re-generated all Xtext languages, introduced TransitionBase

as common super class of Transition and RefinedTransition

Change-Id: Id4dc739696814d3ffc704626a37d6e9599f3432c

419 files changed, 45979 insertions, 56665 deletions

diff --git a/plugins/org.eclipse.etrice.core.common.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.common.ui/META-INF/MANIFEST.MF
index 40f15e1ed..8ebb3315e 100644
--- a/plugins/org.eclipse.etrice.core.common.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.common.ui/META-INF/MANIFEST.MF
@@ -29,5 +29,6 @@ Export-Package: org.eclipse.etrice.core.common.ui.contentassist,
  org.eclipse.etrice.core.common.ui.internal,
  org.eclipse.etrice.core.common.ui.labeling,
  org.eclipse.etrice.core.common.ui.linking,
- org.eclipse.etrice.core.common.ui.quickfix
+ org.eclipse.etrice.core.common.ui.quickfix,
+ org.eclipse.etrice.core.common.ui.contentassist.antlr.internal
 Bundle-Activator: org.eclipse.etrice.core.common.ui.ETriceCoreCommonActivator
diff --git a/plugins/org.eclipse.etrice.core.common.ui/plugin.xml_gen b/plugins/org.eclipse.etrice.core.common.ui/plugin.xml_gen
index 3580d2a5c..66cd9ec08 100644
--- a/plugins/org.eclipse.etrice.core.common.ui/plugin.xml_gen
+++ b/plugins/org.eclipse.etrice.core.common.ui/plugin.xml_gen
@@ -279,6 +279,27 @@
 	        <filter name="projectNature" value="org.eclipse.xtext.ui.shared.xtextNature"/>
         </page>
     </extension>
+    <extension point="org.eclipse.ui.menus">
+		<menuContribution locationURI="popup:#TextEditorContext?after=xtext.ui.openDeclaration">
+			<command
+				commandId="org.eclipse.xtext.ui.OpenGeneratedFileCommand"
+				id="org.eclipse.etrice.core.common.Base.OpenGeneratedCode"
+				style="push">
+					<visibleWhen checkEnabled="false">
+						<reference definitionId="org.eclipse.etrice.core.common.Base.Editor.opened" />
+					</visibleWhen>
+			</command>
+		</menuContribution>
+	</extension>
+	<extension point="org.eclipse.ui.handlers">
+		<handler
+			class="org.eclipse.etrice.core.common.ui.BaseExecutableExtensionFactory:org.eclipse.xtext.ui.generator.trace.OpenGeneratedFileHandler"
+			commandId="org.eclipse.xtext.ui.OpenGeneratedFileCommand">
+				<activeWhen>
+					<reference definitionId="org.eclipse.etrice.core.common.Base.Editor.opened" />
+				</activeWhen>
+		</handler>
+	</extension>
 
 	<!-- Quick Outline -->
 	<extension
diff --git a/plugins/org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/AbstractBaseTestUiModule.java b/plugins/org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/AbstractBaseTestUiModule.java
index 160ee1c77..cbaf63c95 100644
--- a/plugins/org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/AbstractBaseTestUiModule.java
+++ b/plugins/org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/AbstractBaseTestUiModule.java
@@ -4,14 +4,13 @@
  */
 package org.eclipse.etrice.core.common.ui;
 
-import org.eclipse.xtext.ui.DefaultUiModule;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 
 /**
  * Manual modifications go to {org.eclipse.etrice.core.common.ui.BaseTestUiModule}
  */
 @SuppressWarnings("all")
-public abstract class AbstractBaseTestUiModule extends DefaultUiModule {
+public abstract class AbstractBaseTestUiModule extends org.eclipse.xtext.ui.DefaultUiModule {
 	
 	public AbstractBaseTestUiModule(AbstractUIPlugin plugin) {
 		super(plugin);
@@ -44,6 +43,11 @@ public abstract class AbstractBaseTestUiModule extends DefaultUiModule {
 	}
 
 	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
+	public Class<? extends org.eclipse.xtext.generator.IContextualOutputConfigurationProvider> bindIContextualOutputConfigurationProvider() {
+		return org.eclipse.xtext.builder.EclipseOutputConfigurationProvider.class;
+	}
+
+	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
 	public void configureIResourceDescriptionsPersisted(com.google.inject.Binder binder) {
 		binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.PERSISTED_DESCRIPTIONS)).to(org.eclipse.xtext.builder.builderState.IBuilderState.class);
 	}
diff --git a/plugins/org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/AbstractBaseUiModule.java b/plugins/org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/AbstractBaseUiModule.java
index 541eb7136..d7feccd49 100644
--- a/plugins/org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/AbstractBaseUiModule.java
+++ b/plugins/org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/AbstractBaseUiModule.java
@@ -4,14 +4,13 @@
  */
 package org.eclipse.etrice.core.common.ui;
 
-import org.eclipse.xtext.ui.DefaultUiModule;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 
 /**
  * Manual modifications go to {org.eclipse.etrice.core.common.ui.BaseUiModule}
  */
 @SuppressWarnings("all")
-public abstract class AbstractBaseUiModule extends DefaultUiModule {
+public abstract class AbstractBaseUiModule extends org.eclipse.xtext.ui.DefaultUiModule {
 	
 	public AbstractBaseUiModule(AbstractUIPlugin plugin) {
 		super(plugin);
@@ -59,6 +58,11 @@ public abstract class AbstractBaseUiModule extends DefaultUiModule {
 	}
 
 	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
+	public Class<? extends org.eclipse.xtext.generator.IContextualOutputConfigurationProvider> bindIContextualOutputConfigurationProvider() {
+		return org.eclipse.xtext.builder.EclipseOutputConfigurationProvider.class;
+	}
+
+	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
 	public void configureIResourceDescriptionsPersisted(com.google.inject.Binder binder) {
 		binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.PERSISTED_DESCRIPTIONS)).to(org.eclipse.xtext.builder.builderState.IBuilderState.class);
 	}
diff --git a/plugins/org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/AbstractBaseProposalProvider.java b/plugins/org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/AbstractBaseProposalProvider.java
index fdbe4c0e9..06e34e806 100644
--- a/plugins/org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/AbstractBaseProposalProvider.java
+++ b/plugins/org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/AbstractBaseProposalProvider.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.common.ui.contentassist;
 
 import org.eclipse.emf.ecore.EObject;
diff --git a/plugins/org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/BaseParser.java b/plugins/org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/BaseParser.java
index 762999e32..c9f607acf 100644
--- a/plugins/org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/BaseParser.java
+++ b/plugins/org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/BaseParser.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.common.ui.contentassist.antlr;
 
 import java.util.Collection;
diff --git a/plugins/org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g b/plugins/org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g
index f1f384741..19969c41f 100644
--- a/plugins/org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g
+++ b/plugins/org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 grammar InternalBase;
 
 options {
diff --git a/plugins/org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBaseLexer.java b/plugins/org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBaseLexer.java
index ba230e285..6fd8bc921 100644
--- a/plugins/org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBaseLexer.java
+++ b/plugins/org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBaseLexer.java
@@ -58,15 +58,15 @@ public class InternalBaseLexer extends Lexer {
         super(input,state);
 
     }
-    public String getGrammarFileName() { return "../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g"; }
+    public String getGrammarFileName() { return "InternalBase.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.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:11:7: ( 'mandatory' )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:11:9: 'mandatory'
+            // InternalBase.g:11:7: ( 'mandatory' )
+            // InternalBase.g:11:9: 'mandatory'
             {
             match("mandatory"); 
 
@@ -86,8 +86,8 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = T__13;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:12:7: ( 'false' )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:12:9: 'false'
+            // InternalBase.g:12:7: ( 'false' )
+            // InternalBase.g:12:9: 'false'
             {
             match("false"); 
 
@@ -107,8 +107,8 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = T__14;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:13:7: ( '+' )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:13:9: '+'
+            // InternalBase.g:13:7: ( '+' )
+            // InternalBase.g:13:9: '+'
             {
             match('+'); 
 
@@ -127,8 +127,8 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = T__15;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:14:7: ( '-' )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:14:9: '-'
+            // InternalBase.g:14:7: ( '-' )
+            // InternalBase.g:14:9: '-'
             {
             match('-'); 
 
@@ -147,8 +147,8 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = T__16;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:15:7: ( 'e' )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:15:9: 'e'
+            // InternalBase.g:15:7: ( 'e' )
+            // InternalBase.g:15:9: 'e'
             {
             match('e'); 
 
@@ -167,8 +167,8 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = T__17;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:16:7: ( 'E' )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:16:9: 'E'
+            // InternalBase.g:16:7: ( 'E' )
+            // InternalBase.g:16:9: 'E'
             {
             match('E'); 
 
@@ -187,8 +187,8 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = T__18;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:17:7: ( 'ptBoolean' )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:17:9: 'ptBoolean'
+            // InternalBase.g:17:7: ( 'ptBoolean' )
+            // InternalBase.g:17:9: 'ptBoolean'
             {
             match("ptBoolean"); 
 
@@ -208,8 +208,8 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = T__19;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:18:7: ( 'ptInteger' )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:18:9: 'ptInteger'
+            // InternalBase.g:18:7: ( 'ptInteger' )
+            // InternalBase.g:18:9: 'ptInteger'
             {
             match("ptInteger"); 
 
@@ -229,8 +229,8 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = T__20;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:19:7: ( 'ptReal' )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:19:9: 'ptReal'
+            // InternalBase.g:19:7: ( 'ptReal' )
+            // InternalBase.g:19:9: 'ptReal'
             {
             match("ptReal"); 
 
@@ -250,8 +250,8 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = T__21;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:20:7: ( 'ptCharacter' )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:20:9: 'ptCharacter'
+            // InternalBase.g:20:7: ( 'ptCharacter' )
+            // InternalBase.g:20:9: 'ptCharacter'
             {
             match("ptCharacter"); 
 
@@ -271,8 +271,8 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = T__22;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:21:7: ( '@' )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:21:9: '@'
+            // InternalBase.g:21:7: ( '@' )
+            // InternalBase.g:21:9: '@'
             {
             match('@'); 
 
@@ -291,8 +291,8 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = T__23;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:22:7: ( '(' )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:22:9: '('
+            // InternalBase.g:22:7: ( '(' )
+            // InternalBase.g:22:9: '('
             {
             match('('); 
 
@@ -311,8 +311,8 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = T__24;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:23:7: ( ')' )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:23:9: ')'
+            // InternalBase.g:23:7: ( ')' )
+            // InternalBase.g:23:9: ')'
             {
             match(')'); 
 
@@ -331,8 +331,8 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = T__25;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:24:7: ( ',' )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:24:9: ','
+            // InternalBase.g:24:7: ( ',' )
+            // InternalBase.g:24:9: ','
             {
             match(','); 
 
@@ -351,8 +351,8 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = T__26;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:25:7: ( '=' )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:25:9: '='
+            // InternalBase.g:25:7: ( '=' )
+            // InternalBase.g:25:9: '='
             {
             match('='); 
 
@@ -371,8 +371,8 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = T__27;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:26:7: ( 'attribute' )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:26:9: 'attribute'
+            // InternalBase.g:26:7: ( 'attribute' )
+            // InternalBase.g:26:9: 'attribute'
             {
             match("attribute"); 
 
@@ -392,8 +392,8 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = T__28;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:27:7: ( ':' )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:27:9: ':'
+            // InternalBase.g:27:7: ( ':' )
+            // InternalBase.g:27:9: ':'
             {
             match(':'); 
 
@@ -412,8 +412,8 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = T__29;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:28:7: ( '{' )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:28:9: '{'
+            // InternalBase.g:28:7: ( '{' )
+            // InternalBase.g:28:9: '{'
             {
             match('{'); 
 
@@ -432,8 +432,8 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = T__30;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:29:7: ( '}' )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:29:9: '}'
+            // InternalBase.g:29:7: ( '}' )
+            // InternalBase.g:29:9: '}'
             {
             match('}'); 
 
@@ -452,8 +452,8 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = T__31;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:30:7: ( '.*' )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:30:9: '.*'
+            // InternalBase.g:30:7: ( '.*' )
+            // InternalBase.g:30:9: '.*'
             {
             match(".*"); 
 
@@ -473,8 +473,8 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = T__32;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:31:7: ( '[' )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:31:9: '['
+            // InternalBase.g:31:7: ( '[' )
+            // InternalBase.g:31:9: '['
             {
             match('['); 
 
@@ -493,8 +493,8 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = T__33;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:32:7: ( ']' )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:32:9: ']'
+            // InternalBase.g:32:7: ( ']' )
+            // InternalBase.g:32:9: ']'
             {
             match(']'); 
 
@@ -513,8 +513,8 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = T__34;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:33:7: ( '.' )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:33:9: '.'
+            // InternalBase.g:33:7: ( '.' )
+            // InternalBase.g:33:9: '.'
             {
             match('.'); 
 
@@ -533,8 +533,8 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = T__35;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:34:7: ( 'optional' )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:34:9: 'optional'
+            // InternalBase.g:34:7: ( 'optional' )
+            // InternalBase.g:34:9: 'optional'
             {
             match("optional"); 
 
@@ -554,8 +554,8 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = T__36;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:35:7: ( 'true' )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:35:9: 'true'
+            // InternalBase.g:35:7: ( 'true' )
+            // InternalBase.g:35:9: 'true'
             {
             match("true"); 
 
@@ -575,10 +575,10 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = RULE_HEX;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3128:10: ( ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+ )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3128:12: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+
+            // InternalBase.g:3128:10: ( ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+ )
+            // InternalBase.g:3128:12: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3128:12: ( '0x' | '0X' )
+            // InternalBase.g:3128:12: ( '0x' | '0X' )
             int alt1=2;
             int LA1_0 = input.LA(1);
 
@@ -606,7 +606,7 @@ public class InternalBaseLexer extends Lexer {
             }
             switch (alt1) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3128:13: '0x'
+                    // InternalBase.g:3128:13: '0x'
                     {
                     match("0x"); 
 
@@ -614,7 +614,7 @@ public class InternalBaseLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3128:18: '0X'
+                    // InternalBase.g:3128:18: '0X'
                     {
                     match("0X"); 
 
@@ -624,7 +624,7 @@ public class InternalBaseLexer extends Lexer {
 
             }
 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3128:24: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+
+            // InternalBase.g:3128:24: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+
             int cnt2=0;
             loop2:
             do {
@@ -638,7 +638,7 @@ public class InternalBaseLexer extends Lexer {
 
                 switch (alt2) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:
+            	    // InternalBase.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();
@@ -678,10 +678,10 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = RULE_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3130:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3130:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalBase.g:3130:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+            // InternalBase.g:3130:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3130:11: ( '^' )?
+            // InternalBase.g:3130:11: ( '^' )?
             int alt3=2;
             int LA3_0 = input.LA(1);
 
@@ -690,7 +690,7 @@ public class InternalBaseLexer extends Lexer {
             }
             switch (alt3) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3130:11: '^'
+                    // InternalBase.g:3130:11: '^'
                     {
                     match('^'); 
 
@@ -708,7 +708,7 @@ public class InternalBaseLexer extends Lexer {
                 recover(mse);
                 throw mse;}
 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3130:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalBase.g:3130:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             loop4:
             do {
                 int alt4=2;
@@ -721,7 +721,7 @@ public class InternalBaseLexer extends Lexer {
 
                 switch (alt4) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:
+            	    // InternalBase.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();
@@ -757,10 +757,10 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = RULE_INT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3132:10: ( ( '0' .. '9' )+ )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3132:12: ( '0' .. '9' )+
+            // InternalBase.g:3132:10: ( ( '0' .. '9' )+ )
+            // InternalBase.g:3132:12: ( '0' .. '9' )+
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3132:12: ( '0' .. '9' )+
+            // InternalBase.g:3132:12: ( '0' .. '9' )+
             int cnt5=0;
             loop5:
             do {
@@ -774,7 +774,7 @@ public class InternalBaseLexer extends Lexer {
 
                 switch (alt5) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3132:13: '0' .. '9'
+            	    // InternalBase.g:3132:13: '0' .. '9'
             	    {
             	    matchRange('0','9'); 
 
@@ -806,10 +806,10 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = RULE_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3134:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3134:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalBase.g:3134:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+            // InternalBase.g:3134:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3134:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalBase.g:3134:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             int alt8=2;
             int LA8_0 = input.LA(1);
 
@@ -827,10 +827,10 @@ public class InternalBaseLexer extends Lexer {
             }
             switch (alt8) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3134:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+                    // InternalBase.g:3134:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
                     {
                     match('\"'); 
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3134:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+                    // InternalBase.g:3134:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
                     loop6:
                     do {
                         int alt6=3;
@@ -846,7 +846,7 @@ public class InternalBaseLexer extends Lexer {
 
                         switch (alt6) {
                     	case 1 :
-                    	    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3134:21: '\\\\' .
+                    	    // InternalBase.g:3134:21: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -854,7 +854,7 @@ public class InternalBaseLexer extends Lexer {
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3134:28: ~ ( ( '\\\\' | '\"' ) )
+                    	    // InternalBase.g:3134:28: ~ ( ( '\\\\' | '\"' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -879,10 +879,10 @@ public class InternalBaseLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3134:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+                    // InternalBase.g:3134:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
                     {
                     match('\''); 
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3134:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+                    // InternalBase.g:3134:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
                     loop7:
                     do {
                         int alt7=3;
@@ -898,7 +898,7 @@ public class InternalBaseLexer extends Lexer {
 
                         switch (alt7) {
                     	case 1 :
-                    	    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3134:54: '\\\\' .
+                    	    // InternalBase.g:3134:54: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -906,7 +906,7 @@ public class InternalBaseLexer extends Lexer {
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3134:61: ~ ( ( '\\\\' | '\\'' ) )
+                    	    // InternalBase.g:3134:61: ~ ( ( '\\\\' | '\\'' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -949,12 +949,12 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = RULE_ML_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3136:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3136:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // InternalBase.g:3136:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // InternalBase.g:3136:19: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); 
 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3136:24: ( options {greedy=false; } : . )*
+            // InternalBase.g:3136:24: ( options {greedy=false; } : . )*
             loop9:
             do {
                 int alt9=2;
@@ -979,7 +979,7 @@ public class InternalBaseLexer extends Lexer {
 
                 switch (alt9) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3136:52: .
+            	    // InternalBase.g:3136:52: .
             	    {
             	    matchAny(); 
 
@@ -1009,12 +1009,12 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = RULE_SL_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3138:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3138:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // InternalBase.g:3138:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // InternalBase.g:3138:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
             {
             match("//"); 
 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3138:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            // InternalBase.g:3138:24: (~ ( ( '\\n' | '\\r' ) ) )*
             loop10:
             do {
                 int alt10=2;
@@ -1027,7 +1027,7 @@ public class InternalBaseLexer extends Lexer {
 
                 switch (alt10) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3138:24: ~ ( ( '\\n' | '\\r' ) )
+            	    // InternalBase.g:3138: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();
@@ -1047,7 +1047,7 @@ public class InternalBaseLexer extends Lexer {
                 }
             } while (true);
 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3138:40: ( ( '\\r' )? '\\n' )?
+            // InternalBase.g:3138:40: ( ( '\\r' )? '\\n' )?
             int alt12=2;
             int LA12_0 = input.LA(1);
 
@@ -1056,9 +1056,9 @@ public class InternalBaseLexer extends Lexer {
             }
             switch (alt12) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3138:41: ( '\\r' )? '\\n'
+                    // InternalBase.g:3138:41: ( '\\r' )? '\\n'
                     {
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3138:41: ( '\\r' )?
+                    // InternalBase.g:3138:41: ( '\\r' )?
                     int alt11=2;
                     int LA11_0 = input.LA(1);
 
@@ -1067,7 +1067,7 @@ public class InternalBaseLexer extends Lexer {
                     }
                     switch (alt11) {
                         case 1 :
-                            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3138:41: '\\r'
+                            // InternalBase.g:3138:41: '\\r'
                             {
                             match('\r'); 
 
@@ -1099,10 +1099,10 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = RULE_WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3140:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3140:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalBase.g:3140:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // InternalBase.g:3140:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3140:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalBase.g:3140:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             int cnt13=0;
             loop13:
             do {
@@ -1116,7 +1116,7 @@ public class InternalBaseLexer extends Lexer {
 
                 switch (alt13) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:
+            	    // InternalBase.g:
             	    {
             	    if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) {
             	        input.consume();
@@ -1156,8 +1156,8 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = RULE_ANY_OTHER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3142:16: ( . )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3142:18: .
+            // InternalBase.g:3142:16: ( . )
+            // InternalBase.g:3142:18: .
             {
             matchAny(); 
 
@@ -1172,236 +1172,236 @@ public class InternalBaseLexer extends Lexer {
     // $ANTLR end "RULE_ANY_OTHER"
 
     public void mTokens() throws RecognitionException {
-        // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.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 | RULE_HEX | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+        // InternalBase.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 | RULE_HEX | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
         int alt14=33;
         alt14 = dfa14.predict(input);
         switch (alt14) {
             case 1 :
-                // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1:10: T__12
+                // InternalBase.g:1:10: T__12
                 {
                 mT__12(); 
 
                 }
                 break;
             case 2 :
-                // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1:16: T__13
+                // InternalBase.g:1:16: T__13
                 {
                 mT__13(); 
 
                 }
                 break;
             case 3 :
-                // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1:22: T__14
+                // InternalBase.g:1:22: T__14
                 {
                 mT__14(); 
 
                 }
                 break;
             case 4 :
-                // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1:28: T__15
+                // InternalBase.g:1:28: T__15
                 {
                 mT__15(); 
 
                 }
                 break;
             case 5 :
-                // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1:34: T__16
+                // InternalBase.g:1:34: T__16
                 {
                 mT__16(); 
 
                 }
                 break;
             case 6 :
-                // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1:40: T__17
+                // InternalBase.g:1:40: T__17
                 {
                 mT__17(); 
 
                 }
                 break;
             case 7 :
-                // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1:46: T__18
+                // InternalBase.g:1:46: T__18
                 {
                 mT__18(); 
 
                 }
                 break;
             case 8 :
-                // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1:52: T__19
+                // InternalBase.g:1:52: T__19
                 {
                 mT__19(); 
 
                 }
                 break;
             case 9 :
-                // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1:58: T__20
+                // InternalBase.g:1:58: T__20
                 {
                 mT__20(); 
 
                 }
                 break;
             case 10 :
-                // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1:64: T__21
+                // InternalBase.g:1:64: T__21
                 {
                 mT__21(); 
 
                 }
                 break;
             case 11 :
-                // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1:70: T__22
+                // InternalBase.g:1:70: T__22
                 {
                 mT__22(); 
 
                 }
                 break;
             case 12 :
-                // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1:76: T__23
+                // InternalBase.g:1:76: T__23
                 {
                 mT__23(); 
 
                 }
                 break;
             case 13 :
-                // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1:82: T__24
+                // InternalBase.g:1:82: T__24
                 {
                 mT__24(); 
 
                 }
                 break;
             case 14 :
-                // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1:88: T__25
+                // InternalBase.g:1:88: T__25
                 {
                 mT__25(); 
 
                 }
                 break;
             case 15 :
-                // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1:94: T__26
+                // InternalBase.g:1:94: T__26
                 {
                 mT__26(); 
 
                 }
                 break;
             case 16 :
-                // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1:100: T__27
+                // InternalBase.g:1:100: T__27
                 {
                 mT__27(); 
 
                 }
                 break;
             case 17 :
-                // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1:106: T__28
+                // InternalBase.g:1:106: T__28
                 {
                 mT__28(); 
 
                 }
                 break;
             case 18 :
-                // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1:112: T__29
+                // InternalBase.g:1:112: T__29
                 {
                 mT__29(); 
 
                 }
                 break;
             case 19 :
-                // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1:118: T__30
+                // InternalBase.g:1:118: T__30
                 {
                 mT__30(); 
 
                 }
                 break;
             case 20 :
-                // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1:124: T__31
+                // InternalBase.g:1:124: T__31
                 {
                 mT__31(); 
 
                 }
                 break;
             case 21 :
-                // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1:130: T__32
+                // InternalBase.g:1:130: T__32
                 {
                 mT__32(); 
 
                 }
                 break;
             case 22 :
-                // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1:136: T__33
+                // InternalBase.g:1:136: T__33
                 {
                 mT__33(); 
 
                 }
                 break;
             case 23 :
-                // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1:142: T__34
+                // InternalBase.g:1:142: T__34
                 {
                 mT__34(); 
 
                 }
                 break;
             case 24 :
-                // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1:148: T__35
+                // InternalBase.g:1:148: T__35
                 {
                 mT__35(); 
 
                 }
                 break;
             case 25 :
-                // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1:154: T__36
+                // InternalBase.g:1:154: T__36
                 {
                 mT__36(); 
 
                 }
                 break;
             case 26 :
-                // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1:160: RULE_HEX
+                // InternalBase.g:1:160: RULE_HEX
                 {
                 mRULE_HEX(); 
 
                 }
                 break;
             case 27 :
-                // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1:169: RULE_ID
+                // InternalBase.g:1:169: RULE_ID
                 {
                 mRULE_ID(); 
 
                 }
                 break;
             case 28 :
-                // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1:177: RULE_INT
+                // InternalBase.g:1:177: RULE_INT
                 {
                 mRULE_INT(); 
 
                 }
                 break;
             case 29 :
-                // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1:186: RULE_STRING
+                // InternalBase.g:1:186: RULE_STRING
                 {
                 mRULE_STRING(); 
 
                 }
                 break;
             case 30 :
-                // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1:198: RULE_ML_COMMENT
+                // InternalBase.g:1:198: RULE_ML_COMMENT
                 {
                 mRULE_ML_COMMENT(); 
 
                 }
                 break;
             case 31 :
-                // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1:214: RULE_SL_COMMENT
+                // InternalBase.g:1:214: RULE_SL_COMMENT
                 {
                 mRULE_SL_COMMENT(); 
 
                 }
                 break;
             case 32 :
-                // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1:230: RULE_WS
+                // InternalBase.g:1:230: RULE_WS
                 {
                 mRULE_WS(); 
 
                 }
                 break;
             case 33 :
-                // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1:238: RULE_ANY_OTHER
+                // InternalBase.g:1:238: RULE_ANY_OTHER
                 {
                 mRULE_ANY_OTHER(); 
 
@@ -1415,48 +1415,19 @@ public class InternalBaseLexer extends Lexer {
 
     protected DFA14 dfa14 = new DFA14(this);
     static final String DFA14_eotS =
-        "\1\uffff\2\40\2\uffff\1\44\1\45\1\40\5\uffff\1\40\3\uffff\1\61"+
-        "\2\uffff\2\40\1\67\1\36\2\uffff\3\36\2\uffff\1\40\1\uffff\1\40\4"+
-        "\uffff\1\40\5\uffff\1\40\7\uffff\2\40\6\uffff\21\40\1\126\1\40\1"+
-        "\130\6\40\1\uffff\1\40\1\uffff\2\40\1\142\6\40\1\uffff\10\40\1\161"+
-        "\1\162\1\163\1\164\1\40\1\166\4\uffff\1\40\1\uffff\1\170\1\uffff";
+        "\1\uffff\2\40\2\uffff\1\44\1\45\1\40\5\uffff\1\40\3\uffff\1\61\2\uffff\2\40\1\67\1\36\2\uffff\3\36\2\uffff\1\40\1\uffff\1\40\4\uffff\1\40\5\uffff\1\40\7\uffff\2\40\6\uffff\21\40\1\126\1\40\1\130\6\40\1\uffff\1\40\1\uffff\2\40\1\142\6\40\1\uffff\10\40\1\161\1\162\1\163\1\164\1\40\1\166\4\uffff\1\40\1\uffff\1\170\1\uffff";
     static final String DFA14_eofS =
         "\171\uffff";
     static final String DFA14_minS =
-        "\1\0\2\141\2\uffff\2\60\1\164\5\uffff\1\164\3\uffff\1\52\2\uffff"+
-        "\1\160\1\162\1\130\1\101\2\uffff\2\0\1\52\2\uffff\1\156\1\uffff"+
-        "\1\154\4\uffff\1\102\5\uffff\1\164\7\uffff\1\164\1\165\6\uffff\1"+
-        "\144\1\163\1\157\1\156\1\145\1\150\1\162\1\151\1\145\1\141\1\145"+
-        "\1\157\1\164\2\141\1\151\1\157\1\60\1\164\1\60\1\154\1\145\1\154"+
-        "\1\162\1\142\1\156\1\uffff\1\157\1\uffff\1\145\1\147\1\60\1\141"+
-        "\1\165\1\141\1\162\1\141\1\145\1\uffff\1\143\1\164\1\154\1\171\1"+
-        "\156\1\162\1\164\1\145\4\60\1\145\1\60\4\uffff\1\162\1\uffff\1\60"+
-        "\1\uffff";
+        "\1\0\2\141\2\uffff\2\60\1\164\5\uffff\1\164\3\uffff\1\52\2\uffff\1\160\1\162\1\130\1\101\2\uffff\2\0\1\52\2\uffff\1\156\1\uffff\1\154\4\uffff\1\102\5\uffff\1\164\7\uffff\1\164\1\165\6\uffff\1\144\1\163\1\157\1\156\1\145\1\150\1\162\1\151\1\145\1\141\1\145\1\157\1\164\2\141\1\151\1\157\1\60\1\164\1\60\1\154\1\145\1\154\1\162\1\142\1\156\1\uffff\1\157\1\uffff\1\145\1\147\1\60\1\141\1\165\1\141\1\162\1\141\1\145\1\uffff\1\143\1\164\1\154\1\171\1\156\1\162\1\164\1\145\4\60\1\145\1\60\4\uffff\1\162\1\uffff\1\60\1\uffff";
     static final String DFA14_maxS =
-        "\1\uffff\2\141\2\uffff\2\172\1\164\5\uffff\1\164\3\uffff\1\52\2"+
-        "\uffff\1\160\1\162\1\170\1\172\2\uffff\2\uffff\1\57\2\uffff\1\156"+
-        "\1\uffff\1\154\4\uffff\1\122\5\uffff\1\164\7\uffff\1\164\1\165\6"+
-        "\uffff\1\144\1\163\1\157\1\156\1\145\1\150\1\162\1\151\1\145\1\141"+
-        "\1\145\1\157\1\164\2\141\1\151\1\157\1\172\1\164\1\172\1\154\1\145"+
-        "\1\154\1\162\1\142\1\156\1\uffff\1\157\1\uffff\1\145\1\147\1\172"+
-        "\1\141\1\165\1\141\1\162\1\141\1\145\1\uffff\1\143\1\164\1\154\1"+
-        "\171\1\156\1\162\1\164\1\145\4\172\1\145\1\172\4\uffff\1\162\1\uffff"+
-        "\1\172\1\uffff";
+        "\1\uffff\2\141\2\uffff\2\172\1\164\5\uffff\1\164\3\uffff\1\52\2\uffff\1\160\1\162\1\170\1\172\2\uffff\2\uffff\1\57\2\uffff\1\156\1\uffff\1\154\4\uffff\1\122\5\uffff\1\164\7\uffff\1\164\1\165\6\uffff\1\144\1\163\1\157\1\156\1\145\1\150\1\162\1\151\1\145\1\141\1\145\1\157\1\164\2\141\1\151\1\157\1\172\1\164\1\172\1\154\1\145\1\154\1\162\1\142\1\156\1\uffff\1\157\1\uffff\1\145\1\147\1\172\1\141\1\165\1\141\1\162\1\141\1\145\1\uffff\1\143\1\164\1\154\1\171\1\156\1\162\1\164\1\145\4\172\1\145\1\172\4\uffff\1\162\1\uffff\1\172\1\uffff";
     static final String DFA14_acceptS =
-        "\3\uffff\1\3\1\4\3\uffff\1\13\1\14\1\15\1\16\1\17\1\uffff\1\21"+
-        "\1\22\1\23\1\uffff\1\25\1\26\4\uffff\1\33\1\34\3\uffff\1\40\1\41"+
-        "\1\uffff\1\33\1\uffff\1\3\1\4\1\5\1\6\1\uffff\1\13\1\14\1\15\1\16"+
-        "\1\17\1\uffff\1\21\1\22\1\23\1\24\1\27\1\25\1\26\2\uffff\1\32\1"+
-        "\34\1\35\1\36\1\37\1\40\32\uffff\1\31\1\uffff\1\2\11\uffff\1\11"+
-        "\16\uffff\1\30\1\1\1\7\1\10\1\uffff\1\20\1\uffff\1\12";
+        "\3\uffff\1\3\1\4\3\uffff\1\13\1\14\1\15\1\16\1\17\1\uffff\1\21\1\22\1\23\1\uffff\1\25\1\26\4\uffff\1\33\1\34\3\uffff\1\40\1\41\1\uffff\1\33\1\uffff\1\3\1\4\1\5\1\6\1\uffff\1\13\1\14\1\15\1\16\1\17\1\uffff\1\21\1\22\1\23\1\24\1\27\1\25\1\26\2\uffff\1\32\1\34\1\35\1\36\1\37\1\40\32\uffff\1\31\1\uffff\1\2\11\uffff\1\11\16\uffff\1\30\1\1\1\7\1\10\1\uffff\1\20\1\uffff\1\12";
     static final String DFA14_specialS =
         "\1\1\31\uffff\1\0\1\2\135\uffff}>";
     static final String[] DFA14_transitionS = {
-            "\11\36\2\35\2\36\1\35\22\36\1\35\1\36\1\32\4\36\1\33\1\11\1"+
-            "\12\1\36\1\3\1\13\1\4\1\21\1\34\1\26\11\31\1\16\2\36\1\14\2"+
-            "\36\1\10\4\30\1\6\25\30\1\22\1\36\1\23\1\27\1\30\1\36\1\15\3"+
-            "\30\1\5\1\2\6\30\1\1\1\30\1\24\1\7\3\30\1\25\6\30\1\17\1\36"+
-            "\1\20\uff82\36",
+            "\11\36\2\35\2\36\1\35\22\36\1\35\1\36\1\32\4\36\1\33\1\11\1\12\1\36\1\3\1\13\1\4\1\21\1\34\1\26\11\31\1\16\2\36\1\14\2\36\1\10\4\30\1\6\25\30\1\22\1\36\1\23\1\27\1\30\1\36\1\15\3\30\1\5\1\2\6\30\1\1\1\30\1\24\1\7\3\30\1\25\6\30\1\17\1\36\1\20\uff82\36",
             "\1\37",
             "\1\41",
             "",
diff --git a/plugins/org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBaseParser.java b/plugins/org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBaseParser.java
index ed665bcef..2dfdab7b3 100644
--- a/plugins/org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBaseParser.java
+++ b/plugins/org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBaseParser.java
@@ -73,7 +73,7 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
         
 
     public String[] getTokenNames() { return InternalBaseParser.tokenNames; }
-    public String getGrammarFileName() { return "../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g"; }
+    public String getGrammarFileName() { return "InternalBase.g"; }
 
 
      
@@ -97,20 +97,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleAnnotation"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:60:1: entryRuleAnnotation : ruleAnnotation EOF ;
+    // InternalBase.g:60:1: entryRuleAnnotation : ruleAnnotation EOF ;
     public final void entryRuleAnnotation() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:61:1: ( ruleAnnotation EOF )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:62:1: ruleAnnotation EOF
+            // InternalBase.g:61:1: ( ruleAnnotation EOF )
+            // InternalBase.g:62:1: ruleAnnotation EOF
             {
              before(grammarAccess.getAnnotationRule()); 
-            pushFollow(FOLLOW_ruleAnnotation_in_entryRuleAnnotation61);
+            pushFollow(FOLLOW_1);
             ruleAnnotation();
 
             state._fsp--;
 
              after(grammarAccess.getAnnotationRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAnnotation68); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -127,23 +127,23 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleAnnotation"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:69:1: ruleAnnotation : ( ( rule__Annotation__Group__0 ) ) ;
+    // InternalBase.g:69:1: ruleAnnotation : ( ( rule__Annotation__Group__0 ) ) ;
     public final void ruleAnnotation() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:73:2: ( ( ( rule__Annotation__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:74:1: ( ( rule__Annotation__Group__0 ) )
+            // InternalBase.g:73:2: ( ( ( rule__Annotation__Group__0 ) ) )
+            // InternalBase.g:74:1: ( ( rule__Annotation__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:74:1: ( ( rule__Annotation__Group__0 ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:75:1: ( rule__Annotation__Group__0 )
+            // InternalBase.g:74:1: ( ( rule__Annotation__Group__0 ) )
+            // InternalBase.g:75:1: ( rule__Annotation__Group__0 )
             {
              before(grammarAccess.getAnnotationAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:76:1: ( rule__Annotation__Group__0 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:76:2: rule__Annotation__Group__0
+            // InternalBase.g:76:1: ( rule__Annotation__Group__0 )
+            // InternalBase.g:76:2: rule__Annotation__Group__0
             {
-            pushFollow(FOLLOW_rule__Annotation__Group__0_in_ruleAnnotation94);
+            pushFollow(FOLLOW_2);
             rule__Annotation__Group__0();
 
             state._fsp--;
@@ -174,20 +174,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleKeyValue"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:88:1: entryRuleKeyValue : ruleKeyValue EOF ;
+    // InternalBase.g:88:1: entryRuleKeyValue : ruleKeyValue EOF ;
     public final void entryRuleKeyValue() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:89:1: ( ruleKeyValue EOF )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:90:1: ruleKeyValue EOF
+            // InternalBase.g:89:1: ( ruleKeyValue EOF )
+            // InternalBase.g:90:1: ruleKeyValue EOF
             {
              before(grammarAccess.getKeyValueRule()); 
-            pushFollow(FOLLOW_ruleKeyValue_in_entryRuleKeyValue121);
+            pushFollow(FOLLOW_1);
             ruleKeyValue();
 
             state._fsp--;
 
              after(grammarAccess.getKeyValueRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleKeyValue128); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -204,23 +204,23 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleKeyValue"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:97:1: ruleKeyValue : ( ( rule__KeyValue__Group__0 ) ) ;
+    // InternalBase.g:97:1: ruleKeyValue : ( ( rule__KeyValue__Group__0 ) ) ;
     public final void ruleKeyValue() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:101:2: ( ( ( rule__KeyValue__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:102:1: ( ( rule__KeyValue__Group__0 ) )
+            // InternalBase.g:101:2: ( ( ( rule__KeyValue__Group__0 ) ) )
+            // InternalBase.g:102:1: ( ( rule__KeyValue__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:102:1: ( ( rule__KeyValue__Group__0 ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:103:1: ( rule__KeyValue__Group__0 )
+            // InternalBase.g:102:1: ( ( rule__KeyValue__Group__0 ) )
+            // InternalBase.g:103:1: ( rule__KeyValue__Group__0 )
             {
              before(grammarAccess.getKeyValueAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:104:1: ( rule__KeyValue__Group__0 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:104:2: rule__KeyValue__Group__0
+            // InternalBase.g:104:1: ( rule__KeyValue__Group__0 )
+            // InternalBase.g:104:2: rule__KeyValue__Group__0
             {
-            pushFollow(FOLLOW_rule__KeyValue__Group__0_in_ruleKeyValue154);
+            pushFollow(FOLLOW_2);
             rule__KeyValue__Group__0();
 
             state._fsp--;
@@ -251,20 +251,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleAnnotationTargetType"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:118:1: entryRuleAnnotationTargetType : ruleAnnotationTargetType EOF ;
+    // InternalBase.g:118:1: entryRuleAnnotationTargetType : ruleAnnotationTargetType EOF ;
     public final void entryRuleAnnotationTargetType() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:119:1: ( ruleAnnotationTargetType EOF )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:120:1: ruleAnnotationTargetType EOF
+            // InternalBase.g:119:1: ( ruleAnnotationTargetType EOF )
+            // InternalBase.g:120:1: ruleAnnotationTargetType EOF
             {
              before(grammarAccess.getAnnotationTargetTypeRule()); 
-            pushFollow(FOLLOW_ruleAnnotationTargetType_in_entryRuleAnnotationTargetType183);
+            pushFollow(FOLLOW_1);
             ruleAnnotationTargetType();
 
             state._fsp--;
 
              after(grammarAccess.getAnnotationTargetTypeRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAnnotationTargetType190); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -281,20 +281,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleAnnotationTargetType"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:127:1: ruleAnnotationTargetType : ( RULE_ID ) ;
+    // InternalBase.g:127:1: ruleAnnotationTargetType : ( RULE_ID ) ;
     public final void ruleAnnotationTargetType() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:131:2: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:132:1: ( RULE_ID )
+            // InternalBase.g:131:2: ( ( RULE_ID ) )
+            // InternalBase.g:132:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:132:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:133:1: RULE_ID
+            // InternalBase.g:132:1: ( RULE_ID )
+            // InternalBase.g:133:1: RULE_ID
             {
              before(grammarAccess.getAnnotationTargetTypeAccess().getIDTerminalRuleCall()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleAnnotationTargetType216); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getAnnotationTargetTypeAccess().getIDTerminalRuleCall()); 
 
             }
@@ -318,20 +318,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleAnnotationAttribute"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:146:1: entryRuleAnnotationAttribute : ruleAnnotationAttribute EOF ;
+    // InternalBase.g:146:1: entryRuleAnnotationAttribute : ruleAnnotationAttribute EOF ;
     public final void entryRuleAnnotationAttribute() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:147:1: ( ruleAnnotationAttribute EOF )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:148:1: ruleAnnotationAttribute EOF
+            // InternalBase.g:147:1: ( ruleAnnotationAttribute EOF )
+            // InternalBase.g:148:1: ruleAnnotationAttribute EOF
             {
              before(grammarAccess.getAnnotationAttributeRule()); 
-            pushFollow(FOLLOW_ruleAnnotationAttribute_in_entryRuleAnnotationAttribute242);
+            pushFollow(FOLLOW_1);
             ruleAnnotationAttribute();
 
             state._fsp--;
 
              after(grammarAccess.getAnnotationAttributeRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAnnotationAttribute249); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -348,23 +348,23 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleAnnotationAttribute"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:155:1: ruleAnnotationAttribute : ( ( rule__AnnotationAttribute__Alternatives ) ) ;
+    // InternalBase.g:155:1: ruleAnnotationAttribute : ( ( rule__AnnotationAttribute__Alternatives ) ) ;
     public final void ruleAnnotationAttribute() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:159:2: ( ( ( rule__AnnotationAttribute__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:160:1: ( ( rule__AnnotationAttribute__Alternatives ) )
+            // InternalBase.g:159:2: ( ( ( rule__AnnotationAttribute__Alternatives ) ) )
+            // InternalBase.g:160:1: ( ( rule__AnnotationAttribute__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:160:1: ( ( rule__AnnotationAttribute__Alternatives ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:161:1: ( rule__AnnotationAttribute__Alternatives )
+            // InternalBase.g:160:1: ( ( rule__AnnotationAttribute__Alternatives ) )
+            // InternalBase.g:161:1: ( rule__AnnotationAttribute__Alternatives )
             {
              before(grammarAccess.getAnnotationAttributeAccess().getAlternatives()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:162:1: ( rule__AnnotationAttribute__Alternatives )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:162:2: rule__AnnotationAttribute__Alternatives
+            // InternalBase.g:162:1: ( rule__AnnotationAttribute__Alternatives )
+            // InternalBase.g:162:2: rule__AnnotationAttribute__Alternatives
             {
-            pushFollow(FOLLOW_rule__AnnotationAttribute__Alternatives_in_ruleAnnotationAttribute275);
+            pushFollow(FOLLOW_2);
             rule__AnnotationAttribute__Alternatives();
 
             state._fsp--;
@@ -395,20 +395,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleSimpleAnnotationAttribute"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:174:1: entryRuleSimpleAnnotationAttribute : ruleSimpleAnnotationAttribute EOF ;
+    // InternalBase.g:174:1: entryRuleSimpleAnnotationAttribute : ruleSimpleAnnotationAttribute EOF ;
     public final void entryRuleSimpleAnnotationAttribute() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:175:1: ( ruleSimpleAnnotationAttribute EOF )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:176:1: ruleSimpleAnnotationAttribute EOF
+            // InternalBase.g:175:1: ( ruleSimpleAnnotationAttribute EOF )
+            // InternalBase.g:176:1: ruleSimpleAnnotationAttribute EOF
             {
              before(grammarAccess.getSimpleAnnotationAttributeRule()); 
-            pushFollow(FOLLOW_ruleSimpleAnnotationAttribute_in_entryRuleSimpleAnnotationAttribute302);
+            pushFollow(FOLLOW_1);
             ruleSimpleAnnotationAttribute();
 
             state._fsp--;
 
              after(grammarAccess.getSimpleAnnotationAttributeRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSimpleAnnotationAttribute309); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -425,23 +425,23 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleSimpleAnnotationAttribute"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:183:1: ruleSimpleAnnotationAttribute : ( ( rule__SimpleAnnotationAttribute__Group__0 ) ) ;
+    // InternalBase.g:183:1: ruleSimpleAnnotationAttribute : ( ( rule__SimpleAnnotationAttribute__Group__0 ) ) ;
     public final void ruleSimpleAnnotationAttribute() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:187:2: ( ( ( rule__SimpleAnnotationAttribute__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:188:1: ( ( rule__SimpleAnnotationAttribute__Group__0 ) )
+            // InternalBase.g:187:2: ( ( ( rule__SimpleAnnotationAttribute__Group__0 ) ) )
+            // InternalBase.g:188:1: ( ( rule__SimpleAnnotationAttribute__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:188:1: ( ( rule__SimpleAnnotationAttribute__Group__0 ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:189:1: ( rule__SimpleAnnotationAttribute__Group__0 )
+            // InternalBase.g:188:1: ( ( rule__SimpleAnnotationAttribute__Group__0 ) )
+            // InternalBase.g:189:1: ( rule__SimpleAnnotationAttribute__Group__0 )
             {
              before(grammarAccess.getSimpleAnnotationAttributeAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:190:1: ( rule__SimpleAnnotationAttribute__Group__0 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:190:2: rule__SimpleAnnotationAttribute__Group__0
+            // InternalBase.g:190:1: ( rule__SimpleAnnotationAttribute__Group__0 )
+            // InternalBase.g:190:2: rule__SimpleAnnotationAttribute__Group__0
             {
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__0_in_ruleSimpleAnnotationAttribute335);
+            pushFollow(FOLLOW_2);
             rule__SimpleAnnotationAttribute__Group__0();
 
             state._fsp--;
@@ -472,20 +472,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleEnumAnnotationAttribute"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:202:1: entryRuleEnumAnnotationAttribute : ruleEnumAnnotationAttribute EOF ;
+    // InternalBase.g:202:1: entryRuleEnumAnnotationAttribute : ruleEnumAnnotationAttribute EOF ;
     public final void entryRuleEnumAnnotationAttribute() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:203:1: ( ruleEnumAnnotationAttribute EOF )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:204:1: ruleEnumAnnotationAttribute EOF
+            // InternalBase.g:203:1: ( ruleEnumAnnotationAttribute EOF )
+            // InternalBase.g:204:1: ruleEnumAnnotationAttribute EOF
             {
              before(grammarAccess.getEnumAnnotationAttributeRule()); 
-            pushFollow(FOLLOW_ruleEnumAnnotationAttribute_in_entryRuleEnumAnnotationAttribute362);
+            pushFollow(FOLLOW_1);
             ruleEnumAnnotationAttribute();
 
             state._fsp--;
 
              after(grammarAccess.getEnumAnnotationAttributeRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleEnumAnnotationAttribute369); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -502,23 +502,23 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleEnumAnnotationAttribute"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:211:1: ruleEnumAnnotationAttribute : ( ( rule__EnumAnnotationAttribute__Group__0 ) ) ;
+    // InternalBase.g:211:1: ruleEnumAnnotationAttribute : ( ( rule__EnumAnnotationAttribute__Group__0 ) ) ;
     public final void ruleEnumAnnotationAttribute() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:215:2: ( ( ( rule__EnumAnnotationAttribute__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:216:1: ( ( rule__EnumAnnotationAttribute__Group__0 ) )
+            // InternalBase.g:215:2: ( ( ( rule__EnumAnnotationAttribute__Group__0 ) ) )
+            // InternalBase.g:216:1: ( ( rule__EnumAnnotationAttribute__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:216:1: ( ( rule__EnumAnnotationAttribute__Group__0 ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:217:1: ( rule__EnumAnnotationAttribute__Group__0 )
+            // InternalBase.g:216:1: ( ( rule__EnumAnnotationAttribute__Group__0 ) )
+            // InternalBase.g:217:1: ( rule__EnumAnnotationAttribute__Group__0 )
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:218:1: ( rule__EnumAnnotationAttribute__Group__0 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:218:2: rule__EnumAnnotationAttribute__Group__0
+            // InternalBase.g:218:1: ( rule__EnumAnnotationAttribute__Group__0 )
+            // InternalBase.g:218:2: rule__EnumAnnotationAttribute__Group__0
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__0_in_ruleEnumAnnotationAttribute395);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group__0();
 
             state._fsp--;
@@ -549,20 +549,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleImportedFQN"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:232:1: entryRuleImportedFQN : ruleImportedFQN EOF ;
+    // InternalBase.g:232:1: entryRuleImportedFQN : ruleImportedFQN EOF ;
     public final void entryRuleImportedFQN() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:233:1: ( ruleImportedFQN EOF )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:234:1: ruleImportedFQN EOF
+            // InternalBase.g:233:1: ( ruleImportedFQN EOF )
+            // InternalBase.g:234:1: ruleImportedFQN EOF
             {
              before(grammarAccess.getImportedFQNRule()); 
-            pushFollow(FOLLOW_ruleImportedFQN_in_entryRuleImportedFQN424);
+            pushFollow(FOLLOW_1);
             ruleImportedFQN();
 
             state._fsp--;
 
              after(grammarAccess.getImportedFQNRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleImportedFQN431); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -579,23 +579,23 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleImportedFQN"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:241:1: ruleImportedFQN : ( ( rule__ImportedFQN__Group__0 ) ) ;
+    // InternalBase.g:241:1: ruleImportedFQN : ( ( rule__ImportedFQN__Group__0 ) ) ;
     public final void ruleImportedFQN() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:245:2: ( ( ( rule__ImportedFQN__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:246:1: ( ( rule__ImportedFQN__Group__0 ) )
+            // InternalBase.g:245:2: ( ( ( rule__ImportedFQN__Group__0 ) ) )
+            // InternalBase.g:246:1: ( ( rule__ImportedFQN__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:246:1: ( ( rule__ImportedFQN__Group__0 ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:247:1: ( rule__ImportedFQN__Group__0 )
+            // InternalBase.g:246:1: ( ( rule__ImportedFQN__Group__0 ) )
+            // InternalBase.g:247:1: ( rule__ImportedFQN__Group__0 )
             {
              before(grammarAccess.getImportedFQNAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:248:1: ( rule__ImportedFQN__Group__0 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:248:2: rule__ImportedFQN__Group__0
+            // InternalBase.g:248:1: ( rule__ImportedFQN__Group__0 )
+            // InternalBase.g:248:2: rule__ImportedFQN__Group__0
             {
-            pushFollow(FOLLOW_rule__ImportedFQN__Group__0_in_ruleImportedFQN457);
+            pushFollow(FOLLOW_2);
             rule__ImportedFQN__Group__0();
 
             state._fsp--;
@@ -626,20 +626,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleDocumentation"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:260:1: entryRuleDocumentation : ruleDocumentation EOF ;
+    // InternalBase.g:260:1: entryRuleDocumentation : ruleDocumentation EOF ;
     public final void entryRuleDocumentation() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:261:1: ( ruleDocumentation EOF )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:262:1: ruleDocumentation EOF
+            // InternalBase.g:261:1: ( ruleDocumentation EOF )
+            // InternalBase.g:262:1: ruleDocumentation EOF
             {
              before(grammarAccess.getDocumentationRule()); 
-            pushFollow(FOLLOW_ruleDocumentation_in_entryRuleDocumentation484);
+            pushFollow(FOLLOW_1);
             ruleDocumentation();
 
             state._fsp--;
 
              after(grammarAccess.getDocumentationRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDocumentation491); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -656,23 +656,23 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleDocumentation"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:269:1: ruleDocumentation : ( ( rule__Documentation__Group__0 ) ) ;
+    // InternalBase.g:269:1: ruleDocumentation : ( ( rule__Documentation__Group__0 ) ) ;
     public final void ruleDocumentation() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:273:2: ( ( ( rule__Documentation__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:274:1: ( ( rule__Documentation__Group__0 ) )
+            // InternalBase.g:273:2: ( ( ( rule__Documentation__Group__0 ) ) )
+            // InternalBase.g:274:1: ( ( rule__Documentation__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:274:1: ( ( rule__Documentation__Group__0 ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:275:1: ( rule__Documentation__Group__0 )
+            // InternalBase.g:274:1: ( ( rule__Documentation__Group__0 ) )
+            // InternalBase.g:275:1: ( rule__Documentation__Group__0 )
             {
              before(grammarAccess.getDocumentationAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:276:1: ( rule__Documentation__Group__0 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:276:2: rule__Documentation__Group__0
+            // InternalBase.g:276:1: ( rule__Documentation__Group__0 )
+            // InternalBase.g:276:2: rule__Documentation__Group__0
             {
-            pushFollow(FOLLOW_rule__Documentation__Group__0_in_ruleDocumentation517);
+            pushFollow(FOLLOW_2);
             rule__Documentation__Group__0();
 
             state._fsp--;
@@ -703,20 +703,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleLiteral"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:292:1: entryRuleLiteral : ruleLiteral EOF ;
+    // InternalBase.g:292:1: entryRuleLiteral : ruleLiteral EOF ;
     public final void entryRuleLiteral() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:293:1: ( ruleLiteral EOF )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:294:1: ruleLiteral EOF
+            // InternalBase.g:293:1: ( ruleLiteral EOF )
+            // InternalBase.g:294:1: ruleLiteral EOF
             {
              before(grammarAccess.getLiteralRule()); 
-            pushFollow(FOLLOW_ruleLiteral_in_entryRuleLiteral548);
+            pushFollow(FOLLOW_1);
             ruleLiteral();
 
             state._fsp--;
 
              after(grammarAccess.getLiteralRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleLiteral555); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -733,23 +733,23 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleLiteral"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:301:1: ruleLiteral : ( ( rule__Literal__Alternatives ) ) ;
+    // InternalBase.g:301:1: ruleLiteral : ( ( rule__Literal__Alternatives ) ) ;
     public final void ruleLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:305:2: ( ( ( rule__Literal__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:306:1: ( ( rule__Literal__Alternatives ) )
+            // InternalBase.g:305:2: ( ( ( rule__Literal__Alternatives ) ) )
+            // InternalBase.g:306:1: ( ( rule__Literal__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:306:1: ( ( rule__Literal__Alternatives ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:307:1: ( rule__Literal__Alternatives )
+            // InternalBase.g:306:1: ( ( rule__Literal__Alternatives ) )
+            // InternalBase.g:307:1: ( rule__Literal__Alternatives )
             {
              before(grammarAccess.getLiteralAccess().getAlternatives()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:308:1: ( rule__Literal__Alternatives )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:308:2: rule__Literal__Alternatives
+            // InternalBase.g:308:1: ( rule__Literal__Alternatives )
+            // InternalBase.g:308:2: rule__Literal__Alternatives
             {
-            pushFollow(FOLLOW_rule__Literal__Alternatives_in_ruleLiteral581);
+            pushFollow(FOLLOW_2);
             rule__Literal__Alternatives();
 
             state._fsp--;
@@ -780,20 +780,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleBooleanLiteral"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:320:1: entryRuleBooleanLiteral : ruleBooleanLiteral EOF ;
+    // InternalBase.g:320:1: entryRuleBooleanLiteral : ruleBooleanLiteral EOF ;
     public final void entryRuleBooleanLiteral() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:321:1: ( ruleBooleanLiteral EOF )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:322:1: ruleBooleanLiteral EOF
+            // InternalBase.g:321:1: ( ruleBooleanLiteral EOF )
+            // InternalBase.g:322:1: ruleBooleanLiteral EOF
             {
              before(grammarAccess.getBooleanLiteralRule()); 
-            pushFollow(FOLLOW_ruleBooleanLiteral_in_entryRuleBooleanLiteral608);
+            pushFollow(FOLLOW_1);
             ruleBooleanLiteral();
 
             state._fsp--;
 
              after(grammarAccess.getBooleanLiteralRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleBooleanLiteral615); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -810,23 +810,23 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleBooleanLiteral"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:329:1: ruleBooleanLiteral : ( ( rule__BooleanLiteral__Group__0 ) ) ;
+    // InternalBase.g:329:1: ruleBooleanLiteral : ( ( rule__BooleanLiteral__Group__0 ) ) ;
     public final void ruleBooleanLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:333:2: ( ( ( rule__BooleanLiteral__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:334:1: ( ( rule__BooleanLiteral__Group__0 ) )
+            // InternalBase.g:333:2: ( ( ( rule__BooleanLiteral__Group__0 ) ) )
+            // InternalBase.g:334:1: ( ( rule__BooleanLiteral__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:334:1: ( ( rule__BooleanLiteral__Group__0 ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:335:1: ( rule__BooleanLiteral__Group__0 )
+            // InternalBase.g:334:1: ( ( rule__BooleanLiteral__Group__0 ) )
+            // InternalBase.g:335:1: ( rule__BooleanLiteral__Group__0 )
             {
              before(grammarAccess.getBooleanLiteralAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:336:1: ( rule__BooleanLiteral__Group__0 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:336:2: rule__BooleanLiteral__Group__0
+            // InternalBase.g:336:1: ( rule__BooleanLiteral__Group__0 )
+            // InternalBase.g:336:2: rule__BooleanLiteral__Group__0
             {
-            pushFollow(FOLLOW_rule__BooleanLiteral__Group__0_in_ruleBooleanLiteral641);
+            pushFollow(FOLLOW_2);
             rule__BooleanLiteral__Group__0();
 
             state._fsp--;
@@ -857,20 +857,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleNumberLiteral"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:348:1: entryRuleNumberLiteral : ruleNumberLiteral EOF ;
+    // InternalBase.g:348:1: entryRuleNumberLiteral : ruleNumberLiteral EOF ;
     public final void entryRuleNumberLiteral() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:349:1: ( ruleNumberLiteral EOF )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:350:1: ruleNumberLiteral EOF
+            // InternalBase.g:349:1: ( ruleNumberLiteral EOF )
+            // InternalBase.g:350:1: ruleNumberLiteral EOF
             {
              before(grammarAccess.getNumberLiteralRule()); 
-            pushFollow(FOLLOW_ruleNumberLiteral_in_entryRuleNumberLiteral668);
+            pushFollow(FOLLOW_1);
             ruleNumberLiteral();
 
             state._fsp--;
 
              after(grammarAccess.getNumberLiteralRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleNumberLiteral675); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -887,23 +887,23 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleNumberLiteral"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:357:1: ruleNumberLiteral : ( ( rule__NumberLiteral__Alternatives ) ) ;
+    // InternalBase.g:357:1: ruleNumberLiteral : ( ( rule__NumberLiteral__Alternatives ) ) ;
     public final void ruleNumberLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:361:2: ( ( ( rule__NumberLiteral__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:362:1: ( ( rule__NumberLiteral__Alternatives ) )
+            // InternalBase.g:361:2: ( ( ( rule__NumberLiteral__Alternatives ) ) )
+            // InternalBase.g:362:1: ( ( rule__NumberLiteral__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:362:1: ( ( rule__NumberLiteral__Alternatives ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:363:1: ( rule__NumberLiteral__Alternatives )
+            // InternalBase.g:362:1: ( ( rule__NumberLiteral__Alternatives ) )
+            // InternalBase.g:363:1: ( rule__NumberLiteral__Alternatives )
             {
              before(grammarAccess.getNumberLiteralAccess().getAlternatives()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:364:1: ( rule__NumberLiteral__Alternatives )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:364:2: rule__NumberLiteral__Alternatives
+            // InternalBase.g:364:1: ( rule__NumberLiteral__Alternatives )
+            // InternalBase.g:364:2: rule__NumberLiteral__Alternatives
             {
-            pushFollow(FOLLOW_rule__NumberLiteral__Alternatives_in_ruleNumberLiteral701);
+            pushFollow(FOLLOW_2);
             rule__NumberLiteral__Alternatives();
 
             state._fsp--;
@@ -934,20 +934,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleRealLiteral"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:376:1: entryRuleRealLiteral : ruleRealLiteral EOF ;
+    // InternalBase.g:376:1: entryRuleRealLiteral : ruleRealLiteral EOF ;
     public final void entryRuleRealLiteral() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:377:1: ( ruleRealLiteral EOF )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:378:1: ruleRealLiteral EOF
+            // InternalBase.g:377:1: ( ruleRealLiteral EOF )
+            // InternalBase.g:378:1: ruleRealLiteral EOF
             {
              before(grammarAccess.getRealLiteralRule()); 
-            pushFollow(FOLLOW_ruleRealLiteral_in_entryRuleRealLiteral728);
+            pushFollow(FOLLOW_1);
             ruleRealLiteral();
 
             state._fsp--;
 
              after(grammarAccess.getRealLiteralRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRealLiteral735); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -964,23 +964,23 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleRealLiteral"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:385:1: ruleRealLiteral : ( ( rule__RealLiteral__Group__0 ) ) ;
+    // InternalBase.g:385:1: ruleRealLiteral : ( ( rule__RealLiteral__Group__0 ) ) ;
     public final void ruleRealLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:389:2: ( ( ( rule__RealLiteral__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:390:1: ( ( rule__RealLiteral__Group__0 ) )
+            // InternalBase.g:389:2: ( ( ( rule__RealLiteral__Group__0 ) ) )
+            // InternalBase.g:390:1: ( ( rule__RealLiteral__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:390:1: ( ( rule__RealLiteral__Group__0 ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:391:1: ( rule__RealLiteral__Group__0 )
+            // InternalBase.g:390:1: ( ( rule__RealLiteral__Group__0 ) )
+            // InternalBase.g:391:1: ( rule__RealLiteral__Group__0 )
             {
              before(grammarAccess.getRealLiteralAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:392:1: ( rule__RealLiteral__Group__0 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:392:2: rule__RealLiteral__Group__0
+            // InternalBase.g:392:1: ( rule__RealLiteral__Group__0 )
+            // InternalBase.g:392:2: rule__RealLiteral__Group__0
             {
-            pushFollow(FOLLOW_rule__RealLiteral__Group__0_in_ruleRealLiteral761);
+            pushFollow(FOLLOW_2);
             rule__RealLiteral__Group__0();
 
             state._fsp--;
@@ -1011,20 +1011,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleIntLiteral"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:404:1: entryRuleIntLiteral : ruleIntLiteral EOF ;
+    // InternalBase.g:404:1: entryRuleIntLiteral : ruleIntLiteral EOF ;
     public final void entryRuleIntLiteral() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:405:1: ( ruleIntLiteral EOF )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:406:1: ruleIntLiteral EOF
+            // InternalBase.g:405:1: ( ruleIntLiteral EOF )
+            // InternalBase.g:406:1: ruleIntLiteral EOF
             {
              before(grammarAccess.getIntLiteralRule()); 
-            pushFollow(FOLLOW_ruleIntLiteral_in_entryRuleIntLiteral788);
+            pushFollow(FOLLOW_1);
             ruleIntLiteral();
 
             state._fsp--;
 
              after(grammarAccess.getIntLiteralRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIntLiteral795); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1041,23 +1041,23 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleIntLiteral"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:413:1: ruleIntLiteral : ( ( rule__IntLiteral__Group__0 ) ) ;
+    // InternalBase.g:413:1: ruleIntLiteral : ( ( rule__IntLiteral__Group__0 ) ) ;
     public final void ruleIntLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:417:2: ( ( ( rule__IntLiteral__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:418:1: ( ( rule__IntLiteral__Group__0 ) )
+            // InternalBase.g:417:2: ( ( ( rule__IntLiteral__Group__0 ) ) )
+            // InternalBase.g:418:1: ( ( rule__IntLiteral__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:418:1: ( ( rule__IntLiteral__Group__0 ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:419:1: ( rule__IntLiteral__Group__0 )
+            // InternalBase.g:418:1: ( ( rule__IntLiteral__Group__0 ) )
+            // InternalBase.g:419:1: ( rule__IntLiteral__Group__0 )
             {
              before(grammarAccess.getIntLiteralAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:420:1: ( rule__IntLiteral__Group__0 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:420:2: rule__IntLiteral__Group__0
+            // InternalBase.g:420:1: ( rule__IntLiteral__Group__0 )
+            // InternalBase.g:420:2: rule__IntLiteral__Group__0
             {
-            pushFollow(FOLLOW_rule__IntLiteral__Group__0_in_ruleIntLiteral821);
+            pushFollow(FOLLOW_2);
             rule__IntLiteral__Group__0();
 
             state._fsp--;
@@ -1088,20 +1088,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleStringLiteral"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:432:1: entryRuleStringLiteral : ruleStringLiteral EOF ;
+    // InternalBase.g:432:1: entryRuleStringLiteral : ruleStringLiteral EOF ;
     public final void entryRuleStringLiteral() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:433:1: ( ruleStringLiteral EOF )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:434:1: ruleStringLiteral EOF
+            // InternalBase.g:433:1: ( ruleStringLiteral EOF )
+            // InternalBase.g:434:1: ruleStringLiteral EOF
             {
              before(grammarAccess.getStringLiteralRule()); 
-            pushFollow(FOLLOW_ruleStringLiteral_in_entryRuleStringLiteral848);
+            pushFollow(FOLLOW_1);
             ruleStringLiteral();
 
             state._fsp--;
 
              after(grammarAccess.getStringLiteralRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleStringLiteral855); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1118,23 +1118,23 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleStringLiteral"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:441:1: ruleStringLiteral : ( ( rule__StringLiteral__Group__0 ) ) ;
+    // InternalBase.g:441:1: ruleStringLiteral : ( ( rule__StringLiteral__Group__0 ) ) ;
     public final void ruleStringLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:445:2: ( ( ( rule__StringLiteral__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:446:1: ( ( rule__StringLiteral__Group__0 ) )
+            // InternalBase.g:445:2: ( ( ( rule__StringLiteral__Group__0 ) ) )
+            // InternalBase.g:446:1: ( ( rule__StringLiteral__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:446:1: ( ( rule__StringLiteral__Group__0 ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:447:1: ( rule__StringLiteral__Group__0 )
+            // InternalBase.g:446:1: ( ( rule__StringLiteral__Group__0 ) )
+            // InternalBase.g:447:1: ( rule__StringLiteral__Group__0 )
             {
              before(grammarAccess.getStringLiteralAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:448:1: ( rule__StringLiteral__Group__0 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:448:2: rule__StringLiteral__Group__0
+            // InternalBase.g:448:1: ( rule__StringLiteral__Group__0 )
+            // InternalBase.g:448:2: rule__StringLiteral__Group__0
             {
-            pushFollow(FOLLOW_rule__StringLiteral__Group__0_in_ruleStringLiteral881);
+            pushFollow(FOLLOW_2);
             rule__StringLiteral__Group__0();
 
             state._fsp--;
@@ -1165,20 +1165,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleInteger"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:460:1: entryRuleInteger : ruleInteger EOF ;
+    // InternalBase.g:460:1: entryRuleInteger : ruleInteger EOF ;
     public final void entryRuleInteger() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:461:1: ( ruleInteger EOF )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:462:1: ruleInteger EOF
+            // InternalBase.g:461:1: ( ruleInteger EOF )
+            // InternalBase.g:462:1: ruleInteger EOF
             {
              before(grammarAccess.getIntegerRule()); 
-            pushFollow(FOLLOW_ruleInteger_in_entryRuleInteger908);
+            pushFollow(FOLLOW_1);
             ruleInteger();
 
             state._fsp--;
 
              after(grammarAccess.getIntegerRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleInteger915); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1195,23 +1195,23 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleInteger"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:469:1: ruleInteger : ( ( rule__Integer__Alternatives ) ) ;
+    // InternalBase.g:469:1: ruleInteger : ( ( rule__Integer__Alternatives ) ) ;
     public final void ruleInteger() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:473:2: ( ( ( rule__Integer__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:474:1: ( ( rule__Integer__Alternatives ) )
+            // InternalBase.g:473:2: ( ( ( rule__Integer__Alternatives ) ) )
+            // InternalBase.g:474:1: ( ( rule__Integer__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:474:1: ( ( rule__Integer__Alternatives ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:475:1: ( rule__Integer__Alternatives )
+            // InternalBase.g:474:1: ( ( rule__Integer__Alternatives ) )
+            // InternalBase.g:475:1: ( rule__Integer__Alternatives )
             {
              before(grammarAccess.getIntegerAccess().getAlternatives()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:476:1: ( rule__Integer__Alternatives )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:476:2: rule__Integer__Alternatives
+            // InternalBase.g:476:1: ( rule__Integer__Alternatives )
+            // InternalBase.g:476:2: rule__Integer__Alternatives
             {
-            pushFollow(FOLLOW_rule__Integer__Alternatives_in_ruleInteger941);
+            pushFollow(FOLLOW_2);
             rule__Integer__Alternatives();
 
             state._fsp--;
@@ -1242,20 +1242,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleReal"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:488:1: entryRuleReal : ruleReal EOF ;
+    // InternalBase.g:488:1: entryRuleReal : ruleReal EOF ;
     public final void entryRuleReal() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:489:1: ( ruleReal EOF )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:490:1: ruleReal EOF
+            // InternalBase.g:489:1: ( ruleReal EOF )
+            // InternalBase.g:490:1: ruleReal EOF
             {
              before(grammarAccess.getRealRule()); 
-            pushFollow(FOLLOW_ruleReal_in_entryRuleReal968);
+            pushFollow(FOLLOW_1);
             ruleReal();
 
             state._fsp--;
 
              after(grammarAccess.getRealRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleReal975); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1272,23 +1272,23 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleReal"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:497:1: ruleReal : ( ( rule__Real__Alternatives ) ) ;
+    // InternalBase.g:497:1: ruleReal : ( ( rule__Real__Alternatives ) ) ;
     public final void ruleReal() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:501:2: ( ( ( rule__Real__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:502:1: ( ( rule__Real__Alternatives ) )
+            // InternalBase.g:501:2: ( ( ( rule__Real__Alternatives ) ) )
+            // InternalBase.g:502:1: ( ( rule__Real__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:502:1: ( ( rule__Real__Alternatives ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:503:1: ( rule__Real__Alternatives )
+            // InternalBase.g:502:1: ( ( rule__Real__Alternatives ) )
+            // InternalBase.g:503:1: ( rule__Real__Alternatives )
             {
              before(grammarAccess.getRealAccess().getAlternatives()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:504:1: ( rule__Real__Alternatives )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:504:2: rule__Real__Alternatives
+            // InternalBase.g:504:1: ( rule__Real__Alternatives )
+            // InternalBase.g:504:2: rule__Real__Alternatives
             {
-            pushFollow(FOLLOW_rule__Real__Alternatives_in_ruleReal1001);
+            pushFollow(FOLLOW_2);
             rule__Real__Alternatives();
 
             state._fsp--;
@@ -1319,23 +1319,23 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleDecimal"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:516:1: entryRuleDecimal : ruleDecimal EOF ;
+    // InternalBase.g:516:1: entryRuleDecimal : ruleDecimal EOF ;
     public final void entryRuleDecimal() throws RecognitionException {
 
         	HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
 
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:520:1: ( ruleDecimal EOF )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:521:1: ruleDecimal EOF
+            // InternalBase.g:520:1: ( ruleDecimal EOF )
+            // InternalBase.g:521:1: ruleDecimal EOF
             {
              before(grammarAccess.getDecimalRule()); 
-            pushFollow(FOLLOW_ruleDecimal_in_entryRuleDecimal1033);
+            pushFollow(FOLLOW_1);
             ruleDecimal();
 
             state._fsp--;
 
              after(grammarAccess.getDecimalRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDecimal1040); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1355,24 +1355,24 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleDecimal"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:531:1: ruleDecimal : ( ( rule__Decimal__Group__0 ) ) ;
+    // InternalBase.g:531:1: ruleDecimal : ( ( rule__Decimal__Group__0 ) ) ;
     public final void ruleDecimal() throws RecognitionException {
 
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:536:2: ( ( ( rule__Decimal__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:537:1: ( ( rule__Decimal__Group__0 ) )
+            // InternalBase.g:536:2: ( ( ( rule__Decimal__Group__0 ) ) )
+            // InternalBase.g:537:1: ( ( rule__Decimal__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:537:1: ( ( rule__Decimal__Group__0 ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:538:1: ( rule__Decimal__Group__0 )
+            // InternalBase.g:537:1: ( ( rule__Decimal__Group__0 ) )
+            // InternalBase.g:538:1: ( rule__Decimal__Group__0 )
             {
              before(grammarAccess.getDecimalAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:539:1: ( rule__Decimal__Group__0 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:539:2: rule__Decimal__Group__0
+            // InternalBase.g:539:1: ( rule__Decimal__Group__0 )
+            // InternalBase.g:539:2: rule__Decimal__Group__0
             {
-            pushFollow(FOLLOW_rule__Decimal__Group__0_in_ruleDecimal1070);
+            pushFollow(FOLLOW_2);
             rule__Decimal__Group__0();
 
             state._fsp--;
@@ -1404,23 +1404,23 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleDecimalExp"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:552:1: entryRuleDecimalExp : ruleDecimalExp EOF ;
+    // InternalBase.g:552:1: entryRuleDecimalExp : ruleDecimalExp EOF ;
     public final void entryRuleDecimalExp() throws RecognitionException {
 
         	HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
 
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:556:1: ( ruleDecimalExp EOF )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:557:1: ruleDecimalExp EOF
+            // InternalBase.g:556:1: ( ruleDecimalExp EOF )
+            // InternalBase.g:557:1: ruleDecimalExp EOF
             {
              before(grammarAccess.getDecimalExpRule()); 
-            pushFollow(FOLLOW_ruleDecimalExp_in_entryRuleDecimalExp1102);
+            pushFollow(FOLLOW_1);
             ruleDecimalExp();
 
             state._fsp--;
 
              after(grammarAccess.getDecimalExpRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDecimalExp1109); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1440,24 +1440,24 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleDecimalExp"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:567:1: ruleDecimalExp : ( ( rule__DecimalExp__Group__0 ) ) ;
+    // InternalBase.g:567:1: ruleDecimalExp : ( ( rule__DecimalExp__Group__0 ) ) ;
     public final void ruleDecimalExp() throws RecognitionException {
 
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:572:2: ( ( ( rule__DecimalExp__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:573:1: ( ( rule__DecimalExp__Group__0 ) )
+            // InternalBase.g:572:2: ( ( ( rule__DecimalExp__Group__0 ) ) )
+            // InternalBase.g:573:1: ( ( rule__DecimalExp__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:573:1: ( ( rule__DecimalExp__Group__0 ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:574:1: ( rule__DecimalExp__Group__0 )
+            // InternalBase.g:573:1: ( ( rule__DecimalExp__Group__0 ) )
+            // InternalBase.g:574:1: ( rule__DecimalExp__Group__0 )
             {
              before(grammarAccess.getDecimalExpAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:575:1: ( rule__DecimalExp__Group__0 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:575:2: rule__DecimalExp__Group__0
+            // InternalBase.g:575:1: ( rule__DecimalExp__Group__0 )
+            // InternalBase.g:575:2: rule__DecimalExp__Group__0
             {
-            pushFollow(FOLLOW_rule__DecimalExp__Group__0_in_ruleDecimalExp1139);
+            pushFollow(FOLLOW_2);
             rule__DecimalExp__Group__0();
 
             state._fsp--;
@@ -1489,20 +1489,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleFQN"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:588:1: entryRuleFQN : ruleFQN EOF ;
+    // InternalBase.g:588:1: entryRuleFQN : ruleFQN EOF ;
     public final void entryRuleFQN() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:589:1: ( ruleFQN EOF )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:590:1: ruleFQN EOF
+            // InternalBase.g:589:1: ( ruleFQN EOF )
+            // InternalBase.g:590:1: ruleFQN EOF
             {
              before(grammarAccess.getFQNRule()); 
-            pushFollow(FOLLOW_ruleFQN_in_entryRuleFQN1166);
+            pushFollow(FOLLOW_1);
             ruleFQN();
 
             state._fsp--;
 
              after(grammarAccess.getFQNRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleFQN1173); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1519,23 +1519,23 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleFQN"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:597:1: ruleFQN : ( ( rule__FQN__Group__0 ) ) ;
+    // InternalBase.g:597:1: ruleFQN : ( ( rule__FQN__Group__0 ) ) ;
     public final void ruleFQN() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:601:2: ( ( ( rule__FQN__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:602:1: ( ( rule__FQN__Group__0 ) )
+            // InternalBase.g:601:2: ( ( ( rule__FQN__Group__0 ) ) )
+            // InternalBase.g:602:1: ( ( rule__FQN__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:602:1: ( ( rule__FQN__Group__0 ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:603:1: ( rule__FQN__Group__0 )
+            // InternalBase.g:602:1: ( ( rule__FQN__Group__0 ) )
+            // InternalBase.g:603:1: ( rule__FQN__Group__0 )
             {
              before(grammarAccess.getFQNAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:604:1: ( rule__FQN__Group__0 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:604:2: rule__FQN__Group__0
+            // InternalBase.g:604:1: ( rule__FQN__Group__0 )
+            // InternalBase.g:604:2: rule__FQN__Group__0
             {
-            pushFollow(FOLLOW_rule__FQN__Group__0_in_ruleFQN1199);
+            pushFollow(FOLLOW_2);
             rule__FQN__Group__0();
 
             state._fsp--;
@@ -1566,23 +1566,23 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleLiteralType"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:617:1: ruleLiteralType : ( ( rule__LiteralType__Alternatives ) ) ;
+    // InternalBase.g:617:1: ruleLiteralType : ( ( rule__LiteralType__Alternatives ) ) ;
     public final void ruleLiteralType() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:621:1: ( ( ( rule__LiteralType__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:622:1: ( ( rule__LiteralType__Alternatives ) )
+            // InternalBase.g:621:1: ( ( ( rule__LiteralType__Alternatives ) ) )
+            // InternalBase.g:622:1: ( ( rule__LiteralType__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:622:1: ( ( rule__LiteralType__Alternatives ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:623:1: ( rule__LiteralType__Alternatives )
+            // InternalBase.g:622:1: ( ( rule__LiteralType__Alternatives ) )
+            // InternalBase.g:623:1: ( rule__LiteralType__Alternatives )
             {
              before(grammarAccess.getLiteralTypeAccess().getAlternatives()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:624:1: ( rule__LiteralType__Alternatives )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:624:2: rule__LiteralType__Alternatives
+            // InternalBase.g:624:1: ( rule__LiteralType__Alternatives )
+            // InternalBase.g:624:2: rule__LiteralType__Alternatives
             {
-            pushFollow(FOLLOW_rule__LiteralType__Alternatives_in_ruleLiteralType1236);
+            pushFollow(FOLLOW_2);
             rule__LiteralType__Alternatives();
 
             state._fsp--;
@@ -1613,13 +1613,13 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AnnotationAttribute__Alternatives"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:636:1: rule__AnnotationAttribute__Alternatives : ( ( ruleSimpleAnnotationAttribute ) | ( ruleEnumAnnotationAttribute ) );
+    // InternalBase.g:636:1: rule__AnnotationAttribute__Alternatives : ( ( ruleSimpleAnnotationAttribute ) | ( ruleEnumAnnotationAttribute ) );
     public final void rule__AnnotationAttribute__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:640:1: ( ( ruleSimpleAnnotationAttribute ) | ( ruleEnumAnnotationAttribute ) )
+            // InternalBase.g:640:1: ( ( ruleSimpleAnnotationAttribute ) | ( ruleEnumAnnotationAttribute ) )
             int alt1=2;
             int LA1_0 = input.LA(1);
 
@@ -1723,13 +1723,13 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
             }
             switch (alt1) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:641:1: ( ruleSimpleAnnotationAttribute )
+                    // InternalBase.g:641:1: ( ruleSimpleAnnotationAttribute )
                     {
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:641:1: ( ruleSimpleAnnotationAttribute )
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:642:1: ruleSimpleAnnotationAttribute
+                    // InternalBase.g:641:1: ( ruleSimpleAnnotationAttribute )
+                    // InternalBase.g:642:1: ruleSimpleAnnotationAttribute
                     {
                      before(grammarAccess.getAnnotationAttributeAccess().getSimpleAnnotationAttributeParserRuleCall_0()); 
-                    pushFollow(FOLLOW_ruleSimpleAnnotationAttribute_in_rule__AnnotationAttribute__Alternatives1272);
+                    pushFollow(FOLLOW_2);
                     ruleSimpleAnnotationAttribute();
 
                     state._fsp--;
@@ -1742,13 +1742,13 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:647:6: ( ruleEnumAnnotationAttribute )
+                    // InternalBase.g:647:6: ( ruleEnumAnnotationAttribute )
                     {
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:647:6: ( ruleEnumAnnotationAttribute )
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:648:1: ruleEnumAnnotationAttribute
+                    // InternalBase.g:647:6: ( ruleEnumAnnotationAttribute )
+                    // InternalBase.g:648:1: ruleEnumAnnotationAttribute
                     {
                      before(grammarAccess.getAnnotationAttributeAccess().getEnumAnnotationAttributeParserRuleCall_1()); 
-                    pushFollow(FOLLOW_ruleEnumAnnotationAttribute_in_rule__AnnotationAttribute__Alternatives1289);
+                    pushFollow(FOLLOW_2);
                     ruleEnumAnnotationAttribute();
 
                     state._fsp--;
@@ -1778,13 +1778,13 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Alternatives_0"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:658:1: rule__SimpleAnnotationAttribute__Alternatives_0 : ( ( ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 ) ) | ( 'mandatory' ) );
+    // InternalBase.g:658:1: rule__SimpleAnnotationAttribute__Alternatives_0 : ( ( ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 ) ) | ( 'mandatory' ) );
     public final void rule__SimpleAnnotationAttribute__Alternatives_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:662:1: ( ( ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 ) ) | ( 'mandatory' ) )
+            // InternalBase.g:662:1: ( ( ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 ) ) | ( 'mandatory' ) )
             int alt2=2;
             int LA2_0 = input.LA(1);
 
@@ -1802,16 +1802,16 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
             }
             switch (alt2) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:663:1: ( ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 ) )
+                    // InternalBase.g:663:1: ( ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 ) )
                     {
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:663:1: ( ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 ) )
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:664:1: ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 )
+                    // InternalBase.g:663:1: ( ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 ) )
+                    // InternalBase.g:664:1: ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 )
                     {
                      before(grammarAccess.getSimpleAnnotationAttributeAccess().getOptionalAssignment_0_0()); 
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:665:1: ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 )
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:665:2: rule__SimpleAnnotationAttribute__OptionalAssignment_0_0
+                    // InternalBase.g:665:1: ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 )
+                    // InternalBase.g:665:2: rule__SimpleAnnotationAttribute__OptionalAssignment_0_0
                     {
-                    pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__OptionalAssignment_0_0_in_rule__SimpleAnnotationAttribute__Alternatives_01321);
+                    pushFollow(FOLLOW_2);
                     rule__SimpleAnnotationAttribute__OptionalAssignment_0_0();
 
                     state._fsp--;
@@ -1827,13 +1827,13 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:669:6: ( 'mandatory' )
+                    // InternalBase.g:669:6: ( 'mandatory' )
                     {
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:669:6: ( 'mandatory' )
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:670:1: 'mandatory'
+                    // InternalBase.g:669:6: ( 'mandatory' )
+                    // InternalBase.g:670:1: 'mandatory'
                     {
                      before(grammarAccess.getSimpleAnnotationAttributeAccess().getMandatoryKeyword_0_1()); 
-                    match(input,12,FOLLOW_12_in_rule__SimpleAnnotationAttribute__Alternatives_01340); 
+                    match(input,12,FOLLOW_2); 
                      after(grammarAccess.getSimpleAnnotationAttributeAccess().getMandatoryKeyword_0_1()); 
 
                     }
@@ -1859,13 +1859,13 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Alternatives_0"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:682:1: rule__EnumAnnotationAttribute__Alternatives_0 : ( ( ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 ) ) | ( 'mandatory' ) );
+    // InternalBase.g:682:1: rule__EnumAnnotationAttribute__Alternatives_0 : ( ( ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 ) ) | ( 'mandatory' ) );
     public final void rule__EnumAnnotationAttribute__Alternatives_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:686:1: ( ( ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 ) ) | ( 'mandatory' ) )
+            // InternalBase.g:686:1: ( ( ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 ) ) | ( 'mandatory' ) )
             int alt3=2;
             int LA3_0 = input.LA(1);
 
@@ -1883,16 +1883,16 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
             }
             switch (alt3) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:687:1: ( ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 ) )
+                    // InternalBase.g:687:1: ( ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 ) )
                     {
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:687:1: ( ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 ) )
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:688:1: ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 )
+                    // InternalBase.g:687:1: ( ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 ) )
+                    // InternalBase.g:688:1: ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 )
                     {
                      before(grammarAccess.getEnumAnnotationAttributeAccess().getOptionalAssignment_0_0()); 
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:689:1: ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 )
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:689:2: rule__EnumAnnotationAttribute__OptionalAssignment_0_0
+                    // InternalBase.g:689:1: ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 )
+                    // InternalBase.g:689:2: rule__EnumAnnotationAttribute__OptionalAssignment_0_0
                     {
-                    pushFollow(FOLLOW_rule__EnumAnnotationAttribute__OptionalAssignment_0_0_in_rule__EnumAnnotationAttribute__Alternatives_01374);
+                    pushFollow(FOLLOW_2);
                     rule__EnumAnnotationAttribute__OptionalAssignment_0_0();
 
                     state._fsp--;
@@ -1908,13 +1908,13 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:693:6: ( 'mandatory' )
+                    // InternalBase.g:693:6: ( 'mandatory' )
                     {
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:693:6: ( 'mandatory' )
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:694:1: 'mandatory'
+                    // InternalBase.g:693:6: ( 'mandatory' )
+                    // InternalBase.g:694:1: 'mandatory'
                     {
                      before(grammarAccess.getEnumAnnotationAttributeAccess().getMandatoryKeyword_0_1()); 
-                    match(input,12,FOLLOW_12_in_rule__EnumAnnotationAttribute__Alternatives_01393); 
+                    match(input,12,FOLLOW_2); 
                      after(grammarAccess.getEnumAnnotationAttributeAccess().getMandatoryKeyword_0_1()); 
 
                     }
@@ -1940,13 +1940,13 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Literal__Alternatives"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:708:1: rule__Literal__Alternatives : ( ( ruleBooleanLiteral ) | ( ruleNumberLiteral ) | ( ruleStringLiteral ) );
+    // InternalBase.g:708:1: rule__Literal__Alternatives : ( ( ruleBooleanLiteral ) | ( ruleNumberLiteral ) | ( ruleStringLiteral ) );
     public final void rule__Literal__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:712:1: ( ( ruleBooleanLiteral ) | ( ruleNumberLiteral ) | ( ruleStringLiteral ) )
+            // InternalBase.g:712:1: ( ( ruleBooleanLiteral ) | ( ruleNumberLiteral ) | ( ruleStringLiteral ) )
             int alt4=3;
             switch ( input.LA(1) ) {
             case 13:
@@ -1977,13 +1977,13 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
             switch (alt4) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:713:1: ( ruleBooleanLiteral )
+                    // InternalBase.g:713:1: ( ruleBooleanLiteral )
                     {
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:713:1: ( ruleBooleanLiteral )
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:714:1: ruleBooleanLiteral
+                    // InternalBase.g:713:1: ( ruleBooleanLiteral )
+                    // InternalBase.g:714:1: ruleBooleanLiteral
                     {
                      before(grammarAccess.getLiteralAccess().getBooleanLiteralParserRuleCall_0()); 
-                    pushFollow(FOLLOW_ruleBooleanLiteral_in_rule__Literal__Alternatives1429);
+                    pushFollow(FOLLOW_2);
                     ruleBooleanLiteral();
 
                     state._fsp--;
@@ -1996,13 +1996,13 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:719:6: ( ruleNumberLiteral )
+                    // InternalBase.g:719:6: ( ruleNumberLiteral )
                     {
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:719:6: ( ruleNumberLiteral )
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:720:1: ruleNumberLiteral
+                    // InternalBase.g:719:6: ( ruleNumberLiteral )
+                    // InternalBase.g:720:1: ruleNumberLiteral
                     {
                      before(grammarAccess.getLiteralAccess().getNumberLiteralParserRuleCall_1()); 
-                    pushFollow(FOLLOW_ruleNumberLiteral_in_rule__Literal__Alternatives1446);
+                    pushFollow(FOLLOW_2);
                     ruleNumberLiteral();
 
                     state._fsp--;
@@ -2015,13 +2015,13 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:725:6: ( ruleStringLiteral )
+                    // InternalBase.g:725:6: ( ruleStringLiteral )
                     {
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:725:6: ( ruleStringLiteral )
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:726:1: ruleStringLiteral
+                    // InternalBase.g:725:6: ( ruleStringLiteral )
+                    // InternalBase.g:726:1: ruleStringLiteral
                     {
                      before(grammarAccess.getLiteralAccess().getStringLiteralParserRuleCall_2()); 
-                    pushFollow(FOLLOW_ruleStringLiteral_in_rule__Literal__Alternatives1463);
+                    pushFollow(FOLLOW_2);
                     ruleStringLiteral();
 
                     state._fsp--;
@@ -2051,13 +2051,13 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__BooleanLiteral__Alternatives_1"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:736:1: rule__BooleanLiteral__Alternatives_1 : ( ( 'false' ) | ( ( rule__BooleanLiteral__IsTrueAssignment_1_1 ) ) );
+    // InternalBase.g:736:1: rule__BooleanLiteral__Alternatives_1 : ( ( 'false' ) | ( ( rule__BooleanLiteral__IsTrueAssignment_1_1 ) ) );
     public final void rule__BooleanLiteral__Alternatives_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:740:1: ( ( 'false' ) | ( ( rule__BooleanLiteral__IsTrueAssignment_1_1 ) ) )
+            // InternalBase.g:740:1: ( ( 'false' ) | ( ( rule__BooleanLiteral__IsTrueAssignment_1_1 ) ) )
             int alt5=2;
             int LA5_0 = input.LA(1);
 
@@ -2075,13 +2075,13 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
             }
             switch (alt5) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:741:1: ( 'false' )
+                    // InternalBase.g:741:1: ( 'false' )
                     {
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:741:1: ( 'false' )
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:742:1: 'false'
+                    // InternalBase.g:741:1: ( 'false' )
+                    // InternalBase.g:742:1: 'false'
                     {
                      before(grammarAccess.getBooleanLiteralAccess().getFalseKeyword_1_0()); 
-                    match(input,13,FOLLOW_13_in_rule__BooleanLiteral__Alternatives_11496); 
+                    match(input,13,FOLLOW_2); 
                      after(grammarAccess.getBooleanLiteralAccess().getFalseKeyword_1_0()); 
 
                     }
@@ -2090,16 +2090,16 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:749:6: ( ( rule__BooleanLiteral__IsTrueAssignment_1_1 ) )
+                    // InternalBase.g:749:6: ( ( rule__BooleanLiteral__IsTrueAssignment_1_1 ) )
                     {
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:749:6: ( ( rule__BooleanLiteral__IsTrueAssignment_1_1 ) )
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:750:1: ( rule__BooleanLiteral__IsTrueAssignment_1_1 )
+                    // InternalBase.g:749:6: ( ( rule__BooleanLiteral__IsTrueAssignment_1_1 ) )
+                    // InternalBase.g:750:1: ( rule__BooleanLiteral__IsTrueAssignment_1_1 )
                     {
                      before(grammarAccess.getBooleanLiteralAccess().getIsTrueAssignment_1_1()); 
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:751:1: ( rule__BooleanLiteral__IsTrueAssignment_1_1 )
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:751:2: rule__BooleanLiteral__IsTrueAssignment_1_1
+                    // InternalBase.g:751:1: ( rule__BooleanLiteral__IsTrueAssignment_1_1 )
+                    // InternalBase.g:751:2: rule__BooleanLiteral__IsTrueAssignment_1_1
                     {
-                    pushFollow(FOLLOW_rule__BooleanLiteral__IsTrueAssignment_1_1_in_rule__BooleanLiteral__Alternatives_11515);
+                    pushFollow(FOLLOW_2);
                     rule__BooleanLiteral__IsTrueAssignment_1_1();
 
                     state._fsp--;
@@ -2132,13 +2132,13 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NumberLiteral__Alternatives"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:760:1: rule__NumberLiteral__Alternatives : ( ( ruleIntLiteral ) | ( ruleRealLiteral ) );
+    // InternalBase.g:760:1: rule__NumberLiteral__Alternatives : ( ( ruleIntLiteral ) | ( ruleRealLiteral ) );
     public final void rule__NumberLiteral__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:764:1: ( ( ruleIntLiteral ) | ( ruleRealLiteral ) )
+            // InternalBase.g:764:1: ( ( ruleIntLiteral ) | ( ruleRealLiteral ) )
             int alt6=2;
             switch ( input.LA(1) ) {
             case 14:
@@ -2229,13 +2229,13 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
             switch (alt6) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:765:1: ( ruleIntLiteral )
+                    // InternalBase.g:765:1: ( ruleIntLiteral )
                     {
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:765:1: ( ruleIntLiteral )
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:766:1: ruleIntLiteral
+                    // InternalBase.g:765:1: ( ruleIntLiteral )
+                    // InternalBase.g:766:1: ruleIntLiteral
                     {
                      before(grammarAccess.getNumberLiteralAccess().getIntLiteralParserRuleCall_0()); 
-                    pushFollow(FOLLOW_ruleIntLiteral_in_rule__NumberLiteral__Alternatives1548);
+                    pushFollow(FOLLOW_2);
                     ruleIntLiteral();
 
                     state._fsp--;
@@ -2248,13 +2248,13 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:771:6: ( ruleRealLiteral )
+                    // InternalBase.g:771:6: ( ruleRealLiteral )
                     {
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:771:6: ( ruleRealLiteral )
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:772:1: ruleRealLiteral
+                    // InternalBase.g:771:6: ( ruleRealLiteral )
+                    // InternalBase.g:772:1: ruleRealLiteral
                     {
                      before(grammarAccess.getNumberLiteralAccess().getRealLiteralParserRuleCall_1()); 
-                    pushFollow(FOLLOW_ruleRealLiteral_in_rule__NumberLiteral__Alternatives1565);
+                    pushFollow(FOLLOW_2);
                     ruleRealLiteral();
 
                     state._fsp--;
@@ -2284,13 +2284,13 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Integer__Alternatives"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:782:1: rule__Integer__Alternatives : ( ( ( rule__Integer__Group_0__0 ) ) | ( RULE_HEX ) );
+    // InternalBase.g:782:1: rule__Integer__Alternatives : ( ( ( rule__Integer__Group_0__0 ) ) | ( RULE_HEX ) );
     public final void rule__Integer__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:786:1: ( ( ( rule__Integer__Group_0__0 ) ) | ( RULE_HEX ) )
+            // InternalBase.g:786:1: ( ( ( rule__Integer__Group_0__0 ) ) | ( RULE_HEX ) )
             int alt7=2;
             int LA7_0 = input.LA(1);
 
@@ -2308,16 +2308,16 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
             }
             switch (alt7) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:787:1: ( ( rule__Integer__Group_0__0 ) )
+                    // InternalBase.g:787:1: ( ( rule__Integer__Group_0__0 ) )
                     {
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:787:1: ( ( rule__Integer__Group_0__0 ) )
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:788:1: ( rule__Integer__Group_0__0 )
+                    // InternalBase.g:787:1: ( ( rule__Integer__Group_0__0 ) )
+                    // InternalBase.g:788:1: ( rule__Integer__Group_0__0 )
                     {
                      before(grammarAccess.getIntegerAccess().getGroup_0()); 
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:789:1: ( rule__Integer__Group_0__0 )
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:789:2: rule__Integer__Group_0__0
+                    // InternalBase.g:789:1: ( rule__Integer__Group_0__0 )
+                    // InternalBase.g:789:2: rule__Integer__Group_0__0
                     {
-                    pushFollow(FOLLOW_rule__Integer__Group_0__0_in_rule__Integer__Alternatives1597);
+                    pushFollow(FOLLOW_2);
                     rule__Integer__Group_0__0();
 
                     state._fsp--;
@@ -2333,13 +2333,13 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:793:6: ( RULE_HEX )
+                    // InternalBase.g:793:6: ( RULE_HEX )
                     {
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:793:6: ( RULE_HEX )
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:794:1: RULE_HEX
+                    // InternalBase.g:793:6: ( RULE_HEX )
+                    // InternalBase.g:794:1: RULE_HEX
                     {
                      before(grammarAccess.getIntegerAccess().getHEXTerminalRuleCall_1()); 
-                    match(input,RULE_HEX,FOLLOW_RULE_HEX_in_rule__Integer__Alternatives1615); 
+                    match(input,RULE_HEX,FOLLOW_2); 
                      after(grammarAccess.getIntegerAccess().getHEXTerminalRuleCall_1()); 
 
                     }
@@ -2365,13 +2365,13 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Integer__Alternatives_0_0"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:804:1: rule__Integer__Alternatives_0_0 : ( ( '+' ) | ( '-' ) );
+    // InternalBase.g:804:1: rule__Integer__Alternatives_0_0 : ( ( '+' ) | ( '-' ) );
     public final void rule__Integer__Alternatives_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:808:1: ( ( '+' ) | ( '-' ) )
+            // InternalBase.g:808:1: ( ( '+' ) | ( '-' ) )
             int alt8=2;
             int LA8_0 = input.LA(1);
 
@@ -2389,13 +2389,13 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
             }
             switch (alt8) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:809:1: ( '+' )
+                    // InternalBase.g:809:1: ( '+' )
                     {
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:809:1: ( '+' )
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:810:1: '+'
+                    // InternalBase.g:809:1: ( '+' )
+                    // InternalBase.g:810:1: '+'
                     {
                      before(grammarAccess.getIntegerAccess().getPlusSignKeyword_0_0_0()); 
-                    match(input,14,FOLLOW_14_in_rule__Integer__Alternatives_0_01648); 
+                    match(input,14,FOLLOW_2); 
                      after(grammarAccess.getIntegerAccess().getPlusSignKeyword_0_0_0()); 
 
                     }
@@ -2404,13 +2404,13 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:817:6: ( '-' )
+                    // InternalBase.g:817:6: ( '-' )
                     {
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:817:6: ( '-' )
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:818:1: '-'
+                    // InternalBase.g:817:6: ( '-' )
+                    // InternalBase.g:818:1: '-'
                     {
                      before(grammarAccess.getIntegerAccess().getHyphenMinusKeyword_0_0_1()); 
-                    match(input,15,FOLLOW_15_in_rule__Integer__Alternatives_0_01668); 
+                    match(input,15,FOLLOW_2); 
                      after(grammarAccess.getIntegerAccess().getHyphenMinusKeyword_0_0_1()); 
 
                     }
@@ -2436,13 +2436,13 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Real__Alternatives"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:830:1: rule__Real__Alternatives : ( ( ruleDecimal ) | ( ruleDecimalExp ) );
+    // InternalBase.g:830:1: rule__Real__Alternatives : ( ( ruleDecimal ) | ( ruleDecimalExp ) );
     public final void rule__Real__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:834:1: ( ( ruleDecimal ) | ( ruleDecimalExp ) )
+            // InternalBase.g:834:1: ( ( ruleDecimal ) | ( ruleDecimalExp ) )
             int alt9=2;
             switch ( input.LA(1) ) {
             case 14:
@@ -2588,13 +2588,13 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
             switch (alt9) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:835:1: ( ruleDecimal )
+                    // InternalBase.g:835:1: ( ruleDecimal )
                     {
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:835:1: ( ruleDecimal )
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:836:1: ruleDecimal
+                    // InternalBase.g:835:1: ( ruleDecimal )
+                    // InternalBase.g:836:1: ruleDecimal
                     {
                      before(grammarAccess.getRealAccess().getDecimalParserRuleCall_0()); 
-                    pushFollow(FOLLOW_ruleDecimal_in_rule__Real__Alternatives1702);
+                    pushFollow(FOLLOW_2);
                     ruleDecimal();
 
                     state._fsp--;
@@ -2607,13 +2607,13 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:841:6: ( ruleDecimalExp )
+                    // InternalBase.g:841:6: ( ruleDecimalExp )
                     {
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:841:6: ( ruleDecimalExp )
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:842:1: ruleDecimalExp
+                    // InternalBase.g:841:6: ( ruleDecimalExp )
+                    // InternalBase.g:842:1: ruleDecimalExp
                     {
                      before(grammarAccess.getRealAccess().getDecimalExpParserRuleCall_1()); 
-                    pushFollow(FOLLOW_ruleDecimalExp_in_rule__Real__Alternatives1719);
+                    pushFollow(FOLLOW_2);
                     ruleDecimalExp();
 
                     state._fsp--;
@@ -2643,13 +2643,13 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Decimal__Alternatives_0"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:852:1: rule__Decimal__Alternatives_0 : ( ( '+' ) | ( '-' ) );
+    // InternalBase.g:852:1: rule__Decimal__Alternatives_0 : ( ( '+' ) | ( '-' ) );
     public final void rule__Decimal__Alternatives_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:856:1: ( ( '+' ) | ( '-' ) )
+            // InternalBase.g:856:1: ( ( '+' ) | ( '-' ) )
             int alt10=2;
             int LA10_0 = input.LA(1);
 
@@ -2667,13 +2667,13 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
             }
             switch (alt10) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:857:1: ( '+' )
+                    // InternalBase.g:857:1: ( '+' )
                     {
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:857:1: ( '+' )
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:858:1: '+'
+                    // InternalBase.g:857:1: ( '+' )
+                    // InternalBase.g:858:1: '+'
                     {
                      before(grammarAccess.getDecimalAccess().getPlusSignKeyword_0_0()); 
-                    match(input,14,FOLLOW_14_in_rule__Decimal__Alternatives_01752); 
+                    match(input,14,FOLLOW_2); 
                      after(grammarAccess.getDecimalAccess().getPlusSignKeyword_0_0()); 
 
                     }
@@ -2682,13 +2682,13 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:865:6: ( '-' )
+                    // InternalBase.g:865:6: ( '-' )
                     {
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:865:6: ( '-' )
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:866:1: '-'
+                    // InternalBase.g:865:6: ( '-' )
+                    // InternalBase.g:866:1: '-'
                     {
                      before(grammarAccess.getDecimalAccess().getHyphenMinusKeyword_0_1()); 
-                    match(input,15,FOLLOW_15_in_rule__Decimal__Alternatives_01772); 
+                    match(input,15,FOLLOW_2); 
                      after(grammarAccess.getDecimalAccess().getHyphenMinusKeyword_0_1()); 
 
                     }
@@ -2714,13 +2714,13 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Alternatives_0"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:878:1: rule__DecimalExp__Alternatives_0 : ( ( '+' ) | ( '-' ) );
+    // InternalBase.g:878:1: rule__DecimalExp__Alternatives_0 : ( ( '+' ) | ( '-' ) );
     public final void rule__DecimalExp__Alternatives_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:882:1: ( ( '+' ) | ( '-' ) )
+            // InternalBase.g:882:1: ( ( '+' ) | ( '-' ) )
             int alt11=2;
             int LA11_0 = input.LA(1);
 
@@ -2738,13 +2738,13 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
             }
             switch (alt11) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:883:1: ( '+' )
+                    // InternalBase.g:883:1: ( '+' )
                     {
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:883:1: ( '+' )
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:884:1: '+'
+                    // InternalBase.g:883:1: ( '+' )
+                    // InternalBase.g:884:1: '+'
                     {
                      before(grammarAccess.getDecimalExpAccess().getPlusSignKeyword_0_0()); 
-                    match(input,14,FOLLOW_14_in_rule__DecimalExp__Alternatives_01807); 
+                    match(input,14,FOLLOW_2); 
                      after(grammarAccess.getDecimalExpAccess().getPlusSignKeyword_0_0()); 
 
                     }
@@ -2753,13 +2753,13 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:891:6: ( '-' )
+                    // InternalBase.g:891:6: ( '-' )
                     {
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:891:6: ( '-' )
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:892:1: '-'
+                    // InternalBase.g:891:6: ( '-' )
+                    // InternalBase.g:892:1: '-'
                     {
                      before(grammarAccess.getDecimalExpAccess().getHyphenMinusKeyword_0_1()); 
-                    match(input,15,FOLLOW_15_in_rule__DecimalExp__Alternatives_01827); 
+                    match(input,15,FOLLOW_2); 
                      after(grammarAccess.getDecimalExpAccess().getHyphenMinusKeyword_0_1()); 
 
                     }
@@ -2785,13 +2785,13 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Alternatives_4"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:904:1: rule__DecimalExp__Alternatives_4 : ( ( 'e' ) | ( 'E' ) );
+    // InternalBase.g:904:1: rule__DecimalExp__Alternatives_4 : ( ( 'e' ) | ( 'E' ) );
     public final void rule__DecimalExp__Alternatives_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:908:1: ( ( 'e' ) | ( 'E' ) )
+            // InternalBase.g:908:1: ( ( 'e' ) | ( 'E' ) )
             int alt12=2;
             int LA12_0 = input.LA(1);
 
@@ -2809,13 +2809,13 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
             }
             switch (alt12) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:909:1: ( 'e' )
+                    // InternalBase.g:909:1: ( 'e' )
                     {
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:909:1: ( 'e' )
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:910:1: 'e'
+                    // InternalBase.g:909:1: ( 'e' )
+                    // InternalBase.g:910:1: 'e'
                     {
                      before(grammarAccess.getDecimalExpAccess().getEKeyword_4_0()); 
-                    match(input,16,FOLLOW_16_in_rule__DecimalExp__Alternatives_41862); 
+                    match(input,16,FOLLOW_2); 
                      after(grammarAccess.getDecimalExpAccess().getEKeyword_4_0()); 
 
                     }
@@ -2824,13 +2824,13 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:917:6: ( 'E' )
+                    // InternalBase.g:917:6: ( 'E' )
                     {
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:917:6: ( 'E' )
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:918:1: 'E'
+                    // InternalBase.g:917:6: ( 'E' )
+                    // InternalBase.g:918:1: 'E'
                     {
                      before(grammarAccess.getDecimalExpAccess().getEKeyword_4_1()); 
-                    match(input,17,FOLLOW_17_in_rule__DecimalExp__Alternatives_41882); 
+                    match(input,17,FOLLOW_2); 
                      after(grammarAccess.getDecimalExpAccess().getEKeyword_4_1()); 
 
                     }
@@ -2856,13 +2856,13 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Alternatives_5"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:930:1: rule__DecimalExp__Alternatives_5 : ( ( '+' ) | ( '-' ) );
+    // InternalBase.g:930:1: rule__DecimalExp__Alternatives_5 : ( ( '+' ) | ( '-' ) );
     public final void rule__DecimalExp__Alternatives_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:934:1: ( ( '+' ) | ( '-' ) )
+            // InternalBase.g:934:1: ( ( '+' ) | ( '-' ) )
             int alt13=2;
             int LA13_0 = input.LA(1);
 
@@ -2880,13 +2880,13 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
             }
             switch (alt13) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:935:1: ( '+' )
+                    // InternalBase.g:935:1: ( '+' )
                     {
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:935:1: ( '+' )
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:936:1: '+'
+                    // InternalBase.g:935:1: ( '+' )
+                    // InternalBase.g:936:1: '+'
                     {
                      before(grammarAccess.getDecimalExpAccess().getPlusSignKeyword_5_0()); 
-                    match(input,14,FOLLOW_14_in_rule__DecimalExp__Alternatives_51917); 
+                    match(input,14,FOLLOW_2); 
                      after(grammarAccess.getDecimalExpAccess().getPlusSignKeyword_5_0()); 
 
                     }
@@ -2895,13 +2895,13 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:943:6: ( '-' )
+                    // InternalBase.g:943:6: ( '-' )
                     {
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:943:6: ( '-' )
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:944:1: '-'
+                    // InternalBase.g:943:6: ( '-' )
+                    // InternalBase.g:944:1: '-'
                     {
                      before(grammarAccess.getDecimalExpAccess().getHyphenMinusKeyword_5_1()); 
-                    match(input,15,FOLLOW_15_in_rule__DecimalExp__Alternatives_51937); 
+                    match(input,15,FOLLOW_2); 
                      after(grammarAccess.getDecimalExpAccess().getHyphenMinusKeyword_5_1()); 
 
                     }
@@ -2927,13 +2927,13 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__LiteralType__Alternatives"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:956:1: rule__LiteralType__Alternatives : ( ( ( 'ptBoolean' ) ) | ( ( 'ptInteger' ) ) | ( ( 'ptReal' ) ) | ( ( 'ptCharacter' ) ) );
+    // InternalBase.g:956:1: rule__LiteralType__Alternatives : ( ( ( 'ptBoolean' ) ) | ( ( 'ptInteger' ) ) | ( ( 'ptReal' ) ) | ( ( 'ptCharacter' ) ) );
     public final void rule__LiteralType__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:960:1: ( ( ( 'ptBoolean' ) ) | ( ( 'ptInteger' ) ) | ( ( 'ptReal' ) ) | ( ( 'ptCharacter' ) ) )
+            // InternalBase.g:960:1: ( ( ( 'ptBoolean' ) ) | ( ( 'ptInteger' ) ) | ( ( 'ptReal' ) ) | ( ( 'ptCharacter' ) ) )
             int alt14=4;
             switch ( input.LA(1) ) {
             case 18:
@@ -2965,16 +2965,16 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
             switch (alt14) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:961:1: ( ( 'ptBoolean' ) )
+                    // InternalBase.g:961:1: ( ( 'ptBoolean' ) )
                     {
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:961:1: ( ( 'ptBoolean' ) )
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:962:1: ( 'ptBoolean' )
+                    // InternalBase.g:961:1: ( ( 'ptBoolean' ) )
+                    // InternalBase.g:962:1: ( 'ptBoolean' )
                     {
                      before(grammarAccess.getLiteralTypeAccess().getBOOLEnumLiteralDeclaration_0()); 
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:963:1: ( 'ptBoolean' )
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:963:3: 'ptBoolean'
+                    // InternalBase.g:963:1: ( 'ptBoolean' )
+                    // InternalBase.g:963:3: 'ptBoolean'
                     {
-                    match(input,18,FOLLOW_18_in_rule__LiteralType__Alternatives1972); 
+                    match(input,18,FOLLOW_2); 
 
                     }
 
@@ -2986,16 +2986,16 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:968:6: ( ( 'ptInteger' ) )
+                    // InternalBase.g:968:6: ( ( 'ptInteger' ) )
                     {
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:968:6: ( ( 'ptInteger' ) )
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:969:1: ( 'ptInteger' )
+                    // InternalBase.g:968:6: ( ( 'ptInteger' ) )
+                    // InternalBase.g:969:1: ( 'ptInteger' )
                     {
                      before(grammarAccess.getLiteralTypeAccess().getINTEnumLiteralDeclaration_1()); 
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:970:1: ( 'ptInteger' )
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:970:3: 'ptInteger'
+                    // InternalBase.g:970:1: ( 'ptInteger' )
+                    // InternalBase.g:970:3: 'ptInteger'
                     {
-                    match(input,19,FOLLOW_19_in_rule__LiteralType__Alternatives1993); 
+                    match(input,19,FOLLOW_2); 
 
                     }
 
@@ -3007,16 +3007,16 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:975:6: ( ( 'ptReal' ) )
+                    // InternalBase.g:975:6: ( ( 'ptReal' ) )
                     {
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:975:6: ( ( 'ptReal' ) )
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:976:1: ( 'ptReal' )
+                    // InternalBase.g:975:6: ( ( 'ptReal' ) )
+                    // InternalBase.g:976:1: ( 'ptReal' )
                     {
                      before(grammarAccess.getLiteralTypeAccess().getREALEnumLiteralDeclaration_2()); 
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:977:1: ( 'ptReal' )
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:977:3: 'ptReal'
+                    // InternalBase.g:977:1: ( 'ptReal' )
+                    // InternalBase.g:977:3: 'ptReal'
                     {
-                    match(input,20,FOLLOW_20_in_rule__LiteralType__Alternatives2014); 
+                    match(input,20,FOLLOW_2); 
 
                     }
 
@@ -3028,16 +3028,16 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 4 :
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:982:6: ( ( 'ptCharacter' ) )
+                    // InternalBase.g:982:6: ( ( 'ptCharacter' ) )
                     {
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:982:6: ( ( 'ptCharacter' ) )
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:983:1: ( 'ptCharacter' )
+                    // InternalBase.g:982:6: ( ( 'ptCharacter' ) )
+                    // InternalBase.g:983:1: ( 'ptCharacter' )
                     {
                      before(grammarAccess.getLiteralTypeAccess().getCHAREnumLiteralDeclaration_3()); 
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:984:1: ( 'ptCharacter' )
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:984:3: 'ptCharacter'
+                    // InternalBase.g:984:1: ( 'ptCharacter' )
+                    // InternalBase.g:984:3: 'ptCharacter'
                     {
-                    match(input,21,FOLLOW_21_in_rule__LiteralType__Alternatives2035); 
+                    match(input,21,FOLLOW_2); 
 
                     }
 
@@ -3066,21 +3066,21 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Annotation__Group__0"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:996:1: rule__Annotation__Group__0 : rule__Annotation__Group__0__Impl rule__Annotation__Group__1 ;
+    // InternalBase.g:996:1: rule__Annotation__Group__0 : rule__Annotation__Group__0__Impl rule__Annotation__Group__1 ;
     public final void rule__Annotation__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1000:1: ( rule__Annotation__Group__0__Impl rule__Annotation__Group__1 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1001:2: rule__Annotation__Group__0__Impl rule__Annotation__Group__1
+            // InternalBase.g:1000:1: ( rule__Annotation__Group__0__Impl rule__Annotation__Group__1 )
+            // InternalBase.g:1001:2: rule__Annotation__Group__0__Impl rule__Annotation__Group__1
             {
-            pushFollow(FOLLOW_rule__Annotation__Group__0__Impl_in_rule__Annotation__Group__02068);
+            pushFollow(FOLLOW_3);
             rule__Annotation__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Annotation__Group__1_in_rule__Annotation__Group__02071);
+            pushFollow(FOLLOW_2);
             rule__Annotation__Group__1();
 
             state._fsp--;
@@ -3104,20 +3104,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Annotation__Group__0__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1008:1: rule__Annotation__Group__0__Impl : ( '@' ) ;
+    // InternalBase.g:1008:1: rule__Annotation__Group__0__Impl : ( '@' ) ;
     public final void rule__Annotation__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1012:1: ( ( '@' ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1013:1: ( '@' )
+            // InternalBase.g:1012:1: ( ( '@' ) )
+            // InternalBase.g:1013:1: ( '@' )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1013:1: ( '@' )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1014:1: '@'
+            // InternalBase.g:1013:1: ( '@' )
+            // InternalBase.g:1014:1: '@'
             {
              before(grammarAccess.getAnnotationAccess().getCommercialAtKeyword_0()); 
-            match(input,22,FOLLOW_22_in_rule__Annotation__Group__0__Impl2099); 
+            match(input,22,FOLLOW_2); 
              after(grammarAccess.getAnnotationAccess().getCommercialAtKeyword_0()); 
 
             }
@@ -3141,21 +3141,21 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Annotation__Group__1"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1027:1: rule__Annotation__Group__1 : rule__Annotation__Group__1__Impl rule__Annotation__Group__2 ;
+    // InternalBase.g:1027:1: rule__Annotation__Group__1 : rule__Annotation__Group__1__Impl rule__Annotation__Group__2 ;
     public final void rule__Annotation__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1031:1: ( rule__Annotation__Group__1__Impl rule__Annotation__Group__2 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1032:2: rule__Annotation__Group__1__Impl rule__Annotation__Group__2
+            // InternalBase.g:1031:1: ( rule__Annotation__Group__1__Impl rule__Annotation__Group__2 )
+            // InternalBase.g:1032:2: rule__Annotation__Group__1__Impl rule__Annotation__Group__2
             {
-            pushFollow(FOLLOW_rule__Annotation__Group__1__Impl_in_rule__Annotation__Group__12130);
+            pushFollow(FOLLOW_4);
             rule__Annotation__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Annotation__Group__2_in_rule__Annotation__Group__12133);
+            pushFollow(FOLLOW_2);
             rule__Annotation__Group__2();
 
             state._fsp--;
@@ -3179,23 +3179,23 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Annotation__Group__1__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1039:1: rule__Annotation__Group__1__Impl : ( ( rule__Annotation__TypeAssignment_1 ) ) ;
+    // InternalBase.g:1039:1: rule__Annotation__Group__1__Impl : ( ( rule__Annotation__TypeAssignment_1 ) ) ;
     public final void rule__Annotation__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1043:1: ( ( ( rule__Annotation__TypeAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1044:1: ( ( rule__Annotation__TypeAssignment_1 ) )
+            // InternalBase.g:1043:1: ( ( ( rule__Annotation__TypeAssignment_1 ) ) )
+            // InternalBase.g:1044:1: ( ( rule__Annotation__TypeAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1044:1: ( ( rule__Annotation__TypeAssignment_1 ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1045:1: ( rule__Annotation__TypeAssignment_1 )
+            // InternalBase.g:1044:1: ( ( rule__Annotation__TypeAssignment_1 ) )
+            // InternalBase.g:1045:1: ( rule__Annotation__TypeAssignment_1 )
             {
              before(grammarAccess.getAnnotationAccess().getTypeAssignment_1()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1046:1: ( rule__Annotation__TypeAssignment_1 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1046:2: rule__Annotation__TypeAssignment_1
+            // InternalBase.g:1046:1: ( rule__Annotation__TypeAssignment_1 )
+            // InternalBase.g:1046:2: rule__Annotation__TypeAssignment_1
             {
-            pushFollow(FOLLOW_rule__Annotation__TypeAssignment_1_in_rule__Annotation__Group__1__Impl2160);
+            pushFollow(FOLLOW_2);
             rule__Annotation__TypeAssignment_1();
 
             state._fsp--;
@@ -3226,16 +3226,16 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Annotation__Group__2"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1056:1: rule__Annotation__Group__2 : rule__Annotation__Group__2__Impl ;
+    // InternalBase.g:1056:1: rule__Annotation__Group__2 : rule__Annotation__Group__2__Impl ;
     public final void rule__Annotation__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1060:1: ( rule__Annotation__Group__2__Impl )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1061:2: rule__Annotation__Group__2__Impl
+            // InternalBase.g:1060:1: ( rule__Annotation__Group__2__Impl )
+            // InternalBase.g:1061:2: rule__Annotation__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__Annotation__Group__2__Impl_in_rule__Annotation__Group__22190);
+            pushFollow(FOLLOW_2);
             rule__Annotation__Group__2__Impl();
 
             state._fsp--;
@@ -3259,20 +3259,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Annotation__Group__2__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1067:1: rule__Annotation__Group__2__Impl : ( ( rule__Annotation__Group_2__0 )? ) ;
+    // InternalBase.g:1067:1: rule__Annotation__Group__2__Impl : ( ( rule__Annotation__Group_2__0 )? ) ;
     public final void rule__Annotation__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1071:1: ( ( ( rule__Annotation__Group_2__0 )? ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1072:1: ( ( rule__Annotation__Group_2__0 )? )
+            // InternalBase.g:1071:1: ( ( ( rule__Annotation__Group_2__0 )? ) )
+            // InternalBase.g:1072:1: ( ( rule__Annotation__Group_2__0 )? )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1072:1: ( ( rule__Annotation__Group_2__0 )? )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1073:1: ( rule__Annotation__Group_2__0 )?
+            // InternalBase.g:1072:1: ( ( rule__Annotation__Group_2__0 )? )
+            // InternalBase.g:1073:1: ( rule__Annotation__Group_2__0 )?
             {
              before(grammarAccess.getAnnotationAccess().getGroup_2()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1074:1: ( rule__Annotation__Group_2__0 )?
+            // InternalBase.g:1074:1: ( rule__Annotation__Group_2__0 )?
             int alt15=2;
             int LA15_0 = input.LA(1);
 
@@ -3281,9 +3281,9 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
             }
             switch (alt15) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1074:2: rule__Annotation__Group_2__0
+                    // InternalBase.g:1074:2: rule__Annotation__Group_2__0
                     {
-                    pushFollow(FOLLOW_rule__Annotation__Group_2__0_in_rule__Annotation__Group__2__Impl2217);
+                    pushFollow(FOLLOW_2);
                     rule__Annotation__Group_2__0();
 
                     state._fsp--;
@@ -3317,21 +3317,21 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Annotation__Group_2__0"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1090:1: rule__Annotation__Group_2__0 : rule__Annotation__Group_2__0__Impl rule__Annotation__Group_2__1 ;
+    // InternalBase.g:1090:1: rule__Annotation__Group_2__0 : rule__Annotation__Group_2__0__Impl rule__Annotation__Group_2__1 ;
     public final void rule__Annotation__Group_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1094:1: ( rule__Annotation__Group_2__0__Impl rule__Annotation__Group_2__1 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1095:2: rule__Annotation__Group_2__0__Impl rule__Annotation__Group_2__1
+            // InternalBase.g:1094:1: ( rule__Annotation__Group_2__0__Impl rule__Annotation__Group_2__1 )
+            // InternalBase.g:1095:2: rule__Annotation__Group_2__0__Impl rule__Annotation__Group_2__1
             {
-            pushFollow(FOLLOW_rule__Annotation__Group_2__0__Impl_in_rule__Annotation__Group_2__02254);
+            pushFollow(FOLLOW_3);
             rule__Annotation__Group_2__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Annotation__Group_2__1_in_rule__Annotation__Group_2__02257);
+            pushFollow(FOLLOW_2);
             rule__Annotation__Group_2__1();
 
             state._fsp--;
@@ -3355,20 +3355,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Annotation__Group_2__0__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1102:1: rule__Annotation__Group_2__0__Impl : ( '(' ) ;
+    // InternalBase.g:1102:1: rule__Annotation__Group_2__0__Impl : ( '(' ) ;
     public final void rule__Annotation__Group_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1106:1: ( ( '(' ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1107:1: ( '(' )
+            // InternalBase.g:1106:1: ( ( '(' ) )
+            // InternalBase.g:1107:1: ( '(' )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1107:1: ( '(' )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1108:1: '('
+            // InternalBase.g:1107:1: ( '(' )
+            // InternalBase.g:1108:1: '('
             {
              before(grammarAccess.getAnnotationAccess().getLeftParenthesisKeyword_2_0()); 
-            match(input,23,FOLLOW_23_in_rule__Annotation__Group_2__0__Impl2285); 
+            match(input,23,FOLLOW_2); 
              after(grammarAccess.getAnnotationAccess().getLeftParenthesisKeyword_2_0()); 
 
             }
@@ -3392,21 +3392,21 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Annotation__Group_2__1"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1121:1: rule__Annotation__Group_2__1 : rule__Annotation__Group_2__1__Impl rule__Annotation__Group_2__2 ;
+    // InternalBase.g:1121:1: rule__Annotation__Group_2__1 : rule__Annotation__Group_2__1__Impl rule__Annotation__Group_2__2 ;
     public final void rule__Annotation__Group_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1125:1: ( rule__Annotation__Group_2__1__Impl rule__Annotation__Group_2__2 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1126:2: rule__Annotation__Group_2__1__Impl rule__Annotation__Group_2__2
+            // InternalBase.g:1125:1: ( rule__Annotation__Group_2__1__Impl rule__Annotation__Group_2__2 )
+            // InternalBase.g:1126:2: rule__Annotation__Group_2__1__Impl rule__Annotation__Group_2__2
             {
-            pushFollow(FOLLOW_rule__Annotation__Group_2__1__Impl_in_rule__Annotation__Group_2__12316);
+            pushFollow(FOLLOW_5);
             rule__Annotation__Group_2__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Annotation__Group_2__2_in_rule__Annotation__Group_2__12319);
+            pushFollow(FOLLOW_2);
             rule__Annotation__Group_2__2();
 
             state._fsp--;
@@ -3430,23 +3430,23 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Annotation__Group_2__1__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1133:1: rule__Annotation__Group_2__1__Impl : ( ( rule__Annotation__AttributesAssignment_2_1 ) ) ;
+    // InternalBase.g:1133:1: rule__Annotation__Group_2__1__Impl : ( ( rule__Annotation__AttributesAssignment_2_1 ) ) ;
     public final void rule__Annotation__Group_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1137:1: ( ( ( rule__Annotation__AttributesAssignment_2_1 ) ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1138:1: ( ( rule__Annotation__AttributesAssignment_2_1 ) )
+            // InternalBase.g:1137:1: ( ( ( rule__Annotation__AttributesAssignment_2_1 ) ) )
+            // InternalBase.g:1138:1: ( ( rule__Annotation__AttributesAssignment_2_1 ) )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1138:1: ( ( rule__Annotation__AttributesAssignment_2_1 ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1139:1: ( rule__Annotation__AttributesAssignment_2_1 )
+            // InternalBase.g:1138:1: ( ( rule__Annotation__AttributesAssignment_2_1 ) )
+            // InternalBase.g:1139:1: ( rule__Annotation__AttributesAssignment_2_1 )
             {
              before(grammarAccess.getAnnotationAccess().getAttributesAssignment_2_1()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1140:1: ( rule__Annotation__AttributesAssignment_2_1 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1140:2: rule__Annotation__AttributesAssignment_2_1
+            // InternalBase.g:1140:1: ( rule__Annotation__AttributesAssignment_2_1 )
+            // InternalBase.g:1140:2: rule__Annotation__AttributesAssignment_2_1
             {
-            pushFollow(FOLLOW_rule__Annotation__AttributesAssignment_2_1_in_rule__Annotation__Group_2__1__Impl2346);
+            pushFollow(FOLLOW_2);
             rule__Annotation__AttributesAssignment_2_1();
 
             state._fsp--;
@@ -3477,21 +3477,21 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Annotation__Group_2__2"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1150:1: rule__Annotation__Group_2__2 : rule__Annotation__Group_2__2__Impl rule__Annotation__Group_2__3 ;
+    // InternalBase.g:1150:1: rule__Annotation__Group_2__2 : rule__Annotation__Group_2__2__Impl rule__Annotation__Group_2__3 ;
     public final void rule__Annotation__Group_2__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1154:1: ( rule__Annotation__Group_2__2__Impl rule__Annotation__Group_2__3 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1155:2: rule__Annotation__Group_2__2__Impl rule__Annotation__Group_2__3
+            // InternalBase.g:1154:1: ( rule__Annotation__Group_2__2__Impl rule__Annotation__Group_2__3 )
+            // InternalBase.g:1155:2: rule__Annotation__Group_2__2__Impl rule__Annotation__Group_2__3
             {
-            pushFollow(FOLLOW_rule__Annotation__Group_2__2__Impl_in_rule__Annotation__Group_2__22376);
+            pushFollow(FOLLOW_5);
             rule__Annotation__Group_2__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Annotation__Group_2__3_in_rule__Annotation__Group_2__22379);
+            pushFollow(FOLLOW_2);
             rule__Annotation__Group_2__3();
 
             state._fsp--;
@@ -3515,20 +3515,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Annotation__Group_2__2__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1162:1: rule__Annotation__Group_2__2__Impl : ( ( rule__Annotation__Group_2_2__0 )* ) ;
+    // InternalBase.g:1162:1: rule__Annotation__Group_2__2__Impl : ( ( rule__Annotation__Group_2_2__0 )* ) ;
     public final void rule__Annotation__Group_2__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1166:1: ( ( ( rule__Annotation__Group_2_2__0 )* ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1167:1: ( ( rule__Annotation__Group_2_2__0 )* )
+            // InternalBase.g:1166:1: ( ( ( rule__Annotation__Group_2_2__0 )* ) )
+            // InternalBase.g:1167:1: ( ( rule__Annotation__Group_2_2__0 )* )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1167:1: ( ( rule__Annotation__Group_2_2__0 )* )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1168:1: ( rule__Annotation__Group_2_2__0 )*
+            // InternalBase.g:1167:1: ( ( rule__Annotation__Group_2_2__0 )* )
+            // InternalBase.g:1168:1: ( rule__Annotation__Group_2_2__0 )*
             {
              before(grammarAccess.getAnnotationAccess().getGroup_2_2()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1169:1: ( rule__Annotation__Group_2_2__0 )*
+            // InternalBase.g:1169:1: ( rule__Annotation__Group_2_2__0 )*
             loop16:
             do {
                 int alt16=2;
@@ -3541,9 +3541,9 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
                 switch (alt16) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1169:2: rule__Annotation__Group_2_2__0
+            	    // InternalBase.g:1169:2: rule__Annotation__Group_2_2__0
             	    {
-            	    pushFollow(FOLLOW_rule__Annotation__Group_2_2__0_in_rule__Annotation__Group_2__2__Impl2406);
+            	    pushFollow(FOLLOW_6);
             	    rule__Annotation__Group_2_2__0();
 
             	    state._fsp--;
@@ -3580,16 +3580,16 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Annotation__Group_2__3"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1179:1: rule__Annotation__Group_2__3 : rule__Annotation__Group_2__3__Impl ;
+    // InternalBase.g:1179:1: rule__Annotation__Group_2__3 : rule__Annotation__Group_2__3__Impl ;
     public final void rule__Annotation__Group_2__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1183:1: ( rule__Annotation__Group_2__3__Impl )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1184:2: rule__Annotation__Group_2__3__Impl
+            // InternalBase.g:1183:1: ( rule__Annotation__Group_2__3__Impl )
+            // InternalBase.g:1184:2: rule__Annotation__Group_2__3__Impl
             {
-            pushFollow(FOLLOW_rule__Annotation__Group_2__3__Impl_in_rule__Annotation__Group_2__32437);
+            pushFollow(FOLLOW_2);
             rule__Annotation__Group_2__3__Impl();
 
             state._fsp--;
@@ -3613,20 +3613,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Annotation__Group_2__3__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1190:1: rule__Annotation__Group_2__3__Impl : ( ')' ) ;
+    // InternalBase.g:1190:1: rule__Annotation__Group_2__3__Impl : ( ')' ) ;
     public final void rule__Annotation__Group_2__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1194:1: ( ( ')' ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1195:1: ( ')' )
+            // InternalBase.g:1194:1: ( ( ')' ) )
+            // InternalBase.g:1195:1: ( ')' )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1195:1: ( ')' )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1196:1: ')'
+            // InternalBase.g:1195:1: ( ')' )
+            // InternalBase.g:1196:1: ')'
             {
              before(grammarAccess.getAnnotationAccess().getRightParenthesisKeyword_2_3()); 
-            match(input,24,FOLLOW_24_in_rule__Annotation__Group_2__3__Impl2465); 
+            match(input,24,FOLLOW_2); 
              after(grammarAccess.getAnnotationAccess().getRightParenthesisKeyword_2_3()); 
 
             }
@@ -3650,21 +3650,21 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Annotation__Group_2_2__0"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1217:1: rule__Annotation__Group_2_2__0 : rule__Annotation__Group_2_2__0__Impl rule__Annotation__Group_2_2__1 ;
+    // InternalBase.g:1217:1: rule__Annotation__Group_2_2__0 : rule__Annotation__Group_2_2__0__Impl rule__Annotation__Group_2_2__1 ;
     public final void rule__Annotation__Group_2_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1221:1: ( rule__Annotation__Group_2_2__0__Impl rule__Annotation__Group_2_2__1 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1222:2: rule__Annotation__Group_2_2__0__Impl rule__Annotation__Group_2_2__1
+            // InternalBase.g:1221:1: ( rule__Annotation__Group_2_2__0__Impl rule__Annotation__Group_2_2__1 )
+            // InternalBase.g:1222:2: rule__Annotation__Group_2_2__0__Impl rule__Annotation__Group_2_2__1
             {
-            pushFollow(FOLLOW_rule__Annotation__Group_2_2__0__Impl_in_rule__Annotation__Group_2_2__02504);
+            pushFollow(FOLLOW_3);
             rule__Annotation__Group_2_2__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Annotation__Group_2_2__1_in_rule__Annotation__Group_2_2__02507);
+            pushFollow(FOLLOW_2);
             rule__Annotation__Group_2_2__1();
 
             state._fsp--;
@@ -3688,20 +3688,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Annotation__Group_2_2__0__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1229:1: rule__Annotation__Group_2_2__0__Impl : ( ',' ) ;
+    // InternalBase.g:1229:1: rule__Annotation__Group_2_2__0__Impl : ( ',' ) ;
     public final void rule__Annotation__Group_2_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1233:1: ( ( ',' ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1234:1: ( ',' )
+            // InternalBase.g:1233:1: ( ( ',' ) )
+            // InternalBase.g:1234:1: ( ',' )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1234:1: ( ',' )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1235:1: ','
+            // InternalBase.g:1234:1: ( ',' )
+            // InternalBase.g:1235:1: ','
             {
              before(grammarAccess.getAnnotationAccess().getCommaKeyword_2_2_0()); 
-            match(input,25,FOLLOW_25_in_rule__Annotation__Group_2_2__0__Impl2535); 
+            match(input,25,FOLLOW_2); 
              after(grammarAccess.getAnnotationAccess().getCommaKeyword_2_2_0()); 
 
             }
@@ -3725,16 +3725,16 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Annotation__Group_2_2__1"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1248:1: rule__Annotation__Group_2_2__1 : rule__Annotation__Group_2_2__1__Impl ;
+    // InternalBase.g:1248:1: rule__Annotation__Group_2_2__1 : rule__Annotation__Group_2_2__1__Impl ;
     public final void rule__Annotation__Group_2_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1252:1: ( rule__Annotation__Group_2_2__1__Impl )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1253:2: rule__Annotation__Group_2_2__1__Impl
+            // InternalBase.g:1252:1: ( rule__Annotation__Group_2_2__1__Impl )
+            // InternalBase.g:1253:2: rule__Annotation__Group_2_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__Annotation__Group_2_2__1__Impl_in_rule__Annotation__Group_2_2__12566);
+            pushFollow(FOLLOW_2);
             rule__Annotation__Group_2_2__1__Impl();
 
             state._fsp--;
@@ -3758,23 +3758,23 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Annotation__Group_2_2__1__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1259:1: rule__Annotation__Group_2_2__1__Impl : ( ( rule__Annotation__AttributesAssignment_2_2_1 ) ) ;
+    // InternalBase.g:1259:1: rule__Annotation__Group_2_2__1__Impl : ( ( rule__Annotation__AttributesAssignment_2_2_1 ) ) ;
     public final void rule__Annotation__Group_2_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1263:1: ( ( ( rule__Annotation__AttributesAssignment_2_2_1 ) ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1264:1: ( ( rule__Annotation__AttributesAssignment_2_2_1 ) )
+            // InternalBase.g:1263:1: ( ( ( rule__Annotation__AttributesAssignment_2_2_1 ) ) )
+            // InternalBase.g:1264:1: ( ( rule__Annotation__AttributesAssignment_2_2_1 ) )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1264:1: ( ( rule__Annotation__AttributesAssignment_2_2_1 ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1265:1: ( rule__Annotation__AttributesAssignment_2_2_1 )
+            // InternalBase.g:1264:1: ( ( rule__Annotation__AttributesAssignment_2_2_1 ) )
+            // InternalBase.g:1265:1: ( rule__Annotation__AttributesAssignment_2_2_1 )
             {
              before(grammarAccess.getAnnotationAccess().getAttributesAssignment_2_2_1()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1266:1: ( rule__Annotation__AttributesAssignment_2_2_1 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1266:2: rule__Annotation__AttributesAssignment_2_2_1
+            // InternalBase.g:1266:1: ( rule__Annotation__AttributesAssignment_2_2_1 )
+            // InternalBase.g:1266:2: rule__Annotation__AttributesAssignment_2_2_1
             {
-            pushFollow(FOLLOW_rule__Annotation__AttributesAssignment_2_2_1_in_rule__Annotation__Group_2_2__1__Impl2593);
+            pushFollow(FOLLOW_2);
             rule__Annotation__AttributesAssignment_2_2_1();
 
             state._fsp--;
@@ -3805,21 +3805,21 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__KeyValue__Group__0"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1280:1: rule__KeyValue__Group__0 : rule__KeyValue__Group__0__Impl rule__KeyValue__Group__1 ;
+    // InternalBase.g:1280:1: rule__KeyValue__Group__0 : rule__KeyValue__Group__0__Impl rule__KeyValue__Group__1 ;
     public final void rule__KeyValue__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1284:1: ( rule__KeyValue__Group__0__Impl rule__KeyValue__Group__1 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1285:2: rule__KeyValue__Group__0__Impl rule__KeyValue__Group__1
+            // InternalBase.g:1284:1: ( rule__KeyValue__Group__0__Impl rule__KeyValue__Group__1 )
+            // InternalBase.g:1285:2: rule__KeyValue__Group__0__Impl rule__KeyValue__Group__1
             {
-            pushFollow(FOLLOW_rule__KeyValue__Group__0__Impl_in_rule__KeyValue__Group__02627);
+            pushFollow(FOLLOW_7);
             rule__KeyValue__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__KeyValue__Group__1_in_rule__KeyValue__Group__02630);
+            pushFollow(FOLLOW_2);
             rule__KeyValue__Group__1();
 
             state._fsp--;
@@ -3843,23 +3843,23 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__KeyValue__Group__0__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1292:1: rule__KeyValue__Group__0__Impl : ( ( rule__KeyValue__KeyAssignment_0 ) ) ;
+    // InternalBase.g:1292:1: rule__KeyValue__Group__0__Impl : ( ( rule__KeyValue__KeyAssignment_0 ) ) ;
     public final void rule__KeyValue__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1296:1: ( ( ( rule__KeyValue__KeyAssignment_0 ) ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1297:1: ( ( rule__KeyValue__KeyAssignment_0 ) )
+            // InternalBase.g:1296:1: ( ( ( rule__KeyValue__KeyAssignment_0 ) ) )
+            // InternalBase.g:1297:1: ( ( rule__KeyValue__KeyAssignment_0 ) )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1297:1: ( ( rule__KeyValue__KeyAssignment_0 ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1298:1: ( rule__KeyValue__KeyAssignment_0 )
+            // InternalBase.g:1297:1: ( ( rule__KeyValue__KeyAssignment_0 ) )
+            // InternalBase.g:1298:1: ( rule__KeyValue__KeyAssignment_0 )
             {
              before(grammarAccess.getKeyValueAccess().getKeyAssignment_0()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1299:1: ( rule__KeyValue__KeyAssignment_0 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1299:2: rule__KeyValue__KeyAssignment_0
+            // InternalBase.g:1299:1: ( rule__KeyValue__KeyAssignment_0 )
+            // InternalBase.g:1299:2: rule__KeyValue__KeyAssignment_0
             {
-            pushFollow(FOLLOW_rule__KeyValue__KeyAssignment_0_in_rule__KeyValue__Group__0__Impl2657);
+            pushFollow(FOLLOW_2);
             rule__KeyValue__KeyAssignment_0();
 
             state._fsp--;
@@ -3890,21 +3890,21 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__KeyValue__Group__1"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1309:1: rule__KeyValue__Group__1 : rule__KeyValue__Group__1__Impl rule__KeyValue__Group__2 ;
+    // InternalBase.g:1309:1: rule__KeyValue__Group__1 : rule__KeyValue__Group__1__Impl rule__KeyValue__Group__2 ;
     public final void rule__KeyValue__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1313:1: ( rule__KeyValue__Group__1__Impl rule__KeyValue__Group__2 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1314:2: rule__KeyValue__Group__1__Impl rule__KeyValue__Group__2
+            // InternalBase.g:1313:1: ( rule__KeyValue__Group__1__Impl rule__KeyValue__Group__2 )
+            // InternalBase.g:1314:2: rule__KeyValue__Group__1__Impl rule__KeyValue__Group__2
             {
-            pushFollow(FOLLOW_rule__KeyValue__Group__1__Impl_in_rule__KeyValue__Group__12687);
+            pushFollow(FOLLOW_8);
             rule__KeyValue__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__KeyValue__Group__2_in_rule__KeyValue__Group__12690);
+            pushFollow(FOLLOW_2);
             rule__KeyValue__Group__2();
 
             state._fsp--;
@@ -3928,20 +3928,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__KeyValue__Group__1__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1321:1: rule__KeyValue__Group__1__Impl : ( '=' ) ;
+    // InternalBase.g:1321:1: rule__KeyValue__Group__1__Impl : ( '=' ) ;
     public final void rule__KeyValue__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1325:1: ( ( '=' ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1326:1: ( '=' )
+            // InternalBase.g:1325:1: ( ( '=' ) )
+            // InternalBase.g:1326:1: ( '=' )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1326:1: ( '=' )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1327:1: '='
+            // InternalBase.g:1326:1: ( '=' )
+            // InternalBase.g:1327:1: '='
             {
              before(grammarAccess.getKeyValueAccess().getEqualsSignKeyword_1()); 
-            match(input,26,FOLLOW_26_in_rule__KeyValue__Group__1__Impl2718); 
+            match(input,26,FOLLOW_2); 
              after(grammarAccess.getKeyValueAccess().getEqualsSignKeyword_1()); 
 
             }
@@ -3965,16 +3965,16 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__KeyValue__Group__2"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1340:1: rule__KeyValue__Group__2 : rule__KeyValue__Group__2__Impl ;
+    // InternalBase.g:1340:1: rule__KeyValue__Group__2 : rule__KeyValue__Group__2__Impl ;
     public final void rule__KeyValue__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1344:1: ( rule__KeyValue__Group__2__Impl )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1345:2: rule__KeyValue__Group__2__Impl
+            // InternalBase.g:1344:1: ( rule__KeyValue__Group__2__Impl )
+            // InternalBase.g:1345:2: rule__KeyValue__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__KeyValue__Group__2__Impl_in_rule__KeyValue__Group__22749);
+            pushFollow(FOLLOW_2);
             rule__KeyValue__Group__2__Impl();
 
             state._fsp--;
@@ -3998,23 +3998,23 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__KeyValue__Group__2__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1351:1: rule__KeyValue__Group__2__Impl : ( ( rule__KeyValue__ValueAssignment_2 ) ) ;
+    // InternalBase.g:1351:1: rule__KeyValue__Group__2__Impl : ( ( rule__KeyValue__ValueAssignment_2 ) ) ;
     public final void rule__KeyValue__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1355:1: ( ( ( rule__KeyValue__ValueAssignment_2 ) ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1356:1: ( ( rule__KeyValue__ValueAssignment_2 ) )
+            // InternalBase.g:1355:1: ( ( ( rule__KeyValue__ValueAssignment_2 ) ) )
+            // InternalBase.g:1356:1: ( ( rule__KeyValue__ValueAssignment_2 ) )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1356:1: ( ( rule__KeyValue__ValueAssignment_2 ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1357:1: ( rule__KeyValue__ValueAssignment_2 )
+            // InternalBase.g:1356:1: ( ( rule__KeyValue__ValueAssignment_2 ) )
+            // InternalBase.g:1357:1: ( rule__KeyValue__ValueAssignment_2 )
             {
              before(grammarAccess.getKeyValueAccess().getValueAssignment_2()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1358:1: ( rule__KeyValue__ValueAssignment_2 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1358:2: rule__KeyValue__ValueAssignment_2
+            // InternalBase.g:1358:1: ( rule__KeyValue__ValueAssignment_2 )
+            // InternalBase.g:1358:2: rule__KeyValue__ValueAssignment_2
             {
-            pushFollow(FOLLOW_rule__KeyValue__ValueAssignment_2_in_rule__KeyValue__Group__2__Impl2776);
+            pushFollow(FOLLOW_2);
             rule__KeyValue__ValueAssignment_2();
 
             state._fsp--;
@@ -4045,21 +4045,21 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__0"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1377:1: rule__SimpleAnnotationAttribute__Group__0 : rule__SimpleAnnotationAttribute__Group__0__Impl rule__SimpleAnnotationAttribute__Group__1 ;
+    // InternalBase.g:1377:1: rule__SimpleAnnotationAttribute__Group__0 : rule__SimpleAnnotationAttribute__Group__0__Impl rule__SimpleAnnotationAttribute__Group__1 ;
     public final void rule__SimpleAnnotationAttribute__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1381:1: ( rule__SimpleAnnotationAttribute__Group__0__Impl rule__SimpleAnnotationAttribute__Group__1 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1382:2: rule__SimpleAnnotationAttribute__Group__0__Impl rule__SimpleAnnotationAttribute__Group__1
+            // InternalBase.g:1381:1: ( rule__SimpleAnnotationAttribute__Group__0__Impl rule__SimpleAnnotationAttribute__Group__1 )
+            // InternalBase.g:1382:2: rule__SimpleAnnotationAttribute__Group__0__Impl rule__SimpleAnnotationAttribute__Group__1
             {
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__0__Impl_in_rule__SimpleAnnotationAttribute__Group__02815);
+            pushFollow(FOLLOW_9);
             rule__SimpleAnnotationAttribute__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__1_in_rule__SimpleAnnotationAttribute__Group__02818);
+            pushFollow(FOLLOW_2);
             rule__SimpleAnnotationAttribute__Group__1();
 
             state._fsp--;
@@ -4083,23 +4083,23 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__0__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1389:1: rule__SimpleAnnotationAttribute__Group__0__Impl : ( ( rule__SimpleAnnotationAttribute__Alternatives_0 ) ) ;
+    // InternalBase.g:1389:1: rule__SimpleAnnotationAttribute__Group__0__Impl : ( ( rule__SimpleAnnotationAttribute__Alternatives_0 ) ) ;
     public final void rule__SimpleAnnotationAttribute__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1393:1: ( ( ( rule__SimpleAnnotationAttribute__Alternatives_0 ) ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1394:1: ( ( rule__SimpleAnnotationAttribute__Alternatives_0 ) )
+            // InternalBase.g:1393:1: ( ( ( rule__SimpleAnnotationAttribute__Alternatives_0 ) ) )
+            // InternalBase.g:1394:1: ( ( rule__SimpleAnnotationAttribute__Alternatives_0 ) )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1394:1: ( ( rule__SimpleAnnotationAttribute__Alternatives_0 ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1395:1: ( rule__SimpleAnnotationAttribute__Alternatives_0 )
+            // InternalBase.g:1394:1: ( ( rule__SimpleAnnotationAttribute__Alternatives_0 ) )
+            // InternalBase.g:1395:1: ( rule__SimpleAnnotationAttribute__Alternatives_0 )
             {
              before(grammarAccess.getSimpleAnnotationAttributeAccess().getAlternatives_0()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1396:1: ( rule__SimpleAnnotationAttribute__Alternatives_0 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1396:2: rule__SimpleAnnotationAttribute__Alternatives_0
+            // InternalBase.g:1396:1: ( rule__SimpleAnnotationAttribute__Alternatives_0 )
+            // InternalBase.g:1396:2: rule__SimpleAnnotationAttribute__Alternatives_0
             {
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Alternatives_0_in_rule__SimpleAnnotationAttribute__Group__0__Impl2845);
+            pushFollow(FOLLOW_2);
             rule__SimpleAnnotationAttribute__Alternatives_0();
 
             state._fsp--;
@@ -4130,21 +4130,21 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__1"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1406:1: rule__SimpleAnnotationAttribute__Group__1 : rule__SimpleAnnotationAttribute__Group__1__Impl rule__SimpleAnnotationAttribute__Group__2 ;
+    // InternalBase.g:1406:1: rule__SimpleAnnotationAttribute__Group__1 : rule__SimpleAnnotationAttribute__Group__1__Impl rule__SimpleAnnotationAttribute__Group__2 ;
     public final void rule__SimpleAnnotationAttribute__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1410:1: ( rule__SimpleAnnotationAttribute__Group__1__Impl rule__SimpleAnnotationAttribute__Group__2 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1411:2: rule__SimpleAnnotationAttribute__Group__1__Impl rule__SimpleAnnotationAttribute__Group__2
+            // InternalBase.g:1410:1: ( rule__SimpleAnnotationAttribute__Group__1__Impl rule__SimpleAnnotationAttribute__Group__2 )
+            // InternalBase.g:1411:2: rule__SimpleAnnotationAttribute__Group__1__Impl rule__SimpleAnnotationAttribute__Group__2
             {
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__1__Impl_in_rule__SimpleAnnotationAttribute__Group__12875);
+            pushFollow(FOLLOW_3);
             rule__SimpleAnnotationAttribute__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__2_in_rule__SimpleAnnotationAttribute__Group__12878);
+            pushFollow(FOLLOW_2);
             rule__SimpleAnnotationAttribute__Group__2();
 
             state._fsp--;
@@ -4168,20 +4168,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__1__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1418:1: rule__SimpleAnnotationAttribute__Group__1__Impl : ( 'attribute' ) ;
+    // InternalBase.g:1418:1: rule__SimpleAnnotationAttribute__Group__1__Impl : ( 'attribute' ) ;
     public final void rule__SimpleAnnotationAttribute__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1422:1: ( ( 'attribute' ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1423:1: ( 'attribute' )
+            // InternalBase.g:1422:1: ( ( 'attribute' ) )
+            // InternalBase.g:1423:1: ( 'attribute' )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1423:1: ( 'attribute' )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1424:1: 'attribute'
+            // InternalBase.g:1423:1: ( 'attribute' )
+            // InternalBase.g:1424:1: 'attribute'
             {
              before(grammarAccess.getSimpleAnnotationAttributeAccess().getAttributeKeyword_1()); 
-            match(input,27,FOLLOW_27_in_rule__SimpleAnnotationAttribute__Group__1__Impl2906); 
+            match(input,27,FOLLOW_2); 
              after(grammarAccess.getSimpleAnnotationAttributeAccess().getAttributeKeyword_1()); 
 
             }
@@ -4205,21 +4205,21 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__2"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1437:1: rule__SimpleAnnotationAttribute__Group__2 : rule__SimpleAnnotationAttribute__Group__2__Impl rule__SimpleAnnotationAttribute__Group__3 ;
+    // InternalBase.g:1437:1: rule__SimpleAnnotationAttribute__Group__2 : rule__SimpleAnnotationAttribute__Group__2__Impl rule__SimpleAnnotationAttribute__Group__3 ;
     public final void rule__SimpleAnnotationAttribute__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1441:1: ( rule__SimpleAnnotationAttribute__Group__2__Impl rule__SimpleAnnotationAttribute__Group__3 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1442:2: rule__SimpleAnnotationAttribute__Group__2__Impl rule__SimpleAnnotationAttribute__Group__3
+            // InternalBase.g:1441:1: ( rule__SimpleAnnotationAttribute__Group__2__Impl rule__SimpleAnnotationAttribute__Group__3 )
+            // InternalBase.g:1442:2: rule__SimpleAnnotationAttribute__Group__2__Impl rule__SimpleAnnotationAttribute__Group__3
             {
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__2__Impl_in_rule__SimpleAnnotationAttribute__Group__22937);
+            pushFollow(FOLLOW_10);
             rule__SimpleAnnotationAttribute__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__3_in_rule__SimpleAnnotationAttribute__Group__22940);
+            pushFollow(FOLLOW_2);
             rule__SimpleAnnotationAttribute__Group__3();
 
             state._fsp--;
@@ -4243,23 +4243,23 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__2__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1449:1: rule__SimpleAnnotationAttribute__Group__2__Impl : ( ( rule__SimpleAnnotationAttribute__NameAssignment_2 ) ) ;
+    // InternalBase.g:1449:1: rule__SimpleAnnotationAttribute__Group__2__Impl : ( ( rule__SimpleAnnotationAttribute__NameAssignment_2 ) ) ;
     public final void rule__SimpleAnnotationAttribute__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1453:1: ( ( ( rule__SimpleAnnotationAttribute__NameAssignment_2 ) ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1454:1: ( ( rule__SimpleAnnotationAttribute__NameAssignment_2 ) )
+            // InternalBase.g:1453:1: ( ( ( rule__SimpleAnnotationAttribute__NameAssignment_2 ) ) )
+            // InternalBase.g:1454:1: ( ( rule__SimpleAnnotationAttribute__NameAssignment_2 ) )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1454:1: ( ( rule__SimpleAnnotationAttribute__NameAssignment_2 ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1455:1: ( rule__SimpleAnnotationAttribute__NameAssignment_2 )
+            // InternalBase.g:1454:1: ( ( rule__SimpleAnnotationAttribute__NameAssignment_2 ) )
+            // InternalBase.g:1455:1: ( rule__SimpleAnnotationAttribute__NameAssignment_2 )
             {
              before(grammarAccess.getSimpleAnnotationAttributeAccess().getNameAssignment_2()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1456:1: ( rule__SimpleAnnotationAttribute__NameAssignment_2 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1456:2: rule__SimpleAnnotationAttribute__NameAssignment_2
+            // InternalBase.g:1456:1: ( rule__SimpleAnnotationAttribute__NameAssignment_2 )
+            // InternalBase.g:1456:2: rule__SimpleAnnotationAttribute__NameAssignment_2
             {
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__NameAssignment_2_in_rule__SimpleAnnotationAttribute__Group__2__Impl2967);
+            pushFollow(FOLLOW_2);
             rule__SimpleAnnotationAttribute__NameAssignment_2();
 
             state._fsp--;
@@ -4290,21 +4290,21 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__3"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1466:1: rule__SimpleAnnotationAttribute__Group__3 : rule__SimpleAnnotationAttribute__Group__3__Impl rule__SimpleAnnotationAttribute__Group__4 ;
+    // InternalBase.g:1466:1: rule__SimpleAnnotationAttribute__Group__3 : rule__SimpleAnnotationAttribute__Group__3__Impl rule__SimpleAnnotationAttribute__Group__4 ;
     public final void rule__SimpleAnnotationAttribute__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1470:1: ( rule__SimpleAnnotationAttribute__Group__3__Impl rule__SimpleAnnotationAttribute__Group__4 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1471:2: rule__SimpleAnnotationAttribute__Group__3__Impl rule__SimpleAnnotationAttribute__Group__4
+            // InternalBase.g:1470:1: ( rule__SimpleAnnotationAttribute__Group__3__Impl rule__SimpleAnnotationAttribute__Group__4 )
+            // InternalBase.g:1471:2: rule__SimpleAnnotationAttribute__Group__3__Impl rule__SimpleAnnotationAttribute__Group__4
             {
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__3__Impl_in_rule__SimpleAnnotationAttribute__Group__32997);
+            pushFollow(FOLLOW_11);
             rule__SimpleAnnotationAttribute__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__4_in_rule__SimpleAnnotationAttribute__Group__33000);
+            pushFollow(FOLLOW_2);
             rule__SimpleAnnotationAttribute__Group__4();
 
             state._fsp--;
@@ -4328,20 +4328,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__3__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1478:1: rule__SimpleAnnotationAttribute__Group__3__Impl : ( ':' ) ;
+    // InternalBase.g:1478:1: rule__SimpleAnnotationAttribute__Group__3__Impl : ( ':' ) ;
     public final void rule__SimpleAnnotationAttribute__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1482:1: ( ( ':' ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1483:1: ( ':' )
+            // InternalBase.g:1482:1: ( ( ':' ) )
+            // InternalBase.g:1483:1: ( ':' )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1483:1: ( ':' )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1484:1: ':'
+            // InternalBase.g:1483:1: ( ':' )
+            // InternalBase.g:1484:1: ':'
             {
              before(grammarAccess.getSimpleAnnotationAttributeAccess().getColonKeyword_3()); 
-            match(input,28,FOLLOW_28_in_rule__SimpleAnnotationAttribute__Group__3__Impl3028); 
+            match(input,28,FOLLOW_2); 
              after(grammarAccess.getSimpleAnnotationAttributeAccess().getColonKeyword_3()); 
 
             }
@@ -4365,16 +4365,16 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__4"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1497:1: rule__SimpleAnnotationAttribute__Group__4 : rule__SimpleAnnotationAttribute__Group__4__Impl ;
+    // InternalBase.g:1497:1: rule__SimpleAnnotationAttribute__Group__4 : rule__SimpleAnnotationAttribute__Group__4__Impl ;
     public final void rule__SimpleAnnotationAttribute__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1501:1: ( rule__SimpleAnnotationAttribute__Group__4__Impl )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1502:2: rule__SimpleAnnotationAttribute__Group__4__Impl
+            // InternalBase.g:1501:1: ( rule__SimpleAnnotationAttribute__Group__4__Impl )
+            // InternalBase.g:1502:2: rule__SimpleAnnotationAttribute__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__4__Impl_in_rule__SimpleAnnotationAttribute__Group__43059);
+            pushFollow(FOLLOW_2);
             rule__SimpleAnnotationAttribute__Group__4__Impl();
 
             state._fsp--;
@@ -4398,23 +4398,23 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__4__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1508:1: rule__SimpleAnnotationAttribute__Group__4__Impl : ( ( rule__SimpleAnnotationAttribute__TypeAssignment_4 ) ) ;
+    // InternalBase.g:1508:1: rule__SimpleAnnotationAttribute__Group__4__Impl : ( ( rule__SimpleAnnotationAttribute__TypeAssignment_4 ) ) ;
     public final void rule__SimpleAnnotationAttribute__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1512:1: ( ( ( rule__SimpleAnnotationAttribute__TypeAssignment_4 ) ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1513:1: ( ( rule__SimpleAnnotationAttribute__TypeAssignment_4 ) )
+            // InternalBase.g:1512:1: ( ( ( rule__SimpleAnnotationAttribute__TypeAssignment_4 ) ) )
+            // InternalBase.g:1513:1: ( ( rule__SimpleAnnotationAttribute__TypeAssignment_4 ) )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1513:1: ( ( rule__SimpleAnnotationAttribute__TypeAssignment_4 ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1514:1: ( rule__SimpleAnnotationAttribute__TypeAssignment_4 )
+            // InternalBase.g:1513:1: ( ( rule__SimpleAnnotationAttribute__TypeAssignment_4 ) )
+            // InternalBase.g:1514:1: ( rule__SimpleAnnotationAttribute__TypeAssignment_4 )
             {
              before(grammarAccess.getSimpleAnnotationAttributeAccess().getTypeAssignment_4()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1515:1: ( rule__SimpleAnnotationAttribute__TypeAssignment_4 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1515:2: rule__SimpleAnnotationAttribute__TypeAssignment_4
+            // InternalBase.g:1515:1: ( rule__SimpleAnnotationAttribute__TypeAssignment_4 )
+            // InternalBase.g:1515:2: rule__SimpleAnnotationAttribute__TypeAssignment_4
             {
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__TypeAssignment_4_in_rule__SimpleAnnotationAttribute__Group__4__Impl3086);
+            pushFollow(FOLLOW_2);
             rule__SimpleAnnotationAttribute__TypeAssignment_4();
 
             state._fsp--;
@@ -4445,21 +4445,21 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__0"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1535:1: rule__EnumAnnotationAttribute__Group__0 : rule__EnumAnnotationAttribute__Group__0__Impl rule__EnumAnnotationAttribute__Group__1 ;
+    // InternalBase.g:1535:1: rule__EnumAnnotationAttribute__Group__0 : rule__EnumAnnotationAttribute__Group__0__Impl rule__EnumAnnotationAttribute__Group__1 ;
     public final void rule__EnumAnnotationAttribute__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1539:1: ( rule__EnumAnnotationAttribute__Group__0__Impl rule__EnumAnnotationAttribute__Group__1 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1540:2: rule__EnumAnnotationAttribute__Group__0__Impl rule__EnumAnnotationAttribute__Group__1
+            // InternalBase.g:1539:1: ( rule__EnumAnnotationAttribute__Group__0__Impl rule__EnumAnnotationAttribute__Group__1 )
+            // InternalBase.g:1540:2: rule__EnumAnnotationAttribute__Group__0__Impl rule__EnumAnnotationAttribute__Group__1
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__0__Impl_in_rule__EnumAnnotationAttribute__Group__03126);
+            pushFollow(FOLLOW_9);
             rule__EnumAnnotationAttribute__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__1_in_rule__EnumAnnotationAttribute__Group__03129);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group__1();
 
             state._fsp--;
@@ -4483,23 +4483,23 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__0__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1547:1: rule__EnumAnnotationAttribute__Group__0__Impl : ( ( rule__EnumAnnotationAttribute__Alternatives_0 ) ) ;
+    // InternalBase.g:1547:1: rule__EnumAnnotationAttribute__Group__0__Impl : ( ( rule__EnumAnnotationAttribute__Alternatives_0 ) ) ;
     public final void rule__EnumAnnotationAttribute__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1551:1: ( ( ( rule__EnumAnnotationAttribute__Alternatives_0 ) ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1552:1: ( ( rule__EnumAnnotationAttribute__Alternatives_0 ) )
+            // InternalBase.g:1551:1: ( ( ( rule__EnumAnnotationAttribute__Alternatives_0 ) ) )
+            // InternalBase.g:1552:1: ( ( rule__EnumAnnotationAttribute__Alternatives_0 ) )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1552:1: ( ( rule__EnumAnnotationAttribute__Alternatives_0 ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1553:1: ( rule__EnumAnnotationAttribute__Alternatives_0 )
+            // InternalBase.g:1552:1: ( ( rule__EnumAnnotationAttribute__Alternatives_0 ) )
+            // InternalBase.g:1553:1: ( rule__EnumAnnotationAttribute__Alternatives_0 )
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getAlternatives_0()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1554:1: ( rule__EnumAnnotationAttribute__Alternatives_0 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1554:2: rule__EnumAnnotationAttribute__Alternatives_0
+            // InternalBase.g:1554:1: ( rule__EnumAnnotationAttribute__Alternatives_0 )
+            // InternalBase.g:1554:2: rule__EnumAnnotationAttribute__Alternatives_0
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Alternatives_0_in_rule__EnumAnnotationAttribute__Group__0__Impl3156);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Alternatives_0();
 
             state._fsp--;
@@ -4530,21 +4530,21 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__1"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1564:1: rule__EnumAnnotationAttribute__Group__1 : rule__EnumAnnotationAttribute__Group__1__Impl rule__EnumAnnotationAttribute__Group__2 ;
+    // InternalBase.g:1564:1: rule__EnumAnnotationAttribute__Group__1 : rule__EnumAnnotationAttribute__Group__1__Impl rule__EnumAnnotationAttribute__Group__2 ;
     public final void rule__EnumAnnotationAttribute__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1568:1: ( rule__EnumAnnotationAttribute__Group__1__Impl rule__EnumAnnotationAttribute__Group__2 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1569:2: rule__EnumAnnotationAttribute__Group__1__Impl rule__EnumAnnotationAttribute__Group__2
+            // InternalBase.g:1568:1: ( rule__EnumAnnotationAttribute__Group__1__Impl rule__EnumAnnotationAttribute__Group__2 )
+            // InternalBase.g:1569:2: rule__EnumAnnotationAttribute__Group__1__Impl rule__EnumAnnotationAttribute__Group__2
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__1__Impl_in_rule__EnumAnnotationAttribute__Group__13186);
+            pushFollow(FOLLOW_3);
             rule__EnumAnnotationAttribute__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__2_in_rule__EnumAnnotationAttribute__Group__13189);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group__2();
 
             state._fsp--;
@@ -4568,20 +4568,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__1__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1576:1: rule__EnumAnnotationAttribute__Group__1__Impl : ( 'attribute' ) ;
+    // InternalBase.g:1576:1: rule__EnumAnnotationAttribute__Group__1__Impl : ( 'attribute' ) ;
     public final void rule__EnumAnnotationAttribute__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1580:1: ( ( 'attribute' ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1581:1: ( 'attribute' )
+            // InternalBase.g:1580:1: ( ( 'attribute' ) )
+            // InternalBase.g:1581:1: ( 'attribute' )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1581:1: ( 'attribute' )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1582:1: 'attribute'
+            // InternalBase.g:1581:1: ( 'attribute' )
+            // InternalBase.g:1582:1: 'attribute'
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getAttributeKeyword_1()); 
-            match(input,27,FOLLOW_27_in_rule__EnumAnnotationAttribute__Group__1__Impl3217); 
+            match(input,27,FOLLOW_2); 
              after(grammarAccess.getEnumAnnotationAttributeAccess().getAttributeKeyword_1()); 
 
             }
@@ -4605,21 +4605,21 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__2"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1595:1: rule__EnumAnnotationAttribute__Group__2 : rule__EnumAnnotationAttribute__Group__2__Impl rule__EnumAnnotationAttribute__Group__3 ;
+    // InternalBase.g:1595:1: rule__EnumAnnotationAttribute__Group__2 : rule__EnumAnnotationAttribute__Group__2__Impl rule__EnumAnnotationAttribute__Group__3 ;
     public final void rule__EnumAnnotationAttribute__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1599:1: ( rule__EnumAnnotationAttribute__Group__2__Impl rule__EnumAnnotationAttribute__Group__3 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1600:2: rule__EnumAnnotationAttribute__Group__2__Impl rule__EnumAnnotationAttribute__Group__3
+            // InternalBase.g:1599:1: ( rule__EnumAnnotationAttribute__Group__2__Impl rule__EnumAnnotationAttribute__Group__3 )
+            // InternalBase.g:1600:2: rule__EnumAnnotationAttribute__Group__2__Impl rule__EnumAnnotationAttribute__Group__3
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__2__Impl_in_rule__EnumAnnotationAttribute__Group__23248);
+            pushFollow(FOLLOW_10);
             rule__EnumAnnotationAttribute__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__3_in_rule__EnumAnnotationAttribute__Group__23251);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group__3();
 
             state._fsp--;
@@ -4643,23 +4643,23 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__2__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1607:1: rule__EnumAnnotationAttribute__Group__2__Impl : ( ( rule__EnumAnnotationAttribute__NameAssignment_2 ) ) ;
+    // InternalBase.g:1607:1: rule__EnumAnnotationAttribute__Group__2__Impl : ( ( rule__EnumAnnotationAttribute__NameAssignment_2 ) ) ;
     public final void rule__EnumAnnotationAttribute__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1611:1: ( ( ( rule__EnumAnnotationAttribute__NameAssignment_2 ) ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1612:1: ( ( rule__EnumAnnotationAttribute__NameAssignment_2 ) )
+            // InternalBase.g:1611:1: ( ( ( rule__EnumAnnotationAttribute__NameAssignment_2 ) ) )
+            // InternalBase.g:1612:1: ( ( rule__EnumAnnotationAttribute__NameAssignment_2 ) )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1612:1: ( ( rule__EnumAnnotationAttribute__NameAssignment_2 ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1613:1: ( rule__EnumAnnotationAttribute__NameAssignment_2 )
+            // InternalBase.g:1612:1: ( ( rule__EnumAnnotationAttribute__NameAssignment_2 ) )
+            // InternalBase.g:1613:1: ( rule__EnumAnnotationAttribute__NameAssignment_2 )
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getNameAssignment_2()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1614:1: ( rule__EnumAnnotationAttribute__NameAssignment_2 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1614:2: rule__EnumAnnotationAttribute__NameAssignment_2
+            // InternalBase.g:1614:1: ( rule__EnumAnnotationAttribute__NameAssignment_2 )
+            // InternalBase.g:1614:2: rule__EnumAnnotationAttribute__NameAssignment_2
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__NameAssignment_2_in_rule__EnumAnnotationAttribute__Group__2__Impl3278);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__NameAssignment_2();
 
             state._fsp--;
@@ -4690,21 +4690,21 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__3"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1624:1: rule__EnumAnnotationAttribute__Group__3 : rule__EnumAnnotationAttribute__Group__3__Impl rule__EnumAnnotationAttribute__Group__4 ;
+    // InternalBase.g:1624:1: rule__EnumAnnotationAttribute__Group__3 : rule__EnumAnnotationAttribute__Group__3__Impl rule__EnumAnnotationAttribute__Group__4 ;
     public final void rule__EnumAnnotationAttribute__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1628:1: ( rule__EnumAnnotationAttribute__Group__3__Impl rule__EnumAnnotationAttribute__Group__4 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1629:2: rule__EnumAnnotationAttribute__Group__3__Impl rule__EnumAnnotationAttribute__Group__4
+            // InternalBase.g:1628:1: ( rule__EnumAnnotationAttribute__Group__3__Impl rule__EnumAnnotationAttribute__Group__4 )
+            // InternalBase.g:1629:2: rule__EnumAnnotationAttribute__Group__3__Impl rule__EnumAnnotationAttribute__Group__4
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__3__Impl_in_rule__EnumAnnotationAttribute__Group__33308);
+            pushFollow(FOLLOW_12);
             rule__EnumAnnotationAttribute__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__4_in_rule__EnumAnnotationAttribute__Group__33311);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group__4();
 
             state._fsp--;
@@ -4728,20 +4728,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__3__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1636:1: rule__EnumAnnotationAttribute__Group__3__Impl : ( ':' ) ;
+    // InternalBase.g:1636:1: rule__EnumAnnotationAttribute__Group__3__Impl : ( ':' ) ;
     public final void rule__EnumAnnotationAttribute__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1640:1: ( ( ':' ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1641:1: ( ':' )
+            // InternalBase.g:1640:1: ( ( ':' ) )
+            // InternalBase.g:1641:1: ( ':' )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1641:1: ( ':' )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1642:1: ':'
+            // InternalBase.g:1641:1: ( ':' )
+            // InternalBase.g:1642:1: ':'
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getColonKeyword_3()); 
-            match(input,28,FOLLOW_28_in_rule__EnumAnnotationAttribute__Group__3__Impl3339); 
+            match(input,28,FOLLOW_2); 
              after(grammarAccess.getEnumAnnotationAttributeAccess().getColonKeyword_3()); 
 
             }
@@ -4765,21 +4765,21 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__4"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1655:1: rule__EnumAnnotationAttribute__Group__4 : rule__EnumAnnotationAttribute__Group__4__Impl rule__EnumAnnotationAttribute__Group__5 ;
+    // InternalBase.g:1655:1: rule__EnumAnnotationAttribute__Group__4 : rule__EnumAnnotationAttribute__Group__4__Impl rule__EnumAnnotationAttribute__Group__5 ;
     public final void rule__EnumAnnotationAttribute__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1659:1: ( rule__EnumAnnotationAttribute__Group__4__Impl rule__EnumAnnotationAttribute__Group__5 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1660:2: rule__EnumAnnotationAttribute__Group__4__Impl rule__EnumAnnotationAttribute__Group__5
+            // InternalBase.g:1659:1: ( rule__EnumAnnotationAttribute__Group__4__Impl rule__EnumAnnotationAttribute__Group__5 )
+            // InternalBase.g:1660:2: rule__EnumAnnotationAttribute__Group__4__Impl rule__EnumAnnotationAttribute__Group__5
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__4__Impl_in_rule__EnumAnnotationAttribute__Group__43370);
+            pushFollow(FOLLOW_13);
             rule__EnumAnnotationAttribute__Group__4__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__5_in_rule__EnumAnnotationAttribute__Group__43373);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group__5();
 
             state._fsp--;
@@ -4803,20 +4803,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__4__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1667:1: rule__EnumAnnotationAttribute__Group__4__Impl : ( '{' ) ;
+    // InternalBase.g:1667:1: rule__EnumAnnotationAttribute__Group__4__Impl : ( '{' ) ;
     public final void rule__EnumAnnotationAttribute__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1671:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1672:1: ( '{' )
+            // InternalBase.g:1671:1: ( ( '{' ) )
+            // InternalBase.g:1672:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1672:1: ( '{' )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1673:1: '{'
+            // InternalBase.g:1672:1: ( '{' )
+            // InternalBase.g:1673:1: '{'
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getLeftCurlyBracketKeyword_4()); 
-            match(input,29,FOLLOW_29_in_rule__EnumAnnotationAttribute__Group__4__Impl3401); 
+            match(input,29,FOLLOW_2); 
              after(grammarAccess.getEnumAnnotationAttributeAccess().getLeftCurlyBracketKeyword_4()); 
 
             }
@@ -4840,21 +4840,21 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__5"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1686:1: rule__EnumAnnotationAttribute__Group__5 : rule__EnumAnnotationAttribute__Group__5__Impl rule__EnumAnnotationAttribute__Group__6 ;
+    // InternalBase.g:1686:1: rule__EnumAnnotationAttribute__Group__5 : rule__EnumAnnotationAttribute__Group__5__Impl rule__EnumAnnotationAttribute__Group__6 ;
     public final void rule__EnumAnnotationAttribute__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1690:1: ( rule__EnumAnnotationAttribute__Group__5__Impl rule__EnumAnnotationAttribute__Group__6 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1691:2: rule__EnumAnnotationAttribute__Group__5__Impl rule__EnumAnnotationAttribute__Group__6
+            // InternalBase.g:1690:1: ( rule__EnumAnnotationAttribute__Group__5__Impl rule__EnumAnnotationAttribute__Group__6 )
+            // InternalBase.g:1691:2: rule__EnumAnnotationAttribute__Group__5__Impl rule__EnumAnnotationAttribute__Group__6
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__5__Impl_in_rule__EnumAnnotationAttribute__Group__53432);
+            pushFollow(FOLLOW_14);
             rule__EnumAnnotationAttribute__Group__5__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__6_in_rule__EnumAnnotationAttribute__Group__53435);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group__6();
 
             state._fsp--;
@@ -4878,23 +4878,23 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__5__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1698:1: rule__EnumAnnotationAttribute__Group__5__Impl : ( ( rule__EnumAnnotationAttribute__ValuesAssignment_5 ) ) ;
+    // InternalBase.g:1698:1: rule__EnumAnnotationAttribute__Group__5__Impl : ( ( rule__EnumAnnotationAttribute__ValuesAssignment_5 ) ) ;
     public final void rule__EnumAnnotationAttribute__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1702:1: ( ( ( rule__EnumAnnotationAttribute__ValuesAssignment_5 ) ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1703:1: ( ( rule__EnumAnnotationAttribute__ValuesAssignment_5 ) )
+            // InternalBase.g:1702:1: ( ( ( rule__EnumAnnotationAttribute__ValuesAssignment_5 ) ) )
+            // InternalBase.g:1703:1: ( ( rule__EnumAnnotationAttribute__ValuesAssignment_5 ) )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1703:1: ( ( rule__EnumAnnotationAttribute__ValuesAssignment_5 ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1704:1: ( rule__EnumAnnotationAttribute__ValuesAssignment_5 )
+            // InternalBase.g:1703:1: ( ( rule__EnumAnnotationAttribute__ValuesAssignment_5 ) )
+            // InternalBase.g:1704:1: ( rule__EnumAnnotationAttribute__ValuesAssignment_5 )
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getValuesAssignment_5()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1705:1: ( rule__EnumAnnotationAttribute__ValuesAssignment_5 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1705:2: rule__EnumAnnotationAttribute__ValuesAssignment_5
+            // InternalBase.g:1705:1: ( rule__EnumAnnotationAttribute__ValuesAssignment_5 )
+            // InternalBase.g:1705:2: rule__EnumAnnotationAttribute__ValuesAssignment_5
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__ValuesAssignment_5_in_rule__EnumAnnotationAttribute__Group__5__Impl3462);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__ValuesAssignment_5();
 
             state._fsp--;
@@ -4925,21 +4925,21 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__6"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1715:1: rule__EnumAnnotationAttribute__Group__6 : rule__EnumAnnotationAttribute__Group__6__Impl rule__EnumAnnotationAttribute__Group__7 ;
+    // InternalBase.g:1715:1: rule__EnumAnnotationAttribute__Group__6 : rule__EnumAnnotationAttribute__Group__6__Impl rule__EnumAnnotationAttribute__Group__7 ;
     public final void rule__EnumAnnotationAttribute__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1719:1: ( rule__EnumAnnotationAttribute__Group__6__Impl rule__EnumAnnotationAttribute__Group__7 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1720:2: rule__EnumAnnotationAttribute__Group__6__Impl rule__EnumAnnotationAttribute__Group__7
+            // InternalBase.g:1719:1: ( rule__EnumAnnotationAttribute__Group__6__Impl rule__EnumAnnotationAttribute__Group__7 )
+            // InternalBase.g:1720:2: rule__EnumAnnotationAttribute__Group__6__Impl rule__EnumAnnotationAttribute__Group__7
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__6__Impl_in_rule__EnumAnnotationAttribute__Group__63492);
+            pushFollow(FOLLOW_14);
             rule__EnumAnnotationAttribute__Group__6__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__7_in_rule__EnumAnnotationAttribute__Group__63495);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group__7();
 
             state._fsp--;
@@ -4963,20 +4963,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__6__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1727:1: rule__EnumAnnotationAttribute__Group__6__Impl : ( ( rule__EnumAnnotationAttribute__Group_6__0 )* ) ;
+    // InternalBase.g:1727:1: rule__EnumAnnotationAttribute__Group__6__Impl : ( ( rule__EnumAnnotationAttribute__Group_6__0 )* ) ;
     public final void rule__EnumAnnotationAttribute__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1731:1: ( ( ( rule__EnumAnnotationAttribute__Group_6__0 )* ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1732:1: ( ( rule__EnumAnnotationAttribute__Group_6__0 )* )
+            // InternalBase.g:1731:1: ( ( ( rule__EnumAnnotationAttribute__Group_6__0 )* ) )
+            // InternalBase.g:1732:1: ( ( rule__EnumAnnotationAttribute__Group_6__0 )* )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1732:1: ( ( rule__EnumAnnotationAttribute__Group_6__0 )* )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1733:1: ( rule__EnumAnnotationAttribute__Group_6__0 )*
+            // InternalBase.g:1732:1: ( ( rule__EnumAnnotationAttribute__Group_6__0 )* )
+            // InternalBase.g:1733:1: ( rule__EnumAnnotationAttribute__Group_6__0 )*
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getGroup_6()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1734:1: ( rule__EnumAnnotationAttribute__Group_6__0 )*
+            // InternalBase.g:1734:1: ( rule__EnumAnnotationAttribute__Group_6__0 )*
             loop17:
             do {
                 int alt17=2;
@@ -4989,9 +4989,9 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
                 switch (alt17) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1734:2: rule__EnumAnnotationAttribute__Group_6__0
+            	    // InternalBase.g:1734:2: rule__EnumAnnotationAttribute__Group_6__0
             	    {
-            	    pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group_6__0_in_rule__EnumAnnotationAttribute__Group__6__Impl3522);
+            	    pushFollow(FOLLOW_6);
             	    rule__EnumAnnotationAttribute__Group_6__0();
 
             	    state._fsp--;
@@ -5028,16 +5028,16 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__7"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1744:1: rule__EnumAnnotationAttribute__Group__7 : rule__EnumAnnotationAttribute__Group__7__Impl ;
+    // InternalBase.g:1744:1: rule__EnumAnnotationAttribute__Group__7 : rule__EnumAnnotationAttribute__Group__7__Impl ;
     public final void rule__EnumAnnotationAttribute__Group__7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1748:1: ( rule__EnumAnnotationAttribute__Group__7__Impl )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1749:2: rule__EnumAnnotationAttribute__Group__7__Impl
+            // InternalBase.g:1748:1: ( rule__EnumAnnotationAttribute__Group__7__Impl )
+            // InternalBase.g:1749:2: rule__EnumAnnotationAttribute__Group__7__Impl
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__7__Impl_in_rule__EnumAnnotationAttribute__Group__73553);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group__7__Impl();
 
             state._fsp--;
@@ -5061,20 +5061,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__7__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1755:1: rule__EnumAnnotationAttribute__Group__7__Impl : ( '}' ) ;
+    // InternalBase.g:1755:1: rule__EnumAnnotationAttribute__Group__7__Impl : ( '}' ) ;
     public final void rule__EnumAnnotationAttribute__Group__7__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1759:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1760:1: ( '}' )
+            // InternalBase.g:1759:1: ( ( '}' ) )
+            // InternalBase.g:1760:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1760:1: ( '}' )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1761:1: '}'
+            // InternalBase.g:1760:1: ( '}' )
+            // InternalBase.g:1761:1: '}'
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getRightCurlyBracketKeyword_7()); 
-            match(input,30,FOLLOW_30_in_rule__EnumAnnotationAttribute__Group__7__Impl3581); 
+            match(input,30,FOLLOW_2); 
              after(grammarAccess.getEnumAnnotationAttributeAccess().getRightCurlyBracketKeyword_7()); 
 
             }
@@ -5098,21 +5098,21 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group_6__0"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1790:1: rule__EnumAnnotationAttribute__Group_6__0 : rule__EnumAnnotationAttribute__Group_6__0__Impl rule__EnumAnnotationAttribute__Group_6__1 ;
+    // InternalBase.g:1790:1: rule__EnumAnnotationAttribute__Group_6__0 : rule__EnumAnnotationAttribute__Group_6__0__Impl rule__EnumAnnotationAttribute__Group_6__1 ;
     public final void rule__EnumAnnotationAttribute__Group_6__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1794:1: ( rule__EnumAnnotationAttribute__Group_6__0__Impl rule__EnumAnnotationAttribute__Group_6__1 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1795:2: rule__EnumAnnotationAttribute__Group_6__0__Impl rule__EnumAnnotationAttribute__Group_6__1
+            // InternalBase.g:1794:1: ( rule__EnumAnnotationAttribute__Group_6__0__Impl rule__EnumAnnotationAttribute__Group_6__1 )
+            // InternalBase.g:1795:2: rule__EnumAnnotationAttribute__Group_6__0__Impl rule__EnumAnnotationAttribute__Group_6__1
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group_6__0__Impl_in_rule__EnumAnnotationAttribute__Group_6__03628);
+            pushFollow(FOLLOW_13);
             rule__EnumAnnotationAttribute__Group_6__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group_6__1_in_rule__EnumAnnotationAttribute__Group_6__03631);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group_6__1();
 
             state._fsp--;
@@ -5136,20 +5136,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group_6__0__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1802:1: rule__EnumAnnotationAttribute__Group_6__0__Impl : ( ',' ) ;
+    // InternalBase.g:1802:1: rule__EnumAnnotationAttribute__Group_6__0__Impl : ( ',' ) ;
     public final void rule__EnumAnnotationAttribute__Group_6__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1806:1: ( ( ',' ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1807:1: ( ',' )
+            // InternalBase.g:1806:1: ( ( ',' ) )
+            // InternalBase.g:1807:1: ( ',' )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1807:1: ( ',' )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1808:1: ','
+            // InternalBase.g:1807:1: ( ',' )
+            // InternalBase.g:1808:1: ','
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getCommaKeyword_6_0()); 
-            match(input,25,FOLLOW_25_in_rule__EnumAnnotationAttribute__Group_6__0__Impl3659); 
+            match(input,25,FOLLOW_2); 
              after(grammarAccess.getEnumAnnotationAttributeAccess().getCommaKeyword_6_0()); 
 
             }
@@ -5173,16 +5173,16 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group_6__1"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1821:1: rule__EnumAnnotationAttribute__Group_6__1 : rule__EnumAnnotationAttribute__Group_6__1__Impl ;
+    // InternalBase.g:1821:1: rule__EnumAnnotationAttribute__Group_6__1 : rule__EnumAnnotationAttribute__Group_6__1__Impl ;
     public final void rule__EnumAnnotationAttribute__Group_6__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1825:1: ( rule__EnumAnnotationAttribute__Group_6__1__Impl )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1826:2: rule__EnumAnnotationAttribute__Group_6__1__Impl
+            // InternalBase.g:1825:1: ( rule__EnumAnnotationAttribute__Group_6__1__Impl )
+            // InternalBase.g:1826:2: rule__EnumAnnotationAttribute__Group_6__1__Impl
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group_6__1__Impl_in_rule__EnumAnnotationAttribute__Group_6__13690);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group_6__1__Impl();
 
             state._fsp--;
@@ -5206,23 +5206,23 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group_6__1__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1832:1: rule__EnumAnnotationAttribute__Group_6__1__Impl : ( ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 ) ) ;
+    // InternalBase.g:1832:1: rule__EnumAnnotationAttribute__Group_6__1__Impl : ( ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 ) ) ;
     public final void rule__EnumAnnotationAttribute__Group_6__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1836:1: ( ( ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 ) ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1837:1: ( ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 ) )
+            // InternalBase.g:1836:1: ( ( ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 ) ) )
+            // InternalBase.g:1837:1: ( ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 ) )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1837:1: ( ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1838:1: ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 )
+            // InternalBase.g:1837:1: ( ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 ) )
+            // InternalBase.g:1838:1: ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 )
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getValuesAssignment_6_1()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1839:1: ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1839:2: rule__EnumAnnotationAttribute__ValuesAssignment_6_1
+            // InternalBase.g:1839:1: ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 )
+            // InternalBase.g:1839:2: rule__EnumAnnotationAttribute__ValuesAssignment_6_1
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__ValuesAssignment_6_1_in_rule__EnumAnnotationAttribute__Group_6__1__Impl3717);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__ValuesAssignment_6_1();
 
             state._fsp--;
@@ -5253,21 +5253,21 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ImportedFQN__Group__0"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1855:1: rule__ImportedFQN__Group__0 : rule__ImportedFQN__Group__0__Impl rule__ImportedFQN__Group__1 ;
+    // InternalBase.g:1855:1: rule__ImportedFQN__Group__0 : rule__ImportedFQN__Group__0__Impl rule__ImportedFQN__Group__1 ;
     public final void rule__ImportedFQN__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1859:1: ( rule__ImportedFQN__Group__0__Impl rule__ImportedFQN__Group__1 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1860:2: rule__ImportedFQN__Group__0__Impl rule__ImportedFQN__Group__1
+            // InternalBase.g:1859:1: ( rule__ImportedFQN__Group__0__Impl rule__ImportedFQN__Group__1 )
+            // InternalBase.g:1860:2: rule__ImportedFQN__Group__0__Impl rule__ImportedFQN__Group__1
             {
-            pushFollow(FOLLOW_rule__ImportedFQN__Group__0__Impl_in_rule__ImportedFQN__Group__03753);
+            pushFollow(FOLLOW_15);
             rule__ImportedFQN__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ImportedFQN__Group__1_in_rule__ImportedFQN__Group__03756);
+            pushFollow(FOLLOW_2);
             rule__ImportedFQN__Group__1();
 
             state._fsp--;
@@ -5291,20 +5291,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ImportedFQN__Group__0__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1867:1: rule__ImportedFQN__Group__0__Impl : ( ruleFQN ) ;
+    // InternalBase.g:1867:1: rule__ImportedFQN__Group__0__Impl : ( ruleFQN ) ;
     public final void rule__ImportedFQN__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1871:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1872:1: ( ruleFQN )
+            // InternalBase.g:1871:1: ( ( ruleFQN ) )
+            // InternalBase.g:1872:1: ( ruleFQN )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1872:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1873:1: ruleFQN
+            // InternalBase.g:1872:1: ( ruleFQN )
+            // InternalBase.g:1873:1: ruleFQN
             {
              before(grammarAccess.getImportedFQNAccess().getFQNParserRuleCall_0()); 
-            pushFollow(FOLLOW_ruleFQN_in_rule__ImportedFQN__Group__0__Impl3783);
+            pushFollow(FOLLOW_2);
             ruleFQN();
 
             state._fsp--;
@@ -5332,16 +5332,16 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ImportedFQN__Group__1"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1884:1: rule__ImportedFQN__Group__1 : rule__ImportedFQN__Group__1__Impl ;
+    // InternalBase.g:1884:1: rule__ImportedFQN__Group__1 : rule__ImportedFQN__Group__1__Impl ;
     public final void rule__ImportedFQN__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1888:1: ( rule__ImportedFQN__Group__1__Impl )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1889:2: rule__ImportedFQN__Group__1__Impl
+            // InternalBase.g:1888:1: ( rule__ImportedFQN__Group__1__Impl )
+            // InternalBase.g:1889:2: rule__ImportedFQN__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__ImportedFQN__Group__1__Impl_in_rule__ImportedFQN__Group__13812);
+            pushFollow(FOLLOW_2);
             rule__ImportedFQN__Group__1__Impl();
 
             state._fsp--;
@@ -5365,20 +5365,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ImportedFQN__Group__1__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1895:1: rule__ImportedFQN__Group__1__Impl : ( ( '.*' )? ) ;
+    // InternalBase.g:1895:1: rule__ImportedFQN__Group__1__Impl : ( ( '.*' )? ) ;
     public final void rule__ImportedFQN__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1899:1: ( ( ( '.*' )? ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1900:1: ( ( '.*' )? )
+            // InternalBase.g:1899:1: ( ( ( '.*' )? ) )
+            // InternalBase.g:1900:1: ( ( '.*' )? )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1900:1: ( ( '.*' )? )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1901:1: ( '.*' )?
+            // InternalBase.g:1900:1: ( ( '.*' )? )
+            // InternalBase.g:1901:1: ( '.*' )?
             {
              before(grammarAccess.getImportedFQNAccess().getFullStopAsteriskKeyword_1()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1902:1: ( '.*' )?
+            // InternalBase.g:1902:1: ( '.*' )?
             int alt18=2;
             int LA18_0 = input.LA(1);
 
@@ -5387,9 +5387,9 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
             }
             switch (alt18) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1903:2: '.*'
+                    // InternalBase.g:1903:2: '.*'
                     {
-                    match(input,31,FOLLOW_31_in_rule__ImportedFQN__Group__1__Impl3841); 
+                    match(input,31,FOLLOW_2); 
 
                     }
                     break;
@@ -5419,21 +5419,21 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Documentation__Group__0"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1918:1: rule__Documentation__Group__0 : rule__Documentation__Group__0__Impl rule__Documentation__Group__1 ;
+    // InternalBase.g:1918:1: rule__Documentation__Group__0 : rule__Documentation__Group__0__Impl rule__Documentation__Group__1 ;
     public final void rule__Documentation__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1922:1: ( rule__Documentation__Group__0__Impl rule__Documentation__Group__1 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1923:2: rule__Documentation__Group__0__Impl rule__Documentation__Group__1
+            // InternalBase.g:1922:1: ( rule__Documentation__Group__0__Impl rule__Documentation__Group__1 )
+            // InternalBase.g:1923:2: rule__Documentation__Group__0__Impl rule__Documentation__Group__1
             {
-            pushFollow(FOLLOW_rule__Documentation__Group__0__Impl_in_rule__Documentation__Group__03878);
+            pushFollow(FOLLOW_16);
             rule__Documentation__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Documentation__Group__1_in_rule__Documentation__Group__03881);
+            pushFollow(FOLLOW_2);
             rule__Documentation__Group__1();
 
             state._fsp--;
@@ -5457,21 +5457,21 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Documentation__Group__0__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1930:1: rule__Documentation__Group__0__Impl : ( () ) ;
+    // InternalBase.g:1930:1: rule__Documentation__Group__0__Impl : ( () ) ;
     public final void rule__Documentation__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1934:1: ( ( () ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1935:1: ( () )
+            // InternalBase.g:1934:1: ( ( () ) )
+            // InternalBase.g:1935:1: ( () )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1935:1: ( () )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1936:1: ()
+            // InternalBase.g:1935:1: ( () )
+            // InternalBase.g:1936:1: ()
             {
              before(grammarAccess.getDocumentationAccess().getDocumentationAction_0()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1937:1: ()
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1939:1: 
+            // InternalBase.g:1937:1: ()
+            // InternalBase.g:1939:1: 
             {
             }
 
@@ -5494,21 +5494,21 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Documentation__Group__1"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1949:1: rule__Documentation__Group__1 : rule__Documentation__Group__1__Impl rule__Documentation__Group__2 ;
+    // InternalBase.g:1949:1: rule__Documentation__Group__1 : rule__Documentation__Group__1__Impl rule__Documentation__Group__2 ;
     public final void rule__Documentation__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1953:1: ( rule__Documentation__Group__1__Impl rule__Documentation__Group__2 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1954:2: rule__Documentation__Group__1__Impl rule__Documentation__Group__2
+            // InternalBase.g:1953:1: ( rule__Documentation__Group__1__Impl rule__Documentation__Group__2 )
+            // InternalBase.g:1954:2: rule__Documentation__Group__1__Impl rule__Documentation__Group__2
             {
-            pushFollow(FOLLOW_rule__Documentation__Group__1__Impl_in_rule__Documentation__Group__13939);
+            pushFollow(FOLLOW_17);
             rule__Documentation__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Documentation__Group__2_in_rule__Documentation__Group__13942);
+            pushFollow(FOLLOW_2);
             rule__Documentation__Group__2();
 
             state._fsp--;
@@ -5532,20 +5532,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Documentation__Group__1__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1961:1: rule__Documentation__Group__1__Impl : ( '[' ) ;
+    // InternalBase.g:1961:1: rule__Documentation__Group__1__Impl : ( '[' ) ;
     public final void rule__Documentation__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1965:1: ( ( '[' ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1966:1: ( '[' )
+            // InternalBase.g:1965:1: ( ( '[' ) )
+            // InternalBase.g:1966:1: ( '[' )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1966:1: ( '[' )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1967:1: '['
+            // InternalBase.g:1966:1: ( '[' )
+            // InternalBase.g:1967:1: '['
             {
              before(grammarAccess.getDocumentationAccess().getLeftSquareBracketKeyword_1()); 
-            match(input,32,FOLLOW_32_in_rule__Documentation__Group__1__Impl3970); 
+            match(input,32,FOLLOW_2); 
              after(grammarAccess.getDocumentationAccess().getLeftSquareBracketKeyword_1()); 
 
             }
@@ -5569,21 +5569,21 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Documentation__Group__2"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1980:1: rule__Documentation__Group__2 : rule__Documentation__Group__2__Impl rule__Documentation__Group__3 ;
+    // InternalBase.g:1980:1: rule__Documentation__Group__2 : rule__Documentation__Group__2__Impl rule__Documentation__Group__3 ;
     public final void rule__Documentation__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1984:1: ( rule__Documentation__Group__2__Impl rule__Documentation__Group__3 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1985:2: rule__Documentation__Group__2__Impl rule__Documentation__Group__3
+            // InternalBase.g:1984:1: ( rule__Documentation__Group__2__Impl rule__Documentation__Group__3 )
+            // InternalBase.g:1985:2: rule__Documentation__Group__2__Impl rule__Documentation__Group__3
             {
-            pushFollow(FOLLOW_rule__Documentation__Group__2__Impl_in_rule__Documentation__Group__24001);
+            pushFollow(FOLLOW_17);
             rule__Documentation__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Documentation__Group__3_in_rule__Documentation__Group__24004);
+            pushFollow(FOLLOW_2);
             rule__Documentation__Group__3();
 
             state._fsp--;
@@ -5607,20 +5607,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Documentation__Group__2__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1992:1: rule__Documentation__Group__2__Impl : ( ( rule__Documentation__LinesAssignment_2 )* ) ;
+    // InternalBase.g:1992:1: rule__Documentation__Group__2__Impl : ( ( rule__Documentation__LinesAssignment_2 )* ) ;
     public final void rule__Documentation__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1996:1: ( ( ( rule__Documentation__LinesAssignment_2 )* ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1997:1: ( ( rule__Documentation__LinesAssignment_2 )* )
+            // InternalBase.g:1996:1: ( ( ( rule__Documentation__LinesAssignment_2 )* ) )
+            // InternalBase.g:1997:1: ( ( rule__Documentation__LinesAssignment_2 )* )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1997:1: ( ( rule__Documentation__LinesAssignment_2 )* )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1998:1: ( rule__Documentation__LinesAssignment_2 )*
+            // InternalBase.g:1997:1: ( ( rule__Documentation__LinesAssignment_2 )* )
+            // InternalBase.g:1998:1: ( rule__Documentation__LinesAssignment_2 )*
             {
              before(grammarAccess.getDocumentationAccess().getLinesAssignment_2()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1999:1: ( rule__Documentation__LinesAssignment_2 )*
+            // InternalBase.g:1999:1: ( rule__Documentation__LinesAssignment_2 )*
             loop19:
             do {
                 int alt19=2;
@@ -5633,9 +5633,9 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
                 switch (alt19) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:1999:2: rule__Documentation__LinesAssignment_2
+            	    // InternalBase.g:1999:2: rule__Documentation__LinesAssignment_2
             	    {
-            	    pushFollow(FOLLOW_rule__Documentation__LinesAssignment_2_in_rule__Documentation__Group__2__Impl4031);
+            	    pushFollow(FOLLOW_18);
             	    rule__Documentation__LinesAssignment_2();
 
             	    state._fsp--;
@@ -5672,16 +5672,16 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Documentation__Group__3"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2009:1: rule__Documentation__Group__3 : rule__Documentation__Group__3__Impl ;
+    // InternalBase.g:2009:1: rule__Documentation__Group__3 : rule__Documentation__Group__3__Impl ;
     public final void rule__Documentation__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2013:1: ( rule__Documentation__Group__3__Impl )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2014:2: rule__Documentation__Group__3__Impl
+            // InternalBase.g:2013:1: ( rule__Documentation__Group__3__Impl )
+            // InternalBase.g:2014:2: rule__Documentation__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__Documentation__Group__3__Impl_in_rule__Documentation__Group__34062);
+            pushFollow(FOLLOW_2);
             rule__Documentation__Group__3__Impl();
 
             state._fsp--;
@@ -5705,20 +5705,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Documentation__Group__3__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2020:1: rule__Documentation__Group__3__Impl : ( ']' ) ;
+    // InternalBase.g:2020:1: rule__Documentation__Group__3__Impl : ( ']' ) ;
     public final void rule__Documentation__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2024:1: ( ( ']' ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2025:1: ( ']' )
+            // InternalBase.g:2024:1: ( ( ']' ) )
+            // InternalBase.g:2025:1: ( ']' )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2025:1: ( ']' )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2026:1: ']'
+            // InternalBase.g:2025:1: ( ']' )
+            // InternalBase.g:2026:1: ']'
             {
              before(grammarAccess.getDocumentationAccess().getRightSquareBracketKeyword_3()); 
-            match(input,33,FOLLOW_33_in_rule__Documentation__Group__3__Impl4090); 
+            match(input,33,FOLLOW_2); 
              after(grammarAccess.getDocumentationAccess().getRightSquareBracketKeyword_3()); 
 
             }
@@ -5742,21 +5742,21 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__BooleanLiteral__Group__0"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2053:1: rule__BooleanLiteral__Group__0 : rule__BooleanLiteral__Group__0__Impl rule__BooleanLiteral__Group__1 ;
+    // InternalBase.g:2053:1: rule__BooleanLiteral__Group__0 : rule__BooleanLiteral__Group__0__Impl rule__BooleanLiteral__Group__1 ;
     public final void rule__BooleanLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2057:1: ( rule__BooleanLiteral__Group__0__Impl rule__BooleanLiteral__Group__1 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2058:2: rule__BooleanLiteral__Group__0__Impl rule__BooleanLiteral__Group__1
+            // InternalBase.g:2057:1: ( rule__BooleanLiteral__Group__0__Impl rule__BooleanLiteral__Group__1 )
+            // InternalBase.g:2058:2: rule__BooleanLiteral__Group__0__Impl rule__BooleanLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__BooleanLiteral__Group__0__Impl_in_rule__BooleanLiteral__Group__04135);
+            pushFollow(FOLLOW_19);
             rule__BooleanLiteral__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__BooleanLiteral__Group__1_in_rule__BooleanLiteral__Group__04138);
+            pushFollow(FOLLOW_2);
             rule__BooleanLiteral__Group__1();
 
             state._fsp--;
@@ -5780,21 +5780,21 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__BooleanLiteral__Group__0__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2065:1: rule__BooleanLiteral__Group__0__Impl : ( () ) ;
+    // InternalBase.g:2065:1: rule__BooleanLiteral__Group__0__Impl : ( () ) ;
     public final void rule__BooleanLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2069:1: ( ( () ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2070:1: ( () )
+            // InternalBase.g:2069:1: ( ( () ) )
+            // InternalBase.g:2070:1: ( () )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2070:1: ( () )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2071:1: ()
+            // InternalBase.g:2070:1: ( () )
+            // InternalBase.g:2071:1: ()
             {
              before(grammarAccess.getBooleanLiteralAccess().getBooleanLiteralAction_0()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2072:1: ()
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2074:1: 
+            // InternalBase.g:2072:1: ()
+            // InternalBase.g:2074:1: 
             {
             }
 
@@ -5817,16 +5817,16 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__BooleanLiteral__Group__1"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2084:1: rule__BooleanLiteral__Group__1 : rule__BooleanLiteral__Group__1__Impl ;
+    // InternalBase.g:2084:1: rule__BooleanLiteral__Group__1 : rule__BooleanLiteral__Group__1__Impl ;
     public final void rule__BooleanLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2088:1: ( rule__BooleanLiteral__Group__1__Impl )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2089:2: rule__BooleanLiteral__Group__1__Impl
+            // InternalBase.g:2088:1: ( rule__BooleanLiteral__Group__1__Impl )
+            // InternalBase.g:2089:2: rule__BooleanLiteral__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__BooleanLiteral__Group__1__Impl_in_rule__BooleanLiteral__Group__14196);
+            pushFollow(FOLLOW_2);
             rule__BooleanLiteral__Group__1__Impl();
 
             state._fsp--;
@@ -5850,23 +5850,23 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__BooleanLiteral__Group__1__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2095:1: rule__BooleanLiteral__Group__1__Impl : ( ( rule__BooleanLiteral__Alternatives_1 ) ) ;
+    // InternalBase.g:2095:1: rule__BooleanLiteral__Group__1__Impl : ( ( rule__BooleanLiteral__Alternatives_1 ) ) ;
     public final void rule__BooleanLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2099:1: ( ( ( rule__BooleanLiteral__Alternatives_1 ) ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2100:1: ( ( rule__BooleanLiteral__Alternatives_1 ) )
+            // InternalBase.g:2099:1: ( ( ( rule__BooleanLiteral__Alternatives_1 ) ) )
+            // InternalBase.g:2100:1: ( ( rule__BooleanLiteral__Alternatives_1 ) )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2100:1: ( ( rule__BooleanLiteral__Alternatives_1 ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2101:1: ( rule__BooleanLiteral__Alternatives_1 )
+            // InternalBase.g:2100:1: ( ( rule__BooleanLiteral__Alternatives_1 ) )
+            // InternalBase.g:2101:1: ( rule__BooleanLiteral__Alternatives_1 )
             {
              before(grammarAccess.getBooleanLiteralAccess().getAlternatives_1()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2102:1: ( rule__BooleanLiteral__Alternatives_1 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2102:2: rule__BooleanLiteral__Alternatives_1
+            // InternalBase.g:2102:1: ( rule__BooleanLiteral__Alternatives_1 )
+            // InternalBase.g:2102:2: rule__BooleanLiteral__Alternatives_1
             {
-            pushFollow(FOLLOW_rule__BooleanLiteral__Alternatives_1_in_rule__BooleanLiteral__Group__1__Impl4223);
+            pushFollow(FOLLOW_2);
             rule__BooleanLiteral__Alternatives_1();
 
             state._fsp--;
@@ -5897,21 +5897,21 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RealLiteral__Group__0"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2116:1: rule__RealLiteral__Group__0 : rule__RealLiteral__Group__0__Impl rule__RealLiteral__Group__1 ;
+    // InternalBase.g:2116:1: rule__RealLiteral__Group__0 : rule__RealLiteral__Group__0__Impl rule__RealLiteral__Group__1 ;
     public final void rule__RealLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2120:1: ( rule__RealLiteral__Group__0__Impl rule__RealLiteral__Group__1 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2121:2: rule__RealLiteral__Group__0__Impl rule__RealLiteral__Group__1
+            // InternalBase.g:2120:1: ( rule__RealLiteral__Group__0__Impl rule__RealLiteral__Group__1 )
+            // InternalBase.g:2121:2: rule__RealLiteral__Group__0__Impl rule__RealLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__RealLiteral__Group__0__Impl_in_rule__RealLiteral__Group__04257);
+            pushFollow(FOLLOW_20);
             rule__RealLiteral__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RealLiteral__Group__1_in_rule__RealLiteral__Group__04260);
+            pushFollow(FOLLOW_2);
             rule__RealLiteral__Group__1();
 
             state._fsp--;
@@ -5935,21 +5935,21 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RealLiteral__Group__0__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2128:1: rule__RealLiteral__Group__0__Impl : ( () ) ;
+    // InternalBase.g:2128:1: rule__RealLiteral__Group__0__Impl : ( () ) ;
     public final void rule__RealLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2132:1: ( ( () ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2133:1: ( () )
+            // InternalBase.g:2132:1: ( ( () ) )
+            // InternalBase.g:2133:1: ( () )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2133:1: ( () )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2134:1: ()
+            // InternalBase.g:2133:1: ( () )
+            // InternalBase.g:2134:1: ()
             {
              before(grammarAccess.getRealLiteralAccess().getRealLiteralAction_0()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2135:1: ()
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2137:1: 
+            // InternalBase.g:2135:1: ()
+            // InternalBase.g:2137:1: 
             {
             }
 
@@ -5972,16 +5972,16 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RealLiteral__Group__1"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2147:1: rule__RealLiteral__Group__1 : rule__RealLiteral__Group__1__Impl ;
+    // InternalBase.g:2147:1: rule__RealLiteral__Group__1 : rule__RealLiteral__Group__1__Impl ;
     public final void rule__RealLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2151:1: ( rule__RealLiteral__Group__1__Impl )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2152:2: rule__RealLiteral__Group__1__Impl
+            // InternalBase.g:2151:1: ( rule__RealLiteral__Group__1__Impl )
+            // InternalBase.g:2152:2: rule__RealLiteral__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__RealLiteral__Group__1__Impl_in_rule__RealLiteral__Group__14318);
+            pushFollow(FOLLOW_2);
             rule__RealLiteral__Group__1__Impl();
 
             state._fsp--;
@@ -6005,23 +6005,23 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RealLiteral__Group__1__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2158:1: rule__RealLiteral__Group__1__Impl : ( ( rule__RealLiteral__ValueAssignment_1 ) ) ;
+    // InternalBase.g:2158:1: rule__RealLiteral__Group__1__Impl : ( ( rule__RealLiteral__ValueAssignment_1 ) ) ;
     public final void rule__RealLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2162:1: ( ( ( rule__RealLiteral__ValueAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2163:1: ( ( rule__RealLiteral__ValueAssignment_1 ) )
+            // InternalBase.g:2162:1: ( ( ( rule__RealLiteral__ValueAssignment_1 ) ) )
+            // InternalBase.g:2163:1: ( ( rule__RealLiteral__ValueAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2163:1: ( ( rule__RealLiteral__ValueAssignment_1 ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2164:1: ( rule__RealLiteral__ValueAssignment_1 )
+            // InternalBase.g:2163:1: ( ( rule__RealLiteral__ValueAssignment_1 ) )
+            // InternalBase.g:2164:1: ( rule__RealLiteral__ValueAssignment_1 )
             {
              before(grammarAccess.getRealLiteralAccess().getValueAssignment_1()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2165:1: ( rule__RealLiteral__ValueAssignment_1 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2165:2: rule__RealLiteral__ValueAssignment_1
+            // InternalBase.g:2165:1: ( rule__RealLiteral__ValueAssignment_1 )
+            // InternalBase.g:2165:2: rule__RealLiteral__ValueAssignment_1
             {
-            pushFollow(FOLLOW_rule__RealLiteral__ValueAssignment_1_in_rule__RealLiteral__Group__1__Impl4345);
+            pushFollow(FOLLOW_2);
             rule__RealLiteral__ValueAssignment_1();
 
             state._fsp--;
@@ -6052,21 +6052,21 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__IntLiteral__Group__0"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2179:1: rule__IntLiteral__Group__0 : rule__IntLiteral__Group__0__Impl rule__IntLiteral__Group__1 ;
+    // InternalBase.g:2179:1: rule__IntLiteral__Group__0 : rule__IntLiteral__Group__0__Impl rule__IntLiteral__Group__1 ;
     public final void rule__IntLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2183:1: ( rule__IntLiteral__Group__0__Impl rule__IntLiteral__Group__1 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2184:2: rule__IntLiteral__Group__0__Impl rule__IntLiteral__Group__1
+            // InternalBase.g:2183:1: ( rule__IntLiteral__Group__0__Impl rule__IntLiteral__Group__1 )
+            // InternalBase.g:2184:2: rule__IntLiteral__Group__0__Impl rule__IntLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__IntLiteral__Group__0__Impl_in_rule__IntLiteral__Group__04379);
+            pushFollow(FOLLOW_20);
             rule__IntLiteral__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__IntLiteral__Group__1_in_rule__IntLiteral__Group__04382);
+            pushFollow(FOLLOW_2);
             rule__IntLiteral__Group__1();
 
             state._fsp--;
@@ -6090,21 +6090,21 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__IntLiteral__Group__0__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2191:1: rule__IntLiteral__Group__0__Impl : ( () ) ;
+    // InternalBase.g:2191:1: rule__IntLiteral__Group__0__Impl : ( () ) ;
     public final void rule__IntLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2195:1: ( ( () ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2196:1: ( () )
+            // InternalBase.g:2195:1: ( ( () ) )
+            // InternalBase.g:2196:1: ( () )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2196:1: ( () )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2197:1: ()
+            // InternalBase.g:2196:1: ( () )
+            // InternalBase.g:2197:1: ()
             {
              before(grammarAccess.getIntLiteralAccess().getIntLiteralAction_0()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2198:1: ()
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2200:1: 
+            // InternalBase.g:2198:1: ()
+            // InternalBase.g:2200:1: 
             {
             }
 
@@ -6127,16 +6127,16 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__IntLiteral__Group__1"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2210:1: rule__IntLiteral__Group__1 : rule__IntLiteral__Group__1__Impl ;
+    // InternalBase.g:2210:1: rule__IntLiteral__Group__1 : rule__IntLiteral__Group__1__Impl ;
     public final void rule__IntLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2214:1: ( rule__IntLiteral__Group__1__Impl )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2215:2: rule__IntLiteral__Group__1__Impl
+            // InternalBase.g:2214:1: ( rule__IntLiteral__Group__1__Impl )
+            // InternalBase.g:2215:2: rule__IntLiteral__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__IntLiteral__Group__1__Impl_in_rule__IntLiteral__Group__14440);
+            pushFollow(FOLLOW_2);
             rule__IntLiteral__Group__1__Impl();
 
             state._fsp--;
@@ -6160,23 +6160,23 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__IntLiteral__Group__1__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2221:1: rule__IntLiteral__Group__1__Impl : ( ( rule__IntLiteral__ValueAssignment_1 ) ) ;
+    // InternalBase.g:2221:1: rule__IntLiteral__Group__1__Impl : ( ( rule__IntLiteral__ValueAssignment_1 ) ) ;
     public final void rule__IntLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2225:1: ( ( ( rule__IntLiteral__ValueAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2226:1: ( ( rule__IntLiteral__ValueAssignment_1 ) )
+            // InternalBase.g:2225:1: ( ( ( rule__IntLiteral__ValueAssignment_1 ) ) )
+            // InternalBase.g:2226:1: ( ( rule__IntLiteral__ValueAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2226:1: ( ( rule__IntLiteral__ValueAssignment_1 ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2227:1: ( rule__IntLiteral__ValueAssignment_1 )
+            // InternalBase.g:2226:1: ( ( rule__IntLiteral__ValueAssignment_1 ) )
+            // InternalBase.g:2227:1: ( rule__IntLiteral__ValueAssignment_1 )
             {
              before(grammarAccess.getIntLiteralAccess().getValueAssignment_1()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2228:1: ( rule__IntLiteral__ValueAssignment_1 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2228:2: rule__IntLiteral__ValueAssignment_1
+            // InternalBase.g:2228:1: ( rule__IntLiteral__ValueAssignment_1 )
+            // InternalBase.g:2228:2: rule__IntLiteral__ValueAssignment_1
             {
-            pushFollow(FOLLOW_rule__IntLiteral__ValueAssignment_1_in_rule__IntLiteral__Group__1__Impl4467);
+            pushFollow(FOLLOW_2);
             rule__IntLiteral__ValueAssignment_1();
 
             state._fsp--;
@@ -6207,21 +6207,21 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StringLiteral__Group__0"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2242:1: rule__StringLiteral__Group__0 : rule__StringLiteral__Group__0__Impl rule__StringLiteral__Group__1 ;
+    // InternalBase.g:2242:1: rule__StringLiteral__Group__0 : rule__StringLiteral__Group__0__Impl rule__StringLiteral__Group__1 ;
     public final void rule__StringLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2246:1: ( rule__StringLiteral__Group__0__Impl rule__StringLiteral__Group__1 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2247:2: rule__StringLiteral__Group__0__Impl rule__StringLiteral__Group__1
+            // InternalBase.g:2246:1: ( rule__StringLiteral__Group__0__Impl rule__StringLiteral__Group__1 )
+            // InternalBase.g:2247:2: rule__StringLiteral__Group__0__Impl rule__StringLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__StringLiteral__Group__0__Impl_in_rule__StringLiteral__Group__04501);
+            pushFollow(FOLLOW_8);
             rule__StringLiteral__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__StringLiteral__Group__1_in_rule__StringLiteral__Group__04504);
+            pushFollow(FOLLOW_2);
             rule__StringLiteral__Group__1();
 
             state._fsp--;
@@ -6245,21 +6245,21 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StringLiteral__Group__0__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2254:1: rule__StringLiteral__Group__0__Impl : ( () ) ;
+    // InternalBase.g:2254:1: rule__StringLiteral__Group__0__Impl : ( () ) ;
     public final void rule__StringLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2258:1: ( ( () ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2259:1: ( () )
+            // InternalBase.g:2258:1: ( ( () ) )
+            // InternalBase.g:2259:1: ( () )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2259:1: ( () )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2260:1: ()
+            // InternalBase.g:2259:1: ( () )
+            // InternalBase.g:2260:1: ()
             {
              before(grammarAccess.getStringLiteralAccess().getStringLiteralAction_0()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2261:1: ()
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2263:1: 
+            // InternalBase.g:2261:1: ()
+            // InternalBase.g:2263:1: 
             {
             }
 
@@ -6282,16 +6282,16 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StringLiteral__Group__1"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2273:1: rule__StringLiteral__Group__1 : rule__StringLiteral__Group__1__Impl ;
+    // InternalBase.g:2273:1: rule__StringLiteral__Group__1 : rule__StringLiteral__Group__1__Impl ;
     public final void rule__StringLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2277:1: ( rule__StringLiteral__Group__1__Impl )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2278:2: rule__StringLiteral__Group__1__Impl
+            // InternalBase.g:2277:1: ( rule__StringLiteral__Group__1__Impl )
+            // InternalBase.g:2278:2: rule__StringLiteral__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__StringLiteral__Group__1__Impl_in_rule__StringLiteral__Group__14562);
+            pushFollow(FOLLOW_2);
             rule__StringLiteral__Group__1__Impl();
 
             state._fsp--;
@@ -6315,23 +6315,23 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StringLiteral__Group__1__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2284:1: rule__StringLiteral__Group__1__Impl : ( ( rule__StringLiteral__ValueAssignment_1 ) ) ;
+    // InternalBase.g:2284:1: rule__StringLiteral__Group__1__Impl : ( ( rule__StringLiteral__ValueAssignment_1 ) ) ;
     public final void rule__StringLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2288:1: ( ( ( rule__StringLiteral__ValueAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2289:1: ( ( rule__StringLiteral__ValueAssignment_1 ) )
+            // InternalBase.g:2288:1: ( ( ( rule__StringLiteral__ValueAssignment_1 ) ) )
+            // InternalBase.g:2289:1: ( ( rule__StringLiteral__ValueAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2289:1: ( ( rule__StringLiteral__ValueAssignment_1 ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2290:1: ( rule__StringLiteral__ValueAssignment_1 )
+            // InternalBase.g:2289:1: ( ( rule__StringLiteral__ValueAssignment_1 ) )
+            // InternalBase.g:2290:1: ( rule__StringLiteral__ValueAssignment_1 )
             {
              before(grammarAccess.getStringLiteralAccess().getValueAssignment_1()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2291:1: ( rule__StringLiteral__ValueAssignment_1 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2291:2: rule__StringLiteral__ValueAssignment_1
+            // InternalBase.g:2291:1: ( rule__StringLiteral__ValueAssignment_1 )
+            // InternalBase.g:2291:2: rule__StringLiteral__ValueAssignment_1
             {
-            pushFollow(FOLLOW_rule__StringLiteral__ValueAssignment_1_in_rule__StringLiteral__Group__1__Impl4589);
+            pushFollow(FOLLOW_2);
             rule__StringLiteral__ValueAssignment_1();
 
             state._fsp--;
@@ -6362,21 +6362,21 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Integer__Group_0__0"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2305:1: rule__Integer__Group_0__0 : rule__Integer__Group_0__0__Impl rule__Integer__Group_0__1 ;
+    // InternalBase.g:2305:1: rule__Integer__Group_0__0 : rule__Integer__Group_0__0__Impl rule__Integer__Group_0__1 ;
     public final void rule__Integer__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2309:1: ( rule__Integer__Group_0__0__Impl rule__Integer__Group_0__1 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2310:2: rule__Integer__Group_0__0__Impl rule__Integer__Group_0__1
+            // InternalBase.g:2309:1: ( rule__Integer__Group_0__0__Impl rule__Integer__Group_0__1 )
+            // InternalBase.g:2310:2: rule__Integer__Group_0__0__Impl rule__Integer__Group_0__1
             {
-            pushFollow(FOLLOW_rule__Integer__Group_0__0__Impl_in_rule__Integer__Group_0__04623);
+            pushFollow(FOLLOW_21);
             rule__Integer__Group_0__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Integer__Group_0__1_in_rule__Integer__Group_0__04626);
+            pushFollow(FOLLOW_2);
             rule__Integer__Group_0__1();
 
             state._fsp--;
@@ -6400,20 +6400,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Integer__Group_0__0__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2317:1: rule__Integer__Group_0__0__Impl : ( ( rule__Integer__Alternatives_0_0 )? ) ;
+    // InternalBase.g:2317:1: rule__Integer__Group_0__0__Impl : ( ( rule__Integer__Alternatives_0_0 )? ) ;
     public final void rule__Integer__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2321:1: ( ( ( rule__Integer__Alternatives_0_0 )? ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2322:1: ( ( rule__Integer__Alternatives_0_0 )? )
+            // InternalBase.g:2321:1: ( ( ( rule__Integer__Alternatives_0_0 )? ) )
+            // InternalBase.g:2322:1: ( ( rule__Integer__Alternatives_0_0 )? )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2322:1: ( ( rule__Integer__Alternatives_0_0 )? )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2323:1: ( rule__Integer__Alternatives_0_0 )?
+            // InternalBase.g:2322:1: ( ( rule__Integer__Alternatives_0_0 )? )
+            // InternalBase.g:2323:1: ( rule__Integer__Alternatives_0_0 )?
             {
              before(grammarAccess.getIntegerAccess().getAlternatives_0_0()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2324:1: ( rule__Integer__Alternatives_0_0 )?
+            // InternalBase.g:2324:1: ( rule__Integer__Alternatives_0_0 )?
             int alt20=2;
             int LA20_0 = input.LA(1);
 
@@ -6422,9 +6422,9 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
             }
             switch (alt20) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2324:2: rule__Integer__Alternatives_0_0
+                    // InternalBase.g:2324:2: rule__Integer__Alternatives_0_0
                     {
-                    pushFollow(FOLLOW_rule__Integer__Alternatives_0_0_in_rule__Integer__Group_0__0__Impl4653);
+                    pushFollow(FOLLOW_2);
                     rule__Integer__Alternatives_0_0();
 
                     state._fsp--;
@@ -6458,16 +6458,16 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Integer__Group_0__1"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2334:1: rule__Integer__Group_0__1 : rule__Integer__Group_0__1__Impl ;
+    // InternalBase.g:2334:1: rule__Integer__Group_0__1 : rule__Integer__Group_0__1__Impl ;
     public final void rule__Integer__Group_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2338:1: ( rule__Integer__Group_0__1__Impl )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2339:2: rule__Integer__Group_0__1__Impl
+            // InternalBase.g:2338:1: ( rule__Integer__Group_0__1__Impl )
+            // InternalBase.g:2339:2: rule__Integer__Group_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__Integer__Group_0__1__Impl_in_rule__Integer__Group_0__14684);
+            pushFollow(FOLLOW_2);
             rule__Integer__Group_0__1__Impl();
 
             state._fsp--;
@@ -6491,20 +6491,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Integer__Group_0__1__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2345:1: rule__Integer__Group_0__1__Impl : ( RULE_INT ) ;
+    // InternalBase.g:2345:1: rule__Integer__Group_0__1__Impl : ( RULE_INT ) ;
     public final void rule__Integer__Group_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2349:1: ( ( RULE_INT ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2350:1: ( RULE_INT )
+            // InternalBase.g:2349:1: ( ( RULE_INT ) )
+            // InternalBase.g:2350:1: ( RULE_INT )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2350:1: ( RULE_INT )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2351:1: RULE_INT
+            // InternalBase.g:2350:1: ( RULE_INT )
+            // InternalBase.g:2351:1: RULE_INT
             {
              before(grammarAccess.getIntegerAccess().getINTTerminalRuleCall_0_1()); 
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__Integer__Group_0__1__Impl4711); 
+            match(input,RULE_INT,FOLLOW_2); 
              after(grammarAccess.getIntegerAccess().getINTTerminalRuleCall_0_1()); 
 
             }
@@ -6528,21 +6528,21 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Decimal__Group__0"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2366:1: rule__Decimal__Group__0 : rule__Decimal__Group__0__Impl rule__Decimal__Group__1 ;
+    // InternalBase.g:2366:1: rule__Decimal__Group__0 : rule__Decimal__Group__0__Impl rule__Decimal__Group__1 ;
     public final void rule__Decimal__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2370:1: ( rule__Decimal__Group__0__Impl rule__Decimal__Group__1 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2371:2: rule__Decimal__Group__0__Impl rule__Decimal__Group__1
+            // InternalBase.g:2370:1: ( rule__Decimal__Group__0__Impl rule__Decimal__Group__1 )
+            // InternalBase.g:2371:2: rule__Decimal__Group__0__Impl rule__Decimal__Group__1
             {
-            pushFollow(FOLLOW_rule__Decimal__Group__0__Impl_in_rule__Decimal__Group__04744);
+            pushFollow(FOLLOW_21);
             rule__Decimal__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Decimal__Group__1_in_rule__Decimal__Group__04747);
+            pushFollow(FOLLOW_2);
             rule__Decimal__Group__1();
 
             state._fsp--;
@@ -6566,20 +6566,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Decimal__Group__0__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2378:1: rule__Decimal__Group__0__Impl : ( ( rule__Decimal__Alternatives_0 )? ) ;
+    // InternalBase.g:2378:1: rule__Decimal__Group__0__Impl : ( ( rule__Decimal__Alternatives_0 )? ) ;
     public final void rule__Decimal__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2382:1: ( ( ( rule__Decimal__Alternatives_0 )? ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2383:1: ( ( rule__Decimal__Alternatives_0 )? )
+            // InternalBase.g:2382:1: ( ( ( rule__Decimal__Alternatives_0 )? ) )
+            // InternalBase.g:2383:1: ( ( rule__Decimal__Alternatives_0 )? )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2383:1: ( ( rule__Decimal__Alternatives_0 )? )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2384:1: ( rule__Decimal__Alternatives_0 )?
+            // InternalBase.g:2383:1: ( ( rule__Decimal__Alternatives_0 )? )
+            // InternalBase.g:2384:1: ( rule__Decimal__Alternatives_0 )?
             {
              before(grammarAccess.getDecimalAccess().getAlternatives_0()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2385:1: ( rule__Decimal__Alternatives_0 )?
+            // InternalBase.g:2385:1: ( rule__Decimal__Alternatives_0 )?
             int alt21=2;
             int LA21_0 = input.LA(1);
 
@@ -6588,9 +6588,9 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
             }
             switch (alt21) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2385:2: rule__Decimal__Alternatives_0
+                    // InternalBase.g:2385:2: rule__Decimal__Alternatives_0
                     {
-                    pushFollow(FOLLOW_rule__Decimal__Alternatives_0_in_rule__Decimal__Group__0__Impl4774);
+                    pushFollow(FOLLOW_2);
                     rule__Decimal__Alternatives_0();
 
                     state._fsp--;
@@ -6624,21 +6624,21 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Decimal__Group__1"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2395:1: rule__Decimal__Group__1 : rule__Decimal__Group__1__Impl rule__Decimal__Group__2 ;
+    // InternalBase.g:2395:1: rule__Decimal__Group__1 : rule__Decimal__Group__1__Impl rule__Decimal__Group__2 ;
     public final void rule__Decimal__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2399:1: ( rule__Decimal__Group__1__Impl rule__Decimal__Group__2 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2400:2: rule__Decimal__Group__1__Impl rule__Decimal__Group__2
+            // InternalBase.g:2399:1: ( rule__Decimal__Group__1__Impl rule__Decimal__Group__2 )
+            // InternalBase.g:2400:2: rule__Decimal__Group__1__Impl rule__Decimal__Group__2
             {
-            pushFollow(FOLLOW_rule__Decimal__Group__1__Impl_in_rule__Decimal__Group__14805);
+            pushFollow(FOLLOW_22);
             rule__Decimal__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Decimal__Group__2_in_rule__Decimal__Group__14808);
+            pushFollow(FOLLOW_2);
             rule__Decimal__Group__2();
 
             state._fsp--;
@@ -6662,20 +6662,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Decimal__Group__1__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2407:1: rule__Decimal__Group__1__Impl : ( RULE_INT ) ;
+    // InternalBase.g:2407:1: rule__Decimal__Group__1__Impl : ( RULE_INT ) ;
     public final void rule__Decimal__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2411:1: ( ( RULE_INT ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2412:1: ( RULE_INT )
+            // InternalBase.g:2411:1: ( ( RULE_INT ) )
+            // InternalBase.g:2412:1: ( RULE_INT )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2412:1: ( RULE_INT )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2413:1: RULE_INT
+            // InternalBase.g:2412:1: ( RULE_INT )
+            // InternalBase.g:2413:1: RULE_INT
             {
              before(grammarAccess.getDecimalAccess().getINTTerminalRuleCall_1()); 
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__Decimal__Group__1__Impl4835); 
+            match(input,RULE_INT,FOLLOW_2); 
              after(grammarAccess.getDecimalAccess().getINTTerminalRuleCall_1()); 
 
             }
@@ -6699,21 +6699,21 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Decimal__Group__2"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2424:1: rule__Decimal__Group__2 : rule__Decimal__Group__2__Impl rule__Decimal__Group__3 ;
+    // InternalBase.g:2424:1: rule__Decimal__Group__2 : rule__Decimal__Group__2__Impl rule__Decimal__Group__3 ;
     public final void rule__Decimal__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2428:1: ( rule__Decimal__Group__2__Impl rule__Decimal__Group__3 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2429:2: rule__Decimal__Group__2__Impl rule__Decimal__Group__3
+            // InternalBase.g:2428:1: ( rule__Decimal__Group__2__Impl rule__Decimal__Group__3 )
+            // InternalBase.g:2429:2: rule__Decimal__Group__2__Impl rule__Decimal__Group__3
             {
-            pushFollow(FOLLOW_rule__Decimal__Group__2__Impl_in_rule__Decimal__Group__24864);
+            pushFollow(FOLLOW_23);
             rule__Decimal__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Decimal__Group__3_in_rule__Decimal__Group__24867);
+            pushFollow(FOLLOW_2);
             rule__Decimal__Group__3();
 
             state._fsp--;
@@ -6737,20 +6737,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Decimal__Group__2__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2436:1: rule__Decimal__Group__2__Impl : ( '.' ) ;
+    // InternalBase.g:2436:1: rule__Decimal__Group__2__Impl : ( '.' ) ;
     public final void rule__Decimal__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2440:1: ( ( '.' ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2441:1: ( '.' )
+            // InternalBase.g:2440:1: ( ( '.' ) )
+            // InternalBase.g:2441:1: ( '.' )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2441:1: ( '.' )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2442:1: '.'
+            // InternalBase.g:2441:1: ( '.' )
+            // InternalBase.g:2442:1: '.'
             {
              before(grammarAccess.getDecimalAccess().getFullStopKeyword_2()); 
-            match(input,34,FOLLOW_34_in_rule__Decimal__Group__2__Impl4895); 
+            match(input,34,FOLLOW_2); 
              after(grammarAccess.getDecimalAccess().getFullStopKeyword_2()); 
 
             }
@@ -6774,16 +6774,16 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Decimal__Group__3"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2455:1: rule__Decimal__Group__3 : rule__Decimal__Group__3__Impl ;
+    // InternalBase.g:2455:1: rule__Decimal__Group__3 : rule__Decimal__Group__3__Impl ;
     public final void rule__Decimal__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2459:1: ( rule__Decimal__Group__3__Impl )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2460:2: rule__Decimal__Group__3__Impl
+            // InternalBase.g:2459:1: ( rule__Decimal__Group__3__Impl )
+            // InternalBase.g:2460:2: rule__Decimal__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__Decimal__Group__3__Impl_in_rule__Decimal__Group__34926);
+            pushFollow(FOLLOW_2);
             rule__Decimal__Group__3__Impl();
 
             state._fsp--;
@@ -6807,20 +6807,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Decimal__Group__3__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2466:1: rule__Decimal__Group__3__Impl : ( RULE_INT ) ;
+    // InternalBase.g:2466:1: rule__Decimal__Group__3__Impl : ( RULE_INT ) ;
     public final void rule__Decimal__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2470:1: ( ( RULE_INT ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2471:1: ( RULE_INT )
+            // InternalBase.g:2470:1: ( ( RULE_INT ) )
+            // InternalBase.g:2471:1: ( RULE_INT )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2471:1: ( RULE_INT )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2472:1: RULE_INT
+            // InternalBase.g:2471:1: ( RULE_INT )
+            // InternalBase.g:2472:1: RULE_INT
             {
              before(grammarAccess.getDecimalAccess().getINTTerminalRuleCall_3()); 
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__Decimal__Group__3__Impl4953); 
+            match(input,RULE_INT,FOLLOW_2); 
              after(grammarAccess.getDecimalAccess().getINTTerminalRuleCall_3()); 
 
             }
@@ -6844,21 +6844,21 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__0"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2491:1: rule__DecimalExp__Group__0 : rule__DecimalExp__Group__0__Impl rule__DecimalExp__Group__1 ;
+    // InternalBase.g:2491:1: rule__DecimalExp__Group__0 : rule__DecimalExp__Group__0__Impl rule__DecimalExp__Group__1 ;
     public final void rule__DecimalExp__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2495:1: ( rule__DecimalExp__Group__0__Impl rule__DecimalExp__Group__1 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2496:2: rule__DecimalExp__Group__0__Impl rule__DecimalExp__Group__1
+            // InternalBase.g:2495:1: ( rule__DecimalExp__Group__0__Impl rule__DecimalExp__Group__1 )
+            // InternalBase.g:2496:2: rule__DecimalExp__Group__0__Impl rule__DecimalExp__Group__1
             {
-            pushFollow(FOLLOW_rule__DecimalExp__Group__0__Impl_in_rule__DecimalExp__Group__04990);
+            pushFollow(FOLLOW_20);
             rule__DecimalExp__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__DecimalExp__Group__1_in_rule__DecimalExp__Group__04993);
+            pushFollow(FOLLOW_2);
             rule__DecimalExp__Group__1();
 
             state._fsp--;
@@ -6882,20 +6882,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__0__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2503:1: rule__DecimalExp__Group__0__Impl : ( ( rule__DecimalExp__Alternatives_0 )? ) ;
+    // InternalBase.g:2503:1: rule__DecimalExp__Group__0__Impl : ( ( rule__DecimalExp__Alternatives_0 )? ) ;
     public final void rule__DecimalExp__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2507:1: ( ( ( rule__DecimalExp__Alternatives_0 )? ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2508:1: ( ( rule__DecimalExp__Alternatives_0 )? )
+            // InternalBase.g:2507:1: ( ( ( rule__DecimalExp__Alternatives_0 )? ) )
+            // InternalBase.g:2508:1: ( ( rule__DecimalExp__Alternatives_0 )? )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2508:1: ( ( rule__DecimalExp__Alternatives_0 )? )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2509:1: ( rule__DecimalExp__Alternatives_0 )?
+            // InternalBase.g:2508:1: ( ( rule__DecimalExp__Alternatives_0 )? )
+            // InternalBase.g:2509:1: ( rule__DecimalExp__Alternatives_0 )?
             {
              before(grammarAccess.getDecimalExpAccess().getAlternatives_0()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2510:1: ( rule__DecimalExp__Alternatives_0 )?
+            // InternalBase.g:2510:1: ( rule__DecimalExp__Alternatives_0 )?
             int alt22=2;
             int LA22_0 = input.LA(1);
 
@@ -6904,9 +6904,9 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
             }
             switch (alt22) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2510:2: rule__DecimalExp__Alternatives_0
+                    // InternalBase.g:2510:2: rule__DecimalExp__Alternatives_0
                     {
-                    pushFollow(FOLLOW_rule__DecimalExp__Alternatives_0_in_rule__DecimalExp__Group__0__Impl5020);
+                    pushFollow(FOLLOW_2);
                     rule__DecimalExp__Alternatives_0();
 
                     state._fsp--;
@@ -6940,21 +6940,21 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__1"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2520:1: rule__DecimalExp__Group__1 : rule__DecimalExp__Group__1__Impl rule__DecimalExp__Group__2 ;
+    // InternalBase.g:2520:1: rule__DecimalExp__Group__1 : rule__DecimalExp__Group__1__Impl rule__DecimalExp__Group__2 ;
     public final void rule__DecimalExp__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2524:1: ( rule__DecimalExp__Group__1__Impl rule__DecimalExp__Group__2 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2525:2: rule__DecimalExp__Group__1__Impl rule__DecimalExp__Group__2
+            // InternalBase.g:2524:1: ( rule__DecimalExp__Group__1__Impl rule__DecimalExp__Group__2 )
+            // InternalBase.g:2525:2: rule__DecimalExp__Group__1__Impl rule__DecimalExp__Group__2
             {
-            pushFollow(FOLLOW_rule__DecimalExp__Group__1__Impl_in_rule__DecimalExp__Group__15051);
+            pushFollow(FOLLOW_22);
             rule__DecimalExp__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__DecimalExp__Group__2_in_rule__DecimalExp__Group__15054);
+            pushFollow(FOLLOW_2);
             rule__DecimalExp__Group__2();
 
             state._fsp--;
@@ -6978,20 +6978,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__1__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2532:1: rule__DecimalExp__Group__1__Impl : ( RULE_INT ) ;
+    // InternalBase.g:2532:1: rule__DecimalExp__Group__1__Impl : ( RULE_INT ) ;
     public final void rule__DecimalExp__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2536:1: ( ( RULE_INT ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2537:1: ( RULE_INT )
+            // InternalBase.g:2536:1: ( ( RULE_INT ) )
+            // InternalBase.g:2537:1: ( RULE_INT )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2537:1: ( RULE_INT )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2538:1: RULE_INT
+            // InternalBase.g:2537:1: ( RULE_INT )
+            // InternalBase.g:2538:1: RULE_INT
             {
              before(grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_1()); 
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__DecimalExp__Group__1__Impl5081); 
+            match(input,RULE_INT,FOLLOW_2); 
              after(grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_1()); 
 
             }
@@ -7015,21 +7015,21 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__2"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2549:1: rule__DecimalExp__Group__2 : rule__DecimalExp__Group__2__Impl rule__DecimalExp__Group__3 ;
+    // InternalBase.g:2549:1: rule__DecimalExp__Group__2 : rule__DecimalExp__Group__2__Impl rule__DecimalExp__Group__3 ;
     public final void rule__DecimalExp__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2553:1: ( rule__DecimalExp__Group__2__Impl rule__DecimalExp__Group__3 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2554:2: rule__DecimalExp__Group__2__Impl rule__DecimalExp__Group__3
+            // InternalBase.g:2553:1: ( rule__DecimalExp__Group__2__Impl rule__DecimalExp__Group__3 )
+            // InternalBase.g:2554:2: rule__DecimalExp__Group__2__Impl rule__DecimalExp__Group__3
             {
-            pushFollow(FOLLOW_rule__DecimalExp__Group__2__Impl_in_rule__DecimalExp__Group__25110);
+            pushFollow(FOLLOW_23);
             rule__DecimalExp__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__DecimalExp__Group__3_in_rule__DecimalExp__Group__25113);
+            pushFollow(FOLLOW_2);
             rule__DecimalExp__Group__3();
 
             state._fsp--;
@@ -7053,20 +7053,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__2__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2561:1: rule__DecimalExp__Group__2__Impl : ( '.' ) ;
+    // InternalBase.g:2561:1: rule__DecimalExp__Group__2__Impl : ( '.' ) ;
     public final void rule__DecimalExp__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2565:1: ( ( '.' ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2566:1: ( '.' )
+            // InternalBase.g:2565:1: ( ( '.' ) )
+            // InternalBase.g:2566:1: ( '.' )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2566:1: ( '.' )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2567:1: '.'
+            // InternalBase.g:2566:1: ( '.' )
+            // InternalBase.g:2567:1: '.'
             {
              before(grammarAccess.getDecimalExpAccess().getFullStopKeyword_2()); 
-            match(input,34,FOLLOW_34_in_rule__DecimalExp__Group__2__Impl5141); 
+            match(input,34,FOLLOW_2); 
              after(grammarAccess.getDecimalExpAccess().getFullStopKeyword_2()); 
 
             }
@@ -7090,21 +7090,21 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__3"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2580:1: rule__DecimalExp__Group__3 : rule__DecimalExp__Group__3__Impl rule__DecimalExp__Group__4 ;
+    // InternalBase.g:2580:1: rule__DecimalExp__Group__3 : rule__DecimalExp__Group__3__Impl rule__DecimalExp__Group__4 ;
     public final void rule__DecimalExp__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2584:1: ( rule__DecimalExp__Group__3__Impl rule__DecimalExp__Group__4 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2585:2: rule__DecimalExp__Group__3__Impl rule__DecimalExp__Group__4
+            // InternalBase.g:2584:1: ( rule__DecimalExp__Group__3__Impl rule__DecimalExp__Group__4 )
+            // InternalBase.g:2585:2: rule__DecimalExp__Group__3__Impl rule__DecimalExp__Group__4
             {
-            pushFollow(FOLLOW_rule__DecimalExp__Group__3__Impl_in_rule__DecimalExp__Group__35172);
+            pushFollow(FOLLOW_24);
             rule__DecimalExp__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__DecimalExp__Group__4_in_rule__DecimalExp__Group__35175);
+            pushFollow(FOLLOW_2);
             rule__DecimalExp__Group__4();
 
             state._fsp--;
@@ -7128,20 +7128,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__3__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2592:1: rule__DecimalExp__Group__3__Impl : ( RULE_INT ) ;
+    // InternalBase.g:2592:1: rule__DecimalExp__Group__3__Impl : ( RULE_INT ) ;
     public final void rule__DecimalExp__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2596:1: ( ( RULE_INT ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2597:1: ( RULE_INT )
+            // InternalBase.g:2596:1: ( ( RULE_INT ) )
+            // InternalBase.g:2597:1: ( RULE_INT )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2597:1: ( RULE_INT )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2598:1: RULE_INT
+            // InternalBase.g:2597:1: ( RULE_INT )
+            // InternalBase.g:2598:1: RULE_INT
             {
              before(grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_3()); 
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__DecimalExp__Group__3__Impl5202); 
+            match(input,RULE_INT,FOLLOW_2); 
              after(grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_3()); 
 
             }
@@ -7165,21 +7165,21 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__4"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2609:1: rule__DecimalExp__Group__4 : rule__DecimalExp__Group__4__Impl rule__DecimalExp__Group__5 ;
+    // InternalBase.g:2609:1: rule__DecimalExp__Group__4 : rule__DecimalExp__Group__4__Impl rule__DecimalExp__Group__5 ;
     public final void rule__DecimalExp__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2613:1: ( rule__DecimalExp__Group__4__Impl rule__DecimalExp__Group__5 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2614:2: rule__DecimalExp__Group__4__Impl rule__DecimalExp__Group__5
+            // InternalBase.g:2613:1: ( rule__DecimalExp__Group__4__Impl rule__DecimalExp__Group__5 )
+            // InternalBase.g:2614:2: rule__DecimalExp__Group__4__Impl rule__DecimalExp__Group__5
             {
-            pushFollow(FOLLOW_rule__DecimalExp__Group__4__Impl_in_rule__DecimalExp__Group__45231);
+            pushFollow(FOLLOW_21);
             rule__DecimalExp__Group__4__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__DecimalExp__Group__5_in_rule__DecimalExp__Group__45234);
+            pushFollow(FOLLOW_2);
             rule__DecimalExp__Group__5();
 
             state._fsp--;
@@ -7203,23 +7203,23 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__4__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2621:1: rule__DecimalExp__Group__4__Impl : ( ( rule__DecimalExp__Alternatives_4 ) ) ;
+    // InternalBase.g:2621:1: rule__DecimalExp__Group__4__Impl : ( ( rule__DecimalExp__Alternatives_4 ) ) ;
     public final void rule__DecimalExp__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2625:1: ( ( ( rule__DecimalExp__Alternatives_4 ) ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2626:1: ( ( rule__DecimalExp__Alternatives_4 ) )
+            // InternalBase.g:2625:1: ( ( ( rule__DecimalExp__Alternatives_4 ) ) )
+            // InternalBase.g:2626:1: ( ( rule__DecimalExp__Alternatives_4 ) )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2626:1: ( ( rule__DecimalExp__Alternatives_4 ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2627:1: ( rule__DecimalExp__Alternatives_4 )
+            // InternalBase.g:2626:1: ( ( rule__DecimalExp__Alternatives_4 ) )
+            // InternalBase.g:2627:1: ( rule__DecimalExp__Alternatives_4 )
             {
              before(grammarAccess.getDecimalExpAccess().getAlternatives_4()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2628:1: ( rule__DecimalExp__Alternatives_4 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2628:2: rule__DecimalExp__Alternatives_4
+            // InternalBase.g:2628:1: ( rule__DecimalExp__Alternatives_4 )
+            // InternalBase.g:2628:2: rule__DecimalExp__Alternatives_4
             {
-            pushFollow(FOLLOW_rule__DecimalExp__Alternatives_4_in_rule__DecimalExp__Group__4__Impl5261);
+            pushFollow(FOLLOW_2);
             rule__DecimalExp__Alternatives_4();
 
             state._fsp--;
@@ -7250,21 +7250,21 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__5"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2638:1: rule__DecimalExp__Group__5 : rule__DecimalExp__Group__5__Impl rule__DecimalExp__Group__6 ;
+    // InternalBase.g:2638:1: rule__DecimalExp__Group__5 : rule__DecimalExp__Group__5__Impl rule__DecimalExp__Group__6 ;
     public final void rule__DecimalExp__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2642:1: ( rule__DecimalExp__Group__5__Impl rule__DecimalExp__Group__6 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2643:2: rule__DecimalExp__Group__5__Impl rule__DecimalExp__Group__6
+            // InternalBase.g:2642:1: ( rule__DecimalExp__Group__5__Impl rule__DecimalExp__Group__6 )
+            // InternalBase.g:2643:2: rule__DecimalExp__Group__5__Impl rule__DecimalExp__Group__6
             {
-            pushFollow(FOLLOW_rule__DecimalExp__Group__5__Impl_in_rule__DecimalExp__Group__55291);
+            pushFollow(FOLLOW_21);
             rule__DecimalExp__Group__5__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__DecimalExp__Group__6_in_rule__DecimalExp__Group__55294);
+            pushFollow(FOLLOW_2);
             rule__DecimalExp__Group__6();
 
             state._fsp--;
@@ -7288,20 +7288,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__5__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2650:1: rule__DecimalExp__Group__5__Impl : ( ( rule__DecimalExp__Alternatives_5 )? ) ;
+    // InternalBase.g:2650:1: rule__DecimalExp__Group__5__Impl : ( ( rule__DecimalExp__Alternatives_5 )? ) ;
     public final void rule__DecimalExp__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2654:1: ( ( ( rule__DecimalExp__Alternatives_5 )? ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2655:1: ( ( rule__DecimalExp__Alternatives_5 )? )
+            // InternalBase.g:2654:1: ( ( ( rule__DecimalExp__Alternatives_5 )? ) )
+            // InternalBase.g:2655:1: ( ( rule__DecimalExp__Alternatives_5 )? )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2655:1: ( ( rule__DecimalExp__Alternatives_5 )? )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2656:1: ( rule__DecimalExp__Alternatives_5 )?
+            // InternalBase.g:2655:1: ( ( rule__DecimalExp__Alternatives_5 )? )
+            // InternalBase.g:2656:1: ( rule__DecimalExp__Alternatives_5 )?
             {
              before(grammarAccess.getDecimalExpAccess().getAlternatives_5()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2657:1: ( rule__DecimalExp__Alternatives_5 )?
+            // InternalBase.g:2657:1: ( rule__DecimalExp__Alternatives_5 )?
             int alt23=2;
             int LA23_0 = input.LA(1);
 
@@ -7310,9 +7310,9 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
             }
             switch (alt23) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2657:2: rule__DecimalExp__Alternatives_5
+                    // InternalBase.g:2657:2: rule__DecimalExp__Alternatives_5
                     {
-                    pushFollow(FOLLOW_rule__DecimalExp__Alternatives_5_in_rule__DecimalExp__Group__5__Impl5321);
+                    pushFollow(FOLLOW_2);
                     rule__DecimalExp__Alternatives_5();
 
                     state._fsp--;
@@ -7346,16 +7346,16 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__6"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2667:1: rule__DecimalExp__Group__6 : rule__DecimalExp__Group__6__Impl ;
+    // InternalBase.g:2667:1: rule__DecimalExp__Group__6 : rule__DecimalExp__Group__6__Impl ;
     public final void rule__DecimalExp__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2671:1: ( rule__DecimalExp__Group__6__Impl )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2672:2: rule__DecimalExp__Group__6__Impl
+            // InternalBase.g:2671:1: ( rule__DecimalExp__Group__6__Impl )
+            // InternalBase.g:2672:2: rule__DecimalExp__Group__6__Impl
             {
-            pushFollow(FOLLOW_rule__DecimalExp__Group__6__Impl_in_rule__DecimalExp__Group__65352);
+            pushFollow(FOLLOW_2);
             rule__DecimalExp__Group__6__Impl();
 
             state._fsp--;
@@ -7379,20 +7379,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__6__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2678:1: rule__DecimalExp__Group__6__Impl : ( RULE_INT ) ;
+    // InternalBase.g:2678:1: rule__DecimalExp__Group__6__Impl : ( RULE_INT ) ;
     public final void rule__DecimalExp__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2682:1: ( ( RULE_INT ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2683:1: ( RULE_INT )
+            // InternalBase.g:2682:1: ( ( RULE_INT ) )
+            // InternalBase.g:2683:1: ( RULE_INT )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2683:1: ( RULE_INT )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2684:1: RULE_INT
+            // InternalBase.g:2683:1: ( RULE_INT )
+            // InternalBase.g:2684:1: RULE_INT
             {
              before(grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_6()); 
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__DecimalExp__Group__6__Impl5379); 
+            match(input,RULE_INT,FOLLOW_2); 
              after(grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_6()); 
 
             }
@@ -7416,21 +7416,21 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FQN__Group__0"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2709:1: rule__FQN__Group__0 : rule__FQN__Group__0__Impl rule__FQN__Group__1 ;
+    // InternalBase.g:2709:1: rule__FQN__Group__0 : rule__FQN__Group__0__Impl rule__FQN__Group__1 ;
     public final void rule__FQN__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2713:1: ( rule__FQN__Group__0__Impl rule__FQN__Group__1 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2714:2: rule__FQN__Group__0__Impl rule__FQN__Group__1
+            // InternalBase.g:2713:1: ( rule__FQN__Group__0__Impl rule__FQN__Group__1 )
+            // InternalBase.g:2714:2: rule__FQN__Group__0__Impl rule__FQN__Group__1
             {
-            pushFollow(FOLLOW_rule__FQN__Group__0__Impl_in_rule__FQN__Group__05422);
+            pushFollow(FOLLOW_22);
             rule__FQN__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__FQN__Group__1_in_rule__FQN__Group__05425);
+            pushFollow(FOLLOW_2);
             rule__FQN__Group__1();
 
             state._fsp--;
@@ -7454,20 +7454,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FQN__Group__0__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2721:1: rule__FQN__Group__0__Impl : ( RULE_ID ) ;
+    // InternalBase.g:2721:1: rule__FQN__Group__0__Impl : ( RULE_ID ) ;
     public final void rule__FQN__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2725:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2726:1: ( RULE_ID )
+            // InternalBase.g:2725:1: ( ( RULE_ID ) )
+            // InternalBase.g:2726:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2726:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2727:1: RULE_ID
+            // InternalBase.g:2726:1: ( RULE_ID )
+            // InternalBase.g:2727:1: RULE_ID
             {
              before(grammarAccess.getFQNAccess().getIDTerminalRuleCall_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__FQN__Group__0__Impl5452); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getFQNAccess().getIDTerminalRuleCall_0()); 
 
             }
@@ -7491,16 +7491,16 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FQN__Group__1"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2738:1: rule__FQN__Group__1 : rule__FQN__Group__1__Impl ;
+    // InternalBase.g:2738:1: rule__FQN__Group__1 : rule__FQN__Group__1__Impl ;
     public final void rule__FQN__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2742:1: ( rule__FQN__Group__1__Impl )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2743:2: rule__FQN__Group__1__Impl
+            // InternalBase.g:2742:1: ( rule__FQN__Group__1__Impl )
+            // InternalBase.g:2743:2: rule__FQN__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__FQN__Group__1__Impl_in_rule__FQN__Group__15481);
+            pushFollow(FOLLOW_2);
             rule__FQN__Group__1__Impl();
 
             state._fsp--;
@@ -7524,20 +7524,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FQN__Group__1__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2749:1: rule__FQN__Group__1__Impl : ( ( rule__FQN__Group_1__0 )* ) ;
+    // InternalBase.g:2749:1: rule__FQN__Group__1__Impl : ( ( rule__FQN__Group_1__0 )* ) ;
     public final void rule__FQN__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2753:1: ( ( ( rule__FQN__Group_1__0 )* ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2754:1: ( ( rule__FQN__Group_1__0 )* )
+            // InternalBase.g:2753:1: ( ( ( rule__FQN__Group_1__0 )* ) )
+            // InternalBase.g:2754:1: ( ( rule__FQN__Group_1__0 )* )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2754:1: ( ( rule__FQN__Group_1__0 )* )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2755:1: ( rule__FQN__Group_1__0 )*
+            // InternalBase.g:2754:1: ( ( rule__FQN__Group_1__0 )* )
+            // InternalBase.g:2755:1: ( rule__FQN__Group_1__0 )*
             {
              before(grammarAccess.getFQNAccess().getGroup_1()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2756:1: ( rule__FQN__Group_1__0 )*
+            // InternalBase.g:2756:1: ( rule__FQN__Group_1__0 )*
             loop24:
             do {
                 int alt24=2;
@@ -7550,9 +7550,9 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
                 switch (alt24) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2756:2: rule__FQN__Group_1__0
+            	    // InternalBase.g:2756:2: rule__FQN__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__FQN__Group_1__0_in_rule__FQN__Group__1__Impl5508);
+            	    pushFollow(FOLLOW_25);
             	    rule__FQN__Group_1__0();
 
             	    state._fsp--;
@@ -7589,21 +7589,21 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FQN__Group_1__0"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2770:1: rule__FQN__Group_1__0 : rule__FQN__Group_1__0__Impl rule__FQN__Group_1__1 ;
+    // InternalBase.g:2770:1: rule__FQN__Group_1__0 : rule__FQN__Group_1__0__Impl rule__FQN__Group_1__1 ;
     public final void rule__FQN__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2774:1: ( rule__FQN__Group_1__0__Impl rule__FQN__Group_1__1 )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2775:2: rule__FQN__Group_1__0__Impl rule__FQN__Group_1__1
+            // InternalBase.g:2774:1: ( rule__FQN__Group_1__0__Impl rule__FQN__Group_1__1 )
+            // InternalBase.g:2775:2: rule__FQN__Group_1__0__Impl rule__FQN__Group_1__1
             {
-            pushFollow(FOLLOW_rule__FQN__Group_1__0__Impl_in_rule__FQN__Group_1__05543);
+            pushFollow(FOLLOW_3);
             rule__FQN__Group_1__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__FQN__Group_1__1_in_rule__FQN__Group_1__05546);
+            pushFollow(FOLLOW_2);
             rule__FQN__Group_1__1();
 
             state._fsp--;
@@ -7627,20 +7627,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FQN__Group_1__0__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2782:1: rule__FQN__Group_1__0__Impl : ( '.' ) ;
+    // InternalBase.g:2782:1: rule__FQN__Group_1__0__Impl : ( '.' ) ;
     public final void rule__FQN__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2786:1: ( ( '.' ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2787:1: ( '.' )
+            // InternalBase.g:2786:1: ( ( '.' ) )
+            // InternalBase.g:2787:1: ( '.' )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2787:1: ( '.' )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2788:1: '.'
+            // InternalBase.g:2787:1: ( '.' )
+            // InternalBase.g:2788:1: '.'
             {
              before(grammarAccess.getFQNAccess().getFullStopKeyword_1_0()); 
-            match(input,34,FOLLOW_34_in_rule__FQN__Group_1__0__Impl5574); 
+            match(input,34,FOLLOW_2); 
              after(grammarAccess.getFQNAccess().getFullStopKeyword_1_0()); 
 
             }
@@ -7664,16 +7664,16 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FQN__Group_1__1"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2801:1: rule__FQN__Group_1__1 : rule__FQN__Group_1__1__Impl ;
+    // InternalBase.g:2801:1: rule__FQN__Group_1__1 : rule__FQN__Group_1__1__Impl ;
     public final void rule__FQN__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2805:1: ( rule__FQN__Group_1__1__Impl )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2806:2: rule__FQN__Group_1__1__Impl
+            // InternalBase.g:2805:1: ( rule__FQN__Group_1__1__Impl )
+            // InternalBase.g:2806:2: rule__FQN__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__FQN__Group_1__1__Impl_in_rule__FQN__Group_1__15605);
+            pushFollow(FOLLOW_2);
             rule__FQN__Group_1__1__Impl();
 
             state._fsp--;
@@ -7697,20 +7697,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FQN__Group_1__1__Impl"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2812:1: rule__FQN__Group_1__1__Impl : ( RULE_ID ) ;
+    // InternalBase.g:2812:1: rule__FQN__Group_1__1__Impl : ( RULE_ID ) ;
     public final void rule__FQN__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2816:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2817:1: ( RULE_ID )
+            // InternalBase.g:2816:1: ( ( RULE_ID ) )
+            // InternalBase.g:2817:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2817:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2818:1: RULE_ID
+            // InternalBase.g:2817:1: ( RULE_ID )
+            // InternalBase.g:2818:1: RULE_ID
             {
              before(grammarAccess.getFQNAccess().getIDTerminalRuleCall_1_1()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__FQN__Group_1__1__Impl5632); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getFQNAccess().getIDTerminalRuleCall_1_1()); 
 
             }
@@ -7734,24 +7734,24 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Annotation__TypeAssignment_1"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2834:1: rule__Annotation__TypeAssignment_1 : ( ( ruleFQN ) ) ;
+    // InternalBase.g:2834:1: rule__Annotation__TypeAssignment_1 : ( ( ruleFQN ) ) ;
     public final void rule__Annotation__TypeAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2838:1: ( ( ( ruleFQN ) ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2839:1: ( ( ruleFQN ) )
+            // InternalBase.g:2838:1: ( ( ( ruleFQN ) ) )
+            // InternalBase.g:2839:1: ( ( ruleFQN ) )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2839:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2840:1: ( ruleFQN )
+            // InternalBase.g:2839:1: ( ( ruleFQN ) )
+            // InternalBase.g:2840:1: ( ruleFQN )
             {
              before(grammarAccess.getAnnotationAccess().getTypeAnnotationTypeCrossReference_1_0()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2841:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2842:1: ruleFQN
+            // InternalBase.g:2841:1: ( ruleFQN )
+            // InternalBase.g:2842:1: ruleFQN
             {
              before(grammarAccess.getAnnotationAccess().getTypeAnnotationTypeFQNParserRuleCall_1_0_1()); 
-            pushFollow(FOLLOW_ruleFQN_in_rule__Annotation__TypeAssignment_15674);
+            pushFollow(FOLLOW_2);
             ruleFQN();
 
             state._fsp--;
@@ -7783,20 +7783,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Annotation__AttributesAssignment_2_1"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2853:1: rule__Annotation__AttributesAssignment_2_1 : ( ruleKeyValue ) ;
+    // InternalBase.g:2853:1: rule__Annotation__AttributesAssignment_2_1 : ( ruleKeyValue ) ;
     public final void rule__Annotation__AttributesAssignment_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2857:1: ( ( ruleKeyValue ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2858:1: ( ruleKeyValue )
+            // InternalBase.g:2857:1: ( ( ruleKeyValue ) )
+            // InternalBase.g:2858:1: ( ruleKeyValue )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2858:1: ( ruleKeyValue )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2859:1: ruleKeyValue
+            // InternalBase.g:2858:1: ( ruleKeyValue )
+            // InternalBase.g:2859:1: ruleKeyValue
             {
              before(grammarAccess.getAnnotationAccess().getAttributesKeyValueParserRuleCall_2_1_0()); 
-            pushFollow(FOLLOW_ruleKeyValue_in_rule__Annotation__AttributesAssignment_2_15709);
+            pushFollow(FOLLOW_2);
             ruleKeyValue();
 
             state._fsp--;
@@ -7824,20 +7824,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Annotation__AttributesAssignment_2_2_1"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2868:1: rule__Annotation__AttributesAssignment_2_2_1 : ( ruleKeyValue ) ;
+    // InternalBase.g:2868:1: rule__Annotation__AttributesAssignment_2_2_1 : ( ruleKeyValue ) ;
     public final void rule__Annotation__AttributesAssignment_2_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2872:1: ( ( ruleKeyValue ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2873:1: ( ruleKeyValue )
+            // InternalBase.g:2872:1: ( ( ruleKeyValue ) )
+            // InternalBase.g:2873:1: ( ruleKeyValue )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2873:1: ( ruleKeyValue )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2874:1: ruleKeyValue
+            // InternalBase.g:2873:1: ( ruleKeyValue )
+            // InternalBase.g:2874:1: ruleKeyValue
             {
              before(grammarAccess.getAnnotationAccess().getAttributesKeyValueParserRuleCall_2_2_1_0()); 
-            pushFollow(FOLLOW_ruleKeyValue_in_rule__Annotation__AttributesAssignment_2_2_15740);
+            pushFollow(FOLLOW_2);
             ruleKeyValue();
 
             state._fsp--;
@@ -7865,20 +7865,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__KeyValue__KeyAssignment_0"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2883:1: rule__KeyValue__KeyAssignment_0 : ( RULE_ID ) ;
+    // InternalBase.g:2883:1: rule__KeyValue__KeyAssignment_0 : ( RULE_ID ) ;
     public final void rule__KeyValue__KeyAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2887:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2888:1: ( RULE_ID )
+            // InternalBase.g:2887:1: ( ( RULE_ID ) )
+            // InternalBase.g:2888:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2888:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2889:1: RULE_ID
+            // InternalBase.g:2888:1: ( RULE_ID )
+            // InternalBase.g:2889:1: RULE_ID
             {
              before(grammarAccess.getKeyValueAccess().getKeyIDTerminalRuleCall_0_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__KeyValue__KeyAssignment_05771); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getKeyValueAccess().getKeyIDTerminalRuleCall_0_0()); 
 
             }
@@ -7902,20 +7902,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__KeyValue__ValueAssignment_2"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2898:1: rule__KeyValue__ValueAssignment_2 : ( ruleLiteral ) ;
+    // InternalBase.g:2898:1: rule__KeyValue__ValueAssignment_2 : ( ruleLiteral ) ;
     public final void rule__KeyValue__ValueAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2902:1: ( ( ruleLiteral ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2903:1: ( ruleLiteral )
+            // InternalBase.g:2902:1: ( ( ruleLiteral ) )
+            // InternalBase.g:2903:1: ( ruleLiteral )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2903:1: ( ruleLiteral )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2904:1: ruleLiteral
+            // InternalBase.g:2903:1: ( ruleLiteral )
+            // InternalBase.g:2904:1: ruleLiteral
             {
              before(grammarAccess.getKeyValueAccess().getValueLiteralParserRuleCall_2_0()); 
-            pushFollow(FOLLOW_ruleLiteral_in_rule__KeyValue__ValueAssignment_25802);
+            pushFollow(FOLLOW_2);
             ruleLiteral();
 
             state._fsp--;
@@ -7943,24 +7943,24 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__OptionalAssignment_0_0"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2919:1: rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 : ( ( 'optional' ) ) ;
+    // InternalBase.g:2919:1: rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 : ( ( 'optional' ) ) ;
     public final void rule__SimpleAnnotationAttribute__OptionalAssignment_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2923:1: ( ( ( 'optional' ) ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2924:1: ( ( 'optional' ) )
+            // InternalBase.g:2923:1: ( ( ( 'optional' ) ) )
+            // InternalBase.g:2924:1: ( ( 'optional' ) )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2924:1: ( ( 'optional' ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2925:1: ( 'optional' )
+            // InternalBase.g:2924:1: ( ( 'optional' ) )
+            // InternalBase.g:2925:1: ( 'optional' )
             {
              before(grammarAccess.getSimpleAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2926:1: ( 'optional' )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2927:1: 'optional'
+            // InternalBase.g:2926:1: ( 'optional' )
+            // InternalBase.g:2927:1: 'optional'
             {
              before(grammarAccess.getSimpleAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0()); 
-            match(input,35,FOLLOW_35_in_rule__SimpleAnnotationAttribute__OptionalAssignment_0_05844); 
+            match(input,35,FOLLOW_2); 
              after(grammarAccess.getSimpleAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0()); 
 
             }
@@ -7988,20 +7988,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__NameAssignment_2"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2942:1: rule__SimpleAnnotationAttribute__NameAssignment_2 : ( RULE_ID ) ;
+    // InternalBase.g:2942:1: rule__SimpleAnnotationAttribute__NameAssignment_2 : ( RULE_ID ) ;
     public final void rule__SimpleAnnotationAttribute__NameAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2946:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2947:1: ( RULE_ID )
+            // InternalBase.g:2946:1: ( ( RULE_ID ) )
+            // InternalBase.g:2947:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2947:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2948:1: RULE_ID
+            // InternalBase.g:2947:1: ( RULE_ID )
+            // InternalBase.g:2948:1: RULE_ID
             {
              before(grammarAccess.getSimpleAnnotationAttributeAccess().getNameIDTerminalRuleCall_2_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__SimpleAnnotationAttribute__NameAssignment_25883); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getSimpleAnnotationAttributeAccess().getNameIDTerminalRuleCall_2_0()); 
 
             }
@@ -8025,20 +8025,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__TypeAssignment_4"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2957:1: rule__SimpleAnnotationAttribute__TypeAssignment_4 : ( ruleLiteralType ) ;
+    // InternalBase.g:2957:1: rule__SimpleAnnotationAttribute__TypeAssignment_4 : ( ruleLiteralType ) ;
     public final void rule__SimpleAnnotationAttribute__TypeAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2961:1: ( ( ruleLiteralType ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2962:1: ( ruleLiteralType )
+            // InternalBase.g:2961:1: ( ( ruleLiteralType ) )
+            // InternalBase.g:2962:1: ( ruleLiteralType )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2962:1: ( ruleLiteralType )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2963:1: ruleLiteralType
+            // InternalBase.g:2962:1: ( ruleLiteralType )
+            // InternalBase.g:2963:1: ruleLiteralType
             {
              before(grammarAccess.getSimpleAnnotationAttributeAccess().getTypeLiteralTypeEnumRuleCall_4_0()); 
-            pushFollow(FOLLOW_ruleLiteralType_in_rule__SimpleAnnotationAttribute__TypeAssignment_45914);
+            pushFollow(FOLLOW_2);
             ruleLiteralType();
 
             state._fsp--;
@@ -8066,24 +8066,24 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__OptionalAssignment_0_0"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2972:1: rule__EnumAnnotationAttribute__OptionalAssignment_0_0 : ( ( 'optional' ) ) ;
+    // InternalBase.g:2972:1: rule__EnumAnnotationAttribute__OptionalAssignment_0_0 : ( ( 'optional' ) ) ;
     public final void rule__EnumAnnotationAttribute__OptionalAssignment_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2976:1: ( ( ( 'optional' ) ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2977:1: ( ( 'optional' ) )
+            // InternalBase.g:2976:1: ( ( ( 'optional' ) ) )
+            // InternalBase.g:2977:1: ( ( 'optional' ) )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2977:1: ( ( 'optional' ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2978:1: ( 'optional' )
+            // InternalBase.g:2977:1: ( ( 'optional' ) )
+            // InternalBase.g:2978:1: ( 'optional' )
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2979:1: ( 'optional' )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2980:1: 'optional'
+            // InternalBase.g:2979:1: ( 'optional' )
+            // InternalBase.g:2980:1: 'optional'
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0()); 
-            match(input,35,FOLLOW_35_in_rule__EnumAnnotationAttribute__OptionalAssignment_0_05950); 
+            match(input,35,FOLLOW_2); 
              after(grammarAccess.getEnumAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0()); 
 
             }
@@ -8111,20 +8111,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__NameAssignment_2"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2995:1: rule__EnumAnnotationAttribute__NameAssignment_2 : ( RULE_ID ) ;
+    // InternalBase.g:2995:1: rule__EnumAnnotationAttribute__NameAssignment_2 : ( RULE_ID ) ;
     public final void rule__EnumAnnotationAttribute__NameAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:2999:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3000:1: ( RULE_ID )
+            // InternalBase.g:2999:1: ( ( RULE_ID ) )
+            // InternalBase.g:3000:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3000:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3001:1: RULE_ID
+            // InternalBase.g:3000:1: ( RULE_ID )
+            // InternalBase.g:3001:1: RULE_ID
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getNameIDTerminalRuleCall_2_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__EnumAnnotationAttribute__NameAssignment_25989); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getEnumAnnotationAttributeAccess().getNameIDTerminalRuleCall_2_0()); 
 
             }
@@ -8148,20 +8148,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__ValuesAssignment_5"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3010:1: rule__EnumAnnotationAttribute__ValuesAssignment_5 : ( RULE_STRING ) ;
+    // InternalBase.g:3010:1: rule__EnumAnnotationAttribute__ValuesAssignment_5 : ( RULE_STRING ) ;
     public final void rule__EnumAnnotationAttribute__ValuesAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3014:1: ( ( RULE_STRING ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3015:1: ( RULE_STRING )
+            // InternalBase.g:3014:1: ( ( RULE_STRING ) )
+            // InternalBase.g:3015:1: ( RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3015:1: ( RULE_STRING )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3016:1: RULE_STRING
+            // InternalBase.g:3015:1: ( RULE_STRING )
+            // InternalBase.g:3016:1: RULE_STRING
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getValuesSTRINGTerminalRuleCall_5_0()); 
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__EnumAnnotationAttribute__ValuesAssignment_56020); 
+            match(input,RULE_STRING,FOLLOW_2); 
              after(grammarAccess.getEnumAnnotationAttributeAccess().getValuesSTRINGTerminalRuleCall_5_0()); 
 
             }
@@ -8185,20 +8185,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__ValuesAssignment_6_1"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3025:1: rule__EnumAnnotationAttribute__ValuesAssignment_6_1 : ( RULE_STRING ) ;
+    // InternalBase.g:3025:1: rule__EnumAnnotationAttribute__ValuesAssignment_6_1 : ( RULE_STRING ) ;
     public final void rule__EnumAnnotationAttribute__ValuesAssignment_6_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3029:1: ( ( RULE_STRING ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3030:1: ( RULE_STRING )
+            // InternalBase.g:3029:1: ( ( RULE_STRING ) )
+            // InternalBase.g:3030:1: ( RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3030:1: ( RULE_STRING )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3031:1: RULE_STRING
+            // InternalBase.g:3030:1: ( RULE_STRING )
+            // InternalBase.g:3031:1: RULE_STRING
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getValuesSTRINGTerminalRuleCall_6_1_0()); 
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__EnumAnnotationAttribute__ValuesAssignment_6_16051); 
+            match(input,RULE_STRING,FOLLOW_2); 
              after(grammarAccess.getEnumAnnotationAttributeAccess().getValuesSTRINGTerminalRuleCall_6_1_0()); 
 
             }
@@ -8222,20 +8222,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Documentation__LinesAssignment_2"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3042:1: rule__Documentation__LinesAssignment_2 : ( RULE_STRING ) ;
+    // InternalBase.g:3042:1: rule__Documentation__LinesAssignment_2 : ( RULE_STRING ) ;
     public final void rule__Documentation__LinesAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3046:1: ( ( RULE_STRING ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3047:1: ( RULE_STRING )
+            // InternalBase.g:3046:1: ( ( RULE_STRING ) )
+            // InternalBase.g:3047:1: ( RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3047:1: ( RULE_STRING )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3048:1: RULE_STRING
+            // InternalBase.g:3047:1: ( RULE_STRING )
+            // InternalBase.g:3048:1: RULE_STRING
             {
              before(grammarAccess.getDocumentationAccess().getLinesSTRINGTerminalRuleCall_2_0()); 
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__Documentation__LinesAssignment_26084); 
+            match(input,RULE_STRING,FOLLOW_2); 
              after(grammarAccess.getDocumentationAccess().getLinesSTRINGTerminalRuleCall_2_0()); 
 
             }
@@ -8259,24 +8259,24 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__BooleanLiteral__IsTrueAssignment_1_1"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3059:1: rule__BooleanLiteral__IsTrueAssignment_1_1 : ( ( 'true' ) ) ;
+    // InternalBase.g:3059:1: rule__BooleanLiteral__IsTrueAssignment_1_1 : ( ( 'true' ) ) ;
     public final void rule__BooleanLiteral__IsTrueAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3063:1: ( ( ( 'true' ) ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3064:1: ( ( 'true' ) )
+            // InternalBase.g:3063:1: ( ( ( 'true' ) ) )
+            // InternalBase.g:3064:1: ( ( 'true' ) )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3064:1: ( ( 'true' ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3065:1: ( 'true' )
+            // InternalBase.g:3064:1: ( ( 'true' ) )
+            // InternalBase.g:3065:1: ( 'true' )
             {
              before(grammarAccess.getBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0()); 
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3066:1: ( 'true' )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3067:1: 'true'
+            // InternalBase.g:3066:1: ( 'true' )
+            // InternalBase.g:3067:1: 'true'
             {
              before(grammarAccess.getBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0()); 
-            match(input,36,FOLLOW_36_in_rule__BooleanLiteral__IsTrueAssignment_1_16122); 
+            match(input,36,FOLLOW_2); 
              after(grammarAccess.getBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0()); 
 
             }
@@ -8304,20 +8304,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RealLiteral__ValueAssignment_1"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3082:1: rule__RealLiteral__ValueAssignment_1 : ( ruleReal ) ;
+    // InternalBase.g:3082:1: rule__RealLiteral__ValueAssignment_1 : ( ruleReal ) ;
     public final void rule__RealLiteral__ValueAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3086:1: ( ( ruleReal ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3087:1: ( ruleReal )
+            // InternalBase.g:3086:1: ( ( ruleReal ) )
+            // InternalBase.g:3087:1: ( ruleReal )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3087:1: ( ruleReal )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3088:1: ruleReal
+            // InternalBase.g:3087:1: ( ruleReal )
+            // InternalBase.g:3088:1: ruleReal
             {
              before(grammarAccess.getRealLiteralAccess().getValueRealParserRuleCall_1_0()); 
-            pushFollow(FOLLOW_ruleReal_in_rule__RealLiteral__ValueAssignment_16161);
+            pushFollow(FOLLOW_2);
             ruleReal();
 
             state._fsp--;
@@ -8345,20 +8345,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__IntLiteral__ValueAssignment_1"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3097:1: rule__IntLiteral__ValueAssignment_1 : ( ruleInteger ) ;
+    // InternalBase.g:3097:1: rule__IntLiteral__ValueAssignment_1 : ( ruleInteger ) ;
     public final void rule__IntLiteral__ValueAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3101:1: ( ( ruleInteger ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3102:1: ( ruleInteger )
+            // InternalBase.g:3101:1: ( ( ruleInteger ) )
+            // InternalBase.g:3102:1: ( ruleInteger )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3102:1: ( ruleInteger )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3103:1: ruleInteger
+            // InternalBase.g:3102:1: ( ruleInteger )
+            // InternalBase.g:3103:1: ruleInteger
             {
              before(grammarAccess.getIntLiteralAccess().getValueIntegerParserRuleCall_1_0()); 
-            pushFollow(FOLLOW_ruleInteger_in_rule__IntLiteral__ValueAssignment_16192);
+            pushFollow(FOLLOW_2);
             ruleInteger();
 
             state._fsp--;
@@ -8386,20 +8386,20 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StringLiteral__ValueAssignment_1"
-    // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3112:1: rule__StringLiteral__ValueAssignment_1 : ( RULE_STRING ) ;
+    // InternalBase.g:3112:1: rule__StringLiteral__ValueAssignment_1 : ( RULE_STRING ) ;
     public final void rule__StringLiteral__ValueAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3116:1: ( ( RULE_STRING ) )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3117:1: ( RULE_STRING )
+            // InternalBase.g:3116:1: ( ( RULE_STRING ) )
+            // InternalBase.g:3117:1: ( RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3117:1: ( RULE_STRING )
-            // ../org.eclipse.etrice.core.common.ui/src-gen/org/eclipse/etrice/core/common/ui/contentassist/antlr/internal/InternalBase.g:3118:1: RULE_STRING
+            // InternalBase.g:3117:1: ( RULE_STRING )
+            // InternalBase.g:3118:1: RULE_STRING
             {
              before(grammarAccess.getStringLiteralAccess().getValueSTRINGTerminalRuleCall_1_0()); 
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__StringLiteral__ValueAssignment_16223); 
+            match(input,RULE_STRING,FOLLOW_2); 
              after(grammarAccess.getStringLiteralAccess().getValueSTRINGTerminalRuleCall_1_0()); 
 
             }
@@ -8426,262 +8426,30 @@ public class InternalBaseParser extends AbstractInternalContentAssistParser {
 
  
 
-    public static final BitSet FOLLOW_ruleAnnotation_in_entryRuleAnnotation61 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAnnotation68 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Annotation__Group__0_in_ruleAnnotation94 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleKeyValue_in_entryRuleKeyValue121 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleKeyValue128 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeyValue__Group__0_in_ruleKeyValue154 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAnnotationTargetType_in_entryRuleAnnotationTargetType183 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAnnotationTargetType190 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleAnnotationTargetType216 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAnnotationAttribute_in_entryRuleAnnotationAttribute242 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAnnotationAttribute249 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AnnotationAttribute__Alternatives_in_ruleAnnotationAttribute275 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleAnnotationAttribute_in_entryRuleSimpleAnnotationAttribute302 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSimpleAnnotationAttribute309 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__0_in_ruleSimpleAnnotationAttribute335 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleEnumAnnotationAttribute_in_entryRuleEnumAnnotationAttribute362 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleEnumAnnotationAttribute369 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__0_in_ruleEnumAnnotationAttribute395 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleImportedFQN_in_entryRuleImportedFQN424 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleImportedFQN431 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ImportedFQN__Group__0_in_ruleImportedFQN457 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_entryRuleDocumentation484 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDocumentation491 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Documentation__Group__0_in_ruleDocumentation517 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLiteral_in_entryRuleLiteral548 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleLiteral555 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Literal__Alternatives_in_ruleLiteral581 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleBooleanLiteral_in_entryRuleBooleanLiteral608 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleBooleanLiteral615 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__BooleanLiteral__Group__0_in_ruleBooleanLiteral641 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNumberLiteral_in_entryRuleNumberLiteral668 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleNumberLiteral675 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NumberLiteral__Alternatives_in_ruleNumberLiteral701 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRealLiteral_in_entryRuleRealLiteral728 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRealLiteral735 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RealLiteral__Group__0_in_ruleRealLiteral761 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntLiteral_in_entryRuleIntLiteral788 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIntLiteral795 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IntLiteral__Group__0_in_ruleIntLiteral821 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStringLiteral_in_entryRuleStringLiteral848 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleStringLiteral855 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StringLiteral__Group__0_in_ruleStringLiteral881 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInteger_in_entryRuleInteger908 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleInteger915 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Integer__Alternatives_in_ruleInteger941 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleReal_in_entryRuleReal968 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleReal975 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Real__Alternatives_in_ruleReal1001 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDecimal_in_entryRuleDecimal1033 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDecimal1040 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Decimal__Group__0_in_ruleDecimal1070 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDecimalExp_in_entryRuleDecimalExp1102 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDecimalExp1109 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__0_in_ruleDecimalExp1139 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_entryRuleFQN1166 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleFQN1173 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FQN__Group__0_in_ruleFQN1199 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LiteralType__Alternatives_in_ruleLiteralType1236 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleAnnotationAttribute_in_rule__AnnotationAttribute__Alternatives1272 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleEnumAnnotationAttribute_in_rule__AnnotationAttribute__Alternatives1289 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__OptionalAssignment_0_0_in_rule__SimpleAnnotationAttribute__Alternatives_01321 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_12_in_rule__SimpleAnnotationAttribute__Alternatives_01340 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__OptionalAssignment_0_0_in_rule__EnumAnnotationAttribute__Alternatives_01374 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_12_in_rule__EnumAnnotationAttribute__Alternatives_01393 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleBooleanLiteral_in_rule__Literal__Alternatives1429 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNumberLiteral_in_rule__Literal__Alternatives1446 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStringLiteral_in_rule__Literal__Alternatives1463 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_13_in_rule__BooleanLiteral__Alternatives_11496 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__BooleanLiteral__IsTrueAssignment_1_1_in_rule__BooleanLiteral__Alternatives_11515 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntLiteral_in_rule__NumberLiteral__Alternatives1548 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRealLiteral_in_rule__NumberLiteral__Alternatives1565 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Integer__Group_0__0_in_rule__Integer__Alternatives1597 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_HEX_in_rule__Integer__Alternatives1615 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_14_in_rule__Integer__Alternatives_0_01648 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_15_in_rule__Integer__Alternatives_0_01668 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDecimal_in_rule__Real__Alternatives1702 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDecimalExp_in_rule__Real__Alternatives1719 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_14_in_rule__Decimal__Alternatives_01752 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_15_in_rule__Decimal__Alternatives_01772 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_14_in_rule__DecimalExp__Alternatives_01807 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_15_in_rule__DecimalExp__Alternatives_01827 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_16_in_rule__DecimalExp__Alternatives_41862 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_17_in_rule__DecimalExp__Alternatives_41882 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_14_in_rule__DecimalExp__Alternatives_51917 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_15_in_rule__DecimalExp__Alternatives_51937 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_18_in_rule__LiteralType__Alternatives1972 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_19_in_rule__LiteralType__Alternatives1993 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_20_in_rule__LiteralType__Alternatives2014 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_21_in_rule__LiteralType__Alternatives2035 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Annotation__Group__0__Impl_in_rule__Annotation__Group__02068 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__Annotation__Group__1_in_rule__Annotation__Group__02071 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_22_in_rule__Annotation__Group__0__Impl2099 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Annotation__Group__1__Impl_in_rule__Annotation__Group__12130 = new BitSet(new long[]{0x0000000000800000L});
-    public static final BitSet FOLLOW_rule__Annotation__Group__2_in_rule__Annotation__Group__12133 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Annotation__TypeAssignment_1_in_rule__Annotation__Group__1__Impl2160 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Annotation__Group__2__Impl_in_rule__Annotation__Group__22190 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Annotation__Group_2__0_in_rule__Annotation__Group__2__Impl2217 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Annotation__Group_2__0__Impl_in_rule__Annotation__Group_2__02254 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__Annotation__Group_2__1_in_rule__Annotation__Group_2__02257 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_23_in_rule__Annotation__Group_2__0__Impl2285 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Annotation__Group_2__1__Impl_in_rule__Annotation__Group_2__12316 = new BitSet(new long[]{0x0000000003000000L});
-    public static final BitSet FOLLOW_rule__Annotation__Group_2__2_in_rule__Annotation__Group_2__12319 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Annotation__AttributesAssignment_2_1_in_rule__Annotation__Group_2__1__Impl2346 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Annotation__Group_2__2__Impl_in_rule__Annotation__Group_2__22376 = new BitSet(new long[]{0x0000000003000000L});
-    public static final BitSet FOLLOW_rule__Annotation__Group_2__3_in_rule__Annotation__Group_2__22379 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Annotation__Group_2_2__0_in_rule__Annotation__Group_2__2__Impl2406 = new BitSet(new long[]{0x0000000002000002L});
-    public static final BitSet FOLLOW_rule__Annotation__Group_2__3__Impl_in_rule__Annotation__Group_2__32437 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_24_in_rule__Annotation__Group_2__3__Impl2465 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Annotation__Group_2_2__0__Impl_in_rule__Annotation__Group_2_2__02504 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__Annotation__Group_2_2__1_in_rule__Annotation__Group_2_2__02507 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_25_in_rule__Annotation__Group_2_2__0__Impl2535 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Annotation__Group_2_2__1__Impl_in_rule__Annotation__Group_2_2__12566 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Annotation__AttributesAssignment_2_2_1_in_rule__Annotation__Group_2_2__1__Impl2593 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeyValue__Group__0__Impl_in_rule__KeyValue__Group__02627 = new BitSet(new long[]{0x0000000004000000L});
-    public static final BitSet FOLLOW_rule__KeyValue__Group__1_in_rule__KeyValue__Group__02630 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeyValue__KeyAssignment_0_in_rule__KeyValue__Group__0__Impl2657 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeyValue__Group__1__Impl_in_rule__KeyValue__Group__12687 = new BitSet(new long[]{0x000000100000E0E0L});
-    public static final BitSet FOLLOW_rule__KeyValue__Group__2_in_rule__KeyValue__Group__12690 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_26_in_rule__KeyValue__Group__1__Impl2718 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeyValue__Group__2__Impl_in_rule__KeyValue__Group__22749 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeyValue__ValueAssignment_2_in_rule__KeyValue__Group__2__Impl2776 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__0__Impl_in_rule__SimpleAnnotationAttribute__Group__02815 = new BitSet(new long[]{0x0000000008000000L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__1_in_rule__SimpleAnnotationAttribute__Group__02818 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Alternatives_0_in_rule__SimpleAnnotationAttribute__Group__0__Impl2845 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__1__Impl_in_rule__SimpleAnnotationAttribute__Group__12875 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__2_in_rule__SimpleAnnotationAttribute__Group__12878 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_rule__SimpleAnnotationAttribute__Group__1__Impl2906 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__2__Impl_in_rule__SimpleAnnotationAttribute__Group__22937 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__3_in_rule__SimpleAnnotationAttribute__Group__22940 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__NameAssignment_2_in_rule__SimpleAnnotationAttribute__Group__2__Impl2967 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__3__Impl_in_rule__SimpleAnnotationAttribute__Group__32997 = new BitSet(new long[]{0x00000000003C0000L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__4_in_rule__SimpleAnnotationAttribute__Group__33000 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_rule__SimpleAnnotationAttribute__Group__3__Impl3028 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__4__Impl_in_rule__SimpleAnnotationAttribute__Group__43059 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__TypeAssignment_4_in_rule__SimpleAnnotationAttribute__Group__4__Impl3086 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__0__Impl_in_rule__EnumAnnotationAttribute__Group__03126 = new BitSet(new long[]{0x0000000008000000L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__1_in_rule__EnumAnnotationAttribute__Group__03129 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Alternatives_0_in_rule__EnumAnnotationAttribute__Group__0__Impl3156 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__1__Impl_in_rule__EnumAnnotationAttribute__Group__13186 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__2_in_rule__EnumAnnotationAttribute__Group__13189 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_rule__EnumAnnotationAttribute__Group__1__Impl3217 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__2__Impl_in_rule__EnumAnnotationAttribute__Group__23248 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__3_in_rule__EnumAnnotationAttribute__Group__23251 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__NameAssignment_2_in_rule__EnumAnnotationAttribute__Group__2__Impl3278 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__3__Impl_in_rule__EnumAnnotationAttribute__Group__33308 = new BitSet(new long[]{0x0000000020000000L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__4_in_rule__EnumAnnotationAttribute__Group__33311 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_rule__EnumAnnotationAttribute__Group__3__Impl3339 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__4__Impl_in_rule__EnumAnnotationAttribute__Group__43370 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__5_in_rule__EnumAnnotationAttribute__Group__43373 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_rule__EnumAnnotationAttribute__Group__4__Impl3401 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__5__Impl_in_rule__EnumAnnotationAttribute__Group__53432 = new BitSet(new long[]{0x0000000042000000L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__6_in_rule__EnumAnnotationAttribute__Group__53435 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__ValuesAssignment_5_in_rule__EnumAnnotationAttribute__Group__5__Impl3462 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__6__Impl_in_rule__EnumAnnotationAttribute__Group__63492 = new BitSet(new long[]{0x0000000042000000L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__7_in_rule__EnumAnnotationAttribute__Group__63495 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group_6__0_in_rule__EnumAnnotationAttribute__Group__6__Impl3522 = new BitSet(new long[]{0x0000000002000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__7__Impl_in_rule__EnumAnnotationAttribute__Group__73553 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_30_in_rule__EnumAnnotationAttribute__Group__7__Impl3581 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group_6__0__Impl_in_rule__EnumAnnotationAttribute__Group_6__03628 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group_6__1_in_rule__EnumAnnotationAttribute__Group_6__03631 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_25_in_rule__EnumAnnotationAttribute__Group_6__0__Impl3659 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group_6__1__Impl_in_rule__EnumAnnotationAttribute__Group_6__13690 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__ValuesAssignment_6_1_in_rule__EnumAnnotationAttribute__Group_6__1__Impl3717 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ImportedFQN__Group__0__Impl_in_rule__ImportedFQN__Group__03753 = new BitSet(new long[]{0x0000000080000000L});
-    public static final BitSet FOLLOW_rule__ImportedFQN__Group__1_in_rule__ImportedFQN__Group__03756 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_rule__ImportedFQN__Group__0__Impl3783 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ImportedFQN__Group__1__Impl_in_rule__ImportedFQN__Group__13812 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_31_in_rule__ImportedFQN__Group__1__Impl3841 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Documentation__Group__0__Impl_in_rule__Documentation__Group__03878 = new BitSet(new long[]{0x0000000100000000L});
-    public static final BitSet FOLLOW_rule__Documentation__Group__1_in_rule__Documentation__Group__03881 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Documentation__Group__1__Impl_in_rule__Documentation__Group__13939 = new BitSet(new long[]{0x0000000200000080L});
-    public static final BitSet FOLLOW_rule__Documentation__Group__2_in_rule__Documentation__Group__13942 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_rule__Documentation__Group__1__Impl3970 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Documentation__Group__2__Impl_in_rule__Documentation__Group__24001 = new BitSet(new long[]{0x0000000200000080L});
-    public static final BitSet FOLLOW_rule__Documentation__Group__3_in_rule__Documentation__Group__24004 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Documentation__LinesAssignment_2_in_rule__Documentation__Group__2__Impl4031 = new BitSet(new long[]{0x0000000000000082L});
-    public static final BitSet FOLLOW_rule__Documentation__Group__3__Impl_in_rule__Documentation__Group__34062 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_rule__Documentation__Group__3__Impl4090 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__BooleanLiteral__Group__0__Impl_in_rule__BooleanLiteral__Group__04135 = new BitSet(new long[]{0x0000001000002000L});
-    public static final BitSet FOLLOW_rule__BooleanLiteral__Group__1_in_rule__BooleanLiteral__Group__04138 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__BooleanLiteral__Group__1__Impl_in_rule__BooleanLiteral__Group__14196 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__BooleanLiteral__Alternatives_1_in_rule__BooleanLiteral__Group__1__Impl4223 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RealLiteral__Group__0__Impl_in_rule__RealLiteral__Group__04257 = new BitSet(new long[]{0x000000000000C060L});
-    public static final BitSet FOLLOW_rule__RealLiteral__Group__1_in_rule__RealLiteral__Group__04260 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RealLiteral__Group__1__Impl_in_rule__RealLiteral__Group__14318 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RealLiteral__ValueAssignment_1_in_rule__RealLiteral__Group__1__Impl4345 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IntLiteral__Group__0__Impl_in_rule__IntLiteral__Group__04379 = new BitSet(new long[]{0x000000000000C060L});
-    public static final BitSet FOLLOW_rule__IntLiteral__Group__1_in_rule__IntLiteral__Group__04382 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IntLiteral__Group__1__Impl_in_rule__IntLiteral__Group__14440 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IntLiteral__ValueAssignment_1_in_rule__IntLiteral__Group__1__Impl4467 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StringLiteral__Group__0__Impl_in_rule__StringLiteral__Group__04501 = new BitSet(new long[]{0x000000100000E0E0L});
-    public static final BitSet FOLLOW_rule__StringLiteral__Group__1_in_rule__StringLiteral__Group__04504 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StringLiteral__Group__1__Impl_in_rule__StringLiteral__Group__14562 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StringLiteral__ValueAssignment_1_in_rule__StringLiteral__Group__1__Impl4589 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Integer__Group_0__0__Impl_in_rule__Integer__Group_0__04623 = new BitSet(new long[]{0x000000000000C040L});
-    public static final BitSet FOLLOW_rule__Integer__Group_0__1_in_rule__Integer__Group_0__04626 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Integer__Alternatives_0_0_in_rule__Integer__Group_0__0__Impl4653 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Integer__Group_0__1__Impl_in_rule__Integer__Group_0__14684 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__Integer__Group_0__1__Impl4711 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Decimal__Group__0__Impl_in_rule__Decimal__Group__04744 = new BitSet(new long[]{0x000000000000C040L});
-    public static final BitSet FOLLOW_rule__Decimal__Group__1_in_rule__Decimal__Group__04747 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Decimal__Alternatives_0_in_rule__Decimal__Group__0__Impl4774 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Decimal__Group__1__Impl_in_rule__Decimal__Group__14805 = new BitSet(new long[]{0x0000000400000000L});
-    public static final BitSet FOLLOW_rule__Decimal__Group__2_in_rule__Decimal__Group__14808 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__Decimal__Group__1__Impl4835 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Decimal__Group__2__Impl_in_rule__Decimal__Group__24864 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__Decimal__Group__3_in_rule__Decimal__Group__24867 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_34_in_rule__Decimal__Group__2__Impl4895 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Decimal__Group__3__Impl_in_rule__Decimal__Group__34926 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__Decimal__Group__3__Impl4953 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__0__Impl_in_rule__DecimalExp__Group__04990 = new BitSet(new long[]{0x000000000000C060L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__1_in_rule__DecimalExp__Group__04993 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Alternatives_0_in_rule__DecimalExp__Group__0__Impl5020 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__1__Impl_in_rule__DecimalExp__Group__15051 = new BitSet(new long[]{0x0000000400000000L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__2_in_rule__DecimalExp__Group__15054 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__DecimalExp__Group__1__Impl5081 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__2__Impl_in_rule__DecimalExp__Group__25110 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__3_in_rule__DecimalExp__Group__25113 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_34_in_rule__DecimalExp__Group__2__Impl5141 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__3__Impl_in_rule__DecimalExp__Group__35172 = new BitSet(new long[]{0x0000000000030000L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__4_in_rule__DecimalExp__Group__35175 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__DecimalExp__Group__3__Impl5202 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__4__Impl_in_rule__DecimalExp__Group__45231 = new BitSet(new long[]{0x000000000000C040L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__5_in_rule__DecimalExp__Group__45234 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Alternatives_4_in_rule__DecimalExp__Group__4__Impl5261 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__5__Impl_in_rule__DecimalExp__Group__55291 = new BitSet(new long[]{0x000000000000C040L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__6_in_rule__DecimalExp__Group__55294 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Alternatives_5_in_rule__DecimalExp__Group__5__Impl5321 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__6__Impl_in_rule__DecimalExp__Group__65352 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__DecimalExp__Group__6__Impl5379 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FQN__Group__0__Impl_in_rule__FQN__Group__05422 = new BitSet(new long[]{0x0000000400000000L});
-    public static final BitSet FOLLOW_rule__FQN__Group__1_in_rule__FQN__Group__05425 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__FQN__Group__0__Impl5452 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FQN__Group__1__Impl_in_rule__FQN__Group__15481 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FQN__Group_1__0_in_rule__FQN__Group__1__Impl5508 = new BitSet(new long[]{0x0000000400000002L});
-    public static final BitSet FOLLOW_rule__FQN__Group_1__0__Impl_in_rule__FQN__Group_1__05543 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__FQN__Group_1__1_in_rule__FQN__Group_1__05546 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_34_in_rule__FQN__Group_1__0__Impl5574 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FQN__Group_1__1__Impl_in_rule__FQN__Group_1__15605 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__FQN__Group_1__1__Impl5632 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_rule__Annotation__TypeAssignment_15674 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleKeyValue_in_rule__Annotation__AttributesAssignment_2_15709 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleKeyValue_in_rule__Annotation__AttributesAssignment_2_2_15740 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__KeyValue__KeyAssignment_05771 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLiteral_in_rule__KeyValue__ValueAssignment_25802 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_35_in_rule__SimpleAnnotationAttribute__OptionalAssignment_0_05844 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__SimpleAnnotationAttribute__NameAssignment_25883 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLiteralType_in_rule__SimpleAnnotationAttribute__TypeAssignment_45914 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_35_in_rule__EnumAnnotationAttribute__OptionalAssignment_0_05950 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__EnumAnnotationAttribute__NameAssignment_25989 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__EnumAnnotationAttribute__ValuesAssignment_56020 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__EnumAnnotationAttribute__ValuesAssignment_6_16051 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__Documentation__LinesAssignment_26084 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_36_in_rule__BooleanLiteral__IsTrueAssignment_1_16122 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleReal_in_rule__RealLiteral__ValueAssignment_16161 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInteger_in_rule__IntLiteral__ValueAssignment_16192 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__StringLiteral__ValueAssignment_16223 = 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[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x0000000000800000L});
+    public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x0000000003000000L});
+    public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x0000000002000002L});
+    public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x0000000004000000L});
+    public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x000000100000E0E0L});
+    public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x0000000008000000L});
+    public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0000000010000000L});
+    public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x00000000003C0000L});
+    public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0000000020000000L});
+    public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000000000000080L});
+    public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x0000000042000000L});
+    public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0000000080000000L});
+    public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x0000000100000000L});
+    public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0000000200000080L});
+    public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0000000000000082L});
+    public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0000001000002000L});
+    public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x000000000000C060L});
+    public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x000000000000C040L});
+    public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0000000400000000L});
+    public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x0000000000000040L});
+    public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x0000000000030000L});
+    public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x0000000400000002L});
 
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/AbstractBaseRuntimeModule.java b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/AbstractBaseRuntimeModule.java
index 1162a0489..fad15a03d 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/AbstractBaseRuntimeModule.java
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/AbstractBaseRuntimeModule.java
@@ -6,7 +6,6 @@ package org.eclipse.etrice.core.common;
 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.common.BaseRuntimeModule}
  */
- @SuppressWarnings("all")
-public abstract class AbstractBaseRuntimeModule extends DefaultRuntimeModule {
+@SuppressWarnings("all")
+public abstract class AbstractBaseRuntimeModule extends org.eclipse.xtext.service.DefaultRuntimeModule {
 
 	protected Properties properties = null;
 
diff --git a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/AbstractBaseTestRuntimeModule.java b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/AbstractBaseTestRuntimeModule.java
index 92a291f63..1e63b7093 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/AbstractBaseTestRuntimeModule.java
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/AbstractBaseTestRuntimeModule.java
@@ -6,7 +6,6 @@ package org.eclipse.etrice.core.common;
 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.common.BaseTestRuntimeModule}
  */
- @SuppressWarnings("all")
-public abstract class AbstractBaseTestRuntimeModule extends DefaultRuntimeModule {
+@SuppressWarnings("all")
+public abstract class AbstractBaseTestRuntimeModule extends org.eclipse.xtext.service.DefaultRuntimeModule {
 
 	protected Properties properties = null;
 
diff --git a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.genmodel b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.genmodel
index 2e0a41af3..c2bb053db 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.genmodel
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.genmodel
@@ -3,8 +3,8 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.etrice.core.common/src-gen" editDirectory="/org.eclipse.etrice.core.common.edit/src"
     editorDirectory="/org.eclipse.etrice.core.common.editor/src" modelPluginID="org.eclipse.etrice.core.common"
     forceOverwrite="true" modelName="Base" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.etrice.core.common.edit"
-    editorPluginID="org.eclipse.etrice.core.common.editor" runtimeVersion="2.10">
+    complianceLevel="6.0" copyrightFields="false" editPluginID="org.eclipse.etrice.core.common.edit"
+    editorPluginID="org.eclipse.etrice.core.common.editor" runtimeVersion="2.12">
   <genPackages prefix="Base" basePackage="org.eclipse.etrice.core.common" disposableProviderFactory="true"
       fileExtensions="__etbase" ecorePackage="Base.ecore#/">
     <genEnums typeSafeEnumCompatible="false" ecoreEnum="Base.ecore#//LiteralType">
diff --git a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/BaseStandaloneSetupGenerated.java b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/BaseStandaloneSetupGenerated.java
index 8aa651a0a..b4e3d0586 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/BaseStandaloneSetupGenerated.java
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/BaseStandaloneSetupGenerated.java
@@ -1,11 +1,11 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.common;
 
 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 BaseStandaloneSetupGenerated implements ISetup {
 
+	@Override
 	public Injector createInjectorAndDoEMFRegistration() {
 		org.eclipse.xtext.common.TerminalsStandaloneSetup.doSetup();
 
diff --git a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/BaseTest.genmodel b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/BaseTest.genmodel
index 55e2e6bdf..fa3d35856 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/BaseTest.genmodel
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/BaseTest.genmodel
@@ -3,8 +3,8 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.etrice.core.common/src-gen" editDirectory="/org.eclipse.etrice.core.common.edit/src"
     editorDirectory="/org.eclipse.etrice.core.common.editor/src" modelPluginID="org.eclipse.etrice.core.common"
     forceOverwrite="true" modelName="BaseTest" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.etrice.core.common.edit"
-    editorPluginID="org.eclipse.etrice.core.common.editor" runtimeVersion="2.10">
+    complianceLevel="6.0" copyrightFields="false" editPluginID="org.eclipse.etrice.core.common.edit"
+    editorPluginID="org.eclipse.etrice.core.common.editor" runtimeVersion="2.12">
   <genPackages prefix="Basetest" basePackage="org.eclipse.etrice.core.common" disposableProviderFactory="true"
       fileExtensions="__etbase" ecorePackage="BaseTest.ecore#/">
     <genClasses ecoreClass="BaseTest.ecore#//BaseModel">
diff --git a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/BaseTestStandaloneSetupGenerated.java b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/BaseTestStandaloneSetupGenerated.java
index 3bd5af991..332298027 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/BaseTestStandaloneSetupGenerated.java
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/BaseTestStandaloneSetupGenerated.java
@@ -1,11 +1,11 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.common;
 
 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 BaseTestStandaloneSetupGenerated implements ISetup {
 
+	@Override
 	public Injector createInjectorAndDoEMFRegistration() {
 		org.eclipse.etrice.core.common.BaseStandaloneSetup.doSetup();
 
diff --git a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/Annotation.java b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/Annotation.java
index ac6bc6a26..357e4558e 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/Annotation.java
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/Annotation.java
@@ -20,11 +20,11 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.common.base.Annotation#getType <em>Type</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.common.base.Annotation#getAttributes <em>Attributes</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.common.base.BasePackage#getAnnotation()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/AnnotationAttribute.java b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/AnnotationAttribute.java
index b1accbb64..b16f1b08b 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/AnnotationAttribute.java
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/AnnotationAttribute.java
@@ -16,11 +16,11 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.common.base.AnnotationAttribute#isOptional <em>Optional</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.common.base.AnnotationAttribute#getName <em>Name</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.common.base.BasePackage#getAnnotationAttribute()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/AnnotationType.java b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/AnnotationType.java
index 9aad82488..749fdc103 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/AnnotationType.java
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/AnnotationType.java
@@ -17,13 +17,13 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.common.base.AnnotationType#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.common.base.AnnotationType#getDocu <em>Docu</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.common.base.AnnotationType#getTargets <em>Targets</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.common.base.AnnotationType#getAttributes <em>Attributes</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.common.base.BasePackage#getAnnotationType()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/BooleanLiteral.java b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/BooleanLiteral.java
index a6cb40435..743e3fe43 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/BooleanLiteral.java
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/BooleanLiteral.java
@@ -10,10 +10,10 @@ package org.eclipse.etrice.core.common.base;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.common.base.BooleanLiteral#isIsTrue <em>Is True</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.common.base.BasePackage#getBooleanLiteral()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/Documentation.java b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/Documentation.java
index d4c9a4655..f69237407 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/Documentation.java
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/Documentation.java
@@ -19,10 +19,10 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.common.base.Documentation#getLines <em>Lines</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.common.base.BasePackage#getDocumentation()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/EnumAnnotationAttribute.java b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/EnumAnnotationAttribute.java
index 34131be03..7bebd4137 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/EnumAnnotationAttribute.java
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/EnumAnnotationAttribute.java
@@ -16,10 +16,10 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.common.base.EnumAnnotationAttribute#getValues <em>Values</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.common.base.BasePackage#getEnumAnnotationAttribute()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/Import.java b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/Import.java
index 670474584..4f211cf3c 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/Import.java
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/Import.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.common.base.Import#getImportedNamespace <em>Imported Namespace</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.common.base.Import#getImportURI <em>Import URI</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.common.base.BasePackage#getImport()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/IntLiteral.java b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/IntLiteral.java
index abd1025a7..c6f723fc8 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/IntLiteral.java
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/IntLiteral.java
@@ -10,10 +10,10 @@ package org.eclipse.etrice.core.common.base;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.common.base.IntLiteral#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.common.base.BasePackage#getIntLiteral()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/KeyValue.java b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/KeyValue.java
index 69f8ac0b3..9733b6416 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/KeyValue.java
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/KeyValue.java
@@ -16,11 +16,11 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.common.base.KeyValue#getKey <em>Key</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.common.base.KeyValue#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.common.base.BasePackage#getKeyValue()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/LiteralArray.java b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/LiteralArray.java
index 6efebb063..704726719 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/LiteralArray.java
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/LiteralArray.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.common.base.LiteralArray#getLiterals <em>Literals</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.common.base.BasePackage#getLiteralArray()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/LiteralType.java b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/LiteralType.java
index f62f1195c..838cec2b4 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/LiteralType.java
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/LiteralType.java
@@ -146,6 +146,8 @@ public enum LiteralType implements Enumerator
    * Returns the '<em><b>Literal 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 LiteralType get(String literal)
@@ -165,6 +167,8 @@ public enum LiteralType implements Enumerator
    * Returns the '<em><b>Literal 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 LiteralType getByName(String name)
@@ -184,6 +188,8 @@ public enum LiteralType implements Enumerator
    * Returns the '<em><b>Literal 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 LiteralType get(int value)
diff --git a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/RealLiteral.java b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/RealLiteral.java
index bfc08df6b..5934a37e2 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/RealLiteral.java
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/RealLiteral.java
@@ -10,10 +10,10 @@ package org.eclipse.etrice.core.common.base;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.common.base.RealLiteral#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.common.base.BasePackage#getRealLiteral()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/SimpleAnnotationAttribute.java b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/SimpleAnnotationAttribute.java
index a7483dc97..b15fa25ae 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/SimpleAnnotationAttribute.java
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/SimpleAnnotationAttribute.java
@@ -15,10 +15,10 @@ package org.eclipse.etrice.core.common.base;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.common.base.SimpleAnnotationAttribute#getType <em>Type</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.common.base.BasePackage#getSimpleAnnotationAttribute()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/StringLiteral.java b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/StringLiteral.java
index 23060b115..d49c2b091 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/StringLiteral.java
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/StringLiteral.java
@@ -10,10 +10,10 @@ package org.eclipse.etrice.core.common.base;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.common.base.StringLiteral#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.common.base.BasePackage#getStringLiteral()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/AnnotationAttributeImpl.java b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/AnnotationAttributeImpl.java
index d89ebcdf2..e5a63a423 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/AnnotationAttributeImpl.java
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/AnnotationAttributeImpl.java
@@ -18,11 +18,11 @@ import org.eclipse.etrice.core.common.base.BasePackage;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.common.base.impl.AnnotationAttributeImpl#isOptional <em>Optional</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.common.base.impl.AnnotationAttributeImpl#getName <em>Name</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/AnnotationImpl.java b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/AnnotationImpl.java
index c0c5cf92b..28e5469ac 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/AnnotationImpl.java
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/AnnotationImpl.java
@@ -29,11 +29,11 @@ import org.eclipse.etrice.core.common.base.KeyValue;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.common.base.impl.AnnotationImpl#getType <em>Type</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.common.base.impl.AnnotationImpl#getAttributes <em>Attributes</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/AnnotationTypeImpl.java b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/AnnotationTypeImpl.java
index 5735c26e7..23f5b6dd2 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/AnnotationTypeImpl.java
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/AnnotationTypeImpl.java
@@ -30,13 +30,13 @@ import org.eclipse.etrice.core.common.base.Documentation;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.common.base.impl.AnnotationTypeImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.common.base.impl.AnnotationTypeImpl#getDocu <em>Docu</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.common.base.impl.AnnotationTypeImpl#getTargets <em>Targets</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.common.base.impl.AnnotationTypeImpl#getAttributes <em>Attributes</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/BooleanLiteralImpl.java b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/BooleanLiteralImpl.java
index 27ad52124..95ca8a9c8 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/BooleanLiteralImpl.java
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/BooleanLiteralImpl.java
@@ -17,10 +17,10 @@ import org.eclipse.etrice.core.common.base.BooleanLiteral;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.common.base.impl.BooleanLiteralImpl#isIsTrue <em>Is True</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/DocumentationImpl.java b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/DocumentationImpl.java
index 4768e7f10..945833c58 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/DocumentationImpl.java
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/DocumentationImpl.java
@@ -21,10 +21,10 @@ import org.eclipse.etrice.core.common.base.Documentation;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.common.base.impl.DocumentationImpl#getLines <em>Lines</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/EnumAnnotationAttributeImpl.java b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/EnumAnnotationAttributeImpl.java
index ff0dcc690..daaa24f6b 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/EnumAnnotationAttributeImpl.java
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/EnumAnnotationAttributeImpl.java
@@ -19,10 +19,10 @@ import org.eclipse.etrice.core.common.base.EnumAnnotationAttribute;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.common.base.impl.EnumAnnotationAttributeImpl#getValues <em>Values</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/ImportImpl.java b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/ImportImpl.java
index 27de1ee9b..3808b9ef6 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/ImportImpl.java
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/ImportImpl.java
@@ -18,11 +18,11 @@ import org.eclipse.etrice.core.common.base.Import;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.common.base.impl.ImportImpl#getImportedNamespace <em>Imported Namespace</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.common.base.impl.ImportImpl#getImportURI <em>Import URI</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/IntLiteralImpl.java b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/IntLiteralImpl.java
index e60521c6c..4728e459e 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/IntLiteralImpl.java
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/IntLiteralImpl.java
@@ -17,10 +17,10 @@ import org.eclipse.etrice.core.common.base.IntLiteral;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.common.base.impl.IntLiteralImpl#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/KeyValueImpl.java b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/KeyValueImpl.java
index 8b9161d42..afa51288b 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/KeyValueImpl.java
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/KeyValueImpl.java
@@ -21,11 +21,11 @@ import org.eclipse.etrice.core.common.base.Literal;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.common.base.impl.KeyValueImpl#getKey <em>Key</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.common.base.impl.KeyValueImpl#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/LiteralArrayImpl.java b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/LiteralArrayImpl.java
index b2710b289..8469f37a3 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/LiteralArrayImpl.java
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/LiteralArrayImpl.java
@@ -26,10 +26,10 @@ import org.eclipse.etrice.core.common.base.LiteralArray;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.common.base.impl.LiteralArrayImpl#getLiterals <em>Literals</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/LiteralImpl.java b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/LiteralImpl.java
index fe160268e..5aa1ff96b 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/LiteralImpl.java
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/LiteralImpl.java
@@ -13,8 +13,6 @@ import org.eclipse.etrice.core.common.base.Literal;
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Literal</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/NumberLiteralImpl.java b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/NumberLiteralImpl.java
index fb6047e80..04dcf982e 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/NumberLiteralImpl.java
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/NumberLiteralImpl.java
@@ -11,8 +11,6 @@ import org.eclipse.etrice.core.common.base.NumberLiteral;
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Number Literal</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/RealLiteralImpl.java b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/RealLiteralImpl.java
index 91e915f60..1cb6cdfbf 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/RealLiteralImpl.java
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/RealLiteralImpl.java
@@ -17,10 +17,10 @@ import org.eclipse.etrice.core.common.base.RealLiteral;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.common.base.impl.RealLiteralImpl#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/SimpleAnnotationAttributeImpl.java b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/SimpleAnnotationAttributeImpl.java
index 426775310..22f42d193 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/SimpleAnnotationAttributeImpl.java
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/SimpleAnnotationAttributeImpl.java
@@ -18,10 +18,10 @@ import org.eclipse.etrice.core.common.base.SimpleAnnotationAttribute;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.common.base.impl.SimpleAnnotationAttributeImpl#getType <em>Type</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/StringLiteralImpl.java b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/StringLiteralImpl.java
index be473917c..598134ecc 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/StringLiteralImpl.java
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/impl/StringLiteralImpl.java
@@ -17,10 +17,10 @@ import org.eclipse.etrice.core.common.base.StringLiteral;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.common.base.impl.StringLiteralImpl#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/util/BaseSwitch.java b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/util/BaseSwitch.java
index 649c5df92..fd63fae68 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/util/BaseSwitch.java
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/base/util/BaseSwitch.java
@@ -50,7 +50,7 @@ public class BaseSwitch<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
    */
diff --git a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/basetest/BaseModel.java b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/basetest/BaseModel.java
index 8bdf963b5..62a8c8391 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/basetest/BaseModel.java
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/basetest/BaseModel.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.common.basetest.BaseModel#getElements <em>Elements</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.common.basetest.BasetestPackage#getBaseModel()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/basetest/impl/BaseModelImpl.java b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/basetest/impl/BaseModelImpl.java
index 1cf0c1ebe..1597f5cdc 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/basetest/impl/BaseModelImpl.java
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/basetest/impl/BaseModelImpl.java
@@ -26,10 +26,10 @@ import org.eclipse.etrice.core.common.basetest.BasetestPackage;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.common.basetest.impl.BaseModelImpl#getElements <em>Elements</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/basetest/util/BasetestSwitch.java b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/basetest/util/BasetestSwitch.java
index 88aa36769..9f65ea6aa 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/basetest/util/BasetestSwitch.java
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/basetest/util/BasetestSwitch.java
@@ -50,7 +50,7 @@ public class BasetestSwitch<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
    */
diff --git a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/BaseAntlrTokenFileProvider.java b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/BaseAntlrTokenFileProvider.java
index 1be9de427..6e0a8eb3e 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/BaseAntlrTokenFileProvider.java
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/BaseAntlrTokenFileProvider.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.common.parser.antlr;
 
 import java.io.InputStream;
@@ -8,6 +8,7 @@ import org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider;
 
 public class BaseAntlrTokenFileProvider implements IAntlrTokenFileProvider {
 	
+	@Override
 	public InputStream getAntlrTokenFile() {
 		ClassLoader classLoader = getClass().getClassLoader();
     	return classLoader.getResourceAsStream("org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.tokens");
diff --git a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/BaseParser.java b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/BaseParser.java
index 816c4ed53..020270007 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/BaseParser.java
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/BaseParser.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.common.parser.antlr;
 
 import com.google.inject.Inject;
diff --git a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/BaseTestAntlrTokenFileProvider.java b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/BaseTestAntlrTokenFileProvider.java
index 19d8c5e88..737d5154d 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/BaseTestAntlrTokenFileProvider.java
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/BaseTestAntlrTokenFileProvider.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.common.parser.antlr;
 
 import java.io.InputStream;
@@ -8,6 +8,7 @@ import org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider;
 
 public class BaseTestAntlrTokenFileProvider implements IAntlrTokenFileProvider {
 	
+	@Override
 	public InputStream getAntlrTokenFile() {
 		ClassLoader classLoader = getClass().getClassLoader();
     	return classLoader.getResourceAsStream("org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.tokens");
diff --git a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/BaseTestParser.java b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/BaseTestParser.java
index 56aab9af5..b3340948f 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/BaseTestParser.java
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/BaseTestParser.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.common.parser.antlr;
 
 import com.google.inject.Inject;
diff --git a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g
index b0d02fa55..73e19332a 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 grammar InternalBase;
 
 options {
@@ -114,7 +114,7 @@ ruleAnnotation returns [EObject current=null]
        			$current, 
        			"attributes",
         		lv_attributes_3_0, 
-        		"KeyValue");
+        		"org.eclipse.etrice.core.common.Base.KeyValue");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -136,7 +136,7 @@ ruleAnnotation returns [EObject current=null]
        			$current, 
        			"attributes",
         		lv_attributes_5_0, 
-        		"KeyValue");
+        		"org.eclipse.etrice.core.common.Base.KeyValue");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -180,7 +180,7 @@ ruleKeyValue returns [EObject current=null]
        			$current, 
        			"key",
         		lv_key_0_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -201,7 +201,7 @@ ruleKeyValue returns [EObject current=null]
        			$current, 
        			"value",
         		lv_value_2_0, 
-        		"Literal");
+        		"org.eclipse.etrice.core.common.Base.Literal");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -335,7 +335,7 @@ ruleSimpleAnnotationAttribute returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_3_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -356,7 +356,7 @@ ruleSimpleAnnotationAttribute returns [EObject current=null]
        			$current, 
        			"type",
         		lv_type_5_0, 
-        		"LiteralType");
+        		"org.eclipse.etrice.core.common.Base.LiteralType");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -420,7 +420,7 @@ ruleEnumAnnotationAttribute returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_3_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -446,7 +446,7 @@ ruleEnumAnnotationAttribute returns [EObject current=null]
        			$current, 
        			"values",
         		lv_values_6_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -468,7 +468,7 @@ ruleEnumAnnotationAttribute returns [EObject current=null]
        			$current, 
        			"values",
         		lv_values_8_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -561,7 +561,7 @@ ruleDocumentation returns [EObject current=null]
        			$current, 
        			"lines",
         		lv_lines_2_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -750,7 +750,7 @@ ruleRealLiteral returns [EObject current=null]
        			$current, 
        			"value",
         		lv_value_1_0, 
-        		"Real");
+        		"org.eclipse.etrice.core.common.Base.Real");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -795,7 +795,7 @@ ruleIntLiteral returns [EObject current=null]
        			$current, 
        			"value",
         		lv_value_1_0, 
-        		"Integer");
+        		"org.eclipse.etrice.core.common.Base.Integer");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -841,7 +841,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.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseLexer.java b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseLexer.java
index 923b7e49a..6f20389d0 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseLexer.java
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseLexer.java
@@ -58,15 +58,15 @@ public class InternalBaseLexer extends Lexer {
         super(input,state);
 
     }
-    public String getGrammarFileName() { return "../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g"; }
+    public String getGrammarFileName() { return "InternalBase.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.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:11:7: ( '@' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:11:9: '@'
+            // InternalBase.g:11:7: ( '@' )
+            // InternalBase.g:11:9: '@'
             {
             match('@'); 
 
@@ -85,8 +85,8 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = T__13;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:12:7: ( '(' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:12:9: '('
+            // InternalBase.g:12:7: ( '(' )
+            // InternalBase.g:12:9: '('
             {
             match('('); 
 
@@ -105,8 +105,8 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = T__14;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:13:7: ( ',' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:13:9: ','
+            // InternalBase.g:13:7: ( ',' )
+            // InternalBase.g:13:9: ','
             {
             match(','); 
 
@@ -125,8 +125,8 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = T__15;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:14:7: ( ')' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:14:9: ')'
+            // InternalBase.g:14:7: ( ')' )
+            // InternalBase.g:14:9: ')'
             {
             match(')'); 
 
@@ -145,8 +145,8 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = T__16;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:15:7: ( '=' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:15:9: '='
+            // InternalBase.g:15:7: ( '=' )
+            // InternalBase.g:15:9: '='
             {
             match('='); 
 
@@ -165,8 +165,8 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = T__17;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:16:7: ( 'optional' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:16:9: 'optional'
+            // InternalBase.g:16:7: ( 'optional' )
+            // InternalBase.g:16:9: 'optional'
             {
             match("optional"); 
 
@@ -186,8 +186,8 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = T__18;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:17:7: ( 'mandatory' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:17:9: 'mandatory'
+            // InternalBase.g:17:7: ( 'mandatory' )
+            // InternalBase.g:17:9: 'mandatory'
             {
             match("mandatory"); 
 
@@ -207,8 +207,8 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = T__19;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:18:7: ( 'attribute' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:18:9: 'attribute'
+            // InternalBase.g:18:7: ( 'attribute' )
+            // InternalBase.g:18:9: 'attribute'
             {
             match("attribute"); 
 
@@ -228,8 +228,8 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = T__20;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:19:7: ( ':' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:19:9: ':'
+            // InternalBase.g:19:7: ( ':' )
+            // InternalBase.g:19:9: ':'
             {
             match(':'); 
 
@@ -248,8 +248,8 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = T__21;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:20:7: ( '{' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:20:9: '{'
+            // InternalBase.g:20:7: ( '{' )
+            // InternalBase.g:20:9: '{'
             {
             match('{'); 
 
@@ -268,8 +268,8 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = T__22;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:21:7: ( '}' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:21:9: '}'
+            // InternalBase.g:21:7: ( '}' )
+            // InternalBase.g:21:9: '}'
             {
             match('}'); 
 
@@ -288,8 +288,8 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = T__23;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:22:7: ( '.*' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:22:9: '.*'
+            // InternalBase.g:22:7: ( '.*' )
+            // InternalBase.g:22:9: '.*'
             {
             match(".*"); 
 
@@ -309,8 +309,8 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = T__24;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:23:7: ( '[' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:23:9: '['
+            // InternalBase.g:23:7: ( '[' )
+            // InternalBase.g:23:9: '['
             {
             match('['); 
 
@@ -329,8 +329,8 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = T__25;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:24:7: ( ']' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:24:9: ']'
+            // InternalBase.g:24:7: ( ']' )
+            // InternalBase.g:24:9: ']'
             {
             match(']'); 
 
@@ -349,8 +349,8 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = T__26;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:25:7: ( 'false' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:25:9: 'false'
+            // InternalBase.g:25:7: ( 'false' )
+            // InternalBase.g:25:9: 'false'
             {
             match("false"); 
 
@@ -370,8 +370,8 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = T__27;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:26:7: ( 'true' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:26:9: 'true'
+            // InternalBase.g:26:7: ( 'true' )
+            // InternalBase.g:26:9: 'true'
             {
             match("true"); 
 
@@ -391,8 +391,8 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = T__28;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:27:7: ( '+' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:27:9: '+'
+            // InternalBase.g:27:7: ( '+' )
+            // InternalBase.g:27:9: '+'
             {
             match('+'); 
 
@@ -411,8 +411,8 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = T__29;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:28:7: ( '-' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:28:9: '-'
+            // InternalBase.g:28:7: ( '-' )
+            // InternalBase.g:28:9: '-'
             {
             match('-'); 
 
@@ -431,8 +431,8 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = T__30;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:29:7: ( '.' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:29:9: '.'
+            // InternalBase.g:29:7: ( '.' )
+            // InternalBase.g:29:9: '.'
             {
             match('.'); 
 
@@ -451,8 +451,8 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = T__31;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:30:7: ( 'e' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:30:9: 'e'
+            // InternalBase.g:30:7: ( 'e' )
+            // InternalBase.g:30:9: 'e'
             {
             match('e'); 
 
@@ -471,8 +471,8 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = T__32;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:31:7: ( 'E' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:31:9: 'E'
+            // InternalBase.g:31:7: ( 'E' )
+            // InternalBase.g:31:9: 'E'
             {
             match('E'); 
 
@@ -491,8 +491,8 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = T__33;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:32:7: ( 'ptBoolean' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:32:9: 'ptBoolean'
+            // InternalBase.g:32:7: ( 'ptBoolean' )
+            // InternalBase.g:32:9: 'ptBoolean'
             {
             match("ptBoolean"); 
 
@@ -512,8 +512,8 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = T__34;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:33:7: ( 'ptInteger' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:33:9: 'ptInteger'
+            // InternalBase.g:33:7: ( 'ptInteger' )
+            // InternalBase.g:33:9: 'ptInteger'
             {
             match("ptInteger"); 
 
@@ -533,8 +533,8 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = T__35;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:34:7: ( 'ptReal' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:34:9: 'ptReal'
+            // InternalBase.g:34:7: ( 'ptReal' )
+            // InternalBase.g:34:9: 'ptReal'
             {
             match("ptReal"); 
 
@@ -554,8 +554,8 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = T__36;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:35:7: ( 'ptCharacter' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:35:9: 'ptCharacter'
+            // InternalBase.g:35:7: ( 'ptCharacter' )
+            // InternalBase.g:35:9: 'ptCharacter'
             {
             match("ptCharacter"); 
 
@@ -575,10 +575,10 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = RULE_HEX;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1181:10: ( ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+ )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1181:12: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+
+            // InternalBase.g:1181:10: ( ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+ )
+            // InternalBase.g:1181:12: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1181:12: ( '0x' | '0X' )
+            // InternalBase.g:1181:12: ( '0x' | '0X' )
             int alt1=2;
             int LA1_0 = input.LA(1);
 
@@ -606,7 +606,7 @@ public class InternalBaseLexer extends Lexer {
             }
             switch (alt1) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1181:13: '0x'
+                    // InternalBase.g:1181:13: '0x'
                     {
                     match("0x"); 
 
@@ -614,7 +614,7 @@ public class InternalBaseLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1181:18: '0X'
+                    // InternalBase.g:1181:18: '0X'
                     {
                     match("0X"); 
 
@@ -624,7 +624,7 @@ public class InternalBaseLexer extends Lexer {
 
             }
 
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1181:24: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+
+            // InternalBase.g:1181:24: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+
             int cnt2=0;
             loop2:
             do {
@@ -638,7 +638,7 @@ public class InternalBaseLexer extends Lexer {
 
                 switch (alt2) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:
+            	    // InternalBase.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();
@@ -678,10 +678,10 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = RULE_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1183:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1183:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalBase.g:1183:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+            // InternalBase.g:1183:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1183:11: ( '^' )?
+            // InternalBase.g:1183:11: ( '^' )?
             int alt3=2;
             int LA3_0 = input.LA(1);
 
@@ -690,7 +690,7 @@ public class InternalBaseLexer extends Lexer {
             }
             switch (alt3) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1183:11: '^'
+                    // InternalBase.g:1183:11: '^'
                     {
                     match('^'); 
 
@@ -708,7 +708,7 @@ public class InternalBaseLexer extends Lexer {
                 recover(mse);
                 throw mse;}
 
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1183:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalBase.g:1183:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             loop4:
             do {
                 int alt4=2;
@@ -721,7 +721,7 @@ public class InternalBaseLexer extends Lexer {
 
                 switch (alt4) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:
+            	    // InternalBase.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();
@@ -757,10 +757,10 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = RULE_INT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1185:10: ( ( '0' .. '9' )+ )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1185:12: ( '0' .. '9' )+
+            // InternalBase.g:1185:10: ( ( '0' .. '9' )+ )
+            // InternalBase.g:1185:12: ( '0' .. '9' )+
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1185:12: ( '0' .. '9' )+
+            // InternalBase.g:1185:12: ( '0' .. '9' )+
             int cnt5=0;
             loop5:
             do {
@@ -774,7 +774,7 @@ public class InternalBaseLexer extends Lexer {
 
                 switch (alt5) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1185:13: '0' .. '9'
+            	    // InternalBase.g:1185:13: '0' .. '9'
             	    {
             	    matchRange('0','9'); 
 
@@ -806,10 +806,10 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = RULE_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1187:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1187:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalBase.g:1187:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+            // InternalBase.g:1187:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1187:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalBase.g:1187:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             int alt8=2;
             int LA8_0 = input.LA(1);
 
@@ -827,10 +827,10 @@ public class InternalBaseLexer extends Lexer {
             }
             switch (alt8) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1187:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+                    // InternalBase.g:1187:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
                     {
                     match('\"'); 
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1187:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+                    // InternalBase.g:1187:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
                     loop6:
                     do {
                         int alt6=3;
@@ -846,7 +846,7 @@ public class InternalBaseLexer extends Lexer {
 
                         switch (alt6) {
                     	case 1 :
-                    	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1187:21: '\\\\' .
+                    	    // InternalBase.g:1187:21: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -854,7 +854,7 @@ public class InternalBaseLexer extends Lexer {
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1187:28: ~ ( ( '\\\\' | '\"' ) )
+                    	    // InternalBase.g:1187:28: ~ ( ( '\\\\' | '\"' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -879,10 +879,10 @@ public class InternalBaseLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1187:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+                    // InternalBase.g:1187:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
                     {
                     match('\''); 
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1187:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+                    // InternalBase.g:1187:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
                     loop7:
                     do {
                         int alt7=3;
@@ -898,7 +898,7 @@ public class InternalBaseLexer extends Lexer {
 
                         switch (alt7) {
                     	case 1 :
-                    	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1187:54: '\\\\' .
+                    	    // InternalBase.g:1187:54: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -906,7 +906,7 @@ public class InternalBaseLexer extends Lexer {
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1187:61: ~ ( ( '\\\\' | '\\'' ) )
+                    	    // InternalBase.g:1187:61: ~ ( ( '\\\\' | '\\'' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -949,12 +949,12 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = RULE_ML_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1189:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1189:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // InternalBase.g:1189:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // InternalBase.g:1189:19: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); 
 
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1189:24: ( options {greedy=false; } : . )*
+            // InternalBase.g:1189:24: ( options {greedy=false; } : . )*
             loop9:
             do {
                 int alt9=2;
@@ -979,7 +979,7 @@ public class InternalBaseLexer extends Lexer {
 
                 switch (alt9) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1189:52: .
+            	    // InternalBase.g:1189:52: .
             	    {
             	    matchAny(); 
 
@@ -1009,12 +1009,12 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = RULE_SL_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1191:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1191:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // InternalBase.g:1191:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // InternalBase.g:1191:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
             {
             match("//"); 
 
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1191:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            // InternalBase.g:1191:24: (~ ( ( '\\n' | '\\r' ) ) )*
             loop10:
             do {
                 int alt10=2;
@@ -1027,7 +1027,7 @@ public class InternalBaseLexer extends Lexer {
 
                 switch (alt10) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1191:24: ~ ( ( '\\n' | '\\r' ) )
+            	    // InternalBase.g:1191: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();
@@ -1047,7 +1047,7 @@ public class InternalBaseLexer extends Lexer {
                 }
             } while (true);
 
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1191:40: ( ( '\\r' )? '\\n' )?
+            // InternalBase.g:1191:40: ( ( '\\r' )? '\\n' )?
             int alt12=2;
             int LA12_0 = input.LA(1);
 
@@ -1056,9 +1056,9 @@ public class InternalBaseLexer extends Lexer {
             }
             switch (alt12) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1191:41: ( '\\r' )? '\\n'
+                    // InternalBase.g:1191:41: ( '\\r' )? '\\n'
                     {
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1191:41: ( '\\r' )?
+                    // InternalBase.g:1191:41: ( '\\r' )?
                     int alt11=2;
                     int LA11_0 = input.LA(1);
 
@@ -1067,7 +1067,7 @@ public class InternalBaseLexer extends Lexer {
                     }
                     switch (alt11) {
                         case 1 :
-                            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1191:41: '\\r'
+                            // InternalBase.g:1191:41: '\\r'
                             {
                             match('\r'); 
 
@@ -1099,10 +1099,10 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = RULE_WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1193:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1193:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalBase.g:1193:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // InternalBase.g:1193:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1193:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalBase.g:1193:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             int cnt13=0;
             loop13:
             do {
@@ -1116,7 +1116,7 @@ public class InternalBaseLexer extends Lexer {
 
                 switch (alt13) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:
+            	    // InternalBase.g:
             	    {
             	    if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) {
             	        input.consume();
@@ -1156,8 +1156,8 @@ public class InternalBaseLexer extends Lexer {
         try {
             int _type = RULE_ANY_OTHER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1195:16: ( . )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1195:18: .
+            // InternalBase.g:1195:16: ( . )
+            // InternalBase.g:1195:18: .
             {
             matchAny(); 
 
@@ -1172,236 +1172,236 @@ public class InternalBaseLexer extends Lexer {
     // $ANTLR end "RULE_ANY_OTHER"
 
     public void mTokens() throws RecognitionException {
-        // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.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 | RULE_HEX | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+        // InternalBase.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 | RULE_HEX | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
         int alt14=33;
         alt14 = dfa14.predict(input);
         switch (alt14) {
             case 1 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1:10: T__12
+                // InternalBase.g:1:10: T__12
                 {
                 mT__12(); 
 
                 }
                 break;
             case 2 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1:16: T__13
+                // InternalBase.g:1:16: T__13
                 {
                 mT__13(); 
 
                 }
                 break;
             case 3 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1:22: T__14
+                // InternalBase.g:1:22: T__14
                 {
                 mT__14(); 
 
                 }
                 break;
             case 4 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1:28: T__15
+                // InternalBase.g:1:28: T__15
                 {
                 mT__15(); 
 
                 }
                 break;
             case 5 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1:34: T__16
+                // InternalBase.g:1:34: T__16
                 {
                 mT__16(); 
 
                 }
                 break;
             case 6 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1:40: T__17
+                // InternalBase.g:1:40: T__17
                 {
                 mT__17(); 
 
                 }
                 break;
             case 7 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1:46: T__18
+                // InternalBase.g:1:46: T__18
                 {
                 mT__18(); 
 
                 }
                 break;
             case 8 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1:52: T__19
+                // InternalBase.g:1:52: T__19
                 {
                 mT__19(); 
 
                 }
                 break;
             case 9 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1:58: T__20
+                // InternalBase.g:1:58: T__20
                 {
                 mT__20(); 
 
                 }
                 break;
             case 10 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1:64: T__21
+                // InternalBase.g:1:64: T__21
                 {
                 mT__21(); 
 
                 }
                 break;
             case 11 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1:70: T__22
+                // InternalBase.g:1:70: T__22
                 {
                 mT__22(); 
 
                 }
                 break;
             case 12 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1:76: T__23
+                // InternalBase.g:1:76: T__23
                 {
                 mT__23(); 
 
                 }
                 break;
             case 13 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1:82: T__24
+                // InternalBase.g:1:82: T__24
                 {
                 mT__24(); 
 
                 }
                 break;
             case 14 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1:88: T__25
+                // InternalBase.g:1:88: T__25
                 {
                 mT__25(); 
 
                 }
                 break;
             case 15 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1:94: T__26
+                // InternalBase.g:1:94: T__26
                 {
                 mT__26(); 
 
                 }
                 break;
             case 16 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1:100: T__27
+                // InternalBase.g:1:100: T__27
                 {
                 mT__27(); 
 
                 }
                 break;
             case 17 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1:106: T__28
+                // InternalBase.g:1:106: T__28
                 {
                 mT__28(); 
 
                 }
                 break;
             case 18 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1:112: T__29
+                // InternalBase.g:1:112: T__29
                 {
                 mT__29(); 
 
                 }
                 break;
             case 19 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1:118: T__30
+                // InternalBase.g:1:118: T__30
                 {
                 mT__30(); 
 
                 }
                 break;
             case 20 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1:124: T__31
+                // InternalBase.g:1:124: T__31
                 {
                 mT__31(); 
 
                 }
                 break;
             case 21 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1:130: T__32
+                // InternalBase.g:1:130: T__32
                 {
                 mT__32(); 
 
                 }
                 break;
             case 22 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1:136: T__33
+                // InternalBase.g:1:136: T__33
                 {
                 mT__33(); 
 
                 }
                 break;
             case 23 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1:142: T__34
+                // InternalBase.g:1:142: T__34
                 {
                 mT__34(); 
 
                 }
                 break;
             case 24 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1:148: T__35
+                // InternalBase.g:1:148: T__35
                 {
                 mT__35(); 
 
                 }
                 break;
             case 25 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1:154: T__36
+                // InternalBase.g:1:154: T__36
                 {
                 mT__36(); 
 
                 }
                 break;
             case 26 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1:160: RULE_HEX
+                // InternalBase.g:1:160: RULE_HEX
                 {
                 mRULE_HEX(); 
 
                 }
                 break;
             case 27 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1:169: RULE_ID
+                // InternalBase.g:1:169: RULE_ID
                 {
                 mRULE_ID(); 
 
                 }
                 break;
             case 28 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1:177: RULE_INT
+                // InternalBase.g:1:177: RULE_INT
                 {
                 mRULE_INT(); 
 
                 }
                 break;
             case 29 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1:186: RULE_STRING
+                // InternalBase.g:1:186: RULE_STRING
                 {
                 mRULE_STRING(); 
 
                 }
                 break;
             case 30 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1:198: RULE_ML_COMMENT
+                // InternalBase.g:1:198: RULE_ML_COMMENT
                 {
                 mRULE_ML_COMMENT(); 
 
                 }
                 break;
             case 31 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1:214: RULE_SL_COMMENT
+                // InternalBase.g:1:214: RULE_SL_COMMENT
                 {
                 mRULE_SL_COMMENT(); 
 
                 }
                 break;
             case 32 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1:230: RULE_WS
+                // InternalBase.g:1:230: RULE_WS
                 {
                 mRULE_WS(); 
 
                 }
                 break;
             case 33 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1:238: RULE_ANY_OTHER
+                // InternalBase.g:1:238: RULE_ANY_OTHER
                 {
                 mRULE_ANY_OTHER(); 
 
@@ -1415,47 +1415,19 @@ public class InternalBaseLexer extends Lexer {
 
     protected DFA14 dfa14 = new DFA14(this);
     static final String DFA14_eotS =
-        "\6\uffff\3\45\3\uffff\1\54\2\uffff\2\45\2\uffff\1\63\1\64\1\45"+
-        "\1\67\1\36\2\uffff\3\36\7\uffff\1\45\1\uffff\2\45\7\uffff\2\45\4"+
-        "\uffff\1\45\6\uffff\15\45\1\122\7\45\1\132\1\uffff\7\45\1\uffff"+
-        "\2\45\1\144\6\45\1\uffff\1\45\1\154\5\45\1\uffff\1\162\1\163\1\164"+
-        "\1\165\1\45\4\uffff\1\45\1\170\1\uffff";
+        "\6\uffff\3\45\3\uffff\1\54\2\uffff\2\45\2\uffff\1\63\1\64\1\45\1\67\1\36\2\uffff\3\36\7\uffff\1\45\1\uffff\2\45\7\uffff\2\45\4\uffff\1\45\6\uffff\15\45\1\122\7\45\1\132\1\uffff\7\45\1\uffff\2\45\1\144\6\45\1\uffff\1\45\1\154\5\45\1\uffff\1\162\1\163\1\164\1\165\1\45\4\uffff\1\45\1\170\1\uffff";
     static final String DFA14_eofS =
         "\171\uffff";
     static final String DFA14_minS =
-        "\1\0\5\uffff\1\160\1\141\1\164\3\uffff\1\52\2\uffff\1\141\1\162"+
-        "\2\uffff\2\60\1\164\1\130\1\101\2\uffff\2\0\1\52\7\uffff\1\164\1"+
-        "\uffff\1\156\1\164\7\uffff\1\154\1\165\4\uffff\1\102\6\uffff\1\151"+
-        "\1\144\1\162\1\163\1\145\1\157\1\156\1\145\1\150\1\157\1\141\1\151"+
-        "\1\145\1\60\1\157\1\164\2\141\1\156\1\164\1\142\1\60\1\uffff\1\154"+
-        "\1\145\1\154\1\162\1\141\1\157\1\165\1\uffff\1\145\1\147\1\60\1"+
-        "\141\1\154\1\162\1\164\1\141\1\145\1\uffff\1\143\1\60\1\171\1\145"+
-        "\1\156\1\162\1\164\1\uffff\4\60\1\145\4\uffff\1\162\1\60\1\uffff";
+        "\1\0\5\uffff\1\160\1\141\1\164\3\uffff\1\52\2\uffff\1\141\1\162\2\uffff\2\60\1\164\1\130\1\101\2\uffff\2\0\1\52\7\uffff\1\164\1\uffff\1\156\1\164\7\uffff\1\154\1\165\4\uffff\1\102\6\uffff\1\151\1\144\1\162\1\163\1\145\1\157\1\156\1\145\1\150\1\157\1\141\1\151\1\145\1\60\1\157\1\164\2\141\1\156\1\164\1\142\1\60\1\uffff\1\154\1\145\1\154\1\162\1\141\1\157\1\165\1\uffff\1\145\1\147\1\60\1\141\1\154\1\162\1\164\1\141\1\145\1\uffff\1\143\1\60\1\171\1\145\1\156\1\162\1\164\1\uffff\4\60\1\145\4\uffff\1\162\1\60\1\uffff";
     static final String DFA14_maxS =
-        "\1\uffff\5\uffff\1\160\1\141\1\164\3\uffff\1\52\2\uffff\1\141\1"+
-        "\162\2\uffff\2\172\1\164\1\170\1\172\2\uffff\2\uffff\1\57\7\uffff"+
-        "\1\164\1\uffff\1\156\1\164\7\uffff\1\154\1\165\4\uffff\1\122\6\uffff"+
-        "\1\151\1\144\1\162\1\163\1\145\1\157\1\156\1\145\1\150\1\157\1\141"+
-        "\1\151\1\145\1\172\1\157\1\164\2\141\1\156\1\164\1\142\1\172\1\uffff"+
-        "\1\154\1\145\1\154\1\162\1\141\1\157\1\165\1\uffff\1\145\1\147\1"+
-        "\172\1\141\1\154\1\162\1\164\1\141\1\145\1\uffff\1\143\1\172\1\171"+
-        "\1\145\1\156\1\162\1\164\1\uffff\4\172\1\145\4\uffff\1\162\1\172"+
-        "\1\uffff";
+        "\1\uffff\5\uffff\1\160\1\141\1\164\3\uffff\1\52\2\uffff\1\141\1\162\2\uffff\2\172\1\164\1\170\1\172\2\uffff\2\uffff\1\57\7\uffff\1\164\1\uffff\1\156\1\164\7\uffff\1\154\1\165\4\uffff\1\122\6\uffff\1\151\1\144\1\162\1\163\1\145\1\157\1\156\1\145\1\150\1\157\1\141\1\151\1\145\1\172\1\157\1\164\2\141\1\156\1\164\1\142\1\172\1\uffff\1\154\1\145\1\154\1\162\1\141\1\157\1\165\1\uffff\1\145\1\147\1\172\1\141\1\154\1\162\1\164\1\141\1\145\1\uffff\1\143\1\172\1\171\1\145\1\156\1\162\1\164\1\uffff\4\172\1\145\4\uffff\1\162\1\172\1\uffff";
     static final String DFA14_acceptS =
-        "\1\uffff\1\1\1\2\1\3\1\4\1\5\3\uffff\1\11\1\12\1\13\1\uffff\1\15"+
-        "\1\16\2\uffff\1\21\1\22\5\uffff\1\33\1\34\3\uffff\1\40\1\41\1\1"+
-        "\1\2\1\3\1\4\1\5\1\uffff\1\33\2\uffff\1\11\1\12\1\13\1\14\1\23\1"+
-        "\15\1\16\2\uffff\1\21\1\22\1\24\1\25\1\uffff\1\32\1\34\1\35\1\36"+
-        "\1\37\1\40\26\uffff\1\20\7\uffff\1\17\11\uffff\1\30\7\uffff\1\6"+
-        "\5\uffff\1\7\1\10\1\26\1\27\2\uffff\1\31";
+        "\1\uffff\1\1\1\2\1\3\1\4\1\5\3\uffff\1\11\1\12\1\13\1\uffff\1\15\1\16\2\uffff\1\21\1\22\5\uffff\1\33\1\34\3\uffff\1\40\1\41\1\1\1\2\1\3\1\4\1\5\1\uffff\1\33\2\uffff\1\11\1\12\1\13\1\14\1\23\1\15\1\16\2\uffff\1\21\1\22\1\24\1\25\1\uffff\1\32\1\34\1\35\1\36\1\37\1\40\26\uffff\1\20\7\uffff\1\17\11\uffff\1\30\7\uffff\1\6\5\uffff\1\7\1\10\1\26\1\27\2\uffff\1\31";
     static final String DFA14_specialS =
         "\1\1\31\uffff\1\0\1\2\135\uffff}>";
     static final String[] DFA14_transitionS = {
-            "\11\36\2\35\2\36\1\35\22\36\1\35\1\36\1\32\4\36\1\33\1\2\1"+
-            "\4\1\36\1\21\1\3\1\22\1\14\1\34\1\26\11\31\1\11\2\36\1\5\2\36"+
-            "\1\1\4\30\1\24\25\30\1\15\1\36\1\16\1\27\1\30\1\36\1\10\3\30"+
-            "\1\23\1\17\6\30\1\7\1\30\1\6\1\25\3\30\1\20\6\30\1\12\1\36\1"+
-            "\13\uff82\36",
+            "\11\36\2\35\2\36\1\35\22\36\1\35\1\36\1\32\4\36\1\33\1\2\1\4\1\36\1\21\1\3\1\22\1\14\1\34\1\26\11\31\1\11\2\36\1\5\2\36\1\1\4\30\1\24\25\30\1\15\1\36\1\16\1\27\1\30\1\36\1\10\3\30\1\23\1\17\6\30\1\7\1\30\1\6\1\25\3\30\1\20\6\30\1\12\1\36\1\13\uff82\36",
             "",
             "",
             "",
diff --git a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseParser.java b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseParser.java
index fc8596980..181a67dc7 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseParser.java
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseParser.java
@@ -73,7 +73,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
         
 
     public String[] getTokenNames() { return InternalBaseParser.tokenNames; }
-    public String getGrammarFileName() { return "../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g"; }
+    public String getGrammarFileName() { return "InternalBase.g"; }
 
 
 
@@ -98,7 +98,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleAnnotation"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:68:1: entryRuleAnnotation returns [EObject current=null] : iv_ruleAnnotation= ruleAnnotation EOF ;
+    // InternalBase.g:68:1: entryRuleAnnotation returns [EObject current=null] : iv_ruleAnnotation= ruleAnnotation EOF ;
     public final EObject entryRuleAnnotation() throws RecognitionException {
         EObject current = null;
 
@@ -106,17 +106,17 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:69:2: (iv_ruleAnnotation= ruleAnnotation EOF )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:70:2: iv_ruleAnnotation= ruleAnnotation EOF
+            // InternalBase.g:69:2: (iv_ruleAnnotation= ruleAnnotation EOF )
+            // InternalBase.g:70:2: iv_ruleAnnotation= ruleAnnotation EOF
             {
              newCompositeNode(grammarAccess.getAnnotationRule()); 
-            pushFollow(FOLLOW_ruleAnnotation_in_entryRuleAnnotation75);
+            pushFollow(FOLLOW_1);
             iv_ruleAnnotation=ruleAnnotation();
 
             state._fsp--;
 
              current =iv_ruleAnnotation; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAnnotation85); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -134,7 +134,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleAnnotation"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:77:1: ruleAnnotation returns [EObject current=null] : (otherlv_0= '@' ( ( ruleFQN ) ) (otherlv_2= '(' ( (lv_attributes_3_0= ruleKeyValue ) ) (otherlv_4= ',' ( (lv_attributes_5_0= ruleKeyValue ) ) )* otherlv_6= ')' )? ) ;
+    // InternalBase.g:77:1: ruleAnnotation returns [EObject current=null] : (otherlv_0= '@' ( ( ruleFQN ) ) (otherlv_2= '(' ( (lv_attributes_3_0= ruleKeyValue ) ) (otherlv_4= ',' ( (lv_attributes_5_0= ruleKeyValue ) ) )* otherlv_6= ')' )? ) ;
     public final EObject ruleAnnotation() throws RecognitionException {
         EObject current = null;
 
@@ -150,21 +150,21 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:80:28: ( (otherlv_0= '@' ( ( ruleFQN ) ) (otherlv_2= '(' ( (lv_attributes_3_0= ruleKeyValue ) ) (otherlv_4= ',' ( (lv_attributes_5_0= ruleKeyValue ) ) )* otherlv_6= ')' )? ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:81:1: (otherlv_0= '@' ( ( ruleFQN ) ) (otherlv_2= '(' ( (lv_attributes_3_0= ruleKeyValue ) ) (otherlv_4= ',' ( (lv_attributes_5_0= ruleKeyValue ) ) )* otherlv_6= ')' )? )
+            // InternalBase.g:80:28: ( (otherlv_0= '@' ( ( ruleFQN ) ) (otherlv_2= '(' ( (lv_attributes_3_0= ruleKeyValue ) ) (otherlv_4= ',' ( (lv_attributes_5_0= ruleKeyValue ) ) )* otherlv_6= ')' )? ) )
+            // InternalBase.g:81:1: (otherlv_0= '@' ( ( ruleFQN ) ) (otherlv_2= '(' ( (lv_attributes_3_0= ruleKeyValue ) ) (otherlv_4= ',' ( (lv_attributes_5_0= ruleKeyValue ) ) )* otherlv_6= ')' )? )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:81:1: (otherlv_0= '@' ( ( ruleFQN ) ) (otherlv_2= '(' ( (lv_attributes_3_0= ruleKeyValue ) ) (otherlv_4= ',' ( (lv_attributes_5_0= ruleKeyValue ) ) )* otherlv_6= ')' )? )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:81:3: otherlv_0= '@' ( ( ruleFQN ) ) (otherlv_2= '(' ( (lv_attributes_3_0= ruleKeyValue ) ) (otherlv_4= ',' ( (lv_attributes_5_0= ruleKeyValue ) ) )* otherlv_6= ')' )?
+            // InternalBase.g:81:1: (otherlv_0= '@' ( ( ruleFQN ) ) (otherlv_2= '(' ( (lv_attributes_3_0= ruleKeyValue ) ) (otherlv_4= ',' ( (lv_attributes_5_0= ruleKeyValue ) ) )* otherlv_6= ')' )? )
+            // InternalBase.g:81:3: otherlv_0= '@' ( ( ruleFQN ) ) (otherlv_2= '(' ( (lv_attributes_3_0= ruleKeyValue ) ) (otherlv_4= ',' ( (lv_attributes_5_0= ruleKeyValue ) ) )* otherlv_6= ')' )?
             {
-            otherlv_0=(Token)match(input,12,FOLLOW_12_in_ruleAnnotation122); 
+            otherlv_0=(Token)match(input,12,FOLLOW_3); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getAnnotationAccess().getCommercialAtKeyword_0());
                 
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:85:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:86:1: ( ruleFQN )
+            // InternalBase.g:85:1: ( ( ruleFQN ) )
+            // InternalBase.g:86:1: ( ruleFQN )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:86:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:87:3: ruleFQN
+            // InternalBase.g:86:1: ( ruleFQN )
+            // InternalBase.g:87:3: ruleFQN
             {
 
             			if (current==null) {
@@ -174,7 +174,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
              
             	        newCompositeNode(grammarAccess.getAnnotationAccess().getTypeAnnotationTypeCrossReference_1_0()); 
             	    
-            pushFollow(FOLLOW_ruleFQN_in_ruleAnnotation145);
+            pushFollow(FOLLOW_4);
             ruleFQN();
 
             state._fsp--;
@@ -188,7 +188,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:100:2: (otherlv_2= '(' ( (lv_attributes_3_0= ruleKeyValue ) ) (otherlv_4= ',' ( (lv_attributes_5_0= ruleKeyValue ) ) )* otherlv_6= ')' )?
+            // InternalBase.g:100:2: (otherlv_2= '(' ( (lv_attributes_3_0= ruleKeyValue ) ) (otherlv_4= ',' ( (lv_attributes_5_0= ruleKeyValue ) ) )* otherlv_6= ')' )?
             int alt2=2;
             int LA2_0 = input.LA(1);
 
@@ -197,22 +197,22 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
             }
             switch (alt2) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:100:4: otherlv_2= '(' ( (lv_attributes_3_0= ruleKeyValue ) ) (otherlv_4= ',' ( (lv_attributes_5_0= ruleKeyValue ) ) )* otherlv_6= ')'
+                    // InternalBase.g:100:4: otherlv_2= '(' ( (lv_attributes_3_0= ruleKeyValue ) ) (otherlv_4= ',' ( (lv_attributes_5_0= ruleKeyValue ) ) )* otherlv_6= ')'
                     {
-                    otherlv_2=(Token)match(input,13,FOLLOW_13_in_ruleAnnotation158); 
+                    otherlv_2=(Token)match(input,13,FOLLOW_3); 
 
                         	newLeafNode(otherlv_2, grammarAccess.getAnnotationAccess().getLeftParenthesisKeyword_2_0());
                         
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:104:1: ( (lv_attributes_3_0= ruleKeyValue ) )
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:105:1: (lv_attributes_3_0= ruleKeyValue )
+                    // InternalBase.g:104:1: ( (lv_attributes_3_0= ruleKeyValue ) )
+                    // InternalBase.g:105:1: (lv_attributes_3_0= ruleKeyValue )
                     {
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:105:1: (lv_attributes_3_0= ruleKeyValue )
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:106:3: lv_attributes_3_0= ruleKeyValue
+                    // InternalBase.g:105:1: (lv_attributes_3_0= ruleKeyValue )
+                    // InternalBase.g:106:3: lv_attributes_3_0= ruleKeyValue
                     {
                      
                     	        newCompositeNode(grammarAccess.getAnnotationAccess().getAttributesKeyValueParserRuleCall_2_1_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleKeyValue_in_ruleAnnotation179);
+                    pushFollow(FOLLOW_5);
                     lv_attributes_3_0=ruleKeyValue();
 
                     state._fsp--;
@@ -225,7 +225,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"attributes",
                             		lv_attributes_3_0, 
-                            		"KeyValue");
+                            		"org.eclipse.etrice.core.common.Base.KeyValue");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -234,7 +234,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:122:2: (otherlv_4= ',' ( (lv_attributes_5_0= ruleKeyValue ) ) )*
+                    // InternalBase.g:122:2: (otherlv_4= ',' ( (lv_attributes_5_0= ruleKeyValue ) ) )*
                     loop1:
                     do {
                         int alt1=2;
@@ -247,22 +247,22 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
                         switch (alt1) {
                     	case 1 :
-                    	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:122:4: otherlv_4= ',' ( (lv_attributes_5_0= ruleKeyValue ) )
+                    	    // InternalBase.g:122:4: otherlv_4= ',' ( (lv_attributes_5_0= ruleKeyValue ) )
                     	    {
-                    	    otherlv_4=(Token)match(input,14,FOLLOW_14_in_ruleAnnotation192); 
+                    	    otherlv_4=(Token)match(input,14,FOLLOW_3); 
 
                     	        	newLeafNode(otherlv_4, grammarAccess.getAnnotationAccess().getCommaKeyword_2_2_0());
                     	        
-                    	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:126:1: ( (lv_attributes_5_0= ruleKeyValue ) )
-                    	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:127:1: (lv_attributes_5_0= ruleKeyValue )
+                    	    // InternalBase.g:126:1: ( (lv_attributes_5_0= ruleKeyValue ) )
+                    	    // InternalBase.g:127:1: (lv_attributes_5_0= ruleKeyValue )
                     	    {
-                    	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:127:1: (lv_attributes_5_0= ruleKeyValue )
-                    	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:128:3: lv_attributes_5_0= ruleKeyValue
+                    	    // InternalBase.g:127:1: (lv_attributes_5_0= ruleKeyValue )
+                    	    // InternalBase.g:128:3: lv_attributes_5_0= ruleKeyValue
                     	    {
                     	     
                     	    	        newCompositeNode(grammarAccess.getAnnotationAccess().getAttributesKeyValueParserRuleCall_2_2_1_0()); 
                     	    	    
-                    	    pushFollow(FOLLOW_ruleKeyValue_in_ruleAnnotation213);
+                    	    pushFollow(FOLLOW_5);
                     	    lv_attributes_5_0=ruleKeyValue();
 
                     	    state._fsp--;
@@ -275,7 +275,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
                     	           			current, 
                     	           			"attributes",
                     	            		lv_attributes_5_0, 
-                    	            		"KeyValue");
+                    	            		"org.eclipse.etrice.core.common.Base.KeyValue");
                     	    	        afterParserOrEnumRuleCall();
                     	    	    
 
@@ -293,7 +293,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
                         }
                     } while (true);
 
-                    otherlv_6=(Token)match(input,15,FOLLOW_15_in_ruleAnnotation227); 
+                    otherlv_6=(Token)match(input,15,FOLLOW_2); 
 
                         	newLeafNode(otherlv_6, grammarAccess.getAnnotationAccess().getRightParenthesisKeyword_2_3());
                         
@@ -324,7 +324,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleKeyValue"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:156:1: entryRuleKeyValue returns [EObject current=null] : iv_ruleKeyValue= ruleKeyValue EOF ;
+    // InternalBase.g:156:1: entryRuleKeyValue returns [EObject current=null] : iv_ruleKeyValue= ruleKeyValue EOF ;
     public final EObject entryRuleKeyValue() throws RecognitionException {
         EObject current = null;
 
@@ -332,17 +332,17 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:157:2: (iv_ruleKeyValue= ruleKeyValue EOF )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:158:2: iv_ruleKeyValue= ruleKeyValue EOF
+            // InternalBase.g:157:2: (iv_ruleKeyValue= ruleKeyValue EOF )
+            // InternalBase.g:158:2: iv_ruleKeyValue= ruleKeyValue EOF
             {
              newCompositeNode(grammarAccess.getKeyValueRule()); 
-            pushFollow(FOLLOW_ruleKeyValue_in_entryRuleKeyValue265);
+            pushFollow(FOLLOW_1);
             iv_ruleKeyValue=ruleKeyValue();
 
             state._fsp--;
 
              current =iv_ruleKeyValue; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleKeyValue275); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -360,7 +360,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleKeyValue"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:165:1: ruleKeyValue returns [EObject current=null] : ( ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) ) ) ;
+    // InternalBase.g:165: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;
 
@@ -372,19 +372,19 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:168:28: ( ( ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) ) ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:169:1: ( ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) ) )
+            // InternalBase.g:168:28: ( ( ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) ) ) )
+            // InternalBase.g:169:1: ( ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) ) )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:169:1: ( ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:169:2: ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) )
+            // InternalBase.g:169:1: ( ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) ) )
+            // InternalBase.g:169:2: ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:169:2: ( (lv_key_0_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:170:1: (lv_key_0_0= RULE_ID )
+            // InternalBase.g:169:2: ( (lv_key_0_0= RULE_ID ) )
+            // InternalBase.g:170:1: (lv_key_0_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:170:1: (lv_key_0_0= RULE_ID )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:171:3: lv_key_0_0= RULE_ID
+            // InternalBase.g:170:1: (lv_key_0_0= RULE_ID )
+            // InternalBase.g:171:3: lv_key_0_0= RULE_ID
             {
-            lv_key_0_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleKeyValue317); 
+            lv_key_0_0=(Token)match(input,RULE_ID,FOLLOW_6); 
 
             			newLeafNode(lv_key_0_0, grammarAccess.getKeyValueAccess().getKeyIDTerminalRuleCall_0_0()); 
             		
@@ -396,7 +396,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"key",
                     		lv_key_0_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -404,20 +404,20 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,16,FOLLOW_16_in_ruleKeyValue334); 
+            otherlv_1=(Token)match(input,16,FOLLOW_7); 
 
                 	newLeafNode(otherlv_1, grammarAccess.getKeyValueAccess().getEqualsSignKeyword_1());
                 
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:191:1: ( (lv_value_2_0= ruleLiteral ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:192:1: (lv_value_2_0= ruleLiteral )
+            // InternalBase.g:191:1: ( (lv_value_2_0= ruleLiteral ) )
+            // InternalBase.g:192:1: (lv_value_2_0= ruleLiteral )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:192:1: (lv_value_2_0= ruleLiteral )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:193:3: lv_value_2_0= ruleLiteral
+            // InternalBase.g:192:1: (lv_value_2_0= ruleLiteral )
+            // InternalBase.g:193:3: lv_value_2_0= ruleLiteral
             {
              
             	        newCompositeNode(grammarAccess.getKeyValueAccess().getValueLiteralParserRuleCall_2_0()); 
             	    
-            pushFollow(FOLLOW_ruleLiteral_in_ruleKeyValue355);
+            pushFollow(FOLLOW_2);
             lv_value_2_0=ruleLiteral();
 
             state._fsp--;
@@ -430,7 +430,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"value",
                     		lv_value_2_0, 
-                    		"Literal");
+                    		"org.eclipse.etrice.core.common.Base.Literal");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -460,7 +460,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleAnnotationTargetType"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:219:1: entryRuleAnnotationTargetType returns [String current=null] : iv_ruleAnnotationTargetType= ruleAnnotationTargetType EOF ;
+    // InternalBase.g:219:1: entryRuleAnnotationTargetType returns [String current=null] : iv_ruleAnnotationTargetType= ruleAnnotationTargetType EOF ;
     public final String entryRuleAnnotationTargetType() throws RecognitionException {
         String current = null;
 
@@ -468,17 +468,17 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:220:2: (iv_ruleAnnotationTargetType= ruleAnnotationTargetType EOF )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:221:2: iv_ruleAnnotationTargetType= ruleAnnotationTargetType EOF
+            // InternalBase.g:220:2: (iv_ruleAnnotationTargetType= ruleAnnotationTargetType EOF )
+            // InternalBase.g:221:2: iv_ruleAnnotationTargetType= ruleAnnotationTargetType EOF
             {
              newCompositeNode(grammarAccess.getAnnotationTargetTypeRule()); 
-            pushFollow(FOLLOW_ruleAnnotationTargetType_in_entryRuleAnnotationTargetType394);
+            pushFollow(FOLLOW_1);
             iv_ruleAnnotationTargetType=ruleAnnotationTargetType();
 
             state._fsp--;
 
              current =iv_ruleAnnotationTargetType.getText(); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAnnotationTargetType405); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -496,7 +496,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleAnnotationTargetType"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:228:1: ruleAnnotationTargetType returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_ID_0= RULE_ID ;
+    // InternalBase.g:228:1: ruleAnnotationTargetType returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_ID_0= RULE_ID ;
     public final AntlrDatatypeRuleToken ruleAnnotationTargetType() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -505,10 +505,10 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:231:28: (this_ID_0= RULE_ID )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:232:5: this_ID_0= RULE_ID
+            // InternalBase.g:231:28: (this_ID_0= RULE_ID )
+            // InternalBase.g:232:5: this_ID_0= RULE_ID
             {
-            this_ID_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleAnnotationTargetType444); 
+            this_ID_0=(Token)match(input,RULE_ID,FOLLOW_2); 
 
             		current.merge(this_ID_0);
                 
@@ -533,7 +533,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleAnnotationAttribute"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:247:1: entryRuleAnnotationAttribute returns [EObject current=null] : iv_ruleAnnotationAttribute= ruleAnnotationAttribute EOF ;
+    // InternalBase.g:247:1: entryRuleAnnotationAttribute returns [EObject current=null] : iv_ruleAnnotationAttribute= ruleAnnotationAttribute EOF ;
     public final EObject entryRuleAnnotationAttribute() throws RecognitionException {
         EObject current = null;
 
@@ -541,17 +541,17 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:248:2: (iv_ruleAnnotationAttribute= ruleAnnotationAttribute EOF )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:249:2: iv_ruleAnnotationAttribute= ruleAnnotationAttribute EOF
+            // InternalBase.g:248:2: (iv_ruleAnnotationAttribute= ruleAnnotationAttribute EOF )
+            // InternalBase.g:249:2: iv_ruleAnnotationAttribute= ruleAnnotationAttribute EOF
             {
              newCompositeNode(grammarAccess.getAnnotationAttributeRule()); 
-            pushFollow(FOLLOW_ruleAnnotationAttribute_in_entryRuleAnnotationAttribute488);
+            pushFollow(FOLLOW_1);
             iv_ruleAnnotationAttribute=ruleAnnotationAttribute();
 
             state._fsp--;
 
              current =iv_ruleAnnotationAttribute; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAnnotationAttribute498); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -569,7 +569,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleAnnotationAttribute"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:256:1: ruleAnnotationAttribute returns [EObject current=null] : (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute ) ;
+    // InternalBase.g:256:1: ruleAnnotationAttribute returns [EObject current=null] : (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute ) ;
     public final EObject ruleAnnotationAttribute() throws RecognitionException {
         EObject current = null;
 
@@ -581,10 +581,10 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:259:28: ( (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:260:1: (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute )
+            // InternalBase.g:259:28: ( (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute ) )
+            // InternalBase.g:260:1: (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:260:1: (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute )
+            // InternalBase.g:260:1: (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute )
             int alt3=2;
             int LA3_0 = input.LA(1);
 
@@ -688,12 +688,12 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
             }
             switch (alt3) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:261:5: this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute
+                    // InternalBase.g:261:5: this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute
                     {
                      
                             newCompositeNode(grammarAccess.getAnnotationAttributeAccess().getSimpleAnnotationAttributeParserRuleCall_0()); 
                         
-                    pushFollow(FOLLOW_ruleSimpleAnnotationAttribute_in_ruleAnnotationAttribute545);
+                    pushFollow(FOLLOW_2);
                     this_SimpleAnnotationAttribute_0=ruleSimpleAnnotationAttribute();
 
                     state._fsp--;
@@ -706,12 +706,12 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:271:5: this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute
+                    // InternalBase.g:271:5: this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute
                     {
                      
                             newCompositeNode(grammarAccess.getAnnotationAttributeAccess().getEnumAnnotationAttributeParserRuleCall_1()); 
                         
-                    pushFollow(FOLLOW_ruleEnumAnnotationAttribute_in_ruleAnnotationAttribute572);
+                    pushFollow(FOLLOW_2);
                     this_EnumAnnotationAttribute_1=ruleEnumAnnotationAttribute();
 
                     state._fsp--;
@@ -744,7 +744,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleSimpleAnnotationAttribute"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:287:1: entryRuleSimpleAnnotationAttribute returns [EObject current=null] : iv_ruleSimpleAnnotationAttribute= ruleSimpleAnnotationAttribute EOF ;
+    // InternalBase.g:287:1: entryRuleSimpleAnnotationAttribute returns [EObject current=null] : iv_ruleSimpleAnnotationAttribute= ruleSimpleAnnotationAttribute EOF ;
     public final EObject entryRuleSimpleAnnotationAttribute() throws RecognitionException {
         EObject current = null;
 
@@ -752,17 +752,17 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:288:2: (iv_ruleSimpleAnnotationAttribute= ruleSimpleAnnotationAttribute EOF )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:289:2: iv_ruleSimpleAnnotationAttribute= ruleSimpleAnnotationAttribute EOF
+            // InternalBase.g:288:2: (iv_ruleSimpleAnnotationAttribute= ruleSimpleAnnotationAttribute EOF )
+            // InternalBase.g:289:2: iv_ruleSimpleAnnotationAttribute= ruleSimpleAnnotationAttribute EOF
             {
              newCompositeNode(grammarAccess.getSimpleAnnotationAttributeRule()); 
-            pushFollow(FOLLOW_ruleSimpleAnnotationAttribute_in_entryRuleSimpleAnnotationAttribute607);
+            pushFollow(FOLLOW_1);
             iv_ruleSimpleAnnotationAttribute=ruleSimpleAnnotationAttribute();
 
             state._fsp--;
 
              current =iv_ruleSimpleAnnotationAttribute; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSimpleAnnotationAttribute617); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -780,7 +780,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleSimpleAnnotationAttribute"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:296: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 ) ) ) ;
+    // InternalBase.g:296: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;
 
@@ -795,13 +795,13 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:299: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.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:300: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 ) ) )
+            // InternalBase.g:299: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 ) ) ) )
+            // InternalBase.g:300: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.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:300: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.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:300: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 ) )
+            // InternalBase.g:300: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 ) ) )
+            // InternalBase.g:300: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.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:300:2: ( ( (lv_optional_0_0= 'optional' ) ) | otherlv_1= 'mandatory' )
+            // InternalBase.g:300:2: ( ( (lv_optional_0_0= 'optional' ) ) | otherlv_1= 'mandatory' )
             int alt4=2;
             int LA4_0 = input.LA(1);
 
@@ -819,15 +819,15 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
             }
             switch (alt4) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:300:3: ( (lv_optional_0_0= 'optional' ) )
+                    // InternalBase.g:300:3: ( (lv_optional_0_0= 'optional' ) )
                     {
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:300:3: ( (lv_optional_0_0= 'optional' ) )
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:301:1: (lv_optional_0_0= 'optional' )
+                    // InternalBase.g:300:3: ( (lv_optional_0_0= 'optional' ) )
+                    // InternalBase.g:301:1: (lv_optional_0_0= 'optional' )
                     {
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:301:1: (lv_optional_0_0= 'optional' )
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:302:3: lv_optional_0_0= 'optional'
+                    // InternalBase.g:301:1: (lv_optional_0_0= 'optional' )
+                    // InternalBase.g:302:3: lv_optional_0_0= 'optional'
                     {
-                    lv_optional_0_0=(Token)match(input,17,FOLLOW_17_in_ruleSimpleAnnotationAttribute661); 
+                    lv_optional_0_0=(Token)match(input,17,FOLLOW_8); 
 
                             newLeafNode(lv_optional_0_0, grammarAccess.getSimpleAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0());
                         
@@ -847,9 +847,9 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:316:7: otherlv_1= 'mandatory'
+                    // InternalBase.g:316:7: otherlv_1= 'mandatory'
                     {
-                    otherlv_1=(Token)match(input,18,FOLLOW_18_in_ruleSimpleAnnotationAttribute692); 
+                    otherlv_1=(Token)match(input,18,FOLLOW_8); 
 
                         	newLeafNode(otherlv_1, grammarAccess.getSimpleAnnotationAttributeAccess().getMandatoryKeyword_0_1());
                         
@@ -859,17 +859,17 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_2=(Token)match(input,19,FOLLOW_19_in_ruleSimpleAnnotationAttribute705); 
+            otherlv_2=(Token)match(input,19,FOLLOW_3); 
 
                 	newLeafNode(otherlv_2, grammarAccess.getSimpleAnnotationAttributeAccess().getAttributeKeyword_1());
                 
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:324:1: ( (lv_name_3_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:325:1: (lv_name_3_0= RULE_ID )
+            // InternalBase.g:324:1: ( (lv_name_3_0= RULE_ID ) )
+            // InternalBase.g:325:1: (lv_name_3_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:325:1: (lv_name_3_0= RULE_ID )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:326:3: lv_name_3_0= RULE_ID
+            // InternalBase.g:325:1: (lv_name_3_0= RULE_ID )
+            // InternalBase.g:326:3: lv_name_3_0= RULE_ID
             {
-            lv_name_3_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleSimpleAnnotationAttribute722); 
+            lv_name_3_0=(Token)match(input,RULE_ID,FOLLOW_9); 
 
             			newLeafNode(lv_name_3_0, grammarAccess.getSimpleAnnotationAttributeAccess().getNameIDTerminalRuleCall_2_0()); 
             		
@@ -881,7 +881,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"name",
                     		lv_name_3_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -889,20 +889,20 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_4=(Token)match(input,20,FOLLOW_20_in_ruleSimpleAnnotationAttribute739); 
+            otherlv_4=(Token)match(input,20,FOLLOW_10); 
 
                 	newLeafNode(otherlv_4, grammarAccess.getSimpleAnnotationAttributeAccess().getColonKeyword_3());
                 
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:346:1: ( (lv_type_5_0= ruleLiteralType ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:347:1: (lv_type_5_0= ruleLiteralType )
+            // InternalBase.g:346:1: ( (lv_type_5_0= ruleLiteralType ) )
+            // InternalBase.g:347:1: (lv_type_5_0= ruleLiteralType )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:347:1: (lv_type_5_0= ruleLiteralType )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:348:3: lv_type_5_0= ruleLiteralType
+            // InternalBase.g:347:1: (lv_type_5_0= ruleLiteralType )
+            // InternalBase.g:348:3: lv_type_5_0= ruleLiteralType
             {
              
             	        newCompositeNode(grammarAccess.getSimpleAnnotationAttributeAccess().getTypeLiteralTypeEnumRuleCall_4_0()); 
             	    
-            pushFollow(FOLLOW_ruleLiteralType_in_ruleSimpleAnnotationAttribute760);
+            pushFollow(FOLLOW_2);
             lv_type_5_0=ruleLiteralType();
 
             state._fsp--;
@@ -915,7 +915,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"type",
                     		lv_type_5_0, 
-                    		"LiteralType");
+                    		"org.eclipse.etrice.core.common.Base.LiteralType");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -945,7 +945,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleEnumAnnotationAttribute"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:372:1: entryRuleEnumAnnotationAttribute returns [EObject current=null] : iv_ruleEnumAnnotationAttribute= ruleEnumAnnotationAttribute EOF ;
+    // InternalBase.g:372:1: entryRuleEnumAnnotationAttribute returns [EObject current=null] : iv_ruleEnumAnnotationAttribute= ruleEnumAnnotationAttribute EOF ;
     public final EObject entryRuleEnumAnnotationAttribute() throws RecognitionException {
         EObject current = null;
 
@@ -953,17 +953,17 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:373:2: (iv_ruleEnumAnnotationAttribute= ruleEnumAnnotationAttribute EOF )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:374:2: iv_ruleEnumAnnotationAttribute= ruleEnumAnnotationAttribute EOF
+            // InternalBase.g:373:2: (iv_ruleEnumAnnotationAttribute= ruleEnumAnnotationAttribute EOF )
+            // InternalBase.g:374:2: iv_ruleEnumAnnotationAttribute= ruleEnumAnnotationAttribute EOF
             {
              newCompositeNode(grammarAccess.getEnumAnnotationAttributeRule()); 
-            pushFollow(FOLLOW_ruleEnumAnnotationAttribute_in_entryRuleEnumAnnotationAttribute796);
+            pushFollow(FOLLOW_1);
             iv_ruleEnumAnnotationAttribute=ruleEnumAnnotationAttribute();
 
             state._fsp--;
 
              current =iv_ruleEnumAnnotationAttribute; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleEnumAnnotationAttribute806); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -981,7 +981,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleEnumAnnotationAttribute"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:381: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= '}' ) ;
+    // InternalBase.g:381: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;
 
@@ -999,13 +999,13 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:384: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.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:385: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= '}' )
+            // InternalBase.g:384: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= '}' ) )
+            // InternalBase.g:385: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.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:385: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.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:385: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= '}'
+            // InternalBase.g:385: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= '}' )
+            // InternalBase.g:385: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.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:385:2: ( ( (lv_optional_0_0= 'optional' ) ) | otherlv_1= 'mandatory' )
+            // InternalBase.g:385:2: ( ( (lv_optional_0_0= 'optional' ) ) | otherlv_1= 'mandatory' )
             int alt5=2;
             int LA5_0 = input.LA(1);
 
@@ -1023,15 +1023,15 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
             }
             switch (alt5) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:385:3: ( (lv_optional_0_0= 'optional' ) )
+                    // InternalBase.g:385:3: ( (lv_optional_0_0= 'optional' ) )
                     {
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:385:3: ( (lv_optional_0_0= 'optional' ) )
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:386:1: (lv_optional_0_0= 'optional' )
+                    // InternalBase.g:385:3: ( (lv_optional_0_0= 'optional' ) )
+                    // InternalBase.g:386:1: (lv_optional_0_0= 'optional' )
                     {
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:386:1: (lv_optional_0_0= 'optional' )
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:387:3: lv_optional_0_0= 'optional'
+                    // InternalBase.g:386:1: (lv_optional_0_0= 'optional' )
+                    // InternalBase.g:387:3: lv_optional_0_0= 'optional'
                     {
-                    lv_optional_0_0=(Token)match(input,17,FOLLOW_17_in_ruleEnumAnnotationAttribute850); 
+                    lv_optional_0_0=(Token)match(input,17,FOLLOW_8); 
 
                             newLeafNode(lv_optional_0_0, grammarAccess.getEnumAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0());
                         
@@ -1051,9 +1051,9 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:401:7: otherlv_1= 'mandatory'
+                    // InternalBase.g:401:7: otherlv_1= 'mandatory'
                     {
-                    otherlv_1=(Token)match(input,18,FOLLOW_18_in_ruleEnumAnnotationAttribute881); 
+                    otherlv_1=(Token)match(input,18,FOLLOW_8); 
 
                         	newLeafNode(otherlv_1, grammarAccess.getEnumAnnotationAttributeAccess().getMandatoryKeyword_0_1());
                         
@@ -1063,17 +1063,17 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_2=(Token)match(input,19,FOLLOW_19_in_ruleEnumAnnotationAttribute894); 
+            otherlv_2=(Token)match(input,19,FOLLOW_3); 
 
                 	newLeafNode(otherlv_2, grammarAccess.getEnumAnnotationAttributeAccess().getAttributeKeyword_1());
                 
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:409:1: ( (lv_name_3_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:410:1: (lv_name_3_0= RULE_ID )
+            // InternalBase.g:409:1: ( (lv_name_3_0= RULE_ID ) )
+            // InternalBase.g:410:1: (lv_name_3_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:410:1: (lv_name_3_0= RULE_ID )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:411:3: lv_name_3_0= RULE_ID
+            // InternalBase.g:410:1: (lv_name_3_0= RULE_ID )
+            // InternalBase.g:411:3: lv_name_3_0= RULE_ID
             {
-            lv_name_3_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEnumAnnotationAttribute911); 
+            lv_name_3_0=(Token)match(input,RULE_ID,FOLLOW_9); 
 
             			newLeafNode(lv_name_3_0, grammarAccess.getEnumAnnotationAttributeAccess().getNameIDTerminalRuleCall_2_0()); 
             		
@@ -1085,7 +1085,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"name",
                     		lv_name_3_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -1093,21 +1093,21 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_4=(Token)match(input,20,FOLLOW_20_in_ruleEnumAnnotationAttribute928); 
+            otherlv_4=(Token)match(input,20,FOLLOW_11); 
 
                 	newLeafNode(otherlv_4, grammarAccess.getEnumAnnotationAttributeAccess().getColonKeyword_3());
                 
-            otherlv_5=(Token)match(input,21,FOLLOW_21_in_ruleEnumAnnotationAttribute940); 
+            otherlv_5=(Token)match(input,21,FOLLOW_12); 
 
                 	newLeafNode(otherlv_5, grammarAccess.getEnumAnnotationAttributeAccess().getLeftCurlyBracketKeyword_4());
                 
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:435:1: ( (lv_values_6_0= RULE_STRING ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:436:1: (lv_values_6_0= RULE_STRING )
+            // InternalBase.g:435:1: ( (lv_values_6_0= RULE_STRING ) )
+            // InternalBase.g:436:1: (lv_values_6_0= RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:436:1: (lv_values_6_0= RULE_STRING )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:437:3: lv_values_6_0= RULE_STRING
+            // InternalBase.g:436:1: (lv_values_6_0= RULE_STRING )
+            // InternalBase.g:437:3: lv_values_6_0= RULE_STRING
             {
-            lv_values_6_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleEnumAnnotationAttribute957); 
+            lv_values_6_0=(Token)match(input,RULE_STRING,FOLLOW_13); 
 
             			newLeafNode(lv_values_6_0, grammarAccess.getEnumAnnotationAttributeAccess().getValuesSTRINGTerminalRuleCall_5_0()); 
             		
@@ -1119,7 +1119,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"values",
                     		lv_values_6_0, 
-                    		"STRING");
+                    		"org.eclipse.xtext.common.Terminals.STRING");
             	    
 
             }
@@ -1127,7 +1127,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:453:2: (otherlv_7= ',' ( (lv_values_8_0= RULE_STRING ) ) )*
+            // InternalBase.g:453:2: (otherlv_7= ',' ( (lv_values_8_0= RULE_STRING ) ) )*
             loop6:
             do {
                 int alt6=2;
@@ -1140,19 +1140,19 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
                 switch (alt6) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:453:4: otherlv_7= ',' ( (lv_values_8_0= RULE_STRING ) )
+            	    // InternalBase.g:453:4: otherlv_7= ',' ( (lv_values_8_0= RULE_STRING ) )
             	    {
-            	    otherlv_7=(Token)match(input,14,FOLLOW_14_in_ruleEnumAnnotationAttribute975); 
+            	    otherlv_7=(Token)match(input,14,FOLLOW_12); 
 
             	        	newLeafNode(otherlv_7, grammarAccess.getEnumAnnotationAttributeAccess().getCommaKeyword_6_0());
             	        
-            	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:457:1: ( (lv_values_8_0= RULE_STRING ) )
-            	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:458:1: (lv_values_8_0= RULE_STRING )
+            	    // InternalBase.g:457:1: ( (lv_values_8_0= RULE_STRING ) )
+            	    // InternalBase.g:458:1: (lv_values_8_0= RULE_STRING )
             	    {
-            	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:458:1: (lv_values_8_0= RULE_STRING )
-            	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:459:3: lv_values_8_0= RULE_STRING
+            	    // InternalBase.g:458:1: (lv_values_8_0= RULE_STRING )
+            	    // InternalBase.g:459:3: lv_values_8_0= RULE_STRING
             	    {
-            	    lv_values_8_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleEnumAnnotationAttribute992); 
+            	    lv_values_8_0=(Token)match(input,RULE_STRING,FOLLOW_13); 
 
             	    			newLeafNode(lv_values_8_0, grammarAccess.getEnumAnnotationAttributeAccess().getValuesSTRINGTerminalRuleCall_6_1_0()); 
             	    		
@@ -1164,7 +1164,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"values",
             	            		lv_values_8_0, 
-            	            		"STRING");
+            	            		"org.eclipse.xtext.common.Terminals.STRING");
             	    	    
 
             	    }
@@ -1181,7 +1181,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
                 }
             } while (true);
 
-            otherlv_9=(Token)match(input,22,FOLLOW_22_in_ruleEnumAnnotationAttribute1011); 
+            otherlv_9=(Token)match(input,22,FOLLOW_2); 
 
                 	newLeafNode(otherlv_9, grammarAccess.getEnumAnnotationAttributeAccess().getRightCurlyBracketKeyword_7());
                 
@@ -1206,7 +1206,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleImportedFQN"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:489:1: entryRuleImportedFQN returns [String current=null] : iv_ruleImportedFQN= ruleImportedFQN EOF ;
+    // InternalBase.g:489:1: entryRuleImportedFQN returns [String current=null] : iv_ruleImportedFQN= ruleImportedFQN EOF ;
     public final String entryRuleImportedFQN() throws RecognitionException {
         String current = null;
 
@@ -1214,17 +1214,17 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:490:2: (iv_ruleImportedFQN= ruleImportedFQN EOF )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:491:2: iv_ruleImportedFQN= ruleImportedFQN EOF
+            // InternalBase.g:490:2: (iv_ruleImportedFQN= ruleImportedFQN EOF )
+            // InternalBase.g:491:2: iv_ruleImportedFQN= ruleImportedFQN EOF
             {
              newCompositeNode(grammarAccess.getImportedFQNRule()); 
-            pushFollow(FOLLOW_ruleImportedFQN_in_entryRuleImportedFQN1050);
+            pushFollow(FOLLOW_1);
             iv_ruleImportedFQN=ruleImportedFQN();
 
             state._fsp--;
 
              current =iv_ruleImportedFQN.getText(); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleImportedFQN1061); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1242,7 +1242,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleImportedFQN"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:498:1: ruleImportedFQN returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_FQN_0= ruleFQN (kw= '.*' )? ) ;
+    // InternalBase.g:498:1: ruleImportedFQN returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_FQN_0= ruleFQN (kw= '.*' )? ) ;
     public final AntlrDatatypeRuleToken ruleImportedFQN() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -1253,16 +1253,16 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:501:28: ( (this_FQN_0= ruleFQN (kw= '.*' )? ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:502:1: (this_FQN_0= ruleFQN (kw= '.*' )? )
+            // InternalBase.g:501:28: ( (this_FQN_0= ruleFQN (kw= '.*' )? ) )
+            // InternalBase.g:502:1: (this_FQN_0= ruleFQN (kw= '.*' )? )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:502:1: (this_FQN_0= ruleFQN (kw= '.*' )? )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:503:5: this_FQN_0= ruleFQN (kw= '.*' )?
+            // InternalBase.g:502:1: (this_FQN_0= ruleFQN (kw= '.*' )? )
+            // InternalBase.g:503:5: this_FQN_0= ruleFQN (kw= '.*' )?
             {
              
                     newCompositeNode(grammarAccess.getImportedFQNAccess().getFQNParserRuleCall_0()); 
                 
-            pushFollow(FOLLOW_ruleFQN_in_ruleImportedFQN1108);
+            pushFollow(FOLLOW_14);
             this_FQN_0=ruleFQN();
 
             state._fsp--;
@@ -1273,7 +1273,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
              
                     afterParserOrEnumRuleCall();
                 
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:513:1: (kw= '.*' )?
+            // InternalBase.g:513:1: (kw= '.*' )?
             int alt7=2;
             int LA7_0 = input.LA(1);
 
@@ -1282,9 +1282,9 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
             }
             switch (alt7) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:514:2: kw= '.*'
+                    // InternalBase.g:514:2: kw= '.*'
                     {
-                    kw=(Token)match(input,23,FOLLOW_23_in_ruleImportedFQN1127); 
+                    kw=(Token)match(input,23,FOLLOW_2); 
 
                             current.merge(kw);
                             newLeafNode(kw, grammarAccess.getImportedFQNAccess().getFullStopAsteriskKeyword_1()); 
@@ -1316,7 +1316,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleDocumentation"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:527:1: entryRuleDocumentation returns [EObject current=null] : iv_ruleDocumentation= ruleDocumentation EOF ;
+    // InternalBase.g:527:1: entryRuleDocumentation returns [EObject current=null] : iv_ruleDocumentation= ruleDocumentation EOF ;
     public final EObject entryRuleDocumentation() throws RecognitionException {
         EObject current = null;
 
@@ -1324,17 +1324,17 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:528:2: (iv_ruleDocumentation= ruleDocumentation EOF )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:529:2: iv_ruleDocumentation= ruleDocumentation EOF
+            // InternalBase.g:528:2: (iv_ruleDocumentation= ruleDocumentation EOF )
+            // InternalBase.g:529:2: iv_ruleDocumentation= ruleDocumentation EOF
             {
              newCompositeNode(grammarAccess.getDocumentationRule()); 
-            pushFollow(FOLLOW_ruleDocumentation_in_entryRuleDocumentation1169);
+            pushFollow(FOLLOW_1);
             iv_ruleDocumentation=ruleDocumentation();
 
             state._fsp--;
 
              current =iv_ruleDocumentation; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDocumentation1179); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1352,7 +1352,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleDocumentation"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:536:1: ruleDocumentation returns [EObject current=null] : ( () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']' ) ;
+    // InternalBase.g:536: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;
 
@@ -1363,14 +1363,14 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:539:28: ( ( () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']' ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:540:1: ( () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']' )
+            // InternalBase.g:539:28: ( ( () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']' ) )
+            // InternalBase.g:540:1: ( () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']' )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:540:1: ( () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:540:2: () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']'
+            // InternalBase.g:540:1: ( () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']' )
+            // InternalBase.g:540:2: () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']'
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:540:2: ()
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:541:5: 
+            // InternalBase.g:540:2: ()
+            // InternalBase.g:541:5: 
             {
 
                     current = forceCreateModelElement(
@@ -1380,11 +1380,11 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,24,FOLLOW_24_in_ruleDocumentation1225); 
+            otherlv_1=(Token)match(input,24,FOLLOW_15); 
 
                 	newLeafNode(otherlv_1, grammarAccess.getDocumentationAccess().getLeftSquareBracketKeyword_1());
                 
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:550:1: ( (lv_lines_2_0= RULE_STRING ) )*
+            // InternalBase.g:550:1: ( (lv_lines_2_0= RULE_STRING ) )*
             loop8:
             do {
                 int alt8=2;
@@ -1397,12 +1397,12 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
                 switch (alt8) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:551:1: (lv_lines_2_0= RULE_STRING )
+            	    // InternalBase.g:551:1: (lv_lines_2_0= RULE_STRING )
             	    {
-            	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:551:1: (lv_lines_2_0= RULE_STRING )
-            	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:552:3: lv_lines_2_0= RULE_STRING
+            	    // InternalBase.g:551:1: (lv_lines_2_0= RULE_STRING )
+            	    // InternalBase.g:552:3: lv_lines_2_0= RULE_STRING
             	    {
-            	    lv_lines_2_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleDocumentation1242); 
+            	    lv_lines_2_0=(Token)match(input,RULE_STRING,FOLLOW_15); 
 
             	    			newLeafNode(lv_lines_2_0, grammarAccess.getDocumentationAccess().getLinesSTRINGTerminalRuleCall_2_0()); 
             	    		
@@ -1414,7 +1414,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"lines",
             	            		lv_lines_2_0, 
-            	            		"STRING");
+            	            		"org.eclipse.xtext.common.Terminals.STRING");
             	    	    
 
             	    }
@@ -1428,7 +1428,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
                 }
             } while (true);
 
-            otherlv_3=(Token)match(input,25,FOLLOW_25_in_ruleDocumentation1260); 
+            otherlv_3=(Token)match(input,25,FOLLOW_2); 
 
                 	newLeafNode(otherlv_3, grammarAccess.getDocumentationAccess().getRightSquareBracketKeyword_3());
                 
@@ -1453,7 +1453,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleLiteral"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:584:1: entryRuleLiteral returns [EObject current=null] : iv_ruleLiteral= ruleLiteral EOF ;
+    // InternalBase.g:584:1: entryRuleLiteral returns [EObject current=null] : iv_ruleLiteral= ruleLiteral EOF ;
     public final EObject entryRuleLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -1461,17 +1461,17 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:585:2: (iv_ruleLiteral= ruleLiteral EOF )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:586:2: iv_ruleLiteral= ruleLiteral EOF
+            // InternalBase.g:585:2: (iv_ruleLiteral= ruleLiteral EOF )
+            // InternalBase.g:586:2: iv_ruleLiteral= ruleLiteral EOF
             {
              newCompositeNode(grammarAccess.getLiteralRule()); 
-            pushFollow(FOLLOW_ruleLiteral_in_entryRuleLiteral1300);
+            pushFollow(FOLLOW_1);
             iv_ruleLiteral=ruleLiteral();
 
             state._fsp--;
 
              current =iv_ruleLiteral; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleLiteral1310); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1489,7 +1489,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleLiteral"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:593:1: ruleLiteral returns [EObject current=null] : (this_BooleanLiteral_0= ruleBooleanLiteral | this_NumberLiteral_1= ruleNumberLiteral | this_StringLiteral_2= ruleStringLiteral ) ;
+    // InternalBase.g:593: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;
 
@@ -1503,10 +1503,10 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:596:28: ( (this_BooleanLiteral_0= ruleBooleanLiteral | this_NumberLiteral_1= ruleNumberLiteral | this_StringLiteral_2= ruleStringLiteral ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:597:1: (this_BooleanLiteral_0= ruleBooleanLiteral | this_NumberLiteral_1= ruleNumberLiteral | this_StringLiteral_2= ruleStringLiteral )
+            // InternalBase.g:596:28: ( (this_BooleanLiteral_0= ruleBooleanLiteral | this_NumberLiteral_1= ruleNumberLiteral | this_StringLiteral_2= ruleStringLiteral ) )
+            // InternalBase.g:597:1: (this_BooleanLiteral_0= ruleBooleanLiteral | this_NumberLiteral_1= ruleNumberLiteral | this_StringLiteral_2= ruleStringLiteral )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:597:1: (this_BooleanLiteral_0= ruleBooleanLiteral | this_NumberLiteral_1= ruleNumberLiteral | this_StringLiteral_2= ruleStringLiteral )
+            // InternalBase.g:597:1: (this_BooleanLiteral_0= ruleBooleanLiteral | this_NumberLiteral_1= ruleNumberLiteral | this_StringLiteral_2= ruleStringLiteral )
             int alt9=3;
             switch ( input.LA(1) ) {
             case 26:
@@ -1537,12 +1537,12 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
             switch (alt9) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:598:5: this_BooleanLiteral_0= ruleBooleanLiteral
+                    // InternalBase.g:598:5: this_BooleanLiteral_0= ruleBooleanLiteral
                     {
                      
                             newCompositeNode(grammarAccess.getLiteralAccess().getBooleanLiteralParserRuleCall_0()); 
                         
-                    pushFollow(FOLLOW_ruleBooleanLiteral_in_ruleLiteral1357);
+                    pushFollow(FOLLOW_2);
                     this_BooleanLiteral_0=ruleBooleanLiteral();
 
                     state._fsp--;
@@ -1555,12 +1555,12 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:608:5: this_NumberLiteral_1= ruleNumberLiteral
+                    // InternalBase.g:608:5: this_NumberLiteral_1= ruleNumberLiteral
                     {
                      
                             newCompositeNode(grammarAccess.getLiteralAccess().getNumberLiteralParserRuleCall_1()); 
                         
-                    pushFollow(FOLLOW_ruleNumberLiteral_in_ruleLiteral1384);
+                    pushFollow(FOLLOW_2);
                     this_NumberLiteral_1=ruleNumberLiteral();
 
                     state._fsp--;
@@ -1573,12 +1573,12 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:618:5: this_StringLiteral_2= ruleStringLiteral
+                    // InternalBase.g:618:5: this_StringLiteral_2= ruleStringLiteral
                     {
                      
                             newCompositeNode(grammarAccess.getLiteralAccess().getStringLiteralParserRuleCall_2()); 
                         
-                    pushFollow(FOLLOW_ruleStringLiteral_in_ruleLiteral1411);
+                    pushFollow(FOLLOW_2);
                     this_StringLiteral_2=ruleStringLiteral();
 
                     state._fsp--;
@@ -1611,7 +1611,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleBooleanLiteral"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:634:1: entryRuleBooleanLiteral returns [EObject current=null] : iv_ruleBooleanLiteral= ruleBooleanLiteral EOF ;
+    // InternalBase.g:634:1: entryRuleBooleanLiteral returns [EObject current=null] : iv_ruleBooleanLiteral= ruleBooleanLiteral EOF ;
     public final EObject entryRuleBooleanLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -1619,17 +1619,17 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:635:2: (iv_ruleBooleanLiteral= ruleBooleanLiteral EOF )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:636:2: iv_ruleBooleanLiteral= ruleBooleanLiteral EOF
+            // InternalBase.g:635:2: (iv_ruleBooleanLiteral= ruleBooleanLiteral EOF )
+            // InternalBase.g:636:2: iv_ruleBooleanLiteral= ruleBooleanLiteral EOF
             {
              newCompositeNode(grammarAccess.getBooleanLiteralRule()); 
-            pushFollow(FOLLOW_ruleBooleanLiteral_in_entryRuleBooleanLiteral1446);
+            pushFollow(FOLLOW_1);
             iv_ruleBooleanLiteral=ruleBooleanLiteral();
 
             state._fsp--;
 
              current =iv_ruleBooleanLiteral; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleBooleanLiteral1456); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1647,7 +1647,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleBooleanLiteral"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:643:1: ruleBooleanLiteral returns [EObject current=null] : ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) ) ;
+    // InternalBase.g:643:1: ruleBooleanLiteral returns [EObject current=null] : ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) ) ;
     public final EObject ruleBooleanLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -1657,14 +1657,14 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:646:28: ( ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:647:1: ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) )
+            // InternalBase.g:646:28: ( ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) ) )
+            // InternalBase.g:647:1: ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:647:1: ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:647:2: () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) )
+            // InternalBase.g:647:1: ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) )
+            // InternalBase.g:647:2: () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:647:2: ()
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:648:5: 
+            // InternalBase.g:647:2: ()
+            // InternalBase.g:648:5: 
             {
 
                     current = forceCreateModelElement(
@@ -1674,7 +1674,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:653:2: (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) )
+            // InternalBase.g:653:2: (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) )
             int alt10=2;
             int LA10_0 = input.LA(1);
 
@@ -1692,9 +1692,9 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
             }
             switch (alt10) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:653:4: otherlv_1= 'false'
+                    // InternalBase.g:653:4: otherlv_1= 'false'
                     {
-                    otherlv_1=(Token)match(input,26,FOLLOW_26_in_ruleBooleanLiteral1503); 
+                    otherlv_1=(Token)match(input,26,FOLLOW_2); 
 
                         	newLeafNode(otherlv_1, grammarAccess.getBooleanLiteralAccess().getFalseKeyword_1_0());
                         
@@ -1702,15 +1702,15 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:658:6: ( (lv_isTrue_2_0= 'true' ) )
+                    // InternalBase.g:658:6: ( (lv_isTrue_2_0= 'true' ) )
                     {
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:658:6: ( (lv_isTrue_2_0= 'true' ) )
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:659:1: (lv_isTrue_2_0= 'true' )
+                    // InternalBase.g:658:6: ( (lv_isTrue_2_0= 'true' ) )
+                    // InternalBase.g:659:1: (lv_isTrue_2_0= 'true' )
                     {
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:659:1: (lv_isTrue_2_0= 'true' )
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:660:3: lv_isTrue_2_0= 'true'
+                    // InternalBase.g:659:1: (lv_isTrue_2_0= 'true' )
+                    // InternalBase.g:660:3: lv_isTrue_2_0= 'true'
                     {
-                    lv_isTrue_2_0=(Token)match(input,27,FOLLOW_27_in_ruleBooleanLiteral1527); 
+                    lv_isTrue_2_0=(Token)match(input,27,FOLLOW_2); 
 
                             newLeafNode(lv_isTrue_2_0, grammarAccess.getBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0());
                         
@@ -1753,7 +1753,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleNumberLiteral"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:681:1: entryRuleNumberLiteral returns [EObject current=null] : iv_ruleNumberLiteral= ruleNumberLiteral EOF ;
+    // InternalBase.g:681:1: entryRuleNumberLiteral returns [EObject current=null] : iv_ruleNumberLiteral= ruleNumberLiteral EOF ;
     public final EObject entryRuleNumberLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -1761,17 +1761,17 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:682:2: (iv_ruleNumberLiteral= ruleNumberLiteral EOF )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:683:2: iv_ruleNumberLiteral= ruleNumberLiteral EOF
+            // InternalBase.g:682:2: (iv_ruleNumberLiteral= ruleNumberLiteral EOF )
+            // InternalBase.g:683:2: iv_ruleNumberLiteral= ruleNumberLiteral EOF
             {
              newCompositeNode(grammarAccess.getNumberLiteralRule()); 
-            pushFollow(FOLLOW_ruleNumberLiteral_in_entryRuleNumberLiteral1577);
+            pushFollow(FOLLOW_1);
             iv_ruleNumberLiteral=ruleNumberLiteral();
 
             state._fsp--;
 
              current =iv_ruleNumberLiteral; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleNumberLiteral1587); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1789,7 +1789,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleNumberLiteral"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:690:1: ruleNumberLiteral returns [EObject current=null] : (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral ) ;
+    // InternalBase.g:690:1: ruleNumberLiteral returns [EObject current=null] : (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral ) ;
     public final EObject ruleNumberLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -1801,10 +1801,10 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:693:28: ( (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:694:1: (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral )
+            // InternalBase.g:693:28: ( (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral ) )
+            // InternalBase.g:694:1: (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:694:1: (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral )
+            // InternalBase.g:694:1: (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral )
             int alt11=2;
             switch ( input.LA(1) ) {
             case 28:
@@ -1895,12 +1895,12 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
             switch (alt11) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:695:5: this_IntLiteral_0= ruleIntLiteral
+                    // InternalBase.g:695:5: this_IntLiteral_0= ruleIntLiteral
                     {
                      
                             newCompositeNode(grammarAccess.getNumberLiteralAccess().getIntLiteralParserRuleCall_0()); 
                         
-                    pushFollow(FOLLOW_ruleIntLiteral_in_ruleNumberLiteral1634);
+                    pushFollow(FOLLOW_2);
                     this_IntLiteral_0=ruleIntLiteral();
 
                     state._fsp--;
@@ -1913,12 +1913,12 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:705:5: this_RealLiteral_1= ruleRealLiteral
+                    // InternalBase.g:705:5: this_RealLiteral_1= ruleRealLiteral
                     {
                      
                             newCompositeNode(grammarAccess.getNumberLiteralAccess().getRealLiteralParserRuleCall_1()); 
                         
-                    pushFollow(FOLLOW_ruleRealLiteral_in_ruleNumberLiteral1661);
+                    pushFollow(FOLLOW_2);
                     this_RealLiteral_1=ruleRealLiteral();
 
                     state._fsp--;
@@ -1951,7 +1951,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleRealLiteral"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:721:1: entryRuleRealLiteral returns [EObject current=null] : iv_ruleRealLiteral= ruleRealLiteral EOF ;
+    // InternalBase.g:721:1: entryRuleRealLiteral returns [EObject current=null] : iv_ruleRealLiteral= ruleRealLiteral EOF ;
     public final EObject entryRuleRealLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -1959,17 +1959,17 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:722:2: (iv_ruleRealLiteral= ruleRealLiteral EOF )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:723:2: iv_ruleRealLiteral= ruleRealLiteral EOF
+            // InternalBase.g:722:2: (iv_ruleRealLiteral= ruleRealLiteral EOF )
+            // InternalBase.g:723:2: iv_ruleRealLiteral= ruleRealLiteral EOF
             {
              newCompositeNode(grammarAccess.getRealLiteralRule()); 
-            pushFollow(FOLLOW_ruleRealLiteral_in_entryRuleRealLiteral1696);
+            pushFollow(FOLLOW_1);
             iv_ruleRealLiteral=ruleRealLiteral();
 
             state._fsp--;
 
              current =iv_ruleRealLiteral; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRealLiteral1706); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1987,7 +1987,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleRealLiteral"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:730:1: ruleRealLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= ruleReal ) ) ) ;
+    // InternalBase.g:730:1: ruleRealLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= ruleReal ) ) ) ;
     public final EObject ruleRealLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -1997,14 +1997,14 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:733:28: ( ( () ( (lv_value_1_0= ruleReal ) ) ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:734:1: ( () ( (lv_value_1_0= ruleReal ) ) )
+            // InternalBase.g:733:28: ( ( () ( (lv_value_1_0= ruleReal ) ) ) )
+            // InternalBase.g:734:1: ( () ( (lv_value_1_0= ruleReal ) ) )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:734:1: ( () ( (lv_value_1_0= ruleReal ) ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:734:2: () ( (lv_value_1_0= ruleReal ) )
+            // InternalBase.g:734:1: ( () ( (lv_value_1_0= ruleReal ) ) )
+            // InternalBase.g:734:2: () ( (lv_value_1_0= ruleReal ) )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:734:2: ()
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:735:5: 
+            // InternalBase.g:734:2: ()
+            // InternalBase.g:735:5: 
             {
 
                     current = forceCreateModelElement(
@@ -2014,16 +2014,16 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:740:2: ( (lv_value_1_0= ruleReal ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:741:1: (lv_value_1_0= ruleReal )
+            // InternalBase.g:740:2: ( (lv_value_1_0= ruleReal ) )
+            // InternalBase.g:741:1: (lv_value_1_0= ruleReal )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:741:1: (lv_value_1_0= ruleReal )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:742:3: lv_value_1_0= ruleReal
+            // InternalBase.g:741:1: (lv_value_1_0= ruleReal )
+            // InternalBase.g:742:3: lv_value_1_0= ruleReal
             {
              
             	        newCompositeNode(grammarAccess.getRealLiteralAccess().getValueRealParserRuleCall_1_0()); 
             	    
-            pushFollow(FOLLOW_ruleReal_in_ruleRealLiteral1761);
+            pushFollow(FOLLOW_2);
             lv_value_1_0=ruleReal();
 
             state._fsp--;
@@ -2036,7 +2036,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"value",
                     		lv_value_1_0, 
-                    		"Real");
+                    		"org.eclipse.etrice.core.common.Base.Real");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -2066,7 +2066,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleIntLiteral"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:766:1: entryRuleIntLiteral returns [EObject current=null] : iv_ruleIntLiteral= ruleIntLiteral EOF ;
+    // InternalBase.g:766:1: entryRuleIntLiteral returns [EObject current=null] : iv_ruleIntLiteral= ruleIntLiteral EOF ;
     public final EObject entryRuleIntLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -2074,17 +2074,17 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:767:2: (iv_ruleIntLiteral= ruleIntLiteral EOF )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:768:2: iv_ruleIntLiteral= ruleIntLiteral EOF
+            // InternalBase.g:767:2: (iv_ruleIntLiteral= ruleIntLiteral EOF )
+            // InternalBase.g:768:2: iv_ruleIntLiteral= ruleIntLiteral EOF
             {
              newCompositeNode(grammarAccess.getIntLiteralRule()); 
-            pushFollow(FOLLOW_ruleIntLiteral_in_entryRuleIntLiteral1797);
+            pushFollow(FOLLOW_1);
             iv_ruleIntLiteral=ruleIntLiteral();
 
             state._fsp--;
 
              current =iv_ruleIntLiteral; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIntLiteral1807); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2102,7 +2102,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleIntLiteral"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:775:1: ruleIntLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= ruleInteger ) ) ) ;
+    // InternalBase.g:775:1: ruleIntLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= ruleInteger ) ) ) ;
     public final EObject ruleIntLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -2112,14 +2112,14 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:778:28: ( ( () ( (lv_value_1_0= ruleInteger ) ) ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:779:1: ( () ( (lv_value_1_0= ruleInteger ) ) )
+            // InternalBase.g:778:28: ( ( () ( (lv_value_1_0= ruleInteger ) ) ) )
+            // InternalBase.g:779:1: ( () ( (lv_value_1_0= ruleInteger ) ) )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:779:1: ( () ( (lv_value_1_0= ruleInteger ) ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:779:2: () ( (lv_value_1_0= ruleInteger ) )
+            // InternalBase.g:779:1: ( () ( (lv_value_1_0= ruleInteger ) ) )
+            // InternalBase.g:779:2: () ( (lv_value_1_0= ruleInteger ) )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:779:2: ()
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:780:5: 
+            // InternalBase.g:779:2: ()
+            // InternalBase.g:780:5: 
             {
 
                     current = forceCreateModelElement(
@@ -2129,16 +2129,16 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:785:2: ( (lv_value_1_0= ruleInteger ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:786:1: (lv_value_1_0= ruleInteger )
+            // InternalBase.g:785:2: ( (lv_value_1_0= ruleInteger ) )
+            // InternalBase.g:786:1: (lv_value_1_0= ruleInteger )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:786:1: (lv_value_1_0= ruleInteger )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:787:3: lv_value_1_0= ruleInteger
+            // InternalBase.g:786:1: (lv_value_1_0= ruleInteger )
+            // InternalBase.g:787:3: lv_value_1_0= ruleInteger
             {
              
             	        newCompositeNode(grammarAccess.getIntLiteralAccess().getValueIntegerParserRuleCall_1_0()); 
             	    
-            pushFollow(FOLLOW_ruleInteger_in_ruleIntLiteral1862);
+            pushFollow(FOLLOW_2);
             lv_value_1_0=ruleInteger();
 
             state._fsp--;
@@ -2151,7 +2151,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"value",
                     		lv_value_1_0, 
-                    		"Integer");
+                    		"org.eclipse.etrice.core.common.Base.Integer");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -2181,7 +2181,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleStringLiteral"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:811:1: entryRuleStringLiteral returns [EObject current=null] : iv_ruleStringLiteral= ruleStringLiteral EOF ;
+    // InternalBase.g:811:1: entryRuleStringLiteral returns [EObject current=null] : iv_ruleStringLiteral= ruleStringLiteral EOF ;
     public final EObject entryRuleStringLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -2189,17 +2189,17 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:812:2: (iv_ruleStringLiteral= ruleStringLiteral EOF )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:813:2: iv_ruleStringLiteral= ruleStringLiteral EOF
+            // InternalBase.g:812:2: (iv_ruleStringLiteral= ruleStringLiteral EOF )
+            // InternalBase.g:813:2: iv_ruleStringLiteral= ruleStringLiteral EOF
             {
              newCompositeNode(grammarAccess.getStringLiteralRule()); 
-            pushFollow(FOLLOW_ruleStringLiteral_in_entryRuleStringLiteral1898);
+            pushFollow(FOLLOW_1);
             iv_ruleStringLiteral=ruleStringLiteral();
 
             state._fsp--;
 
              current =iv_ruleStringLiteral; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleStringLiteral1908); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2217,7 +2217,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleStringLiteral"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:820:1: ruleStringLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= RULE_STRING ) ) ) ;
+    // InternalBase.g:820:1: ruleStringLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= RULE_STRING ) ) ) ;
     public final EObject ruleStringLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -2226,14 +2226,14 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:823:28: ( ( () ( (lv_value_1_0= RULE_STRING ) ) ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:824:1: ( () ( (lv_value_1_0= RULE_STRING ) ) )
+            // InternalBase.g:823:28: ( ( () ( (lv_value_1_0= RULE_STRING ) ) ) )
+            // InternalBase.g:824:1: ( () ( (lv_value_1_0= RULE_STRING ) ) )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:824:1: ( () ( (lv_value_1_0= RULE_STRING ) ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:824:2: () ( (lv_value_1_0= RULE_STRING ) )
+            // InternalBase.g:824:1: ( () ( (lv_value_1_0= RULE_STRING ) ) )
+            // InternalBase.g:824:2: () ( (lv_value_1_0= RULE_STRING ) )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:824:2: ()
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:825:5: 
+            // InternalBase.g:824:2: ()
+            // InternalBase.g:825:5: 
             {
 
                     current = forceCreateModelElement(
@@ -2243,13 +2243,13 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:830:2: ( (lv_value_1_0= RULE_STRING ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:831:1: (lv_value_1_0= RULE_STRING )
+            // InternalBase.g:830:2: ( (lv_value_1_0= RULE_STRING ) )
+            // InternalBase.g:831:1: (lv_value_1_0= RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:831:1: (lv_value_1_0= RULE_STRING )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:832:3: lv_value_1_0= RULE_STRING
+            // InternalBase.g:831:1: (lv_value_1_0= RULE_STRING )
+            // InternalBase.g:832:3: lv_value_1_0= RULE_STRING
             {
-            lv_value_1_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleStringLiteral1959); 
+            lv_value_1_0=(Token)match(input,RULE_STRING,FOLLOW_2); 
 
             			newLeafNode(lv_value_1_0, grammarAccess.getStringLiteralAccess().getValueSTRINGTerminalRuleCall_1_0()); 
             		
@@ -2261,7 +2261,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"value",
                     		lv_value_1_0, 
-                    		"STRING");
+                    		"org.eclipse.xtext.common.Terminals.STRING");
             	    
 
             }
@@ -2290,7 +2290,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleInteger"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:856:1: entryRuleInteger returns [String current=null] : iv_ruleInteger= ruleInteger EOF ;
+    // InternalBase.g:856:1: entryRuleInteger returns [String current=null] : iv_ruleInteger= ruleInteger EOF ;
     public final String entryRuleInteger() throws RecognitionException {
         String current = null;
 
@@ -2298,17 +2298,17 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:857:2: (iv_ruleInteger= ruleInteger EOF )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:858:2: iv_ruleInteger= ruleInteger EOF
+            // InternalBase.g:857:2: (iv_ruleInteger= ruleInteger EOF )
+            // InternalBase.g:858:2: iv_ruleInteger= ruleInteger EOF
             {
              newCompositeNode(grammarAccess.getIntegerRule()); 
-            pushFollow(FOLLOW_ruleInteger_in_entryRuleInteger2001);
+            pushFollow(FOLLOW_1);
             iv_ruleInteger=ruleInteger();
 
             state._fsp--;
 
              current =iv_ruleInteger.getText(); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleInteger2012); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2326,7 +2326,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleInteger"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:865:1: ruleInteger returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT ) | this_HEX_3= RULE_HEX ) ;
+    // InternalBase.g:865: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();
 
@@ -2337,10 +2337,10 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:868:28: ( ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT ) | this_HEX_3= RULE_HEX ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:869:1: ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT ) | this_HEX_3= RULE_HEX )
+            // InternalBase.g:868:28: ( ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT ) | this_HEX_3= RULE_HEX ) )
+            // InternalBase.g:869:1: ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT ) | this_HEX_3= RULE_HEX )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:869:1: ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT ) | this_HEX_3= RULE_HEX )
+            // InternalBase.g:869:1: ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT ) | this_HEX_3= RULE_HEX )
             int alt13=2;
             int LA13_0 = input.LA(1);
 
@@ -2358,12 +2358,12 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
             }
             switch (alt13) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:869:2: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT )
+                    // InternalBase.g:869:2: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT )
                     {
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:869:2: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT )
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:869:3: (kw= '+' | kw= '-' )? this_INT_2= RULE_INT
+                    // InternalBase.g:869:2: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT )
+                    // InternalBase.g:869:3: (kw= '+' | kw= '-' )? this_INT_2= RULE_INT
                     {
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:869:3: (kw= '+' | kw= '-' )?
+                    // InternalBase.g:869:3: (kw= '+' | kw= '-' )?
                     int alt12=3;
                     int LA12_0 = input.LA(1);
 
@@ -2375,9 +2375,9 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
                     }
                     switch (alt12) {
                         case 1 :
-                            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:870:2: kw= '+'
+                            // InternalBase.g:870:2: kw= '+'
                             {
-                            kw=(Token)match(input,28,FOLLOW_28_in_ruleInteger2052); 
+                            kw=(Token)match(input,28,FOLLOW_16); 
 
                                     current.merge(kw);
                                     newLeafNode(kw, grammarAccess.getIntegerAccess().getPlusSignKeyword_0_0_0()); 
@@ -2386,9 +2386,9 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
                             }
                             break;
                         case 2 :
-                            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:877:2: kw= '-'
+                            // InternalBase.g:877:2: kw= '-'
                             {
-                            kw=(Token)match(input,29,FOLLOW_29_in_ruleInteger2071); 
+                            kw=(Token)match(input,29,FOLLOW_16); 
 
                                     current.merge(kw);
                                     newLeafNode(kw, grammarAccess.getIntegerAccess().getHyphenMinusKeyword_0_0_1()); 
@@ -2399,7 +2399,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    this_INT_2=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleInteger2088); 
+                    this_INT_2=(Token)match(input,RULE_INT,FOLLOW_2); 
 
                     		current.merge(this_INT_2);
                         
@@ -2413,9 +2413,9 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:890:10: this_HEX_3= RULE_HEX
+                    // InternalBase.g:890:10: this_HEX_3= RULE_HEX
                     {
-                    this_HEX_3=(Token)match(input,RULE_HEX,FOLLOW_RULE_HEX_in_ruleInteger2115); 
+                    this_HEX_3=(Token)match(input,RULE_HEX,FOLLOW_2); 
 
                     		current.merge(this_HEX_3);
                         
@@ -2446,7 +2446,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleReal"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:905:1: entryRuleReal returns [String current=null] : iv_ruleReal= ruleReal EOF ;
+    // InternalBase.g:905:1: entryRuleReal returns [String current=null] : iv_ruleReal= ruleReal EOF ;
     public final String entryRuleReal() throws RecognitionException {
         String current = null;
 
@@ -2454,17 +2454,17 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:906:2: (iv_ruleReal= ruleReal EOF )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:907:2: iv_ruleReal= ruleReal EOF
+            // InternalBase.g:906:2: (iv_ruleReal= ruleReal EOF )
+            // InternalBase.g:907:2: iv_ruleReal= ruleReal EOF
             {
              newCompositeNode(grammarAccess.getRealRule()); 
-            pushFollow(FOLLOW_ruleReal_in_entryRuleReal2161);
+            pushFollow(FOLLOW_1);
             iv_ruleReal=ruleReal();
 
             state._fsp--;
 
              current =iv_ruleReal.getText(); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleReal2172); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2482,7 +2482,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleReal"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:914:1: ruleReal returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_Decimal_0= ruleDecimal | this_DecimalExp_1= ruleDecimalExp ) ;
+    // InternalBase.g:914: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();
 
@@ -2494,10 +2494,10 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:917:28: ( (this_Decimal_0= ruleDecimal | this_DecimalExp_1= ruleDecimalExp ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:918:1: (this_Decimal_0= ruleDecimal | this_DecimalExp_1= ruleDecimalExp )
+            // InternalBase.g:917:28: ( (this_Decimal_0= ruleDecimal | this_DecimalExp_1= ruleDecimalExp ) )
+            // InternalBase.g:918:1: (this_Decimal_0= ruleDecimal | this_DecimalExp_1= ruleDecimalExp )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:918:1: (this_Decimal_0= ruleDecimal | this_DecimalExp_1= ruleDecimalExp )
+            // InternalBase.g:918:1: (this_Decimal_0= ruleDecimal | this_DecimalExp_1= ruleDecimalExp )
             int alt14=2;
             switch ( input.LA(1) ) {
             case 28:
@@ -2643,12 +2643,12 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
             switch (alt14) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:919:5: this_Decimal_0= ruleDecimal
+                    // InternalBase.g:919:5: this_Decimal_0= ruleDecimal
                     {
                      
                             newCompositeNode(grammarAccess.getRealAccess().getDecimalParserRuleCall_0()); 
                         
-                    pushFollow(FOLLOW_ruleDecimal_in_ruleReal2219);
+                    pushFollow(FOLLOW_2);
                     this_Decimal_0=ruleDecimal();
 
                     state._fsp--;
@@ -2663,12 +2663,12 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:931:5: this_DecimalExp_1= ruleDecimalExp
+                    // InternalBase.g:931:5: this_DecimalExp_1= ruleDecimalExp
                     {
                      
                             newCompositeNode(grammarAccess.getRealAccess().getDecimalExpParserRuleCall_1()); 
                         
-                    pushFollow(FOLLOW_ruleDecimalExp_in_ruleReal2252);
+                    pushFollow(FOLLOW_2);
                     this_DecimalExp_1=ruleDecimalExp();
 
                     state._fsp--;
@@ -2703,7 +2703,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleDecimal"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:949:1: entryRuleDecimal returns [String current=null] : iv_ruleDecimal= ruleDecimal EOF ;
+    // InternalBase.g:949:1: entryRuleDecimal returns [String current=null] : iv_ruleDecimal= ruleDecimal EOF ;
     public final String entryRuleDecimal() throws RecognitionException {
         String current = null;
 
@@ -2714,17 +2714,17 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
         	
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:953:2: (iv_ruleDecimal= ruleDecimal EOF )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:954:2: iv_ruleDecimal= ruleDecimal EOF
+            // InternalBase.g:953:2: (iv_ruleDecimal= ruleDecimal EOF )
+            // InternalBase.g:954:2: iv_ruleDecimal= ruleDecimal EOF
             {
              newCompositeNode(grammarAccess.getDecimalRule()); 
-            pushFollow(FOLLOW_ruleDecimal_in_entryRuleDecimal2304);
+            pushFollow(FOLLOW_1);
             iv_ruleDecimal=ruleDecimal();
 
             state._fsp--;
 
              current =iv_ruleDecimal.getText(); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDecimal2315); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2745,7 +2745,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleDecimal"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:964:1: ruleDecimal returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT ) ;
+    // InternalBase.g:964: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();
 
@@ -2757,13 +2757,13 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
             
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:968:28: ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:969:1: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT )
+            // InternalBase.g:968:28: ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT ) )
+            // InternalBase.g:969:1: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:969:1: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:969:2: (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT
+            // InternalBase.g:969:1: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT )
+            // InternalBase.g:969:2: (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:969:2: (kw= '+' | kw= '-' )?
+            // InternalBase.g:969:2: (kw= '+' | kw= '-' )?
             int alt15=3;
             int LA15_0 = input.LA(1);
 
@@ -2775,9 +2775,9 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
             }
             switch (alt15) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:970:2: kw= '+'
+                    // InternalBase.g:970:2: kw= '+'
                     {
-                    kw=(Token)match(input,28,FOLLOW_28_in_ruleDecimal2358); 
+                    kw=(Token)match(input,28,FOLLOW_16); 
 
                             current.merge(kw);
                             newLeafNode(kw, grammarAccess.getDecimalAccess().getPlusSignKeyword_0_0()); 
@@ -2786,9 +2786,9 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:977:2: kw= '-'
+                    // InternalBase.g:977:2: kw= '-'
                     {
-                    kw=(Token)match(input,29,FOLLOW_29_in_ruleDecimal2377); 
+                    kw=(Token)match(input,29,FOLLOW_16); 
 
                             current.merge(kw);
                             newLeafNode(kw, grammarAccess.getDecimalAccess().getHyphenMinusKeyword_0_1()); 
@@ -2799,19 +2799,19 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
             }
 
-            this_INT_2=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleDecimal2394); 
+            this_INT_2=(Token)match(input,RULE_INT,FOLLOW_17); 
 
             		current.merge(this_INT_2);
                 
              
                 newLeafNode(this_INT_2, grammarAccess.getDecimalAccess().getINTTerminalRuleCall_1()); 
                 
-            kw=(Token)match(input,30,FOLLOW_30_in_ruleDecimal2412); 
+            kw=(Token)match(input,30,FOLLOW_16); 
 
                     current.merge(kw);
                     newLeafNode(kw, grammarAccess.getDecimalAccess().getFullStopKeyword_2()); 
                 
-            this_INT_4=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleDecimal2427); 
+            this_INT_4=(Token)match(input,RULE_INT,FOLLOW_2); 
 
             		current.merge(this_INT_4);
                 
@@ -2842,7 +2842,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleDecimalExp"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1013:1: entryRuleDecimalExp returns [String current=null] : iv_ruleDecimalExp= ruleDecimalExp EOF ;
+    // InternalBase.g:1013:1: entryRuleDecimalExp returns [String current=null] : iv_ruleDecimalExp= ruleDecimalExp EOF ;
     public final String entryRuleDecimalExp() throws RecognitionException {
         String current = null;
 
@@ -2853,17 +2853,17 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
         	
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1017:2: (iv_ruleDecimalExp= ruleDecimalExp EOF )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1018:2: iv_ruleDecimalExp= ruleDecimalExp EOF
+            // InternalBase.g:1017:2: (iv_ruleDecimalExp= ruleDecimalExp EOF )
+            // InternalBase.g:1018:2: iv_ruleDecimalExp= ruleDecimalExp EOF
             {
              newCompositeNode(grammarAccess.getDecimalExpRule()); 
-            pushFollow(FOLLOW_ruleDecimalExp_in_entryRuleDecimalExp2483);
+            pushFollow(FOLLOW_1);
             iv_ruleDecimalExp=ruleDecimalExp();
 
             state._fsp--;
 
              current =iv_ruleDecimalExp.getText(); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDecimalExp2494); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2884,7 +2884,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleDecimalExp"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1028: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 ) ;
+    // InternalBase.g:1028: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();
 
@@ -2897,13 +2897,13 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
             
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1032: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.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1033: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 )
+            // InternalBase.g:1032: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 ) )
+            // InternalBase.g:1033: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.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1033: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.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1033: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
+            // InternalBase.g:1033: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 )
+            // InternalBase.g:1033: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.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1033:2: (kw= '+' | kw= '-' )?
+            // InternalBase.g:1033:2: (kw= '+' | kw= '-' )?
             int alt16=3;
             int LA16_0 = input.LA(1);
 
@@ -2915,9 +2915,9 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
             }
             switch (alt16) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1034:2: kw= '+'
+                    // InternalBase.g:1034:2: kw= '+'
                     {
-                    kw=(Token)match(input,28,FOLLOW_28_in_ruleDecimalExp2537); 
+                    kw=(Token)match(input,28,FOLLOW_16); 
 
                             current.merge(kw);
                             newLeafNode(kw, grammarAccess.getDecimalExpAccess().getPlusSignKeyword_0_0()); 
@@ -2926,9 +2926,9 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1041:2: kw= '-'
+                    // InternalBase.g:1041:2: kw= '-'
                     {
-                    kw=(Token)match(input,29,FOLLOW_29_in_ruleDecimalExp2556); 
+                    kw=(Token)match(input,29,FOLLOW_16); 
 
                             current.merge(kw);
                             newLeafNode(kw, grammarAccess.getDecimalExpAccess().getHyphenMinusKeyword_0_1()); 
@@ -2939,26 +2939,26 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
             }
 
-            this_INT_2=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleDecimalExp2573); 
+            this_INT_2=(Token)match(input,RULE_INT,FOLLOW_17); 
 
             		current.merge(this_INT_2);
                 
              
                 newLeafNode(this_INT_2, grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_1()); 
                 
-            kw=(Token)match(input,30,FOLLOW_30_in_ruleDecimalExp2591); 
+            kw=(Token)match(input,30,FOLLOW_16); 
 
                     current.merge(kw);
                     newLeafNode(kw, grammarAccess.getDecimalExpAccess().getFullStopKeyword_2()); 
                 
-            this_INT_4=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleDecimalExp2606); 
+            this_INT_4=(Token)match(input,RULE_INT,FOLLOW_18); 
 
             		current.merge(this_INT_4);
                 
              
                 newLeafNode(this_INT_4, grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_3()); 
                 
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1066:1: (kw= 'e' | kw= 'E' )
+            // InternalBase.g:1066:1: (kw= 'e' | kw= 'E' )
             int alt17=2;
             int LA17_0 = input.LA(1);
 
@@ -2976,9 +2976,9 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
             }
             switch (alt17) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1067:2: kw= 'e'
+                    // InternalBase.g:1067:2: kw= 'e'
                     {
-                    kw=(Token)match(input,31,FOLLOW_31_in_ruleDecimalExp2625); 
+                    kw=(Token)match(input,31,FOLLOW_19); 
 
                             current.merge(kw);
                             newLeafNode(kw, grammarAccess.getDecimalExpAccess().getEKeyword_4_0()); 
@@ -2987,9 +2987,9 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1074:2: kw= 'E'
+                    // InternalBase.g:1074:2: kw= 'E'
                     {
-                    kw=(Token)match(input,32,FOLLOW_32_in_ruleDecimalExp2644); 
+                    kw=(Token)match(input,32,FOLLOW_19); 
 
                             current.merge(kw);
                             newLeafNode(kw, grammarAccess.getDecimalExpAccess().getEKeyword_4_1()); 
@@ -3000,7 +3000,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1079:2: (kw= '+' | kw= '-' )?
+            // InternalBase.g:1079:2: (kw= '+' | kw= '-' )?
             int alt18=3;
             int LA18_0 = input.LA(1);
 
@@ -3012,9 +3012,9 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
             }
             switch (alt18) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1080:2: kw= '+'
+                    // InternalBase.g:1080:2: kw= '+'
                     {
-                    kw=(Token)match(input,28,FOLLOW_28_in_ruleDecimalExp2659); 
+                    kw=(Token)match(input,28,FOLLOW_16); 
 
                             current.merge(kw);
                             newLeafNode(kw, grammarAccess.getDecimalExpAccess().getPlusSignKeyword_5_0()); 
@@ -3023,9 +3023,9 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1087:2: kw= '-'
+                    // InternalBase.g:1087:2: kw= '-'
                     {
-                    kw=(Token)match(input,29,FOLLOW_29_in_ruleDecimalExp2678); 
+                    kw=(Token)match(input,29,FOLLOW_16); 
 
                             current.merge(kw);
                             newLeafNode(kw, grammarAccess.getDecimalExpAccess().getHyphenMinusKeyword_5_1()); 
@@ -3036,7 +3036,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
             }
 
-            this_INT_9=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleDecimalExp2695); 
+            this_INT_9=(Token)match(input,RULE_INT,FOLLOW_2); 
 
             		current.merge(this_INT_9);
                 
@@ -3067,7 +3067,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleFQN"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1110:1: entryRuleFQN returns [String current=null] : iv_ruleFQN= ruleFQN EOF ;
+    // InternalBase.g:1110:1: entryRuleFQN returns [String current=null] : iv_ruleFQN= ruleFQN EOF ;
     public final String entryRuleFQN() throws RecognitionException {
         String current = null;
 
@@ -3075,17 +3075,17 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1111:2: (iv_ruleFQN= ruleFQN EOF )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1112:2: iv_ruleFQN= ruleFQN EOF
+            // InternalBase.g:1111:2: (iv_ruleFQN= ruleFQN EOF )
+            // InternalBase.g:1112:2: iv_ruleFQN= ruleFQN EOF
             {
              newCompositeNode(grammarAccess.getFQNRule()); 
-            pushFollow(FOLLOW_ruleFQN_in_entryRuleFQN2745);
+            pushFollow(FOLLOW_1);
             iv_ruleFQN=ruleFQN();
 
             state._fsp--;
 
              current =iv_ruleFQN.getText(); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleFQN2756); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3103,7 +3103,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleFQN"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1119:1: ruleFQN returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* ) ;
+    // InternalBase.g:1119: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();
 
@@ -3114,20 +3114,20 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1122:28: ( (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1123:1: (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* )
+            // InternalBase.g:1122:28: ( (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* ) )
+            // InternalBase.g:1123:1: (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1123:1: (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1123:6: this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )*
+            // InternalBase.g:1123:1: (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* )
+            // InternalBase.g:1123:6: this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )*
             {
-            this_ID_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFQN2796); 
+            this_ID_0=(Token)match(input,RULE_ID,FOLLOW_20); 
 
             		current.merge(this_ID_0);
                 
              
                 newLeafNode(this_ID_0, grammarAccess.getFQNAccess().getIDTerminalRuleCall_0()); 
                 
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1130:1: (kw= '.' this_ID_2= RULE_ID )*
+            // InternalBase.g:1130:1: (kw= '.' this_ID_2= RULE_ID )*
             loop19:
             do {
                 int alt19=2;
@@ -3140,14 +3140,14 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
                 switch (alt19) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1131:2: kw= '.' this_ID_2= RULE_ID
+            	    // InternalBase.g:1131:2: kw= '.' this_ID_2= RULE_ID
             	    {
-            	    kw=(Token)match(input,30,FOLLOW_30_in_ruleFQN2815); 
+            	    kw=(Token)match(input,30,FOLLOW_3); 
 
             	            current.merge(kw);
             	            newLeafNode(kw, grammarAccess.getFQNAccess().getFullStopKeyword_1_0()); 
             	        
-            	    this_ID_2=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFQN2830); 
+            	    this_ID_2=(Token)match(input,RULE_ID,FOLLOW_20); 
 
             	    		current.merge(this_ID_2);
             	        
@@ -3184,7 +3184,7 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleLiteralType"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1151:1: ruleLiteralType returns [Enumerator current=null] : ( (enumLiteral_0= 'ptBoolean' ) | (enumLiteral_1= 'ptInteger' ) | (enumLiteral_2= 'ptReal' ) | (enumLiteral_3= 'ptCharacter' ) ) ;
+    // InternalBase.g:1151: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;
 
@@ -3195,10 +3195,10 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
          enterRule(); 
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1153:28: ( ( (enumLiteral_0= 'ptBoolean' ) | (enumLiteral_1= 'ptInteger' ) | (enumLiteral_2= 'ptReal' ) | (enumLiteral_3= 'ptCharacter' ) ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1154:1: ( (enumLiteral_0= 'ptBoolean' ) | (enumLiteral_1= 'ptInteger' ) | (enumLiteral_2= 'ptReal' ) | (enumLiteral_3= 'ptCharacter' ) )
+            // InternalBase.g:1153:28: ( ( (enumLiteral_0= 'ptBoolean' ) | (enumLiteral_1= 'ptInteger' ) | (enumLiteral_2= 'ptReal' ) | (enumLiteral_3= 'ptCharacter' ) ) )
+            // InternalBase.g:1154:1: ( (enumLiteral_0= 'ptBoolean' ) | (enumLiteral_1= 'ptInteger' ) | (enumLiteral_2= 'ptReal' ) | (enumLiteral_3= 'ptCharacter' ) )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1154:1: ( (enumLiteral_0= 'ptBoolean' ) | (enumLiteral_1= 'ptInteger' ) | (enumLiteral_2= 'ptReal' ) | (enumLiteral_3= 'ptCharacter' ) )
+            // InternalBase.g:1154:1: ( (enumLiteral_0= 'ptBoolean' ) | (enumLiteral_1= 'ptInteger' ) | (enumLiteral_2= 'ptReal' ) | (enumLiteral_3= 'ptCharacter' ) )
             int alt20=4;
             switch ( input.LA(1) ) {
             case 33:
@@ -3230,12 +3230,12 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
             switch (alt20) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1154:2: (enumLiteral_0= 'ptBoolean' )
+                    // InternalBase.g:1154:2: (enumLiteral_0= 'ptBoolean' )
                     {
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1154:2: (enumLiteral_0= 'ptBoolean' )
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1154:4: enumLiteral_0= 'ptBoolean'
+                    // InternalBase.g:1154:2: (enumLiteral_0= 'ptBoolean' )
+                    // InternalBase.g:1154:4: enumLiteral_0= 'ptBoolean'
                     {
-                    enumLiteral_0=(Token)match(input,33,FOLLOW_33_in_ruleLiteralType2891); 
+                    enumLiteral_0=(Token)match(input,33,FOLLOW_2); 
 
                             current = grammarAccess.getLiteralTypeAccess().getBOOLEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
                             newLeafNode(enumLiteral_0, grammarAccess.getLiteralTypeAccess().getBOOLEnumLiteralDeclaration_0()); 
@@ -3247,12 +3247,12 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1160:6: (enumLiteral_1= 'ptInteger' )
+                    // InternalBase.g:1160:6: (enumLiteral_1= 'ptInteger' )
                     {
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1160:6: (enumLiteral_1= 'ptInteger' )
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1160:8: enumLiteral_1= 'ptInteger'
+                    // InternalBase.g:1160:6: (enumLiteral_1= 'ptInteger' )
+                    // InternalBase.g:1160:8: enumLiteral_1= 'ptInteger'
                     {
-                    enumLiteral_1=(Token)match(input,34,FOLLOW_34_in_ruleLiteralType2908); 
+                    enumLiteral_1=(Token)match(input,34,FOLLOW_2); 
 
                             current = grammarAccess.getLiteralTypeAccess().getINTEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
                             newLeafNode(enumLiteral_1, grammarAccess.getLiteralTypeAccess().getINTEnumLiteralDeclaration_1()); 
@@ -3264,12 +3264,12 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1166:6: (enumLiteral_2= 'ptReal' )
+                    // InternalBase.g:1166:6: (enumLiteral_2= 'ptReal' )
                     {
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1166:6: (enumLiteral_2= 'ptReal' )
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1166:8: enumLiteral_2= 'ptReal'
+                    // InternalBase.g:1166:6: (enumLiteral_2= 'ptReal' )
+                    // InternalBase.g:1166:8: enumLiteral_2= 'ptReal'
                     {
-                    enumLiteral_2=(Token)match(input,35,FOLLOW_35_in_ruleLiteralType2925); 
+                    enumLiteral_2=(Token)match(input,35,FOLLOW_2); 
 
                             current = grammarAccess.getLiteralTypeAccess().getREALEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
                             newLeafNode(enumLiteral_2, grammarAccess.getLiteralTypeAccess().getREALEnumLiteralDeclaration_2()); 
@@ -3281,12 +3281,12 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 4 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1172:6: (enumLiteral_3= 'ptCharacter' )
+                    // InternalBase.g:1172:6: (enumLiteral_3= 'ptCharacter' )
                     {
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1172:6: (enumLiteral_3= 'ptCharacter' )
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBase.g:1172:8: enumLiteral_3= 'ptCharacter'
+                    // InternalBase.g:1172:6: (enumLiteral_3= 'ptCharacter' )
+                    // InternalBase.g:1172:8: enumLiteral_3= 'ptCharacter'
                     {
-                    enumLiteral_3=(Token)match(input,36,FOLLOW_36_in_ruleLiteralType2942); 
+                    enumLiteral_3=(Token)match(input,36,FOLLOW_2); 
 
                             current = grammarAccess.getLiteralTypeAccess().getCHAREnumLiteralDeclaration_3().getEnumLiteral().getInstance();
                             newLeafNode(enumLiteral_3, grammarAccess.getLiteralTypeAccess().getCHAREnumLiteralDeclaration_3()); 
@@ -3321,115 +3321,25 @@ public class InternalBaseParser extends AbstractInternalAntlrParser {
 
  
 
-    public static final BitSet FOLLOW_ruleAnnotation_in_entryRuleAnnotation75 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAnnotation85 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_12_in_ruleAnnotation122 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleFQN_in_ruleAnnotation145 = new BitSet(new long[]{0x0000000000002002L});
-    public static final BitSet FOLLOW_13_in_ruleAnnotation158 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleKeyValue_in_ruleAnnotation179 = new BitSet(new long[]{0x000000000000C000L});
-    public static final BitSet FOLLOW_14_in_ruleAnnotation192 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleKeyValue_in_ruleAnnotation213 = new BitSet(new long[]{0x000000000000C000L});
-    public static final BitSet FOLLOW_15_in_ruleAnnotation227 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleKeyValue_in_entryRuleKeyValue265 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleKeyValue275 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleKeyValue317 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_16_in_ruleKeyValue334 = new BitSet(new long[]{0x000000003C0000E0L});
-    public static final BitSet FOLLOW_ruleLiteral_in_ruleKeyValue355 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAnnotationTargetType_in_entryRuleAnnotationTargetType394 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAnnotationTargetType405 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleAnnotationTargetType444 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAnnotationAttribute_in_entryRuleAnnotationAttribute488 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAnnotationAttribute498 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleAnnotationAttribute_in_ruleAnnotationAttribute545 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleEnumAnnotationAttribute_in_ruleAnnotationAttribute572 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleAnnotationAttribute_in_entryRuleSimpleAnnotationAttribute607 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSimpleAnnotationAttribute617 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_17_in_ruleSimpleAnnotationAttribute661 = new BitSet(new long[]{0x0000000000080000L});
-    public static final BitSet FOLLOW_18_in_ruleSimpleAnnotationAttribute692 = new BitSet(new long[]{0x0000000000080000L});
-    public static final BitSet FOLLOW_19_in_ruleSimpleAnnotationAttribute705 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleSimpleAnnotationAttribute722 = new BitSet(new long[]{0x0000000000100000L});
-    public static final BitSet FOLLOW_20_in_ruleSimpleAnnotationAttribute739 = new BitSet(new long[]{0x0000001E00000000L});
-    public static final BitSet FOLLOW_ruleLiteralType_in_ruleSimpleAnnotationAttribute760 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleEnumAnnotationAttribute_in_entryRuleEnumAnnotationAttribute796 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleEnumAnnotationAttribute806 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_17_in_ruleEnumAnnotationAttribute850 = new BitSet(new long[]{0x0000000000080000L});
-    public static final BitSet FOLLOW_18_in_ruleEnumAnnotationAttribute881 = new BitSet(new long[]{0x0000000000080000L});
-    public static final BitSet FOLLOW_19_in_ruleEnumAnnotationAttribute894 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleEnumAnnotationAttribute911 = new BitSet(new long[]{0x0000000000100000L});
-    public static final BitSet FOLLOW_20_in_ruleEnumAnnotationAttribute928 = new BitSet(new long[]{0x0000000000200000L});
-    public static final BitSet FOLLOW_21_in_ruleEnumAnnotationAttribute940 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleEnumAnnotationAttribute957 = new BitSet(new long[]{0x0000000000404000L});
-    public static final BitSet FOLLOW_14_in_ruleEnumAnnotationAttribute975 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleEnumAnnotationAttribute992 = new BitSet(new long[]{0x0000000000404000L});
-    public static final BitSet FOLLOW_22_in_ruleEnumAnnotationAttribute1011 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleImportedFQN_in_entryRuleImportedFQN1050 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleImportedFQN1061 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_ruleImportedFQN1108 = new BitSet(new long[]{0x0000000000800002L});
-    public static final BitSet FOLLOW_23_in_ruleImportedFQN1127 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_entryRuleDocumentation1169 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDocumentation1179 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_24_in_ruleDocumentation1225 = new BitSet(new long[]{0x0000000002000020L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleDocumentation1242 = new BitSet(new long[]{0x0000000002000020L});
-    public static final BitSet FOLLOW_25_in_ruleDocumentation1260 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLiteral_in_entryRuleLiteral1300 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleLiteral1310 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleBooleanLiteral_in_ruleLiteral1357 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNumberLiteral_in_ruleLiteral1384 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStringLiteral_in_ruleLiteral1411 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleBooleanLiteral_in_entryRuleBooleanLiteral1446 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleBooleanLiteral1456 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_26_in_ruleBooleanLiteral1503 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_ruleBooleanLiteral1527 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNumberLiteral_in_entryRuleNumberLiteral1577 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleNumberLiteral1587 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntLiteral_in_ruleNumberLiteral1634 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRealLiteral_in_ruleNumberLiteral1661 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRealLiteral_in_entryRuleRealLiteral1696 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRealLiteral1706 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleReal_in_ruleRealLiteral1761 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntLiteral_in_entryRuleIntLiteral1797 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIntLiteral1807 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInteger_in_ruleIntLiteral1862 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStringLiteral_in_entryRuleStringLiteral1898 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleStringLiteral1908 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleStringLiteral1959 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInteger_in_entryRuleInteger2001 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleInteger2012 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_ruleInteger2052 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_29_in_ruleInteger2071 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleInteger2088 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_HEX_in_ruleInteger2115 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleReal_in_entryRuleReal2161 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleReal2172 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDecimal_in_ruleReal2219 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDecimalExp_in_ruleReal2252 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDecimal_in_entryRuleDecimal2304 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDecimal2315 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_ruleDecimal2358 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_29_in_ruleDecimal2377 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleDecimal2394 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_30_in_ruleDecimal2412 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleDecimal2427 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDecimalExp_in_entryRuleDecimalExp2483 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDecimalExp2494 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_ruleDecimalExp2537 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_29_in_ruleDecimalExp2556 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleDecimalExp2573 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_30_in_ruleDecimalExp2591 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleDecimalExp2606 = new BitSet(new long[]{0x0000000180000000L});
-    public static final BitSet FOLLOW_31_in_ruleDecimalExp2625 = new BitSet(new long[]{0x0000000030000040L});
-    public static final BitSet FOLLOW_32_in_ruleDecimalExp2644 = new BitSet(new long[]{0x0000000030000040L});
-    public static final BitSet FOLLOW_28_in_ruleDecimalExp2659 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_29_in_ruleDecimalExp2678 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleDecimalExp2695 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_entryRuleFQN2745 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleFQN2756 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleFQN2796 = new BitSet(new long[]{0x0000000040000002L});
-    public static final BitSet FOLLOW_30_in_ruleFQN2815 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleFQN2830 = new BitSet(new long[]{0x0000000040000002L});
-    public static final BitSet FOLLOW_33_in_ruleLiteralType2891 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_34_in_ruleLiteralType2908 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_35_in_ruleLiteralType2925 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_36_in_ruleLiteralType2942 = 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[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x0000000000002002L});
+    public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x000000000000C000L});
+    public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x0000000000010000L});
+    public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x000000003C0000E0L});
+    public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x0000000000080000L});
+    public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x0000000000100000L});
+    public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0000001E00000000L});
+    public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0000000000200000L});
+    public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000000000404000L});
+    public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x0000000000800002L});
+    public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0000000002000020L});
+    public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x0000000000000040L});
+    public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0000000040000000L});
+    public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0000000180000000L});
+    public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0000000030000040L});
+    public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x0000000040000002L});
 
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g
index 09ac81dec..44608cbbd 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 grammar InternalBaseTest;
 
 options {
@@ -92,7 +92,7 @@ ruleBaseModel returns [EObject current=null]
        			$current, 
        			"elements",
         		lv_elements_0_1, 
-        		"Annotation");
+        		"org.eclipse.etrice.core.common.Base.Annotation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -107,7 +107,7 @@ ruleBaseModel returns [EObject current=null]
        			$current, 
        			"elements",
         		lv_elements_0_2, 
-        		"AnnotationType");
+        		"org.eclipse.etrice.core.common.Base.AnnotationType");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -171,7 +171,7 @@ ruleAnnotation returns [EObject current=null]
        			$current, 
        			"attributes",
         		lv_attributes_3_0, 
-        		"KeyValue");
+        		"org.eclipse.etrice.core.common.Base.KeyValue");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -193,7 +193,7 @@ ruleAnnotation returns [EObject current=null]
        			$current, 
        			"attributes",
         		lv_attributes_5_0, 
-        		"KeyValue");
+        		"org.eclipse.etrice.core.common.Base.KeyValue");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -237,7 +237,7 @@ ruleKeyValue returns [EObject current=null]
        			$current, 
        			"key",
         		lv_key_0_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -258,7 +258,7 @@ ruleKeyValue returns [EObject current=null]
        			$current, 
        			"value",
         		lv_value_2_0, 
-        		"Literal");
+        		"org.eclipse.etrice.core.common.Base.Literal");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -302,7 +302,7 @@ ruleAnnotationType returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -319,7 +319,7 @@ ruleAnnotationType returns [EObject current=null]
        			$current, 
        			"docu",
         		lv_docu_2_0, 
-        		"Documentation");
+        		"org.eclipse.etrice.core.common.Base.Documentation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -349,7 +349,7 @@ ruleAnnotationType returns [EObject current=null]
        			$current, 
        			"targets",
         		lv_targets_6_0, 
-        		"AnnotationTargetType");
+        		"org.eclipse.etrice.core.common.Base.AnnotationTargetType");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -372,7 +372,7 @@ ruleAnnotationType returns [EObject current=null]
        			$current, 
        			"targets",
         		lv_targets_8_0, 
-        		"AnnotationTargetType");
+        		"org.eclipse.etrice.core.common.Base.AnnotationTargetType");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -394,7 +394,7 @@ ruleAnnotationType returns [EObject current=null]
        			$current, 
        			"targets",
         		lv_targets_10_0, 
-        		"AnnotationTargetType");
+        		"org.eclipse.etrice.core.common.Base.AnnotationTargetType");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -416,7 +416,7 @@ ruleAnnotationType returns [EObject current=null]
        			$current, 
        			"attributes",
         		lv_attributes_12_0, 
-        		"AnnotationAttribute");
+        		"org.eclipse.etrice.core.common.Base.AnnotationAttribute");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -552,7 +552,7 @@ ruleSimpleAnnotationAttribute returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_3_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -573,7 +573,7 @@ ruleSimpleAnnotationAttribute returns [EObject current=null]
        			$current, 
        			"type",
         		lv_type_5_0, 
-        		"LiteralType");
+        		"org.eclipse.etrice.core.common.Base.LiteralType");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -637,7 +637,7 @@ ruleEnumAnnotationAttribute returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_3_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -663,7 +663,7 @@ ruleEnumAnnotationAttribute returns [EObject current=null]
        			$current, 
        			"values",
         		lv_values_6_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -685,7 +685,7 @@ ruleEnumAnnotationAttribute returns [EObject current=null]
        			$current, 
        			"values",
         		lv_values_8_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -778,7 +778,7 @@ ruleDocumentation returns [EObject current=null]
        			$current, 
        			"lines",
         		lv_lines_2_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -967,7 +967,7 @@ ruleRealLiteral returns [EObject current=null]
        			$current, 
        			"value",
         		lv_value_1_0, 
-        		"Real");
+        		"org.eclipse.etrice.core.common.Base.Real");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1012,7 +1012,7 @@ ruleIntLiteral returns [EObject current=null]
        			$current, 
        			"value",
         		lv_value_1_0, 
-        		"Integer");
+        		"org.eclipse.etrice.core.common.Base.Integer");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1058,7 +1058,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.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTestLexer.java b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTestLexer.java
index 99a1defcc..200708ccd 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTestLexer.java
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTestLexer.java
@@ -60,15 +60,15 @@ public class InternalBaseTestLexer extends Lexer {
         super(input,state);
 
     }
-    public String getGrammarFileName() { return "../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g"; }
+    public String getGrammarFileName() { return "InternalBaseTest.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.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:11:7: ( '@' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:11:9: '@'
+            // InternalBaseTest.g:11:7: ( '@' )
+            // InternalBaseTest.g:11:9: '@'
             {
             match('@'); 
 
@@ -87,8 +87,8 @@ public class InternalBaseTestLexer extends Lexer {
         try {
             int _type = T__13;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:12:7: ( '(' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:12:9: '('
+            // InternalBaseTest.g:12:7: ( '(' )
+            // InternalBaseTest.g:12:9: '('
             {
             match('('); 
 
@@ -107,8 +107,8 @@ public class InternalBaseTestLexer extends Lexer {
         try {
             int _type = T__14;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:13:7: ( ',' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:13:9: ','
+            // InternalBaseTest.g:13:7: ( ',' )
+            // InternalBaseTest.g:13:9: ','
             {
             match(','); 
 
@@ -127,8 +127,8 @@ public class InternalBaseTestLexer extends Lexer {
         try {
             int _type = T__15;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:14:7: ( ')' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:14:9: ')'
+            // InternalBaseTest.g:14:7: ( ')' )
+            // InternalBaseTest.g:14:9: ')'
             {
             match(')'); 
 
@@ -147,8 +147,8 @@ public class InternalBaseTestLexer extends Lexer {
         try {
             int _type = T__16;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:15:7: ( '=' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:15:9: '='
+            // InternalBaseTest.g:15:7: ( '=' )
+            // InternalBaseTest.g:15:9: '='
             {
             match('='); 
 
@@ -167,8 +167,8 @@ public class InternalBaseTestLexer extends Lexer {
         try {
             int _type = T__17;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:16:7: ( 'AnnotationType' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:16:9: 'AnnotationType'
+            // InternalBaseTest.g:16:7: ( 'AnnotationType' )
+            // InternalBaseTest.g:16:9: 'AnnotationType'
             {
             match("AnnotationType"); 
 
@@ -188,8 +188,8 @@ public class InternalBaseTestLexer extends Lexer {
         try {
             int _type = T__18;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:17:7: ( '{' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:17:9: '{'
+            // InternalBaseTest.g:17:7: ( '{' )
+            // InternalBaseTest.g:17:9: '{'
             {
             match('{'); 
 
@@ -208,8 +208,8 @@ public class InternalBaseTestLexer extends Lexer {
         try {
             int _type = T__19;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:18:7: ( 'target' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:18:9: 'target'
+            // InternalBaseTest.g:18:7: ( 'target' )
+            // InternalBaseTest.g:18:9: 'target'
             {
             match("target"); 
 
@@ -229,8 +229,8 @@ public class InternalBaseTestLexer extends Lexer {
         try {
             int _type = T__20;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:19:7: ( '}' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:19:9: '}'
+            // InternalBaseTest.g:19:7: ( '}' )
+            // InternalBaseTest.g:19:9: '}'
             {
             match('}'); 
 
@@ -249,8 +249,8 @@ public class InternalBaseTestLexer extends Lexer {
         try {
             int _type = T__21;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:20:7: ( 'optional' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:20:9: 'optional'
+            // InternalBaseTest.g:20:7: ( 'optional' )
+            // InternalBaseTest.g:20:9: 'optional'
             {
             match("optional"); 
 
@@ -270,8 +270,8 @@ public class InternalBaseTestLexer extends Lexer {
         try {
             int _type = T__22;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:21:7: ( 'mandatory' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:21:9: 'mandatory'
+            // InternalBaseTest.g:21:7: ( 'mandatory' )
+            // InternalBaseTest.g:21:9: 'mandatory'
             {
             match("mandatory"); 
 
@@ -291,8 +291,8 @@ public class InternalBaseTestLexer extends Lexer {
         try {
             int _type = T__23;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:22:7: ( 'attribute' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:22:9: 'attribute'
+            // InternalBaseTest.g:22:7: ( 'attribute' )
+            // InternalBaseTest.g:22:9: 'attribute'
             {
             match("attribute"); 
 
@@ -312,8 +312,8 @@ public class InternalBaseTestLexer extends Lexer {
         try {
             int _type = T__24;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:23:7: ( ':' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:23:9: ':'
+            // InternalBaseTest.g:23:7: ( ':' )
+            // InternalBaseTest.g:23:9: ':'
             {
             match(':'); 
 
@@ -332,8 +332,8 @@ public class InternalBaseTestLexer extends Lexer {
         try {
             int _type = T__25;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:24:7: ( '.*' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:24:9: '.*'
+            // InternalBaseTest.g:24:7: ( '.*' )
+            // InternalBaseTest.g:24:9: '.*'
             {
             match(".*"); 
 
@@ -353,8 +353,8 @@ public class InternalBaseTestLexer extends Lexer {
         try {
             int _type = T__26;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:25:7: ( '[' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:25:9: '['
+            // InternalBaseTest.g:25:7: ( '[' )
+            // InternalBaseTest.g:25:9: '['
             {
             match('['); 
 
@@ -373,8 +373,8 @@ public class InternalBaseTestLexer extends Lexer {
         try {
             int _type = T__27;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:26:7: ( ']' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:26:9: ']'
+            // InternalBaseTest.g:26:7: ( ']' )
+            // InternalBaseTest.g:26:9: ']'
             {
             match(']'); 
 
@@ -393,8 +393,8 @@ public class InternalBaseTestLexer extends Lexer {
         try {
             int _type = T__28;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:27:7: ( 'false' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:27:9: 'false'
+            // InternalBaseTest.g:27:7: ( 'false' )
+            // InternalBaseTest.g:27:9: 'false'
             {
             match("false"); 
 
@@ -414,8 +414,8 @@ public class InternalBaseTestLexer extends Lexer {
         try {
             int _type = T__29;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:28:7: ( 'true' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:28:9: 'true'
+            // InternalBaseTest.g:28:7: ( 'true' )
+            // InternalBaseTest.g:28:9: 'true'
             {
             match("true"); 
 
@@ -435,8 +435,8 @@ public class InternalBaseTestLexer extends Lexer {
         try {
             int _type = T__30;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:29:7: ( '+' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:29:9: '+'
+            // InternalBaseTest.g:29:7: ( '+' )
+            // InternalBaseTest.g:29:9: '+'
             {
             match('+'); 
 
@@ -455,8 +455,8 @@ public class InternalBaseTestLexer extends Lexer {
         try {
             int _type = T__31;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:30:7: ( '-' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:30:9: '-'
+            // InternalBaseTest.g:30:7: ( '-' )
+            // InternalBaseTest.g:30:9: '-'
             {
             match('-'); 
 
@@ -475,8 +475,8 @@ public class InternalBaseTestLexer extends Lexer {
         try {
             int _type = T__32;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:31:7: ( '.' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:31:9: '.'
+            // InternalBaseTest.g:31:7: ( '.' )
+            // InternalBaseTest.g:31:9: '.'
             {
             match('.'); 
 
@@ -495,8 +495,8 @@ public class InternalBaseTestLexer extends Lexer {
         try {
             int _type = T__33;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:32:7: ( 'e' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:32:9: 'e'
+            // InternalBaseTest.g:32:7: ( 'e' )
+            // InternalBaseTest.g:32:9: 'e'
             {
             match('e'); 
 
@@ -515,8 +515,8 @@ public class InternalBaseTestLexer extends Lexer {
         try {
             int _type = T__34;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:33:7: ( 'E' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:33:9: 'E'
+            // InternalBaseTest.g:33:7: ( 'E' )
+            // InternalBaseTest.g:33:9: 'E'
             {
             match('E'); 
 
@@ -535,8 +535,8 @@ public class InternalBaseTestLexer extends Lexer {
         try {
             int _type = T__35;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:34:7: ( 'ptBoolean' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:34:9: 'ptBoolean'
+            // InternalBaseTest.g:34:7: ( 'ptBoolean' )
+            // InternalBaseTest.g:34:9: 'ptBoolean'
             {
             match("ptBoolean"); 
 
@@ -556,8 +556,8 @@ public class InternalBaseTestLexer extends Lexer {
         try {
             int _type = T__36;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:35:7: ( 'ptInteger' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:35:9: 'ptInteger'
+            // InternalBaseTest.g:35:7: ( 'ptInteger' )
+            // InternalBaseTest.g:35:9: 'ptInteger'
             {
             match("ptInteger"); 
 
@@ -577,8 +577,8 @@ public class InternalBaseTestLexer extends Lexer {
         try {
             int _type = T__37;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:36:7: ( 'ptReal' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:36:9: 'ptReal'
+            // InternalBaseTest.g:36:7: ( 'ptReal' )
+            // InternalBaseTest.g:36:9: 'ptReal'
             {
             match("ptReal"); 
 
@@ -598,8 +598,8 @@ public class InternalBaseTestLexer extends Lexer {
         try {
             int _type = T__38;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:37:7: ( 'ptCharacter' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:37:9: 'ptCharacter'
+            // InternalBaseTest.g:37:7: ( 'ptCharacter' )
+            // InternalBaseTest.g:37:9: 'ptCharacter'
             {
             match("ptCharacter"); 
 
@@ -619,10 +619,10 @@ public class InternalBaseTestLexer extends Lexer {
         try {
             int _type = RULE_HEX;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1398:10: ( ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+ )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1398:12: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+
+            // InternalBaseTest.g:1398:10: ( ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+ )
+            // InternalBaseTest.g:1398:12: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1398:12: ( '0x' | '0X' )
+            // InternalBaseTest.g:1398:12: ( '0x' | '0X' )
             int alt1=2;
             int LA1_0 = input.LA(1);
 
@@ -650,7 +650,7 @@ public class InternalBaseTestLexer extends Lexer {
             }
             switch (alt1) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1398:13: '0x'
+                    // InternalBaseTest.g:1398:13: '0x'
                     {
                     match("0x"); 
 
@@ -658,7 +658,7 @@ public class InternalBaseTestLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1398:18: '0X'
+                    // InternalBaseTest.g:1398:18: '0X'
                     {
                     match("0X"); 
 
@@ -668,7 +668,7 @@ public class InternalBaseTestLexer extends Lexer {
 
             }
 
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1398:24: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+
+            // InternalBaseTest.g:1398:24: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+
             int cnt2=0;
             loop2:
             do {
@@ -682,7 +682,7 @@ public class InternalBaseTestLexer extends Lexer {
 
                 switch (alt2) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:
+            	    // InternalBaseTest.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();
@@ -722,10 +722,10 @@ public class InternalBaseTestLexer extends Lexer {
         try {
             int _type = RULE_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1400:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1400:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalBaseTest.g:1400:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+            // InternalBaseTest.g:1400:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1400:11: ( '^' )?
+            // InternalBaseTest.g:1400:11: ( '^' )?
             int alt3=2;
             int LA3_0 = input.LA(1);
 
@@ -734,7 +734,7 @@ public class InternalBaseTestLexer extends Lexer {
             }
             switch (alt3) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1400:11: '^'
+                    // InternalBaseTest.g:1400:11: '^'
                     {
                     match('^'); 
 
@@ -752,7 +752,7 @@ public class InternalBaseTestLexer extends Lexer {
                 recover(mse);
                 throw mse;}
 
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1400:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalBaseTest.g:1400:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             loop4:
             do {
                 int alt4=2;
@@ -765,7 +765,7 @@ public class InternalBaseTestLexer extends Lexer {
 
                 switch (alt4) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:
+            	    // InternalBaseTest.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();
@@ -801,10 +801,10 @@ public class InternalBaseTestLexer extends Lexer {
         try {
             int _type = RULE_INT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1402:10: ( ( '0' .. '9' )+ )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1402:12: ( '0' .. '9' )+
+            // InternalBaseTest.g:1402:10: ( ( '0' .. '9' )+ )
+            // InternalBaseTest.g:1402:12: ( '0' .. '9' )+
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1402:12: ( '0' .. '9' )+
+            // InternalBaseTest.g:1402:12: ( '0' .. '9' )+
             int cnt5=0;
             loop5:
             do {
@@ -818,7 +818,7 @@ public class InternalBaseTestLexer extends Lexer {
 
                 switch (alt5) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1402:13: '0' .. '9'
+            	    // InternalBaseTest.g:1402:13: '0' .. '9'
             	    {
             	    matchRange('0','9'); 
 
@@ -850,10 +850,10 @@ public class InternalBaseTestLexer extends Lexer {
         try {
             int _type = RULE_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1404:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1404:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalBaseTest.g:1404:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+            // InternalBaseTest.g:1404:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1404:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalBaseTest.g:1404:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             int alt8=2;
             int LA8_0 = input.LA(1);
 
@@ -871,10 +871,10 @@ public class InternalBaseTestLexer extends Lexer {
             }
             switch (alt8) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1404:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+                    // InternalBaseTest.g:1404:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
                     {
                     match('\"'); 
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1404:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+                    // InternalBaseTest.g:1404:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
                     loop6:
                     do {
                         int alt6=3;
@@ -890,7 +890,7 @@ public class InternalBaseTestLexer extends Lexer {
 
                         switch (alt6) {
                     	case 1 :
-                    	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1404:21: '\\\\' .
+                    	    // InternalBaseTest.g:1404:21: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -898,7 +898,7 @@ public class InternalBaseTestLexer extends Lexer {
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1404:28: ~ ( ( '\\\\' | '\"' ) )
+                    	    // InternalBaseTest.g:1404:28: ~ ( ( '\\\\' | '\"' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -923,10 +923,10 @@ public class InternalBaseTestLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1404:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+                    // InternalBaseTest.g:1404:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
                     {
                     match('\''); 
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1404:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+                    // InternalBaseTest.g:1404:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
                     loop7:
                     do {
                         int alt7=3;
@@ -942,7 +942,7 @@ public class InternalBaseTestLexer extends Lexer {
 
                         switch (alt7) {
                     	case 1 :
-                    	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1404:54: '\\\\' .
+                    	    // InternalBaseTest.g:1404:54: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -950,7 +950,7 @@ public class InternalBaseTestLexer extends Lexer {
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1404:61: ~ ( ( '\\\\' | '\\'' ) )
+                    	    // InternalBaseTest.g:1404:61: ~ ( ( '\\\\' | '\\'' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -993,12 +993,12 @@ public class InternalBaseTestLexer extends Lexer {
         try {
             int _type = RULE_ML_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1406:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1406:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // InternalBaseTest.g:1406:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // InternalBaseTest.g:1406:19: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); 
 
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1406:24: ( options {greedy=false; } : . )*
+            // InternalBaseTest.g:1406:24: ( options {greedy=false; } : . )*
             loop9:
             do {
                 int alt9=2;
@@ -1023,7 +1023,7 @@ public class InternalBaseTestLexer extends Lexer {
 
                 switch (alt9) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1406:52: .
+            	    // InternalBaseTest.g:1406:52: .
             	    {
             	    matchAny(); 
 
@@ -1053,12 +1053,12 @@ public class InternalBaseTestLexer extends Lexer {
         try {
             int _type = RULE_SL_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1408:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1408:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // InternalBaseTest.g:1408:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // InternalBaseTest.g:1408:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
             {
             match("//"); 
 
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1408:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            // InternalBaseTest.g:1408:24: (~ ( ( '\\n' | '\\r' ) ) )*
             loop10:
             do {
                 int alt10=2;
@@ -1071,7 +1071,7 @@ public class InternalBaseTestLexer extends Lexer {
 
                 switch (alt10) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1408:24: ~ ( ( '\\n' | '\\r' ) )
+            	    // InternalBaseTest.g:1408: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();
@@ -1091,7 +1091,7 @@ public class InternalBaseTestLexer extends Lexer {
                 }
             } while (true);
 
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1408:40: ( ( '\\r' )? '\\n' )?
+            // InternalBaseTest.g:1408:40: ( ( '\\r' )? '\\n' )?
             int alt12=2;
             int LA12_0 = input.LA(1);
 
@@ -1100,9 +1100,9 @@ public class InternalBaseTestLexer extends Lexer {
             }
             switch (alt12) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1408:41: ( '\\r' )? '\\n'
+                    // InternalBaseTest.g:1408:41: ( '\\r' )? '\\n'
                     {
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1408:41: ( '\\r' )?
+                    // InternalBaseTest.g:1408:41: ( '\\r' )?
                     int alt11=2;
                     int LA11_0 = input.LA(1);
 
@@ -1111,7 +1111,7 @@ public class InternalBaseTestLexer extends Lexer {
                     }
                     switch (alt11) {
                         case 1 :
-                            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1408:41: '\\r'
+                            // InternalBaseTest.g:1408:41: '\\r'
                             {
                             match('\r'); 
 
@@ -1143,10 +1143,10 @@ public class InternalBaseTestLexer extends Lexer {
         try {
             int _type = RULE_WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1410:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1410:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalBaseTest.g:1410:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // InternalBaseTest.g:1410:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1410:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalBaseTest.g:1410:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             int cnt13=0;
             loop13:
             do {
@@ -1160,7 +1160,7 @@ public class InternalBaseTestLexer extends Lexer {
 
                 switch (alt13) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:
+            	    // InternalBaseTest.g:
             	    {
             	    if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) {
             	        input.consume();
@@ -1200,8 +1200,8 @@ public class InternalBaseTestLexer extends Lexer {
         try {
             int _type = RULE_ANY_OTHER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1412:16: ( . )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1412:18: .
+            // InternalBaseTest.g:1412:16: ( . )
+            // InternalBaseTest.g:1412:18: .
             {
             matchAny(); 
 
@@ -1216,250 +1216,250 @@ public class InternalBaseTestLexer extends Lexer {
     // $ANTLR end "RULE_ANY_OTHER"
 
     public void mTokens() throws RecognitionException {
-        // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.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 | RULE_HEX | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+        // InternalBaseTest.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 | RULE_HEX | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
         int alt14=35;
         alt14 = dfa14.predict(input);
         switch (alt14) {
             case 1 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1:10: T__12
+                // InternalBaseTest.g:1:10: T__12
                 {
                 mT__12(); 
 
                 }
                 break;
             case 2 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1:16: T__13
+                // InternalBaseTest.g:1:16: T__13
                 {
                 mT__13(); 
 
                 }
                 break;
             case 3 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1:22: T__14
+                // InternalBaseTest.g:1:22: T__14
                 {
                 mT__14(); 
 
                 }
                 break;
             case 4 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1:28: T__15
+                // InternalBaseTest.g:1:28: T__15
                 {
                 mT__15(); 
 
                 }
                 break;
             case 5 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1:34: T__16
+                // InternalBaseTest.g:1:34: T__16
                 {
                 mT__16(); 
 
                 }
                 break;
             case 6 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1:40: T__17
+                // InternalBaseTest.g:1:40: T__17
                 {
                 mT__17(); 
 
                 }
                 break;
             case 7 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1:46: T__18
+                // InternalBaseTest.g:1:46: T__18
                 {
                 mT__18(); 
 
                 }
                 break;
             case 8 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1:52: T__19
+                // InternalBaseTest.g:1:52: T__19
                 {
                 mT__19(); 
 
                 }
                 break;
             case 9 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1:58: T__20
+                // InternalBaseTest.g:1:58: T__20
                 {
                 mT__20(); 
 
                 }
                 break;
             case 10 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1:64: T__21
+                // InternalBaseTest.g:1:64: T__21
                 {
                 mT__21(); 
 
                 }
                 break;
             case 11 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1:70: T__22
+                // InternalBaseTest.g:1:70: T__22
                 {
                 mT__22(); 
 
                 }
                 break;
             case 12 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1:76: T__23
+                // InternalBaseTest.g:1:76: T__23
                 {
                 mT__23(); 
 
                 }
                 break;
             case 13 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1:82: T__24
+                // InternalBaseTest.g:1:82: T__24
                 {
                 mT__24(); 
 
                 }
                 break;
             case 14 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1:88: T__25
+                // InternalBaseTest.g:1:88: T__25
                 {
                 mT__25(); 
 
                 }
                 break;
             case 15 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1:94: T__26
+                // InternalBaseTest.g:1:94: T__26
                 {
                 mT__26(); 
 
                 }
                 break;
             case 16 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1:100: T__27
+                // InternalBaseTest.g:1:100: T__27
                 {
                 mT__27(); 
 
                 }
                 break;
             case 17 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1:106: T__28
+                // InternalBaseTest.g:1:106: T__28
                 {
                 mT__28(); 
 
                 }
                 break;
             case 18 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1:112: T__29
+                // InternalBaseTest.g:1:112: T__29
                 {
                 mT__29(); 
 
                 }
                 break;
             case 19 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1:118: T__30
+                // InternalBaseTest.g:1:118: T__30
                 {
                 mT__30(); 
 
                 }
                 break;
             case 20 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1:124: T__31
+                // InternalBaseTest.g:1:124: T__31
                 {
                 mT__31(); 
 
                 }
                 break;
             case 21 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1:130: T__32
+                // InternalBaseTest.g:1:130: T__32
                 {
                 mT__32(); 
 
                 }
                 break;
             case 22 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1:136: T__33
+                // InternalBaseTest.g:1:136: T__33
                 {
                 mT__33(); 
 
                 }
                 break;
             case 23 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1:142: T__34
+                // InternalBaseTest.g:1:142: T__34
                 {
                 mT__34(); 
 
                 }
                 break;
             case 24 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1:148: T__35
+                // InternalBaseTest.g:1:148: T__35
                 {
                 mT__35(); 
 
                 }
                 break;
             case 25 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1:154: T__36
+                // InternalBaseTest.g:1:154: T__36
                 {
                 mT__36(); 
 
                 }
                 break;
             case 26 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1:160: T__37
+                // InternalBaseTest.g:1:160: T__37
                 {
                 mT__37(); 
 
                 }
                 break;
             case 27 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1:166: T__38
+                // InternalBaseTest.g:1:166: T__38
                 {
                 mT__38(); 
 
                 }
                 break;
             case 28 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1:172: RULE_HEX
+                // InternalBaseTest.g:1:172: RULE_HEX
                 {
                 mRULE_HEX(); 
 
                 }
                 break;
             case 29 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1:181: RULE_ID
+                // InternalBaseTest.g:1:181: RULE_ID
                 {
                 mRULE_ID(); 
 
                 }
                 break;
             case 30 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1:189: RULE_INT
+                // InternalBaseTest.g:1:189: RULE_INT
                 {
                 mRULE_INT(); 
 
                 }
                 break;
             case 31 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1:198: RULE_STRING
+                // InternalBaseTest.g:1:198: RULE_STRING
                 {
                 mRULE_STRING(); 
 
                 }
                 break;
             case 32 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1:210: RULE_ML_COMMENT
+                // InternalBaseTest.g:1:210: RULE_ML_COMMENT
                 {
                 mRULE_ML_COMMENT(); 
 
                 }
                 break;
             case 33 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1:226: RULE_SL_COMMENT
+                // InternalBaseTest.g:1:226: RULE_SL_COMMENT
                 {
                 mRULE_SL_COMMENT(); 
 
                 }
                 break;
             case 34 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1:242: RULE_WS
+                // InternalBaseTest.g:1:242: RULE_WS
                 {
                 mRULE_WS(); 
 
                 }
                 break;
             case 35 :
-                // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1:250: RULE_ANY_OTHER
+                // InternalBaseTest.g:1:250: RULE_ANY_OTHER
                 {
                 mRULE_ANY_OTHER(); 
 
@@ -1473,55 +1473,19 @@ public class InternalBaseTestLexer extends Lexer {
 
     protected DFA14 dfa14 = new DFA14(this);
     static final String DFA14_eotS =
-        "\6\uffff\1\46\1\uffff\1\46\1\uffff\3\46\1\uffff\1\60\2\uffff\1"+
-        "\46\2\uffff\1\66\1\67\1\46\1\72\1\37\2\uffff\3\37\7\uffff\1\46\2"+
-        "\uffff\2\46\1\uffff\3\46\5\uffff\1\46\4\uffff\1\46\6\uffff\15\46"+
-        "\1\127\12\46\1\uffff\3\46\1\145\5\46\1\153\3\46\1\uffff\2\46\1\161"+
-        "\2\46\1\uffff\5\46\1\uffff\2\46\1\173\6\46\1\uffff\1\u0082\1\u0083"+
-        "\1\u0084\1\u0085\2\46\4\uffff\2\46\1\u008a\1\46\1\uffff\1\46\1\u008d"+
-        "\1\uffff";
+        "\6\uffff\1\46\1\uffff\1\46\1\uffff\3\46\1\uffff\1\60\2\uffff\1\46\2\uffff\1\66\1\67\1\46\1\72\1\37\2\uffff\3\37\7\uffff\1\46\2\uffff\2\46\1\uffff\3\46\5\uffff\1\46\4\uffff\1\46\6\uffff\15\46\1\127\12\46\1\uffff\3\46\1\145\5\46\1\153\3\46\1\uffff\2\46\1\161\2\46\1\uffff\5\46\1\uffff\2\46\1\173\6\46\1\uffff\1\u0082\1\u0083\1\u0084\1\u0085\2\46\4\uffff\2\46\1\u008a\1\46\1\uffff\1\46\1\u008d\1\uffff";
     static final String DFA14_eofS =
         "\u008e\uffff";
     static final String DFA14_minS =
-        "\1\0\5\uffff\1\156\1\uffff\1\141\1\uffff\1\160\1\141\1\164\1\uffff"+
-        "\1\52\2\uffff\1\141\2\uffff\2\60\1\164\1\130\1\101\2\uffff\2\0\1"+
-        "\52\7\uffff\1\156\2\uffff\1\162\1\165\1\uffff\1\164\1\156\1\164"+
-        "\5\uffff\1\154\4\uffff\1\102\6\uffff\1\157\1\147\1\145\1\151\1\144"+
-        "\1\162\1\163\1\157\1\156\1\145\1\150\1\164\1\145\1\60\1\157\1\141"+
-        "\1\151\1\145\1\157\1\164\3\141\1\164\1\uffff\1\156\1\164\1\142\1"+
-        "\60\1\154\1\145\1\154\1\162\1\164\1\60\1\141\1\157\1\165\1\uffff"+
-        "\1\145\1\147\1\60\1\141\1\151\1\uffff\1\154\1\162\1\164\1\141\1"+
-        "\145\1\uffff\1\143\1\157\1\60\1\171\1\145\1\156\1\162\1\164\1\156"+
-        "\1\uffff\4\60\1\145\1\124\4\uffff\1\162\1\171\1\60\1\160\1\uffff"+
-        "\1\145\1\60\1\uffff";
+        "\1\0\5\uffff\1\156\1\uffff\1\141\1\uffff\1\160\1\141\1\164\1\uffff\1\52\2\uffff\1\141\2\uffff\2\60\1\164\1\130\1\101\2\uffff\2\0\1\52\7\uffff\1\156\2\uffff\1\162\1\165\1\uffff\1\164\1\156\1\164\5\uffff\1\154\4\uffff\1\102\6\uffff\1\157\1\147\1\145\1\151\1\144\1\162\1\163\1\157\1\156\1\145\1\150\1\164\1\145\1\60\1\157\1\141\1\151\1\145\1\157\1\164\3\141\1\164\1\uffff\1\156\1\164\1\142\1\60\1\154\1\145\1\154\1\162\1\164\1\60\1\141\1\157\1\165\1\uffff\1\145\1\147\1\60\1\141\1\151\1\uffff\1\154\1\162\1\164\1\141\1\145\1\uffff\1\143\1\157\1\60\1\171\1\145\1\156\1\162\1\164\1\156\1\uffff\4\60\1\145\1\124\4\uffff\1\162\1\171\1\60\1\160\1\uffff\1\145\1\60\1\uffff";
     static final String DFA14_maxS =
-        "\1\uffff\5\uffff\1\156\1\uffff\1\162\1\uffff\1\160\1\141\1\164"+
-        "\1\uffff\1\52\2\uffff\1\141\2\uffff\2\172\1\164\1\170\1\172\2\uffff"+
-        "\2\uffff\1\57\7\uffff\1\156\2\uffff\1\162\1\165\1\uffff\1\164\1"+
-        "\156\1\164\5\uffff\1\154\4\uffff\1\122\6\uffff\1\157\1\147\1\145"+
-        "\1\151\1\144\1\162\1\163\1\157\1\156\1\145\1\150\1\164\1\145\1\172"+
-        "\1\157\1\141\1\151\1\145\1\157\1\164\3\141\1\164\1\uffff\1\156\1"+
-        "\164\1\142\1\172\1\154\1\145\1\154\1\162\1\164\1\172\1\141\1\157"+
-        "\1\165\1\uffff\1\145\1\147\1\172\1\141\1\151\1\uffff\1\154\1\162"+
-        "\1\164\1\141\1\145\1\uffff\1\143\1\157\1\172\1\171\1\145\1\156\1"+
-        "\162\1\164\1\156\1\uffff\4\172\1\145\1\124\4\uffff\1\162\1\171\1"+
-        "\172\1\160\1\uffff\1\145\1\172\1\uffff";
+        "\1\uffff\5\uffff\1\156\1\uffff\1\162\1\uffff\1\160\1\141\1\164\1\uffff\1\52\2\uffff\1\141\2\uffff\2\172\1\164\1\170\1\172\2\uffff\2\uffff\1\57\7\uffff\1\156\2\uffff\1\162\1\165\1\uffff\1\164\1\156\1\164\5\uffff\1\154\4\uffff\1\122\6\uffff\1\157\1\147\1\145\1\151\1\144\1\162\1\163\1\157\1\156\1\145\1\150\1\164\1\145\1\172\1\157\1\141\1\151\1\145\1\157\1\164\3\141\1\164\1\uffff\1\156\1\164\1\142\1\172\1\154\1\145\1\154\1\162\1\164\1\172\1\141\1\157\1\165\1\uffff\1\145\1\147\1\172\1\141\1\151\1\uffff\1\154\1\162\1\164\1\141\1\145\1\uffff\1\143\1\157\1\172\1\171\1\145\1\156\1\162\1\164\1\156\1\uffff\4\172\1\145\1\124\4\uffff\1\162\1\171\1\172\1\160\1\uffff\1\145\1\172\1\uffff";
     static final String DFA14_acceptS =
-        "\1\uffff\1\1\1\2\1\3\1\4\1\5\1\uffff\1\7\1\uffff\1\11\3\uffff\1"+
-        "\15\1\uffff\1\17\1\20\1\uffff\1\23\1\24\5\uffff\1\35\1\36\3\uffff"+
-        "\1\42\1\43\1\1\1\2\1\3\1\4\1\5\1\uffff\1\35\1\7\2\uffff\1\11\3\uffff"+
-        "\1\15\1\16\1\25\1\17\1\20\1\uffff\1\23\1\24\1\26\1\27\1\uffff\1"+
-        "\34\1\36\1\37\1\40\1\41\1\42\30\uffff\1\22\15\uffff\1\21\5\uffff"+
-        "\1\10\5\uffff\1\32\11\uffff\1\12\6\uffff\1\13\1\14\1\30\1\31\4\uffff"+
-        "\1\33\2\uffff\1\6";
+        "\1\uffff\1\1\1\2\1\3\1\4\1\5\1\uffff\1\7\1\uffff\1\11\3\uffff\1\15\1\uffff\1\17\1\20\1\uffff\1\23\1\24\5\uffff\1\35\1\36\3\uffff\1\42\1\43\1\1\1\2\1\3\1\4\1\5\1\uffff\1\35\1\7\2\uffff\1\11\3\uffff\1\15\1\16\1\25\1\17\1\20\1\uffff\1\23\1\24\1\26\1\27\1\uffff\1\34\1\36\1\37\1\40\1\41\1\42\30\uffff\1\22\15\uffff\1\21\5\uffff\1\10\5\uffff\1\32\11\uffff\1\12\6\uffff\1\13\1\14\1\30\1\31\4\uffff\1\33\2\uffff\1\6";
     static final String DFA14_specialS =
         "\1\0\32\uffff\1\2\1\1\161\uffff}>";
     static final String[] DFA14_transitionS = {
-            "\11\37\2\36\2\37\1\36\22\37\1\36\1\37\1\33\4\37\1\34\1\2\1"+
-            "\4\1\37\1\22\1\3\1\23\1\16\1\35\1\27\11\32\1\15\2\37\1\5\2\37"+
-            "\1\1\1\6\3\31\1\25\25\31\1\17\1\37\1\20\1\30\1\31\1\37\1\14"+
-            "\3\31\1\24\1\21\6\31\1\13\1\31\1\12\1\26\3\31\1\10\6\31\1\7"+
-            "\1\37\1\11\uff82\37",
+            "\11\37\2\36\2\37\1\36\22\37\1\36\1\37\1\33\4\37\1\34\1\2\1\4\1\37\1\22\1\3\1\23\1\16\1\35\1\27\11\32\1\15\2\37\1\5\2\37\1\1\1\6\3\31\1\25\25\31\1\17\1\37\1\20\1\30\1\31\1\37\1\14\3\31\1\24\1\21\6\31\1\13\1\31\1\12\1\26\3\31\1\10\6\31\1\7\1\37\1\11\uff82\37",
             "",
             "",
             "",
diff --git a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTestParser.java b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTestParser.java
index ba0184115..f8021e923 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTestParser.java
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTestParser.java
@@ -75,7 +75,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
         
 
     public String[] getTokenNames() { return InternalBaseTestParser.tokenNames; }
-    public String getGrammarFileName() { return "../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g"; }
+    public String getGrammarFileName() { return "InternalBaseTest.g"; }
 
 
 
@@ -100,7 +100,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleBaseModel"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:68:1: entryRuleBaseModel returns [EObject current=null] : iv_ruleBaseModel= ruleBaseModel EOF ;
+    // InternalBaseTest.g:68:1: entryRuleBaseModel returns [EObject current=null] : iv_ruleBaseModel= ruleBaseModel EOF ;
     public final EObject entryRuleBaseModel() throws RecognitionException {
         EObject current = null;
 
@@ -108,17 +108,17 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:69:2: (iv_ruleBaseModel= ruleBaseModel EOF )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:70:2: iv_ruleBaseModel= ruleBaseModel EOF
+            // InternalBaseTest.g:69:2: (iv_ruleBaseModel= ruleBaseModel EOF )
+            // InternalBaseTest.g:70:2: iv_ruleBaseModel= ruleBaseModel EOF
             {
              newCompositeNode(grammarAccess.getBaseModelRule()); 
-            pushFollow(FOLLOW_ruleBaseModel_in_entryRuleBaseModel75);
+            pushFollow(FOLLOW_1);
             iv_ruleBaseModel=ruleBaseModel();
 
             state._fsp--;
 
              current =iv_ruleBaseModel; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleBaseModel85); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -136,7 +136,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleBaseModel"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:77:1: ruleBaseModel returns [EObject current=null] : ( ( (lv_elements_0_1= ruleAnnotation | lv_elements_0_2= ruleAnnotationType ) ) )* ;
+    // InternalBaseTest.g:77:1: ruleBaseModel returns [EObject current=null] : ( ( (lv_elements_0_1= ruleAnnotation | lv_elements_0_2= ruleAnnotationType ) ) )* ;
     public final EObject ruleBaseModel() throws RecognitionException {
         EObject current = null;
 
@@ -148,10 +148,10 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:80:28: ( ( ( (lv_elements_0_1= ruleAnnotation | lv_elements_0_2= ruleAnnotationType ) ) )* )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:81:1: ( ( (lv_elements_0_1= ruleAnnotation | lv_elements_0_2= ruleAnnotationType ) ) )*
+            // InternalBaseTest.g:80:28: ( ( ( (lv_elements_0_1= ruleAnnotation | lv_elements_0_2= ruleAnnotationType ) ) )* )
+            // InternalBaseTest.g:81:1: ( ( (lv_elements_0_1= ruleAnnotation | lv_elements_0_2= ruleAnnotationType ) ) )*
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:81:1: ( ( (lv_elements_0_1= ruleAnnotation | lv_elements_0_2= ruleAnnotationType ) ) )*
+            // InternalBaseTest.g:81:1: ( ( (lv_elements_0_1= ruleAnnotation | lv_elements_0_2= ruleAnnotationType ) ) )*
             loop2:
             do {
                 int alt2=2;
@@ -164,12 +164,12 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
                 switch (alt2) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:82:1: ( (lv_elements_0_1= ruleAnnotation | lv_elements_0_2= ruleAnnotationType ) )
+            	    // InternalBaseTest.g:82:1: ( (lv_elements_0_1= ruleAnnotation | lv_elements_0_2= ruleAnnotationType ) )
             	    {
-            	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:82:1: ( (lv_elements_0_1= ruleAnnotation | lv_elements_0_2= ruleAnnotationType ) )
-            	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:83:1: (lv_elements_0_1= ruleAnnotation | lv_elements_0_2= ruleAnnotationType )
+            	    // InternalBaseTest.g:82:1: ( (lv_elements_0_1= ruleAnnotation | lv_elements_0_2= ruleAnnotationType ) )
+            	    // InternalBaseTest.g:83:1: (lv_elements_0_1= ruleAnnotation | lv_elements_0_2= ruleAnnotationType )
             	    {
-            	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:83:1: (lv_elements_0_1= ruleAnnotation | lv_elements_0_2= ruleAnnotationType )
+            	    // InternalBaseTest.g:83:1: (lv_elements_0_1= ruleAnnotation | lv_elements_0_2= ruleAnnotationType )
             	    int alt1=2;
             	    int LA1_0 = input.LA(1);
 
@@ -187,12 +187,12 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
             	    }
             	    switch (alt1) {
             	        case 1 :
-            	            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:84:3: lv_elements_0_1= ruleAnnotation
+            	            // InternalBaseTest.g:84:3: lv_elements_0_1= ruleAnnotation
             	            {
             	             
             	            	        newCompositeNode(grammarAccess.getBaseModelAccess().getElementsAnnotationParserRuleCall_0_0()); 
             	            	    
-            	            pushFollow(FOLLOW_ruleAnnotation_in_ruleBaseModel132);
+            	            pushFollow(FOLLOW_3);
             	            lv_elements_0_1=ruleAnnotation();
 
             	            state._fsp--;
@@ -205,19 +205,19 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
             	                   			current, 
             	                   			"elements",
             	                    		lv_elements_0_1, 
-            	                    		"Annotation");
+            	                    		"org.eclipse.etrice.core.common.Base.Annotation");
             	            	        afterParserOrEnumRuleCall();
             	            	    
 
             	            }
             	            break;
             	        case 2 :
-            	            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:99:8: lv_elements_0_2= ruleAnnotationType
+            	            // InternalBaseTest.g:99:8: lv_elements_0_2= ruleAnnotationType
             	            {
             	             
             	            	        newCompositeNode(grammarAccess.getBaseModelAccess().getElementsAnnotationTypeParserRuleCall_0_1()); 
             	            	    
-            	            pushFollow(FOLLOW_ruleAnnotationType_in_ruleBaseModel151);
+            	            pushFollow(FOLLOW_3);
             	            lv_elements_0_2=ruleAnnotationType();
 
             	            state._fsp--;
@@ -230,7 +230,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
             	                   			current, 
             	                   			"elements",
             	                    		lv_elements_0_2, 
-            	                    		"AnnotationType");
+            	                    		"org.eclipse.etrice.core.common.Base.AnnotationType");
             	            	        afterParserOrEnumRuleCall();
             	            	    
 
@@ -269,7 +269,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleAnnotation"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:125:1: entryRuleAnnotation returns [EObject current=null] : iv_ruleAnnotation= ruleAnnotation EOF ;
+    // InternalBaseTest.g:125:1: entryRuleAnnotation returns [EObject current=null] : iv_ruleAnnotation= ruleAnnotation EOF ;
     public final EObject entryRuleAnnotation() throws RecognitionException {
         EObject current = null;
 
@@ -277,17 +277,17 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:126:2: (iv_ruleAnnotation= ruleAnnotation EOF )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:127:2: iv_ruleAnnotation= ruleAnnotation EOF
+            // InternalBaseTest.g:126:2: (iv_ruleAnnotation= ruleAnnotation EOF )
+            // InternalBaseTest.g:127:2: iv_ruleAnnotation= ruleAnnotation EOF
             {
              newCompositeNode(grammarAccess.getAnnotationRule()); 
-            pushFollow(FOLLOW_ruleAnnotation_in_entryRuleAnnotation190);
+            pushFollow(FOLLOW_1);
             iv_ruleAnnotation=ruleAnnotation();
 
             state._fsp--;
 
              current =iv_ruleAnnotation; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAnnotation200); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -305,7 +305,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleAnnotation"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:134:1: ruleAnnotation returns [EObject current=null] : (otherlv_0= '@' ( ( ruleFQN ) ) (otherlv_2= '(' ( (lv_attributes_3_0= ruleKeyValue ) ) (otherlv_4= ',' ( (lv_attributes_5_0= ruleKeyValue ) ) )* otherlv_6= ')' )? ) ;
+    // InternalBaseTest.g:134:1: ruleAnnotation returns [EObject current=null] : (otherlv_0= '@' ( ( ruleFQN ) ) (otherlv_2= '(' ( (lv_attributes_3_0= ruleKeyValue ) ) (otherlv_4= ',' ( (lv_attributes_5_0= ruleKeyValue ) ) )* otherlv_6= ')' )? ) ;
     public final EObject ruleAnnotation() throws RecognitionException {
         EObject current = null;
 
@@ -321,21 +321,21 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:137:28: ( (otherlv_0= '@' ( ( ruleFQN ) ) (otherlv_2= '(' ( (lv_attributes_3_0= ruleKeyValue ) ) (otherlv_4= ',' ( (lv_attributes_5_0= ruleKeyValue ) ) )* otherlv_6= ')' )? ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:138:1: (otherlv_0= '@' ( ( ruleFQN ) ) (otherlv_2= '(' ( (lv_attributes_3_0= ruleKeyValue ) ) (otherlv_4= ',' ( (lv_attributes_5_0= ruleKeyValue ) ) )* otherlv_6= ')' )? )
+            // InternalBaseTest.g:137:28: ( (otherlv_0= '@' ( ( ruleFQN ) ) (otherlv_2= '(' ( (lv_attributes_3_0= ruleKeyValue ) ) (otherlv_4= ',' ( (lv_attributes_5_0= ruleKeyValue ) ) )* otherlv_6= ')' )? ) )
+            // InternalBaseTest.g:138:1: (otherlv_0= '@' ( ( ruleFQN ) ) (otherlv_2= '(' ( (lv_attributes_3_0= ruleKeyValue ) ) (otherlv_4= ',' ( (lv_attributes_5_0= ruleKeyValue ) ) )* otherlv_6= ')' )? )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:138:1: (otherlv_0= '@' ( ( ruleFQN ) ) (otherlv_2= '(' ( (lv_attributes_3_0= ruleKeyValue ) ) (otherlv_4= ',' ( (lv_attributes_5_0= ruleKeyValue ) ) )* otherlv_6= ')' )? )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:138:3: otherlv_0= '@' ( ( ruleFQN ) ) (otherlv_2= '(' ( (lv_attributes_3_0= ruleKeyValue ) ) (otherlv_4= ',' ( (lv_attributes_5_0= ruleKeyValue ) ) )* otherlv_6= ')' )?
+            // InternalBaseTest.g:138:1: (otherlv_0= '@' ( ( ruleFQN ) ) (otherlv_2= '(' ( (lv_attributes_3_0= ruleKeyValue ) ) (otherlv_4= ',' ( (lv_attributes_5_0= ruleKeyValue ) ) )* otherlv_6= ')' )? )
+            // InternalBaseTest.g:138:3: otherlv_0= '@' ( ( ruleFQN ) ) (otherlv_2= '(' ( (lv_attributes_3_0= ruleKeyValue ) ) (otherlv_4= ',' ( (lv_attributes_5_0= ruleKeyValue ) ) )* otherlv_6= ')' )?
             {
-            otherlv_0=(Token)match(input,12,FOLLOW_12_in_ruleAnnotation237); 
+            otherlv_0=(Token)match(input,12,FOLLOW_4); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getAnnotationAccess().getCommercialAtKeyword_0());
                 
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:142:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:143:1: ( ruleFQN )
+            // InternalBaseTest.g:142:1: ( ( ruleFQN ) )
+            // InternalBaseTest.g:143:1: ( ruleFQN )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:143:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:144:3: ruleFQN
+            // InternalBaseTest.g:143:1: ( ruleFQN )
+            // InternalBaseTest.g:144:3: ruleFQN
             {
 
             			if (current==null) {
@@ -345,7 +345,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
              
             	        newCompositeNode(grammarAccess.getAnnotationAccess().getTypeAnnotationTypeCrossReference_1_0()); 
             	    
-            pushFollow(FOLLOW_ruleFQN_in_ruleAnnotation260);
+            pushFollow(FOLLOW_5);
             ruleFQN();
 
             state._fsp--;
@@ -359,7 +359,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:157:2: (otherlv_2= '(' ( (lv_attributes_3_0= ruleKeyValue ) ) (otherlv_4= ',' ( (lv_attributes_5_0= ruleKeyValue ) ) )* otherlv_6= ')' )?
+            // InternalBaseTest.g:157:2: (otherlv_2= '(' ( (lv_attributes_3_0= ruleKeyValue ) ) (otherlv_4= ',' ( (lv_attributes_5_0= ruleKeyValue ) ) )* otherlv_6= ')' )?
             int alt4=2;
             int LA4_0 = input.LA(1);
 
@@ -368,22 +368,22 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
             }
             switch (alt4) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:157:4: otherlv_2= '(' ( (lv_attributes_3_0= ruleKeyValue ) ) (otherlv_4= ',' ( (lv_attributes_5_0= ruleKeyValue ) ) )* otherlv_6= ')'
+                    // InternalBaseTest.g:157:4: otherlv_2= '(' ( (lv_attributes_3_0= ruleKeyValue ) ) (otherlv_4= ',' ( (lv_attributes_5_0= ruleKeyValue ) ) )* otherlv_6= ')'
                     {
-                    otherlv_2=(Token)match(input,13,FOLLOW_13_in_ruleAnnotation273); 
+                    otherlv_2=(Token)match(input,13,FOLLOW_4); 
 
                         	newLeafNode(otherlv_2, grammarAccess.getAnnotationAccess().getLeftParenthesisKeyword_2_0());
                         
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:161:1: ( (lv_attributes_3_0= ruleKeyValue ) )
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:162:1: (lv_attributes_3_0= ruleKeyValue )
+                    // InternalBaseTest.g:161:1: ( (lv_attributes_3_0= ruleKeyValue ) )
+                    // InternalBaseTest.g:162:1: (lv_attributes_3_0= ruleKeyValue )
                     {
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:162:1: (lv_attributes_3_0= ruleKeyValue )
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:163:3: lv_attributes_3_0= ruleKeyValue
+                    // InternalBaseTest.g:162:1: (lv_attributes_3_0= ruleKeyValue )
+                    // InternalBaseTest.g:163:3: lv_attributes_3_0= ruleKeyValue
                     {
                      
                     	        newCompositeNode(grammarAccess.getAnnotationAccess().getAttributesKeyValueParserRuleCall_2_1_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleKeyValue_in_ruleAnnotation294);
+                    pushFollow(FOLLOW_6);
                     lv_attributes_3_0=ruleKeyValue();
 
                     state._fsp--;
@@ -396,7 +396,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"attributes",
                             		lv_attributes_3_0, 
-                            		"KeyValue");
+                            		"org.eclipse.etrice.core.common.Base.KeyValue");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -405,7 +405,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:179:2: (otherlv_4= ',' ( (lv_attributes_5_0= ruleKeyValue ) ) )*
+                    // InternalBaseTest.g:179:2: (otherlv_4= ',' ( (lv_attributes_5_0= ruleKeyValue ) ) )*
                     loop3:
                     do {
                         int alt3=2;
@@ -418,22 +418,22 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
                         switch (alt3) {
                     	case 1 :
-                    	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:179:4: otherlv_4= ',' ( (lv_attributes_5_0= ruleKeyValue ) )
+                    	    // InternalBaseTest.g:179:4: otherlv_4= ',' ( (lv_attributes_5_0= ruleKeyValue ) )
                     	    {
-                    	    otherlv_4=(Token)match(input,14,FOLLOW_14_in_ruleAnnotation307); 
+                    	    otherlv_4=(Token)match(input,14,FOLLOW_4); 
 
                     	        	newLeafNode(otherlv_4, grammarAccess.getAnnotationAccess().getCommaKeyword_2_2_0());
                     	        
-                    	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:183:1: ( (lv_attributes_5_0= ruleKeyValue ) )
-                    	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:184:1: (lv_attributes_5_0= ruleKeyValue )
+                    	    // InternalBaseTest.g:183:1: ( (lv_attributes_5_0= ruleKeyValue ) )
+                    	    // InternalBaseTest.g:184:1: (lv_attributes_5_0= ruleKeyValue )
                     	    {
-                    	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:184:1: (lv_attributes_5_0= ruleKeyValue )
-                    	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:185:3: lv_attributes_5_0= ruleKeyValue
+                    	    // InternalBaseTest.g:184:1: (lv_attributes_5_0= ruleKeyValue )
+                    	    // InternalBaseTest.g:185:3: lv_attributes_5_0= ruleKeyValue
                     	    {
                     	     
                     	    	        newCompositeNode(grammarAccess.getAnnotationAccess().getAttributesKeyValueParserRuleCall_2_2_1_0()); 
                     	    	    
-                    	    pushFollow(FOLLOW_ruleKeyValue_in_ruleAnnotation328);
+                    	    pushFollow(FOLLOW_6);
                     	    lv_attributes_5_0=ruleKeyValue();
 
                     	    state._fsp--;
@@ -446,7 +446,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
                     	           			current, 
                     	           			"attributes",
                     	            		lv_attributes_5_0, 
-                    	            		"KeyValue");
+                    	            		"org.eclipse.etrice.core.common.Base.KeyValue");
                     	    	        afterParserOrEnumRuleCall();
                     	    	    
 
@@ -464,7 +464,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
                         }
                     } while (true);
 
-                    otherlv_6=(Token)match(input,15,FOLLOW_15_in_ruleAnnotation342); 
+                    otherlv_6=(Token)match(input,15,FOLLOW_2); 
 
                         	newLeafNode(otherlv_6, grammarAccess.getAnnotationAccess().getRightParenthesisKeyword_2_3());
                         
@@ -495,7 +495,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleKeyValue"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:213:1: entryRuleKeyValue returns [EObject current=null] : iv_ruleKeyValue= ruleKeyValue EOF ;
+    // InternalBaseTest.g:213:1: entryRuleKeyValue returns [EObject current=null] : iv_ruleKeyValue= ruleKeyValue EOF ;
     public final EObject entryRuleKeyValue() throws RecognitionException {
         EObject current = null;
 
@@ -503,17 +503,17 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:214:2: (iv_ruleKeyValue= ruleKeyValue EOF )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:215:2: iv_ruleKeyValue= ruleKeyValue EOF
+            // InternalBaseTest.g:214:2: (iv_ruleKeyValue= ruleKeyValue EOF )
+            // InternalBaseTest.g:215:2: iv_ruleKeyValue= ruleKeyValue EOF
             {
              newCompositeNode(grammarAccess.getKeyValueRule()); 
-            pushFollow(FOLLOW_ruleKeyValue_in_entryRuleKeyValue380);
+            pushFollow(FOLLOW_1);
             iv_ruleKeyValue=ruleKeyValue();
 
             state._fsp--;
 
              current =iv_ruleKeyValue; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleKeyValue390); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -531,7 +531,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleKeyValue"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:222:1: ruleKeyValue returns [EObject current=null] : ( ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) ) ) ;
+    // InternalBaseTest.g:222: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;
 
@@ -543,19 +543,19 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:225:28: ( ( ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) ) ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:226:1: ( ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) ) )
+            // InternalBaseTest.g:225:28: ( ( ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) ) ) )
+            // InternalBaseTest.g:226:1: ( ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) ) )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:226:1: ( ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:226:2: ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) )
+            // InternalBaseTest.g:226:1: ( ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) ) )
+            // InternalBaseTest.g:226:2: ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:226:2: ( (lv_key_0_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:227:1: (lv_key_0_0= RULE_ID )
+            // InternalBaseTest.g:226:2: ( (lv_key_0_0= RULE_ID ) )
+            // InternalBaseTest.g:227:1: (lv_key_0_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:227:1: (lv_key_0_0= RULE_ID )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:228:3: lv_key_0_0= RULE_ID
+            // InternalBaseTest.g:227:1: (lv_key_0_0= RULE_ID )
+            // InternalBaseTest.g:228:3: lv_key_0_0= RULE_ID
             {
-            lv_key_0_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleKeyValue432); 
+            lv_key_0_0=(Token)match(input,RULE_ID,FOLLOW_7); 
 
             			newLeafNode(lv_key_0_0, grammarAccess.getKeyValueAccess().getKeyIDTerminalRuleCall_0_0()); 
             		
@@ -567,7 +567,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"key",
                     		lv_key_0_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -575,20 +575,20 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,16,FOLLOW_16_in_ruleKeyValue449); 
+            otherlv_1=(Token)match(input,16,FOLLOW_8); 
 
                 	newLeafNode(otherlv_1, grammarAccess.getKeyValueAccess().getEqualsSignKeyword_1());
                 
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:248:1: ( (lv_value_2_0= ruleLiteral ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:249:1: (lv_value_2_0= ruleLiteral )
+            // InternalBaseTest.g:248:1: ( (lv_value_2_0= ruleLiteral ) )
+            // InternalBaseTest.g:249:1: (lv_value_2_0= ruleLiteral )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:249:1: (lv_value_2_0= ruleLiteral )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:250:3: lv_value_2_0= ruleLiteral
+            // InternalBaseTest.g:249:1: (lv_value_2_0= ruleLiteral )
+            // InternalBaseTest.g:250:3: lv_value_2_0= ruleLiteral
             {
              
             	        newCompositeNode(grammarAccess.getKeyValueAccess().getValueLiteralParserRuleCall_2_0()); 
             	    
-            pushFollow(FOLLOW_ruleLiteral_in_ruleKeyValue470);
+            pushFollow(FOLLOW_2);
             lv_value_2_0=ruleLiteral();
 
             state._fsp--;
@@ -601,7 +601,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"value",
                     		lv_value_2_0, 
-                    		"Literal");
+                    		"org.eclipse.etrice.core.common.Base.Literal");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -631,7 +631,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleAnnotationType"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:274:1: entryRuleAnnotationType returns [EObject current=null] : iv_ruleAnnotationType= ruleAnnotationType EOF ;
+    // InternalBaseTest.g:274:1: entryRuleAnnotationType returns [EObject current=null] : iv_ruleAnnotationType= ruleAnnotationType EOF ;
     public final EObject entryRuleAnnotationType() throws RecognitionException {
         EObject current = null;
 
@@ -639,17 +639,17 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:275:2: (iv_ruleAnnotationType= ruleAnnotationType EOF )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:276:2: iv_ruleAnnotationType= ruleAnnotationType EOF
+            // InternalBaseTest.g:275:2: (iv_ruleAnnotationType= ruleAnnotationType EOF )
+            // InternalBaseTest.g:276:2: iv_ruleAnnotationType= ruleAnnotationType EOF
             {
              newCompositeNode(grammarAccess.getAnnotationTypeRule()); 
-            pushFollow(FOLLOW_ruleAnnotationType_in_entryRuleAnnotationType506);
+            pushFollow(FOLLOW_1);
             iv_ruleAnnotationType=ruleAnnotationType();
 
             state._fsp--;
 
              current =iv_ruleAnnotationType; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAnnotationType516); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -667,7 +667,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleAnnotationType"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:283:1: ruleAnnotationType returns [EObject current=null] : (otherlv_0= 'AnnotationType' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' otherlv_4= 'target' otherlv_5= '=' ( ( (lv_targets_6_0= ruleAnnotationTargetType ) ) | (otherlv_7= '{' ( (lv_targets_8_0= ruleAnnotationTargetType ) ) (otherlv_9= ',' ( (lv_targets_10_0= ruleAnnotationTargetType ) ) )* otherlv_11= '}' ) ) ( (lv_attributes_12_0= ruleAnnotationAttribute ) )* otherlv_13= '}' ) ;
+    // InternalBaseTest.g:283:1: ruleAnnotationType returns [EObject current=null] : (otherlv_0= 'AnnotationType' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' otherlv_4= 'target' otherlv_5= '=' ( ( (lv_targets_6_0= ruleAnnotationTargetType ) ) | (otherlv_7= '{' ( (lv_targets_8_0= ruleAnnotationTargetType ) ) (otherlv_9= ',' ( (lv_targets_10_0= ruleAnnotationTargetType ) ) )* otherlv_11= '}' ) ) ( (lv_attributes_12_0= ruleAnnotationAttribute ) )* otherlv_13= '}' ) ;
     public final EObject ruleAnnotationType() throws RecognitionException {
         EObject current = null;
 
@@ -694,23 +694,23 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:286:28: ( (otherlv_0= 'AnnotationType' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' otherlv_4= 'target' otherlv_5= '=' ( ( (lv_targets_6_0= ruleAnnotationTargetType ) ) | (otherlv_7= '{' ( (lv_targets_8_0= ruleAnnotationTargetType ) ) (otherlv_9= ',' ( (lv_targets_10_0= ruleAnnotationTargetType ) ) )* otherlv_11= '}' ) ) ( (lv_attributes_12_0= ruleAnnotationAttribute ) )* otherlv_13= '}' ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:287:1: (otherlv_0= 'AnnotationType' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' otherlv_4= 'target' otherlv_5= '=' ( ( (lv_targets_6_0= ruleAnnotationTargetType ) ) | (otherlv_7= '{' ( (lv_targets_8_0= ruleAnnotationTargetType ) ) (otherlv_9= ',' ( (lv_targets_10_0= ruleAnnotationTargetType ) ) )* otherlv_11= '}' ) ) ( (lv_attributes_12_0= ruleAnnotationAttribute ) )* otherlv_13= '}' )
+            // InternalBaseTest.g:286:28: ( (otherlv_0= 'AnnotationType' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' otherlv_4= 'target' otherlv_5= '=' ( ( (lv_targets_6_0= ruleAnnotationTargetType ) ) | (otherlv_7= '{' ( (lv_targets_8_0= ruleAnnotationTargetType ) ) (otherlv_9= ',' ( (lv_targets_10_0= ruleAnnotationTargetType ) ) )* otherlv_11= '}' ) ) ( (lv_attributes_12_0= ruleAnnotationAttribute ) )* otherlv_13= '}' ) )
+            // InternalBaseTest.g:287:1: (otherlv_0= 'AnnotationType' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' otherlv_4= 'target' otherlv_5= '=' ( ( (lv_targets_6_0= ruleAnnotationTargetType ) ) | (otherlv_7= '{' ( (lv_targets_8_0= ruleAnnotationTargetType ) ) (otherlv_9= ',' ( (lv_targets_10_0= ruleAnnotationTargetType ) ) )* otherlv_11= '}' ) ) ( (lv_attributes_12_0= ruleAnnotationAttribute ) )* otherlv_13= '}' )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:287:1: (otherlv_0= 'AnnotationType' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' otherlv_4= 'target' otherlv_5= '=' ( ( (lv_targets_6_0= ruleAnnotationTargetType ) ) | (otherlv_7= '{' ( (lv_targets_8_0= ruleAnnotationTargetType ) ) (otherlv_9= ',' ( (lv_targets_10_0= ruleAnnotationTargetType ) ) )* otherlv_11= '}' ) ) ( (lv_attributes_12_0= ruleAnnotationAttribute ) )* otherlv_13= '}' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:287:3: otherlv_0= 'AnnotationType' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' otherlv_4= 'target' otherlv_5= '=' ( ( (lv_targets_6_0= ruleAnnotationTargetType ) ) | (otherlv_7= '{' ( (lv_targets_8_0= ruleAnnotationTargetType ) ) (otherlv_9= ',' ( (lv_targets_10_0= ruleAnnotationTargetType ) ) )* otherlv_11= '}' ) ) ( (lv_attributes_12_0= ruleAnnotationAttribute ) )* otherlv_13= '}'
+            // InternalBaseTest.g:287:1: (otherlv_0= 'AnnotationType' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' otherlv_4= 'target' otherlv_5= '=' ( ( (lv_targets_6_0= ruleAnnotationTargetType ) ) | (otherlv_7= '{' ( (lv_targets_8_0= ruleAnnotationTargetType ) ) (otherlv_9= ',' ( (lv_targets_10_0= ruleAnnotationTargetType ) ) )* otherlv_11= '}' ) ) ( (lv_attributes_12_0= ruleAnnotationAttribute ) )* otherlv_13= '}' )
+            // InternalBaseTest.g:287:3: otherlv_0= 'AnnotationType' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' otherlv_4= 'target' otherlv_5= '=' ( ( (lv_targets_6_0= ruleAnnotationTargetType ) ) | (otherlv_7= '{' ( (lv_targets_8_0= ruleAnnotationTargetType ) ) (otherlv_9= ',' ( (lv_targets_10_0= ruleAnnotationTargetType ) ) )* otherlv_11= '}' ) ) ( (lv_attributes_12_0= ruleAnnotationAttribute ) )* otherlv_13= '}'
             {
-            otherlv_0=(Token)match(input,17,FOLLOW_17_in_ruleAnnotationType553); 
+            otherlv_0=(Token)match(input,17,FOLLOW_4); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getAnnotationTypeAccess().getAnnotationTypeKeyword_0());
                 
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:291:1: ( (lv_name_1_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:292:1: (lv_name_1_0= RULE_ID )
+            // InternalBaseTest.g:291:1: ( (lv_name_1_0= RULE_ID ) )
+            // InternalBaseTest.g:292:1: (lv_name_1_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:292:1: (lv_name_1_0= RULE_ID )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:293:3: lv_name_1_0= RULE_ID
+            // InternalBaseTest.g:292:1: (lv_name_1_0= RULE_ID )
+            // InternalBaseTest.g:293:3: lv_name_1_0= RULE_ID
             {
-            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleAnnotationType570); 
+            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_9); 
 
             			newLeafNode(lv_name_1_0, grammarAccess.getAnnotationTypeAccess().getNameIDTerminalRuleCall_1_0()); 
             		
@@ -722,7 +722,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"name",
                     		lv_name_1_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -730,7 +730,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:309:2: ( (lv_docu_2_0= ruleDocumentation ) )?
+            // InternalBaseTest.g:309:2: ( (lv_docu_2_0= ruleDocumentation ) )?
             int alt5=2;
             int LA5_0 = input.LA(1);
 
@@ -739,15 +739,15 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
             }
             switch (alt5) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:310:1: (lv_docu_2_0= ruleDocumentation )
+                    // InternalBaseTest.g:310:1: (lv_docu_2_0= ruleDocumentation )
                     {
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:310:1: (lv_docu_2_0= ruleDocumentation )
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:311:3: lv_docu_2_0= ruleDocumentation
+                    // InternalBaseTest.g:310:1: (lv_docu_2_0= ruleDocumentation )
+                    // InternalBaseTest.g:311:3: lv_docu_2_0= ruleDocumentation
                     {
                      
                     	        newCompositeNode(grammarAccess.getAnnotationTypeAccess().getDocuDocumentationParserRuleCall_2_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDocumentation_in_ruleAnnotationType596);
+                    pushFollow(FOLLOW_10);
                     lv_docu_2_0=ruleDocumentation();
 
                     state._fsp--;
@@ -760,7 +760,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"docu",
                             		lv_docu_2_0, 
-                            		"Documentation");
+                            		"org.eclipse.etrice.core.common.Base.Documentation");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -772,19 +772,19 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_3=(Token)match(input,18,FOLLOW_18_in_ruleAnnotationType609); 
+            otherlv_3=(Token)match(input,18,FOLLOW_11); 
 
                 	newLeafNode(otherlv_3, grammarAccess.getAnnotationTypeAccess().getLeftCurlyBracketKeyword_3());
                 
-            otherlv_4=(Token)match(input,19,FOLLOW_19_in_ruleAnnotationType621); 
+            otherlv_4=(Token)match(input,19,FOLLOW_7); 
 
                 	newLeafNode(otherlv_4, grammarAccess.getAnnotationTypeAccess().getTargetKeyword_4());
                 
-            otherlv_5=(Token)match(input,16,FOLLOW_16_in_ruleAnnotationType633); 
+            otherlv_5=(Token)match(input,16,FOLLOW_12); 
 
                 	newLeafNode(otherlv_5, grammarAccess.getAnnotationTypeAccess().getEqualsSignKeyword_5());
                 
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:339:1: ( ( (lv_targets_6_0= ruleAnnotationTargetType ) ) | (otherlv_7= '{' ( (lv_targets_8_0= ruleAnnotationTargetType ) ) (otherlv_9= ',' ( (lv_targets_10_0= ruleAnnotationTargetType ) ) )* otherlv_11= '}' ) )
+            // InternalBaseTest.g:339:1: ( ( (lv_targets_6_0= ruleAnnotationTargetType ) ) | (otherlv_7= '{' ( (lv_targets_8_0= ruleAnnotationTargetType ) ) (otherlv_9= ',' ( (lv_targets_10_0= ruleAnnotationTargetType ) ) )* otherlv_11= '}' ) )
             int alt7=2;
             int LA7_0 = input.LA(1);
 
@@ -802,18 +802,18 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
             }
             switch (alt7) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:339:2: ( (lv_targets_6_0= ruleAnnotationTargetType ) )
+                    // InternalBaseTest.g:339:2: ( (lv_targets_6_0= ruleAnnotationTargetType ) )
                     {
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:339:2: ( (lv_targets_6_0= ruleAnnotationTargetType ) )
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:340:1: (lv_targets_6_0= ruleAnnotationTargetType )
+                    // InternalBaseTest.g:339:2: ( (lv_targets_6_0= ruleAnnotationTargetType ) )
+                    // InternalBaseTest.g:340:1: (lv_targets_6_0= ruleAnnotationTargetType )
                     {
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:340:1: (lv_targets_6_0= ruleAnnotationTargetType )
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:341:3: lv_targets_6_0= ruleAnnotationTargetType
+                    // InternalBaseTest.g:340:1: (lv_targets_6_0= ruleAnnotationTargetType )
+                    // InternalBaseTest.g:341:3: lv_targets_6_0= ruleAnnotationTargetType
                     {
                      
                     	        newCompositeNode(grammarAccess.getAnnotationTypeAccess().getTargetsAnnotationTargetTypeParserRuleCall_6_0_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleAnnotationTargetType_in_ruleAnnotationType655);
+                    pushFollow(FOLLOW_13);
                     lv_targets_6_0=ruleAnnotationTargetType();
 
                     state._fsp--;
@@ -826,7 +826,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"targets",
                             		lv_targets_6_0, 
-                            		"AnnotationTargetType");
+                            		"org.eclipse.etrice.core.common.Base.AnnotationTargetType");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -839,25 +839,25 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:358:6: (otherlv_7= '{' ( (lv_targets_8_0= ruleAnnotationTargetType ) ) (otherlv_9= ',' ( (lv_targets_10_0= ruleAnnotationTargetType ) ) )* otherlv_11= '}' )
+                    // InternalBaseTest.g:358:6: (otherlv_7= '{' ( (lv_targets_8_0= ruleAnnotationTargetType ) ) (otherlv_9= ',' ( (lv_targets_10_0= ruleAnnotationTargetType ) ) )* otherlv_11= '}' )
                     {
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:358:6: (otherlv_7= '{' ( (lv_targets_8_0= ruleAnnotationTargetType ) ) (otherlv_9= ',' ( (lv_targets_10_0= ruleAnnotationTargetType ) ) )* otherlv_11= '}' )
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:358:8: otherlv_7= '{' ( (lv_targets_8_0= ruleAnnotationTargetType ) ) (otherlv_9= ',' ( (lv_targets_10_0= ruleAnnotationTargetType ) ) )* otherlv_11= '}'
+                    // InternalBaseTest.g:358:6: (otherlv_7= '{' ( (lv_targets_8_0= ruleAnnotationTargetType ) ) (otherlv_9= ',' ( (lv_targets_10_0= ruleAnnotationTargetType ) ) )* otherlv_11= '}' )
+                    // InternalBaseTest.g:358:8: otherlv_7= '{' ( (lv_targets_8_0= ruleAnnotationTargetType ) ) (otherlv_9= ',' ( (lv_targets_10_0= ruleAnnotationTargetType ) ) )* otherlv_11= '}'
                     {
-                    otherlv_7=(Token)match(input,18,FOLLOW_18_in_ruleAnnotationType674); 
+                    otherlv_7=(Token)match(input,18,FOLLOW_4); 
 
                         	newLeafNode(otherlv_7, grammarAccess.getAnnotationTypeAccess().getLeftCurlyBracketKeyword_6_1_0());
                         
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:362:1: ( (lv_targets_8_0= ruleAnnotationTargetType ) )
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:363:1: (lv_targets_8_0= ruleAnnotationTargetType )
+                    // InternalBaseTest.g:362:1: ( (lv_targets_8_0= ruleAnnotationTargetType ) )
+                    // InternalBaseTest.g:363:1: (lv_targets_8_0= ruleAnnotationTargetType )
                     {
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:363:1: (lv_targets_8_0= ruleAnnotationTargetType )
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:364:3: lv_targets_8_0= ruleAnnotationTargetType
+                    // InternalBaseTest.g:363:1: (lv_targets_8_0= ruleAnnotationTargetType )
+                    // InternalBaseTest.g:364:3: lv_targets_8_0= ruleAnnotationTargetType
                     {
                      
                     	        newCompositeNode(grammarAccess.getAnnotationTypeAccess().getTargetsAnnotationTargetTypeParserRuleCall_6_1_1_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleAnnotationTargetType_in_ruleAnnotationType695);
+                    pushFollow(FOLLOW_14);
                     lv_targets_8_0=ruleAnnotationTargetType();
 
                     state._fsp--;
@@ -870,7 +870,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"targets",
                             		lv_targets_8_0, 
-                            		"AnnotationTargetType");
+                            		"org.eclipse.etrice.core.common.Base.AnnotationTargetType");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -879,7 +879,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:380:2: (otherlv_9= ',' ( (lv_targets_10_0= ruleAnnotationTargetType ) ) )*
+                    // InternalBaseTest.g:380:2: (otherlv_9= ',' ( (lv_targets_10_0= ruleAnnotationTargetType ) ) )*
                     loop6:
                     do {
                         int alt6=2;
@@ -892,22 +892,22 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
                         switch (alt6) {
                     	case 1 :
-                    	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:380:4: otherlv_9= ',' ( (lv_targets_10_0= ruleAnnotationTargetType ) )
+                    	    // InternalBaseTest.g:380:4: otherlv_9= ',' ( (lv_targets_10_0= ruleAnnotationTargetType ) )
                     	    {
-                    	    otherlv_9=(Token)match(input,14,FOLLOW_14_in_ruleAnnotationType708); 
+                    	    otherlv_9=(Token)match(input,14,FOLLOW_4); 
 
                     	        	newLeafNode(otherlv_9, grammarAccess.getAnnotationTypeAccess().getCommaKeyword_6_1_2_0());
                     	        
-                    	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:384:1: ( (lv_targets_10_0= ruleAnnotationTargetType ) )
-                    	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:385:1: (lv_targets_10_0= ruleAnnotationTargetType )
+                    	    // InternalBaseTest.g:384:1: ( (lv_targets_10_0= ruleAnnotationTargetType ) )
+                    	    // InternalBaseTest.g:385:1: (lv_targets_10_0= ruleAnnotationTargetType )
                     	    {
-                    	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:385:1: (lv_targets_10_0= ruleAnnotationTargetType )
-                    	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:386:3: lv_targets_10_0= ruleAnnotationTargetType
+                    	    // InternalBaseTest.g:385:1: (lv_targets_10_0= ruleAnnotationTargetType )
+                    	    // InternalBaseTest.g:386:3: lv_targets_10_0= ruleAnnotationTargetType
                     	    {
                     	     
                     	    	        newCompositeNode(grammarAccess.getAnnotationTypeAccess().getTargetsAnnotationTargetTypeParserRuleCall_6_1_2_1_0()); 
                     	    	    
-                    	    pushFollow(FOLLOW_ruleAnnotationTargetType_in_ruleAnnotationType729);
+                    	    pushFollow(FOLLOW_14);
                     	    lv_targets_10_0=ruleAnnotationTargetType();
 
                     	    state._fsp--;
@@ -920,7 +920,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
                     	           			current, 
                     	           			"targets",
                     	            		lv_targets_10_0, 
-                    	            		"AnnotationTargetType");
+                    	            		"org.eclipse.etrice.core.common.Base.AnnotationTargetType");
                     	    	        afterParserOrEnumRuleCall();
                     	    	    
 
@@ -938,7 +938,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
                         }
                     } while (true);
 
-                    otherlv_11=(Token)match(input,20,FOLLOW_20_in_ruleAnnotationType743); 
+                    otherlv_11=(Token)match(input,20,FOLLOW_13); 
 
                         	newLeafNode(otherlv_11, grammarAccess.getAnnotationTypeAccess().getRightCurlyBracketKeyword_6_1_3());
                         
@@ -951,7 +951,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:406:3: ( (lv_attributes_12_0= ruleAnnotationAttribute ) )*
+            // InternalBaseTest.g:406:3: ( (lv_attributes_12_0= ruleAnnotationAttribute ) )*
             loop8:
             do {
                 int alt8=2;
@@ -964,15 +964,15 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
                 switch (alt8) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:407:1: (lv_attributes_12_0= ruleAnnotationAttribute )
+            	    // InternalBaseTest.g:407:1: (lv_attributes_12_0= ruleAnnotationAttribute )
             	    {
-            	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:407:1: (lv_attributes_12_0= ruleAnnotationAttribute )
-            	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:408:3: lv_attributes_12_0= ruleAnnotationAttribute
+            	    // InternalBaseTest.g:407:1: (lv_attributes_12_0= ruleAnnotationAttribute )
+            	    // InternalBaseTest.g:408:3: lv_attributes_12_0= ruleAnnotationAttribute
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getAnnotationTypeAccess().getAttributesAnnotationAttributeParserRuleCall_7_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleAnnotationAttribute_in_ruleAnnotationType766);
+            	    pushFollow(FOLLOW_13);
             	    lv_attributes_12_0=ruleAnnotationAttribute();
 
             	    state._fsp--;
@@ -985,7 +985,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"attributes",
             	            		lv_attributes_12_0, 
-            	            		"AnnotationAttribute");
+            	            		"org.eclipse.etrice.core.common.Base.AnnotationAttribute");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -1000,7 +1000,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
                 }
             } while (true);
 
-            otherlv_13=(Token)match(input,20,FOLLOW_20_in_ruleAnnotationType779); 
+            otherlv_13=(Token)match(input,20,FOLLOW_2); 
 
                 	newLeafNode(otherlv_13, grammarAccess.getAnnotationTypeAccess().getRightCurlyBracketKeyword_8());
                 
@@ -1025,7 +1025,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleAnnotationTargetType"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:436:1: entryRuleAnnotationTargetType returns [String current=null] : iv_ruleAnnotationTargetType= ruleAnnotationTargetType EOF ;
+    // InternalBaseTest.g:436:1: entryRuleAnnotationTargetType returns [String current=null] : iv_ruleAnnotationTargetType= ruleAnnotationTargetType EOF ;
     public final String entryRuleAnnotationTargetType() throws RecognitionException {
         String current = null;
 
@@ -1033,17 +1033,17 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:437:2: (iv_ruleAnnotationTargetType= ruleAnnotationTargetType EOF )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:438:2: iv_ruleAnnotationTargetType= ruleAnnotationTargetType EOF
+            // InternalBaseTest.g:437:2: (iv_ruleAnnotationTargetType= ruleAnnotationTargetType EOF )
+            // InternalBaseTest.g:438:2: iv_ruleAnnotationTargetType= ruleAnnotationTargetType EOF
             {
              newCompositeNode(grammarAccess.getAnnotationTargetTypeRule()); 
-            pushFollow(FOLLOW_ruleAnnotationTargetType_in_entryRuleAnnotationTargetType816);
+            pushFollow(FOLLOW_1);
             iv_ruleAnnotationTargetType=ruleAnnotationTargetType();
 
             state._fsp--;
 
              current =iv_ruleAnnotationTargetType.getText(); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAnnotationTargetType827); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1061,7 +1061,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleAnnotationTargetType"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:445:1: ruleAnnotationTargetType returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_ID_0= RULE_ID ;
+    // InternalBaseTest.g:445:1: ruleAnnotationTargetType returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_ID_0= RULE_ID ;
     public final AntlrDatatypeRuleToken ruleAnnotationTargetType() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -1070,10 +1070,10 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:448:28: (this_ID_0= RULE_ID )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:449:5: this_ID_0= RULE_ID
+            // InternalBaseTest.g:448:28: (this_ID_0= RULE_ID )
+            // InternalBaseTest.g:449:5: this_ID_0= RULE_ID
             {
-            this_ID_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleAnnotationTargetType866); 
+            this_ID_0=(Token)match(input,RULE_ID,FOLLOW_2); 
 
             		current.merge(this_ID_0);
                 
@@ -1098,7 +1098,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleAnnotationAttribute"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:464:1: entryRuleAnnotationAttribute returns [EObject current=null] : iv_ruleAnnotationAttribute= ruleAnnotationAttribute EOF ;
+    // InternalBaseTest.g:464:1: entryRuleAnnotationAttribute returns [EObject current=null] : iv_ruleAnnotationAttribute= ruleAnnotationAttribute EOF ;
     public final EObject entryRuleAnnotationAttribute() throws RecognitionException {
         EObject current = null;
 
@@ -1106,17 +1106,17 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:465:2: (iv_ruleAnnotationAttribute= ruleAnnotationAttribute EOF )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:466:2: iv_ruleAnnotationAttribute= ruleAnnotationAttribute EOF
+            // InternalBaseTest.g:465:2: (iv_ruleAnnotationAttribute= ruleAnnotationAttribute EOF )
+            // InternalBaseTest.g:466:2: iv_ruleAnnotationAttribute= ruleAnnotationAttribute EOF
             {
              newCompositeNode(grammarAccess.getAnnotationAttributeRule()); 
-            pushFollow(FOLLOW_ruleAnnotationAttribute_in_entryRuleAnnotationAttribute910);
+            pushFollow(FOLLOW_1);
             iv_ruleAnnotationAttribute=ruleAnnotationAttribute();
 
             state._fsp--;
 
              current =iv_ruleAnnotationAttribute; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAnnotationAttribute920); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1134,7 +1134,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleAnnotationAttribute"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:473:1: ruleAnnotationAttribute returns [EObject current=null] : (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute ) ;
+    // InternalBaseTest.g:473:1: ruleAnnotationAttribute returns [EObject current=null] : (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute ) ;
     public final EObject ruleAnnotationAttribute() throws RecognitionException {
         EObject current = null;
 
@@ -1146,10 +1146,10 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:476:28: ( (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:477:1: (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute )
+            // InternalBaseTest.g:476:28: ( (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute ) )
+            // InternalBaseTest.g:477:1: (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:477:1: (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute )
+            // InternalBaseTest.g:477:1: (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute )
             int alt9=2;
             int LA9_0 = input.LA(1);
 
@@ -1253,12 +1253,12 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
             }
             switch (alt9) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:478:5: this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute
+                    // InternalBaseTest.g:478:5: this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute
                     {
                      
                             newCompositeNode(grammarAccess.getAnnotationAttributeAccess().getSimpleAnnotationAttributeParserRuleCall_0()); 
                         
-                    pushFollow(FOLLOW_ruleSimpleAnnotationAttribute_in_ruleAnnotationAttribute967);
+                    pushFollow(FOLLOW_2);
                     this_SimpleAnnotationAttribute_0=ruleSimpleAnnotationAttribute();
 
                     state._fsp--;
@@ -1271,12 +1271,12 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:488:5: this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute
+                    // InternalBaseTest.g:488:5: this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute
                     {
                      
                             newCompositeNode(grammarAccess.getAnnotationAttributeAccess().getEnumAnnotationAttributeParserRuleCall_1()); 
                         
-                    pushFollow(FOLLOW_ruleEnumAnnotationAttribute_in_ruleAnnotationAttribute994);
+                    pushFollow(FOLLOW_2);
                     this_EnumAnnotationAttribute_1=ruleEnumAnnotationAttribute();
 
                     state._fsp--;
@@ -1309,7 +1309,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleSimpleAnnotationAttribute"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:504:1: entryRuleSimpleAnnotationAttribute returns [EObject current=null] : iv_ruleSimpleAnnotationAttribute= ruleSimpleAnnotationAttribute EOF ;
+    // InternalBaseTest.g:504:1: entryRuleSimpleAnnotationAttribute returns [EObject current=null] : iv_ruleSimpleAnnotationAttribute= ruleSimpleAnnotationAttribute EOF ;
     public final EObject entryRuleSimpleAnnotationAttribute() throws RecognitionException {
         EObject current = null;
 
@@ -1317,17 +1317,17 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:505:2: (iv_ruleSimpleAnnotationAttribute= ruleSimpleAnnotationAttribute EOF )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:506:2: iv_ruleSimpleAnnotationAttribute= ruleSimpleAnnotationAttribute EOF
+            // InternalBaseTest.g:505:2: (iv_ruleSimpleAnnotationAttribute= ruleSimpleAnnotationAttribute EOF )
+            // InternalBaseTest.g:506:2: iv_ruleSimpleAnnotationAttribute= ruleSimpleAnnotationAttribute EOF
             {
              newCompositeNode(grammarAccess.getSimpleAnnotationAttributeRule()); 
-            pushFollow(FOLLOW_ruleSimpleAnnotationAttribute_in_entryRuleSimpleAnnotationAttribute1029);
+            pushFollow(FOLLOW_1);
             iv_ruleSimpleAnnotationAttribute=ruleSimpleAnnotationAttribute();
 
             state._fsp--;
 
              current =iv_ruleSimpleAnnotationAttribute; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSimpleAnnotationAttribute1039); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1345,7 +1345,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleSimpleAnnotationAttribute"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:513: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 ) ) ) ;
+    // InternalBaseTest.g:513: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;
 
@@ -1360,13 +1360,13 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:516: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.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:517: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 ) ) )
+            // InternalBaseTest.g:516: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 ) ) ) )
+            // InternalBaseTest.g:517: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.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:517: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.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:517: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 ) )
+            // InternalBaseTest.g:517: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 ) ) )
+            // InternalBaseTest.g:517: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.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:517:2: ( ( (lv_optional_0_0= 'optional' ) ) | otherlv_1= 'mandatory' )
+            // InternalBaseTest.g:517:2: ( ( (lv_optional_0_0= 'optional' ) ) | otherlv_1= 'mandatory' )
             int alt10=2;
             int LA10_0 = input.LA(1);
 
@@ -1384,15 +1384,15 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
             }
             switch (alt10) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:517:3: ( (lv_optional_0_0= 'optional' ) )
+                    // InternalBaseTest.g:517:3: ( (lv_optional_0_0= 'optional' ) )
                     {
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:517:3: ( (lv_optional_0_0= 'optional' ) )
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:518:1: (lv_optional_0_0= 'optional' )
+                    // InternalBaseTest.g:517:3: ( (lv_optional_0_0= 'optional' ) )
+                    // InternalBaseTest.g:518:1: (lv_optional_0_0= 'optional' )
                     {
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:518:1: (lv_optional_0_0= 'optional' )
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:519:3: lv_optional_0_0= 'optional'
+                    // InternalBaseTest.g:518:1: (lv_optional_0_0= 'optional' )
+                    // InternalBaseTest.g:519:3: lv_optional_0_0= 'optional'
                     {
-                    lv_optional_0_0=(Token)match(input,21,FOLLOW_21_in_ruleSimpleAnnotationAttribute1083); 
+                    lv_optional_0_0=(Token)match(input,21,FOLLOW_15); 
 
                             newLeafNode(lv_optional_0_0, grammarAccess.getSimpleAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0());
                         
@@ -1412,9 +1412,9 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:533:7: otherlv_1= 'mandatory'
+                    // InternalBaseTest.g:533:7: otherlv_1= 'mandatory'
                     {
-                    otherlv_1=(Token)match(input,22,FOLLOW_22_in_ruleSimpleAnnotationAttribute1114); 
+                    otherlv_1=(Token)match(input,22,FOLLOW_15); 
 
                         	newLeafNode(otherlv_1, grammarAccess.getSimpleAnnotationAttributeAccess().getMandatoryKeyword_0_1());
                         
@@ -1424,17 +1424,17 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_2=(Token)match(input,23,FOLLOW_23_in_ruleSimpleAnnotationAttribute1127); 
+            otherlv_2=(Token)match(input,23,FOLLOW_4); 
 
                 	newLeafNode(otherlv_2, grammarAccess.getSimpleAnnotationAttributeAccess().getAttributeKeyword_1());
                 
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:541:1: ( (lv_name_3_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:542:1: (lv_name_3_0= RULE_ID )
+            // InternalBaseTest.g:541:1: ( (lv_name_3_0= RULE_ID ) )
+            // InternalBaseTest.g:542:1: (lv_name_3_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:542:1: (lv_name_3_0= RULE_ID )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:543:3: lv_name_3_0= RULE_ID
+            // InternalBaseTest.g:542:1: (lv_name_3_0= RULE_ID )
+            // InternalBaseTest.g:543:3: lv_name_3_0= RULE_ID
             {
-            lv_name_3_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleSimpleAnnotationAttribute1144); 
+            lv_name_3_0=(Token)match(input,RULE_ID,FOLLOW_16); 
 
             			newLeafNode(lv_name_3_0, grammarAccess.getSimpleAnnotationAttributeAccess().getNameIDTerminalRuleCall_2_0()); 
             		
@@ -1446,7 +1446,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"name",
                     		lv_name_3_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -1454,20 +1454,20 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_4=(Token)match(input,24,FOLLOW_24_in_ruleSimpleAnnotationAttribute1161); 
+            otherlv_4=(Token)match(input,24,FOLLOW_17); 
 
                 	newLeafNode(otherlv_4, grammarAccess.getSimpleAnnotationAttributeAccess().getColonKeyword_3());
                 
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:563:1: ( (lv_type_5_0= ruleLiteralType ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:564:1: (lv_type_5_0= ruleLiteralType )
+            // InternalBaseTest.g:563:1: ( (lv_type_5_0= ruleLiteralType ) )
+            // InternalBaseTest.g:564:1: (lv_type_5_0= ruleLiteralType )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:564:1: (lv_type_5_0= ruleLiteralType )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:565:3: lv_type_5_0= ruleLiteralType
+            // InternalBaseTest.g:564:1: (lv_type_5_0= ruleLiteralType )
+            // InternalBaseTest.g:565:3: lv_type_5_0= ruleLiteralType
             {
              
             	        newCompositeNode(grammarAccess.getSimpleAnnotationAttributeAccess().getTypeLiteralTypeEnumRuleCall_4_0()); 
             	    
-            pushFollow(FOLLOW_ruleLiteralType_in_ruleSimpleAnnotationAttribute1182);
+            pushFollow(FOLLOW_2);
             lv_type_5_0=ruleLiteralType();
 
             state._fsp--;
@@ -1480,7 +1480,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"type",
                     		lv_type_5_0, 
-                    		"LiteralType");
+                    		"org.eclipse.etrice.core.common.Base.LiteralType");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -1510,7 +1510,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleEnumAnnotationAttribute"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:589:1: entryRuleEnumAnnotationAttribute returns [EObject current=null] : iv_ruleEnumAnnotationAttribute= ruleEnumAnnotationAttribute EOF ;
+    // InternalBaseTest.g:589:1: entryRuleEnumAnnotationAttribute returns [EObject current=null] : iv_ruleEnumAnnotationAttribute= ruleEnumAnnotationAttribute EOF ;
     public final EObject entryRuleEnumAnnotationAttribute() throws RecognitionException {
         EObject current = null;
 
@@ -1518,17 +1518,17 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:590:2: (iv_ruleEnumAnnotationAttribute= ruleEnumAnnotationAttribute EOF )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:591:2: iv_ruleEnumAnnotationAttribute= ruleEnumAnnotationAttribute EOF
+            // InternalBaseTest.g:590:2: (iv_ruleEnumAnnotationAttribute= ruleEnumAnnotationAttribute EOF )
+            // InternalBaseTest.g:591:2: iv_ruleEnumAnnotationAttribute= ruleEnumAnnotationAttribute EOF
             {
              newCompositeNode(grammarAccess.getEnumAnnotationAttributeRule()); 
-            pushFollow(FOLLOW_ruleEnumAnnotationAttribute_in_entryRuleEnumAnnotationAttribute1218);
+            pushFollow(FOLLOW_1);
             iv_ruleEnumAnnotationAttribute=ruleEnumAnnotationAttribute();
 
             state._fsp--;
 
              current =iv_ruleEnumAnnotationAttribute; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleEnumAnnotationAttribute1228); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1546,7 +1546,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleEnumAnnotationAttribute"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:598: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= '}' ) ;
+    // InternalBaseTest.g:598: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;
 
@@ -1564,13 +1564,13 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:601: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.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:602: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= '}' )
+            // InternalBaseTest.g:601: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= '}' ) )
+            // InternalBaseTest.g:602: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.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:602: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.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:602: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= '}'
+            // InternalBaseTest.g:602: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= '}' )
+            // InternalBaseTest.g:602: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.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:602:2: ( ( (lv_optional_0_0= 'optional' ) ) | otherlv_1= 'mandatory' )
+            // InternalBaseTest.g:602:2: ( ( (lv_optional_0_0= 'optional' ) ) | otherlv_1= 'mandatory' )
             int alt11=2;
             int LA11_0 = input.LA(1);
 
@@ -1588,15 +1588,15 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
             }
             switch (alt11) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:602:3: ( (lv_optional_0_0= 'optional' ) )
+                    // InternalBaseTest.g:602:3: ( (lv_optional_0_0= 'optional' ) )
                     {
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:602:3: ( (lv_optional_0_0= 'optional' ) )
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:603:1: (lv_optional_0_0= 'optional' )
+                    // InternalBaseTest.g:602:3: ( (lv_optional_0_0= 'optional' ) )
+                    // InternalBaseTest.g:603:1: (lv_optional_0_0= 'optional' )
                     {
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:603:1: (lv_optional_0_0= 'optional' )
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:604:3: lv_optional_0_0= 'optional'
+                    // InternalBaseTest.g:603:1: (lv_optional_0_0= 'optional' )
+                    // InternalBaseTest.g:604:3: lv_optional_0_0= 'optional'
                     {
-                    lv_optional_0_0=(Token)match(input,21,FOLLOW_21_in_ruleEnumAnnotationAttribute1272); 
+                    lv_optional_0_0=(Token)match(input,21,FOLLOW_15); 
 
                             newLeafNode(lv_optional_0_0, grammarAccess.getEnumAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0());
                         
@@ -1616,9 +1616,9 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:618:7: otherlv_1= 'mandatory'
+                    // InternalBaseTest.g:618:7: otherlv_1= 'mandatory'
                     {
-                    otherlv_1=(Token)match(input,22,FOLLOW_22_in_ruleEnumAnnotationAttribute1303); 
+                    otherlv_1=(Token)match(input,22,FOLLOW_15); 
 
                         	newLeafNode(otherlv_1, grammarAccess.getEnumAnnotationAttributeAccess().getMandatoryKeyword_0_1());
                         
@@ -1628,17 +1628,17 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_2=(Token)match(input,23,FOLLOW_23_in_ruleEnumAnnotationAttribute1316); 
+            otherlv_2=(Token)match(input,23,FOLLOW_4); 
 
                 	newLeafNode(otherlv_2, grammarAccess.getEnumAnnotationAttributeAccess().getAttributeKeyword_1());
                 
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:626:1: ( (lv_name_3_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:627:1: (lv_name_3_0= RULE_ID )
+            // InternalBaseTest.g:626:1: ( (lv_name_3_0= RULE_ID ) )
+            // InternalBaseTest.g:627:1: (lv_name_3_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:627:1: (lv_name_3_0= RULE_ID )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:628:3: lv_name_3_0= RULE_ID
+            // InternalBaseTest.g:627:1: (lv_name_3_0= RULE_ID )
+            // InternalBaseTest.g:628:3: lv_name_3_0= RULE_ID
             {
-            lv_name_3_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEnumAnnotationAttribute1333); 
+            lv_name_3_0=(Token)match(input,RULE_ID,FOLLOW_16); 
 
             			newLeafNode(lv_name_3_0, grammarAccess.getEnumAnnotationAttributeAccess().getNameIDTerminalRuleCall_2_0()); 
             		
@@ -1650,7 +1650,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"name",
                     		lv_name_3_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -1658,21 +1658,21 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_4=(Token)match(input,24,FOLLOW_24_in_ruleEnumAnnotationAttribute1350); 
+            otherlv_4=(Token)match(input,24,FOLLOW_10); 
 
                 	newLeafNode(otherlv_4, grammarAccess.getEnumAnnotationAttributeAccess().getColonKeyword_3());
                 
-            otherlv_5=(Token)match(input,18,FOLLOW_18_in_ruleEnumAnnotationAttribute1362); 
+            otherlv_5=(Token)match(input,18,FOLLOW_18); 
 
                 	newLeafNode(otherlv_5, grammarAccess.getEnumAnnotationAttributeAccess().getLeftCurlyBracketKeyword_4());
                 
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:652:1: ( (lv_values_6_0= RULE_STRING ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:653:1: (lv_values_6_0= RULE_STRING )
+            // InternalBaseTest.g:652:1: ( (lv_values_6_0= RULE_STRING ) )
+            // InternalBaseTest.g:653:1: (lv_values_6_0= RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:653:1: (lv_values_6_0= RULE_STRING )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:654:3: lv_values_6_0= RULE_STRING
+            // InternalBaseTest.g:653:1: (lv_values_6_0= RULE_STRING )
+            // InternalBaseTest.g:654:3: lv_values_6_0= RULE_STRING
             {
-            lv_values_6_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleEnumAnnotationAttribute1379); 
+            lv_values_6_0=(Token)match(input,RULE_STRING,FOLLOW_14); 
 
             			newLeafNode(lv_values_6_0, grammarAccess.getEnumAnnotationAttributeAccess().getValuesSTRINGTerminalRuleCall_5_0()); 
             		
@@ -1684,7 +1684,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"values",
                     		lv_values_6_0, 
-                    		"STRING");
+                    		"org.eclipse.xtext.common.Terminals.STRING");
             	    
 
             }
@@ -1692,7 +1692,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:670:2: (otherlv_7= ',' ( (lv_values_8_0= RULE_STRING ) ) )*
+            // InternalBaseTest.g:670:2: (otherlv_7= ',' ( (lv_values_8_0= RULE_STRING ) ) )*
             loop12:
             do {
                 int alt12=2;
@@ -1705,19 +1705,19 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
                 switch (alt12) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:670:4: otherlv_7= ',' ( (lv_values_8_0= RULE_STRING ) )
+            	    // InternalBaseTest.g:670:4: otherlv_7= ',' ( (lv_values_8_0= RULE_STRING ) )
             	    {
-            	    otherlv_7=(Token)match(input,14,FOLLOW_14_in_ruleEnumAnnotationAttribute1397); 
+            	    otherlv_7=(Token)match(input,14,FOLLOW_18); 
 
             	        	newLeafNode(otherlv_7, grammarAccess.getEnumAnnotationAttributeAccess().getCommaKeyword_6_0());
             	        
-            	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:674:1: ( (lv_values_8_0= RULE_STRING ) )
-            	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:675:1: (lv_values_8_0= RULE_STRING )
+            	    // InternalBaseTest.g:674:1: ( (lv_values_8_0= RULE_STRING ) )
+            	    // InternalBaseTest.g:675:1: (lv_values_8_0= RULE_STRING )
             	    {
-            	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:675:1: (lv_values_8_0= RULE_STRING )
-            	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:676:3: lv_values_8_0= RULE_STRING
+            	    // InternalBaseTest.g:675:1: (lv_values_8_0= RULE_STRING )
+            	    // InternalBaseTest.g:676:3: lv_values_8_0= RULE_STRING
             	    {
-            	    lv_values_8_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleEnumAnnotationAttribute1414); 
+            	    lv_values_8_0=(Token)match(input,RULE_STRING,FOLLOW_14); 
 
             	    			newLeafNode(lv_values_8_0, grammarAccess.getEnumAnnotationAttributeAccess().getValuesSTRINGTerminalRuleCall_6_1_0()); 
             	    		
@@ -1729,7 +1729,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"values",
             	            		lv_values_8_0, 
-            	            		"STRING");
+            	            		"org.eclipse.xtext.common.Terminals.STRING");
             	    	    
 
             	    }
@@ -1746,7 +1746,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
                 }
             } while (true);
 
-            otherlv_9=(Token)match(input,20,FOLLOW_20_in_ruleEnumAnnotationAttribute1433); 
+            otherlv_9=(Token)match(input,20,FOLLOW_2); 
 
                 	newLeafNode(otherlv_9, grammarAccess.getEnumAnnotationAttributeAccess().getRightCurlyBracketKeyword_7());
                 
@@ -1771,7 +1771,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleImportedFQN"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:706:1: entryRuleImportedFQN returns [String current=null] : iv_ruleImportedFQN= ruleImportedFQN EOF ;
+    // InternalBaseTest.g:706:1: entryRuleImportedFQN returns [String current=null] : iv_ruleImportedFQN= ruleImportedFQN EOF ;
     public final String entryRuleImportedFQN() throws RecognitionException {
         String current = null;
 
@@ -1779,17 +1779,17 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:707:2: (iv_ruleImportedFQN= ruleImportedFQN EOF )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:708:2: iv_ruleImportedFQN= ruleImportedFQN EOF
+            // InternalBaseTest.g:707:2: (iv_ruleImportedFQN= ruleImportedFQN EOF )
+            // InternalBaseTest.g:708:2: iv_ruleImportedFQN= ruleImportedFQN EOF
             {
              newCompositeNode(grammarAccess.getImportedFQNRule()); 
-            pushFollow(FOLLOW_ruleImportedFQN_in_entryRuleImportedFQN1472);
+            pushFollow(FOLLOW_1);
             iv_ruleImportedFQN=ruleImportedFQN();
 
             state._fsp--;
 
              current =iv_ruleImportedFQN.getText(); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleImportedFQN1483); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1807,7 +1807,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleImportedFQN"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:715:1: ruleImportedFQN returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_FQN_0= ruleFQN (kw= '.*' )? ) ;
+    // InternalBaseTest.g:715:1: ruleImportedFQN returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_FQN_0= ruleFQN (kw= '.*' )? ) ;
     public final AntlrDatatypeRuleToken ruleImportedFQN() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -1818,16 +1818,16 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:718:28: ( (this_FQN_0= ruleFQN (kw= '.*' )? ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:719:1: (this_FQN_0= ruleFQN (kw= '.*' )? )
+            // InternalBaseTest.g:718:28: ( (this_FQN_0= ruleFQN (kw= '.*' )? ) )
+            // InternalBaseTest.g:719:1: (this_FQN_0= ruleFQN (kw= '.*' )? )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:719:1: (this_FQN_0= ruleFQN (kw= '.*' )? )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:720:5: this_FQN_0= ruleFQN (kw= '.*' )?
+            // InternalBaseTest.g:719:1: (this_FQN_0= ruleFQN (kw= '.*' )? )
+            // InternalBaseTest.g:720:5: this_FQN_0= ruleFQN (kw= '.*' )?
             {
              
                     newCompositeNode(grammarAccess.getImportedFQNAccess().getFQNParserRuleCall_0()); 
                 
-            pushFollow(FOLLOW_ruleFQN_in_ruleImportedFQN1530);
+            pushFollow(FOLLOW_19);
             this_FQN_0=ruleFQN();
 
             state._fsp--;
@@ -1838,7 +1838,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
              
                     afterParserOrEnumRuleCall();
                 
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:730:1: (kw= '.*' )?
+            // InternalBaseTest.g:730:1: (kw= '.*' )?
             int alt13=2;
             int LA13_0 = input.LA(1);
 
@@ -1847,9 +1847,9 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
             }
             switch (alt13) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:731:2: kw= '.*'
+                    // InternalBaseTest.g:731:2: kw= '.*'
                     {
-                    kw=(Token)match(input,25,FOLLOW_25_in_ruleImportedFQN1549); 
+                    kw=(Token)match(input,25,FOLLOW_2); 
 
                             current.merge(kw);
                             newLeafNode(kw, grammarAccess.getImportedFQNAccess().getFullStopAsteriskKeyword_1()); 
@@ -1881,7 +1881,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleDocumentation"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:744:1: entryRuleDocumentation returns [EObject current=null] : iv_ruleDocumentation= ruleDocumentation EOF ;
+    // InternalBaseTest.g:744:1: entryRuleDocumentation returns [EObject current=null] : iv_ruleDocumentation= ruleDocumentation EOF ;
     public final EObject entryRuleDocumentation() throws RecognitionException {
         EObject current = null;
 
@@ -1889,17 +1889,17 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:745:2: (iv_ruleDocumentation= ruleDocumentation EOF )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:746:2: iv_ruleDocumentation= ruleDocumentation EOF
+            // InternalBaseTest.g:745:2: (iv_ruleDocumentation= ruleDocumentation EOF )
+            // InternalBaseTest.g:746:2: iv_ruleDocumentation= ruleDocumentation EOF
             {
              newCompositeNode(grammarAccess.getDocumentationRule()); 
-            pushFollow(FOLLOW_ruleDocumentation_in_entryRuleDocumentation1591);
+            pushFollow(FOLLOW_1);
             iv_ruleDocumentation=ruleDocumentation();
 
             state._fsp--;
 
              current =iv_ruleDocumentation; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDocumentation1601); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1917,7 +1917,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleDocumentation"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:753:1: ruleDocumentation returns [EObject current=null] : ( () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']' ) ;
+    // InternalBaseTest.g:753: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;
 
@@ -1928,14 +1928,14 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:756:28: ( ( () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']' ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:757:1: ( () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']' )
+            // InternalBaseTest.g:756:28: ( ( () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']' ) )
+            // InternalBaseTest.g:757:1: ( () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']' )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:757:1: ( () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']' )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:757:2: () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']'
+            // InternalBaseTest.g:757:1: ( () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']' )
+            // InternalBaseTest.g:757:2: () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']'
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:757:2: ()
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:758:5: 
+            // InternalBaseTest.g:757:2: ()
+            // InternalBaseTest.g:758:5: 
             {
 
                     current = forceCreateModelElement(
@@ -1945,11 +1945,11 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,26,FOLLOW_26_in_ruleDocumentation1647); 
+            otherlv_1=(Token)match(input,26,FOLLOW_20); 
 
                 	newLeafNode(otherlv_1, grammarAccess.getDocumentationAccess().getLeftSquareBracketKeyword_1());
                 
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:767:1: ( (lv_lines_2_0= RULE_STRING ) )*
+            // InternalBaseTest.g:767:1: ( (lv_lines_2_0= RULE_STRING ) )*
             loop14:
             do {
                 int alt14=2;
@@ -1962,12 +1962,12 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
                 switch (alt14) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:768:1: (lv_lines_2_0= RULE_STRING )
+            	    // InternalBaseTest.g:768:1: (lv_lines_2_0= RULE_STRING )
             	    {
-            	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:768:1: (lv_lines_2_0= RULE_STRING )
-            	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:769:3: lv_lines_2_0= RULE_STRING
+            	    // InternalBaseTest.g:768:1: (lv_lines_2_0= RULE_STRING )
+            	    // InternalBaseTest.g:769:3: lv_lines_2_0= RULE_STRING
             	    {
-            	    lv_lines_2_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleDocumentation1664); 
+            	    lv_lines_2_0=(Token)match(input,RULE_STRING,FOLLOW_20); 
 
             	    			newLeafNode(lv_lines_2_0, grammarAccess.getDocumentationAccess().getLinesSTRINGTerminalRuleCall_2_0()); 
             	    		
@@ -1979,7 +1979,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"lines",
             	            		lv_lines_2_0, 
-            	            		"STRING");
+            	            		"org.eclipse.xtext.common.Terminals.STRING");
             	    	    
 
             	    }
@@ -1993,7 +1993,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
                 }
             } while (true);
 
-            otherlv_3=(Token)match(input,27,FOLLOW_27_in_ruleDocumentation1682); 
+            otherlv_3=(Token)match(input,27,FOLLOW_2); 
 
                 	newLeafNode(otherlv_3, grammarAccess.getDocumentationAccess().getRightSquareBracketKeyword_3());
                 
@@ -2018,7 +2018,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleLiteral"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:801:1: entryRuleLiteral returns [EObject current=null] : iv_ruleLiteral= ruleLiteral EOF ;
+    // InternalBaseTest.g:801:1: entryRuleLiteral returns [EObject current=null] : iv_ruleLiteral= ruleLiteral EOF ;
     public final EObject entryRuleLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -2026,17 +2026,17 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:802:2: (iv_ruleLiteral= ruleLiteral EOF )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:803:2: iv_ruleLiteral= ruleLiteral EOF
+            // InternalBaseTest.g:802:2: (iv_ruleLiteral= ruleLiteral EOF )
+            // InternalBaseTest.g:803:2: iv_ruleLiteral= ruleLiteral EOF
             {
              newCompositeNode(grammarAccess.getLiteralRule()); 
-            pushFollow(FOLLOW_ruleLiteral_in_entryRuleLiteral1722);
+            pushFollow(FOLLOW_1);
             iv_ruleLiteral=ruleLiteral();
 
             state._fsp--;
 
              current =iv_ruleLiteral; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleLiteral1732); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2054,7 +2054,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleLiteral"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:810:1: ruleLiteral returns [EObject current=null] : (this_BooleanLiteral_0= ruleBooleanLiteral | this_NumberLiteral_1= ruleNumberLiteral | this_StringLiteral_2= ruleStringLiteral ) ;
+    // InternalBaseTest.g:810: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;
 
@@ -2068,10 +2068,10 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:813:28: ( (this_BooleanLiteral_0= ruleBooleanLiteral | this_NumberLiteral_1= ruleNumberLiteral | this_StringLiteral_2= ruleStringLiteral ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:814:1: (this_BooleanLiteral_0= ruleBooleanLiteral | this_NumberLiteral_1= ruleNumberLiteral | this_StringLiteral_2= ruleStringLiteral )
+            // InternalBaseTest.g:813:28: ( (this_BooleanLiteral_0= ruleBooleanLiteral | this_NumberLiteral_1= ruleNumberLiteral | this_StringLiteral_2= ruleStringLiteral ) )
+            // InternalBaseTest.g:814:1: (this_BooleanLiteral_0= ruleBooleanLiteral | this_NumberLiteral_1= ruleNumberLiteral | this_StringLiteral_2= ruleStringLiteral )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:814:1: (this_BooleanLiteral_0= ruleBooleanLiteral | this_NumberLiteral_1= ruleNumberLiteral | this_StringLiteral_2= ruleStringLiteral )
+            // InternalBaseTest.g:814:1: (this_BooleanLiteral_0= ruleBooleanLiteral | this_NumberLiteral_1= ruleNumberLiteral | this_StringLiteral_2= ruleStringLiteral )
             int alt15=3;
             switch ( input.LA(1) ) {
             case 28:
@@ -2102,12 +2102,12 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
             switch (alt15) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:815:5: this_BooleanLiteral_0= ruleBooleanLiteral
+                    // InternalBaseTest.g:815:5: this_BooleanLiteral_0= ruleBooleanLiteral
                     {
                      
                             newCompositeNode(grammarAccess.getLiteralAccess().getBooleanLiteralParserRuleCall_0()); 
                         
-                    pushFollow(FOLLOW_ruleBooleanLiteral_in_ruleLiteral1779);
+                    pushFollow(FOLLOW_2);
                     this_BooleanLiteral_0=ruleBooleanLiteral();
 
                     state._fsp--;
@@ -2120,12 +2120,12 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:825:5: this_NumberLiteral_1= ruleNumberLiteral
+                    // InternalBaseTest.g:825:5: this_NumberLiteral_1= ruleNumberLiteral
                     {
                      
                             newCompositeNode(grammarAccess.getLiteralAccess().getNumberLiteralParserRuleCall_1()); 
                         
-                    pushFollow(FOLLOW_ruleNumberLiteral_in_ruleLiteral1806);
+                    pushFollow(FOLLOW_2);
                     this_NumberLiteral_1=ruleNumberLiteral();
 
                     state._fsp--;
@@ -2138,12 +2138,12 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:835:5: this_StringLiteral_2= ruleStringLiteral
+                    // InternalBaseTest.g:835:5: this_StringLiteral_2= ruleStringLiteral
                     {
                      
                             newCompositeNode(grammarAccess.getLiteralAccess().getStringLiteralParserRuleCall_2()); 
                         
-                    pushFollow(FOLLOW_ruleStringLiteral_in_ruleLiteral1833);
+                    pushFollow(FOLLOW_2);
                     this_StringLiteral_2=ruleStringLiteral();
 
                     state._fsp--;
@@ -2176,7 +2176,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleBooleanLiteral"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:851:1: entryRuleBooleanLiteral returns [EObject current=null] : iv_ruleBooleanLiteral= ruleBooleanLiteral EOF ;
+    // InternalBaseTest.g:851:1: entryRuleBooleanLiteral returns [EObject current=null] : iv_ruleBooleanLiteral= ruleBooleanLiteral EOF ;
     public final EObject entryRuleBooleanLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -2184,17 +2184,17 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:852:2: (iv_ruleBooleanLiteral= ruleBooleanLiteral EOF )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:853:2: iv_ruleBooleanLiteral= ruleBooleanLiteral EOF
+            // InternalBaseTest.g:852:2: (iv_ruleBooleanLiteral= ruleBooleanLiteral EOF )
+            // InternalBaseTest.g:853:2: iv_ruleBooleanLiteral= ruleBooleanLiteral EOF
             {
              newCompositeNode(grammarAccess.getBooleanLiteralRule()); 
-            pushFollow(FOLLOW_ruleBooleanLiteral_in_entryRuleBooleanLiteral1868);
+            pushFollow(FOLLOW_1);
             iv_ruleBooleanLiteral=ruleBooleanLiteral();
 
             state._fsp--;
 
              current =iv_ruleBooleanLiteral; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleBooleanLiteral1878); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2212,7 +2212,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleBooleanLiteral"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:860:1: ruleBooleanLiteral returns [EObject current=null] : ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) ) ;
+    // InternalBaseTest.g:860:1: ruleBooleanLiteral returns [EObject current=null] : ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) ) ;
     public final EObject ruleBooleanLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -2222,14 +2222,14 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:863:28: ( ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:864:1: ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) )
+            // InternalBaseTest.g:863:28: ( ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) ) )
+            // InternalBaseTest.g:864:1: ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:864:1: ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:864:2: () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) )
+            // InternalBaseTest.g:864:1: ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) )
+            // InternalBaseTest.g:864:2: () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:864:2: ()
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:865:5: 
+            // InternalBaseTest.g:864:2: ()
+            // InternalBaseTest.g:865:5: 
             {
 
                     current = forceCreateModelElement(
@@ -2239,7 +2239,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:870:2: (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) )
+            // InternalBaseTest.g:870:2: (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) )
             int alt16=2;
             int LA16_0 = input.LA(1);
 
@@ -2257,9 +2257,9 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
             }
             switch (alt16) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:870:4: otherlv_1= 'false'
+                    // InternalBaseTest.g:870:4: otherlv_1= 'false'
                     {
-                    otherlv_1=(Token)match(input,28,FOLLOW_28_in_ruleBooleanLiteral1925); 
+                    otherlv_1=(Token)match(input,28,FOLLOW_2); 
 
                         	newLeafNode(otherlv_1, grammarAccess.getBooleanLiteralAccess().getFalseKeyword_1_0());
                         
@@ -2267,15 +2267,15 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:875:6: ( (lv_isTrue_2_0= 'true' ) )
+                    // InternalBaseTest.g:875:6: ( (lv_isTrue_2_0= 'true' ) )
                     {
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:875:6: ( (lv_isTrue_2_0= 'true' ) )
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:876:1: (lv_isTrue_2_0= 'true' )
+                    // InternalBaseTest.g:875:6: ( (lv_isTrue_2_0= 'true' ) )
+                    // InternalBaseTest.g:876:1: (lv_isTrue_2_0= 'true' )
                     {
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:876:1: (lv_isTrue_2_0= 'true' )
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:877:3: lv_isTrue_2_0= 'true'
+                    // InternalBaseTest.g:876:1: (lv_isTrue_2_0= 'true' )
+                    // InternalBaseTest.g:877:3: lv_isTrue_2_0= 'true'
                     {
-                    lv_isTrue_2_0=(Token)match(input,29,FOLLOW_29_in_ruleBooleanLiteral1949); 
+                    lv_isTrue_2_0=(Token)match(input,29,FOLLOW_2); 
 
                             newLeafNode(lv_isTrue_2_0, grammarAccess.getBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0());
                         
@@ -2318,7 +2318,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleNumberLiteral"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:898:1: entryRuleNumberLiteral returns [EObject current=null] : iv_ruleNumberLiteral= ruleNumberLiteral EOF ;
+    // InternalBaseTest.g:898:1: entryRuleNumberLiteral returns [EObject current=null] : iv_ruleNumberLiteral= ruleNumberLiteral EOF ;
     public final EObject entryRuleNumberLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -2326,17 +2326,17 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:899:2: (iv_ruleNumberLiteral= ruleNumberLiteral EOF )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:900:2: iv_ruleNumberLiteral= ruleNumberLiteral EOF
+            // InternalBaseTest.g:899:2: (iv_ruleNumberLiteral= ruleNumberLiteral EOF )
+            // InternalBaseTest.g:900:2: iv_ruleNumberLiteral= ruleNumberLiteral EOF
             {
              newCompositeNode(grammarAccess.getNumberLiteralRule()); 
-            pushFollow(FOLLOW_ruleNumberLiteral_in_entryRuleNumberLiteral1999);
+            pushFollow(FOLLOW_1);
             iv_ruleNumberLiteral=ruleNumberLiteral();
 
             state._fsp--;
 
              current =iv_ruleNumberLiteral; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleNumberLiteral2009); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2354,7 +2354,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleNumberLiteral"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:907:1: ruleNumberLiteral returns [EObject current=null] : (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral ) ;
+    // InternalBaseTest.g:907:1: ruleNumberLiteral returns [EObject current=null] : (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral ) ;
     public final EObject ruleNumberLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -2366,10 +2366,10 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:910:28: ( (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:911:1: (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral )
+            // InternalBaseTest.g:910:28: ( (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral ) )
+            // InternalBaseTest.g:911:1: (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:911:1: (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral )
+            // InternalBaseTest.g:911:1: (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral )
             int alt17=2;
             switch ( input.LA(1) ) {
             case 30:
@@ -2460,12 +2460,12 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
             switch (alt17) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:912:5: this_IntLiteral_0= ruleIntLiteral
+                    // InternalBaseTest.g:912:5: this_IntLiteral_0= ruleIntLiteral
                     {
                      
                             newCompositeNode(grammarAccess.getNumberLiteralAccess().getIntLiteralParserRuleCall_0()); 
                         
-                    pushFollow(FOLLOW_ruleIntLiteral_in_ruleNumberLiteral2056);
+                    pushFollow(FOLLOW_2);
                     this_IntLiteral_0=ruleIntLiteral();
 
                     state._fsp--;
@@ -2478,12 +2478,12 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:922:5: this_RealLiteral_1= ruleRealLiteral
+                    // InternalBaseTest.g:922:5: this_RealLiteral_1= ruleRealLiteral
                     {
                      
                             newCompositeNode(grammarAccess.getNumberLiteralAccess().getRealLiteralParserRuleCall_1()); 
                         
-                    pushFollow(FOLLOW_ruleRealLiteral_in_ruleNumberLiteral2083);
+                    pushFollow(FOLLOW_2);
                     this_RealLiteral_1=ruleRealLiteral();
 
                     state._fsp--;
@@ -2516,7 +2516,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleRealLiteral"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:938:1: entryRuleRealLiteral returns [EObject current=null] : iv_ruleRealLiteral= ruleRealLiteral EOF ;
+    // InternalBaseTest.g:938:1: entryRuleRealLiteral returns [EObject current=null] : iv_ruleRealLiteral= ruleRealLiteral EOF ;
     public final EObject entryRuleRealLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -2524,17 +2524,17 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:939:2: (iv_ruleRealLiteral= ruleRealLiteral EOF )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:940:2: iv_ruleRealLiteral= ruleRealLiteral EOF
+            // InternalBaseTest.g:939:2: (iv_ruleRealLiteral= ruleRealLiteral EOF )
+            // InternalBaseTest.g:940:2: iv_ruleRealLiteral= ruleRealLiteral EOF
             {
              newCompositeNode(grammarAccess.getRealLiteralRule()); 
-            pushFollow(FOLLOW_ruleRealLiteral_in_entryRuleRealLiteral2118);
+            pushFollow(FOLLOW_1);
             iv_ruleRealLiteral=ruleRealLiteral();
 
             state._fsp--;
 
              current =iv_ruleRealLiteral; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRealLiteral2128); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2552,7 +2552,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleRealLiteral"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:947:1: ruleRealLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= ruleReal ) ) ) ;
+    // InternalBaseTest.g:947:1: ruleRealLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= ruleReal ) ) ) ;
     public final EObject ruleRealLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -2562,14 +2562,14 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:950:28: ( ( () ( (lv_value_1_0= ruleReal ) ) ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:951:1: ( () ( (lv_value_1_0= ruleReal ) ) )
+            // InternalBaseTest.g:950:28: ( ( () ( (lv_value_1_0= ruleReal ) ) ) )
+            // InternalBaseTest.g:951:1: ( () ( (lv_value_1_0= ruleReal ) ) )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:951:1: ( () ( (lv_value_1_0= ruleReal ) ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:951:2: () ( (lv_value_1_0= ruleReal ) )
+            // InternalBaseTest.g:951:1: ( () ( (lv_value_1_0= ruleReal ) ) )
+            // InternalBaseTest.g:951:2: () ( (lv_value_1_0= ruleReal ) )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:951:2: ()
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:952:5: 
+            // InternalBaseTest.g:951:2: ()
+            // InternalBaseTest.g:952:5: 
             {
 
                     current = forceCreateModelElement(
@@ -2579,16 +2579,16 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:957:2: ( (lv_value_1_0= ruleReal ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:958:1: (lv_value_1_0= ruleReal )
+            // InternalBaseTest.g:957:2: ( (lv_value_1_0= ruleReal ) )
+            // InternalBaseTest.g:958:1: (lv_value_1_0= ruleReal )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:958:1: (lv_value_1_0= ruleReal )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:959:3: lv_value_1_0= ruleReal
+            // InternalBaseTest.g:958:1: (lv_value_1_0= ruleReal )
+            // InternalBaseTest.g:959:3: lv_value_1_0= ruleReal
             {
              
             	        newCompositeNode(grammarAccess.getRealLiteralAccess().getValueRealParserRuleCall_1_0()); 
             	    
-            pushFollow(FOLLOW_ruleReal_in_ruleRealLiteral2183);
+            pushFollow(FOLLOW_2);
             lv_value_1_0=ruleReal();
 
             state._fsp--;
@@ -2601,7 +2601,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"value",
                     		lv_value_1_0, 
-                    		"Real");
+                    		"org.eclipse.etrice.core.common.Base.Real");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -2631,7 +2631,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleIntLiteral"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:983:1: entryRuleIntLiteral returns [EObject current=null] : iv_ruleIntLiteral= ruleIntLiteral EOF ;
+    // InternalBaseTest.g:983:1: entryRuleIntLiteral returns [EObject current=null] : iv_ruleIntLiteral= ruleIntLiteral EOF ;
     public final EObject entryRuleIntLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -2639,17 +2639,17 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:984:2: (iv_ruleIntLiteral= ruleIntLiteral EOF )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:985:2: iv_ruleIntLiteral= ruleIntLiteral EOF
+            // InternalBaseTest.g:984:2: (iv_ruleIntLiteral= ruleIntLiteral EOF )
+            // InternalBaseTest.g:985:2: iv_ruleIntLiteral= ruleIntLiteral EOF
             {
              newCompositeNode(grammarAccess.getIntLiteralRule()); 
-            pushFollow(FOLLOW_ruleIntLiteral_in_entryRuleIntLiteral2219);
+            pushFollow(FOLLOW_1);
             iv_ruleIntLiteral=ruleIntLiteral();
 
             state._fsp--;
 
              current =iv_ruleIntLiteral; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIntLiteral2229); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2667,7 +2667,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleIntLiteral"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:992:1: ruleIntLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= ruleInteger ) ) ) ;
+    // InternalBaseTest.g:992:1: ruleIntLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= ruleInteger ) ) ) ;
     public final EObject ruleIntLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -2677,14 +2677,14 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:995:28: ( ( () ( (lv_value_1_0= ruleInteger ) ) ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:996:1: ( () ( (lv_value_1_0= ruleInteger ) ) )
+            // InternalBaseTest.g:995:28: ( ( () ( (lv_value_1_0= ruleInteger ) ) ) )
+            // InternalBaseTest.g:996:1: ( () ( (lv_value_1_0= ruleInteger ) ) )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:996:1: ( () ( (lv_value_1_0= ruleInteger ) ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:996:2: () ( (lv_value_1_0= ruleInteger ) )
+            // InternalBaseTest.g:996:1: ( () ( (lv_value_1_0= ruleInteger ) ) )
+            // InternalBaseTest.g:996:2: () ( (lv_value_1_0= ruleInteger ) )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:996:2: ()
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:997:5: 
+            // InternalBaseTest.g:996:2: ()
+            // InternalBaseTest.g:997:5: 
             {
 
                     current = forceCreateModelElement(
@@ -2694,16 +2694,16 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1002:2: ( (lv_value_1_0= ruleInteger ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1003:1: (lv_value_1_0= ruleInteger )
+            // InternalBaseTest.g:1002:2: ( (lv_value_1_0= ruleInteger ) )
+            // InternalBaseTest.g:1003:1: (lv_value_1_0= ruleInteger )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1003:1: (lv_value_1_0= ruleInteger )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1004:3: lv_value_1_0= ruleInteger
+            // InternalBaseTest.g:1003:1: (lv_value_1_0= ruleInteger )
+            // InternalBaseTest.g:1004:3: lv_value_1_0= ruleInteger
             {
              
             	        newCompositeNode(grammarAccess.getIntLiteralAccess().getValueIntegerParserRuleCall_1_0()); 
             	    
-            pushFollow(FOLLOW_ruleInteger_in_ruleIntLiteral2284);
+            pushFollow(FOLLOW_2);
             lv_value_1_0=ruleInteger();
 
             state._fsp--;
@@ -2716,7 +2716,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"value",
                     		lv_value_1_0, 
-                    		"Integer");
+                    		"org.eclipse.etrice.core.common.Base.Integer");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -2746,7 +2746,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleStringLiteral"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1028:1: entryRuleStringLiteral returns [EObject current=null] : iv_ruleStringLiteral= ruleStringLiteral EOF ;
+    // InternalBaseTest.g:1028:1: entryRuleStringLiteral returns [EObject current=null] : iv_ruleStringLiteral= ruleStringLiteral EOF ;
     public final EObject entryRuleStringLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -2754,17 +2754,17 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1029:2: (iv_ruleStringLiteral= ruleStringLiteral EOF )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1030:2: iv_ruleStringLiteral= ruleStringLiteral EOF
+            // InternalBaseTest.g:1029:2: (iv_ruleStringLiteral= ruleStringLiteral EOF )
+            // InternalBaseTest.g:1030:2: iv_ruleStringLiteral= ruleStringLiteral EOF
             {
              newCompositeNode(grammarAccess.getStringLiteralRule()); 
-            pushFollow(FOLLOW_ruleStringLiteral_in_entryRuleStringLiteral2320);
+            pushFollow(FOLLOW_1);
             iv_ruleStringLiteral=ruleStringLiteral();
 
             state._fsp--;
 
              current =iv_ruleStringLiteral; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleStringLiteral2330); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2782,7 +2782,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleStringLiteral"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1037:1: ruleStringLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= RULE_STRING ) ) ) ;
+    // InternalBaseTest.g:1037:1: ruleStringLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= RULE_STRING ) ) ) ;
     public final EObject ruleStringLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -2791,14 +2791,14 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1040:28: ( ( () ( (lv_value_1_0= RULE_STRING ) ) ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1041:1: ( () ( (lv_value_1_0= RULE_STRING ) ) )
+            // InternalBaseTest.g:1040:28: ( ( () ( (lv_value_1_0= RULE_STRING ) ) ) )
+            // InternalBaseTest.g:1041:1: ( () ( (lv_value_1_0= RULE_STRING ) ) )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1041:1: ( () ( (lv_value_1_0= RULE_STRING ) ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1041:2: () ( (lv_value_1_0= RULE_STRING ) )
+            // InternalBaseTest.g:1041:1: ( () ( (lv_value_1_0= RULE_STRING ) ) )
+            // InternalBaseTest.g:1041:2: () ( (lv_value_1_0= RULE_STRING ) )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1041:2: ()
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1042:5: 
+            // InternalBaseTest.g:1041:2: ()
+            // InternalBaseTest.g:1042:5: 
             {
 
                     current = forceCreateModelElement(
@@ -2808,13 +2808,13 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1047:2: ( (lv_value_1_0= RULE_STRING ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1048:1: (lv_value_1_0= RULE_STRING )
+            // InternalBaseTest.g:1047:2: ( (lv_value_1_0= RULE_STRING ) )
+            // InternalBaseTest.g:1048:1: (lv_value_1_0= RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1048:1: (lv_value_1_0= RULE_STRING )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1049:3: lv_value_1_0= RULE_STRING
+            // InternalBaseTest.g:1048:1: (lv_value_1_0= RULE_STRING )
+            // InternalBaseTest.g:1049:3: lv_value_1_0= RULE_STRING
             {
-            lv_value_1_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleStringLiteral2381); 
+            lv_value_1_0=(Token)match(input,RULE_STRING,FOLLOW_2); 
 
             			newLeafNode(lv_value_1_0, grammarAccess.getStringLiteralAccess().getValueSTRINGTerminalRuleCall_1_0()); 
             		
@@ -2826,7 +2826,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"value",
                     		lv_value_1_0, 
-                    		"STRING");
+                    		"org.eclipse.xtext.common.Terminals.STRING");
             	    
 
             }
@@ -2855,7 +2855,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleInteger"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1073:1: entryRuleInteger returns [String current=null] : iv_ruleInteger= ruleInteger EOF ;
+    // InternalBaseTest.g:1073:1: entryRuleInteger returns [String current=null] : iv_ruleInteger= ruleInteger EOF ;
     public final String entryRuleInteger() throws RecognitionException {
         String current = null;
 
@@ -2863,17 +2863,17 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1074:2: (iv_ruleInteger= ruleInteger EOF )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1075:2: iv_ruleInteger= ruleInteger EOF
+            // InternalBaseTest.g:1074:2: (iv_ruleInteger= ruleInteger EOF )
+            // InternalBaseTest.g:1075:2: iv_ruleInteger= ruleInteger EOF
             {
              newCompositeNode(grammarAccess.getIntegerRule()); 
-            pushFollow(FOLLOW_ruleInteger_in_entryRuleInteger2423);
+            pushFollow(FOLLOW_1);
             iv_ruleInteger=ruleInteger();
 
             state._fsp--;
 
              current =iv_ruleInteger.getText(); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleInteger2434); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2891,7 +2891,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleInteger"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1082:1: ruleInteger returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT ) | this_HEX_3= RULE_HEX ) ;
+    // InternalBaseTest.g:1082: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();
 
@@ -2902,10 +2902,10 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1085:28: ( ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT ) | this_HEX_3= RULE_HEX ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1086:1: ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT ) | this_HEX_3= RULE_HEX )
+            // InternalBaseTest.g:1085:28: ( ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT ) | this_HEX_3= RULE_HEX ) )
+            // InternalBaseTest.g:1086:1: ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT ) | this_HEX_3= RULE_HEX )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1086:1: ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT ) | this_HEX_3= RULE_HEX )
+            // InternalBaseTest.g:1086:1: ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT ) | this_HEX_3= RULE_HEX )
             int alt19=2;
             int LA19_0 = input.LA(1);
 
@@ -2923,12 +2923,12 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
             }
             switch (alt19) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1086:2: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT )
+                    // InternalBaseTest.g:1086:2: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT )
                     {
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1086:2: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT )
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1086:3: (kw= '+' | kw= '-' )? this_INT_2= RULE_INT
+                    // InternalBaseTest.g:1086:2: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT )
+                    // InternalBaseTest.g:1086:3: (kw= '+' | kw= '-' )? this_INT_2= RULE_INT
                     {
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1086:3: (kw= '+' | kw= '-' )?
+                    // InternalBaseTest.g:1086:3: (kw= '+' | kw= '-' )?
                     int alt18=3;
                     int LA18_0 = input.LA(1);
 
@@ -2940,9 +2940,9 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
                     }
                     switch (alt18) {
                         case 1 :
-                            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1087:2: kw= '+'
+                            // InternalBaseTest.g:1087:2: kw= '+'
                             {
-                            kw=(Token)match(input,30,FOLLOW_30_in_ruleInteger2474); 
+                            kw=(Token)match(input,30,FOLLOW_21); 
 
                                     current.merge(kw);
                                     newLeafNode(kw, grammarAccess.getIntegerAccess().getPlusSignKeyword_0_0_0()); 
@@ -2951,9 +2951,9 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
                             }
                             break;
                         case 2 :
-                            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1094:2: kw= '-'
+                            // InternalBaseTest.g:1094:2: kw= '-'
                             {
-                            kw=(Token)match(input,31,FOLLOW_31_in_ruleInteger2493); 
+                            kw=(Token)match(input,31,FOLLOW_21); 
 
                                     current.merge(kw);
                                     newLeafNode(kw, grammarAccess.getIntegerAccess().getHyphenMinusKeyword_0_0_1()); 
@@ -2964,7 +2964,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    this_INT_2=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleInteger2510); 
+                    this_INT_2=(Token)match(input,RULE_INT,FOLLOW_2); 
 
                     		current.merge(this_INT_2);
                         
@@ -2978,9 +2978,9 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1107:10: this_HEX_3= RULE_HEX
+                    // InternalBaseTest.g:1107:10: this_HEX_3= RULE_HEX
                     {
-                    this_HEX_3=(Token)match(input,RULE_HEX,FOLLOW_RULE_HEX_in_ruleInteger2537); 
+                    this_HEX_3=(Token)match(input,RULE_HEX,FOLLOW_2); 
 
                     		current.merge(this_HEX_3);
                         
@@ -3011,7 +3011,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleReal"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1122:1: entryRuleReal returns [String current=null] : iv_ruleReal= ruleReal EOF ;
+    // InternalBaseTest.g:1122:1: entryRuleReal returns [String current=null] : iv_ruleReal= ruleReal EOF ;
     public final String entryRuleReal() throws RecognitionException {
         String current = null;
 
@@ -3019,17 +3019,17 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1123:2: (iv_ruleReal= ruleReal EOF )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1124:2: iv_ruleReal= ruleReal EOF
+            // InternalBaseTest.g:1123:2: (iv_ruleReal= ruleReal EOF )
+            // InternalBaseTest.g:1124:2: iv_ruleReal= ruleReal EOF
             {
              newCompositeNode(grammarAccess.getRealRule()); 
-            pushFollow(FOLLOW_ruleReal_in_entryRuleReal2583);
+            pushFollow(FOLLOW_1);
             iv_ruleReal=ruleReal();
 
             state._fsp--;
 
              current =iv_ruleReal.getText(); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleReal2594); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3047,7 +3047,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleReal"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1131:1: ruleReal returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_Decimal_0= ruleDecimal | this_DecimalExp_1= ruleDecimalExp ) ;
+    // InternalBaseTest.g:1131: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();
 
@@ -3059,10 +3059,10 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1134:28: ( (this_Decimal_0= ruleDecimal | this_DecimalExp_1= ruleDecimalExp ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1135:1: (this_Decimal_0= ruleDecimal | this_DecimalExp_1= ruleDecimalExp )
+            // InternalBaseTest.g:1134:28: ( (this_Decimal_0= ruleDecimal | this_DecimalExp_1= ruleDecimalExp ) )
+            // InternalBaseTest.g:1135:1: (this_Decimal_0= ruleDecimal | this_DecimalExp_1= ruleDecimalExp )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1135:1: (this_Decimal_0= ruleDecimal | this_DecimalExp_1= ruleDecimalExp )
+            // InternalBaseTest.g:1135:1: (this_Decimal_0= ruleDecimal | this_DecimalExp_1= ruleDecimalExp )
             int alt20=2;
             switch ( input.LA(1) ) {
             case 30:
@@ -3208,12 +3208,12 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
             switch (alt20) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1136:5: this_Decimal_0= ruleDecimal
+                    // InternalBaseTest.g:1136:5: this_Decimal_0= ruleDecimal
                     {
                      
                             newCompositeNode(grammarAccess.getRealAccess().getDecimalParserRuleCall_0()); 
                         
-                    pushFollow(FOLLOW_ruleDecimal_in_ruleReal2641);
+                    pushFollow(FOLLOW_2);
                     this_Decimal_0=ruleDecimal();
 
                     state._fsp--;
@@ -3228,12 +3228,12 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1148:5: this_DecimalExp_1= ruleDecimalExp
+                    // InternalBaseTest.g:1148:5: this_DecimalExp_1= ruleDecimalExp
                     {
                      
                             newCompositeNode(grammarAccess.getRealAccess().getDecimalExpParserRuleCall_1()); 
                         
-                    pushFollow(FOLLOW_ruleDecimalExp_in_ruleReal2674);
+                    pushFollow(FOLLOW_2);
                     this_DecimalExp_1=ruleDecimalExp();
 
                     state._fsp--;
@@ -3268,7 +3268,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleDecimal"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1166:1: entryRuleDecimal returns [String current=null] : iv_ruleDecimal= ruleDecimal EOF ;
+    // InternalBaseTest.g:1166:1: entryRuleDecimal returns [String current=null] : iv_ruleDecimal= ruleDecimal EOF ;
     public final String entryRuleDecimal() throws RecognitionException {
         String current = null;
 
@@ -3279,17 +3279,17 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
         	
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1170:2: (iv_ruleDecimal= ruleDecimal EOF )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1171:2: iv_ruleDecimal= ruleDecimal EOF
+            // InternalBaseTest.g:1170:2: (iv_ruleDecimal= ruleDecimal EOF )
+            // InternalBaseTest.g:1171:2: iv_ruleDecimal= ruleDecimal EOF
             {
              newCompositeNode(grammarAccess.getDecimalRule()); 
-            pushFollow(FOLLOW_ruleDecimal_in_entryRuleDecimal2726);
+            pushFollow(FOLLOW_1);
             iv_ruleDecimal=ruleDecimal();
 
             state._fsp--;
 
              current =iv_ruleDecimal.getText(); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDecimal2737); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3310,7 +3310,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleDecimal"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1181:1: ruleDecimal returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT ) ;
+    // InternalBaseTest.g:1181: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();
 
@@ -3322,13 +3322,13 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
             
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1185:28: ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1186:1: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT )
+            // InternalBaseTest.g:1185:28: ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT ) )
+            // InternalBaseTest.g:1186:1: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1186:1: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1186:2: (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT
+            // InternalBaseTest.g:1186:1: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT )
+            // InternalBaseTest.g:1186:2: (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1186:2: (kw= '+' | kw= '-' )?
+            // InternalBaseTest.g:1186:2: (kw= '+' | kw= '-' )?
             int alt21=3;
             int LA21_0 = input.LA(1);
 
@@ -3340,9 +3340,9 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
             }
             switch (alt21) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1187:2: kw= '+'
+                    // InternalBaseTest.g:1187:2: kw= '+'
                     {
-                    kw=(Token)match(input,30,FOLLOW_30_in_ruleDecimal2780); 
+                    kw=(Token)match(input,30,FOLLOW_21); 
 
                             current.merge(kw);
                             newLeafNode(kw, grammarAccess.getDecimalAccess().getPlusSignKeyword_0_0()); 
@@ -3351,9 +3351,9 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1194:2: kw= '-'
+                    // InternalBaseTest.g:1194:2: kw= '-'
                     {
-                    kw=(Token)match(input,31,FOLLOW_31_in_ruleDecimal2799); 
+                    kw=(Token)match(input,31,FOLLOW_21); 
 
                             current.merge(kw);
                             newLeafNode(kw, grammarAccess.getDecimalAccess().getHyphenMinusKeyword_0_1()); 
@@ -3364,19 +3364,19 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
             }
 
-            this_INT_2=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleDecimal2816); 
+            this_INT_2=(Token)match(input,RULE_INT,FOLLOW_22); 
 
             		current.merge(this_INT_2);
                 
              
                 newLeafNode(this_INT_2, grammarAccess.getDecimalAccess().getINTTerminalRuleCall_1()); 
                 
-            kw=(Token)match(input,32,FOLLOW_32_in_ruleDecimal2834); 
+            kw=(Token)match(input,32,FOLLOW_21); 
 
                     current.merge(kw);
                     newLeafNode(kw, grammarAccess.getDecimalAccess().getFullStopKeyword_2()); 
                 
-            this_INT_4=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleDecimal2849); 
+            this_INT_4=(Token)match(input,RULE_INT,FOLLOW_2); 
 
             		current.merge(this_INT_4);
                 
@@ -3407,7 +3407,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleDecimalExp"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1230:1: entryRuleDecimalExp returns [String current=null] : iv_ruleDecimalExp= ruleDecimalExp EOF ;
+    // InternalBaseTest.g:1230:1: entryRuleDecimalExp returns [String current=null] : iv_ruleDecimalExp= ruleDecimalExp EOF ;
     public final String entryRuleDecimalExp() throws RecognitionException {
         String current = null;
 
@@ -3418,17 +3418,17 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
         	
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1234:2: (iv_ruleDecimalExp= ruleDecimalExp EOF )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1235:2: iv_ruleDecimalExp= ruleDecimalExp EOF
+            // InternalBaseTest.g:1234:2: (iv_ruleDecimalExp= ruleDecimalExp EOF )
+            // InternalBaseTest.g:1235:2: iv_ruleDecimalExp= ruleDecimalExp EOF
             {
              newCompositeNode(grammarAccess.getDecimalExpRule()); 
-            pushFollow(FOLLOW_ruleDecimalExp_in_entryRuleDecimalExp2905);
+            pushFollow(FOLLOW_1);
             iv_ruleDecimalExp=ruleDecimalExp();
 
             state._fsp--;
 
              current =iv_ruleDecimalExp.getText(); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDecimalExp2916); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3449,7 +3449,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleDecimalExp"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1245: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 ) ;
+    // InternalBaseTest.g:1245: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();
 
@@ -3462,13 +3462,13 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
             
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1249: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.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1250: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 )
+            // InternalBaseTest.g:1249: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 ) )
+            // InternalBaseTest.g:1250: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.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1250: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.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1250: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
+            // InternalBaseTest.g:1250: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 )
+            // InternalBaseTest.g:1250: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.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1250:2: (kw= '+' | kw= '-' )?
+            // InternalBaseTest.g:1250:2: (kw= '+' | kw= '-' )?
             int alt22=3;
             int LA22_0 = input.LA(1);
 
@@ -3480,9 +3480,9 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
             }
             switch (alt22) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1251:2: kw= '+'
+                    // InternalBaseTest.g:1251:2: kw= '+'
                     {
-                    kw=(Token)match(input,30,FOLLOW_30_in_ruleDecimalExp2959); 
+                    kw=(Token)match(input,30,FOLLOW_21); 
 
                             current.merge(kw);
                             newLeafNode(kw, grammarAccess.getDecimalExpAccess().getPlusSignKeyword_0_0()); 
@@ -3491,9 +3491,9 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1258:2: kw= '-'
+                    // InternalBaseTest.g:1258:2: kw= '-'
                     {
-                    kw=(Token)match(input,31,FOLLOW_31_in_ruleDecimalExp2978); 
+                    kw=(Token)match(input,31,FOLLOW_21); 
 
                             current.merge(kw);
                             newLeafNode(kw, grammarAccess.getDecimalExpAccess().getHyphenMinusKeyword_0_1()); 
@@ -3504,26 +3504,26 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
             }
 
-            this_INT_2=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleDecimalExp2995); 
+            this_INT_2=(Token)match(input,RULE_INT,FOLLOW_22); 
 
             		current.merge(this_INT_2);
                 
              
                 newLeafNode(this_INT_2, grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_1()); 
                 
-            kw=(Token)match(input,32,FOLLOW_32_in_ruleDecimalExp3013); 
+            kw=(Token)match(input,32,FOLLOW_21); 
 
                     current.merge(kw);
                     newLeafNode(kw, grammarAccess.getDecimalExpAccess().getFullStopKeyword_2()); 
                 
-            this_INT_4=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleDecimalExp3028); 
+            this_INT_4=(Token)match(input,RULE_INT,FOLLOW_23); 
 
             		current.merge(this_INT_4);
                 
              
                 newLeafNode(this_INT_4, grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_3()); 
                 
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1283:1: (kw= 'e' | kw= 'E' )
+            // InternalBaseTest.g:1283:1: (kw= 'e' | kw= 'E' )
             int alt23=2;
             int LA23_0 = input.LA(1);
 
@@ -3541,9 +3541,9 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
             }
             switch (alt23) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1284:2: kw= 'e'
+                    // InternalBaseTest.g:1284:2: kw= 'e'
                     {
-                    kw=(Token)match(input,33,FOLLOW_33_in_ruleDecimalExp3047); 
+                    kw=(Token)match(input,33,FOLLOW_24); 
 
                             current.merge(kw);
                             newLeafNode(kw, grammarAccess.getDecimalExpAccess().getEKeyword_4_0()); 
@@ -3552,9 +3552,9 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1291:2: kw= 'E'
+                    // InternalBaseTest.g:1291:2: kw= 'E'
                     {
-                    kw=(Token)match(input,34,FOLLOW_34_in_ruleDecimalExp3066); 
+                    kw=(Token)match(input,34,FOLLOW_24); 
 
                             current.merge(kw);
                             newLeafNode(kw, grammarAccess.getDecimalExpAccess().getEKeyword_4_1()); 
@@ -3565,7 +3565,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1296:2: (kw= '+' | kw= '-' )?
+            // InternalBaseTest.g:1296:2: (kw= '+' | kw= '-' )?
             int alt24=3;
             int LA24_0 = input.LA(1);
 
@@ -3577,9 +3577,9 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
             }
             switch (alt24) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1297:2: kw= '+'
+                    // InternalBaseTest.g:1297:2: kw= '+'
                     {
-                    kw=(Token)match(input,30,FOLLOW_30_in_ruleDecimalExp3081); 
+                    kw=(Token)match(input,30,FOLLOW_21); 
 
                             current.merge(kw);
                             newLeafNode(kw, grammarAccess.getDecimalExpAccess().getPlusSignKeyword_5_0()); 
@@ -3588,9 +3588,9 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1304:2: kw= '-'
+                    // InternalBaseTest.g:1304:2: kw= '-'
                     {
-                    kw=(Token)match(input,31,FOLLOW_31_in_ruleDecimalExp3100); 
+                    kw=(Token)match(input,31,FOLLOW_21); 
 
                             current.merge(kw);
                             newLeafNode(kw, grammarAccess.getDecimalExpAccess().getHyphenMinusKeyword_5_1()); 
@@ -3601,7 +3601,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
             }
 
-            this_INT_9=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleDecimalExp3117); 
+            this_INT_9=(Token)match(input,RULE_INT,FOLLOW_2); 
 
             		current.merge(this_INT_9);
                 
@@ -3632,7 +3632,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleFQN"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1327:1: entryRuleFQN returns [String current=null] : iv_ruleFQN= ruleFQN EOF ;
+    // InternalBaseTest.g:1327:1: entryRuleFQN returns [String current=null] : iv_ruleFQN= ruleFQN EOF ;
     public final String entryRuleFQN() throws RecognitionException {
         String current = null;
 
@@ -3640,17 +3640,17 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1328:2: (iv_ruleFQN= ruleFQN EOF )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1329:2: iv_ruleFQN= ruleFQN EOF
+            // InternalBaseTest.g:1328:2: (iv_ruleFQN= ruleFQN EOF )
+            // InternalBaseTest.g:1329:2: iv_ruleFQN= ruleFQN EOF
             {
              newCompositeNode(grammarAccess.getFQNRule()); 
-            pushFollow(FOLLOW_ruleFQN_in_entryRuleFQN3167);
+            pushFollow(FOLLOW_1);
             iv_ruleFQN=ruleFQN();
 
             state._fsp--;
 
              current =iv_ruleFQN.getText(); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleFQN3178); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3668,7 +3668,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleFQN"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1336:1: ruleFQN returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* ) ;
+    // InternalBaseTest.g:1336: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();
 
@@ -3679,20 +3679,20 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1339:28: ( (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1340:1: (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* )
+            // InternalBaseTest.g:1339:28: ( (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* ) )
+            // InternalBaseTest.g:1340:1: (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1340:1: (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1340:6: this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )*
+            // InternalBaseTest.g:1340:1: (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* )
+            // InternalBaseTest.g:1340:6: this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )*
             {
-            this_ID_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFQN3218); 
+            this_ID_0=(Token)match(input,RULE_ID,FOLLOW_25); 
 
             		current.merge(this_ID_0);
                 
              
                 newLeafNode(this_ID_0, grammarAccess.getFQNAccess().getIDTerminalRuleCall_0()); 
                 
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1347:1: (kw= '.' this_ID_2= RULE_ID )*
+            // InternalBaseTest.g:1347:1: (kw= '.' this_ID_2= RULE_ID )*
             loop25:
             do {
                 int alt25=2;
@@ -3705,14 +3705,14 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
                 switch (alt25) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1348:2: kw= '.' this_ID_2= RULE_ID
+            	    // InternalBaseTest.g:1348:2: kw= '.' this_ID_2= RULE_ID
             	    {
-            	    kw=(Token)match(input,32,FOLLOW_32_in_ruleFQN3237); 
+            	    kw=(Token)match(input,32,FOLLOW_4); 
 
             	            current.merge(kw);
             	            newLeafNode(kw, grammarAccess.getFQNAccess().getFullStopKeyword_1_0()); 
             	        
-            	    this_ID_2=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFQN3252); 
+            	    this_ID_2=(Token)match(input,RULE_ID,FOLLOW_25); 
 
             	    		current.merge(this_ID_2);
             	        
@@ -3749,7 +3749,7 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleLiteralType"
-    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1368:1: ruleLiteralType returns [Enumerator current=null] : ( (enumLiteral_0= 'ptBoolean' ) | (enumLiteral_1= 'ptInteger' ) | (enumLiteral_2= 'ptReal' ) | (enumLiteral_3= 'ptCharacter' ) ) ;
+    // InternalBaseTest.g:1368: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;
 
@@ -3760,10 +3760,10 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
          enterRule(); 
         try {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1370:28: ( ( (enumLiteral_0= 'ptBoolean' ) | (enumLiteral_1= 'ptInteger' ) | (enumLiteral_2= 'ptReal' ) | (enumLiteral_3= 'ptCharacter' ) ) )
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1371:1: ( (enumLiteral_0= 'ptBoolean' ) | (enumLiteral_1= 'ptInteger' ) | (enumLiteral_2= 'ptReal' ) | (enumLiteral_3= 'ptCharacter' ) )
+            // InternalBaseTest.g:1370:28: ( ( (enumLiteral_0= 'ptBoolean' ) | (enumLiteral_1= 'ptInteger' ) | (enumLiteral_2= 'ptReal' ) | (enumLiteral_3= 'ptCharacter' ) ) )
+            // InternalBaseTest.g:1371:1: ( (enumLiteral_0= 'ptBoolean' ) | (enumLiteral_1= 'ptInteger' ) | (enumLiteral_2= 'ptReal' ) | (enumLiteral_3= 'ptCharacter' ) )
             {
-            // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1371:1: ( (enumLiteral_0= 'ptBoolean' ) | (enumLiteral_1= 'ptInteger' ) | (enumLiteral_2= 'ptReal' ) | (enumLiteral_3= 'ptCharacter' ) )
+            // InternalBaseTest.g:1371:1: ( (enumLiteral_0= 'ptBoolean' ) | (enumLiteral_1= 'ptInteger' ) | (enumLiteral_2= 'ptReal' ) | (enumLiteral_3= 'ptCharacter' ) )
             int alt26=4;
             switch ( input.LA(1) ) {
             case 35:
@@ -3795,12 +3795,12 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
             switch (alt26) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1371:2: (enumLiteral_0= 'ptBoolean' )
+                    // InternalBaseTest.g:1371:2: (enumLiteral_0= 'ptBoolean' )
                     {
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1371:2: (enumLiteral_0= 'ptBoolean' )
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1371:4: enumLiteral_0= 'ptBoolean'
+                    // InternalBaseTest.g:1371:2: (enumLiteral_0= 'ptBoolean' )
+                    // InternalBaseTest.g:1371:4: enumLiteral_0= 'ptBoolean'
                     {
-                    enumLiteral_0=(Token)match(input,35,FOLLOW_35_in_ruleLiteralType3313); 
+                    enumLiteral_0=(Token)match(input,35,FOLLOW_2); 
 
                             current = grammarAccess.getLiteralTypeAccess().getBOOLEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
                             newLeafNode(enumLiteral_0, grammarAccess.getLiteralTypeAccess().getBOOLEnumLiteralDeclaration_0()); 
@@ -3812,12 +3812,12 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1377:6: (enumLiteral_1= 'ptInteger' )
+                    // InternalBaseTest.g:1377:6: (enumLiteral_1= 'ptInteger' )
                     {
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1377:6: (enumLiteral_1= 'ptInteger' )
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1377:8: enumLiteral_1= 'ptInteger'
+                    // InternalBaseTest.g:1377:6: (enumLiteral_1= 'ptInteger' )
+                    // InternalBaseTest.g:1377:8: enumLiteral_1= 'ptInteger'
                     {
-                    enumLiteral_1=(Token)match(input,36,FOLLOW_36_in_ruleLiteralType3330); 
+                    enumLiteral_1=(Token)match(input,36,FOLLOW_2); 
 
                             current = grammarAccess.getLiteralTypeAccess().getINTEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
                             newLeafNode(enumLiteral_1, grammarAccess.getLiteralTypeAccess().getINTEnumLiteralDeclaration_1()); 
@@ -3829,12 +3829,12 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1383:6: (enumLiteral_2= 'ptReal' )
+                    // InternalBaseTest.g:1383:6: (enumLiteral_2= 'ptReal' )
                     {
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1383:6: (enumLiteral_2= 'ptReal' )
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1383:8: enumLiteral_2= 'ptReal'
+                    // InternalBaseTest.g:1383:6: (enumLiteral_2= 'ptReal' )
+                    // InternalBaseTest.g:1383:8: enumLiteral_2= 'ptReal'
                     {
-                    enumLiteral_2=(Token)match(input,37,FOLLOW_37_in_ruleLiteralType3347); 
+                    enumLiteral_2=(Token)match(input,37,FOLLOW_2); 
 
                             current = grammarAccess.getLiteralTypeAccess().getREALEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
                             newLeafNode(enumLiteral_2, grammarAccess.getLiteralTypeAccess().getREALEnumLiteralDeclaration_2()); 
@@ -3846,12 +3846,12 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 4 :
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1389:6: (enumLiteral_3= 'ptCharacter' )
+                    // InternalBaseTest.g:1389:6: (enumLiteral_3= 'ptCharacter' )
                     {
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1389:6: (enumLiteral_3= 'ptCharacter' )
-                    // ../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/parser/antlr/internal/InternalBaseTest.g:1389:8: enumLiteral_3= 'ptCharacter'
+                    // InternalBaseTest.g:1389:6: (enumLiteral_3= 'ptCharacter' )
+                    // InternalBaseTest.g:1389:8: enumLiteral_3= 'ptCharacter'
                     {
-                    enumLiteral_3=(Token)match(input,38,FOLLOW_38_in_ruleLiteralType3364); 
+                    enumLiteral_3=(Token)match(input,38,FOLLOW_2); 
 
                             current = grammarAccess.getLiteralTypeAccess().getCHAREnumLiteralDeclaration_3().getEnumLiteral().getInstance();
                             newLeafNode(enumLiteral_3, grammarAccess.getLiteralTypeAccess().getCHAREnumLiteralDeclaration_3()); 
@@ -3886,135 +3886,30 @@ public class InternalBaseTestParser extends AbstractInternalAntlrParser {
 
  
 
-    public static final BitSet FOLLOW_ruleBaseModel_in_entryRuleBaseModel75 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleBaseModel85 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAnnotation_in_ruleBaseModel132 = new BitSet(new long[]{0x0000000000021002L});
-    public static final BitSet FOLLOW_ruleAnnotationType_in_ruleBaseModel151 = new BitSet(new long[]{0x0000000000021002L});
-    public static final BitSet FOLLOW_ruleAnnotation_in_entryRuleAnnotation190 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAnnotation200 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_12_in_ruleAnnotation237 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleFQN_in_ruleAnnotation260 = new BitSet(new long[]{0x0000000000002002L});
-    public static final BitSet FOLLOW_13_in_ruleAnnotation273 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleKeyValue_in_ruleAnnotation294 = new BitSet(new long[]{0x000000000000C000L});
-    public static final BitSet FOLLOW_14_in_ruleAnnotation307 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleKeyValue_in_ruleAnnotation328 = new BitSet(new long[]{0x000000000000C000L});
-    public static final BitSet FOLLOW_15_in_ruleAnnotation342 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleKeyValue_in_entryRuleKeyValue380 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleKeyValue390 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleKeyValue432 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_16_in_ruleKeyValue449 = new BitSet(new long[]{0x00000000F00000E0L});
-    public static final BitSet FOLLOW_ruleLiteral_in_ruleKeyValue470 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAnnotationType_in_entryRuleAnnotationType506 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAnnotationType516 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_17_in_ruleAnnotationType553 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleAnnotationType570 = new BitSet(new long[]{0x0000000004040000L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_ruleAnnotationType596 = new BitSet(new long[]{0x0000000000040000L});
-    public static final BitSet FOLLOW_18_in_ruleAnnotationType609 = new BitSet(new long[]{0x0000000000080000L});
-    public static final BitSet FOLLOW_19_in_ruleAnnotationType621 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_16_in_ruleAnnotationType633 = new BitSet(new long[]{0x0000000000040010L});
-    public static final BitSet FOLLOW_ruleAnnotationTargetType_in_ruleAnnotationType655 = new BitSet(new long[]{0x0000000000700000L});
-    public static final BitSet FOLLOW_18_in_ruleAnnotationType674 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleAnnotationTargetType_in_ruleAnnotationType695 = new BitSet(new long[]{0x0000000000104000L});
-    public static final BitSet FOLLOW_14_in_ruleAnnotationType708 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleAnnotationTargetType_in_ruleAnnotationType729 = new BitSet(new long[]{0x0000000000104000L});
-    public static final BitSet FOLLOW_20_in_ruleAnnotationType743 = new BitSet(new long[]{0x0000000000700000L});
-    public static final BitSet FOLLOW_ruleAnnotationAttribute_in_ruleAnnotationType766 = new BitSet(new long[]{0x0000000000700000L});
-    public static final BitSet FOLLOW_20_in_ruleAnnotationType779 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAnnotationTargetType_in_entryRuleAnnotationTargetType816 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAnnotationTargetType827 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleAnnotationTargetType866 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAnnotationAttribute_in_entryRuleAnnotationAttribute910 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAnnotationAttribute920 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleAnnotationAttribute_in_ruleAnnotationAttribute967 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleEnumAnnotationAttribute_in_ruleAnnotationAttribute994 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleAnnotationAttribute_in_entryRuleSimpleAnnotationAttribute1029 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSimpleAnnotationAttribute1039 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_21_in_ruleSimpleAnnotationAttribute1083 = new BitSet(new long[]{0x0000000000800000L});
-    public static final BitSet FOLLOW_22_in_ruleSimpleAnnotationAttribute1114 = new BitSet(new long[]{0x0000000000800000L});
-    public static final BitSet FOLLOW_23_in_ruleSimpleAnnotationAttribute1127 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleSimpleAnnotationAttribute1144 = new BitSet(new long[]{0x0000000001000000L});
-    public static final BitSet FOLLOW_24_in_ruleSimpleAnnotationAttribute1161 = new BitSet(new long[]{0x0000007800000000L});
-    public static final BitSet FOLLOW_ruleLiteralType_in_ruleSimpleAnnotationAttribute1182 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleEnumAnnotationAttribute_in_entryRuleEnumAnnotationAttribute1218 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleEnumAnnotationAttribute1228 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_21_in_ruleEnumAnnotationAttribute1272 = new BitSet(new long[]{0x0000000000800000L});
-    public static final BitSet FOLLOW_22_in_ruleEnumAnnotationAttribute1303 = new BitSet(new long[]{0x0000000000800000L});
-    public static final BitSet FOLLOW_23_in_ruleEnumAnnotationAttribute1316 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleEnumAnnotationAttribute1333 = new BitSet(new long[]{0x0000000001000000L});
-    public static final BitSet FOLLOW_24_in_ruleEnumAnnotationAttribute1350 = new BitSet(new long[]{0x0000000000040000L});
-    public static final BitSet FOLLOW_18_in_ruleEnumAnnotationAttribute1362 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleEnumAnnotationAttribute1379 = new BitSet(new long[]{0x0000000000104000L});
-    public static final BitSet FOLLOW_14_in_ruleEnumAnnotationAttribute1397 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleEnumAnnotationAttribute1414 = new BitSet(new long[]{0x0000000000104000L});
-    public static final BitSet FOLLOW_20_in_ruleEnumAnnotationAttribute1433 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleImportedFQN_in_entryRuleImportedFQN1472 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleImportedFQN1483 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_ruleImportedFQN1530 = new BitSet(new long[]{0x0000000002000002L});
-    public static final BitSet FOLLOW_25_in_ruleImportedFQN1549 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_entryRuleDocumentation1591 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDocumentation1601 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_26_in_ruleDocumentation1647 = new BitSet(new long[]{0x0000000008000020L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleDocumentation1664 = new BitSet(new long[]{0x0000000008000020L});
-    public static final BitSet FOLLOW_27_in_ruleDocumentation1682 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLiteral_in_entryRuleLiteral1722 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleLiteral1732 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleBooleanLiteral_in_ruleLiteral1779 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNumberLiteral_in_ruleLiteral1806 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStringLiteral_in_ruleLiteral1833 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleBooleanLiteral_in_entryRuleBooleanLiteral1868 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleBooleanLiteral1878 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_ruleBooleanLiteral1925 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_ruleBooleanLiteral1949 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNumberLiteral_in_entryRuleNumberLiteral1999 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleNumberLiteral2009 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntLiteral_in_ruleNumberLiteral2056 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRealLiteral_in_ruleNumberLiteral2083 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRealLiteral_in_entryRuleRealLiteral2118 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRealLiteral2128 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleReal_in_ruleRealLiteral2183 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntLiteral_in_entryRuleIntLiteral2219 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIntLiteral2229 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInteger_in_ruleIntLiteral2284 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStringLiteral_in_entryRuleStringLiteral2320 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleStringLiteral2330 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleStringLiteral2381 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInteger_in_entryRuleInteger2423 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleInteger2434 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_30_in_ruleInteger2474 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_31_in_ruleInteger2493 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleInteger2510 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_HEX_in_ruleInteger2537 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleReal_in_entryRuleReal2583 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleReal2594 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDecimal_in_ruleReal2641 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDecimalExp_in_ruleReal2674 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDecimal_in_entryRuleDecimal2726 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDecimal2737 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_30_in_ruleDecimal2780 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_31_in_ruleDecimal2799 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleDecimal2816 = new BitSet(new long[]{0x0000000100000000L});
-    public static final BitSet FOLLOW_32_in_ruleDecimal2834 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleDecimal2849 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDecimalExp_in_entryRuleDecimalExp2905 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDecimalExp2916 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_30_in_ruleDecimalExp2959 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_31_in_ruleDecimalExp2978 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleDecimalExp2995 = new BitSet(new long[]{0x0000000100000000L});
-    public static final BitSet FOLLOW_32_in_ruleDecimalExp3013 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleDecimalExp3028 = new BitSet(new long[]{0x0000000600000000L});
-    public static final BitSet FOLLOW_33_in_ruleDecimalExp3047 = new BitSet(new long[]{0x00000000C0000040L});
-    public static final BitSet FOLLOW_34_in_ruleDecimalExp3066 = new BitSet(new long[]{0x00000000C0000040L});
-    public static final BitSet FOLLOW_30_in_ruleDecimalExp3081 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_31_in_ruleDecimalExp3100 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleDecimalExp3117 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_entryRuleFQN3167 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleFQN3178 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleFQN3218 = new BitSet(new long[]{0x0000000100000002L});
-    public static final BitSet FOLLOW_32_in_ruleFQN3237 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleFQN3252 = new BitSet(new long[]{0x0000000100000002L});
-    public static final BitSet FOLLOW_35_in_ruleLiteralType3313 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_36_in_ruleLiteralType3330 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_37_in_ruleLiteralType3347 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_38_in_ruleLiteralType3364 = 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[]{0x0000000000021002L});
+    public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x0000000000002002L});
+    public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x000000000000C000L});
+    public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x0000000000010000L});
+    public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x00000000F00000E0L});
+    public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x0000000004040000L});
+    public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0000000000040000L});
+    public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0000000000080000L});
+    public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0000000000040010L});
+    public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000000000700000L});
+    public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x0000000000104000L});
+    public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0000000000800000L});
+    public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x0000000001000000L});
+    public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0000007800000000L});
+    public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0000000002000002L});
+    public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x0000000008000020L});
+    public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x0000000000000040L});
+    public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0000000100000000L});
+    public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x0000000600000000L});
+    public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x00000000C0000040L});
+    public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x0000000100000002L});
 
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/serializer/BaseSemanticSequencer.java b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/serializer/BaseSemanticSequencer.java
index d9012f71f..2f783d5e4 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/serializer/BaseSemanticSequencer.java
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/serializer/BaseSemanticSequencer.java
@@ -1,8 +1,12 @@
+/*
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.common.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;
@@ -17,15 +21,12 @@ import org.eclipse.etrice.core.common.base.RealLiteral;
 import org.eclipse.etrice.core.common.base.SimpleAnnotationAttribute;
 import org.eclipse.etrice.core.common.base.StringLiteral;
 import org.eclipse.etrice.core.common.services.BaseGrammarAccess;
-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.AbstractDelegatingSemanticSequencer;
-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")
@@ -34,93 +35,59 @@ public class BaseSemanticSequencer extends AbstractDelegatingSemanticSequencer {
 	@Inject
 	private BaseGrammarAccess 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; 
 			}
-		if (errorAcceptor != null) errorAcceptor.accept(diagnosticProvider.createInvalidContextOrTypeDiagnostic(semanticObject, context));
+		if (errorAcceptor != null)
+			errorAcceptor.accept(diagnosticProvider.createInvalidContextOrTypeDiagnostic(semanticObject, context));
 	}
 	
 	/**
+	 * Contexts:
+	 *     AnnotationType returns AnnotationType
+	 *
 	 * Constraint:
 	 *     (
 	 *         name=ID 
@@ -129,85 +96,108 @@ public class BaseSemanticSequencer extends AbstractDelegatingSemanticSequencer {
 	 *         attributes+=AnnotationAttribute*
 	 *     )
 	 */
-	protected void sequence_AnnotationType(EObject context, AnnotationType semanticObject) {
+	protected void sequence_AnnotationType(ISerializationContext context, AnnotationType semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Annotation returns Annotation
+	 *
 	 * Constraint:
 	 *     (type=[AnnotationType|FQN] (attributes+=KeyValue attributes+=KeyValue*)?)
 	 */
-	protected void sequence_Annotation(EObject context, Annotation semanticObject) {
+	protected void sequence_Annotation(ISerializationContext context, Annotation semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Literal returns BooleanLiteral
+	 *     BooleanLiteral returns BooleanLiteral
+	 *
 	 * Constraint:
-	 *     (isTrue?='true'?)
+	 *     isTrue?='true'?
 	 */
-	protected void sequence_BooleanLiteral(EObject context, BooleanLiteral semanticObject) {
+	protected void sequence_BooleanLiteral(ISerializationContext context, BooleanLiteral semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Documentation returns Documentation
+	 *
 	 * Constraint:
-	 *     (lines+=STRING*)
+	 *     lines+=STRING*
 	 */
-	protected void sequence_Documentation(EObject context, Documentation semanticObject) {
+	protected void sequence_Documentation(ISerializationContext context, Documentation semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     AnnotationAttribute returns EnumAnnotationAttribute
+	 *     EnumAnnotationAttribute returns EnumAnnotationAttribute
+	 *
 	 * Constraint:
 	 *     (optional?='optional'? name=ID values+=STRING values+=STRING*)
 	 */
-	protected void sequence_EnumAnnotationAttribute(EObject context, EnumAnnotationAttribute semanticObject) {
+	protected void sequence_EnumAnnotationAttribute(ISerializationContext context, EnumAnnotationAttribute semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Import returns Import
+	 *
 	 * Constraint:
 	 *     (importedNamespace=ImportedFQN? importURI=STRING)
 	 */
-	protected void sequence_Import(EObject context, Import semanticObject) {
+	protected void sequence_Import(ISerializationContext context, Import semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Literal returns IntLiteral
+	 *     NumberLiteral returns IntLiteral
+	 *     IntLiteral returns IntLiteral
+	 *
 	 * Constraint:
 	 *     value=Integer
 	 */
-	protected void sequence_IntLiteral(EObject context, IntLiteral semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, BasePackage.Literals.INT_LITERAL__VALUE) == ValueTransient.YES)
+	protected void sequence_IntLiteral(ISerializationContext context, IntLiteral semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, BasePackage.Literals.INT_LITERAL__VALUE) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, BasePackage.Literals.INT_LITERAL__VALUE));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
 		feeder.accept(grammarAccess.getIntLiteralAccess().getValueIntegerParserRuleCall_1_0(), semanticObject.getValue());
 		feeder.finish();
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     KeyValue returns KeyValue
+	 *
 	 * Constraint:
 	 *     (key=ID value=Literal)
 	 */
-	protected void sequence_KeyValue(EObject context, KeyValue semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, BasePackage.Literals.KEY_VALUE__KEY) == ValueTransient.YES)
+	protected void sequence_KeyValue(ISerializationContext context, KeyValue semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, BasePackage.Literals.KEY_VALUE__KEY) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, BasePackage.Literals.KEY_VALUE__KEY));
-			if(transientValues.isValueTransient(semanticObject, BasePackage.Literals.KEY_VALUE__VALUE) == ValueTransient.YES)
+			if (transientValues.isValueTransient(semanticObject, BasePackage.Literals.KEY_VALUE__VALUE) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, BasePackage.Literals.KEY_VALUE__VALUE));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
 		feeder.accept(grammarAccess.getKeyValueAccess().getKeyIDTerminalRuleCall_0_0(), semanticObject.getKey());
 		feeder.accept(grammarAccess.getKeyValueAccess().getValueLiteralParserRuleCall_2_0(), semanticObject.getValue());
 		feeder.finish();
@@ -215,51 +205,67 @@ public class BaseSemanticSequencer extends AbstractDelegatingSemanticSequencer {
 	
 	
 	/**
+	 * Contexts:
+	 *     LiteralArray returns LiteralArray
+	 *
 	 * Constraint:
 	 *     (literals+=Literal literals+=Literal*)
 	 */
-	protected void sequence_LiteralArray(EObject context, LiteralArray semanticObject) {
+	protected void sequence_LiteralArray(ISerializationContext context, LiteralArray semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Literal returns RealLiteral
+	 *     NumberLiteral returns RealLiteral
+	 *     RealLiteral returns RealLiteral
+	 *
 	 * Constraint:
 	 *     value=Real
 	 */
-	protected void sequence_RealLiteral(EObject context, RealLiteral semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, BasePackage.Literals.REAL_LITERAL__VALUE) == ValueTransient.YES)
+	protected void sequence_RealLiteral(ISerializationContext context, RealLiteral semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, BasePackage.Literals.REAL_LITERAL__VALUE) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, BasePackage.Literals.REAL_LITERAL__VALUE));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
 		feeder.accept(grammarAccess.getRealLiteralAccess().getValueRealParserRuleCall_1_0(), semanticObject.getValue());
 		feeder.finish();
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     AnnotationAttribute returns SimpleAnnotationAttribute
+	 *     SimpleAnnotationAttribute returns SimpleAnnotationAttribute
+	 *
 	 * Constraint:
 	 *     (optional?='optional'? name=ID type=LiteralType)
 	 */
-	protected void sequence_SimpleAnnotationAttribute(EObject context, SimpleAnnotationAttribute semanticObject) {
+	protected void sequence_SimpleAnnotationAttribute(ISerializationContext context, SimpleAnnotationAttribute semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Literal returns StringLiteral
+	 *     StringLiteral returns StringLiteral
+	 *
 	 * Constraint:
 	 *     value=STRING
 	 */
-	protected void sequence_StringLiteral(EObject context, StringLiteral semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, BasePackage.Literals.STRING_LITERAL__VALUE) == ValueTransient.YES)
+	protected void sequence_StringLiteral(ISerializationContext context, StringLiteral semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, BasePackage.Literals.STRING_LITERAL__VALUE) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, BasePackage.Literals.STRING_LITERAL__VALUE));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
 		feeder.accept(grammarAccess.getStringLiteralAccess().getValueSTRINGTerminalRuleCall_1_0(), semanticObject.getValue());
 		feeder.finish();
 	}
+	
+	
 }
diff --git a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/serializer/BaseSyntacticSequencer.java b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/serializer/BaseSyntacticSequencer.java
index 4220a62d4..4034c9896 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/serializer/BaseSyntacticSequencer.java
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/serializer/BaseSyntacticSequencer.java
@@ -1,3 +1,6 @@
+/*
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.common.serializer;
 
 import com.google.inject.Inject;
diff --git a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/serializer/BaseTestSemanticSequencer.java b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/serializer/BaseTestSemanticSequencer.java
index e9069c900..37619ddb8 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/serializer/BaseTestSemanticSequencer.java
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/serializer/BaseTestSemanticSequencer.java
@@ -1,8 +1,12 @@
+/*
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.common.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;
@@ -18,14 +22,11 @@ import org.eclipse.etrice.core.common.base.SimpleAnnotationAttribute;
 import org.eclipse.etrice.core.common.base.StringLiteral;
 import org.eclipse.etrice.core.common.basetest.BaseModel;
 import org.eclipse.etrice.core.common.basetest.BasetestPackage;
-import org.eclipse.etrice.core.common.serializer.BaseSemanticSequencer;
 import org.eclipse.etrice.core.common.services.BaseTestGrammarAccess;
-import org.eclipse.xtext.serializer.acceptor.ISemanticSequenceAcceptor;
-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.ISemanticSequencer;
-import org.eclipse.xtext.serializer.sequencer.ITransientValueService;
+import org.eclipse.xtext.Action;
+import org.eclipse.xtext.Parameter;
+import org.eclipse.xtext.ParserRule;
+import org.eclipse.xtext.serializer.ISerializationContext;
 
 @SuppressWarnings("all")
 public class BaseTestSemanticSequencer extends BaseSemanticSequencer {
@@ -33,105 +34,71 @@ public class BaseTestSemanticSequencer extends BaseSemanticSequencer {
 	@Inject
 	private BaseTestGrammarAccess 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() == BasetestPackage.eINSTANCE) switch(semanticObject.eClass().getClassifierID()) {
+		else if (epackage == BasetestPackage.eINSTANCE)
+			switch (semanticObject.eClass().getClassifierID()) {
 			case BasetestPackage.BASE_MODEL:
-				if(context == grammarAccess.getBaseModelRule()) {
-					sequence_BaseModel(context, (BaseModel) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_BaseModel(context, (BaseModel) semanticObject); 
+				return; 
 			}
-		if (errorAcceptor != null) errorAcceptor.accept(diagnosticProvider.createInvalidContextOrTypeDiagnostic(semanticObject, context));
+		if (errorAcceptor != null)
+			errorAcceptor.accept(diagnosticProvider.createInvalidContextOrTypeDiagnostic(semanticObject, context));
 	}
 	
 	/**
+	 * Contexts:
+	 *     BaseModel returns BaseModel
+	 *
 	 * Constraint:
-	 *     (elements+=Annotation | elements+=AnnotationType)*
+	 *     (elements+=Annotation | elements+=AnnotationType)+
 	 */
-	protected void sequence_BaseModel(EObject context, BaseModel semanticObject) {
+	protected void sequence_BaseModel(ISerializationContext context, BaseModel semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
+	
+	
 }
diff --git a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/serializer/BaseTestSyntacticSequencer.java b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/serializer/BaseTestSyntacticSequencer.java
index db5541b85..9f1a35bec 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/serializer/BaseTestSyntacticSequencer.java
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/serializer/BaseTestSyntacticSequencer.java
@@ -1,3 +1,6 @@
+/*
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.common.serializer;
 
 import com.google.inject.Inject;
diff --git a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/services/BaseGrammarAccess.java b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/services/BaseGrammarAccess.java
index 931408aec..13841db93 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/services/BaseGrammarAccess.java
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/services/BaseGrammarAccess.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.common.services;
 
 import com.google.inject.Singleton;
@@ -19,7 +19,7 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 	
 	
 	public class AnnotationElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Annotation");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.common.Base.Annotation");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cCommercialAtKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cTypeAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -38,13 +38,13 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 		//// **************************************************************
 		//// AnnotationType and Annotation Rules
 		//Annotation:
-		//	"@" type=[AnnotationType|FQN] ("(" attributes+=KeyValue ("," attributes+=KeyValue)* ")")?;
-		public ParserRule getRule() { return rule; }
+		//	'@' type=[AnnotationType|FQN] ('(' attributes+=KeyValue (',' attributes+=KeyValue)* ')')?;
+		@Override public ParserRule getRule() { return rule; }
 
-		//"@" type=[AnnotationType|FQN] ("(" attributes+=KeyValue ("," attributes+=KeyValue)* ")")?
+		//'@' type=[AnnotationType|FQN] ('(' attributes+=KeyValue (',' attributes+=KeyValue)* ')')?
 		public Group getGroup() { return cGroup; }
 
-		//"@"
+		//'@'
 		public Keyword getCommercialAtKeyword_0() { return cCommercialAtKeyword_0; }
 
 		//type=[AnnotationType|FQN]
@@ -56,10 +56,10 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 		//FQN
 		public RuleCall getTypeAnnotationTypeFQNParserRuleCall_1_0_1() { return cTypeAnnotationTypeFQNParserRuleCall_1_0_1; }
 
-		//("(" attributes+=KeyValue ("," attributes+=KeyValue)* ")")?
+		//('(' attributes+=KeyValue (',' attributes+=KeyValue)* ')')?
 		public Group getGroup_2() { return cGroup_2; }
 
-		//"("
+		//'('
 		public Keyword getLeftParenthesisKeyword_2_0() { return cLeftParenthesisKeyword_2_0; }
 
 		//attributes+=KeyValue
@@ -68,10 +68,10 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 		//KeyValue
 		public RuleCall getAttributesKeyValueParserRuleCall_2_1_0() { return cAttributesKeyValueParserRuleCall_2_1_0; }
 
-		//("," attributes+=KeyValue)*
+		//(',' attributes+=KeyValue)*
 		public Group getGroup_2_2() { return cGroup_2_2; }
 
-		//","
+		//','
 		public Keyword getCommaKeyword_2_2_0() { return cCommaKeyword_2_2_0; }
 
 		//attributes+=KeyValue
@@ -80,12 +80,12 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 		//KeyValue
 		public RuleCall getAttributesKeyValueParserRuleCall_2_2_1_0() { return cAttributesKeyValueParserRuleCall_2_2_1_0; }
 
-		//")"
+		//')'
 		public Keyword getRightParenthesisKeyword_2_3() { return cRightParenthesisKeyword_2_3; }
 	}
 
 	public class KeyValueElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "KeyValue");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.common.Base.KeyValue");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Assignment cKeyAssignment_0 = (Assignment)cGroup.eContents().get(0);
 		private final RuleCall cKeyIDTerminalRuleCall_0_0 = (RuleCall)cKeyAssignment_0.eContents().get(0);
@@ -94,10 +94,10 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cValueLiteralParserRuleCall_2_0 = (RuleCall)cValueAssignment_2.eContents().get(0);
 		
 		//KeyValue:
-		//	key=ID "=" value=Literal;
-		public ParserRule getRule() { return rule; }
+		//	key=ID '=' value=Literal;
+		@Override public ParserRule getRule() { return rule; }
 
-		//key=ID "=" value=Literal
+		//key=ID '=' value=Literal
 		public Group getGroup() { return cGroup; }
 
 		//key=ID
@@ -106,7 +106,7 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 		//ID
 		public RuleCall getKeyIDTerminalRuleCall_0_0() { return cKeyIDTerminalRuleCall_0_0; }
 
-		//"="
+		//'='
 		public Keyword getEqualsSignKeyword_1() { return cEqualsSignKeyword_1; }
 
 		//value=Literal
@@ -117,7 +117,7 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class AnnotationTypeElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "AnnotationType");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.common.Base.AnnotationType");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cAnnotationTypeKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -144,15 +144,17 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cRightCurlyBracketKeyword_8 = (Keyword)cGroup.eContents().get(8);
 		
 		//AnnotationType:
-		//	"AnnotationType" name=ID docu=Documentation? "{" "target" "=" (targets+=AnnotationTargetType | "{"
-		//	targets+=AnnotationTargetType ("," targets+=AnnotationTargetType)* "}") attributes+=AnnotationAttribute* "}";
-		public ParserRule getRule() { return rule; }
-
-		//"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*
+		//	'}';
+		@Override public ParserRule getRule() { return rule; }
+
+		//'AnnotationType' name=ID docu=Documentation? '{' 'target' '=' (targets+=AnnotationTargetType | '{'
+		//targets+=AnnotationTargetType (',' targets+=AnnotationTargetType)* '}') attributes+=AnnotationAttribute* '}'
 		public Group getGroup() { return cGroup; }
 
-		//"AnnotationType"
+		//'AnnotationType'
 		public Keyword getAnnotationTypeKeyword_0() { return cAnnotationTypeKeyword_0; }
 
 		//name=ID
@@ -167,16 +169,16 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 		//Documentation
 		public RuleCall getDocuDocumentationParserRuleCall_2_0() { return cDocuDocumentationParserRuleCall_2_0; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_3() { return cLeftCurlyBracketKeyword_3; }
 
-		//"target"
+		//'target'
 		public Keyword getTargetKeyword_4() { return cTargetKeyword_4; }
 
-		//"="
+		//'='
 		public Keyword getEqualsSignKeyword_5() { return cEqualsSignKeyword_5; }
 
-		//targets+=AnnotationTargetType | "{" targets+=AnnotationTargetType ("," targets+=AnnotationTargetType)* "}"
+		//(targets+=AnnotationTargetType | '{' targets+=AnnotationTargetType (',' targets+=AnnotationTargetType)* '}')
 		public Alternatives getAlternatives_6() { return cAlternatives_6; }
 
 		//targets+=AnnotationTargetType
@@ -185,10 +187,10 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 		//AnnotationTargetType
 		public RuleCall getTargetsAnnotationTargetTypeParserRuleCall_6_0_0() { return cTargetsAnnotationTargetTypeParserRuleCall_6_0_0; }
 
-		//"{" targets+=AnnotationTargetType ("," targets+=AnnotationTargetType)* "}"
+		//'{' targets+=AnnotationTargetType (',' targets+=AnnotationTargetType)* '}'
 		public Group getGroup_6_1() { return cGroup_6_1; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_6_1_0() { return cLeftCurlyBracketKeyword_6_1_0; }
 
 		//targets+=AnnotationTargetType
@@ -197,10 +199,10 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 		//AnnotationTargetType
 		public RuleCall getTargetsAnnotationTargetTypeParserRuleCall_6_1_1_0() { return cTargetsAnnotationTargetTypeParserRuleCall_6_1_1_0; }
 
-		//("," targets+=AnnotationTargetType)*
+		//(',' targets+=AnnotationTargetType)*
 		public Group getGroup_6_1_2() { return cGroup_6_1_2; }
 
-		//","
+		//','
 		public Keyword getCommaKeyword_6_1_2_0() { return cCommaKeyword_6_1_2_0; }
 
 		//targets+=AnnotationTargetType
@@ -209,7 +211,7 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 		//AnnotationTargetType
 		public RuleCall getTargetsAnnotationTargetTypeParserRuleCall_6_1_2_1_0() { return cTargetsAnnotationTargetTypeParserRuleCall_6_1_2_1_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_6_1_3() { return cRightCurlyBracketKeyword_6_1_3; }
 
 		//attributes+=AnnotationAttribute*
@@ -218,12 +220,12 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 		//AnnotationAttribute
 		public RuleCall getAttributesAnnotationAttributeParserRuleCall_7_0() { return cAttributesAnnotationAttributeParserRuleCall_7_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_8() { return cRightCurlyBracketKeyword_8; }
 	}
 
 	public class AnnotationTargetTypeElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "AnnotationTargetType");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.common.Base.AnnotationTargetType");
 		private final RuleCall cIDTerminalRuleCall = (RuleCall)rule.eContents().get(1);
 		
 		////
@@ -236,21 +238,21 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 		////
 		//AnnotationTargetType:
 		//	ID;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//ID
 		public RuleCall getIDTerminalRuleCall() { return cIDTerminalRuleCall; }
 	}
 
 	public class AnnotationAttributeElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "AnnotationAttribute");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.common.Base.AnnotationAttribute");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final RuleCall cSimpleAnnotationAttributeParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final RuleCall cEnumAnnotationAttributeParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
 		
 		//AnnotationAttribute:
 		//	SimpleAnnotationAttribute | EnumAnnotationAttribute;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//SimpleAnnotationAttribute | EnumAnnotationAttribute
 		public Alternatives getAlternatives() { return cAlternatives; }
@@ -263,7 +265,7 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class SimpleAnnotationAttributeElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "SimpleAnnotationAttribute");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.common.Base.SimpleAnnotationAttribute");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Alternatives cAlternatives_0 = (Alternatives)cGroup.eContents().get(0);
 		private final Assignment cOptionalAssignment_0_0 = (Assignment)cAlternatives_0.eContents().get(0);
@@ -277,25 +279,25 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cTypeLiteralTypeEnumRuleCall_4_0 = (RuleCall)cTypeAssignment_4.eContents().get(0);
 		
 		//SimpleAnnotationAttribute:
-		//	(optional?="optional" | "mandatory") "attribute" name=ID ":" type=LiteralType;
-		public ParserRule getRule() { return rule; }
+		//	(optional?='optional' | 'mandatory') 'attribute' name=ID ':' type=LiteralType;
+		@Override public ParserRule getRule() { return rule; }
 
-		//(optional?="optional" | "mandatory") "attribute" name=ID ":" type=LiteralType
+		//(optional?='optional' | 'mandatory') 'attribute' name=ID ':' type=LiteralType
 		public Group getGroup() { return cGroup; }
 
-		//optional?="optional" | "mandatory"
+		//(optional?='optional' | 'mandatory')
 		public Alternatives getAlternatives_0() { return cAlternatives_0; }
 
-		//optional?="optional"
+		//optional?='optional'
 		public Assignment getOptionalAssignment_0_0() { return cOptionalAssignment_0_0; }
 
-		//"optional"
+		//'optional'
 		public Keyword getOptionalOptionalKeyword_0_0_0() { return cOptionalOptionalKeyword_0_0_0; }
 
-		//"mandatory"
+		//'mandatory'
 		public Keyword getMandatoryKeyword_0_1() { return cMandatoryKeyword_0_1; }
 
-		//"attribute"
+		//'attribute'
 		public Keyword getAttributeKeyword_1() { return cAttributeKeyword_1; }
 
 		//name=ID
@@ -304,7 +306,7 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 		//ID
 		public RuleCall getNameIDTerminalRuleCall_2_0() { return cNameIDTerminalRuleCall_2_0; }
 
-		//":"
+		//':'
 		public Keyword getColonKeyword_3() { return cColonKeyword_3; }
 
 		//type=LiteralType
@@ -315,7 +317,7 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class EnumAnnotationAttributeElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "EnumAnnotationAttribute");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.common.Base.EnumAnnotationAttribute");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Alternatives cAlternatives_0 = (Alternatives)cGroup.eContents().get(0);
 		private final Assignment cOptionalAssignment_0_0 = (Assignment)cAlternatives_0.eContents().get(0);
@@ -335,25 +337,25 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cRightCurlyBracketKeyword_7 = (Keyword)cGroup.eContents().get(7);
 		
 		//EnumAnnotationAttribute:
-		//	(optional?="optional" | "mandatory") "attribute" name=ID ":" "{" values+=STRING ("," values+=STRING)* "}";
-		public ParserRule getRule() { return rule; }
+		//	(optional?='optional' | 'mandatory') 'attribute' name=ID ':' '{' values+=STRING (',' values+=STRING)* '}';
+		@Override public ParserRule getRule() { return rule; }
 
-		//(optional?="optional" | "mandatory") "attribute" name=ID ":" "{" values+=STRING ("," values+=STRING)* "}"
+		//(optional?='optional' | 'mandatory') 'attribute' name=ID ':' '{' values+=STRING (',' values+=STRING)* '}'
 		public Group getGroup() { return cGroup; }
 
-		//optional?="optional" | "mandatory"
+		//(optional?='optional' | 'mandatory')
 		public Alternatives getAlternatives_0() { return cAlternatives_0; }
 
-		//optional?="optional"
+		//optional?='optional'
 		public Assignment getOptionalAssignment_0_0() { return cOptionalAssignment_0_0; }
 
-		//"optional"
+		//'optional'
 		public Keyword getOptionalOptionalKeyword_0_0_0() { return cOptionalOptionalKeyword_0_0_0; }
 
-		//"mandatory"
+		//'mandatory'
 		public Keyword getMandatoryKeyword_0_1() { return cMandatoryKeyword_0_1; }
 
-		//"attribute"
+		//'attribute'
 		public Keyword getAttributeKeyword_1() { return cAttributeKeyword_1; }
 
 		//name=ID
@@ -362,10 +364,10 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 		//ID
 		public RuleCall getNameIDTerminalRuleCall_2_0() { return cNameIDTerminalRuleCall_2_0; }
 
-		//":"
+		//':'
 		public Keyword getColonKeyword_3() { return cColonKeyword_3; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_4() { return cLeftCurlyBracketKeyword_4; }
 
 		//values+=STRING
@@ -374,10 +376,10 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 		//STRING
 		public RuleCall getValuesSTRINGTerminalRuleCall_5_0() { return cValuesSTRINGTerminalRuleCall_5_0; }
 
-		//("," values+=STRING)*
+		//(',' values+=STRING)*
 		public Group getGroup_6() { return cGroup_6; }
 
-		//","
+		//','
 		public Keyword getCommaKeyword_6_0() { return cCommaKeyword_6_0; }
 
 		//values+=STRING
@@ -386,12 +388,12 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 		//STRING
 		public RuleCall getValuesSTRINGTerminalRuleCall_6_1_0() { return cValuesSTRINGTerminalRuleCall_6_1_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_7() { return cRightCurlyBracketKeyword_7; }
 	}
 
 	public class ImportElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Import");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.common.Base.Import");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cImportKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Alternatives cAlternatives_1 = (Alternatives)cGroup.eContents().get(1);
@@ -424,19 +426,19 @@ public class BaseGrammarAccess 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;
-		public ParserRule getRule() { return rule; }
+		//	'import' (importedNamespace=ImportedFQN 'from' | 'model') importURI=STRING;
+		@Override public ParserRule getRule() { return rule; }
 
-		//"import" (importedNamespace=ImportedFQN "from" | "model") importURI=STRING
+		//'import' (importedNamespace=ImportedFQN 'from' | 'model') importURI=STRING
 		public Group getGroup() { return cGroup; }
 
-		//"import"
+		//'import'
 		public Keyword getImportKeyword_0() { return cImportKeyword_0; }
 
-		//importedNamespace=ImportedFQN "from" | "model"
+		//(importedNamespace=ImportedFQN 'from' | 'model')
 		public Alternatives getAlternatives_1() { return cAlternatives_1; }
 
-		//importedNamespace=ImportedFQN "from"
+		//importedNamespace=ImportedFQN 'from'
 		public Group getGroup_1_0() { return cGroup_1_0; }
 
 		//importedNamespace=ImportedFQN
@@ -445,10 +447,10 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 		//ImportedFQN
 		public RuleCall getImportedNamespaceImportedFQNParserRuleCall_1_0_0_0() { return cImportedNamespaceImportedFQNParserRuleCall_1_0_0_0; }
 
-		//"from"
+		//'from'
 		public Keyword getFromKeyword_1_0_1() { return cFromKeyword_1_0_1; }
 
-		//"model"
+		//'model'
 		public Keyword getModelKeyword_1_1() { return cModelKeyword_1_1; }
 
 		//importURI=STRING
@@ -459,27 +461,27 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class ImportedFQNElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ImportedFQN");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.common.Base.ImportedFQN");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final RuleCall cFQNParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0);
 		private final Keyword cFullStopAsteriskKeyword_1 = (Keyword)cGroup.eContents().get(1);
 		
 		//ImportedFQN:
-		//	FQN ".*"?;
-		public ParserRule getRule() { return rule; }
+		//	FQN '.*'?;
+		@Override public ParserRule getRule() { return rule; }
 
-		//FQN ".*"?
+		//FQN '.*'?
 		public Group getGroup() { return cGroup; }
 
 		//FQN
 		public RuleCall getFQNParserRuleCall_0() { return cFQNParserRuleCall_0; }
 
-		//".*"?
+		//'.*'?
 		public Keyword getFullStopAsteriskKeyword_1() { return cFullStopAsteriskKeyword_1; }
 	}
 
 	public class DocumentationElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Documentation");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.common.Base.Documentation");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Action cDocumentationAction_0 = (Action)cGroup.eContents().get(0);
 		private final Keyword cLeftSquareBracketKeyword_1 = (Keyword)cGroup.eContents().get(1);
@@ -490,16 +492,19 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 		//// **************************************************************
 		//// Documentation Rule
 		//Documentation:
-		//	{Documentation} "[" lines+=STRING* "]";
-		public ParserRule getRule() { return rule; }
+		//	{Documentation}
+		//	'['
+		//	lines+=STRING*
+		//	']';
+		@Override public ParserRule getRule() { return rule; }
 
-		//{Documentation} "[" lines+=STRING* "]"
+		//{Documentation} '[' lines+=STRING* ']'
 		public Group getGroup() { return cGroup; }
 
 		//{Documentation}
 		public Action getDocumentationAction_0() { return cDocumentationAction_0; }
 
-		//"["
+		//'['
 		public Keyword getLeftSquareBracketKeyword_1() { return cLeftSquareBracketKeyword_1; }
 
 		//lines+=STRING*
@@ -508,12 +513,12 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 		//STRING
 		public RuleCall getLinesSTRINGTerminalRuleCall_2_0() { return cLinesSTRINGTerminalRuleCall_2_0; }
 
-		//"]"
+		//']'
 		public Keyword getRightSquareBracketKeyword_3() { return cRightSquareBracketKeyword_3; }
 	}
 
 	public class TIMEElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "TIME");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.common.Base.TIME");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final Group cGroup_0 = (Group)cAlternatives.eContents().get(0);
 		private final RuleCall cINTTerminalRuleCall_0_0 = (RuleCall)cGroup_0.eContents().get(0);
@@ -530,52 +535,52 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//// **************************************************************
 		//// Time Rule
-		//TIME returns ecore::ELong:
-		//	INT "s" | INT "ms" | INT "us" | INT "ns";
-		public ParserRule getRule() { return rule; }
+		//TIME ecore::ELong:
+		//	INT 's' | INT 'ms' | INT 'us' | INT 'ns'
+		@Override public ParserRule getRule() { return rule; }
 
-		//INT "s" | INT "ms" | INT "us" | INT "ns"
+		//INT 's' | INT 'ms' | INT 'us' | INT 'ns'
 		public Alternatives getAlternatives() { return cAlternatives; }
 
-		//INT "s"
+		//INT 's'
 		public Group getGroup_0() { return cGroup_0; }
 
 		//INT
 		public RuleCall getINTTerminalRuleCall_0_0() { return cINTTerminalRuleCall_0_0; }
 
-		//"s"
+		//'s'
 		public Keyword getSKeyword_0_1() { return cSKeyword_0_1; }
 
-		//INT "ms"
+		//INT 'ms'
 		public Group getGroup_1() { return cGroup_1; }
 
 		//INT
 		public RuleCall getINTTerminalRuleCall_1_0() { return cINTTerminalRuleCall_1_0; }
 
-		//"ms"
+		//'ms'
 		public Keyword getMsKeyword_1_1() { return cMsKeyword_1_1; }
 
-		//INT "us"
+		//INT 'us'
 		public Group getGroup_2() { return cGroup_2; }
 
 		//INT
 		public RuleCall getINTTerminalRuleCall_2_0() { return cINTTerminalRuleCall_2_0; }
 
-		//"us"
+		//'us'
 		public Keyword getUsKeyword_2_1() { return cUsKeyword_2_1; }
 
-		//INT "ns"
+		//INT 'ns'
 		public Group getGroup_3() { return cGroup_3; }
 
 		//INT
 		public RuleCall getINTTerminalRuleCall_3_0() { return cINTTerminalRuleCall_3_0; }
 
-		//"ns"
+		//'ns'
 		public Keyword getNsKeyword_3_1() { return cNsKeyword_3_1; }
 	}
 
 	public class LiteralArrayElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "LiteralArray");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.common.Base.LiteralArray");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Assignment cLiteralsAssignment_0 = (Assignment)cGroup.eContents().get(0);
 		private final RuleCall cLiteralsLiteralParserRuleCall_0_0 = (RuleCall)cLiteralsAssignment_0.eContents().get(0);
@@ -585,10 +590,10 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cLiteralsLiteralParserRuleCall_1_1_0 = (RuleCall)cLiteralsAssignment_1_1.eContents().get(0);
 		
 		//LiteralArray:
-		//	literals+=Literal ("," literals+=Literal)*;
-		public ParserRule getRule() { return rule; }
+		//	literals+=Literal (',' literals+=Literal)*;
+		@Override public ParserRule getRule() { return rule; }
 
-		//literals+=Literal ("," literals+=Literal)*
+		//literals+=Literal (',' literals+=Literal)*
 		public Group getGroup() { return cGroup; }
 
 		//literals+=Literal
@@ -597,10 +602,10 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 		//Literal
 		public RuleCall getLiteralsLiteralParserRuleCall_0_0() { return cLiteralsLiteralParserRuleCall_0_0; }
 
-		//("," literals+=Literal)*
+		//(',' literals+=Literal)*
 		public Group getGroup_1() { return cGroup_1; }
 
-		//","
+		//','
 		public Keyword getCommaKeyword_1_0() { return cCommaKeyword_1_0; }
 
 		//literals+=Literal
@@ -611,7 +616,7 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class LiteralElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Literal");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.common.Base.Literal");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final RuleCall cBooleanLiteralParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final RuleCall cNumberLiteralParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
@@ -620,7 +625,7 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 		//// Value Types for Attributes
 		//Literal:
 		//	BooleanLiteral | NumberLiteral | StringLiteral;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//BooleanLiteral | NumberLiteral | StringLiteral
 		public Alternatives getAlternatives() { return cAlternatives; }
@@ -636,7 +641,7 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class BooleanLiteralElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "BooleanLiteral");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.common.Base.BooleanLiteral");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Action cBooleanLiteralAction_0 = (Action)cGroup.eContents().get(0);
 		private final Alternatives cAlternatives_1 = (Alternatives)cGroup.eContents().get(1);
@@ -645,37 +650,37 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cIsTrueTrueKeyword_1_1_0 = (Keyword)cIsTrueAssignment_1_1.eContents().get(0);
 		
 		//BooleanLiteral:
-		//	{BooleanLiteral} ("false" | isTrue?="true");
-		public ParserRule getRule() { return rule; }
+		//	{BooleanLiteral} ('false' | isTrue?='true');
+		@Override public ParserRule getRule() { return rule; }
 
-		//{BooleanLiteral} ("false" | isTrue?="true")
+		//{BooleanLiteral} ('false' | isTrue?='true')
 		public Group getGroup() { return cGroup; }
 
 		//{BooleanLiteral}
 		public Action getBooleanLiteralAction_0() { return cBooleanLiteralAction_0; }
 
-		//"false" | isTrue?="true"
+		//('false' | isTrue?='true')
 		public Alternatives getAlternatives_1() { return cAlternatives_1; }
 
-		//"false"
+		//'false'
 		public Keyword getFalseKeyword_1_0() { return cFalseKeyword_1_0; }
 
-		//isTrue?="true"
+		//isTrue?='true'
 		public Assignment getIsTrueAssignment_1_1() { return cIsTrueAssignment_1_1; }
 
-		//"true"
+		//'true'
 		public Keyword getIsTrueTrueKeyword_1_1_0() { return cIsTrueTrueKeyword_1_1_0; }
 	}
 
 	public class NumberLiteralElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "NumberLiteral");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.common.Base.NumberLiteral");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final RuleCall cIntLiteralParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final RuleCall cRealLiteralParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
 		
 		//NumberLiteral:
 		//	IntLiteral | RealLiteral;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//IntLiteral | RealLiteral
 		public Alternatives getAlternatives() { return cAlternatives; }
@@ -688,7 +693,7 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class RealLiteralElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "RealLiteral");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.common.Base.RealLiteral");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Action cRealLiteralAction_0 = (Action)cGroup.eContents().get(0);
 		private final Assignment cValueAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -696,7 +701,7 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//RealLiteral:
 		//	{RealLiteral} value=Real;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//{RealLiteral} value=Real
 		public Group getGroup() { return cGroup; }
@@ -712,7 +717,7 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class IntLiteralElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "IntLiteral");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.common.Base.IntLiteral");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Action cIntLiteralAction_0 = (Action)cGroup.eContents().get(0);
 		private final Assignment cValueAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -720,7 +725,7 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//IntLiteral:
 		//	{IntLiteral} value=Integer;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//{IntLiteral} value=Integer
 		public Group getGroup() { return cGroup; }
@@ -736,7 +741,7 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class StringLiteralElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "StringLiteral");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.common.Base.StringLiteral");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Action cStringLiteralAction_0 = (Action)cGroup.eContents().get(0);
 		private final Assignment cValueAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -744,7 +749,7 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//StringLiteral:
 		//	{StringLiteral} value=STRING;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//{StringLiteral} value=STRING
 		public Group getGroup() { return cGroup; }
@@ -760,7 +765,7 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class IntegerElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Integer");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.common.Base.Integer");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final Group cGroup_0 = (Group)cAlternatives.eContents().get(0);
 		private final Alternatives cAlternatives_0_0 = (Alternatives)cGroup_0.eContents().get(0);
@@ -769,23 +774,23 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cINTTerminalRuleCall_0_1 = (RuleCall)cGroup_0.eContents().get(1);
 		private final RuleCall cHEXTerminalRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
 		
-		//Integer returns ecore::ELong:
-		//	("+" | "-")? INT | HEX;
-		public ParserRule getRule() { return rule; }
+		//Integer ecore::ELong:
+		//	('+' | '-')? INT | HEX
+		@Override public ParserRule getRule() { return rule; }
 
-		//("+" | "-")? INT | HEX
+		//('+' | '-')? INT | HEX
 		public Alternatives getAlternatives() { return cAlternatives; }
 
-		//("+" | "-")? INT
+		//('+' | '-')? INT
 		public Group getGroup_0() { return cGroup_0; }
 
-		//("+" | "-")?
+		//('+' | '-')?
 		public Alternatives getAlternatives_0_0() { return cAlternatives_0_0; }
 
-		//"+"
+		//'+'
 		public Keyword getPlusSignKeyword_0_0_0() { return cPlusSignKeyword_0_0_0; }
 
-		//"-"
+		//'-'
 		public Keyword getHyphenMinusKeyword_0_0_1() { return cHyphenMinusKeyword_0_0_1; }
 
 		//INT
@@ -796,16 +801,16 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class RealElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Real");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.common.Base.Real");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final RuleCall cDecimalParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final RuleCall cDecimalExpParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
 		
-		//Real returns ecore::EDouble:
-		//	Decimal | / *DotDecimal | DecimalDot |* / DecimalExp;
-		public ParserRule getRule() { return rule; }
+		//Real ecore::EDouble:
+		//	Decimal | DecimalExp
+		@Override public ParserRule getRule() { return rule; }
 
-		//Decimal | / *DotDecimal | DecimalDot |* / DecimalExp
+		//Decimal | DecimalExp
 		public Alternatives getAlternatives() { return cAlternatives; }
 
 		//Decimal
@@ -816,7 +821,7 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class DecimalElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Decimal");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.common.Base.Decimal");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Alternatives cAlternatives_0 = (Alternatives)cGroup.eContents().get(0);
 		private final Keyword cPlusSignKeyword_0_0 = (Keyword)cAlternatives_0.eContents().get(0);
@@ -826,25 +831,25 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cINTTerminalRuleCall_3 = (RuleCall)cGroup.eContents().get(3);
 		
 		//Decimal hidden():
-		//	("+" | "-")? INT "." INT;
-		public ParserRule getRule() { return rule; }
+		//	('+' | '-')? INT '.' INT;
+		@Override public ParserRule getRule() { return rule; }
 
-		//("+" | "-")? INT "." INT
+		//('+' | '-')? INT '.' INT
 		public Group getGroup() { return cGroup; }
 
-		//("+" | "-")?
+		//('+' | '-')?
 		public Alternatives getAlternatives_0() { return cAlternatives_0; }
 
-		//"+"
+		//'+'
 		public Keyword getPlusSignKeyword_0_0() { return cPlusSignKeyword_0_0; }
 
-		//"-"
+		//'-'
 		public Keyword getHyphenMinusKeyword_0_1() { return cHyphenMinusKeyword_0_1; }
 
 		//INT
 		public RuleCall getINTTerminalRuleCall_1() { return cINTTerminalRuleCall_1; }
 
-		//"."
+		//'.'
 		public Keyword getFullStopKeyword_2() { return cFullStopKeyword_2; }
 
 		//INT
@@ -852,7 +857,7 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class DecimalExpElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "DecimalExp");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.common.Base.DecimalExp");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Alternatives cAlternatives_0 = (Alternatives)cGroup.eContents().get(0);
 		private final Keyword cPlusSignKeyword_0_0 = (Keyword)cAlternatives_0.eContents().get(0);
@@ -874,46 +879,46 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 		////DecimalDot hidden():
 		////	('+' | '-')? INT '.';
 		//DecimalExp hidden():
-		//	("+" | "-")? INT "." INT ("e" | "E") ("+" | "-")? INT;
-		public ParserRule getRule() { return rule; }
+		//	('+' | '-')? INT '.' INT ('e' | 'E') ('+' | '-')? INT;
+		@Override public ParserRule getRule() { return rule; }
 
-		//("+" | "-")? INT "." INT ("e" | "E") ("+" | "-")? INT
+		//('+' | '-')? INT '.' INT ('e' | 'E') ('+' | '-')? INT
 		public Group getGroup() { return cGroup; }
 
-		//("+" | "-")?
+		//('+' | '-')?
 		public Alternatives getAlternatives_0() { return cAlternatives_0; }
 
-		//"+"
+		//'+'
 		public Keyword getPlusSignKeyword_0_0() { return cPlusSignKeyword_0_0; }
 
-		//"-"
+		//'-'
 		public Keyword getHyphenMinusKeyword_0_1() { return cHyphenMinusKeyword_0_1; }
 
 		//INT
 		public RuleCall getINTTerminalRuleCall_1() { return cINTTerminalRuleCall_1; }
 
-		//"."
+		//'.'
 		public Keyword getFullStopKeyword_2() { return cFullStopKeyword_2; }
 
 		//INT
 		public RuleCall getINTTerminalRuleCall_3() { return cINTTerminalRuleCall_3; }
 
-		//"e" | "E"
+		//('e' | 'E')
 		public Alternatives getAlternatives_4() { return cAlternatives_4; }
 
-		//"e"
+		//'e'
 		public Keyword getEKeyword_4_0() { return cEKeyword_4_0; }
 
-		//"E"
+		//'E'
 		public Keyword getEKeyword_4_1() { return cEKeyword_4_1; }
 
-		//("+" | "-")?
+		//('+' | '-')?
 		public Alternatives getAlternatives_5() { return cAlternatives_5; }
 
-		//"+"
+		//'+'
 		public Keyword getPlusSignKeyword_5_0() { return cPlusSignKeyword_5_0; }
 
-		//"-"
+		//'-'
 		public Keyword getHyphenMinusKeyword_5_1() { return cHyphenMinusKeyword_5_1; }
 
 		//INT
@@ -921,7 +926,7 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class FQNElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "FQN");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.common.Base.FQN");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final RuleCall cIDTerminalRuleCall_0 = (RuleCall)cGroup.eContents().get(0);
 		private final Group cGroup_1 = (Group)cGroup.eContents().get(1);
@@ -929,19 +934,19 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cIDTerminalRuleCall_1_1 = (RuleCall)cGroup_1.eContents().get(1);
 		
 		//FQN:
-		//	ID ("." ID)*;
-		public ParserRule getRule() { return rule; }
+		//	ID ('.' ID)*;
+		@Override public ParserRule getRule() { return rule; }
 
-		//ID ("." ID)*
+		//ID ('.' ID)*
 		public Group getGroup() { return cGroup; }
 
 		//ID
 		public RuleCall getIDTerminalRuleCall_0() { return cIDTerminalRuleCall_0; }
 
-		//("." ID)*
+		//('.' ID)*
 		public Group getGroup_1() { return cGroup_1; }
 
-		//"."
+		//'.'
 		public Keyword getFullStopKeyword_1_0() { return cFullStopKeyword_1_0; }
 
 		//ID
@@ -950,7 +955,7 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 	
 	
 	public class LiteralTypeElements extends AbstractEnumRuleElementFinder {
-		private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "LiteralType");
+		private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.common.Base.LiteralType");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final EnumLiteralDeclaration cBOOLEnumLiteralDeclaration_0 = (EnumLiteralDeclaration)cAlternatives.eContents().get(0);
 		private final Keyword cBOOLPtBooleanKeyword_0_0 = (Keyword)cBOOLEnumLiteralDeclaration_0.eContents().get(0);
@@ -961,37 +966,38 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 		private final EnumLiteralDeclaration cCHAREnumLiteralDeclaration_3 = (EnumLiteralDeclaration)cAlternatives.eContents().get(3);
 		private final Keyword cCHARPtCharacterKeyword_3_0 = (Keyword)cCHAREnumLiteralDeclaration_3.eContents().get(0);
 		
-		//// **************************************************************
-		//// Literal Rules
 		//enum LiteralType:
-		//	BOOL="ptBoolean" | INT="ptInteger" | REAL="ptReal" | CHAR="ptCharacter";
+		//	BOOL='ptBoolean' |
+		//	INT='ptInteger' |
+		//	REAL='ptReal' |
+		//	CHAR='ptCharacter';
 		public EnumRule getRule() { return rule; }
 
-		//BOOL="ptBoolean" | INT="ptInteger" | REAL="ptReal" | CHAR="ptCharacter"
+		//BOOL='ptBoolean' | INT='ptInteger' | REAL='ptReal' | CHAR='ptCharacter'
 		public Alternatives getAlternatives() { return cAlternatives; }
 
-		//BOOL="ptBoolean"
+		//BOOL='ptBoolean'
 		public EnumLiteralDeclaration getBOOLEnumLiteralDeclaration_0() { return cBOOLEnumLiteralDeclaration_0; }
 
-		//"ptBoolean"
+		//'ptBoolean'
 		public Keyword getBOOLPtBooleanKeyword_0_0() { return cBOOLPtBooleanKeyword_0_0; }
 
-		//INT="ptInteger"
+		//INT='ptInteger'
 		public EnumLiteralDeclaration getINTEnumLiteralDeclaration_1() { return cINTEnumLiteralDeclaration_1; }
 
-		//"ptInteger"
+		//'ptInteger'
 		public Keyword getINTPtIntegerKeyword_1_0() { return cINTPtIntegerKeyword_1_0; }
 
-		//REAL="ptReal"
+		//REAL='ptReal'
 		public EnumLiteralDeclaration getREALEnumLiteralDeclaration_2() { return cREALEnumLiteralDeclaration_2; }
 
-		//"ptReal"
+		//'ptReal'
 		public Keyword getREALPtRealKeyword_2_0() { return cREALPtRealKeyword_2_0; }
 
-		//CHAR="ptCharacter"
+		//CHAR='ptCharacter'
 		public EnumLiteralDeclaration getCHAREnumLiteralDeclaration_3() { return cCHAREnumLiteralDeclaration_3; }
 
-		//"ptCharacter"
+		//'ptCharacter'
 		public Keyword getCHARPtCharacterKeyword_3_0() { return cCHARPtCharacterKeyword_3_0; }
 	}
 	
@@ -1006,7 +1012,7 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 	private final ImportedFQNElements pImportedFQN;
 	private final DocumentationElements pDocumentation;
 	private final TIMEElements pTIME;
-	private final LiteralTypeElements unknownRuleLiteralType;
+	private final LiteralTypeElements eLiteralType;
 	private final LiteralArrayElements pLiteralArray;
 	private final LiteralElements pLiteral;
 	private final BooleanLiteralElements pBooleanLiteral;
@@ -1041,7 +1047,7 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 		this.pImportedFQN = new ImportedFQNElements();
 		this.pDocumentation = new DocumentationElements();
 		this.pTIME = new TIMEElements();
-		this.unknownRuleLiteralType = new LiteralTypeElements();
+		this.eLiteralType = new LiteralTypeElements();
 		this.pLiteralArray = new LiteralArrayElements();
 		this.pLiteral = new LiteralElements();
 		this.pBooleanLiteral = new BooleanLiteralElements();
@@ -1054,7 +1060,7 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 		this.pDecimal = new DecimalElements();
 		this.pDecimalExp = new DecimalExpElements();
 		this.pFQN = new FQNElements();
-		this.tHEX = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "HEX");
+		this.tHEX = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.common.Base.HEX");
 	}
 	
 	protected Grammar internalFindGrammar(GrammarProvider grammarProvider) {
@@ -1073,7 +1079,7 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 		return grammar;
 	}
 	
-	
+	@Override
 	public Grammar getGrammar() {
 		return grammar;
 	}
@@ -1087,7 +1093,7 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 	//// **************************************************************
 	//// AnnotationType and Annotation Rules
 	//Annotation:
-	//	"@" type=[AnnotationType|FQN] ("(" attributes+=KeyValue ("," attributes+=KeyValue)* ")")?;
+	//	'@' type=[AnnotationType|FQN] ('(' attributes+=KeyValue (',' attributes+=KeyValue)* ')')?;
 	public AnnotationElements getAnnotationAccess() {
 		return pAnnotation;
 	}
@@ -1097,7 +1103,7 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//KeyValue:
-	//	key=ID "=" value=Literal;
+	//	key=ID '=' value=Literal;
 	public KeyValueElements getKeyValueAccess() {
 		return pKeyValue;
 	}
@@ -1107,8 +1113,10 @@ public class BaseGrammarAccess 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 AnnotationTypeElements getAnnotationTypeAccess() {
 		return pAnnotationType;
 	}
@@ -1146,7 +1154,7 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//SimpleAnnotationAttribute:
-	//	(optional?="optional" | "mandatory") "attribute" name=ID ":" type=LiteralType;
+	//	(optional?='optional' | 'mandatory') 'attribute' name=ID ':' type=LiteralType;
 	public SimpleAnnotationAttributeElements getSimpleAnnotationAttributeAccess() {
 		return pSimpleAnnotationAttribute;
 	}
@@ -1156,7 +1164,7 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//EnumAnnotationAttribute:
-	//	(optional?="optional" | "mandatory") "attribute" name=ID ":" "{" values+=STRING ("," values+=STRING)* "}";
+	//	(optional?='optional' | 'mandatory') 'attribute' name=ID ':' '{' values+=STRING (',' values+=STRING)* '}';
 	public EnumAnnotationAttributeElements getEnumAnnotationAttributeAccess() {
 		return pEnumAnnotationAttribute;
 	}
@@ -1186,7 +1194,7 @@ public class BaseGrammarAccess 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 ImportElements getImportAccess() {
 		return pImport;
 	}
@@ -1196,7 +1204,7 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//ImportedFQN:
-	//	FQN ".*"?;
+	//	FQN '.*'?;
 	public ImportedFQNElements getImportedFQNAccess() {
 		return pImportedFQN;
 	}
@@ -1208,7 +1216,10 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 	//// **************************************************************
 	//// Documentation Rule
 	//Documentation:
-	//	{Documentation} "[" lines+=STRING* "]";
+	//	{Documentation}
+	//	'['
+	//	lines+=STRING*
+	//	']';
 	public DocumentationElements getDocumentationAccess() {
 		return pDocumentation;
 	}
@@ -1219,8 +1230,8 @@ public class BaseGrammarAccess 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 TIMEElements getTIMEAccess() {
 		return pTIME;
 	}
@@ -1229,12 +1240,13 @@ public class BaseGrammarAccess 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 LiteralTypeElements getLiteralTypeAccess() {
-		return unknownRuleLiteralType;
+		return eLiteralType;
 	}
 	
 	public EnumRule getLiteralTypeRule() {
@@ -1242,7 +1254,7 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//LiteralArray:
-	//	literals+=Literal ("," literals+=Literal)*;
+	//	literals+=Literal (',' literals+=Literal)*;
 	public LiteralArrayElements getLiteralArrayAccess() {
 		return pLiteralArray;
 	}
@@ -1263,7 +1275,7 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//BooleanLiteral:
-	//	{BooleanLiteral} ("false" | isTrue?="true");
+	//	{BooleanLiteral} ('false' | isTrue?='true');
 	public BooleanLiteralElements getBooleanLiteralAccess() {
 		return pBooleanLiteral;
 	}
@@ -1312,8 +1324,8 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 		return getStringLiteralAccess().getRule();
 	}
 
-	//Integer returns ecore::ELong:
-	//	("+" | "-")? INT | HEX;
+	//Integer ecore::ELong:
+	//	('+' | '-')? INT | HEX
 	public IntegerElements getIntegerAccess() {
 		return pInteger;
 	}
@@ -1322,8 +1334,8 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 		return getIntegerAccess().getRule();
 	}
 
-	//Real returns ecore::EDouble:
-	//	Decimal | / *DotDecimal | DecimalDot |* / DecimalExp;
+	//Real ecore::EDouble:
+	//	Decimal | DecimalExp
 	public RealElements getRealAccess() {
 		return pReal;
 	}
@@ -1333,7 +1345,7 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//Decimal hidden():
-	//	("+" | "-")? INT "." INT;
+	//	('+' | '-')? INT '.' INT;
 	public DecimalElements getDecimalAccess() {
 		return pDecimal;
 	}
@@ -1348,7 +1360,7 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 	////DecimalDot hidden():
 	////	('+' | '-')? INT '.';
 	//DecimalExp hidden():
-	//	("+" | "-")? INT "." INT ("e" | "E") ("+" | "-")? INT;
+	//	('+' | '-')? INT '.' INT ('e' | 'E') ('+' | '-')? INT;
 	public DecimalExpElements getDecimalExpAccess() {
 		return pDecimalExp;
 	}
@@ -1358,7 +1370,7 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//FQN:
-	//	ID ("." ID)*;
+	//	ID ('.' ID)*;
 	public FQNElements getFQNAccess() {
 		return pFQN;
 	}
@@ -1368,44 +1380,43 @@ public class BaseGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//terminal HEX:
-	//	("0x" | "0X") ("0".."9" | "a".."f" | "A".."F")+;
+	//	('0x' | '0X') ('0'..'9' | 'a'..'f' | 'A'..'F')+;
 	public TerminalRule getHEXRule() {
 		return tHEX;
 	} 
 
 	//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 gaTerminals.getIDRule();
 	} 
 
 	//terminal INT returns ecore::EInt:
-	//	"0".."9"+;
+	//	'0'..'9'+;
 	public TerminalRule getINTRule() {
 		return gaTerminals.getINTRule();
 	} 
 
 	//terminal STRING:
-	//	"\"" ("\\" . / * 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' * / | !("\\" | "\""))* "\"" | "\'" ("\\" .
-	//	/ * 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' * / | !("\\" | "\'"))* "\'";
+	//	'"' ('\\' . | !('\\' | '"'))* '"' | "'" ('\\' . | !('\\' | "'"))* "'";
 	public TerminalRule getSTRINGRule() {
 		return gaTerminals.getSTRINGRule();
 	} 
 
 	//terminal ML_COMMENT:
-	//	"/ *"->"* /";
+	//	'/ *'->'* /';
 	public TerminalRule getML_COMMENTRule() {
 		return gaTerminals.getML_COMMENTRule();
 	} 
 
 	//terminal SL_COMMENT:
-	//	"//" !("\n" | "\r")* ("\r"? "\n")?;
+	//	'//' !('\n' | '\r')* ('\r'? '\n')?;
 	public TerminalRule getSL_COMMENTRule() {
 		return gaTerminals.getSL_COMMENTRule();
 	} 
 
 	//terminal WS:
-	//	(" " | "\t" | "\r" | "\n")+;
+	//	' ' | '\t' | '\r' | '\n'+;
 	public TerminalRule getWSRule() {
 		return gaTerminals.getWSRule();
 	} 
diff --git a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/services/BaseTestGrammarAccess.java b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/services/BaseTestGrammarAccess.java
index f99772ca2..6a7bbbe91 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/services/BaseTestGrammarAccess.java
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/services/BaseTestGrammarAccess.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.common.services;
 
 import com.google.inject.Singleton;
@@ -13,13 +13,14 @@ 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 BaseTestGrammarAccess extends AbstractGrammarElementFinder {
 	
 	
 	public class BaseModelElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "BaseModel");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.common.BaseTest.BaseModel");
 		private final Assignment cElementsAssignment = (Assignment)rule.eContents().get(1);
 		private final Alternatives cElementsAlternatives_0 = (Alternatives)cElementsAssignment.eContents().get(0);
 		private final RuleCall cElementsAnnotationParserRuleCall_0_0 = (RuleCall)cElementsAlternatives_0.eContents().get(0);
@@ -30,12 +31,12 @@ public class BaseTestGrammarAccess extends AbstractGrammarElementFinder {
 		////
 		//BaseModel:
 		//	elements+=(Annotation | AnnotationType)*;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//elements+=(Annotation | AnnotationType)*
 		public Assignment getElementsAssignment() { return cElementsAssignment; }
 
-		//Annotation | AnnotationType
+		//(Annotation | AnnotationType)
 		public Alternatives getElementsAlternatives_0() { return cElementsAlternatives_0; }
 
 		//Annotation
@@ -52,11 +53,15 @@ public class BaseTestGrammarAccess extends AbstractGrammarElementFinder {
 
 	private final BaseGrammarAccess gaBase;
 
+	private final TerminalsGrammarAccess gaTerminals;
+
 	@Inject
 	public BaseTestGrammarAccess(GrammarProvider grammarProvider,
-		BaseGrammarAccess gaBase) {
+		BaseGrammarAccess gaBase,
+		TerminalsGrammarAccess gaTerminals) {
 		this.grammar = internalFindGrammar(grammarProvider);
 		this.gaBase = gaBase;
+		this.gaTerminals = gaTerminals;
 		this.pBaseModel = new BaseModelElements();
 	}
 	
@@ -76,7 +81,7 @@ public class BaseTestGrammarAccess extends AbstractGrammarElementFinder {
 		return grammar;
 	}
 	
-	
+	@Override
 	public Grammar getGrammar() {
 		return grammar;
 	}
@@ -86,6 +91,10 @@ public class BaseTestGrammarAccess extends AbstractGrammarElementFinder {
 		return gaBase;
 	}
 
+	public TerminalsGrammarAccess getTerminalsGrammarAccess() {
+		return gaTerminals;
+	}
+
 	
 	//// **************************************************************
 	//// A simple model for testing Base grammar rules
@@ -103,7 +112,7 @@ public class BaseTestGrammarAccess 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();
 	}
@@ -113,7 +122,7 @@ public class BaseTestGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//KeyValue:
-	//	key=ID "=" value=Literal;
+	//	key=ID '=' value=Literal;
 	public BaseGrammarAccess.KeyValueElements getKeyValueAccess() {
 		return gaBase.getKeyValueAccess();
 	}
@@ -123,8 +132,10 @@ public class BaseTestGrammarAccess 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();
 	}
@@ -162,7 +173,7 @@ public class BaseTestGrammarAccess 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();
 	}
@@ -172,7 +183,7 @@ public class BaseTestGrammarAccess 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();
 	}
@@ -202,7 +213,7 @@ public class BaseTestGrammarAccess 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();
 	}
@@ -212,7 +223,7 @@ public class BaseTestGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//ImportedFQN:
-	//	FQN ".*"?;
+	//	FQN '.*'?;
 	public BaseGrammarAccess.ImportedFQNElements getImportedFQNAccess() {
 		return gaBase.getImportedFQNAccess();
 	}
@@ -224,7 +235,10 @@ public class BaseTestGrammarAccess extends AbstractGrammarElementFinder {
 	//// **************************************************************
 	//// Documentation Rule
 	//Documentation:
-	//	{Documentation} "[" lines+=STRING* "]";
+	//	{Documentation}
+	//	'['
+	//	lines+=STRING*
+	//	']';
 	public BaseGrammarAccess.DocumentationElements getDocumentationAccess() {
 		return gaBase.getDocumentationAccess();
 	}
@@ -235,8 +249,8 @@ public class BaseTestGrammarAccess 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();
 	}
@@ -245,10 +259,11 @@ public class BaseTestGrammarAccess 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();
 	}
@@ -258,7 +273,7 @@ public class BaseTestGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//LiteralArray:
-	//	literals+=Literal ("," literals+=Literal)*;
+	//	literals+=Literal (',' literals+=Literal)*;
 	public BaseGrammarAccess.LiteralArrayElements getLiteralArrayAccess() {
 		return gaBase.getLiteralArrayAccess();
 	}
@@ -279,7 +294,7 @@ public class BaseTestGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//BooleanLiteral:
-	//	{BooleanLiteral} ("false" | isTrue?="true");
+	//	{BooleanLiteral} ('false' | isTrue?='true');
 	public BaseGrammarAccess.BooleanLiteralElements getBooleanLiteralAccess() {
 		return gaBase.getBooleanLiteralAccess();
 	}
@@ -328,8 +343,8 @@ public class BaseTestGrammarAccess extends AbstractGrammarElementFinder {
 		return getStringLiteralAccess().getRule();
 	}
 
-	//Integer returns ecore::ELong:
-	//	("+" | "-")? INT | HEX;
+	//Integer ecore::ELong:
+	//	('+' | '-')? INT | HEX
 	public BaseGrammarAccess.IntegerElements getIntegerAccess() {
 		return gaBase.getIntegerAccess();
 	}
@@ -338,8 +353,8 @@ public class BaseTestGrammarAccess 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();
 	}
@@ -349,7 +364,7 @@ public class BaseTestGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//Decimal hidden():
-	//	("+" | "-")? INT "." INT;
+	//	('+' | '-')? INT '.' INT;
 	public BaseGrammarAccess.DecimalElements getDecimalAccess() {
 		return gaBase.getDecimalAccess();
 	}
@@ -364,7 +379,7 @@ public class BaseTestGrammarAccess extends AbstractGrammarElementFinder {
 	////DecimalDot hidden():
 	////	('+' | '-')? INT '.';
 	//DecimalExp hidden():
-	//	("+" | "-")? INT "." INT ("e" | "E") ("+" | "-")? INT;
+	//	('+' | '-')? INT '.' INT ('e' | 'E') ('+' | '-')? INT;
 	public BaseGrammarAccess.DecimalExpElements getDecimalExpAccess() {
 		return gaBase.getDecimalExpAccess();
 	}
@@ -374,7 +389,7 @@ public class BaseTestGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//FQN:
-	//	ID ("." ID)*;
+	//	ID ('.' ID)*;
 	public BaseGrammarAccess.FQNElements getFQNAccess() {
 		return gaBase.getFQNAccess();
 	}
@@ -384,51 +399,50 @@ public class BaseTestGrammarAccess 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.common/src-gen/org/eclipse/etrice/core/common/validation/AbstractBaseJavaValidator.java b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/validation/AbstractBaseJavaValidator.java
index 9f155d38c..a733c3959 100644
--- a/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/validation/AbstractBaseJavaValidator.java
+++ b/plugins/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/validation/AbstractBaseJavaValidator.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.common.validation;
  
 import java.util.ArrayList;
diff --git a/plugins/org.eclipse.etrice.core.config.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.config.ui/META-INF/MANIFEST.MF
index d5a082113..9650edcfc 100644
--- a/plugins/org.eclipse.etrice.core.config.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.config.ui/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-Vendor: Eclipse eTrice
 Bundle-Version: 1.1.0.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.core.config.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle:  org.eclipse.etrice.core.room.ui;bundle-version="1.1.0",
+Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="1.1.0",
  org.eclipse.etrice.core.common.ui;bundle-version="1.1.0",
  org.eclipse.etrice.core.fsm;bundle-version="1.1.0",
  org.eclipse.etrice.core.room;bundle-version="1.1.0",
@@ -27,5 +27,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.etrice.core.ui.contentassist.antlr,
  org.eclipse.etrice.core.ui.internal,
  org.eclipse.etrice.core.ui.contentassist,
- org.eclipse.etrice.core.ui.quickfix
+ org.eclipse.etrice.core.ui.quickfix,
+ org.eclipse.etrice.core.ui.contentassist.antlr.internal
 Bundle-Activator: org.eclipse.etrice.core.ui.internal.ConfigActivator
diff --git a/plugins/org.eclipse.etrice.core.config.ui/plugin.xml_gen b/plugins/org.eclipse.etrice.core.config.ui/plugin.xml_gen
index 8800ad445..25fadeec7 100644
--- a/plugins/org.eclipse.etrice.core.config.ui/plugin.xml_gen
+++ b/plugins/org.eclipse.etrice.core.config.ui/plugin.xml_gen
@@ -279,6 +279,27 @@
 	        <filter name="projectNature" value="org.eclipse.xtext.ui.shared.xtextNature"/>
         </page>
     </extension>
+    <extension point="org.eclipse.ui.menus">
+		<menuContribution locationURI="popup:#TextEditorContext?after=xtext.ui.openDeclaration">
+			<command
+				commandId="org.eclipse.xtext.ui.OpenGeneratedFileCommand"
+				id="org.eclipse.etrice.core.Config.OpenGeneratedCode"
+				style="push">
+					<visibleWhen checkEnabled="false">
+						<reference definitionId="org.eclipse.etrice.core.Config.Editor.opened" />
+					</visibleWhen>
+			</command>
+		</menuContribution>
+	</extension>
+	<extension point="org.eclipse.ui.handlers">
+		<handler
+			class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.generator.trace.OpenGeneratedFileHandler"
+			commandId="org.eclipse.xtext.ui.OpenGeneratedFileCommand">
+				<activeWhen>
+					<reference definitionId="org.eclipse.etrice.core.Config.Editor.opened" />
+				</activeWhen>
+		</handler>
+	</extension>
 
 	<!-- Quick Outline -->
 	<extension
@@ -394,5 +415,11 @@
             extensions="config">
     </provider>
   </extension>
+  <extension point="org.eclipse.team.core.fileTypes">
+    <fileTypes
+            extension="config"
+            type="text">
+    </fileTypes>
+  </extension>
 
 </plugin>
diff --git a/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/AbstractConfigUiModule.java b/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/AbstractConfigUiModule.java
index 9d960bb66..f46b1d754 100644
--- a/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/AbstractConfigUiModule.java
+++ b/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/AbstractConfigUiModule.java
@@ -4,14 +4,13 @@
  */
 package org.eclipse.etrice.core.ui;
 
-import org.eclipse.xtext.ui.DefaultUiModule;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 
 /**
  * Manual modifications go to {org.eclipse.etrice.core.ui.ConfigUiModule}
  */
 @SuppressWarnings("all")
-public abstract class AbstractConfigUiModule extends DefaultUiModule {
+public abstract class AbstractConfigUiModule extends org.eclipse.xtext.ui.DefaultUiModule {
 	
 	public AbstractConfigUiModule(AbstractUIPlugin plugin) {
 		super(plugin);
@@ -59,6 +58,11 @@ public abstract class AbstractConfigUiModule extends DefaultUiModule {
 	}
 
 	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
+	public Class<? extends org.eclipse.xtext.generator.IContextualOutputConfigurationProvider> bindIContextualOutputConfigurationProvider() {
+		return org.eclipse.xtext.builder.EclipseOutputConfigurationProvider.class;
+	}
+
+	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
 	public void configureIResourceDescriptionsPersisted(com.google.inject.Binder binder) {
 		binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.PERSISTED_DESCRIPTIONS)).to(org.eclipse.xtext.builder.builderState.IBuilderState.class);
 	}
diff --git a/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/AbstractConfigProposalProvider.java b/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/AbstractConfigProposalProvider.java
index 53b3f7ade..dc8c3b169 100644
--- a/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/AbstractConfigProposalProvider.java
+++ b/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/AbstractConfigProposalProvider.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.ui.contentassist;
 
 import org.eclipse.emf.ecore.EObject;
diff --git a/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/ConfigParser.java b/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/ConfigParser.java
index d0e9b195f..944fcf190 100644
--- a/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/ConfigParser.java
+++ b/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/ConfigParser.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.ui.contentassist.antlr;
 
 import java.util.Collection;
diff --git a/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/PartialConfigContentAssistParser.java b/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/PartialConfigContentAssistParser.java
index b207162fb..8638e766d 100644
--- a/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/PartialConfigContentAssistParser.java
+++ b/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/PartialConfigContentAssistParser.java
@@ -12,14 +12,14 @@ import org.eclipse.xtext.ui.editor.contentassist.antlr.FollowElement;
 import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.AbstractInternalContentAssistParser;
 import org.eclipse.xtext.util.PolymorphicDispatcher;
 
-/**
- * @author Sebastian Zarnekow - Initial contribution and API
+/*
+ * Template CodetemplatesGeneratorFragment.xpt
  */
-@SuppressWarnings("restriction")
 public class PartialConfigContentAssistParser extends ConfigParser implements IPartialContentAssistParser {
 
 	private AbstractRule rule;
 
+	@Override
 	public void initializeFor(AbstractRule rule) {
 		this.rule = rule;
 	}
diff --git a/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g b/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g
index 378ba525b..6a3c52e59 100644
--- a/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g
+++ b/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g
@@ -1,11 +1,10 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 grammar InternalConfig;
 
 options {
 	superClass=AbstractInternalContentAssistParser;
-	backtrack=true;
 	
 }
 
@@ -6845,7 +6844,7 @@ rule__DecimalExp__Group__6__Impl
 :
 (
 { before(grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_6()); }
-(	RULE_INT)
+	RULE_INT
 { after(grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_6()); }
 )
 
diff --git a/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfigLexer.java b/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfigLexer.java
index 987b9dbec..e530586d4 100644
--- a/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfigLexer.java
+++ b/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfigLexer.java
@@ -83,15 +83,15 @@ public class InternalConfigLexer extends Lexer {
         super(input,state);
 
     }
-    public String getGrammarFileName() { return "../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g"; }
+    public String getGrammarFileName() { return "InternalConfig.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.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:11:7: ( 'conjugate' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:11:9: 'conjugate'
+            // InternalConfig.g:11:7: ( 'conjugate' )
+            // InternalConfig.g:11:9: 'conjugate'
             {
             match("conjugate"); 
 
@@ -111,8 +111,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__13;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:12:7: ( 'conjugated' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:12:9: 'conjugated'
+            // InternalConfig.g:12:7: ( 'conjugated' )
+            // InternalConfig.g:12:9: 'conjugated'
             {
             match("conjugated"); 
 
@@ -132,8 +132,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__14;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:13:7: ( 'write' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:13:9: 'write'
+            // InternalConfig.g:13:7: ( 'write' )
+            // InternalConfig.g:13:9: 'write'
             {
             match("write"); 
 
@@ -153,8 +153,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__15;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:14:7: ( 'mandatory' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:14:9: 'mandatory'
+            // InternalConfig.g:14:7: ( 'mandatory' )
+            // InternalConfig.g:14:9: 'mandatory'
             {
             match("mandatory"); 
 
@@ -174,8 +174,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__16;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:15:7: ( 'model' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:15:9: 'model'
+            // InternalConfig.g:15:7: ( 'model' )
+            // InternalConfig.g:15:9: 'model'
             {
             match("model"); 
 
@@ -195,8 +195,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__17;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:16:7: ( 'false' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:16:9: 'false'
+            // InternalConfig.g:16:7: ( 'false' )
+            // InternalConfig.g:16:9: 'false'
             {
             match("false"); 
 
@@ -216,8 +216,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__18;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:17:7: ( '+' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:17:9: '+'
+            // InternalConfig.g:17:7: ( '+' )
+            // InternalConfig.g:17:9: '+'
             {
             match('+'); 
 
@@ -236,8 +236,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__19;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:18:7: ( '-' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:18:9: '-'
+            // InternalConfig.g:18:7: ( '-' )
+            // InternalConfig.g:18:9: '-'
             {
             match('-'); 
 
@@ -256,8 +256,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__20;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:19:7: ( 'e' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:19:9: 'e'
+            // InternalConfig.g:19:7: ( 'e' )
+            // InternalConfig.g:19:9: 'e'
             {
             match('e'); 
 
@@ -276,8 +276,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__21;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:20:7: ( 'E' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:20:9: 'E'
+            // InternalConfig.g:20:7: ( 'E' )
+            // InternalConfig.g:20:9: 'E'
             {
             match('E'); 
 
@@ -296,8 +296,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__22;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:21:7: ( 'ptBoolean' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:21:9: 'ptBoolean'
+            // InternalConfig.g:21:7: ( 'ptBoolean' )
+            // InternalConfig.g:21:9: 'ptBoolean'
             {
             match("ptBoolean"); 
 
@@ -317,8 +317,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__23;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:22:7: ( 'ptInteger' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:22:9: 'ptInteger'
+            // InternalConfig.g:22:7: ( 'ptInteger' )
+            // InternalConfig.g:22:9: 'ptInteger'
             {
             match("ptInteger"); 
 
@@ -338,8 +338,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__24;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:23:7: ( 'ptReal' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:23:9: 'ptReal'
+            // InternalConfig.g:23:7: ( 'ptReal' )
+            // InternalConfig.g:23:9: 'ptReal'
             {
             match("ptReal"); 
 
@@ -359,8 +359,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__25;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:24:7: ( 'ptCharacter' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:24:9: 'ptCharacter'
+            // InternalConfig.g:24:7: ( 'ptCharacter' )
+            // InternalConfig.g:24:9: 'ptCharacter'
             {
             match("ptCharacter"); 
 
@@ -380,8 +380,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__26;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:25:7: ( 'ConfigModel' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:25:9: 'ConfigModel'
+            // InternalConfig.g:25:7: ( 'ConfigModel' )
+            // InternalConfig.g:25:9: 'ConfigModel'
             {
             match("ConfigModel"); 
 
@@ -401,8 +401,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__27;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:26:7: ( '{' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:26:9: '{'
+            // InternalConfig.g:26:7: ( '{' )
+            // InternalConfig.g:26:9: '{'
             {
             match('{'); 
 
@@ -421,8 +421,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__28;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:27:7: ( '}' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:27:9: '}'
+            // InternalConfig.g:27:7: ( '}' )
+            // InternalConfig.g:27:9: '}'
             {
             match('}'); 
 
@@ -441,8 +441,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__29;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:28:7: ( 'SubSystemConfig' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:28:9: 'SubSystemConfig'
+            // InternalConfig.g:28:7: ( 'SubSystemConfig' )
+            // InternalConfig.g:28:9: 'SubSystemConfig'
             {
             match("SubSystemConfig"); 
 
@@ -462,8 +462,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__30;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:29:7: ( '/' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:29:9: '/'
+            // InternalConfig.g:29:7: ( '/' )
+            // InternalConfig.g:29:9: '/'
             {
             match('/'); 
 
@@ -482,8 +482,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__31;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:30:7: ( 'dynamic configuration' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:30:9: 'dynamic configuration'
+            // InternalConfig.g:30:7: ( 'dynamic configuration' )
+            // InternalConfig.g:30:9: 'dynamic configuration'
             {
             match("dynamic configuration"); 
 
@@ -503,8 +503,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__32;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:31:7: ( 'file path' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:31:9: 'file path'
+            // InternalConfig.g:31:7: ( 'file path' )
+            // InternalConfig.g:31:9: 'file path'
             {
             match("file path"); 
 
@@ -524,8 +524,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__33;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:32:7: ( 'user import' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:32:9: 'user import'
+            // InternalConfig.g:32:7: ( 'user import' )
+            // InternalConfig.g:32:9: 'user import'
             {
             match("user import"); 
 
@@ -545,8 +545,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__34;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:33:7: ( 'user constructor' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:33:9: 'user constructor'
+            // InternalConfig.g:33:7: ( 'user constructor' )
+            // InternalConfig.g:33:9: 'user constructor'
             {
             match("user constructor"); 
 
@@ -566,8 +566,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__35;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:34:7: ( 'polling interval' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:34:9: 'polling interval'
+            // InternalConfig.g:34:7: ( 'polling interval' )
+            // InternalConfig.g:34:9: 'polling interval'
             {
             match("polling interval"); 
 
@@ -587,8 +587,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__36;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:35:7: ( 'ActorClassConfig' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:35:9: 'ActorClassConfig'
+            // InternalConfig.g:35:7: ( 'ActorClassConfig' )
+            // InternalConfig.g:35:9: 'ActorClassConfig'
             {
             match("ActorClassConfig"); 
 
@@ -608,8 +608,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__37;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:36:7: ( 'ActorInstanceConfig' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:36:9: 'ActorInstanceConfig'
+            // InternalConfig.g:36:7: ( 'ActorInstanceConfig' )
+            // InternalConfig.g:36:9: 'ActorInstanceConfig'
             {
             match("ActorInstanceConfig"); 
 
@@ -629,8 +629,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__38;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:37:7: ( 'ProtocolClassConfig' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:37:9: 'ProtocolClassConfig'
+            // InternalConfig.g:37:7: ( 'ProtocolClassConfig' )
+            // InternalConfig.g:37:9: 'ProtocolClassConfig'
             {
             match("ProtocolClassConfig"); 
 
@@ -650,8 +650,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__39;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:38:7: ( 'regular' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:38:9: 'regular'
+            // InternalConfig.g:38:7: ( 'regular' )
+            // InternalConfig.g:38:9: 'regular'
             {
             match("regular"); 
 
@@ -671,8 +671,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__40;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:39:7: ( 'Port' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:39:9: 'Port'
+            // InternalConfig.g:39:7: ( 'Port' )
+            // InternalConfig.g:39:9: 'Port'
             {
             match("Port"); 
 
@@ -692,8 +692,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__41;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:40:7: ( 'InterfaceItem' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:40:9: 'InterfaceItem'
+            // InternalConfig.g:40:7: ( 'InterfaceItem' )
+            // InternalConfig.g:40:9: 'InterfaceItem'
             {
             match("InterfaceItem"); 
 
@@ -713,8 +713,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__42;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:41:7: ( 'Attr' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:41:9: 'Attr'
+            // InternalConfig.g:41:7: ( 'Attr' )
+            // InternalConfig.g:41:9: 'Attr'
             {
             match("Attr"); 
 
@@ -734,8 +734,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__43;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:42:7: ( '=' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:42:9: '='
+            // InternalConfig.g:42:7: ( '=' )
+            // InternalConfig.g:42:9: '='
             {
             match('='); 
 
@@ -754,8 +754,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__44;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:43:7: ( 'min' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:43:9: 'min'
+            // InternalConfig.g:43:7: ( 'min' )
+            // InternalConfig.g:43:9: 'min'
             {
             match("min"); 
 
@@ -775,8 +775,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__45;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:44:7: ( 'max' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:44:9: 'max'
+            // InternalConfig.g:44:7: ( 'max' )
+            // InternalConfig.g:44:9: 'max'
             {
             match("max"); 
 
@@ -796,8 +796,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__46;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:45:7: ( ',' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:45:9: ','
+            // InternalConfig.g:45:7: ( ',' )
+            // InternalConfig.g:45:9: ','
             {
             match(','); 
 
@@ -816,8 +816,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__47;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:46:7: ( '.' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:46:9: '.'
+            // InternalConfig.g:46:7: ( '.' )
+            // InternalConfig.g:46:9: '.'
             {
             match('.'); 
 
@@ -836,8 +836,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__48;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:47:7: ( ':' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:47:9: ':'
+            // InternalConfig.g:47:7: ( ':' )
+            // InternalConfig.g:47:9: ':'
             {
             match(':'); 
 
@@ -856,8 +856,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__49;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:48:7: ( 'attribute' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:48:9: 'attribute'
+            // InternalConfig.g:48:7: ( 'attribute' )
+            // InternalConfig.g:48:9: 'attribute'
             {
             match("attribute"); 
 
@@ -877,8 +877,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__50;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:49:7: ( 'import' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:49:9: 'import'
+            // InternalConfig.g:49:7: ( 'import' )
+            // InternalConfig.g:49:9: 'import'
             {
             match("import"); 
 
@@ -898,8 +898,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__51;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:50:7: ( 'from' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:50:9: 'from'
+            // InternalConfig.g:50:7: ( 'from' )
+            // InternalConfig.g:50:9: 'from'
             {
             match("from"); 
 
@@ -919,8 +919,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__52;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:51:7: ( '.*' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:51:9: '.*'
+            // InternalConfig.g:51:7: ( '.*' )
+            // InternalConfig.g:51:9: '.*'
             {
             match(".*"); 
 
@@ -940,8 +940,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__53;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:52:7: ( '[' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:52:9: '['
+            // InternalConfig.g:52:7: ( '[' )
+            // InternalConfig.g:52:9: '['
             {
             match('['); 
 
@@ -960,8 +960,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__54;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:53:7: ( ']' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:53:9: ']'
+            // InternalConfig.g:53:7: ( ']' )
+            // InternalConfig.g:53:9: ']'
             {
             match(']'); 
 
@@ -980,8 +980,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__55;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:54:7: ( 's' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:54:9: 's'
+            // InternalConfig.g:54:7: ( 's' )
+            // InternalConfig.g:54:9: 's'
             {
             match('s'); 
 
@@ -1000,8 +1000,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__56;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:55:7: ( 'ms' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:55:9: 'ms'
+            // InternalConfig.g:55:7: ( 'ms' )
+            // InternalConfig.g:55:9: 'ms'
             {
             match("ms"); 
 
@@ -1021,8 +1021,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__57;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:56:7: ( 'us' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:56:9: 'us'
+            // InternalConfig.g:56:7: ( 'us' )
+            // InternalConfig.g:56:9: 'us'
             {
             match("us"); 
 
@@ -1042,8 +1042,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__58;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:57:7: ( 'ns' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:57:9: 'ns'
+            // InternalConfig.g:57:7: ( 'ns' )
+            // InternalConfig.g:57:9: 'ns'
             {
             match("ns"); 
 
@@ -1063,8 +1063,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__59;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:58:7: ( 'read' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:58:9: 'read'
+            // InternalConfig.g:58:7: ( 'read' )
+            // InternalConfig.g:58:9: 'read'
             {
             match("read"); 
 
@@ -1084,8 +1084,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__60;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:59:7: ( 'optional' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:59:9: 'optional'
+            // InternalConfig.g:59:7: ( 'optional' )
+            // InternalConfig.g:59:9: 'optional'
             {
             match("optional"); 
 
@@ -1105,8 +1105,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__61;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:60:7: ( 'true' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:60:9: 'true'
+            // InternalConfig.g:60:7: ( 'true' )
+            // InternalConfig.g:60:9: 'true'
             {
             match("true"); 
 
@@ -1126,10 +1126,10 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = RULE_HEX;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8262:10: ( ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+ )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8262:12: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+
+            // InternalConfig.g:8261:10: ( ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+ )
+            // InternalConfig.g:8261:12: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8262:12: ( '0x' | '0X' )
+            // InternalConfig.g:8261:12: ( '0x' | '0X' )
             int alt1=2;
             int LA1_0 = input.LA(1);
 
@@ -1157,7 +1157,7 @@ public class InternalConfigLexer extends Lexer {
             }
             switch (alt1) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8262:13: '0x'
+                    // InternalConfig.g:8261:13: '0x'
                     {
                     match("0x"); 
 
@@ -1165,7 +1165,7 @@ public class InternalConfigLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8262:18: '0X'
+                    // InternalConfig.g:8261:18: '0X'
                     {
                     match("0X"); 
 
@@ -1175,7 +1175,7 @@ public class InternalConfigLexer extends Lexer {
 
             }
 
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8262:24: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+
+            // InternalConfig.g:8261:24: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+
             int cnt2=0;
             loop2:
             do {
@@ -1189,7 +1189,7 @@ public class InternalConfigLexer extends Lexer {
 
                 switch (alt2) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:
+            	    // InternalConfig.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();
@@ -1229,10 +1229,10 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = RULE_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8264:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8264:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalConfig.g:8263:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+            // InternalConfig.g:8263:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8264:11: ( '^' )?
+            // InternalConfig.g:8263:11: ( '^' )?
             int alt3=2;
             int LA3_0 = input.LA(1);
 
@@ -1241,7 +1241,7 @@ public class InternalConfigLexer extends Lexer {
             }
             switch (alt3) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8264:11: '^'
+                    // InternalConfig.g:8263:11: '^'
                     {
                     match('^'); 
 
@@ -1259,7 +1259,7 @@ public class InternalConfigLexer extends Lexer {
                 recover(mse);
                 throw mse;}
 
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8264:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalConfig.g:8263:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             loop4:
             do {
                 int alt4=2;
@@ -1272,7 +1272,7 @@ public class InternalConfigLexer extends Lexer {
 
                 switch (alt4) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:
+            	    // InternalConfig.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();
@@ -1308,10 +1308,10 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = RULE_INT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8266:10: ( ( '0' .. '9' )+ )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8266:12: ( '0' .. '9' )+
+            // InternalConfig.g:8265:10: ( ( '0' .. '9' )+ )
+            // InternalConfig.g:8265:12: ( '0' .. '9' )+
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8266:12: ( '0' .. '9' )+
+            // InternalConfig.g:8265:12: ( '0' .. '9' )+
             int cnt5=0;
             loop5:
             do {
@@ -1325,7 +1325,7 @@ public class InternalConfigLexer extends Lexer {
 
                 switch (alt5) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8266:13: '0' .. '9'
+            	    // InternalConfig.g:8265:13: '0' .. '9'
             	    {
             	    matchRange('0','9'); 
 
@@ -1357,10 +1357,10 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = RULE_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8268:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8268:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalConfig.g:8267:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+            // InternalConfig.g:8267:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8268:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalConfig.g:8267:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             int alt8=2;
             int LA8_0 = input.LA(1);
 
@@ -1378,10 +1378,10 @@ public class InternalConfigLexer extends Lexer {
             }
             switch (alt8) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8268:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+                    // InternalConfig.g:8267:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
                     {
                     match('\"'); 
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8268:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+                    // InternalConfig.g:8267:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
                     loop6:
                     do {
                         int alt6=3;
@@ -1397,7 +1397,7 @@ public class InternalConfigLexer extends Lexer {
 
                         switch (alt6) {
                     	case 1 :
-                    	    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8268:21: '\\\\' .
+                    	    // InternalConfig.g:8267:21: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -1405,7 +1405,7 @@ public class InternalConfigLexer extends Lexer {
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8268:28: ~ ( ( '\\\\' | '\"' ) )
+                    	    // InternalConfig.g:8267:28: ~ ( ( '\\\\' | '\"' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -1430,10 +1430,10 @@ public class InternalConfigLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8268:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+                    // InternalConfig.g:8267:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
                     {
                     match('\''); 
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8268:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+                    // InternalConfig.g:8267:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
                     loop7:
                     do {
                         int alt7=3;
@@ -1449,7 +1449,7 @@ public class InternalConfigLexer extends Lexer {
 
                         switch (alt7) {
                     	case 1 :
-                    	    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8268:54: '\\\\' .
+                    	    // InternalConfig.g:8267:54: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -1457,7 +1457,7 @@ public class InternalConfigLexer extends Lexer {
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8268:61: ~ ( ( '\\\\' | '\\'' ) )
+                    	    // InternalConfig.g:8267:61: ~ ( ( '\\\\' | '\\'' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -1500,12 +1500,12 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = RULE_ML_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8270:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8270:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // InternalConfig.g:8269:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // InternalConfig.g:8269:19: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); 
 
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8270:24: ( options {greedy=false; } : . )*
+            // InternalConfig.g:8269:24: ( options {greedy=false; } : . )*
             loop9:
             do {
                 int alt9=2;
@@ -1530,7 +1530,7 @@ public class InternalConfigLexer extends Lexer {
 
                 switch (alt9) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8270:52: .
+            	    // InternalConfig.g:8269:52: .
             	    {
             	    matchAny(); 
 
@@ -1560,12 +1560,12 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = RULE_SL_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8272:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8272:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // InternalConfig.g:8271:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // InternalConfig.g:8271:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
             {
             match("//"); 
 
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8272:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            // InternalConfig.g:8271:24: (~ ( ( '\\n' | '\\r' ) ) )*
             loop10:
             do {
                 int alt10=2;
@@ -1578,7 +1578,7 @@ public class InternalConfigLexer extends Lexer {
 
                 switch (alt10) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8272:24: ~ ( ( '\\n' | '\\r' ) )
+            	    // InternalConfig.g:8271: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();
@@ -1598,7 +1598,7 @@ public class InternalConfigLexer extends Lexer {
                 }
             } while (true);
 
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8272:40: ( ( '\\r' )? '\\n' )?
+            // InternalConfig.g:8271:40: ( ( '\\r' )? '\\n' )?
             int alt12=2;
             int LA12_0 = input.LA(1);
 
@@ -1607,9 +1607,9 @@ public class InternalConfigLexer extends Lexer {
             }
             switch (alt12) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8272:41: ( '\\r' )? '\\n'
+                    // InternalConfig.g:8271:41: ( '\\r' )? '\\n'
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8272:41: ( '\\r' )?
+                    // InternalConfig.g:8271:41: ( '\\r' )?
                     int alt11=2;
                     int LA11_0 = input.LA(1);
 
@@ -1618,7 +1618,7 @@ public class InternalConfigLexer extends Lexer {
                     }
                     switch (alt11) {
                         case 1 :
-                            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8272:41: '\\r'
+                            // InternalConfig.g:8271:41: '\\r'
                             {
                             match('\r'); 
 
@@ -1650,10 +1650,10 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = RULE_WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8274:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8274:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalConfig.g:8273:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // InternalConfig.g:8273:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8274:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalConfig.g:8273:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             int cnt13=0;
             loop13:
             do {
@@ -1667,7 +1667,7 @@ public class InternalConfigLexer extends Lexer {
 
                 switch (alt13) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:
+            	    // InternalConfig.g:
             	    {
             	    if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) {
             	        input.consume();
@@ -1707,8 +1707,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = RULE_ANY_OTHER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8276:16: ( . )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8276:18: .
+            // InternalConfig.g:8275:16: ( . )
+            // InternalConfig.g:8275:18: .
             {
             matchAny(); 
 
@@ -1723,411 +1723,411 @@ public class InternalConfigLexer extends Lexer {
     // $ANTLR end "RULE_ANY_OTHER"
 
     public void mTokens() throws RecognitionException {
-        // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.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 | RULE_HEX | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+        // InternalConfig.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 | RULE_HEX | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
         int alt14=58;
         alt14 = dfa14.predict(input);
         switch (alt14) {
             case 1 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:10: T__12
+                // InternalConfig.g:1:10: T__12
                 {
                 mT__12(); 
 
                 }
                 break;
             case 2 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:16: T__13
+                // InternalConfig.g:1:16: T__13
                 {
                 mT__13(); 
 
                 }
                 break;
             case 3 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:22: T__14
+                // InternalConfig.g:1:22: T__14
                 {
                 mT__14(); 
 
                 }
                 break;
             case 4 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:28: T__15
+                // InternalConfig.g:1:28: T__15
                 {
                 mT__15(); 
 
                 }
                 break;
             case 5 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:34: T__16
+                // InternalConfig.g:1:34: T__16
                 {
                 mT__16(); 
 
                 }
                 break;
             case 6 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:40: T__17
+                // InternalConfig.g:1:40: T__17
                 {
                 mT__17(); 
 
                 }
                 break;
             case 7 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:46: T__18
+                // InternalConfig.g:1:46: T__18
                 {
                 mT__18(); 
 
                 }
                 break;
             case 8 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:52: T__19
+                // InternalConfig.g:1:52: T__19
                 {
                 mT__19(); 
 
                 }
                 break;
             case 9 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:58: T__20
+                // InternalConfig.g:1:58: T__20
                 {
                 mT__20(); 
 
                 }
                 break;
             case 10 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:64: T__21
+                // InternalConfig.g:1:64: T__21
                 {
                 mT__21(); 
 
                 }
                 break;
             case 11 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:70: T__22
+                // InternalConfig.g:1:70: T__22
                 {
                 mT__22(); 
 
                 }
                 break;
             case 12 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:76: T__23
+                // InternalConfig.g:1:76: T__23
                 {
                 mT__23(); 
 
                 }
                 break;
             case 13 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:82: T__24
+                // InternalConfig.g:1:82: T__24
                 {
                 mT__24(); 
 
                 }
                 break;
             case 14 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:88: T__25
+                // InternalConfig.g:1:88: T__25
                 {
                 mT__25(); 
 
                 }
                 break;
             case 15 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:94: T__26
+                // InternalConfig.g:1:94: T__26
                 {
                 mT__26(); 
 
                 }
                 break;
             case 16 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:100: T__27
+                // InternalConfig.g:1:100: T__27
                 {
                 mT__27(); 
 
                 }
                 break;
             case 17 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:106: T__28
+                // InternalConfig.g:1:106: T__28
                 {
                 mT__28(); 
 
                 }
                 break;
             case 18 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:112: T__29
+                // InternalConfig.g:1:112: T__29
                 {
                 mT__29(); 
 
                 }
                 break;
             case 19 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:118: T__30
+                // InternalConfig.g:1:118: T__30
                 {
                 mT__30(); 
 
                 }
                 break;
             case 20 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:124: T__31
+                // InternalConfig.g:1:124: T__31
                 {
                 mT__31(); 
 
                 }
                 break;
             case 21 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:130: T__32
+                // InternalConfig.g:1:130: T__32
                 {
                 mT__32(); 
 
                 }
                 break;
             case 22 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:136: T__33
+                // InternalConfig.g:1:136: T__33
                 {
                 mT__33(); 
 
                 }
                 break;
             case 23 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:142: T__34
+                // InternalConfig.g:1:142: T__34
                 {
                 mT__34(); 
 
                 }
                 break;
             case 24 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:148: T__35
+                // InternalConfig.g:1:148: T__35
                 {
                 mT__35(); 
 
                 }
                 break;
             case 25 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:154: T__36
+                // InternalConfig.g:1:154: T__36
                 {
                 mT__36(); 
 
                 }
                 break;
             case 26 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:160: T__37
+                // InternalConfig.g:1:160: T__37
                 {
                 mT__37(); 
 
                 }
                 break;
             case 27 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:166: T__38
+                // InternalConfig.g:1:166: T__38
                 {
                 mT__38(); 
 
                 }
                 break;
             case 28 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:172: T__39
+                // InternalConfig.g:1:172: T__39
                 {
                 mT__39(); 
 
                 }
                 break;
             case 29 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:178: T__40
+                // InternalConfig.g:1:178: T__40
                 {
                 mT__40(); 
 
                 }
                 break;
             case 30 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:184: T__41
+                // InternalConfig.g:1:184: T__41
                 {
                 mT__41(); 
 
                 }
                 break;
             case 31 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:190: T__42
+                // InternalConfig.g:1:190: T__42
                 {
                 mT__42(); 
 
                 }
                 break;
             case 32 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:196: T__43
+                // InternalConfig.g:1:196: T__43
                 {
                 mT__43(); 
 
                 }
                 break;
             case 33 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:202: T__44
+                // InternalConfig.g:1:202: T__44
                 {
                 mT__44(); 
 
                 }
                 break;
             case 34 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:208: T__45
+                // InternalConfig.g:1:208: T__45
                 {
                 mT__45(); 
 
                 }
                 break;
             case 35 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:214: T__46
+                // InternalConfig.g:1:214: T__46
                 {
                 mT__46(); 
 
                 }
                 break;
             case 36 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:220: T__47
+                // InternalConfig.g:1:220: T__47
                 {
                 mT__47(); 
 
                 }
                 break;
             case 37 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:226: T__48
+                // InternalConfig.g:1:226: T__48
                 {
                 mT__48(); 
 
                 }
                 break;
             case 38 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:232: T__49
+                // InternalConfig.g:1:232: T__49
                 {
                 mT__49(); 
 
                 }
                 break;
             case 39 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:238: T__50
+                // InternalConfig.g:1:238: T__50
                 {
                 mT__50(); 
 
                 }
                 break;
             case 40 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:244: T__51
+                // InternalConfig.g:1:244: T__51
                 {
                 mT__51(); 
 
                 }
                 break;
             case 41 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:250: T__52
+                // InternalConfig.g:1:250: T__52
                 {
                 mT__52(); 
 
                 }
                 break;
             case 42 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:256: T__53
+                // InternalConfig.g:1:256: T__53
                 {
                 mT__53(); 
 
                 }
                 break;
             case 43 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:262: T__54
+                // InternalConfig.g:1:262: T__54
                 {
                 mT__54(); 
 
                 }
                 break;
             case 44 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:268: T__55
+                // InternalConfig.g:1:268: T__55
                 {
                 mT__55(); 
 
                 }
                 break;
             case 45 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:274: T__56
+                // InternalConfig.g:1:274: T__56
                 {
                 mT__56(); 
 
                 }
                 break;
             case 46 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:280: T__57
+                // InternalConfig.g:1:280: T__57
                 {
                 mT__57(); 
 
                 }
                 break;
             case 47 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:286: T__58
+                // InternalConfig.g:1:286: T__58
                 {
                 mT__58(); 
 
                 }
                 break;
             case 48 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:292: T__59
+                // InternalConfig.g:1:292: T__59
                 {
                 mT__59(); 
 
                 }
                 break;
             case 49 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:298: T__60
+                // InternalConfig.g:1:298: T__60
                 {
                 mT__60(); 
 
                 }
                 break;
             case 50 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:304: T__61
+                // InternalConfig.g:1:304: T__61
                 {
                 mT__61(); 
 
                 }
                 break;
             case 51 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:310: RULE_HEX
+                // InternalConfig.g:1:310: RULE_HEX
                 {
                 mRULE_HEX(); 
 
                 }
                 break;
             case 52 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:319: RULE_ID
+                // InternalConfig.g:1:319: RULE_ID
                 {
                 mRULE_ID(); 
 
                 }
                 break;
             case 53 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:327: RULE_INT
+                // InternalConfig.g:1:327: RULE_INT
                 {
                 mRULE_INT(); 
 
                 }
                 break;
             case 54 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:336: RULE_STRING
+                // InternalConfig.g:1:336: RULE_STRING
                 {
                 mRULE_STRING(); 
 
                 }
                 break;
             case 55 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:348: RULE_ML_COMMENT
+                // InternalConfig.g:1:348: RULE_ML_COMMENT
                 {
                 mRULE_ML_COMMENT(); 
 
                 }
                 break;
             case 56 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:364: RULE_SL_COMMENT
+                // InternalConfig.g:1:364: RULE_SL_COMMENT
                 {
                 mRULE_SL_COMMENT(); 
 
                 }
                 break;
             case 57 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:380: RULE_WS
+                // InternalConfig.g:1:380: RULE_WS
                 {
                 mRULE_WS(); 
 
                 }
                 break;
             case 58 :
-                // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1:388: RULE_ANY_OTHER
+                // InternalConfig.g:1:388: RULE_ANY_OTHER
                 {
                 mRULE_ANY_OTHER(); 
 
@@ -2141,94 +2141,19 @@ public class InternalConfigLexer extends Lexer {
 
     protected DFA14 dfa14 = new DFA14(this);
     static final String DFA14_eotS =
-        "\1\uffff\4\52\2\uffff\1\65\1\66\2\52\2\uffff\1\52\1\77\6\52\2\uffff"+
-        "\1\113\1\uffff\2\52\2\uffff\1\121\3\52\1\126\1\50\2\uffff\2\50\2"+
-        "\uffff\1\52\1\uffff\4\52\1\137\3\52\4\uffff\3\52\2\uffff\1\52\3"+
-        "\uffff\1\52\1\154\6\52\5\uffff\2\52\3\uffff\1\166\2\52\4\uffff\3"+
-        "\52\1\174\1\52\1\176\1\uffff\14\52\1\uffff\11\52\1\uffff\5\52\1"+
-        "\uffff\1\52\1\uffff\2\52\1\u009c\12\52\1\u00a7\1\52\1\u00a9\1\52"+
-        "\1\u00ab\4\52\1\u00b0\1\52\1\u00b2\1\52\1\u00b4\1\u00b5\2\uffff"+
-        "\10\52\1\uffff\1\52\1\uffff\1\52\1\uffff\1\52\1\uffff\4\52\1\uffff"+
-        "\1\52\1\uffff\1\52\2\uffff\2\52\1\u00cc\5\52\2\uffff\6\52\1\u00d8"+
-        "\5\52\1\uffff\10\52\1\u00e6\2\52\1\uffff\6\52\1\uffff\2\52\1\uffff"+
-        "\3\52\1\uffff\2\52\1\u00f6\1\u00f8\1\u00f9\1\u00fa\1\u00fb\7\52"+
-        "\1\u0103\1\uffff\1\u0104\4\uffff\7\52\2\uffff\1\u010c\1\u010d\5"+
-        "\52\2\uffff\11\52\1\u011c\4\52\1\uffff\1\u0121\3\52\1\uffff\1\u0125"+
-        "\2\52\1\uffff\4\52\1\u012c\1\u012d\2\uffff";
+        "\1\uffff\4\52\2\uffff\1\65\1\66\2\52\2\uffff\1\52\1\77\6\52\2\uffff\1\113\1\uffff\2\52\2\uffff\1\121\3\52\1\126\1\50\2\uffff\2\50\2\uffff\1\52\1\uffff\4\52\1\137\3\52\4\uffff\3\52\2\uffff\1\52\3\uffff\1\52\1\154\6\52\5\uffff\2\52\3\uffff\1\166\2\52\4\uffff\3\52\1\174\1\52\1\176\1\uffff\14\52\1\uffff\11\52\1\uffff\5\52\1\uffff\1\52\1\uffff\2\52\1\u009c\12\52\1\u00a7\1\52\1\u00a9\1\52\1\u00ab\4\52\1\u00b0\1\52\1\u00b2\1\52\1\u00b4\1\u00b5\2\uffff\10\52\1\uffff\1\52\1\uffff\1\52\1\uffff\1\52\1\uffff\4\52\1\uffff\1\52\1\uffff\1\52\2\uffff\2\52\1\u00cc\5\52\2\uffff\6\52\1\u00d8\5\52\1\uffff\10\52\1\u00e6\2\52\1\uffff\6\52\1\uffff\2\52\1\uffff\3\52\1\uffff\2\52\1\u00f6\1\u00f8\1\u00f9\1\u00fa\1\u00fb\7\52\1\u0103\1\uffff\1\u0104\4\uffff\7\52\2\uffff\1\u010c\1\u010d\5\52\2\uffff\11\52\1\u011c\4\52\1\uffff\1\u0121\3\52\1\uffff\1\u0125\2\52\1\uffff\4\52\1\u012c\1\u012d\2\uffff";
     static final String DFA14_eofS =
         "\u012e\uffff";
     static final String DFA14_minS =
-        "\1\0\1\157\1\162\2\141\2\uffff\2\60\2\157\2\uffff\1\165\1\52\1"+
-        "\171\1\163\1\143\1\157\1\145\1\156\2\uffff\1\52\1\uffff\1\164\1"+
-        "\155\2\uffff\1\60\1\163\1\160\1\162\1\130\1\101\2\uffff\2\0\2\uffff"+
-        "\1\156\1\uffff\1\151\1\156\1\144\1\156\1\60\2\154\1\157\4\uffff"+
-        "\1\102\1\154\1\156\2\uffff\1\142\3\uffff\1\156\1\60\2\164\1\157"+
-        "\1\162\1\141\1\164\5\uffff\1\164\1\160\3\uffff\1\60\1\164\1\165"+
-        "\4\uffff\1\152\1\164\1\144\1\60\1\145\1\60\1\uffff\1\163\1\145\1"+
-        "\155\1\157\1\156\1\145\1\150\1\154\1\146\1\123\1\141\1\162\1\uffff"+
-        "\1\157\1\162\2\164\1\165\1\144\1\145\1\162\1\157\1\uffff\1\151\1"+
-        "\145\1\165\1\145\1\141\1\uffff\1\154\1\uffff\1\145\1\40\1\60\1\157"+
-        "\1\164\2\141\2\151\1\171\1\155\1\40\1\162\1\60\1\157\1\60\1\154"+
-        "\1\60\1\162\1\151\1\162\1\157\1\60\1\147\1\60\1\164\2\60\2\uffff"+
-        "\1\154\1\145\1\154\1\162\1\156\1\147\1\163\1\151\1\143\1\103\1\uffff"+
-        "\1\143\1\uffff\1\141\1\uffff\1\146\1\142\1\164\1\156\1\uffff\1\141"+
-        "\1\uffff\1\157\2\uffff\1\145\1\147\1\60\1\141\1\147\1\115\1\164"+
-        "\1\143\2\uffff\1\154\1\156\1\157\1\162\1\141\1\165\1\60\1\141\1"+
-        "\164\1\162\1\141\1\145\1\uffff\1\143\1\40\1\157\1\145\1\40\1\141"+
-        "\1\163\1\154\1\60\1\143\1\164\1\uffff\1\154\1\145\1\171\1\156\1"+
-        "\162\1\164\1\uffff\1\144\1\155\1\uffff\1\163\1\164\1\103\1\uffff"+
-        "\2\145\5\60\2\145\1\103\1\163\1\141\1\154\1\111\1\60\1\uffff\1\60"+
-        "\4\uffff\1\162\1\154\1\157\1\103\1\156\1\141\1\164\2\uffff\2\60"+
-        "\1\156\1\157\1\143\1\163\1\145\2\uffff\1\146\1\156\1\145\1\163\1"+
-        "\155\1\151\1\146\2\103\1\60\1\147\1\151\2\157\1\uffff\1\60\1\147"+
-        "\2\156\1\uffff\1\60\2\146\1\uffff\2\151\2\147\2\60\2\uffff";
+        "\1\0\1\157\1\162\2\141\2\uffff\2\60\2\157\2\uffff\1\165\1\52\1\171\1\163\1\143\1\157\1\145\1\156\2\uffff\1\52\1\uffff\1\164\1\155\2\uffff\1\60\1\163\1\160\1\162\1\130\1\101\2\uffff\2\0\2\uffff\1\156\1\uffff\1\151\1\156\1\144\1\156\1\60\2\154\1\157\4\uffff\1\102\1\154\1\156\2\uffff\1\142\3\uffff\1\156\1\60\2\164\1\157\1\162\1\141\1\164\5\uffff\1\164\1\160\3\uffff\1\60\1\164\1\165\4\uffff\1\152\1\164\1\144\1\60\1\145\1\60\1\uffff\1\163\1\145\1\155\1\157\1\156\1\145\1\150\1\154\1\146\1\123\1\141\1\162\1\uffff\1\157\1\162\2\164\1\165\1\144\1\145\1\162\1\157\1\uffff\1\151\1\145\1\165\1\145\1\141\1\uffff\1\154\1\uffff\1\145\1\40\1\60\1\157\1\164\2\141\2\151\1\171\1\155\1\40\1\162\1\60\1\157\1\60\1\154\1\60\1\162\1\151\1\162\1\157\1\60\1\147\1\60\1\164\2\60\2\uffff\1\154\1\145\1\154\1\162\1\156\1\147\1\163\1\151\1\143\1\103\1\uffff\1\143\1\uffff\1\141\1\uffff\1\146\1\142\1\164\1\156\1\uffff\1\141\1\uffff\1\157\2\uffff\1\145\1\147\1\60\1\141\1\147\1\115\1\164\1\143\2\uffff\1\154\1\156\1\157\1\162\1\141\1\165\1\60\1\141\1\164\1\162\1\141\1\145\1\uffff\1\143\1\40\1\157\1\145\1\40\1\141\1\163\1\154\1\60\1\143\1\164\1\uffff\1\154\1\145\1\171\1\156\1\162\1\164\1\uffff\1\144\1\155\1\uffff\1\163\1\164\1\103\1\uffff\2\145\5\60\2\145\1\103\1\163\1\141\1\154\1\111\1\60\1\uffff\1\60\4\uffff\1\162\1\154\1\157\1\103\1\156\1\141\1\164\2\uffff\2\60\1\156\1\157\1\143\1\163\1\145\2\uffff\1\146\1\156\1\145\1\163\1\155\1\151\1\146\2\103\1\60\1\147\1\151\2\157\1\uffff\1\60\1\147\2\156\1\uffff\1\60\2\146\1\uffff\2\151\2\147\2\60\2\uffff";
     static final String DFA14_maxS =
-        "\1\uffff\1\157\1\162\1\163\1\162\2\uffff\2\172\1\164\1\157\2\uffff"+
-        "\1\165\1\57\1\171\1\163\1\164\1\162\1\145\1\156\2\uffff\1\52\1\uffff"+
-        "\1\164\1\155\2\uffff\1\172\1\163\1\160\1\162\1\170\1\172\2\uffff"+
-        "\2\uffff\2\uffff\1\156\1\uffff\1\151\1\170\1\144\1\156\1\172\2\154"+
-        "\1\157\4\uffff\1\122\1\154\1\156\2\uffff\1\142\3\uffff\1\156\1\172"+
-        "\2\164\1\157\1\162\1\147\1\164\5\uffff\1\164\1\160\3\uffff\1\172"+
-        "\1\164\1\165\4\uffff\1\152\1\164\1\144\1\172\1\145\1\172\1\uffff"+
-        "\1\163\1\145\1\155\1\157\1\156\1\145\1\150\1\154\1\146\1\123\1\141"+
-        "\1\162\1\uffff\1\157\1\162\2\164\1\165\1\144\1\145\1\162\1\157\1"+
-        "\uffff\1\151\1\145\1\165\1\145\1\141\1\uffff\1\154\1\uffff\1\145"+
-        "\1\40\1\172\1\157\1\164\2\141\2\151\1\171\1\155\1\40\1\162\1\172"+
-        "\1\157\1\172\1\154\1\172\1\162\1\151\1\162\1\157\1\172\1\147\1\172"+
-        "\1\164\2\172\2\uffff\1\154\1\145\1\154\1\162\1\156\1\147\1\163\2"+
-        "\151\1\111\1\uffff\1\143\1\uffff\1\141\1\uffff\1\146\1\142\1\164"+
-        "\1\156\1\uffff\1\141\1\uffff\1\157\2\uffff\1\145\1\147\1\172\1\141"+
-        "\1\147\1\115\1\164\1\143\2\uffff\1\154\1\156\1\157\1\162\1\141\1"+
-        "\165\1\172\1\141\1\164\1\162\1\141\1\145\1\uffff\1\143\1\40\1\157"+
-        "\1\145\1\40\1\141\1\163\1\154\1\172\1\143\1\164\1\uffff\1\154\1"+
-        "\145\1\171\1\156\1\162\1\164\1\uffff\1\144\1\155\1\uffff\1\163\1"+
-        "\164\1\103\1\uffff\2\145\5\172\2\145\1\103\1\163\1\141\1\154\1\111"+
-        "\1\172\1\uffff\1\172\4\uffff\1\162\1\154\1\157\1\103\1\156\1\141"+
-        "\1\164\2\uffff\2\172\1\156\1\157\1\143\1\163\1\145\2\uffff\1\146"+
-        "\1\156\1\145\1\163\1\155\1\151\1\146\2\103\1\172\1\147\1\151\2\157"+
-        "\1\uffff\1\172\1\147\2\156\1\uffff\1\172\2\146\1\uffff\2\151\2\147"+
-        "\2\172\2\uffff";
+        "\1\uffff\1\157\1\162\1\163\1\162\2\uffff\2\172\1\164\1\157\2\uffff\1\165\1\57\1\171\1\163\1\164\1\162\1\145\1\156\2\uffff\1\52\1\uffff\1\164\1\155\2\uffff\1\172\1\163\1\160\1\162\1\170\1\172\2\uffff\2\uffff\2\uffff\1\156\1\uffff\1\151\1\170\1\144\1\156\1\172\2\154\1\157\4\uffff\1\122\1\154\1\156\2\uffff\1\142\3\uffff\1\156\1\172\2\164\1\157\1\162\1\147\1\164\5\uffff\1\164\1\160\3\uffff\1\172\1\164\1\165\4\uffff\1\152\1\164\1\144\1\172\1\145\1\172\1\uffff\1\163\1\145\1\155\1\157\1\156\1\145\1\150\1\154\1\146\1\123\1\141\1\162\1\uffff\1\157\1\162\2\164\1\165\1\144\1\145\1\162\1\157\1\uffff\1\151\1\145\1\165\1\145\1\141\1\uffff\1\154\1\uffff\1\145\1\40\1\172\1\157\1\164\2\141\2\151\1\171\1\155\1\40\1\162\1\172\1\157\1\172\1\154\1\172\1\162\1\151\1\162\1\157\1\172\1\147\1\172\1\164\2\172\2\uffff\1\154\1\145\1\154\1\162\1\156\1\147\1\163\2\151\1\111\1\uffff\1\143\1\uffff\1\141\1\uffff\1\146\1\142\1\164\1\156\1\uffff\1\141\1\uffff\1\157\2\uffff\1\145\1\147\1\172\1\141\1\147\1\115\1\164\1\143\2\uffff\1\154\1\156\1\157\1\162\1\141\1\165\1\172\1\141\1\164\1\162\1\141\1\145\1\uffff\1\143\1\40\1\157\1\145\1\40\1\141\1\163\1\154\1\172\1\143\1\164\1\uffff\1\154\1\145\1\171\1\156\1\162\1\164\1\uffff\1\144\1\155\1\uffff\1\163\1\164\1\103\1\uffff\2\145\5\172\2\145\1\103\1\163\1\141\1\154\1\111\1\172\1\uffff\1\172\4\uffff\1\162\1\154\1\157\1\103\1\156\1\141\1\164\2\uffff\2\172\1\156\1\157\1\143\1\163\1\145\2\uffff\1\146\1\156\1\145\1\163\1\155\1\151\1\146\2\103\1\172\1\147\1\151\2\157\1\uffff\1\172\1\147\2\156\1\uffff\1\172\2\146\1\uffff\2\151\2\147\2\172\2\uffff";
     static final String DFA14_acceptS =
-        "\5\uffff\1\7\1\10\4\uffff\1\20\1\21\10\uffff\1\40\1\43\1\uffff"+
-        "\1\45\2\uffff\1\52\1\53\6\uffff\1\64\1\65\2\uffff\1\71\1\72\1\uffff"+
-        "\1\64\10\uffff\1\7\1\10\1\11\1\12\3\uffff\1\20\1\21\1\uffff\1\67"+
-        "\1\70\1\23\10\uffff\1\40\1\43\1\51\1\44\1\45\2\uffff\1\52\1\53\1"+
-        "\54\3\uffff\1\63\1\65\1\66\1\71\6\uffff\1\55\14\uffff\1\56\11\uffff"+
-        "\1\57\5\uffff\1\42\1\uffff\1\41\34\uffff\1\25\1\50\12\uffff\1\37"+
-        "\1\uffff\1\35\1\uffff\1\60\4\uffff\1\62\1\uffff\1\3\1\uffff\1\5"+
-        "\1\6\10\uffff\1\26\1\27\14\uffff\1\15\13\uffff\1\47\6\uffff\1\30"+
-        "\2\uffff\1\24\3\uffff\1\34\17\uffff\1\61\1\uffff\1\1\1\4\1\13\1"+
-        "\14\7\uffff\1\46\1\2\7\uffff\1\16\1\17\16\uffff\1\36\4\uffff\1\22"+
-        "\3\uffff\1\31\6\uffff\1\32\1\33";
+        "\5\uffff\1\7\1\10\4\uffff\1\20\1\21\10\uffff\1\40\1\43\1\uffff\1\45\2\uffff\1\52\1\53\6\uffff\1\64\1\65\2\uffff\1\71\1\72\1\uffff\1\64\10\uffff\1\7\1\10\1\11\1\12\3\uffff\1\20\1\21\1\uffff\1\67\1\70\1\23\10\uffff\1\40\1\43\1\51\1\44\1\45\2\uffff\1\52\1\53\1\54\3\uffff\1\63\1\65\1\66\1\71\6\uffff\1\55\14\uffff\1\56\11\uffff\1\57\5\uffff\1\42\1\uffff\1\41\34\uffff\1\25\1\50\12\uffff\1\37\1\uffff\1\35\1\uffff\1\60\4\uffff\1\62\1\uffff\1\3\1\uffff\1\5\1\6\10\uffff\1\26\1\27\14\uffff\1\15\13\uffff\1\47\6\uffff\1\30\2\uffff\1\24\3\uffff\1\34\17\uffff\1\61\1\uffff\1\1\1\4\1\13\1\14\7\uffff\1\46\1\2\7\uffff\1\16\1\17\16\uffff\1\36\4\uffff\1\22\3\uffff\1\31\6\uffff\1\32\1\33";
     static final String DFA14_specialS =
         "\1\1\44\uffff\1\0\1\2\u0107\uffff}>";
     static final String[] DFA14_transitionS = {
-            "\11\50\2\47\2\50\1\47\22\50\1\47\1\50\1\45\4\50\1\46\3\50\1"+
-            "\5\1\26\1\6\1\27\1\16\1\41\11\44\1\30\2\50\1\25\3\50\1\21\1"+
-            "\43\1\12\1\43\1\10\3\43\1\24\6\43\1\22\2\43\1\15\7\43\1\33\1"+
-            "\50\1\34\1\42\1\43\1\50\1\31\1\43\1\1\1\17\1\7\1\4\2\43\1\32"+
-            "\3\43\1\3\1\36\1\37\1\11\1\43\1\23\1\35\1\40\1\20\1\43\1\2\3"+
-            "\43\1\13\1\50\1\14\uff82\50",
+            "\11\50\2\47\2\50\1\47\22\50\1\47\1\50\1\45\4\50\1\46\3\50\1\5\1\26\1\6\1\27\1\16\1\41\11\44\1\30\2\50\1\25\3\50\1\21\1\43\1\12\1\43\1\10\3\43\1\24\6\43\1\22\2\43\1\15\7\43\1\33\1\50\1\34\1\42\1\43\1\50\1\31\1\43\1\1\1\17\1\7\1\4\2\43\1\32\3\43\1\3\1\36\1\37\1\11\1\43\1\23\1\35\1\40\1\20\1\43\1\2\3\43\1\13\1\50\1\14\uff82\50",
             "\1\51",
             "\1\53",
             "\1\54\7\uffff\1\56\5\uffff\1\55\3\uffff\1\57",
@@ -2462,8 +2387,7 @@ public class InternalConfigLexer extends Lexer {
             "\1\u00f4",
             "\1\u00f5",
             "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52",
-            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\3\52\1\u00f7\26"+
-            "\52",
+            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\3\52\1\u00f7\26\52",
             "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52",
             "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52",
             "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52",
diff --git a/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfigParser.java b/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfigParser.java
index ada336608..8dff537fb 100644
--- a/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfigParser.java
+++ b/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfigParser.java
@@ -99,7 +99,7 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
         
 
     public String[] getTokenNames() { return InternalConfigParser.tokenNames; }
-    public String getGrammarFileName() { return "../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g"; }
+    public String getGrammarFileName() { return "InternalConfig.g"; }
 
 
      
@@ -123,16 +123,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleConfigModel"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:61:1: entryRuleConfigModel : ruleConfigModel EOF ;
+    // InternalConfig.g:60:1: entryRuleConfigModel : ruleConfigModel EOF ;
     public final void entryRuleConfigModel() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:62:1: ( ruleConfigModel EOF )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:63:1: ruleConfigModel EOF
+            // InternalConfig.g:61:1: ( ruleConfigModel EOF )
+            // InternalConfig.g:62:1: ruleConfigModel EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfigModelRule()); 
             }
-            pushFollow(FOLLOW_ruleConfigModel_in_entryRuleConfigModel67);
+            pushFollow(FOLLOW_1);
             ruleConfigModel();
 
             state._fsp--;
@@ -140,7 +140,7 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getConfigModelRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleConfigModel74); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -157,25 +157,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleConfigModel"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:70:1: ruleConfigModel : ( ( rule__ConfigModel__Group__0 ) ) ;
+    // InternalConfig.g:69:1: ruleConfigModel : ( ( rule__ConfigModel__Group__0 ) ) ;
     public final void ruleConfigModel() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:74:2: ( ( ( rule__ConfigModel__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:75:1: ( ( rule__ConfigModel__Group__0 ) )
+            // InternalConfig.g:73:2: ( ( ( rule__ConfigModel__Group__0 ) ) )
+            // InternalConfig.g:74:1: ( ( rule__ConfigModel__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:75:1: ( ( rule__ConfigModel__Group__0 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:76:1: ( rule__ConfigModel__Group__0 )
+            // InternalConfig.g:74:1: ( ( rule__ConfigModel__Group__0 ) )
+            // InternalConfig.g:75:1: ( rule__ConfigModel__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfigModelAccess().getGroup()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:77:1: ( rule__ConfigModel__Group__0 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:77:2: rule__ConfigModel__Group__0
+            // InternalConfig.g:76:1: ( rule__ConfigModel__Group__0 )
+            // InternalConfig.g:76:2: rule__ConfigModel__Group__0
             {
-            pushFollow(FOLLOW_rule__ConfigModel__Group__0_in_ruleConfigModel100);
+            pushFollow(FOLLOW_2);
             rule__ConfigModel__Group__0();
 
             state._fsp--;
@@ -208,16 +208,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleConfigElement"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:89:1: entryRuleConfigElement : ruleConfigElement EOF ;
+    // InternalConfig.g:88:1: entryRuleConfigElement : ruleConfigElement EOF ;
     public final void entryRuleConfigElement() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:90:1: ( ruleConfigElement EOF )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:91:1: ruleConfigElement EOF
+            // InternalConfig.g:89:1: ( ruleConfigElement EOF )
+            // InternalConfig.g:90:1: ruleConfigElement EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfigElementRule()); 
             }
-            pushFollow(FOLLOW_ruleConfigElement_in_entryRuleConfigElement127);
+            pushFollow(FOLLOW_1);
             ruleConfigElement();
 
             state._fsp--;
@@ -225,7 +225,7 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getConfigElementRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleConfigElement134); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -242,25 +242,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleConfigElement"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:98:1: ruleConfigElement : ( ( rule__ConfigElement__Alternatives ) ) ;
+    // InternalConfig.g:97:1: ruleConfigElement : ( ( rule__ConfigElement__Alternatives ) ) ;
     public final void ruleConfigElement() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:102:2: ( ( ( rule__ConfigElement__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:103:1: ( ( rule__ConfigElement__Alternatives ) )
+            // InternalConfig.g:101:2: ( ( ( rule__ConfigElement__Alternatives ) ) )
+            // InternalConfig.g:102:1: ( ( rule__ConfigElement__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:103:1: ( ( rule__ConfigElement__Alternatives ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:104:1: ( rule__ConfigElement__Alternatives )
+            // InternalConfig.g:102:1: ( ( rule__ConfigElement__Alternatives ) )
+            // InternalConfig.g:103:1: ( rule__ConfigElement__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfigElementAccess().getAlternatives()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:105:1: ( rule__ConfigElement__Alternatives )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:105:2: rule__ConfigElement__Alternatives
+            // InternalConfig.g:104:1: ( rule__ConfigElement__Alternatives )
+            // InternalConfig.g:104:2: rule__ConfigElement__Alternatives
             {
-            pushFollow(FOLLOW_rule__ConfigElement__Alternatives_in_ruleConfigElement160);
+            pushFollow(FOLLOW_2);
             rule__ConfigElement__Alternatives();
 
             state._fsp--;
@@ -293,16 +293,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleSubSystemConfig"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:117:1: entryRuleSubSystemConfig : ruleSubSystemConfig EOF ;
+    // InternalConfig.g:116:1: entryRuleSubSystemConfig : ruleSubSystemConfig EOF ;
     public final void entryRuleSubSystemConfig() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:118:1: ( ruleSubSystemConfig EOF )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:119:1: ruleSubSystemConfig EOF
+            // InternalConfig.g:117:1: ( ruleSubSystemConfig EOF )
+            // InternalConfig.g:118:1: ruleSubSystemConfig EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSubSystemConfigRule()); 
             }
-            pushFollow(FOLLOW_ruleSubSystemConfig_in_entryRuleSubSystemConfig187);
+            pushFollow(FOLLOW_1);
             ruleSubSystemConfig();
 
             state._fsp--;
@@ -310,7 +310,7 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSubSystemConfigRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSubSystemConfig194); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -327,25 +327,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleSubSystemConfig"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:126:1: ruleSubSystemConfig : ( ( rule__SubSystemConfig__Group__0 ) ) ;
+    // InternalConfig.g:125:1: ruleSubSystemConfig : ( ( rule__SubSystemConfig__Group__0 ) ) ;
     public final void ruleSubSystemConfig() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:130:2: ( ( ( rule__SubSystemConfig__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:131:1: ( ( rule__SubSystemConfig__Group__0 ) )
+            // InternalConfig.g:129:2: ( ( ( rule__SubSystemConfig__Group__0 ) ) )
+            // InternalConfig.g:130:1: ( ( rule__SubSystemConfig__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:131:1: ( ( rule__SubSystemConfig__Group__0 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:132:1: ( rule__SubSystemConfig__Group__0 )
+            // InternalConfig.g:130:1: ( ( rule__SubSystemConfig__Group__0 ) )
+            // InternalConfig.g:131:1: ( rule__SubSystemConfig__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSubSystemConfigAccess().getGroup()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:133:1: ( rule__SubSystemConfig__Group__0 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:133:2: rule__SubSystemConfig__Group__0
+            // InternalConfig.g:132:1: ( rule__SubSystemConfig__Group__0 )
+            // InternalConfig.g:132:2: rule__SubSystemConfig__Group__0
             {
-            pushFollow(FOLLOW_rule__SubSystemConfig__Group__0_in_ruleSubSystemConfig220);
+            pushFollow(FOLLOW_2);
             rule__SubSystemConfig__Group__0();
 
             state._fsp--;
@@ -378,16 +378,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleDynamicConfig"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:145:1: entryRuleDynamicConfig : ruleDynamicConfig EOF ;
+    // InternalConfig.g:144:1: entryRuleDynamicConfig : ruleDynamicConfig EOF ;
     public final void entryRuleDynamicConfig() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:146:1: ( ruleDynamicConfig EOF )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:147:1: ruleDynamicConfig EOF
+            // InternalConfig.g:145:1: ( ruleDynamicConfig EOF )
+            // InternalConfig.g:146:1: ruleDynamicConfig EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDynamicConfigRule()); 
             }
-            pushFollow(FOLLOW_ruleDynamicConfig_in_entryRuleDynamicConfig247);
+            pushFollow(FOLLOW_1);
             ruleDynamicConfig();
 
             state._fsp--;
@@ -395,7 +395,7 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getDynamicConfigRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDynamicConfig254); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -412,25 +412,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleDynamicConfig"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:154:1: ruleDynamicConfig : ( ( rule__DynamicConfig__Group__0 ) ) ;
+    // InternalConfig.g:153:1: ruleDynamicConfig : ( ( rule__DynamicConfig__Group__0 ) ) ;
     public final void ruleDynamicConfig() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:158:2: ( ( ( rule__DynamicConfig__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:159:1: ( ( rule__DynamicConfig__Group__0 ) )
+            // InternalConfig.g:157:2: ( ( ( rule__DynamicConfig__Group__0 ) ) )
+            // InternalConfig.g:158:1: ( ( rule__DynamicConfig__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:159:1: ( ( rule__DynamicConfig__Group__0 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:160:1: ( rule__DynamicConfig__Group__0 )
+            // InternalConfig.g:158:1: ( ( rule__DynamicConfig__Group__0 ) )
+            // InternalConfig.g:159:1: ( rule__DynamicConfig__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDynamicConfigAccess().getGroup()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:161:1: ( rule__DynamicConfig__Group__0 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:161:2: rule__DynamicConfig__Group__0
+            // InternalConfig.g:160:1: ( rule__DynamicConfig__Group__0 )
+            // InternalConfig.g:160:2: rule__DynamicConfig__Group__0
             {
-            pushFollow(FOLLOW_rule__DynamicConfig__Group__0_in_ruleDynamicConfig280);
+            pushFollow(FOLLOW_2);
             rule__DynamicConfig__Group__0();
 
             state._fsp--;
@@ -463,16 +463,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleActorClassConfig"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:173:1: entryRuleActorClassConfig : ruleActorClassConfig EOF ;
+    // InternalConfig.g:172:1: entryRuleActorClassConfig : ruleActorClassConfig EOF ;
     public final void entryRuleActorClassConfig() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:174:1: ( ruleActorClassConfig EOF )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:175:1: ruleActorClassConfig EOF
+            // InternalConfig.g:173:1: ( ruleActorClassConfig EOF )
+            // InternalConfig.g:174:1: ruleActorClassConfig EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getActorClassConfigRule()); 
             }
-            pushFollow(FOLLOW_ruleActorClassConfig_in_entryRuleActorClassConfig307);
+            pushFollow(FOLLOW_1);
             ruleActorClassConfig();
 
             state._fsp--;
@@ -480,7 +480,7 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getActorClassConfigRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleActorClassConfig314); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -497,25 +497,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleActorClassConfig"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:182:1: ruleActorClassConfig : ( ( rule__ActorClassConfig__Group__0 ) ) ;
+    // InternalConfig.g:181:1: ruleActorClassConfig : ( ( rule__ActorClassConfig__Group__0 ) ) ;
     public final void ruleActorClassConfig() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:186:2: ( ( ( rule__ActorClassConfig__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:187:1: ( ( rule__ActorClassConfig__Group__0 ) )
+            // InternalConfig.g:185:2: ( ( ( rule__ActorClassConfig__Group__0 ) ) )
+            // InternalConfig.g:186:1: ( ( rule__ActorClassConfig__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:187:1: ( ( rule__ActorClassConfig__Group__0 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:188:1: ( rule__ActorClassConfig__Group__0 )
+            // InternalConfig.g:186:1: ( ( rule__ActorClassConfig__Group__0 ) )
+            // InternalConfig.g:187:1: ( rule__ActorClassConfig__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getActorClassConfigAccess().getGroup()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:189:1: ( rule__ActorClassConfig__Group__0 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:189:2: rule__ActorClassConfig__Group__0
+            // InternalConfig.g:188:1: ( rule__ActorClassConfig__Group__0 )
+            // InternalConfig.g:188:2: rule__ActorClassConfig__Group__0
             {
-            pushFollow(FOLLOW_rule__ActorClassConfig__Group__0_in_ruleActorClassConfig340);
+            pushFollow(FOLLOW_2);
             rule__ActorClassConfig__Group__0();
 
             state._fsp--;
@@ -548,16 +548,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleActorInstanceConfig"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:201:1: entryRuleActorInstanceConfig : ruleActorInstanceConfig EOF ;
+    // InternalConfig.g:200:1: entryRuleActorInstanceConfig : ruleActorInstanceConfig EOF ;
     public final void entryRuleActorInstanceConfig() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:202:1: ( ruleActorInstanceConfig EOF )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:203:1: ruleActorInstanceConfig EOF
+            // InternalConfig.g:201:1: ( ruleActorInstanceConfig EOF )
+            // InternalConfig.g:202:1: ruleActorInstanceConfig EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getActorInstanceConfigRule()); 
             }
-            pushFollow(FOLLOW_ruleActorInstanceConfig_in_entryRuleActorInstanceConfig367);
+            pushFollow(FOLLOW_1);
             ruleActorInstanceConfig();
 
             state._fsp--;
@@ -565,7 +565,7 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getActorInstanceConfigRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleActorInstanceConfig374); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -582,25 +582,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleActorInstanceConfig"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:210:1: ruleActorInstanceConfig : ( ( rule__ActorInstanceConfig__Group__0 ) ) ;
+    // InternalConfig.g:209:1: ruleActorInstanceConfig : ( ( rule__ActorInstanceConfig__Group__0 ) ) ;
     public final void ruleActorInstanceConfig() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:214:2: ( ( ( rule__ActorInstanceConfig__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:215:1: ( ( rule__ActorInstanceConfig__Group__0 ) )
+            // InternalConfig.g:213:2: ( ( ( rule__ActorInstanceConfig__Group__0 ) ) )
+            // InternalConfig.g:214:1: ( ( rule__ActorInstanceConfig__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:215:1: ( ( rule__ActorInstanceConfig__Group__0 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:216:1: ( rule__ActorInstanceConfig__Group__0 )
+            // InternalConfig.g:214:1: ( ( rule__ActorInstanceConfig__Group__0 ) )
+            // InternalConfig.g:215:1: ( rule__ActorInstanceConfig__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getActorInstanceConfigAccess().getGroup()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:217:1: ( rule__ActorInstanceConfig__Group__0 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:217:2: rule__ActorInstanceConfig__Group__0
+            // InternalConfig.g:216:1: ( rule__ActorInstanceConfig__Group__0 )
+            // InternalConfig.g:216:2: rule__ActorInstanceConfig__Group__0
             {
-            pushFollow(FOLLOW_rule__ActorInstanceConfig__Group__0_in_ruleActorInstanceConfig400);
+            pushFollow(FOLLOW_2);
             rule__ActorInstanceConfig__Group__0();
 
             state._fsp--;
@@ -633,16 +633,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleProtocolClassConfig"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:229:1: entryRuleProtocolClassConfig : ruleProtocolClassConfig EOF ;
+    // InternalConfig.g:228:1: entryRuleProtocolClassConfig : ruleProtocolClassConfig EOF ;
     public final void entryRuleProtocolClassConfig() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:230:1: ( ruleProtocolClassConfig EOF )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:231:1: ruleProtocolClassConfig EOF
+            // InternalConfig.g:229:1: ( ruleProtocolClassConfig EOF )
+            // InternalConfig.g:230:1: ruleProtocolClassConfig EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getProtocolClassConfigRule()); 
             }
-            pushFollow(FOLLOW_ruleProtocolClassConfig_in_entryRuleProtocolClassConfig427);
+            pushFollow(FOLLOW_1);
             ruleProtocolClassConfig();
 
             state._fsp--;
@@ -650,7 +650,7 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getProtocolClassConfigRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleProtocolClassConfig434); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -667,25 +667,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleProtocolClassConfig"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:238:1: ruleProtocolClassConfig : ( ( rule__ProtocolClassConfig__Group__0 ) ) ;
+    // InternalConfig.g:237:1: ruleProtocolClassConfig : ( ( rule__ProtocolClassConfig__Group__0 ) ) ;
     public final void ruleProtocolClassConfig() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:242:2: ( ( ( rule__ProtocolClassConfig__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:243:1: ( ( rule__ProtocolClassConfig__Group__0 ) )
+            // InternalConfig.g:241:2: ( ( ( rule__ProtocolClassConfig__Group__0 ) ) )
+            // InternalConfig.g:242:1: ( ( rule__ProtocolClassConfig__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:243:1: ( ( rule__ProtocolClassConfig__Group__0 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:244:1: ( rule__ProtocolClassConfig__Group__0 )
+            // InternalConfig.g:242:1: ( ( rule__ProtocolClassConfig__Group__0 ) )
+            // InternalConfig.g:243:1: ( rule__ProtocolClassConfig__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getProtocolClassConfigAccess().getGroup()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:245:1: ( rule__ProtocolClassConfig__Group__0 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:245:2: rule__ProtocolClassConfig__Group__0
+            // InternalConfig.g:244:1: ( rule__ProtocolClassConfig__Group__0 )
+            // InternalConfig.g:244:2: rule__ProtocolClassConfig__Group__0
             {
-            pushFollow(FOLLOW_rule__ProtocolClassConfig__Group__0_in_ruleProtocolClassConfig460);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClassConfig__Group__0();
 
             state._fsp--;
@@ -718,16 +718,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRulePortClassConfig"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:257:1: entryRulePortClassConfig : rulePortClassConfig EOF ;
+    // InternalConfig.g:256:1: entryRulePortClassConfig : rulePortClassConfig EOF ;
     public final void entryRulePortClassConfig() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:258:1: ( rulePortClassConfig EOF )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:259:1: rulePortClassConfig EOF
+            // InternalConfig.g:257:1: ( rulePortClassConfig EOF )
+            // InternalConfig.g:258:1: rulePortClassConfig EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPortClassConfigRule()); 
             }
-            pushFollow(FOLLOW_rulePortClassConfig_in_entryRulePortClassConfig487);
+            pushFollow(FOLLOW_1);
             rulePortClassConfig();
 
             state._fsp--;
@@ -735,7 +735,7 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getPortClassConfigRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRulePortClassConfig494); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -752,25 +752,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rulePortClassConfig"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:266:1: rulePortClassConfig : ( ( rule__PortClassConfig__Group__0 ) ) ;
+    // InternalConfig.g:265:1: rulePortClassConfig : ( ( rule__PortClassConfig__Group__0 ) ) ;
     public final void rulePortClassConfig() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:270:2: ( ( ( rule__PortClassConfig__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:271:1: ( ( rule__PortClassConfig__Group__0 ) )
+            // InternalConfig.g:269:2: ( ( ( rule__PortClassConfig__Group__0 ) ) )
+            // InternalConfig.g:270:1: ( ( rule__PortClassConfig__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:271:1: ( ( rule__PortClassConfig__Group__0 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:272:1: ( rule__PortClassConfig__Group__0 )
+            // InternalConfig.g:270:1: ( ( rule__PortClassConfig__Group__0 ) )
+            // InternalConfig.g:271:1: ( rule__PortClassConfig__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPortClassConfigAccess().getGroup()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:273:1: ( rule__PortClassConfig__Group__0 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:273:2: rule__PortClassConfig__Group__0
+            // InternalConfig.g:272:1: ( rule__PortClassConfig__Group__0 )
+            // InternalConfig.g:272:2: rule__PortClassConfig__Group__0
             {
-            pushFollow(FOLLOW_rule__PortClassConfig__Group__0_in_rulePortClassConfig520);
+            pushFollow(FOLLOW_2);
             rule__PortClassConfig__Group__0();
 
             state._fsp--;
@@ -803,16 +803,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRulePortInstanceConfig"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:285:1: entryRulePortInstanceConfig : rulePortInstanceConfig EOF ;
+    // InternalConfig.g:284:1: entryRulePortInstanceConfig : rulePortInstanceConfig EOF ;
     public final void entryRulePortInstanceConfig() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:286:1: ( rulePortInstanceConfig EOF )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:287:1: rulePortInstanceConfig EOF
+            // InternalConfig.g:285:1: ( rulePortInstanceConfig EOF )
+            // InternalConfig.g:286:1: rulePortInstanceConfig EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPortInstanceConfigRule()); 
             }
-            pushFollow(FOLLOW_rulePortInstanceConfig_in_entryRulePortInstanceConfig547);
+            pushFollow(FOLLOW_1);
             rulePortInstanceConfig();
 
             state._fsp--;
@@ -820,7 +820,7 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getPortInstanceConfigRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRulePortInstanceConfig554); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -837,25 +837,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rulePortInstanceConfig"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:294:1: rulePortInstanceConfig : ( ( rule__PortInstanceConfig__Group__0 ) ) ;
+    // InternalConfig.g:293:1: rulePortInstanceConfig : ( ( rule__PortInstanceConfig__Group__0 ) ) ;
     public final void rulePortInstanceConfig() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:298:2: ( ( ( rule__PortInstanceConfig__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:299:1: ( ( rule__PortInstanceConfig__Group__0 ) )
+            // InternalConfig.g:297:2: ( ( ( rule__PortInstanceConfig__Group__0 ) ) )
+            // InternalConfig.g:298:1: ( ( rule__PortInstanceConfig__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:299:1: ( ( rule__PortInstanceConfig__Group__0 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:300:1: ( rule__PortInstanceConfig__Group__0 )
+            // InternalConfig.g:298:1: ( ( rule__PortInstanceConfig__Group__0 ) )
+            // InternalConfig.g:299:1: ( rule__PortInstanceConfig__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPortInstanceConfigAccess().getGroup()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:301:1: ( rule__PortInstanceConfig__Group__0 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:301:2: rule__PortInstanceConfig__Group__0
+            // InternalConfig.g:300:1: ( rule__PortInstanceConfig__Group__0 )
+            // InternalConfig.g:300:2: rule__PortInstanceConfig__Group__0
             {
-            pushFollow(FOLLOW_rule__PortInstanceConfig__Group__0_in_rulePortInstanceConfig580);
+            pushFollow(FOLLOW_2);
             rule__PortInstanceConfig__Group__0();
 
             state._fsp--;
@@ -888,16 +888,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleAttrClassConfig"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:315:1: entryRuleAttrClassConfig : ruleAttrClassConfig EOF ;
+    // InternalConfig.g:314:1: entryRuleAttrClassConfig : ruleAttrClassConfig EOF ;
     public final void entryRuleAttrClassConfig() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:316:1: ( ruleAttrClassConfig EOF )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:317:1: ruleAttrClassConfig EOF
+            // InternalConfig.g:315:1: ( ruleAttrClassConfig EOF )
+            // InternalConfig.g:316:1: ruleAttrClassConfig EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAttrClassConfigRule()); 
             }
-            pushFollow(FOLLOW_ruleAttrClassConfig_in_entryRuleAttrClassConfig609);
+            pushFollow(FOLLOW_1);
             ruleAttrClassConfig();
 
             state._fsp--;
@@ -905,7 +905,7 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getAttrClassConfigRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAttrClassConfig616); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -922,25 +922,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleAttrClassConfig"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:324:1: ruleAttrClassConfig : ( ( rule__AttrClassConfig__Group__0 ) ) ;
+    // InternalConfig.g:323:1: ruleAttrClassConfig : ( ( rule__AttrClassConfig__Group__0 ) ) ;
     public final void ruleAttrClassConfig() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:328:2: ( ( ( rule__AttrClassConfig__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:329:1: ( ( rule__AttrClassConfig__Group__0 ) )
+            // InternalConfig.g:327:2: ( ( ( rule__AttrClassConfig__Group__0 ) ) )
+            // InternalConfig.g:328:1: ( ( rule__AttrClassConfig__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:329:1: ( ( rule__AttrClassConfig__Group__0 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:330:1: ( rule__AttrClassConfig__Group__0 )
+            // InternalConfig.g:328:1: ( ( rule__AttrClassConfig__Group__0 ) )
+            // InternalConfig.g:329:1: ( rule__AttrClassConfig__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAttrClassConfigAccess().getGroup()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:331:1: ( rule__AttrClassConfig__Group__0 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:331:2: rule__AttrClassConfig__Group__0
+            // InternalConfig.g:330:1: ( rule__AttrClassConfig__Group__0 )
+            // InternalConfig.g:330:2: rule__AttrClassConfig__Group__0
             {
-            pushFollow(FOLLOW_rule__AttrClassConfig__Group__0_in_ruleAttrClassConfig642);
+            pushFollow(FOLLOW_2);
             rule__AttrClassConfig__Group__0();
 
             state._fsp--;
@@ -973,16 +973,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleAttrInstanceConfig"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:343:1: entryRuleAttrInstanceConfig : ruleAttrInstanceConfig EOF ;
+    // InternalConfig.g:342:1: entryRuleAttrInstanceConfig : ruleAttrInstanceConfig EOF ;
     public final void entryRuleAttrInstanceConfig() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:344:1: ( ruleAttrInstanceConfig EOF )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:345:1: ruleAttrInstanceConfig EOF
+            // InternalConfig.g:343:1: ( ruleAttrInstanceConfig EOF )
+            // InternalConfig.g:344:1: ruleAttrInstanceConfig EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAttrInstanceConfigRule()); 
             }
-            pushFollow(FOLLOW_ruleAttrInstanceConfig_in_entryRuleAttrInstanceConfig669);
+            pushFollow(FOLLOW_1);
             ruleAttrInstanceConfig();
 
             state._fsp--;
@@ -990,7 +990,7 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getAttrInstanceConfigRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAttrInstanceConfig676); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1007,25 +1007,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleAttrInstanceConfig"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:352:1: ruleAttrInstanceConfig : ( ( rule__AttrInstanceConfig__Group__0 ) ) ;
+    // InternalConfig.g:351:1: ruleAttrInstanceConfig : ( ( rule__AttrInstanceConfig__Group__0 ) ) ;
     public final void ruleAttrInstanceConfig() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:356:2: ( ( ( rule__AttrInstanceConfig__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:357:1: ( ( rule__AttrInstanceConfig__Group__0 ) )
+            // InternalConfig.g:355:2: ( ( ( rule__AttrInstanceConfig__Group__0 ) ) )
+            // InternalConfig.g:356:1: ( ( rule__AttrInstanceConfig__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:357:1: ( ( rule__AttrInstanceConfig__Group__0 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:358:1: ( rule__AttrInstanceConfig__Group__0 )
+            // InternalConfig.g:356:1: ( ( rule__AttrInstanceConfig__Group__0 ) )
+            // InternalConfig.g:357:1: ( rule__AttrInstanceConfig__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAttrInstanceConfigAccess().getGroup()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:359:1: ( rule__AttrInstanceConfig__Group__0 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:359:2: rule__AttrInstanceConfig__Group__0
+            // InternalConfig.g:358:1: ( rule__AttrInstanceConfig__Group__0 )
+            // InternalConfig.g:358:2: rule__AttrInstanceConfig__Group__0
             {
-            pushFollow(FOLLOW_rule__AttrInstanceConfig__Group__0_in_ruleAttrInstanceConfig702);
+            pushFollow(FOLLOW_2);
             rule__AttrInstanceConfig__Group__0();
 
             state._fsp--;
@@ -1058,16 +1058,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleConfigValueArray"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:371:1: entryRuleConfigValueArray : ruleConfigValueArray EOF ;
+    // InternalConfig.g:370:1: entryRuleConfigValueArray : ruleConfigValueArray EOF ;
     public final void entryRuleConfigValueArray() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:372:1: ( ruleConfigValueArray EOF )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:373:1: ruleConfigValueArray EOF
+            // InternalConfig.g:371:1: ( ruleConfigValueArray EOF )
+            // InternalConfig.g:372:1: ruleConfigValueArray EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfigValueArrayRule()); 
             }
-            pushFollow(FOLLOW_ruleConfigValueArray_in_entryRuleConfigValueArray729);
+            pushFollow(FOLLOW_1);
             ruleConfigValueArray();
 
             state._fsp--;
@@ -1075,7 +1075,7 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getConfigValueArrayRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleConfigValueArray736); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1092,25 +1092,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleConfigValueArray"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:380:1: ruleConfigValueArray : ( ( rule__ConfigValueArray__Group__0 ) ) ;
+    // InternalConfig.g:379:1: ruleConfigValueArray : ( ( rule__ConfigValueArray__Group__0 ) ) ;
     public final void ruleConfigValueArray() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:384:2: ( ( ( rule__ConfigValueArray__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:385:1: ( ( rule__ConfigValueArray__Group__0 ) )
+            // InternalConfig.g:383:2: ( ( ( rule__ConfigValueArray__Group__0 ) ) )
+            // InternalConfig.g:384:1: ( ( rule__ConfigValueArray__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:385:1: ( ( rule__ConfigValueArray__Group__0 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:386:1: ( rule__ConfigValueArray__Group__0 )
+            // InternalConfig.g:384:1: ( ( rule__ConfigValueArray__Group__0 ) )
+            // InternalConfig.g:385:1: ( rule__ConfigValueArray__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfigValueArrayAccess().getGroup()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:387:1: ( rule__ConfigValueArray__Group__0 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:387:2: rule__ConfigValueArray__Group__0
+            // InternalConfig.g:386:1: ( rule__ConfigValueArray__Group__0 )
+            // InternalConfig.g:386:2: rule__ConfigValueArray__Group__0
             {
-            pushFollow(FOLLOW_rule__ConfigValueArray__Group__0_in_ruleConfigValueArray762);
+            pushFollow(FOLLOW_2);
             rule__ConfigValueArray__Group__0();
 
             state._fsp--;
@@ -1143,16 +1143,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleConfigValue"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:399:1: entryRuleConfigValue : ruleConfigValue EOF ;
+    // InternalConfig.g:398:1: entryRuleConfigValue : ruleConfigValue EOF ;
     public final void entryRuleConfigValue() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:400:1: ( ruleConfigValue EOF )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:401:1: ruleConfigValue EOF
+            // InternalConfig.g:399:1: ( ruleConfigValue EOF )
+            // InternalConfig.g:400:1: ruleConfigValue EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfigValueRule()); 
             }
-            pushFollow(FOLLOW_ruleConfigValue_in_entryRuleConfigValue789);
+            pushFollow(FOLLOW_1);
             ruleConfigValue();
 
             state._fsp--;
@@ -1160,7 +1160,7 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getConfigValueRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleConfigValue796); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1177,25 +1177,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleConfigValue"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:408:1: ruleConfigValue : ( ( rule__ConfigValue__Alternatives ) ) ;
+    // InternalConfig.g:407:1: ruleConfigValue : ( ( rule__ConfigValue__Alternatives ) ) ;
     public final void ruleConfigValue() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:412:2: ( ( ( rule__ConfigValue__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:413:1: ( ( rule__ConfigValue__Alternatives ) )
+            // InternalConfig.g:411:2: ( ( ( rule__ConfigValue__Alternatives ) ) )
+            // InternalConfig.g:412:1: ( ( rule__ConfigValue__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:413:1: ( ( rule__ConfigValue__Alternatives ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:414:1: ( rule__ConfigValue__Alternatives )
+            // InternalConfig.g:412:1: ( ( rule__ConfigValue__Alternatives ) )
+            // InternalConfig.g:413:1: ( rule__ConfigValue__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfigValueAccess().getAlternatives()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:415:1: ( rule__ConfigValue__Alternatives )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:415:2: rule__ConfigValue__Alternatives
+            // InternalConfig.g:414:1: ( rule__ConfigValue__Alternatives )
+            // InternalConfig.g:414:2: rule__ConfigValue__Alternatives
             {
-            pushFollow(FOLLOW_rule__ConfigValue__Alternatives_in_ruleConfigValue822);
+            pushFollow(FOLLOW_2);
             rule__ConfigValue__Alternatives();
 
             state._fsp--;
@@ -1228,16 +1228,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleLiteralConfigValue"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:427:1: entryRuleLiteralConfigValue : ruleLiteralConfigValue EOF ;
+    // InternalConfig.g:426:1: entryRuleLiteralConfigValue : ruleLiteralConfigValue EOF ;
     public final void entryRuleLiteralConfigValue() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:428:1: ( ruleLiteralConfigValue EOF )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:429:1: ruleLiteralConfigValue EOF
+            // InternalConfig.g:427:1: ( ruleLiteralConfigValue EOF )
+            // InternalConfig.g:428:1: ruleLiteralConfigValue EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLiteralConfigValueRule()); 
             }
-            pushFollow(FOLLOW_ruleLiteralConfigValue_in_entryRuleLiteralConfigValue849);
+            pushFollow(FOLLOW_1);
             ruleLiteralConfigValue();
 
             state._fsp--;
@@ -1245,7 +1245,7 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getLiteralConfigValueRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleLiteralConfigValue856); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1262,25 +1262,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleLiteralConfigValue"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:436:1: ruleLiteralConfigValue : ( ( rule__LiteralConfigValue__ValueAssignment ) ) ;
+    // InternalConfig.g:435:1: ruleLiteralConfigValue : ( ( rule__LiteralConfigValue__ValueAssignment ) ) ;
     public final void ruleLiteralConfigValue() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:440:2: ( ( ( rule__LiteralConfigValue__ValueAssignment ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:441:1: ( ( rule__LiteralConfigValue__ValueAssignment ) )
+            // InternalConfig.g:439:2: ( ( ( rule__LiteralConfigValue__ValueAssignment ) ) )
+            // InternalConfig.g:440:1: ( ( rule__LiteralConfigValue__ValueAssignment ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:441:1: ( ( rule__LiteralConfigValue__ValueAssignment ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:442:1: ( rule__LiteralConfigValue__ValueAssignment )
+            // InternalConfig.g:440:1: ( ( rule__LiteralConfigValue__ValueAssignment ) )
+            // InternalConfig.g:441:1: ( rule__LiteralConfigValue__ValueAssignment )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLiteralConfigValueAccess().getValueAssignment()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:443:1: ( rule__LiteralConfigValue__ValueAssignment )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:443:2: rule__LiteralConfigValue__ValueAssignment
+            // InternalConfig.g:442:1: ( rule__LiteralConfigValue__ValueAssignment )
+            // InternalConfig.g:442:2: rule__LiteralConfigValue__ValueAssignment
             {
-            pushFollow(FOLLOW_rule__LiteralConfigValue__ValueAssignment_in_ruleLiteralConfigValue882);
+            pushFollow(FOLLOW_2);
             rule__LiteralConfigValue__ValueAssignment();
 
             state._fsp--;
@@ -1313,16 +1313,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleEnumConfigValue"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:455:1: entryRuleEnumConfigValue : ruleEnumConfigValue EOF ;
+    // InternalConfig.g:454:1: entryRuleEnumConfigValue : ruleEnumConfigValue EOF ;
     public final void entryRuleEnumConfigValue() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:456:1: ( ruleEnumConfigValue EOF )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:457:1: ruleEnumConfigValue EOF
+            // InternalConfig.g:455:1: ( ruleEnumConfigValue EOF )
+            // InternalConfig.g:456:1: ruleEnumConfigValue EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getEnumConfigValueRule()); 
             }
-            pushFollow(FOLLOW_ruleEnumConfigValue_in_entryRuleEnumConfigValue909);
+            pushFollow(FOLLOW_1);
             ruleEnumConfigValue();
 
             state._fsp--;
@@ -1330,7 +1330,7 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getEnumConfigValueRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleEnumConfigValue916); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1347,25 +1347,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleEnumConfigValue"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:464:1: ruleEnumConfigValue : ( ( rule__EnumConfigValue__Group__0 ) ) ;
+    // InternalConfig.g:463:1: ruleEnumConfigValue : ( ( rule__EnumConfigValue__Group__0 ) ) ;
     public final void ruleEnumConfigValue() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:468:2: ( ( ( rule__EnumConfigValue__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:469:1: ( ( rule__EnumConfigValue__Group__0 ) )
+            // InternalConfig.g:467:2: ( ( ( rule__EnumConfigValue__Group__0 ) ) )
+            // InternalConfig.g:468:1: ( ( rule__EnumConfigValue__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:469:1: ( ( rule__EnumConfigValue__Group__0 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:470:1: ( rule__EnumConfigValue__Group__0 )
+            // InternalConfig.g:468:1: ( ( rule__EnumConfigValue__Group__0 ) )
+            // InternalConfig.g:469:1: ( rule__EnumConfigValue__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getEnumConfigValueAccess().getGroup()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:471:1: ( rule__EnumConfigValue__Group__0 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:471:2: rule__EnumConfigValue__Group__0
+            // InternalConfig.g:470:1: ( rule__EnumConfigValue__Group__0 )
+            // InternalConfig.g:470:2: rule__EnumConfigValue__Group__0
             {
-            pushFollow(FOLLOW_rule__EnumConfigValue__Group__0_in_ruleEnumConfigValue942);
+            pushFollow(FOLLOW_2);
             rule__EnumConfigValue__Group__0();
 
             state._fsp--;
@@ -1398,16 +1398,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleRefPath"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:483:1: entryRuleRefPath : ruleRefPath EOF ;
+    // InternalConfig.g:482:1: entryRuleRefPath : ruleRefPath EOF ;
     public final void entryRuleRefPath() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:484:1: ( ruleRefPath EOF )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:485:1: ruleRefPath EOF
+            // InternalConfig.g:483:1: ( ruleRefPath EOF )
+            // InternalConfig.g:484:1: ruleRefPath EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRefPathRule()); 
             }
-            pushFollow(FOLLOW_ruleRefPath_in_entryRuleRefPath969);
+            pushFollow(FOLLOW_1);
             ruleRefPath();
 
             state._fsp--;
@@ -1415,7 +1415,7 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getRefPathRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRefPath976); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1432,25 +1432,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleRefPath"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:492:1: ruleRefPath : ( ( rule__RefPath__Group__0 ) ) ;
+    // InternalConfig.g:491:1: ruleRefPath : ( ( rule__RefPath__Group__0 ) ) ;
     public final void ruleRefPath() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:496:2: ( ( ( rule__RefPath__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:497:1: ( ( rule__RefPath__Group__0 ) )
+            // InternalConfig.g:495:2: ( ( ( rule__RefPath__Group__0 ) ) )
+            // InternalConfig.g:496:1: ( ( rule__RefPath__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:497:1: ( ( rule__RefPath__Group__0 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:498:1: ( rule__RefPath__Group__0 )
+            // InternalConfig.g:496:1: ( ( rule__RefPath__Group__0 ) )
+            // InternalConfig.g:497:1: ( rule__RefPath__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRefPathAccess().getGroup()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:499:1: ( rule__RefPath__Group__0 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:499:2: rule__RefPath__Group__0
+            // InternalConfig.g:498:1: ( rule__RefPath__Group__0 )
+            // InternalConfig.g:498:2: rule__RefPath__Group__0
             {
-            pushFollow(FOLLOW_rule__RefPath__Group__0_in_ruleRefPath1002);
+            pushFollow(FOLLOW_2);
             rule__RefPath__Group__0();
 
             state._fsp--;
@@ -1483,16 +1483,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleRefSegment"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:511:1: entryRuleRefSegment : ruleRefSegment EOF ;
+    // InternalConfig.g:510:1: entryRuleRefSegment : ruleRefSegment EOF ;
     public final void entryRuleRefSegment() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:512:1: ( ruleRefSegment EOF )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:513:1: ruleRefSegment EOF
+            // InternalConfig.g:511:1: ( ruleRefSegment EOF )
+            // InternalConfig.g:512:1: ruleRefSegment EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRefSegmentRule()); 
             }
-            pushFollow(FOLLOW_ruleRefSegment_in_entryRuleRefSegment1029);
+            pushFollow(FOLLOW_1);
             ruleRefSegment();
 
             state._fsp--;
@@ -1500,7 +1500,7 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getRefSegmentRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRefSegment1036); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1517,25 +1517,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleRefSegment"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:520:1: ruleRefSegment : ( ( rule__RefSegment__Group__0 ) ) ;
+    // InternalConfig.g:519:1: ruleRefSegment : ( ( rule__RefSegment__Group__0 ) ) ;
     public final void ruleRefSegment() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:524:2: ( ( ( rule__RefSegment__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:525:1: ( ( rule__RefSegment__Group__0 ) )
+            // InternalConfig.g:523:2: ( ( ( rule__RefSegment__Group__0 ) ) )
+            // InternalConfig.g:524:1: ( ( rule__RefSegment__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:525:1: ( ( rule__RefSegment__Group__0 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:526:1: ( rule__RefSegment__Group__0 )
+            // InternalConfig.g:524:1: ( ( rule__RefSegment__Group__0 ) )
+            // InternalConfig.g:525:1: ( rule__RefSegment__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRefSegmentAccess().getGroup()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:527:1: ( rule__RefSegment__Group__0 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:527:2: rule__RefSegment__Group__0
+            // InternalConfig.g:526:1: ( rule__RefSegment__Group__0 )
+            // InternalConfig.g:526:2: rule__RefSegment__Group__0
             {
-            pushFollow(FOLLOW_rule__RefSegment__Group__0_in_ruleRefSegment1062);
+            pushFollow(FOLLOW_2);
             rule__RefSegment__Group__0();
 
             state._fsp--;
@@ -1568,16 +1568,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleKeyValue"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:541:1: entryRuleKeyValue : ruleKeyValue EOF ;
+    // InternalConfig.g:540:1: entryRuleKeyValue : ruleKeyValue EOF ;
     public final void entryRuleKeyValue() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:542:1: ( ruleKeyValue EOF )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:543:1: ruleKeyValue EOF
+            // InternalConfig.g:541:1: ( ruleKeyValue EOF )
+            // InternalConfig.g:542:1: ruleKeyValue EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getKeyValueRule()); 
             }
-            pushFollow(FOLLOW_ruleKeyValue_in_entryRuleKeyValue1091);
+            pushFollow(FOLLOW_1);
             ruleKeyValue();
 
             state._fsp--;
@@ -1585,7 +1585,7 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getKeyValueRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleKeyValue1098); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1602,25 +1602,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleKeyValue"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:550:1: ruleKeyValue : ( ( rule__KeyValue__Group__0 ) ) ;
+    // InternalConfig.g:549:1: ruleKeyValue : ( ( rule__KeyValue__Group__0 ) ) ;
     public final void ruleKeyValue() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:554:2: ( ( ( rule__KeyValue__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:555:1: ( ( rule__KeyValue__Group__0 ) )
+            // InternalConfig.g:553:2: ( ( ( rule__KeyValue__Group__0 ) ) )
+            // InternalConfig.g:554:1: ( ( rule__KeyValue__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:555:1: ( ( rule__KeyValue__Group__0 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:556:1: ( rule__KeyValue__Group__0 )
+            // InternalConfig.g:554:1: ( ( rule__KeyValue__Group__0 ) )
+            // InternalConfig.g:555:1: ( rule__KeyValue__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getKeyValueAccess().getGroup()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:557:1: ( rule__KeyValue__Group__0 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:557:2: rule__KeyValue__Group__0
+            // InternalConfig.g:556:1: ( rule__KeyValue__Group__0 )
+            // InternalConfig.g:556:2: rule__KeyValue__Group__0
             {
-            pushFollow(FOLLOW_rule__KeyValue__Group__0_in_ruleKeyValue1124);
+            pushFollow(FOLLOW_2);
             rule__KeyValue__Group__0();
 
             state._fsp--;
@@ -1653,16 +1653,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleAnnotationTargetType"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:571:1: entryRuleAnnotationTargetType : ruleAnnotationTargetType EOF ;
+    // InternalConfig.g:570:1: entryRuleAnnotationTargetType : ruleAnnotationTargetType EOF ;
     public final void entryRuleAnnotationTargetType() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:572:1: ( ruleAnnotationTargetType EOF )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:573:1: ruleAnnotationTargetType EOF
+            // InternalConfig.g:571:1: ( ruleAnnotationTargetType EOF )
+            // InternalConfig.g:572:1: ruleAnnotationTargetType EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAnnotationTargetTypeRule()); 
             }
-            pushFollow(FOLLOW_ruleAnnotationTargetType_in_entryRuleAnnotationTargetType1153);
+            pushFollow(FOLLOW_1);
             ruleAnnotationTargetType();
 
             state._fsp--;
@@ -1670,7 +1670,7 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getAnnotationTargetTypeRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAnnotationTargetType1160); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1687,22 +1687,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleAnnotationTargetType"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:580:1: ruleAnnotationTargetType : ( RULE_ID ) ;
+    // InternalConfig.g:579:1: ruleAnnotationTargetType : ( RULE_ID ) ;
     public final void ruleAnnotationTargetType() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:584:2: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:585:1: ( RULE_ID )
+            // InternalConfig.g:583:2: ( ( RULE_ID ) )
+            // InternalConfig.g:584:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:585:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:586:1: RULE_ID
+            // InternalConfig.g:584:1: ( RULE_ID )
+            // InternalConfig.g:585:1: RULE_ID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAnnotationTargetTypeAccess().getIDTerminalRuleCall()); 
             }
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleAnnotationTargetType1186); if (state.failed) return ;
+            match(input,RULE_ID,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getAnnotationTargetTypeAccess().getIDTerminalRuleCall()); 
             }
@@ -1728,16 +1728,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleAnnotationAttribute"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:599:1: entryRuleAnnotationAttribute : ruleAnnotationAttribute EOF ;
+    // InternalConfig.g:598:1: entryRuleAnnotationAttribute : ruleAnnotationAttribute EOF ;
     public final void entryRuleAnnotationAttribute() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:600:1: ( ruleAnnotationAttribute EOF )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:601:1: ruleAnnotationAttribute EOF
+            // InternalConfig.g:599:1: ( ruleAnnotationAttribute EOF )
+            // InternalConfig.g:600:1: ruleAnnotationAttribute EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAnnotationAttributeRule()); 
             }
-            pushFollow(FOLLOW_ruleAnnotationAttribute_in_entryRuleAnnotationAttribute1212);
+            pushFollow(FOLLOW_1);
             ruleAnnotationAttribute();
 
             state._fsp--;
@@ -1745,7 +1745,7 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getAnnotationAttributeRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAnnotationAttribute1219); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1762,25 +1762,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleAnnotationAttribute"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:608:1: ruleAnnotationAttribute : ( ( rule__AnnotationAttribute__Alternatives ) ) ;
+    // InternalConfig.g:607:1: ruleAnnotationAttribute : ( ( rule__AnnotationAttribute__Alternatives ) ) ;
     public final void ruleAnnotationAttribute() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:612:2: ( ( ( rule__AnnotationAttribute__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:613:1: ( ( rule__AnnotationAttribute__Alternatives ) )
+            // InternalConfig.g:611:2: ( ( ( rule__AnnotationAttribute__Alternatives ) ) )
+            // InternalConfig.g:612:1: ( ( rule__AnnotationAttribute__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:613:1: ( ( rule__AnnotationAttribute__Alternatives ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:614:1: ( rule__AnnotationAttribute__Alternatives )
+            // InternalConfig.g:612:1: ( ( rule__AnnotationAttribute__Alternatives ) )
+            // InternalConfig.g:613:1: ( rule__AnnotationAttribute__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAnnotationAttributeAccess().getAlternatives()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:615:1: ( rule__AnnotationAttribute__Alternatives )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:615:2: rule__AnnotationAttribute__Alternatives
+            // InternalConfig.g:614:1: ( rule__AnnotationAttribute__Alternatives )
+            // InternalConfig.g:614:2: rule__AnnotationAttribute__Alternatives
             {
-            pushFollow(FOLLOW_rule__AnnotationAttribute__Alternatives_in_ruleAnnotationAttribute1245);
+            pushFollow(FOLLOW_2);
             rule__AnnotationAttribute__Alternatives();
 
             state._fsp--;
@@ -1813,16 +1813,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleSimpleAnnotationAttribute"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:627:1: entryRuleSimpleAnnotationAttribute : ruleSimpleAnnotationAttribute EOF ;
+    // InternalConfig.g:626:1: entryRuleSimpleAnnotationAttribute : ruleSimpleAnnotationAttribute EOF ;
     public final void entryRuleSimpleAnnotationAttribute() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:628:1: ( ruleSimpleAnnotationAttribute EOF )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:629:1: ruleSimpleAnnotationAttribute EOF
+            // InternalConfig.g:627:1: ( ruleSimpleAnnotationAttribute EOF )
+            // InternalConfig.g:628:1: ruleSimpleAnnotationAttribute EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSimpleAnnotationAttributeRule()); 
             }
-            pushFollow(FOLLOW_ruleSimpleAnnotationAttribute_in_entryRuleSimpleAnnotationAttribute1272);
+            pushFollow(FOLLOW_1);
             ruleSimpleAnnotationAttribute();
 
             state._fsp--;
@@ -1830,7 +1830,7 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSimpleAnnotationAttributeRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSimpleAnnotationAttribute1279); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1847,25 +1847,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleSimpleAnnotationAttribute"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:636:1: ruleSimpleAnnotationAttribute : ( ( rule__SimpleAnnotationAttribute__Group__0 ) ) ;
+    // InternalConfig.g:635:1: ruleSimpleAnnotationAttribute : ( ( rule__SimpleAnnotationAttribute__Group__0 ) ) ;
     public final void ruleSimpleAnnotationAttribute() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:640:2: ( ( ( rule__SimpleAnnotationAttribute__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:641:1: ( ( rule__SimpleAnnotationAttribute__Group__0 ) )
+            // InternalConfig.g:639:2: ( ( ( rule__SimpleAnnotationAttribute__Group__0 ) ) )
+            // InternalConfig.g:640:1: ( ( rule__SimpleAnnotationAttribute__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:641:1: ( ( rule__SimpleAnnotationAttribute__Group__0 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:642:1: ( rule__SimpleAnnotationAttribute__Group__0 )
+            // InternalConfig.g:640:1: ( ( rule__SimpleAnnotationAttribute__Group__0 ) )
+            // InternalConfig.g:641:1: ( rule__SimpleAnnotationAttribute__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSimpleAnnotationAttributeAccess().getGroup()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:643:1: ( rule__SimpleAnnotationAttribute__Group__0 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:643:2: rule__SimpleAnnotationAttribute__Group__0
+            // InternalConfig.g:642:1: ( rule__SimpleAnnotationAttribute__Group__0 )
+            // InternalConfig.g:642:2: rule__SimpleAnnotationAttribute__Group__0
             {
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__0_in_ruleSimpleAnnotationAttribute1305);
+            pushFollow(FOLLOW_2);
             rule__SimpleAnnotationAttribute__Group__0();
 
             state._fsp--;
@@ -1898,16 +1898,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleEnumAnnotationAttribute"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:655:1: entryRuleEnumAnnotationAttribute : ruleEnumAnnotationAttribute EOF ;
+    // InternalConfig.g:654:1: entryRuleEnumAnnotationAttribute : ruleEnumAnnotationAttribute EOF ;
     public final void entryRuleEnumAnnotationAttribute() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:656:1: ( ruleEnumAnnotationAttribute EOF )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:657:1: ruleEnumAnnotationAttribute EOF
+            // InternalConfig.g:655:1: ( ruleEnumAnnotationAttribute EOF )
+            // InternalConfig.g:656:1: ruleEnumAnnotationAttribute EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getEnumAnnotationAttributeRule()); 
             }
-            pushFollow(FOLLOW_ruleEnumAnnotationAttribute_in_entryRuleEnumAnnotationAttribute1332);
+            pushFollow(FOLLOW_1);
             ruleEnumAnnotationAttribute();
 
             state._fsp--;
@@ -1915,7 +1915,7 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getEnumAnnotationAttributeRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleEnumAnnotationAttribute1339); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1932,25 +1932,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleEnumAnnotationAttribute"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:664:1: ruleEnumAnnotationAttribute : ( ( rule__EnumAnnotationAttribute__Group__0 ) ) ;
+    // InternalConfig.g:663:1: ruleEnumAnnotationAttribute : ( ( rule__EnumAnnotationAttribute__Group__0 ) ) ;
     public final void ruleEnumAnnotationAttribute() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:668:2: ( ( ( rule__EnumAnnotationAttribute__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:669:1: ( ( rule__EnumAnnotationAttribute__Group__0 ) )
+            // InternalConfig.g:667:2: ( ( ( rule__EnumAnnotationAttribute__Group__0 ) ) )
+            // InternalConfig.g:668:1: ( ( rule__EnumAnnotationAttribute__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:669:1: ( ( rule__EnumAnnotationAttribute__Group__0 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:670:1: ( rule__EnumAnnotationAttribute__Group__0 )
+            // InternalConfig.g:668:1: ( ( rule__EnumAnnotationAttribute__Group__0 ) )
+            // InternalConfig.g:669:1: ( rule__EnumAnnotationAttribute__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getEnumAnnotationAttributeAccess().getGroup()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:671:1: ( rule__EnumAnnotationAttribute__Group__0 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:671:2: rule__EnumAnnotationAttribute__Group__0
+            // InternalConfig.g:670:1: ( rule__EnumAnnotationAttribute__Group__0 )
+            // InternalConfig.g:670:2: rule__EnumAnnotationAttribute__Group__0
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__0_in_ruleEnumAnnotationAttribute1365);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group__0();
 
             state._fsp--;
@@ -1983,16 +1983,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleImport"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:683:1: entryRuleImport : ruleImport EOF ;
+    // InternalConfig.g:682:1: entryRuleImport : ruleImport EOF ;
     public final void entryRuleImport() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:684:1: ( ruleImport EOF )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:685:1: ruleImport EOF
+            // InternalConfig.g:683:1: ( ruleImport EOF )
+            // InternalConfig.g:684:1: ruleImport EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImportRule()); 
             }
-            pushFollow(FOLLOW_ruleImport_in_entryRuleImport1392);
+            pushFollow(FOLLOW_1);
             ruleImport();
 
             state._fsp--;
@@ -2000,7 +2000,7 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getImportRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleImport1399); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2017,25 +2017,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleImport"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:692:1: ruleImport : ( ( rule__Import__Group__0 ) ) ;
+    // InternalConfig.g:691:1: ruleImport : ( ( rule__Import__Group__0 ) ) ;
     public final void ruleImport() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:696:2: ( ( ( rule__Import__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:697:1: ( ( rule__Import__Group__0 ) )
+            // InternalConfig.g:695:2: ( ( ( rule__Import__Group__0 ) ) )
+            // InternalConfig.g:696:1: ( ( rule__Import__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:697:1: ( ( rule__Import__Group__0 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:698:1: ( rule__Import__Group__0 )
+            // InternalConfig.g:696:1: ( ( rule__Import__Group__0 ) )
+            // InternalConfig.g:697:1: ( rule__Import__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImportAccess().getGroup()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:699:1: ( rule__Import__Group__0 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:699:2: rule__Import__Group__0
+            // InternalConfig.g:698:1: ( rule__Import__Group__0 )
+            // InternalConfig.g:698:2: rule__Import__Group__0
             {
-            pushFollow(FOLLOW_rule__Import__Group__0_in_ruleImport1425);
+            pushFollow(FOLLOW_2);
             rule__Import__Group__0();
 
             state._fsp--;
@@ -2068,16 +2068,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleImportedFQN"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:711:1: entryRuleImportedFQN : ruleImportedFQN EOF ;
+    // InternalConfig.g:710:1: entryRuleImportedFQN : ruleImportedFQN EOF ;
     public final void entryRuleImportedFQN() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:712:1: ( ruleImportedFQN EOF )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:713:1: ruleImportedFQN EOF
+            // InternalConfig.g:711:1: ( ruleImportedFQN EOF )
+            // InternalConfig.g:712:1: ruleImportedFQN EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImportedFQNRule()); 
             }
-            pushFollow(FOLLOW_ruleImportedFQN_in_entryRuleImportedFQN1452);
+            pushFollow(FOLLOW_1);
             ruleImportedFQN();
 
             state._fsp--;
@@ -2085,7 +2085,7 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getImportedFQNRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleImportedFQN1459); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2102,25 +2102,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleImportedFQN"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:720:1: ruleImportedFQN : ( ( rule__ImportedFQN__Group__0 ) ) ;
+    // InternalConfig.g:719:1: ruleImportedFQN : ( ( rule__ImportedFQN__Group__0 ) ) ;
     public final void ruleImportedFQN() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:724:2: ( ( ( rule__ImportedFQN__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:725:1: ( ( rule__ImportedFQN__Group__0 ) )
+            // InternalConfig.g:723:2: ( ( ( rule__ImportedFQN__Group__0 ) ) )
+            // InternalConfig.g:724:1: ( ( rule__ImportedFQN__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:725:1: ( ( rule__ImportedFQN__Group__0 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:726:1: ( rule__ImportedFQN__Group__0 )
+            // InternalConfig.g:724:1: ( ( rule__ImportedFQN__Group__0 ) )
+            // InternalConfig.g:725:1: ( rule__ImportedFQN__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImportedFQNAccess().getGroup()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:727:1: ( rule__ImportedFQN__Group__0 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:727:2: rule__ImportedFQN__Group__0
+            // InternalConfig.g:726:1: ( rule__ImportedFQN__Group__0 )
+            // InternalConfig.g:726:2: rule__ImportedFQN__Group__0
             {
-            pushFollow(FOLLOW_rule__ImportedFQN__Group__0_in_ruleImportedFQN1485);
+            pushFollow(FOLLOW_2);
             rule__ImportedFQN__Group__0();
 
             state._fsp--;
@@ -2153,16 +2153,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleDocumentation"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:739:1: entryRuleDocumentation : ruleDocumentation EOF ;
+    // InternalConfig.g:738:1: entryRuleDocumentation : ruleDocumentation EOF ;
     public final void entryRuleDocumentation() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:740:1: ( ruleDocumentation EOF )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:741:1: ruleDocumentation EOF
+            // InternalConfig.g:739:1: ( ruleDocumentation EOF )
+            // InternalConfig.g:740:1: ruleDocumentation EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDocumentationRule()); 
             }
-            pushFollow(FOLLOW_ruleDocumentation_in_entryRuleDocumentation1512);
+            pushFollow(FOLLOW_1);
             ruleDocumentation();
 
             state._fsp--;
@@ -2170,7 +2170,7 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getDocumentationRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDocumentation1519); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2187,25 +2187,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleDocumentation"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:748:1: ruleDocumentation : ( ( rule__Documentation__Group__0 ) ) ;
+    // InternalConfig.g:747:1: ruleDocumentation : ( ( rule__Documentation__Group__0 ) ) ;
     public final void ruleDocumentation() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:752:2: ( ( ( rule__Documentation__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:753:1: ( ( rule__Documentation__Group__0 ) )
+            // InternalConfig.g:751:2: ( ( ( rule__Documentation__Group__0 ) ) )
+            // InternalConfig.g:752:1: ( ( rule__Documentation__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:753:1: ( ( rule__Documentation__Group__0 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:754:1: ( rule__Documentation__Group__0 )
+            // InternalConfig.g:752:1: ( ( rule__Documentation__Group__0 ) )
+            // InternalConfig.g:753:1: ( rule__Documentation__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDocumentationAccess().getGroup()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:755:1: ( rule__Documentation__Group__0 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:755:2: rule__Documentation__Group__0
+            // InternalConfig.g:754:1: ( rule__Documentation__Group__0 )
+            // InternalConfig.g:754:2: rule__Documentation__Group__0
             {
-            pushFollow(FOLLOW_rule__Documentation__Group__0_in_ruleDocumentation1545);
+            pushFollow(FOLLOW_2);
             rule__Documentation__Group__0();
 
             state._fsp--;
@@ -2238,16 +2238,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleTIME"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:767:1: entryRuleTIME : ruleTIME EOF ;
+    // InternalConfig.g:766:1: entryRuleTIME : ruleTIME EOF ;
     public final void entryRuleTIME() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:768:1: ( ruleTIME EOF )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:769:1: ruleTIME EOF
+            // InternalConfig.g:767:1: ( ruleTIME EOF )
+            // InternalConfig.g:768:1: ruleTIME EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTIMERule()); 
             }
-            pushFollow(FOLLOW_ruleTIME_in_entryRuleTIME1572);
+            pushFollow(FOLLOW_1);
             ruleTIME();
 
             state._fsp--;
@@ -2255,7 +2255,7 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getTIMERule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleTIME1579); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2272,25 +2272,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleTIME"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:776:1: ruleTIME : ( ( rule__TIME__Alternatives ) ) ;
+    // InternalConfig.g:775:1: ruleTIME : ( ( rule__TIME__Alternatives ) ) ;
     public final void ruleTIME() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:780:2: ( ( ( rule__TIME__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:781:1: ( ( rule__TIME__Alternatives ) )
+            // InternalConfig.g:779:2: ( ( ( rule__TIME__Alternatives ) ) )
+            // InternalConfig.g:780:1: ( ( rule__TIME__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:781:1: ( ( rule__TIME__Alternatives ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:782:1: ( rule__TIME__Alternatives )
+            // InternalConfig.g:780:1: ( ( rule__TIME__Alternatives ) )
+            // InternalConfig.g:781:1: ( rule__TIME__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTIMEAccess().getAlternatives()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:783:1: ( rule__TIME__Alternatives )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:783:2: rule__TIME__Alternatives
+            // InternalConfig.g:782:1: ( rule__TIME__Alternatives )
+            // InternalConfig.g:782:2: rule__TIME__Alternatives
             {
-            pushFollow(FOLLOW_rule__TIME__Alternatives_in_ruleTIME1605);
+            pushFollow(FOLLOW_2);
             rule__TIME__Alternatives();
 
             state._fsp--;
@@ -2323,16 +2323,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleLiteral"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:797:1: entryRuleLiteral : ruleLiteral EOF ;
+    // InternalConfig.g:796:1: entryRuleLiteral : ruleLiteral EOF ;
     public final void entryRuleLiteral() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:798:1: ( ruleLiteral EOF )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:799:1: ruleLiteral EOF
+            // InternalConfig.g:797:1: ( ruleLiteral EOF )
+            // InternalConfig.g:798:1: ruleLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleLiteral_in_entryRuleLiteral1634);
+            pushFollow(FOLLOW_1);
             ruleLiteral();
 
             state._fsp--;
@@ -2340,7 +2340,7 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleLiteral1641); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2357,25 +2357,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleLiteral"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:806:1: ruleLiteral : ( ( rule__Literal__Alternatives ) ) ;
+    // InternalConfig.g:805:1: ruleLiteral : ( ( rule__Literal__Alternatives ) ) ;
     public final void ruleLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:810:2: ( ( ( rule__Literal__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:811:1: ( ( rule__Literal__Alternatives ) )
+            // InternalConfig.g:809:2: ( ( ( rule__Literal__Alternatives ) ) )
+            // InternalConfig.g:810:1: ( ( rule__Literal__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:811:1: ( ( rule__Literal__Alternatives ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:812:1: ( rule__Literal__Alternatives )
+            // InternalConfig.g:810:1: ( ( rule__Literal__Alternatives ) )
+            // InternalConfig.g:811:1: ( rule__Literal__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLiteralAccess().getAlternatives()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:813:1: ( rule__Literal__Alternatives )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:813:2: rule__Literal__Alternatives
+            // InternalConfig.g:812:1: ( rule__Literal__Alternatives )
+            // InternalConfig.g:812:2: rule__Literal__Alternatives
             {
-            pushFollow(FOLLOW_rule__Literal__Alternatives_in_ruleLiteral1667);
+            pushFollow(FOLLOW_2);
             rule__Literal__Alternatives();
 
             state._fsp--;
@@ -2408,16 +2408,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleBooleanLiteral"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:825:1: entryRuleBooleanLiteral : ruleBooleanLiteral EOF ;
+    // InternalConfig.g:824:1: entryRuleBooleanLiteral : ruleBooleanLiteral EOF ;
     public final void entryRuleBooleanLiteral() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:826:1: ( ruleBooleanLiteral EOF )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:827:1: ruleBooleanLiteral EOF
+            // InternalConfig.g:825:1: ( ruleBooleanLiteral EOF )
+            // InternalConfig.g:826:1: ruleBooleanLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getBooleanLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleBooleanLiteral_in_entryRuleBooleanLiteral1694);
+            pushFollow(FOLLOW_1);
             ruleBooleanLiteral();
 
             state._fsp--;
@@ -2425,7 +2425,7 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getBooleanLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleBooleanLiteral1701); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2442,25 +2442,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleBooleanLiteral"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:834:1: ruleBooleanLiteral : ( ( rule__BooleanLiteral__Group__0 ) ) ;
+    // InternalConfig.g:833:1: ruleBooleanLiteral : ( ( rule__BooleanLiteral__Group__0 ) ) ;
     public final void ruleBooleanLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:838:2: ( ( ( rule__BooleanLiteral__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:839:1: ( ( rule__BooleanLiteral__Group__0 ) )
+            // InternalConfig.g:837:2: ( ( ( rule__BooleanLiteral__Group__0 ) ) )
+            // InternalConfig.g:838:1: ( ( rule__BooleanLiteral__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:839:1: ( ( rule__BooleanLiteral__Group__0 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:840:1: ( rule__BooleanLiteral__Group__0 )
+            // InternalConfig.g:838:1: ( ( rule__BooleanLiteral__Group__0 ) )
+            // InternalConfig.g:839:1: ( rule__BooleanLiteral__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getBooleanLiteralAccess().getGroup()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:841:1: ( rule__BooleanLiteral__Group__0 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:841:2: rule__BooleanLiteral__Group__0
+            // InternalConfig.g:840:1: ( rule__BooleanLiteral__Group__0 )
+            // InternalConfig.g:840:2: rule__BooleanLiteral__Group__0
             {
-            pushFollow(FOLLOW_rule__BooleanLiteral__Group__0_in_ruleBooleanLiteral1727);
+            pushFollow(FOLLOW_2);
             rule__BooleanLiteral__Group__0();
 
             state._fsp--;
@@ -2493,16 +2493,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleNumberLiteral"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:853:1: entryRuleNumberLiteral : ruleNumberLiteral EOF ;
+    // InternalConfig.g:852:1: entryRuleNumberLiteral : ruleNumberLiteral EOF ;
     public final void entryRuleNumberLiteral() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:854:1: ( ruleNumberLiteral EOF )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:855:1: ruleNumberLiteral EOF
+            // InternalConfig.g:853:1: ( ruleNumberLiteral EOF )
+            // InternalConfig.g:854:1: ruleNumberLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNumberLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleNumberLiteral_in_entryRuleNumberLiteral1754);
+            pushFollow(FOLLOW_1);
             ruleNumberLiteral();
 
             state._fsp--;
@@ -2510,7 +2510,7 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getNumberLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleNumberLiteral1761); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2527,25 +2527,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleNumberLiteral"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:862:1: ruleNumberLiteral : ( ( rule__NumberLiteral__Alternatives ) ) ;
+    // InternalConfig.g:861:1: ruleNumberLiteral : ( ( rule__NumberLiteral__Alternatives ) ) ;
     public final void ruleNumberLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:866:2: ( ( ( rule__NumberLiteral__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:867:1: ( ( rule__NumberLiteral__Alternatives ) )
+            // InternalConfig.g:865:2: ( ( ( rule__NumberLiteral__Alternatives ) ) )
+            // InternalConfig.g:866:1: ( ( rule__NumberLiteral__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:867:1: ( ( rule__NumberLiteral__Alternatives ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:868:1: ( rule__NumberLiteral__Alternatives )
+            // InternalConfig.g:866:1: ( ( rule__NumberLiteral__Alternatives ) )
+            // InternalConfig.g:867:1: ( rule__NumberLiteral__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNumberLiteralAccess().getAlternatives()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:869:1: ( rule__NumberLiteral__Alternatives )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:869:2: rule__NumberLiteral__Alternatives
+            // InternalConfig.g:868:1: ( rule__NumberLiteral__Alternatives )
+            // InternalConfig.g:868:2: rule__NumberLiteral__Alternatives
             {
-            pushFollow(FOLLOW_rule__NumberLiteral__Alternatives_in_ruleNumberLiteral1787);
+            pushFollow(FOLLOW_2);
             rule__NumberLiteral__Alternatives();
 
             state._fsp--;
@@ -2578,16 +2578,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleRealLiteral"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:881:1: entryRuleRealLiteral : ruleRealLiteral EOF ;
+    // InternalConfig.g:880:1: entryRuleRealLiteral : ruleRealLiteral EOF ;
     public final void entryRuleRealLiteral() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:882:1: ( ruleRealLiteral EOF )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:883:1: ruleRealLiteral EOF
+            // InternalConfig.g:881:1: ( ruleRealLiteral EOF )
+            // InternalConfig.g:882:1: ruleRealLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRealLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleRealLiteral_in_entryRuleRealLiteral1814);
+            pushFollow(FOLLOW_1);
             ruleRealLiteral();
 
             state._fsp--;
@@ -2595,7 +2595,7 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getRealLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRealLiteral1821); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2612,25 +2612,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleRealLiteral"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:890:1: ruleRealLiteral : ( ( rule__RealLiteral__Group__0 ) ) ;
+    // InternalConfig.g:889:1: ruleRealLiteral : ( ( rule__RealLiteral__Group__0 ) ) ;
     public final void ruleRealLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:894:2: ( ( ( rule__RealLiteral__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:895:1: ( ( rule__RealLiteral__Group__0 ) )
+            // InternalConfig.g:893:2: ( ( ( rule__RealLiteral__Group__0 ) ) )
+            // InternalConfig.g:894:1: ( ( rule__RealLiteral__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:895:1: ( ( rule__RealLiteral__Group__0 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:896:1: ( rule__RealLiteral__Group__0 )
+            // InternalConfig.g:894:1: ( ( rule__RealLiteral__Group__0 ) )
+            // InternalConfig.g:895:1: ( rule__RealLiteral__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRealLiteralAccess().getGroup()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:897:1: ( rule__RealLiteral__Group__0 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:897:2: rule__RealLiteral__Group__0
+            // InternalConfig.g:896:1: ( rule__RealLiteral__Group__0 )
+            // InternalConfig.g:896:2: rule__RealLiteral__Group__0
             {
-            pushFollow(FOLLOW_rule__RealLiteral__Group__0_in_ruleRealLiteral1847);
+            pushFollow(FOLLOW_2);
             rule__RealLiteral__Group__0();
 
             state._fsp--;
@@ -2663,16 +2663,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleIntLiteral"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:909:1: entryRuleIntLiteral : ruleIntLiteral EOF ;
+    // InternalConfig.g:908:1: entryRuleIntLiteral : ruleIntLiteral EOF ;
     public final void entryRuleIntLiteral() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:910:1: ( ruleIntLiteral EOF )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:911:1: ruleIntLiteral EOF
+            // InternalConfig.g:909:1: ( ruleIntLiteral EOF )
+            // InternalConfig.g:910:1: ruleIntLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIntLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleIntLiteral_in_entryRuleIntLiteral1874);
+            pushFollow(FOLLOW_1);
             ruleIntLiteral();
 
             state._fsp--;
@@ -2680,7 +2680,7 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getIntLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIntLiteral1881); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2697,25 +2697,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleIntLiteral"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:918:1: ruleIntLiteral : ( ( rule__IntLiteral__Group__0 ) ) ;
+    // InternalConfig.g:917:1: ruleIntLiteral : ( ( rule__IntLiteral__Group__0 ) ) ;
     public final void ruleIntLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:922:2: ( ( ( rule__IntLiteral__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:923:1: ( ( rule__IntLiteral__Group__0 ) )
+            // InternalConfig.g:921:2: ( ( ( rule__IntLiteral__Group__0 ) ) )
+            // InternalConfig.g:922:1: ( ( rule__IntLiteral__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:923:1: ( ( rule__IntLiteral__Group__0 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:924:1: ( rule__IntLiteral__Group__0 )
+            // InternalConfig.g:922:1: ( ( rule__IntLiteral__Group__0 ) )
+            // InternalConfig.g:923:1: ( rule__IntLiteral__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIntLiteralAccess().getGroup()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:925:1: ( rule__IntLiteral__Group__0 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:925:2: rule__IntLiteral__Group__0
+            // InternalConfig.g:924:1: ( rule__IntLiteral__Group__0 )
+            // InternalConfig.g:924:2: rule__IntLiteral__Group__0
             {
-            pushFollow(FOLLOW_rule__IntLiteral__Group__0_in_ruleIntLiteral1907);
+            pushFollow(FOLLOW_2);
             rule__IntLiteral__Group__0();
 
             state._fsp--;
@@ -2748,16 +2748,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleStringLiteral"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:937:1: entryRuleStringLiteral : ruleStringLiteral EOF ;
+    // InternalConfig.g:936:1: entryRuleStringLiteral : ruleStringLiteral EOF ;
     public final void entryRuleStringLiteral() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:938:1: ( ruleStringLiteral EOF )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:939:1: ruleStringLiteral EOF
+            // InternalConfig.g:937:1: ( ruleStringLiteral EOF )
+            // InternalConfig.g:938:1: ruleStringLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getStringLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleStringLiteral_in_entryRuleStringLiteral1934);
+            pushFollow(FOLLOW_1);
             ruleStringLiteral();
 
             state._fsp--;
@@ -2765,7 +2765,7 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getStringLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleStringLiteral1941); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2782,25 +2782,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleStringLiteral"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:946:1: ruleStringLiteral : ( ( rule__StringLiteral__Group__0 ) ) ;
+    // InternalConfig.g:945:1: ruleStringLiteral : ( ( rule__StringLiteral__Group__0 ) ) ;
     public final void ruleStringLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:950:2: ( ( ( rule__StringLiteral__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:951:1: ( ( rule__StringLiteral__Group__0 ) )
+            // InternalConfig.g:949:2: ( ( ( rule__StringLiteral__Group__0 ) ) )
+            // InternalConfig.g:950:1: ( ( rule__StringLiteral__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:951:1: ( ( rule__StringLiteral__Group__0 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:952:1: ( rule__StringLiteral__Group__0 )
+            // InternalConfig.g:950:1: ( ( rule__StringLiteral__Group__0 ) )
+            // InternalConfig.g:951:1: ( rule__StringLiteral__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getStringLiteralAccess().getGroup()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:953:1: ( rule__StringLiteral__Group__0 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:953:2: rule__StringLiteral__Group__0
+            // InternalConfig.g:952:1: ( rule__StringLiteral__Group__0 )
+            // InternalConfig.g:952:2: rule__StringLiteral__Group__0
             {
-            pushFollow(FOLLOW_rule__StringLiteral__Group__0_in_ruleStringLiteral1967);
+            pushFollow(FOLLOW_2);
             rule__StringLiteral__Group__0();
 
             state._fsp--;
@@ -2833,16 +2833,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleInteger"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:965:1: entryRuleInteger : ruleInteger EOF ;
+    // InternalConfig.g:964:1: entryRuleInteger : ruleInteger EOF ;
     public final void entryRuleInteger() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:966:1: ( ruleInteger EOF )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:967:1: ruleInteger EOF
+            // InternalConfig.g:965:1: ( ruleInteger EOF )
+            // InternalConfig.g:966:1: ruleInteger EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIntegerRule()); 
             }
-            pushFollow(FOLLOW_ruleInteger_in_entryRuleInteger1994);
+            pushFollow(FOLLOW_1);
             ruleInteger();
 
             state._fsp--;
@@ -2850,7 +2850,7 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getIntegerRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleInteger2001); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2867,25 +2867,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleInteger"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:974:1: ruleInteger : ( ( rule__Integer__Alternatives ) ) ;
+    // InternalConfig.g:973:1: ruleInteger : ( ( rule__Integer__Alternatives ) ) ;
     public final void ruleInteger() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:978:2: ( ( ( rule__Integer__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:979:1: ( ( rule__Integer__Alternatives ) )
+            // InternalConfig.g:977:2: ( ( ( rule__Integer__Alternatives ) ) )
+            // InternalConfig.g:978:1: ( ( rule__Integer__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:979:1: ( ( rule__Integer__Alternatives ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:980:1: ( rule__Integer__Alternatives )
+            // InternalConfig.g:978:1: ( ( rule__Integer__Alternatives ) )
+            // InternalConfig.g:979:1: ( rule__Integer__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIntegerAccess().getAlternatives()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:981:1: ( rule__Integer__Alternatives )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:981:2: rule__Integer__Alternatives
+            // InternalConfig.g:980:1: ( rule__Integer__Alternatives )
+            // InternalConfig.g:980:2: rule__Integer__Alternatives
             {
-            pushFollow(FOLLOW_rule__Integer__Alternatives_in_ruleInteger2027);
+            pushFollow(FOLLOW_2);
             rule__Integer__Alternatives();
 
             state._fsp--;
@@ -2918,16 +2918,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleReal"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:993:1: entryRuleReal : ruleReal EOF ;
+    // InternalConfig.g:992:1: entryRuleReal : ruleReal EOF ;
     public final void entryRuleReal() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:994:1: ( ruleReal EOF )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:995:1: ruleReal EOF
+            // InternalConfig.g:993:1: ( ruleReal EOF )
+            // InternalConfig.g:994:1: ruleReal EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRealRule()); 
             }
-            pushFollow(FOLLOW_ruleReal_in_entryRuleReal2054);
+            pushFollow(FOLLOW_1);
             ruleReal();
 
             state._fsp--;
@@ -2935,7 +2935,7 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getRealRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleReal2061); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2952,25 +2952,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleReal"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1002:1: ruleReal : ( ( rule__Real__Alternatives ) ) ;
+    // InternalConfig.g:1001:1: ruleReal : ( ( rule__Real__Alternatives ) ) ;
     public final void ruleReal() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1006:2: ( ( ( rule__Real__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1007:1: ( ( rule__Real__Alternatives ) )
+            // InternalConfig.g:1005:2: ( ( ( rule__Real__Alternatives ) ) )
+            // InternalConfig.g:1006:1: ( ( rule__Real__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1007:1: ( ( rule__Real__Alternatives ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1008:1: ( rule__Real__Alternatives )
+            // InternalConfig.g:1006:1: ( ( rule__Real__Alternatives ) )
+            // InternalConfig.g:1007:1: ( rule__Real__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRealAccess().getAlternatives()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1009:1: ( rule__Real__Alternatives )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1009:2: rule__Real__Alternatives
+            // InternalConfig.g:1008:1: ( rule__Real__Alternatives )
+            // InternalConfig.g:1008:2: rule__Real__Alternatives
             {
-            pushFollow(FOLLOW_rule__Real__Alternatives_in_ruleReal2087);
+            pushFollow(FOLLOW_2);
             rule__Real__Alternatives();
 
             state._fsp--;
@@ -3003,19 +3003,19 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleDecimal"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1021:1: entryRuleDecimal : ruleDecimal EOF ;
+    // InternalConfig.g:1020:1: entryRuleDecimal : ruleDecimal EOF ;
     public final void entryRuleDecimal() throws RecognitionException {
 
         	HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
 
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1025:1: ( ruleDecimal EOF )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1026:1: ruleDecimal EOF
+            // InternalConfig.g:1024:1: ( ruleDecimal EOF )
+            // InternalConfig.g:1025:1: ruleDecimal EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDecimalRule()); 
             }
-            pushFollow(FOLLOW_ruleDecimal_in_entryRuleDecimal2119);
+            pushFollow(FOLLOW_1);
             ruleDecimal();
 
             state._fsp--;
@@ -3023,7 +3023,7 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getDecimalRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDecimal2126); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3043,26 +3043,26 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleDecimal"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1036:1: ruleDecimal : ( ( rule__Decimal__Group__0 ) ) ;
+    // InternalConfig.g:1035:1: ruleDecimal : ( ( rule__Decimal__Group__0 ) ) ;
     public final void ruleDecimal() throws RecognitionException {
 
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1041:2: ( ( ( rule__Decimal__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1042:1: ( ( rule__Decimal__Group__0 ) )
+            // InternalConfig.g:1040:2: ( ( ( rule__Decimal__Group__0 ) ) )
+            // InternalConfig.g:1041:1: ( ( rule__Decimal__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1042:1: ( ( rule__Decimal__Group__0 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1043:1: ( rule__Decimal__Group__0 )
+            // InternalConfig.g:1041:1: ( ( rule__Decimal__Group__0 ) )
+            // InternalConfig.g:1042:1: ( rule__Decimal__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDecimalAccess().getGroup()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1044:1: ( rule__Decimal__Group__0 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1044:2: rule__Decimal__Group__0
+            // InternalConfig.g:1043:1: ( rule__Decimal__Group__0 )
+            // InternalConfig.g:1043:2: rule__Decimal__Group__0
             {
-            pushFollow(FOLLOW_rule__Decimal__Group__0_in_ruleDecimal2156);
+            pushFollow(FOLLOW_2);
             rule__Decimal__Group__0();
 
             state._fsp--;
@@ -3096,19 +3096,19 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleDecimalExp"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1057:1: entryRuleDecimalExp : ruleDecimalExp EOF ;
+    // InternalConfig.g:1056:1: entryRuleDecimalExp : ruleDecimalExp EOF ;
     public final void entryRuleDecimalExp() throws RecognitionException {
 
         	HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
 
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1061:1: ( ruleDecimalExp EOF )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1062:1: ruleDecimalExp EOF
+            // InternalConfig.g:1060:1: ( ruleDecimalExp EOF )
+            // InternalConfig.g:1061:1: ruleDecimalExp EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDecimalExpRule()); 
             }
-            pushFollow(FOLLOW_ruleDecimalExp_in_entryRuleDecimalExp2188);
+            pushFollow(FOLLOW_1);
             ruleDecimalExp();
 
             state._fsp--;
@@ -3116,7 +3116,7 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getDecimalExpRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDecimalExp2195); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3136,26 +3136,26 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleDecimalExp"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1072:1: ruleDecimalExp : ( ( rule__DecimalExp__Group__0 ) ) ;
+    // InternalConfig.g:1071:1: ruleDecimalExp : ( ( rule__DecimalExp__Group__0 ) ) ;
     public final void ruleDecimalExp() throws RecognitionException {
 
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1077:2: ( ( ( rule__DecimalExp__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1078:1: ( ( rule__DecimalExp__Group__0 ) )
+            // InternalConfig.g:1076:2: ( ( ( rule__DecimalExp__Group__0 ) ) )
+            // InternalConfig.g:1077:1: ( ( rule__DecimalExp__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1078:1: ( ( rule__DecimalExp__Group__0 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1079:1: ( rule__DecimalExp__Group__0 )
+            // InternalConfig.g:1077:1: ( ( rule__DecimalExp__Group__0 ) )
+            // InternalConfig.g:1078:1: ( rule__DecimalExp__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDecimalExpAccess().getGroup()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1080:1: ( rule__DecimalExp__Group__0 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1080:2: rule__DecimalExp__Group__0
+            // InternalConfig.g:1079:1: ( rule__DecimalExp__Group__0 )
+            // InternalConfig.g:1079:2: rule__DecimalExp__Group__0
             {
-            pushFollow(FOLLOW_rule__DecimalExp__Group__0_in_ruleDecimalExp2225);
+            pushFollow(FOLLOW_2);
             rule__DecimalExp__Group__0();
 
             state._fsp--;
@@ -3189,16 +3189,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleFQN"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1093:1: entryRuleFQN : ruleFQN EOF ;
+    // InternalConfig.g:1092:1: entryRuleFQN : ruleFQN EOF ;
     public final void entryRuleFQN() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1094:1: ( ruleFQN EOF )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1095:1: ruleFQN EOF
+            // InternalConfig.g:1093:1: ( ruleFQN EOF )
+            // InternalConfig.g:1094:1: ruleFQN EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFQNRule()); 
             }
-            pushFollow(FOLLOW_ruleFQN_in_entryRuleFQN2252);
+            pushFollow(FOLLOW_1);
             ruleFQN();
 
             state._fsp--;
@@ -3206,7 +3206,7 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getFQNRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleFQN2259); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3223,25 +3223,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleFQN"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1102:1: ruleFQN : ( ( rule__FQN__Group__0 ) ) ;
+    // InternalConfig.g:1101:1: ruleFQN : ( ( rule__FQN__Group__0 ) ) ;
     public final void ruleFQN() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1106:2: ( ( ( rule__FQN__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1107:1: ( ( rule__FQN__Group__0 ) )
+            // InternalConfig.g:1105:2: ( ( ( rule__FQN__Group__0 ) ) )
+            // InternalConfig.g:1106:1: ( ( rule__FQN__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1107:1: ( ( rule__FQN__Group__0 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1108:1: ( rule__FQN__Group__0 )
+            // InternalConfig.g:1106:1: ( ( rule__FQN__Group__0 ) )
+            // InternalConfig.g:1107:1: ( rule__FQN__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFQNAccess().getGroup()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1109:1: ( rule__FQN__Group__0 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1109:2: rule__FQN__Group__0
+            // InternalConfig.g:1108:1: ( rule__FQN__Group__0 )
+            // InternalConfig.g:1108:2: rule__FQN__Group__0
             {
-            pushFollow(FOLLOW_rule__FQN__Group__0_in_ruleFQN2285);
+            pushFollow(FOLLOW_2);
             rule__FQN__Group__0();
 
             state._fsp--;
@@ -3274,25 +3274,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleLiteralType"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1122:1: ruleLiteralType : ( ( rule__LiteralType__Alternatives ) ) ;
+    // InternalConfig.g:1121:1: ruleLiteralType : ( ( rule__LiteralType__Alternatives ) ) ;
     public final void ruleLiteralType() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1126:1: ( ( ( rule__LiteralType__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1127:1: ( ( rule__LiteralType__Alternatives ) )
+            // InternalConfig.g:1125:1: ( ( ( rule__LiteralType__Alternatives ) ) )
+            // InternalConfig.g:1126:1: ( ( rule__LiteralType__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1127:1: ( ( rule__LiteralType__Alternatives ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1128:1: ( rule__LiteralType__Alternatives )
+            // InternalConfig.g:1126:1: ( ( rule__LiteralType__Alternatives ) )
+            // InternalConfig.g:1127:1: ( rule__LiteralType__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLiteralTypeAccess().getAlternatives()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1129:1: ( rule__LiteralType__Alternatives )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1129:2: rule__LiteralType__Alternatives
+            // InternalConfig.g:1128:1: ( rule__LiteralType__Alternatives )
+            // InternalConfig.g:1128:2: rule__LiteralType__Alternatives
             {
-            pushFollow(FOLLOW_rule__LiteralType__Alternatives_in_ruleLiteralType2322);
+            pushFollow(FOLLOW_2);
             rule__LiteralType__Alternatives();
 
             state._fsp--;
@@ -3325,13 +3325,13 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ConfigElement__Alternatives"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1140:1: rule__ConfigElement__Alternatives : ( ( ruleSubSystemConfig ) | ( ruleActorClassConfig ) | ( ruleActorInstanceConfig ) | ( ruleProtocolClassConfig ) );
+    // InternalConfig.g:1139:1: rule__ConfigElement__Alternatives : ( ( ruleSubSystemConfig ) | ( ruleActorClassConfig ) | ( ruleActorInstanceConfig ) | ( ruleProtocolClassConfig ) );
     public final void rule__ConfigElement__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1144:1: ( ( ruleSubSystemConfig ) | ( ruleActorClassConfig ) | ( ruleActorInstanceConfig ) | ( ruleProtocolClassConfig ) )
+            // InternalConfig.g:1143:1: ( ( ruleSubSystemConfig ) | ( ruleActorClassConfig ) | ( ruleActorInstanceConfig ) | ( ruleProtocolClassConfig ) )
             int alt1=4;
             switch ( input.LA(1) ) {
             case 29:
@@ -3364,15 +3364,15 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
             switch (alt1) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1145:1: ( ruleSubSystemConfig )
+                    // InternalConfig.g:1144:1: ( ruleSubSystemConfig )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1145:1: ( ruleSubSystemConfig )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1146:1: ruleSubSystemConfig
+                    // InternalConfig.g:1144:1: ( ruleSubSystemConfig )
+                    // InternalConfig.g:1145:1: ruleSubSystemConfig
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getConfigElementAccess().getSubSystemConfigParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleSubSystemConfig_in_rule__ConfigElement__Alternatives2357);
+                    pushFollow(FOLLOW_2);
                     ruleSubSystemConfig();
 
                     state._fsp--;
@@ -3387,15 +3387,15 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1151:6: ( ruleActorClassConfig )
+                    // InternalConfig.g:1150:6: ( ruleActorClassConfig )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1151:6: ( ruleActorClassConfig )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1152:1: ruleActorClassConfig
+                    // InternalConfig.g:1150:6: ( ruleActorClassConfig )
+                    // InternalConfig.g:1151:1: ruleActorClassConfig
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getConfigElementAccess().getActorClassConfigParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleActorClassConfig_in_rule__ConfigElement__Alternatives2374);
+                    pushFollow(FOLLOW_2);
                     ruleActorClassConfig();
 
                     state._fsp--;
@@ -3410,15 +3410,15 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1157:6: ( ruleActorInstanceConfig )
+                    // InternalConfig.g:1156:6: ( ruleActorInstanceConfig )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1157:6: ( ruleActorInstanceConfig )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1158:1: ruleActorInstanceConfig
+                    // InternalConfig.g:1156:6: ( ruleActorInstanceConfig )
+                    // InternalConfig.g:1157:1: ruleActorInstanceConfig
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getConfigElementAccess().getActorInstanceConfigParserRuleCall_2()); 
                     }
-                    pushFollow(FOLLOW_ruleActorInstanceConfig_in_rule__ConfigElement__Alternatives2391);
+                    pushFollow(FOLLOW_2);
                     ruleActorInstanceConfig();
 
                     state._fsp--;
@@ -3433,15 +3433,15 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 4 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1163:6: ( ruleProtocolClassConfig )
+                    // InternalConfig.g:1162:6: ( ruleProtocolClassConfig )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1163:6: ( ruleProtocolClassConfig )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1164:1: ruleProtocolClassConfig
+                    // InternalConfig.g:1162:6: ( ruleProtocolClassConfig )
+                    // InternalConfig.g:1163:1: ruleProtocolClassConfig
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getConfigElementAccess().getProtocolClassConfigParserRuleCall_3()); 
                     }
-                    pushFollow(FOLLOW_ruleProtocolClassConfig_in_rule__ConfigElement__Alternatives2408);
+                    pushFollow(FOLLOW_2);
                     ruleProtocolClassConfig();
 
                     state._fsp--;
@@ -3473,13 +3473,13 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DynamicConfig__Alternatives_2_0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1174:1: rule__DynamicConfig__Alternatives_2_0 : ( ( ( rule__DynamicConfig__Group_2_0_0__0 ) ) | ( ( rule__DynamicConfig__Group_2_0_1__0 ) ) );
+    // InternalConfig.g:1173:1: rule__DynamicConfig__Alternatives_2_0 : ( ( ( rule__DynamicConfig__Group_2_0_0__0 ) ) | ( ( rule__DynamicConfig__Group_2_0_1__0 ) ) );
     public final void rule__DynamicConfig__Alternatives_2_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1178:1: ( ( ( rule__DynamicConfig__Group_2_0_0__0 ) ) | ( ( rule__DynamicConfig__Group_2_0_1__0 ) ) )
+            // InternalConfig.g:1177:1: ( ( ( rule__DynamicConfig__Group_2_0_0__0 ) ) | ( ( rule__DynamicConfig__Group_2_0_1__0 ) ) )
             int alt2=2;
             int LA2_0 = input.LA(1);
 
@@ -3498,18 +3498,18 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             }
             switch (alt2) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1179:1: ( ( rule__DynamicConfig__Group_2_0_0__0 ) )
+                    // InternalConfig.g:1178:1: ( ( rule__DynamicConfig__Group_2_0_0__0 ) )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1179:1: ( ( rule__DynamicConfig__Group_2_0_0__0 ) )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1180:1: ( rule__DynamicConfig__Group_2_0_0__0 )
+                    // InternalConfig.g:1178:1: ( ( rule__DynamicConfig__Group_2_0_0__0 ) )
+                    // InternalConfig.g:1179:1: ( rule__DynamicConfig__Group_2_0_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getDynamicConfigAccess().getGroup_2_0_0()); 
                     }
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1181:1: ( rule__DynamicConfig__Group_2_0_0__0 )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1181:2: rule__DynamicConfig__Group_2_0_0__0
+                    // InternalConfig.g:1180:1: ( rule__DynamicConfig__Group_2_0_0__0 )
+                    // InternalConfig.g:1180:2: rule__DynamicConfig__Group_2_0_0__0
                     {
-                    pushFollow(FOLLOW_rule__DynamicConfig__Group_2_0_0__0_in_rule__DynamicConfig__Alternatives_2_02440);
+                    pushFollow(FOLLOW_2);
                     rule__DynamicConfig__Group_2_0_0__0();
 
                     state._fsp--;
@@ -3527,18 +3527,18 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1185:6: ( ( rule__DynamicConfig__Group_2_0_1__0 ) )
+                    // InternalConfig.g:1184:6: ( ( rule__DynamicConfig__Group_2_0_1__0 ) )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1185:6: ( ( rule__DynamicConfig__Group_2_0_1__0 ) )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1186:1: ( rule__DynamicConfig__Group_2_0_1__0 )
+                    // InternalConfig.g:1184:6: ( ( rule__DynamicConfig__Group_2_0_1__0 ) )
+                    // InternalConfig.g:1185:1: ( rule__DynamicConfig__Group_2_0_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getDynamicConfigAccess().getGroup_2_0_1()); 
                     }
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1187:1: ( rule__DynamicConfig__Group_2_0_1__0 )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1187:2: rule__DynamicConfig__Group_2_0_1__0
+                    // InternalConfig.g:1186:1: ( rule__DynamicConfig__Group_2_0_1__0 )
+                    // InternalConfig.g:1186:2: rule__DynamicConfig__Group_2_0_1__0
                     {
-                    pushFollow(FOLLOW_rule__DynamicConfig__Group_2_0_1__0_in_rule__DynamicConfig__Alternatives_2_02458);
+                    pushFollow(FOLLOW_2);
                     rule__DynamicConfig__Group_2_0_1__0();
 
                     state._fsp--;
@@ -3573,13 +3573,13 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClassConfig__Alternatives_3_1_0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1196:1: rule__ProtocolClassConfig__Alternatives_3_1_0 : ( ( 'conjugate' ) | ( 'conjugated' ) );
+    // InternalConfig.g:1195:1: rule__ProtocolClassConfig__Alternatives_3_1_0 : ( ( 'conjugate' ) | ( 'conjugated' ) );
     public final void rule__ProtocolClassConfig__Alternatives_3_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1200:1: ( ( 'conjugate' ) | ( 'conjugated' ) )
+            // InternalConfig.g:1199:1: ( ( 'conjugate' ) | ( 'conjugated' ) )
             int alt3=2;
             int LA3_0 = input.LA(1);
 
@@ -3598,15 +3598,15 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             }
             switch (alt3) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1201:1: ( 'conjugate' )
+                    // InternalConfig.g:1200:1: ( 'conjugate' )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1201:1: ( 'conjugate' )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1202:1: 'conjugate'
+                    // InternalConfig.g:1200:1: ( 'conjugate' )
+                    // InternalConfig.g:1201:1: 'conjugate'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getProtocolClassConfigAccess().getConjugateKeyword_3_1_0_0()); 
                     }
-                    match(input,12,FOLLOW_12_in_rule__ProtocolClassConfig__Alternatives_3_1_02492); if (state.failed) return ;
+                    match(input,12,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getProtocolClassConfigAccess().getConjugateKeyword_3_1_0_0()); 
                     }
@@ -3617,15 +3617,15 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1209:6: ( 'conjugated' )
+                    // InternalConfig.g:1208:6: ( 'conjugated' )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1209:6: ( 'conjugated' )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1210:1: 'conjugated'
+                    // InternalConfig.g:1208:6: ( 'conjugated' )
+                    // InternalConfig.g:1209:1: 'conjugated'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getProtocolClassConfigAccess().getConjugatedKeyword_3_1_0_1()); 
                     }
-                    match(input,13,FOLLOW_13_in_rule__ProtocolClassConfig__Alternatives_3_1_02512); if (state.failed) return ;
+                    match(input,13,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getProtocolClassConfigAccess().getConjugatedKeyword_3_1_0_1()); 
                     }
@@ -3653,13 +3653,13 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrInstanceConfig__Alternatives_3_1_0_1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1223:1: rule__AttrInstanceConfig__Alternatives_3_1_0_1 : ( ( ( rule__AttrInstanceConfig__ReadOnlyAssignment_3_1_0_1_0 ) ) | ( 'write' ) );
+    // InternalConfig.g:1222:1: rule__AttrInstanceConfig__Alternatives_3_1_0_1 : ( ( ( rule__AttrInstanceConfig__ReadOnlyAssignment_3_1_0_1_0 ) ) | ( 'write' ) );
     public final void rule__AttrInstanceConfig__Alternatives_3_1_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1227:1: ( ( ( rule__AttrInstanceConfig__ReadOnlyAssignment_3_1_0_1_0 ) ) | ( 'write' ) )
+            // InternalConfig.g:1226:1: ( ( ( rule__AttrInstanceConfig__ReadOnlyAssignment_3_1_0_1_0 ) ) | ( 'write' ) )
             int alt4=2;
             int LA4_0 = input.LA(1);
 
@@ -3678,18 +3678,18 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             }
             switch (alt4) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1228:1: ( ( rule__AttrInstanceConfig__ReadOnlyAssignment_3_1_0_1_0 ) )
+                    // InternalConfig.g:1227:1: ( ( rule__AttrInstanceConfig__ReadOnlyAssignment_3_1_0_1_0 ) )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1228:1: ( ( rule__AttrInstanceConfig__ReadOnlyAssignment_3_1_0_1_0 ) )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1229:1: ( rule__AttrInstanceConfig__ReadOnlyAssignment_3_1_0_1_0 )
+                    // InternalConfig.g:1227:1: ( ( rule__AttrInstanceConfig__ReadOnlyAssignment_3_1_0_1_0 ) )
+                    // InternalConfig.g:1228:1: ( rule__AttrInstanceConfig__ReadOnlyAssignment_3_1_0_1_0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getAttrInstanceConfigAccess().getReadOnlyAssignment_3_1_0_1_0()); 
                     }
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1230:1: ( rule__AttrInstanceConfig__ReadOnlyAssignment_3_1_0_1_0 )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1230:2: rule__AttrInstanceConfig__ReadOnlyAssignment_3_1_0_1_0
+                    // InternalConfig.g:1229:1: ( rule__AttrInstanceConfig__ReadOnlyAssignment_3_1_0_1_0 )
+                    // InternalConfig.g:1229:2: rule__AttrInstanceConfig__ReadOnlyAssignment_3_1_0_1_0
                     {
-                    pushFollow(FOLLOW_rule__AttrInstanceConfig__ReadOnlyAssignment_3_1_0_1_0_in_rule__AttrInstanceConfig__Alternatives_3_1_0_12547);
+                    pushFollow(FOLLOW_2);
                     rule__AttrInstanceConfig__ReadOnlyAssignment_3_1_0_1_0();
 
                     state._fsp--;
@@ -3707,15 +3707,15 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1234:6: ( 'write' )
+                    // InternalConfig.g:1233:6: ( 'write' )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1234:6: ( 'write' )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1235:1: 'write'
+                    // InternalConfig.g:1233:6: ( 'write' )
+                    // InternalConfig.g:1234:1: 'write'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getAttrInstanceConfigAccess().getWriteKeyword_3_1_0_1_1()); 
                     }
-                    match(input,14,FOLLOW_14_in_rule__AttrInstanceConfig__Alternatives_3_1_0_12566); if (state.failed) return ;
+                    match(input,14,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getAttrInstanceConfigAccess().getWriteKeyword_3_1_0_1_1()); 
                     }
@@ -3743,13 +3743,13 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ConfigValue__Alternatives"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1247:1: rule__ConfigValue__Alternatives : ( ( ruleLiteralConfigValue ) | ( ruleEnumConfigValue ) );
+    // InternalConfig.g:1246:1: rule__ConfigValue__Alternatives : ( ( ruleLiteralConfigValue ) | ( ruleEnumConfigValue ) );
     public final void rule__ConfigValue__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1251:1: ( ( ruleLiteralConfigValue ) | ( ruleEnumConfigValue ) )
+            // InternalConfig.g:1250:1: ( ( ruleLiteralConfigValue ) | ( ruleEnumConfigValue ) )
             int alt5=2;
             int LA5_0 = input.LA(1);
 
@@ -3768,15 +3768,15 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             }
             switch (alt5) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1252:1: ( ruleLiteralConfigValue )
+                    // InternalConfig.g:1251:1: ( ruleLiteralConfigValue )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1252:1: ( ruleLiteralConfigValue )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1253:1: ruleLiteralConfigValue
+                    // InternalConfig.g:1251:1: ( ruleLiteralConfigValue )
+                    // InternalConfig.g:1252:1: ruleLiteralConfigValue
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getConfigValueAccess().getLiteralConfigValueParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleLiteralConfigValue_in_rule__ConfigValue__Alternatives2600);
+                    pushFollow(FOLLOW_2);
                     ruleLiteralConfigValue();
 
                     state._fsp--;
@@ -3791,15 +3791,15 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1258:6: ( ruleEnumConfigValue )
+                    // InternalConfig.g:1257:6: ( ruleEnumConfigValue )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1258:6: ( ruleEnumConfigValue )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1259:1: ruleEnumConfigValue
+                    // InternalConfig.g:1257:6: ( ruleEnumConfigValue )
+                    // InternalConfig.g:1258:1: ruleEnumConfigValue
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getConfigValueAccess().getEnumConfigValueParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleEnumConfigValue_in_rule__ConfigValue__Alternatives2617);
+                    pushFollow(FOLLOW_2);
                     ruleEnumConfigValue();
 
                     state._fsp--;
@@ -3831,13 +3831,13 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AnnotationAttribute__Alternatives"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1270:1: rule__AnnotationAttribute__Alternatives : ( ( ruleSimpleAnnotationAttribute ) | ( ruleEnumAnnotationAttribute ) );
+    // InternalConfig.g:1269:1: rule__AnnotationAttribute__Alternatives : ( ( ruleSimpleAnnotationAttribute ) | ( ruleEnumAnnotationAttribute ) );
     public final void rule__AnnotationAttribute__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1274:1: ( ( ruleSimpleAnnotationAttribute ) | ( ruleEnumAnnotationAttribute ) )
+            // InternalConfig.g:1273:1: ( ( ruleSimpleAnnotationAttribute ) | ( ruleEnumAnnotationAttribute ) )
             int alt6=2;
             int LA6_0 = input.LA(1);
 
@@ -3853,12 +3853,12 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
                         if ( (LA6_4==48) ) {
                             int LA6_5 = input.LA(5);
 
-                            if ( ((LA6_5>=22 && LA6_5<=25)) ) {
-                                alt6=1;
-                            }
-                            else if ( (LA6_5==27) ) {
+                            if ( (LA6_5==27) ) {
                                 alt6=2;
                             }
+                            else if ( ((LA6_5>=22 && LA6_5<=25)) ) {
+                                alt6=1;
+                            }
                             else {
                                 if (state.backtracking>0) {state.failed=true; return ;}
                                 NoViableAltException nvae =
@@ -3903,12 +3903,12 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
                         if ( (LA6_4==48) ) {
                             int LA6_5 = input.LA(5);
 
-                            if ( ((LA6_5>=22 && LA6_5<=25)) ) {
-                                alt6=1;
-                            }
-                            else if ( (LA6_5==27) ) {
+                            if ( (LA6_5==27) ) {
                                 alt6=2;
                             }
+                            else if ( ((LA6_5>=22 && LA6_5<=25)) ) {
+                                alt6=1;
+                            }
                             else {
                                 if (state.backtracking>0) {state.failed=true; return ;}
                                 NoViableAltException nvae =
@@ -3950,15 +3950,15 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             }
             switch (alt6) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1275:1: ( ruleSimpleAnnotationAttribute )
+                    // InternalConfig.g:1274:1: ( ruleSimpleAnnotationAttribute )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1275:1: ( ruleSimpleAnnotationAttribute )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1276:1: ruleSimpleAnnotationAttribute
+                    // InternalConfig.g:1274:1: ( ruleSimpleAnnotationAttribute )
+                    // InternalConfig.g:1275:1: ruleSimpleAnnotationAttribute
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getAnnotationAttributeAccess().getSimpleAnnotationAttributeParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleSimpleAnnotationAttribute_in_rule__AnnotationAttribute__Alternatives2650);
+                    pushFollow(FOLLOW_2);
                     ruleSimpleAnnotationAttribute();
 
                     state._fsp--;
@@ -3973,15 +3973,15 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1281:6: ( ruleEnumAnnotationAttribute )
+                    // InternalConfig.g:1280:6: ( ruleEnumAnnotationAttribute )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1281:6: ( ruleEnumAnnotationAttribute )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1282:1: ruleEnumAnnotationAttribute
+                    // InternalConfig.g:1280:6: ( ruleEnumAnnotationAttribute )
+                    // InternalConfig.g:1281:1: ruleEnumAnnotationAttribute
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getAnnotationAttributeAccess().getEnumAnnotationAttributeParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleEnumAnnotationAttribute_in_rule__AnnotationAttribute__Alternatives2667);
+                    pushFollow(FOLLOW_2);
                     ruleEnumAnnotationAttribute();
 
                     state._fsp--;
@@ -4013,13 +4013,13 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Alternatives_0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1292:1: rule__SimpleAnnotationAttribute__Alternatives_0 : ( ( ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 ) ) | ( 'mandatory' ) );
+    // InternalConfig.g:1291:1: rule__SimpleAnnotationAttribute__Alternatives_0 : ( ( ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 ) ) | ( 'mandatory' ) );
     public final void rule__SimpleAnnotationAttribute__Alternatives_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1296:1: ( ( ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 ) ) | ( 'mandatory' ) )
+            // InternalConfig.g:1295:1: ( ( ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 ) ) | ( 'mandatory' ) )
             int alt7=2;
             int LA7_0 = input.LA(1);
 
@@ -4038,18 +4038,18 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             }
             switch (alt7) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1297:1: ( ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 ) )
+                    // InternalConfig.g:1296:1: ( ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 ) )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1297:1: ( ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 ) )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1298:1: ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 )
+                    // InternalConfig.g:1296:1: ( ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 ) )
+                    // InternalConfig.g:1297:1: ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getSimpleAnnotationAttributeAccess().getOptionalAssignment_0_0()); 
                     }
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1299:1: ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1299:2: rule__SimpleAnnotationAttribute__OptionalAssignment_0_0
+                    // InternalConfig.g:1298:1: ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 )
+                    // InternalConfig.g:1298:2: rule__SimpleAnnotationAttribute__OptionalAssignment_0_0
                     {
-                    pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__OptionalAssignment_0_0_in_rule__SimpleAnnotationAttribute__Alternatives_02699);
+                    pushFollow(FOLLOW_2);
                     rule__SimpleAnnotationAttribute__OptionalAssignment_0_0();
 
                     state._fsp--;
@@ -4067,15 +4067,15 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1303:6: ( 'mandatory' )
+                    // InternalConfig.g:1302:6: ( 'mandatory' )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1303:6: ( 'mandatory' )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1304:1: 'mandatory'
+                    // InternalConfig.g:1302:6: ( 'mandatory' )
+                    // InternalConfig.g:1303:1: 'mandatory'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getSimpleAnnotationAttributeAccess().getMandatoryKeyword_0_1()); 
                     }
-                    match(input,15,FOLLOW_15_in_rule__SimpleAnnotationAttribute__Alternatives_02718); if (state.failed) return ;
+                    match(input,15,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getSimpleAnnotationAttributeAccess().getMandatoryKeyword_0_1()); 
                     }
@@ -4103,13 +4103,13 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Alternatives_0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1316:1: rule__EnumAnnotationAttribute__Alternatives_0 : ( ( ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 ) ) | ( 'mandatory' ) );
+    // InternalConfig.g:1315:1: rule__EnumAnnotationAttribute__Alternatives_0 : ( ( ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 ) ) | ( 'mandatory' ) );
     public final void rule__EnumAnnotationAttribute__Alternatives_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1320:1: ( ( ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 ) ) | ( 'mandatory' ) )
+            // InternalConfig.g:1319:1: ( ( ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 ) ) | ( 'mandatory' ) )
             int alt8=2;
             int LA8_0 = input.LA(1);
 
@@ -4128,18 +4128,18 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             }
             switch (alt8) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1321:1: ( ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 ) )
+                    // InternalConfig.g:1320:1: ( ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 ) )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1321:1: ( ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 ) )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1322:1: ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 )
+                    // InternalConfig.g:1320:1: ( ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 ) )
+                    // InternalConfig.g:1321:1: ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getEnumAnnotationAttributeAccess().getOptionalAssignment_0_0()); 
                     }
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1323:1: ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1323:2: rule__EnumAnnotationAttribute__OptionalAssignment_0_0
+                    // InternalConfig.g:1322:1: ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 )
+                    // InternalConfig.g:1322:2: rule__EnumAnnotationAttribute__OptionalAssignment_0_0
                     {
-                    pushFollow(FOLLOW_rule__EnumAnnotationAttribute__OptionalAssignment_0_0_in_rule__EnumAnnotationAttribute__Alternatives_02752);
+                    pushFollow(FOLLOW_2);
                     rule__EnumAnnotationAttribute__OptionalAssignment_0_0();
 
                     state._fsp--;
@@ -4157,15 +4157,15 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1327:6: ( 'mandatory' )
+                    // InternalConfig.g:1326:6: ( 'mandatory' )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1327:6: ( 'mandatory' )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1328:1: 'mandatory'
+                    // InternalConfig.g:1326:6: ( 'mandatory' )
+                    // InternalConfig.g:1327:1: 'mandatory'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getEnumAnnotationAttributeAccess().getMandatoryKeyword_0_1()); 
                     }
-                    match(input,15,FOLLOW_15_in_rule__EnumAnnotationAttribute__Alternatives_02771); if (state.failed) return ;
+                    match(input,15,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getEnumAnnotationAttributeAccess().getMandatoryKeyword_0_1()); 
                     }
@@ -4193,13 +4193,13 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Import__Alternatives_1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1340:1: rule__Import__Alternatives_1 : ( ( ( rule__Import__Group_1_0__0 ) ) | ( 'model' ) );
+    // InternalConfig.g:1339:1: rule__Import__Alternatives_1 : ( ( ( rule__Import__Group_1_0__0 ) ) | ( 'model' ) );
     public final void rule__Import__Alternatives_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1344:1: ( ( ( rule__Import__Group_1_0__0 ) ) | ( 'model' ) )
+            // InternalConfig.g:1343:1: ( ( ( rule__Import__Group_1_0__0 ) ) | ( 'model' ) )
             int alt9=2;
             int LA9_0 = input.LA(1);
 
@@ -4218,18 +4218,18 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             }
             switch (alt9) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1345:1: ( ( rule__Import__Group_1_0__0 ) )
+                    // InternalConfig.g:1344:1: ( ( rule__Import__Group_1_0__0 ) )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1345:1: ( ( rule__Import__Group_1_0__0 ) )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1346:1: ( rule__Import__Group_1_0__0 )
+                    // InternalConfig.g:1344:1: ( ( rule__Import__Group_1_0__0 ) )
+                    // InternalConfig.g:1345:1: ( rule__Import__Group_1_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getImportAccess().getGroup_1_0()); 
                     }
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1347:1: ( rule__Import__Group_1_0__0 )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1347:2: rule__Import__Group_1_0__0
+                    // InternalConfig.g:1346:1: ( rule__Import__Group_1_0__0 )
+                    // InternalConfig.g:1346:2: rule__Import__Group_1_0__0
                     {
-                    pushFollow(FOLLOW_rule__Import__Group_1_0__0_in_rule__Import__Alternatives_12805);
+                    pushFollow(FOLLOW_2);
                     rule__Import__Group_1_0__0();
 
                     state._fsp--;
@@ -4247,15 +4247,15 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1351:6: ( 'model' )
+                    // InternalConfig.g:1350:6: ( 'model' )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1351:6: ( 'model' )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1352:1: 'model'
+                    // InternalConfig.g:1350:6: ( 'model' )
+                    // InternalConfig.g:1351:1: 'model'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getImportAccess().getModelKeyword_1_1()); 
                     }
-                    match(input,16,FOLLOW_16_in_rule__Import__Alternatives_12824); if (state.failed) return ;
+                    match(input,16,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getImportAccess().getModelKeyword_1_1()); 
                     }
@@ -4283,18 +4283,23 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TIME__Alternatives"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1364:1: rule__TIME__Alternatives : ( ( ( rule__TIME__Group_0__0 ) ) | ( ( rule__TIME__Group_1__0 ) ) | ( ( rule__TIME__Group_2__0 ) ) | ( ( rule__TIME__Group_3__0 ) ) );
+    // InternalConfig.g:1363:1: rule__TIME__Alternatives : ( ( ( rule__TIME__Group_0__0 ) ) | ( ( rule__TIME__Group_1__0 ) ) | ( ( rule__TIME__Group_2__0 ) ) | ( ( rule__TIME__Group_3__0 ) ) );
     public final void rule__TIME__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1368:1: ( ( ( rule__TIME__Group_0__0 ) ) | ( ( rule__TIME__Group_1__0 ) ) | ( ( rule__TIME__Group_2__0 ) ) | ( ( rule__TIME__Group_3__0 ) ) )
+            // InternalConfig.g:1367:1: ( ( ( rule__TIME__Group_0__0 ) ) | ( ( rule__TIME__Group_1__0 ) ) | ( ( rule__TIME__Group_2__0 ) ) | ( ( rule__TIME__Group_3__0 ) ) )
             int alt10=4;
             int LA10_0 = input.LA(1);
 
             if ( (LA10_0==RULE_INT) ) {
                 switch ( input.LA(2) ) {
+                case 56:
+                    {
+                    alt10=2;
+                    }
+                    break;
                 case 58:
                     {
                     alt10=4;
@@ -4310,11 +4315,6 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
                     alt10=3;
                     }
                     break;
-                case 56:
-                    {
-                    alt10=2;
-                    }
-                    break;
                 default:
                     if (state.backtracking>0) {state.failed=true; return ;}
                     NoViableAltException nvae =
@@ -4333,18 +4333,18 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             }
             switch (alt10) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1369:1: ( ( rule__TIME__Group_0__0 ) )
+                    // InternalConfig.g:1368:1: ( ( rule__TIME__Group_0__0 ) )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1369:1: ( ( rule__TIME__Group_0__0 ) )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1370:1: ( rule__TIME__Group_0__0 )
+                    // InternalConfig.g:1368:1: ( ( rule__TIME__Group_0__0 ) )
+                    // InternalConfig.g:1369:1: ( rule__TIME__Group_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getTIMEAccess().getGroup_0()); 
                     }
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1371:1: ( rule__TIME__Group_0__0 )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1371:2: rule__TIME__Group_0__0
+                    // InternalConfig.g:1370:1: ( rule__TIME__Group_0__0 )
+                    // InternalConfig.g:1370:2: rule__TIME__Group_0__0
                     {
-                    pushFollow(FOLLOW_rule__TIME__Group_0__0_in_rule__TIME__Alternatives2858);
+                    pushFollow(FOLLOW_2);
                     rule__TIME__Group_0__0();
 
                     state._fsp--;
@@ -4362,18 +4362,18 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1375:6: ( ( rule__TIME__Group_1__0 ) )
+                    // InternalConfig.g:1374:6: ( ( rule__TIME__Group_1__0 ) )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1375:6: ( ( rule__TIME__Group_1__0 ) )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1376:1: ( rule__TIME__Group_1__0 )
+                    // InternalConfig.g:1374:6: ( ( rule__TIME__Group_1__0 ) )
+                    // InternalConfig.g:1375:1: ( rule__TIME__Group_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getTIMEAccess().getGroup_1()); 
                     }
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1377:1: ( rule__TIME__Group_1__0 )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1377:2: rule__TIME__Group_1__0
+                    // InternalConfig.g:1376:1: ( rule__TIME__Group_1__0 )
+                    // InternalConfig.g:1376:2: rule__TIME__Group_1__0
                     {
-                    pushFollow(FOLLOW_rule__TIME__Group_1__0_in_rule__TIME__Alternatives2876);
+                    pushFollow(FOLLOW_2);
                     rule__TIME__Group_1__0();
 
                     state._fsp--;
@@ -4391,18 +4391,18 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1381:6: ( ( rule__TIME__Group_2__0 ) )
+                    // InternalConfig.g:1380:6: ( ( rule__TIME__Group_2__0 ) )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1381:6: ( ( rule__TIME__Group_2__0 ) )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1382:1: ( rule__TIME__Group_2__0 )
+                    // InternalConfig.g:1380:6: ( ( rule__TIME__Group_2__0 ) )
+                    // InternalConfig.g:1381:1: ( rule__TIME__Group_2__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getTIMEAccess().getGroup_2()); 
                     }
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1383:1: ( rule__TIME__Group_2__0 )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1383:2: rule__TIME__Group_2__0
+                    // InternalConfig.g:1382:1: ( rule__TIME__Group_2__0 )
+                    // InternalConfig.g:1382:2: rule__TIME__Group_2__0
                     {
-                    pushFollow(FOLLOW_rule__TIME__Group_2__0_in_rule__TIME__Alternatives2894);
+                    pushFollow(FOLLOW_2);
                     rule__TIME__Group_2__0();
 
                     state._fsp--;
@@ -4420,18 +4420,18 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 4 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1387:6: ( ( rule__TIME__Group_3__0 ) )
+                    // InternalConfig.g:1386:6: ( ( rule__TIME__Group_3__0 ) )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1387:6: ( ( rule__TIME__Group_3__0 ) )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1388:1: ( rule__TIME__Group_3__0 )
+                    // InternalConfig.g:1386:6: ( ( rule__TIME__Group_3__0 ) )
+                    // InternalConfig.g:1387:1: ( rule__TIME__Group_3__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getTIMEAccess().getGroup_3()); 
                     }
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1389:1: ( rule__TIME__Group_3__0 )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1389:2: rule__TIME__Group_3__0
+                    // InternalConfig.g:1388:1: ( rule__TIME__Group_3__0 )
+                    // InternalConfig.g:1388:2: rule__TIME__Group_3__0
                     {
-                    pushFollow(FOLLOW_rule__TIME__Group_3__0_in_rule__TIME__Alternatives2912);
+                    pushFollow(FOLLOW_2);
                     rule__TIME__Group_3__0();
 
                     state._fsp--;
@@ -4466,13 +4466,13 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Literal__Alternatives"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1398:1: rule__Literal__Alternatives : ( ( ruleBooleanLiteral ) | ( ruleNumberLiteral ) | ( ruleStringLiteral ) );
+    // InternalConfig.g:1397:1: rule__Literal__Alternatives : ( ( ruleBooleanLiteral ) | ( ruleNumberLiteral ) | ( ruleStringLiteral ) );
     public final void rule__Literal__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1402:1: ( ( ruleBooleanLiteral ) | ( ruleNumberLiteral ) | ( ruleStringLiteral ) )
+            // InternalConfig.g:1401:1: ( ( ruleBooleanLiteral ) | ( ruleNumberLiteral ) | ( ruleStringLiteral ) )
             int alt11=3;
             switch ( input.LA(1) ) {
             case 17:
@@ -4504,15 +4504,15 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
             switch (alt11) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1403:1: ( ruleBooleanLiteral )
+                    // InternalConfig.g:1402:1: ( ruleBooleanLiteral )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1403:1: ( ruleBooleanLiteral )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1404:1: ruleBooleanLiteral
+                    // InternalConfig.g:1402:1: ( ruleBooleanLiteral )
+                    // InternalConfig.g:1403:1: ruleBooleanLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getLiteralAccess().getBooleanLiteralParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleBooleanLiteral_in_rule__Literal__Alternatives2945);
+                    pushFollow(FOLLOW_2);
                     ruleBooleanLiteral();
 
                     state._fsp--;
@@ -4527,15 +4527,15 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1409:6: ( ruleNumberLiteral )
+                    // InternalConfig.g:1408:6: ( ruleNumberLiteral )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1409:6: ( ruleNumberLiteral )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1410:1: ruleNumberLiteral
+                    // InternalConfig.g:1408:6: ( ruleNumberLiteral )
+                    // InternalConfig.g:1409:1: ruleNumberLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getLiteralAccess().getNumberLiteralParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleNumberLiteral_in_rule__Literal__Alternatives2962);
+                    pushFollow(FOLLOW_2);
                     ruleNumberLiteral();
 
                     state._fsp--;
@@ -4550,15 +4550,15 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1415:6: ( ruleStringLiteral )
+                    // InternalConfig.g:1414:6: ( ruleStringLiteral )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1415:6: ( ruleStringLiteral )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1416:1: ruleStringLiteral
+                    // InternalConfig.g:1414:6: ( ruleStringLiteral )
+                    // InternalConfig.g:1415:1: ruleStringLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getLiteralAccess().getStringLiteralParserRuleCall_2()); 
                     }
-                    pushFollow(FOLLOW_ruleStringLiteral_in_rule__Literal__Alternatives2979);
+                    pushFollow(FOLLOW_2);
                     ruleStringLiteral();
 
                     state._fsp--;
@@ -4590,13 +4590,13 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__BooleanLiteral__Alternatives_1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1426:1: rule__BooleanLiteral__Alternatives_1 : ( ( 'false' ) | ( ( rule__BooleanLiteral__IsTrueAssignment_1_1 ) ) );
+    // InternalConfig.g:1425:1: rule__BooleanLiteral__Alternatives_1 : ( ( 'false' ) | ( ( rule__BooleanLiteral__IsTrueAssignment_1_1 ) ) );
     public final void rule__BooleanLiteral__Alternatives_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1430:1: ( ( 'false' ) | ( ( rule__BooleanLiteral__IsTrueAssignment_1_1 ) ) )
+            // InternalConfig.g:1429:1: ( ( 'false' ) | ( ( rule__BooleanLiteral__IsTrueAssignment_1_1 ) ) )
             int alt12=2;
             int LA12_0 = input.LA(1);
 
@@ -4615,15 +4615,15 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             }
             switch (alt12) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1431:1: ( 'false' )
+                    // InternalConfig.g:1430:1: ( 'false' )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1431:1: ( 'false' )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1432:1: 'false'
+                    // InternalConfig.g:1430:1: ( 'false' )
+                    // InternalConfig.g:1431:1: 'false'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getBooleanLiteralAccess().getFalseKeyword_1_0()); 
                     }
-                    match(input,17,FOLLOW_17_in_rule__BooleanLiteral__Alternatives_13012); if (state.failed) return ;
+                    match(input,17,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getBooleanLiteralAccess().getFalseKeyword_1_0()); 
                     }
@@ -4634,18 +4634,18 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1439:6: ( ( rule__BooleanLiteral__IsTrueAssignment_1_1 ) )
+                    // InternalConfig.g:1438:6: ( ( rule__BooleanLiteral__IsTrueAssignment_1_1 ) )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1439:6: ( ( rule__BooleanLiteral__IsTrueAssignment_1_1 ) )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1440:1: ( rule__BooleanLiteral__IsTrueAssignment_1_1 )
+                    // InternalConfig.g:1438:6: ( ( rule__BooleanLiteral__IsTrueAssignment_1_1 ) )
+                    // InternalConfig.g:1439:1: ( rule__BooleanLiteral__IsTrueAssignment_1_1 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getBooleanLiteralAccess().getIsTrueAssignment_1_1()); 
                     }
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1441:1: ( rule__BooleanLiteral__IsTrueAssignment_1_1 )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1441:2: rule__BooleanLiteral__IsTrueAssignment_1_1
+                    // InternalConfig.g:1440:1: ( rule__BooleanLiteral__IsTrueAssignment_1_1 )
+                    // InternalConfig.g:1440:2: rule__BooleanLiteral__IsTrueAssignment_1_1
                     {
-                    pushFollow(FOLLOW_rule__BooleanLiteral__IsTrueAssignment_1_1_in_rule__BooleanLiteral__Alternatives_13031);
+                    pushFollow(FOLLOW_2);
                     rule__BooleanLiteral__IsTrueAssignment_1_1();
 
                     state._fsp--;
@@ -4680,13 +4680,13 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NumberLiteral__Alternatives"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1450:1: rule__NumberLiteral__Alternatives : ( ( ruleIntLiteral ) | ( ruleRealLiteral ) );
+    // InternalConfig.g:1449:1: rule__NumberLiteral__Alternatives : ( ( ruleIntLiteral ) | ( ruleRealLiteral ) );
     public final void rule__NumberLiteral__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1454:1: ( ( ruleIntLiteral ) | ( ruleRealLiteral ) )
+            // InternalConfig.g:1453:1: ( ( ruleIntLiteral ) | ( ruleRealLiteral ) )
             int alt13=2;
             switch ( input.LA(1) ) {
             case 18:
@@ -4783,15 +4783,15 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
             switch (alt13) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1455:1: ( ruleIntLiteral )
+                    // InternalConfig.g:1454:1: ( ruleIntLiteral )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1455:1: ( ruleIntLiteral )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1456:1: ruleIntLiteral
+                    // InternalConfig.g:1454:1: ( ruleIntLiteral )
+                    // InternalConfig.g:1455:1: ruleIntLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getNumberLiteralAccess().getIntLiteralParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleIntLiteral_in_rule__NumberLiteral__Alternatives3064);
+                    pushFollow(FOLLOW_2);
                     ruleIntLiteral();
 
                     state._fsp--;
@@ -4806,15 +4806,15 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1461:6: ( ruleRealLiteral )
+                    // InternalConfig.g:1460:6: ( ruleRealLiteral )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1461:6: ( ruleRealLiteral )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1462:1: ruleRealLiteral
+                    // InternalConfig.g:1460:6: ( ruleRealLiteral )
+                    // InternalConfig.g:1461:1: ruleRealLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getNumberLiteralAccess().getRealLiteralParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleRealLiteral_in_rule__NumberLiteral__Alternatives3081);
+                    pushFollow(FOLLOW_2);
                     ruleRealLiteral();
 
                     state._fsp--;
@@ -4846,13 +4846,13 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Integer__Alternatives"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1472:1: rule__Integer__Alternatives : ( ( ( rule__Integer__Group_0__0 ) ) | ( RULE_HEX ) );
+    // InternalConfig.g:1471:1: rule__Integer__Alternatives : ( ( ( rule__Integer__Group_0__0 ) ) | ( RULE_HEX ) );
     public final void rule__Integer__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1476:1: ( ( ( rule__Integer__Group_0__0 ) ) | ( RULE_HEX ) )
+            // InternalConfig.g:1475:1: ( ( ( rule__Integer__Group_0__0 ) ) | ( RULE_HEX ) )
             int alt14=2;
             int LA14_0 = input.LA(1);
 
@@ -4871,18 +4871,18 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             }
             switch (alt14) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1477:1: ( ( rule__Integer__Group_0__0 ) )
+                    // InternalConfig.g:1476:1: ( ( rule__Integer__Group_0__0 ) )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1477:1: ( ( rule__Integer__Group_0__0 ) )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1478:1: ( rule__Integer__Group_0__0 )
+                    // InternalConfig.g:1476:1: ( ( rule__Integer__Group_0__0 ) )
+                    // InternalConfig.g:1477:1: ( rule__Integer__Group_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getIntegerAccess().getGroup_0()); 
                     }
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1479:1: ( rule__Integer__Group_0__0 )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1479:2: rule__Integer__Group_0__0
+                    // InternalConfig.g:1478:1: ( rule__Integer__Group_0__0 )
+                    // InternalConfig.g:1478:2: rule__Integer__Group_0__0
                     {
-                    pushFollow(FOLLOW_rule__Integer__Group_0__0_in_rule__Integer__Alternatives3113);
+                    pushFollow(FOLLOW_2);
                     rule__Integer__Group_0__0();
 
                     state._fsp--;
@@ -4900,15 +4900,15 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1483:6: ( RULE_HEX )
+                    // InternalConfig.g:1482:6: ( RULE_HEX )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1483:6: ( RULE_HEX )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1484:1: RULE_HEX
+                    // InternalConfig.g:1482:6: ( RULE_HEX )
+                    // InternalConfig.g:1483:1: RULE_HEX
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getIntegerAccess().getHEXTerminalRuleCall_1()); 
                     }
-                    match(input,RULE_HEX,FOLLOW_RULE_HEX_in_rule__Integer__Alternatives3131); if (state.failed) return ;
+                    match(input,RULE_HEX,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getIntegerAccess().getHEXTerminalRuleCall_1()); 
                     }
@@ -4936,13 +4936,13 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Integer__Alternatives_0_0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1494:1: rule__Integer__Alternatives_0_0 : ( ( '+' ) | ( '-' ) );
+    // InternalConfig.g:1493:1: rule__Integer__Alternatives_0_0 : ( ( '+' ) | ( '-' ) );
     public final void rule__Integer__Alternatives_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1498:1: ( ( '+' ) | ( '-' ) )
+            // InternalConfig.g:1497:1: ( ( '+' ) | ( '-' ) )
             int alt15=2;
             int LA15_0 = input.LA(1);
 
@@ -4961,15 +4961,15 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             }
             switch (alt15) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1499:1: ( '+' )
+                    // InternalConfig.g:1498:1: ( '+' )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1499:1: ( '+' )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1500:1: '+'
+                    // InternalConfig.g:1498:1: ( '+' )
+                    // InternalConfig.g:1499:1: '+'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getIntegerAccess().getPlusSignKeyword_0_0_0()); 
                     }
-                    match(input,18,FOLLOW_18_in_rule__Integer__Alternatives_0_03164); if (state.failed) return ;
+                    match(input,18,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getIntegerAccess().getPlusSignKeyword_0_0_0()); 
                     }
@@ -4980,15 +4980,15 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1507:6: ( '-' )
+                    // InternalConfig.g:1506:6: ( '-' )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1507:6: ( '-' )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1508:1: '-'
+                    // InternalConfig.g:1506:6: ( '-' )
+                    // InternalConfig.g:1507:1: '-'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getIntegerAccess().getHyphenMinusKeyword_0_0_1()); 
                     }
-                    match(input,19,FOLLOW_19_in_rule__Integer__Alternatives_0_03184); if (state.failed) return ;
+                    match(input,19,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getIntegerAccess().getHyphenMinusKeyword_0_0_1()); 
                     }
@@ -5016,13 +5016,13 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Real__Alternatives"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1520:1: rule__Real__Alternatives : ( ( ruleDecimal ) | ( ruleDecimalExp ) );
+    // InternalConfig.g:1519:1: rule__Real__Alternatives : ( ( ruleDecimal ) | ( ruleDecimalExp ) );
     public final void rule__Real__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1524:1: ( ( ruleDecimal ) | ( ruleDecimalExp ) )
+            // InternalConfig.g:1523:1: ( ( ruleDecimal ) | ( ruleDecimalExp ) )
             int alt16=2;
             switch ( input.LA(1) ) {
             case 18:
@@ -5038,12 +5038,12 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
                         if ( (LA16_4==RULE_INT) ) {
                             int LA16_5 = input.LA(5);
 
-                            if ( ((LA16_5>=20 && LA16_5<=21)) ) {
-                                alt16=2;
-                            }
-                            else if ( (LA16_5==EOF||(LA16_5>=27 && LA16_5<=28)||(LA16_5>=41 && LA16_5<=42)||(LA16_5>=45 && LA16_5<=46)) ) {
+                            if ( (LA16_5==EOF||(LA16_5>=27 && LA16_5<=28)||(LA16_5>=41 && LA16_5<=42)||(LA16_5>=45 && LA16_5<=46)) ) {
                                 alt16=1;
                             }
+                            else if ( ((LA16_5>=20 && LA16_5<=21)) ) {
+                                alt16=2;
+                            }
                             else {
                                 if (state.backtracking>0) {state.failed=true; return ;}
                                 NoViableAltException nvae =
@@ -5090,12 +5090,12 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
                         if ( (LA16_4==RULE_INT) ) {
                             int LA16_5 = input.LA(5);
 
-                            if ( ((LA16_5>=20 && LA16_5<=21)) ) {
-                                alt16=2;
-                            }
-                            else if ( (LA16_5==EOF||(LA16_5>=27 && LA16_5<=28)||(LA16_5>=41 && LA16_5<=42)||(LA16_5>=45 && LA16_5<=46)) ) {
+                            if ( (LA16_5==EOF||(LA16_5>=27 && LA16_5<=28)||(LA16_5>=41 && LA16_5<=42)||(LA16_5>=45 && LA16_5<=46)) ) {
                                 alt16=1;
                             }
+                            else if ( ((LA16_5>=20 && LA16_5<=21)) ) {
+                                alt16=2;
+                            }
                             else {
                                 if (state.backtracking>0) {state.failed=true; return ;}
                                 NoViableAltException nvae =
@@ -5139,12 +5139,12 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
                     if ( (LA16_4==RULE_INT) ) {
                         int LA16_5 = input.LA(4);
 
-                        if ( ((LA16_5>=20 && LA16_5<=21)) ) {
-                            alt16=2;
-                        }
-                        else if ( (LA16_5==EOF||(LA16_5>=27 && LA16_5<=28)||(LA16_5>=41 && LA16_5<=42)||(LA16_5>=45 && LA16_5<=46)) ) {
+                        if ( (LA16_5==EOF||(LA16_5>=27 && LA16_5<=28)||(LA16_5>=41 && LA16_5<=42)||(LA16_5>=45 && LA16_5<=46)) ) {
                             alt16=1;
                         }
+                        else if ( ((LA16_5>=20 && LA16_5<=21)) ) {
+                            alt16=2;
+                        }
                         else {
                             if (state.backtracking>0) {state.failed=true; return ;}
                             NoViableAltException nvae =
@@ -5180,15 +5180,15 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
             switch (alt16) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1525:1: ( ruleDecimal )
+                    // InternalConfig.g:1524:1: ( ruleDecimal )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1525:1: ( ruleDecimal )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1526:1: ruleDecimal
+                    // InternalConfig.g:1524:1: ( ruleDecimal )
+                    // InternalConfig.g:1525:1: ruleDecimal
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getRealAccess().getDecimalParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleDecimal_in_rule__Real__Alternatives3218);
+                    pushFollow(FOLLOW_2);
                     ruleDecimal();
 
                     state._fsp--;
@@ -5203,15 +5203,15 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1531:6: ( ruleDecimalExp )
+                    // InternalConfig.g:1530:6: ( ruleDecimalExp )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1531:6: ( ruleDecimalExp )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1532:1: ruleDecimalExp
+                    // InternalConfig.g:1530:6: ( ruleDecimalExp )
+                    // InternalConfig.g:1531:1: ruleDecimalExp
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getRealAccess().getDecimalExpParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleDecimalExp_in_rule__Real__Alternatives3235);
+                    pushFollow(FOLLOW_2);
                     ruleDecimalExp();
 
                     state._fsp--;
@@ -5243,13 +5243,13 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Decimal__Alternatives_0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1542:1: rule__Decimal__Alternatives_0 : ( ( '+' ) | ( '-' ) );
+    // InternalConfig.g:1541:1: rule__Decimal__Alternatives_0 : ( ( '+' ) | ( '-' ) );
     public final void rule__Decimal__Alternatives_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1546:1: ( ( '+' ) | ( '-' ) )
+            // InternalConfig.g:1545:1: ( ( '+' ) | ( '-' ) )
             int alt17=2;
             int LA17_0 = input.LA(1);
 
@@ -5268,15 +5268,15 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             }
             switch (alt17) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1547:1: ( '+' )
+                    // InternalConfig.g:1546:1: ( '+' )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1547:1: ( '+' )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1548:1: '+'
+                    // InternalConfig.g:1546:1: ( '+' )
+                    // InternalConfig.g:1547:1: '+'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getDecimalAccess().getPlusSignKeyword_0_0()); 
                     }
-                    match(input,18,FOLLOW_18_in_rule__Decimal__Alternatives_03268); if (state.failed) return ;
+                    match(input,18,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getDecimalAccess().getPlusSignKeyword_0_0()); 
                     }
@@ -5287,15 +5287,15 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1555:6: ( '-' )
+                    // InternalConfig.g:1554:6: ( '-' )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1555:6: ( '-' )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1556:1: '-'
+                    // InternalConfig.g:1554:6: ( '-' )
+                    // InternalConfig.g:1555:1: '-'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getDecimalAccess().getHyphenMinusKeyword_0_1()); 
                     }
-                    match(input,19,FOLLOW_19_in_rule__Decimal__Alternatives_03288); if (state.failed) return ;
+                    match(input,19,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getDecimalAccess().getHyphenMinusKeyword_0_1()); 
                     }
@@ -5323,13 +5323,13 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Alternatives_0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1568:1: rule__DecimalExp__Alternatives_0 : ( ( '+' ) | ( '-' ) );
+    // InternalConfig.g:1567:1: rule__DecimalExp__Alternatives_0 : ( ( '+' ) | ( '-' ) );
     public final void rule__DecimalExp__Alternatives_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1572:1: ( ( '+' ) | ( '-' ) )
+            // InternalConfig.g:1571:1: ( ( '+' ) | ( '-' ) )
             int alt18=2;
             int LA18_0 = input.LA(1);
 
@@ -5348,15 +5348,15 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             }
             switch (alt18) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1573:1: ( '+' )
+                    // InternalConfig.g:1572:1: ( '+' )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1573:1: ( '+' )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1574:1: '+'
+                    // InternalConfig.g:1572:1: ( '+' )
+                    // InternalConfig.g:1573:1: '+'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getDecimalExpAccess().getPlusSignKeyword_0_0()); 
                     }
-                    match(input,18,FOLLOW_18_in_rule__DecimalExp__Alternatives_03323); if (state.failed) return ;
+                    match(input,18,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getDecimalExpAccess().getPlusSignKeyword_0_0()); 
                     }
@@ -5367,15 +5367,15 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1581:6: ( '-' )
+                    // InternalConfig.g:1580:6: ( '-' )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1581:6: ( '-' )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1582:1: '-'
+                    // InternalConfig.g:1580:6: ( '-' )
+                    // InternalConfig.g:1581:1: '-'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getDecimalExpAccess().getHyphenMinusKeyword_0_1()); 
                     }
-                    match(input,19,FOLLOW_19_in_rule__DecimalExp__Alternatives_03343); if (state.failed) return ;
+                    match(input,19,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getDecimalExpAccess().getHyphenMinusKeyword_0_1()); 
                     }
@@ -5403,13 +5403,13 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Alternatives_4"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1594:1: rule__DecimalExp__Alternatives_4 : ( ( 'e' ) | ( 'E' ) );
+    // InternalConfig.g:1593:1: rule__DecimalExp__Alternatives_4 : ( ( 'e' ) | ( 'E' ) );
     public final void rule__DecimalExp__Alternatives_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1598:1: ( ( 'e' ) | ( 'E' ) )
+            // InternalConfig.g:1597:1: ( ( 'e' ) | ( 'E' ) )
             int alt19=2;
             int LA19_0 = input.LA(1);
 
@@ -5428,15 +5428,15 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             }
             switch (alt19) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1599:1: ( 'e' )
+                    // InternalConfig.g:1598:1: ( 'e' )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1599:1: ( 'e' )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1600:1: 'e'
+                    // InternalConfig.g:1598:1: ( 'e' )
+                    // InternalConfig.g:1599:1: 'e'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getDecimalExpAccess().getEKeyword_4_0()); 
                     }
-                    match(input,20,FOLLOW_20_in_rule__DecimalExp__Alternatives_43378); if (state.failed) return ;
+                    match(input,20,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getDecimalExpAccess().getEKeyword_4_0()); 
                     }
@@ -5447,15 +5447,15 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1607:6: ( 'E' )
+                    // InternalConfig.g:1606:6: ( 'E' )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1607:6: ( 'E' )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1608:1: 'E'
+                    // InternalConfig.g:1606:6: ( 'E' )
+                    // InternalConfig.g:1607:1: 'E'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getDecimalExpAccess().getEKeyword_4_1()); 
                     }
-                    match(input,21,FOLLOW_21_in_rule__DecimalExp__Alternatives_43398); if (state.failed) return ;
+                    match(input,21,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getDecimalExpAccess().getEKeyword_4_1()); 
                     }
@@ -5483,13 +5483,13 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Alternatives_5"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1620:1: rule__DecimalExp__Alternatives_5 : ( ( '+' ) | ( '-' ) );
+    // InternalConfig.g:1619:1: rule__DecimalExp__Alternatives_5 : ( ( '+' ) | ( '-' ) );
     public final void rule__DecimalExp__Alternatives_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1624:1: ( ( '+' ) | ( '-' ) )
+            // InternalConfig.g:1623:1: ( ( '+' ) | ( '-' ) )
             int alt20=2;
             int LA20_0 = input.LA(1);
 
@@ -5508,15 +5508,15 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             }
             switch (alt20) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1625:1: ( '+' )
+                    // InternalConfig.g:1624:1: ( '+' )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1625:1: ( '+' )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1626:1: '+'
+                    // InternalConfig.g:1624:1: ( '+' )
+                    // InternalConfig.g:1625:1: '+'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getDecimalExpAccess().getPlusSignKeyword_5_0()); 
                     }
-                    match(input,18,FOLLOW_18_in_rule__DecimalExp__Alternatives_53433); if (state.failed) return ;
+                    match(input,18,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getDecimalExpAccess().getPlusSignKeyword_5_0()); 
                     }
@@ -5527,15 +5527,15 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1633:6: ( '-' )
+                    // InternalConfig.g:1632:6: ( '-' )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1633:6: ( '-' )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1634:1: '-'
+                    // InternalConfig.g:1632:6: ( '-' )
+                    // InternalConfig.g:1633:1: '-'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getDecimalExpAccess().getHyphenMinusKeyword_5_1()); 
                     }
-                    match(input,19,FOLLOW_19_in_rule__DecimalExp__Alternatives_53453); if (state.failed) return ;
+                    match(input,19,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getDecimalExpAccess().getHyphenMinusKeyword_5_1()); 
                     }
@@ -5563,13 +5563,13 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__LiteralType__Alternatives"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1646:1: rule__LiteralType__Alternatives : ( ( ( 'ptBoolean' ) ) | ( ( 'ptInteger' ) ) | ( ( 'ptReal' ) ) | ( ( 'ptCharacter' ) ) );
+    // InternalConfig.g:1645:1: rule__LiteralType__Alternatives : ( ( ( 'ptBoolean' ) ) | ( ( 'ptInteger' ) ) | ( ( 'ptReal' ) ) | ( ( 'ptCharacter' ) ) );
     public final void rule__LiteralType__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1650:1: ( ( ( 'ptBoolean' ) ) | ( ( 'ptInteger' ) ) | ( ( 'ptReal' ) ) | ( ( 'ptCharacter' ) ) )
+            // InternalConfig.g:1649:1: ( ( ( 'ptBoolean' ) ) | ( ( 'ptInteger' ) ) | ( ( 'ptReal' ) ) | ( ( 'ptCharacter' ) ) )
             int alt21=4;
             switch ( input.LA(1) ) {
             case 22:
@@ -5602,18 +5602,18 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
             switch (alt21) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1651:1: ( ( 'ptBoolean' ) )
+                    // InternalConfig.g:1650:1: ( ( 'ptBoolean' ) )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1651:1: ( ( 'ptBoolean' ) )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1652:1: ( 'ptBoolean' )
+                    // InternalConfig.g:1650:1: ( ( 'ptBoolean' ) )
+                    // InternalConfig.g:1651:1: ( 'ptBoolean' )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getLiteralTypeAccess().getBOOLEnumLiteralDeclaration_0()); 
                     }
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1653:1: ( 'ptBoolean' )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1653:3: 'ptBoolean'
+                    // InternalConfig.g:1652:1: ( 'ptBoolean' )
+                    // InternalConfig.g:1652:3: 'ptBoolean'
                     {
-                    match(input,22,FOLLOW_22_in_rule__LiteralType__Alternatives3488); if (state.failed) return ;
+                    match(input,22,FOLLOW_2); if (state.failed) return ;
 
                     }
 
@@ -5627,18 +5627,18 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1658:6: ( ( 'ptInteger' ) )
+                    // InternalConfig.g:1657:6: ( ( 'ptInteger' ) )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1658:6: ( ( 'ptInteger' ) )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1659:1: ( 'ptInteger' )
+                    // InternalConfig.g:1657:6: ( ( 'ptInteger' ) )
+                    // InternalConfig.g:1658:1: ( 'ptInteger' )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getLiteralTypeAccess().getINTEnumLiteralDeclaration_1()); 
                     }
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1660:1: ( 'ptInteger' )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1660:3: 'ptInteger'
+                    // InternalConfig.g:1659:1: ( 'ptInteger' )
+                    // InternalConfig.g:1659:3: 'ptInteger'
                     {
-                    match(input,23,FOLLOW_23_in_rule__LiteralType__Alternatives3509); if (state.failed) return ;
+                    match(input,23,FOLLOW_2); if (state.failed) return ;
 
                     }
 
@@ -5652,18 +5652,18 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1665:6: ( ( 'ptReal' ) )
+                    // InternalConfig.g:1664:6: ( ( 'ptReal' ) )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1665:6: ( ( 'ptReal' ) )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1666:1: ( 'ptReal' )
+                    // InternalConfig.g:1664:6: ( ( 'ptReal' ) )
+                    // InternalConfig.g:1665:1: ( 'ptReal' )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getLiteralTypeAccess().getREALEnumLiteralDeclaration_2()); 
                     }
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1667:1: ( 'ptReal' )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1667:3: 'ptReal'
+                    // InternalConfig.g:1666:1: ( 'ptReal' )
+                    // InternalConfig.g:1666:3: 'ptReal'
                     {
-                    match(input,24,FOLLOW_24_in_rule__LiteralType__Alternatives3530); if (state.failed) return ;
+                    match(input,24,FOLLOW_2); if (state.failed) return ;
 
                     }
 
@@ -5677,18 +5677,18 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 4 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1672:6: ( ( 'ptCharacter' ) )
+                    // InternalConfig.g:1671:6: ( ( 'ptCharacter' ) )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1672:6: ( ( 'ptCharacter' ) )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1673:1: ( 'ptCharacter' )
+                    // InternalConfig.g:1671:6: ( ( 'ptCharacter' ) )
+                    // InternalConfig.g:1672:1: ( 'ptCharacter' )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getLiteralTypeAccess().getCHAREnumLiteralDeclaration_3()); 
                     }
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1674:1: ( 'ptCharacter' )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1674:3: 'ptCharacter'
+                    // InternalConfig.g:1673:1: ( 'ptCharacter' )
+                    // InternalConfig.g:1673:3: 'ptCharacter'
                     {
-                    match(input,25,FOLLOW_25_in_rule__LiteralType__Alternatives3551); if (state.failed) return ;
+                    match(input,25,FOLLOW_2); if (state.failed) return ;
 
                     }
 
@@ -5719,21 +5719,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ConfigModel__Group__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1686:1: rule__ConfigModel__Group__0 : rule__ConfigModel__Group__0__Impl rule__ConfigModel__Group__1 ;
+    // InternalConfig.g:1685:1: rule__ConfigModel__Group__0 : rule__ConfigModel__Group__0__Impl rule__ConfigModel__Group__1 ;
     public final void rule__ConfigModel__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1690:1: ( rule__ConfigModel__Group__0__Impl rule__ConfigModel__Group__1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1691:2: rule__ConfigModel__Group__0__Impl rule__ConfigModel__Group__1
+            // InternalConfig.g:1689:1: ( rule__ConfigModel__Group__0__Impl rule__ConfigModel__Group__1 )
+            // InternalConfig.g:1690:2: rule__ConfigModel__Group__0__Impl rule__ConfigModel__Group__1
             {
-            pushFollow(FOLLOW_rule__ConfigModel__Group__0__Impl_in_rule__ConfigModel__Group__03584);
+            pushFollow(FOLLOW_3);
             rule__ConfigModel__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ConfigModel__Group__1_in_rule__ConfigModel__Group__03587);
+            pushFollow(FOLLOW_2);
             rule__ConfigModel__Group__1();
 
             state._fsp--;
@@ -5757,22 +5757,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ConfigModel__Group__0__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1698:1: rule__ConfigModel__Group__0__Impl : ( 'ConfigModel' ) ;
+    // InternalConfig.g:1697:1: rule__ConfigModel__Group__0__Impl : ( 'ConfigModel' ) ;
     public final void rule__ConfigModel__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1702:1: ( ( 'ConfigModel' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1703:1: ( 'ConfigModel' )
+            // InternalConfig.g:1701:1: ( ( 'ConfigModel' ) )
+            // InternalConfig.g:1702:1: ( 'ConfigModel' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1703:1: ( 'ConfigModel' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1704:1: 'ConfigModel'
+            // InternalConfig.g:1702:1: ( 'ConfigModel' )
+            // InternalConfig.g:1703:1: 'ConfigModel'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfigModelAccess().getConfigModelKeyword_0()); 
             }
-            match(input,26,FOLLOW_26_in_rule__ConfigModel__Group__0__Impl3615); if (state.failed) return ;
+            match(input,26,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getConfigModelAccess().getConfigModelKeyword_0()); 
             }
@@ -5798,21 +5798,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ConfigModel__Group__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1717:1: rule__ConfigModel__Group__1 : rule__ConfigModel__Group__1__Impl rule__ConfigModel__Group__2 ;
+    // InternalConfig.g:1716:1: rule__ConfigModel__Group__1 : rule__ConfigModel__Group__1__Impl rule__ConfigModel__Group__2 ;
     public final void rule__ConfigModel__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1721:1: ( rule__ConfigModel__Group__1__Impl rule__ConfigModel__Group__2 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1722:2: rule__ConfigModel__Group__1__Impl rule__ConfigModel__Group__2
+            // InternalConfig.g:1720:1: ( rule__ConfigModel__Group__1__Impl rule__ConfigModel__Group__2 )
+            // InternalConfig.g:1721:2: rule__ConfigModel__Group__1__Impl rule__ConfigModel__Group__2
             {
-            pushFollow(FOLLOW_rule__ConfigModel__Group__1__Impl_in_rule__ConfigModel__Group__13646);
+            pushFollow(FOLLOW_4);
             rule__ConfigModel__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ConfigModel__Group__2_in_rule__ConfigModel__Group__13649);
+            pushFollow(FOLLOW_2);
             rule__ConfigModel__Group__2();
 
             state._fsp--;
@@ -5836,25 +5836,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ConfigModel__Group__1__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1729:1: rule__ConfigModel__Group__1__Impl : ( ( rule__ConfigModel__NameAssignment_1 ) ) ;
+    // InternalConfig.g:1728:1: rule__ConfigModel__Group__1__Impl : ( ( rule__ConfigModel__NameAssignment_1 ) ) ;
     public final void rule__ConfigModel__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1733:1: ( ( ( rule__ConfigModel__NameAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1734:1: ( ( rule__ConfigModel__NameAssignment_1 ) )
+            // InternalConfig.g:1732:1: ( ( ( rule__ConfigModel__NameAssignment_1 ) ) )
+            // InternalConfig.g:1733:1: ( ( rule__ConfigModel__NameAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1734:1: ( ( rule__ConfigModel__NameAssignment_1 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1735:1: ( rule__ConfigModel__NameAssignment_1 )
+            // InternalConfig.g:1733:1: ( ( rule__ConfigModel__NameAssignment_1 ) )
+            // InternalConfig.g:1734:1: ( rule__ConfigModel__NameAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfigModelAccess().getNameAssignment_1()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1736:1: ( rule__ConfigModel__NameAssignment_1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1736:2: rule__ConfigModel__NameAssignment_1
+            // InternalConfig.g:1735:1: ( rule__ConfigModel__NameAssignment_1 )
+            // InternalConfig.g:1735:2: rule__ConfigModel__NameAssignment_1
             {
-            pushFollow(FOLLOW_rule__ConfigModel__NameAssignment_1_in_rule__ConfigModel__Group__1__Impl3676);
+            pushFollow(FOLLOW_2);
             rule__ConfigModel__NameAssignment_1();
 
             state._fsp--;
@@ -5887,21 +5887,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ConfigModel__Group__2"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1746:1: rule__ConfigModel__Group__2 : rule__ConfigModel__Group__2__Impl rule__ConfigModel__Group__3 ;
+    // InternalConfig.g:1745:1: rule__ConfigModel__Group__2 : rule__ConfigModel__Group__2__Impl rule__ConfigModel__Group__3 ;
     public final void rule__ConfigModel__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1750:1: ( rule__ConfigModel__Group__2__Impl rule__ConfigModel__Group__3 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1751:2: rule__ConfigModel__Group__2__Impl rule__ConfigModel__Group__3
+            // InternalConfig.g:1749:1: ( rule__ConfigModel__Group__2__Impl rule__ConfigModel__Group__3 )
+            // InternalConfig.g:1750:2: rule__ConfigModel__Group__2__Impl rule__ConfigModel__Group__3
             {
-            pushFollow(FOLLOW_rule__ConfigModel__Group__2__Impl_in_rule__ConfigModel__Group__23706);
+            pushFollow(FOLLOW_5);
             rule__ConfigModel__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ConfigModel__Group__3_in_rule__ConfigModel__Group__23709);
+            pushFollow(FOLLOW_2);
             rule__ConfigModel__Group__3();
 
             state._fsp--;
@@ -5925,22 +5925,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ConfigModel__Group__2__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1758:1: rule__ConfigModel__Group__2__Impl : ( '{' ) ;
+    // InternalConfig.g:1757:1: rule__ConfigModel__Group__2__Impl : ( '{' ) ;
     public final void rule__ConfigModel__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1762:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1763:1: ( '{' )
+            // InternalConfig.g:1761:1: ( ( '{' ) )
+            // InternalConfig.g:1762:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1763:1: ( '{' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1764:1: '{'
+            // InternalConfig.g:1762:1: ( '{' )
+            // InternalConfig.g:1763:1: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfigModelAccess().getLeftCurlyBracketKeyword_2()); 
             }
-            match(input,27,FOLLOW_27_in_rule__ConfigModel__Group__2__Impl3737); if (state.failed) return ;
+            match(input,27,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getConfigModelAccess().getLeftCurlyBracketKeyword_2()); 
             }
@@ -5966,21 +5966,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ConfigModel__Group__3"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1777:1: rule__ConfigModel__Group__3 : rule__ConfigModel__Group__3__Impl rule__ConfigModel__Group__4 ;
+    // InternalConfig.g:1776:1: rule__ConfigModel__Group__3 : rule__ConfigModel__Group__3__Impl rule__ConfigModel__Group__4 ;
     public final void rule__ConfigModel__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1781:1: ( rule__ConfigModel__Group__3__Impl rule__ConfigModel__Group__4 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1782:2: rule__ConfigModel__Group__3__Impl rule__ConfigModel__Group__4
+            // InternalConfig.g:1780:1: ( rule__ConfigModel__Group__3__Impl rule__ConfigModel__Group__4 )
+            // InternalConfig.g:1781:2: rule__ConfigModel__Group__3__Impl rule__ConfigModel__Group__4
             {
-            pushFollow(FOLLOW_rule__ConfigModel__Group__3__Impl_in_rule__ConfigModel__Group__33768);
+            pushFollow(FOLLOW_5);
             rule__ConfigModel__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ConfigModel__Group__4_in_rule__ConfigModel__Group__33771);
+            pushFollow(FOLLOW_2);
             rule__ConfigModel__Group__4();
 
             state._fsp--;
@@ -6004,22 +6004,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ConfigModel__Group__3__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1789:1: rule__ConfigModel__Group__3__Impl : ( ( rule__ConfigModel__ImportsAssignment_3 )* ) ;
+    // InternalConfig.g:1788:1: rule__ConfigModel__Group__3__Impl : ( ( rule__ConfigModel__ImportsAssignment_3 )* ) ;
     public final void rule__ConfigModel__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1793:1: ( ( ( rule__ConfigModel__ImportsAssignment_3 )* ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1794:1: ( ( rule__ConfigModel__ImportsAssignment_3 )* )
+            // InternalConfig.g:1792:1: ( ( ( rule__ConfigModel__ImportsAssignment_3 )* ) )
+            // InternalConfig.g:1793:1: ( ( rule__ConfigModel__ImportsAssignment_3 )* )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1794:1: ( ( rule__ConfigModel__ImportsAssignment_3 )* )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1795:1: ( rule__ConfigModel__ImportsAssignment_3 )*
+            // InternalConfig.g:1793:1: ( ( rule__ConfigModel__ImportsAssignment_3 )* )
+            // InternalConfig.g:1794:1: ( rule__ConfigModel__ImportsAssignment_3 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfigModelAccess().getImportsAssignment_3()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1796:1: ( rule__ConfigModel__ImportsAssignment_3 )*
+            // InternalConfig.g:1795:1: ( rule__ConfigModel__ImportsAssignment_3 )*
             loop22:
             do {
                 int alt22=2;
@@ -6032,9 +6032,9 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
                 switch (alt22) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1796:2: rule__ConfigModel__ImportsAssignment_3
+            	    // InternalConfig.g:1795:2: rule__ConfigModel__ImportsAssignment_3
             	    {
-            	    pushFollow(FOLLOW_rule__ConfigModel__ImportsAssignment_3_in_rule__ConfigModel__Group__3__Impl3798);
+            	    pushFollow(FOLLOW_6);
             	    rule__ConfigModel__ImportsAssignment_3();
 
             	    state._fsp--;
@@ -6073,21 +6073,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ConfigModel__Group__4"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1806:1: rule__ConfigModel__Group__4 : rule__ConfigModel__Group__4__Impl rule__ConfigModel__Group__5 ;
+    // InternalConfig.g:1805:1: rule__ConfigModel__Group__4 : rule__ConfigModel__Group__4__Impl rule__ConfigModel__Group__5 ;
     public final void rule__ConfigModel__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1810:1: ( rule__ConfigModel__Group__4__Impl rule__ConfigModel__Group__5 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1811:2: rule__ConfigModel__Group__4__Impl rule__ConfigModel__Group__5
+            // InternalConfig.g:1809:1: ( rule__ConfigModel__Group__4__Impl rule__ConfigModel__Group__5 )
+            // InternalConfig.g:1810:2: rule__ConfigModel__Group__4__Impl rule__ConfigModel__Group__5
             {
-            pushFollow(FOLLOW_rule__ConfigModel__Group__4__Impl_in_rule__ConfigModel__Group__43829);
+            pushFollow(FOLLOW_5);
             rule__ConfigModel__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ConfigModel__Group__5_in_rule__ConfigModel__Group__43832);
+            pushFollow(FOLLOW_2);
             rule__ConfigModel__Group__5();
 
             state._fsp--;
@@ -6111,22 +6111,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ConfigModel__Group__4__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1818:1: rule__ConfigModel__Group__4__Impl : ( ( rule__ConfigModel__ConfigElementsAssignment_4 )* ) ;
+    // InternalConfig.g:1817:1: rule__ConfigModel__Group__4__Impl : ( ( rule__ConfigModel__ConfigElementsAssignment_4 )* ) ;
     public final void rule__ConfigModel__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1822:1: ( ( ( rule__ConfigModel__ConfigElementsAssignment_4 )* ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1823:1: ( ( rule__ConfigModel__ConfigElementsAssignment_4 )* )
+            // InternalConfig.g:1821:1: ( ( ( rule__ConfigModel__ConfigElementsAssignment_4 )* ) )
+            // InternalConfig.g:1822:1: ( ( rule__ConfigModel__ConfigElementsAssignment_4 )* )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1823:1: ( ( rule__ConfigModel__ConfigElementsAssignment_4 )* )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1824:1: ( rule__ConfigModel__ConfigElementsAssignment_4 )*
+            // InternalConfig.g:1822:1: ( ( rule__ConfigModel__ConfigElementsAssignment_4 )* )
+            // InternalConfig.g:1823:1: ( rule__ConfigModel__ConfigElementsAssignment_4 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfigModelAccess().getConfigElementsAssignment_4()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1825:1: ( rule__ConfigModel__ConfigElementsAssignment_4 )*
+            // InternalConfig.g:1824:1: ( rule__ConfigModel__ConfigElementsAssignment_4 )*
             loop23:
             do {
                 int alt23=2;
@@ -6139,9 +6139,9 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
                 switch (alt23) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1825:2: rule__ConfigModel__ConfigElementsAssignment_4
+            	    // InternalConfig.g:1824:2: rule__ConfigModel__ConfigElementsAssignment_4
             	    {
-            	    pushFollow(FOLLOW_rule__ConfigModel__ConfigElementsAssignment_4_in_rule__ConfigModel__Group__4__Impl3859);
+            	    pushFollow(FOLLOW_7);
             	    rule__ConfigModel__ConfigElementsAssignment_4();
 
             	    state._fsp--;
@@ -6180,16 +6180,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ConfigModel__Group__5"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1835:1: rule__ConfigModel__Group__5 : rule__ConfigModel__Group__5__Impl ;
+    // InternalConfig.g:1834:1: rule__ConfigModel__Group__5 : rule__ConfigModel__Group__5__Impl ;
     public final void rule__ConfigModel__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1839:1: ( rule__ConfigModel__Group__5__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1840:2: rule__ConfigModel__Group__5__Impl
+            // InternalConfig.g:1838:1: ( rule__ConfigModel__Group__5__Impl )
+            // InternalConfig.g:1839:2: rule__ConfigModel__Group__5__Impl
             {
-            pushFollow(FOLLOW_rule__ConfigModel__Group__5__Impl_in_rule__ConfigModel__Group__53890);
+            pushFollow(FOLLOW_2);
             rule__ConfigModel__Group__5__Impl();
 
             state._fsp--;
@@ -6213,22 +6213,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ConfigModel__Group__5__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1846:1: rule__ConfigModel__Group__5__Impl : ( '}' ) ;
+    // InternalConfig.g:1845:1: rule__ConfigModel__Group__5__Impl : ( '}' ) ;
     public final void rule__ConfigModel__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1850:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1851:1: ( '}' )
+            // InternalConfig.g:1849:1: ( ( '}' ) )
+            // InternalConfig.g:1850:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1851:1: ( '}' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1852:1: '}'
+            // InternalConfig.g:1850:1: ( '}' )
+            // InternalConfig.g:1851:1: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfigModelAccess().getRightCurlyBracketKeyword_5()); 
             }
-            match(input,28,FOLLOW_28_in_rule__ConfigModel__Group__5__Impl3918); if (state.failed) return ;
+            match(input,28,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getConfigModelAccess().getRightCurlyBracketKeyword_5()); 
             }
@@ -6254,21 +6254,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemConfig__Group__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1877:1: rule__SubSystemConfig__Group__0 : rule__SubSystemConfig__Group__0__Impl rule__SubSystemConfig__Group__1 ;
+    // InternalConfig.g:1876:1: rule__SubSystemConfig__Group__0 : rule__SubSystemConfig__Group__0__Impl rule__SubSystemConfig__Group__1 ;
     public final void rule__SubSystemConfig__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1881:1: ( rule__SubSystemConfig__Group__0__Impl rule__SubSystemConfig__Group__1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1882:2: rule__SubSystemConfig__Group__0__Impl rule__SubSystemConfig__Group__1
+            // InternalConfig.g:1880:1: ( rule__SubSystemConfig__Group__0__Impl rule__SubSystemConfig__Group__1 )
+            // InternalConfig.g:1881:2: rule__SubSystemConfig__Group__0__Impl rule__SubSystemConfig__Group__1
             {
-            pushFollow(FOLLOW_rule__SubSystemConfig__Group__0__Impl_in_rule__SubSystemConfig__Group__03961);
+            pushFollow(FOLLOW_3);
             rule__SubSystemConfig__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SubSystemConfig__Group__1_in_rule__SubSystemConfig__Group__03964);
+            pushFollow(FOLLOW_2);
             rule__SubSystemConfig__Group__1();
 
             state._fsp--;
@@ -6292,22 +6292,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemConfig__Group__0__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1889:1: rule__SubSystemConfig__Group__0__Impl : ( 'SubSystemConfig' ) ;
+    // InternalConfig.g:1888:1: rule__SubSystemConfig__Group__0__Impl : ( 'SubSystemConfig' ) ;
     public final void rule__SubSystemConfig__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1893:1: ( ( 'SubSystemConfig' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1894:1: ( 'SubSystemConfig' )
+            // InternalConfig.g:1892:1: ( ( 'SubSystemConfig' ) )
+            // InternalConfig.g:1893:1: ( 'SubSystemConfig' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1894:1: ( 'SubSystemConfig' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1895:1: 'SubSystemConfig'
+            // InternalConfig.g:1893:1: ( 'SubSystemConfig' )
+            // InternalConfig.g:1894:1: 'SubSystemConfig'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSubSystemConfigAccess().getSubSystemConfigKeyword_0()); 
             }
-            match(input,29,FOLLOW_29_in_rule__SubSystemConfig__Group__0__Impl3992); if (state.failed) return ;
+            match(input,29,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSubSystemConfigAccess().getSubSystemConfigKeyword_0()); 
             }
@@ -6333,21 +6333,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemConfig__Group__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1908:1: rule__SubSystemConfig__Group__1 : rule__SubSystemConfig__Group__1__Impl rule__SubSystemConfig__Group__2 ;
+    // InternalConfig.g:1907:1: rule__SubSystemConfig__Group__1 : rule__SubSystemConfig__Group__1__Impl rule__SubSystemConfig__Group__2 ;
     public final void rule__SubSystemConfig__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1912:1: ( rule__SubSystemConfig__Group__1__Impl rule__SubSystemConfig__Group__2 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1913:2: rule__SubSystemConfig__Group__1__Impl rule__SubSystemConfig__Group__2
+            // InternalConfig.g:1911:1: ( rule__SubSystemConfig__Group__1__Impl rule__SubSystemConfig__Group__2 )
+            // InternalConfig.g:1912:2: rule__SubSystemConfig__Group__1__Impl rule__SubSystemConfig__Group__2
             {
-            pushFollow(FOLLOW_rule__SubSystemConfig__Group__1__Impl_in_rule__SubSystemConfig__Group__14023);
+            pushFollow(FOLLOW_8);
             rule__SubSystemConfig__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SubSystemConfig__Group__2_in_rule__SubSystemConfig__Group__14026);
+            pushFollow(FOLLOW_2);
             rule__SubSystemConfig__Group__2();
 
             state._fsp--;
@@ -6371,25 +6371,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemConfig__Group__1__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1920:1: rule__SubSystemConfig__Group__1__Impl : ( ( rule__SubSystemConfig__RootAssignment_1 ) ) ;
+    // InternalConfig.g:1919:1: rule__SubSystemConfig__Group__1__Impl : ( ( rule__SubSystemConfig__RootAssignment_1 ) ) ;
     public final void rule__SubSystemConfig__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1924:1: ( ( ( rule__SubSystemConfig__RootAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1925:1: ( ( rule__SubSystemConfig__RootAssignment_1 ) )
+            // InternalConfig.g:1923:1: ( ( ( rule__SubSystemConfig__RootAssignment_1 ) ) )
+            // InternalConfig.g:1924:1: ( ( rule__SubSystemConfig__RootAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1925:1: ( ( rule__SubSystemConfig__RootAssignment_1 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1926:1: ( rule__SubSystemConfig__RootAssignment_1 )
+            // InternalConfig.g:1924:1: ( ( rule__SubSystemConfig__RootAssignment_1 ) )
+            // InternalConfig.g:1925:1: ( rule__SubSystemConfig__RootAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSubSystemConfigAccess().getRootAssignment_1()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1927:1: ( rule__SubSystemConfig__RootAssignment_1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1927:2: rule__SubSystemConfig__RootAssignment_1
+            // InternalConfig.g:1926:1: ( rule__SubSystemConfig__RootAssignment_1 )
+            // InternalConfig.g:1926:2: rule__SubSystemConfig__RootAssignment_1
             {
-            pushFollow(FOLLOW_rule__SubSystemConfig__RootAssignment_1_in_rule__SubSystemConfig__Group__1__Impl4053);
+            pushFollow(FOLLOW_2);
             rule__SubSystemConfig__RootAssignment_1();
 
             state._fsp--;
@@ -6422,21 +6422,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemConfig__Group__2"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1937:1: rule__SubSystemConfig__Group__2 : rule__SubSystemConfig__Group__2__Impl rule__SubSystemConfig__Group__3 ;
+    // InternalConfig.g:1936:1: rule__SubSystemConfig__Group__2 : rule__SubSystemConfig__Group__2__Impl rule__SubSystemConfig__Group__3 ;
     public final void rule__SubSystemConfig__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1941:1: ( rule__SubSystemConfig__Group__2__Impl rule__SubSystemConfig__Group__3 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1942:2: rule__SubSystemConfig__Group__2__Impl rule__SubSystemConfig__Group__3
+            // InternalConfig.g:1940:1: ( rule__SubSystemConfig__Group__2__Impl rule__SubSystemConfig__Group__3 )
+            // InternalConfig.g:1941:2: rule__SubSystemConfig__Group__2__Impl rule__SubSystemConfig__Group__3
             {
-            pushFollow(FOLLOW_rule__SubSystemConfig__Group__2__Impl_in_rule__SubSystemConfig__Group__24083);
+            pushFollow(FOLLOW_3);
             rule__SubSystemConfig__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SubSystemConfig__Group__3_in_rule__SubSystemConfig__Group__24086);
+            pushFollow(FOLLOW_2);
             rule__SubSystemConfig__Group__3();
 
             state._fsp--;
@@ -6460,22 +6460,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemConfig__Group__2__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1949:1: rule__SubSystemConfig__Group__2__Impl : ( '/' ) ;
+    // InternalConfig.g:1948:1: rule__SubSystemConfig__Group__2__Impl : ( '/' ) ;
     public final void rule__SubSystemConfig__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1953:1: ( ( '/' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1954:1: ( '/' )
+            // InternalConfig.g:1952:1: ( ( '/' ) )
+            // InternalConfig.g:1953:1: ( '/' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1954:1: ( '/' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1955:1: '/'
+            // InternalConfig.g:1953:1: ( '/' )
+            // InternalConfig.g:1954:1: '/'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSubSystemConfigAccess().getSolidusKeyword_2()); 
             }
-            match(input,30,FOLLOW_30_in_rule__SubSystemConfig__Group__2__Impl4114); if (state.failed) return ;
+            match(input,30,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSubSystemConfigAccess().getSolidusKeyword_2()); 
             }
@@ -6501,21 +6501,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemConfig__Group__3"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1968:1: rule__SubSystemConfig__Group__3 : rule__SubSystemConfig__Group__3__Impl rule__SubSystemConfig__Group__4 ;
+    // InternalConfig.g:1967:1: rule__SubSystemConfig__Group__3 : rule__SubSystemConfig__Group__3__Impl rule__SubSystemConfig__Group__4 ;
     public final void rule__SubSystemConfig__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1972:1: ( rule__SubSystemConfig__Group__3__Impl rule__SubSystemConfig__Group__4 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1973:2: rule__SubSystemConfig__Group__3__Impl rule__SubSystemConfig__Group__4
+            // InternalConfig.g:1971:1: ( rule__SubSystemConfig__Group__3__Impl rule__SubSystemConfig__Group__4 )
+            // InternalConfig.g:1972:2: rule__SubSystemConfig__Group__3__Impl rule__SubSystemConfig__Group__4
             {
-            pushFollow(FOLLOW_rule__SubSystemConfig__Group__3__Impl_in_rule__SubSystemConfig__Group__34145);
+            pushFollow(FOLLOW_4);
             rule__SubSystemConfig__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SubSystemConfig__Group__4_in_rule__SubSystemConfig__Group__34148);
+            pushFollow(FOLLOW_2);
             rule__SubSystemConfig__Group__4();
 
             state._fsp--;
@@ -6539,25 +6539,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemConfig__Group__3__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1980:1: rule__SubSystemConfig__Group__3__Impl : ( ( rule__SubSystemConfig__SubSystemAssignment_3 ) ) ;
+    // InternalConfig.g:1979:1: rule__SubSystemConfig__Group__3__Impl : ( ( rule__SubSystemConfig__SubSystemAssignment_3 ) ) ;
     public final void rule__SubSystemConfig__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1984:1: ( ( ( rule__SubSystemConfig__SubSystemAssignment_3 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1985:1: ( ( rule__SubSystemConfig__SubSystemAssignment_3 ) )
+            // InternalConfig.g:1983:1: ( ( ( rule__SubSystemConfig__SubSystemAssignment_3 ) ) )
+            // InternalConfig.g:1984:1: ( ( rule__SubSystemConfig__SubSystemAssignment_3 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1985:1: ( ( rule__SubSystemConfig__SubSystemAssignment_3 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1986:1: ( rule__SubSystemConfig__SubSystemAssignment_3 )
+            // InternalConfig.g:1984:1: ( ( rule__SubSystemConfig__SubSystemAssignment_3 ) )
+            // InternalConfig.g:1985:1: ( rule__SubSystemConfig__SubSystemAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSubSystemConfigAccess().getSubSystemAssignment_3()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1987:1: ( rule__SubSystemConfig__SubSystemAssignment_3 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1987:2: rule__SubSystemConfig__SubSystemAssignment_3
+            // InternalConfig.g:1986:1: ( rule__SubSystemConfig__SubSystemAssignment_3 )
+            // InternalConfig.g:1986:2: rule__SubSystemConfig__SubSystemAssignment_3
             {
-            pushFollow(FOLLOW_rule__SubSystemConfig__SubSystemAssignment_3_in_rule__SubSystemConfig__Group__3__Impl4175);
+            pushFollow(FOLLOW_2);
             rule__SubSystemConfig__SubSystemAssignment_3();
 
             state._fsp--;
@@ -6590,21 +6590,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemConfig__Group__4"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:1997:1: rule__SubSystemConfig__Group__4 : rule__SubSystemConfig__Group__4__Impl rule__SubSystemConfig__Group__5 ;
+    // InternalConfig.g:1996:1: rule__SubSystemConfig__Group__4 : rule__SubSystemConfig__Group__4__Impl rule__SubSystemConfig__Group__5 ;
     public final void rule__SubSystemConfig__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2001:1: ( rule__SubSystemConfig__Group__4__Impl rule__SubSystemConfig__Group__5 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2002:2: rule__SubSystemConfig__Group__4__Impl rule__SubSystemConfig__Group__5
+            // InternalConfig.g:2000:1: ( rule__SubSystemConfig__Group__4__Impl rule__SubSystemConfig__Group__5 )
+            // InternalConfig.g:2001:2: rule__SubSystemConfig__Group__4__Impl rule__SubSystemConfig__Group__5
             {
-            pushFollow(FOLLOW_rule__SubSystemConfig__Group__4__Impl_in_rule__SubSystemConfig__Group__44205);
+            pushFollow(FOLLOW_9);
             rule__SubSystemConfig__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SubSystemConfig__Group__5_in_rule__SubSystemConfig__Group__44208);
+            pushFollow(FOLLOW_2);
             rule__SubSystemConfig__Group__5();
 
             state._fsp--;
@@ -6628,22 +6628,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemConfig__Group__4__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2009:1: rule__SubSystemConfig__Group__4__Impl : ( '{' ) ;
+    // InternalConfig.g:2008:1: rule__SubSystemConfig__Group__4__Impl : ( '{' ) ;
     public final void rule__SubSystemConfig__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2013:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2014:1: ( '{' )
+            // InternalConfig.g:2012:1: ( ( '{' ) )
+            // InternalConfig.g:2013:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2014:1: ( '{' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2015:1: '{'
+            // InternalConfig.g:2013:1: ( '{' )
+            // InternalConfig.g:2014:1: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSubSystemConfigAccess().getLeftCurlyBracketKeyword_4()); 
             }
-            match(input,27,FOLLOW_27_in_rule__SubSystemConfig__Group__4__Impl4236); if (state.failed) return ;
+            match(input,27,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSubSystemConfigAccess().getLeftCurlyBracketKeyword_4()); 
             }
@@ -6669,21 +6669,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemConfig__Group__5"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2028:1: rule__SubSystemConfig__Group__5 : rule__SubSystemConfig__Group__5__Impl rule__SubSystemConfig__Group__6 ;
+    // InternalConfig.g:2027:1: rule__SubSystemConfig__Group__5 : rule__SubSystemConfig__Group__5__Impl rule__SubSystemConfig__Group__6 ;
     public final void rule__SubSystemConfig__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2032:1: ( rule__SubSystemConfig__Group__5__Impl rule__SubSystemConfig__Group__6 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2033:2: rule__SubSystemConfig__Group__5__Impl rule__SubSystemConfig__Group__6
+            // InternalConfig.g:2031:1: ( rule__SubSystemConfig__Group__5__Impl rule__SubSystemConfig__Group__6 )
+            // InternalConfig.g:2032:2: rule__SubSystemConfig__Group__5__Impl rule__SubSystemConfig__Group__6
             {
-            pushFollow(FOLLOW_rule__SubSystemConfig__Group__5__Impl_in_rule__SubSystemConfig__Group__54267);
+            pushFollow(FOLLOW_10);
             rule__SubSystemConfig__Group__5__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SubSystemConfig__Group__6_in_rule__SubSystemConfig__Group__54270);
+            pushFollow(FOLLOW_2);
             rule__SubSystemConfig__Group__6();
 
             state._fsp--;
@@ -6707,25 +6707,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemConfig__Group__5__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2040:1: rule__SubSystemConfig__Group__5__Impl : ( ( rule__SubSystemConfig__DynConfigAssignment_5 ) ) ;
+    // InternalConfig.g:2039:1: rule__SubSystemConfig__Group__5__Impl : ( ( rule__SubSystemConfig__DynConfigAssignment_5 ) ) ;
     public final void rule__SubSystemConfig__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2044:1: ( ( ( rule__SubSystemConfig__DynConfigAssignment_5 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2045:1: ( ( rule__SubSystemConfig__DynConfigAssignment_5 ) )
+            // InternalConfig.g:2043:1: ( ( ( rule__SubSystemConfig__DynConfigAssignment_5 ) ) )
+            // InternalConfig.g:2044:1: ( ( rule__SubSystemConfig__DynConfigAssignment_5 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2045:1: ( ( rule__SubSystemConfig__DynConfigAssignment_5 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2046:1: ( rule__SubSystemConfig__DynConfigAssignment_5 )
+            // InternalConfig.g:2044:1: ( ( rule__SubSystemConfig__DynConfigAssignment_5 ) )
+            // InternalConfig.g:2045:1: ( rule__SubSystemConfig__DynConfigAssignment_5 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSubSystemConfigAccess().getDynConfigAssignment_5()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2047:1: ( rule__SubSystemConfig__DynConfigAssignment_5 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2047:2: rule__SubSystemConfig__DynConfigAssignment_5
+            // InternalConfig.g:2046:1: ( rule__SubSystemConfig__DynConfigAssignment_5 )
+            // InternalConfig.g:2046:2: rule__SubSystemConfig__DynConfigAssignment_5
             {
-            pushFollow(FOLLOW_rule__SubSystemConfig__DynConfigAssignment_5_in_rule__SubSystemConfig__Group__5__Impl4297);
+            pushFollow(FOLLOW_2);
             rule__SubSystemConfig__DynConfigAssignment_5();
 
             state._fsp--;
@@ -6758,16 +6758,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemConfig__Group__6"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2057:1: rule__SubSystemConfig__Group__6 : rule__SubSystemConfig__Group__6__Impl ;
+    // InternalConfig.g:2056:1: rule__SubSystemConfig__Group__6 : rule__SubSystemConfig__Group__6__Impl ;
     public final void rule__SubSystemConfig__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2061:1: ( rule__SubSystemConfig__Group__6__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2062:2: rule__SubSystemConfig__Group__6__Impl
+            // InternalConfig.g:2060:1: ( rule__SubSystemConfig__Group__6__Impl )
+            // InternalConfig.g:2061:2: rule__SubSystemConfig__Group__6__Impl
             {
-            pushFollow(FOLLOW_rule__SubSystemConfig__Group__6__Impl_in_rule__SubSystemConfig__Group__64327);
+            pushFollow(FOLLOW_2);
             rule__SubSystemConfig__Group__6__Impl();
 
             state._fsp--;
@@ -6791,22 +6791,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemConfig__Group__6__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2068:1: rule__SubSystemConfig__Group__6__Impl : ( '}' ) ;
+    // InternalConfig.g:2067:1: rule__SubSystemConfig__Group__6__Impl : ( '}' ) ;
     public final void rule__SubSystemConfig__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2072:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2073:1: ( '}' )
+            // InternalConfig.g:2071:1: ( ( '}' ) )
+            // InternalConfig.g:2072:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2073:1: ( '}' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2074:1: '}'
+            // InternalConfig.g:2072:1: ( '}' )
+            // InternalConfig.g:2073:1: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSubSystemConfigAccess().getRightCurlyBracketKeyword_6()); 
             }
-            match(input,28,FOLLOW_28_in_rule__SubSystemConfig__Group__6__Impl4355); if (state.failed) return ;
+            match(input,28,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSubSystemConfigAccess().getRightCurlyBracketKeyword_6()); 
             }
@@ -6832,21 +6832,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DynamicConfig__Group__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2101:1: rule__DynamicConfig__Group__0 : rule__DynamicConfig__Group__0__Impl rule__DynamicConfig__Group__1 ;
+    // InternalConfig.g:2100:1: rule__DynamicConfig__Group__0 : rule__DynamicConfig__Group__0__Impl rule__DynamicConfig__Group__1 ;
     public final void rule__DynamicConfig__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2105:1: ( rule__DynamicConfig__Group__0__Impl rule__DynamicConfig__Group__1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2106:2: rule__DynamicConfig__Group__0__Impl rule__DynamicConfig__Group__1
+            // InternalConfig.g:2104:1: ( rule__DynamicConfig__Group__0__Impl rule__DynamicConfig__Group__1 )
+            // InternalConfig.g:2105:2: rule__DynamicConfig__Group__0__Impl rule__DynamicConfig__Group__1
             {
-            pushFollow(FOLLOW_rule__DynamicConfig__Group__0__Impl_in_rule__DynamicConfig__Group__04400);
+            pushFollow(FOLLOW_4);
             rule__DynamicConfig__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__DynamicConfig__Group__1_in_rule__DynamicConfig__Group__04403);
+            pushFollow(FOLLOW_2);
             rule__DynamicConfig__Group__1();
 
             state._fsp--;
@@ -6870,22 +6870,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DynamicConfig__Group__0__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2113:1: rule__DynamicConfig__Group__0__Impl : ( 'dynamic configuration' ) ;
+    // InternalConfig.g:2112:1: rule__DynamicConfig__Group__0__Impl : ( 'dynamic configuration' ) ;
     public final void rule__DynamicConfig__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2117:1: ( ( 'dynamic configuration' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2118:1: ( 'dynamic configuration' )
+            // InternalConfig.g:2116:1: ( ( 'dynamic configuration' ) )
+            // InternalConfig.g:2117:1: ( 'dynamic configuration' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2118:1: ( 'dynamic configuration' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2119:1: 'dynamic configuration'
+            // InternalConfig.g:2117:1: ( 'dynamic configuration' )
+            // InternalConfig.g:2118:1: 'dynamic configuration'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDynamicConfigAccess().getDynamicConfigurationKeyword_0()); 
             }
-            match(input,31,FOLLOW_31_in_rule__DynamicConfig__Group__0__Impl4431); if (state.failed) return ;
+            match(input,31,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getDynamicConfigAccess().getDynamicConfigurationKeyword_0()); 
             }
@@ -6911,21 +6911,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DynamicConfig__Group__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2132:1: rule__DynamicConfig__Group__1 : rule__DynamicConfig__Group__1__Impl rule__DynamicConfig__Group__2 ;
+    // InternalConfig.g:2131:1: rule__DynamicConfig__Group__1 : rule__DynamicConfig__Group__1__Impl rule__DynamicConfig__Group__2 ;
     public final void rule__DynamicConfig__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2136:1: ( rule__DynamicConfig__Group__1__Impl rule__DynamicConfig__Group__2 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2137:2: rule__DynamicConfig__Group__1__Impl rule__DynamicConfig__Group__2
+            // InternalConfig.g:2135:1: ( rule__DynamicConfig__Group__1__Impl rule__DynamicConfig__Group__2 )
+            // InternalConfig.g:2136:2: rule__DynamicConfig__Group__1__Impl rule__DynamicConfig__Group__2
             {
-            pushFollow(FOLLOW_rule__DynamicConfig__Group__1__Impl_in_rule__DynamicConfig__Group__14462);
+            pushFollow(FOLLOW_11);
             rule__DynamicConfig__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__DynamicConfig__Group__2_in_rule__DynamicConfig__Group__14465);
+            pushFollow(FOLLOW_2);
             rule__DynamicConfig__Group__2();
 
             state._fsp--;
@@ -6949,22 +6949,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DynamicConfig__Group__1__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2144:1: rule__DynamicConfig__Group__1__Impl : ( '{' ) ;
+    // InternalConfig.g:2143:1: rule__DynamicConfig__Group__1__Impl : ( '{' ) ;
     public final void rule__DynamicConfig__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2148:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2149:1: ( '{' )
+            // InternalConfig.g:2147:1: ( ( '{' ) )
+            // InternalConfig.g:2148:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2149:1: ( '{' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2150:1: '{'
+            // InternalConfig.g:2148:1: ( '{' )
+            // InternalConfig.g:2149:1: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDynamicConfigAccess().getLeftCurlyBracketKeyword_1()); 
             }
-            match(input,27,FOLLOW_27_in_rule__DynamicConfig__Group__1__Impl4493); if (state.failed) return ;
+            match(input,27,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getDynamicConfigAccess().getLeftCurlyBracketKeyword_1()); 
             }
@@ -6990,21 +6990,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DynamicConfig__Group__2"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2163:1: rule__DynamicConfig__Group__2 : rule__DynamicConfig__Group__2__Impl rule__DynamicConfig__Group__3 ;
+    // InternalConfig.g:2162:1: rule__DynamicConfig__Group__2 : rule__DynamicConfig__Group__2__Impl rule__DynamicConfig__Group__3 ;
     public final void rule__DynamicConfig__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2167:1: ( rule__DynamicConfig__Group__2__Impl rule__DynamicConfig__Group__3 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2168:2: rule__DynamicConfig__Group__2__Impl rule__DynamicConfig__Group__3
+            // InternalConfig.g:2166:1: ( rule__DynamicConfig__Group__2__Impl rule__DynamicConfig__Group__3 )
+            // InternalConfig.g:2167:2: rule__DynamicConfig__Group__2__Impl rule__DynamicConfig__Group__3
             {
-            pushFollow(FOLLOW_rule__DynamicConfig__Group__2__Impl_in_rule__DynamicConfig__Group__24524);
+            pushFollow(FOLLOW_10);
             rule__DynamicConfig__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__DynamicConfig__Group__3_in_rule__DynamicConfig__Group__24527);
+            pushFollow(FOLLOW_2);
             rule__DynamicConfig__Group__3();
 
             state._fsp--;
@@ -7028,25 +7028,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DynamicConfig__Group__2__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2175:1: rule__DynamicConfig__Group__2__Impl : ( ( rule__DynamicConfig__UnorderedGroup_2 ) ) ;
+    // InternalConfig.g:2174:1: rule__DynamicConfig__Group__2__Impl : ( ( rule__DynamicConfig__UnorderedGroup_2 ) ) ;
     public final void rule__DynamicConfig__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2179:1: ( ( ( rule__DynamicConfig__UnorderedGroup_2 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2180:1: ( ( rule__DynamicConfig__UnorderedGroup_2 ) )
+            // InternalConfig.g:2178:1: ( ( ( rule__DynamicConfig__UnorderedGroup_2 ) ) )
+            // InternalConfig.g:2179:1: ( ( rule__DynamicConfig__UnorderedGroup_2 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2180:1: ( ( rule__DynamicConfig__UnorderedGroup_2 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2181:1: ( rule__DynamicConfig__UnorderedGroup_2 )
+            // InternalConfig.g:2179:1: ( ( rule__DynamicConfig__UnorderedGroup_2 ) )
+            // InternalConfig.g:2180:1: ( rule__DynamicConfig__UnorderedGroup_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDynamicConfigAccess().getUnorderedGroup_2()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2182:1: ( rule__DynamicConfig__UnorderedGroup_2 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2182:2: rule__DynamicConfig__UnorderedGroup_2
+            // InternalConfig.g:2181:1: ( rule__DynamicConfig__UnorderedGroup_2 )
+            // InternalConfig.g:2181:2: rule__DynamicConfig__UnorderedGroup_2
             {
-            pushFollow(FOLLOW_rule__DynamicConfig__UnorderedGroup_2_in_rule__DynamicConfig__Group__2__Impl4554);
+            pushFollow(FOLLOW_2);
             rule__DynamicConfig__UnorderedGroup_2();
 
             state._fsp--;
@@ -7079,16 +7079,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DynamicConfig__Group__3"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2192:1: rule__DynamicConfig__Group__3 : rule__DynamicConfig__Group__3__Impl ;
+    // InternalConfig.g:2191:1: rule__DynamicConfig__Group__3 : rule__DynamicConfig__Group__3__Impl ;
     public final void rule__DynamicConfig__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2196:1: ( rule__DynamicConfig__Group__3__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2197:2: rule__DynamicConfig__Group__3__Impl
+            // InternalConfig.g:2195:1: ( rule__DynamicConfig__Group__3__Impl )
+            // InternalConfig.g:2196:2: rule__DynamicConfig__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__DynamicConfig__Group__3__Impl_in_rule__DynamicConfig__Group__34584);
+            pushFollow(FOLLOW_2);
             rule__DynamicConfig__Group__3__Impl();
 
             state._fsp--;
@@ -7112,22 +7112,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DynamicConfig__Group__3__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2203:1: rule__DynamicConfig__Group__3__Impl : ( '}' ) ;
+    // InternalConfig.g:2202:1: rule__DynamicConfig__Group__3__Impl : ( '}' ) ;
     public final void rule__DynamicConfig__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2207:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2208:1: ( '}' )
+            // InternalConfig.g:2206:1: ( ( '}' ) )
+            // InternalConfig.g:2207:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2208:1: ( '}' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2209:1: '}'
+            // InternalConfig.g:2207:1: ( '}' )
+            // InternalConfig.g:2208:1: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDynamicConfigAccess().getRightCurlyBracketKeyword_3()); 
             }
-            match(input,28,FOLLOW_28_in_rule__DynamicConfig__Group__3__Impl4612); if (state.failed) return ;
+            match(input,28,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getDynamicConfigAccess().getRightCurlyBracketKeyword_3()); 
             }
@@ -7153,21 +7153,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DynamicConfig__Group_2_0_0__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2230:1: rule__DynamicConfig__Group_2_0_0__0 : rule__DynamicConfig__Group_2_0_0__0__Impl rule__DynamicConfig__Group_2_0_0__1 ;
+    // InternalConfig.g:2229:1: rule__DynamicConfig__Group_2_0_0__0 : rule__DynamicConfig__Group_2_0_0__0__Impl rule__DynamicConfig__Group_2_0_0__1 ;
     public final void rule__DynamicConfig__Group_2_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2234:1: ( rule__DynamicConfig__Group_2_0_0__0__Impl rule__DynamicConfig__Group_2_0_0__1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2235:2: rule__DynamicConfig__Group_2_0_0__0__Impl rule__DynamicConfig__Group_2_0_0__1
+            // InternalConfig.g:2233:1: ( rule__DynamicConfig__Group_2_0_0__0__Impl rule__DynamicConfig__Group_2_0_0__1 )
+            // InternalConfig.g:2234:2: rule__DynamicConfig__Group_2_0_0__0__Impl rule__DynamicConfig__Group_2_0_0__1
             {
-            pushFollow(FOLLOW_rule__DynamicConfig__Group_2_0_0__0__Impl_in_rule__DynamicConfig__Group_2_0_0__04651);
+            pushFollow(FOLLOW_12);
             rule__DynamicConfig__Group_2_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__DynamicConfig__Group_2_0_0__1_in_rule__DynamicConfig__Group_2_0_0__04654);
+            pushFollow(FOLLOW_2);
             rule__DynamicConfig__Group_2_0_0__1();
 
             state._fsp--;
@@ -7191,22 +7191,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DynamicConfig__Group_2_0_0__0__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2242:1: rule__DynamicConfig__Group_2_0_0__0__Impl : ( 'file path' ) ;
+    // InternalConfig.g:2241:1: rule__DynamicConfig__Group_2_0_0__0__Impl : ( 'file path' ) ;
     public final void rule__DynamicConfig__Group_2_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2246:1: ( ( 'file path' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2247:1: ( 'file path' )
+            // InternalConfig.g:2245:1: ( ( 'file path' ) )
+            // InternalConfig.g:2246:1: ( 'file path' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2247:1: ( 'file path' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2248:1: 'file path'
+            // InternalConfig.g:2246:1: ( 'file path' )
+            // InternalConfig.g:2247:1: 'file path'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDynamicConfigAccess().getFilePathKeyword_2_0_0_0()); 
             }
-            match(input,32,FOLLOW_32_in_rule__DynamicConfig__Group_2_0_0__0__Impl4682); if (state.failed) return ;
+            match(input,32,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getDynamicConfigAccess().getFilePathKeyword_2_0_0_0()); 
             }
@@ -7232,16 +7232,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DynamicConfig__Group_2_0_0__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2261:1: rule__DynamicConfig__Group_2_0_0__1 : rule__DynamicConfig__Group_2_0_0__1__Impl ;
+    // InternalConfig.g:2260:1: rule__DynamicConfig__Group_2_0_0__1 : rule__DynamicConfig__Group_2_0_0__1__Impl ;
     public final void rule__DynamicConfig__Group_2_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2265:1: ( rule__DynamicConfig__Group_2_0_0__1__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2266:2: rule__DynamicConfig__Group_2_0_0__1__Impl
+            // InternalConfig.g:2264:1: ( rule__DynamicConfig__Group_2_0_0__1__Impl )
+            // InternalConfig.g:2265:2: rule__DynamicConfig__Group_2_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__DynamicConfig__Group_2_0_0__1__Impl_in_rule__DynamicConfig__Group_2_0_0__14713);
+            pushFollow(FOLLOW_2);
             rule__DynamicConfig__Group_2_0_0__1__Impl();
 
             state._fsp--;
@@ -7265,25 +7265,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DynamicConfig__Group_2_0_0__1__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2272:1: rule__DynamicConfig__Group_2_0_0__1__Impl : ( ( rule__DynamicConfig__FilePathAssignment_2_0_0_1 ) ) ;
+    // InternalConfig.g:2271:1: rule__DynamicConfig__Group_2_0_0__1__Impl : ( ( rule__DynamicConfig__FilePathAssignment_2_0_0_1 ) ) ;
     public final void rule__DynamicConfig__Group_2_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2276:1: ( ( ( rule__DynamicConfig__FilePathAssignment_2_0_0_1 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2277:1: ( ( rule__DynamicConfig__FilePathAssignment_2_0_0_1 ) )
+            // InternalConfig.g:2275:1: ( ( ( rule__DynamicConfig__FilePathAssignment_2_0_0_1 ) ) )
+            // InternalConfig.g:2276:1: ( ( rule__DynamicConfig__FilePathAssignment_2_0_0_1 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2277:1: ( ( rule__DynamicConfig__FilePathAssignment_2_0_0_1 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2278:1: ( rule__DynamicConfig__FilePathAssignment_2_0_0_1 )
+            // InternalConfig.g:2276:1: ( ( rule__DynamicConfig__FilePathAssignment_2_0_0_1 ) )
+            // InternalConfig.g:2277:1: ( rule__DynamicConfig__FilePathAssignment_2_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDynamicConfigAccess().getFilePathAssignment_2_0_0_1()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2279:1: ( rule__DynamicConfig__FilePathAssignment_2_0_0_1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2279:2: rule__DynamicConfig__FilePathAssignment_2_0_0_1
+            // InternalConfig.g:2278:1: ( rule__DynamicConfig__FilePathAssignment_2_0_0_1 )
+            // InternalConfig.g:2278:2: rule__DynamicConfig__FilePathAssignment_2_0_0_1
             {
-            pushFollow(FOLLOW_rule__DynamicConfig__FilePathAssignment_2_0_0_1_in_rule__DynamicConfig__Group_2_0_0__1__Impl4740);
+            pushFollow(FOLLOW_2);
             rule__DynamicConfig__FilePathAssignment_2_0_0_1();
 
             state._fsp--;
@@ -7316,21 +7316,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DynamicConfig__Group_2_0_1__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2293:1: rule__DynamicConfig__Group_2_0_1__0 : rule__DynamicConfig__Group_2_0_1__0__Impl rule__DynamicConfig__Group_2_0_1__1 ;
+    // InternalConfig.g:2292:1: rule__DynamicConfig__Group_2_0_1__0 : rule__DynamicConfig__Group_2_0_1__0__Impl rule__DynamicConfig__Group_2_0_1__1 ;
     public final void rule__DynamicConfig__Group_2_0_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2297:1: ( rule__DynamicConfig__Group_2_0_1__0__Impl rule__DynamicConfig__Group_2_0_1__1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2298:2: rule__DynamicConfig__Group_2_0_1__0__Impl rule__DynamicConfig__Group_2_0_1__1
+            // InternalConfig.g:2296:1: ( rule__DynamicConfig__Group_2_0_1__0__Impl rule__DynamicConfig__Group_2_0_1__1 )
+            // InternalConfig.g:2297:2: rule__DynamicConfig__Group_2_0_1__0__Impl rule__DynamicConfig__Group_2_0_1__1
             {
-            pushFollow(FOLLOW_rule__DynamicConfig__Group_2_0_1__0__Impl_in_rule__DynamicConfig__Group_2_0_1__04774);
+            pushFollow(FOLLOW_13);
             rule__DynamicConfig__Group_2_0_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__DynamicConfig__Group_2_0_1__1_in_rule__DynamicConfig__Group_2_0_1__04777);
+            pushFollow(FOLLOW_2);
             rule__DynamicConfig__Group_2_0_1__1();
 
             state._fsp--;
@@ -7354,25 +7354,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DynamicConfig__Group_2_0_1__0__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2305:1: rule__DynamicConfig__Group_2_0_1__0__Impl : ( ( rule__DynamicConfig__Group_2_0_1_0__0 ) ) ;
+    // InternalConfig.g:2304:1: rule__DynamicConfig__Group_2_0_1__0__Impl : ( ( rule__DynamicConfig__Group_2_0_1_0__0 ) ) ;
     public final void rule__DynamicConfig__Group_2_0_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2309:1: ( ( ( rule__DynamicConfig__Group_2_0_1_0__0 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2310:1: ( ( rule__DynamicConfig__Group_2_0_1_0__0 ) )
+            // InternalConfig.g:2308:1: ( ( ( rule__DynamicConfig__Group_2_0_1_0__0 ) ) )
+            // InternalConfig.g:2309:1: ( ( rule__DynamicConfig__Group_2_0_1_0__0 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2310:1: ( ( rule__DynamicConfig__Group_2_0_1_0__0 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2311:1: ( rule__DynamicConfig__Group_2_0_1_0__0 )
+            // InternalConfig.g:2309:1: ( ( rule__DynamicConfig__Group_2_0_1_0__0 ) )
+            // InternalConfig.g:2310:1: ( rule__DynamicConfig__Group_2_0_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDynamicConfigAccess().getGroup_2_0_1_0()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2312:1: ( rule__DynamicConfig__Group_2_0_1_0__0 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2312:2: rule__DynamicConfig__Group_2_0_1_0__0
+            // InternalConfig.g:2311:1: ( rule__DynamicConfig__Group_2_0_1_0__0 )
+            // InternalConfig.g:2311:2: rule__DynamicConfig__Group_2_0_1_0__0
             {
-            pushFollow(FOLLOW_rule__DynamicConfig__Group_2_0_1_0__0_in_rule__DynamicConfig__Group_2_0_1__0__Impl4804);
+            pushFollow(FOLLOW_2);
             rule__DynamicConfig__Group_2_0_1_0__0();
 
             state._fsp--;
@@ -7405,16 +7405,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DynamicConfig__Group_2_0_1__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2322:1: rule__DynamicConfig__Group_2_0_1__1 : rule__DynamicConfig__Group_2_0_1__1__Impl ;
+    // InternalConfig.g:2321:1: rule__DynamicConfig__Group_2_0_1__1 : rule__DynamicConfig__Group_2_0_1__1__Impl ;
     public final void rule__DynamicConfig__Group_2_0_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2326:1: ( rule__DynamicConfig__Group_2_0_1__1__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2327:2: rule__DynamicConfig__Group_2_0_1__1__Impl
+            // InternalConfig.g:2325:1: ( rule__DynamicConfig__Group_2_0_1__1__Impl )
+            // InternalConfig.g:2326:2: rule__DynamicConfig__Group_2_0_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__DynamicConfig__Group_2_0_1__1__Impl_in_rule__DynamicConfig__Group_2_0_1__14834);
+            pushFollow(FOLLOW_2);
             rule__DynamicConfig__Group_2_0_1__1__Impl();
 
             state._fsp--;
@@ -7438,25 +7438,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DynamicConfig__Group_2_0_1__1__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2333:1: rule__DynamicConfig__Group_2_0_1__1__Impl : ( ( rule__DynamicConfig__Group_2_0_1_1__0 ) ) ;
+    // InternalConfig.g:2332:1: rule__DynamicConfig__Group_2_0_1__1__Impl : ( ( rule__DynamicConfig__Group_2_0_1_1__0 ) ) ;
     public final void rule__DynamicConfig__Group_2_0_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2337:1: ( ( ( rule__DynamicConfig__Group_2_0_1_1__0 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2338:1: ( ( rule__DynamicConfig__Group_2_0_1_1__0 ) )
+            // InternalConfig.g:2336:1: ( ( ( rule__DynamicConfig__Group_2_0_1_1__0 ) ) )
+            // InternalConfig.g:2337:1: ( ( rule__DynamicConfig__Group_2_0_1_1__0 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2338:1: ( ( rule__DynamicConfig__Group_2_0_1_1__0 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2339:1: ( rule__DynamicConfig__Group_2_0_1_1__0 )
+            // InternalConfig.g:2337:1: ( ( rule__DynamicConfig__Group_2_0_1_1__0 ) )
+            // InternalConfig.g:2338:1: ( rule__DynamicConfig__Group_2_0_1_1__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDynamicConfigAccess().getGroup_2_0_1_1()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2340:1: ( rule__DynamicConfig__Group_2_0_1_1__0 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2340:2: rule__DynamicConfig__Group_2_0_1_1__0
+            // InternalConfig.g:2339:1: ( rule__DynamicConfig__Group_2_0_1_1__0 )
+            // InternalConfig.g:2339:2: rule__DynamicConfig__Group_2_0_1_1__0
             {
-            pushFollow(FOLLOW_rule__DynamicConfig__Group_2_0_1_1__0_in_rule__DynamicConfig__Group_2_0_1__1__Impl4861);
+            pushFollow(FOLLOW_2);
             rule__DynamicConfig__Group_2_0_1_1__0();
 
             state._fsp--;
@@ -7489,21 +7489,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DynamicConfig__Group_2_0_1_0__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2354:1: rule__DynamicConfig__Group_2_0_1_0__0 : rule__DynamicConfig__Group_2_0_1_0__0__Impl rule__DynamicConfig__Group_2_0_1_0__1 ;
+    // InternalConfig.g:2353:1: rule__DynamicConfig__Group_2_0_1_0__0 : rule__DynamicConfig__Group_2_0_1_0__0__Impl rule__DynamicConfig__Group_2_0_1_0__1 ;
     public final void rule__DynamicConfig__Group_2_0_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2358:1: ( rule__DynamicConfig__Group_2_0_1_0__0__Impl rule__DynamicConfig__Group_2_0_1_0__1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2359:2: rule__DynamicConfig__Group_2_0_1_0__0__Impl rule__DynamicConfig__Group_2_0_1_0__1
+            // InternalConfig.g:2357:1: ( rule__DynamicConfig__Group_2_0_1_0__0__Impl rule__DynamicConfig__Group_2_0_1_0__1 )
+            // InternalConfig.g:2358:2: rule__DynamicConfig__Group_2_0_1_0__0__Impl rule__DynamicConfig__Group_2_0_1_0__1
             {
-            pushFollow(FOLLOW_rule__DynamicConfig__Group_2_0_1_0__0__Impl_in_rule__DynamicConfig__Group_2_0_1_0__04895);
+            pushFollow(FOLLOW_12);
             rule__DynamicConfig__Group_2_0_1_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__DynamicConfig__Group_2_0_1_0__1_in_rule__DynamicConfig__Group_2_0_1_0__04898);
+            pushFollow(FOLLOW_2);
             rule__DynamicConfig__Group_2_0_1_0__1();
 
             state._fsp--;
@@ -7527,22 +7527,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DynamicConfig__Group_2_0_1_0__0__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2366:1: rule__DynamicConfig__Group_2_0_1_0__0__Impl : ( 'user import' ) ;
+    // InternalConfig.g:2365:1: rule__DynamicConfig__Group_2_0_1_0__0__Impl : ( 'user import' ) ;
     public final void rule__DynamicConfig__Group_2_0_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2370:1: ( ( 'user import' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2371:1: ( 'user import' )
+            // InternalConfig.g:2369:1: ( ( 'user import' ) )
+            // InternalConfig.g:2370:1: ( 'user import' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2371:1: ( 'user import' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2372:1: 'user import'
+            // InternalConfig.g:2370:1: ( 'user import' )
+            // InternalConfig.g:2371:1: 'user import'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDynamicConfigAccess().getUserImportKeyword_2_0_1_0_0()); 
             }
-            match(input,33,FOLLOW_33_in_rule__DynamicConfig__Group_2_0_1_0__0__Impl4926); if (state.failed) return ;
+            match(input,33,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getDynamicConfigAccess().getUserImportKeyword_2_0_1_0_0()); 
             }
@@ -7568,16 +7568,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DynamicConfig__Group_2_0_1_0__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2385:1: rule__DynamicConfig__Group_2_0_1_0__1 : rule__DynamicConfig__Group_2_0_1_0__1__Impl ;
+    // InternalConfig.g:2384:1: rule__DynamicConfig__Group_2_0_1_0__1 : rule__DynamicConfig__Group_2_0_1_0__1__Impl ;
     public final void rule__DynamicConfig__Group_2_0_1_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2389:1: ( rule__DynamicConfig__Group_2_0_1_0__1__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2390:2: rule__DynamicConfig__Group_2_0_1_0__1__Impl
+            // InternalConfig.g:2388:1: ( rule__DynamicConfig__Group_2_0_1_0__1__Impl )
+            // InternalConfig.g:2389:2: rule__DynamicConfig__Group_2_0_1_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__DynamicConfig__Group_2_0_1_0__1__Impl_in_rule__DynamicConfig__Group_2_0_1_0__14957);
+            pushFollow(FOLLOW_2);
             rule__DynamicConfig__Group_2_0_1_0__1__Impl();
 
             state._fsp--;
@@ -7601,25 +7601,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DynamicConfig__Group_2_0_1_0__1__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2396:1: rule__DynamicConfig__Group_2_0_1_0__1__Impl : ( ( rule__DynamicConfig__UserCode1Assignment_2_0_1_0_1 ) ) ;
+    // InternalConfig.g:2395:1: rule__DynamicConfig__Group_2_0_1_0__1__Impl : ( ( rule__DynamicConfig__UserCode1Assignment_2_0_1_0_1 ) ) ;
     public final void rule__DynamicConfig__Group_2_0_1_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2400:1: ( ( ( rule__DynamicConfig__UserCode1Assignment_2_0_1_0_1 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2401:1: ( ( rule__DynamicConfig__UserCode1Assignment_2_0_1_0_1 ) )
+            // InternalConfig.g:2399:1: ( ( ( rule__DynamicConfig__UserCode1Assignment_2_0_1_0_1 ) ) )
+            // InternalConfig.g:2400:1: ( ( rule__DynamicConfig__UserCode1Assignment_2_0_1_0_1 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2401:1: ( ( rule__DynamicConfig__UserCode1Assignment_2_0_1_0_1 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2402:1: ( rule__DynamicConfig__UserCode1Assignment_2_0_1_0_1 )
+            // InternalConfig.g:2400:1: ( ( rule__DynamicConfig__UserCode1Assignment_2_0_1_0_1 ) )
+            // InternalConfig.g:2401:1: ( rule__DynamicConfig__UserCode1Assignment_2_0_1_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDynamicConfigAccess().getUserCode1Assignment_2_0_1_0_1()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2403:1: ( rule__DynamicConfig__UserCode1Assignment_2_0_1_0_1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2403:2: rule__DynamicConfig__UserCode1Assignment_2_0_1_0_1
+            // InternalConfig.g:2402:1: ( rule__DynamicConfig__UserCode1Assignment_2_0_1_0_1 )
+            // InternalConfig.g:2402:2: rule__DynamicConfig__UserCode1Assignment_2_0_1_0_1
             {
-            pushFollow(FOLLOW_rule__DynamicConfig__UserCode1Assignment_2_0_1_0_1_in_rule__DynamicConfig__Group_2_0_1_0__1__Impl4984);
+            pushFollow(FOLLOW_2);
             rule__DynamicConfig__UserCode1Assignment_2_0_1_0_1();
 
             state._fsp--;
@@ -7652,21 +7652,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DynamicConfig__Group_2_0_1_1__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2417:1: rule__DynamicConfig__Group_2_0_1_1__0 : rule__DynamicConfig__Group_2_0_1_1__0__Impl rule__DynamicConfig__Group_2_0_1_1__1 ;
+    // InternalConfig.g:2416:1: rule__DynamicConfig__Group_2_0_1_1__0 : rule__DynamicConfig__Group_2_0_1_1__0__Impl rule__DynamicConfig__Group_2_0_1_1__1 ;
     public final void rule__DynamicConfig__Group_2_0_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2421:1: ( rule__DynamicConfig__Group_2_0_1_1__0__Impl rule__DynamicConfig__Group_2_0_1_1__1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2422:2: rule__DynamicConfig__Group_2_0_1_1__0__Impl rule__DynamicConfig__Group_2_0_1_1__1
+            // InternalConfig.g:2420:1: ( rule__DynamicConfig__Group_2_0_1_1__0__Impl rule__DynamicConfig__Group_2_0_1_1__1 )
+            // InternalConfig.g:2421:2: rule__DynamicConfig__Group_2_0_1_1__0__Impl rule__DynamicConfig__Group_2_0_1_1__1
             {
-            pushFollow(FOLLOW_rule__DynamicConfig__Group_2_0_1_1__0__Impl_in_rule__DynamicConfig__Group_2_0_1_1__05018);
+            pushFollow(FOLLOW_12);
             rule__DynamicConfig__Group_2_0_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__DynamicConfig__Group_2_0_1_1__1_in_rule__DynamicConfig__Group_2_0_1_1__05021);
+            pushFollow(FOLLOW_2);
             rule__DynamicConfig__Group_2_0_1_1__1();
 
             state._fsp--;
@@ -7690,22 +7690,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DynamicConfig__Group_2_0_1_1__0__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2429:1: rule__DynamicConfig__Group_2_0_1_1__0__Impl : ( 'user constructor' ) ;
+    // InternalConfig.g:2428:1: rule__DynamicConfig__Group_2_0_1_1__0__Impl : ( 'user constructor' ) ;
     public final void rule__DynamicConfig__Group_2_0_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2433:1: ( ( 'user constructor' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2434:1: ( 'user constructor' )
+            // InternalConfig.g:2432:1: ( ( 'user constructor' ) )
+            // InternalConfig.g:2433:1: ( 'user constructor' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2434:1: ( 'user constructor' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2435:1: 'user constructor'
+            // InternalConfig.g:2433:1: ( 'user constructor' )
+            // InternalConfig.g:2434:1: 'user constructor'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDynamicConfigAccess().getUserConstructorKeyword_2_0_1_1_0()); 
             }
-            match(input,34,FOLLOW_34_in_rule__DynamicConfig__Group_2_0_1_1__0__Impl5049); if (state.failed) return ;
+            match(input,34,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getDynamicConfigAccess().getUserConstructorKeyword_2_0_1_1_0()); 
             }
@@ -7731,16 +7731,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DynamicConfig__Group_2_0_1_1__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2448:1: rule__DynamicConfig__Group_2_0_1_1__1 : rule__DynamicConfig__Group_2_0_1_1__1__Impl ;
+    // InternalConfig.g:2447:1: rule__DynamicConfig__Group_2_0_1_1__1 : rule__DynamicConfig__Group_2_0_1_1__1__Impl ;
     public final void rule__DynamicConfig__Group_2_0_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2452:1: ( rule__DynamicConfig__Group_2_0_1_1__1__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2453:2: rule__DynamicConfig__Group_2_0_1_1__1__Impl
+            // InternalConfig.g:2451:1: ( rule__DynamicConfig__Group_2_0_1_1__1__Impl )
+            // InternalConfig.g:2452:2: rule__DynamicConfig__Group_2_0_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__DynamicConfig__Group_2_0_1_1__1__Impl_in_rule__DynamicConfig__Group_2_0_1_1__15080);
+            pushFollow(FOLLOW_2);
             rule__DynamicConfig__Group_2_0_1_1__1__Impl();
 
             state._fsp--;
@@ -7764,25 +7764,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DynamicConfig__Group_2_0_1_1__1__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2459:1: rule__DynamicConfig__Group_2_0_1_1__1__Impl : ( ( rule__DynamicConfig__UserCode2Assignment_2_0_1_1_1 ) ) ;
+    // InternalConfig.g:2458:1: rule__DynamicConfig__Group_2_0_1_1__1__Impl : ( ( rule__DynamicConfig__UserCode2Assignment_2_0_1_1_1 ) ) ;
     public final void rule__DynamicConfig__Group_2_0_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2463:1: ( ( ( rule__DynamicConfig__UserCode2Assignment_2_0_1_1_1 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2464:1: ( ( rule__DynamicConfig__UserCode2Assignment_2_0_1_1_1 ) )
+            // InternalConfig.g:2462:1: ( ( ( rule__DynamicConfig__UserCode2Assignment_2_0_1_1_1 ) ) )
+            // InternalConfig.g:2463:1: ( ( rule__DynamicConfig__UserCode2Assignment_2_0_1_1_1 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2464:1: ( ( rule__DynamicConfig__UserCode2Assignment_2_0_1_1_1 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2465:1: ( rule__DynamicConfig__UserCode2Assignment_2_0_1_1_1 )
+            // InternalConfig.g:2463:1: ( ( rule__DynamicConfig__UserCode2Assignment_2_0_1_1_1 ) )
+            // InternalConfig.g:2464:1: ( rule__DynamicConfig__UserCode2Assignment_2_0_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDynamicConfigAccess().getUserCode2Assignment_2_0_1_1_1()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2466:1: ( rule__DynamicConfig__UserCode2Assignment_2_0_1_1_1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2466:2: rule__DynamicConfig__UserCode2Assignment_2_0_1_1_1
+            // InternalConfig.g:2465:1: ( rule__DynamicConfig__UserCode2Assignment_2_0_1_1_1 )
+            // InternalConfig.g:2465:2: rule__DynamicConfig__UserCode2Assignment_2_0_1_1_1
             {
-            pushFollow(FOLLOW_rule__DynamicConfig__UserCode2Assignment_2_0_1_1_1_in_rule__DynamicConfig__Group_2_0_1_1__1__Impl5107);
+            pushFollow(FOLLOW_2);
             rule__DynamicConfig__UserCode2Assignment_2_0_1_1_1();
 
             state._fsp--;
@@ -7815,21 +7815,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DynamicConfig__Group_2_1__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2480:1: rule__DynamicConfig__Group_2_1__0 : rule__DynamicConfig__Group_2_1__0__Impl rule__DynamicConfig__Group_2_1__1 ;
+    // InternalConfig.g:2479:1: rule__DynamicConfig__Group_2_1__0 : rule__DynamicConfig__Group_2_1__0__Impl rule__DynamicConfig__Group_2_1__1 ;
     public final void rule__DynamicConfig__Group_2_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2484:1: ( rule__DynamicConfig__Group_2_1__0__Impl rule__DynamicConfig__Group_2_1__1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2485:2: rule__DynamicConfig__Group_2_1__0__Impl rule__DynamicConfig__Group_2_1__1
+            // InternalConfig.g:2483:1: ( rule__DynamicConfig__Group_2_1__0__Impl rule__DynamicConfig__Group_2_1__1 )
+            // InternalConfig.g:2484:2: rule__DynamicConfig__Group_2_1__0__Impl rule__DynamicConfig__Group_2_1__1
             {
-            pushFollow(FOLLOW_rule__DynamicConfig__Group_2_1__0__Impl_in_rule__DynamicConfig__Group_2_1__05141);
+            pushFollow(FOLLOW_14);
             rule__DynamicConfig__Group_2_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__DynamicConfig__Group_2_1__1_in_rule__DynamicConfig__Group_2_1__05144);
+            pushFollow(FOLLOW_2);
             rule__DynamicConfig__Group_2_1__1();
 
             state._fsp--;
@@ -7853,22 +7853,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DynamicConfig__Group_2_1__0__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2492:1: rule__DynamicConfig__Group_2_1__0__Impl : ( 'polling interval' ) ;
+    // InternalConfig.g:2491:1: rule__DynamicConfig__Group_2_1__0__Impl : ( 'polling interval' ) ;
     public final void rule__DynamicConfig__Group_2_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2496:1: ( ( 'polling interval' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2497:1: ( 'polling interval' )
+            // InternalConfig.g:2495:1: ( ( 'polling interval' ) )
+            // InternalConfig.g:2496:1: ( 'polling interval' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2497:1: ( 'polling interval' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2498:1: 'polling interval'
+            // InternalConfig.g:2496:1: ( 'polling interval' )
+            // InternalConfig.g:2497:1: 'polling interval'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDynamicConfigAccess().getPollingIntervalKeyword_2_1_0()); 
             }
-            match(input,35,FOLLOW_35_in_rule__DynamicConfig__Group_2_1__0__Impl5172); if (state.failed) return ;
+            match(input,35,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getDynamicConfigAccess().getPollingIntervalKeyword_2_1_0()); 
             }
@@ -7894,16 +7894,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DynamicConfig__Group_2_1__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2511:1: rule__DynamicConfig__Group_2_1__1 : rule__DynamicConfig__Group_2_1__1__Impl ;
+    // InternalConfig.g:2510:1: rule__DynamicConfig__Group_2_1__1 : rule__DynamicConfig__Group_2_1__1__Impl ;
     public final void rule__DynamicConfig__Group_2_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2515:1: ( rule__DynamicConfig__Group_2_1__1__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2516:2: rule__DynamicConfig__Group_2_1__1__Impl
+            // InternalConfig.g:2514:1: ( rule__DynamicConfig__Group_2_1__1__Impl )
+            // InternalConfig.g:2515:2: rule__DynamicConfig__Group_2_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__DynamicConfig__Group_2_1__1__Impl_in_rule__DynamicConfig__Group_2_1__15203);
+            pushFollow(FOLLOW_2);
             rule__DynamicConfig__Group_2_1__1__Impl();
 
             state._fsp--;
@@ -7927,25 +7927,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DynamicConfig__Group_2_1__1__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2522:1: rule__DynamicConfig__Group_2_1__1__Impl : ( ( rule__DynamicConfig__PollingAssignment_2_1_1 ) ) ;
+    // InternalConfig.g:2521:1: rule__DynamicConfig__Group_2_1__1__Impl : ( ( rule__DynamicConfig__PollingAssignment_2_1_1 ) ) ;
     public final void rule__DynamicConfig__Group_2_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2526:1: ( ( ( rule__DynamicConfig__PollingAssignment_2_1_1 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2527:1: ( ( rule__DynamicConfig__PollingAssignment_2_1_1 ) )
+            // InternalConfig.g:2525:1: ( ( ( rule__DynamicConfig__PollingAssignment_2_1_1 ) ) )
+            // InternalConfig.g:2526:1: ( ( rule__DynamicConfig__PollingAssignment_2_1_1 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2527:1: ( ( rule__DynamicConfig__PollingAssignment_2_1_1 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2528:1: ( rule__DynamicConfig__PollingAssignment_2_1_1 )
+            // InternalConfig.g:2526:1: ( ( rule__DynamicConfig__PollingAssignment_2_1_1 ) )
+            // InternalConfig.g:2527:1: ( rule__DynamicConfig__PollingAssignment_2_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDynamicConfigAccess().getPollingAssignment_2_1_1()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2529:1: ( rule__DynamicConfig__PollingAssignment_2_1_1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2529:2: rule__DynamicConfig__PollingAssignment_2_1_1
+            // InternalConfig.g:2528:1: ( rule__DynamicConfig__PollingAssignment_2_1_1 )
+            // InternalConfig.g:2528:2: rule__DynamicConfig__PollingAssignment_2_1_1
             {
-            pushFollow(FOLLOW_rule__DynamicConfig__PollingAssignment_2_1_1_in_rule__DynamicConfig__Group_2_1__1__Impl5230);
+            pushFollow(FOLLOW_2);
             rule__DynamicConfig__PollingAssignment_2_1_1();
 
             state._fsp--;
@@ -7978,21 +7978,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClassConfig__Group__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2543:1: rule__ActorClassConfig__Group__0 : rule__ActorClassConfig__Group__0__Impl rule__ActorClassConfig__Group__1 ;
+    // InternalConfig.g:2542:1: rule__ActorClassConfig__Group__0 : rule__ActorClassConfig__Group__0__Impl rule__ActorClassConfig__Group__1 ;
     public final void rule__ActorClassConfig__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2547:1: ( rule__ActorClassConfig__Group__0__Impl rule__ActorClassConfig__Group__1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2548:2: rule__ActorClassConfig__Group__0__Impl rule__ActorClassConfig__Group__1
+            // InternalConfig.g:2546:1: ( rule__ActorClassConfig__Group__0__Impl rule__ActorClassConfig__Group__1 )
+            // InternalConfig.g:2547:2: rule__ActorClassConfig__Group__0__Impl rule__ActorClassConfig__Group__1
             {
-            pushFollow(FOLLOW_rule__ActorClassConfig__Group__0__Impl_in_rule__ActorClassConfig__Group__05264);
+            pushFollow(FOLLOW_3);
             rule__ActorClassConfig__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ActorClassConfig__Group__1_in_rule__ActorClassConfig__Group__05267);
+            pushFollow(FOLLOW_2);
             rule__ActorClassConfig__Group__1();
 
             state._fsp--;
@@ -8016,22 +8016,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClassConfig__Group__0__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2555:1: rule__ActorClassConfig__Group__0__Impl : ( 'ActorClassConfig' ) ;
+    // InternalConfig.g:2554:1: rule__ActorClassConfig__Group__0__Impl : ( 'ActorClassConfig' ) ;
     public final void rule__ActorClassConfig__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2559:1: ( ( 'ActorClassConfig' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2560:1: ( 'ActorClassConfig' )
+            // InternalConfig.g:2558:1: ( ( 'ActorClassConfig' ) )
+            // InternalConfig.g:2559:1: ( 'ActorClassConfig' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2560:1: ( 'ActorClassConfig' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2561:1: 'ActorClassConfig'
+            // InternalConfig.g:2559:1: ( 'ActorClassConfig' )
+            // InternalConfig.g:2560:1: 'ActorClassConfig'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getActorClassConfigAccess().getActorClassConfigKeyword_0()); 
             }
-            match(input,36,FOLLOW_36_in_rule__ActorClassConfig__Group__0__Impl5295); if (state.failed) return ;
+            match(input,36,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getActorClassConfigAccess().getActorClassConfigKeyword_0()); 
             }
@@ -8057,21 +8057,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClassConfig__Group__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2574:1: rule__ActorClassConfig__Group__1 : rule__ActorClassConfig__Group__1__Impl rule__ActorClassConfig__Group__2 ;
+    // InternalConfig.g:2573:1: rule__ActorClassConfig__Group__1 : rule__ActorClassConfig__Group__1__Impl rule__ActorClassConfig__Group__2 ;
     public final void rule__ActorClassConfig__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2578:1: ( rule__ActorClassConfig__Group__1__Impl rule__ActorClassConfig__Group__2 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2579:2: rule__ActorClassConfig__Group__1__Impl rule__ActorClassConfig__Group__2
+            // InternalConfig.g:2577:1: ( rule__ActorClassConfig__Group__1__Impl rule__ActorClassConfig__Group__2 )
+            // InternalConfig.g:2578:2: rule__ActorClassConfig__Group__1__Impl rule__ActorClassConfig__Group__2
             {
-            pushFollow(FOLLOW_rule__ActorClassConfig__Group__1__Impl_in_rule__ActorClassConfig__Group__15326);
+            pushFollow(FOLLOW_4);
             rule__ActorClassConfig__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ActorClassConfig__Group__2_in_rule__ActorClassConfig__Group__15329);
+            pushFollow(FOLLOW_2);
             rule__ActorClassConfig__Group__2();
 
             state._fsp--;
@@ -8095,25 +8095,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClassConfig__Group__1__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2586:1: rule__ActorClassConfig__Group__1__Impl : ( ( rule__ActorClassConfig__ActorAssignment_1 ) ) ;
+    // InternalConfig.g:2585:1: rule__ActorClassConfig__Group__1__Impl : ( ( rule__ActorClassConfig__ActorAssignment_1 ) ) ;
     public final void rule__ActorClassConfig__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2590:1: ( ( ( rule__ActorClassConfig__ActorAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2591:1: ( ( rule__ActorClassConfig__ActorAssignment_1 ) )
+            // InternalConfig.g:2589:1: ( ( ( rule__ActorClassConfig__ActorAssignment_1 ) ) )
+            // InternalConfig.g:2590:1: ( ( rule__ActorClassConfig__ActorAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2591:1: ( ( rule__ActorClassConfig__ActorAssignment_1 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2592:1: ( rule__ActorClassConfig__ActorAssignment_1 )
+            // InternalConfig.g:2590:1: ( ( rule__ActorClassConfig__ActorAssignment_1 ) )
+            // InternalConfig.g:2591:1: ( rule__ActorClassConfig__ActorAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getActorClassConfigAccess().getActorAssignment_1()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2593:1: ( rule__ActorClassConfig__ActorAssignment_1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2593:2: rule__ActorClassConfig__ActorAssignment_1
+            // InternalConfig.g:2592:1: ( rule__ActorClassConfig__ActorAssignment_1 )
+            // InternalConfig.g:2592:2: rule__ActorClassConfig__ActorAssignment_1
             {
-            pushFollow(FOLLOW_rule__ActorClassConfig__ActorAssignment_1_in_rule__ActorClassConfig__Group__1__Impl5356);
+            pushFollow(FOLLOW_2);
             rule__ActorClassConfig__ActorAssignment_1();
 
             state._fsp--;
@@ -8146,21 +8146,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClassConfig__Group__2"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2603:1: rule__ActorClassConfig__Group__2 : rule__ActorClassConfig__Group__2__Impl rule__ActorClassConfig__Group__3 ;
+    // InternalConfig.g:2602:1: rule__ActorClassConfig__Group__2 : rule__ActorClassConfig__Group__2__Impl rule__ActorClassConfig__Group__3 ;
     public final void rule__ActorClassConfig__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2607:1: ( rule__ActorClassConfig__Group__2__Impl rule__ActorClassConfig__Group__3 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2608:2: rule__ActorClassConfig__Group__2__Impl rule__ActorClassConfig__Group__3
+            // InternalConfig.g:2606:1: ( rule__ActorClassConfig__Group__2__Impl rule__ActorClassConfig__Group__3 )
+            // InternalConfig.g:2607:2: rule__ActorClassConfig__Group__2__Impl rule__ActorClassConfig__Group__3
             {
-            pushFollow(FOLLOW_rule__ActorClassConfig__Group__2__Impl_in_rule__ActorClassConfig__Group__25386);
+            pushFollow(FOLLOW_15);
             rule__ActorClassConfig__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ActorClassConfig__Group__3_in_rule__ActorClassConfig__Group__25389);
+            pushFollow(FOLLOW_2);
             rule__ActorClassConfig__Group__3();
 
             state._fsp--;
@@ -8184,22 +8184,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClassConfig__Group__2__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2615:1: rule__ActorClassConfig__Group__2__Impl : ( '{' ) ;
+    // InternalConfig.g:2614:1: rule__ActorClassConfig__Group__2__Impl : ( '{' ) ;
     public final void rule__ActorClassConfig__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2619:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2620:1: ( '{' )
+            // InternalConfig.g:2618:1: ( ( '{' ) )
+            // InternalConfig.g:2619:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2620:1: ( '{' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2621:1: '{'
+            // InternalConfig.g:2619:1: ( '{' )
+            // InternalConfig.g:2620:1: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getActorClassConfigAccess().getLeftCurlyBracketKeyword_2()); 
             }
-            match(input,27,FOLLOW_27_in_rule__ActorClassConfig__Group__2__Impl5417); if (state.failed) return ;
+            match(input,27,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getActorClassConfigAccess().getLeftCurlyBracketKeyword_2()); 
             }
@@ -8225,21 +8225,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClassConfig__Group__3"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2634:1: rule__ActorClassConfig__Group__3 : rule__ActorClassConfig__Group__3__Impl rule__ActorClassConfig__Group__4 ;
+    // InternalConfig.g:2633:1: rule__ActorClassConfig__Group__3 : rule__ActorClassConfig__Group__3__Impl rule__ActorClassConfig__Group__4 ;
     public final void rule__ActorClassConfig__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2638:1: ( rule__ActorClassConfig__Group__3__Impl rule__ActorClassConfig__Group__4 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2639:2: rule__ActorClassConfig__Group__3__Impl rule__ActorClassConfig__Group__4
+            // InternalConfig.g:2637:1: ( rule__ActorClassConfig__Group__3__Impl rule__ActorClassConfig__Group__4 )
+            // InternalConfig.g:2638:2: rule__ActorClassConfig__Group__3__Impl rule__ActorClassConfig__Group__4
             {
-            pushFollow(FOLLOW_rule__ActorClassConfig__Group__3__Impl_in_rule__ActorClassConfig__Group__35448);
+            pushFollow(FOLLOW_15);
             rule__ActorClassConfig__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ActorClassConfig__Group__4_in_rule__ActorClassConfig__Group__35451);
+            pushFollow(FOLLOW_2);
             rule__ActorClassConfig__Group__4();
 
             state._fsp--;
@@ -8263,22 +8263,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClassConfig__Group__3__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2646:1: rule__ActorClassConfig__Group__3__Impl : ( ( rule__ActorClassConfig__AttributesAssignment_3 )* ) ;
+    // InternalConfig.g:2645:1: rule__ActorClassConfig__Group__3__Impl : ( ( rule__ActorClassConfig__AttributesAssignment_3 )* ) ;
     public final void rule__ActorClassConfig__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2650:1: ( ( ( rule__ActorClassConfig__AttributesAssignment_3 )* ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2651:1: ( ( rule__ActorClassConfig__AttributesAssignment_3 )* )
+            // InternalConfig.g:2649:1: ( ( ( rule__ActorClassConfig__AttributesAssignment_3 )* ) )
+            // InternalConfig.g:2650:1: ( ( rule__ActorClassConfig__AttributesAssignment_3 )* )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2651:1: ( ( rule__ActorClassConfig__AttributesAssignment_3 )* )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2652:1: ( rule__ActorClassConfig__AttributesAssignment_3 )*
+            // InternalConfig.g:2650:1: ( ( rule__ActorClassConfig__AttributesAssignment_3 )* )
+            // InternalConfig.g:2651:1: ( rule__ActorClassConfig__AttributesAssignment_3 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getActorClassConfigAccess().getAttributesAssignment_3()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2653:1: ( rule__ActorClassConfig__AttributesAssignment_3 )*
+            // InternalConfig.g:2652:1: ( rule__ActorClassConfig__AttributesAssignment_3 )*
             loop24:
             do {
                 int alt24=2;
@@ -8291,9 +8291,9 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
                 switch (alt24) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2653:2: rule__ActorClassConfig__AttributesAssignment_3
+            	    // InternalConfig.g:2652:2: rule__ActorClassConfig__AttributesAssignment_3
             	    {
-            	    pushFollow(FOLLOW_rule__ActorClassConfig__AttributesAssignment_3_in_rule__ActorClassConfig__Group__3__Impl5478);
+            	    pushFollow(FOLLOW_16);
             	    rule__ActorClassConfig__AttributesAssignment_3();
 
             	    state._fsp--;
@@ -8332,16 +8332,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClassConfig__Group__4"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2663:1: rule__ActorClassConfig__Group__4 : rule__ActorClassConfig__Group__4__Impl ;
+    // InternalConfig.g:2662:1: rule__ActorClassConfig__Group__4 : rule__ActorClassConfig__Group__4__Impl ;
     public final void rule__ActorClassConfig__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2667:1: ( rule__ActorClassConfig__Group__4__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2668:2: rule__ActorClassConfig__Group__4__Impl
+            // InternalConfig.g:2666:1: ( rule__ActorClassConfig__Group__4__Impl )
+            // InternalConfig.g:2667:2: rule__ActorClassConfig__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__ActorClassConfig__Group__4__Impl_in_rule__ActorClassConfig__Group__45509);
+            pushFollow(FOLLOW_2);
             rule__ActorClassConfig__Group__4__Impl();
 
             state._fsp--;
@@ -8365,22 +8365,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClassConfig__Group__4__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2674:1: rule__ActorClassConfig__Group__4__Impl : ( '}' ) ;
+    // InternalConfig.g:2673:1: rule__ActorClassConfig__Group__4__Impl : ( '}' ) ;
     public final void rule__ActorClassConfig__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2678:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2679:1: ( '}' )
+            // InternalConfig.g:2677:1: ( ( '}' ) )
+            // InternalConfig.g:2678:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2679:1: ( '}' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2680:1: '}'
+            // InternalConfig.g:2678:1: ( '}' )
+            // InternalConfig.g:2679:1: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getActorClassConfigAccess().getRightCurlyBracketKeyword_4()); 
             }
-            match(input,28,FOLLOW_28_in_rule__ActorClassConfig__Group__4__Impl5537); if (state.failed) return ;
+            match(input,28,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getActorClassConfigAccess().getRightCurlyBracketKeyword_4()); 
             }
@@ -8406,21 +8406,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorInstanceConfig__Group__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2703:1: rule__ActorInstanceConfig__Group__0 : rule__ActorInstanceConfig__Group__0__Impl rule__ActorInstanceConfig__Group__1 ;
+    // InternalConfig.g:2702:1: rule__ActorInstanceConfig__Group__0 : rule__ActorInstanceConfig__Group__0__Impl rule__ActorInstanceConfig__Group__1 ;
     public final void rule__ActorInstanceConfig__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2707:1: ( rule__ActorInstanceConfig__Group__0__Impl rule__ActorInstanceConfig__Group__1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2708:2: rule__ActorInstanceConfig__Group__0__Impl rule__ActorInstanceConfig__Group__1
+            // InternalConfig.g:2706:1: ( rule__ActorInstanceConfig__Group__0__Impl rule__ActorInstanceConfig__Group__1 )
+            // InternalConfig.g:2707:2: rule__ActorInstanceConfig__Group__0__Impl rule__ActorInstanceConfig__Group__1
             {
-            pushFollow(FOLLOW_rule__ActorInstanceConfig__Group__0__Impl_in_rule__ActorInstanceConfig__Group__05578);
+            pushFollow(FOLLOW_3);
             rule__ActorInstanceConfig__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ActorInstanceConfig__Group__1_in_rule__ActorInstanceConfig__Group__05581);
+            pushFollow(FOLLOW_2);
             rule__ActorInstanceConfig__Group__1();
 
             state._fsp--;
@@ -8444,22 +8444,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorInstanceConfig__Group__0__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2715:1: rule__ActorInstanceConfig__Group__0__Impl : ( 'ActorInstanceConfig' ) ;
+    // InternalConfig.g:2714:1: rule__ActorInstanceConfig__Group__0__Impl : ( 'ActorInstanceConfig' ) ;
     public final void rule__ActorInstanceConfig__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2719:1: ( ( 'ActorInstanceConfig' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2720:1: ( 'ActorInstanceConfig' )
+            // InternalConfig.g:2718:1: ( ( 'ActorInstanceConfig' ) )
+            // InternalConfig.g:2719:1: ( 'ActorInstanceConfig' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2720:1: ( 'ActorInstanceConfig' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2721:1: 'ActorInstanceConfig'
+            // InternalConfig.g:2719:1: ( 'ActorInstanceConfig' )
+            // InternalConfig.g:2720:1: 'ActorInstanceConfig'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getActorInstanceConfigAccess().getActorInstanceConfigKeyword_0()); 
             }
-            match(input,37,FOLLOW_37_in_rule__ActorInstanceConfig__Group__0__Impl5609); if (state.failed) return ;
+            match(input,37,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getActorInstanceConfigAccess().getActorInstanceConfigKeyword_0()); 
             }
@@ -8485,21 +8485,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorInstanceConfig__Group__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2734:1: rule__ActorInstanceConfig__Group__1 : rule__ActorInstanceConfig__Group__1__Impl rule__ActorInstanceConfig__Group__2 ;
+    // InternalConfig.g:2733:1: rule__ActorInstanceConfig__Group__1 : rule__ActorInstanceConfig__Group__1__Impl rule__ActorInstanceConfig__Group__2 ;
     public final void rule__ActorInstanceConfig__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2738:1: ( rule__ActorInstanceConfig__Group__1__Impl rule__ActorInstanceConfig__Group__2 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2739:2: rule__ActorInstanceConfig__Group__1__Impl rule__ActorInstanceConfig__Group__2
+            // InternalConfig.g:2737:1: ( rule__ActorInstanceConfig__Group__1__Impl rule__ActorInstanceConfig__Group__2 )
+            // InternalConfig.g:2738:2: rule__ActorInstanceConfig__Group__1__Impl rule__ActorInstanceConfig__Group__2
             {
-            pushFollow(FOLLOW_rule__ActorInstanceConfig__Group__1__Impl_in_rule__ActorInstanceConfig__Group__15640);
+            pushFollow(FOLLOW_8);
             rule__ActorInstanceConfig__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ActorInstanceConfig__Group__2_in_rule__ActorInstanceConfig__Group__15643);
+            pushFollow(FOLLOW_2);
             rule__ActorInstanceConfig__Group__2();
 
             state._fsp--;
@@ -8523,25 +8523,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorInstanceConfig__Group__1__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2746:1: rule__ActorInstanceConfig__Group__1__Impl : ( ( rule__ActorInstanceConfig__RootAssignment_1 ) ) ;
+    // InternalConfig.g:2745:1: rule__ActorInstanceConfig__Group__1__Impl : ( ( rule__ActorInstanceConfig__RootAssignment_1 ) ) ;
     public final void rule__ActorInstanceConfig__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2750:1: ( ( ( rule__ActorInstanceConfig__RootAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2751:1: ( ( rule__ActorInstanceConfig__RootAssignment_1 ) )
+            // InternalConfig.g:2749:1: ( ( ( rule__ActorInstanceConfig__RootAssignment_1 ) ) )
+            // InternalConfig.g:2750:1: ( ( rule__ActorInstanceConfig__RootAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2751:1: ( ( rule__ActorInstanceConfig__RootAssignment_1 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2752:1: ( rule__ActorInstanceConfig__RootAssignment_1 )
+            // InternalConfig.g:2750:1: ( ( rule__ActorInstanceConfig__RootAssignment_1 ) )
+            // InternalConfig.g:2751:1: ( rule__ActorInstanceConfig__RootAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getActorInstanceConfigAccess().getRootAssignment_1()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2753:1: ( rule__ActorInstanceConfig__RootAssignment_1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2753:2: rule__ActorInstanceConfig__RootAssignment_1
+            // InternalConfig.g:2752:1: ( rule__ActorInstanceConfig__RootAssignment_1 )
+            // InternalConfig.g:2752:2: rule__ActorInstanceConfig__RootAssignment_1
             {
-            pushFollow(FOLLOW_rule__ActorInstanceConfig__RootAssignment_1_in_rule__ActorInstanceConfig__Group__1__Impl5670);
+            pushFollow(FOLLOW_2);
             rule__ActorInstanceConfig__RootAssignment_1();
 
             state._fsp--;
@@ -8574,21 +8574,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorInstanceConfig__Group__2"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2763:1: rule__ActorInstanceConfig__Group__2 : rule__ActorInstanceConfig__Group__2__Impl rule__ActorInstanceConfig__Group__3 ;
+    // InternalConfig.g:2762:1: rule__ActorInstanceConfig__Group__2 : rule__ActorInstanceConfig__Group__2__Impl rule__ActorInstanceConfig__Group__3 ;
     public final void rule__ActorInstanceConfig__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2767:1: ( rule__ActorInstanceConfig__Group__2__Impl rule__ActorInstanceConfig__Group__3 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2768:2: rule__ActorInstanceConfig__Group__2__Impl rule__ActorInstanceConfig__Group__3
+            // InternalConfig.g:2766:1: ( rule__ActorInstanceConfig__Group__2__Impl rule__ActorInstanceConfig__Group__3 )
+            // InternalConfig.g:2767:2: rule__ActorInstanceConfig__Group__2__Impl rule__ActorInstanceConfig__Group__3
             {
-            pushFollow(FOLLOW_rule__ActorInstanceConfig__Group__2__Impl_in_rule__ActorInstanceConfig__Group__25700);
+            pushFollow(FOLLOW_3);
             rule__ActorInstanceConfig__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ActorInstanceConfig__Group__3_in_rule__ActorInstanceConfig__Group__25703);
+            pushFollow(FOLLOW_2);
             rule__ActorInstanceConfig__Group__3();
 
             state._fsp--;
@@ -8612,22 +8612,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorInstanceConfig__Group__2__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2775:1: rule__ActorInstanceConfig__Group__2__Impl : ( '/' ) ;
+    // InternalConfig.g:2774:1: rule__ActorInstanceConfig__Group__2__Impl : ( '/' ) ;
     public final void rule__ActorInstanceConfig__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2779:1: ( ( '/' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2780:1: ( '/' )
+            // InternalConfig.g:2778:1: ( ( '/' ) )
+            // InternalConfig.g:2779:1: ( '/' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2780:1: ( '/' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2781:1: '/'
+            // InternalConfig.g:2779:1: ( '/' )
+            // InternalConfig.g:2780:1: '/'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getActorInstanceConfigAccess().getSolidusKeyword_2()); 
             }
-            match(input,30,FOLLOW_30_in_rule__ActorInstanceConfig__Group__2__Impl5731); if (state.failed) return ;
+            match(input,30,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getActorInstanceConfigAccess().getSolidusKeyword_2()); 
             }
@@ -8653,21 +8653,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorInstanceConfig__Group__3"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2794:1: rule__ActorInstanceConfig__Group__3 : rule__ActorInstanceConfig__Group__3__Impl rule__ActorInstanceConfig__Group__4 ;
+    // InternalConfig.g:2793:1: rule__ActorInstanceConfig__Group__3 : rule__ActorInstanceConfig__Group__3__Impl rule__ActorInstanceConfig__Group__4 ;
     public final void rule__ActorInstanceConfig__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2798:1: ( rule__ActorInstanceConfig__Group__3__Impl rule__ActorInstanceConfig__Group__4 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2799:2: rule__ActorInstanceConfig__Group__3__Impl rule__ActorInstanceConfig__Group__4
+            // InternalConfig.g:2797:1: ( rule__ActorInstanceConfig__Group__3__Impl rule__ActorInstanceConfig__Group__4 )
+            // InternalConfig.g:2798:2: rule__ActorInstanceConfig__Group__3__Impl rule__ActorInstanceConfig__Group__4
             {
-            pushFollow(FOLLOW_rule__ActorInstanceConfig__Group__3__Impl_in_rule__ActorInstanceConfig__Group__35762);
+            pushFollow(FOLLOW_8);
             rule__ActorInstanceConfig__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ActorInstanceConfig__Group__4_in_rule__ActorInstanceConfig__Group__35765);
+            pushFollow(FOLLOW_2);
             rule__ActorInstanceConfig__Group__4();
 
             state._fsp--;
@@ -8691,25 +8691,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorInstanceConfig__Group__3__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2806:1: rule__ActorInstanceConfig__Group__3__Impl : ( ( rule__ActorInstanceConfig__SubSystemAssignment_3 ) ) ;
+    // InternalConfig.g:2805:1: rule__ActorInstanceConfig__Group__3__Impl : ( ( rule__ActorInstanceConfig__SubSystemAssignment_3 ) ) ;
     public final void rule__ActorInstanceConfig__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2810:1: ( ( ( rule__ActorInstanceConfig__SubSystemAssignment_3 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2811:1: ( ( rule__ActorInstanceConfig__SubSystemAssignment_3 ) )
+            // InternalConfig.g:2809:1: ( ( ( rule__ActorInstanceConfig__SubSystemAssignment_3 ) ) )
+            // InternalConfig.g:2810:1: ( ( rule__ActorInstanceConfig__SubSystemAssignment_3 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2811:1: ( ( rule__ActorInstanceConfig__SubSystemAssignment_3 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2812:1: ( rule__ActorInstanceConfig__SubSystemAssignment_3 )
+            // InternalConfig.g:2810:1: ( ( rule__ActorInstanceConfig__SubSystemAssignment_3 ) )
+            // InternalConfig.g:2811:1: ( rule__ActorInstanceConfig__SubSystemAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getActorInstanceConfigAccess().getSubSystemAssignment_3()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2813:1: ( rule__ActorInstanceConfig__SubSystemAssignment_3 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2813:2: rule__ActorInstanceConfig__SubSystemAssignment_3
+            // InternalConfig.g:2812:1: ( rule__ActorInstanceConfig__SubSystemAssignment_3 )
+            // InternalConfig.g:2812:2: rule__ActorInstanceConfig__SubSystemAssignment_3
             {
-            pushFollow(FOLLOW_rule__ActorInstanceConfig__SubSystemAssignment_3_in_rule__ActorInstanceConfig__Group__3__Impl5792);
+            pushFollow(FOLLOW_2);
             rule__ActorInstanceConfig__SubSystemAssignment_3();
 
             state._fsp--;
@@ -8742,21 +8742,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorInstanceConfig__Group__4"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2823:1: rule__ActorInstanceConfig__Group__4 : rule__ActorInstanceConfig__Group__4__Impl rule__ActorInstanceConfig__Group__5 ;
+    // InternalConfig.g:2822:1: rule__ActorInstanceConfig__Group__4 : rule__ActorInstanceConfig__Group__4__Impl rule__ActorInstanceConfig__Group__5 ;
     public final void rule__ActorInstanceConfig__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2827:1: ( rule__ActorInstanceConfig__Group__4__Impl rule__ActorInstanceConfig__Group__5 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2828:2: rule__ActorInstanceConfig__Group__4__Impl rule__ActorInstanceConfig__Group__5
+            // InternalConfig.g:2826:1: ( rule__ActorInstanceConfig__Group__4__Impl rule__ActorInstanceConfig__Group__5 )
+            // InternalConfig.g:2827:2: rule__ActorInstanceConfig__Group__4__Impl rule__ActorInstanceConfig__Group__5
             {
-            pushFollow(FOLLOW_rule__ActorInstanceConfig__Group__4__Impl_in_rule__ActorInstanceConfig__Group__45822);
+            pushFollow(FOLLOW_3);
             rule__ActorInstanceConfig__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ActorInstanceConfig__Group__5_in_rule__ActorInstanceConfig__Group__45825);
+            pushFollow(FOLLOW_2);
             rule__ActorInstanceConfig__Group__5();
 
             state._fsp--;
@@ -8780,22 +8780,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorInstanceConfig__Group__4__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2835:1: rule__ActorInstanceConfig__Group__4__Impl : ( '/' ) ;
+    // InternalConfig.g:2834:1: rule__ActorInstanceConfig__Group__4__Impl : ( '/' ) ;
     public final void rule__ActorInstanceConfig__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2839:1: ( ( '/' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2840:1: ( '/' )
+            // InternalConfig.g:2838:1: ( ( '/' ) )
+            // InternalConfig.g:2839:1: ( '/' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2840:1: ( '/' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2841:1: '/'
+            // InternalConfig.g:2839:1: ( '/' )
+            // InternalConfig.g:2840:1: '/'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getActorInstanceConfigAccess().getSolidusKeyword_4()); 
             }
-            match(input,30,FOLLOW_30_in_rule__ActorInstanceConfig__Group__4__Impl5853); if (state.failed) return ;
+            match(input,30,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getActorInstanceConfigAccess().getSolidusKeyword_4()); 
             }
@@ -8821,21 +8821,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorInstanceConfig__Group__5"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2854:1: rule__ActorInstanceConfig__Group__5 : rule__ActorInstanceConfig__Group__5__Impl rule__ActorInstanceConfig__Group__6 ;
+    // InternalConfig.g:2853:1: rule__ActorInstanceConfig__Group__5 : rule__ActorInstanceConfig__Group__5__Impl rule__ActorInstanceConfig__Group__6 ;
     public final void rule__ActorInstanceConfig__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2858:1: ( rule__ActorInstanceConfig__Group__5__Impl rule__ActorInstanceConfig__Group__6 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2859:2: rule__ActorInstanceConfig__Group__5__Impl rule__ActorInstanceConfig__Group__6
+            // InternalConfig.g:2857:1: ( rule__ActorInstanceConfig__Group__5__Impl rule__ActorInstanceConfig__Group__6 )
+            // InternalConfig.g:2858:2: rule__ActorInstanceConfig__Group__5__Impl rule__ActorInstanceConfig__Group__6
             {
-            pushFollow(FOLLOW_rule__ActorInstanceConfig__Group__5__Impl_in_rule__ActorInstanceConfig__Group__55884);
+            pushFollow(FOLLOW_4);
             rule__ActorInstanceConfig__Group__5__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ActorInstanceConfig__Group__6_in_rule__ActorInstanceConfig__Group__55887);
+            pushFollow(FOLLOW_2);
             rule__ActorInstanceConfig__Group__6();
 
             state._fsp--;
@@ -8859,25 +8859,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorInstanceConfig__Group__5__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2866:1: rule__ActorInstanceConfig__Group__5__Impl : ( ( rule__ActorInstanceConfig__PathAssignment_5 ) ) ;
+    // InternalConfig.g:2865:1: rule__ActorInstanceConfig__Group__5__Impl : ( ( rule__ActorInstanceConfig__PathAssignment_5 ) ) ;
     public final void rule__ActorInstanceConfig__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2870:1: ( ( ( rule__ActorInstanceConfig__PathAssignment_5 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2871:1: ( ( rule__ActorInstanceConfig__PathAssignment_5 ) )
+            // InternalConfig.g:2869:1: ( ( ( rule__ActorInstanceConfig__PathAssignment_5 ) ) )
+            // InternalConfig.g:2870:1: ( ( rule__ActorInstanceConfig__PathAssignment_5 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2871:1: ( ( rule__ActorInstanceConfig__PathAssignment_5 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2872:1: ( rule__ActorInstanceConfig__PathAssignment_5 )
+            // InternalConfig.g:2870:1: ( ( rule__ActorInstanceConfig__PathAssignment_5 ) )
+            // InternalConfig.g:2871:1: ( rule__ActorInstanceConfig__PathAssignment_5 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getActorInstanceConfigAccess().getPathAssignment_5()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2873:1: ( rule__ActorInstanceConfig__PathAssignment_5 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2873:2: rule__ActorInstanceConfig__PathAssignment_5
+            // InternalConfig.g:2872:1: ( rule__ActorInstanceConfig__PathAssignment_5 )
+            // InternalConfig.g:2872:2: rule__ActorInstanceConfig__PathAssignment_5
             {
-            pushFollow(FOLLOW_rule__ActorInstanceConfig__PathAssignment_5_in_rule__ActorInstanceConfig__Group__5__Impl5914);
+            pushFollow(FOLLOW_2);
             rule__ActorInstanceConfig__PathAssignment_5();
 
             state._fsp--;
@@ -8910,21 +8910,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorInstanceConfig__Group__6"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2883:1: rule__ActorInstanceConfig__Group__6 : rule__ActorInstanceConfig__Group__6__Impl rule__ActorInstanceConfig__Group__7 ;
+    // InternalConfig.g:2882:1: rule__ActorInstanceConfig__Group__6 : rule__ActorInstanceConfig__Group__6__Impl rule__ActorInstanceConfig__Group__7 ;
     public final void rule__ActorInstanceConfig__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2887:1: ( rule__ActorInstanceConfig__Group__6__Impl rule__ActorInstanceConfig__Group__7 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2888:2: rule__ActorInstanceConfig__Group__6__Impl rule__ActorInstanceConfig__Group__7
+            // InternalConfig.g:2886:1: ( rule__ActorInstanceConfig__Group__6__Impl rule__ActorInstanceConfig__Group__7 )
+            // InternalConfig.g:2887:2: rule__ActorInstanceConfig__Group__6__Impl rule__ActorInstanceConfig__Group__7
             {
-            pushFollow(FOLLOW_rule__ActorInstanceConfig__Group__6__Impl_in_rule__ActorInstanceConfig__Group__65944);
+            pushFollow(FOLLOW_17);
             rule__ActorInstanceConfig__Group__6__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ActorInstanceConfig__Group__7_in_rule__ActorInstanceConfig__Group__65947);
+            pushFollow(FOLLOW_2);
             rule__ActorInstanceConfig__Group__7();
 
             state._fsp--;
@@ -8948,22 +8948,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorInstanceConfig__Group__6__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2895:1: rule__ActorInstanceConfig__Group__6__Impl : ( '{' ) ;
+    // InternalConfig.g:2894:1: rule__ActorInstanceConfig__Group__6__Impl : ( '{' ) ;
     public final void rule__ActorInstanceConfig__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2899:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2900:1: ( '{' )
+            // InternalConfig.g:2898:1: ( ( '{' ) )
+            // InternalConfig.g:2899:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2900:1: ( '{' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2901:1: '{'
+            // InternalConfig.g:2899:1: ( '{' )
+            // InternalConfig.g:2900:1: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getActorInstanceConfigAccess().getLeftCurlyBracketKeyword_6()); 
             }
-            match(input,27,FOLLOW_27_in_rule__ActorInstanceConfig__Group__6__Impl5975); if (state.failed) return ;
+            match(input,27,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getActorInstanceConfigAccess().getLeftCurlyBracketKeyword_6()); 
             }
@@ -8989,21 +8989,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorInstanceConfig__Group__7"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2914:1: rule__ActorInstanceConfig__Group__7 : rule__ActorInstanceConfig__Group__7__Impl rule__ActorInstanceConfig__Group__8 ;
+    // InternalConfig.g:2913:1: rule__ActorInstanceConfig__Group__7 : rule__ActorInstanceConfig__Group__7__Impl rule__ActorInstanceConfig__Group__8 ;
     public final void rule__ActorInstanceConfig__Group__7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2918:1: ( rule__ActorInstanceConfig__Group__7__Impl rule__ActorInstanceConfig__Group__8 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2919:2: rule__ActorInstanceConfig__Group__7__Impl rule__ActorInstanceConfig__Group__8
+            // InternalConfig.g:2917:1: ( rule__ActorInstanceConfig__Group__7__Impl rule__ActorInstanceConfig__Group__8 )
+            // InternalConfig.g:2918:2: rule__ActorInstanceConfig__Group__7__Impl rule__ActorInstanceConfig__Group__8
             {
-            pushFollow(FOLLOW_rule__ActorInstanceConfig__Group__7__Impl_in_rule__ActorInstanceConfig__Group__76006);
+            pushFollow(FOLLOW_10);
             rule__ActorInstanceConfig__Group__7__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ActorInstanceConfig__Group__8_in_rule__ActorInstanceConfig__Group__76009);
+            pushFollow(FOLLOW_2);
             rule__ActorInstanceConfig__Group__8();
 
             state._fsp--;
@@ -9027,25 +9027,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorInstanceConfig__Group__7__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2926:1: rule__ActorInstanceConfig__Group__7__Impl : ( ( rule__ActorInstanceConfig__UnorderedGroup_7 ) ) ;
+    // InternalConfig.g:2925:1: rule__ActorInstanceConfig__Group__7__Impl : ( ( rule__ActorInstanceConfig__UnorderedGroup_7 ) ) ;
     public final void rule__ActorInstanceConfig__Group__7__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2930:1: ( ( ( rule__ActorInstanceConfig__UnorderedGroup_7 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2931:1: ( ( rule__ActorInstanceConfig__UnorderedGroup_7 ) )
+            // InternalConfig.g:2929:1: ( ( ( rule__ActorInstanceConfig__UnorderedGroup_7 ) ) )
+            // InternalConfig.g:2930:1: ( ( rule__ActorInstanceConfig__UnorderedGroup_7 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2931:1: ( ( rule__ActorInstanceConfig__UnorderedGroup_7 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2932:1: ( rule__ActorInstanceConfig__UnorderedGroup_7 )
+            // InternalConfig.g:2930:1: ( ( rule__ActorInstanceConfig__UnorderedGroup_7 ) )
+            // InternalConfig.g:2931:1: ( rule__ActorInstanceConfig__UnorderedGroup_7 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getActorInstanceConfigAccess().getUnorderedGroup_7()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2933:1: ( rule__ActorInstanceConfig__UnorderedGroup_7 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2933:2: rule__ActorInstanceConfig__UnorderedGroup_7
+            // InternalConfig.g:2932:1: ( rule__ActorInstanceConfig__UnorderedGroup_7 )
+            // InternalConfig.g:2932:2: rule__ActorInstanceConfig__UnorderedGroup_7
             {
-            pushFollow(FOLLOW_rule__ActorInstanceConfig__UnorderedGroup_7_in_rule__ActorInstanceConfig__Group__7__Impl6036);
+            pushFollow(FOLLOW_2);
             rule__ActorInstanceConfig__UnorderedGroup_7();
 
             state._fsp--;
@@ -9078,16 +9078,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorInstanceConfig__Group__8"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2943:1: rule__ActorInstanceConfig__Group__8 : rule__ActorInstanceConfig__Group__8__Impl ;
+    // InternalConfig.g:2942:1: rule__ActorInstanceConfig__Group__8 : rule__ActorInstanceConfig__Group__8__Impl ;
     public final void rule__ActorInstanceConfig__Group__8() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2947:1: ( rule__ActorInstanceConfig__Group__8__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2948:2: rule__ActorInstanceConfig__Group__8__Impl
+            // InternalConfig.g:2946:1: ( rule__ActorInstanceConfig__Group__8__Impl )
+            // InternalConfig.g:2947:2: rule__ActorInstanceConfig__Group__8__Impl
             {
-            pushFollow(FOLLOW_rule__ActorInstanceConfig__Group__8__Impl_in_rule__ActorInstanceConfig__Group__86066);
+            pushFollow(FOLLOW_2);
             rule__ActorInstanceConfig__Group__8__Impl();
 
             state._fsp--;
@@ -9111,22 +9111,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorInstanceConfig__Group__8__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2954:1: rule__ActorInstanceConfig__Group__8__Impl : ( '}' ) ;
+    // InternalConfig.g:2953:1: rule__ActorInstanceConfig__Group__8__Impl : ( '}' ) ;
     public final void rule__ActorInstanceConfig__Group__8__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2958:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2959:1: ( '}' )
+            // InternalConfig.g:2957:1: ( ( '}' ) )
+            // InternalConfig.g:2958:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2959:1: ( '}' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2960:1: '}'
+            // InternalConfig.g:2958:1: ( '}' )
+            // InternalConfig.g:2959:1: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getActorInstanceConfigAccess().getRightCurlyBracketKeyword_8()); 
             }
-            match(input,28,FOLLOW_28_in_rule__ActorInstanceConfig__Group__8__Impl6094); if (state.failed) return ;
+            match(input,28,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getActorInstanceConfigAccess().getRightCurlyBracketKeyword_8()); 
             }
@@ -9152,21 +9152,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClassConfig__Group__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2991:1: rule__ProtocolClassConfig__Group__0 : rule__ProtocolClassConfig__Group__0__Impl rule__ProtocolClassConfig__Group__1 ;
+    // InternalConfig.g:2990:1: rule__ProtocolClassConfig__Group__0 : rule__ProtocolClassConfig__Group__0__Impl rule__ProtocolClassConfig__Group__1 ;
     public final void rule__ProtocolClassConfig__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2995:1: ( rule__ProtocolClassConfig__Group__0__Impl rule__ProtocolClassConfig__Group__1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:2996:2: rule__ProtocolClassConfig__Group__0__Impl rule__ProtocolClassConfig__Group__1
+            // InternalConfig.g:2994:1: ( rule__ProtocolClassConfig__Group__0__Impl rule__ProtocolClassConfig__Group__1 )
+            // InternalConfig.g:2995:2: rule__ProtocolClassConfig__Group__0__Impl rule__ProtocolClassConfig__Group__1
             {
-            pushFollow(FOLLOW_rule__ProtocolClassConfig__Group__0__Impl_in_rule__ProtocolClassConfig__Group__06143);
+            pushFollow(FOLLOW_3);
             rule__ProtocolClassConfig__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ProtocolClassConfig__Group__1_in_rule__ProtocolClassConfig__Group__06146);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClassConfig__Group__1();
 
             state._fsp--;
@@ -9190,22 +9190,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClassConfig__Group__0__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3003:1: rule__ProtocolClassConfig__Group__0__Impl : ( 'ProtocolClassConfig' ) ;
+    // InternalConfig.g:3002:1: rule__ProtocolClassConfig__Group__0__Impl : ( 'ProtocolClassConfig' ) ;
     public final void rule__ProtocolClassConfig__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3007:1: ( ( 'ProtocolClassConfig' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3008:1: ( 'ProtocolClassConfig' )
+            // InternalConfig.g:3006:1: ( ( 'ProtocolClassConfig' ) )
+            // InternalConfig.g:3007:1: ( 'ProtocolClassConfig' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3008:1: ( 'ProtocolClassConfig' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3009:1: 'ProtocolClassConfig'
+            // InternalConfig.g:3007:1: ( 'ProtocolClassConfig' )
+            // InternalConfig.g:3008:1: 'ProtocolClassConfig'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getProtocolClassConfigAccess().getProtocolClassConfigKeyword_0()); 
             }
-            match(input,38,FOLLOW_38_in_rule__ProtocolClassConfig__Group__0__Impl6174); if (state.failed) return ;
+            match(input,38,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getProtocolClassConfigAccess().getProtocolClassConfigKeyword_0()); 
             }
@@ -9231,21 +9231,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClassConfig__Group__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3022:1: rule__ProtocolClassConfig__Group__1 : rule__ProtocolClassConfig__Group__1__Impl rule__ProtocolClassConfig__Group__2 ;
+    // InternalConfig.g:3021:1: rule__ProtocolClassConfig__Group__1 : rule__ProtocolClassConfig__Group__1__Impl rule__ProtocolClassConfig__Group__2 ;
     public final void rule__ProtocolClassConfig__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3026:1: ( rule__ProtocolClassConfig__Group__1__Impl rule__ProtocolClassConfig__Group__2 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3027:2: rule__ProtocolClassConfig__Group__1__Impl rule__ProtocolClassConfig__Group__2
+            // InternalConfig.g:3025:1: ( rule__ProtocolClassConfig__Group__1__Impl rule__ProtocolClassConfig__Group__2 )
+            // InternalConfig.g:3026:2: rule__ProtocolClassConfig__Group__1__Impl rule__ProtocolClassConfig__Group__2
             {
-            pushFollow(FOLLOW_rule__ProtocolClassConfig__Group__1__Impl_in_rule__ProtocolClassConfig__Group__16205);
+            pushFollow(FOLLOW_4);
             rule__ProtocolClassConfig__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ProtocolClassConfig__Group__2_in_rule__ProtocolClassConfig__Group__16208);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClassConfig__Group__2();
 
             state._fsp--;
@@ -9269,25 +9269,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClassConfig__Group__1__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3034:1: rule__ProtocolClassConfig__Group__1__Impl : ( ( rule__ProtocolClassConfig__ProtocolAssignment_1 ) ) ;
+    // InternalConfig.g:3033:1: rule__ProtocolClassConfig__Group__1__Impl : ( ( rule__ProtocolClassConfig__ProtocolAssignment_1 ) ) ;
     public final void rule__ProtocolClassConfig__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3038:1: ( ( ( rule__ProtocolClassConfig__ProtocolAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3039:1: ( ( rule__ProtocolClassConfig__ProtocolAssignment_1 ) )
+            // InternalConfig.g:3037:1: ( ( ( rule__ProtocolClassConfig__ProtocolAssignment_1 ) ) )
+            // InternalConfig.g:3038:1: ( ( rule__ProtocolClassConfig__ProtocolAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3039:1: ( ( rule__ProtocolClassConfig__ProtocolAssignment_1 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3040:1: ( rule__ProtocolClassConfig__ProtocolAssignment_1 )
+            // InternalConfig.g:3038:1: ( ( rule__ProtocolClassConfig__ProtocolAssignment_1 ) )
+            // InternalConfig.g:3039:1: ( rule__ProtocolClassConfig__ProtocolAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getProtocolClassConfigAccess().getProtocolAssignment_1()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3041:1: ( rule__ProtocolClassConfig__ProtocolAssignment_1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3041:2: rule__ProtocolClassConfig__ProtocolAssignment_1
+            // InternalConfig.g:3040:1: ( rule__ProtocolClassConfig__ProtocolAssignment_1 )
+            // InternalConfig.g:3040:2: rule__ProtocolClassConfig__ProtocolAssignment_1
             {
-            pushFollow(FOLLOW_rule__ProtocolClassConfig__ProtocolAssignment_1_in_rule__ProtocolClassConfig__Group__1__Impl6235);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClassConfig__ProtocolAssignment_1();
 
             state._fsp--;
@@ -9320,21 +9320,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClassConfig__Group__2"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3051:1: rule__ProtocolClassConfig__Group__2 : rule__ProtocolClassConfig__Group__2__Impl rule__ProtocolClassConfig__Group__3 ;
+    // InternalConfig.g:3050:1: rule__ProtocolClassConfig__Group__2 : rule__ProtocolClassConfig__Group__2__Impl rule__ProtocolClassConfig__Group__3 ;
     public final void rule__ProtocolClassConfig__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3055:1: ( rule__ProtocolClassConfig__Group__2__Impl rule__ProtocolClassConfig__Group__3 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3056:2: rule__ProtocolClassConfig__Group__2__Impl rule__ProtocolClassConfig__Group__3
+            // InternalConfig.g:3054:1: ( rule__ProtocolClassConfig__Group__2__Impl rule__ProtocolClassConfig__Group__3 )
+            // InternalConfig.g:3055:2: rule__ProtocolClassConfig__Group__2__Impl rule__ProtocolClassConfig__Group__3
             {
-            pushFollow(FOLLOW_rule__ProtocolClassConfig__Group__2__Impl_in_rule__ProtocolClassConfig__Group__26265);
+            pushFollow(FOLLOW_18);
             rule__ProtocolClassConfig__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ProtocolClassConfig__Group__3_in_rule__ProtocolClassConfig__Group__26268);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClassConfig__Group__3();
 
             state._fsp--;
@@ -9358,22 +9358,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClassConfig__Group__2__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3063:1: rule__ProtocolClassConfig__Group__2__Impl : ( '{' ) ;
+    // InternalConfig.g:3062:1: rule__ProtocolClassConfig__Group__2__Impl : ( '{' ) ;
     public final void rule__ProtocolClassConfig__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3067:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3068:1: ( '{' )
+            // InternalConfig.g:3066:1: ( ( '{' ) )
+            // InternalConfig.g:3067:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3068:1: ( '{' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3069:1: '{'
+            // InternalConfig.g:3067:1: ( '{' )
+            // InternalConfig.g:3068:1: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getProtocolClassConfigAccess().getLeftCurlyBracketKeyword_2()); 
             }
-            match(input,27,FOLLOW_27_in_rule__ProtocolClassConfig__Group__2__Impl6296); if (state.failed) return ;
+            match(input,27,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getProtocolClassConfigAccess().getLeftCurlyBracketKeyword_2()); 
             }
@@ -9399,21 +9399,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClassConfig__Group__3"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3082:1: rule__ProtocolClassConfig__Group__3 : rule__ProtocolClassConfig__Group__3__Impl rule__ProtocolClassConfig__Group__4 ;
+    // InternalConfig.g:3081:1: rule__ProtocolClassConfig__Group__3 : rule__ProtocolClassConfig__Group__3__Impl rule__ProtocolClassConfig__Group__4 ;
     public final void rule__ProtocolClassConfig__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3086:1: ( rule__ProtocolClassConfig__Group__3__Impl rule__ProtocolClassConfig__Group__4 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3087:2: rule__ProtocolClassConfig__Group__3__Impl rule__ProtocolClassConfig__Group__4
+            // InternalConfig.g:3085:1: ( rule__ProtocolClassConfig__Group__3__Impl rule__ProtocolClassConfig__Group__4 )
+            // InternalConfig.g:3086:2: rule__ProtocolClassConfig__Group__3__Impl rule__ProtocolClassConfig__Group__4
             {
-            pushFollow(FOLLOW_rule__ProtocolClassConfig__Group__3__Impl_in_rule__ProtocolClassConfig__Group__36327);
+            pushFollow(FOLLOW_10);
             rule__ProtocolClassConfig__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ProtocolClassConfig__Group__4_in_rule__ProtocolClassConfig__Group__36330);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClassConfig__Group__4();
 
             state._fsp--;
@@ -9437,25 +9437,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClassConfig__Group__3__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3094:1: rule__ProtocolClassConfig__Group__3__Impl : ( ( rule__ProtocolClassConfig__UnorderedGroup_3 ) ) ;
+    // InternalConfig.g:3093:1: rule__ProtocolClassConfig__Group__3__Impl : ( ( rule__ProtocolClassConfig__UnorderedGroup_3 ) ) ;
     public final void rule__ProtocolClassConfig__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3098:1: ( ( ( rule__ProtocolClassConfig__UnorderedGroup_3 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3099:1: ( ( rule__ProtocolClassConfig__UnorderedGroup_3 ) )
+            // InternalConfig.g:3097:1: ( ( ( rule__ProtocolClassConfig__UnorderedGroup_3 ) ) )
+            // InternalConfig.g:3098:1: ( ( rule__ProtocolClassConfig__UnorderedGroup_3 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3099:1: ( ( rule__ProtocolClassConfig__UnorderedGroup_3 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3100:1: ( rule__ProtocolClassConfig__UnorderedGroup_3 )
+            // InternalConfig.g:3098:1: ( ( rule__ProtocolClassConfig__UnorderedGroup_3 ) )
+            // InternalConfig.g:3099:1: ( rule__ProtocolClassConfig__UnorderedGroup_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getProtocolClassConfigAccess().getUnorderedGroup_3()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3101:1: ( rule__ProtocolClassConfig__UnorderedGroup_3 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3101:2: rule__ProtocolClassConfig__UnorderedGroup_3
+            // InternalConfig.g:3100:1: ( rule__ProtocolClassConfig__UnorderedGroup_3 )
+            // InternalConfig.g:3100:2: rule__ProtocolClassConfig__UnorderedGroup_3
             {
-            pushFollow(FOLLOW_rule__ProtocolClassConfig__UnorderedGroup_3_in_rule__ProtocolClassConfig__Group__3__Impl6357);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClassConfig__UnorderedGroup_3();
 
             state._fsp--;
@@ -9488,16 +9488,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClassConfig__Group__4"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3111:1: rule__ProtocolClassConfig__Group__4 : rule__ProtocolClassConfig__Group__4__Impl ;
+    // InternalConfig.g:3110:1: rule__ProtocolClassConfig__Group__4 : rule__ProtocolClassConfig__Group__4__Impl ;
     public final void rule__ProtocolClassConfig__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3115:1: ( rule__ProtocolClassConfig__Group__4__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3116:2: rule__ProtocolClassConfig__Group__4__Impl
+            // InternalConfig.g:3114:1: ( rule__ProtocolClassConfig__Group__4__Impl )
+            // InternalConfig.g:3115:2: rule__ProtocolClassConfig__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__ProtocolClassConfig__Group__4__Impl_in_rule__ProtocolClassConfig__Group__46387);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClassConfig__Group__4__Impl();
 
             state._fsp--;
@@ -9521,22 +9521,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClassConfig__Group__4__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3122:1: rule__ProtocolClassConfig__Group__4__Impl : ( '}' ) ;
+    // InternalConfig.g:3121:1: rule__ProtocolClassConfig__Group__4__Impl : ( '}' ) ;
     public final void rule__ProtocolClassConfig__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3126:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3127:1: ( '}' )
+            // InternalConfig.g:3125:1: ( ( '}' ) )
+            // InternalConfig.g:3126:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3127:1: ( '}' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3128:1: '}'
+            // InternalConfig.g:3126:1: ( '}' )
+            // InternalConfig.g:3127:1: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getProtocolClassConfigAccess().getRightCurlyBracketKeyword_4()); 
             }
-            match(input,28,FOLLOW_28_in_rule__ProtocolClassConfig__Group__4__Impl6415); if (state.failed) return ;
+            match(input,28,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getProtocolClassConfigAccess().getRightCurlyBracketKeyword_4()); 
             }
@@ -9562,21 +9562,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClassConfig__Group_3_0__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3151:1: rule__ProtocolClassConfig__Group_3_0__0 : rule__ProtocolClassConfig__Group_3_0__0__Impl rule__ProtocolClassConfig__Group_3_0__1 ;
+    // InternalConfig.g:3150:1: rule__ProtocolClassConfig__Group_3_0__0 : rule__ProtocolClassConfig__Group_3_0__0__Impl rule__ProtocolClassConfig__Group_3_0__1 ;
     public final void rule__ProtocolClassConfig__Group_3_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3155:1: ( rule__ProtocolClassConfig__Group_3_0__0__Impl rule__ProtocolClassConfig__Group_3_0__1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3156:2: rule__ProtocolClassConfig__Group_3_0__0__Impl rule__ProtocolClassConfig__Group_3_0__1
+            // InternalConfig.g:3154:1: ( rule__ProtocolClassConfig__Group_3_0__0__Impl rule__ProtocolClassConfig__Group_3_0__1 )
+            // InternalConfig.g:3155:2: rule__ProtocolClassConfig__Group_3_0__0__Impl rule__ProtocolClassConfig__Group_3_0__1
             {
-            pushFollow(FOLLOW_rule__ProtocolClassConfig__Group_3_0__0__Impl_in_rule__ProtocolClassConfig__Group_3_0__06456);
+            pushFollow(FOLLOW_19);
             rule__ProtocolClassConfig__Group_3_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ProtocolClassConfig__Group_3_0__1_in_rule__ProtocolClassConfig__Group_3_0__06459);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClassConfig__Group_3_0__1();
 
             state._fsp--;
@@ -9600,22 +9600,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClassConfig__Group_3_0__0__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3163:1: rule__ProtocolClassConfig__Group_3_0__0__Impl : ( 'regular' ) ;
+    // InternalConfig.g:3162:1: rule__ProtocolClassConfig__Group_3_0__0__Impl : ( 'regular' ) ;
     public final void rule__ProtocolClassConfig__Group_3_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3167:1: ( ( 'regular' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3168:1: ( 'regular' )
+            // InternalConfig.g:3166:1: ( ( 'regular' ) )
+            // InternalConfig.g:3167:1: ( 'regular' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3168:1: ( 'regular' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3169:1: 'regular'
+            // InternalConfig.g:3167:1: ( 'regular' )
+            // InternalConfig.g:3168:1: 'regular'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getProtocolClassConfigAccess().getRegularKeyword_3_0_0()); 
             }
-            match(input,39,FOLLOW_39_in_rule__ProtocolClassConfig__Group_3_0__0__Impl6487); if (state.failed) return ;
+            match(input,39,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getProtocolClassConfigAccess().getRegularKeyword_3_0_0()); 
             }
@@ -9641,16 +9641,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClassConfig__Group_3_0__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3182:1: rule__ProtocolClassConfig__Group_3_0__1 : rule__ProtocolClassConfig__Group_3_0__1__Impl ;
+    // InternalConfig.g:3181:1: rule__ProtocolClassConfig__Group_3_0__1 : rule__ProtocolClassConfig__Group_3_0__1__Impl ;
     public final void rule__ProtocolClassConfig__Group_3_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3186:1: ( rule__ProtocolClassConfig__Group_3_0__1__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3187:2: rule__ProtocolClassConfig__Group_3_0__1__Impl
+            // InternalConfig.g:3185:1: ( rule__ProtocolClassConfig__Group_3_0__1__Impl )
+            // InternalConfig.g:3186:2: rule__ProtocolClassConfig__Group_3_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__ProtocolClassConfig__Group_3_0__1__Impl_in_rule__ProtocolClassConfig__Group_3_0__16518);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClassConfig__Group_3_0__1__Impl();
 
             state._fsp--;
@@ -9674,25 +9674,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClassConfig__Group_3_0__1__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3193:1: rule__ProtocolClassConfig__Group_3_0__1__Impl : ( ( rule__ProtocolClassConfig__RegularAssignment_3_0_1 ) ) ;
+    // InternalConfig.g:3192:1: rule__ProtocolClassConfig__Group_3_0__1__Impl : ( ( rule__ProtocolClassConfig__RegularAssignment_3_0_1 ) ) ;
     public final void rule__ProtocolClassConfig__Group_3_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3197:1: ( ( ( rule__ProtocolClassConfig__RegularAssignment_3_0_1 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3198:1: ( ( rule__ProtocolClassConfig__RegularAssignment_3_0_1 ) )
+            // InternalConfig.g:3196:1: ( ( ( rule__ProtocolClassConfig__RegularAssignment_3_0_1 ) ) )
+            // InternalConfig.g:3197:1: ( ( rule__ProtocolClassConfig__RegularAssignment_3_0_1 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3198:1: ( ( rule__ProtocolClassConfig__RegularAssignment_3_0_1 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3199:1: ( rule__ProtocolClassConfig__RegularAssignment_3_0_1 )
+            // InternalConfig.g:3197:1: ( ( rule__ProtocolClassConfig__RegularAssignment_3_0_1 ) )
+            // InternalConfig.g:3198:1: ( rule__ProtocolClassConfig__RegularAssignment_3_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getProtocolClassConfigAccess().getRegularAssignment_3_0_1()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3200:1: ( rule__ProtocolClassConfig__RegularAssignment_3_0_1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3200:2: rule__ProtocolClassConfig__RegularAssignment_3_0_1
+            // InternalConfig.g:3199:1: ( rule__ProtocolClassConfig__RegularAssignment_3_0_1 )
+            // InternalConfig.g:3199:2: rule__ProtocolClassConfig__RegularAssignment_3_0_1
             {
-            pushFollow(FOLLOW_rule__ProtocolClassConfig__RegularAssignment_3_0_1_in_rule__ProtocolClassConfig__Group_3_0__1__Impl6545);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClassConfig__RegularAssignment_3_0_1();
 
             state._fsp--;
@@ -9725,21 +9725,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClassConfig__Group_3_1__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3214:1: rule__ProtocolClassConfig__Group_3_1__0 : rule__ProtocolClassConfig__Group_3_1__0__Impl rule__ProtocolClassConfig__Group_3_1__1 ;
+    // InternalConfig.g:3213:1: rule__ProtocolClassConfig__Group_3_1__0 : rule__ProtocolClassConfig__Group_3_1__0__Impl rule__ProtocolClassConfig__Group_3_1__1 ;
     public final void rule__ProtocolClassConfig__Group_3_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3218:1: ( rule__ProtocolClassConfig__Group_3_1__0__Impl rule__ProtocolClassConfig__Group_3_1__1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3219:2: rule__ProtocolClassConfig__Group_3_1__0__Impl rule__ProtocolClassConfig__Group_3_1__1
+            // InternalConfig.g:3217:1: ( rule__ProtocolClassConfig__Group_3_1__0__Impl rule__ProtocolClassConfig__Group_3_1__1 )
+            // InternalConfig.g:3218:2: rule__ProtocolClassConfig__Group_3_1__0__Impl rule__ProtocolClassConfig__Group_3_1__1
             {
-            pushFollow(FOLLOW_rule__ProtocolClassConfig__Group_3_1__0__Impl_in_rule__ProtocolClassConfig__Group_3_1__06579);
+            pushFollow(FOLLOW_19);
             rule__ProtocolClassConfig__Group_3_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ProtocolClassConfig__Group_3_1__1_in_rule__ProtocolClassConfig__Group_3_1__06582);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClassConfig__Group_3_1__1();
 
             state._fsp--;
@@ -9763,25 +9763,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClassConfig__Group_3_1__0__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3226:1: rule__ProtocolClassConfig__Group_3_1__0__Impl : ( ( rule__ProtocolClassConfig__Alternatives_3_1_0 ) ) ;
+    // InternalConfig.g:3225:1: rule__ProtocolClassConfig__Group_3_1__0__Impl : ( ( rule__ProtocolClassConfig__Alternatives_3_1_0 ) ) ;
     public final void rule__ProtocolClassConfig__Group_3_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3230:1: ( ( ( rule__ProtocolClassConfig__Alternatives_3_1_0 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3231:1: ( ( rule__ProtocolClassConfig__Alternatives_3_1_0 ) )
+            // InternalConfig.g:3229:1: ( ( ( rule__ProtocolClassConfig__Alternatives_3_1_0 ) ) )
+            // InternalConfig.g:3230:1: ( ( rule__ProtocolClassConfig__Alternatives_3_1_0 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3231:1: ( ( rule__ProtocolClassConfig__Alternatives_3_1_0 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3232:1: ( rule__ProtocolClassConfig__Alternatives_3_1_0 )
+            // InternalConfig.g:3230:1: ( ( rule__ProtocolClassConfig__Alternatives_3_1_0 ) )
+            // InternalConfig.g:3231:1: ( rule__ProtocolClassConfig__Alternatives_3_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getProtocolClassConfigAccess().getAlternatives_3_1_0()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3233:1: ( rule__ProtocolClassConfig__Alternatives_3_1_0 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3233:2: rule__ProtocolClassConfig__Alternatives_3_1_0
+            // InternalConfig.g:3232:1: ( rule__ProtocolClassConfig__Alternatives_3_1_0 )
+            // InternalConfig.g:3232:2: rule__ProtocolClassConfig__Alternatives_3_1_0
             {
-            pushFollow(FOLLOW_rule__ProtocolClassConfig__Alternatives_3_1_0_in_rule__ProtocolClassConfig__Group_3_1__0__Impl6609);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClassConfig__Alternatives_3_1_0();
 
             state._fsp--;
@@ -9814,16 +9814,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClassConfig__Group_3_1__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3243:1: rule__ProtocolClassConfig__Group_3_1__1 : rule__ProtocolClassConfig__Group_3_1__1__Impl ;
+    // InternalConfig.g:3242:1: rule__ProtocolClassConfig__Group_3_1__1 : rule__ProtocolClassConfig__Group_3_1__1__Impl ;
     public final void rule__ProtocolClassConfig__Group_3_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3247:1: ( rule__ProtocolClassConfig__Group_3_1__1__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3248:2: rule__ProtocolClassConfig__Group_3_1__1__Impl
+            // InternalConfig.g:3246:1: ( rule__ProtocolClassConfig__Group_3_1__1__Impl )
+            // InternalConfig.g:3247:2: rule__ProtocolClassConfig__Group_3_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__ProtocolClassConfig__Group_3_1__1__Impl_in_rule__ProtocolClassConfig__Group_3_1__16639);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClassConfig__Group_3_1__1__Impl();
 
             state._fsp--;
@@ -9847,25 +9847,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClassConfig__Group_3_1__1__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3254:1: rule__ProtocolClassConfig__Group_3_1__1__Impl : ( ( rule__ProtocolClassConfig__ConjugatedAssignment_3_1_1 ) ) ;
+    // InternalConfig.g:3253:1: rule__ProtocolClassConfig__Group_3_1__1__Impl : ( ( rule__ProtocolClassConfig__ConjugatedAssignment_3_1_1 ) ) ;
     public final void rule__ProtocolClassConfig__Group_3_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3258:1: ( ( ( rule__ProtocolClassConfig__ConjugatedAssignment_3_1_1 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3259:1: ( ( rule__ProtocolClassConfig__ConjugatedAssignment_3_1_1 ) )
+            // InternalConfig.g:3257:1: ( ( ( rule__ProtocolClassConfig__ConjugatedAssignment_3_1_1 ) ) )
+            // InternalConfig.g:3258:1: ( ( rule__ProtocolClassConfig__ConjugatedAssignment_3_1_1 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3259:1: ( ( rule__ProtocolClassConfig__ConjugatedAssignment_3_1_1 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3260:1: ( rule__ProtocolClassConfig__ConjugatedAssignment_3_1_1 )
+            // InternalConfig.g:3258:1: ( ( rule__ProtocolClassConfig__ConjugatedAssignment_3_1_1 ) )
+            // InternalConfig.g:3259:1: ( rule__ProtocolClassConfig__ConjugatedAssignment_3_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getProtocolClassConfigAccess().getConjugatedAssignment_3_1_1()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3261:1: ( rule__ProtocolClassConfig__ConjugatedAssignment_3_1_1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3261:2: rule__ProtocolClassConfig__ConjugatedAssignment_3_1_1
+            // InternalConfig.g:3260:1: ( rule__ProtocolClassConfig__ConjugatedAssignment_3_1_1 )
+            // InternalConfig.g:3260:2: rule__ProtocolClassConfig__ConjugatedAssignment_3_1_1
             {
-            pushFollow(FOLLOW_rule__ProtocolClassConfig__ConjugatedAssignment_3_1_1_in_rule__ProtocolClassConfig__Group_3_1__1__Impl6666);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClassConfig__ConjugatedAssignment_3_1_1();
 
             state._fsp--;
@@ -9898,21 +9898,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortClassConfig__Group__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3275:1: rule__PortClassConfig__Group__0 : rule__PortClassConfig__Group__0__Impl rule__PortClassConfig__Group__1 ;
+    // InternalConfig.g:3274:1: rule__PortClassConfig__Group__0 : rule__PortClassConfig__Group__0__Impl rule__PortClassConfig__Group__1 ;
     public final void rule__PortClassConfig__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3279:1: ( rule__PortClassConfig__Group__0__Impl rule__PortClassConfig__Group__1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3280:2: rule__PortClassConfig__Group__0__Impl rule__PortClassConfig__Group__1
+            // InternalConfig.g:3278:1: ( rule__PortClassConfig__Group__0__Impl rule__PortClassConfig__Group__1 )
+            // InternalConfig.g:3279:2: rule__PortClassConfig__Group__0__Impl rule__PortClassConfig__Group__1
             {
-            pushFollow(FOLLOW_rule__PortClassConfig__Group__0__Impl_in_rule__PortClassConfig__Group__06700);
+            pushFollow(FOLLOW_19);
             rule__PortClassConfig__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__PortClassConfig__Group__1_in_rule__PortClassConfig__Group__06703);
+            pushFollow(FOLLOW_2);
             rule__PortClassConfig__Group__1();
 
             state._fsp--;
@@ -9936,23 +9936,23 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortClassConfig__Group__0__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3287:1: rule__PortClassConfig__Group__0__Impl : ( () ) ;
+    // InternalConfig.g:3286:1: rule__PortClassConfig__Group__0__Impl : ( () ) ;
     public final void rule__PortClassConfig__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3291:1: ( ( () ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3292:1: ( () )
+            // InternalConfig.g:3290:1: ( ( () ) )
+            // InternalConfig.g:3291:1: ( () )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3292:1: ( () )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3293:1: ()
+            // InternalConfig.g:3291:1: ( () )
+            // InternalConfig.g:3292:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPortClassConfigAccess().getPortClassConfigAction_0()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3294:1: ()
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3296:1: 
+            // InternalConfig.g:3293:1: ()
+            // InternalConfig.g:3295:1: 
             {
             }
 
@@ -9977,21 +9977,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortClassConfig__Group__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3306:1: rule__PortClassConfig__Group__1 : rule__PortClassConfig__Group__1__Impl rule__PortClassConfig__Group__2 ;
+    // InternalConfig.g:3305:1: rule__PortClassConfig__Group__1 : rule__PortClassConfig__Group__1__Impl rule__PortClassConfig__Group__2 ;
     public final void rule__PortClassConfig__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3310:1: ( rule__PortClassConfig__Group__1__Impl rule__PortClassConfig__Group__2 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3311:2: rule__PortClassConfig__Group__1__Impl rule__PortClassConfig__Group__2
+            // InternalConfig.g:3309:1: ( rule__PortClassConfig__Group__1__Impl rule__PortClassConfig__Group__2 )
+            // InternalConfig.g:3310:2: rule__PortClassConfig__Group__1__Impl rule__PortClassConfig__Group__2
             {
-            pushFollow(FOLLOW_rule__PortClassConfig__Group__1__Impl_in_rule__PortClassConfig__Group__16761);
+            pushFollow(FOLLOW_4);
             rule__PortClassConfig__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__PortClassConfig__Group__2_in_rule__PortClassConfig__Group__16764);
+            pushFollow(FOLLOW_2);
             rule__PortClassConfig__Group__2();
 
             state._fsp--;
@@ -10015,22 +10015,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortClassConfig__Group__1__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3318:1: rule__PortClassConfig__Group__1__Impl : ( 'Port' ) ;
+    // InternalConfig.g:3317:1: rule__PortClassConfig__Group__1__Impl : ( 'Port' ) ;
     public final void rule__PortClassConfig__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3322:1: ( ( 'Port' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3323:1: ( 'Port' )
+            // InternalConfig.g:3321:1: ( ( 'Port' ) )
+            // InternalConfig.g:3322:1: ( 'Port' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3323:1: ( 'Port' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3324:1: 'Port'
+            // InternalConfig.g:3322:1: ( 'Port' )
+            // InternalConfig.g:3323:1: 'Port'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPortClassConfigAccess().getPortKeyword_1()); 
             }
-            match(input,40,FOLLOW_40_in_rule__PortClassConfig__Group__1__Impl6792); if (state.failed) return ;
+            match(input,40,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getPortClassConfigAccess().getPortKeyword_1()); 
             }
@@ -10056,21 +10056,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortClassConfig__Group__2"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3337:1: rule__PortClassConfig__Group__2 : rule__PortClassConfig__Group__2__Impl rule__PortClassConfig__Group__3 ;
+    // InternalConfig.g:3336:1: rule__PortClassConfig__Group__2 : rule__PortClassConfig__Group__2__Impl rule__PortClassConfig__Group__3 ;
     public final void rule__PortClassConfig__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3341:1: ( rule__PortClassConfig__Group__2__Impl rule__PortClassConfig__Group__3 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3342:2: rule__PortClassConfig__Group__2__Impl rule__PortClassConfig__Group__3
+            // InternalConfig.g:3340:1: ( rule__PortClassConfig__Group__2__Impl rule__PortClassConfig__Group__3 )
+            // InternalConfig.g:3341:2: rule__PortClassConfig__Group__2__Impl rule__PortClassConfig__Group__3
             {
-            pushFollow(FOLLOW_rule__PortClassConfig__Group__2__Impl_in_rule__PortClassConfig__Group__26823);
+            pushFollow(FOLLOW_15);
             rule__PortClassConfig__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__PortClassConfig__Group__3_in_rule__PortClassConfig__Group__26826);
+            pushFollow(FOLLOW_2);
             rule__PortClassConfig__Group__3();
 
             state._fsp--;
@@ -10094,22 +10094,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortClassConfig__Group__2__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3349:1: rule__PortClassConfig__Group__2__Impl : ( '{' ) ;
+    // InternalConfig.g:3348:1: rule__PortClassConfig__Group__2__Impl : ( '{' ) ;
     public final void rule__PortClassConfig__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3353:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3354:1: ( '{' )
+            // InternalConfig.g:3352:1: ( ( '{' ) )
+            // InternalConfig.g:3353:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3354:1: ( '{' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3355:1: '{'
+            // InternalConfig.g:3353:1: ( '{' )
+            // InternalConfig.g:3354:1: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPortClassConfigAccess().getLeftCurlyBracketKeyword_2()); 
             }
-            match(input,27,FOLLOW_27_in_rule__PortClassConfig__Group__2__Impl6854); if (state.failed) return ;
+            match(input,27,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getPortClassConfigAccess().getLeftCurlyBracketKeyword_2()); 
             }
@@ -10135,21 +10135,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortClassConfig__Group__3"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3368:1: rule__PortClassConfig__Group__3 : rule__PortClassConfig__Group__3__Impl rule__PortClassConfig__Group__4 ;
+    // InternalConfig.g:3367:1: rule__PortClassConfig__Group__3 : rule__PortClassConfig__Group__3__Impl rule__PortClassConfig__Group__4 ;
     public final void rule__PortClassConfig__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3372:1: ( rule__PortClassConfig__Group__3__Impl rule__PortClassConfig__Group__4 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3373:2: rule__PortClassConfig__Group__3__Impl rule__PortClassConfig__Group__4
+            // InternalConfig.g:3371:1: ( rule__PortClassConfig__Group__3__Impl rule__PortClassConfig__Group__4 )
+            // InternalConfig.g:3372:2: rule__PortClassConfig__Group__3__Impl rule__PortClassConfig__Group__4
             {
-            pushFollow(FOLLOW_rule__PortClassConfig__Group__3__Impl_in_rule__PortClassConfig__Group__36885);
+            pushFollow(FOLLOW_15);
             rule__PortClassConfig__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__PortClassConfig__Group__4_in_rule__PortClassConfig__Group__36888);
+            pushFollow(FOLLOW_2);
             rule__PortClassConfig__Group__4();
 
             state._fsp--;
@@ -10173,22 +10173,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortClassConfig__Group__3__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3380:1: rule__PortClassConfig__Group__3__Impl : ( ( rule__PortClassConfig__AttributesAssignment_3 )* ) ;
+    // InternalConfig.g:3379:1: rule__PortClassConfig__Group__3__Impl : ( ( rule__PortClassConfig__AttributesAssignment_3 )* ) ;
     public final void rule__PortClassConfig__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3384:1: ( ( ( rule__PortClassConfig__AttributesAssignment_3 )* ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3385:1: ( ( rule__PortClassConfig__AttributesAssignment_3 )* )
+            // InternalConfig.g:3383:1: ( ( ( rule__PortClassConfig__AttributesAssignment_3 )* ) )
+            // InternalConfig.g:3384:1: ( ( rule__PortClassConfig__AttributesAssignment_3 )* )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3385:1: ( ( rule__PortClassConfig__AttributesAssignment_3 )* )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3386:1: ( rule__PortClassConfig__AttributesAssignment_3 )*
+            // InternalConfig.g:3384:1: ( ( rule__PortClassConfig__AttributesAssignment_3 )* )
+            // InternalConfig.g:3385:1: ( rule__PortClassConfig__AttributesAssignment_3 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPortClassConfigAccess().getAttributesAssignment_3()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3387:1: ( rule__PortClassConfig__AttributesAssignment_3 )*
+            // InternalConfig.g:3386:1: ( rule__PortClassConfig__AttributesAssignment_3 )*
             loop25:
             do {
                 int alt25=2;
@@ -10201,9 +10201,9 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
                 switch (alt25) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3387:2: rule__PortClassConfig__AttributesAssignment_3
+            	    // InternalConfig.g:3386:2: rule__PortClassConfig__AttributesAssignment_3
             	    {
-            	    pushFollow(FOLLOW_rule__PortClassConfig__AttributesAssignment_3_in_rule__PortClassConfig__Group__3__Impl6915);
+            	    pushFollow(FOLLOW_16);
             	    rule__PortClassConfig__AttributesAssignment_3();
 
             	    state._fsp--;
@@ -10242,16 +10242,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortClassConfig__Group__4"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3397:1: rule__PortClassConfig__Group__4 : rule__PortClassConfig__Group__4__Impl ;
+    // InternalConfig.g:3396:1: rule__PortClassConfig__Group__4 : rule__PortClassConfig__Group__4__Impl ;
     public final void rule__PortClassConfig__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3401:1: ( rule__PortClassConfig__Group__4__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3402:2: rule__PortClassConfig__Group__4__Impl
+            // InternalConfig.g:3400:1: ( rule__PortClassConfig__Group__4__Impl )
+            // InternalConfig.g:3401:2: rule__PortClassConfig__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__PortClassConfig__Group__4__Impl_in_rule__PortClassConfig__Group__46946);
+            pushFollow(FOLLOW_2);
             rule__PortClassConfig__Group__4__Impl();
 
             state._fsp--;
@@ -10275,22 +10275,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortClassConfig__Group__4__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3408:1: rule__PortClassConfig__Group__4__Impl : ( '}' ) ;
+    // InternalConfig.g:3407:1: rule__PortClassConfig__Group__4__Impl : ( '}' ) ;
     public final void rule__PortClassConfig__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3412:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3413:1: ( '}' )
+            // InternalConfig.g:3411:1: ( ( '}' ) )
+            // InternalConfig.g:3412:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3413:1: ( '}' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3414:1: '}'
+            // InternalConfig.g:3412:1: ( '}' )
+            // InternalConfig.g:3413:1: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPortClassConfigAccess().getRightCurlyBracketKeyword_4()); 
             }
-            match(input,28,FOLLOW_28_in_rule__PortClassConfig__Group__4__Impl6974); if (state.failed) return ;
+            match(input,28,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getPortClassConfigAccess().getRightCurlyBracketKeyword_4()); 
             }
@@ -10316,21 +10316,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortInstanceConfig__Group__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3437:1: rule__PortInstanceConfig__Group__0 : rule__PortInstanceConfig__Group__0__Impl rule__PortInstanceConfig__Group__1 ;
+    // InternalConfig.g:3436:1: rule__PortInstanceConfig__Group__0 : rule__PortInstanceConfig__Group__0__Impl rule__PortInstanceConfig__Group__1 ;
     public final void rule__PortInstanceConfig__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3441:1: ( rule__PortInstanceConfig__Group__0__Impl rule__PortInstanceConfig__Group__1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3442:2: rule__PortInstanceConfig__Group__0__Impl rule__PortInstanceConfig__Group__1
+            // InternalConfig.g:3440:1: ( rule__PortInstanceConfig__Group__0__Impl rule__PortInstanceConfig__Group__1 )
+            // InternalConfig.g:3441:2: rule__PortInstanceConfig__Group__0__Impl rule__PortInstanceConfig__Group__1
             {
-            pushFollow(FOLLOW_rule__PortInstanceConfig__Group__0__Impl_in_rule__PortInstanceConfig__Group__07015);
+            pushFollow(FOLLOW_3);
             rule__PortInstanceConfig__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__PortInstanceConfig__Group__1_in_rule__PortInstanceConfig__Group__07018);
+            pushFollow(FOLLOW_2);
             rule__PortInstanceConfig__Group__1();
 
             state._fsp--;
@@ -10354,22 +10354,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortInstanceConfig__Group__0__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3449:1: rule__PortInstanceConfig__Group__0__Impl : ( 'InterfaceItem' ) ;
+    // InternalConfig.g:3448:1: rule__PortInstanceConfig__Group__0__Impl : ( 'InterfaceItem' ) ;
     public final void rule__PortInstanceConfig__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3453:1: ( ( 'InterfaceItem' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3454:1: ( 'InterfaceItem' )
+            // InternalConfig.g:3452:1: ( ( 'InterfaceItem' ) )
+            // InternalConfig.g:3453:1: ( 'InterfaceItem' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3454:1: ( 'InterfaceItem' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3455:1: 'InterfaceItem'
+            // InternalConfig.g:3453:1: ( 'InterfaceItem' )
+            // InternalConfig.g:3454:1: 'InterfaceItem'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPortInstanceConfigAccess().getInterfaceItemKeyword_0()); 
             }
-            match(input,41,FOLLOW_41_in_rule__PortInstanceConfig__Group__0__Impl7046); if (state.failed) return ;
+            match(input,41,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getPortInstanceConfigAccess().getInterfaceItemKeyword_0()); 
             }
@@ -10395,21 +10395,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortInstanceConfig__Group__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3468:1: rule__PortInstanceConfig__Group__1 : rule__PortInstanceConfig__Group__1__Impl rule__PortInstanceConfig__Group__2 ;
+    // InternalConfig.g:3467:1: rule__PortInstanceConfig__Group__1 : rule__PortInstanceConfig__Group__1__Impl rule__PortInstanceConfig__Group__2 ;
     public final void rule__PortInstanceConfig__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3472:1: ( rule__PortInstanceConfig__Group__1__Impl rule__PortInstanceConfig__Group__2 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3473:2: rule__PortInstanceConfig__Group__1__Impl rule__PortInstanceConfig__Group__2
+            // InternalConfig.g:3471:1: ( rule__PortInstanceConfig__Group__1__Impl rule__PortInstanceConfig__Group__2 )
+            // InternalConfig.g:3472:2: rule__PortInstanceConfig__Group__1__Impl rule__PortInstanceConfig__Group__2
             {
-            pushFollow(FOLLOW_rule__PortInstanceConfig__Group__1__Impl_in_rule__PortInstanceConfig__Group__17077);
+            pushFollow(FOLLOW_4);
             rule__PortInstanceConfig__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__PortInstanceConfig__Group__2_in_rule__PortInstanceConfig__Group__17080);
+            pushFollow(FOLLOW_2);
             rule__PortInstanceConfig__Group__2();
 
             state._fsp--;
@@ -10433,25 +10433,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortInstanceConfig__Group__1__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3480:1: rule__PortInstanceConfig__Group__1__Impl : ( ( rule__PortInstanceConfig__ItemAssignment_1 ) ) ;
+    // InternalConfig.g:3479:1: rule__PortInstanceConfig__Group__1__Impl : ( ( rule__PortInstanceConfig__ItemAssignment_1 ) ) ;
     public final void rule__PortInstanceConfig__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3484:1: ( ( ( rule__PortInstanceConfig__ItemAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3485:1: ( ( rule__PortInstanceConfig__ItemAssignment_1 ) )
+            // InternalConfig.g:3483:1: ( ( ( rule__PortInstanceConfig__ItemAssignment_1 ) ) )
+            // InternalConfig.g:3484:1: ( ( rule__PortInstanceConfig__ItemAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3485:1: ( ( rule__PortInstanceConfig__ItemAssignment_1 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3486:1: ( rule__PortInstanceConfig__ItemAssignment_1 )
+            // InternalConfig.g:3484:1: ( ( rule__PortInstanceConfig__ItemAssignment_1 ) )
+            // InternalConfig.g:3485:1: ( rule__PortInstanceConfig__ItemAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPortInstanceConfigAccess().getItemAssignment_1()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3487:1: ( rule__PortInstanceConfig__ItemAssignment_1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3487:2: rule__PortInstanceConfig__ItemAssignment_1
+            // InternalConfig.g:3486:1: ( rule__PortInstanceConfig__ItemAssignment_1 )
+            // InternalConfig.g:3486:2: rule__PortInstanceConfig__ItemAssignment_1
             {
-            pushFollow(FOLLOW_rule__PortInstanceConfig__ItemAssignment_1_in_rule__PortInstanceConfig__Group__1__Impl7107);
+            pushFollow(FOLLOW_2);
             rule__PortInstanceConfig__ItemAssignment_1();
 
             state._fsp--;
@@ -10484,21 +10484,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortInstanceConfig__Group__2"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3497:1: rule__PortInstanceConfig__Group__2 : rule__PortInstanceConfig__Group__2__Impl rule__PortInstanceConfig__Group__3 ;
+    // InternalConfig.g:3496:1: rule__PortInstanceConfig__Group__2 : rule__PortInstanceConfig__Group__2__Impl rule__PortInstanceConfig__Group__3 ;
     public final void rule__PortInstanceConfig__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3501:1: ( rule__PortInstanceConfig__Group__2__Impl rule__PortInstanceConfig__Group__3 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3502:2: rule__PortInstanceConfig__Group__2__Impl rule__PortInstanceConfig__Group__3
+            // InternalConfig.g:3500:1: ( rule__PortInstanceConfig__Group__2__Impl rule__PortInstanceConfig__Group__3 )
+            // InternalConfig.g:3501:2: rule__PortInstanceConfig__Group__2__Impl rule__PortInstanceConfig__Group__3
             {
-            pushFollow(FOLLOW_rule__PortInstanceConfig__Group__2__Impl_in_rule__PortInstanceConfig__Group__27137);
+            pushFollow(FOLLOW_15);
             rule__PortInstanceConfig__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__PortInstanceConfig__Group__3_in_rule__PortInstanceConfig__Group__27140);
+            pushFollow(FOLLOW_2);
             rule__PortInstanceConfig__Group__3();
 
             state._fsp--;
@@ -10522,22 +10522,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortInstanceConfig__Group__2__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3509:1: rule__PortInstanceConfig__Group__2__Impl : ( '{' ) ;
+    // InternalConfig.g:3508:1: rule__PortInstanceConfig__Group__2__Impl : ( '{' ) ;
     public final void rule__PortInstanceConfig__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3513:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3514:1: ( '{' )
+            // InternalConfig.g:3512:1: ( ( '{' ) )
+            // InternalConfig.g:3513:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3514:1: ( '{' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3515:1: '{'
+            // InternalConfig.g:3513:1: ( '{' )
+            // InternalConfig.g:3514:1: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPortInstanceConfigAccess().getLeftCurlyBracketKeyword_2()); 
             }
-            match(input,27,FOLLOW_27_in_rule__PortInstanceConfig__Group__2__Impl7168); if (state.failed) return ;
+            match(input,27,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getPortInstanceConfigAccess().getLeftCurlyBracketKeyword_2()); 
             }
@@ -10563,21 +10563,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortInstanceConfig__Group__3"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3528:1: rule__PortInstanceConfig__Group__3 : rule__PortInstanceConfig__Group__3__Impl rule__PortInstanceConfig__Group__4 ;
+    // InternalConfig.g:3527:1: rule__PortInstanceConfig__Group__3 : rule__PortInstanceConfig__Group__3__Impl rule__PortInstanceConfig__Group__4 ;
     public final void rule__PortInstanceConfig__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3532:1: ( rule__PortInstanceConfig__Group__3__Impl rule__PortInstanceConfig__Group__4 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3533:2: rule__PortInstanceConfig__Group__3__Impl rule__PortInstanceConfig__Group__4
+            // InternalConfig.g:3531:1: ( rule__PortInstanceConfig__Group__3__Impl rule__PortInstanceConfig__Group__4 )
+            // InternalConfig.g:3532:2: rule__PortInstanceConfig__Group__3__Impl rule__PortInstanceConfig__Group__4
             {
-            pushFollow(FOLLOW_rule__PortInstanceConfig__Group__3__Impl_in_rule__PortInstanceConfig__Group__37199);
+            pushFollow(FOLLOW_15);
             rule__PortInstanceConfig__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__PortInstanceConfig__Group__4_in_rule__PortInstanceConfig__Group__37202);
+            pushFollow(FOLLOW_2);
             rule__PortInstanceConfig__Group__4();
 
             state._fsp--;
@@ -10601,22 +10601,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortInstanceConfig__Group__3__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3540:1: rule__PortInstanceConfig__Group__3__Impl : ( ( rule__PortInstanceConfig__AttributesAssignment_3 )* ) ;
+    // InternalConfig.g:3539:1: rule__PortInstanceConfig__Group__3__Impl : ( ( rule__PortInstanceConfig__AttributesAssignment_3 )* ) ;
     public final void rule__PortInstanceConfig__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3544:1: ( ( ( rule__PortInstanceConfig__AttributesAssignment_3 )* ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3545:1: ( ( rule__PortInstanceConfig__AttributesAssignment_3 )* )
+            // InternalConfig.g:3543:1: ( ( ( rule__PortInstanceConfig__AttributesAssignment_3 )* ) )
+            // InternalConfig.g:3544:1: ( ( rule__PortInstanceConfig__AttributesAssignment_3 )* )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3545:1: ( ( rule__PortInstanceConfig__AttributesAssignment_3 )* )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3546:1: ( rule__PortInstanceConfig__AttributesAssignment_3 )*
+            // InternalConfig.g:3544:1: ( ( rule__PortInstanceConfig__AttributesAssignment_3 )* )
+            // InternalConfig.g:3545:1: ( rule__PortInstanceConfig__AttributesAssignment_3 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPortInstanceConfigAccess().getAttributesAssignment_3()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3547:1: ( rule__PortInstanceConfig__AttributesAssignment_3 )*
+            // InternalConfig.g:3546:1: ( rule__PortInstanceConfig__AttributesAssignment_3 )*
             loop26:
             do {
                 int alt26=2;
@@ -10629,9 +10629,9 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
                 switch (alt26) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3547:2: rule__PortInstanceConfig__AttributesAssignment_3
+            	    // InternalConfig.g:3546:2: rule__PortInstanceConfig__AttributesAssignment_3
             	    {
-            	    pushFollow(FOLLOW_rule__PortInstanceConfig__AttributesAssignment_3_in_rule__PortInstanceConfig__Group__3__Impl7229);
+            	    pushFollow(FOLLOW_16);
             	    rule__PortInstanceConfig__AttributesAssignment_3();
 
             	    state._fsp--;
@@ -10670,16 +10670,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortInstanceConfig__Group__4"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3557:1: rule__PortInstanceConfig__Group__4 : rule__PortInstanceConfig__Group__4__Impl ;
+    // InternalConfig.g:3556:1: rule__PortInstanceConfig__Group__4 : rule__PortInstanceConfig__Group__4__Impl ;
     public final void rule__PortInstanceConfig__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3561:1: ( rule__PortInstanceConfig__Group__4__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3562:2: rule__PortInstanceConfig__Group__4__Impl
+            // InternalConfig.g:3560:1: ( rule__PortInstanceConfig__Group__4__Impl )
+            // InternalConfig.g:3561:2: rule__PortInstanceConfig__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__PortInstanceConfig__Group__4__Impl_in_rule__PortInstanceConfig__Group__47260);
+            pushFollow(FOLLOW_2);
             rule__PortInstanceConfig__Group__4__Impl();
 
             state._fsp--;
@@ -10703,22 +10703,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortInstanceConfig__Group__4__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3568:1: rule__PortInstanceConfig__Group__4__Impl : ( '}' ) ;
+    // InternalConfig.g:3567:1: rule__PortInstanceConfig__Group__4__Impl : ( '}' ) ;
     public final void rule__PortInstanceConfig__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3572:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3573:1: ( '}' )
+            // InternalConfig.g:3571:1: ( ( '}' ) )
+            // InternalConfig.g:3572:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3573:1: ( '}' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3574:1: '}'
+            // InternalConfig.g:3572:1: ( '}' )
+            // InternalConfig.g:3573:1: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPortInstanceConfigAccess().getRightCurlyBracketKeyword_4()); 
             }
-            match(input,28,FOLLOW_28_in_rule__PortInstanceConfig__Group__4__Impl7288); if (state.failed) return ;
+            match(input,28,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getPortInstanceConfigAccess().getRightCurlyBracketKeyword_4()); 
             }
@@ -10744,21 +10744,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrClassConfig__Group__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3597:1: rule__AttrClassConfig__Group__0 : rule__AttrClassConfig__Group__0__Impl rule__AttrClassConfig__Group__1 ;
+    // InternalConfig.g:3596:1: rule__AttrClassConfig__Group__0 : rule__AttrClassConfig__Group__0__Impl rule__AttrClassConfig__Group__1 ;
     public final void rule__AttrClassConfig__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3601:1: ( rule__AttrClassConfig__Group__0__Impl rule__AttrClassConfig__Group__1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3602:2: rule__AttrClassConfig__Group__0__Impl rule__AttrClassConfig__Group__1
+            // InternalConfig.g:3600:1: ( rule__AttrClassConfig__Group__0__Impl rule__AttrClassConfig__Group__1 )
+            // InternalConfig.g:3601:2: rule__AttrClassConfig__Group__0__Impl rule__AttrClassConfig__Group__1
             {
-            pushFollow(FOLLOW_rule__AttrClassConfig__Group__0__Impl_in_rule__AttrClassConfig__Group__07329);
+            pushFollow(FOLLOW_3);
             rule__AttrClassConfig__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__AttrClassConfig__Group__1_in_rule__AttrClassConfig__Group__07332);
+            pushFollow(FOLLOW_2);
             rule__AttrClassConfig__Group__1();
 
             state._fsp--;
@@ -10782,22 +10782,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrClassConfig__Group__0__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3609:1: rule__AttrClassConfig__Group__0__Impl : ( 'Attr' ) ;
+    // InternalConfig.g:3608:1: rule__AttrClassConfig__Group__0__Impl : ( 'Attr' ) ;
     public final void rule__AttrClassConfig__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3613:1: ( ( 'Attr' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3614:1: ( 'Attr' )
+            // InternalConfig.g:3612:1: ( ( 'Attr' ) )
+            // InternalConfig.g:3613:1: ( 'Attr' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3614:1: ( 'Attr' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3615:1: 'Attr'
+            // InternalConfig.g:3613:1: ( 'Attr' )
+            // InternalConfig.g:3614:1: 'Attr'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAttrClassConfigAccess().getAttrKeyword_0()); 
             }
-            match(input,42,FOLLOW_42_in_rule__AttrClassConfig__Group__0__Impl7360); if (state.failed) return ;
+            match(input,42,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getAttrClassConfigAccess().getAttrKeyword_0()); 
             }
@@ -10823,21 +10823,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrClassConfig__Group__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3628:1: rule__AttrClassConfig__Group__1 : rule__AttrClassConfig__Group__1__Impl rule__AttrClassConfig__Group__2 ;
+    // InternalConfig.g:3627:1: rule__AttrClassConfig__Group__1 : rule__AttrClassConfig__Group__1__Impl rule__AttrClassConfig__Group__2 ;
     public final void rule__AttrClassConfig__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3632:1: ( rule__AttrClassConfig__Group__1__Impl rule__AttrClassConfig__Group__2 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3633:2: rule__AttrClassConfig__Group__1__Impl rule__AttrClassConfig__Group__2
+            // InternalConfig.g:3631:1: ( rule__AttrClassConfig__Group__1__Impl rule__AttrClassConfig__Group__2 )
+            // InternalConfig.g:3632:2: rule__AttrClassConfig__Group__1__Impl rule__AttrClassConfig__Group__2
             {
-            pushFollow(FOLLOW_rule__AttrClassConfig__Group__1__Impl_in_rule__AttrClassConfig__Group__17391);
+            pushFollow(FOLLOW_20);
             rule__AttrClassConfig__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__AttrClassConfig__Group__2_in_rule__AttrClassConfig__Group__17394);
+            pushFollow(FOLLOW_2);
             rule__AttrClassConfig__Group__2();
 
             state._fsp--;
@@ -10861,25 +10861,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrClassConfig__Group__1__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3640:1: rule__AttrClassConfig__Group__1__Impl : ( ( rule__AttrClassConfig__AttributeAssignment_1 ) ) ;
+    // InternalConfig.g:3639:1: rule__AttrClassConfig__Group__1__Impl : ( ( rule__AttrClassConfig__AttributeAssignment_1 ) ) ;
     public final void rule__AttrClassConfig__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3644:1: ( ( ( rule__AttrClassConfig__AttributeAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3645:1: ( ( rule__AttrClassConfig__AttributeAssignment_1 ) )
+            // InternalConfig.g:3643:1: ( ( ( rule__AttrClassConfig__AttributeAssignment_1 ) ) )
+            // InternalConfig.g:3644:1: ( ( rule__AttrClassConfig__AttributeAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3645:1: ( ( rule__AttrClassConfig__AttributeAssignment_1 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3646:1: ( rule__AttrClassConfig__AttributeAssignment_1 )
+            // InternalConfig.g:3644:1: ( ( rule__AttrClassConfig__AttributeAssignment_1 ) )
+            // InternalConfig.g:3645:1: ( rule__AttrClassConfig__AttributeAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAttrClassConfigAccess().getAttributeAssignment_1()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3647:1: ( rule__AttrClassConfig__AttributeAssignment_1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3647:2: rule__AttrClassConfig__AttributeAssignment_1
+            // InternalConfig.g:3646:1: ( rule__AttrClassConfig__AttributeAssignment_1 )
+            // InternalConfig.g:3646:2: rule__AttrClassConfig__AttributeAssignment_1
             {
-            pushFollow(FOLLOW_rule__AttrClassConfig__AttributeAssignment_1_in_rule__AttrClassConfig__Group__1__Impl7421);
+            pushFollow(FOLLOW_2);
             rule__AttrClassConfig__AttributeAssignment_1();
 
             state._fsp--;
@@ -10912,21 +10912,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrClassConfig__Group__2"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3657:1: rule__AttrClassConfig__Group__2 : rule__AttrClassConfig__Group__2__Impl rule__AttrClassConfig__Group__3 ;
+    // InternalConfig.g:3656:1: rule__AttrClassConfig__Group__2 : rule__AttrClassConfig__Group__2__Impl rule__AttrClassConfig__Group__3 ;
     public final void rule__AttrClassConfig__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3661:1: ( rule__AttrClassConfig__Group__2__Impl rule__AttrClassConfig__Group__3 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3662:2: rule__AttrClassConfig__Group__2__Impl rule__AttrClassConfig__Group__3
+            // InternalConfig.g:3660:1: ( rule__AttrClassConfig__Group__2__Impl rule__AttrClassConfig__Group__3 )
+            // InternalConfig.g:3661:2: rule__AttrClassConfig__Group__2__Impl rule__AttrClassConfig__Group__3
             {
-            pushFollow(FOLLOW_rule__AttrClassConfig__Group__2__Impl_in_rule__AttrClassConfig__Group__27451);
+            pushFollow(FOLLOW_20);
             rule__AttrClassConfig__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__AttrClassConfig__Group__3_in_rule__AttrClassConfig__Group__27454);
+            pushFollow(FOLLOW_2);
             rule__AttrClassConfig__Group__3();
 
             state._fsp--;
@@ -10950,22 +10950,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrClassConfig__Group__2__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3669:1: rule__AttrClassConfig__Group__2__Impl : ( ( rule__AttrClassConfig__Group_2__0 )? ) ;
+    // InternalConfig.g:3668:1: rule__AttrClassConfig__Group__2__Impl : ( ( rule__AttrClassConfig__Group_2__0 )? ) ;
     public final void rule__AttrClassConfig__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3673:1: ( ( ( rule__AttrClassConfig__Group_2__0 )? ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3674:1: ( ( rule__AttrClassConfig__Group_2__0 )? )
+            // InternalConfig.g:3672:1: ( ( ( rule__AttrClassConfig__Group_2__0 )? ) )
+            // InternalConfig.g:3673:1: ( ( rule__AttrClassConfig__Group_2__0 )? )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3674:1: ( ( rule__AttrClassConfig__Group_2__0 )? )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3675:1: ( rule__AttrClassConfig__Group_2__0 )?
+            // InternalConfig.g:3673:1: ( ( rule__AttrClassConfig__Group_2__0 )? )
+            // InternalConfig.g:3674:1: ( rule__AttrClassConfig__Group_2__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAttrClassConfigAccess().getGroup_2()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3676:1: ( rule__AttrClassConfig__Group_2__0 )?
+            // InternalConfig.g:3675:1: ( rule__AttrClassConfig__Group_2__0 )?
             int alt27=2;
             int LA27_0 = input.LA(1);
 
@@ -10974,9 +10974,9 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             }
             switch (alt27) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3676:2: rule__AttrClassConfig__Group_2__0
+                    // InternalConfig.g:3675:2: rule__AttrClassConfig__Group_2__0
                     {
-                    pushFollow(FOLLOW_rule__AttrClassConfig__Group_2__0_in_rule__AttrClassConfig__Group__2__Impl7481);
+                    pushFollow(FOLLOW_2);
                     rule__AttrClassConfig__Group_2__0();
 
                     state._fsp--;
@@ -11012,16 +11012,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrClassConfig__Group__3"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3686:1: rule__AttrClassConfig__Group__3 : rule__AttrClassConfig__Group__3__Impl ;
+    // InternalConfig.g:3685:1: rule__AttrClassConfig__Group__3 : rule__AttrClassConfig__Group__3__Impl ;
     public final void rule__AttrClassConfig__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3690:1: ( rule__AttrClassConfig__Group__3__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3691:2: rule__AttrClassConfig__Group__3__Impl
+            // InternalConfig.g:3689:1: ( rule__AttrClassConfig__Group__3__Impl )
+            // InternalConfig.g:3690:2: rule__AttrClassConfig__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__AttrClassConfig__Group__3__Impl_in_rule__AttrClassConfig__Group__37512);
+            pushFollow(FOLLOW_2);
             rule__AttrClassConfig__Group__3__Impl();
 
             state._fsp--;
@@ -11045,22 +11045,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrClassConfig__Group__3__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3697:1: rule__AttrClassConfig__Group__3__Impl : ( ( rule__AttrClassConfig__Group_3__0 )? ) ;
+    // InternalConfig.g:3696:1: rule__AttrClassConfig__Group__3__Impl : ( ( rule__AttrClassConfig__Group_3__0 )? ) ;
     public final void rule__AttrClassConfig__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3701:1: ( ( ( rule__AttrClassConfig__Group_3__0 )? ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3702:1: ( ( rule__AttrClassConfig__Group_3__0 )? )
+            // InternalConfig.g:3700:1: ( ( ( rule__AttrClassConfig__Group_3__0 )? ) )
+            // InternalConfig.g:3701:1: ( ( rule__AttrClassConfig__Group_3__0 )? )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3702:1: ( ( rule__AttrClassConfig__Group_3__0 )? )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3703:1: ( rule__AttrClassConfig__Group_3__0 )?
+            // InternalConfig.g:3701:1: ( ( rule__AttrClassConfig__Group_3__0 )? )
+            // InternalConfig.g:3702:1: ( rule__AttrClassConfig__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAttrClassConfigAccess().getGroup_3()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3704:1: ( rule__AttrClassConfig__Group_3__0 )?
+            // InternalConfig.g:3703:1: ( rule__AttrClassConfig__Group_3__0 )?
             int alt28=2;
             int LA28_0 = input.LA(1);
 
@@ -11069,9 +11069,9 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             }
             switch (alt28) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3704:2: rule__AttrClassConfig__Group_3__0
+                    // InternalConfig.g:3703:2: rule__AttrClassConfig__Group_3__0
                     {
-                    pushFollow(FOLLOW_rule__AttrClassConfig__Group_3__0_in_rule__AttrClassConfig__Group__3__Impl7539);
+                    pushFollow(FOLLOW_2);
                     rule__AttrClassConfig__Group_3__0();
 
                     state._fsp--;
@@ -11107,21 +11107,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrClassConfig__Group_2__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3722:1: rule__AttrClassConfig__Group_2__0 : rule__AttrClassConfig__Group_2__0__Impl rule__AttrClassConfig__Group_2__1 ;
+    // InternalConfig.g:3721:1: rule__AttrClassConfig__Group_2__0 : rule__AttrClassConfig__Group_2__0__Impl rule__AttrClassConfig__Group_2__1 ;
     public final void rule__AttrClassConfig__Group_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3726:1: ( rule__AttrClassConfig__Group_2__0__Impl rule__AttrClassConfig__Group_2__1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3727:2: rule__AttrClassConfig__Group_2__0__Impl rule__AttrClassConfig__Group_2__1
+            // InternalConfig.g:3725:1: ( rule__AttrClassConfig__Group_2__0__Impl rule__AttrClassConfig__Group_2__1 )
+            // InternalConfig.g:3726:2: rule__AttrClassConfig__Group_2__0__Impl rule__AttrClassConfig__Group_2__1
             {
-            pushFollow(FOLLOW_rule__AttrClassConfig__Group_2__0__Impl_in_rule__AttrClassConfig__Group_2__07578);
+            pushFollow(FOLLOW_21);
             rule__AttrClassConfig__Group_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__AttrClassConfig__Group_2__1_in_rule__AttrClassConfig__Group_2__07581);
+            pushFollow(FOLLOW_2);
             rule__AttrClassConfig__Group_2__1();
 
             state._fsp--;
@@ -11145,22 +11145,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrClassConfig__Group_2__0__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3734:1: rule__AttrClassConfig__Group_2__0__Impl : ( '=' ) ;
+    // InternalConfig.g:3733:1: rule__AttrClassConfig__Group_2__0__Impl : ( '=' ) ;
     public final void rule__AttrClassConfig__Group_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3738:1: ( ( '=' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3739:1: ( '=' )
+            // InternalConfig.g:3737:1: ( ( '=' ) )
+            // InternalConfig.g:3738:1: ( '=' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3739:1: ( '=' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3740:1: '='
+            // InternalConfig.g:3738:1: ( '=' )
+            // InternalConfig.g:3739:1: '='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAttrClassConfigAccess().getEqualsSignKeyword_2_0()); 
             }
-            match(input,43,FOLLOW_43_in_rule__AttrClassConfig__Group_2__0__Impl7609); if (state.failed) return ;
+            match(input,43,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getAttrClassConfigAccess().getEqualsSignKeyword_2_0()); 
             }
@@ -11186,16 +11186,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrClassConfig__Group_2__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3753:1: rule__AttrClassConfig__Group_2__1 : rule__AttrClassConfig__Group_2__1__Impl ;
+    // InternalConfig.g:3752:1: rule__AttrClassConfig__Group_2__1 : rule__AttrClassConfig__Group_2__1__Impl ;
     public final void rule__AttrClassConfig__Group_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3757:1: ( rule__AttrClassConfig__Group_2__1__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3758:2: rule__AttrClassConfig__Group_2__1__Impl
+            // InternalConfig.g:3756:1: ( rule__AttrClassConfig__Group_2__1__Impl )
+            // InternalConfig.g:3757:2: rule__AttrClassConfig__Group_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__AttrClassConfig__Group_2__1__Impl_in_rule__AttrClassConfig__Group_2__17640);
+            pushFollow(FOLLOW_2);
             rule__AttrClassConfig__Group_2__1__Impl();
 
             state._fsp--;
@@ -11219,25 +11219,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrClassConfig__Group_2__1__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3764:1: rule__AttrClassConfig__Group_2__1__Impl : ( ( rule__AttrClassConfig__ValueAssignment_2_1 ) ) ;
+    // InternalConfig.g:3763:1: rule__AttrClassConfig__Group_2__1__Impl : ( ( rule__AttrClassConfig__ValueAssignment_2_1 ) ) ;
     public final void rule__AttrClassConfig__Group_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3768:1: ( ( ( rule__AttrClassConfig__ValueAssignment_2_1 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3769:1: ( ( rule__AttrClassConfig__ValueAssignment_2_1 ) )
+            // InternalConfig.g:3767:1: ( ( ( rule__AttrClassConfig__ValueAssignment_2_1 ) ) )
+            // InternalConfig.g:3768:1: ( ( rule__AttrClassConfig__ValueAssignment_2_1 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3769:1: ( ( rule__AttrClassConfig__ValueAssignment_2_1 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3770:1: ( rule__AttrClassConfig__ValueAssignment_2_1 )
+            // InternalConfig.g:3768:1: ( ( rule__AttrClassConfig__ValueAssignment_2_1 ) )
+            // InternalConfig.g:3769:1: ( rule__AttrClassConfig__ValueAssignment_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAttrClassConfigAccess().getValueAssignment_2_1()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3771:1: ( rule__AttrClassConfig__ValueAssignment_2_1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3771:2: rule__AttrClassConfig__ValueAssignment_2_1
+            // InternalConfig.g:3770:1: ( rule__AttrClassConfig__ValueAssignment_2_1 )
+            // InternalConfig.g:3770:2: rule__AttrClassConfig__ValueAssignment_2_1
             {
-            pushFollow(FOLLOW_rule__AttrClassConfig__ValueAssignment_2_1_in_rule__AttrClassConfig__Group_2__1__Impl7667);
+            pushFollow(FOLLOW_2);
             rule__AttrClassConfig__ValueAssignment_2_1();
 
             state._fsp--;
@@ -11270,21 +11270,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrClassConfig__Group_3__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3785:1: rule__AttrClassConfig__Group_3__0 : rule__AttrClassConfig__Group_3__0__Impl rule__AttrClassConfig__Group_3__1 ;
+    // InternalConfig.g:3784:1: rule__AttrClassConfig__Group_3__0 : rule__AttrClassConfig__Group_3__0__Impl rule__AttrClassConfig__Group_3__1 ;
     public final void rule__AttrClassConfig__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3789:1: ( rule__AttrClassConfig__Group_3__0__Impl rule__AttrClassConfig__Group_3__1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3790:2: rule__AttrClassConfig__Group_3__0__Impl rule__AttrClassConfig__Group_3__1
+            // InternalConfig.g:3788:1: ( rule__AttrClassConfig__Group_3__0__Impl rule__AttrClassConfig__Group_3__1 )
+            // InternalConfig.g:3789:2: rule__AttrClassConfig__Group_3__0__Impl rule__AttrClassConfig__Group_3__1
             {
-            pushFollow(FOLLOW_rule__AttrClassConfig__Group_3__0__Impl_in_rule__AttrClassConfig__Group_3__07701);
+            pushFollow(FOLLOW_22);
             rule__AttrClassConfig__Group_3__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__AttrClassConfig__Group_3__1_in_rule__AttrClassConfig__Group_3__07704);
+            pushFollow(FOLLOW_2);
             rule__AttrClassConfig__Group_3__1();
 
             state._fsp--;
@@ -11308,22 +11308,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrClassConfig__Group_3__0__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3797:1: rule__AttrClassConfig__Group_3__0__Impl : ( '{' ) ;
+    // InternalConfig.g:3796:1: rule__AttrClassConfig__Group_3__0__Impl : ( '{' ) ;
     public final void rule__AttrClassConfig__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3801:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3802:1: ( '{' )
+            // InternalConfig.g:3800:1: ( ( '{' ) )
+            // InternalConfig.g:3801:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3802:1: ( '{' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3803:1: '{'
+            // InternalConfig.g:3801:1: ( '{' )
+            // InternalConfig.g:3802:1: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAttrClassConfigAccess().getLeftCurlyBracketKeyword_3_0()); 
             }
-            match(input,27,FOLLOW_27_in_rule__AttrClassConfig__Group_3__0__Impl7732); if (state.failed) return ;
+            match(input,27,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getAttrClassConfigAccess().getLeftCurlyBracketKeyword_3_0()); 
             }
@@ -11349,21 +11349,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrClassConfig__Group_3__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3816:1: rule__AttrClassConfig__Group_3__1 : rule__AttrClassConfig__Group_3__1__Impl rule__AttrClassConfig__Group_3__2 ;
+    // InternalConfig.g:3815:1: rule__AttrClassConfig__Group_3__1 : rule__AttrClassConfig__Group_3__1__Impl rule__AttrClassConfig__Group_3__2 ;
     public final void rule__AttrClassConfig__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3820:1: ( rule__AttrClassConfig__Group_3__1__Impl rule__AttrClassConfig__Group_3__2 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3821:2: rule__AttrClassConfig__Group_3__1__Impl rule__AttrClassConfig__Group_3__2
+            // InternalConfig.g:3819:1: ( rule__AttrClassConfig__Group_3__1__Impl rule__AttrClassConfig__Group_3__2 )
+            // InternalConfig.g:3820:2: rule__AttrClassConfig__Group_3__1__Impl rule__AttrClassConfig__Group_3__2
             {
-            pushFollow(FOLLOW_rule__AttrClassConfig__Group_3__1__Impl_in_rule__AttrClassConfig__Group_3__17763);
+            pushFollow(FOLLOW_10);
             rule__AttrClassConfig__Group_3__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__AttrClassConfig__Group_3__2_in_rule__AttrClassConfig__Group_3__17766);
+            pushFollow(FOLLOW_2);
             rule__AttrClassConfig__Group_3__2();
 
             state._fsp--;
@@ -11387,25 +11387,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrClassConfig__Group_3__1__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3828:1: rule__AttrClassConfig__Group_3__1__Impl : ( ( rule__AttrClassConfig__Group_3_1__0 ) ) ;
+    // InternalConfig.g:3827:1: rule__AttrClassConfig__Group_3__1__Impl : ( ( rule__AttrClassConfig__Group_3_1__0 ) ) ;
     public final void rule__AttrClassConfig__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3832:1: ( ( ( rule__AttrClassConfig__Group_3_1__0 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3833:1: ( ( rule__AttrClassConfig__Group_3_1__0 ) )
+            // InternalConfig.g:3831:1: ( ( ( rule__AttrClassConfig__Group_3_1__0 ) ) )
+            // InternalConfig.g:3832:1: ( ( rule__AttrClassConfig__Group_3_1__0 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3833:1: ( ( rule__AttrClassConfig__Group_3_1__0 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3834:1: ( rule__AttrClassConfig__Group_3_1__0 )
+            // InternalConfig.g:3832:1: ( ( rule__AttrClassConfig__Group_3_1__0 ) )
+            // InternalConfig.g:3833:1: ( rule__AttrClassConfig__Group_3_1__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAttrClassConfigAccess().getGroup_3_1()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3835:1: ( rule__AttrClassConfig__Group_3_1__0 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3835:2: rule__AttrClassConfig__Group_3_1__0
+            // InternalConfig.g:3834:1: ( rule__AttrClassConfig__Group_3_1__0 )
+            // InternalConfig.g:3834:2: rule__AttrClassConfig__Group_3_1__0
             {
-            pushFollow(FOLLOW_rule__AttrClassConfig__Group_3_1__0_in_rule__AttrClassConfig__Group_3__1__Impl7793);
+            pushFollow(FOLLOW_2);
             rule__AttrClassConfig__Group_3_1__0();
 
             state._fsp--;
@@ -11438,16 +11438,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrClassConfig__Group_3__2"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3845:1: rule__AttrClassConfig__Group_3__2 : rule__AttrClassConfig__Group_3__2__Impl ;
+    // InternalConfig.g:3844:1: rule__AttrClassConfig__Group_3__2 : rule__AttrClassConfig__Group_3__2__Impl ;
     public final void rule__AttrClassConfig__Group_3__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3849:1: ( rule__AttrClassConfig__Group_3__2__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3850:2: rule__AttrClassConfig__Group_3__2__Impl
+            // InternalConfig.g:3848:1: ( rule__AttrClassConfig__Group_3__2__Impl )
+            // InternalConfig.g:3849:2: rule__AttrClassConfig__Group_3__2__Impl
             {
-            pushFollow(FOLLOW_rule__AttrClassConfig__Group_3__2__Impl_in_rule__AttrClassConfig__Group_3__27823);
+            pushFollow(FOLLOW_2);
             rule__AttrClassConfig__Group_3__2__Impl();
 
             state._fsp--;
@@ -11471,22 +11471,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrClassConfig__Group_3__2__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3856:1: rule__AttrClassConfig__Group_3__2__Impl : ( '}' ) ;
+    // InternalConfig.g:3855:1: rule__AttrClassConfig__Group_3__2__Impl : ( '}' ) ;
     public final void rule__AttrClassConfig__Group_3__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3860:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3861:1: ( '}' )
+            // InternalConfig.g:3859:1: ( ( '}' ) )
+            // InternalConfig.g:3860:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3861:1: ( '}' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3862:1: '}'
+            // InternalConfig.g:3860:1: ( '}' )
+            // InternalConfig.g:3861:1: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAttrClassConfigAccess().getRightCurlyBracketKeyword_3_2()); 
             }
-            match(input,28,FOLLOW_28_in_rule__AttrClassConfig__Group_3__2__Impl7851); if (state.failed) return ;
+            match(input,28,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getAttrClassConfigAccess().getRightCurlyBracketKeyword_3_2()); 
             }
@@ -11512,21 +11512,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrClassConfig__Group_3_1__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3881:1: rule__AttrClassConfig__Group_3_1__0 : rule__AttrClassConfig__Group_3_1__0__Impl rule__AttrClassConfig__Group_3_1__1 ;
+    // InternalConfig.g:3880:1: rule__AttrClassConfig__Group_3_1__0 : rule__AttrClassConfig__Group_3_1__0__Impl rule__AttrClassConfig__Group_3_1__1 ;
     public final void rule__AttrClassConfig__Group_3_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3885:1: ( rule__AttrClassConfig__Group_3_1__0__Impl rule__AttrClassConfig__Group_3_1__1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3886:2: rule__AttrClassConfig__Group_3_1__0__Impl rule__AttrClassConfig__Group_3_1__1
+            // InternalConfig.g:3884:1: ( rule__AttrClassConfig__Group_3_1__0__Impl rule__AttrClassConfig__Group_3_1__1 )
+            // InternalConfig.g:3885:2: rule__AttrClassConfig__Group_3_1__0__Impl rule__AttrClassConfig__Group_3_1__1
             {
-            pushFollow(FOLLOW_rule__AttrClassConfig__Group_3_1__0__Impl_in_rule__AttrClassConfig__Group_3_1__07888);
+            pushFollow(FOLLOW_22);
             rule__AttrClassConfig__Group_3_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__AttrClassConfig__Group_3_1__1_in_rule__AttrClassConfig__Group_3_1__07891);
+            pushFollow(FOLLOW_2);
             rule__AttrClassConfig__Group_3_1__1();
 
             state._fsp--;
@@ -11550,22 +11550,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrClassConfig__Group_3_1__0__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3893:1: rule__AttrClassConfig__Group_3_1__0__Impl : ( ( rule__AttrClassConfig__Group_3_1_0__0 )? ) ;
+    // InternalConfig.g:3892:1: rule__AttrClassConfig__Group_3_1__0__Impl : ( ( rule__AttrClassConfig__Group_3_1_0__0 )? ) ;
     public final void rule__AttrClassConfig__Group_3_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3897:1: ( ( ( rule__AttrClassConfig__Group_3_1_0__0 )? ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3898:1: ( ( rule__AttrClassConfig__Group_3_1_0__0 )? )
+            // InternalConfig.g:3896:1: ( ( ( rule__AttrClassConfig__Group_3_1_0__0 )? ) )
+            // InternalConfig.g:3897:1: ( ( rule__AttrClassConfig__Group_3_1_0__0 )? )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3898:1: ( ( rule__AttrClassConfig__Group_3_1_0__0 )? )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3899:1: ( rule__AttrClassConfig__Group_3_1_0__0 )?
+            // InternalConfig.g:3897:1: ( ( rule__AttrClassConfig__Group_3_1_0__0 )? )
+            // InternalConfig.g:3898:1: ( rule__AttrClassConfig__Group_3_1_0__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAttrClassConfigAccess().getGroup_3_1_0()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3900:1: ( rule__AttrClassConfig__Group_3_1_0__0 )?
+            // InternalConfig.g:3899:1: ( rule__AttrClassConfig__Group_3_1_0__0 )?
             int alt29=2;
             int LA29_0 = input.LA(1);
 
@@ -11574,9 +11574,9 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             }
             switch (alt29) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3900:2: rule__AttrClassConfig__Group_3_1_0__0
+                    // InternalConfig.g:3899:2: rule__AttrClassConfig__Group_3_1_0__0
                     {
-                    pushFollow(FOLLOW_rule__AttrClassConfig__Group_3_1_0__0_in_rule__AttrClassConfig__Group_3_1__0__Impl7918);
+                    pushFollow(FOLLOW_2);
                     rule__AttrClassConfig__Group_3_1_0__0();
 
                     state._fsp--;
@@ -11612,21 +11612,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrClassConfig__Group_3_1__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3910:1: rule__AttrClassConfig__Group_3_1__1 : rule__AttrClassConfig__Group_3_1__1__Impl rule__AttrClassConfig__Group_3_1__2 ;
+    // InternalConfig.g:3909:1: rule__AttrClassConfig__Group_3_1__1 : rule__AttrClassConfig__Group_3_1__1__Impl rule__AttrClassConfig__Group_3_1__2 ;
     public final void rule__AttrClassConfig__Group_3_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3914:1: ( rule__AttrClassConfig__Group_3_1__1__Impl rule__AttrClassConfig__Group_3_1__2 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3915:2: rule__AttrClassConfig__Group_3_1__1__Impl rule__AttrClassConfig__Group_3_1__2
+            // InternalConfig.g:3913:1: ( rule__AttrClassConfig__Group_3_1__1__Impl rule__AttrClassConfig__Group_3_1__2 )
+            // InternalConfig.g:3914:2: rule__AttrClassConfig__Group_3_1__1__Impl rule__AttrClassConfig__Group_3_1__2
             {
-            pushFollow(FOLLOW_rule__AttrClassConfig__Group_3_1__1__Impl_in_rule__AttrClassConfig__Group_3_1__17949);
+            pushFollow(FOLLOW_22);
             rule__AttrClassConfig__Group_3_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__AttrClassConfig__Group_3_1__2_in_rule__AttrClassConfig__Group_3_1__17952);
+            pushFollow(FOLLOW_2);
             rule__AttrClassConfig__Group_3_1__2();
 
             state._fsp--;
@@ -11650,22 +11650,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrClassConfig__Group_3_1__1__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3922:1: rule__AttrClassConfig__Group_3_1__1__Impl : ( ( rule__AttrClassConfig__Group_3_1_1__0 )? ) ;
+    // InternalConfig.g:3921:1: rule__AttrClassConfig__Group_3_1__1__Impl : ( ( rule__AttrClassConfig__Group_3_1_1__0 )? ) ;
     public final void rule__AttrClassConfig__Group_3_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3926:1: ( ( ( rule__AttrClassConfig__Group_3_1_1__0 )? ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3927:1: ( ( rule__AttrClassConfig__Group_3_1_1__0 )? )
+            // InternalConfig.g:3925:1: ( ( ( rule__AttrClassConfig__Group_3_1_1__0 )? ) )
+            // InternalConfig.g:3926:1: ( ( rule__AttrClassConfig__Group_3_1_1__0 )? )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3927:1: ( ( rule__AttrClassConfig__Group_3_1_1__0 )? )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3928:1: ( rule__AttrClassConfig__Group_3_1_1__0 )?
+            // InternalConfig.g:3926:1: ( ( rule__AttrClassConfig__Group_3_1_1__0 )? )
+            // InternalConfig.g:3927:1: ( rule__AttrClassConfig__Group_3_1_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAttrClassConfigAccess().getGroup_3_1_1()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3929:1: ( rule__AttrClassConfig__Group_3_1_1__0 )?
+            // InternalConfig.g:3928:1: ( rule__AttrClassConfig__Group_3_1_1__0 )?
             int alt30=2;
             int LA30_0 = input.LA(1);
 
@@ -11674,9 +11674,9 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             }
             switch (alt30) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3929:2: rule__AttrClassConfig__Group_3_1_1__0
+                    // InternalConfig.g:3928:2: rule__AttrClassConfig__Group_3_1_1__0
                     {
-                    pushFollow(FOLLOW_rule__AttrClassConfig__Group_3_1_1__0_in_rule__AttrClassConfig__Group_3_1__1__Impl7979);
+                    pushFollow(FOLLOW_2);
                     rule__AttrClassConfig__Group_3_1_1__0();
 
                     state._fsp--;
@@ -11712,16 +11712,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrClassConfig__Group_3_1__2"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3939:1: rule__AttrClassConfig__Group_3_1__2 : rule__AttrClassConfig__Group_3_1__2__Impl ;
+    // InternalConfig.g:3938:1: rule__AttrClassConfig__Group_3_1__2 : rule__AttrClassConfig__Group_3_1__2__Impl ;
     public final void rule__AttrClassConfig__Group_3_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3943:1: ( rule__AttrClassConfig__Group_3_1__2__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3944:2: rule__AttrClassConfig__Group_3_1__2__Impl
+            // InternalConfig.g:3942:1: ( rule__AttrClassConfig__Group_3_1__2__Impl )
+            // InternalConfig.g:3943:2: rule__AttrClassConfig__Group_3_1__2__Impl
             {
-            pushFollow(FOLLOW_rule__AttrClassConfig__Group_3_1__2__Impl_in_rule__AttrClassConfig__Group_3_1__28010);
+            pushFollow(FOLLOW_2);
             rule__AttrClassConfig__Group_3_1__2__Impl();
 
             state._fsp--;
@@ -11745,22 +11745,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrClassConfig__Group_3_1__2__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3950:1: rule__AttrClassConfig__Group_3_1__2__Impl : ( ( rule__AttrClassConfig__AttributesAssignment_3_1_2 )* ) ;
+    // InternalConfig.g:3949:1: rule__AttrClassConfig__Group_3_1__2__Impl : ( ( rule__AttrClassConfig__AttributesAssignment_3_1_2 )* ) ;
     public final void rule__AttrClassConfig__Group_3_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3954:1: ( ( ( rule__AttrClassConfig__AttributesAssignment_3_1_2 )* ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3955:1: ( ( rule__AttrClassConfig__AttributesAssignment_3_1_2 )* )
+            // InternalConfig.g:3953:1: ( ( ( rule__AttrClassConfig__AttributesAssignment_3_1_2 )* ) )
+            // InternalConfig.g:3954:1: ( ( rule__AttrClassConfig__AttributesAssignment_3_1_2 )* )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3955:1: ( ( rule__AttrClassConfig__AttributesAssignment_3_1_2 )* )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3956:1: ( rule__AttrClassConfig__AttributesAssignment_3_1_2 )*
+            // InternalConfig.g:3954:1: ( ( rule__AttrClassConfig__AttributesAssignment_3_1_2 )* )
+            // InternalConfig.g:3955:1: ( rule__AttrClassConfig__AttributesAssignment_3_1_2 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAttrClassConfigAccess().getAttributesAssignment_3_1_2()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3957:1: ( rule__AttrClassConfig__AttributesAssignment_3_1_2 )*
+            // InternalConfig.g:3956:1: ( rule__AttrClassConfig__AttributesAssignment_3_1_2 )*
             loop31:
             do {
                 int alt31=2;
@@ -11773,9 +11773,9 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
                 switch (alt31) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3957:2: rule__AttrClassConfig__AttributesAssignment_3_1_2
+            	    // InternalConfig.g:3956:2: rule__AttrClassConfig__AttributesAssignment_3_1_2
             	    {
-            	    pushFollow(FOLLOW_rule__AttrClassConfig__AttributesAssignment_3_1_2_in_rule__AttrClassConfig__Group_3_1__2__Impl8037);
+            	    pushFollow(FOLLOW_16);
             	    rule__AttrClassConfig__AttributesAssignment_3_1_2();
 
             	    state._fsp--;
@@ -11814,21 +11814,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrClassConfig__Group_3_1_0__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3973:1: rule__AttrClassConfig__Group_3_1_0__0 : rule__AttrClassConfig__Group_3_1_0__0__Impl rule__AttrClassConfig__Group_3_1_0__1 ;
+    // InternalConfig.g:3972:1: rule__AttrClassConfig__Group_3_1_0__0 : rule__AttrClassConfig__Group_3_1_0__0__Impl rule__AttrClassConfig__Group_3_1_0__1 ;
     public final void rule__AttrClassConfig__Group_3_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3977:1: ( rule__AttrClassConfig__Group_3_1_0__0__Impl rule__AttrClassConfig__Group_3_1_0__1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3978:2: rule__AttrClassConfig__Group_3_1_0__0__Impl rule__AttrClassConfig__Group_3_1_0__1
+            // InternalConfig.g:3976:1: ( rule__AttrClassConfig__Group_3_1_0__0__Impl rule__AttrClassConfig__Group_3_1_0__1 )
+            // InternalConfig.g:3977:2: rule__AttrClassConfig__Group_3_1_0__0__Impl rule__AttrClassConfig__Group_3_1_0__1
             {
-            pushFollow(FOLLOW_rule__AttrClassConfig__Group_3_1_0__0__Impl_in_rule__AttrClassConfig__Group_3_1_0__08074);
+            pushFollow(FOLLOW_23);
             rule__AttrClassConfig__Group_3_1_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__AttrClassConfig__Group_3_1_0__1_in_rule__AttrClassConfig__Group_3_1_0__08077);
+            pushFollow(FOLLOW_2);
             rule__AttrClassConfig__Group_3_1_0__1();
 
             state._fsp--;
@@ -11852,22 +11852,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrClassConfig__Group_3_1_0__0__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3985:1: rule__AttrClassConfig__Group_3_1_0__0__Impl : ( 'min' ) ;
+    // InternalConfig.g:3984:1: rule__AttrClassConfig__Group_3_1_0__0__Impl : ( 'min' ) ;
     public final void rule__AttrClassConfig__Group_3_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3989:1: ( ( 'min' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3990:1: ( 'min' )
+            // InternalConfig.g:3988:1: ( ( 'min' ) )
+            // InternalConfig.g:3989:1: ( 'min' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3990:1: ( 'min' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:3991:1: 'min'
+            // InternalConfig.g:3989:1: ( 'min' )
+            // InternalConfig.g:3990:1: 'min'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAttrClassConfigAccess().getMinKeyword_3_1_0_0()); 
             }
-            match(input,44,FOLLOW_44_in_rule__AttrClassConfig__Group_3_1_0__0__Impl8105); if (state.failed) return ;
+            match(input,44,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getAttrClassConfigAccess().getMinKeyword_3_1_0_0()); 
             }
@@ -11893,21 +11893,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrClassConfig__Group_3_1_0__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4004:1: rule__AttrClassConfig__Group_3_1_0__1 : rule__AttrClassConfig__Group_3_1_0__1__Impl rule__AttrClassConfig__Group_3_1_0__2 ;
+    // InternalConfig.g:4003:1: rule__AttrClassConfig__Group_3_1_0__1 : rule__AttrClassConfig__Group_3_1_0__1__Impl rule__AttrClassConfig__Group_3_1_0__2 ;
     public final void rule__AttrClassConfig__Group_3_1_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4008:1: ( rule__AttrClassConfig__Group_3_1_0__1__Impl rule__AttrClassConfig__Group_3_1_0__2 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4009:2: rule__AttrClassConfig__Group_3_1_0__1__Impl rule__AttrClassConfig__Group_3_1_0__2
+            // InternalConfig.g:4007:1: ( rule__AttrClassConfig__Group_3_1_0__1__Impl rule__AttrClassConfig__Group_3_1_0__2 )
+            // InternalConfig.g:4008:2: rule__AttrClassConfig__Group_3_1_0__1__Impl rule__AttrClassConfig__Group_3_1_0__2
             {
-            pushFollow(FOLLOW_rule__AttrClassConfig__Group_3_1_0__1__Impl_in_rule__AttrClassConfig__Group_3_1_0__18136);
+            pushFollow(FOLLOW_24);
             rule__AttrClassConfig__Group_3_1_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__AttrClassConfig__Group_3_1_0__2_in_rule__AttrClassConfig__Group_3_1_0__18139);
+            pushFollow(FOLLOW_2);
             rule__AttrClassConfig__Group_3_1_0__2();
 
             state._fsp--;
@@ -11931,22 +11931,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrClassConfig__Group_3_1_0__1__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4016:1: rule__AttrClassConfig__Group_3_1_0__1__Impl : ( '=' ) ;
+    // InternalConfig.g:4015:1: rule__AttrClassConfig__Group_3_1_0__1__Impl : ( '=' ) ;
     public final void rule__AttrClassConfig__Group_3_1_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4020:1: ( ( '=' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4021:1: ( '=' )
+            // InternalConfig.g:4019:1: ( ( '=' ) )
+            // InternalConfig.g:4020:1: ( '=' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4021:1: ( '=' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4022:1: '='
+            // InternalConfig.g:4020:1: ( '=' )
+            // InternalConfig.g:4021:1: '='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAttrClassConfigAccess().getEqualsSignKeyword_3_1_0_1()); 
             }
-            match(input,43,FOLLOW_43_in_rule__AttrClassConfig__Group_3_1_0__1__Impl8167); if (state.failed) return ;
+            match(input,43,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getAttrClassConfigAccess().getEqualsSignKeyword_3_1_0_1()); 
             }
@@ -11972,16 +11972,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrClassConfig__Group_3_1_0__2"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4035:1: rule__AttrClassConfig__Group_3_1_0__2 : rule__AttrClassConfig__Group_3_1_0__2__Impl ;
+    // InternalConfig.g:4034:1: rule__AttrClassConfig__Group_3_1_0__2 : rule__AttrClassConfig__Group_3_1_0__2__Impl ;
     public final void rule__AttrClassConfig__Group_3_1_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4039:1: ( rule__AttrClassConfig__Group_3_1_0__2__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4040:2: rule__AttrClassConfig__Group_3_1_0__2__Impl
+            // InternalConfig.g:4038:1: ( rule__AttrClassConfig__Group_3_1_0__2__Impl )
+            // InternalConfig.g:4039:2: rule__AttrClassConfig__Group_3_1_0__2__Impl
             {
-            pushFollow(FOLLOW_rule__AttrClassConfig__Group_3_1_0__2__Impl_in_rule__AttrClassConfig__Group_3_1_0__28198);
+            pushFollow(FOLLOW_2);
             rule__AttrClassConfig__Group_3_1_0__2__Impl();
 
             state._fsp--;
@@ -12005,25 +12005,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrClassConfig__Group_3_1_0__2__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4046:1: rule__AttrClassConfig__Group_3_1_0__2__Impl : ( ( rule__AttrClassConfig__MinAssignment_3_1_0_2 ) ) ;
+    // InternalConfig.g:4045:1: rule__AttrClassConfig__Group_3_1_0__2__Impl : ( ( rule__AttrClassConfig__MinAssignment_3_1_0_2 ) ) ;
     public final void rule__AttrClassConfig__Group_3_1_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4050:1: ( ( ( rule__AttrClassConfig__MinAssignment_3_1_0_2 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4051:1: ( ( rule__AttrClassConfig__MinAssignment_3_1_0_2 ) )
+            // InternalConfig.g:4049:1: ( ( ( rule__AttrClassConfig__MinAssignment_3_1_0_2 ) ) )
+            // InternalConfig.g:4050:1: ( ( rule__AttrClassConfig__MinAssignment_3_1_0_2 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4051:1: ( ( rule__AttrClassConfig__MinAssignment_3_1_0_2 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4052:1: ( rule__AttrClassConfig__MinAssignment_3_1_0_2 )
+            // InternalConfig.g:4050:1: ( ( rule__AttrClassConfig__MinAssignment_3_1_0_2 ) )
+            // InternalConfig.g:4051:1: ( rule__AttrClassConfig__MinAssignment_3_1_0_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAttrClassConfigAccess().getMinAssignment_3_1_0_2()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4053:1: ( rule__AttrClassConfig__MinAssignment_3_1_0_2 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4053:2: rule__AttrClassConfig__MinAssignment_3_1_0_2
+            // InternalConfig.g:4052:1: ( rule__AttrClassConfig__MinAssignment_3_1_0_2 )
+            // InternalConfig.g:4052:2: rule__AttrClassConfig__MinAssignment_3_1_0_2
             {
-            pushFollow(FOLLOW_rule__AttrClassConfig__MinAssignment_3_1_0_2_in_rule__AttrClassConfig__Group_3_1_0__2__Impl8225);
+            pushFollow(FOLLOW_2);
             rule__AttrClassConfig__MinAssignment_3_1_0_2();
 
             state._fsp--;
@@ -12056,21 +12056,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrClassConfig__Group_3_1_1__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4069:1: rule__AttrClassConfig__Group_3_1_1__0 : rule__AttrClassConfig__Group_3_1_1__0__Impl rule__AttrClassConfig__Group_3_1_1__1 ;
+    // InternalConfig.g:4068:1: rule__AttrClassConfig__Group_3_1_1__0 : rule__AttrClassConfig__Group_3_1_1__0__Impl rule__AttrClassConfig__Group_3_1_1__1 ;
     public final void rule__AttrClassConfig__Group_3_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4073:1: ( rule__AttrClassConfig__Group_3_1_1__0__Impl rule__AttrClassConfig__Group_3_1_1__1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4074:2: rule__AttrClassConfig__Group_3_1_1__0__Impl rule__AttrClassConfig__Group_3_1_1__1
+            // InternalConfig.g:4072:1: ( rule__AttrClassConfig__Group_3_1_1__0__Impl rule__AttrClassConfig__Group_3_1_1__1 )
+            // InternalConfig.g:4073:2: rule__AttrClassConfig__Group_3_1_1__0__Impl rule__AttrClassConfig__Group_3_1_1__1
             {
-            pushFollow(FOLLOW_rule__AttrClassConfig__Group_3_1_1__0__Impl_in_rule__AttrClassConfig__Group_3_1_1__08261);
+            pushFollow(FOLLOW_23);
             rule__AttrClassConfig__Group_3_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__AttrClassConfig__Group_3_1_1__1_in_rule__AttrClassConfig__Group_3_1_1__08264);
+            pushFollow(FOLLOW_2);
             rule__AttrClassConfig__Group_3_1_1__1();
 
             state._fsp--;
@@ -12094,22 +12094,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrClassConfig__Group_3_1_1__0__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4081:1: rule__AttrClassConfig__Group_3_1_1__0__Impl : ( 'max' ) ;
+    // InternalConfig.g:4080:1: rule__AttrClassConfig__Group_3_1_1__0__Impl : ( 'max' ) ;
     public final void rule__AttrClassConfig__Group_3_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4085:1: ( ( 'max' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4086:1: ( 'max' )
+            // InternalConfig.g:4084:1: ( ( 'max' ) )
+            // InternalConfig.g:4085:1: ( 'max' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4086:1: ( 'max' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4087:1: 'max'
+            // InternalConfig.g:4085:1: ( 'max' )
+            // InternalConfig.g:4086:1: 'max'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAttrClassConfigAccess().getMaxKeyword_3_1_1_0()); 
             }
-            match(input,45,FOLLOW_45_in_rule__AttrClassConfig__Group_3_1_1__0__Impl8292); if (state.failed) return ;
+            match(input,45,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getAttrClassConfigAccess().getMaxKeyword_3_1_1_0()); 
             }
@@ -12135,21 +12135,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrClassConfig__Group_3_1_1__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4100:1: rule__AttrClassConfig__Group_3_1_1__1 : rule__AttrClassConfig__Group_3_1_1__1__Impl rule__AttrClassConfig__Group_3_1_1__2 ;
+    // InternalConfig.g:4099:1: rule__AttrClassConfig__Group_3_1_1__1 : rule__AttrClassConfig__Group_3_1_1__1__Impl rule__AttrClassConfig__Group_3_1_1__2 ;
     public final void rule__AttrClassConfig__Group_3_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4104:1: ( rule__AttrClassConfig__Group_3_1_1__1__Impl rule__AttrClassConfig__Group_3_1_1__2 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4105:2: rule__AttrClassConfig__Group_3_1_1__1__Impl rule__AttrClassConfig__Group_3_1_1__2
+            // InternalConfig.g:4103:1: ( rule__AttrClassConfig__Group_3_1_1__1__Impl rule__AttrClassConfig__Group_3_1_1__2 )
+            // InternalConfig.g:4104:2: rule__AttrClassConfig__Group_3_1_1__1__Impl rule__AttrClassConfig__Group_3_1_1__2
             {
-            pushFollow(FOLLOW_rule__AttrClassConfig__Group_3_1_1__1__Impl_in_rule__AttrClassConfig__Group_3_1_1__18323);
+            pushFollow(FOLLOW_24);
             rule__AttrClassConfig__Group_3_1_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__AttrClassConfig__Group_3_1_1__2_in_rule__AttrClassConfig__Group_3_1_1__18326);
+            pushFollow(FOLLOW_2);
             rule__AttrClassConfig__Group_3_1_1__2();
 
             state._fsp--;
@@ -12173,22 +12173,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrClassConfig__Group_3_1_1__1__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4112:1: rule__AttrClassConfig__Group_3_1_1__1__Impl : ( '=' ) ;
+    // InternalConfig.g:4111:1: rule__AttrClassConfig__Group_3_1_1__1__Impl : ( '=' ) ;
     public final void rule__AttrClassConfig__Group_3_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4116:1: ( ( '=' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4117:1: ( '=' )
+            // InternalConfig.g:4115:1: ( ( '=' ) )
+            // InternalConfig.g:4116:1: ( '=' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4117:1: ( '=' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4118:1: '='
+            // InternalConfig.g:4116:1: ( '=' )
+            // InternalConfig.g:4117:1: '='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAttrClassConfigAccess().getEqualsSignKeyword_3_1_1_1()); 
             }
-            match(input,43,FOLLOW_43_in_rule__AttrClassConfig__Group_3_1_1__1__Impl8354); if (state.failed) return ;
+            match(input,43,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getAttrClassConfigAccess().getEqualsSignKeyword_3_1_1_1()); 
             }
@@ -12214,16 +12214,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrClassConfig__Group_3_1_1__2"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4131:1: rule__AttrClassConfig__Group_3_1_1__2 : rule__AttrClassConfig__Group_3_1_1__2__Impl ;
+    // InternalConfig.g:4130:1: rule__AttrClassConfig__Group_3_1_1__2 : rule__AttrClassConfig__Group_3_1_1__2__Impl ;
     public final void rule__AttrClassConfig__Group_3_1_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4135:1: ( rule__AttrClassConfig__Group_3_1_1__2__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4136:2: rule__AttrClassConfig__Group_3_1_1__2__Impl
+            // InternalConfig.g:4134:1: ( rule__AttrClassConfig__Group_3_1_1__2__Impl )
+            // InternalConfig.g:4135:2: rule__AttrClassConfig__Group_3_1_1__2__Impl
             {
-            pushFollow(FOLLOW_rule__AttrClassConfig__Group_3_1_1__2__Impl_in_rule__AttrClassConfig__Group_3_1_1__28385);
+            pushFollow(FOLLOW_2);
             rule__AttrClassConfig__Group_3_1_1__2__Impl();
 
             state._fsp--;
@@ -12247,25 +12247,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrClassConfig__Group_3_1_1__2__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4142:1: rule__AttrClassConfig__Group_3_1_1__2__Impl : ( ( rule__AttrClassConfig__MaxAssignment_3_1_1_2 ) ) ;
+    // InternalConfig.g:4141:1: rule__AttrClassConfig__Group_3_1_1__2__Impl : ( ( rule__AttrClassConfig__MaxAssignment_3_1_1_2 ) ) ;
     public final void rule__AttrClassConfig__Group_3_1_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4146:1: ( ( ( rule__AttrClassConfig__MaxAssignment_3_1_1_2 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4147:1: ( ( rule__AttrClassConfig__MaxAssignment_3_1_1_2 ) )
+            // InternalConfig.g:4145:1: ( ( ( rule__AttrClassConfig__MaxAssignment_3_1_1_2 ) ) )
+            // InternalConfig.g:4146:1: ( ( rule__AttrClassConfig__MaxAssignment_3_1_1_2 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4147:1: ( ( rule__AttrClassConfig__MaxAssignment_3_1_1_2 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4148:1: ( rule__AttrClassConfig__MaxAssignment_3_1_1_2 )
+            // InternalConfig.g:4146:1: ( ( rule__AttrClassConfig__MaxAssignment_3_1_1_2 ) )
+            // InternalConfig.g:4147:1: ( rule__AttrClassConfig__MaxAssignment_3_1_1_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAttrClassConfigAccess().getMaxAssignment_3_1_1_2()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4149:1: ( rule__AttrClassConfig__MaxAssignment_3_1_1_2 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4149:2: rule__AttrClassConfig__MaxAssignment_3_1_1_2
+            // InternalConfig.g:4148:1: ( rule__AttrClassConfig__MaxAssignment_3_1_1_2 )
+            // InternalConfig.g:4148:2: rule__AttrClassConfig__MaxAssignment_3_1_1_2
             {
-            pushFollow(FOLLOW_rule__AttrClassConfig__MaxAssignment_3_1_1_2_in_rule__AttrClassConfig__Group_3_1_1__2__Impl8412);
+            pushFollow(FOLLOW_2);
             rule__AttrClassConfig__MaxAssignment_3_1_1_2();
 
             state._fsp--;
@@ -12298,21 +12298,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrInstanceConfig__Group__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4165:1: rule__AttrInstanceConfig__Group__0 : rule__AttrInstanceConfig__Group__0__Impl rule__AttrInstanceConfig__Group__1 ;
+    // InternalConfig.g:4164:1: rule__AttrInstanceConfig__Group__0 : rule__AttrInstanceConfig__Group__0__Impl rule__AttrInstanceConfig__Group__1 ;
     public final void rule__AttrInstanceConfig__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4169:1: ( rule__AttrInstanceConfig__Group__0__Impl rule__AttrInstanceConfig__Group__1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4170:2: rule__AttrInstanceConfig__Group__0__Impl rule__AttrInstanceConfig__Group__1
+            // InternalConfig.g:4168:1: ( rule__AttrInstanceConfig__Group__0__Impl rule__AttrInstanceConfig__Group__1 )
+            // InternalConfig.g:4169:2: rule__AttrInstanceConfig__Group__0__Impl rule__AttrInstanceConfig__Group__1
             {
-            pushFollow(FOLLOW_rule__AttrInstanceConfig__Group__0__Impl_in_rule__AttrInstanceConfig__Group__08448);
+            pushFollow(FOLLOW_3);
             rule__AttrInstanceConfig__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__AttrInstanceConfig__Group__1_in_rule__AttrInstanceConfig__Group__08451);
+            pushFollow(FOLLOW_2);
             rule__AttrInstanceConfig__Group__1();
 
             state._fsp--;
@@ -12336,22 +12336,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrInstanceConfig__Group__0__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4177:1: rule__AttrInstanceConfig__Group__0__Impl : ( 'Attr' ) ;
+    // InternalConfig.g:4176:1: rule__AttrInstanceConfig__Group__0__Impl : ( 'Attr' ) ;
     public final void rule__AttrInstanceConfig__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4181:1: ( ( 'Attr' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4182:1: ( 'Attr' )
+            // InternalConfig.g:4180:1: ( ( 'Attr' ) )
+            // InternalConfig.g:4181:1: ( 'Attr' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4182:1: ( 'Attr' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4183:1: 'Attr'
+            // InternalConfig.g:4181:1: ( 'Attr' )
+            // InternalConfig.g:4182:1: 'Attr'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAttrInstanceConfigAccess().getAttrKeyword_0()); 
             }
-            match(input,42,FOLLOW_42_in_rule__AttrInstanceConfig__Group__0__Impl8479); if (state.failed) return ;
+            match(input,42,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getAttrInstanceConfigAccess().getAttrKeyword_0()); 
             }
@@ -12377,21 +12377,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrInstanceConfig__Group__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4196:1: rule__AttrInstanceConfig__Group__1 : rule__AttrInstanceConfig__Group__1__Impl rule__AttrInstanceConfig__Group__2 ;
+    // InternalConfig.g:4195:1: rule__AttrInstanceConfig__Group__1 : rule__AttrInstanceConfig__Group__1__Impl rule__AttrInstanceConfig__Group__2 ;
     public final void rule__AttrInstanceConfig__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4200:1: ( rule__AttrInstanceConfig__Group__1__Impl rule__AttrInstanceConfig__Group__2 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4201:2: rule__AttrInstanceConfig__Group__1__Impl rule__AttrInstanceConfig__Group__2
+            // InternalConfig.g:4199:1: ( rule__AttrInstanceConfig__Group__1__Impl rule__AttrInstanceConfig__Group__2 )
+            // InternalConfig.g:4200:2: rule__AttrInstanceConfig__Group__1__Impl rule__AttrInstanceConfig__Group__2
             {
-            pushFollow(FOLLOW_rule__AttrInstanceConfig__Group__1__Impl_in_rule__AttrInstanceConfig__Group__18510);
+            pushFollow(FOLLOW_20);
             rule__AttrInstanceConfig__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__AttrInstanceConfig__Group__2_in_rule__AttrInstanceConfig__Group__18513);
+            pushFollow(FOLLOW_2);
             rule__AttrInstanceConfig__Group__2();
 
             state._fsp--;
@@ -12415,25 +12415,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrInstanceConfig__Group__1__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4208:1: rule__AttrInstanceConfig__Group__1__Impl : ( ( rule__AttrInstanceConfig__AttributeAssignment_1 ) ) ;
+    // InternalConfig.g:4207:1: rule__AttrInstanceConfig__Group__1__Impl : ( ( rule__AttrInstanceConfig__AttributeAssignment_1 ) ) ;
     public final void rule__AttrInstanceConfig__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4212:1: ( ( ( rule__AttrInstanceConfig__AttributeAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4213:1: ( ( rule__AttrInstanceConfig__AttributeAssignment_1 ) )
+            // InternalConfig.g:4211:1: ( ( ( rule__AttrInstanceConfig__AttributeAssignment_1 ) ) )
+            // InternalConfig.g:4212:1: ( ( rule__AttrInstanceConfig__AttributeAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4213:1: ( ( rule__AttrInstanceConfig__AttributeAssignment_1 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4214:1: ( rule__AttrInstanceConfig__AttributeAssignment_1 )
+            // InternalConfig.g:4212:1: ( ( rule__AttrInstanceConfig__AttributeAssignment_1 ) )
+            // InternalConfig.g:4213:1: ( rule__AttrInstanceConfig__AttributeAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAttrInstanceConfigAccess().getAttributeAssignment_1()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4215:1: ( rule__AttrInstanceConfig__AttributeAssignment_1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4215:2: rule__AttrInstanceConfig__AttributeAssignment_1
+            // InternalConfig.g:4214:1: ( rule__AttrInstanceConfig__AttributeAssignment_1 )
+            // InternalConfig.g:4214:2: rule__AttrInstanceConfig__AttributeAssignment_1
             {
-            pushFollow(FOLLOW_rule__AttrInstanceConfig__AttributeAssignment_1_in_rule__AttrInstanceConfig__Group__1__Impl8540);
+            pushFollow(FOLLOW_2);
             rule__AttrInstanceConfig__AttributeAssignment_1();
 
             state._fsp--;
@@ -12466,21 +12466,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrInstanceConfig__Group__2"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4225:1: rule__AttrInstanceConfig__Group__2 : rule__AttrInstanceConfig__Group__2__Impl rule__AttrInstanceConfig__Group__3 ;
+    // InternalConfig.g:4224:1: rule__AttrInstanceConfig__Group__2 : rule__AttrInstanceConfig__Group__2__Impl rule__AttrInstanceConfig__Group__3 ;
     public final void rule__AttrInstanceConfig__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4229:1: ( rule__AttrInstanceConfig__Group__2__Impl rule__AttrInstanceConfig__Group__3 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4230:2: rule__AttrInstanceConfig__Group__2__Impl rule__AttrInstanceConfig__Group__3
+            // InternalConfig.g:4228:1: ( rule__AttrInstanceConfig__Group__2__Impl rule__AttrInstanceConfig__Group__3 )
+            // InternalConfig.g:4229:2: rule__AttrInstanceConfig__Group__2__Impl rule__AttrInstanceConfig__Group__3
             {
-            pushFollow(FOLLOW_rule__AttrInstanceConfig__Group__2__Impl_in_rule__AttrInstanceConfig__Group__28570);
+            pushFollow(FOLLOW_20);
             rule__AttrInstanceConfig__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__AttrInstanceConfig__Group__3_in_rule__AttrInstanceConfig__Group__28573);
+            pushFollow(FOLLOW_2);
             rule__AttrInstanceConfig__Group__3();
 
             state._fsp--;
@@ -12504,22 +12504,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrInstanceConfig__Group__2__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4237:1: rule__AttrInstanceConfig__Group__2__Impl : ( ( rule__AttrInstanceConfig__Group_2__0 )? ) ;
+    // InternalConfig.g:4236:1: rule__AttrInstanceConfig__Group__2__Impl : ( ( rule__AttrInstanceConfig__Group_2__0 )? ) ;
     public final void rule__AttrInstanceConfig__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4241:1: ( ( ( rule__AttrInstanceConfig__Group_2__0 )? ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4242:1: ( ( rule__AttrInstanceConfig__Group_2__0 )? )
+            // InternalConfig.g:4240:1: ( ( ( rule__AttrInstanceConfig__Group_2__0 )? ) )
+            // InternalConfig.g:4241:1: ( ( rule__AttrInstanceConfig__Group_2__0 )? )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4242:1: ( ( rule__AttrInstanceConfig__Group_2__0 )? )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4243:1: ( rule__AttrInstanceConfig__Group_2__0 )?
+            // InternalConfig.g:4241:1: ( ( rule__AttrInstanceConfig__Group_2__0 )? )
+            // InternalConfig.g:4242:1: ( rule__AttrInstanceConfig__Group_2__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAttrInstanceConfigAccess().getGroup_2()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4244:1: ( rule__AttrInstanceConfig__Group_2__0 )?
+            // InternalConfig.g:4243:1: ( rule__AttrInstanceConfig__Group_2__0 )?
             int alt32=2;
             int LA32_0 = input.LA(1);
 
@@ -12528,9 +12528,9 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             }
             switch (alt32) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4244:2: rule__AttrInstanceConfig__Group_2__0
+                    // InternalConfig.g:4243:2: rule__AttrInstanceConfig__Group_2__0
                     {
-                    pushFollow(FOLLOW_rule__AttrInstanceConfig__Group_2__0_in_rule__AttrInstanceConfig__Group__2__Impl8600);
+                    pushFollow(FOLLOW_2);
                     rule__AttrInstanceConfig__Group_2__0();
 
                     state._fsp--;
@@ -12566,16 +12566,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrInstanceConfig__Group__3"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4254:1: rule__AttrInstanceConfig__Group__3 : rule__AttrInstanceConfig__Group__3__Impl ;
+    // InternalConfig.g:4253:1: rule__AttrInstanceConfig__Group__3 : rule__AttrInstanceConfig__Group__3__Impl ;
     public final void rule__AttrInstanceConfig__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4258:1: ( rule__AttrInstanceConfig__Group__3__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4259:2: rule__AttrInstanceConfig__Group__3__Impl
+            // InternalConfig.g:4257:1: ( rule__AttrInstanceConfig__Group__3__Impl )
+            // InternalConfig.g:4258:2: rule__AttrInstanceConfig__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__AttrInstanceConfig__Group__3__Impl_in_rule__AttrInstanceConfig__Group__38631);
+            pushFollow(FOLLOW_2);
             rule__AttrInstanceConfig__Group__3__Impl();
 
             state._fsp--;
@@ -12599,22 +12599,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrInstanceConfig__Group__3__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4265:1: rule__AttrInstanceConfig__Group__3__Impl : ( ( rule__AttrInstanceConfig__Group_3__0 )? ) ;
+    // InternalConfig.g:4264:1: rule__AttrInstanceConfig__Group__3__Impl : ( ( rule__AttrInstanceConfig__Group_3__0 )? ) ;
     public final void rule__AttrInstanceConfig__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4269:1: ( ( ( rule__AttrInstanceConfig__Group_3__0 )? ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4270:1: ( ( rule__AttrInstanceConfig__Group_3__0 )? )
+            // InternalConfig.g:4268:1: ( ( ( rule__AttrInstanceConfig__Group_3__0 )? ) )
+            // InternalConfig.g:4269:1: ( ( rule__AttrInstanceConfig__Group_3__0 )? )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4270:1: ( ( rule__AttrInstanceConfig__Group_3__0 )? )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4271:1: ( rule__AttrInstanceConfig__Group_3__0 )?
+            // InternalConfig.g:4269:1: ( ( rule__AttrInstanceConfig__Group_3__0 )? )
+            // InternalConfig.g:4270:1: ( rule__AttrInstanceConfig__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAttrInstanceConfigAccess().getGroup_3()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4272:1: ( rule__AttrInstanceConfig__Group_3__0 )?
+            // InternalConfig.g:4271:1: ( rule__AttrInstanceConfig__Group_3__0 )?
             int alt33=2;
             int LA33_0 = input.LA(1);
 
@@ -12623,9 +12623,9 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             }
             switch (alt33) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4272:2: rule__AttrInstanceConfig__Group_3__0
+                    // InternalConfig.g:4271:2: rule__AttrInstanceConfig__Group_3__0
                     {
-                    pushFollow(FOLLOW_rule__AttrInstanceConfig__Group_3__0_in_rule__AttrInstanceConfig__Group__3__Impl8658);
+                    pushFollow(FOLLOW_2);
                     rule__AttrInstanceConfig__Group_3__0();
 
                     state._fsp--;
@@ -12661,21 +12661,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrInstanceConfig__Group_2__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4290:1: rule__AttrInstanceConfig__Group_2__0 : rule__AttrInstanceConfig__Group_2__0__Impl rule__AttrInstanceConfig__Group_2__1 ;
+    // InternalConfig.g:4289:1: rule__AttrInstanceConfig__Group_2__0 : rule__AttrInstanceConfig__Group_2__0__Impl rule__AttrInstanceConfig__Group_2__1 ;
     public final void rule__AttrInstanceConfig__Group_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4294:1: ( rule__AttrInstanceConfig__Group_2__0__Impl rule__AttrInstanceConfig__Group_2__1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4295:2: rule__AttrInstanceConfig__Group_2__0__Impl rule__AttrInstanceConfig__Group_2__1
+            // InternalConfig.g:4293:1: ( rule__AttrInstanceConfig__Group_2__0__Impl rule__AttrInstanceConfig__Group_2__1 )
+            // InternalConfig.g:4294:2: rule__AttrInstanceConfig__Group_2__0__Impl rule__AttrInstanceConfig__Group_2__1
             {
-            pushFollow(FOLLOW_rule__AttrInstanceConfig__Group_2__0__Impl_in_rule__AttrInstanceConfig__Group_2__08697);
+            pushFollow(FOLLOW_21);
             rule__AttrInstanceConfig__Group_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__AttrInstanceConfig__Group_2__1_in_rule__AttrInstanceConfig__Group_2__08700);
+            pushFollow(FOLLOW_2);
             rule__AttrInstanceConfig__Group_2__1();
 
             state._fsp--;
@@ -12699,22 +12699,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrInstanceConfig__Group_2__0__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4302:1: rule__AttrInstanceConfig__Group_2__0__Impl : ( '=' ) ;
+    // InternalConfig.g:4301:1: rule__AttrInstanceConfig__Group_2__0__Impl : ( '=' ) ;
     public final void rule__AttrInstanceConfig__Group_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4306:1: ( ( '=' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4307:1: ( '=' )
+            // InternalConfig.g:4305:1: ( ( '=' ) )
+            // InternalConfig.g:4306:1: ( '=' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4307:1: ( '=' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4308:1: '='
+            // InternalConfig.g:4306:1: ( '=' )
+            // InternalConfig.g:4307:1: '='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAttrInstanceConfigAccess().getEqualsSignKeyword_2_0()); 
             }
-            match(input,43,FOLLOW_43_in_rule__AttrInstanceConfig__Group_2__0__Impl8728); if (state.failed) return ;
+            match(input,43,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getAttrInstanceConfigAccess().getEqualsSignKeyword_2_0()); 
             }
@@ -12740,16 +12740,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrInstanceConfig__Group_2__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4321:1: rule__AttrInstanceConfig__Group_2__1 : rule__AttrInstanceConfig__Group_2__1__Impl ;
+    // InternalConfig.g:4320:1: rule__AttrInstanceConfig__Group_2__1 : rule__AttrInstanceConfig__Group_2__1__Impl ;
     public final void rule__AttrInstanceConfig__Group_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4325:1: ( rule__AttrInstanceConfig__Group_2__1__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4326:2: rule__AttrInstanceConfig__Group_2__1__Impl
+            // InternalConfig.g:4324:1: ( rule__AttrInstanceConfig__Group_2__1__Impl )
+            // InternalConfig.g:4325:2: rule__AttrInstanceConfig__Group_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__AttrInstanceConfig__Group_2__1__Impl_in_rule__AttrInstanceConfig__Group_2__18759);
+            pushFollow(FOLLOW_2);
             rule__AttrInstanceConfig__Group_2__1__Impl();
 
             state._fsp--;
@@ -12773,25 +12773,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrInstanceConfig__Group_2__1__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4332:1: rule__AttrInstanceConfig__Group_2__1__Impl : ( ( rule__AttrInstanceConfig__ValueAssignment_2_1 ) ) ;
+    // InternalConfig.g:4331:1: rule__AttrInstanceConfig__Group_2__1__Impl : ( ( rule__AttrInstanceConfig__ValueAssignment_2_1 ) ) ;
     public final void rule__AttrInstanceConfig__Group_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4336:1: ( ( ( rule__AttrInstanceConfig__ValueAssignment_2_1 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4337:1: ( ( rule__AttrInstanceConfig__ValueAssignment_2_1 ) )
+            // InternalConfig.g:4335:1: ( ( ( rule__AttrInstanceConfig__ValueAssignment_2_1 ) ) )
+            // InternalConfig.g:4336:1: ( ( rule__AttrInstanceConfig__ValueAssignment_2_1 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4337:1: ( ( rule__AttrInstanceConfig__ValueAssignment_2_1 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4338:1: ( rule__AttrInstanceConfig__ValueAssignment_2_1 )
+            // InternalConfig.g:4336:1: ( ( rule__AttrInstanceConfig__ValueAssignment_2_1 ) )
+            // InternalConfig.g:4337:1: ( rule__AttrInstanceConfig__ValueAssignment_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAttrInstanceConfigAccess().getValueAssignment_2_1()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4339:1: ( rule__AttrInstanceConfig__ValueAssignment_2_1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4339:2: rule__AttrInstanceConfig__ValueAssignment_2_1
+            // InternalConfig.g:4338:1: ( rule__AttrInstanceConfig__ValueAssignment_2_1 )
+            // InternalConfig.g:4338:2: rule__AttrInstanceConfig__ValueAssignment_2_1
             {
-            pushFollow(FOLLOW_rule__AttrInstanceConfig__ValueAssignment_2_1_in_rule__AttrInstanceConfig__Group_2__1__Impl8786);
+            pushFollow(FOLLOW_2);
             rule__AttrInstanceConfig__ValueAssignment_2_1();
 
             state._fsp--;
@@ -12824,21 +12824,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrInstanceConfig__Group_3__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4353:1: rule__AttrInstanceConfig__Group_3__0 : rule__AttrInstanceConfig__Group_3__0__Impl rule__AttrInstanceConfig__Group_3__1 ;
+    // InternalConfig.g:4352:1: rule__AttrInstanceConfig__Group_3__0 : rule__AttrInstanceConfig__Group_3__0__Impl rule__AttrInstanceConfig__Group_3__1 ;
     public final void rule__AttrInstanceConfig__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4357:1: ( rule__AttrInstanceConfig__Group_3__0__Impl rule__AttrInstanceConfig__Group_3__1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4358:2: rule__AttrInstanceConfig__Group_3__0__Impl rule__AttrInstanceConfig__Group_3__1
+            // InternalConfig.g:4356:1: ( rule__AttrInstanceConfig__Group_3__0__Impl rule__AttrInstanceConfig__Group_3__1 )
+            // InternalConfig.g:4357:2: rule__AttrInstanceConfig__Group_3__0__Impl rule__AttrInstanceConfig__Group_3__1
             {
-            pushFollow(FOLLOW_rule__AttrInstanceConfig__Group_3__0__Impl_in_rule__AttrInstanceConfig__Group_3__08820);
+            pushFollow(FOLLOW_25);
             rule__AttrInstanceConfig__Group_3__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__AttrInstanceConfig__Group_3__1_in_rule__AttrInstanceConfig__Group_3__08823);
+            pushFollow(FOLLOW_2);
             rule__AttrInstanceConfig__Group_3__1();
 
             state._fsp--;
@@ -12862,22 +12862,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrInstanceConfig__Group_3__0__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4365:1: rule__AttrInstanceConfig__Group_3__0__Impl : ( '{' ) ;
+    // InternalConfig.g:4364:1: rule__AttrInstanceConfig__Group_3__0__Impl : ( '{' ) ;
     public final void rule__AttrInstanceConfig__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4369:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4370:1: ( '{' )
+            // InternalConfig.g:4368:1: ( ( '{' ) )
+            // InternalConfig.g:4369:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4370:1: ( '{' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4371:1: '{'
+            // InternalConfig.g:4369:1: ( '{' )
+            // InternalConfig.g:4370:1: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAttrInstanceConfigAccess().getLeftCurlyBracketKeyword_3_0()); 
             }
-            match(input,27,FOLLOW_27_in_rule__AttrInstanceConfig__Group_3__0__Impl8851); if (state.failed) return ;
+            match(input,27,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getAttrInstanceConfigAccess().getLeftCurlyBracketKeyword_3_0()); 
             }
@@ -12903,21 +12903,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrInstanceConfig__Group_3__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4384:1: rule__AttrInstanceConfig__Group_3__1 : rule__AttrInstanceConfig__Group_3__1__Impl rule__AttrInstanceConfig__Group_3__2 ;
+    // InternalConfig.g:4383:1: rule__AttrInstanceConfig__Group_3__1 : rule__AttrInstanceConfig__Group_3__1__Impl rule__AttrInstanceConfig__Group_3__2 ;
     public final void rule__AttrInstanceConfig__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4388:1: ( rule__AttrInstanceConfig__Group_3__1__Impl rule__AttrInstanceConfig__Group_3__2 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4389:2: rule__AttrInstanceConfig__Group_3__1__Impl rule__AttrInstanceConfig__Group_3__2
+            // InternalConfig.g:4387:1: ( rule__AttrInstanceConfig__Group_3__1__Impl rule__AttrInstanceConfig__Group_3__2 )
+            // InternalConfig.g:4388:2: rule__AttrInstanceConfig__Group_3__1__Impl rule__AttrInstanceConfig__Group_3__2
             {
-            pushFollow(FOLLOW_rule__AttrInstanceConfig__Group_3__1__Impl_in_rule__AttrInstanceConfig__Group_3__18882);
+            pushFollow(FOLLOW_10);
             rule__AttrInstanceConfig__Group_3__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__AttrInstanceConfig__Group_3__2_in_rule__AttrInstanceConfig__Group_3__18885);
+            pushFollow(FOLLOW_2);
             rule__AttrInstanceConfig__Group_3__2();
 
             state._fsp--;
@@ -12941,25 +12941,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrInstanceConfig__Group_3__1__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4396:1: rule__AttrInstanceConfig__Group_3__1__Impl : ( ( rule__AttrInstanceConfig__Group_3_1__0 ) ) ;
+    // InternalConfig.g:4395:1: rule__AttrInstanceConfig__Group_3__1__Impl : ( ( rule__AttrInstanceConfig__Group_3_1__0 ) ) ;
     public final void rule__AttrInstanceConfig__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4400:1: ( ( ( rule__AttrInstanceConfig__Group_3_1__0 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4401:1: ( ( rule__AttrInstanceConfig__Group_3_1__0 ) )
+            // InternalConfig.g:4399:1: ( ( ( rule__AttrInstanceConfig__Group_3_1__0 ) ) )
+            // InternalConfig.g:4400:1: ( ( rule__AttrInstanceConfig__Group_3_1__0 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4401:1: ( ( rule__AttrInstanceConfig__Group_3_1__0 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4402:1: ( rule__AttrInstanceConfig__Group_3_1__0 )
+            // InternalConfig.g:4400:1: ( ( rule__AttrInstanceConfig__Group_3_1__0 ) )
+            // InternalConfig.g:4401:1: ( rule__AttrInstanceConfig__Group_3_1__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAttrInstanceConfigAccess().getGroup_3_1()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4403:1: ( rule__AttrInstanceConfig__Group_3_1__0 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4403:2: rule__AttrInstanceConfig__Group_3_1__0
+            // InternalConfig.g:4402:1: ( rule__AttrInstanceConfig__Group_3_1__0 )
+            // InternalConfig.g:4402:2: rule__AttrInstanceConfig__Group_3_1__0
             {
-            pushFollow(FOLLOW_rule__AttrInstanceConfig__Group_3_1__0_in_rule__AttrInstanceConfig__Group_3__1__Impl8912);
+            pushFollow(FOLLOW_2);
             rule__AttrInstanceConfig__Group_3_1__0();
 
             state._fsp--;
@@ -12992,16 +12992,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrInstanceConfig__Group_3__2"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4413:1: rule__AttrInstanceConfig__Group_3__2 : rule__AttrInstanceConfig__Group_3__2__Impl ;
+    // InternalConfig.g:4412:1: rule__AttrInstanceConfig__Group_3__2 : rule__AttrInstanceConfig__Group_3__2__Impl ;
     public final void rule__AttrInstanceConfig__Group_3__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4417:1: ( rule__AttrInstanceConfig__Group_3__2__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4418:2: rule__AttrInstanceConfig__Group_3__2__Impl
+            // InternalConfig.g:4416:1: ( rule__AttrInstanceConfig__Group_3__2__Impl )
+            // InternalConfig.g:4417:2: rule__AttrInstanceConfig__Group_3__2__Impl
             {
-            pushFollow(FOLLOW_rule__AttrInstanceConfig__Group_3__2__Impl_in_rule__AttrInstanceConfig__Group_3__28942);
+            pushFollow(FOLLOW_2);
             rule__AttrInstanceConfig__Group_3__2__Impl();
 
             state._fsp--;
@@ -13025,22 +13025,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrInstanceConfig__Group_3__2__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4424:1: rule__AttrInstanceConfig__Group_3__2__Impl : ( '}' ) ;
+    // InternalConfig.g:4423:1: rule__AttrInstanceConfig__Group_3__2__Impl : ( '}' ) ;
     public final void rule__AttrInstanceConfig__Group_3__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4428:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4429:1: ( '}' )
+            // InternalConfig.g:4427:1: ( ( '}' ) )
+            // InternalConfig.g:4428:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4429:1: ( '}' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4430:1: '}'
+            // InternalConfig.g:4428:1: ( '}' )
+            // InternalConfig.g:4429:1: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAttrInstanceConfigAccess().getRightCurlyBracketKeyword_3_2()); 
             }
-            match(input,28,FOLLOW_28_in_rule__AttrInstanceConfig__Group_3__2__Impl8970); if (state.failed) return ;
+            match(input,28,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getAttrInstanceConfigAccess().getRightCurlyBracketKeyword_3_2()); 
             }
@@ -13066,21 +13066,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrInstanceConfig__Group_3_1__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4449:1: rule__AttrInstanceConfig__Group_3_1__0 : rule__AttrInstanceConfig__Group_3_1__0__Impl rule__AttrInstanceConfig__Group_3_1__1 ;
+    // InternalConfig.g:4448:1: rule__AttrInstanceConfig__Group_3_1__0 : rule__AttrInstanceConfig__Group_3_1__0__Impl rule__AttrInstanceConfig__Group_3_1__1 ;
     public final void rule__AttrInstanceConfig__Group_3_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4453:1: ( rule__AttrInstanceConfig__Group_3_1__0__Impl rule__AttrInstanceConfig__Group_3_1__1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4454:2: rule__AttrInstanceConfig__Group_3_1__0__Impl rule__AttrInstanceConfig__Group_3_1__1
+            // InternalConfig.g:4452:1: ( rule__AttrInstanceConfig__Group_3_1__0__Impl rule__AttrInstanceConfig__Group_3_1__1 )
+            // InternalConfig.g:4453:2: rule__AttrInstanceConfig__Group_3_1__0__Impl rule__AttrInstanceConfig__Group_3_1__1
             {
-            pushFollow(FOLLOW_rule__AttrInstanceConfig__Group_3_1__0__Impl_in_rule__AttrInstanceConfig__Group_3_1__09007);
+            pushFollow(FOLLOW_25);
             rule__AttrInstanceConfig__Group_3_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__AttrInstanceConfig__Group_3_1__1_in_rule__AttrInstanceConfig__Group_3_1__09010);
+            pushFollow(FOLLOW_2);
             rule__AttrInstanceConfig__Group_3_1__1();
 
             state._fsp--;
@@ -13104,22 +13104,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrInstanceConfig__Group_3_1__0__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4461:1: rule__AttrInstanceConfig__Group_3_1__0__Impl : ( ( rule__AttrInstanceConfig__Group_3_1_0__0 )? ) ;
+    // InternalConfig.g:4460:1: rule__AttrInstanceConfig__Group_3_1__0__Impl : ( ( rule__AttrInstanceConfig__Group_3_1_0__0 )? ) ;
     public final void rule__AttrInstanceConfig__Group_3_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4465:1: ( ( ( rule__AttrInstanceConfig__Group_3_1_0__0 )? ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4466:1: ( ( rule__AttrInstanceConfig__Group_3_1_0__0 )? )
+            // InternalConfig.g:4464:1: ( ( ( rule__AttrInstanceConfig__Group_3_1_0__0 )? ) )
+            // InternalConfig.g:4465:1: ( ( rule__AttrInstanceConfig__Group_3_1_0__0 )? )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4466:1: ( ( rule__AttrInstanceConfig__Group_3_1_0__0 )? )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4467:1: ( rule__AttrInstanceConfig__Group_3_1_0__0 )?
+            // InternalConfig.g:4465:1: ( ( rule__AttrInstanceConfig__Group_3_1_0__0 )? )
+            // InternalConfig.g:4466:1: ( rule__AttrInstanceConfig__Group_3_1_0__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAttrInstanceConfigAccess().getGroup_3_1_0()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4468:1: ( rule__AttrInstanceConfig__Group_3_1_0__0 )?
+            // InternalConfig.g:4467:1: ( rule__AttrInstanceConfig__Group_3_1_0__0 )?
             int alt34=2;
             int LA34_0 = input.LA(1);
 
@@ -13128,9 +13128,9 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             }
             switch (alt34) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4468:2: rule__AttrInstanceConfig__Group_3_1_0__0
+                    // InternalConfig.g:4467:2: rule__AttrInstanceConfig__Group_3_1_0__0
                     {
-                    pushFollow(FOLLOW_rule__AttrInstanceConfig__Group_3_1_0__0_in_rule__AttrInstanceConfig__Group_3_1__0__Impl9037);
+                    pushFollow(FOLLOW_2);
                     rule__AttrInstanceConfig__Group_3_1_0__0();
 
                     state._fsp--;
@@ -13166,16 +13166,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrInstanceConfig__Group_3_1__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4478:1: rule__AttrInstanceConfig__Group_3_1__1 : rule__AttrInstanceConfig__Group_3_1__1__Impl ;
+    // InternalConfig.g:4477:1: rule__AttrInstanceConfig__Group_3_1__1 : rule__AttrInstanceConfig__Group_3_1__1__Impl ;
     public final void rule__AttrInstanceConfig__Group_3_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4482:1: ( rule__AttrInstanceConfig__Group_3_1__1__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4483:2: rule__AttrInstanceConfig__Group_3_1__1__Impl
+            // InternalConfig.g:4481:1: ( rule__AttrInstanceConfig__Group_3_1__1__Impl )
+            // InternalConfig.g:4482:2: rule__AttrInstanceConfig__Group_3_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__AttrInstanceConfig__Group_3_1__1__Impl_in_rule__AttrInstanceConfig__Group_3_1__19068);
+            pushFollow(FOLLOW_2);
             rule__AttrInstanceConfig__Group_3_1__1__Impl();
 
             state._fsp--;
@@ -13199,22 +13199,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrInstanceConfig__Group_3_1__1__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4489:1: rule__AttrInstanceConfig__Group_3_1__1__Impl : ( ( rule__AttrInstanceConfig__AttributesAssignment_3_1_1 )* ) ;
+    // InternalConfig.g:4488:1: rule__AttrInstanceConfig__Group_3_1__1__Impl : ( ( rule__AttrInstanceConfig__AttributesAssignment_3_1_1 )* ) ;
     public final void rule__AttrInstanceConfig__Group_3_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4493:1: ( ( ( rule__AttrInstanceConfig__AttributesAssignment_3_1_1 )* ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4494:1: ( ( rule__AttrInstanceConfig__AttributesAssignment_3_1_1 )* )
+            // InternalConfig.g:4492:1: ( ( ( rule__AttrInstanceConfig__AttributesAssignment_3_1_1 )* ) )
+            // InternalConfig.g:4493:1: ( ( rule__AttrInstanceConfig__AttributesAssignment_3_1_1 )* )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4494:1: ( ( rule__AttrInstanceConfig__AttributesAssignment_3_1_1 )* )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4495:1: ( rule__AttrInstanceConfig__AttributesAssignment_3_1_1 )*
+            // InternalConfig.g:4493:1: ( ( rule__AttrInstanceConfig__AttributesAssignment_3_1_1 )* )
+            // InternalConfig.g:4494:1: ( rule__AttrInstanceConfig__AttributesAssignment_3_1_1 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAttrInstanceConfigAccess().getAttributesAssignment_3_1_1()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4496:1: ( rule__AttrInstanceConfig__AttributesAssignment_3_1_1 )*
+            // InternalConfig.g:4495:1: ( rule__AttrInstanceConfig__AttributesAssignment_3_1_1 )*
             loop35:
             do {
                 int alt35=2;
@@ -13227,9 +13227,9 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
                 switch (alt35) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4496:2: rule__AttrInstanceConfig__AttributesAssignment_3_1_1
+            	    // InternalConfig.g:4495:2: rule__AttrInstanceConfig__AttributesAssignment_3_1_1
             	    {
-            	    pushFollow(FOLLOW_rule__AttrInstanceConfig__AttributesAssignment_3_1_1_in_rule__AttrInstanceConfig__Group_3_1__1__Impl9095);
+            	    pushFollow(FOLLOW_16);
             	    rule__AttrInstanceConfig__AttributesAssignment_3_1_1();
 
             	    state._fsp--;
@@ -13268,21 +13268,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrInstanceConfig__Group_3_1_0__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4510:1: rule__AttrInstanceConfig__Group_3_1_0__0 : rule__AttrInstanceConfig__Group_3_1_0__0__Impl rule__AttrInstanceConfig__Group_3_1_0__1 ;
+    // InternalConfig.g:4509:1: rule__AttrInstanceConfig__Group_3_1_0__0 : rule__AttrInstanceConfig__Group_3_1_0__0__Impl rule__AttrInstanceConfig__Group_3_1_0__1 ;
     public final void rule__AttrInstanceConfig__Group_3_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4514:1: ( rule__AttrInstanceConfig__Group_3_1_0__0__Impl rule__AttrInstanceConfig__Group_3_1_0__1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4515:2: rule__AttrInstanceConfig__Group_3_1_0__0__Impl rule__AttrInstanceConfig__Group_3_1_0__1
+            // InternalConfig.g:4513:1: ( rule__AttrInstanceConfig__Group_3_1_0__0__Impl rule__AttrInstanceConfig__Group_3_1_0__1 )
+            // InternalConfig.g:4514:2: rule__AttrInstanceConfig__Group_3_1_0__0__Impl rule__AttrInstanceConfig__Group_3_1_0__1
             {
-            pushFollow(FOLLOW_rule__AttrInstanceConfig__Group_3_1_0__0__Impl_in_rule__AttrInstanceConfig__Group_3_1_0__09130);
+            pushFollow(FOLLOW_26);
             rule__AttrInstanceConfig__Group_3_1_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__AttrInstanceConfig__Group_3_1_0__1_in_rule__AttrInstanceConfig__Group_3_1_0__09133);
+            pushFollow(FOLLOW_2);
             rule__AttrInstanceConfig__Group_3_1_0__1();
 
             state._fsp--;
@@ -13306,25 +13306,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrInstanceConfig__Group_3_1_0__0__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4522:1: rule__AttrInstanceConfig__Group_3_1_0__0__Impl : ( ( rule__AttrInstanceConfig__DynConfigAssignment_3_1_0_0 ) ) ;
+    // InternalConfig.g:4521:1: rule__AttrInstanceConfig__Group_3_1_0__0__Impl : ( ( rule__AttrInstanceConfig__DynConfigAssignment_3_1_0_0 ) ) ;
     public final void rule__AttrInstanceConfig__Group_3_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4526:1: ( ( ( rule__AttrInstanceConfig__DynConfigAssignment_3_1_0_0 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4527:1: ( ( rule__AttrInstanceConfig__DynConfigAssignment_3_1_0_0 ) )
+            // InternalConfig.g:4525:1: ( ( ( rule__AttrInstanceConfig__DynConfigAssignment_3_1_0_0 ) ) )
+            // InternalConfig.g:4526:1: ( ( rule__AttrInstanceConfig__DynConfigAssignment_3_1_0_0 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4527:1: ( ( rule__AttrInstanceConfig__DynConfigAssignment_3_1_0_0 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4528:1: ( rule__AttrInstanceConfig__DynConfigAssignment_3_1_0_0 )
+            // InternalConfig.g:4526:1: ( ( rule__AttrInstanceConfig__DynConfigAssignment_3_1_0_0 ) )
+            // InternalConfig.g:4527:1: ( rule__AttrInstanceConfig__DynConfigAssignment_3_1_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAttrInstanceConfigAccess().getDynConfigAssignment_3_1_0_0()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4529:1: ( rule__AttrInstanceConfig__DynConfigAssignment_3_1_0_0 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4529:2: rule__AttrInstanceConfig__DynConfigAssignment_3_1_0_0
+            // InternalConfig.g:4528:1: ( rule__AttrInstanceConfig__DynConfigAssignment_3_1_0_0 )
+            // InternalConfig.g:4528:2: rule__AttrInstanceConfig__DynConfigAssignment_3_1_0_0
             {
-            pushFollow(FOLLOW_rule__AttrInstanceConfig__DynConfigAssignment_3_1_0_0_in_rule__AttrInstanceConfig__Group_3_1_0__0__Impl9160);
+            pushFollow(FOLLOW_2);
             rule__AttrInstanceConfig__DynConfigAssignment_3_1_0_0();
 
             state._fsp--;
@@ -13357,16 +13357,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrInstanceConfig__Group_3_1_0__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4539:1: rule__AttrInstanceConfig__Group_3_1_0__1 : rule__AttrInstanceConfig__Group_3_1_0__1__Impl ;
+    // InternalConfig.g:4538:1: rule__AttrInstanceConfig__Group_3_1_0__1 : rule__AttrInstanceConfig__Group_3_1_0__1__Impl ;
     public final void rule__AttrInstanceConfig__Group_3_1_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4543:1: ( rule__AttrInstanceConfig__Group_3_1_0__1__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4544:2: rule__AttrInstanceConfig__Group_3_1_0__1__Impl
+            // InternalConfig.g:4542:1: ( rule__AttrInstanceConfig__Group_3_1_0__1__Impl )
+            // InternalConfig.g:4543:2: rule__AttrInstanceConfig__Group_3_1_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__AttrInstanceConfig__Group_3_1_0__1__Impl_in_rule__AttrInstanceConfig__Group_3_1_0__19190);
+            pushFollow(FOLLOW_2);
             rule__AttrInstanceConfig__Group_3_1_0__1__Impl();
 
             state._fsp--;
@@ -13390,25 +13390,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrInstanceConfig__Group_3_1_0__1__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4550:1: rule__AttrInstanceConfig__Group_3_1_0__1__Impl : ( ( rule__AttrInstanceConfig__Alternatives_3_1_0_1 ) ) ;
+    // InternalConfig.g:4549:1: rule__AttrInstanceConfig__Group_3_1_0__1__Impl : ( ( rule__AttrInstanceConfig__Alternatives_3_1_0_1 ) ) ;
     public final void rule__AttrInstanceConfig__Group_3_1_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4554:1: ( ( ( rule__AttrInstanceConfig__Alternatives_3_1_0_1 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4555:1: ( ( rule__AttrInstanceConfig__Alternatives_3_1_0_1 ) )
+            // InternalConfig.g:4553:1: ( ( ( rule__AttrInstanceConfig__Alternatives_3_1_0_1 ) ) )
+            // InternalConfig.g:4554:1: ( ( rule__AttrInstanceConfig__Alternatives_3_1_0_1 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4555:1: ( ( rule__AttrInstanceConfig__Alternatives_3_1_0_1 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4556:1: ( rule__AttrInstanceConfig__Alternatives_3_1_0_1 )
+            // InternalConfig.g:4554:1: ( ( rule__AttrInstanceConfig__Alternatives_3_1_0_1 ) )
+            // InternalConfig.g:4555:1: ( rule__AttrInstanceConfig__Alternatives_3_1_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAttrInstanceConfigAccess().getAlternatives_3_1_0_1()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4557:1: ( rule__AttrInstanceConfig__Alternatives_3_1_0_1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4557:2: rule__AttrInstanceConfig__Alternatives_3_1_0_1
+            // InternalConfig.g:4556:1: ( rule__AttrInstanceConfig__Alternatives_3_1_0_1 )
+            // InternalConfig.g:4556:2: rule__AttrInstanceConfig__Alternatives_3_1_0_1
             {
-            pushFollow(FOLLOW_rule__AttrInstanceConfig__Alternatives_3_1_0_1_in_rule__AttrInstanceConfig__Group_3_1_0__1__Impl9217);
+            pushFollow(FOLLOW_2);
             rule__AttrInstanceConfig__Alternatives_3_1_0_1();
 
             state._fsp--;
@@ -13441,21 +13441,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ConfigValueArray__Group__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4571:1: rule__ConfigValueArray__Group__0 : rule__ConfigValueArray__Group__0__Impl rule__ConfigValueArray__Group__1 ;
+    // InternalConfig.g:4570:1: rule__ConfigValueArray__Group__0 : rule__ConfigValueArray__Group__0__Impl rule__ConfigValueArray__Group__1 ;
     public final void rule__ConfigValueArray__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4575:1: ( rule__ConfigValueArray__Group__0__Impl rule__ConfigValueArray__Group__1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4576:2: rule__ConfigValueArray__Group__0__Impl rule__ConfigValueArray__Group__1
+            // InternalConfig.g:4574:1: ( rule__ConfigValueArray__Group__0__Impl rule__ConfigValueArray__Group__1 )
+            // InternalConfig.g:4575:2: rule__ConfigValueArray__Group__0__Impl rule__ConfigValueArray__Group__1
             {
-            pushFollow(FOLLOW_rule__ConfigValueArray__Group__0__Impl_in_rule__ConfigValueArray__Group__09251);
+            pushFollow(FOLLOW_27);
             rule__ConfigValueArray__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ConfigValueArray__Group__1_in_rule__ConfigValueArray__Group__09254);
+            pushFollow(FOLLOW_2);
             rule__ConfigValueArray__Group__1();
 
             state._fsp--;
@@ -13479,25 +13479,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ConfigValueArray__Group__0__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4583:1: rule__ConfigValueArray__Group__0__Impl : ( ( rule__ConfigValueArray__ValuesAssignment_0 ) ) ;
+    // InternalConfig.g:4582:1: rule__ConfigValueArray__Group__0__Impl : ( ( rule__ConfigValueArray__ValuesAssignment_0 ) ) ;
     public final void rule__ConfigValueArray__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4587:1: ( ( ( rule__ConfigValueArray__ValuesAssignment_0 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4588:1: ( ( rule__ConfigValueArray__ValuesAssignment_0 ) )
+            // InternalConfig.g:4586:1: ( ( ( rule__ConfigValueArray__ValuesAssignment_0 ) ) )
+            // InternalConfig.g:4587:1: ( ( rule__ConfigValueArray__ValuesAssignment_0 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4588:1: ( ( rule__ConfigValueArray__ValuesAssignment_0 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4589:1: ( rule__ConfigValueArray__ValuesAssignment_0 )
+            // InternalConfig.g:4587:1: ( ( rule__ConfigValueArray__ValuesAssignment_0 ) )
+            // InternalConfig.g:4588:1: ( rule__ConfigValueArray__ValuesAssignment_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfigValueArrayAccess().getValuesAssignment_0()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4590:1: ( rule__ConfigValueArray__ValuesAssignment_0 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4590:2: rule__ConfigValueArray__ValuesAssignment_0
+            // InternalConfig.g:4589:1: ( rule__ConfigValueArray__ValuesAssignment_0 )
+            // InternalConfig.g:4589:2: rule__ConfigValueArray__ValuesAssignment_0
             {
-            pushFollow(FOLLOW_rule__ConfigValueArray__ValuesAssignment_0_in_rule__ConfigValueArray__Group__0__Impl9281);
+            pushFollow(FOLLOW_2);
             rule__ConfigValueArray__ValuesAssignment_0();
 
             state._fsp--;
@@ -13530,16 +13530,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ConfigValueArray__Group__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4600:1: rule__ConfigValueArray__Group__1 : rule__ConfigValueArray__Group__1__Impl ;
+    // InternalConfig.g:4599:1: rule__ConfigValueArray__Group__1 : rule__ConfigValueArray__Group__1__Impl ;
     public final void rule__ConfigValueArray__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4604:1: ( rule__ConfigValueArray__Group__1__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4605:2: rule__ConfigValueArray__Group__1__Impl
+            // InternalConfig.g:4603:1: ( rule__ConfigValueArray__Group__1__Impl )
+            // InternalConfig.g:4604:2: rule__ConfigValueArray__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__ConfigValueArray__Group__1__Impl_in_rule__ConfigValueArray__Group__19311);
+            pushFollow(FOLLOW_2);
             rule__ConfigValueArray__Group__1__Impl();
 
             state._fsp--;
@@ -13563,22 +13563,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ConfigValueArray__Group__1__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4611:1: rule__ConfigValueArray__Group__1__Impl : ( ( rule__ConfigValueArray__Group_1__0 )* ) ;
+    // InternalConfig.g:4610:1: rule__ConfigValueArray__Group__1__Impl : ( ( rule__ConfigValueArray__Group_1__0 )* ) ;
     public final void rule__ConfigValueArray__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4615:1: ( ( ( rule__ConfigValueArray__Group_1__0 )* ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4616:1: ( ( rule__ConfigValueArray__Group_1__0 )* )
+            // InternalConfig.g:4614:1: ( ( ( rule__ConfigValueArray__Group_1__0 )* ) )
+            // InternalConfig.g:4615:1: ( ( rule__ConfigValueArray__Group_1__0 )* )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4616:1: ( ( rule__ConfigValueArray__Group_1__0 )* )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4617:1: ( rule__ConfigValueArray__Group_1__0 )*
+            // InternalConfig.g:4615:1: ( ( rule__ConfigValueArray__Group_1__0 )* )
+            // InternalConfig.g:4616:1: ( rule__ConfigValueArray__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfigValueArrayAccess().getGroup_1()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4618:1: ( rule__ConfigValueArray__Group_1__0 )*
+            // InternalConfig.g:4617:1: ( rule__ConfigValueArray__Group_1__0 )*
             loop36:
             do {
                 int alt36=2;
@@ -13591,9 +13591,9 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
                 switch (alt36) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4618:2: rule__ConfigValueArray__Group_1__0
+            	    // InternalConfig.g:4617:2: rule__ConfigValueArray__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__ConfigValueArray__Group_1__0_in_rule__ConfigValueArray__Group__1__Impl9338);
+            	    pushFollow(FOLLOW_28);
             	    rule__ConfigValueArray__Group_1__0();
 
             	    state._fsp--;
@@ -13632,21 +13632,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ConfigValueArray__Group_1__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4632:1: rule__ConfigValueArray__Group_1__0 : rule__ConfigValueArray__Group_1__0__Impl rule__ConfigValueArray__Group_1__1 ;
+    // InternalConfig.g:4631:1: rule__ConfigValueArray__Group_1__0 : rule__ConfigValueArray__Group_1__0__Impl rule__ConfigValueArray__Group_1__1 ;
     public final void rule__ConfigValueArray__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4636:1: ( rule__ConfigValueArray__Group_1__0__Impl rule__ConfigValueArray__Group_1__1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4637:2: rule__ConfigValueArray__Group_1__0__Impl rule__ConfigValueArray__Group_1__1
+            // InternalConfig.g:4635:1: ( rule__ConfigValueArray__Group_1__0__Impl rule__ConfigValueArray__Group_1__1 )
+            // InternalConfig.g:4636:2: rule__ConfigValueArray__Group_1__0__Impl rule__ConfigValueArray__Group_1__1
             {
-            pushFollow(FOLLOW_rule__ConfigValueArray__Group_1__0__Impl_in_rule__ConfigValueArray__Group_1__09373);
+            pushFollow(FOLLOW_21);
             rule__ConfigValueArray__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ConfigValueArray__Group_1__1_in_rule__ConfigValueArray__Group_1__09376);
+            pushFollow(FOLLOW_2);
             rule__ConfigValueArray__Group_1__1();
 
             state._fsp--;
@@ -13670,22 +13670,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ConfigValueArray__Group_1__0__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4644:1: rule__ConfigValueArray__Group_1__0__Impl : ( ',' ) ;
+    // InternalConfig.g:4643:1: rule__ConfigValueArray__Group_1__0__Impl : ( ',' ) ;
     public final void rule__ConfigValueArray__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4648:1: ( ( ',' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4649:1: ( ',' )
+            // InternalConfig.g:4647:1: ( ( ',' ) )
+            // InternalConfig.g:4648:1: ( ',' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4649:1: ( ',' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4650:1: ','
+            // InternalConfig.g:4648:1: ( ',' )
+            // InternalConfig.g:4649:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfigValueArrayAccess().getCommaKeyword_1_0()); 
             }
-            match(input,46,FOLLOW_46_in_rule__ConfigValueArray__Group_1__0__Impl9404); if (state.failed) return ;
+            match(input,46,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getConfigValueArrayAccess().getCommaKeyword_1_0()); 
             }
@@ -13711,16 +13711,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ConfigValueArray__Group_1__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4663:1: rule__ConfigValueArray__Group_1__1 : rule__ConfigValueArray__Group_1__1__Impl ;
+    // InternalConfig.g:4662:1: rule__ConfigValueArray__Group_1__1 : rule__ConfigValueArray__Group_1__1__Impl ;
     public final void rule__ConfigValueArray__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4667:1: ( rule__ConfigValueArray__Group_1__1__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4668:2: rule__ConfigValueArray__Group_1__1__Impl
+            // InternalConfig.g:4666:1: ( rule__ConfigValueArray__Group_1__1__Impl )
+            // InternalConfig.g:4667:2: rule__ConfigValueArray__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__ConfigValueArray__Group_1__1__Impl_in_rule__ConfigValueArray__Group_1__19435);
+            pushFollow(FOLLOW_2);
             rule__ConfigValueArray__Group_1__1__Impl();
 
             state._fsp--;
@@ -13744,25 +13744,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ConfigValueArray__Group_1__1__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4674:1: rule__ConfigValueArray__Group_1__1__Impl : ( ( rule__ConfigValueArray__ValuesAssignment_1_1 ) ) ;
+    // InternalConfig.g:4673:1: rule__ConfigValueArray__Group_1__1__Impl : ( ( rule__ConfigValueArray__ValuesAssignment_1_1 ) ) ;
     public final void rule__ConfigValueArray__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4678:1: ( ( ( rule__ConfigValueArray__ValuesAssignment_1_1 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4679:1: ( ( rule__ConfigValueArray__ValuesAssignment_1_1 ) )
+            // InternalConfig.g:4677:1: ( ( ( rule__ConfigValueArray__ValuesAssignment_1_1 ) ) )
+            // InternalConfig.g:4678:1: ( ( rule__ConfigValueArray__ValuesAssignment_1_1 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4679:1: ( ( rule__ConfigValueArray__ValuesAssignment_1_1 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4680:1: ( rule__ConfigValueArray__ValuesAssignment_1_1 )
+            // InternalConfig.g:4678:1: ( ( rule__ConfigValueArray__ValuesAssignment_1_1 ) )
+            // InternalConfig.g:4679:1: ( rule__ConfigValueArray__ValuesAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfigValueArrayAccess().getValuesAssignment_1_1()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4681:1: ( rule__ConfigValueArray__ValuesAssignment_1_1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4681:2: rule__ConfigValueArray__ValuesAssignment_1_1
+            // InternalConfig.g:4680:1: ( rule__ConfigValueArray__ValuesAssignment_1_1 )
+            // InternalConfig.g:4680:2: rule__ConfigValueArray__ValuesAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__ConfigValueArray__ValuesAssignment_1_1_in_rule__ConfigValueArray__Group_1__1__Impl9462);
+            pushFollow(FOLLOW_2);
             rule__ConfigValueArray__ValuesAssignment_1_1();
 
             state._fsp--;
@@ -13795,21 +13795,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumConfigValue__Group__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4695:1: rule__EnumConfigValue__Group__0 : rule__EnumConfigValue__Group__0__Impl rule__EnumConfigValue__Group__1 ;
+    // InternalConfig.g:4694:1: rule__EnumConfigValue__Group__0 : rule__EnumConfigValue__Group__0__Impl rule__EnumConfigValue__Group__1 ;
     public final void rule__EnumConfigValue__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4699:1: ( rule__EnumConfigValue__Group__0__Impl rule__EnumConfigValue__Group__1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4700:2: rule__EnumConfigValue__Group__0__Impl rule__EnumConfigValue__Group__1
+            // InternalConfig.g:4698:1: ( rule__EnumConfigValue__Group__0__Impl rule__EnumConfigValue__Group__1 )
+            // InternalConfig.g:4699:2: rule__EnumConfigValue__Group__0__Impl rule__EnumConfigValue__Group__1
             {
-            pushFollow(FOLLOW_rule__EnumConfigValue__Group__0__Impl_in_rule__EnumConfigValue__Group__09496);
+            pushFollow(FOLLOW_29);
             rule__EnumConfigValue__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__EnumConfigValue__Group__1_in_rule__EnumConfigValue__Group__09499);
+            pushFollow(FOLLOW_2);
             rule__EnumConfigValue__Group__1();
 
             state._fsp--;
@@ -13833,25 +13833,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumConfigValue__Group__0__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4707:1: rule__EnumConfigValue__Group__0__Impl : ( ( rule__EnumConfigValue__TypeAssignment_0 ) ) ;
+    // InternalConfig.g:4706:1: rule__EnumConfigValue__Group__0__Impl : ( ( rule__EnumConfigValue__TypeAssignment_0 ) ) ;
     public final void rule__EnumConfigValue__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4711:1: ( ( ( rule__EnumConfigValue__TypeAssignment_0 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4712:1: ( ( rule__EnumConfigValue__TypeAssignment_0 ) )
+            // InternalConfig.g:4710:1: ( ( ( rule__EnumConfigValue__TypeAssignment_0 ) ) )
+            // InternalConfig.g:4711:1: ( ( rule__EnumConfigValue__TypeAssignment_0 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4712:1: ( ( rule__EnumConfigValue__TypeAssignment_0 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4713:1: ( rule__EnumConfigValue__TypeAssignment_0 )
+            // InternalConfig.g:4711:1: ( ( rule__EnumConfigValue__TypeAssignment_0 ) )
+            // InternalConfig.g:4712:1: ( rule__EnumConfigValue__TypeAssignment_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getEnumConfigValueAccess().getTypeAssignment_0()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4714:1: ( rule__EnumConfigValue__TypeAssignment_0 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4714:2: rule__EnumConfigValue__TypeAssignment_0
+            // InternalConfig.g:4713:1: ( rule__EnumConfigValue__TypeAssignment_0 )
+            // InternalConfig.g:4713:2: rule__EnumConfigValue__TypeAssignment_0
             {
-            pushFollow(FOLLOW_rule__EnumConfigValue__TypeAssignment_0_in_rule__EnumConfigValue__Group__0__Impl9526);
+            pushFollow(FOLLOW_2);
             rule__EnumConfigValue__TypeAssignment_0();
 
             state._fsp--;
@@ -13884,21 +13884,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumConfigValue__Group__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4724:1: rule__EnumConfigValue__Group__1 : rule__EnumConfigValue__Group__1__Impl rule__EnumConfigValue__Group__2 ;
+    // InternalConfig.g:4723:1: rule__EnumConfigValue__Group__1 : rule__EnumConfigValue__Group__1__Impl rule__EnumConfigValue__Group__2 ;
     public final void rule__EnumConfigValue__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4728:1: ( rule__EnumConfigValue__Group__1__Impl rule__EnumConfigValue__Group__2 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4729:2: rule__EnumConfigValue__Group__1__Impl rule__EnumConfigValue__Group__2
+            // InternalConfig.g:4727:1: ( rule__EnumConfigValue__Group__1__Impl rule__EnumConfigValue__Group__2 )
+            // InternalConfig.g:4728:2: rule__EnumConfigValue__Group__1__Impl rule__EnumConfigValue__Group__2
             {
-            pushFollow(FOLLOW_rule__EnumConfigValue__Group__1__Impl_in_rule__EnumConfigValue__Group__19556);
+            pushFollow(FOLLOW_3);
             rule__EnumConfigValue__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__EnumConfigValue__Group__2_in_rule__EnumConfigValue__Group__19559);
+            pushFollow(FOLLOW_2);
             rule__EnumConfigValue__Group__2();
 
             state._fsp--;
@@ -13922,22 +13922,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumConfigValue__Group__1__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4736:1: rule__EnumConfigValue__Group__1__Impl : ( '.' ) ;
+    // InternalConfig.g:4735:1: rule__EnumConfigValue__Group__1__Impl : ( '.' ) ;
     public final void rule__EnumConfigValue__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4740:1: ( ( '.' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4741:1: ( '.' )
+            // InternalConfig.g:4739:1: ( ( '.' ) )
+            // InternalConfig.g:4740:1: ( '.' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4741:1: ( '.' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4742:1: '.'
+            // InternalConfig.g:4740:1: ( '.' )
+            // InternalConfig.g:4741:1: '.'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getEnumConfigValueAccess().getFullStopKeyword_1()); 
             }
-            match(input,47,FOLLOW_47_in_rule__EnumConfigValue__Group__1__Impl9587); if (state.failed) return ;
+            match(input,47,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getEnumConfigValueAccess().getFullStopKeyword_1()); 
             }
@@ -13963,16 +13963,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumConfigValue__Group__2"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4755:1: rule__EnumConfigValue__Group__2 : rule__EnumConfigValue__Group__2__Impl ;
+    // InternalConfig.g:4754:1: rule__EnumConfigValue__Group__2 : rule__EnumConfigValue__Group__2__Impl ;
     public final void rule__EnumConfigValue__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4759:1: ( rule__EnumConfigValue__Group__2__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4760:2: rule__EnumConfigValue__Group__2__Impl
+            // InternalConfig.g:4758:1: ( rule__EnumConfigValue__Group__2__Impl )
+            // InternalConfig.g:4759:2: rule__EnumConfigValue__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__EnumConfigValue__Group__2__Impl_in_rule__EnumConfigValue__Group__29618);
+            pushFollow(FOLLOW_2);
             rule__EnumConfigValue__Group__2__Impl();
 
             state._fsp--;
@@ -13996,25 +13996,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumConfigValue__Group__2__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4766:1: rule__EnumConfigValue__Group__2__Impl : ( ( rule__EnumConfigValue__ValueAssignment_2 ) ) ;
+    // InternalConfig.g:4765:1: rule__EnumConfigValue__Group__2__Impl : ( ( rule__EnumConfigValue__ValueAssignment_2 ) ) ;
     public final void rule__EnumConfigValue__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4770:1: ( ( ( rule__EnumConfigValue__ValueAssignment_2 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4771:1: ( ( rule__EnumConfigValue__ValueAssignment_2 ) )
+            // InternalConfig.g:4769:1: ( ( ( rule__EnumConfigValue__ValueAssignment_2 ) ) )
+            // InternalConfig.g:4770:1: ( ( rule__EnumConfigValue__ValueAssignment_2 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4771:1: ( ( rule__EnumConfigValue__ValueAssignment_2 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4772:1: ( rule__EnumConfigValue__ValueAssignment_2 )
+            // InternalConfig.g:4770:1: ( ( rule__EnumConfigValue__ValueAssignment_2 ) )
+            // InternalConfig.g:4771:1: ( rule__EnumConfigValue__ValueAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getEnumConfigValueAccess().getValueAssignment_2()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4773:1: ( rule__EnumConfigValue__ValueAssignment_2 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4773:2: rule__EnumConfigValue__ValueAssignment_2
+            // InternalConfig.g:4772:1: ( rule__EnumConfigValue__ValueAssignment_2 )
+            // InternalConfig.g:4772:2: rule__EnumConfigValue__ValueAssignment_2
             {
-            pushFollow(FOLLOW_rule__EnumConfigValue__ValueAssignment_2_in_rule__EnumConfigValue__Group__2__Impl9645);
+            pushFollow(FOLLOW_2);
             rule__EnumConfigValue__ValueAssignment_2();
 
             state._fsp--;
@@ -14047,21 +14047,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefPath__Group__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4789:1: rule__RefPath__Group__0 : rule__RefPath__Group__0__Impl rule__RefPath__Group__1 ;
+    // InternalConfig.g:4788:1: rule__RefPath__Group__0 : rule__RefPath__Group__0__Impl rule__RefPath__Group__1 ;
     public final void rule__RefPath__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4793:1: ( rule__RefPath__Group__0__Impl rule__RefPath__Group__1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4794:2: rule__RefPath__Group__0__Impl rule__RefPath__Group__1
+            // InternalConfig.g:4792:1: ( rule__RefPath__Group__0__Impl rule__RefPath__Group__1 )
+            // InternalConfig.g:4793:2: rule__RefPath__Group__0__Impl rule__RefPath__Group__1
             {
-            pushFollow(FOLLOW_rule__RefPath__Group__0__Impl_in_rule__RefPath__Group__09681);
+            pushFollow(FOLLOW_8);
             rule__RefPath__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__RefPath__Group__1_in_rule__RefPath__Group__09684);
+            pushFollow(FOLLOW_2);
             rule__RefPath__Group__1();
 
             state._fsp--;
@@ -14085,25 +14085,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefPath__Group__0__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4801:1: rule__RefPath__Group__0__Impl : ( ( rule__RefPath__RefsAssignment_0 ) ) ;
+    // InternalConfig.g:4800:1: rule__RefPath__Group__0__Impl : ( ( rule__RefPath__RefsAssignment_0 ) ) ;
     public final void rule__RefPath__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4805:1: ( ( ( rule__RefPath__RefsAssignment_0 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4806:1: ( ( rule__RefPath__RefsAssignment_0 ) )
+            // InternalConfig.g:4804:1: ( ( ( rule__RefPath__RefsAssignment_0 ) ) )
+            // InternalConfig.g:4805:1: ( ( rule__RefPath__RefsAssignment_0 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4806:1: ( ( rule__RefPath__RefsAssignment_0 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4807:1: ( rule__RefPath__RefsAssignment_0 )
+            // InternalConfig.g:4805:1: ( ( rule__RefPath__RefsAssignment_0 ) )
+            // InternalConfig.g:4806:1: ( rule__RefPath__RefsAssignment_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRefPathAccess().getRefsAssignment_0()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4808:1: ( rule__RefPath__RefsAssignment_0 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4808:2: rule__RefPath__RefsAssignment_0
+            // InternalConfig.g:4807:1: ( rule__RefPath__RefsAssignment_0 )
+            // InternalConfig.g:4807:2: rule__RefPath__RefsAssignment_0
             {
-            pushFollow(FOLLOW_rule__RefPath__RefsAssignment_0_in_rule__RefPath__Group__0__Impl9711);
+            pushFollow(FOLLOW_2);
             rule__RefPath__RefsAssignment_0();
 
             state._fsp--;
@@ -14136,16 +14136,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefPath__Group__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4818:1: rule__RefPath__Group__1 : rule__RefPath__Group__1__Impl ;
+    // InternalConfig.g:4817:1: rule__RefPath__Group__1 : rule__RefPath__Group__1__Impl ;
     public final void rule__RefPath__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4822:1: ( rule__RefPath__Group__1__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4823:2: rule__RefPath__Group__1__Impl
+            // InternalConfig.g:4821:1: ( rule__RefPath__Group__1__Impl )
+            // InternalConfig.g:4822:2: rule__RefPath__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__RefPath__Group__1__Impl_in_rule__RefPath__Group__19741);
+            pushFollow(FOLLOW_2);
             rule__RefPath__Group__1__Impl();
 
             state._fsp--;
@@ -14169,22 +14169,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefPath__Group__1__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4829:1: rule__RefPath__Group__1__Impl : ( ( rule__RefPath__Group_1__0 )* ) ;
+    // InternalConfig.g:4828:1: rule__RefPath__Group__1__Impl : ( ( rule__RefPath__Group_1__0 )* ) ;
     public final void rule__RefPath__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4833:1: ( ( ( rule__RefPath__Group_1__0 )* ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4834:1: ( ( rule__RefPath__Group_1__0 )* )
+            // InternalConfig.g:4832:1: ( ( ( rule__RefPath__Group_1__0 )* ) )
+            // InternalConfig.g:4833:1: ( ( rule__RefPath__Group_1__0 )* )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4834:1: ( ( rule__RefPath__Group_1__0 )* )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4835:1: ( rule__RefPath__Group_1__0 )*
+            // InternalConfig.g:4833:1: ( ( rule__RefPath__Group_1__0 )* )
+            // InternalConfig.g:4834:1: ( rule__RefPath__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRefPathAccess().getGroup_1()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4836:1: ( rule__RefPath__Group_1__0 )*
+            // InternalConfig.g:4835:1: ( rule__RefPath__Group_1__0 )*
             loop37:
             do {
                 int alt37=2;
@@ -14197,9 +14197,9 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
                 switch (alt37) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4836:2: rule__RefPath__Group_1__0
+            	    // InternalConfig.g:4835:2: rule__RefPath__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__RefPath__Group_1__0_in_rule__RefPath__Group__1__Impl9768);
+            	    pushFollow(FOLLOW_30);
             	    rule__RefPath__Group_1__0();
 
             	    state._fsp--;
@@ -14238,21 +14238,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefPath__Group_1__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4850:1: rule__RefPath__Group_1__0 : rule__RefPath__Group_1__0__Impl rule__RefPath__Group_1__1 ;
+    // InternalConfig.g:4849:1: rule__RefPath__Group_1__0 : rule__RefPath__Group_1__0__Impl rule__RefPath__Group_1__1 ;
     public final void rule__RefPath__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4854:1: ( rule__RefPath__Group_1__0__Impl rule__RefPath__Group_1__1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4855:2: rule__RefPath__Group_1__0__Impl rule__RefPath__Group_1__1
+            // InternalConfig.g:4853:1: ( rule__RefPath__Group_1__0__Impl rule__RefPath__Group_1__1 )
+            // InternalConfig.g:4854:2: rule__RefPath__Group_1__0__Impl rule__RefPath__Group_1__1
             {
-            pushFollow(FOLLOW_rule__RefPath__Group_1__0__Impl_in_rule__RefPath__Group_1__09803);
+            pushFollow(FOLLOW_3);
             rule__RefPath__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__RefPath__Group_1__1_in_rule__RefPath__Group_1__09806);
+            pushFollow(FOLLOW_2);
             rule__RefPath__Group_1__1();
 
             state._fsp--;
@@ -14276,22 +14276,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefPath__Group_1__0__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4862:1: rule__RefPath__Group_1__0__Impl : ( '/' ) ;
+    // InternalConfig.g:4861:1: rule__RefPath__Group_1__0__Impl : ( '/' ) ;
     public final void rule__RefPath__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4866:1: ( ( '/' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4867:1: ( '/' )
+            // InternalConfig.g:4865:1: ( ( '/' ) )
+            // InternalConfig.g:4866:1: ( '/' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4867:1: ( '/' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4868:1: '/'
+            // InternalConfig.g:4866:1: ( '/' )
+            // InternalConfig.g:4867:1: '/'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRefPathAccess().getSolidusKeyword_1_0()); 
             }
-            match(input,30,FOLLOW_30_in_rule__RefPath__Group_1__0__Impl9834); if (state.failed) return ;
+            match(input,30,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getRefPathAccess().getSolidusKeyword_1_0()); 
             }
@@ -14317,16 +14317,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefPath__Group_1__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4881:1: rule__RefPath__Group_1__1 : rule__RefPath__Group_1__1__Impl ;
+    // InternalConfig.g:4880:1: rule__RefPath__Group_1__1 : rule__RefPath__Group_1__1__Impl ;
     public final void rule__RefPath__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4885:1: ( rule__RefPath__Group_1__1__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4886:2: rule__RefPath__Group_1__1__Impl
+            // InternalConfig.g:4884:1: ( rule__RefPath__Group_1__1__Impl )
+            // InternalConfig.g:4885:2: rule__RefPath__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__RefPath__Group_1__1__Impl_in_rule__RefPath__Group_1__19865);
+            pushFollow(FOLLOW_2);
             rule__RefPath__Group_1__1__Impl();
 
             state._fsp--;
@@ -14350,25 +14350,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefPath__Group_1__1__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4892:1: rule__RefPath__Group_1__1__Impl : ( ( rule__RefPath__RefsAssignment_1_1 ) ) ;
+    // InternalConfig.g:4891:1: rule__RefPath__Group_1__1__Impl : ( ( rule__RefPath__RefsAssignment_1_1 ) ) ;
     public final void rule__RefPath__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4896:1: ( ( ( rule__RefPath__RefsAssignment_1_1 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4897:1: ( ( rule__RefPath__RefsAssignment_1_1 ) )
+            // InternalConfig.g:4895:1: ( ( ( rule__RefPath__RefsAssignment_1_1 ) ) )
+            // InternalConfig.g:4896:1: ( ( rule__RefPath__RefsAssignment_1_1 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4897:1: ( ( rule__RefPath__RefsAssignment_1_1 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4898:1: ( rule__RefPath__RefsAssignment_1_1 )
+            // InternalConfig.g:4896:1: ( ( rule__RefPath__RefsAssignment_1_1 ) )
+            // InternalConfig.g:4897:1: ( rule__RefPath__RefsAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRefPathAccess().getRefsAssignment_1_1()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4899:1: ( rule__RefPath__RefsAssignment_1_1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4899:2: rule__RefPath__RefsAssignment_1_1
+            // InternalConfig.g:4898:1: ( rule__RefPath__RefsAssignment_1_1 )
+            // InternalConfig.g:4898:2: rule__RefPath__RefsAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__RefPath__RefsAssignment_1_1_in_rule__RefPath__Group_1__1__Impl9892);
+            pushFollow(FOLLOW_2);
             rule__RefPath__RefsAssignment_1_1();
 
             state._fsp--;
@@ -14401,21 +14401,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefSegment__Group__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4913:1: rule__RefSegment__Group__0 : rule__RefSegment__Group__0__Impl rule__RefSegment__Group__1 ;
+    // InternalConfig.g:4912:1: rule__RefSegment__Group__0 : rule__RefSegment__Group__0__Impl rule__RefSegment__Group__1 ;
     public final void rule__RefSegment__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4917:1: ( rule__RefSegment__Group__0__Impl rule__RefSegment__Group__1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4918:2: rule__RefSegment__Group__0__Impl rule__RefSegment__Group__1
+            // InternalConfig.g:4916:1: ( rule__RefSegment__Group__0__Impl rule__RefSegment__Group__1 )
+            // InternalConfig.g:4917:2: rule__RefSegment__Group__0__Impl rule__RefSegment__Group__1
             {
-            pushFollow(FOLLOW_rule__RefSegment__Group__0__Impl_in_rule__RefSegment__Group__09926);
+            pushFollow(FOLLOW_31);
             rule__RefSegment__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__RefSegment__Group__1_in_rule__RefSegment__Group__09929);
+            pushFollow(FOLLOW_2);
             rule__RefSegment__Group__1();
 
             state._fsp--;
@@ -14439,25 +14439,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefSegment__Group__0__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4925:1: rule__RefSegment__Group__0__Impl : ( ( rule__RefSegment__RefAssignment_0 ) ) ;
+    // InternalConfig.g:4924:1: rule__RefSegment__Group__0__Impl : ( ( rule__RefSegment__RefAssignment_0 ) ) ;
     public final void rule__RefSegment__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4929:1: ( ( ( rule__RefSegment__RefAssignment_0 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4930:1: ( ( rule__RefSegment__RefAssignment_0 ) )
+            // InternalConfig.g:4928:1: ( ( ( rule__RefSegment__RefAssignment_0 ) ) )
+            // InternalConfig.g:4929:1: ( ( rule__RefSegment__RefAssignment_0 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4930:1: ( ( rule__RefSegment__RefAssignment_0 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4931:1: ( rule__RefSegment__RefAssignment_0 )
+            // InternalConfig.g:4929:1: ( ( rule__RefSegment__RefAssignment_0 ) )
+            // InternalConfig.g:4930:1: ( rule__RefSegment__RefAssignment_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRefSegmentAccess().getRefAssignment_0()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4932:1: ( rule__RefSegment__RefAssignment_0 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4932:2: rule__RefSegment__RefAssignment_0
+            // InternalConfig.g:4931:1: ( rule__RefSegment__RefAssignment_0 )
+            // InternalConfig.g:4931:2: rule__RefSegment__RefAssignment_0
             {
-            pushFollow(FOLLOW_rule__RefSegment__RefAssignment_0_in_rule__RefSegment__Group__0__Impl9956);
+            pushFollow(FOLLOW_2);
             rule__RefSegment__RefAssignment_0();
 
             state._fsp--;
@@ -14490,16 +14490,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefSegment__Group__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4942:1: rule__RefSegment__Group__1 : rule__RefSegment__Group__1__Impl ;
+    // InternalConfig.g:4941:1: rule__RefSegment__Group__1 : rule__RefSegment__Group__1__Impl ;
     public final void rule__RefSegment__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4946:1: ( rule__RefSegment__Group__1__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4947:2: rule__RefSegment__Group__1__Impl
+            // InternalConfig.g:4945:1: ( rule__RefSegment__Group__1__Impl )
+            // InternalConfig.g:4946:2: rule__RefSegment__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__RefSegment__Group__1__Impl_in_rule__RefSegment__Group__19986);
+            pushFollow(FOLLOW_2);
             rule__RefSegment__Group__1__Impl();
 
             state._fsp--;
@@ -14523,22 +14523,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefSegment__Group__1__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4953:1: rule__RefSegment__Group__1__Impl : ( ( rule__RefSegment__Group_1__0 )? ) ;
+    // InternalConfig.g:4952:1: rule__RefSegment__Group__1__Impl : ( ( rule__RefSegment__Group_1__0 )? ) ;
     public final void rule__RefSegment__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4957:1: ( ( ( rule__RefSegment__Group_1__0 )? ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4958:1: ( ( rule__RefSegment__Group_1__0 )? )
+            // InternalConfig.g:4956:1: ( ( ( rule__RefSegment__Group_1__0 )? ) )
+            // InternalConfig.g:4957:1: ( ( rule__RefSegment__Group_1__0 )? )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4958:1: ( ( rule__RefSegment__Group_1__0 )? )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4959:1: ( rule__RefSegment__Group_1__0 )?
+            // InternalConfig.g:4957:1: ( ( rule__RefSegment__Group_1__0 )? )
+            // InternalConfig.g:4958:1: ( rule__RefSegment__Group_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRefSegmentAccess().getGroup_1()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4960:1: ( rule__RefSegment__Group_1__0 )?
+            // InternalConfig.g:4959:1: ( rule__RefSegment__Group_1__0 )?
             int alt38=2;
             int LA38_0 = input.LA(1);
 
@@ -14547,9 +14547,9 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             }
             switch (alt38) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4960:2: rule__RefSegment__Group_1__0
+                    // InternalConfig.g:4959:2: rule__RefSegment__Group_1__0
                     {
-                    pushFollow(FOLLOW_rule__RefSegment__Group_1__0_in_rule__RefSegment__Group__1__Impl10013);
+                    pushFollow(FOLLOW_2);
                     rule__RefSegment__Group_1__0();
 
                     state._fsp--;
@@ -14585,21 +14585,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefSegment__Group_1__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4974:1: rule__RefSegment__Group_1__0 : rule__RefSegment__Group_1__0__Impl rule__RefSegment__Group_1__1 ;
+    // InternalConfig.g:4973:1: rule__RefSegment__Group_1__0 : rule__RefSegment__Group_1__0__Impl rule__RefSegment__Group_1__1 ;
     public final void rule__RefSegment__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4978:1: ( rule__RefSegment__Group_1__0__Impl rule__RefSegment__Group_1__1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4979:2: rule__RefSegment__Group_1__0__Impl rule__RefSegment__Group_1__1
+            // InternalConfig.g:4977:1: ( rule__RefSegment__Group_1__0__Impl rule__RefSegment__Group_1__1 )
+            // InternalConfig.g:4978:2: rule__RefSegment__Group_1__0__Impl rule__RefSegment__Group_1__1
             {
-            pushFollow(FOLLOW_rule__RefSegment__Group_1__0__Impl_in_rule__RefSegment__Group_1__010048);
+            pushFollow(FOLLOW_14);
             rule__RefSegment__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__RefSegment__Group_1__1_in_rule__RefSegment__Group_1__010051);
+            pushFollow(FOLLOW_2);
             rule__RefSegment__Group_1__1();
 
             state._fsp--;
@@ -14623,22 +14623,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefSegment__Group_1__0__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4986:1: rule__RefSegment__Group_1__0__Impl : ( ':' ) ;
+    // InternalConfig.g:4985:1: rule__RefSegment__Group_1__0__Impl : ( ':' ) ;
     public final void rule__RefSegment__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4990:1: ( ( ':' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4991:1: ( ':' )
+            // InternalConfig.g:4989:1: ( ( ':' ) )
+            // InternalConfig.g:4990:1: ( ':' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4991:1: ( ':' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:4992:1: ':'
+            // InternalConfig.g:4990:1: ( ':' )
+            // InternalConfig.g:4991:1: ':'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRefSegmentAccess().getColonKeyword_1_0()); 
             }
-            match(input,48,FOLLOW_48_in_rule__RefSegment__Group_1__0__Impl10079); if (state.failed) return ;
+            match(input,48,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getRefSegmentAccess().getColonKeyword_1_0()); 
             }
@@ -14664,16 +14664,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefSegment__Group_1__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5005:1: rule__RefSegment__Group_1__1 : rule__RefSegment__Group_1__1__Impl ;
+    // InternalConfig.g:5004:1: rule__RefSegment__Group_1__1 : rule__RefSegment__Group_1__1__Impl ;
     public final void rule__RefSegment__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5009:1: ( rule__RefSegment__Group_1__1__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5010:2: rule__RefSegment__Group_1__1__Impl
+            // InternalConfig.g:5008:1: ( rule__RefSegment__Group_1__1__Impl )
+            // InternalConfig.g:5009:2: rule__RefSegment__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__RefSegment__Group_1__1__Impl_in_rule__RefSegment__Group_1__110110);
+            pushFollow(FOLLOW_2);
             rule__RefSegment__Group_1__1__Impl();
 
             state._fsp--;
@@ -14697,25 +14697,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefSegment__Group_1__1__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5016:1: rule__RefSegment__Group_1__1__Impl : ( ( rule__RefSegment__IdxAssignment_1_1 ) ) ;
+    // InternalConfig.g:5015:1: rule__RefSegment__Group_1__1__Impl : ( ( rule__RefSegment__IdxAssignment_1_1 ) ) ;
     public final void rule__RefSegment__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5020:1: ( ( ( rule__RefSegment__IdxAssignment_1_1 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5021:1: ( ( rule__RefSegment__IdxAssignment_1_1 ) )
+            // InternalConfig.g:5019:1: ( ( ( rule__RefSegment__IdxAssignment_1_1 ) ) )
+            // InternalConfig.g:5020:1: ( ( rule__RefSegment__IdxAssignment_1_1 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5021:1: ( ( rule__RefSegment__IdxAssignment_1_1 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5022:1: ( rule__RefSegment__IdxAssignment_1_1 )
+            // InternalConfig.g:5020:1: ( ( rule__RefSegment__IdxAssignment_1_1 ) )
+            // InternalConfig.g:5021:1: ( rule__RefSegment__IdxAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRefSegmentAccess().getIdxAssignment_1_1()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5023:1: ( rule__RefSegment__IdxAssignment_1_1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5023:2: rule__RefSegment__IdxAssignment_1_1
+            // InternalConfig.g:5022:1: ( rule__RefSegment__IdxAssignment_1_1 )
+            // InternalConfig.g:5022:2: rule__RefSegment__IdxAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__RefSegment__IdxAssignment_1_1_in_rule__RefSegment__Group_1__1__Impl10137);
+            pushFollow(FOLLOW_2);
             rule__RefSegment__IdxAssignment_1_1();
 
             state._fsp--;
@@ -14748,21 +14748,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__KeyValue__Group__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5040:1: rule__KeyValue__Group__0 : rule__KeyValue__Group__0__Impl rule__KeyValue__Group__1 ;
+    // InternalConfig.g:5039:1: rule__KeyValue__Group__0 : rule__KeyValue__Group__0__Impl rule__KeyValue__Group__1 ;
     public final void rule__KeyValue__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5044:1: ( rule__KeyValue__Group__0__Impl rule__KeyValue__Group__1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5045:2: rule__KeyValue__Group__0__Impl rule__KeyValue__Group__1
+            // InternalConfig.g:5043:1: ( rule__KeyValue__Group__0__Impl rule__KeyValue__Group__1 )
+            // InternalConfig.g:5044:2: rule__KeyValue__Group__0__Impl rule__KeyValue__Group__1
             {
-            pushFollow(FOLLOW_rule__KeyValue__Group__0__Impl_in_rule__KeyValue__Group__010174);
+            pushFollow(FOLLOW_23);
             rule__KeyValue__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__KeyValue__Group__1_in_rule__KeyValue__Group__010177);
+            pushFollow(FOLLOW_2);
             rule__KeyValue__Group__1();
 
             state._fsp--;
@@ -14786,25 +14786,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__KeyValue__Group__0__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5052:1: rule__KeyValue__Group__0__Impl : ( ( rule__KeyValue__KeyAssignment_0 ) ) ;
+    // InternalConfig.g:5051:1: rule__KeyValue__Group__0__Impl : ( ( rule__KeyValue__KeyAssignment_0 ) ) ;
     public final void rule__KeyValue__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5056:1: ( ( ( rule__KeyValue__KeyAssignment_0 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5057:1: ( ( rule__KeyValue__KeyAssignment_0 ) )
+            // InternalConfig.g:5055:1: ( ( ( rule__KeyValue__KeyAssignment_0 ) ) )
+            // InternalConfig.g:5056:1: ( ( rule__KeyValue__KeyAssignment_0 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5057:1: ( ( rule__KeyValue__KeyAssignment_0 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5058:1: ( rule__KeyValue__KeyAssignment_0 )
+            // InternalConfig.g:5056:1: ( ( rule__KeyValue__KeyAssignment_0 ) )
+            // InternalConfig.g:5057:1: ( rule__KeyValue__KeyAssignment_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getKeyValueAccess().getKeyAssignment_0()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5059:1: ( rule__KeyValue__KeyAssignment_0 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5059:2: rule__KeyValue__KeyAssignment_0
+            // InternalConfig.g:5058:1: ( rule__KeyValue__KeyAssignment_0 )
+            // InternalConfig.g:5058:2: rule__KeyValue__KeyAssignment_0
             {
-            pushFollow(FOLLOW_rule__KeyValue__KeyAssignment_0_in_rule__KeyValue__Group__0__Impl10204);
+            pushFollow(FOLLOW_2);
             rule__KeyValue__KeyAssignment_0();
 
             state._fsp--;
@@ -14837,21 +14837,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__KeyValue__Group__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5069:1: rule__KeyValue__Group__1 : rule__KeyValue__Group__1__Impl rule__KeyValue__Group__2 ;
+    // InternalConfig.g:5068:1: rule__KeyValue__Group__1 : rule__KeyValue__Group__1__Impl rule__KeyValue__Group__2 ;
     public final void rule__KeyValue__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5073:1: ( rule__KeyValue__Group__1__Impl rule__KeyValue__Group__2 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5074:2: rule__KeyValue__Group__1__Impl rule__KeyValue__Group__2
+            // InternalConfig.g:5072:1: ( rule__KeyValue__Group__1__Impl rule__KeyValue__Group__2 )
+            // InternalConfig.g:5073:2: rule__KeyValue__Group__1__Impl rule__KeyValue__Group__2
             {
-            pushFollow(FOLLOW_rule__KeyValue__Group__1__Impl_in_rule__KeyValue__Group__110234);
+            pushFollow(FOLLOW_32);
             rule__KeyValue__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__KeyValue__Group__2_in_rule__KeyValue__Group__110237);
+            pushFollow(FOLLOW_2);
             rule__KeyValue__Group__2();
 
             state._fsp--;
@@ -14875,22 +14875,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__KeyValue__Group__1__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5081:1: rule__KeyValue__Group__1__Impl : ( '=' ) ;
+    // InternalConfig.g:5080:1: rule__KeyValue__Group__1__Impl : ( '=' ) ;
     public final void rule__KeyValue__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5085:1: ( ( '=' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5086:1: ( '=' )
+            // InternalConfig.g:5084:1: ( ( '=' ) )
+            // InternalConfig.g:5085:1: ( '=' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5086:1: ( '=' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5087:1: '='
+            // InternalConfig.g:5085:1: ( '=' )
+            // InternalConfig.g:5086:1: '='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getKeyValueAccess().getEqualsSignKeyword_1()); 
             }
-            match(input,43,FOLLOW_43_in_rule__KeyValue__Group__1__Impl10265); if (state.failed) return ;
+            match(input,43,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getKeyValueAccess().getEqualsSignKeyword_1()); 
             }
@@ -14916,16 +14916,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__KeyValue__Group__2"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5100:1: rule__KeyValue__Group__2 : rule__KeyValue__Group__2__Impl ;
+    // InternalConfig.g:5099:1: rule__KeyValue__Group__2 : rule__KeyValue__Group__2__Impl ;
     public final void rule__KeyValue__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5104:1: ( rule__KeyValue__Group__2__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5105:2: rule__KeyValue__Group__2__Impl
+            // InternalConfig.g:5103:1: ( rule__KeyValue__Group__2__Impl )
+            // InternalConfig.g:5104:2: rule__KeyValue__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__KeyValue__Group__2__Impl_in_rule__KeyValue__Group__210296);
+            pushFollow(FOLLOW_2);
             rule__KeyValue__Group__2__Impl();
 
             state._fsp--;
@@ -14949,25 +14949,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__KeyValue__Group__2__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5111:1: rule__KeyValue__Group__2__Impl : ( ( rule__KeyValue__ValueAssignment_2 ) ) ;
+    // InternalConfig.g:5110:1: rule__KeyValue__Group__2__Impl : ( ( rule__KeyValue__ValueAssignment_2 ) ) ;
     public final void rule__KeyValue__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5115:1: ( ( ( rule__KeyValue__ValueAssignment_2 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5116:1: ( ( rule__KeyValue__ValueAssignment_2 ) )
+            // InternalConfig.g:5114:1: ( ( ( rule__KeyValue__ValueAssignment_2 ) ) )
+            // InternalConfig.g:5115:1: ( ( rule__KeyValue__ValueAssignment_2 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5116:1: ( ( rule__KeyValue__ValueAssignment_2 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5117:1: ( rule__KeyValue__ValueAssignment_2 )
+            // InternalConfig.g:5115:1: ( ( rule__KeyValue__ValueAssignment_2 ) )
+            // InternalConfig.g:5116:1: ( rule__KeyValue__ValueAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getKeyValueAccess().getValueAssignment_2()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5118:1: ( rule__KeyValue__ValueAssignment_2 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5118:2: rule__KeyValue__ValueAssignment_2
+            // InternalConfig.g:5117:1: ( rule__KeyValue__ValueAssignment_2 )
+            // InternalConfig.g:5117:2: rule__KeyValue__ValueAssignment_2
             {
-            pushFollow(FOLLOW_rule__KeyValue__ValueAssignment_2_in_rule__KeyValue__Group__2__Impl10323);
+            pushFollow(FOLLOW_2);
             rule__KeyValue__ValueAssignment_2();
 
             state._fsp--;
@@ -15000,21 +15000,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5137:1: rule__SimpleAnnotationAttribute__Group__0 : rule__SimpleAnnotationAttribute__Group__0__Impl rule__SimpleAnnotationAttribute__Group__1 ;
+    // InternalConfig.g:5136:1: rule__SimpleAnnotationAttribute__Group__0 : rule__SimpleAnnotationAttribute__Group__0__Impl rule__SimpleAnnotationAttribute__Group__1 ;
     public final void rule__SimpleAnnotationAttribute__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5141:1: ( rule__SimpleAnnotationAttribute__Group__0__Impl rule__SimpleAnnotationAttribute__Group__1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5142:2: rule__SimpleAnnotationAttribute__Group__0__Impl rule__SimpleAnnotationAttribute__Group__1
+            // InternalConfig.g:5140:1: ( rule__SimpleAnnotationAttribute__Group__0__Impl rule__SimpleAnnotationAttribute__Group__1 )
+            // InternalConfig.g:5141:2: rule__SimpleAnnotationAttribute__Group__0__Impl rule__SimpleAnnotationAttribute__Group__1
             {
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__0__Impl_in_rule__SimpleAnnotationAttribute__Group__010362);
+            pushFollow(FOLLOW_33);
             rule__SimpleAnnotationAttribute__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__1_in_rule__SimpleAnnotationAttribute__Group__010365);
+            pushFollow(FOLLOW_2);
             rule__SimpleAnnotationAttribute__Group__1();
 
             state._fsp--;
@@ -15038,25 +15038,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__0__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5149:1: rule__SimpleAnnotationAttribute__Group__0__Impl : ( ( rule__SimpleAnnotationAttribute__Alternatives_0 ) ) ;
+    // InternalConfig.g:5148:1: rule__SimpleAnnotationAttribute__Group__0__Impl : ( ( rule__SimpleAnnotationAttribute__Alternatives_0 ) ) ;
     public final void rule__SimpleAnnotationAttribute__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5153:1: ( ( ( rule__SimpleAnnotationAttribute__Alternatives_0 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5154:1: ( ( rule__SimpleAnnotationAttribute__Alternatives_0 ) )
+            // InternalConfig.g:5152:1: ( ( ( rule__SimpleAnnotationAttribute__Alternatives_0 ) ) )
+            // InternalConfig.g:5153:1: ( ( rule__SimpleAnnotationAttribute__Alternatives_0 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5154:1: ( ( rule__SimpleAnnotationAttribute__Alternatives_0 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5155:1: ( rule__SimpleAnnotationAttribute__Alternatives_0 )
+            // InternalConfig.g:5153:1: ( ( rule__SimpleAnnotationAttribute__Alternatives_0 ) )
+            // InternalConfig.g:5154:1: ( rule__SimpleAnnotationAttribute__Alternatives_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSimpleAnnotationAttributeAccess().getAlternatives_0()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5156:1: ( rule__SimpleAnnotationAttribute__Alternatives_0 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5156:2: rule__SimpleAnnotationAttribute__Alternatives_0
+            // InternalConfig.g:5155:1: ( rule__SimpleAnnotationAttribute__Alternatives_0 )
+            // InternalConfig.g:5155:2: rule__SimpleAnnotationAttribute__Alternatives_0
             {
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Alternatives_0_in_rule__SimpleAnnotationAttribute__Group__0__Impl10392);
+            pushFollow(FOLLOW_2);
             rule__SimpleAnnotationAttribute__Alternatives_0();
 
             state._fsp--;
@@ -15089,21 +15089,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5166:1: rule__SimpleAnnotationAttribute__Group__1 : rule__SimpleAnnotationAttribute__Group__1__Impl rule__SimpleAnnotationAttribute__Group__2 ;
+    // InternalConfig.g:5165:1: rule__SimpleAnnotationAttribute__Group__1 : rule__SimpleAnnotationAttribute__Group__1__Impl rule__SimpleAnnotationAttribute__Group__2 ;
     public final void rule__SimpleAnnotationAttribute__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5170:1: ( rule__SimpleAnnotationAttribute__Group__1__Impl rule__SimpleAnnotationAttribute__Group__2 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5171:2: rule__SimpleAnnotationAttribute__Group__1__Impl rule__SimpleAnnotationAttribute__Group__2
+            // InternalConfig.g:5169:1: ( rule__SimpleAnnotationAttribute__Group__1__Impl rule__SimpleAnnotationAttribute__Group__2 )
+            // InternalConfig.g:5170:2: rule__SimpleAnnotationAttribute__Group__1__Impl rule__SimpleAnnotationAttribute__Group__2
             {
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__1__Impl_in_rule__SimpleAnnotationAttribute__Group__110422);
+            pushFollow(FOLLOW_3);
             rule__SimpleAnnotationAttribute__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__2_in_rule__SimpleAnnotationAttribute__Group__110425);
+            pushFollow(FOLLOW_2);
             rule__SimpleAnnotationAttribute__Group__2();
 
             state._fsp--;
@@ -15127,22 +15127,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__1__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5178:1: rule__SimpleAnnotationAttribute__Group__1__Impl : ( 'attribute' ) ;
+    // InternalConfig.g:5177:1: rule__SimpleAnnotationAttribute__Group__1__Impl : ( 'attribute' ) ;
     public final void rule__SimpleAnnotationAttribute__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5182:1: ( ( 'attribute' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5183:1: ( 'attribute' )
+            // InternalConfig.g:5181:1: ( ( 'attribute' ) )
+            // InternalConfig.g:5182:1: ( 'attribute' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5183:1: ( 'attribute' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5184:1: 'attribute'
+            // InternalConfig.g:5182:1: ( 'attribute' )
+            // InternalConfig.g:5183:1: 'attribute'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSimpleAnnotationAttributeAccess().getAttributeKeyword_1()); 
             }
-            match(input,49,FOLLOW_49_in_rule__SimpleAnnotationAttribute__Group__1__Impl10453); if (state.failed) return ;
+            match(input,49,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSimpleAnnotationAttributeAccess().getAttributeKeyword_1()); 
             }
@@ -15168,21 +15168,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__2"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5197:1: rule__SimpleAnnotationAttribute__Group__2 : rule__SimpleAnnotationAttribute__Group__2__Impl rule__SimpleAnnotationAttribute__Group__3 ;
+    // InternalConfig.g:5196:1: rule__SimpleAnnotationAttribute__Group__2 : rule__SimpleAnnotationAttribute__Group__2__Impl rule__SimpleAnnotationAttribute__Group__3 ;
     public final void rule__SimpleAnnotationAttribute__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5201:1: ( rule__SimpleAnnotationAttribute__Group__2__Impl rule__SimpleAnnotationAttribute__Group__3 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5202:2: rule__SimpleAnnotationAttribute__Group__2__Impl rule__SimpleAnnotationAttribute__Group__3
+            // InternalConfig.g:5200:1: ( rule__SimpleAnnotationAttribute__Group__2__Impl rule__SimpleAnnotationAttribute__Group__3 )
+            // InternalConfig.g:5201:2: rule__SimpleAnnotationAttribute__Group__2__Impl rule__SimpleAnnotationAttribute__Group__3
             {
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__2__Impl_in_rule__SimpleAnnotationAttribute__Group__210484);
+            pushFollow(FOLLOW_31);
             rule__SimpleAnnotationAttribute__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__3_in_rule__SimpleAnnotationAttribute__Group__210487);
+            pushFollow(FOLLOW_2);
             rule__SimpleAnnotationAttribute__Group__3();
 
             state._fsp--;
@@ -15206,25 +15206,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__2__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5209:1: rule__SimpleAnnotationAttribute__Group__2__Impl : ( ( rule__SimpleAnnotationAttribute__NameAssignment_2 ) ) ;
+    // InternalConfig.g:5208:1: rule__SimpleAnnotationAttribute__Group__2__Impl : ( ( rule__SimpleAnnotationAttribute__NameAssignment_2 ) ) ;
     public final void rule__SimpleAnnotationAttribute__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5213:1: ( ( ( rule__SimpleAnnotationAttribute__NameAssignment_2 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5214:1: ( ( rule__SimpleAnnotationAttribute__NameAssignment_2 ) )
+            // InternalConfig.g:5212:1: ( ( ( rule__SimpleAnnotationAttribute__NameAssignment_2 ) ) )
+            // InternalConfig.g:5213:1: ( ( rule__SimpleAnnotationAttribute__NameAssignment_2 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5214:1: ( ( rule__SimpleAnnotationAttribute__NameAssignment_2 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5215:1: ( rule__SimpleAnnotationAttribute__NameAssignment_2 )
+            // InternalConfig.g:5213:1: ( ( rule__SimpleAnnotationAttribute__NameAssignment_2 ) )
+            // InternalConfig.g:5214:1: ( rule__SimpleAnnotationAttribute__NameAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSimpleAnnotationAttributeAccess().getNameAssignment_2()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5216:1: ( rule__SimpleAnnotationAttribute__NameAssignment_2 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5216:2: rule__SimpleAnnotationAttribute__NameAssignment_2
+            // InternalConfig.g:5215:1: ( rule__SimpleAnnotationAttribute__NameAssignment_2 )
+            // InternalConfig.g:5215:2: rule__SimpleAnnotationAttribute__NameAssignment_2
             {
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__NameAssignment_2_in_rule__SimpleAnnotationAttribute__Group__2__Impl10514);
+            pushFollow(FOLLOW_2);
             rule__SimpleAnnotationAttribute__NameAssignment_2();
 
             state._fsp--;
@@ -15257,21 +15257,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__3"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5226:1: rule__SimpleAnnotationAttribute__Group__3 : rule__SimpleAnnotationAttribute__Group__3__Impl rule__SimpleAnnotationAttribute__Group__4 ;
+    // InternalConfig.g:5225:1: rule__SimpleAnnotationAttribute__Group__3 : rule__SimpleAnnotationAttribute__Group__3__Impl rule__SimpleAnnotationAttribute__Group__4 ;
     public final void rule__SimpleAnnotationAttribute__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5230:1: ( rule__SimpleAnnotationAttribute__Group__3__Impl rule__SimpleAnnotationAttribute__Group__4 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5231:2: rule__SimpleAnnotationAttribute__Group__3__Impl rule__SimpleAnnotationAttribute__Group__4
+            // InternalConfig.g:5229:1: ( rule__SimpleAnnotationAttribute__Group__3__Impl rule__SimpleAnnotationAttribute__Group__4 )
+            // InternalConfig.g:5230:2: rule__SimpleAnnotationAttribute__Group__3__Impl rule__SimpleAnnotationAttribute__Group__4
             {
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__3__Impl_in_rule__SimpleAnnotationAttribute__Group__310544);
+            pushFollow(FOLLOW_34);
             rule__SimpleAnnotationAttribute__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__4_in_rule__SimpleAnnotationAttribute__Group__310547);
+            pushFollow(FOLLOW_2);
             rule__SimpleAnnotationAttribute__Group__4();
 
             state._fsp--;
@@ -15295,22 +15295,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__3__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5238:1: rule__SimpleAnnotationAttribute__Group__3__Impl : ( ':' ) ;
+    // InternalConfig.g:5237:1: rule__SimpleAnnotationAttribute__Group__3__Impl : ( ':' ) ;
     public final void rule__SimpleAnnotationAttribute__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5242:1: ( ( ':' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5243:1: ( ':' )
+            // InternalConfig.g:5241:1: ( ( ':' ) )
+            // InternalConfig.g:5242:1: ( ':' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5243:1: ( ':' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5244:1: ':'
+            // InternalConfig.g:5242:1: ( ':' )
+            // InternalConfig.g:5243:1: ':'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSimpleAnnotationAttributeAccess().getColonKeyword_3()); 
             }
-            match(input,48,FOLLOW_48_in_rule__SimpleAnnotationAttribute__Group__3__Impl10575); if (state.failed) return ;
+            match(input,48,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSimpleAnnotationAttributeAccess().getColonKeyword_3()); 
             }
@@ -15336,16 +15336,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__4"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5257:1: rule__SimpleAnnotationAttribute__Group__4 : rule__SimpleAnnotationAttribute__Group__4__Impl ;
+    // InternalConfig.g:5256:1: rule__SimpleAnnotationAttribute__Group__4 : rule__SimpleAnnotationAttribute__Group__4__Impl ;
     public final void rule__SimpleAnnotationAttribute__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5261:1: ( rule__SimpleAnnotationAttribute__Group__4__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5262:2: rule__SimpleAnnotationAttribute__Group__4__Impl
+            // InternalConfig.g:5260:1: ( rule__SimpleAnnotationAttribute__Group__4__Impl )
+            // InternalConfig.g:5261:2: rule__SimpleAnnotationAttribute__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__4__Impl_in_rule__SimpleAnnotationAttribute__Group__410606);
+            pushFollow(FOLLOW_2);
             rule__SimpleAnnotationAttribute__Group__4__Impl();
 
             state._fsp--;
@@ -15369,25 +15369,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__4__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5268:1: rule__SimpleAnnotationAttribute__Group__4__Impl : ( ( rule__SimpleAnnotationAttribute__TypeAssignment_4 ) ) ;
+    // InternalConfig.g:5267:1: rule__SimpleAnnotationAttribute__Group__4__Impl : ( ( rule__SimpleAnnotationAttribute__TypeAssignment_4 ) ) ;
     public final void rule__SimpleAnnotationAttribute__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5272:1: ( ( ( rule__SimpleAnnotationAttribute__TypeAssignment_4 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5273:1: ( ( rule__SimpleAnnotationAttribute__TypeAssignment_4 ) )
+            // InternalConfig.g:5271:1: ( ( ( rule__SimpleAnnotationAttribute__TypeAssignment_4 ) ) )
+            // InternalConfig.g:5272:1: ( ( rule__SimpleAnnotationAttribute__TypeAssignment_4 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5273:1: ( ( rule__SimpleAnnotationAttribute__TypeAssignment_4 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5274:1: ( rule__SimpleAnnotationAttribute__TypeAssignment_4 )
+            // InternalConfig.g:5272:1: ( ( rule__SimpleAnnotationAttribute__TypeAssignment_4 ) )
+            // InternalConfig.g:5273:1: ( rule__SimpleAnnotationAttribute__TypeAssignment_4 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSimpleAnnotationAttributeAccess().getTypeAssignment_4()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5275:1: ( rule__SimpleAnnotationAttribute__TypeAssignment_4 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5275:2: rule__SimpleAnnotationAttribute__TypeAssignment_4
+            // InternalConfig.g:5274:1: ( rule__SimpleAnnotationAttribute__TypeAssignment_4 )
+            // InternalConfig.g:5274:2: rule__SimpleAnnotationAttribute__TypeAssignment_4
             {
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__TypeAssignment_4_in_rule__SimpleAnnotationAttribute__Group__4__Impl10633);
+            pushFollow(FOLLOW_2);
             rule__SimpleAnnotationAttribute__TypeAssignment_4();
 
             state._fsp--;
@@ -15420,21 +15420,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5295:1: rule__EnumAnnotationAttribute__Group__0 : rule__EnumAnnotationAttribute__Group__0__Impl rule__EnumAnnotationAttribute__Group__1 ;
+    // InternalConfig.g:5294:1: rule__EnumAnnotationAttribute__Group__0 : rule__EnumAnnotationAttribute__Group__0__Impl rule__EnumAnnotationAttribute__Group__1 ;
     public final void rule__EnumAnnotationAttribute__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5299:1: ( rule__EnumAnnotationAttribute__Group__0__Impl rule__EnumAnnotationAttribute__Group__1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5300:2: rule__EnumAnnotationAttribute__Group__0__Impl rule__EnumAnnotationAttribute__Group__1
+            // InternalConfig.g:5298:1: ( rule__EnumAnnotationAttribute__Group__0__Impl rule__EnumAnnotationAttribute__Group__1 )
+            // InternalConfig.g:5299:2: rule__EnumAnnotationAttribute__Group__0__Impl rule__EnumAnnotationAttribute__Group__1
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__0__Impl_in_rule__EnumAnnotationAttribute__Group__010673);
+            pushFollow(FOLLOW_33);
             rule__EnumAnnotationAttribute__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__1_in_rule__EnumAnnotationAttribute__Group__010676);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group__1();
 
             state._fsp--;
@@ -15458,25 +15458,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__0__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5307:1: rule__EnumAnnotationAttribute__Group__0__Impl : ( ( rule__EnumAnnotationAttribute__Alternatives_0 ) ) ;
+    // InternalConfig.g:5306:1: rule__EnumAnnotationAttribute__Group__0__Impl : ( ( rule__EnumAnnotationAttribute__Alternatives_0 ) ) ;
     public final void rule__EnumAnnotationAttribute__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5311:1: ( ( ( rule__EnumAnnotationAttribute__Alternatives_0 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5312:1: ( ( rule__EnumAnnotationAttribute__Alternatives_0 ) )
+            // InternalConfig.g:5310:1: ( ( ( rule__EnumAnnotationAttribute__Alternatives_0 ) ) )
+            // InternalConfig.g:5311:1: ( ( rule__EnumAnnotationAttribute__Alternatives_0 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5312:1: ( ( rule__EnumAnnotationAttribute__Alternatives_0 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5313:1: ( rule__EnumAnnotationAttribute__Alternatives_0 )
+            // InternalConfig.g:5311:1: ( ( rule__EnumAnnotationAttribute__Alternatives_0 ) )
+            // InternalConfig.g:5312:1: ( rule__EnumAnnotationAttribute__Alternatives_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getEnumAnnotationAttributeAccess().getAlternatives_0()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5314:1: ( rule__EnumAnnotationAttribute__Alternatives_0 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5314:2: rule__EnumAnnotationAttribute__Alternatives_0
+            // InternalConfig.g:5313:1: ( rule__EnumAnnotationAttribute__Alternatives_0 )
+            // InternalConfig.g:5313:2: rule__EnumAnnotationAttribute__Alternatives_0
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Alternatives_0_in_rule__EnumAnnotationAttribute__Group__0__Impl10703);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Alternatives_0();
 
             state._fsp--;
@@ -15509,21 +15509,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5324:1: rule__EnumAnnotationAttribute__Group__1 : rule__EnumAnnotationAttribute__Group__1__Impl rule__EnumAnnotationAttribute__Group__2 ;
+    // InternalConfig.g:5323:1: rule__EnumAnnotationAttribute__Group__1 : rule__EnumAnnotationAttribute__Group__1__Impl rule__EnumAnnotationAttribute__Group__2 ;
     public final void rule__EnumAnnotationAttribute__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5328:1: ( rule__EnumAnnotationAttribute__Group__1__Impl rule__EnumAnnotationAttribute__Group__2 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5329:2: rule__EnumAnnotationAttribute__Group__1__Impl rule__EnumAnnotationAttribute__Group__2
+            // InternalConfig.g:5327:1: ( rule__EnumAnnotationAttribute__Group__1__Impl rule__EnumAnnotationAttribute__Group__2 )
+            // InternalConfig.g:5328:2: rule__EnumAnnotationAttribute__Group__1__Impl rule__EnumAnnotationAttribute__Group__2
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__1__Impl_in_rule__EnumAnnotationAttribute__Group__110733);
+            pushFollow(FOLLOW_3);
             rule__EnumAnnotationAttribute__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__2_in_rule__EnumAnnotationAttribute__Group__110736);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group__2();
 
             state._fsp--;
@@ -15547,22 +15547,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__1__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5336:1: rule__EnumAnnotationAttribute__Group__1__Impl : ( 'attribute' ) ;
+    // InternalConfig.g:5335:1: rule__EnumAnnotationAttribute__Group__1__Impl : ( 'attribute' ) ;
     public final void rule__EnumAnnotationAttribute__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5340:1: ( ( 'attribute' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5341:1: ( 'attribute' )
+            // InternalConfig.g:5339:1: ( ( 'attribute' ) )
+            // InternalConfig.g:5340:1: ( 'attribute' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5341:1: ( 'attribute' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5342:1: 'attribute'
+            // InternalConfig.g:5340:1: ( 'attribute' )
+            // InternalConfig.g:5341:1: 'attribute'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getEnumAnnotationAttributeAccess().getAttributeKeyword_1()); 
             }
-            match(input,49,FOLLOW_49_in_rule__EnumAnnotationAttribute__Group__1__Impl10764); if (state.failed) return ;
+            match(input,49,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getEnumAnnotationAttributeAccess().getAttributeKeyword_1()); 
             }
@@ -15588,21 +15588,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__2"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5355:1: rule__EnumAnnotationAttribute__Group__2 : rule__EnumAnnotationAttribute__Group__2__Impl rule__EnumAnnotationAttribute__Group__3 ;
+    // InternalConfig.g:5354:1: rule__EnumAnnotationAttribute__Group__2 : rule__EnumAnnotationAttribute__Group__2__Impl rule__EnumAnnotationAttribute__Group__3 ;
     public final void rule__EnumAnnotationAttribute__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5359:1: ( rule__EnumAnnotationAttribute__Group__2__Impl rule__EnumAnnotationAttribute__Group__3 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5360:2: rule__EnumAnnotationAttribute__Group__2__Impl rule__EnumAnnotationAttribute__Group__3
+            // InternalConfig.g:5358:1: ( rule__EnumAnnotationAttribute__Group__2__Impl rule__EnumAnnotationAttribute__Group__3 )
+            // InternalConfig.g:5359:2: rule__EnumAnnotationAttribute__Group__2__Impl rule__EnumAnnotationAttribute__Group__3
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__2__Impl_in_rule__EnumAnnotationAttribute__Group__210795);
+            pushFollow(FOLLOW_31);
             rule__EnumAnnotationAttribute__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__3_in_rule__EnumAnnotationAttribute__Group__210798);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group__3();
 
             state._fsp--;
@@ -15626,25 +15626,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__2__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5367:1: rule__EnumAnnotationAttribute__Group__2__Impl : ( ( rule__EnumAnnotationAttribute__NameAssignment_2 ) ) ;
+    // InternalConfig.g:5366:1: rule__EnumAnnotationAttribute__Group__2__Impl : ( ( rule__EnumAnnotationAttribute__NameAssignment_2 ) ) ;
     public final void rule__EnumAnnotationAttribute__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5371:1: ( ( ( rule__EnumAnnotationAttribute__NameAssignment_2 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5372:1: ( ( rule__EnumAnnotationAttribute__NameAssignment_2 ) )
+            // InternalConfig.g:5370:1: ( ( ( rule__EnumAnnotationAttribute__NameAssignment_2 ) ) )
+            // InternalConfig.g:5371:1: ( ( rule__EnumAnnotationAttribute__NameAssignment_2 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5372:1: ( ( rule__EnumAnnotationAttribute__NameAssignment_2 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5373:1: ( rule__EnumAnnotationAttribute__NameAssignment_2 )
+            // InternalConfig.g:5371:1: ( ( rule__EnumAnnotationAttribute__NameAssignment_2 ) )
+            // InternalConfig.g:5372:1: ( rule__EnumAnnotationAttribute__NameAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getEnumAnnotationAttributeAccess().getNameAssignment_2()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5374:1: ( rule__EnumAnnotationAttribute__NameAssignment_2 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5374:2: rule__EnumAnnotationAttribute__NameAssignment_2
+            // InternalConfig.g:5373:1: ( rule__EnumAnnotationAttribute__NameAssignment_2 )
+            // InternalConfig.g:5373:2: rule__EnumAnnotationAttribute__NameAssignment_2
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__NameAssignment_2_in_rule__EnumAnnotationAttribute__Group__2__Impl10825);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__NameAssignment_2();
 
             state._fsp--;
@@ -15677,21 +15677,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__3"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5384:1: rule__EnumAnnotationAttribute__Group__3 : rule__EnumAnnotationAttribute__Group__3__Impl rule__EnumAnnotationAttribute__Group__4 ;
+    // InternalConfig.g:5383:1: rule__EnumAnnotationAttribute__Group__3 : rule__EnumAnnotationAttribute__Group__3__Impl rule__EnumAnnotationAttribute__Group__4 ;
     public final void rule__EnumAnnotationAttribute__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5388:1: ( rule__EnumAnnotationAttribute__Group__3__Impl rule__EnumAnnotationAttribute__Group__4 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5389:2: rule__EnumAnnotationAttribute__Group__3__Impl rule__EnumAnnotationAttribute__Group__4
+            // InternalConfig.g:5387:1: ( rule__EnumAnnotationAttribute__Group__3__Impl rule__EnumAnnotationAttribute__Group__4 )
+            // InternalConfig.g:5388:2: rule__EnumAnnotationAttribute__Group__3__Impl rule__EnumAnnotationAttribute__Group__4
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__3__Impl_in_rule__EnumAnnotationAttribute__Group__310855);
+            pushFollow(FOLLOW_4);
             rule__EnumAnnotationAttribute__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__4_in_rule__EnumAnnotationAttribute__Group__310858);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group__4();
 
             state._fsp--;
@@ -15715,22 +15715,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__3__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5396:1: rule__EnumAnnotationAttribute__Group__3__Impl : ( ':' ) ;
+    // InternalConfig.g:5395:1: rule__EnumAnnotationAttribute__Group__3__Impl : ( ':' ) ;
     public final void rule__EnumAnnotationAttribute__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5400:1: ( ( ':' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5401:1: ( ':' )
+            // InternalConfig.g:5399:1: ( ( ':' ) )
+            // InternalConfig.g:5400:1: ( ':' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5401:1: ( ':' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5402:1: ':'
+            // InternalConfig.g:5400:1: ( ':' )
+            // InternalConfig.g:5401:1: ':'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getEnumAnnotationAttributeAccess().getColonKeyword_3()); 
             }
-            match(input,48,FOLLOW_48_in_rule__EnumAnnotationAttribute__Group__3__Impl10886); if (state.failed) return ;
+            match(input,48,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getEnumAnnotationAttributeAccess().getColonKeyword_3()); 
             }
@@ -15756,21 +15756,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__4"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5415:1: rule__EnumAnnotationAttribute__Group__4 : rule__EnumAnnotationAttribute__Group__4__Impl rule__EnumAnnotationAttribute__Group__5 ;
+    // InternalConfig.g:5414:1: rule__EnumAnnotationAttribute__Group__4 : rule__EnumAnnotationAttribute__Group__4__Impl rule__EnumAnnotationAttribute__Group__5 ;
     public final void rule__EnumAnnotationAttribute__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5419:1: ( rule__EnumAnnotationAttribute__Group__4__Impl rule__EnumAnnotationAttribute__Group__5 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5420:2: rule__EnumAnnotationAttribute__Group__4__Impl rule__EnumAnnotationAttribute__Group__5
+            // InternalConfig.g:5418:1: ( rule__EnumAnnotationAttribute__Group__4__Impl rule__EnumAnnotationAttribute__Group__5 )
+            // InternalConfig.g:5419:2: rule__EnumAnnotationAttribute__Group__4__Impl rule__EnumAnnotationAttribute__Group__5
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__4__Impl_in_rule__EnumAnnotationAttribute__Group__410917);
+            pushFollow(FOLLOW_12);
             rule__EnumAnnotationAttribute__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__5_in_rule__EnumAnnotationAttribute__Group__410920);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group__5();
 
             state._fsp--;
@@ -15794,22 +15794,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__4__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5427:1: rule__EnumAnnotationAttribute__Group__4__Impl : ( '{' ) ;
+    // InternalConfig.g:5426:1: rule__EnumAnnotationAttribute__Group__4__Impl : ( '{' ) ;
     public final void rule__EnumAnnotationAttribute__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5431:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5432:1: ( '{' )
+            // InternalConfig.g:5430:1: ( ( '{' ) )
+            // InternalConfig.g:5431:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5432:1: ( '{' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5433:1: '{'
+            // InternalConfig.g:5431:1: ( '{' )
+            // InternalConfig.g:5432:1: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getEnumAnnotationAttributeAccess().getLeftCurlyBracketKeyword_4()); 
             }
-            match(input,27,FOLLOW_27_in_rule__EnumAnnotationAttribute__Group__4__Impl10948); if (state.failed) return ;
+            match(input,27,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getEnumAnnotationAttributeAccess().getLeftCurlyBracketKeyword_4()); 
             }
@@ -15835,21 +15835,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__5"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5446:1: rule__EnumAnnotationAttribute__Group__5 : rule__EnumAnnotationAttribute__Group__5__Impl rule__EnumAnnotationAttribute__Group__6 ;
+    // InternalConfig.g:5445:1: rule__EnumAnnotationAttribute__Group__5 : rule__EnumAnnotationAttribute__Group__5__Impl rule__EnumAnnotationAttribute__Group__6 ;
     public final void rule__EnumAnnotationAttribute__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5450:1: ( rule__EnumAnnotationAttribute__Group__5__Impl rule__EnumAnnotationAttribute__Group__6 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5451:2: rule__EnumAnnotationAttribute__Group__5__Impl rule__EnumAnnotationAttribute__Group__6
+            // InternalConfig.g:5449:1: ( rule__EnumAnnotationAttribute__Group__5__Impl rule__EnumAnnotationAttribute__Group__6 )
+            // InternalConfig.g:5450:2: rule__EnumAnnotationAttribute__Group__5__Impl rule__EnumAnnotationAttribute__Group__6
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__5__Impl_in_rule__EnumAnnotationAttribute__Group__510979);
+            pushFollow(FOLLOW_35);
             rule__EnumAnnotationAttribute__Group__5__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__6_in_rule__EnumAnnotationAttribute__Group__510982);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group__6();
 
             state._fsp--;
@@ -15873,25 +15873,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__5__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5458:1: rule__EnumAnnotationAttribute__Group__5__Impl : ( ( rule__EnumAnnotationAttribute__ValuesAssignment_5 ) ) ;
+    // InternalConfig.g:5457:1: rule__EnumAnnotationAttribute__Group__5__Impl : ( ( rule__EnumAnnotationAttribute__ValuesAssignment_5 ) ) ;
     public final void rule__EnumAnnotationAttribute__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5462:1: ( ( ( rule__EnumAnnotationAttribute__ValuesAssignment_5 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5463:1: ( ( rule__EnumAnnotationAttribute__ValuesAssignment_5 ) )
+            // InternalConfig.g:5461:1: ( ( ( rule__EnumAnnotationAttribute__ValuesAssignment_5 ) ) )
+            // InternalConfig.g:5462:1: ( ( rule__EnumAnnotationAttribute__ValuesAssignment_5 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5463:1: ( ( rule__EnumAnnotationAttribute__ValuesAssignment_5 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5464:1: ( rule__EnumAnnotationAttribute__ValuesAssignment_5 )
+            // InternalConfig.g:5462:1: ( ( rule__EnumAnnotationAttribute__ValuesAssignment_5 ) )
+            // InternalConfig.g:5463:1: ( rule__EnumAnnotationAttribute__ValuesAssignment_5 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getEnumAnnotationAttributeAccess().getValuesAssignment_5()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5465:1: ( rule__EnumAnnotationAttribute__ValuesAssignment_5 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5465:2: rule__EnumAnnotationAttribute__ValuesAssignment_5
+            // InternalConfig.g:5464:1: ( rule__EnumAnnotationAttribute__ValuesAssignment_5 )
+            // InternalConfig.g:5464:2: rule__EnumAnnotationAttribute__ValuesAssignment_5
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__ValuesAssignment_5_in_rule__EnumAnnotationAttribute__Group__5__Impl11009);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__ValuesAssignment_5();
 
             state._fsp--;
@@ -15924,21 +15924,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__6"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5475:1: rule__EnumAnnotationAttribute__Group__6 : rule__EnumAnnotationAttribute__Group__6__Impl rule__EnumAnnotationAttribute__Group__7 ;
+    // InternalConfig.g:5474:1: rule__EnumAnnotationAttribute__Group__6 : rule__EnumAnnotationAttribute__Group__6__Impl rule__EnumAnnotationAttribute__Group__7 ;
     public final void rule__EnumAnnotationAttribute__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5479:1: ( rule__EnumAnnotationAttribute__Group__6__Impl rule__EnumAnnotationAttribute__Group__7 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5480:2: rule__EnumAnnotationAttribute__Group__6__Impl rule__EnumAnnotationAttribute__Group__7
+            // InternalConfig.g:5478:1: ( rule__EnumAnnotationAttribute__Group__6__Impl rule__EnumAnnotationAttribute__Group__7 )
+            // InternalConfig.g:5479:2: rule__EnumAnnotationAttribute__Group__6__Impl rule__EnumAnnotationAttribute__Group__7
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__6__Impl_in_rule__EnumAnnotationAttribute__Group__611039);
+            pushFollow(FOLLOW_35);
             rule__EnumAnnotationAttribute__Group__6__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__7_in_rule__EnumAnnotationAttribute__Group__611042);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group__7();
 
             state._fsp--;
@@ -15962,22 +15962,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__6__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5487:1: rule__EnumAnnotationAttribute__Group__6__Impl : ( ( rule__EnumAnnotationAttribute__Group_6__0 )* ) ;
+    // InternalConfig.g:5486:1: rule__EnumAnnotationAttribute__Group__6__Impl : ( ( rule__EnumAnnotationAttribute__Group_6__0 )* ) ;
     public final void rule__EnumAnnotationAttribute__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5491:1: ( ( ( rule__EnumAnnotationAttribute__Group_6__0 )* ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5492:1: ( ( rule__EnumAnnotationAttribute__Group_6__0 )* )
+            // InternalConfig.g:5490:1: ( ( ( rule__EnumAnnotationAttribute__Group_6__0 )* ) )
+            // InternalConfig.g:5491:1: ( ( rule__EnumAnnotationAttribute__Group_6__0 )* )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5492:1: ( ( rule__EnumAnnotationAttribute__Group_6__0 )* )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5493:1: ( rule__EnumAnnotationAttribute__Group_6__0 )*
+            // InternalConfig.g:5491:1: ( ( rule__EnumAnnotationAttribute__Group_6__0 )* )
+            // InternalConfig.g:5492:1: ( rule__EnumAnnotationAttribute__Group_6__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getEnumAnnotationAttributeAccess().getGroup_6()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5494:1: ( rule__EnumAnnotationAttribute__Group_6__0 )*
+            // InternalConfig.g:5493:1: ( rule__EnumAnnotationAttribute__Group_6__0 )*
             loop39:
             do {
                 int alt39=2;
@@ -15990,9 +15990,9 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
                 switch (alt39) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5494:2: rule__EnumAnnotationAttribute__Group_6__0
+            	    // InternalConfig.g:5493:2: rule__EnumAnnotationAttribute__Group_6__0
             	    {
-            	    pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group_6__0_in_rule__EnumAnnotationAttribute__Group__6__Impl11069);
+            	    pushFollow(FOLLOW_28);
             	    rule__EnumAnnotationAttribute__Group_6__0();
 
             	    state._fsp--;
@@ -16031,16 +16031,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__7"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5504:1: rule__EnumAnnotationAttribute__Group__7 : rule__EnumAnnotationAttribute__Group__7__Impl ;
+    // InternalConfig.g:5503:1: rule__EnumAnnotationAttribute__Group__7 : rule__EnumAnnotationAttribute__Group__7__Impl ;
     public final void rule__EnumAnnotationAttribute__Group__7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5508:1: ( rule__EnumAnnotationAttribute__Group__7__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5509:2: rule__EnumAnnotationAttribute__Group__7__Impl
+            // InternalConfig.g:5507:1: ( rule__EnumAnnotationAttribute__Group__7__Impl )
+            // InternalConfig.g:5508:2: rule__EnumAnnotationAttribute__Group__7__Impl
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__7__Impl_in_rule__EnumAnnotationAttribute__Group__711100);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group__7__Impl();
 
             state._fsp--;
@@ -16064,22 +16064,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__7__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5515:1: rule__EnumAnnotationAttribute__Group__7__Impl : ( '}' ) ;
+    // InternalConfig.g:5514:1: rule__EnumAnnotationAttribute__Group__7__Impl : ( '}' ) ;
     public final void rule__EnumAnnotationAttribute__Group__7__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5519:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5520:1: ( '}' )
+            // InternalConfig.g:5518:1: ( ( '}' ) )
+            // InternalConfig.g:5519:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5520:1: ( '}' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5521:1: '}'
+            // InternalConfig.g:5519:1: ( '}' )
+            // InternalConfig.g:5520:1: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getEnumAnnotationAttributeAccess().getRightCurlyBracketKeyword_7()); 
             }
-            match(input,28,FOLLOW_28_in_rule__EnumAnnotationAttribute__Group__7__Impl11128); if (state.failed) return ;
+            match(input,28,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getEnumAnnotationAttributeAccess().getRightCurlyBracketKeyword_7()); 
             }
@@ -16105,21 +16105,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group_6__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5550:1: rule__EnumAnnotationAttribute__Group_6__0 : rule__EnumAnnotationAttribute__Group_6__0__Impl rule__EnumAnnotationAttribute__Group_6__1 ;
+    // InternalConfig.g:5549:1: rule__EnumAnnotationAttribute__Group_6__0 : rule__EnumAnnotationAttribute__Group_6__0__Impl rule__EnumAnnotationAttribute__Group_6__1 ;
     public final void rule__EnumAnnotationAttribute__Group_6__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5554:1: ( rule__EnumAnnotationAttribute__Group_6__0__Impl rule__EnumAnnotationAttribute__Group_6__1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5555:2: rule__EnumAnnotationAttribute__Group_6__0__Impl rule__EnumAnnotationAttribute__Group_6__1
+            // InternalConfig.g:5553:1: ( rule__EnumAnnotationAttribute__Group_6__0__Impl rule__EnumAnnotationAttribute__Group_6__1 )
+            // InternalConfig.g:5554:2: rule__EnumAnnotationAttribute__Group_6__0__Impl rule__EnumAnnotationAttribute__Group_6__1
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group_6__0__Impl_in_rule__EnumAnnotationAttribute__Group_6__011175);
+            pushFollow(FOLLOW_12);
             rule__EnumAnnotationAttribute__Group_6__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group_6__1_in_rule__EnumAnnotationAttribute__Group_6__011178);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group_6__1();
 
             state._fsp--;
@@ -16143,22 +16143,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group_6__0__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5562:1: rule__EnumAnnotationAttribute__Group_6__0__Impl : ( ',' ) ;
+    // InternalConfig.g:5561:1: rule__EnumAnnotationAttribute__Group_6__0__Impl : ( ',' ) ;
     public final void rule__EnumAnnotationAttribute__Group_6__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5566:1: ( ( ',' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5567:1: ( ',' )
+            // InternalConfig.g:5565:1: ( ( ',' ) )
+            // InternalConfig.g:5566:1: ( ',' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5567:1: ( ',' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5568:1: ','
+            // InternalConfig.g:5566:1: ( ',' )
+            // InternalConfig.g:5567:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getEnumAnnotationAttributeAccess().getCommaKeyword_6_0()); 
             }
-            match(input,46,FOLLOW_46_in_rule__EnumAnnotationAttribute__Group_6__0__Impl11206); if (state.failed) return ;
+            match(input,46,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getEnumAnnotationAttributeAccess().getCommaKeyword_6_0()); 
             }
@@ -16184,16 +16184,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group_6__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5581:1: rule__EnumAnnotationAttribute__Group_6__1 : rule__EnumAnnotationAttribute__Group_6__1__Impl ;
+    // InternalConfig.g:5580:1: rule__EnumAnnotationAttribute__Group_6__1 : rule__EnumAnnotationAttribute__Group_6__1__Impl ;
     public final void rule__EnumAnnotationAttribute__Group_6__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5585:1: ( rule__EnumAnnotationAttribute__Group_6__1__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5586:2: rule__EnumAnnotationAttribute__Group_6__1__Impl
+            // InternalConfig.g:5584:1: ( rule__EnumAnnotationAttribute__Group_6__1__Impl )
+            // InternalConfig.g:5585:2: rule__EnumAnnotationAttribute__Group_6__1__Impl
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group_6__1__Impl_in_rule__EnumAnnotationAttribute__Group_6__111237);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group_6__1__Impl();
 
             state._fsp--;
@@ -16217,25 +16217,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group_6__1__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5592:1: rule__EnumAnnotationAttribute__Group_6__1__Impl : ( ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 ) ) ;
+    // InternalConfig.g:5591:1: rule__EnumAnnotationAttribute__Group_6__1__Impl : ( ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 ) ) ;
     public final void rule__EnumAnnotationAttribute__Group_6__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5596:1: ( ( ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5597:1: ( ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 ) )
+            // InternalConfig.g:5595:1: ( ( ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 ) ) )
+            // InternalConfig.g:5596:1: ( ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5597:1: ( ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5598:1: ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 )
+            // InternalConfig.g:5596:1: ( ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 ) )
+            // InternalConfig.g:5597:1: ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getEnumAnnotationAttributeAccess().getValuesAssignment_6_1()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5599:1: ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5599:2: rule__EnumAnnotationAttribute__ValuesAssignment_6_1
+            // InternalConfig.g:5598:1: ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 )
+            // InternalConfig.g:5598:2: rule__EnumAnnotationAttribute__ValuesAssignment_6_1
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__ValuesAssignment_6_1_in_rule__EnumAnnotationAttribute__Group_6__1__Impl11264);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__ValuesAssignment_6_1();
 
             state._fsp--;
@@ -16268,21 +16268,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Import__Group__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5613:1: rule__Import__Group__0 : rule__Import__Group__0__Impl rule__Import__Group__1 ;
+    // InternalConfig.g:5612:1: rule__Import__Group__0 : rule__Import__Group__0__Impl rule__Import__Group__1 ;
     public final void rule__Import__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5617:1: ( rule__Import__Group__0__Impl rule__Import__Group__1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5618:2: rule__Import__Group__0__Impl rule__Import__Group__1
+            // InternalConfig.g:5616:1: ( rule__Import__Group__0__Impl rule__Import__Group__1 )
+            // InternalConfig.g:5617:2: rule__Import__Group__0__Impl rule__Import__Group__1
             {
-            pushFollow(FOLLOW_rule__Import__Group__0__Impl_in_rule__Import__Group__011298);
+            pushFollow(FOLLOW_36);
             rule__Import__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Import__Group__1_in_rule__Import__Group__011301);
+            pushFollow(FOLLOW_2);
             rule__Import__Group__1();
 
             state._fsp--;
@@ -16306,22 +16306,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Import__Group__0__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5625:1: rule__Import__Group__0__Impl : ( 'import' ) ;
+    // InternalConfig.g:5624:1: rule__Import__Group__0__Impl : ( 'import' ) ;
     public final void rule__Import__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5629:1: ( ( 'import' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5630:1: ( 'import' )
+            // InternalConfig.g:5628:1: ( ( 'import' ) )
+            // InternalConfig.g:5629:1: ( 'import' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5630:1: ( 'import' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5631:1: 'import'
+            // InternalConfig.g:5629:1: ( 'import' )
+            // InternalConfig.g:5630:1: 'import'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImportAccess().getImportKeyword_0()); 
             }
-            match(input,50,FOLLOW_50_in_rule__Import__Group__0__Impl11329); if (state.failed) return ;
+            match(input,50,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getImportAccess().getImportKeyword_0()); 
             }
@@ -16347,21 +16347,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Import__Group__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5644:1: rule__Import__Group__1 : rule__Import__Group__1__Impl rule__Import__Group__2 ;
+    // InternalConfig.g:5643:1: rule__Import__Group__1 : rule__Import__Group__1__Impl rule__Import__Group__2 ;
     public final void rule__Import__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5648:1: ( rule__Import__Group__1__Impl rule__Import__Group__2 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5649:2: rule__Import__Group__1__Impl rule__Import__Group__2
+            // InternalConfig.g:5647:1: ( rule__Import__Group__1__Impl rule__Import__Group__2 )
+            // InternalConfig.g:5648:2: rule__Import__Group__1__Impl rule__Import__Group__2
             {
-            pushFollow(FOLLOW_rule__Import__Group__1__Impl_in_rule__Import__Group__111360);
+            pushFollow(FOLLOW_12);
             rule__Import__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Import__Group__2_in_rule__Import__Group__111363);
+            pushFollow(FOLLOW_2);
             rule__Import__Group__2();
 
             state._fsp--;
@@ -16385,25 +16385,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Import__Group__1__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5656:1: rule__Import__Group__1__Impl : ( ( rule__Import__Alternatives_1 ) ) ;
+    // InternalConfig.g:5655:1: rule__Import__Group__1__Impl : ( ( rule__Import__Alternatives_1 ) ) ;
     public final void rule__Import__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5660:1: ( ( ( rule__Import__Alternatives_1 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5661:1: ( ( rule__Import__Alternatives_1 ) )
+            // InternalConfig.g:5659:1: ( ( ( rule__Import__Alternatives_1 ) ) )
+            // InternalConfig.g:5660:1: ( ( rule__Import__Alternatives_1 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5661:1: ( ( rule__Import__Alternatives_1 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5662:1: ( rule__Import__Alternatives_1 )
+            // InternalConfig.g:5660:1: ( ( rule__Import__Alternatives_1 ) )
+            // InternalConfig.g:5661:1: ( rule__Import__Alternatives_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImportAccess().getAlternatives_1()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5663:1: ( rule__Import__Alternatives_1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5663:2: rule__Import__Alternatives_1
+            // InternalConfig.g:5662:1: ( rule__Import__Alternatives_1 )
+            // InternalConfig.g:5662:2: rule__Import__Alternatives_1
             {
-            pushFollow(FOLLOW_rule__Import__Alternatives_1_in_rule__Import__Group__1__Impl11390);
+            pushFollow(FOLLOW_2);
             rule__Import__Alternatives_1();
 
             state._fsp--;
@@ -16436,16 +16436,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Import__Group__2"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5673:1: rule__Import__Group__2 : rule__Import__Group__2__Impl ;
+    // InternalConfig.g:5672:1: rule__Import__Group__2 : rule__Import__Group__2__Impl ;
     public final void rule__Import__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5677:1: ( rule__Import__Group__2__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5678:2: rule__Import__Group__2__Impl
+            // InternalConfig.g:5676:1: ( rule__Import__Group__2__Impl )
+            // InternalConfig.g:5677:2: rule__Import__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__Import__Group__2__Impl_in_rule__Import__Group__211420);
+            pushFollow(FOLLOW_2);
             rule__Import__Group__2__Impl();
 
             state._fsp--;
@@ -16469,25 +16469,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Import__Group__2__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5684:1: rule__Import__Group__2__Impl : ( ( rule__Import__ImportURIAssignment_2 ) ) ;
+    // InternalConfig.g:5683:1: rule__Import__Group__2__Impl : ( ( rule__Import__ImportURIAssignment_2 ) ) ;
     public final void rule__Import__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5688:1: ( ( ( rule__Import__ImportURIAssignment_2 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5689:1: ( ( rule__Import__ImportURIAssignment_2 ) )
+            // InternalConfig.g:5687:1: ( ( ( rule__Import__ImportURIAssignment_2 ) ) )
+            // InternalConfig.g:5688:1: ( ( rule__Import__ImportURIAssignment_2 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5689:1: ( ( rule__Import__ImportURIAssignment_2 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5690:1: ( rule__Import__ImportURIAssignment_2 )
+            // InternalConfig.g:5688:1: ( ( rule__Import__ImportURIAssignment_2 ) )
+            // InternalConfig.g:5689:1: ( rule__Import__ImportURIAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImportAccess().getImportURIAssignment_2()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5691:1: ( rule__Import__ImportURIAssignment_2 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5691:2: rule__Import__ImportURIAssignment_2
+            // InternalConfig.g:5690:1: ( rule__Import__ImportURIAssignment_2 )
+            // InternalConfig.g:5690:2: rule__Import__ImportURIAssignment_2
             {
-            pushFollow(FOLLOW_rule__Import__ImportURIAssignment_2_in_rule__Import__Group__2__Impl11447);
+            pushFollow(FOLLOW_2);
             rule__Import__ImportURIAssignment_2();
 
             state._fsp--;
@@ -16520,21 +16520,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Import__Group_1_0__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5707:1: rule__Import__Group_1_0__0 : rule__Import__Group_1_0__0__Impl rule__Import__Group_1_0__1 ;
+    // InternalConfig.g:5706:1: rule__Import__Group_1_0__0 : rule__Import__Group_1_0__0__Impl rule__Import__Group_1_0__1 ;
     public final void rule__Import__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5711:1: ( rule__Import__Group_1_0__0__Impl rule__Import__Group_1_0__1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5712:2: rule__Import__Group_1_0__0__Impl rule__Import__Group_1_0__1
+            // InternalConfig.g:5710:1: ( rule__Import__Group_1_0__0__Impl rule__Import__Group_1_0__1 )
+            // InternalConfig.g:5711:2: rule__Import__Group_1_0__0__Impl rule__Import__Group_1_0__1
             {
-            pushFollow(FOLLOW_rule__Import__Group_1_0__0__Impl_in_rule__Import__Group_1_0__011483);
+            pushFollow(FOLLOW_37);
             rule__Import__Group_1_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Import__Group_1_0__1_in_rule__Import__Group_1_0__011486);
+            pushFollow(FOLLOW_2);
             rule__Import__Group_1_0__1();
 
             state._fsp--;
@@ -16558,25 +16558,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Import__Group_1_0__0__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5719:1: rule__Import__Group_1_0__0__Impl : ( ( rule__Import__ImportedNamespaceAssignment_1_0_0 ) ) ;
+    // InternalConfig.g:5718:1: rule__Import__Group_1_0__0__Impl : ( ( rule__Import__ImportedNamespaceAssignment_1_0_0 ) ) ;
     public final void rule__Import__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5723:1: ( ( ( rule__Import__ImportedNamespaceAssignment_1_0_0 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5724:1: ( ( rule__Import__ImportedNamespaceAssignment_1_0_0 ) )
+            // InternalConfig.g:5722:1: ( ( ( rule__Import__ImportedNamespaceAssignment_1_0_0 ) ) )
+            // InternalConfig.g:5723:1: ( ( rule__Import__ImportedNamespaceAssignment_1_0_0 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5724:1: ( ( rule__Import__ImportedNamespaceAssignment_1_0_0 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5725:1: ( rule__Import__ImportedNamespaceAssignment_1_0_0 )
+            // InternalConfig.g:5723:1: ( ( rule__Import__ImportedNamespaceAssignment_1_0_0 ) )
+            // InternalConfig.g:5724:1: ( rule__Import__ImportedNamespaceAssignment_1_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImportAccess().getImportedNamespaceAssignment_1_0_0()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5726:1: ( rule__Import__ImportedNamespaceAssignment_1_0_0 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5726:2: rule__Import__ImportedNamespaceAssignment_1_0_0
+            // InternalConfig.g:5725:1: ( rule__Import__ImportedNamespaceAssignment_1_0_0 )
+            // InternalConfig.g:5725:2: rule__Import__ImportedNamespaceAssignment_1_0_0
             {
-            pushFollow(FOLLOW_rule__Import__ImportedNamespaceAssignment_1_0_0_in_rule__Import__Group_1_0__0__Impl11513);
+            pushFollow(FOLLOW_2);
             rule__Import__ImportedNamespaceAssignment_1_0_0();
 
             state._fsp--;
@@ -16609,16 +16609,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Import__Group_1_0__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5736:1: rule__Import__Group_1_0__1 : rule__Import__Group_1_0__1__Impl ;
+    // InternalConfig.g:5735:1: rule__Import__Group_1_0__1 : rule__Import__Group_1_0__1__Impl ;
     public final void rule__Import__Group_1_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5740:1: ( rule__Import__Group_1_0__1__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5741:2: rule__Import__Group_1_0__1__Impl
+            // InternalConfig.g:5739:1: ( rule__Import__Group_1_0__1__Impl )
+            // InternalConfig.g:5740:2: rule__Import__Group_1_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__Import__Group_1_0__1__Impl_in_rule__Import__Group_1_0__111543);
+            pushFollow(FOLLOW_2);
             rule__Import__Group_1_0__1__Impl();
 
             state._fsp--;
@@ -16642,22 +16642,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Import__Group_1_0__1__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5747:1: rule__Import__Group_1_0__1__Impl : ( 'from' ) ;
+    // InternalConfig.g:5746:1: rule__Import__Group_1_0__1__Impl : ( 'from' ) ;
     public final void rule__Import__Group_1_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5751:1: ( ( 'from' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5752:1: ( 'from' )
+            // InternalConfig.g:5750:1: ( ( 'from' ) )
+            // InternalConfig.g:5751:1: ( 'from' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5752:1: ( 'from' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5753:1: 'from'
+            // InternalConfig.g:5751:1: ( 'from' )
+            // InternalConfig.g:5752:1: 'from'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImportAccess().getFromKeyword_1_0_1()); 
             }
-            match(input,51,FOLLOW_51_in_rule__Import__Group_1_0__1__Impl11571); if (state.failed) return ;
+            match(input,51,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getImportAccess().getFromKeyword_1_0_1()); 
             }
@@ -16683,21 +16683,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ImportedFQN__Group__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5770:1: rule__ImportedFQN__Group__0 : rule__ImportedFQN__Group__0__Impl rule__ImportedFQN__Group__1 ;
+    // InternalConfig.g:5769:1: rule__ImportedFQN__Group__0 : rule__ImportedFQN__Group__0__Impl rule__ImportedFQN__Group__1 ;
     public final void rule__ImportedFQN__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5774:1: ( rule__ImportedFQN__Group__0__Impl rule__ImportedFQN__Group__1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5775:2: rule__ImportedFQN__Group__0__Impl rule__ImportedFQN__Group__1
+            // InternalConfig.g:5773:1: ( rule__ImportedFQN__Group__0__Impl rule__ImportedFQN__Group__1 )
+            // InternalConfig.g:5774:2: rule__ImportedFQN__Group__0__Impl rule__ImportedFQN__Group__1
             {
-            pushFollow(FOLLOW_rule__ImportedFQN__Group__0__Impl_in_rule__ImportedFQN__Group__011606);
+            pushFollow(FOLLOW_38);
             rule__ImportedFQN__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ImportedFQN__Group__1_in_rule__ImportedFQN__Group__011609);
+            pushFollow(FOLLOW_2);
             rule__ImportedFQN__Group__1();
 
             state._fsp--;
@@ -16721,22 +16721,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ImportedFQN__Group__0__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5782:1: rule__ImportedFQN__Group__0__Impl : ( ruleFQN ) ;
+    // InternalConfig.g:5781:1: rule__ImportedFQN__Group__0__Impl : ( ruleFQN ) ;
     public final void rule__ImportedFQN__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5786:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5787:1: ( ruleFQN )
+            // InternalConfig.g:5785:1: ( ( ruleFQN ) )
+            // InternalConfig.g:5786:1: ( ruleFQN )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5787:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5788:1: ruleFQN
+            // InternalConfig.g:5786:1: ( ruleFQN )
+            // InternalConfig.g:5787:1: ruleFQN
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImportedFQNAccess().getFQNParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleFQN_in_rule__ImportedFQN__Group__0__Impl11636);
+            pushFollow(FOLLOW_2);
             ruleFQN();
 
             state._fsp--;
@@ -16766,16 +16766,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ImportedFQN__Group__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5799:1: rule__ImportedFQN__Group__1 : rule__ImportedFQN__Group__1__Impl ;
+    // InternalConfig.g:5798:1: rule__ImportedFQN__Group__1 : rule__ImportedFQN__Group__1__Impl ;
     public final void rule__ImportedFQN__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5803:1: ( rule__ImportedFQN__Group__1__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5804:2: rule__ImportedFQN__Group__1__Impl
+            // InternalConfig.g:5802:1: ( rule__ImportedFQN__Group__1__Impl )
+            // InternalConfig.g:5803:2: rule__ImportedFQN__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__ImportedFQN__Group__1__Impl_in_rule__ImportedFQN__Group__111665);
+            pushFollow(FOLLOW_2);
             rule__ImportedFQN__Group__1__Impl();
 
             state._fsp--;
@@ -16799,22 +16799,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ImportedFQN__Group__1__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5810:1: rule__ImportedFQN__Group__1__Impl : ( ( '.*' )? ) ;
+    // InternalConfig.g:5809:1: rule__ImportedFQN__Group__1__Impl : ( ( '.*' )? ) ;
     public final void rule__ImportedFQN__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5814:1: ( ( ( '.*' )? ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5815:1: ( ( '.*' )? )
+            // InternalConfig.g:5813:1: ( ( ( '.*' )? ) )
+            // InternalConfig.g:5814:1: ( ( '.*' )? )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5815:1: ( ( '.*' )? )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5816:1: ( '.*' )?
+            // InternalConfig.g:5814:1: ( ( '.*' )? )
+            // InternalConfig.g:5815:1: ( '.*' )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImportedFQNAccess().getFullStopAsteriskKeyword_1()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5817:1: ( '.*' )?
+            // InternalConfig.g:5816:1: ( '.*' )?
             int alt40=2;
             int LA40_0 = input.LA(1);
 
@@ -16823,9 +16823,9 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             }
             switch (alt40) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5818:2: '.*'
+                    // InternalConfig.g:5817:2: '.*'
                     {
-                    match(input,52,FOLLOW_52_in_rule__ImportedFQN__Group__1__Impl11694); if (state.failed) return ;
+                    match(input,52,FOLLOW_2); if (state.failed) return ;
 
                     }
                     break;
@@ -16857,21 +16857,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Documentation__Group__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5833:1: rule__Documentation__Group__0 : rule__Documentation__Group__0__Impl rule__Documentation__Group__1 ;
+    // InternalConfig.g:5832:1: rule__Documentation__Group__0 : rule__Documentation__Group__0__Impl rule__Documentation__Group__1 ;
     public final void rule__Documentation__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5837:1: ( rule__Documentation__Group__0__Impl rule__Documentation__Group__1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5838:2: rule__Documentation__Group__0__Impl rule__Documentation__Group__1
+            // InternalConfig.g:5836:1: ( rule__Documentation__Group__0__Impl rule__Documentation__Group__1 )
+            // InternalConfig.g:5837:2: rule__Documentation__Group__0__Impl rule__Documentation__Group__1
             {
-            pushFollow(FOLLOW_rule__Documentation__Group__0__Impl_in_rule__Documentation__Group__011731);
+            pushFollow(FOLLOW_39);
             rule__Documentation__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Documentation__Group__1_in_rule__Documentation__Group__011734);
+            pushFollow(FOLLOW_2);
             rule__Documentation__Group__1();
 
             state._fsp--;
@@ -16895,23 +16895,23 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Documentation__Group__0__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5845:1: rule__Documentation__Group__0__Impl : ( () ) ;
+    // InternalConfig.g:5844:1: rule__Documentation__Group__0__Impl : ( () ) ;
     public final void rule__Documentation__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5849:1: ( ( () ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5850:1: ( () )
+            // InternalConfig.g:5848:1: ( ( () ) )
+            // InternalConfig.g:5849:1: ( () )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5850:1: ( () )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5851:1: ()
+            // InternalConfig.g:5849:1: ( () )
+            // InternalConfig.g:5850:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDocumentationAccess().getDocumentationAction_0()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5852:1: ()
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5854:1: 
+            // InternalConfig.g:5851:1: ()
+            // InternalConfig.g:5853:1: 
             {
             }
 
@@ -16936,21 +16936,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Documentation__Group__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5864:1: rule__Documentation__Group__1 : rule__Documentation__Group__1__Impl rule__Documentation__Group__2 ;
+    // InternalConfig.g:5863:1: rule__Documentation__Group__1 : rule__Documentation__Group__1__Impl rule__Documentation__Group__2 ;
     public final void rule__Documentation__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5868:1: ( rule__Documentation__Group__1__Impl rule__Documentation__Group__2 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5869:2: rule__Documentation__Group__1__Impl rule__Documentation__Group__2
+            // InternalConfig.g:5867:1: ( rule__Documentation__Group__1__Impl rule__Documentation__Group__2 )
+            // InternalConfig.g:5868:2: rule__Documentation__Group__1__Impl rule__Documentation__Group__2
             {
-            pushFollow(FOLLOW_rule__Documentation__Group__1__Impl_in_rule__Documentation__Group__111792);
+            pushFollow(FOLLOW_40);
             rule__Documentation__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Documentation__Group__2_in_rule__Documentation__Group__111795);
+            pushFollow(FOLLOW_2);
             rule__Documentation__Group__2();
 
             state._fsp--;
@@ -16974,22 +16974,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Documentation__Group__1__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5876:1: rule__Documentation__Group__1__Impl : ( '[' ) ;
+    // InternalConfig.g:5875:1: rule__Documentation__Group__1__Impl : ( '[' ) ;
     public final void rule__Documentation__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5880:1: ( ( '[' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5881:1: ( '[' )
+            // InternalConfig.g:5879:1: ( ( '[' ) )
+            // InternalConfig.g:5880:1: ( '[' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5881:1: ( '[' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5882:1: '['
+            // InternalConfig.g:5880:1: ( '[' )
+            // InternalConfig.g:5881:1: '['
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDocumentationAccess().getLeftSquareBracketKeyword_1()); 
             }
-            match(input,53,FOLLOW_53_in_rule__Documentation__Group__1__Impl11823); if (state.failed) return ;
+            match(input,53,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getDocumentationAccess().getLeftSquareBracketKeyword_1()); 
             }
@@ -17015,21 +17015,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Documentation__Group__2"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5895:1: rule__Documentation__Group__2 : rule__Documentation__Group__2__Impl rule__Documentation__Group__3 ;
+    // InternalConfig.g:5894:1: rule__Documentation__Group__2 : rule__Documentation__Group__2__Impl rule__Documentation__Group__3 ;
     public final void rule__Documentation__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5899:1: ( rule__Documentation__Group__2__Impl rule__Documentation__Group__3 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5900:2: rule__Documentation__Group__2__Impl rule__Documentation__Group__3
+            // InternalConfig.g:5898:1: ( rule__Documentation__Group__2__Impl rule__Documentation__Group__3 )
+            // InternalConfig.g:5899:2: rule__Documentation__Group__2__Impl rule__Documentation__Group__3
             {
-            pushFollow(FOLLOW_rule__Documentation__Group__2__Impl_in_rule__Documentation__Group__211854);
+            pushFollow(FOLLOW_40);
             rule__Documentation__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Documentation__Group__3_in_rule__Documentation__Group__211857);
+            pushFollow(FOLLOW_2);
             rule__Documentation__Group__3();
 
             state._fsp--;
@@ -17053,22 +17053,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Documentation__Group__2__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5907:1: rule__Documentation__Group__2__Impl : ( ( rule__Documentation__LinesAssignment_2 )* ) ;
+    // InternalConfig.g:5906:1: rule__Documentation__Group__2__Impl : ( ( rule__Documentation__LinesAssignment_2 )* ) ;
     public final void rule__Documentation__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5911:1: ( ( ( rule__Documentation__LinesAssignment_2 )* ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5912:1: ( ( rule__Documentation__LinesAssignment_2 )* )
+            // InternalConfig.g:5910:1: ( ( ( rule__Documentation__LinesAssignment_2 )* ) )
+            // InternalConfig.g:5911:1: ( ( rule__Documentation__LinesAssignment_2 )* )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5912:1: ( ( rule__Documentation__LinesAssignment_2 )* )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5913:1: ( rule__Documentation__LinesAssignment_2 )*
+            // InternalConfig.g:5911:1: ( ( rule__Documentation__LinesAssignment_2 )* )
+            // InternalConfig.g:5912:1: ( rule__Documentation__LinesAssignment_2 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDocumentationAccess().getLinesAssignment_2()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5914:1: ( rule__Documentation__LinesAssignment_2 )*
+            // InternalConfig.g:5913:1: ( rule__Documentation__LinesAssignment_2 )*
             loop41:
             do {
                 int alt41=2;
@@ -17081,9 +17081,9 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
                 switch (alt41) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5914:2: rule__Documentation__LinesAssignment_2
+            	    // InternalConfig.g:5913:2: rule__Documentation__LinesAssignment_2
             	    {
-            	    pushFollow(FOLLOW_rule__Documentation__LinesAssignment_2_in_rule__Documentation__Group__2__Impl11884);
+            	    pushFollow(FOLLOW_41);
             	    rule__Documentation__LinesAssignment_2();
 
             	    state._fsp--;
@@ -17122,16 +17122,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Documentation__Group__3"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5924:1: rule__Documentation__Group__3 : rule__Documentation__Group__3__Impl ;
+    // InternalConfig.g:5923:1: rule__Documentation__Group__3 : rule__Documentation__Group__3__Impl ;
     public final void rule__Documentation__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5928:1: ( rule__Documentation__Group__3__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5929:2: rule__Documentation__Group__3__Impl
+            // InternalConfig.g:5927:1: ( rule__Documentation__Group__3__Impl )
+            // InternalConfig.g:5928:2: rule__Documentation__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__Documentation__Group__3__Impl_in_rule__Documentation__Group__311915);
+            pushFollow(FOLLOW_2);
             rule__Documentation__Group__3__Impl();
 
             state._fsp--;
@@ -17155,22 +17155,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Documentation__Group__3__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5935:1: rule__Documentation__Group__3__Impl : ( ']' ) ;
+    // InternalConfig.g:5934:1: rule__Documentation__Group__3__Impl : ( ']' ) ;
     public final void rule__Documentation__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5939:1: ( ( ']' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5940:1: ( ']' )
+            // InternalConfig.g:5938:1: ( ( ']' ) )
+            // InternalConfig.g:5939:1: ( ']' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5940:1: ( ']' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5941:1: ']'
+            // InternalConfig.g:5939:1: ( ']' )
+            // InternalConfig.g:5940:1: ']'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDocumentationAccess().getRightSquareBracketKeyword_3()); 
             }
-            match(input,54,FOLLOW_54_in_rule__Documentation__Group__3__Impl11943); if (state.failed) return ;
+            match(input,54,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getDocumentationAccess().getRightSquareBracketKeyword_3()); 
             }
@@ -17196,21 +17196,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TIME__Group_0__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5962:1: rule__TIME__Group_0__0 : rule__TIME__Group_0__0__Impl rule__TIME__Group_0__1 ;
+    // InternalConfig.g:5961:1: rule__TIME__Group_0__0 : rule__TIME__Group_0__0__Impl rule__TIME__Group_0__1 ;
     public final void rule__TIME__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5966:1: ( rule__TIME__Group_0__0__Impl rule__TIME__Group_0__1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5967:2: rule__TIME__Group_0__0__Impl rule__TIME__Group_0__1
+            // InternalConfig.g:5965:1: ( rule__TIME__Group_0__0__Impl rule__TIME__Group_0__1 )
+            // InternalConfig.g:5966:2: rule__TIME__Group_0__0__Impl rule__TIME__Group_0__1
             {
-            pushFollow(FOLLOW_rule__TIME__Group_0__0__Impl_in_rule__TIME__Group_0__011982);
+            pushFollow(FOLLOW_42);
             rule__TIME__Group_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__TIME__Group_0__1_in_rule__TIME__Group_0__011985);
+            pushFollow(FOLLOW_2);
             rule__TIME__Group_0__1();
 
             state._fsp--;
@@ -17234,22 +17234,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TIME__Group_0__0__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5974:1: rule__TIME__Group_0__0__Impl : ( RULE_INT ) ;
+    // InternalConfig.g:5973:1: rule__TIME__Group_0__0__Impl : ( RULE_INT ) ;
     public final void rule__TIME__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5978:1: ( ( RULE_INT ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5979:1: ( RULE_INT )
+            // InternalConfig.g:5977:1: ( ( RULE_INT ) )
+            // InternalConfig.g:5978:1: ( RULE_INT )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5979:1: ( RULE_INT )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5980:1: RULE_INT
+            // InternalConfig.g:5978:1: ( RULE_INT )
+            // InternalConfig.g:5979:1: RULE_INT
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTIMEAccess().getINTTerminalRuleCall_0_0()); 
             }
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__TIME__Group_0__0__Impl12012); if (state.failed) return ;
+            match(input,RULE_INT,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getTIMEAccess().getINTTerminalRuleCall_0_0()); 
             }
@@ -17275,16 +17275,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TIME__Group_0__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5991:1: rule__TIME__Group_0__1 : rule__TIME__Group_0__1__Impl ;
+    // InternalConfig.g:5990:1: rule__TIME__Group_0__1 : rule__TIME__Group_0__1__Impl ;
     public final void rule__TIME__Group_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5995:1: ( rule__TIME__Group_0__1__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:5996:2: rule__TIME__Group_0__1__Impl
+            // InternalConfig.g:5994:1: ( rule__TIME__Group_0__1__Impl )
+            // InternalConfig.g:5995:2: rule__TIME__Group_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__TIME__Group_0__1__Impl_in_rule__TIME__Group_0__112041);
+            pushFollow(FOLLOW_2);
             rule__TIME__Group_0__1__Impl();
 
             state._fsp--;
@@ -17308,22 +17308,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TIME__Group_0__1__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6002:1: rule__TIME__Group_0__1__Impl : ( 's' ) ;
+    // InternalConfig.g:6001:1: rule__TIME__Group_0__1__Impl : ( 's' ) ;
     public final void rule__TIME__Group_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6006:1: ( ( 's' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6007:1: ( 's' )
+            // InternalConfig.g:6005:1: ( ( 's' ) )
+            // InternalConfig.g:6006:1: ( 's' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6007:1: ( 's' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6008:1: 's'
+            // InternalConfig.g:6006:1: ( 's' )
+            // InternalConfig.g:6007:1: 's'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTIMEAccess().getSKeyword_0_1()); 
             }
-            match(input,55,FOLLOW_55_in_rule__TIME__Group_0__1__Impl12069); if (state.failed) return ;
+            match(input,55,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getTIMEAccess().getSKeyword_0_1()); 
             }
@@ -17349,21 +17349,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TIME__Group_1__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6025:1: rule__TIME__Group_1__0 : rule__TIME__Group_1__0__Impl rule__TIME__Group_1__1 ;
+    // InternalConfig.g:6024:1: rule__TIME__Group_1__0 : rule__TIME__Group_1__0__Impl rule__TIME__Group_1__1 ;
     public final void rule__TIME__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6029:1: ( rule__TIME__Group_1__0__Impl rule__TIME__Group_1__1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6030:2: rule__TIME__Group_1__0__Impl rule__TIME__Group_1__1
+            // InternalConfig.g:6028:1: ( rule__TIME__Group_1__0__Impl rule__TIME__Group_1__1 )
+            // InternalConfig.g:6029:2: rule__TIME__Group_1__0__Impl rule__TIME__Group_1__1
             {
-            pushFollow(FOLLOW_rule__TIME__Group_1__0__Impl_in_rule__TIME__Group_1__012104);
+            pushFollow(FOLLOW_43);
             rule__TIME__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__TIME__Group_1__1_in_rule__TIME__Group_1__012107);
+            pushFollow(FOLLOW_2);
             rule__TIME__Group_1__1();
 
             state._fsp--;
@@ -17387,22 +17387,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TIME__Group_1__0__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6037:1: rule__TIME__Group_1__0__Impl : ( RULE_INT ) ;
+    // InternalConfig.g:6036:1: rule__TIME__Group_1__0__Impl : ( RULE_INT ) ;
     public final void rule__TIME__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6041:1: ( ( RULE_INT ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6042:1: ( RULE_INT )
+            // InternalConfig.g:6040:1: ( ( RULE_INT ) )
+            // InternalConfig.g:6041:1: ( RULE_INT )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6042:1: ( RULE_INT )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6043:1: RULE_INT
+            // InternalConfig.g:6041:1: ( RULE_INT )
+            // InternalConfig.g:6042:1: RULE_INT
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTIMEAccess().getINTTerminalRuleCall_1_0()); 
             }
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__TIME__Group_1__0__Impl12134); if (state.failed) return ;
+            match(input,RULE_INT,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getTIMEAccess().getINTTerminalRuleCall_1_0()); 
             }
@@ -17428,16 +17428,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TIME__Group_1__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6054:1: rule__TIME__Group_1__1 : rule__TIME__Group_1__1__Impl ;
+    // InternalConfig.g:6053:1: rule__TIME__Group_1__1 : rule__TIME__Group_1__1__Impl ;
     public final void rule__TIME__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6058:1: ( rule__TIME__Group_1__1__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6059:2: rule__TIME__Group_1__1__Impl
+            // InternalConfig.g:6057:1: ( rule__TIME__Group_1__1__Impl )
+            // InternalConfig.g:6058:2: rule__TIME__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__TIME__Group_1__1__Impl_in_rule__TIME__Group_1__112163);
+            pushFollow(FOLLOW_2);
             rule__TIME__Group_1__1__Impl();
 
             state._fsp--;
@@ -17461,22 +17461,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TIME__Group_1__1__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6065:1: rule__TIME__Group_1__1__Impl : ( 'ms' ) ;
+    // InternalConfig.g:6064:1: rule__TIME__Group_1__1__Impl : ( 'ms' ) ;
     public final void rule__TIME__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6069:1: ( ( 'ms' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6070:1: ( 'ms' )
+            // InternalConfig.g:6068:1: ( ( 'ms' ) )
+            // InternalConfig.g:6069:1: ( 'ms' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6070:1: ( 'ms' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6071:1: 'ms'
+            // InternalConfig.g:6069:1: ( 'ms' )
+            // InternalConfig.g:6070:1: 'ms'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTIMEAccess().getMsKeyword_1_1()); 
             }
-            match(input,56,FOLLOW_56_in_rule__TIME__Group_1__1__Impl12191); if (state.failed) return ;
+            match(input,56,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getTIMEAccess().getMsKeyword_1_1()); 
             }
@@ -17502,21 +17502,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TIME__Group_2__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6088:1: rule__TIME__Group_2__0 : rule__TIME__Group_2__0__Impl rule__TIME__Group_2__1 ;
+    // InternalConfig.g:6087:1: rule__TIME__Group_2__0 : rule__TIME__Group_2__0__Impl rule__TIME__Group_2__1 ;
     public final void rule__TIME__Group_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6092:1: ( rule__TIME__Group_2__0__Impl rule__TIME__Group_2__1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6093:2: rule__TIME__Group_2__0__Impl rule__TIME__Group_2__1
+            // InternalConfig.g:6091:1: ( rule__TIME__Group_2__0__Impl rule__TIME__Group_2__1 )
+            // InternalConfig.g:6092:2: rule__TIME__Group_2__0__Impl rule__TIME__Group_2__1
             {
-            pushFollow(FOLLOW_rule__TIME__Group_2__0__Impl_in_rule__TIME__Group_2__012226);
+            pushFollow(FOLLOW_44);
             rule__TIME__Group_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__TIME__Group_2__1_in_rule__TIME__Group_2__012229);
+            pushFollow(FOLLOW_2);
             rule__TIME__Group_2__1();
 
             state._fsp--;
@@ -17540,22 +17540,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TIME__Group_2__0__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6100:1: rule__TIME__Group_2__0__Impl : ( RULE_INT ) ;
+    // InternalConfig.g:6099:1: rule__TIME__Group_2__0__Impl : ( RULE_INT ) ;
     public final void rule__TIME__Group_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6104:1: ( ( RULE_INT ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6105:1: ( RULE_INT )
+            // InternalConfig.g:6103:1: ( ( RULE_INT ) )
+            // InternalConfig.g:6104:1: ( RULE_INT )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6105:1: ( RULE_INT )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6106:1: RULE_INT
+            // InternalConfig.g:6104:1: ( RULE_INT )
+            // InternalConfig.g:6105:1: RULE_INT
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTIMEAccess().getINTTerminalRuleCall_2_0()); 
             }
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__TIME__Group_2__0__Impl12256); if (state.failed) return ;
+            match(input,RULE_INT,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getTIMEAccess().getINTTerminalRuleCall_2_0()); 
             }
@@ -17581,16 +17581,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TIME__Group_2__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6117:1: rule__TIME__Group_2__1 : rule__TIME__Group_2__1__Impl ;
+    // InternalConfig.g:6116:1: rule__TIME__Group_2__1 : rule__TIME__Group_2__1__Impl ;
     public final void rule__TIME__Group_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6121:1: ( rule__TIME__Group_2__1__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6122:2: rule__TIME__Group_2__1__Impl
+            // InternalConfig.g:6120:1: ( rule__TIME__Group_2__1__Impl )
+            // InternalConfig.g:6121:2: rule__TIME__Group_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__TIME__Group_2__1__Impl_in_rule__TIME__Group_2__112285);
+            pushFollow(FOLLOW_2);
             rule__TIME__Group_2__1__Impl();
 
             state._fsp--;
@@ -17614,22 +17614,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TIME__Group_2__1__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6128:1: rule__TIME__Group_2__1__Impl : ( 'us' ) ;
+    // InternalConfig.g:6127:1: rule__TIME__Group_2__1__Impl : ( 'us' ) ;
     public final void rule__TIME__Group_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6132:1: ( ( 'us' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6133:1: ( 'us' )
+            // InternalConfig.g:6131:1: ( ( 'us' ) )
+            // InternalConfig.g:6132:1: ( 'us' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6133:1: ( 'us' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6134:1: 'us'
+            // InternalConfig.g:6132:1: ( 'us' )
+            // InternalConfig.g:6133:1: 'us'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTIMEAccess().getUsKeyword_2_1()); 
             }
-            match(input,57,FOLLOW_57_in_rule__TIME__Group_2__1__Impl12313); if (state.failed) return ;
+            match(input,57,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getTIMEAccess().getUsKeyword_2_1()); 
             }
@@ -17655,21 +17655,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TIME__Group_3__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6151:1: rule__TIME__Group_3__0 : rule__TIME__Group_3__0__Impl rule__TIME__Group_3__1 ;
+    // InternalConfig.g:6150:1: rule__TIME__Group_3__0 : rule__TIME__Group_3__0__Impl rule__TIME__Group_3__1 ;
     public final void rule__TIME__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6155:1: ( rule__TIME__Group_3__0__Impl rule__TIME__Group_3__1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6156:2: rule__TIME__Group_3__0__Impl rule__TIME__Group_3__1
+            // InternalConfig.g:6154:1: ( rule__TIME__Group_3__0__Impl rule__TIME__Group_3__1 )
+            // InternalConfig.g:6155:2: rule__TIME__Group_3__0__Impl rule__TIME__Group_3__1
             {
-            pushFollow(FOLLOW_rule__TIME__Group_3__0__Impl_in_rule__TIME__Group_3__012348);
+            pushFollow(FOLLOW_45);
             rule__TIME__Group_3__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__TIME__Group_3__1_in_rule__TIME__Group_3__012351);
+            pushFollow(FOLLOW_2);
             rule__TIME__Group_3__1();
 
             state._fsp--;
@@ -17693,22 +17693,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TIME__Group_3__0__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6163:1: rule__TIME__Group_3__0__Impl : ( RULE_INT ) ;
+    // InternalConfig.g:6162:1: rule__TIME__Group_3__0__Impl : ( RULE_INT ) ;
     public final void rule__TIME__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6167:1: ( ( RULE_INT ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6168:1: ( RULE_INT )
+            // InternalConfig.g:6166:1: ( ( RULE_INT ) )
+            // InternalConfig.g:6167:1: ( RULE_INT )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6168:1: ( RULE_INT )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6169:1: RULE_INT
+            // InternalConfig.g:6167:1: ( RULE_INT )
+            // InternalConfig.g:6168:1: RULE_INT
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTIMEAccess().getINTTerminalRuleCall_3_0()); 
             }
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__TIME__Group_3__0__Impl12378); if (state.failed) return ;
+            match(input,RULE_INT,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getTIMEAccess().getINTTerminalRuleCall_3_0()); 
             }
@@ -17734,16 +17734,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TIME__Group_3__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6180:1: rule__TIME__Group_3__1 : rule__TIME__Group_3__1__Impl ;
+    // InternalConfig.g:6179:1: rule__TIME__Group_3__1 : rule__TIME__Group_3__1__Impl ;
     public final void rule__TIME__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6184:1: ( rule__TIME__Group_3__1__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6185:2: rule__TIME__Group_3__1__Impl
+            // InternalConfig.g:6183:1: ( rule__TIME__Group_3__1__Impl )
+            // InternalConfig.g:6184:2: rule__TIME__Group_3__1__Impl
             {
-            pushFollow(FOLLOW_rule__TIME__Group_3__1__Impl_in_rule__TIME__Group_3__112407);
+            pushFollow(FOLLOW_2);
             rule__TIME__Group_3__1__Impl();
 
             state._fsp--;
@@ -17767,22 +17767,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TIME__Group_3__1__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6191:1: rule__TIME__Group_3__1__Impl : ( 'ns' ) ;
+    // InternalConfig.g:6190:1: rule__TIME__Group_3__1__Impl : ( 'ns' ) ;
     public final void rule__TIME__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6195:1: ( ( 'ns' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6196:1: ( 'ns' )
+            // InternalConfig.g:6194:1: ( ( 'ns' ) )
+            // InternalConfig.g:6195:1: ( 'ns' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6196:1: ( 'ns' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6197:1: 'ns'
+            // InternalConfig.g:6195:1: ( 'ns' )
+            // InternalConfig.g:6196:1: 'ns'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTIMEAccess().getNsKeyword_3_1()); 
             }
-            match(input,58,FOLLOW_58_in_rule__TIME__Group_3__1__Impl12435); if (state.failed) return ;
+            match(input,58,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getTIMEAccess().getNsKeyword_3_1()); 
             }
@@ -17808,21 +17808,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__BooleanLiteral__Group__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6216:1: rule__BooleanLiteral__Group__0 : rule__BooleanLiteral__Group__0__Impl rule__BooleanLiteral__Group__1 ;
+    // InternalConfig.g:6215:1: rule__BooleanLiteral__Group__0 : rule__BooleanLiteral__Group__0__Impl rule__BooleanLiteral__Group__1 ;
     public final void rule__BooleanLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6220:1: ( rule__BooleanLiteral__Group__0__Impl rule__BooleanLiteral__Group__1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6221:2: rule__BooleanLiteral__Group__0__Impl rule__BooleanLiteral__Group__1
+            // InternalConfig.g:6219:1: ( rule__BooleanLiteral__Group__0__Impl rule__BooleanLiteral__Group__1 )
+            // InternalConfig.g:6220:2: rule__BooleanLiteral__Group__0__Impl rule__BooleanLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__BooleanLiteral__Group__0__Impl_in_rule__BooleanLiteral__Group__012472);
+            pushFollow(FOLLOW_46);
             rule__BooleanLiteral__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__BooleanLiteral__Group__1_in_rule__BooleanLiteral__Group__012475);
+            pushFollow(FOLLOW_2);
             rule__BooleanLiteral__Group__1();
 
             state._fsp--;
@@ -17846,23 +17846,23 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__BooleanLiteral__Group__0__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6228:1: rule__BooleanLiteral__Group__0__Impl : ( () ) ;
+    // InternalConfig.g:6227:1: rule__BooleanLiteral__Group__0__Impl : ( () ) ;
     public final void rule__BooleanLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6232:1: ( ( () ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6233:1: ( () )
+            // InternalConfig.g:6231:1: ( ( () ) )
+            // InternalConfig.g:6232:1: ( () )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6233:1: ( () )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6234:1: ()
+            // InternalConfig.g:6232:1: ( () )
+            // InternalConfig.g:6233:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getBooleanLiteralAccess().getBooleanLiteralAction_0()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6235:1: ()
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6237:1: 
+            // InternalConfig.g:6234:1: ()
+            // InternalConfig.g:6236:1: 
             {
             }
 
@@ -17887,16 +17887,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__BooleanLiteral__Group__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6247:1: rule__BooleanLiteral__Group__1 : rule__BooleanLiteral__Group__1__Impl ;
+    // InternalConfig.g:6246:1: rule__BooleanLiteral__Group__1 : rule__BooleanLiteral__Group__1__Impl ;
     public final void rule__BooleanLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6251:1: ( rule__BooleanLiteral__Group__1__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6252:2: rule__BooleanLiteral__Group__1__Impl
+            // InternalConfig.g:6250:1: ( rule__BooleanLiteral__Group__1__Impl )
+            // InternalConfig.g:6251:2: rule__BooleanLiteral__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__BooleanLiteral__Group__1__Impl_in_rule__BooleanLiteral__Group__112533);
+            pushFollow(FOLLOW_2);
             rule__BooleanLiteral__Group__1__Impl();
 
             state._fsp--;
@@ -17920,25 +17920,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__BooleanLiteral__Group__1__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6258:1: rule__BooleanLiteral__Group__1__Impl : ( ( rule__BooleanLiteral__Alternatives_1 ) ) ;
+    // InternalConfig.g:6257:1: rule__BooleanLiteral__Group__1__Impl : ( ( rule__BooleanLiteral__Alternatives_1 ) ) ;
     public final void rule__BooleanLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6262:1: ( ( ( rule__BooleanLiteral__Alternatives_1 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6263:1: ( ( rule__BooleanLiteral__Alternatives_1 ) )
+            // InternalConfig.g:6261:1: ( ( ( rule__BooleanLiteral__Alternatives_1 ) ) )
+            // InternalConfig.g:6262:1: ( ( rule__BooleanLiteral__Alternatives_1 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6263:1: ( ( rule__BooleanLiteral__Alternatives_1 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6264:1: ( rule__BooleanLiteral__Alternatives_1 )
+            // InternalConfig.g:6262:1: ( ( rule__BooleanLiteral__Alternatives_1 ) )
+            // InternalConfig.g:6263:1: ( rule__BooleanLiteral__Alternatives_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getBooleanLiteralAccess().getAlternatives_1()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6265:1: ( rule__BooleanLiteral__Alternatives_1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6265:2: rule__BooleanLiteral__Alternatives_1
+            // InternalConfig.g:6264:1: ( rule__BooleanLiteral__Alternatives_1 )
+            // InternalConfig.g:6264:2: rule__BooleanLiteral__Alternatives_1
             {
-            pushFollow(FOLLOW_rule__BooleanLiteral__Alternatives_1_in_rule__BooleanLiteral__Group__1__Impl12560);
+            pushFollow(FOLLOW_2);
             rule__BooleanLiteral__Alternatives_1();
 
             state._fsp--;
@@ -17971,21 +17971,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RealLiteral__Group__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6279:1: rule__RealLiteral__Group__0 : rule__RealLiteral__Group__0__Impl rule__RealLiteral__Group__1 ;
+    // InternalConfig.g:6278:1: rule__RealLiteral__Group__0 : rule__RealLiteral__Group__0__Impl rule__RealLiteral__Group__1 ;
     public final void rule__RealLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6283:1: ( rule__RealLiteral__Group__0__Impl rule__RealLiteral__Group__1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6284:2: rule__RealLiteral__Group__0__Impl rule__RealLiteral__Group__1
+            // InternalConfig.g:6282:1: ( rule__RealLiteral__Group__0__Impl rule__RealLiteral__Group__1 )
+            // InternalConfig.g:6283:2: rule__RealLiteral__Group__0__Impl rule__RealLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__RealLiteral__Group__0__Impl_in_rule__RealLiteral__Group__012594);
+            pushFollow(FOLLOW_24);
             rule__RealLiteral__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__RealLiteral__Group__1_in_rule__RealLiteral__Group__012597);
+            pushFollow(FOLLOW_2);
             rule__RealLiteral__Group__1();
 
             state._fsp--;
@@ -18009,23 +18009,23 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RealLiteral__Group__0__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6291:1: rule__RealLiteral__Group__0__Impl : ( () ) ;
+    // InternalConfig.g:6290:1: rule__RealLiteral__Group__0__Impl : ( () ) ;
     public final void rule__RealLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6295:1: ( ( () ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6296:1: ( () )
+            // InternalConfig.g:6294:1: ( ( () ) )
+            // InternalConfig.g:6295:1: ( () )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6296:1: ( () )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6297:1: ()
+            // InternalConfig.g:6295:1: ( () )
+            // InternalConfig.g:6296:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRealLiteralAccess().getRealLiteralAction_0()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6298:1: ()
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6300:1: 
+            // InternalConfig.g:6297:1: ()
+            // InternalConfig.g:6299:1: 
             {
             }
 
@@ -18050,16 +18050,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RealLiteral__Group__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6310:1: rule__RealLiteral__Group__1 : rule__RealLiteral__Group__1__Impl ;
+    // InternalConfig.g:6309:1: rule__RealLiteral__Group__1 : rule__RealLiteral__Group__1__Impl ;
     public final void rule__RealLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6314:1: ( rule__RealLiteral__Group__1__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6315:2: rule__RealLiteral__Group__1__Impl
+            // InternalConfig.g:6313:1: ( rule__RealLiteral__Group__1__Impl )
+            // InternalConfig.g:6314:2: rule__RealLiteral__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__RealLiteral__Group__1__Impl_in_rule__RealLiteral__Group__112655);
+            pushFollow(FOLLOW_2);
             rule__RealLiteral__Group__1__Impl();
 
             state._fsp--;
@@ -18083,25 +18083,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RealLiteral__Group__1__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6321:1: rule__RealLiteral__Group__1__Impl : ( ( rule__RealLiteral__ValueAssignment_1 ) ) ;
+    // InternalConfig.g:6320:1: rule__RealLiteral__Group__1__Impl : ( ( rule__RealLiteral__ValueAssignment_1 ) ) ;
     public final void rule__RealLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6325:1: ( ( ( rule__RealLiteral__ValueAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6326:1: ( ( rule__RealLiteral__ValueAssignment_1 ) )
+            // InternalConfig.g:6324:1: ( ( ( rule__RealLiteral__ValueAssignment_1 ) ) )
+            // InternalConfig.g:6325:1: ( ( rule__RealLiteral__ValueAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6326:1: ( ( rule__RealLiteral__ValueAssignment_1 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6327:1: ( rule__RealLiteral__ValueAssignment_1 )
+            // InternalConfig.g:6325:1: ( ( rule__RealLiteral__ValueAssignment_1 ) )
+            // InternalConfig.g:6326:1: ( rule__RealLiteral__ValueAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRealLiteralAccess().getValueAssignment_1()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6328:1: ( rule__RealLiteral__ValueAssignment_1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6328:2: rule__RealLiteral__ValueAssignment_1
+            // InternalConfig.g:6327:1: ( rule__RealLiteral__ValueAssignment_1 )
+            // InternalConfig.g:6327:2: rule__RealLiteral__ValueAssignment_1
             {
-            pushFollow(FOLLOW_rule__RealLiteral__ValueAssignment_1_in_rule__RealLiteral__Group__1__Impl12682);
+            pushFollow(FOLLOW_2);
             rule__RealLiteral__ValueAssignment_1();
 
             state._fsp--;
@@ -18134,21 +18134,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__IntLiteral__Group__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6342:1: rule__IntLiteral__Group__0 : rule__IntLiteral__Group__0__Impl rule__IntLiteral__Group__1 ;
+    // InternalConfig.g:6341:1: rule__IntLiteral__Group__0 : rule__IntLiteral__Group__0__Impl rule__IntLiteral__Group__1 ;
     public final void rule__IntLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6346:1: ( rule__IntLiteral__Group__0__Impl rule__IntLiteral__Group__1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6347:2: rule__IntLiteral__Group__0__Impl rule__IntLiteral__Group__1
+            // InternalConfig.g:6345:1: ( rule__IntLiteral__Group__0__Impl rule__IntLiteral__Group__1 )
+            // InternalConfig.g:6346:2: rule__IntLiteral__Group__0__Impl rule__IntLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__IntLiteral__Group__0__Impl_in_rule__IntLiteral__Group__012716);
+            pushFollow(FOLLOW_24);
             rule__IntLiteral__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__IntLiteral__Group__1_in_rule__IntLiteral__Group__012719);
+            pushFollow(FOLLOW_2);
             rule__IntLiteral__Group__1();
 
             state._fsp--;
@@ -18172,23 +18172,23 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__IntLiteral__Group__0__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6354:1: rule__IntLiteral__Group__0__Impl : ( () ) ;
+    // InternalConfig.g:6353:1: rule__IntLiteral__Group__0__Impl : ( () ) ;
     public final void rule__IntLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6358:1: ( ( () ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6359:1: ( () )
+            // InternalConfig.g:6357:1: ( ( () ) )
+            // InternalConfig.g:6358:1: ( () )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6359:1: ( () )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6360:1: ()
+            // InternalConfig.g:6358:1: ( () )
+            // InternalConfig.g:6359:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIntLiteralAccess().getIntLiteralAction_0()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6361:1: ()
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6363:1: 
+            // InternalConfig.g:6360:1: ()
+            // InternalConfig.g:6362:1: 
             {
             }
 
@@ -18213,16 +18213,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__IntLiteral__Group__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6373:1: rule__IntLiteral__Group__1 : rule__IntLiteral__Group__1__Impl ;
+    // InternalConfig.g:6372:1: rule__IntLiteral__Group__1 : rule__IntLiteral__Group__1__Impl ;
     public final void rule__IntLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6377:1: ( rule__IntLiteral__Group__1__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6378:2: rule__IntLiteral__Group__1__Impl
+            // InternalConfig.g:6376:1: ( rule__IntLiteral__Group__1__Impl )
+            // InternalConfig.g:6377:2: rule__IntLiteral__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__IntLiteral__Group__1__Impl_in_rule__IntLiteral__Group__112777);
+            pushFollow(FOLLOW_2);
             rule__IntLiteral__Group__1__Impl();
 
             state._fsp--;
@@ -18246,25 +18246,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__IntLiteral__Group__1__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6384:1: rule__IntLiteral__Group__1__Impl : ( ( rule__IntLiteral__ValueAssignment_1 ) ) ;
+    // InternalConfig.g:6383:1: rule__IntLiteral__Group__1__Impl : ( ( rule__IntLiteral__ValueAssignment_1 ) ) ;
     public final void rule__IntLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6388:1: ( ( ( rule__IntLiteral__ValueAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6389:1: ( ( rule__IntLiteral__ValueAssignment_1 ) )
+            // InternalConfig.g:6387:1: ( ( ( rule__IntLiteral__ValueAssignment_1 ) ) )
+            // InternalConfig.g:6388:1: ( ( rule__IntLiteral__ValueAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6389:1: ( ( rule__IntLiteral__ValueAssignment_1 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6390:1: ( rule__IntLiteral__ValueAssignment_1 )
+            // InternalConfig.g:6388:1: ( ( rule__IntLiteral__ValueAssignment_1 ) )
+            // InternalConfig.g:6389:1: ( rule__IntLiteral__ValueAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIntLiteralAccess().getValueAssignment_1()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6391:1: ( rule__IntLiteral__ValueAssignment_1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6391:2: rule__IntLiteral__ValueAssignment_1
+            // InternalConfig.g:6390:1: ( rule__IntLiteral__ValueAssignment_1 )
+            // InternalConfig.g:6390:2: rule__IntLiteral__ValueAssignment_1
             {
-            pushFollow(FOLLOW_rule__IntLiteral__ValueAssignment_1_in_rule__IntLiteral__Group__1__Impl12804);
+            pushFollow(FOLLOW_2);
             rule__IntLiteral__ValueAssignment_1();
 
             state._fsp--;
@@ -18297,21 +18297,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StringLiteral__Group__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6405:1: rule__StringLiteral__Group__0 : rule__StringLiteral__Group__0__Impl rule__StringLiteral__Group__1 ;
+    // InternalConfig.g:6404:1: rule__StringLiteral__Group__0 : rule__StringLiteral__Group__0__Impl rule__StringLiteral__Group__1 ;
     public final void rule__StringLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6409:1: ( rule__StringLiteral__Group__0__Impl rule__StringLiteral__Group__1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6410:2: rule__StringLiteral__Group__0__Impl rule__StringLiteral__Group__1
+            // InternalConfig.g:6408:1: ( rule__StringLiteral__Group__0__Impl rule__StringLiteral__Group__1 )
+            // InternalConfig.g:6409:2: rule__StringLiteral__Group__0__Impl rule__StringLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__StringLiteral__Group__0__Impl_in_rule__StringLiteral__Group__012838);
+            pushFollow(FOLLOW_32);
             rule__StringLiteral__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__StringLiteral__Group__1_in_rule__StringLiteral__Group__012841);
+            pushFollow(FOLLOW_2);
             rule__StringLiteral__Group__1();
 
             state._fsp--;
@@ -18335,23 +18335,23 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StringLiteral__Group__0__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6417:1: rule__StringLiteral__Group__0__Impl : ( () ) ;
+    // InternalConfig.g:6416:1: rule__StringLiteral__Group__0__Impl : ( () ) ;
     public final void rule__StringLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6421:1: ( ( () ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6422:1: ( () )
+            // InternalConfig.g:6420:1: ( ( () ) )
+            // InternalConfig.g:6421:1: ( () )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6422:1: ( () )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6423:1: ()
+            // InternalConfig.g:6421:1: ( () )
+            // InternalConfig.g:6422:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getStringLiteralAccess().getStringLiteralAction_0()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6424:1: ()
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6426:1: 
+            // InternalConfig.g:6423:1: ()
+            // InternalConfig.g:6425:1: 
             {
             }
 
@@ -18376,16 +18376,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StringLiteral__Group__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6436:1: rule__StringLiteral__Group__1 : rule__StringLiteral__Group__1__Impl ;
+    // InternalConfig.g:6435:1: rule__StringLiteral__Group__1 : rule__StringLiteral__Group__1__Impl ;
     public final void rule__StringLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6440:1: ( rule__StringLiteral__Group__1__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6441:2: rule__StringLiteral__Group__1__Impl
+            // InternalConfig.g:6439:1: ( rule__StringLiteral__Group__1__Impl )
+            // InternalConfig.g:6440:2: rule__StringLiteral__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__StringLiteral__Group__1__Impl_in_rule__StringLiteral__Group__112899);
+            pushFollow(FOLLOW_2);
             rule__StringLiteral__Group__1__Impl();
 
             state._fsp--;
@@ -18409,25 +18409,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StringLiteral__Group__1__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6447:1: rule__StringLiteral__Group__1__Impl : ( ( rule__StringLiteral__ValueAssignment_1 ) ) ;
+    // InternalConfig.g:6446:1: rule__StringLiteral__Group__1__Impl : ( ( rule__StringLiteral__ValueAssignment_1 ) ) ;
     public final void rule__StringLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6451:1: ( ( ( rule__StringLiteral__ValueAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6452:1: ( ( rule__StringLiteral__ValueAssignment_1 ) )
+            // InternalConfig.g:6450:1: ( ( ( rule__StringLiteral__ValueAssignment_1 ) ) )
+            // InternalConfig.g:6451:1: ( ( rule__StringLiteral__ValueAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6452:1: ( ( rule__StringLiteral__ValueAssignment_1 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6453:1: ( rule__StringLiteral__ValueAssignment_1 )
+            // InternalConfig.g:6451:1: ( ( rule__StringLiteral__ValueAssignment_1 ) )
+            // InternalConfig.g:6452:1: ( rule__StringLiteral__ValueAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getStringLiteralAccess().getValueAssignment_1()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6454:1: ( rule__StringLiteral__ValueAssignment_1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6454:2: rule__StringLiteral__ValueAssignment_1
+            // InternalConfig.g:6453:1: ( rule__StringLiteral__ValueAssignment_1 )
+            // InternalConfig.g:6453:2: rule__StringLiteral__ValueAssignment_1
             {
-            pushFollow(FOLLOW_rule__StringLiteral__ValueAssignment_1_in_rule__StringLiteral__Group__1__Impl12926);
+            pushFollow(FOLLOW_2);
             rule__StringLiteral__ValueAssignment_1();
 
             state._fsp--;
@@ -18460,21 +18460,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Integer__Group_0__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6468:1: rule__Integer__Group_0__0 : rule__Integer__Group_0__0__Impl rule__Integer__Group_0__1 ;
+    // InternalConfig.g:6467:1: rule__Integer__Group_0__0 : rule__Integer__Group_0__0__Impl rule__Integer__Group_0__1 ;
     public final void rule__Integer__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6472:1: ( rule__Integer__Group_0__0__Impl rule__Integer__Group_0__1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6473:2: rule__Integer__Group_0__0__Impl rule__Integer__Group_0__1
+            // InternalConfig.g:6471:1: ( rule__Integer__Group_0__0__Impl rule__Integer__Group_0__1 )
+            // InternalConfig.g:6472:2: rule__Integer__Group_0__0__Impl rule__Integer__Group_0__1
             {
-            pushFollow(FOLLOW_rule__Integer__Group_0__0__Impl_in_rule__Integer__Group_0__012960);
+            pushFollow(FOLLOW_47);
             rule__Integer__Group_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Integer__Group_0__1_in_rule__Integer__Group_0__012963);
+            pushFollow(FOLLOW_2);
             rule__Integer__Group_0__1();
 
             state._fsp--;
@@ -18498,22 +18498,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Integer__Group_0__0__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6480:1: rule__Integer__Group_0__0__Impl : ( ( rule__Integer__Alternatives_0_0 )? ) ;
+    // InternalConfig.g:6479:1: rule__Integer__Group_0__0__Impl : ( ( rule__Integer__Alternatives_0_0 )? ) ;
     public final void rule__Integer__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6484:1: ( ( ( rule__Integer__Alternatives_0_0 )? ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6485:1: ( ( rule__Integer__Alternatives_0_0 )? )
+            // InternalConfig.g:6483:1: ( ( ( rule__Integer__Alternatives_0_0 )? ) )
+            // InternalConfig.g:6484:1: ( ( rule__Integer__Alternatives_0_0 )? )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6485:1: ( ( rule__Integer__Alternatives_0_0 )? )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6486:1: ( rule__Integer__Alternatives_0_0 )?
+            // InternalConfig.g:6484:1: ( ( rule__Integer__Alternatives_0_0 )? )
+            // InternalConfig.g:6485:1: ( rule__Integer__Alternatives_0_0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIntegerAccess().getAlternatives_0_0()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6487:1: ( rule__Integer__Alternatives_0_0 )?
+            // InternalConfig.g:6486:1: ( rule__Integer__Alternatives_0_0 )?
             int alt42=2;
             int LA42_0 = input.LA(1);
 
@@ -18522,9 +18522,9 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             }
             switch (alt42) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6487:2: rule__Integer__Alternatives_0_0
+                    // InternalConfig.g:6486:2: rule__Integer__Alternatives_0_0
                     {
-                    pushFollow(FOLLOW_rule__Integer__Alternatives_0_0_in_rule__Integer__Group_0__0__Impl12990);
+                    pushFollow(FOLLOW_2);
                     rule__Integer__Alternatives_0_0();
 
                     state._fsp--;
@@ -18560,16 +18560,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Integer__Group_0__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6497:1: rule__Integer__Group_0__1 : rule__Integer__Group_0__1__Impl ;
+    // InternalConfig.g:6496:1: rule__Integer__Group_0__1 : rule__Integer__Group_0__1__Impl ;
     public final void rule__Integer__Group_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6501:1: ( rule__Integer__Group_0__1__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6502:2: rule__Integer__Group_0__1__Impl
+            // InternalConfig.g:6500:1: ( rule__Integer__Group_0__1__Impl )
+            // InternalConfig.g:6501:2: rule__Integer__Group_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__Integer__Group_0__1__Impl_in_rule__Integer__Group_0__113021);
+            pushFollow(FOLLOW_2);
             rule__Integer__Group_0__1__Impl();
 
             state._fsp--;
@@ -18593,22 +18593,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Integer__Group_0__1__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6508:1: rule__Integer__Group_0__1__Impl : ( RULE_INT ) ;
+    // InternalConfig.g:6507:1: rule__Integer__Group_0__1__Impl : ( RULE_INT ) ;
     public final void rule__Integer__Group_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6512:1: ( ( RULE_INT ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6513:1: ( RULE_INT )
+            // InternalConfig.g:6511:1: ( ( RULE_INT ) )
+            // InternalConfig.g:6512:1: ( RULE_INT )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6513:1: ( RULE_INT )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6514:1: RULE_INT
+            // InternalConfig.g:6512:1: ( RULE_INT )
+            // InternalConfig.g:6513:1: RULE_INT
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIntegerAccess().getINTTerminalRuleCall_0_1()); 
             }
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__Integer__Group_0__1__Impl13048); if (state.failed) return ;
+            match(input,RULE_INT,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getIntegerAccess().getINTTerminalRuleCall_0_1()); 
             }
@@ -18634,21 +18634,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Decimal__Group__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6529:1: rule__Decimal__Group__0 : rule__Decimal__Group__0__Impl rule__Decimal__Group__1 ;
+    // InternalConfig.g:6528:1: rule__Decimal__Group__0 : rule__Decimal__Group__0__Impl rule__Decimal__Group__1 ;
     public final void rule__Decimal__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6533:1: ( rule__Decimal__Group__0__Impl rule__Decimal__Group__1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6534:2: rule__Decimal__Group__0__Impl rule__Decimal__Group__1
+            // InternalConfig.g:6532:1: ( rule__Decimal__Group__0__Impl rule__Decimal__Group__1 )
+            // InternalConfig.g:6533:2: rule__Decimal__Group__0__Impl rule__Decimal__Group__1
             {
-            pushFollow(FOLLOW_rule__Decimal__Group__0__Impl_in_rule__Decimal__Group__013081);
+            pushFollow(FOLLOW_47);
             rule__Decimal__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Decimal__Group__1_in_rule__Decimal__Group__013084);
+            pushFollow(FOLLOW_2);
             rule__Decimal__Group__1();
 
             state._fsp--;
@@ -18672,22 +18672,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Decimal__Group__0__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6541:1: rule__Decimal__Group__0__Impl : ( ( rule__Decimal__Alternatives_0 )? ) ;
+    // InternalConfig.g:6540:1: rule__Decimal__Group__0__Impl : ( ( rule__Decimal__Alternatives_0 )? ) ;
     public final void rule__Decimal__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6545:1: ( ( ( rule__Decimal__Alternatives_0 )? ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6546:1: ( ( rule__Decimal__Alternatives_0 )? )
+            // InternalConfig.g:6544:1: ( ( ( rule__Decimal__Alternatives_0 )? ) )
+            // InternalConfig.g:6545:1: ( ( rule__Decimal__Alternatives_0 )? )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6546:1: ( ( rule__Decimal__Alternatives_0 )? )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6547:1: ( rule__Decimal__Alternatives_0 )?
+            // InternalConfig.g:6545:1: ( ( rule__Decimal__Alternatives_0 )? )
+            // InternalConfig.g:6546:1: ( rule__Decimal__Alternatives_0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDecimalAccess().getAlternatives_0()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6548:1: ( rule__Decimal__Alternatives_0 )?
+            // InternalConfig.g:6547:1: ( rule__Decimal__Alternatives_0 )?
             int alt43=2;
             int LA43_0 = input.LA(1);
 
@@ -18696,9 +18696,9 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             }
             switch (alt43) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6548:2: rule__Decimal__Alternatives_0
+                    // InternalConfig.g:6547:2: rule__Decimal__Alternatives_0
                     {
-                    pushFollow(FOLLOW_rule__Decimal__Alternatives_0_in_rule__Decimal__Group__0__Impl13111);
+                    pushFollow(FOLLOW_2);
                     rule__Decimal__Alternatives_0();
 
                     state._fsp--;
@@ -18734,21 +18734,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Decimal__Group__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6558:1: rule__Decimal__Group__1 : rule__Decimal__Group__1__Impl rule__Decimal__Group__2 ;
+    // InternalConfig.g:6557:1: rule__Decimal__Group__1 : rule__Decimal__Group__1__Impl rule__Decimal__Group__2 ;
     public final void rule__Decimal__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6562:1: ( rule__Decimal__Group__1__Impl rule__Decimal__Group__2 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6563:2: rule__Decimal__Group__1__Impl rule__Decimal__Group__2
+            // InternalConfig.g:6561:1: ( rule__Decimal__Group__1__Impl rule__Decimal__Group__2 )
+            // InternalConfig.g:6562:2: rule__Decimal__Group__1__Impl rule__Decimal__Group__2
             {
-            pushFollow(FOLLOW_rule__Decimal__Group__1__Impl_in_rule__Decimal__Group__113142);
+            pushFollow(FOLLOW_29);
             rule__Decimal__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Decimal__Group__2_in_rule__Decimal__Group__113145);
+            pushFollow(FOLLOW_2);
             rule__Decimal__Group__2();
 
             state._fsp--;
@@ -18772,22 +18772,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Decimal__Group__1__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6570:1: rule__Decimal__Group__1__Impl : ( RULE_INT ) ;
+    // InternalConfig.g:6569:1: rule__Decimal__Group__1__Impl : ( RULE_INT ) ;
     public final void rule__Decimal__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6574:1: ( ( RULE_INT ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6575:1: ( RULE_INT )
+            // InternalConfig.g:6573:1: ( ( RULE_INT ) )
+            // InternalConfig.g:6574:1: ( RULE_INT )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6575:1: ( RULE_INT )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6576:1: RULE_INT
+            // InternalConfig.g:6574:1: ( RULE_INT )
+            // InternalConfig.g:6575:1: RULE_INT
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDecimalAccess().getINTTerminalRuleCall_1()); 
             }
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__Decimal__Group__1__Impl13172); if (state.failed) return ;
+            match(input,RULE_INT,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getDecimalAccess().getINTTerminalRuleCall_1()); 
             }
@@ -18813,21 +18813,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Decimal__Group__2"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6587:1: rule__Decimal__Group__2 : rule__Decimal__Group__2__Impl rule__Decimal__Group__3 ;
+    // InternalConfig.g:6586:1: rule__Decimal__Group__2 : rule__Decimal__Group__2__Impl rule__Decimal__Group__3 ;
     public final void rule__Decimal__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6591:1: ( rule__Decimal__Group__2__Impl rule__Decimal__Group__3 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6592:2: rule__Decimal__Group__2__Impl rule__Decimal__Group__3
+            // InternalConfig.g:6590:1: ( rule__Decimal__Group__2__Impl rule__Decimal__Group__3 )
+            // InternalConfig.g:6591:2: rule__Decimal__Group__2__Impl rule__Decimal__Group__3
             {
-            pushFollow(FOLLOW_rule__Decimal__Group__2__Impl_in_rule__Decimal__Group__213201);
+            pushFollow(FOLLOW_14);
             rule__Decimal__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Decimal__Group__3_in_rule__Decimal__Group__213204);
+            pushFollow(FOLLOW_2);
             rule__Decimal__Group__3();
 
             state._fsp--;
@@ -18851,22 +18851,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Decimal__Group__2__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6599:1: rule__Decimal__Group__2__Impl : ( '.' ) ;
+    // InternalConfig.g:6598:1: rule__Decimal__Group__2__Impl : ( '.' ) ;
     public final void rule__Decimal__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6603:1: ( ( '.' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6604:1: ( '.' )
+            // InternalConfig.g:6602:1: ( ( '.' ) )
+            // InternalConfig.g:6603:1: ( '.' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6604:1: ( '.' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6605:1: '.'
+            // InternalConfig.g:6603:1: ( '.' )
+            // InternalConfig.g:6604:1: '.'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDecimalAccess().getFullStopKeyword_2()); 
             }
-            match(input,47,FOLLOW_47_in_rule__Decimal__Group__2__Impl13232); if (state.failed) return ;
+            match(input,47,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getDecimalAccess().getFullStopKeyword_2()); 
             }
@@ -18892,16 +18892,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Decimal__Group__3"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6618:1: rule__Decimal__Group__3 : rule__Decimal__Group__3__Impl ;
+    // InternalConfig.g:6617:1: rule__Decimal__Group__3 : rule__Decimal__Group__3__Impl ;
     public final void rule__Decimal__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6622:1: ( rule__Decimal__Group__3__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6623:2: rule__Decimal__Group__3__Impl
+            // InternalConfig.g:6621:1: ( rule__Decimal__Group__3__Impl )
+            // InternalConfig.g:6622:2: rule__Decimal__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__Decimal__Group__3__Impl_in_rule__Decimal__Group__313263);
+            pushFollow(FOLLOW_2);
             rule__Decimal__Group__3__Impl();
 
             state._fsp--;
@@ -18925,22 +18925,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Decimal__Group__3__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6629:1: rule__Decimal__Group__3__Impl : ( RULE_INT ) ;
+    // InternalConfig.g:6628:1: rule__Decimal__Group__3__Impl : ( RULE_INT ) ;
     public final void rule__Decimal__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6633:1: ( ( RULE_INT ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6634:1: ( RULE_INT )
+            // InternalConfig.g:6632:1: ( ( RULE_INT ) )
+            // InternalConfig.g:6633:1: ( RULE_INT )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6634:1: ( RULE_INT )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6635:1: RULE_INT
+            // InternalConfig.g:6633:1: ( RULE_INT )
+            // InternalConfig.g:6634:1: RULE_INT
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDecimalAccess().getINTTerminalRuleCall_3()); 
             }
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__Decimal__Group__3__Impl13290); if (state.failed) return ;
+            match(input,RULE_INT,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getDecimalAccess().getINTTerminalRuleCall_3()); 
             }
@@ -18966,21 +18966,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6654:1: rule__DecimalExp__Group__0 : rule__DecimalExp__Group__0__Impl rule__DecimalExp__Group__1 ;
+    // InternalConfig.g:6653:1: rule__DecimalExp__Group__0 : rule__DecimalExp__Group__0__Impl rule__DecimalExp__Group__1 ;
     public final void rule__DecimalExp__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6658:1: ( rule__DecimalExp__Group__0__Impl rule__DecimalExp__Group__1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6659:2: rule__DecimalExp__Group__0__Impl rule__DecimalExp__Group__1
+            // InternalConfig.g:6657:1: ( rule__DecimalExp__Group__0__Impl rule__DecimalExp__Group__1 )
+            // InternalConfig.g:6658:2: rule__DecimalExp__Group__0__Impl rule__DecimalExp__Group__1
             {
-            pushFollow(FOLLOW_rule__DecimalExp__Group__0__Impl_in_rule__DecimalExp__Group__013327);
+            pushFollow(FOLLOW_24);
             rule__DecimalExp__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__DecimalExp__Group__1_in_rule__DecimalExp__Group__013330);
+            pushFollow(FOLLOW_2);
             rule__DecimalExp__Group__1();
 
             state._fsp--;
@@ -19004,22 +19004,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__0__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6666:1: rule__DecimalExp__Group__0__Impl : ( ( rule__DecimalExp__Alternatives_0 )? ) ;
+    // InternalConfig.g:6665:1: rule__DecimalExp__Group__0__Impl : ( ( rule__DecimalExp__Alternatives_0 )? ) ;
     public final void rule__DecimalExp__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6670:1: ( ( ( rule__DecimalExp__Alternatives_0 )? ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6671:1: ( ( rule__DecimalExp__Alternatives_0 )? )
+            // InternalConfig.g:6669:1: ( ( ( rule__DecimalExp__Alternatives_0 )? ) )
+            // InternalConfig.g:6670:1: ( ( rule__DecimalExp__Alternatives_0 )? )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6671:1: ( ( rule__DecimalExp__Alternatives_0 )? )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6672:1: ( rule__DecimalExp__Alternatives_0 )?
+            // InternalConfig.g:6670:1: ( ( rule__DecimalExp__Alternatives_0 )? )
+            // InternalConfig.g:6671:1: ( rule__DecimalExp__Alternatives_0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDecimalExpAccess().getAlternatives_0()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6673:1: ( rule__DecimalExp__Alternatives_0 )?
+            // InternalConfig.g:6672:1: ( rule__DecimalExp__Alternatives_0 )?
             int alt44=2;
             int LA44_0 = input.LA(1);
 
@@ -19028,9 +19028,9 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             }
             switch (alt44) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6673:2: rule__DecimalExp__Alternatives_0
+                    // InternalConfig.g:6672:2: rule__DecimalExp__Alternatives_0
                     {
-                    pushFollow(FOLLOW_rule__DecimalExp__Alternatives_0_in_rule__DecimalExp__Group__0__Impl13357);
+                    pushFollow(FOLLOW_2);
                     rule__DecimalExp__Alternatives_0();
 
                     state._fsp--;
@@ -19066,21 +19066,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6683:1: rule__DecimalExp__Group__1 : rule__DecimalExp__Group__1__Impl rule__DecimalExp__Group__2 ;
+    // InternalConfig.g:6682:1: rule__DecimalExp__Group__1 : rule__DecimalExp__Group__1__Impl rule__DecimalExp__Group__2 ;
     public final void rule__DecimalExp__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6687:1: ( rule__DecimalExp__Group__1__Impl rule__DecimalExp__Group__2 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6688:2: rule__DecimalExp__Group__1__Impl rule__DecimalExp__Group__2
+            // InternalConfig.g:6686:1: ( rule__DecimalExp__Group__1__Impl rule__DecimalExp__Group__2 )
+            // InternalConfig.g:6687:2: rule__DecimalExp__Group__1__Impl rule__DecimalExp__Group__2
             {
-            pushFollow(FOLLOW_rule__DecimalExp__Group__1__Impl_in_rule__DecimalExp__Group__113388);
+            pushFollow(FOLLOW_29);
             rule__DecimalExp__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__DecimalExp__Group__2_in_rule__DecimalExp__Group__113391);
+            pushFollow(FOLLOW_2);
             rule__DecimalExp__Group__2();
 
             state._fsp--;
@@ -19104,22 +19104,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__1__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6695:1: rule__DecimalExp__Group__1__Impl : ( RULE_INT ) ;
+    // InternalConfig.g:6694:1: rule__DecimalExp__Group__1__Impl : ( RULE_INT ) ;
     public final void rule__DecimalExp__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6699:1: ( ( RULE_INT ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6700:1: ( RULE_INT )
+            // InternalConfig.g:6698:1: ( ( RULE_INT ) )
+            // InternalConfig.g:6699:1: ( RULE_INT )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6700:1: ( RULE_INT )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6701:1: RULE_INT
+            // InternalConfig.g:6699:1: ( RULE_INT )
+            // InternalConfig.g:6700:1: RULE_INT
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_1()); 
             }
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__DecimalExp__Group__1__Impl13418); if (state.failed) return ;
+            match(input,RULE_INT,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_1()); 
             }
@@ -19145,21 +19145,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__2"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6712:1: rule__DecimalExp__Group__2 : rule__DecimalExp__Group__2__Impl rule__DecimalExp__Group__3 ;
+    // InternalConfig.g:6711:1: rule__DecimalExp__Group__2 : rule__DecimalExp__Group__2__Impl rule__DecimalExp__Group__3 ;
     public final void rule__DecimalExp__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6716:1: ( rule__DecimalExp__Group__2__Impl rule__DecimalExp__Group__3 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6717:2: rule__DecimalExp__Group__2__Impl rule__DecimalExp__Group__3
+            // InternalConfig.g:6715:1: ( rule__DecimalExp__Group__2__Impl rule__DecimalExp__Group__3 )
+            // InternalConfig.g:6716:2: rule__DecimalExp__Group__2__Impl rule__DecimalExp__Group__3
             {
-            pushFollow(FOLLOW_rule__DecimalExp__Group__2__Impl_in_rule__DecimalExp__Group__213447);
+            pushFollow(FOLLOW_14);
             rule__DecimalExp__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__DecimalExp__Group__3_in_rule__DecimalExp__Group__213450);
+            pushFollow(FOLLOW_2);
             rule__DecimalExp__Group__3();
 
             state._fsp--;
@@ -19183,22 +19183,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__2__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6724:1: rule__DecimalExp__Group__2__Impl : ( '.' ) ;
+    // InternalConfig.g:6723:1: rule__DecimalExp__Group__2__Impl : ( '.' ) ;
     public final void rule__DecimalExp__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6728:1: ( ( '.' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6729:1: ( '.' )
+            // InternalConfig.g:6727:1: ( ( '.' ) )
+            // InternalConfig.g:6728:1: ( '.' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6729:1: ( '.' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6730:1: '.'
+            // InternalConfig.g:6728:1: ( '.' )
+            // InternalConfig.g:6729:1: '.'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDecimalExpAccess().getFullStopKeyword_2()); 
             }
-            match(input,47,FOLLOW_47_in_rule__DecimalExp__Group__2__Impl13478); if (state.failed) return ;
+            match(input,47,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getDecimalExpAccess().getFullStopKeyword_2()); 
             }
@@ -19224,21 +19224,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__3"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6743:1: rule__DecimalExp__Group__3 : rule__DecimalExp__Group__3__Impl rule__DecimalExp__Group__4 ;
+    // InternalConfig.g:6742:1: rule__DecimalExp__Group__3 : rule__DecimalExp__Group__3__Impl rule__DecimalExp__Group__4 ;
     public final void rule__DecimalExp__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6747:1: ( rule__DecimalExp__Group__3__Impl rule__DecimalExp__Group__4 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6748:2: rule__DecimalExp__Group__3__Impl rule__DecimalExp__Group__4
+            // InternalConfig.g:6746:1: ( rule__DecimalExp__Group__3__Impl rule__DecimalExp__Group__4 )
+            // InternalConfig.g:6747:2: rule__DecimalExp__Group__3__Impl rule__DecimalExp__Group__4
             {
-            pushFollow(FOLLOW_rule__DecimalExp__Group__3__Impl_in_rule__DecimalExp__Group__313509);
+            pushFollow(FOLLOW_48);
             rule__DecimalExp__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__DecimalExp__Group__4_in_rule__DecimalExp__Group__313512);
+            pushFollow(FOLLOW_2);
             rule__DecimalExp__Group__4();
 
             state._fsp--;
@@ -19262,22 +19262,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__3__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6755:1: rule__DecimalExp__Group__3__Impl : ( RULE_INT ) ;
+    // InternalConfig.g:6754:1: rule__DecimalExp__Group__3__Impl : ( RULE_INT ) ;
     public final void rule__DecimalExp__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6759:1: ( ( RULE_INT ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6760:1: ( RULE_INT )
+            // InternalConfig.g:6758:1: ( ( RULE_INT ) )
+            // InternalConfig.g:6759:1: ( RULE_INT )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6760:1: ( RULE_INT )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6761:1: RULE_INT
+            // InternalConfig.g:6759:1: ( RULE_INT )
+            // InternalConfig.g:6760:1: RULE_INT
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_3()); 
             }
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__DecimalExp__Group__3__Impl13539); if (state.failed) return ;
+            match(input,RULE_INT,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_3()); 
             }
@@ -19303,21 +19303,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__4"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6772:1: rule__DecimalExp__Group__4 : rule__DecimalExp__Group__4__Impl rule__DecimalExp__Group__5 ;
+    // InternalConfig.g:6771:1: rule__DecimalExp__Group__4 : rule__DecimalExp__Group__4__Impl rule__DecimalExp__Group__5 ;
     public final void rule__DecimalExp__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6776:1: ( rule__DecimalExp__Group__4__Impl rule__DecimalExp__Group__5 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6777:2: rule__DecimalExp__Group__4__Impl rule__DecimalExp__Group__5
+            // InternalConfig.g:6775:1: ( rule__DecimalExp__Group__4__Impl rule__DecimalExp__Group__5 )
+            // InternalConfig.g:6776:2: rule__DecimalExp__Group__4__Impl rule__DecimalExp__Group__5
             {
-            pushFollow(FOLLOW_rule__DecimalExp__Group__4__Impl_in_rule__DecimalExp__Group__413568);
+            pushFollow(FOLLOW_47);
             rule__DecimalExp__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__DecimalExp__Group__5_in_rule__DecimalExp__Group__413571);
+            pushFollow(FOLLOW_2);
             rule__DecimalExp__Group__5();
 
             state._fsp--;
@@ -19341,25 +19341,25 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__4__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6784:1: rule__DecimalExp__Group__4__Impl : ( ( rule__DecimalExp__Alternatives_4 ) ) ;
+    // InternalConfig.g:6783:1: rule__DecimalExp__Group__4__Impl : ( ( rule__DecimalExp__Alternatives_4 ) ) ;
     public final void rule__DecimalExp__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6788:1: ( ( ( rule__DecimalExp__Alternatives_4 ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6789:1: ( ( rule__DecimalExp__Alternatives_4 ) )
+            // InternalConfig.g:6787:1: ( ( ( rule__DecimalExp__Alternatives_4 ) ) )
+            // InternalConfig.g:6788:1: ( ( rule__DecimalExp__Alternatives_4 ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6789:1: ( ( rule__DecimalExp__Alternatives_4 ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6790:1: ( rule__DecimalExp__Alternatives_4 )
+            // InternalConfig.g:6788:1: ( ( rule__DecimalExp__Alternatives_4 ) )
+            // InternalConfig.g:6789:1: ( rule__DecimalExp__Alternatives_4 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDecimalExpAccess().getAlternatives_4()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6791:1: ( rule__DecimalExp__Alternatives_4 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6791:2: rule__DecimalExp__Alternatives_4
+            // InternalConfig.g:6790:1: ( rule__DecimalExp__Alternatives_4 )
+            // InternalConfig.g:6790:2: rule__DecimalExp__Alternatives_4
             {
-            pushFollow(FOLLOW_rule__DecimalExp__Alternatives_4_in_rule__DecimalExp__Group__4__Impl13598);
+            pushFollow(FOLLOW_2);
             rule__DecimalExp__Alternatives_4();
 
             state._fsp--;
@@ -19392,21 +19392,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__5"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6801:1: rule__DecimalExp__Group__5 : rule__DecimalExp__Group__5__Impl rule__DecimalExp__Group__6 ;
+    // InternalConfig.g:6800:1: rule__DecimalExp__Group__5 : rule__DecimalExp__Group__5__Impl rule__DecimalExp__Group__6 ;
     public final void rule__DecimalExp__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6805:1: ( rule__DecimalExp__Group__5__Impl rule__DecimalExp__Group__6 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6806:2: rule__DecimalExp__Group__5__Impl rule__DecimalExp__Group__6
+            // InternalConfig.g:6804:1: ( rule__DecimalExp__Group__5__Impl rule__DecimalExp__Group__6 )
+            // InternalConfig.g:6805:2: rule__DecimalExp__Group__5__Impl rule__DecimalExp__Group__6
             {
-            pushFollow(FOLLOW_rule__DecimalExp__Group__5__Impl_in_rule__DecimalExp__Group__513628);
+            pushFollow(FOLLOW_47);
             rule__DecimalExp__Group__5__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__DecimalExp__Group__6_in_rule__DecimalExp__Group__513631);
+            pushFollow(FOLLOW_2);
             rule__DecimalExp__Group__6();
 
             state._fsp--;
@@ -19430,22 +19430,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__5__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6813:1: rule__DecimalExp__Group__5__Impl : ( ( rule__DecimalExp__Alternatives_5 )? ) ;
+    // InternalConfig.g:6812:1: rule__DecimalExp__Group__5__Impl : ( ( rule__DecimalExp__Alternatives_5 )? ) ;
     public final void rule__DecimalExp__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6817:1: ( ( ( rule__DecimalExp__Alternatives_5 )? ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6818:1: ( ( rule__DecimalExp__Alternatives_5 )? )
+            // InternalConfig.g:6816:1: ( ( ( rule__DecimalExp__Alternatives_5 )? ) )
+            // InternalConfig.g:6817:1: ( ( rule__DecimalExp__Alternatives_5 )? )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6818:1: ( ( rule__DecimalExp__Alternatives_5 )? )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6819:1: ( rule__DecimalExp__Alternatives_5 )?
+            // InternalConfig.g:6817:1: ( ( rule__DecimalExp__Alternatives_5 )? )
+            // InternalConfig.g:6818:1: ( rule__DecimalExp__Alternatives_5 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDecimalExpAccess().getAlternatives_5()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6820:1: ( rule__DecimalExp__Alternatives_5 )?
+            // InternalConfig.g:6819:1: ( rule__DecimalExp__Alternatives_5 )?
             int alt45=2;
             int LA45_0 = input.LA(1);
 
@@ -19454,9 +19454,9 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             }
             switch (alt45) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6820:2: rule__DecimalExp__Alternatives_5
+                    // InternalConfig.g:6819:2: rule__DecimalExp__Alternatives_5
                     {
-                    pushFollow(FOLLOW_rule__DecimalExp__Alternatives_5_in_rule__DecimalExp__Group__5__Impl13658);
+                    pushFollow(FOLLOW_2);
                     rule__DecimalExp__Alternatives_5();
 
                     state._fsp--;
@@ -19492,16 +19492,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__6"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6830:1: rule__DecimalExp__Group__6 : rule__DecimalExp__Group__6__Impl ;
+    // InternalConfig.g:6829:1: rule__DecimalExp__Group__6 : rule__DecimalExp__Group__6__Impl ;
     public final void rule__DecimalExp__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6834:1: ( rule__DecimalExp__Group__6__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6835:2: rule__DecimalExp__Group__6__Impl
+            // InternalConfig.g:6833:1: ( rule__DecimalExp__Group__6__Impl )
+            // InternalConfig.g:6834:2: rule__DecimalExp__Group__6__Impl
             {
-            pushFollow(FOLLOW_rule__DecimalExp__Group__6__Impl_in_rule__DecimalExp__Group__613689);
+            pushFollow(FOLLOW_2);
             rule__DecimalExp__Group__6__Impl();
 
             state._fsp--;
@@ -19525,28 +19525,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__6__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6841:1: rule__DecimalExp__Group__6__Impl : ( ( RULE_INT ) ) ;
+    // InternalConfig.g:6840:1: rule__DecimalExp__Group__6__Impl : ( RULE_INT ) ;
     public final void rule__DecimalExp__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6845:1: ( ( ( RULE_INT ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6846:1: ( ( RULE_INT ) )
+            // InternalConfig.g:6844:1: ( ( RULE_INT ) )
+            // InternalConfig.g:6845:1: ( RULE_INT )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6846:1: ( ( RULE_INT ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6847:1: ( RULE_INT )
+            // InternalConfig.g:6845:1: ( RULE_INT )
+            // InternalConfig.g:6846:1: RULE_INT
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_6()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6848:1: ( RULE_INT )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6848:3: RULE_INT
-            {
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__DecimalExp__Group__6__Impl13717); if (state.failed) return ;
-
-            }
-
+            match(input,RULE_INT,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_6()); 
             }
@@ -19572,21 +19566,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FQN__Group__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6872:1: rule__FQN__Group__0 : rule__FQN__Group__0__Impl rule__FQN__Group__1 ;
+    // InternalConfig.g:6871:1: rule__FQN__Group__0 : rule__FQN__Group__0__Impl rule__FQN__Group__1 ;
     public final void rule__FQN__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6876:1: ( rule__FQN__Group__0__Impl rule__FQN__Group__1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6877:2: rule__FQN__Group__0__Impl rule__FQN__Group__1
+            // InternalConfig.g:6875:1: ( rule__FQN__Group__0__Impl rule__FQN__Group__1 )
+            // InternalConfig.g:6876:2: rule__FQN__Group__0__Impl rule__FQN__Group__1
             {
-            pushFollow(FOLLOW_rule__FQN__Group__0__Impl_in_rule__FQN__Group__013761);
+            pushFollow(FOLLOW_29);
             rule__FQN__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__FQN__Group__1_in_rule__FQN__Group__013764);
+            pushFollow(FOLLOW_2);
             rule__FQN__Group__1();
 
             state._fsp--;
@@ -19610,22 +19604,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FQN__Group__0__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6884:1: rule__FQN__Group__0__Impl : ( RULE_ID ) ;
+    // InternalConfig.g:6883:1: rule__FQN__Group__0__Impl : ( RULE_ID ) ;
     public final void rule__FQN__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6888:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6889:1: ( RULE_ID )
+            // InternalConfig.g:6887:1: ( ( RULE_ID ) )
+            // InternalConfig.g:6888:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6889:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6890:1: RULE_ID
+            // InternalConfig.g:6888:1: ( RULE_ID )
+            // InternalConfig.g:6889:1: RULE_ID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFQNAccess().getIDTerminalRuleCall_0()); 
             }
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__FQN__Group__0__Impl13791); if (state.failed) return ;
+            match(input,RULE_ID,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getFQNAccess().getIDTerminalRuleCall_0()); 
             }
@@ -19651,16 +19645,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FQN__Group__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6901:1: rule__FQN__Group__1 : rule__FQN__Group__1__Impl ;
+    // InternalConfig.g:6900:1: rule__FQN__Group__1 : rule__FQN__Group__1__Impl ;
     public final void rule__FQN__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6905:1: ( rule__FQN__Group__1__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6906:2: rule__FQN__Group__1__Impl
+            // InternalConfig.g:6904:1: ( rule__FQN__Group__1__Impl )
+            // InternalConfig.g:6905:2: rule__FQN__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__FQN__Group__1__Impl_in_rule__FQN__Group__113820);
+            pushFollow(FOLLOW_2);
             rule__FQN__Group__1__Impl();
 
             state._fsp--;
@@ -19684,22 +19678,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FQN__Group__1__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6912:1: rule__FQN__Group__1__Impl : ( ( rule__FQN__Group_1__0 )* ) ;
+    // InternalConfig.g:6911:1: rule__FQN__Group__1__Impl : ( ( rule__FQN__Group_1__0 )* ) ;
     public final void rule__FQN__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6916:1: ( ( ( rule__FQN__Group_1__0 )* ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6917:1: ( ( rule__FQN__Group_1__0 )* )
+            // InternalConfig.g:6915:1: ( ( ( rule__FQN__Group_1__0 )* ) )
+            // InternalConfig.g:6916:1: ( ( rule__FQN__Group_1__0 )* )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6917:1: ( ( rule__FQN__Group_1__0 )* )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6918:1: ( rule__FQN__Group_1__0 )*
+            // InternalConfig.g:6916:1: ( ( rule__FQN__Group_1__0 )* )
+            // InternalConfig.g:6917:1: ( rule__FQN__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFQNAccess().getGroup_1()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6919:1: ( rule__FQN__Group_1__0 )*
+            // InternalConfig.g:6918:1: ( rule__FQN__Group_1__0 )*
             loop46:
             do {
                 int alt46=2;
@@ -19712,9 +19706,9 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
                 switch (alt46) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6919:2: rule__FQN__Group_1__0
+            	    // InternalConfig.g:6918:2: rule__FQN__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__FQN__Group_1__0_in_rule__FQN__Group__1__Impl13847);
+            	    pushFollow(FOLLOW_49);
             	    rule__FQN__Group_1__0();
 
             	    state._fsp--;
@@ -19753,21 +19747,21 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FQN__Group_1__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6933:1: rule__FQN__Group_1__0 : rule__FQN__Group_1__0__Impl rule__FQN__Group_1__1 ;
+    // InternalConfig.g:6932:1: rule__FQN__Group_1__0 : rule__FQN__Group_1__0__Impl rule__FQN__Group_1__1 ;
     public final void rule__FQN__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6937:1: ( rule__FQN__Group_1__0__Impl rule__FQN__Group_1__1 )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6938:2: rule__FQN__Group_1__0__Impl rule__FQN__Group_1__1
+            // InternalConfig.g:6936:1: ( rule__FQN__Group_1__0__Impl rule__FQN__Group_1__1 )
+            // InternalConfig.g:6937:2: rule__FQN__Group_1__0__Impl rule__FQN__Group_1__1
             {
-            pushFollow(FOLLOW_rule__FQN__Group_1__0__Impl_in_rule__FQN__Group_1__013882);
+            pushFollow(FOLLOW_3);
             rule__FQN__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__FQN__Group_1__1_in_rule__FQN__Group_1__013885);
+            pushFollow(FOLLOW_2);
             rule__FQN__Group_1__1();
 
             state._fsp--;
@@ -19791,22 +19785,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FQN__Group_1__0__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6945:1: rule__FQN__Group_1__0__Impl : ( '.' ) ;
+    // InternalConfig.g:6944:1: rule__FQN__Group_1__0__Impl : ( '.' ) ;
     public final void rule__FQN__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6949:1: ( ( '.' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6950:1: ( '.' )
+            // InternalConfig.g:6948:1: ( ( '.' ) )
+            // InternalConfig.g:6949:1: ( '.' )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6950:1: ( '.' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6951:1: '.'
+            // InternalConfig.g:6949:1: ( '.' )
+            // InternalConfig.g:6950:1: '.'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFQNAccess().getFullStopKeyword_1_0()); 
             }
-            match(input,47,FOLLOW_47_in_rule__FQN__Group_1__0__Impl13913); if (state.failed) return ;
+            match(input,47,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getFQNAccess().getFullStopKeyword_1_0()); 
             }
@@ -19832,16 +19826,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FQN__Group_1__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6964:1: rule__FQN__Group_1__1 : rule__FQN__Group_1__1__Impl ;
+    // InternalConfig.g:6963:1: rule__FQN__Group_1__1 : rule__FQN__Group_1__1__Impl ;
     public final void rule__FQN__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6968:1: ( rule__FQN__Group_1__1__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6969:2: rule__FQN__Group_1__1__Impl
+            // InternalConfig.g:6967:1: ( rule__FQN__Group_1__1__Impl )
+            // InternalConfig.g:6968:2: rule__FQN__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__FQN__Group_1__1__Impl_in_rule__FQN__Group_1__113944);
+            pushFollow(FOLLOW_2);
             rule__FQN__Group_1__1__Impl();
 
             state._fsp--;
@@ -19865,22 +19859,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FQN__Group_1__1__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6975:1: rule__FQN__Group_1__1__Impl : ( RULE_ID ) ;
+    // InternalConfig.g:6974:1: rule__FQN__Group_1__1__Impl : ( RULE_ID ) ;
     public final void rule__FQN__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6979:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6980:1: ( RULE_ID )
+            // InternalConfig.g:6978:1: ( ( RULE_ID ) )
+            // InternalConfig.g:6979:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6980:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6981:1: RULE_ID
+            // InternalConfig.g:6979:1: ( RULE_ID )
+            // InternalConfig.g:6980:1: RULE_ID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFQNAccess().getIDTerminalRuleCall_1_1()); 
             }
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__FQN__Group_1__1__Impl13971); if (state.failed) return ;
+            match(input,RULE_ID,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getFQNAccess().getIDTerminalRuleCall_1_1()); 
             }
@@ -19906,17 +19900,17 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DynamicConfig__UnorderedGroup_2"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:6997:1: rule__DynamicConfig__UnorderedGroup_2 : rule__DynamicConfig__UnorderedGroup_2__0 {...}?;
+    // InternalConfig.g:6996:1: rule__DynamicConfig__UnorderedGroup_2 : rule__DynamicConfig__UnorderedGroup_2__0 {...}?;
     public final void rule__DynamicConfig__UnorderedGroup_2() throws RecognitionException {
 
             	int stackSize = keepStackSize();
         		getUnorderedGroupHelper().enter(grammarAccess.getDynamicConfigAccess().getUnorderedGroup_2());
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7002:1: ( rule__DynamicConfig__UnorderedGroup_2__0 {...}?)
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7003:2: rule__DynamicConfig__UnorderedGroup_2__0 {...}?
+            // InternalConfig.g:7001:1: ( rule__DynamicConfig__UnorderedGroup_2__0 {...}?)
+            // InternalConfig.g:7002:2: rule__DynamicConfig__UnorderedGroup_2__0 {...}?
             {
-            pushFollow(FOLLOW_rule__DynamicConfig__UnorderedGroup_2__0_in_rule__DynamicConfig__UnorderedGroup_214005);
+            pushFollow(FOLLOW_2);
             rule__DynamicConfig__UnorderedGroup_2__0();
 
             state._fsp--;
@@ -19945,27 +19939,24 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DynamicConfig__UnorderedGroup_2__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7014:1: rule__DynamicConfig__UnorderedGroup_2__Impl : ( ({...}? => ( ( ( rule__DynamicConfig__Alternatives_2_0 ) ) ) ) | ({...}? => ( ( ( rule__DynamicConfig__Group_2_1__0 ) ) ) ) ) ;
+    // InternalConfig.g:7013:1: rule__DynamicConfig__UnorderedGroup_2__Impl : ( ({...}? => ( ( ( rule__DynamicConfig__Alternatives_2_0 ) ) ) ) | ({...}? => ( ( ( rule__DynamicConfig__Group_2_1__0 ) ) ) ) ) ;
     public final void rule__DynamicConfig__UnorderedGroup_2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         		boolean selected = false;
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7019:1: ( ( ({...}? => ( ( ( rule__DynamicConfig__Alternatives_2_0 ) ) ) ) | ({...}? => ( ( ( rule__DynamicConfig__Group_2_1__0 ) ) ) ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7020:3: ( ({...}? => ( ( ( rule__DynamicConfig__Alternatives_2_0 ) ) ) ) | ({...}? => ( ( ( rule__DynamicConfig__Group_2_1__0 ) ) ) ) )
+            // InternalConfig.g:7018:1: ( ( ({...}? => ( ( ( rule__DynamicConfig__Alternatives_2_0 ) ) ) ) | ({...}? => ( ( ( rule__DynamicConfig__Group_2_1__0 ) ) ) ) ) )
+            // InternalConfig.g:7019:3: ( ({...}? => ( ( ( rule__DynamicConfig__Alternatives_2_0 ) ) ) ) | ({...}? => ( ( ( rule__DynamicConfig__Group_2_1__0 ) ) ) ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7020:3: ( ({...}? => ( ( ( rule__DynamicConfig__Alternatives_2_0 ) ) ) ) | ({...}? => ( ( ( rule__DynamicConfig__Group_2_1__0 ) ) ) ) )
+            // InternalConfig.g:7019:3: ( ({...}? => ( ( ( rule__DynamicConfig__Alternatives_2_0 ) ) ) ) | ({...}? => ( ( ( rule__DynamicConfig__Group_2_1__0 ) ) ) ) )
             int alt47=2;
             int LA47_0 = input.LA(1);
 
-            if ( LA47_0 ==32 && getUnorderedGroupHelper().canSelect(grammarAccess.getDynamicConfigAccess().getUnorderedGroup_2(), 0) ) {
+            if ( LA47_0 >= 32 && LA47_0 <= 33 && getUnorderedGroupHelper().canSelect(grammarAccess.getDynamicConfigAccess().getUnorderedGroup_2(), 0) ) {
                 alt47=1;
             }
-            else if ( LA47_0 ==33 && getUnorderedGroupHelper().canSelect(grammarAccess.getDynamicConfigAccess().getUnorderedGroup_2(), 0) ) {
-                alt47=1;
-            }
-            else if ( LA47_0 ==35 && getUnorderedGroupHelper().canSelect(grammarAccess.getDynamicConfigAccess().getUnorderedGroup_2(), 1) ) {
+            else if ( LA47_0 == 35 && getUnorderedGroupHelper().canSelect(grammarAccess.getDynamicConfigAccess().getUnorderedGroup_2(), 1) ) {
                 alt47=2;
             }
             else {
@@ -19977,30 +19968,30 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             }
             switch (alt47) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7022:4: ({...}? => ( ( ( rule__DynamicConfig__Alternatives_2_0 ) ) ) )
+                    // InternalConfig.g:7021:4: ({...}? => ( ( ( rule__DynamicConfig__Alternatives_2_0 ) ) ) )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7022:4: ({...}? => ( ( ( rule__DynamicConfig__Alternatives_2_0 ) ) ) )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7023:5: {...}? => ( ( ( rule__DynamicConfig__Alternatives_2_0 ) ) )
+                    // InternalConfig.g:7021:4: ({...}? => ( ( ( rule__DynamicConfig__Alternatives_2_0 ) ) ) )
+                    // InternalConfig.g:7022:5: {...}? => ( ( ( rule__DynamicConfig__Alternatives_2_0 ) ) )
                     {
                     if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getDynamicConfigAccess().getUnorderedGroup_2(), 0) ) {
                         if (state.backtracking>0) {state.failed=true; return ;}
                         throw new FailedPredicateException(input, "rule__DynamicConfig__UnorderedGroup_2__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getDynamicConfigAccess().getUnorderedGroup_2(), 0)");
                     }
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7023:110: ( ( ( rule__DynamicConfig__Alternatives_2_0 ) ) )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7024:6: ( ( rule__DynamicConfig__Alternatives_2_0 ) )
+                    // InternalConfig.g:7022:110: ( ( ( rule__DynamicConfig__Alternatives_2_0 ) ) )
+                    // InternalConfig.g:7023:6: ( ( rule__DynamicConfig__Alternatives_2_0 ) )
                     {
                     getUnorderedGroupHelper().select(grammarAccess.getDynamicConfigAccess().getUnorderedGroup_2(), 0);
                     selected = true;
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7030:6: ( ( rule__DynamicConfig__Alternatives_2_0 ) )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7032:7: ( rule__DynamicConfig__Alternatives_2_0 )
+                    // InternalConfig.g:7029:6: ( ( rule__DynamicConfig__Alternatives_2_0 ) )
+                    // InternalConfig.g:7031:7: ( rule__DynamicConfig__Alternatives_2_0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getDynamicConfigAccess().getAlternatives_2_0()); 
                     }
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7033:7: ( rule__DynamicConfig__Alternatives_2_0 )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7033:8: rule__DynamicConfig__Alternatives_2_0
+                    // InternalConfig.g:7032:7: ( rule__DynamicConfig__Alternatives_2_0 )
+                    // InternalConfig.g:7032:8: rule__DynamicConfig__Alternatives_2_0
                     {
-                    pushFollow(FOLLOW_rule__DynamicConfig__Alternatives_2_0_in_rule__DynamicConfig__UnorderedGroup_2__Impl14094);
+                    pushFollow(FOLLOW_2);
                     rule__DynamicConfig__Alternatives_2_0();
 
                     state._fsp--;
@@ -20024,30 +20015,30 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7039:4: ({...}? => ( ( ( rule__DynamicConfig__Group_2_1__0 ) ) ) )
+                    // InternalConfig.g:7038:4: ({...}? => ( ( ( rule__DynamicConfig__Group_2_1__0 ) ) ) )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7039:4: ({...}? => ( ( ( rule__DynamicConfig__Group_2_1__0 ) ) ) )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7040:5: {...}? => ( ( ( rule__DynamicConfig__Group_2_1__0 ) ) )
+                    // InternalConfig.g:7038:4: ({...}? => ( ( ( rule__DynamicConfig__Group_2_1__0 ) ) ) )
+                    // InternalConfig.g:7039:5: {...}? => ( ( ( rule__DynamicConfig__Group_2_1__0 ) ) )
                     {
                     if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getDynamicConfigAccess().getUnorderedGroup_2(), 1) ) {
                         if (state.backtracking>0) {state.failed=true; return ;}
                         throw new FailedPredicateException(input, "rule__DynamicConfig__UnorderedGroup_2__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getDynamicConfigAccess().getUnorderedGroup_2(), 1)");
                     }
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7040:110: ( ( ( rule__DynamicConfig__Group_2_1__0 ) ) )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7041:6: ( ( rule__DynamicConfig__Group_2_1__0 ) )
+                    // InternalConfig.g:7039:110: ( ( ( rule__DynamicConfig__Group_2_1__0 ) ) )
+                    // InternalConfig.g:7040:6: ( ( rule__DynamicConfig__Group_2_1__0 ) )
                     {
                     getUnorderedGroupHelper().select(grammarAccess.getDynamicConfigAccess().getUnorderedGroup_2(), 1);
                     selected = true;
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7047:6: ( ( rule__DynamicConfig__Group_2_1__0 ) )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7049:7: ( rule__DynamicConfig__Group_2_1__0 )
+                    // InternalConfig.g:7046:6: ( ( rule__DynamicConfig__Group_2_1__0 ) )
+                    // InternalConfig.g:7048:7: ( rule__DynamicConfig__Group_2_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getDynamicConfigAccess().getGroup_2_1()); 
                     }
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7050:7: ( rule__DynamicConfig__Group_2_1__0 )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7050:8: rule__DynamicConfig__Group_2_1__0
+                    // InternalConfig.g:7049:7: ( rule__DynamicConfig__Group_2_1__0 )
+                    // InternalConfig.g:7049:8: rule__DynamicConfig__Group_2_1__0
                     {
-                    pushFollow(FOLLOW_rule__DynamicConfig__Group_2_1__0_in_rule__DynamicConfig__UnorderedGroup_2__Impl14185);
+                    pushFollow(FOLLOW_2);
                     rule__DynamicConfig__Group_2_1__0();
 
                     state._fsp--;
@@ -20094,38 +20085,35 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DynamicConfig__UnorderedGroup_2__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7065:1: rule__DynamicConfig__UnorderedGroup_2__0 : rule__DynamicConfig__UnorderedGroup_2__Impl ( rule__DynamicConfig__UnorderedGroup_2__1 )? ;
+    // InternalConfig.g:7064:1: rule__DynamicConfig__UnorderedGroup_2__0 : rule__DynamicConfig__UnorderedGroup_2__Impl ( rule__DynamicConfig__UnorderedGroup_2__1 )? ;
     public final void rule__DynamicConfig__UnorderedGroup_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7069:1: ( rule__DynamicConfig__UnorderedGroup_2__Impl ( rule__DynamicConfig__UnorderedGroup_2__1 )? )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7070:2: rule__DynamicConfig__UnorderedGroup_2__Impl ( rule__DynamicConfig__UnorderedGroup_2__1 )?
+            // InternalConfig.g:7068:1: ( rule__DynamicConfig__UnorderedGroup_2__Impl ( rule__DynamicConfig__UnorderedGroup_2__1 )? )
+            // InternalConfig.g:7069:2: rule__DynamicConfig__UnorderedGroup_2__Impl ( rule__DynamicConfig__UnorderedGroup_2__1 )?
             {
-            pushFollow(FOLLOW_rule__DynamicConfig__UnorderedGroup_2__Impl_in_rule__DynamicConfig__UnorderedGroup_2__014244);
+            pushFollow(FOLLOW_50);
             rule__DynamicConfig__UnorderedGroup_2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7071:2: ( rule__DynamicConfig__UnorderedGroup_2__1 )?
+            // InternalConfig.g:7070:2: ( rule__DynamicConfig__UnorderedGroup_2__1 )?
             int alt48=2;
             int LA48_0 = input.LA(1);
 
-            if ( LA48_0 ==32 && getUnorderedGroupHelper().canSelect(grammarAccess.getDynamicConfigAccess().getUnorderedGroup_2(), 0) ) {
-                alt48=1;
-            }
-            else if ( LA48_0 ==33 && getUnorderedGroupHelper().canSelect(grammarAccess.getDynamicConfigAccess().getUnorderedGroup_2(), 0) ) {
+            if ( LA48_0 >= 32 && LA48_0 <= 33 && getUnorderedGroupHelper().canSelect(grammarAccess.getDynamicConfigAccess().getUnorderedGroup_2(), 0) ) {
                 alt48=1;
             }
-            else if ( LA48_0 ==35 && getUnorderedGroupHelper().canSelect(grammarAccess.getDynamicConfigAccess().getUnorderedGroup_2(), 1) ) {
+            else if ( LA48_0 == 35 && getUnorderedGroupHelper().canSelect(grammarAccess.getDynamicConfigAccess().getUnorderedGroup_2(), 1) ) {
                 alt48=1;
             }
             switch (alt48) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:0:0: rule__DynamicConfig__UnorderedGroup_2__1
+                    // InternalConfig.g:7070:2: rule__DynamicConfig__UnorderedGroup_2__1
                     {
-                    pushFollow(FOLLOW_rule__DynamicConfig__UnorderedGroup_2__1_in_rule__DynamicConfig__UnorderedGroup_2__014247);
+                    pushFollow(FOLLOW_2);
                     rule__DynamicConfig__UnorderedGroup_2__1();
 
                     state._fsp--;
@@ -20155,16 +20143,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DynamicConfig__UnorderedGroup_2__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7078:1: rule__DynamicConfig__UnorderedGroup_2__1 : rule__DynamicConfig__UnorderedGroup_2__Impl ;
+    // InternalConfig.g:7077:1: rule__DynamicConfig__UnorderedGroup_2__1 : rule__DynamicConfig__UnorderedGroup_2__Impl ;
     public final void rule__DynamicConfig__UnorderedGroup_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7082:1: ( rule__DynamicConfig__UnorderedGroup_2__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7083:2: rule__DynamicConfig__UnorderedGroup_2__Impl
+            // InternalConfig.g:7081:1: ( rule__DynamicConfig__UnorderedGroup_2__Impl )
+            // InternalConfig.g:7082:2: rule__DynamicConfig__UnorderedGroup_2__Impl
             {
-            pushFollow(FOLLOW_rule__DynamicConfig__UnorderedGroup_2__Impl_in_rule__DynamicConfig__UnorderedGroup_2__114272);
+            pushFollow(FOLLOW_2);
             rule__DynamicConfig__UnorderedGroup_2__Impl();
 
             state._fsp--;
@@ -20188,31 +20176,31 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorInstanceConfig__UnorderedGroup_7"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7094:1: rule__ActorInstanceConfig__UnorderedGroup_7 : ( rule__ActorInstanceConfig__UnorderedGroup_7__0 )? ;
+    // InternalConfig.g:7093:1: rule__ActorInstanceConfig__UnorderedGroup_7 : ( rule__ActorInstanceConfig__UnorderedGroup_7__0 )? ;
     public final void rule__ActorInstanceConfig__UnorderedGroup_7() throws RecognitionException {
 
             	int stackSize = keepStackSize();
         		getUnorderedGroupHelper().enter(grammarAccess.getActorInstanceConfigAccess().getUnorderedGroup_7());
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7099:1: ( ( rule__ActorInstanceConfig__UnorderedGroup_7__0 )? )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7100:2: ( rule__ActorInstanceConfig__UnorderedGroup_7__0 )?
+            // InternalConfig.g:7098:1: ( ( rule__ActorInstanceConfig__UnorderedGroup_7__0 )? )
+            // InternalConfig.g:7099:2: ( rule__ActorInstanceConfig__UnorderedGroup_7__0 )?
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7100:2: ( rule__ActorInstanceConfig__UnorderedGroup_7__0 )?
+            // InternalConfig.g:7099:2: ( rule__ActorInstanceConfig__UnorderedGroup_7__0 )?
             int alt49=2;
             int LA49_0 = input.LA(1);
 
-            if ( LA49_0 ==42 && getUnorderedGroupHelper().canSelect(grammarAccess.getActorInstanceConfigAccess().getUnorderedGroup_7(), 0) ) {
+            if ( LA49_0 == 42 && getUnorderedGroupHelper().canSelect(grammarAccess.getActorInstanceConfigAccess().getUnorderedGroup_7(), 0) ) {
                 alt49=1;
             }
-            else if ( LA49_0 ==41 && getUnorderedGroupHelper().canSelect(grammarAccess.getActorInstanceConfigAccess().getUnorderedGroup_7(), 1) ) {
+            else if ( LA49_0 == 41 && getUnorderedGroupHelper().canSelect(grammarAccess.getActorInstanceConfigAccess().getUnorderedGroup_7(), 1) ) {
                 alt49=1;
             }
             switch (alt49) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:0:0: rule__ActorInstanceConfig__UnorderedGroup_7__0
+                    // InternalConfig.g:7099:2: rule__ActorInstanceConfig__UnorderedGroup_7__0
                     {
-                    pushFollow(FOLLOW_rule__ActorInstanceConfig__UnorderedGroup_7__0_in_rule__ActorInstanceConfig__UnorderedGroup_714300);
+                    pushFollow(FOLLOW_2);
                     rule__ActorInstanceConfig__UnorderedGroup_7__0();
 
                     state._fsp--;
@@ -20243,24 +20231,24 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorInstanceConfig__UnorderedGroup_7__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7110:1: rule__ActorInstanceConfig__UnorderedGroup_7__Impl : ( ({...}? => ( ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 ) ) ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 )=> rule__ActorInstanceConfig__AttributesAssignment_7_0 )* ) ) ) ) | ({...}? => ( ( ( ( rule__ActorInstanceConfig__PortsAssignment_7_1 ) ) ( ( ( rule__ActorInstanceConfig__PortsAssignment_7_1 )=> rule__ActorInstanceConfig__PortsAssignment_7_1 )* ) ) ) ) ) ;
+    // InternalConfig.g:7109:1: rule__ActorInstanceConfig__UnorderedGroup_7__Impl : ( ({...}? => ( ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 ) ) ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 )=> rule__ActorInstanceConfig__AttributesAssignment_7_0 )* ) ) ) ) | ({...}? => ( ( ( ( rule__ActorInstanceConfig__PortsAssignment_7_1 ) ) ( ( ( rule__ActorInstanceConfig__PortsAssignment_7_1 )=> rule__ActorInstanceConfig__PortsAssignment_7_1 )* ) ) ) ) ) ;
     public final void rule__ActorInstanceConfig__UnorderedGroup_7__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         		boolean selected = false;
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7115:1: ( ( ({...}? => ( ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 ) ) ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 )=> rule__ActorInstanceConfig__AttributesAssignment_7_0 )* ) ) ) ) | ({...}? => ( ( ( ( rule__ActorInstanceConfig__PortsAssignment_7_1 ) ) ( ( ( rule__ActorInstanceConfig__PortsAssignment_7_1 )=> rule__ActorInstanceConfig__PortsAssignment_7_1 )* ) ) ) ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7116:3: ( ({...}? => ( ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 ) ) ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 )=> rule__ActorInstanceConfig__AttributesAssignment_7_0 )* ) ) ) ) | ({...}? => ( ( ( ( rule__ActorInstanceConfig__PortsAssignment_7_1 ) ) ( ( ( rule__ActorInstanceConfig__PortsAssignment_7_1 )=> rule__ActorInstanceConfig__PortsAssignment_7_1 )* ) ) ) ) )
+            // InternalConfig.g:7114:1: ( ( ({...}? => ( ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 ) ) ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 )=> rule__ActorInstanceConfig__AttributesAssignment_7_0 )* ) ) ) ) | ({...}? => ( ( ( ( rule__ActorInstanceConfig__PortsAssignment_7_1 ) ) ( ( ( rule__ActorInstanceConfig__PortsAssignment_7_1 )=> rule__ActorInstanceConfig__PortsAssignment_7_1 )* ) ) ) ) ) )
+            // InternalConfig.g:7115:3: ( ({...}? => ( ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 ) ) ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 )=> rule__ActorInstanceConfig__AttributesAssignment_7_0 )* ) ) ) ) | ({...}? => ( ( ( ( rule__ActorInstanceConfig__PortsAssignment_7_1 ) ) ( ( ( rule__ActorInstanceConfig__PortsAssignment_7_1 )=> rule__ActorInstanceConfig__PortsAssignment_7_1 )* ) ) ) ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7116:3: ( ({...}? => ( ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 ) ) ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 )=> rule__ActorInstanceConfig__AttributesAssignment_7_0 )* ) ) ) ) | ({...}? => ( ( ( ( rule__ActorInstanceConfig__PortsAssignment_7_1 ) ) ( ( ( rule__ActorInstanceConfig__PortsAssignment_7_1 )=> rule__ActorInstanceConfig__PortsAssignment_7_1 )* ) ) ) ) )
+            // InternalConfig.g:7115:3: ( ({...}? => ( ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 ) ) ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 )=> rule__ActorInstanceConfig__AttributesAssignment_7_0 )* ) ) ) ) | ({...}? => ( ( ( ( rule__ActorInstanceConfig__PortsAssignment_7_1 ) ) ( ( ( rule__ActorInstanceConfig__PortsAssignment_7_1 )=> rule__ActorInstanceConfig__PortsAssignment_7_1 )* ) ) ) ) )
             int alt52=2;
             int LA52_0 = input.LA(1);
 
-            if ( LA52_0 ==42 && getUnorderedGroupHelper().canSelect(grammarAccess.getActorInstanceConfigAccess().getUnorderedGroup_7(), 0) ) {
+            if ( LA52_0 == 42 && getUnorderedGroupHelper().canSelect(grammarAccess.getActorInstanceConfigAccess().getUnorderedGroup_7(), 0) ) {
                 alt52=1;
             }
-            else if ( LA52_0 ==41 && getUnorderedGroupHelper().canSelect(grammarAccess.getActorInstanceConfigAccess().getUnorderedGroup_7(), 1) ) {
+            else if ( LA52_0 == 41 && getUnorderedGroupHelper().canSelect(grammarAccess.getActorInstanceConfigAccess().getUnorderedGroup_7(), 1) ) {
                 alt52=2;
             }
             else {
@@ -20272,33 +20260,33 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             }
             switch (alt52) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7118:4: ({...}? => ( ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 ) ) ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 )=> rule__ActorInstanceConfig__AttributesAssignment_7_0 )* ) ) ) )
+                    // InternalConfig.g:7117:4: ({...}? => ( ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 ) ) ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 )=> rule__ActorInstanceConfig__AttributesAssignment_7_0 )* ) ) ) )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7118:4: ({...}? => ( ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 ) ) ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 )=> rule__ActorInstanceConfig__AttributesAssignment_7_0 )* ) ) ) )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7119:5: {...}? => ( ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 ) ) ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 )=> rule__ActorInstanceConfig__AttributesAssignment_7_0 )* ) ) )
+                    // InternalConfig.g:7117:4: ({...}? => ( ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 ) ) ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 )=> rule__ActorInstanceConfig__AttributesAssignment_7_0 )* ) ) ) )
+                    // InternalConfig.g:7118:5: {...}? => ( ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 ) ) ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 )=> rule__ActorInstanceConfig__AttributesAssignment_7_0 )* ) ) )
                     {
                     if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getActorInstanceConfigAccess().getUnorderedGroup_7(), 0) ) {
                         if (state.backtracking>0) {state.failed=true; return ;}
                         throw new FailedPredicateException(input, "rule__ActorInstanceConfig__UnorderedGroup_7__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getActorInstanceConfigAccess().getUnorderedGroup_7(), 0)");
                     }
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7119:116: ( ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 ) ) ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 )=> rule__ActorInstanceConfig__AttributesAssignment_7_0 )* ) ) )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7120:6: ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 ) ) ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 )=> rule__ActorInstanceConfig__AttributesAssignment_7_0 )* ) )
+                    // InternalConfig.g:7118:116: ( ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 ) ) ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 )=> rule__ActorInstanceConfig__AttributesAssignment_7_0 )* ) ) )
+                    // InternalConfig.g:7119:6: ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 ) ) ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 )=> rule__ActorInstanceConfig__AttributesAssignment_7_0 )* ) )
                     {
                     getUnorderedGroupHelper().select(grammarAccess.getActorInstanceConfigAccess().getUnorderedGroup_7(), 0);
                     selected = true;
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7126:6: ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 ) ) ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 )=> rule__ActorInstanceConfig__AttributesAssignment_7_0 )* ) )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7127:6: ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 ) ) ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 )=> rule__ActorInstanceConfig__AttributesAssignment_7_0 )* )
+                    // InternalConfig.g:7125:6: ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 ) ) ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 )=> rule__ActorInstanceConfig__AttributesAssignment_7_0 )* ) )
+                    // InternalConfig.g:7126:6: ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 ) ) ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 )=> rule__ActorInstanceConfig__AttributesAssignment_7_0 )* )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7127:6: ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 ) )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7128:7: ( rule__ActorInstanceConfig__AttributesAssignment_7_0 )
+                    // InternalConfig.g:7126:6: ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 ) )
+                    // InternalConfig.g:7127:7: ( rule__ActorInstanceConfig__AttributesAssignment_7_0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getActorInstanceConfigAccess().getAttributesAssignment_7_0()); 
                     }
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7129:7: ( rule__ActorInstanceConfig__AttributesAssignment_7_0 )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7129:8: rule__ActorInstanceConfig__AttributesAssignment_7_0
+                    // InternalConfig.g:7128:7: ( rule__ActorInstanceConfig__AttributesAssignment_7_0 )
+                    // InternalConfig.g:7128:8: rule__ActorInstanceConfig__AttributesAssignment_7_0
                     {
-                    pushFollow(FOLLOW_rule__ActorInstanceConfig__AttributesAssignment_7_0_in_rule__ActorInstanceConfig__UnorderedGroup_7__Impl14388);
+                    pushFollow(FOLLOW_16);
                     rule__ActorInstanceConfig__AttributesAssignment_7_0();
 
                     state._fsp--;
@@ -20312,13 +20300,13 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
                     }
 
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7132:6: ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 )=> rule__ActorInstanceConfig__AttributesAssignment_7_0 )* )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7133:7: ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 )=> rule__ActorInstanceConfig__AttributesAssignment_7_0 )*
+                    // InternalConfig.g:7131:6: ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 )=> rule__ActorInstanceConfig__AttributesAssignment_7_0 )* )
+                    // InternalConfig.g:7132:7: ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 )=> rule__ActorInstanceConfig__AttributesAssignment_7_0 )*
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getActorInstanceConfigAccess().getAttributesAssignment_7_0()); 
                     }
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7134:7: ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 )=> rule__ActorInstanceConfig__AttributesAssignment_7_0 )*
+                    // InternalConfig.g:7133:7: ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 )=> rule__ActorInstanceConfig__AttributesAssignment_7_0 )*
                     loop50:
                     do {
                         int alt50=2;
@@ -20330,7 +20318,7 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
                             if ( (LA50_1==RULE_ID) ) {
                                 int LA50_3 = input.LA(3);
 
-                                if ( (synpred57_InternalConfig()) ) {
+                                if ( (synpred1_InternalConfig()) ) {
                                     alt50=1;
                                 }
 
@@ -20343,9 +20331,9 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
                         switch (alt50) {
                     	case 1 :
-                    	    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7134:8: ( rule__ActorInstanceConfig__AttributesAssignment_7_0 )=> rule__ActorInstanceConfig__AttributesAssignment_7_0
+                    	    // InternalConfig.g:7133:8: ( rule__ActorInstanceConfig__AttributesAssignment_7_0 )=> rule__ActorInstanceConfig__AttributesAssignment_7_0
                     	    {
-                    	    pushFollow(FOLLOW_rule__ActorInstanceConfig__AttributesAssignment_7_0_in_rule__ActorInstanceConfig__UnorderedGroup_7__Impl14432);
+                    	    pushFollow(FOLLOW_16);
                     	    rule__ActorInstanceConfig__AttributesAssignment_7_0();
 
                     	    state._fsp--;
@@ -20378,33 +20366,33 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7140:4: ({...}? => ( ( ( ( rule__ActorInstanceConfig__PortsAssignment_7_1 ) ) ( ( ( rule__ActorInstanceConfig__PortsAssignment_7_1 )=> rule__ActorInstanceConfig__PortsAssignment_7_1 )* ) ) ) )
+                    // InternalConfig.g:7139:4: ({...}? => ( ( ( ( rule__ActorInstanceConfig__PortsAssignment_7_1 ) ) ( ( ( rule__ActorInstanceConfig__PortsAssignment_7_1 )=> rule__ActorInstanceConfig__PortsAssignment_7_1 )* ) ) ) )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7140:4: ({...}? => ( ( ( ( rule__ActorInstanceConfig__PortsAssignment_7_1 ) ) ( ( ( rule__ActorInstanceConfig__PortsAssignment_7_1 )=> rule__ActorInstanceConfig__PortsAssignment_7_1 )* ) ) ) )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7141:5: {...}? => ( ( ( ( rule__ActorInstanceConfig__PortsAssignment_7_1 ) ) ( ( ( rule__ActorInstanceConfig__PortsAssignment_7_1 )=> rule__ActorInstanceConfig__PortsAssignment_7_1 )* ) ) )
+                    // InternalConfig.g:7139:4: ({...}? => ( ( ( ( rule__ActorInstanceConfig__PortsAssignment_7_1 ) ) ( ( ( rule__ActorInstanceConfig__PortsAssignment_7_1 )=> rule__ActorInstanceConfig__PortsAssignment_7_1 )* ) ) ) )
+                    // InternalConfig.g:7140:5: {...}? => ( ( ( ( rule__ActorInstanceConfig__PortsAssignment_7_1 ) ) ( ( ( rule__ActorInstanceConfig__PortsAssignment_7_1 )=> rule__ActorInstanceConfig__PortsAssignment_7_1 )* ) ) )
                     {
                     if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getActorInstanceConfigAccess().getUnorderedGroup_7(), 1) ) {
                         if (state.backtracking>0) {state.failed=true; return ;}
                         throw new FailedPredicateException(input, "rule__ActorInstanceConfig__UnorderedGroup_7__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getActorInstanceConfigAccess().getUnorderedGroup_7(), 1)");
                     }
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7141:116: ( ( ( ( rule__ActorInstanceConfig__PortsAssignment_7_1 ) ) ( ( ( rule__ActorInstanceConfig__PortsAssignment_7_1 )=> rule__ActorInstanceConfig__PortsAssignment_7_1 )* ) ) )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7142:6: ( ( ( rule__ActorInstanceConfig__PortsAssignment_7_1 ) ) ( ( ( rule__ActorInstanceConfig__PortsAssignment_7_1 )=> rule__ActorInstanceConfig__PortsAssignment_7_1 )* ) )
+                    // InternalConfig.g:7140:116: ( ( ( ( rule__ActorInstanceConfig__PortsAssignment_7_1 ) ) ( ( ( rule__ActorInstanceConfig__PortsAssignment_7_1 )=> rule__ActorInstanceConfig__PortsAssignment_7_1 )* ) ) )
+                    // InternalConfig.g:7141:6: ( ( ( rule__ActorInstanceConfig__PortsAssignment_7_1 ) ) ( ( ( rule__ActorInstanceConfig__PortsAssignment_7_1 )=> rule__ActorInstanceConfig__PortsAssignment_7_1 )* ) )
                     {
                     getUnorderedGroupHelper().select(grammarAccess.getActorInstanceConfigAccess().getUnorderedGroup_7(), 1);
                     selected = true;
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7148:6: ( ( ( rule__ActorInstanceConfig__PortsAssignment_7_1 ) ) ( ( ( rule__ActorInstanceConfig__PortsAssignment_7_1 )=> rule__ActorInstanceConfig__PortsAssignment_7_1 )* ) )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7149:6: ( ( rule__ActorInstanceConfig__PortsAssignment_7_1 ) ) ( ( ( rule__ActorInstanceConfig__PortsAssignment_7_1 )=> rule__ActorInstanceConfig__PortsAssignment_7_1 )* )
+                    // InternalConfig.g:7147:6: ( ( ( rule__ActorInstanceConfig__PortsAssignment_7_1 ) ) ( ( ( rule__ActorInstanceConfig__PortsAssignment_7_1 )=> rule__ActorInstanceConfig__PortsAssignment_7_1 )* ) )
+                    // InternalConfig.g:7148:6: ( ( rule__ActorInstanceConfig__PortsAssignment_7_1 ) ) ( ( ( rule__ActorInstanceConfig__PortsAssignment_7_1 )=> rule__ActorInstanceConfig__PortsAssignment_7_1 )* )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7149:6: ( ( rule__ActorInstanceConfig__PortsAssignment_7_1 ) )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7150:7: ( rule__ActorInstanceConfig__PortsAssignment_7_1 )
+                    // InternalConfig.g:7148:6: ( ( rule__ActorInstanceConfig__PortsAssignment_7_1 ) )
+                    // InternalConfig.g:7149:7: ( rule__ActorInstanceConfig__PortsAssignment_7_1 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getActorInstanceConfigAccess().getPortsAssignment_7_1()); 
                     }
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7151:7: ( rule__ActorInstanceConfig__PortsAssignment_7_1 )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7151:8: rule__ActorInstanceConfig__PortsAssignment_7_1
+                    // InternalConfig.g:7150:7: ( rule__ActorInstanceConfig__PortsAssignment_7_1 )
+                    // InternalConfig.g:7150:8: rule__ActorInstanceConfig__PortsAssignment_7_1
                     {
-                    pushFollow(FOLLOW_rule__ActorInstanceConfig__PortsAssignment_7_1_in_rule__ActorInstanceConfig__UnorderedGroup_7__Impl14531);
+                    pushFollow(FOLLOW_51);
                     rule__ActorInstanceConfig__PortsAssignment_7_1();
 
                     state._fsp--;
@@ -20418,13 +20406,13 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
                     }
 
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7154:6: ( ( ( rule__ActorInstanceConfig__PortsAssignment_7_1 )=> rule__ActorInstanceConfig__PortsAssignment_7_1 )* )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7155:7: ( ( rule__ActorInstanceConfig__PortsAssignment_7_1 )=> rule__ActorInstanceConfig__PortsAssignment_7_1 )*
+                    // InternalConfig.g:7153:6: ( ( ( rule__ActorInstanceConfig__PortsAssignment_7_1 )=> rule__ActorInstanceConfig__PortsAssignment_7_1 )* )
+                    // InternalConfig.g:7154:7: ( ( rule__ActorInstanceConfig__PortsAssignment_7_1 )=> rule__ActorInstanceConfig__PortsAssignment_7_1 )*
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getActorInstanceConfigAccess().getPortsAssignment_7_1()); 
                     }
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7156:7: ( ( rule__ActorInstanceConfig__PortsAssignment_7_1 )=> rule__ActorInstanceConfig__PortsAssignment_7_1 )*
+                    // InternalConfig.g:7155:7: ( ( rule__ActorInstanceConfig__PortsAssignment_7_1 )=> rule__ActorInstanceConfig__PortsAssignment_7_1 )*
                     loop51:
                     do {
                         int alt51=2;
@@ -20433,7 +20421,7 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
                         if ( (LA51_0==41) ) {
                             int LA51_2 = input.LA(2);
 
-                            if ( (synpred59_InternalConfig()) ) {
+                            if ( (synpred2_InternalConfig()) ) {
                                 alt51=1;
                             }
 
@@ -20443,9 +20431,9 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
                         switch (alt51) {
                     	case 1 :
-                    	    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7156:8: ( rule__ActorInstanceConfig__PortsAssignment_7_1 )=> rule__ActorInstanceConfig__PortsAssignment_7_1
+                    	    // InternalConfig.g:7155:8: ( rule__ActorInstanceConfig__PortsAssignment_7_1 )=> rule__ActorInstanceConfig__PortsAssignment_7_1
                     	    {
-                    	    pushFollow(FOLLOW_rule__ActorInstanceConfig__PortsAssignment_7_1_in_rule__ActorInstanceConfig__UnorderedGroup_7__Impl14575);
+                    	    pushFollow(FOLLOW_51);
                     	    rule__ActorInstanceConfig__PortsAssignment_7_1();
 
                     	    state._fsp--;
@@ -20501,35 +20489,35 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorInstanceConfig__UnorderedGroup_7__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7171:1: rule__ActorInstanceConfig__UnorderedGroup_7__0 : rule__ActorInstanceConfig__UnorderedGroup_7__Impl ( rule__ActorInstanceConfig__UnorderedGroup_7__1 )? ;
+    // InternalConfig.g:7170:1: rule__ActorInstanceConfig__UnorderedGroup_7__0 : rule__ActorInstanceConfig__UnorderedGroup_7__Impl ( rule__ActorInstanceConfig__UnorderedGroup_7__1 )? ;
     public final void rule__ActorInstanceConfig__UnorderedGroup_7__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7175:1: ( rule__ActorInstanceConfig__UnorderedGroup_7__Impl ( rule__ActorInstanceConfig__UnorderedGroup_7__1 )? )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7176:2: rule__ActorInstanceConfig__UnorderedGroup_7__Impl ( rule__ActorInstanceConfig__UnorderedGroup_7__1 )?
+            // InternalConfig.g:7174:1: ( rule__ActorInstanceConfig__UnorderedGroup_7__Impl ( rule__ActorInstanceConfig__UnorderedGroup_7__1 )? )
+            // InternalConfig.g:7175:2: rule__ActorInstanceConfig__UnorderedGroup_7__Impl ( rule__ActorInstanceConfig__UnorderedGroup_7__1 )?
             {
-            pushFollow(FOLLOW_rule__ActorInstanceConfig__UnorderedGroup_7__Impl_in_rule__ActorInstanceConfig__UnorderedGroup_7__014641);
+            pushFollow(FOLLOW_51);
             rule__ActorInstanceConfig__UnorderedGroup_7__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7177:2: ( rule__ActorInstanceConfig__UnorderedGroup_7__1 )?
+            // InternalConfig.g:7176:2: ( rule__ActorInstanceConfig__UnorderedGroup_7__1 )?
             int alt53=2;
             int LA53_0 = input.LA(1);
 
-            if ( LA53_0 ==42 && getUnorderedGroupHelper().canSelect(grammarAccess.getActorInstanceConfigAccess().getUnorderedGroup_7(), 0) ) {
+            if ( LA53_0 == 42 && getUnorderedGroupHelper().canSelect(grammarAccess.getActorInstanceConfigAccess().getUnorderedGroup_7(), 0) ) {
                 alt53=1;
             }
-            else if ( LA53_0 ==41 && getUnorderedGroupHelper().canSelect(grammarAccess.getActorInstanceConfigAccess().getUnorderedGroup_7(), 1) ) {
+            else if ( LA53_0 == 41 && getUnorderedGroupHelper().canSelect(grammarAccess.getActorInstanceConfigAccess().getUnorderedGroup_7(), 1) ) {
                 alt53=1;
             }
             switch (alt53) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:0:0: rule__ActorInstanceConfig__UnorderedGroup_7__1
+                    // InternalConfig.g:7176:2: rule__ActorInstanceConfig__UnorderedGroup_7__1
                     {
-                    pushFollow(FOLLOW_rule__ActorInstanceConfig__UnorderedGroup_7__1_in_rule__ActorInstanceConfig__UnorderedGroup_7__014644);
+                    pushFollow(FOLLOW_2);
                     rule__ActorInstanceConfig__UnorderedGroup_7__1();
 
                     state._fsp--;
@@ -20559,16 +20547,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorInstanceConfig__UnorderedGroup_7__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7184:1: rule__ActorInstanceConfig__UnorderedGroup_7__1 : rule__ActorInstanceConfig__UnorderedGroup_7__Impl ;
+    // InternalConfig.g:7183:1: rule__ActorInstanceConfig__UnorderedGroup_7__1 : rule__ActorInstanceConfig__UnorderedGroup_7__Impl ;
     public final void rule__ActorInstanceConfig__UnorderedGroup_7__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7188:1: ( rule__ActorInstanceConfig__UnorderedGroup_7__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7189:2: rule__ActorInstanceConfig__UnorderedGroup_7__Impl
+            // InternalConfig.g:7187:1: ( rule__ActorInstanceConfig__UnorderedGroup_7__Impl )
+            // InternalConfig.g:7188:2: rule__ActorInstanceConfig__UnorderedGroup_7__Impl
             {
-            pushFollow(FOLLOW_rule__ActorInstanceConfig__UnorderedGroup_7__Impl_in_rule__ActorInstanceConfig__UnorderedGroup_7__114669);
+            pushFollow(FOLLOW_2);
             rule__ActorInstanceConfig__UnorderedGroup_7__Impl();
 
             state._fsp--;
@@ -20592,34 +20580,31 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClassConfig__UnorderedGroup_3"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7200:1: rule__ProtocolClassConfig__UnorderedGroup_3 : ( rule__ProtocolClassConfig__UnorderedGroup_3__0 )? ;
+    // InternalConfig.g:7199:1: rule__ProtocolClassConfig__UnorderedGroup_3 : ( rule__ProtocolClassConfig__UnorderedGroup_3__0 )? ;
     public final void rule__ProtocolClassConfig__UnorderedGroup_3() throws RecognitionException {
 
             	int stackSize = keepStackSize();
         		getUnorderedGroupHelper().enter(grammarAccess.getProtocolClassConfigAccess().getUnorderedGroup_3());
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7205:1: ( ( rule__ProtocolClassConfig__UnorderedGroup_3__0 )? )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7206:2: ( rule__ProtocolClassConfig__UnorderedGroup_3__0 )?
+            // InternalConfig.g:7204:1: ( ( rule__ProtocolClassConfig__UnorderedGroup_3__0 )? )
+            // InternalConfig.g:7205:2: ( rule__ProtocolClassConfig__UnorderedGroup_3__0 )?
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7206:2: ( rule__ProtocolClassConfig__UnorderedGroup_3__0 )?
+            // InternalConfig.g:7205:2: ( rule__ProtocolClassConfig__UnorderedGroup_3__0 )?
             int alt54=2;
             int LA54_0 = input.LA(1);
 
-            if ( LA54_0 ==39 && getUnorderedGroupHelper().canSelect(grammarAccess.getProtocolClassConfigAccess().getUnorderedGroup_3(), 0) ) {
-                alt54=1;
-            }
-            else if ( LA54_0 ==12 && getUnorderedGroupHelper().canSelect(grammarAccess.getProtocolClassConfigAccess().getUnorderedGroup_3(), 1) ) {
+            if ( LA54_0 == 39 && getUnorderedGroupHelper().canSelect(grammarAccess.getProtocolClassConfigAccess().getUnorderedGroup_3(), 0) ) {
                 alt54=1;
             }
-            else if ( LA54_0 ==13 && getUnorderedGroupHelper().canSelect(grammarAccess.getProtocolClassConfigAccess().getUnorderedGroup_3(), 1) ) {
+            else if ( LA54_0 >= 12 && LA54_0 <= 13 && getUnorderedGroupHelper().canSelect(grammarAccess.getProtocolClassConfigAccess().getUnorderedGroup_3(), 1) ) {
                 alt54=1;
             }
             switch (alt54) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:0:0: rule__ProtocolClassConfig__UnorderedGroup_3__0
+                    // InternalConfig.g:7205:2: rule__ProtocolClassConfig__UnorderedGroup_3__0
                     {
-                    pushFollow(FOLLOW_rule__ProtocolClassConfig__UnorderedGroup_3__0_in_rule__ProtocolClassConfig__UnorderedGroup_314697);
+                    pushFollow(FOLLOW_2);
                     rule__ProtocolClassConfig__UnorderedGroup_3__0();
 
                     state._fsp--;
@@ -20650,24 +20635,24 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClassConfig__UnorderedGroup_3__Impl"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7216:1: rule__ProtocolClassConfig__UnorderedGroup_3__Impl : ( ({...}? => ( ( ( rule__ProtocolClassConfig__Group_3_0__0 ) ) ) ) | ({...}? => ( ( ( rule__ProtocolClassConfig__Group_3_1__0 ) ) ) ) ) ;
+    // InternalConfig.g:7215:1: rule__ProtocolClassConfig__UnorderedGroup_3__Impl : ( ({...}? => ( ( ( rule__ProtocolClassConfig__Group_3_0__0 ) ) ) ) | ({...}? => ( ( ( rule__ProtocolClassConfig__Group_3_1__0 ) ) ) ) ) ;
     public final void rule__ProtocolClassConfig__UnorderedGroup_3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         		boolean selected = false;
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7221:1: ( ( ({...}? => ( ( ( rule__ProtocolClassConfig__Group_3_0__0 ) ) ) ) | ({...}? => ( ( ( rule__ProtocolClassConfig__Group_3_1__0 ) ) ) ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7222:3: ( ({...}? => ( ( ( rule__ProtocolClassConfig__Group_3_0__0 ) ) ) ) | ({...}? => ( ( ( rule__ProtocolClassConfig__Group_3_1__0 ) ) ) ) )
+            // InternalConfig.g:7220:1: ( ( ({...}? => ( ( ( rule__ProtocolClassConfig__Group_3_0__0 ) ) ) ) | ({...}? => ( ( ( rule__ProtocolClassConfig__Group_3_1__0 ) ) ) ) ) )
+            // InternalConfig.g:7221:3: ( ({...}? => ( ( ( rule__ProtocolClassConfig__Group_3_0__0 ) ) ) ) | ({...}? => ( ( ( rule__ProtocolClassConfig__Group_3_1__0 ) ) ) ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7222:3: ( ({...}? => ( ( ( rule__ProtocolClassConfig__Group_3_0__0 ) ) ) ) | ({...}? => ( ( ( rule__ProtocolClassConfig__Group_3_1__0 ) ) ) ) )
+            // InternalConfig.g:7221:3: ( ({...}? => ( ( ( rule__ProtocolClassConfig__Group_3_0__0 ) ) ) ) | ({...}? => ( ( ( rule__ProtocolClassConfig__Group_3_1__0 ) ) ) ) )
             int alt55=2;
             int LA55_0 = input.LA(1);
 
-            if ( LA55_0 ==39 && getUnorderedGroupHelper().canSelect(grammarAccess.getProtocolClassConfigAccess().getUnorderedGroup_3(), 0) ) {
+            if ( LA55_0 == 39 && getUnorderedGroupHelper().canSelect(grammarAccess.getProtocolClassConfigAccess().getUnorderedGroup_3(), 0) ) {
                 alt55=1;
             }
-            else if ( LA55_0 >=12 && LA55_0<=13 && getUnorderedGroupHelper().canSelect(grammarAccess.getProtocolClassConfigAccess().getUnorderedGroup_3(), 1) ) {
+            else if ( LA55_0 >= 12 && LA55_0 <= 13 && getUnorderedGroupHelper().canSelect(grammarAccess.getProtocolClassConfigAccess().getUnorderedGroup_3(), 1) ) {
                 alt55=2;
             }
             else {
@@ -20679,30 +20664,30 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
             }
             switch (alt55) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7224:4: ({...}? => ( ( ( rule__ProtocolClassConfig__Group_3_0__0 ) ) ) )
+                    // InternalConfig.g:7223:4: ({...}? => ( ( ( rule__ProtocolClassConfig__Group_3_0__0 ) ) ) )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7224:4: ({...}? => ( ( ( rule__ProtocolClassConfig__Group_3_0__0 ) ) ) )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7225:5: {...}? => ( ( ( rule__ProtocolClassConfig__Group_3_0__0 ) ) )
+                    // InternalConfig.g:7223:4: ({...}? => ( ( ( rule__ProtocolClassConfig__Group_3_0__0 ) ) ) )
+                    // InternalConfig.g:7224:5: {...}? => ( ( ( rule__ProtocolClassConfig__Group_3_0__0 ) ) )
                     {
                     if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getProtocolClassConfigAccess().getUnorderedGroup_3(), 0) ) {
                         if (state.backtracking>0) {state.failed=true; return ;}
                         throw new FailedPredicateException(input, "rule__ProtocolClassConfig__UnorderedGroup_3__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getProtocolClassConfigAccess().getUnorderedGroup_3(), 0)");
                     }
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7225:116: ( ( ( rule__ProtocolClassConfig__Group_3_0__0 ) ) )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7226:6: ( ( rule__ProtocolClassConfig__Group_3_0__0 ) )
+                    // InternalConfig.g:7224:116: ( ( ( rule__ProtocolClassConfig__Group_3_0__0 ) ) )
+                    // InternalConfig.g:7225:6: ( ( rule__ProtocolClassConfig__Group_3_0__0 ) )
                     {
                     getUnorderedGroupHelper().select(grammarAccess.getProtocolClassConfigAccess().getUnorderedGroup_3(), 0);
                     selected = true;
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7232:6: ( ( rule__ProtocolClassConfig__Group_3_0__0 ) )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7234:7: ( rule__ProtocolClassConfig__Group_3_0__0 )
+                    // InternalConfig.g:7231:6: ( ( rule__ProtocolClassConfig__Group_3_0__0 ) )
+                    // InternalConfig.g:7233:7: ( rule__ProtocolClassConfig__Group_3_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getProtocolClassConfigAccess().getGroup_3_0()); 
                     }
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7235:7: ( rule__ProtocolClassConfig__Group_3_0__0 )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7235:8: rule__ProtocolClassConfig__Group_3_0__0
+                    // InternalConfig.g:7234:7: ( rule__ProtocolClassConfig__Group_3_0__0 )
+                    // InternalConfig.g:7234:8: rule__ProtocolClassConfig__Group_3_0__0
                     {
-                    pushFollow(FOLLOW_rule__ProtocolClassConfig__Group_3_0__0_in_rule__ProtocolClassConfig__UnorderedGroup_3__Impl14784);
+                    pushFollow(FOLLOW_2);
                     rule__ProtocolClassConfig__Group_3_0__0();
 
                     state._fsp--;
@@ -20726,30 +20711,30 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7241:4: ({...}? => ( ( ( rule__ProtocolClassConfig__Group_3_1__0 ) ) ) )
+                    // InternalConfig.g:7240:4: ({...}? => ( ( ( rule__ProtocolClassConfig__Group_3_1__0 ) ) ) )
                     {
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7241:4: ({...}? => ( ( ( rule__ProtocolClassConfig__Group_3_1__0 ) ) ) )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7242:5: {...}? => ( ( ( rule__ProtocolClassConfig__Group_3_1__0 ) ) )
+                    // InternalConfig.g:7240:4: ({...}? => ( ( ( rule__ProtocolClassConfig__Group_3_1__0 ) ) ) )
+                    // InternalConfig.g:7241:5: {...}? => ( ( ( rule__ProtocolClassConfig__Group_3_1__0 ) ) )
                     {
                     if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getProtocolClassConfigAccess().getUnorderedGroup_3(), 1) ) {
                         if (state.backtracking>0) {state.failed=true; return ;}
                         throw new FailedPredicateException(input, "rule__ProtocolClassConfig__UnorderedGroup_3__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getProtocolClassConfigAccess().getUnorderedGroup_3(), 1)");
                     }
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7242:116: ( ( ( rule__ProtocolClassConfig__Group_3_1__0 ) ) )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7243:6: ( ( rule__ProtocolClassConfig__Group_3_1__0 ) )
+                    // InternalConfig.g:7241:116: ( ( ( rule__ProtocolClassConfig__Group_3_1__0 ) ) )
+                    // InternalConfig.g:7242:6: ( ( rule__ProtocolClassConfig__Group_3_1__0 ) )
                     {
                     getUnorderedGroupHelper().select(grammarAccess.getProtocolClassConfigAccess().getUnorderedGroup_3(), 1);
                     selected = true;
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7249:6: ( ( rule__ProtocolClassConfig__Group_3_1__0 ) )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7251:7: ( rule__ProtocolClassConfig__Group_3_1__0 )
+                    // InternalConfig.g:7248:6: ( ( rule__ProtocolClassConfig__Group_3_1__0 ) )
+                    // InternalConfig.g:7250:7: ( rule__ProtocolClassConfig__Group_3_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getProtocolClassConfigAccess().getGroup_3_1()); 
                     }
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7252:7: ( rule__ProtocolClassConfig__Group_3_1__0 )
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7252:8: rule__ProtocolClassConfig__Group_3_1__0
+                    // InternalConfig.g:7251:7: ( rule__ProtocolClassConfig__Group_3_1__0 )
+                    // InternalConfig.g:7251:8: rule__ProtocolClassConfig__Group_3_1__0
                     {
-                    pushFollow(FOLLOW_rule__ProtocolClassConfig__Group_3_1__0_in_rule__ProtocolClassConfig__UnorderedGroup_3__Impl14875);
+                    pushFollow(FOLLOW_2);
                     rule__ProtocolClassConfig__Group_3_1__0();
 
                     state._fsp--;
@@ -20796,38 +20781,35 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClassConfig__UnorderedGroup_3__0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7267:1: rule__ProtocolClassConfig__UnorderedGroup_3__0 : rule__ProtocolClassConfig__UnorderedGroup_3__Impl ( rule__ProtocolClassConfig__UnorderedGroup_3__1 )? ;
+    // InternalConfig.g:7266:1: rule__ProtocolClassConfig__UnorderedGroup_3__0 : rule__ProtocolClassConfig__UnorderedGroup_3__Impl ( rule__ProtocolClassConfig__UnorderedGroup_3__1 )? ;
     public final void rule__ProtocolClassConfig__UnorderedGroup_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7271:1: ( rule__ProtocolClassConfig__UnorderedGroup_3__Impl ( rule__ProtocolClassConfig__UnorderedGroup_3__1 )? )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7272:2: rule__ProtocolClassConfig__UnorderedGroup_3__Impl ( rule__ProtocolClassConfig__UnorderedGroup_3__1 )?
+            // InternalConfig.g:7270:1: ( rule__ProtocolClassConfig__UnorderedGroup_3__Impl ( rule__ProtocolClassConfig__UnorderedGroup_3__1 )? )
+            // InternalConfig.g:7271:2: rule__ProtocolClassConfig__UnorderedGroup_3__Impl ( rule__ProtocolClassConfig__UnorderedGroup_3__1 )?
             {
-            pushFollow(FOLLOW_rule__ProtocolClassConfig__UnorderedGroup_3__Impl_in_rule__ProtocolClassConfig__UnorderedGroup_3__014934);
+            pushFollow(FOLLOW_52);
             rule__ProtocolClassConfig__UnorderedGroup_3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7273:2: ( rule__ProtocolClassConfig__UnorderedGroup_3__1 )?
+            // InternalConfig.g:7272:2: ( rule__ProtocolClassConfig__UnorderedGroup_3__1 )?
             int alt56=2;
             int LA56_0 = input.LA(1);
 
-            if ( LA56_0 ==39 && getUnorderedGroupHelper().canSelect(grammarAccess.getProtocolClassConfigAccess().getUnorderedGroup_3(), 0) ) {
+            if ( LA56_0 == 39 && getUnorderedGroupHelper().canSelect(grammarAccess.getProtocolClassConfigAccess().getUnorderedGroup_3(), 0) ) {
                 alt56=1;
             }
-            else if ( LA56_0 ==12 && getUnorderedGroupHelper().canSelect(grammarAccess.getProtocolClassConfigAccess().getUnorderedGroup_3(), 1) ) {
-                alt56=1;
-            }
-            else if ( LA56_0 ==13 && getUnorderedGroupHelper().canSelect(grammarAccess.getProtocolClassConfigAccess().getUnorderedGroup_3(), 1) ) {
+            else if ( LA56_0 >= 12 && LA56_0 <= 13 && getUnorderedGroupHelper().canSelect(grammarAccess.getProtocolClassConfigAccess().getUnorderedGroup_3(), 1) ) {
                 alt56=1;
             }
             switch (alt56) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:0:0: rule__ProtocolClassConfig__UnorderedGroup_3__1
+                    // InternalConfig.g:7272:2: rule__ProtocolClassConfig__UnorderedGroup_3__1
                     {
-                    pushFollow(FOLLOW_rule__ProtocolClassConfig__UnorderedGroup_3__1_in_rule__ProtocolClassConfig__UnorderedGroup_3__014937);
+                    pushFollow(FOLLOW_2);
                     rule__ProtocolClassConfig__UnorderedGroup_3__1();
 
                     state._fsp--;
@@ -20857,16 +20839,16 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClassConfig__UnorderedGroup_3__1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7280:1: rule__ProtocolClassConfig__UnorderedGroup_3__1 : rule__ProtocolClassConfig__UnorderedGroup_3__Impl ;
+    // InternalConfig.g:7279:1: rule__ProtocolClassConfig__UnorderedGroup_3__1 : rule__ProtocolClassConfig__UnorderedGroup_3__Impl ;
     public final void rule__ProtocolClassConfig__UnorderedGroup_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7284:1: ( rule__ProtocolClassConfig__UnorderedGroup_3__Impl )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7285:2: rule__ProtocolClassConfig__UnorderedGroup_3__Impl
+            // InternalConfig.g:7283:1: ( rule__ProtocolClassConfig__UnorderedGroup_3__Impl )
+            // InternalConfig.g:7284:2: rule__ProtocolClassConfig__UnorderedGroup_3__Impl
             {
-            pushFollow(FOLLOW_rule__ProtocolClassConfig__UnorderedGroup_3__Impl_in_rule__ProtocolClassConfig__UnorderedGroup_3__114962);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClassConfig__UnorderedGroup_3__Impl();
 
             state._fsp--;
@@ -20890,22 +20872,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ConfigModel__NameAssignment_1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7296:1: rule__ConfigModel__NameAssignment_1 : ( ruleFQN ) ;
+    // InternalConfig.g:7295:1: rule__ConfigModel__NameAssignment_1 : ( ruleFQN ) ;
     public final void rule__ConfigModel__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7300:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7301:1: ( ruleFQN )
+            // InternalConfig.g:7299:1: ( ( ruleFQN ) )
+            // InternalConfig.g:7300:1: ( ruleFQN )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7301:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7302:1: ruleFQN
+            // InternalConfig.g:7300:1: ( ruleFQN )
+            // InternalConfig.g:7301:1: ruleFQN
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfigModelAccess().getNameFQNParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleFQN_in_rule__ConfigModel__NameAssignment_114994);
+            pushFollow(FOLLOW_2);
             ruleFQN();
 
             state._fsp--;
@@ -20935,22 +20917,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ConfigModel__ImportsAssignment_3"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7311:1: rule__ConfigModel__ImportsAssignment_3 : ( ruleImport ) ;
+    // InternalConfig.g:7310:1: rule__ConfigModel__ImportsAssignment_3 : ( ruleImport ) ;
     public final void rule__ConfigModel__ImportsAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7315:1: ( ( ruleImport ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7316:1: ( ruleImport )
+            // InternalConfig.g:7314:1: ( ( ruleImport ) )
+            // InternalConfig.g:7315:1: ( ruleImport )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7316:1: ( ruleImport )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7317:1: ruleImport
+            // InternalConfig.g:7315:1: ( ruleImport )
+            // InternalConfig.g:7316:1: ruleImport
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfigModelAccess().getImportsImportParserRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleImport_in_rule__ConfigModel__ImportsAssignment_315025);
+            pushFollow(FOLLOW_2);
             ruleImport();
 
             state._fsp--;
@@ -20980,22 +20962,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ConfigModel__ConfigElementsAssignment_4"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7326:1: rule__ConfigModel__ConfigElementsAssignment_4 : ( ruleConfigElement ) ;
+    // InternalConfig.g:7325:1: rule__ConfigModel__ConfigElementsAssignment_4 : ( ruleConfigElement ) ;
     public final void rule__ConfigModel__ConfigElementsAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7330:1: ( ( ruleConfigElement ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7331:1: ( ruleConfigElement )
+            // InternalConfig.g:7329:1: ( ( ruleConfigElement ) )
+            // InternalConfig.g:7330:1: ( ruleConfigElement )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7331:1: ( ruleConfigElement )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7332:1: ruleConfigElement
+            // InternalConfig.g:7330:1: ( ruleConfigElement )
+            // InternalConfig.g:7331:1: ruleConfigElement
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfigModelAccess().getConfigElementsConfigElementParserRuleCall_4_0()); 
             }
-            pushFollow(FOLLOW_ruleConfigElement_in_rule__ConfigModel__ConfigElementsAssignment_415056);
+            pushFollow(FOLLOW_2);
             ruleConfigElement();
 
             state._fsp--;
@@ -21025,28 +21007,28 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemConfig__RootAssignment_1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7341:1: rule__SubSystemConfig__RootAssignment_1 : ( ( ruleFQN ) ) ;
+    // InternalConfig.g:7340:1: rule__SubSystemConfig__RootAssignment_1 : ( ( ruleFQN ) ) ;
     public final void rule__SubSystemConfig__RootAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7345:1: ( ( ( ruleFQN ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7346:1: ( ( ruleFQN ) )
+            // InternalConfig.g:7344:1: ( ( ( ruleFQN ) ) )
+            // InternalConfig.g:7345:1: ( ( ruleFQN ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7346:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7347:1: ( ruleFQN )
+            // InternalConfig.g:7345:1: ( ( ruleFQN ) )
+            // InternalConfig.g:7346:1: ( ruleFQN )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSubSystemConfigAccess().getRootLogicalSystemCrossReference_1_0()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7348:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7349:1: ruleFQN
+            // InternalConfig.g:7347:1: ( ruleFQN )
+            // InternalConfig.g:7348:1: ruleFQN
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSubSystemConfigAccess().getRootLogicalSystemFQNParserRuleCall_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleFQN_in_rule__SubSystemConfig__RootAssignment_115091);
+            pushFollow(FOLLOW_2);
             ruleFQN();
 
             state._fsp--;
@@ -21082,28 +21064,28 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemConfig__SubSystemAssignment_3"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7360:1: rule__SubSystemConfig__SubSystemAssignment_3 : ( ( RULE_ID ) ) ;
+    // InternalConfig.g:7359:1: rule__SubSystemConfig__SubSystemAssignment_3 : ( ( RULE_ID ) ) ;
     public final void rule__SubSystemConfig__SubSystemAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7364:1: ( ( ( RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7365:1: ( ( RULE_ID ) )
+            // InternalConfig.g:7363:1: ( ( ( RULE_ID ) ) )
+            // InternalConfig.g:7364:1: ( ( RULE_ID ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7365:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7366:1: ( RULE_ID )
+            // InternalConfig.g:7364:1: ( ( RULE_ID ) )
+            // InternalConfig.g:7365:1: ( RULE_ID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSubSystemConfigAccess().getSubSystemSubSystemRefCrossReference_3_0()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7367:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7368:1: RULE_ID
+            // InternalConfig.g:7366:1: ( RULE_ID )
+            // InternalConfig.g:7367:1: RULE_ID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSubSystemConfigAccess().getSubSystemSubSystemRefIDTerminalRuleCall_3_0_1()); 
             }
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__SubSystemConfig__SubSystemAssignment_315130); if (state.failed) return ;
+            match(input,RULE_ID,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSubSystemConfigAccess().getSubSystemSubSystemRefIDTerminalRuleCall_3_0_1()); 
             }
@@ -21135,22 +21117,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemConfig__DynConfigAssignment_5"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7379:1: rule__SubSystemConfig__DynConfigAssignment_5 : ( ruleDynamicConfig ) ;
+    // InternalConfig.g:7378:1: rule__SubSystemConfig__DynConfigAssignment_5 : ( ruleDynamicConfig ) ;
     public final void rule__SubSystemConfig__DynConfigAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7383:1: ( ( ruleDynamicConfig ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7384:1: ( ruleDynamicConfig )
+            // InternalConfig.g:7382:1: ( ( ruleDynamicConfig ) )
+            // InternalConfig.g:7383:1: ( ruleDynamicConfig )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7384:1: ( ruleDynamicConfig )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7385:1: ruleDynamicConfig
+            // InternalConfig.g:7383:1: ( ruleDynamicConfig )
+            // InternalConfig.g:7384:1: ruleDynamicConfig
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSubSystemConfigAccess().getDynConfigDynamicConfigParserRuleCall_5_0()); 
             }
-            pushFollow(FOLLOW_ruleDynamicConfig_in_rule__SubSystemConfig__DynConfigAssignment_515165);
+            pushFollow(FOLLOW_2);
             ruleDynamicConfig();
 
             state._fsp--;
@@ -21180,22 +21162,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DynamicConfig__FilePathAssignment_2_0_0_1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7394:1: rule__DynamicConfig__FilePathAssignment_2_0_0_1 : ( RULE_STRING ) ;
+    // InternalConfig.g:7393:1: rule__DynamicConfig__FilePathAssignment_2_0_0_1 : ( RULE_STRING ) ;
     public final void rule__DynamicConfig__FilePathAssignment_2_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7398:1: ( ( RULE_STRING ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7399:1: ( RULE_STRING )
+            // InternalConfig.g:7397:1: ( ( RULE_STRING ) )
+            // InternalConfig.g:7398:1: ( RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7399:1: ( RULE_STRING )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7400:1: RULE_STRING
+            // InternalConfig.g:7398:1: ( RULE_STRING )
+            // InternalConfig.g:7399:1: RULE_STRING
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDynamicConfigAccess().getFilePathSTRINGTerminalRuleCall_2_0_0_1_0()); 
             }
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__DynamicConfig__FilePathAssignment_2_0_0_115196); if (state.failed) return ;
+            match(input,RULE_STRING,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getDynamicConfigAccess().getFilePathSTRINGTerminalRuleCall_2_0_0_1_0()); 
             }
@@ -21221,22 +21203,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DynamicConfig__UserCode1Assignment_2_0_1_0_1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7409:1: rule__DynamicConfig__UserCode1Assignment_2_0_1_0_1 : ( RULE_STRING ) ;
+    // InternalConfig.g:7408:1: rule__DynamicConfig__UserCode1Assignment_2_0_1_0_1 : ( RULE_STRING ) ;
     public final void rule__DynamicConfig__UserCode1Assignment_2_0_1_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7413:1: ( ( RULE_STRING ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7414:1: ( RULE_STRING )
+            // InternalConfig.g:7412:1: ( ( RULE_STRING ) )
+            // InternalConfig.g:7413:1: ( RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7414:1: ( RULE_STRING )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7415:1: RULE_STRING
+            // InternalConfig.g:7413:1: ( RULE_STRING )
+            // InternalConfig.g:7414:1: RULE_STRING
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDynamicConfigAccess().getUserCode1STRINGTerminalRuleCall_2_0_1_0_1_0()); 
             }
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__DynamicConfig__UserCode1Assignment_2_0_1_0_115227); if (state.failed) return ;
+            match(input,RULE_STRING,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getDynamicConfigAccess().getUserCode1STRINGTerminalRuleCall_2_0_1_0_1_0()); 
             }
@@ -21262,22 +21244,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DynamicConfig__UserCode2Assignment_2_0_1_1_1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7424:1: rule__DynamicConfig__UserCode2Assignment_2_0_1_1_1 : ( RULE_STRING ) ;
+    // InternalConfig.g:7423:1: rule__DynamicConfig__UserCode2Assignment_2_0_1_1_1 : ( RULE_STRING ) ;
     public final void rule__DynamicConfig__UserCode2Assignment_2_0_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7428:1: ( ( RULE_STRING ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7429:1: ( RULE_STRING )
+            // InternalConfig.g:7427:1: ( ( RULE_STRING ) )
+            // InternalConfig.g:7428:1: ( RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7429:1: ( RULE_STRING )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7430:1: RULE_STRING
+            // InternalConfig.g:7428:1: ( RULE_STRING )
+            // InternalConfig.g:7429:1: RULE_STRING
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDynamicConfigAccess().getUserCode2STRINGTerminalRuleCall_2_0_1_1_1_0()); 
             }
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__DynamicConfig__UserCode2Assignment_2_0_1_1_115258); if (state.failed) return ;
+            match(input,RULE_STRING,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getDynamicConfigAccess().getUserCode2STRINGTerminalRuleCall_2_0_1_1_1_0()); 
             }
@@ -21303,22 +21285,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DynamicConfig__PollingAssignment_2_1_1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7439:1: rule__DynamicConfig__PollingAssignment_2_1_1 : ( ruleTIME ) ;
+    // InternalConfig.g:7438:1: rule__DynamicConfig__PollingAssignment_2_1_1 : ( ruleTIME ) ;
     public final void rule__DynamicConfig__PollingAssignment_2_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7443:1: ( ( ruleTIME ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7444:1: ( ruleTIME )
+            // InternalConfig.g:7442:1: ( ( ruleTIME ) )
+            // InternalConfig.g:7443:1: ( ruleTIME )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7444:1: ( ruleTIME )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7445:1: ruleTIME
+            // InternalConfig.g:7443:1: ( ruleTIME )
+            // InternalConfig.g:7444:1: ruleTIME
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDynamicConfigAccess().getPollingTIMEParserRuleCall_2_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleTIME_in_rule__DynamicConfig__PollingAssignment_2_1_115289);
+            pushFollow(FOLLOW_2);
             ruleTIME();
 
             state._fsp--;
@@ -21348,28 +21330,28 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClassConfig__ActorAssignment_1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7454:1: rule__ActorClassConfig__ActorAssignment_1 : ( ( ruleFQN ) ) ;
+    // InternalConfig.g:7453:1: rule__ActorClassConfig__ActorAssignment_1 : ( ( ruleFQN ) ) ;
     public final void rule__ActorClassConfig__ActorAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7458:1: ( ( ( ruleFQN ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7459:1: ( ( ruleFQN ) )
+            // InternalConfig.g:7457:1: ( ( ( ruleFQN ) ) )
+            // InternalConfig.g:7458:1: ( ( ruleFQN ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7459:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7460:1: ( ruleFQN )
+            // InternalConfig.g:7458:1: ( ( ruleFQN ) )
+            // InternalConfig.g:7459:1: ( ruleFQN )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getActorClassConfigAccess().getActorActorClassCrossReference_1_0()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7461:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7462:1: ruleFQN
+            // InternalConfig.g:7460:1: ( ruleFQN )
+            // InternalConfig.g:7461:1: ruleFQN
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getActorClassConfigAccess().getActorActorClassFQNParserRuleCall_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleFQN_in_rule__ActorClassConfig__ActorAssignment_115324);
+            pushFollow(FOLLOW_2);
             ruleFQN();
 
             state._fsp--;
@@ -21405,22 +21387,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClassConfig__AttributesAssignment_3"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7473:1: rule__ActorClassConfig__AttributesAssignment_3 : ( ruleAttrClassConfig ) ;
+    // InternalConfig.g:7472:1: rule__ActorClassConfig__AttributesAssignment_3 : ( ruleAttrClassConfig ) ;
     public final void rule__ActorClassConfig__AttributesAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7477:1: ( ( ruleAttrClassConfig ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7478:1: ( ruleAttrClassConfig )
+            // InternalConfig.g:7476:1: ( ( ruleAttrClassConfig ) )
+            // InternalConfig.g:7477:1: ( ruleAttrClassConfig )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7478:1: ( ruleAttrClassConfig )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7479:1: ruleAttrClassConfig
+            // InternalConfig.g:7477:1: ( ruleAttrClassConfig )
+            // InternalConfig.g:7478:1: ruleAttrClassConfig
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getActorClassConfigAccess().getAttributesAttrClassConfigParserRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleAttrClassConfig_in_rule__ActorClassConfig__AttributesAssignment_315359);
+            pushFollow(FOLLOW_2);
             ruleAttrClassConfig();
 
             state._fsp--;
@@ -21450,28 +21432,28 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorInstanceConfig__RootAssignment_1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7488:1: rule__ActorInstanceConfig__RootAssignment_1 : ( ( ruleFQN ) ) ;
+    // InternalConfig.g:7487:1: rule__ActorInstanceConfig__RootAssignment_1 : ( ( ruleFQN ) ) ;
     public final void rule__ActorInstanceConfig__RootAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7492:1: ( ( ( ruleFQN ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7493:1: ( ( ruleFQN ) )
+            // InternalConfig.g:7491:1: ( ( ( ruleFQN ) ) )
+            // InternalConfig.g:7492:1: ( ( ruleFQN ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7493:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7494:1: ( ruleFQN )
+            // InternalConfig.g:7492:1: ( ( ruleFQN ) )
+            // InternalConfig.g:7493:1: ( ruleFQN )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getActorInstanceConfigAccess().getRootLogicalSystemCrossReference_1_0()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7495:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7496:1: ruleFQN
+            // InternalConfig.g:7494:1: ( ruleFQN )
+            // InternalConfig.g:7495:1: ruleFQN
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getActorInstanceConfigAccess().getRootLogicalSystemFQNParserRuleCall_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleFQN_in_rule__ActorInstanceConfig__RootAssignment_115394);
+            pushFollow(FOLLOW_2);
             ruleFQN();
 
             state._fsp--;
@@ -21507,28 +21489,28 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorInstanceConfig__SubSystemAssignment_3"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7507:1: rule__ActorInstanceConfig__SubSystemAssignment_3 : ( ( RULE_ID ) ) ;
+    // InternalConfig.g:7506:1: rule__ActorInstanceConfig__SubSystemAssignment_3 : ( ( RULE_ID ) ) ;
     public final void rule__ActorInstanceConfig__SubSystemAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7511:1: ( ( ( RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7512:1: ( ( RULE_ID ) )
+            // InternalConfig.g:7510:1: ( ( ( RULE_ID ) ) )
+            // InternalConfig.g:7511:1: ( ( RULE_ID ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7512:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7513:1: ( RULE_ID )
+            // InternalConfig.g:7511:1: ( ( RULE_ID ) )
+            // InternalConfig.g:7512:1: ( RULE_ID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getActorInstanceConfigAccess().getSubSystemSubSystemRefCrossReference_3_0()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7514:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7515:1: RULE_ID
+            // InternalConfig.g:7513:1: ( RULE_ID )
+            // InternalConfig.g:7514:1: RULE_ID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getActorInstanceConfigAccess().getSubSystemSubSystemRefIDTerminalRuleCall_3_0_1()); 
             }
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__ActorInstanceConfig__SubSystemAssignment_315433); if (state.failed) return ;
+            match(input,RULE_ID,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getActorInstanceConfigAccess().getSubSystemSubSystemRefIDTerminalRuleCall_3_0_1()); 
             }
@@ -21560,22 +21542,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorInstanceConfig__PathAssignment_5"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7526:1: rule__ActorInstanceConfig__PathAssignment_5 : ( ruleRefPath ) ;
+    // InternalConfig.g:7525:1: rule__ActorInstanceConfig__PathAssignment_5 : ( ruleRefPath ) ;
     public final void rule__ActorInstanceConfig__PathAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7530:1: ( ( ruleRefPath ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7531:1: ( ruleRefPath )
+            // InternalConfig.g:7529:1: ( ( ruleRefPath ) )
+            // InternalConfig.g:7530:1: ( ruleRefPath )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7531:1: ( ruleRefPath )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7532:1: ruleRefPath
+            // InternalConfig.g:7530:1: ( ruleRefPath )
+            // InternalConfig.g:7531:1: ruleRefPath
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getActorInstanceConfigAccess().getPathRefPathParserRuleCall_5_0()); 
             }
-            pushFollow(FOLLOW_ruleRefPath_in_rule__ActorInstanceConfig__PathAssignment_515468);
+            pushFollow(FOLLOW_2);
             ruleRefPath();
 
             state._fsp--;
@@ -21605,22 +21587,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorInstanceConfig__AttributesAssignment_7_0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7541:1: rule__ActorInstanceConfig__AttributesAssignment_7_0 : ( ruleAttrInstanceConfig ) ;
+    // InternalConfig.g:7540:1: rule__ActorInstanceConfig__AttributesAssignment_7_0 : ( ruleAttrInstanceConfig ) ;
     public final void rule__ActorInstanceConfig__AttributesAssignment_7_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7545:1: ( ( ruleAttrInstanceConfig ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7546:1: ( ruleAttrInstanceConfig )
+            // InternalConfig.g:7544:1: ( ( ruleAttrInstanceConfig ) )
+            // InternalConfig.g:7545:1: ( ruleAttrInstanceConfig )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7546:1: ( ruleAttrInstanceConfig )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7547:1: ruleAttrInstanceConfig
+            // InternalConfig.g:7545:1: ( ruleAttrInstanceConfig )
+            // InternalConfig.g:7546:1: ruleAttrInstanceConfig
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getActorInstanceConfigAccess().getAttributesAttrInstanceConfigParserRuleCall_7_0_0()); 
             }
-            pushFollow(FOLLOW_ruleAttrInstanceConfig_in_rule__ActorInstanceConfig__AttributesAssignment_7_015499);
+            pushFollow(FOLLOW_2);
             ruleAttrInstanceConfig();
 
             state._fsp--;
@@ -21650,22 +21632,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorInstanceConfig__PortsAssignment_7_1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7556:1: rule__ActorInstanceConfig__PortsAssignment_7_1 : ( rulePortInstanceConfig ) ;
+    // InternalConfig.g:7555:1: rule__ActorInstanceConfig__PortsAssignment_7_1 : ( rulePortInstanceConfig ) ;
     public final void rule__ActorInstanceConfig__PortsAssignment_7_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7560:1: ( ( rulePortInstanceConfig ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7561:1: ( rulePortInstanceConfig )
+            // InternalConfig.g:7559:1: ( ( rulePortInstanceConfig ) )
+            // InternalConfig.g:7560:1: ( rulePortInstanceConfig )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7561:1: ( rulePortInstanceConfig )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7562:1: rulePortInstanceConfig
+            // InternalConfig.g:7560:1: ( rulePortInstanceConfig )
+            // InternalConfig.g:7561:1: rulePortInstanceConfig
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getActorInstanceConfigAccess().getPortsPortInstanceConfigParserRuleCall_7_1_0()); 
             }
-            pushFollow(FOLLOW_rulePortInstanceConfig_in_rule__ActorInstanceConfig__PortsAssignment_7_115530);
+            pushFollow(FOLLOW_2);
             rulePortInstanceConfig();
 
             state._fsp--;
@@ -21695,28 +21677,28 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClassConfig__ProtocolAssignment_1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7571:1: rule__ProtocolClassConfig__ProtocolAssignment_1 : ( ( ruleFQN ) ) ;
+    // InternalConfig.g:7570:1: rule__ProtocolClassConfig__ProtocolAssignment_1 : ( ( ruleFQN ) ) ;
     public final void rule__ProtocolClassConfig__ProtocolAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7575:1: ( ( ( ruleFQN ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7576:1: ( ( ruleFQN ) )
+            // InternalConfig.g:7574:1: ( ( ( ruleFQN ) ) )
+            // InternalConfig.g:7575:1: ( ( ruleFQN ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7576:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7577:1: ( ruleFQN )
+            // InternalConfig.g:7575:1: ( ( ruleFQN ) )
+            // InternalConfig.g:7576:1: ( ruleFQN )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getProtocolClassConfigAccess().getProtocolProtocolClassCrossReference_1_0()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7578:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7579:1: ruleFQN
+            // InternalConfig.g:7577:1: ( ruleFQN )
+            // InternalConfig.g:7578:1: ruleFQN
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getProtocolClassConfigAccess().getProtocolProtocolClassFQNParserRuleCall_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleFQN_in_rule__ProtocolClassConfig__ProtocolAssignment_115565);
+            pushFollow(FOLLOW_2);
             ruleFQN();
 
             state._fsp--;
@@ -21752,22 +21734,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClassConfig__RegularAssignment_3_0_1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7590:1: rule__ProtocolClassConfig__RegularAssignment_3_0_1 : ( rulePortClassConfig ) ;
+    // InternalConfig.g:7589:1: rule__ProtocolClassConfig__RegularAssignment_3_0_1 : ( rulePortClassConfig ) ;
     public final void rule__ProtocolClassConfig__RegularAssignment_3_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7594:1: ( ( rulePortClassConfig ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7595:1: ( rulePortClassConfig )
+            // InternalConfig.g:7593:1: ( ( rulePortClassConfig ) )
+            // InternalConfig.g:7594:1: ( rulePortClassConfig )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7595:1: ( rulePortClassConfig )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7596:1: rulePortClassConfig
+            // InternalConfig.g:7594:1: ( rulePortClassConfig )
+            // InternalConfig.g:7595:1: rulePortClassConfig
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getProtocolClassConfigAccess().getRegularPortClassConfigParserRuleCall_3_0_1_0()); 
             }
-            pushFollow(FOLLOW_rulePortClassConfig_in_rule__ProtocolClassConfig__RegularAssignment_3_0_115600);
+            pushFollow(FOLLOW_2);
             rulePortClassConfig();
 
             state._fsp--;
@@ -21797,22 +21779,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClassConfig__ConjugatedAssignment_3_1_1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7605:1: rule__ProtocolClassConfig__ConjugatedAssignment_3_1_1 : ( rulePortClassConfig ) ;
+    // InternalConfig.g:7604:1: rule__ProtocolClassConfig__ConjugatedAssignment_3_1_1 : ( rulePortClassConfig ) ;
     public final void rule__ProtocolClassConfig__ConjugatedAssignment_3_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7609:1: ( ( rulePortClassConfig ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7610:1: ( rulePortClassConfig )
+            // InternalConfig.g:7608:1: ( ( rulePortClassConfig ) )
+            // InternalConfig.g:7609:1: ( rulePortClassConfig )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7610:1: ( rulePortClassConfig )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7611:1: rulePortClassConfig
+            // InternalConfig.g:7609:1: ( rulePortClassConfig )
+            // InternalConfig.g:7610:1: rulePortClassConfig
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getProtocolClassConfigAccess().getConjugatedPortClassConfigParserRuleCall_3_1_1_0()); 
             }
-            pushFollow(FOLLOW_rulePortClassConfig_in_rule__ProtocolClassConfig__ConjugatedAssignment_3_1_115631);
+            pushFollow(FOLLOW_2);
             rulePortClassConfig();
 
             state._fsp--;
@@ -21842,22 +21824,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortClassConfig__AttributesAssignment_3"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7620:1: rule__PortClassConfig__AttributesAssignment_3 : ( ruleAttrClassConfig ) ;
+    // InternalConfig.g:7619:1: rule__PortClassConfig__AttributesAssignment_3 : ( ruleAttrClassConfig ) ;
     public final void rule__PortClassConfig__AttributesAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7624:1: ( ( ruleAttrClassConfig ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7625:1: ( ruleAttrClassConfig )
+            // InternalConfig.g:7623:1: ( ( ruleAttrClassConfig ) )
+            // InternalConfig.g:7624:1: ( ruleAttrClassConfig )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7625:1: ( ruleAttrClassConfig )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7626:1: ruleAttrClassConfig
+            // InternalConfig.g:7624:1: ( ruleAttrClassConfig )
+            // InternalConfig.g:7625:1: ruleAttrClassConfig
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPortClassConfigAccess().getAttributesAttrClassConfigParserRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleAttrClassConfig_in_rule__PortClassConfig__AttributesAssignment_315662);
+            pushFollow(FOLLOW_2);
             ruleAttrClassConfig();
 
             state._fsp--;
@@ -21887,28 +21869,28 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortInstanceConfig__ItemAssignment_1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7635:1: rule__PortInstanceConfig__ItemAssignment_1 : ( ( RULE_ID ) ) ;
+    // InternalConfig.g:7634:1: rule__PortInstanceConfig__ItemAssignment_1 : ( ( RULE_ID ) ) ;
     public final void rule__PortInstanceConfig__ItemAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7639:1: ( ( ( RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7640:1: ( ( RULE_ID ) )
+            // InternalConfig.g:7638:1: ( ( ( RULE_ID ) ) )
+            // InternalConfig.g:7639:1: ( ( RULE_ID ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7640:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7641:1: ( RULE_ID )
+            // InternalConfig.g:7639:1: ( ( RULE_ID ) )
+            // InternalConfig.g:7640:1: ( RULE_ID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPortInstanceConfigAccess().getItemInterfaceItemCrossReference_1_0()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7642:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7643:1: RULE_ID
+            // InternalConfig.g:7641:1: ( RULE_ID )
+            // InternalConfig.g:7642:1: RULE_ID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPortInstanceConfigAccess().getItemInterfaceItemIDTerminalRuleCall_1_0_1()); 
             }
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__PortInstanceConfig__ItemAssignment_115697); if (state.failed) return ;
+            match(input,RULE_ID,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getPortInstanceConfigAccess().getItemInterfaceItemIDTerminalRuleCall_1_0_1()); 
             }
@@ -21940,22 +21922,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortInstanceConfig__AttributesAssignment_3"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7654:1: rule__PortInstanceConfig__AttributesAssignment_3 : ( ruleAttrInstanceConfig ) ;
+    // InternalConfig.g:7653:1: rule__PortInstanceConfig__AttributesAssignment_3 : ( ruleAttrInstanceConfig ) ;
     public final void rule__PortInstanceConfig__AttributesAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7658:1: ( ( ruleAttrInstanceConfig ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7659:1: ( ruleAttrInstanceConfig )
+            // InternalConfig.g:7657:1: ( ( ruleAttrInstanceConfig ) )
+            // InternalConfig.g:7658:1: ( ruleAttrInstanceConfig )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7659:1: ( ruleAttrInstanceConfig )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7660:1: ruleAttrInstanceConfig
+            // InternalConfig.g:7658:1: ( ruleAttrInstanceConfig )
+            // InternalConfig.g:7659:1: ruleAttrInstanceConfig
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPortInstanceConfigAccess().getAttributesAttrInstanceConfigParserRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleAttrInstanceConfig_in_rule__PortInstanceConfig__AttributesAssignment_315732);
+            pushFollow(FOLLOW_2);
             ruleAttrInstanceConfig();
 
             state._fsp--;
@@ -21985,28 +21967,28 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrClassConfig__AttributeAssignment_1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7669:1: rule__AttrClassConfig__AttributeAssignment_1 : ( ( RULE_ID ) ) ;
+    // InternalConfig.g:7668:1: rule__AttrClassConfig__AttributeAssignment_1 : ( ( RULE_ID ) ) ;
     public final void rule__AttrClassConfig__AttributeAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7673:1: ( ( ( RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7674:1: ( ( RULE_ID ) )
+            // InternalConfig.g:7672:1: ( ( ( RULE_ID ) ) )
+            // InternalConfig.g:7673:1: ( ( RULE_ID ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7674:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7675:1: ( RULE_ID )
+            // InternalConfig.g:7673:1: ( ( RULE_ID ) )
+            // InternalConfig.g:7674:1: ( RULE_ID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAttrClassConfigAccess().getAttributeAttributeCrossReference_1_0()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7676:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7677:1: RULE_ID
+            // InternalConfig.g:7675:1: ( RULE_ID )
+            // InternalConfig.g:7676:1: RULE_ID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAttrClassConfigAccess().getAttributeAttributeIDTerminalRuleCall_1_0_1()); 
             }
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__AttrClassConfig__AttributeAssignment_115767); if (state.failed) return ;
+            match(input,RULE_ID,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getAttrClassConfigAccess().getAttributeAttributeIDTerminalRuleCall_1_0_1()); 
             }
@@ -22038,22 +22020,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrClassConfig__ValueAssignment_2_1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7688:1: rule__AttrClassConfig__ValueAssignment_2_1 : ( ruleConfigValueArray ) ;
+    // InternalConfig.g:7687:1: rule__AttrClassConfig__ValueAssignment_2_1 : ( ruleConfigValueArray ) ;
     public final void rule__AttrClassConfig__ValueAssignment_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7692:1: ( ( ruleConfigValueArray ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7693:1: ( ruleConfigValueArray )
+            // InternalConfig.g:7691:1: ( ( ruleConfigValueArray ) )
+            // InternalConfig.g:7692:1: ( ruleConfigValueArray )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7693:1: ( ruleConfigValueArray )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7694:1: ruleConfigValueArray
+            // InternalConfig.g:7692:1: ( ruleConfigValueArray )
+            // InternalConfig.g:7693:1: ruleConfigValueArray
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAttrClassConfigAccess().getValueConfigValueArrayParserRuleCall_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleConfigValueArray_in_rule__AttrClassConfig__ValueAssignment_2_115802);
+            pushFollow(FOLLOW_2);
             ruleConfigValueArray();
 
             state._fsp--;
@@ -22083,22 +22065,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrClassConfig__MinAssignment_3_1_0_2"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7703:1: rule__AttrClassConfig__MinAssignment_3_1_0_2 : ( ruleNumberLiteral ) ;
+    // InternalConfig.g:7702:1: rule__AttrClassConfig__MinAssignment_3_1_0_2 : ( ruleNumberLiteral ) ;
     public final void rule__AttrClassConfig__MinAssignment_3_1_0_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7707:1: ( ( ruleNumberLiteral ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7708:1: ( ruleNumberLiteral )
+            // InternalConfig.g:7706:1: ( ( ruleNumberLiteral ) )
+            // InternalConfig.g:7707:1: ( ruleNumberLiteral )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7708:1: ( ruleNumberLiteral )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7709:1: ruleNumberLiteral
+            // InternalConfig.g:7707:1: ( ruleNumberLiteral )
+            // InternalConfig.g:7708:1: ruleNumberLiteral
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAttrClassConfigAccess().getMinNumberLiteralParserRuleCall_3_1_0_2_0()); 
             }
-            pushFollow(FOLLOW_ruleNumberLiteral_in_rule__AttrClassConfig__MinAssignment_3_1_0_215833);
+            pushFollow(FOLLOW_2);
             ruleNumberLiteral();
 
             state._fsp--;
@@ -22128,22 +22110,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrClassConfig__MaxAssignment_3_1_1_2"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7718:1: rule__AttrClassConfig__MaxAssignment_3_1_1_2 : ( ruleNumberLiteral ) ;
+    // InternalConfig.g:7717:1: rule__AttrClassConfig__MaxAssignment_3_1_1_2 : ( ruleNumberLiteral ) ;
     public final void rule__AttrClassConfig__MaxAssignment_3_1_1_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7722:1: ( ( ruleNumberLiteral ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7723:1: ( ruleNumberLiteral )
+            // InternalConfig.g:7721:1: ( ( ruleNumberLiteral ) )
+            // InternalConfig.g:7722:1: ( ruleNumberLiteral )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7723:1: ( ruleNumberLiteral )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7724:1: ruleNumberLiteral
+            // InternalConfig.g:7722:1: ( ruleNumberLiteral )
+            // InternalConfig.g:7723:1: ruleNumberLiteral
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAttrClassConfigAccess().getMaxNumberLiteralParserRuleCall_3_1_1_2_0()); 
             }
-            pushFollow(FOLLOW_ruleNumberLiteral_in_rule__AttrClassConfig__MaxAssignment_3_1_1_215864);
+            pushFollow(FOLLOW_2);
             ruleNumberLiteral();
 
             state._fsp--;
@@ -22173,22 +22155,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrClassConfig__AttributesAssignment_3_1_2"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7733:1: rule__AttrClassConfig__AttributesAssignment_3_1_2 : ( ruleAttrClassConfig ) ;
+    // InternalConfig.g:7732:1: rule__AttrClassConfig__AttributesAssignment_3_1_2 : ( ruleAttrClassConfig ) ;
     public final void rule__AttrClassConfig__AttributesAssignment_3_1_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7737:1: ( ( ruleAttrClassConfig ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7738:1: ( ruleAttrClassConfig )
+            // InternalConfig.g:7736:1: ( ( ruleAttrClassConfig ) )
+            // InternalConfig.g:7737:1: ( ruleAttrClassConfig )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7738:1: ( ruleAttrClassConfig )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7739:1: ruleAttrClassConfig
+            // InternalConfig.g:7737:1: ( ruleAttrClassConfig )
+            // InternalConfig.g:7738:1: ruleAttrClassConfig
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAttrClassConfigAccess().getAttributesAttrClassConfigParserRuleCall_3_1_2_0()); 
             }
-            pushFollow(FOLLOW_ruleAttrClassConfig_in_rule__AttrClassConfig__AttributesAssignment_3_1_215895);
+            pushFollow(FOLLOW_2);
             ruleAttrClassConfig();
 
             state._fsp--;
@@ -22218,28 +22200,28 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrInstanceConfig__AttributeAssignment_1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7748:1: rule__AttrInstanceConfig__AttributeAssignment_1 : ( ( RULE_ID ) ) ;
+    // InternalConfig.g:7747:1: rule__AttrInstanceConfig__AttributeAssignment_1 : ( ( RULE_ID ) ) ;
     public final void rule__AttrInstanceConfig__AttributeAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7752:1: ( ( ( RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7753:1: ( ( RULE_ID ) )
+            // InternalConfig.g:7751:1: ( ( ( RULE_ID ) ) )
+            // InternalConfig.g:7752:1: ( ( RULE_ID ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7753:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7754:1: ( RULE_ID )
+            // InternalConfig.g:7752:1: ( ( RULE_ID ) )
+            // InternalConfig.g:7753:1: ( RULE_ID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAttrInstanceConfigAccess().getAttributeAttributeCrossReference_1_0()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7755:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7756:1: RULE_ID
+            // InternalConfig.g:7754:1: ( RULE_ID )
+            // InternalConfig.g:7755:1: RULE_ID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAttrInstanceConfigAccess().getAttributeAttributeIDTerminalRuleCall_1_0_1()); 
             }
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__AttrInstanceConfig__AttributeAssignment_115930); if (state.failed) return ;
+            match(input,RULE_ID,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getAttrInstanceConfigAccess().getAttributeAttributeIDTerminalRuleCall_1_0_1()); 
             }
@@ -22271,22 +22253,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrInstanceConfig__ValueAssignment_2_1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7767:1: rule__AttrInstanceConfig__ValueAssignment_2_1 : ( ruleConfigValueArray ) ;
+    // InternalConfig.g:7766:1: rule__AttrInstanceConfig__ValueAssignment_2_1 : ( ruleConfigValueArray ) ;
     public final void rule__AttrInstanceConfig__ValueAssignment_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7771:1: ( ( ruleConfigValueArray ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7772:1: ( ruleConfigValueArray )
+            // InternalConfig.g:7770:1: ( ( ruleConfigValueArray ) )
+            // InternalConfig.g:7771:1: ( ruleConfigValueArray )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7772:1: ( ruleConfigValueArray )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7773:1: ruleConfigValueArray
+            // InternalConfig.g:7771:1: ( ruleConfigValueArray )
+            // InternalConfig.g:7772:1: ruleConfigValueArray
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAttrInstanceConfigAccess().getValueConfigValueArrayParserRuleCall_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleConfigValueArray_in_rule__AttrInstanceConfig__ValueAssignment_2_115965);
+            pushFollow(FOLLOW_2);
             ruleConfigValueArray();
 
             state._fsp--;
@@ -22316,28 +22298,28 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrInstanceConfig__DynConfigAssignment_3_1_0_0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7782:1: rule__AttrInstanceConfig__DynConfigAssignment_3_1_0_0 : ( ( 'dynamic configuration' ) ) ;
+    // InternalConfig.g:7781:1: rule__AttrInstanceConfig__DynConfigAssignment_3_1_0_0 : ( ( 'dynamic configuration' ) ) ;
     public final void rule__AttrInstanceConfig__DynConfigAssignment_3_1_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7786:1: ( ( ( 'dynamic configuration' ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7787:1: ( ( 'dynamic configuration' ) )
+            // InternalConfig.g:7785:1: ( ( ( 'dynamic configuration' ) ) )
+            // InternalConfig.g:7786:1: ( ( 'dynamic configuration' ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7787:1: ( ( 'dynamic configuration' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7788:1: ( 'dynamic configuration' )
+            // InternalConfig.g:7786:1: ( ( 'dynamic configuration' ) )
+            // InternalConfig.g:7787:1: ( 'dynamic configuration' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAttrInstanceConfigAccess().getDynConfigDynamicConfigurationKeyword_3_1_0_0_0()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7789:1: ( 'dynamic configuration' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7790:1: 'dynamic configuration'
+            // InternalConfig.g:7788:1: ( 'dynamic configuration' )
+            // InternalConfig.g:7789:1: 'dynamic configuration'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAttrInstanceConfigAccess().getDynConfigDynamicConfigurationKeyword_3_1_0_0_0()); 
             }
-            match(input,31,FOLLOW_31_in_rule__AttrInstanceConfig__DynConfigAssignment_3_1_0_016001); if (state.failed) return ;
+            match(input,31,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getAttrInstanceConfigAccess().getDynConfigDynamicConfigurationKeyword_3_1_0_0_0()); 
             }
@@ -22369,28 +22351,28 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrInstanceConfig__ReadOnlyAssignment_3_1_0_1_0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7805:1: rule__AttrInstanceConfig__ReadOnlyAssignment_3_1_0_1_0 : ( ( 'read' ) ) ;
+    // InternalConfig.g:7804:1: rule__AttrInstanceConfig__ReadOnlyAssignment_3_1_0_1_0 : ( ( 'read' ) ) ;
     public final void rule__AttrInstanceConfig__ReadOnlyAssignment_3_1_0_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7809:1: ( ( ( 'read' ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7810:1: ( ( 'read' ) )
+            // InternalConfig.g:7808:1: ( ( ( 'read' ) ) )
+            // InternalConfig.g:7809:1: ( ( 'read' ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7810:1: ( ( 'read' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7811:1: ( 'read' )
+            // InternalConfig.g:7809:1: ( ( 'read' ) )
+            // InternalConfig.g:7810:1: ( 'read' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAttrInstanceConfigAccess().getReadOnlyReadKeyword_3_1_0_1_0_0()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7812:1: ( 'read' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7813:1: 'read'
+            // InternalConfig.g:7811:1: ( 'read' )
+            // InternalConfig.g:7812:1: 'read'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAttrInstanceConfigAccess().getReadOnlyReadKeyword_3_1_0_1_0_0()); 
             }
-            match(input,59,FOLLOW_59_in_rule__AttrInstanceConfig__ReadOnlyAssignment_3_1_0_1_016045); if (state.failed) return ;
+            match(input,59,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getAttrInstanceConfigAccess().getReadOnlyReadKeyword_3_1_0_1_0_0()); 
             }
@@ -22422,22 +22404,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AttrInstanceConfig__AttributesAssignment_3_1_1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7828:1: rule__AttrInstanceConfig__AttributesAssignment_3_1_1 : ( ruleAttrInstanceConfig ) ;
+    // InternalConfig.g:7827:1: rule__AttrInstanceConfig__AttributesAssignment_3_1_1 : ( ruleAttrInstanceConfig ) ;
     public final void rule__AttrInstanceConfig__AttributesAssignment_3_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7832:1: ( ( ruleAttrInstanceConfig ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7833:1: ( ruleAttrInstanceConfig )
+            // InternalConfig.g:7831:1: ( ( ruleAttrInstanceConfig ) )
+            // InternalConfig.g:7832:1: ( ruleAttrInstanceConfig )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7833:1: ( ruleAttrInstanceConfig )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7834:1: ruleAttrInstanceConfig
+            // InternalConfig.g:7832:1: ( ruleAttrInstanceConfig )
+            // InternalConfig.g:7833:1: ruleAttrInstanceConfig
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAttrInstanceConfigAccess().getAttributesAttrInstanceConfigParserRuleCall_3_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleAttrInstanceConfig_in_rule__AttrInstanceConfig__AttributesAssignment_3_1_116084);
+            pushFollow(FOLLOW_2);
             ruleAttrInstanceConfig();
 
             state._fsp--;
@@ -22467,22 +22449,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ConfigValueArray__ValuesAssignment_0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7843:1: rule__ConfigValueArray__ValuesAssignment_0 : ( ruleConfigValue ) ;
+    // InternalConfig.g:7842:1: rule__ConfigValueArray__ValuesAssignment_0 : ( ruleConfigValue ) ;
     public final void rule__ConfigValueArray__ValuesAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7847:1: ( ( ruleConfigValue ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7848:1: ( ruleConfigValue )
+            // InternalConfig.g:7846:1: ( ( ruleConfigValue ) )
+            // InternalConfig.g:7847:1: ( ruleConfigValue )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7848:1: ( ruleConfigValue )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7849:1: ruleConfigValue
+            // InternalConfig.g:7847:1: ( ruleConfigValue )
+            // InternalConfig.g:7848:1: ruleConfigValue
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfigValueArrayAccess().getValuesConfigValueParserRuleCall_0_0()); 
             }
-            pushFollow(FOLLOW_ruleConfigValue_in_rule__ConfigValueArray__ValuesAssignment_016115);
+            pushFollow(FOLLOW_2);
             ruleConfigValue();
 
             state._fsp--;
@@ -22512,22 +22494,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ConfigValueArray__ValuesAssignment_1_1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7858:1: rule__ConfigValueArray__ValuesAssignment_1_1 : ( ruleConfigValue ) ;
+    // InternalConfig.g:7857:1: rule__ConfigValueArray__ValuesAssignment_1_1 : ( ruleConfigValue ) ;
     public final void rule__ConfigValueArray__ValuesAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7862:1: ( ( ruleConfigValue ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7863:1: ( ruleConfigValue )
+            // InternalConfig.g:7861:1: ( ( ruleConfigValue ) )
+            // InternalConfig.g:7862:1: ( ruleConfigValue )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7863:1: ( ruleConfigValue )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7864:1: ruleConfigValue
+            // InternalConfig.g:7862:1: ( ruleConfigValue )
+            // InternalConfig.g:7863:1: ruleConfigValue
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfigValueArrayAccess().getValuesConfigValueParserRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleConfigValue_in_rule__ConfigValueArray__ValuesAssignment_1_116146);
+            pushFollow(FOLLOW_2);
             ruleConfigValue();
 
             state._fsp--;
@@ -22557,22 +22539,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__LiteralConfigValue__ValueAssignment"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7873:1: rule__LiteralConfigValue__ValueAssignment : ( ruleLiteral ) ;
+    // InternalConfig.g:7872:1: rule__LiteralConfigValue__ValueAssignment : ( ruleLiteral ) ;
     public final void rule__LiteralConfigValue__ValueAssignment() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7877:1: ( ( ruleLiteral ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7878:1: ( ruleLiteral )
+            // InternalConfig.g:7876:1: ( ( ruleLiteral ) )
+            // InternalConfig.g:7877:1: ( ruleLiteral )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7878:1: ( ruleLiteral )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7879:1: ruleLiteral
+            // InternalConfig.g:7877:1: ( ruleLiteral )
+            // InternalConfig.g:7878:1: ruleLiteral
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLiteralConfigValueAccess().getValueLiteralParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleLiteral_in_rule__LiteralConfigValue__ValueAssignment16177);
+            pushFollow(FOLLOW_2);
             ruleLiteral();
 
             state._fsp--;
@@ -22602,28 +22584,28 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumConfigValue__TypeAssignment_0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7888:1: rule__EnumConfigValue__TypeAssignment_0 : ( ( RULE_ID ) ) ;
+    // InternalConfig.g:7887:1: rule__EnumConfigValue__TypeAssignment_0 : ( ( RULE_ID ) ) ;
     public final void rule__EnumConfigValue__TypeAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7892:1: ( ( ( RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7893:1: ( ( RULE_ID ) )
+            // InternalConfig.g:7891:1: ( ( ( RULE_ID ) ) )
+            // InternalConfig.g:7892:1: ( ( RULE_ID ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7893:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7894:1: ( RULE_ID )
+            // InternalConfig.g:7892:1: ( ( RULE_ID ) )
+            // InternalConfig.g:7893:1: ( RULE_ID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getEnumConfigValueAccess().getTypeEnumerationTypeCrossReference_0_0()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7895:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7896:1: RULE_ID
+            // InternalConfig.g:7894:1: ( RULE_ID )
+            // InternalConfig.g:7895:1: RULE_ID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getEnumConfigValueAccess().getTypeEnumerationTypeIDTerminalRuleCall_0_0_1()); 
             }
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__EnumConfigValue__TypeAssignment_016212); if (state.failed) return ;
+            match(input,RULE_ID,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getEnumConfigValueAccess().getTypeEnumerationTypeIDTerminalRuleCall_0_0_1()); 
             }
@@ -22655,28 +22637,28 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumConfigValue__ValueAssignment_2"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7907:1: rule__EnumConfigValue__ValueAssignment_2 : ( ( RULE_ID ) ) ;
+    // InternalConfig.g:7906:1: rule__EnumConfigValue__ValueAssignment_2 : ( ( RULE_ID ) ) ;
     public final void rule__EnumConfigValue__ValueAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7911:1: ( ( ( RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7912:1: ( ( RULE_ID ) )
+            // InternalConfig.g:7910:1: ( ( ( RULE_ID ) ) )
+            // InternalConfig.g:7911:1: ( ( RULE_ID ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7912:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7913:1: ( RULE_ID )
+            // InternalConfig.g:7911:1: ( ( RULE_ID ) )
+            // InternalConfig.g:7912:1: ( RULE_ID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getEnumConfigValueAccess().getValueEnumLiteralCrossReference_2_0()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7914:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7915:1: RULE_ID
+            // InternalConfig.g:7913:1: ( RULE_ID )
+            // InternalConfig.g:7914:1: RULE_ID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getEnumConfigValueAccess().getValueEnumLiteralIDTerminalRuleCall_2_0_1()); 
             }
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__EnumConfigValue__ValueAssignment_216251); if (state.failed) return ;
+            match(input,RULE_ID,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getEnumConfigValueAccess().getValueEnumLiteralIDTerminalRuleCall_2_0_1()); 
             }
@@ -22708,22 +22690,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefPath__RefsAssignment_0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7926:1: rule__RefPath__RefsAssignment_0 : ( ruleRefSegment ) ;
+    // InternalConfig.g:7925:1: rule__RefPath__RefsAssignment_0 : ( ruleRefSegment ) ;
     public final void rule__RefPath__RefsAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7930:1: ( ( ruleRefSegment ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7931:1: ( ruleRefSegment )
+            // InternalConfig.g:7929:1: ( ( ruleRefSegment ) )
+            // InternalConfig.g:7930:1: ( ruleRefSegment )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7931:1: ( ruleRefSegment )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7932:1: ruleRefSegment
+            // InternalConfig.g:7930:1: ( ruleRefSegment )
+            // InternalConfig.g:7931:1: ruleRefSegment
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRefPathAccess().getRefsRefSegmentParserRuleCall_0_0()); 
             }
-            pushFollow(FOLLOW_ruleRefSegment_in_rule__RefPath__RefsAssignment_016286);
+            pushFollow(FOLLOW_2);
             ruleRefSegment();
 
             state._fsp--;
@@ -22753,22 +22735,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefPath__RefsAssignment_1_1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7941:1: rule__RefPath__RefsAssignment_1_1 : ( ruleRefSegment ) ;
+    // InternalConfig.g:7940:1: rule__RefPath__RefsAssignment_1_1 : ( ruleRefSegment ) ;
     public final void rule__RefPath__RefsAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7945:1: ( ( ruleRefSegment ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7946:1: ( ruleRefSegment )
+            // InternalConfig.g:7944:1: ( ( ruleRefSegment ) )
+            // InternalConfig.g:7945:1: ( ruleRefSegment )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7946:1: ( ruleRefSegment )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7947:1: ruleRefSegment
+            // InternalConfig.g:7945:1: ( ruleRefSegment )
+            // InternalConfig.g:7946:1: ruleRefSegment
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRefPathAccess().getRefsRefSegmentParserRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleRefSegment_in_rule__RefPath__RefsAssignment_1_116317);
+            pushFollow(FOLLOW_2);
             ruleRefSegment();
 
             state._fsp--;
@@ -22798,22 +22780,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefSegment__RefAssignment_0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7956:1: rule__RefSegment__RefAssignment_0 : ( RULE_ID ) ;
+    // InternalConfig.g:7955:1: rule__RefSegment__RefAssignment_0 : ( RULE_ID ) ;
     public final void rule__RefSegment__RefAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7960:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7961:1: ( RULE_ID )
+            // InternalConfig.g:7959:1: ( ( RULE_ID ) )
+            // InternalConfig.g:7960:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7961:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7962:1: RULE_ID
+            // InternalConfig.g:7960:1: ( RULE_ID )
+            // InternalConfig.g:7961:1: RULE_ID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRefSegmentAccess().getRefIDTerminalRuleCall_0_0()); 
             }
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__RefSegment__RefAssignment_016348); if (state.failed) return ;
+            match(input,RULE_ID,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getRefSegmentAccess().getRefIDTerminalRuleCall_0_0()); 
             }
@@ -22839,22 +22821,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefSegment__IdxAssignment_1_1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7971:1: rule__RefSegment__IdxAssignment_1_1 : ( RULE_INT ) ;
+    // InternalConfig.g:7970:1: rule__RefSegment__IdxAssignment_1_1 : ( RULE_INT ) ;
     public final void rule__RefSegment__IdxAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7975:1: ( ( RULE_INT ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7976:1: ( RULE_INT )
+            // InternalConfig.g:7974:1: ( ( RULE_INT ) )
+            // InternalConfig.g:7975:1: ( RULE_INT )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7976:1: ( RULE_INT )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7977:1: RULE_INT
+            // InternalConfig.g:7975:1: ( RULE_INT )
+            // InternalConfig.g:7976:1: RULE_INT
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRefSegmentAccess().getIdxINTTerminalRuleCall_1_1_0()); 
             }
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__RefSegment__IdxAssignment_1_116379); if (state.failed) return ;
+            match(input,RULE_INT,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getRefSegmentAccess().getIdxINTTerminalRuleCall_1_1_0()); 
             }
@@ -22880,22 +22862,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__KeyValue__KeyAssignment_0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7989:1: rule__KeyValue__KeyAssignment_0 : ( RULE_ID ) ;
+    // InternalConfig.g:7988:1: rule__KeyValue__KeyAssignment_0 : ( RULE_ID ) ;
     public final void rule__KeyValue__KeyAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7993:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7994:1: ( RULE_ID )
+            // InternalConfig.g:7992:1: ( ( RULE_ID ) )
+            // InternalConfig.g:7993:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7994:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7995:1: RULE_ID
+            // InternalConfig.g:7993:1: ( RULE_ID )
+            // InternalConfig.g:7994:1: RULE_ID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getKeyValueAccess().getKeyIDTerminalRuleCall_0_0()); 
             }
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__KeyValue__KeyAssignment_016413); if (state.failed) return ;
+            match(input,RULE_ID,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getKeyValueAccess().getKeyIDTerminalRuleCall_0_0()); 
             }
@@ -22921,22 +22903,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__KeyValue__ValueAssignment_2"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8004:1: rule__KeyValue__ValueAssignment_2 : ( ruleLiteral ) ;
+    // InternalConfig.g:8003:1: rule__KeyValue__ValueAssignment_2 : ( ruleLiteral ) ;
     public final void rule__KeyValue__ValueAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8008:1: ( ( ruleLiteral ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8009:1: ( ruleLiteral )
+            // InternalConfig.g:8007:1: ( ( ruleLiteral ) )
+            // InternalConfig.g:8008:1: ( ruleLiteral )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8009:1: ( ruleLiteral )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8010:1: ruleLiteral
+            // InternalConfig.g:8008:1: ( ruleLiteral )
+            // InternalConfig.g:8009:1: ruleLiteral
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getKeyValueAccess().getValueLiteralParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleLiteral_in_rule__KeyValue__ValueAssignment_216444);
+            pushFollow(FOLLOW_2);
             ruleLiteral();
 
             state._fsp--;
@@ -22966,28 +22948,28 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__OptionalAssignment_0_0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8025:1: rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 : ( ( 'optional' ) ) ;
+    // InternalConfig.g:8024:1: rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 : ( ( 'optional' ) ) ;
     public final void rule__SimpleAnnotationAttribute__OptionalAssignment_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8029:1: ( ( ( 'optional' ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8030:1: ( ( 'optional' ) )
+            // InternalConfig.g:8028:1: ( ( ( 'optional' ) ) )
+            // InternalConfig.g:8029:1: ( ( 'optional' ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8030:1: ( ( 'optional' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8031:1: ( 'optional' )
+            // InternalConfig.g:8029:1: ( ( 'optional' ) )
+            // InternalConfig.g:8030:1: ( 'optional' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSimpleAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8032:1: ( 'optional' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8033:1: 'optional'
+            // InternalConfig.g:8031:1: ( 'optional' )
+            // InternalConfig.g:8032:1: 'optional'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSimpleAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0()); 
             }
-            match(input,60,FOLLOW_60_in_rule__SimpleAnnotationAttribute__OptionalAssignment_0_016486); if (state.failed) return ;
+            match(input,60,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSimpleAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0()); 
             }
@@ -23019,22 +23001,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__NameAssignment_2"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8048:1: rule__SimpleAnnotationAttribute__NameAssignment_2 : ( RULE_ID ) ;
+    // InternalConfig.g:8047:1: rule__SimpleAnnotationAttribute__NameAssignment_2 : ( RULE_ID ) ;
     public final void rule__SimpleAnnotationAttribute__NameAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8052:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8053:1: ( RULE_ID )
+            // InternalConfig.g:8051:1: ( ( RULE_ID ) )
+            // InternalConfig.g:8052:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8053:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8054:1: RULE_ID
+            // InternalConfig.g:8052:1: ( RULE_ID )
+            // InternalConfig.g:8053:1: RULE_ID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSimpleAnnotationAttributeAccess().getNameIDTerminalRuleCall_2_0()); 
             }
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__SimpleAnnotationAttribute__NameAssignment_216525); if (state.failed) return ;
+            match(input,RULE_ID,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSimpleAnnotationAttributeAccess().getNameIDTerminalRuleCall_2_0()); 
             }
@@ -23060,22 +23042,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__TypeAssignment_4"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8063:1: rule__SimpleAnnotationAttribute__TypeAssignment_4 : ( ruleLiteralType ) ;
+    // InternalConfig.g:8062:1: rule__SimpleAnnotationAttribute__TypeAssignment_4 : ( ruleLiteralType ) ;
     public final void rule__SimpleAnnotationAttribute__TypeAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8067:1: ( ( ruleLiteralType ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8068:1: ( ruleLiteralType )
+            // InternalConfig.g:8066:1: ( ( ruleLiteralType ) )
+            // InternalConfig.g:8067:1: ( ruleLiteralType )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8068:1: ( ruleLiteralType )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8069:1: ruleLiteralType
+            // InternalConfig.g:8067:1: ( ruleLiteralType )
+            // InternalConfig.g:8068:1: ruleLiteralType
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSimpleAnnotationAttributeAccess().getTypeLiteralTypeEnumRuleCall_4_0()); 
             }
-            pushFollow(FOLLOW_ruleLiteralType_in_rule__SimpleAnnotationAttribute__TypeAssignment_416556);
+            pushFollow(FOLLOW_2);
             ruleLiteralType();
 
             state._fsp--;
@@ -23105,28 +23087,28 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__OptionalAssignment_0_0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8078:1: rule__EnumAnnotationAttribute__OptionalAssignment_0_0 : ( ( 'optional' ) ) ;
+    // InternalConfig.g:8077:1: rule__EnumAnnotationAttribute__OptionalAssignment_0_0 : ( ( 'optional' ) ) ;
     public final void rule__EnumAnnotationAttribute__OptionalAssignment_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8082:1: ( ( ( 'optional' ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8083:1: ( ( 'optional' ) )
+            // InternalConfig.g:8081:1: ( ( ( 'optional' ) ) )
+            // InternalConfig.g:8082:1: ( ( 'optional' ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8083:1: ( ( 'optional' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8084:1: ( 'optional' )
+            // InternalConfig.g:8082:1: ( ( 'optional' ) )
+            // InternalConfig.g:8083:1: ( 'optional' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getEnumAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8085:1: ( 'optional' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8086:1: 'optional'
+            // InternalConfig.g:8084:1: ( 'optional' )
+            // InternalConfig.g:8085:1: 'optional'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getEnumAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0()); 
             }
-            match(input,60,FOLLOW_60_in_rule__EnumAnnotationAttribute__OptionalAssignment_0_016592); if (state.failed) return ;
+            match(input,60,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getEnumAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0()); 
             }
@@ -23158,22 +23140,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__NameAssignment_2"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8101:1: rule__EnumAnnotationAttribute__NameAssignment_2 : ( RULE_ID ) ;
+    // InternalConfig.g:8100:1: rule__EnumAnnotationAttribute__NameAssignment_2 : ( RULE_ID ) ;
     public final void rule__EnumAnnotationAttribute__NameAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8105:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8106:1: ( RULE_ID )
+            // InternalConfig.g:8104:1: ( ( RULE_ID ) )
+            // InternalConfig.g:8105:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8106:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8107:1: RULE_ID
+            // InternalConfig.g:8105:1: ( RULE_ID )
+            // InternalConfig.g:8106:1: RULE_ID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getEnumAnnotationAttributeAccess().getNameIDTerminalRuleCall_2_0()); 
             }
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__EnumAnnotationAttribute__NameAssignment_216631); if (state.failed) return ;
+            match(input,RULE_ID,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getEnumAnnotationAttributeAccess().getNameIDTerminalRuleCall_2_0()); 
             }
@@ -23199,22 +23181,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__ValuesAssignment_5"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8116:1: rule__EnumAnnotationAttribute__ValuesAssignment_5 : ( RULE_STRING ) ;
+    // InternalConfig.g:8115:1: rule__EnumAnnotationAttribute__ValuesAssignment_5 : ( RULE_STRING ) ;
     public final void rule__EnumAnnotationAttribute__ValuesAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8120:1: ( ( RULE_STRING ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8121:1: ( RULE_STRING )
+            // InternalConfig.g:8119:1: ( ( RULE_STRING ) )
+            // InternalConfig.g:8120:1: ( RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8121:1: ( RULE_STRING )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8122:1: RULE_STRING
+            // InternalConfig.g:8120:1: ( RULE_STRING )
+            // InternalConfig.g:8121:1: RULE_STRING
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getEnumAnnotationAttributeAccess().getValuesSTRINGTerminalRuleCall_5_0()); 
             }
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__EnumAnnotationAttribute__ValuesAssignment_516662); if (state.failed) return ;
+            match(input,RULE_STRING,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getEnumAnnotationAttributeAccess().getValuesSTRINGTerminalRuleCall_5_0()); 
             }
@@ -23240,22 +23222,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__ValuesAssignment_6_1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8131:1: rule__EnumAnnotationAttribute__ValuesAssignment_6_1 : ( RULE_STRING ) ;
+    // InternalConfig.g:8130:1: rule__EnumAnnotationAttribute__ValuesAssignment_6_1 : ( RULE_STRING ) ;
     public final void rule__EnumAnnotationAttribute__ValuesAssignment_6_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8135:1: ( ( RULE_STRING ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8136:1: ( RULE_STRING )
+            // InternalConfig.g:8134:1: ( ( RULE_STRING ) )
+            // InternalConfig.g:8135:1: ( RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8136:1: ( RULE_STRING )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8137:1: RULE_STRING
+            // InternalConfig.g:8135:1: ( RULE_STRING )
+            // InternalConfig.g:8136:1: RULE_STRING
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getEnumAnnotationAttributeAccess().getValuesSTRINGTerminalRuleCall_6_1_0()); 
             }
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__EnumAnnotationAttribute__ValuesAssignment_6_116693); if (state.failed) return ;
+            match(input,RULE_STRING,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getEnumAnnotationAttributeAccess().getValuesSTRINGTerminalRuleCall_6_1_0()); 
             }
@@ -23281,22 +23263,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Import__ImportedNamespaceAssignment_1_0_0"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8146:1: rule__Import__ImportedNamespaceAssignment_1_0_0 : ( ruleImportedFQN ) ;
+    // InternalConfig.g:8145:1: rule__Import__ImportedNamespaceAssignment_1_0_0 : ( ruleImportedFQN ) ;
     public final void rule__Import__ImportedNamespaceAssignment_1_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8150:1: ( ( ruleImportedFQN ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8151:1: ( ruleImportedFQN )
+            // InternalConfig.g:8149:1: ( ( ruleImportedFQN ) )
+            // InternalConfig.g:8150:1: ( ruleImportedFQN )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8151:1: ( ruleImportedFQN )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8152:1: ruleImportedFQN
+            // InternalConfig.g:8150:1: ( ruleImportedFQN )
+            // InternalConfig.g:8151:1: ruleImportedFQN
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImportAccess().getImportedNamespaceImportedFQNParserRuleCall_1_0_0_0()); 
             }
-            pushFollow(FOLLOW_ruleImportedFQN_in_rule__Import__ImportedNamespaceAssignment_1_0_016724);
+            pushFollow(FOLLOW_2);
             ruleImportedFQN();
 
             state._fsp--;
@@ -23326,22 +23308,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Import__ImportURIAssignment_2"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8161:1: rule__Import__ImportURIAssignment_2 : ( RULE_STRING ) ;
+    // InternalConfig.g:8160:1: rule__Import__ImportURIAssignment_2 : ( RULE_STRING ) ;
     public final void rule__Import__ImportURIAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8165:1: ( ( RULE_STRING ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8166:1: ( RULE_STRING )
+            // InternalConfig.g:8164:1: ( ( RULE_STRING ) )
+            // InternalConfig.g:8165:1: ( RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8166:1: ( RULE_STRING )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8167:1: RULE_STRING
+            // InternalConfig.g:8165:1: ( RULE_STRING )
+            // InternalConfig.g:8166:1: RULE_STRING
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImportAccess().getImportURISTRINGTerminalRuleCall_2_0()); 
             }
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__Import__ImportURIAssignment_216755); if (state.failed) return ;
+            match(input,RULE_STRING,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getImportAccess().getImportURISTRINGTerminalRuleCall_2_0()); 
             }
@@ -23367,22 +23349,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Documentation__LinesAssignment_2"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8176:1: rule__Documentation__LinesAssignment_2 : ( RULE_STRING ) ;
+    // InternalConfig.g:8175:1: rule__Documentation__LinesAssignment_2 : ( RULE_STRING ) ;
     public final void rule__Documentation__LinesAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8180:1: ( ( RULE_STRING ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8181:1: ( RULE_STRING )
+            // InternalConfig.g:8179:1: ( ( RULE_STRING ) )
+            // InternalConfig.g:8180:1: ( RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8181:1: ( RULE_STRING )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8182:1: RULE_STRING
+            // InternalConfig.g:8180:1: ( RULE_STRING )
+            // InternalConfig.g:8181:1: RULE_STRING
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDocumentationAccess().getLinesSTRINGTerminalRuleCall_2_0()); 
             }
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__Documentation__LinesAssignment_216786); if (state.failed) return ;
+            match(input,RULE_STRING,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getDocumentationAccess().getLinesSTRINGTerminalRuleCall_2_0()); 
             }
@@ -23408,28 +23390,28 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__BooleanLiteral__IsTrueAssignment_1_1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8193:1: rule__BooleanLiteral__IsTrueAssignment_1_1 : ( ( 'true' ) ) ;
+    // InternalConfig.g:8192:1: rule__BooleanLiteral__IsTrueAssignment_1_1 : ( ( 'true' ) ) ;
     public final void rule__BooleanLiteral__IsTrueAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8197:1: ( ( ( 'true' ) ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8198:1: ( ( 'true' ) )
+            // InternalConfig.g:8196:1: ( ( ( 'true' ) ) )
+            // InternalConfig.g:8197:1: ( ( 'true' ) )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8198:1: ( ( 'true' ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8199:1: ( 'true' )
+            // InternalConfig.g:8197:1: ( ( 'true' ) )
+            // InternalConfig.g:8198:1: ( 'true' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0()); 
             }
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8200:1: ( 'true' )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8201:1: 'true'
+            // InternalConfig.g:8199:1: ( 'true' )
+            // InternalConfig.g:8200:1: 'true'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0()); 
             }
-            match(input,61,FOLLOW_61_in_rule__BooleanLiteral__IsTrueAssignment_1_116824); if (state.failed) return ;
+            match(input,61,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0()); 
             }
@@ -23461,22 +23443,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RealLiteral__ValueAssignment_1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8216:1: rule__RealLiteral__ValueAssignment_1 : ( ruleReal ) ;
+    // InternalConfig.g:8215:1: rule__RealLiteral__ValueAssignment_1 : ( ruleReal ) ;
     public final void rule__RealLiteral__ValueAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8220:1: ( ( ruleReal ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8221:1: ( ruleReal )
+            // InternalConfig.g:8219:1: ( ( ruleReal ) )
+            // InternalConfig.g:8220:1: ( ruleReal )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8221:1: ( ruleReal )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8222:1: ruleReal
+            // InternalConfig.g:8220:1: ( ruleReal )
+            // InternalConfig.g:8221:1: ruleReal
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRealLiteralAccess().getValueRealParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleReal_in_rule__RealLiteral__ValueAssignment_116863);
+            pushFollow(FOLLOW_2);
             ruleReal();
 
             state._fsp--;
@@ -23506,22 +23488,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__IntLiteral__ValueAssignment_1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8231:1: rule__IntLiteral__ValueAssignment_1 : ( ruleInteger ) ;
+    // InternalConfig.g:8230:1: rule__IntLiteral__ValueAssignment_1 : ( ruleInteger ) ;
     public final void rule__IntLiteral__ValueAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8235:1: ( ( ruleInteger ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8236:1: ( ruleInteger )
+            // InternalConfig.g:8234:1: ( ( ruleInteger ) )
+            // InternalConfig.g:8235:1: ( ruleInteger )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8236:1: ( ruleInteger )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8237:1: ruleInteger
+            // InternalConfig.g:8235:1: ( ruleInteger )
+            // InternalConfig.g:8236:1: ruleInteger
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIntLiteralAccess().getValueIntegerParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleInteger_in_rule__IntLiteral__ValueAssignment_116894);
+            pushFollow(FOLLOW_2);
             ruleInteger();
 
             state._fsp--;
@@ -23551,22 +23533,22 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StringLiteral__ValueAssignment_1"
-    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8246:1: rule__StringLiteral__ValueAssignment_1 : ( RULE_STRING ) ;
+    // InternalConfig.g:8245:1: rule__StringLiteral__ValueAssignment_1 : ( RULE_STRING ) ;
     public final void rule__StringLiteral__ValueAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8250:1: ( ( RULE_STRING ) )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8251:1: ( RULE_STRING )
+            // InternalConfig.g:8249:1: ( ( RULE_STRING ) )
+            // InternalConfig.g:8250:1: ( RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8251:1: ( RULE_STRING )
-            // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8252:1: RULE_STRING
+            // InternalConfig.g:8250:1: ( RULE_STRING )
+            // InternalConfig.g:8251:1: RULE_STRING
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getStringLiteralAccess().getValueSTRINGTerminalRuleCall_1_0()); 
             }
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__StringLiteral__ValueAssignment_116925); if (state.failed) return ;
+            match(input,RULE_STRING,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getStringLiteralAccess().getValueSTRINGTerminalRuleCall_1_0()); 
             }
@@ -23590,89 +23572,12 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
     }
     // $ANTLR end "rule__StringLiteral__ValueAssignment_1"
 
-    // $ANTLR start synpred54_InternalConfig
-    public final void synpred54_InternalConfig_fragment() throws RecognitionException {   
-        // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7022:4: ( ({...}? => ( ( ( rule__DynamicConfig__Alternatives_2_0 ) ) ) ) )
-        // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7022:4: ({...}? => ( ( ( rule__DynamicConfig__Alternatives_2_0 ) ) ) )
-        {
-        // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7022:4: ({...}? => ( ( ( rule__DynamicConfig__Alternatives_2_0 ) ) ) )
-        // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7023:5: {...}? => ( ( ( rule__DynamicConfig__Alternatives_2_0 ) ) )
-        {
-        if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getDynamicConfigAccess().getUnorderedGroup_2(), 0) ) {
-            if (state.backtracking>0) {state.failed=true; return ;}
-            throw new FailedPredicateException(input, "synpred54_InternalConfig", "getUnorderedGroupHelper().canSelect(grammarAccess.getDynamicConfigAccess().getUnorderedGroup_2(), 0)");
-        }
-        // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7023:110: ( ( ( rule__DynamicConfig__Alternatives_2_0 ) ) )
-        // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7024:6: ( ( rule__DynamicConfig__Alternatives_2_0 ) )
-        {
-        getUnorderedGroupHelper().select(grammarAccess.getDynamicConfigAccess().getUnorderedGroup_2(), 0);
-        // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7030:6: ( ( rule__DynamicConfig__Alternatives_2_0 ) )
-        // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7032:7: ( rule__DynamicConfig__Alternatives_2_0 )
-        {
-        if ( state.backtracking==0 ) {
-           before(grammarAccess.getDynamicConfigAccess().getAlternatives_2_0()); 
-        }
-        // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7033:7: ( rule__DynamicConfig__Alternatives_2_0 )
-        // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7033:8: rule__DynamicConfig__Alternatives_2_0
-        {
-        pushFollow(FOLLOW_rule__DynamicConfig__Alternatives_2_0_in_synpred54_InternalConfig14094);
-        rule__DynamicConfig__Alternatives_2_0();
-
-        state._fsp--;
-        if (state.failed) return ;
-
-        }
-
-
-        }
-
-
-        }
-
-
-        }
-
-
-        }
-    }
-    // $ANTLR end synpred54_InternalConfig
-
-    // $ANTLR start synpred55_InternalConfig
-    public final void synpred55_InternalConfig_fragment() throws RecognitionException {   
-        // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7071:2: ( rule__DynamicConfig__UnorderedGroup_2__1 )
-        // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7071:2: rule__DynamicConfig__UnorderedGroup_2__1
-        {
-        pushFollow(FOLLOW_rule__DynamicConfig__UnorderedGroup_2__1_in_synpred55_InternalConfig14247);
-        rule__DynamicConfig__UnorderedGroup_2__1();
-
-        state._fsp--;
-        if (state.failed) return ;
-
-        }
-    }
-    // $ANTLR end synpred55_InternalConfig
-
-    // $ANTLR start synpred56_InternalConfig
-    public final void synpred56_InternalConfig_fragment() throws RecognitionException {   
-        // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7100:2: ( rule__ActorInstanceConfig__UnorderedGroup_7__0 )
-        // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7100:2: rule__ActorInstanceConfig__UnorderedGroup_7__0
-        {
-        pushFollow(FOLLOW_rule__ActorInstanceConfig__UnorderedGroup_7__0_in_synpred56_InternalConfig14300);
-        rule__ActorInstanceConfig__UnorderedGroup_7__0();
-
-        state._fsp--;
-        if (state.failed) return ;
-
-        }
-    }
-    // $ANTLR end synpred56_InternalConfig
-
-    // $ANTLR start synpred57_InternalConfig
-    public final void synpred57_InternalConfig_fragment() throws RecognitionException {   
-        // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7134:8: ( rule__ActorInstanceConfig__AttributesAssignment_7_0 )
-        // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7134:9: rule__ActorInstanceConfig__AttributesAssignment_7_0
+    // $ANTLR start synpred1_InternalConfig
+    public final void synpred1_InternalConfig_fragment() throws RecognitionException {   
+        // InternalConfig.g:7133:8: ( rule__ActorInstanceConfig__AttributesAssignment_7_0 )
+        // InternalConfig.g:7133:9: rule__ActorInstanceConfig__AttributesAssignment_7_0
         {
-        pushFollow(FOLLOW_rule__ActorInstanceConfig__AttributesAssignment_7_0_in_synpred57_InternalConfig14429);
+        pushFollow(FOLLOW_2);
         rule__ActorInstanceConfig__AttributesAssignment_7_0();
 
         state._fsp--;
@@ -23680,105 +23585,14 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
         }
     }
-    // $ANTLR end synpred57_InternalConfig
+    // $ANTLR end synpred1_InternalConfig
 
-    // $ANTLR start synpred58_InternalConfig
-    public final void synpred58_InternalConfig_fragment() throws RecognitionException {   
-        // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7118:4: ( ({...}? => ( ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 ) ) ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 )=> rule__ActorInstanceConfig__AttributesAssignment_7_0 )* ) ) ) ) )
-        // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7118:4: ({...}? => ( ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 ) ) ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 )=> rule__ActorInstanceConfig__AttributesAssignment_7_0 )* ) ) ) )
-        {
-        // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7118:4: ({...}? => ( ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 ) ) ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 )=> rule__ActorInstanceConfig__AttributesAssignment_7_0 )* ) ) ) )
-        // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7119:5: {...}? => ( ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 ) ) ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 )=> rule__ActorInstanceConfig__AttributesAssignment_7_0 )* ) ) )
-        {
-        if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getActorInstanceConfigAccess().getUnorderedGroup_7(), 0) ) {
-            if (state.backtracking>0) {state.failed=true; return ;}
-            throw new FailedPredicateException(input, "synpred58_InternalConfig", "getUnorderedGroupHelper().canSelect(grammarAccess.getActorInstanceConfigAccess().getUnorderedGroup_7(), 0)");
-        }
-        // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7119:116: ( ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 ) ) ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 )=> rule__ActorInstanceConfig__AttributesAssignment_7_0 )* ) ) )
-        // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7120:6: ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 ) ) ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 )=> rule__ActorInstanceConfig__AttributesAssignment_7_0 )* ) )
+    // $ANTLR start synpred2_InternalConfig
+    public final void synpred2_InternalConfig_fragment() throws RecognitionException {   
+        // InternalConfig.g:7155:8: ( rule__ActorInstanceConfig__PortsAssignment_7_1 )
+        // InternalConfig.g:7155:9: rule__ActorInstanceConfig__PortsAssignment_7_1
         {
-        getUnorderedGroupHelper().select(grammarAccess.getActorInstanceConfigAccess().getUnorderedGroup_7(), 0);
-        // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7126:6: ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 ) ) ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 )=> rule__ActorInstanceConfig__AttributesAssignment_7_0 )* ) )
-        // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7127:6: ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 ) ) ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 )=> rule__ActorInstanceConfig__AttributesAssignment_7_0 )* )
-        {
-        // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7127:6: ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 ) )
-        // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7128:7: ( rule__ActorInstanceConfig__AttributesAssignment_7_0 )
-        {
-        if ( state.backtracking==0 ) {
-           before(grammarAccess.getActorInstanceConfigAccess().getAttributesAssignment_7_0()); 
-        }
-        // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7129:7: ( rule__ActorInstanceConfig__AttributesAssignment_7_0 )
-        // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7129:8: rule__ActorInstanceConfig__AttributesAssignment_7_0
-        {
-        pushFollow(FOLLOW_rule__ActorInstanceConfig__AttributesAssignment_7_0_in_synpred58_InternalConfig14388);
-        rule__ActorInstanceConfig__AttributesAssignment_7_0();
-
-        state._fsp--;
-        if (state.failed) return ;
-
-        }
-
-
-        }
-
-        // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7132:6: ( ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 )=> rule__ActorInstanceConfig__AttributesAssignment_7_0 )* )
-        // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7133:7: ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 )=> rule__ActorInstanceConfig__AttributesAssignment_7_0 )*
-        {
-        if ( state.backtracking==0 ) {
-           before(grammarAccess.getActorInstanceConfigAccess().getAttributesAssignment_7_0()); 
-        }
-        // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7134:7: ( ( rule__ActorInstanceConfig__AttributesAssignment_7_0 )=> rule__ActorInstanceConfig__AttributesAssignment_7_0 )*
-        loop57:
-        do {
-            int alt57=2;
-            int LA57_0 = input.LA(1);
-
-            if ( (LA57_0==42) && (synpred57_InternalConfig())) {
-                alt57=1;
-            }
-
-
-            switch (alt57) {
-        	case 1 :
-        	    // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7134:8: ( rule__ActorInstanceConfig__AttributesAssignment_7_0 )=> rule__ActorInstanceConfig__AttributesAssignment_7_0
-        	    {
-        	    pushFollow(FOLLOW_rule__ActorInstanceConfig__AttributesAssignment_7_0_in_synpred58_InternalConfig14432);
-        	    rule__ActorInstanceConfig__AttributesAssignment_7_0();
-
-        	    state._fsp--;
-        	    if (state.failed) return ;
-
-        	    }
-        	    break;
-
-        	default :
-        	    break loop57;
-            }
-        } while (true);
-
-
-        }
-
-
-        }
-
-
-        }
-
-
-        }
-
-
-        }
-    }
-    // $ANTLR end synpred58_InternalConfig
-
-    // $ANTLR start synpred59_InternalConfig
-    public final void synpred59_InternalConfig_fragment() throws RecognitionException {   
-        // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7156:8: ( rule__ActorInstanceConfig__PortsAssignment_7_1 )
-        // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7156:9: rule__ActorInstanceConfig__PortsAssignment_7_1
-        {
-        pushFollow(FOLLOW_rule__ActorInstanceConfig__PortsAssignment_7_1_in_synpred59_InternalConfig14572);
+        pushFollow(FOLLOW_2);
         rule__ActorInstanceConfig__PortsAssignment_7_1();
 
         state._fsp--;
@@ -23786,219 +23600,15 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
         }
     }
-    // $ANTLR end synpred59_InternalConfig
-
-    // $ANTLR start synpred60_InternalConfig
-    public final void synpred60_InternalConfig_fragment() throws RecognitionException {   
-        // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7177:2: ( rule__ActorInstanceConfig__UnorderedGroup_7__1 )
-        // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7177:2: rule__ActorInstanceConfig__UnorderedGroup_7__1
-        {
-        pushFollow(FOLLOW_rule__ActorInstanceConfig__UnorderedGroup_7__1_in_synpred60_InternalConfig14644);
-        rule__ActorInstanceConfig__UnorderedGroup_7__1();
-
-        state._fsp--;
-        if (state.failed) return ;
-
-        }
-    }
-    // $ANTLR end synpred60_InternalConfig
-
-    // $ANTLR start synpred61_InternalConfig
-    public final void synpred61_InternalConfig_fragment() throws RecognitionException {   
-        // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7206:2: ( rule__ProtocolClassConfig__UnorderedGroup_3__0 )
-        // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7206:2: rule__ProtocolClassConfig__UnorderedGroup_3__0
-        {
-        pushFollow(FOLLOW_rule__ProtocolClassConfig__UnorderedGroup_3__0_in_synpred61_InternalConfig14697);
-        rule__ProtocolClassConfig__UnorderedGroup_3__0();
-
-        state._fsp--;
-        if (state.failed) return ;
-
-        }
-    }
-    // $ANTLR end synpred61_InternalConfig
-
-    // $ANTLR start synpred62_InternalConfig
-    public final void synpred62_InternalConfig_fragment() throws RecognitionException {   
-        // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7224:4: ( ({...}? => ( ( ( rule__ProtocolClassConfig__Group_3_0__0 ) ) ) ) )
-        // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7224:4: ({...}? => ( ( ( rule__ProtocolClassConfig__Group_3_0__0 ) ) ) )
-        {
-        // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7224:4: ({...}? => ( ( ( rule__ProtocolClassConfig__Group_3_0__0 ) ) ) )
-        // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7225:5: {...}? => ( ( ( rule__ProtocolClassConfig__Group_3_0__0 ) ) )
-        {
-        if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getProtocolClassConfigAccess().getUnorderedGroup_3(), 0) ) {
-            if (state.backtracking>0) {state.failed=true; return ;}
-            throw new FailedPredicateException(input, "synpred62_InternalConfig", "getUnorderedGroupHelper().canSelect(grammarAccess.getProtocolClassConfigAccess().getUnorderedGroup_3(), 0)");
-        }
-        // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7225:116: ( ( ( rule__ProtocolClassConfig__Group_3_0__0 ) ) )
-        // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7226:6: ( ( rule__ProtocolClassConfig__Group_3_0__0 ) )
-        {
-        getUnorderedGroupHelper().select(grammarAccess.getProtocolClassConfigAccess().getUnorderedGroup_3(), 0);
-        // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7232:6: ( ( rule__ProtocolClassConfig__Group_3_0__0 ) )
-        // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7234:7: ( rule__ProtocolClassConfig__Group_3_0__0 )
-        {
-        if ( state.backtracking==0 ) {
-           before(grammarAccess.getProtocolClassConfigAccess().getGroup_3_0()); 
-        }
-        // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7235:7: ( rule__ProtocolClassConfig__Group_3_0__0 )
-        // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7235:8: rule__ProtocolClassConfig__Group_3_0__0
-        {
-        pushFollow(FOLLOW_rule__ProtocolClassConfig__Group_3_0__0_in_synpred62_InternalConfig14784);
-        rule__ProtocolClassConfig__Group_3_0__0();
-
-        state._fsp--;
-        if (state.failed) return ;
-
-        }
-
-
-        }
-
-
-        }
-
-
-        }
-
-
-        }
-    }
-    // $ANTLR end synpred62_InternalConfig
-
-    // $ANTLR start synpred63_InternalConfig
-    public final void synpred63_InternalConfig_fragment() throws RecognitionException {   
-        // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7273:2: ( rule__ProtocolClassConfig__UnorderedGroup_3__1 )
-        // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:7273:2: rule__ProtocolClassConfig__UnorderedGroup_3__1
-        {
-        pushFollow(FOLLOW_rule__ProtocolClassConfig__UnorderedGroup_3__1_in_synpred63_InternalConfig14937);
-        rule__ProtocolClassConfig__UnorderedGroup_3__1();
-
-        state._fsp--;
-        if (state.failed) return ;
-
-        }
-    }
-    // $ANTLR end synpred63_InternalConfig
+    // $ANTLR end synpred2_InternalConfig
 
     // Delegated rules
 
-    public final boolean synpred57_InternalConfig() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred57_InternalConfig_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
-    public final boolean synpred60_InternalConfig() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred60_InternalConfig_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
-    public final boolean synpred56_InternalConfig() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred56_InternalConfig_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
-    public final boolean synpred58_InternalConfig() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred58_InternalConfig_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
-    public final boolean synpred59_InternalConfig() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred59_InternalConfig_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
-    public final boolean synpred55_InternalConfig() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred55_InternalConfig_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
-    public final boolean synpred62_InternalConfig() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred62_InternalConfig_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
-    public final boolean synpred54_InternalConfig() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred54_InternalConfig_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
-    public final boolean synpred61_InternalConfig() {
+    public final boolean synpred1_InternalConfig() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred61_InternalConfig_fragment(); // can never throw exception
+            synpred1_InternalConfig_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -24008,11 +23618,11 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
         state.failed=false;
         return success;
     }
-    public final boolean synpred63_InternalConfig() {
+    public final boolean synpred2_InternalConfig() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred63_InternalConfig_fragment(); // can never throw exception
+            synpred2_InternalConfig_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -24026,699 +23636,57 @@ public class InternalConfigParser extends AbstractInternalContentAssistParser {
 
  
 
-    public static final BitSet FOLLOW_ruleConfigModel_in_entryRuleConfigModel67 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleConfigModel74 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfigModel__Group__0_in_ruleConfigModel100 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleConfigElement_in_entryRuleConfigElement127 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleConfigElement134 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfigElement__Alternatives_in_ruleConfigElement160 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSubSystemConfig_in_entryRuleSubSystemConfig187 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSubSystemConfig194 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemConfig__Group__0_in_ruleSubSystemConfig220 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDynamicConfig_in_entryRuleDynamicConfig247 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDynamicConfig254 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DynamicConfig__Group__0_in_ruleDynamicConfig280 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleActorClassConfig_in_entryRuleActorClassConfig307 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleActorClassConfig314 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClassConfig__Group__0_in_ruleActorClassConfig340 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleActorInstanceConfig_in_entryRuleActorInstanceConfig367 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleActorInstanceConfig374 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorInstanceConfig__Group__0_in_ruleActorInstanceConfig400 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleProtocolClassConfig_in_entryRuleProtocolClassConfig427 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleProtocolClassConfig434 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClassConfig__Group__0_in_ruleProtocolClassConfig460 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rulePortClassConfig_in_entryRulePortClassConfig487 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRulePortClassConfig494 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortClassConfig__Group__0_in_rulePortClassConfig520 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rulePortInstanceConfig_in_entryRulePortInstanceConfig547 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRulePortInstanceConfig554 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortInstanceConfig__Group__0_in_rulePortInstanceConfig580 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAttrClassConfig_in_entryRuleAttrClassConfig609 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAttrClassConfig616 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AttrClassConfig__Group__0_in_ruleAttrClassConfig642 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAttrInstanceConfig_in_entryRuleAttrInstanceConfig669 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAttrInstanceConfig676 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AttrInstanceConfig__Group__0_in_ruleAttrInstanceConfig702 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleConfigValueArray_in_entryRuleConfigValueArray729 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleConfigValueArray736 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfigValueArray__Group__0_in_ruleConfigValueArray762 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleConfigValue_in_entryRuleConfigValue789 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleConfigValue796 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfigValue__Alternatives_in_ruleConfigValue822 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLiteralConfigValue_in_entryRuleLiteralConfigValue849 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleLiteralConfigValue856 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LiteralConfigValue__ValueAssignment_in_ruleLiteralConfigValue882 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleEnumConfigValue_in_entryRuleEnumConfigValue909 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleEnumConfigValue916 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumConfigValue__Group__0_in_ruleEnumConfigValue942 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRefPath_in_entryRuleRefPath969 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRefPath976 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefPath__Group__0_in_ruleRefPath1002 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRefSegment_in_entryRuleRefSegment1029 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRefSegment1036 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefSegment__Group__0_in_ruleRefSegment1062 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleKeyValue_in_entryRuleKeyValue1091 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleKeyValue1098 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeyValue__Group__0_in_ruleKeyValue1124 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAnnotationTargetType_in_entryRuleAnnotationTargetType1153 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAnnotationTargetType1160 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleAnnotationTargetType1186 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAnnotationAttribute_in_entryRuleAnnotationAttribute1212 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAnnotationAttribute1219 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AnnotationAttribute__Alternatives_in_ruleAnnotationAttribute1245 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleAnnotationAttribute_in_entryRuleSimpleAnnotationAttribute1272 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSimpleAnnotationAttribute1279 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__0_in_ruleSimpleAnnotationAttribute1305 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleEnumAnnotationAttribute_in_entryRuleEnumAnnotationAttribute1332 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleEnumAnnotationAttribute1339 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__0_in_ruleEnumAnnotationAttribute1365 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleImport_in_entryRuleImport1392 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleImport1399 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__Group__0_in_ruleImport1425 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleImportedFQN_in_entryRuleImportedFQN1452 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleImportedFQN1459 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ImportedFQN__Group__0_in_ruleImportedFQN1485 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_entryRuleDocumentation1512 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDocumentation1519 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Documentation__Group__0_in_ruleDocumentation1545 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTIME_in_entryRuleTIME1572 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleTIME1579 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TIME__Alternatives_in_ruleTIME1605 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLiteral_in_entryRuleLiteral1634 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleLiteral1641 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Literal__Alternatives_in_ruleLiteral1667 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleBooleanLiteral_in_entryRuleBooleanLiteral1694 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleBooleanLiteral1701 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__BooleanLiteral__Group__0_in_ruleBooleanLiteral1727 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNumberLiteral_in_entryRuleNumberLiteral1754 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleNumberLiteral1761 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NumberLiteral__Alternatives_in_ruleNumberLiteral1787 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRealLiteral_in_entryRuleRealLiteral1814 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRealLiteral1821 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RealLiteral__Group__0_in_ruleRealLiteral1847 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntLiteral_in_entryRuleIntLiteral1874 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIntLiteral1881 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IntLiteral__Group__0_in_ruleIntLiteral1907 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStringLiteral_in_entryRuleStringLiteral1934 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleStringLiteral1941 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StringLiteral__Group__0_in_ruleStringLiteral1967 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInteger_in_entryRuleInteger1994 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleInteger2001 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Integer__Alternatives_in_ruleInteger2027 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleReal_in_entryRuleReal2054 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleReal2061 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Real__Alternatives_in_ruleReal2087 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDecimal_in_entryRuleDecimal2119 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDecimal2126 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Decimal__Group__0_in_ruleDecimal2156 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDecimalExp_in_entryRuleDecimalExp2188 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDecimalExp2195 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__0_in_ruleDecimalExp2225 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_entryRuleFQN2252 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleFQN2259 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FQN__Group__0_in_ruleFQN2285 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LiteralType__Alternatives_in_ruleLiteralType2322 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSubSystemConfig_in_rule__ConfigElement__Alternatives2357 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleActorClassConfig_in_rule__ConfigElement__Alternatives2374 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleActorInstanceConfig_in_rule__ConfigElement__Alternatives2391 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleProtocolClassConfig_in_rule__ConfigElement__Alternatives2408 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DynamicConfig__Group_2_0_0__0_in_rule__DynamicConfig__Alternatives_2_02440 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DynamicConfig__Group_2_0_1__0_in_rule__DynamicConfig__Alternatives_2_02458 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_12_in_rule__ProtocolClassConfig__Alternatives_3_1_02492 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_13_in_rule__ProtocolClassConfig__Alternatives_3_1_02512 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AttrInstanceConfig__ReadOnlyAssignment_3_1_0_1_0_in_rule__AttrInstanceConfig__Alternatives_3_1_0_12547 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_14_in_rule__AttrInstanceConfig__Alternatives_3_1_0_12566 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLiteralConfigValue_in_rule__ConfigValue__Alternatives2600 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleEnumConfigValue_in_rule__ConfigValue__Alternatives2617 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleAnnotationAttribute_in_rule__AnnotationAttribute__Alternatives2650 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleEnumAnnotationAttribute_in_rule__AnnotationAttribute__Alternatives2667 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__OptionalAssignment_0_0_in_rule__SimpleAnnotationAttribute__Alternatives_02699 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_15_in_rule__SimpleAnnotationAttribute__Alternatives_02718 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__OptionalAssignment_0_0_in_rule__EnumAnnotationAttribute__Alternatives_02752 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_15_in_rule__EnumAnnotationAttribute__Alternatives_02771 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__Group_1_0__0_in_rule__Import__Alternatives_12805 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_16_in_rule__Import__Alternatives_12824 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TIME__Group_0__0_in_rule__TIME__Alternatives2858 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TIME__Group_1__0_in_rule__TIME__Alternatives2876 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TIME__Group_2__0_in_rule__TIME__Alternatives2894 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TIME__Group_3__0_in_rule__TIME__Alternatives2912 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleBooleanLiteral_in_rule__Literal__Alternatives2945 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNumberLiteral_in_rule__Literal__Alternatives2962 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStringLiteral_in_rule__Literal__Alternatives2979 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_17_in_rule__BooleanLiteral__Alternatives_13012 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__BooleanLiteral__IsTrueAssignment_1_1_in_rule__BooleanLiteral__Alternatives_13031 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntLiteral_in_rule__NumberLiteral__Alternatives3064 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRealLiteral_in_rule__NumberLiteral__Alternatives3081 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Integer__Group_0__0_in_rule__Integer__Alternatives3113 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_HEX_in_rule__Integer__Alternatives3131 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_18_in_rule__Integer__Alternatives_0_03164 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_19_in_rule__Integer__Alternatives_0_03184 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDecimal_in_rule__Real__Alternatives3218 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDecimalExp_in_rule__Real__Alternatives3235 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_18_in_rule__Decimal__Alternatives_03268 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_19_in_rule__Decimal__Alternatives_03288 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_18_in_rule__DecimalExp__Alternatives_03323 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_19_in_rule__DecimalExp__Alternatives_03343 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_20_in_rule__DecimalExp__Alternatives_43378 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_21_in_rule__DecimalExp__Alternatives_43398 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_18_in_rule__DecimalExp__Alternatives_53433 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_19_in_rule__DecimalExp__Alternatives_53453 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_22_in_rule__LiteralType__Alternatives3488 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_23_in_rule__LiteralType__Alternatives3509 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_24_in_rule__LiteralType__Alternatives3530 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_25_in_rule__LiteralType__Alternatives3551 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfigModel__Group__0__Impl_in_rule__ConfigModel__Group__03584 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__ConfigModel__Group__1_in_rule__ConfigModel__Group__03587 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_26_in_rule__ConfigModel__Group__0__Impl3615 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfigModel__Group__1__Impl_in_rule__ConfigModel__Group__13646 = new BitSet(new long[]{0x0000000008000000L});
-    public static final BitSet FOLLOW_rule__ConfigModel__Group__2_in_rule__ConfigModel__Group__13649 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfigModel__NameAssignment_1_in_rule__ConfigModel__Group__1__Impl3676 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfigModel__Group__2__Impl_in_rule__ConfigModel__Group__23706 = new BitSet(new long[]{0x0004007030000000L});
-    public static final BitSet FOLLOW_rule__ConfigModel__Group__3_in_rule__ConfigModel__Group__23709 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_rule__ConfigModel__Group__2__Impl3737 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfigModel__Group__3__Impl_in_rule__ConfigModel__Group__33768 = new BitSet(new long[]{0x0004007030000000L});
-    public static final BitSet FOLLOW_rule__ConfigModel__Group__4_in_rule__ConfigModel__Group__33771 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfigModel__ImportsAssignment_3_in_rule__ConfigModel__Group__3__Impl3798 = new BitSet(new long[]{0x0004000000000002L});
-    public static final BitSet FOLLOW_rule__ConfigModel__Group__4__Impl_in_rule__ConfigModel__Group__43829 = new BitSet(new long[]{0x0004007030000000L});
-    public static final BitSet FOLLOW_rule__ConfigModel__Group__5_in_rule__ConfigModel__Group__43832 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfigModel__ConfigElementsAssignment_4_in_rule__ConfigModel__Group__4__Impl3859 = new BitSet(new long[]{0x0000007020000002L});
-    public static final BitSet FOLLOW_rule__ConfigModel__Group__5__Impl_in_rule__ConfigModel__Group__53890 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_rule__ConfigModel__Group__5__Impl3918 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemConfig__Group__0__Impl_in_rule__SubSystemConfig__Group__03961 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__SubSystemConfig__Group__1_in_rule__SubSystemConfig__Group__03964 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_rule__SubSystemConfig__Group__0__Impl3992 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemConfig__Group__1__Impl_in_rule__SubSystemConfig__Group__14023 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_rule__SubSystemConfig__Group__2_in_rule__SubSystemConfig__Group__14026 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemConfig__RootAssignment_1_in_rule__SubSystemConfig__Group__1__Impl4053 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemConfig__Group__2__Impl_in_rule__SubSystemConfig__Group__24083 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__SubSystemConfig__Group__3_in_rule__SubSystemConfig__Group__24086 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_30_in_rule__SubSystemConfig__Group__2__Impl4114 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemConfig__Group__3__Impl_in_rule__SubSystemConfig__Group__34145 = new BitSet(new long[]{0x0000000008000000L});
-    public static final BitSet FOLLOW_rule__SubSystemConfig__Group__4_in_rule__SubSystemConfig__Group__34148 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemConfig__SubSystemAssignment_3_in_rule__SubSystemConfig__Group__3__Impl4175 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemConfig__Group__4__Impl_in_rule__SubSystemConfig__Group__44205 = new BitSet(new long[]{0x0000000080000000L});
-    public static final BitSet FOLLOW_rule__SubSystemConfig__Group__5_in_rule__SubSystemConfig__Group__44208 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_rule__SubSystemConfig__Group__4__Impl4236 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemConfig__Group__5__Impl_in_rule__SubSystemConfig__Group__54267 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_rule__SubSystemConfig__Group__6_in_rule__SubSystemConfig__Group__54270 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemConfig__DynConfigAssignment_5_in_rule__SubSystemConfig__Group__5__Impl4297 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemConfig__Group__6__Impl_in_rule__SubSystemConfig__Group__64327 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_rule__SubSystemConfig__Group__6__Impl4355 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DynamicConfig__Group__0__Impl_in_rule__DynamicConfig__Group__04400 = new BitSet(new long[]{0x0000000008000000L});
-    public static final BitSet FOLLOW_rule__DynamicConfig__Group__1_in_rule__DynamicConfig__Group__04403 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_31_in_rule__DynamicConfig__Group__0__Impl4431 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DynamicConfig__Group__1__Impl_in_rule__DynamicConfig__Group__14462 = new BitSet(new long[]{0x0000000B00000000L});
-    public static final BitSet FOLLOW_rule__DynamicConfig__Group__2_in_rule__DynamicConfig__Group__14465 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_rule__DynamicConfig__Group__1__Impl4493 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DynamicConfig__Group__2__Impl_in_rule__DynamicConfig__Group__24524 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_rule__DynamicConfig__Group__3_in_rule__DynamicConfig__Group__24527 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DynamicConfig__UnorderedGroup_2_in_rule__DynamicConfig__Group__2__Impl4554 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DynamicConfig__Group__3__Impl_in_rule__DynamicConfig__Group__34584 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_rule__DynamicConfig__Group__3__Impl4612 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DynamicConfig__Group_2_0_0__0__Impl_in_rule__DynamicConfig__Group_2_0_0__04651 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__DynamicConfig__Group_2_0_0__1_in_rule__DynamicConfig__Group_2_0_0__04654 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_rule__DynamicConfig__Group_2_0_0__0__Impl4682 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DynamicConfig__Group_2_0_0__1__Impl_in_rule__DynamicConfig__Group_2_0_0__14713 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DynamicConfig__FilePathAssignment_2_0_0_1_in_rule__DynamicConfig__Group_2_0_0__1__Impl4740 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DynamicConfig__Group_2_0_1__0__Impl_in_rule__DynamicConfig__Group_2_0_1__04774 = new BitSet(new long[]{0x0000000400000000L});
-    public static final BitSet FOLLOW_rule__DynamicConfig__Group_2_0_1__1_in_rule__DynamicConfig__Group_2_0_1__04777 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DynamicConfig__Group_2_0_1_0__0_in_rule__DynamicConfig__Group_2_0_1__0__Impl4804 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DynamicConfig__Group_2_0_1__1__Impl_in_rule__DynamicConfig__Group_2_0_1__14834 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DynamicConfig__Group_2_0_1_1__0_in_rule__DynamicConfig__Group_2_0_1__1__Impl4861 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DynamicConfig__Group_2_0_1_0__0__Impl_in_rule__DynamicConfig__Group_2_0_1_0__04895 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__DynamicConfig__Group_2_0_1_0__1_in_rule__DynamicConfig__Group_2_0_1_0__04898 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_rule__DynamicConfig__Group_2_0_1_0__0__Impl4926 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DynamicConfig__Group_2_0_1_0__1__Impl_in_rule__DynamicConfig__Group_2_0_1_0__14957 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DynamicConfig__UserCode1Assignment_2_0_1_0_1_in_rule__DynamicConfig__Group_2_0_1_0__1__Impl4984 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DynamicConfig__Group_2_0_1_1__0__Impl_in_rule__DynamicConfig__Group_2_0_1_1__05018 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__DynamicConfig__Group_2_0_1_1__1_in_rule__DynamicConfig__Group_2_0_1_1__05021 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_34_in_rule__DynamicConfig__Group_2_0_1_1__0__Impl5049 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DynamicConfig__Group_2_0_1_1__1__Impl_in_rule__DynamicConfig__Group_2_0_1_1__15080 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DynamicConfig__UserCode2Assignment_2_0_1_1_1_in_rule__DynamicConfig__Group_2_0_1_1__1__Impl5107 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DynamicConfig__Group_2_1__0__Impl_in_rule__DynamicConfig__Group_2_1__05141 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__DynamicConfig__Group_2_1__1_in_rule__DynamicConfig__Group_2_1__05144 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_35_in_rule__DynamicConfig__Group_2_1__0__Impl5172 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DynamicConfig__Group_2_1__1__Impl_in_rule__DynamicConfig__Group_2_1__15203 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DynamicConfig__PollingAssignment_2_1_1_in_rule__DynamicConfig__Group_2_1__1__Impl5230 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClassConfig__Group__0__Impl_in_rule__ActorClassConfig__Group__05264 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__ActorClassConfig__Group__1_in_rule__ActorClassConfig__Group__05267 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_36_in_rule__ActorClassConfig__Group__0__Impl5295 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClassConfig__Group__1__Impl_in_rule__ActorClassConfig__Group__15326 = new BitSet(new long[]{0x0000000008000000L});
-    public static final BitSet FOLLOW_rule__ActorClassConfig__Group__2_in_rule__ActorClassConfig__Group__15329 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClassConfig__ActorAssignment_1_in_rule__ActorClassConfig__Group__1__Impl5356 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClassConfig__Group__2__Impl_in_rule__ActorClassConfig__Group__25386 = new BitSet(new long[]{0x0000040010000000L});
-    public static final BitSet FOLLOW_rule__ActorClassConfig__Group__3_in_rule__ActorClassConfig__Group__25389 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_rule__ActorClassConfig__Group__2__Impl5417 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClassConfig__Group__3__Impl_in_rule__ActorClassConfig__Group__35448 = new BitSet(new long[]{0x0000040010000000L});
-    public static final BitSet FOLLOW_rule__ActorClassConfig__Group__4_in_rule__ActorClassConfig__Group__35451 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClassConfig__AttributesAssignment_3_in_rule__ActorClassConfig__Group__3__Impl5478 = new BitSet(new long[]{0x0000040000000002L});
-    public static final BitSet FOLLOW_rule__ActorClassConfig__Group__4__Impl_in_rule__ActorClassConfig__Group__45509 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_rule__ActorClassConfig__Group__4__Impl5537 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorInstanceConfig__Group__0__Impl_in_rule__ActorInstanceConfig__Group__05578 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__ActorInstanceConfig__Group__1_in_rule__ActorInstanceConfig__Group__05581 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_37_in_rule__ActorInstanceConfig__Group__0__Impl5609 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorInstanceConfig__Group__1__Impl_in_rule__ActorInstanceConfig__Group__15640 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_rule__ActorInstanceConfig__Group__2_in_rule__ActorInstanceConfig__Group__15643 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorInstanceConfig__RootAssignment_1_in_rule__ActorInstanceConfig__Group__1__Impl5670 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorInstanceConfig__Group__2__Impl_in_rule__ActorInstanceConfig__Group__25700 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__ActorInstanceConfig__Group__3_in_rule__ActorInstanceConfig__Group__25703 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_30_in_rule__ActorInstanceConfig__Group__2__Impl5731 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorInstanceConfig__Group__3__Impl_in_rule__ActorInstanceConfig__Group__35762 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_rule__ActorInstanceConfig__Group__4_in_rule__ActorInstanceConfig__Group__35765 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorInstanceConfig__SubSystemAssignment_3_in_rule__ActorInstanceConfig__Group__3__Impl5792 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorInstanceConfig__Group__4__Impl_in_rule__ActorInstanceConfig__Group__45822 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__ActorInstanceConfig__Group__5_in_rule__ActorInstanceConfig__Group__45825 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_30_in_rule__ActorInstanceConfig__Group__4__Impl5853 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorInstanceConfig__Group__5__Impl_in_rule__ActorInstanceConfig__Group__55884 = new BitSet(new long[]{0x0000000008000000L});
-    public static final BitSet FOLLOW_rule__ActorInstanceConfig__Group__6_in_rule__ActorInstanceConfig__Group__55887 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorInstanceConfig__PathAssignment_5_in_rule__ActorInstanceConfig__Group__5__Impl5914 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorInstanceConfig__Group__6__Impl_in_rule__ActorInstanceConfig__Group__65944 = new BitSet(new long[]{0x0000060000000000L});
-    public static final BitSet FOLLOW_rule__ActorInstanceConfig__Group__7_in_rule__ActorInstanceConfig__Group__65947 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_rule__ActorInstanceConfig__Group__6__Impl5975 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorInstanceConfig__Group__7__Impl_in_rule__ActorInstanceConfig__Group__76006 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_rule__ActorInstanceConfig__Group__8_in_rule__ActorInstanceConfig__Group__76009 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorInstanceConfig__UnorderedGroup_7_in_rule__ActorInstanceConfig__Group__7__Impl6036 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorInstanceConfig__Group__8__Impl_in_rule__ActorInstanceConfig__Group__86066 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_rule__ActorInstanceConfig__Group__8__Impl6094 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClassConfig__Group__0__Impl_in_rule__ProtocolClassConfig__Group__06143 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__ProtocolClassConfig__Group__1_in_rule__ProtocolClassConfig__Group__06146 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_38_in_rule__ProtocolClassConfig__Group__0__Impl6174 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClassConfig__Group__1__Impl_in_rule__ProtocolClassConfig__Group__16205 = new BitSet(new long[]{0x0000000008000000L});
-    public static final BitSet FOLLOW_rule__ProtocolClassConfig__Group__2_in_rule__ProtocolClassConfig__Group__16208 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClassConfig__ProtocolAssignment_1_in_rule__ProtocolClassConfig__Group__1__Impl6235 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClassConfig__Group__2__Impl_in_rule__ProtocolClassConfig__Group__26265 = new BitSet(new long[]{0x0000008000003000L});
-    public static final BitSet FOLLOW_rule__ProtocolClassConfig__Group__3_in_rule__ProtocolClassConfig__Group__26268 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_rule__ProtocolClassConfig__Group__2__Impl6296 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClassConfig__Group__3__Impl_in_rule__ProtocolClassConfig__Group__36327 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_rule__ProtocolClassConfig__Group__4_in_rule__ProtocolClassConfig__Group__36330 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClassConfig__UnorderedGroup_3_in_rule__ProtocolClassConfig__Group__3__Impl6357 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClassConfig__Group__4__Impl_in_rule__ProtocolClassConfig__Group__46387 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_rule__ProtocolClassConfig__Group__4__Impl6415 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClassConfig__Group_3_0__0__Impl_in_rule__ProtocolClassConfig__Group_3_0__06456 = new BitSet(new long[]{0x0000010000000000L});
-    public static final BitSet FOLLOW_rule__ProtocolClassConfig__Group_3_0__1_in_rule__ProtocolClassConfig__Group_3_0__06459 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_39_in_rule__ProtocolClassConfig__Group_3_0__0__Impl6487 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClassConfig__Group_3_0__1__Impl_in_rule__ProtocolClassConfig__Group_3_0__16518 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClassConfig__RegularAssignment_3_0_1_in_rule__ProtocolClassConfig__Group_3_0__1__Impl6545 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClassConfig__Group_3_1__0__Impl_in_rule__ProtocolClassConfig__Group_3_1__06579 = new BitSet(new long[]{0x0000010000000000L});
-    public static final BitSet FOLLOW_rule__ProtocolClassConfig__Group_3_1__1_in_rule__ProtocolClassConfig__Group_3_1__06582 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClassConfig__Alternatives_3_1_0_in_rule__ProtocolClassConfig__Group_3_1__0__Impl6609 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClassConfig__Group_3_1__1__Impl_in_rule__ProtocolClassConfig__Group_3_1__16639 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClassConfig__ConjugatedAssignment_3_1_1_in_rule__ProtocolClassConfig__Group_3_1__1__Impl6666 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortClassConfig__Group__0__Impl_in_rule__PortClassConfig__Group__06700 = new BitSet(new long[]{0x0000010000000000L});
-    public static final BitSet FOLLOW_rule__PortClassConfig__Group__1_in_rule__PortClassConfig__Group__06703 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortClassConfig__Group__1__Impl_in_rule__PortClassConfig__Group__16761 = new BitSet(new long[]{0x0000000008000000L});
-    public static final BitSet FOLLOW_rule__PortClassConfig__Group__2_in_rule__PortClassConfig__Group__16764 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_40_in_rule__PortClassConfig__Group__1__Impl6792 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortClassConfig__Group__2__Impl_in_rule__PortClassConfig__Group__26823 = new BitSet(new long[]{0x0000040010000000L});
-    public static final BitSet FOLLOW_rule__PortClassConfig__Group__3_in_rule__PortClassConfig__Group__26826 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_rule__PortClassConfig__Group__2__Impl6854 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortClassConfig__Group__3__Impl_in_rule__PortClassConfig__Group__36885 = new BitSet(new long[]{0x0000040010000000L});
-    public static final BitSet FOLLOW_rule__PortClassConfig__Group__4_in_rule__PortClassConfig__Group__36888 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortClassConfig__AttributesAssignment_3_in_rule__PortClassConfig__Group__3__Impl6915 = new BitSet(new long[]{0x0000040000000002L});
-    public static final BitSet FOLLOW_rule__PortClassConfig__Group__4__Impl_in_rule__PortClassConfig__Group__46946 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_rule__PortClassConfig__Group__4__Impl6974 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortInstanceConfig__Group__0__Impl_in_rule__PortInstanceConfig__Group__07015 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__PortInstanceConfig__Group__1_in_rule__PortInstanceConfig__Group__07018 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_rule__PortInstanceConfig__Group__0__Impl7046 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortInstanceConfig__Group__1__Impl_in_rule__PortInstanceConfig__Group__17077 = new BitSet(new long[]{0x0000000008000000L});
-    public static final BitSet FOLLOW_rule__PortInstanceConfig__Group__2_in_rule__PortInstanceConfig__Group__17080 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortInstanceConfig__ItemAssignment_1_in_rule__PortInstanceConfig__Group__1__Impl7107 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortInstanceConfig__Group__2__Impl_in_rule__PortInstanceConfig__Group__27137 = new BitSet(new long[]{0x0000040010000000L});
-    public static final BitSet FOLLOW_rule__PortInstanceConfig__Group__3_in_rule__PortInstanceConfig__Group__27140 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_rule__PortInstanceConfig__Group__2__Impl7168 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortInstanceConfig__Group__3__Impl_in_rule__PortInstanceConfig__Group__37199 = new BitSet(new long[]{0x0000040010000000L});
-    public static final BitSet FOLLOW_rule__PortInstanceConfig__Group__4_in_rule__PortInstanceConfig__Group__37202 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortInstanceConfig__AttributesAssignment_3_in_rule__PortInstanceConfig__Group__3__Impl7229 = new BitSet(new long[]{0x0000040000000002L});
-    public static final BitSet FOLLOW_rule__PortInstanceConfig__Group__4__Impl_in_rule__PortInstanceConfig__Group__47260 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_rule__PortInstanceConfig__Group__4__Impl7288 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AttrClassConfig__Group__0__Impl_in_rule__AttrClassConfig__Group__07329 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__AttrClassConfig__Group__1_in_rule__AttrClassConfig__Group__07332 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rule__AttrClassConfig__Group__0__Impl7360 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AttrClassConfig__Group__1__Impl_in_rule__AttrClassConfig__Group__17391 = new BitSet(new long[]{0x0000080008000000L});
-    public static final BitSet FOLLOW_rule__AttrClassConfig__Group__2_in_rule__AttrClassConfig__Group__17394 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AttrClassConfig__AttributeAssignment_1_in_rule__AttrClassConfig__Group__1__Impl7421 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AttrClassConfig__Group__2__Impl_in_rule__AttrClassConfig__Group__27451 = new BitSet(new long[]{0x0000080008000000L});
-    public static final BitSet FOLLOW_rule__AttrClassConfig__Group__3_in_rule__AttrClassConfig__Group__27454 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AttrClassConfig__Group_2__0_in_rule__AttrClassConfig__Group__2__Impl7481 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AttrClassConfig__Group__3__Impl_in_rule__AttrClassConfig__Group__37512 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AttrClassConfig__Group_3__0_in_rule__AttrClassConfig__Group__3__Impl7539 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AttrClassConfig__Group_2__0__Impl_in_rule__AttrClassConfig__Group_2__07578 = new BitSet(new long[]{0x20000000000E00F0L});
-    public static final BitSet FOLLOW_rule__AttrClassConfig__Group_2__1_in_rule__AttrClassConfig__Group_2__07581 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_43_in_rule__AttrClassConfig__Group_2__0__Impl7609 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AttrClassConfig__Group_2__1__Impl_in_rule__AttrClassConfig__Group_2__17640 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AttrClassConfig__ValueAssignment_2_1_in_rule__AttrClassConfig__Group_2__1__Impl7667 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AttrClassConfig__Group_3__0__Impl_in_rule__AttrClassConfig__Group_3__07701 = new BitSet(new long[]{0x0000340000000000L});
-    public static final BitSet FOLLOW_rule__AttrClassConfig__Group_3__1_in_rule__AttrClassConfig__Group_3__07704 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_rule__AttrClassConfig__Group_3__0__Impl7732 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AttrClassConfig__Group_3__1__Impl_in_rule__AttrClassConfig__Group_3__17763 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_rule__AttrClassConfig__Group_3__2_in_rule__AttrClassConfig__Group_3__17766 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AttrClassConfig__Group_3_1__0_in_rule__AttrClassConfig__Group_3__1__Impl7793 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AttrClassConfig__Group_3__2__Impl_in_rule__AttrClassConfig__Group_3__27823 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_rule__AttrClassConfig__Group_3__2__Impl7851 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AttrClassConfig__Group_3_1__0__Impl_in_rule__AttrClassConfig__Group_3_1__07888 = new BitSet(new long[]{0x0000340000000000L});
-    public static final BitSet FOLLOW_rule__AttrClassConfig__Group_3_1__1_in_rule__AttrClassConfig__Group_3_1__07891 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AttrClassConfig__Group_3_1_0__0_in_rule__AttrClassConfig__Group_3_1__0__Impl7918 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AttrClassConfig__Group_3_1__1__Impl_in_rule__AttrClassConfig__Group_3_1__17949 = new BitSet(new long[]{0x0000340000000000L});
-    public static final BitSet FOLLOW_rule__AttrClassConfig__Group_3_1__2_in_rule__AttrClassConfig__Group_3_1__17952 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AttrClassConfig__Group_3_1_1__0_in_rule__AttrClassConfig__Group_3_1__1__Impl7979 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AttrClassConfig__Group_3_1__2__Impl_in_rule__AttrClassConfig__Group_3_1__28010 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AttrClassConfig__AttributesAssignment_3_1_2_in_rule__AttrClassConfig__Group_3_1__2__Impl8037 = new BitSet(new long[]{0x0000040000000002L});
-    public static final BitSet FOLLOW_rule__AttrClassConfig__Group_3_1_0__0__Impl_in_rule__AttrClassConfig__Group_3_1_0__08074 = new BitSet(new long[]{0x0000080000000000L});
-    public static final BitSet FOLLOW_rule__AttrClassConfig__Group_3_1_0__1_in_rule__AttrClassConfig__Group_3_1_0__08077 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_44_in_rule__AttrClassConfig__Group_3_1_0__0__Impl8105 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AttrClassConfig__Group_3_1_0__1__Impl_in_rule__AttrClassConfig__Group_3_1_0__18136 = new BitSet(new long[]{0x00000000000C0060L});
-    public static final BitSet FOLLOW_rule__AttrClassConfig__Group_3_1_0__2_in_rule__AttrClassConfig__Group_3_1_0__18139 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_43_in_rule__AttrClassConfig__Group_3_1_0__1__Impl8167 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AttrClassConfig__Group_3_1_0__2__Impl_in_rule__AttrClassConfig__Group_3_1_0__28198 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AttrClassConfig__MinAssignment_3_1_0_2_in_rule__AttrClassConfig__Group_3_1_0__2__Impl8225 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AttrClassConfig__Group_3_1_1__0__Impl_in_rule__AttrClassConfig__Group_3_1_1__08261 = new BitSet(new long[]{0x0000080000000000L});
-    public static final BitSet FOLLOW_rule__AttrClassConfig__Group_3_1_1__1_in_rule__AttrClassConfig__Group_3_1_1__08264 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_45_in_rule__AttrClassConfig__Group_3_1_1__0__Impl8292 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AttrClassConfig__Group_3_1_1__1__Impl_in_rule__AttrClassConfig__Group_3_1_1__18323 = new BitSet(new long[]{0x00000000000C0060L});
-    public static final BitSet FOLLOW_rule__AttrClassConfig__Group_3_1_1__2_in_rule__AttrClassConfig__Group_3_1_1__18326 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_43_in_rule__AttrClassConfig__Group_3_1_1__1__Impl8354 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AttrClassConfig__Group_3_1_1__2__Impl_in_rule__AttrClassConfig__Group_3_1_1__28385 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AttrClassConfig__MaxAssignment_3_1_1_2_in_rule__AttrClassConfig__Group_3_1_1__2__Impl8412 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AttrInstanceConfig__Group__0__Impl_in_rule__AttrInstanceConfig__Group__08448 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__AttrInstanceConfig__Group__1_in_rule__AttrInstanceConfig__Group__08451 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rule__AttrInstanceConfig__Group__0__Impl8479 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AttrInstanceConfig__Group__1__Impl_in_rule__AttrInstanceConfig__Group__18510 = new BitSet(new long[]{0x0000080008000000L});
-    public static final BitSet FOLLOW_rule__AttrInstanceConfig__Group__2_in_rule__AttrInstanceConfig__Group__18513 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AttrInstanceConfig__AttributeAssignment_1_in_rule__AttrInstanceConfig__Group__1__Impl8540 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AttrInstanceConfig__Group__2__Impl_in_rule__AttrInstanceConfig__Group__28570 = new BitSet(new long[]{0x0000080008000000L});
-    public static final BitSet FOLLOW_rule__AttrInstanceConfig__Group__3_in_rule__AttrInstanceConfig__Group__28573 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AttrInstanceConfig__Group_2__0_in_rule__AttrInstanceConfig__Group__2__Impl8600 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AttrInstanceConfig__Group__3__Impl_in_rule__AttrInstanceConfig__Group__38631 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AttrInstanceConfig__Group_3__0_in_rule__AttrInstanceConfig__Group__3__Impl8658 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AttrInstanceConfig__Group_2__0__Impl_in_rule__AttrInstanceConfig__Group_2__08697 = new BitSet(new long[]{0x20000000000E00F0L});
-    public static final BitSet FOLLOW_rule__AttrInstanceConfig__Group_2__1_in_rule__AttrInstanceConfig__Group_2__08700 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_43_in_rule__AttrInstanceConfig__Group_2__0__Impl8728 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AttrInstanceConfig__Group_2__1__Impl_in_rule__AttrInstanceConfig__Group_2__18759 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AttrInstanceConfig__ValueAssignment_2_1_in_rule__AttrInstanceConfig__Group_2__1__Impl8786 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AttrInstanceConfig__Group_3__0__Impl_in_rule__AttrInstanceConfig__Group_3__08820 = new BitSet(new long[]{0x0000040080000000L});
-    public static final BitSet FOLLOW_rule__AttrInstanceConfig__Group_3__1_in_rule__AttrInstanceConfig__Group_3__08823 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_rule__AttrInstanceConfig__Group_3__0__Impl8851 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AttrInstanceConfig__Group_3__1__Impl_in_rule__AttrInstanceConfig__Group_3__18882 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_rule__AttrInstanceConfig__Group_3__2_in_rule__AttrInstanceConfig__Group_3__18885 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AttrInstanceConfig__Group_3_1__0_in_rule__AttrInstanceConfig__Group_3__1__Impl8912 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AttrInstanceConfig__Group_3__2__Impl_in_rule__AttrInstanceConfig__Group_3__28942 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_rule__AttrInstanceConfig__Group_3__2__Impl8970 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AttrInstanceConfig__Group_3_1__0__Impl_in_rule__AttrInstanceConfig__Group_3_1__09007 = new BitSet(new long[]{0x0000040080000000L});
-    public static final BitSet FOLLOW_rule__AttrInstanceConfig__Group_3_1__1_in_rule__AttrInstanceConfig__Group_3_1__09010 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AttrInstanceConfig__Group_3_1_0__0_in_rule__AttrInstanceConfig__Group_3_1__0__Impl9037 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AttrInstanceConfig__Group_3_1__1__Impl_in_rule__AttrInstanceConfig__Group_3_1__19068 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AttrInstanceConfig__AttributesAssignment_3_1_1_in_rule__AttrInstanceConfig__Group_3_1__1__Impl9095 = new BitSet(new long[]{0x0000040000000002L});
-    public static final BitSet FOLLOW_rule__AttrInstanceConfig__Group_3_1_0__0__Impl_in_rule__AttrInstanceConfig__Group_3_1_0__09130 = new BitSet(new long[]{0x0800000000004000L});
-    public static final BitSet FOLLOW_rule__AttrInstanceConfig__Group_3_1_0__1_in_rule__AttrInstanceConfig__Group_3_1_0__09133 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AttrInstanceConfig__DynConfigAssignment_3_1_0_0_in_rule__AttrInstanceConfig__Group_3_1_0__0__Impl9160 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AttrInstanceConfig__Group_3_1_0__1__Impl_in_rule__AttrInstanceConfig__Group_3_1_0__19190 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AttrInstanceConfig__Alternatives_3_1_0_1_in_rule__AttrInstanceConfig__Group_3_1_0__1__Impl9217 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfigValueArray__Group__0__Impl_in_rule__ConfigValueArray__Group__09251 = new BitSet(new long[]{0x0000400000000000L});
-    public static final BitSet FOLLOW_rule__ConfigValueArray__Group__1_in_rule__ConfigValueArray__Group__09254 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfigValueArray__ValuesAssignment_0_in_rule__ConfigValueArray__Group__0__Impl9281 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfigValueArray__Group__1__Impl_in_rule__ConfigValueArray__Group__19311 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfigValueArray__Group_1__0_in_rule__ConfigValueArray__Group__1__Impl9338 = new BitSet(new long[]{0x0000400000000002L});
-    public static final BitSet FOLLOW_rule__ConfigValueArray__Group_1__0__Impl_in_rule__ConfigValueArray__Group_1__09373 = new BitSet(new long[]{0x20000000000E00F0L});
-    public static final BitSet FOLLOW_rule__ConfigValueArray__Group_1__1_in_rule__ConfigValueArray__Group_1__09376 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_rule__ConfigValueArray__Group_1__0__Impl9404 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfigValueArray__Group_1__1__Impl_in_rule__ConfigValueArray__Group_1__19435 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfigValueArray__ValuesAssignment_1_1_in_rule__ConfigValueArray__Group_1__1__Impl9462 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumConfigValue__Group__0__Impl_in_rule__EnumConfigValue__Group__09496 = new BitSet(new long[]{0x0000800000000000L});
-    public static final BitSet FOLLOW_rule__EnumConfigValue__Group__1_in_rule__EnumConfigValue__Group__09499 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumConfigValue__TypeAssignment_0_in_rule__EnumConfigValue__Group__0__Impl9526 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumConfigValue__Group__1__Impl_in_rule__EnumConfigValue__Group__19556 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__EnumConfigValue__Group__2_in_rule__EnumConfigValue__Group__19559 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_rule__EnumConfigValue__Group__1__Impl9587 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumConfigValue__Group__2__Impl_in_rule__EnumConfigValue__Group__29618 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumConfigValue__ValueAssignment_2_in_rule__EnumConfigValue__Group__2__Impl9645 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefPath__Group__0__Impl_in_rule__RefPath__Group__09681 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_rule__RefPath__Group__1_in_rule__RefPath__Group__09684 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefPath__RefsAssignment_0_in_rule__RefPath__Group__0__Impl9711 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefPath__Group__1__Impl_in_rule__RefPath__Group__19741 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefPath__Group_1__0_in_rule__RefPath__Group__1__Impl9768 = new BitSet(new long[]{0x0000000040000002L});
-    public static final BitSet FOLLOW_rule__RefPath__Group_1__0__Impl_in_rule__RefPath__Group_1__09803 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__RefPath__Group_1__1_in_rule__RefPath__Group_1__09806 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_30_in_rule__RefPath__Group_1__0__Impl9834 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefPath__Group_1__1__Impl_in_rule__RefPath__Group_1__19865 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefPath__RefsAssignment_1_1_in_rule__RefPath__Group_1__1__Impl9892 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefSegment__Group__0__Impl_in_rule__RefSegment__Group__09926 = new BitSet(new long[]{0x0001000000000000L});
-    public static final BitSet FOLLOW_rule__RefSegment__Group__1_in_rule__RefSegment__Group__09929 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefSegment__RefAssignment_0_in_rule__RefSegment__Group__0__Impl9956 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefSegment__Group__1__Impl_in_rule__RefSegment__Group__19986 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefSegment__Group_1__0_in_rule__RefSegment__Group__1__Impl10013 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefSegment__Group_1__0__Impl_in_rule__RefSegment__Group_1__010048 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__RefSegment__Group_1__1_in_rule__RefSegment__Group_1__010051 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_48_in_rule__RefSegment__Group_1__0__Impl10079 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefSegment__Group_1__1__Impl_in_rule__RefSegment__Group_1__110110 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefSegment__IdxAssignment_1_1_in_rule__RefSegment__Group_1__1__Impl10137 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeyValue__Group__0__Impl_in_rule__KeyValue__Group__010174 = new BitSet(new long[]{0x0000080000000000L});
-    public static final BitSet FOLLOW_rule__KeyValue__Group__1_in_rule__KeyValue__Group__010177 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeyValue__KeyAssignment_0_in_rule__KeyValue__Group__0__Impl10204 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeyValue__Group__1__Impl_in_rule__KeyValue__Group__110234 = new BitSet(new long[]{0x20000000000E00E0L});
-    public static final BitSet FOLLOW_rule__KeyValue__Group__2_in_rule__KeyValue__Group__110237 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_43_in_rule__KeyValue__Group__1__Impl10265 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeyValue__Group__2__Impl_in_rule__KeyValue__Group__210296 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeyValue__ValueAssignment_2_in_rule__KeyValue__Group__2__Impl10323 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__0__Impl_in_rule__SimpleAnnotationAttribute__Group__010362 = new BitSet(new long[]{0x0002000000000000L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__1_in_rule__SimpleAnnotationAttribute__Group__010365 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Alternatives_0_in_rule__SimpleAnnotationAttribute__Group__0__Impl10392 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__1__Impl_in_rule__SimpleAnnotationAttribute__Group__110422 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__2_in_rule__SimpleAnnotationAttribute__Group__110425 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_49_in_rule__SimpleAnnotationAttribute__Group__1__Impl10453 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__2__Impl_in_rule__SimpleAnnotationAttribute__Group__210484 = new BitSet(new long[]{0x0001000000000000L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__3_in_rule__SimpleAnnotationAttribute__Group__210487 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__NameAssignment_2_in_rule__SimpleAnnotationAttribute__Group__2__Impl10514 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__3__Impl_in_rule__SimpleAnnotationAttribute__Group__310544 = new BitSet(new long[]{0x0000000003C00000L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__4_in_rule__SimpleAnnotationAttribute__Group__310547 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_48_in_rule__SimpleAnnotationAttribute__Group__3__Impl10575 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__4__Impl_in_rule__SimpleAnnotationAttribute__Group__410606 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__TypeAssignment_4_in_rule__SimpleAnnotationAttribute__Group__4__Impl10633 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__0__Impl_in_rule__EnumAnnotationAttribute__Group__010673 = new BitSet(new long[]{0x0002000000000000L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__1_in_rule__EnumAnnotationAttribute__Group__010676 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Alternatives_0_in_rule__EnumAnnotationAttribute__Group__0__Impl10703 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__1__Impl_in_rule__EnumAnnotationAttribute__Group__110733 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__2_in_rule__EnumAnnotationAttribute__Group__110736 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_49_in_rule__EnumAnnotationAttribute__Group__1__Impl10764 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__2__Impl_in_rule__EnumAnnotationAttribute__Group__210795 = new BitSet(new long[]{0x0001000000000000L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__3_in_rule__EnumAnnotationAttribute__Group__210798 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__NameAssignment_2_in_rule__EnumAnnotationAttribute__Group__2__Impl10825 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__3__Impl_in_rule__EnumAnnotationAttribute__Group__310855 = new BitSet(new long[]{0x0000000008000000L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__4_in_rule__EnumAnnotationAttribute__Group__310858 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_48_in_rule__EnumAnnotationAttribute__Group__3__Impl10886 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__4__Impl_in_rule__EnumAnnotationAttribute__Group__410917 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__5_in_rule__EnumAnnotationAttribute__Group__410920 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_rule__EnumAnnotationAttribute__Group__4__Impl10948 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__5__Impl_in_rule__EnumAnnotationAttribute__Group__510979 = new BitSet(new long[]{0x0000400010000000L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__6_in_rule__EnumAnnotationAttribute__Group__510982 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__ValuesAssignment_5_in_rule__EnumAnnotationAttribute__Group__5__Impl11009 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__6__Impl_in_rule__EnumAnnotationAttribute__Group__611039 = new BitSet(new long[]{0x0000400010000000L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__7_in_rule__EnumAnnotationAttribute__Group__611042 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group_6__0_in_rule__EnumAnnotationAttribute__Group__6__Impl11069 = new BitSet(new long[]{0x0000400000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__7__Impl_in_rule__EnumAnnotationAttribute__Group__711100 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_rule__EnumAnnotationAttribute__Group__7__Impl11128 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group_6__0__Impl_in_rule__EnumAnnotationAttribute__Group_6__011175 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group_6__1_in_rule__EnumAnnotationAttribute__Group_6__011178 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_rule__EnumAnnotationAttribute__Group_6__0__Impl11206 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group_6__1__Impl_in_rule__EnumAnnotationAttribute__Group_6__111237 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__ValuesAssignment_6_1_in_rule__EnumAnnotationAttribute__Group_6__1__Impl11264 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__Group__0__Impl_in_rule__Import__Group__011298 = new BitSet(new long[]{0x0000000000010010L});
-    public static final BitSet FOLLOW_rule__Import__Group__1_in_rule__Import__Group__011301 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_50_in_rule__Import__Group__0__Impl11329 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__Group__1__Impl_in_rule__Import__Group__111360 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__Import__Group__2_in_rule__Import__Group__111363 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__Alternatives_1_in_rule__Import__Group__1__Impl11390 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__Group__2__Impl_in_rule__Import__Group__211420 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__ImportURIAssignment_2_in_rule__Import__Group__2__Impl11447 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__Group_1_0__0__Impl_in_rule__Import__Group_1_0__011483 = new BitSet(new long[]{0x0008000000000000L});
-    public static final BitSet FOLLOW_rule__Import__Group_1_0__1_in_rule__Import__Group_1_0__011486 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__ImportedNamespaceAssignment_1_0_0_in_rule__Import__Group_1_0__0__Impl11513 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__Group_1_0__1__Impl_in_rule__Import__Group_1_0__111543 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_rule__Import__Group_1_0__1__Impl11571 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ImportedFQN__Group__0__Impl_in_rule__ImportedFQN__Group__011606 = new BitSet(new long[]{0x0010000000000000L});
-    public static final BitSet FOLLOW_rule__ImportedFQN__Group__1_in_rule__ImportedFQN__Group__011609 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_rule__ImportedFQN__Group__0__Impl11636 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ImportedFQN__Group__1__Impl_in_rule__ImportedFQN__Group__111665 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_52_in_rule__ImportedFQN__Group__1__Impl11694 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Documentation__Group__0__Impl_in_rule__Documentation__Group__011731 = new BitSet(new long[]{0x0020000000000000L});
-    public static final BitSet FOLLOW_rule__Documentation__Group__1_in_rule__Documentation__Group__011734 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Documentation__Group__1__Impl_in_rule__Documentation__Group__111792 = new BitSet(new long[]{0x0040000000000080L});
-    public static final BitSet FOLLOW_rule__Documentation__Group__2_in_rule__Documentation__Group__111795 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_53_in_rule__Documentation__Group__1__Impl11823 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Documentation__Group__2__Impl_in_rule__Documentation__Group__211854 = new BitSet(new long[]{0x0040000000000080L});
-    public static final BitSet FOLLOW_rule__Documentation__Group__3_in_rule__Documentation__Group__211857 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Documentation__LinesAssignment_2_in_rule__Documentation__Group__2__Impl11884 = new BitSet(new long[]{0x0000000000000082L});
-    public static final BitSet FOLLOW_rule__Documentation__Group__3__Impl_in_rule__Documentation__Group__311915 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_54_in_rule__Documentation__Group__3__Impl11943 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TIME__Group_0__0__Impl_in_rule__TIME__Group_0__011982 = new BitSet(new long[]{0x0080000000000000L});
-    public static final BitSet FOLLOW_rule__TIME__Group_0__1_in_rule__TIME__Group_0__011985 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__TIME__Group_0__0__Impl12012 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TIME__Group_0__1__Impl_in_rule__TIME__Group_0__112041 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_55_in_rule__TIME__Group_0__1__Impl12069 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TIME__Group_1__0__Impl_in_rule__TIME__Group_1__012104 = new BitSet(new long[]{0x0100000000000000L});
-    public static final BitSet FOLLOW_rule__TIME__Group_1__1_in_rule__TIME__Group_1__012107 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__TIME__Group_1__0__Impl12134 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TIME__Group_1__1__Impl_in_rule__TIME__Group_1__112163 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_56_in_rule__TIME__Group_1__1__Impl12191 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TIME__Group_2__0__Impl_in_rule__TIME__Group_2__012226 = new BitSet(new long[]{0x0200000000000000L});
-    public static final BitSet FOLLOW_rule__TIME__Group_2__1_in_rule__TIME__Group_2__012229 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__TIME__Group_2__0__Impl12256 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TIME__Group_2__1__Impl_in_rule__TIME__Group_2__112285 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_57_in_rule__TIME__Group_2__1__Impl12313 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TIME__Group_3__0__Impl_in_rule__TIME__Group_3__012348 = new BitSet(new long[]{0x0400000000000000L});
-    public static final BitSet FOLLOW_rule__TIME__Group_3__1_in_rule__TIME__Group_3__012351 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__TIME__Group_3__0__Impl12378 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TIME__Group_3__1__Impl_in_rule__TIME__Group_3__112407 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_58_in_rule__TIME__Group_3__1__Impl12435 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__BooleanLiteral__Group__0__Impl_in_rule__BooleanLiteral__Group__012472 = new BitSet(new long[]{0x2000000000020000L});
-    public static final BitSet FOLLOW_rule__BooleanLiteral__Group__1_in_rule__BooleanLiteral__Group__012475 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__BooleanLiteral__Group__1__Impl_in_rule__BooleanLiteral__Group__112533 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__BooleanLiteral__Alternatives_1_in_rule__BooleanLiteral__Group__1__Impl12560 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RealLiteral__Group__0__Impl_in_rule__RealLiteral__Group__012594 = new BitSet(new long[]{0x00000000000C0060L});
-    public static final BitSet FOLLOW_rule__RealLiteral__Group__1_in_rule__RealLiteral__Group__012597 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RealLiteral__Group__1__Impl_in_rule__RealLiteral__Group__112655 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RealLiteral__ValueAssignment_1_in_rule__RealLiteral__Group__1__Impl12682 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IntLiteral__Group__0__Impl_in_rule__IntLiteral__Group__012716 = new BitSet(new long[]{0x00000000000C0060L});
-    public static final BitSet FOLLOW_rule__IntLiteral__Group__1_in_rule__IntLiteral__Group__012719 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IntLiteral__Group__1__Impl_in_rule__IntLiteral__Group__112777 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IntLiteral__ValueAssignment_1_in_rule__IntLiteral__Group__1__Impl12804 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StringLiteral__Group__0__Impl_in_rule__StringLiteral__Group__012838 = new BitSet(new long[]{0x20000000000E00E0L});
-    public static final BitSet FOLLOW_rule__StringLiteral__Group__1_in_rule__StringLiteral__Group__012841 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StringLiteral__Group__1__Impl_in_rule__StringLiteral__Group__112899 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StringLiteral__ValueAssignment_1_in_rule__StringLiteral__Group__1__Impl12926 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Integer__Group_0__0__Impl_in_rule__Integer__Group_0__012960 = new BitSet(new long[]{0x00000000000C0040L});
-    public static final BitSet FOLLOW_rule__Integer__Group_0__1_in_rule__Integer__Group_0__012963 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Integer__Alternatives_0_0_in_rule__Integer__Group_0__0__Impl12990 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Integer__Group_0__1__Impl_in_rule__Integer__Group_0__113021 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__Integer__Group_0__1__Impl13048 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Decimal__Group__0__Impl_in_rule__Decimal__Group__013081 = new BitSet(new long[]{0x00000000000C0040L});
-    public static final BitSet FOLLOW_rule__Decimal__Group__1_in_rule__Decimal__Group__013084 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Decimal__Alternatives_0_in_rule__Decimal__Group__0__Impl13111 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Decimal__Group__1__Impl_in_rule__Decimal__Group__113142 = new BitSet(new long[]{0x0000800000000000L});
-    public static final BitSet FOLLOW_rule__Decimal__Group__2_in_rule__Decimal__Group__113145 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__Decimal__Group__1__Impl13172 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Decimal__Group__2__Impl_in_rule__Decimal__Group__213201 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__Decimal__Group__3_in_rule__Decimal__Group__213204 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_rule__Decimal__Group__2__Impl13232 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Decimal__Group__3__Impl_in_rule__Decimal__Group__313263 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__Decimal__Group__3__Impl13290 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__0__Impl_in_rule__DecimalExp__Group__013327 = new BitSet(new long[]{0x00000000000C0060L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__1_in_rule__DecimalExp__Group__013330 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Alternatives_0_in_rule__DecimalExp__Group__0__Impl13357 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__1__Impl_in_rule__DecimalExp__Group__113388 = new BitSet(new long[]{0x0000800000000000L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__2_in_rule__DecimalExp__Group__113391 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__DecimalExp__Group__1__Impl13418 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__2__Impl_in_rule__DecimalExp__Group__213447 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__3_in_rule__DecimalExp__Group__213450 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_rule__DecimalExp__Group__2__Impl13478 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__3__Impl_in_rule__DecimalExp__Group__313509 = new BitSet(new long[]{0x0000000000300000L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__4_in_rule__DecimalExp__Group__313512 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__DecimalExp__Group__3__Impl13539 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__4__Impl_in_rule__DecimalExp__Group__413568 = new BitSet(new long[]{0x00000000000C0040L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__5_in_rule__DecimalExp__Group__413571 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Alternatives_4_in_rule__DecimalExp__Group__4__Impl13598 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__5__Impl_in_rule__DecimalExp__Group__513628 = new BitSet(new long[]{0x00000000000C0040L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__6_in_rule__DecimalExp__Group__513631 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Alternatives_5_in_rule__DecimalExp__Group__5__Impl13658 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__6__Impl_in_rule__DecimalExp__Group__613689 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__DecimalExp__Group__6__Impl13717 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FQN__Group__0__Impl_in_rule__FQN__Group__013761 = new BitSet(new long[]{0x0000800000000000L});
-    public static final BitSet FOLLOW_rule__FQN__Group__1_in_rule__FQN__Group__013764 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__FQN__Group__0__Impl13791 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FQN__Group__1__Impl_in_rule__FQN__Group__113820 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FQN__Group_1__0_in_rule__FQN__Group__1__Impl13847 = new BitSet(new long[]{0x0000800000000002L});
-    public static final BitSet FOLLOW_rule__FQN__Group_1__0__Impl_in_rule__FQN__Group_1__013882 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__FQN__Group_1__1_in_rule__FQN__Group_1__013885 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_rule__FQN__Group_1__0__Impl13913 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FQN__Group_1__1__Impl_in_rule__FQN__Group_1__113944 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__FQN__Group_1__1__Impl13971 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DynamicConfig__UnorderedGroup_2__0_in_rule__DynamicConfig__UnorderedGroup_214005 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DynamicConfig__Alternatives_2_0_in_rule__DynamicConfig__UnorderedGroup_2__Impl14094 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DynamicConfig__Group_2_1__0_in_rule__DynamicConfig__UnorderedGroup_2__Impl14185 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DynamicConfig__UnorderedGroup_2__Impl_in_rule__DynamicConfig__UnorderedGroup_2__014244 = new BitSet(new long[]{0x0000000B00000002L});
-    public static final BitSet FOLLOW_rule__DynamicConfig__UnorderedGroup_2__1_in_rule__DynamicConfig__UnorderedGroup_2__014247 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DynamicConfig__UnorderedGroup_2__Impl_in_rule__DynamicConfig__UnorderedGroup_2__114272 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorInstanceConfig__UnorderedGroup_7__0_in_rule__ActorInstanceConfig__UnorderedGroup_714300 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorInstanceConfig__AttributesAssignment_7_0_in_rule__ActorInstanceConfig__UnorderedGroup_7__Impl14388 = new BitSet(new long[]{0x0000040000000002L});
-    public static final BitSet FOLLOW_rule__ActorInstanceConfig__AttributesAssignment_7_0_in_rule__ActorInstanceConfig__UnorderedGroup_7__Impl14432 = new BitSet(new long[]{0x0000040000000002L});
-    public static final BitSet FOLLOW_rule__ActorInstanceConfig__PortsAssignment_7_1_in_rule__ActorInstanceConfig__UnorderedGroup_7__Impl14531 = new BitSet(new long[]{0x0000060000000002L});
-    public static final BitSet FOLLOW_rule__ActorInstanceConfig__PortsAssignment_7_1_in_rule__ActorInstanceConfig__UnorderedGroup_7__Impl14575 = new BitSet(new long[]{0x0000060000000002L});
-    public static final BitSet FOLLOW_rule__ActorInstanceConfig__UnorderedGroup_7__Impl_in_rule__ActorInstanceConfig__UnorderedGroup_7__014641 = new BitSet(new long[]{0x0000060000000002L});
-    public static final BitSet FOLLOW_rule__ActorInstanceConfig__UnorderedGroup_7__1_in_rule__ActorInstanceConfig__UnorderedGroup_7__014644 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorInstanceConfig__UnorderedGroup_7__Impl_in_rule__ActorInstanceConfig__UnorderedGroup_7__114669 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClassConfig__UnorderedGroup_3__0_in_rule__ProtocolClassConfig__UnorderedGroup_314697 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClassConfig__Group_3_0__0_in_rule__ProtocolClassConfig__UnorderedGroup_3__Impl14784 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClassConfig__Group_3_1__0_in_rule__ProtocolClassConfig__UnorderedGroup_3__Impl14875 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClassConfig__UnorderedGroup_3__Impl_in_rule__ProtocolClassConfig__UnorderedGroup_3__014934 = new BitSet(new long[]{0x0000008000003002L});
-    public static final BitSet FOLLOW_rule__ProtocolClassConfig__UnorderedGroup_3__1_in_rule__ProtocolClassConfig__UnorderedGroup_3__014937 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClassConfig__UnorderedGroup_3__Impl_in_rule__ProtocolClassConfig__UnorderedGroup_3__114962 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_rule__ConfigModel__NameAssignment_114994 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleImport_in_rule__ConfigModel__ImportsAssignment_315025 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleConfigElement_in_rule__ConfigModel__ConfigElementsAssignment_415056 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_rule__SubSystemConfig__RootAssignment_115091 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__SubSystemConfig__SubSystemAssignment_315130 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDynamicConfig_in_rule__SubSystemConfig__DynConfigAssignment_515165 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__DynamicConfig__FilePathAssignment_2_0_0_115196 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__DynamicConfig__UserCode1Assignment_2_0_1_0_115227 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__DynamicConfig__UserCode2Assignment_2_0_1_1_115258 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTIME_in_rule__DynamicConfig__PollingAssignment_2_1_115289 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_rule__ActorClassConfig__ActorAssignment_115324 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAttrClassConfig_in_rule__ActorClassConfig__AttributesAssignment_315359 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_rule__ActorInstanceConfig__RootAssignment_115394 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__ActorInstanceConfig__SubSystemAssignment_315433 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRefPath_in_rule__ActorInstanceConfig__PathAssignment_515468 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAttrInstanceConfig_in_rule__ActorInstanceConfig__AttributesAssignment_7_015499 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rulePortInstanceConfig_in_rule__ActorInstanceConfig__PortsAssignment_7_115530 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_rule__ProtocolClassConfig__ProtocolAssignment_115565 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rulePortClassConfig_in_rule__ProtocolClassConfig__RegularAssignment_3_0_115600 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rulePortClassConfig_in_rule__ProtocolClassConfig__ConjugatedAssignment_3_1_115631 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAttrClassConfig_in_rule__PortClassConfig__AttributesAssignment_315662 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__PortInstanceConfig__ItemAssignment_115697 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAttrInstanceConfig_in_rule__PortInstanceConfig__AttributesAssignment_315732 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__AttrClassConfig__AttributeAssignment_115767 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleConfigValueArray_in_rule__AttrClassConfig__ValueAssignment_2_115802 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNumberLiteral_in_rule__AttrClassConfig__MinAssignment_3_1_0_215833 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNumberLiteral_in_rule__AttrClassConfig__MaxAssignment_3_1_1_215864 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAttrClassConfig_in_rule__AttrClassConfig__AttributesAssignment_3_1_215895 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__AttrInstanceConfig__AttributeAssignment_115930 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleConfigValueArray_in_rule__AttrInstanceConfig__ValueAssignment_2_115965 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_31_in_rule__AttrInstanceConfig__DynConfigAssignment_3_1_0_016001 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_59_in_rule__AttrInstanceConfig__ReadOnlyAssignment_3_1_0_1_016045 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAttrInstanceConfig_in_rule__AttrInstanceConfig__AttributesAssignment_3_1_116084 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleConfigValue_in_rule__ConfigValueArray__ValuesAssignment_016115 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleConfigValue_in_rule__ConfigValueArray__ValuesAssignment_1_116146 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLiteral_in_rule__LiteralConfigValue__ValueAssignment16177 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__EnumConfigValue__TypeAssignment_016212 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__EnumConfigValue__ValueAssignment_216251 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRefSegment_in_rule__RefPath__RefsAssignment_016286 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRefSegment_in_rule__RefPath__RefsAssignment_1_116317 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__RefSegment__RefAssignment_016348 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__RefSegment__IdxAssignment_1_116379 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__KeyValue__KeyAssignment_016413 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLiteral_in_rule__KeyValue__ValueAssignment_216444 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_60_in_rule__SimpleAnnotationAttribute__OptionalAssignment_0_016486 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__SimpleAnnotationAttribute__NameAssignment_216525 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLiteralType_in_rule__SimpleAnnotationAttribute__TypeAssignment_416556 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_60_in_rule__EnumAnnotationAttribute__OptionalAssignment_0_016592 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__EnumAnnotationAttribute__NameAssignment_216631 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__EnumAnnotationAttribute__ValuesAssignment_516662 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__EnumAnnotationAttribute__ValuesAssignment_6_116693 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleImportedFQN_in_rule__Import__ImportedNamespaceAssignment_1_0_016724 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__Import__ImportURIAssignment_216755 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__Documentation__LinesAssignment_216786 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_61_in_rule__BooleanLiteral__IsTrueAssignment_1_116824 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleReal_in_rule__RealLiteral__ValueAssignment_116863 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInteger_in_rule__IntLiteral__ValueAssignment_116894 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__StringLiteral__ValueAssignment_116925 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DynamicConfig__Alternatives_2_0_in_synpred54_InternalConfig14094 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DynamicConfig__UnorderedGroup_2__1_in_synpred55_InternalConfig14247 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorInstanceConfig__UnorderedGroup_7__0_in_synpred56_InternalConfig14300 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorInstanceConfig__AttributesAssignment_7_0_in_synpred57_InternalConfig14429 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorInstanceConfig__AttributesAssignment_7_0_in_synpred58_InternalConfig14388 = new BitSet(new long[]{0x0000040000000002L});
-    public static final BitSet FOLLOW_rule__ActorInstanceConfig__AttributesAssignment_7_0_in_synpred58_InternalConfig14432 = new BitSet(new long[]{0x0000040000000002L});
-    public static final BitSet FOLLOW_rule__ActorInstanceConfig__PortsAssignment_7_1_in_synpred59_InternalConfig14572 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorInstanceConfig__UnorderedGroup_7__1_in_synpred60_InternalConfig14644 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClassConfig__UnorderedGroup_3__0_in_synpred61_InternalConfig14697 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClassConfig__Group_3_0__0_in_synpred62_InternalConfig14784 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClassConfig__UnorderedGroup_3__1_in_synpred63_InternalConfig14937 = 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[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x0000000008000000L});
+    public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x0004007030000000L});
+    public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x0004000000000002L});
+    public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x0000007020000002L});
+    public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x0000000040000000L});
+    public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x0000000080000000L});
+    public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0000000010000000L});
+    public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0000000B00000000L});
+    public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0000000000000080L});
+    public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000000400000000L});
+    public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x0000000000000040L});
+    public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0000040010000000L});
+    public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x0000040000000002L});
+    public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0000060000000000L});
+    public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0000008000003000L});
+    public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0000010000000000L});
+    public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x0000080008000000L});
+    public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x20000000000E00F0L});
+    public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0000340000000000L});
+    public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x0000080000000000L});
+    public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x00000000000C0060L});
+    public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x0000040080000000L});
+    public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x0800000000004000L});
+    public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x0000400000000000L});
+    public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x0000400000000002L});
+    public static final BitSet FOLLOW_29 = new BitSet(new long[]{0x0000800000000000L});
+    public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x0000000040000002L});
+    public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x0001000000000000L});
+    public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x20000000000E00E0L});
+    public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x0002000000000000L});
+    public static final BitSet FOLLOW_34 = new BitSet(new long[]{0x0000000003C00000L});
+    public static final BitSet FOLLOW_35 = new BitSet(new long[]{0x0000400010000000L});
+    public static final BitSet FOLLOW_36 = new BitSet(new long[]{0x0000000000010010L});
+    public static final BitSet FOLLOW_37 = new BitSet(new long[]{0x0008000000000000L});
+    public static final BitSet FOLLOW_38 = new BitSet(new long[]{0x0010000000000000L});
+    public static final BitSet FOLLOW_39 = new BitSet(new long[]{0x0020000000000000L});
+    public static final BitSet FOLLOW_40 = new BitSet(new long[]{0x0040000000000080L});
+    public static final BitSet FOLLOW_41 = new BitSet(new long[]{0x0000000000000082L});
+    public static final BitSet FOLLOW_42 = new BitSet(new long[]{0x0080000000000000L});
+    public static final BitSet FOLLOW_43 = new BitSet(new long[]{0x0100000000000000L});
+    public static final BitSet FOLLOW_44 = new BitSet(new long[]{0x0200000000000000L});
+    public static final BitSet FOLLOW_45 = new BitSet(new long[]{0x0400000000000000L});
+    public static final BitSet FOLLOW_46 = new BitSet(new long[]{0x2000000000020000L});
+    public static final BitSet FOLLOW_47 = new BitSet(new long[]{0x00000000000C0040L});
+    public static final BitSet FOLLOW_48 = new BitSet(new long[]{0x0000000000300000L});
+    public static final BitSet FOLLOW_49 = new BitSet(new long[]{0x0000800000000002L});
+    public static final BitSet FOLLOW_50 = new BitSet(new long[]{0x0000000B00000002L});
+    public static final BitSet FOLLOW_51 = new BitSet(new long[]{0x0000060000000002L});
+    public static final BitSet FOLLOW_52 = new BitSet(new long[]{0x0000008000003002L});
 
 }
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/AbstractConfigRuntimeModule.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/AbstractConfigRuntimeModule.java
index 0e727c363..9dfe87b6f 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/AbstractConfigRuntimeModule.java
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/AbstractConfigRuntimeModule.java
@@ -6,7 +6,6 @@ package org.eclipse.etrice.core;
 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.ConfigRuntimeModule}
  */
- @SuppressWarnings("all")
-public abstract class AbstractConfigRuntimeModule extends DefaultRuntimeModule {
+@SuppressWarnings("all")
+public abstract class AbstractConfigRuntimeModule extends org.eclipse.xtext.service.DefaultRuntimeModule {
 
 	protected Properties properties = null;
 
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/Config.genmodel b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/Config.genmodel
index 4473bb37f..0853a85ed 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/Config.genmodel
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/Config.genmodel
@@ -3,8 +3,8 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.etrice.core.config/src-gen" editDirectory="/org.eclipse.etrice.core.config.edit/src"
     editorDirectory="/org.eclipse.etrice.core.config.editor/src" modelPluginID="org.eclipse.etrice.core.config"
     forceOverwrite="true" modelName="Config" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.etrice.core.config.edit"
-    editorPluginID="org.eclipse.etrice.core.config.editor" runtimeVersion="2.10" usedGenPackages="platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.genmodel#//base platform:/resource/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.genmodel#//room">
+    complianceLevel="6.0" copyrightFields="false" editPluginID="org.eclipse.etrice.core.config.edit"
+    editorPluginID="org.eclipse.etrice.core.config.editor" runtimeVersion="2.12" usedGenPackages="platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.genmodel#//base platform:/resource/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.genmodel#//room">
   <genPackages prefix="Config" basePackage="org.eclipse.etrice.core" disposableProviderFactory="true"
       ecorePackage="Config.ecore#/">
     <genClasses ecoreClass="Config.ecore#//ConfigModel">
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/Config.xtextbin b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/Config.xtextbin
index 0097c250c..41019be12 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/Config.xtextbin
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/Config.xtextbin
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/ConfigStandaloneSetupGenerated.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/ConfigStandaloneSetupGenerated.java
index f034b082a..47eb29da1 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/ConfigStandaloneSetupGenerated.java
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/ConfigStandaloneSetupGenerated.java
@@ -1,11 +1,11 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core;
 
 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 ConfigStandaloneSetupGenerated implements ISetup {
 
+	@Override
 	public Injector createInjectorAndDoEMFRegistration() {
 		org.eclipse.etrice.core.common.BaseStandaloneSetup.doSetup();
 
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ActorClassConfig.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ActorClassConfig.java
index 1bc019f91..235c7edac 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ActorClassConfig.java
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ActorClassConfig.java
@@ -24,11 +24,11 @@ import org.eclipse.etrice.core.room.ActorClass;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.config.ActorClassConfig#getActor <em>Actor</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.config.ActorClassConfig#getAttributes <em>Attributes</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.config.ConfigPackage#getActorClassConfig()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ActorInstanceConfig.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ActorInstanceConfig.java
index 305e93e13..787f47b00 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ActorInstanceConfig.java
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ActorInstanceConfig.java
@@ -25,6 +25,7 @@ import org.eclipse.etrice.core.room.SubSystemRef;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.config.ActorInstanceConfig#getRoot <em>Root</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.config.ActorInstanceConfig#getSubSystem <em>Sub System</em>}</li>
@@ -32,7 +33,6 @@ import org.eclipse.etrice.core.room.SubSystemRef;
  *   <li>{@link org.eclipse.etrice.core.config.ActorInstanceConfig#getAttributes <em>Attributes</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.config.ActorInstanceConfig#getPorts <em>Ports</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.config.ConfigPackage#getActorInstanceConfig()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/AttrClassConfig.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/AttrClassConfig.java
index 074e68883..b2b58e6aa 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/AttrClassConfig.java
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/AttrClassConfig.java
@@ -25,12 +25,12 @@ import org.eclipse.etrice.core.common.base.NumberLiteral;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.config.AttrClassConfig#getMin <em>Min</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.config.AttrClassConfig#getMax <em>Max</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.config.AttrClassConfig#getAttributes <em>Attributes</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.config.ConfigPackage#getAttrClassConfig()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/AttrConfig.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/AttrConfig.java
index 14273fa14..8c5801e94 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/AttrConfig.java
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/AttrConfig.java
@@ -22,11 +22,11 @@ import org.eclipse.etrice.core.room.Attribute;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.config.AttrConfig#getAttribute <em>Attribute</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.config.AttrConfig#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.config.ConfigPackage#getAttrConfig()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/AttrInstanceConfig.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/AttrInstanceConfig.java
index 3d4907d11..5e399f531 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/AttrInstanceConfig.java
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/AttrInstanceConfig.java
@@ -23,12 +23,12 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.config.AttrInstanceConfig#isDynConfig <em>Dyn Config</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.config.AttrInstanceConfig#isReadOnly <em>Read Only</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.config.AttrInstanceConfig#getAttributes <em>Attributes</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.config.ConfigPackage#getAttrInstanceConfig()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ConfigModel.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ConfigModel.java
index d59b1faf2..d22abbd62 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ConfigModel.java
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ConfigModel.java
@@ -23,12 +23,12 @@ import org.eclipse.etrice.core.common.base.Import;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.config.ConfigModel#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.config.ConfigModel#getImports <em>Imports</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.config.ConfigModel#getConfigElements <em>Config Elements</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.config.ConfigPackage#getConfigModel()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ConfigValueArray.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ConfigValueArray.java
index c21740abd..f9d1187a1 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ConfigValueArray.java
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ConfigValueArray.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.config.ConfigValueArray#getValues <em>Values</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.config.ConfigPackage#getConfigValueArray()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/DynamicConfig.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/DynamicConfig.java
index ad0396c9a..aec6b3ea9 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/DynamicConfig.java
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/DynamicConfig.java
@@ -19,13 +19,13 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.config.DynamicConfig#getFilePath <em>File Path</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.config.DynamicConfig#getUserCode1 <em>User Code1</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.config.DynamicConfig#getUserCode2 <em>User Code2</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.config.DynamicConfig#getPolling <em>Polling</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.config.ConfigPackage#getDynamicConfig()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/EnumConfigValue.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/EnumConfigValue.java
index 2c4e8b177..51918766c 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/EnumConfigValue.java
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/EnumConfigValue.java
@@ -12,11 +12,11 @@ import org.eclipse.etrice.core.room.EnumerationType;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.config.EnumConfigValue#getType <em>Type</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.config.EnumConfigValue#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.config.ConfigPackage#getEnumConfigValue()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/LiteralConfigValue.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/LiteralConfigValue.java
index 63f85ae97..8238cdb91 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/LiteralConfigValue.java
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/LiteralConfigValue.java
@@ -11,10 +11,10 @@ import org.eclipse.etrice.core.common.base.Literal;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.config.LiteralConfigValue#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.config.ConfigPackage#getLiteralConfigValue()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/PortClassConfig.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/PortClassConfig.java
index 265aed4e2..87f60d233 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/PortClassConfig.java
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/PortClassConfig.java
@@ -24,10 +24,10 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.config.PortClassConfig#getAttributes <em>Attributes</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.config.ConfigPackage#getPortClassConfig()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/PortInstanceConfig.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/PortInstanceConfig.java
index 6b04c4972..6866c607f 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/PortInstanceConfig.java
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/PortInstanceConfig.java
@@ -26,11 +26,11 @@ import org.eclipse.etrice.core.room.InterfaceItem;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.config.PortInstanceConfig#getItem <em>Item</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.config.PortInstanceConfig#getAttributes <em>Attributes</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.config.ConfigPackage#getPortInstanceConfig()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ProtocolClassConfig.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ProtocolClassConfig.java
index bbe577e1b..5ebd048ab 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ProtocolClassConfig.java
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ProtocolClassConfig.java
@@ -21,12 +21,12 @@ import org.eclipse.etrice.core.room.ProtocolClass;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.config.ProtocolClassConfig#getProtocol <em>Protocol</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.config.ProtocolClassConfig#getRegular <em>Regular</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.config.ProtocolClassConfig#getConjugated <em>Conjugated</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.config.ConfigPackage#getProtocolClassConfig()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/RefPath.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/RefPath.java
index bc0856c7d..9969e8e38 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/RefPath.java
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/RefPath.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.config.RefPath#getRefs <em>Refs</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.config.ConfigPackage#getRefPath()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/RefSegment.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/RefSegment.java
index e23cdbddb..43dcc6168 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/RefSegment.java
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/RefSegment.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.config.RefSegment#getRef <em>Ref</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.config.RefSegment#getIdx <em>Idx</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.config.ConfigPackage#getRefSegment()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/SubSystemConfig.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/SubSystemConfig.java
index aecec2787..8d1a5d53c 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/SubSystemConfig.java
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/SubSystemConfig.java
@@ -17,12 +17,12 @@ import org.eclipse.etrice.core.room.SubSystemRef;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.config.SubSystemConfig#getRoot <em>Root</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.config.SubSystemConfig#getSubSystem <em>Sub System</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.config.SubSystemConfig#getDynConfig <em>Dyn Config</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.config.ConfigPackage#getSubSystemConfig()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ActorClassConfigImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ActorClassConfigImpl.java
index 92770da86..5be619271 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ActorClassConfigImpl.java
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ActorClassConfigImpl.java
@@ -29,11 +29,11 @@ import org.eclipse.etrice.core.room.ActorClass;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.config.impl.ActorClassConfigImpl#getActor <em>Actor</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.config.impl.ActorClassConfigImpl#getAttributes <em>Attributes</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ActorInstanceConfigImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ActorInstanceConfigImpl.java
index 8cc9fbf4c..c7ac55908 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ActorInstanceConfigImpl.java
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ActorInstanceConfigImpl.java
@@ -32,6 +32,7 @@ import org.eclipse.etrice.core.room.SubSystemRef;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.config.impl.ActorInstanceConfigImpl#getRoot <em>Root</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.config.impl.ActorInstanceConfigImpl#getSubSystem <em>Sub System</em>}</li>
@@ -39,7 +40,6 @@ import org.eclipse.etrice.core.room.SubSystemRef;
  *   <li>{@link org.eclipse.etrice.core.config.impl.ActorInstanceConfigImpl#getAttributes <em>Attributes</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.config.impl.ActorInstanceConfigImpl#getPorts <em>Ports</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/AttrClassConfigImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/AttrClassConfigImpl.java
index 155edada9..36bd517e6 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/AttrClassConfigImpl.java
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/AttrClassConfigImpl.java
@@ -28,12 +28,12 @@ import org.eclipse.etrice.core.config.ConfigPackage;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.config.impl.AttrClassConfigImpl#getMin <em>Min</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.config.impl.AttrClassConfigImpl#getMax <em>Max</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.config.impl.AttrClassConfigImpl#getAttributes <em>Attributes</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/AttrConfigImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/AttrConfigImpl.java
index c0d08c479..bb1aab3c7 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/AttrConfigImpl.java
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/AttrConfigImpl.java
@@ -23,11 +23,11 @@ import org.eclipse.etrice.core.room.Attribute;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.config.impl.AttrConfigImpl#getAttribute <em>Attribute</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.config.impl.AttrConfigImpl#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/AttrInstanceConfigImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/AttrInstanceConfigImpl.java
index 12597c192..c51d05674 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/AttrInstanceConfigImpl.java
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/AttrInstanceConfigImpl.java
@@ -26,12 +26,12 @@ import org.eclipse.etrice.core.config.ConfigPackage;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.config.impl.AttrInstanceConfigImpl#isDynConfig <em>Dyn Config</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.config.impl.AttrInstanceConfigImpl#isReadOnly <em>Read Only</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.config.impl.AttrInstanceConfigImpl#getAttributes <em>Attributes</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ConfigElementImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ConfigElementImpl.java
index dc6c91dba..93377f9db 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ConfigElementImpl.java
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ConfigElementImpl.java
@@ -13,8 +13,6 @@ import org.eclipse.etrice.core.config.ConfigPackage;
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Element</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ConfigModelImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ConfigModelImpl.java
index 1ba471215..a01c7b3b8 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ConfigModelImpl.java
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ConfigModelImpl.java
@@ -34,12 +34,12 @@ import org.eclipse.etrice.core.config.SubSystemConfig;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.config.impl.ConfigModelImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.config.impl.ConfigModelImpl#getImports <em>Imports</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.config.impl.ConfigModelImpl#getConfigElements <em>Config Elements</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ConfigValueArrayImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ConfigValueArrayImpl.java
index f2b7c6826..f045c74db 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ConfigValueArrayImpl.java
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ConfigValueArrayImpl.java
@@ -26,10 +26,10 @@ import org.eclipse.etrice.core.config.ConfigValueArray;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.config.impl.ConfigValueArrayImpl#getValues <em>Values</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ConfigValueImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ConfigValueImpl.java
index a6d2512b5..246741596 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ConfigValueImpl.java
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ConfigValueImpl.java
@@ -13,8 +13,6 @@ import org.eclipse.etrice.core.config.ConfigValue;
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Value</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/DynamicConfigImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/DynamicConfigImpl.java
index abd8bd0a7..2a2b024c3 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/DynamicConfigImpl.java
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/DynamicConfigImpl.java
@@ -18,13 +18,13 @@ import org.eclipse.etrice.core.config.DynamicConfig;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.config.impl.DynamicConfigImpl#getFilePath <em>File Path</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.config.impl.DynamicConfigImpl#getUserCode1 <em>User Code1</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.config.impl.DynamicConfigImpl#getUserCode2 <em>User Code2</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.config.impl.DynamicConfigImpl#getPolling <em>Polling</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/EnumConfigValueImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/EnumConfigValueImpl.java
index 81e20c520..c5902bd36 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/EnumConfigValueImpl.java
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/EnumConfigValueImpl.java
@@ -21,11 +21,11 @@ import org.eclipse.etrice.core.room.EnumerationType;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.config.impl.EnumConfigValueImpl#getType <em>Type</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.config.impl.EnumConfigValueImpl#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/LiteralConfigValueImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/LiteralConfigValueImpl.java
index 49e9b1b49..01f5f01a1 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/LiteralConfigValueImpl.java
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/LiteralConfigValueImpl.java
@@ -21,10 +21,10 @@ import org.eclipse.etrice.core.config.LiteralConfigValue;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.config.impl.LiteralConfigValueImpl#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/PortClassConfigImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/PortClassConfigImpl.java
index 8377ccb07..5d349838d 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/PortClassConfigImpl.java
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/PortClassConfigImpl.java
@@ -26,10 +26,10 @@ import org.eclipse.etrice.core.config.PortClassConfig;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.config.impl.PortClassConfigImpl#getAttributes <em>Attributes</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/PortInstanceConfigImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/PortInstanceConfigImpl.java
index 913762f66..405d6245f 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/PortInstanceConfigImpl.java
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/PortInstanceConfigImpl.java
@@ -30,11 +30,11 @@ import org.eclipse.etrice.core.room.InterfaceItem;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.config.impl.PortInstanceConfigImpl#getItem <em>Item</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.config.impl.PortInstanceConfigImpl#getAttributes <em>Attributes</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ProtocolClassConfigImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ProtocolClassConfigImpl.java
index 164f326e0..dfb70f716 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ProtocolClassConfigImpl.java
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ProtocolClassConfigImpl.java
@@ -22,12 +22,12 @@ import org.eclipse.etrice.core.room.ProtocolClass;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.config.impl.ProtocolClassConfigImpl#getProtocol <em>Protocol</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.config.impl.ProtocolClassConfigImpl#getRegular <em>Regular</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.config.impl.ProtocolClassConfigImpl#getConjugated <em>Conjugated</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/RefPathImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/RefPathImpl.java
index deb182b45..db2d5ea57 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/RefPathImpl.java
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/RefPathImpl.java
@@ -26,10 +26,10 @@ import org.eclipse.etrice.core.config.RefSegment;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.config.impl.RefPathImpl#getRefs <em>Refs</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/RefSegmentImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/RefSegmentImpl.java
index 9dcae1d12..51791be29 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/RefSegmentImpl.java
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/RefSegmentImpl.java
@@ -18,11 +18,11 @@ import org.eclipse.etrice.core.config.RefSegment;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.config.impl.RefSegmentImpl#getRef <em>Ref</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.config.impl.RefSegmentImpl#getIdx <em>Idx</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/SubSystemConfigImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/SubSystemConfigImpl.java
index 3409a7e46..d12f57dc9 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/SubSystemConfigImpl.java
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/SubSystemConfigImpl.java
@@ -23,12 +23,12 @@ import org.eclipse.etrice.core.room.SubSystemRef;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.config.impl.SubSystemConfigImpl#getRoot <em>Root</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.config.impl.SubSystemConfigImpl#getSubSystem <em>Sub System</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.config.impl.SubSystemConfigImpl#getDynConfig <em>Dyn Config</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/util/ConfigSwitch.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/util/ConfigSwitch.java
index 621901820..3cb1d025a 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/util/ConfigSwitch.java
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/util/ConfigSwitch.java
@@ -50,7 +50,7 @@ public class ConfigSwitch<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
    */
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/ConfigAntlrTokenFileProvider.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/ConfigAntlrTokenFileProvider.java
index fdd47642c..42d640b6c 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/ConfigAntlrTokenFileProvider.java
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/ConfigAntlrTokenFileProvider.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.parser.antlr;
 
 import java.io.InputStream;
@@ -8,6 +8,7 @@ import org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider;
 
 public class ConfigAntlrTokenFileProvider implements IAntlrTokenFileProvider {
 	
+	@Override
 	public InputStream getAntlrTokenFile() {
 		ClassLoader classLoader = getClass().getClassLoader();
     	return classLoader.getResourceAsStream("org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.tokens");
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/ConfigParser.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/ConfigParser.java
index 2b7ad294f..5cab0d72c 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/ConfigParser.java
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/ConfigParser.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.parser.antlr;
 
 import com.google.inject.Inject;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g
index bbfbc8b98..fa08ec450 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 grammar InternalConfig;
 
 options {
@@ -95,7 +95,7 @@ ruleConfigModel returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"FQN");
+        		"org.eclipse.etrice.core.common.Base.FQN");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -117,7 +117,7 @@ ruleConfigModel returns [EObject current=null]
        			$current, 
        			"imports",
         		lv_imports_3_0, 
-        		"Import");
+        		"org.eclipse.etrice.core.common.Base.Import");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -135,7 +135,7 @@ ruleConfigModel returns [EObject current=null]
        			$current, 
        			"configElements",
         		lv_configElements_4_0, 
-        		"ConfigElement");
+        		"org.eclipse.etrice.core.Config.ConfigElement");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -278,7 +278,7 @@ ruleSubSystemConfig returns [EObject current=null]
        			$current, 
        			"dynConfig",
         		lv_dynConfig_5_0, 
-        		"DynamicConfig");
+        		"org.eclipse.etrice.core.Config.DynamicConfig");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -348,7 +348,7 @@ ruleDynamicConfig returns [EObject current=null]
        			$current, 
        			"filePath",
         		lv_filePath_4_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -371,7 +371,7 @@ ruleDynamicConfig returns [EObject current=null]
        			$current, 
        			"userCode1",
         		lv_userCode1_6_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -393,7 +393,7 @@ ruleDynamicConfig returns [EObject current=null]
        			$current, 
        			"userCode2",
         		lv_userCode2_8_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -426,7 +426,7 @@ ruleDynamicConfig returns [EObject current=null]
        			$current, 
        			"polling",
         		lv_polling_10_0, 
-        		"TIME");
+        		"org.eclipse.etrice.core.common.Base.TIME");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -507,7 +507,7 @@ ruleActorClassConfig returns [EObject current=null]
        			$current, 
        			"attributes",
         		lv_attributes_3_0, 
-        		"AttrClassConfig");
+        		"org.eclipse.etrice.core.Config.AttrClassConfig");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -590,7 +590,7 @@ ruleActorInstanceConfig returns [EObject current=null]
        			$current, 
        			"path",
         		lv_path_5_0, 
-        		"RefPath");
+        		"org.eclipse.etrice.core.Config.RefPath");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -626,7 +626,7 @@ ruleActorInstanceConfig returns [EObject current=null]
        			$current, 
        			"attributes",
         		lv_attributes_8_0, 
-        		"AttrInstanceConfig");
+        		"org.eclipse.etrice.core.Config.AttrInstanceConfig");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -656,7 +656,7 @@ ruleActorInstanceConfig returns [EObject current=null]
        			$current, 
        			"ports",
         		lv_ports_9_0, 
-        		"PortInstanceConfig");
+        		"org.eclipse.etrice.core.Config.PortInstanceConfig");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -754,7 +754,7 @@ ruleProtocolClassConfig returns [EObject current=null]
        			$current, 
        			"regular",
         		lv_regular_5_0, 
-        		"PortClassConfig");
+        		"org.eclipse.etrice.core.Config.PortClassConfig");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -793,7 +793,7 @@ ruleProtocolClassConfig returns [EObject current=null]
        			$current, 
        			"conjugated",
         		lv_conjugated_8_0, 
-        		"PortClassConfig");
+        		"org.eclipse.etrice.core.Config.PortClassConfig");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -864,7 +864,7 @@ rulePortClassConfig returns [EObject current=null]
        			$current, 
        			"attributes",
         		lv_attributes_3_0, 
-        		"AttrClassConfig");
+        		"org.eclipse.etrice.core.Config.AttrClassConfig");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -928,7 +928,7 @@ rulePortInstanceConfig returns [EObject current=null]
        			$current, 
        			"attributes",
         		lv_attributes_3_0, 
-        		"AttrInstanceConfig");
+        		"org.eclipse.etrice.core.Config.AttrInstanceConfig");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -994,7 +994,7 @@ ruleAttrClassConfig returns [EObject current=null]
        			$current, 
        			"value",
         		lv_value_3_0, 
-        		"ConfigValueArray");
+        		"org.eclipse.etrice.core.Config.ConfigValueArray");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1024,7 +1024,7 @@ ruleAttrClassConfig returns [EObject current=null]
        			$current, 
        			"min",
         		lv_min_7_0, 
-        		"NumberLiteral");
+        		"org.eclipse.etrice.core.common.Base.NumberLiteral");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1050,7 +1050,7 @@ ruleAttrClassConfig returns [EObject current=null]
        			$current, 
        			"max",
         		lv_max_10_0, 
-        		"NumberLiteral");
+        		"org.eclipse.etrice.core.common.Base.NumberLiteral");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1068,7 +1068,7 @@ ruleAttrClassConfig returns [EObject current=null]
        			$current, 
        			"attributes",
         		lv_attributes_11_0, 
-        		"AttrClassConfig");
+        		"org.eclipse.etrice.core.Config.AttrClassConfig");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1132,7 +1132,7 @@ ruleAttrInstanceConfig returns [EObject current=null]
        			$current, 
        			"value",
         		lv_value_3_0, 
-        		"ConfigValueArray");
+        		"org.eclipse.etrice.core.Config.ConfigValueArray");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1189,7 +1189,7 @@ ruleAttrInstanceConfig returns [EObject current=null]
        			$current, 
        			"attributes",
         		lv_attributes_8_0, 
-        		"AttrInstanceConfig");
+        		"org.eclipse.etrice.core.Config.AttrInstanceConfig");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1232,7 +1232,7 @@ ruleConfigValueArray returns [EObject current=null]
        			$current, 
        			"values",
         		lv_values_0_0, 
-        		"ConfigValue");
+        		"org.eclipse.etrice.core.Config.ConfigValue");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1254,7 +1254,7 @@ ruleConfigValueArray returns [EObject current=null]
        			$current, 
        			"values",
         		lv_values_2_0, 
-        		"ConfigValue");
+        		"org.eclipse.etrice.core.Config.ConfigValue");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1333,7 +1333,7 @@ ruleLiteralConfigValue returns [EObject current=null]
        			$current, 
        			"value",
         		lv_value_0_0, 
-        		"Literal");
+        		"org.eclipse.etrice.core.common.Base.Literal");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1423,7 +1423,7 @@ ruleRefPath returns [EObject current=null]
        			$current, 
        			"refs",
         		lv_refs_0_0, 
-        		"RefSegment");
+        		"org.eclipse.etrice.core.Config.RefSegment");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1445,7 +1445,7 @@ ruleRefPath returns [EObject current=null]
        			$current, 
        			"refs",
         		lv_refs_2_0, 
-        		"RefSegment");
+        		"org.eclipse.etrice.core.Config.RefSegment");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1485,7 +1485,7 @@ ruleRefSegment returns [EObject current=null]
        			$current, 
        			"ref",
         		lv_ref_0_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -1507,7 +1507,7 @@ ruleRefSegment returns [EObject current=null]
        			$current, 
        			"idx",
         		lv_idx_2_0, 
-        		"INT");
+        		"org.eclipse.xtext.common.Terminals.INT");
 	    }
 
 )
@@ -1548,7 +1548,7 @@ ruleKeyValue returns [EObject current=null]
        			$current, 
        			"key",
         		lv_key_0_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -1569,7 +1569,7 @@ ruleKeyValue returns [EObject current=null]
        			$current, 
        			"value",
         		lv_value_2_0, 
-        		"Literal");
+        		"org.eclipse.etrice.core.common.Base.Literal");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1703,7 +1703,7 @@ ruleSimpleAnnotationAttribute returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_3_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -1724,7 +1724,7 @@ ruleSimpleAnnotationAttribute returns [EObject current=null]
        			$current, 
        			"type",
         		lv_type_5_0, 
-        		"LiteralType");
+        		"org.eclipse.etrice.core.common.Base.LiteralType");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1788,7 +1788,7 @@ ruleEnumAnnotationAttribute returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_3_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -1814,7 +1814,7 @@ ruleEnumAnnotationAttribute returns [EObject current=null]
        			$current, 
        			"values",
         		lv_values_6_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -1836,7 +1836,7 @@ ruleEnumAnnotationAttribute returns [EObject current=null]
        			$current, 
        			"values",
         		lv_values_8_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -1882,7 +1882,7 @@ ruleImport returns [EObject current=null]
        			$current, 
        			"importedNamespace",
         		lv_importedNamespace_1_0, 
-        		"ImportedFQN");
+        		"org.eclipse.etrice.core.common.Base.ImportedFQN");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1910,7 +1910,7 @@ ruleImport returns [EObject current=null]
        			$current, 
        			"importURI",
         		lv_importURI_4_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -1997,7 +1997,7 @@ ruleDocumentation returns [EObject current=null]
        			$current, 
        			"lines",
         		lv_lines_2_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -2260,7 +2260,7 @@ ruleRealLiteral returns [EObject current=null]
        			$current, 
        			"value",
         		lv_value_1_0, 
-        		"Real");
+        		"org.eclipse.etrice.core.common.Base.Real");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2305,7 +2305,7 @@ ruleIntLiteral returns [EObject current=null]
        			$current, 
        			"value",
         		lv_value_1_0, 
-        		"Integer");
+        		"org.eclipse.etrice.core.common.Base.Integer");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2351,7 +2351,7 @@ ruleStringLiteral returns [EObject current=null]
        			$current, 
        			"value",
         		lv_value_1_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -2599,14 +2599,14 @@ ruleDecimalExp returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToke
         $current.merge(kw);
         newLeafNode(kw, grammarAccess.getDecimalExpAccess().getHyphenMinusKeyword_5_1()); 
     }
-)?(( RULE_INT)=>    this_INT_9=RULE_INT    {
+)?    this_INT_9=RULE_INT    {
 		$current.merge(this_INT_9);
     }
 
     { 
     newLeafNode(this_INT_9, grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_6()); 
     }
-))
+)
     ;
 finally {
 	myHiddenTokenState.restore();
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfigLexer.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfigLexer.java
index 513c71377..f0fd74d16 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfigLexer.java
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfigLexer.java
@@ -83,15 +83,15 @@ public class InternalConfigLexer extends Lexer {
         super(input,state);
 
     }
-    public String getGrammarFileName() { return "../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g"; }
+    public String getGrammarFileName() { return "InternalConfig.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.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:11:7: ( 'ConfigModel' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:11:9: 'ConfigModel'
+            // InternalConfig.g:11:7: ( 'ConfigModel' )
+            // InternalConfig.g:11:9: 'ConfigModel'
             {
             match("ConfigModel"); 
 
@@ -111,8 +111,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__13;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:12:7: ( '{' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:12:9: '{'
+            // InternalConfig.g:12:7: ( '{' )
+            // InternalConfig.g:12:9: '{'
             {
             match('{'); 
 
@@ -131,8 +131,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__14;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:13:7: ( '}' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:13:9: '}'
+            // InternalConfig.g:13:7: ( '}' )
+            // InternalConfig.g:13:9: '}'
             {
             match('}'); 
 
@@ -151,8 +151,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__15;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:14:7: ( 'SubSystemConfig' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:14:9: 'SubSystemConfig'
+            // InternalConfig.g:14:7: ( 'SubSystemConfig' )
+            // InternalConfig.g:14:9: 'SubSystemConfig'
             {
             match("SubSystemConfig"); 
 
@@ -172,8 +172,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__16;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:15:7: ( '/' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:15:9: '/'
+            // InternalConfig.g:15:7: ( '/' )
+            // InternalConfig.g:15:9: '/'
             {
             match('/'); 
 
@@ -192,8 +192,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__17;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:16:7: ( 'dynamic configuration' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:16:9: 'dynamic configuration'
+            // InternalConfig.g:16:7: ( 'dynamic configuration' )
+            // InternalConfig.g:16:9: 'dynamic configuration'
             {
             match("dynamic configuration"); 
 
@@ -213,8 +213,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__18;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:17:7: ( 'file path' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:17:9: 'file path'
+            // InternalConfig.g:17:7: ( 'file path' )
+            // InternalConfig.g:17:9: 'file path'
             {
             match("file path"); 
 
@@ -234,8 +234,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__19;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:18:7: ( 'user import' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:18:9: 'user import'
+            // InternalConfig.g:18:7: ( 'user import' )
+            // InternalConfig.g:18:9: 'user import'
             {
             match("user import"); 
 
@@ -255,8 +255,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__20;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:19:7: ( 'user constructor' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:19:9: 'user constructor'
+            // InternalConfig.g:19:7: ( 'user constructor' )
+            // InternalConfig.g:19:9: 'user constructor'
             {
             match("user constructor"); 
 
@@ -276,8 +276,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__21;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:20:7: ( 'polling interval' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:20:9: 'polling interval'
+            // InternalConfig.g:20:7: ( 'polling interval' )
+            // InternalConfig.g:20:9: 'polling interval'
             {
             match("polling interval"); 
 
@@ -297,8 +297,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__22;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:21:7: ( 'ActorClassConfig' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:21:9: 'ActorClassConfig'
+            // InternalConfig.g:21:7: ( 'ActorClassConfig' )
+            // InternalConfig.g:21:9: 'ActorClassConfig'
             {
             match("ActorClassConfig"); 
 
@@ -318,8 +318,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__23;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:22:7: ( 'ActorInstanceConfig' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:22:9: 'ActorInstanceConfig'
+            // InternalConfig.g:22:7: ( 'ActorInstanceConfig' )
+            // InternalConfig.g:22:9: 'ActorInstanceConfig'
             {
             match("ActorInstanceConfig"); 
 
@@ -339,8 +339,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__24;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:23:7: ( 'ProtocolClassConfig' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:23:9: 'ProtocolClassConfig'
+            // InternalConfig.g:23:7: ( 'ProtocolClassConfig' )
+            // InternalConfig.g:23:9: 'ProtocolClassConfig'
             {
             match("ProtocolClassConfig"); 
 
@@ -360,8 +360,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__25;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:24:7: ( 'regular' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:24:9: 'regular'
+            // InternalConfig.g:24:7: ( 'regular' )
+            // InternalConfig.g:24:9: 'regular'
             {
             match("regular"); 
 
@@ -381,8 +381,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__26;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:25:7: ( 'conjugate' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:25:9: 'conjugate'
+            // InternalConfig.g:25:7: ( 'conjugate' )
+            // InternalConfig.g:25:9: 'conjugate'
             {
             match("conjugate"); 
 
@@ -402,8 +402,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__27;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:26:7: ( 'conjugated' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:26:9: 'conjugated'
+            // InternalConfig.g:26:7: ( 'conjugated' )
+            // InternalConfig.g:26:9: 'conjugated'
             {
             match("conjugated"); 
 
@@ -423,8 +423,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__28;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:27:7: ( 'Port' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:27:9: 'Port'
+            // InternalConfig.g:27:7: ( 'Port' )
+            // InternalConfig.g:27:9: 'Port'
             {
             match("Port"); 
 
@@ -444,8 +444,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__29;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:28:7: ( 'InterfaceItem' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:28:9: 'InterfaceItem'
+            // InternalConfig.g:28:7: ( 'InterfaceItem' )
+            // InternalConfig.g:28:9: 'InterfaceItem'
             {
             match("InterfaceItem"); 
 
@@ -465,8 +465,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__30;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:29:7: ( 'Attr' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:29:9: 'Attr'
+            // InternalConfig.g:29:7: ( 'Attr' )
+            // InternalConfig.g:29:9: 'Attr'
             {
             match("Attr"); 
 
@@ -486,8 +486,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__31;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:30:7: ( '=' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:30:9: '='
+            // InternalConfig.g:30:7: ( '=' )
+            // InternalConfig.g:30:9: '='
             {
             match('='); 
 
@@ -506,8 +506,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__32;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:31:7: ( 'min' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:31:9: 'min'
+            // InternalConfig.g:31:7: ( 'min' )
+            // InternalConfig.g:31:9: 'min'
             {
             match("min"); 
 
@@ -527,8 +527,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__33;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:32:7: ( 'max' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:32:9: 'max'
+            // InternalConfig.g:32:7: ( 'max' )
+            // InternalConfig.g:32:9: 'max'
             {
             match("max"); 
 
@@ -548,8 +548,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__34;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:33:7: ( 'read' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:33:9: 'read'
+            // InternalConfig.g:33:7: ( 'read' )
+            // InternalConfig.g:33:9: 'read'
             {
             match("read"); 
 
@@ -569,8 +569,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__35;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:34:7: ( 'write' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:34:9: 'write'
+            // InternalConfig.g:34:7: ( 'write' )
+            // InternalConfig.g:34:9: 'write'
             {
             match("write"); 
 
@@ -590,8 +590,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__36;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:35:7: ( ',' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:35:9: ','
+            // InternalConfig.g:35:7: ( ',' )
+            // InternalConfig.g:35:9: ','
             {
             match(','); 
 
@@ -610,8 +610,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__37;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:36:7: ( '.' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:36:9: '.'
+            // InternalConfig.g:36:7: ( '.' )
+            // InternalConfig.g:36:9: '.'
             {
             match('.'); 
 
@@ -630,8 +630,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__38;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:37:7: ( ':' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:37:9: ':'
+            // InternalConfig.g:37:7: ( ':' )
+            // InternalConfig.g:37:9: ':'
             {
             match(':'); 
 
@@ -650,8 +650,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__39;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:38:7: ( 'optional' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:38:9: 'optional'
+            // InternalConfig.g:38:7: ( 'optional' )
+            // InternalConfig.g:38:9: 'optional'
             {
             match("optional"); 
 
@@ -671,8 +671,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__40;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:39:7: ( 'mandatory' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:39:9: 'mandatory'
+            // InternalConfig.g:39:7: ( 'mandatory' )
+            // InternalConfig.g:39:9: 'mandatory'
             {
             match("mandatory"); 
 
@@ -692,8 +692,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__41;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:40:7: ( 'attribute' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:40:9: 'attribute'
+            // InternalConfig.g:40:7: ( 'attribute' )
+            // InternalConfig.g:40:9: 'attribute'
             {
             match("attribute"); 
 
@@ -713,8 +713,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__42;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:41:7: ( 'import' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:41:9: 'import'
+            // InternalConfig.g:41:7: ( 'import' )
+            // InternalConfig.g:41:9: 'import'
             {
             match("import"); 
 
@@ -734,8 +734,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__43;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:42:7: ( 'from' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:42:9: 'from'
+            // InternalConfig.g:42:7: ( 'from' )
+            // InternalConfig.g:42:9: 'from'
             {
             match("from"); 
 
@@ -755,8 +755,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__44;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:43:7: ( 'model' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:43:9: 'model'
+            // InternalConfig.g:43:7: ( 'model' )
+            // InternalConfig.g:43:9: 'model'
             {
             match("model"); 
 
@@ -776,8 +776,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__45;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:44:7: ( '.*' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:44:9: '.*'
+            // InternalConfig.g:44:7: ( '.*' )
+            // InternalConfig.g:44:9: '.*'
             {
             match(".*"); 
 
@@ -797,8 +797,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__46;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:45:7: ( '[' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:45:9: '['
+            // InternalConfig.g:45:7: ( '[' )
+            // InternalConfig.g:45:9: '['
             {
             match('['); 
 
@@ -817,8 +817,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__47;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:46:7: ( ']' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:46:9: ']'
+            // InternalConfig.g:46:7: ( ']' )
+            // InternalConfig.g:46:9: ']'
             {
             match(']'); 
 
@@ -837,8 +837,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__48;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:47:7: ( 's' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:47:9: 's'
+            // InternalConfig.g:47:7: ( 's' )
+            // InternalConfig.g:47:9: 's'
             {
             match('s'); 
 
@@ -857,8 +857,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__49;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:48:7: ( 'ms' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:48:9: 'ms'
+            // InternalConfig.g:48:7: ( 'ms' )
+            // InternalConfig.g:48:9: 'ms'
             {
             match("ms"); 
 
@@ -878,8 +878,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__50;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:49:7: ( 'us' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:49:9: 'us'
+            // InternalConfig.g:49:7: ( 'us' )
+            // InternalConfig.g:49:9: 'us'
             {
             match("us"); 
 
@@ -899,8 +899,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__51;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:50:7: ( 'ns' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:50:9: 'ns'
+            // InternalConfig.g:50:7: ( 'ns' )
+            // InternalConfig.g:50:9: 'ns'
             {
             match("ns"); 
 
@@ -920,8 +920,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__52;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:51:7: ( 'false' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:51:9: 'false'
+            // InternalConfig.g:51:7: ( 'false' )
+            // InternalConfig.g:51:9: 'false'
             {
             match("false"); 
 
@@ -941,8 +941,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__53;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:52:7: ( 'true' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:52:9: 'true'
+            // InternalConfig.g:52:7: ( 'true' )
+            // InternalConfig.g:52:9: 'true'
             {
             match("true"); 
 
@@ -962,8 +962,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__54;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:53:7: ( '+' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:53:9: '+'
+            // InternalConfig.g:53:7: ( '+' )
+            // InternalConfig.g:53:9: '+'
             {
             match('+'); 
 
@@ -982,8 +982,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__55;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:54:7: ( '-' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:54:9: '-'
+            // InternalConfig.g:54:7: ( '-' )
+            // InternalConfig.g:54:9: '-'
             {
             match('-'); 
 
@@ -1002,8 +1002,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__56;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:55:7: ( 'e' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:55:9: 'e'
+            // InternalConfig.g:55:7: ( 'e' )
+            // InternalConfig.g:55:9: 'e'
             {
             match('e'); 
 
@@ -1022,8 +1022,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__57;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:56:7: ( 'E' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:56:9: 'E'
+            // InternalConfig.g:56:7: ( 'E' )
+            // InternalConfig.g:56:9: 'E'
             {
             match('E'); 
 
@@ -1042,8 +1042,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__58;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:57:7: ( 'ptBoolean' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:57:9: 'ptBoolean'
+            // InternalConfig.g:57:7: ( 'ptBoolean' )
+            // InternalConfig.g:57:9: 'ptBoolean'
             {
             match("ptBoolean"); 
 
@@ -1063,8 +1063,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__59;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:58:7: ( 'ptInteger' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:58:9: 'ptInteger'
+            // InternalConfig.g:58:7: ( 'ptInteger' )
+            // InternalConfig.g:58:9: 'ptInteger'
             {
             match("ptInteger"); 
 
@@ -1084,8 +1084,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__60;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:59:7: ( 'ptReal' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:59:9: 'ptReal'
+            // InternalConfig.g:59:7: ( 'ptReal' )
+            // InternalConfig.g:59:9: 'ptReal'
             {
             match("ptReal"); 
 
@@ -1105,8 +1105,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = T__61;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:60:7: ( 'ptCharacter' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:60:9: 'ptCharacter'
+            // InternalConfig.g:60:7: ( 'ptCharacter' )
+            // InternalConfig.g:60:9: 'ptCharacter'
             {
             match("ptCharacter"); 
 
@@ -1126,10 +1126,10 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = RULE_HEX;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2691:10: ( ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+ )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2691:12: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+
+            // InternalConfig.g:2691:10: ( ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+ )
+            // InternalConfig.g:2691:12: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2691:12: ( '0x' | '0X' )
+            // InternalConfig.g:2691:12: ( '0x' | '0X' )
             int alt1=2;
             int LA1_0 = input.LA(1);
 
@@ -1157,7 +1157,7 @@ public class InternalConfigLexer extends Lexer {
             }
             switch (alt1) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2691:13: '0x'
+                    // InternalConfig.g:2691:13: '0x'
                     {
                     match("0x"); 
 
@@ -1165,7 +1165,7 @@ public class InternalConfigLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2691:18: '0X'
+                    // InternalConfig.g:2691:18: '0X'
                     {
                     match("0X"); 
 
@@ -1175,7 +1175,7 @@ public class InternalConfigLexer extends Lexer {
 
             }
 
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2691:24: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+
+            // InternalConfig.g:2691:24: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+
             int cnt2=0;
             loop2:
             do {
@@ -1189,7 +1189,7 @@ public class InternalConfigLexer extends Lexer {
 
                 switch (alt2) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:
+            	    // InternalConfig.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();
@@ -1229,10 +1229,10 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = RULE_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2693:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2693:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalConfig.g:2693:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+            // InternalConfig.g:2693:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2693:11: ( '^' )?
+            // InternalConfig.g:2693:11: ( '^' )?
             int alt3=2;
             int LA3_0 = input.LA(1);
 
@@ -1241,7 +1241,7 @@ public class InternalConfigLexer extends Lexer {
             }
             switch (alt3) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2693:11: '^'
+                    // InternalConfig.g:2693:11: '^'
                     {
                     match('^'); 
 
@@ -1259,7 +1259,7 @@ public class InternalConfigLexer extends Lexer {
                 recover(mse);
                 throw mse;}
 
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2693:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalConfig.g:2693:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             loop4:
             do {
                 int alt4=2;
@@ -1272,7 +1272,7 @@ public class InternalConfigLexer extends Lexer {
 
                 switch (alt4) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:
+            	    // InternalConfig.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();
@@ -1308,10 +1308,10 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = RULE_INT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2695:10: ( ( '0' .. '9' )+ )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2695:12: ( '0' .. '9' )+
+            // InternalConfig.g:2695:10: ( ( '0' .. '9' )+ )
+            // InternalConfig.g:2695:12: ( '0' .. '9' )+
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2695:12: ( '0' .. '9' )+
+            // InternalConfig.g:2695:12: ( '0' .. '9' )+
             int cnt5=0;
             loop5:
             do {
@@ -1325,7 +1325,7 @@ public class InternalConfigLexer extends Lexer {
 
                 switch (alt5) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2695:13: '0' .. '9'
+            	    // InternalConfig.g:2695:13: '0' .. '9'
             	    {
             	    matchRange('0','9'); 
 
@@ -1357,10 +1357,10 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = RULE_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2697:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2697:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalConfig.g:2697:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+            // InternalConfig.g:2697:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2697:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalConfig.g:2697:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             int alt8=2;
             int LA8_0 = input.LA(1);
 
@@ -1378,10 +1378,10 @@ public class InternalConfigLexer extends Lexer {
             }
             switch (alt8) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2697:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+                    // InternalConfig.g:2697:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
                     {
                     match('\"'); 
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2697:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+                    // InternalConfig.g:2697:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
                     loop6:
                     do {
                         int alt6=3;
@@ -1397,7 +1397,7 @@ public class InternalConfigLexer extends Lexer {
 
                         switch (alt6) {
                     	case 1 :
-                    	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2697:21: '\\\\' .
+                    	    // InternalConfig.g:2697:21: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -1405,7 +1405,7 @@ public class InternalConfigLexer extends Lexer {
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2697:28: ~ ( ( '\\\\' | '\"' ) )
+                    	    // InternalConfig.g:2697:28: ~ ( ( '\\\\' | '\"' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -1430,10 +1430,10 @@ public class InternalConfigLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2697:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+                    // InternalConfig.g:2697:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
                     {
                     match('\''); 
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2697:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+                    // InternalConfig.g:2697:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
                     loop7:
                     do {
                         int alt7=3;
@@ -1449,7 +1449,7 @@ public class InternalConfigLexer extends Lexer {
 
                         switch (alt7) {
                     	case 1 :
-                    	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2697:54: '\\\\' .
+                    	    // InternalConfig.g:2697:54: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -1457,7 +1457,7 @@ public class InternalConfigLexer extends Lexer {
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2697:61: ~ ( ( '\\\\' | '\\'' ) )
+                    	    // InternalConfig.g:2697:61: ~ ( ( '\\\\' | '\\'' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -1500,12 +1500,12 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = RULE_ML_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2699:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2699:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // InternalConfig.g:2699:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // InternalConfig.g:2699:19: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); 
 
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2699:24: ( options {greedy=false; } : . )*
+            // InternalConfig.g:2699:24: ( options {greedy=false; } : . )*
             loop9:
             do {
                 int alt9=2;
@@ -1530,7 +1530,7 @@ public class InternalConfigLexer extends Lexer {
 
                 switch (alt9) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2699:52: .
+            	    // InternalConfig.g:2699:52: .
             	    {
             	    matchAny(); 
 
@@ -1560,12 +1560,12 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = RULE_SL_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2701:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2701:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // InternalConfig.g:2701:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // InternalConfig.g:2701:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
             {
             match("//"); 
 
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2701:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            // InternalConfig.g:2701:24: (~ ( ( '\\n' | '\\r' ) ) )*
             loop10:
             do {
                 int alt10=2;
@@ -1578,7 +1578,7 @@ public class InternalConfigLexer extends Lexer {
 
                 switch (alt10) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2701:24: ~ ( ( '\\n' | '\\r' ) )
+            	    // InternalConfig.g:2701: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();
@@ -1598,7 +1598,7 @@ public class InternalConfigLexer extends Lexer {
                 }
             } while (true);
 
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2701:40: ( ( '\\r' )? '\\n' )?
+            // InternalConfig.g:2701:40: ( ( '\\r' )? '\\n' )?
             int alt12=2;
             int LA12_0 = input.LA(1);
 
@@ -1607,9 +1607,9 @@ public class InternalConfigLexer extends Lexer {
             }
             switch (alt12) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2701:41: ( '\\r' )? '\\n'
+                    // InternalConfig.g:2701:41: ( '\\r' )? '\\n'
                     {
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2701:41: ( '\\r' )?
+                    // InternalConfig.g:2701:41: ( '\\r' )?
                     int alt11=2;
                     int LA11_0 = input.LA(1);
 
@@ -1618,7 +1618,7 @@ public class InternalConfigLexer extends Lexer {
                     }
                     switch (alt11) {
                         case 1 :
-                            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2701:41: '\\r'
+                            // InternalConfig.g:2701:41: '\\r'
                             {
                             match('\r'); 
 
@@ -1650,10 +1650,10 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = RULE_WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2703:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2703:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalConfig.g:2703:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // InternalConfig.g:2703:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2703:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalConfig.g:2703:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             int cnt13=0;
             loop13:
             do {
@@ -1667,7 +1667,7 @@ public class InternalConfigLexer extends Lexer {
 
                 switch (alt13) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:
+            	    // InternalConfig.g:
             	    {
             	    if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) {
             	        input.consume();
@@ -1707,8 +1707,8 @@ public class InternalConfigLexer extends Lexer {
         try {
             int _type = RULE_ANY_OTHER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2705:16: ( . )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2705:18: .
+            // InternalConfig.g:2705:16: ( . )
+            // InternalConfig.g:2705:18: .
             {
             matchAny(); 
 
@@ -1723,411 +1723,411 @@ public class InternalConfigLexer extends Lexer {
     // $ANTLR end "RULE_ANY_OTHER"
 
     public void mTokens() throws RecognitionException {
-        // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.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 | RULE_HEX | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+        // InternalConfig.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 | RULE_HEX | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
         int alt14=58;
         alt14 = dfa14.predict(input);
         switch (alt14) {
             case 1 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:10: T__12
+                // InternalConfig.g:1:10: T__12
                 {
                 mT__12(); 
 
                 }
                 break;
             case 2 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:16: T__13
+                // InternalConfig.g:1:16: T__13
                 {
                 mT__13(); 
 
                 }
                 break;
             case 3 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:22: T__14
+                // InternalConfig.g:1:22: T__14
                 {
                 mT__14(); 
 
                 }
                 break;
             case 4 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:28: T__15
+                // InternalConfig.g:1:28: T__15
                 {
                 mT__15(); 
 
                 }
                 break;
             case 5 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:34: T__16
+                // InternalConfig.g:1:34: T__16
                 {
                 mT__16(); 
 
                 }
                 break;
             case 6 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:40: T__17
+                // InternalConfig.g:1:40: T__17
                 {
                 mT__17(); 
 
                 }
                 break;
             case 7 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:46: T__18
+                // InternalConfig.g:1:46: T__18
                 {
                 mT__18(); 
 
                 }
                 break;
             case 8 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:52: T__19
+                // InternalConfig.g:1:52: T__19
                 {
                 mT__19(); 
 
                 }
                 break;
             case 9 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:58: T__20
+                // InternalConfig.g:1:58: T__20
                 {
                 mT__20(); 
 
                 }
                 break;
             case 10 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:64: T__21
+                // InternalConfig.g:1:64: T__21
                 {
                 mT__21(); 
 
                 }
                 break;
             case 11 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:70: T__22
+                // InternalConfig.g:1:70: T__22
                 {
                 mT__22(); 
 
                 }
                 break;
             case 12 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:76: T__23
+                // InternalConfig.g:1:76: T__23
                 {
                 mT__23(); 
 
                 }
                 break;
             case 13 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:82: T__24
+                // InternalConfig.g:1:82: T__24
                 {
                 mT__24(); 
 
                 }
                 break;
             case 14 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:88: T__25
+                // InternalConfig.g:1:88: T__25
                 {
                 mT__25(); 
 
                 }
                 break;
             case 15 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:94: T__26
+                // InternalConfig.g:1:94: T__26
                 {
                 mT__26(); 
 
                 }
                 break;
             case 16 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:100: T__27
+                // InternalConfig.g:1:100: T__27
                 {
                 mT__27(); 
 
                 }
                 break;
             case 17 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:106: T__28
+                // InternalConfig.g:1:106: T__28
                 {
                 mT__28(); 
 
                 }
                 break;
             case 18 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:112: T__29
+                // InternalConfig.g:1:112: T__29
                 {
                 mT__29(); 
 
                 }
                 break;
             case 19 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:118: T__30
+                // InternalConfig.g:1:118: T__30
                 {
                 mT__30(); 
 
                 }
                 break;
             case 20 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:124: T__31
+                // InternalConfig.g:1:124: T__31
                 {
                 mT__31(); 
 
                 }
                 break;
             case 21 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:130: T__32
+                // InternalConfig.g:1:130: T__32
                 {
                 mT__32(); 
 
                 }
                 break;
             case 22 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:136: T__33
+                // InternalConfig.g:1:136: T__33
                 {
                 mT__33(); 
 
                 }
                 break;
             case 23 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:142: T__34
+                // InternalConfig.g:1:142: T__34
                 {
                 mT__34(); 
 
                 }
                 break;
             case 24 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:148: T__35
+                // InternalConfig.g:1:148: T__35
                 {
                 mT__35(); 
 
                 }
                 break;
             case 25 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:154: T__36
+                // InternalConfig.g:1:154: T__36
                 {
                 mT__36(); 
 
                 }
                 break;
             case 26 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:160: T__37
+                // InternalConfig.g:1:160: T__37
                 {
                 mT__37(); 
 
                 }
                 break;
             case 27 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:166: T__38
+                // InternalConfig.g:1:166: T__38
                 {
                 mT__38(); 
 
                 }
                 break;
             case 28 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:172: T__39
+                // InternalConfig.g:1:172: T__39
                 {
                 mT__39(); 
 
                 }
                 break;
             case 29 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:178: T__40
+                // InternalConfig.g:1:178: T__40
                 {
                 mT__40(); 
 
                 }
                 break;
             case 30 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:184: T__41
+                // InternalConfig.g:1:184: T__41
                 {
                 mT__41(); 
 
                 }
                 break;
             case 31 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:190: T__42
+                // InternalConfig.g:1:190: T__42
                 {
                 mT__42(); 
 
                 }
                 break;
             case 32 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:196: T__43
+                // InternalConfig.g:1:196: T__43
                 {
                 mT__43(); 
 
                 }
                 break;
             case 33 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:202: T__44
+                // InternalConfig.g:1:202: T__44
                 {
                 mT__44(); 
 
                 }
                 break;
             case 34 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:208: T__45
+                // InternalConfig.g:1:208: T__45
                 {
                 mT__45(); 
 
                 }
                 break;
             case 35 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:214: T__46
+                // InternalConfig.g:1:214: T__46
                 {
                 mT__46(); 
 
                 }
                 break;
             case 36 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:220: T__47
+                // InternalConfig.g:1:220: T__47
                 {
                 mT__47(); 
 
                 }
                 break;
             case 37 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:226: T__48
+                // InternalConfig.g:1:226: T__48
                 {
                 mT__48(); 
 
                 }
                 break;
             case 38 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:232: T__49
+                // InternalConfig.g:1:232: T__49
                 {
                 mT__49(); 
 
                 }
                 break;
             case 39 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:238: T__50
+                // InternalConfig.g:1:238: T__50
                 {
                 mT__50(); 
 
                 }
                 break;
             case 40 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:244: T__51
+                // InternalConfig.g:1:244: T__51
                 {
                 mT__51(); 
 
                 }
                 break;
             case 41 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:250: T__52
+                // InternalConfig.g:1:250: T__52
                 {
                 mT__52(); 
 
                 }
                 break;
             case 42 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:256: T__53
+                // InternalConfig.g:1:256: T__53
                 {
                 mT__53(); 
 
                 }
                 break;
             case 43 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:262: T__54
+                // InternalConfig.g:1:262: T__54
                 {
                 mT__54(); 
 
                 }
                 break;
             case 44 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:268: T__55
+                // InternalConfig.g:1:268: T__55
                 {
                 mT__55(); 
 
                 }
                 break;
             case 45 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:274: T__56
+                // InternalConfig.g:1:274: T__56
                 {
                 mT__56(); 
 
                 }
                 break;
             case 46 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:280: T__57
+                // InternalConfig.g:1:280: T__57
                 {
                 mT__57(); 
 
                 }
                 break;
             case 47 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:286: T__58
+                // InternalConfig.g:1:286: T__58
                 {
                 mT__58(); 
 
                 }
                 break;
             case 48 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:292: T__59
+                // InternalConfig.g:1:292: T__59
                 {
                 mT__59(); 
 
                 }
                 break;
             case 49 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:298: T__60
+                // InternalConfig.g:1:298: T__60
                 {
                 mT__60(); 
 
                 }
                 break;
             case 50 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:304: T__61
+                // InternalConfig.g:1:304: T__61
                 {
                 mT__61(); 
 
                 }
                 break;
             case 51 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:310: RULE_HEX
+                // InternalConfig.g:1:310: RULE_HEX
                 {
                 mRULE_HEX(); 
 
                 }
                 break;
             case 52 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:319: RULE_ID
+                // InternalConfig.g:1:319: RULE_ID
                 {
                 mRULE_ID(); 
 
                 }
                 break;
             case 53 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:327: RULE_INT
+                // InternalConfig.g:1:327: RULE_INT
                 {
                 mRULE_INT(); 
 
                 }
                 break;
             case 54 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:336: RULE_STRING
+                // InternalConfig.g:1:336: RULE_STRING
                 {
                 mRULE_STRING(); 
 
                 }
                 break;
             case 55 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:348: RULE_ML_COMMENT
+                // InternalConfig.g:1:348: RULE_ML_COMMENT
                 {
                 mRULE_ML_COMMENT(); 
 
                 }
                 break;
             case 56 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:364: RULE_SL_COMMENT
+                // InternalConfig.g:1:364: RULE_SL_COMMENT
                 {
                 mRULE_SL_COMMENT(); 
 
                 }
                 break;
             case 57 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:380: RULE_WS
+                // InternalConfig.g:1:380: RULE_WS
                 {
                 mRULE_WS(); 
 
                 }
                 break;
             case 58 :
-                // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1:388: RULE_ANY_OTHER
+                // InternalConfig.g:1:388: RULE_ANY_OTHER
                 {
                 mRULE_ANY_OTHER(); 
 
@@ -2141,95 +2141,19 @@ public class InternalConfigLexer extends Lexer {
 
     protected DFA14 dfa14 = new DFA14(this);
     static final String DFA14_eotS =
-        "\1\uffff\1\52\2\uffff\1\52\1\60\11\52\1\uffff\2\52\1\uffff\1\107"+
-        "\1\uffff\3\52\2\uffff\1\116\2\52\2\uffff\1\123\1\124\1\126\1\50"+
-        "\2\uffff\2\50\2\uffff\1\52\3\uffff\1\52\3\uffff\4\52\1\140\11\52"+
-        "\1\uffff\3\52\1\162\1\52\4\uffff\3\52\3\uffff\1\167\1\52\10\uffff"+
-        "\7\52\1\uffff\15\52\1\u008d\1\u008e\2\52\1\uffff\4\52\1\uffff\5"+
-        "\52\1\u009a\10\52\1\u00a3\1\52\1\u00a5\1\52\1\u00a7\2\52\2\uffff"+
-        "\6\52\1\u00b0\3\52\2\uffff\1\u00b4\1\uffff\6\52\1\uffff\1\52\1\uffff"+
-        "\1\52\1\uffff\3\52\1\u00c3\1\u00c4\3\52\1\uffff\3\52\3\uffff\3\52"+
-        "\1\u00ce\10\52\2\uffff\2\52\1\u00d9\6\52\1\uffff\4\52\1\u00e4\5"+
-        "\52\1\uffff\2\52\2\uffff\6\52\1\uffff\3\52\1\u00f5\3\52\1\u00f9"+
-        "\1\u00fa\4\52\1\u0100\1\52\1\u0102\1\uffff\1\u0103\2\52\2\uffff"+
-        "\4\52\1\u010a\1\uffff\1\52\2\uffff\1\u010c\1\52\1\u010e\3\52\1\uffff"+
-        "\1\52\1\uffff\1\52\1\uffff\10\52\1\u011c\4\52\1\uffff\1\u0121\3"+
-        "\52\1\uffff\1\u0125\2\52\1\uffff\4\52\1\u012c\1\u012d\2\uffff";
+        "\1\uffff\1\52\2\uffff\1\52\1\60\11\52\1\uffff\2\52\1\uffff\1\107\1\uffff\3\52\2\uffff\1\116\2\52\2\uffff\1\123\1\124\1\126\1\50\2\uffff\2\50\2\uffff\1\52\3\uffff\1\52\3\uffff\4\52\1\140\11\52\1\uffff\3\52\1\162\1\52\4\uffff\3\52\3\uffff\1\167\1\52\10\uffff\7\52\1\uffff\15\52\1\u008d\1\u008e\2\52\1\uffff\4\52\1\uffff\5\52\1\u009a\10\52\1\u00a3\1\52\1\u00a5\1\52\1\u00a7\2\52\2\uffff\6\52\1\u00b0\3\52\2\uffff\1\u00b4\1\uffff\6\52\1\uffff\1\52\1\uffff\1\52\1\uffff\3\52\1\u00c3\1\u00c4\3\52\1\uffff\3\52\3\uffff\3\52\1\u00ce\10\52\2\uffff\2\52\1\u00d9\6\52\1\uffff\4\52\1\u00e4\5\52\1\uffff\2\52\2\uffff\6\52\1\uffff\3\52\1\u00f5\3\52\1\u00f9\1\u00fa\4\52\1\u0100\1\52\1\u0102\1\uffff\1\u0103\2\52\2\uffff\4\52\1\u010a\1\uffff\1\52\2\uffff\1\u010c\1\52\1\u010e\3\52\1\uffff\1\52\1\uffff\1\52\1\uffff\10\52\1\u011c\4\52\1\uffff\1\u0121\3\52\1\uffff\1\u0125\2\52\1\uffff\4\52\1\u012c\1\u012d\2\uffff";
     static final String DFA14_eofS =
         "\u012e\uffff";
     static final String DFA14_minS =
-        "\1\0\1\157\2\uffff\1\165\1\52\1\171\1\141\1\163\1\157\1\143\1\157"+
-        "\1\145\1\157\1\156\1\uffff\1\141\1\162\1\uffff\1\52\1\uffff\1\160"+
-        "\1\164\1\155\2\uffff\1\60\1\163\1\162\2\uffff\2\60\1\130\1\101\2"+
-        "\uffff\2\0\2\uffff\1\156\3\uffff\1\142\3\uffff\1\156\1\154\1\157"+
-        "\1\154\1\60\1\154\1\102\2\164\1\157\1\162\1\141\1\156\1\164\1\uffff"+
-        "\2\156\1\144\1\60\1\151\4\uffff\2\164\1\160\3\uffff\1\60\1\165\10"+
-        "\uffff\1\146\1\123\1\141\1\145\1\155\1\163\1\162\1\uffff\1\154\1"+
-        "\157\1\156\1\145\1\150\1\157\1\162\2\164\1\165\1\144\1\152\1\145"+
-        "\2\60\1\144\1\145\1\uffff\1\164\1\151\1\162\1\157\1\uffff\1\145"+
-        "\1\151\1\171\1\155\1\40\1\60\1\145\1\40\1\151\1\157\1\164\2\141"+
-        "\1\162\1\60\1\157\1\60\1\154\1\60\1\165\1\162\2\uffff\1\141\1\154"+
-        "\1\145\1\157\1\151\1\162\1\60\1\147\1\163\1\151\2\uffff\1\60\1\143"+
-        "\1\156\1\154\1\145\1\154\1\162\1\103\1\uffff\1\143\1\uffff\1\141"+
-        "\1\uffff\1\147\1\146\1\164\2\60\1\156\1\142\1\164\1\uffff\1\115"+
-        "\1\164\1\143\3\uffff\1\147\1\145\1\147\1\60\1\141\1\154\1\156\1"+
-        "\157\1\162\2\141\1\157\2\uffff\1\141\1\165\1\60\1\157\1\145\2\40"+
-        "\1\141\1\145\1\uffff\1\143\1\141\1\163\1\154\1\60\1\164\1\143\1"+
-        "\162\1\154\1\164\1\uffff\1\144\1\155\2\uffff\1\156\1\162\1\164\1"+
-        "\163\1\164\1\103\1\uffff\2\145\1\171\1\60\2\145\1\103\2\60\1\145"+
-        "\1\163\1\141\1\154\1\60\1\111\1\60\1\uffff\1\60\1\154\1\157\2\uffff"+
-        "\1\162\1\103\1\156\1\141\1\60\1\uffff\1\164\2\uffff\1\60\1\156\1"+
-        "\60\1\157\1\143\1\163\1\uffff\1\145\1\uffff\1\146\1\uffff\1\156"+
-        "\1\145\1\163\1\155\1\151\1\146\2\103\1\60\1\147\1\151\2\157\1\uffff"+
-        "\1\60\1\147\2\156\1\uffff\1\60\2\146\1\uffff\2\151\2\147\2\60\2"+
-        "\uffff";
+        "\1\0\1\157\2\uffff\1\165\1\52\1\171\1\141\1\163\1\157\1\143\1\157\1\145\1\157\1\156\1\uffff\1\141\1\162\1\uffff\1\52\1\uffff\1\160\1\164\1\155\2\uffff\1\60\1\163\1\162\2\uffff\2\60\1\130\1\101\2\uffff\2\0\2\uffff\1\156\3\uffff\1\142\3\uffff\1\156\1\154\1\157\1\154\1\60\1\154\1\102\2\164\1\157\1\162\1\141\1\156\1\164\1\uffff\2\156\1\144\1\60\1\151\4\uffff\2\164\1\160\3\uffff\1\60\1\165\10\uffff\1\146\1\123\1\141\1\145\1\155\1\163\1\162\1\uffff\1\154\1\157\1\156\1\145\1\150\1\157\1\162\2\164\1\165\1\144\1\152\1\145\2\60\1\144\1\145\1\uffff\1\164\1\151\1\162\1\157\1\uffff\1\145\1\151\1\171\1\155\1\40\1\60\1\145\1\40\1\151\1\157\1\164\2\141\1\162\1\60\1\157\1\60\1\154\1\60\1\165\1\162\2\uffff\1\141\1\154\1\145\1\157\1\151\1\162\1\60\1\147\1\163\1\151\2\uffff\1\60\1\143\1\156\1\154\1\145\1\154\1\162\1\103\1\uffff\1\143\1\uffff\1\141\1\uffff\1\147\1\146\1\164\2\60\1\156\1\142\1\164\1\uffff\1\115\1\164\1\143\3\uffff\1\147\1\145\1\147\1\60\1\141\1\154\1\156\1\157\1\162\2\141\1\157\2\uffff\1\141\1\165\1\60\1\157\1\145\2\40\1\141\1\145\1\uffff\1\143\1\141\1\163\1\154\1\60\1\164\1\143\1\162\1\154\1\164\1\uffff\1\144\1\155\2\uffff\1\156\1\162\1\164\1\163\1\164\1\103\1\uffff\2\145\1\171\1\60\2\145\1\103\2\60\1\145\1\163\1\141\1\154\1\60\1\111\1\60\1\uffff\1\60\1\154\1\157\2\uffff\1\162\1\103\1\156\1\141\1\60\1\uffff\1\164\2\uffff\1\60\1\156\1\60\1\157\1\143\1\163\1\uffff\1\145\1\uffff\1\146\1\uffff\1\156\1\145\1\163\1\155\1\151\1\146\2\103\1\60\1\147\1\151\2\157\1\uffff\1\60\1\147\2\156\1\uffff\1\60\2\146\1\uffff\2\151\2\147\2\60\2\uffff";
     static final String DFA14_maxS =
-        "\1\uffff\1\157\2\uffff\1\165\1\57\1\171\1\162\1\163\2\164\1\162"+
-        "\1\145\1\157\1\156\1\uffff\1\163\1\162\1\uffff\1\52\1\uffff\1\160"+
-        "\1\164\1\155\2\uffff\1\172\1\163\1\162\2\uffff\2\172\1\170\1\172"+
-        "\2\uffff\2\uffff\2\uffff\1\156\3\uffff\1\142\3\uffff\1\156\1\154"+
-        "\1\157\1\154\1\172\1\154\1\122\2\164\1\157\1\162\1\147\1\156\1\164"+
-        "\1\uffff\1\156\1\170\1\144\1\172\1\151\4\uffff\2\164\1\160\3\uffff"+
-        "\1\172\1\165\10\uffff\1\146\1\123\1\141\1\145\1\155\1\163\1\162"+
-        "\1\uffff\1\154\1\157\1\156\1\145\1\150\1\157\1\162\2\164\1\165\1"+
-        "\144\1\152\1\145\2\172\1\144\1\145\1\uffff\1\164\1\151\1\162\1\157"+
-        "\1\uffff\1\145\1\151\1\171\1\155\1\40\1\172\1\145\1\40\1\151\1\157"+
-        "\1\164\2\141\1\162\1\172\1\157\1\172\1\154\1\172\1\165\1\162\2\uffff"+
-        "\1\141\1\154\1\145\1\157\1\151\1\162\1\172\1\147\1\163\1\151\2\uffff"+
-        "\1\172\1\151\1\156\1\154\1\145\1\154\1\162\1\111\1\uffff\1\143\1"+
-        "\uffff\1\141\1\uffff\1\147\1\146\1\164\2\172\1\156\1\142\1\164\1"+
-        "\uffff\1\115\1\164\1\143\3\uffff\1\147\1\145\1\147\1\172\1\141\1"+
-        "\154\1\156\1\157\1\162\2\141\1\157\2\uffff\1\141\1\165\1\172\1\157"+
-        "\1\145\2\40\1\141\1\145\1\uffff\1\143\1\141\1\163\1\154\1\172\1"+
-        "\164\1\143\1\162\1\154\1\164\1\uffff\1\144\1\155\2\uffff\1\156\1"+
-        "\162\1\164\1\163\1\164\1\103\1\uffff\2\145\1\171\1\172\2\145\1\103"+
-        "\2\172\1\145\1\163\1\141\1\154\1\172\1\111\1\172\1\uffff\1\172\1"+
-        "\154\1\157\2\uffff\1\162\1\103\1\156\1\141\1\172\1\uffff\1\164\2"+
-        "\uffff\1\172\1\156\1\172\1\157\1\143\1\163\1\uffff\1\145\1\uffff"+
-        "\1\146\1\uffff\1\156\1\145\1\163\1\155\1\151\1\146\2\103\1\172\1"+
-        "\147\1\151\2\157\1\uffff\1\172\1\147\2\156\1\uffff\1\172\2\146\1"+
-        "\uffff\2\151\2\147\2\172\2\uffff";
+        "\1\uffff\1\157\2\uffff\1\165\1\57\1\171\1\162\1\163\2\164\1\162\1\145\1\157\1\156\1\uffff\1\163\1\162\1\uffff\1\52\1\uffff\1\160\1\164\1\155\2\uffff\1\172\1\163\1\162\2\uffff\2\172\1\170\1\172\2\uffff\2\uffff\2\uffff\1\156\3\uffff\1\142\3\uffff\1\156\1\154\1\157\1\154\1\172\1\154\1\122\2\164\1\157\1\162\1\147\1\156\1\164\1\uffff\1\156\1\170\1\144\1\172\1\151\4\uffff\2\164\1\160\3\uffff\1\172\1\165\10\uffff\1\146\1\123\1\141\1\145\1\155\1\163\1\162\1\uffff\1\154\1\157\1\156\1\145\1\150\1\157\1\162\2\164\1\165\1\144\1\152\1\145\2\172\1\144\1\145\1\uffff\1\164\1\151\1\162\1\157\1\uffff\1\145\1\151\1\171\1\155\1\40\1\172\1\145\1\40\1\151\1\157\1\164\2\141\1\162\1\172\1\157\1\172\1\154\1\172\1\165\1\162\2\uffff\1\141\1\154\1\145\1\157\1\151\1\162\1\172\1\147\1\163\1\151\2\uffff\1\172\1\151\1\156\1\154\1\145\1\154\1\162\1\111\1\uffff\1\143\1\uffff\1\141\1\uffff\1\147\1\146\1\164\2\172\1\156\1\142\1\164\1\uffff\1\115\1\164\1\143\3\uffff\1\147\1\145\1\147\1\172\1\141\1\154\1\156\1\157\1\162\2\141\1\157\2\uffff\1\141\1\165\1\172\1\157\1\145\2\40\1\141\1\145\1\uffff\1\143\1\141\1\163\1\154\1\172\1\164\1\143\1\162\1\154\1\164\1\uffff\1\144\1\155\2\uffff\1\156\1\162\1\164\1\163\1\164\1\103\1\uffff\2\145\1\171\1\172\2\145\1\103\2\172\1\145\1\163\1\141\1\154\1\172\1\111\1\172\1\uffff\1\172\1\154\1\157\2\uffff\1\162\1\103\1\156\1\141\1\172\1\uffff\1\164\2\uffff\1\172\1\156\1\172\1\157\1\143\1\163\1\uffff\1\145\1\uffff\1\146\1\uffff\1\156\1\145\1\163\1\155\1\151\1\146\2\103\1\172\1\147\1\151\2\157\1\uffff\1\172\1\147\2\156\1\uffff\1\172\2\146\1\uffff\2\151\2\147\2\172\2\uffff";
     static final String DFA14_acceptS =
-        "\2\uffff\1\2\1\3\13\uffff\1\24\2\uffff\1\31\1\uffff\1\33\3\uffff"+
-        "\1\43\1\44\3\uffff\1\53\1\54\4\uffff\1\64\1\65\2\uffff\1\71\1\72"+
-        "\1\uffff\1\64\1\2\1\3\1\uffff\1\67\1\70\1\5\16\uffff\1\24\5\uffff"+
-        "\1\31\1\42\1\32\1\33\3\uffff\1\43\1\44\1\45\2\uffff\1\53\1\54\1"+
-        "\55\1\56\1\63\1\65\1\66\1\71\7\uffff\1\47\21\uffff\1\46\4\uffff"+
-        "\1\50\25\uffff\1\25\1\26\12\uffff\1\7\1\40\10\uffff\1\23\1\uffff"+
-        "\1\21\1\uffff\1\27\10\uffff\1\52\3\uffff\1\51\1\10\1\11\14\uffff"+
-        "\1\41\1\30\11\uffff\1\61\12\uffff\1\37\2\uffff\1\6\1\12\6\uffff"+
-        "\1\16\20\uffff\1\34\3\uffff\1\57\1\60\5\uffff\1\17\1\uffff\1\35"+
-        "\1\36\6\uffff\1\20\1\uffff\1\1\1\uffff\1\62\15\uffff\1\22\4\uffff"+
-        "\1\4\3\uffff\1\13\6\uffff\1\14\1\15";
+        "\2\uffff\1\2\1\3\13\uffff\1\24\2\uffff\1\31\1\uffff\1\33\3\uffff\1\43\1\44\3\uffff\1\53\1\54\4\uffff\1\64\1\65\2\uffff\1\71\1\72\1\uffff\1\64\1\2\1\3\1\uffff\1\67\1\70\1\5\16\uffff\1\24\5\uffff\1\31\1\42\1\32\1\33\3\uffff\1\43\1\44\1\45\2\uffff\1\53\1\54\1\55\1\56\1\63\1\65\1\66\1\71\7\uffff\1\47\21\uffff\1\46\4\uffff\1\50\25\uffff\1\25\1\26\12\uffff\1\7\1\40\10\uffff\1\23\1\uffff\1\21\1\uffff\1\27\10\uffff\1\52\3\uffff\1\51\1\10\1\11\14\uffff\1\41\1\30\11\uffff\1\61\12\uffff\1\37\2\uffff\1\6\1\12\6\uffff\1\16\20\uffff\1\34\3\uffff\1\57\1\60\5\uffff\1\17\1\uffff\1\35\1\36\6\uffff\1\20\1\uffff\1\1\1\uffff\1\62\15\uffff\1\22\4\uffff\1\4\3\uffff\1\13\6\uffff\1\14\1\15";
     static final String DFA14_specialS =
         "\1\2\44\uffff\1\0\1\1\u0107\uffff}>";
     static final String[] DFA14_transitionS = {
-            "\11\50\2\47\2\50\1\47\22\50\1\47\1\50\1\45\4\50\1\46\3\50\1"+
-            "\35\1\22\1\36\1\23\1\5\1\41\11\44\1\24\2\50\1\17\3\50\1\12\1"+
-            "\43\1\1\1\43\1\40\3\43\1\16\6\43\1\13\2\43\1\4\7\43\1\30\1\50"+
-            "\1\31\1\42\1\43\1\50\1\26\1\43\1\15\1\6\1\37\1\7\2\43\1\27\3"+
-            "\43\1\20\1\33\1\25\1\11\1\43\1\14\1\32\1\34\1\10\1\43\1\21\3"+
-            "\43\1\2\1\50\1\3\uff82\50",
+            "\11\50\2\47\2\50\1\47\22\50\1\47\1\50\1\45\4\50\1\46\3\50\1\35\1\22\1\36\1\23\1\5\1\41\11\44\1\24\2\50\1\17\3\50\1\12\1\43\1\1\1\43\1\40\3\43\1\16\6\43\1\13\2\43\1\4\7\43\1\30\1\50\1\31\1\42\1\43\1\50\1\26\1\43\1\15\1\6\1\37\1\7\2\43\1\27\3\43\1\20\1\33\1\25\1\11\1\43\1\14\1\32\1\34\1\10\1\43\1\21\3\43\1\2\1\50\1\3\uff82\50",
             "\1\51",
             "",
             "",
@@ -2471,8 +2395,7 @@ public class InternalConfigLexer extends Lexer {
             "\1\u00fc",
             "\1\u00fd",
             "\1\u00fe",
-            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\3\52\1\u00ff\26"+
-            "\52",
+            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\3\52\1\u00ff\26\52",
             "\1\u0101",
             "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52",
             "",
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfigParser.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfigParser.java
index 678a7f846..60b25c105 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfigParser.java
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfigParser.java
@@ -18,8 +18,7 @@ import org.antlr.runtime.*;
 import java.util.Stack;
 import java.util.List;
 import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
+
 @SuppressWarnings("all")
 public class InternalConfigParser extends AbstractInternalAntlrParser {
     public static final String[] tokenNames = new String[] {
@@ -99,7 +98,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
         
 
     public String[] getTokenNames() { return InternalConfigParser.tokenNames; }
-    public String getGrammarFileName() { return "../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g"; }
+    public String getGrammarFileName() { return "InternalConfig.g"; }
 
 
 
@@ -124,7 +123,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleConfigModel"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:68:1: entryRuleConfigModel returns [EObject current=null] : iv_ruleConfigModel= ruleConfigModel EOF ;
+    // InternalConfig.g:68:1: entryRuleConfigModel returns [EObject current=null] : iv_ruleConfigModel= ruleConfigModel EOF ;
     public final EObject entryRuleConfigModel() throws RecognitionException {
         EObject current = null;
 
@@ -132,21 +131,17 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:69:2: (iv_ruleConfigModel= ruleConfigModel EOF )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:70:2: iv_ruleConfigModel= ruleConfigModel EOF
+            // InternalConfig.g:69:2: (iv_ruleConfigModel= ruleConfigModel EOF )
+            // InternalConfig.g:70:2: iv_ruleConfigModel= ruleConfigModel EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getConfigModelRule()); 
-            }
-            pushFollow(FOLLOW_ruleConfigModel_in_entryRuleConfigModel75);
+             newCompositeNode(grammarAccess.getConfigModelRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleConfigModel=ruleConfigModel();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleConfigModel; 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleConfigModel85); if (state.failed) return current;
+
+             current =iv_ruleConfigModel; 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -164,7 +159,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleConfigModel"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:77:1: ruleConfigModel returns [EObject current=null] : (otherlv_0= 'ConfigModel' ( (lv_name_1_0= ruleFQN ) ) otherlv_2= '{' ( (lv_imports_3_0= ruleImport ) )* ( (lv_configElements_4_0= ruleConfigElement ) )* otherlv_5= '}' ) ;
+    // InternalConfig.g:77:1: ruleConfigModel returns [EObject current=null] : (otherlv_0= 'ConfigModel' ( (lv_name_1_0= ruleFQN ) ) otherlv_2= '{' ( (lv_imports_3_0= ruleImport ) )* ( (lv_configElements_4_0= ruleConfigElement ) )* otherlv_5= '}' ) ;
     public final EObject ruleConfigModel() throws RecognitionException {
         EObject current = null;
 
@@ -181,60 +176,52 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:80:28: ( (otherlv_0= 'ConfigModel' ( (lv_name_1_0= ruleFQN ) ) otherlv_2= '{' ( (lv_imports_3_0= ruleImport ) )* ( (lv_configElements_4_0= ruleConfigElement ) )* otherlv_5= '}' ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:81:1: (otherlv_0= 'ConfigModel' ( (lv_name_1_0= ruleFQN ) ) otherlv_2= '{' ( (lv_imports_3_0= ruleImport ) )* ( (lv_configElements_4_0= ruleConfigElement ) )* otherlv_5= '}' )
+            // InternalConfig.g:80:28: ( (otherlv_0= 'ConfigModel' ( (lv_name_1_0= ruleFQN ) ) otherlv_2= '{' ( (lv_imports_3_0= ruleImport ) )* ( (lv_configElements_4_0= ruleConfigElement ) )* otherlv_5= '}' ) )
+            // InternalConfig.g:81:1: (otherlv_0= 'ConfigModel' ( (lv_name_1_0= ruleFQN ) ) otherlv_2= '{' ( (lv_imports_3_0= ruleImport ) )* ( (lv_configElements_4_0= ruleConfigElement ) )* otherlv_5= '}' )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:81:1: (otherlv_0= 'ConfigModel' ( (lv_name_1_0= ruleFQN ) ) otherlv_2= '{' ( (lv_imports_3_0= ruleImport ) )* ( (lv_configElements_4_0= ruleConfigElement ) )* otherlv_5= '}' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:81:3: otherlv_0= 'ConfigModel' ( (lv_name_1_0= ruleFQN ) ) otherlv_2= '{' ( (lv_imports_3_0= ruleImport ) )* ( (lv_configElements_4_0= ruleConfigElement ) )* otherlv_5= '}'
+            // InternalConfig.g:81:1: (otherlv_0= 'ConfigModel' ( (lv_name_1_0= ruleFQN ) ) otherlv_2= '{' ( (lv_imports_3_0= ruleImport ) )* ( (lv_configElements_4_0= ruleConfigElement ) )* otherlv_5= '}' )
+            // InternalConfig.g:81:3: otherlv_0= 'ConfigModel' ( (lv_name_1_0= ruleFQN ) ) otherlv_2= '{' ( (lv_imports_3_0= ruleImport ) )* ( (lv_configElements_4_0= ruleConfigElement ) )* otherlv_5= '}'
             {
-            otherlv_0=(Token)match(input,12,FOLLOW_12_in_ruleConfigModel122); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_0=(Token)match(input,12,FOLLOW_3); 
 
-                  	newLeafNode(otherlv_0, grammarAccess.getConfigModelAccess().getConfigModelKeyword_0());
-                  
-            }
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:85:1: ( (lv_name_1_0= ruleFQN ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:86:1: (lv_name_1_0= ruleFQN )
+                	newLeafNode(otherlv_0, grammarAccess.getConfigModelAccess().getConfigModelKeyword_0());
+                
+            // InternalConfig.g:85:1: ( (lv_name_1_0= ruleFQN ) )
+            // InternalConfig.g:86:1: (lv_name_1_0= ruleFQN )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:86:1: (lv_name_1_0= ruleFQN )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:87:3: lv_name_1_0= ruleFQN
+            // InternalConfig.g:86:1: (lv_name_1_0= ruleFQN )
+            // InternalConfig.g:87:3: lv_name_1_0= ruleFQN
             {
-            if ( state.backtracking==0 ) {
-               
-              	        newCompositeNode(grammarAccess.getConfigModelAccess().getNameFQNParserRuleCall_1_0()); 
-              	    
-            }
-            pushFollow(FOLLOW_ruleFQN_in_ruleConfigModel143);
+             
+            	        newCompositeNode(grammarAccess.getConfigModelAccess().getNameFQNParserRuleCall_1_0()); 
+            	    
+            pushFollow(FOLLOW_4);
             lv_name_1_0=ruleFQN();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
 
-              	        if (current==null) {
-              	            current = createModelElementForParent(grammarAccess.getConfigModelRule());
-              	        }
-                     		set(
-                     			current, 
-                     			"name",
-                      		lv_name_1_0, 
-                      		"FQN");
-              	        afterParserOrEnumRuleCall();
-              	    
-            }
+
+            	        if (current==null) {
+            	            current = createModelElementForParent(grammarAccess.getConfigModelRule());
+            	        }
+                   		set(
+                   			current, 
+                   			"name",
+                    		lv_name_1_0, 
+                    		"org.eclipse.etrice.core.common.Base.FQN");
+            	        afterParserOrEnumRuleCall();
+            	    
 
             }
 
 
             }
 
-            otherlv_2=(Token)match(input,13,FOLLOW_13_in_ruleConfigModel155); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_2=(Token)match(input,13,FOLLOW_5); 
 
-                  	newLeafNode(otherlv_2, grammarAccess.getConfigModelAccess().getLeftCurlyBracketKeyword_2());
-                  
-            }
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:107:1: ( (lv_imports_3_0= ruleImport ) )*
+                	newLeafNode(otherlv_2, grammarAccess.getConfigModelAccess().getLeftCurlyBracketKeyword_2());
+                
+            // InternalConfig.g:107:1: ( (lv_imports_3_0= ruleImport ) )*
             loop1:
             do {
                 int alt1=2;
@@ -247,34 +234,30 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
                 switch (alt1) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:108:1: (lv_imports_3_0= ruleImport )
+            	    // InternalConfig.g:108:1: (lv_imports_3_0= ruleImport )
             	    {
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:108:1: (lv_imports_3_0= ruleImport )
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:109:3: lv_imports_3_0= ruleImport
+            	    // InternalConfig.g:108:1: (lv_imports_3_0= ruleImport )
+            	    // InternalConfig.g:109:3: lv_imports_3_0= ruleImport
             	    {
-            	    if ( state.backtracking==0 ) {
-            	       
-            	      	        newCompositeNode(grammarAccess.getConfigModelAccess().getImportsImportParserRuleCall_3_0()); 
-            	      	    
-            	    }
-            	    pushFollow(FOLLOW_ruleImport_in_ruleConfigModel176);
+            	     
+            	    	        newCompositeNode(grammarAccess.getConfigModelAccess().getImportsImportParserRuleCall_3_0()); 
+            	    	    
+            	    pushFollow(FOLLOW_5);
             	    lv_imports_3_0=ruleImport();
 
             	    state._fsp--;
-            	    if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
-
-            	      	        if (current==null) {
-            	      	            current = createModelElementForParent(grammarAccess.getConfigModelRule());
-            	      	        }
-            	             		add(
-            	             			current, 
-            	             			"imports",
-            	              		lv_imports_3_0, 
-            	              		"Import");
-            	      	        afterParserOrEnumRuleCall();
-            	      	    
-            	    }
+
+
+            	    	        if (current==null) {
+            	    	            current = createModelElementForParent(grammarAccess.getConfigModelRule());
+            	    	        }
+            	           		add(
+            	           			current, 
+            	           			"imports",
+            	            		lv_imports_3_0, 
+            	            		"org.eclipse.etrice.core.common.Base.Import");
+            	    	        afterParserOrEnumRuleCall();
+            	    	    
 
             	    }
 
@@ -287,7 +270,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                 }
             } while (true);
 
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:125:3: ( (lv_configElements_4_0= ruleConfigElement ) )*
+            // InternalConfig.g:125:3: ( (lv_configElements_4_0= ruleConfigElement ) )*
             loop2:
             do {
                 int alt2=2;
@@ -300,34 +283,30 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
                 switch (alt2) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:126:1: (lv_configElements_4_0= ruleConfigElement )
+            	    // InternalConfig.g:126:1: (lv_configElements_4_0= ruleConfigElement )
             	    {
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:126:1: (lv_configElements_4_0= ruleConfigElement )
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:127:3: lv_configElements_4_0= ruleConfigElement
+            	    // InternalConfig.g:126:1: (lv_configElements_4_0= ruleConfigElement )
+            	    // InternalConfig.g:127:3: lv_configElements_4_0= ruleConfigElement
             	    {
-            	    if ( state.backtracking==0 ) {
-            	       
-            	      	        newCompositeNode(grammarAccess.getConfigModelAccess().getConfigElementsConfigElementParserRuleCall_4_0()); 
-            	      	    
-            	    }
-            	    pushFollow(FOLLOW_ruleConfigElement_in_ruleConfigModel198);
+            	     
+            	    	        newCompositeNode(grammarAccess.getConfigModelAccess().getConfigElementsConfigElementParserRuleCall_4_0()); 
+            	    	    
+            	    pushFollow(FOLLOW_6);
             	    lv_configElements_4_0=ruleConfigElement();
 
             	    state._fsp--;
-            	    if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
-
-            	      	        if (current==null) {
-            	      	            current = createModelElementForParent(grammarAccess.getConfigModelRule());
-            	      	        }
-            	             		add(
-            	             			current, 
-            	             			"configElements",
-            	              		lv_configElements_4_0, 
-            	              		"ConfigElement");
-            	      	        afterParserOrEnumRuleCall();
-            	      	    
-            	    }
+
+
+            	    	        if (current==null) {
+            	    	            current = createModelElementForParent(grammarAccess.getConfigModelRule());
+            	    	        }
+            	           		add(
+            	           			current, 
+            	           			"configElements",
+            	            		lv_configElements_4_0, 
+            	            		"org.eclipse.etrice.core.Config.ConfigElement");
+            	    	        afterParserOrEnumRuleCall();
+            	    	    
 
             	    }
 
@@ -340,21 +319,17 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                 }
             } while (true);
 
-            otherlv_5=(Token)match(input,14,FOLLOW_14_in_ruleConfigModel211); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_5=(Token)match(input,14,FOLLOW_2); 
 
-                  	newLeafNode(otherlv_5, grammarAccess.getConfigModelAccess().getRightCurlyBracketKeyword_5());
-                  
-            }
+                	newLeafNode(otherlv_5, grammarAccess.getConfigModelAccess().getRightCurlyBracketKeyword_5());
+                
 
             }
 
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -369,7 +344,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleConfigElement"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:155:1: entryRuleConfigElement returns [EObject current=null] : iv_ruleConfigElement= ruleConfigElement EOF ;
+    // InternalConfig.g:155:1: entryRuleConfigElement returns [EObject current=null] : iv_ruleConfigElement= ruleConfigElement EOF ;
     public final EObject entryRuleConfigElement() throws RecognitionException {
         EObject current = null;
 
@@ -377,21 +352,17 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:156:2: (iv_ruleConfigElement= ruleConfigElement EOF )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:157:2: iv_ruleConfigElement= ruleConfigElement EOF
+            // InternalConfig.g:156:2: (iv_ruleConfigElement= ruleConfigElement EOF )
+            // InternalConfig.g:157:2: iv_ruleConfigElement= ruleConfigElement EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getConfigElementRule()); 
-            }
-            pushFollow(FOLLOW_ruleConfigElement_in_entryRuleConfigElement247);
+             newCompositeNode(grammarAccess.getConfigElementRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleConfigElement=ruleConfigElement();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleConfigElement; 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleConfigElement257); if (state.failed) return current;
+
+             current =iv_ruleConfigElement; 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -409,7 +380,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleConfigElement"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:164:1: ruleConfigElement returns [EObject current=null] : (this_SubSystemConfig_0= ruleSubSystemConfig | this_ActorClassConfig_1= ruleActorClassConfig | this_ActorInstanceConfig_2= ruleActorInstanceConfig | this_ProtocolClassConfig_3= ruleProtocolClassConfig ) ;
+    // InternalConfig.g:164:1: ruleConfigElement returns [EObject current=null] : (this_SubSystemConfig_0= ruleSubSystemConfig | this_ActorClassConfig_1= ruleActorClassConfig | this_ActorInstanceConfig_2= ruleActorInstanceConfig | this_ProtocolClassConfig_3= ruleProtocolClassConfig ) ;
     public final EObject ruleConfigElement() throws RecognitionException {
         EObject current = null;
 
@@ -425,10 +396,10 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:167:28: ( (this_SubSystemConfig_0= ruleSubSystemConfig | this_ActorClassConfig_1= ruleActorClassConfig | this_ActorInstanceConfig_2= ruleActorInstanceConfig | this_ProtocolClassConfig_3= ruleProtocolClassConfig ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:168:1: (this_SubSystemConfig_0= ruleSubSystemConfig | this_ActorClassConfig_1= ruleActorClassConfig | this_ActorInstanceConfig_2= ruleActorInstanceConfig | this_ProtocolClassConfig_3= ruleProtocolClassConfig )
+            // InternalConfig.g:167:28: ( (this_SubSystemConfig_0= ruleSubSystemConfig | this_ActorClassConfig_1= ruleActorClassConfig | this_ActorInstanceConfig_2= ruleActorInstanceConfig | this_ProtocolClassConfig_3= ruleProtocolClassConfig ) )
+            // InternalConfig.g:168:1: (this_SubSystemConfig_0= ruleSubSystemConfig | this_ActorClassConfig_1= ruleActorClassConfig | this_ActorInstanceConfig_2= ruleActorInstanceConfig | this_ProtocolClassConfig_3= ruleProtocolClassConfig )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:168:1: (this_SubSystemConfig_0= ruleSubSystemConfig | this_ActorClassConfig_1= ruleActorClassConfig | this_ActorInstanceConfig_2= ruleActorInstanceConfig | this_ProtocolClassConfig_3= ruleProtocolClassConfig )
+            // InternalConfig.g:168:1: (this_SubSystemConfig_0= ruleSubSystemConfig | this_ActorClassConfig_1= ruleActorClassConfig | this_ActorInstanceConfig_2= ruleActorInstanceConfig | this_ProtocolClassConfig_3= ruleProtocolClassConfig )
             int alt3=4;
             switch ( input.LA(1) ) {
             case 15:
@@ -452,7 +423,6 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                 }
                 break;
             default:
-                if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
                     new NoViableAltException("", 3, 0, input);
 
@@ -461,90 +431,74 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
             switch (alt3) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:169:5: this_SubSystemConfig_0= ruleSubSystemConfig
+                    // InternalConfig.g:169:5: this_SubSystemConfig_0= ruleSubSystemConfig
                     {
-                    if ( state.backtracking==0 ) {
-                       
-                              newCompositeNode(grammarAccess.getConfigElementAccess().getSubSystemConfigParserRuleCall_0()); 
-                          
-                    }
-                    pushFollow(FOLLOW_ruleSubSystemConfig_in_ruleConfigElement304);
+                     
+                            newCompositeNode(grammarAccess.getConfigElementAccess().getSubSystemConfigParserRuleCall_0()); 
+                        
+                    pushFollow(FOLLOW_2);
                     this_SubSystemConfig_0=ruleSubSystemConfig();
 
                     state._fsp--;
-                    if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
-                       
-                              current = this_SubSystemConfig_0; 
-                              afterParserOrEnumRuleCall();
-                          
-                    }
+
+                     
+                            current = this_SubSystemConfig_0; 
+                            afterParserOrEnumRuleCall();
+                        
 
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:179:5: this_ActorClassConfig_1= ruleActorClassConfig
+                    // InternalConfig.g:179:5: this_ActorClassConfig_1= ruleActorClassConfig
                     {
-                    if ( state.backtracking==0 ) {
-                       
-                              newCompositeNode(grammarAccess.getConfigElementAccess().getActorClassConfigParserRuleCall_1()); 
-                          
-                    }
-                    pushFollow(FOLLOW_ruleActorClassConfig_in_ruleConfigElement331);
+                     
+                            newCompositeNode(grammarAccess.getConfigElementAccess().getActorClassConfigParserRuleCall_1()); 
+                        
+                    pushFollow(FOLLOW_2);
                     this_ActorClassConfig_1=ruleActorClassConfig();
 
                     state._fsp--;
-                    if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
-                       
-                              current = this_ActorClassConfig_1; 
-                              afterParserOrEnumRuleCall();
-                          
-                    }
+
+                     
+                            current = this_ActorClassConfig_1; 
+                            afterParserOrEnumRuleCall();
+                        
 
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:189:5: this_ActorInstanceConfig_2= ruleActorInstanceConfig
+                    // InternalConfig.g:189:5: this_ActorInstanceConfig_2= ruleActorInstanceConfig
                     {
-                    if ( state.backtracking==0 ) {
-                       
-                              newCompositeNode(grammarAccess.getConfigElementAccess().getActorInstanceConfigParserRuleCall_2()); 
-                          
-                    }
-                    pushFollow(FOLLOW_ruleActorInstanceConfig_in_ruleConfigElement358);
+                     
+                            newCompositeNode(grammarAccess.getConfigElementAccess().getActorInstanceConfigParserRuleCall_2()); 
+                        
+                    pushFollow(FOLLOW_2);
                     this_ActorInstanceConfig_2=ruleActorInstanceConfig();
 
                     state._fsp--;
-                    if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
-                       
-                              current = this_ActorInstanceConfig_2; 
-                              afterParserOrEnumRuleCall();
-                          
-                    }
+
+                     
+                            current = this_ActorInstanceConfig_2; 
+                            afterParserOrEnumRuleCall();
+                        
 
                     }
                     break;
                 case 4 :
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:199:5: this_ProtocolClassConfig_3= ruleProtocolClassConfig
+                    // InternalConfig.g:199:5: this_ProtocolClassConfig_3= ruleProtocolClassConfig
                     {
-                    if ( state.backtracking==0 ) {
-                       
-                              newCompositeNode(grammarAccess.getConfigElementAccess().getProtocolClassConfigParserRuleCall_3()); 
-                          
-                    }
-                    pushFollow(FOLLOW_ruleProtocolClassConfig_in_ruleConfigElement385);
+                     
+                            newCompositeNode(grammarAccess.getConfigElementAccess().getProtocolClassConfigParserRuleCall_3()); 
+                        
+                    pushFollow(FOLLOW_2);
                     this_ProtocolClassConfig_3=ruleProtocolClassConfig();
 
                     state._fsp--;
-                    if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
-                       
-                              current = this_ProtocolClassConfig_3; 
-                              afterParserOrEnumRuleCall();
-                          
-                    }
+
+                     
+                            current = this_ProtocolClassConfig_3; 
+                            afterParserOrEnumRuleCall();
+                        
 
                     }
                     break;
@@ -554,9 +508,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -571,7 +523,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleSubSystemConfig"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:215:1: entryRuleSubSystemConfig returns [EObject current=null] : iv_ruleSubSystemConfig= ruleSubSystemConfig EOF ;
+    // InternalConfig.g:215:1: entryRuleSubSystemConfig returns [EObject current=null] : iv_ruleSubSystemConfig= ruleSubSystemConfig EOF ;
     public final EObject entryRuleSubSystemConfig() throws RecognitionException {
         EObject current = null;
 
@@ -579,21 +531,17 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:216:2: (iv_ruleSubSystemConfig= ruleSubSystemConfig EOF )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:217:2: iv_ruleSubSystemConfig= ruleSubSystemConfig EOF
+            // InternalConfig.g:216:2: (iv_ruleSubSystemConfig= ruleSubSystemConfig EOF )
+            // InternalConfig.g:217:2: iv_ruleSubSystemConfig= ruleSubSystemConfig EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getSubSystemConfigRule()); 
-            }
-            pushFollow(FOLLOW_ruleSubSystemConfig_in_entryRuleSubSystemConfig420);
+             newCompositeNode(grammarAccess.getSubSystemConfigRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleSubSystemConfig=ruleSubSystemConfig();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleSubSystemConfig; 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSubSystemConfig430); if (state.failed) return current;
+
+             current =iv_ruleSubSystemConfig; 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -611,7 +559,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleSubSystemConfig"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:224:1: ruleSubSystemConfig returns [EObject current=null] : (otherlv_0= 'SubSystemConfig' ( ( ruleFQN ) ) otherlv_2= '/' ( (otherlv_3= RULE_ID ) ) otherlv_4= '{' ( (lv_dynConfig_5_0= ruleDynamicConfig ) ) otherlv_6= '}' ) ;
+    // InternalConfig.g:224:1: ruleSubSystemConfig returns [EObject current=null] : (otherlv_0= 'SubSystemConfig' ( ( ruleFQN ) ) otherlv_2= '/' ( (otherlv_3= RULE_ID ) ) otherlv_4= '{' ( (lv_dynConfig_5_0= ruleDynamicConfig ) ) otherlv_6= '}' ) ;
     public final EObject ruleSubSystemConfig() throws RecognitionException {
         EObject current = null;
 
@@ -626,139 +574,115 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:227:28: ( (otherlv_0= 'SubSystemConfig' ( ( ruleFQN ) ) otherlv_2= '/' ( (otherlv_3= RULE_ID ) ) otherlv_4= '{' ( (lv_dynConfig_5_0= ruleDynamicConfig ) ) otherlv_6= '}' ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:228:1: (otherlv_0= 'SubSystemConfig' ( ( ruleFQN ) ) otherlv_2= '/' ( (otherlv_3= RULE_ID ) ) otherlv_4= '{' ( (lv_dynConfig_5_0= ruleDynamicConfig ) ) otherlv_6= '}' )
+            // InternalConfig.g:227:28: ( (otherlv_0= 'SubSystemConfig' ( ( ruleFQN ) ) otherlv_2= '/' ( (otherlv_3= RULE_ID ) ) otherlv_4= '{' ( (lv_dynConfig_5_0= ruleDynamicConfig ) ) otherlv_6= '}' ) )
+            // InternalConfig.g:228:1: (otherlv_0= 'SubSystemConfig' ( ( ruleFQN ) ) otherlv_2= '/' ( (otherlv_3= RULE_ID ) ) otherlv_4= '{' ( (lv_dynConfig_5_0= ruleDynamicConfig ) ) otherlv_6= '}' )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:228:1: (otherlv_0= 'SubSystemConfig' ( ( ruleFQN ) ) otherlv_2= '/' ( (otherlv_3= RULE_ID ) ) otherlv_4= '{' ( (lv_dynConfig_5_0= ruleDynamicConfig ) ) otherlv_6= '}' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:228:3: otherlv_0= 'SubSystemConfig' ( ( ruleFQN ) ) otherlv_2= '/' ( (otherlv_3= RULE_ID ) ) otherlv_4= '{' ( (lv_dynConfig_5_0= ruleDynamicConfig ) ) otherlv_6= '}'
+            // InternalConfig.g:228:1: (otherlv_0= 'SubSystemConfig' ( ( ruleFQN ) ) otherlv_2= '/' ( (otherlv_3= RULE_ID ) ) otherlv_4= '{' ( (lv_dynConfig_5_0= ruleDynamicConfig ) ) otherlv_6= '}' )
+            // InternalConfig.g:228:3: otherlv_0= 'SubSystemConfig' ( ( ruleFQN ) ) otherlv_2= '/' ( (otherlv_3= RULE_ID ) ) otherlv_4= '{' ( (lv_dynConfig_5_0= ruleDynamicConfig ) ) otherlv_6= '}'
             {
-            otherlv_0=(Token)match(input,15,FOLLOW_15_in_ruleSubSystemConfig467); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_0=(Token)match(input,15,FOLLOW_3); 
 
-                  	newLeafNode(otherlv_0, grammarAccess.getSubSystemConfigAccess().getSubSystemConfigKeyword_0());
-                  
-            }
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:232:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:233:1: ( ruleFQN )
+                	newLeafNode(otherlv_0, grammarAccess.getSubSystemConfigAccess().getSubSystemConfigKeyword_0());
+                
+            // InternalConfig.g:232:1: ( ( ruleFQN ) )
+            // InternalConfig.g:233:1: ( ruleFQN )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:233:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:234:3: ruleFQN
+            // InternalConfig.g:233:1: ( ruleFQN )
+            // InternalConfig.g:234:3: ruleFQN
             {
-            if ( state.backtracking==0 ) {
 
-              			if (current==null) {
-              	            current = createModelElement(grammarAccess.getSubSystemConfigRule());
-              	        }
-                      
-            }
-            if ( state.backtracking==0 ) {
-               
-              	        newCompositeNode(grammarAccess.getSubSystemConfigAccess().getRootLogicalSystemCrossReference_1_0()); 
-              	    
-            }
-            pushFollow(FOLLOW_ruleFQN_in_ruleSubSystemConfig490);
+            			if (current==null) {
+            	            current = createModelElement(grammarAccess.getSubSystemConfigRule());
+            	        }
+                    
+             
+            	        newCompositeNode(grammarAccess.getSubSystemConfigAccess().getRootLogicalSystemCrossReference_1_0()); 
+            	    
+            pushFollow(FOLLOW_7);
             ruleFQN();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               
-              	        afterParserOrEnumRuleCall();
-              	    
-            }
+
+             
+            	        afterParserOrEnumRuleCall();
+            	    
 
             }
 
 
             }
 
-            otherlv_2=(Token)match(input,16,FOLLOW_16_in_ruleSubSystemConfig502); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_2=(Token)match(input,16,FOLLOW_3); 
 
-                  	newLeafNode(otherlv_2, grammarAccess.getSubSystemConfigAccess().getSolidusKeyword_2());
-                  
-            }
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:251:1: ( (otherlv_3= RULE_ID ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:252:1: (otherlv_3= RULE_ID )
+                	newLeafNode(otherlv_2, grammarAccess.getSubSystemConfigAccess().getSolidusKeyword_2());
+                
+            // InternalConfig.g:251:1: ( (otherlv_3= RULE_ID ) )
+            // InternalConfig.g:252:1: (otherlv_3= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:252:1: (otherlv_3= RULE_ID )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:253:3: otherlv_3= RULE_ID
+            // InternalConfig.g:252:1: (otherlv_3= RULE_ID )
+            // InternalConfig.g:253:3: otherlv_3= RULE_ID
             {
-            if ( state.backtracking==0 ) {
 
-              			if (current==null) {
-              	            current = createModelElement(grammarAccess.getSubSystemConfigRule());
-              	        }
-                      
-            }
-            otherlv_3=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleSubSystemConfig522); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            			if (current==null) {
+            	            current = createModelElement(grammarAccess.getSubSystemConfigRule());
+            	        }
+                    
+            otherlv_3=(Token)match(input,RULE_ID,FOLLOW_4); 
 
-              		newLeafNode(otherlv_3, grammarAccess.getSubSystemConfigAccess().getSubSystemSubSystemRefCrossReference_3_0()); 
-              	
-            }
+            		newLeafNode(otherlv_3, grammarAccess.getSubSystemConfigAccess().getSubSystemSubSystemRefCrossReference_3_0()); 
+            	
 
             }
 
 
             }
 
-            otherlv_4=(Token)match(input,13,FOLLOW_13_in_ruleSubSystemConfig534); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_4=(Token)match(input,13,FOLLOW_8); 
 
-                  	newLeafNode(otherlv_4, grammarAccess.getSubSystemConfigAccess().getLeftCurlyBracketKeyword_4());
-                  
-            }
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:268:1: ( (lv_dynConfig_5_0= ruleDynamicConfig ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:269:1: (lv_dynConfig_5_0= ruleDynamicConfig )
+                	newLeafNode(otherlv_4, grammarAccess.getSubSystemConfigAccess().getLeftCurlyBracketKeyword_4());
+                
+            // InternalConfig.g:268:1: ( (lv_dynConfig_5_0= ruleDynamicConfig ) )
+            // InternalConfig.g:269:1: (lv_dynConfig_5_0= ruleDynamicConfig )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:269:1: (lv_dynConfig_5_0= ruleDynamicConfig )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:270:3: lv_dynConfig_5_0= ruleDynamicConfig
+            // InternalConfig.g:269:1: (lv_dynConfig_5_0= ruleDynamicConfig )
+            // InternalConfig.g:270:3: lv_dynConfig_5_0= ruleDynamicConfig
             {
-            if ( state.backtracking==0 ) {
-               
-              	        newCompositeNode(grammarAccess.getSubSystemConfigAccess().getDynConfigDynamicConfigParserRuleCall_5_0()); 
-              	    
-            }
-            pushFollow(FOLLOW_ruleDynamicConfig_in_ruleSubSystemConfig555);
+             
+            	        newCompositeNode(grammarAccess.getSubSystemConfigAccess().getDynConfigDynamicConfigParserRuleCall_5_0()); 
+            	    
+            pushFollow(FOLLOW_9);
             lv_dynConfig_5_0=ruleDynamicConfig();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
 
-              	        if (current==null) {
-              	            current = createModelElementForParent(grammarAccess.getSubSystemConfigRule());
-              	        }
-                     		set(
-                     			current, 
-                     			"dynConfig",
-                      		lv_dynConfig_5_0, 
-                      		"DynamicConfig");
-              	        afterParserOrEnumRuleCall();
-              	    
-            }
+
+            	        if (current==null) {
+            	            current = createModelElementForParent(grammarAccess.getSubSystemConfigRule());
+            	        }
+                   		set(
+                   			current, 
+                   			"dynConfig",
+                    		lv_dynConfig_5_0, 
+                    		"org.eclipse.etrice.core.Config.DynamicConfig");
+            	        afterParserOrEnumRuleCall();
+            	    
 
             }
 
 
             }
 
-            otherlv_6=(Token)match(input,14,FOLLOW_14_in_ruleSubSystemConfig567); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_6=(Token)match(input,14,FOLLOW_2); 
 
-                  	newLeafNode(otherlv_6, grammarAccess.getSubSystemConfigAccess().getRightCurlyBracketKeyword_6());
-                  
-            }
+                	newLeafNode(otherlv_6, grammarAccess.getSubSystemConfigAccess().getRightCurlyBracketKeyword_6());
+                
 
             }
 
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -773,7 +697,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleDynamicConfig"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:298:1: entryRuleDynamicConfig returns [EObject current=null] : iv_ruleDynamicConfig= ruleDynamicConfig EOF ;
+    // InternalConfig.g:298:1: entryRuleDynamicConfig returns [EObject current=null] : iv_ruleDynamicConfig= ruleDynamicConfig EOF ;
     public final EObject entryRuleDynamicConfig() throws RecognitionException {
         EObject current = null;
 
@@ -781,21 +705,17 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:299:2: (iv_ruleDynamicConfig= ruleDynamicConfig EOF )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:300:2: iv_ruleDynamicConfig= ruleDynamicConfig EOF
+            // InternalConfig.g:299:2: (iv_ruleDynamicConfig= ruleDynamicConfig EOF )
+            // InternalConfig.g:300:2: iv_ruleDynamicConfig= ruleDynamicConfig EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getDynamicConfigRule()); 
-            }
-            pushFollow(FOLLOW_ruleDynamicConfig_in_entryRuleDynamicConfig603);
+             newCompositeNode(grammarAccess.getDynamicConfigRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleDynamicConfig=ruleDynamicConfig();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleDynamicConfig; 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDynamicConfig613); if (state.failed) return current;
+
+             current =iv_ruleDynamicConfig; 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -813,7 +733,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleDynamicConfig"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:307:1: ruleDynamicConfig returns [EObject current=null] : (otherlv_0= 'dynamic configuration' otherlv_1= '{' ( ( ( ( ({...}? => ( ({...}? => ( (otherlv_3= 'file path' ( (lv_filePath_4_0= RULE_STRING ) ) ) | ( (otherlv_5= 'user import' ( (lv_userCode1_6_0= RULE_STRING ) ) ) (otherlv_7= 'user constructor' ( (lv_userCode2_8_0= RULE_STRING ) ) ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_9= 'polling interval' ( (lv_polling_10_0= ruleTIME ) ) ) ) ) ) )+ {...}?) ) ) otherlv_11= '}' ) ;
+    // InternalConfig.g:307:1: ruleDynamicConfig returns [EObject current=null] : (otherlv_0= 'dynamic configuration' otherlv_1= '{' ( ( ( ( ({...}? => ( ({...}? => ( (otherlv_3= 'file path' ( (lv_filePath_4_0= RULE_STRING ) ) ) | ( (otherlv_5= 'user import' ( (lv_userCode1_6_0= RULE_STRING ) ) ) (otherlv_7= 'user constructor' ( (lv_userCode2_8_0= RULE_STRING ) ) ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_9= 'polling interval' ( (lv_polling_10_0= ruleTIME ) ) ) ) ) ) )+ {...}?) ) ) otherlv_11= '}' ) ;
     public final EObject ruleDynamicConfig() throws RecognitionException {
         EObject current = null;
 
@@ -833,72 +753,70 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:310:28: ( (otherlv_0= 'dynamic configuration' otherlv_1= '{' ( ( ( ( ({...}? => ( ({...}? => ( (otherlv_3= 'file path' ( (lv_filePath_4_0= RULE_STRING ) ) ) | ( (otherlv_5= 'user import' ( (lv_userCode1_6_0= RULE_STRING ) ) ) (otherlv_7= 'user constructor' ( (lv_userCode2_8_0= RULE_STRING ) ) ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_9= 'polling interval' ( (lv_polling_10_0= ruleTIME ) ) ) ) ) ) )+ {...}?) ) ) otherlv_11= '}' ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:311:1: (otherlv_0= 'dynamic configuration' otherlv_1= '{' ( ( ( ( ({...}? => ( ({...}? => ( (otherlv_3= 'file path' ( (lv_filePath_4_0= RULE_STRING ) ) ) | ( (otherlv_5= 'user import' ( (lv_userCode1_6_0= RULE_STRING ) ) ) (otherlv_7= 'user constructor' ( (lv_userCode2_8_0= RULE_STRING ) ) ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_9= 'polling interval' ( (lv_polling_10_0= ruleTIME ) ) ) ) ) ) )+ {...}?) ) ) otherlv_11= '}' )
+            // InternalConfig.g:310:28: ( (otherlv_0= 'dynamic configuration' otherlv_1= '{' ( ( ( ( ({...}? => ( ({...}? => ( (otherlv_3= 'file path' ( (lv_filePath_4_0= RULE_STRING ) ) ) | ( (otherlv_5= 'user import' ( (lv_userCode1_6_0= RULE_STRING ) ) ) (otherlv_7= 'user constructor' ( (lv_userCode2_8_0= RULE_STRING ) ) ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_9= 'polling interval' ( (lv_polling_10_0= ruleTIME ) ) ) ) ) ) )+ {...}?) ) ) otherlv_11= '}' ) )
+            // InternalConfig.g:311:1: (otherlv_0= 'dynamic configuration' otherlv_1= '{' ( ( ( ( ({...}? => ( ({...}? => ( (otherlv_3= 'file path' ( (lv_filePath_4_0= RULE_STRING ) ) ) | ( (otherlv_5= 'user import' ( (lv_userCode1_6_0= RULE_STRING ) ) ) (otherlv_7= 'user constructor' ( (lv_userCode2_8_0= RULE_STRING ) ) ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_9= 'polling interval' ( (lv_polling_10_0= ruleTIME ) ) ) ) ) ) )+ {...}?) ) ) otherlv_11= '}' )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:311:1: (otherlv_0= 'dynamic configuration' otherlv_1= '{' ( ( ( ( ({...}? => ( ({...}? => ( (otherlv_3= 'file path' ( (lv_filePath_4_0= RULE_STRING ) ) ) | ( (otherlv_5= 'user import' ( (lv_userCode1_6_0= RULE_STRING ) ) ) (otherlv_7= 'user constructor' ( (lv_userCode2_8_0= RULE_STRING ) ) ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_9= 'polling interval' ( (lv_polling_10_0= ruleTIME ) ) ) ) ) ) )+ {...}?) ) ) otherlv_11= '}' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:311:3: otherlv_0= 'dynamic configuration' otherlv_1= '{' ( ( ( ( ({...}? => ( ({...}? => ( (otherlv_3= 'file path' ( (lv_filePath_4_0= RULE_STRING ) ) ) | ( (otherlv_5= 'user import' ( (lv_userCode1_6_0= RULE_STRING ) ) ) (otherlv_7= 'user constructor' ( (lv_userCode2_8_0= RULE_STRING ) ) ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_9= 'polling interval' ( (lv_polling_10_0= ruleTIME ) ) ) ) ) ) )+ {...}?) ) ) otherlv_11= '}'
+            // InternalConfig.g:311:1: (otherlv_0= 'dynamic configuration' otherlv_1= '{' ( ( ( ( ({...}? => ( ({...}? => ( (otherlv_3= 'file path' ( (lv_filePath_4_0= RULE_STRING ) ) ) | ( (otherlv_5= 'user import' ( (lv_userCode1_6_0= RULE_STRING ) ) ) (otherlv_7= 'user constructor' ( (lv_userCode2_8_0= RULE_STRING ) ) ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_9= 'polling interval' ( (lv_polling_10_0= ruleTIME ) ) ) ) ) ) )+ {...}?) ) ) otherlv_11= '}' )
+            // InternalConfig.g:311:3: otherlv_0= 'dynamic configuration' otherlv_1= '{' ( ( ( ( ({...}? => ( ({...}? => ( (otherlv_3= 'file path' ( (lv_filePath_4_0= RULE_STRING ) ) ) | ( (otherlv_5= 'user import' ( (lv_userCode1_6_0= RULE_STRING ) ) ) (otherlv_7= 'user constructor' ( (lv_userCode2_8_0= RULE_STRING ) ) ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_9= 'polling interval' ( (lv_polling_10_0= ruleTIME ) ) ) ) ) ) )+ {...}?) ) ) otherlv_11= '}'
             {
-            otherlv_0=(Token)match(input,17,FOLLOW_17_in_ruleDynamicConfig650); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_0=(Token)match(input,17,FOLLOW_4); 
 
-                  	newLeafNode(otherlv_0, grammarAccess.getDynamicConfigAccess().getDynamicConfigurationKeyword_0());
-                  
-            }
-            otherlv_1=(Token)match(input,13,FOLLOW_13_in_ruleDynamicConfig662); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+                	newLeafNode(otherlv_0, grammarAccess.getDynamicConfigAccess().getDynamicConfigurationKeyword_0());
+                
+            otherlv_1=(Token)match(input,13,FOLLOW_10); 
 
-                  	newLeafNode(otherlv_1, grammarAccess.getDynamicConfigAccess().getLeftCurlyBracketKeyword_1());
-                  
-            }
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:319:1: ( ( ( ( ({...}? => ( ({...}? => ( (otherlv_3= 'file path' ( (lv_filePath_4_0= RULE_STRING ) ) ) | ( (otherlv_5= 'user import' ( (lv_userCode1_6_0= RULE_STRING ) ) ) (otherlv_7= 'user constructor' ( (lv_userCode2_8_0= RULE_STRING ) ) ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_9= 'polling interval' ( (lv_polling_10_0= ruleTIME ) ) ) ) ) ) )+ {...}?) ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:321:1: ( ( ( ({...}? => ( ({...}? => ( (otherlv_3= 'file path' ( (lv_filePath_4_0= RULE_STRING ) ) ) | ( (otherlv_5= 'user import' ( (lv_userCode1_6_0= RULE_STRING ) ) ) (otherlv_7= 'user constructor' ( (lv_userCode2_8_0= RULE_STRING ) ) ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_9= 'polling interval' ( (lv_polling_10_0= ruleTIME ) ) ) ) ) ) )+ {...}?) )
+                	newLeafNode(otherlv_1, grammarAccess.getDynamicConfigAccess().getLeftCurlyBracketKeyword_1());
+                
+            // InternalConfig.g:319:1: ( ( ( ( ({...}? => ( ({...}? => ( (otherlv_3= 'file path' ( (lv_filePath_4_0= RULE_STRING ) ) ) | ( (otherlv_5= 'user import' ( (lv_userCode1_6_0= RULE_STRING ) ) ) (otherlv_7= 'user constructor' ( (lv_userCode2_8_0= RULE_STRING ) ) ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_9= 'polling interval' ( (lv_polling_10_0= ruleTIME ) ) ) ) ) ) )+ {...}?) ) )
+            // InternalConfig.g:321:1: ( ( ( ({...}? => ( ({...}? => ( (otherlv_3= 'file path' ( (lv_filePath_4_0= RULE_STRING ) ) ) | ( (otherlv_5= 'user import' ( (lv_userCode1_6_0= RULE_STRING ) ) ) (otherlv_7= 'user constructor' ( (lv_userCode2_8_0= RULE_STRING ) ) ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_9= 'polling interval' ( (lv_polling_10_0= ruleTIME ) ) ) ) ) ) )+ {...}?) )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:321:1: ( ( ( ({...}? => ( ({...}? => ( (otherlv_3= 'file path' ( (lv_filePath_4_0= RULE_STRING ) ) ) | ( (otherlv_5= 'user import' ( (lv_userCode1_6_0= RULE_STRING ) ) ) (otherlv_7= 'user constructor' ( (lv_userCode2_8_0= RULE_STRING ) ) ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_9= 'polling interval' ( (lv_polling_10_0= ruleTIME ) ) ) ) ) ) )+ {...}?) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:322:2: ( ( ({...}? => ( ({...}? => ( (otherlv_3= 'file path' ( (lv_filePath_4_0= RULE_STRING ) ) ) | ( (otherlv_5= 'user import' ( (lv_userCode1_6_0= RULE_STRING ) ) ) (otherlv_7= 'user constructor' ( (lv_userCode2_8_0= RULE_STRING ) ) ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_9= 'polling interval' ( (lv_polling_10_0= ruleTIME ) ) ) ) ) ) )+ {...}?)
+            // InternalConfig.g:321:1: ( ( ( ({...}? => ( ({...}? => ( (otherlv_3= 'file path' ( (lv_filePath_4_0= RULE_STRING ) ) ) | ( (otherlv_5= 'user import' ( (lv_userCode1_6_0= RULE_STRING ) ) ) (otherlv_7= 'user constructor' ( (lv_userCode2_8_0= RULE_STRING ) ) ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_9= 'polling interval' ( (lv_polling_10_0= ruleTIME ) ) ) ) ) ) )+ {...}?) )
+            // InternalConfig.g:322:2: ( ( ({...}? => ( ({...}? => ( (otherlv_3= 'file path' ( (lv_filePath_4_0= RULE_STRING ) ) ) | ( (otherlv_5= 'user import' ( (lv_userCode1_6_0= RULE_STRING ) ) ) (otherlv_7= 'user constructor' ( (lv_userCode2_8_0= RULE_STRING ) ) ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_9= 'polling interval' ( (lv_polling_10_0= ruleTIME ) ) ) ) ) ) )+ {...}?)
             {
-            getUnorderedGroupHelper().enter(grammarAccess.getDynamicConfigAccess().getUnorderedGroup_2());
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:325:2: ( ( ({...}? => ( ({...}? => ( (otherlv_3= 'file path' ( (lv_filePath_4_0= RULE_STRING ) ) ) | ( (otherlv_5= 'user import' ( (lv_userCode1_6_0= RULE_STRING ) ) ) (otherlv_7= 'user constructor' ( (lv_userCode2_8_0= RULE_STRING ) ) ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_9= 'polling interval' ( (lv_polling_10_0= ruleTIME ) ) ) ) ) ) )+ {...}?)
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:326:3: ( ({...}? => ( ({...}? => ( (otherlv_3= 'file path' ( (lv_filePath_4_0= RULE_STRING ) ) ) | ( (otherlv_5= 'user import' ( (lv_userCode1_6_0= RULE_STRING ) ) ) (otherlv_7= 'user constructor' ( (lv_userCode2_8_0= RULE_STRING ) ) ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_9= 'polling interval' ( (lv_polling_10_0= ruleTIME ) ) ) ) ) ) )+ {...}?
+             
+            	  getUnorderedGroupHelper().enter(grammarAccess.getDynamicConfigAccess().getUnorderedGroup_2());
+            	
+            // InternalConfig.g:325:2: ( ( ({...}? => ( ({...}? => ( (otherlv_3= 'file path' ( (lv_filePath_4_0= RULE_STRING ) ) ) | ( (otherlv_5= 'user import' ( (lv_userCode1_6_0= RULE_STRING ) ) ) (otherlv_7= 'user constructor' ( (lv_userCode2_8_0= RULE_STRING ) ) ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_9= 'polling interval' ( (lv_polling_10_0= ruleTIME ) ) ) ) ) ) )+ {...}?)
+            // InternalConfig.g:326:3: ( ({...}? => ( ({...}? => ( (otherlv_3= 'file path' ( (lv_filePath_4_0= RULE_STRING ) ) ) | ( (otherlv_5= 'user import' ( (lv_userCode1_6_0= RULE_STRING ) ) ) (otherlv_7= 'user constructor' ( (lv_userCode2_8_0= RULE_STRING ) ) ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_9= 'polling interval' ( (lv_polling_10_0= ruleTIME ) ) ) ) ) ) )+ {...}?
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:326:3: ( ({...}? => ( ({...}? => ( (otherlv_3= 'file path' ( (lv_filePath_4_0= RULE_STRING ) ) ) | ( (otherlv_5= 'user import' ( (lv_userCode1_6_0= RULE_STRING ) ) ) (otherlv_7= 'user constructor' ( (lv_userCode2_8_0= RULE_STRING ) ) ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_9= 'polling interval' ( (lv_polling_10_0= ruleTIME ) ) ) ) ) ) )+
+            // InternalConfig.g:326:3: ( ({...}? => ( ({...}? => ( (otherlv_3= 'file path' ( (lv_filePath_4_0= RULE_STRING ) ) ) | ( (otherlv_5= 'user import' ( (lv_userCode1_6_0= RULE_STRING ) ) ) (otherlv_7= 'user constructor' ( (lv_userCode2_8_0= RULE_STRING ) ) ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_9= 'polling interval' ( (lv_polling_10_0= ruleTIME ) ) ) ) ) ) )+
             int cnt5=0;
             loop5:
             do {
                 int alt5=3;
                 int LA5_0 = input.LA(1);
 
-                if ( LA5_0 >=18 && LA5_0<=19 && getUnorderedGroupHelper().canSelect(grammarAccess.getDynamicConfigAccess().getUnorderedGroup_2(), 0) ) {
+                if ( LA5_0 >= 18 && LA5_0 <= 19 && getUnorderedGroupHelper().canSelect(grammarAccess.getDynamicConfigAccess().getUnorderedGroup_2(), 0) ) {
                     alt5=1;
                 }
-                else if ( LA5_0 ==21 && getUnorderedGroupHelper().canSelect(grammarAccess.getDynamicConfigAccess().getUnorderedGroup_2(), 1) ) {
+                else if ( LA5_0 == 21 && getUnorderedGroupHelper().canSelect(grammarAccess.getDynamicConfigAccess().getUnorderedGroup_2(), 1) ) {
                     alt5=2;
                 }
 
 
                 switch (alt5) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:328:4: ({...}? => ( ({...}? => ( (otherlv_3= 'file path' ( (lv_filePath_4_0= RULE_STRING ) ) ) | ( (otherlv_5= 'user import' ( (lv_userCode1_6_0= RULE_STRING ) ) ) (otherlv_7= 'user constructor' ( (lv_userCode2_8_0= RULE_STRING ) ) ) ) ) ) ) )
+            	    // InternalConfig.g:328:4: ({...}? => ( ({...}? => ( (otherlv_3= 'file path' ( (lv_filePath_4_0= RULE_STRING ) ) ) | ( (otherlv_5= 'user import' ( (lv_userCode1_6_0= RULE_STRING ) ) ) (otherlv_7= 'user constructor' ( (lv_userCode2_8_0= RULE_STRING ) ) ) ) ) ) ) )
             	    {
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:328:4: ({...}? => ( ({...}? => ( (otherlv_3= 'file path' ( (lv_filePath_4_0= RULE_STRING ) ) ) | ( (otherlv_5= 'user import' ( (lv_userCode1_6_0= RULE_STRING ) ) ) (otherlv_7= 'user constructor' ( (lv_userCode2_8_0= RULE_STRING ) ) ) ) ) ) ) )
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:329:5: {...}? => ( ({...}? => ( (otherlv_3= 'file path' ( (lv_filePath_4_0= RULE_STRING ) ) ) | ( (otherlv_5= 'user import' ( (lv_userCode1_6_0= RULE_STRING ) ) ) (otherlv_7= 'user constructor' ( (lv_userCode2_8_0= RULE_STRING ) ) ) ) ) ) )
+            	    // InternalConfig.g:328:4: ({...}? => ( ({...}? => ( (otherlv_3= 'file path' ( (lv_filePath_4_0= RULE_STRING ) ) ) | ( (otherlv_5= 'user import' ( (lv_userCode1_6_0= RULE_STRING ) ) ) (otherlv_7= 'user constructor' ( (lv_userCode2_8_0= RULE_STRING ) ) ) ) ) ) ) )
+            	    // InternalConfig.g:329:5: {...}? => ( ({...}? => ( (otherlv_3= 'file path' ( (lv_filePath_4_0= RULE_STRING ) ) ) | ( (otherlv_5= 'user import' ( (lv_userCode1_6_0= RULE_STRING ) ) ) (otherlv_7= 'user constructor' ( (lv_userCode2_8_0= RULE_STRING ) ) ) ) ) ) )
             	    {
             	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getDynamicConfigAccess().getUnorderedGroup_2(), 0) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleDynamicConfig", "getUnorderedGroupHelper().canSelect(grammarAccess.getDynamicConfigAccess().getUnorderedGroup_2(), 0)");
             	    }
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:329:110: ( ({...}? => ( (otherlv_3= 'file path' ( (lv_filePath_4_0= RULE_STRING ) ) ) | ( (otherlv_5= 'user import' ( (lv_userCode1_6_0= RULE_STRING ) ) ) (otherlv_7= 'user constructor' ( (lv_userCode2_8_0= RULE_STRING ) ) ) ) ) ) )
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:330:6: ({...}? => ( (otherlv_3= 'file path' ( (lv_filePath_4_0= RULE_STRING ) ) ) | ( (otherlv_5= 'user import' ( (lv_userCode1_6_0= RULE_STRING ) ) ) (otherlv_7= 'user constructor' ( (lv_userCode2_8_0= RULE_STRING ) ) ) ) ) )
+            	    // InternalConfig.g:329:110: ( ({...}? => ( (otherlv_3= 'file path' ( (lv_filePath_4_0= RULE_STRING ) ) ) | ( (otherlv_5= 'user import' ( (lv_userCode1_6_0= RULE_STRING ) ) ) (otherlv_7= 'user constructor' ( (lv_userCode2_8_0= RULE_STRING ) ) ) ) ) ) )
+            	    // InternalConfig.g:330:6: ({...}? => ( (otherlv_3= 'file path' ( (lv_filePath_4_0= RULE_STRING ) ) ) | ( (otherlv_5= 'user import' ( (lv_userCode1_6_0= RULE_STRING ) ) ) (otherlv_7= 'user constructor' ( (lv_userCode2_8_0= RULE_STRING ) ) ) ) ) )
             	    {
-            	    getUnorderedGroupHelper().select(grammarAccess.getDynamicConfigAccess().getUnorderedGroup_2(), 0);
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:333:6: ({...}? => ( (otherlv_3= 'file path' ( (lv_filePath_4_0= RULE_STRING ) ) ) | ( (otherlv_5= 'user import' ( (lv_userCode1_6_0= RULE_STRING ) ) ) (otherlv_7= 'user constructor' ( (lv_userCode2_8_0= RULE_STRING ) ) ) ) ) )
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:333:7: {...}? => ( (otherlv_3= 'file path' ( (lv_filePath_4_0= RULE_STRING ) ) ) | ( (otherlv_5= 'user import' ( (lv_userCode1_6_0= RULE_STRING ) ) ) (otherlv_7= 'user constructor' ( (lv_userCode2_8_0= RULE_STRING ) ) ) ) )
+            	     
+            	    	 				  getUnorderedGroupHelper().select(grammarAccess.getDynamicConfigAccess().getUnorderedGroup_2(), 0);
+            	    	 				
+            	    // InternalConfig.g:333:6: ({...}? => ( (otherlv_3= 'file path' ( (lv_filePath_4_0= RULE_STRING ) ) ) | ( (otherlv_5= 'user import' ( (lv_userCode1_6_0= RULE_STRING ) ) ) (otherlv_7= 'user constructor' ( (lv_userCode2_8_0= RULE_STRING ) ) ) ) ) )
+            	    // InternalConfig.g:333:7: {...}? => ( (otherlv_3= 'file path' ( (lv_filePath_4_0= RULE_STRING ) ) ) | ( (otherlv_5= 'user import' ( (lv_userCode1_6_0= RULE_STRING ) ) ) (otherlv_7= 'user constructor' ( (lv_userCode2_8_0= RULE_STRING ) ) ) ) )
             	    {
             	    if ( !((true)) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleDynamicConfig", "true");
             	    }
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:333:16: ( (otherlv_3= 'file path' ( (lv_filePath_4_0= RULE_STRING ) ) ) | ( (otherlv_5= 'user import' ( (lv_userCode1_6_0= RULE_STRING ) ) ) (otherlv_7= 'user constructor' ( (lv_userCode2_8_0= RULE_STRING ) ) ) ) )
+            	    // InternalConfig.g:333:16: ( (otherlv_3= 'file path' ( (lv_filePath_4_0= RULE_STRING ) ) ) | ( (otherlv_5= 'user import' ( (lv_userCode1_6_0= RULE_STRING ) ) ) (otherlv_7= 'user constructor' ( (lv_userCode2_8_0= RULE_STRING ) ) ) ) )
             	    int alt4=2;
             	    int LA4_0 = input.LA(1);
 
@@ -909,7 +827,6 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
             	        alt4=2;
             	    }
             	    else {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
             	        NoViableAltException nvae =
             	            new NoViableAltException("", 4, 0, input);
 
@@ -917,41 +834,35 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
             	    }
             	    switch (alt4) {
             	        case 1 :
-            	            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:333:17: (otherlv_3= 'file path' ( (lv_filePath_4_0= RULE_STRING ) ) )
+            	            // InternalConfig.g:333:17: (otherlv_3= 'file path' ( (lv_filePath_4_0= RULE_STRING ) ) )
             	            {
-            	            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:333:17: (otherlv_3= 'file path' ( (lv_filePath_4_0= RULE_STRING ) ) )
-            	            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:333:19: otherlv_3= 'file path' ( (lv_filePath_4_0= RULE_STRING ) )
+            	            // InternalConfig.g:333:17: (otherlv_3= 'file path' ( (lv_filePath_4_0= RULE_STRING ) ) )
+            	            // InternalConfig.g:333:19: otherlv_3= 'file path' ( (lv_filePath_4_0= RULE_STRING ) )
             	            {
-            	            otherlv_3=(Token)match(input,18,FOLLOW_18_in_ruleDynamicConfig721); if (state.failed) return current;
-            	            if ( state.backtracking==0 ) {
+            	            otherlv_3=(Token)match(input,18,FOLLOW_11); 
 
-            	                  	newLeafNode(otherlv_3, grammarAccess.getDynamicConfigAccess().getFilePathKeyword_2_0_0_0());
-            	                  
-            	            }
-            	            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:337:1: ( (lv_filePath_4_0= RULE_STRING ) )
-            	            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:338:1: (lv_filePath_4_0= RULE_STRING )
+            	                	newLeafNode(otherlv_3, grammarAccess.getDynamicConfigAccess().getFilePathKeyword_2_0_0_0());
+            	                
+            	            // InternalConfig.g:337:1: ( (lv_filePath_4_0= RULE_STRING ) )
+            	            // InternalConfig.g:338:1: (lv_filePath_4_0= RULE_STRING )
             	            {
-            	            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:338:1: (lv_filePath_4_0= RULE_STRING )
-            	            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:339:3: lv_filePath_4_0= RULE_STRING
+            	            // InternalConfig.g:338:1: (lv_filePath_4_0= RULE_STRING )
+            	            // InternalConfig.g:339:3: lv_filePath_4_0= RULE_STRING
             	            {
-            	            lv_filePath_4_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleDynamicConfig738); if (state.failed) return current;
-            	            if ( state.backtracking==0 ) {
+            	            lv_filePath_4_0=(Token)match(input,RULE_STRING,FOLLOW_12); 
 
-            	              			newLeafNode(lv_filePath_4_0, grammarAccess.getDynamicConfigAccess().getFilePathSTRINGTerminalRuleCall_2_0_0_1_0()); 
-            	              		
-            	            }
-            	            if ( state.backtracking==0 ) {
-
-            	              	        if (current==null) {
-            	              	            current = createModelElement(grammarAccess.getDynamicConfigRule());
-            	              	        }
-            	                     		setWithLastConsumed(
-            	                     			current, 
-            	                     			"filePath",
-            	                      		lv_filePath_4_0, 
-            	                      		"STRING");
-            	              	    
-            	            }
+            	            			newLeafNode(lv_filePath_4_0, grammarAccess.getDynamicConfigAccess().getFilePathSTRINGTerminalRuleCall_2_0_0_1_0()); 
+            	            		
+
+            	            	        if (current==null) {
+            	            	            current = createModelElement(grammarAccess.getDynamicConfigRule());
+            	            	        }
+            	                   		setWithLastConsumed(
+            	                   			current, 
+            	                   			"filePath",
+            	                    		lv_filePath_4_0, 
+            	                    		"org.eclipse.xtext.common.Terminals.STRING");
+            	            	    
 
             	            }
 
@@ -965,44 +876,38 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
             	            }
             	            break;
             	        case 2 :
-            	            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:356:6: ( (otherlv_5= 'user import' ( (lv_userCode1_6_0= RULE_STRING ) ) ) (otherlv_7= 'user constructor' ( (lv_userCode2_8_0= RULE_STRING ) ) ) )
+            	            // InternalConfig.g:356:6: ( (otherlv_5= 'user import' ( (lv_userCode1_6_0= RULE_STRING ) ) ) (otherlv_7= 'user constructor' ( (lv_userCode2_8_0= RULE_STRING ) ) ) )
             	            {
-            	            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:356:6: ( (otherlv_5= 'user import' ( (lv_userCode1_6_0= RULE_STRING ) ) ) (otherlv_7= 'user constructor' ( (lv_userCode2_8_0= RULE_STRING ) ) ) )
-            	            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:356:7: (otherlv_5= 'user import' ( (lv_userCode1_6_0= RULE_STRING ) ) ) (otherlv_7= 'user constructor' ( (lv_userCode2_8_0= RULE_STRING ) ) )
+            	            // InternalConfig.g:356:6: ( (otherlv_5= 'user import' ( (lv_userCode1_6_0= RULE_STRING ) ) ) (otherlv_7= 'user constructor' ( (lv_userCode2_8_0= RULE_STRING ) ) ) )
+            	            // InternalConfig.g:356:7: (otherlv_5= 'user import' ( (lv_userCode1_6_0= RULE_STRING ) ) ) (otherlv_7= 'user constructor' ( (lv_userCode2_8_0= RULE_STRING ) ) )
             	            {
-            	            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:356:7: (otherlv_5= 'user import' ( (lv_userCode1_6_0= RULE_STRING ) ) )
-            	            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:356:9: otherlv_5= 'user import' ( (lv_userCode1_6_0= RULE_STRING ) )
+            	            // InternalConfig.g:356:7: (otherlv_5= 'user import' ( (lv_userCode1_6_0= RULE_STRING ) ) )
+            	            // InternalConfig.g:356:9: otherlv_5= 'user import' ( (lv_userCode1_6_0= RULE_STRING ) )
             	            {
-            	            otherlv_5=(Token)match(input,19,FOLLOW_19_in_ruleDynamicConfig764); if (state.failed) return current;
-            	            if ( state.backtracking==0 ) {
+            	            otherlv_5=(Token)match(input,19,FOLLOW_11); 
 
-            	                  	newLeafNode(otherlv_5, grammarAccess.getDynamicConfigAccess().getUserImportKeyword_2_0_1_0_0());
-            	                  
-            	            }
-            	            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:360:1: ( (lv_userCode1_6_0= RULE_STRING ) )
-            	            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:361:1: (lv_userCode1_6_0= RULE_STRING )
+            	                	newLeafNode(otherlv_5, grammarAccess.getDynamicConfigAccess().getUserImportKeyword_2_0_1_0_0());
+            	                
+            	            // InternalConfig.g:360:1: ( (lv_userCode1_6_0= RULE_STRING ) )
+            	            // InternalConfig.g:361:1: (lv_userCode1_6_0= RULE_STRING )
             	            {
-            	            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:361:1: (lv_userCode1_6_0= RULE_STRING )
-            	            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:362:3: lv_userCode1_6_0= RULE_STRING
+            	            // InternalConfig.g:361:1: (lv_userCode1_6_0= RULE_STRING )
+            	            // InternalConfig.g:362:3: lv_userCode1_6_0= RULE_STRING
             	            {
-            	            lv_userCode1_6_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleDynamicConfig781); if (state.failed) return current;
-            	            if ( state.backtracking==0 ) {
+            	            lv_userCode1_6_0=(Token)match(input,RULE_STRING,FOLLOW_13); 
 
-            	              			newLeafNode(lv_userCode1_6_0, grammarAccess.getDynamicConfigAccess().getUserCode1STRINGTerminalRuleCall_2_0_1_0_1_0()); 
-            	              		
-            	            }
-            	            if ( state.backtracking==0 ) {
-
-            	              	        if (current==null) {
-            	              	            current = createModelElement(grammarAccess.getDynamicConfigRule());
-            	              	        }
-            	                     		setWithLastConsumed(
-            	                     			current, 
-            	                     			"userCode1",
-            	                      		lv_userCode1_6_0, 
-            	                      		"STRING");
-            	              	    
-            	            }
+            	            			newLeafNode(lv_userCode1_6_0, grammarAccess.getDynamicConfigAccess().getUserCode1STRINGTerminalRuleCall_2_0_1_0_1_0()); 
+            	            		
+
+            	            	        if (current==null) {
+            	            	            current = createModelElement(grammarAccess.getDynamicConfigRule());
+            	            	        }
+            	                   		setWithLastConsumed(
+            	                   			current, 
+            	                   			"userCode1",
+            	                    		lv_userCode1_6_0, 
+            	                    		"org.eclipse.xtext.common.Terminals.STRING");
+            	            	    
 
             	            }
 
@@ -1012,39 +917,33 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
             	            }
 
-            	            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:378:3: (otherlv_7= 'user constructor' ( (lv_userCode2_8_0= RULE_STRING ) ) )
-            	            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:378:5: otherlv_7= 'user constructor' ( (lv_userCode2_8_0= RULE_STRING ) )
+            	            // InternalConfig.g:378:3: (otherlv_7= 'user constructor' ( (lv_userCode2_8_0= RULE_STRING ) ) )
+            	            // InternalConfig.g:378:5: otherlv_7= 'user constructor' ( (lv_userCode2_8_0= RULE_STRING ) )
             	            {
-            	            otherlv_7=(Token)match(input,20,FOLLOW_20_in_ruleDynamicConfig800); if (state.failed) return current;
-            	            if ( state.backtracking==0 ) {
+            	            otherlv_7=(Token)match(input,20,FOLLOW_11); 
 
-            	                  	newLeafNode(otherlv_7, grammarAccess.getDynamicConfigAccess().getUserConstructorKeyword_2_0_1_1_0());
-            	                  
-            	            }
-            	            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:382:1: ( (lv_userCode2_8_0= RULE_STRING ) )
-            	            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:383:1: (lv_userCode2_8_0= RULE_STRING )
+            	                	newLeafNode(otherlv_7, grammarAccess.getDynamicConfigAccess().getUserConstructorKeyword_2_0_1_1_0());
+            	                
+            	            // InternalConfig.g:382:1: ( (lv_userCode2_8_0= RULE_STRING ) )
+            	            // InternalConfig.g:383:1: (lv_userCode2_8_0= RULE_STRING )
             	            {
-            	            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:383:1: (lv_userCode2_8_0= RULE_STRING )
-            	            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:384:3: lv_userCode2_8_0= RULE_STRING
+            	            // InternalConfig.g:383:1: (lv_userCode2_8_0= RULE_STRING )
+            	            // InternalConfig.g:384:3: lv_userCode2_8_0= RULE_STRING
             	            {
-            	            lv_userCode2_8_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleDynamicConfig817); if (state.failed) return current;
-            	            if ( state.backtracking==0 ) {
+            	            lv_userCode2_8_0=(Token)match(input,RULE_STRING,FOLLOW_12); 
 
-            	              			newLeafNode(lv_userCode2_8_0, grammarAccess.getDynamicConfigAccess().getUserCode2STRINGTerminalRuleCall_2_0_1_1_1_0()); 
-            	              		
-            	            }
-            	            if ( state.backtracking==0 ) {
-
-            	              	        if (current==null) {
-            	              	            current = createModelElement(grammarAccess.getDynamicConfigRule());
-            	              	        }
-            	                     		setWithLastConsumed(
-            	                     			current, 
-            	                     			"userCode2",
-            	                      		lv_userCode2_8_0, 
-            	                      		"STRING");
-            	              	    
-            	            }
+            	            			newLeafNode(lv_userCode2_8_0, grammarAccess.getDynamicConfigAccess().getUserCode2STRINGTerminalRuleCall_2_0_1_1_1_0()); 
+            	            		
+
+            	            	        if (current==null) {
+            	            	            current = createModelElement(grammarAccess.getDynamicConfigRule());
+            	            	        }
+            	                   		setWithLastConsumed(
+            	                   			current, 
+            	                   			"userCode2",
+            	                    		lv_userCode2_8_0, 
+            	                    		"org.eclipse.xtext.common.Terminals.STRING");
+            	            	    
 
             	            }
 
@@ -1066,7 +965,9 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    getUnorderedGroupHelper().returnFromSelection(grammarAccess.getDynamicConfigAccess().getUnorderedGroup_2());
+            	     
+            	    	 				  getUnorderedGroupHelper().returnFromSelection(grammarAccess.getDynamicConfigAccess().getUnorderedGroup_2());
+            	    	 				
 
             	    }
 
@@ -1077,64 +978,58 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 2 :
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:407:4: ({...}? => ( ({...}? => (otherlv_9= 'polling interval' ( (lv_polling_10_0= ruleTIME ) ) ) ) ) )
+            	    // InternalConfig.g:407:4: ({...}? => ( ({...}? => (otherlv_9= 'polling interval' ( (lv_polling_10_0= ruleTIME ) ) ) ) ) )
             	    {
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:407:4: ({...}? => ( ({...}? => (otherlv_9= 'polling interval' ( (lv_polling_10_0= ruleTIME ) ) ) ) ) )
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:408:5: {...}? => ( ({...}? => (otherlv_9= 'polling interval' ( (lv_polling_10_0= ruleTIME ) ) ) ) )
+            	    // InternalConfig.g:407:4: ({...}? => ( ({...}? => (otherlv_9= 'polling interval' ( (lv_polling_10_0= ruleTIME ) ) ) ) ) )
+            	    // InternalConfig.g:408:5: {...}? => ( ({...}? => (otherlv_9= 'polling interval' ( (lv_polling_10_0= ruleTIME ) ) ) ) )
             	    {
             	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getDynamicConfigAccess().getUnorderedGroup_2(), 1) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleDynamicConfig", "getUnorderedGroupHelper().canSelect(grammarAccess.getDynamicConfigAccess().getUnorderedGroup_2(), 1)");
             	    }
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:408:110: ( ({...}? => (otherlv_9= 'polling interval' ( (lv_polling_10_0= ruleTIME ) ) ) ) )
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:409:6: ({...}? => (otherlv_9= 'polling interval' ( (lv_polling_10_0= ruleTIME ) ) ) )
+            	    // InternalConfig.g:408:110: ( ({...}? => (otherlv_9= 'polling interval' ( (lv_polling_10_0= ruleTIME ) ) ) ) )
+            	    // InternalConfig.g:409:6: ({...}? => (otherlv_9= 'polling interval' ( (lv_polling_10_0= ruleTIME ) ) ) )
             	    {
-            	    getUnorderedGroupHelper().select(grammarAccess.getDynamicConfigAccess().getUnorderedGroup_2(), 1);
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:412:6: ({...}? => (otherlv_9= 'polling interval' ( (lv_polling_10_0= ruleTIME ) ) ) )
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:412:7: {...}? => (otherlv_9= 'polling interval' ( (lv_polling_10_0= ruleTIME ) ) )
+            	     
+            	    	 				  getUnorderedGroupHelper().select(grammarAccess.getDynamicConfigAccess().getUnorderedGroup_2(), 1);
+            	    	 				
+            	    // InternalConfig.g:412:6: ({...}? => (otherlv_9= 'polling interval' ( (lv_polling_10_0= ruleTIME ) ) ) )
+            	    // InternalConfig.g:412:7: {...}? => (otherlv_9= 'polling interval' ( (lv_polling_10_0= ruleTIME ) ) )
             	    {
             	    if ( !((true)) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleDynamicConfig", "true");
             	    }
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:412:16: (otherlv_9= 'polling interval' ( (lv_polling_10_0= ruleTIME ) ) )
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:412:18: otherlv_9= 'polling interval' ( (lv_polling_10_0= ruleTIME ) )
+            	    // InternalConfig.g:412:16: (otherlv_9= 'polling interval' ( (lv_polling_10_0= ruleTIME ) ) )
+            	    // InternalConfig.g:412:18: otherlv_9= 'polling interval' ( (lv_polling_10_0= ruleTIME ) )
             	    {
-            	    otherlv_9=(Token)match(input,21,FOLLOW_21_in_ruleDynamicConfig892); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
+            	    otherlv_9=(Token)match(input,21,FOLLOW_14); 
 
-            	          	newLeafNode(otherlv_9, grammarAccess.getDynamicConfigAccess().getPollingIntervalKeyword_2_1_0());
-            	          
-            	    }
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:416:1: ( (lv_polling_10_0= ruleTIME ) )
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:417:1: (lv_polling_10_0= ruleTIME )
+            	        	newLeafNode(otherlv_9, grammarAccess.getDynamicConfigAccess().getPollingIntervalKeyword_2_1_0());
+            	        
+            	    // InternalConfig.g:416:1: ( (lv_polling_10_0= ruleTIME ) )
+            	    // InternalConfig.g:417:1: (lv_polling_10_0= ruleTIME )
             	    {
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:417:1: (lv_polling_10_0= ruleTIME )
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:418:3: lv_polling_10_0= ruleTIME
+            	    // InternalConfig.g:417:1: (lv_polling_10_0= ruleTIME )
+            	    // InternalConfig.g:418:3: lv_polling_10_0= ruleTIME
             	    {
-            	    if ( state.backtracking==0 ) {
-            	       
-            	      	        newCompositeNode(grammarAccess.getDynamicConfigAccess().getPollingTIMEParserRuleCall_2_1_1_0()); 
-            	      	    
-            	    }
-            	    pushFollow(FOLLOW_ruleTIME_in_ruleDynamicConfig913);
+            	     
+            	    	        newCompositeNode(grammarAccess.getDynamicConfigAccess().getPollingTIMEParserRuleCall_2_1_1_0()); 
+            	    	    
+            	    pushFollow(FOLLOW_12);
             	    lv_polling_10_0=ruleTIME();
 
             	    state._fsp--;
-            	    if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
-
-            	      	        if (current==null) {
-            	      	            current = createModelElementForParent(grammarAccess.getDynamicConfigRule());
-            	      	        }
-            	             		set(
-            	             			current, 
-            	             			"polling",
-            	              		lv_polling_10_0, 
-            	              		"TIME");
-            	      	        afterParserOrEnumRuleCall();
-            	      	    
-            	    }
+
+
+            	    	        if (current==null) {
+            	    	            current = createModelElementForParent(grammarAccess.getDynamicConfigRule());
+            	    	        }
+            	           		set(
+            	           			current, 
+            	           			"polling",
+            	            		lv_polling_10_0, 
+            	            		"org.eclipse.etrice.core.common.Base.TIME");
+            	    	        afterParserOrEnumRuleCall();
+            	    	    
 
             	    }
 
@@ -1147,7 +1042,9 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    getUnorderedGroupHelper().returnFromSelection(grammarAccess.getDynamicConfigAccess().getUnorderedGroup_2());
+            	     
+            	    	 				  getUnorderedGroupHelper().returnFromSelection(grammarAccess.getDynamicConfigAccess().getUnorderedGroup_2());
+            	    	 				
 
             	    }
 
@@ -1160,7 +1057,6 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
             	default :
             	    if ( cnt5 >= 1 ) break loop5;
-            	    if (state.backtracking>0) {state.failed=true; return current;}
                         EarlyExitException eee =
                             new EarlyExitException(5, input);
                         throw eee;
@@ -1169,7 +1065,6 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
             } while (true);
 
             if ( ! getUnorderedGroupHelper().canLeave(grammarAccess.getDynamicConfigAccess().getUnorderedGroup_2()) ) {
-                if (state.backtracking>0) {state.failed=true; return current;}
                 throw new FailedPredicateException(input, "ruleDynamicConfig", "getUnorderedGroupHelper().canLeave(grammarAccess.getDynamicConfigAccess().getUnorderedGroup_2())");
             }
 
@@ -1178,25 +1073,23 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
             }
 
-            getUnorderedGroupHelper().leave(grammarAccess.getDynamicConfigAccess().getUnorderedGroup_2());
+             
+            	  getUnorderedGroupHelper().leave(grammarAccess.getDynamicConfigAccess().getUnorderedGroup_2());
+            	
 
             }
 
-            otherlv_11=(Token)match(input,14,FOLLOW_14_in_ruleDynamicConfig972); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_11=(Token)match(input,14,FOLLOW_2); 
 
-                  	newLeafNode(otherlv_11, grammarAccess.getDynamicConfigAccess().getRightCurlyBracketKeyword_3());
-                  
-            }
+                	newLeafNode(otherlv_11, grammarAccess.getDynamicConfigAccess().getRightCurlyBracketKeyword_3());
+                
 
             }
 
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -1211,7 +1104,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleActorClassConfig"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:461:1: entryRuleActorClassConfig returns [EObject current=null] : iv_ruleActorClassConfig= ruleActorClassConfig EOF ;
+    // InternalConfig.g:461:1: entryRuleActorClassConfig returns [EObject current=null] : iv_ruleActorClassConfig= ruleActorClassConfig EOF ;
     public final EObject entryRuleActorClassConfig() throws RecognitionException {
         EObject current = null;
 
@@ -1219,21 +1112,17 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:462:2: (iv_ruleActorClassConfig= ruleActorClassConfig EOF )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:463:2: iv_ruleActorClassConfig= ruleActorClassConfig EOF
+            // InternalConfig.g:462:2: (iv_ruleActorClassConfig= ruleActorClassConfig EOF )
+            // InternalConfig.g:463:2: iv_ruleActorClassConfig= ruleActorClassConfig EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getActorClassConfigRule()); 
-            }
-            pushFollow(FOLLOW_ruleActorClassConfig_in_entryRuleActorClassConfig1008);
+             newCompositeNode(grammarAccess.getActorClassConfigRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleActorClassConfig=ruleActorClassConfig();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleActorClassConfig; 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleActorClassConfig1018); if (state.failed) return current;
+
+             current =iv_ruleActorClassConfig; 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1251,7 +1140,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleActorClassConfig"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:470:1: ruleActorClassConfig returns [EObject current=null] : (otherlv_0= 'ActorClassConfig' ( ( ruleFQN ) ) otherlv_2= '{' ( (lv_attributes_3_0= ruleAttrClassConfig ) )* otherlv_4= '}' ) ;
+    // InternalConfig.g:470:1: ruleActorClassConfig returns [EObject current=null] : (otherlv_0= 'ActorClassConfig' ( ( ruleFQN ) ) otherlv_2= '{' ( (lv_attributes_3_0= ruleAttrClassConfig ) )* otherlv_4= '}' ) ;
     public final EObject ruleActorClassConfig() throws RecognitionException {
         EObject current = null;
 
@@ -1264,59 +1153,49 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:473:28: ( (otherlv_0= 'ActorClassConfig' ( ( ruleFQN ) ) otherlv_2= '{' ( (lv_attributes_3_0= ruleAttrClassConfig ) )* otherlv_4= '}' ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:474:1: (otherlv_0= 'ActorClassConfig' ( ( ruleFQN ) ) otherlv_2= '{' ( (lv_attributes_3_0= ruleAttrClassConfig ) )* otherlv_4= '}' )
+            // InternalConfig.g:473:28: ( (otherlv_0= 'ActorClassConfig' ( ( ruleFQN ) ) otherlv_2= '{' ( (lv_attributes_3_0= ruleAttrClassConfig ) )* otherlv_4= '}' ) )
+            // InternalConfig.g:474:1: (otherlv_0= 'ActorClassConfig' ( ( ruleFQN ) ) otherlv_2= '{' ( (lv_attributes_3_0= ruleAttrClassConfig ) )* otherlv_4= '}' )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:474:1: (otherlv_0= 'ActorClassConfig' ( ( ruleFQN ) ) otherlv_2= '{' ( (lv_attributes_3_0= ruleAttrClassConfig ) )* otherlv_4= '}' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:474:3: otherlv_0= 'ActorClassConfig' ( ( ruleFQN ) ) otherlv_2= '{' ( (lv_attributes_3_0= ruleAttrClassConfig ) )* otherlv_4= '}'
+            // InternalConfig.g:474:1: (otherlv_0= 'ActorClassConfig' ( ( ruleFQN ) ) otherlv_2= '{' ( (lv_attributes_3_0= ruleAttrClassConfig ) )* otherlv_4= '}' )
+            // InternalConfig.g:474:3: otherlv_0= 'ActorClassConfig' ( ( ruleFQN ) ) otherlv_2= '{' ( (lv_attributes_3_0= ruleAttrClassConfig ) )* otherlv_4= '}'
             {
-            otherlv_0=(Token)match(input,22,FOLLOW_22_in_ruleActorClassConfig1055); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_0=(Token)match(input,22,FOLLOW_3); 
 
-                  	newLeafNode(otherlv_0, grammarAccess.getActorClassConfigAccess().getActorClassConfigKeyword_0());
-                  
-            }
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:478:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:479:1: ( ruleFQN )
+                	newLeafNode(otherlv_0, grammarAccess.getActorClassConfigAccess().getActorClassConfigKeyword_0());
+                
+            // InternalConfig.g:478:1: ( ( ruleFQN ) )
+            // InternalConfig.g:479:1: ( ruleFQN )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:479:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:480:3: ruleFQN
+            // InternalConfig.g:479:1: ( ruleFQN )
+            // InternalConfig.g:480:3: ruleFQN
             {
-            if ( state.backtracking==0 ) {
 
-              			if (current==null) {
-              	            current = createModelElement(grammarAccess.getActorClassConfigRule());
-              	        }
-                      
-            }
-            if ( state.backtracking==0 ) {
-               
-              	        newCompositeNode(grammarAccess.getActorClassConfigAccess().getActorActorClassCrossReference_1_0()); 
-              	    
-            }
-            pushFollow(FOLLOW_ruleFQN_in_ruleActorClassConfig1078);
+            			if (current==null) {
+            	            current = createModelElement(grammarAccess.getActorClassConfigRule());
+            	        }
+                    
+             
+            	        newCompositeNode(grammarAccess.getActorClassConfigAccess().getActorActorClassCrossReference_1_0()); 
+            	    
+            pushFollow(FOLLOW_4);
             ruleFQN();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               
-              	        afterParserOrEnumRuleCall();
-              	    
-            }
+
+             
+            	        afterParserOrEnumRuleCall();
+            	    
 
             }
 
 
             }
 
-            otherlv_2=(Token)match(input,13,FOLLOW_13_in_ruleActorClassConfig1090); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_2=(Token)match(input,13,FOLLOW_15); 
 
-                  	newLeafNode(otherlv_2, grammarAccess.getActorClassConfigAccess().getLeftCurlyBracketKeyword_2());
-                  
-            }
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:497:1: ( (lv_attributes_3_0= ruleAttrClassConfig ) )*
+                	newLeafNode(otherlv_2, grammarAccess.getActorClassConfigAccess().getLeftCurlyBracketKeyword_2());
+                
+            // InternalConfig.g:497:1: ( (lv_attributes_3_0= ruleAttrClassConfig ) )*
             loop6:
             do {
                 int alt6=2;
@@ -1329,34 +1208,30 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
                 switch (alt6) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:498:1: (lv_attributes_3_0= ruleAttrClassConfig )
+            	    // InternalConfig.g:498:1: (lv_attributes_3_0= ruleAttrClassConfig )
             	    {
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:498:1: (lv_attributes_3_0= ruleAttrClassConfig )
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:499:3: lv_attributes_3_0= ruleAttrClassConfig
+            	    // InternalConfig.g:498:1: (lv_attributes_3_0= ruleAttrClassConfig )
+            	    // InternalConfig.g:499:3: lv_attributes_3_0= ruleAttrClassConfig
             	    {
-            	    if ( state.backtracking==0 ) {
-            	       
-            	      	        newCompositeNode(grammarAccess.getActorClassConfigAccess().getAttributesAttrClassConfigParserRuleCall_3_0()); 
-            	      	    
-            	    }
-            	    pushFollow(FOLLOW_ruleAttrClassConfig_in_ruleActorClassConfig1111);
+            	     
+            	    	        newCompositeNode(grammarAccess.getActorClassConfigAccess().getAttributesAttrClassConfigParserRuleCall_3_0()); 
+            	    	    
+            	    pushFollow(FOLLOW_15);
             	    lv_attributes_3_0=ruleAttrClassConfig();
 
             	    state._fsp--;
-            	    if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
-
-            	      	        if (current==null) {
-            	      	            current = createModelElementForParent(grammarAccess.getActorClassConfigRule());
-            	      	        }
-            	             		add(
-            	             			current, 
-            	             			"attributes",
-            	              		lv_attributes_3_0, 
-            	              		"AttrClassConfig");
-            	      	        afterParserOrEnumRuleCall();
-            	      	    
-            	    }
+
+
+            	    	        if (current==null) {
+            	    	            current = createModelElementForParent(grammarAccess.getActorClassConfigRule());
+            	    	        }
+            	           		add(
+            	           			current, 
+            	           			"attributes",
+            	            		lv_attributes_3_0, 
+            	            		"org.eclipse.etrice.core.Config.AttrClassConfig");
+            	    	        afterParserOrEnumRuleCall();
+            	    	    
 
             	    }
 
@@ -1369,21 +1244,17 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                 }
             } while (true);
 
-            otherlv_4=(Token)match(input,14,FOLLOW_14_in_ruleActorClassConfig1124); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_4=(Token)match(input,14,FOLLOW_2); 
 
-                  	newLeafNode(otherlv_4, grammarAccess.getActorClassConfigAccess().getRightCurlyBracketKeyword_4());
-                  
-            }
+                	newLeafNode(otherlv_4, grammarAccess.getActorClassConfigAccess().getRightCurlyBracketKeyword_4());
+                
 
             }
 
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -1398,7 +1269,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleActorInstanceConfig"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:527:1: entryRuleActorInstanceConfig returns [EObject current=null] : iv_ruleActorInstanceConfig= ruleActorInstanceConfig EOF ;
+    // InternalConfig.g:527:1: entryRuleActorInstanceConfig returns [EObject current=null] : iv_ruleActorInstanceConfig= ruleActorInstanceConfig EOF ;
     public final EObject entryRuleActorInstanceConfig() throws RecognitionException {
         EObject current = null;
 
@@ -1406,21 +1277,17 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:528:2: (iv_ruleActorInstanceConfig= ruleActorInstanceConfig EOF )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:529:2: iv_ruleActorInstanceConfig= ruleActorInstanceConfig EOF
+            // InternalConfig.g:528:2: (iv_ruleActorInstanceConfig= ruleActorInstanceConfig EOF )
+            // InternalConfig.g:529:2: iv_ruleActorInstanceConfig= ruleActorInstanceConfig EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getActorInstanceConfigRule()); 
-            }
-            pushFollow(FOLLOW_ruleActorInstanceConfig_in_entryRuleActorInstanceConfig1160);
+             newCompositeNode(grammarAccess.getActorInstanceConfigRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleActorInstanceConfig=ruleActorInstanceConfig();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleActorInstanceConfig; 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleActorInstanceConfig1170); if (state.failed) return current;
+
+             current =iv_ruleActorInstanceConfig; 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1438,7 +1305,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleActorInstanceConfig"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:536:1: ruleActorInstanceConfig returns [EObject current=null] : (otherlv_0= 'ActorInstanceConfig' ( ( ruleFQN ) ) otherlv_2= '/' ( (otherlv_3= RULE_ID ) ) otherlv_4= '/' ( (lv_path_5_0= ruleRefPath ) ) otherlv_6= '{' ( ( ( ( ({...}? => ( ({...}? => ( (lv_attributes_8_0= ruleAttrInstanceConfig ) ) )+ ) ) | ({...}? => ( ({...}? => ( (lv_ports_9_0= rulePortInstanceConfig ) ) )+ ) ) )* ) ) ) otherlv_10= '}' ) ;
+    // InternalConfig.g:536:1: ruleActorInstanceConfig returns [EObject current=null] : (otherlv_0= 'ActorInstanceConfig' ( ( ruleFQN ) ) otherlv_2= '/' ( (otherlv_3= RULE_ID ) ) otherlv_4= '/' ( (lv_path_5_0= ruleRefPath ) ) otherlv_6= '{' ( ( ( ( ({...}? => ( ({...}? => ( (lv_attributes_8_0= ruleAttrInstanceConfig ) ) )+ ) ) | ({...}? => ( ({...}? => ( (lv_ports_9_0= rulePortInstanceConfig ) ) )+ ) ) )* ) ) ) otherlv_10= '}' ) ;
     public final EObject ruleActorInstanceConfig() throws RecognitionException {
         EObject current = null;
 
@@ -1458,170 +1325,151 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:539:28: ( (otherlv_0= 'ActorInstanceConfig' ( ( ruleFQN ) ) otherlv_2= '/' ( (otherlv_3= RULE_ID ) ) otherlv_4= '/' ( (lv_path_5_0= ruleRefPath ) ) otherlv_6= '{' ( ( ( ( ({...}? => ( ({...}? => ( (lv_attributes_8_0= ruleAttrInstanceConfig ) ) )+ ) ) | ({...}? => ( ({...}? => ( (lv_ports_9_0= rulePortInstanceConfig ) ) )+ ) ) )* ) ) ) otherlv_10= '}' ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:540:1: (otherlv_0= 'ActorInstanceConfig' ( ( ruleFQN ) ) otherlv_2= '/' ( (otherlv_3= RULE_ID ) ) otherlv_4= '/' ( (lv_path_5_0= ruleRefPath ) ) otherlv_6= '{' ( ( ( ( ({...}? => ( ({...}? => ( (lv_attributes_8_0= ruleAttrInstanceConfig ) ) )+ ) ) | ({...}? => ( ({...}? => ( (lv_ports_9_0= rulePortInstanceConfig ) ) )+ ) ) )* ) ) ) otherlv_10= '}' )
+            // InternalConfig.g:539:28: ( (otherlv_0= 'ActorInstanceConfig' ( ( ruleFQN ) ) otherlv_2= '/' ( (otherlv_3= RULE_ID ) ) otherlv_4= '/' ( (lv_path_5_0= ruleRefPath ) ) otherlv_6= '{' ( ( ( ( ({...}? => ( ({...}? => ( (lv_attributes_8_0= ruleAttrInstanceConfig ) ) )+ ) ) | ({...}? => ( ({...}? => ( (lv_ports_9_0= rulePortInstanceConfig ) ) )+ ) ) )* ) ) ) otherlv_10= '}' ) )
+            // InternalConfig.g:540:1: (otherlv_0= 'ActorInstanceConfig' ( ( ruleFQN ) ) otherlv_2= '/' ( (otherlv_3= RULE_ID ) ) otherlv_4= '/' ( (lv_path_5_0= ruleRefPath ) ) otherlv_6= '{' ( ( ( ( ({...}? => ( ({...}? => ( (lv_attributes_8_0= ruleAttrInstanceConfig ) ) )+ ) ) | ({...}? => ( ({...}? => ( (lv_ports_9_0= rulePortInstanceConfig ) ) )+ ) ) )* ) ) ) otherlv_10= '}' )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:540:1: (otherlv_0= 'ActorInstanceConfig' ( ( ruleFQN ) ) otherlv_2= '/' ( (otherlv_3= RULE_ID ) ) otherlv_4= '/' ( (lv_path_5_0= ruleRefPath ) ) otherlv_6= '{' ( ( ( ( ({...}? => ( ({...}? => ( (lv_attributes_8_0= ruleAttrInstanceConfig ) ) )+ ) ) | ({...}? => ( ({...}? => ( (lv_ports_9_0= rulePortInstanceConfig ) ) )+ ) ) )* ) ) ) otherlv_10= '}' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:540:3: otherlv_0= 'ActorInstanceConfig' ( ( ruleFQN ) ) otherlv_2= '/' ( (otherlv_3= RULE_ID ) ) otherlv_4= '/' ( (lv_path_5_0= ruleRefPath ) ) otherlv_6= '{' ( ( ( ( ({...}? => ( ({...}? => ( (lv_attributes_8_0= ruleAttrInstanceConfig ) ) )+ ) ) | ({...}? => ( ({...}? => ( (lv_ports_9_0= rulePortInstanceConfig ) ) )+ ) ) )* ) ) ) otherlv_10= '}'
+            // InternalConfig.g:540:1: (otherlv_0= 'ActorInstanceConfig' ( ( ruleFQN ) ) otherlv_2= '/' ( (otherlv_3= RULE_ID ) ) otherlv_4= '/' ( (lv_path_5_0= ruleRefPath ) ) otherlv_6= '{' ( ( ( ( ({...}? => ( ({...}? => ( (lv_attributes_8_0= ruleAttrInstanceConfig ) ) )+ ) ) | ({...}? => ( ({...}? => ( (lv_ports_9_0= rulePortInstanceConfig ) ) )+ ) ) )* ) ) ) otherlv_10= '}' )
+            // InternalConfig.g:540:3: otherlv_0= 'ActorInstanceConfig' ( ( ruleFQN ) ) otherlv_2= '/' ( (otherlv_3= RULE_ID ) ) otherlv_4= '/' ( (lv_path_5_0= ruleRefPath ) ) otherlv_6= '{' ( ( ( ( ({...}? => ( ({...}? => ( (lv_attributes_8_0= ruleAttrInstanceConfig ) ) )+ ) ) | ({...}? => ( ({...}? => ( (lv_ports_9_0= rulePortInstanceConfig ) ) )+ ) ) )* ) ) ) otherlv_10= '}'
             {
-            otherlv_0=(Token)match(input,23,FOLLOW_23_in_ruleActorInstanceConfig1207); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_0=(Token)match(input,23,FOLLOW_3); 
 
-                  	newLeafNode(otherlv_0, grammarAccess.getActorInstanceConfigAccess().getActorInstanceConfigKeyword_0());
-                  
-            }
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:544:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:545:1: ( ruleFQN )
+                	newLeafNode(otherlv_0, grammarAccess.getActorInstanceConfigAccess().getActorInstanceConfigKeyword_0());
+                
+            // InternalConfig.g:544:1: ( ( ruleFQN ) )
+            // InternalConfig.g:545:1: ( ruleFQN )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:545:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:546:3: ruleFQN
+            // InternalConfig.g:545:1: ( ruleFQN )
+            // InternalConfig.g:546:3: ruleFQN
             {
-            if ( state.backtracking==0 ) {
 
-              			if (current==null) {
-              	            current = createModelElement(grammarAccess.getActorInstanceConfigRule());
-              	        }
-                      
-            }
-            if ( state.backtracking==0 ) {
-               
-              	        newCompositeNode(grammarAccess.getActorInstanceConfigAccess().getRootLogicalSystemCrossReference_1_0()); 
-              	    
-            }
-            pushFollow(FOLLOW_ruleFQN_in_ruleActorInstanceConfig1230);
+            			if (current==null) {
+            	            current = createModelElement(grammarAccess.getActorInstanceConfigRule());
+            	        }
+                    
+             
+            	        newCompositeNode(grammarAccess.getActorInstanceConfigAccess().getRootLogicalSystemCrossReference_1_0()); 
+            	    
+            pushFollow(FOLLOW_7);
             ruleFQN();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               
-              	        afterParserOrEnumRuleCall();
-              	    
-            }
+
+             
+            	        afterParserOrEnumRuleCall();
+            	    
 
             }
 
 
             }
 
-            otherlv_2=(Token)match(input,16,FOLLOW_16_in_ruleActorInstanceConfig1242); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_2=(Token)match(input,16,FOLLOW_3); 
 
-                  	newLeafNode(otherlv_2, grammarAccess.getActorInstanceConfigAccess().getSolidusKeyword_2());
-                  
-            }
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:563:1: ( (otherlv_3= RULE_ID ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:564:1: (otherlv_3= RULE_ID )
+                	newLeafNode(otherlv_2, grammarAccess.getActorInstanceConfigAccess().getSolidusKeyword_2());
+                
+            // InternalConfig.g:563:1: ( (otherlv_3= RULE_ID ) )
+            // InternalConfig.g:564:1: (otherlv_3= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:564:1: (otherlv_3= RULE_ID )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:565:3: otherlv_3= RULE_ID
+            // InternalConfig.g:564:1: (otherlv_3= RULE_ID )
+            // InternalConfig.g:565:3: otherlv_3= RULE_ID
             {
-            if ( state.backtracking==0 ) {
 
-              			if (current==null) {
-              	            current = createModelElement(grammarAccess.getActorInstanceConfigRule());
-              	        }
-                      
-            }
-            otherlv_3=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleActorInstanceConfig1262); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            			if (current==null) {
+            	            current = createModelElement(grammarAccess.getActorInstanceConfigRule());
+            	        }
+                    
+            otherlv_3=(Token)match(input,RULE_ID,FOLLOW_7); 
 
-              		newLeafNode(otherlv_3, grammarAccess.getActorInstanceConfigAccess().getSubSystemSubSystemRefCrossReference_3_0()); 
-              	
-            }
+            		newLeafNode(otherlv_3, grammarAccess.getActorInstanceConfigAccess().getSubSystemSubSystemRefCrossReference_3_0()); 
+            	
 
             }
 
 
             }
 
-            otherlv_4=(Token)match(input,16,FOLLOW_16_in_ruleActorInstanceConfig1274); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_4=(Token)match(input,16,FOLLOW_3); 
 
-                  	newLeafNode(otherlv_4, grammarAccess.getActorInstanceConfigAccess().getSolidusKeyword_4());
-                  
-            }
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:580:1: ( (lv_path_5_0= ruleRefPath ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:581:1: (lv_path_5_0= ruleRefPath )
+                	newLeafNode(otherlv_4, grammarAccess.getActorInstanceConfigAccess().getSolidusKeyword_4());
+                
+            // InternalConfig.g:580:1: ( (lv_path_5_0= ruleRefPath ) )
+            // InternalConfig.g:581:1: (lv_path_5_0= ruleRefPath )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:581:1: (lv_path_5_0= ruleRefPath )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:582:3: lv_path_5_0= ruleRefPath
+            // InternalConfig.g:581:1: (lv_path_5_0= ruleRefPath )
+            // InternalConfig.g:582:3: lv_path_5_0= ruleRefPath
             {
-            if ( state.backtracking==0 ) {
-               
-              	        newCompositeNode(grammarAccess.getActorInstanceConfigAccess().getPathRefPathParserRuleCall_5_0()); 
-              	    
-            }
-            pushFollow(FOLLOW_ruleRefPath_in_ruleActorInstanceConfig1295);
+             
+            	        newCompositeNode(grammarAccess.getActorInstanceConfigAccess().getPathRefPathParserRuleCall_5_0()); 
+            	    
+            pushFollow(FOLLOW_4);
             lv_path_5_0=ruleRefPath();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
 
-              	        if (current==null) {
-              	            current = createModelElementForParent(grammarAccess.getActorInstanceConfigRule());
-              	        }
-                     		set(
-                     			current, 
-                     			"path",
-                      		lv_path_5_0, 
-                      		"RefPath");
-              	        afterParserOrEnumRuleCall();
-              	    
-            }
+
+            	        if (current==null) {
+            	            current = createModelElementForParent(grammarAccess.getActorInstanceConfigRule());
+            	        }
+                   		set(
+                   			current, 
+                   			"path",
+                    		lv_path_5_0, 
+                    		"org.eclipse.etrice.core.Config.RefPath");
+            	        afterParserOrEnumRuleCall();
+            	    
 
             }
 
 
             }
 
-            otherlv_6=(Token)match(input,13,FOLLOW_13_in_ruleActorInstanceConfig1307); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_6=(Token)match(input,13,FOLLOW_16); 
 
-                  	newLeafNode(otherlv_6, grammarAccess.getActorInstanceConfigAccess().getLeftCurlyBracketKeyword_6());
-                  
-            }
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:602:1: ( ( ( ( ({...}? => ( ({...}? => ( (lv_attributes_8_0= ruleAttrInstanceConfig ) ) )+ ) ) | ({...}? => ( ({...}? => ( (lv_ports_9_0= rulePortInstanceConfig ) ) )+ ) ) )* ) ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:604:1: ( ( ( ({...}? => ( ({...}? => ( (lv_attributes_8_0= ruleAttrInstanceConfig ) ) )+ ) ) | ({...}? => ( ({...}? => ( (lv_ports_9_0= rulePortInstanceConfig ) ) )+ ) ) )* ) )
+                	newLeafNode(otherlv_6, grammarAccess.getActorInstanceConfigAccess().getLeftCurlyBracketKeyword_6());
+                
+            // InternalConfig.g:602:1: ( ( ( ( ({...}? => ( ({...}? => ( (lv_attributes_8_0= ruleAttrInstanceConfig ) ) )+ ) ) | ({...}? => ( ({...}? => ( (lv_ports_9_0= rulePortInstanceConfig ) ) )+ ) ) )* ) ) )
+            // InternalConfig.g:604:1: ( ( ( ({...}? => ( ({...}? => ( (lv_attributes_8_0= ruleAttrInstanceConfig ) ) )+ ) ) | ({...}? => ( ({...}? => ( (lv_ports_9_0= rulePortInstanceConfig ) ) )+ ) ) )* ) )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:604:1: ( ( ( ({...}? => ( ({...}? => ( (lv_attributes_8_0= ruleAttrInstanceConfig ) ) )+ ) ) | ({...}? => ( ({...}? => ( (lv_ports_9_0= rulePortInstanceConfig ) ) )+ ) ) )* ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:605:2: ( ( ({...}? => ( ({...}? => ( (lv_attributes_8_0= ruleAttrInstanceConfig ) ) )+ ) ) | ({...}? => ( ({...}? => ( (lv_ports_9_0= rulePortInstanceConfig ) ) )+ ) ) )* )
+            // InternalConfig.g:604:1: ( ( ( ({...}? => ( ({...}? => ( (lv_attributes_8_0= ruleAttrInstanceConfig ) ) )+ ) ) | ({...}? => ( ({...}? => ( (lv_ports_9_0= rulePortInstanceConfig ) ) )+ ) ) )* ) )
+            // InternalConfig.g:605:2: ( ( ({...}? => ( ({...}? => ( (lv_attributes_8_0= ruleAttrInstanceConfig ) ) )+ ) ) | ({...}? => ( ({...}? => ( (lv_ports_9_0= rulePortInstanceConfig ) ) )+ ) ) )* )
             {
-            getUnorderedGroupHelper().enter(grammarAccess.getActorInstanceConfigAccess().getUnorderedGroup_7());
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:608:2: ( ( ({...}? => ( ({...}? => ( (lv_attributes_8_0= ruleAttrInstanceConfig ) ) )+ ) ) | ({...}? => ( ({...}? => ( (lv_ports_9_0= rulePortInstanceConfig ) ) )+ ) ) )* )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:609:3: ( ({...}? => ( ({...}? => ( (lv_attributes_8_0= ruleAttrInstanceConfig ) ) )+ ) ) | ({...}? => ( ({...}? => ( (lv_ports_9_0= rulePortInstanceConfig ) ) )+ ) ) )*
+             
+            	  getUnorderedGroupHelper().enter(grammarAccess.getActorInstanceConfigAccess().getUnorderedGroup_7());
+            	
+            // InternalConfig.g:608:2: ( ( ({...}? => ( ({...}? => ( (lv_attributes_8_0= ruleAttrInstanceConfig ) ) )+ ) ) | ({...}? => ( ({...}? => ( (lv_ports_9_0= rulePortInstanceConfig ) ) )+ ) ) )* )
+            // InternalConfig.g:609:3: ( ({...}? => ( ({...}? => ( (lv_attributes_8_0= ruleAttrInstanceConfig ) ) )+ ) ) | ({...}? => ( ({...}? => ( (lv_ports_9_0= rulePortInstanceConfig ) ) )+ ) ) )*
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:609:3: ( ({...}? => ( ({...}? => ( (lv_attributes_8_0= ruleAttrInstanceConfig ) ) )+ ) ) | ({...}? => ( ({...}? => ( (lv_ports_9_0= rulePortInstanceConfig ) ) )+ ) ) )*
+            // InternalConfig.g:609:3: ( ({...}? => ( ({...}? => ( (lv_attributes_8_0= ruleAttrInstanceConfig ) ) )+ ) ) | ({...}? => ( ({...}? => ( (lv_ports_9_0= rulePortInstanceConfig ) ) )+ ) ) )*
             loop9:
             do {
                 int alt9=3;
                 int LA9_0 = input.LA(1);
 
-                if ( LA9_0 ==30 && getUnorderedGroupHelper().canSelect(grammarAccess.getActorInstanceConfigAccess().getUnorderedGroup_7(), 0) ) {
+                if ( LA9_0 == 30 && getUnorderedGroupHelper().canSelect(grammarAccess.getActorInstanceConfigAccess().getUnorderedGroup_7(), 0) ) {
                     alt9=1;
                 }
-                else if ( LA9_0 ==29 && getUnorderedGroupHelper().canSelect(grammarAccess.getActorInstanceConfigAccess().getUnorderedGroup_7(), 1) ) {
+                else if ( LA9_0 == 29 && getUnorderedGroupHelper().canSelect(grammarAccess.getActorInstanceConfigAccess().getUnorderedGroup_7(), 1) ) {
                     alt9=2;
                 }
 
 
                 switch (alt9) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:611:4: ({...}? => ( ({...}? => ( (lv_attributes_8_0= ruleAttrInstanceConfig ) ) )+ ) )
+            	    // InternalConfig.g:611:4: ({...}? => ( ({...}? => ( (lv_attributes_8_0= ruleAttrInstanceConfig ) ) )+ ) )
             	    {
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:611:4: ({...}? => ( ({...}? => ( (lv_attributes_8_0= ruleAttrInstanceConfig ) ) )+ ) )
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:612:5: {...}? => ( ({...}? => ( (lv_attributes_8_0= ruleAttrInstanceConfig ) ) )+ )
+            	    // InternalConfig.g:611:4: ({...}? => ( ({...}? => ( (lv_attributes_8_0= ruleAttrInstanceConfig ) ) )+ ) )
+            	    // InternalConfig.g:612:5: {...}? => ( ({...}? => ( (lv_attributes_8_0= ruleAttrInstanceConfig ) ) )+ )
             	    {
             	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getActorInstanceConfigAccess().getUnorderedGroup_7(), 0) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleActorInstanceConfig", "getUnorderedGroupHelper().canSelect(grammarAccess.getActorInstanceConfigAccess().getUnorderedGroup_7(), 0)");
             	    }
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:612:116: ( ({...}? => ( (lv_attributes_8_0= ruleAttrInstanceConfig ) ) )+ )
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:613:6: ({...}? => ( (lv_attributes_8_0= ruleAttrInstanceConfig ) ) )+
+            	    // InternalConfig.g:612:116: ( ({...}? => ( (lv_attributes_8_0= ruleAttrInstanceConfig ) ) )+ )
+            	    // InternalConfig.g:613:6: ({...}? => ( (lv_attributes_8_0= ruleAttrInstanceConfig ) ) )+
             	    {
-            	    getUnorderedGroupHelper().select(grammarAccess.getActorInstanceConfigAccess().getUnorderedGroup_7(), 0);
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:616:6: ({...}? => ( (lv_attributes_8_0= ruleAttrInstanceConfig ) ) )+
+            	     
+            	    	 				  getUnorderedGroupHelper().select(grammarAccess.getActorInstanceConfigAccess().getUnorderedGroup_7(), 0);
+            	    	 				
+            	    // InternalConfig.g:616:6: ({...}? => ( (lv_attributes_8_0= ruleAttrInstanceConfig ) ) )+
             	    int cnt7=0;
             	    loop7:
             	    do {
@@ -1641,41 +1489,36 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
             	        switch (alt7) {
             	    	case 1 :
-            	    	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:616:7: {...}? => ( (lv_attributes_8_0= ruleAttrInstanceConfig ) )
+            	    	    // InternalConfig.g:616:7: {...}? => ( (lv_attributes_8_0= ruleAttrInstanceConfig ) )
             	    	    {
             	    	    if ( !((true)) ) {
-            	    	        if (state.backtracking>0) {state.failed=true; return current;}
             	    	        throw new FailedPredicateException(input, "ruleActorInstanceConfig", "true");
             	    	    }
-            	    	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:616:16: ( (lv_attributes_8_0= ruleAttrInstanceConfig ) )
-            	    	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:617:1: (lv_attributes_8_0= ruleAttrInstanceConfig )
+            	    	    // InternalConfig.g:616:16: ( (lv_attributes_8_0= ruleAttrInstanceConfig ) )
+            	    	    // InternalConfig.g:617:1: (lv_attributes_8_0= ruleAttrInstanceConfig )
             	    	    {
-            	    	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:617:1: (lv_attributes_8_0= ruleAttrInstanceConfig )
-            	    	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:618:3: lv_attributes_8_0= ruleAttrInstanceConfig
+            	    	    // InternalConfig.g:617:1: (lv_attributes_8_0= ruleAttrInstanceConfig )
+            	    	    // InternalConfig.g:618:3: lv_attributes_8_0= ruleAttrInstanceConfig
             	    	    {
-            	    	    if ( state.backtracking==0 ) {
-            	    	       
-            	    	      	        newCompositeNode(grammarAccess.getActorInstanceConfigAccess().getAttributesAttrInstanceConfigParserRuleCall_7_0_0()); 
-            	    	      	    
-            	    	    }
-            	    	    pushFollow(FOLLOW_ruleAttrInstanceConfig_in_ruleActorInstanceConfig1373);
+            	    	     
+            	    	    	        newCompositeNode(grammarAccess.getActorInstanceConfigAccess().getAttributesAttrInstanceConfigParserRuleCall_7_0_0()); 
+            	    	    	    
+            	    	    pushFollow(FOLLOW_16);
             	    	    lv_attributes_8_0=ruleAttrInstanceConfig();
 
             	    	    state._fsp--;
-            	    	    if (state.failed) return current;
-            	    	    if ( state.backtracking==0 ) {
-
-            	    	      	        if (current==null) {
-            	    	      	            current = createModelElementForParent(grammarAccess.getActorInstanceConfigRule());
-            	    	      	        }
-            	    	             		add(
-            	    	             			current, 
-            	    	             			"attributes",
-            	    	              		lv_attributes_8_0, 
-            	    	              		"AttrInstanceConfig");
-            	    	      	        afterParserOrEnumRuleCall();
-            	    	      	    
-            	    	    }
+
+
+            	    	    	        if (current==null) {
+            	    	    	            current = createModelElementForParent(grammarAccess.getActorInstanceConfigRule());
+            	    	    	        }
+            	    	           		add(
+            	    	           			current, 
+            	    	           			"attributes",
+            	    	            		lv_attributes_8_0, 
+            	    	            		"org.eclipse.etrice.core.Config.AttrInstanceConfig");
+            	    	    	        afterParserOrEnumRuleCall();
+            	    	    	    
 
             	    	    }
 
@@ -1688,7 +1531,6 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
             	    	default :
             	    	    if ( cnt7 >= 1 ) break loop7;
-            	    	    if (state.backtracking>0) {state.failed=true; return current;}
             	                EarlyExitException eee =
             	                    new EarlyExitException(7, input);
             	                throw eee;
@@ -1696,7 +1538,9 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
             	        cnt7++;
             	    } while (true);
 
-            	    getUnorderedGroupHelper().returnFromSelection(grammarAccess.getActorInstanceConfigAccess().getUnorderedGroup_7());
+            	     
+            	    	 				  getUnorderedGroupHelper().returnFromSelection(grammarAccess.getActorInstanceConfigAccess().getUnorderedGroup_7());
+            	    	 				
 
             	    }
 
@@ -1707,20 +1551,21 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 2 :
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:641:4: ({...}? => ( ({...}? => ( (lv_ports_9_0= rulePortInstanceConfig ) ) )+ ) )
+            	    // InternalConfig.g:641:4: ({...}? => ( ({...}? => ( (lv_ports_9_0= rulePortInstanceConfig ) ) )+ ) )
             	    {
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:641:4: ({...}? => ( ({...}? => ( (lv_ports_9_0= rulePortInstanceConfig ) ) )+ ) )
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:642:5: {...}? => ( ({...}? => ( (lv_ports_9_0= rulePortInstanceConfig ) ) )+ )
+            	    // InternalConfig.g:641:4: ({...}? => ( ({...}? => ( (lv_ports_9_0= rulePortInstanceConfig ) ) )+ ) )
+            	    // InternalConfig.g:642:5: {...}? => ( ({...}? => ( (lv_ports_9_0= rulePortInstanceConfig ) ) )+ )
             	    {
             	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getActorInstanceConfigAccess().getUnorderedGroup_7(), 1) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleActorInstanceConfig", "getUnorderedGroupHelper().canSelect(grammarAccess.getActorInstanceConfigAccess().getUnorderedGroup_7(), 1)");
             	    }
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:642:116: ( ({...}? => ( (lv_ports_9_0= rulePortInstanceConfig ) ) )+ )
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:643:6: ({...}? => ( (lv_ports_9_0= rulePortInstanceConfig ) ) )+
+            	    // InternalConfig.g:642:116: ( ({...}? => ( (lv_ports_9_0= rulePortInstanceConfig ) ) )+ )
+            	    // InternalConfig.g:643:6: ({...}? => ( (lv_ports_9_0= rulePortInstanceConfig ) ) )+
             	    {
-            	    getUnorderedGroupHelper().select(grammarAccess.getActorInstanceConfigAccess().getUnorderedGroup_7(), 1);
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:646:6: ({...}? => ( (lv_ports_9_0= rulePortInstanceConfig ) ) )+
+            	     
+            	    	 				  getUnorderedGroupHelper().select(grammarAccess.getActorInstanceConfigAccess().getUnorderedGroup_7(), 1);
+            	    	 				
+            	    // InternalConfig.g:646:6: ({...}? => ( (lv_ports_9_0= rulePortInstanceConfig ) ) )+
             	    int cnt8=0;
             	    loop8:
             	    do {
@@ -1740,41 +1585,36 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
             	        switch (alt8) {
             	    	case 1 :
-            	    	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:646:7: {...}? => ( (lv_ports_9_0= rulePortInstanceConfig ) )
+            	    	    // InternalConfig.g:646:7: {...}? => ( (lv_ports_9_0= rulePortInstanceConfig ) )
             	    	    {
             	    	    if ( !((true)) ) {
-            	    	        if (state.backtracking>0) {state.failed=true; return current;}
             	    	        throw new FailedPredicateException(input, "ruleActorInstanceConfig", "true");
             	    	    }
-            	    	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:646:16: ( (lv_ports_9_0= rulePortInstanceConfig ) )
-            	    	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:647:1: (lv_ports_9_0= rulePortInstanceConfig )
+            	    	    // InternalConfig.g:646:16: ( (lv_ports_9_0= rulePortInstanceConfig ) )
+            	    	    // InternalConfig.g:647:1: (lv_ports_9_0= rulePortInstanceConfig )
             	    	    {
-            	    	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:647:1: (lv_ports_9_0= rulePortInstanceConfig )
-            	    	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:648:3: lv_ports_9_0= rulePortInstanceConfig
+            	    	    // InternalConfig.g:647:1: (lv_ports_9_0= rulePortInstanceConfig )
+            	    	    // InternalConfig.g:648:3: lv_ports_9_0= rulePortInstanceConfig
             	    	    {
-            	    	    if ( state.backtracking==0 ) {
-            	    	       
-            	    	      	        newCompositeNode(grammarAccess.getActorInstanceConfigAccess().getPortsPortInstanceConfigParserRuleCall_7_1_0()); 
-            	    	      	    
-            	    	    }
-            	    	    pushFollow(FOLLOW_rulePortInstanceConfig_in_ruleActorInstanceConfig1449);
+            	    	     
+            	    	    	        newCompositeNode(grammarAccess.getActorInstanceConfigAccess().getPortsPortInstanceConfigParserRuleCall_7_1_0()); 
+            	    	    	    
+            	    	    pushFollow(FOLLOW_16);
             	    	    lv_ports_9_0=rulePortInstanceConfig();
 
             	    	    state._fsp--;
-            	    	    if (state.failed) return current;
-            	    	    if ( state.backtracking==0 ) {
-
-            	    	      	        if (current==null) {
-            	    	      	            current = createModelElementForParent(grammarAccess.getActorInstanceConfigRule());
-            	    	      	        }
-            	    	             		add(
-            	    	             			current, 
-            	    	             			"ports",
-            	    	              		lv_ports_9_0, 
-            	    	              		"PortInstanceConfig");
-            	    	      	        afterParserOrEnumRuleCall();
-            	    	      	    
-            	    	    }
+
+
+            	    	    	        if (current==null) {
+            	    	    	            current = createModelElementForParent(grammarAccess.getActorInstanceConfigRule());
+            	    	    	        }
+            	    	           		add(
+            	    	           			current, 
+            	    	           			"ports",
+            	    	            		lv_ports_9_0, 
+            	    	            		"org.eclipse.etrice.core.Config.PortInstanceConfig");
+            	    	    	        afterParserOrEnumRuleCall();
+            	    	    	    
 
             	    	    }
 
@@ -1787,7 +1627,6 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
             	    	default :
             	    	    if ( cnt8 >= 1 ) break loop8;
-            	    	    if (state.backtracking>0) {state.failed=true; return current;}
             	                EarlyExitException eee =
             	                    new EarlyExitException(8, input);
             	                throw eee;
@@ -1795,7 +1634,9 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
             	        cnt8++;
             	    } while (true);
 
-            	    getUnorderedGroupHelper().returnFromSelection(grammarAccess.getActorInstanceConfigAccess().getUnorderedGroup_7());
+            	     
+            	    	 				  getUnorderedGroupHelper().returnFromSelection(grammarAccess.getActorInstanceConfigAccess().getUnorderedGroup_7());
+            	    	 				
 
             	    }
 
@@ -1817,25 +1658,23 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
             }
 
-            getUnorderedGroupHelper().leave(grammarAccess.getActorInstanceConfigAccess().getUnorderedGroup_7());
+             
+            	  getUnorderedGroupHelper().leave(grammarAccess.getActorInstanceConfigAccess().getUnorderedGroup_7());
+            	
 
             }
 
-            otherlv_10=(Token)match(input,14,FOLLOW_14_in_ruleActorInstanceConfig1502); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_10=(Token)match(input,14,FOLLOW_2); 
 
-                  	newLeafNode(otherlv_10, grammarAccess.getActorInstanceConfigAccess().getRightCurlyBracketKeyword_8());
-                  
-            }
+                	newLeafNode(otherlv_10, grammarAccess.getActorInstanceConfigAccess().getRightCurlyBracketKeyword_8());
+                
 
             }
 
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -1850,7 +1689,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleProtocolClassConfig"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:690:1: entryRuleProtocolClassConfig returns [EObject current=null] : iv_ruleProtocolClassConfig= ruleProtocolClassConfig EOF ;
+    // InternalConfig.g:690:1: entryRuleProtocolClassConfig returns [EObject current=null] : iv_ruleProtocolClassConfig= ruleProtocolClassConfig EOF ;
     public final EObject entryRuleProtocolClassConfig() throws RecognitionException {
         EObject current = null;
 
@@ -1858,21 +1697,17 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:691:2: (iv_ruleProtocolClassConfig= ruleProtocolClassConfig EOF )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:692:2: iv_ruleProtocolClassConfig= ruleProtocolClassConfig EOF
+            // InternalConfig.g:691:2: (iv_ruleProtocolClassConfig= ruleProtocolClassConfig EOF )
+            // InternalConfig.g:692:2: iv_ruleProtocolClassConfig= ruleProtocolClassConfig EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getProtocolClassConfigRule()); 
-            }
-            pushFollow(FOLLOW_ruleProtocolClassConfig_in_entryRuleProtocolClassConfig1538);
+             newCompositeNode(grammarAccess.getProtocolClassConfigRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleProtocolClassConfig=ruleProtocolClassConfig();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleProtocolClassConfig; 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleProtocolClassConfig1548); if (state.failed) return current;
+
+             current =iv_ruleProtocolClassConfig; 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1890,7 +1725,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleProtocolClassConfig"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:699:1: ruleProtocolClassConfig returns [EObject current=null] : (otherlv_0= 'ProtocolClassConfig' ( ( ruleFQN ) ) otherlv_2= '{' ( ( ( ( ({...}? => ( ({...}? => (otherlv_4= 'regular' ( (lv_regular_5_0= rulePortClassConfig ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (otherlv_6= 'conjugate' | otherlv_7= 'conjugated' ) ( (lv_conjugated_8_0= rulePortClassConfig ) ) ) ) ) ) )* ) ) ) otherlv_9= '}' ) ;
+    // InternalConfig.g:699:1: ruleProtocolClassConfig returns [EObject current=null] : (otherlv_0= 'ProtocolClassConfig' ( ( ruleFQN ) ) otherlv_2= '{' ( ( ( ( ({...}? => ( ({...}? => (otherlv_4= 'regular' ( (lv_regular_5_0= rulePortClassConfig ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (otherlv_6= 'conjugate' | otherlv_7= 'conjugated' ) ( (lv_conjugated_8_0= rulePortClassConfig ) ) ) ) ) ) )* ) ) ) otherlv_9= '}' ) ;
     public final EObject ruleProtocolClassConfig() throws RecognitionException {
         EObject current = null;
 
@@ -1908,142 +1743,128 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:702:28: ( (otherlv_0= 'ProtocolClassConfig' ( ( ruleFQN ) ) otherlv_2= '{' ( ( ( ( ({...}? => ( ({...}? => (otherlv_4= 'regular' ( (lv_regular_5_0= rulePortClassConfig ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (otherlv_6= 'conjugate' | otherlv_7= 'conjugated' ) ( (lv_conjugated_8_0= rulePortClassConfig ) ) ) ) ) ) )* ) ) ) otherlv_9= '}' ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:703:1: (otherlv_0= 'ProtocolClassConfig' ( ( ruleFQN ) ) otherlv_2= '{' ( ( ( ( ({...}? => ( ({...}? => (otherlv_4= 'regular' ( (lv_regular_5_0= rulePortClassConfig ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (otherlv_6= 'conjugate' | otherlv_7= 'conjugated' ) ( (lv_conjugated_8_0= rulePortClassConfig ) ) ) ) ) ) )* ) ) ) otherlv_9= '}' )
+            // InternalConfig.g:702:28: ( (otherlv_0= 'ProtocolClassConfig' ( ( ruleFQN ) ) otherlv_2= '{' ( ( ( ( ({...}? => ( ({...}? => (otherlv_4= 'regular' ( (lv_regular_5_0= rulePortClassConfig ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (otherlv_6= 'conjugate' | otherlv_7= 'conjugated' ) ( (lv_conjugated_8_0= rulePortClassConfig ) ) ) ) ) ) )* ) ) ) otherlv_9= '}' ) )
+            // InternalConfig.g:703:1: (otherlv_0= 'ProtocolClassConfig' ( ( ruleFQN ) ) otherlv_2= '{' ( ( ( ( ({...}? => ( ({...}? => (otherlv_4= 'regular' ( (lv_regular_5_0= rulePortClassConfig ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (otherlv_6= 'conjugate' | otherlv_7= 'conjugated' ) ( (lv_conjugated_8_0= rulePortClassConfig ) ) ) ) ) ) )* ) ) ) otherlv_9= '}' )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:703:1: (otherlv_0= 'ProtocolClassConfig' ( ( ruleFQN ) ) otherlv_2= '{' ( ( ( ( ({...}? => ( ({...}? => (otherlv_4= 'regular' ( (lv_regular_5_0= rulePortClassConfig ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (otherlv_6= 'conjugate' | otherlv_7= 'conjugated' ) ( (lv_conjugated_8_0= rulePortClassConfig ) ) ) ) ) ) )* ) ) ) otherlv_9= '}' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:703:3: otherlv_0= 'ProtocolClassConfig' ( ( ruleFQN ) ) otherlv_2= '{' ( ( ( ( ({...}? => ( ({...}? => (otherlv_4= 'regular' ( (lv_regular_5_0= rulePortClassConfig ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (otherlv_6= 'conjugate' | otherlv_7= 'conjugated' ) ( (lv_conjugated_8_0= rulePortClassConfig ) ) ) ) ) ) )* ) ) ) otherlv_9= '}'
+            // InternalConfig.g:703:1: (otherlv_0= 'ProtocolClassConfig' ( ( ruleFQN ) ) otherlv_2= '{' ( ( ( ( ({...}? => ( ({...}? => (otherlv_4= 'regular' ( (lv_regular_5_0= rulePortClassConfig ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (otherlv_6= 'conjugate' | otherlv_7= 'conjugated' ) ( (lv_conjugated_8_0= rulePortClassConfig ) ) ) ) ) ) )* ) ) ) otherlv_9= '}' )
+            // InternalConfig.g:703:3: otherlv_0= 'ProtocolClassConfig' ( ( ruleFQN ) ) otherlv_2= '{' ( ( ( ( ({...}? => ( ({...}? => (otherlv_4= 'regular' ( (lv_regular_5_0= rulePortClassConfig ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (otherlv_6= 'conjugate' | otherlv_7= 'conjugated' ) ( (lv_conjugated_8_0= rulePortClassConfig ) ) ) ) ) ) )* ) ) ) otherlv_9= '}'
             {
-            otherlv_0=(Token)match(input,24,FOLLOW_24_in_ruleProtocolClassConfig1585); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_0=(Token)match(input,24,FOLLOW_3); 
 
-                  	newLeafNode(otherlv_0, grammarAccess.getProtocolClassConfigAccess().getProtocolClassConfigKeyword_0());
-                  
-            }
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:707:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:708:1: ( ruleFQN )
+                	newLeafNode(otherlv_0, grammarAccess.getProtocolClassConfigAccess().getProtocolClassConfigKeyword_0());
+                
+            // InternalConfig.g:707:1: ( ( ruleFQN ) )
+            // InternalConfig.g:708:1: ( ruleFQN )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:708:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:709:3: ruleFQN
+            // InternalConfig.g:708:1: ( ruleFQN )
+            // InternalConfig.g:709:3: ruleFQN
             {
-            if ( state.backtracking==0 ) {
 
-              			if (current==null) {
-              	            current = createModelElement(grammarAccess.getProtocolClassConfigRule());
-              	        }
-                      
-            }
-            if ( state.backtracking==0 ) {
-               
-              	        newCompositeNode(grammarAccess.getProtocolClassConfigAccess().getProtocolProtocolClassCrossReference_1_0()); 
-              	    
-            }
-            pushFollow(FOLLOW_ruleFQN_in_ruleProtocolClassConfig1608);
+            			if (current==null) {
+            	            current = createModelElement(grammarAccess.getProtocolClassConfigRule());
+            	        }
+                    
+             
+            	        newCompositeNode(grammarAccess.getProtocolClassConfigAccess().getProtocolProtocolClassCrossReference_1_0()); 
+            	    
+            pushFollow(FOLLOW_4);
             ruleFQN();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               
-              	        afterParserOrEnumRuleCall();
-              	    
-            }
+
+             
+            	        afterParserOrEnumRuleCall();
+            	    
 
             }
 
 
             }
 
-            otherlv_2=(Token)match(input,13,FOLLOW_13_in_ruleProtocolClassConfig1620); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_2=(Token)match(input,13,FOLLOW_17); 
 
-                  	newLeafNode(otherlv_2, grammarAccess.getProtocolClassConfigAccess().getLeftCurlyBracketKeyword_2());
-                  
-            }
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:726:1: ( ( ( ( ({...}? => ( ({...}? => (otherlv_4= 'regular' ( (lv_regular_5_0= rulePortClassConfig ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (otherlv_6= 'conjugate' | otherlv_7= 'conjugated' ) ( (lv_conjugated_8_0= rulePortClassConfig ) ) ) ) ) ) )* ) ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:728:1: ( ( ( ({...}? => ( ({...}? => (otherlv_4= 'regular' ( (lv_regular_5_0= rulePortClassConfig ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (otherlv_6= 'conjugate' | otherlv_7= 'conjugated' ) ( (lv_conjugated_8_0= rulePortClassConfig ) ) ) ) ) ) )* ) )
+                	newLeafNode(otherlv_2, grammarAccess.getProtocolClassConfigAccess().getLeftCurlyBracketKeyword_2());
+                
+            // InternalConfig.g:726:1: ( ( ( ( ({...}? => ( ({...}? => (otherlv_4= 'regular' ( (lv_regular_5_0= rulePortClassConfig ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (otherlv_6= 'conjugate' | otherlv_7= 'conjugated' ) ( (lv_conjugated_8_0= rulePortClassConfig ) ) ) ) ) ) )* ) ) )
+            // InternalConfig.g:728:1: ( ( ( ({...}? => ( ({...}? => (otherlv_4= 'regular' ( (lv_regular_5_0= rulePortClassConfig ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (otherlv_6= 'conjugate' | otherlv_7= 'conjugated' ) ( (lv_conjugated_8_0= rulePortClassConfig ) ) ) ) ) ) )* ) )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:728:1: ( ( ( ({...}? => ( ({...}? => (otherlv_4= 'regular' ( (lv_regular_5_0= rulePortClassConfig ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (otherlv_6= 'conjugate' | otherlv_7= 'conjugated' ) ( (lv_conjugated_8_0= rulePortClassConfig ) ) ) ) ) ) )* ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:729:2: ( ( ({...}? => ( ({...}? => (otherlv_4= 'regular' ( (lv_regular_5_0= rulePortClassConfig ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (otherlv_6= 'conjugate' | otherlv_7= 'conjugated' ) ( (lv_conjugated_8_0= rulePortClassConfig ) ) ) ) ) ) )* )
+            // InternalConfig.g:728:1: ( ( ( ({...}? => ( ({...}? => (otherlv_4= 'regular' ( (lv_regular_5_0= rulePortClassConfig ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (otherlv_6= 'conjugate' | otherlv_7= 'conjugated' ) ( (lv_conjugated_8_0= rulePortClassConfig ) ) ) ) ) ) )* ) )
+            // InternalConfig.g:729:2: ( ( ({...}? => ( ({...}? => (otherlv_4= 'regular' ( (lv_regular_5_0= rulePortClassConfig ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (otherlv_6= 'conjugate' | otherlv_7= 'conjugated' ) ( (lv_conjugated_8_0= rulePortClassConfig ) ) ) ) ) ) )* )
             {
-            getUnorderedGroupHelper().enter(grammarAccess.getProtocolClassConfigAccess().getUnorderedGroup_3());
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:732:2: ( ( ({...}? => ( ({...}? => (otherlv_4= 'regular' ( (lv_regular_5_0= rulePortClassConfig ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (otherlv_6= 'conjugate' | otherlv_7= 'conjugated' ) ( (lv_conjugated_8_0= rulePortClassConfig ) ) ) ) ) ) )* )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:733:3: ( ({...}? => ( ({...}? => (otherlv_4= 'regular' ( (lv_regular_5_0= rulePortClassConfig ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (otherlv_6= 'conjugate' | otherlv_7= 'conjugated' ) ( (lv_conjugated_8_0= rulePortClassConfig ) ) ) ) ) ) )*
+             
+            	  getUnorderedGroupHelper().enter(grammarAccess.getProtocolClassConfigAccess().getUnorderedGroup_3());
+            	
+            // InternalConfig.g:732:2: ( ( ({...}? => ( ({...}? => (otherlv_4= 'regular' ( (lv_regular_5_0= rulePortClassConfig ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (otherlv_6= 'conjugate' | otherlv_7= 'conjugated' ) ( (lv_conjugated_8_0= rulePortClassConfig ) ) ) ) ) ) )* )
+            // InternalConfig.g:733:3: ( ({...}? => ( ({...}? => (otherlv_4= 'regular' ( (lv_regular_5_0= rulePortClassConfig ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (otherlv_6= 'conjugate' | otherlv_7= 'conjugated' ) ( (lv_conjugated_8_0= rulePortClassConfig ) ) ) ) ) ) )*
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:733:3: ( ({...}? => ( ({...}? => (otherlv_4= 'regular' ( (lv_regular_5_0= rulePortClassConfig ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (otherlv_6= 'conjugate' | otherlv_7= 'conjugated' ) ( (lv_conjugated_8_0= rulePortClassConfig ) ) ) ) ) ) )*
+            // InternalConfig.g:733:3: ( ({...}? => ( ({...}? => (otherlv_4= 'regular' ( (lv_regular_5_0= rulePortClassConfig ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (otherlv_6= 'conjugate' | otherlv_7= 'conjugated' ) ( (lv_conjugated_8_0= rulePortClassConfig ) ) ) ) ) ) )*
             loop11:
             do {
                 int alt11=3;
                 int LA11_0 = input.LA(1);
 
-                if ( LA11_0 ==25 && getUnorderedGroupHelper().canSelect(grammarAccess.getProtocolClassConfigAccess().getUnorderedGroup_3(), 0) ) {
+                if ( LA11_0 == 25 && getUnorderedGroupHelper().canSelect(grammarAccess.getProtocolClassConfigAccess().getUnorderedGroup_3(), 0) ) {
                     alt11=1;
                 }
-                else if ( LA11_0 >=26 && LA11_0<=27 && getUnorderedGroupHelper().canSelect(grammarAccess.getProtocolClassConfigAccess().getUnorderedGroup_3(), 1) ) {
+                else if ( LA11_0 >= 26 && LA11_0 <= 27 && getUnorderedGroupHelper().canSelect(grammarAccess.getProtocolClassConfigAccess().getUnorderedGroup_3(), 1) ) {
                     alt11=2;
                 }
 
 
                 switch (alt11) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:735:4: ({...}? => ( ({...}? => (otherlv_4= 'regular' ( (lv_regular_5_0= rulePortClassConfig ) ) ) ) ) )
+            	    // InternalConfig.g:735:4: ({...}? => ( ({...}? => (otherlv_4= 'regular' ( (lv_regular_5_0= rulePortClassConfig ) ) ) ) ) )
             	    {
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:735:4: ({...}? => ( ({...}? => (otherlv_4= 'regular' ( (lv_regular_5_0= rulePortClassConfig ) ) ) ) ) )
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:736:5: {...}? => ( ({...}? => (otherlv_4= 'regular' ( (lv_regular_5_0= rulePortClassConfig ) ) ) ) )
+            	    // InternalConfig.g:735:4: ({...}? => ( ({...}? => (otherlv_4= 'regular' ( (lv_regular_5_0= rulePortClassConfig ) ) ) ) ) )
+            	    // InternalConfig.g:736:5: {...}? => ( ({...}? => (otherlv_4= 'regular' ( (lv_regular_5_0= rulePortClassConfig ) ) ) ) )
             	    {
             	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getProtocolClassConfigAccess().getUnorderedGroup_3(), 0) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleProtocolClassConfig", "getUnorderedGroupHelper().canSelect(grammarAccess.getProtocolClassConfigAccess().getUnorderedGroup_3(), 0)");
             	    }
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:736:116: ( ({...}? => (otherlv_4= 'regular' ( (lv_regular_5_0= rulePortClassConfig ) ) ) ) )
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:737:6: ({...}? => (otherlv_4= 'regular' ( (lv_regular_5_0= rulePortClassConfig ) ) ) )
+            	    // InternalConfig.g:736:116: ( ({...}? => (otherlv_4= 'regular' ( (lv_regular_5_0= rulePortClassConfig ) ) ) ) )
+            	    // InternalConfig.g:737:6: ({...}? => (otherlv_4= 'regular' ( (lv_regular_5_0= rulePortClassConfig ) ) ) )
             	    {
-            	    getUnorderedGroupHelper().select(grammarAccess.getProtocolClassConfigAccess().getUnorderedGroup_3(), 0);
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:740:6: ({...}? => (otherlv_4= 'regular' ( (lv_regular_5_0= rulePortClassConfig ) ) ) )
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:740:7: {...}? => (otherlv_4= 'regular' ( (lv_regular_5_0= rulePortClassConfig ) ) )
+            	     
+            	    	 				  getUnorderedGroupHelper().select(grammarAccess.getProtocolClassConfigAccess().getUnorderedGroup_3(), 0);
+            	    	 				
+            	    // InternalConfig.g:740:6: ({...}? => (otherlv_4= 'regular' ( (lv_regular_5_0= rulePortClassConfig ) ) ) )
+            	    // InternalConfig.g:740:7: {...}? => (otherlv_4= 'regular' ( (lv_regular_5_0= rulePortClassConfig ) ) )
             	    {
             	    if ( !((true)) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleProtocolClassConfig", "true");
             	    }
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:740:16: (otherlv_4= 'regular' ( (lv_regular_5_0= rulePortClassConfig ) ) )
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:740:18: otherlv_4= 'regular' ( (lv_regular_5_0= rulePortClassConfig ) )
+            	    // InternalConfig.g:740:16: (otherlv_4= 'regular' ( (lv_regular_5_0= rulePortClassConfig ) ) )
+            	    // InternalConfig.g:740:18: otherlv_4= 'regular' ( (lv_regular_5_0= rulePortClassConfig ) )
             	    {
-            	    otherlv_4=(Token)match(input,25,FOLLOW_25_in_ruleProtocolClassConfig1678); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
+            	    otherlv_4=(Token)match(input,25,FOLLOW_18); 
 
-            	          	newLeafNode(otherlv_4, grammarAccess.getProtocolClassConfigAccess().getRegularKeyword_3_0_0());
-            	          
-            	    }
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:744:1: ( (lv_regular_5_0= rulePortClassConfig ) )
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:745:1: (lv_regular_5_0= rulePortClassConfig )
+            	        	newLeafNode(otherlv_4, grammarAccess.getProtocolClassConfigAccess().getRegularKeyword_3_0_0());
+            	        
+            	    // InternalConfig.g:744:1: ( (lv_regular_5_0= rulePortClassConfig ) )
+            	    // InternalConfig.g:745:1: (lv_regular_5_0= rulePortClassConfig )
             	    {
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:745:1: (lv_regular_5_0= rulePortClassConfig )
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:746:3: lv_regular_5_0= rulePortClassConfig
+            	    // InternalConfig.g:745:1: (lv_regular_5_0= rulePortClassConfig )
+            	    // InternalConfig.g:746:3: lv_regular_5_0= rulePortClassConfig
             	    {
-            	    if ( state.backtracking==0 ) {
-            	       
-            	      	        newCompositeNode(grammarAccess.getProtocolClassConfigAccess().getRegularPortClassConfigParserRuleCall_3_0_1_0()); 
-            	      	    
-            	    }
-            	    pushFollow(FOLLOW_rulePortClassConfig_in_ruleProtocolClassConfig1699);
+            	     
+            	    	        newCompositeNode(grammarAccess.getProtocolClassConfigAccess().getRegularPortClassConfigParserRuleCall_3_0_1_0()); 
+            	    	    
+            	    pushFollow(FOLLOW_17);
             	    lv_regular_5_0=rulePortClassConfig();
 
             	    state._fsp--;
-            	    if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
-
-            	      	        if (current==null) {
-            	      	            current = createModelElementForParent(grammarAccess.getProtocolClassConfigRule());
-            	      	        }
-            	             		set(
-            	             			current, 
-            	             			"regular",
-            	              		lv_regular_5_0, 
-            	              		"PortClassConfig");
-            	      	        afterParserOrEnumRuleCall();
-            	      	    
-            	    }
+
+
+            	    	        if (current==null) {
+            	    	            current = createModelElementForParent(grammarAccess.getProtocolClassConfigRule());
+            	    	        }
+            	           		set(
+            	           			current, 
+            	           			"regular",
+            	            		lv_regular_5_0, 
+            	            		"org.eclipse.etrice.core.Config.PortClassConfig");
+            	    	        afterParserOrEnumRuleCall();
+            	    	    
 
             	    }
 
@@ -2056,7 +1877,9 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    getUnorderedGroupHelper().returnFromSelection(grammarAccess.getProtocolClassConfigAccess().getUnorderedGroup_3());
+            	     
+            	    	 				  getUnorderedGroupHelper().returnFromSelection(grammarAccess.getProtocolClassConfigAccess().getUnorderedGroup_3());
+            	    	 				
 
             	    }
 
@@ -2067,30 +1890,30 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 2 :
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:769:4: ({...}? => ( ({...}? => ( (otherlv_6= 'conjugate' | otherlv_7= 'conjugated' ) ( (lv_conjugated_8_0= rulePortClassConfig ) ) ) ) ) )
+            	    // InternalConfig.g:769:4: ({...}? => ( ({...}? => ( (otherlv_6= 'conjugate' | otherlv_7= 'conjugated' ) ( (lv_conjugated_8_0= rulePortClassConfig ) ) ) ) ) )
             	    {
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:769:4: ({...}? => ( ({...}? => ( (otherlv_6= 'conjugate' | otherlv_7= 'conjugated' ) ( (lv_conjugated_8_0= rulePortClassConfig ) ) ) ) ) )
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:770:5: {...}? => ( ({...}? => ( (otherlv_6= 'conjugate' | otherlv_7= 'conjugated' ) ( (lv_conjugated_8_0= rulePortClassConfig ) ) ) ) )
+            	    // InternalConfig.g:769:4: ({...}? => ( ({...}? => ( (otherlv_6= 'conjugate' | otherlv_7= 'conjugated' ) ( (lv_conjugated_8_0= rulePortClassConfig ) ) ) ) ) )
+            	    // InternalConfig.g:770:5: {...}? => ( ({...}? => ( (otherlv_6= 'conjugate' | otherlv_7= 'conjugated' ) ( (lv_conjugated_8_0= rulePortClassConfig ) ) ) ) )
             	    {
             	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getProtocolClassConfigAccess().getUnorderedGroup_3(), 1) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleProtocolClassConfig", "getUnorderedGroupHelper().canSelect(grammarAccess.getProtocolClassConfigAccess().getUnorderedGroup_3(), 1)");
             	    }
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:770:116: ( ({...}? => ( (otherlv_6= 'conjugate' | otherlv_7= 'conjugated' ) ( (lv_conjugated_8_0= rulePortClassConfig ) ) ) ) )
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:771:6: ({...}? => ( (otherlv_6= 'conjugate' | otherlv_7= 'conjugated' ) ( (lv_conjugated_8_0= rulePortClassConfig ) ) ) )
+            	    // InternalConfig.g:770:116: ( ({...}? => ( (otherlv_6= 'conjugate' | otherlv_7= 'conjugated' ) ( (lv_conjugated_8_0= rulePortClassConfig ) ) ) ) )
+            	    // InternalConfig.g:771:6: ({...}? => ( (otherlv_6= 'conjugate' | otherlv_7= 'conjugated' ) ( (lv_conjugated_8_0= rulePortClassConfig ) ) ) )
             	    {
-            	    getUnorderedGroupHelper().select(grammarAccess.getProtocolClassConfigAccess().getUnorderedGroup_3(), 1);
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:774:6: ({...}? => ( (otherlv_6= 'conjugate' | otherlv_7= 'conjugated' ) ( (lv_conjugated_8_0= rulePortClassConfig ) ) ) )
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:774:7: {...}? => ( (otherlv_6= 'conjugate' | otherlv_7= 'conjugated' ) ( (lv_conjugated_8_0= rulePortClassConfig ) ) )
+            	     
+            	    	 				  getUnorderedGroupHelper().select(grammarAccess.getProtocolClassConfigAccess().getUnorderedGroup_3(), 1);
+            	    	 				
+            	    // InternalConfig.g:774:6: ({...}? => ( (otherlv_6= 'conjugate' | otherlv_7= 'conjugated' ) ( (lv_conjugated_8_0= rulePortClassConfig ) ) ) )
+            	    // InternalConfig.g:774:7: {...}? => ( (otherlv_6= 'conjugate' | otherlv_7= 'conjugated' ) ( (lv_conjugated_8_0= rulePortClassConfig ) ) )
             	    {
             	    if ( !((true)) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleProtocolClassConfig", "true");
             	    }
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:774:16: ( (otherlv_6= 'conjugate' | otherlv_7= 'conjugated' ) ( (lv_conjugated_8_0= rulePortClassConfig ) ) )
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:774:17: (otherlv_6= 'conjugate' | otherlv_7= 'conjugated' ) ( (lv_conjugated_8_0= rulePortClassConfig ) )
+            	    // InternalConfig.g:774:16: ( (otherlv_6= 'conjugate' | otherlv_7= 'conjugated' ) ( (lv_conjugated_8_0= rulePortClassConfig ) ) )
+            	    // InternalConfig.g:774:17: (otherlv_6= 'conjugate' | otherlv_7= 'conjugated' ) ( (lv_conjugated_8_0= rulePortClassConfig ) )
             	    {
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:774:17: (otherlv_6= 'conjugate' | otherlv_7= 'conjugated' )
+            	    // InternalConfig.g:774:17: (otherlv_6= 'conjugate' | otherlv_7= 'conjugated' )
             	    int alt10=2;
             	    int LA10_0 = input.LA(1);
 
@@ -2101,7 +1924,6 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
             	        alt10=2;
             	    }
             	    else {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
             	        NoViableAltException nvae =
             	            new NoViableAltException("", 10, 0, input);
 
@@ -2109,61 +1931,53 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
             	    }
             	    switch (alt10) {
             	        case 1 :
-            	            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:774:19: otherlv_6= 'conjugate'
+            	            // InternalConfig.g:774:19: otherlv_6= 'conjugate'
             	            {
-            	            otherlv_6=(Token)match(input,26,FOLLOW_26_in_ruleProtocolClassConfig1768); if (state.failed) return current;
-            	            if ( state.backtracking==0 ) {
+            	            otherlv_6=(Token)match(input,26,FOLLOW_18); 
 
-            	                  	newLeafNode(otherlv_6, grammarAccess.getProtocolClassConfigAccess().getConjugateKeyword_3_1_0_0());
-            	                  
-            	            }
+            	                	newLeafNode(otherlv_6, grammarAccess.getProtocolClassConfigAccess().getConjugateKeyword_3_1_0_0());
+            	                
 
             	            }
             	            break;
             	        case 2 :
-            	            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:779:7: otherlv_7= 'conjugated'
+            	            // InternalConfig.g:779:7: otherlv_7= 'conjugated'
             	            {
-            	            otherlv_7=(Token)match(input,27,FOLLOW_27_in_ruleProtocolClassConfig1786); if (state.failed) return current;
-            	            if ( state.backtracking==0 ) {
+            	            otherlv_7=(Token)match(input,27,FOLLOW_18); 
 
-            	                  	newLeafNode(otherlv_7, grammarAccess.getProtocolClassConfigAccess().getConjugatedKeyword_3_1_0_1());
-            	                  
-            	            }
+            	                	newLeafNode(otherlv_7, grammarAccess.getProtocolClassConfigAccess().getConjugatedKeyword_3_1_0_1());
+            	                
 
             	            }
             	            break;
 
             	    }
 
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:783:2: ( (lv_conjugated_8_0= rulePortClassConfig ) )
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:784:1: (lv_conjugated_8_0= rulePortClassConfig )
+            	    // InternalConfig.g:783:2: ( (lv_conjugated_8_0= rulePortClassConfig ) )
+            	    // InternalConfig.g:784:1: (lv_conjugated_8_0= rulePortClassConfig )
             	    {
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:784:1: (lv_conjugated_8_0= rulePortClassConfig )
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:785:3: lv_conjugated_8_0= rulePortClassConfig
+            	    // InternalConfig.g:784:1: (lv_conjugated_8_0= rulePortClassConfig )
+            	    // InternalConfig.g:785:3: lv_conjugated_8_0= rulePortClassConfig
             	    {
-            	    if ( state.backtracking==0 ) {
-            	       
-            	      	        newCompositeNode(grammarAccess.getProtocolClassConfigAccess().getConjugatedPortClassConfigParserRuleCall_3_1_1_0()); 
-            	      	    
-            	    }
-            	    pushFollow(FOLLOW_rulePortClassConfig_in_ruleProtocolClassConfig1808);
+            	     
+            	    	        newCompositeNode(grammarAccess.getProtocolClassConfigAccess().getConjugatedPortClassConfigParserRuleCall_3_1_1_0()); 
+            	    	    
+            	    pushFollow(FOLLOW_17);
             	    lv_conjugated_8_0=rulePortClassConfig();
 
             	    state._fsp--;
-            	    if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
-
-            	      	        if (current==null) {
-            	      	            current = createModelElementForParent(grammarAccess.getProtocolClassConfigRule());
-            	      	        }
-            	             		set(
-            	             			current, 
-            	             			"conjugated",
-            	              		lv_conjugated_8_0, 
-            	              		"PortClassConfig");
-            	      	        afterParserOrEnumRuleCall();
-            	      	    
-            	    }
+
+
+            	    	        if (current==null) {
+            	    	            current = createModelElementForParent(grammarAccess.getProtocolClassConfigRule());
+            	    	        }
+            	           		set(
+            	           			current, 
+            	           			"conjugated",
+            	            		lv_conjugated_8_0, 
+            	            		"org.eclipse.etrice.core.Config.PortClassConfig");
+            	    	        afterParserOrEnumRuleCall();
+            	    	    
 
             	    }
 
@@ -2176,7 +1990,9 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    getUnorderedGroupHelper().returnFromSelection(grammarAccess.getProtocolClassConfigAccess().getUnorderedGroup_3());
+            	     
+            	    	 				  getUnorderedGroupHelper().returnFromSelection(grammarAccess.getProtocolClassConfigAccess().getUnorderedGroup_3());
+            	    	 				
 
             	    }
 
@@ -2198,25 +2014,23 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
             }
 
-            getUnorderedGroupHelper().leave(grammarAccess.getProtocolClassConfigAccess().getUnorderedGroup_3());
+             
+            	  getUnorderedGroupHelper().leave(grammarAccess.getProtocolClassConfigAccess().getUnorderedGroup_3());
+            	
 
             }
 
-            otherlv_9=(Token)match(input,14,FOLLOW_14_in_ruleProtocolClassConfig1861); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_9=(Token)match(input,14,FOLLOW_2); 
 
-                  	newLeafNode(otherlv_9, grammarAccess.getProtocolClassConfigAccess().getRightCurlyBracketKeyword_4());
-                  
-            }
+                	newLeafNode(otherlv_9, grammarAccess.getProtocolClassConfigAccess().getRightCurlyBracketKeyword_4());
+                
 
             }
 
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -2231,7 +2045,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRulePortClassConfig"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:827:1: entryRulePortClassConfig returns [EObject current=null] : iv_rulePortClassConfig= rulePortClassConfig EOF ;
+    // InternalConfig.g:827:1: entryRulePortClassConfig returns [EObject current=null] : iv_rulePortClassConfig= rulePortClassConfig EOF ;
     public final EObject entryRulePortClassConfig() throws RecognitionException {
         EObject current = null;
 
@@ -2239,21 +2053,17 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:828:2: (iv_rulePortClassConfig= rulePortClassConfig EOF )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:829:2: iv_rulePortClassConfig= rulePortClassConfig EOF
+            // InternalConfig.g:828:2: (iv_rulePortClassConfig= rulePortClassConfig EOF )
+            // InternalConfig.g:829:2: iv_rulePortClassConfig= rulePortClassConfig EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getPortClassConfigRule()); 
-            }
-            pushFollow(FOLLOW_rulePortClassConfig_in_entryRulePortClassConfig1897);
+             newCompositeNode(grammarAccess.getPortClassConfigRule()); 
+            pushFollow(FOLLOW_1);
             iv_rulePortClassConfig=rulePortClassConfig();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_rulePortClassConfig; 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRulePortClassConfig1907); if (state.failed) return current;
+
+             current =iv_rulePortClassConfig; 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2271,7 +2081,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "rulePortClassConfig"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:836:1: rulePortClassConfig returns [EObject current=null] : ( () otherlv_1= 'Port' otherlv_2= '{' ( (lv_attributes_3_0= ruleAttrClassConfig ) )* otherlv_4= '}' ) ;
+    // InternalConfig.g:836:1: rulePortClassConfig returns [EObject current=null] : ( () otherlv_1= 'Port' otherlv_2= '{' ( (lv_attributes_3_0= ruleAttrClassConfig ) )* otherlv_4= '}' ) ;
     public final EObject rulePortClassConfig() throws RecognitionException {
         EObject current = null;
 
@@ -2284,38 +2094,32 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:839:28: ( ( () otherlv_1= 'Port' otherlv_2= '{' ( (lv_attributes_3_0= ruleAttrClassConfig ) )* otherlv_4= '}' ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:840:1: ( () otherlv_1= 'Port' otherlv_2= '{' ( (lv_attributes_3_0= ruleAttrClassConfig ) )* otherlv_4= '}' )
+            // InternalConfig.g:839:28: ( ( () otherlv_1= 'Port' otherlv_2= '{' ( (lv_attributes_3_0= ruleAttrClassConfig ) )* otherlv_4= '}' ) )
+            // InternalConfig.g:840:1: ( () otherlv_1= 'Port' otherlv_2= '{' ( (lv_attributes_3_0= ruleAttrClassConfig ) )* otherlv_4= '}' )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:840:1: ( () otherlv_1= 'Port' otherlv_2= '{' ( (lv_attributes_3_0= ruleAttrClassConfig ) )* otherlv_4= '}' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:840:2: () otherlv_1= 'Port' otherlv_2= '{' ( (lv_attributes_3_0= ruleAttrClassConfig ) )* otherlv_4= '}'
+            // InternalConfig.g:840:1: ( () otherlv_1= 'Port' otherlv_2= '{' ( (lv_attributes_3_0= ruleAttrClassConfig ) )* otherlv_4= '}' )
+            // InternalConfig.g:840:2: () otherlv_1= 'Port' otherlv_2= '{' ( (lv_attributes_3_0= ruleAttrClassConfig ) )* otherlv_4= '}'
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:840:2: ()
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:841:5: 
+            // InternalConfig.g:840:2: ()
+            // InternalConfig.g:841:5: 
             {
-            if ( state.backtracking==0 ) {
 
-                      current = forceCreateModelElement(
-                          grammarAccess.getPortClassConfigAccess().getPortClassConfigAction_0(),
-                          current);
-                  
-            }
+                    current = forceCreateModelElement(
+                        grammarAccess.getPortClassConfigAccess().getPortClassConfigAction_0(),
+                        current);
+                
 
             }
 
-            otherlv_1=(Token)match(input,28,FOLLOW_28_in_rulePortClassConfig1953); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_1=(Token)match(input,28,FOLLOW_4); 
 
-                  	newLeafNode(otherlv_1, grammarAccess.getPortClassConfigAccess().getPortKeyword_1());
-                  
-            }
-            otherlv_2=(Token)match(input,13,FOLLOW_13_in_rulePortClassConfig1965); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+                	newLeafNode(otherlv_1, grammarAccess.getPortClassConfigAccess().getPortKeyword_1());
+                
+            otherlv_2=(Token)match(input,13,FOLLOW_15); 
 
-                  	newLeafNode(otherlv_2, grammarAccess.getPortClassConfigAccess().getLeftCurlyBracketKeyword_2());
-                  
-            }
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:854:1: ( (lv_attributes_3_0= ruleAttrClassConfig ) )*
+                	newLeafNode(otherlv_2, grammarAccess.getPortClassConfigAccess().getLeftCurlyBracketKeyword_2());
+                
+            // InternalConfig.g:854:1: ( (lv_attributes_3_0= ruleAttrClassConfig ) )*
             loop12:
             do {
                 int alt12=2;
@@ -2328,34 +2132,30 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
                 switch (alt12) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:855:1: (lv_attributes_3_0= ruleAttrClassConfig )
+            	    // InternalConfig.g:855:1: (lv_attributes_3_0= ruleAttrClassConfig )
             	    {
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:855:1: (lv_attributes_3_0= ruleAttrClassConfig )
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:856:3: lv_attributes_3_0= ruleAttrClassConfig
+            	    // InternalConfig.g:855:1: (lv_attributes_3_0= ruleAttrClassConfig )
+            	    // InternalConfig.g:856:3: lv_attributes_3_0= ruleAttrClassConfig
             	    {
-            	    if ( state.backtracking==0 ) {
-            	       
-            	      	        newCompositeNode(grammarAccess.getPortClassConfigAccess().getAttributesAttrClassConfigParserRuleCall_3_0()); 
-            	      	    
-            	    }
-            	    pushFollow(FOLLOW_ruleAttrClassConfig_in_rulePortClassConfig1986);
+            	     
+            	    	        newCompositeNode(grammarAccess.getPortClassConfigAccess().getAttributesAttrClassConfigParserRuleCall_3_0()); 
+            	    	    
+            	    pushFollow(FOLLOW_15);
             	    lv_attributes_3_0=ruleAttrClassConfig();
 
             	    state._fsp--;
-            	    if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
-
-            	      	        if (current==null) {
-            	      	            current = createModelElementForParent(grammarAccess.getPortClassConfigRule());
-            	      	        }
-            	             		add(
-            	             			current, 
-            	             			"attributes",
-            	              		lv_attributes_3_0, 
-            	              		"AttrClassConfig");
-            	      	        afterParserOrEnumRuleCall();
-            	      	    
-            	    }
+
+
+            	    	        if (current==null) {
+            	    	            current = createModelElementForParent(grammarAccess.getPortClassConfigRule());
+            	    	        }
+            	           		add(
+            	           			current, 
+            	           			"attributes",
+            	            		lv_attributes_3_0, 
+            	            		"org.eclipse.etrice.core.Config.AttrClassConfig");
+            	    	        afterParserOrEnumRuleCall();
+            	    	    
 
             	    }
 
@@ -2368,21 +2168,17 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                 }
             } while (true);
 
-            otherlv_4=(Token)match(input,14,FOLLOW_14_in_rulePortClassConfig1999); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_4=(Token)match(input,14,FOLLOW_2); 
 
-                  	newLeafNode(otherlv_4, grammarAccess.getPortClassConfigAccess().getRightCurlyBracketKeyword_4());
-                  
-            }
+                	newLeafNode(otherlv_4, grammarAccess.getPortClassConfigAccess().getRightCurlyBracketKeyword_4());
+                
 
             }
 
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -2397,7 +2193,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRulePortInstanceConfig"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:884:1: entryRulePortInstanceConfig returns [EObject current=null] : iv_rulePortInstanceConfig= rulePortInstanceConfig EOF ;
+    // InternalConfig.g:884:1: entryRulePortInstanceConfig returns [EObject current=null] : iv_rulePortInstanceConfig= rulePortInstanceConfig EOF ;
     public final EObject entryRulePortInstanceConfig() throws RecognitionException {
         EObject current = null;
 
@@ -2405,21 +2201,17 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:885:2: (iv_rulePortInstanceConfig= rulePortInstanceConfig EOF )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:886:2: iv_rulePortInstanceConfig= rulePortInstanceConfig EOF
+            // InternalConfig.g:885:2: (iv_rulePortInstanceConfig= rulePortInstanceConfig EOF )
+            // InternalConfig.g:886:2: iv_rulePortInstanceConfig= rulePortInstanceConfig EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getPortInstanceConfigRule()); 
-            }
-            pushFollow(FOLLOW_rulePortInstanceConfig_in_entryRulePortInstanceConfig2035);
+             newCompositeNode(grammarAccess.getPortInstanceConfigRule()); 
+            pushFollow(FOLLOW_1);
             iv_rulePortInstanceConfig=rulePortInstanceConfig();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_rulePortInstanceConfig; 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRulePortInstanceConfig2045); if (state.failed) return current;
+
+             current =iv_rulePortInstanceConfig; 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2437,7 +2229,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "rulePortInstanceConfig"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:893:1: rulePortInstanceConfig returns [EObject current=null] : (otherlv_0= 'InterfaceItem' ( (otherlv_1= RULE_ID ) ) otherlv_2= '{' ( (lv_attributes_3_0= ruleAttrInstanceConfig ) )* otherlv_4= '}' ) ;
+    // InternalConfig.g:893:1: rulePortInstanceConfig returns [EObject current=null] : (otherlv_0= 'InterfaceItem' ( (otherlv_1= RULE_ID ) ) otherlv_2= '{' ( (lv_attributes_3_0= ruleAttrInstanceConfig ) )* otherlv_4= '}' ) ;
     public final EObject rulePortInstanceConfig() throws RecognitionException {
         EObject current = null;
 
@@ -2451,50 +2243,42 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:896:28: ( (otherlv_0= 'InterfaceItem' ( (otherlv_1= RULE_ID ) ) otherlv_2= '{' ( (lv_attributes_3_0= ruleAttrInstanceConfig ) )* otherlv_4= '}' ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:897:1: (otherlv_0= 'InterfaceItem' ( (otherlv_1= RULE_ID ) ) otherlv_2= '{' ( (lv_attributes_3_0= ruleAttrInstanceConfig ) )* otherlv_4= '}' )
+            // InternalConfig.g:896:28: ( (otherlv_0= 'InterfaceItem' ( (otherlv_1= RULE_ID ) ) otherlv_2= '{' ( (lv_attributes_3_0= ruleAttrInstanceConfig ) )* otherlv_4= '}' ) )
+            // InternalConfig.g:897:1: (otherlv_0= 'InterfaceItem' ( (otherlv_1= RULE_ID ) ) otherlv_2= '{' ( (lv_attributes_3_0= ruleAttrInstanceConfig ) )* otherlv_4= '}' )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:897:1: (otherlv_0= 'InterfaceItem' ( (otherlv_1= RULE_ID ) ) otherlv_2= '{' ( (lv_attributes_3_0= ruleAttrInstanceConfig ) )* otherlv_4= '}' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:897:3: otherlv_0= 'InterfaceItem' ( (otherlv_1= RULE_ID ) ) otherlv_2= '{' ( (lv_attributes_3_0= ruleAttrInstanceConfig ) )* otherlv_4= '}'
+            // InternalConfig.g:897:1: (otherlv_0= 'InterfaceItem' ( (otherlv_1= RULE_ID ) ) otherlv_2= '{' ( (lv_attributes_3_0= ruleAttrInstanceConfig ) )* otherlv_4= '}' )
+            // InternalConfig.g:897:3: otherlv_0= 'InterfaceItem' ( (otherlv_1= RULE_ID ) ) otherlv_2= '{' ( (lv_attributes_3_0= ruleAttrInstanceConfig ) )* otherlv_4= '}'
             {
-            otherlv_0=(Token)match(input,29,FOLLOW_29_in_rulePortInstanceConfig2082); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_0=(Token)match(input,29,FOLLOW_3); 
 
-                  	newLeafNode(otherlv_0, grammarAccess.getPortInstanceConfigAccess().getInterfaceItemKeyword_0());
-                  
-            }
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:901:1: ( (otherlv_1= RULE_ID ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:902:1: (otherlv_1= RULE_ID )
+                	newLeafNode(otherlv_0, grammarAccess.getPortInstanceConfigAccess().getInterfaceItemKeyword_0());
+                
+            // InternalConfig.g:901:1: ( (otherlv_1= RULE_ID ) )
+            // InternalConfig.g:902:1: (otherlv_1= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:902:1: (otherlv_1= RULE_ID )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:903:3: otherlv_1= RULE_ID
+            // InternalConfig.g:902:1: (otherlv_1= RULE_ID )
+            // InternalConfig.g:903:3: otherlv_1= RULE_ID
             {
-            if ( state.backtracking==0 ) {
 
-              			if (current==null) {
-              	            current = createModelElement(grammarAccess.getPortInstanceConfigRule());
-              	        }
-                      
-            }
-            otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_rulePortInstanceConfig2102); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            			if (current==null) {
+            	            current = createModelElement(grammarAccess.getPortInstanceConfigRule());
+            	        }
+                    
+            otherlv_1=(Token)match(input,RULE_ID,FOLLOW_4); 
 
-              		newLeafNode(otherlv_1, grammarAccess.getPortInstanceConfigAccess().getItemInterfaceItemCrossReference_1_0()); 
-              	
-            }
+            		newLeafNode(otherlv_1, grammarAccess.getPortInstanceConfigAccess().getItemInterfaceItemCrossReference_1_0()); 
+            	
 
             }
 
 
             }
 
-            otherlv_2=(Token)match(input,13,FOLLOW_13_in_rulePortInstanceConfig2114); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_2=(Token)match(input,13,FOLLOW_15); 
 
-                  	newLeafNode(otherlv_2, grammarAccess.getPortInstanceConfigAccess().getLeftCurlyBracketKeyword_2());
-                  
-            }
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:918:1: ( (lv_attributes_3_0= ruleAttrInstanceConfig ) )*
+                	newLeafNode(otherlv_2, grammarAccess.getPortInstanceConfigAccess().getLeftCurlyBracketKeyword_2());
+                
+            // InternalConfig.g:918:1: ( (lv_attributes_3_0= ruleAttrInstanceConfig ) )*
             loop13:
             do {
                 int alt13=2;
@@ -2507,34 +2291,30 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
                 switch (alt13) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:919:1: (lv_attributes_3_0= ruleAttrInstanceConfig )
+            	    // InternalConfig.g:919:1: (lv_attributes_3_0= ruleAttrInstanceConfig )
             	    {
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:919:1: (lv_attributes_3_0= ruleAttrInstanceConfig )
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:920:3: lv_attributes_3_0= ruleAttrInstanceConfig
+            	    // InternalConfig.g:919:1: (lv_attributes_3_0= ruleAttrInstanceConfig )
+            	    // InternalConfig.g:920:3: lv_attributes_3_0= ruleAttrInstanceConfig
             	    {
-            	    if ( state.backtracking==0 ) {
-            	       
-            	      	        newCompositeNode(grammarAccess.getPortInstanceConfigAccess().getAttributesAttrInstanceConfigParserRuleCall_3_0()); 
-            	      	    
-            	    }
-            	    pushFollow(FOLLOW_ruleAttrInstanceConfig_in_rulePortInstanceConfig2135);
+            	     
+            	    	        newCompositeNode(grammarAccess.getPortInstanceConfigAccess().getAttributesAttrInstanceConfigParserRuleCall_3_0()); 
+            	    	    
+            	    pushFollow(FOLLOW_15);
             	    lv_attributes_3_0=ruleAttrInstanceConfig();
 
             	    state._fsp--;
-            	    if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
-
-            	      	        if (current==null) {
-            	      	            current = createModelElementForParent(grammarAccess.getPortInstanceConfigRule());
-            	      	        }
-            	             		add(
-            	             			current, 
-            	             			"attributes",
-            	              		lv_attributes_3_0, 
-            	              		"AttrInstanceConfig");
-            	      	        afterParserOrEnumRuleCall();
-            	      	    
-            	    }
+
+
+            	    	        if (current==null) {
+            	    	            current = createModelElementForParent(grammarAccess.getPortInstanceConfigRule());
+            	    	        }
+            	           		add(
+            	           			current, 
+            	           			"attributes",
+            	            		lv_attributes_3_0, 
+            	            		"org.eclipse.etrice.core.Config.AttrInstanceConfig");
+            	    	        afterParserOrEnumRuleCall();
+            	    	    
 
             	    }
 
@@ -2547,21 +2327,17 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                 }
             } while (true);
 
-            otherlv_4=(Token)match(input,14,FOLLOW_14_in_rulePortInstanceConfig2148); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_4=(Token)match(input,14,FOLLOW_2); 
 
-                  	newLeafNode(otherlv_4, grammarAccess.getPortInstanceConfigAccess().getRightCurlyBracketKeyword_4());
-                  
-            }
+                	newLeafNode(otherlv_4, grammarAccess.getPortInstanceConfigAccess().getRightCurlyBracketKeyword_4());
+                
 
             }
 
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -2576,7 +2352,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleAttrClassConfig"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:950:1: entryRuleAttrClassConfig returns [EObject current=null] : iv_ruleAttrClassConfig= ruleAttrClassConfig EOF ;
+    // InternalConfig.g:950:1: entryRuleAttrClassConfig returns [EObject current=null] : iv_ruleAttrClassConfig= ruleAttrClassConfig EOF ;
     public final EObject entryRuleAttrClassConfig() throws RecognitionException {
         EObject current = null;
 
@@ -2584,21 +2360,17 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:951:2: (iv_ruleAttrClassConfig= ruleAttrClassConfig EOF )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:952:2: iv_ruleAttrClassConfig= ruleAttrClassConfig EOF
+            // InternalConfig.g:951:2: (iv_ruleAttrClassConfig= ruleAttrClassConfig EOF )
+            // InternalConfig.g:952:2: iv_ruleAttrClassConfig= ruleAttrClassConfig EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getAttrClassConfigRule()); 
-            }
-            pushFollow(FOLLOW_ruleAttrClassConfig_in_entryRuleAttrClassConfig2186);
+             newCompositeNode(grammarAccess.getAttrClassConfigRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleAttrClassConfig=ruleAttrClassConfig();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleAttrClassConfig; 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAttrClassConfig2196); if (state.failed) return current;
+
+             current =iv_ruleAttrClassConfig; 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2616,7 +2388,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleAttrClassConfig"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:959:1: ruleAttrClassConfig returns [EObject current=null] : (otherlv_0= 'Attr' ( (otherlv_1= RULE_ID ) ) (otherlv_2= '=' ( (lv_value_3_0= ruleConfigValueArray ) ) )? (otherlv_4= '{' ( (otherlv_5= 'min' otherlv_6= '=' ( (lv_min_7_0= ruleNumberLiteral ) ) )? (otherlv_8= 'max' otherlv_9= '=' ( (lv_max_10_0= ruleNumberLiteral ) ) )? ( (lv_attributes_11_0= ruleAttrClassConfig ) )* ) otherlv_12= '}' )? ) ;
+    // InternalConfig.g:959:1: ruleAttrClassConfig returns [EObject current=null] : (otherlv_0= 'Attr' ( (otherlv_1= RULE_ID ) ) (otherlv_2= '=' ( (lv_value_3_0= ruleConfigValueArray ) ) )? (otherlv_4= '{' ( (otherlv_5= 'min' otherlv_6= '=' ( (lv_min_7_0= ruleNumberLiteral ) ) )? (otherlv_8= 'max' otherlv_9= '=' ( (lv_max_10_0= ruleNumberLiteral ) ) )? ( (lv_attributes_11_0= ruleAttrClassConfig ) )* ) otherlv_12= '}' )? ) ;
     public final EObject ruleAttrClassConfig() throws RecognitionException {
         EObject current = null;
 
@@ -2641,44 +2413,38 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:962:28: ( (otherlv_0= 'Attr' ( (otherlv_1= RULE_ID ) ) (otherlv_2= '=' ( (lv_value_3_0= ruleConfigValueArray ) ) )? (otherlv_4= '{' ( (otherlv_5= 'min' otherlv_6= '=' ( (lv_min_7_0= ruleNumberLiteral ) ) )? (otherlv_8= 'max' otherlv_9= '=' ( (lv_max_10_0= ruleNumberLiteral ) ) )? ( (lv_attributes_11_0= ruleAttrClassConfig ) )* ) otherlv_12= '}' )? ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:963:1: (otherlv_0= 'Attr' ( (otherlv_1= RULE_ID ) ) (otherlv_2= '=' ( (lv_value_3_0= ruleConfigValueArray ) ) )? (otherlv_4= '{' ( (otherlv_5= 'min' otherlv_6= '=' ( (lv_min_7_0= ruleNumberLiteral ) ) )? (otherlv_8= 'max' otherlv_9= '=' ( (lv_max_10_0= ruleNumberLiteral ) ) )? ( (lv_attributes_11_0= ruleAttrClassConfig ) )* ) otherlv_12= '}' )? )
+            // InternalConfig.g:962:28: ( (otherlv_0= 'Attr' ( (otherlv_1= RULE_ID ) ) (otherlv_2= '=' ( (lv_value_3_0= ruleConfigValueArray ) ) )? (otherlv_4= '{' ( (otherlv_5= 'min' otherlv_6= '=' ( (lv_min_7_0= ruleNumberLiteral ) ) )? (otherlv_8= 'max' otherlv_9= '=' ( (lv_max_10_0= ruleNumberLiteral ) ) )? ( (lv_attributes_11_0= ruleAttrClassConfig ) )* ) otherlv_12= '}' )? ) )
+            // InternalConfig.g:963:1: (otherlv_0= 'Attr' ( (otherlv_1= RULE_ID ) ) (otherlv_2= '=' ( (lv_value_3_0= ruleConfigValueArray ) ) )? (otherlv_4= '{' ( (otherlv_5= 'min' otherlv_6= '=' ( (lv_min_7_0= ruleNumberLiteral ) ) )? (otherlv_8= 'max' otherlv_9= '=' ( (lv_max_10_0= ruleNumberLiteral ) ) )? ( (lv_attributes_11_0= ruleAttrClassConfig ) )* ) otherlv_12= '}' )? )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:963:1: (otherlv_0= 'Attr' ( (otherlv_1= RULE_ID ) ) (otherlv_2= '=' ( (lv_value_3_0= ruleConfigValueArray ) ) )? (otherlv_4= '{' ( (otherlv_5= 'min' otherlv_6= '=' ( (lv_min_7_0= ruleNumberLiteral ) ) )? (otherlv_8= 'max' otherlv_9= '=' ( (lv_max_10_0= ruleNumberLiteral ) ) )? ( (lv_attributes_11_0= ruleAttrClassConfig ) )* ) otherlv_12= '}' )? )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:963:3: otherlv_0= 'Attr' ( (otherlv_1= RULE_ID ) ) (otherlv_2= '=' ( (lv_value_3_0= ruleConfigValueArray ) ) )? (otherlv_4= '{' ( (otherlv_5= 'min' otherlv_6= '=' ( (lv_min_7_0= ruleNumberLiteral ) ) )? (otherlv_8= 'max' otherlv_9= '=' ( (lv_max_10_0= ruleNumberLiteral ) ) )? ( (lv_attributes_11_0= ruleAttrClassConfig ) )* ) otherlv_12= '}' )?
+            // InternalConfig.g:963:1: (otherlv_0= 'Attr' ( (otherlv_1= RULE_ID ) ) (otherlv_2= '=' ( (lv_value_3_0= ruleConfigValueArray ) ) )? (otherlv_4= '{' ( (otherlv_5= 'min' otherlv_6= '=' ( (lv_min_7_0= ruleNumberLiteral ) ) )? (otherlv_8= 'max' otherlv_9= '=' ( (lv_max_10_0= ruleNumberLiteral ) ) )? ( (lv_attributes_11_0= ruleAttrClassConfig ) )* ) otherlv_12= '}' )? )
+            // InternalConfig.g:963:3: otherlv_0= 'Attr' ( (otherlv_1= RULE_ID ) ) (otherlv_2= '=' ( (lv_value_3_0= ruleConfigValueArray ) ) )? (otherlv_4= '{' ( (otherlv_5= 'min' otherlv_6= '=' ( (lv_min_7_0= ruleNumberLiteral ) ) )? (otherlv_8= 'max' otherlv_9= '=' ( (lv_max_10_0= ruleNumberLiteral ) ) )? ( (lv_attributes_11_0= ruleAttrClassConfig ) )* ) otherlv_12= '}' )?
             {
-            otherlv_0=(Token)match(input,30,FOLLOW_30_in_ruleAttrClassConfig2233); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_0=(Token)match(input,30,FOLLOW_3); 
 
-                  	newLeafNode(otherlv_0, grammarAccess.getAttrClassConfigAccess().getAttrKeyword_0());
-                  
-            }
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:967:1: ( (otherlv_1= RULE_ID ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:968:1: (otherlv_1= RULE_ID )
+                	newLeafNode(otherlv_0, grammarAccess.getAttrClassConfigAccess().getAttrKeyword_0());
+                
+            // InternalConfig.g:967:1: ( (otherlv_1= RULE_ID ) )
+            // InternalConfig.g:968:1: (otherlv_1= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:968:1: (otherlv_1= RULE_ID )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:969:3: otherlv_1= RULE_ID
+            // InternalConfig.g:968:1: (otherlv_1= RULE_ID )
+            // InternalConfig.g:969:3: otherlv_1= RULE_ID
             {
-            if ( state.backtracking==0 ) {
 
-              			if (current==null) {
-              	            current = createModelElement(grammarAccess.getAttrClassConfigRule());
-              	        }
-                      
-            }
-            otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleAttrClassConfig2253); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            			if (current==null) {
+            	            current = createModelElement(grammarAccess.getAttrClassConfigRule());
+            	        }
+                    
+            otherlv_1=(Token)match(input,RULE_ID,FOLLOW_19); 
 
-              		newLeafNode(otherlv_1, grammarAccess.getAttrClassConfigAccess().getAttributeAttributeCrossReference_1_0()); 
-              	
-            }
+            		newLeafNode(otherlv_1, grammarAccess.getAttrClassConfigAccess().getAttributeAttributeCrossReference_1_0()); 
+            	
 
             }
 
 
             }
 
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:980:2: (otherlv_2= '=' ( (lv_value_3_0= ruleConfigValueArray ) ) )?
+            // InternalConfig.g:980:2: (otherlv_2= '=' ( (lv_value_3_0= ruleConfigValueArray ) ) )?
             int alt14=2;
             int LA14_0 = input.LA(1);
 
@@ -2687,43 +2453,37 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
             }
             switch (alt14) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:980:4: otherlv_2= '=' ( (lv_value_3_0= ruleConfigValueArray ) )
+                    // InternalConfig.g:980:4: otherlv_2= '=' ( (lv_value_3_0= ruleConfigValueArray ) )
                     {
-                    otherlv_2=(Token)match(input,31,FOLLOW_31_in_ruleAttrClassConfig2266); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    otherlv_2=(Token)match(input,31,FOLLOW_20); 
 
-                          	newLeafNode(otherlv_2, grammarAccess.getAttrClassConfigAccess().getEqualsSignKeyword_2_0());
-                          
-                    }
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:984:1: ( (lv_value_3_0= ruleConfigValueArray ) )
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:985:1: (lv_value_3_0= ruleConfigValueArray )
+                        	newLeafNode(otherlv_2, grammarAccess.getAttrClassConfigAccess().getEqualsSignKeyword_2_0());
+                        
+                    // InternalConfig.g:984:1: ( (lv_value_3_0= ruleConfigValueArray ) )
+                    // InternalConfig.g:985:1: (lv_value_3_0= ruleConfigValueArray )
                     {
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:985:1: (lv_value_3_0= ruleConfigValueArray )
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:986:3: lv_value_3_0= ruleConfigValueArray
+                    // InternalConfig.g:985:1: (lv_value_3_0= ruleConfigValueArray )
+                    // InternalConfig.g:986:3: lv_value_3_0= ruleConfigValueArray
                     {
-                    if ( state.backtracking==0 ) {
-                       
-                      	        newCompositeNode(grammarAccess.getAttrClassConfigAccess().getValueConfigValueArrayParserRuleCall_2_1_0()); 
-                      	    
-                    }
-                    pushFollow(FOLLOW_ruleConfigValueArray_in_ruleAttrClassConfig2287);
+                     
+                    	        newCompositeNode(grammarAccess.getAttrClassConfigAccess().getValueConfigValueArrayParserRuleCall_2_1_0()); 
+                    	    
+                    pushFollow(FOLLOW_21);
                     lv_value_3_0=ruleConfigValueArray();
 
                     state._fsp--;
-                    if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
-
-                      	        if (current==null) {
-                      	            current = createModelElementForParent(grammarAccess.getAttrClassConfigRule());
-                      	        }
-                             		set(
-                             			current, 
-                             			"value",
-                              		lv_value_3_0, 
-                              		"ConfigValueArray");
-                      	        afterParserOrEnumRuleCall();
-                      	    
-                    }
+
+
+                    	        if (current==null) {
+                    	            current = createModelElementForParent(grammarAccess.getAttrClassConfigRule());
+                    	        }
+                           		set(
+                           			current, 
+                           			"value",
+                            		lv_value_3_0, 
+                            		"org.eclipse.etrice.core.Config.ConfigValueArray");
+                    	        afterParserOrEnumRuleCall();
+                    	    
 
                     }
 
@@ -2736,7 +2496,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1002:4: (otherlv_4= '{' ( (otherlv_5= 'min' otherlv_6= '=' ( (lv_min_7_0= ruleNumberLiteral ) ) )? (otherlv_8= 'max' otherlv_9= '=' ( (lv_max_10_0= ruleNumberLiteral ) ) )? ( (lv_attributes_11_0= ruleAttrClassConfig ) )* ) otherlv_12= '}' )?
+            // InternalConfig.g:1002:4: (otherlv_4= '{' ( (otherlv_5= 'min' otherlv_6= '=' ( (lv_min_7_0= ruleNumberLiteral ) ) )? (otherlv_8= 'max' otherlv_9= '=' ( (lv_max_10_0= ruleNumberLiteral ) ) )? ( (lv_attributes_11_0= ruleAttrClassConfig ) )* ) otherlv_12= '}' )?
             int alt18=2;
             int LA18_0 = input.LA(1);
 
@@ -2745,18 +2505,16 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
             }
             switch (alt18) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1002:6: otherlv_4= '{' ( (otherlv_5= 'min' otherlv_6= '=' ( (lv_min_7_0= ruleNumberLiteral ) ) )? (otherlv_8= 'max' otherlv_9= '=' ( (lv_max_10_0= ruleNumberLiteral ) ) )? ( (lv_attributes_11_0= ruleAttrClassConfig ) )* ) otherlv_12= '}'
+                    // InternalConfig.g:1002:6: otherlv_4= '{' ( (otherlv_5= 'min' otherlv_6= '=' ( (lv_min_7_0= ruleNumberLiteral ) ) )? (otherlv_8= 'max' otherlv_9= '=' ( (lv_max_10_0= ruleNumberLiteral ) ) )? ( (lv_attributes_11_0= ruleAttrClassConfig ) )* ) otherlv_12= '}'
                     {
-                    otherlv_4=(Token)match(input,13,FOLLOW_13_in_ruleAttrClassConfig2302); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    otherlv_4=(Token)match(input,13,FOLLOW_22); 
 
-                          	newLeafNode(otherlv_4, grammarAccess.getAttrClassConfigAccess().getLeftCurlyBracketKeyword_3_0());
-                          
-                    }
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1006:1: ( (otherlv_5= 'min' otherlv_6= '=' ( (lv_min_7_0= ruleNumberLiteral ) ) )? (otherlv_8= 'max' otherlv_9= '=' ( (lv_max_10_0= ruleNumberLiteral ) ) )? ( (lv_attributes_11_0= ruleAttrClassConfig ) )* )
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1006:2: (otherlv_5= 'min' otherlv_6= '=' ( (lv_min_7_0= ruleNumberLiteral ) ) )? (otherlv_8= 'max' otherlv_9= '=' ( (lv_max_10_0= ruleNumberLiteral ) ) )? ( (lv_attributes_11_0= ruleAttrClassConfig ) )*
+                        	newLeafNode(otherlv_4, grammarAccess.getAttrClassConfigAccess().getLeftCurlyBracketKeyword_3_0());
+                        
+                    // InternalConfig.g:1006:1: ( (otherlv_5= 'min' otherlv_6= '=' ( (lv_min_7_0= ruleNumberLiteral ) ) )? (otherlv_8= 'max' otherlv_9= '=' ( (lv_max_10_0= ruleNumberLiteral ) ) )? ( (lv_attributes_11_0= ruleAttrClassConfig ) )* )
+                    // InternalConfig.g:1006:2: (otherlv_5= 'min' otherlv_6= '=' ( (lv_min_7_0= ruleNumberLiteral ) ) )? (otherlv_8= 'max' otherlv_9= '=' ( (lv_max_10_0= ruleNumberLiteral ) ) )? ( (lv_attributes_11_0= ruleAttrClassConfig ) )*
                     {
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1006:2: (otherlv_5= 'min' otherlv_6= '=' ( (lv_min_7_0= ruleNumberLiteral ) ) )?
+                    // InternalConfig.g:1006:2: (otherlv_5= 'min' otherlv_6= '=' ( (lv_min_7_0= ruleNumberLiteral ) ) )?
                     int alt15=2;
                     int LA15_0 = input.LA(1);
 
@@ -2765,49 +2523,41 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                     }
                     switch (alt15) {
                         case 1 :
-                            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1006:4: otherlv_5= 'min' otherlv_6= '=' ( (lv_min_7_0= ruleNumberLiteral ) )
+                            // InternalConfig.g:1006:4: otherlv_5= 'min' otherlv_6= '=' ( (lv_min_7_0= ruleNumberLiteral ) )
                             {
-                            otherlv_5=(Token)match(input,32,FOLLOW_32_in_ruleAttrClassConfig2316); if (state.failed) return current;
-                            if ( state.backtracking==0 ) {
+                            otherlv_5=(Token)match(input,32,FOLLOW_23); 
 
-                                  	newLeafNode(otherlv_5, grammarAccess.getAttrClassConfigAccess().getMinKeyword_3_1_0_0());
-                                  
-                            }
-                            otherlv_6=(Token)match(input,31,FOLLOW_31_in_ruleAttrClassConfig2328); if (state.failed) return current;
-                            if ( state.backtracking==0 ) {
+                                	newLeafNode(otherlv_5, grammarAccess.getAttrClassConfigAccess().getMinKeyword_3_1_0_0());
+                                
+                            otherlv_6=(Token)match(input,31,FOLLOW_24); 
 
-                                  	newLeafNode(otherlv_6, grammarAccess.getAttrClassConfigAccess().getEqualsSignKeyword_3_1_0_1());
-                                  
-                            }
-                            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1014:1: ( (lv_min_7_0= ruleNumberLiteral ) )
-                            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1015:1: (lv_min_7_0= ruleNumberLiteral )
+                                	newLeafNode(otherlv_6, grammarAccess.getAttrClassConfigAccess().getEqualsSignKeyword_3_1_0_1());
+                                
+                            // InternalConfig.g:1014:1: ( (lv_min_7_0= ruleNumberLiteral ) )
+                            // InternalConfig.g:1015:1: (lv_min_7_0= ruleNumberLiteral )
                             {
-                            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1015:1: (lv_min_7_0= ruleNumberLiteral )
-                            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1016:3: lv_min_7_0= ruleNumberLiteral
+                            // InternalConfig.g:1015:1: (lv_min_7_0= ruleNumberLiteral )
+                            // InternalConfig.g:1016:3: lv_min_7_0= ruleNumberLiteral
                             {
-                            if ( state.backtracking==0 ) {
-                               
-                              	        newCompositeNode(grammarAccess.getAttrClassConfigAccess().getMinNumberLiteralParserRuleCall_3_1_0_2_0()); 
-                              	    
-                            }
-                            pushFollow(FOLLOW_ruleNumberLiteral_in_ruleAttrClassConfig2349);
+                             
+                            	        newCompositeNode(grammarAccess.getAttrClassConfigAccess().getMinNumberLiteralParserRuleCall_3_1_0_2_0()); 
+                            	    
+                            pushFollow(FOLLOW_25);
                             lv_min_7_0=ruleNumberLiteral();
 
                             state._fsp--;
-                            if (state.failed) return current;
-                            if ( state.backtracking==0 ) {
-
-                              	        if (current==null) {
-                              	            current = createModelElementForParent(grammarAccess.getAttrClassConfigRule());
-                              	        }
-                                     		set(
-                                     			current, 
-                                     			"min",
-                                      		lv_min_7_0, 
-                                      		"NumberLiteral");
-                              	        afterParserOrEnumRuleCall();
-                              	    
-                            }
+
+
+                            	        if (current==null) {
+                            	            current = createModelElementForParent(grammarAccess.getAttrClassConfigRule());
+                            	        }
+                                   		set(
+                                   			current, 
+                                   			"min",
+                                    		lv_min_7_0, 
+                                    		"org.eclipse.etrice.core.common.Base.NumberLiteral");
+                            	        afterParserOrEnumRuleCall();
+                            	    
 
                             }
 
@@ -2820,7 +2570,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1032:4: (otherlv_8= 'max' otherlv_9= '=' ( (lv_max_10_0= ruleNumberLiteral ) ) )?
+                    // InternalConfig.g:1032:4: (otherlv_8= 'max' otherlv_9= '=' ( (lv_max_10_0= ruleNumberLiteral ) ) )?
                     int alt16=2;
                     int LA16_0 = input.LA(1);
 
@@ -2829,49 +2579,41 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                     }
                     switch (alt16) {
                         case 1 :
-                            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1032:6: otherlv_8= 'max' otherlv_9= '=' ( (lv_max_10_0= ruleNumberLiteral ) )
+                            // InternalConfig.g:1032:6: otherlv_8= 'max' otherlv_9= '=' ( (lv_max_10_0= ruleNumberLiteral ) )
                             {
-                            otherlv_8=(Token)match(input,33,FOLLOW_33_in_ruleAttrClassConfig2364); if (state.failed) return current;
-                            if ( state.backtracking==0 ) {
+                            otherlv_8=(Token)match(input,33,FOLLOW_23); 
 
-                                  	newLeafNode(otherlv_8, grammarAccess.getAttrClassConfigAccess().getMaxKeyword_3_1_1_0());
-                                  
-                            }
-                            otherlv_9=(Token)match(input,31,FOLLOW_31_in_ruleAttrClassConfig2376); if (state.failed) return current;
-                            if ( state.backtracking==0 ) {
+                                	newLeafNode(otherlv_8, grammarAccess.getAttrClassConfigAccess().getMaxKeyword_3_1_1_0());
+                                
+                            otherlv_9=(Token)match(input,31,FOLLOW_24); 
 
-                                  	newLeafNode(otherlv_9, grammarAccess.getAttrClassConfigAccess().getEqualsSignKeyword_3_1_1_1());
-                                  
-                            }
-                            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1040:1: ( (lv_max_10_0= ruleNumberLiteral ) )
-                            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1041:1: (lv_max_10_0= ruleNumberLiteral )
+                                	newLeafNode(otherlv_9, grammarAccess.getAttrClassConfigAccess().getEqualsSignKeyword_3_1_1_1());
+                                
+                            // InternalConfig.g:1040:1: ( (lv_max_10_0= ruleNumberLiteral ) )
+                            // InternalConfig.g:1041:1: (lv_max_10_0= ruleNumberLiteral )
                             {
-                            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1041:1: (lv_max_10_0= ruleNumberLiteral )
-                            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1042:3: lv_max_10_0= ruleNumberLiteral
+                            // InternalConfig.g:1041:1: (lv_max_10_0= ruleNumberLiteral )
+                            // InternalConfig.g:1042:3: lv_max_10_0= ruleNumberLiteral
                             {
-                            if ( state.backtracking==0 ) {
-                               
-                              	        newCompositeNode(grammarAccess.getAttrClassConfigAccess().getMaxNumberLiteralParserRuleCall_3_1_1_2_0()); 
-                              	    
-                            }
-                            pushFollow(FOLLOW_ruleNumberLiteral_in_ruleAttrClassConfig2397);
+                             
+                            	        newCompositeNode(grammarAccess.getAttrClassConfigAccess().getMaxNumberLiteralParserRuleCall_3_1_1_2_0()); 
+                            	    
+                            pushFollow(FOLLOW_15);
                             lv_max_10_0=ruleNumberLiteral();
 
                             state._fsp--;
-                            if (state.failed) return current;
-                            if ( state.backtracking==0 ) {
-
-                              	        if (current==null) {
-                              	            current = createModelElementForParent(grammarAccess.getAttrClassConfigRule());
-                              	        }
-                                     		set(
-                                     			current, 
-                                     			"max",
-                                      		lv_max_10_0, 
-                                      		"NumberLiteral");
-                              	        afterParserOrEnumRuleCall();
-                              	    
-                            }
+
+
+                            	        if (current==null) {
+                            	            current = createModelElementForParent(grammarAccess.getAttrClassConfigRule());
+                            	        }
+                                   		set(
+                                   			current, 
+                                   			"max",
+                                    		lv_max_10_0, 
+                                    		"org.eclipse.etrice.core.common.Base.NumberLiteral");
+                            	        afterParserOrEnumRuleCall();
+                            	    
 
                             }
 
@@ -2884,7 +2626,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1058:4: ( (lv_attributes_11_0= ruleAttrClassConfig ) )*
+                    // InternalConfig.g:1058:4: ( (lv_attributes_11_0= ruleAttrClassConfig ) )*
                     loop17:
                     do {
                         int alt17=2;
@@ -2897,34 +2639,30 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
                         switch (alt17) {
                     	case 1 :
-                    	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1059:1: (lv_attributes_11_0= ruleAttrClassConfig )
+                    	    // InternalConfig.g:1059:1: (lv_attributes_11_0= ruleAttrClassConfig )
                     	    {
-                    	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1059:1: (lv_attributes_11_0= ruleAttrClassConfig )
-                    	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1060:3: lv_attributes_11_0= ruleAttrClassConfig
+                    	    // InternalConfig.g:1059:1: (lv_attributes_11_0= ruleAttrClassConfig )
+                    	    // InternalConfig.g:1060:3: lv_attributes_11_0= ruleAttrClassConfig
                     	    {
-                    	    if ( state.backtracking==0 ) {
-                    	       
-                    	      	        newCompositeNode(grammarAccess.getAttrClassConfigAccess().getAttributesAttrClassConfigParserRuleCall_3_1_2_0()); 
-                    	      	    
-                    	    }
-                    	    pushFollow(FOLLOW_ruleAttrClassConfig_in_ruleAttrClassConfig2420);
+                    	     
+                    	    	        newCompositeNode(grammarAccess.getAttrClassConfigAccess().getAttributesAttrClassConfigParserRuleCall_3_1_2_0()); 
+                    	    	    
+                    	    pushFollow(FOLLOW_15);
                     	    lv_attributes_11_0=ruleAttrClassConfig();
 
                     	    state._fsp--;
-                    	    if (state.failed) return current;
-                    	    if ( state.backtracking==0 ) {
-
-                    	      	        if (current==null) {
-                    	      	            current = createModelElementForParent(grammarAccess.getAttrClassConfigRule());
-                    	      	        }
-                    	             		add(
-                    	             			current, 
-                    	             			"attributes",
-                    	              		lv_attributes_11_0, 
-                    	              		"AttrClassConfig");
-                    	      	        afterParserOrEnumRuleCall();
-                    	      	    
-                    	    }
+
+
+                    	    	        if (current==null) {
+                    	    	            current = createModelElementForParent(grammarAccess.getAttrClassConfigRule());
+                    	    	        }
+                    	           		add(
+                    	           			current, 
+                    	           			"attributes",
+                    	            		lv_attributes_11_0, 
+                    	            		"org.eclipse.etrice.core.Config.AttrClassConfig");
+                    	    	        afterParserOrEnumRuleCall();
+                    	    	    
 
                     	    }
 
@@ -2940,12 +2678,10 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_12=(Token)match(input,14,FOLLOW_14_in_ruleAttrClassConfig2434); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    otherlv_12=(Token)match(input,14,FOLLOW_2); 
 
-                          	newLeafNode(otherlv_12, grammarAccess.getAttrClassConfigAccess().getRightCurlyBracketKeyword_3_2());
-                          
-                    }
+                        	newLeafNode(otherlv_12, grammarAccess.getAttrClassConfigAccess().getRightCurlyBracketKeyword_3_2());
+                        
 
                     }
                     break;
@@ -2958,9 +2694,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -2975,7 +2709,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleAttrInstanceConfig"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1088:1: entryRuleAttrInstanceConfig returns [EObject current=null] : iv_ruleAttrInstanceConfig= ruleAttrInstanceConfig EOF ;
+    // InternalConfig.g:1088:1: entryRuleAttrInstanceConfig returns [EObject current=null] : iv_ruleAttrInstanceConfig= ruleAttrInstanceConfig EOF ;
     public final EObject entryRuleAttrInstanceConfig() throws RecognitionException {
         EObject current = null;
 
@@ -2983,21 +2717,17 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1089:2: (iv_ruleAttrInstanceConfig= ruleAttrInstanceConfig EOF )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1090:2: iv_ruleAttrInstanceConfig= ruleAttrInstanceConfig EOF
+            // InternalConfig.g:1089:2: (iv_ruleAttrInstanceConfig= ruleAttrInstanceConfig EOF )
+            // InternalConfig.g:1090:2: iv_ruleAttrInstanceConfig= ruleAttrInstanceConfig EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getAttrInstanceConfigRule()); 
-            }
-            pushFollow(FOLLOW_ruleAttrInstanceConfig_in_entryRuleAttrInstanceConfig2472);
+             newCompositeNode(grammarAccess.getAttrInstanceConfigRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleAttrInstanceConfig=ruleAttrInstanceConfig();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleAttrInstanceConfig; 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAttrInstanceConfig2482); if (state.failed) return current;
+
+             current =iv_ruleAttrInstanceConfig; 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3015,7 +2745,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleAttrInstanceConfig"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1097:1: ruleAttrInstanceConfig returns [EObject current=null] : (otherlv_0= 'Attr' ( (otherlv_1= RULE_ID ) ) (otherlv_2= '=' ( (lv_value_3_0= ruleConfigValueArray ) ) )? (otherlv_4= '{' ( ( ( (lv_dynConfig_5_0= 'dynamic configuration' ) ) ( ( (lv_readOnly_6_0= 'read' ) ) | otherlv_7= 'write' ) )? ( (lv_attributes_8_0= ruleAttrInstanceConfig ) )* ) otherlv_9= '}' )? ) ;
+    // InternalConfig.g:1097:1: ruleAttrInstanceConfig returns [EObject current=null] : (otherlv_0= 'Attr' ( (otherlv_1= RULE_ID ) ) (otherlv_2= '=' ( (lv_value_3_0= ruleConfigValueArray ) ) )? (otherlv_4= '{' ( ( ( (lv_dynConfig_5_0= 'dynamic configuration' ) ) ( ( (lv_readOnly_6_0= 'read' ) ) | otherlv_7= 'write' ) )? ( (lv_attributes_8_0= ruleAttrInstanceConfig ) )* ) otherlv_9= '}' )? ) ;
     public final EObject ruleAttrInstanceConfig() throws RecognitionException {
         EObject current = null;
 
@@ -3035,44 +2765,38 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1100:28: ( (otherlv_0= 'Attr' ( (otherlv_1= RULE_ID ) ) (otherlv_2= '=' ( (lv_value_3_0= ruleConfigValueArray ) ) )? (otherlv_4= '{' ( ( ( (lv_dynConfig_5_0= 'dynamic configuration' ) ) ( ( (lv_readOnly_6_0= 'read' ) ) | otherlv_7= 'write' ) )? ( (lv_attributes_8_0= ruleAttrInstanceConfig ) )* ) otherlv_9= '}' )? ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1101:1: (otherlv_0= 'Attr' ( (otherlv_1= RULE_ID ) ) (otherlv_2= '=' ( (lv_value_3_0= ruleConfigValueArray ) ) )? (otherlv_4= '{' ( ( ( (lv_dynConfig_5_0= 'dynamic configuration' ) ) ( ( (lv_readOnly_6_0= 'read' ) ) | otherlv_7= 'write' ) )? ( (lv_attributes_8_0= ruleAttrInstanceConfig ) )* ) otherlv_9= '}' )? )
+            // InternalConfig.g:1100:28: ( (otherlv_0= 'Attr' ( (otherlv_1= RULE_ID ) ) (otherlv_2= '=' ( (lv_value_3_0= ruleConfigValueArray ) ) )? (otherlv_4= '{' ( ( ( (lv_dynConfig_5_0= 'dynamic configuration' ) ) ( ( (lv_readOnly_6_0= 'read' ) ) | otherlv_7= 'write' ) )? ( (lv_attributes_8_0= ruleAttrInstanceConfig ) )* ) otherlv_9= '}' )? ) )
+            // InternalConfig.g:1101:1: (otherlv_0= 'Attr' ( (otherlv_1= RULE_ID ) ) (otherlv_2= '=' ( (lv_value_3_0= ruleConfigValueArray ) ) )? (otherlv_4= '{' ( ( ( (lv_dynConfig_5_0= 'dynamic configuration' ) ) ( ( (lv_readOnly_6_0= 'read' ) ) | otherlv_7= 'write' ) )? ( (lv_attributes_8_0= ruleAttrInstanceConfig ) )* ) otherlv_9= '}' )? )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1101:1: (otherlv_0= 'Attr' ( (otherlv_1= RULE_ID ) ) (otherlv_2= '=' ( (lv_value_3_0= ruleConfigValueArray ) ) )? (otherlv_4= '{' ( ( ( (lv_dynConfig_5_0= 'dynamic configuration' ) ) ( ( (lv_readOnly_6_0= 'read' ) ) | otherlv_7= 'write' ) )? ( (lv_attributes_8_0= ruleAttrInstanceConfig ) )* ) otherlv_9= '}' )? )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1101:3: otherlv_0= 'Attr' ( (otherlv_1= RULE_ID ) ) (otherlv_2= '=' ( (lv_value_3_0= ruleConfigValueArray ) ) )? (otherlv_4= '{' ( ( ( (lv_dynConfig_5_0= 'dynamic configuration' ) ) ( ( (lv_readOnly_6_0= 'read' ) ) | otherlv_7= 'write' ) )? ( (lv_attributes_8_0= ruleAttrInstanceConfig ) )* ) otherlv_9= '}' )?
+            // InternalConfig.g:1101:1: (otherlv_0= 'Attr' ( (otherlv_1= RULE_ID ) ) (otherlv_2= '=' ( (lv_value_3_0= ruleConfigValueArray ) ) )? (otherlv_4= '{' ( ( ( (lv_dynConfig_5_0= 'dynamic configuration' ) ) ( ( (lv_readOnly_6_0= 'read' ) ) | otherlv_7= 'write' ) )? ( (lv_attributes_8_0= ruleAttrInstanceConfig ) )* ) otherlv_9= '}' )? )
+            // InternalConfig.g:1101:3: otherlv_0= 'Attr' ( (otherlv_1= RULE_ID ) ) (otherlv_2= '=' ( (lv_value_3_0= ruleConfigValueArray ) ) )? (otherlv_4= '{' ( ( ( (lv_dynConfig_5_0= 'dynamic configuration' ) ) ( ( (lv_readOnly_6_0= 'read' ) ) | otherlv_7= 'write' ) )? ( (lv_attributes_8_0= ruleAttrInstanceConfig ) )* ) otherlv_9= '}' )?
             {
-            otherlv_0=(Token)match(input,30,FOLLOW_30_in_ruleAttrInstanceConfig2519); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_0=(Token)match(input,30,FOLLOW_3); 
 
-                  	newLeafNode(otherlv_0, grammarAccess.getAttrInstanceConfigAccess().getAttrKeyword_0());
-                  
-            }
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1105:1: ( (otherlv_1= RULE_ID ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1106:1: (otherlv_1= RULE_ID )
+                	newLeafNode(otherlv_0, grammarAccess.getAttrInstanceConfigAccess().getAttrKeyword_0());
+                
+            // InternalConfig.g:1105:1: ( (otherlv_1= RULE_ID ) )
+            // InternalConfig.g:1106:1: (otherlv_1= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1106:1: (otherlv_1= RULE_ID )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1107:3: otherlv_1= RULE_ID
+            // InternalConfig.g:1106:1: (otherlv_1= RULE_ID )
+            // InternalConfig.g:1107:3: otherlv_1= RULE_ID
             {
-            if ( state.backtracking==0 ) {
 
-              			if (current==null) {
-              	            current = createModelElement(grammarAccess.getAttrInstanceConfigRule());
-              	        }
-                      
-            }
-            otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleAttrInstanceConfig2539); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            			if (current==null) {
+            	            current = createModelElement(grammarAccess.getAttrInstanceConfigRule());
+            	        }
+                    
+            otherlv_1=(Token)match(input,RULE_ID,FOLLOW_19); 
 
-              		newLeafNode(otherlv_1, grammarAccess.getAttrInstanceConfigAccess().getAttributeAttributeCrossReference_1_0()); 
-              	
-            }
+            		newLeafNode(otherlv_1, grammarAccess.getAttrInstanceConfigAccess().getAttributeAttributeCrossReference_1_0()); 
+            	
 
             }
 
 
             }
 
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1118:2: (otherlv_2= '=' ( (lv_value_3_0= ruleConfigValueArray ) ) )?
+            // InternalConfig.g:1118:2: (otherlv_2= '=' ( (lv_value_3_0= ruleConfigValueArray ) ) )?
             int alt19=2;
             int LA19_0 = input.LA(1);
 
@@ -3081,43 +2805,37 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
             }
             switch (alt19) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1118:4: otherlv_2= '=' ( (lv_value_3_0= ruleConfigValueArray ) )
+                    // InternalConfig.g:1118:4: otherlv_2= '=' ( (lv_value_3_0= ruleConfigValueArray ) )
                     {
-                    otherlv_2=(Token)match(input,31,FOLLOW_31_in_ruleAttrInstanceConfig2552); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    otherlv_2=(Token)match(input,31,FOLLOW_20); 
 
-                          	newLeafNode(otherlv_2, grammarAccess.getAttrInstanceConfigAccess().getEqualsSignKeyword_2_0());
-                          
-                    }
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1122:1: ( (lv_value_3_0= ruleConfigValueArray ) )
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1123:1: (lv_value_3_0= ruleConfigValueArray )
+                        	newLeafNode(otherlv_2, grammarAccess.getAttrInstanceConfigAccess().getEqualsSignKeyword_2_0());
+                        
+                    // InternalConfig.g:1122:1: ( (lv_value_3_0= ruleConfigValueArray ) )
+                    // InternalConfig.g:1123:1: (lv_value_3_0= ruleConfigValueArray )
                     {
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1123:1: (lv_value_3_0= ruleConfigValueArray )
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1124:3: lv_value_3_0= ruleConfigValueArray
+                    // InternalConfig.g:1123:1: (lv_value_3_0= ruleConfigValueArray )
+                    // InternalConfig.g:1124:3: lv_value_3_0= ruleConfigValueArray
                     {
-                    if ( state.backtracking==0 ) {
-                       
-                      	        newCompositeNode(grammarAccess.getAttrInstanceConfigAccess().getValueConfigValueArrayParserRuleCall_2_1_0()); 
-                      	    
-                    }
-                    pushFollow(FOLLOW_ruleConfigValueArray_in_ruleAttrInstanceConfig2573);
+                     
+                    	        newCompositeNode(grammarAccess.getAttrInstanceConfigAccess().getValueConfigValueArrayParserRuleCall_2_1_0()); 
+                    	    
+                    pushFollow(FOLLOW_21);
                     lv_value_3_0=ruleConfigValueArray();
 
                     state._fsp--;
-                    if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
-
-                      	        if (current==null) {
-                      	            current = createModelElementForParent(grammarAccess.getAttrInstanceConfigRule());
-                      	        }
-                             		set(
-                             			current, 
-                             			"value",
-                              		lv_value_3_0, 
-                              		"ConfigValueArray");
-                      	        afterParserOrEnumRuleCall();
-                      	    
-                    }
+
+
+                    	        if (current==null) {
+                    	            current = createModelElementForParent(grammarAccess.getAttrInstanceConfigRule());
+                    	        }
+                           		set(
+                           			current, 
+                           			"value",
+                            		lv_value_3_0, 
+                            		"org.eclipse.etrice.core.Config.ConfigValueArray");
+                    	        afterParserOrEnumRuleCall();
+                    	    
 
                     }
 
@@ -3130,7 +2848,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1140:4: (otherlv_4= '{' ( ( ( (lv_dynConfig_5_0= 'dynamic configuration' ) ) ( ( (lv_readOnly_6_0= 'read' ) ) | otherlv_7= 'write' ) )? ( (lv_attributes_8_0= ruleAttrInstanceConfig ) )* ) otherlv_9= '}' )?
+            // InternalConfig.g:1140:4: (otherlv_4= '{' ( ( ( (lv_dynConfig_5_0= 'dynamic configuration' ) ) ( ( (lv_readOnly_6_0= 'read' ) ) | otherlv_7= 'write' ) )? ( (lv_attributes_8_0= ruleAttrInstanceConfig ) )* ) otherlv_9= '}' )?
             int alt23=2;
             int LA23_0 = input.LA(1);
 
@@ -3139,18 +2857,16 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
             }
             switch (alt23) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1140:6: otherlv_4= '{' ( ( ( (lv_dynConfig_5_0= 'dynamic configuration' ) ) ( ( (lv_readOnly_6_0= 'read' ) ) | otherlv_7= 'write' ) )? ( (lv_attributes_8_0= ruleAttrInstanceConfig ) )* ) otherlv_9= '}'
+                    // InternalConfig.g:1140:6: otherlv_4= '{' ( ( ( (lv_dynConfig_5_0= 'dynamic configuration' ) ) ( ( (lv_readOnly_6_0= 'read' ) ) | otherlv_7= 'write' ) )? ( (lv_attributes_8_0= ruleAttrInstanceConfig ) )* ) otherlv_9= '}'
                     {
-                    otherlv_4=(Token)match(input,13,FOLLOW_13_in_ruleAttrInstanceConfig2588); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    otherlv_4=(Token)match(input,13,FOLLOW_26); 
 
-                          	newLeafNode(otherlv_4, grammarAccess.getAttrInstanceConfigAccess().getLeftCurlyBracketKeyword_3_0());
-                          
-                    }
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1144:1: ( ( ( (lv_dynConfig_5_0= 'dynamic configuration' ) ) ( ( (lv_readOnly_6_0= 'read' ) ) | otherlv_7= 'write' ) )? ( (lv_attributes_8_0= ruleAttrInstanceConfig ) )* )
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1144:2: ( ( (lv_dynConfig_5_0= 'dynamic configuration' ) ) ( ( (lv_readOnly_6_0= 'read' ) ) | otherlv_7= 'write' ) )? ( (lv_attributes_8_0= ruleAttrInstanceConfig ) )*
+                        	newLeafNode(otherlv_4, grammarAccess.getAttrInstanceConfigAccess().getLeftCurlyBracketKeyword_3_0());
+                        
+                    // InternalConfig.g:1144:1: ( ( ( (lv_dynConfig_5_0= 'dynamic configuration' ) ) ( ( (lv_readOnly_6_0= 'read' ) ) | otherlv_7= 'write' ) )? ( (lv_attributes_8_0= ruleAttrInstanceConfig ) )* )
+                    // InternalConfig.g:1144:2: ( ( (lv_dynConfig_5_0= 'dynamic configuration' ) ) ( ( (lv_readOnly_6_0= 'read' ) ) | otherlv_7= 'write' ) )? ( (lv_attributes_8_0= ruleAttrInstanceConfig ) )*
                     {
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1144:2: ( ( (lv_dynConfig_5_0= 'dynamic configuration' ) ) ( ( (lv_readOnly_6_0= 'read' ) ) | otherlv_7= 'write' ) )?
+                    // InternalConfig.g:1144:2: ( ( (lv_dynConfig_5_0= 'dynamic configuration' ) ) ( ( (lv_readOnly_6_0= 'read' ) ) | otherlv_7= 'write' ) )?
                     int alt21=2;
                     int LA21_0 = input.LA(1);
 
@@ -3159,35 +2875,31 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                     }
                     switch (alt21) {
                         case 1 :
-                            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1144:3: ( (lv_dynConfig_5_0= 'dynamic configuration' ) ) ( ( (lv_readOnly_6_0= 'read' ) ) | otherlv_7= 'write' )
+                            // InternalConfig.g:1144:3: ( (lv_dynConfig_5_0= 'dynamic configuration' ) ) ( ( (lv_readOnly_6_0= 'read' ) ) | otherlv_7= 'write' )
                             {
-                            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1144:3: ( (lv_dynConfig_5_0= 'dynamic configuration' ) )
-                            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1145:1: (lv_dynConfig_5_0= 'dynamic configuration' )
+                            // InternalConfig.g:1144:3: ( (lv_dynConfig_5_0= 'dynamic configuration' ) )
+                            // InternalConfig.g:1145:1: (lv_dynConfig_5_0= 'dynamic configuration' )
                             {
-                            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1145:1: (lv_dynConfig_5_0= 'dynamic configuration' )
-                            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1146:3: lv_dynConfig_5_0= 'dynamic configuration'
+                            // InternalConfig.g:1145:1: (lv_dynConfig_5_0= 'dynamic configuration' )
+                            // InternalConfig.g:1146:3: lv_dynConfig_5_0= 'dynamic configuration'
                             {
-                            lv_dynConfig_5_0=(Token)match(input,17,FOLLOW_17_in_ruleAttrInstanceConfig2608); if (state.failed) return current;
-                            if ( state.backtracking==0 ) {
+                            lv_dynConfig_5_0=(Token)match(input,17,FOLLOW_27); 
 
-                                      newLeafNode(lv_dynConfig_5_0, grammarAccess.getAttrInstanceConfigAccess().getDynConfigDynamicConfigurationKeyword_3_1_0_0_0());
-                                  
-                            }
-                            if ( state.backtracking==0 ) {
+                                    newLeafNode(lv_dynConfig_5_0, grammarAccess.getAttrInstanceConfigAccess().getDynConfigDynamicConfigurationKeyword_3_1_0_0_0());
+                                
 
-                              	        if (current==null) {
-                              	            current = createModelElement(grammarAccess.getAttrInstanceConfigRule());
-                              	        }
-                                     		setWithLastConsumed(current, "dynConfig", true, "dynamic configuration");
-                              	    
-                            }
+                            	        if (current==null) {
+                            	            current = createModelElement(grammarAccess.getAttrInstanceConfigRule());
+                            	        }
+                                   		setWithLastConsumed(current, "dynConfig", true, "dynamic configuration");
+                            	    
 
                             }
 
 
                             }
 
-                            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1159:2: ( ( (lv_readOnly_6_0= 'read' ) ) | otherlv_7= 'write' )
+                            // InternalConfig.g:1159:2: ( ( (lv_readOnly_6_0= 'read' ) ) | otherlv_7= 'write' )
                             int alt20=2;
                             int LA20_0 = input.LA(1);
 
@@ -3198,7 +2910,6 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                                 alt20=2;
                             }
                             else {
-                                if (state.backtracking>0) {state.failed=true; return current;}
                                 NoViableAltException nvae =
                                     new NoViableAltException("", 20, 0, input);
 
@@ -3206,28 +2917,24 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                             }
                             switch (alt20) {
                                 case 1 :
-                                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1159:3: ( (lv_readOnly_6_0= 'read' ) )
+                                    // InternalConfig.g:1159:3: ( (lv_readOnly_6_0= 'read' ) )
                                     {
-                                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1159:3: ( (lv_readOnly_6_0= 'read' ) )
-                                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1160:1: (lv_readOnly_6_0= 'read' )
+                                    // InternalConfig.g:1159:3: ( (lv_readOnly_6_0= 'read' ) )
+                                    // InternalConfig.g:1160:1: (lv_readOnly_6_0= 'read' )
                                     {
-                                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1160:1: (lv_readOnly_6_0= 'read' )
-                                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1161:3: lv_readOnly_6_0= 'read'
+                                    // InternalConfig.g:1160:1: (lv_readOnly_6_0= 'read' )
+                                    // InternalConfig.g:1161:3: lv_readOnly_6_0= 'read'
                                     {
-                                    lv_readOnly_6_0=(Token)match(input,34,FOLLOW_34_in_ruleAttrInstanceConfig2640); if (state.failed) return current;
-                                    if ( state.backtracking==0 ) {
+                                    lv_readOnly_6_0=(Token)match(input,34,FOLLOW_15); 
 
-                                              newLeafNode(lv_readOnly_6_0, grammarAccess.getAttrInstanceConfigAccess().getReadOnlyReadKeyword_3_1_0_1_0_0());
-                                          
-                                    }
-                                    if ( state.backtracking==0 ) {
+                                            newLeafNode(lv_readOnly_6_0, grammarAccess.getAttrInstanceConfigAccess().getReadOnlyReadKeyword_3_1_0_1_0_0());
+                                        
 
-                                      	        if (current==null) {
-                                      	            current = createModelElement(grammarAccess.getAttrInstanceConfigRule());
-                                      	        }
-                                             		setWithLastConsumed(current, "readOnly", true, "read");
-                                      	    
-                                    }
+                                    	        if (current==null) {
+                                    	            current = createModelElement(grammarAccess.getAttrInstanceConfigRule());
+                                    	        }
+                                           		setWithLastConsumed(current, "readOnly", true, "read");
+                                    	    
 
                                     }
 
@@ -3238,14 +2945,12 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                                     }
                                     break;
                                 case 2 :
-                                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1175:7: otherlv_7= 'write'
+                                    // InternalConfig.g:1175:7: otherlv_7= 'write'
                                     {
-                                    otherlv_7=(Token)match(input,35,FOLLOW_35_in_ruleAttrInstanceConfig2671); if (state.failed) return current;
-                                    if ( state.backtracking==0 ) {
+                                    otherlv_7=(Token)match(input,35,FOLLOW_15); 
 
-                                          	newLeafNode(otherlv_7, grammarAccess.getAttrInstanceConfigAccess().getWriteKeyword_3_1_0_1_1());
-                                          
-                                    }
+                                        	newLeafNode(otherlv_7, grammarAccess.getAttrInstanceConfigAccess().getWriteKeyword_3_1_0_1_1());
+                                        
 
                                     }
                                     break;
@@ -3258,7 +2963,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1179:4: ( (lv_attributes_8_0= ruleAttrInstanceConfig ) )*
+                    // InternalConfig.g:1179:4: ( (lv_attributes_8_0= ruleAttrInstanceConfig ) )*
                     loop22:
                     do {
                         int alt22=2;
@@ -3271,34 +2976,30 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
                         switch (alt22) {
                     	case 1 :
-                    	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1180:1: (lv_attributes_8_0= ruleAttrInstanceConfig )
+                    	    // InternalConfig.g:1180:1: (lv_attributes_8_0= ruleAttrInstanceConfig )
                     	    {
-                    	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1180:1: (lv_attributes_8_0= ruleAttrInstanceConfig )
-                    	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1181:3: lv_attributes_8_0= ruleAttrInstanceConfig
+                    	    // InternalConfig.g:1180:1: (lv_attributes_8_0= ruleAttrInstanceConfig )
+                    	    // InternalConfig.g:1181:3: lv_attributes_8_0= ruleAttrInstanceConfig
                     	    {
-                    	    if ( state.backtracking==0 ) {
-                    	       
-                    	      	        newCompositeNode(grammarAccess.getAttrInstanceConfigAccess().getAttributesAttrInstanceConfigParserRuleCall_3_1_1_0()); 
-                    	      	    
-                    	    }
-                    	    pushFollow(FOLLOW_ruleAttrInstanceConfig_in_ruleAttrInstanceConfig2695);
+                    	     
+                    	    	        newCompositeNode(grammarAccess.getAttrInstanceConfigAccess().getAttributesAttrInstanceConfigParserRuleCall_3_1_1_0()); 
+                    	    	    
+                    	    pushFollow(FOLLOW_15);
                     	    lv_attributes_8_0=ruleAttrInstanceConfig();
 
                     	    state._fsp--;
-                    	    if (state.failed) return current;
-                    	    if ( state.backtracking==0 ) {
-
-                    	      	        if (current==null) {
-                    	      	            current = createModelElementForParent(grammarAccess.getAttrInstanceConfigRule());
-                    	      	        }
-                    	             		add(
-                    	             			current, 
-                    	             			"attributes",
-                    	              		lv_attributes_8_0, 
-                    	              		"AttrInstanceConfig");
-                    	      	        afterParserOrEnumRuleCall();
-                    	      	    
-                    	    }
+
+
+                    	    	        if (current==null) {
+                    	    	            current = createModelElementForParent(grammarAccess.getAttrInstanceConfigRule());
+                    	    	        }
+                    	           		add(
+                    	           			current, 
+                    	           			"attributes",
+                    	            		lv_attributes_8_0, 
+                    	            		"org.eclipse.etrice.core.Config.AttrInstanceConfig");
+                    	    	        afterParserOrEnumRuleCall();
+                    	    	    
 
                     	    }
 
@@ -3314,12 +3015,10 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_9=(Token)match(input,14,FOLLOW_14_in_ruleAttrInstanceConfig2709); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    otherlv_9=(Token)match(input,14,FOLLOW_2); 
 
-                          	newLeafNode(otherlv_9, grammarAccess.getAttrInstanceConfigAccess().getRightCurlyBracketKeyword_3_2());
-                          
-                    }
+                        	newLeafNode(otherlv_9, grammarAccess.getAttrInstanceConfigAccess().getRightCurlyBracketKeyword_3_2());
+                        
 
                     }
                     break;
@@ -3332,9 +3031,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -3349,7 +3046,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleConfigValueArray"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1209:1: entryRuleConfigValueArray returns [EObject current=null] : iv_ruleConfigValueArray= ruleConfigValueArray EOF ;
+    // InternalConfig.g:1209:1: entryRuleConfigValueArray returns [EObject current=null] : iv_ruleConfigValueArray= ruleConfigValueArray EOF ;
     public final EObject entryRuleConfigValueArray() throws RecognitionException {
         EObject current = null;
 
@@ -3357,21 +3054,17 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1210:2: (iv_ruleConfigValueArray= ruleConfigValueArray EOF )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1211:2: iv_ruleConfigValueArray= ruleConfigValueArray EOF
+            // InternalConfig.g:1210:2: (iv_ruleConfigValueArray= ruleConfigValueArray EOF )
+            // InternalConfig.g:1211:2: iv_ruleConfigValueArray= ruleConfigValueArray EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getConfigValueArrayRule()); 
-            }
-            pushFollow(FOLLOW_ruleConfigValueArray_in_entryRuleConfigValueArray2747);
+             newCompositeNode(grammarAccess.getConfigValueArrayRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleConfigValueArray=ruleConfigValueArray();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleConfigValueArray; 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleConfigValueArray2757); if (state.failed) return current;
+
+             current =iv_ruleConfigValueArray; 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3389,7 +3082,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleConfigValueArray"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1218:1: ruleConfigValueArray returns [EObject current=null] : ( ( (lv_values_0_0= ruleConfigValue ) ) (otherlv_1= ',' ( (lv_values_2_0= ruleConfigValue ) ) )* ) ;
+    // InternalConfig.g:1218:1: ruleConfigValueArray returns [EObject current=null] : ( ( (lv_values_0_0= ruleConfigValue ) ) (otherlv_1= ',' ( (lv_values_2_0= ruleConfigValue ) ) )* ) ;
     public final EObject ruleConfigValueArray() throws RecognitionException {
         EObject current = null;
 
@@ -3402,48 +3095,44 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1221:28: ( ( ( (lv_values_0_0= ruleConfigValue ) ) (otherlv_1= ',' ( (lv_values_2_0= ruleConfigValue ) ) )* ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1222:1: ( ( (lv_values_0_0= ruleConfigValue ) ) (otherlv_1= ',' ( (lv_values_2_0= ruleConfigValue ) ) )* )
+            // InternalConfig.g:1221:28: ( ( ( (lv_values_0_0= ruleConfigValue ) ) (otherlv_1= ',' ( (lv_values_2_0= ruleConfigValue ) ) )* ) )
+            // InternalConfig.g:1222:1: ( ( (lv_values_0_0= ruleConfigValue ) ) (otherlv_1= ',' ( (lv_values_2_0= ruleConfigValue ) ) )* )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1222:1: ( ( (lv_values_0_0= ruleConfigValue ) ) (otherlv_1= ',' ( (lv_values_2_0= ruleConfigValue ) ) )* )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1222:2: ( (lv_values_0_0= ruleConfigValue ) ) (otherlv_1= ',' ( (lv_values_2_0= ruleConfigValue ) ) )*
+            // InternalConfig.g:1222:1: ( ( (lv_values_0_0= ruleConfigValue ) ) (otherlv_1= ',' ( (lv_values_2_0= ruleConfigValue ) ) )* )
+            // InternalConfig.g:1222:2: ( (lv_values_0_0= ruleConfigValue ) ) (otherlv_1= ',' ( (lv_values_2_0= ruleConfigValue ) ) )*
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1222:2: ( (lv_values_0_0= ruleConfigValue ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1223:1: (lv_values_0_0= ruleConfigValue )
+            // InternalConfig.g:1222:2: ( (lv_values_0_0= ruleConfigValue ) )
+            // InternalConfig.g:1223:1: (lv_values_0_0= ruleConfigValue )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1223:1: (lv_values_0_0= ruleConfigValue )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1224:3: lv_values_0_0= ruleConfigValue
+            // InternalConfig.g:1223:1: (lv_values_0_0= ruleConfigValue )
+            // InternalConfig.g:1224:3: lv_values_0_0= ruleConfigValue
             {
-            if ( state.backtracking==0 ) {
-               
-              	        newCompositeNode(grammarAccess.getConfigValueArrayAccess().getValuesConfigValueParserRuleCall_0_0()); 
-              	    
-            }
-            pushFollow(FOLLOW_ruleConfigValue_in_ruleConfigValueArray2803);
+             
+            	        newCompositeNode(grammarAccess.getConfigValueArrayAccess().getValuesConfigValueParserRuleCall_0_0()); 
+            	    
+            pushFollow(FOLLOW_28);
             lv_values_0_0=ruleConfigValue();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
 
-              	        if (current==null) {
-              	            current = createModelElementForParent(grammarAccess.getConfigValueArrayRule());
-              	        }
-                     		add(
-                     			current, 
-                     			"values",
-                      		lv_values_0_0, 
-                      		"ConfigValue");
-              	        afterParserOrEnumRuleCall();
-              	    
-            }
+
+            	        if (current==null) {
+            	            current = createModelElementForParent(grammarAccess.getConfigValueArrayRule());
+            	        }
+                   		add(
+                   			current, 
+                   			"values",
+                    		lv_values_0_0, 
+                    		"org.eclipse.etrice.core.Config.ConfigValue");
+            	        afterParserOrEnumRuleCall();
+            	    
 
             }
 
 
             }
 
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1240:2: (otherlv_1= ',' ( (lv_values_2_0= ruleConfigValue ) ) )*
+            // InternalConfig.g:1240:2: (otherlv_1= ',' ( (lv_values_2_0= ruleConfigValue ) ) )*
             loop24:
             do {
                 int alt24=2;
@@ -3456,43 +3145,37 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
                 switch (alt24) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1240:4: otherlv_1= ',' ( (lv_values_2_0= ruleConfigValue ) )
+            	    // InternalConfig.g:1240:4: otherlv_1= ',' ( (lv_values_2_0= ruleConfigValue ) )
             	    {
-            	    otherlv_1=(Token)match(input,36,FOLLOW_36_in_ruleConfigValueArray2816); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
+            	    otherlv_1=(Token)match(input,36,FOLLOW_20); 
 
-            	          	newLeafNode(otherlv_1, grammarAccess.getConfigValueArrayAccess().getCommaKeyword_1_0());
-            	          
-            	    }
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1244:1: ( (lv_values_2_0= ruleConfigValue ) )
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1245:1: (lv_values_2_0= ruleConfigValue )
+            	        	newLeafNode(otherlv_1, grammarAccess.getConfigValueArrayAccess().getCommaKeyword_1_0());
+            	        
+            	    // InternalConfig.g:1244:1: ( (lv_values_2_0= ruleConfigValue ) )
+            	    // InternalConfig.g:1245:1: (lv_values_2_0= ruleConfigValue )
             	    {
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1245:1: (lv_values_2_0= ruleConfigValue )
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1246:3: lv_values_2_0= ruleConfigValue
+            	    // InternalConfig.g:1245:1: (lv_values_2_0= ruleConfigValue )
+            	    // InternalConfig.g:1246:3: lv_values_2_0= ruleConfigValue
             	    {
-            	    if ( state.backtracking==0 ) {
-            	       
-            	      	        newCompositeNode(grammarAccess.getConfigValueArrayAccess().getValuesConfigValueParserRuleCall_1_1_0()); 
-            	      	    
-            	    }
-            	    pushFollow(FOLLOW_ruleConfigValue_in_ruleConfigValueArray2837);
+            	     
+            	    	        newCompositeNode(grammarAccess.getConfigValueArrayAccess().getValuesConfigValueParserRuleCall_1_1_0()); 
+            	    	    
+            	    pushFollow(FOLLOW_28);
             	    lv_values_2_0=ruleConfigValue();
 
             	    state._fsp--;
-            	    if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
-
-            	      	        if (current==null) {
-            	      	            current = createModelElementForParent(grammarAccess.getConfigValueArrayRule());
-            	      	        }
-            	             		add(
-            	             			current, 
-            	             			"values",
-            	              		lv_values_2_0, 
-            	              		"ConfigValue");
-            	      	        afterParserOrEnumRuleCall();
-            	      	    
-            	    }
+
+
+            	    	        if (current==null) {
+            	    	            current = createModelElementForParent(grammarAccess.getConfigValueArrayRule());
+            	    	        }
+            	           		add(
+            	           			current, 
+            	           			"values",
+            	            		lv_values_2_0, 
+            	            		"org.eclipse.etrice.core.Config.ConfigValue");
+            	    	        afterParserOrEnumRuleCall();
+            	    	    
 
             	    }
 
@@ -3514,9 +3197,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -3531,7 +3212,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleConfigValue"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1270:1: entryRuleConfigValue returns [EObject current=null] : iv_ruleConfigValue= ruleConfigValue EOF ;
+    // InternalConfig.g:1270:1: entryRuleConfigValue returns [EObject current=null] : iv_ruleConfigValue= ruleConfigValue EOF ;
     public final EObject entryRuleConfigValue() throws RecognitionException {
         EObject current = null;
 
@@ -3539,21 +3220,17 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1271:2: (iv_ruleConfigValue= ruleConfigValue EOF )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1272:2: iv_ruleConfigValue= ruleConfigValue EOF
+            // InternalConfig.g:1271:2: (iv_ruleConfigValue= ruleConfigValue EOF )
+            // InternalConfig.g:1272:2: iv_ruleConfigValue= ruleConfigValue EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getConfigValueRule()); 
-            }
-            pushFollow(FOLLOW_ruleConfigValue_in_entryRuleConfigValue2875);
+             newCompositeNode(grammarAccess.getConfigValueRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleConfigValue=ruleConfigValue();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleConfigValue; 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleConfigValue2885); if (state.failed) return current;
+
+             current =iv_ruleConfigValue; 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3571,7 +3248,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleConfigValue"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1279:1: ruleConfigValue returns [EObject current=null] : (this_LiteralConfigValue_0= ruleLiteralConfigValue | this_EnumConfigValue_1= ruleEnumConfigValue ) ;
+    // InternalConfig.g:1279:1: ruleConfigValue returns [EObject current=null] : (this_LiteralConfigValue_0= ruleLiteralConfigValue | this_EnumConfigValue_1= ruleEnumConfigValue ) ;
     public final EObject ruleConfigValue() throws RecognitionException {
         EObject current = null;
 
@@ -3583,10 +3260,10 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1282:28: ( (this_LiteralConfigValue_0= ruleLiteralConfigValue | this_EnumConfigValue_1= ruleEnumConfigValue ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1283:1: (this_LiteralConfigValue_0= ruleLiteralConfigValue | this_EnumConfigValue_1= ruleEnumConfigValue )
+            // InternalConfig.g:1282:28: ( (this_LiteralConfigValue_0= ruleLiteralConfigValue | this_EnumConfigValue_1= ruleEnumConfigValue ) )
+            // InternalConfig.g:1283:1: (this_LiteralConfigValue_0= ruleLiteralConfigValue | this_EnumConfigValue_1= ruleEnumConfigValue )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1283:1: (this_LiteralConfigValue_0= ruleLiteralConfigValue | this_EnumConfigValue_1= ruleEnumConfigValue )
+            // InternalConfig.g:1283:1: (this_LiteralConfigValue_0= ruleLiteralConfigValue | this_EnumConfigValue_1= ruleEnumConfigValue )
             int alt25=2;
             int LA25_0 = input.LA(1);
 
@@ -3597,7 +3274,6 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                 alt25=2;
             }
             else {
-                if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
                     new NoViableAltException("", 25, 0, input);
 
@@ -3605,46 +3281,38 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
             }
             switch (alt25) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1284:5: this_LiteralConfigValue_0= ruleLiteralConfigValue
+                    // InternalConfig.g:1284:5: this_LiteralConfigValue_0= ruleLiteralConfigValue
                     {
-                    if ( state.backtracking==0 ) {
-                       
-                              newCompositeNode(grammarAccess.getConfigValueAccess().getLiteralConfigValueParserRuleCall_0()); 
-                          
-                    }
-                    pushFollow(FOLLOW_ruleLiteralConfigValue_in_ruleConfigValue2932);
+                     
+                            newCompositeNode(grammarAccess.getConfigValueAccess().getLiteralConfigValueParserRuleCall_0()); 
+                        
+                    pushFollow(FOLLOW_2);
                     this_LiteralConfigValue_0=ruleLiteralConfigValue();
 
                     state._fsp--;
-                    if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
-                       
-                              current = this_LiteralConfigValue_0; 
-                              afterParserOrEnumRuleCall();
-                          
-                    }
+
+                     
+                            current = this_LiteralConfigValue_0; 
+                            afterParserOrEnumRuleCall();
+                        
 
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1294:5: this_EnumConfigValue_1= ruleEnumConfigValue
+                    // InternalConfig.g:1294:5: this_EnumConfigValue_1= ruleEnumConfigValue
                     {
-                    if ( state.backtracking==0 ) {
-                       
-                              newCompositeNode(grammarAccess.getConfigValueAccess().getEnumConfigValueParserRuleCall_1()); 
-                          
-                    }
-                    pushFollow(FOLLOW_ruleEnumConfigValue_in_ruleConfigValue2959);
+                     
+                            newCompositeNode(grammarAccess.getConfigValueAccess().getEnumConfigValueParserRuleCall_1()); 
+                        
+                    pushFollow(FOLLOW_2);
                     this_EnumConfigValue_1=ruleEnumConfigValue();
 
                     state._fsp--;
-                    if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
-                       
-                              current = this_EnumConfigValue_1; 
-                              afterParserOrEnumRuleCall();
-                          
-                    }
+
+                     
+                            current = this_EnumConfigValue_1; 
+                            afterParserOrEnumRuleCall();
+                        
 
                     }
                     break;
@@ -3654,9 +3322,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -3671,7 +3337,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleLiteralConfigValue"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1310:1: entryRuleLiteralConfigValue returns [EObject current=null] : iv_ruleLiteralConfigValue= ruleLiteralConfigValue EOF ;
+    // InternalConfig.g:1310:1: entryRuleLiteralConfigValue returns [EObject current=null] : iv_ruleLiteralConfigValue= ruleLiteralConfigValue EOF ;
     public final EObject entryRuleLiteralConfigValue() throws RecognitionException {
         EObject current = null;
 
@@ -3679,21 +3345,17 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1311:2: (iv_ruleLiteralConfigValue= ruleLiteralConfigValue EOF )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1312:2: iv_ruleLiteralConfigValue= ruleLiteralConfigValue EOF
+            // InternalConfig.g:1311:2: (iv_ruleLiteralConfigValue= ruleLiteralConfigValue EOF )
+            // InternalConfig.g:1312:2: iv_ruleLiteralConfigValue= ruleLiteralConfigValue EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getLiteralConfigValueRule()); 
-            }
-            pushFollow(FOLLOW_ruleLiteralConfigValue_in_entryRuleLiteralConfigValue2994);
+             newCompositeNode(grammarAccess.getLiteralConfigValueRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleLiteralConfigValue=ruleLiteralConfigValue();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleLiteralConfigValue; 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleLiteralConfigValue3004); if (state.failed) return current;
+
+             current =iv_ruleLiteralConfigValue; 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3711,7 +3373,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleLiteralConfigValue"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1319:1: ruleLiteralConfigValue returns [EObject current=null] : ( (lv_value_0_0= ruleLiteral ) ) ;
+    // InternalConfig.g:1319:1: ruleLiteralConfigValue returns [EObject current=null] : ( (lv_value_0_0= ruleLiteral ) ) ;
     public final EObject ruleLiteralConfigValue() throws RecognitionException {
         EObject current = null;
 
@@ -3721,38 +3383,34 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1322:28: ( ( (lv_value_0_0= ruleLiteral ) ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1323:1: ( (lv_value_0_0= ruleLiteral ) )
+            // InternalConfig.g:1322:28: ( ( (lv_value_0_0= ruleLiteral ) ) )
+            // InternalConfig.g:1323:1: ( (lv_value_0_0= ruleLiteral ) )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1323:1: ( (lv_value_0_0= ruleLiteral ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1324:1: (lv_value_0_0= ruleLiteral )
+            // InternalConfig.g:1323:1: ( (lv_value_0_0= ruleLiteral ) )
+            // InternalConfig.g:1324:1: (lv_value_0_0= ruleLiteral )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1324:1: (lv_value_0_0= ruleLiteral )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1325:3: lv_value_0_0= ruleLiteral
+            // InternalConfig.g:1324:1: (lv_value_0_0= ruleLiteral )
+            // InternalConfig.g:1325:3: lv_value_0_0= ruleLiteral
             {
-            if ( state.backtracking==0 ) {
-               
-              	        newCompositeNode(grammarAccess.getLiteralConfigValueAccess().getValueLiteralParserRuleCall_0()); 
-              	    
-            }
-            pushFollow(FOLLOW_ruleLiteral_in_ruleLiteralConfigValue3049);
+             
+            	        newCompositeNode(grammarAccess.getLiteralConfigValueAccess().getValueLiteralParserRuleCall_0()); 
+            	    
+            pushFollow(FOLLOW_2);
             lv_value_0_0=ruleLiteral();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
 
-              	        if (current==null) {
-              	            current = createModelElementForParent(grammarAccess.getLiteralConfigValueRule());
-              	        }
-                     		set(
-                     			current, 
-                     			"value",
-                      		lv_value_0_0, 
-                      		"Literal");
-              	        afterParserOrEnumRuleCall();
-              	    
-            }
+
+            	        if (current==null) {
+            	            current = createModelElementForParent(grammarAccess.getLiteralConfigValueRule());
+            	        }
+                   		set(
+                   			current, 
+                   			"value",
+                    		lv_value_0_0, 
+                    		"org.eclipse.etrice.core.common.Base.Literal");
+            	        afterParserOrEnumRuleCall();
+            	    
 
             }
 
@@ -3762,9 +3420,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -3779,7 +3435,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleEnumConfigValue"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1349:1: entryRuleEnumConfigValue returns [EObject current=null] : iv_ruleEnumConfigValue= ruleEnumConfigValue EOF ;
+    // InternalConfig.g:1349:1: entryRuleEnumConfigValue returns [EObject current=null] : iv_ruleEnumConfigValue= ruleEnumConfigValue EOF ;
     public final EObject entryRuleEnumConfigValue() throws RecognitionException {
         EObject current = null;
 
@@ -3787,21 +3443,17 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1350:2: (iv_ruleEnumConfigValue= ruleEnumConfigValue EOF )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1351:2: iv_ruleEnumConfigValue= ruleEnumConfigValue EOF
+            // InternalConfig.g:1350:2: (iv_ruleEnumConfigValue= ruleEnumConfigValue EOF )
+            // InternalConfig.g:1351:2: iv_ruleEnumConfigValue= ruleEnumConfigValue EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getEnumConfigValueRule()); 
-            }
-            pushFollow(FOLLOW_ruleEnumConfigValue_in_entryRuleEnumConfigValue3084);
+             newCompositeNode(grammarAccess.getEnumConfigValueRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleEnumConfigValue=ruleEnumConfigValue();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleEnumConfigValue; 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleEnumConfigValue3094); if (state.failed) return current;
+
+             current =iv_ruleEnumConfigValue; 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3819,7 +3471,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleEnumConfigValue"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1358:1: ruleEnumConfigValue returns [EObject current=null] : ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '.' ( (otherlv_2= RULE_ID ) ) ) ;
+    // InternalConfig.g:1358:1: ruleEnumConfigValue returns [EObject current=null] : ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '.' ( (otherlv_2= RULE_ID ) ) ) ;
     public final EObject ruleEnumConfigValue() throws RecognitionException {
         EObject current = null;
 
@@ -3830,62 +3482,52 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1361:28: ( ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '.' ( (otherlv_2= RULE_ID ) ) ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1362:1: ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '.' ( (otherlv_2= RULE_ID ) ) )
+            // InternalConfig.g:1361:28: ( ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '.' ( (otherlv_2= RULE_ID ) ) ) )
+            // InternalConfig.g:1362:1: ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '.' ( (otherlv_2= RULE_ID ) ) )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1362:1: ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '.' ( (otherlv_2= RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1362:2: ( (otherlv_0= RULE_ID ) ) otherlv_1= '.' ( (otherlv_2= RULE_ID ) )
+            // InternalConfig.g:1362:1: ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '.' ( (otherlv_2= RULE_ID ) ) )
+            // InternalConfig.g:1362:2: ( (otherlv_0= RULE_ID ) ) otherlv_1= '.' ( (otherlv_2= RULE_ID ) )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1362:2: ( (otherlv_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1363:1: (otherlv_0= RULE_ID )
+            // InternalConfig.g:1362:2: ( (otherlv_0= RULE_ID ) )
+            // InternalConfig.g:1363:1: (otherlv_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1363:1: (otherlv_0= RULE_ID )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1364:3: otherlv_0= RULE_ID
+            // InternalConfig.g:1363:1: (otherlv_0= RULE_ID )
+            // InternalConfig.g:1364:3: otherlv_0= RULE_ID
             {
-            if ( state.backtracking==0 ) {
 
-              			if (current==null) {
-              	            current = createModelElement(grammarAccess.getEnumConfigValueRule());
-              	        }
-                      
-            }
-            otherlv_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEnumConfigValue3139); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            			if (current==null) {
+            	            current = createModelElement(grammarAccess.getEnumConfigValueRule());
+            	        }
+                    
+            otherlv_0=(Token)match(input,RULE_ID,FOLLOW_29); 
 
-              		newLeafNode(otherlv_0, grammarAccess.getEnumConfigValueAccess().getTypeEnumerationTypeCrossReference_0_0()); 
-              	
-            }
+            		newLeafNode(otherlv_0, grammarAccess.getEnumConfigValueAccess().getTypeEnumerationTypeCrossReference_0_0()); 
+            	
 
             }
 
 
             }
 
-            otherlv_1=(Token)match(input,37,FOLLOW_37_in_ruleEnumConfigValue3151); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_1=(Token)match(input,37,FOLLOW_3); 
 
-                  	newLeafNode(otherlv_1, grammarAccess.getEnumConfigValueAccess().getFullStopKeyword_1());
-                  
-            }
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1379:1: ( (otherlv_2= RULE_ID ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1380:1: (otherlv_2= RULE_ID )
+                	newLeafNode(otherlv_1, grammarAccess.getEnumConfigValueAccess().getFullStopKeyword_1());
+                
+            // InternalConfig.g:1379:1: ( (otherlv_2= RULE_ID ) )
+            // InternalConfig.g:1380:1: (otherlv_2= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1380:1: (otherlv_2= RULE_ID )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1381:3: otherlv_2= RULE_ID
+            // InternalConfig.g:1380:1: (otherlv_2= RULE_ID )
+            // InternalConfig.g:1381:3: otherlv_2= RULE_ID
             {
-            if ( state.backtracking==0 ) {
 
-              			if (current==null) {
-              	            current = createModelElement(grammarAccess.getEnumConfigValueRule());
-              	        }
-                      
-            }
-            otherlv_2=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEnumConfigValue3171); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            			if (current==null) {
+            	            current = createModelElement(grammarAccess.getEnumConfigValueRule());
+            	        }
+                    
+            otherlv_2=(Token)match(input,RULE_ID,FOLLOW_2); 
 
-              		newLeafNode(otherlv_2, grammarAccess.getEnumConfigValueAccess().getValueEnumLiteralCrossReference_2_0()); 
-              	
-            }
+            		newLeafNode(otherlv_2, grammarAccess.getEnumConfigValueAccess().getValueEnumLiteralCrossReference_2_0()); 
+            	
 
             }
 
@@ -3898,9 +3540,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -3915,7 +3555,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleRefPath"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1400:1: entryRuleRefPath returns [EObject current=null] : iv_ruleRefPath= ruleRefPath EOF ;
+    // InternalConfig.g:1400:1: entryRuleRefPath returns [EObject current=null] : iv_ruleRefPath= ruleRefPath EOF ;
     public final EObject entryRuleRefPath() throws RecognitionException {
         EObject current = null;
 
@@ -3923,21 +3563,17 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1401:2: (iv_ruleRefPath= ruleRefPath EOF )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1402:2: iv_ruleRefPath= ruleRefPath EOF
+            // InternalConfig.g:1401:2: (iv_ruleRefPath= ruleRefPath EOF )
+            // InternalConfig.g:1402:2: iv_ruleRefPath= ruleRefPath EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getRefPathRule()); 
-            }
-            pushFollow(FOLLOW_ruleRefPath_in_entryRuleRefPath3207);
+             newCompositeNode(grammarAccess.getRefPathRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleRefPath=ruleRefPath();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleRefPath; 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRefPath3217); if (state.failed) return current;
+
+             current =iv_ruleRefPath; 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3955,7 +3591,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleRefPath"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1409:1: ruleRefPath returns [EObject current=null] : ( ( (lv_refs_0_0= ruleRefSegment ) ) (otherlv_1= '/' ( (lv_refs_2_0= ruleRefSegment ) ) )* ) ;
+    // InternalConfig.g:1409:1: ruleRefPath returns [EObject current=null] : ( ( (lv_refs_0_0= ruleRefSegment ) ) (otherlv_1= '/' ( (lv_refs_2_0= ruleRefSegment ) ) )* ) ;
     public final EObject ruleRefPath() throws RecognitionException {
         EObject current = null;
 
@@ -3968,48 +3604,44 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1412:28: ( ( ( (lv_refs_0_0= ruleRefSegment ) ) (otherlv_1= '/' ( (lv_refs_2_0= ruleRefSegment ) ) )* ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1413:1: ( ( (lv_refs_0_0= ruleRefSegment ) ) (otherlv_1= '/' ( (lv_refs_2_0= ruleRefSegment ) ) )* )
+            // InternalConfig.g:1412:28: ( ( ( (lv_refs_0_0= ruleRefSegment ) ) (otherlv_1= '/' ( (lv_refs_2_0= ruleRefSegment ) ) )* ) )
+            // InternalConfig.g:1413:1: ( ( (lv_refs_0_0= ruleRefSegment ) ) (otherlv_1= '/' ( (lv_refs_2_0= ruleRefSegment ) ) )* )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1413:1: ( ( (lv_refs_0_0= ruleRefSegment ) ) (otherlv_1= '/' ( (lv_refs_2_0= ruleRefSegment ) ) )* )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1413:2: ( (lv_refs_0_0= ruleRefSegment ) ) (otherlv_1= '/' ( (lv_refs_2_0= ruleRefSegment ) ) )*
+            // InternalConfig.g:1413:1: ( ( (lv_refs_0_0= ruleRefSegment ) ) (otherlv_1= '/' ( (lv_refs_2_0= ruleRefSegment ) ) )* )
+            // InternalConfig.g:1413:2: ( (lv_refs_0_0= ruleRefSegment ) ) (otherlv_1= '/' ( (lv_refs_2_0= ruleRefSegment ) ) )*
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1413:2: ( (lv_refs_0_0= ruleRefSegment ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1414:1: (lv_refs_0_0= ruleRefSegment )
+            // InternalConfig.g:1413:2: ( (lv_refs_0_0= ruleRefSegment ) )
+            // InternalConfig.g:1414:1: (lv_refs_0_0= ruleRefSegment )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1414:1: (lv_refs_0_0= ruleRefSegment )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1415:3: lv_refs_0_0= ruleRefSegment
+            // InternalConfig.g:1414:1: (lv_refs_0_0= ruleRefSegment )
+            // InternalConfig.g:1415:3: lv_refs_0_0= ruleRefSegment
             {
-            if ( state.backtracking==0 ) {
-               
-              	        newCompositeNode(grammarAccess.getRefPathAccess().getRefsRefSegmentParserRuleCall_0_0()); 
-              	    
-            }
-            pushFollow(FOLLOW_ruleRefSegment_in_ruleRefPath3263);
+             
+            	        newCompositeNode(grammarAccess.getRefPathAccess().getRefsRefSegmentParserRuleCall_0_0()); 
+            	    
+            pushFollow(FOLLOW_30);
             lv_refs_0_0=ruleRefSegment();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
 
-              	        if (current==null) {
-              	            current = createModelElementForParent(grammarAccess.getRefPathRule());
-              	        }
-                     		add(
-                     			current, 
-                     			"refs",
-                      		lv_refs_0_0, 
-                      		"RefSegment");
-              	        afterParserOrEnumRuleCall();
-              	    
-            }
+
+            	        if (current==null) {
+            	            current = createModelElementForParent(grammarAccess.getRefPathRule());
+            	        }
+                   		add(
+                   			current, 
+                   			"refs",
+                    		lv_refs_0_0, 
+                    		"org.eclipse.etrice.core.Config.RefSegment");
+            	        afterParserOrEnumRuleCall();
+            	    
 
             }
 
 
             }
 
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1431:2: (otherlv_1= '/' ( (lv_refs_2_0= ruleRefSegment ) ) )*
+            // InternalConfig.g:1431:2: (otherlv_1= '/' ( (lv_refs_2_0= ruleRefSegment ) ) )*
             loop26:
             do {
                 int alt26=2;
@@ -4022,43 +3654,37 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
                 switch (alt26) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1431:4: otherlv_1= '/' ( (lv_refs_2_0= ruleRefSegment ) )
+            	    // InternalConfig.g:1431:4: otherlv_1= '/' ( (lv_refs_2_0= ruleRefSegment ) )
             	    {
-            	    otherlv_1=(Token)match(input,16,FOLLOW_16_in_ruleRefPath3276); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
+            	    otherlv_1=(Token)match(input,16,FOLLOW_3); 
 
-            	          	newLeafNode(otherlv_1, grammarAccess.getRefPathAccess().getSolidusKeyword_1_0());
-            	          
-            	    }
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1435:1: ( (lv_refs_2_0= ruleRefSegment ) )
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1436:1: (lv_refs_2_0= ruleRefSegment )
+            	        	newLeafNode(otherlv_1, grammarAccess.getRefPathAccess().getSolidusKeyword_1_0());
+            	        
+            	    // InternalConfig.g:1435:1: ( (lv_refs_2_0= ruleRefSegment ) )
+            	    // InternalConfig.g:1436:1: (lv_refs_2_0= ruleRefSegment )
             	    {
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1436:1: (lv_refs_2_0= ruleRefSegment )
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1437:3: lv_refs_2_0= ruleRefSegment
+            	    // InternalConfig.g:1436:1: (lv_refs_2_0= ruleRefSegment )
+            	    // InternalConfig.g:1437:3: lv_refs_2_0= ruleRefSegment
             	    {
-            	    if ( state.backtracking==0 ) {
-            	       
-            	      	        newCompositeNode(grammarAccess.getRefPathAccess().getRefsRefSegmentParserRuleCall_1_1_0()); 
-            	      	    
-            	    }
-            	    pushFollow(FOLLOW_ruleRefSegment_in_ruleRefPath3297);
+            	     
+            	    	        newCompositeNode(grammarAccess.getRefPathAccess().getRefsRefSegmentParserRuleCall_1_1_0()); 
+            	    	    
+            	    pushFollow(FOLLOW_30);
             	    lv_refs_2_0=ruleRefSegment();
 
             	    state._fsp--;
-            	    if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
-
-            	      	        if (current==null) {
-            	      	            current = createModelElementForParent(grammarAccess.getRefPathRule());
-            	      	        }
-            	             		add(
-            	             			current, 
-            	             			"refs",
-            	              		lv_refs_2_0, 
-            	              		"RefSegment");
-            	      	        afterParserOrEnumRuleCall();
-            	      	    
-            	    }
+
+
+            	    	        if (current==null) {
+            	    	            current = createModelElementForParent(grammarAccess.getRefPathRule());
+            	    	        }
+            	           		add(
+            	           			current, 
+            	           			"refs",
+            	            		lv_refs_2_0, 
+            	            		"org.eclipse.etrice.core.Config.RefSegment");
+            	    	        afterParserOrEnumRuleCall();
+            	    	    
 
             	    }
 
@@ -4080,9 +3706,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -4097,7 +3721,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleRefSegment"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1461:1: entryRuleRefSegment returns [EObject current=null] : iv_ruleRefSegment= ruleRefSegment EOF ;
+    // InternalConfig.g:1461:1: entryRuleRefSegment returns [EObject current=null] : iv_ruleRefSegment= ruleRefSegment EOF ;
     public final EObject entryRuleRefSegment() throws RecognitionException {
         EObject current = null;
 
@@ -4105,21 +3729,17 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1462:2: (iv_ruleRefSegment= ruleRefSegment EOF )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1463:2: iv_ruleRefSegment= ruleRefSegment EOF
+            // InternalConfig.g:1462:2: (iv_ruleRefSegment= ruleRefSegment EOF )
+            // InternalConfig.g:1463:2: iv_ruleRefSegment= ruleRefSegment EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getRefSegmentRule()); 
-            }
-            pushFollow(FOLLOW_ruleRefSegment_in_entryRuleRefSegment3335);
+             newCompositeNode(grammarAccess.getRefSegmentRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleRefSegment=ruleRefSegment();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleRefSegment; 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRefSegment3345); if (state.failed) return current;
+
+             current =iv_ruleRefSegment; 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -4137,7 +3757,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleRefSegment"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1470:1: ruleRefSegment returns [EObject current=null] : ( ( (lv_ref_0_0= RULE_ID ) ) (otherlv_1= ':' ( (lv_idx_2_0= RULE_INT ) ) )? ) ;
+    // InternalConfig.g:1470:1: ruleRefSegment returns [EObject current=null] : ( ( (lv_ref_0_0= RULE_ID ) ) (otherlv_1= ':' ( (lv_idx_2_0= RULE_INT ) ) )? ) ;
     public final EObject ruleRefSegment() throws RecognitionException {
         EObject current = null;
 
@@ -4148,43 +3768,39 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1473:28: ( ( ( (lv_ref_0_0= RULE_ID ) ) (otherlv_1= ':' ( (lv_idx_2_0= RULE_INT ) ) )? ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1474:1: ( ( (lv_ref_0_0= RULE_ID ) ) (otherlv_1= ':' ( (lv_idx_2_0= RULE_INT ) ) )? )
+            // InternalConfig.g:1473:28: ( ( ( (lv_ref_0_0= RULE_ID ) ) (otherlv_1= ':' ( (lv_idx_2_0= RULE_INT ) ) )? ) )
+            // InternalConfig.g:1474:1: ( ( (lv_ref_0_0= RULE_ID ) ) (otherlv_1= ':' ( (lv_idx_2_0= RULE_INT ) ) )? )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1474:1: ( ( (lv_ref_0_0= RULE_ID ) ) (otherlv_1= ':' ( (lv_idx_2_0= RULE_INT ) ) )? )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1474:2: ( (lv_ref_0_0= RULE_ID ) ) (otherlv_1= ':' ( (lv_idx_2_0= RULE_INT ) ) )?
+            // InternalConfig.g:1474:1: ( ( (lv_ref_0_0= RULE_ID ) ) (otherlv_1= ':' ( (lv_idx_2_0= RULE_INT ) ) )? )
+            // InternalConfig.g:1474:2: ( (lv_ref_0_0= RULE_ID ) ) (otherlv_1= ':' ( (lv_idx_2_0= RULE_INT ) ) )?
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1474:2: ( (lv_ref_0_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1475:1: (lv_ref_0_0= RULE_ID )
+            // InternalConfig.g:1474:2: ( (lv_ref_0_0= RULE_ID ) )
+            // InternalConfig.g:1475:1: (lv_ref_0_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1475:1: (lv_ref_0_0= RULE_ID )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1476:3: lv_ref_0_0= RULE_ID
+            // InternalConfig.g:1475:1: (lv_ref_0_0= RULE_ID )
+            // InternalConfig.g:1476:3: lv_ref_0_0= RULE_ID
             {
-            lv_ref_0_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleRefSegment3387); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            lv_ref_0_0=(Token)match(input,RULE_ID,FOLLOW_31); 
 
-              			newLeafNode(lv_ref_0_0, grammarAccess.getRefSegmentAccess().getRefIDTerminalRuleCall_0_0()); 
-              		
-            }
-            if ( state.backtracking==0 ) {
+            			newLeafNode(lv_ref_0_0, grammarAccess.getRefSegmentAccess().getRefIDTerminalRuleCall_0_0()); 
+            		
 
-              	        if (current==null) {
-              	            current = createModelElement(grammarAccess.getRefSegmentRule());
-              	        }
-                     		setWithLastConsumed(
-                     			current, 
-                     			"ref",
-                      		lv_ref_0_0, 
-                      		"ID");
-              	    
-            }
+            	        if (current==null) {
+            	            current = createModelElement(grammarAccess.getRefSegmentRule());
+            	        }
+                   		setWithLastConsumed(
+                   			current, 
+                   			"ref",
+                    		lv_ref_0_0, 
+                    		"org.eclipse.xtext.common.Terminals.ID");
+            	    
 
             }
 
 
             }
 
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1492:2: (otherlv_1= ':' ( (lv_idx_2_0= RULE_INT ) ) )?
+            // InternalConfig.g:1492:2: (otherlv_1= ':' ( (lv_idx_2_0= RULE_INT ) ) )?
             int alt27=2;
             int LA27_0 = input.LA(1);
 
@@ -4193,38 +3809,32 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
             }
             switch (alt27) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1492:4: otherlv_1= ':' ( (lv_idx_2_0= RULE_INT ) )
+                    // InternalConfig.g:1492:4: otherlv_1= ':' ( (lv_idx_2_0= RULE_INT ) )
                     {
-                    otherlv_1=(Token)match(input,38,FOLLOW_38_in_ruleRefSegment3405); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    otherlv_1=(Token)match(input,38,FOLLOW_14); 
 
-                          	newLeafNode(otherlv_1, grammarAccess.getRefSegmentAccess().getColonKeyword_1_0());
-                          
-                    }
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1496:1: ( (lv_idx_2_0= RULE_INT ) )
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1497:1: (lv_idx_2_0= RULE_INT )
+                        	newLeafNode(otherlv_1, grammarAccess.getRefSegmentAccess().getColonKeyword_1_0());
+                        
+                    // InternalConfig.g:1496:1: ( (lv_idx_2_0= RULE_INT ) )
+                    // InternalConfig.g:1497:1: (lv_idx_2_0= RULE_INT )
                     {
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1497:1: (lv_idx_2_0= RULE_INT )
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1498:3: lv_idx_2_0= RULE_INT
+                    // InternalConfig.g:1497:1: (lv_idx_2_0= RULE_INT )
+                    // InternalConfig.g:1498:3: lv_idx_2_0= RULE_INT
                     {
-                    lv_idx_2_0=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleRefSegment3422); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    lv_idx_2_0=(Token)match(input,RULE_INT,FOLLOW_2); 
 
-                      			newLeafNode(lv_idx_2_0, grammarAccess.getRefSegmentAccess().getIdxINTTerminalRuleCall_1_1_0()); 
-                      		
-                    }
-                    if ( state.backtracking==0 ) {
-
-                      	        if (current==null) {
-                      	            current = createModelElement(grammarAccess.getRefSegmentRule());
-                      	        }
-                             		setWithLastConsumed(
-                             			current, 
-                             			"idx",
-                              		lv_idx_2_0, 
-                              		"INT");
-                      	    
-                    }
+                    			newLeafNode(lv_idx_2_0, grammarAccess.getRefSegmentAccess().getIdxINTTerminalRuleCall_1_1_0()); 
+                    		
+
+                    	        if (current==null) {
+                    	            current = createModelElement(grammarAccess.getRefSegmentRule());
+                    	        }
+                           		setWithLastConsumed(
+                           			current, 
+                           			"idx",
+                            		lv_idx_2_0, 
+                            		"org.eclipse.xtext.common.Terminals.INT");
+                    	    
 
                     }
 
@@ -4243,9 +3853,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -4260,7 +3868,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleKeyValue"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1524:1: entryRuleKeyValue returns [EObject current=null] : iv_ruleKeyValue= ruleKeyValue EOF ;
+    // InternalConfig.g:1524:1: entryRuleKeyValue returns [EObject current=null] : iv_ruleKeyValue= ruleKeyValue EOF ;
     public final EObject entryRuleKeyValue() throws RecognitionException {
         EObject current = null;
 
@@ -4268,21 +3876,17 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1525:2: (iv_ruleKeyValue= ruleKeyValue EOF )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1526:2: iv_ruleKeyValue= ruleKeyValue EOF
+            // InternalConfig.g:1525:2: (iv_ruleKeyValue= ruleKeyValue EOF )
+            // InternalConfig.g:1526:2: iv_ruleKeyValue= ruleKeyValue EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getKeyValueRule()); 
-            }
-            pushFollow(FOLLOW_ruleKeyValue_in_entryRuleKeyValue3467);
+             newCompositeNode(grammarAccess.getKeyValueRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleKeyValue=ruleKeyValue();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleKeyValue; 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleKeyValue3477); if (state.failed) return current;
+
+             current =iv_ruleKeyValue; 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -4300,7 +3904,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleKeyValue"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1533:1: ruleKeyValue returns [EObject current=null] : ( ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) ) ) ;
+    // InternalConfig.g:1533: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;
 
@@ -4312,77 +3916,67 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1536:28: ( ( ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) ) ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1537:1: ( ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) ) )
+            // InternalConfig.g:1536:28: ( ( ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) ) ) )
+            // InternalConfig.g:1537:1: ( ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) ) )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1537:1: ( ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1537:2: ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) )
+            // InternalConfig.g:1537:1: ( ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) ) )
+            // InternalConfig.g:1537:2: ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1537:2: ( (lv_key_0_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1538:1: (lv_key_0_0= RULE_ID )
+            // InternalConfig.g:1537:2: ( (lv_key_0_0= RULE_ID ) )
+            // InternalConfig.g:1538:1: (lv_key_0_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1538:1: (lv_key_0_0= RULE_ID )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1539:3: lv_key_0_0= RULE_ID
+            // InternalConfig.g:1538:1: (lv_key_0_0= RULE_ID )
+            // InternalConfig.g:1539:3: lv_key_0_0= RULE_ID
             {
-            lv_key_0_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleKeyValue3519); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            lv_key_0_0=(Token)match(input,RULE_ID,FOLLOW_23); 
 
-              			newLeafNode(lv_key_0_0, grammarAccess.getKeyValueAccess().getKeyIDTerminalRuleCall_0_0()); 
-              		
-            }
-            if ( state.backtracking==0 ) {
+            			newLeafNode(lv_key_0_0, grammarAccess.getKeyValueAccess().getKeyIDTerminalRuleCall_0_0()); 
+            		
 
-              	        if (current==null) {
-              	            current = createModelElement(grammarAccess.getKeyValueRule());
-              	        }
-                     		setWithLastConsumed(
-                     			current, 
-                     			"key",
-                      		lv_key_0_0, 
-                      		"ID");
-              	    
-            }
+            	        if (current==null) {
+            	            current = createModelElement(grammarAccess.getKeyValueRule());
+            	        }
+                   		setWithLastConsumed(
+                   			current, 
+                   			"key",
+                    		lv_key_0_0, 
+                    		"org.eclipse.xtext.common.Terminals.ID");
+            	    
 
             }
 
 
             }
 
-            otherlv_1=(Token)match(input,31,FOLLOW_31_in_ruleKeyValue3536); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_1=(Token)match(input,31,FOLLOW_32); 
 
-                  	newLeafNode(otherlv_1, grammarAccess.getKeyValueAccess().getEqualsSignKeyword_1());
-                  
-            }
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1559:1: ( (lv_value_2_0= ruleLiteral ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1560:1: (lv_value_2_0= ruleLiteral )
+                	newLeafNode(otherlv_1, grammarAccess.getKeyValueAccess().getEqualsSignKeyword_1());
+                
+            // InternalConfig.g:1559:1: ( (lv_value_2_0= ruleLiteral ) )
+            // InternalConfig.g:1560:1: (lv_value_2_0= ruleLiteral )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1560:1: (lv_value_2_0= ruleLiteral )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1561:3: lv_value_2_0= ruleLiteral
+            // InternalConfig.g:1560:1: (lv_value_2_0= ruleLiteral )
+            // InternalConfig.g:1561:3: lv_value_2_0= ruleLiteral
             {
-            if ( state.backtracking==0 ) {
-               
-              	        newCompositeNode(grammarAccess.getKeyValueAccess().getValueLiteralParserRuleCall_2_0()); 
-              	    
-            }
-            pushFollow(FOLLOW_ruleLiteral_in_ruleKeyValue3557);
+             
+            	        newCompositeNode(grammarAccess.getKeyValueAccess().getValueLiteralParserRuleCall_2_0()); 
+            	    
+            pushFollow(FOLLOW_2);
             lv_value_2_0=ruleLiteral();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
 
-              	        if (current==null) {
-              	            current = createModelElementForParent(grammarAccess.getKeyValueRule());
-              	        }
-                     		set(
-                     			current, 
-                     			"value",
-                      		lv_value_2_0, 
-                      		"Literal");
-              	        afterParserOrEnumRuleCall();
-              	    
-            }
+
+            	        if (current==null) {
+            	            current = createModelElementForParent(grammarAccess.getKeyValueRule());
+            	        }
+                   		set(
+                   			current, 
+                   			"value",
+                    		lv_value_2_0, 
+                    		"org.eclipse.etrice.core.common.Base.Literal");
+            	        afterParserOrEnumRuleCall();
+            	    
 
             }
 
@@ -4395,9 +3989,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -4412,7 +4004,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleAnnotationTargetType"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1587:1: entryRuleAnnotationTargetType returns [String current=null] : iv_ruleAnnotationTargetType= ruleAnnotationTargetType EOF ;
+    // InternalConfig.g:1587:1: entryRuleAnnotationTargetType returns [String current=null] : iv_ruleAnnotationTargetType= ruleAnnotationTargetType EOF ;
     public final String entryRuleAnnotationTargetType() throws RecognitionException {
         String current = null;
 
@@ -4420,21 +4012,17 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1588:2: (iv_ruleAnnotationTargetType= ruleAnnotationTargetType EOF )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1589:2: iv_ruleAnnotationTargetType= ruleAnnotationTargetType EOF
+            // InternalConfig.g:1588:2: (iv_ruleAnnotationTargetType= ruleAnnotationTargetType EOF )
+            // InternalConfig.g:1589:2: iv_ruleAnnotationTargetType= ruleAnnotationTargetType EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getAnnotationTargetTypeRule()); 
-            }
-            pushFollow(FOLLOW_ruleAnnotationTargetType_in_entryRuleAnnotationTargetType3596);
+             newCompositeNode(grammarAccess.getAnnotationTargetTypeRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleAnnotationTargetType=ruleAnnotationTargetType();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleAnnotationTargetType.getText(); 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAnnotationTargetType3607); if (state.failed) return current;
+
+             current =iv_ruleAnnotationTargetType.getText(); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -4452,7 +4040,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleAnnotationTargetType"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1596:1: ruleAnnotationTargetType returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_ID_0= RULE_ID ;
+    // InternalConfig.g:1596:1: ruleAnnotationTargetType returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_ID_0= RULE_ID ;
     public final AntlrDatatypeRuleToken ruleAnnotationTargetType() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -4461,26 +4049,20 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1599:28: (this_ID_0= RULE_ID )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1600:5: this_ID_0= RULE_ID
+            // InternalConfig.g:1599:28: (this_ID_0= RULE_ID )
+            // InternalConfig.g:1600:5: this_ID_0= RULE_ID
             {
-            this_ID_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleAnnotationTargetType3646); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            this_ID_0=(Token)match(input,RULE_ID,FOLLOW_2); 
 
-              		current.merge(this_ID_0);
-                  
-            }
-            if ( state.backtracking==0 ) {
-               
-                  newLeafNode(this_ID_0, grammarAccess.getAnnotationTargetTypeAccess().getIDTerminalRuleCall()); 
-                  
-            }
+            		current.merge(this_ID_0);
+                
+             
+                newLeafNode(this_ID_0, grammarAccess.getAnnotationTargetTypeAccess().getIDTerminalRuleCall()); 
+                
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -4495,7 +4077,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleAnnotationAttribute"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1615:1: entryRuleAnnotationAttribute returns [EObject current=null] : iv_ruleAnnotationAttribute= ruleAnnotationAttribute EOF ;
+    // InternalConfig.g:1615:1: entryRuleAnnotationAttribute returns [EObject current=null] : iv_ruleAnnotationAttribute= ruleAnnotationAttribute EOF ;
     public final EObject entryRuleAnnotationAttribute() throws RecognitionException {
         EObject current = null;
 
@@ -4503,21 +4085,17 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1616:2: (iv_ruleAnnotationAttribute= ruleAnnotationAttribute EOF )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1617:2: iv_ruleAnnotationAttribute= ruleAnnotationAttribute EOF
+            // InternalConfig.g:1616:2: (iv_ruleAnnotationAttribute= ruleAnnotationAttribute EOF )
+            // InternalConfig.g:1617:2: iv_ruleAnnotationAttribute= ruleAnnotationAttribute EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getAnnotationAttributeRule()); 
-            }
-            pushFollow(FOLLOW_ruleAnnotationAttribute_in_entryRuleAnnotationAttribute3690);
+             newCompositeNode(grammarAccess.getAnnotationAttributeRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleAnnotationAttribute=ruleAnnotationAttribute();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleAnnotationAttribute; 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAnnotationAttribute3700); if (state.failed) return current;
+
+             current =iv_ruleAnnotationAttribute; 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -4535,7 +4113,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleAnnotationAttribute"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1624:1: ruleAnnotationAttribute returns [EObject current=null] : (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute ) ;
+    // InternalConfig.g:1624:1: ruleAnnotationAttribute returns [EObject current=null] : (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute ) ;
     public final EObject ruleAnnotationAttribute() throws RecognitionException {
         EObject current = null;
 
@@ -4547,10 +4125,10 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1627:28: ( (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1628:1: (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute )
+            // InternalConfig.g:1627:28: ( (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute ) )
+            // InternalConfig.g:1628:1: (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1628:1: (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute )
+            // InternalConfig.g:1628:1: (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute )
             int alt28=2;
             int LA28_0 = input.LA(1);
 
@@ -4573,7 +4151,6 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                                 alt28=2;
                             }
                             else {
-                                if (state.backtracking>0) {state.failed=true; return current;}
                                 NoViableAltException nvae =
                                     new NoViableAltException("", 28, 5, input);
 
@@ -4581,7 +4158,6 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                             }
                         }
                         else {
-                            if (state.backtracking>0) {state.failed=true; return current;}
                             NoViableAltException nvae =
                                 new NoViableAltException("", 28, 4, input);
 
@@ -4589,7 +4165,6 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                         }
                     }
                     else {
-                        if (state.backtracking>0) {state.failed=true; return current;}
                         NoViableAltException nvae =
                             new NoViableAltException("", 28, 3, input);
 
@@ -4597,7 +4172,6 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                     }
                 }
                 else {
-                    if (state.backtracking>0) {state.failed=true; return current;}
                     NoViableAltException nvae =
                         new NoViableAltException("", 28, 1, input);
 
@@ -4623,7 +4197,6 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                                 alt28=2;
                             }
                             else {
-                                if (state.backtracking>0) {state.failed=true; return current;}
                                 NoViableAltException nvae =
                                     new NoViableAltException("", 28, 5, input);
 
@@ -4631,7 +4204,6 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                             }
                         }
                         else {
-                            if (state.backtracking>0) {state.failed=true; return current;}
                             NoViableAltException nvae =
                                 new NoViableAltException("", 28, 4, input);
 
@@ -4639,7 +4211,6 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                         }
                     }
                     else {
-                        if (state.backtracking>0) {state.failed=true; return current;}
                         NoViableAltException nvae =
                             new NoViableAltException("", 28, 3, input);
 
@@ -4647,7 +4218,6 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                     }
                 }
                 else {
-                    if (state.backtracking>0) {state.failed=true; return current;}
                     NoViableAltException nvae =
                         new NoViableAltException("", 28, 2, input);
 
@@ -4655,7 +4225,6 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                 }
             }
             else {
-                if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
                     new NoViableAltException("", 28, 0, input);
 
@@ -4663,46 +4232,38 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
             }
             switch (alt28) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1629:5: this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute
+                    // InternalConfig.g:1629:5: this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute
                     {
-                    if ( state.backtracking==0 ) {
-                       
-                              newCompositeNode(grammarAccess.getAnnotationAttributeAccess().getSimpleAnnotationAttributeParserRuleCall_0()); 
-                          
-                    }
-                    pushFollow(FOLLOW_ruleSimpleAnnotationAttribute_in_ruleAnnotationAttribute3747);
+                     
+                            newCompositeNode(grammarAccess.getAnnotationAttributeAccess().getSimpleAnnotationAttributeParserRuleCall_0()); 
+                        
+                    pushFollow(FOLLOW_2);
                     this_SimpleAnnotationAttribute_0=ruleSimpleAnnotationAttribute();
 
                     state._fsp--;
-                    if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
-                       
-                              current = this_SimpleAnnotationAttribute_0; 
-                              afterParserOrEnumRuleCall();
-                          
-                    }
+
+                     
+                            current = this_SimpleAnnotationAttribute_0; 
+                            afterParserOrEnumRuleCall();
+                        
 
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1639:5: this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute
+                    // InternalConfig.g:1639:5: this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute
                     {
-                    if ( state.backtracking==0 ) {
-                       
-                              newCompositeNode(grammarAccess.getAnnotationAttributeAccess().getEnumAnnotationAttributeParserRuleCall_1()); 
-                          
-                    }
-                    pushFollow(FOLLOW_ruleEnumAnnotationAttribute_in_ruleAnnotationAttribute3774);
+                     
+                            newCompositeNode(grammarAccess.getAnnotationAttributeAccess().getEnumAnnotationAttributeParserRuleCall_1()); 
+                        
+                    pushFollow(FOLLOW_2);
                     this_EnumAnnotationAttribute_1=ruleEnumAnnotationAttribute();
 
                     state._fsp--;
-                    if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
-                       
-                              current = this_EnumAnnotationAttribute_1; 
-                              afterParserOrEnumRuleCall();
-                          
-                    }
+
+                     
+                            current = this_EnumAnnotationAttribute_1; 
+                            afterParserOrEnumRuleCall();
+                        
 
                     }
                     break;
@@ -4712,9 +4273,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -4729,7 +4288,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleSimpleAnnotationAttribute"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1655:1: entryRuleSimpleAnnotationAttribute returns [EObject current=null] : iv_ruleSimpleAnnotationAttribute= ruleSimpleAnnotationAttribute EOF ;
+    // InternalConfig.g:1655:1: entryRuleSimpleAnnotationAttribute returns [EObject current=null] : iv_ruleSimpleAnnotationAttribute= ruleSimpleAnnotationAttribute EOF ;
     public final EObject entryRuleSimpleAnnotationAttribute() throws RecognitionException {
         EObject current = null;
 
@@ -4737,21 +4296,17 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1656:2: (iv_ruleSimpleAnnotationAttribute= ruleSimpleAnnotationAttribute EOF )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1657:2: iv_ruleSimpleAnnotationAttribute= ruleSimpleAnnotationAttribute EOF
+            // InternalConfig.g:1656:2: (iv_ruleSimpleAnnotationAttribute= ruleSimpleAnnotationAttribute EOF )
+            // InternalConfig.g:1657:2: iv_ruleSimpleAnnotationAttribute= ruleSimpleAnnotationAttribute EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getSimpleAnnotationAttributeRule()); 
-            }
-            pushFollow(FOLLOW_ruleSimpleAnnotationAttribute_in_entryRuleSimpleAnnotationAttribute3809);
+             newCompositeNode(grammarAccess.getSimpleAnnotationAttributeRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleSimpleAnnotationAttribute=ruleSimpleAnnotationAttribute();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleSimpleAnnotationAttribute; 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSimpleAnnotationAttribute3819); if (state.failed) return current;
+
+             current =iv_ruleSimpleAnnotationAttribute; 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -4769,7 +4324,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleSimpleAnnotationAttribute"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1664: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 ) ) ) ;
+    // InternalConfig.g:1664: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;
 
@@ -4784,13 +4339,13 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1667: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.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1668: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 ) ) )
+            // InternalConfig.g:1667: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 ) ) ) )
+            // InternalConfig.g:1668: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.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1668: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.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1668: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 ) )
+            // InternalConfig.g:1668: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 ) ) )
+            // InternalConfig.g:1668: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.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1668:2: ( ( (lv_optional_0_0= 'optional' ) ) | otherlv_1= 'mandatory' )
+            // InternalConfig.g:1668:2: ( ( (lv_optional_0_0= 'optional' ) ) | otherlv_1= 'mandatory' )
             int alt29=2;
             int LA29_0 = input.LA(1);
 
@@ -4801,7 +4356,6 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                 alt29=2;
             }
             else {
-                if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
                     new NoViableAltException("", 29, 0, input);
 
@@ -4809,28 +4363,24 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
             }
             switch (alt29) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1668:3: ( (lv_optional_0_0= 'optional' ) )
+                    // InternalConfig.g:1668:3: ( (lv_optional_0_0= 'optional' ) )
                     {
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1668:3: ( (lv_optional_0_0= 'optional' ) )
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1669:1: (lv_optional_0_0= 'optional' )
+                    // InternalConfig.g:1668:3: ( (lv_optional_0_0= 'optional' ) )
+                    // InternalConfig.g:1669:1: (lv_optional_0_0= 'optional' )
                     {
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1669:1: (lv_optional_0_0= 'optional' )
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1670:3: lv_optional_0_0= 'optional'
+                    // InternalConfig.g:1669:1: (lv_optional_0_0= 'optional' )
+                    // InternalConfig.g:1670:3: lv_optional_0_0= 'optional'
                     {
-                    lv_optional_0_0=(Token)match(input,39,FOLLOW_39_in_ruleSimpleAnnotationAttribute3863); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    lv_optional_0_0=(Token)match(input,39,FOLLOW_33); 
 
-                              newLeafNode(lv_optional_0_0, grammarAccess.getSimpleAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0());
-                          
-                    }
-                    if ( state.backtracking==0 ) {
+                            newLeafNode(lv_optional_0_0, grammarAccess.getSimpleAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0());
+                        
 
-                      	        if (current==null) {
-                      	            current = createModelElement(grammarAccess.getSimpleAnnotationAttributeRule());
-                      	        }
-                             		setWithLastConsumed(current, "optional", true, "optional");
-                      	    
-                    }
+                    	        if (current==null) {
+                    	            current = createModelElement(grammarAccess.getSimpleAnnotationAttributeRule());
+                    	        }
+                           		setWithLastConsumed(current, "optional", true, "optional");
+                    	    
 
                     }
 
@@ -4841,91 +4391,77 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1684:7: otherlv_1= 'mandatory'
+                    // InternalConfig.g:1684:7: otherlv_1= 'mandatory'
                     {
-                    otherlv_1=(Token)match(input,40,FOLLOW_40_in_ruleSimpleAnnotationAttribute3894); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    otherlv_1=(Token)match(input,40,FOLLOW_33); 
 
-                          	newLeafNode(otherlv_1, grammarAccess.getSimpleAnnotationAttributeAccess().getMandatoryKeyword_0_1());
-                          
-                    }
+                        	newLeafNode(otherlv_1, grammarAccess.getSimpleAnnotationAttributeAccess().getMandatoryKeyword_0_1());
+                        
 
                     }
                     break;
 
             }
 
-            otherlv_2=(Token)match(input,41,FOLLOW_41_in_ruleSimpleAnnotationAttribute3907); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_2=(Token)match(input,41,FOLLOW_3); 
 
-                  	newLeafNode(otherlv_2, grammarAccess.getSimpleAnnotationAttributeAccess().getAttributeKeyword_1());
-                  
-            }
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1692:1: ( (lv_name_3_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1693:1: (lv_name_3_0= RULE_ID )
+                	newLeafNode(otherlv_2, grammarAccess.getSimpleAnnotationAttributeAccess().getAttributeKeyword_1());
+                
+            // InternalConfig.g:1692:1: ( (lv_name_3_0= RULE_ID ) )
+            // InternalConfig.g:1693:1: (lv_name_3_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1693:1: (lv_name_3_0= RULE_ID )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1694:3: lv_name_3_0= RULE_ID
+            // InternalConfig.g:1693:1: (lv_name_3_0= RULE_ID )
+            // InternalConfig.g:1694:3: lv_name_3_0= RULE_ID
             {
-            lv_name_3_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleSimpleAnnotationAttribute3924); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            lv_name_3_0=(Token)match(input,RULE_ID,FOLLOW_34); 
 
-              			newLeafNode(lv_name_3_0, grammarAccess.getSimpleAnnotationAttributeAccess().getNameIDTerminalRuleCall_2_0()); 
-              		
-            }
-            if ( state.backtracking==0 ) {
+            			newLeafNode(lv_name_3_0, grammarAccess.getSimpleAnnotationAttributeAccess().getNameIDTerminalRuleCall_2_0()); 
+            		
 
-              	        if (current==null) {
-              	            current = createModelElement(grammarAccess.getSimpleAnnotationAttributeRule());
-              	        }
-                     		setWithLastConsumed(
-                     			current, 
-                     			"name",
-                      		lv_name_3_0, 
-                      		"ID");
-              	    
-            }
+            	        if (current==null) {
+            	            current = createModelElement(grammarAccess.getSimpleAnnotationAttributeRule());
+            	        }
+                   		setWithLastConsumed(
+                   			current, 
+                   			"name",
+                    		lv_name_3_0, 
+                    		"org.eclipse.xtext.common.Terminals.ID");
+            	    
 
             }
 
 
             }
 
-            otherlv_4=(Token)match(input,38,FOLLOW_38_in_ruleSimpleAnnotationAttribute3941); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_4=(Token)match(input,38,FOLLOW_35); 
 
-                  	newLeafNode(otherlv_4, grammarAccess.getSimpleAnnotationAttributeAccess().getColonKeyword_3());
-                  
-            }
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1714:1: ( (lv_type_5_0= ruleLiteralType ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1715:1: (lv_type_5_0= ruleLiteralType )
+                	newLeafNode(otherlv_4, grammarAccess.getSimpleAnnotationAttributeAccess().getColonKeyword_3());
+                
+            // InternalConfig.g:1714:1: ( (lv_type_5_0= ruleLiteralType ) )
+            // InternalConfig.g:1715:1: (lv_type_5_0= ruleLiteralType )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1715:1: (lv_type_5_0= ruleLiteralType )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1716:3: lv_type_5_0= ruleLiteralType
+            // InternalConfig.g:1715:1: (lv_type_5_0= ruleLiteralType )
+            // InternalConfig.g:1716:3: lv_type_5_0= ruleLiteralType
             {
-            if ( state.backtracking==0 ) {
-               
-              	        newCompositeNode(grammarAccess.getSimpleAnnotationAttributeAccess().getTypeLiteralTypeEnumRuleCall_4_0()); 
-              	    
-            }
-            pushFollow(FOLLOW_ruleLiteralType_in_ruleSimpleAnnotationAttribute3962);
+             
+            	        newCompositeNode(grammarAccess.getSimpleAnnotationAttributeAccess().getTypeLiteralTypeEnumRuleCall_4_0()); 
+            	    
+            pushFollow(FOLLOW_2);
             lv_type_5_0=ruleLiteralType();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
 
-              	        if (current==null) {
-              	            current = createModelElementForParent(grammarAccess.getSimpleAnnotationAttributeRule());
-              	        }
-                     		set(
-                     			current, 
-                     			"type",
-                      		lv_type_5_0, 
-                      		"LiteralType");
-              	        afterParserOrEnumRuleCall();
-              	    
-            }
+
+            	        if (current==null) {
+            	            current = createModelElementForParent(grammarAccess.getSimpleAnnotationAttributeRule());
+            	        }
+                   		set(
+                   			current, 
+                   			"type",
+                    		lv_type_5_0, 
+                    		"org.eclipse.etrice.core.common.Base.LiteralType");
+            	        afterParserOrEnumRuleCall();
+            	    
 
             }
 
@@ -4938,9 +4474,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -4955,7 +4489,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleEnumAnnotationAttribute"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1740:1: entryRuleEnumAnnotationAttribute returns [EObject current=null] : iv_ruleEnumAnnotationAttribute= ruleEnumAnnotationAttribute EOF ;
+    // InternalConfig.g:1740:1: entryRuleEnumAnnotationAttribute returns [EObject current=null] : iv_ruleEnumAnnotationAttribute= ruleEnumAnnotationAttribute EOF ;
     public final EObject entryRuleEnumAnnotationAttribute() throws RecognitionException {
         EObject current = null;
 
@@ -4963,21 +4497,17 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1741:2: (iv_ruleEnumAnnotationAttribute= ruleEnumAnnotationAttribute EOF )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1742:2: iv_ruleEnumAnnotationAttribute= ruleEnumAnnotationAttribute EOF
+            // InternalConfig.g:1741:2: (iv_ruleEnumAnnotationAttribute= ruleEnumAnnotationAttribute EOF )
+            // InternalConfig.g:1742:2: iv_ruleEnumAnnotationAttribute= ruleEnumAnnotationAttribute EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getEnumAnnotationAttributeRule()); 
-            }
-            pushFollow(FOLLOW_ruleEnumAnnotationAttribute_in_entryRuleEnumAnnotationAttribute3998);
+             newCompositeNode(grammarAccess.getEnumAnnotationAttributeRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleEnumAnnotationAttribute=ruleEnumAnnotationAttribute();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleEnumAnnotationAttribute; 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleEnumAnnotationAttribute4008); if (state.failed) return current;
+
+             current =iv_ruleEnumAnnotationAttribute; 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -4995,7 +4525,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleEnumAnnotationAttribute"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1749: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= '}' ) ;
+    // InternalConfig.g:1749: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;
 
@@ -5013,13 +4543,13 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1752: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.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1753: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= '}' )
+            // InternalConfig.g:1752: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= '}' ) )
+            // InternalConfig.g:1753: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.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1753: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.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1753: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= '}'
+            // InternalConfig.g:1753: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= '}' )
+            // InternalConfig.g:1753: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.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1753:2: ( ( (lv_optional_0_0= 'optional' ) ) | otherlv_1= 'mandatory' )
+            // InternalConfig.g:1753:2: ( ( (lv_optional_0_0= 'optional' ) ) | otherlv_1= 'mandatory' )
             int alt30=2;
             int LA30_0 = input.LA(1);
 
@@ -5030,7 +4560,6 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                 alt30=2;
             }
             else {
-                if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
                     new NoViableAltException("", 30, 0, input);
 
@@ -5038,28 +4567,24 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
             }
             switch (alt30) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1753:3: ( (lv_optional_0_0= 'optional' ) )
+                    // InternalConfig.g:1753:3: ( (lv_optional_0_0= 'optional' ) )
                     {
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1753:3: ( (lv_optional_0_0= 'optional' ) )
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1754:1: (lv_optional_0_0= 'optional' )
+                    // InternalConfig.g:1753:3: ( (lv_optional_0_0= 'optional' ) )
+                    // InternalConfig.g:1754:1: (lv_optional_0_0= 'optional' )
                     {
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1754:1: (lv_optional_0_0= 'optional' )
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1755:3: lv_optional_0_0= 'optional'
+                    // InternalConfig.g:1754:1: (lv_optional_0_0= 'optional' )
+                    // InternalConfig.g:1755:3: lv_optional_0_0= 'optional'
                     {
-                    lv_optional_0_0=(Token)match(input,39,FOLLOW_39_in_ruleEnumAnnotationAttribute4052); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    lv_optional_0_0=(Token)match(input,39,FOLLOW_33); 
 
-                              newLeafNode(lv_optional_0_0, grammarAccess.getEnumAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0());
-                          
-                    }
-                    if ( state.backtracking==0 ) {
+                            newLeafNode(lv_optional_0_0, grammarAccess.getEnumAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0());
+                        
 
-                      	        if (current==null) {
-                      	            current = createModelElement(grammarAccess.getEnumAnnotationAttributeRule());
-                      	        }
-                             		setWithLastConsumed(current, "optional", true, "optional");
-                      	    
-                    }
+                    	        if (current==null) {
+                    	            current = createModelElement(grammarAccess.getEnumAnnotationAttributeRule());
+                    	        }
+                           		setWithLastConsumed(current, "optional", true, "optional");
+                    	    
 
                     }
 
@@ -5070,99 +4595,83 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1769:7: otherlv_1= 'mandatory'
+                    // InternalConfig.g:1769:7: otherlv_1= 'mandatory'
                     {
-                    otherlv_1=(Token)match(input,40,FOLLOW_40_in_ruleEnumAnnotationAttribute4083); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    otherlv_1=(Token)match(input,40,FOLLOW_33); 
 
-                          	newLeafNode(otherlv_1, grammarAccess.getEnumAnnotationAttributeAccess().getMandatoryKeyword_0_1());
-                          
-                    }
+                        	newLeafNode(otherlv_1, grammarAccess.getEnumAnnotationAttributeAccess().getMandatoryKeyword_0_1());
+                        
 
                     }
                     break;
 
             }
 
-            otherlv_2=(Token)match(input,41,FOLLOW_41_in_ruleEnumAnnotationAttribute4096); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_2=(Token)match(input,41,FOLLOW_3); 
 
-                  	newLeafNode(otherlv_2, grammarAccess.getEnumAnnotationAttributeAccess().getAttributeKeyword_1());
-                  
-            }
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1777:1: ( (lv_name_3_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1778:1: (lv_name_3_0= RULE_ID )
+                	newLeafNode(otherlv_2, grammarAccess.getEnumAnnotationAttributeAccess().getAttributeKeyword_1());
+                
+            // InternalConfig.g:1777:1: ( (lv_name_3_0= RULE_ID ) )
+            // InternalConfig.g:1778:1: (lv_name_3_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1778:1: (lv_name_3_0= RULE_ID )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1779:3: lv_name_3_0= RULE_ID
+            // InternalConfig.g:1778:1: (lv_name_3_0= RULE_ID )
+            // InternalConfig.g:1779:3: lv_name_3_0= RULE_ID
             {
-            lv_name_3_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEnumAnnotationAttribute4113); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            lv_name_3_0=(Token)match(input,RULE_ID,FOLLOW_34); 
 
-              			newLeafNode(lv_name_3_0, grammarAccess.getEnumAnnotationAttributeAccess().getNameIDTerminalRuleCall_2_0()); 
-              		
-            }
-            if ( state.backtracking==0 ) {
+            			newLeafNode(lv_name_3_0, grammarAccess.getEnumAnnotationAttributeAccess().getNameIDTerminalRuleCall_2_0()); 
+            		
 
-              	        if (current==null) {
-              	            current = createModelElement(grammarAccess.getEnumAnnotationAttributeRule());
-              	        }
-                     		setWithLastConsumed(
-                     			current, 
-                     			"name",
-                      		lv_name_3_0, 
-                      		"ID");
-              	    
-            }
+            	        if (current==null) {
+            	            current = createModelElement(grammarAccess.getEnumAnnotationAttributeRule());
+            	        }
+                   		setWithLastConsumed(
+                   			current, 
+                   			"name",
+                    		lv_name_3_0, 
+                    		"org.eclipse.xtext.common.Terminals.ID");
+            	    
 
             }
 
 
             }
 
-            otherlv_4=(Token)match(input,38,FOLLOW_38_in_ruleEnumAnnotationAttribute4130); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_4=(Token)match(input,38,FOLLOW_4); 
 
-                  	newLeafNode(otherlv_4, grammarAccess.getEnumAnnotationAttributeAccess().getColonKeyword_3());
-                  
-            }
-            otherlv_5=(Token)match(input,13,FOLLOW_13_in_ruleEnumAnnotationAttribute4142); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+                	newLeafNode(otherlv_4, grammarAccess.getEnumAnnotationAttributeAccess().getColonKeyword_3());
+                
+            otherlv_5=(Token)match(input,13,FOLLOW_11); 
 
-                  	newLeafNode(otherlv_5, grammarAccess.getEnumAnnotationAttributeAccess().getLeftCurlyBracketKeyword_4());
-                  
-            }
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1803:1: ( (lv_values_6_0= RULE_STRING ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1804:1: (lv_values_6_0= RULE_STRING )
+                	newLeafNode(otherlv_5, grammarAccess.getEnumAnnotationAttributeAccess().getLeftCurlyBracketKeyword_4());
+                
+            // InternalConfig.g:1803:1: ( (lv_values_6_0= RULE_STRING ) )
+            // InternalConfig.g:1804:1: (lv_values_6_0= RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1804:1: (lv_values_6_0= RULE_STRING )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1805:3: lv_values_6_0= RULE_STRING
+            // InternalConfig.g:1804:1: (lv_values_6_0= RULE_STRING )
+            // InternalConfig.g:1805:3: lv_values_6_0= RULE_STRING
             {
-            lv_values_6_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleEnumAnnotationAttribute4159); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            lv_values_6_0=(Token)match(input,RULE_STRING,FOLLOW_36); 
 
-              			newLeafNode(lv_values_6_0, grammarAccess.getEnumAnnotationAttributeAccess().getValuesSTRINGTerminalRuleCall_5_0()); 
-              		
-            }
-            if ( state.backtracking==0 ) {
+            			newLeafNode(lv_values_6_0, grammarAccess.getEnumAnnotationAttributeAccess().getValuesSTRINGTerminalRuleCall_5_0()); 
+            		
 
-              	        if (current==null) {
-              	            current = createModelElement(grammarAccess.getEnumAnnotationAttributeRule());
-              	        }
-                     		addWithLastConsumed(
-                     			current, 
-                     			"values",
-                      		lv_values_6_0, 
-                      		"STRING");
-              	    
-            }
+            	        if (current==null) {
+            	            current = createModelElement(grammarAccess.getEnumAnnotationAttributeRule());
+            	        }
+                   		addWithLastConsumed(
+                   			current, 
+                   			"values",
+                    		lv_values_6_0, 
+                    		"org.eclipse.xtext.common.Terminals.STRING");
+            	    
 
             }
 
 
             }
 
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1821:2: (otherlv_7= ',' ( (lv_values_8_0= RULE_STRING ) ) )*
+            // InternalConfig.g:1821:2: (otherlv_7= ',' ( (lv_values_8_0= RULE_STRING ) ) )*
             loop31:
             do {
                 int alt31=2;
@@ -5175,38 +4684,32 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
                 switch (alt31) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1821:4: otherlv_7= ',' ( (lv_values_8_0= RULE_STRING ) )
+            	    // InternalConfig.g:1821:4: otherlv_7= ',' ( (lv_values_8_0= RULE_STRING ) )
             	    {
-            	    otherlv_7=(Token)match(input,36,FOLLOW_36_in_ruleEnumAnnotationAttribute4177); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
+            	    otherlv_7=(Token)match(input,36,FOLLOW_11); 
 
-            	          	newLeafNode(otherlv_7, grammarAccess.getEnumAnnotationAttributeAccess().getCommaKeyword_6_0());
-            	          
-            	    }
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1825:1: ( (lv_values_8_0= RULE_STRING ) )
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1826:1: (lv_values_8_0= RULE_STRING )
+            	        	newLeafNode(otherlv_7, grammarAccess.getEnumAnnotationAttributeAccess().getCommaKeyword_6_0());
+            	        
+            	    // InternalConfig.g:1825:1: ( (lv_values_8_0= RULE_STRING ) )
+            	    // InternalConfig.g:1826:1: (lv_values_8_0= RULE_STRING )
             	    {
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1826:1: (lv_values_8_0= RULE_STRING )
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1827:3: lv_values_8_0= RULE_STRING
+            	    // InternalConfig.g:1826:1: (lv_values_8_0= RULE_STRING )
+            	    // InternalConfig.g:1827:3: lv_values_8_0= RULE_STRING
             	    {
-            	    lv_values_8_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleEnumAnnotationAttribute4194); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
+            	    lv_values_8_0=(Token)match(input,RULE_STRING,FOLLOW_36); 
 
-            	      			newLeafNode(lv_values_8_0, grammarAccess.getEnumAnnotationAttributeAccess().getValuesSTRINGTerminalRuleCall_6_1_0()); 
-            	      		
-            	    }
-            	    if ( state.backtracking==0 ) {
-
-            	      	        if (current==null) {
-            	      	            current = createModelElement(grammarAccess.getEnumAnnotationAttributeRule());
-            	      	        }
-            	             		addWithLastConsumed(
-            	             			current, 
-            	             			"values",
-            	              		lv_values_8_0, 
-            	              		"STRING");
-            	      	    
-            	    }
+            	    			newLeafNode(lv_values_8_0, grammarAccess.getEnumAnnotationAttributeAccess().getValuesSTRINGTerminalRuleCall_6_1_0()); 
+            	    		
+
+            	    	        if (current==null) {
+            	    	            current = createModelElement(grammarAccess.getEnumAnnotationAttributeRule());
+            	    	        }
+            	           		addWithLastConsumed(
+            	           			current, 
+            	           			"values",
+            	            		lv_values_8_0, 
+            	            		"org.eclipse.xtext.common.Terminals.STRING");
+            	    	    
 
             	    }
 
@@ -5222,21 +4725,17 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                 }
             } while (true);
 
-            otherlv_9=(Token)match(input,14,FOLLOW_14_in_ruleEnumAnnotationAttribute4213); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_9=(Token)match(input,14,FOLLOW_2); 
 
-                  	newLeafNode(otherlv_9, grammarAccess.getEnumAnnotationAttributeAccess().getRightCurlyBracketKeyword_7());
-                  
-            }
+                	newLeafNode(otherlv_9, grammarAccess.getEnumAnnotationAttributeAccess().getRightCurlyBracketKeyword_7());
+                
 
             }
 
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -5251,7 +4750,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleImport"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1855:1: entryRuleImport returns [EObject current=null] : iv_ruleImport= ruleImport EOF ;
+    // InternalConfig.g:1855:1: entryRuleImport returns [EObject current=null] : iv_ruleImport= ruleImport EOF ;
     public final EObject entryRuleImport() throws RecognitionException {
         EObject current = null;
 
@@ -5259,21 +4758,17 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1856:2: (iv_ruleImport= ruleImport EOF )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1857:2: iv_ruleImport= ruleImport EOF
+            // InternalConfig.g:1856:2: (iv_ruleImport= ruleImport EOF )
+            // InternalConfig.g:1857:2: iv_ruleImport= ruleImport EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getImportRule()); 
-            }
-            pushFollow(FOLLOW_ruleImport_in_entryRuleImport4249);
+             newCompositeNode(grammarAccess.getImportRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleImport=ruleImport();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleImport; 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleImport4259); if (state.failed) return current;
+
+             current =iv_ruleImport; 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -5291,7 +4786,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleImport"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1864:1: ruleImport returns [EObject current=null] : (otherlv_0= 'import' ( ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' ) | otherlv_3= 'model' ) ( (lv_importURI_4_0= RULE_STRING ) ) ) ;
+    // InternalConfig.g:1864:1: ruleImport returns [EObject current=null] : (otherlv_0= 'import' ( ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' ) | otherlv_3= 'model' ) ( (lv_importURI_4_0= RULE_STRING ) ) ) ;
     public final EObject ruleImport() throws RecognitionException {
         EObject current = null;
 
@@ -5305,19 +4800,17 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1867:28: ( (otherlv_0= 'import' ( ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' ) | otherlv_3= 'model' ) ( (lv_importURI_4_0= RULE_STRING ) ) ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1868:1: (otherlv_0= 'import' ( ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' ) | otherlv_3= 'model' ) ( (lv_importURI_4_0= RULE_STRING ) ) )
+            // InternalConfig.g:1867:28: ( (otherlv_0= 'import' ( ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' ) | otherlv_3= 'model' ) ( (lv_importURI_4_0= RULE_STRING ) ) ) )
+            // InternalConfig.g:1868:1: (otherlv_0= 'import' ( ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' ) | otherlv_3= 'model' ) ( (lv_importURI_4_0= RULE_STRING ) ) )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1868:1: (otherlv_0= 'import' ( ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' ) | otherlv_3= 'model' ) ( (lv_importURI_4_0= RULE_STRING ) ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1868:3: otherlv_0= 'import' ( ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' ) | otherlv_3= 'model' ) ( (lv_importURI_4_0= RULE_STRING ) )
+            // InternalConfig.g:1868:1: (otherlv_0= 'import' ( ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' ) | otherlv_3= 'model' ) ( (lv_importURI_4_0= RULE_STRING ) ) )
+            // InternalConfig.g:1868:3: otherlv_0= 'import' ( ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' ) | otherlv_3= 'model' ) ( (lv_importURI_4_0= RULE_STRING ) )
             {
-            otherlv_0=(Token)match(input,42,FOLLOW_42_in_ruleImport4296); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_0=(Token)match(input,42,FOLLOW_37); 
 
-                  	newLeafNode(otherlv_0, grammarAccess.getImportAccess().getImportKeyword_0());
-                  
-            }
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1872:1: ( ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' ) | otherlv_3= 'model' )
+                	newLeafNode(otherlv_0, grammarAccess.getImportAccess().getImportKeyword_0());
+                
+            // InternalConfig.g:1872:1: ( ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' ) | otherlv_3= 'model' )
             int alt32=2;
             int LA32_0 = input.LA(1);
 
@@ -5328,7 +4821,6 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                 alt32=2;
             }
             else {
-                if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
                     new NoViableAltException("", 32, 0, input);
 
@@ -5336,97 +4828,85 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
             }
             switch (alt32) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1872:2: ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' )
+                    // InternalConfig.g:1872:2: ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' )
                     {
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1872:2: ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' )
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1872:3: ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from'
+                    // InternalConfig.g:1872:2: ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' )
+                    // InternalConfig.g:1872:3: ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from'
                     {
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1872:3: ( (lv_importedNamespace_1_0= ruleImportedFQN ) )
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1873:1: (lv_importedNamespace_1_0= ruleImportedFQN )
+                    // InternalConfig.g:1872:3: ( (lv_importedNamespace_1_0= ruleImportedFQN ) )
+                    // InternalConfig.g:1873:1: (lv_importedNamespace_1_0= ruleImportedFQN )
                     {
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1873:1: (lv_importedNamespace_1_0= ruleImportedFQN )
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1874:3: lv_importedNamespace_1_0= ruleImportedFQN
+                    // InternalConfig.g:1873:1: (lv_importedNamespace_1_0= ruleImportedFQN )
+                    // InternalConfig.g:1874:3: lv_importedNamespace_1_0= ruleImportedFQN
                     {
-                    if ( state.backtracking==0 ) {
-                       
-                      	        newCompositeNode(grammarAccess.getImportAccess().getImportedNamespaceImportedFQNParserRuleCall_1_0_0_0()); 
-                      	    
-                    }
-                    pushFollow(FOLLOW_ruleImportedFQN_in_ruleImport4319);
+                     
+                    	        newCompositeNode(grammarAccess.getImportAccess().getImportedNamespaceImportedFQNParserRuleCall_1_0_0_0()); 
+                    	    
+                    pushFollow(FOLLOW_38);
                     lv_importedNamespace_1_0=ruleImportedFQN();
 
                     state._fsp--;
-                    if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
-
-                      	        if (current==null) {
-                      	            current = createModelElementForParent(grammarAccess.getImportRule());
-                      	        }
-                             		set(
-                             			current, 
-                             			"importedNamespace",
-                              		lv_importedNamespace_1_0, 
-                              		"ImportedFQN");
-                      	        afterParserOrEnumRuleCall();
-                      	    
-                    }
 
-                    }
 
+                    	        if (current==null) {
+                    	            current = createModelElementForParent(grammarAccess.getImportRule());
+                    	        }
+                           		set(
+                           			current, 
+                           			"importedNamespace",
+                            		lv_importedNamespace_1_0, 
+                            		"org.eclipse.etrice.core.common.Base.ImportedFQN");
+                    	        afterParserOrEnumRuleCall();
+                    	    
 
                     }
 
-                    otherlv_2=(Token)match(input,43,FOLLOW_43_in_ruleImport4331); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
 
-                          	newLeafNode(otherlv_2, grammarAccess.getImportAccess().getFromKeyword_1_0_1());
-                          
                     }
 
+                    otherlv_2=(Token)match(input,43,FOLLOW_11); 
+
+                        	newLeafNode(otherlv_2, grammarAccess.getImportAccess().getFromKeyword_1_0_1());
+                        
+
                     }
 
 
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1895:7: otherlv_3= 'model'
+                    // InternalConfig.g:1895:7: otherlv_3= 'model'
                     {
-                    otherlv_3=(Token)match(input,44,FOLLOW_44_in_ruleImport4350); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    otherlv_3=(Token)match(input,44,FOLLOW_11); 
 
-                          	newLeafNode(otherlv_3, grammarAccess.getImportAccess().getModelKeyword_1_1());
-                          
-                    }
+                        	newLeafNode(otherlv_3, grammarAccess.getImportAccess().getModelKeyword_1_1());
+                        
 
                     }
                     break;
 
             }
 
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1899:2: ( (lv_importURI_4_0= RULE_STRING ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1900:1: (lv_importURI_4_0= RULE_STRING )
+            // InternalConfig.g:1899:2: ( (lv_importURI_4_0= RULE_STRING ) )
+            // InternalConfig.g:1900:1: (lv_importURI_4_0= RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1900:1: (lv_importURI_4_0= RULE_STRING )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1901:3: lv_importURI_4_0= RULE_STRING
+            // InternalConfig.g:1900:1: (lv_importURI_4_0= RULE_STRING )
+            // InternalConfig.g:1901:3: lv_importURI_4_0= RULE_STRING
             {
-            lv_importURI_4_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleImport4368); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            lv_importURI_4_0=(Token)match(input,RULE_STRING,FOLLOW_2); 
 
-              			newLeafNode(lv_importURI_4_0, grammarAccess.getImportAccess().getImportURISTRINGTerminalRuleCall_2_0()); 
-              		
-            }
-            if ( state.backtracking==0 ) {
+            			newLeafNode(lv_importURI_4_0, grammarAccess.getImportAccess().getImportURISTRINGTerminalRuleCall_2_0()); 
+            		
 
-              	        if (current==null) {
-              	            current = createModelElement(grammarAccess.getImportRule());
-              	        }
-                     		setWithLastConsumed(
-                     			current, 
-                     			"importURI",
-                      		lv_importURI_4_0, 
-                      		"STRING");
-              	    
-            }
+            	        if (current==null) {
+            	            current = createModelElement(grammarAccess.getImportRule());
+            	        }
+                   		setWithLastConsumed(
+                   			current, 
+                   			"importURI",
+                    		lv_importURI_4_0, 
+                    		"org.eclipse.xtext.common.Terminals.STRING");
+            	    
 
             }
 
@@ -5439,9 +4919,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -5456,7 +4934,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleImportedFQN"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1925:1: entryRuleImportedFQN returns [String current=null] : iv_ruleImportedFQN= ruleImportedFQN EOF ;
+    // InternalConfig.g:1925:1: entryRuleImportedFQN returns [String current=null] : iv_ruleImportedFQN= ruleImportedFQN EOF ;
     public final String entryRuleImportedFQN() throws RecognitionException {
         String current = null;
 
@@ -5464,21 +4942,17 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1926:2: (iv_ruleImportedFQN= ruleImportedFQN EOF )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1927:2: iv_ruleImportedFQN= ruleImportedFQN EOF
+            // InternalConfig.g:1926:2: (iv_ruleImportedFQN= ruleImportedFQN EOF )
+            // InternalConfig.g:1927:2: iv_ruleImportedFQN= ruleImportedFQN EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getImportedFQNRule()); 
-            }
-            pushFollow(FOLLOW_ruleImportedFQN_in_entryRuleImportedFQN4410);
+             newCompositeNode(grammarAccess.getImportedFQNRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleImportedFQN=ruleImportedFQN();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleImportedFQN.getText(); 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleImportedFQN4421); if (state.failed) return current;
+
+             current =iv_ruleImportedFQN.getText(); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -5496,7 +4970,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleImportedFQN"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1934:1: ruleImportedFQN returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_FQN_0= ruleFQN (kw= '.*' )? ) ;
+    // InternalConfig.g:1934:1: ruleImportedFQN returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_FQN_0= ruleFQN (kw= '.*' )? ) ;
     public final AntlrDatatypeRuleToken ruleImportedFQN() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -5507,33 +4981,27 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1937:28: ( (this_FQN_0= ruleFQN (kw= '.*' )? ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1938:1: (this_FQN_0= ruleFQN (kw= '.*' )? )
+            // InternalConfig.g:1937:28: ( (this_FQN_0= ruleFQN (kw= '.*' )? ) )
+            // InternalConfig.g:1938:1: (this_FQN_0= ruleFQN (kw= '.*' )? )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1938:1: (this_FQN_0= ruleFQN (kw= '.*' )? )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1939:5: this_FQN_0= ruleFQN (kw= '.*' )?
+            // InternalConfig.g:1938:1: (this_FQN_0= ruleFQN (kw= '.*' )? )
+            // InternalConfig.g:1939:5: this_FQN_0= ruleFQN (kw= '.*' )?
             {
-            if ( state.backtracking==0 ) {
-               
-                      newCompositeNode(grammarAccess.getImportedFQNAccess().getFQNParserRuleCall_0()); 
-                  
-            }
-            pushFollow(FOLLOW_ruleFQN_in_ruleImportedFQN4468);
+             
+                    newCompositeNode(grammarAccess.getImportedFQNAccess().getFQNParserRuleCall_0()); 
+                
+            pushFollow(FOLLOW_39);
             this_FQN_0=ruleFQN();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
 
-              		current.merge(this_FQN_0);
-                  
-            }
-            if ( state.backtracking==0 ) {
-               
-                      afterParserOrEnumRuleCall();
-                  
-            }
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1949:1: (kw= '.*' )?
+
+            		current.merge(this_FQN_0);
+                
+             
+                    afterParserOrEnumRuleCall();
+                
+            // InternalConfig.g:1949:1: (kw= '.*' )?
             int alt33=2;
             int LA33_0 = input.LA(1);
 
@@ -5542,15 +5010,13 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
             }
             switch (alt33) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1950:2: kw= '.*'
+                    // InternalConfig.g:1950:2: kw= '.*'
                     {
-                    kw=(Token)match(input,45,FOLLOW_45_in_ruleImportedFQN4487); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    kw=(Token)match(input,45,FOLLOW_2); 
 
-                              current.merge(kw);
-                              newLeafNode(kw, grammarAccess.getImportedFQNAccess().getFullStopAsteriskKeyword_1()); 
-                          
-                    }
+                            current.merge(kw);
+                            newLeafNode(kw, grammarAccess.getImportedFQNAccess().getFullStopAsteriskKeyword_1()); 
+                        
 
                     }
                     break;
@@ -5563,9 +5029,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -5580,7 +5044,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleDocumentation"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1963:1: entryRuleDocumentation returns [EObject current=null] : iv_ruleDocumentation= ruleDocumentation EOF ;
+    // InternalConfig.g:1963:1: entryRuleDocumentation returns [EObject current=null] : iv_ruleDocumentation= ruleDocumentation EOF ;
     public final EObject entryRuleDocumentation() throws RecognitionException {
         EObject current = null;
 
@@ -5588,21 +5052,17 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1964:2: (iv_ruleDocumentation= ruleDocumentation EOF )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1965:2: iv_ruleDocumentation= ruleDocumentation EOF
+            // InternalConfig.g:1964:2: (iv_ruleDocumentation= ruleDocumentation EOF )
+            // InternalConfig.g:1965:2: iv_ruleDocumentation= ruleDocumentation EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getDocumentationRule()); 
-            }
-            pushFollow(FOLLOW_ruleDocumentation_in_entryRuleDocumentation4529);
+             newCompositeNode(grammarAccess.getDocumentationRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleDocumentation=ruleDocumentation();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleDocumentation; 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDocumentation4539); if (state.failed) return current;
+
+             current =iv_ruleDocumentation; 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -5620,7 +5080,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleDocumentation"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1972:1: ruleDocumentation returns [EObject current=null] : ( () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']' ) ;
+    // InternalConfig.g:1972: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;
 
@@ -5631,32 +5091,28 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1975:28: ( ( () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']' ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1976:1: ( () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']' )
+            // InternalConfig.g:1975:28: ( ( () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']' ) )
+            // InternalConfig.g:1976:1: ( () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']' )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1976:1: ( () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']' )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1976:2: () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']'
+            // InternalConfig.g:1976:1: ( () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']' )
+            // InternalConfig.g:1976:2: () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']'
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1976:2: ()
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1977:5: 
+            // InternalConfig.g:1976:2: ()
+            // InternalConfig.g:1977:5: 
             {
-            if ( state.backtracking==0 ) {
 
-                      current = forceCreateModelElement(
-                          grammarAccess.getDocumentationAccess().getDocumentationAction_0(),
-                          current);
-                  
-            }
+                    current = forceCreateModelElement(
+                        grammarAccess.getDocumentationAccess().getDocumentationAction_0(),
+                        current);
+                
 
             }
 
-            otherlv_1=(Token)match(input,46,FOLLOW_46_in_ruleDocumentation4585); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_1=(Token)match(input,46,FOLLOW_40); 
 
-                  	newLeafNode(otherlv_1, grammarAccess.getDocumentationAccess().getLeftSquareBracketKeyword_1());
-                  
-            }
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1986:1: ( (lv_lines_2_0= RULE_STRING ) )*
+                	newLeafNode(otherlv_1, grammarAccess.getDocumentationAccess().getLeftSquareBracketKeyword_1());
+                
+            // InternalConfig.g:1986:1: ( (lv_lines_2_0= RULE_STRING ) )*
             loop34:
             do {
                 int alt34=2;
@@ -5669,29 +5125,25 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
                 switch (alt34) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1987:1: (lv_lines_2_0= RULE_STRING )
+            	    // InternalConfig.g:1987:1: (lv_lines_2_0= RULE_STRING )
             	    {
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1987:1: (lv_lines_2_0= RULE_STRING )
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:1988:3: lv_lines_2_0= RULE_STRING
+            	    // InternalConfig.g:1987:1: (lv_lines_2_0= RULE_STRING )
+            	    // InternalConfig.g:1988:3: lv_lines_2_0= RULE_STRING
             	    {
-            	    lv_lines_2_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleDocumentation4602); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
+            	    lv_lines_2_0=(Token)match(input,RULE_STRING,FOLLOW_40); 
 
-            	      			newLeafNode(lv_lines_2_0, grammarAccess.getDocumentationAccess().getLinesSTRINGTerminalRuleCall_2_0()); 
-            	      		
-            	    }
-            	    if ( state.backtracking==0 ) {
-
-            	      	        if (current==null) {
-            	      	            current = createModelElement(grammarAccess.getDocumentationRule());
-            	      	        }
-            	             		addWithLastConsumed(
-            	             			current, 
-            	             			"lines",
-            	              		lv_lines_2_0, 
-            	              		"STRING");
-            	      	    
-            	    }
+            	    			newLeafNode(lv_lines_2_0, grammarAccess.getDocumentationAccess().getLinesSTRINGTerminalRuleCall_2_0()); 
+            	    		
+
+            	    	        if (current==null) {
+            	    	            current = createModelElement(grammarAccess.getDocumentationRule());
+            	    	        }
+            	           		addWithLastConsumed(
+            	           			current, 
+            	           			"lines",
+            	            		lv_lines_2_0, 
+            	            		"org.eclipse.xtext.common.Terminals.STRING");
+            	    	    
 
             	    }
 
@@ -5704,21 +5156,17 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                 }
             } while (true);
 
-            otherlv_3=(Token)match(input,47,FOLLOW_47_in_ruleDocumentation4620); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_3=(Token)match(input,47,FOLLOW_2); 
 
-                  	newLeafNode(otherlv_3, grammarAccess.getDocumentationAccess().getRightSquareBracketKeyword_3());
-                  
-            }
+                	newLeafNode(otherlv_3, grammarAccess.getDocumentationAccess().getRightSquareBracketKeyword_3());
+                
 
             }
 
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -5733,7 +5181,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTIME"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2016:1: entryRuleTIME returns [String current=null] : iv_ruleTIME= ruleTIME EOF ;
+    // InternalConfig.g:2016:1: entryRuleTIME returns [String current=null] : iv_ruleTIME= ruleTIME EOF ;
     public final String entryRuleTIME() throws RecognitionException {
         String current = null;
 
@@ -5741,21 +5189,17 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2017:2: (iv_ruleTIME= ruleTIME EOF )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2018:2: iv_ruleTIME= ruleTIME EOF
+            // InternalConfig.g:2017:2: (iv_ruleTIME= ruleTIME EOF )
+            // InternalConfig.g:2018:2: iv_ruleTIME= ruleTIME EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getTIMERule()); 
-            }
-            pushFollow(FOLLOW_ruleTIME_in_entryRuleTIME4657);
+             newCompositeNode(grammarAccess.getTIMERule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleTIME=ruleTIME();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleTIME.getText(); 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleTIME4668); if (state.failed) return current;
+
+             current =iv_ruleTIME.getText(); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -5773,7 +5217,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTIME"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2025:1: ruleTIME returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : ( (this_INT_0= RULE_INT kw= 's' ) | (this_INT_2= RULE_INT kw= 'ms' ) | (this_INT_4= RULE_INT kw= 'us' ) | (this_INT_6= RULE_INT kw= 'ns' ) ) ;
+    // InternalConfig.g:2025:1: ruleTIME returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : ( (this_INT_0= RULE_INT kw= 's' ) | (this_INT_2= RULE_INT kw= 'ms' ) | (this_INT_4= RULE_INT kw= 'us' ) | (this_INT_6= RULE_INT kw= 'ns' ) ) ;
     public final AntlrDatatypeRuleToken ruleTIME() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -5786,20 +5230,15 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2028:28: ( ( (this_INT_0= RULE_INT kw= 's' ) | (this_INT_2= RULE_INT kw= 'ms' ) | (this_INT_4= RULE_INT kw= 'us' ) | (this_INT_6= RULE_INT kw= 'ns' ) ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2029:1: ( (this_INT_0= RULE_INT kw= 's' ) | (this_INT_2= RULE_INT kw= 'ms' ) | (this_INT_4= RULE_INT kw= 'us' ) | (this_INT_6= RULE_INT kw= 'ns' ) )
+            // InternalConfig.g:2028:28: ( ( (this_INT_0= RULE_INT kw= 's' ) | (this_INT_2= RULE_INT kw= 'ms' ) | (this_INT_4= RULE_INT kw= 'us' ) | (this_INT_6= RULE_INT kw= 'ns' ) ) )
+            // InternalConfig.g:2029:1: ( (this_INT_0= RULE_INT kw= 's' ) | (this_INT_2= RULE_INT kw= 'ms' ) | (this_INT_4= RULE_INT kw= 'us' ) | (this_INT_6= RULE_INT kw= 'ns' ) )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2029:1: ( (this_INT_0= RULE_INT kw= 's' ) | (this_INT_2= RULE_INT kw= 'ms' ) | (this_INT_4= RULE_INT kw= 'us' ) | (this_INT_6= RULE_INT kw= 'ns' ) )
+            // InternalConfig.g:2029:1: ( (this_INT_0= RULE_INT kw= 's' ) | (this_INT_2= RULE_INT kw= 'ms' ) | (this_INT_4= RULE_INT kw= 'us' ) | (this_INT_6= RULE_INT kw= 'ns' ) )
             int alt35=4;
             int LA35_0 = input.LA(1);
 
             if ( (LA35_0==RULE_INT) ) {
                 switch ( input.LA(2) ) {
-                case 48:
-                    {
-                    alt35=1;
-                    }
-                    break;
                 case 51:
                     {
                     alt35=4;
@@ -5815,8 +5254,12 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                     alt35=2;
                     }
                     break;
+                case 48:
+                    {
+                    alt35=1;
+                    }
+                    break;
                 default:
-                    if (state.backtracking>0) {state.failed=true; return current;}
                     NoViableAltException nvae =
                         new NoViableAltException("", 35, 1, input);
 
@@ -5825,7 +5268,6 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
             }
             else {
-                if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
                     new NoViableAltException("", 35, 0, input);
 
@@ -5833,29 +5275,23 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
             }
             switch (alt35) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2029:2: (this_INT_0= RULE_INT kw= 's' )
+                    // InternalConfig.g:2029:2: (this_INT_0= RULE_INT kw= 's' )
                     {
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2029:2: (this_INT_0= RULE_INT kw= 's' )
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2029:7: this_INT_0= RULE_INT kw= 's'
+                    // InternalConfig.g:2029:2: (this_INT_0= RULE_INT kw= 's' )
+                    // InternalConfig.g:2029:7: this_INT_0= RULE_INT kw= 's'
                     {
-                    this_INT_0=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleTIME4709); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    this_INT_0=(Token)match(input,RULE_INT,FOLLOW_41); 
 
-                      		current.merge(this_INT_0);
-                          
-                    }
-                    if ( state.backtracking==0 ) {
-                       
-                          newLeafNode(this_INT_0, grammarAccess.getTIMEAccess().getINTTerminalRuleCall_0_0()); 
-                          
-                    }
-                    kw=(Token)match(input,48,FOLLOW_48_in_ruleTIME4727); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    		current.merge(this_INT_0);
+                        
+                     
+                        newLeafNode(this_INT_0, grammarAccess.getTIMEAccess().getINTTerminalRuleCall_0_0()); 
+                        
+                    kw=(Token)match(input,48,FOLLOW_2); 
 
-                              current.merge(kw);
-                              newLeafNode(kw, grammarAccess.getTIMEAccess().getSKeyword_0_1()); 
-                          
-                    }
+                            current.merge(kw);
+                            newLeafNode(kw, grammarAccess.getTIMEAccess().getSKeyword_0_1()); 
+                        
 
                     }
 
@@ -5863,29 +5299,23 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2043:6: (this_INT_2= RULE_INT kw= 'ms' )
+                    // InternalConfig.g:2043:6: (this_INT_2= RULE_INT kw= 'ms' )
                     {
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2043:6: (this_INT_2= RULE_INT kw= 'ms' )
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2043:11: this_INT_2= RULE_INT kw= 'ms'
+                    // InternalConfig.g:2043:6: (this_INT_2= RULE_INT kw= 'ms' )
+                    // InternalConfig.g:2043:11: this_INT_2= RULE_INT kw= 'ms'
                     {
-                    this_INT_2=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleTIME4750); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    this_INT_2=(Token)match(input,RULE_INT,FOLLOW_42); 
 
-                      		current.merge(this_INT_2);
-                          
-                    }
-                    if ( state.backtracking==0 ) {
-                       
-                          newLeafNode(this_INT_2, grammarAccess.getTIMEAccess().getINTTerminalRuleCall_1_0()); 
-                          
-                    }
-                    kw=(Token)match(input,49,FOLLOW_49_in_ruleTIME4768); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    		current.merge(this_INT_2);
+                        
+                     
+                        newLeafNode(this_INT_2, grammarAccess.getTIMEAccess().getINTTerminalRuleCall_1_0()); 
+                        
+                    kw=(Token)match(input,49,FOLLOW_2); 
 
-                              current.merge(kw);
-                              newLeafNode(kw, grammarAccess.getTIMEAccess().getMsKeyword_1_1()); 
-                          
-                    }
+                            current.merge(kw);
+                            newLeafNode(kw, grammarAccess.getTIMEAccess().getMsKeyword_1_1()); 
+                        
 
                     }
 
@@ -5893,29 +5323,23 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2057:6: (this_INT_4= RULE_INT kw= 'us' )
+                    // InternalConfig.g:2057:6: (this_INT_4= RULE_INT kw= 'us' )
                     {
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2057:6: (this_INT_4= RULE_INT kw= 'us' )
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2057:11: this_INT_4= RULE_INT kw= 'us'
+                    // InternalConfig.g:2057:6: (this_INT_4= RULE_INT kw= 'us' )
+                    // InternalConfig.g:2057:11: this_INT_4= RULE_INT kw= 'us'
                     {
-                    this_INT_4=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleTIME4791); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    this_INT_4=(Token)match(input,RULE_INT,FOLLOW_43); 
 
-                      		current.merge(this_INT_4);
-                          
-                    }
-                    if ( state.backtracking==0 ) {
-                       
-                          newLeafNode(this_INT_4, grammarAccess.getTIMEAccess().getINTTerminalRuleCall_2_0()); 
-                          
-                    }
-                    kw=(Token)match(input,50,FOLLOW_50_in_ruleTIME4809); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    		current.merge(this_INT_4);
+                        
+                     
+                        newLeafNode(this_INT_4, grammarAccess.getTIMEAccess().getINTTerminalRuleCall_2_0()); 
+                        
+                    kw=(Token)match(input,50,FOLLOW_2); 
 
-                              current.merge(kw);
-                              newLeafNode(kw, grammarAccess.getTIMEAccess().getUsKeyword_2_1()); 
-                          
-                    }
+                            current.merge(kw);
+                            newLeafNode(kw, grammarAccess.getTIMEAccess().getUsKeyword_2_1()); 
+                        
 
                     }
 
@@ -5923,29 +5347,23 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 4 :
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2071:6: (this_INT_6= RULE_INT kw= 'ns' )
+                    // InternalConfig.g:2071:6: (this_INT_6= RULE_INT kw= 'ns' )
                     {
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2071:6: (this_INT_6= RULE_INT kw= 'ns' )
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2071:11: this_INT_6= RULE_INT kw= 'ns'
+                    // InternalConfig.g:2071:6: (this_INT_6= RULE_INT kw= 'ns' )
+                    // InternalConfig.g:2071:11: this_INT_6= RULE_INT kw= 'ns'
                     {
-                    this_INT_6=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleTIME4832); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    this_INT_6=(Token)match(input,RULE_INT,FOLLOW_44); 
 
-                      		current.merge(this_INT_6);
-                          
-                    }
-                    if ( state.backtracking==0 ) {
-                       
-                          newLeafNode(this_INT_6, grammarAccess.getTIMEAccess().getINTTerminalRuleCall_3_0()); 
-                          
-                    }
-                    kw=(Token)match(input,51,FOLLOW_51_in_ruleTIME4850); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    		current.merge(this_INT_6);
+                        
+                     
+                        newLeafNode(this_INT_6, grammarAccess.getTIMEAccess().getINTTerminalRuleCall_3_0()); 
+                        
+                    kw=(Token)match(input,51,FOLLOW_2); 
 
-                              current.merge(kw);
-                              newLeafNode(kw, grammarAccess.getTIMEAccess().getNsKeyword_3_1()); 
-                          
-                    }
+                            current.merge(kw);
+                            newLeafNode(kw, grammarAccess.getTIMEAccess().getNsKeyword_3_1()); 
+                        
 
                     }
 
@@ -5958,9 +5376,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -5975,7 +5391,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleLiteral"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2094:1: entryRuleLiteral returns [EObject current=null] : iv_ruleLiteral= ruleLiteral EOF ;
+    // InternalConfig.g:2094:1: entryRuleLiteral returns [EObject current=null] : iv_ruleLiteral= ruleLiteral EOF ;
     public final EObject entryRuleLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -5983,21 +5399,17 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2095:2: (iv_ruleLiteral= ruleLiteral EOF )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2096:2: iv_ruleLiteral= ruleLiteral EOF
+            // InternalConfig.g:2095:2: (iv_ruleLiteral= ruleLiteral EOF )
+            // InternalConfig.g:2096:2: iv_ruleLiteral= ruleLiteral EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getLiteralRule()); 
-            }
-            pushFollow(FOLLOW_ruleLiteral_in_entryRuleLiteral4893);
+             newCompositeNode(grammarAccess.getLiteralRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleLiteral=ruleLiteral();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleLiteral; 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleLiteral4903); if (state.failed) return current;
+
+             current =iv_ruleLiteral; 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -6015,7 +5427,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleLiteral"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2103:1: ruleLiteral returns [EObject current=null] : (this_BooleanLiteral_0= ruleBooleanLiteral | this_NumberLiteral_1= ruleNumberLiteral | this_StringLiteral_2= ruleStringLiteral ) ;
+    // InternalConfig.g:2103: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;
 
@@ -6029,10 +5441,10 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2106:28: ( (this_BooleanLiteral_0= ruleBooleanLiteral | this_NumberLiteral_1= ruleNumberLiteral | this_StringLiteral_2= ruleStringLiteral ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2107:1: (this_BooleanLiteral_0= ruleBooleanLiteral | this_NumberLiteral_1= ruleNumberLiteral | this_StringLiteral_2= ruleStringLiteral )
+            // InternalConfig.g:2106:28: ( (this_BooleanLiteral_0= ruleBooleanLiteral | this_NumberLiteral_1= ruleNumberLiteral | this_StringLiteral_2= ruleStringLiteral ) )
+            // InternalConfig.g:2107:1: (this_BooleanLiteral_0= ruleBooleanLiteral | this_NumberLiteral_1= ruleNumberLiteral | this_StringLiteral_2= ruleStringLiteral )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2107:1: (this_BooleanLiteral_0= ruleBooleanLiteral | this_NumberLiteral_1= ruleNumberLiteral | this_StringLiteral_2= ruleStringLiteral )
+            // InternalConfig.g:2107:1: (this_BooleanLiteral_0= ruleBooleanLiteral | this_NumberLiteral_1= ruleNumberLiteral | this_StringLiteral_2= ruleStringLiteral )
             int alt36=3;
             switch ( input.LA(1) ) {
             case 52:
@@ -6055,7 +5467,6 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                 }
                 break;
             default:
-                if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
                     new NoViableAltException("", 36, 0, input);
 
@@ -6064,68 +5475,56 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
             switch (alt36) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2108:5: this_BooleanLiteral_0= ruleBooleanLiteral
+                    // InternalConfig.g:2108:5: this_BooleanLiteral_0= ruleBooleanLiteral
                     {
-                    if ( state.backtracking==0 ) {
-                       
-                              newCompositeNode(grammarAccess.getLiteralAccess().getBooleanLiteralParserRuleCall_0()); 
-                          
-                    }
-                    pushFollow(FOLLOW_ruleBooleanLiteral_in_ruleLiteral4950);
+                     
+                            newCompositeNode(grammarAccess.getLiteralAccess().getBooleanLiteralParserRuleCall_0()); 
+                        
+                    pushFollow(FOLLOW_2);
                     this_BooleanLiteral_0=ruleBooleanLiteral();
 
                     state._fsp--;
-                    if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
-                       
-                              current = this_BooleanLiteral_0; 
-                              afterParserOrEnumRuleCall();
-                          
-                    }
+
+                     
+                            current = this_BooleanLiteral_0; 
+                            afterParserOrEnumRuleCall();
+                        
 
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2118:5: this_NumberLiteral_1= ruleNumberLiteral
+                    // InternalConfig.g:2118:5: this_NumberLiteral_1= ruleNumberLiteral
                     {
-                    if ( state.backtracking==0 ) {
-                       
-                              newCompositeNode(grammarAccess.getLiteralAccess().getNumberLiteralParserRuleCall_1()); 
-                          
-                    }
-                    pushFollow(FOLLOW_ruleNumberLiteral_in_ruleLiteral4977);
+                     
+                            newCompositeNode(grammarAccess.getLiteralAccess().getNumberLiteralParserRuleCall_1()); 
+                        
+                    pushFollow(FOLLOW_2);
                     this_NumberLiteral_1=ruleNumberLiteral();
 
                     state._fsp--;
-                    if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
-                       
-                              current = this_NumberLiteral_1; 
-                              afterParserOrEnumRuleCall();
-                          
-                    }
+
+                     
+                            current = this_NumberLiteral_1; 
+                            afterParserOrEnumRuleCall();
+                        
 
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2128:5: this_StringLiteral_2= ruleStringLiteral
+                    // InternalConfig.g:2128:5: this_StringLiteral_2= ruleStringLiteral
                     {
-                    if ( state.backtracking==0 ) {
-                       
-                              newCompositeNode(grammarAccess.getLiteralAccess().getStringLiteralParserRuleCall_2()); 
-                          
-                    }
-                    pushFollow(FOLLOW_ruleStringLiteral_in_ruleLiteral5004);
+                     
+                            newCompositeNode(grammarAccess.getLiteralAccess().getStringLiteralParserRuleCall_2()); 
+                        
+                    pushFollow(FOLLOW_2);
                     this_StringLiteral_2=ruleStringLiteral();
 
                     state._fsp--;
-                    if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
-                       
-                              current = this_StringLiteral_2; 
-                              afterParserOrEnumRuleCall();
-                          
-                    }
+
+                     
+                            current = this_StringLiteral_2; 
+                            afterParserOrEnumRuleCall();
+                        
 
                     }
                     break;
@@ -6135,9 +5534,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -6152,7 +5549,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleBooleanLiteral"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2144:1: entryRuleBooleanLiteral returns [EObject current=null] : iv_ruleBooleanLiteral= ruleBooleanLiteral EOF ;
+    // InternalConfig.g:2144:1: entryRuleBooleanLiteral returns [EObject current=null] : iv_ruleBooleanLiteral= ruleBooleanLiteral EOF ;
     public final EObject entryRuleBooleanLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -6160,21 +5557,17 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2145:2: (iv_ruleBooleanLiteral= ruleBooleanLiteral EOF )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2146:2: iv_ruleBooleanLiteral= ruleBooleanLiteral EOF
+            // InternalConfig.g:2145:2: (iv_ruleBooleanLiteral= ruleBooleanLiteral EOF )
+            // InternalConfig.g:2146:2: iv_ruleBooleanLiteral= ruleBooleanLiteral EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getBooleanLiteralRule()); 
-            }
-            pushFollow(FOLLOW_ruleBooleanLiteral_in_entryRuleBooleanLiteral5039);
+             newCompositeNode(grammarAccess.getBooleanLiteralRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleBooleanLiteral=ruleBooleanLiteral();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleBooleanLiteral; 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleBooleanLiteral5049); if (state.failed) return current;
+
+             current =iv_ruleBooleanLiteral; 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -6192,7 +5585,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleBooleanLiteral"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2153:1: ruleBooleanLiteral returns [EObject current=null] : ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) ) ;
+    // InternalConfig.g:2153:1: ruleBooleanLiteral returns [EObject current=null] : ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) ) ;
     public final EObject ruleBooleanLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -6202,26 +5595,24 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2156:28: ( ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2157:1: ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) )
+            // InternalConfig.g:2156:28: ( ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) ) )
+            // InternalConfig.g:2157:1: ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2157:1: ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2157:2: () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) )
+            // InternalConfig.g:2157:1: ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) )
+            // InternalConfig.g:2157:2: () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2157:2: ()
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2158:5: 
+            // InternalConfig.g:2157:2: ()
+            // InternalConfig.g:2158:5: 
             {
-            if ( state.backtracking==0 ) {
 
-                      current = forceCreateModelElement(
-                          grammarAccess.getBooleanLiteralAccess().getBooleanLiteralAction_0(),
-                          current);
-                  
-            }
+                    current = forceCreateModelElement(
+                        grammarAccess.getBooleanLiteralAccess().getBooleanLiteralAction_0(),
+                        current);
+                
 
             }
 
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2163:2: (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) )
+            // InternalConfig.g:2163:2: (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) )
             int alt37=2;
             int LA37_0 = input.LA(1);
 
@@ -6232,7 +5623,6 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                 alt37=2;
             }
             else {
-                if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
                     new NoViableAltException("", 37, 0, input);
 
@@ -6240,40 +5630,34 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
             }
             switch (alt37) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2163:4: otherlv_1= 'false'
+                    // InternalConfig.g:2163:4: otherlv_1= 'false'
                     {
-                    otherlv_1=(Token)match(input,52,FOLLOW_52_in_ruleBooleanLiteral5096); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    otherlv_1=(Token)match(input,52,FOLLOW_2); 
 
-                          	newLeafNode(otherlv_1, grammarAccess.getBooleanLiteralAccess().getFalseKeyword_1_0());
-                          
-                    }
+                        	newLeafNode(otherlv_1, grammarAccess.getBooleanLiteralAccess().getFalseKeyword_1_0());
+                        
 
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2168:6: ( (lv_isTrue_2_0= 'true' ) )
+                    // InternalConfig.g:2168:6: ( (lv_isTrue_2_0= 'true' ) )
                     {
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2168:6: ( (lv_isTrue_2_0= 'true' ) )
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2169:1: (lv_isTrue_2_0= 'true' )
+                    // InternalConfig.g:2168:6: ( (lv_isTrue_2_0= 'true' ) )
+                    // InternalConfig.g:2169:1: (lv_isTrue_2_0= 'true' )
                     {
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2169:1: (lv_isTrue_2_0= 'true' )
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2170:3: lv_isTrue_2_0= 'true'
+                    // InternalConfig.g:2169:1: (lv_isTrue_2_0= 'true' )
+                    // InternalConfig.g:2170:3: lv_isTrue_2_0= 'true'
                     {
-                    lv_isTrue_2_0=(Token)match(input,53,FOLLOW_53_in_ruleBooleanLiteral5120); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    lv_isTrue_2_0=(Token)match(input,53,FOLLOW_2); 
 
-                              newLeafNode(lv_isTrue_2_0, grammarAccess.getBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0());
-                          
-                    }
-                    if ( state.backtracking==0 ) {
+                            newLeafNode(lv_isTrue_2_0, grammarAccess.getBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0());
+                        
 
-                      	        if (current==null) {
-                      	            current = createModelElement(grammarAccess.getBooleanLiteralRule());
-                      	        }
-                             		setWithLastConsumed(current, "isTrue", true, "true");
-                      	    
-                    }
+                    	        if (current==null) {
+                    	            current = createModelElement(grammarAccess.getBooleanLiteralRule());
+                    	        }
+                           		setWithLastConsumed(current, "isTrue", true, "true");
+                    	    
 
                     }
 
@@ -6292,9 +5676,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -6309,7 +5691,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleNumberLiteral"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2191:1: entryRuleNumberLiteral returns [EObject current=null] : iv_ruleNumberLiteral= ruleNumberLiteral EOF ;
+    // InternalConfig.g:2191:1: entryRuleNumberLiteral returns [EObject current=null] : iv_ruleNumberLiteral= ruleNumberLiteral EOF ;
     public final EObject entryRuleNumberLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -6317,21 +5699,17 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2192:2: (iv_ruleNumberLiteral= ruleNumberLiteral EOF )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2193:2: iv_ruleNumberLiteral= ruleNumberLiteral EOF
+            // InternalConfig.g:2192:2: (iv_ruleNumberLiteral= ruleNumberLiteral EOF )
+            // InternalConfig.g:2193:2: iv_ruleNumberLiteral= ruleNumberLiteral EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getNumberLiteralRule()); 
-            }
-            pushFollow(FOLLOW_ruleNumberLiteral_in_entryRuleNumberLiteral5170);
+             newCompositeNode(grammarAccess.getNumberLiteralRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleNumberLiteral=ruleNumberLiteral();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleNumberLiteral; 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleNumberLiteral5180); if (state.failed) return current;
+
+             current =iv_ruleNumberLiteral; 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -6349,7 +5727,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleNumberLiteral"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2200:1: ruleNumberLiteral returns [EObject current=null] : (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral ) ;
+    // InternalConfig.g:2200:1: ruleNumberLiteral returns [EObject current=null] : (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral ) ;
     public final EObject ruleNumberLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -6361,10 +5739,10 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2203:28: ( (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2204:1: (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral )
+            // InternalConfig.g:2203:28: ( (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral ) )
+            // InternalConfig.g:2204:1: (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2204:1: (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral )
+            // InternalConfig.g:2204:1: (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral )
             int alt38=2;
             switch ( input.LA(1) ) {
             case 54:
@@ -6374,14 +5752,13 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                 if ( (LA38_1==RULE_INT) ) {
                     int LA38_3 = input.LA(3);
 
-                    if ( (LA38_3==EOF||(LA38_3>=13 && LA38_3<=14)||(LA38_3>=29 && LA38_3<=30)||LA38_3==33||LA38_3==36) ) {
-                        alt38=1;
-                    }
-                    else if ( (LA38_3==37) ) {
+                    if ( (LA38_3==37) ) {
                         alt38=2;
                     }
+                    else if ( (LA38_3==EOF||(LA38_3>=13 && LA38_3<=14)||(LA38_3>=29 && LA38_3<=30)||LA38_3==33||LA38_3==36) ) {
+                        alt38=1;
+                    }
                     else {
-                        if (state.backtracking>0) {state.failed=true; return current;}
                         NoViableAltException nvae =
                             new NoViableAltException("", 38, 3, input);
 
@@ -6389,7 +5766,6 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                     }
                 }
                 else {
-                    if (state.backtracking>0) {state.failed=true; return current;}
                     NoViableAltException nvae =
                         new NoViableAltException("", 38, 1, input);
 
@@ -6404,14 +5780,13 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                 if ( (LA38_2==RULE_INT) ) {
                     int LA38_3 = input.LA(3);
 
-                    if ( (LA38_3==EOF||(LA38_3>=13 && LA38_3<=14)||(LA38_3>=29 && LA38_3<=30)||LA38_3==33||LA38_3==36) ) {
-                        alt38=1;
-                    }
-                    else if ( (LA38_3==37) ) {
+                    if ( (LA38_3==37) ) {
                         alt38=2;
                     }
+                    else if ( (LA38_3==EOF||(LA38_3>=13 && LA38_3<=14)||(LA38_3>=29 && LA38_3<=30)||LA38_3==33||LA38_3==36) ) {
+                        alt38=1;
+                    }
                     else {
-                        if (state.backtracking>0) {state.failed=true; return current;}
                         NoViableAltException nvae =
                             new NoViableAltException("", 38, 3, input);
 
@@ -6419,7 +5794,6 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                     }
                 }
                 else {
-                    if (state.backtracking>0) {state.failed=true; return current;}
                     NoViableAltException nvae =
                         new NoViableAltException("", 38, 2, input);
 
@@ -6431,14 +5805,13 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                 {
                 int LA38_3 = input.LA(2);
 
-                if ( (LA38_3==EOF||(LA38_3>=13 && LA38_3<=14)||(LA38_3>=29 && LA38_3<=30)||LA38_3==33||LA38_3==36) ) {
-                    alt38=1;
-                }
-                else if ( (LA38_3==37) ) {
+                if ( (LA38_3==37) ) {
                     alt38=2;
                 }
+                else if ( (LA38_3==EOF||(LA38_3>=13 && LA38_3<=14)||(LA38_3>=29 && LA38_3<=30)||LA38_3==33||LA38_3==36) ) {
+                    alt38=1;
+                }
                 else {
-                    if (state.backtracking>0) {state.failed=true; return current;}
                     NoViableAltException nvae =
                         new NoViableAltException("", 38, 3, input);
 
@@ -6452,7 +5825,6 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                 }
                 break;
             default:
-                if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
                     new NoViableAltException("", 38, 0, input);
 
@@ -6461,46 +5833,38 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
             switch (alt38) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2205:5: this_IntLiteral_0= ruleIntLiteral
+                    // InternalConfig.g:2205:5: this_IntLiteral_0= ruleIntLiteral
                     {
-                    if ( state.backtracking==0 ) {
-                       
-                              newCompositeNode(grammarAccess.getNumberLiteralAccess().getIntLiteralParserRuleCall_0()); 
-                          
-                    }
-                    pushFollow(FOLLOW_ruleIntLiteral_in_ruleNumberLiteral5227);
+                     
+                            newCompositeNode(grammarAccess.getNumberLiteralAccess().getIntLiteralParserRuleCall_0()); 
+                        
+                    pushFollow(FOLLOW_2);
                     this_IntLiteral_0=ruleIntLiteral();
 
                     state._fsp--;
-                    if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
-                       
-                              current = this_IntLiteral_0; 
-                              afterParserOrEnumRuleCall();
-                          
-                    }
+
+                     
+                            current = this_IntLiteral_0; 
+                            afterParserOrEnumRuleCall();
+                        
 
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2215:5: this_RealLiteral_1= ruleRealLiteral
+                    // InternalConfig.g:2215:5: this_RealLiteral_1= ruleRealLiteral
                     {
-                    if ( state.backtracking==0 ) {
-                       
-                              newCompositeNode(grammarAccess.getNumberLiteralAccess().getRealLiteralParserRuleCall_1()); 
-                          
-                    }
-                    pushFollow(FOLLOW_ruleRealLiteral_in_ruleNumberLiteral5254);
+                     
+                            newCompositeNode(grammarAccess.getNumberLiteralAccess().getRealLiteralParserRuleCall_1()); 
+                        
+                    pushFollow(FOLLOW_2);
                     this_RealLiteral_1=ruleRealLiteral();
 
                     state._fsp--;
-                    if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
-                       
-                              current = this_RealLiteral_1; 
-                              afterParserOrEnumRuleCall();
-                          
-                    }
+
+                     
+                            current = this_RealLiteral_1; 
+                            afterParserOrEnumRuleCall();
+                        
 
                     }
                     break;
@@ -6510,9 +5874,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -6527,7 +5889,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleRealLiteral"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2231:1: entryRuleRealLiteral returns [EObject current=null] : iv_ruleRealLiteral= ruleRealLiteral EOF ;
+    // InternalConfig.g:2231:1: entryRuleRealLiteral returns [EObject current=null] : iv_ruleRealLiteral= ruleRealLiteral EOF ;
     public final EObject entryRuleRealLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -6535,21 +5897,17 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2232:2: (iv_ruleRealLiteral= ruleRealLiteral EOF )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2233:2: iv_ruleRealLiteral= ruleRealLiteral EOF
+            // InternalConfig.g:2232:2: (iv_ruleRealLiteral= ruleRealLiteral EOF )
+            // InternalConfig.g:2233:2: iv_ruleRealLiteral= ruleRealLiteral EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getRealLiteralRule()); 
-            }
-            pushFollow(FOLLOW_ruleRealLiteral_in_entryRuleRealLiteral5289);
+             newCompositeNode(grammarAccess.getRealLiteralRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleRealLiteral=ruleRealLiteral();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleRealLiteral; 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRealLiteral5299); if (state.failed) return current;
+
+             current =iv_ruleRealLiteral; 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -6567,7 +5925,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleRealLiteral"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2240:1: ruleRealLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= ruleReal ) ) ) ;
+    // InternalConfig.g:2240:1: ruleRealLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= ruleReal ) ) ) ;
     public final EObject ruleRealLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -6577,54 +5935,48 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2243:28: ( ( () ( (lv_value_1_0= ruleReal ) ) ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2244:1: ( () ( (lv_value_1_0= ruleReal ) ) )
+            // InternalConfig.g:2243:28: ( ( () ( (lv_value_1_0= ruleReal ) ) ) )
+            // InternalConfig.g:2244:1: ( () ( (lv_value_1_0= ruleReal ) ) )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2244:1: ( () ( (lv_value_1_0= ruleReal ) ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2244:2: () ( (lv_value_1_0= ruleReal ) )
+            // InternalConfig.g:2244:1: ( () ( (lv_value_1_0= ruleReal ) ) )
+            // InternalConfig.g:2244:2: () ( (lv_value_1_0= ruleReal ) )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2244:2: ()
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2245:5: 
+            // InternalConfig.g:2244:2: ()
+            // InternalConfig.g:2245:5: 
             {
-            if ( state.backtracking==0 ) {
 
-                      current = forceCreateModelElement(
-                          grammarAccess.getRealLiteralAccess().getRealLiteralAction_0(),
-                          current);
-                  
-            }
+                    current = forceCreateModelElement(
+                        grammarAccess.getRealLiteralAccess().getRealLiteralAction_0(),
+                        current);
+                
 
             }
 
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2250:2: ( (lv_value_1_0= ruleReal ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2251:1: (lv_value_1_0= ruleReal )
+            // InternalConfig.g:2250:2: ( (lv_value_1_0= ruleReal ) )
+            // InternalConfig.g:2251:1: (lv_value_1_0= ruleReal )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2251:1: (lv_value_1_0= ruleReal )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2252:3: lv_value_1_0= ruleReal
+            // InternalConfig.g:2251:1: (lv_value_1_0= ruleReal )
+            // InternalConfig.g:2252:3: lv_value_1_0= ruleReal
             {
-            if ( state.backtracking==0 ) {
-               
-              	        newCompositeNode(grammarAccess.getRealLiteralAccess().getValueRealParserRuleCall_1_0()); 
-              	    
-            }
-            pushFollow(FOLLOW_ruleReal_in_ruleRealLiteral5354);
+             
+            	        newCompositeNode(grammarAccess.getRealLiteralAccess().getValueRealParserRuleCall_1_0()); 
+            	    
+            pushFollow(FOLLOW_2);
             lv_value_1_0=ruleReal();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
 
-              	        if (current==null) {
-              	            current = createModelElementForParent(grammarAccess.getRealLiteralRule());
-              	        }
-                     		set(
-                     			current, 
-                     			"value",
-                      		lv_value_1_0, 
-                      		"Real");
-              	        afterParserOrEnumRuleCall();
-              	    
-            }
+
+            	        if (current==null) {
+            	            current = createModelElementForParent(grammarAccess.getRealLiteralRule());
+            	        }
+                   		set(
+                   			current, 
+                   			"value",
+                    		lv_value_1_0, 
+                    		"org.eclipse.etrice.core.common.Base.Real");
+            	        afterParserOrEnumRuleCall();
+            	    
 
             }
 
@@ -6637,9 +5989,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -6654,7 +6004,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleIntLiteral"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2276:1: entryRuleIntLiteral returns [EObject current=null] : iv_ruleIntLiteral= ruleIntLiteral EOF ;
+    // InternalConfig.g:2276:1: entryRuleIntLiteral returns [EObject current=null] : iv_ruleIntLiteral= ruleIntLiteral EOF ;
     public final EObject entryRuleIntLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -6662,21 +6012,17 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2277:2: (iv_ruleIntLiteral= ruleIntLiteral EOF )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2278:2: iv_ruleIntLiteral= ruleIntLiteral EOF
+            // InternalConfig.g:2277:2: (iv_ruleIntLiteral= ruleIntLiteral EOF )
+            // InternalConfig.g:2278:2: iv_ruleIntLiteral= ruleIntLiteral EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getIntLiteralRule()); 
-            }
-            pushFollow(FOLLOW_ruleIntLiteral_in_entryRuleIntLiteral5390);
+             newCompositeNode(grammarAccess.getIntLiteralRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleIntLiteral=ruleIntLiteral();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleIntLiteral; 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIntLiteral5400); if (state.failed) return current;
+
+             current =iv_ruleIntLiteral; 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -6694,7 +6040,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleIntLiteral"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2285:1: ruleIntLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= ruleInteger ) ) ) ;
+    // InternalConfig.g:2285:1: ruleIntLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= ruleInteger ) ) ) ;
     public final EObject ruleIntLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -6704,54 +6050,48 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2288:28: ( ( () ( (lv_value_1_0= ruleInteger ) ) ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2289:1: ( () ( (lv_value_1_0= ruleInteger ) ) )
+            // InternalConfig.g:2288:28: ( ( () ( (lv_value_1_0= ruleInteger ) ) ) )
+            // InternalConfig.g:2289:1: ( () ( (lv_value_1_0= ruleInteger ) ) )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2289:1: ( () ( (lv_value_1_0= ruleInteger ) ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2289:2: () ( (lv_value_1_0= ruleInteger ) )
+            // InternalConfig.g:2289:1: ( () ( (lv_value_1_0= ruleInteger ) ) )
+            // InternalConfig.g:2289:2: () ( (lv_value_1_0= ruleInteger ) )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2289:2: ()
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2290:5: 
+            // InternalConfig.g:2289:2: ()
+            // InternalConfig.g:2290:5: 
             {
-            if ( state.backtracking==0 ) {
 
-                      current = forceCreateModelElement(
-                          grammarAccess.getIntLiteralAccess().getIntLiteralAction_0(),
-                          current);
-                  
-            }
+                    current = forceCreateModelElement(
+                        grammarAccess.getIntLiteralAccess().getIntLiteralAction_0(),
+                        current);
+                
 
             }
 
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2295:2: ( (lv_value_1_0= ruleInteger ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2296:1: (lv_value_1_0= ruleInteger )
+            // InternalConfig.g:2295:2: ( (lv_value_1_0= ruleInteger ) )
+            // InternalConfig.g:2296:1: (lv_value_1_0= ruleInteger )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2296:1: (lv_value_1_0= ruleInteger )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2297:3: lv_value_1_0= ruleInteger
+            // InternalConfig.g:2296:1: (lv_value_1_0= ruleInteger )
+            // InternalConfig.g:2297:3: lv_value_1_0= ruleInteger
             {
-            if ( state.backtracking==0 ) {
-               
-              	        newCompositeNode(grammarAccess.getIntLiteralAccess().getValueIntegerParserRuleCall_1_0()); 
-              	    
-            }
-            pushFollow(FOLLOW_ruleInteger_in_ruleIntLiteral5455);
+             
+            	        newCompositeNode(grammarAccess.getIntLiteralAccess().getValueIntegerParserRuleCall_1_0()); 
+            	    
+            pushFollow(FOLLOW_2);
             lv_value_1_0=ruleInteger();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
 
-              	        if (current==null) {
-              	            current = createModelElementForParent(grammarAccess.getIntLiteralRule());
-              	        }
-                     		set(
-                     			current, 
-                     			"value",
-                      		lv_value_1_0, 
-                      		"Integer");
-              	        afterParserOrEnumRuleCall();
-              	    
-            }
+
+            	        if (current==null) {
+            	            current = createModelElementForParent(grammarAccess.getIntLiteralRule());
+            	        }
+                   		set(
+                   			current, 
+                   			"value",
+                    		lv_value_1_0, 
+                    		"org.eclipse.etrice.core.common.Base.Integer");
+            	        afterParserOrEnumRuleCall();
+            	    
 
             }
 
@@ -6764,9 +6104,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -6781,7 +6119,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleStringLiteral"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2321:1: entryRuleStringLiteral returns [EObject current=null] : iv_ruleStringLiteral= ruleStringLiteral EOF ;
+    // InternalConfig.g:2321:1: entryRuleStringLiteral returns [EObject current=null] : iv_ruleStringLiteral= ruleStringLiteral EOF ;
     public final EObject entryRuleStringLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -6789,21 +6127,17 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2322:2: (iv_ruleStringLiteral= ruleStringLiteral EOF )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2323:2: iv_ruleStringLiteral= ruleStringLiteral EOF
+            // InternalConfig.g:2322:2: (iv_ruleStringLiteral= ruleStringLiteral EOF )
+            // InternalConfig.g:2323:2: iv_ruleStringLiteral= ruleStringLiteral EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getStringLiteralRule()); 
-            }
-            pushFollow(FOLLOW_ruleStringLiteral_in_entryRuleStringLiteral5491);
+             newCompositeNode(grammarAccess.getStringLiteralRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleStringLiteral=ruleStringLiteral();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleStringLiteral; 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleStringLiteral5501); if (state.failed) return current;
+
+             current =iv_ruleStringLiteral; 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -6821,7 +6155,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleStringLiteral"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2330:1: ruleStringLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= RULE_STRING ) ) ) ;
+    // InternalConfig.g:2330:1: ruleStringLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= RULE_STRING ) ) ) ;
     public final EObject ruleStringLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -6830,49 +6164,43 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2333:28: ( ( () ( (lv_value_1_0= RULE_STRING ) ) ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2334:1: ( () ( (lv_value_1_0= RULE_STRING ) ) )
+            // InternalConfig.g:2333:28: ( ( () ( (lv_value_1_0= RULE_STRING ) ) ) )
+            // InternalConfig.g:2334:1: ( () ( (lv_value_1_0= RULE_STRING ) ) )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2334:1: ( () ( (lv_value_1_0= RULE_STRING ) ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2334:2: () ( (lv_value_1_0= RULE_STRING ) )
+            // InternalConfig.g:2334:1: ( () ( (lv_value_1_0= RULE_STRING ) ) )
+            // InternalConfig.g:2334:2: () ( (lv_value_1_0= RULE_STRING ) )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2334:2: ()
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2335:5: 
+            // InternalConfig.g:2334:2: ()
+            // InternalConfig.g:2335:5: 
             {
-            if ( state.backtracking==0 ) {
 
-                      current = forceCreateModelElement(
-                          grammarAccess.getStringLiteralAccess().getStringLiteralAction_0(),
-                          current);
-                  
-            }
+                    current = forceCreateModelElement(
+                        grammarAccess.getStringLiteralAccess().getStringLiteralAction_0(),
+                        current);
+                
 
             }
 
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2340:2: ( (lv_value_1_0= RULE_STRING ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2341:1: (lv_value_1_0= RULE_STRING )
+            // InternalConfig.g:2340:2: ( (lv_value_1_0= RULE_STRING ) )
+            // InternalConfig.g:2341:1: (lv_value_1_0= RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2341:1: (lv_value_1_0= RULE_STRING )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2342:3: lv_value_1_0= RULE_STRING
+            // InternalConfig.g:2341:1: (lv_value_1_0= RULE_STRING )
+            // InternalConfig.g:2342:3: lv_value_1_0= RULE_STRING
             {
-            lv_value_1_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleStringLiteral5552); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            lv_value_1_0=(Token)match(input,RULE_STRING,FOLLOW_2); 
 
-              			newLeafNode(lv_value_1_0, grammarAccess.getStringLiteralAccess().getValueSTRINGTerminalRuleCall_1_0()); 
-              		
-            }
-            if ( state.backtracking==0 ) {
+            			newLeafNode(lv_value_1_0, grammarAccess.getStringLiteralAccess().getValueSTRINGTerminalRuleCall_1_0()); 
+            		
 
-              	        if (current==null) {
-              	            current = createModelElement(grammarAccess.getStringLiteralRule());
-              	        }
-                     		setWithLastConsumed(
-                     			current, 
-                     			"value",
-                      		lv_value_1_0, 
-                      		"STRING");
-              	    
-            }
+            	        if (current==null) {
+            	            current = createModelElement(grammarAccess.getStringLiteralRule());
+            	        }
+                   		setWithLastConsumed(
+                   			current, 
+                   			"value",
+                    		lv_value_1_0, 
+                    		"org.eclipse.xtext.common.Terminals.STRING");
+            	    
 
             }
 
@@ -6885,9 +6213,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -6902,7 +6228,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleInteger"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2366:1: entryRuleInteger returns [String current=null] : iv_ruleInteger= ruleInteger EOF ;
+    // InternalConfig.g:2366:1: entryRuleInteger returns [String current=null] : iv_ruleInteger= ruleInteger EOF ;
     public final String entryRuleInteger() throws RecognitionException {
         String current = null;
 
@@ -6910,21 +6236,17 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2367:2: (iv_ruleInteger= ruleInteger EOF )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2368:2: iv_ruleInteger= ruleInteger EOF
+            // InternalConfig.g:2367:2: (iv_ruleInteger= ruleInteger EOF )
+            // InternalConfig.g:2368:2: iv_ruleInteger= ruleInteger EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getIntegerRule()); 
-            }
-            pushFollow(FOLLOW_ruleInteger_in_entryRuleInteger5594);
+             newCompositeNode(grammarAccess.getIntegerRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleInteger=ruleInteger();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleInteger.getText(); 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleInteger5605); if (state.failed) return current;
+
+             current =iv_ruleInteger.getText(); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -6942,7 +6264,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleInteger"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2375:1: ruleInteger returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT ) | this_HEX_3= RULE_HEX ) ;
+    // InternalConfig.g:2375: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();
 
@@ -6953,10 +6275,10 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2378:28: ( ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT ) | this_HEX_3= RULE_HEX ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2379:1: ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT ) | this_HEX_3= RULE_HEX )
+            // InternalConfig.g:2378:28: ( ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT ) | this_HEX_3= RULE_HEX ) )
+            // InternalConfig.g:2379:1: ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT ) | this_HEX_3= RULE_HEX )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2379:1: ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT ) | this_HEX_3= RULE_HEX )
+            // InternalConfig.g:2379:1: ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT ) | this_HEX_3= RULE_HEX )
             int alt40=2;
             int LA40_0 = input.LA(1);
 
@@ -6967,7 +6289,6 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                 alt40=2;
             }
             else {
-                if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
                     new NoViableAltException("", 40, 0, input);
 
@@ -6975,12 +6296,12 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
             }
             switch (alt40) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2379:2: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT )
+                    // InternalConfig.g:2379:2: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT )
                     {
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2379:2: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT )
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2379:3: (kw= '+' | kw= '-' )? this_INT_2= RULE_INT
+                    // InternalConfig.g:2379:2: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT )
+                    // InternalConfig.g:2379:3: (kw= '+' | kw= '-' )? this_INT_2= RULE_INT
                     {
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2379:3: (kw= '+' | kw= '-' )?
+                    // InternalConfig.g:2379:3: (kw= '+' | kw= '-' )?
                     int alt39=3;
                     int LA39_0 = input.LA(1);
 
@@ -6992,45 +6313,37 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                     }
                     switch (alt39) {
                         case 1 :
-                            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2380:2: kw= '+'
+                            // InternalConfig.g:2380:2: kw= '+'
                             {
-                            kw=(Token)match(input,54,FOLLOW_54_in_ruleInteger5645); if (state.failed) return current;
-                            if ( state.backtracking==0 ) {
+                            kw=(Token)match(input,54,FOLLOW_14); 
 
-                                      current.merge(kw);
-                                      newLeafNode(kw, grammarAccess.getIntegerAccess().getPlusSignKeyword_0_0_0()); 
-                                  
-                            }
+                                    current.merge(kw);
+                                    newLeafNode(kw, grammarAccess.getIntegerAccess().getPlusSignKeyword_0_0_0()); 
+                                
 
                             }
                             break;
                         case 2 :
-                            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2387:2: kw= '-'
+                            // InternalConfig.g:2387:2: kw= '-'
                             {
-                            kw=(Token)match(input,55,FOLLOW_55_in_ruleInteger5664); if (state.failed) return current;
-                            if ( state.backtracking==0 ) {
+                            kw=(Token)match(input,55,FOLLOW_14); 
 
-                                      current.merge(kw);
-                                      newLeafNode(kw, grammarAccess.getIntegerAccess().getHyphenMinusKeyword_0_0_1()); 
-                                  
-                            }
+                                    current.merge(kw);
+                                    newLeafNode(kw, grammarAccess.getIntegerAccess().getHyphenMinusKeyword_0_0_1()); 
+                                
 
                             }
                             break;
 
                     }
 
-                    this_INT_2=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleInteger5681); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    this_INT_2=(Token)match(input,RULE_INT,FOLLOW_2); 
 
-                      		current.merge(this_INT_2);
-                          
-                    }
-                    if ( state.backtracking==0 ) {
-                       
-                          newLeafNode(this_INT_2, grammarAccess.getIntegerAccess().getINTTerminalRuleCall_0_1()); 
-                          
-                    }
+                    		current.merge(this_INT_2);
+                        
+                     
+                        newLeafNode(this_INT_2, grammarAccess.getIntegerAccess().getINTTerminalRuleCall_0_1()); 
+                        
 
                     }
 
@@ -7038,19 +6351,15 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2400:10: this_HEX_3= RULE_HEX
+                    // InternalConfig.g:2400:10: this_HEX_3= RULE_HEX
                     {
-                    this_HEX_3=(Token)match(input,RULE_HEX,FOLLOW_RULE_HEX_in_ruleInteger5708); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    this_HEX_3=(Token)match(input,RULE_HEX,FOLLOW_2); 
 
-                      		current.merge(this_HEX_3);
-                          
-                    }
-                    if ( state.backtracking==0 ) {
-                       
-                          newLeafNode(this_HEX_3, grammarAccess.getIntegerAccess().getHEXTerminalRuleCall_1()); 
-                          
-                    }
+                    		current.merge(this_HEX_3);
+                        
+                     
+                        newLeafNode(this_HEX_3, grammarAccess.getIntegerAccess().getHEXTerminalRuleCall_1()); 
+                        
 
                     }
                     break;
@@ -7060,9 +6369,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -7077,7 +6384,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleReal"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2415:1: entryRuleReal returns [String current=null] : iv_ruleReal= ruleReal EOF ;
+    // InternalConfig.g:2415:1: entryRuleReal returns [String current=null] : iv_ruleReal= ruleReal EOF ;
     public final String entryRuleReal() throws RecognitionException {
         String current = null;
 
@@ -7085,21 +6392,17 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2416:2: (iv_ruleReal= ruleReal EOF )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2417:2: iv_ruleReal= ruleReal EOF
+            // InternalConfig.g:2416:2: (iv_ruleReal= ruleReal EOF )
+            // InternalConfig.g:2417:2: iv_ruleReal= ruleReal EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getRealRule()); 
-            }
-            pushFollow(FOLLOW_ruleReal_in_entryRuleReal5754);
+             newCompositeNode(grammarAccess.getRealRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleReal=ruleReal();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleReal.getText(); 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleReal5765); if (state.failed) return current;
+
+             current =iv_ruleReal.getText(); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -7117,7 +6420,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleReal"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2424:1: ruleReal returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_Decimal_0= ruleDecimal | this_DecimalExp_1= ruleDecimalExp ) ;
+    // InternalConfig.g:2424: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();
 
@@ -7129,10 +6432,10 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2427:28: ( (this_Decimal_0= ruleDecimal | this_DecimalExp_1= ruleDecimalExp ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2428:1: (this_Decimal_0= ruleDecimal | this_DecimalExp_1= ruleDecimalExp )
+            // InternalConfig.g:2427:28: ( (this_Decimal_0= ruleDecimal | this_DecimalExp_1= ruleDecimalExp ) )
+            // InternalConfig.g:2428:1: (this_Decimal_0= ruleDecimal | this_DecimalExp_1= ruleDecimalExp )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2428:1: (this_Decimal_0= ruleDecimal | this_DecimalExp_1= ruleDecimalExp )
+            // InternalConfig.g:2428:1: (this_Decimal_0= ruleDecimal | this_DecimalExp_1= ruleDecimalExp )
             int alt41=2;
             switch ( input.LA(1) ) {
             case 54:
@@ -7155,7 +6458,6 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                                 alt41=2;
                             }
                             else {
-                                if (state.backtracking>0) {state.failed=true; return current;}
                                 NoViableAltException nvae =
                                     new NoViableAltException("", 41, 5, input);
 
@@ -7163,7 +6465,6 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                             }
                         }
                         else {
-                            if (state.backtracking>0) {state.failed=true; return current;}
                             NoViableAltException nvae =
                                 new NoViableAltException("", 41, 4, input);
 
@@ -7171,7 +6472,6 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                         }
                     }
                     else {
-                        if (state.backtracking>0) {state.failed=true; return current;}
                         NoViableAltException nvae =
                             new NoViableAltException("", 41, 3, input);
 
@@ -7179,7 +6479,6 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                     }
                 }
                 else {
-                    if (state.backtracking>0) {state.failed=true; return current;}
                     NoViableAltException nvae =
                         new NoViableAltException("", 41, 1, input);
 
@@ -7207,7 +6506,6 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                                 alt41=2;
                             }
                             else {
-                                if (state.backtracking>0) {state.failed=true; return current;}
                                 NoViableAltException nvae =
                                     new NoViableAltException("", 41, 5, input);
 
@@ -7215,7 +6513,6 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                             }
                         }
                         else {
-                            if (state.backtracking>0) {state.failed=true; return current;}
                             NoViableAltException nvae =
                                 new NoViableAltException("", 41, 4, input);
 
@@ -7223,7 +6520,6 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                         }
                     }
                     else {
-                        if (state.backtracking>0) {state.failed=true; return current;}
                         NoViableAltException nvae =
                             new NoViableAltException("", 41, 3, input);
 
@@ -7231,7 +6527,6 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                     }
                 }
                 else {
-                    if (state.backtracking>0) {state.failed=true; return current;}
                     NoViableAltException nvae =
                         new NoViableAltException("", 41, 2, input);
 
@@ -7256,7 +6551,6 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                             alt41=2;
                         }
                         else {
-                            if (state.backtracking>0) {state.failed=true; return current;}
                             NoViableAltException nvae =
                                 new NoViableAltException("", 41, 5, input);
 
@@ -7264,7 +6558,6 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                         }
                     }
                     else {
-                        if (state.backtracking>0) {state.failed=true; return current;}
                         NoViableAltException nvae =
                             new NoViableAltException("", 41, 4, input);
 
@@ -7272,7 +6565,6 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                     }
                 }
                 else {
-                    if (state.backtracking>0) {state.failed=true; return current;}
                     NoViableAltException nvae =
                         new NoViableAltException("", 41, 3, input);
 
@@ -7281,7 +6573,6 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                 }
                 break;
             default:
-                if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
                     new NoViableAltException("", 41, 0, input);
 
@@ -7290,54 +6581,42 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
             switch (alt41) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2429:5: this_Decimal_0= ruleDecimal
+                    // InternalConfig.g:2429:5: this_Decimal_0= ruleDecimal
                     {
-                    if ( state.backtracking==0 ) {
-                       
-                              newCompositeNode(grammarAccess.getRealAccess().getDecimalParserRuleCall_0()); 
-                          
-                    }
-                    pushFollow(FOLLOW_ruleDecimal_in_ruleReal5812);
+                     
+                            newCompositeNode(grammarAccess.getRealAccess().getDecimalParserRuleCall_0()); 
+                        
+                    pushFollow(FOLLOW_2);
                     this_Decimal_0=ruleDecimal();
 
                     state._fsp--;
-                    if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
 
-                      		current.merge(this_Decimal_0);
-                          
-                    }
-                    if ( state.backtracking==0 ) {
-                       
-                              afterParserOrEnumRuleCall();
-                          
-                    }
+
+                    		current.merge(this_Decimal_0);
+                        
+                     
+                            afterParserOrEnumRuleCall();
+                        
 
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2441:5: this_DecimalExp_1= ruleDecimalExp
+                    // InternalConfig.g:2441:5: this_DecimalExp_1= ruleDecimalExp
                     {
-                    if ( state.backtracking==0 ) {
-                       
-                              newCompositeNode(grammarAccess.getRealAccess().getDecimalExpParserRuleCall_1()); 
-                          
-                    }
-                    pushFollow(FOLLOW_ruleDecimalExp_in_ruleReal5845);
+                     
+                            newCompositeNode(grammarAccess.getRealAccess().getDecimalExpParserRuleCall_1()); 
+                        
+                    pushFollow(FOLLOW_2);
                     this_DecimalExp_1=ruleDecimalExp();
 
                     state._fsp--;
-                    if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
 
-                      		current.merge(this_DecimalExp_1);
-                          
-                    }
-                    if ( state.backtracking==0 ) {
-                       
-                              afterParserOrEnumRuleCall();
-                          
-                    }
+
+                    		current.merge(this_DecimalExp_1);
+                        
+                     
+                            afterParserOrEnumRuleCall();
+                        
 
                     }
                     break;
@@ -7347,9 +6626,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -7364,7 +6641,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleDecimal"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2459:1: entryRuleDecimal returns [String current=null] : iv_ruleDecimal= ruleDecimal EOF ;
+    // InternalConfig.g:2459:1: entryRuleDecimal returns [String current=null] : iv_ruleDecimal= ruleDecimal EOF ;
     public final String entryRuleDecimal() throws RecognitionException {
         String current = null;
 
@@ -7375,21 +6652,17 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
         	
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2463:2: (iv_ruleDecimal= ruleDecimal EOF )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2464:2: iv_ruleDecimal= ruleDecimal EOF
+            // InternalConfig.g:2463:2: (iv_ruleDecimal= ruleDecimal EOF )
+            // InternalConfig.g:2464:2: iv_ruleDecimal= ruleDecimal EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getDecimalRule()); 
-            }
-            pushFollow(FOLLOW_ruleDecimal_in_entryRuleDecimal5897);
+             newCompositeNode(grammarAccess.getDecimalRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleDecimal=ruleDecimal();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleDecimal.getText(); 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDecimal5908); if (state.failed) return current;
+
+             current =iv_ruleDecimal.getText(); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -7410,7 +6683,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleDecimal"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2474:1: ruleDecimal returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT ) ;
+    // InternalConfig.g:2474: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();
 
@@ -7422,13 +6695,13 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
             
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2478:28: ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2479:1: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT )
+            // InternalConfig.g:2478:28: ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT ) )
+            // InternalConfig.g:2479:1: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2479:1: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2479:2: (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT
+            // InternalConfig.g:2479:1: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT )
+            // InternalConfig.g:2479:2: (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2479:2: (kw= '+' | kw= '-' )?
+            // InternalConfig.g:2479:2: (kw= '+' | kw= '-' )?
             int alt42=3;
             int LA42_0 = input.LA(1);
 
@@ -7440,72 +6713,56 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
             }
             switch (alt42) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2480:2: kw= '+'
+                    // InternalConfig.g:2480:2: kw= '+'
                     {
-                    kw=(Token)match(input,54,FOLLOW_54_in_ruleDecimal5951); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    kw=(Token)match(input,54,FOLLOW_14); 
 
-                              current.merge(kw);
-                              newLeafNode(kw, grammarAccess.getDecimalAccess().getPlusSignKeyword_0_0()); 
-                          
-                    }
+                            current.merge(kw);
+                            newLeafNode(kw, grammarAccess.getDecimalAccess().getPlusSignKeyword_0_0()); 
+                        
 
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2487:2: kw= '-'
+                    // InternalConfig.g:2487:2: kw= '-'
                     {
-                    kw=(Token)match(input,55,FOLLOW_55_in_ruleDecimal5970); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    kw=(Token)match(input,55,FOLLOW_14); 
 
-                              current.merge(kw);
-                              newLeafNode(kw, grammarAccess.getDecimalAccess().getHyphenMinusKeyword_0_1()); 
-                          
-                    }
+                            current.merge(kw);
+                            newLeafNode(kw, grammarAccess.getDecimalAccess().getHyphenMinusKeyword_0_1()); 
+                        
 
                     }
                     break;
 
             }
 
-            this_INT_2=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleDecimal5987); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            this_INT_2=(Token)match(input,RULE_INT,FOLLOW_29); 
 
-              		current.merge(this_INT_2);
-                  
-            }
-            if ( state.backtracking==0 ) {
-               
-                  newLeafNode(this_INT_2, grammarAccess.getDecimalAccess().getINTTerminalRuleCall_1()); 
-                  
-            }
-            kw=(Token)match(input,37,FOLLOW_37_in_ruleDecimal6005); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            		current.merge(this_INT_2);
+                
+             
+                newLeafNode(this_INT_2, grammarAccess.getDecimalAccess().getINTTerminalRuleCall_1()); 
+                
+            kw=(Token)match(input,37,FOLLOW_14); 
 
-                      current.merge(kw);
-                      newLeafNode(kw, grammarAccess.getDecimalAccess().getFullStopKeyword_2()); 
-                  
-            }
-            this_INT_4=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleDecimal6020); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+                    current.merge(kw);
+                    newLeafNode(kw, grammarAccess.getDecimalAccess().getFullStopKeyword_2()); 
+                
+            this_INT_4=(Token)match(input,RULE_INT,FOLLOW_2); 
 
-              		current.merge(this_INT_4);
-                  
-            }
-            if ( state.backtracking==0 ) {
-               
-                  newLeafNode(this_INT_4, grammarAccess.getDecimalAccess().getINTTerminalRuleCall_3()); 
-                  
-            }
+            		current.merge(this_INT_4);
+                
+             
+                newLeafNode(this_INT_4, grammarAccess.getDecimalAccess().getINTTerminalRuleCall_3()); 
+                
 
             }
 
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -7523,7 +6780,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleDecimalExp"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2523:1: entryRuleDecimalExp returns [String current=null] : iv_ruleDecimalExp= ruleDecimalExp EOF ;
+    // InternalConfig.g:2523:1: entryRuleDecimalExp returns [String current=null] : iv_ruleDecimalExp= ruleDecimalExp EOF ;
     public final String entryRuleDecimalExp() throws RecognitionException {
         String current = null;
 
@@ -7534,21 +6791,17 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
         	
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2527:2: (iv_ruleDecimalExp= ruleDecimalExp EOF )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2528:2: iv_ruleDecimalExp= ruleDecimalExp EOF
+            // InternalConfig.g:2527:2: (iv_ruleDecimalExp= ruleDecimalExp EOF )
+            // InternalConfig.g:2528:2: iv_ruleDecimalExp= ruleDecimalExp EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getDecimalExpRule()); 
-            }
-            pushFollow(FOLLOW_ruleDecimalExp_in_entryRuleDecimalExp6076);
+             newCompositeNode(grammarAccess.getDecimalExpRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleDecimalExp=ruleDecimalExp();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleDecimalExp.getText(); 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDecimalExp6087); if (state.failed) return current;
+
+             current =iv_ruleDecimalExp.getText(); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -7569,7 +6822,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleDecimalExp"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2538: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= '-' )? ( ( RULE_INT )=>this_INT_9= RULE_INT ) ) ;
+    // InternalConfig.g:2538: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();
 
@@ -7582,13 +6835,13 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
             
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2542:28: ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT (kw= 'e' | kw= 'E' ) (kw= '+' | kw= '-' )? ( ( RULE_INT )=>this_INT_9= RULE_INT ) ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2543:1: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT (kw= 'e' | kw= 'E' ) (kw= '+' | kw= '-' )? ( ( RULE_INT )=>this_INT_9= RULE_INT ) )
+            // InternalConfig.g:2542: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 ) )
+            // InternalConfig.g:2543: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.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2543:1: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT (kw= 'e' | kw= 'E' ) (kw= '+' | kw= '-' )? ( ( RULE_INT )=>this_INT_9= RULE_INT ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2543:2: (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT (kw= 'e' | kw= 'E' ) (kw= '+' | kw= '-' )? ( ( RULE_INT )=>this_INT_9= RULE_INT )
+            // InternalConfig.g:2543: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 )
+            // InternalConfig.g:2543: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.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2543:2: (kw= '+' | kw= '-' )?
+            // InternalConfig.g:2543:2: (kw= '+' | kw= '-' )?
             int alt43=3;
             int LA43_0 = input.LA(1);
 
@@ -7600,64 +6853,50 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
             }
             switch (alt43) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2544:2: kw= '+'
+                    // InternalConfig.g:2544:2: kw= '+'
                     {
-                    kw=(Token)match(input,54,FOLLOW_54_in_ruleDecimalExp6130); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    kw=(Token)match(input,54,FOLLOW_14); 
 
-                              current.merge(kw);
-                              newLeafNode(kw, grammarAccess.getDecimalExpAccess().getPlusSignKeyword_0_0()); 
-                          
-                    }
+                            current.merge(kw);
+                            newLeafNode(kw, grammarAccess.getDecimalExpAccess().getPlusSignKeyword_0_0()); 
+                        
 
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2551:2: kw= '-'
+                    // InternalConfig.g:2551:2: kw= '-'
                     {
-                    kw=(Token)match(input,55,FOLLOW_55_in_ruleDecimalExp6149); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    kw=(Token)match(input,55,FOLLOW_14); 
 
-                              current.merge(kw);
-                              newLeafNode(kw, grammarAccess.getDecimalExpAccess().getHyphenMinusKeyword_0_1()); 
-                          
-                    }
+                            current.merge(kw);
+                            newLeafNode(kw, grammarAccess.getDecimalExpAccess().getHyphenMinusKeyword_0_1()); 
+                        
 
                     }
                     break;
 
             }
 
-            this_INT_2=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleDecimalExp6166); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            this_INT_2=(Token)match(input,RULE_INT,FOLLOW_29); 
 
-              		current.merge(this_INT_2);
-                  
-            }
-            if ( state.backtracking==0 ) {
-               
-                  newLeafNode(this_INT_2, grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_1()); 
-                  
-            }
-            kw=(Token)match(input,37,FOLLOW_37_in_ruleDecimalExp6184); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            		current.merge(this_INT_2);
+                
+             
+                newLeafNode(this_INT_2, grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_1()); 
+                
+            kw=(Token)match(input,37,FOLLOW_14); 
 
-                      current.merge(kw);
-                      newLeafNode(kw, grammarAccess.getDecimalExpAccess().getFullStopKeyword_2()); 
-                  
-            }
-            this_INT_4=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleDecimalExp6199); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+                    current.merge(kw);
+                    newLeafNode(kw, grammarAccess.getDecimalExpAccess().getFullStopKeyword_2()); 
+                
+            this_INT_4=(Token)match(input,RULE_INT,FOLLOW_45); 
 
-              		current.merge(this_INT_4);
-                  
-            }
-            if ( state.backtracking==0 ) {
-               
-                  newLeafNode(this_INT_4, grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_3()); 
-                  
-            }
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2576:1: (kw= 'e' | kw= 'E' )
+            		current.merge(this_INT_4);
+                
+             
+                newLeafNode(this_INT_4, grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_3()); 
+                
+            // InternalConfig.g:2576:1: (kw= 'e' | kw= 'E' )
             int alt44=2;
             int LA44_0 = input.LA(1);
 
@@ -7668,7 +6907,6 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                 alt44=2;
             }
             else {
-                if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
                     new NoViableAltException("", 44, 0, input);
 
@@ -7676,35 +6914,31 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
             }
             switch (alt44) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2577:2: kw= 'e'
+                    // InternalConfig.g:2577:2: kw= 'e'
                     {
-                    kw=(Token)match(input,56,FOLLOW_56_in_ruleDecimalExp6218); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    kw=(Token)match(input,56,FOLLOW_46); 
 
-                              current.merge(kw);
-                              newLeafNode(kw, grammarAccess.getDecimalExpAccess().getEKeyword_4_0()); 
-                          
-                    }
+                            current.merge(kw);
+                            newLeafNode(kw, grammarAccess.getDecimalExpAccess().getEKeyword_4_0()); 
+                        
 
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2584:2: kw= 'E'
+                    // InternalConfig.g:2584:2: kw= 'E'
                     {
-                    kw=(Token)match(input,57,FOLLOW_57_in_ruleDecimalExp6237); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    kw=(Token)match(input,57,FOLLOW_46); 
 
-                              current.merge(kw);
-                              newLeafNode(kw, grammarAccess.getDecimalExpAccess().getEKeyword_4_1()); 
-                          
-                    }
+                            current.merge(kw);
+                            newLeafNode(kw, grammarAccess.getDecimalExpAccess().getEKeyword_4_1()); 
+                        
 
                     }
                     break;
 
             }
 
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2589:2: (kw= '+' | kw= '-' )?
+            // InternalConfig.g:2589:2: (kw= '+' | kw= '-' )?
             int alt45=3;
             int LA45_0 = input.LA(1);
 
@@ -7716,60 +6950,44 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
             }
             switch (alt45) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2590:2: kw= '+'
+                    // InternalConfig.g:2590:2: kw= '+'
                     {
-                    kw=(Token)match(input,54,FOLLOW_54_in_ruleDecimalExp6252); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    kw=(Token)match(input,54,FOLLOW_14); 
 
-                              current.merge(kw);
-                              newLeafNode(kw, grammarAccess.getDecimalExpAccess().getPlusSignKeyword_5_0()); 
-                          
-                    }
+                            current.merge(kw);
+                            newLeafNode(kw, grammarAccess.getDecimalExpAccess().getPlusSignKeyword_5_0()); 
+                        
 
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2597:2: kw= '-'
+                    // InternalConfig.g:2597:2: kw= '-'
                     {
-                    kw=(Token)match(input,55,FOLLOW_55_in_ruleDecimalExp6271); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    kw=(Token)match(input,55,FOLLOW_14); 
 
-                              current.merge(kw);
-                              newLeafNode(kw, grammarAccess.getDecimalExpAccess().getHyphenMinusKeyword_5_1()); 
-                          
-                    }
+                            current.merge(kw);
+                            newLeafNode(kw, grammarAccess.getDecimalExpAccess().getHyphenMinusKeyword_5_1()); 
+                        
 
                     }
                     break;
 
             }
 
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2602:3: ( ( RULE_INT )=>this_INT_9= RULE_INT )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2602:4: ( RULE_INT )=>this_INT_9= RULE_INT
-            {
-            this_INT_9=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleDecimalExp6294); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-
-              		current.merge(this_INT_9);
-                  
-            }
-            if ( state.backtracking==0 ) {
-               
-                  newLeafNode(this_INT_9, grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_6()); 
-                  
-            }
-
-            }
+            this_INT_9=(Token)match(input,RULE_INT,FOLLOW_2); 
 
+            		current.merge(this_INT_9);
+                
+             
+                newLeafNode(this_INT_9, grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_6()); 
+                
 
             }
 
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -7787,7 +7005,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleFQN"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2620:1: entryRuleFQN returns [String current=null] : iv_ruleFQN= ruleFQN EOF ;
+    // InternalConfig.g:2620:1: entryRuleFQN returns [String current=null] : iv_ruleFQN= ruleFQN EOF ;
     public final String entryRuleFQN() throws RecognitionException {
         String current = null;
 
@@ -7795,21 +7013,17 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2621:2: (iv_ruleFQN= ruleFQN EOF )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2622:2: iv_ruleFQN= ruleFQN EOF
+            // InternalConfig.g:2621:2: (iv_ruleFQN= ruleFQN EOF )
+            // InternalConfig.g:2622:2: iv_ruleFQN= ruleFQN EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getFQNRule()); 
-            }
-            pushFollow(FOLLOW_ruleFQN_in_entryRuleFQN6345);
+             newCompositeNode(grammarAccess.getFQNRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleFQN=ruleFQN();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleFQN.getText(); 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleFQN6356); if (state.failed) return current;
+
+             current =iv_ruleFQN.getText(); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -7827,7 +7041,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleFQN"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2629:1: ruleFQN returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* ) ;
+    // InternalConfig.g:2629: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();
 
@@ -7838,24 +7052,20 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2632:28: ( (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2633:1: (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* )
+            // InternalConfig.g:2632:28: ( (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* ) )
+            // InternalConfig.g:2633:1: (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2633:1: (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2633:6: this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )*
+            // InternalConfig.g:2633:1: (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* )
+            // InternalConfig.g:2633:6: this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )*
             {
-            this_ID_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFQN6396); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            this_ID_0=(Token)match(input,RULE_ID,FOLLOW_47); 
 
-              		current.merge(this_ID_0);
-                  
-            }
-            if ( state.backtracking==0 ) {
-               
-                  newLeafNode(this_ID_0, grammarAccess.getFQNAccess().getIDTerminalRuleCall_0()); 
-                  
-            }
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2640:1: (kw= '.' this_ID_2= RULE_ID )*
+            		current.merge(this_ID_0);
+                
+             
+                newLeafNode(this_ID_0, grammarAccess.getFQNAccess().getIDTerminalRuleCall_0()); 
+                
+            // InternalConfig.g:2640:1: (kw= '.' this_ID_2= RULE_ID )*
             loop46:
             do {
                 int alt46=2;
@@ -7868,26 +7078,20 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
                 switch (alt46) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2641:2: kw= '.' this_ID_2= RULE_ID
+            	    // InternalConfig.g:2641:2: kw= '.' this_ID_2= RULE_ID
             	    {
-            	    kw=(Token)match(input,37,FOLLOW_37_in_ruleFQN6415); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
+            	    kw=(Token)match(input,37,FOLLOW_3); 
 
-            	              current.merge(kw);
-            	              newLeafNode(kw, grammarAccess.getFQNAccess().getFullStopKeyword_1_0()); 
-            	          
-            	    }
-            	    this_ID_2=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFQN6430); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
+            	            current.merge(kw);
+            	            newLeafNode(kw, grammarAccess.getFQNAccess().getFullStopKeyword_1_0()); 
+            	        
+            	    this_ID_2=(Token)match(input,RULE_ID,FOLLOW_47); 
 
-            	      		current.merge(this_ID_2);
-            	          
-            	    }
-            	    if ( state.backtracking==0 ) {
-            	       
-            	          newLeafNode(this_ID_2, grammarAccess.getFQNAccess().getIDTerminalRuleCall_1_1()); 
-            	          
-            	    }
+            	    		current.merge(this_ID_2);
+            	        
+            	     
+            	        newLeafNode(this_ID_2, grammarAccess.getFQNAccess().getIDTerminalRuleCall_1_1()); 
+            	        
 
             	    }
             	    break;
@@ -7903,9 +7107,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -7920,7 +7122,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleLiteralType"
-    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2661:1: ruleLiteralType returns [Enumerator current=null] : ( (enumLiteral_0= 'ptBoolean' ) | (enumLiteral_1= 'ptInteger' ) | (enumLiteral_2= 'ptReal' ) | (enumLiteral_3= 'ptCharacter' ) ) ;
+    // InternalConfig.g:2661: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;
 
@@ -7931,10 +7133,10 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
          enterRule(); 
         try {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2663:28: ( ( (enumLiteral_0= 'ptBoolean' ) | (enumLiteral_1= 'ptInteger' ) | (enumLiteral_2= 'ptReal' ) | (enumLiteral_3= 'ptCharacter' ) ) )
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2664:1: ( (enumLiteral_0= 'ptBoolean' ) | (enumLiteral_1= 'ptInteger' ) | (enumLiteral_2= 'ptReal' ) | (enumLiteral_3= 'ptCharacter' ) )
+            // InternalConfig.g:2663:28: ( ( (enumLiteral_0= 'ptBoolean' ) | (enumLiteral_1= 'ptInteger' ) | (enumLiteral_2= 'ptReal' ) | (enumLiteral_3= 'ptCharacter' ) ) )
+            // InternalConfig.g:2664:1: ( (enumLiteral_0= 'ptBoolean' ) | (enumLiteral_1= 'ptInteger' ) | (enumLiteral_2= 'ptReal' ) | (enumLiteral_3= 'ptCharacter' ) )
             {
-            // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2664:1: ( (enumLiteral_0= 'ptBoolean' ) | (enumLiteral_1= 'ptInteger' ) | (enumLiteral_2= 'ptReal' ) | (enumLiteral_3= 'ptCharacter' ) )
+            // InternalConfig.g:2664:1: ( (enumLiteral_0= 'ptBoolean' ) | (enumLiteral_1= 'ptInteger' ) | (enumLiteral_2= 'ptReal' ) | (enumLiteral_3= 'ptCharacter' ) )
             int alt47=4;
             switch ( input.LA(1) ) {
             case 58:
@@ -7958,7 +7160,6 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                 }
                 break;
             default:
-                if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
                     new NoViableAltException("", 47, 0, input);
 
@@ -7967,18 +7168,16 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
             switch (alt47) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2664:2: (enumLiteral_0= 'ptBoolean' )
+                    // InternalConfig.g:2664:2: (enumLiteral_0= 'ptBoolean' )
                     {
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2664:2: (enumLiteral_0= 'ptBoolean' )
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2664:4: enumLiteral_0= 'ptBoolean'
+                    // InternalConfig.g:2664:2: (enumLiteral_0= 'ptBoolean' )
+                    // InternalConfig.g:2664:4: enumLiteral_0= 'ptBoolean'
                     {
-                    enumLiteral_0=(Token)match(input,58,FOLLOW_58_in_ruleLiteralType6491); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    enumLiteral_0=(Token)match(input,58,FOLLOW_2); 
 
-                              current = grammarAccess.getLiteralTypeAccess().getBOOLEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
-                              newLeafNode(enumLiteral_0, grammarAccess.getLiteralTypeAccess().getBOOLEnumLiteralDeclaration_0()); 
-                          
-                    }
+                            current = grammarAccess.getLiteralTypeAccess().getBOOLEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
+                            newLeafNode(enumLiteral_0, grammarAccess.getLiteralTypeAccess().getBOOLEnumLiteralDeclaration_0()); 
+                        
 
                     }
 
@@ -7986,18 +7185,16 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2670:6: (enumLiteral_1= 'ptInteger' )
+                    // InternalConfig.g:2670:6: (enumLiteral_1= 'ptInteger' )
                     {
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2670:6: (enumLiteral_1= 'ptInteger' )
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2670:8: enumLiteral_1= 'ptInteger'
+                    // InternalConfig.g:2670:6: (enumLiteral_1= 'ptInteger' )
+                    // InternalConfig.g:2670:8: enumLiteral_1= 'ptInteger'
                     {
-                    enumLiteral_1=(Token)match(input,59,FOLLOW_59_in_ruleLiteralType6508); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    enumLiteral_1=(Token)match(input,59,FOLLOW_2); 
 
-                              current = grammarAccess.getLiteralTypeAccess().getINTEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
-                              newLeafNode(enumLiteral_1, grammarAccess.getLiteralTypeAccess().getINTEnumLiteralDeclaration_1()); 
-                          
-                    }
+                            current = grammarAccess.getLiteralTypeAccess().getINTEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
+                            newLeafNode(enumLiteral_1, grammarAccess.getLiteralTypeAccess().getINTEnumLiteralDeclaration_1()); 
+                        
 
                     }
 
@@ -8005,18 +7202,16 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2676:6: (enumLiteral_2= 'ptReal' )
+                    // InternalConfig.g:2676:6: (enumLiteral_2= 'ptReal' )
                     {
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2676:6: (enumLiteral_2= 'ptReal' )
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2676:8: enumLiteral_2= 'ptReal'
+                    // InternalConfig.g:2676:6: (enumLiteral_2= 'ptReal' )
+                    // InternalConfig.g:2676:8: enumLiteral_2= 'ptReal'
                     {
-                    enumLiteral_2=(Token)match(input,60,FOLLOW_60_in_ruleLiteralType6525); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    enumLiteral_2=(Token)match(input,60,FOLLOW_2); 
 
-                              current = grammarAccess.getLiteralTypeAccess().getREALEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
-                              newLeafNode(enumLiteral_2, grammarAccess.getLiteralTypeAccess().getREALEnumLiteralDeclaration_2()); 
-                          
-                    }
+                            current = grammarAccess.getLiteralTypeAccess().getREALEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
+                            newLeafNode(enumLiteral_2, grammarAccess.getLiteralTypeAccess().getREALEnumLiteralDeclaration_2()); 
+                        
 
                     }
 
@@ -8024,18 +7219,16 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 4 :
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2682:6: (enumLiteral_3= 'ptCharacter' )
+                    // InternalConfig.g:2682:6: (enumLiteral_3= 'ptCharacter' )
                     {
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2682:6: (enumLiteral_3= 'ptCharacter' )
-                    // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2682:8: enumLiteral_3= 'ptCharacter'
+                    // InternalConfig.g:2682:6: (enumLiteral_3= 'ptCharacter' )
+                    // InternalConfig.g:2682:8: enumLiteral_3= 'ptCharacter'
                     {
-                    enumLiteral_3=(Token)match(input,61,FOLLOW_61_in_ruleLiteralType6542); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    enumLiteral_3=(Token)match(input,61,FOLLOW_2); 
 
-                              current = grammarAccess.getLiteralTypeAccess().getCHAREnumLiteralDeclaration_3().getEnumLiteral().getInstance();
-                              newLeafNode(enumLiteral_3, grammarAccess.getLiteralTypeAccess().getCHAREnumLiteralDeclaration_3()); 
-                          
-                    }
+                            current = grammarAccess.getLiteralTypeAccess().getCHAREnumLiteralDeclaration_3().getEnumLiteral().getInstance();
+                            newLeafNode(enumLiteral_3, grammarAccess.getLiteralTypeAccess().getCHAREnumLiteralDeclaration_3()); 
+                        
 
                     }
 
@@ -8048,9 +7241,7 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -8063,288 +7254,57 @@ public class InternalConfigParser extends AbstractInternalAntlrParser {
     }
     // $ANTLR end "ruleLiteralType"
 
-    // $ANTLR start synpred1_InternalConfig
-    public final void synpred1_InternalConfig_fragment() throws RecognitionException {   
-        // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2602:4: ( RULE_INT )
-        // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2602:6: RULE_INT
-        {
-        match(input,RULE_INT,FOLLOW_RULE_INT_in_synpred1_InternalConfig6285); if (state.failed) return ;
-
-        }
-    }
-    // $ANTLR end synpred1_InternalConfig
-
     // Delegated rules
 
-    public final boolean synpred1_InternalConfig() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred1_InternalConfig_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
-
 
  
 
-    public static final BitSet FOLLOW_ruleConfigModel_in_entryRuleConfigModel75 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleConfigModel85 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_12_in_ruleConfigModel122 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleFQN_in_ruleConfigModel143 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_13_in_ruleConfigModel155 = new BitSet(new long[]{0x0000040001C0C000L});
-    public static final BitSet FOLLOW_ruleImport_in_ruleConfigModel176 = new BitSet(new long[]{0x0000040001C0C000L});
-    public static final BitSet FOLLOW_ruleConfigElement_in_ruleConfigModel198 = new BitSet(new long[]{0x0000000001C0C000L});
-    public static final BitSet FOLLOW_14_in_ruleConfigModel211 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleConfigElement_in_entryRuleConfigElement247 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleConfigElement257 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSubSystemConfig_in_ruleConfigElement304 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleActorClassConfig_in_ruleConfigElement331 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleActorInstanceConfig_in_ruleConfigElement358 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleProtocolClassConfig_in_ruleConfigElement385 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSubSystemConfig_in_entryRuleSubSystemConfig420 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSubSystemConfig430 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_15_in_ruleSubSystemConfig467 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleFQN_in_ruleSubSystemConfig490 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_16_in_ruleSubSystemConfig502 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleSubSystemConfig522 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_13_in_ruleSubSystemConfig534 = new BitSet(new long[]{0x0000000000020000L});
-    public static final BitSet FOLLOW_ruleDynamicConfig_in_ruleSubSystemConfig555 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_14_in_ruleSubSystemConfig567 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDynamicConfig_in_entryRuleDynamicConfig603 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDynamicConfig613 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_17_in_ruleDynamicConfig650 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_13_in_ruleDynamicConfig662 = new BitSet(new long[]{0x00000000002C0000L});
-    public static final BitSet FOLLOW_18_in_ruleDynamicConfig721 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleDynamicConfig738 = new BitSet(new long[]{0x00000000002C4000L});
-    public static final BitSet FOLLOW_19_in_ruleDynamicConfig764 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleDynamicConfig781 = new BitSet(new long[]{0x0000000000100000L});
-    public static final BitSet FOLLOW_20_in_ruleDynamicConfig800 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleDynamicConfig817 = new BitSet(new long[]{0x00000000002C4000L});
-    public static final BitSet FOLLOW_21_in_ruleDynamicConfig892 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_ruleTIME_in_ruleDynamicConfig913 = new BitSet(new long[]{0x00000000002C4000L});
-    public static final BitSet FOLLOW_14_in_ruleDynamicConfig972 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleActorClassConfig_in_entryRuleActorClassConfig1008 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleActorClassConfig1018 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_22_in_ruleActorClassConfig1055 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleFQN_in_ruleActorClassConfig1078 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_13_in_ruleActorClassConfig1090 = new BitSet(new long[]{0x0000000040004000L});
-    public static final BitSet FOLLOW_ruleAttrClassConfig_in_ruleActorClassConfig1111 = new BitSet(new long[]{0x0000000040004000L});
-    public static final BitSet FOLLOW_14_in_ruleActorClassConfig1124 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleActorInstanceConfig_in_entryRuleActorInstanceConfig1160 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleActorInstanceConfig1170 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_23_in_ruleActorInstanceConfig1207 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleFQN_in_ruleActorInstanceConfig1230 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_16_in_ruleActorInstanceConfig1242 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleActorInstanceConfig1262 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_16_in_ruleActorInstanceConfig1274 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleRefPath_in_ruleActorInstanceConfig1295 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_13_in_ruleActorInstanceConfig1307 = new BitSet(new long[]{0x0000000060004000L});
-    public static final BitSet FOLLOW_ruleAttrInstanceConfig_in_ruleActorInstanceConfig1373 = new BitSet(new long[]{0x0000000060004000L});
-    public static final BitSet FOLLOW_rulePortInstanceConfig_in_ruleActorInstanceConfig1449 = new BitSet(new long[]{0x0000000060004000L});
-    public static final BitSet FOLLOW_14_in_ruleActorInstanceConfig1502 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleProtocolClassConfig_in_entryRuleProtocolClassConfig1538 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleProtocolClassConfig1548 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_24_in_ruleProtocolClassConfig1585 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleFQN_in_ruleProtocolClassConfig1608 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_13_in_ruleProtocolClassConfig1620 = new BitSet(new long[]{0x000000000E004000L});
-    public static final BitSet FOLLOW_25_in_ruleProtocolClassConfig1678 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_rulePortClassConfig_in_ruleProtocolClassConfig1699 = new BitSet(new long[]{0x000000000E004000L});
-    public static final BitSet FOLLOW_26_in_ruleProtocolClassConfig1768 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_27_in_ruleProtocolClassConfig1786 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_rulePortClassConfig_in_ruleProtocolClassConfig1808 = new BitSet(new long[]{0x000000000E004000L});
-    public static final BitSet FOLLOW_14_in_ruleProtocolClassConfig1861 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rulePortClassConfig_in_entryRulePortClassConfig1897 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRulePortClassConfig1907 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_rulePortClassConfig1953 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_13_in_rulePortClassConfig1965 = new BitSet(new long[]{0x0000000040004000L});
-    public static final BitSet FOLLOW_ruleAttrClassConfig_in_rulePortClassConfig1986 = new BitSet(new long[]{0x0000000040004000L});
-    public static final BitSet FOLLOW_14_in_rulePortClassConfig1999 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rulePortInstanceConfig_in_entryRulePortInstanceConfig2035 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRulePortInstanceConfig2045 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_rulePortInstanceConfig2082 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_rulePortInstanceConfig2102 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_13_in_rulePortInstanceConfig2114 = new BitSet(new long[]{0x0000000040004000L});
-    public static final BitSet FOLLOW_ruleAttrInstanceConfig_in_rulePortInstanceConfig2135 = new BitSet(new long[]{0x0000000040004000L});
-    public static final BitSet FOLLOW_14_in_rulePortInstanceConfig2148 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAttrClassConfig_in_entryRuleAttrClassConfig2186 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAttrClassConfig2196 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_30_in_ruleAttrClassConfig2233 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleAttrClassConfig2253 = new BitSet(new long[]{0x0000000080002002L});
-    public static final BitSet FOLLOW_31_in_ruleAttrClassConfig2266 = new BitSet(new long[]{0x00F00000000000F0L});
-    public static final BitSet FOLLOW_ruleConfigValueArray_in_ruleAttrClassConfig2287 = new BitSet(new long[]{0x0000000000002002L});
-    public static final BitSet FOLLOW_13_in_ruleAttrClassConfig2302 = new BitSet(new long[]{0x0000000340004000L});
-    public static final BitSet FOLLOW_32_in_ruleAttrClassConfig2316 = new BitSet(new long[]{0x0000000080000000L});
-    public static final BitSet FOLLOW_31_in_ruleAttrClassConfig2328 = new BitSet(new long[]{0x00C00000000000C0L});
-    public static final BitSet FOLLOW_ruleNumberLiteral_in_ruleAttrClassConfig2349 = new BitSet(new long[]{0x0000000240004000L});
-    public static final BitSet FOLLOW_33_in_ruleAttrClassConfig2364 = new BitSet(new long[]{0x0000000080000000L});
-    public static final BitSet FOLLOW_31_in_ruleAttrClassConfig2376 = new BitSet(new long[]{0x00C00000000000C0L});
-    public static final BitSet FOLLOW_ruleNumberLiteral_in_ruleAttrClassConfig2397 = new BitSet(new long[]{0x0000000040004000L});
-    public static final BitSet FOLLOW_ruleAttrClassConfig_in_ruleAttrClassConfig2420 = new BitSet(new long[]{0x0000000040004000L});
-    public static final BitSet FOLLOW_14_in_ruleAttrClassConfig2434 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAttrInstanceConfig_in_entryRuleAttrInstanceConfig2472 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAttrInstanceConfig2482 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_30_in_ruleAttrInstanceConfig2519 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleAttrInstanceConfig2539 = new BitSet(new long[]{0x0000000080002002L});
-    public static final BitSet FOLLOW_31_in_ruleAttrInstanceConfig2552 = new BitSet(new long[]{0x00F00000000000F0L});
-    public static final BitSet FOLLOW_ruleConfigValueArray_in_ruleAttrInstanceConfig2573 = new BitSet(new long[]{0x0000000000002002L});
-    public static final BitSet FOLLOW_13_in_ruleAttrInstanceConfig2588 = new BitSet(new long[]{0x0000000040024000L});
-    public static final BitSet FOLLOW_17_in_ruleAttrInstanceConfig2608 = new BitSet(new long[]{0x0000000C00000000L});
-    public static final BitSet FOLLOW_34_in_ruleAttrInstanceConfig2640 = new BitSet(new long[]{0x0000000040004000L});
-    public static final BitSet FOLLOW_35_in_ruleAttrInstanceConfig2671 = new BitSet(new long[]{0x0000000040004000L});
-    public static final BitSet FOLLOW_ruleAttrInstanceConfig_in_ruleAttrInstanceConfig2695 = new BitSet(new long[]{0x0000000040004000L});
-    public static final BitSet FOLLOW_14_in_ruleAttrInstanceConfig2709 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleConfigValueArray_in_entryRuleConfigValueArray2747 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleConfigValueArray2757 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleConfigValue_in_ruleConfigValueArray2803 = new BitSet(new long[]{0x0000001000000002L});
-    public static final BitSet FOLLOW_36_in_ruleConfigValueArray2816 = new BitSet(new long[]{0x00F00000000000F0L});
-    public static final BitSet FOLLOW_ruleConfigValue_in_ruleConfigValueArray2837 = new BitSet(new long[]{0x0000001000000002L});
-    public static final BitSet FOLLOW_ruleConfigValue_in_entryRuleConfigValue2875 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleConfigValue2885 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLiteralConfigValue_in_ruleConfigValue2932 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleEnumConfigValue_in_ruleConfigValue2959 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLiteralConfigValue_in_entryRuleLiteralConfigValue2994 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleLiteralConfigValue3004 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLiteral_in_ruleLiteralConfigValue3049 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleEnumConfigValue_in_entryRuleEnumConfigValue3084 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleEnumConfigValue3094 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleEnumConfigValue3139 = new BitSet(new long[]{0x0000002000000000L});
-    public static final BitSet FOLLOW_37_in_ruleEnumConfigValue3151 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleEnumConfigValue3171 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRefPath_in_entryRuleRefPath3207 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRefPath3217 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRefSegment_in_ruleRefPath3263 = new BitSet(new long[]{0x0000000000010002L});
-    public static final BitSet FOLLOW_16_in_ruleRefPath3276 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleRefSegment_in_ruleRefPath3297 = new BitSet(new long[]{0x0000000000010002L});
-    public static final BitSet FOLLOW_ruleRefSegment_in_entryRuleRefSegment3335 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRefSegment3345 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleRefSegment3387 = new BitSet(new long[]{0x0000004000000002L});
-    public static final BitSet FOLLOW_38_in_ruleRefSegment3405 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleRefSegment3422 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleKeyValue_in_entryRuleKeyValue3467 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleKeyValue3477 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleKeyValue3519 = new BitSet(new long[]{0x0000000080000000L});
-    public static final BitSet FOLLOW_31_in_ruleKeyValue3536 = new BitSet(new long[]{0x00F00000000000E0L});
-    public static final BitSet FOLLOW_ruleLiteral_in_ruleKeyValue3557 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAnnotationTargetType_in_entryRuleAnnotationTargetType3596 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAnnotationTargetType3607 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleAnnotationTargetType3646 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAnnotationAttribute_in_entryRuleAnnotationAttribute3690 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAnnotationAttribute3700 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleAnnotationAttribute_in_ruleAnnotationAttribute3747 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleEnumAnnotationAttribute_in_ruleAnnotationAttribute3774 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleAnnotationAttribute_in_entryRuleSimpleAnnotationAttribute3809 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSimpleAnnotationAttribute3819 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_39_in_ruleSimpleAnnotationAttribute3863 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_40_in_ruleSimpleAnnotationAttribute3894 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_41_in_ruleSimpleAnnotationAttribute3907 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleSimpleAnnotationAttribute3924 = new BitSet(new long[]{0x0000004000000000L});
-    public static final BitSet FOLLOW_38_in_ruleSimpleAnnotationAttribute3941 = new BitSet(new long[]{0x3C00000000000000L});
-    public static final BitSet FOLLOW_ruleLiteralType_in_ruleSimpleAnnotationAttribute3962 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleEnumAnnotationAttribute_in_entryRuleEnumAnnotationAttribute3998 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleEnumAnnotationAttribute4008 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_39_in_ruleEnumAnnotationAttribute4052 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_40_in_ruleEnumAnnotationAttribute4083 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_41_in_ruleEnumAnnotationAttribute4096 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleEnumAnnotationAttribute4113 = new BitSet(new long[]{0x0000004000000000L});
-    public static final BitSet FOLLOW_38_in_ruleEnumAnnotationAttribute4130 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_13_in_ruleEnumAnnotationAttribute4142 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleEnumAnnotationAttribute4159 = new BitSet(new long[]{0x0000001000004000L});
-    public static final BitSet FOLLOW_36_in_ruleEnumAnnotationAttribute4177 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleEnumAnnotationAttribute4194 = new BitSet(new long[]{0x0000001000004000L});
-    public static final BitSet FOLLOW_14_in_ruleEnumAnnotationAttribute4213 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleImport_in_entryRuleImport4249 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleImport4259 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_ruleImport4296 = new BitSet(new long[]{0x0000100000000010L});
-    public static final BitSet FOLLOW_ruleImportedFQN_in_ruleImport4319 = new BitSet(new long[]{0x0000080000000000L});
-    public static final BitSet FOLLOW_43_in_ruleImport4331 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_44_in_ruleImport4350 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleImport4368 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleImportedFQN_in_entryRuleImportedFQN4410 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleImportedFQN4421 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_ruleImportedFQN4468 = new BitSet(new long[]{0x0000200000000002L});
-    public static final BitSet FOLLOW_45_in_ruleImportedFQN4487 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_entryRuleDocumentation4529 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDocumentation4539 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_ruleDocumentation4585 = new BitSet(new long[]{0x0000800000000020L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleDocumentation4602 = new BitSet(new long[]{0x0000800000000020L});
-    public static final BitSet FOLLOW_47_in_ruleDocumentation4620 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTIME_in_entryRuleTIME4657 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleTIME4668 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleTIME4709 = new BitSet(new long[]{0x0001000000000000L});
-    public static final BitSet FOLLOW_48_in_ruleTIME4727 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleTIME4750 = new BitSet(new long[]{0x0002000000000000L});
-    public static final BitSet FOLLOW_49_in_ruleTIME4768 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleTIME4791 = new BitSet(new long[]{0x0004000000000000L});
-    public static final BitSet FOLLOW_50_in_ruleTIME4809 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleTIME4832 = new BitSet(new long[]{0x0008000000000000L});
-    public static final BitSet FOLLOW_51_in_ruleTIME4850 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLiteral_in_entryRuleLiteral4893 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleLiteral4903 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleBooleanLiteral_in_ruleLiteral4950 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNumberLiteral_in_ruleLiteral4977 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStringLiteral_in_ruleLiteral5004 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleBooleanLiteral_in_entryRuleBooleanLiteral5039 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleBooleanLiteral5049 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_52_in_ruleBooleanLiteral5096 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_53_in_ruleBooleanLiteral5120 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNumberLiteral_in_entryRuleNumberLiteral5170 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleNumberLiteral5180 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntLiteral_in_ruleNumberLiteral5227 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRealLiteral_in_ruleNumberLiteral5254 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRealLiteral_in_entryRuleRealLiteral5289 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRealLiteral5299 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleReal_in_ruleRealLiteral5354 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntLiteral_in_entryRuleIntLiteral5390 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIntLiteral5400 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInteger_in_ruleIntLiteral5455 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStringLiteral_in_entryRuleStringLiteral5491 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleStringLiteral5501 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleStringLiteral5552 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInteger_in_entryRuleInteger5594 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleInteger5605 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_54_in_ruleInteger5645 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_55_in_ruleInteger5664 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleInteger5681 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_HEX_in_ruleInteger5708 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleReal_in_entryRuleReal5754 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleReal5765 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDecimal_in_ruleReal5812 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDecimalExp_in_ruleReal5845 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDecimal_in_entryRuleDecimal5897 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDecimal5908 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_54_in_ruleDecimal5951 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_55_in_ruleDecimal5970 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleDecimal5987 = new BitSet(new long[]{0x0000002000000000L});
-    public static final BitSet FOLLOW_37_in_ruleDecimal6005 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleDecimal6020 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDecimalExp_in_entryRuleDecimalExp6076 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDecimalExp6087 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_54_in_ruleDecimalExp6130 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_55_in_ruleDecimalExp6149 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleDecimalExp6166 = new BitSet(new long[]{0x0000002000000000L});
-    public static final BitSet FOLLOW_37_in_ruleDecimalExp6184 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleDecimalExp6199 = new BitSet(new long[]{0x0300000000000000L});
-    public static final BitSet FOLLOW_56_in_ruleDecimalExp6218 = new BitSet(new long[]{0x00C0000000000040L});
-    public static final BitSet FOLLOW_57_in_ruleDecimalExp6237 = new BitSet(new long[]{0x00C0000000000040L});
-    public static final BitSet FOLLOW_54_in_ruleDecimalExp6252 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_55_in_ruleDecimalExp6271 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleDecimalExp6294 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_entryRuleFQN6345 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleFQN6356 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleFQN6396 = new BitSet(new long[]{0x0000002000000002L});
-    public static final BitSet FOLLOW_37_in_ruleFQN6415 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleFQN6430 = new BitSet(new long[]{0x0000002000000002L});
-    public static final BitSet FOLLOW_58_in_ruleLiteralType6491 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_59_in_ruleLiteralType6508 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_60_in_ruleLiteralType6525 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_61_in_ruleLiteralType6542 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_synpred1_InternalConfig6285 = 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[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x0000000000002000L});
+    public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x0000040001C0C000L});
+    public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x0000000001C0C000L});
+    public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x0000000000010000L});
+    public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x0000000000020000L});
+    public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x0000000000004000L});
+    public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x00000000002C0000L});
+    public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x00000000002C4000L});
+    public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000000000100000L});
+    public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x0000000000000040L});
+    public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0000000040004000L});
+    public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x0000000060004000L});
+    public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x000000000E004000L});
+    public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0000000010000000L});
+    public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0000000080002002L});
+    public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x00F00000000000F0L});
+    public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x0000000000002002L});
+    public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0000000340004000L});
+    public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x0000000080000000L});
+    public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x00C00000000000C0L});
+    public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x0000000240004000L});
+    public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x0000000040024000L});
+    public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x0000000C00000000L});
+    public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x0000001000000002L});
+    public static final BitSet FOLLOW_29 = new BitSet(new long[]{0x0000002000000000L});
+    public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x0000000000010002L});
+    public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x0000004000000002L});
+    public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x00F00000000000E0L});
+    public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x0000020000000000L});
+    public static final BitSet FOLLOW_34 = new BitSet(new long[]{0x0000004000000000L});
+    public static final BitSet FOLLOW_35 = new BitSet(new long[]{0x3C00000000000000L});
+    public static final BitSet FOLLOW_36 = new BitSet(new long[]{0x0000001000004000L});
+    public static final BitSet FOLLOW_37 = new BitSet(new long[]{0x0000100000000010L});
+    public static final BitSet FOLLOW_38 = new BitSet(new long[]{0x0000080000000000L});
+    public static final BitSet FOLLOW_39 = new BitSet(new long[]{0x0000200000000002L});
+    public static final BitSet FOLLOW_40 = new BitSet(new long[]{0x0000800000000020L});
+    public static final BitSet FOLLOW_41 = new BitSet(new long[]{0x0001000000000000L});
+    public static final BitSet FOLLOW_42 = new BitSet(new long[]{0x0002000000000000L});
+    public static final BitSet FOLLOW_43 = new BitSet(new long[]{0x0004000000000000L});
+    public static final BitSet FOLLOW_44 = new BitSet(new long[]{0x0008000000000000L});
+    public static final BitSet FOLLOW_45 = new BitSet(new long[]{0x0300000000000000L});
+    public static final BitSet FOLLOW_46 = new BitSet(new long[]{0x00C0000000000040L});
+    public static final BitSet FOLLOW_47 = new BitSet(new long[]{0x0000002000000002L});
 
 }
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/serializer/ConfigSemanticSequencer.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/serializer/ConfigSemanticSequencer.java
index b1e1749c8..6439fdca7 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/serializer/ConfigSemanticSequencer.java
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/serializer/ConfigSemanticSequencer.java
@@ -1,8 +1,12 @@
+/*
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.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;
@@ -34,14 +38,11 @@ import org.eclipse.etrice.core.config.RefPath;
 import org.eclipse.etrice.core.config.RefSegment;
 import org.eclipse.etrice.core.config.SubSystemConfig;
 import org.eclipse.etrice.core.services.ConfigGrammarAccess;
-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")
@@ -50,268 +51,207 @@ public class ConfigSemanticSequencer extends BaseSemanticSequencer {
 	@Inject
 	private ConfigGrammarAccess 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() == ConfigPackage.eINSTANCE) switch(semanticObject.eClass().getClassifierID()) {
+		else if (epackage == ConfigPackage.eINSTANCE)
+			switch (semanticObject.eClass().getClassifierID()) {
 			case ConfigPackage.ACTOR_CLASS_CONFIG:
-				if(context == grammarAccess.getActorClassConfigRule() ||
-				   context == grammarAccess.getConfigElementRule()) {
-					sequence_ActorClassConfig(context, (ActorClassConfig) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_ActorClassConfig(context, (ActorClassConfig) semanticObject); 
+				return; 
 			case ConfigPackage.ACTOR_INSTANCE_CONFIG:
-				if(context == grammarAccess.getActorInstanceConfigRule() ||
-				   context == grammarAccess.getConfigElementRule()) {
-					sequence_ActorInstanceConfig(context, (ActorInstanceConfig) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_ActorInstanceConfig(context, (ActorInstanceConfig) semanticObject); 
+				return; 
 			case ConfigPackage.ATTR_CLASS_CONFIG:
-				if(context == grammarAccess.getAttrClassConfigRule() ||
-				   context == grammarAccess.getAttrConfigRule()) {
-					sequence_AttrClassConfig(context, (AttrClassConfig) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_AttrClassConfig(context, (AttrClassConfig) semanticObject); 
+				return; 
 			case ConfigPackage.ATTR_INSTANCE_CONFIG:
-				if(context == grammarAccess.getAttrConfigRule() ||
-				   context == grammarAccess.getAttrInstanceConfigRule()) {
-					sequence_AttrInstanceConfig(context, (AttrInstanceConfig) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_AttrInstanceConfig(context, (AttrInstanceConfig) semanticObject); 
+				return; 
 			case ConfigPackage.CONFIG_MODEL:
-				if(context == grammarAccess.getConfigModelRule()) {
-					sequence_ConfigModel(context, (ConfigModel) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_ConfigModel(context, (ConfigModel) semanticObject); 
+				return; 
 			case ConfigPackage.CONFIG_VALUE_ARRAY:
-				if(context == grammarAccess.getConfigValueArrayRule()) {
-					sequence_ConfigValueArray(context, (ConfigValueArray) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_ConfigValueArray(context, (ConfigValueArray) semanticObject); 
+				return; 
 			case ConfigPackage.DYNAMIC_CONFIG:
-				if(context == grammarAccess.getDynamicConfigRule()) {
-					sequence_DynamicConfig(context, (DynamicConfig) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_DynamicConfig(context, (DynamicConfig) semanticObject); 
+				return; 
 			case ConfigPackage.ENUM_CONFIG_VALUE:
-				if(context == grammarAccess.getConfigValueRule() ||
-				   context == grammarAccess.getEnumConfigValueRule()) {
-					sequence_EnumConfigValue(context, (EnumConfigValue) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_EnumConfigValue(context, (EnumConfigValue) semanticObject); 
+				return; 
 			case ConfigPackage.LITERAL_CONFIG_VALUE:
-				if(context == grammarAccess.getConfigValueRule() ||
-				   context == grammarAccess.getLiteralConfigValueRule()) {
-					sequence_LiteralConfigValue(context, (LiteralConfigValue) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_LiteralConfigValue(context, (LiteralConfigValue) semanticObject); 
+				return; 
 			case ConfigPackage.PORT_CLASS_CONFIG:
-				if(context == grammarAccess.getPortClassConfigRule()) {
-					sequence_PortClassConfig(context, (PortClassConfig) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_PortClassConfig(context, (PortClassConfig) semanticObject); 
+				return; 
 			case ConfigPackage.PORT_INSTANCE_CONFIG:
-				if(context == grammarAccess.getPortInstanceConfigRule()) {
-					sequence_PortInstanceConfig(context, (PortInstanceConfig) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_PortInstanceConfig(context, (PortInstanceConfig) semanticObject); 
+				return; 
 			case ConfigPackage.PROTOCOL_CLASS_CONFIG:
-				if(context == grammarAccess.getConfigElementRule() ||
-				   context == grammarAccess.getProtocolClassConfigRule()) {
-					sequence_ProtocolClassConfig(context, (ProtocolClassConfig) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_ProtocolClassConfig(context, (ProtocolClassConfig) semanticObject); 
+				return; 
 			case ConfigPackage.REF_PATH:
-				if(context == grammarAccess.getRefPathRule()) {
-					sequence_RefPath(context, (RefPath) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_RefPath(context, (RefPath) semanticObject); 
+				return; 
 			case ConfigPackage.REF_SEGMENT:
-				if(context == grammarAccess.getRefSegmentRule()) {
-					sequence_RefSegment(context, (RefSegment) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_RefSegment(context, (RefSegment) semanticObject); 
+				return; 
 			case ConfigPackage.SUB_SYSTEM_CONFIG:
-				if(context == grammarAccess.getConfigElementRule() ||
-				   context == grammarAccess.getSubSystemConfigRule()) {
-					sequence_SubSystemConfig(context, (SubSystemConfig) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_SubSystemConfig(context, (SubSystemConfig) semanticObject); 
+				return; 
 			}
-		if (errorAcceptor != null) errorAcceptor.accept(diagnosticProvider.createInvalidContextOrTypeDiagnostic(semanticObject, context));
+		if (errorAcceptor != null)
+			errorAcceptor.accept(diagnosticProvider.createInvalidContextOrTypeDiagnostic(semanticObject, context));
 	}
 	
 	/**
+	 * Contexts:
+	 *     ConfigElement returns ActorClassConfig
+	 *     ActorClassConfig returns ActorClassConfig
+	 *
 	 * Constraint:
 	 *     (actor=[ActorClass|FQN] attributes+=AttrClassConfig*)
 	 */
-	protected void sequence_ActorClassConfig(EObject context, ActorClassConfig semanticObject) {
+	protected void sequence_ActorClassConfig(ISerializationContext context, ActorClassConfig semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     ConfigElement returns ActorInstanceConfig
+	 *     ActorInstanceConfig returns ActorInstanceConfig
+	 *
 	 * Constraint:
-	 *     (root=[LogicalSystem|FQN] subSystem=[SubSystemRef|ID] path=RefPath attributes+=AttrInstanceConfig* ports+=PortInstanceConfig*)
+	 *     (root=[LogicalSystem|FQN] subSystem=[SubSystemRef|ID] path=RefPath (attributes+=AttrInstanceConfig | ports+=PortInstanceConfig)*)
 	 */
-	protected void sequence_ActorInstanceConfig(EObject context, ActorInstanceConfig semanticObject) {
+	protected void sequence_ActorInstanceConfig(ISerializationContext context, ActorInstanceConfig semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     AttrConfig returns AttrClassConfig
+	 *     AttrClassConfig returns AttrClassConfig
+	 *
 	 * Constraint:
-	 *     (attribute=[Attribute|ID] value=ConfigValueArray? (min=NumberLiteral? max=NumberLiteral? attributes+=AttrClassConfig*)?)
+	 *     (attribute=[Attribute|ID] value=ConfigValueArray? min=NumberLiteral? max=NumberLiteral? attributes+=AttrClassConfig*)
 	 */
-	protected void sequence_AttrClassConfig(EObject context, AttrClassConfig semanticObject) {
+	protected void sequence_AttrClassConfig(ISerializationContext context, AttrClassConfig semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     AttrConfig returns AttrInstanceConfig
+	 *     AttrInstanceConfig returns AttrInstanceConfig
+	 *
 	 * Constraint:
-	 *     (attribute=[Attribute|ID] value=ConfigValueArray? ((dynConfig?='dynamic configuration' readOnly?='read'?)? attributes+=AttrInstanceConfig*)?)
+	 *     (attribute=[Attribute|ID] value=ConfigValueArray? (dynConfig?='dynamic configuration' readOnly?='read'?)? attributes+=AttrInstanceConfig*)
 	 */
-	protected void sequence_AttrInstanceConfig(EObject context, AttrInstanceConfig semanticObject) {
+	protected void sequence_AttrInstanceConfig(ISerializationContext context, AttrInstanceConfig semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     ConfigModel returns ConfigModel
+	 *
 	 * Constraint:
 	 *     (name=FQN imports+=Import* configElements+=ConfigElement*)
 	 */
-	protected void sequence_ConfigModel(EObject context, ConfigModel semanticObject) {
+	protected void sequence_ConfigModel(ISerializationContext context, ConfigModel semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     ConfigValueArray returns ConfigValueArray
+	 *
 	 * Constraint:
 	 *     (values+=ConfigValue values+=ConfigValue*)
 	 */
-	protected void sequence_ConfigValueArray(EObject context, ConfigValueArray semanticObject) {
+	protected void sequence_ConfigValueArray(ISerializationContext context, ConfigValueArray semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     DynamicConfig returns DynamicConfig
+	 *
 	 * Constraint:
-	 *     ((filePath=STRING | (userCode1=STRING userCode2=STRING)) polling=TIME?)
+	 *     (filePath=STRING | (userCode1=STRING userCode2=STRING) | polling=TIME)+
 	 */
-	protected void sequence_DynamicConfig(EObject context, DynamicConfig semanticObject) {
+	protected void sequence_DynamicConfig(ISerializationContext context, DynamicConfig semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     ConfigValue returns EnumConfigValue
+	 *     EnumConfigValue returns EnumConfigValue
+	 *
 	 * Constraint:
 	 *     (type=[EnumerationType|ID] value=[EnumLiteral|ID])
 	 */
-	protected void sequence_EnumConfigValue(EObject context, EnumConfigValue semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, ConfigPackage.Literals.ENUM_CONFIG_VALUE__TYPE) == ValueTransient.YES)
+	protected void sequence_EnumConfigValue(ISerializationContext context, EnumConfigValue semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, ConfigPackage.Literals.ENUM_CONFIG_VALUE__TYPE) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ConfigPackage.Literals.ENUM_CONFIG_VALUE__TYPE));
-			if(transientValues.isValueTransient(semanticObject, ConfigPackage.Literals.ENUM_CONFIG_VALUE__VALUE) == ValueTransient.YES)
+			if (transientValues.isValueTransient(semanticObject, ConfigPackage.Literals.ENUM_CONFIG_VALUE__VALUE) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ConfigPackage.Literals.ENUM_CONFIG_VALUE__VALUE));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
 		feeder.accept(grammarAccess.getEnumConfigValueAccess().getTypeEnumerationTypeIDTerminalRuleCall_0_0_1(), semanticObject.getType());
 		feeder.accept(grammarAccess.getEnumConfigValueAccess().getValueEnumLiteralIDTerminalRuleCall_2_0_1(), semanticObject.getValue());
 		feeder.finish();
@@ -319,84 +259,108 @@ public class ConfigSemanticSequencer extends BaseSemanticSequencer {
 	
 	
 	/**
+	 * Contexts:
+	 *     ConfigValue returns LiteralConfigValue
+	 *     LiteralConfigValue returns LiteralConfigValue
+	 *
 	 * Constraint:
 	 *     value=Literal
 	 */
-	protected void sequence_LiteralConfigValue(EObject context, LiteralConfigValue semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, ConfigPackage.Literals.LITERAL_CONFIG_VALUE__VALUE) == ValueTransient.YES)
+	protected void sequence_LiteralConfigValue(ISerializationContext context, LiteralConfigValue semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, ConfigPackage.Literals.LITERAL_CONFIG_VALUE__VALUE) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ConfigPackage.Literals.LITERAL_CONFIG_VALUE__VALUE));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
 		feeder.accept(grammarAccess.getLiteralConfigValueAccess().getValueLiteralParserRuleCall_0(), semanticObject.getValue());
 		feeder.finish();
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     PortClassConfig returns PortClassConfig
+	 *
 	 * Constraint:
-	 *     (attributes+=AttrClassConfig*)
+	 *     attributes+=AttrClassConfig*
 	 */
-	protected void sequence_PortClassConfig(EObject context, PortClassConfig semanticObject) {
+	protected void sequence_PortClassConfig(ISerializationContext context, PortClassConfig semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     PortInstanceConfig returns PortInstanceConfig
+	 *
 	 * Constraint:
 	 *     (item=[InterfaceItem|ID] attributes+=AttrInstanceConfig*)
 	 */
-	protected void sequence_PortInstanceConfig(EObject context, PortInstanceConfig semanticObject) {
+	protected void sequence_PortInstanceConfig(ISerializationContext context, PortInstanceConfig semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     ConfigElement returns ProtocolClassConfig
+	 *     ProtocolClassConfig returns ProtocolClassConfig
+	 *
 	 * Constraint:
-	 *     (protocol=[ProtocolClass|FQN] regular=PortClassConfig? conjugated=PortClassConfig?)
+	 *     (protocol=[ProtocolClass|FQN] (regular=PortClassConfig | conjugated=PortClassConfig)*)
 	 */
-	protected void sequence_ProtocolClassConfig(EObject context, ProtocolClassConfig semanticObject) {
+	protected void sequence_ProtocolClassConfig(ISerializationContext context, ProtocolClassConfig semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     RefPath returns RefPath
+	 *
 	 * Constraint:
 	 *     (refs+=RefSegment refs+=RefSegment*)
 	 */
-	protected void sequence_RefPath(EObject context, RefPath semanticObject) {
+	protected void sequence_RefPath(ISerializationContext context, RefPath semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     RefSegment returns RefSegment
+	 *
 	 * Constraint:
 	 *     (ref=ID idx=INT?)
 	 */
-	protected void sequence_RefSegment(EObject context, RefSegment semanticObject) {
+	protected void sequence_RefSegment(ISerializationContext context, RefSegment semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     ConfigElement returns SubSystemConfig
+	 *     SubSystemConfig returns SubSystemConfig
+	 *
 	 * Constraint:
 	 *     (root=[LogicalSystem|FQN] subSystem=[SubSystemRef|ID] dynConfig=DynamicConfig)
 	 */
-	protected void sequence_SubSystemConfig(EObject context, SubSystemConfig semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, ConfigPackage.Literals.SUB_SYSTEM_CONFIG__ROOT) == ValueTransient.YES)
+	protected void sequence_SubSystemConfig(ISerializationContext context, SubSystemConfig semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, ConfigPackage.Literals.SUB_SYSTEM_CONFIG__ROOT) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ConfigPackage.Literals.SUB_SYSTEM_CONFIG__ROOT));
-			if(transientValues.isValueTransient(semanticObject, ConfigPackage.Literals.SUB_SYSTEM_CONFIG__SUB_SYSTEM) == ValueTransient.YES)
+			if (transientValues.isValueTransient(semanticObject, ConfigPackage.Literals.SUB_SYSTEM_CONFIG__SUB_SYSTEM) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ConfigPackage.Literals.SUB_SYSTEM_CONFIG__SUB_SYSTEM));
-			if(transientValues.isValueTransient(semanticObject, ConfigPackage.Literals.SUB_SYSTEM_CONFIG__DYN_CONFIG) == ValueTransient.YES)
+			if (transientValues.isValueTransient(semanticObject, ConfigPackage.Literals.SUB_SYSTEM_CONFIG__DYN_CONFIG) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ConfigPackage.Literals.SUB_SYSTEM_CONFIG__DYN_CONFIG));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
 		feeder.accept(grammarAccess.getSubSystemConfigAccess().getRootLogicalSystemFQNParserRuleCall_1_0_1(), semanticObject.getRoot());
 		feeder.accept(grammarAccess.getSubSystemConfigAccess().getSubSystemSubSystemRefIDTerminalRuleCall_3_0_1(), semanticObject.getSubSystem());
 		feeder.accept(grammarAccess.getSubSystemConfigAccess().getDynConfigDynamicConfigParserRuleCall_5_0(), semanticObject.getDynConfig());
 		feeder.finish();
 	}
+	
+	
 }
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/serializer/ConfigSyntacticSequencer.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/serializer/ConfigSyntacticSequencer.java
index ecb2fb8e5..56b6bd295 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/serializer/ConfigSyntacticSequencer.java
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/serializer/ConfigSyntacticSequencer.java
@@ -1,3 +1,6 @@
+/*
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.serializer;
 
 import com.google.inject.Inject;
@@ -43,35 +46,48 @@ public class ConfigSyntacticSequencer extends AbstractSyntacticSequencer {
 		List<INode> transitionNodes = collectNodes(fromNode, toNode);
 		for (AbstractElementAlias syntax : transition.getAmbiguousSyntaxes()) {
 			List<INode> syntaxNodes = getNodesFor(transitionNodes, syntax);
-			if(match_AttrClassConfig___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_2__q.equals(syntax))
+			if (match_AttrClassConfig___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_2__q.equals(syntax))
 				emit_AttrClassConfig___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_2__q(semanticObject, getLastNavigableState(), syntaxNodes);
-			else if(match_AttrInstanceConfig___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_2__q.equals(syntax))
+			else if (match_AttrInstanceConfig___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_2__q.equals(syntax))
 				emit_AttrInstanceConfig___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_2__q(semanticObject, getLastNavigableState(), syntaxNodes);
-			else if(match_ProtocolClassConfig_ConjugateKeyword_3_1_0_0_or_ConjugatedKeyword_3_1_0_1.equals(syntax))
+			else if (match_ProtocolClassConfig_ConjugateKeyword_3_1_0_0_or_ConjugatedKeyword_3_1_0_1.equals(syntax))
 				emit_ProtocolClassConfig_ConjugateKeyword_3_1_0_0_or_ConjugatedKeyword_3_1_0_1(semanticObject, getLastNavigableState(), syntaxNodes);
 			else acceptNodes(getLastNavigableState(), syntaxNodes);
 		}
 	}
 
 	/**
-	 * Syntax:
+	 * Ambiguous syntax:
 	 *     ('{' '}')?
+	 *
+	 * This ambiguous syntax occurs at:
+	 *     attribute=[Attribute|ID] (ambiguity) (rule end)
+	 *     value=ConfigValueArray (ambiguity) (rule end)
 	 */
 	protected void emit_AttrClassConfig___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_2__q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
 		acceptNodes(transition, nodes);
 	}
 	
 	/**
-	 * Syntax:
+	 * Ambiguous syntax:
 	 *     ('{' '}')?
+	 *
+	 * This ambiguous syntax occurs at:
+	 *     attribute=[Attribute|ID] (ambiguity) (rule end)
+	 *     value=ConfigValueArray (ambiguity) (rule end)
 	 */
 	protected void emit_AttrInstanceConfig___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_2__q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
 		acceptNodes(transition, nodes);
 	}
 	
 	/**
-	 * Syntax:
+	 * Ambiguous syntax:
 	 *     'conjugate' | 'conjugated'
+	 *
+	 * This ambiguous syntax occurs at:
+	 *     conjugated=PortClassConfig (ambiguity) conjugated=PortClassConfig
+	 *     protocol=[ProtocolClass|FQN] '{' (ambiguity) conjugated=PortClassConfig
+	 *     regular=PortClassConfig (ambiguity) conjugated=PortClassConfig
 	 */
 	protected void emit_ProtocolClassConfig_ConjugateKeyword_3_1_0_0_or_ConjugatedKeyword_3_1_0_1(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
 		acceptNodes(transition, nodes);
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/services/ConfigGrammarAccess.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/services/ConfigGrammarAccess.java
index eb04b89fd..54bef7037 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/services/ConfigGrammarAccess.java
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/services/ConfigGrammarAccess.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.services;
 
 import com.google.inject.Singleton;
@@ -13,13 +13,14 @@ 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 ConfigGrammarAccess extends AbstractGrammarElementFinder {
 	
 	
 	public class ConfigModelElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ConfigModel");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Config.ConfigModel");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cConfigModelKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -32,13 +33,16 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cRightCurlyBracketKeyword_5 = (Keyword)cGroup.eContents().get(5);
 		
 		//ConfigModel:
-		//	"ConfigModel" name=FQN "{" imports+=Import* configElements+=ConfigElement* "}";
-		public ParserRule getRule() { return rule; }
+		//	'ConfigModel' name=FQN '{'
+		//	imports+=Import*
+		//	configElements+=ConfigElement*
+		//	'}';
+		@Override public ParserRule getRule() { return rule; }
 
-		//"ConfigModel" name=FQN "{" imports+=Import* configElements+=ConfigElement* "}"
+		//'ConfigModel' name=FQN '{' imports+=Import* configElements+=ConfigElement* '}'
 		public Group getGroup() { return cGroup; }
 
-		//"ConfigModel"
+		//'ConfigModel'
 		public Keyword getConfigModelKeyword_0() { return cConfigModelKeyword_0; }
 
 		//name=FQN
@@ -47,7 +51,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 		//FQN
 		public RuleCall getNameFQNParserRuleCall_1_0() { return cNameFQNParserRuleCall_1_0; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_2() { return cLeftCurlyBracketKeyword_2; }
 
 		//imports+=Import*
@@ -62,12 +66,12 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 		//ConfigElement
 		public RuleCall getConfigElementsConfigElementParserRuleCall_4_0() { return cConfigElementsConfigElementParserRuleCall_4_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_5() { return cRightCurlyBracketKeyword_5; }
 	}
 
 	public class ConfigElementElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ConfigElement");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Config.ConfigElement");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final RuleCall cSubSystemConfigParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final RuleCall cActorClassConfigParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
@@ -76,7 +80,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//ConfigElement:
 		//	SubSystemConfig | ActorClassConfig | ActorInstanceConfig | ProtocolClassConfig;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//SubSystemConfig | ActorClassConfig | ActorInstanceConfig | ProtocolClassConfig
 		public Alternatives getAlternatives() { return cAlternatives; }
@@ -95,7 +99,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class SubSystemConfigElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "SubSystemConfig");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Config.SubSystemConfig");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cSubSystemConfigKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cRootAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -111,13 +115,15 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cRightCurlyBracketKeyword_6 = (Keyword)cGroup.eContents().get(6);
 		
 		//SubSystemConfig:
-		//	"SubSystemConfig" root=[room::LogicalSystem|FQN] "/" subSystem=[room::SubSystemRef] "{" dynConfig=DynamicConfig "}";
-		public ParserRule getRule() { return rule; }
+		//	'SubSystemConfig' root=[room::LogicalSystem|FQN] '/' subSystem=[room::SubSystemRef] '{'
+		//	dynConfig=DynamicConfig
+		//	'}';
+		@Override public ParserRule getRule() { return rule; }
 
-		//"SubSystemConfig" root=[room::LogicalSystem|FQN] "/" subSystem=[room::SubSystemRef] "{" dynConfig=DynamicConfig "}"
+		//'SubSystemConfig' root=[room::LogicalSystem|FQN] '/' subSystem=[room::SubSystemRef] '{' dynConfig=DynamicConfig '}'
 		public Group getGroup() { return cGroup; }
 
-		//"SubSystemConfig"
+		//'SubSystemConfig'
 		public Keyword getSubSystemConfigKeyword_0() { return cSubSystemConfigKeyword_0; }
 
 		//root=[room::LogicalSystem|FQN]
@@ -129,7 +135,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 		//FQN
 		public RuleCall getRootLogicalSystemFQNParserRuleCall_1_0_1() { return cRootLogicalSystemFQNParserRuleCall_1_0_1; }
 
-		//"/"
+		//'/'
 		public Keyword getSolidusKeyword_2() { return cSolidusKeyword_2; }
 
 		//subSystem=[room::SubSystemRef]
@@ -141,7 +147,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 		//ID
 		public RuleCall getSubSystemSubSystemRefIDTerminalRuleCall_3_0_1() { return cSubSystemSubSystemRefIDTerminalRuleCall_3_0_1; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_4() { return cLeftCurlyBracketKeyword_4; }
 
 		//dynConfig=DynamicConfig
@@ -150,12 +156,12 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 		//DynamicConfig
 		public RuleCall getDynConfigDynamicConfigParserRuleCall_5_0() { return cDynConfigDynamicConfigParserRuleCall_5_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_6() { return cRightCurlyBracketKeyword_6; }
 	}
 
 	public class DynamicConfigElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "DynamicConfig");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Config.DynamicConfig");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cDynamicConfigurationKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Keyword cLeftCurlyBracketKeyword_1 = (Keyword)cGroup.eContents().get(1);
@@ -181,31 +187,32 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cRightCurlyBracketKeyword_3 = (Keyword)cGroup.eContents().get(3);
 		
 		//DynamicConfig:
-		//	"dynamic configuration" "{" (("file path" filePath=STRING | ("user import" userCode1=STRING) ("user constructor"
-		//	userCode2=STRING)) & ("polling interval" polling=TIME)?) "}";
-		public ParserRule getRule() { return rule; }
+		//	'dynamic configuration' '{' (('file path' filePath=STRING | ('user import' userCode1=STRING) ('user constructor'
+		//	userCode2=STRING)) & ('polling interval' polling=TIME)?)
+		//	'}';
+		@Override public ParserRule getRule() { return rule; }
 
-		//"dynamic configuration" "{" (("file path" filePath=STRING | ("user import" userCode1=STRING) ("user constructor"
-		//userCode2=STRING)) & ("polling interval" polling=TIME)?) "}"
+		//'dynamic configuration' '{' (('file path' filePath=STRING | ('user import' userCode1=STRING) ('user constructor'
+		//userCode2=STRING)) & ('polling interval' polling=TIME)?) '}'
 		public Group getGroup() { return cGroup; }
 
-		//"dynamic configuration"
+		//'dynamic configuration'
 		public Keyword getDynamicConfigurationKeyword_0() { return cDynamicConfigurationKeyword_0; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_1() { return cLeftCurlyBracketKeyword_1; }
 
-		//("file path" filePath=STRING | ("user import" userCode1=STRING) ("user constructor" userCode2=STRING)) &
-		//("polling interval" polling=TIME)?
+		//(('file path' filePath=STRING | ('user import' userCode1=STRING) ('user constructor' userCode2=STRING)) &
+		//('polling interval' polling=TIME)?)
 		public UnorderedGroup getUnorderedGroup_2() { return cUnorderedGroup_2; }
 
-		//"file path" filePath=STRING | ("user import" userCode1=STRING) ("user constructor" userCode2=STRING)
+		//('file path' filePath=STRING | ('user import' userCode1=STRING) ('user constructor' userCode2=STRING))
 		public Alternatives getAlternatives_2_0() { return cAlternatives_2_0; }
 
-		//"file path" filePath=STRING
+		//'file path' filePath=STRING
 		public Group getGroup_2_0_0() { return cGroup_2_0_0; }
 
-		//"file path"
+		//'file path'
 		public Keyword getFilePathKeyword_2_0_0_0() { return cFilePathKeyword_2_0_0_0; }
 
 		//filePath=STRING
@@ -214,13 +221,13 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 		//STRING
 		public RuleCall getFilePathSTRINGTerminalRuleCall_2_0_0_1_0() { return cFilePathSTRINGTerminalRuleCall_2_0_0_1_0; }
 
-		//("user import" userCode1=STRING) ("user constructor" userCode2=STRING)
+		//('user import' userCode1=STRING) ('user constructor' userCode2=STRING)
 		public Group getGroup_2_0_1() { return cGroup_2_0_1; }
 
-		//"user import" userCode1=STRING
+		//('user import' userCode1=STRING)
 		public Group getGroup_2_0_1_0() { return cGroup_2_0_1_0; }
 
-		//"user import"
+		//'user import'
 		public Keyword getUserImportKeyword_2_0_1_0_0() { return cUserImportKeyword_2_0_1_0_0; }
 
 		//userCode1=STRING
@@ -229,10 +236,10 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 		//STRING
 		public RuleCall getUserCode1STRINGTerminalRuleCall_2_0_1_0_1_0() { return cUserCode1STRINGTerminalRuleCall_2_0_1_0_1_0; }
 
-		//"user constructor" userCode2=STRING
+		//('user constructor' userCode2=STRING)
 		public Group getGroup_2_0_1_1() { return cGroup_2_0_1_1; }
 
-		//"user constructor"
+		//'user constructor'
 		public Keyword getUserConstructorKeyword_2_0_1_1_0() { return cUserConstructorKeyword_2_0_1_1_0; }
 
 		//userCode2=STRING
@@ -241,10 +248,10 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 		//STRING
 		public RuleCall getUserCode2STRINGTerminalRuleCall_2_0_1_1_1_0() { return cUserCode2STRINGTerminalRuleCall_2_0_1_1_1_0; }
 
-		//("polling interval" polling=TIME)?
+		//('polling interval' polling=TIME)?
 		public Group getGroup_2_1() { return cGroup_2_1; }
 
-		//"polling interval"
+		//'polling interval'
 		public Keyword getPollingIntervalKeyword_2_1_0() { return cPollingIntervalKeyword_2_1_0; }
 
 		//polling=TIME
@@ -253,12 +260,12 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 		//TIME
 		public RuleCall getPollingTIMEParserRuleCall_2_1_1_0() { return cPollingTIMEParserRuleCall_2_1_1_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_3() { return cRightCurlyBracketKeyword_3; }
 	}
 
 	public class ActorClassConfigElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ActorClassConfig");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Config.ActorClassConfig");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cActorClassConfigKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cActorAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -270,13 +277,15 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cRightCurlyBracketKeyword_4 = (Keyword)cGroup.eContents().get(4);
 		
 		//ActorClassConfig:
-		//	"ActorClassConfig" actor=[room::ActorClass|FQN] "{" attributes+=AttrClassConfig* "}";
-		public ParserRule getRule() { return rule; }
+		//	'ActorClassConfig' actor=[room::ActorClass|FQN] '{'
+		//	attributes+=AttrClassConfig*
+		//	'}';
+		@Override public ParserRule getRule() { return rule; }
 
-		//"ActorClassConfig" actor=[room::ActorClass|FQN] "{" attributes+=AttrClassConfig* "}"
+		//'ActorClassConfig' actor=[room::ActorClass|FQN] '{' attributes+=AttrClassConfig* '}'
 		public Group getGroup() { return cGroup; }
 
-		//"ActorClassConfig"
+		//'ActorClassConfig'
 		public Keyword getActorClassConfigKeyword_0() { return cActorClassConfigKeyword_0; }
 
 		//actor=[room::ActorClass|FQN]
@@ -288,7 +297,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 		//FQN
 		public RuleCall getActorActorClassFQNParserRuleCall_1_0_1() { return cActorActorClassFQNParserRuleCall_1_0_1; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_2() { return cLeftCurlyBracketKeyword_2; }
 
 		//attributes+=AttrClassConfig*
@@ -297,12 +306,12 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 		//AttrClassConfig
 		public RuleCall getAttributesAttrClassConfigParserRuleCall_3_0() { return cAttributesAttrClassConfigParserRuleCall_3_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_4() { return cRightCurlyBracketKeyword_4; }
 	}
 
 	public class ActorInstanceConfigElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ActorInstanceConfig");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Config.ActorInstanceConfig");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cActorInstanceConfigKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cRootAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -324,15 +333,16 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cRightCurlyBracketKeyword_8 = (Keyword)cGroup.eContents().get(8);
 		
 		//ActorInstanceConfig:
-		//	"ActorInstanceConfig" root=[room::LogicalSystem|FQN] "/" subSystem=[room::SubSystemRef] "/" path=RefPath "{"
-		//	(attributes+=AttrInstanceConfig* & ports+=PortInstanceConfig*) "}";
-		public ParserRule getRule() { return rule; }
+		//	'ActorInstanceConfig' root=[room::LogicalSystem|FQN] '/' subSystem=[room::SubSystemRef] '/' path=RefPath '{'
+		//	(attributes+=AttrInstanceConfig* & ports+=PortInstanceConfig*)
+		//	'}';
+		@Override public ParserRule getRule() { return rule; }
 
-		//"ActorInstanceConfig" root=[room::LogicalSystem|FQN] "/" subSystem=[room::SubSystemRef] "/" path=RefPath "{"
-		//(attributes+=AttrInstanceConfig* & ports+=PortInstanceConfig*) "}"
+		//'ActorInstanceConfig' root=[room::LogicalSystem|FQN] '/' subSystem=[room::SubSystemRef] '/' path=RefPath '{'
+		//(attributes+=AttrInstanceConfig* & ports+=PortInstanceConfig*) '}'
 		public Group getGroup() { return cGroup; }
 
-		//"ActorInstanceConfig"
+		//'ActorInstanceConfig'
 		public Keyword getActorInstanceConfigKeyword_0() { return cActorInstanceConfigKeyword_0; }
 
 		//root=[room::LogicalSystem|FQN]
@@ -344,7 +354,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 		//FQN
 		public RuleCall getRootLogicalSystemFQNParserRuleCall_1_0_1() { return cRootLogicalSystemFQNParserRuleCall_1_0_1; }
 
-		//"/"
+		//'/'
 		public Keyword getSolidusKeyword_2() { return cSolidusKeyword_2; }
 
 		//subSystem=[room::SubSystemRef]
@@ -356,7 +366,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 		//ID
 		public RuleCall getSubSystemSubSystemRefIDTerminalRuleCall_3_0_1() { return cSubSystemSubSystemRefIDTerminalRuleCall_3_0_1; }
 
-		//"/"
+		//'/'
 		public Keyword getSolidusKeyword_4() { return cSolidusKeyword_4; }
 
 		//path=RefPath
@@ -365,10 +375,10 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 		//RefPath
 		public RuleCall getPathRefPathParserRuleCall_5_0() { return cPathRefPathParserRuleCall_5_0; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_6() { return cLeftCurlyBracketKeyword_6; }
 
-		//attributes+=AttrInstanceConfig* & ports+=PortInstanceConfig*
+		//(attributes+=AttrInstanceConfig* & ports+=PortInstanceConfig*)
 		public UnorderedGroup getUnorderedGroup_7() { return cUnorderedGroup_7; }
 
 		//attributes+=AttrInstanceConfig*
@@ -383,12 +393,12 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 		//PortInstanceConfig
 		public RuleCall getPortsPortInstanceConfigParserRuleCall_7_1_0() { return cPortsPortInstanceConfigParserRuleCall_7_1_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_8() { return cRightCurlyBracketKeyword_8; }
 	}
 
 	public class ProtocolClassConfigElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ProtocolClassConfig");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Config.ProtocolClassConfig");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cProtocolClassConfigKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cProtocolAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -409,15 +419,16 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cRightCurlyBracketKeyword_4 = (Keyword)cGroup.eContents().get(4);
 		
 		//ProtocolClassConfig:
-		//	"ProtocolClassConfig" protocol=[room::ProtocolClass|FQN] "{" (("regular" regular=PortClassConfig)? & (("conjugate" |
-		//	"conjugated") conjugated=PortClassConfig)?) "}";
-		public ParserRule getRule() { return rule; }
+		//	'ProtocolClassConfig' protocol=[room::ProtocolClass|FQN] '{' (('regular' regular=PortClassConfig)? & (('conjugate' |
+		//	'conjugated') conjugated=PortClassConfig)?)
+		//	'}';
+		@Override public ParserRule getRule() { return rule; }
 
-		//"ProtocolClassConfig" protocol=[room::ProtocolClass|FQN] "{" (("regular" regular=PortClassConfig)? & (("conjugate" |
-		//"conjugated") conjugated=PortClassConfig)?) "}"
+		//'ProtocolClassConfig' protocol=[room::ProtocolClass|FQN] '{' (('regular' regular=PortClassConfig)? & (('conjugate' |
+		//'conjugated') conjugated=PortClassConfig)?) '}'
 		public Group getGroup() { return cGroup; }
 
-		//"ProtocolClassConfig"
+		//'ProtocolClassConfig'
 		public Keyword getProtocolClassConfigKeyword_0() { return cProtocolClassConfigKeyword_0; }
 
 		//protocol=[room::ProtocolClass|FQN]
@@ -429,16 +440,16 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 		//FQN
 		public RuleCall getProtocolProtocolClassFQNParserRuleCall_1_0_1() { return cProtocolProtocolClassFQNParserRuleCall_1_0_1; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_2() { return cLeftCurlyBracketKeyword_2; }
 
-		//("regular" regular=PortClassConfig)? & (("conjugate" | "conjugated") conjugated=PortClassConfig)?
+		//(('regular' regular=PortClassConfig)? & (('conjugate' | 'conjugated') conjugated=PortClassConfig)?)
 		public UnorderedGroup getUnorderedGroup_3() { return cUnorderedGroup_3; }
 
-		//("regular" regular=PortClassConfig)?
+		//('regular' regular=PortClassConfig)?
 		public Group getGroup_3_0() { return cGroup_3_0; }
 
-		//"regular"
+		//'regular'
 		public Keyword getRegularKeyword_3_0_0() { return cRegularKeyword_3_0_0; }
 
 		//regular=PortClassConfig
@@ -447,16 +458,16 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 		//PortClassConfig
 		public RuleCall getRegularPortClassConfigParserRuleCall_3_0_1_0() { return cRegularPortClassConfigParserRuleCall_3_0_1_0; }
 
-		//(("conjugate" | "conjugated") conjugated=PortClassConfig)?
+		//(('conjugate' | 'conjugated') conjugated=PortClassConfig)?
 		public Group getGroup_3_1() { return cGroup_3_1; }
 
-		//"conjugate" | "conjugated"
+		//('conjugate' | 'conjugated')
 		public Alternatives getAlternatives_3_1_0() { return cAlternatives_3_1_0; }
 
-		//"conjugate"
+		//'conjugate'
 		public Keyword getConjugateKeyword_3_1_0_0() { return cConjugateKeyword_3_1_0_0; }
 
-		//"conjugated"
+		//'conjugated'
 		public Keyword getConjugatedKeyword_3_1_0_1() { return cConjugatedKeyword_3_1_0_1; }
 
 		//conjugated=PortClassConfig
@@ -465,12 +476,12 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 		//PortClassConfig
 		public RuleCall getConjugatedPortClassConfigParserRuleCall_3_1_1_0() { return cConjugatedPortClassConfigParserRuleCall_3_1_1_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_4() { return cRightCurlyBracketKeyword_4; }
 	}
 
 	public class PortClassConfigElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "PortClassConfig");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Config.PortClassConfig");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Action cPortClassConfigAction_0 = (Action)cGroup.eContents().get(0);
 		private final Keyword cPortKeyword_1 = (Keyword)cGroup.eContents().get(1);
@@ -480,19 +491,21 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cRightCurlyBracketKeyword_4 = (Keyword)cGroup.eContents().get(4);
 		
 		//PortClassConfig:
-		//	{PortClassConfig} "Port" "{" attributes+=AttrClassConfig* "}";
-		public ParserRule getRule() { return rule; }
+		//	{PortClassConfig} 'Port' '{'
+		//	attributes+=AttrClassConfig*
+		//	'}';
+		@Override public ParserRule getRule() { return rule; }
 
-		//{PortClassConfig} "Port" "{" attributes+=AttrClassConfig* "}"
+		//{PortClassConfig} 'Port' '{' attributes+=AttrClassConfig* '}'
 		public Group getGroup() { return cGroup; }
 
 		//{PortClassConfig}
 		public Action getPortClassConfigAction_0() { return cPortClassConfigAction_0; }
 
-		//"Port"
+		//'Port'
 		public Keyword getPortKeyword_1() { return cPortKeyword_1; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_2() { return cLeftCurlyBracketKeyword_2; }
 
 		//attributes+=AttrClassConfig*
@@ -501,12 +514,12 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 		//AttrClassConfig
 		public RuleCall getAttributesAttrClassConfigParserRuleCall_3_0() { return cAttributesAttrClassConfigParserRuleCall_3_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_4() { return cRightCurlyBracketKeyword_4; }
 	}
 
 	public class PortInstanceConfigElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "PortInstanceConfig");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Config.PortInstanceConfig");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cInterfaceItemKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cItemAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -518,13 +531,15 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cRightCurlyBracketKeyword_4 = (Keyword)cGroup.eContents().get(4);
 		
 		//PortInstanceConfig:
-		//	"InterfaceItem" item=[room::InterfaceItem] "{" attributes+=AttrInstanceConfig* "}";
-		public ParserRule getRule() { return rule; }
+		//	'InterfaceItem' item=[room::InterfaceItem] '{'
+		//	attributes+=AttrInstanceConfig*
+		//	'}';
+		@Override public ParserRule getRule() { return rule; }
 
-		//"InterfaceItem" item=[room::InterfaceItem] "{" attributes+=AttrInstanceConfig* "}"
+		//'InterfaceItem' item=[room::InterfaceItem] '{' attributes+=AttrInstanceConfig* '}'
 		public Group getGroup() { return cGroup; }
 
-		//"InterfaceItem"
+		//'InterfaceItem'
 		public Keyword getInterfaceItemKeyword_0() { return cInterfaceItemKeyword_0; }
 
 		//item=[room::InterfaceItem]
@@ -536,7 +551,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 		//ID
 		public RuleCall getItemInterfaceItemIDTerminalRuleCall_1_0_1() { return cItemInterfaceItemIDTerminalRuleCall_1_0_1; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_2() { return cLeftCurlyBracketKeyword_2; }
 
 		//attributes+=AttrInstanceConfig*
@@ -545,19 +560,19 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 		//AttrInstanceConfig
 		public RuleCall getAttributesAttrInstanceConfigParserRuleCall_3_0() { return cAttributesAttrInstanceConfigParserRuleCall_3_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_4() { return cRightCurlyBracketKeyword_4; }
 	}
 
 	public class AttrConfigElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "AttrConfig");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Config.AttrConfig");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final RuleCall cAttrClassConfigParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final RuleCall cAttrInstanceConfigParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
 		
 		//AttrConfig:
 		//	AttrClassConfig | AttrInstanceConfig;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//AttrClassConfig | AttrInstanceConfig
 		public Alternatives getAlternatives() { return cAlternatives; }
@@ -570,7 +585,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class AttrClassConfigElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "AttrClassConfig");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Config.AttrClassConfig");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cAttrKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cAttributeAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -598,15 +613,17 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cRightCurlyBracketKeyword_3_2 = (Keyword)cGroup_3.eContents().get(2);
 		
 		//AttrClassConfig:
-		//	"Attr" attribute=[room::Attribute] ("=" value=ConfigValueArray)? ("{" (("min" "=" min=NumberLiteral)? ("max" "="
-		//	max=NumberLiteral)? attributes+=AttrClassConfig*) "}")?;
-		public ParserRule getRule() { return rule; }
-
-		//"Attr" attribute=[room::Attribute] ("=" value=ConfigValueArray)? ("{" (("min" "=" min=NumberLiteral)? ("max" "="
-		//max=NumberLiteral)? attributes+=AttrClassConfig*) "}")?
+		//	'Attr' attribute=[room::Attribute] ('=' value=ConfigValueArray)? ('{' (('min' '=' min=NumberLiteral)? ('max' '='
+		//	max=NumberLiteral)?
+		//	attributes+=AttrClassConfig*)
+		//	'}')?;
+		@Override public ParserRule getRule() { return rule; }
+
+		//'Attr' attribute=[room::Attribute] ('=' value=ConfigValueArray)? ('{' (('min' '=' min=NumberLiteral)? ('max' '='
+		//max=NumberLiteral)? attributes+=AttrClassConfig*) '}')?
 		public Group getGroup() { return cGroup; }
 
-		//"Attr"
+		//'Attr'
 		public Keyword getAttrKeyword_0() { return cAttrKeyword_0; }
 
 		//attribute=[room::Attribute]
@@ -618,10 +635,10 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 		//ID
 		public RuleCall getAttributeAttributeIDTerminalRuleCall_1_0_1() { return cAttributeAttributeIDTerminalRuleCall_1_0_1; }
 
-		//("=" value=ConfigValueArray)?
+		//('=' value=ConfigValueArray)?
 		public Group getGroup_2() { return cGroup_2; }
 
-		//"="
+		//'='
 		public Keyword getEqualsSignKeyword_2_0() { return cEqualsSignKeyword_2_0; }
 
 		//value=ConfigValueArray
@@ -630,22 +647,22 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 		//ConfigValueArray
 		public RuleCall getValueConfigValueArrayParserRuleCall_2_1_0() { return cValueConfigValueArrayParserRuleCall_2_1_0; }
 
-		//("{" (("min" "=" min=NumberLiteral)? ("max" "=" max=NumberLiteral)? attributes+=AttrClassConfig*) "}")?
+		//('{' (('min' '=' min=NumberLiteral)? ('max' '=' max=NumberLiteral)? attributes+=AttrClassConfig*) '}')?
 		public Group getGroup_3() { return cGroup_3; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_3_0() { return cLeftCurlyBracketKeyword_3_0; }
 
-		//("min" "=" min=NumberLiteral)? ("max" "=" max=NumberLiteral)? attributes+=AttrClassConfig*
+		//(('min' '=' min=NumberLiteral)? ('max' '=' max=NumberLiteral)? attributes+=AttrClassConfig*)
 		public Group getGroup_3_1() { return cGroup_3_1; }
 
-		//("min" "=" min=NumberLiteral)?
+		//('min' '=' min=NumberLiteral)?
 		public Group getGroup_3_1_0() { return cGroup_3_1_0; }
 
-		//"min"
+		//'min'
 		public Keyword getMinKeyword_3_1_0_0() { return cMinKeyword_3_1_0_0; }
 
-		//"="
+		//'='
 		public Keyword getEqualsSignKeyword_3_1_0_1() { return cEqualsSignKeyword_3_1_0_1; }
 
 		//min=NumberLiteral
@@ -654,13 +671,13 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 		//NumberLiteral
 		public RuleCall getMinNumberLiteralParserRuleCall_3_1_0_2_0() { return cMinNumberLiteralParserRuleCall_3_1_0_2_0; }
 
-		//("max" "=" max=NumberLiteral)?
+		//('max' '=' max=NumberLiteral)?
 		public Group getGroup_3_1_1() { return cGroup_3_1_1; }
 
-		//"max"
+		//'max'
 		public Keyword getMaxKeyword_3_1_1_0() { return cMaxKeyword_3_1_1_0; }
 
-		//"="
+		//'='
 		public Keyword getEqualsSignKeyword_3_1_1_1() { return cEqualsSignKeyword_3_1_1_1; }
 
 		//max=NumberLiteral
@@ -675,12 +692,12 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 		//AttrClassConfig
 		public RuleCall getAttributesAttrClassConfigParserRuleCall_3_1_2_0() { return cAttributesAttrClassConfigParserRuleCall_3_1_2_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_3_2() { return cRightCurlyBracketKeyword_3_2; }
 	}
 
 	public class AttrInstanceConfigElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "AttrInstanceConfig");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Config.AttrInstanceConfig");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cAttrKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cAttributeAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -705,15 +722,17 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cRightCurlyBracketKeyword_3_2 = (Keyword)cGroup_3.eContents().get(2);
 		
 		//AttrInstanceConfig:
-		//	"Attr" attribute=[room::Attribute] ("=" value=ConfigValueArray)? ("{" ((dynConfig?="dynamic configuration"
-		//	(readOnly?="read" | "write"))? attributes+=AttrInstanceConfig*) "}")?;
-		public ParserRule getRule() { return rule; }
-
-		//"Attr" attribute=[room::Attribute] ("=" value=ConfigValueArray)? ("{" ((dynConfig?="dynamic configuration"
-		//(readOnly?="read" | "write"))? attributes+=AttrInstanceConfig*) "}")?
+		//	'Attr' attribute=[room::Attribute] ('=' value=ConfigValueArray)? ('{' ((dynConfig?='dynamic configuration'
+		//	(readOnly?='read' | 'write'))?
+		//	attributes+=AttrInstanceConfig*)
+		//	'}')?;
+		@Override public ParserRule getRule() { return rule; }
+
+		//'Attr' attribute=[room::Attribute] ('=' value=ConfigValueArray)? ('{' ((dynConfig?='dynamic configuration'
+		//(readOnly?='read' | 'write'))? attributes+=AttrInstanceConfig*) '}')?
 		public Group getGroup() { return cGroup; }
 
-		//"Attr"
+		//'Attr'
 		public Keyword getAttrKeyword_0() { return cAttrKeyword_0; }
 
 		//attribute=[room::Attribute]
@@ -725,10 +744,10 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 		//ID
 		public RuleCall getAttributeAttributeIDTerminalRuleCall_1_0_1() { return cAttributeAttributeIDTerminalRuleCall_1_0_1; }
 
-		//("=" value=ConfigValueArray)?
+		//('=' value=ConfigValueArray)?
 		public Group getGroup_2() { return cGroup_2; }
 
-		//"="
+		//'='
 		public Keyword getEqualsSignKeyword_2_0() { return cEqualsSignKeyword_2_0; }
 
 		//value=ConfigValueArray
@@ -737,34 +756,34 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 		//ConfigValueArray
 		public RuleCall getValueConfigValueArrayParserRuleCall_2_1_0() { return cValueConfigValueArrayParserRuleCall_2_1_0; }
 
-		//("{" ((dynConfig?="dynamic configuration" (readOnly?="read" | "write"))? attributes+=AttrInstanceConfig*) "}")?
+		//('{' ((dynConfig?='dynamic configuration' (readOnly?='read' | 'write'))? attributes+=AttrInstanceConfig*) '}')?
 		public Group getGroup_3() { return cGroup_3; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_3_0() { return cLeftCurlyBracketKeyword_3_0; }
 
-		//(dynConfig?="dynamic configuration" (readOnly?="read" | "write"))? attributes+=AttrInstanceConfig*
+		//((dynConfig?='dynamic configuration' (readOnly?='read' | 'write'))? attributes+=AttrInstanceConfig*)
 		public Group getGroup_3_1() { return cGroup_3_1; }
 
-		//(dynConfig?="dynamic configuration" (readOnly?="read" | "write"))?
+		//(dynConfig?='dynamic configuration' (readOnly?='read' | 'write'))?
 		public Group getGroup_3_1_0() { return cGroup_3_1_0; }
 
-		//dynConfig?="dynamic configuration"
+		//dynConfig?='dynamic configuration'
 		public Assignment getDynConfigAssignment_3_1_0_0() { return cDynConfigAssignment_3_1_0_0; }
 
-		//"dynamic configuration"
+		//'dynamic configuration'
 		public Keyword getDynConfigDynamicConfigurationKeyword_3_1_0_0_0() { return cDynConfigDynamicConfigurationKeyword_3_1_0_0_0; }
 
-		//readOnly?="read" | "write"
+		//(readOnly?='read' | 'write')
 		public Alternatives getAlternatives_3_1_0_1() { return cAlternatives_3_1_0_1; }
 
-		//readOnly?="read"
+		//readOnly?='read'
 		public Assignment getReadOnlyAssignment_3_1_0_1_0() { return cReadOnlyAssignment_3_1_0_1_0; }
 
-		//"read"
+		//'read'
 		public Keyword getReadOnlyReadKeyword_3_1_0_1_0_0() { return cReadOnlyReadKeyword_3_1_0_1_0_0; }
 
-		//"write"
+		//'write'
 		public Keyword getWriteKeyword_3_1_0_1_1() { return cWriteKeyword_3_1_0_1_1; }
 
 		//attributes+=AttrInstanceConfig*
@@ -773,12 +792,12 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 		//AttrInstanceConfig
 		public RuleCall getAttributesAttrInstanceConfigParserRuleCall_3_1_1_0() { return cAttributesAttrInstanceConfigParserRuleCall_3_1_1_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_3_2() { return cRightCurlyBracketKeyword_3_2; }
 	}
 
 	public class ConfigValueArrayElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ConfigValueArray");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Config.ConfigValueArray");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Assignment cValuesAssignment_0 = (Assignment)cGroup.eContents().get(0);
 		private final RuleCall cValuesConfigValueParserRuleCall_0_0 = (RuleCall)cValuesAssignment_0.eContents().get(0);
@@ -788,10 +807,10 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cValuesConfigValueParserRuleCall_1_1_0 = (RuleCall)cValuesAssignment_1_1.eContents().get(0);
 		
 		//ConfigValueArray:
-		//	values+=ConfigValue ("," values+=ConfigValue)*;
-		public ParserRule getRule() { return rule; }
+		//	values+=ConfigValue (',' values+=ConfigValue)*;
+		@Override public ParserRule getRule() { return rule; }
 
-		//values+=ConfigValue ("," values+=ConfigValue)*
+		//values+=ConfigValue (',' values+=ConfigValue)*
 		public Group getGroup() { return cGroup; }
 
 		//values+=ConfigValue
@@ -800,10 +819,10 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 		//ConfigValue
 		public RuleCall getValuesConfigValueParserRuleCall_0_0() { return cValuesConfigValueParserRuleCall_0_0; }
 
-		//("," values+=ConfigValue)*
+		//(',' values+=ConfigValue)*
 		public Group getGroup_1() { return cGroup_1; }
 
-		//","
+		//','
 		public Keyword getCommaKeyword_1_0() { return cCommaKeyword_1_0; }
 
 		//values+=ConfigValue
@@ -814,14 +833,14 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class ConfigValueElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ConfigValue");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Config.ConfigValue");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final RuleCall cLiteralConfigValueParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final RuleCall cEnumConfigValueParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
 		
 		//ConfigValue:
 		//	LiteralConfigValue | EnumConfigValue;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//LiteralConfigValue | EnumConfigValue
 		public Alternatives getAlternatives() { return cAlternatives; }
@@ -834,13 +853,13 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class LiteralConfigValueElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "LiteralConfigValue");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Config.LiteralConfigValue");
 		private final Assignment cValueAssignment = (Assignment)rule.eContents().get(1);
 		private final RuleCall cValueLiteralParserRuleCall_0 = (RuleCall)cValueAssignment.eContents().get(0);
 		
 		//LiteralConfigValue:
 		//	value=Literal;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//value=Literal
 		public Assignment getValueAssignment() { return cValueAssignment; }
@@ -850,7 +869,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class EnumConfigValueElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "EnumConfigValue");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Config.EnumConfigValue");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Assignment cTypeAssignment_0 = (Assignment)cGroup.eContents().get(0);
 		private final CrossReference cTypeEnumerationTypeCrossReference_0_0 = (CrossReference)cTypeAssignment_0.eContents().get(0);
@@ -861,10 +880,10 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cValueEnumLiteralIDTerminalRuleCall_2_0_1 = (RuleCall)cValueEnumLiteralCrossReference_2_0.eContents().get(1);
 		
 		//EnumConfigValue:
-		//	type=[room::EnumerationType] "." value=[room::EnumLiteral];
-		public ParserRule getRule() { return rule; }
+		//	type=[room::EnumerationType] '.' value=[room::EnumLiteral];
+		@Override public ParserRule getRule() { return rule; }
 
-		//type=[room::EnumerationType] "." value=[room::EnumLiteral]
+		//type=[room::EnumerationType] '.' value=[room::EnumLiteral]
 		public Group getGroup() { return cGroup; }
 
 		//type=[room::EnumerationType]
@@ -876,7 +895,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 		//ID
 		public RuleCall getTypeEnumerationTypeIDTerminalRuleCall_0_0_1() { return cTypeEnumerationTypeIDTerminalRuleCall_0_0_1; }
 
-		//"."
+		//'.'
 		public Keyword getFullStopKeyword_1() { return cFullStopKeyword_1; }
 
 		//value=[room::EnumLiteral]
@@ -890,7 +909,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class RefPathElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "RefPath");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Config.RefPath");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Assignment cRefsAssignment_0 = (Assignment)cGroup.eContents().get(0);
 		private final RuleCall cRefsRefSegmentParserRuleCall_0_0 = (RuleCall)cRefsAssignment_0.eContents().get(0);
@@ -900,10 +919,10 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cRefsRefSegmentParserRuleCall_1_1_0 = (RuleCall)cRefsAssignment_1_1.eContents().get(0);
 		
 		//RefPath:
-		//	refs+=RefSegment ("/" refs+=RefSegment)*;
-		public ParserRule getRule() { return rule; }
+		//	refs+=RefSegment ('/' refs+=RefSegment)*;
+		@Override public ParserRule getRule() { return rule; }
 
-		//refs+=RefSegment ("/" refs+=RefSegment)*
+		//refs+=RefSegment ('/' refs+=RefSegment)*
 		public Group getGroup() { return cGroup; }
 
 		//refs+=RefSegment
@@ -912,10 +931,10 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 		//RefSegment
 		public RuleCall getRefsRefSegmentParserRuleCall_0_0() { return cRefsRefSegmentParserRuleCall_0_0; }
 
-		//("/" refs+=RefSegment)*
+		//('/' refs+=RefSegment)*
 		public Group getGroup_1() { return cGroup_1; }
 
-		//"/"
+		//'/'
 		public Keyword getSolidusKeyword_1_0() { return cSolidusKeyword_1_0; }
 
 		//refs+=RefSegment
@@ -926,7 +945,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class RefSegmentElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "RefSegment");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Config.RefSegment");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Assignment cRefAssignment_0 = (Assignment)cGroup.eContents().get(0);
 		private final RuleCall cRefIDTerminalRuleCall_0_0 = (RuleCall)cRefAssignment_0.eContents().get(0);
@@ -936,10 +955,10 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cIdxINTTerminalRuleCall_1_1_0 = (RuleCall)cIdxAssignment_1_1.eContents().get(0);
 		
 		//RefSegment:
-		//	ref=ID (":" idx=INT)?;
-		public ParserRule getRule() { return rule; }
+		//	ref=ID (':' idx=INT)?;
+		@Override public ParserRule getRule() { return rule; }
 
-		//ref=ID (":" idx=INT)?
+		//ref=ID (':' idx=INT)?
 		public Group getGroup() { return cGroup; }
 
 		//ref=ID
@@ -948,10 +967,10 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 		//ID
 		public RuleCall getRefIDTerminalRuleCall_0_0() { return cRefIDTerminalRuleCall_0_0; }
 
-		//(":" idx=INT)?
+		//(':' idx=INT)?
 		public Group getGroup_1() { return cGroup_1; }
 
-		//":"
+		//':'
 		public Keyword getColonKeyword_1_0() { return cColonKeyword_1_0; }
 
 		//idx=INT
@@ -985,11 +1004,15 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 
 	private final BaseGrammarAccess gaBase;
 
+	private final TerminalsGrammarAccess gaTerminals;
+
 	@Inject
 	public ConfigGrammarAccess(GrammarProvider grammarProvider,
-		BaseGrammarAccess gaBase) {
+		BaseGrammarAccess gaBase,
+		TerminalsGrammarAccess gaTerminals) {
 		this.grammar = internalFindGrammar(grammarProvider);
 		this.gaBase = gaBase;
+		this.gaTerminals = gaTerminals;
 		this.pConfigModel = new ConfigModelElements();
 		this.pConfigElement = new ConfigElementElements();
 		this.pSubSystemConfig = new SubSystemConfigElements();
@@ -1026,7 +1049,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 		return grammar;
 	}
 	
-	
+	@Override
 	public Grammar getGrammar() {
 		return grammar;
 	}
@@ -1036,9 +1059,16 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 		return gaBase;
 	}
 
+	public TerminalsGrammarAccess getTerminalsGrammarAccess() {
+		return gaTerminals;
+	}
+
 	
 	//ConfigModel:
-	//	"ConfigModel" name=FQN "{" imports+=Import* configElements+=ConfigElement* "}";
+	//	'ConfigModel' name=FQN '{'
+	//	imports+=Import*
+	//	configElements+=ConfigElement*
+	//	'}';
 	public ConfigModelElements getConfigModelAccess() {
 		return pConfigModel;
 	}
@@ -1058,7 +1088,9 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//SubSystemConfig:
-	//	"SubSystemConfig" root=[room::LogicalSystem|FQN] "/" subSystem=[room::SubSystemRef] "{" dynConfig=DynamicConfig "}";
+	//	'SubSystemConfig' root=[room::LogicalSystem|FQN] '/' subSystem=[room::SubSystemRef] '{'
+	//	dynConfig=DynamicConfig
+	//	'}';
 	public SubSystemConfigElements getSubSystemConfigAccess() {
 		return pSubSystemConfig;
 	}
@@ -1068,8 +1100,9 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//DynamicConfig:
-	//	"dynamic configuration" "{" (("file path" filePath=STRING | ("user import" userCode1=STRING) ("user constructor"
-	//	userCode2=STRING)) & ("polling interval" polling=TIME)?) "}";
+	//	'dynamic configuration' '{' (('file path' filePath=STRING | ('user import' userCode1=STRING) ('user constructor'
+	//	userCode2=STRING)) & ('polling interval' polling=TIME)?)
+	//	'}';
 	public DynamicConfigElements getDynamicConfigAccess() {
 		return pDynamicConfig;
 	}
@@ -1079,7 +1112,9 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//ActorClassConfig:
-	//	"ActorClassConfig" actor=[room::ActorClass|FQN] "{" attributes+=AttrClassConfig* "}";
+	//	'ActorClassConfig' actor=[room::ActorClass|FQN] '{'
+	//	attributes+=AttrClassConfig*
+	//	'}';
 	public ActorClassConfigElements getActorClassConfigAccess() {
 		return pActorClassConfig;
 	}
@@ -1089,8 +1124,9 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//ActorInstanceConfig:
-	//	"ActorInstanceConfig" root=[room::LogicalSystem|FQN] "/" subSystem=[room::SubSystemRef] "/" path=RefPath "{"
-	//	(attributes+=AttrInstanceConfig* & ports+=PortInstanceConfig*) "}";
+	//	'ActorInstanceConfig' root=[room::LogicalSystem|FQN] '/' subSystem=[room::SubSystemRef] '/' path=RefPath '{'
+	//	(attributes+=AttrInstanceConfig* & ports+=PortInstanceConfig*)
+	//	'}';
 	public ActorInstanceConfigElements getActorInstanceConfigAccess() {
 		return pActorInstanceConfig;
 	}
@@ -1100,8 +1136,9 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//ProtocolClassConfig:
-	//	"ProtocolClassConfig" protocol=[room::ProtocolClass|FQN] "{" (("regular" regular=PortClassConfig)? & (("conjugate" |
-	//	"conjugated") conjugated=PortClassConfig)?) "}";
+	//	'ProtocolClassConfig' protocol=[room::ProtocolClass|FQN] '{' (('regular' regular=PortClassConfig)? & (('conjugate' |
+	//	'conjugated') conjugated=PortClassConfig)?)
+	//	'}';
 	public ProtocolClassConfigElements getProtocolClassConfigAccess() {
 		return pProtocolClassConfig;
 	}
@@ -1111,7 +1148,9 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//PortClassConfig:
-	//	{PortClassConfig} "Port" "{" attributes+=AttrClassConfig* "}";
+	//	{PortClassConfig} 'Port' '{'
+	//	attributes+=AttrClassConfig*
+	//	'}';
 	public PortClassConfigElements getPortClassConfigAccess() {
 		return pPortClassConfig;
 	}
@@ -1121,7 +1160,9 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//PortInstanceConfig:
-	//	"InterfaceItem" item=[room::InterfaceItem] "{" attributes+=AttrInstanceConfig* "}";
+	//	'InterfaceItem' item=[room::InterfaceItem] '{'
+	//	attributes+=AttrInstanceConfig*
+	//	'}';
 	public PortInstanceConfigElements getPortInstanceConfigAccess() {
 		return pPortInstanceConfig;
 	}
@@ -1141,8 +1182,10 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//AttrClassConfig:
-	//	"Attr" attribute=[room::Attribute] ("=" value=ConfigValueArray)? ("{" (("min" "=" min=NumberLiteral)? ("max" "="
-	//	max=NumberLiteral)? attributes+=AttrClassConfig*) "}")?;
+	//	'Attr' attribute=[room::Attribute] ('=' value=ConfigValueArray)? ('{' (('min' '=' min=NumberLiteral)? ('max' '='
+	//	max=NumberLiteral)?
+	//	attributes+=AttrClassConfig*)
+	//	'}')?;
 	public AttrClassConfigElements getAttrClassConfigAccess() {
 		return pAttrClassConfig;
 	}
@@ -1152,8 +1195,10 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//AttrInstanceConfig:
-	//	"Attr" attribute=[room::Attribute] ("=" value=ConfigValueArray)? ("{" ((dynConfig?="dynamic configuration"
-	//	(readOnly?="read" | "write"))? attributes+=AttrInstanceConfig*) "}")?;
+	//	'Attr' attribute=[room::Attribute] ('=' value=ConfigValueArray)? ('{' ((dynConfig?='dynamic configuration'
+	//	(readOnly?='read' | 'write'))?
+	//	attributes+=AttrInstanceConfig*)
+	//	'}')?;
 	public AttrInstanceConfigElements getAttrInstanceConfigAccess() {
 		return pAttrInstanceConfig;
 	}
@@ -1163,7 +1208,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//ConfigValueArray:
-	//	values+=ConfigValue ("," values+=ConfigValue)*;
+	//	values+=ConfigValue (',' values+=ConfigValue)*;
 	public ConfigValueArrayElements getConfigValueArrayAccess() {
 		return pConfigValueArray;
 	}
@@ -1193,7 +1238,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//EnumConfigValue:
-	//	type=[room::EnumerationType] "." value=[room::EnumLiteral];
+	//	type=[room::EnumerationType] '.' value=[room::EnumLiteral];
 	public EnumConfigValueElements getEnumConfigValueAccess() {
 		return pEnumConfigValue;
 	}
@@ -1203,7 +1248,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//RefPath:
-	//	refs+=RefSegment ("/" refs+=RefSegment)*;
+	//	refs+=RefSegment ('/' refs+=RefSegment)*;
 	public RefPathElements getRefPathAccess() {
 		return pRefPath;
 	}
@@ -1213,7 +1258,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//RefSegment:
-	//	ref=ID (":" idx=INT)?;
+	//	ref=ID (':' idx=INT)?;
 	public RefSegmentElements getRefSegmentAccess() {
 		return pRefSegment;
 	}
@@ -1225,7 +1270,7 @@ public class ConfigGrammarAccess 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();
 	}
@@ -1235,7 +1280,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//KeyValue:
-	//	key=ID "=" value=Literal;
+	//	key=ID '=' value=Literal;
 	public BaseGrammarAccess.KeyValueElements getKeyValueAccess() {
 		return gaBase.getKeyValueAccess();
 	}
@@ -1245,8 +1290,10 @@ public class ConfigGrammarAccess 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();
 	}
@@ -1284,7 +1331,7 @@ public class ConfigGrammarAccess 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();
 	}
@@ -1294,7 +1341,7 @@ public class ConfigGrammarAccess 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();
 	}
@@ -1324,7 +1371,7 @@ public class ConfigGrammarAccess 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();
 	}
@@ -1334,7 +1381,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//ImportedFQN:
-	//	FQN ".*"?;
+	//	FQN '.*'?;
 	public BaseGrammarAccess.ImportedFQNElements getImportedFQNAccess() {
 		return gaBase.getImportedFQNAccess();
 	}
@@ -1346,7 +1393,10 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 	//// **************************************************************
 	//// Documentation Rule
 	//Documentation:
-	//	{Documentation} "[" lines+=STRING* "]";
+	//	{Documentation}
+	//	'['
+	//	lines+=STRING*
+	//	']';
 	public BaseGrammarAccess.DocumentationElements getDocumentationAccess() {
 		return gaBase.getDocumentationAccess();
 	}
@@ -1357,8 +1407,8 @@ public class ConfigGrammarAccess 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();
 	}
@@ -1367,10 +1417,11 @@ public class ConfigGrammarAccess 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();
 	}
@@ -1380,7 +1431,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//LiteralArray:
-	//	literals+=Literal ("," literals+=Literal)*;
+	//	literals+=Literal (',' literals+=Literal)*;
 	public BaseGrammarAccess.LiteralArrayElements getLiteralArrayAccess() {
 		return gaBase.getLiteralArrayAccess();
 	}
@@ -1401,7 +1452,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//BooleanLiteral:
-	//	{BooleanLiteral} ("false" | isTrue?="true");
+	//	{BooleanLiteral} ('false' | isTrue?='true');
 	public BaseGrammarAccess.BooleanLiteralElements getBooleanLiteralAccess() {
 		return gaBase.getBooleanLiteralAccess();
 	}
@@ -1450,8 +1501,8 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 		return getStringLiteralAccess().getRule();
 	}
 
-	//Integer returns ecore::ELong:
-	//	("+" | "-")? INT | HEX;
+	//Integer ecore::ELong:
+	//	('+' | '-')? INT | HEX
 	public BaseGrammarAccess.IntegerElements getIntegerAccess() {
 		return gaBase.getIntegerAccess();
 	}
@@ -1460,8 +1511,8 @@ public class ConfigGrammarAccess 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();
 	}
@@ -1471,7 +1522,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//Decimal hidden():
-	//	("+" | "-")? INT "." INT;
+	//	('+' | '-')? INT '.' INT;
 	public BaseGrammarAccess.DecimalElements getDecimalAccess() {
 		return gaBase.getDecimalAccess();
 	}
@@ -1486,7 +1537,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 	////DecimalDot hidden():
 	////	('+' | '-')? INT '.';
 	//DecimalExp hidden():
-	//	("+" | "-")? INT "." INT ("e" | "E") ("+" | "-")? -> INT;
+	//	('+' | '-')? INT '.' INT ('e' | 'E') ('+' | '-')? INT;
 	public BaseGrammarAccess.DecimalExpElements getDecimalExpAccess() {
 		return gaBase.getDecimalExpAccess();
 	}
@@ -1496,7 +1547,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//FQN:
-	//	ID ("." ID)*;
+	//	ID ('.' ID)*;
 	public BaseGrammarAccess.FQNElements getFQNAccess() {
 		return gaBase.getFQNAccess();
 	}
@@ -1506,51 +1557,50 @@ public class ConfigGrammarAccess 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.config/src-gen/org/eclipse/etrice/core/validation/AbstractConfigJavaValidator.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/validation/AbstractConfigJavaValidator.java
index bdc8134ee..df7c17967 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/validation/AbstractConfigJavaValidator.java
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/validation/AbstractConfigJavaValidator.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.validation;
  
 import java.util.ArrayList;
diff --git a/plugins/org.eclipse.etrice.core.etmap.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.etmap.ui/META-INF/MANIFEST.MF
index a147cf5e8..b9dff0e02 100644
--- a/plugins/org.eclipse.etrice.core.etmap.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.etmap.ui/META-INF/MANIFEST.MF
@@ -24,5 +24,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.etrice.core.etmap.ui.contentassist,
  org.eclipse.etrice.core.etmap.ui.contentassist.antlr,
  org.eclipse.etrice.core.etmap.ui.internal,
- org.eclipse.etrice.core.etmap.ui.quickfix
+ org.eclipse.etrice.core.etmap.ui.quickfix,
+ org.eclipse.etrice.core.etmap.ui.contentassist.antlr.internal
 Bundle-Activator: org.eclipse.etrice.core.etmap.ui.internal.ETMapActivator
diff --git a/plugins/org.eclipse.etrice.core.etmap.ui/plugin.xml_gen b/plugins/org.eclipse.etrice.core.etmap.ui/plugin.xml_gen
index 259bfd8c6..5ad9e96aa 100644
--- a/plugins/org.eclipse.etrice.core.etmap.ui/plugin.xml_gen
+++ b/plugins/org.eclipse.etrice.core.etmap.ui/plugin.xml_gen
@@ -279,6 +279,27 @@
 	        <filter name="projectNature" value="org.eclipse.xtext.ui.shared.xtextNature"/>
         </page>
     </extension>
+    <extension point="org.eclipse.ui.menus">
+		<menuContribution locationURI="popup:#TextEditorContext?after=xtext.ui.openDeclaration">
+			<command
+				commandId="org.eclipse.xtext.ui.OpenGeneratedFileCommand"
+				id="org.eclipse.etrice.core.etmap.ETMap.OpenGeneratedCode"
+				style="push">
+					<visibleWhen checkEnabled="false">
+						<reference definitionId="org.eclipse.etrice.core.etmap.ETMap.Editor.opened" />
+					</visibleWhen>
+			</command>
+		</menuContribution>
+	</extension>
+	<extension point="org.eclipse.ui.handlers">
+		<handler
+			class="org.eclipse.etrice.core.etmap.ui.ETMapExecutableExtensionFactory:org.eclipse.xtext.ui.generator.trace.OpenGeneratedFileHandler"
+			commandId="org.eclipse.xtext.ui.OpenGeneratedFileCommand">
+				<activeWhen>
+					<reference definitionId="org.eclipse.etrice.core.etmap.ETMap.Editor.opened" />
+				</activeWhen>
+		</handler>
+	</extension>
 
 	<!-- Quick Outline -->
 	<extension
@@ -394,5 +415,11 @@
             extensions="etmap">
     </provider>
   </extension>
+  <extension point="org.eclipse.team.core.fileTypes">
+    <fileTypes
+            extension="etmap"
+            type="text">
+    </fileTypes>
+  </extension>
 
 </plugin>
diff --git a/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/AbstractETMapUiModule.java b/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/AbstractETMapUiModule.java
index da3734499..daab271c1 100644
--- a/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/AbstractETMapUiModule.java
+++ b/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/AbstractETMapUiModule.java
@@ -4,14 +4,13 @@
  */
 package org.eclipse.etrice.core.etmap.ui;
 
-import org.eclipse.xtext.ui.DefaultUiModule;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 
 /**
  * Manual modifications go to {org.eclipse.etrice.core.etmap.ui.ETMapUiModule}
  */
 @SuppressWarnings("all")
-public abstract class AbstractETMapUiModule extends DefaultUiModule {
+public abstract class AbstractETMapUiModule extends org.eclipse.xtext.ui.DefaultUiModule {
 	
 	public AbstractETMapUiModule(AbstractUIPlugin plugin) {
 		super(plugin);
@@ -59,6 +58,11 @@ public abstract class AbstractETMapUiModule extends DefaultUiModule {
 	}
 
 	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
+	public Class<? extends org.eclipse.xtext.generator.IContextualOutputConfigurationProvider> bindIContextualOutputConfigurationProvider() {
+		return org.eclipse.xtext.builder.EclipseOutputConfigurationProvider.class;
+	}
+
+	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
 	public void configureIResourceDescriptionsPersisted(com.google.inject.Binder binder) {
 		binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.PERSISTED_DESCRIPTIONS)).to(org.eclipse.xtext.builder.builderState.IBuilderState.class);
 	}
diff --git a/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/AbstractETMapProposalProvider.java b/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/AbstractETMapProposalProvider.java
index 6502b58e0..97919d198 100644
--- a/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/AbstractETMapProposalProvider.java
+++ b/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/AbstractETMapProposalProvider.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.etmap.ui.contentassist;
 
 import org.eclipse.emf.ecore.EObject;
diff --git a/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/ETMapParser.java b/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/ETMapParser.java
index 12d36e092..7c02bfeb1 100644
--- a/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/ETMapParser.java
+++ b/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/ETMapParser.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.etmap.ui.contentassist.antlr;
 
 import java.util.Collection;
diff --git a/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/PartialETMapContentAssistParser.java b/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/PartialETMapContentAssistParser.java
index 3c965f155..be657eb75 100644
--- a/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/PartialETMapContentAssistParser.java
+++ b/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/PartialETMapContentAssistParser.java
@@ -12,14 +12,14 @@ import org.eclipse.xtext.ui.editor.contentassist.antlr.FollowElement;
 import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.AbstractInternalContentAssistParser;
 import org.eclipse.xtext.util.PolymorphicDispatcher;
 
-/**
- * @author Sebastian Zarnekow - Initial contribution and API
+/*
+ * Template CodetemplatesGeneratorFragment.xpt
  */
-@SuppressWarnings("restriction")
 public class PartialETMapContentAssistParser extends ETMapParser implements IPartialContentAssistParser {
 
 	private AbstractRule rule;
 
+	@Override
 	public void initializeFor(AbstractRule rule) {
 		this.rule = rule;
 	}
diff --git a/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g b/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g
index 4c82d8c63..4501fd4f2 100644
--- a/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g
+++ b/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 grammar InternalETMap;
 
 options {
diff --git a/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMapLexer.java b/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMapLexer.java
index 1cd64ab6a..19603750b 100644
--- a/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMapLexer.java
+++ b/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMapLexer.java
@@ -63,15 +63,15 @@ public class InternalETMapLexer extends Lexer {
         super(input,state);
 
     }
-    public String getGrammarFileName() { return "../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g"; }
+    public String getGrammarFileName() { return "InternalETMap.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.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:11:7: ( 'mandatory' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:11:9: 'mandatory'
+            // InternalETMap.g:11:7: ( 'mandatory' )
+            // InternalETMap.g:11:9: 'mandatory'
             {
             match("mandatory"); 
 
@@ -91,8 +91,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__13;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:12:7: ( 'model' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:12:9: 'model'
+            // InternalETMap.g:12:7: ( 'model' )
+            // InternalETMap.g:12:9: 'model'
             {
             match("model"); 
 
@@ -112,8 +112,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__14;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:13:7: ( 'false' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:13:9: 'false'
+            // InternalETMap.g:13:7: ( 'false' )
+            // InternalETMap.g:13:9: 'false'
             {
             match("false"); 
 
@@ -133,8 +133,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__15;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:14:7: ( '+' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:14:9: '+'
+            // InternalETMap.g:14:7: ( '+' )
+            // InternalETMap.g:14:9: '+'
             {
             match('+'); 
 
@@ -153,8 +153,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__16;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:15:7: ( '-' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:15:9: '-'
+            // InternalETMap.g:15:7: ( '-' )
+            // InternalETMap.g:15:9: '-'
             {
             match('-'); 
 
@@ -173,8 +173,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__17;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:16:7: ( 'e' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:16:9: 'e'
+            // InternalETMap.g:16:7: ( 'e' )
+            // InternalETMap.g:16:9: 'e'
             {
             match('e'); 
 
@@ -193,8 +193,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__18;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:17:7: ( 'E' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:17:9: 'E'
+            // InternalETMap.g:17:7: ( 'E' )
+            // InternalETMap.g:17:9: 'E'
             {
             match('E'); 
 
@@ -213,8 +213,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__19;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:18:7: ( 'ptBoolean' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:18:9: 'ptBoolean'
+            // InternalETMap.g:18:7: ( 'ptBoolean' )
+            // InternalETMap.g:18:9: 'ptBoolean'
             {
             match("ptBoolean"); 
 
@@ -234,8 +234,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__20;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:19:7: ( 'ptInteger' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:19:9: 'ptInteger'
+            // InternalETMap.g:19:7: ( 'ptInteger' )
+            // InternalETMap.g:19:9: 'ptInteger'
             {
             match("ptInteger"); 
 
@@ -255,8 +255,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__21;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:20:7: ( 'ptReal' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:20:9: 'ptReal'
+            // InternalETMap.g:20:7: ( 'ptReal' )
+            // InternalETMap.g:20:9: 'ptReal'
             {
             match("ptReal"); 
 
@@ -276,8 +276,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__22;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:21:7: ( 'ptCharacter' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:21:9: 'ptCharacter'
+            // InternalETMap.g:21:7: ( 'ptCharacter' )
+            // InternalETMap.g:21:9: 'ptCharacter'
             {
             match("ptCharacter"); 
 
@@ -297,8 +297,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__23;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:22:7: ( 'MappingModel' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:22:9: 'MappingModel'
+            // InternalETMap.g:22:7: ( 'MappingModel' )
+            // InternalETMap.g:22:9: 'MappingModel'
             {
             match("MappingModel"); 
 
@@ -318,8 +318,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__24;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:23:7: ( '{' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:23:9: '{'
+            // InternalETMap.g:23:7: ( '{' )
+            // InternalETMap.g:23:9: '{'
             {
             match('{'); 
 
@@ -338,8 +338,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__25;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:24:7: ( '}' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:24:9: '}'
+            // InternalETMap.g:24:7: ( '}' )
+            // InternalETMap.g:24:9: '}'
             {
             match('}'); 
 
@@ -358,8 +358,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__26;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:25:7: ( 'Mapping' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:25:9: 'Mapping'
+            // InternalETMap.g:25:7: ( 'Mapping' )
+            // InternalETMap.g:25:9: 'Mapping'
             {
             match("Mapping"); 
 
@@ -379,8 +379,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__27;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:26:7: ( '->' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:26:9: '->'
+            // InternalETMap.g:26:7: ( '->' )
+            // InternalETMap.g:26:9: '->'
             {
             match("->"); 
 
@@ -400,8 +400,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__28;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:27:7: ( 'SubSystemMapping' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:27:9: 'SubSystemMapping'
+            // InternalETMap.g:27:7: ( 'SubSystemMapping' )
+            // InternalETMap.g:27:9: 'SubSystemMapping'
             {
             match("SubSystemMapping"); 
 
@@ -421,8 +421,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__29;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:28:7: ( 'ThreadMapping' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:28:9: 'ThreadMapping'
+            // InternalETMap.g:28:7: ( 'ThreadMapping' )
+            // InternalETMap.g:28:9: 'ThreadMapping'
             {
             match("ThreadMapping"); 
 
@@ -442,8 +442,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__30;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:29:7: ( '=' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:29:9: '='
+            // InternalETMap.g:29:7: ( '=' )
+            // InternalETMap.g:29:9: '='
             {
             match('='); 
 
@@ -462,8 +462,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__31;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:30:7: ( 'attribute' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:30:9: 'attribute'
+            // InternalETMap.g:30:7: ( 'attribute' )
+            // InternalETMap.g:30:9: 'attribute'
             {
             match("attribute"); 
 
@@ -483,8 +483,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__32;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:31:7: ( ':' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:31:9: ':'
+            // InternalETMap.g:31:7: ( ':' )
+            // InternalETMap.g:31:9: ':'
             {
             match(':'); 
 
@@ -503,8 +503,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__33;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:32:7: ( ',' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:32:9: ','
+            // InternalETMap.g:32:7: ( ',' )
+            // InternalETMap.g:32:9: ','
             {
             match(','); 
 
@@ -523,8 +523,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__34;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:33:7: ( 'import' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:33:9: 'import'
+            // InternalETMap.g:33:7: ( 'import' )
+            // InternalETMap.g:33:9: 'import'
             {
             match("import"); 
 
@@ -544,8 +544,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__35;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:34:7: ( 'from' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:34:9: 'from'
+            // InternalETMap.g:34:7: ( 'from' )
+            // InternalETMap.g:34:9: 'from'
             {
             match("from"); 
 
@@ -565,8 +565,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__36;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:35:7: ( '.*' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:35:9: '.*'
+            // InternalETMap.g:35:7: ( '.*' )
+            // InternalETMap.g:35:9: '.*'
             {
             match(".*"); 
 
@@ -586,8 +586,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__37;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:36:7: ( '[' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:36:9: '['
+            // InternalETMap.g:36:7: ( '[' )
+            // InternalETMap.g:36:9: '['
             {
             match('['); 
 
@@ -606,8 +606,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__38;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:37:7: ( ']' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:37:9: ']'
+            // InternalETMap.g:37:7: ( ']' )
+            // InternalETMap.g:37:9: ']'
             {
             match(']'); 
 
@@ -626,8 +626,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__39;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:38:7: ( '.' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:38:9: '.'
+            // InternalETMap.g:38:7: ( '.' )
+            // InternalETMap.g:38:9: '.'
             {
             match('.'); 
 
@@ -646,8 +646,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__40;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:39:7: ( 'optional' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:39:9: 'optional'
+            // InternalETMap.g:39:7: ( 'optional' )
+            // InternalETMap.g:39:9: 'optional'
             {
             match("optional"); 
 
@@ -667,8 +667,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__41;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:40:7: ( 'true' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:40:9: 'true'
+            // InternalETMap.g:40:7: ( 'true' )
+            // InternalETMap.g:40:9: 'true'
             {
             match("true"); 
 
@@ -688,10 +688,10 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = RULE_HEX;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4104:10: ( ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+ )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4104:12: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+
+            // InternalETMap.g:4104:10: ( ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+ )
+            // InternalETMap.g:4104:12: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4104:12: ( '0x' | '0X' )
+            // InternalETMap.g:4104:12: ( '0x' | '0X' )
             int alt1=2;
             int LA1_0 = input.LA(1);
 
@@ -719,7 +719,7 @@ public class InternalETMapLexer extends Lexer {
             }
             switch (alt1) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4104:13: '0x'
+                    // InternalETMap.g:4104:13: '0x'
                     {
                     match("0x"); 
 
@@ -727,7 +727,7 @@ public class InternalETMapLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4104:18: '0X'
+                    // InternalETMap.g:4104:18: '0X'
                     {
                     match("0X"); 
 
@@ -737,7 +737,7 @@ public class InternalETMapLexer extends Lexer {
 
             }
 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4104:24: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+
+            // InternalETMap.g:4104:24: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+
             int cnt2=0;
             loop2:
             do {
@@ -751,7 +751,7 @@ public class InternalETMapLexer extends Lexer {
 
                 switch (alt2) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:
+            	    // InternalETMap.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();
@@ -791,10 +791,10 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = RULE_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4106:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4106:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalETMap.g:4106:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+            // InternalETMap.g:4106:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4106:11: ( '^' )?
+            // InternalETMap.g:4106:11: ( '^' )?
             int alt3=2;
             int LA3_0 = input.LA(1);
 
@@ -803,7 +803,7 @@ public class InternalETMapLexer extends Lexer {
             }
             switch (alt3) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4106:11: '^'
+                    // InternalETMap.g:4106:11: '^'
                     {
                     match('^'); 
 
@@ -821,7 +821,7 @@ public class InternalETMapLexer extends Lexer {
                 recover(mse);
                 throw mse;}
 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4106:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalETMap.g:4106:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             loop4:
             do {
                 int alt4=2;
@@ -834,7 +834,7 @@ public class InternalETMapLexer extends Lexer {
 
                 switch (alt4) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:
+            	    // InternalETMap.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();
@@ -870,10 +870,10 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = RULE_INT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4108:10: ( ( '0' .. '9' )+ )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4108:12: ( '0' .. '9' )+
+            // InternalETMap.g:4108:10: ( ( '0' .. '9' )+ )
+            // InternalETMap.g:4108:12: ( '0' .. '9' )+
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4108:12: ( '0' .. '9' )+
+            // InternalETMap.g:4108:12: ( '0' .. '9' )+
             int cnt5=0;
             loop5:
             do {
@@ -887,7 +887,7 @@ public class InternalETMapLexer extends Lexer {
 
                 switch (alt5) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4108:13: '0' .. '9'
+            	    // InternalETMap.g:4108:13: '0' .. '9'
             	    {
             	    matchRange('0','9'); 
 
@@ -919,10 +919,10 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = RULE_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4110:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4110:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalETMap.g:4110:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+            // InternalETMap.g:4110:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4110:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalETMap.g:4110:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             int alt8=2;
             int LA8_0 = input.LA(1);
 
@@ -940,10 +940,10 @@ public class InternalETMapLexer extends Lexer {
             }
             switch (alt8) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4110:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+                    // InternalETMap.g:4110:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
                     {
                     match('\"'); 
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4110:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+                    // InternalETMap.g:4110:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
                     loop6:
                     do {
                         int alt6=3;
@@ -959,7 +959,7 @@ public class InternalETMapLexer extends Lexer {
 
                         switch (alt6) {
                     	case 1 :
-                    	    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4110:21: '\\\\' .
+                    	    // InternalETMap.g:4110:21: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -967,7 +967,7 @@ public class InternalETMapLexer extends Lexer {
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4110:28: ~ ( ( '\\\\' | '\"' ) )
+                    	    // InternalETMap.g:4110:28: ~ ( ( '\\\\' | '\"' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -992,10 +992,10 @@ public class InternalETMapLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4110:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+                    // InternalETMap.g:4110:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
                     {
                     match('\''); 
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4110:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+                    // InternalETMap.g:4110:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
                     loop7:
                     do {
                         int alt7=3;
@@ -1011,7 +1011,7 @@ public class InternalETMapLexer extends Lexer {
 
                         switch (alt7) {
                     	case 1 :
-                    	    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4110:54: '\\\\' .
+                    	    // InternalETMap.g:4110:54: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -1019,7 +1019,7 @@ public class InternalETMapLexer extends Lexer {
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4110:61: ~ ( ( '\\\\' | '\\'' ) )
+                    	    // InternalETMap.g:4110:61: ~ ( ( '\\\\' | '\\'' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -1062,12 +1062,12 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = RULE_ML_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4112:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4112:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // InternalETMap.g:4112:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // InternalETMap.g:4112:19: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); 
 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4112:24: ( options {greedy=false; } : . )*
+            // InternalETMap.g:4112:24: ( options {greedy=false; } : . )*
             loop9:
             do {
                 int alt9=2;
@@ -1092,7 +1092,7 @@ public class InternalETMapLexer extends Lexer {
 
                 switch (alt9) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4112:52: .
+            	    // InternalETMap.g:4112:52: .
             	    {
             	    matchAny(); 
 
@@ -1122,12 +1122,12 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = RULE_SL_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4114:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4114:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // InternalETMap.g:4114:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // InternalETMap.g:4114:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
             {
             match("//"); 
 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4114:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            // InternalETMap.g:4114:24: (~ ( ( '\\n' | '\\r' ) ) )*
             loop10:
             do {
                 int alt10=2;
@@ -1140,7 +1140,7 @@ public class InternalETMapLexer extends Lexer {
 
                 switch (alt10) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4114:24: ~ ( ( '\\n' | '\\r' ) )
+            	    // InternalETMap.g:4114: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();
@@ -1160,7 +1160,7 @@ public class InternalETMapLexer extends Lexer {
                 }
             } while (true);
 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4114:40: ( ( '\\r' )? '\\n' )?
+            // InternalETMap.g:4114:40: ( ( '\\r' )? '\\n' )?
             int alt12=2;
             int LA12_0 = input.LA(1);
 
@@ -1169,9 +1169,9 @@ public class InternalETMapLexer extends Lexer {
             }
             switch (alt12) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4114:41: ( '\\r' )? '\\n'
+                    // InternalETMap.g:4114:41: ( '\\r' )? '\\n'
                     {
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4114:41: ( '\\r' )?
+                    // InternalETMap.g:4114:41: ( '\\r' )?
                     int alt11=2;
                     int LA11_0 = input.LA(1);
 
@@ -1180,7 +1180,7 @@ public class InternalETMapLexer extends Lexer {
                     }
                     switch (alt11) {
                         case 1 :
-                            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4114:41: '\\r'
+                            // InternalETMap.g:4114:41: '\\r'
                             {
                             match('\r'); 
 
@@ -1212,10 +1212,10 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = RULE_WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4116:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4116:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalETMap.g:4116:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // InternalETMap.g:4116:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4116:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalETMap.g:4116:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             int cnt13=0;
             loop13:
             do {
@@ -1229,7 +1229,7 @@ public class InternalETMapLexer extends Lexer {
 
                 switch (alt13) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:
+            	    // InternalETMap.g:
             	    {
             	    if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) {
             	        input.consume();
@@ -1269,8 +1269,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = RULE_ANY_OTHER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4118:16: ( . )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4118:18: .
+            // InternalETMap.g:4118:16: ( . )
+            // InternalETMap.g:4118:18: .
             {
             matchAny(); 
 
@@ -1285,271 +1285,271 @@ public class InternalETMapLexer extends Lexer {
     // $ANTLR end "RULE_ANY_OTHER"
 
     public void mTokens() throws RecognitionException {
-        // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.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 | RULE_HEX | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+        // InternalETMap.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 | RULE_HEX | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
         int alt14=38;
         alt14 = dfa14.predict(input);
         switch (alt14) {
             case 1 :
-                // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1:10: T__12
+                // InternalETMap.g:1:10: T__12
                 {
                 mT__12(); 
 
                 }
                 break;
             case 2 :
-                // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1:16: T__13
+                // InternalETMap.g:1:16: T__13
                 {
                 mT__13(); 
 
                 }
                 break;
             case 3 :
-                // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1:22: T__14
+                // InternalETMap.g:1:22: T__14
                 {
                 mT__14(); 
 
                 }
                 break;
             case 4 :
-                // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1:28: T__15
+                // InternalETMap.g:1:28: T__15
                 {
                 mT__15(); 
 
                 }
                 break;
             case 5 :
-                // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1:34: T__16
+                // InternalETMap.g:1:34: T__16
                 {
                 mT__16(); 
 
                 }
                 break;
             case 6 :
-                // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1:40: T__17
+                // InternalETMap.g:1:40: T__17
                 {
                 mT__17(); 
 
                 }
                 break;
             case 7 :
-                // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1:46: T__18
+                // InternalETMap.g:1:46: T__18
                 {
                 mT__18(); 
 
                 }
                 break;
             case 8 :
-                // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1:52: T__19
+                // InternalETMap.g:1:52: T__19
                 {
                 mT__19(); 
 
                 }
                 break;
             case 9 :
-                // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1:58: T__20
+                // InternalETMap.g:1:58: T__20
                 {
                 mT__20(); 
 
                 }
                 break;
             case 10 :
-                // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1:64: T__21
+                // InternalETMap.g:1:64: T__21
                 {
                 mT__21(); 
 
                 }
                 break;
             case 11 :
-                // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1:70: T__22
+                // InternalETMap.g:1:70: T__22
                 {
                 mT__22(); 
 
                 }
                 break;
             case 12 :
-                // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1:76: T__23
+                // InternalETMap.g:1:76: T__23
                 {
                 mT__23(); 
 
                 }
                 break;
             case 13 :
-                // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1:82: T__24
+                // InternalETMap.g:1:82: T__24
                 {
                 mT__24(); 
 
                 }
                 break;
             case 14 :
-                // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1:88: T__25
+                // InternalETMap.g:1:88: T__25
                 {
                 mT__25(); 
 
                 }
                 break;
             case 15 :
-                // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1:94: T__26
+                // InternalETMap.g:1:94: T__26
                 {
                 mT__26(); 
 
                 }
                 break;
             case 16 :
-                // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1:100: T__27
+                // InternalETMap.g:1:100: T__27
                 {
                 mT__27(); 
 
                 }
                 break;
             case 17 :
-                // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1:106: T__28
+                // InternalETMap.g:1:106: T__28
                 {
                 mT__28(); 
 
                 }
                 break;
             case 18 :
-                // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1:112: T__29
+                // InternalETMap.g:1:112: T__29
                 {
                 mT__29(); 
 
                 }
                 break;
             case 19 :
-                // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1:118: T__30
+                // InternalETMap.g:1:118: T__30
                 {
                 mT__30(); 
 
                 }
                 break;
             case 20 :
-                // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1:124: T__31
+                // InternalETMap.g:1:124: T__31
                 {
                 mT__31(); 
 
                 }
                 break;
             case 21 :
-                // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1:130: T__32
+                // InternalETMap.g:1:130: T__32
                 {
                 mT__32(); 
 
                 }
                 break;
             case 22 :
-                // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1:136: T__33
+                // InternalETMap.g:1:136: T__33
                 {
                 mT__33(); 
 
                 }
                 break;
             case 23 :
-                // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1:142: T__34
+                // InternalETMap.g:1:142: T__34
                 {
                 mT__34(); 
 
                 }
                 break;
             case 24 :
-                // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1:148: T__35
+                // InternalETMap.g:1:148: T__35
                 {
                 mT__35(); 
 
                 }
                 break;
             case 25 :
-                // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1:154: T__36
+                // InternalETMap.g:1:154: T__36
                 {
                 mT__36(); 
 
                 }
                 break;
             case 26 :
-                // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1:160: T__37
+                // InternalETMap.g:1:160: T__37
                 {
                 mT__37(); 
 
                 }
                 break;
             case 27 :
-                // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1:166: T__38
+                // InternalETMap.g:1:166: T__38
                 {
                 mT__38(); 
 
                 }
                 break;
             case 28 :
-                // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1:172: T__39
+                // InternalETMap.g:1:172: T__39
                 {
                 mT__39(); 
 
                 }
                 break;
             case 29 :
-                // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1:178: T__40
+                // InternalETMap.g:1:178: T__40
                 {
                 mT__40(); 
 
                 }
                 break;
             case 30 :
-                // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1:184: T__41
+                // InternalETMap.g:1:184: T__41
                 {
                 mT__41(); 
 
                 }
                 break;
             case 31 :
-                // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1:190: RULE_HEX
+                // InternalETMap.g:1:190: RULE_HEX
                 {
                 mRULE_HEX(); 
 
                 }
                 break;
             case 32 :
-                // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1:199: RULE_ID
+                // InternalETMap.g:1:199: RULE_ID
                 {
                 mRULE_ID(); 
 
                 }
                 break;
             case 33 :
-                // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1:207: RULE_INT
+                // InternalETMap.g:1:207: RULE_INT
                 {
                 mRULE_INT(); 
 
                 }
                 break;
             case 34 :
-                // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1:216: RULE_STRING
+                // InternalETMap.g:1:216: RULE_STRING
                 {
                 mRULE_STRING(); 
 
                 }
                 break;
             case 35 :
-                // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1:228: RULE_ML_COMMENT
+                // InternalETMap.g:1:228: RULE_ML_COMMENT
                 {
                 mRULE_ML_COMMENT(); 
 
                 }
                 break;
             case 36 :
-                // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1:244: RULE_SL_COMMENT
+                // InternalETMap.g:1:244: RULE_SL_COMMENT
                 {
                 mRULE_SL_COMMENT(); 
 
                 }
                 break;
             case 37 :
-                // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1:260: RULE_WS
+                // InternalETMap.g:1:260: RULE_WS
                 {
                 mRULE_WS(); 
 
                 }
                 break;
             case 38 :
-                // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1:268: RULE_ANY_OTHER
+                // InternalETMap.g:1:268: RULE_ANY_OTHER
                 {
                 mRULE_ANY_OTHER(); 
 
@@ -1563,65 +1563,19 @@ public class InternalETMapLexer extends Lexer {
 
     protected DFA14 dfa14 = new DFA14(this);
     static final String DFA14_eotS =
-        "\1\uffff\2\42\1\uffff\1\47\1\50\1\51\2\42\2\uffff\2\42\1\uffff"+
-        "\1\42\2\uffff\1\42\1\66\2\uffff\2\42\1\74\1\37\2\uffff\3\37\2\uffff"+
-        "\2\42\1\uffff\2\42\5\uffff\2\42\2\uffff\2\42\1\uffff\1\42\2\uffff"+
-        "\1\42\4\uffff\2\42\6\uffff\22\42\1\142\12\42\1\155\1\42\1\157\1"+
-        "\160\1\uffff\12\42\1\uffff\1\42\2\uffff\2\42\1\176\5\42\1\u0084"+
-        "\4\42\1\uffff\1\42\1\u008b\3\42\1\uffff\6\42\1\uffff\3\42\1\u0098"+
-        "\1\u0099\1\u009a\1\u009b\4\42\1\u00a0\4\uffff\4\42\1\uffff\1\u00a5"+
-        "\3\42\1\uffff\1\u00a9\2\42\1\uffff\1\42\1\u00ad\1\42\1\uffff\1\42"+
-        "\1\u00b0\1\uffff";
+        "\1\uffff\2\42\1\uffff\1\47\1\50\1\51\2\42\2\uffff\2\42\1\uffff\1\42\2\uffff\1\42\1\66\2\uffff\2\42\1\74\1\37\2\uffff\3\37\2\uffff\2\42\1\uffff\2\42\5\uffff\2\42\2\uffff\2\42\1\uffff\1\42\2\uffff\1\42\4\uffff\2\42\6\uffff\22\42\1\142\12\42\1\155\1\42\1\157\1\160\1\uffff\12\42\1\uffff\1\42\2\uffff\2\42\1\176\5\42\1\u0084\4\42\1\uffff\1\42\1\u008b\3\42\1\uffff\6\42\1\uffff\3\42\1\u0098\1\u0099\1\u009a\1\u009b\4\42\1\u00a0\4\uffff\4\42\1\uffff\1\u00a5\3\42\1\uffff\1\u00a9\2\42\1\uffff\1\42\1\u00ad\1\42\1\uffff\1\42\1\u00b0\1\uffff";
     static final String DFA14_eofS =
         "\u00b1\uffff";
     static final String DFA14_minS =
-        "\1\0\2\141\1\uffff\1\76\2\60\1\164\1\141\2\uffff\1\165\1\150\1"+
-        "\uffff\1\164\2\uffff\1\155\1\52\2\uffff\1\160\1\162\1\130\1\101"+
-        "\2\uffff\2\0\1\52\2\uffff\1\156\1\144\1\uffff\1\154\1\157\5\uffff"+
-        "\1\102\1\160\2\uffff\1\142\1\162\1\uffff\1\164\2\uffff\1\160\4\uffff"+
-        "\1\164\1\165\6\uffff\1\144\1\145\1\163\1\155\1\157\1\156\1\145\1"+
-        "\150\1\160\1\123\1\145\1\162\1\157\1\151\1\145\1\141\1\154\1\145"+
-        "\1\60\1\157\1\164\2\141\1\151\1\171\1\141\1\151\1\162\1\157\1\60"+
-        "\1\164\2\60\1\uffff\1\154\1\145\1\154\1\162\1\156\1\163\1\144\1"+
-        "\142\1\164\1\156\1\uffff\1\157\2\uffff\1\145\1\147\1\60\1\141\1"+
-        "\147\1\164\1\115\1\165\1\60\1\141\1\162\1\141\1\145\1\uffff\1\143"+
-        "\1\60\1\145\1\141\1\164\1\uffff\1\154\1\171\1\156\1\162\1\164\1"+
-        "\157\1\uffff\1\155\1\160\1\145\4\60\1\145\1\144\1\115\1\160\1\60"+
-        "\4\uffff\1\162\1\145\1\141\1\151\1\uffff\1\60\1\154\1\160\1\156"+
-        "\1\uffff\1\60\1\160\1\147\1\uffff\1\151\1\60\1\156\1\uffff\1\147"+
-        "\1\60\1\uffff";
+        "\1\0\2\141\1\uffff\1\76\2\60\1\164\1\141\2\uffff\1\165\1\150\1\uffff\1\164\2\uffff\1\155\1\52\2\uffff\1\160\1\162\1\130\1\101\2\uffff\2\0\1\52\2\uffff\1\156\1\144\1\uffff\1\154\1\157\5\uffff\1\102\1\160\2\uffff\1\142\1\162\1\uffff\1\164\2\uffff\1\160\4\uffff\1\164\1\165\6\uffff\1\144\1\145\1\163\1\155\1\157\1\156\1\145\1\150\1\160\1\123\1\145\1\162\1\157\1\151\1\145\1\141\1\154\1\145\1\60\1\157\1\164\2\141\1\151\1\171\1\141\1\151\1\162\1\157\1\60\1\164\2\60\1\uffff\1\154\1\145\1\154\1\162\1\156\1\163\1\144\1\142\1\164\1\156\1\uffff\1\157\2\uffff\1\145\1\147\1\60\1\141\1\147\1\164\1\115\1\165\1\60\1\141\1\162\1\141\1\145\1\uffff\1\143\1\60\1\145\1\141\1\164\1\uffff\1\154\1\171\1\156\1\162\1\164\1\157\1\uffff\1\155\1\160\1\145\4\60\1\145\1\144\1\115\1\160\1\60\4\uffff\1\162\1\145\1\141\1\151\1\uffff\1\60\1\154\1\160\1\156\1\uffff\1\60\1\160\1\147\1\uffff\1\151\1\60\1\156\1\uffff\1\147\1\60\1\uffff";
     static final String DFA14_maxS =
-        "\1\uffff\1\157\1\162\1\uffff\1\76\2\172\1\164\1\141\2\uffff\1\165"+
-        "\1\150\1\uffff\1\164\2\uffff\1\155\1\52\2\uffff\1\160\1\162\1\170"+
-        "\1\172\2\uffff\2\uffff\1\57\2\uffff\1\156\1\144\1\uffff\1\154\1"+
-        "\157\5\uffff\1\122\1\160\2\uffff\1\142\1\162\1\uffff\1\164\2\uffff"+
-        "\1\160\4\uffff\1\164\1\165\6\uffff\1\144\1\145\1\163\1\155\1\157"+
-        "\1\156\1\145\1\150\1\160\1\123\1\145\1\162\1\157\1\151\1\145\1\141"+
-        "\1\154\1\145\1\172\1\157\1\164\2\141\1\151\1\171\1\141\1\151\1\162"+
-        "\1\157\1\172\1\164\2\172\1\uffff\1\154\1\145\1\154\1\162\1\156\1"+
-        "\163\1\144\1\142\1\164\1\156\1\uffff\1\157\2\uffff\1\145\1\147\1"+
-        "\172\1\141\1\147\1\164\1\115\1\165\1\172\1\141\1\162\1\141\1\145"+
-        "\1\uffff\1\143\1\172\1\145\1\141\1\164\1\uffff\1\154\1\171\1\156"+
-        "\1\162\1\164\1\157\1\uffff\1\155\1\160\1\145\4\172\1\145\1\144\1"+
-        "\115\1\160\1\172\4\uffff\1\162\1\145\1\141\1\151\1\uffff\1\172\1"+
-        "\154\1\160\1\156\1\uffff\1\172\1\160\1\147\1\uffff\1\151\1\172\1"+
-        "\156\1\uffff\1\147\1\172\1\uffff";
+        "\1\uffff\1\157\1\162\1\uffff\1\76\2\172\1\164\1\141\2\uffff\1\165\1\150\1\uffff\1\164\2\uffff\1\155\1\52\2\uffff\1\160\1\162\1\170\1\172\2\uffff\2\uffff\1\57\2\uffff\1\156\1\144\1\uffff\1\154\1\157\5\uffff\1\122\1\160\2\uffff\1\142\1\162\1\uffff\1\164\2\uffff\1\160\4\uffff\1\164\1\165\6\uffff\1\144\1\145\1\163\1\155\1\157\1\156\1\145\1\150\1\160\1\123\1\145\1\162\1\157\1\151\1\145\1\141\1\154\1\145\1\172\1\157\1\164\2\141\1\151\1\171\1\141\1\151\1\162\1\157\1\172\1\164\2\172\1\uffff\1\154\1\145\1\154\1\162\1\156\1\163\1\144\1\142\1\164\1\156\1\uffff\1\157\2\uffff\1\145\1\147\1\172\1\141\1\147\1\164\1\115\1\165\1\172\1\141\1\162\1\141\1\145\1\uffff\1\143\1\172\1\145\1\141\1\164\1\uffff\1\154\1\171\1\156\1\162\1\164\1\157\1\uffff\1\155\1\160\1\145\4\172\1\145\1\144\1\115\1\160\1\172\4\uffff\1\162\1\145\1\141\1\151\1\uffff\1\172\1\154\1\160\1\156\1\uffff\1\172\1\160\1\147\1\uffff\1\151\1\172\1\156\1\uffff\1\147\1\172\1\uffff";
     static final String DFA14_acceptS =
-        "\3\uffff\1\4\5\uffff\1\15\1\16\2\uffff\1\23\1\uffff\1\25\1\26\2"+
-        "\uffff\1\32\1\33\4\uffff\1\40\1\41\3\uffff\1\45\1\46\2\uffff\1\40"+
-        "\2\uffff\1\4\1\20\1\5\1\6\1\7\2\uffff\1\15\1\16\2\uffff\1\23\1\uffff"+
-        "\1\25\1\26\1\uffff\1\31\1\34\1\32\1\33\2\uffff\1\37\1\41\1\42\1"+
-        "\43\1\44\1\45\41\uffff\1\30\12\uffff\1\36\1\uffff\1\2\1\3\15\uffff"+
-        "\1\12\5\uffff\1\27\6\uffff\1\17\14\uffff\1\35\1\1\1\10\1\11\4\uffff"+
-        "\1\24\4\uffff\1\13\3\uffff\1\14\3\uffff\1\22\2\uffff\1\21";
+        "\3\uffff\1\4\5\uffff\1\15\1\16\2\uffff\1\23\1\uffff\1\25\1\26\2\uffff\1\32\1\33\4\uffff\1\40\1\41\3\uffff\1\45\1\46\2\uffff\1\40\2\uffff\1\4\1\20\1\5\1\6\1\7\2\uffff\1\15\1\16\2\uffff\1\23\1\uffff\1\25\1\26\1\uffff\1\31\1\34\1\32\1\33\2\uffff\1\37\1\41\1\42\1\43\1\44\1\45\41\uffff\1\30\12\uffff\1\36\1\uffff\1\2\1\3\15\uffff\1\12\5\uffff\1\27\6\uffff\1\17\14\uffff\1\35\1\1\1\10\1\11\4\uffff\1\24\4\uffff\1\13\3\uffff\1\14\3\uffff\1\22\2\uffff\1\21";
     static final String DFA14_specialS =
         "\1\1\32\uffff\1\0\1\2\u0094\uffff}>";
     static final String[] DFA14_transitionS = {
-            "\11\37\2\36\2\37\1\36\22\37\1\36\1\37\1\33\4\37\1\34\3\37\1"+
-            "\3\1\20\1\4\1\22\1\35\1\27\11\32\1\17\2\37\1\15\3\37\4\31\1"+
-            "\6\7\31\1\10\5\31\1\13\1\14\6\31\1\23\1\37\1\24\1\30\1\31\1"+
-            "\37\1\16\3\31\1\5\1\2\2\31\1\21\3\31\1\1\1\31\1\25\1\7\3\31"+
-            "\1\26\6\31\1\11\1\37\1\12\uff82\37",
+            "\11\37\2\36\2\37\1\36\22\37\1\36\1\37\1\33\4\37\1\34\3\37\1\3\1\20\1\4\1\22\1\35\1\27\11\32\1\17\2\37\1\15\3\37\4\31\1\6\7\31\1\10\5\31\1\13\1\14\6\31\1\23\1\37\1\24\1\30\1\31\1\37\1\16\3\31\1\5\1\2\2\31\1\21\3\31\1\1\1\31\1\25\1\7\3\31\1\26\6\31\1\11\1\37\1\12\uff82\37",
             "\1\40\15\uffff\1\41",
             "\1\43\20\uffff\1\44",
             "",
@@ -1749,8 +1703,7 @@ public class InternalETMapLexer extends Lexer {
             "\1\u0088",
             "",
             "\1\u0089",
-            "\12\42\7\uffff\14\42\1\u008a\15\42\4\uffff\1\42\1\uffff\32"+
-            "\42",
+            "\12\42\7\uffff\14\42\1\u008a\15\42\4\uffff\1\42\1\uffff\32\42",
             "\1\u008c",
             "\1\u008d",
             "\1\u008e",
diff --git a/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMapParser.java b/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMapParser.java
index 2e7527861..d934c4cab 100644
--- a/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMapParser.java
+++ b/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMapParser.java
@@ -78,7 +78,7 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
         
 
     public String[] getTokenNames() { return InternalETMapParser.tokenNames; }
-    public String getGrammarFileName() { return "../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g"; }
+    public String getGrammarFileName() { return "InternalETMap.g"; }
 
 
      
@@ -102,20 +102,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleMappingModel"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:60:1: entryRuleMappingModel : ruleMappingModel EOF ;
+    // InternalETMap.g:60:1: entryRuleMappingModel : ruleMappingModel EOF ;
     public final void entryRuleMappingModel() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:61:1: ( ruleMappingModel EOF )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:62:1: ruleMappingModel EOF
+            // InternalETMap.g:61:1: ( ruleMappingModel EOF )
+            // InternalETMap.g:62:1: ruleMappingModel EOF
             {
              before(grammarAccess.getMappingModelRule()); 
-            pushFollow(FOLLOW_ruleMappingModel_in_entryRuleMappingModel61);
+            pushFollow(FOLLOW_1);
             ruleMappingModel();
 
             state._fsp--;
 
              after(grammarAccess.getMappingModelRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleMappingModel68); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -132,23 +132,23 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleMappingModel"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:69:1: ruleMappingModel : ( ( rule__MappingModel__Group__0 ) ) ;
+    // InternalETMap.g:69:1: ruleMappingModel : ( ( rule__MappingModel__Group__0 ) ) ;
     public final void ruleMappingModel() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:73:2: ( ( ( rule__MappingModel__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:74:1: ( ( rule__MappingModel__Group__0 ) )
+            // InternalETMap.g:73:2: ( ( ( rule__MappingModel__Group__0 ) ) )
+            // InternalETMap.g:74:1: ( ( rule__MappingModel__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:74:1: ( ( rule__MappingModel__Group__0 ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:75:1: ( rule__MappingModel__Group__0 )
+            // InternalETMap.g:74:1: ( ( rule__MappingModel__Group__0 ) )
+            // InternalETMap.g:75:1: ( rule__MappingModel__Group__0 )
             {
              before(grammarAccess.getMappingModelAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:76:1: ( rule__MappingModel__Group__0 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:76:2: rule__MappingModel__Group__0
+            // InternalETMap.g:76:1: ( rule__MappingModel__Group__0 )
+            // InternalETMap.g:76:2: rule__MappingModel__Group__0
             {
-            pushFollow(FOLLOW_rule__MappingModel__Group__0_in_ruleMappingModel94);
+            pushFollow(FOLLOW_2);
             rule__MappingModel__Group__0();
 
             state._fsp--;
@@ -179,20 +179,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleMapping"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:88:1: entryRuleMapping : ruleMapping EOF ;
+    // InternalETMap.g:88:1: entryRuleMapping : ruleMapping EOF ;
     public final void entryRuleMapping() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:89:1: ( ruleMapping EOF )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:90:1: ruleMapping EOF
+            // InternalETMap.g:89:1: ( ruleMapping EOF )
+            // InternalETMap.g:90:1: ruleMapping EOF
             {
              before(grammarAccess.getMappingRule()); 
-            pushFollow(FOLLOW_ruleMapping_in_entryRuleMapping121);
+            pushFollow(FOLLOW_1);
             ruleMapping();
 
             state._fsp--;
 
              after(grammarAccess.getMappingRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleMapping128); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -209,23 +209,23 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleMapping"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:97:1: ruleMapping : ( ( rule__Mapping__Group__0 ) ) ;
+    // InternalETMap.g:97:1: ruleMapping : ( ( rule__Mapping__Group__0 ) ) ;
     public final void ruleMapping() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:101:2: ( ( ( rule__Mapping__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:102:1: ( ( rule__Mapping__Group__0 ) )
+            // InternalETMap.g:101:2: ( ( ( rule__Mapping__Group__0 ) ) )
+            // InternalETMap.g:102:1: ( ( rule__Mapping__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:102:1: ( ( rule__Mapping__Group__0 ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:103:1: ( rule__Mapping__Group__0 )
+            // InternalETMap.g:102:1: ( ( rule__Mapping__Group__0 ) )
+            // InternalETMap.g:103:1: ( rule__Mapping__Group__0 )
             {
              before(grammarAccess.getMappingAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:104:1: ( rule__Mapping__Group__0 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:104:2: rule__Mapping__Group__0
+            // InternalETMap.g:104:1: ( rule__Mapping__Group__0 )
+            // InternalETMap.g:104:2: rule__Mapping__Group__0
             {
-            pushFollow(FOLLOW_rule__Mapping__Group__0_in_ruleMapping154);
+            pushFollow(FOLLOW_2);
             rule__Mapping__Group__0();
 
             state._fsp--;
@@ -256,20 +256,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleSubSystemMapping"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:116:1: entryRuleSubSystemMapping : ruleSubSystemMapping EOF ;
+    // InternalETMap.g:116:1: entryRuleSubSystemMapping : ruleSubSystemMapping EOF ;
     public final void entryRuleSubSystemMapping() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:117:1: ( ruleSubSystemMapping EOF )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:118:1: ruleSubSystemMapping EOF
+            // InternalETMap.g:117:1: ( ruleSubSystemMapping EOF )
+            // InternalETMap.g:118:1: ruleSubSystemMapping EOF
             {
              before(grammarAccess.getSubSystemMappingRule()); 
-            pushFollow(FOLLOW_ruleSubSystemMapping_in_entryRuleSubSystemMapping181);
+            pushFollow(FOLLOW_1);
             ruleSubSystemMapping();
 
             state._fsp--;
 
              after(grammarAccess.getSubSystemMappingRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSubSystemMapping188); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -286,23 +286,23 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleSubSystemMapping"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:125:1: ruleSubSystemMapping : ( ( rule__SubSystemMapping__Group__0 ) ) ;
+    // InternalETMap.g:125:1: ruleSubSystemMapping : ( ( rule__SubSystemMapping__Group__0 ) ) ;
     public final void ruleSubSystemMapping() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:129:2: ( ( ( rule__SubSystemMapping__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:130:1: ( ( rule__SubSystemMapping__Group__0 ) )
+            // InternalETMap.g:129:2: ( ( ( rule__SubSystemMapping__Group__0 ) ) )
+            // InternalETMap.g:130:1: ( ( rule__SubSystemMapping__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:130:1: ( ( rule__SubSystemMapping__Group__0 ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:131:1: ( rule__SubSystemMapping__Group__0 )
+            // InternalETMap.g:130:1: ( ( rule__SubSystemMapping__Group__0 ) )
+            // InternalETMap.g:131:1: ( rule__SubSystemMapping__Group__0 )
             {
              before(grammarAccess.getSubSystemMappingAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:132:1: ( rule__SubSystemMapping__Group__0 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:132:2: rule__SubSystemMapping__Group__0
+            // InternalETMap.g:132:1: ( rule__SubSystemMapping__Group__0 )
+            // InternalETMap.g:132:2: rule__SubSystemMapping__Group__0
             {
-            pushFollow(FOLLOW_rule__SubSystemMapping__Group__0_in_ruleSubSystemMapping214);
+            pushFollow(FOLLOW_2);
             rule__SubSystemMapping__Group__0();
 
             state._fsp--;
@@ -333,20 +333,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleThreadMapping"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:144:1: entryRuleThreadMapping : ruleThreadMapping EOF ;
+    // InternalETMap.g:144:1: entryRuleThreadMapping : ruleThreadMapping EOF ;
     public final void entryRuleThreadMapping() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:145:1: ( ruleThreadMapping EOF )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:146:1: ruleThreadMapping EOF
+            // InternalETMap.g:145:1: ( ruleThreadMapping EOF )
+            // InternalETMap.g:146:1: ruleThreadMapping EOF
             {
              before(grammarAccess.getThreadMappingRule()); 
-            pushFollow(FOLLOW_ruleThreadMapping_in_entryRuleThreadMapping241);
+            pushFollow(FOLLOW_1);
             ruleThreadMapping();
 
             state._fsp--;
 
              after(grammarAccess.getThreadMappingRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleThreadMapping248); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -363,23 +363,23 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleThreadMapping"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:153:1: ruleThreadMapping : ( ( rule__ThreadMapping__Group__0 ) ) ;
+    // InternalETMap.g:153:1: ruleThreadMapping : ( ( rule__ThreadMapping__Group__0 ) ) ;
     public final void ruleThreadMapping() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:157:2: ( ( ( rule__ThreadMapping__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:158:1: ( ( rule__ThreadMapping__Group__0 ) )
+            // InternalETMap.g:157:2: ( ( ( rule__ThreadMapping__Group__0 ) ) )
+            // InternalETMap.g:158:1: ( ( rule__ThreadMapping__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:158:1: ( ( rule__ThreadMapping__Group__0 ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:159:1: ( rule__ThreadMapping__Group__0 )
+            // InternalETMap.g:158:1: ( ( rule__ThreadMapping__Group__0 ) )
+            // InternalETMap.g:159:1: ( rule__ThreadMapping__Group__0 )
             {
              before(grammarAccess.getThreadMappingAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:160:1: ( rule__ThreadMapping__Group__0 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:160:2: rule__ThreadMapping__Group__0
+            // InternalETMap.g:160:1: ( rule__ThreadMapping__Group__0 )
+            // InternalETMap.g:160:2: rule__ThreadMapping__Group__0
             {
-            pushFollow(FOLLOW_rule__ThreadMapping__Group__0_in_ruleThreadMapping274);
+            pushFollow(FOLLOW_2);
             rule__ThreadMapping__Group__0();
 
             state._fsp--;
@@ -410,20 +410,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleKeyValue"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:174:1: entryRuleKeyValue : ruleKeyValue EOF ;
+    // InternalETMap.g:174:1: entryRuleKeyValue : ruleKeyValue EOF ;
     public final void entryRuleKeyValue() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:175:1: ( ruleKeyValue EOF )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:176:1: ruleKeyValue EOF
+            // InternalETMap.g:175:1: ( ruleKeyValue EOF )
+            // InternalETMap.g:176:1: ruleKeyValue EOF
             {
              before(grammarAccess.getKeyValueRule()); 
-            pushFollow(FOLLOW_ruleKeyValue_in_entryRuleKeyValue303);
+            pushFollow(FOLLOW_1);
             ruleKeyValue();
 
             state._fsp--;
 
              after(grammarAccess.getKeyValueRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleKeyValue310); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -440,23 +440,23 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleKeyValue"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:183:1: ruleKeyValue : ( ( rule__KeyValue__Group__0 ) ) ;
+    // InternalETMap.g:183:1: ruleKeyValue : ( ( rule__KeyValue__Group__0 ) ) ;
     public final void ruleKeyValue() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:187:2: ( ( ( rule__KeyValue__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:188:1: ( ( rule__KeyValue__Group__0 ) )
+            // InternalETMap.g:187:2: ( ( ( rule__KeyValue__Group__0 ) ) )
+            // InternalETMap.g:188:1: ( ( rule__KeyValue__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:188:1: ( ( rule__KeyValue__Group__0 ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:189:1: ( rule__KeyValue__Group__0 )
+            // InternalETMap.g:188:1: ( ( rule__KeyValue__Group__0 ) )
+            // InternalETMap.g:189:1: ( rule__KeyValue__Group__0 )
             {
              before(grammarAccess.getKeyValueAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:190:1: ( rule__KeyValue__Group__0 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:190:2: rule__KeyValue__Group__0
+            // InternalETMap.g:190:1: ( rule__KeyValue__Group__0 )
+            // InternalETMap.g:190:2: rule__KeyValue__Group__0
             {
-            pushFollow(FOLLOW_rule__KeyValue__Group__0_in_ruleKeyValue336);
+            pushFollow(FOLLOW_2);
             rule__KeyValue__Group__0();
 
             state._fsp--;
@@ -487,20 +487,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleAnnotationTargetType"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:204:1: entryRuleAnnotationTargetType : ruleAnnotationTargetType EOF ;
+    // InternalETMap.g:204:1: entryRuleAnnotationTargetType : ruleAnnotationTargetType EOF ;
     public final void entryRuleAnnotationTargetType() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:205:1: ( ruleAnnotationTargetType EOF )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:206:1: ruleAnnotationTargetType EOF
+            // InternalETMap.g:205:1: ( ruleAnnotationTargetType EOF )
+            // InternalETMap.g:206:1: ruleAnnotationTargetType EOF
             {
              before(grammarAccess.getAnnotationTargetTypeRule()); 
-            pushFollow(FOLLOW_ruleAnnotationTargetType_in_entryRuleAnnotationTargetType365);
+            pushFollow(FOLLOW_1);
             ruleAnnotationTargetType();
 
             state._fsp--;
 
              after(grammarAccess.getAnnotationTargetTypeRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAnnotationTargetType372); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -517,20 +517,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleAnnotationTargetType"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:213:1: ruleAnnotationTargetType : ( RULE_ID ) ;
+    // InternalETMap.g:213:1: ruleAnnotationTargetType : ( RULE_ID ) ;
     public final void ruleAnnotationTargetType() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:217:2: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:218:1: ( RULE_ID )
+            // InternalETMap.g:217:2: ( ( RULE_ID ) )
+            // InternalETMap.g:218:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:218:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:219:1: RULE_ID
+            // InternalETMap.g:218:1: ( RULE_ID )
+            // InternalETMap.g:219:1: RULE_ID
             {
              before(grammarAccess.getAnnotationTargetTypeAccess().getIDTerminalRuleCall()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleAnnotationTargetType398); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getAnnotationTargetTypeAccess().getIDTerminalRuleCall()); 
 
             }
@@ -554,20 +554,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleAnnotationAttribute"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:232:1: entryRuleAnnotationAttribute : ruleAnnotationAttribute EOF ;
+    // InternalETMap.g:232:1: entryRuleAnnotationAttribute : ruleAnnotationAttribute EOF ;
     public final void entryRuleAnnotationAttribute() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:233:1: ( ruleAnnotationAttribute EOF )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:234:1: ruleAnnotationAttribute EOF
+            // InternalETMap.g:233:1: ( ruleAnnotationAttribute EOF )
+            // InternalETMap.g:234:1: ruleAnnotationAttribute EOF
             {
              before(grammarAccess.getAnnotationAttributeRule()); 
-            pushFollow(FOLLOW_ruleAnnotationAttribute_in_entryRuleAnnotationAttribute424);
+            pushFollow(FOLLOW_1);
             ruleAnnotationAttribute();
 
             state._fsp--;
 
              after(grammarAccess.getAnnotationAttributeRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAnnotationAttribute431); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -584,23 +584,23 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleAnnotationAttribute"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:241:1: ruleAnnotationAttribute : ( ( rule__AnnotationAttribute__Alternatives ) ) ;
+    // InternalETMap.g:241:1: ruleAnnotationAttribute : ( ( rule__AnnotationAttribute__Alternatives ) ) ;
     public final void ruleAnnotationAttribute() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:245:2: ( ( ( rule__AnnotationAttribute__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:246:1: ( ( rule__AnnotationAttribute__Alternatives ) )
+            // InternalETMap.g:245:2: ( ( ( rule__AnnotationAttribute__Alternatives ) ) )
+            // InternalETMap.g:246:1: ( ( rule__AnnotationAttribute__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:246:1: ( ( rule__AnnotationAttribute__Alternatives ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:247:1: ( rule__AnnotationAttribute__Alternatives )
+            // InternalETMap.g:246:1: ( ( rule__AnnotationAttribute__Alternatives ) )
+            // InternalETMap.g:247:1: ( rule__AnnotationAttribute__Alternatives )
             {
              before(grammarAccess.getAnnotationAttributeAccess().getAlternatives()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:248:1: ( rule__AnnotationAttribute__Alternatives )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:248:2: rule__AnnotationAttribute__Alternatives
+            // InternalETMap.g:248:1: ( rule__AnnotationAttribute__Alternatives )
+            // InternalETMap.g:248:2: rule__AnnotationAttribute__Alternatives
             {
-            pushFollow(FOLLOW_rule__AnnotationAttribute__Alternatives_in_ruleAnnotationAttribute457);
+            pushFollow(FOLLOW_2);
             rule__AnnotationAttribute__Alternatives();
 
             state._fsp--;
@@ -631,20 +631,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleSimpleAnnotationAttribute"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:260:1: entryRuleSimpleAnnotationAttribute : ruleSimpleAnnotationAttribute EOF ;
+    // InternalETMap.g:260:1: entryRuleSimpleAnnotationAttribute : ruleSimpleAnnotationAttribute EOF ;
     public final void entryRuleSimpleAnnotationAttribute() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:261:1: ( ruleSimpleAnnotationAttribute EOF )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:262:1: ruleSimpleAnnotationAttribute EOF
+            // InternalETMap.g:261:1: ( ruleSimpleAnnotationAttribute EOF )
+            // InternalETMap.g:262:1: ruleSimpleAnnotationAttribute EOF
             {
              before(grammarAccess.getSimpleAnnotationAttributeRule()); 
-            pushFollow(FOLLOW_ruleSimpleAnnotationAttribute_in_entryRuleSimpleAnnotationAttribute484);
+            pushFollow(FOLLOW_1);
             ruleSimpleAnnotationAttribute();
 
             state._fsp--;
 
              after(grammarAccess.getSimpleAnnotationAttributeRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSimpleAnnotationAttribute491); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -661,23 +661,23 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleSimpleAnnotationAttribute"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:269:1: ruleSimpleAnnotationAttribute : ( ( rule__SimpleAnnotationAttribute__Group__0 ) ) ;
+    // InternalETMap.g:269:1: ruleSimpleAnnotationAttribute : ( ( rule__SimpleAnnotationAttribute__Group__0 ) ) ;
     public final void ruleSimpleAnnotationAttribute() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:273:2: ( ( ( rule__SimpleAnnotationAttribute__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:274:1: ( ( rule__SimpleAnnotationAttribute__Group__0 ) )
+            // InternalETMap.g:273:2: ( ( ( rule__SimpleAnnotationAttribute__Group__0 ) ) )
+            // InternalETMap.g:274:1: ( ( rule__SimpleAnnotationAttribute__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:274:1: ( ( rule__SimpleAnnotationAttribute__Group__0 ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:275:1: ( rule__SimpleAnnotationAttribute__Group__0 )
+            // InternalETMap.g:274:1: ( ( rule__SimpleAnnotationAttribute__Group__0 ) )
+            // InternalETMap.g:275:1: ( rule__SimpleAnnotationAttribute__Group__0 )
             {
              before(grammarAccess.getSimpleAnnotationAttributeAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:276:1: ( rule__SimpleAnnotationAttribute__Group__0 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:276:2: rule__SimpleAnnotationAttribute__Group__0
+            // InternalETMap.g:276:1: ( rule__SimpleAnnotationAttribute__Group__0 )
+            // InternalETMap.g:276:2: rule__SimpleAnnotationAttribute__Group__0
             {
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__0_in_ruleSimpleAnnotationAttribute517);
+            pushFollow(FOLLOW_2);
             rule__SimpleAnnotationAttribute__Group__0();
 
             state._fsp--;
@@ -708,20 +708,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleEnumAnnotationAttribute"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:288:1: entryRuleEnumAnnotationAttribute : ruleEnumAnnotationAttribute EOF ;
+    // InternalETMap.g:288:1: entryRuleEnumAnnotationAttribute : ruleEnumAnnotationAttribute EOF ;
     public final void entryRuleEnumAnnotationAttribute() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:289:1: ( ruleEnumAnnotationAttribute EOF )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:290:1: ruleEnumAnnotationAttribute EOF
+            // InternalETMap.g:289:1: ( ruleEnumAnnotationAttribute EOF )
+            // InternalETMap.g:290:1: ruleEnumAnnotationAttribute EOF
             {
              before(grammarAccess.getEnumAnnotationAttributeRule()); 
-            pushFollow(FOLLOW_ruleEnumAnnotationAttribute_in_entryRuleEnumAnnotationAttribute544);
+            pushFollow(FOLLOW_1);
             ruleEnumAnnotationAttribute();
 
             state._fsp--;
 
              after(grammarAccess.getEnumAnnotationAttributeRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleEnumAnnotationAttribute551); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -738,23 +738,23 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleEnumAnnotationAttribute"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:297:1: ruleEnumAnnotationAttribute : ( ( rule__EnumAnnotationAttribute__Group__0 ) ) ;
+    // InternalETMap.g:297:1: ruleEnumAnnotationAttribute : ( ( rule__EnumAnnotationAttribute__Group__0 ) ) ;
     public final void ruleEnumAnnotationAttribute() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:301:2: ( ( ( rule__EnumAnnotationAttribute__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:302:1: ( ( rule__EnumAnnotationAttribute__Group__0 ) )
+            // InternalETMap.g:301:2: ( ( ( rule__EnumAnnotationAttribute__Group__0 ) ) )
+            // InternalETMap.g:302:1: ( ( rule__EnumAnnotationAttribute__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:302:1: ( ( rule__EnumAnnotationAttribute__Group__0 ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:303:1: ( rule__EnumAnnotationAttribute__Group__0 )
+            // InternalETMap.g:302:1: ( ( rule__EnumAnnotationAttribute__Group__0 ) )
+            // InternalETMap.g:303:1: ( rule__EnumAnnotationAttribute__Group__0 )
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:304:1: ( rule__EnumAnnotationAttribute__Group__0 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:304:2: rule__EnumAnnotationAttribute__Group__0
+            // InternalETMap.g:304:1: ( rule__EnumAnnotationAttribute__Group__0 )
+            // InternalETMap.g:304:2: rule__EnumAnnotationAttribute__Group__0
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__0_in_ruleEnumAnnotationAttribute577);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group__0();
 
             state._fsp--;
@@ -785,20 +785,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleImport"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:316:1: entryRuleImport : ruleImport EOF ;
+    // InternalETMap.g:316:1: entryRuleImport : ruleImport EOF ;
     public final void entryRuleImport() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:317:1: ( ruleImport EOF )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:318:1: ruleImport EOF
+            // InternalETMap.g:317:1: ( ruleImport EOF )
+            // InternalETMap.g:318:1: ruleImport EOF
             {
              before(grammarAccess.getImportRule()); 
-            pushFollow(FOLLOW_ruleImport_in_entryRuleImport604);
+            pushFollow(FOLLOW_1);
             ruleImport();
 
             state._fsp--;
 
              after(grammarAccess.getImportRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleImport611); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -815,23 +815,23 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleImport"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:325:1: ruleImport : ( ( rule__Import__Group__0 ) ) ;
+    // InternalETMap.g:325:1: ruleImport : ( ( rule__Import__Group__0 ) ) ;
     public final void ruleImport() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:329:2: ( ( ( rule__Import__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:330:1: ( ( rule__Import__Group__0 ) )
+            // InternalETMap.g:329:2: ( ( ( rule__Import__Group__0 ) ) )
+            // InternalETMap.g:330:1: ( ( rule__Import__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:330:1: ( ( rule__Import__Group__0 ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:331:1: ( rule__Import__Group__0 )
+            // InternalETMap.g:330:1: ( ( rule__Import__Group__0 ) )
+            // InternalETMap.g:331:1: ( rule__Import__Group__0 )
             {
              before(grammarAccess.getImportAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:332:1: ( rule__Import__Group__0 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:332:2: rule__Import__Group__0
+            // InternalETMap.g:332:1: ( rule__Import__Group__0 )
+            // InternalETMap.g:332:2: rule__Import__Group__0
             {
-            pushFollow(FOLLOW_rule__Import__Group__0_in_ruleImport637);
+            pushFollow(FOLLOW_2);
             rule__Import__Group__0();
 
             state._fsp--;
@@ -862,20 +862,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleImportedFQN"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:344:1: entryRuleImportedFQN : ruleImportedFQN EOF ;
+    // InternalETMap.g:344:1: entryRuleImportedFQN : ruleImportedFQN EOF ;
     public final void entryRuleImportedFQN() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:345:1: ( ruleImportedFQN EOF )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:346:1: ruleImportedFQN EOF
+            // InternalETMap.g:345:1: ( ruleImportedFQN EOF )
+            // InternalETMap.g:346:1: ruleImportedFQN EOF
             {
              before(grammarAccess.getImportedFQNRule()); 
-            pushFollow(FOLLOW_ruleImportedFQN_in_entryRuleImportedFQN664);
+            pushFollow(FOLLOW_1);
             ruleImportedFQN();
 
             state._fsp--;
 
              after(grammarAccess.getImportedFQNRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleImportedFQN671); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -892,23 +892,23 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleImportedFQN"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:353:1: ruleImportedFQN : ( ( rule__ImportedFQN__Group__0 ) ) ;
+    // InternalETMap.g:353:1: ruleImportedFQN : ( ( rule__ImportedFQN__Group__0 ) ) ;
     public final void ruleImportedFQN() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:357:2: ( ( ( rule__ImportedFQN__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:358:1: ( ( rule__ImportedFQN__Group__0 ) )
+            // InternalETMap.g:357:2: ( ( ( rule__ImportedFQN__Group__0 ) ) )
+            // InternalETMap.g:358:1: ( ( rule__ImportedFQN__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:358:1: ( ( rule__ImportedFQN__Group__0 ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:359:1: ( rule__ImportedFQN__Group__0 )
+            // InternalETMap.g:358:1: ( ( rule__ImportedFQN__Group__0 ) )
+            // InternalETMap.g:359:1: ( rule__ImportedFQN__Group__0 )
             {
              before(grammarAccess.getImportedFQNAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:360:1: ( rule__ImportedFQN__Group__0 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:360:2: rule__ImportedFQN__Group__0
+            // InternalETMap.g:360:1: ( rule__ImportedFQN__Group__0 )
+            // InternalETMap.g:360:2: rule__ImportedFQN__Group__0
             {
-            pushFollow(FOLLOW_rule__ImportedFQN__Group__0_in_ruleImportedFQN697);
+            pushFollow(FOLLOW_2);
             rule__ImportedFQN__Group__0();
 
             state._fsp--;
@@ -939,20 +939,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleDocumentation"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:372:1: entryRuleDocumentation : ruleDocumentation EOF ;
+    // InternalETMap.g:372:1: entryRuleDocumentation : ruleDocumentation EOF ;
     public final void entryRuleDocumentation() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:373:1: ( ruleDocumentation EOF )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:374:1: ruleDocumentation EOF
+            // InternalETMap.g:373:1: ( ruleDocumentation EOF )
+            // InternalETMap.g:374:1: ruleDocumentation EOF
             {
              before(grammarAccess.getDocumentationRule()); 
-            pushFollow(FOLLOW_ruleDocumentation_in_entryRuleDocumentation724);
+            pushFollow(FOLLOW_1);
             ruleDocumentation();
 
             state._fsp--;
 
              after(grammarAccess.getDocumentationRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDocumentation731); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -969,23 +969,23 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleDocumentation"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:381:1: ruleDocumentation : ( ( rule__Documentation__Group__0 ) ) ;
+    // InternalETMap.g:381:1: ruleDocumentation : ( ( rule__Documentation__Group__0 ) ) ;
     public final void ruleDocumentation() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:385:2: ( ( ( rule__Documentation__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:386:1: ( ( rule__Documentation__Group__0 ) )
+            // InternalETMap.g:385:2: ( ( ( rule__Documentation__Group__0 ) ) )
+            // InternalETMap.g:386:1: ( ( rule__Documentation__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:386:1: ( ( rule__Documentation__Group__0 ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:387:1: ( rule__Documentation__Group__0 )
+            // InternalETMap.g:386:1: ( ( rule__Documentation__Group__0 ) )
+            // InternalETMap.g:387:1: ( rule__Documentation__Group__0 )
             {
              before(grammarAccess.getDocumentationAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:388:1: ( rule__Documentation__Group__0 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:388:2: rule__Documentation__Group__0
+            // InternalETMap.g:388:1: ( rule__Documentation__Group__0 )
+            // InternalETMap.g:388:2: rule__Documentation__Group__0
             {
-            pushFollow(FOLLOW_rule__Documentation__Group__0_in_ruleDocumentation757);
+            pushFollow(FOLLOW_2);
             rule__Documentation__Group__0();
 
             state._fsp--;
@@ -1016,20 +1016,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleLiteral"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:404:1: entryRuleLiteral : ruleLiteral EOF ;
+    // InternalETMap.g:404:1: entryRuleLiteral : ruleLiteral EOF ;
     public final void entryRuleLiteral() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:405:1: ( ruleLiteral EOF )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:406:1: ruleLiteral EOF
+            // InternalETMap.g:405:1: ( ruleLiteral EOF )
+            // InternalETMap.g:406:1: ruleLiteral EOF
             {
              before(grammarAccess.getLiteralRule()); 
-            pushFollow(FOLLOW_ruleLiteral_in_entryRuleLiteral788);
+            pushFollow(FOLLOW_1);
             ruleLiteral();
 
             state._fsp--;
 
              after(grammarAccess.getLiteralRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleLiteral795); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1046,23 +1046,23 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleLiteral"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:413:1: ruleLiteral : ( ( rule__Literal__Alternatives ) ) ;
+    // InternalETMap.g:413:1: ruleLiteral : ( ( rule__Literal__Alternatives ) ) ;
     public final void ruleLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:417:2: ( ( ( rule__Literal__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:418:1: ( ( rule__Literal__Alternatives ) )
+            // InternalETMap.g:417:2: ( ( ( rule__Literal__Alternatives ) ) )
+            // InternalETMap.g:418:1: ( ( rule__Literal__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:418:1: ( ( rule__Literal__Alternatives ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:419:1: ( rule__Literal__Alternatives )
+            // InternalETMap.g:418:1: ( ( rule__Literal__Alternatives ) )
+            // InternalETMap.g:419:1: ( rule__Literal__Alternatives )
             {
              before(grammarAccess.getLiteralAccess().getAlternatives()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:420:1: ( rule__Literal__Alternatives )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:420:2: rule__Literal__Alternatives
+            // InternalETMap.g:420:1: ( rule__Literal__Alternatives )
+            // InternalETMap.g:420:2: rule__Literal__Alternatives
             {
-            pushFollow(FOLLOW_rule__Literal__Alternatives_in_ruleLiteral821);
+            pushFollow(FOLLOW_2);
             rule__Literal__Alternatives();
 
             state._fsp--;
@@ -1093,20 +1093,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleBooleanLiteral"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:432:1: entryRuleBooleanLiteral : ruleBooleanLiteral EOF ;
+    // InternalETMap.g:432:1: entryRuleBooleanLiteral : ruleBooleanLiteral EOF ;
     public final void entryRuleBooleanLiteral() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:433:1: ( ruleBooleanLiteral EOF )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:434:1: ruleBooleanLiteral EOF
+            // InternalETMap.g:433:1: ( ruleBooleanLiteral EOF )
+            // InternalETMap.g:434:1: ruleBooleanLiteral EOF
             {
              before(grammarAccess.getBooleanLiteralRule()); 
-            pushFollow(FOLLOW_ruleBooleanLiteral_in_entryRuleBooleanLiteral848);
+            pushFollow(FOLLOW_1);
             ruleBooleanLiteral();
 
             state._fsp--;
 
              after(grammarAccess.getBooleanLiteralRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleBooleanLiteral855); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1123,23 +1123,23 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleBooleanLiteral"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:441:1: ruleBooleanLiteral : ( ( rule__BooleanLiteral__Group__0 ) ) ;
+    // InternalETMap.g:441:1: ruleBooleanLiteral : ( ( rule__BooleanLiteral__Group__0 ) ) ;
     public final void ruleBooleanLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:445:2: ( ( ( rule__BooleanLiteral__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:446:1: ( ( rule__BooleanLiteral__Group__0 ) )
+            // InternalETMap.g:445:2: ( ( ( rule__BooleanLiteral__Group__0 ) ) )
+            // InternalETMap.g:446:1: ( ( rule__BooleanLiteral__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:446:1: ( ( rule__BooleanLiteral__Group__0 ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:447:1: ( rule__BooleanLiteral__Group__0 )
+            // InternalETMap.g:446:1: ( ( rule__BooleanLiteral__Group__0 ) )
+            // InternalETMap.g:447:1: ( rule__BooleanLiteral__Group__0 )
             {
              before(grammarAccess.getBooleanLiteralAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:448:1: ( rule__BooleanLiteral__Group__0 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:448:2: rule__BooleanLiteral__Group__0
+            // InternalETMap.g:448:1: ( rule__BooleanLiteral__Group__0 )
+            // InternalETMap.g:448:2: rule__BooleanLiteral__Group__0
             {
-            pushFollow(FOLLOW_rule__BooleanLiteral__Group__0_in_ruleBooleanLiteral881);
+            pushFollow(FOLLOW_2);
             rule__BooleanLiteral__Group__0();
 
             state._fsp--;
@@ -1170,20 +1170,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleNumberLiteral"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:460:1: entryRuleNumberLiteral : ruleNumberLiteral EOF ;
+    // InternalETMap.g:460:1: entryRuleNumberLiteral : ruleNumberLiteral EOF ;
     public final void entryRuleNumberLiteral() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:461:1: ( ruleNumberLiteral EOF )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:462:1: ruleNumberLiteral EOF
+            // InternalETMap.g:461:1: ( ruleNumberLiteral EOF )
+            // InternalETMap.g:462:1: ruleNumberLiteral EOF
             {
              before(grammarAccess.getNumberLiteralRule()); 
-            pushFollow(FOLLOW_ruleNumberLiteral_in_entryRuleNumberLiteral908);
+            pushFollow(FOLLOW_1);
             ruleNumberLiteral();
 
             state._fsp--;
 
              after(grammarAccess.getNumberLiteralRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleNumberLiteral915); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1200,23 +1200,23 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleNumberLiteral"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:469:1: ruleNumberLiteral : ( ( rule__NumberLiteral__Alternatives ) ) ;
+    // InternalETMap.g:469:1: ruleNumberLiteral : ( ( rule__NumberLiteral__Alternatives ) ) ;
     public final void ruleNumberLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:473:2: ( ( ( rule__NumberLiteral__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:474:1: ( ( rule__NumberLiteral__Alternatives ) )
+            // InternalETMap.g:473:2: ( ( ( rule__NumberLiteral__Alternatives ) ) )
+            // InternalETMap.g:474:1: ( ( rule__NumberLiteral__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:474:1: ( ( rule__NumberLiteral__Alternatives ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:475:1: ( rule__NumberLiteral__Alternatives )
+            // InternalETMap.g:474:1: ( ( rule__NumberLiteral__Alternatives ) )
+            // InternalETMap.g:475:1: ( rule__NumberLiteral__Alternatives )
             {
              before(grammarAccess.getNumberLiteralAccess().getAlternatives()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:476:1: ( rule__NumberLiteral__Alternatives )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:476:2: rule__NumberLiteral__Alternatives
+            // InternalETMap.g:476:1: ( rule__NumberLiteral__Alternatives )
+            // InternalETMap.g:476:2: rule__NumberLiteral__Alternatives
             {
-            pushFollow(FOLLOW_rule__NumberLiteral__Alternatives_in_ruleNumberLiteral941);
+            pushFollow(FOLLOW_2);
             rule__NumberLiteral__Alternatives();
 
             state._fsp--;
@@ -1247,20 +1247,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleRealLiteral"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:488:1: entryRuleRealLiteral : ruleRealLiteral EOF ;
+    // InternalETMap.g:488:1: entryRuleRealLiteral : ruleRealLiteral EOF ;
     public final void entryRuleRealLiteral() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:489:1: ( ruleRealLiteral EOF )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:490:1: ruleRealLiteral EOF
+            // InternalETMap.g:489:1: ( ruleRealLiteral EOF )
+            // InternalETMap.g:490:1: ruleRealLiteral EOF
             {
              before(grammarAccess.getRealLiteralRule()); 
-            pushFollow(FOLLOW_ruleRealLiteral_in_entryRuleRealLiteral968);
+            pushFollow(FOLLOW_1);
             ruleRealLiteral();
 
             state._fsp--;
 
              after(grammarAccess.getRealLiteralRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRealLiteral975); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1277,23 +1277,23 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleRealLiteral"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:497:1: ruleRealLiteral : ( ( rule__RealLiteral__Group__0 ) ) ;
+    // InternalETMap.g:497:1: ruleRealLiteral : ( ( rule__RealLiteral__Group__0 ) ) ;
     public final void ruleRealLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:501:2: ( ( ( rule__RealLiteral__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:502:1: ( ( rule__RealLiteral__Group__0 ) )
+            // InternalETMap.g:501:2: ( ( ( rule__RealLiteral__Group__0 ) ) )
+            // InternalETMap.g:502:1: ( ( rule__RealLiteral__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:502:1: ( ( rule__RealLiteral__Group__0 ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:503:1: ( rule__RealLiteral__Group__0 )
+            // InternalETMap.g:502:1: ( ( rule__RealLiteral__Group__0 ) )
+            // InternalETMap.g:503:1: ( rule__RealLiteral__Group__0 )
             {
              before(grammarAccess.getRealLiteralAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:504:1: ( rule__RealLiteral__Group__0 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:504:2: rule__RealLiteral__Group__0
+            // InternalETMap.g:504:1: ( rule__RealLiteral__Group__0 )
+            // InternalETMap.g:504:2: rule__RealLiteral__Group__0
             {
-            pushFollow(FOLLOW_rule__RealLiteral__Group__0_in_ruleRealLiteral1001);
+            pushFollow(FOLLOW_2);
             rule__RealLiteral__Group__0();
 
             state._fsp--;
@@ -1324,20 +1324,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleIntLiteral"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:516:1: entryRuleIntLiteral : ruleIntLiteral EOF ;
+    // InternalETMap.g:516:1: entryRuleIntLiteral : ruleIntLiteral EOF ;
     public final void entryRuleIntLiteral() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:517:1: ( ruleIntLiteral EOF )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:518:1: ruleIntLiteral EOF
+            // InternalETMap.g:517:1: ( ruleIntLiteral EOF )
+            // InternalETMap.g:518:1: ruleIntLiteral EOF
             {
              before(grammarAccess.getIntLiteralRule()); 
-            pushFollow(FOLLOW_ruleIntLiteral_in_entryRuleIntLiteral1028);
+            pushFollow(FOLLOW_1);
             ruleIntLiteral();
 
             state._fsp--;
 
              after(grammarAccess.getIntLiteralRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIntLiteral1035); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1354,23 +1354,23 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleIntLiteral"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:525:1: ruleIntLiteral : ( ( rule__IntLiteral__Group__0 ) ) ;
+    // InternalETMap.g:525:1: ruleIntLiteral : ( ( rule__IntLiteral__Group__0 ) ) ;
     public final void ruleIntLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:529:2: ( ( ( rule__IntLiteral__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:530:1: ( ( rule__IntLiteral__Group__0 ) )
+            // InternalETMap.g:529:2: ( ( ( rule__IntLiteral__Group__0 ) ) )
+            // InternalETMap.g:530:1: ( ( rule__IntLiteral__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:530:1: ( ( rule__IntLiteral__Group__0 ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:531:1: ( rule__IntLiteral__Group__0 )
+            // InternalETMap.g:530:1: ( ( rule__IntLiteral__Group__0 ) )
+            // InternalETMap.g:531:1: ( rule__IntLiteral__Group__0 )
             {
              before(grammarAccess.getIntLiteralAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:532:1: ( rule__IntLiteral__Group__0 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:532:2: rule__IntLiteral__Group__0
+            // InternalETMap.g:532:1: ( rule__IntLiteral__Group__0 )
+            // InternalETMap.g:532:2: rule__IntLiteral__Group__0
             {
-            pushFollow(FOLLOW_rule__IntLiteral__Group__0_in_ruleIntLiteral1061);
+            pushFollow(FOLLOW_2);
             rule__IntLiteral__Group__0();
 
             state._fsp--;
@@ -1401,20 +1401,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleStringLiteral"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:544:1: entryRuleStringLiteral : ruleStringLiteral EOF ;
+    // InternalETMap.g:544:1: entryRuleStringLiteral : ruleStringLiteral EOF ;
     public final void entryRuleStringLiteral() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:545:1: ( ruleStringLiteral EOF )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:546:1: ruleStringLiteral EOF
+            // InternalETMap.g:545:1: ( ruleStringLiteral EOF )
+            // InternalETMap.g:546:1: ruleStringLiteral EOF
             {
              before(grammarAccess.getStringLiteralRule()); 
-            pushFollow(FOLLOW_ruleStringLiteral_in_entryRuleStringLiteral1088);
+            pushFollow(FOLLOW_1);
             ruleStringLiteral();
 
             state._fsp--;
 
              after(grammarAccess.getStringLiteralRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleStringLiteral1095); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1431,23 +1431,23 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleStringLiteral"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:553:1: ruleStringLiteral : ( ( rule__StringLiteral__Group__0 ) ) ;
+    // InternalETMap.g:553:1: ruleStringLiteral : ( ( rule__StringLiteral__Group__0 ) ) ;
     public final void ruleStringLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:557:2: ( ( ( rule__StringLiteral__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:558:1: ( ( rule__StringLiteral__Group__0 ) )
+            // InternalETMap.g:557:2: ( ( ( rule__StringLiteral__Group__0 ) ) )
+            // InternalETMap.g:558:1: ( ( rule__StringLiteral__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:558:1: ( ( rule__StringLiteral__Group__0 ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:559:1: ( rule__StringLiteral__Group__0 )
+            // InternalETMap.g:558:1: ( ( rule__StringLiteral__Group__0 ) )
+            // InternalETMap.g:559:1: ( rule__StringLiteral__Group__0 )
             {
              before(grammarAccess.getStringLiteralAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:560:1: ( rule__StringLiteral__Group__0 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:560:2: rule__StringLiteral__Group__0
+            // InternalETMap.g:560:1: ( rule__StringLiteral__Group__0 )
+            // InternalETMap.g:560:2: rule__StringLiteral__Group__0
             {
-            pushFollow(FOLLOW_rule__StringLiteral__Group__0_in_ruleStringLiteral1121);
+            pushFollow(FOLLOW_2);
             rule__StringLiteral__Group__0();
 
             state._fsp--;
@@ -1478,20 +1478,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleInteger"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:572:1: entryRuleInteger : ruleInteger EOF ;
+    // InternalETMap.g:572:1: entryRuleInteger : ruleInteger EOF ;
     public final void entryRuleInteger() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:573:1: ( ruleInteger EOF )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:574:1: ruleInteger EOF
+            // InternalETMap.g:573:1: ( ruleInteger EOF )
+            // InternalETMap.g:574:1: ruleInteger EOF
             {
              before(grammarAccess.getIntegerRule()); 
-            pushFollow(FOLLOW_ruleInteger_in_entryRuleInteger1148);
+            pushFollow(FOLLOW_1);
             ruleInteger();
 
             state._fsp--;
 
              after(grammarAccess.getIntegerRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleInteger1155); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1508,23 +1508,23 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleInteger"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:581:1: ruleInteger : ( ( rule__Integer__Alternatives ) ) ;
+    // InternalETMap.g:581:1: ruleInteger : ( ( rule__Integer__Alternatives ) ) ;
     public final void ruleInteger() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:585:2: ( ( ( rule__Integer__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:586:1: ( ( rule__Integer__Alternatives ) )
+            // InternalETMap.g:585:2: ( ( ( rule__Integer__Alternatives ) ) )
+            // InternalETMap.g:586:1: ( ( rule__Integer__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:586:1: ( ( rule__Integer__Alternatives ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:587:1: ( rule__Integer__Alternatives )
+            // InternalETMap.g:586:1: ( ( rule__Integer__Alternatives ) )
+            // InternalETMap.g:587:1: ( rule__Integer__Alternatives )
             {
              before(grammarAccess.getIntegerAccess().getAlternatives()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:588:1: ( rule__Integer__Alternatives )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:588:2: rule__Integer__Alternatives
+            // InternalETMap.g:588:1: ( rule__Integer__Alternatives )
+            // InternalETMap.g:588:2: rule__Integer__Alternatives
             {
-            pushFollow(FOLLOW_rule__Integer__Alternatives_in_ruleInteger1181);
+            pushFollow(FOLLOW_2);
             rule__Integer__Alternatives();
 
             state._fsp--;
@@ -1555,20 +1555,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleReal"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:600:1: entryRuleReal : ruleReal EOF ;
+    // InternalETMap.g:600:1: entryRuleReal : ruleReal EOF ;
     public final void entryRuleReal() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:601:1: ( ruleReal EOF )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:602:1: ruleReal EOF
+            // InternalETMap.g:601:1: ( ruleReal EOF )
+            // InternalETMap.g:602:1: ruleReal EOF
             {
              before(grammarAccess.getRealRule()); 
-            pushFollow(FOLLOW_ruleReal_in_entryRuleReal1208);
+            pushFollow(FOLLOW_1);
             ruleReal();
 
             state._fsp--;
 
              after(grammarAccess.getRealRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleReal1215); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1585,23 +1585,23 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleReal"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:609:1: ruleReal : ( ( rule__Real__Alternatives ) ) ;
+    // InternalETMap.g:609:1: ruleReal : ( ( rule__Real__Alternatives ) ) ;
     public final void ruleReal() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:613:2: ( ( ( rule__Real__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:614:1: ( ( rule__Real__Alternatives ) )
+            // InternalETMap.g:613:2: ( ( ( rule__Real__Alternatives ) ) )
+            // InternalETMap.g:614:1: ( ( rule__Real__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:614:1: ( ( rule__Real__Alternatives ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:615:1: ( rule__Real__Alternatives )
+            // InternalETMap.g:614:1: ( ( rule__Real__Alternatives ) )
+            // InternalETMap.g:615:1: ( rule__Real__Alternatives )
             {
              before(grammarAccess.getRealAccess().getAlternatives()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:616:1: ( rule__Real__Alternatives )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:616:2: rule__Real__Alternatives
+            // InternalETMap.g:616:1: ( rule__Real__Alternatives )
+            // InternalETMap.g:616:2: rule__Real__Alternatives
             {
-            pushFollow(FOLLOW_rule__Real__Alternatives_in_ruleReal1241);
+            pushFollow(FOLLOW_2);
             rule__Real__Alternatives();
 
             state._fsp--;
@@ -1632,23 +1632,23 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleDecimal"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:628:1: entryRuleDecimal : ruleDecimal EOF ;
+    // InternalETMap.g:628:1: entryRuleDecimal : ruleDecimal EOF ;
     public final void entryRuleDecimal() throws RecognitionException {
 
         	HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
 
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:632:1: ( ruleDecimal EOF )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:633:1: ruleDecimal EOF
+            // InternalETMap.g:632:1: ( ruleDecimal EOF )
+            // InternalETMap.g:633:1: ruleDecimal EOF
             {
              before(grammarAccess.getDecimalRule()); 
-            pushFollow(FOLLOW_ruleDecimal_in_entryRuleDecimal1273);
+            pushFollow(FOLLOW_1);
             ruleDecimal();
 
             state._fsp--;
 
              after(grammarAccess.getDecimalRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDecimal1280); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1668,24 +1668,24 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleDecimal"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:643:1: ruleDecimal : ( ( rule__Decimal__Group__0 ) ) ;
+    // InternalETMap.g:643:1: ruleDecimal : ( ( rule__Decimal__Group__0 ) ) ;
     public final void ruleDecimal() throws RecognitionException {
 
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:648:2: ( ( ( rule__Decimal__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:649:1: ( ( rule__Decimal__Group__0 ) )
+            // InternalETMap.g:648:2: ( ( ( rule__Decimal__Group__0 ) ) )
+            // InternalETMap.g:649:1: ( ( rule__Decimal__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:649:1: ( ( rule__Decimal__Group__0 ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:650:1: ( rule__Decimal__Group__0 )
+            // InternalETMap.g:649:1: ( ( rule__Decimal__Group__0 ) )
+            // InternalETMap.g:650:1: ( rule__Decimal__Group__0 )
             {
              before(grammarAccess.getDecimalAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:651:1: ( rule__Decimal__Group__0 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:651:2: rule__Decimal__Group__0
+            // InternalETMap.g:651:1: ( rule__Decimal__Group__0 )
+            // InternalETMap.g:651:2: rule__Decimal__Group__0
             {
-            pushFollow(FOLLOW_rule__Decimal__Group__0_in_ruleDecimal1310);
+            pushFollow(FOLLOW_2);
             rule__Decimal__Group__0();
 
             state._fsp--;
@@ -1717,23 +1717,23 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleDecimalExp"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:664:1: entryRuleDecimalExp : ruleDecimalExp EOF ;
+    // InternalETMap.g:664:1: entryRuleDecimalExp : ruleDecimalExp EOF ;
     public final void entryRuleDecimalExp() throws RecognitionException {
 
         	HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
 
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:668:1: ( ruleDecimalExp EOF )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:669:1: ruleDecimalExp EOF
+            // InternalETMap.g:668:1: ( ruleDecimalExp EOF )
+            // InternalETMap.g:669:1: ruleDecimalExp EOF
             {
              before(grammarAccess.getDecimalExpRule()); 
-            pushFollow(FOLLOW_ruleDecimalExp_in_entryRuleDecimalExp1342);
+            pushFollow(FOLLOW_1);
             ruleDecimalExp();
 
             state._fsp--;
 
              after(grammarAccess.getDecimalExpRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDecimalExp1349); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1753,24 +1753,24 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleDecimalExp"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:679:1: ruleDecimalExp : ( ( rule__DecimalExp__Group__0 ) ) ;
+    // InternalETMap.g:679:1: ruleDecimalExp : ( ( rule__DecimalExp__Group__0 ) ) ;
     public final void ruleDecimalExp() throws RecognitionException {
 
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:684:2: ( ( ( rule__DecimalExp__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:685:1: ( ( rule__DecimalExp__Group__0 ) )
+            // InternalETMap.g:684:2: ( ( ( rule__DecimalExp__Group__0 ) ) )
+            // InternalETMap.g:685:1: ( ( rule__DecimalExp__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:685:1: ( ( rule__DecimalExp__Group__0 ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:686:1: ( rule__DecimalExp__Group__0 )
+            // InternalETMap.g:685:1: ( ( rule__DecimalExp__Group__0 ) )
+            // InternalETMap.g:686:1: ( rule__DecimalExp__Group__0 )
             {
              before(grammarAccess.getDecimalExpAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:687:1: ( rule__DecimalExp__Group__0 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:687:2: rule__DecimalExp__Group__0
+            // InternalETMap.g:687:1: ( rule__DecimalExp__Group__0 )
+            // InternalETMap.g:687:2: rule__DecimalExp__Group__0
             {
-            pushFollow(FOLLOW_rule__DecimalExp__Group__0_in_ruleDecimalExp1379);
+            pushFollow(FOLLOW_2);
             rule__DecimalExp__Group__0();
 
             state._fsp--;
@@ -1802,20 +1802,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleFQN"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:700:1: entryRuleFQN : ruleFQN EOF ;
+    // InternalETMap.g:700:1: entryRuleFQN : ruleFQN EOF ;
     public final void entryRuleFQN() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:701:1: ( ruleFQN EOF )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:702:1: ruleFQN EOF
+            // InternalETMap.g:701:1: ( ruleFQN EOF )
+            // InternalETMap.g:702:1: ruleFQN EOF
             {
              before(grammarAccess.getFQNRule()); 
-            pushFollow(FOLLOW_ruleFQN_in_entryRuleFQN1406);
+            pushFollow(FOLLOW_1);
             ruleFQN();
 
             state._fsp--;
 
              after(grammarAccess.getFQNRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleFQN1413); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1832,23 +1832,23 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleFQN"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:709:1: ruleFQN : ( ( rule__FQN__Group__0 ) ) ;
+    // InternalETMap.g:709:1: ruleFQN : ( ( rule__FQN__Group__0 ) ) ;
     public final void ruleFQN() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:713:2: ( ( ( rule__FQN__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:714:1: ( ( rule__FQN__Group__0 ) )
+            // InternalETMap.g:713:2: ( ( ( rule__FQN__Group__0 ) ) )
+            // InternalETMap.g:714:1: ( ( rule__FQN__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:714:1: ( ( rule__FQN__Group__0 ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:715:1: ( rule__FQN__Group__0 )
+            // InternalETMap.g:714:1: ( ( rule__FQN__Group__0 ) )
+            // InternalETMap.g:715:1: ( rule__FQN__Group__0 )
             {
              before(grammarAccess.getFQNAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:716:1: ( rule__FQN__Group__0 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:716:2: rule__FQN__Group__0
+            // InternalETMap.g:716:1: ( rule__FQN__Group__0 )
+            // InternalETMap.g:716:2: rule__FQN__Group__0
             {
-            pushFollow(FOLLOW_rule__FQN__Group__0_in_ruleFQN1439);
+            pushFollow(FOLLOW_2);
             rule__FQN__Group__0();
 
             state._fsp--;
@@ -1879,23 +1879,23 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleLiteralType"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:729:1: ruleLiteralType : ( ( rule__LiteralType__Alternatives ) ) ;
+    // InternalETMap.g:729:1: ruleLiteralType : ( ( rule__LiteralType__Alternatives ) ) ;
     public final void ruleLiteralType() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:733:1: ( ( ( rule__LiteralType__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:734:1: ( ( rule__LiteralType__Alternatives ) )
+            // InternalETMap.g:733:1: ( ( ( rule__LiteralType__Alternatives ) ) )
+            // InternalETMap.g:734:1: ( ( rule__LiteralType__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:734:1: ( ( rule__LiteralType__Alternatives ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:735:1: ( rule__LiteralType__Alternatives )
+            // InternalETMap.g:734:1: ( ( rule__LiteralType__Alternatives ) )
+            // InternalETMap.g:735:1: ( rule__LiteralType__Alternatives )
             {
              before(grammarAccess.getLiteralTypeAccess().getAlternatives()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:736:1: ( rule__LiteralType__Alternatives )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:736:2: rule__LiteralType__Alternatives
+            // InternalETMap.g:736:1: ( rule__LiteralType__Alternatives )
+            // InternalETMap.g:736:2: rule__LiteralType__Alternatives
             {
-            pushFollow(FOLLOW_rule__LiteralType__Alternatives_in_ruleLiteralType1476);
+            pushFollow(FOLLOW_2);
             rule__LiteralType__Alternatives();
 
             state._fsp--;
@@ -1926,13 +1926,13 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AnnotationAttribute__Alternatives"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:748:1: rule__AnnotationAttribute__Alternatives : ( ( ruleSimpleAnnotationAttribute ) | ( ruleEnumAnnotationAttribute ) );
+    // InternalETMap.g:748:1: rule__AnnotationAttribute__Alternatives : ( ( ruleSimpleAnnotationAttribute ) | ( ruleEnumAnnotationAttribute ) );
     public final void rule__AnnotationAttribute__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:752:1: ( ( ruleSimpleAnnotationAttribute ) | ( ruleEnumAnnotationAttribute ) )
+            // InternalETMap.g:752:1: ( ( ruleSimpleAnnotationAttribute ) | ( ruleEnumAnnotationAttribute ) )
             int alt1=2;
             int LA1_0 = input.LA(1);
 
@@ -2036,13 +2036,13 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
             }
             switch (alt1) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:753:1: ( ruleSimpleAnnotationAttribute )
+                    // InternalETMap.g:753:1: ( ruleSimpleAnnotationAttribute )
                     {
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:753:1: ( ruleSimpleAnnotationAttribute )
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:754:1: ruleSimpleAnnotationAttribute
+                    // InternalETMap.g:753:1: ( ruleSimpleAnnotationAttribute )
+                    // InternalETMap.g:754:1: ruleSimpleAnnotationAttribute
                     {
                      before(grammarAccess.getAnnotationAttributeAccess().getSimpleAnnotationAttributeParserRuleCall_0()); 
-                    pushFollow(FOLLOW_ruleSimpleAnnotationAttribute_in_rule__AnnotationAttribute__Alternatives1512);
+                    pushFollow(FOLLOW_2);
                     ruleSimpleAnnotationAttribute();
 
                     state._fsp--;
@@ -2055,13 +2055,13 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:759:6: ( ruleEnumAnnotationAttribute )
+                    // InternalETMap.g:759:6: ( ruleEnumAnnotationAttribute )
                     {
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:759:6: ( ruleEnumAnnotationAttribute )
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:760:1: ruleEnumAnnotationAttribute
+                    // InternalETMap.g:759:6: ( ruleEnumAnnotationAttribute )
+                    // InternalETMap.g:760:1: ruleEnumAnnotationAttribute
                     {
                      before(grammarAccess.getAnnotationAttributeAccess().getEnumAnnotationAttributeParserRuleCall_1()); 
-                    pushFollow(FOLLOW_ruleEnumAnnotationAttribute_in_rule__AnnotationAttribute__Alternatives1529);
+                    pushFollow(FOLLOW_2);
                     ruleEnumAnnotationAttribute();
 
                     state._fsp--;
@@ -2091,13 +2091,13 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Alternatives_0"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:770:1: rule__SimpleAnnotationAttribute__Alternatives_0 : ( ( ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 ) ) | ( 'mandatory' ) );
+    // InternalETMap.g:770:1: rule__SimpleAnnotationAttribute__Alternatives_0 : ( ( ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 ) ) | ( 'mandatory' ) );
     public final void rule__SimpleAnnotationAttribute__Alternatives_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:774:1: ( ( ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 ) ) | ( 'mandatory' ) )
+            // InternalETMap.g:774:1: ( ( ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 ) ) | ( 'mandatory' ) )
             int alt2=2;
             int LA2_0 = input.LA(1);
 
@@ -2115,16 +2115,16 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
             }
             switch (alt2) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:775:1: ( ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 ) )
+                    // InternalETMap.g:775:1: ( ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 ) )
                     {
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:775:1: ( ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 ) )
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:776:1: ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 )
+                    // InternalETMap.g:775:1: ( ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 ) )
+                    // InternalETMap.g:776:1: ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 )
                     {
                      before(grammarAccess.getSimpleAnnotationAttributeAccess().getOptionalAssignment_0_0()); 
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:777:1: ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 )
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:777:2: rule__SimpleAnnotationAttribute__OptionalAssignment_0_0
+                    // InternalETMap.g:777:1: ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 )
+                    // InternalETMap.g:777:2: rule__SimpleAnnotationAttribute__OptionalAssignment_0_0
                     {
-                    pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__OptionalAssignment_0_0_in_rule__SimpleAnnotationAttribute__Alternatives_01561);
+                    pushFollow(FOLLOW_2);
                     rule__SimpleAnnotationAttribute__OptionalAssignment_0_0();
 
                     state._fsp--;
@@ -2140,13 +2140,13 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:781:6: ( 'mandatory' )
+                    // InternalETMap.g:781:6: ( 'mandatory' )
                     {
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:781:6: ( 'mandatory' )
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:782:1: 'mandatory'
+                    // InternalETMap.g:781:6: ( 'mandatory' )
+                    // InternalETMap.g:782:1: 'mandatory'
                     {
                      before(grammarAccess.getSimpleAnnotationAttributeAccess().getMandatoryKeyword_0_1()); 
-                    match(input,12,FOLLOW_12_in_rule__SimpleAnnotationAttribute__Alternatives_01580); 
+                    match(input,12,FOLLOW_2); 
                      after(grammarAccess.getSimpleAnnotationAttributeAccess().getMandatoryKeyword_0_1()); 
 
                     }
@@ -2172,13 +2172,13 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Alternatives_0"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:794:1: rule__EnumAnnotationAttribute__Alternatives_0 : ( ( ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 ) ) | ( 'mandatory' ) );
+    // InternalETMap.g:794:1: rule__EnumAnnotationAttribute__Alternatives_0 : ( ( ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 ) ) | ( 'mandatory' ) );
     public final void rule__EnumAnnotationAttribute__Alternatives_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:798:1: ( ( ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 ) ) | ( 'mandatory' ) )
+            // InternalETMap.g:798:1: ( ( ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 ) ) | ( 'mandatory' ) )
             int alt3=2;
             int LA3_0 = input.LA(1);
 
@@ -2196,16 +2196,16 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
             }
             switch (alt3) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:799:1: ( ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 ) )
+                    // InternalETMap.g:799:1: ( ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 ) )
                     {
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:799:1: ( ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 ) )
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:800:1: ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 )
+                    // InternalETMap.g:799:1: ( ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 ) )
+                    // InternalETMap.g:800:1: ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 )
                     {
                      before(grammarAccess.getEnumAnnotationAttributeAccess().getOptionalAssignment_0_0()); 
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:801:1: ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 )
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:801:2: rule__EnumAnnotationAttribute__OptionalAssignment_0_0
+                    // InternalETMap.g:801:1: ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 )
+                    // InternalETMap.g:801:2: rule__EnumAnnotationAttribute__OptionalAssignment_0_0
                     {
-                    pushFollow(FOLLOW_rule__EnumAnnotationAttribute__OptionalAssignment_0_0_in_rule__EnumAnnotationAttribute__Alternatives_01614);
+                    pushFollow(FOLLOW_2);
                     rule__EnumAnnotationAttribute__OptionalAssignment_0_0();
 
                     state._fsp--;
@@ -2221,13 +2221,13 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:805:6: ( 'mandatory' )
+                    // InternalETMap.g:805:6: ( 'mandatory' )
                     {
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:805:6: ( 'mandatory' )
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:806:1: 'mandatory'
+                    // InternalETMap.g:805:6: ( 'mandatory' )
+                    // InternalETMap.g:806:1: 'mandatory'
                     {
                      before(grammarAccess.getEnumAnnotationAttributeAccess().getMandatoryKeyword_0_1()); 
-                    match(input,12,FOLLOW_12_in_rule__EnumAnnotationAttribute__Alternatives_01633); 
+                    match(input,12,FOLLOW_2); 
                      after(grammarAccess.getEnumAnnotationAttributeAccess().getMandatoryKeyword_0_1()); 
 
                     }
@@ -2253,13 +2253,13 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Import__Alternatives_1"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:818:1: rule__Import__Alternatives_1 : ( ( ( rule__Import__Group_1_0__0 ) ) | ( 'model' ) );
+    // InternalETMap.g:818:1: rule__Import__Alternatives_1 : ( ( ( rule__Import__Group_1_0__0 ) ) | ( 'model' ) );
     public final void rule__Import__Alternatives_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:822:1: ( ( ( rule__Import__Group_1_0__0 ) ) | ( 'model' ) )
+            // InternalETMap.g:822:1: ( ( ( rule__Import__Group_1_0__0 ) ) | ( 'model' ) )
             int alt4=2;
             int LA4_0 = input.LA(1);
 
@@ -2277,16 +2277,16 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
             }
             switch (alt4) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:823:1: ( ( rule__Import__Group_1_0__0 ) )
+                    // InternalETMap.g:823:1: ( ( rule__Import__Group_1_0__0 ) )
                     {
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:823:1: ( ( rule__Import__Group_1_0__0 ) )
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:824:1: ( rule__Import__Group_1_0__0 )
+                    // InternalETMap.g:823:1: ( ( rule__Import__Group_1_0__0 ) )
+                    // InternalETMap.g:824:1: ( rule__Import__Group_1_0__0 )
                     {
                      before(grammarAccess.getImportAccess().getGroup_1_0()); 
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:825:1: ( rule__Import__Group_1_0__0 )
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:825:2: rule__Import__Group_1_0__0
+                    // InternalETMap.g:825:1: ( rule__Import__Group_1_0__0 )
+                    // InternalETMap.g:825:2: rule__Import__Group_1_0__0
                     {
-                    pushFollow(FOLLOW_rule__Import__Group_1_0__0_in_rule__Import__Alternatives_11667);
+                    pushFollow(FOLLOW_2);
                     rule__Import__Group_1_0__0();
 
                     state._fsp--;
@@ -2302,13 +2302,13 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:829:6: ( 'model' )
+                    // InternalETMap.g:829:6: ( 'model' )
                     {
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:829:6: ( 'model' )
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:830:1: 'model'
+                    // InternalETMap.g:829:6: ( 'model' )
+                    // InternalETMap.g:830:1: 'model'
                     {
                      before(grammarAccess.getImportAccess().getModelKeyword_1_1()); 
-                    match(input,13,FOLLOW_13_in_rule__Import__Alternatives_11686); 
+                    match(input,13,FOLLOW_2); 
                      after(grammarAccess.getImportAccess().getModelKeyword_1_1()); 
 
                     }
@@ -2334,13 +2334,13 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Literal__Alternatives"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:843:1: rule__Literal__Alternatives : ( ( ruleBooleanLiteral ) | ( ruleNumberLiteral ) | ( ruleStringLiteral ) );
+    // InternalETMap.g:843:1: rule__Literal__Alternatives : ( ( ruleBooleanLiteral ) | ( ruleNumberLiteral ) | ( ruleStringLiteral ) );
     public final void rule__Literal__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:847:1: ( ( ruleBooleanLiteral ) | ( ruleNumberLiteral ) | ( ruleStringLiteral ) )
+            // InternalETMap.g:847:1: ( ( ruleBooleanLiteral ) | ( ruleNumberLiteral ) | ( ruleStringLiteral ) )
             int alt5=3;
             switch ( input.LA(1) ) {
             case 14:
@@ -2371,13 +2371,13 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
             switch (alt5) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:848:1: ( ruleBooleanLiteral )
+                    // InternalETMap.g:848:1: ( ruleBooleanLiteral )
                     {
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:848:1: ( ruleBooleanLiteral )
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:849:1: ruleBooleanLiteral
+                    // InternalETMap.g:848:1: ( ruleBooleanLiteral )
+                    // InternalETMap.g:849:1: ruleBooleanLiteral
                     {
                      before(grammarAccess.getLiteralAccess().getBooleanLiteralParserRuleCall_0()); 
-                    pushFollow(FOLLOW_ruleBooleanLiteral_in_rule__Literal__Alternatives1721);
+                    pushFollow(FOLLOW_2);
                     ruleBooleanLiteral();
 
                     state._fsp--;
@@ -2390,13 +2390,13 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:854:6: ( ruleNumberLiteral )
+                    // InternalETMap.g:854:6: ( ruleNumberLiteral )
                     {
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:854:6: ( ruleNumberLiteral )
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:855:1: ruleNumberLiteral
+                    // InternalETMap.g:854:6: ( ruleNumberLiteral )
+                    // InternalETMap.g:855:1: ruleNumberLiteral
                     {
                      before(grammarAccess.getLiteralAccess().getNumberLiteralParserRuleCall_1()); 
-                    pushFollow(FOLLOW_ruleNumberLiteral_in_rule__Literal__Alternatives1738);
+                    pushFollow(FOLLOW_2);
                     ruleNumberLiteral();
 
                     state._fsp--;
@@ -2409,13 +2409,13 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:860:6: ( ruleStringLiteral )
+                    // InternalETMap.g:860:6: ( ruleStringLiteral )
                     {
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:860:6: ( ruleStringLiteral )
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:861:1: ruleStringLiteral
+                    // InternalETMap.g:860:6: ( ruleStringLiteral )
+                    // InternalETMap.g:861:1: ruleStringLiteral
                     {
                      before(grammarAccess.getLiteralAccess().getStringLiteralParserRuleCall_2()); 
-                    pushFollow(FOLLOW_ruleStringLiteral_in_rule__Literal__Alternatives1755);
+                    pushFollow(FOLLOW_2);
                     ruleStringLiteral();
 
                     state._fsp--;
@@ -2445,13 +2445,13 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__BooleanLiteral__Alternatives_1"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:871:1: rule__BooleanLiteral__Alternatives_1 : ( ( 'false' ) | ( ( rule__BooleanLiteral__IsTrueAssignment_1_1 ) ) );
+    // InternalETMap.g:871:1: rule__BooleanLiteral__Alternatives_1 : ( ( 'false' ) | ( ( rule__BooleanLiteral__IsTrueAssignment_1_1 ) ) );
     public final void rule__BooleanLiteral__Alternatives_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:875:1: ( ( 'false' ) | ( ( rule__BooleanLiteral__IsTrueAssignment_1_1 ) ) )
+            // InternalETMap.g:875:1: ( ( 'false' ) | ( ( rule__BooleanLiteral__IsTrueAssignment_1_1 ) ) )
             int alt6=2;
             int LA6_0 = input.LA(1);
 
@@ -2469,13 +2469,13 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
             }
             switch (alt6) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:876:1: ( 'false' )
+                    // InternalETMap.g:876:1: ( 'false' )
                     {
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:876:1: ( 'false' )
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:877:1: 'false'
+                    // InternalETMap.g:876:1: ( 'false' )
+                    // InternalETMap.g:877:1: 'false'
                     {
                      before(grammarAccess.getBooleanLiteralAccess().getFalseKeyword_1_0()); 
-                    match(input,14,FOLLOW_14_in_rule__BooleanLiteral__Alternatives_11788); 
+                    match(input,14,FOLLOW_2); 
                      after(grammarAccess.getBooleanLiteralAccess().getFalseKeyword_1_0()); 
 
                     }
@@ -2484,16 +2484,16 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:884:6: ( ( rule__BooleanLiteral__IsTrueAssignment_1_1 ) )
+                    // InternalETMap.g:884:6: ( ( rule__BooleanLiteral__IsTrueAssignment_1_1 ) )
                     {
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:884:6: ( ( rule__BooleanLiteral__IsTrueAssignment_1_1 ) )
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:885:1: ( rule__BooleanLiteral__IsTrueAssignment_1_1 )
+                    // InternalETMap.g:884:6: ( ( rule__BooleanLiteral__IsTrueAssignment_1_1 ) )
+                    // InternalETMap.g:885:1: ( rule__BooleanLiteral__IsTrueAssignment_1_1 )
                     {
                      before(grammarAccess.getBooleanLiteralAccess().getIsTrueAssignment_1_1()); 
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:886:1: ( rule__BooleanLiteral__IsTrueAssignment_1_1 )
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:886:2: rule__BooleanLiteral__IsTrueAssignment_1_1
+                    // InternalETMap.g:886:1: ( rule__BooleanLiteral__IsTrueAssignment_1_1 )
+                    // InternalETMap.g:886:2: rule__BooleanLiteral__IsTrueAssignment_1_1
                     {
-                    pushFollow(FOLLOW_rule__BooleanLiteral__IsTrueAssignment_1_1_in_rule__BooleanLiteral__Alternatives_11807);
+                    pushFollow(FOLLOW_2);
                     rule__BooleanLiteral__IsTrueAssignment_1_1();
 
                     state._fsp--;
@@ -2526,13 +2526,13 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NumberLiteral__Alternatives"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:895:1: rule__NumberLiteral__Alternatives : ( ( ruleIntLiteral ) | ( ruleRealLiteral ) );
+    // InternalETMap.g:895:1: rule__NumberLiteral__Alternatives : ( ( ruleIntLiteral ) | ( ruleRealLiteral ) );
     public final void rule__NumberLiteral__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:899:1: ( ( ruleIntLiteral ) | ( ruleRealLiteral ) )
+            // InternalETMap.g:899:1: ( ( ruleIntLiteral ) | ( ruleRealLiteral ) )
             int alt7=2;
             switch ( input.LA(1) ) {
             case 15:
@@ -2623,13 +2623,13 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
             switch (alt7) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:900:1: ( ruleIntLiteral )
+                    // InternalETMap.g:900:1: ( ruleIntLiteral )
                     {
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:900:1: ( ruleIntLiteral )
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:901:1: ruleIntLiteral
+                    // InternalETMap.g:900:1: ( ruleIntLiteral )
+                    // InternalETMap.g:901:1: ruleIntLiteral
                     {
                      before(grammarAccess.getNumberLiteralAccess().getIntLiteralParserRuleCall_0()); 
-                    pushFollow(FOLLOW_ruleIntLiteral_in_rule__NumberLiteral__Alternatives1840);
+                    pushFollow(FOLLOW_2);
                     ruleIntLiteral();
 
                     state._fsp--;
@@ -2642,13 +2642,13 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:906:6: ( ruleRealLiteral )
+                    // InternalETMap.g:906:6: ( ruleRealLiteral )
                     {
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:906:6: ( ruleRealLiteral )
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:907:1: ruleRealLiteral
+                    // InternalETMap.g:906:6: ( ruleRealLiteral )
+                    // InternalETMap.g:907:1: ruleRealLiteral
                     {
                      before(grammarAccess.getNumberLiteralAccess().getRealLiteralParserRuleCall_1()); 
-                    pushFollow(FOLLOW_ruleRealLiteral_in_rule__NumberLiteral__Alternatives1857);
+                    pushFollow(FOLLOW_2);
                     ruleRealLiteral();
 
                     state._fsp--;
@@ -2678,13 +2678,13 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Integer__Alternatives"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:917:1: rule__Integer__Alternatives : ( ( ( rule__Integer__Group_0__0 ) ) | ( RULE_HEX ) );
+    // InternalETMap.g:917:1: rule__Integer__Alternatives : ( ( ( rule__Integer__Group_0__0 ) ) | ( RULE_HEX ) );
     public final void rule__Integer__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:921:1: ( ( ( rule__Integer__Group_0__0 ) ) | ( RULE_HEX ) )
+            // InternalETMap.g:921:1: ( ( ( rule__Integer__Group_0__0 ) ) | ( RULE_HEX ) )
             int alt8=2;
             int LA8_0 = input.LA(1);
 
@@ -2702,16 +2702,16 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
             }
             switch (alt8) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:922:1: ( ( rule__Integer__Group_0__0 ) )
+                    // InternalETMap.g:922:1: ( ( rule__Integer__Group_0__0 ) )
                     {
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:922:1: ( ( rule__Integer__Group_0__0 ) )
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:923:1: ( rule__Integer__Group_0__0 )
+                    // InternalETMap.g:922:1: ( ( rule__Integer__Group_0__0 ) )
+                    // InternalETMap.g:923:1: ( rule__Integer__Group_0__0 )
                     {
                      before(grammarAccess.getIntegerAccess().getGroup_0()); 
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:924:1: ( rule__Integer__Group_0__0 )
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:924:2: rule__Integer__Group_0__0
+                    // InternalETMap.g:924:1: ( rule__Integer__Group_0__0 )
+                    // InternalETMap.g:924:2: rule__Integer__Group_0__0
                     {
-                    pushFollow(FOLLOW_rule__Integer__Group_0__0_in_rule__Integer__Alternatives1889);
+                    pushFollow(FOLLOW_2);
                     rule__Integer__Group_0__0();
 
                     state._fsp--;
@@ -2727,13 +2727,13 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:928:6: ( RULE_HEX )
+                    // InternalETMap.g:928:6: ( RULE_HEX )
                     {
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:928:6: ( RULE_HEX )
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:929:1: RULE_HEX
+                    // InternalETMap.g:928:6: ( RULE_HEX )
+                    // InternalETMap.g:929:1: RULE_HEX
                     {
                      before(grammarAccess.getIntegerAccess().getHEXTerminalRuleCall_1()); 
-                    match(input,RULE_HEX,FOLLOW_RULE_HEX_in_rule__Integer__Alternatives1907); 
+                    match(input,RULE_HEX,FOLLOW_2); 
                      after(grammarAccess.getIntegerAccess().getHEXTerminalRuleCall_1()); 
 
                     }
@@ -2759,13 +2759,13 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Integer__Alternatives_0_0"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:939:1: rule__Integer__Alternatives_0_0 : ( ( '+' ) | ( '-' ) );
+    // InternalETMap.g:939:1: rule__Integer__Alternatives_0_0 : ( ( '+' ) | ( '-' ) );
     public final void rule__Integer__Alternatives_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:943:1: ( ( '+' ) | ( '-' ) )
+            // InternalETMap.g:943:1: ( ( '+' ) | ( '-' ) )
             int alt9=2;
             int LA9_0 = input.LA(1);
 
@@ -2783,13 +2783,13 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
             }
             switch (alt9) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:944:1: ( '+' )
+                    // InternalETMap.g:944:1: ( '+' )
                     {
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:944:1: ( '+' )
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:945:1: '+'
+                    // InternalETMap.g:944:1: ( '+' )
+                    // InternalETMap.g:945:1: '+'
                     {
                      before(grammarAccess.getIntegerAccess().getPlusSignKeyword_0_0_0()); 
-                    match(input,15,FOLLOW_15_in_rule__Integer__Alternatives_0_01940); 
+                    match(input,15,FOLLOW_2); 
                      after(grammarAccess.getIntegerAccess().getPlusSignKeyword_0_0_0()); 
 
                     }
@@ -2798,13 +2798,13 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:952:6: ( '-' )
+                    // InternalETMap.g:952:6: ( '-' )
                     {
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:952:6: ( '-' )
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:953:1: '-'
+                    // InternalETMap.g:952:6: ( '-' )
+                    // InternalETMap.g:953:1: '-'
                     {
                      before(grammarAccess.getIntegerAccess().getHyphenMinusKeyword_0_0_1()); 
-                    match(input,16,FOLLOW_16_in_rule__Integer__Alternatives_0_01960); 
+                    match(input,16,FOLLOW_2); 
                      after(grammarAccess.getIntegerAccess().getHyphenMinusKeyword_0_0_1()); 
 
                     }
@@ -2830,13 +2830,13 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Real__Alternatives"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:965:1: rule__Real__Alternatives : ( ( ruleDecimal ) | ( ruleDecimalExp ) );
+    // InternalETMap.g:965:1: rule__Real__Alternatives : ( ( ruleDecimal ) | ( ruleDecimalExp ) );
     public final void rule__Real__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:969:1: ( ( ruleDecimal ) | ( ruleDecimalExp ) )
+            // InternalETMap.g:969:1: ( ( ruleDecimal ) | ( ruleDecimalExp ) )
             int alt10=2;
             switch ( input.LA(1) ) {
             case 15:
@@ -2982,13 +2982,13 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
             switch (alt10) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:970:1: ( ruleDecimal )
+                    // InternalETMap.g:970:1: ( ruleDecimal )
                     {
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:970:1: ( ruleDecimal )
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:971:1: ruleDecimal
+                    // InternalETMap.g:970:1: ( ruleDecimal )
+                    // InternalETMap.g:971:1: ruleDecimal
                     {
                      before(grammarAccess.getRealAccess().getDecimalParserRuleCall_0()); 
-                    pushFollow(FOLLOW_ruleDecimal_in_rule__Real__Alternatives1994);
+                    pushFollow(FOLLOW_2);
                     ruleDecimal();
 
                     state._fsp--;
@@ -3001,13 +3001,13 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:976:6: ( ruleDecimalExp )
+                    // InternalETMap.g:976:6: ( ruleDecimalExp )
                     {
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:976:6: ( ruleDecimalExp )
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:977:1: ruleDecimalExp
+                    // InternalETMap.g:976:6: ( ruleDecimalExp )
+                    // InternalETMap.g:977:1: ruleDecimalExp
                     {
                      before(grammarAccess.getRealAccess().getDecimalExpParserRuleCall_1()); 
-                    pushFollow(FOLLOW_ruleDecimalExp_in_rule__Real__Alternatives2011);
+                    pushFollow(FOLLOW_2);
                     ruleDecimalExp();
 
                     state._fsp--;
@@ -3037,13 +3037,13 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Decimal__Alternatives_0"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:987:1: rule__Decimal__Alternatives_0 : ( ( '+' ) | ( '-' ) );
+    // InternalETMap.g:987:1: rule__Decimal__Alternatives_0 : ( ( '+' ) | ( '-' ) );
     public final void rule__Decimal__Alternatives_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:991:1: ( ( '+' ) | ( '-' ) )
+            // InternalETMap.g:991:1: ( ( '+' ) | ( '-' ) )
             int alt11=2;
             int LA11_0 = input.LA(1);
 
@@ -3061,13 +3061,13 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
             }
             switch (alt11) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:992:1: ( '+' )
+                    // InternalETMap.g:992:1: ( '+' )
                     {
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:992:1: ( '+' )
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:993:1: '+'
+                    // InternalETMap.g:992:1: ( '+' )
+                    // InternalETMap.g:993:1: '+'
                     {
                      before(grammarAccess.getDecimalAccess().getPlusSignKeyword_0_0()); 
-                    match(input,15,FOLLOW_15_in_rule__Decimal__Alternatives_02044); 
+                    match(input,15,FOLLOW_2); 
                      after(grammarAccess.getDecimalAccess().getPlusSignKeyword_0_0()); 
 
                     }
@@ -3076,13 +3076,13 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1000:6: ( '-' )
+                    // InternalETMap.g:1000:6: ( '-' )
                     {
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1000:6: ( '-' )
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1001:1: '-'
+                    // InternalETMap.g:1000:6: ( '-' )
+                    // InternalETMap.g:1001:1: '-'
                     {
                      before(grammarAccess.getDecimalAccess().getHyphenMinusKeyword_0_1()); 
-                    match(input,16,FOLLOW_16_in_rule__Decimal__Alternatives_02064); 
+                    match(input,16,FOLLOW_2); 
                      after(grammarAccess.getDecimalAccess().getHyphenMinusKeyword_0_1()); 
 
                     }
@@ -3108,13 +3108,13 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Alternatives_0"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1013:1: rule__DecimalExp__Alternatives_0 : ( ( '+' ) | ( '-' ) );
+    // InternalETMap.g:1013:1: rule__DecimalExp__Alternatives_0 : ( ( '+' ) | ( '-' ) );
     public final void rule__DecimalExp__Alternatives_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1017:1: ( ( '+' ) | ( '-' ) )
+            // InternalETMap.g:1017:1: ( ( '+' ) | ( '-' ) )
             int alt12=2;
             int LA12_0 = input.LA(1);
 
@@ -3132,13 +3132,13 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
             }
             switch (alt12) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1018:1: ( '+' )
+                    // InternalETMap.g:1018:1: ( '+' )
                     {
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1018:1: ( '+' )
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1019:1: '+'
+                    // InternalETMap.g:1018:1: ( '+' )
+                    // InternalETMap.g:1019:1: '+'
                     {
                      before(grammarAccess.getDecimalExpAccess().getPlusSignKeyword_0_0()); 
-                    match(input,15,FOLLOW_15_in_rule__DecimalExp__Alternatives_02099); 
+                    match(input,15,FOLLOW_2); 
                      after(grammarAccess.getDecimalExpAccess().getPlusSignKeyword_0_0()); 
 
                     }
@@ -3147,13 +3147,13 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1026:6: ( '-' )
+                    // InternalETMap.g:1026:6: ( '-' )
                     {
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1026:6: ( '-' )
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1027:1: '-'
+                    // InternalETMap.g:1026:6: ( '-' )
+                    // InternalETMap.g:1027:1: '-'
                     {
                      before(grammarAccess.getDecimalExpAccess().getHyphenMinusKeyword_0_1()); 
-                    match(input,16,FOLLOW_16_in_rule__DecimalExp__Alternatives_02119); 
+                    match(input,16,FOLLOW_2); 
                      after(grammarAccess.getDecimalExpAccess().getHyphenMinusKeyword_0_1()); 
 
                     }
@@ -3179,13 +3179,13 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Alternatives_4"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1039:1: rule__DecimalExp__Alternatives_4 : ( ( 'e' ) | ( 'E' ) );
+    // InternalETMap.g:1039:1: rule__DecimalExp__Alternatives_4 : ( ( 'e' ) | ( 'E' ) );
     public final void rule__DecimalExp__Alternatives_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1043:1: ( ( 'e' ) | ( 'E' ) )
+            // InternalETMap.g:1043:1: ( ( 'e' ) | ( 'E' ) )
             int alt13=2;
             int LA13_0 = input.LA(1);
 
@@ -3203,13 +3203,13 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
             }
             switch (alt13) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1044:1: ( 'e' )
+                    // InternalETMap.g:1044:1: ( 'e' )
                     {
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1044:1: ( 'e' )
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1045:1: 'e'
+                    // InternalETMap.g:1044:1: ( 'e' )
+                    // InternalETMap.g:1045:1: 'e'
                     {
                      before(grammarAccess.getDecimalExpAccess().getEKeyword_4_0()); 
-                    match(input,17,FOLLOW_17_in_rule__DecimalExp__Alternatives_42154); 
+                    match(input,17,FOLLOW_2); 
                      after(grammarAccess.getDecimalExpAccess().getEKeyword_4_0()); 
 
                     }
@@ -3218,13 +3218,13 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1052:6: ( 'E' )
+                    // InternalETMap.g:1052:6: ( 'E' )
                     {
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1052:6: ( 'E' )
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1053:1: 'E'
+                    // InternalETMap.g:1052:6: ( 'E' )
+                    // InternalETMap.g:1053:1: 'E'
                     {
                      before(grammarAccess.getDecimalExpAccess().getEKeyword_4_1()); 
-                    match(input,18,FOLLOW_18_in_rule__DecimalExp__Alternatives_42174); 
+                    match(input,18,FOLLOW_2); 
                      after(grammarAccess.getDecimalExpAccess().getEKeyword_4_1()); 
 
                     }
@@ -3250,13 +3250,13 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Alternatives_5"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1065:1: rule__DecimalExp__Alternatives_5 : ( ( '+' ) | ( '-' ) );
+    // InternalETMap.g:1065:1: rule__DecimalExp__Alternatives_5 : ( ( '+' ) | ( '-' ) );
     public final void rule__DecimalExp__Alternatives_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1069:1: ( ( '+' ) | ( '-' ) )
+            // InternalETMap.g:1069:1: ( ( '+' ) | ( '-' ) )
             int alt14=2;
             int LA14_0 = input.LA(1);
 
@@ -3274,13 +3274,13 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
             }
             switch (alt14) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1070:1: ( '+' )
+                    // InternalETMap.g:1070:1: ( '+' )
                     {
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1070:1: ( '+' )
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1071:1: '+'
+                    // InternalETMap.g:1070:1: ( '+' )
+                    // InternalETMap.g:1071:1: '+'
                     {
                      before(grammarAccess.getDecimalExpAccess().getPlusSignKeyword_5_0()); 
-                    match(input,15,FOLLOW_15_in_rule__DecimalExp__Alternatives_52209); 
+                    match(input,15,FOLLOW_2); 
                      after(grammarAccess.getDecimalExpAccess().getPlusSignKeyword_5_0()); 
 
                     }
@@ -3289,13 +3289,13 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1078:6: ( '-' )
+                    // InternalETMap.g:1078:6: ( '-' )
                     {
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1078:6: ( '-' )
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1079:1: '-'
+                    // InternalETMap.g:1078:6: ( '-' )
+                    // InternalETMap.g:1079:1: '-'
                     {
                      before(grammarAccess.getDecimalExpAccess().getHyphenMinusKeyword_5_1()); 
-                    match(input,16,FOLLOW_16_in_rule__DecimalExp__Alternatives_52229); 
+                    match(input,16,FOLLOW_2); 
                      after(grammarAccess.getDecimalExpAccess().getHyphenMinusKeyword_5_1()); 
 
                     }
@@ -3321,13 +3321,13 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__LiteralType__Alternatives"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1091:1: rule__LiteralType__Alternatives : ( ( ( 'ptBoolean' ) ) | ( ( 'ptInteger' ) ) | ( ( 'ptReal' ) ) | ( ( 'ptCharacter' ) ) );
+    // InternalETMap.g:1091:1: rule__LiteralType__Alternatives : ( ( ( 'ptBoolean' ) ) | ( ( 'ptInteger' ) ) | ( ( 'ptReal' ) ) | ( ( 'ptCharacter' ) ) );
     public final void rule__LiteralType__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1095:1: ( ( ( 'ptBoolean' ) ) | ( ( 'ptInteger' ) ) | ( ( 'ptReal' ) ) | ( ( 'ptCharacter' ) ) )
+            // InternalETMap.g:1095:1: ( ( ( 'ptBoolean' ) ) | ( ( 'ptInteger' ) ) | ( ( 'ptReal' ) ) | ( ( 'ptCharacter' ) ) )
             int alt15=4;
             switch ( input.LA(1) ) {
             case 19:
@@ -3359,16 +3359,16 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
             switch (alt15) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1096:1: ( ( 'ptBoolean' ) )
+                    // InternalETMap.g:1096:1: ( ( 'ptBoolean' ) )
                     {
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1096:1: ( ( 'ptBoolean' ) )
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1097:1: ( 'ptBoolean' )
+                    // InternalETMap.g:1096:1: ( ( 'ptBoolean' ) )
+                    // InternalETMap.g:1097:1: ( 'ptBoolean' )
                     {
                      before(grammarAccess.getLiteralTypeAccess().getBOOLEnumLiteralDeclaration_0()); 
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1098:1: ( 'ptBoolean' )
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1098:3: 'ptBoolean'
+                    // InternalETMap.g:1098:1: ( 'ptBoolean' )
+                    // InternalETMap.g:1098:3: 'ptBoolean'
                     {
-                    match(input,19,FOLLOW_19_in_rule__LiteralType__Alternatives2264); 
+                    match(input,19,FOLLOW_2); 
 
                     }
 
@@ -3380,16 +3380,16 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1103:6: ( ( 'ptInteger' ) )
+                    // InternalETMap.g:1103:6: ( ( 'ptInteger' ) )
                     {
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1103:6: ( ( 'ptInteger' ) )
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1104:1: ( 'ptInteger' )
+                    // InternalETMap.g:1103:6: ( ( 'ptInteger' ) )
+                    // InternalETMap.g:1104:1: ( 'ptInteger' )
                     {
                      before(grammarAccess.getLiteralTypeAccess().getINTEnumLiteralDeclaration_1()); 
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1105:1: ( 'ptInteger' )
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1105:3: 'ptInteger'
+                    // InternalETMap.g:1105:1: ( 'ptInteger' )
+                    // InternalETMap.g:1105:3: 'ptInteger'
                     {
-                    match(input,20,FOLLOW_20_in_rule__LiteralType__Alternatives2285); 
+                    match(input,20,FOLLOW_2); 
 
                     }
 
@@ -3401,16 +3401,16 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1110:6: ( ( 'ptReal' ) )
+                    // InternalETMap.g:1110:6: ( ( 'ptReal' ) )
                     {
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1110:6: ( ( 'ptReal' ) )
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1111:1: ( 'ptReal' )
+                    // InternalETMap.g:1110:6: ( ( 'ptReal' ) )
+                    // InternalETMap.g:1111:1: ( 'ptReal' )
                     {
                      before(grammarAccess.getLiteralTypeAccess().getREALEnumLiteralDeclaration_2()); 
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1112:1: ( 'ptReal' )
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1112:3: 'ptReal'
+                    // InternalETMap.g:1112:1: ( 'ptReal' )
+                    // InternalETMap.g:1112:3: 'ptReal'
                     {
-                    match(input,21,FOLLOW_21_in_rule__LiteralType__Alternatives2306); 
+                    match(input,21,FOLLOW_2); 
 
                     }
 
@@ -3422,16 +3422,16 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 4 :
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1117:6: ( ( 'ptCharacter' ) )
+                    // InternalETMap.g:1117:6: ( ( 'ptCharacter' ) )
                     {
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1117:6: ( ( 'ptCharacter' ) )
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1118:1: ( 'ptCharacter' )
+                    // InternalETMap.g:1117:6: ( ( 'ptCharacter' ) )
+                    // InternalETMap.g:1118:1: ( 'ptCharacter' )
                     {
                      before(grammarAccess.getLiteralTypeAccess().getCHAREnumLiteralDeclaration_3()); 
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1119:1: ( 'ptCharacter' )
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1119:3: 'ptCharacter'
+                    // InternalETMap.g:1119:1: ( 'ptCharacter' )
+                    // InternalETMap.g:1119:3: 'ptCharacter'
                     {
-                    match(input,22,FOLLOW_22_in_rule__LiteralType__Alternatives2327); 
+                    match(input,22,FOLLOW_2); 
 
                     }
 
@@ -3460,21 +3460,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MappingModel__Group__0"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1131:1: rule__MappingModel__Group__0 : rule__MappingModel__Group__0__Impl rule__MappingModel__Group__1 ;
+    // InternalETMap.g:1131:1: rule__MappingModel__Group__0 : rule__MappingModel__Group__0__Impl rule__MappingModel__Group__1 ;
     public final void rule__MappingModel__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1135:1: ( rule__MappingModel__Group__0__Impl rule__MappingModel__Group__1 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1136:2: rule__MappingModel__Group__0__Impl rule__MappingModel__Group__1
+            // InternalETMap.g:1135:1: ( rule__MappingModel__Group__0__Impl rule__MappingModel__Group__1 )
+            // InternalETMap.g:1136:2: rule__MappingModel__Group__0__Impl rule__MappingModel__Group__1
             {
-            pushFollow(FOLLOW_rule__MappingModel__Group__0__Impl_in_rule__MappingModel__Group__02360);
+            pushFollow(FOLLOW_3);
             rule__MappingModel__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__MappingModel__Group__1_in_rule__MappingModel__Group__02363);
+            pushFollow(FOLLOW_2);
             rule__MappingModel__Group__1();
 
             state._fsp--;
@@ -3498,20 +3498,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MappingModel__Group__0__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1143:1: rule__MappingModel__Group__0__Impl : ( 'MappingModel' ) ;
+    // InternalETMap.g:1143:1: rule__MappingModel__Group__0__Impl : ( 'MappingModel' ) ;
     public final void rule__MappingModel__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1147:1: ( ( 'MappingModel' ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1148:1: ( 'MappingModel' )
+            // InternalETMap.g:1147:1: ( ( 'MappingModel' ) )
+            // InternalETMap.g:1148:1: ( 'MappingModel' )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1148:1: ( 'MappingModel' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1149:1: 'MappingModel'
+            // InternalETMap.g:1148:1: ( 'MappingModel' )
+            // InternalETMap.g:1149:1: 'MappingModel'
             {
              before(grammarAccess.getMappingModelAccess().getMappingModelKeyword_0()); 
-            match(input,23,FOLLOW_23_in_rule__MappingModel__Group__0__Impl2391); 
+            match(input,23,FOLLOW_2); 
              after(grammarAccess.getMappingModelAccess().getMappingModelKeyword_0()); 
 
             }
@@ -3535,21 +3535,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MappingModel__Group__1"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1162:1: rule__MappingModel__Group__1 : rule__MappingModel__Group__1__Impl rule__MappingModel__Group__2 ;
+    // InternalETMap.g:1162:1: rule__MappingModel__Group__1 : rule__MappingModel__Group__1__Impl rule__MappingModel__Group__2 ;
     public final void rule__MappingModel__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1166:1: ( rule__MappingModel__Group__1__Impl rule__MappingModel__Group__2 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1167:2: rule__MappingModel__Group__1__Impl rule__MappingModel__Group__2
+            // InternalETMap.g:1166:1: ( rule__MappingModel__Group__1__Impl rule__MappingModel__Group__2 )
+            // InternalETMap.g:1167:2: rule__MappingModel__Group__1__Impl rule__MappingModel__Group__2
             {
-            pushFollow(FOLLOW_rule__MappingModel__Group__1__Impl_in_rule__MappingModel__Group__12422);
+            pushFollow(FOLLOW_4);
             rule__MappingModel__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__MappingModel__Group__2_in_rule__MappingModel__Group__12425);
+            pushFollow(FOLLOW_2);
             rule__MappingModel__Group__2();
 
             state._fsp--;
@@ -3573,23 +3573,23 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MappingModel__Group__1__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1174:1: rule__MappingModel__Group__1__Impl : ( ( rule__MappingModel__NameAssignment_1 ) ) ;
+    // InternalETMap.g:1174:1: rule__MappingModel__Group__1__Impl : ( ( rule__MappingModel__NameAssignment_1 ) ) ;
     public final void rule__MappingModel__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1178:1: ( ( ( rule__MappingModel__NameAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1179:1: ( ( rule__MappingModel__NameAssignment_1 ) )
+            // InternalETMap.g:1178:1: ( ( ( rule__MappingModel__NameAssignment_1 ) ) )
+            // InternalETMap.g:1179:1: ( ( rule__MappingModel__NameAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1179:1: ( ( rule__MappingModel__NameAssignment_1 ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1180:1: ( rule__MappingModel__NameAssignment_1 )
+            // InternalETMap.g:1179:1: ( ( rule__MappingModel__NameAssignment_1 ) )
+            // InternalETMap.g:1180:1: ( rule__MappingModel__NameAssignment_1 )
             {
              before(grammarAccess.getMappingModelAccess().getNameAssignment_1()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1181:1: ( rule__MappingModel__NameAssignment_1 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1181:2: rule__MappingModel__NameAssignment_1
+            // InternalETMap.g:1181:1: ( rule__MappingModel__NameAssignment_1 )
+            // InternalETMap.g:1181:2: rule__MappingModel__NameAssignment_1
             {
-            pushFollow(FOLLOW_rule__MappingModel__NameAssignment_1_in_rule__MappingModel__Group__1__Impl2452);
+            pushFollow(FOLLOW_2);
             rule__MappingModel__NameAssignment_1();
 
             state._fsp--;
@@ -3620,21 +3620,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MappingModel__Group__2"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1191:1: rule__MappingModel__Group__2 : rule__MappingModel__Group__2__Impl rule__MappingModel__Group__3 ;
+    // InternalETMap.g:1191:1: rule__MappingModel__Group__2 : rule__MappingModel__Group__2__Impl rule__MappingModel__Group__3 ;
     public final void rule__MappingModel__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1195:1: ( rule__MappingModel__Group__2__Impl rule__MappingModel__Group__3 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1196:2: rule__MappingModel__Group__2__Impl rule__MappingModel__Group__3
+            // InternalETMap.g:1195:1: ( rule__MappingModel__Group__2__Impl rule__MappingModel__Group__3 )
+            // InternalETMap.g:1196:2: rule__MappingModel__Group__2__Impl rule__MappingModel__Group__3
             {
-            pushFollow(FOLLOW_rule__MappingModel__Group__2__Impl_in_rule__MappingModel__Group__22482);
+            pushFollow(FOLLOW_5);
             rule__MappingModel__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__MappingModel__Group__3_in_rule__MappingModel__Group__22485);
+            pushFollow(FOLLOW_2);
             rule__MappingModel__Group__3();
 
             state._fsp--;
@@ -3658,20 +3658,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MappingModel__Group__2__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1203:1: rule__MappingModel__Group__2__Impl : ( '{' ) ;
+    // InternalETMap.g:1203:1: rule__MappingModel__Group__2__Impl : ( '{' ) ;
     public final void rule__MappingModel__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1207:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1208:1: ( '{' )
+            // InternalETMap.g:1207:1: ( ( '{' ) )
+            // InternalETMap.g:1208:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1208:1: ( '{' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1209:1: '{'
+            // InternalETMap.g:1208:1: ( '{' )
+            // InternalETMap.g:1209:1: '{'
             {
              before(grammarAccess.getMappingModelAccess().getLeftCurlyBracketKeyword_2()); 
-            match(input,24,FOLLOW_24_in_rule__MappingModel__Group__2__Impl2513); 
+            match(input,24,FOLLOW_2); 
              after(grammarAccess.getMappingModelAccess().getLeftCurlyBracketKeyword_2()); 
 
             }
@@ -3695,21 +3695,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MappingModel__Group__3"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1222:1: rule__MappingModel__Group__3 : rule__MappingModel__Group__3__Impl rule__MappingModel__Group__4 ;
+    // InternalETMap.g:1222:1: rule__MappingModel__Group__3 : rule__MappingModel__Group__3__Impl rule__MappingModel__Group__4 ;
     public final void rule__MappingModel__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1226:1: ( rule__MappingModel__Group__3__Impl rule__MappingModel__Group__4 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1227:2: rule__MappingModel__Group__3__Impl rule__MappingModel__Group__4
+            // InternalETMap.g:1226:1: ( rule__MappingModel__Group__3__Impl rule__MappingModel__Group__4 )
+            // InternalETMap.g:1227:2: rule__MappingModel__Group__3__Impl rule__MappingModel__Group__4
             {
-            pushFollow(FOLLOW_rule__MappingModel__Group__3__Impl_in_rule__MappingModel__Group__32544);
+            pushFollow(FOLLOW_5);
             rule__MappingModel__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__MappingModel__Group__4_in_rule__MappingModel__Group__32547);
+            pushFollow(FOLLOW_2);
             rule__MappingModel__Group__4();
 
             state._fsp--;
@@ -3733,20 +3733,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MappingModel__Group__3__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1234:1: rule__MappingModel__Group__3__Impl : ( ( rule__MappingModel__ImportsAssignment_3 )* ) ;
+    // InternalETMap.g:1234:1: rule__MappingModel__Group__3__Impl : ( ( rule__MappingModel__ImportsAssignment_3 )* ) ;
     public final void rule__MappingModel__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1238:1: ( ( ( rule__MappingModel__ImportsAssignment_3 )* ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1239:1: ( ( rule__MappingModel__ImportsAssignment_3 )* )
+            // InternalETMap.g:1238:1: ( ( ( rule__MappingModel__ImportsAssignment_3 )* ) )
+            // InternalETMap.g:1239:1: ( ( rule__MappingModel__ImportsAssignment_3 )* )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1239:1: ( ( rule__MappingModel__ImportsAssignment_3 )* )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1240:1: ( rule__MappingModel__ImportsAssignment_3 )*
+            // InternalETMap.g:1239:1: ( ( rule__MappingModel__ImportsAssignment_3 )* )
+            // InternalETMap.g:1240:1: ( rule__MappingModel__ImportsAssignment_3 )*
             {
              before(grammarAccess.getMappingModelAccess().getImportsAssignment_3()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1241:1: ( rule__MappingModel__ImportsAssignment_3 )*
+            // InternalETMap.g:1241:1: ( rule__MappingModel__ImportsAssignment_3 )*
             loop16:
             do {
                 int alt16=2;
@@ -3759,9 +3759,9 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
                 switch (alt16) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1241:2: rule__MappingModel__ImportsAssignment_3
+            	    // InternalETMap.g:1241:2: rule__MappingModel__ImportsAssignment_3
             	    {
-            	    pushFollow(FOLLOW_rule__MappingModel__ImportsAssignment_3_in_rule__MappingModel__Group__3__Impl2574);
+            	    pushFollow(FOLLOW_6);
             	    rule__MappingModel__ImportsAssignment_3();
 
             	    state._fsp--;
@@ -3798,21 +3798,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MappingModel__Group__4"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1251:1: rule__MappingModel__Group__4 : rule__MappingModel__Group__4__Impl rule__MappingModel__Group__5 ;
+    // InternalETMap.g:1251:1: rule__MappingModel__Group__4 : rule__MappingModel__Group__4__Impl rule__MappingModel__Group__5 ;
     public final void rule__MappingModel__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1255:1: ( rule__MappingModel__Group__4__Impl rule__MappingModel__Group__5 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1256:2: rule__MappingModel__Group__4__Impl rule__MappingModel__Group__5
+            // InternalETMap.g:1255:1: ( rule__MappingModel__Group__4__Impl rule__MappingModel__Group__5 )
+            // InternalETMap.g:1256:2: rule__MappingModel__Group__4__Impl rule__MappingModel__Group__5
             {
-            pushFollow(FOLLOW_rule__MappingModel__Group__4__Impl_in_rule__MappingModel__Group__42605);
+            pushFollow(FOLLOW_5);
             rule__MappingModel__Group__4__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__MappingModel__Group__5_in_rule__MappingModel__Group__42608);
+            pushFollow(FOLLOW_2);
             rule__MappingModel__Group__5();
 
             state._fsp--;
@@ -3836,20 +3836,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MappingModel__Group__4__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1263:1: rule__MappingModel__Group__4__Impl : ( ( rule__MappingModel__MappingsAssignment_4 )* ) ;
+    // InternalETMap.g:1263:1: rule__MappingModel__Group__4__Impl : ( ( rule__MappingModel__MappingsAssignment_4 )* ) ;
     public final void rule__MappingModel__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1267:1: ( ( ( rule__MappingModel__MappingsAssignment_4 )* ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1268:1: ( ( rule__MappingModel__MappingsAssignment_4 )* )
+            // InternalETMap.g:1267:1: ( ( ( rule__MappingModel__MappingsAssignment_4 )* ) )
+            // InternalETMap.g:1268:1: ( ( rule__MappingModel__MappingsAssignment_4 )* )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1268:1: ( ( rule__MappingModel__MappingsAssignment_4 )* )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1269:1: ( rule__MappingModel__MappingsAssignment_4 )*
+            // InternalETMap.g:1268:1: ( ( rule__MappingModel__MappingsAssignment_4 )* )
+            // InternalETMap.g:1269:1: ( rule__MappingModel__MappingsAssignment_4 )*
             {
              before(grammarAccess.getMappingModelAccess().getMappingsAssignment_4()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1270:1: ( rule__MappingModel__MappingsAssignment_4 )*
+            // InternalETMap.g:1270:1: ( rule__MappingModel__MappingsAssignment_4 )*
             loop17:
             do {
                 int alt17=2;
@@ -3862,9 +3862,9 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
                 switch (alt17) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1270:2: rule__MappingModel__MappingsAssignment_4
+            	    // InternalETMap.g:1270:2: rule__MappingModel__MappingsAssignment_4
             	    {
-            	    pushFollow(FOLLOW_rule__MappingModel__MappingsAssignment_4_in_rule__MappingModel__Group__4__Impl2635);
+            	    pushFollow(FOLLOW_7);
             	    rule__MappingModel__MappingsAssignment_4();
 
             	    state._fsp--;
@@ -3901,16 +3901,16 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MappingModel__Group__5"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1280:1: rule__MappingModel__Group__5 : rule__MappingModel__Group__5__Impl ;
+    // InternalETMap.g:1280:1: rule__MappingModel__Group__5 : rule__MappingModel__Group__5__Impl ;
     public final void rule__MappingModel__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1284:1: ( rule__MappingModel__Group__5__Impl )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1285:2: rule__MappingModel__Group__5__Impl
+            // InternalETMap.g:1284:1: ( rule__MappingModel__Group__5__Impl )
+            // InternalETMap.g:1285:2: rule__MappingModel__Group__5__Impl
             {
-            pushFollow(FOLLOW_rule__MappingModel__Group__5__Impl_in_rule__MappingModel__Group__52666);
+            pushFollow(FOLLOW_2);
             rule__MappingModel__Group__5__Impl();
 
             state._fsp--;
@@ -3934,20 +3934,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MappingModel__Group__5__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1291:1: rule__MappingModel__Group__5__Impl : ( '}' ) ;
+    // InternalETMap.g:1291:1: rule__MappingModel__Group__5__Impl : ( '}' ) ;
     public final void rule__MappingModel__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1295:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1296:1: ( '}' )
+            // InternalETMap.g:1295:1: ( ( '}' ) )
+            // InternalETMap.g:1296:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1296:1: ( '}' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1297:1: '}'
+            // InternalETMap.g:1296:1: ( '}' )
+            // InternalETMap.g:1297:1: '}'
             {
              before(grammarAccess.getMappingModelAccess().getRightCurlyBracketKeyword_5()); 
-            match(input,25,FOLLOW_25_in_rule__MappingModel__Group__5__Impl2694); 
+            match(input,25,FOLLOW_2); 
              after(grammarAccess.getMappingModelAccess().getRightCurlyBracketKeyword_5()); 
 
             }
@@ -3971,21 +3971,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Mapping__Group__0"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1322:1: rule__Mapping__Group__0 : rule__Mapping__Group__0__Impl rule__Mapping__Group__1 ;
+    // InternalETMap.g:1322:1: rule__Mapping__Group__0 : rule__Mapping__Group__0__Impl rule__Mapping__Group__1 ;
     public final void rule__Mapping__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1326:1: ( rule__Mapping__Group__0__Impl rule__Mapping__Group__1 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1327:2: rule__Mapping__Group__0__Impl rule__Mapping__Group__1
+            // InternalETMap.g:1326:1: ( rule__Mapping__Group__0__Impl rule__Mapping__Group__1 )
+            // InternalETMap.g:1327:2: rule__Mapping__Group__0__Impl rule__Mapping__Group__1
             {
-            pushFollow(FOLLOW_rule__Mapping__Group__0__Impl_in_rule__Mapping__Group__02737);
+            pushFollow(FOLLOW_3);
             rule__Mapping__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Mapping__Group__1_in_rule__Mapping__Group__02740);
+            pushFollow(FOLLOW_2);
             rule__Mapping__Group__1();
 
             state._fsp--;
@@ -4009,20 +4009,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Mapping__Group__0__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1334:1: rule__Mapping__Group__0__Impl : ( 'Mapping' ) ;
+    // InternalETMap.g:1334:1: rule__Mapping__Group__0__Impl : ( 'Mapping' ) ;
     public final void rule__Mapping__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1338:1: ( ( 'Mapping' ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1339:1: ( 'Mapping' )
+            // InternalETMap.g:1338:1: ( ( 'Mapping' ) )
+            // InternalETMap.g:1339:1: ( 'Mapping' )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1339:1: ( 'Mapping' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1340:1: 'Mapping'
+            // InternalETMap.g:1339:1: ( 'Mapping' )
+            // InternalETMap.g:1340:1: 'Mapping'
             {
              before(grammarAccess.getMappingAccess().getMappingKeyword_0()); 
-            match(input,26,FOLLOW_26_in_rule__Mapping__Group__0__Impl2768); 
+            match(input,26,FOLLOW_2); 
              after(grammarAccess.getMappingAccess().getMappingKeyword_0()); 
 
             }
@@ -4046,21 +4046,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Mapping__Group__1"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1353:1: rule__Mapping__Group__1 : rule__Mapping__Group__1__Impl rule__Mapping__Group__2 ;
+    // InternalETMap.g:1353:1: rule__Mapping__Group__1 : rule__Mapping__Group__1__Impl rule__Mapping__Group__2 ;
     public final void rule__Mapping__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1357:1: ( rule__Mapping__Group__1__Impl rule__Mapping__Group__2 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1358:2: rule__Mapping__Group__1__Impl rule__Mapping__Group__2
+            // InternalETMap.g:1357:1: ( rule__Mapping__Group__1__Impl rule__Mapping__Group__2 )
+            // InternalETMap.g:1358:2: rule__Mapping__Group__1__Impl rule__Mapping__Group__2
             {
-            pushFollow(FOLLOW_rule__Mapping__Group__1__Impl_in_rule__Mapping__Group__12799);
+            pushFollow(FOLLOW_8);
             rule__Mapping__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Mapping__Group__2_in_rule__Mapping__Group__12802);
+            pushFollow(FOLLOW_2);
             rule__Mapping__Group__2();
 
             state._fsp--;
@@ -4084,23 +4084,23 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Mapping__Group__1__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1365:1: rule__Mapping__Group__1__Impl : ( ( rule__Mapping__LogicalSysAssignment_1 ) ) ;
+    // InternalETMap.g:1365:1: rule__Mapping__Group__1__Impl : ( ( rule__Mapping__LogicalSysAssignment_1 ) ) ;
     public final void rule__Mapping__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1369:1: ( ( ( rule__Mapping__LogicalSysAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1370:1: ( ( rule__Mapping__LogicalSysAssignment_1 ) )
+            // InternalETMap.g:1369:1: ( ( ( rule__Mapping__LogicalSysAssignment_1 ) ) )
+            // InternalETMap.g:1370:1: ( ( rule__Mapping__LogicalSysAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1370:1: ( ( rule__Mapping__LogicalSysAssignment_1 ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1371:1: ( rule__Mapping__LogicalSysAssignment_1 )
+            // InternalETMap.g:1370:1: ( ( rule__Mapping__LogicalSysAssignment_1 ) )
+            // InternalETMap.g:1371:1: ( rule__Mapping__LogicalSysAssignment_1 )
             {
              before(grammarAccess.getMappingAccess().getLogicalSysAssignment_1()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1372:1: ( rule__Mapping__LogicalSysAssignment_1 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1372:2: rule__Mapping__LogicalSysAssignment_1
+            // InternalETMap.g:1372:1: ( rule__Mapping__LogicalSysAssignment_1 )
+            // InternalETMap.g:1372:2: rule__Mapping__LogicalSysAssignment_1
             {
-            pushFollow(FOLLOW_rule__Mapping__LogicalSysAssignment_1_in_rule__Mapping__Group__1__Impl2829);
+            pushFollow(FOLLOW_2);
             rule__Mapping__LogicalSysAssignment_1();
 
             state._fsp--;
@@ -4131,21 +4131,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Mapping__Group__2"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1382:1: rule__Mapping__Group__2 : rule__Mapping__Group__2__Impl rule__Mapping__Group__3 ;
+    // InternalETMap.g:1382:1: rule__Mapping__Group__2 : rule__Mapping__Group__2__Impl rule__Mapping__Group__3 ;
     public final void rule__Mapping__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1386:1: ( rule__Mapping__Group__2__Impl rule__Mapping__Group__3 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1387:2: rule__Mapping__Group__2__Impl rule__Mapping__Group__3
+            // InternalETMap.g:1386:1: ( rule__Mapping__Group__2__Impl rule__Mapping__Group__3 )
+            // InternalETMap.g:1387:2: rule__Mapping__Group__2__Impl rule__Mapping__Group__3
             {
-            pushFollow(FOLLOW_rule__Mapping__Group__2__Impl_in_rule__Mapping__Group__22859);
+            pushFollow(FOLLOW_3);
             rule__Mapping__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Mapping__Group__3_in_rule__Mapping__Group__22862);
+            pushFollow(FOLLOW_2);
             rule__Mapping__Group__3();
 
             state._fsp--;
@@ -4169,20 +4169,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Mapping__Group__2__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1394:1: rule__Mapping__Group__2__Impl : ( '->' ) ;
+    // InternalETMap.g:1394:1: rule__Mapping__Group__2__Impl : ( '->' ) ;
     public final void rule__Mapping__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1398:1: ( ( '->' ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1399:1: ( '->' )
+            // InternalETMap.g:1398:1: ( ( '->' ) )
+            // InternalETMap.g:1399:1: ( '->' )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1399:1: ( '->' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1400:1: '->'
+            // InternalETMap.g:1399:1: ( '->' )
+            // InternalETMap.g:1400:1: '->'
             {
              before(grammarAccess.getMappingAccess().getHyphenMinusGreaterThanSignKeyword_2()); 
-            match(input,27,FOLLOW_27_in_rule__Mapping__Group__2__Impl2890); 
+            match(input,27,FOLLOW_2); 
              after(grammarAccess.getMappingAccess().getHyphenMinusGreaterThanSignKeyword_2()); 
 
             }
@@ -4206,21 +4206,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Mapping__Group__3"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1413:1: rule__Mapping__Group__3 : rule__Mapping__Group__3__Impl rule__Mapping__Group__4 ;
+    // InternalETMap.g:1413:1: rule__Mapping__Group__3 : rule__Mapping__Group__3__Impl rule__Mapping__Group__4 ;
     public final void rule__Mapping__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1417:1: ( rule__Mapping__Group__3__Impl rule__Mapping__Group__4 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1418:2: rule__Mapping__Group__3__Impl rule__Mapping__Group__4
+            // InternalETMap.g:1417:1: ( rule__Mapping__Group__3__Impl rule__Mapping__Group__4 )
+            // InternalETMap.g:1418:2: rule__Mapping__Group__3__Impl rule__Mapping__Group__4
             {
-            pushFollow(FOLLOW_rule__Mapping__Group__3__Impl_in_rule__Mapping__Group__32921);
+            pushFollow(FOLLOW_4);
             rule__Mapping__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Mapping__Group__4_in_rule__Mapping__Group__32924);
+            pushFollow(FOLLOW_2);
             rule__Mapping__Group__4();
 
             state._fsp--;
@@ -4244,23 +4244,23 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Mapping__Group__3__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1425:1: rule__Mapping__Group__3__Impl : ( ( rule__Mapping__PhysicalSysAssignment_3 ) ) ;
+    // InternalETMap.g:1425:1: rule__Mapping__Group__3__Impl : ( ( rule__Mapping__PhysicalSysAssignment_3 ) ) ;
     public final void rule__Mapping__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1429:1: ( ( ( rule__Mapping__PhysicalSysAssignment_3 ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1430:1: ( ( rule__Mapping__PhysicalSysAssignment_3 ) )
+            // InternalETMap.g:1429:1: ( ( ( rule__Mapping__PhysicalSysAssignment_3 ) ) )
+            // InternalETMap.g:1430:1: ( ( rule__Mapping__PhysicalSysAssignment_3 ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1430:1: ( ( rule__Mapping__PhysicalSysAssignment_3 ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1431:1: ( rule__Mapping__PhysicalSysAssignment_3 )
+            // InternalETMap.g:1430:1: ( ( rule__Mapping__PhysicalSysAssignment_3 ) )
+            // InternalETMap.g:1431:1: ( rule__Mapping__PhysicalSysAssignment_3 )
             {
              before(grammarAccess.getMappingAccess().getPhysicalSysAssignment_3()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1432:1: ( rule__Mapping__PhysicalSysAssignment_3 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1432:2: rule__Mapping__PhysicalSysAssignment_3
+            // InternalETMap.g:1432:1: ( rule__Mapping__PhysicalSysAssignment_3 )
+            // InternalETMap.g:1432:2: rule__Mapping__PhysicalSysAssignment_3
             {
-            pushFollow(FOLLOW_rule__Mapping__PhysicalSysAssignment_3_in_rule__Mapping__Group__3__Impl2951);
+            pushFollow(FOLLOW_2);
             rule__Mapping__PhysicalSysAssignment_3();
 
             state._fsp--;
@@ -4291,21 +4291,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Mapping__Group__4"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1442:1: rule__Mapping__Group__4 : rule__Mapping__Group__4__Impl rule__Mapping__Group__5 ;
+    // InternalETMap.g:1442:1: rule__Mapping__Group__4 : rule__Mapping__Group__4__Impl rule__Mapping__Group__5 ;
     public final void rule__Mapping__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1446:1: ( rule__Mapping__Group__4__Impl rule__Mapping__Group__5 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1447:2: rule__Mapping__Group__4__Impl rule__Mapping__Group__5
+            // InternalETMap.g:1446:1: ( rule__Mapping__Group__4__Impl rule__Mapping__Group__5 )
+            // InternalETMap.g:1447:2: rule__Mapping__Group__4__Impl rule__Mapping__Group__5
             {
-            pushFollow(FOLLOW_rule__Mapping__Group__4__Impl_in_rule__Mapping__Group__42981);
+            pushFollow(FOLLOW_9);
             rule__Mapping__Group__4__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Mapping__Group__5_in_rule__Mapping__Group__42984);
+            pushFollow(FOLLOW_2);
             rule__Mapping__Group__5();
 
             state._fsp--;
@@ -4329,20 +4329,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Mapping__Group__4__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1454:1: rule__Mapping__Group__4__Impl : ( '{' ) ;
+    // InternalETMap.g:1454:1: rule__Mapping__Group__4__Impl : ( '{' ) ;
     public final void rule__Mapping__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1458:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1459:1: ( '{' )
+            // InternalETMap.g:1458:1: ( ( '{' ) )
+            // InternalETMap.g:1459:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1459:1: ( '{' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1460:1: '{'
+            // InternalETMap.g:1459:1: ( '{' )
+            // InternalETMap.g:1460:1: '{'
             {
              before(grammarAccess.getMappingAccess().getLeftCurlyBracketKeyword_4()); 
-            match(input,24,FOLLOW_24_in_rule__Mapping__Group__4__Impl3012); 
+            match(input,24,FOLLOW_2); 
              after(grammarAccess.getMappingAccess().getLeftCurlyBracketKeyword_4()); 
 
             }
@@ -4366,21 +4366,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Mapping__Group__5"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1473:1: rule__Mapping__Group__5 : rule__Mapping__Group__5__Impl rule__Mapping__Group__6 ;
+    // InternalETMap.g:1473:1: rule__Mapping__Group__5 : rule__Mapping__Group__5__Impl rule__Mapping__Group__6 ;
     public final void rule__Mapping__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1477:1: ( rule__Mapping__Group__5__Impl rule__Mapping__Group__6 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1478:2: rule__Mapping__Group__5__Impl rule__Mapping__Group__6
+            // InternalETMap.g:1477:1: ( rule__Mapping__Group__5__Impl rule__Mapping__Group__6 )
+            // InternalETMap.g:1478:2: rule__Mapping__Group__5__Impl rule__Mapping__Group__6
             {
-            pushFollow(FOLLOW_rule__Mapping__Group__5__Impl_in_rule__Mapping__Group__53043);
+            pushFollow(FOLLOW_9);
             rule__Mapping__Group__5__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Mapping__Group__6_in_rule__Mapping__Group__53046);
+            pushFollow(FOLLOW_2);
             rule__Mapping__Group__6();
 
             state._fsp--;
@@ -4404,20 +4404,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Mapping__Group__5__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1485:1: rule__Mapping__Group__5__Impl : ( ( rule__Mapping__SubsysMappingsAssignment_5 )* ) ;
+    // InternalETMap.g:1485:1: rule__Mapping__Group__5__Impl : ( ( rule__Mapping__SubsysMappingsAssignment_5 )* ) ;
     public final void rule__Mapping__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1489:1: ( ( ( rule__Mapping__SubsysMappingsAssignment_5 )* ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1490:1: ( ( rule__Mapping__SubsysMappingsAssignment_5 )* )
+            // InternalETMap.g:1489:1: ( ( ( rule__Mapping__SubsysMappingsAssignment_5 )* ) )
+            // InternalETMap.g:1490:1: ( ( rule__Mapping__SubsysMappingsAssignment_5 )* )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1490:1: ( ( rule__Mapping__SubsysMappingsAssignment_5 )* )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1491:1: ( rule__Mapping__SubsysMappingsAssignment_5 )*
+            // InternalETMap.g:1490:1: ( ( rule__Mapping__SubsysMappingsAssignment_5 )* )
+            // InternalETMap.g:1491:1: ( rule__Mapping__SubsysMappingsAssignment_5 )*
             {
              before(grammarAccess.getMappingAccess().getSubsysMappingsAssignment_5()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1492:1: ( rule__Mapping__SubsysMappingsAssignment_5 )*
+            // InternalETMap.g:1492:1: ( rule__Mapping__SubsysMappingsAssignment_5 )*
             loop18:
             do {
                 int alt18=2;
@@ -4430,9 +4430,9 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
                 switch (alt18) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1492:2: rule__Mapping__SubsysMappingsAssignment_5
+            	    // InternalETMap.g:1492:2: rule__Mapping__SubsysMappingsAssignment_5
             	    {
-            	    pushFollow(FOLLOW_rule__Mapping__SubsysMappingsAssignment_5_in_rule__Mapping__Group__5__Impl3073);
+            	    pushFollow(FOLLOW_10);
             	    rule__Mapping__SubsysMappingsAssignment_5();
 
             	    state._fsp--;
@@ -4469,16 +4469,16 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Mapping__Group__6"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1502:1: rule__Mapping__Group__6 : rule__Mapping__Group__6__Impl ;
+    // InternalETMap.g:1502:1: rule__Mapping__Group__6 : rule__Mapping__Group__6__Impl ;
     public final void rule__Mapping__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1506:1: ( rule__Mapping__Group__6__Impl )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1507:2: rule__Mapping__Group__6__Impl
+            // InternalETMap.g:1506:1: ( rule__Mapping__Group__6__Impl )
+            // InternalETMap.g:1507:2: rule__Mapping__Group__6__Impl
             {
-            pushFollow(FOLLOW_rule__Mapping__Group__6__Impl_in_rule__Mapping__Group__63104);
+            pushFollow(FOLLOW_2);
             rule__Mapping__Group__6__Impl();
 
             state._fsp--;
@@ -4502,20 +4502,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Mapping__Group__6__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1513:1: rule__Mapping__Group__6__Impl : ( '}' ) ;
+    // InternalETMap.g:1513:1: rule__Mapping__Group__6__Impl : ( '}' ) ;
     public final void rule__Mapping__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1517:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1518:1: ( '}' )
+            // InternalETMap.g:1517:1: ( ( '}' ) )
+            // InternalETMap.g:1518:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1518:1: ( '}' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1519:1: '}'
+            // InternalETMap.g:1518:1: ( '}' )
+            // InternalETMap.g:1519:1: '}'
             {
              before(grammarAccess.getMappingAccess().getRightCurlyBracketKeyword_6()); 
-            match(input,25,FOLLOW_25_in_rule__Mapping__Group__6__Impl3132); 
+            match(input,25,FOLLOW_2); 
              after(grammarAccess.getMappingAccess().getRightCurlyBracketKeyword_6()); 
 
             }
@@ -4539,21 +4539,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemMapping__Group__0"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1546:1: rule__SubSystemMapping__Group__0 : rule__SubSystemMapping__Group__0__Impl rule__SubSystemMapping__Group__1 ;
+    // InternalETMap.g:1546:1: rule__SubSystemMapping__Group__0 : rule__SubSystemMapping__Group__0__Impl rule__SubSystemMapping__Group__1 ;
     public final void rule__SubSystemMapping__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1550:1: ( rule__SubSystemMapping__Group__0__Impl rule__SubSystemMapping__Group__1 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1551:2: rule__SubSystemMapping__Group__0__Impl rule__SubSystemMapping__Group__1
+            // InternalETMap.g:1550:1: ( rule__SubSystemMapping__Group__0__Impl rule__SubSystemMapping__Group__1 )
+            // InternalETMap.g:1551:2: rule__SubSystemMapping__Group__0__Impl rule__SubSystemMapping__Group__1
             {
-            pushFollow(FOLLOW_rule__SubSystemMapping__Group__0__Impl_in_rule__SubSystemMapping__Group__03177);
+            pushFollow(FOLLOW_3);
             rule__SubSystemMapping__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SubSystemMapping__Group__1_in_rule__SubSystemMapping__Group__03180);
+            pushFollow(FOLLOW_2);
             rule__SubSystemMapping__Group__1();
 
             state._fsp--;
@@ -4577,20 +4577,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemMapping__Group__0__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1558:1: rule__SubSystemMapping__Group__0__Impl : ( 'SubSystemMapping' ) ;
+    // InternalETMap.g:1558:1: rule__SubSystemMapping__Group__0__Impl : ( 'SubSystemMapping' ) ;
     public final void rule__SubSystemMapping__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1562:1: ( ( 'SubSystemMapping' ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1563:1: ( 'SubSystemMapping' )
+            // InternalETMap.g:1562:1: ( ( 'SubSystemMapping' ) )
+            // InternalETMap.g:1563:1: ( 'SubSystemMapping' )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1563:1: ( 'SubSystemMapping' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1564:1: 'SubSystemMapping'
+            // InternalETMap.g:1563:1: ( 'SubSystemMapping' )
+            // InternalETMap.g:1564:1: 'SubSystemMapping'
             {
              before(grammarAccess.getSubSystemMappingAccess().getSubSystemMappingKeyword_0()); 
-            match(input,28,FOLLOW_28_in_rule__SubSystemMapping__Group__0__Impl3208); 
+            match(input,28,FOLLOW_2); 
              after(grammarAccess.getSubSystemMappingAccess().getSubSystemMappingKeyword_0()); 
 
             }
@@ -4614,21 +4614,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemMapping__Group__1"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1577:1: rule__SubSystemMapping__Group__1 : rule__SubSystemMapping__Group__1__Impl rule__SubSystemMapping__Group__2 ;
+    // InternalETMap.g:1577:1: rule__SubSystemMapping__Group__1 : rule__SubSystemMapping__Group__1__Impl rule__SubSystemMapping__Group__2 ;
     public final void rule__SubSystemMapping__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1581:1: ( rule__SubSystemMapping__Group__1__Impl rule__SubSystemMapping__Group__2 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1582:2: rule__SubSystemMapping__Group__1__Impl rule__SubSystemMapping__Group__2
+            // InternalETMap.g:1581:1: ( rule__SubSystemMapping__Group__1__Impl rule__SubSystemMapping__Group__2 )
+            // InternalETMap.g:1582:2: rule__SubSystemMapping__Group__1__Impl rule__SubSystemMapping__Group__2
             {
-            pushFollow(FOLLOW_rule__SubSystemMapping__Group__1__Impl_in_rule__SubSystemMapping__Group__13239);
+            pushFollow(FOLLOW_8);
             rule__SubSystemMapping__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SubSystemMapping__Group__2_in_rule__SubSystemMapping__Group__13242);
+            pushFollow(FOLLOW_2);
             rule__SubSystemMapping__Group__2();
 
             state._fsp--;
@@ -4652,23 +4652,23 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemMapping__Group__1__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1589:1: rule__SubSystemMapping__Group__1__Impl : ( ( rule__SubSystemMapping__LogicalSubSysAssignment_1 ) ) ;
+    // InternalETMap.g:1589:1: rule__SubSystemMapping__Group__1__Impl : ( ( rule__SubSystemMapping__LogicalSubSysAssignment_1 ) ) ;
     public final void rule__SubSystemMapping__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1593:1: ( ( ( rule__SubSystemMapping__LogicalSubSysAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1594:1: ( ( rule__SubSystemMapping__LogicalSubSysAssignment_1 ) )
+            // InternalETMap.g:1593:1: ( ( ( rule__SubSystemMapping__LogicalSubSysAssignment_1 ) ) )
+            // InternalETMap.g:1594:1: ( ( rule__SubSystemMapping__LogicalSubSysAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1594:1: ( ( rule__SubSystemMapping__LogicalSubSysAssignment_1 ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1595:1: ( rule__SubSystemMapping__LogicalSubSysAssignment_1 )
+            // InternalETMap.g:1594:1: ( ( rule__SubSystemMapping__LogicalSubSysAssignment_1 ) )
+            // InternalETMap.g:1595:1: ( rule__SubSystemMapping__LogicalSubSysAssignment_1 )
             {
              before(grammarAccess.getSubSystemMappingAccess().getLogicalSubSysAssignment_1()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1596:1: ( rule__SubSystemMapping__LogicalSubSysAssignment_1 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1596:2: rule__SubSystemMapping__LogicalSubSysAssignment_1
+            // InternalETMap.g:1596:1: ( rule__SubSystemMapping__LogicalSubSysAssignment_1 )
+            // InternalETMap.g:1596:2: rule__SubSystemMapping__LogicalSubSysAssignment_1
             {
-            pushFollow(FOLLOW_rule__SubSystemMapping__LogicalSubSysAssignment_1_in_rule__SubSystemMapping__Group__1__Impl3269);
+            pushFollow(FOLLOW_2);
             rule__SubSystemMapping__LogicalSubSysAssignment_1();
 
             state._fsp--;
@@ -4699,21 +4699,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemMapping__Group__2"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1606:1: rule__SubSystemMapping__Group__2 : rule__SubSystemMapping__Group__2__Impl rule__SubSystemMapping__Group__3 ;
+    // InternalETMap.g:1606:1: rule__SubSystemMapping__Group__2 : rule__SubSystemMapping__Group__2__Impl rule__SubSystemMapping__Group__3 ;
     public final void rule__SubSystemMapping__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1610:1: ( rule__SubSystemMapping__Group__2__Impl rule__SubSystemMapping__Group__3 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1611:2: rule__SubSystemMapping__Group__2__Impl rule__SubSystemMapping__Group__3
+            // InternalETMap.g:1610:1: ( rule__SubSystemMapping__Group__2__Impl rule__SubSystemMapping__Group__3 )
+            // InternalETMap.g:1611:2: rule__SubSystemMapping__Group__2__Impl rule__SubSystemMapping__Group__3
             {
-            pushFollow(FOLLOW_rule__SubSystemMapping__Group__2__Impl_in_rule__SubSystemMapping__Group__23299);
+            pushFollow(FOLLOW_3);
             rule__SubSystemMapping__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SubSystemMapping__Group__3_in_rule__SubSystemMapping__Group__23302);
+            pushFollow(FOLLOW_2);
             rule__SubSystemMapping__Group__3();
 
             state._fsp--;
@@ -4737,20 +4737,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemMapping__Group__2__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1618:1: rule__SubSystemMapping__Group__2__Impl : ( '->' ) ;
+    // InternalETMap.g:1618:1: rule__SubSystemMapping__Group__2__Impl : ( '->' ) ;
     public final void rule__SubSystemMapping__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1622:1: ( ( '->' ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1623:1: ( '->' )
+            // InternalETMap.g:1622:1: ( ( '->' ) )
+            // InternalETMap.g:1623:1: ( '->' )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1623:1: ( '->' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1624:1: '->'
+            // InternalETMap.g:1623:1: ( '->' )
+            // InternalETMap.g:1624:1: '->'
             {
              before(grammarAccess.getSubSystemMappingAccess().getHyphenMinusGreaterThanSignKeyword_2()); 
-            match(input,27,FOLLOW_27_in_rule__SubSystemMapping__Group__2__Impl3330); 
+            match(input,27,FOLLOW_2); 
              after(grammarAccess.getSubSystemMappingAccess().getHyphenMinusGreaterThanSignKeyword_2()); 
 
             }
@@ -4774,21 +4774,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemMapping__Group__3"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1637:1: rule__SubSystemMapping__Group__3 : rule__SubSystemMapping__Group__3__Impl rule__SubSystemMapping__Group__4 ;
+    // InternalETMap.g:1637:1: rule__SubSystemMapping__Group__3 : rule__SubSystemMapping__Group__3__Impl rule__SubSystemMapping__Group__4 ;
     public final void rule__SubSystemMapping__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1641:1: ( rule__SubSystemMapping__Group__3__Impl rule__SubSystemMapping__Group__4 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1642:2: rule__SubSystemMapping__Group__3__Impl rule__SubSystemMapping__Group__4
+            // InternalETMap.g:1641:1: ( rule__SubSystemMapping__Group__3__Impl rule__SubSystemMapping__Group__4 )
+            // InternalETMap.g:1642:2: rule__SubSystemMapping__Group__3__Impl rule__SubSystemMapping__Group__4
             {
-            pushFollow(FOLLOW_rule__SubSystemMapping__Group__3__Impl_in_rule__SubSystemMapping__Group__33361);
+            pushFollow(FOLLOW_4);
             rule__SubSystemMapping__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SubSystemMapping__Group__4_in_rule__SubSystemMapping__Group__33364);
+            pushFollow(FOLLOW_2);
             rule__SubSystemMapping__Group__4();
 
             state._fsp--;
@@ -4812,23 +4812,23 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemMapping__Group__3__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1649:1: rule__SubSystemMapping__Group__3__Impl : ( ( rule__SubSystemMapping__NodeAssignment_3 ) ) ;
+    // InternalETMap.g:1649:1: rule__SubSystemMapping__Group__3__Impl : ( ( rule__SubSystemMapping__NodeAssignment_3 ) ) ;
     public final void rule__SubSystemMapping__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1653:1: ( ( ( rule__SubSystemMapping__NodeAssignment_3 ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1654:1: ( ( rule__SubSystemMapping__NodeAssignment_3 ) )
+            // InternalETMap.g:1653:1: ( ( ( rule__SubSystemMapping__NodeAssignment_3 ) ) )
+            // InternalETMap.g:1654:1: ( ( rule__SubSystemMapping__NodeAssignment_3 ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1654:1: ( ( rule__SubSystemMapping__NodeAssignment_3 ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1655:1: ( rule__SubSystemMapping__NodeAssignment_3 )
+            // InternalETMap.g:1654:1: ( ( rule__SubSystemMapping__NodeAssignment_3 ) )
+            // InternalETMap.g:1655:1: ( rule__SubSystemMapping__NodeAssignment_3 )
             {
              before(grammarAccess.getSubSystemMappingAccess().getNodeAssignment_3()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1656:1: ( rule__SubSystemMapping__NodeAssignment_3 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1656:2: rule__SubSystemMapping__NodeAssignment_3
+            // InternalETMap.g:1656:1: ( rule__SubSystemMapping__NodeAssignment_3 )
+            // InternalETMap.g:1656:2: rule__SubSystemMapping__NodeAssignment_3
             {
-            pushFollow(FOLLOW_rule__SubSystemMapping__NodeAssignment_3_in_rule__SubSystemMapping__Group__3__Impl3391);
+            pushFollow(FOLLOW_2);
             rule__SubSystemMapping__NodeAssignment_3();
 
             state._fsp--;
@@ -4859,16 +4859,16 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemMapping__Group__4"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1666:1: rule__SubSystemMapping__Group__4 : rule__SubSystemMapping__Group__4__Impl ;
+    // InternalETMap.g:1666:1: rule__SubSystemMapping__Group__4 : rule__SubSystemMapping__Group__4__Impl ;
     public final void rule__SubSystemMapping__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1670:1: ( rule__SubSystemMapping__Group__4__Impl )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1671:2: rule__SubSystemMapping__Group__4__Impl
+            // InternalETMap.g:1670:1: ( rule__SubSystemMapping__Group__4__Impl )
+            // InternalETMap.g:1671:2: rule__SubSystemMapping__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__SubSystemMapping__Group__4__Impl_in_rule__SubSystemMapping__Group__43421);
+            pushFollow(FOLLOW_2);
             rule__SubSystemMapping__Group__4__Impl();
 
             state._fsp--;
@@ -4892,20 +4892,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemMapping__Group__4__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1677:1: rule__SubSystemMapping__Group__4__Impl : ( ( rule__SubSystemMapping__Group_4__0 )? ) ;
+    // InternalETMap.g:1677:1: rule__SubSystemMapping__Group__4__Impl : ( ( rule__SubSystemMapping__Group_4__0 )? ) ;
     public final void rule__SubSystemMapping__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1681:1: ( ( ( rule__SubSystemMapping__Group_4__0 )? ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1682:1: ( ( rule__SubSystemMapping__Group_4__0 )? )
+            // InternalETMap.g:1681:1: ( ( ( rule__SubSystemMapping__Group_4__0 )? ) )
+            // InternalETMap.g:1682:1: ( ( rule__SubSystemMapping__Group_4__0 )? )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1682:1: ( ( rule__SubSystemMapping__Group_4__0 )? )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1683:1: ( rule__SubSystemMapping__Group_4__0 )?
+            // InternalETMap.g:1682:1: ( ( rule__SubSystemMapping__Group_4__0 )? )
+            // InternalETMap.g:1683:1: ( rule__SubSystemMapping__Group_4__0 )?
             {
              before(grammarAccess.getSubSystemMappingAccess().getGroup_4()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1684:1: ( rule__SubSystemMapping__Group_4__0 )?
+            // InternalETMap.g:1684:1: ( rule__SubSystemMapping__Group_4__0 )?
             int alt19=2;
             int LA19_0 = input.LA(1);
 
@@ -4914,9 +4914,9 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
             }
             switch (alt19) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1684:2: rule__SubSystemMapping__Group_4__0
+                    // InternalETMap.g:1684:2: rule__SubSystemMapping__Group_4__0
                     {
-                    pushFollow(FOLLOW_rule__SubSystemMapping__Group_4__0_in_rule__SubSystemMapping__Group__4__Impl3448);
+                    pushFollow(FOLLOW_2);
                     rule__SubSystemMapping__Group_4__0();
 
                     state._fsp--;
@@ -4950,21 +4950,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemMapping__Group_4__0"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1704:1: rule__SubSystemMapping__Group_4__0 : rule__SubSystemMapping__Group_4__0__Impl rule__SubSystemMapping__Group_4__1 ;
+    // InternalETMap.g:1704:1: rule__SubSystemMapping__Group_4__0 : rule__SubSystemMapping__Group_4__0__Impl rule__SubSystemMapping__Group_4__1 ;
     public final void rule__SubSystemMapping__Group_4__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1708:1: ( rule__SubSystemMapping__Group_4__0__Impl rule__SubSystemMapping__Group_4__1 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1709:2: rule__SubSystemMapping__Group_4__0__Impl rule__SubSystemMapping__Group_4__1
+            // InternalETMap.g:1708:1: ( rule__SubSystemMapping__Group_4__0__Impl rule__SubSystemMapping__Group_4__1 )
+            // InternalETMap.g:1709:2: rule__SubSystemMapping__Group_4__0__Impl rule__SubSystemMapping__Group_4__1
             {
-            pushFollow(FOLLOW_rule__SubSystemMapping__Group_4__0__Impl_in_rule__SubSystemMapping__Group_4__03489);
+            pushFollow(FOLLOW_11);
             rule__SubSystemMapping__Group_4__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SubSystemMapping__Group_4__1_in_rule__SubSystemMapping__Group_4__03492);
+            pushFollow(FOLLOW_2);
             rule__SubSystemMapping__Group_4__1();
 
             state._fsp--;
@@ -4988,20 +4988,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemMapping__Group_4__0__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1716:1: rule__SubSystemMapping__Group_4__0__Impl : ( '{' ) ;
+    // InternalETMap.g:1716:1: rule__SubSystemMapping__Group_4__0__Impl : ( '{' ) ;
     public final void rule__SubSystemMapping__Group_4__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1720:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1721:1: ( '{' )
+            // InternalETMap.g:1720:1: ( ( '{' ) )
+            // InternalETMap.g:1721:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1721:1: ( '{' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1722:1: '{'
+            // InternalETMap.g:1721:1: ( '{' )
+            // InternalETMap.g:1722:1: '{'
             {
              before(grammarAccess.getSubSystemMappingAccess().getLeftCurlyBracketKeyword_4_0()); 
-            match(input,24,FOLLOW_24_in_rule__SubSystemMapping__Group_4__0__Impl3520); 
+            match(input,24,FOLLOW_2); 
              after(grammarAccess.getSubSystemMappingAccess().getLeftCurlyBracketKeyword_4_0()); 
 
             }
@@ -5025,21 +5025,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemMapping__Group_4__1"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1735:1: rule__SubSystemMapping__Group_4__1 : rule__SubSystemMapping__Group_4__1__Impl rule__SubSystemMapping__Group_4__2 ;
+    // InternalETMap.g:1735:1: rule__SubSystemMapping__Group_4__1 : rule__SubSystemMapping__Group_4__1__Impl rule__SubSystemMapping__Group_4__2 ;
     public final void rule__SubSystemMapping__Group_4__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1739:1: ( rule__SubSystemMapping__Group_4__1__Impl rule__SubSystemMapping__Group_4__2 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1740:2: rule__SubSystemMapping__Group_4__1__Impl rule__SubSystemMapping__Group_4__2
+            // InternalETMap.g:1739:1: ( rule__SubSystemMapping__Group_4__1__Impl rule__SubSystemMapping__Group_4__2 )
+            // InternalETMap.g:1740:2: rule__SubSystemMapping__Group_4__1__Impl rule__SubSystemMapping__Group_4__2
             {
-            pushFollow(FOLLOW_rule__SubSystemMapping__Group_4__1__Impl_in_rule__SubSystemMapping__Group_4__13551);
+            pushFollow(FOLLOW_11);
             rule__SubSystemMapping__Group_4__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SubSystemMapping__Group_4__2_in_rule__SubSystemMapping__Group_4__13554);
+            pushFollow(FOLLOW_2);
             rule__SubSystemMapping__Group_4__2();
 
             state._fsp--;
@@ -5063,20 +5063,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemMapping__Group_4__1__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1747:1: rule__SubSystemMapping__Group_4__1__Impl : ( ( rule__SubSystemMapping__ThreadMappingsAssignment_4_1 )* ) ;
+    // InternalETMap.g:1747:1: rule__SubSystemMapping__Group_4__1__Impl : ( ( rule__SubSystemMapping__ThreadMappingsAssignment_4_1 )* ) ;
     public final void rule__SubSystemMapping__Group_4__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1751:1: ( ( ( rule__SubSystemMapping__ThreadMappingsAssignment_4_1 )* ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1752:1: ( ( rule__SubSystemMapping__ThreadMappingsAssignment_4_1 )* )
+            // InternalETMap.g:1751:1: ( ( ( rule__SubSystemMapping__ThreadMappingsAssignment_4_1 )* ) )
+            // InternalETMap.g:1752:1: ( ( rule__SubSystemMapping__ThreadMappingsAssignment_4_1 )* )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1752:1: ( ( rule__SubSystemMapping__ThreadMappingsAssignment_4_1 )* )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1753:1: ( rule__SubSystemMapping__ThreadMappingsAssignment_4_1 )*
+            // InternalETMap.g:1752:1: ( ( rule__SubSystemMapping__ThreadMappingsAssignment_4_1 )* )
+            // InternalETMap.g:1753:1: ( rule__SubSystemMapping__ThreadMappingsAssignment_4_1 )*
             {
              before(grammarAccess.getSubSystemMappingAccess().getThreadMappingsAssignment_4_1()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1754:1: ( rule__SubSystemMapping__ThreadMappingsAssignment_4_1 )*
+            // InternalETMap.g:1754:1: ( rule__SubSystemMapping__ThreadMappingsAssignment_4_1 )*
             loop20:
             do {
                 int alt20=2;
@@ -5089,9 +5089,9 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
                 switch (alt20) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1754:2: rule__SubSystemMapping__ThreadMappingsAssignment_4_1
+            	    // InternalETMap.g:1754:2: rule__SubSystemMapping__ThreadMappingsAssignment_4_1
             	    {
-            	    pushFollow(FOLLOW_rule__SubSystemMapping__ThreadMappingsAssignment_4_1_in_rule__SubSystemMapping__Group_4__1__Impl3581);
+            	    pushFollow(FOLLOW_12);
             	    rule__SubSystemMapping__ThreadMappingsAssignment_4_1();
 
             	    state._fsp--;
@@ -5128,16 +5128,16 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemMapping__Group_4__2"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1764:1: rule__SubSystemMapping__Group_4__2 : rule__SubSystemMapping__Group_4__2__Impl ;
+    // InternalETMap.g:1764:1: rule__SubSystemMapping__Group_4__2 : rule__SubSystemMapping__Group_4__2__Impl ;
     public final void rule__SubSystemMapping__Group_4__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1768:1: ( rule__SubSystemMapping__Group_4__2__Impl )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1769:2: rule__SubSystemMapping__Group_4__2__Impl
+            // InternalETMap.g:1768:1: ( rule__SubSystemMapping__Group_4__2__Impl )
+            // InternalETMap.g:1769:2: rule__SubSystemMapping__Group_4__2__Impl
             {
-            pushFollow(FOLLOW_rule__SubSystemMapping__Group_4__2__Impl_in_rule__SubSystemMapping__Group_4__23612);
+            pushFollow(FOLLOW_2);
             rule__SubSystemMapping__Group_4__2__Impl();
 
             state._fsp--;
@@ -5161,20 +5161,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemMapping__Group_4__2__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1775:1: rule__SubSystemMapping__Group_4__2__Impl : ( '}' ) ;
+    // InternalETMap.g:1775:1: rule__SubSystemMapping__Group_4__2__Impl : ( '}' ) ;
     public final void rule__SubSystemMapping__Group_4__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1779:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1780:1: ( '}' )
+            // InternalETMap.g:1779:1: ( ( '}' ) )
+            // InternalETMap.g:1780:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1780:1: ( '}' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1781:1: '}'
+            // InternalETMap.g:1780:1: ( '}' )
+            // InternalETMap.g:1781:1: '}'
             {
              before(grammarAccess.getSubSystemMappingAccess().getRightCurlyBracketKeyword_4_2()); 
-            match(input,25,FOLLOW_25_in_rule__SubSystemMapping__Group_4__2__Impl3640); 
+            match(input,25,FOLLOW_2); 
              after(grammarAccess.getSubSystemMappingAccess().getRightCurlyBracketKeyword_4_2()); 
 
             }
@@ -5198,21 +5198,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ThreadMapping__Group__0"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1800:1: rule__ThreadMapping__Group__0 : rule__ThreadMapping__Group__0__Impl rule__ThreadMapping__Group__1 ;
+    // InternalETMap.g:1800:1: rule__ThreadMapping__Group__0 : rule__ThreadMapping__Group__0__Impl rule__ThreadMapping__Group__1 ;
     public final void rule__ThreadMapping__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1804:1: ( rule__ThreadMapping__Group__0__Impl rule__ThreadMapping__Group__1 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1805:2: rule__ThreadMapping__Group__0__Impl rule__ThreadMapping__Group__1
+            // InternalETMap.g:1804:1: ( rule__ThreadMapping__Group__0__Impl rule__ThreadMapping__Group__1 )
+            // InternalETMap.g:1805:2: rule__ThreadMapping__Group__0__Impl rule__ThreadMapping__Group__1
             {
-            pushFollow(FOLLOW_rule__ThreadMapping__Group__0__Impl_in_rule__ThreadMapping__Group__03677);
+            pushFollow(FOLLOW_3);
             rule__ThreadMapping__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ThreadMapping__Group__1_in_rule__ThreadMapping__Group__03680);
+            pushFollow(FOLLOW_2);
             rule__ThreadMapping__Group__1();
 
             state._fsp--;
@@ -5236,20 +5236,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ThreadMapping__Group__0__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1812:1: rule__ThreadMapping__Group__0__Impl : ( 'ThreadMapping' ) ;
+    // InternalETMap.g:1812:1: rule__ThreadMapping__Group__0__Impl : ( 'ThreadMapping' ) ;
     public final void rule__ThreadMapping__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1816:1: ( ( 'ThreadMapping' ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1817:1: ( 'ThreadMapping' )
+            // InternalETMap.g:1816:1: ( ( 'ThreadMapping' ) )
+            // InternalETMap.g:1817:1: ( 'ThreadMapping' )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1817:1: ( 'ThreadMapping' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1818:1: 'ThreadMapping'
+            // InternalETMap.g:1817:1: ( 'ThreadMapping' )
+            // InternalETMap.g:1818:1: 'ThreadMapping'
             {
              before(grammarAccess.getThreadMappingAccess().getThreadMappingKeyword_0()); 
-            match(input,29,FOLLOW_29_in_rule__ThreadMapping__Group__0__Impl3708); 
+            match(input,29,FOLLOW_2); 
              after(grammarAccess.getThreadMappingAccess().getThreadMappingKeyword_0()); 
 
             }
@@ -5273,21 +5273,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ThreadMapping__Group__1"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1831:1: rule__ThreadMapping__Group__1 : rule__ThreadMapping__Group__1__Impl rule__ThreadMapping__Group__2 ;
+    // InternalETMap.g:1831:1: rule__ThreadMapping__Group__1 : rule__ThreadMapping__Group__1__Impl rule__ThreadMapping__Group__2 ;
     public final void rule__ThreadMapping__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1835:1: ( rule__ThreadMapping__Group__1__Impl rule__ThreadMapping__Group__2 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1836:2: rule__ThreadMapping__Group__1__Impl rule__ThreadMapping__Group__2
+            // InternalETMap.g:1835:1: ( rule__ThreadMapping__Group__1__Impl rule__ThreadMapping__Group__2 )
+            // InternalETMap.g:1836:2: rule__ThreadMapping__Group__1__Impl rule__ThreadMapping__Group__2
             {
-            pushFollow(FOLLOW_rule__ThreadMapping__Group__1__Impl_in_rule__ThreadMapping__Group__13739);
+            pushFollow(FOLLOW_8);
             rule__ThreadMapping__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ThreadMapping__Group__2_in_rule__ThreadMapping__Group__13742);
+            pushFollow(FOLLOW_2);
             rule__ThreadMapping__Group__2();
 
             state._fsp--;
@@ -5311,23 +5311,23 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ThreadMapping__Group__1__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1843:1: rule__ThreadMapping__Group__1__Impl : ( ( rule__ThreadMapping__LogicalThreadAssignment_1 ) ) ;
+    // InternalETMap.g:1843:1: rule__ThreadMapping__Group__1__Impl : ( ( rule__ThreadMapping__LogicalThreadAssignment_1 ) ) ;
     public final void rule__ThreadMapping__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1847:1: ( ( ( rule__ThreadMapping__LogicalThreadAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1848:1: ( ( rule__ThreadMapping__LogicalThreadAssignment_1 ) )
+            // InternalETMap.g:1847:1: ( ( ( rule__ThreadMapping__LogicalThreadAssignment_1 ) ) )
+            // InternalETMap.g:1848:1: ( ( rule__ThreadMapping__LogicalThreadAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1848:1: ( ( rule__ThreadMapping__LogicalThreadAssignment_1 ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1849:1: ( rule__ThreadMapping__LogicalThreadAssignment_1 )
+            // InternalETMap.g:1848:1: ( ( rule__ThreadMapping__LogicalThreadAssignment_1 ) )
+            // InternalETMap.g:1849:1: ( rule__ThreadMapping__LogicalThreadAssignment_1 )
             {
              before(grammarAccess.getThreadMappingAccess().getLogicalThreadAssignment_1()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1850:1: ( rule__ThreadMapping__LogicalThreadAssignment_1 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1850:2: rule__ThreadMapping__LogicalThreadAssignment_1
+            // InternalETMap.g:1850:1: ( rule__ThreadMapping__LogicalThreadAssignment_1 )
+            // InternalETMap.g:1850:2: rule__ThreadMapping__LogicalThreadAssignment_1
             {
-            pushFollow(FOLLOW_rule__ThreadMapping__LogicalThreadAssignment_1_in_rule__ThreadMapping__Group__1__Impl3769);
+            pushFollow(FOLLOW_2);
             rule__ThreadMapping__LogicalThreadAssignment_1();
 
             state._fsp--;
@@ -5358,21 +5358,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ThreadMapping__Group__2"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1860:1: rule__ThreadMapping__Group__2 : rule__ThreadMapping__Group__2__Impl rule__ThreadMapping__Group__3 ;
+    // InternalETMap.g:1860:1: rule__ThreadMapping__Group__2 : rule__ThreadMapping__Group__2__Impl rule__ThreadMapping__Group__3 ;
     public final void rule__ThreadMapping__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1864:1: ( rule__ThreadMapping__Group__2__Impl rule__ThreadMapping__Group__3 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1865:2: rule__ThreadMapping__Group__2__Impl rule__ThreadMapping__Group__3
+            // InternalETMap.g:1864:1: ( rule__ThreadMapping__Group__2__Impl rule__ThreadMapping__Group__3 )
+            // InternalETMap.g:1865:2: rule__ThreadMapping__Group__2__Impl rule__ThreadMapping__Group__3
             {
-            pushFollow(FOLLOW_rule__ThreadMapping__Group__2__Impl_in_rule__ThreadMapping__Group__23799);
+            pushFollow(FOLLOW_3);
             rule__ThreadMapping__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ThreadMapping__Group__3_in_rule__ThreadMapping__Group__23802);
+            pushFollow(FOLLOW_2);
             rule__ThreadMapping__Group__3();
 
             state._fsp--;
@@ -5396,20 +5396,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ThreadMapping__Group__2__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1872:1: rule__ThreadMapping__Group__2__Impl : ( '->' ) ;
+    // InternalETMap.g:1872:1: rule__ThreadMapping__Group__2__Impl : ( '->' ) ;
     public final void rule__ThreadMapping__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1876:1: ( ( '->' ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1877:1: ( '->' )
+            // InternalETMap.g:1876:1: ( ( '->' ) )
+            // InternalETMap.g:1877:1: ( '->' )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1877:1: ( '->' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1878:1: '->'
+            // InternalETMap.g:1877:1: ( '->' )
+            // InternalETMap.g:1878:1: '->'
             {
              before(grammarAccess.getThreadMappingAccess().getHyphenMinusGreaterThanSignKeyword_2()); 
-            match(input,27,FOLLOW_27_in_rule__ThreadMapping__Group__2__Impl3830); 
+            match(input,27,FOLLOW_2); 
              after(grammarAccess.getThreadMappingAccess().getHyphenMinusGreaterThanSignKeyword_2()); 
 
             }
@@ -5433,16 +5433,16 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ThreadMapping__Group__3"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1891:1: rule__ThreadMapping__Group__3 : rule__ThreadMapping__Group__3__Impl ;
+    // InternalETMap.g:1891:1: rule__ThreadMapping__Group__3 : rule__ThreadMapping__Group__3__Impl ;
     public final void rule__ThreadMapping__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1895:1: ( rule__ThreadMapping__Group__3__Impl )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1896:2: rule__ThreadMapping__Group__3__Impl
+            // InternalETMap.g:1895:1: ( rule__ThreadMapping__Group__3__Impl )
+            // InternalETMap.g:1896:2: rule__ThreadMapping__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__ThreadMapping__Group__3__Impl_in_rule__ThreadMapping__Group__33861);
+            pushFollow(FOLLOW_2);
             rule__ThreadMapping__Group__3__Impl();
 
             state._fsp--;
@@ -5466,23 +5466,23 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ThreadMapping__Group__3__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1902:1: rule__ThreadMapping__Group__3__Impl : ( ( rule__ThreadMapping__PhysicalThreadAssignment_3 ) ) ;
+    // InternalETMap.g:1902:1: rule__ThreadMapping__Group__3__Impl : ( ( rule__ThreadMapping__PhysicalThreadAssignment_3 ) ) ;
     public final void rule__ThreadMapping__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1906:1: ( ( ( rule__ThreadMapping__PhysicalThreadAssignment_3 ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1907:1: ( ( rule__ThreadMapping__PhysicalThreadAssignment_3 ) )
+            // InternalETMap.g:1906:1: ( ( ( rule__ThreadMapping__PhysicalThreadAssignment_3 ) ) )
+            // InternalETMap.g:1907:1: ( ( rule__ThreadMapping__PhysicalThreadAssignment_3 ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1907:1: ( ( rule__ThreadMapping__PhysicalThreadAssignment_3 ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1908:1: ( rule__ThreadMapping__PhysicalThreadAssignment_3 )
+            // InternalETMap.g:1907:1: ( ( rule__ThreadMapping__PhysicalThreadAssignment_3 ) )
+            // InternalETMap.g:1908:1: ( rule__ThreadMapping__PhysicalThreadAssignment_3 )
             {
              before(grammarAccess.getThreadMappingAccess().getPhysicalThreadAssignment_3()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1909:1: ( rule__ThreadMapping__PhysicalThreadAssignment_3 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1909:2: rule__ThreadMapping__PhysicalThreadAssignment_3
+            // InternalETMap.g:1909:1: ( rule__ThreadMapping__PhysicalThreadAssignment_3 )
+            // InternalETMap.g:1909:2: rule__ThreadMapping__PhysicalThreadAssignment_3
             {
-            pushFollow(FOLLOW_rule__ThreadMapping__PhysicalThreadAssignment_3_in_rule__ThreadMapping__Group__3__Impl3888);
+            pushFollow(FOLLOW_2);
             rule__ThreadMapping__PhysicalThreadAssignment_3();
 
             state._fsp--;
@@ -5513,21 +5513,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__KeyValue__Group__0"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1930:1: rule__KeyValue__Group__0 : rule__KeyValue__Group__0__Impl rule__KeyValue__Group__1 ;
+    // InternalETMap.g:1930:1: rule__KeyValue__Group__0 : rule__KeyValue__Group__0__Impl rule__KeyValue__Group__1 ;
     public final void rule__KeyValue__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1934:1: ( rule__KeyValue__Group__0__Impl rule__KeyValue__Group__1 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1935:2: rule__KeyValue__Group__0__Impl rule__KeyValue__Group__1
+            // InternalETMap.g:1934:1: ( rule__KeyValue__Group__0__Impl rule__KeyValue__Group__1 )
+            // InternalETMap.g:1935:2: rule__KeyValue__Group__0__Impl rule__KeyValue__Group__1
             {
-            pushFollow(FOLLOW_rule__KeyValue__Group__0__Impl_in_rule__KeyValue__Group__03929);
+            pushFollow(FOLLOW_13);
             rule__KeyValue__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__KeyValue__Group__1_in_rule__KeyValue__Group__03932);
+            pushFollow(FOLLOW_2);
             rule__KeyValue__Group__1();
 
             state._fsp--;
@@ -5551,23 +5551,23 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__KeyValue__Group__0__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1942:1: rule__KeyValue__Group__0__Impl : ( ( rule__KeyValue__KeyAssignment_0 ) ) ;
+    // InternalETMap.g:1942:1: rule__KeyValue__Group__0__Impl : ( ( rule__KeyValue__KeyAssignment_0 ) ) ;
     public final void rule__KeyValue__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1946:1: ( ( ( rule__KeyValue__KeyAssignment_0 ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1947:1: ( ( rule__KeyValue__KeyAssignment_0 ) )
+            // InternalETMap.g:1946:1: ( ( ( rule__KeyValue__KeyAssignment_0 ) ) )
+            // InternalETMap.g:1947:1: ( ( rule__KeyValue__KeyAssignment_0 ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1947:1: ( ( rule__KeyValue__KeyAssignment_0 ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1948:1: ( rule__KeyValue__KeyAssignment_0 )
+            // InternalETMap.g:1947:1: ( ( rule__KeyValue__KeyAssignment_0 ) )
+            // InternalETMap.g:1948:1: ( rule__KeyValue__KeyAssignment_0 )
             {
              before(grammarAccess.getKeyValueAccess().getKeyAssignment_0()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1949:1: ( rule__KeyValue__KeyAssignment_0 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1949:2: rule__KeyValue__KeyAssignment_0
+            // InternalETMap.g:1949:1: ( rule__KeyValue__KeyAssignment_0 )
+            // InternalETMap.g:1949:2: rule__KeyValue__KeyAssignment_0
             {
-            pushFollow(FOLLOW_rule__KeyValue__KeyAssignment_0_in_rule__KeyValue__Group__0__Impl3959);
+            pushFollow(FOLLOW_2);
             rule__KeyValue__KeyAssignment_0();
 
             state._fsp--;
@@ -5598,21 +5598,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__KeyValue__Group__1"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1959:1: rule__KeyValue__Group__1 : rule__KeyValue__Group__1__Impl rule__KeyValue__Group__2 ;
+    // InternalETMap.g:1959:1: rule__KeyValue__Group__1 : rule__KeyValue__Group__1__Impl rule__KeyValue__Group__2 ;
     public final void rule__KeyValue__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1963:1: ( rule__KeyValue__Group__1__Impl rule__KeyValue__Group__2 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1964:2: rule__KeyValue__Group__1__Impl rule__KeyValue__Group__2
+            // InternalETMap.g:1963:1: ( rule__KeyValue__Group__1__Impl rule__KeyValue__Group__2 )
+            // InternalETMap.g:1964:2: rule__KeyValue__Group__1__Impl rule__KeyValue__Group__2
             {
-            pushFollow(FOLLOW_rule__KeyValue__Group__1__Impl_in_rule__KeyValue__Group__13989);
+            pushFollow(FOLLOW_14);
             rule__KeyValue__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__KeyValue__Group__2_in_rule__KeyValue__Group__13992);
+            pushFollow(FOLLOW_2);
             rule__KeyValue__Group__2();
 
             state._fsp--;
@@ -5636,20 +5636,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__KeyValue__Group__1__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1971:1: rule__KeyValue__Group__1__Impl : ( '=' ) ;
+    // InternalETMap.g:1971:1: rule__KeyValue__Group__1__Impl : ( '=' ) ;
     public final void rule__KeyValue__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1975:1: ( ( '=' ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1976:1: ( '=' )
+            // InternalETMap.g:1975:1: ( ( '=' ) )
+            // InternalETMap.g:1976:1: ( '=' )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1976:1: ( '=' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1977:1: '='
+            // InternalETMap.g:1976:1: ( '=' )
+            // InternalETMap.g:1977:1: '='
             {
              before(grammarAccess.getKeyValueAccess().getEqualsSignKeyword_1()); 
-            match(input,30,FOLLOW_30_in_rule__KeyValue__Group__1__Impl4020); 
+            match(input,30,FOLLOW_2); 
              after(grammarAccess.getKeyValueAccess().getEqualsSignKeyword_1()); 
 
             }
@@ -5673,16 +5673,16 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__KeyValue__Group__2"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1990:1: rule__KeyValue__Group__2 : rule__KeyValue__Group__2__Impl ;
+    // InternalETMap.g:1990:1: rule__KeyValue__Group__2 : rule__KeyValue__Group__2__Impl ;
     public final void rule__KeyValue__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1994:1: ( rule__KeyValue__Group__2__Impl )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:1995:2: rule__KeyValue__Group__2__Impl
+            // InternalETMap.g:1994:1: ( rule__KeyValue__Group__2__Impl )
+            // InternalETMap.g:1995:2: rule__KeyValue__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__KeyValue__Group__2__Impl_in_rule__KeyValue__Group__24051);
+            pushFollow(FOLLOW_2);
             rule__KeyValue__Group__2__Impl();
 
             state._fsp--;
@@ -5706,23 +5706,23 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__KeyValue__Group__2__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2001:1: rule__KeyValue__Group__2__Impl : ( ( rule__KeyValue__ValueAssignment_2 ) ) ;
+    // InternalETMap.g:2001:1: rule__KeyValue__Group__2__Impl : ( ( rule__KeyValue__ValueAssignment_2 ) ) ;
     public final void rule__KeyValue__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2005:1: ( ( ( rule__KeyValue__ValueAssignment_2 ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2006:1: ( ( rule__KeyValue__ValueAssignment_2 ) )
+            // InternalETMap.g:2005:1: ( ( ( rule__KeyValue__ValueAssignment_2 ) ) )
+            // InternalETMap.g:2006:1: ( ( rule__KeyValue__ValueAssignment_2 ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2006:1: ( ( rule__KeyValue__ValueAssignment_2 ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2007:1: ( rule__KeyValue__ValueAssignment_2 )
+            // InternalETMap.g:2006:1: ( ( rule__KeyValue__ValueAssignment_2 ) )
+            // InternalETMap.g:2007:1: ( rule__KeyValue__ValueAssignment_2 )
             {
              before(grammarAccess.getKeyValueAccess().getValueAssignment_2()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2008:1: ( rule__KeyValue__ValueAssignment_2 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2008:2: rule__KeyValue__ValueAssignment_2
+            // InternalETMap.g:2008:1: ( rule__KeyValue__ValueAssignment_2 )
+            // InternalETMap.g:2008:2: rule__KeyValue__ValueAssignment_2
             {
-            pushFollow(FOLLOW_rule__KeyValue__ValueAssignment_2_in_rule__KeyValue__Group__2__Impl4078);
+            pushFollow(FOLLOW_2);
             rule__KeyValue__ValueAssignment_2();
 
             state._fsp--;
@@ -5753,21 +5753,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__0"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2027:1: rule__SimpleAnnotationAttribute__Group__0 : rule__SimpleAnnotationAttribute__Group__0__Impl rule__SimpleAnnotationAttribute__Group__1 ;
+    // InternalETMap.g:2027:1: rule__SimpleAnnotationAttribute__Group__0 : rule__SimpleAnnotationAttribute__Group__0__Impl rule__SimpleAnnotationAttribute__Group__1 ;
     public final void rule__SimpleAnnotationAttribute__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2031:1: ( rule__SimpleAnnotationAttribute__Group__0__Impl rule__SimpleAnnotationAttribute__Group__1 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2032:2: rule__SimpleAnnotationAttribute__Group__0__Impl rule__SimpleAnnotationAttribute__Group__1
+            // InternalETMap.g:2031:1: ( rule__SimpleAnnotationAttribute__Group__0__Impl rule__SimpleAnnotationAttribute__Group__1 )
+            // InternalETMap.g:2032:2: rule__SimpleAnnotationAttribute__Group__0__Impl rule__SimpleAnnotationAttribute__Group__1
             {
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__0__Impl_in_rule__SimpleAnnotationAttribute__Group__04117);
+            pushFollow(FOLLOW_15);
             rule__SimpleAnnotationAttribute__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__1_in_rule__SimpleAnnotationAttribute__Group__04120);
+            pushFollow(FOLLOW_2);
             rule__SimpleAnnotationAttribute__Group__1();
 
             state._fsp--;
@@ -5791,23 +5791,23 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__0__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2039:1: rule__SimpleAnnotationAttribute__Group__0__Impl : ( ( rule__SimpleAnnotationAttribute__Alternatives_0 ) ) ;
+    // InternalETMap.g:2039:1: rule__SimpleAnnotationAttribute__Group__0__Impl : ( ( rule__SimpleAnnotationAttribute__Alternatives_0 ) ) ;
     public final void rule__SimpleAnnotationAttribute__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2043:1: ( ( ( rule__SimpleAnnotationAttribute__Alternatives_0 ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2044:1: ( ( rule__SimpleAnnotationAttribute__Alternatives_0 ) )
+            // InternalETMap.g:2043:1: ( ( ( rule__SimpleAnnotationAttribute__Alternatives_0 ) ) )
+            // InternalETMap.g:2044:1: ( ( rule__SimpleAnnotationAttribute__Alternatives_0 ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2044:1: ( ( rule__SimpleAnnotationAttribute__Alternatives_0 ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2045:1: ( rule__SimpleAnnotationAttribute__Alternatives_0 )
+            // InternalETMap.g:2044:1: ( ( rule__SimpleAnnotationAttribute__Alternatives_0 ) )
+            // InternalETMap.g:2045:1: ( rule__SimpleAnnotationAttribute__Alternatives_0 )
             {
              before(grammarAccess.getSimpleAnnotationAttributeAccess().getAlternatives_0()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2046:1: ( rule__SimpleAnnotationAttribute__Alternatives_0 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2046:2: rule__SimpleAnnotationAttribute__Alternatives_0
+            // InternalETMap.g:2046:1: ( rule__SimpleAnnotationAttribute__Alternatives_0 )
+            // InternalETMap.g:2046:2: rule__SimpleAnnotationAttribute__Alternatives_0
             {
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Alternatives_0_in_rule__SimpleAnnotationAttribute__Group__0__Impl4147);
+            pushFollow(FOLLOW_2);
             rule__SimpleAnnotationAttribute__Alternatives_0();
 
             state._fsp--;
@@ -5838,21 +5838,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__1"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2056:1: rule__SimpleAnnotationAttribute__Group__1 : rule__SimpleAnnotationAttribute__Group__1__Impl rule__SimpleAnnotationAttribute__Group__2 ;
+    // InternalETMap.g:2056:1: rule__SimpleAnnotationAttribute__Group__1 : rule__SimpleAnnotationAttribute__Group__1__Impl rule__SimpleAnnotationAttribute__Group__2 ;
     public final void rule__SimpleAnnotationAttribute__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2060:1: ( rule__SimpleAnnotationAttribute__Group__1__Impl rule__SimpleAnnotationAttribute__Group__2 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2061:2: rule__SimpleAnnotationAttribute__Group__1__Impl rule__SimpleAnnotationAttribute__Group__2
+            // InternalETMap.g:2060:1: ( rule__SimpleAnnotationAttribute__Group__1__Impl rule__SimpleAnnotationAttribute__Group__2 )
+            // InternalETMap.g:2061:2: rule__SimpleAnnotationAttribute__Group__1__Impl rule__SimpleAnnotationAttribute__Group__2
             {
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__1__Impl_in_rule__SimpleAnnotationAttribute__Group__14177);
+            pushFollow(FOLLOW_3);
             rule__SimpleAnnotationAttribute__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__2_in_rule__SimpleAnnotationAttribute__Group__14180);
+            pushFollow(FOLLOW_2);
             rule__SimpleAnnotationAttribute__Group__2();
 
             state._fsp--;
@@ -5876,20 +5876,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__1__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2068:1: rule__SimpleAnnotationAttribute__Group__1__Impl : ( 'attribute' ) ;
+    // InternalETMap.g:2068:1: rule__SimpleAnnotationAttribute__Group__1__Impl : ( 'attribute' ) ;
     public final void rule__SimpleAnnotationAttribute__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2072:1: ( ( 'attribute' ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2073:1: ( 'attribute' )
+            // InternalETMap.g:2072:1: ( ( 'attribute' ) )
+            // InternalETMap.g:2073:1: ( 'attribute' )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2073:1: ( 'attribute' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2074:1: 'attribute'
+            // InternalETMap.g:2073:1: ( 'attribute' )
+            // InternalETMap.g:2074:1: 'attribute'
             {
              before(grammarAccess.getSimpleAnnotationAttributeAccess().getAttributeKeyword_1()); 
-            match(input,31,FOLLOW_31_in_rule__SimpleAnnotationAttribute__Group__1__Impl4208); 
+            match(input,31,FOLLOW_2); 
              after(grammarAccess.getSimpleAnnotationAttributeAccess().getAttributeKeyword_1()); 
 
             }
@@ -5913,21 +5913,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__2"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2087:1: rule__SimpleAnnotationAttribute__Group__2 : rule__SimpleAnnotationAttribute__Group__2__Impl rule__SimpleAnnotationAttribute__Group__3 ;
+    // InternalETMap.g:2087:1: rule__SimpleAnnotationAttribute__Group__2 : rule__SimpleAnnotationAttribute__Group__2__Impl rule__SimpleAnnotationAttribute__Group__3 ;
     public final void rule__SimpleAnnotationAttribute__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2091:1: ( rule__SimpleAnnotationAttribute__Group__2__Impl rule__SimpleAnnotationAttribute__Group__3 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2092:2: rule__SimpleAnnotationAttribute__Group__2__Impl rule__SimpleAnnotationAttribute__Group__3
+            // InternalETMap.g:2091:1: ( rule__SimpleAnnotationAttribute__Group__2__Impl rule__SimpleAnnotationAttribute__Group__3 )
+            // InternalETMap.g:2092:2: rule__SimpleAnnotationAttribute__Group__2__Impl rule__SimpleAnnotationAttribute__Group__3
             {
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__2__Impl_in_rule__SimpleAnnotationAttribute__Group__24239);
+            pushFollow(FOLLOW_16);
             rule__SimpleAnnotationAttribute__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__3_in_rule__SimpleAnnotationAttribute__Group__24242);
+            pushFollow(FOLLOW_2);
             rule__SimpleAnnotationAttribute__Group__3();
 
             state._fsp--;
@@ -5951,23 +5951,23 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__2__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2099:1: rule__SimpleAnnotationAttribute__Group__2__Impl : ( ( rule__SimpleAnnotationAttribute__NameAssignment_2 ) ) ;
+    // InternalETMap.g:2099:1: rule__SimpleAnnotationAttribute__Group__2__Impl : ( ( rule__SimpleAnnotationAttribute__NameAssignment_2 ) ) ;
     public final void rule__SimpleAnnotationAttribute__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2103:1: ( ( ( rule__SimpleAnnotationAttribute__NameAssignment_2 ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2104:1: ( ( rule__SimpleAnnotationAttribute__NameAssignment_2 ) )
+            // InternalETMap.g:2103:1: ( ( ( rule__SimpleAnnotationAttribute__NameAssignment_2 ) ) )
+            // InternalETMap.g:2104:1: ( ( rule__SimpleAnnotationAttribute__NameAssignment_2 ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2104:1: ( ( rule__SimpleAnnotationAttribute__NameAssignment_2 ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2105:1: ( rule__SimpleAnnotationAttribute__NameAssignment_2 )
+            // InternalETMap.g:2104:1: ( ( rule__SimpleAnnotationAttribute__NameAssignment_2 ) )
+            // InternalETMap.g:2105:1: ( rule__SimpleAnnotationAttribute__NameAssignment_2 )
             {
              before(grammarAccess.getSimpleAnnotationAttributeAccess().getNameAssignment_2()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2106:1: ( rule__SimpleAnnotationAttribute__NameAssignment_2 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2106:2: rule__SimpleAnnotationAttribute__NameAssignment_2
+            // InternalETMap.g:2106:1: ( rule__SimpleAnnotationAttribute__NameAssignment_2 )
+            // InternalETMap.g:2106:2: rule__SimpleAnnotationAttribute__NameAssignment_2
             {
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__NameAssignment_2_in_rule__SimpleAnnotationAttribute__Group__2__Impl4269);
+            pushFollow(FOLLOW_2);
             rule__SimpleAnnotationAttribute__NameAssignment_2();
 
             state._fsp--;
@@ -5998,21 +5998,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__3"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2116:1: rule__SimpleAnnotationAttribute__Group__3 : rule__SimpleAnnotationAttribute__Group__3__Impl rule__SimpleAnnotationAttribute__Group__4 ;
+    // InternalETMap.g:2116:1: rule__SimpleAnnotationAttribute__Group__3 : rule__SimpleAnnotationAttribute__Group__3__Impl rule__SimpleAnnotationAttribute__Group__4 ;
     public final void rule__SimpleAnnotationAttribute__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2120:1: ( rule__SimpleAnnotationAttribute__Group__3__Impl rule__SimpleAnnotationAttribute__Group__4 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2121:2: rule__SimpleAnnotationAttribute__Group__3__Impl rule__SimpleAnnotationAttribute__Group__4
+            // InternalETMap.g:2120:1: ( rule__SimpleAnnotationAttribute__Group__3__Impl rule__SimpleAnnotationAttribute__Group__4 )
+            // InternalETMap.g:2121:2: rule__SimpleAnnotationAttribute__Group__3__Impl rule__SimpleAnnotationAttribute__Group__4
             {
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__3__Impl_in_rule__SimpleAnnotationAttribute__Group__34299);
+            pushFollow(FOLLOW_17);
             rule__SimpleAnnotationAttribute__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__4_in_rule__SimpleAnnotationAttribute__Group__34302);
+            pushFollow(FOLLOW_2);
             rule__SimpleAnnotationAttribute__Group__4();
 
             state._fsp--;
@@ -6036,20 +6036,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__3__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2128:1: rule__SimpleAnnotationAttribute__Group__3__Impl : ( ':' ) ;
+    // InternalETMap.g:2128:1: rule__SimpleAnnotationAttribute__Group__3__Impl : ( ':' ) ;
     public final void rule__SimpleAnnotationAttribute__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2132:1: ( ( ':' ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2133:1: ( ':' )
+            // InternalETMap.g:2132:1: ( ( ':' ) )
+            // InternalETMap.g:2133:1: ( ':' )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2133:1: ( ':' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2134:1: ':'
+            // InternalETMap.g:2133:1: ( ':' )
+            // InternalETMap.g:2134:1: ':'
             {
              before(grammarAccess.getSimpleAnnotationAttributeAccess().getColonKeyword_3()); 
-            match(input,32,FOLLOW_32_in_rule__SimpleAnnotationAttribute__Group__3__Impl4330); 
+            match(input,32,FOLLOW_2); 
              after(grammarAccess.getSimpleAnnotationAttributeAccess().getColonKeyword_3()); 
 
             }
@@ -6073,16 +6073,16 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__4"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2147:1: rule__SimpleAnnotationAttribute__Group__4 : rule__SimpleAnnotationAttribute__Group__4__Impl ;
+    // InternalETMap.g:2147:1: rule__SimpleAnnotationAttribute__Group__4 : rule__SimpleAnnotationAttribute__Group__4__Impl ;
     public final void rule__SimpleAnnotationAttribute__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2151:1: ( rule__SimpleAnnotationAttribute__Group__4__Impl )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2152:2: rule__SimpleAnnotationAttribute__Group__4__Impl
+            // InternalETMap.g:2151:1: ( rule__SimpleAnnotationAttribute__Group__4__Impl )
+            // InternalETMap.g:2152:2: rule__SimpleAnnotationAttribute__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__4__Impl_in_rule__SimpleAnnotationAttribute__Group__44361);
+            pushFollow(FOLLOW_2);
             rule__SimpleAnnotationAttribute__Group__4__Impl();
 
             state._fsp--;
@@ -6106,23 +6106,23 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__4__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2158:1: rule__SimpleAnnotationAttribute__Group__4__Impl : ( ( rule__SimpleAnnotationAttribute__TypeAssignment_4 ) ) ;
+    // InternalETMap.g:2158:1: rule__SimpleAnnotationAttribute__Group__4__Impl : ( ( rule__SimpleAnnotationAttribute__TypeAssignment_4 ) ) ;
     public final void rule__SimpleAnnotationAttribute__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2162:1: ( ( ( rule__SimpleAnnotationAttribute__TypeAssignment_4 ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2163:1: ( ( rule__SimpleAnnotationAttribute__TypeAssignment_4 ) )
+            // InternalETMap.g:2162:1: ( ( ( rule__SimpleAnnotationAttribute__TypeAssignment_4 ) ) )
+            // InternalETMap.g:2163:1: ( ( rule__SimpleAnnotationAttribute__TypeAssignment_4 ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2163:1: ( ( rule__SimpleAnnotationAttribute__TypeAssignment_4 ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2164:1: ( rule__SimpleAnnotationAttribute__TypeAssignment_4 )
+            // InternalETMap.g:2163:1: ( ( rule__SimpleAnnotationAttribute__TypeAssignment_4 ) )
+            // InternalETMap.g:2164:1: ( rule__SimpleAnnotationAttribute__TypeAssignment_4 )
             {
              before(grammarAccess.getSimpleAnnotationAttributeAccess().getTypeAssignment_4()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2165:1: ( rule__SimpleAnnotationAttribute__TypeAssignment_4 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2165:2: rule__SimpleAnnotationAttribute__TypeAssignment_4
+            // InternalETMap.g:2165:1: ( rule__SimpleAnnotationAttribute__TypeAssignment_4 )
+            // InternalETMap.g:2165:2: rule__SimpleAnnotationAttribute__TypeAssignment_4
             {
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__TypeAssignment_4_in_rule__SimpleAnnotationAttribute__Group__4__Impl4388);
+            pushFollow(FOLLOW_2);
             rule__SimpleAnnotationAttribute__TypeAssignment_4();
 
             state._fsp--;
@@ -6153,21 +6153,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__0"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2185:1: rule__EnumAnnotationAttribute__Group__0 : rule__EnumAnnotationAttribute__Group__0__Impl rule__EnumAnnotationAttribute__Group__1 ;
+    // InternalETMap.g:2185:1: rule__EnumAnnotationAttribute__Group__0 : rule__EnumAnnotationAttribute__Group__0__Impl rule__EnumAnnotationAttribute__Group__1 ;
     public final void rule__EnumAnnotationAttribute__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2189:1: ( rule__EnumAnnotationAttribute__Group__0__Impl rule__EnumAnnotationAttribute__Group__1 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2190:2: rule__EnumAnnotationAttribute__Group__0__Impl rule__EnumAnnotationAttribute__Group__1
+            // InternalETMap.g:2189:1: ( rule__EnumAnnotationAttribute__Group__0__Impl rule__EnumAnnotationAttribute__Group__1 )
+            // InternalETMap.g:2190:2: rule__EnumAnnotationAttribute__Group__0__Impl rule__EnumAnnotationAttribute__Group__1
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__0__Impl_in_rule__EnumAnnotationAttribute__Group__04428);
+            pushFollow(FOLLOW_15);
             rule__EnumAnnotationAttribute__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__1_in_rule__EnumAnnotationAttribute__Group__04431);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group__1();
 
             state._fsp--;
@@ -6191,23 +6191,23 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__0__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2197:1: rule__EnumAnnotationAttribute__Group__0__Impl : ( ( rule__EnumAnnotationAttribute__Alternatives_0 ) ) ;
+    // InternalETMap.g:2197:1: rule__EnumAnnotationAttribute__Group__0__Impl : ( ( rule__EnumAnnotationAttribute__Alternatives_0 ) ) ;
     public final void rule__EnumAnnotationAttribute__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2201:1: ( ( ( rule__EnumAnnotationAttribute__Alternatives_0 ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2202:1: ( ( rule__EnumAnnotationAttribute__Alternatives_0 ) )
+            // InternalETMap.g:2201:1: ( ( ( rule__EnumAnnotationAttribute__Alternatives_0 ) ) )
+            // InternalETMap.g:2202:1: ( ( rule__EnumAnnotationAttribute__Alternatives_0 ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2202:1: ( ( rule__EnumAnnotationAttribute__Alternatives_0 ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2203:1: ( rule__EnumAnnotationAttribute__Alternatives_0 )
+            // InternalETMap.g:2202:1: ( ( rule__EnumAnnotationAttribute__Alternatives_0 ) )
+            // InternalETMap.g:2203:1: ( rule__EnumAnnotationAttribute__Alternatives_0 )
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getAlternatives_0()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2204:1: ( rule__EnumAnnotationAttribute__Alternatives_0 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2204:2: rule__EnumAnnotationAttribute__Alternatives_0
+            // InternalETMap.g:2204:1: ( rule__EnumAnnotationAttribute__Alternatives_0 )
+            // InternalETMap.g:2204:2: rule__EnumAnnotationAttribute__Alternatives_0
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Alternatives_0_in_rule__EnumAnnotationAttribute__Group__0__Impl4458);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Alternatives_0();
 
             state._fsp--;
@@ -6238,21 +6238,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__1"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2214:1: rule__EnumAnnotationAttribute__Group__1 : rule__EnumAnnotationAttribute__Group__1__Impl rule__EnumAnnotationAttribute__Group__2 ;
+    // InternalETMap.g:2214:1: rule__EnumAnnotationAttribute__Group__1 : rule__EnumAnnotationAttribute__Group__1__Impl rule__EnumAnnotationAttribute__Group__2 ;
     public final void rule__EnumAnnotationAttribute__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2218:1: ( rule__EnumAnnotationAttribute__Group__1__Impl rule__EnumAnnotationAttribute__Group__2 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2219:2: rule__EnumAnnotationAttribute__Group__1__Impl rule__EnumAnnotationAttribute__Group__2
+            // InternalETMap.g:2218:1: ( rule__EnumAnnotationAttribute__Group__1__Impl rule__EnumAnnotationAttribute__Group__2 )
+            // InternalETMap.g:2219:2: rule__EnumAnnotationAttribute__Group__1__Impl rule__EnumAnnotationAttribute__Group__2
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__1__Impl_in_rule__EnumAnnotationAttribute__Group__14488);
+            pushFollow(FOLLOW_3);
             rule__EnumAnnotationAttribute__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__2_in_rule__EnumAnnotationAttribute__Group__14491);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group__2();
 
             state._fsp--;
@@ -6276,20 +6276,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__1__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2226:1: rule__EnumAnnotationAttribute__Group__1__Impl : ( 'attribute' ) ;
+    // InternalETMap.g:2226:1: rule__EnumAnnotationAttribute__Group__1__Impl : ( 'attribute' ) ;
     public final void rule__EnumAnnotationAttribute__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2230:1: ( ( 'attribute' ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2231:1: ( 'attribute' )
+            // InternalETMap.g:2230:1: ( ( 'attribute' ) )
+            // InternalETMap.g:2231:1: ( 'attribute' )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2231:1: ( 'attribute' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2232:1: 'attribute'
+            // InternalETMap.g:2231:1: ( 'attribute' )
+            // InternalETMap.g:2232:1: 'attribute'
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getAttributeKeyword_1()); 
-            match(input,31,FOLLOW_31_in_rule__EnumAnnotationAttribute__Group__1__Impl4519); 
+            match(input,31,FOLLOW_2); 
              after(grammarAccess.getEnumAnnotationAttributeAccess().getAttributeKeyword_1()); 
 
             }
@@ -6313,21 +6313,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__2"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2245:1: rule__EnumAnnotationAttribute__Group__2 : rule__EnumAnnotationAttribute__Group__2__Impl rule__EnumAnnotationAttribute__Group__3 ;
+    // InternalETMap.g:2245:1: rule__EnumAnnotationAttribute__Group__2 : rule__EnumAnnotationAttribute__Group__2__Impl rule__EnumAnnotationAttribute__Group__3 ;
     public final void rule__EnumAnnotationAttribute__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2249:1: ( rule__EnumAnnotationAttribute__Group__2__Impl rule__EnumAnnotationAttribute__Group__3 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2250:2: rule__EnumAnnotationAttribute__Group__2__Impl rule__EnumAnnotationAttribute__Group__3
+            // InternalETMap.g:2249:1: ( rule__EnumAnnotationAttribute__Group__2__Impl rule__EnumAnnotationAttribute__Group__3 )
+            // InternalETMap.g:2250:2: rule__EnumAnnotationAttribute__Group__2__Impl rule__EnumAnnotationAttribute__Group__3
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__2__Impl_in_rule__EnumAnnotationAttribute__Group__24550);
+            pushFollow(FOLLOW_16);
             rule__EnumAnnotationAttribute__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__3_in_rule__EnumAnnotationAttribute__Group__24553);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group__3();
 
             state._fsp--;
@@ -6351,23 +6351,23 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__2__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2257:1: rule__EnumAnnotationAttribute__Group__2__Impl : ( ( rule__EnumAnnotationAttribute__NameAssignment_2 ) ) ;
+    // InternalETMap.g:2257:1: rule__EnumAnnotationAttribute__Group__2__Impl : ( ( rule__EnumAnnotationAttribute__NameAssignment_2 ) ) ;
     public final void rule__EnumAnnotationAttribute__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2261:1: ( ( ( rule__EnumAnnotationAttribute__NameAssignment_2 ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2262:1: ( ( rule__EnumAnnotationAttribute__NameAssignment_2 ) )
+            // InternalETMap.g:2261:1: ( ( ( rule__EnumAnnotationAttribute__NameAssignment_2 ) ) )
+            // InternalETMap.g:2262:1: ( ( rule__EnumAnnotationAttribute__NameAssignment_2 ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2262:1: ( ( rule__EnumAnnotationAttribute__NameAssignment_2 ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2263:1: ( rule__EnumAnnotationAttribute__NameAssignment_2 )
+            // InternalETMap.g:2262:1: ( ( rule__EnumAnnotationAttribute__NameAssignment_2 ) )
+            // InternalETMap.g:2263:1: ( rule__EnumAnnotationAttribute__NameAssignment_2 )
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getNameAssignment_2()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2264:1: ( rule__EnumAnnotationAttribute__NameAssignment_2 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2264:2: rule__EnumAnnotationAttribute__NameAssignment_2
+            // InternalETMap.g:2264:1: ( rule__EnumAnnotationAttribute__NameAssignment_2 )
+            // InternalETMap.g:2264:2: rule__EnumAnnotationAttribute__NameAssignment_2
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__NameAssignment_2_in_rule__EnumAnnotationAttribute__Group__2__Impl4580);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__NameAssignment_2();
 
             state._fsp--;
@@ -6398,21 +6398,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__3"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2274:1: rule__EnumAnnotationAttribute__Group__3 : rule__EnumAnnotationAttribute__Group__3__Impl rule__EnumAnnotationAttribute__Group__4 ;
+    // InternalETMap.g:2274:1: rule__EnumAnnotationAttribute__Group__3 : rule__EnumAnnotationAttribute__Group__3__Impl rule__EnumAnnotationAttribute__Group__4 ;
     public final void rule__EnumAnnotationAttribute__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2278:1: ( rule__EnumAnnotationAttribute__Group__3__Impl rule__EnumAnnotationAttribute__Group__4 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2279:2: rule__EnumAnnotationAttribute__Group__3__Impl rule__EnumAnnotationAttribute__Group__4
+            // InternalETMap.g:2278:1: ( rule__EnumAnnotationAttribute__Group__3__Impl rule__EnumAnnotationAttribute__Group__4 )
+            // InternalETMap.g:2279:2: rule__EnumAnnotationAttribute__Group__3__Impl rule__EnumAnnotationAttribute__Group__4
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__3__Impl_in_rule__EnumAnnotationAttribute__Group__34610);
+            pushFollow(FOLLOW_4);
             rule__EnumAnnotationAttribute__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__4_in_rule__EnumAnnotationAttribute__Group__34613);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group__4();
 
             state._fsp--;
@@ -6436,20 +6436,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__3__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2286:1: rule__EnumAnnotationAttribute__Group__3__Impl : ( ':' ) ;
+    // InternalETMap.g:2286:1: rule__EnumAnnotationAttribute__Group__3__Impl : ( ':' ) ;
     public final void rule__EnumAnnotationAttribute__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2290:1: ( ( ':' ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2291:1: ( ':' )
+            // InternalETMap.g:2290:1: ( ( ':' ) )
+            // InternalETMap.g:2291:1: ( ':' )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2291:1: ( ':' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2292:1: ':'
+            // InternalETMap.g:2291:1: ( ':' )
+            // InternalETMap.g:2292:1: ':'
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getColonKeyword_3()); 
-            match(input,32,FOLLOW_32_in_rule__EnumAnnotationAttribute__Group__3__Impl4641); 
+            match(input,32,FOLLOW_2); 
              after(grammarAccess.getEnumAnnotationAttributeAccess().getColonKeyword_3()); 
 
             }
@@ -6473,21 +6473,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__4"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2305:1: rule__EnumAnnotationAttribute__Group__4 : rule__EnumAnnotationAttribute__Group__4__Impl rule__EnumAnnotationAttribute__Group__5 ;
+    // InternalETMap.g:2305:1: rule__EnumAnnotationAttribute__Group__4 : rule__EnumAnnotationAttribute__Group__4__Impl rule__EnumAnnotationAttribute__Group__5 ;
     public final void rule__EnumAnnotationAttribute__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2309:1: ( rule__EnumAnnotationAttribute__Group__4__Impl rule__EnumAnnotationAttribute__Group__5 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2310:2: rule__EnumAnnotationAttribute__Group__4__Impl rule__EnumAnnotationAttribute__Group__5
+            // InternalETMap.g:2309:1: ( rule__EnumAnnotationAttribute__Group__4__Impl rule__EnumAnnotationAttribute__Group__5 )
+            // InternalETMap.g:2310:2: rule__EnumAnnotationAttribute__Group__4__Impl rule__EnumAnnotationAttribute__Group__5
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__4__Impl_in_rule__EnumAnnotationAttribute__Group__44672);
+            pushFollow(FOLLOW_18);
             rule__EnumAnnotationAttribute__Group__4__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__5_in_rule__EnumAnnotationAttribute__Group__44675);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group__5();
 
             state._fsp--;
@@ -6511,20 +6511,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__4__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2317:1: rule__EnumAnnotationAttribute__Group__4__Impl : ( '{' ) ;
+    // InternalETMap.g:2317:1: rule__EnumAnnotationAttribute__Group__4__Impl : ( '{' ) ;
     public final void rule__EnumAnnotationAttribute__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2321:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2322:1: ( '{' )
+            // InternalETMap.g:2321:1: ( ( '{' ) )
+            // InternalETMap.g:2322:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2322:1: ( '{' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2323:1: '{'
+            // InternalETMap.g:2322:1: ( '{' )
+            // InternalETMap.g:2323:1: '{'
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getLeftCurlyBracketKeyword_4()); 
-            match(input,24,FOLLOW_24_in_rule__EnumAnnotationAttribute__Group__4__Impl4703); 
+            match(input,24,FOLLOW_2); 
              after(grammarAccess.getEnumAnnotationAttributeAccess().getLeftCurlyBracketKeyword_4()); 
 
             }
@@ -6548,21 +6548,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__5"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2336:1: rule__EnumAnnotationAttribute__Group__5 : rule__EnumAnnotationAttribute__Group__5__Impl rule__EnumAnnotationAttribute__Group__6 ;
+    // InternalETMap.g:2336:1: rule__EnumAnnotationAttribute__Group__5 : rule__EnumAnnotationAttribute__Group__5__Impl rule__EnumAnnotationAttribute__Group__6 ;
     public final void rule__EnumAnnotationAttribute__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2340:1: ( rule__EnumAnnotationAttribute__Group__5__Impl rule__EnumAnnotationAttribute__Group__6 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2341:2: rule__EnumAnnotationAttribute__Group__5__Impl rule__EnumAnnotationAttribute__Group__6
+            // InternalETMap.g:2340:1: ( rule__EnumAnnotationAttribute__Group__5__Impl rule__EnumAnnotationAttribute__Group__6 )
+            // InternalETMap.g:2341:2: rule__EnumAnnotationAttribute__Group__5__Impl rule__EnumAnnotationAttribute__Group__6
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__5__Impl_in_rule__EnumAnnotationAttribute__Group__54734);
+            pushFollow(FOLLOW_19);
             rule__EnumAnnotationAttribute__Group__5__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__6_in_rule__EnumAnnotationAttribute__Group__54737);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group__6();
 
             state._fsp--;
@@ -6586,23 +6586,23 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__5__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2348:1: rule__EnumAnnotationAttribute__Group__5__Impl : ( ( rule__EnumAnnotationAttribute__ValuesAssignment_5 ) ) ;
+    // InternalETMap.g:2348:1: rule__EnumAnnotationAttribute__Group__5__Impl : ( ( rule__EnumAnnotationAttribute__ValuesAssignment_5 ) ) ;
     public final void rule__EnumAnnotationAttribute__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2352:1: ( ( ( rule__EnumAnnotationAttribute__ValuesAssignment_5 ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2353:1: ( ( rule__EnumAnnotationAttribute__ValuesAssignment_5 ) )
+            // InternalETMap.g:2352:1: ( ( ( rule__EnumAnnotationAttribute__ValuesAssignment_5 ) ) )
+            // InternalETMap.g:2353:1: ( ( rule__EnumAnnotationAttribute__ValuesAssignment_5 ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2353:1: ( ( rule__EnumAnnotationAttribute__ValuesAssignment_5 ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2354:1: ( rule__EnumAnnotationAttribute__ValuesAssignment_5 )
+            // InternalETMap.g:2353:1: ( ( rule__EnumAnnotationAttribute__ValuesAssignment_5 ) )
+            // InternalETMap.g:2354:1: ( rule__EnumAnnotationAttribute__ValuesAssignment_5 )
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getValuesAssignment_5()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2355:1: ( rule__EnumAnnotationAttribute__ValuesAssignment_5 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2355:2: rule__EnumAnnotationAttribute__ValuesAssignment_5
+            // InternalETMap.g:2355:1: ( rule__EnumAnnotationAttribute__ValuesAssignment_5 )
+            // InternalETMap.g:2355:2: rule__EnumAnnotationAttribute__ValuesAssignment_5
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__ValuesAssignment_5_in_rule__EnumAnnotationAttribute__Group__5__Impl4764);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__ValuesAssignment_5();
 
             state._fsp--;
@@ -6633,21 +6633,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__6"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2365:1: rule__EnumAnnotationAttribute__Group__6 : rule__EnumAnnotationAttribute__Group__6__Impl rule__EnumAnnotationAttribute__Group__7 ;
+    // InternalETMap.g:2365:1: rule__EnumAnnotationAttribute__Group__6 : rule__EnumAnnotationAttribute__Group__6__Impl rule__EnumAnnotationAttribute__Group__7 ;
     public final void rule__EnumAnnotationAttribute__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2369:1: ( rule__EnumAnnotationAttribute__Group__6__Impl rule__EnumAnnotationAttribute__Group__7 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2370:2: rule__EnumAnnotationAttribute__Group__6__Impl rule__EnumAnnotationAttribute__Group__7
+            // InternalETMap.g:2369:1: ( rule__EnumAnnotationAttribute__Group__6__Impl rule__EnumAnnotationAttribute__Group__7 )
+            // InternalETMap.g:2370:2: rule__EnumAnnotationAttribute__Group__6__Impl rule__EnumAnnotationAttribute__Group__7
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__6__Impl_in_rule__EnumAnnotationAttribute__Group__64794);
+            pushFollow(FOLLOW_19);
             rule__EnumAnnotationAttribute__Group__6__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__7_in_rule__EnumAnnotationAttribute__Group__64797);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group__7();
 
             state._fsp--;
@@ -6671,20 +6671,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__6__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2377:1: rule__EnumAnnotationAttribute__Group__6__Impl : ( ( rule__EnumAnnotationAttribute__Group_6__0 )* ) ;
+    // InternalETMap.g:2377:1: rule__EnumAnnotationAttribute__Group__6__Impl : ( ( rule__EnumAnnotationAttribute__Group_6__0 )* ) ;
     public final void rule__EnumAnnotationAttribute__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2381:1: ( ( ( rule__EnumAnnotationAttribute__Group_6__0 )* ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2382:1: ( ( rule__EnumAnnotationAttribute__Group_6__0 )* )
+            // InternalETMap.g:2381:1: ( ( ( rule__EnumAnnotationAttribute__Group_6__0 )* ) )
+            // InternalETMap.g:2382:1: ( ( rule__EnumAnnotationAttribute__Group_6__0 )* )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2382:1: ( ( rule__EnumAnnotationAttribute__Group_6__0 )* )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2383:1: ( rule__EnumAnnotationAttribute__Group_6__0 )*
+            // InternalETMap.g:2382:1: ( ( rule__EnumAnnotationAttribute__Group_6__0 )* )
+            // InternalETMap.g:2383:1: ( rule__EnumAnnotationAttribute__Group_6__0 )*
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getGroup_6()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2384:1: ( rule__EnumAnnotationAttribute__Group_6__0 )*
+            // InternalETMap.g:2384:1: ( rule__EnumAnnotationAttribute__Group_6__0 )*
             loop21:
             do {
                 int alt21=2;
@@ -6697,9 +6697,9 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
                 switch (alt21) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2384:2: rule__EnumAnnotationAttribute__Group_6__0
+            	    // InternalETMap.g:2384:2: rule__EnumAnnotationAttribute__Group_6__0
             	    {
-            	    pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group_6__0_in_rule__EnumAnnotationAttribute__Group__6__Impl4824);
+            	    pushFollow(FOLLOW_20);
             	    rule__EnumAnnotationAttribute__Group_6__0();
 
             	    state._fsp--;
@@ -6736,16 +6736,16 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__7"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2394:1: rule__EnumAnnotationAttribute__Group__7 : rule__EnumAnnotationAttribute__Group__7__Impl ;
+    // InternalETMap.g:2394:1: rule__EnumAnnotationAttribute__Group__7 : rule__EnumAnnotationAttribute__Group__7__Impl ;
     public final void rule__EnumAnnotationAttribute__Group__7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2398:1: ( rule__EnumAnnotationAttribute__Group__7__Impl )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2399:2: rule__EnumAnnotationAttribute__Group__7__Impl
+            // InternalETMap.g:2398:1: ( rule__EnumAnnotationAttribute__Group__7__Impl )
+            // InternalETMap.g:2399:2: rule__EnumAnnotationAttribute__Group__7__Impl
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__7__Impl_in_rule__EnumAnnotationAttribute__Group__74855);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group__7__Impl();
 
             state._fsp--;
@@ -6769,20 +6769,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__7__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2405:1: rule__EnumAnnotationAttribute__Group__7__Impl : ( '}' ) ;
+    // InternalETMap.g:2405:1: rule__EnumAnnotationAttribute__Group__7__Impl : ( '}' ) ;
     public final void rule__EnumAnnotationAttribute__Group__7__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2409:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2410:1: ( '}' )
+            // InternalETMap.g:2409:1: ( ( '}' ) )
+            // InternalETMap.g:2410:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2410:1: ( '}' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2411:1: '}'
+            // InternalETMap.g:2410:1: ( '}' )
+            // InternalETMap.g:2411:1: '}'
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getRightCurlyBracketKeyword_7()); 
-            match(input,25,FOLLOW_25_in_rule__EnumAnnotationAttribute__Group__7__Impl4883); 
+            match(input,25,FOLLOW_2); 
              after(grammarAccess.getEnumAnnotationAttributeAccess().getRightCurlyBracketKeyword_7()); 
 
             }
@@ -6806,21 +6806,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group_6__0"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2440:1: rule__EnumAnnotationAttribute__Group_6__0 : rule__EnumAnnotationAttribute__Group_6__0__Impl rule__EnumAnnotationAttribute__Group_6__1 ;
+    // InternalETMap.g:2440:1: rule__EnumAnnotationAttribute__Group_6__0 : rule__EnumAnnotationAttribute__Group_6__0__Impl rule__EnumAnnotationAttribute__Group_6__1 ;
     public final void rule__EnumAnnotationAttribute__Group_6__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2444:1: ( rule__EnumAnnotationAttribute__Group_6__0__Impl rule__EnumAnnotationAttribute__Group_6__1 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2445:2: rule__EnumAnnotationAttribute__Group_6__0__Impl rule__EnumAnnotationAttribute__Group_6__1
+            // InternalETMap.g:2444:1: ( rule__EnumAnnotationAttribute__Group_6__0__Impl rule__EnumAnnotationAttribute__Group_6__1 )
+            // InternalETMap.g:2445:2: rule__EnumAnnotationAttribute__Group_6__0__Impl rule__EnumAnnotationAttribute__Group_6__1
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group_6__0__Impl_in_rule__EnumAnnotationAttribute__Group_6__04930);
+            pushFollow(FOLLOW_18);
             rule__EnumAnnotationAttribute__Group_6__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group_6__1_in_rule__EnumAnnotationAttribute__Group_6__04933);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group_6__1();
 
             state._fsp--;
@@ -6844,20 +6844,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group_6__0__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2452:1: rule__EnumAnnotationAttribute__Group_6__0__Impl : ( ',' ) ;
+    // InternalETMap.g:2452:1: rule__EnumAnnotationAttribute__Group_6__0__Impl : ( ',' ) ;
     public final void rule__EnumAnnotationAttribute__Group_6__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2456:1: ( ( ',' ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2457:1: ( ',' )
+            // InternalETMap.g:2456:1: ( ( ',' ) )
+            // InternalETMap.g:2457:1: ( ',' )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2457:1: ( ',' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2458:1: ','
+            // InternalETMap.g:2457:1: ( ',' )
+            // InternalETMap.g:2458:1: ','
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getCommaKeyword_6_0()); 
-            match(input,33,FOLLOW_33_in_rule__EnumAnnotationAttribute__Group_6__0__Impl4961); 
+            match(input,33,FOLLOW_2); 
              after(grammarAccess.getEnumAnnotationAttributeAccess().getCommaKeyword_6_0()); 
 
             }
@@ -6881,16 +6881,16 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group_6__1"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2471:1: rule__EnumAnnotationAttribute__Group_6__1 : rule__EnumAnnotationAttribute__Group_6__1__Impl ;
+    // InternalETMap.g:2471:1: rule__EnumAnnotationAttribute__Group_6__1 : rule__EnumAnnotationAttribute__Group_6__1__Impl ;
     public final void rule__EnumAnnotationAttribute__Group_6__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2475:1: ( rule__EnumAnnotationAttribute__Group_6__1__Impl )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2476:2: rule__EnumAnnotationAttribute__Group_6__1__Impl
+            // InternalETMap.g:2475:1: ( rule__EnumAnnotationAttribute__Group_6__1__Impl )
+            // InternalETMap.g:2476:2: rule__EnumAnnotationAttribute__Group_6__1__Impl
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group_6__1__Impl_in_rule__EnumAnnotationAttribute__Group_6__14992);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group_6__1__Impl();
 
             state._fsp--;
@@ -6914,23 +6914,23 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group_6__1__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2482:1: rule__EnumAnnotationAttribute__Group_6__1__Impl : ( ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 ) ) ;
+    // InternalETMap.g:2482:1: rule__EnumAnnotationAttribute__Group_6__1__Impl : ( ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 ) ) ;
     public final void rule__EnumAnnotationAttribute__Group_6__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2486:1: ( ( ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2487:1: ( ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 ) )
+            // InternalETMap.g:2486:1: ( ( ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 ) ) )
+            // InternalETMap.g:2487:1: ( ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2487:1: ( ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2488:1: ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 )
+            // InternalETMap.g:2487:1: ( ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 ) )
+            // InternalETMap.g:2488:1: ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 )
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getValuesAssignment_6_1()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2489:1: ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2489:2: rule__EnumAnnotationAttribute__ValuesAssignment_6_1
+            // InternalETMap.g:2489:1: ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 )
+            // InternalETMap.g:2489:2: rule__EnumAnnotationAttribute__ValuesAssignment_6_1
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__ValuesAssignment_6_1_in_rule__EnumAnnotationAttribute__Group_6__1__Impl5019);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__ValuesAssignment_6_1();
 
             state._fsp--;
@@ -6961,21 +6961,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Import__Group__0"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2503:1: rule__Import__Group__0 : rule__Import__Group__0__Impl rule__Import__Group__1 ;
+    // InternalETMap.g:2503:1: rule__Import__Group__0 : rule__Import__Group__0__Impl rule__Import__Group__1 ;
     public final void rule__Import__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2507:1: ( rule__Import__Group__0__Impl rule__Import__Group__1 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2508:2: rule__Import__Group__0__Impl rule__Import__Group__1
+            // InternalETMap.g:2507:1: ( rule__Import__Group__0__Impl rule__Import__Group__1 )
+            // InternalETMap.g:2508:2: rule__Import__Group__0__Impl rule__Import__Group__1
             {
-            pushFollow(FOLLOW_rule__Import__Group__0__Impl_in_rule__Import__Group__05053);
+            pushFollow(FOLLOW_21);
             rule__Import__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Import__Group__1_in_rule__Import__Group__05056);
+            pushFollow(FOLLOW_2);
             rule__Import__Group__1();
 
             state._fsp--;
@@ -6999,20 +6999,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Import__Group__0__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2515:1: rule__Import__Group__0__Impl : ( 'import' ) ;
+    // InternalETMap.g:2515:1: rule__Import__Group__0__Impl : ( 'import' ) ;
     public final void rule__Import__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2519:1: ( ( 'import' ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2520:1: ( 'import' )
+            // InternalETMap.g:2519:1: ( ( 'import' ) )
+            // InternalETMap.g:2520:1: ( 'import' )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2520:1: ( 'import' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2521:1: 'import'
+            // InternalETMap.g:2520:1: ( 'import' )
+            // InternalETMap.g:2521:1: 'import'
             {
              before(grammarAccess.getImportAccess().getImportKeyword_0()); 
-            match(input,34,FOLLOW_34_in_rule__Import__Group__0__Impl5084); 
+            match(input,34,FOLLOW_2); 
              after(grammarAccess.getImportAccess().getImportKeyword_0()); 
 
             }
@@ -7036,21 +7036,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Import__Group__1"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2534:1: rule__Import__Group__1 : rule__Import__Group__1__Impl rule__Import__Group__2 ;
+    // InternalETMap.g:2534:1: rule__Import__Group__1 : rule__Import__Group__1__Impl rule__Import__Group__2 ;
     public final void rule__Import__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2538:1: ( rule__Import__Group__1__Impl rule__Import__Group__2 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2539:2: rule__Import__Group__1__Impl rule__Import__Group__2
+            // InternalETMap.g:2538:1: ( rule__Import__Group__1__Impl rule__Import__Group__2 )
+            // InternalETMap.g:2539:2: rule__Import__Group__1__Impl rule__Import__Group__2
             {
-            pushFollow(FOLLOW_rule__Import__Group__1__Impl_in_rule__Import__Group__15115);
+            pushFollow(FOLLOW_18);
             rule__Import__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Import__Group__2_in_rule__Import__Group__15118);
+            pushFollow(FOLLOW_2);
             rule__Import__Group__2();
 
             state._fsp--;
@@ -7074,23 +7074,23 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Import__Group__1__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2546:1: rule__Import__Group__1__Impl : ( ( rule__Import__Alternatives_1 ) ) ;
+    // InternalETMap.g:2546:1: rule__Import__Group__1__Impl : ( ( rule__Import__Alternatives_1 ) ) ;
     public final void rule__Import__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2550:1: ( ( ( rule__Import__Alternatives_1 ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2551:1: ( ( rule__Import__Alternatives_1 ) )
+            // InternalETMap.g:2550:1: ( ( ( rule__Import__Alternatives_1 ) ) )
+            // InternalETMap.g:2551:1: ( ( rule__Import__Alternatives_1 ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2551:1: ( ( rule__Import__Alternatives_1 ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2552:1: ( rule__Import__Alternatives_1 )
+            // InternalETMap.g:2551:1: ( ( rule__Import__Alternatives_1 ) )
+            // InternalETMap.g:2552:1: ( rule__Import__Alternatives_1 )
             {
              before(grammarAccess.getImportAccess().getAlternatives_1()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2553:1: ( rule__Import__Alternatives_1 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2553:2: rule__Import__Alternatives_1
+            // InternalETMap.g:2553:1: ( rule__Import__Alternatives_1 )
+            // InternalETMap.g:2553:2: rule__Import__Alternatives_1
             {
-            pushFollow(FOLLOW_rule__Import__Alternatives_1_in_rule__Import__Group__1__Impl5145);
+            pushFollow(FOLLOW_2);
             rule__Import__Alternatives_1();
 
             state._fsp--;
@@ -7121,16 +7121,16 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Import__Group__2"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2563:1: rule__Import__Group__2 : rule__Import__Group__2__Impl ;
+    // InternalETMap.g:2563:1: rule__Import__Group__2 : rule__Import__Group__2__Impl ;
     public final void rule__Import__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2567:1: ( rule__Import__Group__2__Impl )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2568:2: rule__Import__Group__2__Impl
+            // InternalETMap.g:2567:1: ( rule__Import__Group__2__Impl )
+            // InternalETMap.g:2568:2: rule__Import__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__Import__Group__2__Impl_in_rule__Import__Group__25175);
+            pushFollow(FOLLOW_2);
             rule__Import__Group__2__Impl();
 
             state._fsp--;
@@ -7154,23 +7154,23 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Import__Group__2__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2574:1: rule__Import__Group__2__Impl : ( ( rule__Import__ImportURIAssignment_2 ) ) ;
+    // InternalETMap.g:2574:1: rule__Import__Group__2__Impl : ( ( rule__Import__ImportURIAssignment_2 ) ) ;
     public final void rule__Import__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2578:1: ( ( ( rule__Import__ImportURIAssignment_2 ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2579:1: ( ( rule__Import__ImportURIAssignment_2 ) )
+            // InternalETMap.g:2578:1: ( ( ( rule__Import__ImportURIAssignment_2 ) ) )
+            // InternalETMap.g:2579:1: ( ( rule__Import__ImportURIAssignment_2 ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2579:1: ( ( rule__Import__ImportURIAssignment_2 ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2580:1: ( rule__Import__ImportURIAssignment_2 )
+            // InternalETMap.g:2579:1: ( ( rule__Import__ImportURIAssignment_2 ) )
+            // InternalETMap.g:2580:1: ( rule__Import__ImportURIAssignment_2 )
             {
              before(grammarAccess.getImportAccess().getImportURIAssignment_2()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2581:1: ( rule__Import__ImportURIAssignment_2 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2581:2: rule__Import__ImportURIAssignment_2
+            // InternalETMap.g:2581:1: ( rule__Import__ImportURIAssignment_2 )
+            // InternalETMap.g:2581:2: rule__Import__ImportURIAssignment_2
             {
-            pushFollow(FOLLOW_rule__Import__ImportURIAssignment_2_in_rule__Import__Group__2__Impl5202);
+            pushFollow(FOLLOW_2);
             rule__Import__ImportURIAssignment_2();
 
             state._fsp--;
@@ -7201,21 +7201,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Import__Group_1_0__0"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2597:1: rule__Import__Group_1_0__0 : rule__Import__Group_1_0__0__Impl rule__Import__Group_1_0__1 ;
+    // InternalETMap.g:2597:1: rule__Import__Group_1_0__0 : rule__Import__Group_1_0__0__Impl rule__Import__Group_1_0__1 ;
     public final void rule__Import__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2601:1: ( rule__Import__Group_1_0__0__Impl rule__Import__Group_1_0__1 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2602:2: rule__Import__Group_1_0__0__Impl rule__Import__Group_1_0__1
+            // InternalETMap.g:2601:1: ( rule__Import__Group_1_0__0__Impl rule__Import__Group_1_0__1 )
+            // InternalETMap.g:2602:2: rule__Import__Group_1_0__0__Impl rule__Import__Group_1_0__1
             {
-            pushFollow(FOLLOW_rule__Import__Group_1_0__0__Impl_in_rule__Import__Group_1_0__05238);
+            pushFollow(FOLLOW_22);
             rule__Import__Group_1_0__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Import__Group_1_0__1_in_rule__Import__Group_1_0__05241);
+            pushFollow(FOLLOW_2);
             rule__Import__Group_1_0__1();
 
             state._fsp--;
@@ -7239,23 +7239,23 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Import__Group_1_0__0__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2609:1: rule__Import__Group_1_0__0__Impl : ( ( rule__Import__ImportedNamespaceAssignment_1_0_0 ) ) ;
+    // InternalETMap.g:2609:1: rule__Import__Group_1_0__0__Impl : ( ( rule__Import__ImportedNamespaceAssignment_1_0_0 ) ) ;
     public final void rule__Import__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2613:1: ( ( ( rule__Import__ImportedNamespaceAssignment_1_0_0 ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2614:1: ( ( rule__Import__ImportedNamespaceAssignment_1_0_0 ) )
+            // InternalETMap.g:2613:1: ( ( ( rule__Import__ImportedNamespaceAssignment_1_0_0 ) ) )
+            // InternalETMap.g:2614:1: ( ( rule__Import__ImportedNamespaceAssignment_1_0_0 ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2614:1: ( ( rule__Import__ImportedNamespaceAssignment_1_0_0 ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2615:1: ( rule__Import__ImportedNamespaceAssignment_1_0_0 )
+            // InternalETMap.g:2614:1: ( ( rule__Import__ImportedNamespaceAssignment_1_0_0 ) )
+            // InternalETMap.g:2615:1: ( rule__Import__ImportedNamespaceAssignment_1_0_0 )
             {
              before(grammarAccess.getImportAccess().getImportedNamespaceAssignment_1_0_0()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2616:1: ( rule__Import__ImportedNamespaceAssignment_1_0_0 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2616:2: rule__Import__ImportedNamespaceAssignment_1_0_0
+            // InternalETMap.g:2616:1: ( rule__Import__ImportedNamespaceAssignment_1_0_0 )
+            // InternalETMap.g:2616:2: rule__Import__ImportedNamespaceAssignment_1_0_0
             {
-            pushFollow(FOLLOW_rule__Import__ImportedNamespaceAssignment_1_0_0_in_rule__Import__Group_1_0__0__Impl5268);
+            pushFollow(FOLLOW_2);
             rule__Import__ImportedNamespaceAssignment_1_0_0();
 
             state._fsp--;
@@ -7286,16 +7286,16 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Import__Group_1_0__1"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2626:1: rule__Import__Group_1_0__1 : rule__Import__Group_1_0__1__Impl ;
+    // InternalETMap.g:2626:1: rule__Import__Group_1_0__1 : rule__Import__Group_1_0__1__Impl ;
     public final void rule__Import__Group_1_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2630:1: ( rule__Import__Group_1_0__1__Impl )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2631:2: rule__Import__Group_1_0__1__Impl
+            // InternalETMap.g:2630:1: ( rule__Import__Group_1_0__1__Impl )
+            // InternalETMap.g:2631:2: rule__Import__Group_1_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__Import__Group_1_0__1__Impl_in_rule__Import__Group_1_0__15298);
+            pushFollow(FOLLOW_2);
             rule__Import__Group_1_0__1__Impl();
 
             state._fsp--;
@@ -7319,20 +7319,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Import__Group_1_0__1__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2637:1: rule__Import__Group_1_0__1__Impl : ( 'from' ) ;
+    // InternalETMap.g:2637:1: rule__Import__Group_1_0__1__Impl : ( 'from' ) ;
     public final void rule__Import__Group_1_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2641:1: ( ( 'from' ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2642:1: ( 'from' )
+            // InternalETMap.g:2641:1: ( ( 'from' ) )
+            // InternalETMap.g:2642:1: ( 'from' )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2642:1: ( 'from' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2643:1: 'from'
+            // InternalETMap.g:2642:1: ( 'from' )
+            // InternalETMap.g:2643:1: 'from'
             {
              before(grammarAccess.getImportAccess().getFromKeyword_1_0_1()); 
-            match(input,35,FOLLOW_35_in_rule__Import__Group_1_0__1__Impl5326); 
+            match(input,35,FOLLOW_2); 
              after(grammarAccess.getImportAccess().getFromKeyword_1_0_1()); 
 
             }
@@ -7356,21 +7356,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ImportedFQN__Group__0"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2660:1: rule__ImportedFQN__Group__0 : rule__ImportedFQN__Group__0__Impl rule__ImportedFQN__Group__1 ;
+    // InternalETMap.g:2660:1: rule__ImportedFQN__Group__0 : rule__ImportedFQN__Group__0__Impl rule__ImportedFQN__Group__1 ;
     public final void rule__ImportedFQN__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2664:1: ( rule__ImportedFQN__Group__0__Impl rule__ImportedFQN__Group__1 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2665:2: rule__ImportedFQN__Group__0__Impl rule__ImportedFQN__Group__1
+            // InternalETMap.g:2664:1: ( rule__ImportedFQN__Group__0__Impl rule__ImportedFQN__Group__1 )
+            // InternalETMap.g:2665:2: rule__ImportedFQN__Group__0__Impl rule__ImportedFQN__Group__1
             {
-            pushFollow(FOLLOW_rule__ImportedFQN__Group__0__Impl_in_rule__ImportedFQN__Group__05361);
+            pushFollow(FOLLOW_23);
             rule__ImportedFQN__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ImportedFQN__Group__1_in_rule__ImportedFQN__Group__05364);
+            pushFollow(FOLLOW_2);
             rule__ImportedFQN__Group__1();
 
             state._fsp--;
@@ -7394,20 +7394,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ImportedFQN__Group__0__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2672:1: rule__ImportedFQN__Group__0__Impl : ( ruleFQN ) ;
+    // InternalETMap.g:2672:1: rule__ImportedFQN__Group__0__Impl : ( ruleFQN ) ;
     public final void rule__ImportedFQN__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2676:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2677:1: ( ruleFQN )
+            // InternalETMap.g:2676:1: ( ( ruleFQN ) )
+            // InternalETMap.g:2677:1: ( ruleFQN )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2677:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2678:1: ruleFQN
+            // InternalETMap.g:2677:1: ( ruleFQN )
+            // InternalETMap.g:2678:1: ruleFQN
             {
              before(grammarAccess.getImportedFQNAccess().getFQNParserRuleCall_0()); 
-            pushFollow(FOLLOW_ruleFQN_in_rule__ImportedFQN__Group__0__Impl5391);
+            pushFollow(FOLLOW_2);
             ruleFQN();
 
             state._fsp--;
@@ -7435,16 +7435,16 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ImportedFQN__Group__1"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2689:1: rule__ImportedFQN__Group__1 : rule__ImportedFQN__Group__1__Impl ;
+    // InternalETMap.g:2689:1: rule__ImportedFQN__Group__1 : rule__ImportedFQN__Group__1__Impl ;
     public final void rule__ImportedFQN__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2693:1: ( rule__ImportedFQN__Group__1__Impl )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2694:2: rule__ImportedFQN__Group__1__Impl
+            // InternalETMap.g:2693:1: ( rule__ImportedFQN__Group__1__Impl )
+            // InternalETMap.g:2694:2: rule__ImportedFQN__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__ImportedFQN__Group__1__Impl_in_rule__ImportedFQN__Group__15420);
+            pushFollow(FOLLOW_2);
             rule__ImportedFQN__Group__1__Impl();
 
             state._fsp--;
@@ -7468,20 +7468,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ImportedFQN__Group__1__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2700:1: rule__ImportedFQN__Group__1__Impl : ( ( '.*' )? ) ;
+    // InternalETMap.g:2700:1: rule__ImportedFQN__Group__1__Impl : ( ( '.*' )? ) ;
     public final void rule__ImportedFQN__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2704:1: ( ( ( '.*' )? ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2705:1: ( ( '.*' )? )
+            // InternalETMap.g:2704:1: ( ( ( '.*' )? ) )
+            // InternalETMap.g:2705:1: ( ( '.*' )? )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2705:1: ( ( '.*' )? )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2706:1: ( '.*' )?
+            // InternalETMap.g:2705:1: ( ( '.*' )? )
+            // InternalETMap.g:2706:1: ( '.*' )?
             {
              before(grammarAccess.getImportedFQNAccess().getFullStopAsteriskKeyword_1()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2707:1: ( '.*' )?
+            // InternalETMap.g:2707:1: ( '.*' )?
             int alt22=2;
             int LA22_0 = input.LA(1);
 
@@ -7490,9 +7490,9 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
             }
             switch (alt22) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2708:2: '.*'
+                    // InternalETMap.g:2708:2: '.*'
                     {
-                    match(input,36,FOLLOW_36_in_rule__ImportedFQN__Group__1__Impl5449); 
+                    match(input,36,FOLLOW_2); 
 
                     }
                     break;
@@ -7522,21 +7522,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Documentation__Group__0"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2723:1: rule__Documentation__Group__0 : rule__Documentation__Group__0__Impl rule__Documentation__Group__1 ;
+    // InternalETMap.g:2723:1: rule__Documentation__Group__0 : rule__Documentation__Group__0__Impl rule__Documentation__Group__1 ;
     public final void rule__Documentation__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2727:1: ( rule__Documentation__Group__0__Impl rule__Documentation__Group__1 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2728:2: rule__Documentation__Group__0__Impl rule__Documentation__Group__1
+            // InternalETMap.g:2727:1: ( rule__Documentation__Group__0__Impl rule__Documentation__Group__1 )
+            // InternalETMap.g:2728:2: rule__Documentation__Group__0__Impl rule__Documentation__Group__1
             {
-            pushFollow(FOLLOW_rule__Documentation__Group__0__Impl_in_rule__Documentation__Group__05486);
+            pushFollow(FOLLOW_24);
             rule__Documentation__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Documentation__Group__1_in_rule__Documentation__Group__05489);
+            pushFollow(FOLLOW_2);
             rule__Documentation__Group__1();
 
             state._fsp--;
@@ -7560,21 +7560,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Documentation__Group__0__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2735:1: rule__Documentation__Group__0__Impl : ( () ) ;
+    // InternalETMap.g:2735:1: rule__Documentation__Group__0__Impl : ( () ) ;
     public final void rule__Documentation__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2739:1: ( ( () ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2740:1: ( () )
+            // InternalETMap.g:2739:1: ( ( () ) )
+            // InternalETMap.g:2740:1: ( () )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2740:1: ( () )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2741:1: ()
+            // InternalETMap.g:2740:1: ( () )
+            // InternalETMap.g:2741:1: ()
             {
              before(grammarAccess.getDocumentationAccess().getDocumentationAction_0()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2742:1: ()
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2744:1: 
+            // InternalETMap.g:2742:1: ()
+            // InternalETMap.g:2744:1: 
             {
             }
 
@@ -7597,21 +7597,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Documentation__Group__1"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2754:1: rule__Documentation__Group__1 : rule__Documentation__Group__1__Impl rule__Documentation__Group__2 ;
+    // InternalETMap.g:2754:1: rule__Documentation__Group__1 : rule__Documentation__Group__1__Impl rule__Documentation__Group__2 ;
     public final void rule__Documentation__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2758:1: ( rule__Documentation__Group__1__Impl rule__Documentation__Group__2 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2759:2: rule__Documentation__Group__1__Impl rule__Documentation__Group__2
+            // InternalETMap.g:2758:1: ( rule__Documentation__Group__1__Impl rule__Documentation__Group__2 )
+            // InternalETMap.g:2759:2: rule__Documentation__Group__1__Impl rule__Documentation__Group__2
             {
-            pushFollow(FOLLOW_rule__Documentation__Group__1__Impl_in_rule__Documentation__Group__15547);
+            pushFollow(FOLLOW_25);
             rule__Documentation__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Documentation__Group__2_in_rule__Documentation__Group__15550);
+            pushFollow(FOLLOW_2);
             rule__Documentation__Group__2();
 
             state._fsp--;
@@ -7635,20 +7635,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Documentation__Group__1__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2766:1: rule__Documentation__Group__1__Impl : ( '[' ) ;
+    // InternalETMap.g:2766:1: rule__Documentation__Group__1__Impl : ( '[' ) ;
     public final void rule__Documentation__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2770:1: ( ( '[' ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2771:1: ( '[' )
+            // InternalETMap.g:2770:1: ( ( '[' ) )
+            // InternalETMap.g:2771:1: ( '[' )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2771:1: ( '[' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2772:1: '['
+            // InternalETMap.g:2771:1: ( '[' )
+            // InternalETMap.g:2772:1: '['
             {
              before(grammarAccess.getDocumentationAccess().getLeftSquareBracketKeyword_1()); 
-            match(input,37,FOLLOW_37_in_rule__Documentation__Group__1__Impl5578); 
+            match(input,37,FOLLOW_2); 
              after(grammarAccess.getDocumentationAccess().getLeftSquareBracketKeyword_1()); 
 
             }
@@ -7672,21 +7672,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Documentation__Group__2"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2785:1: rule__Documentation__Group__2 : rule__Documentation__Group__2__Impl rule__Documentation__Group__3 ;
+    // InternalETMap.g:2785:1: rule__Documentation__Group__2 : rule__Documentation__Group__2__Impl rule__Documentation__Group__3 ;
     public final void rule__Documentation__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2789:1: ( rule__Documentation__Group__2__Impl rule__Documentation__Group__3 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2790:2: rule__Documentation__Group__2__Impl rule__Documentation__Group__3
+            // InternalETMap.g:2789:1: ( rule__Documentation__Group__2__Impl rule__Documentation__Group__3 )
+            // InternalETMap.g:2790:2: rule__Documentation__Group__2__Impl rule__Documentation__Group__3
             {
-            pushFollow(FOLLOW_rule__Documentation__Group__2__Impl_in_rule__Documentation__Group__25609);
+            pushFollow(FOLLOW_25);
             rule__Documentation__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Documentation__Group__3_in_rule__Documentation__Group__25612);
+            pushFollow(FOLLOW_2);
             rule__Documentation__Group__3();
 
             state._fsp--;
@@ -7710,20 +7710,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Documentation__Group__2__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2797:1: rule__Documentation__Group__2__Impl : ( ( rule__Documentation__LinesAssignment_2 )* ) ;
+    // InternalETMap.g:2797:1: rule__Documentation__Group__2__Impl : ( ( rule__Documentation__LinesAssignment_2 )* ) ;
     public final void rule__Documentation__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2801:1: ( ( ( rule__Documentation__LinesAssignment_2 )* ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2802:1: ( ( rule__Documentation__LinesAssignment_2 )* )
+            // InternalETMap.g:2801:1: ( ( ( rule__Documentation__LinesAssignment_2 )* ) )
+            // InternalETMap.g:2802:1: ( ( rule__Documentation__LinesAssignment_2 )* )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2802:1: ( ( rule__Documentation__LinesAssignment_2 )* )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2803:1: ( rule__Documentation__LinesAssignment_2 )*
+            // InternalETMap.g:2802:1: ( ( rule__Documentation__LinesAssignment_2 )* )
+            // InternalETMap.g:2803:1: ( rule__Documentation__LinesAssignment_2 )*
             {
              before(grammarAccess.getDocumentationAccess().getLinesAssignment_2()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2804:1: ( rule__Documentation__LinesAssignment_2 )*
+            // InternalETMap.g:2804:1: ( rule__Documentation__LinesAssignment_2 )*
             loop23:
             do {
                 int alt23=2;
@@ -7736,9 +7736,9 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
                 switch (alt23) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2804:2: rule__Documentation__LinesAssignment_2
+            	    // InternalETMap.g:2804:2: rule__Documentation__LinesAssignment_2
             	    {
-            	    pushFollow(FOLLOW_rule__Documentation__LinesAssignment_2_in_rule__Documentation__Group__2__Impl5639);
+            	    pushFollow(FOLLOW_26);
             	    rule__Documentation__LinesAssignment_2();
 
             	    state._fsp--;
@@ -7775,16 +7775,16 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Documentation__Group__3"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2814:1: rule__Documentation__Group__3 : rule__Documentation__Group__3__Impl ;
+    // InternalETMap.g:2814:1: rule__Documentation__Group__3 : rule__Documentation__Group__3__Impl ;
     public final void rule__Documentation__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2818:1: ( rule__Documentation__Group__3__Impl )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2819:2: rule__Documentation__Group__3__Impl
+            // InternalETMap.g:2818:1: ( rule__Documentation__Group__3__Impl )
+            // InternalETMap.g:2819:2: rule__Documentation__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__Documentation__Group__3__Impl_in_rule__Documentation__Group__35670);
+            pushFollow(FOLLOW_2);
             rule__Documentation__Group__3__Impl();
 
             state._fsp--;
@@ -7808,20 +7808,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Documentation__Group__3__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2825:1: rule__Documentation__Group__3__Impl : ( ']' ) ;
+    // InternalETMap.g:2825:1: rule__Documentation__Group__3__Impl : ( ']' ) ;
     public final void rule__Documentation__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2829:1: ( ( ']' ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2830:1: ( ']' )
+            // InternalETMap.g:2829:1: ( ( ']' ) )
+            // InternalETMap.g:2830:1: ( ']' )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2830:1: ( ']' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2831:1: ']'
+            // InternalETMap.g:2830:1: ( ']' )
+            // InternalETMap.g:2831:1: ']'
             {
              before(grammarAccess.getDocumentationAccess().getRightSquareBracketKeyword_3()); 
-            match(input,38,FOLLOW_38_in_rule__Documentation__Group__3__Impl5698); 
+            match(input,38,FOLLOW_2); 
              after(grammarAccess.getDocumentationAccess().getRightSquareBracketKeyword_3()); 
 
             }
@@ -7845,21 +7845,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__BooleanLiteral__Group__0"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2858:1: rule__BooleanLiteral__Group__0 : rule__BooleanLiteral__Group__0__Impl rule__BooleanLiteral__Group__1 ;
+    // InternalETMap.g:2858:1: rule__BooleanLiteral__Group__0 : rule__BooleanLiteral__Group__0__Impl rule__BooleanLiteral__Group__1 ;
     public final void rule__BooleanLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2862:1: ( rule__BooleanLiteral__Group__0__Impl rule__BooleanLiteral__Group__1 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2863:2: rule__BooleanLiteral__Group__0__Impl rule__BooleanLiteral__Group__1
+            // InternalETMap.g:2862:1: ( rule__BooleanLiteral__Group__0__Impl rule__BooleanLiteral__Group__1 )
+            // InternalETMap.g:2863:2: rule__BooleanLiteral__Group__0__Impl rule__BooleanLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__BooleanLiteral__Group__0__Impl_in_rule__BooleanLiteral__Group__05743);
+            pushFollow(FOLLOW_27);
             rule__BooleanLiteral__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__BooleanLiteral__Group__1_in_rule__BooleanLiteral__Group__05746);
+            pushFollow(FOLLOW_2);
             rule__BooleanLiteral__Group__1();
 
             state._fsp--;
@@ -7883,21 +7883,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__BooleanLiteral__Group__0__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2870:1: rule__BooleanLiteral__Group__0__Impl : ( () ) ;
+    // InternalETMap.g:2870:1: rule__BooleanLiteral__Group__0__Impl : ( () ) ;
     public final void rule__BooleanLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2874:1: ( ( () ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2875:1: ( () )
+            // InternalETMap.g:2874:1: ( ( () ) )
+            // InternalETMap.g:2875:1: ( () )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2875:1: ( () )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2876:1: ()
+            // InternalETMap.g:2875:1: ( () )
+            // InternalETMap.g:2876:1: ()
             {
              before(grammarAccess.getBooleanLiteralAccess().getBooleanLiteralAction_0()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2877:1: ()
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2879:1: 
+            // InternalETMap.g:2877:1: ()
+            // InternalETMap.g:2879:1: 
             {
             }
 
@@ -7920,16 +7920,16 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__BooleanLiteral__Group__1"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2889:1: rule__BooleanLiteral__Group__1 : rule__BooleanLiteral__Group__1__Impl ;
+    // InternalETMap.g:2889:1: rule__BooleanLiteral__Group__1 : rule__BooleanLiteral__Group__1__Impl ;
     public final void rule__BooleanLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2893:1: ( rule__BooleanLiteral__Group__1__Impl )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2894:2: rule__BooleanLiteral__Group__1__Impl
+            // InternalETMap.g:2893:1: ( rule__BooleanLiteral__Group__1__Impl )
+            // InternalETMap.g:2894:2: rule__BooleanLiteral__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__BooleanLiteral__Group__1__Impl_in_rule__BooleanLiteral__Group__15804);
+            pushFollow(FOLLOW_2);
             rule__BooleanLiteral__Group__1__Impl();
 
             state._fsp--;
@@ -7953,23 +7953,23 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__BooleanLiteral__Group__1__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2900:1: rule__BooleanLiteral__Group__1__Impl : ( ( rule__BooleanLiteral__Alternatives_1 ) ) ;
+    // InternalETMap.g:2900:1: rule__BooleanLiteral__Group__1__Impl : ( ( rule__BooleanLiteral__Alternatives_1 ) ) ;
     public final void rule__BooleanLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2904:1: ( ( ( rule__BooleanLiteral__Alternatives_1 ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2905:1: ( ( rule__BooleanLiteral__Alternatives_1 ) )
+            // InternalETMap.g:2904:1: ( ( ( rule__BooleanLiteral__Alternatives_1 ) ) )
+            // InternalETMap.g:2905:1: ( ( rule__BooleanLiteral__Alternatives_1 ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2905:1: ( ( rule__BooleanLiteral__Alternatives_1 ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2906:1: ( rule__BooleanLiteral__Alternatives_1 )
+            // InternalETMap.g:2905:1: ( ( rule__BooleanLiteral__Alternatives_1 ) )
+            // InternalETMap.g:2906:1: ( rule__BooleanLiteral__Alternatives_1 )
             {
              before(grammarAccess.getBooleanLiteralAccess().getAlternatives_1()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2907:1: ( rule__BooleanLiteral__Alternatives_1 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2907:2: rule__BooleanLiteral__Alternatives_1
+            // InternalETMap.g:2907:1: ( rule__BooleanLiteral__Alternatives_1 )
+            // InternalETMap.g:2907:2: rule__BooleanLiteral__Alternatives_1
             {
-            pushFollow(FOLLOW_rule__BooleanLiteral__Alternatives_1_in_rule__BooleanLiteral__Group__1__Impl5831);
+            pushFollow(FOLLOW_2);
             rule__BooleanLiteral__Alternatives_1();
 
             state._fsp--;
@@ -8000,21 +8000,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RealLiteral__Group__0"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2921:1: rule__RealLiteral__Group__0 : rule__RealLiteral__Group__0__Impl rule__RealLiteral__Group__1 ;
+    // InternalETMap.g:2921:1: rule__RealLiteral__Group__0 : rule__RealLiteral__Group__0__Impl rule__RealLiteral__Group__1 ;
     public final void rule__RealLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2925:1: ( rule__RealLiteral__Group__0__Impl rule__RealLiteral__Group__1 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2926:2: rule__RealLiteral__Group__0__Impl rule__RealLiteral__Group__1
+            // InternalETMap.g:2925:1: ( rule__RealLiteral__Group__0__Impl rule__RealLiteral__Group__1 )
+            // InternalETMap.g:2926:2: rule__RealLiteral__Group__0__Impl rule__RealLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__RealLiteral__Group__0__Impl_in_rule__RealLiteral__Group__05865);
+            pushFollow(FOLLOW_28);
             rule__RealLiteral__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RealLiteral__Group__1_in_rule__RealLiteral__Group__05868);
+            pushFollow(FOLLOW_2);
             rule__RealLiteral__Group__1();
 
             state._fsp--;
@@ -8038,21 +8038,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RealLiteral__Group__0__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2933:1: rule__RealLiteral__Group__0__Impl : ( () ) ;
+    // InternalETMap.g:2933:1: rule__RealLiteral__Group__0__Impl : ( () ) ;
     public final void rule__RealLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2937:1: ( ( () ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2938:1: ( () )
+            // InternalETMap.g:2937:1: ( ( () ) )
+            // InternalETMap.g:2938:1: ( () )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2938:1: ( () )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2939:1: ()
+            // InternalETMap.g:2938:1: ( () )
+            // InternalETMap.g:2939:1: ()
             {
              before(grammarAccess.getRealLiteralAccess().getRealLiteralAction_0()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2940:1: ()
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2942:1: 
+            // InternalETMap.g:2940:1: ()
+            // InternalETMap.g:2942:1: 
             {
             }
 
@@ -8075,16 +8075,16 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RealLiteral__Group__1"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2952:1: rule__RealLiteral__Group__1 : rule__RealLiteral__Group__1__Impl ;
+    // InternalETMap.g:2952:1: rule__RealLiteral__Group__1 : rule__RealLiteral__Group__1__Impl ;
     public final void rule__RealLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2956:1: ( rule__RealLiteral__Group__1__Impl )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2957:2: rule__RealLiteral__Group__1__Impl
+            // InternalETMap.g:2956:1: ( rule__RealLiteral__Group__1__Impl )
+            // InternalETMap.g:2957:2: rule__RealLiteral__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__RealLiteral__Group__1__Impl_in_rule__RealLiteral__Group__15926);
+            pushFollow(FOLLOW_2);
             rule__RealLiteral__Group__1__Impl();
 
             state._fsp--;
@@ -8108,23 +8108,23 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RealLiteral__Group__1__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2963:1: rule__RealLiteral__Group__1__Impl : ( ( rule__RealLiteral__ValueAssignment_1 ) ) ;
+    // InternalETMap.g:2963:1: rule__RealLiteral__Group__1__Impl : ( ( rule__RealLiteral__ValueAssignment_1 ) ) ;
     public final void rule__RealLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2967:1: ( ( ( rule__RealLiteral__ValueAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2968:1: ( ( rule__RealLiteral__ValueAssignment_1 ) )
+            // InternalETMap.g:2967:1: ( ( ( rule__RealLiteral__ValueAssignment_1 ) ) )
+            // InternalETMap.g:2968:1: ( ( rule__RealLiteral__ValueAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2968:1: ( ( rule__RealLiteral__ValueAssignment_1 ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2969:1: ( rule__RealLiteral__ValueAssignment_1 )
+            // InternalETMap.g:2968:1: ( ( rule__RealLiteral__ValueAssignment_1 ) )
+            // InternalETMap.g:2969:1: ( rule__RealLiteral__ValueAssignment_1 )
             {
              before(grammarAccess.getRealLiteralAccess().getValueAssignment_1()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2970:1: ( rule__RealLiteral__ValueAssignment_1 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2970:2: rule__RealLiteral__ValueAssignment_1
+            // InternalETMap.g:2970:1: ( rule__RealLiteral__ValueAssignment_1 )
+            // InternalETMap.g:2970:2: rule__RealLiteral__ValueAssignment_1
             {
-            pushFollow(FOLLOW_rule__RealLiteral__ValueAssignment_1_in_rule__RealLiteral__Group__1__Impl5953);
+            pushFollow(FOLLOW_2);
             rule__RealLiteral__ValueAssignment_1();
 
             state._fsp--;
@@ -8155,21 +8155,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__IntLiteral__Group__0"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2984:1: rule__IntLiteral__Group__0 : rule__IntLiteral__Group__0__Impl rule__IntLiteral__Group__1 ;
+    // InternalETMap.g:2984:1: rule__IntLiteral__Group__0 : rule__IntLiteral__Group__0__Impl rule__IntLiteral__Group__1 ;
     public final void rule__IntLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2988:1: ( rule__IntLiteral__Group__0__Impl rule__IntLiteral__Group__1 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2989:2: rule__IntLiteral__Group__0__Impl rule__IntLiteral__Group__1
+            // InternalETMap.g:2988:1: ( rule__IntLiteral__Group__0__Impl rule__IntLiteral__Group__1 )
+            // InternalETMap.g:2989:2: rule__IntLiteral__Group__0__Impl rule__IntLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__IntLiteral__Group__0__Impl_in_rule__IntLiteral__Group__05987);
+            pushFollow(FOLLOW_28);
             rule__IntLiteral__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__IntLiteral__Group__1_in_rule__IntLiteral__Group__05990);
+            pushFollow(FOLLOW_2);
             rule__IntLiteral__Group__1();
 
             state._fsp--;
@@ -8193,21 +8193,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__IntLiteral__Group__0__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:2996:1: rule__IntLiteral__Group__0__Impl : ( () ) ;
+    // InternalETMap.g:2996:1: rule__IntLiteral__Group__0__Impl : ( () ) ;
     public final void rule__IntLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3000:1: ( ( () ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3001:1: ( () )
+            // InternalETMap.g:3000:1: ( ( () ) )
+            // InternalETMap.g:3001:1: ( () )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3001:1: ( () )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3002:1: ()
+            // InternalETMap.g:3001:1: ( () )
+            // InternalETMap.g:3002:1: ()
             {
              before(grammarAccess.getIntLiteralAccess().getIntLiteralAction_0()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3003:1: ()
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3005:1: 
+            // InternalETMap.g:3003:1: ()
+            // InternalETMap.g:3005:1: 
             {
             }
 
@@ -8230,16 +8230,16 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__IntLiteral__Group__1"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3015:1: rule__IntLiteral__Group__1 : rule__IntLiteral__Group__1__Impl ;
+    // InternalETMap.g:3015:1: rule__IntLiteral__Group__1 : rule__IntLiteral__Group__1__Impl ;
     public final void rule__IntLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3019:1: ( rule__IntLiteral__Group__1__Impl )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3020:2: rule__IntLiteral__Group__1__Impl
+            // InternalETMap.g:3019:1: ( rule__IntLiteral__Group__1__Impl )
+            // InternalETMap.g:3020:2: rule__IntLiteral__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__IntLiteral__Group__1__Impl_in_rule__IntLiteral__Group__16048);
+            pushFollow(FOLLOW_2);
             rule__IntLiteral__Group__1__Impl();
 
             state._fsp--;
@@ -8263,23 +8263,23 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__IntLiteral__Group__1__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3026:1: rule__IntLiteral__Group__1__Impl : ( ( rule__IntLiteral__ValueAssignment_1 ) ) ;
+    // InternalETMap.g:3026:1: rule__IntLiteral__Group__1__Impl : ( ( rule__IntLiteral__ValueAssignment_1 ) ) ;
     public final void rule__IntLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3030:1: ( ( ( rule__IntLiteral__ValueAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3031:1: ( ( rule__IntLiteral__ValueAssignment_1 ) )
+            // InternalETMap.g:3030:1: ( ( ( rule__IntLiteral__ValueAssignment_1 ) ) )
+            // InternalETMap.g:3031:1: ( ( rule__IntLiteral__ValueAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3031:1: ( ( rule__IntLiteral__ValueAssignment_1 ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3032:1: ( rule__IntLiteral__ValueAssignment_1 )
+            // InternalETMap.g:3031:1: ( ( rule__IntLiteral__ValueAssignment_1 ) )
+            // InternalETMap.g:3032:1: ( rule__IntLiteral__ValueAssignment_1 )
             {
              before(grammarAccess.getIntLiteralAccess().getValueAssignment_1()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3033:1: ( rule__IntLiteral__ValueAssignment_1 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3033:2: rule__IntLiteral__ValueAssignment_1
+            // InternalETMap.g:3033:1: ( rule__IntLiteral__ValueAssignment_1 )
+            // InternalETMap.g:3033:2: rule__IntLiteral__ValueAssignment_1
             {
-            pushFollow(FOLLOW_rule__IntLiteral__ValueAssignment_1_in_rule__IntLiteral__Group__1__Impl6075);
+            pushFollow(FOLLOW_2);
             rule__IntLiteral__ValueAssignment_1();
 
             state._fsp--;
@@ -8310,21 +8310,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StringLiteral__Group__0"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3047:1: rule__StringLiteral__Group__0 : rule__StringLiteral__Group__0__Impl rule__StringLiteral__Group__1 ;
+    // InternalETMap.g:3047:1: rule__StringLiteral__Group__0 : rule__StringLiteral__Group__0__Impl rule__StringLiteral__Group__1 ;
     public final void rule__StringLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3051:1: ( rule__StringLiteral__Group__0__Impl rule__StringLiteral__Group__1 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3052:2: rule__StringLiteral__Group__0__Impl rule__StringLiteral__Group__1
+            // InternalETMap.g:3051:1: ( rule__StringLiteral__Group__0__Impl rule__StringLiteral__Group__1 )
+            // InternalETMap.g:3052:2: rule__StringLiteral__Group__0__Impl rule__StringLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__StringLiteral__Group__0__Impl_in_rule__StringLiteral__Group__06109);
+            pushFollow(FOLLOW_14);
             rule__StringLiteral__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__StringLiteral__Group__1_in_rule__StringLiteral__Group__06112);
+            pushFollow(FOLLOW_2);
             rule__StringLiteral__Group__1();
 
             state._fsp--;
@@ -8348,21 +8348,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StringLiteral__Group__0__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3059:1: rule__StringLiteral__Group__0__Impl : ( () ) ;
+    // InternalETMap.g:3059:1: rule__StringLiteral__Group__0__Impl : ( () ) ;
     public final void rule__StringLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3063:1: ( ( () ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3064:1: ( () )
+            // InternalETMap.g:3063:1: ( ( () ) )
+            // InternalETMap.g:3064:1: ( () )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3064:1: ( () )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3065:1: ()
+            // InternalETMap.g:3064:1: ( () )
+            // InternalETMap.g:3065:1: ()
             {
              before(grammarAccess.getStringLiteralAccess().getStringLiteralAction_0()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3066:1: ()
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3068:1: 
+            // InternalETMap.g:3066:1: ()
+            // InternalETMap.g:3068:1: 
             {
             }
 
@@ -8385,16 +8385,16 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StringLiteral__Group__1"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3078:1: rule__StringLiteral__Group__1 : rule__StringLiteral__Group__1__Impl ;
+    // InternalETMap.g:3078:1: rule__StringLiteral__Group__1 : rule__StringLiteral__Group__1__Impl ;
     public final void rule__StringLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3082:1: ( rule__StringLiteral__Group__1__Impl )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3083:2: rule__StringLiteral__Group__1__Impl
+            // InternalETMap.g:3082:1: ( rule__StringLiteral__Group__1__Impl )
+            // InternalETMap.g:3083:2: rule__StringLiteral__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__StringLiteral__Group__1__Impl_in_rule__StringLiteral__Group__16170);
+            pushFollow(FOLLOW_2);
             rule__StringLiteral__Group__1__Impl();
 
             state._fsp--;
@@ -8418,23 +8418,23 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StringLiteral__Group__1__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3089:1: rule__StringLiteral__Group__1__Impl : ( ( rule__StringLiteral__ValueAssignment_1 ) ) ;
+    // InternalETMap.g:3089:1: rule__StringLiteral__Group__1__Impl : ( ( rule__StringLiteral__ValueAssignment_1 ) ) ;
     public final void rule__StringLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3093:1: ( ( ( rule__StringLiteral__ValueAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3094:1: ( ( rule__StringLiteral__ValueAssignment_1 ) )
+            // InternalETMap.g:3093:1: ( ( ( rule__StringLiteral__ValueAssignment_1 ) ) )
+            // InternalETMap.g:3094:1: ( ( rule__StringLiteral__ValueAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3094:1: ( ( rule__StringLiteral__ValueAssignment_1 ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3095:1: ( rule__StringLiteral__ValueAssignment_1 )
+            // InternalETMap.g:3094:1: ( ( rule__StringLiteral__ValueAssignment_1 ) )
+            // InternalETMap.g:3095:1: ( rule__StringLiteral__ValueAssignment_1 )
             {
              before(grammarAccess.getStringLiteralAccess().getValueAssignment_1()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3096:1: ( rule__StringLiteral__ValueAssignment_1 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3096:2: rule__StringLiteral__ValueAssignment_1
+            // InternalETMap.g:3096:1: ( rule__StringLiteral__ValueAssignment_1 )
+            // InternalETMap.g:3096:2: rule__StringLiteral__ValueAssignment_1
             {
-            pushFollow(FOLLOW_rule__StringLiteral__ValueAssignment_1_in_rule__StringLiteral__Group__1__Impl6197);
+            pushFollow(FOLLOW_2);
             rule__StringLiteral__ValueAssignment_1();
 
             state._fsp--;
@@ -8465,21 +8465,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Integer__Group_0__0"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3110:1: rule__Integer__Group_0__0 : rule__Integer__Group_0__0__Impl rule__Integer__Group_0__1 ;
+    // InternalETMap.g:3110:1: rule__Integer__Group_0__0 : rule__Integer__Group_0__0__Impl rule__Integer__Group_0__1 ;
     public final void rule__Integer__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3114:1: ( rule__Integer__Group_0__0__Impl rule__Integer__Group_0__1 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3115:2: rule__Integer__Group_0__0__Impl rule__Integer__Group_0__1
+            // InternalETMap.g:3114:1: ( rule__Integer__Group_0__0__Impl rule__Integer__Group_0__1 )
+            // InternalETMap.g:3115:2: rule__Integer__Group_0__0__Impl rule__Integer__Group_0__1
             {
-            pushFollow(FOLLOW_rule__Integer__Group_0__0__Impl_in_rule__Integer__Group_0__06231);
+            pushFollow(FOLLOW_29);
             rule__Integer__Group_0__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Integer__Group_0__1_in_rule__Integer__Group_0__06234);
+            pushFollow(FOLLOW_2);
             rule__Integer__Group_0__1();
 
             state._fsp--;
@@ -8503,20 +8503,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Integer__Group_0__0__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3122:1: rule__Integer__Group_0__0__Impl : ( ( rule__Integer__Alternatives_0_0 )? ) ;
+    // InternalETMap.g:3122:1: rule__Integer__Group_0__0__Impl : ( ( rule__Integer__Alternatives_0_0 )? ) ;
     public final void rule__Integer__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3126:1: ( ( ( rule__Integer__Alternatives_0_0 )? ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3127:1: ( ( rule__Integer__Alternatives_0_0 )? )
+            // InternalETMap.g:3126:1: ( ( ( rule__Integer__Alternatives_0_0 )? ) )
+            // InternalETMap.g:3127:1: ( ( rule__Integer__Alternatives_0_0 )? )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3127:1: ( ( rule__Integer__Alternatives_0_0 )? )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3128:1: ( rule__Integer__Alternatives_0_0 )?
+            // InternalETMap.g:3127:1: ( ( rule__Integer__Alternatives_0_0 )? )
+            // InternalETMap.g:3128:1: ( rule__Integer__Alternatives_0_0 )?
             {
              before(grammarAccess.getIntegerAccess().getAlternatives_0_0()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3129:1: ( rule__Integer__Alternatives_0_0 )?
+            // InternalETMap.g:3129:1: ( rule__Integer__Alternatives_0_0 )?
             int alt24=2;
             int LA24_0 = input.LA(1);
 
@@ -8525,9 +8525,9 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
             }
             switch (alt24) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3129:2: rule__Integer__Alternatives_0_0
+                    // InternalETMap.g:3129:2: rule__Integer__Alternatives_0_0
                     {
-                    pushFollow(FOLLOW_rule__Integer__Alternatives_0_0_in_rule__Integer__Group_0__0__Impl6261);
+                    pushFollow(FOLLOW_2);
                     rule__Integer__Alternatives_0_0();
 
                     state._fsp--;
@@ -8561,16 +8561,16 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Integer__Group_0__1"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3139:1: rule__Integer__Group_0__1 : rule__Integer__Group_0__1__Impl ;
+    // InternalETMap.g:3139:1: rule__Integer__Group_0__1 : rule__Integer__Group_0__1__Impl ;
     public final void rule__Integer__Group_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3143:1: ( rule__Integer__Group_0__1__Impl )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3144:2: rule__Integer__Group_0__1__Impl
+            // InternalETMap.g:3143:1: ( rule__Integer__Group_0__1__Impl )
+            // InternalETMap.g:3144:2: rule__Integer__Group_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__Integer__Group_0__1__Impl_in_rule__Integer__Group_0__16292);
+            pushFollow(FOLLOW_2);
             rule__Integer__Group_0__1__Impl();
 
             state._fsp--;
@@ -8594,20 +8594,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Integer__Group_0__1__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3150:1: rule__Integer__Group_0__1__Impl : ( RULE_INT ) ;
+    // InternalETMap.g:3150:1: rule__Integer__Group_0__1__Impl : ( RULE_INT ) ;
     public final void rule__Integer__Group_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3154:1: ( ( RULE_INT ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3155:1: ( RULE_INT )
+            // InternalETMap.g:3154:1: ( ( RULE_INT ) )
+            // InternalETMap.g:3155:1: ( RULE_INT )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3155:1: ( RULE_INT )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3156:1: RULE_INT
+            // InternalETMap.g:3155:1: ( RULE_INT )
+            // InternalETMap.g:3156:1: RULE_INT
             {
              before(grammarAccess.getIntegerAccess().getINTTerminalRuleCall_0_1()); 
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__Integer__Group_0__1__Impl6319); 
+            match(input,RULE_INT,FOLLOW_2); 
              after(grammarAccess.getIntegerAccess().getINTTerminalRuleCall_0_1()); 
 
             }
@@ -8631,21 +8631,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Decimal__Group__0"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3171:1: rule__Decimal__Group__0 : rule__Decimal__Group__0__Impl rule__Decimal__Group__1 ;
+    // InternalETMap.g:3171:1: rule__Decimal__Group__0 : rule__Decimal__Group__0__Impl rule__Decimal__Group__1 ;
     public final void rule__Decimal__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3175:1: ( rule__Decimal__Group__0__Impl rule__Decimal__Group__1 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3176:2: rule__Decimal__Group__0__Impl rule__Decimal__Group__1
+            // InternalETMap.g:3175:1: ( rule__Decimal__Group__0__Impl rule__Decimal__Group__1 )
+            // InternalETMap.g:3176:2: rule__Decimal__Group__0__Impl rule__Decimal__Group__1
             {
-            pushFollow(FOLLOW_rule__Decimal__Group__0__Impl_in_rule__Decimal__Group__06352);
+            pushFollow(FOLLOW_29);
             rule__Decimal__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Decimal__Group__1_in_rule__Decimal__Group__06355);
+            pushFollow(FOLLOW_2);
             rule__Decimal__Group__1();
 
             state._fsp--;
@@ -8669,20 +8669,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Decimal__Group__0__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3183:1: rule__Decimal__Group__0__Impl : ( ( rule__Decimal__Alternatives_0 )? ) ;
+    // InternalETMap.g:3183:1: rule__Decimal__Group__0__Impl : ( ( rule__Decimal__Alternatives_0 )? ) ;
     public final void rule__Decimal__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3187:1: ( ( ( rule__Decimal__Alternatives_0 )? ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3188:1: ( ( rule__Decimal__Alternatives_0 )? )
+            // InternalETMap.g:3187:1: ( ( ( rule__Decimal__Alternatives_0 )? ) )
+            // InternalETMap.g:3188:1: ( ( rule__Decimal__Alternatives_0 )? )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3188:1: ( ( rule__Decimal__Alternatives_0 )? )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3189:1: ( rule__Decimal__Alternatives_0 )?
+            // InternalETMap.g:3188:1: ( ( rule__Decimal__Alternatives_0 )? )
+            // InternalETMap.g:3189:1: ( rule__Decimal__Alternatives_0 )?
             {
              before(grammarAccess.getDecimalAccess().getAlternatives_0()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3190:1: ( rule__Decimal__Alternatives_0 )?
+            // InternalETMap.g:3190:1: ( rule__Decimal__Alternatives_0 )?
             int alt25=2;
             int LA25_0 = input.LA(1);
 
@@ -8691,9 +8691,9 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
             }
             switch (alt25) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3190:2: rule__Decimal__Alternatives_0
+                    // InternalETMap.g:3190:2: rule__Decimal__Alternatives_0
                     {
-                    pushFollow(FOLLOW_rule__Decimal__Alternatives_0_in_rule__Decimal__Group__0__Impl6382);
+                    pushFollow(FOLLOW_2);
                     rule__Decimal__Alternatives_0();
 
                     state._fsp--;
@@ -8727,21 +8727,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Decimal__Group__1"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3200:1: rule__Decimal__Group__1 : rule__Decimal__Group__1__Impl rule__Decimal__Group__2 ;
+    // InternalETMap.g:3200:1: rule__Decimal__Group__1 : rule__Decimal__Group__1__Impl rule__Decimal__Group__2 ;
     public final void rule__Decimal__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3204:1: ( rule__Decimal__Group__1__Impl rule__Decimal__Group__2 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3205:2: rule__Decimal__Group__1__Impl rule__Decimal__Group__2
+            // InternalETMap.g:3204:1: ( rule__Decimal__Group__1__Impl rule__Decimal__Group__2 )
+            // InternalETMap.g:3205:2: rule__Decimal__Group__1__Impl rule__Decimal__Group__2
             {
-            pushFollow(FOLLOW_rule__Decimal__Group__1__Impl_in_rule__Decimal__Group__16413);
+            pushFollow(FOLLOW_30);
             rule__Decimal__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Decimal__Group__2_in_rule__Decimal__Group__16416);
+            pushFollow(FOLLOW_2);
             rule__Decimal__Group__2();
 
             state._fsp--;
@@ -8765,20 +8765,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Decimal__Group__1__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3212:1: rule__Decimal__Group__1__Impl : ( RULE_INT ) ;
+    // InternalETMap.g:3212:1: rule__Decimal__Group__1__Impl : ( RULE_INT ) ;
     public final void rule__Decimal__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3216:1: ( ( RULE_INT ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3217:1: ( RULE_INT )
+            // InternalETMap.g:3216:1: ( ( RULE_INT ) )
+            // InternalETMap.g:3217:1: ( RULE_INT )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3217:1: ( RULE_INT )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3218:1: RULE_INT
+            // InternalETMap.g:3217:1: ( RULE_INT )
+            // InternalETMap.g:3218:1: RULE_INT
             {
              before(grammarAccess.getDecimalAccess().getINTTerminalRuleCall_1()); 
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__Decimal__Group__1__Impl6443); 
+            match(input,RULE_INT,FOLLOW_2); 
              after(grammarAccess.getDecimalAccess().getINTTerminalRuleCall_1()); 
 
             }
@@ -8802,21 +8802,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Decimal__Group__2"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3229:1: rule__Decimal__Group__2 : rule__Decimal__Group__2__Impl rule__Decimal__Group__3 ;
+    // InternalETMap.g:3229:1: rule__Decimal__Group__2 : rule__Decimal__Group__2__Impl rule__Decimal__Group__3 ;
     public final void rule__Decimal__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3233:1: ( rule__Decimal__Group__2__Impl rule__Decimal__Group__3 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3234:2: rule__Decimal__Group__2__Impl rule__Decimal__Group__3
+            // InternalETMap.g:3233:1: ( rule__Decimal__Group__2__Impl rule__Decimal__Group__3 )
+            // InternalETMap.g:3234:2: rule__Decimal__Group__2__Impl rule__Decimal__Group__3
             {
-            pushFollow(FOLLOW_rule__Decimal__Group__2__Impl_in_rule__Decimal__Group__26472);
+            pushFollow(FOLLOW_31);
             rule__Decimal__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Decimal__Group__3_in_rule__Decimal__Group__26475);
+            pushFollow(FOLLOW_2);
             rule__Decimal__Group__3();
 
             state._fsp--;
@@ -8840,20 +8840,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Decimal__Group__2__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3241:1: rule__Decimal__Group__2__Impl : ( '.' ) ;
+    // InternalETMap.g:3241:1: rule__Decimal__Group__2__Impl : ( '.' ) ;
     public final void rule__Decimal__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3245:1: ( ( '.' ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3246:1: ( '.' )
+            // InternalETMap.g:3245:1: ( ( '.' ) )
+            // InternalETMap.g:3246:1: ( '.' )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3246:1: ( '.' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3247:1: '.'
+            // InternalETMap.g:3246:1: ( '.' )
+            // InternalETMap.g:3247:1: '.'
             {
              before(grammarAccess.getDecimalAccess().getFullStopKeyword_2()); 
-            match(input,39,FOLLOW_39_in_rule__Decimal__Group__2__Impl6503); 
+            match(input,39,FOLLOW_2); 
              after(grammarAccess.getDecimalAccess().getFullStopKeyword_2()); 
 
             }
@@ -8877,16 +8877,16 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Decimal__Group__3"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3260:1: rule__Decimal__Group__3 : rule__Decimal__Group__3__Impl ;
+    // InternalETMap.g:3260:1: rule__Decimal__Group__3 : rule__Decimal__Group__3__Impl ;
     public final void rule__Decimal__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3264:1: ( rule__Decimal__Group__3__Impl )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3265:2: rule__Decimal__Group__3__Impl
+            // InternalETMap.g:3264:1: ( rule__Decimal__Group__3__Impl )
+            // InternalETMap.g:3265:2: rule__Decimal__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__Decimal__Group__3__Impl_in_rule__Decimal__Group__36534);
+            pushFollow(FOLLOW_2);
             rule__Decimal__Group__3__Impl();
 
             state._fsp--;
@@ -8910,20 +8910,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Decimal__Group__3__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3271:1: rule__Decimal__Group__3__Impl : ( RULE_INT ) ;
+    // InternalETMap.g:3271:1: rule__Decimal__Group__3__Impl : ( RULE_INT ) ;
     public final void rule__Decimal__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3275:1: ( ( RULE_INT ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3276:1: ( RULE_INT )
+            // InternalETMap.g:3275:1: ( ( RULE_INT ) )
+            // InternalETMap.g:3276:1: ( RULE_INT )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3276:1: ( RULE_INT )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3277:1: RULE_INT
+            // InternalETMap.g:3276:1: ( RULE_INT )
+            // InternalETMap.g:3277:1: RULE_INT
             {
              before(grammarAccess.getDecimalAccess().getINTTerminalRuleCall_3()); 
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__Decimal__Group__3__Impl6561); 
+            match(input,RULE_INT,FOLLOW_2); 
              after(grammarAccess.getDecimalAccess().getINTTerminalRuleCall_3()); 
 
             }
@@ -8947,21 +8947,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__0"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3296:1: rule__DecimalExp__Group__0 : rule__DecimalExp__Group__0__Impl rule__DecimalExp__Group__1 ;
+    // InternalETMap.g:3296:1: rule__DecimalExp__Group__0 : rule__DecimalExp__Group__0__Impl rule__DecimalExp__Group__1 ;
     public final void rule__DecimalExp__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3300:1: ( rule__DecimalExp__Group__0__Impl rule__DecimalExp__Group__1 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3301:2: rule__DecimalExp__Group__0__Impl rule__DecimalExp__Group__1
+            // InternalETMap.g:3300:1: ( rule__DecimalExp__Group__0__Impl rule__DecimalExp__Group__1 )
+            // InternalETMap.g:3301:2: rule__DecimalExp__Group__0__Impl rule__DecimalExp__Group__1
             {
-            pushFollow(FOLLOW_rule__DecimalExp__Group__0__Impl_in_rule__DecimalExp__Group__06598);
+            pushFollow(FOLLOW_28);
             rule__DecimalExp__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__DecimalExp__Group__1_in_rule__DecimalExp__Group__06601);
+            pushFollow(FOLLOW_2);
             rule__DecimalExp__Group__1();
 
             state._fsp--;
@@ -8985,20 +8985,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__0__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3308:1: rule__DecimalExp__Group__0__Impl : ( ( rule__DecimalExp__Alternatives_0 )? ) ;
+    // InternalETMap.g:3308:1: rule__DecimalExp__Group__0__Impl : ( ( rule__DecimalExp__Alternatives_0 )? ) ;
     public final void rule__DecimalExp__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3312:1: ( ( ( rule__DecimalExp__Alternatives_0 )? ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3313:1: ( ( rule__DecimalExp__Alternatives_0 )? )
+            // InternalETMap.g:3312:1: ( ( ( rule__DecimalExp__Alternatives_0 )? ) )
+            // InternalETMap.g:3313:1: ( ( rule__DecimalExp__Alternatives_0 )? )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3313:1: ( ( rule__DecimalExp__Alternatives_0 )? )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3314:1: ( rule__DecimalExp__Alternatives_0 )?
+            // InternalETMap.g:3313:1: ( ( rule__DecimalExp__Alternatives_0 )? )
+            // InternalETMap.g:3314:1: ( rule__DecimalExp__Alternatives_0 )?
             {
              before(grammarAccess.getDecimalExpAccess().getAlternatives_0()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3315:1: ( rule__DecimalExp__Alternatives_0 )?
+            // InternalETMap.g:3315:1: ( rule__DecimalExp__Alternatives_0 )?
             int alt26=2;
             int LA26_0 = input.LA(1);
 
@@ -9007,9 +9007,9 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
             }
             switch (alt26) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3315:2: rule__DecimalExp__Alternatives_0
+                    // InternalETMap.g:3315:2: rule__DecimalExp__Alternatives_0
                     {
-                    pushFollow(FOLLOW_rule__DecimalExp__Alternatives_0_in_rule__DecimalExp__Group__0__Impl6628);
+                    pushFollow(FOLLOW_2);
                     rule__DecimalExp__Alternatives_0();
 
                     state._fsp--;
@@ -9043,21 +9043,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__1"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3325:1: rule__DecimalExp__Group__1 : rule__DecimalExp__Group__1__Impl rule__DecimalExp__Group__2 ;
+    // InternalETMap.g:3325:1: rule__DecimalExp__Group__1 : rule__DecimalExp__Group__1__Impl rule__DecimalExp__Group__2 ;
     public final void rule__DecimalExp__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3329:1: ( rule__DecimalExp__Group__1__Impl rule__DecimalExp__Group__2 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3330:2: rule__DecimalExp__Group__1__Impl rule__DecimalExp__Group__2
+            // InternalETMap.g:3329:1: ( rule__DecimalExp__Group__1__Impl rule__DecimalExp__Group__2 )
+            // InternalETMap.g:3330:2: rule__DecimalExp__Group__1__Impl rule__DecimalExp__Group__2
             {
-            pushFollow(FOLLOW_rule__DecimalExp__Group__1__Impl_in_rule__DecimalExp__Group__16659);
+            pushFollow(FOLLOW_30);
             rule__DecimalExp__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__DecimalExp__Group__2_in_rule__DecimalExp__Group__16662);
+            pushFollow(FOLLOW_2);
             rule__DecimalExp__Group__2();
 
             state._fsp--;
@@ -9081,20 +9081,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__1__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3337:1: rule__DecimalExp__Group__1__Impl : ( RULE_INT ) ;
+    // InternalETMap.g:3337:1: rule__DecimalExp__Group__1__Impl : ( RULE_INT ) ;
     public final void rule__DecimalExp__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3341:1: ( ( RULE_INT ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3342:1: ( RULE_INT )
+            // InternalETMap.g:3341:1: ( ( RULE_INT ) )
+            // InternalETMap.g:3342:1: ( RULE_INT )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3342:1: ( RULE_INT )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3343:1: RULE_INT
+            // InternalETMap.g:3342:1: ( RULE_INT )
+            // InternalETMap.g:3343:1: RULE_INT
             {
              before(grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_1()); 
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__DecimalExp__Group__1__Impl6689); 
+            match(input,RULE_INT,FOLLOW_2); 
              after(grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_1()); 
 
             }
@@ -9118,21 +9118,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__2"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3354:1: rule__DecimalExp__Group__2 : rule__DecimalExp__Group__2__Impl rule__DecimalExp__Group__3 ;
+    // InternalETMap.g:3354:1: rule__DecimalExp__Group__2 : rule__DecimalExp__Group__2__Impl rule__DecimalExp__Group__3 ;
     public final void rule__DecimalExp__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3358:1: ( rule__DecimalExp__Group__2__Impl rule__DecimalExp__Group__3 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3359:2: rule__DecimalExp__Group__2__Impl rule__DecimalExp__Group__3
+            // InternalETMap.g:3358:1: ( rule__DecimalExp__Group__2__Impl rule__DecimalExp__Group__3 )
+            // InternalETMap.g:3359:2: rule__DecimalExp__Group__2__Impl rule__DecimalExp__Group__3
             {
-            pushFollow(FOLLOW_rule__DecimalExp__Group__2__Impl_in_rule__DecimalExp__Group__26718);
+            pushFollow(FOLLOW_31);
             rule__DecimalExp__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__DecimalExp__Group__3_in_rule__DecimalExp__Group__26721);
+            pushFollow(FOLLOW_2);
             rule__DecimalExp__Group__3();
 
             state._fsp--;
@@ -9156,20 +9156,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__2__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3366:1: rule__DecimalExp__Group__2__Impl : ( '.' ) ;
+    // InternalETMap.g:3366:1: rule__DecimalExp__Group__2__Impl : ( '.' ) ;
     public final void rule__DecimalExp__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3370:1: ( ( '.' ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3371:1: ( '.' )
+            // InternalETMap.g:3370:1: ( ( '.' ) )
+            // InternalETMap.g:3371:1: ( '.' )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3371:1: ( '.' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3372:1: '.'
+            // InternalETMap.g:3371:1: ( '.' )
+            // InternalETMap.g:3372:1: '.'
             {
              before(grammarAccess.getDecimalExpAccess().getFullStopKeyword_2()); 
-            match(input,39,FOLLOW_39_in_rule__DecimalExp__Group__2__Impl6749); 
+            match(input,39,FOLLOW_2); 
              after(grammarAccess.getDecimalExpAccess().getFullStopKeyword_2()); 
 
             }
@@ -9193,21 +9193,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__3"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3385:1: rule__DecimalExp__Group__3 : rule__DecimalExp__Group__3__Impl rule__DecimalExp__Group__4 ;
+    // InternalETMap.g:3385:1: rule__DecimalExp__Group__3 : rule__DecimalExp__Group__3__Impl rule__DecimalExp__Group__4 ;
     public final void rule__DecimalExp__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3389:1: ( rule__DecimalExp__Group__3__Impl rule__DecimalExp__Group__4 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3390:2: rule__DecimalExp__Group__3__Impl rule__DecimalExp__Group__4
+            // InternalETMap.g:3389:1: ( rule__DecimalExp__Group__3__Impl rule__DecimalExp__Group__4 )
+            // InternalETMap.g:3390:2: rule__DecimalExp__Group__3__Impl rule__DecimalExp__Group__4
             {
-            pushFollow(FOLLOW_rule__DecimalExp__Group__3__Impl_in_rule__DecimalExp__Group__36780);
+            pushFollow(FOLLOW_32);
             rule__DecimalExp__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__DecimalExp__Group__4_in_rule__DecimalExp__Group__36783);
+            pushFollow(FOLLOW_2);
             rule__DecimalExp__Group__4();
 
             state._fsp--;
@@ -9231,20 +9231,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__3__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3397:1: rule__DecimalExp__Group__3__Impl : ( RULE_INT ) ;
+    // InternalETMap.g:3397:1: rule__DecimalExp__Group__3__Impl : ( RULE_INT ) ;
     public final void rule__DecimalExp__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3401:1: ( ( RULE_INT ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3402:1: ( RULE_INT )
+            // InternalETMap.g:3401:1: ( ( RULE_INT ) )
+            // InternalETMap.g:3402:1: ( RULE_INT )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3402:1: ( RULE_INT )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3403:1: RULE_INT
+            // InternalETMap.g:3402:1: ( RULE_INT )
+            // InternalETMap.g:3403:1: RULE_INT
             {
              before(grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_3()); 
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__DecimalExp__Group__3__Impl6810); 
+            match(input,RULE_INT,FOLLOW_2); 
              after(grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_3()); 
 
             }
@@ -9268,21 +9268,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__4"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3414:1: rule__DecimalExp__Group__4 : rule__DecimalExp__Group__4__Impl rule__DecimalExp__Group__5 ;
+    // InternalETMap.g:3414:1: rule__DecimalExp__Group__4 : rule__DecimalExp__Group__4__Impl rule__DecimalExp__Group__5 ;
     public final void rule__DecimalExp__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3418:1: ( rule__DecimalExp__Group__4__Impl rule__DecimalExp__Group__5 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3419:2: rule__DecimalExp__Group__4__Impl rule__DecimalExp__Group__5
+            // InternalETMap.g:3418:1: ( rule__DecimalExp__Group__4__Impl rule__DecimalExp__Group__5 )
+            // InternalETMap.g:3419:2: rule__DecimalExp__Group__4__Impl rule__DecimalExp__Group__5
             {
-            pushFollow(FOLLOW_rule__DecimalExp__Group__4__Impl_in_rule__DecimalExp__Group__46839);
+            pushFollow(FOLLOW_29);
             rule__DecimalExp__Group__4__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__DecimalExp__Group__5_in_rule__DecimalExp__Group__46842);
+            pushFollow(FOLLOW_2);
             rule__DecimalExp__Group__5();
 
             state._fsp--;
@@ -9306,23 +9306,23 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__4__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3426:1: rule__DecimalExp__Group__4__Impl : ( ( rule__DecimalExp__Alternatives_4 ) ) ;
+    // InternalETMap.g:3426:1: rule__DecimalExp__Group__4__Impl : ( ( rule__DecimalExp__Alternatives_4 ) ) ;
     public final void rule__DecimalExp__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3430:1: ( ( ( rule__DecimalExp__Alternatives_4 ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3431:1: ( ( rule__DecimalExp__Alternatives_4 ) )
+            // InternalETMap.g:3430:1: ( ( ( rule__DecimalExp__Alternatives_4 ) ) )
+            // InternalETMap.g:3431:1: ( ( rule__DecimalExp__Alternatives_4 ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3431:1: ( ( rule__DecimalExp__Alternatives_4 ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3432:1: ( rule__DecimalExp__Alternatives_4 )
+            // InternalETMap.g:3431:1: ( ( rule__DecimalExp__Alternatives_4 ) )
+            // InternalETMap.g:3432:1: ( rule__DecimalExp__Alternatives_4 )
             {
              before(grammarAccess.getDecimalExpAccess().getAlternatives_4()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3433:1: ( rule__DecimalExp__Alternatives_4 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3433:2: rule__DecimalExp__Alternatives_4
+            // InternalETMap.g:3433:1: ( rule__DecimalExp__Alternatives_4 )
+            // InternalETMap.g:3433:2: rule__DecimalExp__Alternatives_4
             {
-            pushFollow(FOLLOW_rule__DecimalExp__Alternatives_4_in_rule__DecimalExp__Group__4__Impl6869);
+            pushFollow(FOLLOW_2);
             rule__DecimalExp__Alternatives_4();
 
             state._fsp--;
@@ -9353,21 +9353,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__5"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3443:1: rule__DecimalExp__Group__5 : rule__DecimalExp__Group__5__Impl rule__DecimalExp__Group__6 ;
+    // InternalETMap.g:3443:1: rule__DecimalExp__Group__5 : rule__DecimalExp__Group__5__Impl rule__DecimalExp__Group__6 ;
     public final void rule__DecimalExp__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3447:1: ( rule__DecimalExp__Group__5__Impl rule__DecimalExp__Group__6 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3448:2: rule__DecimalExp__Group__5__Impl rule__DecimalExp__Group__6
+            // InternalETMap.g:3447:1: ( rule__DecimalExp__Group__5__Impl rule__DecimalExp__Group__6 )
+            // InternalETMap.g:3448:2: rule__DecimalExp__Group__5__Impl rule__DecimalExp__Group__6
             {
-            pushFollow(FOLLOW_rule__DecimalExp__Group__5__Impl_in_rule__DecimalExp__Group__56899);
+            pushFollow(FOLLOW_29);
             rule__DecimalExp__Group__5__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__DecimalExp__Group__6_in_rule__DecimalExp__Group__56902);
+            pushFollow(FOLLOW_2);
             rule__DecimalExp__Group__6();
 
             state._fsp--;
@@ -9391,20 +9391,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__5__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3455:1: rule__DecimalExp__Group__5__Impl : ( ( rule__DecimalExp__Alternatives_5 )? ) ;
+    // InternalETMap.g:3455:1: rule__DecimalExp__Group__5__Impl : ( ( rule__DecimalExp__Alternatives_5 )? ) ;
     public final void rule__DecimalExp__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3459:1: ( ( ( rule__DecimalExp__Alternatives_5 )? ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3460:1: ( ( rule__DecimalExp__Alternatives_5 )? )
+            // InternalETMap.g:3459:1: ( ( ( rule__DecimalExp__Alternatives_5 )? ) )
+            // InternalETMap.g:3460:1: ( ( rule__DecimalExp__Alternatives_5 )? )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3460:1: ( ( rule__DecimalExp__Alternatives_5 )? )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3461:1: ( rule__DecimalExp__Alternatives_5 )?
+            // InternalETMap.g:3460:1: ( ( rule__DecimalExp__Alternatives_5 )? )
+            // InternalETMap.g:3461:1: ( rule__DecimalExp__Alternatives_5 )?
             {
              before(grammarAccess.getDecimalExpAccess().getAlternatives_5()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3462:1: ( rule__DecimalExp__Alternatives_5 )?
+            // InternalETMap.g:3462:1: ( rule__DecimalExp__Alternatives_5 )?
             int alt27=2;
             int LA27_0 = input.LA(1);
 
@@ -9413,9 +9413,9 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
             }
             switch (alt27) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3462:2: rule__DecimalExp__Alternatives_5
+                    // InternalETMap.g:3462:2: rule__DecimalExp__Alternatives_5
                     {
-                    pushFollow(FOLLOW_rule__DecimalExp__Alternatives_5_in_rule__DecimalExp__Group__5__Impl6929);
+                    pushFollow(FOLLOW_2);
                     rule__DecimalExp__Alternatives_5();
 
                     state._fsp--;
@@ -9449,16 +9449,16 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__6"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3472:1: rule__DecimalExp__Group__6 : rule__DecimalExp__Group__6__Impl ;
+    // InternalETMap.g:3472:1: rule__DecimalExp__Group__6 : rule__DecimalExp__Group__6__Impl ;
     public final void rule__DecimalExp__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3476:1: ( rule__DecimalExp__Group__6__Impl )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3477:2: rule__DecimalExp__Group__6__Impl
+            // InternalETMap.g:3476:1: ( rule__DecimalExp__Group__6__Impl )
+            // InternalETMap.g:3477:2: rule__DecimalExp__Group__6__Impl
             {
-            pushFollow(FOLLOW_rule__DecimalExp__Group__6__Impl_in_rule__DecimalExp__Group__66960);
+            pushFollow(FOLLOW_2);
             rule__DecimalExp__Group__6__Impl();
 
             state._fsp--;
@@ -9482,20 +9482,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__6__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3483:1: rule__DecimalExp__Group__6__Impl : ( RULE_INT ) ;
+    // InternalETMap.g:3483:1: rule__DecimalExp__Group__6__Impl : ( RULE_INT ) ;
     public final void rule__DecimalExp__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3487:1: ( ( RULE_INT ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3488:1: ( RULE_INT )
+            // InternalETMap.g:3487:1: ( ( RULE_INT ) )
+            // InternalETMap.g:3488:1: ( RULE_INT )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3488:1: ( RULE_INT )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3489:1: RULE_INT
+            // InternalETMap.g:3488:1: ( RULE_INT )
+            // InternalETMap.g:3489:1: RULE_INT
             {
              before(grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_6()); 
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__DecimalExp__Group__6__Impl6987); 
+            match(input,RULE_INT,FOLLOW_2); 
              after(grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_6()); 
 
             }
@@ -9519,21 +9519,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FQN__Group__0"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3514:1: rule__FQN__Group__0 : rule__FQN__Group__0__Impl rule__FQN__Group__1 ;
+    // InternalETMap.g:3514:1: rule__FQN__Group__0 : rule__FQN__Group__0__Impl rule__FQN__Group__1 ;
     public final void rule__FQN__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3518:1: ( rule__FQN__Group__0__Impl rule__FQN__Group__1 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3519:2: rule__FQN__Group__0__Impl rule__FQN__Group__1
+            // InternalETMap.g:3518:1: ( rule__FQN__Group__0__Impl rule__FQN__Group__1 )
+            // InternalETMap.g:3519:2: rule__FQN__Group__0__Impl rule__FQN__Group__1
             {
-            pushFollow(FOLLOW_rule__FQN__Group__0__Impl_in_rule__FQN__Group__07030);
+            pushFollow(FOLLOW_30);
             rule__FQN__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__FQN__Group__1_in_rule__FQN__Group__07033);
+            pushFollow(FOLLOW_2);
             rule__FQN__Group__1();
 
             state._fsp--;
@@ -9557,20 +9557,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FQN__Group__0__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3526:1: rule__FQN__Group__0__Impl : ( RULE_ID ) ;
+    // InternalETMap.g:3526:1: rule__FQN__Group__0__Impl : ( RULE_ID ) ;
     public final void rule__FQN__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3530:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3531:1: ( RULE_ID )
+            // InternalETMap.g:3530:1: ( ( RULE_ID ) )
+            // InternalETMap.g:3531:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3531:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3532:1: RULE_ID
+            // InternalETMap.g:3531:1: ( RULE_ID )
+            // InternalETMap.g:3532:1: RULE_ID
             {
              before(grammarAccess.getFQNAccess().getIDTerminalRuleCall_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__FQN__Group__0__Impl7060); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getFQNAccess().getIDTerminalRuleCall_0()); 
 
             }
@@ -9594,16 +9594,16 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FQN__Group__1"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3543:1: rule__FQN__Group__1 : rule__FQN__Group__1__Impl ;
+    // InternalETMap.g:3543:1: rule__FQN__Group__1 : rule__FQN__Group__1__Impl ;
     public final void rule__FQN__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3547:1: ( rule__FQN__Group__1__Impl )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3548:2: rule__FQN__Group__1__Impl
+            // InternalETMap.g:3547:1: ( rule__FQN__Group__1__Impl )
+            // InternalETMap.g:3548:2: rule__FQN__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__FQN__Group__1__Impl_in_rule__FQN__Group__17089);
+            pushFollow(FOLLOW_2);
             rule__FQN__Group__1__Impl();
 
             state._fsp--;
@@ -9627,20 +9627,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FQN__Group__1__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3554:1: rule__FQN__Group__1__Impl : ( ( rule__FQN__Group_1__0 )* ) ;
+    // InternalETMap.g:3554:1: rule__FQN__Group__1__Impl : ( ( rule__FQN__Group_1__0 )* ) ;
     public final void rule__FQN__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3558:1: ( ( ( rule__FQN__Group_1__0 )* ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3559:1: ( ( rule__FQN__Group_1__0 )* )
+            // InternalETMap.g:3558:1: ( ( ( rule__FQN__Group_1__0 )* ) )
+            // InternalETMap.g:3559:1: ( ( rule__FQN__Group_1__0 )* )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3559:1: ( ( rule__FQN__Group_1__0 )* )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3560:1: ( rule__FQN__Group_1__0 )*
+            // InternalETMap.g:3559:1: ( ( rule__FQN__Group_1__0 )* )
+            // InternalETMap.g:3560:1: ( rule__FQN__Group_1__0 )*
             {
              before(grammarAccess.getFQNAccess().getGroup_1()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3561:1: ( rule__FQN__Group_1__0 )*
+            // InternalETMap.g:3561:1: ( rule__FQN__Group_1__0 )*
             loop28:
             do {
                 int alt28=2;
@@ -9653,9 +9653,9 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
                 switch (alt28) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3561:2: rule__FQN__Group_1__0
+            	    // InternalETMap.g:3561:2: rule__FQN__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__FQN__Group_1__0_in_rule__FQN__Group__1__Impl7116);
+            	    pushFollow(FOLLOW_33);
             	    rule__FQN__Group_1__0();
 
             	    state._fsp--;
@@ -9692,21 +9692,21 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FQN__Group_1__0"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3575:1: rule__FQN__Group_1__0 : rule__FQN__Group_1__0__Impl rule__FQN__Group_1__1 ;
+    // InternalETMap.g:3575:1: rule__FQN__Group_1__0 : rule__FQN__Group_1__0__Impl rule__FQN__Group_1__1 ;
     public final void rule__FQN__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3579:1: ( rule__FQN__Group_1__0__Impl rule__FQN__Group_1__1 )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3580:2: rule__FQN__Group_1__0__Impl rule__FQN__Group_1__1
+            // InternalETMap.g:3579:1: ( rule__FQN__Group_1__0__Impl rule__FQN__Group_1__1 )
+            // InternalETMap.g:3580:2: rule__FQN__Group_1__0__Impl rule__FQN__Group_1__1
             {
-            pushFollow(FOLLOW_rule__FQN__Group_1__0__Impl_in_rule__FQN__Group_1__07151);
+            pushFollow(FOLLOW_3);
             rule__FQN__Group_1__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__FQN__Group_1__1_in_rule__FQN__Group_1__07154);
+            pushFollow(FOLLOW_2);
             rule__FQN__Group_1__1();
 
             state._fsp--;
@@ -9730,20 +9730,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FQN__Group_1__0__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3587:1: rule__FQN__Group_1__0__Impl : ( '.' ) ;
+    // InternalETMap.g:3587:1: rule__FQN__Group_1__0__Impl : ( '.' ) ;
     public final void rule__FQN__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3591:1: ( ( '.' ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3592:1: ( '.' )
+            // InternalETMap.g:3591:1: ( ( '.' ) )
+            // InternalETMap.g:3592:1: ( '.' )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3592:1: ( '.' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3593:1: '.'
+            // InternalETMap.g:3592:1: ( '.' )
+            // InternalETMap.g:3593:1: '.'
             {
              before(grammarAccess.getFQNAccess().getFullStopKeyword_1_0()); 
-            match(input,39,FOLLOW_39_in_rule__FQN__Group_1__0__Impl7182); 
+            match(input,39,FOLLOW_2); 
              after(grammarAccess.getFQNAccess().getFullStopKeyword_1_0()); 
 
             }
@@ -9767,16 +9767,16 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FQN__Group_1__1"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3606:1: rule__FQN__Group_1__1 : rule__FQN__Group_1__1__Impl ;
+    // InternalETMap.g:3606:1: rule__FQN__Group_1__1 : rule__FQN__Group_1__1__Impl ;
     public final void rule__FQN__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3610:1: ( rule__FQN__Group_1__1__Impl )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3611:2: rule__FQN__Group_1__1__Impl
+            // InternalETMap.g:3610:1: ( rule__FQN__Group_1__1__Impl )
+            // InternalETMap.g:3611:2: rule__FQN__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__FQN__Group_1__1__Impl_in_rule__FQN__Group_1__17213);
+            pushFollow(FOLLOW_2);
             rule__FQN__Group_1__1__Impl();
 
             state._fsp--;
@@ -9800,20 +9800,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FQN__Group_1__1__Impl"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3617:1: rule__FQN__Group_1__1__Impl : ( RULE_ID ) ;
+    // InternalETMap.g:3617:1: rule__FQN__Group_1__1__Impl : ( RULE_ID ) ;
     public final void rule__FQN__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3621:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3622:1: ( RULE_ID )
+            // InternalETMap.g:3621:1: ( ( RULE_ID ) )
+            // InternalETMap.g:3622:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3622:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3623:1: RULE_ID
+            // InternalETMap.g:3622:1: ( RULE_ID )
+            // InternalETMap.g:3623:1: RULE_ID
             {
              before(grammarAccess.getFQNAccess().getIDTerminalRuleCall_1_1()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__FQN__Group_1__1__Impl7240); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getFQNAccess().getIDTerminalRuleCall_1_1()); 
 
             }
@@ -9837,20 +9837,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MappingModel__NameAssignment_1"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3639:1: rule__MappingModel__NameAssignment_1 : ( ruleFQN ) ;
+    // InternalETMap.g:3639:1: rule__MappingModel__NameAssignment_1 : ( ruleFQN ) ;
     public final void rule__MappingModel__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3643:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3644:1: ( ruleFQN )
+            // InternalETMap.g:3643:1: ( ( ruleFQN ) )
+            // InternalETMap.g:3644:1: ( ruleFQN )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3644:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3645:1: ruleFQN
+            // InternalETMap.g:3644:1: ( ruleFQN )
+            // InternalETMap.g:3645:1: ruleFQN
             {
              before(grammarAccess.getMappingModelAccess().getNameFQNParserRuleCall_1_0()); 
-            pushFollow(FOLLOW_ruleFQN_in_rule__MappingModel__NameAssignment_17278);
+            pushFollow(FOLLOW_2);
             ruleFQN();
 
             state._fsp--;
@@ -9878,20 +9878,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MappingModel__ImportsAssignment_3"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3654:1: rule__MappingModel__ImportsAssignment_3 : ( ruleImport ) ;
+    // InternalETMap.g:3654:1: rule__MappingModel__ImportsAssignment_3 : ( ruleImport ) ;
     public final void rule__MappingModel__ImportsAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3658:1: ( ( ruleImport ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3659:1: ( ruleImport )
+            // InternalETMap.g:3658:1: ( ( ruleImport ) )
+            // InternalETMap.g:3659:1: ( ruleImport )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3659:1: ( ruleImport )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3660:1: ruleImport
+            // InternalETMap.g:3659:1: ( ruleImport )
+            // InternalETMap.g:3660:1: ruleImport
             {
              before(grammarAccess.getMappingModelAccess().getImportsImportParserRuleCall_3_0()); 
-            pushFollow(FOLLOW_ruleImport_in_rule__MappingModel__ImportsAssignment_37309);
+            pushFollow(FOLLOW_2);
             ruleImport();
 
             state._fsp--;
@@ -9919,20 +9919,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MappingModel__MappingsAssignment_4"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3669:1: rule__MappingModel__MappingsAssignment_4 : ( ruleMapping ) ;
+    // InternalETMap.g:3669:1: rule__MappingModel__MappingsAssignment_4 : ( ruleMapping ) ;
     public final void rule__MappingModel__MappingsAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3673:1: ( ( ruleMapping ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3674:1: ( ruleMapping )
+            // InternalETMap.g:3673:1: ( ( ruleMapping ) )
+            // InternalETMap.g:3674:1: ( ruleMapping )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3674:1: ( ruleMapping )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3675:1: ruleMapping
+            // InternalETMap.g:3674:1: ( ruleMapping )
+            // InternalETMap.g:3675:1: ruleMapping
             {
              before(grammarAccess.getMappingModelAccess().getMappingsMappingParserRuleCall_4_0()); 
-            pushFollow(FOLLOW_ruleMapping_in_rule__MappingModel__MappingsAssignment_47340);
+            pushFollow(FOLLOW_2);
             ruleMapping();
 
             state._fsp--;
@@ -9960,24 +9960,24 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Mapping__LogicalSysAssignment_1"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3684:1: rule__Mapping__LogicalSysAssignment_1 : ( ( ruleFQN ) ) ;
+    // InternalETMap.g:3684:1: rule__Mapping__LogicalSysAssignment_1 : ( ( ruleFQN ) ) ;
     public final void rule__Mapping__LogicalSysAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3688:1: ( ( ( ruleFQN ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3689:1: ( ( ruleFQN ) )
+            // InternalETMap.g:3688:1: ( ( ( ruleFQN ) ) )
+            // InternalETMap.g:3689:1: ( ( ruleFQN ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3689:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3690:1: ( ruleFQN )
+            // InternalETMap.g:3689:1: ( ( ruleFQN ) )
+            // InternalETMap.g:3690:1: ( ruleFQN )
             {
              before(grammarAccess.getMappingAccess().getLogicalSysLogicalSystemCrossReference_1_0()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3691:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3692:1: ruleFQN
+            // InternalETMap.g:3691:1: ( ruleFQN )
+            // InternalETMap.g:3692:1: ruleFQN
             {
              before(grammarAccess.getMappingAccess().getLogicalSysLogicalSystemFQNParserRuleCall_1_0_1()); 
-            pushFollow(FOLLOW_ruleFQN_in_rule__Mapping__LogicalSysAssignment_17375);
+            pushFollow(FOLLOW_2);
             ruleFQN();
 
             state._fsp--;
@@ -10009,24 +10009,24 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Mapping__PhysicalSysAssignment_3"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3703:1: rule__Mapping__PhysicalSysAssignment_3 : ( ( ruleFQN ) ) ;
+    // InternalETMap.g:3703:1: rule__Mapping__PhysicalSysAssignment_3 : ( ( ruleFQN ) ) ;
     public final void rule__Mapping__PhysicalSysAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3707:1: ( ( ( ruleFQN ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3708:1: ( ( ruleFQN ) )
+            // InternalETMap.g:3707:1: ( ( ( ruleFQN ) ) )
+            // InternalETMap.g:3708:1: ( ( ruleFQN ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3708:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3709:1: ( ruleFQN )
+            // InternalETMap.g:3708:1: ( ( ruleFQN ) )
+            // InternalETMap.g:3709:1: ( ruleFQN )
             {
              before(grammarAccess.getMappingAccess().getPhysicalSysPhysicalSystemCrossReference_3_0()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3710:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3711:1: ruleFQN
+            // InternalETMap.g:3710:1: ( ruleFQN )
+            // InternalETMap.g:3711:1: ruleFQN
             {
              before(grammarAccess.getMappingAccess().getPhysicalSysPhysicalSystemFQNParserRuleCall_3_0_1()); 
-            pushFollow(FOLLOW_ruleFQN_in_rule__Mapping__PhysicalSysAssignment_37414);
+            pushFollow(FOLLOW_2);
             ruleFQN();
 
             state._fsp--;
@@ -10058,20 +10058,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Mapping__SubsysMappingsAssignment_5"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3722:1: rule__Mapping__SubsysMappingsAssignment_5 : ( ruleSubSystemMapping ) ;
+    // InternalETMap.g:3722:1: rule__Mapping__SubsysMappingsAssignment_5 : ( ruleSubSystemMapping ) ;
     public final void rule__Mapping__SubsysMappingsAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3726:1: ( ( ruleSubSystemMapping ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3727:1: ( ruleSubSystemMapping )
+            // InternalETMap.g:3726:1: ( ( ruleSubSystemMapping ) )
+            // InternalETMap.g:3727:1: ( ruleSubSystemMapping )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3727:1: ( ruleSubSystemMapping )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3728:1: ruleSubSystemMapping
+            // InternalETMap.g:3727:1: ( ruleSubSystemMapping )
+            // InternalETMap.g:3728:1: ruleSubSystemMapping
             {
              before(grammarAccess.getMappingAccess().getSubsysMappingsSubSystemMappingParserRuleCall_5_0()); 
-            pushFollow(FOLLOW_ruleSubSystemMapping_in_rule__Mapping__SubsysMappingsAssignment_57449);
+            pushFollow(FOLLOW_2);
             ruleSubSystemMapping();
 
             state._fsp--;
@@ -10099,24 +10099,24 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemMapping__LogicalSubSysAssignment_1"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3737:1: rule__SubSystemMapping__LogicalSubSysAssignment_1 : ( ( RULE_ID ) ) ;
+    // InternalETMap.g:3737:1: rule__SubSystemMapping__LogicalSubSysAssignment_1 : ( ( RULE_ID ) ) ;
     public final void rule__SubSystemMapping__LogicalSubSysAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3741:1: ( ( ( RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3742:1: ( ( RULE_ID ) )
+            // InternalETMap.g:3741:1: ( ( ( RULE_ID ) ) )
+            // InternalETMap.g:3742:1: ( ( RULE_ID ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3742:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3743:1: ( RULE_ID )
+            // InternalETMap.g:3742:1: ( ( RULE_ID ) )
+            // InternalETMap.g:3743:1: ( RULE_ID )
             {
              before(grammarAccess.getSubSystemMappingAccess().getLogicalSubSysSubSystemRefCrossReference_1_0()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3744:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3745:1: RULE_ID
+            // InternalETMap.g:3744:1: ( RULE_ID )
+            // InternalETMap.g:3745:1: RULE_ID
             {
              before(grammarAccess.getSubSystemMappingAccess().getLogicalSubSysSubSystemRefIDTerminalRuleCall_1_0_1()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__SubSystemMapping__LogicalSubSysAssignment_17484); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getSubSystemMappingAccess().getLogicalSubSysSubSystemRefIDTerminalRuleCall_1_0_1()); 
 
             }
@@ -10144,24 +10144,24 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemMapping__NodeAssignment_3"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3756:1: rule__SubSystemMapping__NodeAssignment_3 : ( ( RULE_ID ) ) ;
+    // InternalETMap.g:3756:1: rule__SubSystemMapping__NodeAssignment_3 : ( ( RULE_ID ) ) ;
     public final void rule__SubSystemMapping__NodeAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3760:1: ( ( ( RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3761:1: ( ( RULE_ID ) )
+            // InternalETMap.g:3760:1: ( ( ( RULE_ID ) ) )
+            // InternalETMap.g:3761:1: ( ( RULE_ID ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3761:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3762:1: ( RULE_ID )
+            // InternalETMap.g:3761:1: ( ( RULE_ID ) )
+            // InternalETMap.g:3762:1: ( RULE_ID )
             {
              before(grammarAccess.getSubSystemMappingAccess().getNodeNodeRefCrossReference_3_0()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3763:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3764:1: RULE_ID
+            // InternalETMap.g:3763:1: ( RULE_ID )
+            // InternalETMap.g:3764:1: RULE_ID
             {
              before(grammarAccess.getSubSystemMappingAccess().getNodeNodeRefIDTerminalRuleCall_3_0_1()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__SubSystemMapping__NodeAssignment_37523); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getSubSystemMappingAccess().getNodeNodeRefIDTerminalRuleCall_3_0_1()); 
 
             }
@@ -10189,20 +10189,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemMapping__ThreadMappingsAssignment_4_1"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3775:1: rule__SubSystemMapping__ThreadMappingsAssignment_4_1 : ( ruleThreadMapping ) ;
+    // InternalETMap.g:3775:1: rule__SubSystemMapping__ThreadMappingsAssignment_4_1 : ( ruleThreadMapping ) ;
     public final void rule__SubSystemMapping__ThreadMappingsAssignment_4_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3779:1: ( ( ruleThreadMapping ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3780:1: ( ruleThreadMapping )
+            // InternalETMap.g:3779:1: ( ( ruleThreadMapping ) )
+            // InternalETMap.g:3780:1: ( ruleThreadMapping )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3780:1: ( ruleThreadMapping )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3781:1: ruleThreadMapping
+            // InternalETMap.g:3780:1: ( ruleThreadMapping )
+            // InternalETMap.g:3781:1: ruleThreadMapping
             {
              before(grammarAccess.getSubSystemMappingAccess().getThreadMappingsThreadMappingParserRuleCall_4_1_0()); 
-            pushFollow(FOLLOW_ruleThreadMapping_in_rule__SubSystemMapping__ThreadMappingsAssignment_4_17558);
+            pushFollow(FOLLOW_2);
             ruleThreadMapping();
 
             state._fsp--;
@@ -10230,24 +10230,24 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ThreadMapping__LogicalThreadAssignment_1"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3790:1: rule__ThreadMapping__LogicalThreadAssignment_1 : ( ( RULE_ID ) ) ;
+    // InternalETMap.g:3790:1: rule__ThreadMapping__LogicalThreadAssignment_1 : ( ( RULE_ID ) ) ;
     public final void rule__ThreadMapping__LogicalThreadAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3794:1: ( ( ( RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3795:1: ( ( RULE_ID ) )
+            // InternalETMap.g:3794:1: ( ( ( RULE_ID ) ) )
+            // InternalETMap.g:3795:1: ( ( RULE_ID ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3795:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3796:1: ( RULE_ID )
+            // InternalETMap.g:3795:1: ( ( RULE_ID ) )
+            // InternalETMap.g:3796:1: ( RULE_ID )
             {
              before(grammarAccess.getThreadMappingAccess().getLogicalThreadLogicalThreadCrossReference_1_0()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3797:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3798:1: RULE_ID
+            // InternalETMap.g:3797:1: ( RULE_ID )
+            // InternalETMap.g:3798:1: RULE_ID
             {
              before(grammarAccess.getThreadMappingAccess().getLogicalThreadLogicalThreadIDTerminalRuleCall_1_0_1()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__ThreadMapping__LogicalThreadAssignment_17593); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getThreadMappingAccess().getLogicalThreadLogicalThreadIDTerminalRuleCall_1_0_1()); 
 
             }
@@ -10275,24 +10275,24 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ThreadMapping__PhysicalThreadAssignment_3"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3809:1: rule__ThreadMapping__PhysicalThreadAssignment_3 : ( ( RULE_ID ) ) ;
+    // InternalETMap.g:3809:1: rule__ThreadMapping__PhysicalThreadAssignment_3 : ( ( RULE_ID ) ) ;
     public final void rule__ThreadMapping__PhysicalThreadAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3813:1: ( ( ( RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3814:1: ( ( RULE_ID ) )
+            // InternalETMap.g:3813:1: ( ( ( RULE_ID ) ) )
+            // InternalETMap.g:3814:1: ( ( RULE_ID ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3814:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3815:1: ( RULE_ID )
+            // InternalETMap.g:3814:1: ( ( RULE_ID ) )
+            // InternalETMap.g:3815:1: ( RULE_ID )
             {
              before(grammarAccess.getThreadMappingAccess().getPhysicalThreadPhysicalThreadCrossReference_3_0()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3816:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3817:1: RULE_ID
+            // InternalETMap.g:3816:1: ( RULE_ID )
+            // InternalETMap.g:3817:1: RULE_ID
             {
              before(grammarAccess.getThreadMappingAccess().getPhysicalThreadPhysicalThreadIDTerminalRuleCall_3_0_1()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__ThreadMapping__PhysicalThreadAssignment_37632); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getThreadMappingAccess().getPhysicalThreadPhysicalThreadIDTerminalRuleCall_3_0_1()); 
 
             }
@@ -10320,20 +10320,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__KeyValue__KeyAssignment_0"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3831:1: rule__KeyValue__KeyAssignment_0 : ( RULE_ID ) ;
+    // InternalETMap.g:3831:1: rule__KeyValue__KeyAssignment_0 : ( RULE_ID ) ;
     public final void rule__KeyValue__KeyAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3835:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3836:1: ( RULE_ID )
+            // InternalETMap.g:3835:1: ( ( RULE_ID ) )
+            // InternalETMap.g:3836:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3836:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3837:1: RULE_ID
+            // InternalETMap.g:3836:1: ( RULE_ID )
+            // InternalETMap.g:3837:1: RULE_ID
             {
              before(grammarAccess.getKeyValueAccess().getKeyIDTerminalRuleCall_0_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__KeyValue__KeyAssignment_07670); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getKeyValueAccess().getKeyIDTerminalRuleCall_0_0()); 
 
             }
@@ -10357,20 +10357,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__KeyValue__ValueAssignment_2"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3846:1: rule__KeyValue__ValueAssignment_2 : ( ruleLiteral ) ;
+    // InternalETMap.g:3846:1: rule__KeyValue__ValueAssignment_2 : ( ruleLiteral ) ;
     public final void rule__KeyValue__ValueAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3850:1: ( ( ruleLiteral ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3851:1: ( ruleLiteral )
+            // InternalETMap.g:3850:1: ( ( ruleLiteral ) )
+            // InternalETMap.g:3851:1: ( ruleLiteral )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3851:1: ( ruleLiteral )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3852:1: ruleLiteral
+            // InternalETMap.g:3851:1: ( ruleLiteral )
+            // InternalETMap.g:3852:1: ruleLiteral
             {
              before(grammarAccess.getKeyValueAccess().getValueLiteralParserRuleCall_2_0()); 
-            pushFollow(FOLLOW_ruleLiteral_in_rule__KeyValue__ValueAssignment_27701);
+            pushFollow(FOLLOW_2);
             ruleLiteral();
 
             state._fsp--;
@@ -10398,24 +10398,24 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__OptionalAssignment_0_0"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3867:1: rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 : ( ( 'optional' ) ) ;
+    // InternalETMap.g:3867:1: rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 : ( ( 'optional' ) ) ;
     public final void rule__SimpleAnnotationAttribute__OptionalAssignment_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3871:1: ( ( ( 'optional' ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3872:1: ( ( 'optional' ) )
+            // InternalETMap.g:3871:1: ( ( ( 'optional' ) ) )
+            // InternalETMap.g:3872:1: ( ( 'optional' ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3872:1: ( ( 'optional' ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3873:1: ( 'optional' )
+            // InternalETMap.g:3872:1: ( ( 'optional' ) )
+            // InternalETMap.g:3873:1: ( 'optional' )
             {
              before(grammarAccess.getSimpleAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3874:1: ( 'optional' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3875:1: 'optional'
+            // InternalETMap.g:3874:1: ( 'optional' )
+            // InternalETMap.g:3875:1: 'optional'
             {
              before(grammarAccess.getSimpleAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0()); 
-            match(input,40,FOLLOW_40_in_rule__SimpleAnnotationAttribute__OptionalAssignment_0_07743); 
+            match(input,40,FOLLOW_2); 
              after(grammarAccess.getSimpleAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0()); 
 
             }
@@ -10443,20 +10443,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__NameAssignment_2"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3890:1: rule__SimpleAnnotationAttribute__NameAssignment_2 : ( RULE_ID ) ;
+    // InternalETMap.g:3890:1: rule__SimpleAnnotationAttribute__NameAssignment_2 : ( RULE_ID ) ;
     public final void rule__SimpleAnnotationAttribute__NameAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3894:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3895:1: ( RULE_ID )
+            // InternalETMap.g:3894:1: ( ( RULE_ID ) )
+            // InternalETMap.g:3895:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3895:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3896:1: RULE_ID
+            // InternalETMap.g:3895:1: ( RULE_ID )
+            // InternalETMap.g:3896:1: RULE_ID
             {
              before(grammarAccess.getSimpleAnnotationAttributeAccess().getNameIDTerminalRuleCall_2_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__SimpleAnnotationAttribute__NameAssignment_27782); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getSimpleAnnotationAttributeAccess().getNameIDTerminalRuleCall_2_0()); 
 
             }
@@ -10480,20 +10480,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__TypeAssignment_4"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3905:1: rule__SimpleAnnotationAttribute__TypeAssignment_4 : ( ruleLiteralType ) ;
+    // InternalETMap.g:3905:1: rule__SimpleAnnotationAttribute__TypeAssignment_4 : ( ruleLiteralType ) ;
     public final void rule__SimpleAnnotationAttribute__TypeAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3909:1: ( ( ruleLiteralType ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3910:1: ( ruleLiteralType )
+            // InternalETMap.g:3909:1: ( ( ruleLiteralType ) )
+            // InternalETMap.g:3910:1: ( ruleLiteralType )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3910:1: ( ruleLiteralType )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3911:1: ruleLiteralType
+            // InternalETMap.g:3910:1: ( ruleLiteralType )
+            // InternalETMap.g:3911:1: ruleLiteralType
             {
              before(grammarAccess.getSimpleAnnotationAttributeAccess().getTypeLiteralTypeEnumRuleCall_4_0()); 
-            pushFollow(FOLLOW_ruleLiteralType_in_rule__SimpleAnnotationAttribute__TypeAssignment_47813);
+            pushFollow(FOLLOW_2);
             ruleLiteralType();
 
             state._fsp--;
@@ -10521,24 +10521,24 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__OptionalAssignment_0_0"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3920:1: rule__EnumAnnotationAttribute__OptionalAssignment_0_0 : ( ( 'optional' ) ) ;
+    // InternalETMap.g:3920:1: rule__EnumAnnotationAttribute__OptionalAssignment_0_0 : ( ( 'optional' ) ) ;
     public final void rule__EnumAnnotationAttribute__OptionalAssignment_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3924:1: ( ( ( 'optional' ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3925:1: ( ( 'optional' ) )
+            // InternalETMap.g:3924:1: ( ( ( 'optional' ) ) )
+            // InternalETMap.g:3925:1: ( ( 'optional' ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3925:1: ( ( 'optional' ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3926:1: ( 'optional' )
+            // InternalETMap.g:3925:1: ( ( 'optional' ) )
+            // InternalETMap.g:3926:1: ( 'optional' )
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3927:1: ( 'optional' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3928:1: 'optional'
+            // InternalETMap.g:3927:1: ( 'optional' )
+            // InternalETMap.g:3928:1: 'optional'
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0()); 
-            match(input,40,FOLLOW_40_in_rule__EnumAnnotationAttribute__OptionalAssignment_0_07849); 
+            match(input,40,FOLLOW_2); 
              after(grammarAccess.getEnumAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0()); 
 
             }
@@ -10566,20 +10566,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__NameAssignment_2"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3943:1: rule__EnumAnnotationAttribute__NameAssignment_2 : ( RULE_ID ) ;
+    // InternalETMap.g:3943:1: rule__EnumAnnotationAttribute__NameAssignment_2 : ( RULE_ID ) ;
     public final void rule__EnumAnnotationAttribute__NameAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3947:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3948:1: ( RULE_ID )
+            // InternalETMap.g:3947:1: ( ( RULE_ID ) )
+            // InternalETMap.g:3948:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3948:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3949:1: RULE_ID
+            // InternalETMap.g:3948:1: ( RULE_ID )
+            // InternalETMap.g:3949:1: RULE_ID
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getNameIDTerminalRuleCall_2_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__EnumAnnotationAttribute__NameAssignment_27888); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getEnumAnnotationAttributeAccess().getNameIDTerminalRuleCall_2_0()); 
 
             }
@@ -10603,20 +10603,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__ValuesAssignment_5"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3958:1: rule__EnumAnnotationAttribute__ValuesAssignment_5 : ( RULE_STRING ) ;
+    // InternalETMap.g:3958:1: rule__EnumAnnotationAttribute__ValuesAssignment_5 : ( RULE_STRING ) ;
     public final void rule__EnumAnnotationAttribute__ValuesAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3962:1: ( ( RULE_STRING ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3963:1: ( RULE_STRING )
+            // InternalETMap.g:3962:1: ( ( RULE_STRING ) )
+            // InternalETMap.g:3963:1: ( RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3963:1: ( RULE_STRING )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3964:1: RULE_STRING
+            // InternalETMap.g:3963:1: ( RULE_STRING )
+            // InternalETMap.g:3964:1: RULE_STRING
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getValuesSTRINGTerminalRuleCall_5_0()); 
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__EnumAnnotationAttribute__ValuesAssignment_57919); 
+            match(input,RULE_STRING,FOLLOW_2); 
              after(grammarAccess.getEnumAnnotationAttributeAccess().getValuesSTRINGTerminalRuleCall_5_0()); 
 
             }
@@ -10640,20 +10640,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__ValuesAssignment_6_1"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3973:1: rule__EnumAnnotationAttribute__ValuesAssignment_6_1 : ( RULE_STRING ) ;
+    // InternalETMap.g:3973:1: rule__EnumAnnotationAttribute__ValuesAssignment_6_1 : ( RULE_STRING ) ;
     public final void rule__EnumAnnotationAttribute__ValuesAssignment_6_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3977:1: ( ( RULE_STRING ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3978:1: ( RULE_STRING )
+            // InternalETMap.g:3977:1: ( ( RULE_STRING ) )
+            // InternalETMap.g:3978:1: ( RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3978:1: ( RULE_STRING )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3979:1: RULE_STRING
+            // InternalETMap.g:3978:1: ( RULE_STRING )
+            // InternalETMap.g:3979:1: RULE_STRING
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getValuesSTRINGTerminalRuleCall_6_1_0()); 
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__EnumAnnotationAttribute__ValuesAssignment_6_17950); 
+            match(input,RULE_STRING,FOLLOW_2); 
              after(grammarAccess.getEnumAnnotationAttributeAccess().getValuesSTRINGTerminalRuleCall_6_1_0()); 
 
             }
@@ -10677,20 +10677,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Import__ImportedNamespaceAssignment_1_0_0"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3988:1: rule__Import__ImportedNamespaceAssignment_1_0_0 : ( ruleImportedFQN ) ;
+    // InternalETMap.g:3988:1: rule__Import__ImportedNamespaceAssignment_1_0_0 : ( ruleImportedFQN ) ;
     public final void rule__Import__ImportedNamespaceAssignment_1_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3992:1: ( ( ruleImportedFQN ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3993:1: ( ruleImportedFQN )
+            // InternalETMap.g:3992:1: ( ( ruleImportedFQN ) )
+            // InternalETMap.g:3993:1: ( ruleImportedFQN )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3993:1: ( ruleImportedFQN )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:3994:1: ruleImportedFQN
+            // InternalETMap.g:3993:1: ( ruleImportedFQN )
+            // InternalETMap.g:3994:1: ruleImportedFQN
             {
              before(grammarAccess.getImportAccess().getImportedNamespaceImportedFQNParserRuleCall_1_0_0_0()); 
-            pushFollow(FOLLOW_ruleImportedFQN_in_rule__Import__ImportedNamespaceAssignment_1_0_07981);
+            pushFollow(FOLLOW_2);
             ruleImportedFQN();
 
             state._fsp--;
@@ -10718,20 +10718,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Import__ImportURIAssignment_2"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4003:1: rule__Import__ImportURIAssignment_2 : ( RULE_STRING ) ;
+    // InternalETMap.g:4003:1: rule__Import__ImportURIAssignment_2 : ( RULE_STRING ) ;
     public final void rule__Import__ImportURIAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4007:1: ( ( RULE_STRING ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4008:1: ( RULE_STRING )
+            // InternalETMap.g:4007:1: ( ( RULE_STRING ) )
+            // InternalETMap.g:4008:1: ( RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4008:1: ( RULE_STRING )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4009:1: RULE_STRING
+            // InternalETMap.g:4008:1: ( RULE_STRING )
+            // InternalETMap.g:4009:1: RULE_STRING
             {
              before(grammarAccess.getImportAccess().getImportURISTRINGTerminalRuleCall_2_0()); 
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__Import__ImportURIAssignment_28012); 
+            match(input,RULE_STRING,FOLLOW_2); 
              after(grammarAccess.getImportAccess().getImportURISTRINGTerminalRuleCall_2_0()); 
 
             }
@@ -10755,20 +10755,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Documentation__LinesAssignment_2"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4018:1: rule__Documentation__LinesAssignment_2 : ( RULE_STRING ) ;
+    // InternalETMap.g:4018:1: rule__Documentation__LinesAssignment_2 : ( RULE_STRING ) ;
     public final void rule__Documentation__LinesAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4022:1: ( ( RULE_STRING ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4023:1: ( RULE_STRING )
+            // InternalETMap.g:4022:1: ( ( RULE_STRING ) )
+            // InternalETMap.g:4023:1: ( RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4023:1: ( RULE_STRING )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4024:1: RULE_STRING
+            // InternalETMap.g:4023:1: ( RULE_STRING )
+            // InternalETMap.g:4024:1: RULE_STRING
             {
              before(grammarAccess.getDocumentationAccess().getLinesSTRINGTerminalRuleCall_2_0()); 
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__Documentation__LinesAssignment_28043); 
+            match(input,RULE_STRING,FOLLOW_2); 
              after(grammarAccess.getDocumentationAccess().getLinesSTRINGTerminalRuleCall_2_0()); 
 
             }
@@ -10792,24 +10792,24 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__BooleanLiteral__IsTrueAssignment_1_1"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4035:1: rule__BooleanLiteral__IsTrueAssignment_1_1 : ( ( 'true' ) ) ;
+    // InternalETMap.g:4035:1: rule__BooleanLiteral__IsTrueAssignment_1_1 : ( ( 'true' ) ) ;
     public final void rule__BooleanLiteral__IsTrueAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4039:1: ( ( ( 'true' ) ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4040:1: ( ( 'true' ) )
+            // InternalETMap.g:4039:1: ( ( ( 'true' ) ) )
+            // InternalETMap.g:4040:1: ( ( 'true' ) )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4040:1: ( ( 'true' ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4041:1: ( 'true' )
+            // InternalETMap.g:4040:1: ( ( 'true' ) )
+            // InternalETMap.g:4041:1: ( 'true' )
             {
              before(grammarAccess.getBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0()); 
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4042:1: ( 'true' )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4043:1: 'true'
+            // InternalETMap.g:4042:1: ( 'true' )
+            // InternalETMap.g:4043:1: 'true'
             {
              before(grammarAccess.getBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0()); 
-            match(input,41,FOLLOW_41_in_rule__BooleanLiteral__IsTrueAssignment_1_18081); 
+            match(input,41,FOLLOW_2); 
              after(grammarAccess.getBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0()); 
 
             }
@@ -10837,20 +10837,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RealLiteral__ValueAssignment_1"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4058:1: rule__RealLiteral__ValueAssignment_1 : ( ruleReal ) ;
+    // InternalETMap.g:4058:1: rule__RealLiteral__ValueAssignment_1 : ( ruleReal ) ;
     public final void rule__RealLiteral__ValueAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4062:1: ( ( ruleReal ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4063:1: ( ruleReal )
+            // InternalETMap.g:4062:1: ( ( ruleReal ) )
+            // InternalETMap.g:4063:1: ( ruleReal )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4063:1: ( ruleReal )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4064:1: ruleReal
+            // InternalETMap.g:4063:1: ( ruleReal )
+            // InternalETMap.g:4064:1: ruleReal
             {
              before(grammarAccess.getRealLiteralAccess().getValueRealParserRuleCall_1_0()); 
-            pushFollow(FOLLOW_ruleReal_in_rule__RealLiteral__ValueAssignment_18120);
+            pushFollow(FOLLOW_2);
             ruleReal();
 
             state._fsp--;
@@ -10878,20 +10878,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__IntLiteral__ValueAssignment_1"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4073:1: rule__IntLiteral__ValueAssignment_1 : ( ruleInteger ) ;
+    // InternalETMap.g:4073:1: rule__IntLiteral__ValueAssignment_1 : ( ruleInteger ) ;
     public final void rule__IntLiteral__ValueAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4077:1: ( ( ruleInteger ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4078:1: ( ruleInteger )
+            // InternalETMap.g:4077:1: ( ( ruleInteger ) )
+            // InternalETMap.g:4078:1: ( ruleInteger )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4078:1: ( ruleInteger )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4079:1: ruleInteger
+            // InternalETMap.g:4078:1: ( ruleInteger )
+            // InternalETMap.g:4079:1: ruleInteger
             {
              before(grammarAccess.getIntLiteralAccess().getValueIntegerParserRuleCall_1_0()); 
-            pushFollow(FOLLOW_ruleInteger_in_rule__IntLiteral__ValueAssignment_18151);
+            pushFollow(FOLLOW_2);
             ruleInteger();
 
             state._fsp--;
@@ -10919,20 +10919,20 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StringLiteral__ValueAssignment_1"
-    // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4088:1: rule__StringLiteral__ValueAssignment_1 : ( RULE_STRING ) ;
+    // InternalETMap.g:4088:1: rule__StringLiteral__ValueAssignment_1 : ( RULE_STRING ) ;
     public final void rule__StringLiteral__ValueAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4092:1: ( ( RULE_STRING ) )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4093:1: ( RULE_STRING )
+            // InternalETMap.g:4092:1: ( ( RULE_STRING ) )
+            // InternalETMap.g:4093:1: ( RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4093:1: ( RULE_STRING )
-            // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4094:1: RULE_STRING
+            // InternalETMap.g:4093:1: ( RULE_STRING )
+            // InternalETMap.g:4094:1: RULE_STRING
             {
              before(grammarAccess.getStringLiteralAccess().getValueSTRINGTerminalRuleCall_1_0()); 
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__StringLiteral__ValueAssignment_18182); 
+            match(input,RULE_STRING,FOLLOW_2); 
              after(grammarAccess.getStringLiteralAccess().getValueSTRINGTerminalRuleCall_1_0()); 
 
             }
@@ -10959,345 +10959,38 @@ public class InternalETMapParser extends AbstractInternalContentAssistParser {
 
  
 
-    public static final BitSet FOLLOW_ruleMappingModel_in_entryRuleMappingModel61 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleMappingModel68 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MappingModel__Group__0_in_ruleMappingModel94 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMapping_in_entryRuleMapping121 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleMapping128 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Mapping__Group__0_in_ruleMapping154 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSubSystemMapping_in_entryRuleSubSystemMapping181 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSubSystemMapping188 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemMapping__Group__0_in_ruleSubSystemMapping214 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleThreadMapping_in_entryRuleThreadMapping241 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleThreadMapping248 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ThreadMapping__Group__0_in_ruleThreadMapping274 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleKeyValue_in_entryRuleKeyValue303 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleKeyValue310 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeyValue__Group__0_in_ruleKeyValue336 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAnnotationTargetType_in_entryRuleAnnotationTargetType365 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAnnotationTargetType372 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleAnnotationTargetType398 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAnnotationAttribute_in_entryRuleAnnotationAttribute424 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAnnotationAttribute431 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AnnotationAttribute__Alternatives_in_ruleAnnotationAttribute457 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleAnnotationAttribute_in_entryRuleSimpleAnnotationAttribute484 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSimpleAnnotationAttribute491 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__0_in_ruleSimpleAnnotationAttribute517 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleEnumAnnotationAttribute_in_entryRuleEnumAnnotationAttribute544 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleEnumAnnotationAttribute551 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__0_in_ruleEnumAnnotationAttribute577 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleImport_in_entryRuleImport604 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleImport611 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__Group__0_in_ruleImport637 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleImportedFQN_in_entryRuleImportedFQN664 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleImportedFQN671 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ImportedFQN__Group__0_in_ruleImportedFQN697 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_entryRuleDocumentation724 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDocumentation731 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Documentation__Group__0_in_ruleDocumentation757 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLiteral_in_entryRuleLiteral788 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleLiteral795 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Literal__Alternatives_in_ruleLiteral821 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleBooleanLiteral_in_entryRuleBooleanLiteral848 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleBooleanLiteral855 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__BooleanLiteral__Group__0_in_ruleBooleanLiteral881 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNumberLiteral_in_entryRuleNumberLiteral908 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleNumberLiteral915 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NumberLiteral__Alternatives_in_ruleNumberLiteral941 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRealLiteral_in_entryRuleRealLiteral968 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRealLiteral975 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RealLiteral__Group__0_in_ruleRealLiteral1001 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntLiteral_in_entryRuleIntLiteral1028 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIntLiteral1035 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IntLiteral__Group__0_in_ruleIntLiteral1061 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStringLiteral_in_entryRuleStringLiteral1088 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleStringLiteral1095 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StringLiteral__Group__0_in_ruleStringLiteral1121 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInteger_in_entryRuleInteger1148 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleInteger1155 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Integer__Alternatives_in_ruleInteger1181 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleReal_in_entryRuleReal1208 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleReal1215 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Real__Alternatives_in_ruleReal1241 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDecimal_in_entryRuleDecimal1273 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDecimal1280 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Decimal__Group__0_in_ruleDecimal1310 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDecimalExp_in_entryRuleDecimalExp1342 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDecimalExp1349 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__0_in_ruleDecimalExp1379 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_entryRuleFQN1406 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleFQN1413 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FQN__Group__0_in_ruleFQN1439 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LiteralType__Alternatives_in_ruleLiteralType1476 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleAnnotationAttribute_in_rule__AnnotationAttribute__Alternatives1512 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleEnumAnnotationAttribute_in_rule__AnnotationAttribute__Alternatives1529 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__OptionalAssignment_0_0_in_rule__SimpleAnnotationAttribute__Alternatives_01561 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_12_in_rule__SimpleAnnotationAttribute__Alternatives_01580 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__OptionalAssignment_0_0_in_rule__EnumAnnotationAttribute__Alternatives_01614 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_12_in_rule__EnumAnnotationAttribute__Alternatives_01633 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__Group_1_0__0_in_rule__Import__Alternatives_11667 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_13_in_rule__Import__Alternatives_11686 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleBooleanLiteral_in_rule__Literal__Alternatives1721 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNumberLiteral_in_rule__Literal__Alternatives1738 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStringLiteral_in_rule__Literal__Alternatives1755 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_14_in_rule__BooleanLiteral__Alternatives_11788 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__BooleanLiteral__IsTrueAssignment_1_1_in_rule__BooleanLiteral__Alternatives_11807 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntLiteral_in_rule__NumberLiteral__Alternatives1840 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRealLiteral_in_rule__NumberLiteral__Alternatives1857 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Integer__Group_0__0_in_rule__Integer__Alternatives1889 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_HEX_in_rule__Integer__Alternatives1907 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_15_in_rule__Integer__Alternatives_0_01940 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_16_in_rule__Integer__Alternatives_0_01960 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDecimal_in_rule__Real__Alternatives1994 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDecimalExp_in_rule__Real__Alternatives2011 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_15_in_rule__Decimal__Alternatives_02044 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_16_in_rule__Decimal__Alternatives_02064 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_15_in_rule__DecimalExp__Alternatives_02099 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_16_in_rule__DecimalExp__Alternatives_02119 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_17_in_rule__DecimalExp__Alternatives_42154 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_18_in_rule__DecimalExp__Alternatives_42174 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_15_in_rule__DecimalExp__Alternatives_52209 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_16_in_rule__DecimalExp__Alternatives_52229 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_19_in_rule__LiteralType__Alternatives2264 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_20_in_rule__LiteralType__Alternatives2285 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_21_in_rule__LiteralType__Alternatives2306 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_22_in_rule__LiteralType__Alternatives2327 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MappingModel__Group__0__Impl_in_rule__MappingModel__Group__02360 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__MappingModel__Group__1_in_rule__MappingModel__Group__02363 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_23_in_rule__MappingModel__Group__0__Impl2391 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MappingModel__Group__1__Impl_in_rule__MappingModel__Group__12422 = new BitSet(new long[]{0x0000000001000000L});
-    public static final BitSet FOLLOW_rule__MappingModel__Group__2_in_rule__MappingModel__Group__12425 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MappingModel__NameAssignment_1_in_rule__MappingModel__Group__1__Impl2452 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MappingModel__Group__2__Impl_in_rule__MappingModel__Group__22482 = new BitSet(new long[]{0x0000000406000000L});
-    public static final BitSet FOLLOW_rule__MappingModel__Group__3_in_rule__MappingModel__Group__22485 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_24_in_rule__MappingModel__Group__2__Impl2513 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MappingModel__Group__3__Impl_in_rule__MappingModel__Group__32544 = new BitSet(new long[]{0x0000000406000000L});
-    public static final BitSet FOLLOW_rule__MappingModel__Group__4_in_rule__MappingModel__Group__32547 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MappingModel__ImportsAssignment_3_in_rule__MappingModel__Group__3__Impl2574 = new BitSet(new long[]{0x0000000400000002L});
-    public static final BitSet FOLLOW_rule__MappingModel__Group__4__Impl_in_rule__MappingModel__Group__42605 = new BitSet(new long[]{0x0000000406000000L});
-    public static final BitSet FOLLOW_rule__MappingModel__Group__5_in_rule__MappingModel__Group__42608 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MappingModel__MappingsAssignment_4_in_rule__MappingModel__Group__4__Impl2635 = new BitSet(new long[]{0x0000000004000002L});
-    public static final BitSet FOLLOW_rule__MappingModel__Group__5__Impl_in_rule__MappingModel__Group__52666 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_25_in_rule__MappingModel__Group__5__Impl2694 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Mapping__Group__0__Impl_in_rule__Mapping__Group__02737 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__Mapping__Group__1_in_rule__Mapping__Group__02740 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_26_in_rule__Mapping__Group__0__Impl2768 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Mapping__Group__1__Impl_in_rule__Mapping__Group__12799 = new BitSet(new long[]{0x0000000008000000L});
-    public static final BitSet FOLLOW_rule__Mapping__Group__2_in_rule__Mapping__Group__12802 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Mapping__LogicalSysAssignment_1_in_rule__Mapping__Group__1__Impl2829 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Mapping__Group__2__Impl_in_rule__Mapping__Group__22859 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__Mapping__Group__3_in_rule__Mapping__Group__22862 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_rule__Mapping__Group__2__Impl2890 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Mapping__Group__3__Impl_in_rule__Mapping__Group__32921 = new BitSet(new long[]{0x0000000001000000L});
-    public static final BitSet FOLLOW_rule__Mapping__Group__4_in_rule__Mapping__Group__32924 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Mapping__PhysicalSysAssignment_3_in_rule__Mapping__Group__3__Impl2951 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Mapping__Group__4__Impl_in_rule__Mapping__Group__42981 = new BitSet(new long[]{0x0000000012000000L});
-    public static final BitSet FOLLOW_rule__Mapping__Group__5_in_rule__Mapping__Group__42984 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_24_in_rule__Mapping__Group__4__Impl3012 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Mapping__Group__5__Impl_in_rule__Mapping__Group__53043 = new BitSet(new long[]{0x0000000012000000L});
-    public static final BitSet FOLLOW_rule__Mapping__Group__6_in_rule__Mapping__Group__53046 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Mapping__SubsysMappingsAssignment_5_in_rule__Mapping__Group__5__Impl3073 = new BitSet(new long[]{0x0000000010000002L});
-    public static final BitSet FOLLOW_rule__Mapping__Group__6__Impl_in_rule__Mapping__Group__63104 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_25_in_rule__Mapping__Group__6__Impl3132 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemMapping__Group__0__Impl_in_rule__SubSystemMapping__Group__03177 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__SubSystemMapping__Group__1_in_rule__SubSystemMapping__Group__03180 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_rule__SubSystemMapping__Group__0__Impl3208 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemMapping__Group__1__Impl_in_rule__SubSystemMapping__Group__13239 = new BitSet(new long[]{0x0000000008000000L});
-    public static final BitSet FOLLOW_rule__SubSystemMapping__Group__2_in_rule__SubSystemMapping__Group__13242 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemMapping__LogicalSubSysAssignment_1_in_rule__SubSystemMapping__Group__1__Impl3269 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemMapping__Group__2__Impl_in_rule__SubSystemMapping__Group__23299 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__SubSystemMapping__Group__3_in_rule__SubSystemMapping__Group__23302 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_rule__SubSystemMapping__Group__2__Impl3330 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemMapping__Group__3__Impl_in_rule__SubSystemMapping__Group__33361 = new BitSet(new long[]{0x0000000001000000L});
-    public static final BitSet FOLLOW_rule__SubSystemMapping__Group__4_in_rule__SubSystemMapping__Group__33364 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemMapping__NodeAssignment_3_in_rule__SubSystemMapping__Group__3__Impl3391 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemMapping__Group__4__Impl_in_rule__SubSystemMapping__Group__43421 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemMapping__Group_4__0_in_rule__SubSystemMapping__Group__4__Impl3448 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemMapping__Group_4__0__Impl_in_rule__SubSystemMapping__Group_4__03489 = new BitSet(new long[]{0x0000000022000000L});
-    public static final BitSet FOLLOW_rule__SubSystemMapping__Group_4__1_in_rule__SubSystemMapping__Group_4__03492 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_24_in_rule__SubSystemMapping__Group_4__0__Impl3520 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemMapping__Group_4__1__Impl_in_rule__SubSystemMapping__Group_4__13551 = new BitSet(new long[]{0x0000000022000000L});
-    public static final BitSet FOLLOW_rule__SubSystemMapping__Group_4__2_in_rule__SubSystemMapping__Group_4__13554 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemMapping__ThreadMappingsAssignment_4_1_in_rule__SubSystemMapping__Group_4__1__Impl3581 = new BitSet(new long[]{0x0000000020000002L});
-    public static final BitSet FOLLOW_rule__SubSystemMapping__Group_4__2__Impl_in_rule__SubSystemMapping__Group_4__23612 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_25_in_rule__SubSystemMapping__Group_4__2__Impl3640 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ThreadMapping__Group__0__Impl_in_rule__ThreadMapping__Group__03677 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__ThreadMapping__Group__1_in_rule__ThreadMapping__Group__03680 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_rule__ThreadMapping__Group__0__Impl3708 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ThreadMapping__Group__1__Impl_in_rule__ThreadMapping__Group__13739 = new BitSet(new long[]{0x0000000008000000L});
-    public static final BitSet FOLLOW_rule__ThreadMapping__Group__2_in_rule__ThreadMapping__Group__13742 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ThreadMapping__LogicalThreadAssignment_1_in_rule__ThreadMapping__Group__1__Impl3769 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ThreadMapping__Group__2__Impl_in_rule__ThreadMapping__Group__23799 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__ThreadMapping__Group__3_in_rule__ThreadMapping__Group__23802 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_rule__ThreadMapping__Group__2__Impl3830 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ThreadMapping__Group__3__Impl_in_rule__ThreadMapping__Group__33861 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ThreadMapping__PhysicalThreadAssignment_3_in_rule__ThreadMapping__Group__3__Impl3888 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeyValue__Group__0__Impl_in_rule__KeyValue__Group__03929 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_rule__KeyValue__Group__1_in_rule__KeyValue__Group__03932 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeyValue__KeyAssignment_0_in_rule__KeyValue__Group__0__Impl3959 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeyValue__Group__1__Impl_in_rule__KeyValue__Group__13989 = new BitSet(new long[]{0x000002000001C0E0L});
-    public static final BitSet FOLLOW_rule__KeyValue__Group__2_in_rule__KeyValue__Group__13992 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_30_in_rule__KeyValue__Group__1__Impl4020 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeyValue__Group__2__Impl_in_rule__KeyValue__Group__24051 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeyValue__ValueAssignment_2_in_rule__KeyValue__Group__2__Impl4078 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__0__Impl_in_rule__SimpleAnnotationAttribute__Group__04117 = new BitSet(new long[]{0x0000000080000000L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__1_in_rule__SimpleAnnotationAttribute__Group__04120 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Alternatives_0_in_rule__SimpleAnnotationAttribute__Group__0__Impl4147 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__1__Impl_in_rule__SimpleAnnotationAttribute__Group__14177 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__2_in_rule__SimpleAnnotationAttribute__Group__14180 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_31_in_rule__SimpleAnnotationAttribute__Group__1__Impl4208 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__2__Impl_in_rule__SimpleAnnotationAttribute__Group__24239 = new BitSet(new long[]{0x0000000100000000L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__3_in_rule__SimpleAnnotationAttribute__Group__24242 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__NameAssignment_2_in_rule__SimpleAnnotationAttribute__Group__2__Impl4269 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__3__Impl_in_rule__SimpleAnnotationAttribute__Group__34299 = new BitSet(new long[]{0x0000000000780000L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__4_in_rule__SimpleAnnotationAttribute__Group__34302 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_rule__SimpleAnnotationAttribute__Group__3__Impl4330 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__4__Impl_in_rule__SimpleAnnotationAttribute__Group__44361 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__TypeAssignment_4_in_rule__SimpleAnnotationAttribute__Group__4__Impl4388 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__0__Impl_in_rule__EnumAnnotationAttribute__Group__04428 = new BitSet(new long[]{0x0000000080000000L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__1_in_rule__EnumAnnotationAttribute__Group__04431 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Alternatives_0_in_rule__EnumAnnotationAttribute__Group__0__Impl4458 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__1__Impl_in_rule__EnumAnnotationAttribute__Group__14488 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__2_in_rule__EnumAnnotationAttribute__Group__14491 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_31_in_rule__EnumAnnotationAttribute__Group__1__Impl4519 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__2__Impl_in_rule__EnumAnnotationAttribute__Group__24550 = new BitSet(new long[]{0x0000000100000000L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__3_in_rule__EnumAnnotationAttribute__Group__24553 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__NameAssignment_2_in_rule__EnumAnnotationAttribute__Group__2__Impl4580 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__3__Impl_in_rule__EnumAnnotationAttribute__Group__34610 = new BitSet(new long[]{0x0000000001000000L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__4_in_rule__EnumAnnotationAttribute__Group__34613 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_rule__EnumAnnotationAttribute__Group__3__Impl4641 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__4__Impl_in_rule__EnumAnnotationAttribute__Group__44672 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__5_in_rule__EnumAnnotationAttribute__Group__44675 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_24_in_rule__EnumAnnotationAttribute__Group__4__Impl4703 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__5__Impl_in_rule__EnumAnnotationAttribute__Group__54734 = new BitSet(new long[]{0x0000000202000000L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__6_in_rule__EnumAnnotationAttribute__Group__54737 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__ValuesAssignment_5_in_rule__EnumAnnotationAttribute__Group__5__Impl4764 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__6__Impl_in_rule__EnumAnnotationAttribute__Group__64794 = new BitSet(new long[]{0x0000000202000000L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__7_in_rule__EnumAnnotationAttribute__Group__64797 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group_6__0_in_rule__EnumAnnotationAttribute__Group__6__Impl4824 = new BitSet(new long[]{0x0000000200000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__7__Impl_in_rule__EnumAnnotationAttribute__Group__74855 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_25_in_rule__EnumAnnotationAttribute__Group__7__Impl4883 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group_6__0__Impl_in_rule__EnumAnnotationAttribute__Group_6__04930 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group_6__1_in_rule__EnumAnnotationAttribute__Group_6__04933 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_rule__EnumAnnotationAttribute__Group_6__0__Impl4961 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group_6__1__Impl_in_rule__EnumAnnotationAttribute__Group_6__14992 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__ValuesAssignment_6_1_in_rule__EnumAnnotationAttribute__Group_6__1__Impl5019 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__Group__0__Impl_in_rule__Import__Group__05053 = new BitSet(new long[]{0x0000000000002010L});
-    public static final BitSet FOLLOW_rule__Import__Group__1_in_rule__Import__Group__05056 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_34_in_rule__Import__Group__0__Impl5084 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__Group__1__Impl_in_rule__Import__Group__15115 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__Import__Group__2_in_rule__Import__Group__15118 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__Alternatives_1_in_rule__Import__Group__1__Impl5145 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__Group__2__Impl_in_rule__Import__Group__25175 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__ImportURIAssignment_2_in_rule__Import__Group__2__Impl5202 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__Group_1_0__0__Impl_in_rule__Import__Group_1_0__05238 = new BitSet(new long[]{0x0000000800000000L});
-    public static final BitSet FOLLOW_rule__Import__Group_1_0__1_in_rule__Import__Group_1_0__05241 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__ImportedNamespaceAssignment_1_0_0_in_rule__Import__Group_1_0__0__Impl5268 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__Group_1_0__1__Impl_in_rule__Import__Group_1_0__15298 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_35_in_rule__Import__Group_1_0__1__Impl5326 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ImportedFQN__Group__0__Impl_in_rule__ImportedFQN__Group__05361 = new BitSet(new long[]{0x0000001000000000L});
-    public static final BitSet FOLLOW_rule__ImportedFQN__Group__1_in_rule__ImportedFQN__Group__05364 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_rule__ImportedFQN__Group__0__Impl5391 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ImportedFQN__Group__1__Impl_in_rule__ImportedFQN__Group__15420 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_36_in_rule__ImportedFQN__Group__1__Impl5449 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Documentation__Group__0__Impl_in_rule__Documentation__Group__05486 = new BitSet(new long[]{0x0000002000000000L});
-    public static final BitSet FOLLOW_rule__Documentation__Group__1_in_rule__Documentation__Group__05489 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Documentation__Group__1__Impl_in_rule__Documentation__Group__15547 = new BitSet(new long[]{0x0000004000000080L});
-    public static final BitSet FOLLOW_rule__Documentation__Group__2_in_rule__Documentation__Group__15550 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_37_in_rule__Documentation__Group__1__Impl5578 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Documentation__Group__2__Impl_in_rule__Documentation__Group__25609 = new BitSet(new long[]{0x0000004000000080L});
-    public static final BitSet FOLLOW_rule__Documentation__Group__3_in_rule__Documentation__Group__25612 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Documentation__LinesAssignment_2_in_rule__Documentation__Group__2__Impl5639 = new BitSet(new long[]{0x0000000000000082L});
-    public static final BitSet FOLLOW_rule__Documentation__Group__3__Impl_in_rule__Documentation__Group__35670 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_38_in_rule__Documentation__Group__3__Impl5698 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__BooleanLiteral__Group__0__Impl_in_rule__BooleanLiteral__Group__05743 = new BitSet(new long[]{0x0000020000004000L});
-    public static final BitSet FOLLOW_rule__BooleanLiteral__Group__1_in_rule__BooleanLiteral__Group__05746 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__BooleanLiteral__Group__1__Impl_in_rule__BooleanLiteral__Group__15804 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__BooleanLiteral__Alternatives_1_in_rule__BooleanLiteral__Group__1__Impl5831 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RealLiteral__Group__0__Impl_in_rule__RealLiteral__Group__05865 = new BitSet(new long[]{0x0000000000018060L});
-    public static final BitSet FOLLOW_rule__RealLiteral__Group__1_in_rule__RealLiteral__Group__05868 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RealLiteral__Group__1__Impl_in_rule__RealLiteral__Group__15926 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RealLiteral__ValueAssignment_1_in_rule__RealLiteral__Group__1__Impl5953 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IntLiteral__Group__0__Impl_in_rule__IntLiteral__Group__05987 = new BitSet(new long[]{0x0000000000018060L});
-    public static final BitSet FOLLOW_rule__IntLiteral__Group__1_in_rule__IntLiteral__Group__05990 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IntLiteral__Group__1__Impl_in_rule__IntLiteral__Group__16048 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IntLiteral__ValueAssignment_1_in_rule__IntLiteral__Group__1__Impl6075 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StringLiteral__Group__0__Impl_in_rule__StringLiteral__Group__06109 = new BitSet(new long[]{0x000002000001C0E0L});
-    public static final BitSet FOLLOW_rule__StringLiteral__Group__1_in_rule__StringLiteral__Group__06112 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StringLiteral__Group__1__Impl_in_rule__StringLiteral__Group__16170 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StringLiteral__ValueAssignment_1_in_rule__StringLiteral__Group__1__Impl6197 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Integer__Group_0__0__Impl_in_rule__Integer__Group_0__06231 = new BitSet(new long[]{0x0000000000018040L});
-    public static final BitSet FOLLOW_rule__Integer__Group_0__1_in_rule__Integer__Group_0__06234 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Integer__Alternatives_0_0_in_rule__Integer__Group_0__0__Impl6261 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Integer__Group_0__1__Impl_in_rule__Integer__Group_0__16292 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__Integer__Group_0__1__Impl6319 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Decimal__Group__0__Impl_in_rule__Decimal__Group__06352 = new BitSet(new long[]{0x0000000000018040L});
-    public static final BitSet FOLLOW_rule__Decimal__Group__1_in_rule__Decimal__Group__06355 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Decimal__Alternatives_0_in_rule__Decimal__Group__0__Impl6382 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Decimal__Group__1__Impl_in_rule__Decimal__Group__16413 = new BitSet(new long[]{0x0000008000000000L});
-    public static final BitSet FOLLOW_rule__Decimal__Group__2_in_rule__Decimal__Group__16416 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__Decimal__Group__1__Impl6443 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Decimal__Group__2__Impl_in_rule__Decimal__Group__26472 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__Decimal__Group__3_in_rule__Decimal__Group__26475 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_39_in_rule__Decimal__Group__2__Impl6503 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Decimal__Group__3__Impl_in_rule__Decimal__Group__36534 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__Decimal__Group__3__Impl6561 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__0__Impl_in_rule__DecimalExp__Group__06598 = new BitSet(new long[]{0x0000000000018060L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__1_in_rule__DecimalExp__Group__06601 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Alternatives_0_in_rule__DecimalExp__Group__0__Impl6628 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__1__Impl_in_rule__DecimalExp__Group__16659 = new BitSet(new long[]{0x0000008000000000L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__2_in_rule__DecimalExp__Group__16662 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__DecimalExp__Group__1__Impl6689 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__2__Impl_in_rule__DecimalExp__Group__26718 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__3_in_rule__DecimalExp__Group__26721 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_39_in_rule__DecimalExp__Group__2__Impl6749 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__3__Impl_in_rule__DecimalExp__Group__36780 = new BitSet(new long[]{0x0000000000060000L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__4_in_rule__DecimalExp__Group__36783 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__DecimalExp__Group__3__Impl6810 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__4__Impl_in_rule__DecimalExp__Group__46839 = new BitSet(new long[]{0x0000000000018040L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__5_in_rule__DecimalExp__Group__46842 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Alternatives_4_in_rule__DecimalExp__Group__4__Impl6869 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__5__Impl_in_rule__DecimalExp__Group__56899 = new BitSet(new long[]{0x0000000000018040L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__6_in_rule__DecimalExp__Group__56902 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Alternatives_5_in_rule__DecimalExp__Group__5__Impl6929 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__6__Impl_in_rule__DecimalExp__Group__66960 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__DecimalExp__Group__6__Impl6987 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FQN__Group__0__Impl_in_rule__FQN__Group__07030 = new BitSet(new long[]{0x0000008000000000L});
-    public static final BitSet FOLLOW_rule__FQN__Group__1_in_rule__FQN__Group__07033 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__FQN__Group__0__Impl7060 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FQN__Group__1__Impl_in_rule__FQN__Group__17089 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FQN__Group_1__0_in_rule__FQN__Group__1__Impl7116 = new BitSet(new long[]{0x0000008000000002L});
-    public static final BitSet FOLLOW_rule__FQN__Group_1__0__Impl_in_rule__FQN__Group_1__07151 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__FQN__Group_1__1_in_rule__FQN__Group_1__07154 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_39_in_rule__FQN__Group_1__0__Impl7182 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FQN__Group_1__1__Impl_in_rule__FQN__Group_1__17213 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__FQN__Group_1__1__Impl7240 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_rule__MappingModel__NameAssignment_17278 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleImport_in_rule__MappingModel__ImportsAssignment_37309 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMapping_in_rule__MappingModel__MappingsAssignment_47340 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_rule__Mapping__LogicalSysAssignment_17375 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_rule__Mapping__PhysicalSysAssignment_37414 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSubSystemMapping_in_rule__Mapping__SubsysMappingsAssignment_57449 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__SubSystemMapping__LogicalSubSysAssignment_17484 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__SubSystemMapping__NodeAssignment_37523 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleThreadMapping_in_rule__SubSystemMapping__ThreadMappingsAssignment_4_17558 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__ThreadMapping__LogicalThreadAssignment_17593 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__ThreadMapping__PhysicalThreadAssignment_37632 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__KeyValue__KeyAssignment_07670 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLiteral_in_rule__KeyValue__ValueAssignment_27701 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_40_in_rule__SimpleAnnotationAttribute__OptionalAssignment_0_07743 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__SimpleAnnotationAttribute__NameAssignment_27782 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLiteralType_in_rule__SimpleAnnotationAttribute__TypeAssignment_47813 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_40_in_rule__EnumAnnotationAttribute__OptionalAssignment_0_07849 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__EnumAnnotationAttribute__NameAssignment_27888 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__EnumAnnotationAttribute__ValuesAssignment_57919 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__EnumAnnotationAttribute__ValuesAssignment_6_17950 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleImportedFQN_in_rule__Import__ImportedNamespaceAssignment_1_0_07981 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__Import__ImportURIAssignment_28012 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__Documentation__LinesAssignment_28043 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_rule__BooleanLiteral__IsTrueAssignment_1_18081 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleReal_in_rule__RealLiteral__ValueAssignment_18120 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInteger_in_rule__IntLiteral__ValueAssignment_18151 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__StringLiteral__ValueAssignment_18182 = 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[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x0000000001000000L});
+    public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x0000000406000000L});
+    public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x0000000400000002L});
+    public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x0000000004000002L});
+    public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x0000000008000000L});
+    public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x0000000012000000L});
+    public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0000000010000002L});
+    public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0000000022000000L});
+    public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0000000020000002L});
+    public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000000040000000L});
+    public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x000002000001C0E0L});
+    public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0000000080000000L});
+    public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x0000000100000000L});
+    public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0000000000780000L});
+    public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0000000000000080L});
+    public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0000000202000000L});
+    public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x0000000200000002L});
+    public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x0000000000002010L});
+    public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0000000800000000L});
+    public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x0000001000000000L});
+    public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x0000002000000000L});
+    public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x0000004000000080L});
+    public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x0000000000000082L});
+    public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x0000020000004000L});
+    public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x0000000000018060L});
+    public static final BitSet FOLLOW_29 = new BitSet(new long[]{0x0000000000018040L});
+    public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x0000008000000000L});
+    public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x0000000000000040L});
+    public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x0000000000060000L});
+    public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x0000008000000002L});
 
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/AbstractETMapRuntimeModule.java b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/AbstractETMapRuntimeModule.java
index 020bbf067..a8809359c 100644
--- a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/AbstractETMapRuntimeModule.java
+++ b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/AbstractETMapRuntimeModule.java
@@ -6,7 +6,6 @@ package org.eclipse.etrice.core.etmap;
 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.etmap.ETMapRuntimeModule}
  */
- @SuppressWarnings("all")
-public abstract class AbstractETMapRuntimeModule extends DefaultRuntimeModule {
+@SuppressWarnings("all")
+public abstract class AbstractETMapRuntimeModule extends org.eclipse.xtext.service.DefaultRuntimeModule {
 
 	protected Properties properties = null;
 
diff --git a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/ETMap.genmodel b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/ETMap.genmodel
index dc00448a6..5f1e1e102 100644
--- a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/ETMap.genmodel
+++ b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/ETMap.genmodel
@@ -3,8 +3,8 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.etrice.core.etmap/src-gen" editDirectory="/org.eclipse.etrice.core.etmap.edit/src"
     editorDirectory="/org.eclipse.etrice.core.etmap.editor/src" modelPluginID="org.eclipse.etrice.core.etmap"
     forceOverwrite="true" modelName="ETMap" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.etrice.core.etmap.edit"
-    editorPluginID="org.eclipse.etrice.core.etmap.editor" runtimeVersion="2.10" usedGenPackages="platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.genmodel#//base platform:/resource/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/ETPhys.genmodel#//eTPhys platform:/resource/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.genmodel#//room">
+    complianceLevel="6.0" copyrightFields="false" editPluginID="org.eclipse.etrice.core.etmap.edit"
+    editorPluginID="org.eclipse.etrice.core.etmap.editor" runtimeVersion="2.12" usedGenPackages="platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.genmodel#//base platform:/resource/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/ETPhys.genmodel#//eTPhys platform:/resource/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.genmodel#//room">
   <genPackages prefix="ETMap" basePackage="org.eclipse.etrice.core.etmap" disposableProviderFactory="true"
       ecorePackage="ETMap.ecore#/">
     <genClasses ecoreClass="ETMap.ecore#//MappingModel">
diff --git a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/ETMapStandaloneSetupGenerated.java b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/ETMapStandaloneSetupGenerated.java
index 8002b4d6c..bc3f903a9 100644
--- a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/ETMapStandaloneSetupGenerated.java
+++ b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/ETMapStandaloneSetupGenerated.java
@@ -1,11 +1,11 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.etmap;
 
 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 ETMapStandaloneSetupGenerated implements ISetup {
 
+	@Override
 	public Injector createInjectorAndDoEMFRegistration() {
 		org.eclipse.etrice.core.common.BaseStandaloneSetup.doSetup();
 
diff --git a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/eTMap/Mapping.java b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/eTMap/Mapping.java
index 4008e003f..d46418d3e 100644
--- a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/eTMap/Mapping.java
+++ b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/eTMap/Mapping.java
@@ -23,12 +23,12 @@ import org.eclipse.etrice.core.room.LogicalSystem;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.etmap.eTMap.Mapping#getLogicalSys <em>Logical Sys</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.etmap.eTMap.Mapping#getPhysicalSys <em>Physical Sys</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.etmap.eTMap.Mapping#getSubsysMappings <em>Subsys Mappings</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.etmap.eTMap.ETMapPackage#getMapping()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/eTMap/MappingModel.java b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/eTMap/MappingModel.java
index 0a690e656..010ad67c2 100644
--- a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/eTMap/MappingModel.java
+++ b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/eTMap/MappingModel.java
@@ -20,12 +20,12 @@ import org.eclipse.etrice.core.common.base.Import;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.etmap.eTMap.MappingModel#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.etmap.eTMap.MappingModel#getImports <em>Imports</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.etmap.eTMap.MappingModel#getMappings <em>Mappings</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.etmap.eTMap.ETMapPackage#getMappingModel()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/eTMap/SubSystemMapping.java b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/eTMap/SubSystemMapping.java
index a12a5624e..e9b5a1554 100644
--- a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/eTMap/SubSystemMapping.java
+++ b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/eTMap/SubSystemMapping.java
@@ -23,12 +23,12 @@ import org.eclipse.etrice.core.room.SubSystemRef;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.etmap.eTMap.SubSystemMapping#getLogicalSubSys <em>Logical Sub Sys</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.etmap.eTMap.SubSystemMapping#getNode <em>Node</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.etmap.eTMap.SubSystemMapping#getThreadMappings <em>Thread Mappings</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.etmap.eTMap.ETMapPackage#getSubSystemMapping()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/eTMap/ThreadMapping.java b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/eTMap/ThreadMapping.java
index 1243f0b97..bbd101ea5 100644
--- a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/eTMap/ThreadMapping.java
+++ b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/eTMap/ThreadMapping.java
@@ -21,11 +21,11 @@ import org.eclipse.etrice.core.room.LogicalThread;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.etmap.eTMap.ThreadMapping#getLogicalThread <em>Logical Thread</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.etmap.eTMap.ThreadMapping#getPhysicalThread <em>Physical Thread</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.etmap.eTMap.ETMapPackage#getThreadMapping()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/eTMap/impl/MappingImpl.java b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/eTMap/impl/MappingImpl.java
index 03e85247f..5146b7581 100644
--- a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/eTMap/impl/MappingImpl.java
+++ b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/eTMap/impl/MappingImpl.java
@@ -32,12 +32,12 @@ import org.eclipse.etrice.core.room.LogicalSystem;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.etmap.eTMap.impl.MappingImpl#getLogicalSys <em>Logical Sys</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.etmap.eTMap.impl.MappingImpl#getPhysicalSys <em>Physical Sys</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.etmap.eTMap.impl.MappingImpl#getSubsysMappings <em>Subsys Mappings</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/eTMap/impl/MappingModelImpl.java b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/eTMap/impl/MappingModelImpl.java
index a49a15c8a..4f5276589 100644
--- a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/eTMap/impl/MappingModelImpl.java
+++ b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/eTMap/impl/MappingModelImpl.java
@@ -30,12 +30,12 @@ import org.eclipse.etrice.core.etmap.eTMap.MappingModel;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.etmap.eTMap.impl.MappingModelImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.etmap.eTMap.impl.MappingModelImpl#getImports <em>Imports</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.etmap.eTMap.impl.MappingModelImpl#getMappings <em>Mappings</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/eTMap/impl/SubSystemMappingImpl.java b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/eTMap/impl/SubSystemMappingImpl.java
index 1a526275c..27b15ed97 100644
--- a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/eTMap/impl/SubSystemMappingImpl.java
+++ b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/eTMap/impl/SubSystemMappingImpl.java
@@ -32,12 +32,12 @@ import org.eclipse.etrice.core.room.SubSystemRef;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.etmap.eTMap.impl.SubSystemMappingImpl#getLogicalSubSys <em>Logical Sub Sys</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.etmap.eTMap.impl.SubSystemMappingImpl#getNode <em>Node</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.etmap.eTMap.impl.SubSystemMappingImpl#getThreadMappings <em>Thread Mappings</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/eTMap/impl/ThreadMappingImpl.java b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/eTMap/impl/ThreadMappingImpl.java
index 2f73ee803..27132e7a3 100644
--- a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/eTMap/impl/ThreadMappingImpl.java
+++ b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/eTMap/impl/ThreadMappingImpl.java
@@ -23,11 +23,11 @@ import org.eclipse.etrice.core.room.LogicalThread;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.etmap.eTMap.impl.ThreadMappingImpl#getLogicalThread <em>Logical Thread</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.etmap.eTMap.impl.ThreadMappingImpl#getPhysicalThread <em>Physical Thread</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/eTMap/util/ETMapSwitch.java b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/eTMap/util/ETMapSwitch.java
index e62aa6f3b..e42d6ebfc 100644
--- a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/eTMap/util/ETMapSwitch.java
+++ b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/eTMap/util/ETMapSwitch.java
@@ -50,7 +50,7 @@ public class ETMapSwitch<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
    */
diff --git a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/ETMapAntlrTokenFileProvider.java b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/ETMapAntlrTokenFileProvider.java
index ae0f08952..a5e4a5fd4 100644
--- a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/ETMapAntlrTokenFileProvider.java
+++ b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/ETMapAntlrTokenFileProvider.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.etmap.parser.antlr;
 
 import java.io.InputStream;
@@ -8,6 +8,7 @@ import org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider;
 
 public class ETMapAntlrTokenFileProvider implements IAntlrTokenFileProvider {
 	
+	@Override
 	public InputStream getAntlrTokenFile() {
 		ClassLoader classLoader = getClass().getClassLoader();
     	return classLoader.getResourceAsStream("org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.tokens");
diff --git a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/ETMapParser.java b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/ETMapParser.java
index 9356fad6d..fb69233a8 100644
--- a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/ETMapParser.java
+++ b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/ETMapParser.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.etmap.parser.antlr;
 
 import com.google.inject.Inject;
diff --git a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g
index 6954427aa..5a435dd55 100644
--- a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g
+++ b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 grammar InternalETMap;
 
 options {
@@ -95,7 +95,7 @@ ruleMappingModel returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"FQN");
+        		"org.eclipse.etrice.core.common.Base.FQN");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -117,7 +117,7 @@ ruleMappingModel returns [EObject current=null]
        			$current, 
        			"imports",
         		lv_imports_3_0, 
-        		"Import");
+        		"org.eclipse.etrice.core.common.Base.Import");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -135,7 +135,7 @@ ruleMappingModel returns [EObject current=null]
        			$current, 
        			"mappings",
         		lv_mappings_4_0, 
-        		"Mapping");
+        		"org.eclipse.etrice.core.etmap.ETMap.Mapping");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -220,7 +220,7 @@ ruleMapping returns [EObject current=null]
        			$current, 
        			"subsysMappings",
         		lv_subsysMappings_5_0, 
-        		"SubSystemMapping");
+        		"org.eclipse.etrice.core.etmap.ETMap.SubSystemMapping");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -301,7 +301,7 @@ ruleSubSystemMapping returns [EObject current=null]
        			$current, 
        			"threadMappings",
         		lv_threadMappings_5_0, 
-        		"ThreadMapping");
+        		"org.eclipse.etrice.core.etmap.ETMap.ThreadMapping");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -402,7 +402,7 @@ ruleKeyValue returns [EObject current=null]
        			$current, 
        			"key",
         		lv_key_0_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -423,7 +423,7 @@ ruleKeyValue returns [EObject current=null]
        			$current, 
        			"value",
         		lv_value_2_0, 
-        		"Literal");
+        		"org.eclipse.etrice.core.common.Base.Literal");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -557,7 +557,7 @@ ruleSimpleAnnotationAttribute returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_3_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -578,7 +578,7 @@ ruleSimpleAnnotationAttribute returns [EObject current=null]
        			$current, 
        			"type",
         		lv_type_5_0, 
-        		"LiteralType");
+        		"org.eclipse.etrice.core.common.Base.LiteralType");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -642,7 +642,7 @@ ruleEnumAnnotationAttribute returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_3_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -668,7 +668,7 @@ ruleEnumAnnotationAttribute returns [EObject current=null]
        			$current, 
        			"values",
         		lv_values_6_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -690,7 +690,7 @@ ruleEnumAnnotationAttribute returns [EObject current=null]
        			$current, 
        			"values",
         		lv_values_8_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -736,7 +736,7 @@ ruleImport returns [EObject current=null]
        			$current, 
        			"importedNamespace",
         		lv_importedNamespace_1_0, 
-        		"ImportedFQN");
+        		"org.eclipse.etrice.core.common.Base.ImportedFQN");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -764,7 +764,7 @@ ruleImport returns [EObject current=null]
        			$current, 
        			"importURI",
         		lv_importURI_4_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -851,7 +851,7 @@ ruleDocumentation returns [EObject current=null]
        			$current, 
        			"lines",
         		lv_lines_2_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -1040,7 +1040,7 @@ ruleRealLiteral returns [EObject current=null]
        			$current, 
        			"value",
         		lv_value_1_0, 
-        		"Real");
+        		"org.eclipse.etrice.core.common.Base.Real");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1085,7 +1085,7 @@ ruleIntLiteral returns [EObject current=null]
        			$current, 
        			"value",
         		lv_value_1_0, 
-        		"Integer");
+        		"org.eclipse.etrice.core.common.Base.Integer");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1131,7 +1131,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.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMapLexer.java b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMapLexer.java
index 56845a5bc..064bb952a 100644
--- a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMapLexer.java
+++ b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMapLexer.java
@@ -63,15 +63,15 @@ public class InternalETMapLexer extends Lexer {
         super(input,state);
 
     }
-    public String getGrammarFileName() { return "../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g"; }
+    public String getGrammarFileName() { return "InternalETMap.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.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:11:7: ( 'MappingModel' )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:11:9: 'MappingModel'
+            // InternalETMap.g:11:7: ( 'MappingModel' )
+            // InternalETMap.g:11:9: 'MappingModel'
             {
             match("MappingModel"); 
 
@@ -91,8 +91,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__13;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:12:7: ( '{' )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:12:9: '{'
+            // InternalETMap.g:12:7: ( '{' )
+            // InternalETMap.g:12:9: '{'
             {
             match('{'); 
 
@@ -111,8 +111,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__14;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:13:7: ( '}' )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:13:9: '}'
+            // InternalETMap.g:13:7: ( '}' )
+            // InternalETMap.g:13:9: '}'
             {
             match('}'); 
 
@@ -131,8 +131,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__15;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:14:7: ( 'Mapping' )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:14:9: 'Mapping'
+            // InternalETMap.g:14:7: ( 'Mapping' )
+            // InternalETMap.g:14:9: 'Mapping'
             {
             match("Mapping"); 
 
@@ -152,8 +152,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__16;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:15:7: ( '->' )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:15:9: '->'
+            // InternalETMap.g:15:7: ( '->' )
+            // InternalETMap.g:15:9: '->'
             {
             match("->"); 
 
@@ -173,8 +173,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__17;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:16:7: ( 'SubSystemMapping' )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:16:9: 'SubSystemMapping'
+            // InternalETMap.g:16:7: ( 'SubSystemMapping' )
+            // InternalETMap.g:16:9: 'SubSystemMapping'
             {
             match("SubSystemMapping"); 
 
@@ -194,8 +194,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__18;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:17:7: ( 'ThreadMapping' )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:17:9: 'ThreadMapping'
+            // InternalETMap.g:17:7: ( 'ThreadMapping' )
+            // InternalETMap.g:17:9: 'ThreadMapping'
             {
             match("ThreadMapping"); 
 
@@ -215,8 +215,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__19;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:18:7: ( '=' )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:18:9: '='
+            // InternalETMap.g:18:7: ( '=' )
+            // InternalETMap.g:18:9: '='
             {
             match('='); 
 
@@ -235,8 +235,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__20;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:19:7: ( 'optional' )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:19:9: 'optional'
+            // InternalETMap.g:19:7: ( 'optional' )
+            // InternalETMap.g:19:9: 'optional'
             {
             match("optional"); 
 
@@ -256,8 +256,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__21;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:20:7: ( 'mandatory' )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:20:9: 'mandatory'
+            // InternalETMap.g:20:7: ( 'mandatory' )
+            // InternalETMap.g:20:9: 'mandatory'
             {
             match("mandatory"); 
 
@@ -277,8 +277,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__22;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:21:7: ( 'attribute' )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:21:9: 'attribute'
+            // InternalETMap.g:21:7: ( 'attribute' )
+            // InternalETMap.g:21:9: 'attribute'
             {
             match("attribute"); 
 
@@ -298,8 +298,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__23;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:22:7: ( ':' )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:22:9: ':'
+            // InternalETMap.g:22:7: ( ':' )
+            // InternalETMap.g:22:9: ':'
             {
             match(':'); 
 
@@ -318,8 +318,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__24;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:23:7: ( ',' )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:23:9: ','
+            // InternalETMap.g:23:7: ( ',' )
+            // InternalETMap.g:23:9: ','
             {
             match(','); 
 
@@ -338,8 +338,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__25;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:24:7: ( 'import' )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:24:9: 'import'
+            // InternalETMap.g:24:7: ( 'import' )
+            // InternalETMap.g:24:9: 'import'
             {
             match("import"); 
 
@@ -359,8 +359,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__26;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:25:7: ( 'from' )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:25:9: 'from'
+            // InternalETMap.g:25:7: ( 'from' )
+            // InternalETMap.g:25:9: 'from'
             {
             match("from"); 
 
@@ -380,8 +380,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__27;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:26:7: ( 'model' )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:26:9: 'model'
+            // InternalETMap.g:26:7: ( 'model' )
+            // InternalETMap.g:26:9: 'model'
             {
             match("model"); 
 
@@ -401,8 +401,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__28;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:27:7: ( '.*' )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:27:9: '.*'
+            // InternalETMap.g:27:7: ( '.*' )
+            // InternalETMap.g:27:9: '.*'
             {
             match(".*"); 
 
@@ -422,8 +422,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__29;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:28:7: ( '[' )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:28:9: '['
+            // InternalETMap.g:28:7: ( '[' )
+            // InternalETMap.g:28:9: '['
             {
             match('['); 
 
@@ -442,8 +442,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__30;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:29:7: ( ']' )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:29:9: ']'
+            // InternalETMap.g:29:7: ( ']' )
+            // InternalETMap.g:29:9: ']'
             {
             match(']'); 
 
@@ -462,8 +462,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__31;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:30:7: ( 'false' )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:30:9: 'false'
+            // InternalETMap.g:30:7: ( 'false' )
+            // InternalETMap.g:30:9: 'false'
             {
             match("false"); 
 
@@ -483,8 +483,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__32;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:31:7: ( 'true' )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:31:9: 'true'
+            // InternalETMap.g:31:7: ( 'true' )
+            // InternalETMap.g:31:9: 'true'
             {
             match("true"); 
 
@@ -504,8 +504,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__33;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:32:7: ( '+' )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:32:9: '+'
+            // InternalETMap.g:32:7: ( '+' )
+            // InternalETMap.g:32:9: '+'
             {
             match('+'); 
 
@@ -524,8 +524,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__34;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:33:7: ( '-' )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:33:9: '-'
+            // InternalETMap.g:33:7: ( '-' )
+            // InternalETMap.g:33:9: '-'
             {
             match('-'); 
 
@@ -544,8 +544,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__35;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:34:7: ( '.' )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:34:9: '.'
+            // InternalETMap.g:34:7: ( '.' )
+            // InternalETMap.g:34:9: '.'
             {
             match('.'); 
 
@@ -564,8 +564,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__36;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:35:7: ( 'e' )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:35:9: 'e'
+            // InternalETMap.g:35:7: ( 'e' )
+            // InternalETMap.g:35:9: 'e'
             {
             match('e'); 
 
@@ -584,8 +584,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__37;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:36:7: ( 'E' )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:36:9: 'E'
+            // InternalETMap.g:36:7: ( 'E' )
+            // InternalETMap.g:36:9: 'E'
             {
             match('E'); 
 
@@ -604,8 +604,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__38;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:37:7: ( 'ptBoolean' )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:37:9: 'ptBoolean'
+            // InternalETMap.g:37:7: ( 'ptBoolean' )
+            // InternalETMap.g:37:9: 'ptBoolean'
             {
             match("ptBoolean"); 
 
@@ -625,8 +625,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__39;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:38:7: ( 'ptInteger' )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:38:9: 'ptInteger'
+            // InternalETMap.g:38:7: ( 'ptInteger' )
+            // InternalETMap.g:38:9: 'ptInteger'
             {
             match("ptInteger"); 
 
@@ -646,8 +646,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__40;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:39:7: ( 'ptReal' )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:39:9: 'ptReal'
+            // InternalETMap.g:39:7: ( 'ptReal' )
+            // InternalETMap.g:39:9: 'ptReal'
             {
             match("ptReal"); 
 
@@ -667,8 +667,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = T__41;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:40:7: ( 'ptCharacter' )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:40:9: 'ptCharacter'
+            // InternalETMap.g:40:7: ( 'ptCharacter' )
+            // InternalETMap.g:40:9: 'ptCharacter'
             {
             match("ptCharacter"); 
 
@@ -688,10 +688,10 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = RULE_HEX;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1471:10: ( ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+ )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1471:12: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+
+            // InternalETMap.g:1471:10: ( ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+ )
+            // InternalETMap.g:1471:12: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+
             {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1471:12: ( '0x' | '0X' )
+            // InternalETMap.g:1471:12: ( '0x' | '0X' )
             int alt1=2;
             int LA1_0 = input.LA(1);
 
@@ -719,7 +719,7 @@ public class InternalETMapLexer extends Lexer {
             }
             switch (alt1) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1471:13: '0x'
+                    // InternalETMap.g:1471:13: '0x'
                     {
                     match("0x"); 
 
@@ -727,7 +727,7 @@ public class InternalETMapLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1471:18: '0X'
+                    // InternalETMap.g:1471:18: '0X'
                     {
                     match("0X"); 
 
@@ -737,7 +737,7 @@ public class InternalETMapLexer extends Lexer {
 
             }
 
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1471:24: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+
+            // InternalETMap.g:1471:24: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+
             int cnt2=0;
             loop2:
             do {
@@ -751,7 +751,7 @@ public class InternalETMapLexer extends Lexer {
 
                 switch (alt2) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:
+            	    // InternalETMap.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();
@@ -791,10 +791,10 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = RULE_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1473:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1473:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalETMap.g:1473:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+            // InternalETMap.g:1473:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1473:11: ( '^' )?
+            // InternalETMap.g:1473:11: ( '^' )?
             int alt3=2;
             int LA3_0 = input.LA(1);
 
@@ -803,7 +803,7 @@ public class InternalETMapLexer extends Lexer {
             }
             switch (alt3) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1473:11: '^'
+                    // InternalETMap.g:1473:11: '^'
                     {
                     match('^'); 
 
@@ -821,7 +821,7 @@ public class InternalETMapLexer extends Lexer {
                 recover(mse);
                 throw mse;}
 
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1473:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalETMap.g:1473:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             loop4:
             do {
                 int alt4=2;
@@ -834,7 +834,7 @@ public class InternalETMapLexer extends Lexer {
 
                 switch (alt4) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:
+            	    // InternalETMap.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();
@@ -870,10 +870,10 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = RULE_INT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1475:10: ( ( '0' .. '9' )+ )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1475:12: ( '0' .. '9' )+
+            // InternalETMap.g:1475:10: ( ( '0' .. '9' )+ )
+            // InternalETMap.g:1475:12: ( '0' .. '9' )+
             {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1475:12: ( '0' .. '9' )+
+            // InternalETMap.g:1475:12: ( '0' .. '9' )+
             int cnt5=0;
             loop5:
             do {
@@ -887,7 +887,7 @@ public class InternalETMapLexer extends Lexer {
 
                 switch (alt5) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1475:13: '0' .. '9'
+            	    // InternalETMap.g:1475:13: '0' .. '9'
             	    {
             	    matchRange('0','9'); 
 
@@ -919,10 +919,10 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = RULE_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1477:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1477:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalETMap.g:1477:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+            // InternalETMap.g:1477:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1477:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalETMap.g:1477:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             int alt8=2;
             int LA8_0 = input.LA(1);
 
@@ -940,10 +940,10 @@ public class InternalETMapLexer extends Lexer {
             }
             switch (alt8) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1477:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+                    // InternalETMap.g:1477:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
                     {
                     match('\"'); 
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1477:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+                    // InternalETMap.g:1477:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
                     loop6:
                     do {
                         int alt6=3;
@@ -959,7 +959,7 @@ public class InternalETMapLexer extends Lexer {
 
                         switch (alt6) {
                     	case 1 :
-                    	    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1477:21: '\\\\' .
+                    	    // InternalETMap.g:1477:21: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -967,7 +967,7 @@ public class InternalETMapLexer extends Lexer {
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1477:28: ~ ( ( '\\\\' | '\"' ) )
+                    	    // InternalETMap.g:1477:28: ~ ( ( '\\\\' | '\"' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -992,10 +992,10 @@ public class InternalETMapLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1477:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+                    // InternalETMap.g:1477:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
                     {
                     match('\''); 
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1477:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+                    // InternalETMap.g:1477:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
                     loop7:
                     do {
                         int alt7=3;
@@ -1011,7 +1011,7 @@ public class InternalETMapLexer extends Lexer {
 
                         switch (alt7) {
                     	case 1 :
-                    	    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1477:54: '\\\\' .
+                    	    // InternalETMap.g:1477:54: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -1019,7 +1019,7 @@ public class InternalETMapLexer extends Lexer {
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1477:61: ~ ( ( '\\\\' | '\\'' ) )
+                    	    // InternalETMap.g:1477:61: ~ ( ( '\\\\' | '\\'' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -1062,12 +1062,12 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = RULE_ML_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1479:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1479:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // InternalETMap.g:1479:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // InternalETMap.g:1479:19: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); 
 
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1479:24: ( options {greedy=false; } : . )*
+            // InternalETMap.g:1479:24: ( options {greedy=false; } : . )*
             loop9:
             do {
                 int alt9=2;
@@ -1092,7 +1092,7 @@ public class InternalETMapLexer extends Lexer {
 
                 switch (alt9) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1479:52: .
+            	    // InternalETMap.g:1479:52: .
             	    {
             	    matchAny(); 
 
@@ -1122,12 +1122,12 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = RULE_SL_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1481:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1481:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // InternalETMap.g:1481:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // InternalETMap.g:1481:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
             {
             match("//"); 
 
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1481:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            // InternalETMap.g:1481:24: (~ ( ( '\\n' | '\\r' ) ) )*
             loop10:
             do {
                 int alt10=2;
@@ -1140,7 +1140,7 @@ public class InternalETMapLexer extends Lexer {
 
                 switch (alt10) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1481:24: ~ ( ( '\\n' | '\\r' ) )
+            	    // InternalETMap.g:1481: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();
@@ -1160,7 +1160,7 @@ public class InternalETMapLexer extends Lexer {
                 }
             } while (true);
 
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1481:40: ( ( '\\r' )? '\\n' )?
+            // InternalETMap.g:1481:40: ( ( '\\r' )? '\\n' )?
             int alt12=2;
             int LA12_0 = input.LA(1);
 
@@ -1169,9 +1169,9 @@ public class InternalETMapLexer extends Lexer {
             }
             switch (alt12) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1481:41: ( '\\r' )? '\\n'
+                    // InternalETMap.g:1481:41: ( '\\r' )? '\\n'
                     {
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1481:41: ( '\\r' )?
+                    // InternalETMap.g:1481:41: ( '\\r' )?
                     int alt11=2;
                     int LA11_0 = input.LA(1);
 
@@ -1180,7 +1180,7 @@ public class InternalETMapLexer extends Lexer {
                     }
                     switch (alt11) {
                         case 1 :
-                            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1481:41: '\\r'
+                            // InternalETMap.g:1481:41: '\\r'
                             {
                             match('\r'); 
 
@@ -1212,10 +1212,10 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = RULE_WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1483:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1483:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalETMap.g:1483:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // InternalETMap.g:1483:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1483:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalETMap.g:1483:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             int cnt13=0;
             loop13:
             do {
@@ -1229,7 +1229,7 @@ public class InternalETMapLexer extends Lexer {
 
                 switch (alt13) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:
+            	    // InternalETMap.g:
             	    {
             	    if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) {
             	        input.consume();
@@ -1269,8 +1269,8 @@ public class InternalETMapLexer extends Lexer {
         try {
             int _type = RULE_ANY_OTHER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1485:16: ( . )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1485:18: .
+            // InternalETMap.g:1485:16: ( . )
+            // InternalETMap.g:1485:18: .
             {
             matchAny(); 
 
@@ -1285,271 +1285,271 @@ public class InternalETMapLexer extends Lexer {
     // $ANTLR end "RULE_ANY_OTHER"
 
     public void mTokens() throws RecognitionException {
-        // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.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 | RULE_HEX | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+        // InternalETMap.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 | RULE_HEX | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
         int alt14=38;
         alt14 = dfa14.predict(input);
         switch (alt14) {
             case 1 :
-                // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1:10: T__12
+                // InternalETMap.g:1:10: T__12
                 {
                 mT__12(); 
 
                 }
                 break;
             case 2 :
-                // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1:16: T__13
+                // InternalETMap.g:1:16: T__13
                 {
                 mT__13(); 
 
                 }
                 break;
             case 3 :
-                // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1:22: T__14
+                // InternalETMap.g:1:22: T__14
                 {
                 mT__14(); 
 
                 }
                 break;
             case 4 :
-                // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1:28: T__15
+                // InternalETMap.g:1:28: T__15
                 {
                 mT__15(); 
 
                 }
                 break;
             case 5 :
-                // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1:34: T__16
+                // InternalETMap.g:1:34: T__16
                 {
                 mT__16(); 
 
                 }
                 break;
             case 6 :
-                // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1:40: T__17
+                // InternalETMap.g:1:40: T__17
                 {
                 mT__17(); 
 
                 }
                 break;
             case 7 :
-                // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1:46: T__18
+                // InternalETMap.g:1:46: T__18
                 {
                 mT__18(); 
 
                 }
                 break;
             case 8 :
-                // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1:52: T__19
+                // InternalETMap.g:1:52: T__19
                 {
                 mT__19(); 
 
                 }
                 break;
             case 9 :
-                // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1:58: T__20
+                // InternalETMap.g:1:58: T__20
                 {
                 mT__20(); 
 
                 }
                 break;
             case 10 :
-                // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1:64: T__21
+                // InternalETMap.g:1:64: T__21
                 {
                 mT__21(); 
 
                 }
                 break;
             case 11 :
-                // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1:70: T__22
+                // InternalETMap.g:1:70: T__22
                 {
                 mT__22(); 
 
                 }
                 break;
             case 12 :
-                // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1:76: T__23
+                // InternalETMap.g:1:76: T__23
                 {
                 mT__23(); 
 
                 }
                 break;
             case 13 :
-                // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1:82: T__24
+                // InternalETMap.g:1:82: T__24
                 {
                 mT__24(); 
 
                 }
                 break;
             case 14 :
-                // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1:88: T__25
+                // InternalETMap.g:1:88: T__25
                 {
                 mT__25(); 
 
                 }
                 break;
             case 15 :
-                // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1:94: T__26
+                // InternalETMap.g:1:94: T__26
                 {
                 mT__26(); 
 
                 }
                 break;
             case 16 :
-                // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1:100: T__27
+                // InternalETMap.g:1:100: T__27
                 {
                 mT__27(); 
 
                 }
                 break;
             case 17 :
-                // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1:106: T__28
+                // InternalETMap.g:1:106: T__28
                 {
                 mT__28(); 
 
                 }
                 break;
             case 18 :
-                // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1:112: T__29
+                // InternalETMap.g:1:112: T__29
                 {
                 mT__29(); 
 
                 }
                 break;
             case 19 :
-                // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1:118: T__30
+                // InternalETMap.g:1:118: T__30
                 {
                 mT__30(); 
 
                 }
                 break;
             case 20 :
-                // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1:124: T__31
+                // InternalETMap.g:1:124: T__31
                 {
                 mT__31(); 
 
                 }
                 break;
             case 21 :
-                // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1:130: T__32
+                // InternalETMap.g:1:130: T__32
                 {
                 mT__32(); 
 
                 }
                 break;
             case 22 :
-                // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1:136: T__33
+                // InternalETMap.g:1:136: T__33
                 {
                 mT__33(); 
 
                 }
                 break;
             case 23 :
-                // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1:142: T__34
+                // InternalETMap.g:1:142: T__34
                 {
                 mT__34(); 
 
                 }
                 break;
             case 24 :
-                // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1:148: T__35
+                // InternalETMap.g:1:148: T__35
                 {
                 mT__35(); 
 
                 }
                 break;
             case 25 :
-                // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1:154: T__36
+                // InternalETMap.g:1:154: T__36
                 {
                 mT__36(); 
 
                 }
                 break;
             case 26 :
-                // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1:160: T__37
+                // InternalETMap.g:1:160: T__37
                 {
                 mT__37(); 
 
                 }
                 break;
             case 27 :
-                // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1:166: T__38
+                // InternalETMap.g:1:166: T__38
                 {
                 mT__38(); 
 
                 }
                 break;
             case 28 :
-                // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1:172: T__39
+                // InternalETMap.g:1:172: T__39
                 {
                 mT__39(); 
 
                 }
                 break;
             case 29 :
-                // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1:178: T__40
+                // InternalETMap.g:1:178: T__40
                 {
                 mT__40(); 
 
                 }
                 break;
             case 30 :
-                // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1:184: T__41
+                // InternalETMap.g:1:184: T__41
                 {
                 mT__41(); 
 
                 }
                 break;
             case 31 :
-                // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1:190: RULE_HEX
+                // InternalETMap.g:1:190: RULE_HEX
                 {
                 mRULE_HEX(); 
 
                 }
                 break;
             case 32 :
-                // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1:199: RULE_ID
+                // InternalETMap.g:1:199: RULE_ID
                 {
                 mRULE_ID(); 
 
                 }
                 break;
             case 33 :
-                // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1:207: RULE_INT
+                // InternalETMap.g:1:207: RULE_INT
                 {
                 mRULE_INT(); 
 
                 }
                 break;
             case 34 :
-                // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1:216: RULE_STRING
+                // InternalETMap.g:1:216: RULE_STRING
                 {
                 mRULE_STRING(); 
 
                 }
                 break;
             case 35 :
-                // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1:228: RULE_ML_COMMENT
+                // InternalETMap.g:1:228: RULE_ML_COMMENT
                 {
                 mRULE_ML_COMMENT(); 
 
                 }
                 break;
             case 36 :
-                // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1:244: RULE_SL_COMMENT
+                // InternalETMap.g:1:244: RULE_SL_COMMENT
                 {
                 mRULE_SL_COMMENT(); 
 
                 }
                 break;
             case 37 :
-                // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1:260: RULE_WS
+                // InternalETMap.g:1:260: RULE_WS
                 {
                 mRULE_WS(); 
 
                 }
                 break;
             case 38 :
-                // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1:268: RULE_ANY_OTHER
+                // InternalETMap.g:1:268: RULE_ANY_OTHER
                 {
                 mRULE_ANY_OTHER(); 
 
@@ -1563,64 +1563,19 @@ public class InternalETMapLexer extends Lexer {
 
     protected DFA14 dfa14 = new DFA14(this);
     static final String DFA14_eotS =
-        "\1\uffff\1\41\2\uffff\1\45\2\41\1\uffff\3\41\2\uffff\2\41\1\63"+
-        "\2\uffff\1\41\1\uffff\1\70\1\71\1\41\1\74\1\37\2\uffff\3\37\2\uffff"+
-        "\1\41\5\uffff\2\41\1\uffff\4\41\2\uffff\3\41\4\uffff\1\41\3\uffff"+
-        "\1\41\6\uffff\27\41\1\147\1\41\1\151\11\41\1\163\2\41\1\uffff\1"+
-        "\166\1\uffff\11\41\1\uffff\1\41\1\u0081\1\uffff\2\41\1\u0084\1\41"+
-        "\1\u0087\5\41\1\uffff\2\41\1\uffff\2\41\1\uffff\2\41\1\u0093\10"+
-        "\41\1\uffff\1\u009c\1\u009d\1\u009e\1\u009f\4\41\4\uffff\4\41\1"+
-        "\u00a8\1\u00a9\2\41\2\uffff\1\41\1\u00ad\1\41\1\uffff\1\41\1\u00b0"+
-        "\1\uffff";
+        "\1\uffff\1\41\2\uffff\1\45\2\41\1\uffff\3\41\2\uffff\2\41\1\63\2\uffff\1\41\1\uffff\1\70\1\71\1\41\1\74\1\37\2\uffff\3\37\2\uffff\1\41\5\uffff\2\41\1\uffff\4\41\2\uffff\3\41\4\uffff\1\41\3\uffff\1\41\6\uffff\27\41\1\147\1\41\1\151\11\41\1\163\2\41\1\uffff\1\166\1\uffff\11\41\1\uffff\1\41\1\u0081\1\uffff\2\41\1\u0084\1\41\1\u0087\5\41\1\uffff\2\41\1\uffff\2\41\1\uffff\2\41\1\u0093\10\41\1\uffff\1\u009c\1\u009d\1\u009e\1\u009f\4\41\4\uffff\4\41\1\u00a8\1\u00a9\2\41\2\uffff\1\41\1\u00ad\1\41\1\uffff\1\41\1\u00b0\1\uffff";
     static final String DFA14_eofS =
         "\u00b1\uffff";
     static final String DFA14_minS =
-        "\1\0\1\141\2\uffff\1\76\1\165\1\150\1\uffff\1\160\1\141\1\164\2"+
-        "\uffff\1\155\1\141\1\52\2\uffff\1\162\1\uffff\2\60\1\164\1\130\1"+
-        "\101\2\uffff\2\0\1\52\2\uffff\1\160\5\uffff\1\142\1\162\1\uffff"+
-        "\1\164\1\156\1\144\1\164\2\uffff\1\160\1\157\1\154\4\uffff\1\165"+
-        "\3\uffff\1\102\6\uffff\1\160\1\123\1\145\1\151\1\144\1\145\1\162"+
-        "\1\157\1\155\1\163\1\145\1\157\1\156\1\145\1\150\1\151\1\171\1\141"+
-        "\1\157\1\141\1\154\1\151\1\162\1\60\1\145\1\60\1\157\1\164\2\141"+
-        "\1\156\1\163\1\144\1\156\1\164\1\60\1\142\1\164\1\uffff\1\60\1\uffff"+
-        "\1\154\1\145\1\154\1\162\1\147\1\164\1\115\1\141\1\157\1\uffff\1"+
-        "\165\1\60\1\uffff\1\145\1\147\1\60\1\141\1\60\1\145\1\141\1\154"+
-        "\1\162\1\164\1\uffff\1\141\1\145\1\uffff\1\143\1\157\1\uffff\1\155"+
-        "\1\160\1\60\1\171\1\145\1\156\1\162\1\164\1\144\1\115\1\160\1\uffff"+
-        "\4\60\2\145\1\141\1\151\4\uffff\1\162\1\154\1\160\1\156\2\60\1\160"+
-        "\1\147\2\uffff\1\151\1\60\1\156\1\uffff\1\147\1\60\1\uffff";
+        "\1\0\1\141\2\uffff\1\76\1\165\1\150\1\uffff\1\160\1\141\1\164\2\uffff\1\155\1\141\1\52\2\uffff\1\162\1\uffff\2\60\1\164\1\130\1\101\2\uffff\2\0\1\52\2\uffff\1\160\5\uffff\1\142\1\162\1\uffff\1\164\1\156\1\144\1\164\2\uffff\1\160\1\157\1\154\4\uffff\1\165\3\uffff\1\102\6\uffff\1\160\1\123\1\145\1\151\1\144\1\145\1\162\1\157\1\155\1\163\1\145\1\157\1\156\1\145\1\150\1\151\1\171\1\141\1\157\1\141\1\154\1\151\1\162\1\60\1\145\1\60\1\157\1\164\2\141\1\156\1\163\1\144\1\156\1\164\1\60\1\142\1\164\1\uffff\1\60\1\uffff\1\154\1\145\1\154\1\162\1\147\1\164\1\115\1\141\1\157\1\uffff\1\165\1\60\1\uffff\1\145\1\147\1\60\1\141\1\60\1\145\1\141\1\154\1\162\1\164\1\uffff\1\141\1\145\1\uffff\1\143\1\157\1\uffff\1\155\1\160\1\60\1\171\1\145\1\156\1\162\1\164\1\144\1\115\1\160\1\uffff\4\60\2\145\1\141\1\151\4\uffff\1\162\1\154\1\160\1\156\2\60\1\160\1\147\2\uffff\1\151\1\60\1\156\1\uffff\1\147\1\60\1\uffff";
     static final String DFA14_maxS =
-        "\1\uffff\1\141\2\uffff\1\76\1\165\1\150\1\uffff\1\160\1\157\1\164"+
-        "\2\uffff\1\155\1\162\1\52\2\uffff\1\162\1\uffff\2\172\1\164\1\170"+
-        "\1\172\2\uffff\2\uffff\1\57\2\uffff\1\160\5\uffff\1\142\1\162\1"+
-        "\uffff\1\164\1\156\1\144\1\164\2\uffff\1\160\1\157\1\154\4\uffff"+
-        "\1\165\3\uffff\1\122\6\uffff\1\160\1\123\1\145\1\151\1\144\1\145"+
-        "\1\162\1\157\1\155\1\163\1\145\1\157\1\156\1\145\1\150\1\151\1\171"+
-        "\1\141\1\157\1\141\1\154\1\151\1\162\1\172\1\145\1\172\1\157\1\164"+
-        "\2\141\1\156\1\163\1\144\1\156\1\164\1\172\1\142\1\164\1\uffff\1"+
-        "\172\1\uffff\1\154\1\145\1\154\1\162\1\147\1\164\1\115\1\141\1\157"+
-        "\1\uffff\1\165\1\172\1\uffff\1\145\1\147\1\172\1\141\1\172\1\145"+
-        "\1\141\1\154\1\162\1\164\1\uffff\1\141\1\145\1\uffff\1\143\1\157"+
-        "\1\uffff\1\155\1\160\1\172\1\171\1\145\1\156\1\162\1\164\1\144\1"+
-        "\115\1\160\1\uffff\4\172\2\145\1\141\1\151\4\uffff\1\162\1\154\1"+
-        "\160\1\156\2\172\1\160\1\147\2\uffff\1\151\1\172\1\156\1\uffff\1"+
-        "\147\1\172\1\uffff";
+        "\1\uffff\1\141\2\uffff\1\76\1\165\1\150\1\uffff\1\160\1\157\1\164\2\uffff\1\155\1\162\1\52\2\uffff\1\162\1\uffff\2\172\1\164\1\170\1\172\2\uffff\2\uffff\1\57\2\uffff\1\160\5\uffff\1\142\1\162\1\uffff\1\164\1\156\1\144\1\164\2\uffff\1\160\1\157\1\154\4\uffff\1\165\3\uffff\1\122\6\uffff\1\160\1\123\1\145\1\151\1\144\1\145\1\162\1\157\1\155\1\163\1\145\1\157\1\156\1\145\1\150\1\151\1\171\1\141\1\157\1\141\1\154\1\151\1\162\1\172\1\145\1\172\1\157\1\164\2\141\1\156\1\163\1\144\1\156\1\164\1\172\1\142\1\164\1\uffff\1\172\1\uffff\1\154\1\145\1\154\1\162\1\147\1\164\1\115\1\141\1\157\1\uffff\1\165\1\172\1\uffff\1\145\1\147\1\172\1\141\1\172\1\145\1\141\1\154\1\162\1\164\1\uffff\1\141\1\145\1\uffff\1\143\1\157\1\uffff\1\155\1\160\1\172\1\171\1\145\1\156\1\162\1\164\1\144\1\115\1\160\1\uffff\4\172\2\145\1\141\1\151\4\uffff\1\162\1\154\1\160\1\156\2\172\1\160\1\147\2\uffff\1\151\1\172\1\156\1\uffff\1\147\1\172\1\uffff";
     static final String DFA14_acceptS =
-        "\2\uffff\1\2\1\3\3\uffff\1\10\3\uffff\1\14\1\15\3\uffff\1\22\1"+
-        "\23\1\uffff\1\26\5\uffff\1\40\1\41\3\uffff\1\45\1\46\1\uffff\1\40"+
-        "\1\2\1\3\1\5\1\27\2\uffff\1\10\4\uffff\1\14\1\15\3\uffff\1\21\1"+
-        "\30\1\22\1\23\1\uffff\1\26\1\31\1\32\1\uffff\1\37\1\41\1\42\1\43"+
-        "\1\44\1\45\46\uffff\1\17\1\uffff\1\25\11\uffff\1\20\2\uffff\1\24"+
-        "\12\uffff\1\16\2\uffff\1\35\2\uffff\1\4\13\uffff\1\11\10\uffff\1"+
-        "\12\1\13\1\33\1\34\10\uffff\1\36\1\1\3\uffff\1\7\2\uffff\1\6";
+        "\2\uffff\1\2\1\3\3\uffff\1\10\3\uffff\1\14\1\15\3\uffff\1\22\1\23\1\uffff\1\26\5\uffff\1\40\1\41\3\uffff\1\45\1\46\1\uffff\1\40\1\2\1\3\1\5\1\27\2\uffff\1\10\4\uffff\1\14\1\15\3\uffff\1\21\1\30\1\22\1\23\1\uffff\1\26\1\31\1\32\1\uffff\1\37\1\41\1\42\1\43\1\44\1\45\46\uffff\1\17\1\uffff\1\25\11\uffff\1\20\2\uffff\1\24\12\uffff\1\16\2\uffff\1\35\2\uffff\1\4\13\uffff\1\11\10\uffff\1\12\1\13\1\33\1\34\10\uffff\1\36\1\1\3\uffff\1\7\2\uffff\1\6";
     static final String DFA14_specialS =
         "\1\1\32\uffff\1\0\1\2\u0094\uffff}>";
     static final String[] DFA14_transitionS = {
-            "\11\37\2\36\2\37\1\36\22\37\1\36\1\37\1\33\4\37\1\34\3\37\1"+
-            "\23\1\14\1\4\1\17\1\35\1\27\11\32\1\13\2\37\1\7\3\37\4\31\1"+
-            "\25\7\31\1\1\5\31\1\5\1\6\6\31\1\20\1\37\1\21\1\30\1\31\1\37"+
-            "\1\12\3\31\1\24\1\16\2\31\1\15\3\31\1\11\1\31\1\10\1\26\3\31"+
-            "\1\22\6\31\1\2\1\37\1\3\uff82\37",
+            "\11\37\2\36\2\37\1\36\22\37\1\36\1\37\1\33\4\37\1\34\3\37\1\23\1\14\1\4\1\17\1\35\1\27\11\32\1\13\2\37\1\7\3\37\4\31\1\25\7\31\1\1\5\31\1\5\1\6\6\31\1\20\1\37\1\21\1\30\1\31\1\37\1\12\3\31\1\24\1\16\2\31\1\15\3\31\1\11\1\31\1\10\1\26\3\31\1\22\6\31\1\2\1\37\1\3\uff82\37",
             "\1\40",
             "",
             "",
@@ -1743,8 +1698,7 @@ public class InternalETMapLexer extends Lexer {
             "\1\u0083",
             "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\32\41",
             "\1\u0085",
-            "\12\41\7\uffff\14\41\1\u0086\15\41\4\uffff\1\41\1\uffff\32"+
-            "\41",
+            "\12\41\7\uffff\14\41\1\u0086\15\41\4\uffff\1\41\1\uffff\32\41",
             "\1\u0088",
             "\1\u0089",
             "\1\u008a",
diff --git a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMapParser.java b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMapParser.java
index 550fad2b4..7b82d0502 100644
--- a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMapParser.java
+++ b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMapParser.java
@@ -78,7 +78,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
         
 
     public String[] getTokenNames() { return InternalETMapParser.tokenNames; }
-    public String getGrammarFileName() { return "../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g"; }
+    public String getGrammarFileName() { return "InternalETMap.g"; }
 
 
 
@@ -103,7 +103,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleMappingModel"
-    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:68:1: entryRuleMappingModel returns [EObject current=null] : iv_ruleMappingModel= ruleMappingModel EOF ;
+    // InternalETMap.g:68:1: entryRuleMappingModel returns [EObject current=null] : iv_ruleMappingModel= ruleMappingModel EOF ;
     public final EObject entryRuleMappingModel() throws RecognitionException {
         EObject current = null;
 
@@ -111,17 +111,17 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:69:2: (iv_ruleMappingModel= ruleMappingModel EOF )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:70:2: iv_ruleMappingModel= ruleMappingModel EOF
+            // InternalETMap.g:69:2: (iv_ruleMappingModel= ruleMappingModel EOF )
+            // InternalETMap.g:70:2: iv_ruleMappingModel= ruleMappingModel EOF
             {
              newCompositeNode(grammarAccess.getMappingModelRule()); 
-            pushFollow(FOLLOW_ruleMappingModel_in_entryRuleMappingModel75);
+            pushFollow(FOLLOW_1);
             iv_ruleMappingModel=ruleMappingModel();
 
             state._fsp--;
 
              current =iv_ruleMappingModel; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleMappingModel85); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -139,7 +139,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleMappingModel"
-    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:77:1: ruleMappingModel returns [EObject current=null] : (otherlv_0= 'MappingModel' ( (lv_name_1_0= ruleFQN ) ) otherlv_2= '{' ( (lv_imports_3_0= ruleImport ) )* ( (lv_mappings_4_0= ruleMapping ) )* otherlv_5= '}' ) ;
+    // InternalETMap.g:77:1: ruleMappingModel returns [EObject current=null] : (otherlv_0= 'MappingModel' ( (lv_name_1_0= ruleFQN ) ) otherlv_2= '{' ( (lv_imports_3_0= ruleImport ) )* ( (lv_mappings_4_0= ruleMapping ) )* otherlv_5= '}' ) ;
     public final EObject ruleMappingModel() throws RecognitionException {
         EObject current = null;
 
@@ -156,26 +156,26 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:80:28: ( (otherlv_0= 'MappingModel' ( (lv_name_1_0= ruleFQN ) ) otherlv_2= '{' ( (lv_imports_3_0= ruleImport ) )* ( (lv_mappings_4_0= ruleMapping ) )* otherlv_5= '}' ) )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:81:1: (otherlv_0= 'MappingModel' ( (lv_name_1_0= ruleFQN ) ) otherlv_2= '{' ( (lv_imports_3_0= ruleImport ) )* ( (lv_mappings_4_0= ruleMapping ) )* otherlv_5= '}' )
+            // InternalETMap.g:80:28: ( (otherlv_0= 'MappingModel' ( (lv_name_1_0= ruleFQN ) ) otherlv_2= '{' ( (lv_imports_3_0= ruleImport ) )* ( (lv_mappings_4_0= ruleMapping ) )* otherlv_5= '}' ) )
+            // InternalETMap.g:81:1: (otherlv_0= 'MappingModel' ( (lv_name_1_0= ruleFQN ) ) otherlv_2= '{' ( (lv_imports_3_0= ruleImport ) )* ( (lv_mappings_4_0= ruleMapping ) )* otherlv_5= '}' )
             {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:81:1: (otherlv_0= 'MappingModel' ( (lv_name_1_0= ruleFQN ) ) otherlv_2= '{' ( (lv_imports_3_0= ruleImport ) )* ( (lv_mappings_4_0= ruleMapping ) )* otherlv_5= '}' )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:81:3: otherlv_0= 'MappingModel' ( (lv_name_1_0= ruleFQN ) ) otherlv_2= '{' ( (lv_imports_3_0= ruleImport ) )* ( (lv_mappings_4_0= ruleMapping ) )* otherlv_5= '}'
+            // InternalETMap.g:81:1: (otherlv_0= 'MappingModel' ( (lv_name_1_0= ruleFQN ) ) otherlv_2= '{' ( (lv_imports_3_0= ruleImport ) )* ( (lv_mappings_4_0= ruleMapping ) )* otherlv_5= '}' )
+            // InternalETMap.g:81:3: otherlv_0= 'MappingModel' ( (lv_name_1_0= ruleFQN ) ) otherlv_2= '{' ( (lv_imports_3_0= ruleImport ) )* ( (lv_mappings_4_0= ruleMapping ) )* otherlv_5= '}'
             {
-            otherlv_0=(Token)match(input,12,FOLLOW_12_in_ruleMappingModel122); 
+            otherlv_0=(Token)match(input,12,FOLLOW_3); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getMappingModelAccess().getMappingModelKeyword_0());
                 
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:85:1: ( (lv_name_1_0= ruleFQN ) )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:86:1: (lv_name_1_0= ruleFQN )
+            // InternalETMap.g:85:1: ( (lv_name_1_0= ruleFQN ) )
+            // InternalETMap.g:86:1: (lv_name_1_0= ruleFQN )
             {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:86:1: (lv_name_1_0= ruleFQN )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:87:3: lv_name_1_0= ruleFQN
+            // InternalETMap.g:86:1: (lv_name_1_0= ruleFQN )
+            // InternalETMap.g:87:3: lv_name_1_0= ruleFQN
             {
              
             	        newCompositeNode(grammarAccess.getMappingModelAccess().getNameFQNParserRuleCall_1_0()); 
             	    
-            pushFollow(FOLLOW_ruleFQN_in_ruleMappingModel143);
+            pushFollow(FOLLOW_4);
             lv_name_1_0=ruleFQN();
 
             state._fsp--;
@@ -188,7 +188,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"name",
                     		lv_name_1_0, 
-                    		"FQN");
+                    		"org.eclipse.etrice.core.common.Base.FQN");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -197,11 +197,11 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_2=(Token)match(input,13,FOLLOW_13_in_ruleMappingModel155); 
+            otherlv_2=(Token)match(input,13,FOLLOW_5); 
 
                 	newLeafNode(otherlv_2, grammarAccess.getMappingModelAccess().getLeftCurlyBracketKeyword_2());
                 
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:107:1: ( (lv_imports_3_0= ruleImport ) )*
+            // InternalETMap.g:107:1: ( (lv_imports_3_0= ruleImport ) )*
             loop1:
             do {
                 int alt1=2;
@@ -214,15 +214,15 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
                 switch (alt1) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:108:1: (lv_imports_3_0= ruleImport )
+            	    // InternalETMap.g:108:1: (lv_imports_3_0= ruleImport )
             	    {
-            	    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:108:1: (lv_imports_3_0= ruleImport )
-            	    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:109:3: lv_imports_3_0= ruleImport
+            	    // InternalETMap.g:108:1: (lv_imports_3_0= ruleImport )
+            	    // InternalETMap.g:109:3: lv_imports_3_0= ruleImport
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getMappingModelAccess().getImportsImportParserRuleCall_3_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleImport_in_ruleMappingModel176);
+            	    pushFollow(FOLLOW_5);
             	    lv_imports_3_0=ruleImport();
 
             	    state._fsp--;
@@ -235,7 +235,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"imports",
             	            		lv_imports_3_0, 
-            	            		"Import");
+            	            		"org.eclipse.etrice.core.common.Base.Import");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -250,7 +250,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
                 }
             } while (true);
 
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:125:3: ( (lv_mappings_4_0= ruleMapping ) )*
+            // InternalETMap.g:125:3: ( (lv_mappings_4_0= ruleMapping ) )*
             loop2:
             do {
                 int alt2=2;
@@ -263,15 +263,15 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
                 switch (alt2) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:126:1: (lv_mappings_4_0= ruleMapping )
+            	    // InternalETMap.g:126:1: (lv_mappings_4_0= ruleMapping )
             	    {
-            	    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:126:1: (lv_mappings_4_0= ruleMapping )
-            	    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:127:3: lv_mappings_4_0= ruleMapping
+            	    // InternalETMap.g:126:1: (lv_mappings_4_0= ruleMapping )
+            	    // InternalETMap.g:127:3: lv_mappings_4_0= ruleMapping
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getMappingModelAccess().getMappingsMappingParserRuleCall_4_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleMapping_in_ruleMappingModel198);
+            	    pushFollow(FOLLOW_6);
             	    lv_mappings_4_0=ruleMapping();
 
             	    state._fsp--;
@@ -284,7 +284,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"mappings",
             	            		lv_mappings_4_0, 
-            	            		"Mapping");
+            	            		"org.eclipse.etrice.core.etmap.ETMap.Mapping");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -299,7 +299,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
                 }
             } while (true);
 
-            otherlv_5=(Token)match(input,14,FOLLOW_14_in_ruleMappingModel211); 
+            otherlv_5=(Token)match(input,14,FOLLOW_2); 
 
                 	newLeafNode(otherlv_5, grammarAccess.getMappingModelAccess().getRightCurlyBracketKeyword_5());
                 
@@ -324,7 +324,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleMapping"
-    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:155:1: entryRuleMapping returns [EObject current=null] : iv_ruleMapping= ruleMapping EOF ;
+    // InternalETMap.g:155:1: entryRuleMapping returns [EObject current=null] : iv_ruleMapping= ruleMapping EOF ;
     public final EObject entryRuleMapping() throws RecognitionException {
         EObject current = null;
 
@@ -332,17 +332,17 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:156:2: (iv_ruleMapping= ruleMapping EOF )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:157:2: iv_ruleMapping= ruleMapping EOF
+            // InternalETMap.g:156:2: (iv_ruleMapping= ruleMapping EOF )
+            // InternalETMap.g:157:2: iv_ruleMapping= ruleMapping EOF
             {
              newCompositeNode(grammarAccess.getMappingRule()); 
-            pushFollow(FOLLOW_ruleMapping_in_entryRuleMapping247);
+            pushFollow(FOLLOW_1);
             iv_ruleMapping=ruleMapping();
 
             state._fsp--;
 
              current =iv_ruleMapping; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleMapping257); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -360,7 +360,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleMapping"
-    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:164:1: ruleMapping returns [EObject current=null] : (otherlv_0= 'Mapping' ( ( ruleFQN ) ) otherlv_2= '->' ( ( ruleFQN ) ) otherlv_4= '{' ( (lv_subsysMappings_5_0= ruleSubSystemMapping ) )* otherlv_6= '}' ) ;
+    // InternalETMap.g:164:1: ruleMapping returns [EObject current=null] : (otherlv_0= 'Mapping' ( ( ruleFQN ) ) otherlv_2= '->' ( ( ruleFQN ) ) otherlv_4= '{' ( (lv_subsysMappings_5_0= ruleSubSystemMapping ) )* otherlv_6= '}' ) ;
     public final EObject ruleMapping() throws RecognitionException {
         EObject current = null;
 
@@ -374,21 +374,21 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:167:28: ( (otherlv_0= 'Mapping' ( ( ruleFQN ) ) otherlv_2= '->' ( ( ruleFQN ) ) otherlv_4= '{' ( (lv_subsysMappings_5_0= ruleSubSystemMapping ) )* otherlv_6= '}' ) )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:168:1: (otherlv_0= 'Mapping' ( ( ruleFQN ) ) otherlv_2= '->' ( ( ruleFQN ) ) otherlv_4= '{' ( (lv_subsysMappings_5_0= ruleSubSystemMapping ) )* otherlv_6= '}' )
+            // InternalETMap.g:167:28: ( (otherlv_0= 'Mapping' ( ( ruleFQN ) ) otherlv_2= '->' ( ( ruleFQN ) ) otherlv_4= '{' ( (lv_subsysMappings_5_0= ruleSubSystemMapping ) )* otherlv_6= '}' ) )
+            // InternalETMap.g:168:1: (otherlv_0= 'Mapping' ( ( ruleFQN ) ) otherlv_2= '->' ( ( ruleFQN ) ) otherlv_4= '{' ( (lv_subsysMappings_5_0= ruleSubSystemMapping ) )* otherlv_6= '}' )
             {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:168:1: (otherlv_0= 'Mapping' ( ( ruleFQN ) ) otherlv_2= '->' ( ( ruleFQN ) ) otherlv_4= '{' ( (lv_subsysMappings_5_0= ruleSubSystemMapping ) )* otherlv_6= '}' )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:168:3: otherlv_0= 'Mapping' ( ( ruleFQN ) ) otherlv_2= '->' ( ( ruleFQN ) ) otherlv_4= '{' ( (lv_subsysMappings_5_0= ruleSubSystemMapping ) )* otherlv_6= '}'
+            // InternalETMap.g:168:1: (otherlv_0= 'Mapping' ( ( ruleFQN ) ) otherlv_2= '->' ( ( ruleFQN ) ) otherlv_4= '{' ( (lv_subsysMappings_5_0= ruleSubSystemMapping ) )* otherlv_6= '}' )
+            // InternalETMap.g:168:3: otherlv_0= 'Mapping' ( ( ruleFQN ) ) otherlv_2= '->' ( ( ruleFQN ) ) otherlv_4= '{' ( (lv_subsysMappings_5_0= ruleSubSystemMapping ) )* otherlv_6= '}'
             {
-            otherlv_0=(Token)match(input,15,FOLLOW_15_in_ruleMapping294); 
+            otherlv_0=(Token)match(input,15,FOLLOW_3); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getMappingAccess().getMappingKeyword_0());
                 
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:172:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:173:1: ( ruleFQN )
+            // InternalETMap.g:172:1: ( ( ruleFQN ) )
+            // InternalETMap.g:173:1: ( ruleFQN )
             {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:173:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:174:3: ruleFQN
+            // InternalETMap.g:173:1: ( ruleFQN )
+            // InternalETMap.g:174:3: ruleFQN
             {
 
             			if (current==null) {
@@ -398,7 +398,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
              
             	        newCompositeNode(grammarAccess.getMappingAccess().getLogicalSysLogicalSystemCrossReference_1_0()); 
             	    
-            pushFollow(FOLLOW_ruleFQN_in_ruleMapping317);
+            pushFollow(FOLLOW_7);
             ruleFQN();
 
             state._fsp--;
@@ -412,15 +412,15 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_2=(Token)match(input,16,FOLLOW_16_in_ruleMapping329); 
+            otherlv_2=(Token)match(input,16,FOLLOW_3); 
 
                 	newLeafNode(otherlv_2, grammarAccess.getMappingAccess().getHyphenMinusGreaterThanSignKeyword_2());
                 
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:191:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:192:1: ( ruleFQN )
+            // InternalETMap.g:191:1: ( ( ruleFQN ) )
+            // InternalETMap.g:192:1: ( ruleFQN )
             {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:192:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:193:3: ruleFQN
+            // InternalETMap.g:192:1: ( ruleFQN )
+            // InternalETMap.g:193:3: ruleFQN
             {
 
             			if (current==null) {
@@ -430,7 +430,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
              
             	        newCompositeNode(grammarAccess.getMappingAccess().getPhysicalSysPhysicalSystemCrossReference_3_0()); 
             	    
-            pushFollow(FOLLOW_ruleFQN_in_ruleMapping352);
+            pushFollow(FOLLOW_4);
             ruleFQN();
 
             state._fsp--;
@@ -444,11 +444,11 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_4=(Token)match(input,13,FOLLOW_13_in_ruleMapping364); 
+            otherlv_4=(Token)match(input,13,FOLLOW_8); 
 
                 	newLeafNode(otherlv_4, grammarAccess.getMappingAccess().getLeftCurlyBracketKeyword_4());
                 
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:210:1: ( (lv_subsysMappings_5_0= ruleSubSystemMapping ) )*
+            // InternalETMap.g:210:1: ( (lv_subsysMappings_5_0= ruleSubSystemMapping ) )*
             loop3:
             do {
                 int alt3=2;
@@ -461,15 +461,15 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
                 switch (alt3) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:211:1: (lv_subsysMappings_5_0= ruleSubSystemMapping )
+            	    // InternalETMap.g:211:1: (lv_subsysMappings_5_0= ruleSubSystemMapping )
             	    {
-            	    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:211:1: (lv_subsysMappings_5_0= ruleSubSystemMapping )
-            	    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:212:3: lv_subsysMappings_5_0= ruleSubSystemMapping
+            	    // InternalETMap.g:211:1: (lv_subsysMappings_5_0= ruleSubSystemMapping )
+            	    // InternalETMap.g:212:3: lv_subsysMappings_5_0= ruleSubSystemMapping
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getMappingAccess().getSubsysMappingsSubSystemMappingParserRuleCall_5_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleSubSystemMapping_in_ruleMapping385);
+            	    pushFollow(FOLLOW_8);
             	    lv_subsysMappings_5_0=ruleSubSystemMapping();
 
             	    state._fsp--;
@@ -482,7 +482,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"subsysMappings",
             	            		lv_subsysMappings_5_0, 
-            	            		"SubSystemMapping");
+            	            		"org.eclipse.etrice.core.etmap.ETMap.SubSystemMapping");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -497,7 +497,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
                 }
             } while (true);
 
-            otherlv_6=(Token)match(input,14,FOLLOW_14_in_ruleMapping398); 
+            otherlv_6=(Token)match(input,14,FOLLOW_2); 
 
                 	newLeafNode(otherlv_6, grammarAccess.getMappingAccess().getRightCurlyBracketKeyword_6());
                 
@@ -522,7 +522,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleSubSystemMapping"
-    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:240:1: entryRuleSubSystemMapping returns [EObject current=null] : iv_ruleSubSystemMapping= ruleSubSystemMapping EOF ;
+    // InternalETMap.g:240:1: entryRuleSubSystemMapping returns [EObject current=null] : iv_ruleSubSystemMapping= ruleSubSystemMapping EOF ;
     public final EObject entryRuleSubSystemMapping() throws RecognitionException {
         EObject current = null;
 
@@ -530,17 +530,17 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:241:2: (iv_ruleSubSystemMapping= ruleSubSystemMapping EOF )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:242:2: iv_ruleSubSystemMapping= ruleSubSystemMapping EOF
+            // InternalETMap.g:241:2: (iv_ruleSubSystemMapping= ruleSubSystemMapping EOF )
+            // InternalETMap.g:242:2: iv_ruleSubSystemMapping= ruleSubSystemMapping EOF
             {
              newCompositeNode(grammarAccess.getSubSystemMappingRule()); 
-            pushFollow(FOLLOW_ruleSubSystemMapping_in_entryRuleSubSystemMapping434);
+            pushFollow(FOLLOW_1);
             iv_ruleSubSystemMapping=ruleSubSystemMapping();
 
             state._fsp--;
 
              current =iv_ruleSubSystemMapping; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSubSystemMapping444); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -558,7 +558,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleSubSystemMapping"
-    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:249:1: ruleSubSystemMapping returns [EObject current=null] : (otherlv_0= 'SubSystemMapping' ( (otherlv_1= RULE_ID ) ) otherlv_2= '->' ( (otherlv_3= RULE_ID ) ) (otherlv_4= '{' ( (lv_threadMappings_5_0= ruleThreadMapping ) )* otherlv_6= '}' )? ) ;
+    // InternalETMap.g:249:1: ruleSubSystemMapping returns [EObject current=null] : (otherlv_0= 'SubSystemMapping' ( (otherlv_1= RULE_ID ) ) otherlv_2= '->' ( (otherlv_3= RULE_ID ) ) (otherlv_4= '{' ( (lv_threadMappings_5_0= ruleThreadMapping ) )* otherlv_6= '}' )? ) ;
     public final EObject ruleSubSystemMapping() throws RecognitionException {
         EObject current = null;
 
@@ -574,28 +574,28 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:252:28: ( (otherlv_0= 'SubSystemMapping' ( (otherlv_1= RULE_ID ) ) otherlv_2= '->' ( (otherlv_3= RULE_ID ) ) (otherlv_4= '{' ( (lv_threadMappings_5_0= ruleThreadMapping ) )* otherlv_6= '}' )? ) )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:253:1: (otherlv_0= 'SubSystemMapping' ( (otherlv_1= RULE_ID ) ) otherlv_2= '->' ( (otherlv_3= RULE_ID ) ) (otherlv_4= '{' ( (lv_threadMappings_5_0= ruleThreadMapping ) )* otherlv_6= '}' )? )
+            // InternalETMap.g:252:28: ( (otherlv_0= 'SubSystemMapping' ( (otherlv_1= RULE_ID ) ) otherlv_2= '->' ( (otherlv_3= RULE_ID ) ) (otherlv_4= '{' ( (lv_threadMappings_5_0= ruleThreadMapping ) )* otherlv_6= '}' )? ) )
+            // InternalETMap.g:253:1: (otherlv_0= 'SubSystemMapping' ( (otherlv_1= RULE_ID ) ) otherlv_2= '->' ( (otherlv_3= RULE_ID ) ) (otherlv_4= '{' ( (lv_threadMappings_5_0= ruleThreadMapping ) )* otherlv_6= '}' )? )
             {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:253:1: (otherlv_0= 'SubSystemMapping' ( (otherlv_1= RULE_ID ) ) otherlv_2= '->' ( (otherlv_3= RULE_ID ) ) (otherlv_4= '{' ( (lv_threadMappings_5_0= ruleThreadMapping ) )* otherlv_6= '}' )? )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:253:3: otherlv_0= 'SubSystemMapping' ( (otherlv_1= RULE_ID ) ) otherlv_2= '->' ( (otherlv_3= RULE_ID ) ) (otherlv_4= '{' ( (lv_threadMappings_5_0= ruleThreadMapping ) )* otherlv_6= '}' )?
+            // InternalETMap.g:253:1: (otherlv_0= 'SubSystemMapping' ( (otherlv_1= RULE_ID ) ) otherlv_2= '->' ( (otherlv_3= RULE_ID ) ) (otherlv_4= '{' ( (lv_threadMappings_5_0= ruleThreadMapping ) )* otherlv_6= '}' )? )
+            // InternalETMap.g:253:3: otherlv_0= 'SubSystemMapping' ( (otherlv_1= RULE_ID ) ) otherlv_2= '->' ( (otherlv_3= RULE_ID ) ) (otherlv_4= '{' ( (lv_threadMappings_5_0= ruleThreadMapping ) )* otherlv_6= '}' )?
             {
-            otherlv_0=(Token)match(input,17,FOLLOW_17_in_ruleSubSystemMapping481); 
+            otherlv_0=(Token)match(input,17,FOLLOW_3); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getSubSystemMappingAccess().getSubSystemMappingKeyword_0());
                 
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:257:1: ( (otherlv_1= RULE_ID ) )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:258:1: (otherlv_1= RULE_ID )
+            // InternalETMap.g:257:1: ( (otherlv_1= RULE_ID ) )
+            // InternalETMap.g:258:1: (otherlv_1= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:258:1: (otherlv_1= RULE_ID )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:259:3: otherlv_1= RULE_ID
+            // InternalETMap.g:258:1: (otherlv_1= RULE_ID )
+            // InternalETMap.g:259:3: otherlv_1= RULE_ID
             {
 
             			if (current==null) {
             	            current = createModelElement(grammarAccess.getSubSystemMappingRule());
             	        }
                     
-            otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleSubSystemMapping501); 
+            otherlv_1=(Token)match(input,RULE_ID,FOLLOW_7); 
 
             		newLeafNode(otherlv_1, grammarAccess.getSubSystemMappingAccess().getLogicalSubSysSubSystemRefCrossReference_1_0()); 
             	
@@ -605,22 +605,22 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_2=(Token)match(input,16,FOLLOW_16_in_ruleSubSystemMapping513); 
+            otherlv_2=(Token)match(input,16,FOLLOW_3); 
 
                 	newLeafNode(otherlv_2, grammarAccess.getSubSystemMappingAccess().getHyphenMinusGreaterThanSignKeyword_2());
                 
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:274:1: ( (otherlv_3= RULE_ID ) )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:275:1: (otherlv_3= RULE_ID )
+            // InternalETMap.g:274:1: ( (otherlv_3= RULE_ID ) )
+            // InternalETMap.g:275:1: (otherlv_3= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:275:1: (otherlv_3= RULE_ID )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:276:3: otherlv_3= RULE_ID
+            // InternalETMap.g:275:1: (otherlv_3= RULE_ID )
+            // InternalETMap.g:276:3: otherlv_3= RULE_ID
             {
 
             			if (current==null) {
             	            current = createModelElement(grammarAccess.getSubSystemMappingRule());
             	        }
                     
-            otherlv_3=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleSubSystemMapping533); 
+            otherlv_3=(Token)match(input,RULE_ID,FOLLOW_9); 
 
             		newLeafNode(otherlv_3, grammarAccess.getSubSystemMappingAccess().getNodeNodeRefCrossReference_3_0()); 
             	
@@ -630,7 +630,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:287:2: (otherlv_4= '{' ( (lv_threadMappings_5_0= ruleThreadMapping ) )* otherlv_6= '}' )?
+            // InternalETMap.g:287:2: (otherlv_4= '{' ( (lv_threadMappings_5_0= ruleThreadMapping ) )* otherlv_6= '}' )?
             int alt5=2;
             int LA5_0 = input.LA(1);
 
@@ -639,13 +639,13 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
             }
             switch (alt5) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:287:4: otherlv_4= '{' ( (lv_threadMappings_5_0= ruleThreadMapping ) )* otherlv_6= '}'
+                    // InternalETMap.g:287:4: otherlv_4= '{' ( (lv_threadMappings_5_0= ruleThreadMapping ) )* otherlv_6= '}'
                     {
-                    otherlv_4=(Token)match(input,13,FOLLOW_13_in_ruleSubSystemMapping546); 
+                    otherlv_4=(Token)match(input,13,FOLLOW_10); 
 
                         	newLeafNode(otherlv_4, grammarAccess.getSubSystemMappingAccess().getLeftCurlyBracketKeyword_4_0());
                         
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:291:1: ( (lv_threadMappings_5_0= ruleThreadMapping ) )*
+                    // InternalETMap.g:291:1: ( (lv_threadMappings_5_0= ruleThreadMapping ) )*
                     loop4:
                     do {
                         int alt4=2;
@@ -658,15 +658,15 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
                         switch (alt4) {
                     	case 1 :
-                    	    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:292:1: (lv_threadMappings_5_0= ruleThreadMapping )
+                    	    // InternalETMap.g:292:1: (lv_threadMappings_5_0= ruleThreadMapping )
                     	    {
-                    	    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:292:1: (lv_threadMappings_5_0= ruleThreadMapping )
-                    	    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:293:3: lv_threadMappings_5_0= ruleThreadMapping
+                    	    // InternalETMap.g:292:1: (lv_threadMappings_5_0= ruleThreadMapping )
+                    	    // InternalETMap.g:293:3: lv_threadMappings_5_0= ruleThreadMapping
                     	    {
                     	     
                     	    	        newCompositeNode(grammarAccess.getSubSystemMappingAccess().getThreadMappingsThreadMappingParserRuleCall_4_1_0()); 
                     	    	    
-                    	    pushFollow(FOLLOW_ruleThreadMapping_in_ruleSubSystemMapping567);
+                    	    pushFollow(FOLLOW_10);
                     	    lv_threadMappings_5_0=ruleThreadMapping();
 
                     	    state._fsp--;
@@ -679,7 +679,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
                     	           			current, 
                     	           			"threadMappings",
                     	            		lv_threadMappings_5_0, 
-                    	            		"ThreadMapping");
+                    	            		"org.eclipse.etrice.core.etmap.ETMap.ThreadMapping");
                     	    	        afterParserOrEnumRuleCall();
                     	    	    
 
@@ -694,7 +694,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
                         }
                     } while (true);
 
-                    otherlv_6=(Token)match(input,14,FOLLOW_14_in_ruleSubSystemMapping580); 
+                    otherlv_6=(Token)match(input,14,FOLLOW_2); 
 
                         	newLeafNode(otherlv_6, grammarAccess.getSubSystemMappingAccess().getRightCurlyBracketKeyword_4_2());
                         
@@ -725,7 +725,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleThreadMapping"
-    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:321:1: entryRuleThreadMapping returns [EObject current=null] : iv_ruleThreadMapping= ruleThreadMapping EOF ;
+    // InternalETMap.g:321:1: entryRuleThreadMapping returns [EObject current=null] : iv_ruleThreadMapping= ruleThreadMapping EOF ;
     public final EObject entryRuleThreadMapping() throws RecognitionException {
         EObject current = null;
 
@@ -733,17 +733,17 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:322:2: (iv_ruleThreadMapping= ruleThreadMapping EOF )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:323:2: iv_ruleThreadMapping= ruleThreadMapping EOF
+            // InternalETMap.g:322:2: (iv_ruleThreadMapping= ruleThreadMapping EOF )
+            // InternalETMap.g:323:2: iv_ruleThreadMapping= ruleThreadMapping EOF
             {
              newCompositeNode(grammarAccess.getThreadMappingRule()); 
-            pushFollow(FOLLOW_ruleThreadMapping_in_entryRuleThreadMapping618);
+            pushFollow(FOLLOW_1);
             iv_ruleThreadMapping=ruleThreadMapping();
 
             state._fsp--;
 
              current =iv_ruleThreadMapping; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleThreadMapping628); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -761,7 +761,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleThreadMapping"
-    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:330:1: ruleThreadMapping returns [EObject current=null] : (otherlv_0= 'ThreadMapping' ( (otherlv_1= RULE_ID ) ) otherlv_2= '->' ( (otherlv_3= RULE_ID ) ) ) ;
+    // InternalETMap.g:330:1: ruleThreadMapping returns [EObject current=null] : (otherlv_0= 'ThreadMapping' ( (otherlv_1= RULE_ID ) ) otherlv_2= '->' ( (otherlv_3= RULE_ID ) ) ) ;
     public final EObject ruleThreadMapping() throws RecognitionException {
         EObject current = null;
 
@@ -773,28 +773,28 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:333:28: ( (otherlv_0= 'ThreadMapping' ( (otherlv_1= RULE_ID ) ) otherlv_2= '->' ( (otherlv_3= RULE_ID ) ) ) )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:334:1: (otherlv_0= 'ThreadMapping' ( (otherlv_1= RULE_ID ) ) otherlv_2= '->' ( (otherlv_3= RULE_ID ) ) )
+            // InternalETMap.g:333:28: ( (otherlv_0= 'ThreadMapping' ( (otherlv_1= RULE_ID ) ) otherlv_2= '->' ( (otherlv_3= RULE_ID ) ) ) )
+            // InternalETMap.g:334:1: (otherlv_0= 'ThreadMapping' ( (otherlv_1= RULE_ID ) ) otherlv_2= '->' ( (otherlv_3= RULE_ID ) ) )
             {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:334:1: (otherlv_0= 'ThreadMapping' ( (otherlv_1= RULE_ID ) ) otherlv_2= '->' ( (otherlv_3= RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:334:3: otherlv_0= 'ThreadMapping' ( (otherlv_1= RULE_ID ) ) otherlv_2= '->' ( (otherlv_3= RULE_ID ) )
+            // InternalETMap.g:334:1: (otherlv_0= 'ThreadMapping' ( (otherlv_1= RULE_ID ) ) otherlv_2= '->' ( (otherlv_3= RULE_ID ) ) )
+            // InternalETMap.g:334:3: otherlv_0= 'ThreadMapping' ( (otherlv_1= RULE_ID ) ) otherlv_2= '->' ( (otherlv_3= RULE_ID ) )
             {
-            otherlv_0=(Token)match(input,18,FOLLOW_18_in_ruleThreadMapping665); 
+            otherlv_0=(Token)match(input,18,FOLLOW_3); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getThreadMappingAccess().getThreadMappingKeyword_0());
                 
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:338:1: ( (otherlv_1= RULE_ID ) )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:339:1: (otherlv_1= RULE_ID )
+            // InternalETMap.g:338:1: ( (otherlv_1= RULE_ID ) )
+            // InternalETMap.g:339:1: (otherlv_1= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:339:1: (otherlv_1= RULE_ID )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:340:3: otherlv_1= RULE_ID
+            // InternalETMap.g:339:1: (otherlv_1= RULE_ID )
+            // InternalETMap.g:340:3: otherlv_1= RULE_ID
             {
 
             			if (current==null) {
             	            current = createModelElement(grammarAccess.getThreadMappingRule());
             	        }
                     
-            otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleThreadMapping685); 
+            otherlv_1=(Token)match(input,RULE_ID,FOLLOW_7); 
 
             		newLeafNode(otherlv_1, grammarAccess.getThreadMappingAccess().getLogicalThreadLogicalThreadCrossReference_1_0()); 
             	
@@ -804,22 +804,22 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_2=(Token)match(input,16,FOLLOW_16_in_ruleThreadMapping697); 
+            otherlv_2=(Token)match(input,16,FOLLOW_3); 
 
                 	newLeafNode(otherlv_2, grammarAccess.getThreadMappingAccess().getHyphenMinusGreaterThanSignKeyword_2());
                 
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:355:1: ( (otherlv_3= RULE_ID ) )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:356:1: (otherlv_3= RULE_ID )
+            // InternalETMap.g:355:1: ( (otherlv_3= RULE_ID ) )
+            // InternalETMap.g:356:1: (otherlv_3= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:356:1: (otherlv_3= RULE_ID )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:357:3: otherlv_3= RULE_ID
+            // InternalETMap.g:356:1: (otherlv_3= RULE_ID )
+            // InternalETMap.g:357:3: otherlv_3= RULE_ID
             {
 
             			if (current==null) {
             	            current = createModelElement(grammarAccess.getThreadMappingRule());
             	        }
                     
-            otherlv_3=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleThreadMapping717); 
+            otherlv_3=(Token)match(input,RULE_ID,FOLLOW_2); 
 
             		newLeafNode(otherlv_3, grammarAccess.getThreadMappingAccess().getPhysicalThreadPhysicalThreadCrossReference_3_0()); 
             	
@@ -850,7 +850,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleKeyValue"
-    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:378:1: entryRuleKeyValue returns [EObject current=null] : iv_ruleKeyValue= ruleKeyValue EOF ;
+    // InternalETMap.g:378:1: entryRuleKeyValue returns [EObject current=null] : iv_ruleKeyValue= ruleKeyValue EOF ;
     public final EObject entryRuleKeyValue() throws RecognitionException {
         EObject current = null;
 
@@ -858,17 +858,17 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:379:2: (iv_ruleKeyValue= ruleKeyValue EOF )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:380:2: iv_ruleKeyValue= ruleKeyValue EOF
+            // InternalETMap.g:379:2: (iv_ruleKeyValue= ruleKeyValue EOF )
+            // InternalETMap.g:380:2: iv_ruleKeyValue= ruleKeyValue EOF
             {
              newCompositeNode(grammarAccess.getKeyValueRule()); 
-            pushFollow(FOLLOW_ruleKeyValue_in_entryRuleKeyValue755);
+            pushFollow(FOLLOW_1);
             iv_ruleKeyValue=ruleKeyValue();
 
             state._fsp--;
 
              current =iv_ruleKeyValue; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleKeyValue765); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -886,7 +886,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleKeyValue"
-    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:387:1: ruleKeyValue returns [EObject current=null] : ( ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) ) ) ;
+    // InternalETMap.g:387: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;
 
@@ -898,19 +898,19 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:390:28: ( ( ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) ) ) )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:391:1: ( ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) ) )
+            // InternalETMap.g:390:28: ( ( ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) ) ) )
+            // InternalETMap.g:391:1: ( ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) ) )
             {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:391:1: ( ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) ) )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:391:2: ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) )
+            // InternalETMap.g:391:1: ( ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) ) )
+            // InternalETMap.g:391:2: ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) )
             {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:391:2: ( (lv_key_0_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:392:1: (lv_key_0_0= RULE_ID )
+            // InternalETMap.g:391:2: ( (lv_key_0_0= RULE_ID ) )
+            // InternalETMap.g:392:1: (lv_key_0_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:392:1: (lv_key_0_0= RULE_ID )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:393:3: lv_key_0_0= RULE_ID
+            // InternalETMap.g:392:1: (lv_key_0_0= RULE_ID )
+            // InternalETMap.g:393:3: lv_key_0_0= RULE_ID
             {
-            lv_key_0_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleKeyValue807); 
+            lv_key_0_0=(Token)match(input,RULE_ID,FOLLOW_11); 
 
             			newLeafNode(lv_key_0_0, grammarAccess.getKeyValueAccess().getKeyIDTerminalRuleCall_0_0()); 
             		
@@ -922,7 +922,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"key",
                     		lv_key_0_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -930,20 +930,20 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,19,FOLLOW_19_in_ruleKeyValue824); 
+            otherlv_1=(Token)match(input,19,FOLLOW_12); 
 
                 	newLeafNode(otherlv_1, grammarAccess.getKeyValueAccess().getEqualsSignKeyword_1());
                 
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:413:1: ( (lv_value_2_0= ruleLiteral ) )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:414:1: (lv_value_2_0= ruleLiteral )
+            // InternalETMap.g:413:1: ( (lv_value_2_0= ruleLiteral ) )
+            // InternalETMap.g:414:1: (lv_value_2_0= ruleLiteral )
             {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:414:1: (lv_value_2_0= ruleLiteral )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:415:3: lv_value_2_0= ruleLiteral
+            // InternalETMap.g:414:1: (lv_value_2_0= ruleLiteral )
+            // InternalETMap.g:415:3: lv_value_2_0= ruleLiteral
             {
              
             	        newCompositeNode(grammarAccess.getKeyValueAccess().getValueLiteralParserRuleCall_2_0()); 
             	    
-            pushFollow(FOLLOW_ruleLiteral_in_ruleKeyValue845);
+            pushFollow(FOLLOW_2);
             lv_value_2_0=ruleLiteral();
 
             state._fsp--;
@@ -956,7 +956,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"value",
                     		lv_value_2_0, 
-                    		"Literal");
+                    		"org.eclipse.etrice.core.common.Base.Literal");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -986,7 +986,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleAnnotationTargetType"
-    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:441:1: entryRuleAnnotationTargetType returns [String current=null] : iv_ruleAnnotationTargetType= ruleAnnotationTargetType EOF ;
+    // InternalETMap.g:441:1: entryRuleAnnotationTargetType returns [String current=null] : iv_ruleAnnotationTargetType= ruleAnnotationTargetType EOF ;
     public final String entryRuleAnnotationTargetType() throws RecognitionException {
         String current = null;
 
@@ -994,17 +994,17 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:442:2: (iv_ruleAnnotationTargetType= ruleAnnotationTargetType EOF )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:443:2: iv_ruleAnnotationTargetType= ruleAnnotationTargetType EOF
+            // InternalETMap.g:442:2: (iv_ruleAnnotationTargetType= ruleAnnotationTargetType EOF )
+            // InternalETMap.g:443:2: iv_ruleAnnotationTargetType= ruleAnnotationTargetType EOF
             {
              newCompositeNode(grammarAccess.getAnnotationTargetTypeRule()); 
-            pushFollow(FOLLOW_ruleAnnotationTargetType_in_entryRuleAnnotationTargetType884);
+            pushFollow(FOLLOW_1);
             iv_ruleAnnotationTargetType=ruleAnnotationTargetType();
 
             state._fsp--;
 
              current =iv_ruleAnnotationTargetType.getText(); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAnnotationTargetType895); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1022,7 +1022,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleAnnotationTargetType"
-    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:450:1: ruleAnnotationTargetType returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_ID_0= RULE_ID ;
+    // InternalETMap.g:450:1: ruleAnnotationTargetType returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_ID_0= RULE_ID ;
     public final AntlrDatatypeRuleToken ruleAnnotationTargetType() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -1031,10 +1031,10 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:453:28: (this_ID_0= RULE_ID )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:454:5: this_ID_0= RULE_ID
+            // InternalETMap.g:453:28: (this_ID_0= RULE_ID )
+            // InternalETMap.g:454:5: this_ID_0= RULE_ID
             {
-            this_ID_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleAnnotationTargetType934); 
+            this_ID_0=(Token)match(input,RULE_ID,FOLLOW_2); 
 
             		current.merge(this_ID_0);
                 
@@ -1059,7 +1059,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleAnnotationAttribute"
-    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:469:1: entryRuleAnnotationAttribute returns [EObject current=null] : iv_ruleAnnotationAttribute= ruleAnnotationAttribute EOF ;
+    // InternalETMap.g:469:1: entryRuleAnnotationAttribute returns [EObject current=null] : iv_ruleAnnotationAttribute= ruleAnnotationAttribute EOF ;
     public final EObject entryRuleAnnotationAttribute() throws RecognitionException {
         EObject current = null;
 
@@ -1067,17 +1067,17 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:470:2: (iv_ruleAnnotationAttribute= ruleAnnotationAttribute EOF )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:471:2: iv_ruleAnnotationAttribute= ruleAnnotationAttribute EOF
+            // InternalETMap.g:470:2: (iv_ruleAnnotationAttribute= ruleAnnotationAttribute EOF )
+            // InternalETMap.g:471:2: iv_ruleAnnotationAttribute= ruleAnnotationAttribute EOF
             {
              newCompositeNode(grammarAccess.getAnnotationAttributeRule()); 
-            pushFollow(FOLLOW_ruleAnnotationAttribute_in_entryRuleAnnotationAttribute978);
+            pushFollow(FOLLOW_1);
             iv_ruleAnnotationAttribute=ruleAnnotationAttribute();
 
             state._fsp--;
 
              current =iv_ruleAnnotationAttribute; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAnnotationAttribute988); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1095,7 +1095,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleAnnotationAttribute"
-    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:478:1: ruleAnnotationAttribute returns [EObject current=null] : (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute ) ;
+    // InternalETMap.g:478:1: ruleAnnotationAttribute returns [EObject current=null] : (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute ) ;
     public final EObject ruleAnnotationAttribute() throws RecognitionException {
         EObject current = null;
 
@@ -1107,10 +1107,10 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:481:28: ( (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute ) )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:482:1: (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute )
+            // InternalETMap.g:481:28: ( (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute ) )
+            // InternalETMap.g:482:1: (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute )
             {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:482:1: (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute )
+            // InternalETMap.g:482:1: (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute )
             int alt6=2;
             int LA6_0 = input.LA(1);
 
@@ -1214,12 +1214,12 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
             }
             switch (alt6) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:483:5: this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute
+                    // InternalETMap.g:483:5: this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute
                     {
                      
                             newCompositeNode(grammarAccess.getAnnotationAttributeAccess().getSimpleAnnotationAttributeParserRuleCall_0()); 
                         
-                    pushFollow(FOLLOW_ruleSimpleAnnotationAttribute_in_ruleAnnotationAttribute1035);
+                    pushFollow(FOLLOW_2);
                     this_SimpleAnnotationAttribute_0=ruleSimpleAnnotationAttribute();
 
                     state._fsp--;
@@ -1232,12 +1232,12 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:493:5: this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute
+                    // InternalETMap.g:493:5: this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute
                     {
                      
                             newCompositeNode(grammarAccess.getAnnotationAttributeAccess().getEnumAnnotationAttributeParserRuleCall_1()); 
                         
-                    pushFollow(FOLLOW_ruleEnumAnnotationAttribute_in_ruleAnnotationAttribute1062);
+                    pushFollow(FOLLOW_2);
                     this_EnumAnnotationAttribute_1=ruleEnumAnnotationAttribute();
 
                     state._fsp--;
@@ -1270,7 +1270,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleSimpleAnnotationAttribute"
-    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:509:1: entryRuleSimpleAnnotationAttribute returns [EObject current=null] : iv_ruleSimpleAnnotationAttribute= ruleSimpleAnnotationAttribute EOF ;
+    // InternalETMap.g:509:1: entryRuleSimpleAnnotationAttribute returns [EObject current=null] : iv_ruleSimpleAnnotationAttribute= ruleSimpleAnnotationAttribute EOF ;
     public final EObject entryRuleSimpleAnnotationAttribute() throws RecognitionException {
         EObject current = null;
 
@@ -1278,17 +1278,17 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:510:2: (iv_ruleSimpleAnnotationAttribute= ruleSimpleAnnotationAttribute EOF )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:511:2: iv_ruleSimpleAnnotationAttribute= ruleSimpleAnnotationAttribute EOF
+            // InternalETMap.g:510:2: (iv_ruleSimpleAnnotationAttribute= ruleSimpleAnnotationAttribute EOF )
+            // InternalETMap.g:511:2: iv_ruleSimpleAnnotationAttribute= ruleSimpleAnnotationAttribute EOF
             {
              newCompositeNode(grammarAccess.getSimpleAnnotationAttributeRule()); 
-            pushFollow(FOLLOW_ruleSimpleAnnotationAttribute_in_entryRuleSimpleAnnotationAttribute1097);
+            pushFollow(FOLLOW_1);
             iv_ruleSimpleAnnotationAttribute=ruleSimpleAnnotationAttribute();
 
             state._fsp--;
 
              current =iv_ruleSimpleAnnotationAttribute; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSimpleAnnotationAttribute1107); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1306,7 +1306,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleSimpleAnnotationAttribute"
-    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:518: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 ) ) ) ;
+    // InternalETMap.g:518: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;
 
@@ -1321,13 +1321,13 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:521: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.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:522: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 ) ) )
+            // InternalETMap.g:521: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 ) ) ) )
+            // InternalETMap.g:522: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.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:522: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.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:522: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 ) )
+            // InternalETMap.g:522: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 ) ) )
+            // InternalETMap.g:522: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.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:522:2: ( ( (lv_optional_0_0= 'optional' ) ) | otherlv_1= 'mandatory' )
+            // InternalETMap.g:522:2: ( ( (lv_optional_0_0= 'optional' ) ) | otherlv_1= 'mandatory' )
             int alt7=2;
             int LA7_0 = input.LA(1);
 
@@ -1345,15 +1345,15 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
             }
             switch (alt7) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:522:3: ( (lv_optional_0_0= 'optional' ) )
+                    // InternalETMap.g:522:3: ( (lv_optional_0_0= 'optional' ) )
                     {
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:522:3: ( (lv_optional_0_0= 'optional' ) )
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:523:1: (lv_optional_0_0= 'optional' )
+                    // InternalETMap.g:522:3: ( (lv_optional_0_0= 'optional' ) )
+                    // InternalETMap.g:523:1: (lv_optional_0_0= 'optional' )
                     {
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:523:1: (lv_optional_0_0= 'optional' )
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:524:3: lv_optional_0_0= 'optional'
+                    // InternalETMap.g:523:1: (lv_optional_0_0= 'optional' )
+                    // InternalETMap.g:524:3: lv_optional_0_0= 'optional'
                     {
-                    lv_optional_0_0=(Token)match(input,20,FOLLOW_20_in_ruleSimpleAnnotationAttribute1151); 
+                    lv_optional_0_0=(Token)match(input,20,FOLLOW_13); 
 
                             newLeafNode(lv_optional_0_0, grammarAccess.getSimpleAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0());
                         
@@ -1373,9 +1373,9 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:538:7: otherlv_1= 'mandatory'
+                    // InternalETMap.g:538:7: otherlv_1= 'mandatory'
                     {
-                    otherlv_1=(Token)match(input,21,FOLLOW_21_in_ruleSimpleAnnotationAttribute1182); 
+                    otherlv_1=(Token)match(input,21,FOLLOW_13); 
 
                         	newLeafNode(otherlv_1, grammarAccess.getSimpleAnnotationAttributeAccess().getMandatoryKeyword_0_1());
                         
@@ -1385,17 +1385,17 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_2=(Token)match(input,22,FOLLOW_22_in_ruleSimpleAnnotationAttribute1195); 
+            otherlv_2=(Token)match(input,22,FOLLOW_3); 
 
                 	newLeafNode(otherlv_2, grammarAccess.getSimpleAnnotationAttributeAccess().getAttributeKeyword_1());
                 
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:546:1: ( (lv_name_3_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:547:1: (lv_name_3_0= RULE_ID )
+            // InternalETMap.g:546:1: ( (lv_name_3_0= RULE_ID ) )
+            // InternalETMap.g:547:1: (lv_name_3_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:547:1: (lv_name_3_0= RULE_ID )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:548:3: lv_name_3_0= RULE_ID
+            // InternalETMap.g:547:1: (lv_name_3_0= RULE_ID )
+            // InternalETMap.g:548:3: lv_name_3_0= RULE_ID
             {
-            lv_name_3_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleSimpleAnnotationAttribute1212); 
+            lv_name_3_0=(Token)match(input,RULE_ID,FOLLOW_14); 
 
             			newLeafNode(lv_name_3_0, grammarAccess.getSimpleAnnotationAttributeAccess().getNameIDTerminalRuleCall_2_0()); 
             		
@@ -1407,7 +1407,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"name",
                     		lv_name_3_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -1415,20 +1415,20 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_4=(Token)match(input,23,FOLLOW_23_in_ruleSimpleAnnotationAttribute1229); 
+            otherlv_4=(Token)match(input,23,FOLLOW_15); 
 
                 	newLeafNode(otherlv_4, grammarAccess.getSimpleAnnotationAttributeAccess().getColonKeyword_3());
                 
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:568:1: ( (lv_type_5_0= ruleLiteralType ) )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:569:1: (lv_type_5_0= ruleLiteralType )
+            // InternalETMap.g:568:1: ( (lv_type_5_0= ruleLiteralType ) )
+            // InternalETMap.g:569:1: (lv_type_5_0= ruleLiteralType )
             {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:569:1: (lv_type_5_0= ruleLiteralType )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:570:3: lv_type_5_0= ruleLiteralType
+            // InternalETMap.g:569:1: (lv_type_5_0= ruleLiteralType )
+            // InternalETMap.g:570:3: lv_type_5_0= ruleLiteralType
             {
              
             	        newCompositeNode(grammarAccess.getSimpleAnnotationAttributeAccess().getTypeLiteralTypeEnumRuleCall_4_0()); 
             	    
-            pushFollow(FOLLOW_ruleLiteralType_in_ruleSimpleAnnotationAttribute1250);
+            pushFollow(FOLLOW_2);
             lv_type_5_0=ruleLiteralType();
 
             state._fsp--;
@@ -1441,7 +1441,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"type",
                     		lv_type_5_0, 
-                    		"LiteralType");
+                    		"org.eclipse.etrice.core.common.Base.LiteralType");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -1471,7 +1471,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleEnumAnnotationAttribute"
-    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:594:1: entryRuleEnumAnnotationAttribute returns [EObject current=null] : iv_ruleEnumAnnotationAttribute= ruleEnumAnnotationAttribute EOF ;
+    // InternalETMap.g:594:1: entryRuleEnumAnnotationAttribute returns [EObject current=null] : iv_ruleEnumAnnotationAttribute= ruleEnumAnnotationAttribute EOF ;
     public final EObject entryRuleEnumAnnotationAttribute() throws RecognitionException {
         EObject current = null;
 
@@ -1479,17 +1479,17 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:595:2: (iv_ruleEnumAnnotationAttribute= ruleEnumAnnotationAttribute EOF )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:596:2: iv_ruleEnumAnnotationAttribute= ruleEnumAnnotationAttribute EOF
+            // InternalETMap.g:595:2: (iv_ruleEnumAnnotationAttribute= ruleEnumAnnotationAttribute EOF )
+            // InternalETMap.g:596:2: iv_ruleEnumAnnotationAttribute= ruleEnumAnnotationAttribute EOF
             {
              newCompositeNode(grammarAccess.getEnumAnnotationAttributeRule()); 
-            pushFollow(FOLLOW_ruleEnumAnnotationAttribute_in_entryRuleEnumAnnotationAttribute1286);
+            pushFollow(FOLLOW_1);
             iv_ruleEnumAnnotationAttribute=ruleEnumAnnotationAttribute();
 
             state._fsp--;
 
              current =iv_ruleEnumAnnotationAttribute; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleEnumAnnotationAttribute1296); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1507,7 +1507,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleEnumAnnotationAttribute"
-    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:603: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= '}' ) ;
+    // InternalETMap.g:603: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;
 
@@ -1525,13 +1525,13 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:606: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.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:607: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= '}' )
+            // InternalETMap.g:606: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= '}' ) )
+            // InternalETMap.g:607: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.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:607: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.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:607: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= '}'
+            // InternalETMap.g:607: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= '}' )
+            // InternalETMap.g:607: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.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:607:2: ( ( (lv_optional_0_0= 'optional' ) ) | otherlv_1= 'mandatory' )
+            // InternalETMap.g:607:2: ( ( (lv_optional_0_0= 'optional' ) ) | otherlv_1= 'mandatory' )
             int alt8=2;
             int LA8_0 = input.LA(1);
 
@@ -1549,15 +1549,15 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
             }
             switch (alt8) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:607:3: ( (lv_optional_0_0= 'optional' ) )
+                    // InternalETMap.g:607:3: ( (lv_optional_0_0= 'optional' ) )
                     {
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:607:3: ( (lv_optional_0_0= 'optional' ) )
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:608:1: (lv_optional_0_0= 'optional' )
+                    // InternalETMap.g:607:3: ( (lv_optional_0_0= 'optional' ) )
+                    // InternalETMap.g:608:1: (lv_optional_0_0= 'optional' )
                     {
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:608:1: (lv_optional_0_0= 'optional' )
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:609:3: lv_optional_0_0= 'optional'
+                    // InternalETMap.g:608:1: (lv_optional_0_0= 'optional' )
+                    // InternalETMap.g:609:3: lv_optional_0_0= 'optional'
                     {
-                    lv_optional_0_0=(Token)match(input,20,FOLLOW_20_in_ruleEnumAnnotationAttribute1340); 
+                    lv_optional_0_0=(Token)match(input,20,FOLLOW_13); 
 
                             newLeafNode(lv_optional_0_0, grammarAccess.getEnumAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0());
                         
@@ -1577,9 +1577,9 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:623:7: otherlv_1= 'mandatory'
+                    // InternalETMap.g:623:7: otherlv_1= 'mandatory'
                     {
-                    otherlv_1=(Token)match(input,21,FOLLOW_21_in_ruleEnumAnnotationAttribute1371); 
+                    otherlv_1=(Token)match(input,21,FOLLOW_13); 
 
                         	newLeafNode(otherlv_1, grammarAccess.getEnumAnnotationAttributeAccess().getMandatoryKeyword_0_1());
                         
@@ -1589,17 +1589,17 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_2=(Token)match(input,22,FOLLOW_22_in_ruleEnumAnnotationAttribute1384); 
+            otherlv_2=(Token)match(input,22,FOLLOW_3); 
 
                 	newLeafNode(otherlv_2, grammarAccess.getEnumAnnotationAttributeAccess().getAttributeKeyword_1());
                 
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:631:1: ( (lv_name_3_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:632:1: (lv_name_3_0= RULE_ID )
+            // InternalETMap.g:631:1: ( (lv_name_3_0= RULE_ID ) )
+            // InternalETMap.g:632:1: (lv_name_3_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:632:1: (lv_name_3_0= RULE_ID )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:633:3: lv_name_3_0= RULE_ID
+            // InternalETMap.g:632:1: (lv_name_3_0= RULE_ID )
+            // InternalETMap.g:633:3: lv_name_3_0= RULE_ID
             {
-            lv_name_3_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEnumAnnotationAttribute1401); 
+            lv_name_3_0=(Token)match(input,RULE_ID,FOLLOW_14); 
 
             			newLeafNode(lv_name_3_0, grammarAccess.getEnumAnnotationAttributeAccess().getNameIDTerminalRuleCall_2_0()); 
             		
@@ -1611,7 +1611,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"name",
                     		lv_name_3_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -1619,21 +1619,21 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_4=(Token)match(input,23,FOLLOW_23_in_ruleEnumAnnotationAttribute1418); 
+            otherlv_4=(Token)match(input,23,FOLLOW_4); 
 
                 	newLeafNode(otherlv_4, grammarAccess.getEnumAnnotationAttributeAccess().getColonKeyword_3());
                 
-            otherlv_5=(Token)match(input,13,FOLLOW_13_in_ruleEnumAnnotationAttribute1430); 
+            otherlv_5=(Token)match(input,13,FOLLOW_16); 
 
                 	newLeafNode(otherlv_5, grammarAccess.getEnumAnnotationAttributeAccess().getLeftCurlyBracketKeyword_4());
                 
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:657:1: ( (lv_values_6_0= RULE_STRING ) )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:658:1: (lv_values_6_0= RULE_STRING )
+            // InternalETMap.g:657:1: ( (lv_values_6_0= RULE_STRING ) )
+            // InternalETMap.g:658:1: (lv_values_6_0= RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:658:1: (lv_values_6_0= RULE_STRING )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:659:3: lv_values_6_0= RULE_STRING
+            // InternalETMap.g:658:1: (lv_values_6_0= RULE_STRING )
+            // InternalETMap.g:659:3: lv_values_6_0= RULE_STRING
             {
-            lv_values_6_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleEnumAnnotationAttribute1447); 
+            lv_values_6_0=(Token)match(input,RULE_STRING,FOLLOW_17); 
 
             			newLeafNode(lv_values_6_0, grammarAccess.getEnumAnnotationAttributeAccess().getValuesSTRINGTerminalRuleCall_5_0()); 
             		
@@ -1645,7 +1645,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"values",
                     		lv_values_6_0, 
-                    		"STRING");
+                    		"org.eclipse.xtext.common.Terminals.STRING");
             	    
 
             }
@@ -1653,7 +1653,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:675:2: (otherlv_7= ',' ( (lv_values_8_0= RULE_STRING ) ) )*
+            // InternalETMap.g:675:2: (otherlv_7= ',' ( (lv_values_8_0= RULE_STRING ) ) )*
             loop9:
             do {
                 int alt9=2;
@@ -1666,19 +1666,19 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
                 switch (alt9) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:675:4: otherlv_7= ',' ( (lv_values_8_0= RULE_STRING ) )
+            	    // InternalETMap.g:675:4: otherlv_7= ',' ( (lv_values_8_0= RULE_STRING ) )
             	    {
-            	    otherlv_7=(Token)match(input,24,FOLLOW_24_in_ruleEnumAnnotationAttribute1465); 
+            	    otherlv_7=(Token)match(input,24,FOLLOW_16); 
 
             	        	newLeafNode(otherlv_7, grammarAccess.getEnumAnnotationAttributeAccess().getCommaKeyword_6_0());
             	        
-            	    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:679:1: ( (lv_values_8_0= RULE_STRING ) )
-            	    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:680:1: (lv_values_8_0= RULE_STRING )
+            	    // InternalETMap.g:679:1: ( (lv_values_8_0= RULE_STRING ) )
+            	    // InternalETMap.g:680:1: (lv_values_8_0= RULE_STRING )
             	    {
-            	    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:680:1: (lv_values_8_0= RULE_STRING )
-            	    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:681:3: lv_values_8_0= RULE_STRING
+            	    // InternalETMap.g:680:1: (lv_values_8_0= RULE_STRING )
+            	    // InternalETMap.g:681:3: lv_values_8_0= RULE_STRING
             	    {
-            	    lv_values_8_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleEnumAnnotationAttribute1482); 
+            	    lv_values_8_0=(Token)match(input,RULE_STRING,FOLLOW_17); 
 
             	    			newLeafNode(lv_values_8_0, grammarAccess.getEnumAnnotationAttributeAccess().getValuesSTRINGTerminalRuleCall_6_1_0()); 
             	    		
@@ -1690,7 +1690,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"values",
             	            		lv_values_8_0, 
-            	            		"STRING");
+            	            		"org.eclipse.xtext.common.Terminals.STRING");
             	    	    
 
             	    }
@@ -1707,7 +1707,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
                 }
             } while (true);
 
-            otherlv_9=(Token)match(input,14,FOLLOW_14_in_ruleEnumAnnotationAttribute1501); 
+            otherlv_9=(Token)match(input,14,FOLLOW_2); 
 
                 	newLeafNode(otherlv_9, grammarAccess.getEnumAnnotationAttributeAccess().getRightCurlyBracketKeyword_7());
                 
@@ -1732,7 +1732,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleImport"
-    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:709:1: entryRuleImport returns [EObject current=null] : iv_ruleImport= ruleImport EOF ;
+    // InternalETMap.g:709:1: entryRuleImport returns [EObject current=null] : iv_ruleImport= ruleImport EOF ;
     public final EObject entryRuleImport() throws RecognitionException {
         EObject current = null;
 
@@ -1740,17 +1740,17 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:710:2: (iv_ruleImport= ruleImport EOF )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:711:2: iv_ruleImport= ruleImport EOF
+            // InternalETMap.g:710:2: (iv_ruleImport= ruleImport EOF )
+            // InternalETMap.g:711:2: iv_ruleImport= ruleImport EOF
             {
              newCompositeNode(grammarAccess.getImportRule()); 
-            pushFollow(FOLLOW_ruleImport_in_entryRuleImport1537);
+            pushFollow(FOLLOW_1);
             iv_ruleImport=ruleImport();
 
             state._fsp--;
 
              current =iv_ruleImport; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleImport1547); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1768,7 +1768,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleImport"
-    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:718:1: ruleImport returns [EObject current=null] : (otherlv_0= 'import' ( ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' ) | otherlv_3= 'model' ) ( (lv_importURI_4_0= RULE_STRING ) ) ) ;
+    // InternalETMap.g:718:1: ruleImport returns [EObject current=null] : (otherlv_0= 'import' ( ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' ) | otherlv_3= 'model' ) ( (lv_importURI_4_0= RULE_STRING ) ) ) ;
     public final EObject ruleImport() throws RecognitionException {
         EObject current = null;
 
@@ -1782,17 +1782,17 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:721:28: ( (otherlv_0= 'import' ( ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' ) | otherlv_3= 'model' ) ( (lv_importURI_4_0= RULE_STRING ) ) ) )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:722:1: (otherlv_0= 'import' ( ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' ) | otherlv_3= 'model' ) ( (lv_importURI_4_0= RULE_STRING ) ) )
+            // InternalETMap.g:721:28: ( (otherlv_0= 'import' ( ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' ) | otherlv_3= 'model' ) ( (lv_importURI_4_0= RULE_STRING ) ) ) )
+            // InternalETMap.g:722:1: (otherlv_0= 'import' ( ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' ) | otherlv_3= 'model' ) ( (lv_importURI_4_0= RULE_STRING ) ) )
             {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:722:1: (otherlv_0= 'import' ( ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' ) | otherlv_3= 'model' ) ( (lv_importURI_4_0= RULE_STRING ) ) )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:722:3: otherlv_0= 'import' ( ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' ) | otherlv_3= 'model' ) ( (lv_importURI_4_0= RULE_STRING ) )
+            // InternalETMap.g:722:1: (otherlv_0= 'import' ( ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' ) | otherlv_3= 'model' ) ( (lv_importURI_4_0= RULE_STRING ) ) )
+            // InternalETMap.g:722:3: otherlv_0= 'import' ( ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' ) | otherlv_3= 'model' ) ( (lv_importURI_4_0= RULE_STRING ) )
             {
-            otherlv_0=(Token)match(input,25,FOLLOW_25_in_ruleImport1584); 
+            otherlv_0=(Token)match(input,25,FOLLOW_18); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getImportAccess().getImportKeyword_0());
                 
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:726:1: ( ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' ) | otherlv_3= 'model' )
+            // InternalETMap.g:726:1: ( ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' ) | otherlv_3= 'model' )
             int alt10=2;
             int LA10_0 = input.LA(1);
 
@@ -1810,21 +1810,21 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
             }
             switch (alt10) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:726:2: ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' )
+                    // InternalETMap.g:726:2: ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' )
                     {
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:726:2: ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' )
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:726:3: ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from'
+                    // InternalETMap.g:726:2: ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' )
+                    // InternalETMap.g:726:3: ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from'
                     {
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:726:3: ( (lv_importedNamespace_1_0= ruleImportedFQN ) )
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:727:1: (lv_importedNamespace_1_0= ruleImportedFQN )
+                    // InternalETMap.g:726:3: ( (lv_importedNamespace_1_0= ruleImportedFQN ) )
+                    // InternalETMap.g:727:1: (lv_importedNamespace_1_0= ruleImportedFQN )
                     {
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:727:1: (lv_importedNamespace_1_0= ruleImportedFQN )
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:728:3: lv_importedNamespace_1_0= ruleImportedFQN
+                    // InternalETMap.g:727:1: (lv_importedNamespace_1_0= ruleImportedFQN )
+                    // InternalETMap.g:728:3: lv_importedNamespace_1_0= ruleImportedFQN
                     {
                      
                     	        newCompositeNode(grammarAccess.getImportAccess().getImportedNamespaceImportedFQNParserRuleCall_1_0_0_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleImportedFQN_in_ruleImport1607);
+                    pushFollow(FOLLOW_19);
                     lv_importedNamespace_1_0=ruleImportedFQN();
 
                     state._fsp--;
@@ -1837,7 +1837,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"importedNamespace",
                             		lv_importedNamespace_1_0, 
-                            		"ImportedFQN");
+                            		"org.eclipse.etrice.core.common.Base.ImportedFQN");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -1846,7 +1846,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_2=(Token)match(input,26,FOLLOW_26_in_ruleImport1619); 
+                    otherlv_2=(Token)match(input,26,FOLLOW_16); 
 
                         	newLeafNode(otherlv_2, grammarAccess.getImportAccess().getFromKeyword_1_0_1());
                         
@@ -1857,9 +1857,9 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:749:7: otherlv_3= 'model'
+                    // InternalETMap.g:749:7: otherlv_3= 'model'
                     {
-                    otherlv_3=(Token)match(input,27,FOLLOW_27_in_ruleImport1638); 
+                    otherlv_3=(Token)match(input,27,FOLLOW_16); 
 
                         	newLeafNode(otherlv_3, grammarAccess.getImportAccess().getModelKeyword_1_1());
                         
@@ -1869,13 +1869,13 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:753:2: ( (lv_importURI_4_0= RULE_STRING ) )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:754:1: (lv_importURI_4_0= RULE_STRING )
+            // InternalETMap.g:753:2: ( (lv_importURI_4_0= RULE_STRING ) )
+            // InternalETMap.g:754:1: (lv_importURI_4_0= RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:754:1: (lv_importURI_4_0= RULE_STRING )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:755:3: lv_importURI_4_0= RULE_STRING
+            // InternalETMap.g:754:1: (lv_importURI_4_0= RULE_STRING )
+            // InternalETMap.g:755:3: lv_importURI_4_0= RULE_STRING
             {
-            lv_importURI_4_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleImport1656); 
+            lv_importURI_4_0=(Token)match(input,RULE_STRING,FOLLOW_2); 
 
             			newLeafNode(lv_importURI_4_0, grammarAccess.getImportAccess().getImportURISTRINGTerminalRuleCall_2_0()); 
             		
@@ -1887,7 +1887,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"importURI",
                     		lv_importURI_4_0, 
-                    		"STRING");
+                    		"org.eclipse.xtext.common.Terminals.STRING");
             	    
 
             }
@@ -1916,7 +1916,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleImportedFQN"
-    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:779:1: entryRuleImportedFQN returns [String current=null] : iv_ruleImportedFQN= ruleImportedFQN EOF ;
+    // InternalETMap.g:779:1: entryRuleImportedFQN returns [String current=null] : iv_ruleImportedFQN= ruleImportedFQN EOF ;
     public final String entryRuleImportedFQN() throws RecognitionException {
         String current = null;
 
@@ -1924,17 +1924,17 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:780:2: (iv_ruleImportedFQN= ruleImportedFQN EOF )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:781:2: iv_ruleImportedFQN= ruleImportedFQN EOF
+            // InternalETMap.g:780:2: (iv_ruleImportedFQN= ruleImportedFQN EOF )
+            // InternalETMap.g:781:2: iv_ruleImportedFQN= ruleImportedFQN EOF
             {
              newCompositeNode(grammarAccess.getImportedFQNRule()); 
-            pushFollow(FOLLOW_ruleImportedFQN_in_entryRuleImportedFQN1698);
+            pushFollow(FOLLOW_1);
             iv_ruleImportedFQN=ruleImportedFQN();
 
             state._fsp--;
 
              current =iv_ruleImportedFQN.getText(); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleImportedFQN1709); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1952,7 +1952,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleImportedFQN"
-    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:788:1: ruleImportedFQN returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_FQN_0= ruleFQN (kw= '.*' )? ) ;
+    // InternalETMap.g:788:1: ruleImportedFQN returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_FQN_0= ruleFQN (kw= '.*' )? ) ;
     public final AntlrDatatypeRuleToken ruleImportedFQN() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -1963,16 +1963,16 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:791:28: ( (this_FQN_0= ruleFQN (kw= '.*' )? ) )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:792:1: (this_FQN_0= ruleFQN (kw= '.*' )? )
+            // InternalETMap.g:791:28: ( (this_FQN_0= ruleFQN (kw= '.*' )? ) )
+            // InternalETMap.g:792:1: (this_FQN_0= ruleFQN (kw= '.*' )? )
             {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:792:1: (this_FQN_0= ruleFQN (kw= '.*' )? )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:793:5: this_FQN_0= ruleFQN (kw= '.*' )?
+            // InternalETMap.g:792:1: (this_FQN_0= ruleFQN (kw= '.*' )? )
+            // InternalETMap.g:793:5: this_FQN_0= ruleFQN (kw= '.*' )?
             {
              
                     newCompositeNode(grammarAccess.getImportedFQNAccess().getFQNParserRuleCall_0()); 
                 
-            pushFollow(FOLLOW_ruleFQN_in_ruleImportedFQN1756);
+            pushFollow(FOLLOW_20);
             this_FQN_0=ruleFQN();
 
             state._fsp--;
@@ -1983,7 +1983,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
              
                     afterParserOrEnumRuleCall();
                 
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:803:1: (kw= '.*' )?
+            // InternalETMap.g:803:1: (kw= '.*' )?
             int alt11=2;
             int LA11_0 = input.LA(1);
 
@@ -1992,9 +1992,9 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
             }
             switch (alt11) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:804:2: kw= '.*'
+                    // InternalETMap.g:804:2: kw= '.*'
                     {
-                    kw=(Token)match(input,28,FOLLOW_28_in_ruleImportedFQN1775); 
+                    kw=(Token)match(input,28,FOLLOW_2); 
 
                             current.merge(kw);
                             newLeafNode(kw, grammarAccess.getImportedFQNAccess().getFullStopAsteriskKeyword_1()); 
@@ -2026,7 +2026,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleDocumentation"
-    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:817:1: entryRuleDocumentation returns [EObject current=null] : iv_ruleDocumentation= ruleDocumentation EOF ;
+    // InternalETMap.g:817:1: entryRuleDocumentation returns [EObject current=null] : iv_ruleDocumentation= ruleDocumentation EOF ;
     public final EObject entryRuleDocumentation() throws RecognitionException {
         EObject current = null;
 
@@ -2034,17 +2034,17 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:818:2: (iv_ruleDocumentation= ruleDocumentation EOF )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:819:2: iv_ruleDocumentation= ruleDocumentation EOF
+            // InternalETMap.g:818:2: (iv_ruleDocumentation= ruleDocumentation EOF )
+            // InternalETMap.g:819:2: iv_ruleDocumentation= ruleDocumentation EOF
             {
              newCompositeNode(grammarAccess.getDocumentationRule()); 
-            pushFollow(FOLLOW_ruleDocumentation_in_entryRuleDocumentation1817);
+            pushFollow(FOLLOW_1);
             iv_ruleDocumentation=ruleDocumentation();
 
             state._fsp--;
 
              current =iv_ruleDocumentation; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDocumentation1827); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2062,7 +2062,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleDocumentation"
-    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:826:1: ruleDocumentation returns [EObject current=null] : ( () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']' ) ;
+    // InternalETMap.g:826: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;
 
@@ -2073,14 +2073,14 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:829:28: ( ( () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']' ) )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:830:1: ( () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']' )
+            // InternalETMap.g:829:28: ( ( () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']' ) )
+            // InternalETMap.g:830:1: ( () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']' )
             {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:830:1: ( () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']' )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:830:2: () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']'
+            // InternalETMap.g:830:1: ( () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']' )
+            // InternalETMap.g:830:2: () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']'
             {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:830:2: ()
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:831:5: 
+            // InternalETMap.g:830:2: ()
+            // InternalETMap.g:831:5: 
             {
 
                     current = forceCreateModelElement(
@@ -2090,11 +2090,11 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,29,FOLLOW_29_in_ruleDocumentation1873); 
+            otherlv_1=(Token)match(input,29,FOLLOW_21); 
 
                 	newLeafNode(otherlv_1, grammarAccess.getDocumentationAccess().getLeftSquareBracketKeyword_1());
                 
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:840:1: ( (lv_lines_2_0= RULE_STRING ) )*
+            // InternalETMap.g:840:1: ( (lv_lines_2_0= RULE_STRING ) )*
             loop12:
             do {
                 int alt12=2;
@@ -2107,12 +2107,12 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
                 switch (alt12) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:841:1: (lv_lines_2_0= RULE_STRING )
+            	    // InternalETMap.g:841:1: (lv_lines_2_0= RULE_STRING )
             	    {
-            	    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:841:1: (lv_lines_2_0= RULE_STRING )
-            	    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:842:3: lv_lines_2_0= RULE_STRING
+            	    // InternalETMap.g:841:1: (lv_lines_2_0= RULE_STRING )
+            	    // InternalETMap.g:842:3: lv_lines_2_0= RULE_STRING
             	    {
-            	    lv_lines_2_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleDocumentation1890); 
+            	    lv_lines_2_0=(Token)match(input,RULE_STRING,FOLLOW_21); 
 
             	    			newLeafNode(lv_lines_2_0, grammarAccess.getDocumentationAccess().getLinesSTRINGTerminalRuleCall_2_0()); 
             	    		
@@ -2124,7 +2124,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"lines",
             	            		lv_lines_2_0, 
-            	            		"STRING");
+            	            		"org.eclipse.xtext.common.Terminals.STRING");
             	    	    
 
             	    }
@@ -2138,7 +2138,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
                 }
             } while (true);
 
-            otherlv_3=(Token)match(input,30,FOLLOW_30_in_ruleDocumentation1908); 
+            otherlv_3=(Token)match(input,30,FOLLOW_2); 
 
                 	newLeafNode(otherlv_3, grammarAccess.getDocumentationAccess().getRightSquareBracketKeyword_3());
                 
@@ -2163,7 +2163,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleLiteral"
-    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:874:1: entryRuleLiteral returns [EObject current=null] : iv_ruleLiteral= ruleLiteral EOF ;
+    // InternalETMap.g:874:1: entryRuleLiteral returns [EObject current=null] : iv_ruleLiteral= ruleLiteral EOF ;
     public final EObject entryRuleLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -2171,17 +2171,17 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:875:2: (iv_ruleLiteral= ruleLiteral EOF )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:876:2: iv_ruleLiteral= ruleLiteral EOF
+            // InternalETMap.g:875:2: (iv_ruleLiteral= ruleLiteral EOF )
+            // InternalETMap.g:876:2: iv_ruleLiteral= ruleLiteral EOF
             {
              newCompositeNode(grammarAccess.getLiteralRule()); 
-            pushFollow(FOLLOW_ruleLiteral_in_entryRuleLiteral1948);
+            pushFollow(FOLLOW_1);
             iv_ruleLiteral=ruleLiteral();
 
             state._fsp--;
 
              current =iv_ruleLiteral; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleLiteral1958); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2199,7 +2199,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleLiteral"
-    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:883:1: ruleLiteral returns [EObject current=null] : (this_BooleanLiteral_0= ruleBooleanLiteral | this_NumberLiteral_1= ruleNumberLiteral | this_StringLiteral_2= ruleStringLiteral ) ;
+    // InternalETMap.g:883: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;
 
@@ -2213,10 +2213,10 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:886:28: ( (this_BooleanLiteral_0= ruleBooleanLiteral | this_NumberLiteral_1= ruleNumberLiteral | this_StringLiteral_2= ruleStringLiteral ) )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:887:1: (this_BooleanLiteral_0= ruleBooleanLiteral | this_NumberLiteral_1= ruleNumberLiteral | this_StringLiteral_2= ruleStringLiteral )
+            // InternalETMap.g:886:28: ( (this_BooleanLiteral_0= ruleBooleanLiteral | this_NumberLiteral_1= ruleNumberLiteral | this_StringLiteral_2= ruleStringLiteral ) )
+            // InternalETMap.g:887:1: (this_BooleanLiteral_0= ruleBooleanLiteral | this_NumberLiteral_1= ruleNumberLiteral | this_StringLiteral_2= ruleStringLiteral )
             {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:887:1: (this_BooleanLiteral_0= ruleBooleanLiteral | this_NumberLiteral_1= ruleNumberLiteral | this_StringLiteral_2= ruleStringLiteral )
+            // InternalETMap.g:887:1: (this_BooleanLiteral_0= ruleBooleanLiteral | this_NumberLiteral_1= ruleNumberLiteral | this_StringLiteral_2= ruleStringLiteral )
             int alt13=3;
             switch ( input.LA(1) ) {
             case 31:
@@ -2247,12 +2247,12 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
             switch (alt13) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:888:5: this_BooleanLiteral_0= ruleBooleanLiteral
+                    // InternalETMap.g:888:5: this_BooleanLiteral_0= ruleBooleanLiteral
                     {
                      
                             newCompositeNode(grammarAccess.getLiteralAccess().getBooleanLiteralParserRuleCall_0()); 
                         
-                    pushFollow(FOLLOW_ruleBooleanLiteral_in_ruleLiteral2005);
+                    pushFollow(FOLLOW_2);
                     this_BooleanLiteral_0=ruleBooleanLiteral();
 
                     state._fsp--;
@@ -2265,12 +2265,12 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:898:5: this_NumberLiteral_1= ruleNumberLiteral
+                    // InternalETMap.g:898:5: this_NumberLiteral_1= ruleNumberLiteral
                     {
                      
                             newCompositeNode(grammarAccess.getLiteralAccess().getNumberLiteralParserRuleCall_1()); 
                         
-                    pushFollow(FOLLOW_ruleNumberLiteral_in_ruleLiteral2032);
+                    pushFollow(FOLLOW_2);
                     this_NumberLiteral_1=ruleNumberLiteral();
 
                     state._fsp--;
@@ -2283,12 +2283,12 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:908:5: this_StringLiteral_2= ruleStringLiteral
+                    // InternalETMap.g:908:5: this_StringLiteral_2= ruleStringLiteral
                     {
                      
                             newCompositeNode(grammarAccess.getLiteralAccess().getStringLiteralParserRuleCall_2()); 
                         
-                    pushFollow(FOLLOW_ruleStringLiteral_in_ruleLiteral2059);
+                    pushFollow(FOLLOW_2);
                     this_StringLiteral_2=ruleStringLiteral();
 
                     state._fsp--;
@@ -2321,7 +2321,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleBooleanLiteral"
-    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:924:1: entryRuleBooleanLiteral returns [EObject current=null] : iv_ruleBooleanLiteral= ruleBooleanLiteral EOF ;
+    // InternalETMap.g:924:1: entryRuleBooleanLiteral returns [EObject current=null] : iv_ruleBooleanLiteral= ruleBooleanLiteral EOF ;
     public final EObject entryRuleBooleanLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -2329,17 +2329,17 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:925:2: (iv_ruleBooleanLiteral= ruleBooleanLiteral EOF )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:926:2: iv_ruleBooleanLiteral= ruleBooleanLiteral EOF
+            // InternalETMap.g:925:2: (iv_ruleBooleanLiteral= ruleBooleanLiteral EOF )
+            // InternalETMap.g:926:2: iv_ruleBooleanLiteral= ruleBooleanLiteral EOF
             {
              newCompositeNode(grammarAccess.getBooleanLiteralRule()); 
-            pushFollow(FOLLOW_ruleBooleanLiteral_in_entryRuleBooleanLiteral2094);
+            pushFollow(FOLLOW_1);
             iv_ruleBooleanLiteral=ruleBooleanLiteral();
 
             state._fsp--;
 
              current =iv_ruleBooleanLiteral; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleBooleanLiteral2104); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2357,7 +2357,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleBooleanLiteral"
-    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:933:1: ruleBooleanLiteral returns [EObject current=null] : ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) ) ;
+    // InternalETMap.g:933:1: ruleBooleanLiteral returns [EObject current=null] : ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) ) ;
     public final EObject ruleBooleanLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -2367,14 +2367,14 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:936:28: ( ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) ) )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:937:1: ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) )
+            // InternalETMap.g:936:28: ( ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) ) )
+            // InternalETMap.g:937:1: ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) )
             {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:937:1: ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:937:2: () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) )
+            // InternalETMap.g:937:1: ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) )
+            // InternalETMap.g:937:2: () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) )
             {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:937:2: ()
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:938:5: 
+            // InternalETMap.g:937:2: ()
+            // InternalETMap.g:938:5: 
             {
 
                     current = forceCreateModelElement(
@@ -2384,7 +2384,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:943:2: (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) )
+            // InternalETMap.g:943:2: (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) )
             int alt14=2;
             int LA14_0 = input.LA(1);
 
@@ -2402,9 +2402,9 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
             }
             switch (alt14) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:943:4: otherlv_1= 'false'
+                    // InternalETMap.g:943:4: otherlv_1= 'false'
                     {
-                    otherlv_1=(Token)match(input,31,FOLLOW_31_in_ruleBooleanLiteral2151); 
+                    otherlv_1=(Token)match(input,31,FOLLOW_2); 
 
                         	newLeafNode(otherlv_1, grammarAccess.getBooleanLiteralAccess().getFalseKeyword_1_0());
                         
@@ -2412,15 +2412,15 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:948:6: ( (lv_isTrue_2_0= 'true' ) )
+                    // InternalETMap.g:948:6: ( (lv_isTrue_2_0= 'true' ) )
                     {
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:948:6: ( (lv_isTrue_2_0= 'true' ) )
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:949:1: (lv_isTrue_2_0= 'true' )
+                    // InternalETMap.g:948:6: ( (lv_isTrue_2_0= 'true' ) )
+                    // InternalETMap.g:949:1: (lv_isTrue_2_0= 'true' )
                     {
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:949:1: (lv_isTrue_2_0= 'true' )
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:950:3: lv_isTrue_2_0= 'true'
+                    // InternalETMap.g:949:1: (lv_isTrue_2_0= 'true' )
+                    // InternalETMap.g:950:3: lv_isTrue_2_0= 'true'
                     {
-                    lv_isTrue_2_0=(Token)match(input,32,FOLLOW_32_in_ruleBooleanLiteral2175); 
+                    lv_isTrue_2_0=(Token)match(input,32,FOLLOW_2); 
 
                             newLeafNode(lv_isTrue_2_0, grammarAccess.getBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0());
                         
@@ -2463,7 +2463,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleNumberLiteral"
-    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:971:1: entryRuleNumberLiteral returns [EObject current=null] : iv_ruleNumberLiteral= ruleNumberLiteral EOF ;
+    // InternalETMap.g:971:1: entryRuleNumberLiteral returns [EObject current=null] : iv_ruleNumberLiteral= ruleNumberLiteral EOF ;
     public final EObject entryRuleNumberLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -2471,17 +2471,17 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:972:2: (iv_ruleNumberLiteral= ruleNumberLiteral EOF )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:973:2: iv_ruleNumberLiteral= ruleNumberLiteral EOF
+            // InternalETMap.g:972:2: (iv_ruleNumberLiteral= ruleNumberLiteral EOF )
+            // InternalETMap.g:973:2: iv_ruleNumberLiteral= ruleNumberLiteral EOF
             {
              newCompositeNode(grammarAccess.getNumberLiteralRule()); 
-            pushFollow(FOLLOW_ruleNumberLiteral_in_entryRuleNumberLiteral2225);
+            pushFollow(FOLLOW_1);
             iv_ruleNumberLiteral=ruleNumberLiteral();
 
             state._fsp--;
 
              current =iv_ruleNumberLiteral; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleNumberLiteral2235); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2499,7 +2499,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleNumberLiteral"
-    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:980:1: ruleNumberLiteral returns [EObject current=null] : (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral ) ;
+    // InternalETMap.g:980:1: ruleNumberLiteral returns [EObject current=null] : (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral ) ;
     public final EObject ruleNumberLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -2511,10 +2511,10 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:983:28: ( (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral ) )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:984:1: (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral )
+            // InternalETMap.g:983:28: ( (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral ) )
+            // InternalETMap.g:984:1: (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral )
             {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:984:1: (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral )
+            // InternalETMap.g:984:1: (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral )
             int alt15=2;
             switch ( input.LA(1) ) {
             case 33:
@@ -2605,12 +2605,12 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
             switch (alt15) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:985:5: this_IntLiteral_0= ruleIntLiteral
+                    // InternalETMap.g:985:5: this_IntLiteral_0= ruleIntLiteral
                     {
                      
                             newCompositeNode(grammarAccess.getNumberLiteralAccess().getIntLiteralParserRuleCall_0()); 
                         
-                    pushFollow(FOLLOW_ruleIntLiteral_in_ruleNumberLiteral2282);
+                    pushFollow(FOLLOW_2);
                     this_IntLiteral_0=ruleIntLiteral();
 
                     state._fsp--;
@@ -2623,12 +2623,12 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:995:5: this_RealLiteral_1= ruleRealLiteral
+                    // InternalETMap.g:995:5: this_RealLiteral_1= ruleRealLiteral
                     {
                      
                             newCompositeNode(grammarAccess.getNumberLiteralAccess().getRealLiteralParserRuleCall_1()); 
                         
-                    pushFollow(FOLLOW_ruleRealLiteral_in_ruleNumberLiteral2309);
+                    pushFollow(FOLLOW_2);
                     this_RealLiteral_1=ruleRealLiteral();
 
                     state._fsp--;
@@ -2661,7 +2661,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleRealLiteral"
-    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1011:1: entryRuleRealLiteral returns [EObject current=null] : iv_ruleRealLiteral= ruleRealLiteral EOF ;
+    // InternalETMap.g:1011:1: entryRuleRealLiteral returns [EObject current=null] : iv_ruleRealLiteral= ruleRealLiteral EOF ;
     public final EObject entryRuleRealLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -2669,17 +2669,17 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1012:2: (iv_ruleRealLiteral= ruleRealLiteral EOF )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1013:2: iv_ruleRealLiteral= ruleRealLiteral EOF
+            // InternalETMap.g:1012:2: (iv_ruleRealLiteral= ruleRealLiteral EOF )
+            // InternalETMap.g:1013:2: iv_ruleRealLiteral= ruleRealLiteral EOF
             {
              newCompositeNode(grammarAccess.getRealLiteralRule()); 
-            pushFollow(FOLLOW_ruleRealLiteral_in_entryRuleRealLiteral2344);
+            pushFollow(FOLLOW_1);
             iv_ruleRealLiteral=ruleRealLiteral();
 
             state._fsp--;
 
              current =iv_ruleRealLiteral; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRealLiteral2354); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2697,7 +2697,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleRealLiteral"
-    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1020:1: ruleRealLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= ruleReal ) ) ) ;
+    // InternalETMap.g:1020:1: ruleRealLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= ruleReal ) ) ) ;
     public final EObject ruleRealLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -2707,14 +2707,14 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1023:28: ( ( () ( (lv_value_1_0= ruleReal ) ) ) )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1024:1: ( () ( (lv_value_1_0= ruleReal ) ) )
+            // InternalETMap.g:1023:28: ( ( () ( (lv_value_1_0= ruleReal ) ) ) )
+            // InternalETMap.g:1024:1: ( () ( (lv_value_1_0= ruleReal ) ) )
             {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1024:1: ( () ( (lv_value_1_0= ruleReal ) ) )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1024:2: () ( (lv_value_1_0= ruleReal ) )
+            // InternalETMap.g:1024:1: ( () ( (lv_value_1_0= ruleReal ) ) )
+            // InternalETMap.g:1024:2: () ( (lv_value_1_0= ruleReal ) )
             {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1024:2: ()
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1025:5: 
+            // InternalETMap.g:1024:2: ()
+            // InternalETMap.g:1025:5: 
             {
 
                     current = forceCreateModelElement(
@@ -2724,16 +2724,16 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1030:2: ( (lv_value_1_0= ruleReal ) )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1031:1: (lv_value_1_0= ruleReal )
+            // InternalETMap.g:1030:2: ( (lv_value_1_0= ruleReal ) )
+            // InternalETMap.g:1031:1: (lv_value_1_0= ruleReal )
             {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1031:1: (lv_value_1_0= ruleReal )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1032:3: lv_value_1_0= ruleReal
+            // InternalETMap.g:1031:1: (lv_value_1_0= ruleReal )
+            // InternalETMap.g:1032:3: lv_value_1_0= ruleReal
             {
              
             	        newCompositeNode(grammarAccess.getRealLiteralAccess().getValueRealParserRuleCall_1_0()); 
             	    
-            pushFollow(FOLLOW_ruleReal_in_ruleRealLiteral2409);
+            pushFollow(FOLLOW_2);
             lv_value_1_0=ruleReal();
 
             state._fsp--;
@@ -2746,7 +2746,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"value",
                     		lv_value_1_0, 
-                    		"Real");
+                    		"org.eclipse.etrice.core.common.Base.Real");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -2776,7 +2776,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleIntLiteral"
-    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1056:1: entryRuleIntLiteral returns [EObject current=null] : iv_ruleIntLiteral= ruleIntLiteral EOF ;
+    // InternalETMap.g:1056:1: entryRuleIntLiteral returns [EObject current=null] : iv_ruleIntLiteral= ruleIntLiteral EOF ;
     public final EObject entryRuleIntLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -2784,17 +2784,17 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1057:2: (iv_ruleIntLiteral= ruleIntLiteral EOF )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1058:2: iv_ruleIntLiteral= ruleIntLiteral EOF
+            // InternalETMap.g:1057:2: (iv_ruleIntLiteral= ruleIntLiteral EOF )
+            // InternalETMap.g:1058:2: iv_ruleIntLiteral= ruleIntLiteral EOF
             {
              newCompositeNode(grammarAccess.getIntLiteralRule()); 
-            pushFollow(FOLLOW_ruleIntLiteral_in_entryRuleIntLiteral2445);
+            pushFollow(FOLLOW_1);
             iv_ruleIntLiteral=ruleIntLiteral();
 
             state._fsp--;
 
              current =iv_ruleIntLiteral; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIntLiteral2455); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2812,7 +2812,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleIntLiteral"
-    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1065:1: ruleIntLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= ruleInteger ) ) ) ;
+    // InternalETMap.g:1065:1: ruleIntLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= ruleInteger ) ) ) ;
     public final EObject ruleIntLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -2822,14 +2822,14 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1068:28: ( ( () ( (lv_value_1_0= ruleInteger ) ) ) )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1069:1: ( () ( (lv_value_1_0= ruleInteger ) ) )
+            // InternalETMap.g:1068:28: ( ( () ( (lv_value_1_0= ruleInteger ) ) ) )
+            // InternalETMap.g:1069:1: ( () ( (lv_value_1_0= ruleInteger ) ) )
             {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1069:1: ( () ( (lv_value_1_0= ruleInteger ) ) )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1069:2: () ( (lv_value_1_0= ruleInteger ) )
+            // InternalETMap.g:1069:1: ( () ( (lv_value_1_0= ruleInteger ) ) )
+            // InternalETMap.g:1069:2: () ( (lv_value_1_0= ruleInteger ) )
             {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1069:2: ()
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1070:5: 
+            // InternalETMap.g:1069:2: ()
+            // InternalETMap.g:1070:5: 
             {
 
                     current = forceCreateModelElement(
@@ -2839,16 +2839,16 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1075:2: ( (lv_value_1_0= ruleInteger ) )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1076:1: (lv_value_1_0= ruleInteger )
+            // InternalETMap.g:1075:2: ( (lv_value_1_0= ruleInteger ) )
+            // InternalETMap.g:1076:1: (lv_value_1_0= ruleInteger )
             {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1076:1: (lv_value_1_0= ruleInteger )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1077:3: lv_value_1_0= ruleInteger
+            // InternalETMap.g:1076:1: (lv_value_1_0= ruleInteger )
+            // InternalETMap.g:1077:3: lv_value_1_0= ruleInteger
             {
              
             	        newCompositeNode(grammarAccess.getIntLiteralAccess().getValueIntegerParserRuleCall_1_0()); 
             	    
-            pushFollow(FOLLOW_ruleInteger_in_ruleIntLiteral2510);
+            pushFollow(FOLLOW_2);
             lv_value_1_0=ruleInteger();
 
             state._fsp--;
@@ -2861,7 +2861,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"value",
                     		lv_value_1_0, 
-                    		"Integer");
+                    		"org.eclipse.etrice.core.common.Base.Integer");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -2891,7 +2891,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleStringLiteral"
-    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1101:1: entryRuleStringLiteral returns [EObject current=null] : iv_ruleStringLiteral= ruleStringLiteral EOF ;
+    // InternalETMap.g:1101:1: entryRuleStringLiteral returns [EObject current=null] : iv_ruleStringLiteral= ruleStringLiteral EOF ;
     public final EObject entryRuleStringLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -2899,17 +2899,17 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1102:2: (iv_ruleStringLiteral= ruleStringLiteral EOF )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1103:2: iv_ruleStringLiteral= ruleStringLiteral EOF
+            // InternalETMap.g:1102:2: (iv_ruleStringLiteral= ruleStringLiteral EOF )
+            // InternalETMap.g:1103:2: iv_ruleStringLiteral= ruleStringLiteral EOF
             {
              newCompositeNode(grammarAccess.getStringLiteralRule()); 
-            pushFollow(FOLLOW_ruleStringLiteral_in_entryRuleStringLiteral2546);
+            pushFollow(FOLLOW_1);
             iv_ruleStringLiteral=ruleStringLiteral();
 
             state._fsp--;
 
              current =iv_ruleStringLiteral; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleStringLiteral2556); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2927,7 +2927,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleStringLiteral"
-    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1110:1: ruleStringLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= RULE_STRING ) ) ) ;
+    // InternalETMap.g:1110:1: ruleStringLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= RULE_STRING ) ) ) ;
     public final EObject ruleStringLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -2936,14 +2936,14 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1113:28: ( ( () ( (lv_value_1_0= RULE_STRING ) ) ) )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1114:1: ( () ( (lv_value_1_0= RULE_STRING ) ) )
+            // InternalETMap.g:1113:28: ( ( () ( (lv_value_1_0= RULE_STRING ) ) ) )
+            // InternalETMap.g:1114:1: ( () ( (lv_value_1_0= RULE_STRING ) ) )
             {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1114:1: ( () ( (lv_value_1_0= RULE_STRING ) ) )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1114:2: () ( (lv_value_1_0= RULE_STRING ) )
+            // InternalETMap.g:1114:1: ( () ( (lv_value_1_0= RULE_STRING ) ) )
+            // InternalETMap.g:1114:2: () ( (lv_value_1_0= RULE_STRING ) )
             {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1114:2: ()
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1115:5: 
+            // InternalETMap.g:1114:2: ()
+            // InternalETMap.g:1115:5: 
             {
 
                     current = forceCreateModelElement(
@@ -2953,13 +2953,13 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1120:2: ( (lv_value_1_0= RULE_STRING ) )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1121:1: (lv_value_1_0= RULE_STRING )
+            // InternalETMap.g:1120:2: ( (lv_value_1_0= RULE_STRING ) )
+            // InternalETMap.g:1121:1: (lv_value_1_0= RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1121:1: (lv_value_1_0= RULE_STRING )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1122:3: lv_value_1_0= RULE_STRING
+            // InternalETMap.g:1121:1: (lv_value_1_0= RULE_STRING )
+            // InternalETMap.g:1122:3: lv_value_1_0= RULE_STRING
             {
-            lv_value_1_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleStringLiteral2607); 
+            lv_value_1_0=(Token)match(input,RULE_STRING,FOLLOW_2); 
 
             			newLeafNode(lv_value_1_0, grammarAccess.getStringLiteralAccess().getValueSTRINGTerminalRuleCall_1_0()); 
             		
@@ -2971,7 +2971,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"value",
                     		lv_value_1_0, 
-                    		"STRING");
+                    		"org.eclipse.xtext.common.Terminals.STRING");
             	    
 
             }
@@ -3000,7 +3000,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleInteger"
-    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1146:1: entryRuleInteger returns [String current=null] : iv_ruleInteger= ruleInteger EOF ;
+    // InternalETMap.g:1146:1: entryRuleInteger returns [String current=null] : iv_ruleInteger= ruleInteger EOF ;
     public final String entryRuleInteger() throws RecognitionException {
         String current = null;
 
@@ -3008,17 +3008,17 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1147:2: (iv_ruleInteger= ruleInteger EOF )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1148:2: iv_ruleInteger= ruleInteger EOF
+            // InternalETMap.g:1147:2: (iv_ruleInteger= ruleInteger EOF )
+            // InternalETMap.g:1148:2: iv_ruleInteger= ruleInteger EOF
             {
              newCompositeNode(grammarAccess.getIntegerRule()); 
-            pushFollow(FOLLOW_ruleInteger_in_entryRuleInteger2649);
+            pushFollow(FOLLOW_1);
             iv_ruleInteger=ruleInteger();
 
             state._fsp--;
 
              current =iv_ruleInteger.getText(); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleInteger2660); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3036,7 +3036,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleInteger"
-    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1155:1: ruleInteger returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT ) | this_HEX_3= RULE_HEX ) ;
+    // InternalETMap.g:1155: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();
 
@@ -3047,10 +3047,10 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1158:28: ( ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT ) | this_HEX_3= RULE_HEX ) )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1159:1: ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT ) | this_HEX_3= RULE_HEX )
+            // InternalETMap.g:1158:28: ( ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT ) | this_HEX_3= RULE_HEX ) )
+            // InternalETMap.g:1159:1: ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT ) | this_HEX_3= RULE_HEX )
             {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1159:1: ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT ) | this_HEX_3= RULE_HEX )
+            // InternalETMap.g:1159:1: ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT ) | this_HEX_3= RULE_HEX )
             int alt17=2;
             int LA17_0 = input.LA(1);
 
@@ -3068,12 +3068,12 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
             }
             switch (alt17) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1159:2: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT )
+                    // InternalETMap.g:1159:2: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT )
                     {
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1159:2: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT )
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1159:3: (kw= '+' | kw= '-' )? this_INT_2= RULE_INT
+                    // InternalETMap.g:1159:2: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT )
+                    // InternalETMap.g:1159:3: (kw= '+' | kw= '-' )? this_INT_2= RULE_INT
                     {
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1159:3: (kw= '+' | kw= '-' )?
+                    // InternalETMap.g:1159:3: (kw= '+' | kw= '-' )?
                     int alt16=3;
                     int LA16_0 = input.LA(1);
 
@@ -3085,9 +3085,9 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
                     }
                     switch (alt16) {
                         case 1 :
-                            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1160:2: kw= '+'
+                            // InternalETMap.g:1160:2: kw= '+'
                             {
-                            kw=(Token)match(input,33,FOLLOW_33_in_ruleInteger2700); 
+                            kw=(Token)match(input,33,FOLLOW_22); 
 
                                     current.merge(kw);
                                     newLeafNode(kw, grammarAccess.getIntegerAccess().getPlusSignKeyword_0_0_0()); 
@@ -3096,9 +3096,9 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
                             }
                             break;
                         case 2 :
-                            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1167:2: kw= '-'
+                            // InternalETMap.g:1167:2: kw= '-'
                             {
-                            kw=(Token)match(input,34,FOLLOW_34_in_ruleInteger2719); 
+                            kw=(Token)match(input,34,FOLLOW_22); 
 
                                     current.merge(kw);
                                     newLeafNode(kw, grammarAccess.getIntegerAccess().getHyphenMinusKeyword_0_0_1()); 
@@ -3109,7 +3109,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    this_INT_2=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleInteger2736); 
+                    this_INT_2=(Token)match(input,RULE_INT,FOLLOW_2); 
 
                     		current.merge(this_INT_2);
                         
@@ -3123,9 +3123,9 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1180:10: this_HEX_3= RULE_HEX
+                    // InternalETMap.g:1180:10: this_HEX_3= RULE_HEX
                     {
-                    this_HEX_3=(Token)match(input,RULE_HEX,FOLLOW_RULE_HEX_in_ruleInteger2763); 
+                    this_HEX_3=(Token)match(input,RULE_HEX,FOLLOW_2); 
 
                     		current.merge(this_HEX_3);
                         
@@ -3156,7 +3156,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleReal"
-    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1195:1: entryRuleReal returns [String current=null] : iv_ruleReal= ruleReal EOF ;
+    // InternalETMap.g:1195:1: entryRuleReal returns [String current=null] : iv_ruleReal= ruleReal EOF ;
     public final String entryRuleReal() throws RecognitionException {
         String current = null;
 
@@ -3164,17 +3164,17 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1196:2: (iv_ruleReal= ruleReal EOF )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1197:2: iv_ruleReal= ruleReal EOF
+            // InternalETMap.g:1196:2: (iv_ruleReal= ruleReal EOF )
+            // InternalETMap.g:1197:2: iv_ruleReal= ruleReal EOF
             {
              newCompositeNode(grammarAccess.getRealRule()); 
-            pushFollow(FOLLOW_ruleReal_in_entryRuleReal2809);
+            pushFollow(FOLLOW_1);
             iv_ruleReal=ruleReal();
 
             state._fsp--;
 
              current =iv_ruleReal.getText(); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleReal2820); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3192,7 +3192,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleReal"
-    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1204:1: ruleReal returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_Decimal_0= ruleDecimal | this_DecimalExp_1= ruleDecimalExp ) ;
+    // InternalETMap.g:1204: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();
 
@@ -3204,10 +3204,10 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1207:28: ( (this_Decimal_0= ruleDecimal | this_DecimalExp_1= ruleDecimalExp ) )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1208:1: (this_Decimal_0= ruleDecimal | this_DecimalExp_1= ruleDecimalExp )
+            // InternalETMap.g:1207:28: ( (this_Decimal_0= ruleDecimal | this_DecimalExp_1= ruleDecimalExp ) )
+            // InternalETMap.g:1208:1: (this_Decimal_0= ruleDecimal | this_DecimalExp_1= ruleDecimalExp )
             {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1208:1: (this_Decimal_0= ruleDecimal | this_DecimalExp_1= ruleDecimalExp )
+            // InternalETMap.g:1208:1: (this_Decimal_0= ruleDecimal | this_DecimalExp_1= ruleDecimalExp )
             int alt18=2;
             switch ( input.LA(1) ) {
             case 33:
@@ -3353,12 +3353,12 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
             switch (alt18) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1209:5: this_Decimal_0= ruleDecimal
+                    // InternalETMap.g:1209:5: this_Decimal_0= ruleDecimal
                     {
                      
                             newCompositeNode(grammarAccess.getRealAccess().getDecimalParserRuleCall_0()); 
                         
-                    pushFollow(FOLLOW_ruleDecimal_in_ruleReal2867);
+                    pushFollow(FOLLOW_2);
                     this_Decimal_0=ruleDecimal();
 
                     state._fsp--;
@@ -3373,12 +3373,12 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1221:5: this_DecimalExp_1= ruleDecimalExp
+                    // InternalETMap.g:1221:5: this_DecimalExp_1= ruleDecimalExp
                     {
                      
                             newCompositeNode(grammarAccess.getRealAccess().getDecimalExpParserRuleCall_1()); 
                         
-                    pushFollow(FOLLOW_ruleDecimalExp_in_ruleReal2900);
+                    pushFollow(FOLLOW_2);
                     this_DecimalExp_1=ruleDecimalExp();
 
                     state._fsp--;
@@ -3413,7 +3413,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleDecimal"
-    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1239:1: entryRuleDecimal returns [String current=null] : iv_ruleDecimal= ruleDecimal EOF ;
+    // InternalETMap.g:1239:1: entryRuleDecimal returns [String current=null] : iv_ruleDecimal= ruleDecimal EOF ;
     public final String entryRuleDecimal() throws RecognitionException {
         String current = null;
 
@@ -3424,17 +3424,17 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
         	
         try {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1243:2: (iv_ruleDecimal= ruleDecimal EOF )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1244:2: iv_ruleDecimal= ruleDecimal EOF
+            // InternalETMap.g:1243:2: (iv_ruleDecimal= ruleDecimal EOF )
+            // InternalETMap.g:1244:2: iv_ruleDecimal= ruleDecimal EOF
             {
              newCompositeNode(grammarAccess.getDecimalRule()); 
-            pushFollow(FOLLOW_ruleDecimal_in_entryRuleDecimal2952);
+            pushFollow(FOLLOW_1);
             iv_ruleDecimal=ruleDecimal();
 
             state._fsp--;
 
              current =iv_ruleDecimal.getText(); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDecimal2963); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3455,7 +3455,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleDecimal"
-    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1254:1: ruleDecimal returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT ) ;
+    // InternalETMap.g:1254: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();
 
@@ -3467,13 +3467,13 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
             
         try {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1258:28: ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT ) )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1259:1: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT )
+            // InternalETMap.g:1258:28: ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT ) )
+            // InternalETMap.g:1259:1: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT )
             {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1259:1: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1259:2: (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT
+            // InternalETMap.g:1259:1: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT )
+            // InternalETMap.g:1259:2: (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT
             {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1259:2: (kw= '+' | kw= '-' )?
+            // InternalETMap.g:1259:2: (kw= '+' | kw= '-' )?
             int alt19=3;
             int LA19_0 = input.LA(1);
 
@@ -3485,9 +3485,9 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
             }
             switch (alt19) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1260:2: kw= '+'
+                    // InternalETMap.g:1260:2: kw= '+'
                     {
-                    kw=(Token)match(input,33,FOLLOW_33_in_ruleDecimal3006); 
+                    kw=(Token)match(input,33,FOLLOW_22); 
 
                             current.merge(kw);
                             newLeafNode(kw, grammarAccess.getDecimalAccess().getPlusSignKeyword_0_0()); 
@@ -3496,9 +3496,9 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1267:2: kw= '-'
+                    // InternalETMap.g:1267:2: kw= '-'
                     {
-                    kw=(Token)match(input,34,FOLLOW_34_in_ruleDecimal3025); 
+                    kw=(Token)match(input,34,FOLLOW_22); 
 
                             current.merge(kw);
                             newLeafNode(kw, grammarAccess.getDecimalAccess().getHyphenMinusKeyword_0_1()); 
@@ -3509,19 +3509,19 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
             }
 
-            this_INT_2=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleDecimal3042); 
+            this_INT_2=(Token)match(input,RULE_INT,FOLLOW_23); 
 
             		current.merge(this_INT_2);
                 
              
                 newLeafNode(this_INT_2, grammarAccess.getDecimalAccess().getINTTerminalRuleCall_1()); 
                 
-            kw=(Token)match(input,35,FOLLOW_35_in_ruleDecimal3060); 
+            kw=(Token)match(input,35,FOLLOW_22); 
 
                     current.merge(kw);
                     newLeafNode(kw, grammarAccess.getDecimalAccess().getFullStopKeyword_2()); 
                 
-            this_INT_4=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleDecimal3075); 
+            this_INT_4=(Token)match(input,RULE_INT,FOLLOW_2); 
 
             		current.merge(this_INT_4);
                 
@@ -3552,7 +3552,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleDecimalExp"
-    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1303:1: entryRuleDecimalExp returns [String current=null] : iv_ruleDecimalExp= ruleDecimalExp EOF ;
+    // InternalETMap.g:1303:1: entryRuleDecimalExp returns [String current=null] : iv_ruleDecimalExp= ruleDecimalExp EOF ;
     public final String entryRuleDecimalExp() throws RecognitionException {
         String current = null;
 
@@ -3563,17 +3563,17 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
         	
         try {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1307:2: (iv_ruleDecimalExp= ruleDecimalExp EOF )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1308:2: iv_ruleDecimalExp= ruleDecimalExp EOF
+            // InternalETMap.g:1307:2: (iv_ruleDecimalExp= ruleDecimalExp EOF )
+            // InternalETMap.g:1308:2: iv_ruleDecimalExp= ruleDecimalExp EOF
             {
              newCompositeNode(grammarAccess.getDecimalExpRule()); 
-            pushFollow(FOLLOW_ruleDecimalExp_in_entryRuleDecimalExp3131);
+            pushFollow(FOLLOW_1);
             iv_ruleDecimalExp=ruleDecimalExp();
 
             state._fsp--;
 
              current =iv_ruleDecimalExp.getText(); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDecimalExp3142); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3594,7 +3594,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleDecimalExp"
-    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1318: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 ) ;
+    // InternalETMap.g:1318: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();
 
@@ -3607,13 +3607,13 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
             
         try {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1322: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.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1323: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 )
+            // InternalETMap.g:1322: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 ) )
+            // InternalETMap.g:1323: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.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1323: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.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1323: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
+            // InternalETMap.g:1323: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 )
+            // InternalETMap.g:1323: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.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1323:2: (kw= '+' | kw= '-' )?
+            // InternalETMap.g:1323:2: (kw= '+' | kw= '-' )?
             int alt20=3;
             int LA20_0 = input.LA(1);
 
@@ -3625,9 +3625,9 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
             }
             switch (alt20) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1324:2: kw= '+'
+                    // InternalETMap.g:1324:2: kw= '+'
                     {
-                    kw=(Token)match(input,33,FOLLOW_33_in_ruleDecimalExp3185); 
+                    kw=(Token)match(input,33,FOLLOW_22); 
 
                             current.merge(kw);
                             newLeafNode(kw, grammarAccess.getDecimalExpAccess().getPlusSignKeyword_0_0()); 
@@ -3636,9 +3636,9 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1331:2: kw= '-'
+                    // InternalETMap.g:1331:2: kw= '-'
                     {
-                    kw=(Token)match(input,34,FOLLOW_34_in_ruleDecimalExp3204); 
+                    kw=(Token)match(input,34,FOLLOW_22); 
 
                             current.merge(kw);
                             newLeafNode(kw, grammarAccess.getDecimalExpAccess().getHyphenMinusKeyword_0_1()); 
@@ -3649,26 +3649,26 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
             }
 
-            this_INT_2=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleDecimalExp3221); 
+            this_INT_2=(Token)match(input,RULE_INT,FOLLOW_23); 
 
             		current.merge(this_INT_2);
                 
              
                 newLeafNode(this_INT_2, grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_1()); 
                 
-            kw=(Token)match(input,35,FOLLOW_35_in_ruleDecimalExp3239); 
+            kw=(Token)match(input,35,FOLLOW_22); 
 
                     current.merge(kw);
                     newLeafNode(kw, grammarAccess.getDecimalExpAccess().getFullStopKeyword_2()); 
                 
-            this_INT_4=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleDecimalExp3254); 
+            this_INT_4=(Token)match(input,RULE_INT,FOLLOW_24); 
 
             		current.merge(this_INT_4);
                 
              
                 newLeafNode(this_INT_4, grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_3()); 
                 
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1356:1: (kw= 'e' | kw= 'E' )
+            // InternalETMap.g:1356:1: (kw= 'e' | kw= 'E' )
             int alt21=2;
             int LA21_0 = input.LA(1);
 
@@ -3686,9 +3686,9 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
             }
             switch (alt21) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1357:2: kw= 'e'
+                    // InternalETMap.g:1357:2: kw= 'e'
                     {
-                    kw=(Token)match(input,36,FOLLOW_36_in_ruleDecimalExp3273); 
+                    kw=(Token)match(input,36,FOLLOW_25); 
 
                             current.merge(kw);
                             newLeafNode(kw, grammarAccess.getDecimalExpAccess().getEKeyword_4_0()); 
@@ -3697,9 +3697,9 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1364:2: kw= 'E'
+                    // InternalETMap.g:1364:2: kw= 'E'
                     {
-                    kw=(Token)match(input,37,FOLLOW_37_in_ruleDecimalExp3292); 
+                    kw=(Token)match(input,37,FOLLOW_25); 
 
                             current.merge(kw);
                             newLeafNode(kw, grammarAccess.getDecimalExpAccess().getEKeyword_4_1()); 
@@ -3710,7 +3710,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1369:2: (kw= '+' | kw= '-' )?
+            // InternalETMap.g:1369:2: (kw= '+' | kw= '-' )?
             int alt22=3;
             int LA22_0 = input.LA(1);
 
@@ -3722,9 +3722,9 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
             }
             switch (alt22) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1370:2: kw= '+'
+                    // InternalETMap.g:1370:2: kw= '+'
                     {
-                    kw=(Token)match(input,33,FOLLOW_33_in_ruleDecimalExp3307); 
+                    kw=(Token)match(input,33,FOLLOW_22); 
 
                             current.merge(kw);
                             newLeafNode(kw, grammarAccess.getDecimalExpAccess().getPlusSignKeyword_5_0()); 
@@ -3733,9 +3733,9 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1377:2: kw= '-'
+                    // InternalETMap.g:1377:2: kw= '-'
                     {
-                    kw=(Token)match(input,34,FOLLOW_34_in_ruleDecimalExp3326); 
+                    kw=(Token)match(input,34,FOLLOW_22); 
 
                             current.merge(kw);
                             newLeafNode(kw, grammarAccess.getDecimalExpAccess().getHyphenMinusKeyword_5_1()); 
@@ -3746,7 +3746,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
             }
 
-            this_INT_9=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleDecimalExp3343); 
+            this_INT_9=(Token)match(input,RULE_INT,FOLLOW_2); 
 
             		current.merge(this_INT_9);
                 
@@ -3777,7 +3777,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleFQN"
-    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1400:1: entryRuleFQN returns [String current=null] : iv_ruleFQN= ruleFQN EOF ;
+    // InternalETMap.g:1400:1: entryRuleFQN returns [String current=null] : iv_ruleFQN= ruleFQN EOF ;
     public final String entryRuleFQN() throws RecognitionException {
         String current = null;
 
@@ -3785,17 +3785,17 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1401:2: (iv_ruleFQN= ruleFQN EOF )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1402:2: iv_ruleFQN= ruleFQN EOF
+            // InternalETMap.g:1401:2: (iv_ruleFQN= ruleFQN EOF )
+            // InternalETMap.g:1402:2: iv_ruleFQN= ruleFQN EOF
             {
              newCompositeNode(grammarAccess.getFQNRule()); 
-            pushFollow(FOLLOW_ruleFQN_in_entryRuleFQN3393);
+            pushFollow(FOLLOW_1);
             iv_ruleFQN=ruleFQN();
 
             state._fsp--;
 
              current =iv_ruleFQN.getText(); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleFQN3404); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3813,7 +3813,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleFQN"
-    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1409:1: ruleFQN returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* ) ;
+    // InternalETMap.g:1409: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();
 
@@ -3824,20 +3824,20 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1412:28: ( (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* ) )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1413:1: (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* )
+            // InternalETMap.g:1412:28: ( (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* ) )
+            // InternalETMap.g:1413:1: (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* )
             {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1413:1: (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1413:6: this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )*
+            // InternalETMap.g:1413:1: (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* )
+            // InternalETMap.g:1413:6: this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )*
             {
-            this_ID_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFQN3444); 
+            this_ID_0=(Token)match(input,RULE_ID,FOLLOW_26); 
 
             		current.merge(this_ID_0);
                 
              
                 newLeafNode(this_ID_0, grammarAccess.getFQNAccess().getIDTerminalRuleCall_0()); 
                 
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1420:1: (kw= '.' this_ID_2= RULE_ID )*
+            // InternalETMap.g:1420:1: (kw= '.' this_ID_2= RULE_ID )*
             loop23:
             do {
                 int alt23=2;
@@ -3850,14 +3850,14 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
                 switch (alt23) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1421:2: kw= '.' this_ID_2= RULE_ID
+            	    // InternalETMap.g:1421:2: kw= '.' this_ID_2= RULE_ID
             	    {
-            	    kw=(Token)match(input,35,FOLLOW_35_in_ruleFQN3463); 
+            	    kw=(Token)match(input,35,FOLLOW_3); 
 
             	            current.merge(kw);
             	            newLeafNode(kw, grammarAccess.getFQNAccess().getFullStopKeyword_1_0()); 
             	        
-            	    this_ID_2=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFQN3478); 
+            	    this_ID_2=(Token)match(input,RULE_ID,FOLLOW_26); 
 
             	    		current.merge(this_ID_2);
             	        
@@ -3894,7 +3894,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleLiteralType"
-    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1441:1: ruleLiteralType returns [Enumerator current=null] : ( (enumLiteral_0= 'ptBoolean' ) | (enumLiteral_1= 'ptInteger' ) | (enumLiteral_2= 'ptReal' ) | (enumLiteral_3= 'ptCharacter' ) ) ;
+    // InternalETMap.g:1441: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;
 
@@ -3905,10 +3905,10 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
          enterRule(); 
         try {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1443:28: ( ( (enumLiteral_0= 'ptBoolean' ) | (enumLiteral_1= 'ptInteger' ) | (enumLiteral_2= 'ptReal' ) | (enumLiteral_3= 'ptCharacter' ) ) )
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1444:1: ( (enumLiteral_0= 'ptBoolean' ) | (enumLiteral_1= 'ptInteger' ) | (enumLiteral_2= 'ptReal' ) | (enumLiteral_3= 'ptCharacter' ) )
+            // InternalETMap.g:1443:28: ( ( (enumLiteral_0= 'ptBoolean' ) | (enumLiteral_1= 'ptInteger' ) | (enumLiteral_2= 'ptReal' ) | (enumLiteral_3= 'ptCharacter' ) ) )
+            // InternalETMap.g:1444:1: ( (enumLiteral_0= 'ptBoolean' ) | (enumLiteral_1= 'ptInteger' ) | (enumLiteral_2= 'ptReal' ) | (enumLiteral_3= 'ptCharacter' ) )
             {
-            // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1444:1: ( (enumLiteral_0= 'ptBoolean' ) | (enumLiteral_1= 'ptInteger' ) | (enumLiteral_2= 'ptReal' ) | (enumLiteral_3= 'ptCharacter' ) )
+            // InternalETMap.g:1444:1: ( (enumLiteral_0= 'ptBoolean' ) | (enumLiteral_1= 'ptInteger' ) | (enumLiteral_2= 'ptReal' ) | (enumLiteral_3= 'ptCharacter' ) )
             int alt24=4;
             switch ( input.LA(1) ) {
             case 38:
@@ -3940,12 +3940,12 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
             switch (alt24) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1444:2: (enumLiteral_0= 'ptBoolean' )
+                    // InternalETMap.g:1444:2: (enumLiteral_0= 'ptBoolean' )
                     {
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1444:2: (enumLiteral_0= 'ptBoolean' )
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1444:4: enumLiteral_0= 'ptBoolean'
+                    // InternalETMap.g:1444:2: (enumLiteral_0= 'ptBoolean' )
+                    // InternalETMap.g:1444:4: enumLiteral_0= 'ptBoolean'
                     {
-                    enumLiteral_0=(Token)match(input,38,FOLLOW_38_in_ruleLiteralType3539); 
+                    enumLiteral_0=(Token)match(input,38,FOLLOW_2); 
 
                             current = grammarAccess.getLiteralTypeAccess().getBOOLEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
                             newLeafNode(enumLiteral_0, grammarAccess.getLiteralTypeAccess().getBOOLEnumLiteralDeclaration_0()); 
@@ -3957,12 +3957,12 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1450:6: (enumLiteral_1= 'ptInteger' )
+                    // InternalETMap.g:1450:6: (enumLiteral_1= 'ptInteger' )
                     {
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1450:6: (enumLiteral_1= 'ptInteger' )
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1450:8: enumLiteral_1= 'ptInteger'
+                    // InternalETMap.g:1450:6: (enumLiteral_1= 'ptInteger' )
+                    // InternalETMap.g:1450:8: enumLiteral_1= 'ptInteger'
                     {
-                    enumLiteral_1=(Token)match(input,39,FOLLOW_39_in_ruleLiteralType3556); 
+                    enumLiteral_1=(Token)match(input,39,FOLLOW_2); 
 
                             current = grammarAccess.getLiteralTypeAccess().getINTEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
                             newLeafNode(enumLiteral_1, grammarAccess.getLiteralTypeAccess().getINTEnumLiteralDeclaration_1()); 
@@ -3974,12 +3974,12 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1456:6: (enumLiteral_2= 'ptReal' )
+                    // InternalETMap.g:1456:6: (enumLiteral_2= 'ptReal' )
                     {
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1456:6: (enumLiteral_2= 'ptReal' )
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1456:8: enumLiteral_2= 'ptReal'
+                    // InternalETMap.g:1456:6: (enumLiteral_2= 'ptReal' )
+                    // InternalETMap.g:1456:8: enumLiteral_2= 'ptReal'
                     {
-                    enumLiteral_2=(Token)match(input,40,FOLLOW_40_in_ruleLiteralType3573); 
+                    enumLiteral_2=(Token)match(input,40,FOLLOW_2); 
 
                             current = grammarAccess.getLiteralTypeAccess().getREALEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
                             newLeafNode(enumLiteral_2, grammarAccess.getLiteralTypeAccess().getREALEnumLiteralDeclaration_2()); 
@@ -3991,12 +3991,12 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 4 :
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1462:6: (enumLiteral_3= 'ptCharacter' )
+                    // InternalETMap.g:1462:6: (enumLiteral_3= 'ptCharacter' )
                     {
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1462:6: (enumLiteral_3= 'ptCharacter' )
-                    // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1462:8: enumLiteral_3= 'ptCharacter'
+                    // InternalETMap.g:1462:6: (enumLiteral_3= 'ptCharacter' )
+                    // InternalETMap.g:1462:8: enumLiteral_3= 'ptCharacter'
                     {
-                    enumLiteral_3=(Token)match(input,41,FOLLOW_41_in_ruleLiteralType3590); 
+                    enumLiteral_3=(Token)match(input,41,FOLLOW_2); 
 
                             current = grammarAccess.getLiteralTypeAccess().getCHAREnumLiteralDeclaration_3().getEnumLiteral().getInstance();
                             newLeafNode(enumLiteral_3, grammarAccess.getLiteralTypeAccess().getCHAREnumLiteralDeclaration_3()); 
@@ -4031,145 +4031,31 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
 
  
 
-    public static final BitSet FOLLOW_ruleMappingModel_in_entryRuleMappingModel75 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleMappingModel85 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_12_in_ruleMappingModel122 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleFQN_in_ruleMappingModel143 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_13_in_ruleMappingModel155 = new BitSet(new long[]{0x000000000200C000L});
-    public static final BitSet FOLLOW_ruleImport_in_ruleMappingModel176 = new BitSet(new long[]{0x000000000200C000L});
-    public static final BitSet FOLLOW_ruleMapping_in_ruleMappingModel198 = new BitSet(new long[]{0x000000000000C000L});
-    public static final BitSet FOLLOW_14_in_ruleMappingModel211 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMapping_in_entryRuleMapping247 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleMapping257 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_15_in_ruleMapping294 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleFQN_in_ruleMapping317 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_16_in_ruleMapping329 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleFQN_in_ruleMapping352 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_13_in_ruleMapping364 = new BitSet(new long[]{0x0000000000024000L});
-    public static final BitSet FOLLOW_ruleSubSystemMapping_in_ruleMapping385 = new BitSet(new long[]{0x0000000000024000L});
-    public static final BitSet FOLLOW_14_in_ruleMapping398 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSubSystemMapping_in_entryRuleSubSystemMapping434 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSubSystemMapping444 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_17_in_ruleSubSystemMapping481 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleSubSystemMapping501 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_16_in_ruleSubSystemMapping513 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleSubSystemMapping533 = new BitSet(new long[]{0x0000000000002002L});
-    public static final BitSet FOLLOW_13_in_ruleSubSystemMapping546 = new BitSet(new long[]{0x0000000000044000L});
-    public static final BitSet FOLLOW_ruleThreadMapping_in_ruleSubSystemMapping567 = new BitSet(new long[]{0x0000000000044000L});
-    public static final BitSet FOLLOW_14_in_ruleSubSystemMapping580 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleThreadMapping_in_entryRuleThreadMapping618 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleThreadMapping628 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_18_in_ruleThreadMapping665 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleThreadMapping685 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_16_in_ruleThreadMapping697 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleThreadMapping717 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleKeyValue_in_entryRuleKeyValue755 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleKeyValue765 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleKeyValue807 = new BitSet(new long[]{0x0000000000080000L});
-    public static final BitSet FOLLOW_19_in_ruleKeyValue824 = new BitSet(new long[]{0x00000007800000E0L});
-    public static final BitSet FOLLOW_ruleLiteral_in_ruleKeyValue845 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAnnotationTargetType_in_entryRuleAnnotationTargetType884 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAnnotationTargetType895 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleAnnotationTargetType934 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAnnotationAttribute_in_entryRuleAnnotationAttribute978 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAnnotationAttribute988 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleAnnotationAttribute_in_ruleAnnotationAttribute1035 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleEnumAnnotationAttribute_in_ruleAnnotationAttribute1062 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleAnnotationAttribute_in_entryRuleSimpleAnnotationAttribute1097 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSimpleAnnotationAttribute1107 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_20_in_ruleSimpleAnnotationAttribute1151 = new BitSet(new long[]{0x0000000000400000L});
-    public static final BitSet FOLLOW_21_in_ruleSimpleAnnotationAttribute1182 = new BitSet(new long[]{0x0000000000400000L});
-    public static final BitSet FOLLOW_22_in_ruleSimpleAnnotationAttribute1195 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleSimpleAnnotationAttribute1212 = new BitSet(new long[]{0x0000000000800000L});
-    public static final BitSet FOLLOW_23_in_ruleSimpleAnnotationAttribute1229 = new BitSet(new long[]{0x000003C000000000L});
-    public static final BitSet FOLLOW_ruleLiteralType_in_ruleSimpleAnnotationAttribute1250 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleEnumAnnotationAttribute_in_entryRuleEnumAnnotationAttribute1286 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleEnumAnnotationAttribute1296 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_20_in_ruleEnumAnnotationAttribute1340 = new BitSet(new long[]{0x0000000000400000L});
-    public static final BitSet FOLLOW_21_in_ruleEnumAnnotationAttribute1371 = new BitSet(new long[]{0x0000000000400000L});
-    public static final BitSet FOLLOW_22_in_ruleEnumAnnotationAttribute1384 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleEnumAnnotationAttribute1401 = new BitSet(new long[]{0x0000000000800000L});
-    public static final BitSet FOLLOW_23_in_ruleEnumAnnotationAttribute1418 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_13_in_ruleEnumAnnotationAttribute1430 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleEnumAnnotationAttribute1447 = new BitSet(new long[]{0x0000000001004000L});
-    public static final BitSet FOLLOW_24_in_ruleEnumAnnotationAttribute1465 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleEnumAnnotationAttribute1482 = new BitSet(new long[]{0x0000000001004000L});
-    public static final BitSet FOLLOW_14_in_ruleEnumAnnotationAttribute1501 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleImport_in_entryRuleImport1537 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleImport1547 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_25_in_ruleImport1584 = new BitSet(new long[]{0x0000000008000010L});
-    public static final BitSet FOLLOW_ruleImportedFQN_in_ruleImport1607 = new BitSet(new long[]{0x0000000004000000L});
-    public static final BitSet FOLLOW_26_in_ruleImport1619 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_27_in_ruleImport1638 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleImport1656 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleImportedFQN_in_entryRuleImportedFQN1698 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleImportedFQN1709 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_ruleImportedFQN1756 = new BitSet(new long[]{0x0000000010000002L});
-    public static final BitSet FOLLOW_28_in_ruleImportedFQN1775 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_entryRuleDocumentation1817 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDocumentation1827 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_ruleDocumentation1873 = new BitSet(new long[]{0x0000000040000020L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleDocumentation1890 = new BitSet(new long[]{0x0000000040000020L});
-    public static final BitSet FOLLOW_30_in_ruleDocumentation1908 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLiteral_in_entryRuleLiteral1948 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleLiteral1958 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleBooleanLiteral_in_ruleLiteral2005 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNumberLiteral_in_ruleLiteral2032 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStringLiteral_in_ruleLiteral2059 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleBooleanLiteral_in_entryRuleBooleanLiteral2094 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleBooleanLiteral2104 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_31_in_ruleBooleanLiteral2151 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_ruleBooleanLiteral2175 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNumberLiteral_in_entryRuleNumberLiteral2225 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleNumberLiteral2235 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntLiteral_in_ruleNumberLiteral2282 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRealLiteral_in_ruleNumberLiteral2309 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRealLiteral_in_entryRuleRealLiteral2344 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRealLiteral2354 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleReal_in_ruleRealLiteral2409 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntLiteral_in_entryRuleIntLiteral2445 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIntLiteral2455 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInteger_in_ruleIntLiteral2510 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStringLiteral_in_entryRuleStringLiteral2546 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleStringLiteral2556 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleStringLiteral2607 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInteger_in_entryRuleInteger2649 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleInteger2660 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_ruleInteger2700 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_34_in_ruleInteger2719 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleInteger2736 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_HEX_in_ruleInteger2763 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleReal_in_entryRuleReal2809 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleReal2820 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDecimal_in_ruleReal2867 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDecimalExp_in_ruleReal2900 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDecimal_in_entryRuleDecimal2952 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDecimal2963 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_ruleDecimal3006 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_34_in_ruleDecimal3025 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleDecimal3042 = new BitSet(new long[]{0x0000000800000000L});
-    public static final BitSet FOLLOW_35_in_ruleDecimal3060 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleDecimal3075 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDecimalExp_in_entryRuleDecimalExp3131 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDecimalExp3142 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_ruleDecimalExp3185 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_34_in_ruleDecimalExp3204 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleDecimalExp3221 = new BitSet(new long[]{0x0000000800000000L});
-    public static final BitSet FOLLOW_35_in_ruleDecimalExp3239 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleDecimalExp3254 = new BitSet(new long[]{0x0000003000000000L});
-    public static final BitSet FOLLOW_36_in_ruleDecimalExp3273 = new BitSet(new long[]{0x0000000600000040L});
-    public static final BitSet FOLLOW_37_in_ruleDecimalExp3292 = new BitSet(new long[]{0x0000000600000040L});
-    public static final BitSet FOLLOW_33_in_ruleDecimalExp3307 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_34_in_ruleDecimalExp3326 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleDecimalExp3343 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_entryRuleFQN3393 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleFQN3404 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleFQN3444 = new BitSet(new long[]{0x0000000800000002L});
-    public static final BitSet FOLLOW_35_in_ruleFQN3463 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleFQN3478 = new BitSet(new long[]{0x0000000800000002L});
-    public static final BitSet FOLLOW_38_in_ruleLiteralType3539 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_39_in_ruleLiteralType3556 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_40_in_ruleLiteralType3573 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_ruleLiteralType3590 = 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[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x0000000000002000L});
+    public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x000000000200C000L});
+    public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x000000000000C000L});
+    public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x0000000000010000L});
+    public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x0000000000024000L});
+    public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x0000000000002002L});
+    public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0000000000044000L});
+    public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0000000000080000L});
+    public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x00000007800000E0L});
+    public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000000000400000L});
+    public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x0000000000800000L});
+    public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x000003C000000000L});
+    public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0000000001004000L});
+    public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0000000008000010L});
+    public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0000000004000000L});
+    public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x0000000010000002L});
+    public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x0000000040000020L});
+    public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0000000000000040L});
+    public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x0000000800000000L});
+    public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x0000003000000000L});
+    public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x0000000600000040L});
+    public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x0000000800000002L});
 
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/serializer/ETMapSemanticSequencer.java b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/serializer/ETMapSemanticSequencer.java
index 461fe5519..2416db0f7 100644
--- a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/serializer/ETMapSemanticSequencer.java
+++ b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/serializer/ETMapSemanticSequencer.java
@@ -1,8 +1,12 @@
+/*
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.etmap.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;
@@ -23,14 +27,11 @@ import org.eclipse.etrice.core.etmap.eTMap.MappingModel;
 import org.eclipse.etrice.core.etmap.eTMap.SubSystemMapping;
 import org.eclipse.etrice.core.etmap.eTMap.ThreadMapping;
 import org.eclipse.etrice.core.etmap.services.ETMapGrammarAccess;
-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")
@@ -39,160 +40,125 @@ public class ETMapSemanticSequencer extends BaseSemanticSequencer {
 	@Inject
 	private ETMapGrammarAccess 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() == ETMapPackage.eINSTANCE) switch(semanticObject.eClass().getClassifierID()) {
+		else if (epackage == ETMapPackage.eINSTANCE)
+			switch (semanticObject.eClass().getClassifierID()) {
 			case ETMapPackage.MAPPING:
-				if(context == grammarAccess.getMappingRule()) {
-					sequence_Mapping(context, (Mapping) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_Mapping(context, (Mapping) semanticObject); 
+				return; 
 			case ETMapPackage.MAPPING_MODEL:
-				if(context == grammarAccess.getMappingModelRule()) {
-					sequence_MappingModel(context, (MappingModel) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_MappingModel(context, (MappingModel) semanticObject); 
+				return; 
 			case ETMapPackage.SUB_SYSTEM_MAPPING:
-				if(context == grammarAccess.getSubSystemMappingRule()) {
-					sequence_SubSystemMapping(context, (SubSystemMapping) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_SubSystemMapping(context, (SubSystemMapping) semanticObject); 
+				return; 
 			case ETMapPackage.THREAD_MAPPING:
-				if(context == grammarAccess.getThreadMappingRule()) {
-					sequence_ThreadMapping(context, (ThreadMapping) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_ThreadMapping(context, (ThreadMapping) semanticObject); 
+				return; 
 			}
-		if (errorAcceptor != null) errorAcceptor.accept(diagnosticProvider.createInvalidContextOrTypeDiagnostic(semanticObject, context));
+		if (errorAcceptor != null)
+			errorAcceptor.accept(diagnosticProvider.createInvalidContextOrTypeDiagnostic(semanticObject, context));
 	}
 	
 	/**
+	 * Contexts:
+	 *     MappingModel returns MappingModel
+	 *
 	 * Constraint:
 	 *     (name=FQN imports+=Import* mappings+=Mapping*)
 	 */
-	protected void sequence_MappingModel(EObject context, MappingModel semanticObject) {
+	protected void sequence_MappingModel(ISerializationContext context, MappingModel semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Mapping returns Mapping
+	 *
 	 * Constraint:
 	 *     (logicalSys=[LogicalSystem|FQN] physicalSys=[PhysicalSystem|FQN] subsysMappings+=SubSystemMapping*)
 	 */
-	protected void sequence_Mapping(EObject context, Mapping semanticObject) {
+	protected void sequence_Mapping(ISerializationContext context, Mapping semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     SubSystemMapping returns SubSystemMapping
+	 *
 	 * Constraint:
 	 *     (logicalSubSys=[SubSystemRef|ID] node=[NodeRef|ID] threadMappings+=ThreadMapping*)
 	 */
-	protected void sequence_SubSystemMapping(EObject context, SubSystemMapping semanticObject) {
+	protected void sequence_SubSystemMapping(ISerializationContext context, SubSystemMapping semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     ThreadMapping returns ThreadMapping
+	 *
 	 * Constraint:
 	 *     (logicalThread=[LogicalThread|ID] physicalThread=[PhysicalThread|ID])
 	 */
-	protected void sequence_ThreadMapping(EObject context, ThreadMapping semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, ETMapPackage.Literals.THREAD_MAPPING__LOGICAL_THREAD) == ValueTransient.YES)
+	protected void sequence_ThreadMapping(ISerializationContext context, ThreadMapping semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, ETMapPackage.Literals.THREAD_MAPPING__LOGICAL_THREAD) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ETMapPackage.Literals.THREAD_MAPPING__LOGICAL_THREAD));
-			if(transientValues.isValueTransient(semanticObject, ETMapPackage.Literals.THREAD_MAPPING__PHYSICAL_THREAD) == ValueTransient.YES)
+			if (transientValues.isValueTransient(semanticObject, ETMapPackage.Literals.THREAD_MAPPING__PHYSICAL_THREAD) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ETMapPackage.Literals.THREAD_MAPPING__PHYSICAL_THREAD));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
 		feeder.accept(grammarAccess.getThreadMappingAccess().getLogicalThreadLogicalThreadIDTerminalRuleCall_1_0_1(), semanticObject.getLogicalThread());
 		feeder.accept(grammarAccess.getThreadMappingAccess().getPhysicalThreadPhysicalThreadIDTerminalRuleCall_3_0_1(), semanticObject.getPhysicalThread());
 		feeder.finish();
 	}
+	
+	
 }
diff --git a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/serializer/ETMapSyntacticSequencer.java b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/serializer/ETMapSyntacticSequencer.java
index 428c6c630..9b2dae0c3 100644
--- a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/serializer/ETMapSyntacticSequencer.java
+++ b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/serializer/ETMapSyntacticSequencer.java
@@ -1,3 +1,6 @@
+/*
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.etmap.serializer;
 
 import com.google.inject.Inject;
@@ -38,15 +41,18 @@ public class ETMapSyntacticSequencer extends AbstractSyntacticSequencer {
 		List<INode> transitionNodes = collectNodes(fromNode, toNode);
 		for (AbstractElementAlias syntax : transition.getAmbiguousSyntaxes()) {
 			List<INode> syntaxNodes = getNodesFor(transitionNodes, syntax);
-			if(match_SubSystemMapping___LeftCurlyBracketKeyword_4_0_RightCurlyBracketKeyword_4_2__q.equals(syntax))
+			if (match_SubSystemMapping___LeftCurlyBracketKeyword_4_0_RightCurlyBracketKeyword_4_2__q.equals(syntax))
 				emit_SubSystemMapping___LeftCurlyBracketKeyword_4_0_RightCurlyBracketKeyword_4_2__q(semanticObject, getLastNavigableState(), syntaxNodes);
 			else acceptNodes(getLastNavigableState(), syntaxNodes);
 		}
 	}
 
 	/**
-	 * Syntax:
+	 * Ambiguous syntax:
 	 *     ('{' '}')?
+	 *
+	 * This ambiguous syntax occurs at:
+	 *     node=[NodeRef|ID] (ambiguity) (rule end)
 	 */
 	protected void emit_SubSystemMapping___LeftCurlyBracketKeyword_4_0_RightCurlyBracketKeyword_4_2__q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
 		acceptNodes(transition, nodes);
diff --git a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/services/ETMapGrammarAccess.java b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/services/ETMapGrammarAccess.java
index 1c820cf31..6151eaace 100644
--- a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/services/ETMapGrammarAccess.java
+++ b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/services/ETMapGrammarAccess.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.etmap.services;
 
 import com.google.inject.Singleton;
@@ -13,13 +13,14 @@ 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 ETMapGrammarAccess extends AbstractGrammarElementFinder {
 	
 	
 	public class MappingModelElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "MappingModel");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.etmap.ETMap.MappingModel");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cMappingModelKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -32,13 +33,16 @@ public class ETMapGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cRightCurlyBracketKeyword_5 = (Keyword)cGroup.eContents().get(5);
 		
 		//MappingModel:
-		//	"MappingModel" name=FQN "{" imports+=Import* mappings+=Mapping* "}";
-		public ParserRule getRule() { return rule; }
+		//	'MappingModel' name=FQN '{'
+		//	imports+=Import*
+		//	mappings+=Mapping*
+		//	'}';
+		@Override public ParserRule getRule() { return rule; }
 
-		//"MappingModel" name=FQN "{" imports+=Import* mappings+=Mapping* "}"
+		//'MappingModel' name=FQN '{' imports+=Import* mappings+=Mapping* '}'
 		public Group getGroup() { return cGroup; }
 
-		//"MappingModel"
+		//'MappingModel'
 		public Keyword getMappingModelKeyword_0() { return cMappingModelKeyword_0; }
 
 		//name=FQN
@@ -47,7 +51,7 @@ public class ETMapGrammarAccess extends AbstractGrammarElementFinder {
 		//FQN
 		public RuleCall getNameFQNParserRuleCall_1_0() { return cNameFQNParserRuleCall_1_0; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_2() { return cLeftCurlyBracketKeyword_2; }
 
 		//imports+=Import*
@@ -62,12 +66,12 @@ public class ETMapGrammarAccess extends AbstractGrammarElementFinder {
 		//Mapping
 		public RuleCall getMappingsMappingParserRuleCall_4_0() { return cMappingsMappingParserRuleCall_4_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_5() { return cRightCurlyBracketKeyword_5; }
 	}
 
 	public class MappingElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Mapping");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.etmap.ETMap.Mapping");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cMappingKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cLogicalSysAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -83,15 +87,16 @@ public class ETMapGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cRightCurlyBracketKeyword_6 = (Keyword)cGroup.eContents().get(6);
 		
 		//Mapping:
-		//	"Mapping" logicalSys=[room::LogicalSystem|FQN] "->" physicalSys=[phys::PhysicalSystem|FQN] "{"
-		//	subsysMappings+=SubSystemMapping* "}";
-		public ParserRule getRule() { return rule; }
+		//	'Mapping' logicalSys=[room::LogicalSystem|FQN] '->' physicalSys=[phys::PhysicalSystem|FQN] '{'
+		//	subsysMappings+=SubSystemMapping*
+		//	'}';
+		@Override public ParserRule getRule() { return rule; }
 
-		//"Mapping" logicalSys=[room::LogicalSystem|FQN] "->" physicalSys=[phys::PhysicalSystem|FQN] "{"
-		//subsysMappings+=SubSystemMapping* "}"
+		//'Mapping' logicalSys=[room::LogicalSystem|FQN] '->' physicalSys=[phys::PhysicalSystem|FQN] '{'
+		//subsysMappings+=SubSystemMapping* '}'
 		public Group getGroup() { return cGroup; }
 
-		//"Mapping"
+		//'Mapping'
 		public Keyword getMappingKeyword_0() { return cMappingKeyword_0; }
 
 		//logicalSys=[room::LogicalSystem|FQN]
@@ -103,7 +108,7 @@ public class ETMapGrammarAccess extends AbstractGrammarElementFinder {
 		//FQN
 		public RuleCall getLogicalSysLogicalSystemFQNParserRuleCall_1_0_1() { return cLogicalSysLogicalSystemFQNParserRuleCall_1_0_1; }
 
-		//"->"
+		//'->'
 		public Keyword getHyphenMinusGreaterThanSignKeyword_2() { return cHyphenMinusGreaterThanSignKeyword_2; }
 
 		//physicalSys=[phys::PhysicalSystem|FQN]
@@ -115,7 +120,7 @@ public class ETMapGrammarAccess extends AbstractGrammarElementFinder {
 		//FQN
 		public RuleCall getPhysicalSysPhysicalSystemFQNParserRuleCall_3_0_1() { return cPhysicalSysPhysicalSystemFQNParserRuleCall_3_0_1; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_4() { return cLeftCurlyBracketKeyword_4; }
 
 		//subsysMappings+=SubSystemMapping*
@@ -124,12 +129,12 @@ public class ETMapGrammarAccess extends AbstractGrammarElementFinder {
 		//SubSystemMapping
 		public RuleCall getSubsysMappingsSubSystemMappingParserRuleCall_5_0() { return cSubsysMappingsSubSystemMappingParserRuleCall_5_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_6() { return cRightCurlyBracketKeyword_6; }
 	}
 
 	public class SubSystemMappingElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "SubSystemMapping");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.etmap.ETMap.SubSystemMapping");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cSubSystemMappingKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cLogicalSubSysAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -146,15 +151,16 @@ public class ETMapGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cRightCurlyBracketKeyword_4_2 = (Keyword)cGroup_4.eContents().get(2);
 		
 		//SubSystemMapping:
-		//	"SubSystemMapping" logicalSubSys=[room::SubSystemRef] "->" node=[phys::NodeRef] ("{" threadMappings+=ThreadMapping*
-		//	"}")?;
-		public ParserRule getRule() { return rule; }
+		//	'SubSystemMapping' logicalSubSys=[room::SubSystemRef] '->' node=[phys::NodeRef] ('{'
+		//	threadMappings+=ThreadMapping*
+		//	'}')?;
+		@Override public ParserRule getRule() { return rule; }
 
-		//"SubSystemMapping" logicalSubSys=[room::SubSystemRef] "->" node=[phys::NodeRef] ("{" threadMappings+=ThreadMapping*
-		//"}")?
+		//'SubSystemMapping' logicalSubSys=[room::SubSystemRef] '->' node=[phys::NodeRef] ('{' threadMappings+=ThreadMapping*
+		//'}')?
 		public Group getGroup() { return cGroup; }
 
-		//"SubSystemMapping"
+		//'SubSystemMapping'
 		public Keyword getSubSystemMappingKeyword_0() { return cSubSystemMappingKeyword_0; }
 
 		//logicalSubSys=[room::SubSystemRef]
@@ -166,7 +172,7 @@ public class ETMapGrammarAccess extends AbstractGrammarElementFinder {
 		//ID
 		public RuleCall getLogicalSubSysSubSystemRefIDTerminalRuleCall_1_0_1() { return cLogicalSubSysSubSystemRefIDTerminalRuleCall_1_0_1; }
 
-		//"->"
+		//'->'
 		public Keyword getHyphenMinusGreaterThanSignKeyword_2() { return cHyphenMinusGreaterThanSignKeyword_2; }
 
 		//node=[phys::NodeRef]
@@ -178,10 +184,10 @@ public class ETMapGrammarAccess extends AbstractGrammarElementFinder {
 		//ID
 		public RuleCall getNodeNodeRefIDTerminalRuleCall_3_0_1() { return cNodeNodeRefIDTerminalRuleCall_3_0_1; }
 
-		//("{" threadMappings+=ThreadMapping* "}")?
+		//('{' threadMappings+=ThreadMapping* '}')?
 		public Group getGroup_4() { return cGroup_4; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_4_0() { return cLeftCurlyBracketKeyword_4_0; }
 
 		//threadMappings+=ThreadMapping*
@@ -190,12 +196,12 @@ public class ETMapGrammarAccess extends AbstractGrammarElementFinder {
 		//ThreadMapping
 		public RuleCall getThreadMappingsThreadMappingParserRuleCall_4_1_0() { return cThreadMappingsThreadMappingParserRuleCall_4_1_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_4_2() { return cRightCurlyBracketKeyword_4_2; }
 	}
 
 	public class ThreadMappingElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ThreadMapping");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.etmap.ETMap.ThreadMapping");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cThreadMappingKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cLogicalThreadAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -207,13 +213,13 @@ public class ETMapGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cPhysicalThreadPhysicalThreadIDTerminalRuleCall_3_0_1 = (RuleCall)cPhysicalThreadPhysicalThreadCrossReference_3_0.eContents().get(1);
 		
 		//ThreadMapping:
-		//	"ThreadMapping" logicalThread=[room::LogicalThread] "->" physicalThread=[phys::PhysicalThread];
-		public ParserRule getRule() { return rule; }
+		//	'ThreadMapping' logicalThread=[room::LogicalThread] '->' physicalThread=[phys::PhysicalThread];
+		@Override public ParserRule getRule() { return rule; }
 
-		//"ThreadMapping" logicalThread=[room::LogicalThread] "->" physicalThread=[phys::PhysicalThread]
+		//'ThreadMapping' logicalThread=[room::LogicalThread] '->' physicalThread=[phys::PhysicalThread]
 		public Group getGroup() { return cGroup; }
 
-		//"ThreadMapping"
+		//'ThreadMapping'
 		public Keyword getThreadMappingKeyword_0() { return cThreadMappingKeyword_0; }
 
 		//logicalThread=[room::LogicalThread]
@@ -225,7 +231,7 @@ public class ETMapGrammarAccess extends AbstractGrammarElementFinder {
 		//ID
 		public RuleCall getLogicalThreadLogicalThreadIDTerminalRuleCall_1_0_1() { return cLogicalThreadLogicalThreadIDTerminalRuleCall_1_0_1; }
 
-		//"->"
+		//'->'
 		public Keyword getHyphenMinusGreaterThanSignKeyword_2() { return cHyphenMinusGreaterThanSignKeyword_2; }
 
 		//physicalThread=[phys::PhysicalThread]
@@ -248,11 +254,15 @@ public class ETMapGrammarAccess extends AbstractGrammarElementFinder {
 
 	private final BaseGrammarAccess gaBase;
 
+	private final TerminalsGrammarAccess gaTerminals;
+
 	@Inject
 	public ETMapGrammarAccess(GrammarProvider grammarProvider,
-		BaseGrammarAccess gaBase) {
+		BaseGrammarAccess gaBase,
+		TerminalsGrammarAccess gaTerminals) {
 		this.grammar = internalFindGrammar(grammarProvider);
 		this.gaBase = gaBase;
+		this.gaTerminals = gaTerminals;
 		this.pMappingModel = new MappingModelElements();
 		this.pMapping = new MappingElements();
 		this.pSubSystemMapping = new SubSystemMappingElements();
@@ -275,7 +285,7 @@ public class ETMapGrammarAccess extends AbstractGrammarElementFinder {
 		return grammar;
 	}
 	
-	
+	@Override
 	public Grammar getGrammar() {
 		return grammar;
 	}
@@ -285,9 +295,16 @@ public class ETMapGrammarAccess extends AbstractGrammarElementFinder {
 		return gaBase;
 	}
 
+	public TerminalsGrammarAccess getTerminalsGrammarAccess() {
+		return gaTerminals;
+	}
+
 	
 	//MappingModel:
-	//	"MappingModel" name=FQN "{" imports+=Import* mappings+=Mapping* "}";
+	//	'MappingModel' name=FQN '{'
+	//	imports+=Import*
+	//	mappings+=Mapping*
+	//	'}';
 	public MappingModelElements getMappingModelAccess() {
 		return pMappingModel;
 	}
@@ -297,8 +314,9 @@ public class ETMapGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//Mapping:
-	//	"Mapping" logicalSys=[room::LogicalSystem|FQN] "->" physicalSys=[phys::PhysicalSystem|FQN] "{"
-	//	subsysMappings+=SubSystemMapping* "}";
+	//	'Mapping' logicalSys=[room::LogicalSystem|FQN] '->' physicalSys=[phys::PhysicalSystem|FQN] '{'
+	//	subsysMappings+=SubSystemMapping*
+	//	'}';
 	public MappingElements getMappingAccess() {
 		return pMapping;
 	}
@@ -308,8 +326,9 @@ public class ETMapGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//SubSystemMapping:
-	//	"SubSystemMapping" logicalSubSys=[room::SubSystemRef] "->" node=[phys::NodeRef] ("{" threadMappings+=ThreadMapping*
-	//	"}")?;
+	//	'SubSystemMapping' logicalSubSys=[room::SubSystemRef] '->' node=[phys::NodeRef] ('{'
+	//	threadMappings+=ThreadMapping*
+	//	'}')?;
 	public SubSystemMappingElements getSubSystemMappingAccess() {
 		return pSubSystemMapping;
 	}
@@ -319,7 +338,7 @@ public class ETMapGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//ThreadMapping:
-	//	"ThreadMapping" logicalThread=[room::LogicalThread] "->" physicalThread=[phys::PhysicalThread];
+	//	'ThreadMapping' logicalThread=[room::LogicalThread] '->' physicalThread=[phys::PhysicalThread];
 	public ThreadMappingElements getThreadMappingAccess() {
 		return pThreadMapping;
 	}
@@ -331,7 +350,7 @@ public class ETMapGrammarAccess 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();
 	}
@@ -341,7 +360,7 @@ public class ETMapGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//KeyValue:
-	//	key=ID "=" value=Literal;
+	//	key=ID '=' value=Literal;
 	public BaseGrammarAccess.KeyValueElements getKeyValueAccess() {
 		return gaBase.getKeyValueAccess();
 	}
@@ -351,8 +370,10 @@ public class ETMapGrammarAccess 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();
 	}
@@ -390,7 +411,7 @@ public class ETMapGrammarAccess 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();
 	}
@@ -400,7 +421,7 @@ public class ETMapGrammarAccess 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();
 	}
@@ -430,7 +451,7 @@ public class ETMapGrammarAccess 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();
 	}
@@ -440,7 +461,7 @@ public class ETMapGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//ImportedFQN:
-	//	FQN ".*"?;
+	//	FQN '.*'?;
 	public BaseGrammarAccess.ImportedFQNElements getImportedFQNAccess() {
 		return gaBase.getImportedFQNAccess();
 	}
@@ -452,7 +473,10 @@ public class ETMapGrammarAccess extends AbstractGrammarElementFinder {
 	//// **************************************************************
 	//// Documentation Rule
 	//Documentation:
-	//	{Documentation} "[" lines+=STRING* "]";
+	//	{Documentation}
+	//	'['
+	//	lines+=STRING*
+	//	']';
 	public BaseGrammarAccess.DocumentationElements getDocumentationAccess() {
 		return gaBase.getDocumentationAccess();
 	}
@@ -463,8 +487,8 @@ public class ETMapGrammarAccess 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();
 	}
@@ -473,10 +497,11 @@ public class ETMapGrammarAccess 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();
 	}
@@ -486,7 +511,7 @@ public class ETMapGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//LiteralArray:
-	//	literals+=Literal ("," literals+=Literal)*;
+	//	literals+=Literal (',' literals+=Literal)*;
 	public BaseGrammarAccess.LiteralArrayElements getLiteralArrayAccess() {
 		return gaBase.getLiteralArrayAccess();
 	}
@@ -507,7 +532,7 @@ public class ETMapGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//BooleanLiteral:
-	//	{BooleanLiteral} ("false" | isTrue?="true");
+	//	{BooleanLiteral} ('false' | isTrue?='true');
 	public BaseGrammarAccess.BooleanLiteralElements getBooleanLiteralAccess() {
 		return gaBase.getBooleanLiteralAccess();
 	}
@@ -556,8 +581,8 @@ public class ETMapGrammarAccess extends AbstractGrammarElementFinder {
 		return getStringLiteralAccess().getRule();
 	}
 
-	//Integer returns ecore::ELong:
-	//	("+" | "-")? INT | HEX;
+	//Integer ecore::ELong:
+	//	('+' | '-')? INT | HEX
 	public BaseGrammarAccess.IntegerElements getIntegerAccess() {
 		return gaBase.getIntegerAccess();
 	}
@@ -566,8 +591,8 @@ public class ETMapGrammarAccess 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();
 	}
@@ -577,7 +602,7 @@ public class ETMapGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//Decimal hidden():
-	//	("+" | "-")? INT "." INT;
+	//	('+' | '-')? INT '.' INT;
 	public BaseGrammarAccess.DecimalElements getDecimalAccess() {
 		return gaBase.getDecimalAccess();
 	}
@@ -592,7 +617,7 @@ public class ETMapGrammarAccess extends AbstractGrammarElementFinder {
 	////DecimalDot hidden():
 	////	('+' | '-')? INT '.';
 	//DecimalExp hidden():
-	//	("+" | "-")? INT "." INT ("e" | "E") ("+" | "-")? INT;
+	//	('+' | '-')? INT '.' INT ('e' | 'E') ('+' | '-')? INT;
 	public BaseGrammarAccess.DecimalExpElements getDecimalExpAccess() {
 		return gaBase.getDecimalExpAccess();
 	}
@@ -602,7 +627,7 @@ public class ETMapGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//FQN:
-	//	ID ("." ID)*;
+	//	ID ('.' ID)*;
 	public BaseGrammarAccess.FQNElements getFQNAccess() {
 		return gaBase.getFQNAccess();
 	}
@@ -612,51 +637,50 @@ public class ETMapGrammarAccess 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.etmap/src-gen/org/eclipse/etrice/core/etmap/validation/AbstractETMapJavaValidator.java b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/validation/AbstractETMapJavaValidator.java
index e69c2d77b..55d340a01 100644
--- a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/validation/AbstractETMapJavaValidator.java
+++ b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/validation/AbstractETMapJavaValidator.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.etmap.validation;
  
 import java.util.ArrayList;
diff --git a/plugins/org.eclipse.etrice.core.etphys.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.etphys.ui/META-INF/MANIFEST.MF
index 57dcb1dac..2d2d8dbd0 100644
--- a/plugins/org.eclipse.etrice.core.etphys.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.etphys.ui/META-INF/MANIFEST.MF
@@ -22,5 +22,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.etrice.core.etphys.ui.contentassist,
  org.eclipse.etrice.core.etphys.ui.contentassist.antlr,
  org.eclipse.etrice.core.etphys.ui.internal,
- org.eclipse.etrice.core.etphys.ui.quickfix
+ org.eclipse.etrice.core.etphys.ui.quickfix,
+ org.eclipse.etrice.core.etphys.ui.contentassist.antlr.internal
 Bundle-Activator: org.eclipse.etrice.core.etphys.ui.internal.ETPhysActivator
diff --git a/plugins/org.eclipse.etrice.core.etphys.ui/plugin.xml_gen b/plugins/org.eclipse.etrice.core.etphys.ui/plugin.xml_gen
index 635e4ec0d..618a93985 100644
--- a/plugins/org.eclipse.etrice.core.etphys.ui/plugin.xml_gen
+++ b/plugins/org.eclipse.etrice.core.etphys.ui/plugin.xml_gen
@@ -279,6 +279,27 @@
 	        <filter name="projectNature" value="org.eclipse.xtext.ui.shared.xtextNature"/>
         </page>
     </extension>
+    <extension point="org.eclipse.ui.menus">
+		<menuContribution locationURI="popup:#TextEditorContext?after=xtext.ui.openDeclaration">
+			<command
+				commandId="org.eclipse.xtext.ui.OpenGeneratedFileCommand"
+				id="org.eclipse.etrice.core.etphys.ETPhys.OpenGeneratedCode"
+				style="push">
+					<visibleWhen checkEnabled="false">
+						<reference definitionId="org.eclipse.etrice.core.etphys.ETPhys.Editor.opened" />
+					</visibleWhen>
+			</command>
+		</menuContribution>
+	</extension>
+	<extension point="org.eclipse.ui.handlers">
+		<handler
+			class="org.eclipse.etrice.core.etphys.ui.ETPhysExecutableExtensionFactory:org.eclipse.xtext.ui.generator.trace.OpenGeneratedFileHandler"
+			commandId="org.eclipse.xtext.ui.OpenGeneratedFileCommand">
+				<activeWhen>
+					<reference definitionId="org.eclipse.etrice.core.etphys.ETPhys.Editor.opened" />
+				</activeWhen>
+		</handler>
+	</extension>
 
 	<!-- Quick Outline -->
 	<extension
@@ -394,5 +415,11 @@
             extensions="etphys">
     </provider>
   </extension>
+  <extension point="org.eclipse.team.core.fileTypes">
+    <fileTypes
+            extension="etphys"
+            type="text">
+    </fileTypes>
+  </extension>
 
 </plugin>
diff --git a/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/AbstractETPhysUiModule.java b/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/AbstractETPhysUiModule.java
index 8b51ddeb3..bb4ad7642 100644
--- a/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/AbstractETPhysUiModule.java
+++ b/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/AbstractETPhysUiModule.java
@@ -4,14 +4,13 @@
  */
 package org.eclipse.etrice.core.etphys.ui;
 
-import org.eclipse.xtext.ui.DefaultUiModule;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 
 /**
  * Manual modifications go to {org.eclipse.etrice.core.etphys.ui.ETPhysUiModule}
  */
 @SuppressWarnings("all")
-public abstract class AbstractETPhysUiModule extends DefaultUiModule {
+public abstract class AbstractETPhysUiModule extends org.eclipse.xtext.ui.DefaultUiModule {
 	
 	public AbstractETPhysUiModule(AbstractUIPlugin plugin) {
 		super(plugin);
diff --git a/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/AbstractETPhysProposalProvider.java b/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/AbstractETPhysProposalProvider.java
index 6100caac9..828393971 100644
--- a/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/AbstractETPhysProposalProvider.java
+++ b/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/AbstractETPhysProposalProvider.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.etphys.ui.contentassist;
 
 import org.eclipse.emf.ecore.EObject;
diff --git a/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/ETPhysParser.java b/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/ETPhysParser.java
index 5b41fd55e..c0740364c 100644
--- a/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/ETPhysParser.java
+++ b/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/ETPhysParser.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.etphys.ui.contentassist.antlr;
 
 import java.util.Collection;
diff --git a/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/PartialETPhysContentAssistParser.java b/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/PartialETPhysContentAssistParser.java
index 7baa8a49b..5b704574a 100644
--- a/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/PartialETPhysContentAssistParser.java
+++ b/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/PartialETPhysContentAssistParser.java
@@ -12,14 +12,14 @@ import org.eclipse.xtext.ui.editor.contentassist.antlr.FollowElement;
 import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.AbstractInternalContentAssistParser;
 import org.eclipse.xtext.util.PolymorphicDispatcher;
 
-/**
- * @author Sebastian Zarnekow - Initial contribution and API
+/*
+ * Template CodetemplatesGeneratorFragment.xpt
  */
-@SuppressWarnings("restriction")
 public class PartialETPhysContentAssistParser extends ETPhysParser implements IPartialContentAssistParser {
 
 	private AbstractRule rule;
 
+	@Override
 	public void initializeFor(AbstractRule rule) {
 		this.rule = rule;
 	}
diff --git a/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g b/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g
index c91523587..0415240bb 100644
--- a/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g
+++ b/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g
@@ -1,11 +1,10 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 grammar InternalETPhys;
 
 options {
 	superClass=AbstractInternalContentAssistParser;
-	backtrack=true;
 	
 }
 
@@ -5241,7 +5240,7 @@ rule__DecimalExp__Group__6__Impl
 :
 (
 { before(grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_6()); }
-(	RULE_INT)
+	RULE_INT
 { after(grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_6()); }
 )
 
diff --git a/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhysLexer.java b/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhysLexer.java
index 0af5b997b..dd546cf95 100644
--- a/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhysLexer.java
+++ b/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhysLexer.java
@@ -83,15 +83,15 @@ public class InternalETPhysLexer extends Lexer {
         super(input,state);
 
     }
-    public String getGrammarFileName() { return "../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g"; }
+    public String getGrammarFileName() { return "InternalETPhys.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.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:11:7: ( 'Thread' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:11:9: 'Thread'
+            // InternalETPhys.g:11:7: ( 'Thread' )
+            // InternalETPhys.g:11:9: 'Thread'
             {
             match("Thread"); 
 
@@ -111,8 +111,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__13;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:12:7: ( 'mandatory' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:12:9: 'mandatory'
+            // InternalETPhys.g:12:7: ( 'mandatory' )
+            // InternalETPhys.g:12:9: 'mandatory'
             {
             match("mandatory"); 
 
@@ -132,8 +132,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__14;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:13:7: ( 'model' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:13:9: 'model'
+            // InternalETPhys.g:13:7: ( 'model' )
+            // InternalETPhys.g:13:9: 'model'
             {
             match("model"); 
 
@@ -153,8 +153,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__15;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:14:7: ( 'false' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:14:9: 'false'
+            // InternalETPhys.g:14:7: ( 'false' )
+            // InternalETPhys.g:14:9: 'false'
             {
             match("false"); 
 
@@ -174,8 +174,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__16;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:15:7: ( '+' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:15:9: '+'
+            // InternalETPhys.g:15:7: ( '+' )
+            // InternalETPhys.g:15:9: '+'
             {
             match('+'); 
 
@@ -194,8 +194,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__17;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:16:7: ( '-' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:16:9: '-'
+            // InternalETPhys.g:16:7: ( '-' )
+            // InternalETPhys.g:16:9: '-'
             {
             match('-'); 
 
@@ -214,8 +214,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__18;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:17:7: ( 'e' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:17:9: 'e'
+            // InternalETPhys.g:17:7: ( 'e' )
+            // InternalETPhys.g:17:9: 'e'
             {
             match('e'); 
 
@@ -234,8 +234,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__19;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:18:7: ( 'E' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:18:9: 'E'
+            // InternalETPhys.g:18:7: ( 'E' )
+            // InternalETPhys.g:18:9: 'E'
             {
             match('E'); 
 
@@ -254,8 +254,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__20;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:19:7: ( 'polled' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:19:9: 'polled'
+            // InternalETPhys.g:19:7: ( 'polled' )
+            // InternalETPhys.g:19:9: 'polled'
             {
             match("polled"); 
 
@@ -275,8 +275,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__21;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:20:7: ( 'blocked' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:20:9: 'blocked'
+            // InternalETPhys.g:20:7: ( 'blocked' )
+            // InternalETPhys.g:20:9: 'blocked'
             {
             match("blocked"); 
 
@@ -296,8 +296,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__22;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:21:7: ( 'mixed' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:21:9: 'mixed'
+            // InternalETPhys.g:21:7: ( 'mixed' )
+            // InternalETPhys.g:21:9: 'mixed'
             {
             match("mixed"); 
 
@@ -317,8 +317,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__23;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:22:7: ( 'singleThreaded' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:22:9: 'singleThreaded'
+            // InternalETPhys.g:22:7: ( 'singleThreaded' )
+            // InternalETPhys.g:22:9: 'singleThreaded'
             {
             match("singleThreaded"); 
 
@@ -338,8 +338,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__24;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:23:7: ( 'multiThreaded' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:23:9: 'multiThreaded'
+            // InternalETPhys.g:23:7: ( 'multiThreaded' )
+            // InternalETPhys.g:23:9: 'multiThreaded'
             {
             match("multiThreaded"); 
 
@@ -359,8 +359,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__25;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:24:7: ( 'ptBoolean' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:24:9: 'ptBoolean'
+            // InternalETPhys.g:24:7: ( 'ptBoolean' )
+            // InternalETPhys.g:24:9: 'ptBoolean'
             {
             match("ptBoolean"); 
 
@@ -380,8 +380,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__26;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:25:7: ( 'ptInteger' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:25:9: 'ptInteger'
+            // InternalETPhys.g:25:7: ( 'ptInteger' )
+            // InternalETPhys.g:25:9: 'ptInteger'
             {
             match("ptInteger"); 
 
@@ -401,8 +401,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__27;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:26:7: ( 'ptReal' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:26:9: 'ptReal'
+            // InternalETPhys.g:26:7: ( 'ptReal' )
+            // InternalETPhys.g:26:9: 'ptReal'
             {
             match("ptReal"); 
 
@@ -422,8 +422,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__28;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:27:7: ( 'ptCharacter' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:27:9: 'ptCharacter'
+            // InternalETPhys.g:27:7: ( 'ptCharacter' )
+            // InternalETPhys.g:27:9: 'ptCharacter'
             {
             match("ptCharacter"); 
 
@@ -443,8 +443,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__29;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:28:7: ( 'PhysicalModel' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:28:9: 'PhysicalModel'
+            // InternalETPhys.g:28:7: ( 'PhysicalModel' )
+            // InternalETPhys.g:28:9: 'PhysicalModel'
             {
             match("PhysicalModel"); 
 
@@ -464,8 +464,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__30;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:29:7: ( '{' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:29:9: '{'
+            // InternalETPhys.g:29:7: ( '{' )
+            // InternalETPhys.g:29:9: '{'
             {
             match('{'); 
 
@@ -484,8 +484,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__31;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:30:7: ( '}' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:30:9: '}'
+            // InternalETPhys.g:30:7: ( '}' )
+            // InternalETPhys.g:30:9: '}'
             {
             match('}'); 
 
@@ -504,8 +504,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__32;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:31:7: ( 'PhysicalSystem' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:31:9: 'PhysicalSystem'
+            // InternalETPhys.g:31:7: ( 'PhysicalSystem' )
+            // InternalETPhys.g:31:9: 'PhysicalSystem'
             {
             match("PhysicalSystem"); 
 
@@ -525,8 +525,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__33;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:32:7: ( 'NodeRef' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:32:9: 'NodeRef'
+            // InternalETPhys.g:32:7: ( 'NodeRef' )
+            // InternalETPhys.g:32:9: 'NodeRef'
             {
             match("NodeRef"); 
 
@@ -546,8 +546,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__34;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:33:7: ( ':' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:33:9: ':'
+            // InternalETPhys.g:33:7: ( ':' )
+            // InternalETPhys.g:33:9: ':'
             {
             match(':'); 
 
@@ -566,8 +566,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__35;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:34:7: ( 'NodeClass' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:34:9: 'NodeClass'
+            // InternalETPhys.g:34:7: ( 'NodeClass' )
+            // InternalETPhys.g:34:9: 'NodeClass'
             {
             match("NodeClass"); 
 
@@ -587,8 +587,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__36;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:35:7: ( 'runtime' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:35:9: 'runtime'
+            // InternalETPhys.g:35:7: ( 'runtime' )
+            // InternalETPhys.g:35:9: 'runtime'
             {
             match("runtime"); 
 
@@ -608,8 +608,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__37;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:36:7: ( '=' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:36:9: '='
+            // InternalETPhys.g:36:7: ( '=' )
+            // InternalETPhys.g:36:9: '='
             {
             match('='); 
 
@@ -628,8 +628,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__38;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:37:7: ( 'priomin' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:37:9: 'priomin'
+            // InternalETPhys.g:37:7: ( 'priomin' )
+            // InternalETPhys.g:37:9: 'priomin'
             {
             match("priomin"); 
 
@@ -649,8 +649,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__39;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:38:7: ( 'priomax' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:38:9: 'priomax'
+            // InternalETPhys.g:38:7: ( 'priomax' )
+            // InternalETPhys.g:38:9: 'priomax'
             {
             match("priomax"); 
 
@@ -670,8 +670,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__40;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:39:7: ( 'execmode' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:39:9: 'execmode'
+            // InternalETPhys.g:39:7: ( 'execmode' )
+            // InternalETPhys.g:39:9: 'execmode'
             {
             match("execmode"); 
 
@@ -691,8 +691,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__41;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:40:7: ( 'interval' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:40:9: 'interval'
+            // InternalETPhys.g:40:7: ( 'interval' )
+            // InternalETPhys.g:40:9: 'interval'
             {
             match("interval"); 
 
@@ -712,8 +712,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__42;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:41:7: ( 'prio' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:41:9: 'prio'
+            // InternalETPhys.g:41:7: ( 'prio' )
+            // InternalETPhys.g:41:9: 'prio'
             {
             match("prio"); 
 
@@ -733,8 +733,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__43;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:42:7: ( 'stacksize' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:42:9: 'stacksize'
+            // InternalETPhys.g:42:7: ( 'stacksize' )
+            // InternalETPhys.g:42:9: 'stacksize'
             {
             match("stacksize"); 
 
@@ -754,8 +754,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__44;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:43:7: ( 'msgblocksize' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:43:9: 'msgblocksize'
+            // InternalETPhys.g:43:7: ( 'msgblocksize' )
+            // InternalETPhys.g:43:9: 'msgblocksize'
             {
             match("msgblocksize"); 
 
@@ -775,8 +775,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__45;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:44:7: ( 'msgpoolsize' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:44:9: 'msgpoolsize'
+            // InternalETPhys.g:44:7: ( 'msgpoolsize' )
+            // InternalETPhys.g:44:9: 'msgpoolsize'
             {
             match("msgpoolsize"); 
 
@@ -796,8 +796,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__46;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:45:7: ( 'RuntimeClass' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:45:9: 'RuntimeClass'
+            // InternalETPhys.g:45:7: ( 'RuntimeClass' )
+            // InternalETPhys.g:45:9: 'RuntimeClass'
             {
             match("RuntimeClass"); 
 
@@ -817,8 +817,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__47;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:46:7: ( 'attribute' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:46:9: 'attribute'
+            // InternalETPhys.g:46:7: ( 'attribute' )
+            // InternalETPhys.g:46:9: 'attribute'
             {
             match("attribute"); 
 
@@ -838,8 +838,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__48;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:47:7: ( ',' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:47:9: ','
+            // InternalETPhys.g:47:7: ( ',' )
+            // InternalETPhys.g:47:9: ','
             {
             match(','); 
 
@@ -858,8 +858,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__49;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:48:7: ( 'import' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:48:9: 'import'
+            // InternalETPhys.g:48:7: ( 'import' )
+            // InternalETPhys.g:48:9: 'import'
             {
             match("import"); 
 
@@ -879,8 +879,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__50;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:49:7: ( 'from' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:49:9: 'from'
+            // InternalETPhys.g:49:7: ( 'from' )
+            // InternalETPhys.g:49:9: 'from'
             {
             match("from"); 
 
@@ -900,8 +900,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__51;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:50:7: ( '.*' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:50:9: '.*'
+            // InternalETPhys.g:50:7: ( '.*' )
+            // InternalETPhys.g:50:9: '.*'
             {
             match(".*"); 
 
@@ -921,8 +921,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__52;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:51:7: ( '[' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:51:9: '['
+            // InternalETPhys.g:51:7: ( '[' )
+            // InternalETPhys.g:51:9: '['
             {
             match('['); 
 
@@ -941,8 +941,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__53;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:52:7: ( ']' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:52:9: ']'
+            // InternalETPhys.g:52:7: ( ']' )
+            // InternalETPhys.g:52:9: ']'
             {
             match(']'); 
 
@@ -961,8 +961,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__54;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:53:7: ( 's' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:53:9: 's'
+            // InternalETPhys.g:53:7: ( 's' )
+            // InternalETPhys.g:53:9: 's'
             {
             match('s'); 
 
@@ -981,8 +981,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__55;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:54:7: ( 'ms' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:54:9: 'ms'
+            // InternalETPhys.g:54:7: ( 'ms' )
+            // InternalETPhys.g:54:9: 'ms'
             {
             match("ms"); 
 
@@ -1002,8 +1002,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__56;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:55:7: ( 'us' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:55:9: 'us'
+            // InternalETPhys.g:55:7: ( 'us' )
+            // InternalETPhys.g:55:9: 'us'
             {
             match("us"); 
 
@@ -1023,8 +1023,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__57;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:56:7: ( 'ns' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:56:9: 'ns'
+            // InternalETPhys.g:56:7: ( 'ns' )
+            // InternalETPhys.g:56:9: 'ns'
             {
             match("ns"); 
 
@@ -1044,8 +1044,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__58;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:57:7: ( '.' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:57:9: '.'
+            // InternalETPhys.g:57:7: ( '.' )
+            // InternalETPhys.g:57:9: '.'
             {
             match('.'); 
 
@@ -1064,8 +1064,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__59;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:58:7: ( 'DefaultThread' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:58:9: 'DefaultThread'
+            // InternalETPhys.g:58:7: ( 'DefaultThread' )
+            // InternalETPhys.g:58:9: 'DefaultThread'
             {
             match("DefaultThread"); 
 
@@ -1085,8 +1085,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__60;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:59:7: ( 'optional' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:59:9: 'optional'
+            // InternalETPhys.g:59:7: ( 'optional' )
+            // InternalETPhys.g:59:9: 'optional'
             {
             match("optional"); 
 
@@ -1106,8 +1106,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__61;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:60:7: ( 'true' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:60:9: 'true'
+            // InternalETPhys.g:60:7: ( 'true' )
+            // InternalETPhys.g:60:9: 'true'
             {
             match("true"); 
 
@@ -1127,10 +1127,10 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = RULE_HEX;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6459:10: ( ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+ )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6459:12: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+
+            // InternalETPhys.g:6458:10: ( ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+ )
+            // InternalETPhys.g:6458:12: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6459:12: ( '0x' | '0X' )
+            // InternalETPhys.g:6458:12: ( '0x' | '0X' )
             int alt1=2;
             int LA1_0 = input.LA(1);
 
@@ -1158,7 +1158,7 @@ public class InternalETPhysLexer extends Lexer {
             }
             switch (alt1) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6459:13: '0x'
+                    // InternalETPhys.g:6458:13: '0x'
                     {
                     match("0x"); 
 
@@ -1166,7 +1166,7 @@ public class InternalETPhysLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6459:18: '0X'
+                    // InternalETPhys.g:6458:18: '0X'
                     {
                     match("0X"); 
 
@@ -1176,7 +1176,7 @@ public class InternalETPhysLexer extends Lexer {
 
             }
 
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6459:24: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+
+            // InternalETPhys.g:6458:24: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+
             int cnt2=0;
             loop2:
             do {
@@ -1190,7 +1190,7 @@ public class InternalETPhysLexer extends Lexer {
 
                 switch (alt2) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:
+            	    // InternalETPhys.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();
@@ -1230,10 +1230,10 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = RULE_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6461:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6461:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalETPhys.g:6460:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+            // InternalETPhys.g:6460:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6461:11: ( '^' )?
+            // InternalETPhys.g:6460:11: ( '^' )?
             int alt3=2;
             int LA3_0 = input.LA(1);
 
@@ -1242,7 +1242,7 @@ public class InternalETPhysLexer extends Lexer {
             }
             switch (alt3) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6461:11: '^'
+                    // InternalETPhys.g:6460:11: '^'
                     {
                     match('^'); 
 
@@ -1260,7 +1260,7 @@ public class InternalETPhysLexer extends Lexer {
                 recover(mse);
                 throw mse;}
 
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6461:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalETPhys.g:6460:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             loop4:
             do {
                 int alt4=2;
@@ -1273,7 +1273,7 @@ public class InternalETPhysLexer extends Lexer {
 
                 switch (alt4) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:
+            	    // InternalETPhys.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();
@@ -1309,10 +1309,10 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = RULE_INT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6463:10: ( ( '0' .. '9' )+ )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6463:12: ( '0' .. '9' )+
+            // InternalETPhys.g:6462:10: ( ( '0' .. '9' )+ )
+            // InternalETPhys.g:6462:12: ( '0' .. '9' )+
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6463:12: ( '0' .. '9' )+
+            // InternalETPhys.g:6462:12: ( '0' .. '9' )+
             int cnt5=0;
             loop5:
             do {
@@ -1326,7 +1326,7 @@ public class InternalETPhysLexer extends Lexer {
 
                 switch (alt5) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6463:13: '0' .. '9'
+            	    // InternalETPhys.g:6462:13: '0' .. '9'
             	    {
             	    matchRange('0','9'); 
 
@@ -1358,10 +1358,10 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = RULE_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6465:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6465:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalETPhys.g:6464:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+            // InternalETPhys.g:6464:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6465:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalETPhys.g:6464:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             int alt8=2;
             int LA8_0 = input.LA(1);
 
@@ -1379,10 +1379,10 @@ public class InternalETPhysLexer extends Lexer {
             }
             switch (alt8) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6465:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+                    // InternalETPhys.g:6464:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
                     {
                     match('\"'); 
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6465:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+                    // InternalETPhys.g:6464:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
                     loop6:
                     do {
                         int alt6=3;
@@ -1398,7 +1398,7 @@ public class InternalETPhysLexer extends Lexer {
 
                         switch (alt6) {
                     	case 1 :
-                    	    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6465:21: '\\\\' .
+                    	    // InternalETPhys.g:6464:21: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -1406,7 +1406,7 @@ public class InternalETPhysLexer extends Lexer {
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6465:28: ~ ( ( '\\\\' | '\"' ) )
+                    	    // InternalETPhys.g:6464:28: ~ ( ( '\\\\' | '\"' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -1431,10 +1431,10 @@ public class InternalETPhysLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6465:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+                    // InternalETPhys.g:6464:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
                     {
                     match('\''); 
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6465:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+                    // InternalETPhys.g:6464:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
                     loop7:
                     do {
                         int alt7=3;
@@ -1450,7 +1450,7 @@ public class InternalETPhysLexer extends Lexer {
 
                         switch (alt7) {
                     	case 1 :
-                    	    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6465:54: '\\\\' .
+                    	    // InternalETPhys.g:6464:54: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -1458,7 +1458,7 @@ public class InternalETPhysLexer extends Lexer {
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6465:61: ~ ( ( '\\\\' | '\\'' ) )
+                    	    // InternalETPhys.g:6464:61: ~ ( ( '\\\\' | '\\'' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -1501,12 +1501,12 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = RULE_ML_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6467:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6467:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // InternalETPhys.g:6466:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // InternalETPhys.g:6466:19: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); 
 
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6467:24: ( options {greedy=false; } : . )*
+            // InternalETPhys.g:6466:24: ( options {greedy=false; } : . )*
             loop9:
             do {
                 int alt9=2;
@@ -1531,7 +1531,7 @@ public class InternalETPhysLexer extends Lexer {
 
                 switch (alt9) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6467:52: .
+            	    // InternalETPhys.g:6466:52: .
             	    {
             	    matchAny(); 
 
@@ -1561,12 +1561,12 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = RULE_SL_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6469:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6469:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // InternalETPhys.g:6468:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // InternalETPhys.g:6468:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
             {
             match("//"); 
 
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6469:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            // InternalETPhys.g:6468:24: (~ ( ( '\\n' | '\\r' ) ) )*
             loop10:
             do {
                 int alt10=2;
@@ -1579,7 +1579,7 @@ public class InternalETPhysLexer extends Lexer {
 
                 switch (alt10) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6469:24: ~ ( ( '\\n' | '\\r' ) )
+            	    // InternalETPhys.g:6468: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();
@@ -1599,7 +1599,7 @@ public class InternalETPhysLexer extends Lexer {
                 }
             } while (true);
 
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6469:40: ( ( '\\r' )? '\\n' )?
+            // InternalETPhys.g:6468:40: ( ( '\\r' )? '\\n' )?
             int alt12=2;
             int LA12_0 = input.LA(1);
 
@@ -1608,9 +1608,9 @@ public class InternalETPhysLexer extends Lexer {
             }
             switch (alt12) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6469:41: ( '\\r' )? '\\n'
+                    // InternalETPhys.g:6468:41: ( '\\r' )? '\\n'
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6469:41: ( '\\r' )?
+                    // InternalETPhys.g:6468:41: ( '\\r' )?
                     int alt11=2;
                     int LA11_0 = input.LA(1);
 
@@ -1619,7 +1619,7 @@ public class InternalETPhysLexer extends Lexer {
                     }
                     switch (alt11) {
                         case 1 :
-                            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6469:41: '\\r'
+                            // InternalETPhys.g:6468:41: '\\r'
                             {
                             match('\r'); 
 
@@ -1651,10 +1651,10 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = RULE_WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6471:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6471:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalETPhys.g:6470:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // InternalETPhys.g:6470:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6471:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalETPhys.g:6470:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             int cnt13=0;
             loop13:
             do {
@@ -1668,7 +1668,7 @@ public class InternalETPhysLexer extends Lexer {
 
                 switch (alt13) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:
+            	    // InternalETPhys.g:
             	    {
             	    if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) {
             	        input.consume();
@@ -1708,8 +1708,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = RULE_ANY_OTHER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6473:16: ( . )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6473:18: .
+            // InternalETPhys.g:6472:16: ( . )
+            // InternalETPhys.g:6472:18: .
             {
             matchAny(); 
 
@@ -1724,411 +1724,411 @@ public class InternalETPhysLexer extends Lexer {
     // $ANTLR end "RULE_ANY_OTHER"
 
     public void mTokens() throws RecognitionException {
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.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 | RULE_HEX | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+        // InternalETPhys.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 | RULE_HEX | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
         int alt14=58;
         alt14 = dfa14.predict(input);
         switch (alt14) {
             case 1 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:10: T__12
+                // InternalETPhys.g:1:10: T__12
                 {
                 mT__12(); 
 
                 }
                 break;
             case 2 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:16: T__13
+                // InternalETPhys.g:1:16: T__13
                 {
                 mT__13(); 
 
                 }
                 break;
             case 3 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:22: T__14
+                // InternalETPhys.g:1:22: T__14
                 {
                 mT__14(); 
 
                 }
                 break;
             case 4 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:28: T__15
+                // InternalETPhys.g:1:28: T__15
                 {
                 mT__15(); 
 
                 }
                 break;
             case 5 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:34: T__16
+                // InternalETPhys.g:1:34: T__16
                 {
                 mT__16(); 
 
                 }
                 break;
             case 6 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:40: T__17
+                // InternalETPhys.g:1:40: T__17
                 {
                 mT__17(); 
 
                 }
                 break;
             case 7 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:46: T__18
+                // InternalETPhys.g:1:46: T__18
                 {
                 mT__18(); 
 
                 }
                 break;
             case 8 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:52: T__19
+                // InternalETPhys.g:1:52: T__19
                 {
                 mT__19(); 
 
                 }
                 break;
             case 9 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:58: T__20
+                // InternalETPhys.g:1:58: T__20
                 {
                 mT__20(); 
 
                 }
                 break;
             case 10 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:64: T__21
+                // InternalETPhys.g:1:64: T__21
                 {
                 mT__21(); 
 
                 }
                 break;
             case 11 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:70: T__22
+                // InternalETPhys.g:1:70: T__22
                 {
                 mT__22(); 
 
                 }
                 break;
             case 12 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:76: T__23
+                // InternalETPhys.g:1:76: T__23
                 {
                 mT__23(); 
 
                 }
                 break;
             case 13 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:82: T__24
+                // InternalETPhys.g:1:82: T__24
                 {
                 mT__24(); 
 
                 }
                 break;
             case 14 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:88: T__25
+                // InternalETPhys.g:1:88: T__25
                 {
                 mT__25(); 
 
                 }
                 break;
             case 15 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:94: T__26
+                // InternalETPhys.g:1:94: T__26
                 {
                 mT__26(); 
 
                 }
                 break;
             case 16 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:100: T__27
+                // InternalETPhys.g:1:100: T__27
                 {
                 mT__27(); 
 
                 }
                 break;
             case 17 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:106: T__28
+                // InternalETPhys.g:1:106: T__28
                 {
                 mT__28(); 
 
                 }
                 break;
             case 18 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:112: T__29
+                // InternalETPhys.g:1:112: T__29
                 {
                 mT__29(); 
 
                 }
                 break;
             case 19 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:118: T__30
+                // InternalETPhys.g:1:118: T__30
                 {
                 mT__30(); 
 
                 }
                 break;
             case 20 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:124: T__31
+                // InternalETPhys.g:1:124: T__31
                 {
                 mT__31(); 
 
                 }
                 break;
             case 21 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:130: T__32
+                // InternalETPhys.g:1:130: T__32
                 {
                 mT__32(); 
 
                 }
                 break;
             case 22 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:136: T__33
+                // InternalETPhys.g:1:136: T__33
                 {
                 mT__33(); 
 
                 }
                 break;
             case 23 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:142: T__34
+                // InternalETPhys.g:1:142: T__34
                 {
                 mT__34(); 
 
                 }
                 break;
             case 24 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:148: T__35
+                // InternalETPhys.g:1:148: T__35
                 {
                 mT__35(); 
 
                 }
                 break;
             case 25 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:154: T__36
+                // InternalETPhys.g:1:154: T__36
                 {
                 mT__36(); 
 
                 }
                 break;
             case 26 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:160: T__37
+                // InternalETPhys.g:1:160: T__37
                 {
                 mT__37(); 
 
                 }
                 break;
             case 27 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:166: T__38
+                // InternalETPhys.g:1:166: T__38
                 {
                 mT__38(); 
 
                 }
                 break;
             case 28 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:172: T__39
+                // InternalETPhys.g:1:172: T__39
                 {
                 mT__39(); 
 
                 }
                 break;
             case 29 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:178: T__40
+                // InternalETPhys.g:1:178: T__40
                 {
                 mT__40(); 
 
                 }
                 break;
             case 30 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:184: T__41
+                // InternalETPhys.g:1:184: T__41
                 {
                 mT__41(); 
 
                 }
                 break;
             case 31 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:190: T__42
+                // InternalETPhys.g:1:190: T__42
                 {
                 mT__42(); 
 
                 }
                 break;
             case 32 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:196: T__43
+                // InternalETPhys.g:1:196: T__43
                 {
                 mT__43(); 
 
                 }
                 break;
             case 33 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:202: T__44
+                // InternalETPhys.g:1:202: T__44
                 {
                 mT__44(); 
 
                 }
                 break;
             case 34 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:208: T__45
+                // InternalETPhys.g:1:208: T__45
                 {
                 mT__45(); 
 
                 }
                 break;
             case 35 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:214: T__46
+                // InternalETPhys.g:1:214: T__46
                 {
                 mT__46(); 
 
                 }
                 break;
             case 36 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:220: T__47
+                // InternalETPhys.g:1:220: T__47
                 {
                 mT__47(); 
 
                 }
                 break;
             case 37 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:226: T__48
+                // InternalETPhys.g:1:226: T__48
                 {
                 mT__48(); 
 
                 }
                 break;
             case 38 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:232: T__49
+                // InternalETPhys.g:1:232: T__49
                 {
                 mT__49(); 
 
                 }
                 break;
             case 39 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:238: T__50
+                // InternalETPhys.g:1:238: T__50
                 {
                 mT__50(); 
 
                 }
                 break;
             case 40 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:244: T__51
+                // InternalETPhys.g:1:244: T__51
                 {
                 mT__51(); 
 
                 }
                 break;
             case 41 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:250: T__52
+                // InternalETPhys.g:1:250: T__52
                 {
                 mT__52(); 
 
                 }
                 break;
             case 42 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:256: T__53
+                // InternalETPhys.g:1:256: T__53
                 {
                 mT__53(); 
 
                 }
                 break;
             case 43 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:262: T__54
+                // InternalETPhys.g:1:262: T__54
                 {
                 mT__54(); 
 
                 }
                 break;
             case 44 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:268: T__55
+                // InternalETPhys.g:1:268: T__55
                 {
                 mT__55(); 
 
                 }
                 break;
             case 45 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:274: T__56
+                // InternalETPhys.g:1:274: T__56
                 {
                 mT__56(); 
 
                 }
                 break;
             case 46 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:280: T__57
+                // InternalETPhys.g:1:280: T__57
                 {
                 mT__57(); 
 
                 }
                 break;
             case 47 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:286: T__58
+                // InternalETPhys.g:1:286: T__58
                 {
                 mT__58(); 
 
                 }
                 break;
             case 48 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:292: T__59
+                // InternalETPhys.g:1:292: T__59
                 {
                 mT__59(); 
 
                 }
                 break;
             case 49 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:298: T__60
+                // InternalETPhys.g:1:298: T__60
                 {
                 mT__60(); 
 
                 }
                 break;
             case 50 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:304: T__61
+                // InternalETPhys.g:1:304: T__61
                 {
                 mT__61(); 
 
                 }
                 break;
             case 51 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:310: RULE_HEX
+                // InternalETPhys.g:1:310: RULE_HEX
                 {
                 mRULE_HEX(); 
 
                 }
                 break;
             case 52 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:319: RULE_ID
+                // InternalETPhys.g:1:319: RULE_ID
                 {
                 mRULE_ID(); 
 
                 }
                 break;
             case 53 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:327: RULE_INT
+                // InternalETPhys.g:1:327: RULE_INT
                 {
                 mRULE_INT(); 
 
                 }
                 break;
             case 54 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:336: RULE_STRING
+                // InternalETPhys.g:1:336: RULE_STRING
                 {
                 mRULE_STRING(); 
 
                 }
                 break;
             case 55 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:348: RULE_ML_COMMENT
+                // InternalETPhys.g:1:348: RULE_ML_COMMENT
                 {
                 mRULE_ML_COMMENT(); 
 
                 }
                 break;
             case 56 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:364: RULE_SL_COMMENT
+                // InternalETPhys.g:1:364: RULE_SL_COMMENT
                 {
                 mRULE_SL_COMMENT(); 
 
                 }
                 break;
             case 57 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:380: RULE_WS
+                // InternalETPhys.g:1:380: RULE_WS
                 {
                 mRULE_WS(); 
 
                 }
                 break;
             case 58 :
-                // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1:388: RULE_ANY_OTHER
+                // InternalETPhys.g:1:388: RULE_ANY_OTHER
                 {
                 mRULE_ANY_OTHER(); 
 
@@ -2142,100 +2142,19 @@ public class InternalETPhysLexer extends Lexer {
 
     protected DFA14 dfa14 = new DFA14(this);
     static final String DFA14_eotS =
-        "\1\uffff\3\50\2\uffff\1\63\1\64\2\50\1\73\1\50\2\uffff\1\50\1\uffff"+
-        "\1\50\1\uffff\3\50\1\uffff\1\111\2\uffff\5\50\1\122\1\46\2\uffff"+
-        "\3\46\2\uffff\1\50\1\uffff\4\50\1\135\2\50\2\uffff\1\50\2\uffff"+
-        "\6\50\1\uffff\1\50\2\uffff\1\50\1\uffff\1\50\1\uffff\4\50\5\uffff"+
-        "\1\161\1\162\3\50\6\uffff\6\50\1\uffff\23\50\2\uffff\13\50\1\u009b"+
-        "\6\50\1\u00a3\14\50\1\u00b1\2\50\1\u00b4\1\u00b5\3\50\1\u00b9\1"+
-        "\uffff\7\50\1\uffff\15\50\1\uffff\1\u00cf\1\50\2\uffff\3\50\1\uffff"+
-        "\1\50\1\u00d5\2\50\1\u00d8\13\50\1\u00e4\4\50\1\uffff\5\50\1\uffff"+
-        "\2\50\1\uffff\1\50\1\u00f1\1\u00f2\1\u00f3\3\50\1\u00f7\1\50\1\u00f9"+
-        "\1\50\1\uffff\10\50\1\u0103\3\50\3\uffff\3\50\1\uffff\1\50\1\uffff"+
-        "\1\u010c\3\50\1\u0110\1\u0111\3\50\1\uffff\1\u0115\1\u0116\2\50"+
-        "\1\u0119\2\50\1\u011c\1\uffff\1\50\1\u011e\1\50\2\uffff\3\50\2\uffff"+
-        "\2\50\1\uffff\2\50\1\uffff\1\50\1\uffff\3\50\1\u012b\1\u012c\6\50"+
-        "\1\u0133\2\uffff\3\50\1\u0137\1\50\1\u0139\1\uffff\1\50\1\u013b"+
-        "\1\50\1\uffff\1\u013d\1\uffff\1\u013e\1\uffff\1\u013f\3\uffff";
+        "\1\uffff\3\50\2\uffff\1\63\1\64\2\50\1\73\1\50\2\uffff\1\50\1\uffff\1\50\1\uffff\3\50\1\uffff\1\111\2\uffff\5\50\1\122\1\46\2\uffff\3\46\2\uffff\1\50\1\uffff\4\50\1\135\2\50\2\uffff\1\50\2\uffff\6\50\1\uffff\1\50\2\uffff\1\50\1\uffff\1\50\1\uffff\4\50\5\uffff\1\161\1\162\3\50\6\uffff\6\50\1\uffff\23\50\2\uffff\13\50\1\u009b\6\50\1\u00a3\14\50\1\u00b1\2\50\1\u00b4\1\u00b5\3\50\1\u00b9\1\uffff\7\50\1\uffff\15\50\1\uffff\1\u00cf\1\50\2\uffff\3\50\1\uffff\1\50\1\u00d5\2\50\1\u00d8\13\50\1\u00e4\4\50\1\uffff\5\50\1\uffff\2\50\1\uffff\1\50\1\u00f1\1\u00f2\1\u00f3\3\50\1\u00f7\1\50\1\u00f9\1\50\1\uffff\10\50\1\u0103\3\50\3\uffff\3\50\1\uffff\1\50\1\uffff\1\u010c\3\50\1\u0110\1\u0111\3\50\1\uffff\1\u0115\1\u0116\2\50\1\u0119\2\50\1\u011c\1\uffff\1\50\1\u011e\1\50\2\uffff\3\50\2\uffff\2\50\1\uffff\2\50\1\uffff\1\50\1\uffff\3\50\1\u012b\1\u012c\6\50\1\u0133\2\uffff\3\50\1\u0137\1\50\1\u0139\1\uffff\1\50\1\u013b\1\50\1\uffff\1\u013d\1\uffff\1\u013e\1\uffff\1\u013f\3\uffff";
     static final String DFA14_eofS =
         "\u0140\uffff";
     static final String DFA14_minS =
-        "\1\0\1\150\2\141\2\uffff\2\60\1\157\1\154\1\60\1\150\2\uffff\1"+
-        "\157\1\uffff\1\165\1\uffff\1\155\1\165\1\164\1\uffff\1\52\2\uffff"+
-        "\2\163\1\145\1\160\1\162\1\130\1\101\2\uffff\2\0\1\52\2\uffff\1"+
-        "\162\1\uffff\1\156\1\144\1\170\1\154\1\60\1\154\1\157\2\uffff\1"+
-        "\145\2\uffff\1\154\1\102\1\151\1\157\1\156\1\141\1\uffff\1\171\2"+
-        "\uffff\1\144\1\uffff\1\156\1\uffff\1\164\1\160\1\156\1\164\5\uffff"+
-        "\2\60\1\146\1\164\1\165\6\uffff\1\145\1\144\2\145\1\164\1\142\1"+
-        "\uffff\1\163\1\155\1\143\1\154\1\157\1\156\1\145\1\150\1\157\1\143"+
-        "\1\147\1\143\1\163\1\145\1\164\1\145\1\157\1\164\1\162\2\uffff\1"+
-        "\141\1\151\1\145\2\141\1\154\1\144\1\151\1\154\1\157\1\145\1\60"+
-        "\1\155\1\145\1\157\1\164\2\141\1\60\1\153\1\154\1\153\1\151\1\103"+
-        "\1\151\2\162\2\151\1\165\1\157\1\60\1\144\1\164\2\60\1\124\2\157"+
-        "\1\60\1\uffff\1\157\1\144\1\154\1\145\1\154\1\162\1\141\1\uffff"+
-        "\2\145\1\163\1\143\1\145\1\154\1\155\1\166\1\164\1\155\1\142\1\154"+
-        "\1\156\1\uffff\1\60\1\157\2\uffff\1\150\1\143\1\154\1\uffff\1\144"+
-        "\1\60\1\145\1\147\1\60\1\141\1\156\1\170\1\144\1\124\1\151\1\141"+
-        "\1\146\1\141\1\145\1\141\1\60\1\145\1\165\1\164\1\141\1\uffff\2"+
-        "\162\1\153\1\163\1\145\1\uffff\1\141\1\145\1\uffff\1\143\3\60\1"+
-        "\150\1\172\1\154\1\60\1\163\1\60\1\154\1\uffff\1\103\1\164\1\124"+
-        "\1\154\1\171\1\145\1\163\1\151\1\60\1\156\1\162\1\164\3\uffff\1"+
-        "\162\1\145\1\115\1\uffff\1\163\1\uffff\1\60\1\154\1\145\1\150\2"+
-        "\60\1\141\1\151\1\172\1\uffff\2\60\2\145\1\60\1\157\1\171\1\60\1"+
-        "\uffff\1\141\1\60\1\162\2\uffff\1\144\1\172\1\145\2\uffff\1\162"+
-        "\1\141\1\uffff\1\144\1\163\1\uffff\1\163\1\uffff\3\145\2\60\1\144"+
-        "\1\145\1\164\1\163\1\141\1\144\1\60\2\uffff\1\145\1\154\1\145\1"+
-        "\60\1\144\1\60\1\uffff\1\144\1\60\1\155\1\uffff\1\60\1\uffff\1\60"+
-        "\1\uffff\1\60\3\uffff";
+        "\1\0\1\150\2\141\2\uffff\2\60\1\157\1\154\1\60\1\150\2\uffff\1\157\1\uffff\1\165\1\uffff\1\155\1\165\1\164\1\uffff\1\52\2\uffff\2\163\1\145\1\160\1\162\1\130\1\101\2\uffff\2\0\1\52\2\uffff\1\162\1\uffff\1\156\1\144\1\170\1\154\1\60\1\154\1\157\2\uffff\1\145\2\uffff\1\154\1\102\1\151\1\157\1\156\1\141\1\uffff\1\171\2\uffff\1\144\1\uffff\1\156\1\uffff\1\164\1\160\1\156\1\164\5\uffff\2\60\1\146\1\164\1\165\6\uffff\1\145\1\144\2\145\1\164\1\142\1\uffff\1\163\1\155\1\143\1\154\1\157\1\156\1\145\1\150\1\157\1\143\1\147\1\143\1\163\1\145\1\164\1\145\1\157\1\164\1\162\2\uffff\1\141\1\151\1\145\2\141\1\154\1\144\1\151\1\154\1\157\1\145\1\60\1\155\1\145\1\157\1\164\2\141\1\60\1\153\1\154\1\153\1\151\1\103\1\151\2\162\2\151\1\165\1\157\1\60\1\144\1\164\2\60\1\124\2\157\1\60\1\uffff\1\157\1\144\1\154\1\145\1\154\1\162\1\141\1\uffff\2\145\1\163\1\143\1\145\1\154\1\155\1\166\1\164\1\155\1\142\1\154\1\156\1\uffff\1\60\1\157\2\uffff\1\150\1\143\1\154\1\uffff\1\144\1\60\1\145\1\147\1\60\1\141\1\156\1\170\1\144\1\124\1\151\1\141\1\146\1\141\1\145\1\141\1\60\1\145\1\165\1\164\1\141\1\uffff\2\162\1\153\1\163\1\145\1\uffff\1\141\1\145\1\uffff\1\143\3\60\1\150\1\172\1\154\1\60\1\163\1\60\1\154\1\uffff\1\103\1\164\1\124\1\154\1\171\1\145\1\163\1\151\1\60\1\156\1\162\1\164\3\uffff\1\162\1\145\1\115\1\uffff\1\163\1\uffff\1\60\1\154\1\145\1\150\2\60\1\141\1\151\1\172\1\uffff\2\60\2\145\1\60\1\157\1\171\1\60\1\uffff\1\141\1\60\1\162\2\uffff\1\144\1\172\1\145\2\uffff\1\162\1\141\1\uffff\1\144\1\163\1\uffff\1\163\1\uffff\3\145\2\60\1\144\1\145\1\164\1\163\1\141\1\144\1\60\2\uffff\1\145\1\154\1\145\1\60\1\144\1\60\1\uffff\1\144\1\60\1\155\1\uffff\1\60\1\uffff\1\60\1\uffff\1\60\3\uffff";
     static final String DFA14_maxS =
-        "\1\uffff\1\150\1\165\1\162\2\uffff\2\172\1\164\1\154\1\172\1\150"+
-        "\2\uffff\1\157\1\uffff\1\165\1\uffff\1\156\1\165\1\164\1\uffff\1"+
-        "\52\2\uffff\2\163\1\145\1\160\1\162\1\170\1\172\2\uffff\2\uffff"+
-        "\1\57\2\uffff\1\162\1\uffff\1\156\1\144\1\170\1\154\1\172\1\154"+
-        "\1\157\2\uffff\1\145\2\uffff\1\154\1\122\1\151\1\157\1\156\1\141"+
-        "\1\uffff\1\171\2\uffff\1\144\1\uffff\1\156\1\uffff\1\164\1\160\1"+
-        "\156\1\164\5\uffff\2\172\1\146\1\164\1\165\6\uffff\1\145\1\144\2"+
-        "\145\1\164\1\160\1\uffff\1\163\1\155\1\143\1\154\1\157\1\156\1\145"+
-        "\1\150\1\157\1\143\1\147\1\143\1\163\1\145\1\164\1\145\1\157\1\164"+
-        "\1\162\2\uffff\1\141\1\151\1\145\2\141\1\154\1\144\1\151\1\154\1"+
-        "\157\1\145\1\172\1\155\1\145\1\157\1\164\2\141\1\172\1\153\1\154"+
-        "\1\153\1\151\1\122\1\151\2\162\2\151\1\165\1\157\1\172\1\144\1\164"+
-        "\2\172\1\124\2\157\1\172\1\uffff\1\157\1\144\1\154\1\145\1\154\1"+
-        "\162\1\151\1\uffff\2\145\1\163\1\143\1\145\1\154\1\155\1\166\1\164"+
-        "\1\155\1\142\1\154\1\156\1\uffff\1\172\1\157\2\uffff\1\150\1\143"+
-        "\1\154\1\uffff\1\144\1\172\1\145\1\147\1\172\1\141\1\156\1\170\1"+
-        "\144\1\124\1\151\1\141\1\146\1\141\1\145\1\141\1\172\1\145\1\165"+
-        "\1\164\1\141\1\uffff\2\162\1\153\1\163\1\145\1\uffff\1\141\1\145"+
-        "\1\uffff\1\143\3\172\1\150\1\172\1\154\1\172\1\163\1\172\1\154\1"+
-        "\uffff\1\103\1\164\1\124\1\154\1\171\1\145\1\163\1\151\1\172\1\156"+
-        "\1\162\1\164\3\uffff\1\162\1\145\1\123\1\uffff\1\163\1\uffff\1\172"+
-        "\1\154\1\145\1\150\2\172\1\141\1\151\1\172\1\uffff\2\172\2\145\1"+
-        "\172\1\157\1\171\1\172\1\uffff\1\141\1\172\1\162\2\uffff\1\144\1"+
-        "\172\1\145\2\uffff\1\162\1\141\1\uffff\1\144\1\163\1\uffff\1\163"+
-        "\1\uffff\3\145\2\172\1\144\1\145\1\164\1\163\1\141\1\144\1\172\2"+
-        "\uffff\1\145\1\154\1\145\1\172\1\144\1\172\1\uffff\1\144\1\172\1"+
-        "\155\1\uffff\1\172\1\uffff\1\172\1\uffff\1\172\3\uffff";
+        "\1\uffff\1\150\1\165\1\162\2\uffff\2\172\1\164\1\154\1\172\1\150\2\uffff\1\157\1\uffff\1\165\1\uffff\1\156\1\165\1\164\1\uffff\1\52\2\uffff\2\163\1\145\1\160\1\162\1\170\1\172\2\uffff\2\uffff\1\57\2\uffff\1\162\1\uffff\1\156\1\144\1\170\1\154\1\172\1\154\1\157\2\uffff\1\145\2\uffff\1\154\1\122\1\151\1\157\1\156\1\141\1\uffff\1\171\2\uffff\1\144\1\uffff\1\156\1\uffff\1\164\1\160\1\156\1\164\5\uffff\2\172\1\146\1\164\1\165\6\uffff\1\145\1\144\2\145\1\164\1\160\1\uffff\1\163\1\155\1\143\1\154\1\157\1\156\1\145\1\150\1\157\1\143\1\147\1\143\1\163\1\145\1\164\1\145\1\157\1\164\1\162\2\uffff\1\141\1\151\1\145\2\141\1\154\1\144\1\151\1\154\1\157\1\145\1\172\1\155\1\145\1\157\1\164\2\141\1\172\1\153\1\154\1\153\1\151\1\122\1\151\2\162\2\151\1\165\1\157\1\172\1\144\1\164\2\172\1\124\2\157\1\172\1\uffff\1\157\1\144\1\154\1\145\1\154\1\162\1\151\1\uffff\2\145\1\163\1\143\1\145\1\154\1\155\1\166\1\164\1\155\1\142\1\154\1\156\1\uffff\1\172\1\157\2\uffff\1\150\1\143\1\154\1\uffff\1\144\1\172\1\145\1\147\1\172\1\141\1\156\1\170\1\144\1\124\1\151\1\141\1\146\1\141\1\145\1\141\1\172\1\145\1\165\1\164\1\141\1\uffff\2\162\1\153\1\163\1\145\1\uffff\1\141\1\145\1\uffff\1\143\3\172\1\150\1\172\1\154\1\172\1\163\1\172\1\154\1\uffff\1\103\1\164\1\124\1\154\1\171\1\145\1\163\1\151\1\172\1\156\1\162\1\164\3\uffff\1\162\1\145\1\123\1\uffff\1\163\1\uffff\1\172\1\154\1\145\1\150\2\172\1\141\1\151\1\172\1\uffff\2\172\2\145\1\172\1\157\1\171\1\172\1\uffff\1\141\1\172\1\162\2\uffff\1\144\1\172\1\145\2\uffff\1\162\1\141\1\uffff\1\144\1\163\1\uffff\1\163\1\uffff\3\145\2\172\1\144\1\145\1\164\1\163\1\141\1\144\1\172\2\uffff\1\145\1\154\1\145\1\172\1\144\1\172\1\uffff\1\144\1\172\1\155\1\uffff\1\172\1\uffff\1\172\1\uffff\1\172\3\uffff";
     static final String DFA14_acceptS =
-        "\4\uffff\1\5\1\6\6\uffff\1\23\1\24\1\uffff\1\27\1\uffff\1\32\3"+
-        "\uffff\1\45\1\uffff\1\51\1\52\7\uffff\1\64\1\65\3\uffff\1\71\1\72"+
-        "\1\uffff\1\64\7\uffff\1\5\1\6\1\uffff\1\7\1\10\6\uffff\1\53\1\uffff"+
-        "\1\23\1\24\1\uffff\1\27\1\uffff\1\32\4\uffff\1\45\1\50\1\57\1\51"+
-        "\1\52\5\uffff\1\63\1\65\1\66\1\67\1\70\1\71\6\uffff\1\54\23\uffff"+
-        "\1\55\1\56\50\uffff\1\47\7\uffff\1\37\15\uffff\1\62\2\uffff\1\3"+
-        "\1\13\3\uffff\1\4\25\uffff\1\1\5\uffff\1\11\2\uffff\1\20\13\uffff"+
-        "\1\46\14\uffff\1\33\1\34\1\12\3\uffff\1\26\1\uffff\1\31\11\uffff"+
-        "\1\35\10\uffff\1\36\3\uffff\1\61\1\2\3\uffff\1\16\1\17\2\uffff\1"+
-        "\40\2\uffff\1\30\1\uffff\1\44\14\uffff\1\42\1\21\6\uffff\1\41\3"+
-        "\uffff\1\43\1\uffff\1\15\1\uffff\1\22\1\uffff\1\60\1\14\1\25";
+        "\4\uffff\1\5\1\6\6\uffff\1\23\1\24\1\uffff\1\27\1\uffff\1\32\3\uffff\1\45\1\uffff\1\51\1\52\7\uffff\1\64\1\65\3\uffff\1\71\1\72\1\uffff\1\64\7\uffff\1\5\1\6\1\uffff\1\7\1\10\6\uffff\1\53\1\uffff\1\23\1\24\1\uffff\1\27\1\uffff\1\32\4\uffff\1\45\1\50\1\57\1\51\1\52\5\uffff\1\63\1\65\1\66\1\67\1\70\1\71\6\uffff\1\54\23\uffff\1\55\1\56\50\uffff\1\47\7\uffff\1\37\15\uffff\1\62\2\uffff\1\3\1\13\3\uffff\1\4\25\uffff\1\1\5\uffff\1\11\2\uffff\1\20\13\uffff\1\46\14\uffff\1\33\1\34\1\12\3\uffff\1\26\1\uffff\1\31\11\uffff\1\35\10\uffff\1\36\3\uffff\1\61\1\2\3\uffff\1\16\1\17\2\uffff\1\40\2\uffff\1\30\1\uffff\1\44\14\uffff\1\42\1\21\6\uffff\1\41\3\uffff\1\43\1\uffff\1\15\1\uffff\1\22\1\uffff\1\60\1\14\1\25";
     static final String DFA14_specialS =
         "\1\2\41\uffff\1\1\1\0\u011c\uffff}>";
     static final String[] DFA14_transitionS = {
-            "\11\46\2\45\2\46\1\45\22\46\1\45\1\46\1\42\4\46\1\43\3\46\1"+
-            "\4\1\25\1\5\1\26\1\44\1\36\11\41\1\17\2\46\1\21\3\46\3\40\1"+
-            "\33\1\7\10\40\1\16\1\40\1\13\1\40\1\23\1\40\1\1\6\40\1\27\1"+
-            "\46\1\30\1\37\1\40\1\46\1\24\1\11\2\40\1\6\1\3\2\40\1\22\3\40"+
-            "\1\2\1\32\1\34\1\10\1\40\1\20\1\12\1\35\1\31\5\40\1\14\1\46"+
-            "\1\15\uff82\46",
+            "\11\46\2\45\2\46\1\45\22\46\1\45\1\46\1\42\4\46\1\43\3\46\1\4\1\25\1\5\1\26\1\44\1\36\11\41\1\17\2\46\1\21\3\46\3\40\1\33\1\7\10\40\1\16\1\40\1\13\1\40\1\23\1\40\1\1\6\40\1\27\1\46\1\30\1\37\1\40\1\46\1\24\1\11\2\40\1\6\1\3\2\40\1\22\3\40\1\2\1\32\1\34\1\10\1\40\1\20\1\12\1\35\1\31\5\40\1\14\1\46\1\15\uff82\46",
             "\1\47",
             "\1\51\7\uffff\1\53\5\uffff\1\52\3\uffff\1\55\1\uffff\1\54",
             "\1\56\20\uffff\1\57",
@@ -2245,8 +2164,7 @@ public class InternalETPhysLexer extends Lexer {
             "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
             "\1\65\2\uffff\1\67\1\uffff\1\66",
             "\1\70",
-            "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\10\50\1\71\12\50"+
-            "\1\72\6\50",
+            "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\10\50\1\71\12\50\1\72\6\50",
             "\1\74",
             "",
             "",
@@ -2369,8 +2287,7 @@ public class InternalETPhysLexer extends Lexer {
             "\1\u009f",
             "\1\u00a0",
             "\1\u00a1",
-            "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\14\50\1\u00a2\15"+
-            "\50",
+            "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\14\50\1\u00a2\15\50",
             "\1\u00a4",
             "\1\u00a5",
             "\1\u00a6",
diff --git a/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhysParser.java b/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhysParser.java
index b0656880e..863368e3f 100644
--- a/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhysParser.java
+++ b/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhysParser.java
@@ -18,8 +18,7 @@ import org.antlr.runtime.*;
 import java.util.Stack;
 import java.util.List;
 import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
+
 @SuppressWarnings("all")
 public class InternalETPhysParser extends AbstractInternalContentAssistParser {
     public static final String[] tokenNames = new String[] {
@@ -99,7 +98,7 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
         
 
     public String[] getTokenNames() { return InternalETPhysParser.tokenNames; }
-    public String getGrammarFileName() { return "../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g"; }
+    public String getGrammarFileName() { return "InternalETPhys.g"; }
 
 
      
@@ -123,24 +122,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRulePhysicalModel"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:61:1: entryRulePhysicalModel : rulePhysicalModel EOF ;
+    // InternalETPhys.g:60:1: entryRulePhysicalModel : rulePhysicalModel EOF ;
     public final void entryRulePhysicalModel() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:62:1: ( rulePhysicalModel EOF )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:63:1: rulePhysicalModel EOF
+            // InternalETPhys.g:61:1: ( rulePhysicalModel EOF )
+            // InternalETPhys.g:62:1: rulePhysicalModel EOF
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalModelRule()); 
-            }
-            pushFollow(FOLLOW_rulePhysicalModel_in_entryRulePhysicalModel67);
+             before(grammarAccess.getPhysicalModelRule()); 
+            pushFollow(FOLLOW_1);
             rulePhysicalModel();
 
             state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalModelRule()); 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRulePhysicalModel74); if (state.failed) return ;
+
+             after(grammarAccess.getPhysicalModelRule()); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -157,36 +152,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rulePhysicalModel"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:70:1: rulePhysicalModel : ( ( rule__PhysicalModel__Group__0 ) ) ;
+    // InternalETPhys.g:69:1: rulePhysicalModel : ( ( rule__PhysicalModel__Group__0 ) ) ;
     public final void rulePhysicalModel() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:74:2: ( ( ( rule__PhysicalModel__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:75:1: ( ( rule__PhysicalModel__Group__0 ) )
+            // InternalETPhys.g:73:2: ( ( ( rule__PhysicalModel__Group__0 ) ) )
+            // InternalETPhys.g:74:1: ( ( rule__PhysicalModel__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:75:1: ( ( rule__PhysicalModel__Group__0 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:76:1: ( rule__PhysicalModel__Group__0 )
+            // InternalETPhys.g:74:1: ( ( rule__PhysicalModel__Group__0 ) )
+            // InternalETPhys.g:75:1: ( rule__PhysicalModel__Group__0 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalModelAccess().getGroup()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:77:1: ( rule__PhysicalModel__Group__0 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:77:2: rule__PhysicalModel__Group__0
+             before(grammarAccess.getPhysicalModelAccess().getGroup()); 
+            // InternalETPhys.g:76:1: ( rule__PhysicalModel__Group__0 )
+            // InternalETPhys.g:76:2: rule__PhysicalModel__Group__0
             {
-            pushFollow(FOLLOW_rule__PhysicalModel__Group__0_in_rulePhysicalModel100);
+            pushFollow(FOLLOW_2);
             rule__PhysicalModel__Group__0();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalModelAccess().getGroup()); 
             }
 
+             after(grammarAccess.getPhysicalModelAccess().getGroup()); 
+
             }
 
 
@@ -208,24 +199,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRulePhysicalSystem"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:89:1: entryRulePhysicalSystem : rulePhysicalSystem EOF ;
+    // InternalETPhys.g:88:1: entryRulePhysicalSystem : rulePhysicalSystem EOF ;
     public final void entryRulePhysicalSystem() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:90:1: ( rulePhysicalSystem EOF )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:91:1: rulePhysicalSystem EOF
+            // InternalETPhys.g:89:1: ( rulePhysicalSystem EOF )
+            // InternalETPhys.g:90:1: rulePhysicalSystem EOF
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalSystemRule()); 
-            }
-            pushFollow(FOLLOW_rulePhysicalSystem_in_entryRulePhysicalSystem127);
+             before(grammarAccess.getPhysicalSystemRule()); 
+            pushFollow(FOLLOW_1);
             rulePhysicalSystem();
 
             state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalSystemRule()); 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRulePhysicalSystem134); if (state.failed) return ;
+
+             after(grammarAccess.getPhysicalSystemRule()); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -242,36 +229,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rulePhysicalSystem"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:98:1: rulePhysicalSystem : ( ( rule__PhysicalSystem__Group__0 ) ) ;
+    // InternalETPhys.g:97:1: rulePhysicalSystem : ( ( rule__PhysicalSystem__Group__0 ) ) ;
     public final void rulePhysicalSystem() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:102:2: ( ( ( rule__PhysicalSystem__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:103:1: ( ( rule__PhysicalSystem__Group__0 ) )
+            // InternalETPhys.g:101:2: ( ( ( rule__PhysicalSystem__Group__0 ) ) )
+            // InternalETPhys.g:102:1: ( ( rule__PhysicalSystem__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:103:1: ( ( rule__PhysicalSystem__Group__0 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:104:1: ( rule__PhysicalSystem__Group__0 )
+            // InternalETPhys.g:102:1: ( ( rule__PhysicalSystem__Group__0 ) )
+            // InternalETPhys.g:103:1: ( rule__PhysicalSystem__Group__0 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalSystemAccess().getGroup()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:105:1: ( rule__PhysicalSystem__Group__0 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:105:2: rule__PhysicalSystem__Group__0
+             before(grammarAccess.getPhysicalSystemAccess().getGroup()); 
+            // InternalETPhys.g:104:1: ( rule__PhysicalSystem__Group__0 )
+            // InternalETPhys.g:104:2: rule__PhysicalSystem__Group__0
             {
-            pushFollow(FOLLOW_rule__PhysicalSystem__Group__0_in_rulePhysicalSystem160);
+            pushFollow(FOLLOW_2);
             rule__PhysicalSystem__Group__0();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalSystemAccess().getGroup()); 
             }
 
+             after(grammarAccess.getPhysicalSystemAccess().getGroup()); 
+
             }
 
 
@@ -293,24 +276,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleNodeRef"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:117:1: entryRuleNodeRef : ruleNodeRef EOF ;
+    // InternalETPhys.g:116:1: entryRuleNodeRef : ruleNodeRef EOF ;
     public final void entryRuleNodeRef() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:118:1: ( ruleNodeRef EOF )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:119:1: ruleNodeRef EOF
+            // InternalETPhys.g:117:1: ( ruleNodeRef EOF )
+            // InternalETPhys.g:118:1: ruleNodeRef EOF
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getNodeRefRule()); 
-            }
-            pushFollow(FOLLOW_ruleNodeRef_in_entryRuleNodeRef187);
+             before(grammarAccess.getNodeRefRule()); 
+            pushFollow(FOLLOW_1);
             ruleNodeRef();
 
             state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getNodeRefRule()); 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleNodeRef194); if (state.failed) return ;
+
+             after(grammarAccess.getNodeRefRule()); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -327,36 +306,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleNodeRef"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:126:1: ruleNodeRef : ( ( rule__NodeRef__Group__0 ) ) ;
+    // InternalETPhys.g:125:1: ruleNodeRef : ( ( rule__NodeRef__Group__0 ) ) ;
     public final void ruleNodeRef() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:130:2: ( ( ( rule__NodeRef__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:131:1: ( ( rule__NodeRef__Group__0 ) )
+            // InternalETPhys.g:129:2: ( ( ( rule__NodeRef__Group__0 ) ) )
+            // InternalETPhys.g:130:1: ( ( rule__NodeRef__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:131:1: ( ( rule__NodeRef__Group__0 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:132:1: ( rule__NodeRef__Group__0 )
+            // InternalETPhys.g:130:1: ( ( rule__NodeRef__Group__0 ) )
+            // InternalETPhys.g:131:1: ( rule__NodeRef__Group__0 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getNodeRefAccess().getGroup()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:133:1: ( rule__NodeRef__Group__0 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:133:2: rule__NodeRef__Group__0
+             before(grammarAccess.getNodeRefAccess().getGroup()); 
+            // InternalETPhys.g:132:1: ( rule__NodeRef__Group__0 )
+            // InternalETPhys.g:132:2: rule__NodeRef__Group__0
             {
-            pushFollow(FOLLOW_rule__NodeRef__Group__0_in_ruleNodeRef220);
+            pushFollow(FOLLOW_2);
             rule__NodeRef__Group__0();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getNodeRefAccess().getGroup()); 
             }
 
+             after(grammarAccess.getNodeRefAccess().getGroup()); 
+
             }
 
 
@@ -378,24 +353,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleNodeClass"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:145:1: entryRuleNodeClass : ruleNodeClass EOF ;
+    // InternalETPhys.g:144:1: entryRuleNodeClass : ruleNodeClass EOF ;
     public final void entryRuleNodeClass() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:146:1: ( ruleNodeClass EOF )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:147:1: ruleNodeClass EOF
+            // InternalETPhys.g:145:1: ( ruleNodeClass EOF )
+            // InternalETPhys.g:146:1: ruleNodeClass EOF
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getNodeClassRule()); 
-            }
-            pushFollow(FOLLOW_ruleNodeClass_in_entryRuleNodeClass247);
+             before(grammarAccess.getNodeClassRule()); 
+            pushFollow(FOLLOW_1);
             ruleNodeClass();
 
             state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getNodeClassRule()); 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleNodeClass254); if (state.failed) return ;
+
+             after(grammarAccess.getNodeClassRule()); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -412,36 +383,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleNodeClass"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:154:1: ruleNodeClass : ( ( rule__NodeClass__Group__0 ) ) ;
+    // InternalETPhys.g:153:1: ruleNodeClass : ( ( rule__NodeClass__Group__0 ) ) ;
     public final void ruleNodeClass() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:158:2: ( ( ( rule__NodeClass__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:159:1: ( ( rule__NodeClass__Group__0 ) )
+            // InternalETPhys.g:157:2: ( ( ( rule__NodeClass__Group__0 ) ) )
+            // InternalETPhys.g:158:1: ( ( rule__NodeClass__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:159:1: ( ( rule__NodeClass__Group__0 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:160:1: ( rule__NodeClass__Group__0 )
+            // InternalETPhys.g:158:1: ( ( rule__NodeClass__Group__0 ) )
+            // InternalETPhys.g:159:1: ( rule__NodeClass__Group__0 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getNodeClassAccess().getGroup()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:161:1: ( rule__NodeClass__Group__0 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:161:2: rule__NodeClass__Group__0
+             before(grammarAccess.getNodeClassAccess().getGroup()); 
+            // InternalETPhys.g:160:1: ( rule__NodeClass__Group__0 )
+            // InternalETPhys.g:160:2: rule__NodeClass__Group__0
             {
-            pushFollow(FOLLOW_rule__NodeClass__Group__0_in_ruleNodeClass280);
+            pushFollow(FOLLOW_2);
             rule__NodeClass__Group__0();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getNodeClassAccess().getGroup()); 
             }
 
+             after(grammarAccess.getNodeClassAccess().getGroup()); 
+
             }
 
 
@@ -463,24 +430,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRulePhysicalThread"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:173:1: entryRulePhysicalThread : rulePhysicalThread EOF ;
+    // InternalETPhys.g:172:1: entryRulePhysicalThread : rulePhysicalThread EOF ;
     public final void entryRulePhysicalThread() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:174:1: ( rulePhysicalThread EOF )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:175:1: rulePhysicalThread EOF
+            // InternalETPhys.g:173:1: ( rulePhysicalThread EOF )
+            // InternalETPhys.g:174:1: rulePhysicalThread EOF
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalThreadRule()); 
-            }
-            pushFollow(FOLLOW_rulePhysicalThread_in_entryRulePhysicalThread307);
+             before(grammarAccess.getPhysicalThreadRule()); 
+            pushFollow(FOLLOW_1);
             rulePhysicalThread();
 
             state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalThreadRule()); 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRulePhysicalThread314); if (state.failed) return ;
+
+             after(grammarAccess.getPhysicalThreadRule()); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -497,36 +460,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rulePhysicalThread"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:182:1: rulePhysicalThread : ( ( rule__PhysicalThread__Group__0 ) ) ;
+    // InternalETPhys.g:181:1: rulePhysicalThread : ( ( rule__PhysicalThread__Group__0 ) ) ;
     public final void rulePhysicalThread() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:186:2: ( ( ( rule__PhysicalThread__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:187:1: ( ( rule__PhysicalThread__Group__0 ) )
+            // InternalETPhys.g:185:2: ( ( ( rule__PhysicalThread__Group__0 ) ) )
+            // InternalETPhys.g:186:1: ( ( rule__PhysicalThread__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:187:1: ( ( rule__PhysicalThread__Group__0 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:188:1: ( rule__PhysicalThread__Group__0 )
+            // InternalETPhys.g:186:1: ( ( rule__PhysicalThread__Group__0 ) )
+            // InternalETPhys.g:187:1: ( rule__PhysicalThread__Group__0 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalThreadAccess().getGroup()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:189:1: ( rule__PhysicalThread__Group__0 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:189:2: rule__PhysicalThread__Group__0
+             before(grammarAccess.getPhysicalThreadAccess().getGroup()); 
+            // InternalETPhys.g:188:1: ( rule__PhysicalThread__Group__0 )
+            // InternalETPhys.g:188:2: rule__PhysicalThread__Group__0
             {
-            pushFollow(FOLLOW_rule__PhysicalThread__Group__0_in_rulePhysicalThread340);
+            pushFollow(FOLLOW_2);
             rule__PhysicalThread__Group__0();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalThreadAccess().getGroup()); 
             }
 
+             after(grammarAccess.getPhysicalThreadAccess().getGroup()); 
+
             }
 
 
@@ -548,24 +507,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleRuntimeClass"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:201:1: entryRuleRuntimeClass : ruleRuntimeClass EOF ;
+    // InternalETPhys.g:200:1: entryRuleRuntimeClass : ruleRuntimeClass EOF ;
     public final void entryRuleRuntimeClass() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:202:1: ( ruleRuntimeClass EOF )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:203:1: ruleRuntimeClass EOF
+            // InternalETPhys.g:201:1: ( ruleRuntimeClass EOF )
+            // InternalETPhys.g:202:1: ruleRuntimeClass EOF
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getRuntimeClassRule()); 
-            }
-            pushFollow(FOLLOW_ruleRuntimeClass_in_entryRuleRuntimeClass367);
+             before(grammarAccess.getRuntimeClassRule()); 
+            pushFollow(FOLLOW_1);
             ruleRuntimeClass();
 
             state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getRuntimeClassRule()); 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRuntimeClass374); if (state.failed) return ;
+
+             after(grammarAccess.getRuntimeClassRule()); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -582,36 +537,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleRuntimeClass"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:210:1: ruleRuntimeClass : ( ( rule__RuntimeClass__Group__0 ) ) ;
+    // InternalETPhys.g:209:1: ruleRuntimeClass : ( ( rule__RuntimeClass__Group__0 ) ) ;
     public final void ruleRuntimeClass() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:214:2: ( ( ( rule__RuntimeClass__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:215:1: ( ( rule__RuntimeClass__Group__0 ) )
+            // InternalETPhys.g:213:2: ( ( ( rule__RuntimeClass__Group__0 ) ) )
+            // InternalETPhys.g:214:1: ( ( rule__RuntimeClass__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:215:1: ( ( rule__RuntimeClass__Group__0 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:216:1: ( rule__RuntimeClass__Group__0 )
+            // InternalETPhys.g:214:1: ( ( rule__RuntimeClass__Group__0 ) )
+            // InternalETPhys.g:215:1: ( rule__RuntimeClass__Group__0 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getRuntimeClassAccess().getGroup()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:217:1: ( rule__RuntimeClass__Group__0 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:217:2: rule__RuntimeClass__Group__0
+             before(grammarAccess.getRuntimeClassAccess().getGroup()); 
+            // InternalETPhys.g:216:1: ( rule__RuntimeClass__Group__0 )
+            // InternalETPhys.g:216:2: rule__RuntimeClass__Group__0
             {
-            pushFollow(FOLLOW_rule__RuntimeClass__Group__0_in_ruleRuntimeClass400);
+            pushFollow(FOLLOW_2);
             rule__RuntimeClass__Group__0();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getRuntimeClassAccess().getGroup()); 
             }
 
+             after(grammarAccess.getRuntimeClassAccess().getGroup()); 
+
             }
 
 
@@ -633,24 +584,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleKeyValue"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:231:1: entryRuleKeyValue : ruleKeyValue EOF ;
+    // InternalETPhys.g:230:1: entryRuleKeyValue : ruleKeyValue EOF ;
     public final void entryRuleKeyValue() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:232:1: ( ruleKeyValue EOF )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:233:1: ruleKeyValue EOF
+            // InternalETPhys.g:231:1: ( ruleKeyValue EOF )
+            // InternalETPhys.g:232:1: ruleKeyValue EOF
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getKeyValueRule()); 
-            }
-            pushFollow(FOLLOW_ruleKeyValue_in_entryRuleKeyValue429);
+             before(grammarAccess.getKeyValueRule()); 
+            pushFollow(FOLLOW_1);
             ruleKeyValue();
 
             state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getKeyValueRule()); 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleKeyValue436); if (state.failed) return ;
+
+             after(grammarAccess.getKeyValueRule()); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -667,36 +614,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleKeyValue"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:240:1: ruleKeyValue : ( ( rule__KeyValue__Group__0 ) ) ;
+    // InternalETPhys.g:239:1: ruleKeyValue : ( ( rule__KeyValue__Group__0 ) ) ;
     public final void ruleKeyValue() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:244:2: ( ( ( rule__KeyValue__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:245:1: ( ( rule__KeyValue__Group__0 ) )
+            // InternalETPhys.g:243:2: ( ( ( rule__KeyValue__Group__0 ) ) )
+            // InternalETPhys.g:244:1: ( ( rule__KeyValue__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:245:1: ( ( rule__KeyValue__Group__0 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:246:1: ( rule__KeyValue__Group__0 )
+            // InternalETPhys.g:244:1: ( ( rule__KeyValue__Group__0 ) )
+            // InternalETPhys.g:245:1: ( rule__KeyValue__Group__0 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getKeyValueAccess().getGroup()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:247:1: ( rule__KeyValue__Group__0 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:247:2: rule__KeyValue__Group__0
+             before(grammarAccess.getKeyValueAccess().getGroup()); 
+            // InternalETPhys.g:246:1: ( rule__KeyValue__Group__0 )
+            // InternalETPhys.g:246:2: rule__KeyValue__Group__0
             {
-            pushFollow(FOLLOW_rule__KeyValue__Group__0_in_ruleKeyValue462);
+            pushFollow(FOLLOW_2);
             rule__KeyValue__Group__0();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getKeyValueAccess().getGroup()); 
             }
 
+             after(grammarAccess.getKeyValueAccess().getGroup()); 
+
             }
 
 
@@ -718,24 +661,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleAnnotationTargetType"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:261:1: entryRuleAnnotationTargetType : ruleAnnotationTargetType EOF ;
+    // InternalETPhys.g:260:1: entryRuleAnnotationTargetType : ruleAnnotationTargetType EOF ;
     public final void entryRuleAnnotationTargetType() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:262:1: ( ruleAnnotationTargetType EOF )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:263:1: ruleAnnotationTargetType EOF
+            // InternalETPhys.g:261:1: ( ruleAnnotationTargetType EOF )
+            // InternalETPhys.g:262:1: ruleAnnotationTargetType EOF
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getAnnotationTargetTypeRule()); 
-            }
-            pushFollow(FOLLOW_ruleAnnotationTargetType_in_entryRuleAnnotationTargetType491);
+             before(grammarAccess.getAnnotationTargetTypeRule()); 
+            pushFollow(FOLLOW_1);
             ruleAnnotationTargetType();
 
             state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getAnnotationTargetTypeRule()); 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAnnotationTargetType498); if (state.failed) return ;
+
+             after(grammarAccess.getAnnotationTargetTypeRule()); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -752,25 +691,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleAnnotationTargetType"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:270:1: ruleAnnotationTargetType : ( RULE_ID ) ;
+    // InternalETPhys.g:269:1: ruleAnnotationTargetType : ( RULE_ID ) ;
     public final void ruleAnnotationTargetType() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:274:2: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:275:1: ( RULE_ID )
+            // InternalETPhys.g:273:2: ( ( RULE_ID ) )
+            // InternalETPhys.g:274:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:275:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:276:1: RULE_ID
+            // InternalETPhys.g:274:1: ( RULE_ID )
+            // InternalETPhys.g:275:1: RULE_ID
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getAnnotationTargetTypeAccess().getIDTerminalRuleCall()); 
-            }
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleAnnotationTargetType524); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getAnnotationTargetTypeAccess().getIDTerminalRuleCall()); 
-            }
+             before(grammarAccess.getAnnotationTargetTypeAccess().getIDTerminalRuleCall()); 
+            match(input,RULE_ID,FOLLOW_2); 
+             after(grammarAccess.getAnnotationTargetTypeAccess().getIDTerminalRuleCall()); 
 
             }
 
@@ -793,24 +728,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleAnnotationAttribute"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:289:1: entryRuleAnnotationAttribute : ruleAnnotationAttribute EOF ;
+    // InternalETPhys.g:288:1: entryRuleAnnotationAttribute : ruleAnnotationAttribute EOF ;
     public final void entryRuleAnnotationAttribute() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:290:1: ( ruleAnnotationAttribute EOF )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:291:1: ruleAnnotationAttribute EOF
+            // InternalETPhys.g:289:1: ( ruleAnnotationAttribute EOF )
+            // InternalETPhys.g:290:1: ruleAnnotationAttribute EOF
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getAnnotationAttributeRule()); 
-            }
-            pushFollow(FOLLOW_ruleAnnotationAttribute_in_entryRuleAnnotationAttribute550);
+             before(grammarAccess.getAnnotationAttributeRule()); 
+            pushFollow(FOLLOW_1);
             ruleAnnotationAttribute();
 
             state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getAnnotationAttributeRule()); 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAnnotationAttribute557); if (state.failed) return ;
+
+             after(grammarAccess.getAnnotationAttributeRule()); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -827,36 +758,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleAnnotationAttribute"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:298:1: ruleAnnotationAttribute : ( ( rule__AnnotationAttribute__Alternatives ) ) ;
+    // InternalETPhys.g:297:1: ruleAnnotationAttribute : ( ( rule__AnnotationAttribute__Alternatives ) ) ;
     public final void ruleAnnotationAttribute() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:302:2: ( ( ( rule__AnnotationAttribute__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:303:1: ( ( rule__AnnotationAttribute__Alternatives ) )
+            // InternalETPhys.g:301:2: ( ( ( rule__AnnotationAttribute__Alternatives ) ) )
+            // InternalETPhys.g:302:1: ( ( rule__AnnotationAttribute__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:303:1: ( ( rule__AnnotationAttribute__Alternatives ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:304:1: ( rule__AnnotationAttribute__Alternatives )
+            // InternalETPhys.g:302:1: ( ( rule__AnnotationAttribute__Alternatives ) )
+            // InternalETPhys.g:303:1: ( rule__AnnotationAttribute__Alternatives )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getAnnotationAttributeAccess().getAlternatives()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:305:1: ( rule__AnnotationAttribute__Alternatives )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:305:2: rule__AnnotationAttribute__Alternatives
+             before(grammarAccess.getAnnotationAttributeAccess().getAlternatives()); 
+            // InternalETPhys.g:304:1: ( rule__AnnotationAttribute__Alternatives )
+            // InternalETPhys.g:304:2: rule__AnnotationAttribute__Alternatives
             {
-            pushFollow(FOLLOW_rule__AnnotationAttribute__Alternatives_in_ruleAnnotationAttribute583);
+            pushFollow(FOLLOW_2);
             rule__AnnotationAttribute__Alternatives();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getAnnotationAttributeAccess().getAlternatives()); 
             }
 
+             after(grammarAccess.getAnnotationAttributeAccess().getAlternatives()); 
+
             }
 
 
@@ -878,24 +805,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleSimpleAnnotationAttribute"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:317:1: entryRuleSimpleAnnotationAttribute : ruleSimpleAnnotationAttribute EOF ;
+    // InternalETPhys.g:316:1: entryRuleSimpleAnnotationAttribute : ruleSimpleAnnotationAttribute EOF ;
     public final void entryRuleSimpleAnnotationAttribute() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:318:1: ( ruleSimpleAnnotationAttribute EOF )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:319:1: ruleSimpleAnnotationAttribute EOF
+            // InternalETPhys.g:317:1: ( ruleSimpleAnnotationAttribute EOF )
+            // InternalETPhys.g:318:1: ruleSimpleAnnotationAttribute EOF
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getSimpleAnnotationAttributeRule()); 
-            }
-            pushFollow(FOLLOW_ruleSimpleAnnotationAttribute_in_entryRuleSimpleAnnotationAttribute610);
+             before(grammarAccess.getSimpleAnnotationAttributeRule()); 
+            pushFollow(FOLLOW_1);
             ruleSimpleAnnotationAttribute();
 
             state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getSimpleAnnotationAttributeRule()); 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSimpleAnnotationAttribute617); if (state.failed) return ;
+
+             after(grammarAccess.getSimpleAnnotationAttributeRule()); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -912,36 +835,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleSimpleAnnotationAttribute"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:326:1: ruleSimpleAnnotationAttribute : ( ( rule__SimpleAnnotationAttribute__Group__0 ) ) ;
+    // InternalETPhys.g:325:1: ruleSimpleAnnotationAttribute : ( ( rule__SimpleAnnotationAttribute__Group__0 ) ) ;
     public final void ruleSimpleAnnotationAttribute() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:330:2: ( ( ( rule__SimpleAnnotationAttribute__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:331:1: ( ( rule__SimpleAnnotationAttribute__Group__0 ) )
+            // InternalETPhys.g:329:2: ( ( ( rule__SimpleAnnotationAttribute__Group__0 ) ) )
+            // InternalETPhys.g:330:1: ( ( rule__SimpleAnnotationAttribute__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:331:1: ( ( rule__SimpleAnnotationAttribute__Group__0 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:332:1: ( rule__SimpleAnnotationAttribute__Group__0 )
+            // InternalETPhys.g:330:1: ( ( rule__SimpleAnnotationAttribute__Group__0 ) )
+            // InternalETPhys.g:331:1: ( rule__SimpleAnnotationAttribute__Group__0 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getSimpleAnnotationAttributeAccess().getGroup()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:333:1: ( rule__SimpleAnnotationAttribute__Group__0 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:333:2: rule__SimpleAnnotationAttribute__Group__0
+             before(grammarAccess.getSimpleAnnotationAttributeAccess().getGroup()); 
+            // InternalETPhys.g:332:1: ( rule__SimpleAnnotationAttribute__Group__0 )
+            // InternalETPhys.g:332:2: rule__SimpleAnnotationAttribute__Group__0
             {
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__0_in_ruleSimpleAnnotationAttribute643);
+            pushFollow(FOLLOW_2);
             rule__SimpleAnnotationAttribute__Group__0();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getSimpleAnnotationAttributeAccess().getGroup()); 
             }
 
+             after(grammarAccess.getSimpleAnnotationAttributeAccess().getGroup()); 
+
             }
 
 
@@ -963,24 +882,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleEnumAnnotationAttribute"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:345:1: entryRuleEnumAnnotationAttribute : ruleEnumAnnotationAttribute EOF ;
+    // InternalETPhys.g:344:1: entryRuleEnumAnnotationAttribute : ruleEnumAnnotationAttribute EOF ;
     public final void entryRuleEnumAnnotationAttribute() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:346:1: ( ruleEnumAnnotationAttribute EOF )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:347:1: ruleEnumAnnotationAttribute EOF
+            // InternalETPhys.g:345:1: ( ruleEnumAnnotationAttribute EOF )
+            // InternalETPhys.g:346:1: ruleEnumAnnotationAttribute EOF
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getEnumAnnotationAttributeRule()); 
-            }
-            pushFollow(FOLLOW_ruleEnumAnnotationAttribute_in_entryRuleEnumAnnotationAttribute670);
+             before(grammarAccess.getEnumAnnotationAttributeRule()); 
+            pushFollow(FOLLOW_1);
             ruleEnumAnnotationAttribute();
 
             state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getEnumAnnotationAttributeRule()); 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleEnumAnnotationAttribute677); if (state.failed) return ;
+
+             after(grammarAccess.getEnumAnnotationAttributeRule()); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -997,36 +912,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleEnumAnnotationAttribute"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:354:1: ruleEnumAnnotationAttribute : ( ( rule__EnumAnnotationAttribute__Group__0 ) ) ;
+    // InternalETPhys.g:353:1: ruleEnumAnnotationAttribute : ( ( rule__EnumAnnotationAttribute__Group__0 ) ) ;
     public final void ruleEnumAnnotationAttribute() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:358:2: ( ( ( rule__EnumAnnotationAttribute__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:359:1: ( ( rule__EnumAnnotationAttribute__Group__0 ) )
+            // InternalETPhys.g:357:2: ( ( ( rule__EnumAnnotationAttribute__Group__0 ) ) )
+            // InternalETPhys.g:358:1: ( ( rule__EnumAnnotationAttribute__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:359:1: ( ( rule__EnumAnnotationAttribute__Group__0 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:360:1: ( rule__EnumAnnotationAttribute__Group__0 )
+            // InternalETPhys.g:358:1: ( ( rule__EnumAnnotationAttribute__Group__0 ) )
+            // InternalETPhys.g:359:1: ( rule__EnumAnnotationAttribute__Group__0 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getEnumAnnotationAttributeAccess().getGroup()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:361:1: ( rule__EnumAnnotationAttribute__Group__0 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:361:2: rule__EnumAnnotationAttribute__Group__0
+             before(grammarAccess.getEnumAnnotationAttributeAccess().getGroup()); 
+            // InternalETPhys.g:360:1: ( rule__EnumAnnotationAttribute__Group__0 )
+            // InternalETPhys.g:360:2: rule__EnumAnnotationAttribute__Group__0
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__0_in_ruleEnumAnnotationAttribute703);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group__0();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getEnumAnnotationAttributeAccess().getGroup()); 
             }
 
+             after(grammarAccess.getEnumAnnotationAttributeAccess().getGroup()); 
+
             }
 
 
@@ -1048,24 +959,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleImport"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:373:1: entryRuleImport : ruleImport EOF ;
+    // InternalETPhys.g:372:1: entryRuleImport : ruleImport EOF ;
     public final void entryRuleImport() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:374:1: ( ruleImport EOF )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:375:1: ruleImport EOF
+            // InternalETPhys.g:373:1: ( ruleImport EOF )
+            // InternalETPhys.g:374:1: ruleImport EOF
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getImportRule()); 
-            }
-            pushFollow(FOLLOW_ruleImport_in_entryRuleImport730);
+             before(grammarAccess.getImportRule()); 
+            pushFollow(FOLLOW_1);
             ruleImport();
 
             state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getImportRule()); 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleImport737); if (state.failed) return ;
+
+             after(grammarAccess.getImportRule()); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1082,36 +989,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleImport"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:382:1: ruleImport : ( ( rule__Import__Group__0 ) ) ;
+    // InternalETPhys.g:381:1: ruleImport : ( ( rule__Import__Group__0 ) ) ;
     public final void ruleImport() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:386:2: ( ( ( rule__Import__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:387:1: ( ( rule__Import__Group__0 ) )
+            // InternalETPhys.g:385:2: ( ( ( rule__Import__Group__0 ) ) )
+            // InternalETPhys.g:386:1: ( ( rule__Import__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:387:1: ( ( rule__Import__Group__0 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:388:1: ( rule__Import__Group__0 )
+            // InternalETPhys.g:386:1: ( ( rule__Import__Group__0 ) )
+            // InternalETPhys.g:387:1: ( rule__Import__Group__0 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getImportAccess().getGroup()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:389:1: ( rule__Import__Group__0 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:389:2: rule__Import__Group__0
+             before(grammarAccess.getImportAccess().getGroup()); 
+            // InternalETPhys.g:388:1: ( rule__Import__Group__0 )
+            // InternalETPhys.g:388:2: rule__Import__Group__0
             {
-            pushFollow(FOLLOW_rule__Import__Group__0_in_ruleImport763);
+            pushFollow(FOLLOW_2);
             rule__Import__Group__0();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getImportAccess().getGroup()); 
             }
 
+             after(grammarAccess.getImportAccess().getGroup()); 
+
             }
 
 
@@ -1133,24 +1036,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleImportedFQN"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:401:1: entryRuleImportedFQN : ruleImportedFQN EOF ;
+    // InternalETPhys.g:400:1: entryRuleImportedFQN : ruleImportedFQN EOF ;
     public final void entryRuleImportedFQN() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:402:1: ( ruleImportedFQN EOF )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:403:1: ruleImportedFQN EOF
+            // InternalETPhys.g:401:1: ( ruleImportedFQN EOF )
+            // InternalETPhys.g:402:1: ruleImportedFQN EOF
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getImportedFQNRule()); 
-            }
-            pushFollow(FOLLOW_ruleImportedFQN_in_entryRuleImportedFQN790);
+             before(grammarAccess.getImportedFQNRule()); 
+            pushFollow(FOLLOW_1);
             ruleImportedFQN();
 
             state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getImportedFQNRule()); 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleImportedFQN797); if (state.failed) return ;
+
+             after(grammarAccess.getImportedFQNRule()); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1167,36 +1066,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleImportedFQN"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:410:1: ruleImportedFQN : ( ( rule__ImportedFQN__Group__0 ) ) ;
+    // InternalETPhys.g:409:1: ruleImportedFQN : ( ( rule__ImportedFQN__Group__0 ) ) ;
     public final void ruleImportedFQN() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:414:2: ( ( ( rule__ImportedFQN__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:415:1: ( ( rule__ImportedFQN__Group__0 ) )
+            // InternalETPhys.g:413:2: ( ( ( rule__ImportedFQN__Group__0 ) ) )
+            // InternalETPhys.g:414:1: ( ( rule__ImportedFQN__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:415:1: ( ( rule__ImportedFQN__Group__0 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:416:1: ( rule__ImportedFQN__Group__0 )
+            // InternalETPhys.g:414:1: ( ( rule__ImportedFQN__Group__0 ) )
+            // InternalETPhys.g:415:1: ( rule__ImportedFQN__Group__0 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getImportedFQNAccess().getGroup()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:417:1: ( rule__ImportedFQN__Group__0 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:417:2: rule__ImportedFQN__Group__0
+             before(grammarAccess.getImportedFQNAccess().getGroup()); 
+            // InternalETPhys.g:416:1: ( rule__ImportedFQN__Group__0 )
+            // InternalETPhys.g:416:2: rule__ImportedFQN__Group__0
             {
-            pushFollow(FOLLOW_rule__ImportedFQN__Group__0_in_ruleImportedFQN823);
+            pushFollow(FOLLOW_2);
             rule__ImportedFQN__Group__0();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getImportedFQNAccess().getGroup()); 
             }
 
+             after(grammarAccess.getImportedFQNAccess().getGroup()); 
+
             }
 
 
@@ -1218,24 +1113,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleDocumentation"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:429:1: entryRuleDocumentation : ruleDocumentation EOF ;
+    // InternalETPhys.g:428:1: entryRuleDocumentation : ruleDocumentation EOF ;
     public final void entryRuleDocumentation() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:430:1: ( ruleDocumentation EOF )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:431:1: ruleDocumentation EOF
+            // InternalETPhys.g:429:1: ( ruleDocumentation EOF )
+            // InternalETPhys.g:430:1: ruleDocumentation EOF
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getDocumentationRule()); 
-            }
-            pushFollow(FOLLOW_ruleDocumentation_in_entryRuleDocumentation850);
+             before(grammarAccess.getDocumentationRule()); 
+            pushFollow(FOLLOW_1);
             ruleDocumentation();
 
             state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getDocumentationRule()); 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDocumentation857); if (state.failed) return ;
+
+             after(grammarAccess.getDocumentationRule()); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1252,36 +1143,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleDocumentation"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:438:1: ruleDocumentation : ( ( rule__Documentation__Group__0 ) ) ;
+    // InternalETPhys.g:437:1: ruleDocumentation : ( ( rule__Documentation__Group__0 ) ) ;
     public final void ruleDocumentation() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:442:2: ( ( ( rule__Documentation__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:443:1: ( ( rule__Documentation__Group__0 ) )
+            // InternalETPhys.g:441:2: ( ( ( rule__Documentation__Group__0 ) ) )
+            // InternalETPhys.g:442:1: ( ( rule__Documentation__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:443:1: ( ( rule__Documentation__Group__0 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:444:1: ( rule__Documentation__Group__0 )
+            // InternalETPhys.g:442:1: ( ( rule__Documentation__Group__0 ) )
+            // InternalETPhys.g:443:1: ( rule__Documentation__Group__0 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getDocumentationAccess().getGroup()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:445:1: ( rule__Documentation__Group__0 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:445:2: rule__Documentation__Group__0
+             before(grammarAccess.getDocumentationAccess().getGroup()); 
+            // InternalETPhys.g:444:1: ( rule__Documentation__Group__0 )
+            // InternalETPhys.g:444:2: rule__Documentation__Group__0
             {
-            pushFollow(FOLLOW_rule__Documentation__Group__0_in_ruleDocumentation883);
+            pushFollow(FOLLOW_2);
             rule__Documentation__Group__0();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getDocumentationAccess().getGroup()); 
             }
 
+             after(grammarAccess.getDocumentationAccess().getGroup()); 
+
             }
 
 
@@ -1303,24 +1190,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleTIME"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:457:1: entryRuleTIME : ruleTIME EOF ;
+    // InternalETPhys.g:456:1: entryRuleTIME : ruleTIME EOF ;
     public final void entryRuleTIME() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:458:1: ( ruleTIME EOF )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:459:1: ruleTIME EOF
+            // InternalETPhys.g:457:1: ( ruleTIME EOF )
+            // InternalETPhys.g:458:1: ruleTIME EOF
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTIMERule()); 
-            }
-            pushFollow(FOLLOW_ruleTIME_in_entryRuleTIME910);
+             before(grammarAccess.getTIMERule()); 
+            pushFollow(FOLLOW_1);
             ruleTIME();
 
             state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTIMERule()); 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleTIME917); if (state.failed) return ;
+
+             after(grammarAccess.getTIMERule()); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1337,36 +1220,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleTIME"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:466:1: ruleTIME : ( ( rule__TIME__Alternatives ) ) ;
+    // InternalETPhys.g:465:1: ruleTIME : ( ( rule__TIME__Alternatives ) ) ;
     public final void ruleTIME() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:470:2: ( ( ( rule__TIME__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:471:1: ( ( rule__TIME__Alternatives ) )
+            // InternalETPhys.g:469:2: ( ( ( rule__TIME__Alternatives ) ) )
+            // InternalETPhys.g:470:1: ( ( rule__TIME__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:471:1: ( ( rule__TIME__Alternatives ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:472:1: ( rule__TIME__Alternatives )
+            // InternalETPhys.g:470:1: ( ( rule__TIME__Alternatives ) )
+            // InternalETPhys.g:471:1: ( rule__TIME__Alternatives )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTIMEAccess().getAlternatives()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:473:1: ( rule__TIME__Alternatives )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:473:2: rule__TIME__Alternatives
+             before(grammarAccess.getTIMEAccess().getAlternatives()); 
+            // InternalETPhys.g:472:1: ( rule__TIME__Alternatives )
+            // InternalETPhys.g:472:2: rule__TIME__Alternatives
             {
-            pushFollow(FOLLOW_rule__TIME__Alternatives_in_ruleTIME943);
+            pushFollow(FOLLOW_2);
             rule__TIME__Alternatives();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTIMEAccess().getAlternatives()); 
             }
 
+             after(grammarAccess.getTIMEAccess().getAlternatives()); 
+
             }
 
 
@@ -1388,24 +1267,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleLiteral"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:487:1: entryRuleLiteral : ruleLiteral EOF ;
+    // InternalETPhys.g:486:1: entryRuleLiteral : ruleLiteral EOF ;
     public final void entryRuleLiteral() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:488:1: ( ruleLiteral EOF )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:489:1: ruleLiteral EOF
+            // InternalETPhys.g:487:1: ( ruleLiteral EOF )
+            // InternalETPhys.g:488:1: ruleLiteral EOF
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getLiteralRule()); 
-            }
-            pushFollow(FOLLOW_ruleLiteral_in_entryRuleLiteral972);
+             before(grammarAccess.getLiteralRule()); 
+            pushFollow(FOLLOW_1);
             ruleLiteral();
 
             state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getLiteralRule()); 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleLiteral979); if (state.failed) return ;
+
+             after(grammarAccess.getLiteralRule()); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1422,36 +1297,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleLiteral"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:496:1: ruleLiteral : ( ( rule__Literal__Alternatives ) ) ;
+    // InternalETPhys.g:495:1: ruleLiteral : ( ( rule__Literal__Alternatives ) ) ;
     public final void ruleLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:500:2: ( ( ( rule__Literal__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:501:1: ( ( rule__Literal__Alternatives ) )
+            // InternalETPhys.g:499:2: ( ( ( rule__Literal__Alternatives ) ) )
+            // InternalETPhys.g:500:1: ( ( rule__Literal__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:501:1: ( ( rule__Literal__Alternatives ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:502:1: ( rule__Literal__Alternatives )
+            // InternalETPhys.g:500:1: ( ( rule__Literal__Alternatives ) )
+            // InternalETPhys.g:501:1: ( rule__Literal__Alternatives )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getLiteralAccess().getAlternatives()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:503:1: ( rule__Literal__Alternatives )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:503:2: rule__Literal__Alternatives
+             before(grammarAccess.getLiteralAccess().getAlternatives()); 
+            // InternalETPhys.g:502:1: ( rule__Literal__Alternatives )
+            // InternalETPhys.g:502:2: rule__Literal__Alternatives
             {
-            pushFollow(FOLLOW_rule__Literal__Alternatives_in_ruleLiteral1005);
+            pushFollow(FOLLOW_2);
             rule__Literal__Alternatives();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getLiteralAccess().getAlternatives()); 
             }
 
+             after(grammarAccess.getLiteralAccess().getAlternatives()); 
+
             }
 
 
@@ -1473,24 +1344,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleBooleanLiteral"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:515:1: entryRuleBooleanLiteral : ruleBooleanLiteral EOF ;
+    // InternalETPhys.g:514:1: entryRuleBooleanLiteral : ruleBooleanLiteral EOF ;
     public final void entryRuleBooleanLiteral() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:516:1: ( ruleBooleanLiteral EOF )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:517:1: ruleBooleanLiteral EOF
+            // InternalETPhys.g:515:1: ( ruleBooleanLiteral EOF )
+            // InternalETPhys.g:516:1: ruleBooleanLiteral EOF
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getBooleanLiteralRule()); 
-            }
-            pushFollow(FOLLOW_ruleBooleanLiteral_in_entryRuleBooleanLiteral1032);
+             before(grammarAccess.getBooleanLiteralRule()); 
+            pushFollow(FOLLOW_1);
             ruleBooleanLiteral();
 
             state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getBooleanLiteralRule()); 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleBooleanLiteral1039); if (state.failed) return ;
+
+             after(grammarAccess.getBooleanLiteralRule()); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1507,36 +1374,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleBooleanLiteral"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:524:1: ruleBooleanLiteral : ( ( rule__BooleanLiteral__Group__0 ) ) ;
+    // InternalETPhys.g:523:1: ruleBooleanLiteral : ( ( rule__BooleanLiteral__Group__0 ) ) ;
     public final void ruleBooleanLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:528:2: ( ( ( rule__BooleanLiteral__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:529:1: ( ( rule__BooleanLiteral__Group__0 ) )
+            // InternalETPhys.g:527:2: ( ( ( rule__BooleanLiteral__Group__0 ) ) )
+            // InternalETPhys.g:528:1: ( ( rule__BooleanLiteral__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:529:1: ( ( rule__BooleanLiteral__Group__0 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:530:1: ( rule__BooleanLiteral__Group__0 )
+            // InternalETPhys.g:528:1: ( ( rule__BooleanLiteral__Group__0 ) )
+            // InternalETPhys.g:529:1: ( rule__BooleanLiteral__Group__0 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getBooleanLiteralAccess().getGroup()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:531:1: ( rule__BooleanLiteral__Group__0 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:531:2: rule__BooleanLiteral__Group__0
+             before(grammarAccess.getBooleanLiteralAccess().getGroup()); 
+            // InternalETPhys.g:530:1: ( rule__BooleanLiteral__Group__0 )
+            // InternalETPhys.g:530:2: rule__BooleanLiteral__Group__0
             {
-            pushFollow(FOLLOW_rule__BooleanLiteral__Group__0_in_ruleBooleanLiteral1065);
+            pushFollow(FOLLOW_2);
             rule__BooleanLiteral__Group__0();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getBooleanLiteralAccess().getGroup()); 
             }
 
+             after(grammarAccess.getBooleanLiteralAccess().getGroup()); 
+
             }
 
 
@@ -1558,24 +1421,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleNumberLiteral"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:543:1: entryRuleNumberLiteral : ruleNumberLiteral EOF ;
+    // InternalETPhys.g:542:1: entryRuleNumberLiteral : ruleNumberLiteral EOF ;
     public final void entryRuleNumberLiteral() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:544:1: ( ruleNumberLiteral EOF )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:545:1: ruleNumberLiteral EOF
+            // InternalETPhys.g:543:1: ( ruleNumberLiteral EOF )
+            // InternalETPhys.g:544:1: ruleNumberLiteral EOF
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getNumberLiteralRule()); 
-            }
-            pushFollow(FOLLOW_ruleNumberLiteral_in_entryRuleNumberLiteral1092);
+             before(grammarAccess.getNumberLiteralRule()); 
+            pushFollow(FOLLOW_1);
             ruleNumberLiteral();
 
             state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getNumberLiteralRule()); 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleNumberLiteral1099); if (state.failed) return ;
+
+             after(grammarAccess.getNumberLiteralRule()); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1592,36 +1451,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleNumberLiteral"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:552:1: ruleNumberLiteral : ( ( rule__NumberLiteral__Alternatives ) ) ;
+    // InternalETPhys.g:551:1: ruleNumberLiteral : ( ( rule__NumberLiteral__Alternatives ) ) ;
     public final void ruleNumberLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:556:2: ( ( ( rule__NumberLiteral__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:557:1: ( ( rule__NumberLiteral__Alternatives ) )
+            // InternalETPhys.g:555:2: ( ( ( rule__NumberLiteral__Alternatives ) ) )
+            // InternalETPhys.g:556:1: ( ( rule__NumberLiteral__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:557:1: ( ( rule__NumberLiteral__Alternatives ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:558:1: ( rule__NumberLiteral__Alternatives )
+            // InternalETPhys.g:556:1: ( ( rule__NumberLiteral__Alternatives ) )
+            // InternalETPhys.g:557:1: ( rule__NumberLiteral__Alternatives )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getNumberLiteralAccess().getAlternatives()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:559:1: ( rule__NumberLiteral__Alternatives )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:559:2: rule__NumberLiteral__Alternatives
+             before(grammarAccess.getNumberLiteralAccess().getAlternatives()); 
+            // InternalETPhys.g:558:1: ( rule__NumberLiteral__Alternatives )
+            // InternalETPhys.g:558:2: rule__NumberLiteral__Alternatives
             {
-            pushFollow(FOLLOW_rule__NumberLiteral__Alternatives_in_ruleNumberLiteral1125);
+            pushFollow(FOLLOW_2);
             rule__NumberLiteral__Alternatives();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getNumberLiteralAccess().getAlternatives()); 
             }
 
+             after(grammarAccess.getNumberLiteralAccess().getAlternatives()); 
+
             }
 
 
@@ -1643,24 +1498,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleRealLiteral"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:571:1: entryRuleRealLiteral : ruleRealLiteral EOF ;
+    // InternalETPhys.g:570:1: entryRuleRealLiteral : ruleRealLiteral EOF ;
     public final void entryRuleRealLiteral() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:572:1: ( ruleRealLiteral EOF )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:573:1: ruleRealLiteral EOF
+            // InternalETPhys.g:571:1: ( ruleRealLiteral EOF )
+            // InternalETPhys.g:572:1: ruleRealLiteral EOF
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getRealLiteralRule()); 
-            }
-            pushFollow(FOLLOW_ruleRealLiteral_in_entryRuleRealLiteral1152);
+             before(grammarAccess.getRealLiteralRule()); 
+            pushFollow(FOLLOW_1);
             ruleRealLiteral();
 
             state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getRealLiteralRule()); 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRealLiteral1159); if (state.failed) return ;
+
+             after(grammarAccess.getRealLiteralRule()); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1677,36 +1528,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleRealLiteral"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:580:1: ruleRealLiteral : ( ( rule__RealLiteral__Group__0 ) ) ;
+    // InternalETPhys.g:579:1: ruleRealLiteral : ( ( rule__RealLiteral__Group__0 ) ) ;
     public final void ruleRealLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:584:2: ( ( ( rule__RealLiteral__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:585:1: ( ( rule__RealLiteral__Group__0 ) )
+            // InternalETPhys.g:583:2: ( ( ( rule__RealLiteral__Group__0 ) ) )
+            // InternalETPhys.g:584:1: ( ( rule__RealLiteral__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:585:1: ( ( rule__RealLiteral__Group__0 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:586:1: ( rule__RealLiteral__Group__0 )
+            // InternalETPhys.g:584:1: ( ( rule__RealLiteral__Group__0 ) )
+            // InternalETPhys.g:585:1: ( rule__RealLiteral__Group__0 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getRealLiteralAccess().getGroup()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:587:1: ( rule__RealLiteral__Group__0 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:587:2: rule__RealLiteral__Group__0
+             before(grammarAccess.getRealLiteralAccess().getGroup()); 
+            // InternalETPhys.g:586:1: ( rule__RealLiteral__Group__0 )
+            // InternalETPhys.g:586:2: rule__RealLiteral__Group__0
             {
-            pushFollow(FOLLOW_rule__RealLiteral__Group__0_in_ruleRealLiteral1185);
+            pushFollow(FOLLOW_2);
             rule__RealLiteral__Group__0();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getRealLiteralAccess().getGroup()); 
             }
 
+             after(grammarAccess.getRealLiteralAccess().getGroup()); 
+
             }
 
 
@@ -1728,24 +1575,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleIntLiteral"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:599:1: entryRuleIntLiteral : ruleIntLiteral EOF ;
+    // InternalETPhys.g:598:1: entryRuleIntLiteral : ruleIntLiteral EOF ;
     public final void entryRuleIntLiteral() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:600:1: ( ruleIntLiteral EOF )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:601:1: ruleIntLiteral EOF
+            // InternalETPhys.g:599:1: ( ruleIntLiteral EOF )
+            // InternalETPhys.g:600:1: ruleIntLiteral EOF
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getIntLiteralRule()); 
-            }
-            pushFollow(FOLLOW_ruleIntLiteral_in_entryRuleIntLiteral1212);
+             before(grammarAccess.getIntLiteralRule()); 
+            pushFollow(FOLLOW_1);
             ruleIntLiteral();
 
             state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getIntLiteralRule()); 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIntLiteral1219); if (state.failed) return ;
+
+             after(grammarAccess.getIntLiteralRule()); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1762,36 +1605,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleIntLiteral"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:608:1: ruleIntLiteral : ( ( rule__IntLiteral__Group__0 ) ) ;
+    // InternalETPhys.g:607:1: ruleIntLiteral : ( ( rule__IntLiteral__Group__0 ) ) ;
     public final void ruleIntLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:612:2: ( ( ( rule__IntLiteral__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:613:1: ( ( rule__IntLiteral__Group__0 ) )
+            // InternalETPhys.g:611:2: ( ( ( rule__IntLiteral__Group__0 ) ) )
+            // InternalETPhys.g:612:1: ( ( rule__IntLiteral__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:613:1: ( ( rule__IntLiteral__Group__0 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:614:1: ( rule__IntLiteral__Group__0 )
+            // InternalETPhys.g:612:1: ( ( rule__IntLiteral__Group__0 ) )
+            // InternalETPhys.g:613:1: ( rule__IntLiteral__Group__0 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getIntLiteralAccess().getGroup()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:615:1: ( rule__IntLiteral__Group__0 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:615:2: rule__IntLiteral__Group__0
+             before(grammarAccess.getIntLiteralAccess().getGroup()); 
+            // InternalETPhys.g:614:1: ( rule__IntLiteral__Group__0 )
+            // InternalETPhys.g:614:2: rule__IntLiteral__Group__0
             {
-            pushFollow(FOLLOW_rule__IntLiteral__Group__0_in_ruleIntLiteral1245);
+            pushFollow(FOLLOW_2);
             rule__IntLiteral__Group__0();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getIntLiteralAccess().getGroup()); 
             }
 
+             after(grammarAccess.getIntLiteralAccess().getGroup()); 
+
             }
 
 
@@ -1813,24 +1652,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleStringLiteral"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:627:1: entryRuleStringLiteral : ruleStringLiteral EOF ;
+    // InternalETPhys.g:626:1: entryRuleStringLiteral : ruleStringLiteral EOF ;
     public final void entryRuleStringLiteral() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:628:1: ( ruleStringLiteral EOF )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:629:1: ruleStringLiteral EOF
+            // InternalETPhys.g:627:1: ( ruleStringLiteral EOF )
+            // InternalETPhys.g:628:1: ruleStringLiteral EOF
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getStringLiteralRule()); 
-            }
-            pushFollow(FOLLOW_ruleStringLiteral_in_entryRuleStringLiteral1272);
+             before(grammarAccess.getStringLiteralRule()); 
+            pushFollow(FOLLOW_1);
             ruleStringLiteral();
 
             state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getStringLiteralRule()); 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleStringLiteral1279); if (state.failed) return ;
+
+             after(grammarAccess.getStringLiteralRule()); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1847,36 +1682,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleStringLiteral"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:636:1: ruleStringLiteral : ( ( rule__StringLiteral__Group__0 ) ) ;
+    // InternalETPhys.g:635:1: ruleStringLiteral : ( ( rule__StringLiteral__Group__0 ) ) ;
     public final void ruleStringLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:640:2: ( ( ( rule__StringLiteral__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:641:1: ( ( rule__StringLiteral__Group__0 ) )
+            // InternalETPhys.g:639:2: ( ( ( rule__StringLiteral__Group__0 ) ) )
+            // InternalETPhys.g:640:1: ( ( rule__StringLiteral__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:641:1: ( ( rule__StringLiteral__Group__0 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:642:1: ( rule__StringLiteral__Group__0 )
+            // InternalETPhys.g:640:1: ( ( rule__StringLiteral__Group__0 ) )
+            // InternalETPhys.g:641:1: ( rule__StringLiteral__Group__0 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getStringLiteralAccess().getGroup()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:643:1: ( rule__StringLiteral__Group__0 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:643:2: rule__StringLiteral__Group__0
+             before(grammarAccess.getStringLiteralAccess().getGroup()); 
+            // InternalETPhys.g:642:1: ( rule__StringLiteral__Group__0 )
+            // InternalETPhys.g:642:2: rule__StringLiteral__Group__0
             {
-            pushFollow(FOLLOW_rule__StringLiteral__Group__0_in_ruleStringLiteral1305);
+            pushFollow(FOLLOW_2);
             rule__StringLiteral__Group__0();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getStringLiteralAccess().getGroup()); 
             }
 
+             after(grammarAccess.getStringLiteralAccess().getGroup()); 
+
             }
 
 
@@ -1898,24 +1729,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleInteger"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:655:1: entryRuleInteger : ruleInteger EOF ;
+    // InternalETPhys.g:654:1: entryRuleInteger : ruleInteger EOF ;
     public final void entryRuleInteger() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:656:1: ( ruleInteger EOF )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:657:1: ruleInteger EOF
+            // InternalETPhys.g:655:1: ( ruleInteger EOF )
+            // InternalETPhys.g:656:1: ruleInteger EOF
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getIntegerRule()); 
-            }
-            pushFollow(FOLLOW_ruleInteger_in_entryRuleInteger1332);
+             before(grammarAccess.getIntegerRule()); 
+            pushFollow(FOLLOW_1);
             ruleInteger();
 
             state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getIntegerRule()); 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleInteger1339); if (state.failed) return ;
+
+             after(grammarAccess.getIntegerRule()); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1932,36 +1759,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleInteger"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:664:1: ruleInteger : ( ( rule__Integer__Alternatives ) ) ;
+    // InternalETPhys.g:663:1: ruleInteger : ( ( rule__Integer__Alternatives ) ) ;
     public final void ruleInteger() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:668:2: ( ( ( rule__Integer__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:669:1: ( ( rule__Integer__Alternatives ) )
+            // InternalETPhys.g:667:2: ( ( ( rule__Integer__Alternatives ) ) )
+            // InternalETPhys.g:668:1: ( ( rule__Integer__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:669:1: ( ( rule__Integer__Alternatives ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:670:1: ( rule__Integer__Alternatives )
+            // InternalETPhys.g:668:1: ( ( rule__Integer__Alternatives ) )
+            // InternalETPhys.g:669:1: ( rule__Integer__Alternatives )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getIntegerAccess().getAlternatives()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:671:1: ( rule__Integer__Alternatives )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:671:2: rule__Integer__Alternatives
+             before(grammarAccess.getIntegerAccess().getAlternatives()); 
+            // InternalETPhys.g:670:1: ( rule__Integer__Alternatives )
+            // InternalETPhys.g:670:2: rule__Integer__Alternatives
             {
-            pushFollow(FOLLOW_rule__Integer__Alternatives_in_ruleInteger1365);
+            pushFollow(FOLLOW_2);
             rule__Integer__Alternatives();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getIntegerAccess().getAlternatives()); 
             }
 
+             after(grammarAccess.getIntegerAccess().getAlternatives()); 
+
             }
 
 
@@ -1983,24 +1806,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleReal"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:683:1: entryRuleReal : ruleReal EOF ;
+    // InternalETPhys.g:682:1: entryRuleReal : ruleReal EOF ;
     public final void entryRuleReal() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:684:1: ( ruleReal EOF )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:685:1: ruleReal EOF
+            // InternalETPhys.g:683:1: ( ruleReal EOF )
+            // InternalETPhys.g:684:1: ruleReal EOF
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getRealRule()); 
-            }
-            pushFollow(FOLLOW_ruleReal_in_entryRuleReal1392);
+             before(grammarAccess.getRealRule()); 
+            pushFollow(FOLLOW_1);
             ruleReal();
 
             state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getRealRule()); 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleReal1399); if (state.failed) return ;
+
+             after(grammarAccess.getRealRule()); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2017,36 +1836,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleReal"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:692:1: ruleReal : ( ( rule__Real__Alternatives ) ) ;
+    // InternalETPhys.g:691:1: ruleReal : ( ( rule__Real__Alternatives ) ) ;
     public final void ruleReal() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:696:2: ( ( ( rule__Real__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:697:1: ( ( rule__Real__Alternatives ) )
+            // InternalETPhys.g:695:2: ( ( ( rule__Real__Alternatives ) ) )
+            // InternalETPhys.g:696:1: ( ( rule__Real__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:697:1: ( ( rule__Real__Alternatives ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:698:1: ( rule__Real__Alternatives )
+            // InternalETPhys.g:696:1: ( ( rule__Real__Alternatives ) )
+            // InternalETPhys.g:697:1: ( rule__Real__Alternatives )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getRealAccess().getAlternatives()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:699:1: ( rule__Real__Alternatives )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:699:2: rule__Real__Alternatives
+             before(grammarAccess.getRealAccess().getAlternatives()); 
+            // InternalETPhys.g:698:1: ( rule__Real__Alternatives )
+            // InternalETPhys.g:698:2: rule__Real__Alternatives
             {
-            pushFollow(FOLLOW_rule__Real__Alternatives_in_ruleReal1425);
+            pushFollow(FOLLOW_2);
             rule__Real__Alternatives();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getRealAccess().getAlternatives()); 
             }
 
+             after(grammarAccess.getRealAccess().getAlternatives()); 
+
             }
 
 
@@ -2068,27 +1883,23 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleDecimal"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:711:1: entryRuleDecimal : ruleDecimal EOF ;
+    // InternalETPhys.g:710:1: entryRuleDecimal : ruleDecimal EOF ;
     public final void entryRuleDecimal() throws RecognitionException {
 
         	HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
 
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:715:1: ( ruleDecimal EOF )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:716:1: ruleDecimal EOF
+            // InternalETPhys.g:714:1: ( ruleDecimal EOF )
+            // InternalETPhys.g:715:1: ruleDecimal EOF
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getDecimalRule()); 
-            }
-            pushFollow(FOLLOW_ruleDecimal_in_entryRuleDecimal1457);
+             before(grammarAccess.getDecimalRule()); 
+            pushFollow(FOLLOW_1);
             ruleDecimal();
 
             state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getDecimalRule()); 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDecimal1464); if (state.failed) return ;
+
+             after(grammarAccess.getDecimalRule()); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2108,37 +1919,33 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleDecimal"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:726:1: ruleDecimal : ( ( rule__Decimal__Group__0 ) ) ;
+    // InternalETPhys.g:725:1: ruleDecimal : ( ( rule__Decimal__Group__0 ) ) ;
     public final void ruleDecimal() throws RecognitionException {
 
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:731:2: ( ( ( rule__Decimal__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:732:1: ( ( rule__Decimal__Group__0 ) )
+            // InternalETPhys.g:730:2: ( ( ( rule__Decimal__Group__0 ) ) )
+            // InternalETPhys.g:731:1: ( ( rule__Decimal__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:732:1: ( ( rule__Decimal__Group__0 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:733:1: ( rule__Decimal__Group__0 )
+            // InternalETPhys.g:731:1: ( ( rule__Decimal__Group__0 ) )
+            // InternalETPhys.g:732:1: ( rule__Decimal__Group__0 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getDecimalAccess().getGroup()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:734:1: ( rule__Decimal__Group__0 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:734:2: rule__Decimal__Group__0
+             before(grammarAccess.getDecimalAccess().getGroup()); 
+            // InternalETPhys.g:733:1: ( rule__Decimal__Group__0 )
+            // InternalETPhys.g:733:2: rule__Decimal__Group__0
             {
-            pushFollow(FOLLOW_rule__Decimal__Group__0_in_ruleDecimal1494);
+            pushFollow(FOLLOW_2);
             rule__Decimal__Group__0();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getDecimalAccess().getGroup()); 
             }
 
+             after(grammarAccess.getDecimalAccess().getGroup()); 
+
             }
 
 
@@ -2161,27 +1968,23 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleDecimalExp"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:747:1: entryRuleDecimalExp : ruleDecimalExp EOF ;
+    // InternalETPhys.g:746:1: entryRuleDecimalExp : ruleDecimalExp EOF ;
     public final void entryRuleDecimalExp() throws RecognitionException {
 
         	HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
 
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:751:1: ( ruleDecimalExp EOF )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:752:1: ruleDecimalExp EOF
+            // InternalETPhys.g:750:1: ( ruleDecimalExp EOF )
+            // InternalETPhys.g:751:1: ruleDecimalExp EOF
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getDecimalExpRule()); 
-            }
-            pushFollow(FOLLOW_ruleDecimalExp_in_entryRuleDecimalExp1526);
+             before(grammarAccess.getDecimalExpRule()); 
+            pushFollow(FOLLOW_1);
             ruleDecimalExp();
 
             state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getDecimalExpRule()); 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDecimalExp1533); if (state.failed) return ;
+
+             after(grammarAccess.getDecimalExpRule()); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2201,37 +2004,33 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleDecimalExp"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:762:1: ruleDecimalExp : ( ( rule__DecimalExp__Group__0 ) ) ;
+    // InternalETPhys.g:761:1: ruleDecimalExp : ( ( rule__DecimalExp__Group__0 ) ) ;
     public final void ruleDecimalExp() throws RecognitionException {
 
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:767:2: ( ( ( rule__DecimalExp__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:768:1: ( ( rule__DecimalExp__Group__0 ) )
+            // InternalETPhys.g:766:2: ( ( ( rule__DecimalExp__Group__0 ) ) )
+            // InternalETPhys.g:767:1: ( ( rule__DecimalExp__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:768:1: ( ( rule__DecimalExp__Group__0 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:769:1: ( rule__DecimalExp__Group__0 )
+            // InternalETPhys.g:767:1: ( ( rule__DecimalExp__Group__0 ) )
+            // InternalETPhys.g:768:1: ( rule__DecimalExp__Group__0 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getDecimalExpAccess().getGroup()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:770:1: ( rule__DecimalExp__Group__0 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:770:2: rule__DecimalExp__Group__0
+             before(grammarAccess.getDecimalExpAccess().getGroup()); 
+            // InternalETPhys.g:769:1: ( rule__DecimalExp__Group__0 )
+            // InternalETPhys.g:769:2: rule__DecimalExp__Group__0
             {
-            pushFollow(FOLLOW_rule__DecimalExp__Group__0_in_ruleDecimalExp1563);
+            pushFollow(FOLLOW_2);
             rule__DecimalExp__Group__0();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getDecimalExpAccess().getGroup()); 
             }
 
+             after(grammarAccess.getDecimalExpAccess().getGroup()); 
+
             }
 
 
@@ -2254,24 +2053,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleFQN"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:783:1: entryRuleFQN : ruleFQN EOF ;
+    // InternalETPhys.g:782:1: entryRuleFQN : ruleFQN EOF ;
     public final void entryRuleFQN() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:784:1: ( ruleFQN EOF )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:785:1: ruleFQN EOF
+            // InternalETPhys.g:783:1: ( ruleFQN EOF )
+            // InternalETPhys.g:784:1: ruleFQN EOF
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getFQNRule()); 
-            }
-            pushFollow(FOLLOW_ruleFQN_in_entryRuleFQN1590);
+             before(grammarAccess.getFQNRule()); 
+            pushFollow(FOLLOW_1);
             ruleFQN();
 
             state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getFQNRule()); 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleFQN1597); if (state.failed) return ;
+
+             after(grammarAccess.getFQNRule()); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2288,36 +2083,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleFQN"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:792:1: ruleFQN : ( ( rule__FQN__Group__0 ) ) ;
+    // InternalETPhys.g:791:1: ruleFQN : ( ( rule__FQN__Group__0 ) ) ;
     public final void ruleFQN() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:796:2: ( ( ( rule__FQN__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:797:1: ( ( rule__FQN__Group__0 ) )
+            // InternalETPhys.g:795:2: ( ( ( rule__FQN__Group__0 ) ) )
+            // InternalETPhys.g:796:1: ( ( rule__FQN__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:797:1: ( ( rule__FQN__Group__0 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:798:1: ( rule__FQN__Group__0 )
+            // InternalETPhys.g:796:1: ( ( rule__FQN__Group__0 ) )
+            // InternalETPhys.g:797:1: ( rule__FQN__Group__0 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getFQNAccess().getGroup()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:799:1: ( rule__FQN__Group__0 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:799:2: rule__FQN__Group__0
+             before(grammarAccess.getFQNAccess().getGroup()); 
+            // InternalETPhys.g:798:1: ( rule__FQN__Group__0 )
+            // InternalETPhys.g:798:2: rule__FQN__Group__0
             {
-            pushFollow(FOLLOW_rule__FQN__Group__0_in_ruleFQN1623);
+            pushFollow(FOLLOW_2);
             rule__FQN__Group__0();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getFQNAccess().getGroup()); 
             }
 
+             after(grammarAccess.getFQNAccess().getGroup()); 
+
             }
 
 
@@ -2339,36 +2130,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleExecMode"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:812:1: ruleExecMode : ( ( rule__ExecMode__Alternatives ) ) ;
+    // InternalETPhys.g:811:1: ruleExecMode : ( ( rule__ExecMode__Alternatives ) ) ;
     public final void ruleExecMode() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:816:1: ( ( ( rule__ExecMode__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:817:1: ( ( rule__ExecMode__Alternatives ) )
+            // InternalETPhys.g:815:1: ( ( ( rule__ExecMode__Alternatives ) ) )
+            // InternalETPhys.g:816:1: ( ( rule__ExecMode__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:817:1: ( ( rule__ExecMode__Alternatives ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:818:1: ( rule__ExecMode__Alternatives )
+            // InternalETPhys.g:816:1: ( ( rule__ExecMode__Alternatives ) )
+            // InternalETPhys.g:817:1: ( rule__ExecMode__Alternatives )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getExecModeAccess().getAlternatives()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:819:1: ( rule__ExecMode__Alternatives )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:819:2: rule__ExecMode__Alternatives
+             before(grammarAccess.getExecModeAccess().getAlternatives()); 
+            // InternalETPhys.g:818:1: ( rule__ExecMode__Alternatives )
+            // InternalETPhys.g:818:2: rule__ExecMode__Alternatives
             {
-            pushFollow(FOLLOW_rule__ExecMode__Alternatives_in_ruleExecMode1660);
+            pushFollow(FOLLOW_2);
             rule__ExecMode__Alternatives();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getExecModeAccess().getAlternatives()); 
             }
 
+             after(grammarAccess.getExecModeAccess().getAlternatives()); 
+
             }
 
 
@@ -2390,36 +2177,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleThreadModel"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:831:1: ruleThreadModel : ( ( rule__ThreadModel__Alternatives ) ) ;
+    // InternalETPhys.g:830:1: ruleThreadModel : ( ( rule__ThreadModel__Alternatives ) ) ;
     public final void ruleThreadModel() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:835:1: ( ( ( rule__ThreadModel__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:836:1: ( ( rule__ThreadModel__Alternatives ) )
+            // InternalETPhys.g:834:1: ( ( ( rule__ThreadModel__Alternatives ) ) )
+            // InternalETPhys.g:835:1: ( ( rule__ThreadModel__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:836:1: ( ( rule__ThreadModel__Alternatives ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:837:1: ( rule__ThreadModel__Alternatives )
+            // InternalETPhys.g:835:1: ( ( rule__ThreadModel__Alternatives ) )
+            // InternalETPhys.g:836:1: ( rule__ThreadModel__Alternatives )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getThreadModelAccess().getAlternatives()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:838:1: ( rule__ThreadModel__Alternatives )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:838:2: rule__ThreadModel__Alternatives
+             before(grammarAccess.getThreadModelAccess().getAlternatives()); 
+            // InternalETPhys.g:837:1: ( rule__ThreadModel__Alternatives )
+            // InternalETPhys.g:837:2: rule__ThreadModel__Alternatives
             {
-            pushFollow(FOLLOW_rule__ThreadModel__Alternatives_in_ruleThreadModel1696);
+            pushFollow(FOLLOW_2);
             rule__ThreadModel__Alternatives();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getThreadModelAccess().getAlternatives()); 
             }
 
+             after(grammarAccess.getThreadModelAccess().getAlternatives()); 
+
             }
 
 
@@ -2441,36 +2224,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleLiteralType"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:850:1: ruleLiteralType : ( ( rule__LiteralType__Alternatives ) ) ;
+    // InternalETPhys.g:849:1: ruleLiteralType : ( ( rule__LiteralType__Alternatives ) ) ;
     public final void ruleLiteralType() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:854:1: ( ( ( rule__LiteralType__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:855:1: ( ( rule__LiteralType__Alternatives ) )
+            // InternalETPhys.g:853:1: ( ( ( rule__LiteralType__Alternatives ) ) )
+            // InternalETPhys.g:854:1: ( ( rule__LiteralType__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:855:1: ( ( rule__LiteralType__Alternatives ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:856:1: ( rule__LiteralType__Alternatives )
+            // InternalETPhys.g:854:1: ( ( rule__LiteralType__Alternatives ) )
+            // InternalETPhys.g:855:1: ( rule__LiteralType__Alternatives )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getLiteralTypeAccess().getAlternatives()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:857:1: ( rule__LiteralType__Alternatives )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:857:2: rule__LiteralType__Alternatives
+             before(grammarAccess.getLiteralTypeAccess().getAlternatives()); 
+            // InternalETPhys.g:856:1: ( rule__LiteralType__Alternatives )
+            // InternalETPhys.g:856:2: rule__LiteralType__Alternatives
             {
-            pushFollow(FOLLOW_rule__LiteralType__Alternatives_in_ruleLiteralType1732);
+            pushFollow(FOLLOW_2);
             rule__LiteralType__Alternatives();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getLiteralTypeAccess().getAlternatives()); 
             }
 
+             after(grammarAccess.getLiteralTypeAccess().getAlternatives()); 
+
             }
 
 
@@ -2492,13 +2271,13 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalModel__Alternatives_4"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:868:1: rule__PhysicalModel__Alternatives_4 : ( ( ( rule__PhysicalModel__SystemsAssignment_4_0 ) ) | ( ( rule__PhysicalModel__NodeClassesAssignment_4_1 ) ) | ( ( rule__PhysicalModel__RuntimeClassesAssignment_4_2 ) ) );
+    // InternalETPhys.g:867:1: rule__PhysicalModel__Alternatives_4 : ( ( ( rule__PhysicalModel__SystemsAssignment_4_0 ) ) | ( ( rule__PhysicalModel__NodeClassesAssignment_4_1 ) ) | ( ( rule__PhysicalModel__RuntimeClassesAssignment_4_2 ) ) );
     public final void rule__PhysicalModel__Alternatives_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:872:1: ( ( ( rule__PhysicalModel__SystemsAssignment_4_0 ) ) | ( ( rule__PhysicalModel__NodeClassesAssignment_4_1 ) ) | ( ( rule__PhysicalModel__RuntimeClassesAssignment_4_2 ) ) )
+            // InternalETPhys.g:871:1: ( ( ( rule__PhysicalModel__SystemsAssignment_4_0 ) ) | ( ( rule__PhysicalModel__NodeClassesAssignment_4_1 ) ) | ( ( rule__PhysicalModel__RuntimeClassesAssignment_4_2 ) ) )
             int alt1=3;
             switch ( input.LA(1) ) {
             case 32:
@@ -2517,7 +2296,6 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                 }
                 break;
             default:
-                if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
                     new NoViableAltException("", 1, 0, input);
 
@@ -2526,87 +2304,75 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
             switch (alt1) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:873:1: ( ( rule__PhysicalModel__SystemsAssignment_4_0 ) )
+                    // InternalETPhys.g:872:1: ( ( rule__PhysicalModel__SystemsAssignment_4_0 ) )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:873:1: ( ( rule__PhysicalModel__SystemsAssignment_4_0 ) )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:874:1: ( rule__PhysicalModel__SystemsAssignment_4_0 )
+                    // InternalETPhys.g:872:1: ( ( rule__PhysicalModel__SystemsAssignment_4_0 ) )
+                    // InternalETPhys.g:873:1: ( rule__PhysicalModel__SystemsAssignment_4_0 )
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getPhysicalModelAccess().getSystemsAssignment_4_0()); 
-                    }
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:875:1: ( rule__PhysicalModel__SystemsAssignment_4_0 )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:875:2: rule__PhysicalModel__SystemsAssignment_4_0
+                     before(grammarAccess.getPhysicalModelAccess().getSystemsAssignment_4_0()); 
+                    // InternalETPhys.g:874:1: ( rule__PhysicalModel__SystemsAssignment_4_0 )
+                    // InternalETPhys.g:874:2: rule__PhysicalModel__SystemsAssignment_4_0
                     {
-                    pushFollow(FOLLOW_rule__PhysicalModel__SystemsAssignment_4_0_in_rule__PhysicalModel__Alternatives_41767);
+                    pushFollow(FOLLOW_2);
                     rule__PhysicalModel__SystemsAssignment_4_0();
 
                     state._fsp--;
-                    if (state.failed) return ;
 
-                    }
 
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getPhysicalModelAccess().getSystemsAssignment_4_0()); 
                     }
 
+                     after(grammarAccess.getPhysicalModelAccess().getSystemsAssignment_4_0()); 
+
                     }
 
 
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:879:6: ( ( rule__PhysicalModel__NodeClassesAssignment_4_1 ) )
+                    // InternalETPhys.g:878:6: ( ( rule__PhysicalModel__NodeClassesAssignment_4_1 ) )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:879:6: ( ( rule__PhysicalModel__NodeClassesAssignment_4_1 ) )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:880:1: ( rule__PhysicalModel__NodeClassesAssignment_4_1 )
+                    // InternalETPhys.g:878:6: ( ( rule__PhysicalModel__NodeClassesAssignment_4_1 ) )
+                    // InternalETPhys.g:879:1: ( rule__PhysicalModel__NodeClassesAssignment_4_1 )
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getPhysicalModelAccess().getNodeClassesAssignment_4_1()); 
-                    }
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:881:1: ( rule__PhysicalModel__NodeClassesAssignment_4_1 )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:881:2: rule__PhysicalModel__NodeClassesAssignment_4_1
+                     before(grammarAccess.getPhysicalModelAccess().getNodeClassesAssignment_4_1()); 
+                    // InternalETPhys.g:880:1: ( rule__PhysicalModel__NodeClassesAssignment_4_1 )
+                    // InternalETPhys.g:880:2: rule__PhysicalModel__NodeClassesAssignment_4_1
                     {
-                    pushFollow(FOLLOW_rule__PhysicalModel__NodeClassesAssignment_4_1_in_rule__PhysicalModel__Alternatives_41785);
+                    pushFollow(FOLLOW_2);
                     rule__PhysicalModel__NodeClassesAssignment_4_1();
 
                     state._fsp--;
-                    if (state.failed) return ;
 
-                    }
 
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getPhysicalModelAccess().getNodeClassesAssignment_4_1()); 
                     }
 
+                     after(grammarAccess.getPhysicalModelAccess().getNodeClassesAssignment_4_1()); 
+
                     }
 
 
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:885:6: ( ( rule__PhysicalModel__RuntimeClassesAssignment_4_2 ) )
+                    // InternalETPhys.g:884:6: ( ( rule__PhysicalModel__RuntimeClassesAssignment_4_2 ) )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:885:6: ( ( rule__PhysicalModel__RuntimeClassesAssignment_4_2 ) )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:886:1: ( rule__PhysicalModel__RuntimeClassesAssignment_4_2 )
+                    // InternalETPhys.g:884:6: ( ( rule__PhysicalModel__RuntimeClassesAssignment_4_2 ) )
+                    // InternalETPhys.g:885:1: ( rule__PhysicalModel__RuntimeClassesAssignment_4_2 )
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getPhysicalModelAccess().getRuntimeClassesAssignment_4_2()); 
-                    }
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:887:1: ( rule__PhysicalModel__RuntimeClassesAssignment_4_2 )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:887:2: rule__PhysicalModel__RuntimeClassesAssignment_4_2
+                     before(grammarAccess.getPhysicalModelAccess().getRuntimeClassesAssignment_4_2()); 
+                    // InternalETPhys.g:886:1: ( rule__PhysicalModel__RuntimeClassesAssignment_4_2 )
+                    // InternalETPhys.g:886:2: rule__PhysicalModel__RuntimeClassesAssignment_4_2
                     {
-                    pushFollow(FOLLOW_rule__PhysicalModel__RuntimeClassesAssignment_4_2_in_rule__PhysicalModel__Alternatives_41803);
+                    pushFollow(FOLLOW_2);
                     rule__PhysicalModel__RuntimeClassesAssignment_4_2();
 
                     state._fsp--;
-                    if (state.failed) return ;
 
-                    }
 
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getPhysicalModelAccess().getRuntimeClassesAssignment_4_2()); 
                     }
 
+                     after(grammarAccess.getPhysicalModelAccess().getRuntimeClassesAssignment_4_2()); 
+
                     }
 
 
@@ -2630,13 +2396,13 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__Alternatives_0"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:896:1: rule__PhysicalThread__Alternatives_0 : ( ( ( rule__PhysicalThread__DefaultAssignment_0_0 ) ) | ( 'Thread' ) );
+    // InternalETPhys.g:895:1: rule__PhysicalThread__Alternatives_0 : ( ( ( rule__PhysicalThread__DefaultAssignment_0_0 ) ) | ( 'Thread' ) );
     public final void rule__PhysicalThread__Alternatives_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:900:1: ( ( ( rule__PhysicalThread__DefaultAssignment_0_0 ) ) | ( 'Thread' ) )
+            // InternalETPhys.g:899:1: ( ( ( rule__PhysicalThread__DefaultAssignment_0_0 ) ) | ( 'Thread' ) )
             int alt2=2;
             int LA2_0 = input.LA(1);
 
@@ -2647,7 +2413,6 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                 alt2=2;
             }
             else {
-                if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
                     new NoViableAltException("", 2, 0, input);
 
@@ -2655,47 +2420,39 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
             }
             switch (alt2) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:901:1: ( ( rule__PhysicalThread__DefaultAssignment_0_0 ) )
+                    // InternalETPhys.g:900:1: ( ( rule__PhysicalThread__DefaultAssignment_0_0 ) )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:901:1: ( ( rule__PhysicalThread__DefaultAssignment_0_0 ) )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:902:1: ( rule__PhysicalThread__DefaultAssignment_0_0 )
+                    // InternalETPhys.g:900:1: ( ( rule__PhysicalThread__DefaultAssignment_0_0 ) )
+                    // InternalETPhys.g:901:1: ( rule__PhysicalThread__DefaultAssignment_0_0 )
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getPhysicalThreadAccess().getDefaultAssignment_0_0()); 
-                    }
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:903:1: ( rule__PhysicalThread__DefaultAssignment_0_0 )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:903:2: rule__PhysicalThread__DefaultAssignment_0_0
+                     before(grammarAccess.getPhysicalThreadAccess().getDefaultAssignment_0_0()); 
+                    // InternalETPhys.g:902:1: ( rule__PhysicalThread__DefaultAssignment_0_0 )
+                    // InternalETPhys.g:902:2: rule__PhysicalThread__DefaultAssignment_0_0
                     {
-                    pushFollow(FOLLOW_rule__PhysicalThread__DefaultAssignment_0_0_in_rule__PhysicalThread__Alternatives_01836);
+                    pushFollow(FOLLOW_2);
                     rule__PhysicalThread__DefaultAssignment_0_0();
 
                     state._fsp--;
-                    if (state.failed) return ;
 
-                    }
 
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getPhysicalThreadAccess().getDefaultAssignment_0_0()); 
                     }
 
+                     after(grammarAccess.getPhysicalThreadAccess().getDefaultAssignment_0_0()); 
+
                     }
 
 
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:907:6: ( 'Thread' )
+                    // InternalETPhys.g:906:6: ( 'Thread' )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:907:6: ( 'Thread' )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:908:1: 'Thread'
+                    // InternalETPhys.g:906:6: ( 'Thread' )
+                    // InternalETPhys.g:907:1: 'Thread'
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getPhysicalThreadAccess().getThreadKeyword_0_1()); 
-                    }
-                    match(input,12,FOLLOW_12_in_rule__PhysicalThread__Alternatives_01855); if (state.failed) return ;
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getPhysicalThreadAccess().getThreadKeyword_0_1()); 
-                    }
+                     before(grammarAccess.getPhysicalThreadAccess().getThreadKeyword_0_1()); 
+                    match(input,12,FOLLOW_2); 
+                     after(grammarAccess.getPhysicalThreadAccess().getThreadKeyword_0_1()); 
 
                     }
 
@@ -2720,13 +2477,13 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AnnotationAttribute__Alternatives"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:921:1: rule__AnnotationAttribute__Alternatives : ( ( ruleSimpleAnnotationAttribute ) | ( ruleEnumAnnotationAttribute ) );
+    // InternalETPhys.g:920:1: rule__AnnotationAttribute__Alternatives : ( ( ruleSimpleAnnotationAttribute ) | ( ruleEnumAnnotationAttribute ) );
     public final void rule__AnnotationAttribute__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:925:1: ( ( ruleSimpleAnnotationAttribute ) | ( ruleEnumAnnotationAttribute ) )
+            // InternalETPhys.g:924:1: ( ( ruleSimpleAnnotationAttribute ) | ( ruleEnumAnnotationAttribute ) )
             int alt3=2;
             int LA3_0 = input.LA(1);
 
@@ -2742,14 +2499,13 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                         if ( (LA3_4==34) ) {
                             int LA3_5 = input.LA(5);
 
-                            if ( (LA3_5==30) ) {
-                                alt3=2;
-                            }
-                            else if ( ((LA3_5>=25 && LA3_5<=28)) ) {
+                            if ( ((LA3_5>=25 && LA3_5<=28)) ) {
                                 alt3=1;
                             }
+                            else if ( (LA3_5==30) ) {
+                                alt3=2;
+                            }
                             else {
-                                if (state.backtracking>0) {state.failed=true; return ;}
                                 NoViableAltException nvae =
                                     new NoViableAltException("", 3, 5, input);
 
@@ -2757,7 +2513,6 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                             }
                         }
                         else {
-                            if (state.backtracking>0) {state.failed=true; return ;}
                             NoViableAltException nvae =
                                 new NoViableAltException("", 3, 4, input);
 
@@ -2765,7 +2520,6 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                         }
                     }
                     else {
-                        if (state.backtracking>0) {state.failed=true; return ;}
                         NoViableAltException nvae =
                             new NoViableAltException("", 3, 3, input);
 
@@ -2773,7 +2527,6 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                     }
                 }
                 else {
-                    if (state.backtracking>0) {state.failed=true; return ;}
                     NoViableAltException nvae =
                         new NoViableAltException("", 3, 1, input);
 
@@ -2792,14 +2545,13 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                         if ( (LA3_4==34) ) {
                             int LA3_5 = input.LA(5);
 
-                            if ( (LA3_5==30) ) {
-                                alt3=2;
-                            }
-                            else if ( ((LA3_5>=25 && LA3_5<=28)) ) {
+                            if ( ((LA3_5>=25 && LA3_5<=28)) ) {
                                 alt3=1;
                             }
+                            else if ( (LA3_5==30) ) {
+                                alt3=2;
+                            }
                             else {
-                                if (state.backtracking>0) {state.failed=true; return ;}
                                 NoViableAltException nvae =
                                     new NoViableAltException("", 3, 5, input);
 
@@ -2807,7 +2559,6 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                             }
                         }
                         else {
-                            if (state.backtracking>0) {state.failed=true; return ;}
                             NoViableAltException nvae =
                                 new NoViableAltException("", 3, 4, input);
 
@@ -2815,7 +2566,6 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                         }
                     }
                     else {
-                        if (state.backtracking>0) {state.failed=true; return ;}
                         NoViableAltException nvae =
                             new NoViableAltException("", 3, 3, input);
 
@@ -2823,7 +2573,6 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                     }
                 }
                 else {
-                    if (state.backtracking>0) {state.failed=true; return ;}
                     NoViableAltException nvae =
                         new NoViableAltException("", 3, 2, input);
 
@@ -2831,7 +2580,6 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                 }
             }
             else {
-                if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
                     new NoViableAltException("", 3, 0, input);
 
@@ -2839,22 +2587,18 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
             }
             switch (alt3) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:926:1: ( ruleSimpleAnnotationAttribute )
+                    // InternalETPhys.g:925:1: ( ruleSimpleAnnotationAttribute )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:926:1: ( ruleSimpleAnnotationAttribute )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:927:1: ruleSimpleAnnotationAttribute
+                    // InternalETPhys.g:925:1: ( ruleSimpleAnnotationAttribute )
+                    // InternalETPhys.g:926:1: ruleSimpleAnnotationAttribute
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getAnnotationAttributeAccess().getSimpleAnnotationAttributeParserRuleCall_0()); 
-                    }
-                    pushFollow(FOLLOW_ruleSimpleAnnotationAttribute_in_rule__AnnotationAttribute__Alternatives1890);
+                     before(grammarAccess.getAnnotationAttributeAccess().getSimpleAnnotationAttributeParserRuleCall_0()); 
+                    pushFollow(FOLLOW_2);
                     ruleSimpleAnnotationAttribute();
 
                     state._fsp--;
-                    if (state.failed) return ;
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getAnnotationAttributeAccess().getSimpleAnnotationAttributeParserRuleCall_0()); 
-                    }
+
+                     after(grammarAccess.getAnnotationAttributeAccess().getSimpleAnnotationAttributeParserRuleCall_0()); 
 
                     }
 
@@ -2862,22 +2606,18 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:932:6: ( ruleEnumAnnotationAttribute )
+                    // InternalETPhys.g:931:6: ( ruleEnumAnnotationAttribute )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:932:6: ( ruleEnumAnnotationAttribute )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:933:1: ruleEnumAnnotationAttribute
+                    // InternalETPhys.g:931:6: ( ruleEnumAnnotationAttribute )
+                    // InternalETPhys.g:932:1: ruleEnumAnnotationAttribute
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getAnnotationAttributeAccess().getEnumAnnotationAttributeParserRuleCall_1()); 
-                    }
-                    pushFollow(FOLLOW_ruleEnumAnnotationAttribute_in_rule__AnnotationAttribute__Alternatives1907);
+                     before(grammarAccess.getAnnotationAttributeAccess().getEnumAnnotationAttributeParserRuleCall_1()); 
+                    pushFollow(FOLLOW_2);
                     ruleEnumAnnotationAttribute();
 
                     state._fsp--;
-                    if (state.failed) return ;
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getAnnotationAttributeAccess().getEnumAnnotationAttributeParserRuleCall_1()); 
-                    }
+
+                     after(grammarAccess.getAnnotationAttributeAccess().getEnumAnnotationAttributeParserRuleCall_1()); 
 
                     }
 
@@ -2902,13 +2642,13 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Alternatives_0"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:943:1: rule__SimpleAnnotationAttribute__Alternatives_0 : ( ( ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 ) ) | ( 'mandatory' ) );
+    // InternalETPhys.g:942:1: rule__SimpleAnnotationAttribute__Alternatives_0 : ( ( ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 ) ) | ( 'mandatory' ) );
     public final void rule__SimpleAnnotationAttribute__Alternatives_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:947:1: ( ( ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 ) ) | ( 'mandatory' ) )
+            // InternalETPhys.g:946:1: ( ( ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 ) ) | ( 'mandatory' ) )
             int alt4=2;
             int LA4_0 = input.LA(1);
 
@@ -2919,7 +2659,6 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                 alt4=2;
             }
             else {
-                if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
                     new NoViableAltException("", 4, 0, input);
 
@@ -2927,47 +2666,39 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
             }
             switch (alt4) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:948:1: ( ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 ) )
+                    // InternalETPhys.g:947:1: ( ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 ) )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:948:1: ( ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 ) )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:949:1: ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 )
+                    // InternalETPhys.g:947:1: ( ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 ) )
+                    // InternalETPhys.g:948:1: ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 )
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getSimpleAnnotationAttributeAccess().getOptionalAssignment_0_0()); 
-                    }
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:950:1: ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:950:2: rule__SimpleAnnotationAttribute__OptionalAssignment_0_0
+                     before(grammarAccess.getSimpleAnnotationAttributeAccess().getOptionalAssignment_0_0()); 
+                    // InternalETPhys.g:949:1: ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 )
+                    // InternalETPhys.g:949:2: rule__SimpleAnnotationAttribute__OptionalAssignment_0_0
                     {
-                    pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__OptionalAssignment_0_0_in_rule__SimpleAnnotationAttribute__Alternatives_01939);
+                    pushFollow(FOLLOW_2);
                     rule__SimpleAnnotationAttribute__OptionalAssignment_0_0();
 
                     state._fsp--;
-                    if (state.failed) return ;
 
-                    }
 
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getSimpleAnnotationAttributeAccess().getOptionalAssignment_0_0()); 
                     }
 
+                     after(grammarAccess.getSimpleAnnotationAttributeAccess().getOptionalAssignment_0_0()); 
+
                     }
 
 
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:954:6: ( 'mandatory' )
+                    // InternalETPhys.g:953:6: ( 'mandatory' )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:954:6: ( 'mandatory' )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:955:1: 'mandatory'
+                    // InternalETPhys.g:953:6: ( 'mandatory' )
+                    // InternalETPhys.g:954:1: 'mandatory'
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getSimpleAnnotationAttributeAccess().getMandatoryKeyword_0_1()); 
-                    }
-                    match(input,13,FOLLOW_13_in_rule__SimpleAnnotationAttribute__Alternatives_01958); if (state.failed) return ;
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getSimpleAnnotationAttributeAccess().getMandatoryKeyword_0_1()); 
-                    }
+                     before(grammarAccess.getSimpleAnnotationAttributeAccess().getMandatoryKeyword_0_1()); 
+                    match(input,13,FOLLOW_2); 
+                     after(grammarAccess.getSimpleAnnotationAttributeAccess().getMandatoryKeyword_0_1()); 
 
                     }
 
@@ -2992,13 +2723,13 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Alternatives_0"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:967:1: rule__EnumAnnotationAttribute__Alternatives_0 : ( ( ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 ) ) | ( 'mandatory' ) );
+    // InternalETPhys.g:966:1: rule__EnumAnnotationAttribute__Alternatives_0 : ( ( ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 ) ) | ( 'mandatory' ) );
     public final void rule__EnumAnnotationAttribute__Alternatives_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:971:1: ( ( ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 ) ) | ( 'mandatory' ) )
+            // InternalETPhys.g:970:1: ( ( ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 ) ) | ( 'mandatory' ) )
             int alt5=2;
             int LA5_0 = input.LA(1);
 
@@ -3009,7 +2740,6 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                 alt5=2;
             }
             else {
-                if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
                     new NoViableAltException("", 5, 0, input);
 
@@ -3017,47 +2747,39 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
             }
             switch (alt5) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:972:1: ( ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 ) )
+                    // InternalETPhys.g:971:1: ( ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 ) )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:972:1: ( ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 ) )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:973:1: ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 )
+                    // InternalETPhys.g:971:1: ( ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 ) )
+                    // InternalETPhys.g:972:1: ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 )
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getEnumAnnotationAttributeAccess().getOptionalAssignment_0_0()); 
-                    }
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:974:1: ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:974:2: rule__EnumAnnotationAttribute__OptionalAssignment_0_0
+                     before(grammarAccess.getEnumAnnotationAttributeAccess().getOptionalAssignment_0_0()); 
+                    // InternalETPhys.g:973:1: ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 )
+                    // InternalETPhys.g:973:2: rule__EnumAnnotationAttribute__OptionalAssignment_0_0
                     {
-                    pushFollow(FOLLOW_rule__EnumAnnotationAttribute__OptionalAssignment_0_0_in_rule__EnumAnnotationAttribute__Alternatives_01992);
+                    pushFollow(FOLLOW_2);
                     rule__EnumAnnotationAttribute__OptionalAssignment_0_0();
 
                     state._fsp--;
-                    if (state.failed) return ;
 
-                    }
 
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getEnumAnnotationAttributeAccess().getOptionalAssignment_0_0()); 
                     }
 
+                     after(grammarAccess.getEnumAnnotationAttributeAccess().getOptionalAssignment_0_0()); 
+
                     }
 
 
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:978:6: ( 'mandatory' )
+                    // InternalETPhys.g:977:6: ( 'mandatory' )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:978:6: ( 'mandatory' )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:979:1: 'mandatory'
+                    // InternalETPhys.g:977:6: ( 'mandatory' )
+                    // InternalETPhys.g:978:1: 'mandatory'
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getEnumAnnotationAttributeAccess().getMandatoryKeyword_0_1()); 
-                    }
-                    match(input,13,FOLLOW_13_in_rule__EnumAnnotationAttribute__Alternatives_02011); if (state.failed) return ;
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getEnumAnnotationAttributeAccess().getMandatoryKeyword_0_1()); 
-                    }
+                     before(grammarAccess.getEnumAnnotationAttributeAccess().getMandatoryKeyword_0_1()); 
+                    match(input,13,FOLLOW_2); 
+                     after(grammarAccess.getEnumAnnotationAttributeAccess().getMandatoryKeyword_0_1()); 
 
                     }
 
@@ -3082,13 +2804,13 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Import__Alternatives_1"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:991:1: rule__Import__Alternatives_1 : ( ( ( rule__Import__Group_1_0__0 ) ) | ( 'model' ) );
+    // InternalETPhys.g:990:1: rule__Import__Alternatives_1 : ( ( ( rule__Import__Group_1_0__0 ) ) | ( 'model' ) );
     public final void rule__Import__Alternatives_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:995:1: ( ( ( rule__Import__Group_1_0__0 ) ) | ( 'model' ) )
+            // InternalETPhys.g:994:1: ( ( ( rule__Import__Group_1_0__0 ) ) | ( 'model' ) )
             int alt6=2;
             int LA6_0 = input.LA(1);
 
@@ -3099,7 +2821,6 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                 alt6=2;
             }
             else {
-                if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
                     new NoViableAltException("", 6, 0, input);
 
@@ -3107,47 +2828,39 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
             }
             switch (alt6) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:996:1: ( ( rule__Import__Group_1_0__0 ) )
+                    // InternalETPhys.g:995:1: ( ( rule__Import__Group_1_0__0 ) )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:996:1: ( ( rule__Import__Group_1_0__0 ) )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:997:1: ( rule__Import__Group_1_0__0 )
+                    // InternalETPhys.g:995:1: ( ( rule__Import__Group_1_0__0 ) )
+                    // InternalETPhys.g:996:1: ( rule__Import__Group_1_0__0 )
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getImportAccess().getGroup_1_0()); 
-                    }
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:998:1: ( rule__Import__Group_1_0__0 )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:998:2: rule__Import__Group_1_0__0
+                     before(grammarAccess.getImportAccess().getGroup_1_0()); 
+                    // InternalETPhys.g:997:1: ( rule__Import__Group_1_0__0 )
+                    // InternalETPhys.g:997:2: rule__Import__Group_1_0__0
                     {
-                    pushFollow(FOLLOW_rule__Import__Group_1_0__0_in_rule__Import__Alternatives_12045);
+                    pushFollow(FOLLOW_2);
                     rule__Import__Group_1_0__0();
 
                     state._fsp--;
-                    if (state.failed) return ;
 
-                    }
 
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getImportAccess().getGroup_1_0()); 
                     }
 
+                     after(grammarAccess.getImportAccess().getGroup_1_0()); 
+
                     }
 
 
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1002:6: ( 'model' )
+                    // InternalETPhys.g:1001:6: ( 'model' )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1002:6: ( 'model' )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1003:1: 'model'
+                    // InternalETPhys.g:1001:6: ( 'model' )
+                    // InternalETPhys.g:1002:1: 'model'
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getImportAccess().getModelKeyword_1_1()); 
-                    }
-                    match(input,14,FOLLOW_14_in_rule__Import__Alternatives_12064); if (state.failed) return ;
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getImportAccess().getModelKeyword_1_1()); 
-                    }
+                     before(grammarAccess.getImportAccess().getModelKeyword_1_1()); 
+                    match(input,14,FOLLOW_2); 
+                     after(grammarAccess.getImportAccess().getModelKeyword_1_1()); 
 
                     }
 
@@ -3172,13 +2885,13 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TIME__Alternatives"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1015:1: rule__TIME__Alternatives : ( ( ( rule__TIME__Group_0__0 ) ) | ( ( rule__TIME__Group_1__0 ) ) | ( ( rule__TIME__Group_2__0 ) ) | ( ( rule__TIME__Group_3__0 ) ) );
+    // InternalETPhys.g:1014:1: rule__TIME__Alternatives : ( ( ( rule__TIME__Group_0__0 ) ) | ( ( rule__TIME__Group_1__0 ) ) | ( ( rule__TIME__Group_2__0 ) ) | ( ( rule__TIME__Group_3__0 ) ) );
     public final void rule__TIME__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1019:1: ( ( ( rule__TIME__Group_0__0 ) ) | ( ( rule__TIME__Group_1__0 ) ) | ( ( rule__TIME__Group_2__0 ) ) | ( ( rule__TIME__Group_3__0 ) ) )
+            // InternalETPhys.g:1018:1: ( ( ( rule__TIME__Group_0__0 ) ) | ( ( rule__TIME__Group_1__0 ) ) | ( ( rule__TIME__Group_2__0 ) ) | ( ( rule__TIME__Group_3__0 ) ) )
             int alt7=4;
             int LA7_0 = input.LA(1);
 
@@ -3205,7 +2918,6 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 default:
-                    if (state.backtracking>0) {state.failed=true; return ;}
                     NoViableAltException nvae =
                         new NoViableAltException("", 7, 1, input);
 
@@ -3214,7 +2926,6 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
             }
             else {
-                if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
                     new NoViableAltException("", 7, 0, input);
 
@@ -3222,116 +2933,100 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
             }
             switch (alt7) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1020:1: ( ( rule__TIME__Group_0__0 ) )
+                    // InternalETPhys.g:1019:1: ( ( rule__TIME__Group_0__0 ) )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1020:1: ( ( rule__TIME__Group_0__0 ) )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1021:1: ( rule__TIME__Group_0__0 )
+                    // InternalETPhys.g:1019:1: ( ( rule__TIME__Group_0__0 ) )
+                    // InternalETPhys.g:1020:1: ( rule__TIME__Group_0__0 )
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getTIMEAccess().getGroup_0()); 
-                    }
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1022:1: ( rule__TIME__Group_0__0 )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1022:2: rule__TIME__Group_0__0
+                     before(grammarAccess.getTIMEAccess().getGroup_0()); 
+                    // InternalETPhys.g:1021:1: ( rule__TIME__Group_0__0 )
+                    // InternalETPhys.g:1021:2: rule__TIME__Group_0__0
                     {
-                    pushFollow(FOLLOW_rule__TIME__Group_0__0_in_rule__TIME__Alternatives2098);
+                    pushFollow(FOLLOW_2);
                     rule__TIME__Group_0__0();
 
                     state._fsp--;
-                    if (state.failed) return ;
 
-                    }
 
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getTIMEAccess().getGroup_0()); 
                     }
 
+                     after(grammarAccess.getTIMEAccess().getGroup_0()); 
+
                     }
 
 
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1026:6: ( ( rule__TIME__Group_1__0 ) )
+                    // InternalETPhys.g:1025:6: ( ( rule__TIME__Group_1__0 ) )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1026:6: ( ( rule__TIME__Group_1__0 ) )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1027:1: ( rule__TIME__Group_1__0 )
+                    // InternalETPhys.g:1025:6: ( ( rule__TIME__Group_1__0 ) )
+                    // InternalETPhys.g:1026:1: ( rule__TIME__Group_1__0 )
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getTIMEAccess().getGroup_1()); 
-                    }
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1028:1: ( rule__TIME__Group_1__0 )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1028:2: rule__TIME__Group_1__0
+                     before(grammarAccess.getTIMEAccess().getGroup_1()); 
+                    // InternalETPhys.g:1027:1: ( rule__TIME__Group_1__0 )
+                    // InternalETPhys.g:1027:2: rule__TIME__Group_1__0
                     {
-                    pushFollow(FOLLOW_rule__TIME__Group_1__0_in_rule__TIME__Alternatives2116);
+                    pushFollow(FOLLOW_2);
                     rule__TIME__Group_1__0();
 
                     state._fsp--;
-                    if (state.failed) return ;
 
-                    }
 
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getTIMEAccess().getGroup_1()); 
                     }
 
+                     after(grammarAccess.getTIMEAccess().getGroup_1()); 
+
                     }
 
 
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1032:6: ( ( rule__TIME__Group_2__0 ) )
+                    // InternalETPhys.g:1031:6: ( ( rule__TIME__Group_2__0 ) )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1032:6: ( ( rule__TIME__Group_2__0 ) )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1033:1: ( rule__TIME__Group_2__0 )
+                    // InternalETPhys.g:1031:6: ( ( rule__TIME__Group_2__0 ) )
+                    // InternalETPhys.g:1032:1: ( rule__TIME__Group_2__0 )
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getTIMEAccess().getGroup_2()); 
-                    }
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1034:1: ( rule__TIME__Group_2__0 )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1034:2: rule__TIME__Group_2__0
+                     before(grammarAccess.getTIMEAccess().getGroup_2()); 
+                    // InternalETPhys.g:1033:1: ( rule__TIME__Group_2__0 )
+                    // InternalETPhys.g:1033:2: rule__TIME__Group_2__0
                     {
-                    pushFollow(FOLLOW_rule__TIME__Group_2__0_in_rule__TIME__Alternatives2134);
+                    pushFollow(FOLLOW_2);
                     rule__TIME__Group_2__0();
 
                     state._fsp--;
-                    if (state.failed) return ;
 
-                    }
 
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getTIMEAccess().getGroup_2()); 
                     }
 
+                     after(grammarAccess.getTIMEAccess().getGroup_2()); 
+
                     }
 
 
                     }
                     break;
                 case 4 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1038:6: ( ( rule__TIME__Group_3__0 ) )
+                    // InternalETPhys.g:1037:6: ( ( rule__TIME__Group_3__0 ) )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1038:6: ( ( rule__TIME__Group_3__0 ) )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1039:1: ( rule__TIME__Group_3__0 )
+                    // InternalETPhys.g:1037:6: ( ( rule__TIME__Group_3__0 ) )
+                    // InternalETPhys.g:1038:1: ( rule__TIME__Group_3__0 )
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getTIMEAccess().getGroup_3()); 
-                    }
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1040:1: ( rule__TIME__Group_3__0 )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1040:2: rule__TIME__Group_3__0
+                     before(grammarAccess.getTIMEAccess().getGroup_3()); 
+                    // InternalETPhys.g:1039:1: ( rule__TIME__Group_3__0 )
+                    // InternalETPhys.g:1039:2: rule__TIME__Group_3__0
                     {
-                    pushFollow(FOLLOW_rule__TIME__Group_3__0_in_rule__TIME__Alternatives2152);
+                    pushFollow(FOLLOW_2);
                     rule__TIME__Group_3__0();
 
                     state._fsp--;
-                    if (state.failed) return ;
 
-                    }
 
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getTIMEAccess().getGroup_3()); 
                     }
 
+                     after(grammarAccess.getTIMEAccess().getGroup_3()); 
+
                     }
 
 
@@ -3355,13 +3050,13 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Literal__Alternatives"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1049:1: rule__Literal__Alternatives : ( ( ruleBooleanLiteral ) | ( ruleNumberLiteral ) | ( ruleStringLiteral ) );
+    // InternalETPhys.g:1048:1: rule__Literal__Alternatives : ( ( ruleBooleanLiteral ) | ( ruleNumberLiteral ) | ( ruleStringLiteral ) );
     public final void rule__Literal__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1053:1: ( ( ruleBooleanLiteral ) | ( ruleNumberLiteral ) | ( ruleStringLiteral ) )
+            // InternalETPhys.g:1052:1: ( ( ruleBooleanLiteral ) | ( ruleNumberLiteral ) | ( ruleStringLiteral ) )
             int alt8=3;
             switch ( input.LA(1) ) {
             case 15:
@@ -3384,7 +3079,6 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                 }
                 break;
             default:
-                if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
                     new NoViableAltException("", 8, 0, input);
 
@@ -3393,22 +3087,18 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
             switch (alt8) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1054:1: ( ruleBooleanLiteral )
+                    // InternalETPhys.g:1053:1: ( ruleBooleanLiteral )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1054:1: ( ruleBooleanLiteral )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1055:1: ruleBooleanLiteral
+                    // InternalETPhys.g:1053:1: ( ruleBooleanLiteral )
+                    // InternalETPhys.g:1054:1: ruleBooleanLiteral
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getLiteralAccess().getBooleanLiteralParserRuleCall_0()); 
-                    }
-                    pushFollow(FOLLOW_ruleBooleanLiteral_in_rule__Literal__Alternatives2185);
+                     before(grammarAccess.getLiteralAccess().getBooleanLiteralParserRuleCall_0()); 
+                    pushFollow(FOLLOW_2);
                     ruleBooleanLiteral();
 
                     state._fsp--;
-                    if (state.failed) return ;
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getLiteralAccess().getBooleanLiteralParserRuleCall_0()); 
-                    }
+
+                     after(grammarAccess.getLiteralAccess().getBooleanLiteralParserRuleCall_0()); 
 
                     }
 
@@ -3416,22 +3106,18 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1060:6: ( ruleNumberLiteral )
+                    // InternalETPhys.g:1059:6: ( ruleNumberLiteral )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1060:6: ( ruleNumberLiteral )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1061:1: ruleNumberLiteral
+                    // InternalETPhys.g:1059:6: ( ruleNumberLiteral )
+                    // InternalETPhys.g:1060:1: ruleNumberLiteral
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getLiteralAccess().getNumberLiteralParserRuleCall_1()); 
-                    }
-                    pushFollow(FOLLOW_ruleNumberLiteral_in_rule__Literal__Alternatives2202);
+                     before(grammarAccess.getLiteralAccess().getNumberLiteralParserRuleCall_1()); 
+                    pushFollow(FOLLOW_2);
                     ruleNumberLiteral();
 
                     state._fsp--;
-                    if (state.failed) return ;
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getLiteralAccess().getNumberLiteralParserRuleCall_1()); 
-                    }
+
+                     after(grammarAccess.getLiteralAccess().getNumberLiteralParserRuleCall_1()); 
 
                     }
 
@@ -3439,22 +3125,18 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1066:6: ( ruleStringLiteral )
+                    // InternalETPhys.g:1065:6: ( ruleStringLiteral )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1066:6: ( ruleStringLiteral )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1067:1: ruleStringLiteral
+                    // InternalETPhys.g:1065:6: ( ruleStringLiteral )
+                    // InternalETPhys.g:1066:1: ruleStringLiteral
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getLiteralAccess().getStringLiteralParserRuleCall_2()); 
-                    }
-                    pushFollow(FOLLOW_ruleStringLiteral_in_rule__Literal__Alternatives2219);
+                     before(grammarAccess.getLiteralAccess().getStringLiteralParserRuleCall_2()); 
+                    pushFollow(FOLLOW_2);
                     ruleStringLiteral();
 
                     state._fsp--;
-                    if (state.failed) return ;
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getLiteralAccess().getStringLiteralParserRuleCall_2()); 
-                    }
+
+                     after(grammarAccess.getLiteralAccess().getStringLiteralParserRuleCall_2()); 
 
                     }
 
@@ -3479,13 +3161,13 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__BooleanLiteral__Alternatives_1"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1077:1: rule__BooleanLiteral__Alternatives_1 : ( ( 'false' ) | ( ( rule__BooleanLiteral__IsTrueAssignment_1_1 ) ) );
+    // InternalETPhys.g:1076:1: rule__BooleanLiteral__Alternatives_1 : ( ( 'false' ) | ( ( rule__BooleanLiteral__IsTrueAssignment_1_1 ) ) );
     public final void rule__BooleanLiteral__Alternatives_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1081:1: ( ( 'false' ) | ( ( rule__BooleanLiteral__IsTrueAssignment_1_1 ) ) )
+            // InternalETPhys.g:1080:1: ( ( 'false' ) | ( ( rule__BooleanLiteral__IsTrueAssignment_1_1 ) ) )
             int alt9=2;
             int LA9_0 = input.LA(1);
 
@@ -3496,7 +3178,6 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                 alt9=2;
             }
             else {
-                if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
                     new NoViableAltException("", 9, 0, input);
 
@@ -3504,18 +3185,14 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
             }
             switch (alt9) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1082:1: ( 'false' )
+                    // InternalETPhys.g:1081:1: ( 'false' )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1082:1: ( 'false' )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1083:1: 'false'
+                    // InternalETPhys.g:1081:1: ( 'false' )
+                    // InternalETPhys.g:1082:1: 'false'
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getBooleanLiteralAccess().getFalseKeyword_1_0()); 
-                    }
-                    match(input,15,FOLLOW_15_in_rule__BooleanLiteral__Alternatives_12252); if (state.failed) return ;
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getBooleanLiteralAccess().getFalseKeyword_1_0()); 
-                    }
+                     before(grammarAccess.getBooleanLiteralAccess().getFalseKeyword_1_0()); 
+                    match(input,15,FOLLOW_2); 
+                     after(grammarAccess.getBooleanLiteralAccess().getFalseKeyword_1_0()); 
 
                     }
 
@@ -3523,29 +3200,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1090:6: ( ( rule__BooleanLiteral__IsTrueAssignment_1_1 ) )
+                    // InternalETPhys.g:1089:6: ( ( rule__BooleanLiteral__IsTrueAssignment_1_1 ) )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1090:6: ( ( rule__BooleanLiteral__IsTrueAssignment_1_1 ) )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1091:1: ( rule__BooleanLiteral__IsTrueAssignment_1_1 )
+                    // InternalETPhys.g:1089:6: ( ( rule__BooleanLiteral__IsTrueAssignment_1_1 ) )
+                    // InternalETPhys.g:1090:1: ( rule__BooleanLiteral__IsTrueAssignment_1_1 )
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getBooleanLiteralAccess().getIsTrueAssignment_1_1()); 
-                    }
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1092:1: ( rule__BooleanLiteral__IsTrueAssignment_1_1 )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1092:2: rule__BooleanLiteral__IsTrueAssignment_1_1
+                     before(grammarAccess.getBooleanLiteralAccess().getIsTrueAssignment_1_1()); 
+                    // InternalETPhys.g:1091:1: ( rule__BooleanLiteral__IsTrueAssignment_1_1 )
+                    // InternalETPhys.g:1091:2: rule__BooleanLiteral__IsTrueAssignment_1_1
                     {
-                    pushFollow(FOLLOW_rule__BooleanLiteral__IsTrueAssignment_1_1_in_rule__BooleanLiteral__Alternatives_12271);
+                    pushFollow(FOLLOW_2);
                     rule__BooleanLiteral__IsTrueAssignment_1_1();
 
                     state._fsp--;
-                    if (state.failed) return ;
 
-                    }
 
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getBooleanLiteralAccess().getIsTrueAssignment_1_1()); 
                     }
 
+                     after(grammarAccess.getBooleanLiteralAccess().getIsTrueAssignment_1_1()); 
+
                     }
 
 
@@ -3569,13 +3242,13 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NumberLiteral__Alternatives"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1101:1: rule__NumberLiteral__Alternatives : ( ( ruleIntLiteral ) | ( ruleRealLiteral ) );
+    // InternalETPhys.g:1100:1: rule__NumberLiteral__Alternatives : ( ( ruleIntLiteral ) | ( ruleRealLiteral ) );
     public final void rule__NumberLiteral__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1105:1: ( ( ruleIntLiteral ) | ( ruleRealLiteral ) )
+            // InternalETPhys.g:1104:1: ( ( ruleIntLiteral ) | ( ruleRealLiteral ) )
             int alt10=2;
             switch ( input.LA(1) ) {
             case 16:
@@ -3592,7 +3265,6 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                         alt10=1;
                     }
                     else {
-                        if (state.backtracking>0) {state.failed=true; return ;}
                         NoViableAltException nvae =
                             new NoViableAltException("", 10, 3, input);
 
@@ -3600,7 +3272,6 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                     }
                 }
                 else {
-                    if (state.backtracking>0) {state.failed=true; return ;}
                     NoViableAltException nvae =
                         new NoViableAltException("", 10, 1, input);
 
@@ -3622,7 +3293,6 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                         alt10=1;
                     }
                     else {
-                        if (state.backtracking>0) {state.failed=true; return ;}
                         NoViableAltException nvae =
                             new NoViableAltException("", 10, 3, input);
 
@@ -3630,7 +3300,6 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                     }
                 }
                 else {
-                    if (state.backtracking>0) {state.failed=true; return ;}
                     NoViableAltException nvae =
                         new NoViableAltException("", 10, 2, input);
 
@@ -3649,7 +3318,6 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                     alt10=1;
                 }
                 else {
-                    if (state.backtracking>0) {state.failed=true; return ;}
                     NoViableAltException nvae =
                         new NoViableAltException("", 10, 3, input);
 
@@ -3663,7 +3331,6 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                 }
                 break;
             default:
-                if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
                     new NoViableAltException("", 10, 0, input);
 
@@ -3672,22 +3339,18 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
             switch (alt10) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1106:1: ( ruleIntLiteral )
+                    // InternalETPhys.g:1105:1: ( ruleIntLiteral )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1106:1: ( ruleIntLiteral )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1107:1: ruleIntLiteral
+                    // InternalETPhys.g:1105:1: ( ruleIntLiteral )
+                    // InternalETPhys.g:1106:1: ruleIntLiteral
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getNumberLiteralAccess().getIntLiteralParserRuleCall_0()); 
-                    }
-                    pushFollow(FOLLOW_ruleIntLiteral_in_rule__NumberLiteral__Alternatives2304);
+                     before(grammarAccess.getNumberLiteralAccess().getIntLiteralParserRuleCall_0()); 
+                    pushFollow(FOLLOW_2);
                     ruleIntLiteral();
 
                     state._fsp--;
-                    if (state.failed) return ;
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getNumberLiteralAccess().getIntLiteralParserRuleCall_0()); 
-                    }
+
+                     after(grammarAccess.getNumberLiteralAccess().getIntLiteralParserRuleCall_0()); 
 
                     }
 
@@ -3695,22 +3358,18 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1112:6: ( ruleRealLiteral )
+                    // InternalETPhys.g:1111:6: ( ruleRealLiteral )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1112:6: ( ruleRealLiteral )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1113:1: ruleRealLiteral
+                    // InternalETPhys.g:1111:6: ( ruleRealLiteral )
+                    // InternalETPhys.g:1112:1: ruleRealLiteral
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getNumberLiteralAccess().getRealLiteralParserRuleCall_1()); 
-                    }
-                    pushFollow(FOLLOW_ruleRealLiteral_in_rule__NumberLiteral__Alternatives2321);
+                     before(grammarAccess.getNumberLiteralAccess().getRealLiteralParserRuleCall_1()); 
+                    pushFollow(FOLLOW_2);
                     ruleRealLiteral();
 
                     state._fsp--;
-                    if (state.failed) return ;
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getNumberLiteralAccess().getRealLiteralParserRuleCall_1()); 
-                    }
+
+                     after(grammarAccess.getNumberLiteralAccess().getRealLiteralParserRuleCall_1()); 
 
                     }
 
@@ -3735,13 +3394,13 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Integer__Alternatives"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1123:1: rule__Integer__Alternatives : ( ( ( rule__Integer__Group_0__0 ) ) | ( RULE_HEX ) );
+    // InternalETPhys.g:1122:1: rule__Integer__Alternatives : ( ( ( rule__Integer__Group_0__0 ) ) | ( RULE_HEX ) );
     public final void rule__Integer__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1127:1: ( ( ( rule__Integer__Group_0__0 ) ) | ( RULE_HEX ) )
+            // InternalETPhys.g:1126:1: ( ( ( rule__Integer__Group_0__0 ) ) | ( RULE_HEX ) )
             int alt11=2;
             int LA11_0 = input.LA(1);
 
@@ -3752,7 +3411,6 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                 alt11=2;
             }
             else {
-                if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
                     new NoViableAltException("", 11, 0, input);
 
@@ -3760,47 +3418,39 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
             }
             switch (alt11) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1128:1: ( ( rule__Integer__Group_0__0 ) )
+                    // InternalETPhys.g:1127:1: ( ( rule__Integer__Group_0__0 ) )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1128:1: ( ( rule__Integer__Group_0__0 ) )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1129:1: ( rule__Integer__Group_0__0 )
+                    // InternalETPhys.g:1127:1: ( ( rule__Integer__Group_0__0 ) )
+                    // InternalETPhys.g:1128:1: ( rule__Integer__Group_0__0 )
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getIntegerAccess().getGroup_0()); 
-                    }
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1130:1: ( rule__Integer__Group_0__0 )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1130:2: rule__Integer__Group_0__0
+                     before(grammarAccess.getIntegerAccess().getGroup_0()); 
+                    // InternalETPhys.g:1129:1: ( rule__Integer__Group_0__0 )
+                    // InternalETPhys.g:1129:2: rule__Integer__Group_0__0
                     {
-                    pushFollow(FOLLOW_rule__Integer__Group_0__0_in_rule__Integer__Alternatives2353);
+                    pushFollow(FOLLOW_2);
                     rule__Integer__Group_0__0();
 
                     state._fsp--;
-                    if (state.failed) return ;
 
-                    }
 
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getIntegerAccess().getGroup_0()); 
                     }
 
+                     after(grammarAccess.getIntegerAccess().getGroup_0()); 
+
                     }
 
 
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1134:6: ( RULE_HEX )
+                    // InternalETPhys.g:1133:6: ( RULE_HEX )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1134:6: ( RULE_HEX )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1135:1: RULE_HEX
+                    // InternalETPhys.g:1133:6: ( RULE_HEX )
+                    // InternalETPhys.g:1134:1: RULE_HEX
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getIntegerAccess().getHEXTerminalRuleCall_1()); 
-                    }
-                    match(input,RULE_HEX,FOLLOW_RULE_HEX_in_rule__Integer__Alternatives2371); if (state.failed) return ;
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getIntegerAccess().getHEXTerminalRuleCall_1()); 
-                    }
+                     before(grammarAccess.getIntegerAccess().getHEXTerminalRuleCall_1()); 
+                    match(input,RULE_HEX,FOLLOW_2); 
+                     after(grammarAccess.getIntegerAccess().getHEXTerminalRuleCall_1()); 
 
                     }
 
@@ -3825,13 +3475,13 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Integer__Alternatives_0_0"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1145:1: rule__Integer__Alternatives_0_0 : ( ( '+' ) | ( '-' ) );
+    // InternalETPhys.g:1144:1: rule__Integer__Alternatives_0_0 : ( ( '+' ) | ( '-' ) );
     public final void rule__Integer__Alternatives_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1149:1: ( ( '+' ) | ( '-' ) )
+            // InternalETPhys.g:1148:1: ( ( '+' ) | ( '-' ) )
             int alt12=2;
             int LA12_0 = input.LA(1);
 
@@ -3842,7 +3492,6 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                 alt12=2;
             }
             else {
-                if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
                     new NoViableAltException("", 12, 0, input);
 
@@ -3850,18 +3499,14 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
             }
             switch (alt12) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1150:1: ( '+' )
+                    // InternalETPhys.g:1149:1: ( '+' )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1150:1: ( '+' )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1151:1: '+'
+                    // InternalETPhys.g:1149:1: ( '+' )
+                    // InternalETPhys.g:1150:1: '+'
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getIntegerAccess().getPlusSignKeyword_0_0_0()); 
-                    }
-                    match(input,16,FOLLOW_16_in_rule__Integer__Alternatives_0_02404); if (state.failed) return ;
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getIntegerAccess().getPlusSignKeyword_0_0_0()); 
-                    }
+                     before(grammarAccess.getIntegerAccess().getPlusSignKeyword_0_0_0()); 
+                    match(input,16,FOLLOW_2); 
+                     after(grammarAccess.getIntegerAccess().getPlusSignKeyword_0_0_0()); 
 
                     }
 
@@ -3869,18 +3514,14 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1158:6: ( '-' )
+                    // InternalETPhys.g:1157:6: ( '-' )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1158:6: ( '-' )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1159:1: '-'
+                    // InternalETPhys.g:1157:6: ( '-' )
+                    // InternalETPhys.g:1158:1: '-'
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getIntegerAccess().getHyphenMinusKeyword_0_0_1()); 
-                    }
-                    match(input,17,FOLLOW_17_in_rule__Integer__Alternatives_0_02424); if (state.failed) return ;
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getIntegerAccess().getHyphenMinusKeyword_0_0_1()); 
-                    }
+                     before(grammarAccess.getIntegerAccess().getHyphenMinusKeyword_0_0_1()); 
+                    match(input,17,FOLLOW_2); 
+                     after(grammarAccess.getIntegerAccess().getHyphenMinusKeyword_0_0_1()); 
 
                     }
 
@@ -3905,13 +3546,13 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Real__Alternatives"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1171:1: rule__Real__Alternatives : ( ( ruleDecimal ) | ( ruleDecimalExp ) );
+    // InternalETPhys.g:1170:1: rule__Real__Alternatives : ( ( ruleDecimal ) | ( ruleDecimalExp ) );
     public final void rule__Real__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1175:1: ( ( ruleDecimal ) | ( ruleDecimalExp ) )
+            // InternalETPhys.g:1174:1: ( ( ruleDecimal ) | ( ruleDecimalExp ) )
             int alt13=2;
             switch ( input.LA(1) ) {
             case 16:
@@ -3934,7 +3575,6 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                                 alt13=2;
                             }
                             else {
-                                if (state.backtracking>0) {state.failed=true; return ;}
                                 NoViableAltException nvae =
                                     new NoViableAltException("", 13, 5, input);
 
@@ -3942,7 +3582,6 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                             }
                         }
                         else {
-                            if (state.backtracking>0) {state.failed=true; return ;}
                             NoViableAltException nvae =
                                 new NoViableAltException("", 13, 4, input);
 
@@ -3950,7 +3589,6 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                         }
                     }
                     else {
-                        if (state.backtracking>0) {state.failed=true; return ;}
                         NoViableAltException nvae =
                             new NoViableAltException("", 13, 3, input);
 
@@ -3958,7 +3596,6 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                     }
                 }
                 else {
-                    if (state.backtracking>0) {state.failed=true; return ;}
                     NoViableAltException nvae =
                         new NoViableAltException("", 13, 1, input);
 
@@ -3986,7 +3623,6 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                                 alt13=2;
                             }
                             else {
-                                if (state.backtracking>0) {state.failed=true; return ;}
                                 NoViableAltException nvae =
                                     new NoViableAltException("", 13, 5, input);
 
@@ -3994,7 +3630,6 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                             }
                         }
                         else {
-                            if (state.backtracking>0) {state.failed=true; return ;}
                             NoViableAltException nvae =
                                 new NoViableAltException("", 13, 4, input);
 
@@ -4002,7 +3637,6 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                         }
                     }
                     else {
-                        if (state.backtracking>0) {state.failed=true; return ;}
                         NoViableAltException nvae =
                             new NoViableAltException("", 13, 3, input);
 
@@ -4010,7 +3644,6 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                     }
                 }
                 else {
-                    if (state.backtracking>0) {state.failed=true; return ;}
                     NoViableAltException nvae =
                         new NoViableAltException("", 13, 2, input);
 
@@ -4035,7 +3668,6 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                             alt13=2;
                         }
                         else {
-                            if (state.backtracking>0) {state.failed=true; return ;}
                             NoViableAltException nvae =
                                 new NoViableAltException("", 13, 5, input);
 
@@ -4043,7 +3675,6 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                         }
                     }
                     else {
-                        if (state.backtracking>0) {state.failed=true; return ;}
                         NoViableAltException nvae =
                             new NoViableAltException("", 13, 4, input);
 
@@ -4051,7 +3682,6 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                     }
                 }
                 else {
-                    if (state.backtracking>0) {state.failed=true; return ;}
                     NoViableAltException nvae =
                         new NoViableAltException("", 13, 3, input);
 
@@ -4060,7 +3690,6 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                 }
                 break;
             default:
-                if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
                     new NoViableAltException("", 13, 0, input);
 
@@ -4069,22 +3698,18 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
             switch (alt13) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1176:1: ( ruleDecimal )
+                    // InternalETPhys.g:1175:1: ( ruleDecimal )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1176:1: ( ruleDecimal )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1177:1: ruleDecimal
+                    // InternalETPhys.g:1175:1: ( ruleDecimal )
+                    // InternalETPhys.g:1176:1: ruleDecimal
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getRealAccess().getDecimalParserRuleCall_0()); 
-                    }
-                    pushFollow(FOLLOW_ruleDecimal_in_rule__Real__Alternatives2458);
+                     before(grammarAccess.getRealAccess().getDecimalParserRuleCall_0()); 
+                    pushFollow(FOLLOW_2);
                     ruleDecimal();
 
                     state._fsp--;
-                    if (state.failed) return ;
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getRealAccess().getDecimalParserRuleCall_0()); 
-                    }
+
+                     after(grammarAccess.getRealAccess().getDecimalParserRuleCall_0()); 
 
                     }
 
@@ -4092,22 +3717,18 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1182:6: ( ruleDecimalExp )
+                    // InternalETPhys.g:1181:6: ( ruleDecimalExp )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1182:6: ( ruleDecimalExp )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1183:1: ruleDecimalExp
+                    // InternalETPhys.g:1181:6: ( ruleDecimalExp )
+                    // InternalETPhys.g:1182:1: ruleDecimalExp
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getRealAccess().getDecimalExpParserRuleCall_1()); 
-                    }
-                    pushFollow(FOLLOW_ruleDecimalExp_in_rule__Real__Alternatives2475);
+                     before(grammarAccess.getRealAccess().getDecimalExpParserRuleCall_1()); 
+                    pushFollow(FOLLOW_2);
                     ruleDecimalExp();
 
                     state._fsp--;
-                    if (state.failed) return ;
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getRealAccess().getDecimalExpParserRuleCall_1()); 
-                    }
+
+                     after(grammarAccess.getRealAccess().getDecimalExpParserRuleCall_1()); 
 
                     }
 
@@ -4132,13 +3753,13 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Decimal__Alternatives_0"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1193:1: rule__Decimal__Alternatives_0 : ( ( '+' ) | ( '-' ) );
+    // InternalETPhys.g:1192:1: rule__Decimal__Alternatives_0 : ( ( '+' ) | ( '-' ) );
     public final void rule__Decimal__Alternatives_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1197:1: ( ( '+' ) | ( '-' ) )
+            // InternalETPhys.g:1196:1: ( ( '+' ) | ( '-' ) )
             int alt14=2;
             int LA14_0 = input.LA(1);
 
@@ -4149,7 +3770,6 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                 alt14=2;
             }
             else {
-                if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
                     new NoViableAltException("", 14, 0, input);
 
@@ -4157,18 +3777,14 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
             }
             switch (alt14) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1198:1: ( '+' )
+                    // InternalETPhys.g:1197:1: ( '+' )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1198:1: ( '+' )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1199:1: '+'
+                    // InternalETPhys.g:1197:1: ( '+' )
+                    // InternalETPhys.g:1198:1: '+'
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getDecimalAccess().getPlusSignKeyword_0_0()); 
-                    }
-                    match(input,16,FOLLOW_16_in_rule__Decimal__Alternatives_02508); if (state.failed) return ;
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getDecimalAccess().getPlusSignKeyword_0_0()); 
-                    }
+                     before(grammarAccess.getDecimalAccess().getPlusSignKeyword_0_0()); 
+                    match(input,16,FOLLOW_2); 
+                     after(grammarAccess.getDecimalAccess().getPlusSignKeyword_0_0()); 
 
                     }
 
@@ -4176,18 +3792,14 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1206:6: ( '-' )
+                    // InternalETPhys.g:1205:6: ( '-' )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1206:6: ( '-' )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1207:1: '-'
+                    // InternalETPhys.g:1205:6: ( '-' )
+                    // InternalETPhys.g:1206:1: '-'
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getDecimalAccess().getHyphenMinusKeyword_0_1()); 
-                    }
-                    match(input,17,FOLLOW_17_in_rule__Decimal__Alternatives_02528); if (state.failed) return ;
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getDecimalAccess().getHyphenMinusKeyword_0_1()); 
-                    }
+                     before(grammarAccess.getDecimalAccess().getHyphenMinusKeyword_0_1()); 
+                    match(input,17,FOLLOW_2); 
+                     after(grammarAccess.getDecimalAccess().getHyphenMinusKeyword_0_1()); 
 
                     }
 
@@ -4212,13 +3824,13 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Alternatives_0"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1219:1: rule__DecimalExp__Alternatives_0 : ( ( '+' ) | ( '-' ) );
+    // InternalETPhys.g:1218:1: rule__DecimalExp__Alternatives_0 : ( ( '+' ) | ( '-' ) );
     public final void rule__DecimalExp__Alternatives_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1223:1: ( ( '+' ) | ( '-' ) )
+            // InternalETPhys.g:1222:1: ( ( '+' ) | ( '-' ) )
             int alt15=2;
             int LA15_0 = input.LA(1);
 
@@ -4229,7 +3841,6 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                 alt15=2;
             }
             else {
-                if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
                     new NoViableAltException("", 15, 0, input);
 
@@ -4237,18 +3848,14 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
             }
             switch (alt15) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1224:1: ( '+' )
+                    // InternalETPhys.g:1223:1: ( '+' )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1224:1: ( '+' )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1225:1: '+'
+                    // InternalETPhys.g:1223:1: ( '+' )
+                    // InternalETPhys.g:1224:1: '+'
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getDecimalExpAccess().getPlusSignKeyword_0_0()); 
-                    }
-                    match(input,16,FOLLOW_16_in_rule__DecimalExp__Alternatives_02563); if (state.failed) return ;
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getDecimalExpAccess().getPlusSignKeyword_0_0()); 
-                    }
+                     before(grammarAccess.getDecimalExpAccess().getPlusSignKeyword_0_0()); 
+                    match(input,16,FOLLOW_2); 
+                     after(grammarAccess.getDecimalExpAccess().getPlusSignKeyword_0_0()); 
 
                     }
 
@@ -4256,18 +3863,14 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1232:6: ( '-' )
+                    // InternalETPhys.g:1231:6: ( '-' )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1232:6: ( '-' )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1233:1: '-'
+                    // InternalETPhys.g:1231:6: ( '-' )
+                    // InternalETPhys.g:1232:1: '-'
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getDecimalExpAccess().getHyphenMinusKeyword_0_1()); 
-                    }
-                    match(input,17,FOLLOW_17_in_rule__DecimalExp__Alternatives_02583); if (state.failed) return ;
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getDecimalExpAccess().getHyphenMinusKeyword_0_1()); 
-                    }
+                     before(grammarAccess.getDecimalExpAccess().getHyphenMinusKeyword_0_1()); 
+                    match(input,17,FOLLOW_2); 
+                     after(grammarAccess.getDecimalExpAccess().getHyphenMinusKeyword_0_1()); 
 
                     }
 
@@ -4292,13 +3895,13 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Alternatives_4"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1245:1: rule__DecimalExp__Alternatives_4 : ( ( 'e' ) | ( 'E' ) );
+    // InternalETPhys.g:1244:1: rule__DecimalExp__Alternatives_4 : ( ( 'e' ) | ( 'E' ) );
     public final void rule__DecimalExp__Alternatives_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1249:1: ( ( 'e' ) | ( 'E' ) )
+            // InternalETPhys.g:1248:1: ( ( 'e' ) | ( 'E' ) )
             int alt16=2;
             int LA16_0 = input.LA(1);
 
@@ -4309,7 +3912,6 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                 alt16=2;
             }
             else {
-                if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
                     new NoViableAltException("", 16, 0, input);
 
@@ -4317,18 +3919,14 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
             }
             switch (alt16) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1250:1: ( 'e' )
+                    // InternalETPhys.g:1249:1: ( 'e' )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1250:1: ( 'e' )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1251:1: 'e'
+                    // InternalETPhys.g:1249:1: ( 'e' )
+                    // InternalETPhys.g:1250:1: 'e'
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getDecimalExpAccess().getEKeyword_4_0()); 
-                    }
-                    match(input,18,FOLLOW_18_in_rule__DecimalExp__Alternatives_42618); if (state.failed) return ;
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getDecimalExpAccess().getEKeyword_4_0()); 
-                    }
+                     before(grammarAccess.getDecimalExpAccess().getEKeyword_4_0()); 
+                    match(input,18,FOLLOW_2); 
+                     after(grammarAccess.getDecimalExpAccess().getEKeyword_4_0()); 
 
                     }
 
@@ -4336,18 +3934,14 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1258:6: ( 'E' )
+                    // InternalETPhys.g:1257:6: ( 'E' )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1258:6: ( 'E' )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1259:1: 'E'
+                    // InternalETPhys.g:1257:6: ( 'E' )
+                    // InternalETPhys.g:1258:1: 'E'
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getDecimalExpAccess().getEKeyword_4_1()); 
-                    }
-                    match(input,19,FOLLOW_19_in_rule__DecimalExp__Alternatives_42638); if (state.failed) return ;
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getDecimalExpAccess().getEKeyword_4_1()); 
-                    }
+                     before(grammarAccess.getDecimalExpAccess().getEKeyword_4_1()); 
+                    match(input,19,FOLLOW_2); 
+                     after(grammarAccess.getDecimalExpAccess().getEKeyword_4_1()); 
 
                     }
 
@@ -4372,13 +3966,13 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Alternatives_5"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1271:1: rule__DecimalExp__Alternatives_5 : ( ( '+' ) | ( '-' ) );
+    // InternalETPhys.g:1270:1: rule__DecimalExp__Alternatives_5 : ( ( '+' ) | ( '-' ) );
     public final void rule__DecimalExp__Alternatives_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1275:1: ( ( '+' ) | ( '-' ) )
+            // InternalETPhys.g:1274:1: ( ( '+' ) | ( '-' ) )
             int alt17=2;
             int LA17_0 = input.LA(1);
 
@@ -4389,7 +3983,6 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                 alt17=2;
             }
             else {
-                if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
                     new NoViableAltException("", 17, 0, input);
 
@@ -4397,18 +3990,14 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
             }
             switch (alt17) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1276:1: ( '+' )
+                    // InternalETPhys.g:1275:1: ( '+' )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1276:1: ( '+' )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1277:1: '+'
+                    // InternalETPhys.g:1275:1: ( '+' )
+                    // InternalETPhys.g:1276:1: '+'
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getDecimalExpAccess().getPlusSignKeyword_5_0()); 
-                    }
-                    match(input,16,FOLLOW_16_in_rule__DecimalExp__Alternatives_52673); if (state.failed) return ;
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getDecimalExpAccess().getPlusSignKeyword_5_0()); 
-                    }
+                     before(grammarAccess.getDecimalExpAccess().getPlusSignKeyword_5_0()); 
+                    match(input,16,FOLLOW_2); 
+                     after(grammarAccess.getDecimalExpAccess().getPlusSignKeyword_5_0()); 
 
                     }
 
@@ -4416,18 +4005,14 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1284:6: ( '-' )
+                    // InternalETPhys.g:1283:6: ( '-' )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1284:6: ( '-' )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1285:1: '-'
+                    // InternalETPhys.g:1283:6: ( '-' )
+                    // InternalETPhys.g:1284:1: '-'
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getDecimalExpAccess().getHyphenMinusKeyword_5_1()); 
-                    }
-                    match(input,17,FOLLOW_17_in_rule__DecimalExp__Alternatives_52693); if (state.failed) return ;
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getDecimalExpAccess().getHyphenMinusKeyword_5_1()); 
-                    }
+                     before(grammarAccess.getDecimalExpAccess().getHyphenMinusKeyword_5_1()); 
+                    match(input,17,FOLLOW_2); 
+                     after(grammarAccess.getDecimalExpAccess().getHyphenMinusKeyword_5_1()); 
 
                     }
 
@@ -4452,13 +4037,13 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ExecMode__Alternatives"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1297:1: rule__ExecMode__Alternatives : ( ( ( 'polled' ) ) | ( ( 'blocked' ) ) | ( ( 'mixed' ) ) );
+    // InternalETPhys.g:1296:1: rule__ExecMode__Alternatives : ( ( ( 'polled' ) ) | ( ( 'blocked' ) ) | ( ( 'mixed' ) ) );
     public final void rule__ExecMode__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1301:1: ( ( ( 'polled' ) ) | ( ( 'blocked' ) ) | ( ( 'mixed' ) ) )
+            // InternalETPhys.g:1300:1: ( ( ( 'polled' ) ) | ( ( 'blocked' ) ) | ( ( 'mixed' ) ) )
             int alt18=3;
             switch ( input.LA(1) ) {
             case 20:
@@ -4477,7 +4062,6 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                 }
                 break;
             default:
-                if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
                     new NoViableAltException("", 18, 0, input);
 
@@ -4486,24 +4070,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
             switch (alt18) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1302:1: ( ( 'polled' ) )
+                    // InternalETPhys.g:1301:1: ( ( 'polled' ) )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1302:1: ( ( 'polled' ) )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1303:1: ( 'polled' )
+                    // InternalETPhys.g:1301:1: ( ( 'polled' ) )
+                    // InternalETPhys.g:1302:1: ( 'polled' )
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getExecModeAccess().getPOLLEDEnumLiteralDeclaration_0()); 
-                    }
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1304:1: ( 'polled' )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1304:3: 'polled'
+                     before(grammarAccess.getExecModeAccess().getPOLLEDEnumLiteralDeclaration_0()); 
+                    // InternalETPhys.g:1303:1: ( 'polled' )
+                    // InternalETPhys.g:1303:3: 'polled'
                     {
-                    match(input,20,FOLLOW_20_in_rule__ExecMode__Alternatives2728); if (state.failed) return ;
+                    match(input,20,FOLLOW_2); 
 
                     }
 
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getExecModeAccess().getPOLLEDEnumLiteralDeclaration_0()); 
-                    }
+                     after(grammarAccess.getExecModeAccess().getPOLLEDEnumLiteralDeclaration_0()); 
 
                     }
 
@@ -4511,24 +4091,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1309:6: ( ( 'blocked' ) )
+                    // InternalETPhys.g:1308:6: ( ( 'blocked' ) )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1309:6: ( ( 'blocked' ) )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1310:1: ( 'blocked' )
+                    // InternalETPhys.g:1308:6: ( ( 'blocked' ) )
+                    // InternalETPhys.g:1309:1: ( 'blocked' )
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getExecModeAccess().getBLOCKEDEnumLiteralDeclaration_1()); 
-                    }
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1311:1: ( 'blocked' )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1311:3: 'blocked'
+                     before(grammarAccess.getExecModeAccess().getBLOCKEDEnumLiteralDeclaration_1()); 
+                    // InternalETPhys.g:1310:1: ( 'blocked' )
+                    // InternalETPhys.g:1310:3: 'blocked'
                     {
-                    match(input,21,FOLLOW_21_in_rule__ExecMode__Alternatives2749); if (state.failed) return ;
+                    match(input,21,FOLLOW_2); 
 
                     }
 
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getExecModeAccess().getBLOCKEDEnumLiteralDeclaration_1()); 
-                    }
+                     after(grammarAccess.getExecModeAccess().getBLOCKEDEnumLiteralDeclaration_1()); 
 
                     }
 
@@ -4536,24 +4112,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1316:6: ( ( 'mixed' ) )
+                    // InternalETPhys.g:1315:6: ( ( 'mixed' ) )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1316:6: ( ( 'mixed' ) )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1317:1: ( 'mixed' )
+                    // InternalETPhys.g:1315:6: ( ( 'mixed' ) )
+                    // InternalETPhys.g:1316:1: ( 'mixed' )
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getExecModeAccess().getMIXEDEnumLiteralDeclaration_2()); 
-                    }
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1318:1: ( 'mixed' )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1318:3: 'mixed'
+                     before(grammarAccess.getExecModeAccess().getMIXEDEnumLiteralDeclaration_2()); 
+                    // InternalETPhys.g:1317:1: ( 'mixed' )
+                    // InternalETPhys.g:1317:3: 'mixed'
                     {
-                    match(input,22,FOLLOW_22_in_rule__ExecMode__Alternatives2770); if (state.failed) return ;
+                    match(input,22,FOLLOW_2); 
 
                     }
 
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getExecModeAccess().getMIXEDEnumLiteralDeclaration_2()); 
-                    }
+                     after(grammarAccess.getExecModeAccess().getMIXEDEnumLiteralDeclaration_2()); 
 
                     }
 
@@ -4578,13 +4150,13 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ThreadModel__Alternatives"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1328:1: rule__ThreadModel__Alternatives : ( ( ( 'singleThreaded' ) ) | ( ( 'multiThreaded' ) ) );
+    // InternalETPhys.g:1327:1: rule__ThreadModel__Alternatives : ( ( ( 'singleThreaded' ) ) | ( ( 'multiThreaded' ) ) );
     public final void rule__ThreadModel__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1332:1: ( ( ( 'singleThreaded' ) ) | ( ( 'multiThreaded' ) ) )
+            // InternalETPhys.g:1331:1: ( ( ( 'singleThreaded' ) ) | ( ( 'multiThreaded' ) ) )
             int alt19=2;
             int LA19_0 = input.LA(1);
 
@@ -4595,7 +4167,6 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                 alt19=2;
             }
             else {
-                if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
                     new NoViableAltException("", 19, 0, input);
 
@@ -4603,24 +4174,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
             }
             switch (alt19) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1333:1: ( ( 'singleThreaded' ) )
+                    // InternalETPhys.g:1332:1: ( ( 'singleThreaded' ) )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1333:1: ( ( 'singleThreaded' ) )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1334:1: ( 'singleThreaded' )
+                    // InternalETPhys.g:1332:1: ( ( 'singleThreaded' ) )
+                    // InternalETPhys.g:1333:1: ( 'singleThreaded' )
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getThreadModelAccess().getSINGLE_THREADEDEnumLiteralDeclaration_0()); 
-                    }
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1335:1: ( 'singleThreaded' )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1335:3: 'singleThreaded'
+                     before(grammarAccess.getThreadModelAccess().getSINGLE_THREADEDEnumLiteralDeclaration_0()); 
+                    // InternalETPhys.g:1334:1: ( 'singleThreaded' )
+                    // InternalETPhys.g:1334:3: 'singleThreaded'
                     {
-                    match(input,23,FOLLOW_23_in_rule__ThreadModel__Alternatives2806); if (state.failed) return ;
+                    match(input,23,FOLLOW_2); 
 
                     }
 
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getThreadModelAccess().getSINGLE_THREADEDEnumLiteralDeclaration_0()); 
-                    }
+                     after(grammarAccess.getThreadModelAccess().getSINGLE_THREADEDEnumLiteralDeclaration_0()); 
 
                     }
 
@@ -4628,24 +4195,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1340:6: ( ( 'multiThreaded' ) )
+                    // InternalETPhys.g:1339:6: ( ( 'multiThreaded' ) )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1340:6: ( ( 'multiThreaded' ) )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1341:1: ( 'multiThreaded' )
+                    // InternalETPhys.g:1339:6: ( ( 'multiThreaded' ) )
+                    // InternalETPhys.g:1340:1: ( 'multiThreaded' )
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getThreadModelAccess().getMULTI_THREADEDEnumLiteralDeclaration_1()); 
-                    }
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1342:1: ( 'multiThreaded' )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1342:3: 'multiThreaded'
+                     before(grammarAccess.getThreadModelAccess().getMULTI_THREADEDEnumLiteralDeclaration_1()); 
+                    // InternalETPhys.g:1341:1: ( 'multiThreaded' )
+                    // InternalETPhys.g:1341:3: 'multiThreaded'
                     {
-                    match(input,24,FOLLOW_24_in_rule__ThreadModel__Alternatives2827); if (state.failed) return ;
+                    match(input,24,FOLLOW_2); 
 
                     }
 
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getThreadModelAccess().getMULTI_THREADEDEnumLiteralDeclaration_1()); 
-                    }
+                     after(grammarAccess.getThreadModelAccess().getMULTI_THREADEDEnumLiteralDeclaration_1()); 
 
                     }
 
@@ -4670,13 +4233,13 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__LiteralType__Alternatives"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1352:1: rule__LiteralType__Alternatives : ( ( ( 'ptBoolean' ) ) | ( ( 'ptInteger' ) ) | ( ( 'ptReal' ) ) | ( ( 'ptCharacter' ) ) );
+    // InternalETPhys.g:1351:1: rule__LiteralType__Alternatives : ( ( ( 'ptBoolean' ) ) | ( ( 'ptInteger' ) ) | ( ( 'ptReal' ) ) | ( ( 'ptCharacter' ) ) );
     public final void rule__LiteralType__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1356:1: ( ( ( 'ptBoolean' ) ) | ( ( 'ptInteger' ) ) | ( ( 'ptReal' ) ) | ( ( 'ptCharacter' ) ) )
+            // InternalETPhys.g:1355:1: ( ( ( 'ptBoolean' ) ) | ( ( 'ptInteger' ) ) | ( ( 'ptReal' ) ) | ( ( 'ptCharacter' ) ) )
             int alt20=4;
             switch ( input.LA(1) ) {
             case 25:
@@ -4700,7 +4263,6 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                 }
                 break;
             default:
-                if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
                     new NoViableAltException("", 20, 0, input);
 
@@ -4709,24 +4271,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
             switch (alt20) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1357:1: ( ( 'ptBoolean' ) )
+                    // InternalETPhys.g:1356:1: ( ( 'ptBoolean' ) )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1357:1: ( ( 'ptBoolean' ) )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1358:1: ( 'ptBoolean' )
+                    // InternalETPhys.g:1356:1: ( ( 'ptBoolean' ) )
+                    // InternalETPhys.g:1357:1: ( 'ptBoolean' )
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getLiteralTypeAccess().getBOOLEnumLiteralDeclaration_0()); 
-                    }
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1359:1: ( 'ptBoolean' )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1359:3: 'ptBoolean'
+                     before(grammarAccess.getLiteralTypeAccess().getBOOLEnumLiteralDeclaration_0()); 
+                    // InternalETPhys.g:1358:1: ( 'ptBoolean' )
+                    // InternalETPhys.g:1358:3: 'ptBoolean'
                     {
-                    match(input,25,FOLLOW_25_in_rule__LiteralType__Alternatives2863); if (state.failed) return ;
+                    match(input,25,FOLLOW_2); 
 
                     }
 
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getLiteralTypeAccess().getBOOLEnumLiteralDeclaration_0()); 
-                    }
+                     after(grammarAccess.getLiteralTypeAccess().getBOOLEnumLiteralDeclaration_0()); 
 
                     }
 
@@ -4734,24 +4292,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1364:6: ( ( 'ptInteger' ) )
+                    // InternalETPhys.g:1363:6: ( ( 'ptInteger' ) )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1364:6: ( ( 'ptInteger' ) )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1365:1: ( 'ptInteger' )
+                    // InternalETPhys.g:1363:6: ( ( 'ptInteger' ) )
+                    // InternalETPhys.g:1364:1: ( 'ptInteger' )
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getLiteralTypeAccess().getINTEnumLiteralDeclaration_1()); 
-                    }
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1366:1: ( 'ptInteger' )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1366:3: 'ptInteger'
+                     before(grammarAccess.getLiteralTypeAccess().getINTEnumLiteralDeclaration_1()); 
+                    // InternalETPhys.g:1365:1: ( 'ptInteger' )
+                    // InternalETPhys.g:1365:3: 'ptInteger'
                     {
-                    match(input,26,FOLLOW_26_in_rule__LiteralType__Alternatives2884); if (state.failed) return ;
+                    match(input,26,FOLLOW_2); 
 
                     }
 
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getLiteralTypeAccess().getINTEnumLiteralDeclaration_1()); 
-                    }
+                     after(grammarAccess.getLiteralTypeAccess().getINTEnumLiteralDeclaration_1()); 
 
                     }
 
@@ -4759,24 +4313,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1371:6: ( ( 'ptReal' ) )
+                    // InternalETPhys.g:1370:6: ( ( 'ptReal' ) )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1371:6: ( ( 'ptReal' ) )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1372:1: ( 'ptReal' )
+                    // InternalETPhys.g:1370:6: ( ( 'ptReal' ) )
+                    // InternalETPhys.g:1371:1: ( 'ptReal' )
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getLiteralTypeAccess().getREALEnumLiteralDeclaration_2()); 
-                    }
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1373:1: ( 'ptReal' )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1373:3: 'ptReal'
+                     before(grammarAccess.getLiteralTypeAccess().getREALEnumLiteralDeclaration_2()); 
+                    // InternalETPhys.g:1372:1: ( 'ptReal' )
+                    // InternalETPhys.g:1372:3: 'ptReal'
                     {
-                    match(input,27,FOLLOW_27_in_rule__LiteralType__Alternatives2905); if (state.failed) return ;
+                    match(input,27,FOLLOW_2); 
 
                     }
 
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getLiteralTypeAccess().getREALEnumLiteralDeclaration_2()); 
-                    }
+                     after(grammarAccess.getLiteralTypeAccess().getREALEnumLiteralDeclaration_2()); 
 
                     }
 
@@ -4784,24 +4334,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 4 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1378:6: ( ( 'ptCharacter' ) )
+                    // InternalETPhys.g:1377:6: ( ( 'ptCharacter' ) )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1378:6: ( ( 'ptCharacter' ) )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1379:1: ( 'ptCharacter' )
+                    // InternalETPhys.g:1377:6: ( ( 'ptCharacter' ) )
+                    // InternalETPhys.g:1378:1: ( 'ptCharacter' )
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getLiteralTypeAccess().getCHAREnumLiteralDeclaration_3()); 
-                    }
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1380:1: ( 'ptCharacter' )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1380:3: 'ptCharacter'
+                     before(grammarAccess.getLiteralTypeAccess().getCHAREnumLiteralDeclaration_3()); 
+                    // InternalETPhys.g:1379:1: ( 'ptCharacter' )
+                    // InternalETPhys.g:1379:3: 'ptCharacter'
                     {
-                    match(input,28,FOLLOW_28_in_rule__LiteralType__Alternatives2926); if (state.failed) return ;
+                    match(input,28,FOLLOW_2); 
 
                     }
 
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getLiteralTypeAccess().getCHAREnumLiteralDeclaration_3()); 
-                    }
+                     after(grammarAccess.getLiteralTypeAccess().getCHAREnumLiteralDeclaration_3()); 
 
                     }
 
@@ -4826,25 +4372,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalModel__Group__0"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1392:1: rule__PhysicalModel__Group__0 : rule__PhysicalModel__Group__0__Impl rule__PhysicalModel__Group__1 ;
+    // InternalETPhys.g:1391:1: rule__PhysicalModel__Group__0 : rule__PhysicalModel__Group__0__Impl rule__PhysicalModel__Group__1 ;
     public final void rule__PhysicalModel__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1396:1: ( rule__PhysicalModel__Group__0__Impl rule__PhysicalModel__Group__1 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1397:2: rule__PhysicalModel__Group__0__Impl rule__PhysicalModel__Group__1
+            // InternalETPhys.g:1395:1: ( rule__PhysicalModel__Group__0__Impl rule__PhysicalModel__Group__1 )
+            // InternalETPhys.g:1396:2: rule__PhysicalModel__Group__0__Impl rule__PhysicalModel__Group__1
             {
-            pushFollow(FOLLOW_rule__PhysicalModel__Group__0__Impl_in_rule__PhysicalModel__Group__02959);
+            pushFollow(FOLLOW_3);
             rule__PhysicalModel__Group__0__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__PhysicalModel__Group__1_in_rule__PhysicalModel__Group__02962);
+
+            pushFollow(FOLLOW_2);
             rule__PhysicalModel__Group__1();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -4864,25 +4410,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalModel__Group__0__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1404:1: rule__PhysicalModel__Group__0__Impl : ( 'PhysicalModel' ) ;
+    // InternalETPhys.g:1403:1: rule__PhysicalModel__Group__0__Impl : ( 'PhysicalModel' ) ;
     public final void rule__PhysicalModel__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1408:1: ( ( 'PhysicalModel' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1409:1: ( 'PhysicalModel' )
+            // InternalETPhys.g:1407:1: ( ( 'PhysicalModel' ) )
+            // InternalETPhys.g:1408:1: ( 'PhysicalModel' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1409:1: ( 'PhysicalModel' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1410:1: 'PhysicalModel'
+            // InternalETPhys.g:1408:1: ( 'PhysicalModel' )
+            // InternalETPhys.g:1409:1: 'PhysicalModel'
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalModelAccess().getPhysicalModelKeyword_0()); 
-            }
-            match(input,29,FOLLOW_29_in_rule__PhysicalModel__Group__0__Impl2990); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalModelAccess().getPhysicalModelKeyword_0()); 
-            }
+             before(grammarAccess.getPhysicalModelAccess().getPhysicalModelKeyword_0()); 
+            match(input,29,FOLLOW_2); 
+             after(grammarAccess.getPhysicalModelAccess().getPhysicalModelKeyword_0()); 
 
             }
 
@@ -4905,25 +4447,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalModel__Group__1"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1423:1: rule__PhysicalModel__Group__1 : rule__PhysicalModel__Group__1__Impl rule__PhysicalModel__Group__2 ;
+    // InternalETPhys.g:1422:1: rule__PhysicalModel__Group__1 : rule__PhysicalModel__Group__1__Impl rule__PhysicalModel__Group__2 ;
     public final void rule__PhysicalModel__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1427:1: ( rule__PhysicalModel__Group__1__Impl rule__PhysicalModel__Group__2 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1428:2: rule__PhysicalModel__Group__1__Impl rule__PhysicalModel__Group__2
+            // InternalETPhys.g:1426:1: ( rule__PhysicalModel__Group__1__Impl rule__PhysicalModel__Group__2 )
+            // InternalETPhys.g:1427:2: rule__PhysicalModel__Group__1__Impl rule__PhysicalModel__Group__2
             {
-            pushFollow(FOLLOW_rule__PhysicalModel__Group__1__Impl_in_rule__PhysicalModel__Group__13021);
+            pushFollow(FOLLOW_4);
             rule__PhysicalModel__Group__1__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__PhysicalModel__Group__2_in_rule__PhysicalModel__Group__13024);
+
+            pushFollow(FOLLOW_2);
             rule__PhysicalModel__Group__2();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -4943,36 +4485,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalModel__Group__1__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1435:1: rule__PhysicalModel__Group__1__Impl : ( ( rule__PhysicalModel__NameAssignment_1 ) ) ;
+    // InternalETPhys.g:1434:1: rule__PhysicalModel__Group__1__Impl : ( ( rule__PhysicalModel__NameAssignment_1 ) ) ;
     public final void rule__PhysicalModel__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1439:1: ( ( ( rule__PhysicalModel__NameAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1440:1: ( ( rule__PhysicalModel__NameAssignment_1 ) )
+            // InternalETPhys.g:1438:1: ( ( ( rule__PhysicalModel__NameAssignment_1 ) ) )
+            // InternalETPhys.g:1439:1: ( ( rule__PhysicalModel__NameAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1440:1: ( ( rule__PhysicalModel__NameAssignment_1 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1441:1: ( rule__PhysicalModel__NameAssignment_1 )
+            // InternalETPhys.g:1439:1: ( ( rule__PhysicalModel__NameAssignment_1 ) )
+            // InternalETPhys.g:1440:1: ( rule__PhysicalModel__NameAssignment_1 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalModelAccess().getNameAssignment_1()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1442:1: ( rule__PhysicalModel__NameAssignment_1 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1442:2: rule__PhysicalModel__NameAssignment_1
+             before(grammarAccess.getPhysicalModelAccess().getNameAssignment_1()); 
+            // InternalETPhys.g:1441:1: ( rule__PhysicalModel__NameAssignment_1 )
+            // InternalETPhys.g:1441:2: rule__PhysicalModel__NameAssignment_1
             {
-            pushFollow(FOLLOW_rule__PhysicalModel__NameAssignment_1_in_rule__PhysicalModel__Group__1__Impl3051);
+            pushFollow(FOLLOW_2);
             rule__PhysicalModel__NameAssignment_1();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalModelAccess().getNameAssignment_1()); 
             }
 
+             after(grammarAccess.getPhysicalModelAccess().getNameAssignment_1()); 
+
             }
 
 
@@ -4994,25 +4532,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalModel__Group__2"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1452:1: rule__PhysicalModel__Group__2 : rule__PhysicalModel__Group__2__Impl rule__PhysicalModel__Group__3 ;
+    // InternalETPhys.g:1451:1: rule__PhysicalModel__Group__2 : rule__PhysicalModel__Group__2__Impl rule__PhysicalModel__Group__3 ;
     public final void rule__PhysicalModel__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1456:1: ( rule__PhysicalModel__Group__2__Impl rule__PhysicalModel__Group__3 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1457:2: rule__PhysicalModel__Group__2__Impl rule__PhysicalModel__Group__3
+            // InternalETPhys.g:1455:1: ( rule__PhysicalModel__Group__2__Impl rule__PhysicalModel__Group__3 )
+            // InternalETPhys.g:1456:2: rule__PhysicalModel__Group__2__Impl rule__PhysicalModel__Group__3
             {
-            pushFollow(FOLLOW_rule__PhysicalModel__Group__2__Impl_in_rule__PhysicalModel__Group__23081);
+            pushFollow(FOLLOW_5);
             rule__PhysicalModel__Group__2__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__PhysicalModel__Group__3_in_rule__PhysicalModel__Group__23084);
+
+            pushFollow(FOLLOW_2);
             rule__PhysicalModel__Group__3();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -5032,25 +4570,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalModel__Group__2__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1464:1: rule__PhysicalModel__Group__2__Impl : ( '{' ) ;
+    // InternalETPhys.g:1463:1: rule__PhysicalModel__Group__2__Impl : ( '{' ) ;
     public final void rule__PhysicalModel__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1468:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1469:1: ( '{' )
+            // InternalETPhys.g:1467:1: ( ( '{' ) )
+            // InternalETPhys.g:1468:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1469:1: ( '{' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1470:1: '{'
+            // InternalETPhys.g:1468:1: ( '{' )
+            // InternalETPhys.g:1469:1: '{'
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalModelAccess().getLeftCurlyBracketKeyword_2()); 
-            }
-            match(input,30,FOLLOW_30_in_rule__PhysicalModel__Group__2__Impl3112); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalModelAccess().getLeftCurlyBracketKeyword_2()); 
-            }
+             before(grammarAccess.getPhysicalModelAccess().getLeftCurlyBracketKeyword_2()); 
+            match(input,30,FOLLOW_2); 
+             after(grammarAccess.getPhysicalModelAccess().getLeftCurlyBracketKeyword_2()); 
 
             }
 
@@ -5073,25 +4607,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalModel__Group__3"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1483:1: rule__PhysicalModel__Group__3 : rule__PhysicalModel__Group__3__Impl rule__PhysicalModel__Group__4 ;
+    // InternalETPhys.g:1482:1: rule__PhysicalModel__Group__3 : rule__PhysicalModel__Group__3__Impl rule__PhysicalModel__Group__4 ;
     public final void rule__PhysicalModel__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1487:1: ( rule__PhysicalModel__Group__3__Impl rule__PhysicalModel__Group__4 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1488:2: rule__PhysicalModel__Group__3__Impl rule__PhysicalModel__Group__4
+            // InternalETPhys.g:1486:1: ( rule__PhysicalModel__Group__3__Impl rule__PhysicalModel__Group__4 )
+            // InternalETPhys.g:1487:2: rule__PhysicalModel__Group__3__Impl rule__PhysicalModel__Group__4
             {
-            pushFollow(FOLLOW_rule__PhysicalModel__Group__3__Impl_in_rule__PhysicalModel__Group__33143);
+            pushFollow(FOLLOW_5);
             rule__PhysicalModel__Group__3__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__PhysicalModel__Group__4_in_rule__PhysicalModel__Group__33146);
+
+            pushFollow(FOLLOW_2);
             rule__PhysicalModel__Group__4();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -5111,22 +4645,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalModel__Group__3__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1495:1: rule__PhysicalModel__Group__3__Impl : ( ( rule__PhysicalModel__ImportsAssignment_3 )* ) ;
+    // InternalETPhys.g:1494:1: rule__PhysicalModel__Group__3__Impl : ( ( rule__PhysicalModel__ImportsAssignment_3 )* ) ;
     public final void rule__PhysicalModel__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1499:1: ( ( ( rule__PhysicalModel__ImportsAssignment_3 )* ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1500:1: ( ( rule__PhysicalModel__ImportsAssignment_3 )* )
+            // InternalETPhys.g:1498:1: ( ( ( rule__PhysicalModel__ImportsAssignment_3 )* ) )
+            // InternalETPhys.g:1499:1: ( ( rule__PhysicalModel__ImportsAssignment_3 )* )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1500:1: ( ( rule__PhysicalModel__ImportsAssignment_3 )* )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1501:1: ( rule__PhysicalModel__ImportsAssignment_3 )*
+            // InternalETPhys.g:1499:1: ( ( rule__PhysicalModel__ImportsAssignment_3 )* )
+            // InternalETPhys.g:1500:1: ( rule__PhysicalModel__ImportsAssignment_3 )*
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalModelAccess().getImportsAssignment_3()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1502:1: ( rule__PhysicalModel__ImportsAssignment_3 )*
+             before(grammarAccess.getPhysicalModelAccess().getImportsAssignment_3()); 
+            // InternalETPhys.g:1501:1: ( rule__PhysicalModel__ImportsAssignment_3 )*
             loop21:
             do {
                 int alt21=2;
@@ -5139,13 +4671,13 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
                 switch (alt21) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1502:2: rule__PhysicalModel__ImportsAssignment_3
+            	    // InternalETPhys.g:1501:2: rule__PhysicalModel__ImportsAssignment_3
             	    {
-            	    pushFollow(FOLLOW_rule__PhysicalModel__ImportsAssignment_3_in_rule__PhysicalModel__Group__3__Impl3173);
+            	    pushFollow(FOLLOW_6);
             	    rule__PhysicalModel__ImportsAssignment_3();
 
             	    state._fsp--;
-            	    if (state.failed) return ;
+
 
             	    }
             	    break;
@@ -5155,9 +4687,7 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                 }
             } while (true);
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalModelAccess().getImportsAssignment_3()); 
-            }
+             after(grammarAccess.getPhysicalModelAccess().getImportsAssignment_3()); 
 
             }
 
@@ -5180,25 +4710,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalModel__Group__4"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1512:1: rule__PhysicalModel__Group__4 : rule__PhysicalModel__Group__4__Impl rule__PhysicalModel__Group__5 ;
+    // InternalETPhys.g:1511:1: rule__PhysicalModel__Group__4 : rule__PhysicalModel__Group__4__Impl rule__PhysicalModel__Group__5 ;
     public final void rule__PhysicalModel__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1516:1: ( rule__PhysicalModel__Group__4__Impl rule__PhysicalModel__Group__5 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1517:2: rule__PhysicalModel__Group__4__Impl rule__PhysicalModel__Group__5
+            // InternalETPhys.g:1515:1: ( rule__PhysicalModel__Group__4__Impl rule__PhysicalModel__Group__5 )
+            // InternalETPhys.g:1516:2: rule__PhysicalModel__Group__4__Impl rule__PhysicalModel__Group__5
             {
-            pushFollow(FOLLOW_rule__PhysicalModel__Group__4__Impl_in_rule__PhysicalModel__Group__43204);
+            pushFollow(FOLLOW_5);
             rule__PhysicalModel__Group__4__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__PhysicalModel__Group__5_in_rule__PhysicalModel__Group__43207);
+
+            pushFollow(FOLLOW_2);
             rule__PhysicalModel__Group__5();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -5218,22 +4748,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalModel__Group__4__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1524:1: rule__PhysicalModel__Group__4__Impl : ( ( rule__PhysicalModel__Alternatives_4 )* ) ;
+    // InternalETPhys.g:1523:1: rule__PhysicalModel__Group__4__Impl : ( ( rule__PhysicalModel__Alternatives_4 )* ) ;
     public final void rule__PhysicalModel__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1528:1: ( ( ( rule__PhysicalModel__Alternatives_4 )* ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1529:1: ( ( rule__PhysicalModel__Alternatives_4 )* )
+            // InternalETPhys.g:1527:1: ( ( ( rule__PhysicalModel__Alternatives_4 )* ) )
+            // InternalETPhys.g:1528:1: ( ( rule__PhysicalModel__Alternatives_4 )* )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1529:1: ( ( rule__PhysicalModel__Alternatives_4 )* )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1530:1: ( rule__PhysicalModel__Alternatives_4 )*
+            // InternalETPhys.g:1528:1: ( ( rule__PhysicalModel__Alternatives_4 )* )
+            // InternalETPhys.g:1529:1: ( rule__PhysicalModel__Alternatives_4 )*
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalModelAccess().getAlternatives_4()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1531:1: ( rule__PhysicalModel__Alternatives_4 )*
+             before(grammarAccess.getPhysicalModelAccess().getAlternatives_4()); 
+            // InternalETPhys.g:1530:1: ( rule__PhysicalModel__Alternatives_4 )*
             loop22:
             do {
                 int alt22=2;
@@ -5246,13 +4774,13 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
                 switch (alt22) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1531:2: rule__PhysicalModel__Alternatives_4
+            	    // InternalETPhys.g:1530:2: rule__PhysicalModel__Alternatives_4
             	    {
-            	    pushFollow(FOLLOW_rule__PhysicalModel__Alternatives_4_in_rule__PhysicalModel__Group__4__Impl3234);
+            	    pushFollow(FOLLOW_7);
             	    rule__PhysicalModel__Alternatives_4();
 
             	    state._fsp--;
-            	    if (state.failed) return ;
+
 
             	    }
             	    break;
@@ -5262,9 +4790,7 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                 }
             } while (true);
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalModelAccess().getAlternatives_4()); 
-            }
+             after(grammarAccess.getPhysicalModelAccess().getAlternatives_4()); 
 
             }
 
@@ -5287,20 +4813,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalModel__Group__5"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1541:1: rule__PhysicalModel__Group__5 : rule__PhysicalModel__Group__5__Impl ;
+    // InternalETPhys.g:1540:1: rule__PhysicalModel__Group__5 : rule__PhysicalModel__Group__5__Impl ;
     public final void rule__PhysicalModel__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1545:1: ( rule__PhysicalModel__Group__5__Impl )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1546:2: rule__PhysicalModel__Group__5__Impl
+            // InternalETPhys.g:1544:1: ( rule__PhysicalModel__Group__5__Impl )
+            // InternalETPhys.g:1545:2: rule__PhysicalModel__Group__5__Impl
             {
-            pushFollow(FOLLOW_rule__PhysicalModel__Group__5__Impl_in_rule__PhysicalModel__Group__53265);
+            pushFollow(FOLLOW_2);
             rule__PhysicalModel__Group__5__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -5320,25 +4846,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalModel__Group__5__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1552:1: rule__PhysicalModel__Group__5__Impl : ( '}' ) ;
+    // InternalETPhys.g:1551:1: rule__PhysicalModel__Group__5__Impl : ( '}' ) ;
     public final void rule__PhysicalModel__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1556:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1557:1: ( '}' )
+            // InternalETPhys.g:1555:1: ( ( '}' ) )
+            // InternalETPhys.g:1556:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1557:1: ( '}' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1558:1: '}'
+            // InternalETPhys.g:1556:1: ( '}' )
+            // InternalETPhys.g:1557:1: '}'
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalModelAccess().getRightCurlyBracketKeyword_5()); 
-            }
-            match(input,31,FOLLOW_31_in_rule__PhysicalModel__Group__5__Impl3293); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalModelAccess().getRightCurlyBracketKeyword_5()); 
-            }
+             before(grammarAccess.getPhysicalModelAccess().getRightCurlyBracketKeyword_5()); 
+            match(input,31,FOLLOW_2); 
+             after(grammarAccess.getPhysicalModelAccess().getRightCurlyBracketKeyword_5()); 
 
             }
 
@@ -5361,25 +4883,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalSystem__Group__0"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1583:1: rule__PhysicalSystem__Group__0 : rule__PhysicalSystem__Group__0__Impl rule__PhysicalSystem__Group__1 ;
+    // InternalETPhys.g:1582:1: rule__PhysicalSystem__Group__0 : rule__PhysicalSystem__Group__0__Impl rule__PhysicalSystem__Group__1 ;
     public final void rule__PhysicalSystem__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1587:1: ( rule__PhysicalSystem__Group__0__Impl rule__PhysicalSystem__Group__1 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1588:2: rule__PhysicalSystem__Group__0__Impl rule__PhysicalSystem__Group__1
+            // InternalETPhys.g:1586:1: ( rule__PhysicalSystem__Group__0__Impl rule__PhysicalSystem__Group__1 )
+            // InternalETPhys.g:1587:2: rule__PhysicalSystem__Group__0__Impl rule__PhysicalSystem__Group__1
             {
-            pushFollow(FOLLOW_rule__PhysicalSystem__Group__0__Impl_in_rule__PhysicalSystem__Group__03336);
+            pushFollow(FOLLOW_3);
             rule__PhysicalSystem__Group__0__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__PhysicalSystem__Group__1_in_rule__PhysicalSystem__Group__03339);
+
+            pushFollow(FOLLOW_2);
             rule__PhysicalSystem__Group__1();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -5399,25 +4921,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalSystem__Group__0__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1595:1: rule__PhysicalSystem__Group__0__Impl : ( 'PhysicalSystem' ) ;
+    // InternalETPhys.g:1594:1: rule__PhysicalSystem__Group__0__Impl : ( 'PhysicalSystem' ) ;
     public final void rule__PhysicalSystem__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1599:1: ( ( 'PhysicalSystem' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1600:1: ( 'PhysicalSystem' )
+            // InternalETPhys.g:1598:1: ( ( 'PhysicalSystem' ) )
+            // InternalETPhys.g:1599:1: ( 'PhysicalSystem' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1600:1: ( 'PhysicalSystem' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1601:1: 'PhysicalSystem'
+            // InternalETPhys.g:1599:1: ( 'PhysicalSystem' )
+            // InternalETPhys.g:1600:1: 'PhysicalSystem'
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalSystemAccess().getPhysicalSystemKeyword_0()); 
-            }
-            match(input,32,FOLLOW_32_in_rule__PhysicalSystem__Group__0__Impl3367); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalSystemAccess().getPhysicalSystemKeyword_0()); 
-            }
+             before(grammarAccess.getPhysicalSystemAccess().getPhysicalSystemKeyword_0()); 
+            match(input,32,FOLLOW_2); 
+             after(grammarAccess.getPhysicalSystemAccess().getPhysicalSystemKeyword_0()); 
 
             }
 
@@ -5440,25 +4958,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalSystem__Group__1"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1614:1: rule__PhysicalSystem__Group__1 : rule__PhysicalSystem__Group__1__Impl rule__PhysicalSystem__Group__2 ;
+    // InternalETPhys.g:1613:1: rule__PhysicalSystem__Group__1 : rule__PhysicalSystem__Group__1__Impl rule__PhysicalSystem__Group__2 ;
     public final void rule__PhysicalSystem__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1618:1: ( rule__PhysicalSystem__Group__1__Impl rule__PhysicalSystem__Group__2 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1619:2: rule__PhysicalSystem__Group__1__Impl rule__PhysicalSystem__Group__2
+            // InternalETPhys.g:1617:1: ( rule__PhysicalSystem__Group__1__Impl rule__PhysicalSystem__Group__2 )
+            // InternalETPhys.g:1618:2: rule__PhysicalSystem__Group__1__Impl rule__PhysicalSystem__Group__2
             {
-            pushFollow(FOLLOW_rule__PhysicalSystem__Group__1__Impl_in_rule__PhysicalSystem__Group__13398);
+            pushFollow(FOLLOW_8);
             rule__PhysicalSystem__Group__1__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__PhysicalSystem__Group__2_in_rule__PhysicalSystem__Group__13401);
+
+            pushFollow(FOLLOW_2);
             rule__PhysicalSystem__Group__2();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -5478,36 +4996,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalSystem__Group__1__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1626:1: rule__PhysicalSystem__Group__1__Impl : ( ( rule__PhysicalSystem__NameAssignment_1 ) ) ;
+    // InternalETPhys.g:1625:1: rule__PhysicalSystem__Group__1__Impl : ( ( rule__PhysicalSystem__NameAssignment_1 ) ) ;
     public final void rule__PhysicalSystem__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1630:1: ( ( ( rule__PhysicalSystem__NameAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1631:1: ( ( rule__PhysicalSystem__NameAssignment_1 ) )
+            // InternalETPhys.g:1629:1: ( ( ( rule__PhysicalSystem__NameAssignment_1 ) ) )
+            // InternalETPhys.g:1630:1: ( ( rule__PhysicalSystem__NameAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1631:1: ( ( rule__PhysicalSystem__NameAssignment_1 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1632:1: ( rule__PhysicalSystem__NameAssignment_1 )
+            // InternalETPhys.g:1630:1: ( ( rule__PhysicalSystem__NameAssignment_1 ) )
+            // InternalETPhys.g:1631:1: ( rule__PhysicalSystem__NameAssignment_1 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalSystemAccess().getNameAssignment_1()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1633:1: ( rule__PhysicalSystem__NameAssignment_1 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1633:2: rule__PhysicalSystem__NameAssignment_1
+             before(grammarAccess.getPhysicalSystemAccess().getNameAssignment_1()); 
+            // InternalETPhys.g:1632:1: ( rule__PhysicalSystem__NameAssignment_1 )
+            // InternalETPhys.g:1632:2: rule__PhysicalSystem__NameAssignment_1
             {
-            pushFollow(FOLLOW_rule__PhysicalSystem__NameAssignment_1_in_rule__PhysicalSystem__Group__1__Impl3428);
+            pushFollow(FOLLOW_2);
             rule__PhysicalSystem__NameAssignment_1();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalSystemAccess().getNameAssignment_1()); 
             }
 
+             after(grammarAccess.getPhysicalSystemAccess().getNameAssignment_1()); 
+
             }
 
 
@@ -5529,25 +5043,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalSystem__Group__2"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1643:1: rule__PhysicalSystem__Group__2 : rule__PhysicalSystem__Group__2__Impl rule__PhysicalSystem__Group__3 ;
+    // InternalETPhys.g:1642:1: rule__PhysicalSystem__Group__2 : rule__PhysicalSystem__Group__2__Impl rule__PhysicalSystem__Group__3 ;
     public final void rule__PhysicalSystem__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1647:1: ( rule__PhysicalSystem__Group__2__Impl rule__PhysicalSystem__Group__3 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1648:2: rule__PhysicalSystem__Group__2__Impl rule__PhysicalSystem__Group__3
+            // InternalETPhys.g:1646:1: ( rule__PhysicalSystem__Group__2__Impl rule__PhysicalSystem__Group__3 )
+            // InternalETPhys.g:1647:2: rule__PhysicalSystem__Group__2__Impl rule__PhysicalSystem__Group__3
             {
-            pushFollow(FOLLOW_rule__PhysicalSystem__Group__2__Impl_in_rule__PhysicalSystem__Group__23458);
+            pushFollow(FOLLOW_8);
             rule__PhysicalSystem__Group__2__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__PhysicalSystem__Group__3_in_rule__PhysicalSystem__Group__23461);
+
+            pushFollow(FOLLOW_2);
             rule__PhysicalSystem__Group__3();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -5567,22 +5081,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalSystem__Group__2__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1655:1: rule__PhysicalSystem__Group__2__Impl : ( ( rule__PhysicalSystem__DocuAssignment_2 )? ) ;
+    // InternalETPhys.g:1654:1: rule__PhysicalSystem__Group__2__Impl : ( ( rule__PhysicalSystem__DocuAssignment_2 )? ) ;
     public final void rule__PhysicalSystem__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1659:1: ( ( ( rule__PhysicalSystem__DocuAssignment_2 )? ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1660:1: ( ( rule__PhysicalSystem__DocuAssignment_2 )? )
+            // InternalETPhys.g:1658:1: ( ( ( rule__PhysicalSystem__DocuAssignment_2 )? ) )
+            // InternalETPhys.g:1659:1: ( ( rule__PhysicalSystem__DocuAssignment_2 )? )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1660:1: ( ( rule__PhysicalSystem__DocuAssignment_2 )? )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1661:1: ( rule__PhysicalSystem__DocuAssignment_2 )?
+            // InternalETPhys.g:1659:1: ( ( rule__PhysicalSystem__DocuAssignment_2 )? )
+            // InternalETPhys.g:1660:1: ( rule__PhysicalSystem__DocuAssignment_2 )?
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalSystemAccess().getDocuAssignment_2()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1662:1: ( rule__PhysicalSystem__DocuAssignment_2 )?
+             before(grammarAccess.getPhysicalSystemAccess().getDocuAssignment_2()); 
+            // InternalETPhys.g:1661:1: ( rule__PhysicalSystem__DocuAssignment_2 )?
             int alt23=2;
             int LA23_0 = input.LA(1);
 
@@ -5591,22 +5103,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
             }
             switch (alt23) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1662:2: rule__PhysicalSystem__DocuAssignment_2
+                    // InternalETPhys.g:1661:2: rule__PhysicalSystem__DocuAssignment_2
                     {
-                    pushFollow(FOLLOW_rule__PhysicalSystem__DocuAssignment_2_in_rule__PhysicalSystem__Group__2__Impl3488);
+                    pushFollow(FOLLOW_2);
                     rule__PhysicalSystem__DocuAssignment_2();
 
                     state._fsp--;
-                    if (state.failed) return ;
+
 
                     }
                     break;
 
             }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalSystemAccess().getDocuAssignment_2()); 
-            }
+             after(grammarAccess.getPhysicalSystemAccess().getDocuAssignment_2()); 
 
             }
 
@@ -5629,25 +5139,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalSystem__Group__3"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1672:1: rule__PhysicalSystem__Group__3 : rule__PhysicalSystem__Group__3__Impl rule__PhysicalSystem__Group__4 ;
+    // InternalETPhys.g:1671:1: rule__PhysicalSystem__Group__3 : rule__PhysicalSystem__Group__3__Impl rule__PhysicalSystem__Group__4 ;
     public final void rule__PhysicalSystem__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1676:1: ( rule__PhysicalSystem__Group__3__Impl rule__PhysicalSystem__Group__4 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1677:2: rule__PhysicalSystem__Group__3__Impl rule__PhysicalSystem__Group__4
+            // InternalETPhys.g:1675:1: ( rule__PhysicalSystem__Group__3__Impl rule__PhysicalSystem__Group__4 )
+            // InternalETPhys.g:1676:2: rule__PhysicalSystem__Group__3__Impl rule__PhysicalSystem__Group__4
             {
-            pushFollow(FOLLOW_rule__PhysicalSystem__Group__3__Impl_in_rule__PhysicalSystem__Group__33519);
+            pushFollow(FOLLOW_9);
             rule__PhysicalSystem__Group__3__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__PhysicalSystem__Group__4_in_rule__PhysicalSystem__Group__33522);
+
+            pushFollow(FOLLOW_2);
             rule__PhysicalSystem__Group__4();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -5667,25 +5177,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalSystem__Group__3__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1684:1: rule__PhysicalSystem__Group__3__Impl : ( '{' ) ;
+    // InternalETPhys.g:1683:1: rule__PhysicalSystem__Group__3__Impl : ( '{' ) ;
     public final void rule__PhysicalSystem__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1688:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1689:1: ( '{' )
+            // InternalETPhys.g:1687:1: ( ( '{' ) )
+            // InternalETPhys.g:1688:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1689:1: ( '{' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1690:1: '{'
+            // InternalETPhys.g:1688:1: ( '{' )
+            // InternalETPhys.g:1689:1: '{'
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalSystemAccess().getLeftCurlyBracketKeyword_3()); 
-            }
-            match(input,30,FOLLOW_30_in_rule__PhysicalSystem__Group__3__Impl3550); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalSystemAccess().getLeftCurlyBracketKeyword_3()); 
-            }
+             before(grammarAccess.getPhysicalSystemAccess().getLeftCurlyBracketKeyword_3()); 
+            match(input,30,FOLLOW_2); 
+             after(grammarAccess.getPhysicalSystemAccess().getLeftCurlyBracketKeyword_3()); 
 
             }
 
@@ -5708,25 +5214,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalSystem__Group__4"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1703:1: rule__PhysicalSystem__Group__4 : rule__PhysicalSystem__Group__4__Impl rule__PhysicalSystem__Group__5 ;
+    // InternalETPhys.g:1702:1: rule__PhysicalSystem__Group__4 : rule__PhysicalSystem__Group__4__Impl rule__PhysicalSystem__Group__5 ;
     public final void rule__PhysicalSystem__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1707:1: ( rule__PhysicalSystem__Group__4__Impl rule__PhysicalSystem__Group__5 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1708:2: rule__PhysicalSystem__Group__4__Impl rule__PhysicalSystem__Group__5
+            // InternalETPhys.g:1706:1: ( rule__PhysicalSystem__Group__4__Impl rule__PhysicalSystem__Group__5 )
+            // InternalETPhys.g:1707:2: rule__PhysicalSystem__Group__4__Impl rule__PhysicalSystem__Group__5
             {
-            pushFollow(FOLLOW_rule__PhysicalSystem__Group__4__Impl_in_rule__PhysicalSystem__Group__43581);
+            pushFollow(FOLLOW_9);
             rule__PhysicalSystem__Group__4__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__PhysicalSystem__Group__5_in_rule__PhysicalSystem__Group__43584);
+
+            pushFollow(FOLLOW_2);
             rule__PhysicalSystem__Group__5();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -5746,22 +5252,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalSystem__Group__4__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1715:1: rule__PhysicalSystem__Group__4__Impl : ( ( rule__PhysicalSystem__NodeRefsAssignment_4 )* ) ;
+    // InternalETPhys.g:1714:1: rule__PhysicalSystem__Group__4__Impl : ( ( rule__PhysicalSystem__NodeRefsAssignment_4 )* ) ;
     public final void rule__PhysicalSystem__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1719:1: ( ( ( rule__PhysicalSystem__NodeRefsAssignment_4 )* ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1720:1: ( ( rule__PhysicalSystem__NodeRefsAssignment_4 )* )
+            // InternalETPhys.g:1718:1: ( ( ( rule__PhysicalSystem__NodeRefsAssignment_4 )* ) )
+            // InternalETPhys.g:1719:1: ( ( rule__PhysicalSystem__NodeRefsAssignment_4 )* )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1720:1: ( ( rule__PhysicalSystem__NodeRefsAssignment_4 )* )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1721:1: ( rule__PhysicalSystem__NodeRefsAssignment_4 )*
+            // InternalETPhys.g:1719:1: ( ( rule__PhysicalSystem__NodeRefsAssignment_4 )* )
+            // InternalETPhys.g:1720:1: ( rule__PhysicalSystem__NodeRefsAssignment_4 )*
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalSystemAccess().getNodeRefsAssignment_4()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1722:1: ( rule__PhysicalSystem__NodeRefsAssignment_4 )*
+             before(grammarAccess.getPhysicalSystemAccess().getNodeRefsAssignment_4()); 
+            // InternalETPhys.g:1721:1: ( rule__PhysicalSystem__NodeRefsAssignment_4 )*
             loop24:
             do {
                 int alt24=2;
@@ -5774,13 +5278,13 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
                 switch (alt24) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1722:2: rule__PhysicalSystem__NodeRefsAssignment_4
+            	    // InternalETPhys.g:1721:2: rule__PhysicalSystem__NodeRefsAssignment_4
             	    {
-            	    pushFollow(FOLLOW_rule__PhysicalSystem__NodeRefsAssignment_4_in_rule__PhysicalSystem__Group__4__Impl3611);
+            	    pushFollow(FOLLOW_10);
             	    rule__PhysicalSystem__NodeRefsAssignment_4();
 
             	    state._fsp--;
-            	    if (state.failed) return ;
+
 
             	    }
             	    break;
@@ -5790,9 +5294,7 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                 }
             } while (true);
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalSystemAccess().getNodeRefsAssignment_4()); 
-            }
+             after(grammarAccess.getPhysicalSystemAccess().getNodeRefsAssignment_4()); 
 
             }
 
@@ -5815,20 +5317,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalSystem__Group__5"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1732:1: rule__PhysicalSystem__Group__5 : rule__PhysicalSystem__Group__5__Impl ;
+    // InternalETPhys.g:1731:1: rule__PhysicalSystem__Group__5 : rule__PhysicalSystem__Group__5__Impl ;
     public final void rule__PhysicalSystem__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1736:1: ( rule__PhysicalSystem__Group__5__Impl )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1737:2: rule__PhysicalSystem__Group__5__Impl
+            // InternalETPhys.g:1735:1: ( rule__PhysicalSystem__Group__5__Impl )
+            // InternalETPhys.g:1736:2: rule__PhysicalSystem__Group__5__Impl
             {
-            pushFollow(FOLLOW_rule__PhysicalSystem__Group__5__Impl_in_rule__PhysicalSystem__Group__53642);
+            pushFollow(FOLLOW_2);
             rule__PhysicalSystem__Group__5__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -5848,25 +5350,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalSystem__Group__5__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1743:1: rule__PhysicalSystem__Group__5__Impl : ( '}' ) ;
+    // InternalETPhys.g:1742:1: rule__PhysicalSystem__Group__5__Impl : ( '}' ) ;
     public final void rule__PhysicalSystem__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1747:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1748:1: ( '}' )
+            // InternalETPhys.g:1746:1: ( ( '}' ) )
+            // InternalETPhys.g:1747:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1748:1: ( '}' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1749:1: '}'
+            // InternalETPhys.g:1747:1: ( '}' )
+            // InternalETPhys.g:1748:1: '}'
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalSystemAccess().getRightCurlyBracketKeyword_5()); 
-            }
-            match(input,31,FOLLOW_31_in_rule__PhysicalSystem__Group__5__Impl3670); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalSystemAccess().getRightCurlyBracketKeyword_5()); 
-            }
+             before(grammarAccess.getPhysicalSystemAccess().getRightCurlyBracketKeyword_5()); 
+            match(input,31,FOLLOW_2); 
+             after(grammarAccess.getPhysicalSystemAccess().getRightCurlyBracketKeyword_5()); 
 
             }
 
@@ -5889,25 +5387,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeRef__Group__0"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1774:1: rule__NodeRef__Group__0 : rule__NodeRef__Group__0__Impl rule__NodeRef__Group__1 ;
+    // InternalETPhys.g:1773:1: rule__NodeRef__Group__0 : rule__NodeRef__Group__0__Impl rule__NodeRef__Group__1 ;
     public final void rule__NodeRef__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1778:1: ( rule__NodeRef__Group__0__Impl rule__NodeRef__Group__1 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1779:2: rule__NodeRef__Group__0__Impl rule__NodeRef__Group__1
+            // InternalETPhys.g:1777:1: ( rule__NodeRef__Group__0__Impl rule__NodeRef__Group__1 )
+            // InternalETPhys.g:1778:2: rule__NodeRef__Group__0__Impl rule__NodeRef__Group__1
             {
-            pushFollow(FOLLOW_rule__NodeRef__Group__0__Impl_in_rule__NodeRef__Group__03713);
+            pushFollow(FOLLOW_3);
             rule__NodeRef__Group__0__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__NodeRef__Group__1_in_rule__NodeRef__Group__03716);
+
+            pushFollow(FOLLOW_2);
             rule__NodeRef__Group__1();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -5927,25 +5425,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeRef__Group__0__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1786:1: rule__NodeRef__Group__0__Impl : ( 'NodeRef' ) ;
+    // InternalETPhys.g:1785:1: rule__NodeRef__Group__0__Impl : ( 'NodeRef' ) ;
     public final void rule__NodeRef__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1790:1: ( ( 'NodeRef' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1791:1: ( 'NodeRef' )
+            // InternalETPhys.g:1789:1: ( ( 'NodeRef' ) )
+            // InternalETPhys.g:1790:1: ( 'NodeRef' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1791:1: ( 'NodeRef' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1792:1: 'NodeRef'
+            // InternalETPhys.g:1790:1: ( 'NodeRef' )
+            // InternalETPhys.g:1791:1: 'NodeRef'
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getNodeRefAccess().getNodeRefKeyword_0()); 
-            }
-            match(input,33,FOLLOW_33_in_rule__NodeRef__Group__0__Impl3744); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getNodeRefAccess().getNodeRefKeyword_0()); 
-            }
+             before(grammarAccess.getNodeRefAccess().getNodeRefKeyword_0()); 
+            match(input,33,FOLLOW_2); 
+             after(grammarAccess.getNodeRefAccess().getNodeRefKeyword_0()); 
 
             }
 
@@ -5968,25 +5462,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeRef__Group__1"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1805:1: rule__NodeRef__Group__1 : rule__NodeRef__Group__1__Impl rule__NodeRef__Group__2 ;
+    // InternalETPhys.g:1804:1: rule__NodeRef__Group__1 : rule__NodeRef__Group__1__Impl rule__NodeRef__Group__2 ;
     public final void rule__NodeRef__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1809:1: ( rule__NodeRef__Group__1__Impl rule__NodeRef__Group__2 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1810:2: rule__NodeRef__Group__1__Impl rule__NodeRef__Group__2
+            // InternalETPhys.g:1808:1: ( rule__NodeRef__Group__1__Impl rule__NodeRef__Group__2 )
+            // InternalETPhys.g:1809:2: rule__NodeRef__Group__1__Impl rule__NodeRef__Group__2
             {
-            pushFollow(FOLLOW_rule__NodeRef__Group__1__Impl_in_rule__NodeRef__Group__13775);
+            pushFollow(FOLLOW_11);
             rule__NodeRef__Group__1__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__NodeRef__Group__2_in_rule__NodeRef__Group__13778);
+
+            pushFollow(FOLLOW_2);
             rule__NodeRef__Group__2();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -6006,36 +5500,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeRef__Group__1__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1817:1: rule__NodeRef__Group__1__Impl : ( ( rule__NodeRef__NameAssignment_1 ) ) ;
+    // InternalETPhys.g:1816:1: rule__NodeRef__Group__1__Impl : ( ( rule__NodeRef__NameAssignment_1 ) ) ;
     public final void rule__NodeRef__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1821:1: ( ( ( rule__NodeRef__NameAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1822:1: ( ( rule__NodeRef__NameAssignment_1 ) )
+            // InternalETPhys.g:1820:1: ( ( ( rule__NodeRef__NameAssignment_1 ) ) )
+            // InternalETPhys.g:1821:1: ( ( rule__NodeRef__NameAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1822:1: ( ( rule__NodeRef__NameAssignment_1 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1823:1: ( rule__NodeRef__NameAssignment_1 )
+            // InternalETPhys.g:1821:1: ( ( rule__NodeRef__NameAssignment_1 ) )
+            // InternalETPhys.g:1822:1: ( rule__NodeRef__NameAssignment_1 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getNodeRefAccess().getNameAssignment_1()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1824:1: ( rule__NodeRef__NameAssignment_1 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1824:2: rule__NodeRef__NameAssignment_1
+             before(grammarAccess.getNodeRefAccess().getNameAssignment_1()); 
+            // InternalETPhys.g:1823:1: ( rule__NodeRef__NameAssignment_1 )
+            // InternalETPhys.g:1823:2: rule__NodeRef__NameAssignment_1
             {
-            pushFollow(FOLLOW_rule__NodeRef__NameAssignment_1_in_rule__NodeRef__Group__1__Impl3805);
+            pushFollow(FOLLOW_2);
             rule__NodeRef__NameAssignment_1();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getNodeRefAccess().getNameAssignment_1()); 
             }
 
+             after(grammarAccess.getNodeRefAccess().getNameAssignment_1()); 
+
             }
 
 
@@ -6057,25 +5547,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeRef__Group__2"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1834:1: rule__NodeRef__Group__2 : rule__NodeRef__Group__2__Impl rule__NodeRef__Group__3 ;
+    // InternalETPhys.g:1833:1: rule__NodeRef__Group__2 : rule__NodeRef__Group__2__Impl rule__NodeRef__Group__3 ;
     public final void rule__NodeRef__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1838:1: ( rule__NodeRef__Group__2__Impl rule__NodeRef__Group__3 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1839:2: rule__NodeRef__Group__2__Impl rule__NodeRef__Group__3
+            // InternalETPhys.g:1837:1: ( rule__NodeRef__Group__2__Impl rule__NodeRef__Group__3 )
+            // InternalETPhys.g:1838:2: rule__NodeRef__Group__2__Impl rule__NodeRef__Group__3
             {
-            pushFollow(FOLLOW_rule__NodeRef__Group__2__Impl_in_rule__NodeRef__Group__23835);
+            pushFollow(FOLLOW_3);
             rule__NodeRef__Group__2__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__NodeRef__Group__3_in_rule__NodeRef__Group__23838);
+
+            pushFollow(FOLLOW_2);
             rule__NodeRef__Group__3();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -6095,25 +5585,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeRef__Group__2__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1846:1: rule__NodeRef__Group__2__Impl : ( ':' ) ;
+    // InternalETPhys.g:1845:1: rule__NodeRef__Group__2__Impl : ( ':' ) ;
     public final void rule__NodeRef__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1850:1: ( ( ':' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1851:1: ( ':' )
+            // InternalETPhys.g:1849:1: ( ( ':' ) )
+            // InternalETPhys.g:1850:1: ( ':' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1851:1: ( ':' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1852:1: ':'
+            // InternalETPhys.g:1850:1: ( ':' )
+            // InternalETPhys.g:1851:1: ':'
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getNodeRefAccess().getColonKeyword_2()); 
-            }
-            match(input,34,FOLLOW_34_in_rule__NodeRef__Group__2__Impl3866); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getNodeRefAccess().getColonKeyword_2()); 
-            }
+             before(grammarAccess.getNodeRefAccess().getColonKeyword_2()); 
+            match(input,34,FOLLOW_2); 
+             after(grammarAccess.getNodeRefAccess().getColonKeyword_2()); 
 
             }
 
@@ -6136,25 +5622,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeRef__Group__3"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1865:1: rule__NodeRef__Group__3 : rule__NodeRef__Group__3__Impl rule__NodeRef__Group__4 ;
+    // InternalETPhys.g:1864:1: rule__NodeRef__Group__3 : rule__NodeRef__Group__3__Impl rule__NodeRef__Group__4 ;
     public final void rule__NodeRef__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1869:1: ( rule__NodeRef__Group__3__Impl rule__NodeRef__Group__4 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1870:2: rule__NodeRef__Group__3__Impl rule__NodeRef__Group__4
+            // InternalETPhys.g:1868:1: ( rule__NodeRef__Group__3__Impl rule__NodeRef__Group__4 )
+            // InternalETPhys.g:1869:2: rule__NodeRef__Group__3__Impl rule__NodeRef__Group__4
             {
-            pushFollow(FOLLOW_rule__NodeRef__Group__3__Impl_in_rule__NodeRef__Group__33897);
+            pushFollow(FOLLOW_12);
             rule__NodeRef__Group__3__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__NodeRef__Group__4_in_rule__NodeRef__Group__33900);
+
+            pushFollow(FOLLOW_2);
             rule__NodeRef__Group__4();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -6174,36 +5660,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeRef__Group__3__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1877:1: rule__NodeRef__Group__3__Impl : ( ( rule__NodeRef__TypeAssignment_3 ) ) ;
+    // InternalETPhys.g:1876:1: rule__NodeRef__Group__3__Impl : ( ( rule__NodeRef__TypeAssignment_3 ) ) ;
     public final void rule__NodeRef__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1881:1: ( ( ( rule__NodeRef__TypeAssignment_3 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1882:1: ( ( rule__NodeRef__TypeAssignment_3 ) )
+            // InternalETPhys.g:1880:1: ( ( ( rule__NodeRef__TypeAssignment_3 ) ) )
+            // InternalETPhys.g:1881:1: ( ( rule__NodeRef__TypeAssignment_3 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1882:1: ( ( rule__NodeRef__TypeAssignment_3 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1883:1: ( rule__NodeRef__TypeAssignment_3 )
+            // InternalETPhys.g:1881:1: ( ( rule__NodeRef__TypeAssignment_3 ) )
+            // InternalETPhys.g:1882:1: ( rule__NodeRef__TypeAssignment_3 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getNodeRefAccess().getTypeAssignment_3()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1884:1: ( rule__NodeRef__TypeAssignment_3 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1884:2: rule__NodeRef__TypeAssignment_3
+             before(grammarAccess.getNodeRefAccess().getTypeAssignment_3()); 
+            // InternalETPhys.g:1883:1: ( rule__NodeRef__TypeAssignment_3 )
+            // InternalETPhys.g:1883:2: rule__NodeRef__TypeAssignment_3
             {
-            pushFollow(FOLLOW_rule__NodeRef__TypeAssignment_3_in_rule__NodeRef__Group__3__Impl3927);
+            pushFollow(FOLLOW_2);
             rule__NodeRef__TypeAssignment_3();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getNodeRefAccess().getTypeAssignment_3()); 
             }
 
+             after(grammarAccess.getNodeRefAccess().getTypeAssignment_3()); 
+
             }
 
 
@@ -6225,20 +5707,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeRef__Group__4"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1894:1: rule__NodeRef__Group__4 : rule__NodeRef__Group__4__Impl ;
+    // InternalETPhys.g:1893:1: rule__NodeRef__Group__4 : rule__NodeRef__Group__4__Impl ;
     public final void rule__NodeRef__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1898:1: ( rule__NodeRef__Group__4__Impl )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1899:2: rule__NodeRef__Group__4__Impl
+            // InternalETPhys.g:1897:1: ( rule__NodeRef__Group__4__Impl )
+            // InternalETPhys.g:1898:2: rule__NodeRef__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__NodeRef__Group__4__Impl_in_rule__NodeRef__Group__43957);
+            pushFollow(FOLLOW_2);
             rule__NodeRef__Group__4__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -6258,22 +5740,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeRef__Group__4__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1905:1: rule__NodeRef__Group__4__Impl : ( ( rule__NodeRef__DocuAssignment_4 )? ) ;
+    // InternalETPhys.g:1904:1: rule__NodeRef__Group__4__Impl : ( ( rule__NodeRef__DocuAssignment_4 )? ) ;
     public final void rule__NodeRef__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1909:1: ( ( ( rule__NodeRef__DocuAssignment_4 )? ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1910:1: ( ( rule__NodeRef__DocuAssignment_4 )? )
+            // InternalETPhys.g:1908:1: ( ( ( rule__NodeRef__DocuAssignment_4 )? ) )
+            // InternalETPhys.g:1909:1: ( ( rule__NodeRef__DocuAssignment_4 )? )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1910:1: ( ( rule__NodeRef__DocuAssignment_4 )? )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1911:1: ( rule__NodeRef__DocuAssignment_4 )?
+            // InternalETPhys.g:1909:1: ( ( rule__NodeRef__DocuAssignment_4 )? )
+            // InternalETPhys.g:1910:1: ( rule__NodeRef__DocuAssignment_4 )?
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getNodeRefAccess().getDocuAssignment_4()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1912:1: ( rule__NodeRef__DocuAssignment_4 )?
+             before(grammarAccess.getNodeRefAccess().getDocuAssignment_4()); 
+            // InternalETPhys.g:1911:1: ( rule__NodeRef__DocuAssignment_4 )?
             int alt25=2;
             int LA25_0 = input.LA(1);
 
@@ -6282,22 +5762,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
             }
             switch (alt25) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1912:2: rule__NodeRef__DocuAssignment_4
+                    // InternalETPhys.g:1911:2: rule__NodeRef__DocuAssignment_4
                     {
-                    pushFollow(FOLLOW_rule__NodeRef__DocuAssignment_4_in_rule__NodeRef__Group__4__Impl3984);
+                    pushFollow(FOLLOW_2);
                     rule__NodeRef__DocuAssignment_4();
 
                     state._fsp--;
-                    if (state.failed) return ;
+
 
                     }
                     break;
 
             }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getNodeRefAccess().getDocuAssignment_4()); 
-            }
+             after(grammarAccess.getNodeRefAccess().getDocuAssignment_4()); 
 
             }
 
@@ -6320,25 +5798,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeClass__Group__0"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1932:1: rule__NodeClass__Group__0 : rule__NodeClass__Group__0__Impl rule__NodeClass__Group__1 ;
+    // InternalETPhys.g:1931:1: rule__NodeClass__Group__0 : rule__NodeClass__Group__0__Impl rule__NodeClass__Group__1 ;
     public final void rule__NodeClass__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1936:1: ( rule__NodeClass__Group__0__Impl rule__NodeClass__Group__1 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1937:2: rule__NodeClass__Group__0__Impl rule__NodeClass__Group__1
+            // InternalETPhys.g:1935:1: ( rule__NodeClass__Group__0__Impl rule__NodeClass__Group__1 )
+            // InternalETPhys.g:1936:2: rule__NodeClass__Group__0__Impl rule__NodeClass__Group__1
             {
-            pushFollow(FOLLOW_rule__NodeClass__Group__0__Impl_in_rule__NodeClass__Group__04025);
+            pushFollow(FOLLOW_3);
             rule__NodeClass__Group__0__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__NodeClass__Group__1_in_rule__NodeClass__Group__04028);
+
+            pushFollow(FOLLOW_2);
             rule__NodeClass__Group__1();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -6358,25 +5836,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeClass__Group__0__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1944:1: rule__NodeClass__Group__0__Impl : ( 'NodeClass' ) ;
+    // InternalETPhys.g:1943:1: rule__NodeClass__Group__0__Impl : ( 'NodeClass' ) ;
     public final void rule__NodeClass__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1948:1: ( ( 'NodeClass' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1949:1: ( 'NodeClass' )
+            // InternalETPhys.g:1947:1: ( ( 'NodeClass' ) )
+            // InternalETPhys.g:1948:1: ( 'NodeClass' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1949:1: ( 'NodeClass' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1950:1: 'NodeClass'
+            // InternalETPhys.g:1948:1: ( 'NodeClass' )
+            // InternalETPhys.g:1949:1: 'NodeClass'
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getNodeClassAccess().getNodeClassKeyword_0()); 
-            }
-            match(input,35,FOLLOW_35_in_rule__NodeClass__Group__0__Impl4056); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getNodeClassAccess().getNodeClassKeyword_0()); 
-            }
+             before(grammarAccess.getNodeClassAccess().getNodeClassKeyword_0()); 
+            match(input,35,FOLLOW_2); 
+             after(grammarAccess.getNodeClassAccess().getNodeClassKeyword_0()); 
 
             }
 
@@ -6399,25 +5873,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeClass__Group__1"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1963:1: rule__NodeClass__Group__1 : rule__NodeClass__Group__1__Impl rule__NodeClass__Group__2 ;
+    // InternalETPhys.g:1962:1: rule__NodeClass__Group__1 : rule__NodeClass__Group__1__Impl rule__NodeClass__Group__2 ;
     public final void rule__NodeClass__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1967:1: ( rule__NodeClass__Group__1__Impl rule__NodeClass__Group__2 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1968:2: rule__NodeClass__Group__1__Impl rule__NodeClass__Group__2
+            // InternalETPhys.g:1966:1: ( rule__NodeClass__Group__1__Impl rule__NodeClass__Group__2 )
+            // InternalETPhys.g:1967:2: rule__NodeClass__Group__1__Impl rule__NodeClass__Group__2
             {
-            pushFollow(FOLLOW_rule__NodeClass__Group__1__Impl_in_rule__NodeClass__Group__14087);
+            pushFollow(FOLLOW_8);
             rule__NodeClass__Group__1__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__NodeClass__Group__2_in_rule__NodeClass__Group__14090);
+
+            pushFollow(FOLLOW_2);
             rule__NodeClass__Group__2();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -6437,36 +5911,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeClass__Group__1__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1975:1: rule__NodeClass__Group__1__Impl : ( ( rule__NodeClass__NameAssignment_1 ) ) ;
+    // InternalETPhys.g:1974:1: rule__NodeClass__Group__1__Impl : ( ( rule__NodeClass__NameAssignment_1 ) ) ;
     public final void rule__NodeClass__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1979:1: ( ( ( rule__NodeClass__NameAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1980:1: ( ( rule__NodeClass__NameAssignment_1 ) )
+            // InternalETPhys.g:1978:1: ( ( ( rule__NodeClass__NameAssignment_1 ) ) )
+            // InternalETPhys.g:1979:1: ( ( rule__NodeClass__NameAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1980:1: ( ( rule__NodeClass__NameAssignment_1 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1981:1: ( rule__NodeClass__NameAssignment_1 )
+            // InternalETPhys.g:1979:1: ( ( rule__NodeClass__NameAssignment_1 ) )
+            // InternalETPhys.g:1980:1: ( rule__NodeClass__NameAssignment_1 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getNodeClassAccess().getNameAssignment_1()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1982:1: ( rule__NodeClass__NameAssignment_1 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1982:2: rule__NodeClass__NameAssignment_1
+             before(grammarAccess.getNodeClassAccess().getNameAssignment_1()); 
+            // InternalETPhys.g:1981:1: ( rule__NodeClass__NameAssignment_1 )
+            // InternalETPhys.g:1981:2: rule__NodeClass__NameAssignment_1
             {
-            pushFollow(FOLLOW_rule__NodeClass__NameAssignment_1_in_rule__NodeClass__Group__1__Impl4117);
+            pushFollow(FOLLOW_2);
             rule__NodeClass__NameAssignment_1();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getNodeClassAccess().getNameAssignment_1()); 
             }
 
+             after(grammarAccess.getNodeClassAccess().getNameAssignment_1()); 
+
             }
 
 
@@ -6488,25 +5958,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeClass__Group__2"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1992:1: rule__NodeClass__Group__2 : rule__NodeClass__Group__2__Impl rule__NodeClass__Group__3 ;
+    // InternalETPhys.g:1991:1: rule__NodeClass__Group__2 : rule__NodeClass__Group__2__Impl rule__NodeClass__Group__3 ;
     public final void rule__NodeClass__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1996:1: ( rule__NodeClass__Group__2__Impl rule__NodeClass__Group__3 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:1997:2: rule__NodeClass__Group__2__Impl rule__NodeClass__Group__3
+            // InternalETPhys.g:1995:1: ( rule__NodeClass__Group__2__Impl rule__NodeClass__Group__3 )
+            // InternalETPhys.g:1996:2: rule__NodeClass__Group__2__Impl rule__NodeClass__Group__3
             {
-            pushFollow(FOLLOW_rule__NodeClass__Group__2__Impl_in_rule__NodeClass__Group__24147);
+            pushFollow(FOLLOW_8);
             rule__NodeClass__Group__2__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__NodeClass__Group__3_in_rule__NodeClass__Group__24150);
+
+            pushFollow(FOLLOW_2);
             rule__NodeClass__Group__3();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -6526,22 +5996,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeClass__Group__2__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2004:1: rule__NodeClass__Group__2__Impl : ( ( rule__NodeClass__DocuAssignment_2 )? ) ;
+    // InternalETPhys.g:2003:1: rule__NodeClass__Group__2__Impl : ( ( rule__NodeClass__DocuAssignment_2 )? ) ;
     public final void rule__NodeClass__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2008:1: ( ( ( rule__NodeClass__DocuAssignment_2 )? ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2009:1: ( ( rule__NodeClass__DocuAssignment_2 )? )
+            // InternalETPhys.g:2007:1: ( ( ( rule__NodeClass__DocuAssignment_2 )? ) )
+            // InternalETPhys.g:2008:1: ( ( rule__NodeClass__DocuAssignment_2 )? )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2009:1: ( ( rule__NodeClass__DocuAssignment_2 )? )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2010:1: ( rule__NodeClass__DocuAssignment_2 )?
+            // InternalETPhys.g:2008:1: ( ( rule__NodeClass__DocuAssignment_2 )? )
+            // InternalETPhys.g:2009:1: ( rule__NodeClass__DocuAssignment_2 )?
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getNodeClassAccess().getDocuAssignment_2()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2011:1: ( rule__NodeClass__DocuAssignment_2 )?
+             before(grammarAccess.getNodeClassAccess().getDocuAssignment_2()); 
+            // InternalETPhys.g:2010:1: ( rule__NodeClass__DocuAssignment_2 )?
             int alt26=2;
             int LA26_0 = input.LA(1);
 
@@ -6550,22 +6018,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
             }
             switch (alt26) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2011:2: rule__NodeClass__DocuAssignment_2
+                    // InternalETPhys.g:2010:2: rule__NodeClass__DocuAssignment_2
                     {
-                    pushFollow(FOLLOW_rule__NodeClass__DocuAssignment_2_in_rule__NodeClass__Group__2__Impl4177);
+                    pushFollow(FOLLOW_2);
                     rule__NodeClass__DocuAssignment_2();
 
                     state._fsp--;
-                    if (state.failed) return ;
+
 
                     }
                     break;
 
             }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getNodeClassAccess().getDocuAssignment_2()); 
-            }
+             after(grammarAccess.getNodeClassAccess().getDocuAssignment_2()); 
 
             }
 
@@ -6588,25 +6054,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeClass__Group__3"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2021:1: rule__NodeClass__Group__3 : rule__NodeClass__Group__3__Impl rule__NodeClass__Group__4 ;
+    // InternalETPhys.g:2020:1: rule__NodeClass__Group__3 : rule__NodeClass__Group__3__Impl rule__NodeClass__Group__4 ;
     public final void rule__NodeClass__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2025:1: ( rule__NodeClass__Group__3__Impl rule__NodeClass__Group__4 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2026:2: rule__NodeClass__Group__3__Impl rule__NodeClass__Group__4
+            // InternalETPhys.g:2024:1: ( rule__NodeClass__Group__3__Impl rule__NodeClass__Group__4 )
+            // InternalETPhys.g:2025:2: rule__NodeClass__Group__3__Impl rule__NodeClass__Group__4
             {
-            pushFollow(FOLLOW_rule__NodeClass__Group__3__Impl_in_rule__NodeClass__Group__34208);
+            pushFollow(FOLLOW_13);
             rule__NodeClass__Group__3__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__NodeClass__Group__4_in_rule__NodeClass__Group__34211);
+
+            pushFollow(FOLLOW_2);
             rule__NodeClass__Group__4();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -6626,25 +6092,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeClass__Group__3__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2033:1: rule__NodeClass__Group__3__Impl : ( '{' ) ;
+    // InternalETPhys.g:2032:1: rule__NodeClass__Group__3__Impl : ( '{' ) ;
     public final void rule__NodeClass__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2037:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2038:1: ( '{' )
+            // InternalETPhys.g:2036:1: ( ( '{' ) )
+            // InternalETPhys.g:2037:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2038:1: ( '{' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2039:1: '{'
+            // InternalETPhys.g:2037:1: ( '{' )
+            // InternalETPhys.g:2038:1: '{'
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getNodeClassAccess().getLeftCurlyBracketKeyword_3()); 
-            }
-            match(input,30,FOLLOW_30_in_rule__NodeClass__Group__3__Impl4239); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getNodeClassAccess().getLeftCurlyBracketKeyword_3()); 
-            }
+             before(grammarAccess.getNodeClassAccess().getLeftCurlyBracketKeyword_3()); 
+            match(input,30,FOLLOW_2); 
+             after(grammarAccess.getNodeClassAccess().getLeftCurlyBracketKeyword_3()); 
 
             }
 
@@ -6667,25 +6129,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeClass__Group__4"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2052:1: rule__NodeClass__Group__4 : rule__NodeClass__Group__4__Impl rule__NodeClass__Group__5 ;
+    // InternalETPhys.g:2051:1: rule__NodeClass__Group__4 : rule__NodeClass__Group__4__Impl rule__NodeClass__Group__5 ;
     public final void rule__NodeClass__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2056:1: ( rule__NodeClass__Group__4__Impl rule__NodeClass__Group__5 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2057:2: rule__NodeClass__Group__4__Impl rule__NodeClass__Group__5
+            // InternalETPhys.g:2055:1: ( rule__NodeClass__Group__4__Impl rule__NodeClass__Group__5 )
+            // InternalETPhys.g:2056:2: rule__NodeClass__Group__4__Impl rule__NodeClass__Group__5
             {
-            pushFollow(FOLLOW_rule__NodeClass__Group__4__Impl_in_rule__NodeClass__Group__44270);
+            pushFollow(FOLLOW_14);
             rule__NodeClass__Group__4__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__NodeClass__Group__5_in_rule__NodeClass__Group__44273);
+
+            pushFollow(FOLLOW_2);
             rule__NodeClass__Group__5();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -6705,36 +6167,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeClass__Group__4__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2064:1: rule__NodeClass__Group__4__Impl : ( ( rule__NodeClass__UnorderedGroup_4 ) ) ;
+    // InternalETPhys.g:2063:1: rule__NodeClass__Group__4__Impl : ( ( rule__NodeClass__UnorderedGroup_4 ) ) ;
     public final void rule__NodeClass__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2068:1: ( ( ( rule__NodeClass__UnorderedGroup_4 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2069:1: ( ( rule__NodeClass__UnorderedGroup_4 ) )
+            // InternalETPhys.g:2067:1: ( ( ( rule__NodeClass__UnorderedGroup_4 ) ) )
+            // InternalETPhys.g:2068:1: ( ( rule__NodeClass__UnorderedGroup_4 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2069:1: ( ( rule__NodeClass__UnorderedGroup_4 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2070:1: ( rule__NodeClass__UnorderedGroup_4 )
+            // InternalETPhys.g:2068:1: ( ( rule__NodeClass__UnorderedGroup_4 ) )
+            // InternalETPhys.g:2069:1: ( rule__NodeClass__UnorderedGroup_4 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getNodeClassAccess().getUnorderedGroup_4()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2071:1: ( rule__NodeClass__UnorderedGroup_4 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2071:2: rule__NodeClass__UnorderedGroup_4
+             before(grammarAccess.getNodeClassAccess().getUnorderedGroup_4()); 
+            // InternalETPhys.g:2070:1: ( rule__NodeClass__UnorderedGroup_4 )
+            // InternalETPhys.g:2070:2: rule__NodeClass__UnorderedGroup_4
             {
-            pushFollow(FOLLOW_rule__NodeClass__UnorderedGroup_4_in_rule__NodeClass__Group__4__Impl4300);
+            pushFollow(FOLLOW_2);
             rule__NodeClass__UnorderedGroup_4();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getNodeClassAccess().getUnorderedGroup_4()); 
             }
 
+             after(grammarAccess.getNodeClassAccess().getUnorderedGroup_4()); 
+
             }
 
 
@@ -6756,25 +6214,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeClass__Group__5"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2081:1: rule__NodeClass__Group__5 : rule__NodeClass__Group__5__Impl rule__NodeClass__Group__6 ;
+    // InternalETPhys.g:2080:1: rule__NodeClass__Group__5 : rule__NodeClass__Group__5__Impl rule__NodeClass__Group__6 ;
     public final void rule__NodeClass__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2085:1: ( rule__NodeClass__Group__5__Impl rule__NodeClass__Group__6 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2086:2: rule__NodeClass__Group__5__Impl rule__NodeClass__Group__6
+            // InternalETPhys.g:2084:1: ( rule__NodeClass__Group__5__Impl rule__NodeClass__Group__6 )
+            // InternalETPhys.g:2085:2: rule__NodeClass__Group__5__Impl rule__NodeClass__Group__6
             {
-            pushFollow(FOLLOW_rule__NodeClass__Group__5__Impl_in_rule__NodeClass__Group__54330);
+            pushFollow(FOLLOW_14);
             rule__NodeClass__Group__5__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__NodeClass__Group__6_in_rule__NodeClass__Group__54333);
+
+            pushFollow(FOLLOW_2);
             rule__NodeClass__Group__6();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -6794,22 +6252,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeClass__Group__5__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2093:1: rule__NodeClass__Group__5__Impl : ( ( rule__NodeClass__ThreadsAssignment_5 )* ) ;
+    // InternalETPhys.g:2092:1: rule__NodeClass__Group__5__Impl : ( ( rule__NodeClass__ThreadsAssignment_5 )* ) ;
     public final void rule__NodeClass__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2097:1: ( ( ( rule__NodeClass__ThreadsAssignment_5 )* ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2098:1: ( ( rule__NodeClass__ThreadsAssignment_5 )* )
+            // InternalETPhys.g:2096:1: ( ( ( rule__NodeClass__ThreadsAssignment_5 )* ) )
+            // InternalETPhys.g:2097:1: ( ( rule__NodeClass__ThreadsAssignment_5 )* )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2098:1: ( ( rule__NodeClass__ThreadsAssignment_5 )* )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2099:1: ( rule__NodeClass__ThreadsAssignment_5 )*
+            // InternalETPhys.g:2097:1: ( ( rule__NodeClass__ThreadsAssignment_5 )* )
+            // InternalETPhys.g:2098:1: ( rule__NodeClass__ThreadsAssignment_5 )*
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getNodeClassAccess().getThreadsAssignment_5()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2100:1: ( rule__NodeClass__ThreadsAssignment_5 )*
+             before(grammarAccess.getNodeClassAccess().getThreadsAssignment_5()); 
+            // InternalETPhys.g:2099:1: ( rule__NodeClass__ThreadsAssignment_5 )*
             loop27:
             do {
                 int alt27=2;
@@ -6822,13 +6278,13 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
                 switch (alt27) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2100:2: rule__NodeClass__ThreadsAssignment_5
+            	    // InternalETPhys.g:2099:2: rule__NodeClass__ThreadsAssignment_5
             	    {
-            	    pushFollow(FOLLOW_rule__NodeClass__ThreadsAssignment_5_in_rule__NodeClass__Group__5__Impl4360);
+            	    pushFollow(FOLLOW_15);
             	    rule__NodeClass__ThreadsAssignment_5();
 
             	    state._fsp--;
-            	    if (state.failed) return ;
+
 
             	    }
             	    break;
@@ -6838,9 +6294,7 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                 }
             } while (true);
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getNodeClassAccess().getThreadsAssignment_5()); 
-            }
+             after(grammarAccess.getNodeClassAccess().getThreadsAssignment_5()); 
 
             }
 
@@ -6863,20 +6317,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeClass__Group__6"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2110:1: rule__NodeClass__Group__6 : rule__NodeClass__Group__6__Impl ;
+    // InternalETPhys.g:2109:1: rule__NodeClass__Group__6 : rule__NodeClass__Group__6__Impl ;
     public final void rule__NodeClass__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2114:1: ( rule__NodeClass__Group__6__Impl )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2115:2: rule__NodeClass__Group__6__Impl
+            // InternalETPhys.g:2113:1: ( rule__NodeClass__Group__6__Impl )
+            // InternalETPhys.g:2114:2: rule__NodeClass__Group__6__Impl
             {
-            pushFollow(FOLLOW_rule__NodeClass__Group__6__Impl_in_rule__NodeClass__Group__64391);
+            pushFollow(FOLLOW_2);
             rule__NodeClass__Group__6__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -6896,25 +6350,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeClass__Group__6__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2121:1: rule__NodeClass__Group__6__Impl : ( '}' ) ;
+    // InternalETPhys.g:2120:1: rule__NodeClass__Group__6__Impl : ( '}' ) ;
     public final void rule__NodeClass__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2125:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2126:1: ( '}' )
+            // InternalETPhys.g:2124:1: ( ( '}' ) )
+            // InternalETPhys.g:2125:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2126:1: ( '}' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2127:1: '}'
+            // InternalETPhys.g:2125:1: ( '}' )
+            // InternalETPhys.g:2126:1: '}'
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getNodeClassAccess().getRightCurlyBracketKeyword_6()); 
-            }
-            match(input,31,FOLLOW_31_in_rule__NodeClass__Group__6__Impl4419); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getNodeClassAccess().getRightCurlyBracketKeyword_6()); 
-            }
+             before(grammarAccess.getNodeClassAccess().getRightCurlyBracketKeyword_6()); 
+            match(input,31,FOLLOW_2); 
+             after(grammarAccess.getNodeClassAccess().getRightCurlyBracketKeyword_6()); 
 
             }
 
@@ -6937,25 +6387,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeClass__Group_4_0__0"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2154:1: rule__NodeClass__Group_4_0__0 : rule__NodeClass__Group_4_0__0__Impl rule__NodeClass__Group_4_0__1 ;
+    // InternalETPhys.g:2153:1: rule__NodeClass__Group_4_0__0 : rule__NodeClass__Group_4_0__0__Impl rule__NodeClass__Group_4_0__1 ;
     public final void rule__NodeClass__Group_4_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2158:1: ( rule__NodeClass__Group_4_0__0__Impl rule__NodeClass__Group_4_0__1 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2159:2: rule__NodeClass__Group_4_0__0__Impl rule__NodeClass__Group_4_0__1
+            // InternalETPhys.g:2157:1: ( rule__NodeClass__Group_4_0__0__Impl rule__NodeClass__Group_4_0__1 )
+            // InternalETPhys.g:2158:2: rule__NodeClass__Group_4_0__0__Impl rule__NodeClass__Group_4_0__1
             {
-            pushFollow(FOLLOW_rule__NodeClass__Group_4_0__0__Impl_in_rule__NodeClass__Group_4_0__04464);
+            pushFollow(FOLLOW_16);
             rule__NodeClass__Group_4_0__0__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__NodeClass__Group_4_0__1_in_rule__NodeClass__Group_4_0__04467);
+
+            pushFollow(FOLLOW_2);
             rule__NodeClass__Group_4_0__1();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -6975,25 +6425,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeClass__Group_4_0__0__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2166:1: rule__NodeClass__Group_4_0__0__Impl : ( 'runtime' ) ;
+    // InternalETPhys.g:2165:1: rule__NodeClass__Group_4_0__0__Impl : ( 'runtime' ) ;
     public final void rule__NodeClass__Group_4_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2170:1: ( ( 'runtime' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2171:1: ( 'runtime' )
+            // InternalETPhys.g:2169:1: ( ( 'runtime' ) )
+            // InternalETPhys.g:2170:1: ( 'runtime' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2171:1: ( 'runtime' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2172:1: 'runtime'
+            // InternalETPhys.g:2170:1: ( 'runtime' )
+            // InternalETPhys.g:2171:1: 'runtime'
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getNodeClassAccess().getRuntimeKeyword_4_0_0()); 
-            }
-            match(input,36,FOLLOW_36_in_rule__NodeClass__Group_4_0__0__Impl4495); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getNodeClassAccess().getRuntimeKeyword_4_0_0()); 
-            }
+             before(grammarAccess.getNodeClassAccess().getRuntimeKeyword_4_0_0()); 
+            match(input,36,FOLLOW_2); 
+             after(grammarAccess.getNodeClassAccess().getRuntimeKeyword_4_0_0()); 
 
             }
 
@@ -7016,25 +6462,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeClass__Group_4_0__1"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2185:1: rule__NodeClass__Group_4_0__1 : rule__NodeClass__Group_4_0__1__Impl rule__NodeClass__Group_4_0__2 ;
+    // InternalETPhys.g:2184:1: rule__NodeClass__Group_4_0__1 : rule__NodeClass__Group_4_0__1__Impl rule__NodeClass__Group_4_0__2 ;
     public final void rule__NodeClass__Group_4_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2189:1: ( rule__NodeClass__Group_4_0__1__Impl rule__NodeClass__Group_4_0__2 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2190:2: rule__NodeClass__Group_4_0__1__Impl rule__NodeClass__Group_4_0__2
+            // InternalETPhys.g:2188:1: ( rule__NodeClass__Group_4_0__1__Impl rule__NodeClass__Group_4_0__2 )
+            // InternalETPhys.g:2189:2: rule__NodeClass__Group_4_0__1__Impl rule__NodeClass__Group_4_0__2
             {
-            pushFollow(FOLLOW_rule__NodeClass__Group_4_0__1__Impl_in_rule__NodeClass__Group_4_0__14526);
+            pushFollow(FOLLOW_3);
             rule__NodeClass__Group_4_0__1__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__NodeClass__Group_4_0__2_in_rule__NodeClass__Group_4_0__14529);
+
+            pushFollow(FOLLOW_2);
             rule__NodeClass__Group_4_0__2();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -7054,25 +6500,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeClass__Group_4_0__1__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2197:1: rule__NodeClass__Group_4_0__1__Impl : ( '=' ) ;
+    // InternalETPhys.g:2196:1: rule__NodeClass__Group_4_0__1__Impl : ( '=' ) ;
     public final void rule__NodeClass__Group_4_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2201:1: ( ( '=' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2202:1: ( '=' )
+            // InternalETPhys.g:2200:1: ( ( '=' ) )
+            // InternalETPhys.g:2201:1: ( '=' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2202:1: ( '=' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2203:1: '='
+            // InternalETPhys.g:2201:1: ( '=' )
+            // InternalETPhys.g:2202:1: '='
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getNodeClassAccess().getEqualsSignKeyword_4_0_1()); 
-            }
-            match(input,37,FOLLOW_37_in_rule__NodeClass__Group_4_0__1__Impl4557); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getNodeClassAccess().getEqualsSignKeyword_4_0_1()); 
-            }
+             before(grammarAccess.getNodeClassAccess().getEqualsSignKeyword_4_0_1()); 
+            match(input,37,FOLLOW_2); 
+             after(grammarAccess.getNodeClassAccess().getEqualsSignKeyword_4_0_1()); 
 
             }
 
@@ -7095,20 +6537,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeClass__Group_4_0__2"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2216:1: rule__NodeClass__Group_4_0__2 : rule__NodeClass__Group_4_0__2__Impl ;
+    // InternalETPhys.g:2215:1: rule__NodeClass__Group_4_0__2 : rule__NodeClass__Group_4_0__2__Impl ;
     public final void rule__NodeClass__Group_4_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2220:1: ( rule__NodeClass__Group_4_0__2__Impl )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2221:2: rule__NodeClass__Group_4_0__2__Impl
+            // InternalETPhys.g:2219:1: ( rule__NodeClass__Group_4_0__2__Impl )
+            // InternalETPhys.g:2220:2: rule__NodeClass__Group_4_0__2__Impl
             {
-            pushFollow(FOLLOW_rule__NodeClass__Group_4_0__2__Impl_in_rule__NodeClass__Group_4_0__24588);
+            pushFollow(FOLLOW_2);
             rule__NodeClass__Group_4_0__2__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -7128,36 +6570,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeClass__Group_4_0__2__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2227:1: rule__NodeClass__Group_4_0__2__Impl : ( ( rule__NodeClass__RuntimeAssignment_4_0_2 ) ) ;
+    // InternalETPhys.g:2226:1: rule__NodeClass__Group_4_0__2__Impl : ( ( rule__NodeClass__RuntimeAssignment_4_0_2 ) ) ;
     public final void rule__NodeClass__Group_4_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2231:1: ( ( ( rule__NodeClass__RuntimeAssignment_4_0_2 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2232:1: ( ( rule__NodeClass__RuntimeAssignment_4_0_2 ) )
+            // InternalETPhys.g:2230:1: ( ( ( rule__NodeClass__RuntimeAssignment_4_0_2 ) ) )
+            // InternalETPhys.g:2231:1: ( ( rule__NodeClass__RuntimeAssignment_4_0_2 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2232:1: ( ( rule__NodeClass__RuntimeAssignment_4_0_2 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2233:1: ( rule__NodeClass__RuntimeAssignment_4_0_2 )
+            // InternalETPhys.g:2231:1: ( ( rule__NodeClass__RuntimeAssignment_4_0_2 ) )
+            // InternalETPhys.g:2232:1: ( rule__NodeClass__RuntimeAssignment_4_0_2 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getNodeClassAccess().getRuntimeAssignment_4_0_2()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2234:1: ( rule__NodeClass__RuntimeAssignment_4_0_2 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2234:2: rule__NodeClass__RuntimeAssignment_4_0_2
+             before(grammarAccess.getNodeClassAccess().getRuntimeAssignment_4_0_2()); 
+            // InternalETPhys.g:2233:1: ( rule__NodeClass__RuntimeAssignment_4_0_2 )
+            // InternalETPhys.g:2233:2: rule__NodeClass__RuntimeAssignment_4_0_2
             {
-            pushFollow(FOLLOW_rule__NodeClass__RuntimeAssignment_4_0_2_in_rule__NodeClass__Group_4_0__2__Impl4615);
+            pushFollow(FOLLOW_2);
             rule__NodeClass__RuntimeAssignment_4_0_2();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getNodeClassAccess().getRuntimeAssignment_4_0_2()); 
             }
 
+             after(grammarAccess.getNodeClassAccess().getRuntimeAssignment_4_0_2()); 
+
             }
 
 
@@ -7179,25 +6617,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeClass__Group_4_1__0"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2250:1: rule__NodeClass__Group_4_1__0 : rule__NodeClass__Group_4_1__0__Impl rule__NodeClass__Group_4_1__1 ;
+    // InternalETPhys.g:2249:1: rule__NodeClass__Group_4_1__0 : rule__NodeClass__Group_4_1__0__Impl rule__NodeClass__Group_4_1__1 ;
     public final void rule__NodeClass__Group_4_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2254:1: ( rule__NodeClass__Group_4_1__0__Impl rule__NodeClass__Group_4_1__1 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2255:2: rule__NodeClass__Group_4_1__0__Impl rule__NodeClass__Group_4_1__1
+            // InternalETPhys.g:2253:1: ( rule__NodeClass__Group_4_1__0__Impl rule__NodeClass__Group_4_1__1 )
+            // InternalETPhys.g:2254:2: rule__NodeClass__Group_4_1__0__Impl rule__NodeClass__Group_4_1__1
             {
-            pushFollow(FOLLOW_rule__NodeClass__Group_4_1__0__Impl_in_rule__NodeClass__Group_4_1__04651);
+            pushFollow(FOLLOW_16);
             rule__NodeClass__Group_4_1__0__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__NodeClass__Group_4_1__1_in_rule__NodeClass__Group_4_1__04654);
+
+            pushFollow(FOLLOW_2);
             rule__NodeClass__Group_4_1__1();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -7217,25 +6655,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeClass__Group_4_1__0__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2262:1: rule__NodeClass__Group_4_1__0__Impl : ( 'priomin' ) ;
+    // InternalETPhys.g:2261:1: rule__NodeClass__Group_4_1__0__Impl : ( 'priomin' ) ;
     public final void rule__NodeClass__Group_4_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2266:1: ( ( 'priomin' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2267:1: ( 'priomin' )
+            // InternalETPhys.g:2265:1: ( ( 'priomin' ) )
+            // InternalETPhys.g:2266:1: ( 'priomin' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2267:1: ( 'priomin' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2268:1: 'priomin'
+            // InternalETPhys.g:2266:1: ( 'priomin' )
+            // InternalETPhys.g:2267:1: 'priomin'
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getNodeClassAccess().getPriominKeyword_4_1_0()); 
-            }
-            match(input,38,FOLLOW_38_in_rule__NodeClass__Group_4_1__0__Impl4682); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getNodeClassAccess().getPriominKeyword_4_1_0()); 
-            }
+             before(grammarAccess.getNodeClassAccess().getPriominKeyword_4_1_0()); 
+            match(input,38,FOLLOW_2); 
+             after(grammarAccess.getNodeClassAccess().getPriominKeyword_4_1_0()); 
 
             }
 
@@ -7258,25 +6692,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeClass__Group_4_1__1"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2281:1: rule__NodeClass__Group_4_1__1 : rule__NodeClass__Group_4_1__1__Impl rule__NodeClass__Group_4_1__2 ;
+    // InternalETPhys.g:2280:1: rule__NodeClass__Group_4_1__1 : rule__NodeClass__Group_4_1__1__Impl rule__NodeClass__Group_4_1__2 ;
     public final void rule__NodeClass__Group_4_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2285:1: ( rule__NodeClass__Group_4_1__1__Impl rule__NodeClass__Group_4_1__2 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2286:2: rule__NodeClass__Group_4_1__1__Impl rule__NodeClass__Group_4_1__2
+            // InternalETPhys.g:2284:1: ( rule__NodeClass__Group_4_1__1__Impl rule__NodeClass__Group_4_1__2 )
+            // InternalETPhys.g:2285:2: rule__NodeClass__Group_4_1__1__Impl rule__NodeClass__Group_4_1__2
             {
-            pushFollow(FOLLOW_rule__NodeClass__Group_4_1__1__Impl_in_rule__NodeClass__Group_4_1__14713);
+            pushFollow(FOLLOW_17);
             rule__NodeClass__Group_4_1__1__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__NodeClass__Group_4_1__2_in_rule__NodeClass__Group_4_1__14716);
+
+            pushFollow(FOLLOW_2);
             rule__NodeClass__Group_4_1__2();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -7296,25 +6730,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeClass__Group_4_1__1__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2293:1: rule__NodeClass__Group_4_1__1__Impl : ( '=' ) ;
+    // InternalETPhys.g:2292:1: rule__NodeClass__Group_4_1__1__Impl : ( '=' ) ;
     public final void rule__NodeClass__Group_4_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2297:1: ( ( '=' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2298:1: ( '=' )
+            // InternalETPhys.g:2296:1: ( ( '=' ) )
+            // InternalETPhys.g:2297:1: ( '=' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2298:1: ( '=' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2299:1: '='
+            // InternalETPhys.g:2297:1: ( '=' )
+            // InternalETPhys.g:2298:1: '='
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getNodeClassAccess().getEqualsSignKeyword_4_1_1()); 
-            }
-            match(input,37,FOLLOW_37_in_rule__NodeClass__Group_4_1__1__Impl4744); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getNodeClassAccess().getEqualsSignKeyword_4_1_1()); 
-            }
+             before(grammarAccess.getNodeClassAccess().getEqualsSignKeyword_4_1_1()); 
+            match(input,37,FOLLOW_2); 
+             after(grammarAccess.getNodeClassAccess().getEqualsSignKeyword_4_1_1()); 
 
             }
 
@@ -7337,20 +6767,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeClass__Group_4_1__2"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2312:1: rule__NodeClass__Group_4_1__2 : rule__NodeClass__Group_4_1__2__Impl ;
+    // InternalETPhys.g:2311:1: rule__NodeClass__Group_4_1__2 : rule__NodeClass__Group_4_1__2__Impl ;
     public final void rule__NodeClass__Group_4_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2316:1: ( rule__NodeClass__Group_4_1__2__Impl )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2317:2: rule__NodeClass__Group_4_1__2__Impl
+            // InternalETPhys.g:2315:1: ( rule__NodeClass__Group_4_1__2__Impl )
+            // InternalETPhys.g:2316:2: rule__NodeClass__Group_4_1__2__Impl
             {
-            pushFollow(FOLLOW_rule__NodeClass__Group_4_1__2__Impl_in_rule__NodeClass__Group_4_1__24775);
+            pushFollow(FOLLOW_2);
             rule__NodeClass__Group_4_1__2__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -7370,36 +6800,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeClass__Group_4_1__2__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2323:1: rule__NodeClass__Group_4_1__2__Impl : ( ( rule__NodeClass__PriominAssignment_4_1_2 ) ) ;
+    // InternalETPhys.g:2322:1: rule__NodeClass__Group_4_1__2__Impl : ( ( rule__NodeClass__PriominAssignment_4_1_2 ) ) ;
     public final void rule__NodeClass__Group_4_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2327:1: ( ( ( rule__NodeClass__PriominAssignment_4_1_2 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2328:1: ( ( rule__NodeClass__PriominAssignment_4_1_2 ) )
+            // InternalETPhys.g:2326:1: ( ( ( rule__NodeClass__PriominAssignment_4_1_2 ) ) )
+            // InternalETPhys.g:2327:1: ( ( rule__NodeClass__PriominAssignment_4_1_2 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2328:1: ( ( rule__NodeClass__PriominAssignment_4_1_2 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2329:1: ( rule__NodeClass__PriominAssignment_4_1_2 )
+            // InternalETPhys.g:2327:1: ( ( rule__NodeClass__PriominAssignment_4_1_2 ) )
+            // InternalETPhys.g:2328:1: ( rule__NodeClass__PriominAssignment_4_1_2 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getNodeClassAccess().getPriominAssignment_4_1_2()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2330:1: ( rule__NodeClass__PriominAssignment_4_1_2 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2330:2: rule__NodeClass__PriominAssignment_4_1_2
+             before(grammarAccess.getNodeClassAccess().getPriominAssignment_4_1_2()); 
+            // InternalETPhys.g:2329:1: ( rule__NodeClass__PriominAssignment_4_1_2 )
+            // InternalETPhys.g:2329:2: rule__NodeClass__PriominAssignment_4_1_2
             {
-            pushFollow(FOLLOW_rule__NodeClass__PriominAssignment_4_1_2_in_rule__NodeClass__Group_4_1__2__Impl4802);
+            pushFollow(FOLLOW_2);
             rule__NodeClass__PriominAssignment_4_1_2();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getNodeClassAccess().getPriominAssignment_4_1_2()); 
             }
 
+             after(grammarAccess.getNodeClassAccess().getPriominAssignment_4_1_2()); 
+
             }
 
 
@@ -7421,25 +6847,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeClass__Group_4_2__0"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2346:1: rule__NodeClass__Group_4_2__0 : rule__NodeClass__Group_4_2__0__Impl rule__NodeClass__Group_4_2__1 ;
+    // InternalETPhys.g:2345:1: rule__NodeClass__Group_4_2__0 : rule__NodeClass__Group_4_2__0__Impl rule__NodeClass__Group_4_2__1 ;
     public final void rule__NodeClass__Group_4_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2350:1: ( rule__NodeClass__Group_4_2__0__Impl rule__NodeClass__Group_4_2__1 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2351:2: rule__NodeClass__Group_4_2__0__Impl rule__NodeClass__Group_4_2__1
+            // InternalETPhys.g:2349:1: ( rule__NodeClass__Group_4_2__0__Impl rule__NodeClass__Group_4_2__1 )
+            // InternalETPhys.g:2350:2: rule__NodeClass__Group_4_2__0__Impl rule__NodeClass__Group_4_2__1
             {
-            pushFollow(FOLLOW_rule__NodeClass__Group_4_2__0__Impl_in_rule__NodeClass__Group_4_2__04838);
+            pushFollow(FOLLOW_16);
             rule__NodeClass__Group_4_2__0__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__NodeClass__Group_4_2__1_in_rule__NodeClass__Group_4_2__04841);
+
+            pushFollow(FOLLOW_2);
             rule__NodeClass__Group_4_2__1();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -7459,25 +6885,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeClass__Group_4_2__0__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2358:1: rule__NodeClass__Group_4_2__0__Impl : ( 'priomax' ) ;
+    // InternalETPhys.g:2357:1: rule__NodeClass__Group_4_2__0__Impl : ( 'priomax' ) ;
     public final void rule__NodeClass__Group_4_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2362:1: ( ( 'priomax' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2363:1: ( 'priomax' )
+            // InternalETPhys.g:2361:1: ( ( 'priomax' ) )
+            // InternalETPhys.g:2362:1: ( 'priomax' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2363:1: ( 'priomax' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2364:1: 'priomax'
+            // InternalETPhys.g:2362:1: ( 'priomax' )
+            // InternalETPhys.g:2363:1: 'priomax'
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getNodeClassAccess().getPriomaxKeyword_4_2_0()); 
-            }
-            match(input,39,FOLLOW_39_in_rule__NodeClass__Group_4_2__0__Impl4869); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getNodeClassAccess().getPriomaxKeyword_4_2_0()); 
-            }
+             before(grammarAccess.getNodeClassAccess().getPriomaxKeyword_4_2_0()); 
+            match(input,39,FOLLOW_2); 
+             after(grammarAccess.getNodeClassAccess().getPriomaxKeyword_4_2_0()); 
 
             }
 
@@ -7500,25 +6922,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeClass__Group_4_2__1"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2377:1: rule__NodeClass__Group_4_2__1 : rule__NodeClass__Group_4_2__1__Impl rule__NodeClass__Group_4_2__2 ;
+    // InternalETPhys.g:2376:1: rule__NodeClass__Group_4_2__1 : rule__NodeClass__Group_4_2__1__Impl rule__NodeClass__Group_4_2__2 ;
     public final void rule__NodeClass__Group_4_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2381:1: ( rule__NodeClass__Group_4_2__1__Impl rule__NodeClass__Group_4_2__2 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2382:2: rule__NodeClass__Group_4_2__1__Impl rule__NodeClass__Group_4_2__2
+            // InternalETPhys.g:2380:1: ( rule__NodeClass__Group_4_2__1__Impl rule__NodeClass__Group_4_2__2 )
+            // InternalETPhys.g:2381:2: rule__NodeClass__Group_4_2__1__Impl rule__NodeClass__Group_4_2__2
             {
-            pushFollow(FOLLOW_rule__NodeClass__Group_4_2__1__Impl_in_rule__NodeClass__Group_4_2__14900);
+            pushFollow(FOLLOW_17);
             rule__NodeClass__Group_4_2__1__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__NodeClass__Group_4_2__2_in_rule__NodeClass__Group_4_2__14903);
+
+            pushFollow(FOLLOW_2);
             rule__NodeClass__Group_4_2__2();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -7538,25 +6960,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeClass__Group_4_2__1__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2389:1: rule__NodeClass__Group_4_2__1__Impl : ( '=' ) ;
+    // InternalETPhys.g:2388:1: rule__NodeClass__Group_4_2__1__Impl : ( '=' ) ;
     public final void rule__NodeClass__Group_4_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2393:1: ( ( '=' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2394:1: ( '=' )
+            // InternalETPhys.g:2392:1: ( ( '=' ) )
+            // InternalETPhys.g:2393:1: ( '=' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2394:1: ( '=' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2395:1: '='
+            // InternalETPhys.g:2393:1: ( '=' )
+            // InternalETPhys.g:2394:1: '='
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getNodeClassAccess().getEqualsSignKeyword_4_2_1()); 
-            }
-            match(input,37,FOLLOW_37_in_rule__NodeClass__Group_4_2__1__Impl4931); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getNodeClassAccess().getEqualsSignKeyword_4_2_1()); 
-            }
+             before(grammarAccess.getNodeClassAccess().getEqualsSignKeyword_4_2_1()); 
+            match(input,37,FOLLOW_2); 
+             after(grammarAccess.getNodeClassAccess().getEqualsSignKeyword_4_2_1()); 
 
             }
 
@@ -7579,20 +6997,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeClass__Group_4_2__2"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2408:1: rule__NodeClass__Group_4_2__2 : rule__NodeClass__Group_4_2__2__Impl ;
+    // InternalETPhys.g:2407:1: rule__NodeClass__Group_4_2__2 : rule__NodeClass__Group_4_2__2__Impl ;
     public final void rule__NodeClass__Group_4_2__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2412:1: ( rule__NodeClass__Group_4_2__2__Impl )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2413:2: rule__NodeClass__Group_4_2__2__Impl
+            // InternalETPhys.g:2411:1: ( rule__NodeClass__Group_4_2__2__Impl )
+            // InternalETPhys.g:2412:2: rule__NodeClass__Group_4_2__2__Impl
             {
-            pushFollow(FOLLOW_rule__NodeClass__Group_4_2__2__Impl_in_rule__NodeClass__Group_4_2__24962);
+            pushFollow(FOLLOW_2);
             rule__NodeClass__Group_4_2__2__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -7612,36 +7030,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeClass__Group_4_2__2__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2419:1: rule__NodeClass__Group_4_2__2__Impl : ( ( rule__NodeClass__PriomaxAssignment_4_2_2 ) ) ;
+    // InternalETPhys.g:2418:1: rule__NodeClass__Group_4_2__2__Impl : ( ( rule__NodeClass__PriomaxAssignment_4_2_2 ) ) ;
     public final void rule__NodeClass__Group_4_2__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2423:1: ( ( ( rule__NodeClass__PriomaxAssignment_4_2_2 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2424:1: ( ( rule__NodeClass__PriomaxAssignment_4_2_2 ) )
+            // InternalETPhys.g:2422:1: ( ( ( rule__NodeClass__PriomaxAssignment_4_2_2 ) ) )
+            // InternalETPhys.g:2423:1: ( ( rule__NodeClass__PriomaxAssignment_4_2_2 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2424:1: ( ( rule__NodeClass__PriomaxAssignment_4_2_2 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2425:1: ( rule__NodeClass__PriomaxAssignment_4_2_2 )
+            // InternalETPhys.g:2423:1: ( ( rule__NodeClass__PriomaxAssignment_4_2_2 ) )
+            // InternalETPhys.g:2424:1: ( rule__NodeClass__PriomaxAssignment_4_2_2 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getNodeClassAccess().getPriomaxAssignment_4_2_2()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2426:1: ( rule__NodeClass__PriomaxAssignment_4_2_2 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2426:2: rule__NodeClass__PriomaxAssignment_4_2_2
+             before(grammarAccess.getNodeClassAccess().getPriomaxAssignment_4_2_2()); 
+            // InternalETPhys.g:2425:1: ( rule__NodeClass__PriomaxAssignment_4_2_2 )
+            // InternalETPhys.g:2425:2: rule__NodeClass__PriomaxAssignment_4_2_2
             {
-            pushFollow(FOLLOW_rule__NodeClass__PriomaxAssignment_4_2_2_in_rule__NodeClass__Group_4_2__2__Impl4989);
+            pushFollow(FOLLOW_2);
             rule__NodeClass__PriomaxAssignment_4_2_2();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getNodeClassAccess().getPriomaxAssignment_4_2_2()); 
             }
 
+             after(grammarAccess.getNodeClassAccess().getPriomaxAssignment_4_2_2()); 
+
             }
 
 
@@ -7663,25 +7077,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__Group__0"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2442:1: rule__PhysicalThread__Group__0 : rule__PhysicalThread__Group__0__Impl rule__PhysicalThread__Group__1 ;
+    // InternalETPhys.g:2441:1: rule__PhysicalThread__Group__0 : rule__PhysicalThread__Group__0__Impl rule__PhysicalThread__Group__1 ;
     public final void rule__PhysicalThread__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2446:1: ( rule__PhysicalThread__Group__0__Impl rule__PhysicalThread__Group__1 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2447:2: rule__PhysicalThread__Group__0__Impl rule__PhysicalThread__Group__1
+            // InternalETPhys.g:2445:1: ( rule__PhysicalThread__Group__0__Impl rule__PhysicalThread__Group__1 )
+            // InternalETPhys.g:2446:2: rule__PhysicalThread__Group__0__Impl rule__PhysicalThread__Group__1
             {
-            pushFollow(FOLLOW_rule__PhysicalThread__Group__0__Impl_in_rule__PhysicalThread__Group__05025);
+            pushFollow(FOLLOW_3);
             rule__PhysicalThread__Group__0__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__PhysicalThread__Group__1_in_rule__PhysicalThread__Group__05028);
+
+            pushFollow(FOLLOW_2);
             rule__PhysicalThread__Group__1();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -7701,36 +7115,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__Group__0__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2454:1: rule__PhysicalThread__Group__0__Impl : ( ( rule__PhysicalThread__Alternatives_0 ) ) ;
+    // InternalETPhys.g:2453:1: rule__PhysicalThread__Group__0__Impl : ( ( rule__PhysicalThread__Alternatives_0 ) ) ;
     public final void rule__PhysicalThread__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2458:1: ( ( ( rule__PhysicalThread__Alternatives_0 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2459:1: ( ( rule__PhysicalThread__Alternatives_0 ) )
+            // InternalETPhys.g:2457:1: ( ( ( rule__PhysicalThread__Alternatives_0 ) ) )
+            // InternalETPhys.g:2458:1: ( ( rule__PhysicalThread__Alternatives_0 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2459:1: ( ( rule__PhysicalThread__Alternatives_0 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2460:1: ( rule__PhysicalThread__Alternatives_0 )
+            // InternalETPhys.g:2458:1: ( ( rule__PhysicalThread__Alternatives_0 ) )
+            // InternalETPhys.g:2459:1: ( rule__PhysicalThread__Alternatives_0 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalThreadAccess().getAlternatives_0()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2461:1: ( rule__PhysicalThread__Alternatives_0 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2461:2: rule__PhysicalThread__Alternatives_0
+             before(grammarAccess.getPhysicalThreadAccess().getAlternatives_0()); 
+            // InternalETPhys.g:2460:1: ( rule__PhysicalThread__Alternatives_0 )
+            // InternalETPhys.g:2460:2: rule__PhysicalThread__Alternatives_0
             {
-            pushFollow(FOLLOW_rule__PhysicalThread__Alternatives_0_in_rule__PhysicalThread__Group__0__Impl5055);
+            pushFollow(FOLLOW_2);
             rule__PhysicalThread__Alternatives_0();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalThreadAccess().getAlternatives_0()); 
             }
 
+             after(grammarAccess.getPhysicalThreadAccess().getAlternatives_0()); 
+
             }
 
 
@@ -7752,25 +7162,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__Group__1"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2471:1: rule__PhysicalThread__Group__1 : rule__PhysicalThread__Group__1__Impl rule__PhysicalThread__Group__2 ;
+    // InternalETPhys.g:2470:1: rule__PhysicalThread__Group__1 : rule__PhysicalThread__Group__1__Impl rule__PhysicalThread__Group__2 ;
     public final void rule__PhysicalThread__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2475:1: ( rule__PhysicalThread__Group__1__Impl rule__PhysicalThread__Group__2 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2476:2: rule__PhysicalThread__Group__1__Impl rule__PhysicalThread__Group__2
+            // InternalETPhys.g:2474:1: ( rule__PhysicalThread__Group__1__Impl rule__PhysicalThread__Group__2 )
+            // InternalETPhys.g:2475:2: rule__PhysicalThread__Group__1__Impl rule__PhysicalThread__Group__2
             {
-            pushFollow(FOLLOW_rule__PhysicalThread__Group__1__Impl_in_rule__PhysicalThread__Group__15085);
+            pushFollow(FOLLOW_4);
             rule__PhysicalThread__Group__1__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__PhysicalThread__Group__2_in_rule__PhysicalThread__Group__15088);
+
+            pushFollow(FOLLOW_2);
             rule__PhysicalThread__Group__2();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -7790,36 +7200,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__Group__1__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2483:1: rule__PhysicalThread__Group__1__Impl : ( ( rule__PhysicalThread__NameAssignment_1 ) ) ;
+    // InternalETPhys.g:2482:1: rule__PhysicalThread__Group__1__Impl : ( ( rule__PhysicalThread__NameAssignment_1 ) ) ;
     public final void rule__PhysicalThread__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2487:1: ( ( ( rule__PhysicalThread__NameAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2488:1: ( ( rule__PhysicalThread__NameAssignment_1 ) )
+            // InternalETPhys.g:2486:1: ( ( ( rule__PhysicalThread__NameAssignment_1 ) ) )
+            // InternalETPhys.g:2487:1: ( ( rule__PhysicalThread__NameAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2488:1: ( ( rule__PhysicalThread__NameAssignment_1 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2489:1: ( rule__PhysicalThread__NameAssignment_1 )
+            // InternalETPhys.g:2487:1: ( ( rule__PhysicalThread__NameAssignment_1 ) )
+            // InternalETPhys.g:2488:1: ( rule__PhysicalThread__NameAssignment_1 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalThreadAccess().getNameAssignment_1()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2490:1: ( rule__PhysicalThread__NameAssignment_1 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2490:2: rule__PhysicalThread__NameAssignment_1
+             before(grammarAccess.getPhysicalThreadAccess().getNameAssignment_1()); 
+            // InternalETPhys.g:2489:1: ( rule__PhysicalThread__NameAssignment_1 )
+            // InternalETPhys.g:2489:2: rule__PhysicalThread__NameAssignment_1
             {
-            pushFollow(FOLLOW_rule__PhysicalThread__NameAssignment_1_in_rule__PhysicalThread__Group__1__Impl5115);
+            pushFollow(FOLLOW_2);
             rule__PhysicalThread__NameAssignment_1();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalThreadAccess().getNameAssignment_1()); 
             }
 
+             after(grammarAccess.getPhysicalThreadAccess().getNameAssignment_1()); 
+
             }
 
 
@@ -7841,25 +7247,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__Group__2"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2500:1: rule__PhysicalThread__Group__2 : rule__PhysicalThread__Group__2__Impl rule__PhysicalThread__Group__3 ;
+    // InternalETPhys.g:2499:1: rule__PhysicalThread__Group__2 : rule__PhysicalThread__Group__2__Impl rule__PhysicalThread__Group__3 ;
     public final void rule__PhysicalThread__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2504:1: ( rule__PhysicalThread__Group__2__Impl rule__PhysicalThread__Group__3 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2505:2: rule__PhysicalThread__Group__2__Impl rule__PhysicalThread__Group__3
+            // InternalETPhys.g:2503:1: ( rule__PhysicalThread__Group__2__Impl rule__PhysicalThread__Group__3 )
+            // InternalETPhys.g:2504:2: rule__PhysicalThread__Group__2__Impl rule__PhysicalThread__Group__3
             {
-            pushFollow(FOLLOW_rule__PhysicalThread__Group__2__Impl_in_rule__PhysicalThread__Group__25145);
+            pushFollow(FOLLOW_18);
             rule__PhysicalThread__Group__2__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__PhysicalThread__Group__3_in_rule__PhysicalThread__Group__25148);
+
+            pushFollow(FOLLOW_2);
             rule__PhysicalThread__Group__3();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -7879,25 +7285,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__Group__2__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2512:1: rule__PhysicalThread__Group__2__Impl : ( '{' ) ;
+    // InternalETPhys.g:2511:1: rule__PhysicalThread__Group__2__Impl : ( '{' ) ;
     public final void rule__PhysicalThread__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2516:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2517:1: ( '{' )
+            // InternalETPhys.g:2515:1: ( ( '{' ) )
+            // InternalETPhys.g:2516:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2517:1: ( '{' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2518:1: '{'
+            // InternalETPhys.g:2516:1: ( '{' )
+            // InternalETPhys.g:2517:1: '{'
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalThreadAccess().getLeftCurlyBracketKeyword_2()); 
-            }
-            match(input,30,FOLLOW_30_in_rule__PhysicalThread__Group__2__Impl5176); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalThreadAccess().getLeftCurlyBracketKeyword_2()); 
-            }
+             before(grammarAccess.getPhysicalThreadAccess().getLeftCurlyBracketKeyword_2()); 
+            match(input,30,FOLLOW_2); 
+             after(grammarAccess.getPhysicalThreadAccess().getLeftCurlyBracketKeyword_2()); 
 
             }
 
@@ -7920,25 +7322,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__Group__3"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2531:1: rule__PhysicalThread__Group__3 : rule__PhysicalThread__Group__3__Impl rule__PhysicalThread__Group__4 ;
+    // InternalETPhys.g:2530:1: rule__PhysicalThread__Group__3 : rule__PhysicalThread__Group__3__Impl rule__PhysicalThread__Group__4 ;
     public final void rule__PhysicalThread__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2535:1: ( rule__PhysicalThread__Group__3__Impl rule__PhysicalThread__Group__4 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2536:2: rule__PhysicalThread__Group__3__Impl rule__PhysicalThread__Group__4
+            // InternalETPhys.g:2534:1: ( rule__PhysicalThread__Group__3__Impl rule__PhysicalThread__Group__4 )
+            // InternalETPhys.g:2535:2: rule__PhysicalThread__Group__3__Impl rule__PhysicalThread__Group__4
             {
-            pushFollow(FOLLOW_rule__PhysicalThread__Group__3__Impl_in_rule__PhysicalThread__Group__35207);
+            pushFollow(FOLLOW_19);
             rule__PhysicalThread__Group__3__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__PhysicalThread__Group__4_in_rule__PhysicalThread__Group__35210);
+
+            pushFollow(FOLLOW_2);
             rule__PhysicalThread__Group__4();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -7958,36 +7360,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__Group__3__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2543:1: rule__PhysicalThread__Group__3__Impl : ( ( rule__PhysicalThread__UnorderedGroup_3 ) ) ;
+    // InternalETPhys.g:2542:1: rule__PhysicalThread__Group__3__Impl : ( ( rule__PhysicalThread__UnorderedGroup_3 ) ) ;
     public final void rule__PhysicalThread__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2547:1: ( ( ( rule__PhysicalThread__UnorderedGroup_3 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2548:1: ( ( rule__PhysicalThread__UnorderedGroup_3 ) )
+            // InternalETPhys.g:2546:1: ( ( ( rule__PhysicalThread__UnorderedGroup_3 ) ) )
+            // InternalETPhys.g:2547:1: ( ( rule__PhysicalThread__UnorderedGroup_3 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2548:1: ( ( rule__PhysicalThread__UnorderedGroup_3 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2549:1: ( rule__PhysicalThread__UnorderedGroup_3 )
+            // InternalETPhys.g:2547:1: ( ( rule__PhysicalThread__UnorderedGroup_3 ) )
+            // InternalETPhys.g:2548:1: ( rule__PhysicalThread__UnorderedGroup_3 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2550:1: ( rule__PhysicalThread__UnorderedGroup_3 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2550:2: rule__PhysicalThread__UnorderedGroup_3
+             before(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3()); 
+            // InternalETPhys.g:2549:1: ( rule__PhysicalThread__UnorderedGroup_3 )
+            // InternalETPhys.g:2549:2: rule__PhysicalThread__UnorderedGroup_3
             {
-            pushFollow(FOLLOW_rule__PhysicalThread__UnorderedGroup_3_in_rule__PhysicalThread__Group__3__Impl5237);
+            pushFollow(FOLLOW_2);
             rule__PhysicalThread__UnorderedGroup_3();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3()); 
             }
 
+             after(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3()); 
+
             }
 
 
@@ -8009,20 +7407,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__Group__4"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2560:1: rule__PhysicalThread__Group__4 : rule__PhysicalThread__Group__4__Impl ;
+    // InternalETPhys.g:2559:1: rule__PhysicalThread__Group__4 : rule__PhysicalThread__Group__4__Impl ;
     public final void rule__PhysicalThread__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2564:1: ( rule__PhysicalThread__Group__4__Impl )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2565:2: rule__PhysicalThread__Group__4__Impl
+            // InternalETPhys.g:2563:1: ( rule__PhysicalThread__Group__4__Impl )
+            // InternalETPhys.g:2564:2: rule__PhysicalThread__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__PhysicalThread__Group__4__Impl_in_rule__PhysicalThread__Group__45267);
+            pushFollow(FOLLOW_2);
             rule__PhysicalThread__Group__4__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -8042,25 +7440,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__Group__4__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2571:1: rule__PhysicalThread__Group__4__Impl : ( '}' ) ;
+    // InternalETPhys.g:2570:1: rule__PhysicalThread__Group__4__Impl : ( '}' ) ;
     public final void rule__PhysicalThread__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2575:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2576:1: ( '}' )
+            // InternalETPhys.g:2574:1: ( ( '}' ) )
+            // InternalETPhys.g:2575:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2576:1: ( '}' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2577:1: '}'
+            // InternalETPhys.g:2575:1: ( '}' )
+            // InternalETPhys.g:2576:1: '}'
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalThreadAccess().getRightCurlyBracketKeyword_4()); 
-            }
-            match(input,31,FOLLOW_31_in_rule__PhysicalThread__Group__4__Impl5295); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalThreadAccess().getRightCurlyBracketKeyword_4()); 
-            }
+             before(grammarAccess.getPhysicalThreadAccess().getRightCurlyBracketKeyword_4()); 
+            match(input,31,FOLLOW_2); 
+             after(grammarAccess.getPhysicalThreadAccess().getRightCurlyBracketKeyword_4()); 
 
             }
 
@@ -8083,25 +7477,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__Group_3_0__0"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2600:1: rule__PhysicalThread__Group_3_0__0 : rule__PhysicalThread__Group_3_0__0__Impl rule__PhysicalThread__Group_3_0__1 ;
+    // InternalETPhys.g:2599:1: rule__PhysicalThread__Group_3_0__0 : rule__PhysicalThread__Group_3_0__0__Impl rule__PhysicalThread__Group_3_0__1 ;
     public final void rule__PhysicalThread__Group_3_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2604:1: ( rule__PhysicalThread__Group_3_0__0__Impl rule__PhysicalThread__Group_3_0__1 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2605:2: rule__PhysicalThread__Group_3_0__0__Impl rule__PhysicalThread__Group_3_0__1
+            // InternalETPhys.g:2603:1: ( rule__PhysicalThread__Group_3_0__0__Impl rule__PhysicalThread__Group_3_0__1 )
+            // InternalETPhys.g:2604:2: rule__PhysicalThread__Group_3_0__0__Impl rule__PhysicalThread__Group_3_0__1
             {
-            pushFollow(FOLLOW_rule__PhysicalThread__Group_3_0__0__Impl_in_rule__PhysicalThread__Group_3_0__05336);
+            pushFollow(FOLLOW_16);
             rule__PhysicalThread__Group_3_0__0__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__PhysicalThread__Group_3_0__1_in_rule__PhysicalThread__Group_3_0__05339);
+
+            pushFollow(FOLLOW_2);
             rule__PhysicalThread__Group_3_0__1();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -8121,25 +7515,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__Group_3_0__0__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2612:1: rule__PhysicalThread__Group_3_0__0__Impl : ( 'execmode' ) ;
+    // InternalETPhys.g:2611:1: rule__PhysicalThread__Group_3_0__0__Impl : ( 'execmode' ) ;
     public final void rule__PhysicalThread__Group_3_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2616:1: ( ( 'execmode' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2617:1: ( 'execmode' )
+            // InternalETPhys.g:2615:1: ( ( 'execmode' ) )
+            // InternalETPhys.g:2616:1: ( 'execmode' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2617:1: ( 'execmode' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2618:1: 'execmode'
+            // InternalETPhys.g:2616:1: ( 'execmode' )
+            // InternalETPhys.g:2617:1: 'execmode'
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalThreadAccess().getExecmodeKeyword_3_0_0()); 
-            }
-            match(input,40,FOLLOW_40_in_rule__PhysicalThread__Group_3_0__0__Impl5367); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalThreadAccess().getExecmodeKeyword_3_0_0()); 
-            }
+             before(grammarAccess.getPhysicalThreadAccess().getExecmodeKeyword_3_0_0()); 
+            match(input,40,FOLLOW_2); 
+             after(grammarAccess.getPhysicalThreadAccess().getExecmodeKeyword_3_0_0()); 
 
             }
 
@@ -8162,25 +7552,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__Group_3_0__1"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2631:1: rule__PhysicalThread__Group_3_0__1 : rule__PhysicalThread__Group_3_0__1__Impl rule__PhysicalThread__Group_3_0__2 ;
+    // InternalETPhys.g:2630:1: rule__PhysicalThread__Group_3_0__1 : rule__PhysicalThread__Group_3_0__1__Impl rule__PhysicalThread__Group_3_0__2 ;
     public final void rule__PhysicalThread__Group_3_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2635:1: ( rule__PhysicalThread__Group_3_0__1__Impl rule__PhysicalThread__Group_3_0__2 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2636:2: rule__PhysicalThread__Group_3_0__1__Impl rule__PhysicalThread__Group_3_0__2
+            // InternalETPhys.g:2634:1: ( rule__PhysicalThread__Group_3_0__1__Impl rule__PhysicalThread__Group_3_0__2 )
+            // InternalETPhys.g:2635:2: rule__PhysicalThread__Group_3_0__1__Impl rule__PhysicalThread__Group_3_0__2
             {
-            pushFollow(FOLLOW_rule__PhysicalThread__Group_3_0__1__Impl_in_rule__PhysicalThread__Group_3_0__15398);
+            pushFollow(FOLLOW_20);
             rule__PhysicalThread__Group_3_0__1__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__PhysicalThread__Group_3_0__2_in_rule__PhysicalThread__Group_3_0__15401);
+
+            pushFollow(FOLLOW_2);
             rule__PhysicalThread__Group_3_0__2();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -8200,25 +7590,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__Group_3_0__1__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2643:1: rule__PhysicalThread__Group_3_0__1__Impl : ( '=' ) ;
+    // InternalETPhys.g:2642:1: rule__PhysicalThread__Group_3_0__1__Impl : ( '=' ) ;
     public final void rule__PhysicalThread__Group_3_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2647:1: ( ( '=' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2648:1: ( '=' )
+            // InternalETPhys.g:2646:1: ( ( '=' ) )
+            // InternalETPhys.g:2647:1: ( '=' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2648:1: ( '=' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2649:1: '='
+            // InternalETPhys.g:2647:1: ( '=' )
+            // InternalETPhys.g:2648:1: '='
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalThreadAccess().getEqualsSignKeyword_3_0_1()); 
-            }
-            match(input,37,FOLLOW_37_in_rule__PhysicalThread__Group_3_0__1__Impl5429); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalThreadAccess().getEqualsSignKeyword_3_0_1()); 
-            }
+             before(grammarAccess.getPhysicalThreadAccess().getEqualsSignKeyword_3_0_1()); 
+            match(input,37,FOLLOW_2); 
+             after(grammarAccess.getPhysicalThreadAccess().getEqualsSignKeyword_3_0_1()); 
 
             }
 
@@ -8241,20 +7627,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__Group_3_0__2"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2662:1: rule__PhysicalThread__Group_3_0__2 : rule__PhysicalThread__Group_3_0__2__Impl ;
+    // InternalETPhys.g:2661:1: rule__PhysicalThread__Group_3_0__2 : rule__PhysicalThread__Group_3_0__2__Impl ;
     public final void rule__PhysicalThread__Group_3_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2666:1: ( rule__PhysicalThread__Group_3_0__2__Impl )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2667:2: rule__PhysicalThread__Group_3_0__2__Impl
+            // InternalETPhys.g:2665:1: ( rule__PhysicalThread__Group_3_0__2__Impl )
+            // InternalETPhys.g:2666:2: rule__PhysicalThread__Group_3_0__2__Impl
             {
-            pushFollow(FOLLOW_rule__PhysicalThread__Group_3_0__2__Impl_in_rule__PhysicalThread__Group_3_0__25460);
+            pushFollow(FOLLOW_2);
             rule__PhysicalThread__Group_3_0__2__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -8274,36 +7660,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__Group_3_0__2__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2673:1: rule__PhysicalThread__Group_3_0__2__Impl : ( ( rule__PhysicalThread__ExecmodeAssignment_3_0_2 ) ) ;
+    // InternalETPhys.g:2672:1: rule__PhysicalThread__Group_3_0__2__Impl : ( ( rule__PhysicalThread__ExecmodeAssignment_3_0_2 ) ) ;
     public final void rule__PhysicalThread__Group_3_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2677:1: ( ( ( rule__PhysicalThread__ExecmodeAssignment_3_0_2 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2678:1: ( ( rule__PhysicalThread__ExecmodeAssignment_3_0_2 ) )
+            // InternalETPhys.g:2676:1: ( ( ( rule__PhysicalThread__ExecmodeAssignment_3_0_2 ) ) )
+            // InternalETPhys.g:2677:1: ( ( rule__PhysicalThread__ExecmodeAssignment_3_0_2 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2678:1: ( ( rule__PhysicalThread__ExecmodeAssignment_3_0_2 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2679:1: ( rule__PhysicalThread__ExecmodeAssignment_3_0_2 )
+            // InternalETPhys.g:2677:1: ( ( rule__PhysicalThread__ExecmodeAssignment_3_0_2 ) )
+            // InternalETPhys.g:2678:1: ( rule__PhysicalThread__ExecmodeAssignment_3_0_2 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalThreadAccess().getExecmodeAssignment_3_0_2()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2680:1: ( rule__PhysicalThread__ExecmodeAssignment_3_0_2 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2680:2: rule__PhysicalThread__ExecmodeAssignment_3_0_2
+             before(grammarAccess.getPhysicalThreadAccess().getExecmodeAssignment_3_0_2()); 
+            // InternalETPhys.g:2679:1: ( rule__PhysicalThread__ExecmodeAssignment_3_0_2 )
+            // InternalETPhys.g:2679:2: rule__PhysicalThread__ExecmodeAssignment_3_0_2
             {
-            pushFollow(FOLLOW_rule__PhysicalThread__ExecmodeAssignment_3_0_2_in_rule__PhysicalThread__Group_3_0__2__Impl5487);
+            pushFollow(FOLLOW_2);
             rule__PhysicalThread__ExecmodeAssignment_3_0_2();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalThreadAccess().getExecmodeAssignment_3_0_2()); 
             }
 
+             after(grammarAccess.getPhysicalThreadAccess().getExecmodeAssignment_3_0_2()); 
+
             }
 
 
@@ -8325,25 +7707,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__Group_3_1__0"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2696:1: rule__PhysicalThread__Group_3_1__0 : rule__PhysicalThread__Group_3_1__0__Impl rule__PhysicalThread__Group_3_1__1 ;
+    // InternalETPhys.g:2695:1: rule__PhysicalThread__Group_3_1__0 : rule__PhysicalThread__Group_3_1__0__Impl rule__PhysicalThread__Group_3_1__1 ;
     public final void rule__PhysicalThread__Group_3_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2700:1: ( rule__PhysicalThread__Group_3_1__0__Impl rule__PhysicalThread__Group_3_1__1 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2701:2: rule__PhysicalThread__Group_3_1__0__Impl rule__PhysicalThread__Group_3_1__1
+            // InternalETPhys.g:2699:1: ( rule__PhysicalThread__Group_3_1__0__Impl rule__PhysicalThread__Group_3_1__1 )
+            // InternalETPhys.g:2700:2: rule__PhysicalThread__Group_3_1__0__Impl rule__PhysicalThread__Group_3_1__1
             {
-            pushFollow(FOLLOW_rule__PhysicalThread__Group_3_1__0__Impl_in_rule__PhysicalThread__Group_3_1__05523);
+            pushFollow(FOLLOW_16);
             rule__PhysicalThread__Group_3_1__0__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__PhysicalThread__Group_3_1__1_in_rule__PhysicalThread__Group_3_1__05526);
+
+            pushFollow(FOLLOW_2);
             rule__PhysicalThread__Group_3_1__1();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -8363,25 +7745,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__Group_3_1__0__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2708:1: rule__PhysicalThread__Group_3_1__0__Impl : ( 'interval' ) ;
+    // InternalETPhys.g:2707:1: rule__PhysicalThread__Group_3_1__0__Impl : ( 'interval' ) ;
     public final void rule__PhysicalThread__Group_3_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2712:1: ( ( 'interval' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2713:1: ( 'interval' )
+            // InternalETPhys.g:2711:1: ( ( 'interval' ) )
+            // InternalETPhys.g:2712:1: ( 'interval' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2713:1: ( 'interval' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2714:1: 'interval'
+            // InternalETPhys.g:2712:1: ( 'interval' )
+            // InternalETPhys.g:2713:1: 'interval'
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalThreadAccess().getIntervalKeyword_3_1_0()); 
-            }
-            match(input,41,FOLLOW_41_in_rule__PhysicalThread__Group_3_1__0__Impl5554); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalThreadAccess().getIntervalKeyword_3_1_0()); 
-            }
+             before(grammarAccess.getPhysicalThreadAccess().getIntervalKeyword_3_1_0()); 
+            match(input,41,FOLLOW_2); 
+             after(grammarAccess.getPhysicalThreadAccess().getIntervalKeyword_3_1_0()); 
 
             }
 
@@ -8404,25 +7782,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__Group_3_1__1"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2727:1: rule__PhysicalThread__Group_3_1__1 : rule__PhysicalThread__Group_3_1__1__Impl rule__PhysicalThread__Group_3_1__2 ;
+    // InternalETPhys.g:2726:1: rule__PhysicalThread__Group_3_1__1 : rule__PhysicalThread__Group_3_1__1__Impl rule__PhysicalThread__Group_3_1__2 ;
     public final void rule__PhysicalThread__Group_3_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2731:1: ( rule__PhysicalThread__Group_3_1__1__Impl rule__PhysicalThread__Group_3_1__2 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2732:2: rule__PhysicalThread__Group_3_1__1__Impl rule__PhysicalThread__Group_3_1__2
+            // InternalETPhys.g:2730:1: ( rule__PhysicalThread__Group_3_1__1__Impl rule__PhysicalThread__Group_3_1__2 )
+            // InternalETPhys.g:2731:2: rule__PhysicalThread__Group_3_1__1__Impl rule__PhysicalThread__Group_3_1__2
             {
-            pushFollow(FOLLOW_rule__PhysicalThread__Group_3_1__1__Impl_in_rule__PhysicalThread__Group_3_1__15585);
+            pushFollow(FOLLOW_21);
             rule__PhysicalThread__Group_3_1__1__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__PhysicalThread__Group_3_1__2_in_rule__PhysicalThread__Group_3_1__15588);
+
+            pushFollow(FOLLOW_2);
             rule__PhysicalThread__Group_3_1__2();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -8442,25 +7820,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__Group_3_1__1__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2739:1: rule__PhysicalThread__Group_3_1__1__Impl : ( '=' ) ;
+    // InternalETPhys.g:2738:1: rule__PhysicalThread__Group_3_1__1__Impl : ( '=' ) ;
     public final void rule__PhysicalThread__Group_3_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2743:1: ( ( '=' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2744:1: ( '=' )
+            // InternalETPhys.g:2742:1: ( ( '=' ) )
+            // InternalETPhys.g:2743:1: ( '=' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2744:1: ( '=' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2745:1: '='
+            // InternalETPhys.g:2743:1: ( '=' )
+            // InternalETPhys.g:2744:1: '='
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalThreadAccess().getEqualsSignKeyword_3_1_1()); 
-            }
-            match(input,37,FOLLOW_37_in_rule__PhysicalThread__Group_3_1__1__Impl5616); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalThreadAccess().getEqualsSignKeyword_3_1_1()); 
-            }
+             before(grammarAccess.getPhysicalThreadAccess().getEqualsSignKeyword_3_1_1()); 
+            match(input,37,FOLLOW_2); 
+             after(grammarAccess.getPhysicalThreadAccess().getEqualsSignKeyword_3_1_1()); 
 
             }
 
@@ -8483,20 +7857,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__Group_3_1__2"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2758:1: rule__PhysicalThread__Group_3_1__2 : rule__PhysicalThread__Group_3_1__2__Impl ;
+    // InternalETPhys.g:2757:1: rule__PhysicalThread__Group_3_1__2 : rule__PhysicalThread__Group_3_1__2__Impl ;
     public final void rule__PhysicalThread__Group_3_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2762:1: ( rule__PhysicalThread__Group_3_1__2__Impl )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2763:2: rule__PhysicalThread__Group_3_1__2__Impl
+            // InternalETPhys.g:2761:1: ( rule__PhysicalThread__Group_3_1__2__Impl )
+            // InternalETPhys.g:2762:2: rule__PhysicalThread__Group_3_1__2__Impl
             {
-            pushFollow(FOLLOW_rule__PhysicalThread__Group_3_1__2__Impl_in_rule__PhysicalThread__Group_3_1__25647);
+            pushFollow(FOLLOW_2);
             rule__PhysicalThread__Group_3_1__2__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -8516,36 +7890,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__Group_3_1__2__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2769:1: rule__PhysicalThread__Group_3_1__2__Impl : ( ( rule__PhysicalThread__TimeAssignment_3_1_2 ) ) ;
+    // InternalETPhys.g:2768:1: rule__PhysicalThread__Group_3_1__2__Impl : ( ( rule__PhysicalThread__TimeAssignment_3_1_2 ) ) ;
     public final void rule__PhysicalThread__Group_3_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2773:1: ( ( ( rule__PhysicalThread__TimeAssignment_3_1_2 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2774:1: ( ( rule__PhysicalThread__TimeAssignment_3_1_2 ) )
+            // InternalETPhys.g:2772:1: ( ( ( rule__PhysicalThread__TimeAssignment_3_1_2 ) ) )
+            // InternalETPhys.g:2773:1: ( ( rule__PhysicalThread__TimeAssignment_3_1_2 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2774:1: ( ( rule__PhysicalThread__TimeAssignment_3_1_2 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2775:1: ( rule__PhysicalThread__TimeAssignment_3_1_2 )
+            // InternalETPhys.g:2773:1: ( ( rule__PhysicalThread__TimeAssignment_3_1_2 ) )
+            // InternalETPhys.g:2774:1: ( rule__PhysicalThread__TimeAssignment_3_1_2 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalThreadAccess().getTimeAssignment_3_1_2()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2776:1: ( rule__PhysicalThread__TimeAssignment_3_1_2 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2776:2: rule__PhysicalThread__TimeAssignment_3_1_2
+             before(grammarAccess.getPhysicalThreadAccess().getTimeAssignment_3_1_2()); 
+            // InternalETPhys.g:2775:1: ( rule__PhysicalThread__TimeAssignment_3_1_2 )
+            // InternalETPhys.g:2775:2: rule__PhysicalThread__TimeAssignment_3_1_2
             {
-            pushFollow(FOLLOW_rule__PhysicalThread__TimeAssignment_3_1_2_in_rule__PhysicalThread__Group_3_1__2__Impl5674);
+            pushFollow(FOLLOW_2);
             rule__PhysicalThread__TimeAssignment_3_1_2();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalThreadAccess().getTimeAssignment_3_1_2()); 
             }
 
+             after(grammarAccess.getPhysicalThreadAccess().getTimeAssignment_3_1_2()); 
+
             }
 
 
@@ -8567,25 +7937,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__Group_3_2__0"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2792:1: rule__PhysicalThread__Group_3_2__0 : rule__PhysicalThread__Group_3_2__0__Impl rule__PhysicalThread__Group_3_2__1 ;
+    // InternalETPhys.g:2791:1: rule__PhysicalThread__Group_3_2__0 : rule__PhysicalThread__Group_3_2__0__Impl rule__PhysicalThread__Group_3_2__1 ;
     public final void rule__PhysicalThread__Group_3_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2796:1: ( rule__PhysicalThread__Group_3_2__0__Impl rule__PhysicalThread__Group_3_2__1 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2797:2: rule__PhysicalThread__Group_3_2__0__Impl rule__PhysicalThread__Group_3_2__1
+            // InternalETPhys.g:2795:1: ( rule__PhysicalThread__Group_3_2__0__Impl rule__PhysicalThread__Group_3_2__1 )
+            // InternalETPhys.g:2796:2: rule__PhysicalThread__Group_3_2__0__Impl rule__PhysicalThread__Group_3_2__1
             {
-            pushFollow(FOLLOW_rule__PhysicalThread__Group_3_2__0__Impl_in_rule__PhysicalThread__Group_3_2__05710);
+            pushFollow(FOLLOW_16);
             rule__PhysicalThread__Group_3_2__0__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__PhysicalThread__Group_3_2__1_in_rule__PhysicalThread__Group_3_2__05713);
+
+            pushFollow(FOLLOW_2);
             rule__PhysicalThread__Group_3_2__1();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -8605,25 +7975,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__Group_3_2__0__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2804:1: rule__PhysicalThread__Group_3_2__0__Impl : ( 'prio' ) ;
+    // InternalETPhys.g:2803:1: rule__PhysicalThread__Group_3_2__0__Impl : ( 'prio' ) ;
     public final void rule__PhysicalThread__Group_3_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2808:1: ( ( 'prio' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2809:1: ( 'prio' )
+            // InternalETPhys.g:2807:1: ( ( 'prio' ) )
+            // InternalETPhys.g:2808:1: ( 'prio' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2809:1: ( 'prio' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2810:1: 'prio'
+            // InternalETPhys.g:2808:1: ( 'prio' )
+            // InternalETPhys.g:2809:1: 'prio'
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalThreadAccess().getPrioKeyword_3_2_0()); 
-            }
-            match(input,42,FOLLOW_42_in_rule__PhysicalThread__Group_3_2__0__Impl5741); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalThreadAccess().getPrioKeyword_3_2_0()); 
-            }
+             before(grammarAccess.getPhysicalThreadAccess().getPrioKeyword_3_2_0()); 
+            match(input,42,FOLLOW_2); 
+             after(grammarAccess.getPhysicalThreadAccess().getPrioKeyword_3_2_0()); 
 
             }
 
@@ -8646,25 +8012,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__Group_3_2__1"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2823:1: rule__PhysicalThread__Group_3_2__1 : rule__PhysicalThread__Group_3_2__1__Impl rule__PhysicalThread__Group_3_2__2 ;
+    // InternalETPhys.g:2822:1: rule__PhysicalThread__Group_3_2__1 : rule__PhysicalThread__Group_3_2__1__Impl rule__PhysicalThread__Group_3_2__2 ;
     public final void rule__PhysicalThread__Group_3_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2827:1: ( rule__PhysicalThread__Group_3_2__1__Impl rule__PhysicalThread__Group_3_2__2 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2828:2: rule__PhysicalThread__Group_3_2__1__Impl rule__PhysicalThread__Group_3_2__2
+            // InternalETPhys.g:2826:1: ( rule__PhysicalThread__Group_3_2__1__Impl rule__PhysicalThread__Group_3_2__2 )
+            // InternalETPhys.g:2827:2: rule__PhysicalThread__Group_3_2__1__Impl rule__PhysicalThread__Group_3_2__2
             {
-            pushFollow(FOLLOW_rule__PhysicalThread__Group_3_2__1__Impl_in_rule__PhysicalThread__Group_3_2__15772);
+            pushFollow(FOLLOW_17);
             rule__PhysicalThread__Group_3_2__1__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__PhysicalThread__Group_3_2__2_in_rule__PhysicalThread__Group_3_2__15775);
+
+            pushFollow(FOLLOW_2);
             rule__PhysicalThread__Group_3_2__2();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -8684,25 +8050,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__Group_3_2__1__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2835:1: rule__PhysicalThread__Group_3_2__1__Impl : ( '=' ) ;
+    // InternalETPhys.g:2834:1: rule__PhysicalThread__Group_3_2__1__Impl : ( '=' ) ;
     public final void rule__PhysicalThread__Group_3_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2839:1: ( ( '=' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2840:1: ( '=' )
+            // InternalETPhys.g:2838:1: ( ( '=' ) )
+            // InternalETPhys.g:2839:1: ( '=' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2840:1: ( '=' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2841:1: '='
+            // InternalETPhys.g:2839:1: ( '=' )
+            // InternalETPhys.g:2840:1: '='
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalThreadAccess().getEqualsSignKeyword_3_2_1()); 
-            }
-            match(input,37,FOLLOW_37_in_rule__PhysicalThread__Group_3_2__1__Impl5803); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalThreadAccess().getEqualsSignKeyword_3_2_1()); 
-            }
+             before(grammarAccess.getPhysicalThreadAccess().getEqualsSignKeyword_3_2_1()); 
+            match(input,37,FOLLOW_2); 
+             after(grammarAccess.getPhysicalThreadAccess().getEqualsSignKeyword_3_2_1()); 
 
             }
 
@@ -8725,20 +8087,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__Group_3_2__2"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2854:1: rule__PhysicalThread__Group_3_2__2 : rule__PhysicalThread__Group_3_2__2__Impl ;
+    // InternalETPhys.g:2853:1: rule__PhysicalThread__Group_3_2__2 : rule__PhysicalThread__Group_3_2__2__Impl ;
     public final void rule__PhysicalThread__Group_3_2__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2858:1: ( rule__PhysicalThread__Group_3_2__2__Impl )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2859:2: rule__PhysicalThread__Group_3_2__2__Impl
+            // InternalETPhys.g:2857:1: ( rule__PhysicalThread__Group_3_2__2__Impl )
+            // InternalETPhys.g:2858:2: rule__PhysicalThread__Group_3_2__2__Impl
             {
-            pushFollow(FOLLOW_rule__PhysicalThread__Group_3_2__2__Impl_in_rule__PhysicalThread__Group_3_2__25834);
+            pushFollow(FOLLOW_2);
             rule__PhysicalThread__Group_3_2__2__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -8758,36 +8120,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__Group_3_2__2__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2865:1: rule__PhysicalThread__Group_3_2__2__Impl : ( ( rule__PhysicalThread__PrioAssignment_3_2_2 ) ) ;
+    // InternalETPhys.g:2864:1: rule__PhysicalThread__Group_3_2__2__Impl : ( ( rule__PhysicalThread__PrioAssignment_3_2_2 ) ) ;
     public final void rule__PhysicalThread__Group_3_2__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2869:1: ( ( ( rule__PhysicalThread__PrioAssignment_3_2_2 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2870:1: ( ( rule__PhysicalThread__PrioAssignment_3_2_2 ) )
+            // InternalETPhys.g:2868:1: ( ( ( rule__PhysicalThread__PrioAssignment_3_2_2 ) ) )
+            // InternalETPhys.g:2869:1: ( ( rule__PhysicalThread__PrioAssignment_3_2_2 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2870:1: ( ( rule__PhysicalThread__PrioAssignment_3_2_2 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2871:1: ( rule__PhysicalThread__PrioAssignment_3_2_2 )
+            // InternalETPhys.g:2869:1: ( ( rule__PhysicalThread__PrioAssignment_3_2_2 ) )
+            // InternalETPhys.g:2870:1: ( rule__PhysicalThread__PrioAssignment_3_2_2 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalThreadAccess().getPrioAssignment_3_2_2()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2872:1: ( rule__PhysicalThread__PrioAssignment_3_2_2 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2872:2: rule__PhysicalThread__PrioAssignment_3_2_2
+             before(grammarAccess.getPhysicalThreadAccess().getPrioAssignment_3_2_2()); 
+            // InternalETPhys.g:2871:1: ( rule__PhysicalThread__PrioAssignment_3_2_2 )
+            // InternalETPhys.g:2871:2: rule__PhysicalThread__PrioAssignment_3_2_2
             {
-            pushFollow(FOLLOW_rule__PhysicalThread__PrioAssignment_3_2_2_in_rule__PhysicalThread__Group_3_2__2__Impl5861);
+            pushFollow(FOLLOW_2);
             rule__PhysicalThread__PrioAssignment_3_2_2();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalThreadAccess().getPrioAssignment_3_2_2()); 
             }
 
+             after(grammarAccess.getPhysicalThreadAccess().getPrioAssignment_3_2_2()); 
+
             }
 
 
@@ -8809,25 +8167,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__Group_3_3__0"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2888:1: rule__PhysicalThread__Group_3_3__0 : rule__PhysicalThread__Group_3_3__0__Impl rule__PhysicalThread__Group_3_3__1 ;
+    // InternalETPhys.g:2887:1: rule__PhysicalThread__Group_3_3__0 : rule__PhysicalThread__Group_3_3__0__Impl rule__PhysicalThread__Group_3_3__1 ;
     public final void rule__PhysicalThread__Group_3_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2892:1: ( rule__PhysicalThread__Group_3_3__0__Impl rule__PhysicalThread__Group_3_3__1 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2893:2: rule__PhysicalThread__Group_3_3__0__Impl rule__PhysicalThread__Group_3_3__1
+            // InternalETPhys.g:2891:1: ( rule__PhysicalThread__Group_3_3__0__Impl rule__PhysicalThread__Group_3_3__1 )
+            // InternalETPhys.g:2892:2: rule__PhysicalThread__Group_3_3__0__Impl rule__PhysicalThread__Group_3_3__1
             {
-            pushFollow(FOLLOW_rule__PhysicalThread__Group_3_3__0__Impl_in_rule__PhysicalThread__Group_3_3__05897);
+            pushFollow(FOLLOW_16);
             rule__PhysicalThread__Group_3_3__0__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__PhysicalThread__Group_3_3__1_in_rule__PhysicalThread__Group_3_3__05900);
+
+            pushFollow(FOLLOW_2);
             rule__PhysicalThread__Group_3_3__1();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -8847,25 +8205,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__Group_3_3__0__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2900:1: rule__PhysicalThread__Group_3_3__0__Impl : ( 'stacksize' ) ;
+    // InternalETPhys.g:2899:1: rule__PhysicalThread__Group_3_3__0__Impl : ( 'stacksize' ) ;
     public final void rule__PhysicalThread__Group_3_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2904:1: ( ( 'stacksize' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2905:1: ( 'stacksize' )
+            // InternalETPhys.g:2903:1: ( ( 'stacksize' ) )
+            // InternalETPhys.g:2904:1: ( 'stacksize' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2905:1: ( 'stacksize' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2906:1: 'stacksize'
+            // InternalETPhys.g:2904:1: ( 'stacksize' )
+            // InternalETPhys.g:2905:1: 'stacksize'
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalThreadAccess().getStacksizeKeyword_3_3_0()); 
-            }
-            match(input,43,FOLLOW_43_in_rule__PhysicalThread__Group_3_3__0__Impl5928); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalThreadAccess().getStacksizeKeyword_3_3_0()); 
-            }
+             before(grammarAccess.getPhysicalThreadAccess().getStacksizeKeyword_3_3_0()); 
+            match(input,43,FOLLOW_2); 
+             after(grammarAccess.getPhysicalThreadAccess().getStacksizeKeyword_3_3_0()); 
 
             }
 
@@ -8888,25 +8242,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__Group_3_3__1"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2919:1: rule__PhysicalThread__Group_3_3__1 : rule__PhysicalThread__Group_3_3__1__Impl rule__PhysicalThread__Group_3_3__2 ;
+    // InternalETPhys.g:2918:1: rule__PhysicalThread__Group_3_3__1 : rule__PhysicalThread__Group_3_3__1__Impl rule__PhysicalThread__Group_3_3__2 ;
     public final void rule__PhysicalThread__Group_3_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2923:1: ( rule__PhysicalThread__Group_3_3__1__Impl rule__PhysicalThread__Group_3_3__2 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2924:2: rule__PhysicalThread__Group_3_3__1__Impl rule__PhysicalThread__Group_3_3__2
+            // InternalETPhys.g:2922:1: ( rule__PhysicalThread__Group_3_3__1__Impl rule__PhysicalThread__Group_3_3__2 )
+            // InternalETPhys.g:2923:2: rule__PhysicalThread__Group_3_3__1__Impl rule__PhysicalThread__Group_3_3__2
             {
-            pushFollow(FOLLOW_rule__PhysicalThread__Group_3_3__1__Impl_in_rule__PhysicalThread__Group_3_3__15959);
+            pushFollow(FOLLOW_21);
             rule__PhysicalThread__Group_3_3__1__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__PhysicalThread__Group_3_3__2_in_rule__PhysicalThread__Group_3_3__15962);
+
+            pushFollow(FOLLOW_2);
             rule__PhysicalThread__Group_3_3__2();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -8926,25 +8280,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__Group_3_3__1__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2931:1: rule__PhysicalThread__Group_3_3__1__Impl : ( '=' ) ;
+    // InternalETPhys.g:2930:1: rule__PhysicalThread__Group_3_3__1__Impl : ( '=' ) ;
     public final void rule__PhysicalThread__Group_3_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2935:1: ( ( '=' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2936:1: ( '=' )
+            // InternalETPhys.g:2934:1: ( ( '=' ) )
+            // InternalETPhys.g:2935:1: ( '=' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2936:1: ( '=' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2937:1: '='
+            // InternalETPhys.g:2935:1: ( '=' )
+            // InternalETPhys.g:2936:1: '='
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalThreadAccess().getEqualsSignKeyword_3_3_1()); 
-            }
-            match(input,37,FOLLOW_37_in_rule__PhysicalThread__Group_3_3__1__Impl5990); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalThreadAccess().getEqualsSignKeyword_3_3_1()); 
-            }
+             before(grammarAccess.getPhysicalThreadAccess().getEqualsSignKeyword_3_3_1()); 
+            match(input,37,FOLLOW_2); 
+             after(grammarAccess.getPhysicalThreadAccess().getEqualsSignKeyword_3_3_1()); 
 
             }
 
@@ -8967,20 +8317,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__Group_3_3__2"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2950:1: rule__PhysicalThread__Group_3_3__2 : rule__PhysicalThread__Group_3_3__2__Impl ;
+    // InternalETPhys.g:2949:1: rule__PhysicalThread__Group_3_3__2 : rule__PhysicalThread__Group_3_3__2__Impl ;
     public final void rule__PhysicalThread__Group_3_3__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2954:1: ( rule__PhysicalThread__Group_3_3__2__Impl )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2955:2: rule__PhysicalThread__Group_3_3__2__Impl
+            // InternalETPhys.g:2953:1: ( rule__PhysicalThread__Group_3_3__2__Impl )
+            // InternalETPhys.g:2954:2: rule__PhysicalThread__Group_3_3__2__Impl
             {
-            pushFollow(FOLLOW_rule__PhysicalThread__Group_3_3__2__Impl_in_rule__PhysicalThread__Group_3_3__26021);
+            pushFollow(FOLLOW_2);
             rule__PhysicalThread__Group_3_3__2__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -9000,36 +8350,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__Group_3_3__2__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2961:1: rule__PhysicalThread__Group_3_3__2__Impl : ( ( rule__PhysicalThread__StacksizeAssignment_3_3_2 ) ) ;
+    // InternalETPhys.g:2960:1: rule__PhysicalThread__Group_3_3__2__Impl : ( ( rule__PhysicalThread__StacksizeAssignment_3_3_2 ) ) ;
     public final void rule__PhysicalThread__Group_3_3__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2965:1: ( ( ( rule__PhysicalThread__StacksizeAssignment_3_3_2 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2966:1: ( ( rule__PhysicalThread__StacksizeAssignment_3_3_2 ) )
+            // InternalETPhys.g:2964:1: ( ( ( rule__PhysicalThread__StacksizeAssignment_3_3_2 ) ) )
+            // InternalETPhys.g:2965:1: ( ( rule__PhysicalThread__StacksizeAssignment_3_3_2 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2966:1: ( ( rule__PhysicalThread__StacksizeAssignment_3_3_2 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2967:1: ( rule__PhysicalThread__StacksizeAssignment_3_3_2 )
+            // InternalETPhys.g:2965:1: ( ( rule__PhysicalThread__StacksizeAssignment_3_3_2 ) )
+            // InternalETPhys.g:2966:1: ( rule__PhysicalThread__StacksizeAssignment_3_3_2 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalThreadAccess().getStacksizeAssignment_3_3_2()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2968:1: ( rule__PhysicalThread__StacksizeAssignment_3_3_2 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2968:2: rule__PhysicalThread__StacksizeAssignment_3_3_2
+             before(grammarAccess.getPhysicalThreadAccess().getStacksizeAssignment_3_3_2()); 
+            // InternalETPhys.g:2967:1: ( rule__PhysicalThread__StacksizeAssignment_3_3_2 )
+            // InternalETPhys.g:2967:2: rule__PhysicalThread__StacksizeAssignment_3_3_2
             {
-            pushFollow(FOLLOW_rule__PhysicalThread__StacksizeAssignment_3_3_2_in_rule__PhysicalThread__Group_3_3__2__Impl6048);
+            pushFollow(FOLLOW_2);
             rule__PhysicalThread__StacksizeAssignment_3_3_2();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalThreadAccess().getStacksizeAssignment_3_3_2()); 
             }
 
+             after(grammarAccess.getPhysicalThreadAccess().getStacksizeAssignment_3_3_2()); 
+
             }
 
 
@@ -9051,25 +8397,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__Group_3_4__0"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2984:1: rule__PhysicalThread__Group_3_4__0 : rule__PhysicalThread__Group_3_4__0__Impl rule__PhysicalThread__Group_3_4__1 ;
+    // InternalETPhys.g:2983:1: rule__PhysicalThread__Group_3_4__0 : rule__PhysicalThread__Group_3_4__0__Impl rule__PhysicalThread__Group_3_4__1 ;
     public final void rule__PhysicalThread__Group_3_4__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2988:1: ( rule__PhysicalThread__Group_3_4__0__Impl rule__PhysicalThread__Group_3_4__1 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2989:2: rule__PhysicalThread__Group_3_4__0__Impl rule__PhysicalThread__Group_3_4__1
+            // InternalETPhys.g:2987:1: ( rule__PhysicalThread__Group_3_4__0__Impl rule__PhysicalThread__Group_3_4__1 )
+            // InternalETPhys.g:2988:2: rule__PhysicalThread__Group_3_4__0__Impl rule__PhysicalThread__Group_3_4__1
             {
-            pushFollow(FOLLOW_rule__PhysicalThread__Group_3_4__0__Impl_in_rule__PhysicalThread__Group_3_4__06084);
+            pushFollow(FOLLOW_16);
             rule__PhysicalThread__Group_3_4__0__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__PhysicalThread__Group_3_4__1_in_rule__PhysicalThread__Group_3_4__06087);
+
+            pushFollow(FOLLOW_2);
             rule__PhysicalThread__Group_3_4__1();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -9089,25 +8435,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__Group_3_4__0__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:2996:1: rule__PhysicalThread__Group_3_4__0__Impl : ( 'msgblocksize' ) ;
+    // InternalETPhys.g:2995:1: rule__PhysicalThread__Group_3_4__0__Impl : ( 'msgblocksize' ) ;
     public final void rule__PhysicalThread__Group_3_4__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3000:1: ( ( 'msgblocksize' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3001:1: ( 'msgblocksize' )
+            // InternalETPhys.g:2999:1: ( ( 'msgblocksize' ) )
+            // InternalETPhys.g:3000:1: ( 'msgblocksize' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3001:1: ( 'msgblocksize' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3002:1: 'msgblocksize'
+            // InternalETPhys.g:3000:1: ( 'msgblocksize' )
+            // InternalETPhys.g:3001:1: 'msgblocksize'
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalThreadAccess().getMsgblocksizeKeyword_3_4_0()); 
-            }
-            match(input,44,FOLLOW_44_in_rule__PhysicalThread__Group_3_4__0__Impl6115); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalThreadAccess().getMsgblocksizeKeyword_3_4_0()); 
-            }
+             before(grammarAccess.getPhysicalThreadAccess().getMsgblocksizeKeyword_3_4_0()); 
+            match(input,44,FOLLOW_2); 
+             after(grammarAccess.getPhysicalThreadAccess().getMsgblocksizeKeyword_3_4_0()); 
 
             }
 
@@ -9130,25 +8472,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__Group_3_4__1"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3015:1: rule__PhysicalThread__Group_3_4__1 : rule__PhysicalThread__Group_3_4__1__Impl rule__PhysicalThread__Group_3_4__2 ;
+    // InternalETPhys.g:3014:1: rule__PhysicalThread__Group_3_4__1 : rule__PhysicalThread__Group_3_4__1__Impl rule__PhysicalThread__Group_3_4__2 ;
     public final void rule__PhysicalThread__Group_3_4__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3019:1: ( rule__PhysicalThread__Group_3_4__1__Impl rule__PhysicalThread__Group_3_4__2 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3020:2: rule__PhysicalThread__Group_3_4__1__Impl rule__PhysicalThread__Group_3_4__2
+            // InternalETPhys.g:3018:1: ( rule__PhysicalThread__Group_3_4__1__Impl rule__PhysicalThread__Group_3_4__2 )
+            // InternalETPhys.g:3019:2: rule__PhysicalThread__Group_3_4__1__Impl rule__PhysicalThread__Group_3_4__2
             {
-            pushFollow(FOLLOW_rule__PhysicalThread__Group_3_4__1__Impl_in_rule__PhysicalThread__Group_3_4__16146);
+            pushFollow(FOLLOW_21);
             rule__PhysicalThread__Group_3_4__1__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__PhysicalThread__Group_3_4__2_in_rule__PhysicalThread__Group_3_4__16149);
+
+            pushFollow(FOLLOW_2);
             rule__PhysicalThread__Group_3_4__2();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -9168,25 +8510,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__Group_3_4__1__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3027:1: rule__PhysicalThread__Group_3_4__1__Impl : ( '=' ) ;
+    // InternalETPhys.g:3026:1: rule__PhysicalThread__Group_3_4__1__Impl : ( '=' ) ;
     public final void rule__PhysicalThread__Group_3_4__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3031:1: ( ( '=' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3032:1: ( '=' )
+            // InternalETPhys.g:3030:1: ( ( '=' ) )
+            // InternalETPhys.g:3031:1: ( '=' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3032:1: ( '=' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3033:1: '='
+            // InternalETPhys.g:3031:1: ( '=' )
+            // InternalETPhys.g:3032:1: '='
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalThreadAccess().getEqualsSignKeyword_3_4_1()); 
-            }
-            match(input,37,FOLLOW_37_in_rule__PhysicalThread__Group_3_4__1__Impl6177); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalThreadAccess().getEqualsSignKeyword_3_4_1()); 
-            }
+             before(grammarAccess.getPhysicalThreadAccess().getEqualsSignKeyword_3_4_1()); 
+            match(input,37,FOLLOW_2); 
+             after(grammarAccess.getPhysicalThreadAccess().getEqualsSignKeyword_3_4_1()); 
 
             }
 
@@ -9209,20 +8547,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__Group_3_4__2"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3046:1: rule__PhysicalThread__Group_3_4__2 : rule__PhysicalThread__Group_3_4__2__Impl ;
+    // InternalETPhys.g:3045:1: rule__PhysicalThread__Group_3_4__2 : rule__PhysicalThread__Group_3_4__2__Impl ;
     public final void rule__PhysicalThread__Group_3_4__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3050:1: ( rule__PhysicalThread__Group_3_4__2__Impl )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3051:2: rule__PhysicalThread__Group_3_4__2__Impl
+            // InternalETPhys.g:3049:1: ( rule__PhysicalThread__Group_3_4__2__Impl )
+            // InternalETPhys.g:3050:2: rule__PhysicalThread__Group_3_4__2__Impl
             {
-            pushFollow(FOLLOW_rule__PhysicalThread__Group_3_4__2__Impl_in_rule__PhysicalThread__Group_3_4__26208);
+            pushFollow(FOLLOW_2);
             rule__PhysicalThread__Group_3_4__2__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -9242,36 +8580,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__Group_3_4__2__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3057:1: rule__PhysicalThread__Group_3_4__2__Impl : ( ( rule__PhysicalThread__MsgblocksizeAssignment_3_4_2 ) ) ;
+    // InternalETPhys.g:3056:1: rule__PhysicalThread__Group_3_4__2__Impl : ( ( rule__PhysicalThread__MsgblocksizeAssignment_3_4_2 ) ) ;
     public final void rule__PhysicalThread__Group_3_4__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3061:1: ( ( ( rule__PhysicalThread__MsgblocksizeAssignment_3_4_2 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3062:1: ( ( rule__PhysicalThread__MsgblocksizeAssignment_3_4_2 ) )
+            // InternalETPhys.g:3060:1: ( ( ( rule__PhysicalThread__MsgblocksizeAssignment_3_4_2 ) ) )
+            // InternalETPhys.g:3061:1: ( ( rule__PhysicalThread__MsgblocksizeAssignment_3_4_2 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3062:1: ( ( rule__PhysicalThread__MsgblocksizeAssignment_3_4_2 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3063:1: ( rule__PhysicalThread__MsgblocksizeAssignment_3_4_2 )
+            // InternalETPhys.g:3061:1: ( ( rule__PhysicalThread__MsgblocksizeAssignment_3_4_2 ) )
+            // InternalETPhys.g:3062:1: ( rule__PhysicalThread__MsgblocksizeAssignment_3_4_2 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalThreadAccess().getMsgblocksizeAssignment_3_4_2()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3064:1: ( rule__PhysicalThread__MsgblocksizeAssignment_3_4_2 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3064:2: rule__PhysicalThread__MsgblocksizeAssignment_3_4_2
+             before(grammarAccess.getPhysicalThreadAccess().getMsgblocksizeAssignment_3_4_2()); 
+            // InternalETPhys.g:3063:1: ( rule__PhysicalThread__MsgblocksizeAssignment_3_4_2 )
+            // InternalETPhys.g:3063:2: rule__PhysicalThread__MsgblocksizeAssignment_3_4_2
             {
-            pushFollow(FOLLOW_rule__PhysicalThread__MsgblocksizeAssignment_3_4_2_in_rule__PhysicalThread__Group_3_4__2__Impl6235);
+            pushFollow(FOLLOW_2);
             rule__PhysicalThread__MsgblocksizeAssignment_3_4_2();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalThreadAccess().getMsgblocksizeAssignment_3_4_2()); 
             }
 
+             after(grammarAccess.getPhysicalThreadAccess().getMsgblocksizeAssignment_3_4_2()); 
+
             }
 
 
@@ -9293,25 +8627,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__Group_3_5__0"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3080:1: rule__PhysicalThread__Group_3_5__0 : rule__PhysicalThread__Group_3_5__0__Impl rule__PhysicalThread__Group_3_5__1 ;
+    // InternalETPhys.g:3079:1: rule__PhysicalThread__Group_3_5__0 : rule__PhysicalThread__Group_3_5__0__Impl rule__PhysicalThread__Group_3_5__1 ;
     public final void rule__PhysicalThread__Group_3_5__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3084:1: ( rule__PhysicalThread__Group_3_5__0__Impl rule__PhysicalThread__Group_3_5__1 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3085:2: rule__PhysicalThread__Group_3_5__0__Impl rule__PhysicalThread__Group_3_5__1
+            // InternalETPhys.g:3083:1: ( rule__PhysicalThread__Group_3_5__0__Impl rule__PhysicalThread__Group_3_5__1 )
+            // InternalETPhys.g:3084:2: rule__PhysicalThread__Group_3_5__0__Impl rule__PhysicalThread__Group_3_5__1
             {
-            pushFollow(FOLLOW_rule__PhysicalThread__Group_3_5__0__Impl_in_rule__PhysicalThread__Group_3_5__06271);
+            pushFollow(FOLLOW_16);
             rule__PhysicalThread__Group_3_5__0__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__PhysicalThread__Group_3_5__1_in_rule__PhysicalThread__Group_3_5__06274);
+
+            pushFollow(FOLLOW_2);
             rule__PhysicalThread__Group_3_5__1();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -9331,25 +8665,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__Group_3_5__0__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3092:1: rule__PhysicalThread__Group_3_5__0__Impl : ( 'msgpoolsize' ) ;
+    // InternalETPhys.g:3091:1: rule__PhysicalThread__Group_3_5__0__Impl : ( 'msgpoolsize' ) ;
     public final void rule__PhysicalThread__Group_3_5__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3096:1: ( ( 'msgpoolsize' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3097:1: ( 'msgpoolsize' )
+            // InternalETPhys.g:3095:1: ( ( 'msgpoolsize' ) )
+            // InternalETPhys.g:3096:1: ( 'msgpoolsize' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3097:1: ( 'msgpoolsize' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3098:1: 'msgpoolsize'
+            // InternalETPhys.g:3096:1: ( 'msgpoolsize' )
+            // InternalETPhys.g:3097:1: 'msgpoolsize'
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalThreadAccess().getMsgpoolsizeKeyword_3_5_0()); 
-            }
-            match(input,45,FOLLOW_45_in_rule__PhysicalThread__Group_3_5__0__Impl6302); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalThreadAccess().getMsgpoolsizeKeyword_3_5_0()); 
-            }
+             before(grammarAccess.getPhysicalThreadAccess().getMsgpoolsizeKeyword_3_5_0()); 
+            match(input,45,FOLLOW_2); 
+             after(grammarAccess.getPhysicalThreadAccess().getMsgpoolsizeKeyword_3_5_0()); 
 
             }
 
@@ -9372,25 +8702,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__Group_3_5__1"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3111:1: rule__PhysicalThread__Group_3_5__1 : rule__PhysicalThread__Group_3_5__1__Impl rule__PhysicalThread__Group_3_5__2 ;
+    // InternalETPhys.g:3110:1: rule__PhysicalThread__Group_3_5__1 : rule__PhysicalThread__Group_3_5__1__Impl rule__PhysicalThread__Group_3_5__2 ;
     public final void rule__PhysicalThread__Group_3_5__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3115:1: ( rule__PhysicalThread__Group_3_5__1__Impl rule__PhysicalThread__Group_3_5__2 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3116:2: rule__PhysicalThread__Group_3_5__1__Impl rule__PhysicalThread__Group_3_5__2
+            // InternalETPhys.g:3114:1: ( rule__PhysicalThread__Group_3_5__1__Impl rule__PhysicalThread__Group_3_5__2 )
+            // InternalETPhys.g:3115:2: rule__PhysicalThread__Group_3_5__1__Impl rule__PhysicalThread__Group_3_5__2
             {
-            pushFollow(FOLLOW_rule__PhysicalThread__Group_3_5__1__Impl_in_rule__PhysicalThread__Group_3_5__16333);
+            pushFollow(FOLLOW_21);
             rule__PhysicalThread__Group_3_5__1__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__PhysicalThread__Group_3_5__2_in_rule__PhysicalThread__Group_3_5__16336);
+
+            pushFollow(FOLLOW_2);
             rule__PhysicalThread__Group_3_5__2();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -9410,25 +8740,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__Group_3_5__1__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3123:1: rule__PhysicalThread__Group_3_5__1__Impl : ( '=' ) ;
+    // InternalETPhys.g:3122:1: rule__PhysicalThread__Group_3_5__1__Impl : ( '=' ) ;
     public final void rule__PhysicalThread__Group_3_5__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3127:1: ( ( '=' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3128:1: ( '=' )
+            // InternalETPhys.g:3126:1: ( ( '=' ) )
+            // InternalETPhys.g:3127:1: ( '=' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3128:1: ( '=' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3129:1: '='
+            // InternalETPhys.g:3127:1: ( '=' )
+            // InternalETPhys.g:3128:1: '='
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalThreadAccess().getEqualsSignKeyword_3_5_1()); 
-            }
-            match(input,37,FOLLOW_37_in_rule__PhysicalThread__Group_3_5__1__Impl6364); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalThreadAccess().getEqualsSignKeyword_3_5_1()); 
-            }
+             before(grammarAccess.getPhysicalThreadAccess().getEqualsSignKeyword_3_5_1()); 
+            match(input,37,FOLLOW_2); 
+             after(grammarAccess.getPhysicalThreadAccess().getEqualsSignKeyword_3_5_1()); 
 
             }
 
@@ -9451,20 +8777,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__Group_3_5__2"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3142:1: rule__PhysicalThread__Group_3_5__2 : rule__PhysicalThread__Group_3_5__2__Impl ;
+    // InternalETPhys.g:3141:1: rule__PhysicalThread__Group_3_5__2 : rule__PhysicalThread__Group_3_5__2__Impl ;
     public final void rule__PhysicalThread__Group_3_5__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3146:1: ( rule__PhysicalThread__Group_3_5__2__Impl )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3147:2: rule__PhysicalThread__Group_3_5__2__Impl
+            // InternalETPhys.g:3145:1: ( rule__PhysicalThread__Group_3_5__2__Impl )
+            // InternalETPhys.g:3146:2: rule__PhysicalThread__Group_3_5__2__Impl
             {
-            pushFollow(FOLLOW_rule__PhysicalThread__Group_3_5__2__Impl_in_rule__PhysicalThread__Group_3_5__26395);
+            pushFollow(FOLLOW_2);
             rule__PhysicalThread__Group_3_5__2__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -9484,36 +8810,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__Group_3_5__2__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3153:1: rule__PhysicalThread__Group_3_5__2__Impl : ( ( rule__PhysicalThread__MsgpoolsizeAssignment_3_5_2 ) ) ;
+    // InternalETPhys.g:3152:1: rule__PhysicalThread__Group_3_5__2__Impl : ( ( rule__PhysicalThread__MsgpoolsizeAssignment_3_5_2 ) ) ;
     public final void rule__PhysicalThread__Group_3_5__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3157:1: ( ( ( rule__PhysicalThread__MsgpoolsizeAssignment_3_5_2 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3158:1: ( ( rule__PhysicalThread__MsgpoolsizeAssignment_3_5_2 ) )
+            // InternalETPhys.g:3156:1: ( ( ( rule__PhysicalThread__MsgpoolsizeAssignment_3_5_2 ) ) )
+            // InternalETPhys.g:3157:1: ( ( rule__PhysicalThread__MsgpoolsizeAssignment_3_5_2 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3158:1: ( ( rule__PhysicalThread__MsgpoolsizeAssignment_3_5_2 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3159:1: ( rule__PhysicalThread__MsgpoolsizeAssignment_3_5_2 )
+            // InternalETPhys.g:3157:1: ( ( rule__PhysicalThread__MsgpoolsizeAssignment_3_5_2 ) )
+            // InternalETPhys.g:3158:1: ( rule__PhysicalThread__MsgpoolsizeAssignment_3_5_2 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalThreadAccess().getMsgpoolsizeAssignment_3_5_2()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3160:1: ( rule__PhysicalThread__MsgpoolsizeAssignment_3_5_2 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3160:2: rule__PhysicalThread__MsgpoolsizeAssignment_3_5_2
+             before(grammarAccess.getPhysicalThreadAccess().getMsgpoolsizeAssignment_3_5_2()); 
+            // InternalETPhys.g:3159:1: ( rule__PhysicalThread__MsgpoolsizeAssignment_3_5_2 )
+            // InternalETPhys.g:3159:2: rule__PhysicalThread__MsgpoolsizeAssignment_3_5_2
             {
-            pushFollow(FOLLOW_rule__PhysicalThread__MsgpoolsizeAssignment_3_5_2_in_rule__PhysicalThread__Group_3_5__2__Impl6422);
+            pushFollow(FOLLOW_2);
             rule__PhysicalThread__MsgpoolsizeAssignment_3_5_2();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalThreadAccess().getMsgpoolsizeAssignment_3_5_2()); 
             }
 
+             after(grammarAccess.getPhysicalThreadAccess().getMsgpoolsizeAssignment_3_5_2()); 
+
             }
 
 
@@ -9535,25 +8857,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RuntimeClass__Group__0"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3176:1: rule__RuntimeClass__Group__0 : rule__RuntimeClass__Group__0__Impl rule__RuntimeClass__Group__1 ;
+    // InternalETPhys.g:3175:1: rule__RuntimeClass__Group__0 : rule__RuntimeClass__Group__0__Impl rule__RuntimeClass__Group__1 ;
     public final void rule__RuntimeClass__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3180:1: ( rule__RuntimeClass__Group__0__Impl rule__RuntimeClass__Group__1 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3181:2: rule__RuntimeClass__Group__0__Impl rule__RuntimeClass__Group__1
+            // InternalETPhys.g:3179:1: ( rule__RuntimeClass__Group__0__Impl rule__RuntimeClass__Group__1 )
+            // InternalETPhys.g:3180:2: rule__RuntimeClass__Group__0__Impl rule__RuntimeClass__Group__1
             {
-            pushFollow(FOLLOW_rule__RuntimeClass__Group__0__Impl_in_rule__RuntimeClass__Group__06458);
+            pushFollow(FOLLOW_3);
             rule__RuntimeClass__Group__0__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__RuntimeClass__Group__1_in_rule__RuntimeClass__Group__06461);
+
+            pushFollow(FOLLOW_2);
             rule__RuntimeClass__Group__1();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -9573,25 +8895,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RuntimeClass__Group__0__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3188:1: rule__RuntimeClass__Group__0__Impl : ( 'RuntimeClass' ) ;
+    // InternalETPhys.g:3187:1: rule__RuntimeClass__Group__0__Impl : ( 'RuntimeClass' ) ;
     public final void rule__RuntimeClass__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3192:1: ( ( 'RuntimeClass' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3193:1: ( 'RuntimeClass' )
+            // InternalETPhys.g:3191:1: ( ( 'RuntimeClass' ) )
+            // InternalETPhys.g:3192:1: ( 'RuntimeClass' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3193:1: ( 'RuntimeClass' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3194:1: 'RuntimeClass'
+            // InternalETPhys.g:3192:1: ( 'RuntimeClass' )
+            // InternalETPhys.g:3193:1: 'RuntimeClass'
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getRuntimeClassAccess().getRuntimeClassKeyword_0()); 
-            }
-            match(input,46,FOLLOW_46_in_rule__RuntimeClass__Group__0__Impl6489); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getRuntimeClassAccess().getRuntimeClassKeyword_0()); 
-            }
+             before(grammarAccess.getRuntimeClassAccess().getRuntimeClassKeyword_0()); 
+            match(input,46,FOLLOW_2); 
+             after(grammarAccess.getRuntimeClassAccess().getRuntimeClassKeyword_0()); 
 
             }
 
@@ -9614,25 +8932,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RuntimeClass__Group__1"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3207:1: rule__RuntimeClass__Group__1 : rule__RuntimeClass__Group__1__Impl rule__RuntimeClass__Group__2 ;
+    // InternalETPhys.g:3206:1: rule__RuntimeClass__Group__1 : rule__RuntimeClass__Group__1__Impl rule__RuntimeClass__Group__2 ;
     public final void rule__RuntimeClass__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3211:1: ( rule__RuntimeClass__Group__1__Impl rule__RuntimeClass__Group__2 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3212:2: rule__RuntimeClass__Group__1__Impl rule__RuntimeClass__Group__2
+            // InternalETPhys.g:3210:1: ( rule__RuntimeClass__Group__1__Impl rule__RuntimeClass__Group__2 )
+            // InternalETPhys.g:3211:2: rule__RuntimeClass__Group__1__Impl rule__RuntimeClass__Group__2
             {
-            pushFollow(FOLLOW_rule__RuntimeClass__Group__1__Impl_in_rule__RuntimeClass__Group__16520);
+            pushFollow(FOLLOW_8);
             rule__RuntimeClass__Group__1__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__RuntimeClass__Group__2_in_rule__RuntimeClass__Group__16523);
+
+            pushFollow(FOLLOW_2);
             rule__RuntimeClass__Group__2();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -9652,36 +8970,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RuntimeClass__Group__1__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3219:1: rule__RuntimeClass__Group__1__Impl : ( ( rule__RuntimeClass__NameAssignment_1 ) ) ;
+    // InternalETPhys.g:3218:1: rule__RuntimeClass__Group__1__Impl : ( ( rule__RuntimeClass__NameAssignment_1 ) ) ;
     public final void rule__RuntimeClass__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3223:1: ( ( ( rule__RuntimeClass__NameAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3224:1: ( ( rule__RuntimeClass__NameAssignment_1 ) )
+            // InternalETPhys.g:3222:1: ( ( ( rule__RuntimeClass__NameAssignment_1 ) ) )
+            // InternalETPhys.g:3223:1: ( ( rule__RuntimeClass__NameAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3224:1: ( ( rule__RuntimeClass__NameAssignment_1 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3225:1: ( rule__RuntimeClass__NameAssignment_1 )
+            // InternalETPhys.g:3223:1: ( ( rule__RuntimeClass__NameAssignment_1 ) )
+            // InternalETPhys.g:3224:1: ( rule__RuntimeClass__NameAssignment_1 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getRuntimeClassAccess().getNameAssignment_1()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3226:1: ( rule__RuntimeClass__NameAssignment_1 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3226:2: rule__RuntimeClass__NameAssignment_1
+             before(grammarAccess.getRuntimeClassAccess().getNameAssignment_1()); 
+            // InternalETPhys.g:3225:1: ( rule__RuntimeClass__NameAssignment_1 )
+            // InternalETPhys.g:3225:2: rule__RuntimeClass__NameAssignment_1
             {
-            pushFollow(FOLLOW_rule__RuntimeClass__NameAssignment_1_in_rule__RuntimeClass__Group__1__Impl6550);
+            pushFollow(FOLLOW_2);
             rule__RuntimeClass__NameAssignment_1();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getRuntimeClassAccess().getNameAssignment_1()); 
             }
 
+             after(grammarAccess.getRuntimeClassAccess().getNameAssignment_1()); 
+
             }
 
 
@@ -9703,25 +9017,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RuntimeClass__Group__2"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3236:1: rule__RuntimeClass__Group__2 : rule__RuntimeClass__Group__2__Impl rule__RuntimeClass__Group__3 ;
+    // InternalETPhys.g:3235:1: rule__RuntimeClass__Group__2 : rule__RuntimeClass__Group__2__Impl rule__RuntimeClass__Group__3 ;
     public final void rule__RuntimeClass__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3240:1: ( rule__RuntimeClass__Group__2__Impl rule__RuntimeClass__Group__3 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3241:2: rule__RuntimeClass__Group__2__Impl rule__RuntimeClass__Group__3
+            // InternalETPhys.g:3239:1: ( rule__RuntimeClass__Group__2__Impl rule__RuntimeClass__Group__3 )
+            // InternalETPhys.g:3240:2: rule__RuntimeClass__Group__2__Impl rule__RuntimeClass__Group__3
             {
-            pushFollow(FOLLOW_rule__RuntimeClass__Group__2__Impl_in_rule__RuntimeClass__Group__26580);
+            pushFollow(FOLLOW_8);
             rule__RuntimeClass__Group__2__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__RuntimeClass__Group__3_in_rule__RuntimeClass__Group__26583);
+
+            pushFollow(FOLLOW_2);
             rule__RuntimeClass__Group__3();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -9741,22 +9055,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RuntimeClass__Group__2__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3248:1: rule__RuntimeClass__Group__2__Impl : ( ( rule__RuntimeClass__DocuAssignment_2 )? ) ;
+    // InternalETPhys.g:3247:1: rule__RuntimeClass__Group__2__Impl : ( ( rule__RuntimeClass__DocuAssignment_2 )? ) ;
     public final void rule__RuntimeClass__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3252:1: ( ( ( rule__RuntimeClass__DocuAssignment_2 )? ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3253:1: ( ( rule__RuntimeClass__DocuAssignment_2 )? )
+            // InternalETPhys.g:3251:1: ( ( ( rule__RuntimeClass__DocuAssignment_2 )? ) )
+            // InternalETPhys.g:3252:1: ( ( rule__RuntimeClass__DocuAssignment_2 )? )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3253:1: ( ( rule__RuntimeClass__DocuAssignment_2 )? )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3254:1: ( rule__RuntimeClass__DocuAssignment_2 )?
+            // InternalETPhys.g:3252:1: ( ( rule__RuntimeClass__DocuAssignment_2 )? )
+            // InternalETPhys.g:3253:1: ( rule__RuntimeClass__DocuAssignment_2 )?
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getRuntimeClassAccess().getDocuAssignment_2()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3255:1: ( rule__RuntimeClass__DocuAssignment_2 )?
+             before(grammarAccess.getRuntimeClassAccess().getDocuAssignment_2()); 
+            // InternalETPhys.g:3254:1: ( rule__RuntimeClass__DocuAssignment_2 )?
             int alt28=2;
             int LA28_0 = input.LA(1);
 
@@ -9765,22 +9077,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
             }
             switch (alt28) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3255:2: rule__RuntimeClass__DocuAssignment_2
+                    // InternalETPhys.g:3254:2: rule__RuntimeClass__DocuAssignment_2
                     {
-                    pushFollow(FOLLOW_rule__RuntimeClass__DocuAssignment_2_in_rule__RuntimeClass__Group__2__Impl6610);
+                    pushFollow(FOLLOW_2);
                     rule__RuntimeClass__DocuAssignment_2();
 
                     state._fsp--;
-                    if (state.failed) return ;
+
 
                     }
                     break;
 
             }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getRuntimeClassAccess().getDocuAssignment_2()); 
-            }
+             after(grammarAccess.getRuntimeClassAccess().getDocuAssignment_2()); 
 
             }
 
@@ -9803,25 +9113,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RuntimeClass__Group__3"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3265:1: rule__RuntimeClass__Group__3 : rule__RuntimeClass__Group__3__Impl rule__RuntimeClass__Group__4 ;
+    // InternalETPhys.g:3264:1: rule__RuntimeClass__Group__3 : rule__RuntimeClass__Group__3__Impl rule__RuntimeClass__Group__4 ;
     public final void rule__RuntimeClass__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3269:1: ( rule__RuntimeClass__Group__3__Impl rule__RuntimeClass__Group__4 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3270:2: rule__RuntimeClass__Group__3__Impl rule__RuntimeClass__Group__4
+            // InternalETPhys.g:3268:1: ( rule__RuntimeClass__Group__3__Impl rule__RuntimeClass__Group__4 )
+            // InternalETPhys.g:3269:2: rule__RuntimeClass__Group__3__Impl rule__RuntimeClass__Group__4
             {
-            pushFollow(FOLLOW_rule__RuntimeClass__Group__3__Impl_in_rule__RuntimeClass__Group__36641);
+            pushFollow(FOLLOW_22);
             rule__RuntimeClass__Group__3__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__RuntimeClass__Group__4_in_rule__RuntimeClass__Group__36644);
+
+            pushFollow(FOLLOW_2);
             rule__RuntimeClass__Group__4();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -9841,25 +9151,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RuntimeClass__Group__3__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3277:1: rule__RuntimeClass__Group__3__Impl : ( '{' ) ;
+    // InternalETPhys.g:3276:1: rule__RuntimeClass__Group__3__Impl : ( '{' ) ;
     public final void rule__RuntimeClass__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3281:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3282:1: ( '{' )
+            // InternalETPhys.g:3280:1: ( ( '{' ) )
+            // InternalETPhys.g:3281:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3282:1: ( '{' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3283:1: '{'
+            // InternalETPhys.g:3281:1: ( '{' )
+            // InternalETPhys.g:3282:1: '{'
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getRuntimeClassAccess().getLeftCurlyBracketKeyword_3()); 
-            }
-            match(input,30,FOLLOW_30_in_rule__RuntimeClass__Group__3__Impl6672); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getRuntimeClassAccess().getLeftCurlyBracketKeyword_3()); 
-            }
+             before(grammarAccess.getRuntimeClassAccess().getLeftCurlyBracketKeyword_3()); 
+            match(input,30,FOLLOW_2); 
+             after(grammarAccess.getRuntimeClassAccess().getLeftCurlyBracketKeyword_3()); 
 
             }
 
@@ -9882,25 +9188,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RuntimeClass__Group__4"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3296:1: rule__RuntimeClass__Group__4 : rule__RuntimeClass__Group__4__Impl rule__RuntimeClass__Group__5 ;
+    // InternalETPhys.g:3295:1: rule__RuntimeClass__Group__4 : rule__RuntimeClass__Group__4__Impl rule__RuntimeClass__Group__5 ;
     public final void rule__RuntimeClass__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3300:1: ( rule__RuntimeClass__Group__4__Impl rule__RuntimeClass__Group__5 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3301:2: rule__RuntimeClass__Group__4__Impl rule__RuntimeClass__Group__5
+            // InternalETPhys.g:3299:1: ( rule__RuntimeClass__Group__4__Impl rule__RuntimeClass__Group__5 )
+            // InternalETPhys.g:3300:2: rule__RuntimeClass__Group__4__Impl rule__RuntimeClass__Group__5
             {
-            pushFollow(FOLLOW_rule__RuntimeClass__Group__4__Impl_in_rule__RuntimeClass__Group__46703);
+            pushFollow(FOLLOW_16);
             rule__RuntimeClass__Group__4__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__RuntimeClass__Group__5_in_rule__RuntimeClass__Group__46706);
+
+            pushFollow(FOLLOW_2);
             rule__RuntimeClass__Group__5();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -9920,25 +9226,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RuntimeClass__Group__4__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3308:1: rule__RuntimeClass__Group__4__Impl : ( 'model' ) ;
+    // InternalETPhys.g:3307:1: rule__RuntimeClass__Group__4__Impl : ( 'model' ) ;
     public final void rule__RuntimeClass__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3312:1: ( ( 'model' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3313:1: ( 'model' )
+            // InternalETPhys.g:3311:1: ( ( 'model' ) )
+            // InternalETPhys.g:3312:1: ( 'model' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3313:1: ( 'model' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3314:1: 'model'
+            // InternalETPhys.g:3312:1: ( 'model' )
+            // InternalETPhys.g:3313:1: 'model'
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getRuntimeClassAccess().getModelKeyword_4()); 
-            }
-            match(input,14,FOLLOW_14_in_rule__RuntimeClass__Group__4__Impl6734); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getRuntimeClassAccess().getModelKeyword_4()); 
-            }
+             before(grammarAccess.getRuntimeClassAccess().getModelKeyword_4()); 
+            match(input,14,FOLLOW_2); 
+             after(grammarAccess.getRuntimeClassAccess().getModelKeyword_4()); 
 
             }
 
@@ -9961,25 +9263,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RuntimeClass__Group__5"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3327:1: rule__RuntimeClass__Group__5 : rule__RuntimeClass__Group__5__Impl rule__RuntimeClass__Group__6 ;
+    // InternalETPhys.g:3326:1: rule__RuntimeClass__Group__5 : rule__RuntimeClass__Group__5__Impl rule__RuntimeClass__Group__6 ;
     public final void rule__RuntimeClass__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3331:1: ( rule__RuntimeClass__Group__5__Impl rule__RuntimeClass__Group__6 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3332:2: rule__RuntimeClass__Group__5__Impl rule__RuntimeClass__Group__6
+            // InternalETPhys.g:3330:1: ( rule__RuntimeClass__Group__5__Impl rule__RuntimeClass__Group__6 )
+            // InternalETPhys.g:3331:2: rule__RuntimeClass__Group__5__Impl rule__RuntimeClass__Group__6
             {
-            pushFollow(FOLLOW_rule__RuntimeClass__Group__5__Impl_in_rule__RuntimeClass__Group__56765);
+            pushFollow(FOLLOW_23);
             rule__RuntimeClass__Group__5__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__RuntimeClass__Group__6_in_rule__RuntimeClass__Group__56768);
+
+            pushFollow(FOLLOW_2);
             rule__RuntimeClass__Group__6();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -9999,25 +9301,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RuntimeClass__Group__5__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3339:1: rule__RuntimeClass__Group__5__Impl : ( '=' ) ;
+    // InternalETPhys.g:3338:1: rule__RuntimeClass__Group__5__Impl : ( '=' ) ;
     public final void rule__RuntimeClass__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3343:1: ( ( '=' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3344:1: ( '=' )
+            // InternalETPhys.g:3342:1: ( ( '=' ) )
+            // InternalETPhys.g:3343:1: ( '=' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3344:1: ( '=' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3345:1: '='
+            // InternalETPhys.g:3343:1: ( '=' )
+            // InternalETPhys.g:3344:1: '='
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getRuntimeClassAccess().getEqualsSignKeyword_5()); 
-            }
-            match(input,37,FOLLOW_37_in_rule__RuntimeClass__Group__5__Impl6796); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getRuntimeClassAccess().getEqualsSignKeyword_5()); 
-            }
+             before(grammarAccess.getRuntimeClassAccess().getEqualsSignKeyword_5()); 
+            match(input,37,FOLLOW_2); 
+             after(grammarAccess.getRuntimeClassAccess().getEqualsSignKeyword_5()); 
 
             }
 
@@ -10040,25 +9338,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RuntimeClass__Group__6"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3358:1: rule__RuntimeClass__Group__6 : rule__RuntimeClass__Group__6__Impl rule__RuntimeClass__Group__7 ;
+    // InternalETPhys.g:3357:1: rule__RuntimeClass__Group__6 : rule__RuntimeClass__Group__6__Impl rule__RuntimeClass__Group__7 ;
     public final void rule__RuntimeClass__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3362:1: ( rule__RuntimeClass__Group__6__Impl rule__RuntimeClass__Group__7 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3363:2: rule__RuntimeClass__Group__6__Impl rule__RuntimeClass__Group__7
+            // InternalETPhys.g:3361:1: ( rule__RuntimeClass__Group__6__Impl rule__RuntimeClass__Group__7 )
+            // InternalETPhys.g:3362:2: rule__RuntimeClass__Group__6__Impl rule__RuntimeClass__Group__7
             {
-            pushFollow(FOLLOW_rule__RuntimeClass__Group__6__Impl_in_rule__RuntimeClass__Group__66827);
+            pushFollow(FOLLOW_19);
             rule__RuntimeClass__Group__6__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__RuntimeClass__Group__7_in_rule__RuntimeClass__Group__66830);
+
+            pushFollow(FOLLOW_2);
             rule__RuntimeClass__Group__7();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -10078,36 +9376,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RuntimeClass__Group__6__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3370:1: rule__RuntimeClass__Group__6__Impl : ( ( rule__RuntimeClass__ThreadModelAssignment_6 ) ) ;
+    // InternalETPhys.g:3369:1: rule__RuntimeClass__Group__6__Impl : ( ( rule__RuntimeClass__ThreadModelAssignment_6 ) ) ;
     public final void rule__RuntimeClass__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3374:1: ( ( ( rule__RuntimeClass__ThreadModelAssignment_6 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3375:1: ( ( rule__RuntimeClass__ThreadModelAssignment_6 ) )
+            // InternalETPhys.g:3373:1: ( ( ( rule__RuntimeClass__ThreadModelAssignment_6 ) ) )
+            // InternalETPhys.g:3374:1: ( ( rule__RuntimeClass__ThreadModelAssignment_6 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3375:1: ( ( rule__RuntimeClass__ThreadModelAssignment_6 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3376:1: ( rule__RuntimeClass__ThreadModelAssignment_6 )
+            // InternalETPhys.g:3374:1: ( ( rule__RuntimeClass__ThreadModelAssignment_6 ) )
+            // InternalETPhys.g:3375:1: ( rule__RuntimeClass__ThreadModelAssignment_6 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getRuntimeClassAccess().getThreadModelAssignment_6()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3377:1: ( rule__RuntimeClass__ThreadModelAssignment_6 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3377:2: rule__RuntimeClass__ThreadModelAssignment_6
+             before(grammarAccess.getRuntimeClassAccess().getThreadModelAssignment_6()); 
+            // InternalETPhys.g:3376:1: ( rule__RuntimeClass__ThreadModelAssignment_6 )
+            // InternalETPhys.g:3376:2: rule__RuntimeClass__ThreadModelAssignment_6
             {
-            pushFollow(FOLLOW_rule__RuntimeClass__ThreadModelAssignment_6_in_rule__RuntimeClass__Group__6__Impl6857);
+            pushFollow(FOLLOW_2);
             rule__RuntimeClass__ThreadModelAssignment_6();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getRuntimeClassAccess().getThreadModelAssignment_6()); 
             }
 
+             after(grammarAccess.getRuntimeClassAccess().getThreadModelAssignment_6()); 
+
             }
 
 
@@ -10129,20 +9423,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RuntimeClass__Group__7"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3387:1: rule__RuntimeClass__Group__7 : rule__RuntimeClass__Group__7__Impl ;
+    // InternalETPhys.g:3386:1: rule__RuntimeClass__Group__7 : rule__RuntimeClass__Group__7__Impl ;
     public final void rule__RuntimeClass__Group__7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3391:1: ( rule__RuntimeClass__Group__7__Impl )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3392:2: rule__RuntimeClass__Group__7__Impl
+            // InternalETPhys.g:3390:1: ( rule__RuntimeClass__Group__7__Impl )
+            // InternalETPhys.g:3391:2: rule__RuntimeClass__Group__7__Impl
             {
-            pushFollow(FOLLOW_rule__RuntimeClass__Group__7__Impl_in_rule__RuntimeClass__Group__76887);
+            pushFollow(FOLLOW_2);
             rule__RuntimeClass__Group__7__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -10162,25 +9456,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RuntimeClass__Group__7__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3398:1: rule__RuntimeClass__Group__7__Impl : ( '}' ) ;
+    // InternalETPhys.g:3397:1: rule__RuntimeClass__Group__7__Impl : ( '}' ) ;
     public final void rule__RuntimeClass__Group__7__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3402:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3403:1: ( '}' )
+            // InternalETPhys.g:3401:1: ( ( '}' ) )
+            // InternalETPhys.g:3402:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3403:1: ( '}' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3404:1: '}'
+            // InternalETPhys.g:3402:1: ( '}' )
+            // InternalETPhys.g:3403:1: '}'
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getRuntimeClassAccess().getRightCurlyBracketKeyword_7()); 
-            }
-            match(input,31,FOLLOW_31_in_rule__RuntimeClass__Group__7__Impl6915); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getRuntimeClassAccess().getRightCurlyBracketKeyword_7()); 
-            }
+             before(grammarAccess.getRuntimeClassAccess().getRightCurlyBracketKeyword_7()); 
+            match(input,31,FOLLOW_2); 
+             after(grammarAccess.getRuntimeClassAccess().getRightCurlyBracketKeyword_7()); 
 
             }
 
@@ -10203,25 +9493,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__KeyValue__Group__0"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3436:1: rule__KeyValue__Group__0 : rule__KeyValue__Group__0__Impl rule__KeyValue__Group__1 ;
+    // InternalETPhys.g:3435:1: rule__KeyValue__Group__0 : rule__KeyValue__Group__0__Impl rule__KeyValue__Group__1 ;
     public final void rule__KeyValue__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3440:1: ( rule__KeyValue__Group__0__Impl rule__KeyValue__Group__1 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3441:2: rule__KeyValue__Group__0__Impl rule__KeyValue__Group__1
+            // InternalETPhys.g:3439:1: ( rule__KeyValue__Group__0__Impl rule__KeyValue__Group__1 )
+            // InternalETPhys.g:3440:2: rule__KeyValue__Group__0__Impl rule__KeyValue__Group__1
             {
-            pushFollow(FOLLOW_rule__KeyValue__Group__0__Impl_in_rule__KeyValue__Group__06965);
+            pushFollow(FOLLOW_16);
             rule__KeyValue__Group__0__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__KeyValue__Group__1_in_rule__KeyValue__Group__06968);
+
+            pushFollow(FOLLOW_2);
             rule__KeyValue__Group__1();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -10241,36 +9531,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__KeyValue__Group__0__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3448:1: rule__KeyValue__Group__0__Impl : ( ( rule__KeyValue__KeyAssignment_0 ) ) ;
+    // InternalETPhys.g:3447:1: rule__KeyValue__Group__0__Impl : ( ( rule__KeyValue__KeyAssignment_0 ) ) ;
     public final void rule__KeyValue__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3452:1: ( ( ( rule__KeyValue__KeyAssignment_0 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3453:1: ( ( rule__KeyValue__KeyAssignment_0 ) )
+            // InternalETPhys.g:3451:1: ( ( ( rule__KeyValue__KeyAssignment_0 ) ) )
+            // InternalETPhys.g:3452:1: ( ( rule__KeyValue__KeyAssignment_0 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3453:1: ( ( rule__KeyValue__KeyAssignment_0 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3454:1: ( rule__KeyValue__KeyAssignment_0 )
+            // InternalETPhys.g:3452:1: ( ( rule__KeyValue__KeyAssignment_0 ) )
+            // InternalETPhys.g:3453:1: ( rule__KeyValue__KeyAssignment_0 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getKeyValueAccess().getKeyAssignment_0()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3455:1: ( rule__KeyValue__KeyAssignment_0 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3455:2: rule__KeyValue__KeyAssignment_0
+             before(grammarAccess.getKeyValueAccess().getKeyAssignment_0()); 
+            // InternalETPhys.g:3454:1: ( rule__KeyValue__KeyAssignment_0 )
+            // InternalETPhys.g:3454:2: rule__KeyValue__KeyAssignment_0
             {
-            pushFollow(FOLLOW_rule__KeyValue__KeyAssignment_0_in_rule__KeyValue__Group__0__Impl6995);
+            pushFollow(FOLLOW_2);
             rule__KeyValue__KeyAssignment_0();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getKeyValueAccess().getKeyAssignment_0()); 
             }
 
+             after(grammarAccess.getKeyValueAccess().getKeyAssignment_0()); 
+
             }
 
 
@@ -10292,25 +9578,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__KeyValue__Group__1"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3465:1: rule__KeyValue__Group__1 : rule__KeyValue__Group__1__Impl rule__KeyValue__Group__2 ;
+    // InternalETPhys.g:3464:1: rule__KeyValue__Group__1 : rule__KeyValue__Group__1__Impl rule__KeyValue__Group__2 ;
     public final void rule__KeyValue__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3469:1: ( rule__KeyValue__Group__1__Impl rule__KeyValue__Group__2 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3470:2: rule__KeyValue__Group__1__Impl rule__KeyValue__Group__2
+            // InternalETPhys.g:3468:1: ( rule__KeyValue__Group__1__Impl rule__KeyValue__Group__2 )
+            // InternalETPhys.g:3469:2: rule__KeyValue__Group__1__Impl rule__KeyValue__Group__2
             {
-            pushFollow(FOLLOW_rule__KeyValue__Group__1__Impl_in_rule__KeyValue__Group__17025);
+            pushFollow(FOLLOW_24);
             rule__KeyValue__Group__1__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__KeyValue__Group__2_in_rule__KeyValue__Group__17028);
+
+            pushFollow(FOLLOW_2);
             rule__KeyValue__Group__2();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -10330,25 +9616,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__KeyValue__Group__1__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3477:1: rule__KeyValue__Group__1__Impl : ( '=' ) ;
+    // InternalETPhys.g:3476:1: rule__KeyValue__Group__1__Impl : ( '=' ) ;
     public final void rule__KeyValue__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3481:1: ( ( '=' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3482:1: ( '=' )
+            // InternalETPhys.g:3480:1: ( ( '=' ) )
+            // InternalETPhys.g:3481:1: ( '=' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3482:1: ( '=' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3483:1: '='
+            // InternalETPhys.g:3481:1: ( '=' )
+            // InternalETPhys.g:3482:1: '='
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getKeyValueAccess().getEqualsSignKeyword_1()); 
-            }
-            match(input,37,FOLLOW_37_in_rule__KeyValue__Group__1__Impl7056); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getKeyValueAccess().getEqualsSignKeyword_1()); 
-            }
+             before(grammarAccess.getKeyValueAccess().getEqualsSignKeyword_1()); 
+            match(input,37,FOLLOW_2); 
+             after(grammarAccess.getKeyValueAccess().getEqualsSignKeyword_1()); 
 
             }
 
@@ -10371,20 +9653,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__KeyValue__Group__2"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3496:1: rule__KeyValue__Group__2 : rule__KeyValue__Group__2__Impl ;
+    // InternalETPhys.g:3495:1: rule__KeyValue__Group__2 : rule__KeyValue__Group__2__Impl ;
     public final void rule__KeyValue__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3500:1: ( rule__KeyValue__Group__2__Impl )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3501:2: rule__KeyValue__Group__2__Impl
+            // InternalETPhys.g:3499:1: ( rule__KeyValue__Group__2__Impl )
+            // InternalETPhys.g:3500:2: rule__KeyValue__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__KeyValue__Group__2__Impl_in_rule__KeyValue__Group__27087);
+            pushFollow(FOLLOW_2);
             rule__KeyValue__Group__2__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -10404,36 +9686,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__KeyValue__Group__2__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3507:1: rule__KeyValue__Group__2__Impl : ( ( rule__KeyValue__ValueAssignment_2 ) ) ;
+    // InternalETPhys.g:3506:1: rule__KeyValue__Group__2__Impl : ( ( rule__KeyValue__ValueAssignment_2 ) ) ;
     public final void rule__KeyValue__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3511:1: ( ( ( rule__KeyValue__ValueAssignment_2 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3512:1: ( ( rule__KeyValue__ValueAssignment_2 ) )
+            // InternalETPhys.g:3510:1: ( ( ( rule__KeyValue__ValueAssignment_2 ) ) )
+            // InternalETPhys.g:3511:1: ( ( rule__KeyValue__ValueAssignment_2 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3512:1: ( ( rule__KeyValue__ValueAssignment_2 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3513:1: ( rule__KeyValue__ValueAssignment_2 )
+            // InternalETPhys.g:3511:1: ( ( rule__KeyValue__ValueAssignment_2 ) )
+            // InternalETPhys.g:3512:1: ( rule__KeyValue__ValueAssignment_2 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getKeyValueAccess().getValueAssignment_2()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3514:1: ( rule__KeyValue__ValueAssignment_2 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3514:2: rule__KeyValue__ValueAssignment_2
+             before(grammarAccess.getKeyValueAccess().getValueAssignment_2()); 
+            // InternalETPhys.g:3513:1: ( rule__KeyValue__ValueAssignment_2 )
+            // InternalETPhys.g:3513:2: rule__KeyValue__ValueAssignment_2
             {
-            pushFollow(FOLLOW_rule__KeyValue__ValueAssignment_2_in_rule__KeyValue__Group__2__Impl7114);
+            pushFollow(FOLLOW_2);
             rule__KeyValue__ValueAssignment_2();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getKeyValueAccess().getValueAssignment_2()); 
             }
 
+             after(grammarAccess.getKeyValueAccess().getValueAssignment_2()); 
+
             }
 
 
@@ -10455,25 +9733,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__0"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3533:1: rule__SimpleAnnotationAttribute__Group__0 : rule__SimpleAnnotationAttribute__Group__0__Impl rule__SimpleAnnotationAttribute__Group__1 ;
+    // InternalETPhys.g:3532:1: rule__SimpleAnnotationAttribute__Group__0 : rule__SimpleAnnotationAttribute__Group__0__Impl rule__SimpleAnnotationAttribute__Group__1 ;
     public final void rule__SimpleAnnotationAttribute__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3537:1: ( rule__SimpleAnnotationAttribute__Group__0__Impl rule__SimpleAnnotationAttribute__Group__1 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3538:2: rule__SimpleAnnotationAttribute__Group__0__Impl rule__SimpleAnnotationAttribute__Group__1
+            // InternalETPhys.g:3536:1: ( rule__SimpleAnnotationAttribute__Group__0__Impl rule__SimpleAnnotationAttribute__Group__1 )
+            // InternalETPhys.g:3537:2: rule__SimpleAnnotationAttribute__Group__0__Impl rule__SimpleAnnotationAttribute__Group__1
             {
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__0__Impl_in_rule__SimpleAnnotationAttribute__Group__07153);
+            pushFollow(FOLLOW_25);
             rule__SimpleAnnotationAttribute__Group__0__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__1_in_rule__SimpleAnnotationAttribute__Group__07156);
+
+            pushFollow(FOLLOW_2);
             rule__SimpleAnnotationAttribute__Group__1();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -10493,36 +9771,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__0__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3545:1: rule__SimpleAnnotationAttribute__Group__0__Impl : ( ( rule__SimpleAnnotationAttribute__Alternatives_0 ) ) ;
+    // InternalETPhys.g:3544:1: rule__SimpleAnnotationAttribute__Group__0__Impl : ( ( rule__SimpleAnnotationAttribute__Alternatives_0 ) ) ;
     public final void rule__SimpleAnnotationAttribute__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3549:1: ( ( ( rule__SimpleAnnotationAttribute__Alternatives_0 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3550:1: ( ( rule__SimpleAnnotationAttribute__Alternatives_0 ) )
+            // InternalETPhys.g:3548:1: ( ( ( rule__SimpleAnnotationAttribute__Alternatives_0 ) ) )
+            // InternalETPhys.g:3549:1: ( ( rule__SimpleAnnotationAttribute__Alternatives_0 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3550:1: ( ( rule__SimpleAnnotationAttribute__Alternatives_0 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3551:1: ( rule__SimpleAnnotationAttribute__Alternatives_0 )
+            // InternalETPhys.g:3549:1: ( ( rule__SimpleAnnotationAttribute__Alternatives_0 ) )
+            // InternalETPhys.g:3550:1: ( rule__SimpleAnnotationAttribute__Alternatives_0 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getSimpleAnnotationAttributeAccess().getAlternatives_0()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3552:1: ( rule__SimpleAnnotationAttribute__Alternatives_0 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3552:2: rule__SimpleAnnotationAttribute__Alternatives_0
+             before(grammarAccess.getSimpleAnnotationAttributeAccess().getAlternatives_0()); 
+            // InternalETPhys.g:3551:1: ( rule__SimpleAnnotationAttribute__Alternatives_0 )
+            // InternalETPhys.g:3551:2: rule__SimpleAnnotationAttribute__Alternatives_0
             {
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Alternatives_0_in_rule__SimpleAnnotationAttribute__Group__0__Impl7183);
+            pushFollow(FOLLOW_2);
             rule__SimpleAnnotationAttribute__Alternatives_0();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getSimpleAnnotationAttributeAccess().getAlternatives_0()); 
             }
 
+             after(grammarAccess.getSimpleAnnotationAttributeAccess().getAlternatives_0()); 
+
             }
 
 
@@ -10544,25 +9818,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__1"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3562:1: rule__SimpleAnnotationAttribute__Group__1 : rule__SimpleAnnotationAttribute__Group__1__Impl rule__SimpleAnnotationAttribute__Group__2 ;
+    // InternalETPhys.g:3561:1: rule__SimpleAnnotationAttribute__Group__1 : rule__SimpleAnnotationAttribute__Group__1__Impl rule__SimpleAnnotationAttribute__Group__2 ;
     public final void rule__SimpleAnnotationAttribute__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3566:1: ( rule__SimpleAnnotationAttribute__Group__1__Impl rule__SimpleAnnotationAttribute__Group__2 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3567:2: rule__SimpleAnnotationAttribute__Group__1__Impl rule__SimpleAnnotationAttribute__Group__2
+            // InternalETPhys.g:3565:1: ( rule__SimpleAnnotationAttribute__Group__1__Impl rule__SimpleAnnotationAttribute__Group__2 )
+            // InternalETPhys.g:3566:2: rule__SimpleAnnotationAttribute__Group__1__Impl rule__SimpleAnnotationAttribute__Group__2
             {
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__1__Impl_in_rule__SimpleAnnotationAttribute__Group__17213);
+            pushFollow(FOLLOW_3);
             rule__SimpleAnnotationAttribute__Group__1__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__2_in_rule__SimpleAnnotationAttribute__Group__17216);
+
+            pushFollow(FOLLOW_2);
             rule__SimpleAnnotationAttribute__Group__2();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -10582,25 +9856,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__1__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3574:1: rule__SimpleAnnotationAttribute__Group__1__Impl : ( 'attribute' ) ;
+    // InternalETPhys.g:3573:1: rule__SimpleAnnotationAttribute__Group__1__Impl : ( 'attribute' ) ;
     public final void rule__SimpleAnnotationAttribute__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3578:1: ( ( 'attribute' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3579:1: ( 'attribute' )
+            // InternalETPhys.g:3577:1: ( ( 'attribute' ) )
+            // InternalETPhys.g:3578:1: ( 'attribute' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3579:1: ( 'attribute' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3580:1: 'attribute'
+            // InternalETPhys.g:3578:1: ( 'attribute' )
+            // InternalETPhys.g:3579:1: 'attribute'
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getSimpleAnnotationAttributeAccess().getAttributeKeyword_1()); 
-            }
-            match(input,47,FOLLOW_47_in_rule__SimpleAnnotationAttribute__Group__1__Impl7244); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getSimpleAnnotationAttributeAccess().getAttributeKeyword_1()); 
-            }
+             before(grammarAccess.getSimpleAnnotationAttributeAccess().getAttributeKeyword_1()); 
+            match(input,47,FOLLOW_2); 
+             after(grammarAccess.getSimpleAnnotationAttributeAccess().getAttributeKeyword_1()); 
 
             }
 
@@ -10623,25 +9893,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__2"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3593:1: rule__SimpleAnnotationAttribute__Group__2 : rule__SimpleAnnotationAttribute__Group__2__Impl rule__SimpleAnnotationAttribute__Group__3 ;
+    // InternalETPhys.g:3592:1: rule__SimpleAnnotationAttribute__Group__2 : rule__SimpleAnnotationAttribute__Group__2__Impl rule__SimpleAnnotationAttribute__Group__3 ;
     public final void rule__SimpleAnnotationAttribute__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3597:1: ( rule__SimpleAnnotationAttribute__Group__2__Impl rule__SimpleAnnotationAttribute__Group__3 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3598:2: rule__SimpleAnnotationAttribute__Group__2__Impl rule__SimpleAnnotationAttribute__Group__3
+            // InternalETPhys.g:3596:1: ( rule__SimpleAnnotationAttribute__Group__2__Impl rule__SimpleAnnotationAttribute__Group__3 )
+            // InternalETPhys.g:3597:2: rule__SimpleAnnotationAttribute__Group__2__Impl rule__SimpleAnnotationAttribute__Group__3
             {
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__2__Impl_in_rule__SimpleAnnotationAttribute__Group__27275);
+            pushFollow(FOLLOW_11);
             rule__SimpleAnnotationAttribute__Group__2__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__3_in_rule__SimpleAnnotationAttribute__Group__27278);
+
+            pushFollow(FOLLOW_2);
             rule__SimpleAnnotationAttribute__Group__3();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -10661,36 +9931,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__2__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3605:1: rule__SimpleAnnotationAttribute__Group__2__Impl : ( ( rule__SimpleAnnotationAttribute__NameAssignment_2 ) ) ;
+    // InternalETPhys.g:3604:1: rule__SimpleAnnotationAttribute__Group__2__Impl : ( ( rule__SimpleAnnotationAttribute__NameAssignment_2 ) ) ;
     public final void rule__SimpleAnnotationAttribute__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3609:1: ( ( ( rule__SimpleAnnotationAttribute__NameAssignment_2 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3610:1: ( ( rule__SimpleAnnotationAttribute__NameAssignment_2 ) )
+            // InternalETPhys.g:3608:1: ( ( ( rule__SimpleAnnotationAttribute__NameAssignment_2 ) ) )
+            // InternalETPhys.g:3609:1: ( ( rule__SimpleAnnotationAttribute__NameAssignment_2 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3610:1: ( ( rule__SimpleAnnotationAttribute__NameAssignment_2 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3611:1: ( rule__SimpleAnnotationAttribute__NameAssignment_2 )
+            // InternalETPhys.g:3609:1: ( ( rule__SimpleAnnotationAttribute__NameAssignment_2 ) )
+            // InternalETPhys.g:3610:1: ( rule__SimpleAnnotationAttribute__NameAssignment_2 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getSimpleAnnotationAttributeAccess().getNameAssignment_2()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3612:1: ( rule__SimpleAnnotationAttribute__NameAssignment_2 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3612:2: rule__SimpleAnnotationAttribute__NameAssignment_2
+             before(grammarAccess.getSimpleAnnotationAttributeAccess().getNameAssignment_2()); 
+            // InternalETPhys.g:3611:1: ( rule__SimpleAnnotationAttribute__NameAssignment_2 )
+            // InternalETPhys.g:3611:2: rule__SimpleAnnotationAttribute__NameAssignment_2
             {
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__NameAssignment_2_in_rule__SimpleAnnotationAttribute__Group__2__Impl7305);
+            pushFollow(FOLLOW_2);
             rule__SimpleAnnotationAttribute__NameAssignment_2();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getSimpleAnnotationAttributeAccess().getNameAssignment_2()); 
             }
 
+             after(grammarAccess.getSimpleAnnotationAttributeAccess().getNameAssignment_2()); 
+
             }
 
 
@@ -10712,25 +9978,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__3"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3622:1: rule__SimpleAnnotationAttribute__Group__3 : rule__SimpleAnnotationAttribute__Group__3__Impl rule__SimpleAnnotationAttribute__Group__4 ;
+    // InternalETPhys.g:3621:1: rule__SimpleAnnotationAttribute__Group__3 : rule__SimpleAnnotationAttribute__Group__3__Impl rule__SimpleAnnotationAttribute__Group__4 ;
     public final void rule__SimpleAnnotationAttribute__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3626:1: ( rule__SimpleAnnotationAttribute__Group__3__Impl rule__SimpleAnnotationAttribute__Group__4 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3627:2: rule__SimpleAnnotationAttribute__Group__3__Impl rule__SimpleAnnotationAttribute__Group__4
+            // InternalETPhys.g:3625:1: ( rule__SimpleAnnotationAttribute__Group__3__Impl rule__SimpleAnnotationAttribute__Group__4 )
+            // InternalETPhys.g:3626:2: rule__SimpleAnnotationAttribute__Group__3__Impl rule__SimpleAnnotationAttribute__Group__4
             {
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__3__Impl_in_rule__SimpleAnnotationAttribute__Group__37335);
+            pushFollow(FOLLOW_26);
             rule__SimpleAnnotationAttribute__Group__3__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__4_in_rule__SimpleAnnotationAttribute__Group__37338);
+
+            pushFollow(FOLLOW_2);
             rule__SimpleAnnotationAttribute__Group__4();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -10750,25 +10016,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__3__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3634:1: rule__SimpleAnnotationAttribute__Group__3__Impl : ( ':' ) ;
+    // InternalETPhys.g:3633:1: rule__SimpleAnnotationAttribute__Group__3__Impl : ( ':' ) ;
     public final void rule__SimpleAnnotationAttribute__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3638:1: ( ( ':' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3639:1: ( ':' )
+            // InternalETPhys.g:3637:1: ( ( ':' ) )
+            // InternalETPhys.g:3638:1: ( ':' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3639:1: ( ':' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3640:1: ':'
+            // InternalETPhys.g:3638:1: ( ':' )
+            // InternalETPhys.g:3639:1: ':'
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getSimpleAnnotationAttributeAccess().getColonKeyword_3()); 
-            }
-            match(input,34,FOLLOW_34_in_rule__SimpleAnnotationAttribute__Group__3__Impl7366); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getSimpleAnnotationAttributeAccess().getColonKeyword_3()); 
-            }
+             before(grammarAccess.getSimpleAnnotationAttributeAccess().getColonKeyword_3()); 
+            match(input,34,FOLLOW_2); 
+             after(grammarAccess.getSimpleAnnotationAttributeAccess().getColonKeyword_3()); 
 
             }
 
@@ -10791,20 +10053,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__4"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3653:1: rule__SimpleAnnotationAttribute__Group__4 : rule__SimpleAnnotationAttribute__Group__4__Impl ;
+    // InternalETPhys.g:3652:1: rule__SimpleAnnotationAttribute__Group__4 : rule__SimpleAnnotationAttribute__Group__4__Impl ;
     public final void rule__SimpleAnnotationAttribute__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3657:1: ( rule__SimpleAnnotationAttribute__Group__4__Impl )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3658:2: rule__SimpleAnnotationAttribute__Group__4__Impl
+            // InternalETPhys.g:3656:1: ( rule__SimpleAnnotationAttribute__Group__4__Impl )
+            // InternalETPhys.g:3657:2: rule__SimpleAnnotationAttribute__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__4__Impl_in_rule__SimpleAnnotationAttribute__Group__47397);
+            pushFollow(FOLLOW_2);
             rule__SimpleAnnotationAttribute__Group__4__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -10824,36 +10086,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__4__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3664:1: rule__SimpleAnnotationAttribute__Group__4__Impl : ( ( rule__SimpleAnnotationAttribute__TypeAssignment_4 ) ) ;
+    // InternalETPhys.g:3663:1: rule__SimpleAnnotationAttribute__Group__4__Impl : ( ( rule__SimpleAnnotationAttribute__TypeAssignment_4 ) ) ;
     public final void rule__SimpleAnnotationAttribute__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3668:1: ( ( ( rule__SimpleAnnotationAttribute__TypeAssignment_4 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3669:1: ( ( rule__SimpleAnnotationAttribute__TypeAssignment_4 ) )
+            // InternalETPhys.g:3667:1: ( ( ( rule__SimpleAnnotationAttribute__TypeAssignment_4 ) ) )
+            // InternalETPhys.g:3668:1: ( ( rule__SimpleAnnotationAttribute__TypeAssignment_4 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3669:1: ( ( rule__SimpleAnnotationAttribute__TypeAssignment_4 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3670:1: ( rule__SimpleAnnotationAttribute__TypeAssignment_4 )
+            // InternalETPhys.g:3668:1: ( ( rule__SimpleAnnotationAttribute__TypeAssignment_4 ) )
+            // InternalETPhys.g:3669:1: ( rule__SimpleAnnotationAttribute__TypeAssignment_4 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getSimpleAnnotationAttributeAccess().getTypeAssignment_4()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3671:1: ( rule__SimpleAnnotationAttribute__TypeAssignment_4 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3671:2: rule__SimpleAnnotationAttribute__TypeAssignment_4
+             before(grammarAccess.getSimpleAnnotationAttributeAccess().getTypeAssignment_4()); 
+            // InternalETPhys.g:3670:1: ( rule__SimpleAnnotationAttribute__TypeAssignment_4 )
+            // InternalETPhys.g:3670:2: rule__SimpleAnnotationAttribute__TypeAssignment_4
             {
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__TypeAssignment_4_in_rule__SimpleAnnotationAttribute__Group__4__Impl7424);
+            pushFollow(FOLLOW_2);
             rule__SimpleAnnotationAttribute__TypeAssignment_4();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getSimpleAnnotationAttributeAccess().getTypeAssignment_4()); 
             }
 
+             after(grammarAccess.getSimpleAnnotationAttributeAccess().getTypeAssignment_4()); 
+
             }
 
 
@@ -10875,25 +10133,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__0"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3691:1: rule__EnumAnnotationAttribute__Group__0 : rule__EnumAnnotationAttribute__Group__0__Impl rule__EnumAnnotationAttribute__Group__1 ;
+    // InternalETPhys.g:3690:1: rule__EnumAnnotationAttribute__Group__0 : rule__EnumAnnotationAttribute__Group__0__Impl rule__EnumAnnotationAttribute__Group__1 ;
     public final void rule__EnumAnnotationAttribute__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3695:1: ( rule__EnumAnnotationAttribute__Group__0__Impl rule__EnumAnnotationAttribute__Group__1 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3696:2: rule__EnumAnnotationAttribute__Group__0__Impl rule__EnumAnnotationAttribute__Group__1
+            // InternalETPhys.g:3694:1: ( rule__EnumAnnotationAttribute__Group__0__Impl rule__EnumAnnotationAttribute__Group__1 )
+            // InternalETPhys.g:3695:2: rule__EnumAnnotationAttribute__Group__0__Impl rule__EnumAnnotationAttribute__Group__1
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__0__Impl_in_rule__EnumAnnotationAttribute__Group__07464);
+            pushFollow(FOLLOW_25);
             rule__EnumAnnotationAttribute__Group__0__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__1_in_rule__EnumAnnotationAttribute__Group__07467);
+
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group__1();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -10913,36 +10171,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__0__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3703:1: rule__EnumAnnotationAttribute__Group__0__Impl : ( ( rule__EnumAnnotationAttribute__Alternatives_0 ) ) ;
+    // InternalETPhys.g:3702:1: rule__EnumAnnotationAttribute__Group__0__Impl : ( ( rule__EnumAnnotationAttribute__Alternatives_0 ) ) ;
     public final void rule__EnumAnnotationAttribute__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3707:1: ( ( ( rule__EnumAnnotationAttribute__Alternatives_0 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3708:1: ( ( rule__EnumAnnotationAttribute__Alternatives_0 ) )
+            // InternalETPhys.g:3706:1: ( ( ( rule__EnumAnnotationAttribute__Alternatives_0 ) ) )
+            // InternalETPhys.g:3707:1: ( ( rule__EnumAnnotationAttribute__Alternatives_0 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3708:1: ( ( rule__EnumAnnotationAttribute__Alternatives_0 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3709:1: ( rule__EnumAnnotationAttribute__Alternatives_0 )
+            // InternalETPhys.g:3707:1: ( ( rule__EnumAnnotationAttribute__Alternatives_0 ) )
+            // InternalETPhys.g:3708:1: ( rule__EnumAnnotationAttribute__Alternatives_0 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getEnumAnnotationAttributeAccess().getAlternatives_0()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3710:1: ( rule__EnumAnnotationAttribute__Alternatives_0 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3710:2: rule__EnumAnnotationAttribute__Alternatives_0
+             before(grammarAccess.getEnumAnnotationAttributeAccess().getAlternatives_0()); 
+            // InternalETPhys.g:3709:1: ( rule__EnumAnnotationAttribute__Alternatives_0 )
+            // InternalETPhys.g:3709:2: rule__EnumAnnotationAttribute__Alternatives_0
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Alternatives_0_in_rule__EnumAnnotationAttribute__Group__0__Impl7494);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Alternatives_0();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getEnumAnnotationAttributeAccess().getAlternatives_0()); 
             }
 
+             after(grammarAccess.getEnumAnnotationAttributeAccess().getAlternatives_0()); 
+
             }
 
 
@@ -10964,25 +10218,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__1"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3720:1: rule__EnumAnnotationAttribute__Group__1 : rule__EnumAnnotationAttribute__Group__1__Impl rule__EnumAnnotationAttribute__Group__2 ;
+    // InternalETPhys.g:3719:1: rule__EnumAnnotationAttribute__Group__1 : rule__EnumAnnotationAttribute__Group__1__Impl rule__EnumAnnotationAttribute__Group__2 ;
     public final void rule__EnumAnnotationAttribute__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3724:1: ( rule__EnumAnnotationAttribute__Group__1__Impl rule__EnumAnnotationAttribute__Group__2 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3725:2: rule__EnumAnnotationAttribute__Group__1__Impl rule__EnumAnnotationAttribute__Group__2
+            // InternalETPhys.g:3723:1: ( rule__EnumAnnotationAttribute__Group__1__Impl rule__EnumAnnotationAttribute__Group__2 )
+            // InternalETPhys.g:3724:2: rule__EnumAnnotationAttribute__Group__1__Impl rule__EnumAnnotationAttribute__Group__2
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__1__Impl_in_rule__EnumAnnotationAttribute__Group__17524);
+            pushFollow(FOLLOW_3);
             rule__EnumAnnotationAttribute__Group__1__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__2_in_rule__EnumAnnotationAttribute__Group__17527);
+
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group__2();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -11002,25 +10256,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__1__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3732:1: rule__EnumAnnotationAttribute__Group__1__Impl : ( 'attribute' ) ;
+    // InternalETPhys.g:3731:1: rule__EnumAnnotationAttribute__Group__1__Impl : ( 'attribute' ) ;
     public final void rule__EnumAnnotationAttribute__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3736:1: ( ( 'attribute' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3737:1: ( 'attribute' )
+            // InternalETPhys.g:3735:1: ( ( 'attribute' ) )
+            // InternalETPhys.g:3736:1: ( 'attribute' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3737:1: ( 'attribute' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3738:1: 'attribute'
+            // InternalETPhys.g:3736:1: ( 'attribute' )
+            // InternalETPhys.g:3737:1: 'attribute'
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getEnumAnnotationAttributeAccess().getAttributeKeyword_1()); 
-            }
-            match(input,47,FOLLOW_47_in_rule__EnumAnnotationAttribute__Group__1__Impl7555); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getEnumAnnotationAttributeAccess().getAttributeKeyword_1()); 
-            }
+             before(grammarAccess.getEnumAnnotationAttributeAccess().getAttributeKeyword_1()); 
+            match(input,47,FOLLOW_2); 
+             after(grammarAccess.getEnumAnnotationAttributeAccess().getAttributeKeyword_1()); 
 
             }
 
@@ -11043,25 +10293,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__2"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3751:1: rule__EnumAnnotationAttribute__Group__2 : rule__EnumAnnotationAttribute__Group__2__Impl rule__EnumAnnotationAttribute__Group__3 ;
+    // InternalETPhys.g:3750:1: rule__EnumAnnotationAttribute__Group__2 : rule__EnumAnnotationAttribute__Group__2__Impl rule__EnumAnnotationAttribute__Group__3 ;
     public final void rule__EnumAnnotationAttribute__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3755:1: ( rule__EnumAnnotationAttribute__Group__2__Impl rule__EnumAnnotationAttribute__Group__3 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3756:2: rule__EnumAnnotationAttribute__Group__2__Impl rule__EnumAnnotationAttribute__Group__3
+            // InternalETPhys.g:3754:1: ( rule__EnumAnnotationAttribute__Group__2__Impl rule__EnumAnnotationAttribute__Group__3 )
+            // InternalETPhys.g:3755:2: rule__EnumAnnotationAttribute__Group__2__Impl rule__EnumAnnotationAttribute__Group__3
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__2__Impl_in_rule__EnumAnnotationAttribute__Group__27586);
+            pushFollow(FOLLOW_11);
             rule__EnumAnnotationAttribute__Group__2__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__3_in_rule__EnumAnnotationAttribute__Group__27589);
+
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group__3();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -11081,36 +10331,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__2__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3763:1: rule__EnumAnnotationAttribute__Group__2__Impl : ( ( rule__EnumAnnotationAttribute__NameAssignment_2 ) ) ;
+    // InternalETPhys.g:3762:1: rule__EnumAnnotationAttribute__Group__2__Impl : ( ( rule__EnumAnnotationAttribute__NameAssignment_2 ) ) ;
     public final void rule__EnumAnnotationAttribute__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3767:1: ( ( ( rule__EnumAnnotationAttribute__NameAssignment_2 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3768:1: ( ( rule__EnumAnnotationAttribute__NameAssignment_2 ) )
+            // InternalETPhys.g:3766:1: ( ( ( rule__EnumAnnotationAttribute__NameAssignment_2 ) ) )
+            // InternalETPhys.g:3767:1: ( ( rule__EnumAnnotationAttribute__NameAssignment_2 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3768:1: ( ( rule__EnumAnnotationAttribute__NameAssignment_2 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3769:1: ( rule__EnumAnnotationAttribute__NameAssignment_2 )
+            // InternalETPhys.g:3767:1: ( ( rule__EnumAnnotationAttribute__NameAssignment_2 ) )
+            // InternalETPhys.g:3768:1: ( rule__EnumAnnotationAttribute__NameAssignment_2 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getEnumAnnotationAttributeAccess().getNameAssignment_2()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3770:1: ( rule__EnumAnnotationAttribute__NameAssignment_2 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3770:2: rule__EnumAnnotationAttribute__NameAssignment_2
+             before(grammarAccess.getEnumAnnotationAttributeAccess().getNameAssignment_2()); 
+            // InternalETPhys.g:3769:1: ( rule__EnumAnnotationAttribute__NameAssignment_2 )
+            // InternalETPhys.g:3769:2: rule__EnumAnnotationAttribute__NameAssignment_2
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__NameAssignment_2_in_rule__EnumAnnotationAttribute__Group__2__Impl7616);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__NameAssignment_2();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getEnumAnnotationAttributeAccess().getNameAssignment_2()); 
             }
 
+             after(grammarAccess.getEnumAnnotationAttributeAccess().getNameAssignment_2()); 
+
             }
 
 
@@ -11132,25 +10378,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__3"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3780:1: rule__EnumAnnotationAttribute__Group__3 : rule__EnumAnnotationAttribute__Group__3__Impl rule__EnumAnnotationAttribute__Group__4 ;
+    // InternalETPhys.g:3779:1: rule__EnumAnnotationAttribute__Group__3 : rule__EnumAnnotationAttribute__Group__3__Impl rule__EnumAnnotationAttribute__Group__4 ;
     public final void rule__EnumAnnotationAttribute__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3784:1: ( rule__EnumAnnotationAttribute__Group__3__Impl rule__EnumAnnotationAttribute__Group__4 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3785:2: rule__EnumAnnotationAttribute__Group__3__Impl rule__EnumAnnotationAttribute__Group__4
+            // InternalETPhys.g:3783:1: ( rule__EnumAnnotationAttribute__Group__3__Impl rule__EnumAnnotationAttribute__Group__4 )
+            // InternalETPhys.g:3784:2: rule__EnumAnnotationAttribute__Group__3__Impl rule__EnumAnnotationAttribute__Group__4
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__3__Impl_in_rule__EnumAnnotationAttribute__Group__37646);
+            pushFollow(FOLLOW_4);
             rule__EnumAnnotationAttribute__Group__3__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__4_in_rule__EnumAnnotationAttribute__Group__37649);
+
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group__4();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -11170,25 +10416,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__3__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3792:1: rule__EnumAnnotationAttribute__Group__3__Impl : ( ':' ) ;
+    // InternalETPhys.g:3791:1: rule__EnumAnnotationAttribute__Group__3__Impl : ( ':' ) ;
     public final void rule__EnumAnnotationAttribute__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3796:1: ( ( ':' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3797:1: ( ':' )
+            // InternalETPhys.g:3795:1: ( ( ':' ) )
+            // InternalETPhys.g:3796:1: ( ':' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3797:1: ( ':' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3798:1: ':'
+            // InternalETPhys.g:3796:1: ( ':' )
+            // InternalETPhys.g:3797:1: ':'
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getEnumAnnotationAttributeAccess().getColonKeyword_3()); 
-            }
-            match(input,34,FOLLOW_34_in_rule__EnumAnnotationAttribute__Group__3__Impl7677); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getEnumAnnotationAttributeAccess().getColonKeyword_3()); 
-            }
+             before(grammarAccess.getEnumAnnotationAttributeAccess().getColonKeyword_3()); 
+            match(input,34,FOLLOW_2); 
+             after(grammarAccess.getEnumAnnotationAttributeAccess().getColonKeyword_3()); 
 
             }
 
@@ -11211,25 +10453,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__4"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3811:1: rule__EnumAnnotationAttribute__Group__4 : rule__EnumAnnotationAttribute__Group__4__Impl rule__EnumAnnotationAttribute__Group__5 ;
+    // InternalETPhys.g:3810:1: rule__EnumAnnotationAttribute__Group__4 : rule__EnumAnnotationAttribute__Group__4__Impl rule__EnumAnnotationAttribute__Group__5 ;
     public final void rule__EnumAnnotationAttribute__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3815:1: ( rule__EnumAnnotationAttribute__Group__4__Impl rule__EnumAnnotationAttribute__Group__5 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3816:2: rule__EnumAnnotationAttribute__Group__4__Impl rule__EnumAnnotationAttribute__Group__5
+            // InternalETPhys.g:3814:1: ( rule__EnumAnnotationAttribute__Group__4__Impl rule__EnumAnnotationAttribute__Group__5 )
+            // InternalETPhys.g:3815:2: rule__EnumAnnotationAttribute__Group__4__Impl rule__EnumAnnotationAttribute__Group__5
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__4__Impl_in_rule__EnumAnnotationAttribute__Group__47708);
+            pushFollow(FOLLOW_27);
             rule__EnumAnnotationAttribute__Group__4__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__5_in_rule__EnumAnnotationAttribute__Group__47711);
+
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group__5();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -11249,25 +10491,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__4__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3823:1: rule__EnumAnnotationAttribute__Group__4__Impl : ( '{' ) ;
+    // InternalETPhys.g:3822:1: rule__EnumAnnotationAttribute__Group__4__Impl : ( '{' ) ;
     public final void rule__EnumAnnotationAttribute__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3827:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3828:1: ( '{' )
+            // InternalETPhys.g:3826:1: ( ( '{' ) )
+            // InternalETPhys.g:3827:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3828:1: ( '{' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3829:1: '{'
+            // InternalETPhys.g:3827:1: ( '{' )
+            // InternalETPhys.g:3828:1: '{'
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getEnumAnnotationAttributeAccess().getLeftCurlyBracketKeyword_4()); 
-            }
-            match(input,30,FOLLOW_30_in_rule__EnumAnnotationAttribute__Group__4__Impl7739); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getEnumAnnotationAttributeAccess().getLeftCurlyBracketKeyword_4()); 
-            }
+             before(grammarAccess.getEnumAnnotationAttributeAccess().getLeftCurlyBracketKeyword_4()); 
+            match(input,30,FOLLOW_2); 
+             after(grammarAccess.getEnumAnnotationAttributeAccess().getLeftCurlyBracketKeyword_4()); 
 
             }
 
@@ -11290,25 +10528,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__5"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3842:1: rule__EnumAnnotationAttribute__Group__5 : rule__EnumAnnotationAttribute__Group__5__Impl rule__EnumAnnotationAttribute__Group__6 ;
+    // InternalETPhys.g:3841:1: rule__EnumAnnotationAttribute__Group__5 : rule__EnumAnnotationAttribute__Group__5__Impl rule__EnumAnnotationAttribute__Group__6 ;
     public final void rule__EnumAnnotationAttribute__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3846:1: ( rule__EnumAnnotationAttribute__Group__5__Impl rule__EnumAnnotationAttribute__Group__6 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3847:2: rule__EnumAnnotationAttribute__Group__5__Impl rule__EnumAnnotationAttribute__Group__6
+            // InternalETPhys.g:3845:1: ( rule__EnumAnnotationAttribute__Group__5__Impl rule__EnumAnnotationAttribute__Group__6 )
+            // InternalETPhys.g:3846:2: rule__EnumAnnotationAttribute__Group__5__Impl rule__EnumAnnotationAttribute__Group__6
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__5__Impl_in_rule__EnumAnnotationAttribute__Group__57770);
+            pushFollow(FOLLOW_28);
             rule__EnumAnnotationAttribute__Group__5__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__6_in_rule__EnumAnnotationAttribute__Group__57773);
+
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group__6();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -11328,36 +10566,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__5__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3854:1: rule__EnumAnnotationAttribute__Group__5__Impl : ( ( rule__EnumAnnotationAttribute__ValuesAssignment_5 ) ) ;
+    // InternalETPhys.g:3853:1: rule__EnumAnnotationAttribute__Group__5__Impl : ( ( rule__EnumAnnotationAttribute__ValuesAssignment_5 ) ) ;
     public final void rule__EnumAnnotationAttribute__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3858:1: ( ( ( rule__EnumAnnotationAttribute__ValuesAssignment_5 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3859:1: ( ( rule__EnumAnnotationAttribute__ValuesAssignment_5 ) )
+            // InternalETPhys.g:3857:1: ( ( ( rule__EnumAnnotationAttribute__ValuesAssignment_5 ) ) )
+            // InternalETPhys.g:3858:1: ( ( rule__EnumAnnotationAttribute__ValuesAssignment_5 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3859:1: ( ( rule__EnumAnnotationAttribute__ValuesAssignment_5 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3860:1: ( rule__EnumAnnotationAttribute__ValuesAssignment_5 )
+            // InternalETPhys.g:3858:1: ( ( rule__EnumAnnotationAttribute__ValuesAssignment_5 ) )
+            // InternalETPhys.g:3859:1: ( rule__EnumAnnotationAttribute__ValuesAssignment_5 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getEnumAnnotationAttributeAccess().getValuesAssignment_5()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3861:1: ( rule__EnumAnnotationAttribute__ValuesAssignment_5 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3861:2: rule__EnumAnnotationAttribute__ValuesAssignment_5
+             before(grammarAccess.getEnumAnnotationAttributeAccess().getValuesAssignment_5()); 
+            // InternalETPhys.g:3860:1: ( rule__EnumAnnotationAttribute__ValuesAssignment_5 )
+            // InternalETPhys.g:3860:2: rule__EnumAnnotationAttribute__ValuesAssignment_5
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__ValuesAssignment_5_in_rule__EnumAnnotationAttribute__Group__5__Impl7800);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__ValuesAssignment_5();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getEnumAnnotationAttributeAccess().getValuesAssignment_5()); 
             }
 
+             after(grammarAccess.getEnumAnnotationAttributeAccess().getValuesAssignment_5()); 
+
             }
 
 
@@ -11379,25 +10613,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__6"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3871:1: rule__EnumAnnotationAttribute__Group__6 : rule__EnumAnnotationAttribute__Group__6__Impl rule__EnumAnnotationAttribute__Group__7 ;
+    // InternalETPhys.g:3870:1: rule__EnumAnnotationAttribute__Group__6 : rule__EnumAnnotationAttribute__Group__6__Impl rule__EnumAnnotationAttribute__Group__7 ;
     public final void rule__EnumAnnotationAttribute__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3875:1: ( rule__EnumAnnotationAttribute__Group__6__Impl rule__EnumAnnotationAttribute__Group__7 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3876:2: rule__EnumAnnotationAttribute__Group__6__Impl rule__EnumAnnotationAttribute__Group__7
+            // InternalETPhys.g:3874:1: ( rule__EnumAnnotationAttribute__Group__6__Impl rule__EnumAnnotationAttribute__Group__7 )
+            // InternalETPhys.g:3875:2: rule__EnumAnnotationAttribute__Group__6__Impl rule__EnumAnnotationAttribute__Group__7
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__6__Impl_in_rule__EnumAnnotationAttribute__Group__67830);
+            pushFollow(FOLLOW_28);
             rule__EnumAnnotationAttribute__Group__6__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__7_in_rule__EnumAnnotationAttribute__Group__67833);
+
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group__7();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -11417,22 +10651,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__6__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3883:1: rule__EnumAnnotationAttribute__Group__6__Impl : ( ( rule__EnumAnnotationAttribute__Group_6__0 )* ) ;
+    // InternalETPhys.g:3882:1: rule__EnumAnnotationAttribute__Group__6__Impl : ( ( rule__EnumAnnotationAttribute__Group_6__0 )* ) ;
     public final void rule__EnumAnnotationAttribute__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3887:1: ( ( ( rule__EnumAnnotationAttribute__Group_6__0 )* ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3888:1: ( ( rule__EnumAnnotationAttribute__Group_6__0 )* )
+            // InternalETPhys.g:3886:1: ( ( ( rule__EnumAnnotationAttribute__Group_6__0 )* ) )
+            // InternalETPhys.g:3887:1: ( ( rule__EnumAnnotationAttribute__Group_6__0 )* )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3888:1: ( ( rule__EnumAnnotationAttribute__Group_6__0 )* )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3889:1: ( rule__EnumAnnotationAttribute__Group_6__0 )*
+            // InternalETPhys.g:3887:1: ( ( rule__EnumAnnotationAttribute__Group_6__0 )* )
+            // InternalETPhys.g:3888:1: ( rule__EnumAnnotationAttribute__Group_6__0 )*
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getEnumAnnotationAttributeAccess().getGroup_6()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3890:1: ( rule__EnumAnnotationAttribute__Group_6__0 )*
+             before(grammarAccess.getEnumAnnotationAttributeAccess().getGroup_6()); 
+            // InternalETPhys.g:3889:1: ( rule__EnumAnnotationAttribute__Group_6__0 )*
             loop29:
             do {
                 int alt29=2;
@@ -11445,13 +10677,13 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
                 switch (alt29) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3890:2: rule__EnumAnnotationAttribute__Group_6__0
+            	    // InternalETPhys.g:3889:2: rule__EnumAnnotationAttribute__Group_6__0
             	    {
-            	    pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group_6__0_in_rule__EnumAnnotationAttribute__Group__6__Impl7860);
+            	    pushFollow(FOLLOW_29);
             	    rule__EnumAnnotationAttribute__Group_6__0();
 
             	    state._fsp--;
-            	    if (state.failed) return ;
+
 
             	    }
             	    break;
@@ -11461,9 +10693,7 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                 }
             } while (true);
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getEnumAnnotationAttributeAccess().getGroup_6()); 
-            }
+             after(grammarAccess.getEnumAnnotationAttributeAccess().getGroup_6()); 
 
             }
 
@@ -11486,20 +10716,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__7"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3900:1: rule__EnumAnnotationAttribute__Group__7 : rule__EnumAnnotationAttribute__Group__7__Impl ;
+    // InternalETPhys.g:3899:1: rule__EnumAnnotationAttribute__Group__7 : rule__EnumAnnotationAttribute__Group__7__Impl ;
     public final void rule__EnumAnnotationAttribute__Group__7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3904:1: ( rule__EnumAnnotationAttribute__Group__7__Impl )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3905:2: rule__EnumAnnotationAttribute__Group__7__Impl
+            // InternalETPhys.g:3903:1: ( rule__EnumAnnotationAttribute__Group__7__Impl )
+            // InternalETPhys.g:3904:2: rule__EnumAnnotationAttribute__Group__7__Impl
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__7__Impl_in_rule__EnumAnnotationAttribute__Group__77891);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group__7__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -11519,25 +10749,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__7__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3911:1: rule__EnumAnnotationAttribute__Group__7__Impl : ( '}' ) ;
+    // InternalETPhys.g:3910:1: rule__EnumAnnotationAttribute__Group__7__Impl : ( '}' ) ;
     public final void rule__EnumAnnotationAttribute__Group__7__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3915:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3916:1: ( '}' )
+            // InternalETPhys.g:3914:1: ( ( '}' ) )
+            // InternalETPhys.g:3915:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3916:1: ( '}' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3917:1: '}'
+            // InternalETPhys.g:3915:1: ( '}' )
+            // InternalETPhys.g:3916:1: '}'
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getEnumAnnotationAttributeAccess().getRightCurlyBracketKeyword_7()); 
-            }
-            match(input,31,FOLLOW_31_in_rule__EnumAnnotationAttribute__Group__7__Impl7919); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getEnumAnnotationAttributeAccess().getRightCurlyBracketKeyword_7()); 
-            }
+             before(grammarAccess.getEnumAnnotationAttributeAccess().getRightCurlyBracketKeyword_7()); 
+            match(input,31,FOLLOW_2); 
+             after(grammarAccess.getEnumAnnotationAttributeAccess().getRightCurlyBracketKeyword_7()); 
 
             }
 
@@ -11560,25 +10786,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group_6__0"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3946:1: rule__EnumAnnotationAttribute__Group_6__0 : rule__EnumAnnotationAttribute__Group_6__0__Impl rule__EnumAnnotationAttribute__Group_6__1 ;
+    // InternalETPhys.g:3945:1: rule__EnumAnnotationAttribute__Group_6__0 : rule__EnumAnnotationAttribute__Group_6__0__Impl rule__EnumAnnotationAttribute__Group_6__1 ;
     public final void rule__EnumAnnotationAttribute__Group_6__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3950:1: ( rule__EnumAnnotationAttribute__Group_6__0__Impl rule__EnumAnnotationAttribute__Group_6__1 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3951:2: rule__EnumAnnotationAttribute__Group_6__0__Impl rule__EnumAnnotationAttribute__Group_6__1
+            // InternalETPhys.g:3949:1: ( rule__EnumAnnotationAttribute__Group_6__0__Impl rule__EnumAnnotationAttribute__Group_6__1 )
+            // InternalETPhys.g:3950:2: rule__EnumAnnotationAttribute__Group_6__0__Impl rule__EnumAnnotationAttribute__Group_6__1
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group_6__0__Impl_in_rule__EnumAnnotationAttribute__Group_6__07966);
+            pushFollow(FOLLOW_27);
             rule__EnumAnnotationAttribute__Group_6__0__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group_6__1_in_rule__EnumAnnotationAttribute__Group_6__07969);
+
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group_6__1();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -11598,25 +10824,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group_6__0__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3958:1: rule__EnumAnnotationAttribute__Group_6__0__Impl : ( ',' ) ;
+    // InternalETPhys.g:3957:1: rule__EnumAnnotationAttribute__Group_6__0__Impl : ( ',' ) ;
     public final void rule__EnumAnnotationAttribute__Group_6__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3962:1: ( ( ',' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3963:1: ( ',' )
+            // InternalETPhys.g:3961:1: ( ( ',' ) )
+            // InternalETPhys.g:3962:1: ( ',' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3963:1: ( ',' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3964:1: ','
+            // InternalETPhys.g:3962:1: ( ',' )
+            // InternalETPhys.g:3963:1: ','
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getEnumAnnotationAttributeAccess().getCommaKeyword_6_0()); 
-            }
-            match(input,48,FOLLOW_48_in_rule__EnumAnnotationAttribute__Group_6__0__Impl7997); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getEnumAnnotationAttributeAccess().getCommaKeyword_6_0()); 
-            }
+             before(grammarAccess.getEnumAnnotationAttributeAccess().getCommaKeyword_6_0()); 
+            match(input,48,FOLLOW_2); 
+             after(grammarAccess.getEnumAnnotationAttributeAccess().getCommaKeyword_6_0()); 
 
             }
 
@@ -11639,20 +10861,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group_6__1"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3977:1: rule__EnumAnnotationAttribute__Group_6__1 : rule__EnumAnnotationAttribute__Group_6__1__Impl ;
+    // InternalETPhys.g:3976:1: rule__EnumAnnotationAttribute__Group_6__1 : rule__EnumAnnotationAttribute__Group_6__1__Impl ;
     public final void rule__EnumAnnotationAttribute__Group_6__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3981:1: ( rule__EnumAnnotationAttribute__Group_6__1__Impl )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3982:2: rule__EnumAnnotationAttribute__Group_6__1__Impl
+            // InternalETPhys.g:3980:1: ( rule__EnumAnnotationAttribute__Group_6__1__Impl )
+            // InternalETPhys.g:3981:2: rule__EnumAnnotationAttribute__Group_6__1__Impl
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group_6__1__Impl_in_rule__EnumAnnotationAttribute__Group_6__18028);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group_6__1__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -11672,36 +10894,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group_6__1__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3988:1: rule__EnumAnnotationAttribute__Group_6__1__Impl : ( ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 ) ) ;
+    // InternalETPhys.g:3987:1: rule__EnumAnnotationAttribute__Group_6__1__Impl : ( ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 ) ) ;
     public final void rule__EnumAnnotationAttribute__Group_6__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3992:1: ( ( ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3993:1: ( ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 ) )
+            // InternalETPhys.g:3991:1: ( ( ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 ) ) )
+            // InternalETPhys.g:3992:1: ( ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3993:1: ( ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3994:1: ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 )
+            // InternalETPhys.g:3992:1: ( ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 ) )
+            // InternalETPhys.g:3993:1: ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getEnumAnnotationAttributeAccess().getValuesAssignment_6_1()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3995:1: ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:3995:2: rule__EnumAnnotationAttribute__ValuesAssignment_6_1
+             before(grammarAccess.getEnumAnnotationAttributeAccess().getValuesAssignment_6_1()); 
+            // InternalETPhys.g:3994:1: ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 )
+            // InternalETPhys.g:3994:2: rule__EnumAnnotationAttribute__ValuesAssignment_6_1
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__ValuesAssignment_6_1_in_rule__EnumAnnotationAttribute__Group_6__1__Impl8055);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__ValuesAssignment_6_1();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getEnumAnnotationAttributeAccess().getValuesAssignment_6_1()); 
             }
 
+             after(grammarAccess.getEnumAnnotationAttributeAccess().getValuesAssignment_6_1()); 
+
             }
 
 
@@ -11723,25 +10941,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Import__Group__0"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4009:1: rule__Import__Group__0 : rule__Import__Group__0__Impl rule__Import__Group__1 ;
+    // InternalETPhys.g:4008:1: rule__Import__Group__0 : rule__Import__Group__0__Impl rule__Import__Group__1 ;
     public final void rule__Import__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4013:1: ( rule__Import__Group__0__Impl rule__Import__Group__1 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4014:2: rule__Import__Group__0__Impl rule__Import__Group__1
+            // InternalETPhys.g:4012:1: ( rule__Import__Group__0__Impl rule__Import__Group__1 )
+            // InternalETPhys.g:4013:2: rule__Import__Group__0__Impl rule__Import__Group__1
             {
-            pushFollow(FOLLOW_rule__Import__Group__0__Impl_in_rule__Import__Group__08089);
+            pushFollow(FOLLOW_30);
             rule__Import__Group__0__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Import__Group__1_in_rule__Import__Group__08092);
+
+            pushFollow(FOLLOW_2);
             rule__Import__Group__1();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -11761,25 +10979,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Import__Group__0__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4021:1: rule__Import__Group__0__Impl : ( 'import' ) ;
+    // InternalETPhys.g:4020:1: rule__Import__Group__0__Impl : ( 'import' ) ;
     public final void rule__Import__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4025:1: ( ( 'import' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4026:1: ( 'import' )
+            // InternalETPhys.g:4024:1: ( ( 'import' ) )
+            // InternalETPhys.g:4025:1: ( 'import' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4026:1: ( 'import' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4027:1: 'import'
+            // InternalETPhys.g:4025:1: ( 'import' )
+            // InternalETPhys.g:4026:1: 'import'
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getImportAccess().getImportKeyword_0()); 
-            }
-            match(input,49,FOLLOW_49_in_rule__Import__Group__0__Impl8120); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getImportAccess().getImportKeyword_0()); 
-            }
+             before(grammarAccess.getImportAccess().getImportKeyword_0()); 
+            match(input,49,FOLLOW_2); 
+             after(grammarAccess.getImportAccess().getImportKeyword_0()); 
 
             }
 
@@ -11802,25 +11016,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Import__Group__1"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4040:1: rule__Import__Group__1 : rule__Import__Group__1__Impl rule__Import__Group__2 ;
+    // InternalETPhys.g:4039:1: rule__Import__Group__1 : rule__Import__Group__1__Impl rule__Import__Group__2 ;
     public final void rule__Import__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4044:1: ( rule__Import__Group__1__Impl rule__Import__Group__2 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4045:2: rule__Import__Group__1__Impl rule__Import__Group__2
+            // InternalETPhys.g:4043:1: ( rule__Import__Group__1__Impl rule__Import__Group__2 )
+            // InternalETPhys.g:4044:2: rule__Import__Group__1__Impl rule__Import__Group__2
             {
-            pushFollow(FOLLOW_rule__Import__Group__1__Impl_in_rule__Import__Group__18151);
+            pushFollow(FOLLOW_27);
             rule__Import__Group__1__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Import__Group__2_in_rule__Import__Group__18154);
+
+            pushFollow(FOLLOW_2);
             rule__Import__Group__2();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -11840,36 +11054,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Import__Group__1__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4052:1: rule__Import__Group__1__Impl : ( ( rule__Import__Alternatives_1 ) ) ;
+    // InternalETPhys.g:4051:1: rule__Import__Group__1__Impl : ( ( rule__Import__Alternatives_1 ) ) ;
     public final void rule__Import__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4056:1: ( ( ( rule__Import__Alternatives_1 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4057:1: ( ( rule__Import__Alternatives_1 ) )
+            // InternalETPhys.g:4055:1: ( ( ( rule__Import__Alternatives_1 ) ) )
+            // InternalETPhys.g:4056:1: ( ( rule__Import__Alternatives_1 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4057:1: ( ( rule__Import__Alternatives_1 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4058:1: ( rule__Import__Alternatives_1 )
+            // InternalETPhys.g:4056:1: ( ( rule__Import__Alternatives_1 ) )
+            // InternalETPhys.g:4057:1: ( rule__Import__Alternatives_1 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getImportAccess().getAlternatives_1()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4059:1: ( rule__Import__Alternatives_1 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4059:2: rule__Import__Alternatives_1
+             before(grammarAccess.getImportAccess().getAlternatives_1()); 
+            // InternalETPhys.g:4058:1: ( rule__Import__Alternatives_1 )
+            // InternalETPhys.g:4058:2: rule__Import__Alternatives_1
             {
-            pushFollow(FOLLOW_rule__Import__Alternatives_1_in_rule__Import__Group__1__Impl8181);
+            pushFollow(FOLLOW_2);
             rule__Import__Alternatives_1();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getImportAccess().getAlternatives_1()); 
             }
 
+             after(grammarAccess.getImportAccess().getAlternatives_1()); 
+
             }
 
 
@@ -11891,20 +11101,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Import__Group__2"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4069:1: rule__Import__Group__2 : rule__Import__Group__2__Impl ;
+    // InternalETPhys.g:4068:1: rule__Import__Group__2 : rule__Import__Group__2__Impl ;
     public final void rule__Import__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4073:1: ( rule__Import__Group__2__Impl )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4074:2: rule__Import__Group__2__Impl
+            // InternalETPhys.g:4072:1: ( rule__Import__Group__2__Impl )
+            // InternalETPhys.g:4073:2: rule__Import__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__Import__Group__2__Impl_in_rule__Import__Group__28211);
+            pushFollow(FOLLOW_2);
             rule__Import__Group__2__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -11924,36 +11134,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Import__Group__2__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4080:1: rule__Import__Group__2__Impl : ( ( rule__Import__ImportURIAssignment_2 ) ) ;
+    // InternalETPhys.g:4079:1: rule__Import__Group__2__Impl : ( ( rule__Import__ImportURIAssignment_2 ) ) ;
     public final void rule__Import__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4084:1: ( ( ( rule__Import__ImportURIAssignment_2 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4085:1: ( ( rule__Import__ImportURIAssignment_2 ) )
+            // InternalETPhys.g:4083:1: ( ( ( rule__Import__ImportURIAssignment_2 ) ) )
+            // InternalETPhys.g:4084:1: ( ( rule__Import__ImportURIAssignment_2 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4085:1: ( ( rule__Import__ImportURIAssignment_2 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4086:1: ( rule__Import__ImportURIAssignment_2 )
+            // InternalETPhys.g:4084:1: ( ( rule__Import__ImportURIAssignment_2 ) )
+            // InternalETPhys.g:4085:1: ( rule__Import__ImportURIAssignment_2 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getImportAccess().getImportURIAssignment_2()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4087:1: ( rule__Import__ImportURIAssignment_2 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4087:2: rule__Import__ImportURIAssignment_2
+             before(grammarAccess.getImportAccess().getImportURIAssignment_2()); 
+            // InternalETPhys.g:4086:1: ( rule__Import__ImportURIAssignment_2 )
+            // InternalETPhys.g:4086:2: rule__Import__ImportURIAssignment_2
             {
-            pushFollow(FOLLOW_rule__Import__ImportURIAssignment_2_in_rule__Import__Group__2__Impl8238);
+            pushFollow(FOLLOW_2);
             rule__Import__ImportURIAssignment_2();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getImportAccess().getImportURIAssignment_2()); 
             }
 
+             after(grammarAccess.getImportAccess().getImportURIAssignment_2()); 
+
             }
 
 
@@ -11975,25 +11181,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Import__Group_1_0__0"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4103:1: rule__Import__Group_1_0__0 : rule__Import__Group_1_0__0__Impl rule__Import__Group_1_0__1 ;
+    // InternalETPhys.g:4102:1: rule__Import__Group_1_0__0 : rule__Import__Group_1_0__0__Impl rule__Import__Group_1_0__1 ;
     public final void rule__Import__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4107:1: ( rule__Import__Group_1_0__0__Impl rule__Import__Group_1_0__1 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4108:2: rule__Import__Group_1_0__0__Impl rule__Import__Group_1_0__1
+            // InternalETPhys.g:4106:1: ( rule__Import__Group_1_0__0__Impl rule__Import__Group_1_0__1 )
+            // InternalETPhys.g:4107:2: rule__Import__Group_1_0__0__Impl rule__Import__Group_1_0__1
             {
-            pushFollow(FOLLOW_rule__Import__Group_1_0__0__Impl_in_rule__Import__Group_1_0__08274);
+            pushFollow(FOLLOW_31);
             rule__Import__Group_1_0__0__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Import__Group_1_0__1_in_rule__Import__Group_1_0__08277);
+
+            pushFollow(FOLLOW_2);
             rule__Import__Group_1_0__1();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -12013,36 +11219,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Import__Group_1_0__0__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4115:1: rule__Import__Group_1_0__0__Impl : ( ( rule__Import__ImportedNamespaceAssignment_1_0_0 ) ) ;
+    // InternalETPhys.g:4114:1: rule__Import__Group_1_0__0__Impl : ( ( rule__Import__ImportedNamespaceAssignment_1_0_0 ) ) ;
     public final void rule__Import__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4119:1: ( ( ( rule__Import__ImportedNamespaceAssignment_1_0_0 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4120:1: ( ( rule__Import__ImportedNamespaceAssignment_1_0_0 ) )
+            // InternalETPhys.g:4118:1: ( ( ( rule__Import__ImportedNamespaceAssignment_1_0_0 ) ) )
+            // InternalETPhys.g:4119:1: ( ( rule__Import__ImportedNamespaceAssignment_1_0_0 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4120:1: ( ( rule__Import__ImportedNamespaceAssignment_1_0_0 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4121:1: ( rule__Import__ImportedNamespaceAssignment_1_0_0 )
+            // InternalETPhys.g:4119:1: ( ( rule__Import__ImportedNamespaceAssignment_1_0_0 ) )
+            // InternalETPhys.g:4120:1: ( rule__Import__ImportedNamespaceAssignment_1_0_0 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getImportAccess().getImportedNamespaceAssignment_1_0_0()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4122:1: ( rule__Import__ImportedNamespaceAssignment_1_0_0 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4122:2: rule__Import__ImportedNamespaceAssignment_1_0_0
+             before(grammarAccess.getImportAccess().getImportedNamespaceAssignment_1_0_0()); 
+            // InternalETPhys.g:4121:1: ( rule__Import__ImportedNamespaceAssignment_1_0_0 )
+            // InternalETPhys.g:4121:2: rule__Import__ImportedNamespaceAssignment_1_0_0
             {
-            pushFollow(FOLLOW_rule__Import__ImportedNamespaceAssignment_1_0_0_in_rule__Import__Group_1_0__0__Impl8304);
+            pushFollow(FOLLOW_2);
             rule__Import__ImportedNamespaceAssignment_1_0_0();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getImportAccess().getImportedNamespaceAssignment_1_0_0()); 
             }
 
+             after(grammarAccess.getImportAccess().getImportedNamespaceAssignment_1_0_0()); 
+
             }
 
 
@@ -12064,20 +11266,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Import__Group_1_0__1"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4132:1: rule__Import__Group_1_0__1 : rule__Import__Group_1_0__1__Impl ;
+    // InternalETPhys.g:4131:1: rule__Import__Group_1_0__1 : rule__Import__Group_1_0__1__Impl ;
     public final void rule__Import__Group_1_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4136:1: ( rule__Import__Group_1_0__1__Impl )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4137:2: rule__Import__Group_1_0__1__Impl
+            // InternalETPhys.g:4135:1: ( rule__Import__Group_1_0__1__Impl )
+            // InternalETPhys.g:4136:2: rule__Import__Group_1_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__Import__Group_1_0__1__Impl_in_rule__Import__Group_1_0__18334);
+            pushFollow(FOLLOW_2);
             rule__Import__Group_1_0__1__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -12097,25 +11299,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Import__Group_1_0__1__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4143:1: rule__Import__Group_1_0__1__Impl : ( 'from' ) ;
+    // InternalETPhys.g:4142:1: rule__Import__Group_1_0__1__Impl : ( 'from' ) ;
     public final void rule__Import__Group_1_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4147:1: ( ( 'from' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4148:1: ( 'from' )
+            // InternalETPhys.g:4146:1: ( ( 'from' ) )
+            // InternalETPhys.g:4147:1: ( 'from' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4148:1: ( 'from' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4149:1: 'from'
+            // InternalETPhys.g:4147:1: ( 'from' )
+            // InternalETPhys.g:4148:1: 'from'
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getImportAccess().getFromKeyword_1_0_1()); 
-            }
-            match(input,50,FOLLOW_50_in_rule__Import__Group_1_0__1__Impl8362); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getImportAccess().getFromKeyword_1_0_1()); 
-            }
+             before(grammarAccess.getImportAccess().getFromKeyword_1_0_1()); 
+            match(input,50,FOLLOW_2); 
+             after(grammarAccess.getImportAccess().getFromKeyword_1_0_1()); 
 
             }
 
@@ -12138,25 +11336,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ImportedFQN__Group__0"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4166:1: rule__ImportedFQN__Group__0 : rule__ImportedFQN__Group__0__Impl rule__ImportedFQN__Group__1 ;
+    // InternalETPhys.g:4165:1: rule__ImportedFQN__Group__0 : rule__ImportedFQN__Group__0__Impl rule__ImportedFQN__Group__1 ;
     public final void rule__ImportedFQN__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4170:1: ( rule__ImportedFQN__Group__0__Impl rule__ImportedFQN__Group__1 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4171:2: rule__ImportedFQN__Group__0__Impl rule__ImportedFQN__Group__1
+            // InternalETPhys.g:4169:1: ( rule__ImportedFQN__Group__0__Impl rule__ImportedFQN__Group__1 )
+            // InternalETPhys.g:4170:2: rule__ImportedFQN__Group__0__Impl rule__ImportedFQN__Group__1
             {
-            pushFollow(FOLLOW_rule__ImportedFQN__Group__0__Impl_in_rule__ImportedFQN__Group__08397);
+            pushFollow(FOLLOW_32);
             rule__ImportedFQN__Group__0__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ImportedFQN__Group__1_in_rule__ImportedFQN__Group__08400);
+
+            pushFollow(FOLLOW_2);
             rule__ImportedFQN__Group__1();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -12176,29 +11374,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ImportedFQN__Group__0__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4178:1: rule__ImportedFQN__Group__0__Impl : ( ruleFQN ) ;
+    // InternalETPhys.g:4177:1: rule__ImportedFQN__Group__0__Impl : ( ruleFQN ) ;
     public final void rule__ImportedFQN__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4182:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4183:1: ( ruleFQN )
+            // InternalETPhys.g:4181:1: ( ( ruleFQN ) )
+            // InternalETPhys.g:4182:1: ( ruleFQN )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4183:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4184:1: ruleFQN
+            // InternalETPhys.g:4182:1: ( ruleFQN )
+            // InternalETPhys.g:4183:1: ruleFQN
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getImportedFQNAccess().getFQNParserRuleCall_0()); 
-            }
-            pushFollow(FOLLOW_ruleFQN_in_rule__ImportedFQN__Group__0__Impl8427);
+             before(grammarAccess.getImportedFQNAccess().getFQNParserRuleCall_0()); 
+            pushFollow(FOLLOW_2);
             ruleFQN();
 
             state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getImportedFQNAccess().getFQNParserRuleCall_0()); 
-            }
+
+             after(grammarAccess.getImportedFQNAccess().getFQNParserRuleCall_0()); 
 
             }
 
@@ -12221,20 +11415,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ImportedFQN__Group__1"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4195:1: rule__ImportedFQN__Group__1 : rule__ImportedFQN__Group__1__Impl ;
+    // InternalETPhys.g:4194:1: rule__ImportedFQN__Group__1 : rule__ImportedFQN__Group__1__Impl ;
     public final void rule__ImportedFQN__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4199:1: ( rule__ImportedFQN__Group__1__Impl )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4200:2: rule__ImportedFQN__Group__1__Impl
+            // InternalETPhys.g:4198:1: ( rule__ImportedFQN__Group__1__Impl )
+            // InternalETPhys.g:4199:2: rule__ImportedFQN__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__ImportedFQN__Group__1__Impl_in_rule__ImportedFQN__Group__18456);
+            pushFollow(FOLLOW_2);
             rule__ImportedFQN__Group__1__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -12254,22 +11448,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ImportedFQN__Group__1__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4206:1: rule__ImportedFQN__Group__1__Impl : ( ( '.*' )? ) ;
+    // InternalETPhys.g:4205:1: rule__ImportedFQN__Group__1__Impl : ( ( '.*' )? ) ;
     public final void rule__ImportedFQN__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4210:1: ( ( ( '.*' )? ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4211:1: ( ( '.*' )? )
+            // InternalETPhys.g:4209:1: ( ( ( '.*' )? ) )
+            // InternalETPhys.g:4210:1: ( ( '.*' )? )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4211:1: ( ( '.*' )? )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4212:1: ( '.*' )?
+            // InternalETPhys.g:4210:1: ( ( '.*' )? )
+            // InternalETPhys.g:4211:1: ( '.*' )?
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getImportedFQNAccess().getFullStopAsteriskKeyword_1()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4213:1: ( '.*' )?
+             before(grammarAccess.getImportedFQNAccess().getFullStopAsteriskKeyword_1()); 
+            // InternalETPhys.g:4212:1: ( '.*' )?
             int alt30=2;
             int LA30_0 = input.LA(1);
 
@@ -12278,18 +11470,16 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
             }
             switch (alt30) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4214:2: '.*'
+                    // InternalETPhys.g:4213:2: '.*'
                     {
-                    match(input,51,FOLLOW_51_in_rule__ImportedFQN__Group__1__Impl8485); if (state.failed) return ;
+                    match(input,51,FOLLOW_2); 
 
                     }
                     break;
 
             }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getImportedFQNAccess().getFullStopAsteriskKeyword_1()); 
-            }
+             after(grammarAccess.getImportedFQNAccess().getFullStopAsteriskKeyword_1()); 
 
             }
 
@@ -12312,25 +11502,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Documentation__Group__0"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4229:1: rule__Documentation__Group__0 : rule__Documentation__Group__0__Impl rule__Documentation__Group__1 ;
+    // InternalETPhys.g:4228:1: rule__Documentation__Group__0 : rule__Documentation__Group__0__Impl rule__Documentation__Group__1 ;
     public final void rule__Documentation__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4233:1: ( rule__Documentation__Group__0__Impl rule__Documentation__Group__1 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4234:2: rule__Documentation__Group__0__Impl rule__Documentation__Group__1
+            // InternalETPhys.g:4232:1: ( rule__Documentation__Group__0__Impl rule__Documentation__Group__1 )
+            // InternalETPhys.g:4233:2: rule__Documentation__Group__0__Impl rule__Documentation__Group__1
             {
-            pushFollow(FOLLOW_rule__Documentation__Group__0__Impl_in_rule__Documentation__Group__08522);
+            pushFollow(FOLLOW_12);
             rule__Documentation__Group__0__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Documentation__Group__1_in_rule__Documentation__Group__08525);
+
+            pushFollow(FOLLOW_2);
             rule__Documentation__Group__1();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -12350,29 +11540,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Documentation__Group__0__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4241:1: rule__Documentation__Group__0__Impl : ( () ) ;
+    // InternalETPhys.g:4240:1: rule__Documentation__Group__0__Impl : ( () ) ;
     public final void rule__Documentation__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4245:1: ( ( () ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4246:1: ( () )
+            // InternalETPhys.g:4244:1: ( ( () ) )
+            // InternalETPhys.g:4245:1: ( () )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4246:1: ( () )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4247:1: ()
+            // InternalETPhys.g:4245:1: ( () )
+            // InternalETPhys.g:4246:1: ()
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getDocumentationAccess().getDocumentationAction_0()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4248:1: ()
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4250:1: 
+             before(grammarAccess.getDocumentationAccess().getDocumentationAction_0()); 
+            // InternalETPhys.g:4247:1: ()
+            // InternalETPhys.g:4249:1: 
             {
             }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getDocumentationAccess().getDocumentationAction_0()); 
-            }
+             after(grammarAccess.getDocumentationAccess().getDocumentationAction_0()); 
 
             }
 
@@ -12391,25 +11577,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Documentation__Group__1"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4260:1: rule__Documentation__Group__1 : rule__Documentation__Group__1__Impl rule__Documentation__Group__2 ;
+    // InternalETPhys.g:4259:1: rule__Documentation__Group__1 : rule__Documentation__Group__1__Impl rule__Documentation__Group__2 ;
     public final void rule__Documentation__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4264:1: ( rule__Documentation__Group__1__Impl rule__Documentation__Group__2 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4265:2: rule__Documentation__Group__1__Impl rule__Documentation__Group__2
+            // InternalETPhys.g:4263:1: ( rule__Documentation__Group__1__Impl rule__Documentation__Group__2 )
+            // InternalETPhys.g:4264:2: rule__Documentation__Group__1__Impl rule__Documentation__Group__2
             {
-            pushFollow(FOLLOW_rule__Documentation__Group__1__Impl_in_rule__Documentation__Group__18583);
+            pushFollow(FOLLOW_33);
             rule__Documentation__Group__1__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Documentation__Group__2_in_rule__Documentation__Group__18586);
+
+            pushFollow(FOLLOW_2);
             rule__Documentation__Group__2();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -12429,25 +11615,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Documentation__Group__1__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4272:1: rule__Documentation__Group__1__Impl : ( '[' ) ;
+    // InternalETPhys.g:4271:1: rule__Documentation__Group__1__Impl : ( '[' ) ;
     public final void rule__Documentation__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4276:1: ( ( '[' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4277:1: ( '[' )
+            // InternalETPhys.g:4275:1: ( ( '[' ) )
+            // InternalETPhys.g:4276:1: ( '[' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4277:1: ( '[' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4278:1: '['
+            // InternalETPhys.g:4276:1: ( '[' )
+            // InternalETPhys.g:4277:1: '['
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getDocumentationAccess().getLeftSquareBracketKeyword_1()); 
-            }
-            match(input,52,FOLLOW_52_in_rule__Documentation__Group__1__Impl8614); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getDocumentationAccess().getLeftSquareBracketKeyword_1()); 
-            }
+             before(grammarAccess.getDocumentationAccess().getLeftSquareBracketKeyword_1()); 
+            match(input,52,FOLLOW_2); 
+             after(grammarAccess.getDocumentationAccess().getLeftSquareBracketKeyword_1()); 
 
             }
 
@@ -12470,25 +11652,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Documentation__Group__2"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4291:1: rule__Documentation__Group__2 : rule__Documentation__Group__2__Impl rule__Documentation__Group__3 ;
+    // InternalETPhys.g:4290:1: rule__Documentation__Group__2 : rule__Documentation__Group__2__Impl rule__Documentation__Group__3 ;
     public final void rule__Documentation__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4295:1: ( rule__Documentation__Group__2__Impl rule__Documentation__Group__3 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4296:2: rule__Documentation__Group__2__Impl rule__Documentation__Group__3
+            // InternalETPhys.g:4294:1: ( rule__Documentation__Group__2__Impl rule__Documentation__Group__3 )
+            // InternalETPhys.g:4295:2: rule__Documentation__Group__2__Impl rule__Documentation__Group__3
             {
-            pushFollow(FOLLOW_rule__Documentation__Group__2__Impl_in_rule__Documentation__Group__28645);
+            pushFollow(FOLLOW_33);
             rule__Documentation__Group__2__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Documentation__Group__3_in_rule__Documentation__Group__28648);
+
+            pushFollow(FOLLOW_2);
             rule__Documentation__Group__3();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -12508,22 +11690,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Documentation__Group__2__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4303:1: rule__Documentation__Group__2__Impl : ( ( rule__Documentation__LinesAssignment_2 )* ) ;
+    // InternalETPhys.g:4302:1: rule__Documentation__Group__2__Impl : ( ( rule__Documentation__LinesAssignment_2 )* ) ;
     public final void rule__Documentation__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4307:1: ( ( ( rule__Documentation__LinesAssignment_2 )* ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4308:1: ( ( rule__Documentation__LinesAssignment_2 )* )
+            // InternalETPhys.g:4306:1: ( ( ( rule__Documentation__LinesAssignment_2 )* ) )
+            // InternalETPhys.g:4307:1: ( ( rule__Documentation__LinesAssignment_2 )* )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4308:1: ( ( rule__Documentation__LinesAssignment_2 )* )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4309:1: ( rule__Documentation__LinesAssignment_2 )*
+            // InternalETPhys.g:4307:1: ( ( rule__Documentation__LinesAssignment_2 )* )
+            // InternalETPhys.g:4308:1: ( rule__Documentation__LinesAssignment_2 )*
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getDocumentationAccess().getLinesAssignment_2()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4310:1: ( rule__Documentation__LinesAssignment_2 )*
+             before(grammarAccess.getDocumentationAccess().getLinesAssignment_2()); 
+            // InternalETPhys.g:4309:1: ( rule__Documentation__LinesAssignment_2 )*
             loop31:
             do {
                 int alt31=2;
@@ -12536,13 +11716,13 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
                 switch (alt31) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4310:2: rule__Documentation__LinesAssignment_2
+            	    // InternalETPhys.g:4309:2: rule__Documentation__LinesAssignment_2
             	    {
-            	    pushFollow(FOLLOW_rule__Documentation__LinesAssignment_2_in_rule__Documentation__Group__2__Impl8675);
+            	    pushFollow(FOLLOW_34);
             	    rule__Documentation__LinesAssignment_2();
 
             	    state._fsp--;
-            	    if (state.failed) return ;
+
 
             	    }
             	    break;
@@ -12552,9 +11732,7 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                 }
             } while (true);
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getDocumentationAccess().getLinesAssignment_2()); 
-            }
+             after(grammarAccess.getDocumentationAccess().getLinesAssignment_2()); 
 
             }
 
@@ -12577,20 +11755,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Documentation__Group__3"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4320:1: rule__Documentation__Group__3 : rule__Documentation__Group__3__Impl ;
+    // InternalETPhys.g:4319:1: rule__Documentation__Group__3 : rule__Documentation__Group__3__Impl ;
     public final void rule__Documentation__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4324:1: ( rule__Documentation__Group__3__Impl )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4325:2: rule__Documentation__Group__3__Impl
+            // InternalETPhys.g:4323:1: ( rule__Documentation__Group__3__Impl )
+            // InternalETPhys.g:4324:2: rule__Documentation__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__Documentation__Group__3__Impl_in_rule__Documentation__Group__38706);
+            pushFollow(FOLLOW_2);
             rule__Documentation__Group__3__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -12610,25 +11788,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Documentation__Group__3__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4331:1: rule__Documentation__Group__3__Impl : ( ']' ) ;
+    // InternalETPhys.g:4330:1: rule__Documentation__Group__3__Impl : ( ']' ) ;
     public final void rule__Documentation__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4335:1: ( ( ']' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4336:1: ( ']' )
+            // InternalETPhys.g:4334:1: ( ( ']' ) )
+            // InternalETPhys.g:4335:1: ( ']' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4336:1: ( ']' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4337:1: ']'
+            // InternalETPhys.g:4335:1: ( ']' )
+            // InternalETPhys.g:4336:1: ']'
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getDocumentationAccess().getRightSquareBracketKeyword_3()); 
-            }
-            match(input,53,FOLLOW_53_in_rule__Documentation__Group__3__Impl8734); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getDocumentationAccess().getRightSquareBracketKeyword_3()); 
-            }
+             before(grammarAccess.getDocumentationAccess().getRightSquareBracketKeyword_3()); 
+            match(input,53,FOLLOW_2); 
+             after(grammarAccess.getDocumentationAccess().getRightSquareBracketKeyword_3()); 
 
             }
 
@@ -12651,25 +11825,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TIME__Group_0__0"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4358:1: rule__TIME__Group_0__0 : rule__TIME__Group_0__0__Impl rule__TIME__Group_0__1 ;
+    // InternalETPhys.g:4357:1: rule__TIME__Group_0__0 : rule__TIME__Group_0__0__Impl rule__TIME__Group_0__1 ;
     public final void rule__TIME__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4362:1: ( rule__TIME__Group_0__0__Impl rule__TIME__Group_0__1 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4363:2: rule__TIME__Group_0__0__Impl rule__TIME__Group_0__1
+            // InternalETPhys.g:4361:1: ( rule__TIME__Group_0__0__Impl rule__TIME__Group_0__1 )
+            // InternalETPhys.g:4362:2: rule__TIME__Group_0__0__Impl rule__TIME__Group_0__1
             {
-            pushFollow(FOLLOW_rule__TIME__Group_0__0__Impl_in_rule__TIME__Group_0__08773);
+            pushFollow(FOLLOW_35);
             rule__TIME__Group_0__0__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__TIME__Group_0__1_in_rule__TIME__Group_0__08776);
+
+            pushFollow(FOLLOW_2);
             rule__TIME__Group_0__1();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -12689,25 +11863,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TIME__Group_0__0__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4370:1: rule__TIME__Group_0__0__Impl : ( RULE_INT ) ;
+    // InternalETPhys.g:4369:1: rule__TIME__Group_0__0__Impl : ( RULE_INT ) ;
     public final void rule__TIME__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4374:1: ( ( RULE_INT ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4375:1: ( RULE_INT )
+            // InternalETPhys.g:4373:1: ( ( RULE_INT ) )
+            // InternalETPhys.g:4374:1: ( RULE_INT )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4375:1: ( RULE_INT )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4376:1: RULE_INT
+            // InternalETPhys.g:4374:1: ( RULE_INT )
+            // InternalETPhys.g:4375:1: RULE_INT
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTIMEAccess().getINTTerminalRuleCall_0_0()); 
-            }
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__TIME__Group_0__0__Impl8803); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTIMEAccess().getINTTerminalRuleCall_0_0()); 
-            }
+             before(grammarAccess.getTIMEAccess().getINTTerminalRuleCall_0_0()); 
+            match(input,RULE_INT,FOLLOW_2); 
+             after(grammarAccess.getTIMEAccess().getINTTerminalRuleCall_0_0()); 
 
             }
 
@@ -12730,20 +11900,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TIME__Group_0__1"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4387:1: rule__TIME__Group_0__1 : rule__TIME__Group_0__1__Impl ;
+    // InternalETPhys.g:4386:1: rule__TIME__Group_0__1 : rule__TIME__Group_0__1__Impl ;
     public final void rule__TIME__Group_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4391:1: ( rule__TIME__Group_0__1__Impl )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4392:2: rule__TIME__Group_0__1__Impl
+            // InternalETPhys.g:4390:1: ( rule__TIME__Group_0__1__Impl )
+            // InternalETPhys.g:4391:2: rule__TIME__Group_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__TIME__Group_0__1__Impl_in_rule__TIME__Group_0__18832);
+            pushFollow(FOLLOW_2);
             rule__TIME__Group_0__1__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -12763,25 +11933,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TIME__Group_0__1__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4398:1: rule__TIME__Group_0__1__Impl : ( 's' ) ;
+    // InternalETPhys.g:4397:1: rule__TIME__Group_0__1__Impl : ( 's' ) ;
     public final void rule__TIME__Group_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4402:1: ( ( 's' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4403:1: ( 's' )
+            // InternalETPhys.g:4401:1: ( ( 's' ) )
+            // InternalETPhys.g:4402:1: ( 's' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4403:1: ( 's' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4404:1: 's'
+            // InternalETPhys.g:4402:1: ( 's' )
+            // InternalETPhys.g:4403:1: 's'
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTIMEAccess().getSKeyword_0_1()); 
-            }
-            match(input,54,FOLLOW_54_in_rule__TIME__Group_0__1__Impl8860); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTIMEAccess().getSKeyword_0_1()); 
-            }
+             before(grammarAccess.getTIMEAccess().getSKeyword_0_1()); 
+            match(input,54,FOLLOW_2); 
+             after(grammarAccess.getTIMEAccess().getSKeyword_0_1()); 
 
             }
 
@@ -12804,25 +11970,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TIME__Group_1__0"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4421:1: rule__TIME__Group_1__0 : rule__TIME__Group_1__0__Impl rule__TIME__Group_1__1 ;
+    // InternalETPhys.g:4420:1: rule__TIME__Group_1__0 : rule__TIME__Group_1__0__Impl rule__TIME__Group_1__1 ;
     public final void rule__TIME__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4425:1: ( rule__TIME__Group_1__0__Impl rule__TIME__Group_1__1 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4426:2: rule__TIME__Group_1__0__Impl rule__TIME__Group_1__1
+            // InternalETPhys.g:4424:1: ( rule__TIME__Group_1__0__Impl rule__TIME__Group_1__1 )
+            // InternalETPhys.g:4425:2: rule__TIME__Group_1__0__Impl rule__TIME__Group_1__1
             {
-            pushFollow(FOLLOW_rule__TIME__Group_1__0__Impl_in_rule__TIME__Group_1__08895);
+            pushFollow(FOLLOW_36);
             rule__TIME__Group_1__0__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__TIME__Group_1__1_in_rule__TIME__Group_1__08898);
+
+            pushFollow(FOLLOW_2);
             rule__TIME__Group_1__1();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -12842,25 +12008,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TIME__Group_1__0__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4433:1: rule__TIME__Group_1__0__Impl : ( RULE_INT ) ;
+    // InternalETPhys.g:4432:1: rule__TIME__Group_1__0__Impl : ( RULE_INT ) ;
     public final void rule__TIME__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4437:1: ( ( RULE_INT ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4438:1: ( RULE_INT )
+            // InternalETPhys.g:4436:1: ( ( RULE_INT ) )
+            // InternalETPhys.g:4437:1: ( RULE_INT )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4438:1: ( RULE_INT )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4439:1: RULE_INT
+            // InternalETPhys.g:4437:1: ( RULE_INT )
+            // InternalETPhys.g:4438:1: RULE_INT
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTIMEAccess().getINTTerminalRuleCall_1_0()); 
-            }
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__TIME__Group_1__0__Impl8925); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTIMEAccess().getINTTerminalRuleCall_1_0()); 
-            }
+             before(grammarAccess.getTIMEAccess().getINTTerminalRuleCall_1_0()); 
+            match(input,RULE_INT,FOLLOW_2); 
+             after(grammarAccess.getTIMEAccess().getINTTerminalRuleCall_1_0()); 
 
             }
 
@@ -12883,20 +12045,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TIME__Group_1__1"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4450:1: rule__TIME__Group_1__1 : rule__TIME__Group_1__1__Impl ;
+    // InternalETPhys.g:4449:1: rule__TIME__Group_1__1 : rule__TIME__Group_1__1__Impl ;
     public final void rule__TIME__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4454:1: ( rule__TIME__Group_1__1__Impl )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4455:2: rule__TIME__Group_1__1__Impl
+            // InternalETPhys.g:4453:1: ( rule__TIME__Group_1__1__Impl )
+            // InternalETPhys.g:4454:2: rule__TIME__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__TIME__Group_1__1__Impl_in_rule__TIME__Group_1__18954);
+            pushFollow(FOLLOW_2);
             rule__TIME__Group_1__1__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -12916,25 +12078,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TIME__Group_1__1__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4461:1: rule__TIME__Group_1__1__Impl : ( 'ms' ) ;
+    // InternalETPhys.g:4460:1: rule__TIME__Group_1__1__Impl : ( 'ms' ) ;
     public final void rule__TIME__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4465:1: ( ( 'ms' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4466:1: ( 'ms' )
+            // InternalETPhys.g:4464:1: ( ( 'ms' ) )
+            // InternalETPhys.g:4465:1: ( 'ms' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4466:1: ( 'ms' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4467:1: 'ms'
+            // InternalETPhys.g:4465:1: ( 'ms' )
+            // InternalETPhys.g:4466:1: 'ms'
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTIMEAccess().getMsKeyword_1_1()); 
-            }
-            match(input,55,FOLLOW_55_in_rule__TIME__Group_1__1__Impl8982); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTIMEAccess().getMsKeyword_1_1()); 
-            }
+             before(grammarAccess.getTIMEAccess().getMsKeyword_1_1()); 
+            match(input,55,FOLLOW_2); 
+             after(grammarAccess.getTIMEAccess().getMsKeyword_1_1()); 
 
             }
 
@@ -12957,25 +12115,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TIME__Group_2__0"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4484:1: rule__TIME__Group_2__0 : rule__TIME__Group_2__0__Impl rule__TIME__Group_2__1 ;
+    // InternalETPhys.g:4483:1: rule__TIME__Group_2__0 : rule__TIME__Group_2__0__Impl rule__TIME__Group_2__1 ;
     public final void rule__TIME__Group_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4488:1: ( rule__TIME__Group_2__0__Impl rule__TIME__Group_2__1 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4489:2: rule__TIME__Group_2__0__Impl rule__TIME__Group_2__1
+            // InternalETPhys.g:4487:1: ( rule__TIME__Group_2__0__Impl rule__TIME__Group_2__1 )
+            // InternalETPhys.g:4488:2: rule__TIME__Group_2__0__Impl rule__TIME__Group_2__1
             {
-            pushFollow(FOLLOW_rule__TIME__Group_2__0__Impl_in_rule__TIME__Group_2__09017);
+            pushFollow(FOLLOW_37);
             rule__TIME__Group_2__0__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__TIME__Group_2__1_in_rule__TIME__Group_2__09020);
+
+            pushFollow(FOLLOW_2);
             rule__TIME__Group_2__1();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -12995,25 +12153,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TIME__Group_2__0__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4496:1: rule__TIME__Group_2__0__Impl : ( RULE_INT ) ;
+    // InternalETPhys.g:4495:1: rule__TIME__Group_2__0__Impl : ( RULE_INT ) ;
     public final void rule__TIME__Group_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4500:1: ( ( RULE_INT ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4501:1: ( RULE_INT )
+            // InternalETPhys.g:4499:1: ( ( RULE_INT ) )
+            // InternalETPhys.g:4500:1: ( RULE_INT )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4501:1: ( RULE_INT )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4502:1: RULE_INT
+            // InternalETPhys.g:4500:1: ( RULE_INT )
+            // InternalETPhys.g:4501:1: RULE_INT
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTIMEAccess().getINTTerminalRuleCall_2_0()); 
-            }
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__TIME__Group_2__0__Impl9047); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTIMEAccess().getINTTerminalRuleCall_2_0()); 
-            }
+             before(grammarAccess.getTIMEAccess().getINTTerminalRuleCall_2_0()); 
+            match(input,RULE_INT,FOLLOW_2); 
+             after(grammarAccess.getTIMEAccess().getINTTerminalRuleCall_2_0()); 
 
             }
 
@@ -13036,20 +12190,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TIME__Group_2__1"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4513:1: rule__TIME__Group_2__1 : rule__TIME__Group_2__1__Impl ;
+    // InternalETPhys.g:4512:1: rule__TIME__Group_2__1 : rule__TIME__Group_2__1__Impl ;
     public final void rule__TIME__Group_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4517:1: ( rule__TIME__Group_2__1__Impl )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4518:2: rule__TIME__Group_2__1__Impl
+            // InternalETPhys.g:4516:1: ( rule__TIME__Group_2__1__Impl )
+            // InternalETPhys.g:4517:2: rule__TIME__Group_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__TIME__Group_2__1__Impl_in_rule__TIME__Group_2__19076);
+            pushFollow(FOLLOW_2);
             rule__TIME__Group_2__1__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -13069,25 +12223,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TIME__Group_2__1__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4524:1: rule__TIME__Group_2__1__Impl : ( 'us' ) ;
+    // InternalETPhys.g:4523:1: rule__TIME__Group_2__1__Impl : ( 'us' ) ;
     public final void rule__TIME__Group_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4528:1: ( ( 'us' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4529:1: ( 'us' )
+            // InternalETPhys.g:4527:1: ( ( 'us' ) )
+            // InternalETPhys.g:4528:1: ( 'us' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4529:1: ( 'us' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4530:1: 'us'
+            // InternalETPhys.g:4528:1: ( 'us' )
+            // InternalETPhys.g:4529:1: 'us'
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTIMEAccess().getUsKeyword_2_1()); 
-            }
-            match(input,56,FOLLOW_56_in_rule__TIME__Group_2__1__Impl9104); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTIMEAccess().getUsKeyword_2_1()); 
-            }
+             before(grammarAccess.getTIMEAccess().getUsKeyword_2_1()); 
+            match(input,56,FOLLOW_2); 
+             after(grammarAccess.getTIMEAccess().getUsKeyword_2_1()); 
 
             }
 
@@ -13110,25 +12260,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TIME__Group_3__0"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4547:1: rule__TIME__Group_3__0 : rule__TIME__Group_3__0__Impl rule__TIME__Group_3__1 ;
+    // InternalETPhys.g:4546:1: rule__TIME__Group_3__0 : rule__TIME__Group_3__0__Impl rule__TIME__Group_3__1 ;
     public final void rule__TIME__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4551:1: ( rule__TIME__Group_3__0__Impl rule__TIME__Group_3__1 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4552:2: rule__TIME__Group_3__0__Impl rule__TIME__Group_3__1
+            // InternalETPhys.g:4550:1: ( rule__TIME__Group_3__0__Impl rule__TIME__Group_3__1 )
+            // InternalETPhys.g:4551:2: rule__TIME__Group_3__0__Impl rule__TIME__Group_3__1
             {
-            pushFollow(FOLLOW_rule__TIME__Group_3__0__Impl_in_rule__TIME__Group_3__09139);
+            pushFollow(FOLLOW_38);
             rule__TIME__Group_3__0__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__TIME__Group_3__1_in_rule__TIME__Group_3__09142);
+
+            pushFollow(FOLLOW_2);
             rule__TIME__Group_3__1();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -13148,25 +12298,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TIME__Group_3__0__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4559:1: rule__TIME__Group_3__0__Impl : ( RULE_INT ) ;
+    // InternalETPhys.g:4558:1: rule__TIME__Group_3__0__Impl : ( RULE_INT ) ;
     public final void rule__TIME__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4563:1: ( ( RULE_INT ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4564:1: ( RULE_INT )
+            // InternalETPhys.g:4562:1: ( ( RULE_INT ) )
+            // InternalETPhys.g:4563:1: ( RULE_INT )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4564:1: ( RULE_INT )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4565:1: RULE_INT
+            // InternalETPhys.g:4563:1: ( RULE_INT )
+            // InternalETPhys.g:4564:1: RULE_INT
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTIMEAccess().getINTTerminalRuleCall_3_0()); 
-            }
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__TIME__Group_3__0__Impl9169); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTIMEAccess().getINTTerminalRuleCall_3_0()); 
-            }
+             before(grammarAccess.getTIMEAccess().getINTTerminalRuleCall_3_0()); 
+            match(input,RULE_INT,FOLLOW_2); 
+             after(grammarAccess.getTIMEAccess().getINTTerminalRuleCall_3_0()); 
 
             }
 
@@ -13189,20 +12335,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TIME__Group_3__1"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4576:1: rule__TIME__Group_3__1 : rule__TIME__Group_3__1__Impl ;
+    // InternalETPhys.g:4575:1: rule__TIME__Group_3__1 : rule__TIME__Group_3__1__Impl ;
     public final void rule__TIME__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4580:1: ( rule__TIME__Group_3__1__Impl )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4581:2: rule__TIME__Group_3__1__Impl
+            // InternalETPhys.g:4579:1: ( rule__TIME__Group_3__1__Impl )
+            // InternalETPhys.g:4580:2: rule__TIME__Group_3__1__Impl
             {
-            pushFollow(FOLLOW_rule__TIME__Group_3__1__Impl_in_rule__TIME__Group_3__19198);
+            pushFollow(FOLLOW_2);
             rule__TIME__Group_3__1__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -13222,25 +12368,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TIME__Group_3__1__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4587:1: rule__TIME__Group_3__1__Impl : ( 'ns' ) ;
+    // InternalETPhys.g:4586:1: rule__TIME__Group_3__1__Impl : ( 'ns' ) ;
     public final void rule__TIME__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4591:1: ( ( 'ns' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4592:1: ( 'ns' )
+            // InternalETPhys.g:4590:1: ( ( 'ns' ) )
+            // InternalETPhys.g:4591:1: ( 'ns' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4592:1: ( 'ns' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4593:1: 'ns'
+            // InternalETPhys.g:4591:1: ( 'ns' )
+            // InternalETPhys.g:4592:1: 'ns'
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTIMEAccess().getNsKeyword_3_1()); 
-            }
-            match(input,57,FOLLOW_57_in_rule__TIME__Group_3__1__Impl9226); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTIMEAccess().getNsKeyword_3_1()); 
-            }
+             before(grammarAccess.getTIMEAccess().getNsKeyword_3_1()); 
+            match(input,57,FOLLOW_2); 
+             after(grammarAccess.getTIMEAccess().getNsKeyword_3_1()); 
 
             }
 
@@ -13263,25 +12405,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__BooleanLiteral__Group__0"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4612:1: rule__BooleanLiteral__Group__0 : rule__BooleanLiteral__Group__0__Impl rule__BooleanLiteral__Group__1 ;
+    // InternalETPhys.g:4611:1: rule__BooleanLiteral__Group__0 : rule__BooleanLiteral__Group__0__Impl rule__BooleanLiteral__Group__1 ;
     public final void rule__BooleanLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4616:1: ( rule__BooleanLiteral__Group__0__Impl rule__BooleanLiteral__Group__1 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4617:2: rule__BooleanLiteral__Group__0__Impl rule__BooleanLiteral__Group__1
+            // InternalETPhys.g:4615:1: ( rule__BooleanLiteral__Group__0__Impl rule__BooleanLiteral__Group__1 )
+            // InternalETPhys.g:4616:2: rule__BooleanLiteral__Group__0__Impl rule__BooleanLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__BooleanLiteral__Group__0__Impl_in_rule__BooleanLiteral__Group__09263);
+            pushFollow(FOLLOW_39);
             rule__BooleanLiteral__Group__0__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__BooleanLiteral__Group__1_in_rule__BooleanLiteral__Group__09266);
+
+            pushFollow(FOLLOW_2);
             rule__BooleanLiteral__Group__1();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -13301,29 +12443,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__BooleanLiteral__Group__0__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4624:1: rule__BooleanLiteral__Group__0__Impl : ( () ) ;
+    // InternalETPhys.g:4623:1: rule__BooleanLiteral__Group__0__Impl : ( () ) ;
     public final void rule__BooleanLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4628:1: ( ( () ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4629:1: ( () )
+            // InternalETPhys.g:4627:1: ( ( () ) )
+            // InternalETPhys.g:4628:1: ( () )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4629:1: ( () )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4630:1: ()
+            // InternalETPhys.g:4628:1: ( () )
+            // InternalETPhys.g:4629:1: ()
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getBooleanLiteralAccess().getBooleanLiteralAction_0()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4631:1: ()
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4633:1: 
+             before(grammarAccess.getBooleanLiteralAccess().getBooleanLiteralAction_0()); 
+            // InternalETPhys.g:4630:1: ()
+            // InternalETPhys.g:4632:1: 
             {
             }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getBooleanLiteralAccess().getBooleanLiteralAction_0()); 
-            }
+             after(grammarAccess.getBooleanLiteralAccess().getBooleanLiteralAction_0()); 
 
             }
 
@@ -13342,20 +12480,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__BooleanLiteral__Group__1"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4643:1: rule__BooleanLiteral__Group__1 : rule__BooleanLiteral__Group__1__Impl ;
+    // InternalETPhys.g:4642:1: rule__BooleanLiteral__Group__1 : rule__BooleanLiteral__Group__1__Impl ;
     public final void rule__BooleanLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4647:1: ( rule__BooleanLiteral__Group__1__Impl )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4648:2: rule__BooleanLiteral__Group__1__Impl
+            // InternalETPhys.g:4646:1: ( rule__BooleanLiteral__Group__1__Impl )
+            // InternalETPhys.g:4647:2: rule__BooleanLiteral__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__BooleanLiteral__Group__1__Impl_in_rule__BooleanLiteral__Group__19324);
+            pushFollow(FOLLOW_2);
             rule__BooleanLiteral__Group__1__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -13375,36 +12513,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__BooleanLiteral__Group__1__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4654:1: rule__BooleanLiteral__Group__1__Impl : ( ( rule__BooleanLiteral__Alternatives_1 ) ) ;
+    // InternalETPhys.g:4653:1: rule__BooleanLiteral__Group__1__Impl : ( ( rule__BooleanLiteral__Alternatives_1 ) ) ;
     public final void rule__BooleanLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4658:1: ( ( ( rule__BooleanLiteral__Alternatives_1 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4659:1: ( ( rule__BooleanLiteral__Alternatives_1 ) )
+            // InternalETPhys.g:4657:1: ( ( ( rule__BooleanLiteral__Alternatives_1 ) ) )
+            // InternalETPhys.g:4658:1: ( ( rule__BooleanLiteral__Alternatives_1 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4659:1: ( ( rule__BooleanLiteral__Alternatives_1 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4660:1: ( rule__BooleanLiteral__Alternatives_1 )
+            // InternalETPhys.g:4658:1: ( ( rule__BooleanLiteral__Alternatives_1 ) )
+            // InternalETPhys.g:4659:1: ( rule__BooleanLiteral__Alternatives_1 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getBooleanLiteralAccess().getAlternatives_1()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4661:1: ( rule__BooleanLiteral__Alternatives_1 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4661:2: rule__BooleanLiteral__Alternatives_1
+             before(grammarAccess.getBooleanLiteralAccess().getAlternatives_1()); 
+            // InternalETPhys.g:4660:1: ( rule__BooleanLiteral__Alternatives_1 )
+            // InternalETPhys.g:4660:2: rule__BooleanLiteral__Alternatives_1
             {
-            pushFollow(FOLLOW_rule__BooleanLiteral__Alternatives_1_in_rule__BooleanLiteral__Group__1__Impl9351);
+            pushFollow(FOLLOW_2);
             rule__BooleanLiteral__Alternatives_1();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getBooleanLiteralAccess().getAlternatives_1()); 
             }
 
+             after(grammarAccess.getBooleanLiteralAccess().getAlternatives_1()); 
+
             }
 
 
@@ -13426,25 +12560,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RealLiteral__Group__0"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4675:1: rule__RealLiteral__Group__0 : rule__RealLiteral__Group__0__Impl rule__RealLiteral__Group__1 ;
+    // InternalETPhys.g:4674:1: rule__RealLiteral__Group__0 : rule__RealLiteral__Group__0__Impl rule__RealLiteral__Group__1 ;
     public final void rule__RealLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4679:1: ( rule__RealLiteral__Group__0__Impl rule__RealLiteral__Group__1 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4680:2: rule__RealLiteral__Group__0__Impl rule__RealLiteral__Group__1
+            // InternalETPhys.g:4678:1: ( rule__RealLiteral__Group__0__Impl rule__RealLiteral__Group__1 )
+            // InternalETPhys.g:4679:2: rule__RealLiteral__Group__0__Impl rule__RealLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__RealLiteral__Group__0__Impl_in_rule__RealLiteral__Group__09385);
+            pushFollow(FOLLOW_17);
             rule__RealLiteral__Group__0__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__RealLiteral__Group__1_in_rule__RealLiteral__Group__09388);
+
+            pushFollow(FOLLOW_2);
             rule__RealLiteral__Group__1();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -13464,29 +12598,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RealLiteral__Group__0__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4687:1: rule__RealLiteral__Group__0__Impl : ( () ) ;
+    // InternalETPhys.g:4686:1: rule__RealLiteral__Group__0__Impl : ( () ) ;
     public final void rule__RealLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4691:1: ( ( () ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4692:1: ( () )
+            // InternalETPhys.g:4690:1: ( ( () ) )
+            // InternalETPhys.g:4691:1: ( () )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4692:1: ( () )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4693:1: ()
+            // InternalETPhys.g:4691:1: ( () )
+            // InternalETPhys.g:4692:1: ()
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getRealLiteralAccess().getRealLiteralAction_0()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4694:1: ()
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4696:1: 
+             before(grammarAccess.getRealLiteralAccess().getRealLiteralAction_0()); 
+            // InternalETPhys.g:4693:1: ()
+            // InternalETPhys.g:4695:1: 
             {
             }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getRealLiteralAccess().getRealLiteralAction_0()); 
-            }
+             after(grammarAccess.getRealLiteralAccess().getRealLiteralAction_0()); 
 
             }
 
@@ -13505,20 +12635,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RealLiteral__Group__1"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4706:1: rule__RealLiteral__Group__1 : rule__RealLiteral__Group__1__Impl ;
+    // InternalETPhys.g:4705:1: rule__RealLiteral__Group__1 : rule__RealLiteral__Group__1__Impl ;
     public final void rule__RealLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4710:1: ( rule__RealLiteral__Group__1__Impl )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4711:2: rule__RealLiteral__Group__1__Impl
+            // InternalETPhys.g:4709:1: ( rule__RealLiteral__Group__1__Impl )
+            // InternalETPhys.g:4710:2: rule__RealLiteral__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__RealLiteral__Group__1__Impl_in_rule__RealLiteral__Group__19446);
+            pushFollow(FOLLOW_2);
             rule__RealLiteral__Group__1__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -13538,36 +12668,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RealLiteral__Group__1__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4717:1: rule__RealLiteral__Group__1__Impl : ( ( rule__RealLiteral__ValueAssignment_1 ) ) ;
+    // InternalETPhys.g:4716:1: rule__RealLiteral__Group__1__Impl : ( ( rule__RealLiteral__ValueAssignment_1 ) ) ;
     public final void rule__RealLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4721:1: ( ( ( rule__RealLiteral__ValueAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4722:1: ( ( rule__RealLiteral__ValueAssignment_1 ) )
+            // InternalETPhys.g:4720:1: ( ( ( rule__RealLiteral__ValueAssignment_1 ) ) )
+            // InternalETPhys.g:4721:1: ( ( rule__RealLiteral__ValueAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4722:1: ( ( rule__RealLiteral__ValueAssignment_1 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4723:1: ( rule__RealLiteral__ValueAssignment_1 )
+            // InternalETPhys.g:4721:1: ( ( rule__RealLiteral__ValueAssignment_1 ) )
+            // InternalETPhys.g:4722:1: ( rule__RealLiteral__ValueAssignment_1 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getRealLiteralAccess().getValueAssignment_1()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4724:1: ( rule__RealLiteral__ValueAssignment_1 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4724:2: rule__RealLiteral__ValueAssignment_1
+             before(grammarAccess.getRealLiteralAccess().getValueAssignment_1()); 
+            // InternalETPhys.g:4723:1: ( rule__RealLiteral__ValueAssignment_1 )
+            // InternalETPhys.g:4723:2: rule__RealLiteral__ValueAssignment_1
             {
-            pushFollow(FOLLOW_rule__RealLiteral__ValueAssignment_1_in_rule__RealLiteral__Group__1__Impl9473);
+            pushFollow(FOLLOW_2);
             rule__RealLiteral__ValueAssignment_1();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getRealLiteralAccess().getValueAssignment_1()); 
             }
 
+             after(grammarAccess.getRealLiteralAccess().getValueAssignment_1()); 
+
             }
 
 
@@ -13589,25 +12715,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__IntLiteral__Group__0"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4738:1: rule__IntLiteral__Group__0 : rule__IntLiteral__Group__0__Impl rule__IntLiteral__Group__1 ;
+    // InternalETPhys.g:4737:1: rule__IntLiteral__Group__0 : rule__IntLiteral__Group__0__Impl rule__IntLiteral__Group__1 ;
     public final void rule__IntLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4742:1: ( rule__IntLiteral__Group__0__Impl rule__IntLiteral__Group__1 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4743:2: rule__IntLiteral__Group__0__Impl rule__IntLiteral__Group__1
+            // InternalETPhys.g:4741:1: ( rule__IntLiteral__Group__0__Impl rule__IntLiteral__Group__1 )
+            // InternalETPhys.g:4742:2: rule__IntLiteral__Group__0__Impl rule__IntLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__IntLiteral__Group__0__Impl_in_rule__IntLiteral__Group__09507);
+            pushFollow(FOLLOW_17);
             rule__IntLiteral__Group__0__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__IntLiteral__Group__1_in_rule__IntLiteral__Group__09510);
+
+            pushFollow(FOLLOW_2);
             rule__IntLiteral__Group__1();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -13627,29 +12753,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__IntLiteral__Group__0__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4750:1: rule__IntLiteral__Group__0__Impl : ( () ) ;
+    // InternalETPhys.g:4749:1: rule__IntLiteral__Group__0__Impl : ( () ) ;
     public final void rule__IntLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4754:1: ( ( () ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4755:1: ( () )
+            // InternalETPhys.g:4753:1: ( ( () ) )
+            // InternalETPhys.g:4754:1: ( () )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4755:1: ( () )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4756:1: ()
+            // InternalETPhys.g:4754:1: ( () )
+            // InternalETPhys.g:4755:1: ()
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getIntLiteralAccess().getIntLiteralAction_0()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4757:1: ()
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4759:1: 
+             before(grammarAccess.getIntLiteralAccess().getIntLiteralAction_0()); 
+            // InternalETPhys.g:4756:1: ()
+            // InternalETPhys.g:4758:1: 
             {
             }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getIntLiteralAccess().getIntLiteralAction_0()); 
-            }
+             after(grammarAccess.getIntLiteralAccess().getIntLiteralAction_0()); 
 
             }
 
@@ -13668,20 +12790,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__IntLiteral__Group__1"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4769:1: rule__IntLiteral__Group__1 : rule__IntLiteral__Group__1__Impl ;
+    // InternalETPhys.g:4768:1: rule__IntLiteral__Group__1 : rule__IntLiteral__Group__1__Impl ;
     public final void rule__IntLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4773:1: ( rule__IntLiteral__Group__1__Impl )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4774:2: rule__IntLiteral__Group__1__Impl
+            // InternalETPhys.g:4772:1: ( rule__IntLiteral__Group__1__Impl )
+            // InternalETPhys.g:4773:2: rule__IntLiteral__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__IntLiteral__Group__1__Impl_in_rule__IntLiteral__Group__19568);
+            pushFollow(FOLLOW_2);
             rule__IntLiteral__Group__1__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -13701,36 +12823,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__IntLiteral__Group__1__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4780:1: rule__IntLiteral__Group__1__Impl : ( ( rule__IntLiteral__ValueAssignment_1 ) ) ;
+    // InternalETPhys.g:4779:1: rule__IntLiteral__Group__1__Impl : ( ( rule__IntLiteral__ValueAssignment_1 ) ) ;
     public final void rule__IntLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4784:1: ( ( ( rule__IntLiteral__ValueAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4785:1: ( ( rule__IntLiteral__ValueAssignment_1 ) )
+            // InternalETPhys.g:4783:1: ( ( ( rule__IntLiteral__ValueAssignment_1 ) ) )
+            // InternalETPhys.g:4784:1: ( ( rule__IntLiteral__ValueAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4785:1: ( ( rule__IntLiteral__ValueAssignment_1 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4786:1: ( rule__IntLiteral__ValueAssignment_1 )
+            // InternalETPhys.g:4784:1: ( ( rule__IntLiteral__ValueAssignment_1 ) )
+            // InternalETPhys.g:4785:1: ( rule__IntLiteral__ValueAssignment_1 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getIntLiteralAccess().getValueAssignment_1()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4787:1: ( rule__IntLiteral__ValueAssignment_1 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4787:2: rule__IntLiteral__ValueAssignment_1
+             before(grammarAccess.getIntLiteralAccess().getValueAssignment_1()); 
+            // InternalETPhys.g:4786:1: ( rule__IntLiteral__ValueAssignment_1 )
+            // InternalETPhys.g:4786:2: rule__IntLiteral__ValueAssignment_1
             {
-            pushFollow(FOLLOW_rule__IntLiteral__ValueAssignment_1_in_rule__IntLiteral__Group__1__Impl9595);
+            pushFollow(FOLLOW_2);
             rule__IntLiteral__ValueAssignment_1();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getIntLiteralAccess().getValueAssignment_1()); 
             }
 
+             after(grammarAccess.getIntLiteralAccess().getValueAssignment_1()); 
+
             }
 
 
@@ -13752,25 +12870,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StringLiteral__Group__0"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4801:1: rule__StringLiteral__Group__0 : rule__StringLiteral__Group__0__Impl rule__StringLiteral__Group__1 ;
+    // InternalETPhys.g:4800:1: rule__StringLiteral__Group__0 : rule__StringLiteral__Group__0__Impl rule__StringLiteral__Group__1 ;
     public final void rule__StringLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4805:1: ( rule__StringLiteral__Group__0__Impl rule__StringLiteral__Group__1 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4806:2: rule__StringLiteral__Group__0__Impl rule__StringLiteral__Group__1
+            // InternalETPhys.g:4804:1: ( rule__StringLiteral__Group__0__Impl rule__StringLiteral__Group__1 )
+            // InternalETPhys.g:4805:2: rule__StringLiteral__Group__0__Impl rule__StringLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__StringLiteral__Group__0__Impl_in_rule__StringLiteral__Group__09629);
+            pushFollow(FOLLOW_24);
             rule__StringLiteral__Group__0__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__StringLiteral__Group__1_in_rule__StringLiteral__Group__09632);
+
+            pushFollow(FOLLOW_2);
             rule__StringLiteral__Group__1();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -13790,29 +12908,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StringLiteral__Group__0__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4813:1: rule__StringLiteral__Group__0__Impl : ( () ) ;
+    // InternalETPhys.g:4812:1: rule__StringLiteral__Group__0__Impl : ( () ) ;
     public final void rule__StringLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4817:1: ( ( () ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4818:1: ( () )
+            // InternalETPhys.g:4816:1: ( ( () ) )
+            // InternalETPhys.g:4817:1: ( () )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4818:1: ( () )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4819:1: ()
+            // InternalETPhys.g:4817:1: ( () )
+            // InternalETPhys.g:4818:1: ()
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getStringLiteralAccess().getStringLiteralAction_0()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4820:1: ()
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4822:1: 
+             before(grammarAccess.getStringLiteralAccess().getStringLiteralAction_0()); 
+            // InternalETPhys.g:4819:1: ()
+            // InternalETPhys.g:4821:1: 
             {
             }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getStringLiteralAccess().getStringLiteralAction_0()); 
-            }
+             after(grammarAccess.getStringLiteralAccess().getStringLiteralAction_0()); 
 
             }
 
@@ -13831,20 +12945,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StringLiteral__Group__1"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4832:1: rule__StringLiteral__Group__1 : rule__StringLiteral__Group__1__Impl ;
+    // InternalETPhys.g:4831:1: rule__StringLiteral__Group__1 : rule__StringLiteral__Group__1__Impl ;
     public final void rule__StringLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4836:1: ( rule__StringLiteral__Group__1__Impl )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4837:2: rule__StringLiteral__Group__1__Impl
+            // InternalETPhys.g:4835:1: ( rule__StringLiteral__Group__1__Impl )
+            // InternalETPhys.g:4836:2: rule__StringLiteral__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__StringLiteral__Group__1__Impl_in_rule__StringLiteral__Group__19690);
+            pushFollow(FOLLOW_2);
             rule__StringLiteral__Group__1__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -13864,36 +12978,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StringLiteral__Group__1__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4843:1: rule__StringLiteral__Group__1__Impl : ( ( rule__StringLiteral__ValueAssignment_1 ) ) ;
+    // InternalETPhys.g:4842:1: rule__StringLiteral__Group__1__Impl : ( ( rule__StringLiteral__ValueAssignment_1 ) ) ;
     public final void rule__StringLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4847:1: ( ( ( rule__StringLiteral__ValueAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4848:1: ( ( rule__StringLiteral__ValueAssignment_1 ) )
+            // InternalETPhys.g:4846:1: ( ( ( rule__StringLiteral__ValueAssignment_1 ) ) )
+            // InternalETPhys.g:4847:1: ( ( rule__StringLiteral__ValueAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4848:1: ( ( rule__StringLiteral__ValueAssignment_1 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4849:1: ( rule__StringLiteral__ValueAssignment_1 )
+            // InternalETPhys.g:4847:1: ( ( rule__StringLiteral__ValueAssignment_1 ) )
+            // InternalETPhys.g:4848:1: ( rule__StringLiteral__ValueAssignment_1 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getStringLiteralAccess().getValueAssignment_1()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4850:1: ( rule__StringLiteral__ValueAssignment_1 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4850:2: rule__StringLiteral__ValueAssignment_1
+             before(grammarAccess.getStringLiteralAccess().getValueAssignment_1()); 
+            // InternalETPhys.g:4849:1: ( rule__StringLiteral__ValueAssignment_1 )
+            // InternalETPhys.g:4849:2: rule__StringLiteral__ValueAssignment_1
             {
-            pushFollow(FOLLOW_rule__StringLiteral__ValueAssignment_1_in_rule__StringLiteral__Group__1__Impl9717);
+            pushFollow(FOLLOW_2);
             rule__StringLiteral__ValueAssignment_1();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getStringLiteralAccess().getValueAssignment_1()); 
             }
 
+             after(grammarAccess.getStringLiteralAccess().getValueAssignment_1()); 
+
             }
 
 
@@ -13915,25 +13025,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Integer__Group_0__0"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4864:1: rule__Integer__Group_0__0 : rule__Integer__Group_0__0__Impl rule__Integer__Group_0__1 ;
+    // InternalETPhys.g:4863:1: rule__Integer__Group_0__0 : rule__Integer__Group_0__0__Impl rule__Integer__Group_0__1 ;
     public final void rule__Integer__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4868:1: ( rule__Integer__Group_0__0__Impl rule__Integer__Group_0__1 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4869:2: rule__Integer__Group_0__0__Impl rule__Integer__Group_0__1
+            // InternalETPhys.g:4867:1: ( rule__Integer__Group_0__0__Impl rule__Integer__Group_0__1 )
+            // InternalETPhys.g:4868:2: rule__Integer__Group_0__0__Impl rule__Integer__Group_0__1
             {
-            pushFollow(FOLLOW_rule__Integer__Group_0__0__Impl_in_rule__Integer__Group_0__09751);
+            pushFollow(FOLLOW_40);
             rule__Integer__Group_0__0__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Integer__Group_0__1_in_rule__Integer__Group_0__09754);
+
+            pushFollow(FOLLOW_2);
             rule__Integer__Group_0__1();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -13953,22 +13063,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Integer__Group_0__0__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4876:1: rule__Integer__Group_0__0__Impl : ( ( rule__Integer__Alternatives_0_0 )? ) ;
+    // InternalETPhys.g:4875:1: rule__Integer__Group_0__0__Impl : ( ( rule__Integer__Alternatives_0_0 )? ) ;
     public final void rule__Integer__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4880:1: ( ( ( rule__Integer__Alternatives_0_0 )? ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4881:1: ( ( rule__Integer__Alternatives_0_0 )? )
+            // InternalETPhys.g:4879:1: ( ( ( rule__Integer__Alternatives_0_0 )? ) )
+            // InternalETPhys.g:4880:1: ( ( rule__Integer__Alternatives_0_0 )? )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4881:1: ( ( rule__Integer__Alternatives_0_0 )? )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4882:1: ( rule__Integer__Alternatives_0_0 )?
+            // InternalETPhys.g:4880:1: ( ( rule__Integer__Alternatives_0_0 )? )
+            // InternalETPhys.g:4881:1: ( rule__Integer__Alternatives_0_0 )?
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getIntegerAccess().getAlternatives_0_0()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4883:1: ( rule__Integer__Alternatives_0_0 )?
+             before(grammarAccess.getIntegerAccess().getAlternatives_0_0()); 
+            // InternalETPhys.g:4882:1: ( rule__Integer__Alternatives_0_0 )?
             int alt32=2;
             int LA32_0 = input.LA(1);
 
@@ -13977,22 +13085,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
             }
             switch (alt32) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4883:2: rule__Integer__Alternatives_0_0
+                    // InternalETPhys.g:4882:2: rule__Integer__Alternatives_0_0
                     {
-                    pushFollow(FOLLOW_rule__Integer__Alternatives_0_0_in_rule__Integer__Group_0__0__Impl9781);
+                    pushFollow(FOLLOW_2);
                     rule__Integer__Alternatives_0_0();
 
                     state._fsp--;
-                    if (state.failed) return ;
+
 
                     }
                     break;
 
             }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getIntegerAccess().getAlternatives_0_0()); 
-            }
+             after(grammarAccess.getIntegerAccess().getAlternatives_0_0()); 
 
             }
 
@@ -14015,20 +13121,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Integer__Group_0__1"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4893:1: rule__Integer__Group_0__1 : rule__Integer__Group_0__1__Impl ;
+    // InternalETPhys.g:4892:1: rule__Integer__Group_0__1 : rule__Integer__Group_0__1__Impl ;
     public final void rule__Integer__Group_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4897:1: ( rule__Integer__Group_0__1__Impl )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4898:2: rule__Integer__Group_0__1__Impl
+            // InternalETPhys.g:4896:1: ( rule__Integer__Group_0__1__Impl )
+            // InternalETPhys.g:4897:2: rule__Integer__Group_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__Integer__Group_0__1__Impl_in_rule__Integer__Group_0__19812);
+            pushFollow(FOLLOW_2);
             rule__Integer__Group_0__1__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -14048,25 +13154,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Integer__Group_0__1__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4904:1: rule__Integer__Group_0__1__Impl : ( RULE_INT ) ;
+    // InternalETPhys.g:4903:1: rule__Integer__Group_0__1__Impl : ( RULE_INT ) ;
     public final void rule__Integer__Group_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4908:1: ( ( RULE_INT ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4909:1: ( RULE_INT )
+            // InternalETPhys.g:4907:1: ( ( RULE_INT ) )
+            // InternalETPhys.g:4908:1: ( RULE_INT )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4909:1: ( RULE_INT )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4910:1: RULE_INT
+            // InternalETPhys.g:4908:1: ( RULE_INT )
+            // InternalETPhys.g:4909:1: RULE_INT
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getIntegerAccess().getINTTerminalRuleCall_0_1()); 
-            }
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__Integer__Group_0__1__Impl9839); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getIntegerAccess().getINTTerminalRuleCall_0_1()); 
-            }
+             before(grammarAccess.getIntegerAccess().getINTTerminalRuleCall_0_1()); 
+            match(input,RULE_INT,FOLLOW_2); 
+             after(grammarAccess.getIntegerAccess().getINTTerminalRuleCall_0_1()); 
 
             }
 
@@ -14089,25 +13191,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Decimal__Group__0"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4925:1: rule__Decimal__Group__0 : rule__Decimal__Group__0__Impl rule__Decimal__Group__1 ;
+    // InternalETPhys.g:4924:1: rule__Decimal__Group__0 : rule__Decimal__Group__0__Impl rule__Decimal__Group__1 ;
     public final void rule__Decimal__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4929:1: ( rule__Decimal__Group__0__Impl rule__Decimal__Group__1 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4930:2: rule__Decimal__Group__0__Impl rule__Decimal__Group__1
+            // InternalETPhys.g:4928:1: ( rule__Decimal__Group__0__Impl rule__Decimal__Group__1 )
+            // InternalETPhys.g:4929:2: rule__Decimal__Group__0__Impl rule__Decimal__Group__1
             {
-            pushFollow(FOLLOW_rule__Decimal__Group__0__Impl_in_rule__Decimal__Group__09872);
+            pushFollow(FOLLOW_40);
             rule__Decimal__Group__0__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Decimal__Group__1_in_rule__Decimal__Group__09875);
+
+            pushFollow(FOLLOW_2);
             rule__Decimal__Group__1();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -14127,22 +13229,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Decimal__Group__0__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4937:1: rule__Decimal__Group__0__Impl : ( ( rule__Decimal__Alternatives_0 )? ) ;
+    // InternalETPhys.g:4936:1: rule__Decimal__Group__0__Impl : ( ( rule__Decimal__Alternatives_0 )? ) ;
     public final void rule__Decimal__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4941:1: ( ( ( rule__Decimal__Alternatives_0 )? ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4942:1: ( ( rule__Decimal__Alternatives_0 )? )
+            // InternalETPhys.g:4940:1: ( ( ( rule__Decimal__Alternatives_0 )? ) )
+            // InternalETPhys.g:4941:1: ( ( rule__Decimal__Alternatives_0 )? )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4942:1: ( ( rule__Decimal__Alternatives_0 )? )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4943:1: ( rule__Decimal__Alternatives_0 )?
+            // InternalETPhys.g:4941:1: ( ( rule__Decimal__Alternatives_0 )? )
+            // InternalETPhys.g:4942:1: ( rule__Decimal__Alternatives_0 )?
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getDecimalAccess().getAlternatives_0()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4944:1: ( rule__Decimal__Alternatives_0 )?
+             before(grammarAccess.getDecimalAccess().getAlternatives_0()); 
+            // InternalETPhys.g:4943:1: ( rule__Decimal__Alternatives_0 )?
             int alt33=2;
             int LA33_0 = input.LA(1);
 
@@ -14151,22 +13251,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
             }
             switch (alt33) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4944:2: rule__Decimal__Alternatives_0
+                    // InternalETPhys.g:4943:2: rule__Decimal__Alternatives_0
                     {
-                    pushFollow(FOLLOW_rule__Decimal__Alternatives_0_in_rule__Decimal__Group__0__Impl9902);
+                    pushFollow(FOLLOW_2);
                     rule__Decimal__Alternatives_0();
 
                     state._fsp--;
-                    if (state.failed) return ;
+
 
                     }
                     break;
 
             }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getDecimalAccess().getAlternatives_0()); 
-            }
+             after(grammarAccess.getDecimalAccess().getAlternatives_0()); 
 
             }
 
@@ -14189,25 +13287,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Decimal__Group__1"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4954:1: rule__Decimal__Group__1 : rule__Decimal__Group__1__Impl rule__Decimal__Group__2 ;
+    // InternalETPhys.g:4953:1: rule__Decimal__Group__1 : rule__Decimal__Group__1__Impl rule__Decimal__Group__2 ;
     public final void rule__Decimal__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4958:1: ( rule__Decimal__Group__1__Impl rule__Decimal__Group__2 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4959:2: rule__Decimal__Group__1__Impl rule__Decimal__Group__2
+            // InternalETPhys.g:4957:1: ( rule__Decimal__Group__1__Impl rule__Decimal__Group__2 )
+            // InternalETPhys.g:4958:2: rule__Decimal__Group__1__Impl rule__Decimal__Group__2
             {
-            pushFollow(FOLLOW_rule__Decimal__Group__1__Impl_in_rule__Decimal__Group__19933);
+            pushFollow(FOLLOW_41);
             rule__Decimal__Group__1__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Decimal__Group__2_in_rule__Decimal__Group__19936);
+
+            pushFollow(FOLLOW_2);
             rule__Decimal__Group__2();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -14227,25 +13325,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Decimal__Group__1__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4966:1: rule__Decimal__Group__1__Impl : ( RULE_INT ) ;
+    // InternalETPhys.g:4965:1: rule__Decimal__Group__1__Impl : ( RULE_INT ) ;
     public final void rule__Decimal__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4970:1: ( ( RULE_INT ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4971:1: ( RULE_INT )
+            // InternalETPhys.g:4969:1: ( ( RULE_INT ) )
+            // InternalETPhys.g:4970:1: ( RULE_INT )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4971:1: ( RULE_INT )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4972:1: RULE_INT
+            // InternalETPhys.g:4970:1: ( RULE_INT )
+            // InternalETPhys.g:4971:1: RULE_INT
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getDecimalAccess().getINTTerminalRuleCall_1()); 
-            }
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__Decimal__Group__1__Impl9963); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getDecimalAccess().getINTTerminalRuleCall_1()); 
-            }
+             before(grammarAccess.getDecimalAccess().getINTTerminalRuleCall_1()); 
+            match(input,RULE_INT,FOLLOW_2); 
+             after(grammarAccess.getDecimalAccess().getINTTerminalRuleCall_1()); 
 
             }
 
@@ -14268,25 +13362,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Decimal__Group__2"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4983:1: rule__Decimal__Group__2 : rule__Decimal__Group__2__Impl rule__Decimal__Group__3 ;
+    // InternalETPhys.g:4982:1: rule__Decimal__Group__2 : rule__Decimal__Group__2__Impl rule__Decimal__Group__3 ;
     public final void rule__Decimal__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4987:1: ( rule__Decimal__Group__2__Impl rule__Decimal__Group__3 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4988:2: rule__Decimal__Group__2__Impl rule__Decimal__Group__3
+            // InternalETPhys.g:4986:1: ( rule__Decimal__Group__2__Impl rule__Decimal__Group__3 )
+            // InternalETPhys.g:4987:2: rule__Decimal__Group__2__Impl rule__Decimal__Group__3
             {
-            pushFollow(FOLLOW_rule__Decimal__Group__2__Impl_in_rule__Decimal__Group__29992);
+            pushFollow(FOLLOW_21);
             rule__Decimal__Group__2__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Decimal__Group__3_in_rule__Decimal__Group__29995);
+
+            pushFollow(FOLLOW_2);
             rule__Decimal__Group__3();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -14306,25 +13400,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Decimal__Group__2__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4995:1: rule__Decimal__Group__2__Impl : ( '.' ) ;
+    // InternalETPhys.g:4994:1: rule__Decimal__Group__2__Impl : ( '.' ) ;
     public final void rule__Decimal__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:4999:1: ( ( '.' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5000:1: ( '.' )
+            // InternalETPhys.g:4998:1: ( ( '.' ) )
+            // InternalETPhys.g:4999:1: ( '.' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5000:1: ( '.' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5001:1: '.'
+            // InternalETPhys.g:4999:1: ( '.' )
+            // InternalETPhys.g:5000:1: '.'
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getDecimalAccess().getFullStopKeyword_2()); 
-            }
-            match(input,58,FOLLOW_58_in_rule__Decimal__Group__2__Impl10023); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getDecimalAccess().getFullStopKeyword_2()); 
-            }
+             before(grammarAccess.getDecimalAccess().getFullStopKeyword_2()); 
+            match(input,58,FOLLOW_2); 
+             after(grammarAccess.getDecimalAccess().getFullStopKeyword_2()); 
 
             }
 
@@ -14347,20 +13437,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Decimal__Group__3"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5014:1: rule__Decimal__Group__3 : rule__Decimal__Group__3__Impl ;
+    // InternalETPhys.g:5013:1: rule__Decimal__Group__3 : rule__Decimal__Group__3__Impl ;
     public final void rule__Decimal__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5018:1: ( rule__Decimal__Group__3__Impl )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5019:2: rule__Decimal__Group__3__Impl
+            // InternalETPhys.g:5017:1: ( rule__Decimal__Group__3__Impl )
+            // InternalETPhys.g:5018:2: rule__Decimal__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__Decimal__Group__3__Impl_in_rule__Decimal__Group__310054);
+            pushFollow(FOLLOW_2);
             rule__Decimal__Group__3__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -14380,25 +13470,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Decimal__Group__3__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5025:1: rule__Decimal__Group__3__Impl : ( RULE_INT ) ;
+    // InternalETPhys.g:5024:1: rule__Decimal__Group__3__Impl : ( RULE_INT ) ;
     public final void rule__Decimal__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5029:1: ( ( RULE_INT ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5030:1: ( RULE_INT )
+            // InternalETPhys.g:5028:1: ( ( RULE_INT ) )
+            // InternalETPhys.g:5029:1: ( RULE_INT )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5030:1: ( RULE_INT )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5031:1: RULE_INT
+            // InternalETPhys.g:5029:1: ( RULE_INT )
+            // InternalETPhys.g:5030:1: RULE_INT
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getDecimalAccess().getINTTerminalRuleCall_3()); 
-            }
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__Decimal__Group__3__Impl10081); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getDecimalAccess().getINTTerminalRuleCall_3()); 
-            }
+             before(grammarAccess.getDecimalAccess().getINTTerminalRuleCall_3()); 
+            match(input,RULE_INT,FOLLOW_2); 
+             after(grammarAccess.getDecimalAccess().getINTTerminalRuleCall_3()); 
 
             }
 
@@ -14421,25 +13507,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__0"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5050:1: rule__DecimalExp__Group__0 : rule__DecimalExp__Group__0__Impl rule__DecimalExp__Group__1 ;
+    // InternalETPhys.g:5049:1: rule__DecimalExp__Group__0 : rule__DecimalExp__Group__0__Impl rule__DecimalExp__Group__1 ;
     public final void rule__DecimalExp__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5054:1: ( rule__DecimalExp__Group__0__Impl rule__DecimalExp__Group__1 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5055:2: rule__DecimalExp__Group__0__Impl rule__DecimalExp__Group__1
+            // InternalETPhys.g:5053:1: ( rule__DecimalExp__Group__0__Impl rule__DecimalExp__Group__1 )
+            // InternalETPhys.g:5054:2: rule__DecimalExp__Group__0__Impl rule__DecimalExp__Group__1
             {
-            pushFollow(FOLLOW_rule__DecimalExp__Group__0__Impl_in_rule__DecimalExp__Group__010118);
+            pushFollow(FOLLOW_17);
             rule__DecimalExp__Group__0__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__DecimalExp__Group__1_in_rule__DecimalExp__Group__010121);
+
+            pushFollow(FOLLOW_2);
             rule__DecimalExp__Group__1();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -14459,22 +13545,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__0__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5062:1: rule__DecimalExp__Group__0__Impl : ( ( rule__DecimalExp__Alternatives_0 )? ) ;
+    // InternalETPhys.g:5061:1: rule__DecimalExp__Group__0__Impl : ( ( rule__DecimalExp__Alternatives_0 )? ) ;
     public final void rule__DecimalExp__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5066:1: ( ( ( rule__DecimalExp__Alternatives_0 )? ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5067:1: ( ( rule__DecimalExp__Alternatives_0 )? )
+            // InternalETPhys.g:5065:1: ( ( ( rule__DecimalExp__Alternatives_0 )? ) )
+            // InternalETPhys.g:5066:1: ( ( rule__DecimalExp__Alternatives_0 )? )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5067:1: ( ( rule__DecimalExp__Alternatives_0 )? )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5068:1: ( rule__DecimalExp__Alternatives_0 )?
+            // InternalETPhys.g:5066:1: ( ( rule__DecimalExp__Alternatives_0 )? )
+            // InternalETPhys.g:5067:1: ( rule__DecimalExp__Alternatives_0 )?
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getDecimalExpAccess().getAlternatives_0()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5069:1: ( rule__DecimalExp__Alternatives_0 )?
+             before(grammarAccess.getDecimalExpAccess().getAlternatives_0()); 
+            // InternalETPhys.g:5068:1: ( rule__DecimalExp__Alternatives_0 )?
             int alt34=2;
             int LA34_0 = input.LA(1);
 
@@ -14483,22 +13567,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
             }
             switch (alt34) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5069:2: rule__DecimalExp__Alternatives_0
+                    // InternalETPhys.g:5068:2: rule__DecimalExp__Alternatives_0
                     {
-                    pushFollow(FOLLOW_rule__DecimalExp__Alternatives_0_in_rule__DecimalExp__Group__0__Impl10148);
+                    pushFollow(FOLLOW_2);
                     rule__DecimalExp__Alternatives_0();
 
                     state._fsp--;
-                    if (state.failed) return ;
+
 
                     }
                     break;
 
             }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getDecimalExpAccess().getAlternatives_0()); 
-            }
+             after(grammarAccess.getDecimalExpAccess().getAlternatives_0()); 
 
             }
 
@@ -14521,25 +13603,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__1"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5079:1: rule__DecimalExp__Group__1 : rule__DecimalExp__Group__1__Impl rule__DecimalExp__Group__2 ;
+    // InternalETPhys.g:5078:1: rule__DecimalExp__Group__1 : rule__DecimalExp__Group__1__Impl rule__DecimalExp__Group__2 ;
     public final void rule__DecimalExp__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5083:1: ( rule__DecimalExp__Group__1__Impl rule__DecimalExp__Group__2 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5084:2: rule__DecimalExp__Group__1__Impl rule__DecimalExp__Group__2
+            // InternalETPhys.g:5082:1: ( rule__DecimalExp__Group__1__Impl rule__DecimalExp__Group__2 )
+            // InternalETPhys.g:5083:2: rule__DecimalExp__Group__1__Impl rule__DecimalExp__Group__2
             {
-            pushFollow(FOLLOW_rule__DecimalExp__Group__1__Impl_in_rule__DecimalExp__Group__110179);
+            pushFollow(FOLLOW_41);
             rule__DecimalExp__Group__1__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__DecimalExp__Group__2_in_rule__DecimalExp__Group__110182);
+
+            pushFollow(FOLLOW_2);
             rule__DecimalExp__Group__2();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -14559,25 +13641,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__1__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5091:1: rule__DecimalExp__Group__1__Impl : ( RULE_INT ) ;
+    // InternalETPhys.g:5090:1: rule__DecimalExp__Group__1__Impl : ( RULE_INT ) ;
     public final void rule__DecimalExp__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5095:1: ( ( RULE_INT ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5096:1: ( RULE_INT )
+            // InternalETPhys.g:5094:1: ( ( RULE_INT ) )
+            // InternalETPhys.g:5095:1: ( RULE_INT )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5096:1: ( RULE_INT )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5097:1: RULE_INT
+            // InternalETPhys.g:5095:1: ( RULE_INT )
+            // InternalETPhys.g:5096:1: RULE_INT
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_1()); 
-            }
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__DecimalExp__Group__1__Impl10209); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_1()); 
-            }
+             before(grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_1()); 
+            match(input,RULE_INT,FOLLOW_2); 
+             after(grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_1()); 
 
             }
 
@@ -14600,25 +13678,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__2"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5108:1: rule__DecimalExp__Group__2 : rule__DecimalExp__Group__2__Impl rule__DecimalExp__Group__3 ;
+    // InternalETPhys.g:5107:1: rule__DecimalExp__Group__2 : rule__DecimalExp__Group__2__Impl rule__DecimalExp__Group__3 ;
     public final void rule__DecimalExp__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5112:1: ( rule__DecimalExp__Group__2__Impl rule__DecimalExp__Group__3 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5113:2: rule__DecimalExp__Group__2__Impl rule__DecimalExp__Group__3
+            // InternalETPhys.g:5111:1: ( rule__DecimalExp__Group__2__Impl rule__DecimalExp__Group__3 )
+            // InternalETPhys.g:5112:2: rule__DecimalExp__Group__2__Impl rule__DecimalExp__Group__3
             {
-            pushFollow(FOLLOW_rule__DecimalExp__Group__2__Impl_in_rule__DecimalExp__Group__210238);
+            pushFollow(FOLLOW_21);
             rule__DecimalExp__Group__2__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__DecimalExp__Group__3_in_rule__DecimalExp__Group__210241);
+
+            pushFollow(FOLLOW_2);
             rule__DecimalExp__Group__3();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -14638,25 +13716,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__2__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5120:1: rule__DecimalExp__Group__2__Impl : ( '.' ) ;
+    // InternalETPhys.g:5119:1: rule__DecimalExp__Group__2__Impl : ( '.' ) ;
     public final void rule__DecimalExp__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5124:1: ( ( '.' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5125:1: ( '.' )
+            // InternalETPhys.g:5123:1: ( ( '.' ) )
+            // InternalETPhys.g:5124:1: ( '.' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5125:1: ( '.' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5126:1: '.'
+            // InternalETPhys.g:5124:1: ( '.' )
+            // InternalETPhys.g:5125:1: '.'
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getDecimalExpAccess().getFullStopKeyword_2()); 
-            }
-            match(input,58,FOLLOW_58_in_rule__DecimalExp__Group__2__Impl10269); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getDecimalExpAccess().getFullStopKeyword_2()); 
-            }
+             before(grammarAccess.getDecimalExpAccess().getFullStopKeyword_2()); 
+            match(input,58,FOLLOW_2); 
+             after(grammarAccess.getDecimalExpAccess().getFullStopKeyword_2()); 
 
             }
 
@@ -14679,25 +13753,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__3"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5139:1: rule__DecimalExp__Group__3 : rule__DecimalExp__Group__3__Impl rule__DecimalExp__Group__4 ;
+    // InternalETPhys.g:5138:1: rule__DecimalExp__Group__3 : rule__DecimalExp__Group__3__Impl rule__DecimalExp__Group__4 ;
     public final void rule__DecimalExp__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5143:1: ( rule__DecimalExp__Group__3__Impl rule__DecimalExp__Group__4 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5144:2: rule__DecimalExp__Group__3__Impl rule__DecimalExp__Group__4
+            // InternalETPhys.g:5142:1: ( rule__DecimalExp__Group__3__Impl rule__DecimalExp__Group__4 )
+            // InternalETPhys.g:5143:2: rule__DecimalExp__Group__3__Impl rule__DecimalExp__Group__4
             {
-            pushFollow(FOLLOW_rule__DecimalExp__Group__3__Impl_in_rule__DecimalExp__Group__310300);
+            pushFollow(FOLLOW_42);
             rule__DecimalExp__Group__3__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__DecimalExp__Group__4_in_rule__DecimalExp__Group__310303);
+
+            pushFollow(FOLLOW_2);
             rule__DecimalExp__Group__4();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -14717,25 +13791,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__3__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5151:1: rule__DecimalExp__Group__3__Impl : ( RULE_INT ) ;
+    // InternalETPhys.g:5150:1: rule__DecimalExp__Group__3__Impl : ( RULE_INT ) ;
     public final void rule__DecimalExp__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5155:1: ( ( RULE_INT ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5156:1: ( RULE_INT )
+            // InternalETPhys.g:5154:1: ( ( RULE_INT ) )
+            // InternalETPhys.g:5155:1: ( RULE_INT )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5156:1: ( RULE_INT )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5157:1: RULE_INT
+            // InternalETPhys.g:5155:1: ( RULE_INT )
+            // InternalETPhys.g:5156:1: RULE_INT
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_3()); 
-            }
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__DecimalExp__Group__3__Impl10330); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_3()); 
-            }
+             before(grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_3()); 
+            match(input,RULE_INT,FOLLOW_2); 
+             after(grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_3()); 
 
             }
 
@@ -14758,25 +13828,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__4"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5168:1: rule__DecimalExp__Group__4 : rule__DecimalExp__Group__4__Impl rule__DecimalExp__Group__5 ;
+    // InternalETPhys.g:5167:1: rule__DecimalExp__Group__4 : rule__DecimalExp__Group__4__Impl rule__DecimalExp__Group__5 ;
     public final void rule__DecimalExp__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5172:1: ( rule__DecimalExp__Group__4__Impl rule__DecimalExp__Group__5 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5173:2: rule__DecimalExp__Group__4__Impl rule__DecimalExp__Group__5
+            // InternalETPhys.g:5171:1: ( rule__DecimalExp__Group__4__Impl rule__DecimalExp__Group__5 )
+            // InternalETPhys.g:5172:2: rule__DecimalExp__Group__4__Impl rule__DecimalExp__Group__5
             {
-            pushFollow(FOLLOW_rule__DecimalExp__Group__4__Impl_in_rule__DecimalExp__Group__410359);
+            pushFollow(FOLLOW_40);
             rule__DecimalExp__Group__4__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__DecimalExp__Group__5_in_rule__DecimalExp__Group__410362);
+
+            pushFollow(FOLLOW_2);
             rule__DecimalExp__Group__5();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -14796,36 +13866,32 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__4__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5180:1: rule__DecimalExp__Group__4__Impl : ( ( rule__DecimalExp__Alternatives_4 ) ) ;
+    // InternalETPhys.g:5179:1: rule__DecimalExp__Group__4__Impl : ( ( rule__DecimalExp__Alternatives_4 ) ) ;
     public final void rule__DecimalExp__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5184:1: ( ( ( rule__DecimalExp__Alternatives_4 ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5185:1: ( ( rule__DecimalExp__Alternatives_4 ) )
+            // InternalETPhys.g:5183:1: ( ( ( rule__DecimalExp__Alternatives_4 ) ) )
+            // InternalETPhys.g:5184:1: ( ( rule__DecimalExp__Alternatives_4 ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5185:1: ( ( rule__DecimalExp__Alternatives_4 ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5186:1: ( rule__DecimalExp__Alternatives_4 )
+            // InternalETPhys.g:5184:1: ( ( rule__DecimalExp__Alternatives_4 ) )
+            // InternalETPhys.g:5185:1: ( rule__DecimalExp__Alternatives_4 )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getDecimalExpAccess().getAlternatives_4()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5187:1: ( rule__DecimalExp__Alternatives_4 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5187:2: rule__DecimalExp__Alternatives_4
+             before(grammarAccess.getDecimalExpAccess().getAlternatives_4()); 
+            // InternalETPhys.g:5186:1: ( rule__DecimalExp__Alternatives_4 )
+            // InternalETPhys.g:5186:2: rule__DecimalExp__Alternatives_4
             {
-            pushFollow(FOLLOW_rule__DecimalExp__Alternatives_4_in_rule__DecimalExp__Group__4__Impl10389);
+            pushFollow(FOLLOW_2);
             rule__DecimalExp__Alternatives_4();
 
             state._fsp--;
-            if (state.failed) return ;
 
-            }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getDecimalExpAccess().getAlternatives_4()); 
             }
 
+             after(grammarAccess.getDecimalExpAccess().getAlternatives_4()); 
+
             }
 
 
@@ -14847,25 +13913,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__5"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5197:1: rule__DecimalExp__Group__5 : rule__DecimalExp__Group__5__Impl rule__DecimalExp__Group__6 ;
+    // InternalETPhys.g:5196:1: rule__DecimalExp__Group__5 : rule__DecimalExp__Group__5__Impl rule__DecimalExp__Group__6 ;
     public final void rule__DecimalExp__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5201:1: ( rule__DecimalExp__Group__5__Impl rule__DecimalExp__Group__6 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5202:2: rule__DecimalExp__Group__5__Impl rule__DecimalExp__Group__6
+            // InternalETPhys.g:5200:1: ( rule__DecimalExp__Group__5__Impl rule__DecimalExp__Group__6 )
+            // InternalETPhys.g:5201:2: rule__DecimalExp__Group__5__Impl rule__DecimalExp__Group__6
             {
-            pushFollow(FOLLOW_rule__DecimalExp__Group__5__Impl_in_rule__DecimalExp__Group__510419);
+            pushFollow(FOLLOW_40);
             rule__DecimalExp__Group__5__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__DecimalExp__Group__6_in_rule__DecimalExp__Group__510422);
+
+            pushFollow(FOLLOW_2);
             rule__DecimalExp__Group__6();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -14885,22 +13951,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__5__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5209:1: rule__DecimalExp__Group__5__Impl : ( ( rule__DecimalExp__Alternatives_5 )? ) ;
+    // InternalETPhys.g:5208:1: rule__DecimalExp__Group__5__Impl : ( ( rule__DecimalExp__Alternatives_5 )? ) ;
     public final void rule__DecimalExp__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5213:1: ( ( ( rule__DecimalExp__Alternatives_5 )? ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5214:1: ( ( rule__DecimalExp__Alternatives_5 )? )
+            // InternalETPhys.g:5212:1: ( ( ( rule__DecimalExp__Alternatives_5 )? ) )
+            // InternalETPhys.g:5213:1: ( ( rule__DecimalExp__Alternatives_5 )? )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5214:1: ( ( rule__DecimalExp__Alternatives_5 )? )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5215:1: ( rule__DecimalExp__Alternatives_5 )?
+            // InternalETPhys.g:5213:1: ( ( rule__DecimalExp__Alternatives_5 )? )
+            // InternalETPhys.g:5214:1: ( rule__DecimalExp__Alternatives_5 )?
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getDecimalExpAccess().getAlternatives_5()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5216:1: ( rule__DecimalExp__Alternatives_5 )?
+             before(grammarAccess.getDecimalExpAccess().getAlternatives_5()); 
+            // InternalETPhys.g:5215:1: ( rule__DecimalExp__Alternatives_5 )?
             int alt35=2;
             int LA35_0 = input.LA(1);
 
@@ -14909,22 +13973,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
             }
             switch (alt35) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5216:2: rule__DecimalExp__Alternatives_5
+                    // InternalETPhys.g:5215:2: rule__DecimalExp__Alternatives_5
                     {
-                    pushFollow(FOLLOW_rule__DecimalExp__Alternatives_5_in_rule__DecimalExp__Group__5__Impl10449);
+                    pushFollow(FOLLOW_2);
                     rule__DecimalExp__Alternatives_5();
 
                     state._fsp--;
-                    if (state.failed) return ;
+
 
                     }
                     break;
 
             }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getDecimalExpAccess().getAlternatives_5()); 
-            }
+             after(grammarAccess.getDecimalExpAccess().getAlternatives_5()); 
 
             }
 
@@ -14947,20 +14009,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__6"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5226:1: rule__DecimalExp__Group__6 : rule__DecimalExp__Group__6__Impl ;
+    // InternalETPhys.g:5225:1: rule__DecimalExp__Group__6 : rule__DecimalExp__Group__6__Impl ;
     public final void rule__DecimalExp__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5230:1: ( rule__DecimalExp__Group__6__Impl )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5231:2: rule__DecimalExp__Group__6__Impl
+            // InternalETPhys.g:5229:1: ( rule__DecimalExp__Group__6__Impl )
+            // InternalETPhys.g:5230:2: rule__DecimalExp__Group__6__Impl
             {
-            pushFollow(FOLLOW_rule__DecimalExp__Group__6__Impl_in_rule__DecimalExp__Group__610480);
+            pushFollow(FOLLOW_2);
             rule__DecimalExp__Group__6__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -14980,31 +14042,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__6__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5237:1: rule__DecimalExp__Group__6__Impl : ( ( RULE_INT ) ) ;
+    // InternalETPhys.g:5236:1: rule__DecimalExp__Group__6__Impl : ( RULE_INT ) ;
     public final void rule__DecimalExp__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5241:1: ( ( ( RULE_INT ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5242:1: ( ( RULE_INT ) )
+            // InternalETPhys.g:5240:1: ( ( RULE_INT ) )
+            // InternalETPhys.g:5241:1: ( RULE_INT )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5242:1: ( ( RULE_INT ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5243:1: ( RULE_INT )
+            // InternalETPhys.g:5241:1: ( RULE_INT )
+            // InternalETPhys.g:5242:1: RULE_INT
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_6()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5244:1: ( RULE_INT )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5244:3: RULE_INT
-            {
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__DecimalExp__Group__6__Impl10508); if (state.failed) return ;
-
-            }
-
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_6()); 
-            }
+             before(grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_6()); 
+            match(input,RULE_INT,FOLLOW_2); 
+             after(grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_6()); 
 
             }
 
@@ -15027,25 +14079,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FQN__Group__0"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5268:1: rule__FQN__Group__0 : rule__FQN__Group__0__Impl rule__FQN__Group__1 ;
+    // InternalETPhys.g:5267:1: rule__FQN__Group__0 : rule__FQN__Group__0__Impl rule__FQN__Group__1 ;
     public final void rule__FQN__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5272:1: ( rule__FQN__Group__0__Impl rule__FQN__Group__1 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5273:2: rule__FQN__Group__0__Impl rule__FQN__Group__1
+            // InternalETPhys.g:5271:1: ( rule__FQN__Group__0__Impl rule__FQN__Group__1 )
+            // InternalETPhys.g:5272:2: rule__FQN__Group__0__Impl rule__FQN__Group__1
             {
-            pushFollow(FOLLOW_rule__FQN__Group__0__Impl_in_rule__FQN__Group__010552);
+            pushFollow(FOLLOW_41);
             rule__FQN__Group__0__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__FQN__Group__1_in_rule__FQN__Group__010555);
+
+            pushFollow(FOLLOW_2);
             rule__FQN__Group__1();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -15065,25 +14117,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FQN__Group__0__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5280:1: rule__FQN__Group__0__Impl : ( RULE_ID ) ;
+    // InternalETPhys.g:5279:1: rule__FQN__Group__0__Impl : ( RULE_ID ) ;
     public final void rule__FQN__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5284:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5285:1: ( RULE_ID )
+            // InternalETPhys.g:5283:1: ( ( RULE_ID ) )
+            // InternalETPhys.g:5284:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5285:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5286:1: RULE_ID
+            // InternalETPhys.g:5284:1: ( RULE_ID )
+            // InternalETPhys.g:5285:1: RULE_ID
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getFQNAccess().getIDTerminalRuleCall_0()); 
-            }
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__FQN__Group__0__Impl10582); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getFQNAccess().getIDTerminalRuleCall_0()); 
-            }
+             before(grammarAccess.getFQNAccess().getIDTerminalRuleCall_0()); 
+            match(input,RULE_ID,FOLLOW_2); 
+             after(grammarAccess.getFQNAccess().getIDTerminalRuleCall_0()); 
 
             }
 
@@ -15106,20 +14154,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FQN__Group__1"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5297:1: rule__FQN__Group__1 : rule__FQN__Group__1__Impl ;
+    // InternalETPhys.g:5296:1: rule__FQN__Group__1 : rule__FQN__Group__1__Impl ;
     public final void rule__FQN__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5301:1: ( rule__FQN__Group__1__Impl )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5302:2: rule__FQN__Group__1__Impl
+            // InternalETPhys.g:5300:1: ( rule__FQN__Group__1__Impl )
+            // InternalETPhys.g:5301:2: rule__FQN__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__FQN__Group__1__Impl_in_rule__FQN__Group__110611);
+            pushFollow(FOLLOW_2);
             rule__FQN__Group__1__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -15139,22 +14187,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FQN__Group__1__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5308:1: rule__FQN__Group__1__Impl : ( ( rule__FQN__Group_1__0 )* ) ;
+    // InternalETPhys.g:5307:1: rule__FQN__Group__1__Impl : ( ( rule__FQN__Group_1__0 )* ) ;
     public final void rule__FQN__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5312:1: ( ( ( rule__FQN__Group_1__0 )* ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5313:1: ( ( rule__FQN__Group_1__0 )* )
+            // InternalETPhys.g:5311:1: ( ( ( rule__FQN__Group_1__0 )* ) )
+            // InternalETPhys.g:5312:1: ( ( rule__FQN__Group_1__0 )* )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5313:1: ( ( rule__FQN__Group_1__0 )* )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5314:1: ( rule__FQN__Group_1__0 )*
+            // InternalETPhys.g:5312:1: ( ( rule__FQN__Group_1__0 )* )
+            // InternalETPhys.g:5313:1: ( rule__FQN__Group_1__0 )*
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getFQNAccess().getGroup_1()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5315:1: ( rule__FQN__Group_1__0 )*
+             before(grammarAccess.getFQNAccess().getGroup_1()); 
+            // InternalETPhys.g:5314:1: ( rule__FQN__Group_1__0 )*
             loop36:
             do {
                 int alt36=2;
@@ -15167,13 +14213,13 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
                 switch (alt36) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5315:2: rule__FQN__Group_1__0
+            	    // InternalETPhys.g:5314:2: rule__FQN__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__FQN__Group_1__0_in_rule__FQN__Group__1__Impl10638);
+            	    pushFollow(FOLLOW_43);
             	    rule__FQN__Group_1__0();
 
             	    state._fsp--;
-            	    if (state.failed) return ;
+
 
             	    }
             	    break;
@@ -15183,9 +14229,7 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                 }
             } while (true);
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getFQNAccess().getGroup_1()); 
-            }
+             after(grammarAccess.getFQNAccess().getGroup_1()); 
 
             }
 
@@ -15208,25 +14252,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FQN__Group_1__0"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5329:1: rule__FQN__Group_1__0 : rule__FQN__Group_1__0__Impl rule__FQN__Group_1__1 ;
+    // InternalETPhys.g:5328:1: rule__FQN__Group_1__0 : rule__FQN__Group_1__0__Impl rule__FQN__Group_1__1 ;
     public final void rule__FQN__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5333:1: ( rule__FQN__Group_1__0__Impl rule__FQN__Group_1__1 )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5334:2: rule__FQN__Group_1__0__Impl rule__FQN__Group_1__1
+            // InternalETPhys.g:5332:1: ( rule__FQN__Group_1__0__Impl rule__FQN__Group_1__1 )
+            // InternalETPhys.g:5333:2: rule__FQN__Group_1__0__Impl rule__FQN__Group_1__1
             {
-            pushFollow(FOLLOW_rule__FQN__Group_1__0__Impl_in_rule__FQN__Group_1__010673);
+            pushFollow(FOLLOW_3);
             rule__FQN__Group_1__0__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__FQN__Group_1__1_in_rule__FQN__Group_1__010676);
+
+            pushFollow(FOLLOW_2);
             rule__FQN__Group_1__1();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -15246,25 +14290,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FQN__Group_1__0__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5341:1: rule__FQN__Group_1__0__Impl : ( '.' ) ;
+    // InternalETPhys.g:5340:1: rule__FQN__Group_1__0__Impl : ( '.' ) ;
     public final void rule__FQN__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5345:1: ( ( '.' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5346:1: ( '.' )
+            // InternalETPhys.g:5344:1: ( ( '.' ) )
+            // InternalETPhys.g:5345:1: ( '.' )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5346:1: ( '.' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5347:1: '.'
+            // InternalETPhys.g:5345:1: ( '.' )
+            // InternalETPhys.g:5346:1: '.'
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getFQNAccess().getFullStopKeyword_1_0()); 
-            }
-            match(input,58,FOLLOW_58_in_rule__FQN__Group_1__0__Impl10704); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getFQNAccess().getFullStopKeyword_1_0()); 
-            }
+             before(grammarAccess.getFQNAccess().getFullStopKeyword_1_0()); 
+            match(input,58,FOLLOW_2); 
+             after(grammarAccess.getFQNAccess().getFullStopKeyword_1_0()); 
 
             }
 
@@ -15287,20 +14327,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FQN__Group_1__1"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5360:1: rule__FQN__Group_1__1 : rule__FQN__Group_1__1__Impl ;
+    // InternalETPhys.g:5359:1: rule__FQN__Group_1__1 : rule__FQN__Group_1__1__Impl ;
     public final void rule__FQN__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5364:1: ( rule__FQN__Group_1__1__Impl )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5365:2: rule__FQN__Group_1__1__Impl
+            // InternalETPhys.g:5363:1: ( rule__FQN__Group_1__1__Impl )
+            // InternalETPhys.g:5364:2: rule__FQN__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__FQN__Group_1__1__Impl_in_rule__FQN__Group_1__110735);
+            pushFollow(FOLLOW_2);
             rule__FQN__Group_1__1__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -15320,25 +14360,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FQN__Group_1__1__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5371:1: rule__FQN__Group_1__1__Impl : ( RULE_ID ) ;
+    // InternalETPhys.g:5370:1: rule__FQN__Group_1__1__Impl : ( RULE_ID ) ;
     public final void rule__FQN__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5375:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5376:1: ( RULE_ID )
+            // InternalETPhys.g:5374:1: ( ( RULE_ID ) )
+            // InternalETPhys.g:5375:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5376:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5377:1: RULE_ID
+            // InternalETPhys.g:5375:1: ( RULE_ID )
+            // InternalETPhys.g:5376:1: RULE_ID
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getFQNAccess().getIDTerminalRuleCall_1_1()); 
-            }
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__FQN__Group_1__1__Impl10762); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getFQNAccess().getIDTerminalRuleCall_1_1()); 
-            }
+             before(grammarAccess.getFQNAccess().getIDTerminalRuleCall_1_1()); 
+            match(input,RULE_ID,FOLLOW_2); 
+             after(grammarAccess.getFQNAccess().getIDTerminalRuleCall_1_1()); 
 
             }
 
@@ -15361,23 +14397,22 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeClass__UnorderedGroup_4"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5393:1: rule__NodeClass__UnorderedGroup_4 : rule__NodeClass__UnorderedGroup_4__0 {...}?;
+    // InternalETPhys.g:5392:1: rule__NodeClass__UnorderedGroup_4 : rule__NodeClass__UnorderedGroup_4__0 {...}?;
     public final void rule__NodeClass__UnorderedGroup_4() throws RecognitionException {
 
             	int stackSize = keepStackSize();
         		getUnorderedGroupHelper().enter(grammarAccess.getNodeClassAccess().getUnorderedGroup_4());
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5398:1: ( rule__NodeClass__UnorderedGroup_4__0 {...}?)
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5399:2: rule__NodeClass__UnorderedGroup_4__0 {...}?
+            // InternalETPhys.g:5397:1: ( rule__NodeClass__UnorderedGroup_4__0 {...}?)
+            // InternalETPhys.g:5398:2: rule__NodeClass__UnorderedGroup_4__0 {...}?
             {
-            pushFollow(FOLLOW_rule__NodeClass__UnorderedGroup_4__0_in_rule__NodeClass__UnorderedGroup_410796);
+            pushFollow(FOLLOW_2);
             rule__NodeClass__UnorderedGroup_4__0();
 
             state._fsp--;
-            if (state.failed) return ;
+
             if ( ! getUnorderedGroupHelper().canLeave(grammarAccess.getNodeClassAccess().getUnorderedGroup_4()) ) {
-                if (state.backtracking>0) {state.failed=true; return ;}
                 throw new FailedPredicateException(input, "rule__NodeClass__UnorderedGroup_4", "getUnorderedGroupHelper().canLeave(grammarAccess.getNodeClassAccess().getUnorderedGroup_4())");
             }
 
@@ -15400,31 +14435,30 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeClass__UnorderedGroup_4__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5410:1: rule__NodeClass__UnorderedGroup_4__Impl : ( ({...}? => ( ( ( rule__NodeClass__Group_4_0__0 ) ) ) ) | ({...}? => ( ( ( rule__NodeClass__Group_4_1__0 ) ) ) ) | ({...}? => ( ( ( rule__NodeClass__Group_4_2__0 ) ) ) ) ) ;
+    // InternalETPhys.g:5409:1: rule__NodeClass__UnorderedGroup_4__Impl : ( ({...}? => ( ( ( rule__NodeClass__Group_4_0__0 ) ) ) ) | ({...}? => ( ( ( rule__NodeClass__Group_4_1__0 ) ) ) ) | ({...}? => ( ( ( rule__NodeClass__Group_4_2__0 ) ) ) ) ) ;
     public final void rule__NodeClass__UnorderedGroup_4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         		boolean selected = false;
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5415:1: ( ( ({...}? => ( ( ( rule__NodeClass__Group_4_0__0 ) ) ) ) | ({...}? => ( ( ( rule__NodeClass__Group_4_1__0 ) ) ) ) | ({...}? => ( ( ( rule__NodeClass__Group_4_2__0 ) ) ) ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5416:3: ( ({...}? => ( ( ( rule__NodeClass__Group_4_0__0 ) ) ) ) | ({...}? => ( ( ( rule__NodeClass__Group_4_1__0 ) ) ) ) | ({...}? => ( ( ( rule__NodeClass__Group_4_2__0 ) ) ) ) )
+            // InternalETPhys.g:5414:1: ( ( ({...}? => ( ( ( rule__NodeClass__Group_4_0__0 ) ) ) ) | ({...}? => ( ( ( rule__NodeClass__Group_4_1__0 ) ) ) ) | ({...}? => ( ( ( rule__NodeClass__Group_4_2__0 ) ) ) ) ) )
+            // InternalETPhys.g:5415:3: ( ({...}? => ( ( ( rule__NodeClass__Group_4_0__0 ) ) ) ) | ({...}? => ( ( ( rule__NodeClass__Group_4_1__0 ) ) ) ) | ({...}? => ( ( ( rule__NodeClass__Group_4_2__0 ) ) ) ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5416:3: ( ({...}? => ( ( ( rule__NodeClass__Group_4_0__0 ) ) ) ) | ({...}? => ( ( ( rule__NodeClass__Group_4_1__0 ) ) ) ) | ({...}? => ( ( ( rule__NodeClass__Group_4_2__0 ) ) ) ) )
+            // InternalETPhys.g:5415:3: ( ({...}? => ( ( ( rule__NodeClass__Group_4_0__0 ) ) ) ) | ({...}? => ( ( ( rule__NodeClass__Group_4_1__0 ) ) ) ) | ({...}? => ( ( ( rule__NodeClass__Group_4_2__0 ) ) ) ) )
             int alt37=3;
             int LA37_0 = input.LA(1);
 
-            if ( LA37_0 ==36 && getUnorderedGroupHelper().canSelect(grammarAccess.getNodeClassAccess().getUnorderedGroup_4(), 0) ) {
+            if ( LA37_0 == 36 && getUnorderedGroupHelper().canSelect(grammarAccess.getNodeClassAccess().getUnorderedGroup_4(), 0) ) {
                 alt37=1;
             }
-            else if ( LA37_0 ==38 && getUnorderedGroupHelper().canSelect(grammarAccess.getNodeClassAccess().getUnorderedGroup_4(), 1) ) {
+            else if ( LA37_0 == 38 && getUnorderedGroupHelper().canSelect(grammarAccess.getNodeClassAccess().getUnorderedGroup_4(), 1) ) {
                 alt37=2;
             }
-            else if ( LA37_0 ==39 && getUnorderedGroupHelper().canSelect(grammarAccess.getNodeClassAccess().getUnorderedGroup_4(), 2) ) {
+            else if ( LA37_0 == 39 && getUnorderedGroupHelper().canSelect(grammarAccess.getNodeClassAccess().getUnorderedGroup_4(), 2) ) {
                 alt37=3;
             }
             else {
-                if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
                     new NoViableAltException("", 37, 0, input);
 
@@ -15432,41 +14466,40 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
             }
             switch (alt37) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5418:4: ({...}? => ( ( ( rule__NodeClass__Group_4_0__0 ) ) ) )
+                    // InternalETPhys.g:5417:4: ({...}? => ( ( ( rule__NodeClass__Group_4_0__0 ) ) ) )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5418:4: ({...}? => ( ( ( rule__NodeClass__Group_4_0__0 ) ) ) )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5419:5: {...}? => ( ( ( rule__NodeClass__Group_4_0__0 ) ) )
+                    // InternalETPhys.g:5417:4: ({...}? => ( ( ( rule__NodeClass__Group_4_0__0 ) ) ) )
+                    // InternalETPhys.g:5418:5: {...}? => ( ( ( rule__NodeClass__Group_4_0__0 ) ) )
                     {
                     if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getNodeClassAccess().getUnorderedGroup_4(), 0) ) {
-                        if (state.backtracking>0) {state.failed=true; return ;}
                         throw new FailedPredicateException(input, "rule__NodeClass__UnorderedGroup_4__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getNodeClassAccess().getUnorderedGroup_4(), 0)");
                     }
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5419:106: ( ( ( rule__NodeClass__Group_4_0__0 ) ) )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5420:6: ( ( rule__NodeClass__Group_4_0__0 ) )
+                    // InternalETPhys.g:5418:106: ( ( ( rule__NodeClass__Group_4_0__0 ) ) )
+                    // InternalETPhys.g:5419:6: ( ( rule__NodeClass__Group_4_0__0 ) )
                     {
-                    getUnorderedGroupHelper().select(grammarAccess.getNodeClassAccess().getUnorderedGroup_4(), 0);
-                    selected = true;
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5426:6: ( ( rule__NodeClass__Group_4_0__0 ) )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5428:7: ( rule__NodeClass__Group_4_0__0 )
+                     
+                    	 				  getUnorderedGroupHelper().select(grammarAccess.getNodeClassAccess().getUnorderedGroup_4(), 0);
+                    	 				
+
+                    	 				  selected = true;
+                    	 				
+                    // InternalETPhys.g:5425:6: ( ( rule__NodeClass__Group_4_0__0 ) )
+                    // InternalETPhys.g:5427:7: ( rule__NodeClass__Group_4_0__0 )
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getNodeClassAccess().getGroup_4_0()); 
-                    }
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5429:7: ( rule__NodeClass__Group_4_0__0 )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5429:8: rule__NodeClass__Group_4_0__0
+                     before(grammarAccess.getNodeClassAccess().getGroup_4_0()); 
+                    // InternalETPhys.g:5428:7: ( rule__NodeClass__Group_4_0__0 )
+                    // InternalETPhys.g:5428:8: rule__NodeClass__Group_4_0__0
                     {
-                    pushFollow(FOLLOW_rule__NodeClass__Group_4_0__0_in_rule__NodeClass__UnorderedGroup_4__Impl10885);
+                    pushFollow(FOLLOW_2);
                     rule__NodeClass__Group_4_0__0();
 
                     state._fsp--;
-                    if (state.failed) return ;
 
-                    }
 
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getNodeClassAccess().getGroup_4_0()); 
                     }
 
+                     after(grammarAccess.getNodeClassAccess().getGroup_4_0()); 
+
                     }
 
 
@@ -15479,41 +14512,40 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5435:4: ({...}? => ( ( ( rule__NodeClass__Group_4_1__0 ) ) ) )
+                    // InternalETPhys.g:5434:4: ({...}? => ( ( ( rule__NodeClass__Group_4_1__0 ) ) ) )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5435:4: ({...}? => ( ( ( rule__NodeClass__Group_4_1__0 ) ) ) )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5436:5: {...}? => ( ( ( rule__NodeClass__Group_4_1__0 ) ) )
+                    // InternalETPhys.g:5434:4: ({...}? => ( ( ( rule__NodeClass__Group_4_1__0 ) ) ) )
+                    // InternalETPhys.g:5435:5: {...}? => ( ( ( rule__NodeClass__Group_4_1__0 ) ) )
                     {
                     if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getNodeClassAccess().getUnorderedGroup_4(), 1) ) {
-                        if (state.backtracking>0) {state.failed=true; return ;}
                         throw new FailedPredicateException(input, "rule__NodeClass__UnorderedGroup_4__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getNodeClassAccess().getUnorderedGroup_4(), 1)");
                     }
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5436:106: ( ( ( rule__NodeClass__Group_4_1__0 ) ) )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5437:6: ( ( rule__NodeClass__Group_4_1__0 ) )
+                    // InternalETPhys.g:5435:106: ( ( ( rule__NodeClass__Group_4_1__0 ) ) )
+                    // InternalETPhys.g:5436:6: ( ( rule__NodeClass__Group_4_1__0 ) )
                     {
-                    getUnorderedGroupHelper().select(grammarAccess.getNodeClassAccess().getUnorderedGroup_4(), 1);
-                    selected = true;
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5443:6: ( ( rule__NodeClass__Group_4_1__0 ) )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5445:7: ( rule__NodeClass__Group_4_1__0 )
+                     
+                    	 				  getUnorderedGroupHelper().select(grammarAccess.getNodeClassAccess().getUnorderedGroup_4(), 1);
+                    	 				
+
+                    	 				  selected = true;
+                    	 				
+                    // InternalETPhys.g:5442:6: ( ( rule__NodeClass__Group_4_1__0 ) )
+                    // InternalETPhys.g:5444:7: ( rule__NodeClass__Group_4_1__0 )
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getNodeClassAccess().getGroup_4_1()); 
-                    }
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5446:7: ( rule__NodeClass__Group_4_1__0 )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5446:8: rule__NodeClass__Group_4_1__0
+                     before(grammarAccess.getNodeClassAccess().getGroup_4_1()); 
+                    // InternalETPhys.g:5445:7: ( rule__NodeClass__Group_4_1__0 )
+                    // InternalETPhys.g:5445:8: rule__NodeClass__Group_4_1__0
                     {
-                    pushFollow(FOLLOW_rule__NodeClass__Group_4_1__0_in_rule__NodeClass__UnorderedGroup_4__Impl10976);
+                    pushFollow(FOLLOW_2);
                     rule__NodeClass__Group_4_1__0();
 
                     state._fsp--;
-                    if (state.failed) return ;
 
-                    }
 
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getNodeClassAccess().getGroup_4_1()); 
                     }
 
+                     after(grammarAccess.getNodeClassAccess().getGroup_4_1()); 
+
                     }
 
 
@@ -15526,41 +14558,40 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5452:4: ({...}? => ( ( ( rule__NodeClass__Group_4_2__0 ) ) ) )
+                    // InternalETPhys.g:5451:4: ({...}? => ( ( ( rule__NodeClass__Group_4_2__0 ) ) ) )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5452:4: ({...}? => ( ( ( rule__NodeClass__Group_4_2__0 ) ) ) )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5453:5: {...}? => ( ( ( rule__NodeClass__Group_4_2__0 ) ) )
+                    // InternalETPhys.g:5451:4: ({...}? => ( ( ( rule__NodeClass__Group_4_2__0 ) ) ) )
+                    // InternalETPhys.g:5452:5: {...}? => ( ( ( rule__NodeClass__Group_4_2__0 ) ) )
                     {
                     if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getNodeClassAccess().getUnorderedGroup_4(), 2) ) {
-                        if (state.backtracking>0) {state.failed=true; return ;}
                         throw new FailedPredicateException(input, "rule__NodeClass__UnorderedGroup_4__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getNodeClassAccess().getUnorderedGroup_4(), 2)");
                     }
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5453:106: ( ( ( rule__NodeClass__Group_4_2__0 ) ) )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5454:6: ( ( rule__NodeClass__Group_4_2__0 ) )
+                    // InternalETPhys.g:5452:106: ( ( ( rule__NodeClass__Group_4_2__0 ) ) )
+                    // InternalETPhys.g:5453:6: ( ( rule__NodeClass__Group_4_2__0 ) )
                     {
-                    getUnorderedGroupHelper().select(grammarAccess.getNodeClassAccess().getUnorderedGroup_4(), 2);
-                    selected = true;
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5460:6: ( ( rule__NodeClass__Group_4_2__0 ) )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5462:7: ( rule__NodeClass__Group_4_2__0 )
+                     
+                    	 				  getUnorderedGroupHelper().select(grammarAccess.getNodeClassAccess().getUnorderedGroup_4(), 2);
+                    	 				
+
+                    	 				  selected = true;
+                    	 				
+                    // InternalETPhys.g:5459:6: ( ( rule__NodeClass__Group_4_2__0 ) )
+                    // InternalETPhys.g:5461:7: ( rule__NodeClass__Group_4_2__0 )
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getNodeClassAccess().getGroup_4_2()); 
-                    }
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5463:7: ( rule__NodeClass__Group_4_2__0 )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5463:8: rule__NodeClass__Group_4_2__0
+                     before(grammarAccess.getNodeClassAccess().getGroup_4_2()); 
+                    // InternalETPhys.g:5462:7: ( rule__NodeClass__Group_4_2__0 )
+                    // InternalETPhys.g:5462:8: rule__NodeClass__Group_4_2__0
                     {
-                    pushFollow(FOLLOW_rule__NodeClass__Group_4_2__0_in_rule__NodeClass__UnorderedGroup_4__Impl11067);
+                    pushFollow(FOLLOW_2);
                     rule__NodeClass__Group_4_2__0();
 
                     state._fsp--;
-                    if (state.failed) return ;
 
-                    }
 
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getNodeClassAccess().getGroup_4_2()); 
                     }
 
+                     after(grammarAccess.getNodeClassAccess().getGroup_4_2()); 
+
                     }
 
 
@@ -15596,42 +14627,42 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeClass__UnorderedGroup_4__0"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5478:1: rule__NodeClass__UnorderedGroup_4__0 : rule__NodeClass__UnorderedGroup_4__Impl ( rule__NodeClass__UnorderedGroup_4__1 )? ;
+    // InternalETPhys.g:5477:1: rule__NodeClass__UnorderedGroup_4__0 : rule__NodeClass__UnorderedGroup_4__Impl ( rule__NodeClass__UnorderedGroup_4__1 )? ;
     public final void rule__NodeClass__UnorderedGroup_4__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5482:1: ( rule__NodeClass__UnorderedGroup_4__Impl ( rule__NodeClass__UnorderedGroup_4__1 )? )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5483:2: rule__NodeClass__UnorderedGroup_4__Impl ( rule__NodeClass__UnorderedGroup_4__1 )?
+            // InternalETPhys.g:5481:1: ( rule__NodeClass__UnorderedGroup_4__Impl ( rule__NodeClass__UnorderedGroup_4__1 )? )
+            // InternalETPhys.g:5482:2: rule__NodeClass__UnorderedGroup_4__Impl ( rule__NodeClass__UnorderedGroup_4__1 )?
             {
-            pushFollow(FOLLOW_rule__NodeClass__UnorderedGroup_4__Impl_in_rule__NodeClass__UnorderedGroup_4__011126);
+            pushFollow(FOLLOW_44);
             rule__NodeClass__UnorderedGroup_4__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5484:2: ( rule__NodeClass__UnorderedGroup_4__1 )?
+
+            // InternalETPhys.g:5483:2: ( rule__NodeClass__UnorderedGroup_4__1 )?
             int alt38=2;
             int LA38_0 = input.LA(1);
 
-            if ( LA38_0 ==36 && getUnorderedGroupHelper().canSelect(grammarAccess.getNodeClassAccess().getUnorderedGroup_4(), 0) ) {
+            if ( LA38_0 == 36 && getUnorderedGroupHelper().canSelect(grammarAccess.getNodeClassAccess().getUnorderedGroup_4(), 0) ) {
                 alt38=1;
             }
-            else if ( LA38_0 ==38 && getUnorderedGroupHelper().canSelect(grammarAccess.getNodeClassAccess().getUnorderedGroup_4(), 1) ) {
+            else if ( LA38_0 == 38 && getUnorderedGroupHelper().canSelect(grammarAccess.getNodeClassAccess().getUnorderedGroup_4(), 1) ) {
                 alt38=1;
             }
-            else if ( LA38_0 ==39 && getUnorderedGroupHelper().canSelect(grammarAccess.getNodeClassAccess().getUnorderedGroup_4(), 2) ) {
+            else if ( LA38_0 == 39 && getUnorderedGroupHelper().canSelect(grammarAccess.getNodeClassAccess().getUnorderedGroup_4(), 2) ) {
                 alt38=1;
             }
             switch (alt38) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:0:0: rule__NodeClass__UnorderedGroup_4__1
+                    // InternalETPhys.g:5483:2: rule__NodeClass__UnorderedGroup_4__1
                     {
-                    pushFollow(FOLLOW_rule__NodeClass__UnorderedGroup_4__1_in_rule__NodeClass__UnorderedGroup_4__011129);
+                    pushFollow(FOLLOW_2);
                     rule__NodeClass__UnorderedGroup_4__1();
 
                     state._fsp--;
-                    if (state.failed) return ;
+
 
                     }
                     break;
@@ -15657,42 +14688,42 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeClass__UnorderedGroup_4__1"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5491:1: rule__NodeClass__UnorderedGroup_4__1 : rule__NodeClass__UnorderedGroup_4__Impl ( rule__NodeClass__UnorderedGroup_4__2 )? ;
+    // InternalETPhys.g:5490:1: rule__NodeClass__UnorderedGroup_4__1 : rule__NodeClass__UnorderedGroup_4__Impl ( rule__NodeClass__UnorderedGroup_4__2 )? ;
     public final void rule__NodeClass__UnorderedGroup_4__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5495:1: ( rule__NodeClass__UnorderedGroup_4__Impl ( rule__NodeClass__UnorderedGroup_4__2 )? )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5496:2: rule__NodeClass__UnorderedGroup_4__Impl ( rule__NodeClass__UnorderedGroup_4__2 )?
+            // InternalETPhys.g:5494:1: ( rule__NodeClass__UnorderedGroup_4__Impl ( rule__NodeClass__UnorderedGroup_4__2 )? )
+            // InternalETPhys.g:5495:2: rule__NodeClass__UnorderedGroup_4__Impl ( rule__NodeClass__UnorderedGroup_4__2 )?
             {
-            pushFollow(FOLLOW_rule__NodeClass__UnorderedGroup_4__Impl_in_rule__NodeClass__UnorderedGroup_4__111154);
+            pushFollow(FOLLOW_44);
             rule__NodeClass__UnorderedGroup_4__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5497:2: ( rule__NodeClass__UnorderedGroup_4__2 )?
+
+            // InternalETPhys.g:5496:2: ( rule__NodeClass__UnorderedGroup_4__2 )?
             int alt39=2;
             int LA39_0 = input.LA(1);
 
-            if ( LA39_0 ==36 && getUnorderedGroupHelper().canSelect(grammarAccess.getNodeClassAccess().getUnorderedGroup_4(), 0) ) {
+            if ( LA39_0 == 36 && getUnorderedGroupHelper().canSelect(grammarAccess.getNodeClassAccess().getUnorderedGroup_4(), 0) ) {
                 alt39=1;
             }
-            else if ( LA39_0 ==38 && getUnorderedGroupHelper().canSelect(grammarAccess.getNodeClassAccess().getUnorderedGroup_4(), 1) ) {
+            else if ( LA39_0 == 38 && getUnorderedGroupHelper().canSelect(grammarAccess.getNodeClassAccess().getUnorderedGroup_4(), 1) ) {
                 alt39=1;
             }
-            else if ( LA39_0 ==39 && getUnorderedGroupHelper().canSelect(grammarAccess.getNodeClassAccess().getUnorderedGroup_4(), 2) ) {
+            else if ( LA39_0 == 39 && getUnorderedGroupHelper().canSelect(grammarAccess.getNodeClassAccess().getUnorderedGroup_4(), 2) ) {
                 alt39=1;
             }
             switch (alt39) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:0:0: rule__NodeClass__UnorderedGroup_4__2
+                    // InternalETPhys.g:5496:2: rule__NodeClass__UnorderedGroup_4__2
                     {
-                    pushFollow(FOLLOW_rule__NodeClass__UnorderedGroup_4__2_in_rule__NodeClass__UnorderedGroup_4__111157);
+                    pushFollow(FOLLOW_2);
                     rule__NodeClass__UnorderedGroup_4__2();
 
                     state._fsp--;
-                    if (state.failed) return ;
+
 
                     }
                     break;
@@ -15718,20 +14749,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeClass__UnorderedGroup_4__2"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5504:1: rule__NodeClass__UnorderedGroup_4__2 : rule__NodeClass__UnorderedGroup_4__Impl ;
+    // InternalETPhys.g:5503:1: rule__NodeClass__UnorderedGroup_4__2 : rule__NodeClass__UnorderedGroup_4__Impl ;
     public final void rule__NodeClass__UnorderedGroup_4__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5508:1: ( rule__NodeClass__UnorderedGroup_4__Impl )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5509:2: rule__NodeClass__UnorderedGroup_4__Impl
+            // InternalETPhys.g:5507:1: ( rule__NodeClass__UnorderedGroup_4__Impl )
+            // InternalETPhys.g:5508:2: rule__NodeClass__UnorderedGroup_4__Impl
             {
-            pushFollow(FOLLOW_rule__NodeClass__UnorderedGroup_4__Impl_in_rule__NodeClass__UnorderedGroup_4__211182);
+            pushFollow(FOLLOW_2);
             rule__NodeClass__UnorderedGroup_4__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -15751,23 +14782,22 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__UnorderedGroup_3"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5522:1: rule__PhysicalThread__UnorderedGroup_3 : rule__PhysicalThread__UnorderedGroup_3__0 {...}?;
+    // InternalETPhys.g:5521:1: rule__PhysicalThread__UnorderedGroup_3 : rule__PhysicalThread__UnorderedGroup_3__0 {...}?;
     public final void rule__PhysicalThread__UnorderedGroup_3() throws RecognitionException {
 
             	int stackSize = keepStackSize();
         		getUnorderedGroupHelper().enter(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3());
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5527:1: ( rule__PhysicalThread__UnorderedGroup_3__0 {...}?)
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5528:2: rule__PhysicalThread__UnorderedGroup_3__0 {...}?
+            // InternalETPhys.g:5526:1: ( rule__PhysicalThread__UnorderedGroup_3__0 {...}?)
+            // InternalETPhys.g:5527:2: rule__PhysicalThread__UnorderedGroup_3__0 {...}?
             {
-            pushFollow(FOLLOW_rule__PhysicalThread__UnorderedGroup_3__0_in_rule__PhysicalThread__UnorderedGroup_311212);
+            pushFollow(FOLLOW_2);
             rule__PhysicalThread__UnorderedGroup_3__0();
 
             state._fsp--;
-            if (state.failed) return ;
+
             if ( ! getUnorderedGroupHelper().canLeave(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3()) ) {
-                if (state.backtracking>0) {state.failed=true; return ;}
                 throw new FailedPredicateException(input, "rule__PhysicalThread__UnorderedGroup_3", "getUnorderedGroupHelper().canLeave(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3())");
             }
 
@@ -15790,40 +14820,39 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__UnorderedGroup_3__Impl"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5539:1: rule__PhysicalThread__UnorderedGroup_3__Impl : ( ({...}? => ( ( ( rule__PhysicalThread__Group_3_0__0 ) ) ) ) | ({...}? => ( ( ( rule__PhysicalThread__Group_3_1__0 ) ) ) ) | ({...}? => ( ( ( rule__PhysicalThread__Group_3_2__0 ) ) ) ) | ({...}? => ( ( ( rule__PhysicalThread__Group_3_3__0 ) ) ) ) | ({...}? => ( ( ( rule__PhysicalThread__Group_3_4__0 ) ) ) ) | ({...}? => ( ( ( rule__PhysicalThread__Group_3_5__0 ) ) ) ) ) ;
+    // InternalETPhys.g:5538:1: rule__PhysicalThread__UnorderedGroup_3__Impl : ( ({...}? => ( ( ( rule__PhysicalThread__Group_3_0__0 ) ) ) ) | ({...}? => ( ( ( rule__PhysicalThread__Group_3_1__0 ) ) ) ) | ({...}? => ( ( ( rule__PhysicalThread__Group_3_2__0 ) ) ) ) | ({...}? => ( ( ( rule__PhysicalThread__Group_3_3__0 ) ) ) ) | ({...}? => ( ( ( rule__PhysicalThread__Group_3_4__0 ) ) ) ) | ({...}? => ( ( ( rule__PhysicalThread__Group_3_5__0 ) ) ) ) ) ;
     public final void rule__PhysicalThread__UnorderedGroup_3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         		boolean selected = false;
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5544:1: ( ( ({...}? => ( ( ( rule__PhysicalThread__Group_3_0__0 ) ) ) ) | ({...}? => ( ( ( rule__PhysicalThread__Group_3_1__0 ) ) ) ) | ({...}? => ( ( ( rule__PhysicalThread__Group_3_2__0 ) ) ) ) | ({...}? => ( ( ( rule__PhysicalThread__Group_3_3__0 ) ) ) ) | ({...}? => ( ( ( rule__PhysicalThread__Group_3_4__0 ) ) ) ) | ({...}? => ( ( ( rule__PhysicalThread__Group_3_5__0 ) ) ) ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5545:3: ( ({...}? => ( ( ( rule__PhysicalThread__Group_3_0__0 ) ) ) ) | ({...}? => ( ( ( rule__PhysicalThread__Group_3_1__0 ) ) ) ) | ({...}? => ( ( ( rule__PhysicalThread__Group_3_2__0 ) ) ) ) | ({...}? => ( ( ( rule__PhysicalThread__Group_3_3__0 ) ) ) ) | ({...}? => ( ( ( rule__PhysicalThread__Group_3_4__0 ) ) ) ) | ({...}? => ( ( ( rule__PhysicalThread__Group_3_5__0 ) ) ) ) )
+            // InternalETPhys.g:5543:1: ( ( ({...}? => ( ( ( rule__PhysicalThread__Group_3_0__0 ) ) ) ) | ({...}? => ( ( ( rule__PhysicalThread__Group_3_1__0 ) ) ) ) | ({...}? => ( ( ( rule__PhysicalThread__Group_3_2__0 ) ) ) ) | ({...}? => ( ( ( rule__PhysicalThread__Group_3_3__0 ) ) ) ) | ({...}? => ( ( ( rule__PhysicalThread__Group_3_4__0 ) ) ) ) | ({...}? => ( ( ( rule__PhysicalThread__Group_3_5__0 ) ) ) ) ) )
+            // InternalETPhys.g:5544:3: ( ({...}? => ( ( ( rule__PhysicalThread__Group_3_0__0 ) ) ) ) | ({...}? => ( ( ( rule__PhysicalThread__Group_3_1__0 ) ) ) ) | ({...}? => ( ( ( rule__PhysicalThread__Group_3_2__0 ) ) ) ) | ({...}? => ( ( ( rule__PhysicalThread__Group_3_3__0 ) ) ) ) | ({...}? => ( ( ( rule__PhysicalThread__Group_3_4__0 ) ) ) ) | ({...}? => ( ( ( rule__PhysicalThread__Group_3_5__0 ) ) ) ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5545:3: ( ({...}? => ( ( ( rule__PhysicalThread__Group_3_0__0 ) ) ) ) | ({...}? => ( ( ( rule__PhysicalThread__Group_3_1__0 ) ) ) ) | ({...}? => ( ( ( rule__PhysicalThread__Group_3_2__0 ) ) ) ) | ({...}? => ( ( ( rule__PhysicalThread__Group_3_3__0 ) ) ) ) | ({...}? => ( ( ( rule__PhysicalThread__Group_3_4__0 ) ) ) ) | ({...}? => ( ( ( rule__PhysicalThread__Group_3_5__0 ) ) ) ) )
+            // InternalETPhys.g:5544:3: ( ({...}? => ( ( ( rule__PhysicalThread__Group_3_0__0 ) ) ) ) | ({...}? => ( ( ( rule__PhysicalThread__Group_3_1__0 ) ) ) ) | ({...}? => ( ( ( rule__PhysicalThread__Group_3_2__0 ) ) ) ) | ({...}? => ( ( ( rule__PhysicalThread__Group_3_3__0 ) ) ) ) | ({...}? => ( ( ( rule__PhysicalThread__Group_3_4__0 ) ) ) ) | ({...}? => ( ( ( rule__PhysicalThread__Group_3_5__0 ) ) ) ) )
             int alt40=6;
             int LA40_0 = input.LA(1);
 
-            if ( LA40_0 ==40 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 0) ) {
+            if ( LA40_0 == 40 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 0) ) {
                 alt40=1;
             }
-            else if ( LA40_0 ==41 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 1) ) {
+            else if ( LA40_0 == 41 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 1) ) {
                 alt40=2;
             }
-            else if ( LA40_0 ==42 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 2) ) {
+            else if ( LA40_0 == 42 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 2) ) {
                 alt40=3;
             }
-            else if ( LA40_0 ==43 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 3) ) {
+            else if ( LA40_0 == 43 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 3) ) {
                 alt40=4;
             }
-            else if ( LA40_0 ==44 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 4) ) {
+            else if ( LA40_0 == 44 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 4) ) {
                 alt40=5;
             }
-            else if ( LA40_0 ==45 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 5) ) {
+            else if ( LA40_0 == 45 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 5) ) {
                 alt40=6;
             }
             else {
-                if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
                     new NoViableAltException("", 40, 0, input);
 
@@ -15831,41 +14860,40 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
             }
             switch (alt40) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5547:4: ({...}? => ( ( ( rule__PhysicalThread__Group_3_0__0 ) ) ) )
+                    // InternalETPhys.g:5546:4: ({...}? => ( ( ( rule__PhysicalThread__Group_3_0__0 ) ) ) )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5547:4: ({...}? => ( ( ( rule__PhysicalThread__Group_3_0__0 ) ) ) )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5548:5: {...}? => ( ( ( rule__PhysicalThread__Group_3_0__0 ) ) )
+                    // InternalETPhys.g:5546:4: ({...}? => ( ( ( rule__PhysicalThread__Group_3_0__0 ) ) ) )
+                    // InternalETPhys.g:5547:5: {...}? => ( ( ( rule__PhysicalThread__Group_3_0__0 ) ) )
                     {
                     if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 0) ) {
-                        if (state.backtracking>0) {state.failed=true; return ;}
                         throw new FailedPredicateException(input, "rule__PhysicalThread__UnorderedGroup_3__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 0)");
                     }
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5548:111: ( ( ( rule__PhysicalThread__Group_3_0__0 ) ) )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5549:6: ( ( rule__PhysicalThread__Group_3_0__0 ) )
+                    // InternalETPhys.g:5547:111: ( ( ( rule__PhysicalThread__Group_3_0__0 ) ) )
+                    // InternalETPhys.g:5548:6: ( ( rule__PhysicalThread__Group_3_0__0 ) )
                     {
-                    getUnorderedGroupHelper().select(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 0);
-                    selected = true;
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5555:6: ( ( rule__PhysicalThread__Group_3_0__0 ) )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5557:7: ( rule__PhysicalThread__Group_3_0__0 )
+                     
+                    	 				  getUnorderedGroupHelper().select(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 0);
+                    	 				
+
+                    	 				  selected = true;
+                    	 				
+                    // InternalETPhys.g:5554:6: ( ( rule__PhysicalThread__Group_3_0__0 ) )
+                    // InternalETPhys.g:5556:7: ( rule__PhysicalThread__Group_3_0__0 )
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getPhysicalThreadAccess().getGroup_3_0()); 
-                    }
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5558:7: ( rule__PhysicalThread__Group_3_0__0 )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5558:8: rule__PhysicalThread__Group_3_0__0
+                     before(grammarAccess.getPhysicalThreadAccess().getGroup_3_0()); 
+                    // InternalETPhys.g:5557:7: ( rule__PhysicalThread__Group_3_0__0 )
+                    // InternalETPhys.g:5557:8: rule__PhysicalThread__Group_3_0__0
                     {
-                    pushFollow(FOLLOW_rule__PhysicalThread__Group_3_0__0_in_rule__PhysicalThread__UnorderedGroup_3__Impl11301);
+                    pushFollow(FOLLOW_2);
                     rule__PhysicalThread__Group_3_0__0();
 
                     state._fsp--;
-                    if (state.failed) return ;
 
-                    }
 
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getPhysicalThreadAccess().getGroup_3_0()); 
                     }
 
+                     after(grammarAccess.getPhysicalThreadAccess().getGroup_3_0()); 
+
                     }
 
 
@@ -15878,41 +14906,40 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5564:4: ({...}? => ( ( ( rule__PhysicalThread__Group_3_1__0 ) ) ) )
+                    // InternalETPhys.g:5563:4: ({...}? => ( ( ( rule__PhysicalThread__Group_3_1__0 ) ) ) )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5564:4: ({...}? => ( ( ( rule__PhysicalThread__Group_3_1__0 ) ) ) )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5565:5: {...}? => ( ( ( rule__PhysicalThread__Group_3_1__0 ) ) )
+                    // InternalETPhys.g:5563:4: ({...}? => ( ( ( rule__PhysicalThread__Group_3_1__0 ) ) ) )
+                    // InternalETPhys.g:5564:5: {...}? => ( ( ( rule__PhysicalThread__Group_3_1__0 ) ) )
                     {
                     if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 1) ) {
-                        if (state.backtracking>0) {state.failed=true; return ;}
                         throw new FailedPredicateException(input, "rule__PhysicalThread__UnorderedGroup_3__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 1)");
                     }
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5565:111: ( ( ( rule__PhysicalThread__Group_3_1__0 ) ) )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5566:6: ( ( rule__PhysicalThread__Group_3_1__0 ) )
+                    // InternalETPhys.g:5564:111: ( ( ( rule__PhysicalThread__Group_3_1__0 ) ) )
+                    // InternalETPhys.g:5565:6: ( ( rule__PhysicalThread__Group_3_1__0 ) )
                     {
-                    getUnorderedGroupHelper().select(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 1);
-                    selected = true;
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5572:6: ( ( rule__PhysicalThread__Group_3_1__0 ) )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5574:7: ( rule__PhysicalThread__Group_3_1__0 )
+                     
+                    	 				  getUnorderedGroupHelper().select(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 1);
+                    	 				
+
+                    	 				  selected = true;
+                    	 				
+                    // InternalETPhys.g:5571:6: ( ( rule__PhysicalThread__Group_3_1__0 ) )
+                    // InternalETPhys.g:5573:7: ( rule__PhysicalThread__Group_3_1__0 )
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getPhysicalThreadAccess().getGroup_3_1()); 
-                    }
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5575:7: ( rule__PhysicalThread__Group_3_1__0 )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5575:8: rule__PhysicalThread__Group_3_1__0
+                     before(grammarAccess.getPhysicalThreadAccess().getGroup_3_1()); 
+                    // InternalETPhys.g:5574:7: ( rule__PhysicalThread__Group_3_1__0 )
+                    // InternalETPhys.g:5574:8: rule__PhysicalThread__Group_3_1__0
                     {
-                    pushFollow(FOLLOW_rule__PhysicalThread__Group_3_1__0_in_rule__PhysicalThread__UnorderedGroup_3__Impl11392);
+                    pushFollow(FOLLOW_2);
                     rule__PhysicalThread__Group_3_1__0();
 
                     state._fsp--;
-                    if (state.failed) return ;
 
-                    }
 
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getPhysicalThreadAccess().getGroup_3_1()); 
                     }
 
+                     after(grammarAccess.getPhysicalThreadAccess().getGroup_3_1()); 
+
                     }
 
 
@@ -15925,41 +14952,40 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5581:4: ({...}? => ( ( ( rule__PhysicalThread__Group_3_2__0 ) ) ) )
+                    // InternalETPhys.g:5580:4: ({...}? => ( ( ( rule__PhysicalThread__Group_3_2__0 ) ) ) )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5581:4: ({...}? => ( ( ( rule__PhysicalThread__Group_3_2__0 ) ) ) )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5582:5: {...}? => ( ( ( rule__PhysicalThread__Group_3_2__0 ) ) )
+                    // InternalETPhys.g:5580:4: ({...}? => ( ( ( rule__PhysicalThread__Group_3_2__0 ) ) ) )
+                    // InternalETPhys.g:5581:5: {...}? => ( ( ( rule__PhysicalThread__Group_3_2__0 ) ) )
                     {
                     if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 2) ) {
-                        if (state.backtracking>0) {state.failed=true; return ;}
                         throw new FailedPredicateException(input, "rule__PhysicalThread__UnorderedGroup_3__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 2)");
                     }
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5582:111: ( ( ( rule__PhysicalThread__Group_3_2__0 ) ) )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5583:6: ( ( rule__PhysicalThread__Group_3_2__0 ) )
+                    // InternalETPhys.g:5581:111: ( ( ( rule__PhysicalThread__Group_3_2__0 ) ) )
+                    // InternalETPhys.g:5582:6: ( ( rule__PhysicalThread__Group_3_2__0 ) )
                     {
-                    getUnorderedGroupHelper().select(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 2);
-                    selected = true;
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5589:6: ( ( rule__PhysicalThread__Group_3_2__0 ) )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5591:7: ( rule__PhysicalThread__Group_3_2__0 )
+                     
+                    	 				  getUnorderedGroupHelper().select(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 2);
+                    	 				
+
+                    	 				  selected = true;
+                    	 				
+                    // InternalETPhys.g:5588:6: ( ( rule__PhysicalThread__Group_3_2__0 ) )
+                    // InternalETPhys.g:5590:7: ( rule__PhysicalThread__Group_3_2__0 )
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getPhysicalThreadAccess().getGroup_3_2()); 
-                    }
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5592:7: ( rule__PhysicalThread__Group_3_2__0 )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5592:8: rule__PhysicalThread__Group_3_2__0
+                     before(grammarAccess.getPhysicalThreadAccess().getGroup_3_2()); 
+                    // InternalETPhys.g:5591:7: ( rule__PhysicalThread__Group_3_2__0 )
+                    // InternalETPhys.g:5591:8: rule__PhysicalThread__Group_3_2__0
                     {
-                    pushFollow(FOLLOW_rule__PhysicalThread__Group_3_2__0_in_rule__PhysicalThread__UnorderedGroup_3__Impl11483);
+                    pushFollow(FOLLOW_2);
                     rule__PhysicalThread__Group_3_2__0();
 
                     state._fsp--;
-                    if (state.failed) return ;
 
-                    }
 
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getPhysicalThreadAccess().getGroup_3_2()); 
                     }
 
+                     after(grammarAccess.getPhysicalThreadAccess().getGroup_3_2()); 
+
                     }
 
 
@@ -15972,41 +14998,40 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 4 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5598:4: ({...}? => ( ( ( rule__PhysicalThread__Group_3_3__0 ) ) ) )
+                    // InternalETPhys.g:5597:4: ({...}? => ( ( ( rule__PhysicalThread__Group_3_3__0 ) ) ) )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5598:4: ({...}? => ( ( ( rule__PhysicalThread__Group_3_3__0 ) ) ) )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5599:5: {...}? => ( ( ( rule__PhysicalThread__Group_3_3__0 ) ) )
+                    // InternalETPhys.g:5597:4: ({...}? => ( ( ( rule__PhysicalThread__Group_3_3__0 ) ) ) )
+                    // InternalETPhys.g:5598:5: {...}? => ( ( ( rule__PhysicalThread__Group_3_3__0 ) ) )
                     {
                     if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 3) ) {
-                        if (state.backtracking>0) {state.failed=true; return ;}
                         throw new FailedPredicateException(input, "rule__PhysicalThread__UnorderedGroup_3__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 3)");
                     }
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5599:111: ( ( ( rule__PhysicalThread__Group_3_3__0 ) ) )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5600:6: ( ( rule__PhysicalThread__Group_3_3__0 ) )
+                    // InternalETPhys.g:5598:111: ( ( ( rule__PhysicalThread__Group_3_3__0 ) ) )
+                    // InternalETPhys.g:5599:6: ( ( rule__PhysicalThread__Group_3_3__0 ) )
                     {
-                    getUnorderedGroupHelper().select(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 3);
-                    selected = true;
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5606:6: ( ( rule__PhysicalThread__Group_3_3__0 ) )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5608:7: ( rule__PhysicalThread__Group_3_3__0 )
+                     
+                    	 				  getUnorderedGroupHelper().select(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 3);
+                    	 				
+
+                    	 				  selected = true;
+                    	 				
+                    // InternalETPhys.g:5605:6: ( ( rule__PhysicalThread__Group_3_3__0 ) )
+                    // InternalETPhys.g:5607:7: ( rule__PhysicalThread__Group_3_3__0 )
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getPhysicalThreadAccess().getGroup_3_3()); 
-                    }
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5609:7: ( rule__PhysicalThread__Group_3_3__0 )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5609:8: rule__PhysicalThread__Group_3_3__0
+                     before(grammarAccess.getPhysicalThreadAccess().getGroup_3_3()); 
+                    // InternalETPhys.g:5608:7: ( rule__PhysicalThread__Group_3_3__0 )
+                    // InternalETPhys.g:5608:8: rule__PhysicalThread__Group_3_3__0
                     {
-                    pushFollow(FOLLOW_rule__PhysicalThread__Group_3_3__0_in_rule__PhysicalThread__UnorderedGroup_3__Impl11574);
+                    pushFollow(FOLLOW_2);
                     rule__PhysicalThread__Group_3_3__0();
 
                     state._fsp--;
-                    if (state.failed) return ;
 
-                    }
 
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getPhysicalThreadAccess().getGroup_3_3()); 
                     }
 
+                     after(grammarAccess.getPhysicalThreadAccess().getGroup_3_3()); 
+
                     }
 
 
@@ -16019,41 +15044,40 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 5 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5615:4: ({...}? => ( ( ( rule__PhysicalThread__Group_3_4__0 ) ) ) )
+                    // InternalETPhys.g:5614:4: ({...}? => ( ( ( rule__PhysicalThread__Group_3_4__0 ) ) ) )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5615:4: ({...}? => ( ( ( rule__PhysicalThread__Group_3_4__0 ) ) ) )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5616:5: {...}? => ( ( ( rule__PhysicalThread__Group_3_4__0 ) ) )
+                    // InternalETPhys.g:5614:4: ({...}? => ( ( ( rule__PhysicalThread__Group_3_4__0 ) ) ) )
+                    // InternalETPhys.g:5615:5: {...}? => ( ( ( rule__PhysicalThread__Group_3_4__0 ) ) )
                     {
                     if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 4) ) {
-                        if (state.backtracking>0) {state.failed=true; return ;}
                         throw new FailedPredicateException(input, "rule__PhysicalThread__UnorderedGroup_3__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 4)");
                     }
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5616:111: ( ( ( rule__PhysicalThread__Group_3_4__0 ) ) )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5617:6: ( ( rule__PhysicalThread__Group_3_4__0 ) )
+                    // InternalETPhys.g:5615:111: ( ( ( rule__PhysicalThread__Group_3_4__0 ) ) )
+                    // InternalETPhys.g:5616:6: ( ( rule__PhysicalThread__Group_3_4__0 ) )
                     {
-                    getUnorderedGroupHelper().select(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 4);
-                    selected = true;
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5623:6: ( ( rule__PhysicalThread__Group_3_4__0 ) )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5625:7: ( rule__PhysicalThread__Group_3_4__0 )
+                     
+                    	 				  getUnorderedGroupHelper().select(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 4);
+                    	 				
+
+                    	 				  selected = true;
+                    	 				
+                    // InternalETPhys.g:5622:6: ( ( rule__PhysicalThread__Group_3_4__0 ) )
+                    // InternalETPhys.g:5624:7: ( rule__PhysicalThread__Group_3_4__0 )
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getPhysicalThreadAccess().getGroup_3_4()); 
-                    }
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5626:7: ( rule__PhysicalThread__Group_3_4__0 )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5626:8: rule__PhysicalThread__Group_3_4__0
+                     before(grammarAccess.getPhysicalThreadAccess().getGroup_3_4()); 
+                    // InternalETPhys.g:5625:7: ( rule__PhysicalThread__Group_3_4__0 )
+                    // InternalETPhys.g:5625:8: rule__PhysicalThread__Group_3_4__0
                     {
-                    pushFollow(FOLLOW_rule__PhysicalThread__Group_3_4__0_in_rule__PhysicalThread__UnorderedGroup_3__Impl11665);
+                    pushFollow(FOLLOW_2);
                     rule__PhysicalThread__Group_3_4__0();
 
                     state._fsp--;
-                    if (state.failed) return ;
 
-                    }
 
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getPhysicalThreadAccess().getGroup_3_4()); 
                     }
 
+                     after(grammarAccess.getPhysicalThreadAccess().getGroup_3_4()); 
+
                     }
 
 
@@ -16066,41 +15090,40 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 6 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5632:4: ({...}? => ( ( ( rule__PhysicalThread__Group_3_5__0 ) ) ) )
+                    // InternalETPhys.g:5631:4: ({...}? => ( ( ( rule__PhysicalThread__Group_3_5__0 ) ) ) )
                     {
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5632:4: ({...}? => ( ( ( rule__PhysicalThread__Group_3_5__0 ) ) ) )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5633:5: {...}? => ( ( ( rule__PhysicalThread__Group_3_5__0 ) ) )
+                    // InternalETPhys.g:5631:4: ({...}? => ( ( ( rule__PhysicalThread__Group_3_5__0 ) ) ) )
+                    // InternalETPhys.g:5632:5: {...}? => ( ( ( rule__PhysicalThread__Group_3_5__0 ) ) )
                     {
                     if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 5) ) {
-                        if (state.backtracking>0) {state.failed=true; return ;}
                         throw new FailedPredicateException(input, "rule__PhysicalThread__UnorderedGroup_3__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 5)");
                     }
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5633:111: ( ( ( rule__PhysicalThread__Group_3_5__0 ) ) )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5634:6: ( ( rule__PhysicalThread__Group_3_5__0 ) )
+                    // InternalETPhys.g:5632:111: ( ( ( rule__PhysicalThread__Group_3_5__0 ) ) )
+                    // InternalETPhys.g:5633:6: ( ( rule__PhysicalThread__Group_3_5__0 ) )
                     {
-                    getUnorderedGroupHelper().select(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 5);
-                    selected = true;
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5640:6: ( ( rule__PhysicalThread__Group_3_5__0 ) )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5642:7: ( rule__PhysicalThread__Group_3_5__0 )
+                     
+                    	 				  getUnorderedGroupHelper().select(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 5);
+                    	 				
+
+                    	 				  selected = true;
+                    	 				
+                    // InternalETPhys.g:5639:6: ( ( rule__PhysicalThread__Group_3_5__0 ) )
+                    // InternalETPhys.g:5641:7: ( rule__PhysicalThread__Group_3_5__0 )
                     {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getPhysicalThreadAccess().getGroup_3_5()); 
-                    }
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5643:7: ( rule__PhysicalThread__Group_3_5__0 )
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5643:8: rule__PhysicalThread__Group_3_5__0
+                     before(grammarAccess.getPhysicalThreadAccess().getGroup_3_5()); 
+                    // InternalETPhys.g:5642:7: ( rule__PhysicalThread__Group_3_5__0 )
+                    // InternalETPhys.g:5642:8: rule__PhysicalThread__Group_3_5__0
                     {
-                    pushFollow(FOLLOW_rule__PhysicalThread__Group_3_5__0_in_rule__PhysicalThread__UnorderedGroup_3__Impl11756);
+                    pushFollow(FOLLOW_2);
                     rule__PhysicalThread__Group_3_5__0();
 
                     state._fsp--;
-                    if (state.failed) return ;
 
-                    }
 
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getPhysicalThreadAccess().getGroup_3_5()); 
                     }
 
+                     after(grammarAccess.getPhysicalThreadAccess().getGroup_3_5()); 
+
                     }
 
 
@@ -16136,51 +15159,51 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__UnorderedGroup_3__0"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5658:1: rule__PhysicalThread__UnorderedGroup_3__0 : rule__PhysicalThread__UnorderedGroup_3__Impl ( rule__PhysicalThread__UnorderedGroup_3__1 )? ;
+    // InternalETPhys.g:5657:1: rule__PhysicalThread__UnorderedGroup_3__0 : rule__PhysicalThread__UnorderedGroup_3__Impl ( rule__PhysicalThread__UnorderedGroup_3__1 )? ;
     public final void rule__PhysicalThread__UnorderedGroup_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5662:1: ( rule__PhysicalThread__UnorderedGroup_3__Impl ( rule__PhysicalThread__UnorderedGroup_3__1 )? )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5663:2: rule__PhysicalThread__UnorderedGroup_3__Impl ( rule__PhysicalThread__UnorderedGroup_3__1 )?
+            // InternalETPhys.g:5661:1: ( rule__PhysicalThread__UnorderedGroup_3__Impl ( rule__PhysicalThread__UnorderedGroup_3__1 )? )
+            // InternalETPhys.g:5662:2: rule__PhysicalThread__UnorderedGroup_3__Impl ( rule__PhysicalThread__UnorderedGroup_3__1 )?
             {
-            pushFollow(FOLLOW_rule__PhysicalThread__UnorderedGroup_3__Impl_in_rule__PhysicalThread__UnorderedGroup_3__011815);
+            pushFollow(FOLLOW_45);
             rule__PhysicalThread__UnorderedGroup_3__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5664:2: ( rule__PhysicalThread__UnorderedGroup_3__1 )?
+
+            // InternalETPhys.g:5663:2: ( rule__PhysicalThread__UnorderedGroup_3__1 )?
             int alt41=2;
             int LA41_0 = input.LA(1);
 
-            if ( LA41_0 ==40 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 0) ) {
+            if ( LA41_0 == 40 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 0) ) {
                 alt41=1;
             }
-            else if ( LA41_0 ==41 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 1) ) {
+            else if ( LA41_0 == 41 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 1) ) {
                 alt41=1;
             }
-            else if ( LA41_0 ==42 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 2) ) {
+            else if ( LA41_0 == 42 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 2) ) {
                 alt41=1;
             }
-            else if ( LA41_0 ==43 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 3) ) {
+            else if ( LA41_0 == 43 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 3) ) {
                 alt41=1;
             }
-            else if ( LA41_0 ==44 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 4) ) {
+            else if ( LA41_0 == 44 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 4) ) {
                 alt41=1;
             }
-            else if ( LA41_0 ==45 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 5) ) {
+            else if ( LA41_0 == 45 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 5) ) {
                 alt41=1;
             }
             switch (alt41) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:0:0: rule__PhysicalThread__UnorderedGroup_3__1
+                    // InternalETPhys.g:5663:2: rule__PhysicalThread__UnorderedGroup_3__1
                     {
-                    pushFollow(FOLLOW_rule__PhysicalThread__UnorderedGroup_3__1_in_rule__PhysicalThread__UnorderedGroup_3__011818);
+                    pushFollow(FOLLOW_2);
                     rule__PhysicalThread__UnorderedGroup_3__1();
 
                     state._fsp--;
-                    if (state.failed) return ;
+
 
                     }
                     break;
@@ -16206,51 +15229,51 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__UnorderedGroup_3__1"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5671:1: rule__PhysicalThread__UnorderedGroup_3__1 : rule__PhysicalThread__UnorderedGroup_3__Impl ( rule__PhysicalThread__UnorderedGroup_3__2 )? ;
+    // InternalETPhys.g:5670:1: rule__PhysicalThread__UnorderedGroup_3__1 : rule__PhysicalThread__UnorderedGroup_3__Impl ( rule__PhysicalThread__UnorderedGroup_3__2 )? ;
     public final void rule__PhysicalThread__UnorderedGroup_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5675:1: ( rule__PhysicalThread__UnorderedGroup_3__Impl ( rule__PhysicalThread__UnorderedGroup_3__2 )? )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5676:2: rule__PhysicalThread__UnorderedGroup_3__Impl ( rule__PhysicalThread__UnorderedGroup_3__2 )?
+            // InternalETPhys.g:5674:1: ( rule__PhysicalThread__UnorderedGroup_3__Impl ( rule__PhysicalThread__UnorderedGroup_3__2 )? )
+            // InternalETPhys.g:5675:2: rule__PhysicalThread__UnorderedGroup_3__Impl ( rule__PhysicalThread__UnorderedGroup_3__2 )?
             {
-            pushFollow(FOLLOW_rule__PhysicalThread__UnorderedGroup_3__Impl_in_rule__PhysicalThread__UnorderedGroup_3__111843);
+            pushFollow(FOLLOW_45);
             rule__PhysicalThread__UnorderedGroup_3__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5677:2: ( rule__PhysicalThread__UnorderedGroup_3__2 )?
+
+            // InternalETPhys.g:5676:2: ( rule__PhysicalThread__UnorderedGroup_3__2 )?
             int alt42=2;
             int LA42_0 = input.LA(1);
 
-            if ( LA42_0 ==40 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 0) ) {
+            if ( LA42_0 == 40 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 0) ) {
                 alt42=1;
             }
-            else if ( LA42_0 ==41 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 1) ) {
+            else if ( LA42_0 == 41 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 1) ) {
                 alt42=1;
             }
-            else if ( LA42_0 ==42 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 2) ) {
+            else if ( LA42_0 == 42 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 2) ) {
                 alt42=1;
             }
-            else if ( LA42_0 ==43 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 3) ) {
+            else if ( LA42_0 == 43 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 3) ) {
                 alt42=1;
             }
-            else if ( LA42_0 ==44 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 4) ) {
+            else if ( LA42_0 == 44 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 4) ) {
                 alt42=1;
             }
-            else if ( LA42_0 ==45 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 5) ) {
+            else if ( LA42_0 == 45 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 5) ) {
                 alt42=1;
             }
             switch (alt42) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:0:0: rule__PhysicalThread__UnorderedGroup_3__2
+                    // InternalETPhys.g:5676:2: rule__PhysicalThread__UnorderedGroup_3__2
                     {
-                    pushFollow(FOLLOW_rule__PhysicalThread__UnorderedGroup_3__2_in_rule__PhysicalThread__UnorderedGroup_3__111846);
+                    pushFollow(FOLLOW_2);
                     rule__PhysicalThread__UnorderedGroup_3__2();
 
                     state._fsp--;
-                    if (state.failed) return ;
+
 
                     }
                     break;
@@ -16276,51 +15299,51 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__UnorderedGroup_3__2"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5684:1: rule__PhysicalThread__UnorderedGroup_3__2 : rule__PhysicalThread__UnorderedGroup_3__Impl ( rule__PhysicalThread__UnorderedGroup_3__3 )? ;
+    // InternalETPhys.g:5683:1: rule__PhysicalThread__UnorderedGroup_3__2 : rule__PhysicalThread__UnorderedGroup_3__Impl ( rule__PhysicalThread__UnorderedGroup_3__3 )? ;
     public final void rule__PhysicalThread__UnorderedGroup_3__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5688:1: ( rule__PhysicalThread__UnorderedGroup_3__Impl ( rule__PhysicalThread__UnorderedGroup_3__3 )? )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5689:2: rule__PhysicalThread__UnorderedGroup_3__Impl ( rule__PhysicalThread__UnorderedGroup_3__3 )?
+            // InternalETPhys.g:5687:1: ( rule__PhysicalThread__UnorderedGroup_3__Impl ( rule__PhysicalThread__UnorderedGroup_3__3 )? )
+            // InternalETPhys.g:5688:2: rule__PhysicalThread__UnorderedGroup_3__Impl ( rule__PhysicalThread__UnorderedGroup_3__3 )?
             {
-            pushFollow(FOLLOW_rule__PhysicalThread__UnorderedGroup_3__Impl_in_rule__PhysicalThread__UnorderedGroup_3__211871);
+            pushFollow(FOLLOW_45);
             rule__PhysicalThread__UnorderedGroup_3__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5690:2: ( rule__PhysicalThread__UnorderedGroup_3__3 )?
+
+            // InternalETPhys.g:5689:2: ( rule__PhysicalThread__UnorderedGroup_3__3 )?
             int alt43=2;
             int LA43_0 = input.LA(1);
 
-            if ( LA43_0 ==40 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 0) ) {
+            if ( LA43_0 == 40 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 0) ) {
                 alt43=1;
             }
-            else if ( LA43_0 ==41 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 1) ) {
+            else if ( LA43_0 == 41 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 1) ) {
                 alt43=1;
             }
-            else if ( LA43_0 ==42 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 2) ) {
+            else if ( LA43_0 == 42 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 2) ) {
                 alt43=1;
             }
-            else if ( LA43_0 ==43 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 3) ) {
+            else if ( LA43_0 == 43 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 3) ) {
                 alt43=1;
             }
-            else if ( LA43_0 ==44 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 4) ) {
+            else if ( LA43_0 == 44 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 4) ) {
                 alt43=1;
             }
-            else if ( LA43_0 ==45 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 5) ) {
+            else if ( LA43_0 == 45 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 5) ) {
                 alt43=1;
             }
             switch (alt43) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:0:0: rule__PhysicalThread__UnorderedGroup_3__3
+                    // InternalETPhys.g:5689:2: rule__PhysicalThread__UnorderedGroup_3__3
                     {
-                    pushFollow(FOLLOW_rule__PhysicalThread__UnorderedGroup_3__3_in_rule__PhysicalThread__UnorderedGroup_3__211874);
+                    pushFollow(FOLLOW_2);
                     rule__PhysicalThread__UnorderedGroup_3__3();
 
                     state._fsp--;
-                    if (state.failed) return ;
+
 
                     }
                     break;
@@ -16346,51 +15369,51 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__UnorderedGroup_3__3"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5697:1: rule__PhysicalThread__UnorderedGroup_3__3 : rule__PhysicalThread__UnorderedGroup_3__Impl ( rule__PhysicalThread__UnorderedGroup_3__4 )? ;
+    // InternalETPhys.g:5696:1: rule__PhysicalThread__UnorderedGroup_3__3 : rule__PhysicalThread__UnorderedGroup_3__Impl ( rule__PhysicalThread__UnorderedGroup_3__4 )? ;
     public final void rule__PhysicalThread__UnorderedGroup_3__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5701:1: ( rule__PhysicalThread__UnorderedGroup_3__Impl ( rule__PhysicalThread__UnorderedGroup_3__4 )? )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5702:2: rule__PhysicalThread__UnorderedGroup_3__Impl ( rule__PhysicalThread__UnorderedGroup_3__4 )?
+            // InternalETPhys.g:5700:1: ( rule__PhysicalThread__UnorderedGroup_3__Impl ( rule__PhysicalThread__UnorderedGroup_3__4 )? )
+            // InternalETPhys.g:5701:2: rule__PhysicalThread__UnorderedGroup_3__Impl ( rule__PhysicalThread__UnorderedGroup_3__4 )?
             {
-            pushFollow(FOLLOW_rule__PhysicalThread__UnorderedGroup_3__Impl_in_rule__PhysicalThread__UnorderedGroup_3__311899);
+            pushFollow(FOLLOW_45);
             rule__PhysicalThread__UnorderedGroup_3__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5703:2: ( rule__PhysicalThread__UnorderedGroup_3__4 )?
+
+            // InternalETPhys.g:5702:2: ( rule__PhysicalThread__UnorderedGroup_3__4 )?
             int alt44=2;
             int LA44_0 = input.LA(1);
 
-            if ( LA44_0 ==40 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 0) ) {
+            if ( LA44_0 == 40 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 0) ) {
                 alt44=1;
             }
-            else if ( LA44_0 ==41 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 1) ) {
+            else if ( LA44_0 == 41 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 1) ) {
                 alt44=1;
             }
-            else if ( LA44_0 ==42 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 2) ) {
+            else if ( LA44_0 == 42 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 2) ) {
                 alt44=1;
             }
-            else if ( LA44_0 ==43 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 3) ) {
+            else if ( LA44_0 == 43 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 3) ) {
                 alt44=1;
             }
-            else if ( LA44_0 ==44 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 4) ) {
+            else if ( LA44_0 == 44 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 4) ) {
                 alt44=1;
             }
-            else if ( LA44_0 ==45 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 5) ) {
+            else if ( LA44_0 == 45 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 5) ) {
                 alt44=1;
             }
             switch (alt44) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:0:0: rule__PhysicalThread__UnorderedGroup_3__4
+                    // InternalETPhys.g:5702:2: rule__PhysicalThread__UnorderedGroup_3__4
                     {
-                    pushFollow(FOLLOW_rule__PhysicalThread__UnorderedGroup_3__4_in_rule__PhysicalThread__UnorderedGroup_3__311902);
+                    pushFollow(FOLLOW_2);
                     rule__PhysicalThread__UnorderedGroup_3__4();
 
                     state._fsp--;
-                    if (state.failed) return ;
+
 
                     }
                     break;
@@ -16416,51 +15439,51 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__UnorderedGroup_3__4"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5710:1: rule__PhysicalThread__UnorderedGroup_3__4 : rule__PhysicalThread__UnorderedGroup_3__Impl ( rule__PhysicalThread__UnorderedGroup_3__5 )? ;
+    // InternalETPhys.g:5709:1: rule__PhysicalThread__UnorderedGroup_3__4 : rule__PhysicalThread__UnorderedGroup_3__Impl ( rule__PhysicalThread__UnorderedGroup_3__5 )? ;
     public final void rule__PhysicalThread__UnorderedGroup_3__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5714:1: ( rule__PhysicalThread__UnorderedGroup_3__Impl ( rule__PhysicalThread__UnorderedGroup_3__5 )? )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5715:2: rule__PhysicalThread__UnorderedGroup_3__Impl ( rule__PhysicalThread__UnorderedGroup_3__5 )?
+            // InternalETPhys.g:5713:1: ( rule__PhysicalThread__UnorderedGroup_3__Impl ( rule__PhysicalThread__UnorderedGroup_3__5 )? )
+            // InternalETPhys.g:5714:2: rule__PhysicalThread__UnorderedGroup_3__Impl ( rule__PhysicalThread__UnorderedGroup_3__5 )?
             {
-            pushFollow(FOLLOW_rule__PhysicalThread__UnorderedGroup_3__Impl_in_rule__PhysicalThread__UnorderedGroup_3__411927);
+            pushFollow(FOLLOW_45);
             rule__PhysicalThread__UnorderedGroup_3__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5716:2: ( rule__PhysicalThread__UnorderedGroup_3__5 )?
+
+            // InternalETPhys.g:5715:2: ( rule__PhysicalThread__UnorderedGroup_3__5 )?
             int alt45=2;
             int LA45_0 = input.LA(1);
 
-            if ( LA45_0 ==40 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 0) ) {
+            if ( LA45_0 == 40 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 0) ) {
                 alt45=1;
             }
-            else if ( LA45_0 ==41 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 1) ) {
+            else if ( LA45_0 == 41 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 1) ) {
                 alt45=1;
             }
-            else if ( LA45_0 ==42 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 2) ) {
+            else if ( LA45_0 == 42 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 2) ) {
                 alt45=1;
             }
-            else if ( LA45_0 ==43 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 3) ) {
+            else if ( LA45_0 == 43 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 3) ) {
                 alt45=1;
             }
-            else if ( LA45_0 ==44 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 4) ) {
+            else if ( LA45_0 == 44 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 4) ) {
                 alt45=1;
             }
-            else if ( LA45_0 ==45 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 5) ) {
+            else if ( LA45_0 == 45 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 5) ) {
                 alt45=1;
             }
             switch (alt45) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:0:0: rule__PhysicalThread__UnorderedGroup_3__5
+                    // InternalETPhys.g:5715:2: rule__PhysicalThread__UnorderedGroup_3__5
                     {
-                    pushFollow(FOLLOW_rule__PhysicalThread__UnorderedGroup_3__5_in_rule__PhysicalThread__UnorderedGroup_3__411930);
+                    pushFollow(FOLLOW_2);
                     rule__PhysicalThread__UnorderedGroup_3__5();
 
                     state._fsp--;
-                    if (state.failed) return ;
+
 
                     }
                     break;
@@ -16486,20 +15509,20 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__UnorderedGroup_3__5"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5723:1: rule__PhysicalThread__UnorderedGroup_3__5 : rule__PhysicalThread__UnorderedGroup_3__Impl ;
+    // InternalETPhys.g:5722:1: rule__PhysicalThread__UnorderedGroup_3__5 : rule__PhysicalThread__UnorderedGroup_3__Impl ;
     public final void rule__PhysicalThread__UnorderedGroup_3__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5727:1: ( rule__PhysicalThread__UnorderedGroup_3__Impl )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5728:2: rule__PhysicalThread__UnorderedGroup_3__Impl
+            // InternalETPhys.g:5726:1: ( rule__PhysicalThread__UnorderedGroup_3__Impl )
+            // InternalETPhys.g:5727:2: rule__PhysicalThread__UnorderedGroup_3__Impl
             {
-            pushFollow(FOLLOW_rule__PhysicalThread__UnorderedGroup_3__Impl_in_rule__PhysicalThread__UnorderedGroup_3__511955);
+            pushFollow(FOLLOW_2);
             rule__PhysicalThread__UnorderedGroup_3__Impl();
 
             state._fsp--;
-            if (state.failed) return ;
+
 
             }
 
@@ -16519,29 +15542,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalModel__NameAssignment_1"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5747:1: rule__PhysicalModel__NameAssignment_1 : ( ruleFQN ) ;
+    // InternalETPhys.g:5746:1: rule__PhysicalModel__NameAssignment_1 : ( ruleFQN ) ;
     public final void rule__PhysicalModel__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5751:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5752:1: ( ruleFQN )
+            // InternalETPhys.g:5750:1: ( ( ruleFQN ) )
+            // InternalETPhys.g:5751:1: ( ruleFQN )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5752:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5753:1: ruleFQN
+            // InternalETPhys.g:5751:1: ( ruleFQN )
+            // InternalETPhys.g:5752:1: ruleFQN
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalModelAccess().getNameFQNParserRuleCall_1_0()); 
-            }
-            pushFollow(FOLLOW_ruleFQN_in_rule__PhysicalModel__NameAssignment_111995);
+             before(grammarAccess.getPhysicalModelAccess().getNameFQNParserRuleCall_1_0()); 
+            pushFollow(FOLLOW_2);
             ruleFQN();
 
             state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalModelAccess().getNameFQNParserRuleCall_1_0()); 
-            }
+
+             after(grammarAccess.getPhysicalModelAccess().getNameFQNParserRuleCall_1_0()); 
 
             }
 
@@ -16564,29 +15583,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalModel__ImportsAssignment_3"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5762:1: rule__PhysicalModel__ImportsAssignment_3 : ( ruleImport ) ;
+    // InternalETPhys.g:5761:1: rule__PhysicalModel__ImportsAssignment_3 : ( ruleImport ) ;
     public final void rule__PhysicalModel__ImportsAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5766:1: ( ( ruleImport ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5767:1: ( ruleImport )
+            // InternalETPhys.g:5765:1: ( ( ruleImport ) )
+            // InternalETPhys.g:5766:1: ( ruleImport )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5767:1: ( ruleImport )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5768:1: ruleImport
+            // InternalETPhys.g:5766:1: ( ruleImport )
+            // InternalETPhys.g:5767:1: ruleImport
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalModelAccess().getImportsImportParserRuleCall_3_0()); 
-            }
-            pushFollow(FOLLOW_ruleImport_in_rule__PhysicalModel__ImportsAssignment_312026);
+             before(grammarAccess.getPhysicalModelAccess().getImportsImportParserRuleCall_3_0()); 
+            pushFollow(FOLLOW_2);
             ruleImport();
 
             state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalModelAccess().getImportsImportParserRuleCall_3_0()); 
-            }
+
+             after(grammarAccess.getPhysicalModelAccess().getImportsImportParserRuleCall_3_0()); 
 
             }
 
@@ -16609,29 +15624,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalModel__SystemsAssignment_4_0"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5777:1: rule__PhysicalModel__SystemsAssignment_4_0 : ( rulePhysicalSystem ) ;
+    // InternalETPhys.g:5776:1: rule__PhysicalModel__SystemsAssignment_4_0 : ( rulePhysicalSystem ) ;
     public final void rule__PhysicalModel__SystemsAssignment_4_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5781:1: ( ( rulePhysicalSystem ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5782:1: ( rulePhysicalSystem )
+            // InternalETPhys.g:5780:1: ( ( rulePhysicalSystem ) )
+            // InternalETPhys.g:5781:1: ( rulePhysicalSystem )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5782:1: ( rulePhysicalSystem )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5783:1: rulePhysicalSystem
+            // InternalETPhys.g:5781:1: ( rulePhysicalSystem )
+            // InternalETPhys.g:5782:1: rulePhysicalSystem
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalModelAccess().getSystemsPhysicalSystemParserRuleCall_4_0_0()); 
-            }
-            pushFollow(FOLLOW_rulePhysicalSystem_in_rule__PhysicalModel__SystemsAssignment_4_012057);
+             before(grammarAccess.getPhysicalModelAccess().getSystemsPhysicalSystemParserRuleCall_4_0_0()); 
+            pushFollow(FOLLOW_2);
             rulePhysicalSystem();
 
             state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalModelAccess().getSystemsPhysicalSystemParserRuleCall_4_0_0()); 
-            }
+
+             after(grammarAccess.getPhysicalModelAccess().getSystemsPhysicalSystemParserRuleCall_4_0_0()); 
 
             }
 
@@ -16654,29 +15665,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalModel__NodeClassesAssignment_4_1"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5792:1: rule__PhysicalModel__NodeClassesAssignment_4_1 : ( ruleNodeClass ) ;
+    // InternalETPhys.g:5791:1: rule__PhysicalModel__NodeClassesAssignment_4_1 : ( ruleNodeClass ) ;
     public final void rule__PhysicalModel__NodeClassesAssignment_4_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5796:1: ( ( ruleNodeClass ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5797:1: ( ruleNodeClass )
+            // InternalETPhys.g:5795:1: ( ( ruleNodeClass ) )
+            // InternalETPhys.g:5796:1: ( ruleNodeClass )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5797:1: ( ruleNodeClass )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5798:1: ruleNodeClass
+            // InternalETPhys.g:5796:1: ( ruleNodeClass )
+            // InternalETPhys.g:5797:1: ruleNodeClass
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalModelAccess().getNodeClassesNodeClassParserRuleCall_4_1_0()); 
-            }
-            pushFollow(FOLLOW_ruleNodeClass_in_rule__PhysicalModel__NodeClassesAssignment_4_112088);
+             before(grammarAccess.getPhysicalModelAccess().getNodeClassesNodeClassParserRuleCall_4_1_0()); 
+            pushFollow(FOLLOW_2);
             ruleNodeClass();
 
             state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalModelAccess().getNodeClassesNodeClassParserRuleCall_4_1_0()); 
-            }
+
+             after(grammarAccess.getPhysicalModelAccess().getNodeClassesNodeClassParserRuleCall_4_1_0()); 
 
             }
 
@@ -16699,29 +15706,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalModel__RuntimeClassesAssignment_4_2"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5807:1: rule__PhysicalModel__RuntimeClassesAssignment_4_2 : ( ruleRuntimeClass ) ;
+    // InternalETPhys.g:5806:1: rule__PhysicalModel__RuntimeClassesAssignment_4_2 : ( ruleRuntimeClass ) ;
     public final void rule__PhysicalModel__RuntimeClassesAssignment_4_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5811:1: ( ( ruleRuntimeClass ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5812:1: ( ruleRuntimeClass )
+            // InternalETPhys.g:5810:1: ( ( ruleRuntimeClass ) )
+            // InternalETPhys.g:5811:1: ( ruleRuntimeClass )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5812:1: ( ruleRuntimeClass )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5813:1: ruleRuntimeClass
+            // InternalETPhys.g:5811:1: ( ruleRuntimeClass )
+            // InternalETPhys.g:5812:1: ruleRuntimeClass
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalModelAccess().getRuntimeClassesRuntimeClassParserRuleCall_4_2_0()); 
-            }
-            pushFollow(FOLLOW_ruleRuntimeClass_in_rule__PhysicalModel__RuntimeClassesAssignment_4_212119);
+             before(grammarAccess.getPhysicalModelAccess().getRuntimeClassesRuntimeClassParserRuleCall_4_2_0()); 
+            pushFollow(FOLLOW_2);
             ruleRuntimeClass();
 
             state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalModelAccess().getRuntimeClassesRuntimeClassParserRuleCall_4_2_0()); 
-            }
+
+             after(grammarAccess.getPhysicalModelAccess().getRuntimeClassesRuntimeClassParserRuleCall_4_2_0()); 
 
             }
 
@@ -16744,25 +15747,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalSystem__NameAssignment_1"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5822:1: rule__PhysicalSystem__NameAssignment_1 : ( RULE_ID ) ;
+    // InternalETPhys.g:5821:1: rule__PhysicalSystem__NameAssignment_1 : ( RULE_ID ) ;
     public final void rule__PhysicalSystem__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5826:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5827:1: ( RULE_ID )
+            // InternalETPhys.g:5825:1: ( ( RULE_ID ) )
+            // InternalETPhys.g:5826:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5827:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5828:1: RULE_ID
+            // InternalETPhys.g:5826:1: ( RULE_ID )
+            // InternalETPhys.g:5827:1: RULE_ID
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalSystemAccess().getNameIDTerminalRuleCall_1_0()); 
-            }
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__PhysicalSystem__NameAssignment_112150); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalSystemAccess().getNameIDTerminalRuleCall_1_0()); 
-            }
+             before(grammarAccess.getPhysicalSystemAccess().getNameIDTerminalRuleCall_1_0()); 
+            match(input,RULE_ID,FOLLOW_2); 
+             after(grammarAccess.getPhysicalSystemAccess().getNameIDTerminalRuleCall_1_0()); 
 
             }
 
@@ -16785,29 +15784,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalSystem__DocuAssignment_2"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5837:1: rule__PhysicalSystem__DocuAssignment_2 : ( ruleDocumentation ) ;
+    // InternalETPhys.g:5836:1: rule__PhysicalSystem__DocuAssignment_2 : ( ruleDocumentation ) ;
     public final void rule__PhysicalSystem__DocuAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5841:1: ( ( ruleDocumentation ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5842:1: ( ruleDocumentation )
+            // InternalETPhys.g:5840:1: ( ( ruleDocumentation ) )
+            // InternalETPhys.g:5841:1: ( ruleDocumentation )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5842:1: ( ruleDocumentation )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5843:1: ruleDocumentation
+            // InternalETPhys.g:5841:1: ( ruleDocumentation )
+            // InternalETPhys.g:5842:1: ruleDocumentation
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalSystemAccess().getDocuDocumentationParserRuleCall_2_0()); 
-            }
-            pushFollow(FOLLOW_ruleDocumentation_in_rule__PhysicalSystem__DocuAssignment_212181);
+             before(grammarAccess.getPhysicalSystemAccess().getDocuDocumentationParserRuleCall_2_0()); 
+            pushFollow(FOLLOW_2);
             ruleDocumentation();
 
             state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalSystemAccess().getDocuDocumentationParserRuleCall_2_0()); 
-            }
+
+             after(grammarAccess.getPhysicalSystemAccess().getDocuDocumentationParserRuleCall_2_0()); 
 
             }
 
@@ -16830,29 +15825,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalSystem__NodeRefsAssignment_4"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5852:1: rule__PhysicalSystem__NodeRefsAssignment_4 : ( ruleNodeRef ) ;
+    // InternalETPhys.g:5851:1: rule__PhysicalSystem__NodeRefsAssignment_4 : ( ruleNodeRef ) ;
     public final void rule__PhysicalSystem__NodeRefsAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5856:1: ( ( ruleNodeRef ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5857:1: ( ruleNodeRef )
+            // InternalETPhys.g:5855:1: ( ( ruleNodeRef ) )
+            // InternalETPhys.g:5856:1: ( ruleNodeRef )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5857:1: ( ruleNodeRef )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5858:1: ruleNodeRef
+            // InternalETPhys.g:5856:1: ( ruleNodeRef )
+            // InternalETPhys.g:5857:1: ruleNodeRef
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalSystemAccess().getNodeRefsNodeRefParserRuleCall_4_0()); 
-            }
-            pushFollow(FOLLOW_ruleNodeRef_in_rule__PhysicalSystem__NodeRefsAssignment_412212);
+             before(grammarAccess.getPhysicalSystemAccess().getNodeRefsNodeRefParserRuleCall_4_0()); 
+            pushFollow(FOLLOW_2);
             ruleNodeRef();
 
             state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalSystemAccess().getNodeRefsNodeRefParserRuleCall_4_0()); 
-            }
+
+             after(grammarAccess.getPhysicalSystemAccess().getNodeRefsNodeRefParserRuleCall_4_0()); 
 
             }
 
@@ -16875,25 +15866,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeRef__NameAssignment_1"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5867:1: rule__NodeRef__NameAssignment_1 : ( RULE_ID ) ;
+    // InternalETPhys.g:5866:1: rule__NodeRef__NameAssignment_1 : ( RULE_ID ) ;
     public final void rule__NodeRef__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5871:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5872:1: ( RULE_ID )
+            // InternalETPhys.g:5870:1: ( ( RULE_ID ) )
+            // InternalETPhys.g:5871:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5872:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5873:1: RULE_ID
+            // InternalETPhys.g:5871:1: ( RULE_ID )
+            // InternalETPhys.g:5872:1: RULE_ID
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getNodeRefAccess().getNameIDTerminalRuleCall_1_0()); 
-            }
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__NodeRef__NameAssignment_112243); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getNodeRefAccess().getNameIDTerminalRuleCall_1_0()); 
-            }
+             before(grammarAccess.getNodeRefAccess().getNameIDTerminalRuleCall_1_0()); 
+            match(input,RULE_ID,FOLLOW_2); 
+             after(grammarAccess.getNodeRefAccess().getNameIDTerminalRuleCall_1_0()); 
 
             }
 
@@ -16916,42 +15903,34 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeRef__TypeAssignment_3"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5882:1: rule__NodeRef__TypeAssignment_3 : ( ( ruleFQN ) ) ;
+    // InternalETPhys.g:5881:1: rule__NodeRef__TypeAssignment_3 : ( ( ruleFQN ) ) ;
     public final void rule__NodeRef__TypeAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5886:1: ( ( ( ruleFQN ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5887:1: ( ( ruleFQN ) )
+            // InternalETPhys.g:5885:1: ( ( ( ruleFQN ) ) )
+            // InternalETPhys.g:5886:1: ( ( ruleFQN ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5887:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5888:1: ( ruleFQN )
+            // InternalETPhys.g:5886:1: ( ( ruleFQN ) )
+            // InternalETPhys.g:5887:1: ( ruleFQN )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getNodeRefAccess().getTypeNodeClassCrossReference_3_0()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5889:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5890:1: ruleFQN
+             before(grammarAccess.getNodeRefAccess().getTypeNodeClassCrossReference_3_0()); 
+            // InternalETPhys.g:5888:1: ( ruleFQN )
+            // InternalETPhys.g:5889:1: ruleFQN
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getNodeRefAccess().getTypeNodeClassFQNParserRuleCall_3_0_1()); 
-            }
-            pushFollow(FOLLOW_ruleFQN_in_rule__NodeRef__TypeAssignment_312278);
+             before(grammarAccess.getNodeRefAccess().getTypeNodeClassFQNParserRuleCall_3_0_1()); 
+            pushFollow(FOLLOW_2);
             ruleFQN();
 
             state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getNodeRefAccess().getTypeNodeClassFQNParserRuleCall_3_0_1()); 
-            }
 
-            }
+             after(grammarAccess.getNodeRefAccess().getTypeNodeClassFQNParserRuleCall_3_0_1()); 
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getNodeRefAccess().getTypeNodeClassCrossReference_3_0()); 
             }
 
+             after(grammarAccess.getNodeRefAccess().getTypeNodeClassCrossReference_3_0()); 
+
             }
 
 
@@ -16973,29 +15952,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeRef__DocuAssignment_4"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5901:1: rule__NodeRef__DocuAssignment_4 : ( ruleDocumentation ) ;
+    // InternalETPhys.g:5900:1: rule__NodeRef__DocuAssignment_4 : ( ruleDocumentation ) ;
     public final void rule__NodeRef__DocuAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5905:1: ( ( ruleDocumentation ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5906:1: ( ruleDocumentation )
+            // InternalETPhys.g:5904:1: ( ( ruleDocumentation ) )
+            // InternalETPhys.g:5905:1: ( ruleDocumentation )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5906:1: ( ruleDocumentation )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5907:1: ruleDocumentation
+            // InternalETPhys.g:5905:1: ( ruleDocumentation )
+            // InternalETPhys.g:5906:1: ruleDocumentation
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getNodeRefAccess().getDocuDocumentationParserRuleCall_4_0()); 
-            }
-            pushFollow(FOLLOW_ruleDocumentation_in_rule__NodeRef__DocuAssignment_412313);
+             before(grammarAccess.getNodeRefAccess().getDocuDocumentationParserRuleCall_4_0()); 
+            pushFollow(FOLLOW_2);
             ruleDocumentation();
 
             state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getNodeRefAccess().getDocuDocumentationParserRuleCall_4_0()); 
-            }
+
+             after(grammarAccess.getNodeRefAccess().getDocuDocumentationParserRuleCall_4_0()); 
 
             }
 
@@ -17018,25 +15993,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeClass__NameAssignment_1"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5916:1: rule__NodeClass__NameAssignment_1 : ( RULE_ID ) ;
+    // InternalETPhys.g:5915:1: rule__NodeClass__NameAssignment_1 : ( RULE_ID ) ;
     public final void rule__NodeClass__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5920:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5921:1: ( RULE_ID )
+            // InternalETPhys.g:5919:1: ( ( RULE_ID ) )
+            // InternalETPhys.g:5920:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5921:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5922:1: RULE_ID
+            // InternalETPhys.g:5920:1: ( RULE_ID )
+            // InternalETPhys.g:5921:1: RULE_ID
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getNodeClassAccess().getNameIDTerminalRuleCall_1_0()); 
-            }
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__NodeClass__NameAssignment_112344); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getNodeClassAccess().getNameIDTerminalRuleCall_1_0()); 
-            }
+             before(grammarAccess.getNodeClassAccess().getNameIDTerminalRuleCall_1_0()); 
+            match(input,RULE_ID,FOLLOW_2); 
+             after(grammarAccess.getNodeClassAccess().getNameIDTerminalRuleCall_1_0()); 
 
             }
 
@@ -17059,29 +16030,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeClass__DocuAssignment_2"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5931:1: rule__NodeClass__DocuAssignment_2 : ( ruleDocumentation ) ;
+    // InternalETPhys.g:5930:1: rule__NodeClass__DocuAssignment_2 : ( ruleDocumentation ) ;
     public final void rule__NodeClass__DocuAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5935:1: ( ( ruleDocumentation ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5936:1: ( ruleDocumentation )
+            // InternalETPhys.g:5934:1: ( ( ruleDocumentation ) )
+            // InternalETPhys.g:5935:1: ( ruleDocumentation )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5936:1: ( ruleDocumentation )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5937:1: ruleDocumentation
+            // InternalETPhys.g:5935:1: ( ruleDocumentation )
+            // InternalETPhys.g:5936:1: ruleDocumentation
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getNodeClassAccess().getDocuDocumentationParserRuleCall_2_0()); 
-            }
-            pushFollow(FOLLOW_ruleDocumentation_in_rule__NodeClass__DocuAssignment_212375);
+             before(grammarAccess.getNodeClassAccess().getDocuDocumentationParserRuleCall_2_0()); 
+            pushFollow(FOLLOW_2);
             ruleDocumentation();
 
             state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getNodeClassAccess().getDocuDocumentationParserRuleCall_2_0()); 
-            }
+
+             after(grammarAccess.getNodeClassAccess().getDocuDocumentationParserRuleCall_2_0()); 
 
             }
 
@@ -17104,42 +16071,34 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeClass__RuntimeAssignment_4_0_2"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5946:1: rule__NodeClass__RuntimeAssignment_4_0_2 : ( ( ruleFQN ) ) ;
+    // InternalETPhys.g:5945:1: rule__NodeClass__RuntimeAssignment_4_0_2 : ( ( ruleFQN ) ) ;
     public final void rule__NodeClass__RuntimeAssignment_4_0_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5950:1: ( ( ( ruleFQN ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5951:1: ( ( ruleFQN ) )
+            // InternalETPhys.g:5949:1: ( ( ( ruleFQN ) ) )
+            // InternalETPhys.g:5950:1: ( ( ruleFQN ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5951:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5952:1: ( ruleFQN )
+            // InternalETPhys.g:5950:1: ( ( ruleFQN ) )
+            // InternalETPhys.g:5951:1: ( ruleFQN )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getNodeClassAccess().getRuntimeRuntimeClassCrossReference_4_0_2_0()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5953:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5954:1: ruleFQN
+             before(grammarAccess.getNodeClassAccess().getRuntimeRuntimeClassCrossReference_4_0_2_0()); 
+            // InternalETPhys.g:5952:1: ( ruleFQN )
+            // InternalETPhys.g:5953:1: ruleFQN
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getNodeClassAccess().getRuntimeRuntimeClassFQNParserRuleCall_4_0_2_0_1()); 
-            }
-            pushFollow(FOLLOW_ruleFQN_in_rule__NodeClass__RuntimeAssignment_4_0_212410);
+             before(grammarAccess.getNodeClassAccess().getRuntimeRuntimeClassFQNParserRuleCall_4_0_2_0_1()); 
+            pushFollow(FOLLOW_2);
             ruleFQN();
 
             state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getNodeClassAccess().getRuntimeRuntimeClassFQNParserRuleCall_4_0_2_0_1()); 
-            }
 
-            }
+             after(grammarAccess.getNodeClassAccess().getRuntimeRuntimeClassFQNParserRuleCall_4_0_2_0_1()); 
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getNodeClassAccess().getRuntimeRuntimeClassCrossReference_4_0_2_0()); 
             }
 
+             after(grammarAccess.getNodeClassAccess().getRuntimeRuntimeClassCrossReference_4_0_2_0()); 
+
             }
 
 
@@ -17161,29 +16120,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeClass__PriominAssignment_4_1_2"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5965:1: rule__NodeClass__PriominAssignment_4_1_2 : ( ruleInteger ) ;
+    // InternalETPhys.g:5964:1: rule__NodeClass__PriominAssignment_4_1_2 : ( ruleInteger ) ;
     public final void rule__NodeClass__PriominAssignment_4_1_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5969:1: ( ( ruleInteger ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5970:1: ( ruleInteger )
+            // InternalETPhys.g:5968:1: ( ( ruleInteger ) )
+            // InternalETPhys.g:5969:1: ( ruleInteger )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5970:1: ( ruleInteger )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5971:1: ruleInteger
+            // InternalETPhys.g:5969:1: ( ruleInteger )
+            // InternalETPhys.g:5970:1: ruleInteger
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getNodeClassAccess().getPriominIntegerParserRuleCall_4_1_2_0()); 
-            }
-            pushFollow(FOLLOW_ruleInteger_in_rule__NodeClass__PriominAssignment_4_1_212445);
+             before(grammarAccess.getNodeClassAccess().getPriominIntegerParserRuleCall_4_1_2_0()); 
+            pushFollow(FOLLOW_2);
             ruleInteger();
 
             state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getNodeClassAccess().getPriominIntegerParserRuleCall_4_1_2_0()); 
-            }
+
+             after(grammarAccess.getNodeClassAccess().getPriominIntegerParserRuleCall_4_1_2_0()); 
 
             }
 
@@ -17206,29 +16161,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeClass__PriomaxAssignment_4_2_2"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5980:1: rule__NodeClass__PriomaxAssignment_4_2_2 : ( ruleInteger ) ;
+    // InternalETPhys.g:5979:1: rule__NodeClass__PriomaxAssignment_4_2_2 : ( ruleInteger ) ;
     public final void rule__NodeClass__PriomaxAssignment_4_2_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5984:1: ( ( ruleInteger ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5985:1: ( ruleInteger )
+            // InternalETPhys.g:5983:1: ( ( ruleInteger ) )
+            // InternalETPhys.g:5984:1: ( ruleInteger )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5985:1: ( ruleInteger )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5986:1: ruleInteger
+            // InternalETPhys.g:5984:1: ( ruleInteger )
+            // InternalETPhys.g:5985:1: ruleInteger
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getNodeClassAccess().getPriomaxIntegerParserRuleCall_4_2_2_0()); 
-            }
-            pushFollow(FOLLOW_ruleInteger_in_rule__NodeClass__PriomaxAssignment_4_2_212476);
+             before(grammarAccess.getNodeClassAccess().getPriomaxIntegerParserRuleCall_4_2_2_0()); 
+            pushFollow(FOLLOW_2);
             ruleInteger();
 
             state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getNodeClassAccess().getPriomaxIntegerParserRuleCall_4_2_2_0()); 
-            }
+
+             after(grammarAccess.getNodeClassAccess().getPriomaxIntegerParserRuleCall_4_2_2_0()); 
 
             }
 
@@ -17251,29 +16202,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NodeClass__ThreadsAssignment_5"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5995:1: rule__NodeClass__ThreadsAssignment_5 : ( rulePhysicalThread ) ;
+    // InternalETPhys.g:5994:1: rule__NodeClass__ThreadsAssignment_5 : ( rulePhysicalThread ) ;
     public final void rule__NodeClass__ThreadsAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5999:1: ( ( rulePhysicalThread ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6000:1: ( rulePhysicalThread )
+            // InternalETPhys.g:5998:1: ( ( rulePhysicalThread ) )
+            // InternalETPhys.g:5999:1: ( rulePhysicalThread )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6000:1: ( rulePhysicalThread )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6001:1: rulePhysicalThread
+            // InternalETPhys.g:5999:1: ( rulePhysicalThread )
+            // InternalETPhys.g:6000:1: rulePhysicalThread
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getNodeClassAccess().getThreadsPhysicalThreadParserRuleCall_5_0()); 
-            }
-            pushFollow(FOLLOW_rulePhysicalThread_in_rule__NodeClass__ThreadsAssignment_512507);
+             before(grammarAccess.getNodeClassAccess().getThreadsPhysicalThreadParserRuleCall_5_0()); 
+            pushFollow(FOLLOW_2);
             rulePhysicalThread();
 
             state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getNodeClassAccess().getThreadsPhysicalThreadParserRuleCall_5_0()); 
-            }
+
+             after(grammarAccess.getNodeClassAccess().getThreadsPhysicalThreadParserRuleCall_5_0()); 
 
             }
 
@@ -17296,37 +16243,29 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__DefaultAssignment_0_0"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6010:1: rule__PhysicalThread__DefaultAssignment_0_0 : ( ( 'DefaultThread' ) ) ;
+    // InternalETPhys.g:6009:1: rule__PhysicalThread__DefaultAssignment_0_0 : ( ( 'DefaultThread' ) ) ;
     public final void rule__PhysicalThread__DefaultAssignment_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6014:1: ( ( ( 'DefaultThread' ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6015:1: ( ( 'DefaultThread' ) )
+            // InternalETPhys.g:6013:1: ( ( ( 'DefaultThread' ) ) )
+            // InternalETPhys.g:6014:1: ( ( 'DefaultThread' ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6015:1: ( ( 'DefaultThread' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6016:1: ( 'DefaultThread' )
+            // InternalETPhys.g:6014:1: ( ( 'DefaultThread' ) )
+            // InternalETPhys.g:6015:1: ( 'DefaultThread' )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalThreadAccess().getDefaultDefaultThreadKeyword_0_0_0()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6017:1: ( 'DefaultThread' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6018:1: 'DefaultThread'
+             before(grammarAccess.getPhysicalThreadAccess().getDefaultDefaultThreadKeyword_0_0_0()); 
+            // InternalETPhys.g:6016:1: ( 'DefaultThread' )
+            // InternalETPhys.g:6017:1: 'DefaultThread'
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalThreadAccess().getDefaultDefaultThreadKeyword_0_0_0()); 
-            }
-            match(input,59,FOLLOW_59_in_rule__PhysicalThread__DefaultAssignment_0_012543); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalThreadAccess().getDefaultDefaultThreadKeyword_0_0_0()); 
-            }
+             before(grammarAccess.getPhysicalThreadAccess().getDefaultDefaultThreadKeyword_0_0_0()); 
+            match(input,59,FOLLOW_2); 
+             after(grammarAccess.getPhysicalThreadAccess().getDefaultDefaultThreadKeyword_0_0_0()); 
 
             }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalThreadAccess().getDefaultDefaultThreadKeyword_0_0_0()); 
-            }
+             after(grammarAccess.getPhysicalThreadAccess().getDefaultDefaultThreadKeyword_0_0_0()); 
 
             }
 
@@ -17349,25 +16288,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__NameAssignment_1"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6033:1: rule__PhysicalThread__NameAssignment_1 : ( RULE_ID ) ;
+    // InternalETPhys.g:6032:1: rule__PhysicalThread__NameAssignment_1 : ( RULE_ID ) ;
     public final void rule__PhysicalThread__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6037:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6038:1: ( RULE_ID )
+            // InternalETPhys.g:6036:1: ( ( RULE_ID ) )
+            // InternalETPhys.g:6037:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6038:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6039:1: RULE_ID
+            // InternalETPhys.g:6037:1: ( RULE_ID )
+            // InternalETPhys.g:6038:1: RULE_ID
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalThreadAccess().getNameIDTerminalRuleCall_1_0()); 
-            }
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__PhysicalThread__NameAssignment_112582); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalThreadAccess().getNameIDTerminalRuleCall_1_0()); 
-            }
+             before(grammarAccess.getPhysicalThreadAccess().getNameIDTerminalRuleCall_1_0()); 
+            match(input,RULE_ID,FOLLOW_2); 
+             after(grammarAccess.getPhysicalThreadAccess().getNameIDTerminalRuleCall_1_0()); 
 
             }
 
@@ -17390,29 +16325,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__ExecmodeAssignment_3_0_2"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6048:1: rule__PhysicalThread__ExecmodeAssignment_3_0_2 : ( ruleExecMode ) ;
+    // InternalETPhys.g:6047:1: rule__PhysicalThread__ExecmodeAssignment_3_0_2 : ( ruleExecMode ) ;
     public final void rule__PhysicalThread__ExecmodeAssignment_3_0_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6052:1: ( ( ruleExecMode ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6053:1: ( ruleExecMode )
+            // InternalETPhys.g:6051:1: ( ( ruleExecMode ) )
+            // InternalETPhys.g:6052:1: ( ruleExecMode )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6053:1: ( ruleExecMode )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6054:1: ruleExecMode
+            // InternalETPhys.g:6052:1: ( ruleExecMode )
+            // InternalETPhys.g:6053:1: ruleExecMode
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalThreadAccess().getExecmodeExecModeEnumRuleCall_3_0_2_0()); 
-            }
-            pushFollow(FOLLOW_ruleExecMode_in_rule__PhysicalThread__ExecmodeAssignment_3_0_212613);
+             before(grammarAccess.getPhysicalThreadAccess().getExecmodeExecModeEnumRuleCall_3_0_2_0()); 
+            pushFollow(FOLLOW_2);
             ruleExecMode();
 
             state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalThreadAccess().getExecmodeExecModeEnumRuleCall_3_0_2_0()); 
-            }
+
+             after(grammarAccess.getPhysicalThreadAccess().getExecmodeExecModeEnumRuleCall_3_0_2_0()); 
 
             }
 
@@ -17435,29 +16366,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__TimeAssignment_3_1_2"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6063:1: rule__PhysicalThread__TimeAssignment_3_1_2 : ( ruleTIME ) ;
+    // InternalETPhys.g:6062:1: rule__PhysicalThread__TimeAssignment_3_1_2 : ( ruleTIME ) ;
     public final void rule__PhysicalThread__TimeAssignment_3_1_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6067:1: ( ( ruleTIME ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6068:1: ( ruleTIME )
+            // InternalETPhys.g:6066:1: ( ( ruleTIME ) )
+            // InternalETPhys.g:6067:1: ( ruleTIME )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6068:1: ( ruleTIME )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6069:1: ruleTIME
+            // InternalETPhys.g:6067:1: ( ruleTIME )
+            // InternalETPhys.g:6068:1: ruleTIME
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalThreadAccess().getTimeTIMEParserRuleCall_3_1_2_0()); 
-            }
-            pushFollow(FOLLOW_ruleTIME_in_rule__PhysicalThread__TimeAssignment_3_1_212644);
+             before(grammarAccess.getPhysicalThreadAccess().getTimeTIMEParserRuleCall_3_1_2_0()); 
+            pushFollow(FOLLOW_2);
             ruleTIME();
 
             state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalThreadAccess().getTimeTIMEParserRuleCall_3_1_2_0()); 
-            }
+
+             after(grammarAccess.getPhysicalThreadAccess().getTimeTIMEParserRuleCall_3_1_2_0()); 
 
             }
 
@@ -17480,29 +16407,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__PrioAssignment_3_2_2"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6078:1: rule__PhysicalThread__PrioAssignment_3_2_2 : ( ruleInteger ) ;
+    // InternalETPhys.g:6077:1: rule__PhysicalThread__PrioAssignment_3_2_2 : ( ruleInteger ) ;
     public final void rule__PhysicalThread__PrioAssignment_3_2_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6082:1: ( ( ruleInteger ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6083:1: ( ruleInteger )
+            // InternalETPhys.g:6081:1: ( ( ruleInteger ) )
+            // InternalETPhys.g:6082:1: ( ruleInteger )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6083:1: ( ruleInteger )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6084:1: ruleInteger
+            // InternalETPhys.g:6082:1: ( ruleInteger )
+            // InternalETPhys.g:6083:1: ruleInteger
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalThreadAccess().getPrioIntegerParserRuleCall_3_2_2_0()); 
-            }
-            pushFollow(FOLLOW_ruleInteger_in_rule__PhysicalThread__PrioAssignment_3_2_212675);
+             before(grammarAccess.getPhysicalThreadAccess().getPrioIntegerParserRuleCall_3_2_2_0()); 
+            pushFollow(FOLLOW_2);
             ruleInteger();
 
             state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalThreadAccess().getPrioIntegerParserRuleCall_3_2_2_0()); 
-            }
+
+             after(grammarAccess.getPhysicalThreadAccess().getPrioIntegerParserRuleCall_3_2_2_0()); 
 
             }
 
@@ -17525,25 +16448,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__StacksizeAssignment_3_3_2"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6093:1: rule__PhysicalThread__StacksizeAssignment_3_3_2 : ( RULE_INT ) ;
+    // InternalETPhys.g:6092:1: rule__PhysicalThread__StacksizeAssignment_3_3_2 : ( RULE_INT ) ;
     public final void rule__PhysicalThread__StacksizeAssignment_3_3_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6097:1: ( ( RULE_INT ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6098:1: ( RULE_INT )
+            // InternalETPhys.g:6096:1: ( ( RULE_INT ) )
+            // InternalETPhys.g:6097:1: ( RULE_INT )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6098:1: ( RULE_INT )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6099:1: RULE_INT
+            // InternalETPhys.g:6097:1: ( RULE_INT )
+            // InternalETPhys.g:6098:1: RULE_INT
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalThreadAccess().getStacksizeINTTerminalRuleCall_3_3_2_0()); 
-            }
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__PhysicalThread__StacksizeAssignment_3_3_212706); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalThreadAccess().getStacksizeINTTerminalRuleCall_3_3_2_0()); 
-            }
+             before(grammarAccess.getPhysicalThreadAccess().getStacksizeINTTerminalRuleCall_3_3_2_0()); 
+            match(input,RULE_INT,FOLLOW_2); 
+             after(grammarAccess.getPhysicalThreadAccess().getStacksizeINTTerminalRuleCall_3_3_2_0()); 
 
             }
 
@@ -17566,25 +16485,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__MsgblocksizeAssignment_3_4_2"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6108:1: rule__PhysicalThread__MsgblocksizeAssignment_3_4_2 : ( RULE_INT ) ;
+    // InternalETPhys.g:6107:1: rule__PhysicalThread__MsgblocksizeAssignment_3_4_2 : ( RULE_INT ) ;
     public final void rule__PhysicalThread__MsgblocksizeAssignment_3_4_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6112:1: ( ( RULE_INT ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6113:1: ( RULE_INT )
+            // InternalETPhys.g:6111:1: ( ( RULE_INT ) )
+            // InternalETPhys.g:6112:1: ( RULE_INT )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6113:1: ( RULE_INT )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6114:1: RULE_INT
+            // InternalETPhys.g:6112:1: ( RULE_INT )
+            // InternalETPhys.g:6113:1: RULE_INT
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalThreadAccess().getMsgblocksizeINTTerminalRuleCall_3_4_2_0()); 
-            }
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__PhysicalThread__MsgblocksizeAssignment_3_4_212737); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalThreadAccess().getMsgblocksizeINTTerminalRuleCall_3_4_2_0()); 
-            }
+             before(grammarAccess.getPhysicalThreadAccess().getMsgblocksizeINTTerminalRuleCall_3_4_2_0()); 
+            match(input,RULE_INT,FOLLOW_2); 
+             after(grammarAccess.getPhysicalThreadAccess().getMsgblocksizeINTTerminalRuleCall_3_4_2_0()); 
 
             }
 
@@ -17607,25 +16522,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PhysicalThread__MsgpoolsizeAssignment_3_5_2"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6123:1: rule__PhysicalThread__MsgpoolsizeAssignment_3_5_2 : ( RULE_INT ) ;
+    // InternalETPhys.g:6122:1: rule__PhysicalThread__MsgpoolsizeAssignment_3_5_2 : ( RULE_INT ) ;
     public final void rule__PhysicalThread__MsgpoolsizeAssignment_3_5_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6127:1: ( ( RULE_INT ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6128:1: ( RULE_INT )
+            // InternalETPhys.g:6126:1: ( ( RULE_INT ) )
+            // InternalETPhys.g:6127:1: ( RULE_INT )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6128:1: ( RULE_INT )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6129:1: RULE_INT
+            // InternalETPhys.g:6127:1: ( RULE_INT )
+            // InternalETPhys.g:6128:1: RULE_INT
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getPhysicalThreadAccess().getMsgpoolsizeINTTerminalRuleCall_3_5_2_0()); 
-            }
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__PhysicalThread__MsgpoolsizeAssignment_3_5_212768); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getPhysicalThreadAccess().getMsgpoolsizeINTTerminalRuleCall_3_5_2_0()); 
-            }
+             before(grammarAccess.getPhysicalThreadAccess().getMsgpoolsizeINTTerminalRuleCall_3_5_2_0()); 
+            match(input,RULE_INT,FOLLOW_2); 
+             after(grammarAccess.getPhysicalThreadAccess().getMsgpoolsizeINTTerminalRuleCall_3_5_2_0()); 
 
             }
 
@@ -17648,25 +16559,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RuntimeClass__NameAssignment_1"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6138:1: rule__RuntimeClass__NameAssignment_1 : ( RULE_ID ) ;
+    // InternalETPhys.g:6137:1: rule__RuntimeClass__NameAssignment_1 : ( RULE_ID ) ;
     public final void rule__RuntimeClass__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6142:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6143:1: ( RULE_ID )
+            // InternalETPhys.g:6141:1: ( ( RULE_ID ) )
+            // InternalETPhys.g:6142:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6143:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6144:1: RULE_ID
+            // InternalETPhys.g:6142:1: ( RULE_ID )
+            // InternalETPhys.g:6143:1: RULE_ID
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getRuntimeClassAccess().getNameIDTerminalRuleCall_1_0()); 
-            }
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__RuntimeClass__NameAssignment_112799); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getRuntimeClassAccess().getNameIDTerminalRuleCall_1_0()); 
-            }
+             before(grammarAccess.getRuntimeClassAccess().getNameIDTerminalRuleCall_1_0()); 
+            match(input,RULE_ID,FOLLOW_2); 
+             after(grammarAccess.getRuntimeClassAccess().getNameIDTerminalRuleCall_1_0()); 
 
             }
 
@@ -17689,29 +16596,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RuntimeClass__DocuAssignment_2"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6153:1: rule__RuntimeClass__DocuAssignment_2 : ( ruleDocumentation ) ;
+    // InternalETPhys.g:6152:1: rule__RuntimeClass__DocuAssignment_2 : ( ruleDocumentation ) ;
     public final void rule__RuntimeClass__DocuAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6157:1: ( ( ruleDocumentation ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6158:1: ( ruleDocumentation )
+            // InternalETPhys.g:6156:1: ( ( ruleDocumentation ) )
+            // InternalETPhys.g:6157:1: ( ruleDocumentation )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6158:1: ( ruleDocumentation )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6159:1: ruleDocumentation
+            // InternalETPhys.g:6157:1: ( ruleDocumentation )
+            // InternalETPhys.g:6158:1: ruleDocumentation
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getRuntimeClassAccess().getDocuDocumentationParserRuleCall_2_0()); 
-            }
-            pushFollow(FOLLOW_ruleDocumentation_in_rule__RuntimeClass__DocuAssignment_212830);
+             before(grammarAccess.getRuntimeClassAccess().getDocuDocumentationParserRuleCall_2_0()); 
+            pushFollow(FOLLOW_2);
             ruleDocumentation();
 
             state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getRuntimeClassAccess().getDocuDocumentationParserRuleCall_2_0()); 
-            }
+
+             after(grammarAccess.getRuntimeClassAccess().getDocuDocumentationParserRuleCall_2_0()); 
 
             }
 
@@ -17734,29 +16637,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RuntimeClass__ThreadModelAssignment_6"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6168:1: rule__RuntimeClass__ThreadModelAssignment_6 : ( ruleThreadModel ) ;
+    // InternalETPhys.g:6167:1: rule__RuntimeClass__ThreadModelAssignment_6 : ( ruleThreadModel ) ;
     public final void rule__RuntimeClass__ThreadModelAssignment_6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6172:1: ( ( ruleThreadModel ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6173:1: ( ruleThreadModel )
+            // InternalETPhys.g:6171:1: ( ( ruleThreadModel ) )
+            // InternalETPhys.g:6172:1: ( ruleThreadModel )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6173:1: ( ruleThreadModel )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6174:1: ruleThreadModel
+            // InternalETPhys.g:6172:1: ( ruleThreadModel )
+            // InternalETPhys.g:6173:1: ruleThreadModel
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getRuntimeClassAccess().getThreadModelThreadModelEnumRuleCall_6_0()); 
-            }
-            pushFollow(FOLLOW_ruleThreadModel_in_rule__RuntimeClass__ThreadModelAssignment_612861);
+             before(grammarAccess.getRuntimeClassAccess().getThreadModelThreadModelEnumRuleCall_6_0()); 
+            pushFollow(FOLLOW_2);
             ruleThreadModel();
 
             state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getRuntimeClassAccess().getThreadModelThreadModelEnumRuleCall_6_0()); 
-            }
+
+             after(grammarAccess.getRuntimeClassAccess().getThreadModelThreadModelEnumRuleCall_6_0()); 
 
             }
 
@@ -17779,25 +16678,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__KeyValue__KeyAssignment_0"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6186:1: rule__KeyValue__KeyAssignment_0 : ( RULE_ID ) ;
+    // InternalETPhys.g:6185:1: rule__KeyValue__KeyAssignment_0 : ( RULE_ID ) ;
     public final void rule__KeyValue__KeyAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6190:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6191:1: ( RULE_ID )
+            // InternalETPhys.g:6189:1: ( ( RULE_ID ) )
+            // InternalETPhys.g:6190:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6191:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6192:1: RULE_ID
+            // InternalETPhys.g:6190:1: ( RULE_ID )
+            // InternalETPhys.g:6191:1: RULE_ID
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getKeyValueAccess().getKeyIDTerminalRuleCall_0_0()); 
-            }
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__KeyValue__KeyAssignment_012895); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getKeyValueAccess().getKeyIDTerminalRuleCall_0_0()); 
-            }
+             before(grammarAccess.getKeyValueAccess().getKeyIDTerminalRuleCall_0_0()); 
+            match(input,RULE_ID,FOLLOW_2); 
+             after(grammarAccess.getKeyValueAccess().getKeyIDTerminalRuleCall_0_0()); 
 
             }
 
@@ -17820,29 +16715,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__KeyValue__ValueAssignment_2"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6201:1: rule__KeyValue__ValueAssignment_2 : ( ruleLiteral ) ;
+    // InternalETPhys.g:6200:1: rule__KeyValue__ValueAssignment_2 : ( ruleLiteral ) ;
     public final void rule__KeyValue__ValueAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6205:1: ( ( ruleLiteral ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6206:1: ( ruleLiteral )
+            // InternalETPhys.g:6204:1: ( ( ruleLiteral ) )
+            // InternalETPhys.g:6205:1: ( ruleLiteral )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6206:1: ( ruleLiteral )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6207:1: ruleLiteral
+            // InternalETPhys.g:6205:1: ( ruleLiteral )
+            // InternalETPhys.g:6206:1: ruleLiteral
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getKeyValueAccess().getValueLiteralParserRuleCall_2_0()); 
-            }
-            pushFollow(FOLLOW_ruleLiteral_in_rule__KeyValue__ValueAssignment_212926);
+             before(grammarAccess.getKeyValueAccess().getValueLiteralParserRuleCall_2_0()); 
+            pushFollow(FOLLOW_2);
             ruleLiteral();
 
             state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getKeyValueAccess().getValueLiteralParserRuleCall_2_0()); 
-            }
+
+             after(grammarAccess.getKeyValueAccess().getValueLiteralParserRuleCall_2_0()); 
 
             }
 
@@ -17865,37 +16756,29 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__OptionalAssignment_0_0"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6222:1: rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 : ( ( 'optional' ) ) ;
+    // InternalETPhys.g:6221:1: rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 : ( ( 'optional' ) ) ;
     public final void rule__SimpleAnnotationAttribute__OptionalAssignment_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6226:1: ( ( ( 'optional' ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6227:1: ( ( 'optional' ) )
+            // InternalETPhys.g:6225:1: ( ( ( 'optional' ) ) )
+            // InternalETPhys.g:6226:1: ( ( 'optional' ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6227:1: ( ( 'optional' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6228:1: ( 'optional' )
+            // InternalETPhys.g:6226:1: ( ( 'optional' ) )
+            // InternalETPhys.g:6227:1: ( 'optional' )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getSimpleAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6229:1: ( 'optional' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6230:1: 'optional'
+             before(grammarAccess.getSimpleAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0()); 
+            // InternalETPhys.g:6228:1: ( 'optional' )
+            // InternalETPhys.g:6229:1: 'optional'
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getSimpleAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0()); 
-            }
-            match(input,60,FOLLOW_60_in_rule__SimpleAnnotationAttribute__OptionalAssignment_0_012968); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getSimpleAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0()); 
-            }
+             before(grammarAccess.getSimpleAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0()); 
+            match(input,60,FOLLOW_2); 
+             after(grammarAccess.getSimpleAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0()); 
 
             }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getSimpleAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0()); 
-            }
+             after(grammarAccess.getSimpleAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0()); 
 
             }
 
@@ -17918,25 +16801,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__NameAssignment_2"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6245:1: rule__SimpleAnnotationAttribute__NameAssignment_2 : ( RULE_ID ) ;
+    // InternalETPhys.g:6244:1: rule__SimpleAnnotationAttribute__NameAssignment_2 : ( RULE_ID ) ;
     public final void rule__SimpleAnnotationAttribute__NameAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6249:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6250:1: ( RULE_ID )
+            // InternalETPhys.g:6248:1: ( ( RULE_ID ) )
+            // InternalETPhys.g:6249:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6250:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6251:1: RULE_ID
+            // InternalETPhys.g:6249:1: ( RULE_ID )
+            // InternalETPhys.g:6250:1: RULE_ID
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getSimpleAnnotationAttributeAccess().getNameIDTerminalRuleCall_2_0()); 
-            }
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__SimpleAnnotationAttribute__NameAssignment_213007); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getSimpleAnnotationAttributeAccess().getNameIDTerminalRuleCall_2_0()); 
-            }
+             before(grammarAccess.getSimpleAnnotationAttributeAccess().getNameIDTerminalRuleCall_2_0()); 
+            match(input,RULE_ID,FOLLOW_2); 
+             after(grammarAccess.getSimpleAnnotationAttributeAccess().getNameIDTerminalRuleCall_2_0()); 
 
             }
 
@@ -17959,29 +16838,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__TypeAssignment_4"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6260:1: rule__SimpleAnnotationAttribute__TypeAssignment_4 : ( ruleLiteralType ) ;
+    // InternalETPhys.g:6259:1: rule__SimpleAnnotationAttribute__TypeAssignment_4 : ( ruleLiteralType ) ;
     public final void rule__SimpleAnnotationAttribute__TypeAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6264:1: ( ( ruleLiteralType ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6265:1: ( ruleLiteralType )
+            // InternalETPhys.g:6263:1: ( ( ruleLiteralType ) )
+            // InternalETPhys.g:6264:1: ( ruleLiteralType )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6265:1: ( ruleLiteralType )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6266:1: ruleLiteralType
+            // InternalETPhys.g:6264:1: ( ruleLiteralType )
+            // InternalETPhys.g:6265:1: ruleLiteralType
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getSimpleAnnotationAttributeAccess().getTypeLiteralTypeEnumRuleCall_4_0()); 
-            }
-            pushFollow(FOLLOW_ruleLiteralType_in_rule__SimpleAnnotationAttribute__TypeAssignment_413038);
+             before(grammarAccess.getSimpleAnnotationAttributeAccess().getTypeLiteralTypeEnumRuleCall_4_0()); 
+            pushFollow(FOLLOW_2);
             ruleLiteralType();
 
             state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getSimpleAnnotationAttributeAccess().getTypeLiteralTypeEnumRuleCall_4_0()); 
-            }
+
+             after(grammarAccess.getSimpleAnnotationAttributeAccess().getTypeLiteralTypeEnumRuleCall_4_0()); 
 
             }
 
@@ -18004,37 +16879,29 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__OptionalAssignment_0_0"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6275:1: rule__EnumAnnotationAttribute__OptionalAssignment_0_0 : ( ( 'optional' ) ) ;
+    // InternalETPhys.g:6274:1: rule__EnumAnnotationAttribute__OptionalAssignment_0_0 : ( ( 'optional' ) ) ;
     public final void rule__EnumAnnotationAttribute__OptionalAssignment_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6279:1: ( ( ( 'optional' ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6280:1: ( ( 'optional' ) )
+            // InternalETPhys.g:6278:1: ( ( ( 'optional' ) ) )
+            // InternalETPhys.g:6279:1: ( ( 'optional' ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6280:1: ( ( 'optional' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6281:1: ( 'optional' )
+            // InternalETPhys.g:6279:1: ( ( 'optional' ) )
+            // InternalETPhys.g:6280:1: ( 'optional' )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getEnumAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6282:1: ( 'optional' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6283:1: 'optional'
+             before(grammarAccess.getEnumAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0()); 
+            // InternalETPhys.g:6281:1: ( 'optional' )
+            // InternalETPhys.g:6282:1: 'optional'
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getEnumAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0()); 
-            }
-            match(input,60,FOLLOW_60_in_rule__EnumAnnotationAttribute__OptionalAssignment_0_013074); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getEnumAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0()); 
-            }
+             before(grammarAccess.getEnumAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0()); 
+            match(input,60,FOLLOW_2); 
+             after(grammarAccess.getEnumAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0()); 
 
             }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getEnumAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0()); 
-            }
+             after(grammarAccess.getEnumAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0()); 
 
             }
 
@@ -18057,25 +16924,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__NameAssignment_2"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6298:1: rule__EnumAnnotationAttribute__NameAssignment_2 : ( RULE_ID ) ;
+    // InternalETPhys.g:6297:1: rule__EnumAnnotationAttribute__NameAssignment_2 : ( RULE_ID ) ;
     public final void rule__EnumAnnotationAttribute__NameAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6302:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6303:1: ( RULE_ID )
+            // InternalETPhys.g:6301:1: ( ( RULE_ID ) )
+            // InternalETPhys.g:6302:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6303:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6304:1: RULE_ID
+            // InternalETPhys.g:6302:1: ( RULE_ID )
+            // InternalETPhys.g:6303:1: RULE_ID
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getEnumAnnotationAttributeAccess().getNameIDTerminalRuleCall_2_0()); 
-            }
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__EnumAnnotationAttribute__NameAssignment_213113); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getEnumAnnotationAttributeAccess().getNameIDTerminalRuleCall_2_0()); 
-            }
+             before(grammarAccess.getEnumAnnotationAttributeAccess().getNameIDTerminalRuleCall_2_0()); 
+            match(input,RULE_ID,FOLLOW_2); 
+             after(grammarAccess.getEnumAnnotationAttributeAccess().getNameIDTerminalRuleCall_2_0()); 
 
             }
 
@@ -18098,25 +16961,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__ValuesAssignment_5"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6313:1: rule__EnumAnnotationAttribute__ValuesAssignment_5 : ( RULE_STRING ) ;
+    // InternalETPhys.g:6312:1: rule__EnumAnnotationAttribute__ValuesAssignment_5 : ( RULE_STRING ) ;
     public final void rule__EnumAnnotationAttribute__ValuesAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6317:1: ( ( RULE_STRING ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6318:1: ( RULE_STRING )
+            // InternalETPhys.g:6316:1: ( ( RULE_STRING ) )
+            // InternalETPhys.g:6317:1: ( RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6318:1: ( RULE_STRING )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6319:1: RULE_STRING
+            // InternalETPhys.g:6317:1: ( RULE_STRING )
+            // InternalETPhys.g:6318:1: RULE_STRING
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getEnumAnnotationAttributeAccess().getValuesSTRINGTerminalRuleCall_5_0()); 
-            }
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__EnumAnnotationAttribute__ValuesAssignment_513144); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getEnumAnnotationAttributeAccess().getValuesSTRINGTerminalRuleCall_5_0()); 
-            }
+             before(grammarAccess.getEnumAnnotationAttributeAccess().getValuesSTRINGTerminalRuleCall_5_0()); 
+            match(input,RULE_STRING,FOLLOW_2); 
+             after(grammarAccess.getEnumAnnotationAttributeAccess().getValuesSTRINGTerminalRuleCall_5_0()); 
 
             }
 
@@ -18139,25 +16998,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__ValuesAssignment_6_1"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6328:1: rule__EnumAnnotationAttribute__ValuesAssignment_6_1 : ( RULE_STRING ) ;
+    // InternalETPhys.g:6327:1: rule__EnumAnnotationAttribute__ValuesAssignment_6_1 : ( RULE_STRING ) ;
     public final void rule__EnumAnnotationAttribute__ValuesAssignment_6_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6332:1: ( ( RULE_STRING ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6333:1: ( RULE_STRING )
+            // InternalETPhys.g:6331:1: ( ( RULE_STRING ) )
+            // InternalETPhys.g:6332:1: ( RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6333:1: ( RULE_STRING )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6334:1: RULE_STRING
+            // InternalETPhys.g:6332:1: ( RULE_STRING )
+            // InternalETPhys.g:6333:1: RULE_STRING
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getEnumAnnotationAttributeAccess().getValuesSTRINGTerminalRuleCall_6_1_0()); 
-            }
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__EnumAnnotationAttribute__ValuesAssignment_6_113175); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getEnumAnnotationAttributeAccess().getValuesSTRINGTerminalRuleCall_6_1_0()); 
-            }
+             before(grammarAccess.getEnumAnnotationAttributeAccess().getValuesSTRINGTerminalRuleCall_6_1_0()); 
+            match(input,RULE_STRING,FOLLOW_2); 
+             after(grammarAccess.getEnumAnnotationAttributeAccess().getValuesSTRINGTerminalRuleCall_6_1_0()); 
 
             }
 
@@ -18180,29 +17035,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Import__ImportedNamespaceAssignment_1_0_0"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6343:1: rule__Import__ImportedNamespaceAssignment_1_0_0 : ( ruleImportedFQN ) ;
+    // InternalETPhys.g:6342:1: rule__Import__ImportedNamespaceAssignment_1_0_0 : ( ruleImportedFQN ) ;
     public final void rule__Import__ImportedNamespaceAssignment_1_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6347:1: ( ( ruleImportedFQN ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6348:1: ( ruleImportedFQN )
+            // InternalETPhys.g:6346:1: ( ( ruleImportedFQN ) )
+            // InternalETPhys.g:6347:1: ( ruleImportedFQN )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6348:1: ( ruleImportedFQN )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6349:1: ruleImportedFQN
+            // InternalETPhys.g:6347:1: ( ruleImportedFQN )
+            // InternalETPhys.g:6348:1: ruleImportedFQN
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getImportAccess().getImportedNamespaceImportedFQNParserRuleCall_1_0_0_0()); 
-            }
-            pushFollow(FOLLOW_ruleImportedFQN_in_rule__Import__ImportedNamespaceAssignment_1_0_013206);
+             before(grammarAccess.getImportAccess().getImportedNamespaceImportedFQNParserRuleCall_1_0_0_0()); 
+            pushFollow(FOLLOW_2);
             ruleImportedFQN();
 
             state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getImportAccess().getImportedNamespaceImportedFQNParserRuleCall_1_0_0_0()); 
-            }
+
+             after(grammarAccess.getImportAccess().getImportedNamespaceImportedFQNParserRuleCall_1_0_0_0()); 
 
             }
 
@@ -18225,25 +17076,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Import__ImportURIAssignment_2"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6358:1: rule__Import__ImportURIAssignment_2 : ( RULE_STRING ) ;
+    // InternalETPhys.g:6357:1: rule__Import__ImportURIAssignment_2 : ( RULE_STRING ) ;
     public final void rule__Import__ImportURIAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6362:1: ( ( RULE_STRING ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6363:1: ( RULE_STRING )
+            // InternalETPhys.g:6361:1: ( ( RULE_STRING ) )
+            // InternalETPhys.g:6362:1: ( RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6363:1: ( RULE_STRING )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6364:1: RULE_STRING
+            // InternalETPhys.g:6362:1: ( RULE_STRING )
+            // InternalETPhys.g:6363:1: RULE_STRING
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getImportAccess().getImportURISTRINGTerminalRuleCall_2_0()); 
-            }
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__Import__ImportURIAssignment_213237); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getImportAccess().getImportURISTRINGTerminalRuleCall_2_0()); 
-            }
+             before(grammarAccess.getImportAccess().getImportURISTRINGTerminalRuleCall_2_0()); 
+            match(input,RULE_STRING,FOLLOW_2); 
+             after(grammarAccess.getImportAccess().getImportURISTRINGTerminalRuleCall_2_0()); 
 
             }
 
@@ -18266,25 +17113,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Documentation__LinesAssignment_2"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6373:1: rule__Documentation__LinesAssignment_2 : ( RULE_STRING ) ;
+    // InternalETPhys.g:6372:1: rule__Documentation__LinesAssignment_2 : ( RULE_STRING ) ;
     public final void rule__Documentation__LinesAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6377:1: ( ( RULE_STRING ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6378:1: ( RULE_STRING )
+            // InternalETPhys.g:6376:1: ( ( RULE_STRING ) )
+            // InternalETPhys.g:6377:1: ( RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6378:1: ( RULE_STRING )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6379:1: RULE_STRING
+            // InternalETPhys.g:6377:1: ( RULE_STRING )
+            // InternalETPhys.g:6378:1: RULE_STRING
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getDocumentationAccess().getLinesSTRINGTerminalRuleCall_2_0()); 
-            }
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__Documentation__LinesAssignment_213268); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getDocumentationAccess().getLinesSTRINGTerminalRuleCall_2_0()); 
-            }
+             before(grammarAccess.getDocumentationAccess().getLinesSTRINGTerminalRuleCall_2_0()); 
+            match(input,RULE_STRING,FOLLOW_2); 
+             after(grammarAccess.getDocumentationAccess().getLinesSTRINGTerminalRuleCall_2_0()); 
 
             }
 
@@ -18307,37 +17150,29 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__BooleanLiteral__IsTrueAssignment_1_1"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6390:1: rule__BooleanLiteral__IsTrueAssignment_1_1 : ( ( 'true' ) ) ;
+    // InternalETPhys.g:6389:1: rule__BooleanLiteral__IsTrueAssignment_1_1 : ( ( 'true' ) ) ;
     public final void rule__BooleanLiteral__IsTrueAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6394:1: ( ( ( 'true' ) ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6395:1: ( ( 'true' ) )
+            // InternalETPhys.g:6393:1: ( ( ( 'true' ) ) )
+            // InternalETPhys.g:6394:1: ( ( 'true' ) )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6395:1: ( ( 'true' ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6396:1: ( 'true' )
+            // InternalETPhys.g:6394:1: ( ( 'true' ) )
+            // InternalETPhys.g:6395:1: ( 'true' )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0()); 
-            }
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6397:1: ( 'true' )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6398:1: 'true'
+             before(grammarAccess.getBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0()); 
+            // InternalETPhys.g:6396:1: ( 'true' )
+            // InternalETPhys.g:6397:1: 'true'
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0()); 
-            }
-            match(input,61,FOLLOW_61_in_rule__BooleanLiteral__IsTrueAssignment_1_113306); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0()); 
-            }
+             before(grammarAccess.getBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0()); 
+            match(input,61,FOLLOW_2); 
+             after(grammarAccess.getBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0()); 
 
             }
 
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0()); 
-            }
+             after(grammarAccess.getBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0()); 
 
             }
 
@@ -18360,29 +17195,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RealLiteral__ValueAssignment_1"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6413:1: rule__RealLiteral__ValueAssignment_1 : ( ruleReal ) ;
+    // InternalETPhys.g:6412:1: rule__RealLiteral__ValueAssignment_1 : ( ruleReal ) ;
     public final void rule__RealLiteral__ValueAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6417:1: ( ( ruleReal ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6418:1: ( ruleReal )
+            // InternalETPhys.g:6416:1: ( ( ruleReal ) )
+            // InternalETPhys.g:6417:1: ( ruleReal )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6418:1: ( ruleReal )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6419:1: ruleReal
+            // InternalETPhys.g:6417:1: ( ruleReal )
+            // InternalETPhys.g:6418:1: ruleReal
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getRealLiteralAccess().getValueRealParserRuleCall_1_0()); 
-            }
-            pushFollow(FOLLOW_ruleReal_in_rule__RealLiteral__ValueAssignment_113345);
+             before(grammarAccess.getRealLiteralAccess().getValueRealParserRuleCall_1_0()); 
+            pushFollow(FOLLOW_2);
             ruleReal();
 
             state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getRealLiteralAccess().getValueRealParserRuleCall_1_0()); 
-            }
+
+             after(grammarAccess.getRealLiteralAccess().getValueRealParserRuleCall_1_0()); 
 
             }
 
@@ -18405,29 +17236,25 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__IntLiteral__ValueAssignment_1"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6428:1: rule__IntLiteral__ValueAssignment_1 : ( ruleInteger ) ;
+    // InternalETPhys.g:6427:1: rule__IntLiteral__ValueAssignment_1 : ( ruleInteger ) ;
     public final void rule__IntLiteral__ValueAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6432:1: ( ( ruleInteger ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6433:1: ( ruleInteger )
+            // InternalETPhys.g:6431:1: ( ( ruleInteger ) )
+            // InternalETPhys.g:6432:1: ( ruleInteger )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6433:1: ( ruleInteger )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6434:1: ruleInteger
+            // InternalETPhys.g:6432:1: ( ruleInteger )
+            // InternalETPhys.g:6433:1: ruleInteger
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getIntLiteralAccess().getValueIntegerParserRuleCall_1_0()); 
-            }
-            pushFollow(FOLLOW_ruleInteger_in_rule__IntLiteral__ValueAssignment_113376);
+             before(grammarAccess.getIntLiteralAccess().getValueIntegerParserRuleCall_1_0()); 
+            pushFollow(FOLLOW_2);
             ruleInteger();
 
             state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getIntLiteralAccess().getValueIntegerParserRuleCall_1_0()); 
-            }
+
+             after(grammarAccess.getIntLiteralAccess().getValueIntegerParserRuleCall_1_0()); 
 
             }
 
@@ -18450,25 +17277,21 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StringLiteral__ValueAssignment_1"
-    // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6443:1: rule__StringLiteral__ValueAssignment_1 : ( RULE_STRING ) ;
+    // InternalETPhys.g:6442:1: rule__StringLiteral__ValueAssignment_1 : ( RULE_STRING ) ;
     public final void rule__StringLiteral__ValueAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6447:1: ( ( RULE_STRING ) )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6448:1: ( RULE_STRING )
+            // InternalETPhys.g:6446:1: ( ( RULE_STRING ) )
+            // InternalETPhys.g:6447:1: ( RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6448:1: ( RULE_STRING )
-            // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6449:1: RULE_STRING
+            // InternalETPhys.g:6447:1: ( RULE_STRING )
+            // InternalETPhys.g:6448:1: RULE_STRING
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getStringLiteralAccess().getValueSTRINGTerminalRuleCall_1_0()); 
-            }
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__StringLiteral__ValueAssignment_113407); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getStringLiteralAccess().getValueSTRINGTerminalRuleCall_1_0()); 
-            }
+             before(grammarAccess.getStringLiteralAccess().getValueSTRINGTerminalRuleCall_1_0()); 
+            match(input,RULE_STRING,FOLLOW_2); 
+             after(grammarAccess.getStringLiteralAccess().getValueSTRINGTerminalRuleCall_1_0()); 
 
             }
 
@@ -18489,1191 +17312,55 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
     }
     // $ANTLR end "rule__StringLiteral__ValueAssignment_1"
 
-    // $ANTLR start synpred44_InternalETPhys
-    public final void synpred44_InternalETPhys_fragment() throws RecognitionException {   
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5418:4: ( ({...}? => ( ( ( rule__NodeClass__Group_4_0__0 ) ) ) ) )
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5418:4: ({...}? => ( ( ( rule__NodeClass__Group_4_0__0 ) ) ) )
-        {
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5418:4: ({...}? => ( ( ( rule__NodeClass__Group_4_0__0 ) ) ) )
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5419:5: {...}? => ( ( ( rule__NodeClass__Group_4_0__0 ) ) )
-        {
-        if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getNodeClassAccess().getUnorderedGroup_4(), 0) ) {
-            if (state.backtracking>0) {state.failed=true; return ;}
-            throw new FailedPredicateException(input, "synpred44_InternalETPhys", "getUnorderedGroupHelper().canSelect(grammarAccess.getNodeClassAccess().getUnorderedGroup_4(), 0)");
-        }
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5419:106: ( ( ( rule__NodeClass__Group_4_0__0 ) ) )
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5420:6: ( ( rule__NodeClass__Group_4_0__0 ) )
-        {
-        getUnorderedGroupHelper().select(grammarAccess.getNodeClassAccess().getUnorderedGroup_4(), 0);
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5426:6: ( ( rule__NodeClass__Group_4_0__0 ) )
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5428:7: ( rule__NodeClass__Group_4_0__0 )
-        {
-        if ( state.backtracking==0 ) {
-           before(grammarAccess.getNodeClassAccess().getGroup_4_0()); 
-        }
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5429:7: ( rule__NodeClass__Group_4_0__0 )
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5429:8: rule__NodeClass__Group_4_0__0
-        {
-        pushFollow(FOLLOW_rule__NodeClass__Group_4_0__0_in_synpred44_InternalETPhys10885);
-        rule__NodeClass__Group_4_0__0();
-
-        state._fsp--;
-        if (state.failed) return ;
-
-        }
-
-
-        }
-
-
-        }
-
-
-        }
-
-
-        }
-    }
-    // $ANTLR end synpred44_InternalETPhys
-
-    // $ANTLR start synpred45_InternalETPhys
-    public final void synpred45_InternalETPhys_fragment() throws RecognitionException {   
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5435:4: ( ({...}? => ( ( ( rule__NodeClass__Group_4_1__0 ) ) ) ) )
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5435:4: ({...}? => ( ( ( rule__NodeClass__Group_4_1__0 ) ) ) )
-        {
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5435:4: ({...}? => ( ( ( rule__NodeClass__Group_4_1__0 ) ) ) )
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5436:5: {...}? => ( ( ( rule__NodeClass__Group_4_1__0 ) ) )
-        {
-        if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getNodeClassAccess().getUnorderedGroup_4(), 1) ) {
-            if (state.backtracking>0) {state.failed=true; return ;}
-            throw new FailedPredicateException(input, "synpred45_InternalETPhys", "getUnorderedGroupHelper().canSelect(grammarAccess.getNodeClassAccess().getUnorderedGroup_4(), 1)");
-        }
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5436:106: ( ( ( rule__NodeClass__Group_4_1__0 ) ) )
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5437:6: ( ( rule__NodeClass__Group_4_1__0 ) )
-        {
-        getUnorderedGroupHelper().select(grammarAccess.getNodeClassAccess().getUnorderedGroup_4(), 1);
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5443:6: ( ( rule__NodeClass__Group_4_1__0 ) )
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5445:7: ( rule__NodeClass__Group_4_1__0 )
-        {
-        if ( state.backtracking==0 ) {
-           before(grammarAccess.getNodeClassAccess().getGroup_4_1()); 
-        }
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5446:7: ( rule__NodeClass__Group_4_1__0 )
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5446:8: rule__NodeClass__Group_4_1__0
-        {
-        pushFollow(FOLLOW_rule__NodeClass__Group_4_1__0_in_synpred45_InternalETPhys10976);
-        rule__NodeClass__Group_4_1__0();
-
-        state._fsp--;
-        if (state.failed) return ;
-
-        }
-
-
-        }
-
-
-        }
-
-
-        }
-
-
-        }
-    }
-    // $ANTLR end synpred45_InternalETPhys
-
-    // $ANTLR start synpred46_InternalETPhys
-    public final void synpred46_InternalETPhys_fragment() throws RecognitionException {   
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5484:2: ( rule__NodeClass__UnorderedGroup_4__1 )
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5484:2: rule__NodeClass__UnorderedGroup_4__1
-        {
-        pushFollow(FOLLOW_rule__NodeClass__UnorderedGroup_4__1_in_synpred46_InternalETPhys11129);
-        rule__NodeClass__UnorderedGroup_4__1();
-
-        state._fsp--;
-        if (state.failed) return ;
-
-        }
-    }
-    // $ANTLR end synpred46_InternalETPhys
-
-    // $ANTLR start synpred47_InternalETPhys
-    public final void synpred47_InternalETPhys_fragment() throws RecognitionException {   
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5497:2: ( rule__NodeClass__UnorderedGroup_4__2 )
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5497:2: rule__NodeClass__UnorderedGroup_4__2
-        {
-        pushFollow(FOLLOW_rule__NodeClass__UnorderedGroup_4__2_in_synpred47_InternalETPhys11157);
-        rule__NodeClass__UnorderedGroup_4__2();
-
-        state._fsp--;
-        if (state.failed) return ;
-
-        }
-    }
-    // $ANTLR end synpred47_InternalETPhys
-
-    // $ANTLR start synpred48_InternalETPhys
-    public final void synpred48_InternalETPhys_fragment() throws RecognitionException {   
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5547:4: ( ({...}? => ( ( ( rule__PhysicalThread__Group_3_0__0 ) ) ) ) )
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5547:4: ({...}? => ( ( ( rule__PhysicalThread__Group_3_0__0 ) ) ) )
-        {
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5547:4: ({...}? => ( ( ( rule__PhysicalThread__Group_3_0__0 ) ) ) )
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5548:5: {...}? => ( ( ( rule__PhysicalThread__Group_3_0__0 ) ) )
-        {
-        if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 0) ) {
-            if (state.backtracking>0) {state.failed=true; return ;}
-            throw new FailedPredicateException(input, "synpred48_InternalETPhys", "getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 0)");
-        }
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5548:111: ( ( ( rule__PhysicalThread__Group_3_0__0 ) ) )
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5549:6: ( ( rule__PhysicalThread__Group_3_0__0 ) )
-        {
-        getUnorderedGroupHelper().select(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 0);
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5555:6: ( ( rule__PhysicalThread__Group_3_0__0 ) )
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5557:7: ( rule__PhysicalThread__Group_3_0__0 )
-        {
-        if ( state.backtracking==0 ) {
-           before(grammarAccess.getPhysicalThreadAccess().getGroup_3_0()); 
-        }
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5558:7: ( rule__PhysicalThread__Group_3_0__0 )
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5558:8: rule__PhysicalThread__Group_3_0__0
-        {
-        pushFollow(FOLLOW_rule__PhysicalThread__Group_3_0__0_in_synpred48_InternalETPhys11301);
-        rule__PhysicalThread__Group_3_0__0();
-
-        state._fsp--;
-        if (state.failed) return ;
-
-        }
-
-
-        }
-
-
-        }
-
-
-        }
-
-
-        }
-    }
-    // $ANTLR end synpred48_InternalETPhys
-
-    // $ANTLR start synpred49_InternalETPhys
-    public final void synpred49_InternalETPhys_fragment() throws RecognitionException {   
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5564:4: ( ({...}? => ( ( ( rule__PhysicalThread__Group_3_1__0 ) ) ) ) )
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5564:4: ({...}? => ( ( ( rule__PhysicalThread__Group_3_1__0 ) ) ) )
-        {
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5564:4: ({...}? => ( ( ( rule__PhysicalThread__Group_3_1__0 ) ) ) )
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5565:5: {...}? => ( ( ( rule__PhysicalThread__Group_3_1__0 ) ) )
-        {
-        if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 1) ) {
-            if (state.backtracking>0) {state.failed=true; return ;}
-            throw new FailedPredicateException(input, "synpred49_InternalETPhys", "getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 1)");
-        }
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5565:111: ( ( ( rule__PhysicalThread__Group_3_1__0 ) ) )
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5566:6: ( ( rule__PhysicalThread__Group_3_1__0 ) )
-        {
-        getUnorderedGroupHelper().select(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 1);
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5572:6: ( ( rule__PhysicalThread__Group_3_1__0 ) )
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5574:7: ( rule__PhysicalThread__Group_3_1__0 )
-        {
-        if ( state.backtracking==0 ) {
-           before(grammarAccess.getPhysicalThreadAccess().getGroup_3_1()); 
-        }
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5575:7: ( rule__PhysicalThread__Group_3_1__0 )
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5575:8: rule__PhysicalThread__Group_3_1__0
-        {
-        pushFollow(FOLLOW_rule__PhysicalThread__Group_3_1__0_in_synpred49_InternalETPhys11392);
-        rule__PhysicalThread__Group_3_1__0();
-
-        state._fsp--;
-        if (state.failed) return ;
-
-        }
-
-
-        }
-
-
-        }
-
-
-        }
-
-
-        }
-    }
-    // $ANTLR end synpred49_InternalETPhys
-
-    // $ANTLR start synpred50_InternalETPhys
-    public final void synpred50_InternalETPhys_fragment() throws RecognitionException {   
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5581:4: ( ({...}? => ( ( ( rule__PhysicalThread__Group_3_2__0 ) ) ) ) )
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5581:4: ({...}? => ( ( ( rule__PhysicalThread__Group_3_2__0 ) ) ) )
-        {
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5581:4: ({...}? => ( ( ( rule__PhysicalThread__Group_3_2__0 ) ) ) )
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5582:5: {...}? => ( ( ( rule__PhysicalThread__Group_3_2__0 ) ) )
-        {
-        if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 2) ) {
-            if (state.backtracking>0) {state.failed=true; return ;}
-            throw new FailedPredicateException(input, "synpred50_InternalETPhys", "getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 2)");
-        }
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5582:111: ( ( ( rule__PhysicalThread__Group_3_2__0 ) ) )
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5583:6: ( ( rule__PhysicalThread__Group_3_2__0 ) )
-        {
-        getUnorderedGroupHelper().select(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 2);
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5589:6: ( ( rule__PhysicalThread__Group_3_2__0 ) )
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5591:7: ( rule__PhysicalThread__Group_3_2__0 )
-        {
-        if ( state.backtracking==0 ) {
-           before(grammarAccess.getPhysicalThreadAccess().getGroup_3_2()); 
-        }
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5592:7: ( rule__PhysicalThread__Group_3_2__0 )
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5592:8: rule__PhysicalThread__Group_3_2__0
-        {
-        pushFollow(FOLLOW_rule__PhysicalThread__Group_3_2__0_in_synpred50_InternalETPhys11483);
-        rule__PhysicalThread__Group_3_2__0();
-
-        state._fsp--;
-        if (state.failed) return ;
-
-        }
-
-
-        }
-
-
-        }
-
-
-        }
-
-
-        }
-    }
-    // $ANTLR end synpred50_InternalETPhys
-
-    // $ANTLR start synpred51_InternalETPhys
-    public final void synpred51_InternalETPhys_fragment() throws RecognitionException {   
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5598:4: ( ({...}? => ( ( ( rule__PhysicalThread__Group_3_3__0 ) ) ) ) )
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5598:4: ({...}? => ( ( ( rule__PhysicalThread__Group_3_3__0 ) ) ) )
-        {
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5598:4: ({...}? => ( ( ( rule__PhysicalThread__Group_3_3__0 ) ) ) )
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5599:5: {...}? => ( ( ( rule__PhysicalThread__Group_3_3__0 ) ) )
-        {
-        if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 3) ) {
-            if (state.backtracking>0) {state.failed=true; return ;}
-            throw new FailedPredicateException(input, "synpred51_InternalETPhys", "getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 3)");
-        }
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5599:111: ( ( ( rule__PhysicalThread__Group_3_3__0 ) ) )
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5600:6: ( ( rule__PhysicalThread__Group_3_3__0 ) )
-        {
-        getUnorderedGroupHelper().select(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 3);
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5606:6: ( ( rule__PhysicalThread__Group_3_3__0 ) )
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5608:7: ( rule__PhysicalThread__Group_3_3__0 )
-        {
-        if ( state.backtracking==0 ) {
-           before(grammarAccess.getPhysicalThreadAccess().getGroup_3_3()); 
-        }
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5609:7: ( rule__PhysicalThread__Group_3_3__0 )
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5609:8: rule__PhysicalThread__Group_3_3__0
-        {
-        pushFollow(FOLLOW_rule__PhysicalThread__Group_3_3__0_in_synpred51_InternalETPhys11574);
-        rule__PhysicalThread__Group_3_3__0();
-
-        state._fsp--;
-        if (state.failed) return ;
-
-        }
-
-
-        }
-
-
-        }
-
-
-        }
-
-
-        }
-    }
-    // $ANTLR end synpred51_InternalETPhys
-
-    // $ANTLR start synpred52_InternalETPhys
-    public final void synpred52_InternalETPhys_fragment() throws RecognitionException {   
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5615:4: ( ({...}? => ( ( ( rule__PhysicalThread__Group_3_4__0 ) ) ) ) )
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5615:4: ({...}? => ( ( ( rule__PhysicalThread__Group_3_4__0 ) ) ) )
-        {
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5615:4: ({...}? => ( ( ( rule__PhysicalThread__Group_3_4__0 ) ) ) )
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5616:5: {...}? => ( ( ( rule__PhysicalThread__Group_3_4__0 ) ) )
-        {
-        if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 4) ) {
-            if (state.backtracking>0) {state.failed=true; return ;}
-            throw new FailedPredicateException(input, "synpred52_InternalETPhys", "getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 4)");
-        }
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5616:111: ( ( ( rule__PhysicalThread__Group_3_4__0 ) ) )
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5617:6: ( ( rule__PhysicalThread__Group_3_4__0 ) )
-        {
-        getUnorderedGroupHelper().select(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 4);
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5623:6: ( ( rule__PhysicalThread__Group_3_4__0 ) )
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5625:7: ( rule__PhysicalThread__Group_3_4__0 )
-        {
-        if ( state.backtracking==0 ) {
-           before(grammarAccess.getPhysicalThreadAccess().getGroup_3_4()); 
-        }
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5626:7: ( rule__PhysicalThread__Group_3_4__0 )
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5626:8: rule__PhysicalThread__Group_3_4__0
-        {
-        pushFollow(FOLLOW_rule__PhysicalThread__Group_3_4__0_in_synpred52_InternalETPhys11665);
-        rule__PhysicalThread__Group_3_4__0();
-
-        state._fsp--;
-        if (state.failed) return ;
-
-        }
-
-
-        }
-
-
-        }
-
-
-        }
-
-
-        }
-    }
-    // $ANTLR end synpred52_InternalETPhys
-
-    // $ANTLR start synpred53_InternalETPhys
-    public final void synpred53_InternalETPhys_fragment() throws RecognitionException {   
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5664:2: ( rule__PhysicalThread__UnorderedGroup_3__1 )
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5664:2: rule__PhysicalThread__UnorderedGroup_3__1
-        {
-        pushFollow(FOLLOW_rule__PhysicalThread__UnorderedGroup_3__1_in_synpred53_InternalETPhys11818);
-        rule__PhysicalThread__UnorderedGroup_3__1();
-
-        state._fsp--;
-        if (state.failed) return ;
-
-        }
-    }
-    // $ANTLR end synpred53_InternalETPhys
-
-    // $ANTLR start synpred54_InternalETPhys
-    public final void synpred54_InternalETPhys_fragment() throws RecognitionException {   
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5677:2: ( rule__PhysicalThread__UnorderedGroup_3__2 )
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5677:2: rule__PhysicalThread__UnorderedGroup_3__2
-        {
-        pushFollow(FOLLOW_rule__PhysicalThread__UnorderedGroup_3__2_in_synpred54_InternalETPhys11846);
-        rule__PhysicalThread__UnorderedGroup_3__2();
-
-        state._fsp--;
-        if (state.failed) return ;
-
-        }
-    }
-    // $ANTLR end synpred54_InternalETPhys
-
-    // $ANTLR start synpred55_InternalETPhys
-    public final void synpred55_InternalETPhys_fragment() throws RecognitionException {   
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5690:2: ( rule__PhysicalThread__UnorderedGroup_3__3 )
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5690:2: rule__PhysicalThread__UnorderedGroup_3__3
-        {
-        pushFollow(FOLLOW_rule__PhysicalThread__UnorderedGroup_3__3_in_synpred55_InternalETPhys11874);
-        rule__PhysicalThread__UnorderedGroup_3__3();
-
-        state._fsp--;
-        if (state.failed) return ;
-
-        }
-    }
-    // $ANTLR end synpred55_InternalETPhys
-
-    // $ANTLR start synpred56_InternalETPhys
-    public final void synpred56_InternalETPhys_fragment() throws RecognitionException {   
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5703:2: ( rule__PhysicalThread__UnorderedGroup_3__4 )
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5703:2: rule__PhysicalThread__UnorderedGroup_3__4
-        {
-        pushFollow(FOLLOW_rule__PhysicalThread__UnorderedGroup_3__4_in_synpred56_InternalETPhys11902);
-        rule__PhysicalThread__UnorderedGroup_3__4();
-
-        state._fsp--;
-        if (state.failed) return ;
-
-        }
-    }
-    // $ANTLR end synpred56_InternalETPhys
-
-    // $ANTLR start synpred57_InternalETPhys
-    public final void synpred57_InternalETPhys_fragment() throws RecognitionException {   
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5716:2: ( rule__PhysicalThread__UnorderedGroup_3__5 )
-        // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:5716:2: rule__PhysicalThread__UnorderedGroup_3__5
-        {
-        pushFollow(FOLLOW_rule__PhysicalThread__UnorderedGroup_3__5_in_synpred57_InternalETPhys11930);
-        rule__PhysicalThread__UnorderedGroup_3__5();
-
-        state._fsp--;
-        if (state.failed) return ;
-
-        }
-    }
-    // $ANTLR end synpred57_InternalETPhys
-
     // Delegated rules
 
-    public final boolean synpred57_InternalETPhys() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred57_InternalETPhys_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
-    public final boolean synpred49_InternalETPhys() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred49_InternalETPhys_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
-    public final boolean synpred46_InternalETPhys() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred46_InternalETPhys_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
-    public final boolean synpred44_InternalETPhys() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred44_InternalETPhys_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
-    public final boolean synpred54_InternalETPhys() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred54_InternalETPhys_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
-    public final boolean synpred48_InternalETPhys() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred48_InternalETPhys_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
-    public final boolean synpred50_InternalETPhys() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred50_InternalETPhys_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
-    public final boolean synpred52_InternalETPhys() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred52_InternalETPhys_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
-    public final boolean synpred56_InternalETPhys() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred56_InternalETPhys_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
-    public final boolean synpred45_InternalETPhys() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred45_InternalETPhys_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
-    public final boolean synpred47_InternalETPhys() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred47_InternalETPhys_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
-    public final boolean synpred55_InternalETPhys() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred55_InternalETPhys_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
-    public final boolean synpred53_InternalETPhys() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred53_InternalETPhys_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
-    public final boolean synpred51_InternalETPhys() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred51_InternalETPhys_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
-
 
  
 
-    public static final BitSet FOLLOW_rulePhysicalModel_in_entryRulePhysicalModel67 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRulePhysicalModel74 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalModel__Group__0_in_rulePhysicalModel100 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rulePhysicalSystem_in_entryRulePhysicalSystem127 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRulePhysicalSystem134 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalSystem__Group__0_in_rulePhysicalSystem160 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNodeRef_in_entryRuleNodeRef187 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleNodeRef194 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NodeRef__Group__0_in_ruleNodeRef220 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNodeClass_in_entryRuleNodeClass247 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleNodeClass254 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NodeClass__Group__0_in_ruleNodeClass280 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rulePhysicalThread_in_entryRulePhysicalThread307 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRulePhysicalThread314 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__Group__0_in_rulePhysicalThread340 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRuntimeClass_in_entryRuleRuntimeClass367 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRuntimeClass374 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RuntimeClass__Group__0_in_ruleRuntimeClass400 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleKeyValue_in_entryRuleKeyValue429 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleKeyValue436 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeyValue__Group__0_in_ruleKeyValue462 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAnnotationTargetType_in_entryRuleAnnotationTargetType491 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAnnotationTargetType498 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleAnnotationTargetType524 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAnnotationAttribute_in_entryRuleAnnotationAttribute550 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAnnotationAttribute557 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AnnotationAttribute__Alternatives_in_ruleAnnotationAttribute583 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleAnnotationAttribute_in_entryRuleSimpleAnnotationAttribute610 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSimpleAnnotationAttribute617 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__0_in_ruleSimpleAnnotationAttribute643 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleEnumAnnotationAttribute_in_entryRuleEnumAnnotationAttribute670 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleEnumAnnotationAttribute677 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__0_in_ruleEnumAnnotationAttribute703 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleImport_in_entryRuleImport730 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleImport737 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__Group__0_in_ruleImport763 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleImportedFQN_in_entryRuleImportedFQN790 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleImportedFQN797 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ImportedFQN__Group__0_in_ruleImportedFQN823 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_entryRuleDocumentation850 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDocumentation857 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Documentation__Group__0_in_ruleDocumentation883 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTIME_in_entryRuleTIME910 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleTIME917 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TIME__Alternatives_in_ruleTIME943 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLiteral_in_entryRuleLiteral972 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleLiteral979 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Literal__Alternatives_in_ruleLiteral1005 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleBooleanLiteral_in_entryRuleBooleanLiteral1032 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleBooleanLiteral1039 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__BooleanLiteral__Group__0_in_ruleBooleanLiteral1065 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNumberLiteral_in_entryRuleNumberLiteral1092 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleNumberLiteral1099 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NumberLiteral__Alternatives_in_ruleNumberLiteral1125 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRealLiteral_in_entryRuleRealLiteral1152 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRealLiteral1159 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RealLiteral__Group__0_in_ruleRealLiteral1185 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntLiteral_in_entryRuleIntLiteral1212 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIntLiteral1219 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IntLiteral__Group__0_in_ruleIntLiteral1245 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStringLiteral_in_entryRuleStringLiteral1272 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleStringLiteral1279 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StringLiteral__Group__0_in_ruleStringLiteral1305 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInteger_in_entryRuleInteger1332 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleInteger1339 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Integer__Alternatives_in_ruleInteger1365 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleReal_in_entryRuleReal1392 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleReal1399 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Real__Alternatives_in_ruleReal1425 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDecimal_in_entryRuleDecimal1457 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDecimal1464 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Decimal__Group__0_in_ruleDecimal1494 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDecimalExp_in_entryRuleDecimalExp1526 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDecimalExp1533 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__0_in_ruleDecimalExp1563 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_entryRuleFQN1590 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleFQN1597 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FQN__Group__0_in_ruleFQN1623 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ExecMode__Alternatives_in_ruleExecMode1660 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ThreadModel__Alternatives_in_ruleThreadModel1696 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LiteralType__Alternatives_in_ruleLiteralType1732 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalModel__SystemsAssignment_4_0_in_rule__PhysicalModel__Alternatives_41767 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalModel__NodeClassesAssignment_4_1_in_rule__PhysicalModel__Alternatives_41785 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalModel__RuntimeClassesAssignment_4_2_in_rule__PhysicalModel__Alternatives_41803 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__DefaultAssignment_0_0_in_rule__PhysicalThread__Alternatives_01836 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_12_in_rule__PhysicalThread__Alternatives_01855 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleAnnotationAttribute_in_rule__AnnotationAttribute__Alternatives1890 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleEnumAnnotationAttribute_in_rule__AnnotationAttribute__Alternatives1907 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__OptionalAssignment_0_0_in_rule__SimpleAnnotationAttribute__Alternatives_01939 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_13_in_rule__SimpleAnnotationAttribute__Alternatives_01958 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__OptionalAssignment_0_0_in_rule__EnumAnnotationAttribute__Alternatives_01992 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_13_in_rule__EnumAnnotationAttribute__Alternatives_02011 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__Group_1_0__0_in_rule__Import__Alternatives_12045 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_14_in_rule__Import__Alternatives_12064 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TIME__Group_0__0_in_rule__TIME__Alternatives2098 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TIME__Group_1__0_in_rule__TIME__Alternatives2116 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TIME__Group_2__0_in_rule__TIME__Alternatives2134 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TIME__Group_3__0_in_rule__TIME__Alternatives2152 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleBooleanLiteral_in_rule__Literal__Alternatives2185 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNumberLiteral_in_rule__Literal__Alternatives2202 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStringLiteral_in_rule__Literal__Alternatives2219 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_15_in_rule__BooleanLiteral__Alternatives_12252 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__BooleanLiteral__IsTrueAssignment_1_1_in_rule__BooleanLiteral__Alternatives_12271 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntLiteral_in_rule__NumberLiteral__Alternatives2304 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRealLiteral_in_rule__NumberLiteral__Alternatives2321 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Integer__Group_0__0_in_rule__Integer__Alternatives2353 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_HEX_in_rule__Integer__Alternatives2371 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_16_in_rule__Integer__Alternatives_0_02404 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_17_in_rule__Integer__Alternatives_0_02424 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDecimal_in_rule__Real__Alternatives2458 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDecimalExp_in_rule__Real__Alternatives2475 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_16_in_rule__Decimal__Alternatives_02508 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_17_in_rule__Decimal__Alternatives_02528 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_16_in_rule__DecimalExp__Alternatives_02563 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_17_in_rule__DecimalExp__Alternatives_02583 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_18_in_rule__DecimalExp__Alternatives_42618 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_19_in_rule__DecimalExp__Alternatives_42638 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_16_in_rule__DecimalExp__Alternatives_52673 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_17_in_rule__DecimalExp__Alternatives_52693 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_20_in_rule__ExecMode__Alternatives2728 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_21_in_rule__ExecMode__Alternatives2749 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_22_in_rule__ExecMode__Alternatives2770 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_23_in_rule__ThreadModel__Alternatives2806 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_24_in_rule__ThreadModel__Alternatives2827 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_25_in_rule__LiteralType__Alternatives2863 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_26_in_rule__LiteralType__Alternatives2884 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_rule__LiteralType__Alternatives2905 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_rule__LiteralType__Alternatives2926 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalModel__Group__0__Impl_in_rule__PhysicalModel__Group__02959 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__PhysicalModel__Group__1_in_rule__PhysicalModel__Group__02962 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_rule__PhysicalModel__Group__0__Impl2990 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalModel__Group__1__Impl_in_rule__PhysicalModel__Group__13021 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_rule__PhysicalModel__Group__2_in_rule__PhysicalModel__Group__13024 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalModel__NameAssignment_1_in_rule__PhysicalModel__Group__1__Impl3051 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalModel__Group__2__Impl_in_rule__PhysicalModel__Group__23081 = new BitSet(new long[]{0x0002400980000000L});
-    public static final BitSet FOLLOW_rule__PhysicalModel__Group__3_in_rule__PhysicalModel__Group__23084 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_30_in_rule__PhysicalModel__Group__2__Impl3112 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalModel__Group__3__Impl_in_rule__PhysicalModel__Group__33143 = new BitSet(new long[]{0x0002400980000000L});
-    public static final BitSet FOLLOW_rule__PhysicalModel__Group__4_in_rule__PhysicalModel__Group__33146 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalModel__ImportsAssignment_3_in_rule__PhysicalModel__Group__3__Impl3173 = new BitSet(new long[]{0x0002000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalModel__Group__4__Impl_in_rule__PhysicalModel__Group__43204 = new BitSet(new long[]{0x0002400980000000L});
-    public static final BitSet FOLLOW_rule__PhysicalModel__Group__5_in_rule__PhysicalModel__Group__43207 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalModel__Alternatives_4_in_rule__PhysicalModel__Group__4__Impl3234 = new BitSet(new long[]{0x0000400900000002L});
-    public static final BitSet FOLLOW_rule__PhysicalModel__Group__5__Impl_in_rule__PhysicalModel__Group__53265 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_31_in_rule__PhysicalModel__Group__5__Impl3293 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalSystem__Group__0__Impl_in_rule__PhysicalSystem__Group__03336 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__PhysicalSystem__Group__1_in_rule__PhysicalSystem__Group__03339 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_rule__PhysicalSystem__Group__0__Impl3367 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalSystem__Group__1__Impl_in_rule__PhysicalSystem__Group__13398 = new BitSet(new long[]{0x0010000040000000L});
-    public static final BitSet FOLLOW_rule__PhysicalSystem__Group__2_in_rule__PhysicalSystem__Group__13401 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalSystem__NameAssignment_1_in_rule__PhysicalSystem__Group__1__Impl3428 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalSystem__Group__2__Impl_in_rule__PhysicalSystem__Group__23458 = new BitSet(new long[]{0x0010000040000000L});
-    public static final BitSet FOLLOW_rule__PhysicalSystem__Group__3_in_rule__PhysicalSystem__Group__23461 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalSystem__DocuAssignment_2_in_rule__PhysicalSystem__Group__2__Impl3488 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalSystem__Group__3__Impl_in_rule__PhysicalSystem__Group__33519 = new BitSet(new long[]{0x0000000280000000L});
-    public static final BitSet FOLLOW_rule__PhysicalSystem__Group__4_in_rule__PhysicalSystem__Group__33522 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_30_in_rule__PhysicalSystem__Group__3__Impl3550 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalSystem__Group__4__Impl_in_rule__PhysicalSystem__Group__43581 = new BitSet(new long[]{0x0000000280000000L});
-    public static final BitSet FOLLOW_rule__PhysicalSystem__Group__5_in_rule__PhysicalSystem__Group__43584 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalSystem__NodeRefsAssignment_4_in_rule__PhysicalSystem__Group__4__Impl3611 = new BitSet(new long[]{0x0000000200000002L});
-    public static final BitSet FOLLOW_rule__PhysicalSystem__Group__5__Impl_in_rule__PhysicalSystem__Group__53642 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_31_in_rule__PhysicalSystem__Group__5__Impl3670 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NodeRef__Group__0__Impl_in_rule__NodeRef__Group__03713 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__NodeRef__Group__1_in_rule__NodeRef__Group__03716 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_rule__NodeRef__Group__0__Impl3744 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NodeRef__Group__1__Impl_in_rule__NodeRef__Group__13775 = new BitSet(new long[]{0x0000000400000000L});
-    public static final BitSet FOLLOW_rule__NodeRef__Group__2_in_rule__NodeRef__Group__13778 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NodeRef__NameAssignment_1_in_rule__NodeRef__Group__1__Impl3805 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NodeRef__Group__2__Impl_in_rule__NodeRef__Group__23835 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__NodeRef__Group__3_in_rule__NodeRef__Group__23838 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_34_in_rule__NodeRef__Group__2__Impl3866 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NodeRef__Group__3__Impl_in_rule__NodeRef__Group__33897 = new BitSet(new long[]{0x0010000000000000L});
-    public static final BitSet FOLLOW_rule__NodeRef__Group__4_in_rule__NodeRef__Group__33900 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NodeRef__TypeAssignment_3_in_rule__NodeRef__Group__3__Impl3927 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NodeRef__Group__4__Impl_in_rule__NodeRef__Group__43957 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NodeRef__DocuAssignment_4_in_rule__NodeRef__Group__4__Impl3984 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NodeClass__Group__0__Impl_in_rule__NodeClass__Group__04025 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__NodeClass__Group__1_in_rule__NodeClass__Group__04028 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_35_in_rule__NodeClass__Group__0__Impl4056 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NodeClass__Group__1__Impl_in_rule__NodeClass__Group__14087 = new BitSet(new long[]{0x0010000040000000L});
-    public static final BitSet FOLLOW_rule__NodeClass__Group__2_in_rule__NodeClass__Group__14090 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NodeClass__NameAssignment_1_in_rule__NodeClass__Group__1__Impl4117 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NodeClass__Group__2__Impl_in_rule__NodeClass__Group__24147 = new BitSet(new long[]{0x0010000040000000L});
-    public static final BitSet FOLLOW_rule__NodeClass__Group__3_in_rule__NodeClass__Group__24150 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NodeClass__DocuAssignment_2_in_rule__NodeClass__Group__2__Impl4177 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NodeClass__Group__3__Impl_in_rule__NodeClass__Group__34208 = new BitSet(new long[]{0x000000D000000000L});
-    public static final BitSet FOLLOW_rule__NodeClass__Group__4_in_rule__NodeClass__Group__34211 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_30_in_rule__NodeClass__Group__3__Impl4239 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NodeClass__Group__4__Impl_in_rule__NodeClass__Group__44270 = new BitSet(new long[]{0x0800000080001000L});
-    public static final BitSet FOLLOW_rule__NodeClass__Group__5_in_rule__NodeClass__Group__44273 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NodeClass__UnorderedGroup_4_in_rule__NodeClass__Group__4__Impl4300 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NodeClass__Group__5__Impl_in_rule__NodeClass__Group__54330 = new BitSet(new long[]{0x0800000080001000L});
-    public static final BitSet FOLLOW_rule__NodeClass__Group__6_in_rule__NodeClass__Group__54333 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NodeClass__ThreadsAssignment_5_in_rule__NodeClass__Group__5__Impl4360 = new BitSet(new long[]{0x0800000000001002L});
-    public static final BitSet FOLLOW_rule__NodeClass__Group__6__Impl_in_rule__NodeClass__Group__64391 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_31_in_rule__NodeClass__Group__6__Impl4419 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NodeClass__Group_4_0__0__Impl_in_rule__NodeClass__Group_4_0__04464 = new BitSet(new long[]{0x0000002000000000L});
-    public static final BitSet FOLLOW_rule__NodeClass__Group_4_0__1_in_rule__NodeClass__Group_4_0__04467 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_36_in_rule__NodeClass__Group_4_0__0__Impl4495 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NodeClass__Group_4_0__1__Impl_in_rule__NodeClass__Group_4_0__14526 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__NodeClass__Group_4_0__2_in_rule__NodeClass__Group_4_0__14529 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_37_in_rule__NodeClass__Group_4_0__1__Impl4557 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NodeClass__Group_4_0__2__Impl_in_rule__NodeClass__Group_4_0__24588 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NodeClass__RuntimeAssignment_4_0_2_in_rule__NodeClass__Group_4_0__2__Impl4615 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NodeClass__Group_4_1__0__Impl_in_rule__NodeClass__Group_4_1__04651 = new BitSet(new long[]{0x0000002000000000L});
-    public static final BitSet FOLLOW_rule__NodeClass__Group_4_1__1_in_rule__NodeClass__Group_4_1__04654 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_38_in_rule__NodeClass__Group_4_1__0__Impl4682 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NodeClass__Group_4_1__1__Impl_in_rule__NodeClass__Group_4_1__14713 = new BitSet(new long[]{0x0000000000030060L});
-    public static final BitSet FOLLOW_rule__NodeClass__Group_4_1__2_in_rule__NodeClass__Group_4_1__14716 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_37_in_rule__NodeClass__Group_4_1__1__Impl4744 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NodeClass__Group_4_1__2__Impl_in_rule__NodeClass__Group_4_1__24775 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NodeClass__PriominAssignment_4_1_2_in_rule__NodeClass__Group_4_1__2__Impl4802 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NodeClass__Group_4_2__0__Impl_in_rule__NodeClass__Group_4_2__04838 = new BitSet(new long[]{0x0000002000000000L});
-    public static final BitSet FOLLOW_rule__NodeClass__Group_4_2__1_in_rule__NodeClass__Group_4_2__04841 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_39_in_rule__NodeClass__Group_4_2__0__Impl4869 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NodeClass__Group_4_2__1__Impl_in_rule__NodeClass__Group_4_2__14900 = new BitSet(new long[]{0x0000000000030060L});
-    public static final BitSet FOLLOW_rule__NodeClass__Group_4_2__2_in_rule__NodeClass__Group_4_2__14903 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_37_in_rule__NodeClass__Group_4_2__1__Impl4931 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NodeClass__Group_4_2__2__Impl_in_rule__NodeClass__Group_4_2__24962 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NodeClass__PriomaxAssignment_4_2_2_in_rule__NodeClass__Group_4_2__2__Impl4989 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__Group__0__Impl_in_rule__PhysicalThread__Group__05025 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__Group__1_in_rule__PhysicalThread__Group__05028 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__Alternatives_0_in_rule__PhysicalThread__Group__0__Impl5055 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__Group__1__Impl_in_rule__PhysicalThread__Group__15085 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__Group__2_in_rule__PhysicalThread__Group__15088 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__NameAssignment_1_in_rule__PhysicalThread__Group__1__Impl5115 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__Group__2__Impl_in_rule__PhysicalThread__Group__25145 = new BitSet(new long[]{0x00003F0000000000L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__Group__3_in_rule__PhysicalThread__Group__25148 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_30_in_rule__PhysicalThread__Group__2__Impl5176 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__Group__3__Impl_in_rule__PhysicalThread__Group__35207 = new BitSet(new long[]{0x0000000080000000L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__Group__4_in_rule__PhysicalThread__Group__35210 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__UnorderedGroup_3_in_rule__PhysicalThread__Group__3__Impl5237 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__Group__4__Impl_in_rule__PhysicalThread__Group__45267 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_31_in_rule__PhysicalThread__Group__4__Impl5295 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__Group_3_0__0__Impl_in_rule__PhysicalThread__Group_3_0__05336 = new BitSet(new long[]{0x0000002000000000L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__Group_3_0__1_in_rule__PhysicalThread__Group_3_0__05339 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_40_in_rule__PhysicalThread__Group_3_0__0__Impl5367 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__Group_3_0__1__Impl_in_rule__PhysicalThread__Group_3_0__15398 = new BitSet(new long[]{0x0000000000700000L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__Group_3_0__2_in_rule__PhysicalThread__Group_3_0__15401 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_37_in_rule__PhysicalThread__Group_3_0__1__Impl5429 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__Group_3_0__2__Impl_in_rule__PhysicalThread__Group_3_0__25460 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__ExecmodeAssignment_3_0_2_in_rule__PhysicalThread__Group_3_0__2__Impl5487 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__Group_3_1__0__Impl_in_rule__PhysicalThread__Group_3_1__05523 = new BitSet(new long[]{0x0000002000000000L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__Group_3_1__1_in_rule__PhysicalThread__Group_3_1__05526 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_rule__PhysicalThread__Group_3_1__0__Impl5554 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__Group_3_1__1__Impl_in_rule__PhysicalThread__Group_3_1__15585 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__Group_3_1__2_in_rule__PhysicalThread__Group_3_1__15588 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_37_in_rule__PhysicalThread__Group_3_1__1__Impl5616 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__Group_3_1__2__Impl_in_rule__PhysicalThread__Group_3_1__25647 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__TimeAssignment_3_1_2_in_rule__PhysicalThread__Group_3_1__2__Impl5674 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__Group_3_2__0__Impl_in_rule__PhysicalThread__Group_3_2__05710 = new BitSet(new long[]{0x0000002000000000L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__Group_3_2__1_in_rule__PhysicalThread__Group_3_2__05713 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rule__PhysicalThread__Group_3_2__0__Impl5741 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__Group_3_2__1__Impl_in_rule__PhysicalThread__Group_3_2__15772 = new BitSet(new long[]{0x0000000000030060L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__Group_3_2__2_in_rule__PhysicalThread__Group_3_2__15775 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_37_in_rule__PhysicalThread__Group_3_2__1__Impl5803 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__Group_3_2__2__Impl_in_rule__PhysicalThread__Group_3_2__25834 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__PrioAssignment_3_2_2_in_rule__PhysicalThread__Group_3_2__2__Impl5861 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__Group_3_3__0__Impl_in_rule__PhysicalThread__Group_3_3__05897 = new BitSet(new long[]{0x0000002000000000L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__Group_3_3__1_in_rule__PhysicalThread__Group_3_3__05900 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_43_in_rule__PhysicalThread__Group_3_3__0__Impl5928 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__Group_3_3__1__Impl_in_rule__PhysicalThread__Group_3_3__15959 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__Group_3_3__2_in_rule__PhysicalThread__Group_3_3__15962 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_37_in_rule__PhysicalThread__Group_3_3__1__Impl5990 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__Group_3_3__2__Impl_in_rule__PhysicalThread__Group_3_3__26021 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__StacksizeAssignment_3_3_2_in_rule__PhysicalThread__Group_3_3__2__Impl6048 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__Group_3_4__0__Impl_in_rule__PhysicalThread__Group_3_4__06084 = new BitSet(new long[]{0x0000002000000000L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__Group_3_4__1_in_rule__PhysicalThread__Group_3_4__06087 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_44_in_rule__PhysicalThread__Group_3_4__0__Impl6115 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__Group_3_4__1__Impl_in_rule__PhysicalThread__Group_3_4__16146 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__Group_3_4__2_in_rule__PhysicalThread__Group_3_4__16149 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_37_in_rule__PhysicalThread__Group_3_4__1__Impl6177 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__Group_3_4__2__Impl_in_rule__PhysicalThread__Group_3_4__26208 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__MsgblocksizeAssignment_3_4_2_in_rule__PhysicalThread__Group_3_4__2__Impl6235 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__Group_3_5__0__Impl_in_rule__PhysicalThread__Group_3_5__06271 = new BitSet(new long[]{0x0000002000000000L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__Group_3_5__1_in_rule__PhysicalThread__Group_3_5__06274 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_45_in_rule__PhysicalThread__Group_3_5__0__Impl6302 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__Group_3_5__1__Impl_in_rule__PhysicalThread__Group_3_5__16333 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__Group_3_5__2_in_rule__PhysicalThread__Group_3_5__16336 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_37_in_rule__PhysicalThread__Group_3_5__1__Impl6364 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__Group_3_5__2__Impl_in_rule__PhysicalThread__Group_3_5__26395 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__MsgpoolsizeAssignment_3_5_2_in_rule__PhysicalThread__Group_3_5__2__Impl6422 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RuntimeClass__Group__0__Impl_in_rule__RuntimeClass__Group__06458 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__RuntimeClass__Group__1_in_rule__RuntimeClass__Group__06461 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_rule__RuntimeClass__Group__0__Impl6489 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RuntimeClass__Group__1__Impl_in_rule__RuntimeClass__Group__16520 = new BitSet(new long[]{0x0010000040000000L});
-    public static final BitSet FOLLOW_rule__RuntimeClass__Group__2_in_rule__RuntimeClass__Group__16523 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RuntimeClass__NameAssignment_1_in_rule__RuntimeClass__Group__1__Impl6550 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RuntimeClass__Group__2__Impl_in_rule__RuntimeClass__Group__26580 = new BitSet(new long[]{0x0010000040000000L});
-    public static final BitSet FOLLOW_rule__RuntimeClass__Group__3_in_rule__RuntimeClass__Group__26583 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RuntimeClass__DocuAssignment_2_in_rule__RuntimeClass__Group__2__Impl6610 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RuntimeClass__Group__3__Impl_in_rule__RuntimeClass__Group__36641 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_rule__RuntimeClass__Group__4_in_rule__RuntimeClass__Group__36644 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_30_in_rule__RuntimeClass__Group__3__Impl6672 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RuntimeClass__Group__4__Impl_in_rule__RuntimeClass__Group__46703 = new BitSet(new long[]{0x0000002000000000L});
-    public static final BitSet FOLLOW_rule__RuntimeClass__Group__5_in_rule__RuntimeClass__Group__46706 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_14_in_rule__RuntimeClass__Group__4__Impl6734 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RuntimeClass__Group__5__Impl_in_rule__RuntimeClass__Group__56765 = new BitSet(new long[]{0x0000000001800000L});
-    public static final BitSet FOLLOW_rule__RuntimeClass__Group__6_in_rule__RuntimeClass__Group__56768 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_37_in_rule__RuntimeClass__Group__5__Impl6796 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RuntimeClass__Group__6__Impl_in_rule__RuntimeClass__Group__66827 = new BitSet(new long[]{0x0000000080000000L});
-    public static final BitSet FOLLOW_rule__RuntimeClass__Group__7_in_rule__RuntimeClass__Group__66830 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RuntimeClass__ThreadModelAssignment_6_in_rule__RuntimeClass__Group__6__Impl6857 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RuntimeClass__Group__7__Impl_in_rule__RuntimeClass__Group__76887 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_31_in_rule__RuntimeClass__Group__7__Impl6915 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeyValue__Group__0__Impl_in_rule__KeyValue__Group__06965 = new BitSet(new long[]{0x0000002000000000L});
-    public static final BitSet FOLLOW_rule__KeyValue__Group__1_in_rule__KeyValue__Group__06968 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeyValue__KeyAssignment_0_in_rule__KeyValue__Group__0__Impl6995 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeyValue__Group__1__Impl_in_rule__KeyValue__Group__17025 = new BitSet(new long[]{0x20000000000380E0L});
-    public static final BitSet FOLLOW_rule__KeyValue__Group__2_in_rule__KeyValue__Group__17028 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_37_in_rule__KeyValue__Group__1__Impl7056 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeyValue__Group__2__Impl_in_rule__KeyValue__Group__27087 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeyValue__ValueAssignment_2_in_rule__KeyValue__Group__2__Impl7114 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__0__Impl_in_rule__SimpleAnnotationAttribute__Group__07153 = new BitSet(new long[]{0x0000800000000000L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__1_in_rule__SimpleAnnotationAttribute__Group__07156 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Alternatives_0_in_rule__SimpleAnnotationAttribute__Group__0__Impl7183 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__1__Impl_in_rule__SimpleAnnotationAttribute__Group__17213 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__2_in_rule__SimpleAnnotationAttribute__Group__17216 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_rule__SimpleAnnotationAttribute__Group__1__Impl7244 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__2__Impl_in_rule__SimpleAnnotationAttribute__Group__27275 = new BitSet(new long[]{0x0000000400000000L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__3_in_rule__SimpleAnnotationAttribute__Group__27278 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__NameAssignment_2_in_rule__SimpleAnnotationAttribute__Group__2__Impl7305 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__3__Impl_in_rule__SimpleAnnotationAttribute__Group__37335 = new BitSet(new long[]{0x000000001E000000L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__4_in_rule__SimpleAnnotationAttribute__Group__37338 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_34_in_rule__SimpleAnnotationAttribute__Group__3__Impl7366 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__4__Impl_in_rule__SimpleAnnotationAttribute__Group__47397 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__TypeAssignment_4_in_rule__SimpleAnnotationAttribute__Group__4__Impl7424 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__0__Impl_in_rule__EnumAnnotationAttribute__Group__07464 = new BitSet(new long[]{0x0000800000000000L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__1_in_rule__EnumAnnotationAttribute__Group__07467 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Alternatives_0_in_rule__EnumAnnotationAttribute__Group__0__Impl7494 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__1__Impl_in_rule__EnumAnnotationAttribute__Group__17524 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__2_in_rule__EnumAnnotationAttribute__Group__17527 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_rule__EnumAnnotationAttribute__Group__1__Impl7555 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__2__Impl_in_rule__EnumAnnotationAttribute__Group__27586 = new BitSet(new long[]{0x0000000400000000L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__3_in_rule__EnumAnnotationAttribute__Group__27589 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__NameAssignment_2_in_rule__EnumAnnotationAttribute__Group__2__Impl7616 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__3__Impl_in_rule__EnumAnnotationAttribute__Group__37646 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__4_in_rule__EnumAnnotationAttribute__Group__37649 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_34_in_rule__EnumAnnotationAttribute__Group__3__Impl7677 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__4__Impl_in_rule__EnumAnnotationAttribute__Group__47708 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__5_in_rule__EnumAnnotationAttribute__Group__47711 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_30_in_rule__EnumAnnotationAttribute__Group__4__Impl7739 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__5__Impl_in_rule__EnumAnnotationAttribute__Group__57770 = new BitSet(new long[]{0x0001000080000000L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__6_in_rule__EnumAnnotationAttribute__Group__57773 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__ValuesAssignment_5_in_rule__EnumAnnotationAttribute__Group__5__Impl7800 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__6__Impl_in_rule__EnumAnnotationAttribute__Group__67830 = new BitSet(new long[]{0x0001000080000000L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__7_in_rule__EnumAnnotationAttribute__Group__67833 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group_6__0_in_rule__EnumAnnotationAttribute__Group__6__Impl7860 = new BitSet(new long[]{0x0001000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__7__Impl_in_rule__EnumAnnotationAttribute__Group__77891 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_31_in_rule__EnumAnnotationAttribute__Group__7__Impl7919 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group_6__0__Impl_in_rule__EnumAnnotationAttribute__Group_6__07966 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group_6__1_in_rule__EnumAnnotationAttribute__Group_6__07969 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_48_in_rule__EnumAnnotationAttribute__Group_6__0__Impl7997 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group_6__1__Impl_in_rule__EnumAnnotationAttribute__Group_6__18028 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__ValuesAssignment_6_1_in_rule__EnumAnnotationAttribute__Group_6__1__Impl8055 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__Group__0__Impl_in_rule__Import__Group__08089 = new BitSet(new long[]{0x0000000000004010L});
-    public static final BitSet FOLLOW_rule__Import__Group__1_in_rule__Import__Group__08092 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_49_in_rule__Import__Group__0__Impl8120 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__Group__1__Impl_in_rule__Import__Group__18151 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__Import__Group__2_in_rule__Import__Group__18154 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__Alternatives_1_in_rule__Import__Group__1__Impl8181 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__Group__2__Impl_in_rule__Import__Group__28211 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__ImportURIAssignment_2_in_rule__Import__Group__2__Impl8238 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__Group_1_0__0__Impl_in_rule__Import__Group_1_0__08274 = new BitSet(new long[]{0x0004000000000000L});
-    public static final BitSet FOLLOW_rule__Import__Group_1_0__1_in_rule__Import__Group_1_0__08277 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__ImportedNamespaceAssignment_1_0_0_in_rule__Import__Group_1_0__0__Impl8304 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__Group_1_0__1__Impl_in_rule__Import__Group_1_0__18334 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_50_in_rule__Import__Group_1_0__1__Impl8362 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ImportedFQN__Group__0__Impl_in_rule__ImportedFQN__Group__08397 = new BitSet(new long[]{0x0008000000000000L});
-    public static final BitSet FOLLOW_rule__ImportedFQN__Group__1_in_rule__ImportedFQN__Group__08400 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_rule__ImportedFQN__Group__0__Impl8427 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ImportedFQN__Group__1__Impl_in_rule__ImportedFQN__Group__18456 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_rule__ImportedFQN__Group__1__Impl8485 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Documentation__Group__0__Impl_in_rule__Documentation__Group__08522 = new BitSet(new long[]{0x0010000000000000L});
-    public static final BitSet FOLLOW_rule__Documentation__Group__1_in_rule__Documentation__Group__08525 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Documentation__Group__1__Impl_in_rule__Documentation__Group__18583 = new BitSet(new long[]{0x0020000000000080L});
-    public static final BitSet FOLLOW_rule__Documentation__Group__2_in_rule__Documentation__Group__18586 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_52_in_rule__Documentation__Group__1__Impl8614 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Documentation__Group__2__Impl_in_rule__Documentation__Group__28645 = new BitSet(new long[]{0x0020000000000080L});
-    public static final BitSet FOLLOW_rule__Documentation__Group__3_in_rule__Documentation__Group__28648 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Documentation__LinesAssignment_2_in_rule__Documentation__Group__2__Impl8675 = new BitSet(new long[]{0x0000000000000082L});
-    public static final BitSet FOLLOW_rule__Documentation__Group__3__Impl_in_rule__Documentation__Group__38706 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_53_in_rule__Documentation__Group__3__Impl8734 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TIME__Group_0__0__Impl_in_rule__TIME__Group_0__08773 = new BitSet(new long[]{0x0040000000000000L});
-    public static final BitSet FOLLOW_rule__TIME__Group_0__1_in_rule__TIME__Group_0__08776 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__TIME__Group_0__0__Impl8803 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TIME__Group_0__1__Impl_in_rule__TIME__Group_0__18832 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_54_in_rule__TIME__Group_0__1__Impl8860 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TIME__Group_1__0__Impl_in_rule__TIME__Group_1__08895 = new BitSet(new long[]{0x0080000000000000L});
-    public static final BitSet FOLLOW_rule__TIME__Group_1__1_in_rule__TIME__Group_1__08898 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__TIME__Group_1__0__Impl8925 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TIME__Group_1__1__Impl_in_rule__TIME__Group_1__18954 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_55_in_rule__TIME__Group_1__1__Impl8982 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TIME__Group_2__0__Impl_in_rule__TIME__Group_2__09017 = new BitSet(new long[]{0x0100000000000000L});
-    public static final BitSet FOLLOW_rule__TIME__Group_2__1_in_rule__TIME__Group_2__09020 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__TIME__Group_2__0__Impl9047 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TIME__Group_2__1__Impl_in_rule__TIME__Group_2__19076 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_56_in_rule__TIME__Group_2__1__Impl9104 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TIME__Group_3__0__Impl_in_rule__TIME__Group_3__09139 = new BitSet(new long[]{0x0200000000000000L});
-    public static final BitSet FOLLOW_rule__TIME__Group_3__1_in_rule__TIME__Group_3__09142 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__TIME__Group_3__0__Impl9169 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TIME__Group_3__1__Impl_in_rule__TIME__Group_3__19198 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_57_in_rule__TIME__Group_3__1__Impl9226 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__BooleanLiteral__Group__0__Impl_in_rule__BooleanLiteral__Group__09263 = new BitSet(new long[]{0x2000000000008000L});
-    public static final BitSet FOLLOW_rule__BooleanLiteral__Group__1_in_rule__BooleanLiteral__Group__09266 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__BooleanLiteral__Group__1__Impl_in_rule__BooleanLiteral__Group__19324 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__BooleanLiteral__Alternatives_1_in_rule__BooleanLiteral__Group__1__Impl9351 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RealLiteral__Group__0__Impl_in_rule__RealLiteral__Group__09385 = new BitSet(new long[]{0x0000000000030060L});
-    public static final BitSet FOLLOW_rule__RealLiteral__Group__1_in_rule__RealLiteral__Group__09388 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RealLiteral__Group__1__Impl_in_rule__RealLiteral__Group__19446 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RealLiteral__ValueAssignment_1_in_rule__RealLiteral__Group__1__Impl9473 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IntLiteral__Group__0__Impl_in_rule__IntLiteral__Group__09507 = new BitSet(new long[]{0x0000000000030060L});
-    public static final BitSet FOLLOW_rule__IntLiteral__Group__1_in_rule__IntLiteral__Group__09510 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IntLiteral__Group__1__Impl_in_rule__IntLiteral__Group__19568 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IntLiteral__ValueAssignment_1_in_rule__IntLiteral__Group__1__Impl9595 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StringLiteral__Group__0__Impl_in_rule__StringLiteral__Group__09629 = new BitSet(new long[]{0x20000000000380E0L});
-    public static final BitSet FOLLOW_rule__StringLiteral__Group__1_in_rule__StringLiteral__Group__09632 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StringLiteral__Group__1__Impl_in_rule__StringLiteral__Group__19690 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StringLiteral__ValueAssignment_1_in_rule__StringLiteral__Group__1__Impl9717 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Integer__Group_0__0__Impl_in_rule__Integer__Group_0__09751 = new BitSet(new long[]{0x0000000000030040L});
-    public static final BitSet FOLLOW_rule__Integer__Group_0__1_in_rule__Integer__Group_0__09754 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Integer__Alternatives_0_0_in_rule__Integer__Group_0__0__Impl9781 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Integer__Group_0__1__Impl_in_rule__Integer__Group_0__19812 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__Integer__Group_0__1__Impl9839 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Decimal__Group__0__Impl_in_rule__Decimal__Group__09872 = new BitSet(new long[]{0x0000000000030040L});
-    public static final BitSet FOLLOW_rule__Decimal__Group__1_in_rule__Decimal__Group__09875 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Decimal__Alternatives_0_in_rule__Decimal__Group__0__Impl9902 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Decimal__Group__1__Impl_in_rule__Decimal__Group__19933 = new BitSet(new long[]{0x0400000000000000L});
-    public static final BitSet FOLLOW_rule__Decimal__Group__2_in_rule__Decimal__Group__19936 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__Decimal__Group__1__Impl9963 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Decimal__Group__2__Impl_in_rule__Decimal__Group__29992 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__Decimal__Group__3_in_rule__Decimal__Group__29995 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_58_in_rule__Decimal__Group__2__Impl10023 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Decimal__Group__3__Impl_in_rule__Decimal__Group__310054 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__Decimal__Group__3__Impl10081 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__0__Impl_in_rule__DecimalExp__Group__010118 = new BitSet(new long[]{0x0000000000030060L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__1_in_rule__DecimalExp__Group__010121 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Alternatives_0_in_rule__DecimalExp__Group__0__Impl10148 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__1__Impl_in_rule__DecimalExp__Group__110179 = new BitSet(new long[]{0x0400000000000000L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__2_in_rule__DecimalExp__Group__110182 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__DecimalExp__Group__1__Impl10209 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__2__Impl_in_rule__DecimalExp__Group__210238 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__3_in_rule__DecimalExp__Group__210241 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_58_in_rule__DecimalExp__Group__2__Impl10269 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__3__Impl_in_rule__DecimalExp__Group__310300 = new BitSet(new long[]{0x00000000000C0000L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__4_in_rule__DecimalExp__Group__310303 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__DecimalExp__Group__3__Impl10330 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__4__Impl_in_rule__DecimalExp__Group__410359 = new BitSet(new long[]{0x0000000000030040L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__5_in_rule__DecimalExp__Group__410362 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Alternatives_4_in_rule__DecimalExp__Group__4__Impl10389 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__5__Impl_in_rule__DecimalExp__Group__510419 = new BitSet(new long[]{0x0000000000030040L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__6_in_rule__DecimalExp__Group__510422 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Alternatives_5_in_rule__DecimalExp__Group__5__Impl10449 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__6__Impl_in_rule__DecimalExp__Group__610480 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__DecimalExp__Group__6__Impl10508 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FQN__Group__0__Impl_in_rule__FQN__Group__010552 = new BitSet(new long[]{0x0400000000000000L});
-    public static final BitSet FOLLOW_rule__FQN__Group__1_in_rule__FQN__Group__010555 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__FQN__Group__0__Impl10582 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FQN__Group__1__Impl_in_rule__FQN__Group__110611 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FQN__Group_1__0_in_rule__FQN__Group__1__Impl10638 = new BitSet(new long[]{0x0400000000000002L});
-    public static final BitSet FOLLOW_rule__FQN__Group_1__0__Impl_in_rule__FQN__Group_1__010673 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__FQN__Group_1__1_in_rule__FQN__Group_1__010676 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_58_in_rule__FQN__Group_1__0__Impl10704 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FQN__Group_1__1__Impl_in_rule__FQN__Group_1__110735 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__FQN__Group_1__1__Impl10762 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NodeClass__UnorderedGroup_4__0_in_rule__NodeClass__UnorderedGroup_410796 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NodeClass__Group_4_0__0_in_rule__NodeClass__UnorderedGroup_4__Impl10885 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NodeClass__Group_4_1__0_in_rule__NodeClass__UnorderedGroup_4__Impl10976 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NodeClass__Group_4_2__0_in_rule__NodeClass__UnorderedGroup_4__Impl11067 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NodeClass__UnorderedGroup_4__Impl_in_rule__NodeClass__UnorderedGroup_4__011126 = new BitSet(new long[]{0x000000D000000002L});
-    public static final BitSet FOLLOW_rule__NodeClass__UnorderedGroup_4__1_in_rule__NodeClass__UnorderedGroup_4__011129 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NodeClass__UnorderedGroup_4__Impl_in_rule__NodeClass__UnorderedGroup_4__111154 = new BitSet(new long[]{0x000000D000000002L});
-    public static final BitSet FOLLOW_rule__NodeClass__UnorderedGroup_4__2_in_rule__NodeClass__UnorderedGroup_4__111157 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NodeClass__UnorderedGroup_4__Impl_in_rule__NodeClass__UnorderedGroup_4__211182 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__UnorderedGroup_3__0_in_rule__PhysicalThread__UnorderedGroup_311212 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__Group_3_0__0_in_rule__PhysicalThread__UnorderedGroup_3__Impl11301 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__Group_3_1__0_in_rule__PhysicalThread__UnorderedGroup_3__Impl11392 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__Group_3_2__0_in_rule__PhysicalThread__UnorderedGroup_3__Impl11483 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__Group_3_3__0_in_rule__PhysicalThread__UnorderedGroup_3__Impl11574 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__Group_3_4__0_in_rule__PhysicalThread__UnorderedGroup_3__Impl11665 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__Group_3_5__0_in_rule__PhysicalThread__UnorderedGroup_3__Impl11756 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__UnorderedGroup_3__Impl_in_rule__PhysicalThread__UnorderedGroup_3__011815 = new BitSet(new long[]{0x00003F0000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__UnorderedGroup_3__1_in_rule__PhysicalThread__UnorderedGroup_3__011818 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__UnorderedGroup_3__Impl_in_rule__PhysicalThread__UnorderedGroup_3__111843 = new BitSet(new long[]{0x00003F0000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__UnorderedGroup_3__2_in_rule__PhysicalThread__UnorderedGroup_3__111846 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__UnorderedGroup_3__Impl_in_rule__PhysicalThread__UnorderedGroup_3__211871 = new BitSet(new long[]{0x00003F0000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__UnorderedGroup_3__3_in_rule__PhysicalThread__UnorderedGroup_3__211874 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__UnorderedGroup_3__Impl_in_rule__PhysicalThread__UnorderedGroup_3__311899 = new BitSet(new long[]{0x00003F0000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__UnorderedGroup_3__4_in_rule__PhysicalThread__UnorderedGroup_3__311902 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__UnorderedGroup_3__Impl_in_rule__PhysicalThread__UnorderedGroup_3__411927 = new BitSet(new long[]{0x00003F0000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__UnorderedGroup_3__5_in_rule__PhysicalThread__UnorderedGroup_3__411930 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__UnorderedGroup_3__Impl_in_rule__PhysicalThread__UnorderedGroup_3__511955 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_rule__PhysicalModel__NameAssignment_111995 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleImport_in_rule__PhysicalModel__ImportsAssignment_312026 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rulePhysicalSystem_in_rule__PhysicalModel__SystemsAssignment_4_012057 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNodeClass_in_rule__PhysicalModel__NodeClassesAssignment_4_112088 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRuntimeClass_in_rule__PhysicalModel__RuntimeClassesAssignment_4_212119 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__PhysicalSystem__NameAssignment_112150 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_rule__PhysicalSystem__DocuAssignment_212181 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNodeRef_in_rule__PhysicalSystem__NodeRefsAssignment_412212 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__NodeRef__NameAssignment_112243 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_rule__NodeRef__TypeAssignment_312278 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_rule__NodeRef__DocuAssignment_412313 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__NodeClass__NameAssignment_112344 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_rule__NodeClass__DocuAssignment_212375 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_rule__NodeClass__RuntimeAssignment_4_0_212410 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInteger_in_rule__NodeClass__PriominAssignment_4_1_212445 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInteger_in_rule__NodeClass__PriomaxAssignment_4_2_212476 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rulePhysicalThread_in_rule__NodeClass__ThreadsAssignment_512507 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_59_in_rule__PhysicalThread__DefaultAssignment_0_012543 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__PhysicalThread__NameAssignment_112582 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExecMode_in_rule__PhysicalThread__ExecmodeAssignment_3_0_212613 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTIME_in_rule__PhysicalThread__TimeAssignment_3_1_212644 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInteger_in_rule__PhysicalThread__PrioAssignment_3_2_212675 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__PhysicalThread__StacksizeAssignment_3_3_212706 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__PhysicalThread__MsgblocksizeAssignment_3_4_212737 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__PhysicalThread__MsgpoolsizeAssignment_3_5_212768 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__RuntimeClass__NameAssignment_112799 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_rule__RuntimeClass__DocuAssignment_212830 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleThreadModel_in_rule__RuntimeClass__ThreadModelAssignment_612861 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__KeyValue__KeyAssignment_012895 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLiteral_in_rule__KeyValue__ValueAssignment_212926 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_60_in_rule__SimpleAnnotationAttribute__OptionalAssignment_0_012968 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__SimpleAnnotationAttribute__NameAssignment_213007 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLiteralType_in_rule__SimpleAnnotationAttribute__TypeAssignment_413038 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_60_in_rule__EnumAnnotationAttribute__OptionalAssignment_0_013074 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__EnumAnnotationAttribute__NameAssignment_213113 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__EnumAnnotationAttribute__ValuesAssignment_513144 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__EnumAnnotationAttribute__ValuesAssignment_6_113175 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleImportedFQN_in_rule__Import__ImportedNamespaceAssignment_1_0_013206 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__Import__ImportURIAssignment_213237 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__Documentation__LinesAssignment_213268 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_61_in_rule__BooleanLiteral__IsTrueAssignment_1_113306 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleReal_in_rule__RealLiteral__ValueAssignment_113345 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInteger_in_rule__IntLiteral__ValueAssignment_113376 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__StringLiteral__ValueAssignment_113407 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NodeClass__Group_4_0__0_in_synpred44_InternalETPhys10885 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NodeClass__Group_4_1__0_in_synpred45_InternalETPhys10976 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NodeClass__UnorderedGroup_4__1_in_synpred46_InternalETPhys11129 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NodeClass__UnorderedGroup_4__2_in_synpred47_InternalETPhys11157 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__Group_3_0__0_in_synpred48_InternalETPhys11301 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__Group_3_1__0_in_synpred49_InternalETPhys11392 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__Group_3_2__0_in_synpred50_InternalETPhys11483 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__Group_3_3__0_in_synpred51_InternalETPhys11574 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__Group_3_4__0_in_synpred52_InternalETPhys11665 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__UnorderedGroup_3__1_in_synpred53_InternalETPhys11818 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__UnorderedGroup_3__2_in_synpred54_InternalETPhys11846 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__UnorderedGroup_3__3_in_synpred55_InternalETPhys11874 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__UnorderedGroup_3__4_in_synpred56_InternalETPhys11902 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PhysicalThread__UnorderedGroup_3__5_in_synpred57_InternalETPhys11930 = 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[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x0000000040000000L});
+    public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x0002400980000000L});
+    public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x0002000000000002L});
+    public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x0000400900000002L});
+    public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x0010000040000000L});
+    public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x0000000280000000L});
+    public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0000000200000002L});
+    public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0000000400000000L});
+    public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0010000000000000L});
+    public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x000000D000000000L});
+    public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x0800000080001000L});
+    public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0800000000001002L});
+    public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x0000002000000000L});
+    public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0000000000030060L});
+    public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x00003F0000000000L});
+    public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0000000080000000L});
+    public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x0000000000700000L});
+    public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x0000000000000040L});
+    public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0000000000004000L});
+    public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x0000000001800000L});
+    public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x20000000000380E0L});
+    public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x0000800000000000L});
+    public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x000000001E000000L});
+    public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x0000000000000080L});
+    public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x0001000080000000L});
+    public static final BitSet FOLLOW_29 = new BitSet(new long[]{0x0001000000000002L});
+    public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x0000000000004010L});
+    public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x0004000000000000L});
+    public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x0008000000000000L});
+    public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x0020000000000080L});
+    public static final BitSet FOLLOW_34 = new BitSet(new long[]{0x0000000000000082L});
+    public static final BitSet FOLLOW_35 = new BitSet(new long[]{0x0040000000000000L});
+    public static final BitSet FOLLOW_36 = new BitSet(new long[]{0x0080000000000000L});
+    public static final BitSet FOLLOW_37 = new BitSet(new long[]{0x0100000000000000L});
+    public static final BitSet FOLLOW_38 = new BitSet(new long[]{0x0200000000000000L});
+    public static final BitSet FOLLOW_39 = new BitSet(new long[]{0x2000000000008000L});
+    public static final BitSet FOLLOW_40 = new BitSet(new long[]{0x0000000000030040L});
+    public static final BitSet FOLLOW_41 = new BitSet(new long[]{0x0400000000000000L});
+    public static final BitSet FOLLOW_42 = new BitSet(new long[]{0x00000000000C0000L});
+    public static final BitSet FOLLOW_43 = new BitSet(new long[]{0x0400000000000002L});
+    public static final BitSet FOLLOW_44 = new BitSet(new long[]{0x000000D000000002L});
+    public static final BitSet FOLLOW_45 = new BitSet(new long[]{0x00003F0000000002L});
 
 }
diff --git a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/AbstractETPhysRuntimeModule.java b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/AbstractETPhysRuntimeModule.java
index 87effa3b2..fbf7a87bf 100644
--- a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/AbstractETPhysRuntimeModule.java
+++ b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/AbstractETPhysRuntimeModule.java
@@ -6,7 +6,6 @@ package org.eclipse.etrice.core.etphys;
 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.etphys.ETPhysRuntimeModule}
  */
- @SuppressWarnings("all")
-public abstract class AbstractETPhysRuntimeModule extends DefaultRuntimeModule {
+@SuppressWarnings("all")
+public abstract class AbstractETPhysRuntimeModule extends org.eclipse.xtext.service.DefaultRuntimeModule {
 
 	protected Properties properties = null;
 
diff --git a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/ETPhys.genmodel b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/ETPhys.genmodel
index e4aa2f3b7..235868ec4 100644
--- a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/ETPhys.genmodel
+++ b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/ETPhys.genmodel
@@ -3,8 +3,8 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.etrice.core.etphys/src-gen" editDirectory="/org.eclipse.etrice.core.etphys.edit/src"
     editorDirectory="/org.eclipse.etrice.core.etphys.editor/src" modelPluginID="org.eclipse.etrice.core.etphys"
     forceOverwrite="true" modelName="ETPhys" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.etrice.core.etphys.edit"
-    editorPluginID="org.eclipse.etrice.core.etphys.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.etphys.edit"
+    editorPluginID="org.eclipse.etrice.core.etphys.editor" runtimeVersion="2.12" usedGenPackages="platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.genmodel#//base">
   <genPackages prefix="ETPhys" basePackage="org.eclipse.etrice.core.etphys" disposableProviderFactory="true"
       ecorePackage="ETPhys.ecore#/">
     <genEnums typeSafeEnumCompatible="false" ecoreEnum="ETPhys.ecore#//ExecMode">
@@ -40,7 +40,6 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ETPhys.ecore#//NodeClass/priomin"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ETPhys.ecore#//NodeClass/priomax"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ETPhys.ecore#//NodeClass/threads"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ETPhys.ecore#//NodeClass/re"/>
     </genClasses>
     <genClasses ecoreClass="ETPhys.ecore#//PhysicalThread">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ETPhys.ecore#//PhysicalThread/default"/>
diff --git a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/ETPhys.xtextbin b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/ETPhys.xtextbin
index f7b39cb7b..d7388b370 100644
--- a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/ETPhys.xtextbin
+++ b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/ETPhys.xtextbin
diff --git a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/ETPhysStandaloneSetupGenerated.java b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/ETPhysStandaloneSetupGenerated.java
index 7fb4915c2..0cbe2f023 100644
--- a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/ETPhysStandaloneSetupGenerated.java
+++ b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/ETPhysStandaloneSetupGenerated.java
@@ -1,11 +1,11 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.etphys;
 
 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 ETPhysStandaloneSetupGenerated implements ISetup {
 
+	@Override
 	public Injector createInjectorAndDoEMFRegistration() {
 		org.eclipse.etrice.core.common.BaseStandaloneSetup.doSetup();
 
diff --git a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/ExecMode.java b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/ExecMode.java
index 96bf16b80..2a7443c6e 100644
--- a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/ExecMode.java
+++ b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/ExecMode.java
@@ -120,6 +120,8 @@ public enum ExecMode implements Enumerator
    * Returns the '<em><b>Exec Mode</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 ExecMode get(String literal)
@@ -139,6 +141,8 @@ public enum ExecMode implements Enumerator
    * Returns the '<em><b>Exec Mode</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 ExecMode getByName(String name)
@@ -158,6 +162,8 @@ public enum ExecMode implements Enumerator
    * Returns the '<em><b>Exec Mode</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 ExecMode get(int value)
diff --git a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/NodeClass.java b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/NodeClass.java
index 1ca9393a4..46d503538 100644
--- a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/NodeClass.java
+++ b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/NodeClass.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.etphys.eTPhys.NodeClass#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.etphys.eTPhys.NodeClass#getDocu <em>Docu</em>}</li>
@@ -28,7 +29,6 @@ import org.eclipse.etrice.core.common.base.Documentation;
  *   <li>{@link org.eclipse.etrice.core.etphys.eTPhys.NodeClass#getPriomax <em>Priomax</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.etphys.eTPhys.NodeClass#getThreads <em>Threads</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.etphys.eTPhys.ETPhysPackage#getNodeClass()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/NodeRef.java b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/NodeRef.java
index 8cabc4146..791cbd81a 100644
--- a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/NodeRef.java
+++ b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/NodeRef.java
@@ -18,12 +18,12 @@ import org.eclipse.etrice.core.common.base.Documentation;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.etphys.eTPhys.NodeRef#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.etphys.eTPhys.NodeRef#getType <em>Type</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.etphys.eTPhys.NodeRef#getDocu <em>Docu</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.etphys.eTPhys.ETPhysPackage#getNodeRef()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/PhysicalModel.java b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/PhysicalModel.java
index eb5d5da81..1718cb188 100644
--- a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/PhysicalModel.java
+++ b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/PhysicalModel.java
@@ -21,6 +21,7 @@ import org.eclipse.etrice.core.common.base.Import;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.etphys.eTPhys.PhysicalModel#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.etphys.eTPhys.PhysicalModel#getImports <em>Imports</em>}</li>
@@ -28,7 +29,6 @@ import org.eclipse.etrice.core.common.base.Import;
  *   <li>{@link org.eclipse.etrice.core.etphys.eTPhys.PhysicalModel#getNodeClasses <em>Node Classes</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.etphys.eTPhys.PhysicalModel#getRuntimeClasses <em>Runtime Classes</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.etphys.eTPhys.ETPhysPackage#getPhysicalModel()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/PhysicalSystem.java b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/PhysicalSystem.java
index 517487891..e17f21321 100644
--- a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/PhysicalSystem.java
+++ b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/PhysicalSystem.java
@@ -20,12 +20,12 @@ import org.eclipse.etrice.core.common.base.Documentation;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.etphys.eTPhys.PhysicalSystem#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.etphys.eTPhys.PhysicalSystem#getDocu <em>Docu</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.etphys.eTPhys.PhysicalSystem#getNodeRefs <em>Node Refs</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.etphys.eTPhys.ETPhysPackage#getPhysicalSystem()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/PhysicalThread.java b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/PhysicalThread.java
index a8fd227df..88311d596 100644
--- a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/PhysicalThread.java
+++ b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/PhysicalThread.java
@@ -16,6 +16,7 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.etphys.eTPhys.PhysicalThread#isDefault <em>Default</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.etphys.eTPhys.PhysicalThread#getName <em>Name</em>}</li>
@@ -26,7 +27,6 @@ import org.eclipse.emf.ecore.EObject;
  *   <li>{@link org.eclipse.etrice.core.etphys.eTPhys.PhysicalThread#getMsgblocksize <em>Msgblocksize</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.etphys.eTPhys.PhysicalThread#getMsgpoolsize <em>Msgpoolsize</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.etphys.eTPhys.ETPhysPackage#getPhysicalThread()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/RuntimeClass.java b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/RuntimeClass.java
index 2a788d922..8916dda5c 100644
--- a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/RuntimeClass.java
+++ b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/RuntimeClass.java
@@ -18,12 +18,12 @@ import org.eclipse.etrice.core.common.base.Documentation;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.etphys.eTPhys.RuntimeClass#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.etphys.eTPhys.RuntimeClass#getDocu <em>Docu</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.etphys.eTPhys.RuntimeClass#getThreadModel <em>Thread Model</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.etphys.eTPhys.ETPhysPackage#getRuntimeClass()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/ThreadModel.java b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/ThreadModel.java
index 9ac9ff359..eaefb54fe 100644
--- a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/ThreadModel.java
+++ b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/ThreadModel.java
@@ -94,6 +94,8 @@ public enum ThreadModel implements Enumerator
    * Returns the '<em><b>Thread Model</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 ThreadModel get(String literal)
@@ -113,6 +115,8 @@ public enum ThreadModel implements Enumerator
    * Returns the '<em><b>Thread Model</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 ThreadModel getByName(String name)
@@ -132,6 +136,8 @@ public enum ThreadModel implements Enumerator
    * Returns the '<em><b>Thread Model</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 ThreadModel get(int value)
diff --git a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/impl/NodeClassImpl.java b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/impl/NodeClassImpl.java
index bfb5579d5..cc65cc9fc 100644
--- a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/impl/NodeClassImpl.java
+++ b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/impl/NodeClassImpl.java
@@ -31,6 +31,7 @@ import org.eclipse.etrice.core.etphys.eTPhys.RuntimeClass;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.etphys.eTPhys.impl.NodeClassImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.etphys.eTPhys.impl.NodeClassImpl#getDocu <em>Docu</em>}</li>
@@ -39,7 +40,6 @@ import org.eclipse.etrice.core.etphys.eTPhys.RuntimeClass;
  *   <li>{@link org.eclipse.etrice.core.etphys.eTPhys.impl.NodeClassImpl#getPriomax <em>Priomax</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.etphys.eTPhys.impl.NodeClassImpl#getThreads <em>Threads</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/impl/NodeRefImpl.java b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/impl/NodeRefImpl.java
index f782df979..d06792540 100644
--- a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/impl/NodeRefImpl.java
+++ b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/impl/NodeRefImpl.java
@@ -23,12 +23,12 @@ import org.eclipse.etrice.core.etphys.eTPhys.NodeRef;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.etphys.eTPhys.impl.NodeRefImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.etphys.eTPhys.impl.NodeRefImpl#getType <em>Type</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.etphys.eTPhys.impl.NodeRefImpl#getDocu <em>Docu</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/impl/PhysicalModelImpl.java b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/impl/PhysicalModelImpl.java
index 92f0e16e0..37f4c7f19 100644
--- a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/impl/PhysicalModelImpl.java
+++ b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/impl/PhysicalModelImpl.java
@@ -32,6 +32,7 @@ import org.eclipse.etrice.core.etphys.eTPhys.RuntimeClass;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.etphys.eTPhys.impl.PhysicalModelImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.etphys.eTPhys.impl.PhysicalModelImpl#getImports <em>Imports</em>}</li>
@@ -39,7 +40,6 @@ import org.eclipse.etrice.core.etphys.eTPhys.RuntimeClass;
  *   <li>{@link org.eclipse.etrice.core.etphys.eTPhys.impl.PhysicalModelImpl#getNodeClasses <em>Node Classes</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.etphys.eTPhys.impl.PhysicalModelImpl#getRuntimeClasses <em>Runtime Classes</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/impl/PhysicalSystemImpl.java b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/impl/PhysicalSystemImpl.java
index ed0fceb03..70cbedf2a 100644
--- a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/impl/PhysicalSystemImpl.java
+++ b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/impl/PhysicalSystemImpl.java
@@ -30,12 +30,12 @@ import org.eclipse.etrice.core.etphys.eTPhys.PhysicalSystem;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.etphys.eTPhys.impl.PhysicalSystemImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.etphys.eTPhys.impl.PhysicalSystemImpl#getDocu <em>Docu</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.etphys.eTPhys.impl.PhysicalSystemImpl#getNodeRefs <em>Node Refs</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/impl/PhysicalThreadImpl.java b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/impl/PhysicalThreadImpl.java
index 5eb55542f..b36661924 100644
--- a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/impl/PhysicalThreadImpl.java
+++ b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/impl/PhysicalThreadImpl.java
@@ -19,6 +19,7 @@ import org.eclipse.etrice.core.etphys.eTPhys.PhysicalThread;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.etphys.eTPhys.impl.PhysicalThreadImpl#isDefault <em>Default</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.etphys.eTPhys.impl.PhysicalThreadImpl#getName <em>Name</em>}</li>
@@ -29,7 +30,6 @@ import org.eclipse.etrice.core.etphys.eTPhys.PhysicalThread;
  *   <li>{@link org.eclipse.etrice.core.etphys.eTPhys.impl.PhysicalThreadImpl#getMsgblocksize <em>Msgblocksize</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.etphys.eTPhys.impl.PhysicalThreadImpl#getMsgpoolsize <em>Msgpoolsize</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/impl/RuntimeClassImpl.java b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/impl/RuntimeClassImpl.java
index e21fead65..130cf6f7c 100644
--- a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/impl/RuntimeClassImpl.java
+++ b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/impl/RuntimeClassImpl.java
@@ -23,12 +23,12 @@ import org.eclipse.etrice.core.etphys.eTPhys.ThreadModel;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.etphys.eTPhys.impl.RuntimeClassImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.etphys.eTPhys.impl.RuntimeClassImpl#getDocu <em>Docu</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.etphys.eTPhys.impl.RuntimeClassImpl#getThreadModel <em>Thread Model</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/util/ETPhysSwitch.java b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/util/ETPhysSwitch.java
index 68d0da4b6..e5553cad1 100644
--- a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/util/ETPhysSwitch.java
+++ b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/eTPhys/util/ETPhysSwitch.java
@@ -50,7 +50,7 @@ public class ETPhysSwitch<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
    */
diff --git a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/ETPhysAntlrTokenFileProvider.java b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/ETPhysAntlrTokenFileProvider.java
index 7d5372582..79addb4fa 100644
--- a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/ETPhysAntlrTokenFileProvider.java
+++ b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/ETPhysAntlrTokenFileProvider.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.etphys.parser.antlr;
 
 import java.io.InputStream;
@@ -8,6 +8,7 @@ import org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider;
 
 public class ETPhysAntlrTokenFileProvider implements IAntlrTokenFileProvider {
 	
+	@Override
 	public InputStream getAntlrTokenFile() {
 		ClassLoader classLoader = getClass().getClassLoader();
     	return classLoader.getResourceAsStream("org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.tokens");
diff --git a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/ETPhysParser.java b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/ETPhysParser.java
index 99fa08163..26f18c010 100644
--- a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/ETPhysParser.java
+++ b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/ETPhysParser.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.etphys.parser.antlr;
 
 import com.google.inject.Inject;
diff --git a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g
index ecbf09c00..f8aa98d53 100644
--- a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g
+++ b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 grammar InternalETPhys;
 
 options {
@@ -95,7 +95,7 @@ rulePhysicalModel returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"FQN");
+        		"org.eclipse.etrice.core.common.Base.FQN");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -117,7 +117,7 @@ rulePhysicalModel returns [EObject current=null]
        			$current, 
        			"imports",
         		lv_imports_3_0, 
-        		"Import");
+        		"org.eclipse.etrice.core.common.Base.Import");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -135,7 +135,7 @@ rulePhysicalModel returns [EObject current=null]
        			$current, 
        			"systems",
         		lv_systems_4_0, 
-        		"PhysicalSystem");
+        		"org.eclipse.etrice.core.etphys.ETPhys.PhysicalSystem");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -154,7 +154,7 @@ rulePhysicalModel returns [EObject current=null]
        			$current, 
        			"nodeClasses",
         		lv_nodeClasses_5_0, 
-        		"NodeClass");
+        		"org.eclipse.etrice.core.etphys.ETPhys.NodeClass");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -173,7 +173,7 @@ rulePhysicalModel returns [EObject current=null]
        			$current, 
        			"runtimeClasses",
         		lv_runtimeClasses_6_0, 
-        		"RuntimeClass");
+        		"org.eclipse.etrice.core.etphys.ETPhys.RuntimeClass");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -221,7 +221,7 @@ rulePhysicalSystem returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -238,7 +238,7 @@ rulePhysicalSystem returns [EObject current=null]
        			$current, 
        			"docu",
         		lv_docu_2_0, 
-        		"Documentation");
+        		"org.eclipse.etrice.core.common.Base.Documentation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -260,7 +260,7 @@ rulePhysicalSystem returns [EObject current=null]
        			$current, 
        			"nodeRefs",
         		lv_nodeRefs_4_0, 
-        		"NodeRef");
+        		"org.eclipse.etrice.core.etphys.ETPhys.NodeRef");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -308,7 +308,7 @@ ruleNodeRef returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -344,7 +344,7 @@ ruleNodeRef returns [EObject current=null]
        			$current, 
        			"docu",
         		lv_docu_4_0, 
-        		"Documentation");
+        		"org.eclipse.etrice.core.common.Base.Documentation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -388,7 +388,7 @@ ruleNodeClass returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -405,7 +405,7 @@ ruleNodeClass returns [EObject current=null]
        			$current, 
        			"docu",
         		lv_docu_2_0, 
-        		"Documentation");
+        		"org.eclipse.etrice.core.common.Base.Documentation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -484,7 +484,7 @@ ruleNodeClass returns [EObject current=null]
        			$current, 
        			"priomin",
         		lv_priomin_10_0, 
-        		"Integer");
+        		"org.eclipse.etrice.core.common.Base.Integer");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -522,7 +522,7 @@ ruleNodeClass returns [EObject current=null]
        			$current, 
        			"priomax",
         		lv_priomax_13_0, 
-        		"Integer");
+        		"org.eclipse.etrice.core.common.Base.Integer");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -555,7 +555,7 @@ ruleNodeClass returns [EObject current=null]
        			$current, 
        			"threads",
         		lv_threads_14_0, 
-        		"PhysicalThread");
+        		"org.eclipse.etrice.core.etphys.ETPhys.PhysicalThread");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -619,7 +619,7 @@ rulePhysicalThread returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_2_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -662,7 +662,7 @@ rulePhysicalThread returns [EObject current=null]
        			$current, 
        			"execmode",
         		lv_execmode_7_0, 
-        		"ExecMode");
+        		"org.eclipse.etrice.core.etphys.ETPhys.ExecMode");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -700,7 +700,7 @@ rulePhysicalThread returns [EObject current=null]
        			$current, 
        			"time",
         		lv_time_10_0, 
-        		"TIME");
+        		"org.eclipse.etrice.core.common.Base.TIME");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -738,7 +738,7 @@ rulePhysicalThread returns [EObject current=null]
        			$current, 
        			"prio",
         		lv_prio_13_0, 
-        		"Integer");
+        		"org.eclipse.etrice.core.common.Base.Integer");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -777,7 +777,7 @@ rulePhysicalThread returns [EObject current=null]
        			$current, 
        			"stacksize",
         		lv_stacksize_16_0, 
-        		"INT");
+        		"org.eclipse.xtext.common.Terminals.INT");
 	    }
 
 )
@@ -815,7 +815,7 @@ rulePhysicalThread returns [EObject current=null]
        			$current, 
        			"msgblocksize",
         		lv_msgblocksize_19_0, 
-        		"INT");
+        		"org.eclipse.xtext.common.Terminals.INT");
 	    }
 
 )
@@ -853,7 +853,7 @@ rulePhysicalThread returns [EObject current=null]
        			$current, 
        			"msgpoolsize",
         		lv_msgpoolsize_22_0, 
-        		"INT");
+        		"org.eclipse.xtext.common.Terminals.INT");
 	    }
 
 )
@@ -915,7 +915,7 @@ ruleRuntimeClass returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -932,7 +932,7 @@ ruleRuntimeClass returns [EObject current=null]
        			$current, 
        			"docu",
         		lv_docu_2_0, 
-        		"Documentation");
+        		"org.eclipse.etrice.core.common.Base.Documentation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -962,7 +962,7 @@ ruleRuntimeClass returns [EObject current=null]
        			$current, 
        			"threadModel",
         		lv_threadModel_6_0, 
-        		"ThreadModel");
+        		"org.eclipse.etrice.core.etphys.ETPhys.ThreadModel");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1008,7 +1008,7 @@ ruleKeyValue returns [EObject current=null]
        			$current, 
        			"key",
         		lv_key_0_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -1029,7 +1029,7 @@ ruleKeyValue returns [EObject current=null]
        			$current, 
        			"value",
         		lv_value_2_0, 
-        		"Literal");
+        		"org.eclipse.etrice.core.common.Base.Literal");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1163,7 +1163,7 @@ ruleSimpleAnnotationAttribute returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_3_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -1184,7 +1184,7 @@ ruleSimpleAnnotationAttribute returns [EObject current=null]
        			$current, 
        			"type",
         		lv_type_5_0, 
-        		"LiteralType");
+        		"org.eclipse.etrice.core.common.Base.LiteralType");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1248,7 +1248,7 @@ ruleEnumAnnotationAttribute returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_3_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -1274,7 +1274,7 @@ ruleEnumAnnotationAttribute returns [EObject current=null]
        			$current, 
        			"values",
         		lv_values_6_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -1296,7 +1296,7 @@ ruleEnumAnnotationAttribute returns [EObject current=null]
        			$current, 
        			"values",
         		lv_values_8_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -1342,7 +1342,7 @@ ruleImport returns [EObject current=null]
        			$current, 
        			"importedNamespace",
         		lv_importedNamespace_1_0, 
-        		"ImportedFQN");
+        		"org.eclipse.etrice.core.common.Base.ImportedFQN");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1370,7 +1370,7 @@ ruleImport returns [EObject current=null]
        			$current, 
        			"importURI",
         		lv_importURI_4_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -1457,7 +1457,7 @@ ruleDocumentation returns [EObject current=null]
        			$current, 
        			"lines",
         		lv_lines_2_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -1720,7 +1720,7 @@ ruleRealLiteral returns [EObject current=null]
        			$current, 
        			"value",
         		lv_value_1_0, 
-        		"Real");
+        		"org.eclipse.etrice.core.common.Base.Real");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1765,7 +1765,7 @@ ruleIntLiteral returns [EObject current=null]
        			$current, 
        			"value",
         		lv_value_1_0, 
-        		"Integer");
+        		"org.eclipse.etrice.core.common.Base.Integer");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1811,7 +1811,7 @@ ruleStringLiteral returns [EObject current=null]
        			$current, 
        			"value",
         		lv_value_1_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -2059,14 +2059,14 @@ ruleDecimalExp returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToke
         $current.merge(kw);
         newLeafNode(kw, grammarAccess.getDecimalExpAccess().getHyphenMinusKeyword_5_1()); 
     }
-)?(( RULE_INT)=>    this_INT_9=RULE_INT    {
+)?    this_INT_9=RULE_INT    {
 		$current.merge(this_INT_9);
     }
 
     { 
     newLeafNode(this_INT_9, grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_6()); 
     }
-))
+)
     ;
 finally {
 	myHiddenTokenState.restore();
diff --git a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhysLexer.java b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhysLexer.java
index 1736307e1..612576eec 100644
--- a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhysLexer.java
+++ b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhysLexer.java
@@ -83,15 +83,15 @@ public class InternalETPhysLexer extends Lexer {
         super(input,state);
 
     }
-    public String getGrammarFileName() { return "../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g"; }
+    public String getGrammarFileName() { return "InternalETPhys.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.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:11:7: ( 'PhysicalModel' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:11:9: 'PhysicalModel'
+            // InternalETPhys.g:11:7: ( 'PhysicalModel' )
+            // InternalETPhys.g:11:9: 'PhysicalModel'
             {
             match("PhysicalModel"); 
 
@@ -111,8 +111,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__13;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:12:7: ( '{' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:12:9: '{'
+            // InternalETPhys.g:12:7: ( '{' )
+            // InternalETPhys.g:12:9: '{'
             {
             match('{'); 
 
@@ -131,8 +131,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__14;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:13:7: ( '}' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:13:9: '}'
+            // InternalETPhys.g:13:7: ( '}' )
+            // InternalETPhys.g:13:9: '}'
             {
             match('}'); 
 
@@ -151,8 +151,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__15;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:14:7: ( 'PhysicalSystem' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:14:9: 'PhysicalSystem'
+            // InternalETPhys.g:14:7: ( 'PhysicalSystem' )
+            // InternalETPhys.g:14:9: 'PhysicalSystem'
             {
             match("PhysicalSystem"); 
 
@@ -172,8 +172,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__16;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:15:7: ( 'NodeRef' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:15:9: 'NodeRef'
+            // InternalETPhys.g:15:7: ( 'NodeRef' )
+            // InternalETPhys.g:15:9: 'NodeRef'
             {
             match("NodeRef"); 
 
@@ -193,8 +193,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__17;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:16:7: ( ':' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:16:9: ':'
+            // InternalETPhys.g:16:7: ( ':' )
+            // InternalETPhys.g:16:9: ':'
             {
             match(':'); 
 
@@ -213,8 +213,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__18;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:17:7: ( 'NodeClass' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:17:9: 'NodeClass'
+            // InternalETPhys.g:17:7: ( 'NodeClass' )
+            // InternalETPhys.g:17:9: 'NodeClass'
             {
             match("NodeClass"); 
 
@@ -234,8 +234,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__19;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:18:7: ( 'runtime' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:18:9: 'runtime'
+            // InternalETPhys.g:18:7: ( 'runtime' )
+            // InternalETPhys.g:18:9: 'runtime'
             {
             match("runtime"); 
 
@@ -255,8 +255,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__20;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:19:7: ( '=' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:19:9: '='
+            // InternalETPhys.g:19:7: ( '=' )
+            // InternalETPhys.g:19:9: '='
             {
             match('='); 
 
@@ -275,8 +275,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__21;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:20:7: ( 'priomin' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:20:9: 'priomin'
+            // InternalETPhys.g:20:7: ( 'priomin' )
+            // InternalETPhys.g:20:9: 'priomin'
             {
             match("priomin"); 
 
@@ -296,8 +296,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__22;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:21:7: ( 'priomax' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:21:9: 'priomax'
+            // InternalETPhys.g:21:7: ( 'priomax' )
+            // InternalETPhys.g:21:9: 'priomax'
             {
             match("priomax"); 
 
@@ -317,8 +317,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__23;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:22:7: ( 'DefaultThread' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:22:9: 'DefaultThread'
+            // InternalETPhys.g:22:7: ( 'DefaultThread' )
+            // InternalETPhys.g:22:9: 'DefaultThread'
             {
             match("DefaultThread"); 
 
@@ -338,8 +338,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__24;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:23:7: ( 'Thread' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:23:9: 'Thread'
+            // InternalETPhys.g:23:7: ( 'Thread' )
+            // InternalETPhys.g:23:9: 'Thread'
             {
             match("Thread"); 
 
@@ -359,8 +359,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__25;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:24:7: ( 'execmode' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:24:9: 'execmode'
+            // InternalETPhys.g:24:7: ( 'execmode' )
+            // InternalETPhys.g:24:9: 'execmode'
             {
             match("execmode"); 
 
@@ -380,8 +380,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__26;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:25:7: ( 'interval' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:25:9: 'interval'
+            // InternalETPhys.g:25:7: ( 'interval' )
+            // InternalETPhys.g:25:9: 'interval'
             {
             match("interval"); 
 
@@ -401,8 +401,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__27;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:26:7: ( 'prio' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:26:9: 'prio'
+            // InternalETPhys.g:26:7: ( 'prio' )
+            // InternalETPhys.g:26:9: 'prio'
             {
             match("prio"); 
 
@@ -422,8 +422,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__28;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:27:7: ( 'stacksize' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:27:9: 'stacksize'
+            // InternalETPhys.g:27:7: ( 'stacksize' )
+            // InternalETPhys.g:27:9: 'stacksize'
             {
             match("stacksize"); 
 
@@ -443,8 +443,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__29;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:28:7: ( 'msgblocksize' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:28:9: 'msgblocksize'
+            // InternalETPhys.g:28:7: ( 'msgblocksize' )
+            // InternalETPhys.g:28:9: 'msgblocksize'
             {
             match("msgblocksize"); 
 
@@ -464,8 +464,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__30;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:29:7: ( 'msgpoolsize' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:29:9: 'msgpoolsize'
+            // InternalETPhys.g:29:7: ( 'msgpoolsize' )
+            // InternalETPhys.g:29:9: 'msgpoolsize'
             {
             match("msgpoolsize"); 
 
@@ -485,8 +485,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__31;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:30:7: ( 'RuntimeClass' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:30:9: 'RuntimeClass'
+            // InternalETPhys.g:30:7: ( 'RuntimeClass' )
+            // InternalETPhys.g:30:9: 'RuntimeClass'
             {
             match("RuntimeClass"); 
 
@@ -506,8 +506,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__32;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:31:7: ( 'model' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:31:9: 'model'
+            // InternalETPhys.g:31:7: ( 'model' )
+            // InternalETPhys.g:31:9: 'model'
             {
             match("model"); 
 
@@ -527,8 +527,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__33;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:32:7: ( 'optional' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:32:9: 'optional'
+            // InternalETPhys.g:32:7: ( 'optional' )
+            // InternalETPhys.g:32:9: 'optional'
             {
             match("optional"); 
 
@@ -548,8 +548,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__34;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:33:7: ( 'mandatory' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:33:9: 'mandatory'
+            // InternalETPhys.g:33:7: ( 'mandatory' )
+            // InternalETPhys.g:33:9: 'mandatory'
             {
             match("mandatory"); 
 
@@ -569,8 +569,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__35;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:34:7: ( 'attribute' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:34:9: 'attribute'
+            // InternalETPhys.g:34:7: ( 'attribute' )
+            // InternalETPhys.g:34:9: 'attribute'
             {
             match("attribute"); 
 
@@ -590,8 +590,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__36;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:35:7: ( ',' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:35:9: ','
+            // InternalETPhys.g:35:7: ( ',' )
+            // InternalETPhys.g:35:9: ','
             {
             match(','); 
 
@@ -610,8 +610,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__37;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:36:7: ( 'import' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:36:9: 'import'
+            // InternalETPhys.g:36:7: ( 'import' )
+            // InternalETPhys.g:36:9: 'import'
             {
             match("import"); 
 
@@ -631,8 +631,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__38;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:37:7: ( 'from' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:37:9: 'from'
+            // InternalETPhys.g:37:7: ( 'from' )
+            // InternalETPhys.g:37:9: 'from'
             {
             match("from"); 
 
@@ -652,8 +652,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__39;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:38:7: ( '.*' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:38:9: '.*'
+            // InternalETPhys.g:38:7: ( '.*' )
+            // InternalETPhys.g:38:9: '.*'
             {
             match(".*"); 
 
@@ -673,8 +673,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__40;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:39:7: ( '[' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:39:9: '['
+            // InternalETPhys.g:39:7: ( '[' )
+            // InternalETPhys.g:39:9: '['
             {
             match('['); 
 
@@ -693,8 +693,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__41;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:40:7: ( ']' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:40:9: ']'
+            // InternalETPhys.g:40:7: ( ']' )
+            // InternalETPhys.g:40:9: ']'
             {
             match(']'); 
 
@@ -713,8 +713,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__42;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:41:7: ( 's' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:41:9: 's'
+            // InternalETPhys.g:41:7: ( 's' )
+            // InternalETPhys.g:41:9: 's'
             {
             match('s'); 
 
@@ -733,8 +733,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__43;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:42:7: ( 'ms' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:42:9: 'ms'
+            // InternalETPhys.g:42:7: ( 'ms' )
+            // InternalETPhys.g:42:9: 'ms'
             {
             match("ms"); 
 
@@ -754,8 +754,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__44;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:43:7: ( 'us' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:43:9: 'us'
+            // InternalETPhys.g:43:7: ( 'us' )
+            // InternalETPhys.g:43:9: 'us'
             {
             match("us"); 
 
@@ -775,8 +775,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__45;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:44:7: ( 'ns' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:44:9: 'ns'
+            // InternalETPhys.g:44:7: ( 'ns' )
+            // InternalETPhys.g:44:9: 'ns'
             {
             match("ns"); 
 
@@ -796,8 +796,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__46;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:45:7: ( 'false' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:45:9: 'false'
+            // InternalETPhys.g:45:7: ( 'false' )
+            // InternalETPhys.g:45:9: 'false'
             {
             match("false"); 
 
@@ -817,8 +817,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__47;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:46:7: ( 'true' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:46:9: 'true'
+            // InternalETPhys.g:46:7: ( 'true' )
+            // InternalETPhys.g:46:9: 'true'
             {
             match("true"); 
 
@@ -838,8 +838,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__48;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:47:7: ( '+' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:47:9: '+'
+            // InternalETPhys.g:47:7: ( '+' )
+            // InternalETPhys.g:47:9: '+'
             {
             match('+'); 
 
@@ -858,8 +858,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__49;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:48:7: ( '-' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:48:9: '-'
+            // InternalETPhys.g:48:7: ( '-' )
+            // InternalETPhys.g:48:9: '-'
             {
             match('-'); 
 
@@ -878,8 +878,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__50;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:49:7: ( '.' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:49:9: '.'
+            // InternalETPhys.g:49:7: ( '.' )
+            // InternalETPhys.g:49:9: '.'
             {
             match('.'); 
 
@@ -898,8 +898,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__51;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:50:7: ( 'e' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:50:9: 'e'
+            // InternalETPhys.g:50:7: ( 'e' )
+            // InternalETPhys.g:50:9: 'e'
             {
             match('e'); 
 
@@ -918,8 +918,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__52;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:51:7: ( 'E' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:51:9: 'E'
+            // InternalETPhys.g:51:7: ( 'E' )
+            // InternalETPhys.g:51:9: 'E'
             {
             match('E'); 
 
@@ -938,8 +938,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__53;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:52:7: ( 'polled' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:52:9: 'polled'
+            // InternalETPhys.g:52:7: ( 'polled' )
+            // InternalETPhys.g:52:9: 'polled'
             {
             match("polled"); 
 
@@ -959,8 +959,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__54;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:53:7: ( 'blocked' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:53:9: 'blocked'
+            // InternalETPhys.g:53:7: ( 'blocked' )
+            // InternalETPhys.g:53:9: 'blocked'
             {
             match("blocked"); 
 
@@ -980,8 +980,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__55;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:54:7: ( 'mixed' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:54:9: 'mixed'
+            // InternalETPhys.g:54:7: ( 'mixed' )
+            // InternalETPhys.g:54:9: 'mixed'
             {
             match("mixed"); 
 
@@ -1001,8 +1001,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__56;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:55:7: ( 'singleThreaded' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:55:9: 'singleThreaded'
+            // InternalETPhys.g:55:7: ( 'singleThreaded' )
+            // InternalETPhys.g:55:9: 'singleThreaded'
             {
             match("singleThreaded"); 
 
@@ -1022,8 +1022,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__57;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:56:7: ( 'multiThreaded' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:56:9: 'multiThreaded'
+            // InternalETPhys.g:56:7: ( 'multiThreaded' )
+            // InternalETPhys.g:56:9: 'multiThreaded'
             {
             match("multiThreaded"); 
 
@@ -1043,8 +1043,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__58;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:57:7: ( 'ptBoolean' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:57:9: 'ptBoolean'
+            // InternalETPhys.g:57:7: ( 'ptBoolean' )
+            // InternalETPhys.g:57:9: 'ptBoolean'
             {
             match("ptBoolean"); 
 
@@ -1064,8 +1064,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__59;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:58:7: ( 'ptInteger' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:58:9: 'ptInteger'
+            // InternalETPhys.g:58:7: ( 'ptInteger' )
+            // InternalETPhys.g:58:9: 'ptInteger'
             {
             match("ptInteger"); 
 
@@ -1085,8 +1085,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__60;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:59:7: ( 'ptReal' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:59:9: 'ptReal'
+            // InternalETPhys.g:59:7: ( 'ptReal' )
+            // InternalETPhys.g:59:9: 'ptReal'
             {
             match("ptReal"); 
 
@@ -1106,8 +1106,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = T__61;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:60:7: ( 'ptCharacter' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:60:9: 'ptCharacter'
+            // InternalETPhys.g:60:7: ( 'ptCharacter' )
+            // InternalETPhys.g:60:9: 'ptCharacter'
             {
             match("ptCharacter"); 
 
@@ -1127,10 +1127,10 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = RULE_HEX;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2195:10: ( ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+ )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2195:12: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+
+            // InternalETPhys.g:2195:10: ( ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+ )
+            // InternalETPhys.g:2195:12: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2195:12: ( '0x' | '0X' )
+            // InternalETPhys.g:2195:12: ( '0x' | '0X' )
             int alt1=2;
             int LA1_0 = input.LA(1);
 
@@ -1158,7 +1158,7 @@ public class InternalETPhysLexer extends Lexer {
             }
             switch (alt1) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2195:13: '0x'
+                    // InternalETPhys.g:2195:13: '0x'
                     {
                     match("0x"); 
 
@@ -1166,7 +1166,7 @@ public class InternalETPhysLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2195:18: '0X'
+                    // InternalETPhys.g:2195:18: '0X'
                     {
                     match("0X"); 
 
@@ -1176,7 +1176,7 @@ public class InternalETPhysLexer extends Lexer {
 
             }
 
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2195:24: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+
+            // InternalETPhys.g:2195:24: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+
             int cnt2=0;
             loop2:
             do {
@@ -1190,7 +1190,7 @@ public class InternalETPhysLexer extends Lexer {
 
                 switch (alt2) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:
+            	    // InternalETPhys.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();
@@ -1230,10 +1230,10 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = RULE_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2197:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2197:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalETPhys.g:2197:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+            // InternalETPhys.g:2197:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2197:11: ( '^' )?
+            // InternalETPhys.g:2197:11: ( '^' )?
             int alt3=2;
             int LA3_0 = input.LA(1);
 
@@ -1242,7 +1242,7 @@ public class InternalETPhysLexer extends Lexer {
             }
             switch (alt3) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2197:11: '^'
+                    // InternalETPhys.g:2197:11: '^'
                     {
                     match('^'); 
 
@@ -1260,7 +1260,7 @@ public class InternalETPhysLexer extends Lexer {
                 recover(mse);
                 throw mse;}
 
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2197:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalETPhys.g:2197:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             loop4:
             do {
                 int alt4=2;
@@ -1273,7 +1273,7 @@ public class InternalETPhysLexer extends Lexer {
 
                 switch (alt4) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:
+            	    // InternalETPhys.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();
@@ -1309,10 +1309,10 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = RULE_INT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2199:10: ( ( '0' .. '9' )+ )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2199:12: ( '0' .. '9' )+
+            // InternalETPhys.g:2199:10: ( ( '0' .. '9' )+ )
+            // InternalETPhys.g:2199:12: ( '0' .. '9' )+
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2199:12: ( '0' .. '9' )+
+            // InternalETPhys.g:2199:12: ( '0' .. '9' )+
             int cnt5=0;
             loop5:
             do {
@@ -1326,7 +1326,7 @@ public class InternalETPhysLexer extends Lexer {
 
                 switch (alt5) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2199:13: '0' .. '9'
+            	    // InternalETPhys.g:2199:13: '0' .. '9'
             	    {
             	    matchRange('0','9'); 
 
@@ -1358,10 +1358,10 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = RULE_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2201:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2201:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalETPhys.g:2201:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+            // InternalETPhys.g:2201:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2201:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalETPhys.g:2201:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             int alt8=2;
             int LA8_0 = input.LA(1);
 
@@ -1379,10 +1379,10 @@ public class InternalETPhysLexer extends Lexer {
             }
             switch (alt8) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2201:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+                    // InternalETPhys.g:2201:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
                     {
                     match('\"'); 
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2201:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+                    // InternalETPhys.g:2201:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
                     loop6:
                     do {
                         int alt6=3;
@@ -1398,7 +1398,7 @@ public class InternalETPhysLexer extends Lexer {
 
                         switch (alt6) {
                     	case 1 :
-                    	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2201:21: '\\\\' .
+                    	    // InternalETPhys.g:2201:21: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -1406,7 +1406,7 @@ public class InternalETPhysLexer extends Lexer {
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2201:28: ~ ( ( '\\\\' | '\"' ) )
+                    	    // InternalETPhys.g:2201:28: ~ ( ( '\\\\' | '\"' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -1431,10 +1431,10 @@ public class InternalETPhysLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2201:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+                    // InternalETPhys.g:2201:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
                     {
                     match('\''); 
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2201:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+                    // InternalETPhys.g:2201:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
                     loop7:
                     do {
                         int alt7=3;
@@ -1450,7 +1450,7 @@ public class InternalETPhysLexer extends Lexer {
 
                         switch (alt7) {
                     	case 1 :
-                    	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2201:54: '\\\\' .
+                    	    // InternalETPhys.g:2201:54: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -1458,7 +1458,7 @@ public class InternalETPhysLexer extends Lexer {
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2201:61: ~ ( ( '\\\\' | '\\'' ) )
+                    	    // InternalETPhys.g:2201:61: ~ ( ( '\\\\' | '\\'' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -1501,12 +1501,12 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = RULE_ML_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2203:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2203:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // InternalETPhys.g:2203:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // InternalETPhys.g:2203:19: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); 
 
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2203:24: ( options {greedy=false; } : . )*
+            // InternalETPhys.g:2203:24: ( options {greedy=false; } : . )*
             loop9:
             do {
                 int alt9=2;
@@ -1531,7 +1531,7 @@ public class InternalETPhysLexer extends Lexer {
 
                 switch (alt9) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2203:52: .
+            	    // InternalETPhys.g:2203:52: .
             	    {
             	    matchAny(); 
 
@@ -1561,12 +1561,12 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = RULE_SL_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2205:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2205:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // InternalETPhys.g:2205:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // InternalETPhys.g:2205:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
             {
             match("//"); 
 
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2205:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            // InternalETPhys.g:2205:24: (~ ( ( '\\n' | '\\r' ) ) )*
             loop10:
             do {
                 int alt10=2;
@@ -1579,7 +1579,7 @@ public class InternalETPhysLexer extends Lexer {
 
                 switch (alt10) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2205:24: ~ ( ( '\\n' | '\\r' ) )
+            	    // InternalETPhys.g:2205: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();
@@ -1599,7 +1599,7 @@ public class InternalETPhysLexer extends Lexer {
                 }
             } while (true);
 
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2205:40: ( ( '\\r' )? '\\n' )?
+            // InternalETPhys.g:2205:40: ( ( '\\r' )? '\\n' )?
             int alt12=2;
             int LA12_0 = input.LA(1);
 
@@ -1608,9 +1608,9 @@ public class InternalETPhysLexer extends Lexer {
             }
             switch (alt12) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2205:41: ( '\\r' )? '\\n'
+                    // InternalETPhys.g:2205:41: ( '\\r' )? '\\n'
                     {
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2205:41: ( '\\r' )?
+                    // InternalETPhys.g:2205:41: ( '\\r' )?
                     int alt11=2;
                     int LA11_0 = input.LA(1);
 
@@ -1619,7 +1619,7 @@ public class InternalETPhysLexer extends Lexer {
                     }
                     switch (alt11) {
                         case 1 :
-                            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2205:41: '\\r'
+                            // InternalETPhys.g:2205:41: '\\r'
                             {
                             match('\r'); 
 
@@ -1651,10 +1651,10 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = RULE_WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2207:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2207:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalETPhys.g:2207:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // InternalETPhys.g:2207:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2207:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalETPhys.g:2207:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             int cnt13=0;
             loop13:
             do {
@@ -1668,7 +1668,7 @@ public class InternalETPhysLexer extends Lexer {
 
                 switch (alt13) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:
+            	    // InternalETPhys.g:
             	    {
             	    if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) {
             	        input.consume();
@@ -1708,8 +1708,8 @@ public class InternalETPhysLexer extends Lexer {
         try {
             int _type = RULE_ANY_OTHER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2209:16: ( . )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2209:18: .
+            // InternalETPhys.g:2209:16: ( . )
+            // InternalETPhys.g:2209:18: .
             {
             matchAny(); 
 
@@ -1724,411 +1724,411 @@ public class InternalETPhysLexer extends Lexer {
     // $ANTLR end "RULE_ANY_OTHER"
 
     public void mTokens() throws RecognitionException {
-        // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.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 | RULE_HEX | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+        // InternalETPhys.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 | RULE_HEX | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
         int alt14=58;
         alt14 = dfa14.predict(input);
         switch (alt14) {
             case 1 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:10: T__12
+                // InternalETPhys.g:1:10: T__12
                 {
                 mT__12(); 
 
                 }
                 break;
             case 2 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:16: T__13
+                // InternalETPhys.g:1:16: T__13
                 {
                 mT__13(); 
 
                 }
                 break;
             case 3 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:22: T__14
+                // InternalETPhys.g:1:22: T__14
                 {
                 mT__14(); 
 
                 }
                 break;
             case 4 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:28: T__15
+                // InternalETPhys.g:1:28: T__15
                 {
                 mT__15(); 
 
                 }
                 break;
             case 5 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:34: T__16
+                // InternalETPhys.g:1:34: T__16
                 {
                 mT__16(); 
 
                 }
                 break;
             case 6 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:40: T__17
+                // InternalETPhys.g:1:40: T__17
                 {
                 mT__17(); 
 
                 }
                 break;
             case 7 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:46: T__18
+                // InternalETPhys.g:1:46: T__18
                 {
                 mT__18(); 
 
                 }
                 break;
             case 8 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:52: T__19
+                // InternalETPhys.g:1:52: T__19
                 {
                 mT__19(); 
 
                 }
                 break;
             case 9 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:58: T__20
+                // InternalETPhys.g:1:58: T__20
                 {
                 mT__20(); 
 
                 }
                 break;
             case 10 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:64: T__21
+                // InternalETPhys.g:1:64: T__21
                 {
                 mT__21(); 
 
                 }
                 break;
             case 11 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:70: T__22
+                // InternalETPhys.g:1:70: T__22
                 {
                 mT__22(); 
 
                 }
                 break;
             case 12 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:76: T__23
+                // InternalETPhys.g:1:76: T__23
                 {
                 mT__23(); 
 
                 }
                 break;
             case 13 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:82: T__24
+                // InternalETPhys.g:1:82: T__24
                 {
                 mT__24(); 
 
                 }
                 break;
             case 14 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:88: T__25
+                // InternalETPhys.g:1:88: T__25
                 {
                 mT__25(); 
 
                 }
                 break;
             case 15 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:94: T__26
+                // InternalETPhys.g:1:94: T__26
                 {
                 mT__26(); 
 
                 }
                 break;
             case 16 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:100: T__27
+                // InternalETPhys.g:1:100: T__27
                 {
                 mT__27(); 
 
                 }
                 break;
             case 17 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:106: T__28
+                // InternalETPhys.g:1:106: T__28
                 {
                 mT__28(); 
 
                 }
                 break;
             case 18 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:112: T__29
+                // InternalETPhys.g:1:112: T__29
                 {
                 mT__29(); 
 
                 }
                 break;
             case 19 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:118: T__30
+                // InternalETPhys.g:1:118: T__30
                 {
                 mT__30(); 
 
                 }
                 break;
             case 20 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:124: T__31
+                // InternalETPhys.g:1:124: T__31
                 {
                 mT__31(); 
 
                 }
                 break;
             case 21 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:130: T__32
+                // InternalETPhys.g:1:130: T__32
                 {
                 mT__32(); 
 
                 }
                 break;
             case 22 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:136: T__33
+                // InternalETPhys.g:1:136: T__33
                 {
                 mT__33(); 
 
                 }
                 break;
             case 23 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:142: T__34
+                // InternalETPhys.g:1:142: T__34
                 {
                 mT__34(); 
 
                 }
                 break;
             case 24 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:148: T__35
+                // InternalETPhys.g:1:148: T__35
                 {
                 mT__35(); 
 
                 }
                 break;
             case 25 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:154: T__36
+                // InternalETPhys.g:1:154: T__36
                 {
                 mT__36(); 
 
                 }
                 break;
             case 26 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:160: T__37
+                // InternalETPhys.g:1:160: T__37
                 {
                 mT__37(); 
 
                 }
                 break;
             case 27 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:166: T__38
+                // InternalETPhys.g:1:166: T__38
                 {
                 mT__38(); 
 
                 }
                 break;
             case 28 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:172: T__39
+                // InternalETPhys.g:1:172: T__39
                 {
                 mT__39(); 
 
                 }
                 break;
             case 29 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:178: T__40
+                // InternalETPhys.g:1:178: T__40
                 {
                 mT__40(); 
 
                 }
                 break;
             case 30 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:184: T__41
+                // InternalETPhys.g:1:184: T__41
                 {
                 mT__41(); 
 
                 }
                 break;
             case 31 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:190: T__42
+                // InternalETPhys.g:1:190: T__42
                 {
                 mT__42(); 
 
                 }
                 break;
             case 32 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:196: T__43
+                // InternalETPhys.g:1:196: T__43
                 {
                 mT__43(); 
 
                 }
                 break;
             case 33 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:202: T__44
+                // InternalETPhys.g:1:202: T__44
                 {
                 mT__44(); 
 
                 }
                 break;
             case 34 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:208: T__45
+                // InternalETPhys.g:1:208: T__45
                 {
                 mT__45(); 
 
                 }
                 break;
             case 35 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:214: T__46
+                // InternalETPhys.g:1:214: T__46
                 {
                 mT__46(); 
 
                 }
                 break;
             case 36 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:220: T__47
+                // InternalETPhys.g:1:220: T__47
                 {
                 mT__47(); 
 
                 }
                 break;
             case 37 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:226: T__48
+                // InternalETPhys.g:1:226: T__48
                 {
                 mT__48(); 
 
                 }
                 break;
             case 38 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:232: T__49
+                // InternalETPhys.g:1:232: T__49
                 {
                 mT__49(); 
 
                 }
                 break;
             case 39 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:238: T__50
+                // InternalETPhys.g:1:238: T__50
                 {
                 mT__50(); 
 
                 }
                 break;
             case 40 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:244: T__51
+                // InternalETPhys.g:1:244: T__51
                 {
                 mT__51(); 
 
                 }
                 break;
             case 41 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:250: T__52
+                // InternalETPhys.g:1:250: T__52
                 {
                 mT__52(); 
 
                 }
                 break;
             case 42 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:256: T__53
+                // InternalETPhys.g:1:256: T__53
                 {
                 mT__53(); 
 
                 }
                 break;
             case 43 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:262: T__54
+                // InternalETPhys.g:1:262: T__54
                 {
                 mT__54(); 
 
                 }
                 break;
             case 44 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:268: T__55
+                // InternalETPhys.g:1:268: T__55
                 {
                 mT__55(); 
 
                 }
                 break;
             case 45 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:274: T__56
+                // InternalETPhys.g:1:274: T__56
                 {
                 mT__56(); 
 
                 }
                 break;
             case 46 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:280: T__57
+                // InternalETPhys.g:1:280: T__57
                 {
                 mT__57(); 
 
                 }
                 break;
             case 47 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:286: T__58
+                // InternalETPhys.g:1:286: T__58
                 {
                 mT__58(); 
 
                 }
                 break;
             case 48 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:292: T__59
+                // InternalETPhys.g:1:292: T__59
                 {
                 mT__59(); 
 
                 }
                 break;
             case 49 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:298: T__60
+                // InternalETPhys.g:1:298: T__60
                 {
                 mT__60(); 
 
                 }
                 break;
             case 50 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:304: T__61
+                // InternalETPhys.g:1:304: T__61
                 {
                 mT__61(); 
 
                 }
                 break;
             case 51 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:310: RULE_HEX
+                // InternalETPhys.g:1:310: RULE_HEX
                 {
                 mRULE_HEX(); 
 
                 }
                 break;
             case 52 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:319: RULE_ID
+                // InternalETPhys.g:1:319: RULE_ID
                 {
                 mRULE_ID(); 
 
                 }
                 break;
             case 53 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:327: RULE_INT
+                // InternalETPhys.g:1:327: RULE_INT
                 {
                 mRULE_INT(); 
 
                 }
                 break;
             case 54 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:336: RULE_STRING
+                // InternalETPhys.g:1:336: RULE_STRING
                 {
                 mRULE_STRING(); 
 
                 }
                 break;
             case 55 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:348: RULE_ML_COMMENT
+                // InternalETPhys.g:1:348: RULE_ML_COMMENT
                 {
                 mRULE_ML_COMMENT(); 
 
                 }
                 break;
             case 56 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:364: RULE_SL_COMMENT
+                // InternalETPhys.g:1:364: RULE_SL_COMMENT
                 {
                 mRULE_SL_COMMENT(); 
 
                 }
                 break;
             case 57 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:380: RULE_WS
+                // InternalETPhys.g:1:380: RULE_WS
                 {
                 mRULE_WS(); 
 
                 }
                 break;
             case 58 :
-                // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1:388: RULE_ANY_OTHER
+                // InternalETPhys.g:1:388: RULE_ANY_OTHER
                 {
                 mRULE_ANY_OTHER(); 
 
@@ -2142,101 +2142,19 @@ public class InternalETPhysLexer extends Lexer {
 
     protected DFA14 dfa14 = new DFA14(this);
     static final String DFA14_eotS =
-        "\1\uffff\1\50\2\uffff\1\50\1\uffff\1\50\1\uffff\3\50\1\65\1\50"+
-        "\1\72\4\50\1\uffff\1\50\1\107\2\uffff\3\50\2\uffff\1\117\1\50\1"+
-        "\122\1\46\2\uffff\3\46\2\uffff\1\50\3\uffff\1\50\1\uffff\1\50\1"+
-        "\uffff\6\50\1\uffff\4\50\1\uffff\1\150\7\50\1\uffff\2\50\4\uffff"+
-        "\1\162\1\163\1\50\3\uffff\1\50\6\uffff\21\50\1\uffff\11\50\2\uffff"+
-        "\5\50\1\u0098\25\50\1\u00ae\1\50\1\u00b0\6\50\1\uffff\16\50\1\u00c6"+
-        "\1\50\1\u00c8\4\50\1\uffff\1\u00cd\1\uffff\7\50\1\u00d5\2\50\1\u00d8"+
-        "\2\50\1\u00db\2\50\1\u00de\4\50\1\uffff\1\50\1\uffff\4\50\1\uffff"+
-        "\2\50\1\u00ea\1\50\1\u00ec\1\u00ed\1\u00ee\1\uffff\2\50\1\uffff"+
-        "\2\50\1\uffff\2\50\1\uffff\11\50\1\u00fe\1\50\1\uffff\1\50\3\uffff"+
-        "\4\50\1\u0106\1\u0107\7\50\1\u010f\1\50\1\uffff\2\50\1\u0113\1\u0114"+
-        "\1\u0115\2\50\2\uffff\1\u0118\3\50\1\u011c\2\50\1\uffff\1\u011f"+
-        "\2\50\3\uffff\2\50\1\uffff\3\50\1\uffff\2\50\1\uffff\2\50\1\u012b"+
-        "\3\50\1\u012f\4\50\1\uffff\2\50\1\u0136\1\uffff\1\50\1\u0138\1\u0139"+
-        "\1\50\1\u013b\1\50\1\uffff\1\u013d\2\uffff\1\u013e\1\uffff\1\u013f"+
-        "\3\uffff";
+        "\1\uffff\1\50\2\uffff\1\50\1\uffff\1\50\1\uffff\3\50\1\65\1\50\1\72\4\50\1\uffff\1\50\1\107\2\uffff\3\50\2\uffff\1\117\1\50\1\122\1\46\2\uffff\3\46\2\uffff\1\50\3\uffff\1\50\1\uffff\1\50\1\uffff\6\50\1\uffff\4\50\1\uffff\1\150\7\50\1\uffff\2\50\4\uffff\1\162\1\163\1\50\3\uffff\1\50\6\uffff\21\50\1\uffff\11\50\2\uffff\5\50\1\u0098\25\50\1\u00ae\1\50\1\u00b0\6\50\1\uffff\16\50\1\u00c6\1\50\1\u00c8\4\50\1\uffff\1\u00cd\1\uffff\7\50\1\u00d5\2\50\1\u00d8\2\50\1\u00db\2\50\1\u00de\4\50\1\uffff\1\50\1\uffff\4\50\1\uffff\2\50\1\u00ea\1\50\1\u00ec\1\u00ed\1\u00ee\1\uffff\2\50\1\uffff\2\50\1\uffff\2\50\1\uffff\11\50\1\u00fe\1\50\1\uffff\1\50\3\uffff\4\50\1\u0106\1\u0107\7\50\1\u010f\1\50\1\uffff\2\50\1\u0113\1\u0114\1\u0115\2\50\2\uffff\1\u0118\3\50\1\u011c\2\50\1\uffff\1\u011f\2\50\3\uffff\2\50\1\uffff\3\50\1\uffff\2\50\1\uffff\2\50\1\u012b\3\50\1\u012f\4\50\1\uffff\2\50\1\u0136\1\uffff\1\50\1\u0138\1\u0139\1\50\1\u013b\1\50\1\uffff\1\u013d\2\uffff\1\u013e\1\uffff\1\u013f\3\uffff";
     static final String DFA14_eofS =
         "\u0140\uffff";
     static final String DFA14_minS =
-        "\1\0\1\150\2\uffff\1\157\1\uffff\1\165\1\uffff\1\157\1\145\1\150"+
-        "\1\60\1\155\1\60\1\141\1\165\1\160\1\164\1\uffff\1\141\1\52\2\uffff"+
-        "\2\163\1\162\2\uffff\1\60\1\154\1\130\1\101\2\uffff\2\0\1\52\2\uffff"+
-        "\1\171\3\uffff\1\144\1\uffff\1\156\1\uffff\1\151\1\154\1\102\1\146"+
-        "\1\162\1\145\1\uffff\1\164\1\160\1\141\1\156\1\uffff\1\60\1\144"+
-        "\1\156\1\170\1\154\1\156\2\164\1\uffff\1\157\1\154\4\uffff\2\60"+
-        "\1\165\3\uffff\1\157\6\uffff\1\163\1\145\1\164\1\157\1\154\1\157"+
-        "\1\156\1\145\1\150\1\141\1\145\1\143\1\145\1\157\1\143\1\147\1\142"+
-        "\1\uffff\1\145\1\144\1\145\2\164\1\151\1\162\1\155\1\163\2\uffff"+
-        "\1\145\1\143\1\151\1\103\1\151\1\60\1\145\1\157\1\164\2\141\1\165"+
-        "\1\141\1\155\2\162\1\153\2\154\1\157\1\154\1\141\1\144\2\151\1\157"+
-        "\1\151\1\60\1\145\1\60\1\153\1\143\1\145\1\154\1\155\1\141\1\uffff"+
-        "\1\144\1\154\1\145\1\154\1\162\1\154\1\144\1\157\1\166\1\164\1\163"+
-        "\1\145\2\157\1\60\1\164\1\60\1\124\1\155\1\156\1\142\1\uffff\1\60"+
-        "\1\uffff\1\145\1\141\1\146\1\141\1\145\1\156\1\170\1\60\1\145\1"+
-        "\147\1\60\1\141\1\164\1\60\1\144\1\141\1\60\1\151\1\124\1\143\1"+
-        "\154\1\uffff\1\157\1\uffff\1\150\1\145\1\141\1\165\1\uffff\1\144"+
-        "\1\154\1\60\1\163\3\60\1\uffff\1\141\1\145\1\uffff\1\143\1\124\1"+
-        "\uffff\1\145\1\154\1\uffff\1\172\1\150\1\153\1\163\2\162\1\103\1"+
-        "\154\1\164\1\60\1\115\1\uffff\1\163\3\uffff\1\156\1\162\1\164\1"+
-        "\150\2\60\1\145\1\162\1\163\1\151\1\171\1\145\1\154\1\60\1\145\1"+
-        "\uffff\1\157\1\171\3\60\1\145\1\162\2\uffff\1\60\1\145\1\151\1\172"+
-        "\1\60\2\141\1\uffff\1\60\1\144\1\163\3\uffff\1\162\1\145\1\uffff"+
-        "\1\141\1\172\1\145\1\uffff\1\144\1\163\1\uffff\1\145\1\164\1\60"+
-        "\1\141\1\144\1\145\1\60\1\145\1\163\1\154\1\145\1\uffff\1\144\1"+
-        "\145\1\60\1\uffff\1\144\2\60\1\155\1\60\1\144\1\uffff\1\60\2\uffff"+
-        "\1\60\1\uffff\1\60\3\uffff";
+        "\1\0\1\150\2\uffff\1\157\1\uffff\1\165\1\uffff\1\157\1\145\1\150\1\60\1\155\1\60\1\141\1\165\1\160\1\164\1\uffff\1\141\1\52\2\uffff\2\163\1\162\2\uffff\1\60\1\154\1\130\1\101\2\uffff\2\0\1\52\2\uffff\1\171\3\uffff\1\144\1\uffff\1\156\1\uffff\1\151\1\154\1\102\1\146\1\162\1\145\1\uffff\1\164\1\160\1\141\1\156\1\uffff\1\60\1\144\1\156\1\170\1\154\1\156\2\164\1\uffff\1\157\1\154\4\uffff\2\60\1\165\3\uffff\1\157\6\uffff\1\163\1\145\1\164\1\157\1\154\1\157\1\156\1\145\1\150\1\141\1\145\1\143\1\145\1\157\1\143\1\147\1\142\1\uffff\1\145\1\144\1\145\2\164\1\151\1\162\1\155\1\163\2\uffff\1\145\1\143\1\151\1\103\1\151\1\60\1\145\1\157\1\164\2\141\1\165\1\141\1\155\2\162\1\153\2\154\1\157\1\154\1\141\1\144\2\151\1\157\1\151\1\60\1\145\1\60\1\153\1\143\1\145\1\154\1\155\1\141\1\uffff\1\144\1\154\1\145\1\154\1\162\1\154\1\144\1\157\1\166\1\164\1\163\1\145\2\157\1\60\1\164\1\60\1\124\1\155\1\156\1\142\1\uffff\1\60\1\uffff\1\145\1\141\1\146\1\141\1\145\1\156\1\170\1\60\1\145\1\147\1\60\1\141\1\164\1\60\1\144\1\141\1\60\1\151\1\124\1\143\1\154\1\uffff\1\157\1\uffff\1\150\1\145\1\141\1\165\1\uffff\1\144\1\154\1\60\1\163\3\60\1\uffff\1\141\1\145\1\uffff\1\143\1\124\1\uffff\1\145\1\154\1\uffff\1\172\1\150\1\153\1\163\2\162\1\103\1\154\1\164\1\60\1\115\1\uffff\1\163\3\uffff\1\156\1\162\1\164\1\150\2\60\1\145\1\162\1\163\1\151\1\171\1\145\1\154\1\60\1\145\1\uffff\1\157\1\171\3\60\1\145\1\162\2\uffff\1\60\1\145\1\151\1\172\1\60\2\141\1\uffff\1\60\1\144\1\163\3\uffff\1\162\1\145\1\uffff\1\141\1\172\1\145\1\uffff\1\144\1\163\1\uffff\1\145\1\164\1\60\1\141\1\144\1\145\1\60\1\145\1\163\1\154\1\145\1\uffff\1\144\1\145\1\60\1\uffff\1\144\2\60\1\155\1\60\1\144\1\uffff\1\60\2\uffff\1\60\1\uffff\1\60\3\uffff";
     static final String DFA14_maxS =
-        "\1\uffff\1\150\2\uffff\1\157\1\uffff\1\165\1\uffff\1\164\1\145"+
-        "\1\150\1\172\1\156\1\172\2\165\1\160\1\164\1\uffff\1\162\1\52\2"+
-        "\uffff\2\163\1\162\2\uffff\1\172\1\154\1\170\1\172\2\uffff\2\uffff"+
-        "\1\57\2\uffff\1\171\3\uffff\1\144\1\uffff\1\156\1\uffff\1\151\1"+
-        "\154\1\122\1\146\1\162\1\145\1\uffff\1\164\1\160\1\141\1\156\1\uffff"+
-        "\1\172\1\144\1\156\1\170\1\154\1\156\2\164\1\uffff\1\157\1\154\4"+
-        "\uffff\2\172\1\165\3\uffff\1\157\6\uffff\1\163\1\145\1\164\1\157"+
-        "\1\154\1\157\1\156\1\145\1\150\1\141\1\145\1\143\1\145\1\157\1\143"+
-        "\1\147\1\160\1\uffff\1\145\1\144\1\145\2\164\1\151\1\162\1\155\1"+
-        "\163\2\uffff\1\145\1\143\1\151\1\122\1\151\1\172\1\145\1\157\1\164"+
-        "\2\141\1\165\1\141\1\155\2\162\1\153\2\154\1\157\1\154\1\141\1\144"+
-        "\2\151\1\157\1\151\1\172\1\145\1\172\1\153\1\143\1\145\1\154\1\155"+
-        "\1\151\1\uffff\1\144\1\154\1\145\1\154\1\162\1\154\1\144\1\157\1"+
-        "\166\1\164\1\163\1\145\2\157\1\172\1\164\1\172\1\124\1\155\1\156"+
-        "\1\142\1\uffff\1\172\1\uffff\1\145\1\141\1\146\1\141\1\145\1\156"+
-        "\1\170\1\172\1\145\1\147\1\172\1\141\1\164\1\172\1\144\1\141\1\172"+
-        "\1\151\1\124\1\143\1\154\1\uffff\1\157\1\uffff\1\150\1\145\1\141"+
-        "\1\165\1\uffff\1\144\1\154\1\172\1\163\3\172\1\uffff\1\141\1\145"+
-        "\1\uffff\1\143\1\124\1\uffff\1\145\1\154\1\uffff\1\172\1\150\1\153"+
-        "\1\163\2\162\1\103\1\154\1\164\1\172\1\123\1\uffff\1\163\3\uffff"+
-        "\1\156\1\162\1\164\1\150\2\172\1\145\1\162\1\163\1\151\1\171\1\145"+
-        "\1\154\1\172\1\145\1\uffff\1\157\1\171\3\172\1\145\1\162\2\uffff"+
-        "\1\172\1\145\1\151\2\172\2\141\1\uffff\1\172\1\144\1\163\3\uffff"+
-        "\1\162\1\145\1\uffff\1\141\1\172\1\145\1\uffff\1\144\1\163\1\uffff"+
-        "\1\145\1\164\1\172\1\141\1\144\1\145\1\172\1\145\1\163\1\154\1\145"+
-        "\1\uffff\1\144\1\145\1\172\1\uffff\1\144\2\172\1\155\1\172\1\144"+
-        "\1\uffff\1\172\2\uffff\1\172\1\uffff\1\172\3\uffff";
+        "\1\uffff\1\150\2\uffff\1\157\1\uffff\1\165\1\uffff\1\164\1\145\1\150\1\172\1\156\1\172\2\165\1\160\1\164\1\uffff\1\162\1\52\2\uffff\2\163\1\162\2\uffff\1\172\1\154\1\170\1\172\2\uffff\2\uffff\1\57\2\uffff\1\171\3\uffff\1\144\1\uffff\1\156\1\uffff\1\151\1\154\1\122\1\146\1\162\1\145\1\uffff\1\164\1\160\1\141\1\156\1\uffff\1\172\1\144\1\156\1\170\1\154\1\156\2\164\1\uffff\1\157\1\154\4\uffff\2\172\1\165\3\uffff\1\157\6\uffff\1\163\1\145\1\164\1\157\1\154\1\157\1\156\1\145\1\150\1\141\1\145\1\143\1\145\1\157\1\143\1\147\1\160\1\uffff\1\145\1\144\1\145\2\164\1\151\1\162\1\155\1\163\2\uffff\1\145\1\143\1\151\1\122\1\151\1\172\1\145\1\157\1\164\2\141\1\165\1\141\1\155\2\162\1\153\2\154\1\157\1\154\1\141\1\144\2\151\1\157\1\151\1\172\1\145\1\172\1\153\1\143\1\145\1\154\1\155\1\151\1\uffff\1\144\1\154\1\145\1\154\1\162\1\154\1\144\1\157\1\166\1\164\1\163\1\145\2\157\1\172\1\164\1\172\1\124\1\155\1\156\1\142\1\uffff\1\172\1\uffff\1\145\1\141\1\146\1\141\1\145\1\156\1\170\1\172\1\145\1\147\1\172\1\141\1\164\1\172\1\144\1\141\1\172\1\151\1\124\1\143\1\154\1\uffff\1\157\1\uffff\1\150\1\145\1\141\1\165\1\uffff\1\144\1\154\1\172\1\163\3\172\1\uffff\1\141\1\145\1\uffff\1\143\1\124\1\uffff\1\145\1\154\1\uffff\1\172\1\150\1\153\1\163\2\162\1\103\1\154\1\164\1\172\1\123\1\uffff\1\163\3\uffff\1\156\1\162\1\164\1\150\2\172\1\145\1\162\1\163\1\151\1\171\1\145\1\154\1\172\1\145\1\uffff\1\157\1\171\3\172\1\145\1\162\2\uffff\1\172\1\145\1\151\2\172\2\141\1\uffff\1\172\1\144\1\163\3\uffff\1\162\1\145\1\uffff\1\141\1\172\1\145\1\uffff\1\144\1\163\1\uffff\1\145\1\164\1\172\1\141\1\144\1\145\1\172\1\145\1\163\1\154\1\145\1\uffff\1\144\1\145\1\172\1\uffff\1\144\2\172\1\155\1\172\1\144\1\uffff\1\172\2\uffff\1\172\1\uffff\1\172\3\uffff";
     static final String DFA14_acceptS =
-        "\2\uffff\1\2\1\3\1\uffff\1\6\1\uffff\1\11\12\uffff\1\31\2\uffff"+
-        "\1\35\1\36\3\uffff\1\45\1\46\4\uffff\1\64\1\65\3\uffff\1\71\1\72"+
-        "\1\uffff\1\64\1\2\1\3\1\uffff\1\6\1\uffff\1\11\6\uffff\1\50\4\uffff"+
-        "\1\37\10\uffff\1\31\2\uffff\1\34\1\47\1\35\1\36\3\uffff\1\45\1\46"+
-        "\1\51\1\uffff\1\63\1\65\1\66\1\67\1\70\1\71\21\uffff\1\40\11\uffff"+
-        "\1\41\1\42\44\uffff\1\20\25\uffff\1\33\1\uffff\1\44\25\uffff\1\25"+
-        "\1\uffff\1\54\4\uffff\1\43\7\uffff\1\52\2\uffff\1\61\2\uffff\1\15"+
-        "\2\uffff\1\32\13\uffff\1\5\1\uffff\1\10\1\12\1\13\17\uffff\1\53"+
-        "\7\uffff\1\16\1\17\7\uffff\1\26\3\uffff\1\7\1\57\1\60\2\uffff\1"+
-        "\21\3\uffff\1\27\2\uffff\1\30\13\uffff\1\62\3\uffff\1\23\6\uffff"+
-        "\1\22\1\uffff\1\24\1\1\1\uffff\1\14\1\uffff\1\56\1\4\1\55";
+        "\2\uffff\1\2\1\3\1\uffff\1\6\1\uffff\1\11\12\uffff\1\31\2\uffff\1\35\1\36\3\uffff\1\45\1\46\4\uffff\1\64\1\65\3\uffff\1\71\1\72\1\uffff\1\64\1\2\1\3\1\uffff\1\6\1\uffff\1\11\6\uffff\1\50\4\uffff\1\37\10\uffff\1\31\2\uffff\1\34\1\47\1\35\1\36\3\uffff\1\45\1\46\1\51\1\uffff\1\63\1\65\1\66\1\67\1\70\1\71\21\uffff\1\40\11\uffff\1\41\1\42\44\uffff\1\20\25\uffff\1\33\1\uffff\1\44\25\uffff\1\25\1\uffff\1\54\4\uffff\1\43\7\uffff\1\52\2\uffff\1\61\2\uffff\1\15\2\uffff\1\32\13\uffff\1\5\1\uffff\1\10\1\12\1\13\17\uffff\1\53\7\uffff\1\16\1\17\7\uffff\1\26\3\uffff\1\7\1\57\1\60\2\uffff\1\21\3\uffff\1\27\2\uffff\1\30\13\uffff\1\62\3\uffff\1\23\6\uffff\1\22\1\uffff\1\24\1\1\1\uffff\1\14\1\uffff\1\56\1\4\1\55";
     static final String DFA14_specialS =
         "\1\1\41\uffff\1\2\1\0\u011c\uffff}>";
     static final String[] DFA14_transitionS = {
-            "\11\46\2\45\2\46\1\45\22\46\1\45\1\46\1\42\4\46\1\43\3\46\1"+
-            "\32\1\22\1\33\1\24\1\44\1\36\11\41\1\5\2\46\1\7\3\46\3\40\1"+
-            "\11\1\34\10\40\1\4\1\40\1\1\1\40\1\17\1\40\1\12\6\40\1\25\1"+
-            "\46\1\26\1\37\1\40\1\46\1\21\1\35\2\40\1\13\1\23\2\40\1\14\3"+
-            "\40\1\16\1\30\1\20\1\10\1\40\1\6\1\15\1\31\1\27\5\40\1\2\1\46"+
-            "\1\3\uff82\46",
+            "\11\46\2\45\2\46\1\45\22\46\1\45\1\46\1\42\4\46\1\43\3\46\1\32\1\22\1\33\1\24\1\44\1\36\11\41\1\5\2\46\1\7\3\46\3\40\1\11\1\34\10\40\1\4\1\40\1\1\1\40\1\17\1\40\1\12\6\40\1\25\1\46\1\26\1\37\1\40\1\46\1\21\1\35\2\40\1\13\1\23\2\40\1\14\3\40\1\16\1\30\1\20\1\10\1\40\1\6\1\15\1\31\1\27\5\40\1\2\1\46\1\3\uff82\46",
             "\1\47",
             "",
             "",
@@ -2249,8 +2167,7 @@ public class InternalETPhysLexer extends Lexer {
             "\1\63",
             "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\27\50\1\64\2\50",
             "\1\67\1\66",
-            "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\10\50\1\71\12\50"+
-            "\1\70\6\50",
+            "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\10\50\1\71\12\50\1\70\6\50",
             "\1\75\7\uffff\1\76\5\uffff\1\74\3\uffff\1\73\1\uffff\1\77",
             "\1\100",
             "\1\101",
@@ -2358,8 +2275,7 @@ public class InternalETPhysLexer extends Lexer {
             "\1\u0093",
             "\1\u0095\16\uffff\1\u0094",
             "\1\u0096",
-            "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\14\50\1\u0097\15"+
-            "\50",
+            "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\14\50\1\u0097\15\50",
             "\1\u0099",
             "\1\u009a",
             "\1\u009b",
diff --git a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhysParser.java b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhysParser.java
index feece41f6..98edbf34a 100644
--- a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhysParser.java
+++ b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhysParser.java
@@ -18,8 +18,7 @@ import org.antlr.runtime.*;
 import java.util.Stack;
 import java.util.List;
 import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
+
 @SuppressWarnings("all")
 public class InternalETPhysParser extends AbstractInternalAntlrParser {
     public static final String[] tokenNames = new String[] {
@@ -99,7 +98,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
         
 
     public String[] getTokenNames() { return InternalETPhysParser.tokenNames; }
-    public String getGrammarFileName() { return "../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g"; }
+    public String getGrammarFileName() { return "InternalETPhys.g"; }
 
 
 
@@ -124,7 +123,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRulePhysicalModel"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:68:1: entryRulePhysicalModel returns [EObject current=null] : iv_rulePhysicalModel= rulePhysicalModel EOF ;
+    // InternalETPhys.g:68:1: entryRulePhysicalModel returns [EObject current=null] : iv_rulePhysicalModel= rulePhysicalModel EOF ;
     public final EObject entryRulePhysicalModel() throws RecognitionException {
         EObject current = null;
 
@@ -132,21 +131,17 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:69:2: (iv_rulePhysicalModel= rulePhysicalModel EOF )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:70:2: iv_rulePhysicalModel= rulePhysicalModel EOF
+            // InternalETPhys.g:69:2: (iv_rulePhysicalModel= rulePhysicalModel EOF )
+            // InternalETPhys.g:70:2: iv_rulePhysicalModel= rulePhysicalModel EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getPhysicalModelRule()); 
-            }
-            pushFollow(FOLLOW_rulePhysicalModel_in_entryRulePhysicalModel75);
+             newCompositeNode(grammarAccess.getPhysicalModelRule()); 
+            pushFollow(FOLLOW_1);
             iv_rulePhysicalModel=rulePhysicalModel();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_rulePhysicalModel; 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRulePhysicalModel85); if (state.failed) return current;
+
+             current =iv_rulePhysicalModel; 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -164,7 +159,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "rulePhysicalModel"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:77:1: rulePhysicalModel returns [EObject current=null] : (otherlv_0= 'PhysicalModel' ( (lv_name_1_0= ruleFQN ) ) otherlv_2= '{' ( (lv_imports_3_0= ruleImport ) )* ( ( (lv_systems_4_0= rulePhysicalSystem ) ) | ( (lv_nodeClasses_5_0= ruleNodeClass ) ) | ( (lv_runtimeClasses_6_0= ruleRuntimeClass ) ) )* otherlv_7= '}' ) ;
+    // InternalETPhys.g:77:1: rulePhysicalModel returns [EObject current=null] : (otherlv_0= 'PhysicalModel' ( (lv_name_1_0= ruleFQN ) ) otherlv_2= '{' ( (lv_imports_3_0= ruleImport ) )* ( ( (lv_systems_4_0= rulePhysicalSystem ) ) | ( (lv_nodeClasses_5_0= ruleNodeClass ) ) | ( (lv_runtimeClasses_6_0= ruleRuntimeClass ) ) )* otherlv_7= '}' ) ;
     public final EObject rulePhysicalModel() throws RecognitionException {
         EObject current = null;
 
@@ -185,60 +180,52 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:80:28: ( (otherlv_0= 'PhysicalModel' ( (lv_name_1_0= ruleFQN ) ) otherlv_2= '{' ( (lv_imports_3_0= ruleImport ) )* ( ( (lv_systems_4_0= rulePhysicalSystem ) ) | ( (lv_nodeClasses_5_0= ruleNodeClass ) ) | ( (lv_runtimeClasses_6_0= ruleRuntimeClass ) ) )* otherlv_7= '}' ) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:81:1: (otherlv_0= 'PhysicalModel' ( (lv_name_1_0= ruleFQN ) ) otherlv_2= '{' ( (lv_imports_3_0= ruleImport ) )* ( ( (lv_systems_4_0= rulePhysicalSystem ) ) | ( (lv_nodeClasses_5_0= ruleNodeClass ) ) | ( (lv_runtimeClasses_6_0= ruleRuntimeClass ) ) )* otherlv_7= '}' )
+            // InternalETPhys.g:80:28: ( (otherlv_0= 'PhysicalModel' ( (lv_name_1_0= ruleFQN ) ) otherlv_2= '{' ( (lv_imports_3_0= ruleImport ) )* ( ( (lv_systems_4_0= rulePhysicalSystem ) ) | ( (lv_nodeClasses_5_0= ruleNodeClass ) ) | ( (lv_runtimeClasses_6_0= ruleRuntimeClass ) ) )* otherlv_7= '}' ) )
+            // InternalETPhys.g:81:1: (otherlv_0= 'PhysicalModel' ( (lv_name_1_0= ruleFQN ) ) otherlv_2= '{' ( (lv_imports_3_0= ruleImport ) )* ( ( (lv_systems_4_0= rulePhysicalSystem ) ) | ( (lv_nodeClasses_5_0= ruleNodeClass ) ) | ( (lv_runtimeClasses_6_0= ruleRuntimeClass ) ) )* otherlv_7= '}' )
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:81:1: (otherlv_0= 'PhysicalModel' ( (lv_name_1_0= ruleFQN ) ) otherlv_2= '{' ( (lv_imports_3_0= ruleImport ) )* ( ( (lv_systems_4_0= rulePhysicalSystem ) ) | ( (lv_nodeClasses_5_0= ruleNodeClass ) ) | ( (lv_runtimeClasses_6_0= ruleRuntimeClass ) ) )* otherlv_7= '}' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:81:3: otherlv_0= 'PhysicalModel' ( (lv_name_1_0= ruleFQN ) ) otherlv_2= '{' ( (lv_imports_3_0= ruleImport ) )* ( ( (lv_systems_4_0= rulePhysicalSystem ) ) | ( (lv_nodeClasses_5_0= ruleNodeClass ) ) | ( (lv_runtimeClasses_6_0= ruleRuntimeClass ) ) )* otherlv_7= '}'
+            // InternalETPhys.g:81:1: (otherlv_0= 'PhysicalModel' ( (lv_name_1_0= ruleFQN ) ) otherlv_2= '{' ( (lv_imports_3_0= ruleImport ) )* ( ( (lv_systems_4_0= rulePhysicalSystem ) ) | ( (lv_nodeClasses_5_0= ruleNodeClass ) ) | ( (lv_runtimeClasses_6_0= ruleRuntimeClass ) ) )* otherlv_7= '}' )
+            // InternalETPhys.g:81:3: otherlv_0= 'PhysicalModel' ( (lv_name_1_0= ruleFQN ) ) otherlv_2= '{' ( (lv_imports_3_0= ruleImport ) )* ( ( (lv_systems_4_0= rulePhysicalSystem ) ) | ( (lv_nodeClasses_5_0= ruleNodeClass ) ) | ( (lv_runtimeClasses_6_0= ruleRuntimeClass ) ) )* otherlv_7= '}'
             {
-            otherlv_0=(Token)match(input,12,FOLLOW_12_in_rulePhysicalModel122); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_0=(Token)match(input,12,FOLLOW_3); 
 
-                  	newLeafNode(otherlv_0, grammarAccess.getPhysicalModelAccess().getPhysicalModelKeyword_0());
-                  
-            }
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:85:1: ( (lv_name_1_0= ruleFQN ) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:86:1: (lv_name_1_0= ruleFQN )
+                	newLeafNode(otherlv_0, grammarAccess.getPhysicalModelAccess().getPhysicalModelKeyword_0());
+                
+            // InternalETPhys.g:85:1: ( (lv_name_1_0= ruleFQN ) )
+            // InternalETPhys.g:86:1: (lv_name_1_0= ruleFQN )
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:86:1: (lv_name_1_0= ruleFQN )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:87:3: lv_name_1_0= ruleFQN
+            // InternalETPhys.g:86:1: (lv_name_1_0= ruleFQN )
+            // InternalETPhys.g:87:3: lv_name_1_0= ruleFQN
             {
-            if ( state.backtracking==0 ) {
-               
-              	        newCompositeNode(grammarAccess.getPhysicalModelAccess().getNameFQNParserRuleCall_1_0()); 
-              	    
-            }
-            pushFollow(FOLLOW_ruleFQN_in_rulePhysicalModel143);
+             
+            	        newCompositeNode(grammarAccess.getPhysicalModelAccess().getNameFQNParserRuleCall_1_0()); 
+            	    
+            pushFollow(FOLLOW_4);
             lv_name_1_0=ruleFQN();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
 
-              	        if (current==null) {
-              	            current = createModelElementForParent(grammarAccess.getPhysicalModelRule());
-              	        }
-                     		set(
-                     			current, 
-                     			"name",
-                      		lv_name_1_0, 
-                      		"FQN");
-              	        afterParserOrEnumRuleCall();
-              	    
-            }
+
+            	        if (current==null) {
+            	            current = createModelElementForParent(grammarAccess.getPhysicalModelRule());
+            	        }
+                   		set(
+                   			current, 
+                   			"name",
+                    		lv_name_1_0, 
+                    		"org.eclipse.etrice.core.common.Base.FQN");
+            	        afterParserOrEnumRuleCall();
+            	    
 
             }
 
 
             }
 
-            otherlv_2=(Token)match(input,13,FOLLOW_13_in_rulePhysicalModel155); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_2=(Token)match(input,13,FOLLOW_5); 
 
-                  	newLeafNode(otherlv_2, grammarAccess.getPhysicalModelAccess().getLeftCurlyBracketKeyword_2());
-                  
-            }
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:107:1: ( (lv_imports_3_0= ruleImport ) )*
+                	newLeafNode(otherlv_2, grammarAccess.getPhysicalModelAccess().getLeftCurlyBracketKeyword_2());
+                
+            // InternalETPhys.g:107:1: ( (lv_imports_3_0= ruleImport ) )*
             loop1:
             do {
                 int alt1=2;
@@ -251,34 +238,30 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
                 switch (alt1) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:108:1: (lv_imports_3_0= ruleImport )
+            	    // InternalETPhys.g:108:1: (lv_imports_3_0= ruleImport )
             	    {
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:108:1: (lv_imports_3_0= ruleImport )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:109:3: lv_imports_3_0= ruleImport
+            	    // InternalETPhys.g:108:1: (lv_imports_3_0= ruleImport )
+            	    // InternalETPhys.g:109:3: lv_imports_3_0= ruleImport
             	    {
-            	    if ( state.backtracking==0 ) {
-            	       
-            	      	        newCompositeNode(grammarAccess.getPhysicalModelAccess().getImportsImportParserRuleCall_3_0()); 
-            	      	    
-            	    }
-            	    pushFollow(FOLLOW_ruleImport_in_rulePhysicalModel176);
+            	     
+            	    	        newCompositeNode(grammarAccess.getPhysicalModelAccess().getImportsImportParserRuleCall_3_0()); 
+            	    	    
+            	    pushFollow(FOLLOW_5);
             	    lv_imports_3_0=ruleImport();
 
             	    state._fsp--;
-            	    if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
-
-            	      	        if (current==null) {
-            	      	            current = createModelElementForParent(grammarAccess.getPhysicalModelRule());
-            	      	        }
-            	             		add(
-            	             			current, 
-            	             			"imports",
-            	              		lv_imports_3_0, 
-            	              		"Import");
-            	      	        afterParserOrEnumRuleCall();
-            	      	    
-            	    }
+
+
+            	    	        if (current==null) {
+            	    	            current = createModelElementForParent(grammarAccess.getPhysicalModelRule());
+            	    	        }
+            	           		add(
+            	           			current, 
+            	           			"imports",
+            	            		lv_imports_3_0, 
+            	            		"org.eclipse.etrice.core.common.Base.Import");
+            	    	        afterParserOrEnumRuleCall();
+            	    	    
 
             	    }
 
@@ -291,7 +274,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                 }
             } while (true);
 
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:125:3: ( ( (lv_systems_4_0= rulePhysicalSystem ) ) | ( (lv_nodeClasses_5_0= ruleNodeClass ) ) | ( (lv_runtimeClasses_6_0= ruleRuntimeClass ) ) )*
+            // InternalETPhys.g:125:3: ( ( (lv_systems_4_0= rulePhysicalSystem ) ) | ( (lv_nodeClasses_5_0= ruleNodeClass ) ) | ( (lv_runtimeClasses_6_0= ruleRuntimeClass ) ) )*
             loop2:
             do {
                 int alt2=4;
@@ -316,37 +299,33 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
                 switch (alt2) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:125:4: ( (lv_systems_4_0= rulePhysicalSystem ) )
+            	    // InternalETPhys.g:125:4: ( (lv_systems_4_0= rulePhysicalSystem ) )
             	    {
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:125:4: ( (lv_systems_4_0= rulePhysicalSystem ) )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:126:1: (lv_systems_4_0= rulePhysicalSystem )
+            	    // InternalETPhys.g:125:4: ( (lv_systems_4_0= rulePhysicalSystem ) )
+            	    // InternalETPhys.g:126:1: (lv_systems_4_0= rulePhysicalSystem )
             	    {
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:126:1: (lv_systems_4_0= rulePhysicalSystem )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:127:3: lv_systems_4_0= rulePhysicalSystem
+            	    // InternalETPhys.g:126:1: (lv_systems_4_0= rulePhysicalSystem )
+            	    // InternalETPhys.g:127:3: lv_systems_4_0= rulePhysicalSystem
             	    {
-            	    if ( state.backtracking==0 ) {
-            	       
-            	      	        newCompositeNode(grammarAccess.getPhysicalModelAccess().getSystemsPhysicalSystemParserRuleCall_4_0_0()); 
-            	      	    
-            	    }
-            	    pushFollow(FOLLOW_rulePhysicalSystem_in_rulePhysicalModel199);
+            	     
+            	    	        newCompositeNode(grammarAccess.getPhysicalModelAccess().getSystemsPhysicalSystemParserRuleCall_4_0_0()); 
+            	    	    
+            	    pushFollow(FOLLOW_6);
             	    lv_systems_4_0=rulePhysicalSystem();
 
             	    state._fsp--;
-            	    if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
-
-            	      	        if (current==null) {
-            	      	            current = createModelElementForParent(grammarAccess.getPhysicalModelRule());
-            	      	        }
-            	             		add(
-            	             			current, 
-            	             			"systems",
-            	              		lv_systems_4_0, 
-            	              		"PhysicalSystem");
-            	      	        afterParserOrEnumRuleCall();
-            	      	    
-            	    }
+
+
+            	    	        if (current==null) {
+            	    	            current = createModelElementForParent(grammarAccess.getPhysicalModelRule());
+            	    	        }
+            	           		add(
+            	           			current, 
+            	           			"systems",
+            	            		lv_systems_4_0, 
+            	            		"org.eclipse.etrice.core.etphys.ETPhys.PhysicalSystem");
+            	    	        afterParserOrEnumRuleCall();
+            	    	    
 
             	    }
 
@@ -357,37 +336,33 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 2 :
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:144:6: ( (lv_nodeClasses_5_0= ruleNodeClass ) )
+            	    // InternalETPhys.g:144:6: ( (lv_nodeClasses_5_0= ruleNodeClass ) )
             	    {
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:144:6: ( (lv_nodeClasses_5_0= ruleNodeClass ) )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:145:1: (lv_nodeClasses_5_0= ruleNodeClass )
+            	    // InternalETPhys.g:144:6: ( (lv_nodeClasses_5_0= ruleNodeClass ) )
+            	    // InternalETPhys.g:145:1: (lv_nodeClasses_5_0= ruleNodeClass )
             	    {
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:145:1: (lv_nodeClasses_5_0= ruleNodeClass )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:146:3: lv_nodeClasses_5_0= ruleNodeClass
+            	    // InternalETPhys.g:145:1: (lv_nodeClasses_5_0= ruleNodeClass )
+            	    // InternalETPhys.g:146:3: lv_nodeClasses_5_0= ruleNodeClass
             	    {
-            	    if ( state.backtracking==0 ) {
-            	       
-            	      	        newCompositeNode(grammarAccess.getPhysicalModelAccess().getNodeClassesNodeClassParserRuleCall_4_1_0()); 
-            	      	    
-            	    }
-            	    pushFollow(FOLLOW_ruleNodeClass_in_rulePhysicalModel226);
+            	     
+            	    	        newCompositeNode(grammarAccess.getPhysicalModelAccess().getNodeClassesNodeClassParserRuleCall_4_1_0()); 
+            	    	    
+            	    pushFollow(FOLLOW_6);
             	    lv_nodeClasses_5_0=ruleNodeClass();
 
             	    state._fsp--;
-            	    if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
-
-            	      	        if (current==null) {
-            	      	            current = createModelElementForParent(grammarAccess.getPhysicalModelRule());
-            	      	        }
-            	             		add(
-            	             			current, 
-            	             			"nodeClasses",
-            	              		lv_nodeClasses_5_0, 
-            	              		"NodeClass");
-            	      	        afterParserOrEnumRuleCall();
-            	      	    
-            	    }
+
+
+            	    	        if (current==null) {
+            	    	            current = createModelElementForParent(grammarAccess.getPhysicalModelRule());
+            	    	        }
+            	           		add(
+            	           			current, 
+            	           			"nodeClasses",
+            	            		lv_nodeClasses_5_0, 
+            	            		"org.eclipse.etrice.core.etphys.ETPhys.NodeClass");
+            	    	        afterParserOrEnumRuleCall();
+            	    	    
 
             	    }
 
@@ -398,37 +373,33 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 3 :
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:163:6: ( (lv_runtimeClasses_6_0= ruleRuntimeClass ) )
+            	    // InternalETPhys.g:163:6: ( (lv_runtimeClasses_6_0= ruleRuntimeClass ) )
             	    {
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:163:6: ( (lv_runtimeClasses_6_0= ruleRuntimeClass ) )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:164:1: (lv_runtimeClasses_6_0= ruleRuntimeClass )
+            	    // InternalETPhys.g:163:6: ( (lv_runtimeClasses_6_0= ruleRuntimeClass ) )
+            	    // InternalETPhys.g:164:1: (lv_runtimeClasses_6_0= ruleRuntimeClass )
             	    {
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:164:1: (lv_runtimeClasses_6_0= ruleRuntimeClass )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:165:3: lv_runtimeClasses_6_0= ruleRuntimeClass
+            	    // InternalETPhys.g:164:1: (lv_runtimeClasses_6_0= ruleRuntimeClass )
+            	    // InternalETPhys.g:165:3: lv_runtimeClasses_6_0= ruleRuntimeClass
             	    {
-            	    if ( state.backtracking==0 ) {
-            	       
-            	      	        newCompositeNode(grammarAccess.getPhysicalModelAccess().getRuntimeClassesRuntimeClassParserRuleCall_4_2_0()); 
-            	      	    
-            	    }
-            	    pushFollow(FOLLOW_ruleRuntimeClass_in_rulePhysicalModel253);
+            	     
+            	    	        newCompositeNode(grammarAccess.getPhysicalModelAccess().getRuntimeClassesRuntimeClassParserRuleCall_4_2_0()); 
+            	    	    
+            	    pushFollow(FOLLOW_6);
             	    lv_runtimeClasses_6_0=ruleRuntimeClass();
 
             	    state._fsp--;
-            	    if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
-
-            	      	        if (current==null) {
-            	      	            current = createModelElementForParent(grammarAccess.getPhysicalModelRule());
-            	      	        }
-            	             		add(
-            	             			current, 
-            	             			"runtimeClasses",
-            	              		lv_runtimeClasses_6_0, 
-            	              		"RuntimeClass");
-            	      	        afterParserOrEnumRuleCall();
-            	      	    
-            	    }
+
+
+            	    	        if (current==null) {
+            	    	            current = createModelElementForParent(grammarAccess.getPhysicalModelRule());
+            	    	        }
+            	           		add(
+            	           			current, 
+            	           			"runtimeClasses",
+            	            		lv_runtimeClasses_6_0, 
+            	            		"org.eclipse.etrice.core.etphys.ETPhys.RuntimeClass");
+            	    	        afterParserOrEnumRuleCall();
+            	    	    
 
             	    }
 
@@ -444,21 +415,17 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                 }
             } while (true);
 
-            otherlv_7=(Token)match(input,14,FOLLOW_14_in_rulePhysicalModel267); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_7=(Token)match(input,14,FOLLOW_2); 
 
-                  	newLeafNode(otherlv_7, grammarAccess.getPhysicalModelAccess().getRightCurlyBracketKeyword_5());
-                  
-            }
+                	newLeafNode(otherlv_7, grammarAccess.getPhysicalModelAccess().getRightCurlyBracketKeyword_5());
+                
 
             }
 
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -473,7 +440,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRulePhysicalSystem"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:193:1: entryRulePhysicalSystem returns [EObject current=null] : iv_rulePhysicalSystem= rulePhysicalSystem EOF ;
+    // InternalETPhys.g:193:1: entryRulePhysicalSystem returns [EObject current=null] : iv_rulePhysicalSystem= rulePhysicalSystem EOF ;
     public final EObject entryRulePhysicalSystem() throws RecognitionException {
         EObject current = null;
 
@@ -481,21 +448,17 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:194:2: (iv_rulePhysicalSystem= rulePhysicalSystem EOF )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:195:2: iv_rulePhysicalSystem= rulePhysicalSystem EOF
+            // InternalETPhys.g:194:2: (iv_rulePhysicalSystem= rulePhysicalSystem EOF )
+            // InternalETPhys.g:195:2: iv_rulePhysicalSystem= rulePhysicalSystem EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getPhysicalSystemRule()); 
-            }
-            pushFollow(FOLLOW_rulePhysicalSystem_in_entryRulePhysicalSystem303);
+             newCompositeNode(grammarAccess.getPhysicalSystemRule()); 
+            pushFollow(FOLLOW_1);
             iv_rulePhysicalSystem=rulePhysicalSystem();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_rulePhysicalSystem; 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRulePhysicalSystem313); if (state.failed) return current;
+
+             current =iv_rulePhysicalSystem; 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -513,7 +476,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "rulePhysicalSystem"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:202:1: rulePhysicalSystem returns [EObject current=null] : (otherlv_0= 'PhysicalSystem' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_nodeRefs_4_0= ruleNodeRef ) )* otherlv_5= '}' ) ;
+    // InternalETPhys.g:202:1: rulePhysicalSystem returns [EObject current=null] : (otherlv_0= 'PhysicalSystem' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_nodeRefs_4_0= ruleNodeRef ) )* otherlv_5= '}' ) ;
     public final EObject rulePhysicalSystem() throws RecognitionException {
         EObject current = null;
 
@@ -529,49 +492,43 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:205:28: ( (otherlv_0= 'PhysicalSystem' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_nodeRefs_4_0= ruleNodeRef ) )* otherlv_5= '}' ) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:206:1: (otherlv_0= 'PhysicalSystem' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_nodeRefs_4_0= ruleNodeRef ) )* otherlv_5= '}' )
+            // InternalETPhys.g:205:28: ( (otherlv_0= 'PhysicalSystem' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_nodeRefs_4_0= ruleNodeRef ) )* otherlv_5= '}' ) )
+            // InternalETPhys.g:206:1: (otherlv_0= 'PhysicalSystem' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_nodeRefs_4_0= ruleNodeRef ) )* otherlv_5= '}' )
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:206:1: (otherlv_0= 'PhysicalSystem' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_nodeRefs_4_0= ruleNodeRef ) )* otherlv_5= '}' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:206:3: otherlv_0= 'PhysicalSystem' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_nodeRefs_4_0= ruleNodeRef ) )* otherlv_5= '}'
+            // InternalETPhys.g:206:1: (otherlv_0= 'PhysicalSystem' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_nodeRefs_4_0= ruleNodeRef ) )* otherlv_5= '}' )
+            // InternalETPhys.g:206:3: otherlv_0= 'PhysicalSystem' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_nodeRefs_4_0= ruleNodeRef ) )* otherlv_5= '}'
             {
-            otherlv_0=(Token)match(input,15,FOLLOW_15_in_rulePhysicalSystem350); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_0=(Token)match(input,15,FOLLOW_3); 
 
-                  	newLeafNode(otherlv_0, grammarAccess.getPhysicalSystemAccess().getPhysicalSystemKeyword_0());
-                  
-            }
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:210:1: ( (lv_name_1_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:211:1: (lv_name_1_0= RULE_ID )
+                	newLeafNode(otherlv_0, grammarAccess.getPhysicalSystemAccess().getPhysicalSystemKeyword_0());
+                
+            // InternalETPhys.g:210:1: ( (lv_name_1_0= RULE_ID ) )
+            // InternalETPhys.g:211:1: (lv_name_1_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:211:1: (lv_name_1_0= RULE_ID )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:212:3: lv_name_1_0= RULE_ID
+            // InternalETPhys.g:211:1: (lv_name_1_0= RULE_ID )
+            // InternalETPhys.g:212:3: lv_name_1_0= RULE_ID
             {
-            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_rulePhysicalSystem367); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_7); 
 
-              			newLeafNode(lv_name_1_0, grammarAccess.getPhysicalSystemAccess().getNameIDTerminalRuleCall_1_0()); 
-              		
-            }
-            if ( state.backtracking==0 ) {
+            			newLeafNode(lv_name_1_0, grammarAccess.getPhysicalSystemAccess().getNameIDTerminalRuleCall_1_0()); 
+            		
 
-              	        if (current==null) {
-              	            current = createModelElement(grammarAccess.getPhysicalSystemRule());
-              	        }
-                     		setWithLastConsumed(
-                     			current, 
-                     			"name",
-                      		lv_name_1_0, 
-                      		"ID");
-              	    
-            }
+            	        if (current==null) {
+            	            current = createModelElement(grammarAccess.getPhysicalSystemRule());
+            	        }
+                   		setWithLastConsumed(
+                   			current, 
+                   			"name",
+                    		lv_name_1_0, 
+                    		"org.eclipse.xtext.common.Terminals.ID");
+            	    
 
             }
 
 
             }
 
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:228:2: ( (lv_docu_2_0= ruleDocumentation ) )?
+            // InternalETPhys.g:228:2: ( (lv_docu_2_0= ruleDocumentation ) )?
             int alt3=2;
             int LA3_0 = input.LA(1);
 
@@ -580,34 +537,30 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
             }
             switch (alt3) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:229:1: (lv_docu_2_0= ruleDocumentation )
+                    // InternalETPhys.g:229:1: (lv_docu_2_0= ruleDocumentation )
                     {
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:229:1: (lv_docu_2_0= ruleDocumentation )
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:230:3: lv_docu_2_0= ruleDocumentation
+                    // InternalETPhys.g:229:1: (lv_docu_2_0= ruleDocumentation )
+                    // InternalETPhys.g:230:3: lv_docu_2_0= ruleDocumentation
                     {
-                    if ( state.backtracking==0 ) {
-                       
-                      	        newCompositeNode(grammarAccess.getPhysicalSystemAccess().getDocuDocumentationParserRuleCall_2_0()); 
-                      	    
-                    }
-                    pushFollow(FOLLOW_ruleDocumentation_in_rulePhysicalSystem393);
+                     
+                    	        newCompositeNode(grammarAccess.getPhysicalSystemAccess().getDocuDocumentationParserRuleCall_2_0()); 
+                    	    
+                    pushFollow(FOLLOW_4);
                     lv_docu_2_0=ruleDocumentation();
 
                     state._fsp--;
-                    if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
-
-                      	        if (current==null) {
-                      	            current = createModelElementForParent(grammarAccess.getPhysicalSystemRule());
-                      	        }
-                             		set(
-                             			current, 
-                             			"docu",
-                              		lv_docu_2_0, 
-                              		"Documentation");
-                      	        afterParserOrEnumRuleCall();
-                      	    
-                    }
+
+
+                    	        if (current==null) {
+                    	            current = createModelElementForParent(grammarAccess.getPhysicalSystemRule());
+                    	        }
+                           		set(
+                           			current, 
+                           			"docu",
+                            		lv_docu_2_0, 
+                            		"org.eclipse.etrice.core.common.Base.Documentation");
+                    	        afterParserOrEnumRuleCall();
+                    	    
 
                     }
 
@@ -617,13 +570,11 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_3=(Token)match(input,13,FOLLOW_13_in_rulePhysicalSystem406); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_3=(Token)match(input,13,FOLLOW_8); 
 
-                  	newLeafNode(otherlv_3, grammarAccess.getPhysicalSystemAccess().getLeftCurlyBracketKeyword_3());
-                  
-            }
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:250:1: ( (lv_nodeRefs_4_0= ruleNodeRef ) )*
+                	newLeafNode(otherlv_3, grammarAccess.getPhysicalSystemAccess().getLeftCurlyBracketKeyword_3());
+                
+            // InternalETPhys.g:250:1: ( (lv_nodeRefs_4_0= ruleNodeRef ) )*
             loop4:
             do {
                 int alt4=2;
@@ -636,34 +587,30 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
                 switch (alt4) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:251:1: (lv_nodeRefs_4_0= ruleNodeRef )
+            	    // InternalETPhys.g:251:1: (lv_nodeRefs_4_0= ruleNodeRef )
             	    {
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:251:1: (lv_nodeRefs_4_0= ruleNodeRef )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:252:3: lv_nodeRefs_4_0= ruleNodeRef
+            	    // InternalETPhys.g:251:1: (lv_nodeRefs_4_0= ruleNodeRef )
+            	    // InternalETPhys.g:252:3: lv_nodeRefs_4_0= ruleNodeRef
             	    {
-            	    if ( state.backtracking==0 ) {
-            	       
-            	      	        newCompositeNode(grammarAccess.getPhysicalSystemAccess().getNodeRefsNodeRefParserRuleCall_4_0()); 
-            	      	    
-            	    }
-            	    pushFollow(FOLLOW_ruleNodeRef_in_rulePhysicalSystem427);
+            	     
+            	    	        newCompositeNode(grammarAccess.getPhysicalSystemAccess().getNodeRefsNodeRefParserRuleCall_4_0()); 
+            	    	    
+            	    pushFollow(FOLLOW_8);
             	    lv_nodeRefs_4_0=ruleNodeRef();
 
             	    state._fsp--;
-            	    if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
-
-            	      	        if (current==null) {
-            	      	            current = createModelElementForParent(grammarAccess.getPhysicalSystemRule());
-            	      	        }
-            	             		add(
-            	             			current, 
-            	             			"nodeRefs",
-            	              		lv_nodeRefs_4_0, 
-            	              		"NodeRef");
-            	      	        afterParserOrEnumRuleCall();
-            	      	    
-            	    }
+
+
+            	    	        if (current==null) {
+            	    	            current = createModelElementForParent(grammarAccess.getPhysicalSystemRule());
+            	    	        }
+            	           		add(
+            	           			current, 
+            	           			"nodeRefs",
+            	            		lv_nodeRefs_4_0, 
+            	            		"org.eclipse.etrice.core.etphys.ETPhys.NodeRef");
+            	    	        afterParserOrEnumRuleCall();
+            	    	    
 
             	    }
 
@@ -676,21 +623,17 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                 }
             } while (true);
 
-            otherlv_5=(Token)match(input,14,FOLLOW_14_in_rulePhysicalSystem440); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_5=(Token)match(input,14,FOLLOW_2); 
 
-                  	newLeafNode(otherlv_5, grammarAccess.getPhysicalSystemAccess().getRightCurlyBracketKeyword_5());
-                  
-            }
+                	newLeafNode(otherlv_5, grammarAccess.getPhysicalSystemAccess().getRightCurlyBracketKeyword_5());
+                
 
             }
 
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -705,7 +648,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleNodeRef"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:280:1: entryRuleNodeRef returns [EObject current=null] : iv_ruleNodeRef= ruleNodeRef EOF ;
+    // InternalETPhys.g:280:1: entryRuleNodeRef returns [EObject current=null] : iv_ruleNodeRef= ruleNodeRef EOF ;
     public final EObject entryRuleNodeRef() throws RecognitionException {
         EObject current = null;
 
@@ -713,21 +656,17 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:281:2: (iv_ruleNodeRef= ruleNodeRef EOF )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:282:2: iv_ruleNodeRef= ruleNodeRef EOF
+            // InternalETPhys.g:281:2: (iv_ruleNodeRef= ruleNodeRef EOF )
+            // InternalETPhys.g:282:2: iv_ruleNodeRef= ruleNodeRef EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getNodeRefRule()); 
-            }
-            pushFollow(FOLLOW_ruleNodeRef_in_entryRuleNodeRef476);
+             newCompositeNode(grammarAccess.getNodeRefRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleNodeRef=ruleNodeRef();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleNodeRef; 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleNodeRef486); if (state.failed) return current;
+
+             current =iv_ruleNodeRef; 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -745,7 +684,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleNodeRef"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:289:1: ruleNodeRef returns [EObject current=null] : (otherlv_0= 'NodeRef' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( ruleFQN ) ) ( (lv_docu_4_0= ruleDocumentation ) )? ) ;
+    // InternalETPhys.g:289:1: ruleNodeRef returns [EObject current=null] : (otherlv_0= 'NodeRef' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( ruleFQN ) ) ( (lv_docu_4_0= ruleDocumentation ) )? ) ;
     public final EObject ruleNodeRef() throws RecognitionException {
         EObject current = null;
 
@@ -758,89 +697,75 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:292:28: ( (otherlv_0= 'NodeRef' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( ruleFQN ) ) ( (lv_docu_4_0= ruleDocumentation ) )? ) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:293:1: (otherlv_0= 'NodeRef' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( ruleFQN ) ) ( (lv_docu_4_0= ruleDocumentation ) )? )
+            // InternalETPhys.g:292:28: ( (otherlv_0= 'NodeRef' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( ruleFQN ) ) ( (lv_docu_4_0= ruleDocumentation ) )? ) )
+            // InternalETPhys.g:293:1: (otherlv_0= 'NodeRef' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( ruleFQN ) ) ( (lv_docu_4_0= ruleDocumentation ) )? )
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:293:1: (otherlv_0= 'NodeRef' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( ruleFQN ) ) ( (lv_docu_4_0= ruleDocumentation ) )? )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:293:3: otherlv_0= 'NodeRef' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( ruleFQN ) ) ( (lv_docu_4_0= ruleDocumentation ) )?
+            // InternalETPhys.g:293:1: (otherlv_0= 'NodeRef' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( ruleFQN ) ) ( (lv_docu_4_0= ruleDocumentation ) )? )
+            // InternalETPhys.g:293:3: otherlv_0= 'NodeRef' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( ruleFQN ) ) ( (lv_docu_4_0= ruleDocumentation ) )?
             {
-            otherlv_0=(Token)match(input,16,FOLLOW_16_in_ruleNodeRef523); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_0=(Token)match(input,16,FOLLOW_3); 
 
-                  	newLeafNode(otherlv_0, grammarAccess.getNodeRefAccess().getNodeRefKeyword_0());
-                  
-            }
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:297:1: ( (lv_name_1_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:298:1: (lv_name_1_0= RULE_ID )
+                	newLeafNode(otherlv_0, grammarAccess.getNodeRefAccess().getNodeRefKeyword_0());
+                
+            // InternalETPhys.g:297:1: ( (lv_name_1_0= RULE_ID ) )
+            // InternalETPhys.g:298:1: (lv_name_1_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:298:1: (lv_name_1_0= RULE_ID )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:299:3: lv_name_1_0= RULE_ID
+            // InternalETPhys.g:298:1: (lv_name_1_0= RULE_ID )
+            // InternalETPhys.g:299:3: lv_name_1_0= RULE_ID
             {
-            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleNodeRef540); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_9); 
 
-              			newLeafNode(lv_name_1_0, grammarAccess.getNodeRefAccess().getNameIDTerminalRuleCall_1_0()); 
-              		
-            }
-            if ( state.backtracking==0 ) {
+            			newLeafNode(lv_name_1_0, grammarAccess.getNodeRefAccess().getNameIDTerminalRuleCall_1_0()); 
+            		
 
-              	        if (current==null) {
-              	            current = createModelElement(grammarAccess.getNodeRefRule());
-              	        }
-                     		setWithLastConsumed(
-                     			current, 
-                     			"name",
-                      		lv_name_1_0, 
-                      		"ID");
-              	    
-            }
+            	        if (current==null) {
+            	            current = createModelElement(grammarAccess.getNodeRefRule());
+            	        }
+                   		setWithLastConsumed(
+                   			current, 
+                   			"name",
+                    		lv_name_1_0, 
+                    		"org.eclipse.xtext.common.Terminals.ID");
+            	    
 
             }
 
 
             }
 
-            otherlv_2=(Token)match(input,17,FOLLOW_17_in_ruleNodeRef557); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_2=(Token)match(input,17,FOLLOW_3); 
 
-                  	newLeafNode(otherlv_2, grammarAccess.getNodeRefAccess().getColonKeyword_2());
-                  
-            }
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:319:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:320:1: ( ruleFQN )
+                	newLeafNode(otherlv_2, grammarAccess.getNodeRefAccess().getColonKeyword_2());
+                
+            // InternalETPhys.g:319:1: ( ( ruleFQN ) )
+            // InternalETPhys.g:320:1: ( ruleFQN )
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:320:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:321:3: ruleFQN
+            // InternalETPhys.g:320:1: ( ruleFQN )
+            // InternalETPhys.g:321:3: ruleFQN
             {
-            if ( state.backtracking==0 ) {
 
-              			if (current==null) {
-              	            current = createModelElement(grammarAccess.getNodeRefRule());
-              	        }
-                      
-            }
-            if ( state.backtracking==0 ) {
-               
-              	        newCompositeNode(grammarAccess.getNodeRefAccess().getTypeNodeClassCrossReference_3_0()); 
-              	    
-            }
-            pushFollow(FOLLOW_ruleFQN_in_ruleNodeRef580);
+            			if (current==null) {
+            	            current = createModelElement(grammarAccess.getNodeRefRule());
+            	        }
+                    
+             
+            	        newCompositeNode(grammarAccess.getNodeRefAccess().getTypeNodeClassCrossReference_3_0()); 
+            	    
+            pushFollow(FOLLOW_10);
             ruleFQN();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               
-              	        afterParserOrEnumRuleCall();
-              	    
-            }
+
+             
+            	        afterParserOrEnumRuleCall();
+            	    
 
             }
 
 
             }
 
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:334:2: ( (lv_docu_4_0= ruleDocumentation ) )?
+            // InternalETPhys.g:334:2: ( (lv_docu_4_0= ruleDocumentation ) )?
             int alt5=2;
             int LA5_0 = input.LA(1);
 
@@ -849,34 +774,30 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
             }
             switch (alt5) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:335:1: (lv_docu_4_0= ruleDocumentation )
+                    // InternalETPhys.g:335:1: (lv_docu_4_0= ruleDocumentation )
                     {
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:335:1: (lv_docu_4_0= ruleDocumentation )
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:336:3: lv_docu_4_0= ruleDocumentation
+                    // InternalETPhys.g:335:1: (lv_docu_4_0= ruleDocumentation )
+                    // InternalETPhys.g:336:3: lv_docu_4_0= ruleDocumentation
                     {
-                    if ( state.backtracking==0 ) {
-                       
-                      	        newCompositeNode(grammarAccess.getNodeRefAccess().getDocuDocumentationParserRuleCall_4_0()); 
-                      	    
-                    }
-                    pushFollow(FOLLOW_ruleDocumentation_in_ruleNodeRef601);
+                     
+                    	        newCompositeNode(grammarAccess.getNodeRefAccess().getDocuDocumentationParserRuleCall_4_0()); 
+                    	    
+                    pushFollow(FOLLOW_2);
                     lv_docu_4_0=ruleDocumentation();
 
                     state._fsp--;
-                    if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
-
-                      	        if (current==null) {
-                      	            current = createModelElementForParent(grammarAccess.getNodeRefRule());
-                      	        }
-                             		set(
-                             			current, 
-                             			"docu",
-                              		lv_docu_4_0, 
-                              		"Documentation");
-                      	        afterParserOrEnumRuleCall();
-                      	    
-                    }
+
+
+                    	        if (current==null) {
+                    	            current = createModelElementForParent(grammarAccess.getNodeRefRule());
+                    	        }
+                           		set(
+                           			current, 
+                           			"docu",
+                            		lv_docu_4_0, 
+                            		"org.eclipse.etrice.core.common.Base.Documentation");
+                    	        afterParserOrEnumRuleCall();
+                    	    
 
                     }
 
@@ -892,9 +813,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -909,7 +828,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleNodeClass"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:360:1: entryRuleNodeClass returns [EObject current=null] : iv_ruleNodeClass= ruleNodeClass EOF ;
+    // InternalETPhys.g:360:1: entryRuleNodeClass returns [EObject current=null] : iv_ruleNodeClass= ruleNodeClass EOF ;
     public final EObject entryRuleNodeClass() throws RecognitionException {
         EObject current = null;
 
@@ -917,21 +836,17 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:361:2: (iv_ruleNodeClass= ruleNodeClass EOF )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:362:2: iv_ruleNodeClass= ruleNodeClass EOF
+            // InternalETPhys.g:361:2: (iv_ruleNodeClass= ruleNodeClass EOF )
+            // InternalETPhys.g:362:2: iv_ruleNodeClass= ruleNodeClass EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getNodeClassRule()); 
-            }
-            pushFollow(FOLLOW_ruleNodeClass_in_entryRuleNodeClass638);
+             newCompositeNode(grammarAccess.getNodeClassRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleNodeClass=ruleNodeClass();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleNodeClass; 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleNodeClass648); if (state.failed) return current;
+
+             current =iv_ruleNodeClass; 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -949,7 +864,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleNodeClass"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:369:1: ruleNodeClass returns [EObject current=null] : (otherlv_0= 'NodeClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( ( ( ( ({...}? => ( ({...}? => (otherlv_5= 'runtime' otherlv_6= '=' ( ( ruleFQN ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'priomin' otherlv_9= '=' ( (lv_priomin_10_0= ruleInteger ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'priomax' otherlv_12= '=' ( (lv_priomax_13_0= ruleInteger ) ) ) ) ) ) )+ {...}?) ) ) ( (lv_threads_14_0= rulePhysicalThread ) )* otherlv_15= '}' ) ;
+    // InternalETPhys.g:369:1: ruleNodeClass returns [EObject current=null] : (otherlv_0= 'NodeClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( ( ( ( ({...}? => ( ({...}? => (otherlv_5= 'runtime' otherlv_6= '=' ( ( ruleFQN ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'priomin' otherlv_9= '=' ( (lv_priomin_10_0= ruleInteger ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'priomax' otherlv_12= '=' ( (lv_priomax_13_0= ruleInteger ) ) ) ) ) ) )+ {...}?) ) ) ( (lv_threads_14_0= rulePhysicalThread ) )* otherlv_15= '}' ) ;
     public final EObject ruleNodeClass() throws RecognitionException {
         EObject current = null;
 
@@ -975,49 +890,43 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:372:28: ( (otherlv_0= 'NodeClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( ( ( ( ({...}? => ( ({...}? => (otherlv_5= 'runtime' otherlv_6= '=' ( ( ruleFQN ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'priomin' otherlv_9= '=' ( (lv_priomin_10_0= ruleInteger ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'priomax' otherlv_12= '=' ( (lv_priomax_13_0= ruleInteger ) ) ) ) ) ) )+ {...}?) ) ) ( (lv_threads_14_0= rulePhysicalThread ) )* otherlv_15= '}' ) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:373:1: (otherlv_0= 'NodeClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( ( ( ( ({...}? => ( ({...}? => (otherlv_5= 'runtime' otherlv_6= '=' ( ( ruleFQN ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'priomin' otherlv_9= '=' ( (lv_priomin_10_0= ruleInteger ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'priomax' otherlv_12= '=' ( (lv_priomax_13_0= ruleInteger ) ) ) ) ) ) )+ {...}?) ) ) ( (lv_threads_14_0= rulePhysicalThread ) )* otherlv_15= '}' )
+            // InternalETPhys.g:372:28: ( (otherlv_0= 'NodeClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( ( ( ( ({...}? => ( ({...}? => (otherlv_5= 'runtime' otherlv_6= '=' ( ( ruleFQN ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'priomin' otherlv_9= '=' ( (lv_priomin_10_0= ruleInteger ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'priomax' otherlv_12= '=' ( (lv_priomax_13_0= ruleInteger ) ) ) ) ) ) )+ {...}?) ) ) ( (lv_threads_14_0= rulePhysicalThread ) )* otherlv_15= '}' ) )
+            // InternalETPhys.g:373:1: (otherlv_0= 'NodeClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( ( ( ( ({...}? => ( ({...}? => (otherlv_5= 'runtime' otherlv_6= '=' ( ( ruleFQN ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'priomin' otherlv_9= '=' ( (lv_priomin_10_0= ruleInteger ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'priomax' otherlv_12= '=' ( (lv_priomax_13_0= ruleInteger ) ) ) ) ) ) )+ {...}?) ) ) ( (lv_threads_14_0= rulePhysicalThread ) )* otherlv_15= '}' )
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:373:1: (otherlv_0= 'NodeClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( ( ( ( ({...}? => ( ({...}? => (otherlv_5= 'runtime' otherlv_6= '=' ( ( ruleFQN ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'priomin' otherlv_9= '=' ( (lv_priomin_10_0= ruleInteger ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'priomax' otherlv_12= '=' ( (lv_priomax_13_0= ruleInteger ) ) ) ) ) ) )+ {...}?) ) ) ( (lv_threads_14_0= rulePhysicalThread ) )* otherlv_15= '}' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:373:3: otherlv_0= 'NodeClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( ( ( ( ({...}? => ( ({...}? => (otherlv_5= 'runtime' otherlv_6= '=' ( ( ruleFQN ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'priomin' otherlv_9= '=' ( (lv_priomin_10_0= ruleInteger ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'priomax' otherlv_12= '=' ( (lv_priomax_13_0= ruleInteger ) ) ) ) ) ) )+ {...}?) ) ) ( (lv_threads_14_0= rulePhysicalThread ) )* otherlv_15= '}'
+            // InternalETPhys.g:373:1: (otherlv_0= 'NodeClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( ( ( ( ({...}? => ( ({...}? => (otherlv_5= 'runtime' otherlv_6= '=' ( ( ruleFQN ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'priomin' otherlv_9= '=' ( (lv_priomin_10_0= ruleInteger ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'priomax' otherlv_12= '=' ( (lv_priomax_13_0= ruleInteger ) ) ) ) ) ) )+ {...}?) ) ) ( (lv_threads_14_0= rulePhysicalThread ) )* otherlv_15= '}' )
+            // InternalETPhys.g:373:3: otherlv_0= 'NodeClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( ( ( ( ({...}? => ( ({...}? => (otherlv_5= 'runtime' otherlv_6= '=' ( ( ruleFQN ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'priomin' otherlv_9= '=' ( (lv_priomin_10_0= ruleInteger ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'priomax' otherlv_12= '=' ( (lv_priomax_13_0= ruleInteger ) ) ) ) ) ) )+ {...}?) ) ) ( (lv_threads_14_0= rulePhysicalThread ) )* otherlv_15= '}'
             {
-            otherlv_0=(Token)match(input,18,FOLLOW_18_in_ruleNodeClass685); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_0=(Token)match(input,18,FOLLOW_3); 
 
-                  	newLeafNode(otherlv_0, grammarAccess.getNodeClassAccess().getNodeClassKeyword_0());
-                  
-            }
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:377:1: ( (lv_name_1_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:378:1: (lv_name_1_0= RULE_ID )
+                	newLeafNode(otherlv_0, grammarAccess.getNodeClassAccess().getNodeClassKeyword_0());
+                
+            // InternalETPhys.g:377:1: ( (lv_name_1_0= RULE_ID ) )
+            // InternalETPhys.g:378:1: (lv_name_1_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:378:1: (lv_name_1_0= RULE_ID )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:379:3: lv_name_1_0= RULE_ID
+            // InternalETPhys.g:378:1: (lv_name_1_0= RULE_ID )
+            // InternalETPhys.g:379:3: lv_name_1_0= RULE_ID
             {
-            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleNodeClass702); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_7); 
 
-              			newLeafNode(lv_name_1_0, grammarAccess.getNodeClassAccess().getNameIDTerminalRuleCall_1_0()); 
-              		
-            }
-            if ( state.backtracking==0 ) {
+            			newLeafNode(lv_name_1_0, grammarAccess.getNodeClassAccess().getNameIDTerminalRuleCall_1_0()); 
+            		
 
-              	        if (current==null) {
-              	            current = createModelElement(grammarAccess.getNodeClassRule());
-              	        }
-                     		setWithLastConsumed(
-                     			current, 
-                     			"name",
-                      		lv_name_1_0, 
-                      		"ID");
-              	    
-            }
+            	        if (current==null) {
+            	            current = createModelElement(grammarAccess.getNodeClassRule());
+            	        }
+                   		setWithLastConsumed(
+                   			current, 
+                   			"name",
+                    		lv_name_1_0, 
+                    		"org.eclipse.xtext.common.Terminals.ID");
+            	    
 
             }
 
 
             }
 
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:395:2: ( (lv_docu_2_0= ruleDocumentation ) )?
+            // InternalETPhys.g:395:2: ( (lv_docu_2_0= ruleDocumentation ) )?
             int alt6=2;
             int LA6_0 = input.LA(1);
 
@@ -1026,34 +935,30 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
             }
             switch (alt6) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:396:1: (lv_docu_2_0= ruleDocumentation )
+                    // InternalETPhys.g:396:1: (lv_docu_2_0= ruleDocumentation )
                     {
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:396:1: (lv_docu_2_0= ruleDocumentation )
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:397:3: lv_docu_2_0= ruleDocumentation
+                    // InternalETPhys.g:396:1: (lv_docu_2_0= ruleDocumentation )
+                    // InternalETPhys.g:397:3: lv_docu_2_0= ruleDocumentation
                     {
-                    if ( state.backtracking==0 ) {
-                       
-                      	        newCompositeNode(grammarAccess.getNodeClassAccess().getDocuDocumentationParserRuleCall_2_0()); 
-                      	    
-                    }
-                    pushFollow(FOLLOW_ruleDocumentation_in_ruleNodeClass728);
+                     
+                    	        newCompositeNode(grammarAccess.getNodeClassAccess().getDocuDocumentationParserRuleCall_2_0()); 
+                    	    
+                    pushFollow(FOLLOW_4);
                     lv_docu_2_0=ruleDocumentation();
 
                     state._fsp--;
-                    if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
-
-                      	        if (current==null) {
-                      	            current = createModelElementForParent(grammarAccess.getNodeClassRule());
-                      	        }
-                             		set(
-                             			current, 
-                             			"docu",
-                              		lv_docu_2_0, 
-                              		"Documentation");
-                      	        afterParserOrEnumRuleCall();
-                      	    
-                    }
+
+
+                    	        if (current==null) {
+                    	            current = createModelElementForParent(grammarAccess.getNodeClassRule());
+                    	        }
+                           		set(
+                           			current, 
+                           			"docu",
+                            		lv_docu_2_0, 
+                            		"org.eclipse.etrice.core.common.Base.Documentation");
+                    	        afterParserOrEnumRuleCall();
+                    	    
 
                     }
 
@@ -1063,105 +968,95 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_3=(Token)match(input,13,FOLLOW_13_in_ruleNodeClass741); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_3=(Token)match(input,13,FOLLOW_11); 
 
-                  	newLeafNode(otherlv_3, grammarAccess.getNodeClassAccess().getLeftCurlyBracketKeyword_3());
-                  
-            }
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:417:1: ( ( ( ( ({...}? => ( ({...}? => (otherlv_5= 'runtime' otherlv_6= '=' ( ( ruleFQN ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'priomin' otherlv_9= '=' ( (lv_priomin_10_0= ruleInteger ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'priomax' otherlv_12= '=' ( (lv_priomax_13_0= ruleInteger ) ) ) ) ) ) )+ {...}?) ) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:419:1: ( ( ( ({...}? => ( ({...}? => (otherlv_5= 'runtime' otherlv_6= '=' ( ( ruleFQN ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'priomin' otherlv_9= '=' ( (lv_priomin_10_0= ruleInteger ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'priomax' otherlv_12= '=' ( (lv_priomax_13_0= ruleInteger ) ) ) ) ) ) )+ {...}?) )
+                	newLeafNode(otherlv_3, grammarAccess.getNodeClassAccess().getLeftCurlyBracketKeyword_3());
+                
+            // InternalETPhys.g:417:1: ( ( ( ( ({...}? => ( ({...}? => (otherlv_5= 'runtime' otherlv_6= '=' ( ( ruleFQN ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'priomin' otherlv_9= '=' ( (lv_priomin_10_0= ruleInteger ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'priomax' otherlv_12= '=' ( (lv_priomax_13_0= ruleInteger ) ) ) ) ) ) )+ {...}?) ) )
+            // InternalETPhys.g:419:1: ( ( ( ({...}? => ( ({...}? => (otherlv_5= 'runtime' otherlv_6= '=' ( ( ruleFQN ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'priomin' otherlv_9= '=' ( (lv_priomin_10_0= ruleInteger ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'priomax' otherlv_12= '=' ( (lv_priomax_13_0= ruleInteger ) ) ) ) ) ) )+ {...}?) )
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:419:1: ( ( ( ({...}? => ( ({...}? => (otherlv_5= 'runtime' otherlv_6= '=' ( ( ruleFQN ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'priomin' otherlv_9= '=' ( (lv_priomin_10_0= ruleInteger ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'priomax' otherlv_12= '=' ( (lv_priomax_13_0= ruleInteger ) ) ) ) ) ) )+ {...}?) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:420:2: ( ( ({...}? => ( ({...}? => (otherlv_5= 'runtime' otherlv_6= '=' ( ( ruleFQN ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'priomin' otherlv_9= '=' ( (lv_priomin_10_0= ruleInteger ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'priomax' otherlv_12= '=' ( (lv_priomax_13_0= ruleInteger ) ) ) ) ) ) )+ {...}?)
+            // InternalETPhys.g:419:1: ( ( ( ({...}? => ( ({...}? => (otherlv_5= 'runtime' otherlv_6= '=' ( ( ruleFQN ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'priomin' otherlv_9= '=' ( (lv_priomin_10_0= ruleInteger ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'priomax' otherlv_12= '=' ( (lv_priomax_13_0= ruleInteger ) ) ) ) ) ) )+ {...}?) )
+            // InternalETPhys.g:420:2: ( ( ({...}? => ( ({...}? => (otherlv_5= 'runtime' otherlv_6= '=' ( ( ruleFQN ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'priomin' otherlv_9= '=' ( (lv_priomin_10_0= ruleInteger ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'priomax' otherlv_12= '=' ( (lv_priomax_13_0= ruleInteger ) ) ) ) ) ) )+ {...}?)
             {
-            getUnorderedGroupHelper().enter(grammarAccess.getNodeClassAccess().getUnorderedGroup_4());
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:423:2: ( ( ({...}? => ( ({...}? => (otherlv_5= 'runtime' otherlv_6= '=' ( ( ruleFQN ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'priomin' otherlv_9= '=' ( (lv_priomin_10_0= ruleInteger ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'priomax' otherlv_12= '=' ( (lv_priomax_13_0= ruleInteger ) ) ) ) ) ) )+ {...}?)
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:424:3: ( ({...}? => ( ({...}? => (otherlv_5= 'runtime' otherlv_6= '=' ( ( ruleFQN ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'priomin' otherlv_9= '=' ( (lv_priomin_10_0= ruleInteger ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'priomax' otherlv_12= '=' ( (lv_priomax_13_0= ruleInteger ) ) ) ) ) ) )+ {...}?
+             
+            	  getUnorderedGroupHelper().enter(grammarAccess.getNodeClassAccess().getUnorderedGroup_4());
+            	
+            // InternalETPhys.g:423:2: ( ( ({...}? => ( ({...}? => (otherlv_5= 'runtime' otherlv_6= '=' ( ( ruleFQN ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'priomin' otherlv_9= '=' ( (lv_priomin_10_0= ruleInteger ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'priomax' otherlv_12= '=' ( (lv_priomax_13_0= ruleInteger ) ) ) ) ) ) )+ {...}?)
+            // InternalETPhys.g:424:3: ( ({...}? => ( ({...}? => (otherlv_5= 'runtime' otherlv_6= '=' ( ( ruleFQN ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'priomin' otherlv_9= '=' ( (lv_priomin_10_0= ruleInteger ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'priomax' otherlv_12= '=' ( (lv_priomax_13_0= ruleInteger ) ) ) ) ) ) )+ {...}?
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:424:3: ( ({...}? => ( ({...}? => (otherlv_5= 'runtime' otherlv_6= '=' ( ( ruleFQN ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'priomin' otherlv_9= '=' ( (lv_priomin_10_0= ruleInteger ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'priomax' otherlv_12= '=' ( (lv_priomax_13_0= ruleInteger ) ) ) ) ) ) )+
+            // InternalETPhys.g:424:3: ( ({...}? => ( ({...}? => (otherlv_5= 'runtime' otherlv_6= '=' ( ( ruleFQN ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'priomin' otherlv_9= '=' ( (lv_priomin_10_0= ruleInteger ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'priomax' otherlv_12= '=' ( (lv_priomax_13_0= ruleInteger ) ) ) ) ) ) )+
             int cnt7=0;
             loop7:
             do {
                 int alt7=4;
                 int LA7_0 = input.LA(1);
 
-                if ( LA7_0 ==19 && getUnorderedGroupHelper().canSelect(grammarAccess.getNodeClassAccess().getUnorderedGroup_4(), 0) ) {
+                if ( LA7_0 == 19 && getUnorderedGroupHelper().canSelect(grammarAccess.getNodeClassAccess().getUnorderedGroup_4(), 0) ) {
                     alt7=1;
                 }
-                else if ( LA7_0 ==21 && getUnorderedGroupHelper().canSelect(grammarAccess.getNodeClassAccess().getUnorderedGroup_4(), 1) ) {
+                else if ( LA7_0 == 21 && getUnorderedGroupHelper().canSelect(grammarAccess.getNodeClassAccess().getUnorderedGroup_4(), 1) ) {
                     alt7=2;
                 }
-                else if ( LA7_0 ==22 && getUnorderedGroupHelper().canSelect(grammarAccess.getNodeClassAccess().getUnorderedGroup_4(), 2) ) {
+                else if ( LA7_0 == 22 && getUnorderedGroupHelper().canSelect(grammarAccess.getNodeClassAccess().getUnorderedGroup_4(), 2) ) {
                     alt7=3;
                 }
 
 
                 switch (alt7) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:426:4: ({...}? => ( ({...}? => (otherlv_5= 'runtime' otherlv_6= '=' ( ( ruleFQN ) ) ) ) ) )
+            	    // InternalETPhys.g:426:4: ({...}? => ( ({...}? => (otherlv_5= 'runtime' otherlv_6= '=' ( ( ruleFQN ) ) ) ) ) )
             	    {
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:426:4: ({...}? => ( ({...}? => (otherlv_5= 'runtime' otherlv_6= '=' ( ( ruleFQN ) ) ) ) ) )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:427:5: {...}? => ( ({...}? => (otherlv_5= 'runtime' otherlv_6= '=' ( ( ruleFQN ) ) ) ) )
+            	    // InternalETPhys.g:426:4: ({...}? => ( ({...}? => (otherlv_5= 'runtime' otherlv_6= '=' ( ( ruleFQN ) ) ) ) ) )
+            	    // InternalETPhys.g:427:5: {...}? => ( ({...}? => (otherlv_5= 'runtime' otherlv_6= '=' ( ( ruleFQN ) ) ) ) )
             	    {
             	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getNodeClassAccess().getUnorderedGroup_4(), 0) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleNodeClass", "getUnorderedGroupHelper().canSelect(grammarAccess.getNodeClassAccess().getUnorderedGroup_4(), 0)");
             	    }
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:427:106: ( ({...}? => (otherlv_5= 'runtime' otherlv_6= '=' ( ( ruleFQN ) ) ) ) )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:428:6: ({...}? => (otherlv_5= 'runtime' otherlv_6= '=' ( ( ruleFQN ) ) ) )
+            	    // InternalETPhys.g:427:106: ( ({...}? => (otherlv_5= 'runtime' otherlv_6= '=' ( ( ruleFQN ) ) ) ) )
+            	    // InternalETPhys.g:428:6: ({...}? => (otherlv_5= 'runtime' otherlv_6= '=' ( ( ruleFQN ) ) ) )
             	    {
-            	    getUnorderedGroupHelper().select(grammarAccess.getNodeClassAccess().getUnorderedGroup_4(), 0);
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:431:6: ({...}? => (otherlv_5= 'runtime' otherlv_6= '=' ( ( ruleFQN ) ) ) )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:431:7: {...}? => (otherlv_5= 'runtime' otherlv_6= '=' ( ( ruleFQN ) ) )
+            	     
+            	    	 				  getUnorderedGroupHelper().select(grammarAccess.getNodeClassAccess().getUnorderedGroup_4(), 0);
+            	    	 				
+            	    // InternalETPhys.g:431:6: ({...}? => (otherlv_5= 'runtime' otherlv_6= '=' ( ( ruleFQN ) ) ) )
+            	    // InternalETPhys.g:431:7: {...}? => (otherlv_5= 'runtime' otherlv_6= '=' ( ( ruleFQN ) ) )
             	    {
             	    if ( !((true)) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleNodeClass", "true");
             	    }
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:431:16: (otherlv_5= 'runtime' otherlv_6= '=' ( ( ruleFQN ) ) )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:431:18: otherlv_5= 'runtime' otherlv_6= '=' ( ( ruleFQN ) )
+            	    // InternalETPhys.g:431:16: (otherlv_5= 'runtime' otherlv_6= '=' ( ( ruleFQN ) ) )
+            	    // InternalETPhys.g:431:18: otherlv_5= 'runtime' otherlv_6= '=' ( ( ruleFQN ) )
             	    {
-            	    otherlv_5=(Token)match(input,19,FOLLOW_19_in_ruleNodeClass799); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
+            	    otherlv_5=(Token)match(input,19,FOLLOW_12); 
 
-            	          	newLeafNode(otherlv_5, grammarAccess.getNodeClassAccess().getRuntimeKeyword_4_0_0());
-            	          
-            	    }
-            	    otherlv_6=(Token)match(input,20,FOLLOW_20_in_ruleNodeClass811); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
+            	        	newLeafNode(otherlv_5, grammarAccess.getNodeClassAccess().getRuntimeKeyword_4_0_0());
+            	        
+            	    otherlv_6=(Token)match(input,20,FOLLOW_3); 
 
-            	          	newLeafNode(otherlv_6, grammarAccess.getNodeClassAccess().getEqualsSignKeyword_4_0_1());
-            	          
-            	    }
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:439:1: ( ( ruleFQN ) )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:440:1: ( ruleFQN )
+            	        	newLeafNode(otherlv_6, grammarAccess.getNodeClassAccess().getEqualsSignKeyword_4_0_1());
+            	        
+            	    // InternalETPhys.g:439:1: ( ( ruleFQN ) )
+            	    // InternalETPhys.g:440:1: ( ruleFQN )
             	    {
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:440:1: ( ruleFQN )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:441:3: ruleFQN
+            	    // InternalETPhys.g:440:1: ( ruleFQN )
+            	    // InternalETPhys.g:441:3: ruleFQN
             	    {
-            	    if ( state.backtracking==0 ) {
 
-            	      			if (current==null) {
-            	      	            current = createModelElement(grammarAccess.getNodeClassRule());
-            	      	        }
-            	              
-            	    }
-            	    if ( state.backtracking==0 ) {
-            	       
-            	      	        newCompositeNode(grammarAccess.getNodeClassAccess().getRuntimeRuntimeClassCrossReference_4_0_2_0()); 
-            	      	    
-            	    }
-            	    pushFollow(FOLLOW_ruleFQN_in_ruleNodeClass834);
+            	    			if (current==null) {
+            	    	            current = createModelElement(grammarAccess.getNodeClassRule());
+            	    	        }
+            	            
+            	     
+            	    	        newCompositeNode(grammarAccess.getNodeClassAccess().getRuntimeRuntimeClassCrossReference_4_0_2_0()); 
+            	    	    
+            	    pushFollow(FOLLOW_13);
             	    ruleFQN();
 
             	    state._fsp--;
-            	    if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
-            	       
-            	      	        afterParserOrEnumRuleCall();
-            	      	    
-            	    }
+
+            	     
+            	    	        afterParserOrEnumRuleCall();
+            	    	    
 
             	    }
 
@@ -1174,7 +1069,9 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    getUnorderedGroupHelper().returnFromSelection(grammarAccess.getNodeClassAccess().getUnorderedGroup_4());
+            	     
+            	    	 				  getUnorderedGroupHelper().returnFromSelection(grammarAccess.getNodeClassAccess().getUnorderedGroup_4());
+            	    	 				
 
             	    }
 
@@ -1185,70 +1082,62 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 2 :
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:461:4: ({...}? => ( ({...}? => (otherlv_8= 'priomin' otherlv_9= '=' ( (lv_priomin_10_0= ruleInteger ) ) ) ) ) )
+            	    // InternalETPhys.g:461:4: ({...}? => ( ({...}? => (otherlv_8= 'priomin' otherlv_9= '=' ( (lv_priomin_10_0= ruleInteger ) ) ) ) ) )
             	    {
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:461:4: ({...}? => ( ({...}? => (otherlv_8= 'priomin' otherlv_9= '=' ( (lv_priomin_10_0= ruleInteger ) ) ) ) ) )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:462:5: {...}? => ( ({...}? => (otherlv_8= 'priomin' otherlv_9= '=' ( (lv_priomin_10_0= ruleInteger ) ) ) ) )
+            	    // InternalETPhys.g:461:4: ({...}? => ( ({...}? => (otherlv_8= 'priomin' otherlv_9= '=' ( (lv_priomin_10_0= ruleInteger ) ) ) ) ) )
+            	    // InternalETPhys.g:462:5: {...}? => ( ({...}? => (otherlv_8= 'priomin' otherlv_9= '=' ( (lv_priomin_10_0= ruleInteger ) ) ) ) )
             	    {
             	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getNodeClassAccess().getUnorderedGroup_4(), 1) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleNodeClass", "getUnorderedGroupHelper().canSelect(grammarAccess.getNodeClassAccess().getUnorderedGroup_4(), 1)");
             	    }
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:462:106: ( ({...}? => (otherlv_8= 'priomin' otherlv_9= '=' ( (lv_priomin_10_0= ruleInteger ) ) ) ) )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:463:6: ({...}? => (otherlv_8= 'priomin' otherlv_9= '=' ( (lv_priomin_10_0= ruleInteger ) ) ) )
+            	    // InternalETPhys.g:462:106: ( ({...}? => (otherlv_8= 'priomin' otherlv_9= '=' ( (lv_priomin_10_0= ruleInteger ) ) ) ) )
+            	    // InternalETPhys.g:463:6: ({...}? => (otherlv_8= 'priomin' otherlv_9= '=' ( (lv_priomin_10_0= ruleInteger ) ) ) )
             	    {
-            	    getUnorderedGroupHelper().select(grammarAccess.getNodeClassAccess().getUnorderedGroup_4(), 1);
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:466:6: ({...}? => (otherlv_8= 'priomin' otherlv_9= '=' ( (lv_priomin_10_0= ruleInteger ) ) ) )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:466:7: {...}? => (otherlv_8= 'priomin' otherlv_9= '=' ( (lv_priomin_10_0= ruleInteger ) ) )
+            	     
+            	    	 				  getUnorderedGroupHelper().select(grammarAccess.getNodeClassAccess().getUnorderedGroup_4(), 1);
+            	    	 				
+            	    // InternalETPhys.g:466:6: ({...}? => (otherlv_8= 'priomin' otherlv_9= '=' ( (lv_priomin_10_0= ruleInteger ) ) ) )
+            	    // InternalETPhys.g:466:7: {...}? => (otherlv_8= 'priomin' otherlv_9= '=' ( (lv_priomin_10_0= ruleInteger ) ) )
             	    {
             	    if ( !((true)) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleNodeClass", "true");
             	    }
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:466:16: (otherlv_8= 'priomin' otherlv_9= '=' ( (lv_priomin_10_0= ruleInteger ) ) )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:466:18: otherlv_8= 'priomin' otherlv_9= '=' ( (lv_priomin_10_0= ruleInteger ) )
+            	    // InternalETPhys.g:466:16: (otherlv_8= 'priomin' otherlv_9= '=' ( (lv_priomin_10_0= ruleInteger ) ) )
+            	    // InternalETPhys.g:466:18: otherlv_8= 'priomin' otherlv_9= '=' ( (lv_priomin_10_0= ruleInteger ) )
             	    {
-            	    otherlv_8=(Token)match(input,21,FOLLOW_21_in_ruleNodeClass902); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
+            	    otherlv_8=(Token)match(input,21,FOLLOW_12); 
 
-            	          	newLeafNode(otherlv_8, grammarAccess.getNodeClassAccess().getPriominKeyword_4_1_0());
-            	          
-            	    }
-            	    otherlv_9=(Token)match(input,20,FOLLOW_20_in_ruleNodeClass914); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
+            	        	newLeafNode(otherlv_8, grammarAccess.getNodeClassAccess().getPriominKeyword_4_1_0());
+            	        
+            	    otherlv_9=(Token)match(input,20,FOLLOW_14); 
 
-            	          	newLeafNode(otherlv_9, grammarAccess.getNodeClassAccess().getEqualsSignKeyword_4_1_1());
-            	          
-            	    }
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:474:1: ( (lv_priomin_10_0= ruleInteger ) )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:475:1: (lv_priomin_10_0= ruleInteger )
+            	        	newLeafNode(otherlv_9, grammarAccess.getNodeClassAccess().getEqualsSignKeyword_4_1_1());
+            	        
+            	    // InternalETPhys.g:474:1: ( (lv_priomin_10_0= ruleInteger ) )
+            	    // InternalETPhys.g:475:1: (lv_priomin_10_0= ruleInteger )
             	    {
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:475:1: (lv_priomin_10_0= ruleInteger )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:476:3: lv_priomin_10_0= ruleInteger
+            	    // InternalETPhys.g:475:1: (lv_priomin_10_0= ruleInteger )
+            	    // InternalETPhys.g:476:3: lv_priomin_10_0= ruleInteger
             	    {
-            	    if ( state.backtracking==0 ) {
-            	       
-            	      	        newCompositeNode(grammarAccess.getNodeClassAccess().getPriominIntegerParserRuleCall_4_1_2_0()); 
-            	      	    
-            	    }
-            	    pushFollow(FOLLOW_ruleInteger_in_ruleNodeClass935);
+            	     
+            	    	        newCompositeNode(grammarAccess.getNodeClassAccess().getPriominIntegerParserRuleCall_4_1_2_0()); 
+            	    	    
+            	    pushFollow(FOLLOW_13);
             	    lv_priomin_10_0=ruleInteger();
 
             	    state._fsp--;
-            	    if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
-
-            	      	        if (current==null) {
-            	      	            current = createModelElementForParent(grammarAccess.getNodeClassRule());
-            	      	        }
-            	             		set(
-            	             			current, 
-            	             			"priomin",
-            	              		lv_priomin_10_0, 
-            	              		"Integer");
-            	      	        afterParserOrEnumRuleCall();
-            	      	    
-            	    }
+
+
+            	    	        if (current==null) {
+            	    	            current = createModelElementForParent(grammarAccess.getNodeClassRule());
+            	    	        }
+            	           		set(
+            	           			current, 
+            	           			"priomin",
+            	            		lv_priomin_10_0, 
+            	            		"org.eclipse.etrice.core.common.Base.Integer");
+            	    	        afterParserOrEnumRuleCall();
+            	    	    
 
             	    }
 
@@ -1261,7 +1150,9 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    getUnorderedGroupHelper().returnFromSelection(grammarAccess.getNodeClassAccess().getUnorderedGroup_4());
+            	     
+            	    	 				  getUnorderedGroupHelper().returnFromSelection(grammarAccess.getNodeClassAccess().getUnorderedGroup_4());
+            	    	 				
 
             	    }
 
@@ -1272,70 +1163,62 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 3 :
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:499:4: ({...}? => ( ({...}? => (otherlv_11= 'priomax' otherlv_12= '=' ( (lv_priomax_13_0= ruleInteger ) ) ) ) ) )
+            	    // InternalETPhys.g:499:4: ({...}? => ( ({...}? => (otherlv_11= 'priomax' otherlv_12= '=' ( (lv_priomax_13_0= ruleInteger ) ) ) ) ) )
             	    {
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:499:4: ({...}? => ( ({...}? => (otherlv_11= 'priomax' otherlv_12= '=' ( (lv_priomax_13_0= ruleInteger ) ) ) ) ) )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:500:5: {...}? => ( ({...}? => (otherlv_11= 'priomax' otherlv_12= '=' ( (lv_priomax_13_0= ruleInteger ) ) ) ) )
+            	    // InternalETPhys.g:499:4: ({...}? => ( ({...}? => (otherlv_11= 'priomax' otherlv_12= '=' ( (lv_priomax_13_0= ruleInteger ) ) ) ) ) )
+            	    // InternalETPhys.g:500:5: {...}? => ( ({...}? => (otherlv_11= 'priomax' otherlv_12= '=' ( (lv_priomax_13_0= ruleInteger ) ) ) ) )
             	    {
             	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getNodeClassAccess().getUnorderedGroup_4(), 2) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleNodeClass", "getUnorderedGroupHelper().canSelect(grammarAccess.getNodeClassAccess().getUnorderedGroup_4(), 2)");
             	    }
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:500:106: ( ({...}? => (otherlv_11= 'priomax' otherlv_12= '=' ( (lv_priomax_13_0= ruleInteger ) ) ) ) )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:501:6: ({...}? => (otherlv_11= 'priomax' otherlv_12= '=' ( (lv_priomax_13_0= ruleInteger ) ) ) )
+            	    // InternalETPhys.g:500:106: ( ({...}? => (otherlv_11= 'priomax' otherlv_12= '=' ( (lv_priomax_13_0= ruleInteger ) ) ) ) )
+            	    // InternalETPhys.g:501:6: ({...}? => (otherlv_11= 'priomax' otherlv_12= '=' ( (lv_priomax_13_0= ruleInteger ) ) ) )
             	    {
-            	    getUnorderedGroupHelper().select(grammarAccess.getNodeClassAccess().getUnorderedGroup_4(), 2);
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:504:6: ({...}? => (otherlv_11= 'priomax' otherlv_12= '=' ( (lv_priomax_13_0= ruleInteger ) ) ) )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:504:7: {...}? => (otherlv_11= 'priomax' otherlv_12= '=' ( (lv_priomax_13_0= ruleInteger ) ) )
+            	     
+            	    	 				  getUnorderedGroupHelper().select(grammarAccess.getNodeClassAccess().getUnorderedGroup_4(), 2);
+            	    	 				
+            	    // InternalETPhys.g:504:6: ({...}? => (otherlv_11= 'priomax' otherlv_12= '=' ( (lv_priomax_13_0= ruleInteger ) ) ) )
+            	    // InternalETPhys.g:504:7: {...}? => (otherlv_11= 'priomax' otherlv_12= '=' ( (lv_priomax_13_0= ruleInteger ) ) )
             	    {
             	    if ( !((true)) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleNodeClass", "true");
             	    }
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:504:16: (otherlv_11= 'priomax' otherlv_12= '=' ( (lv_priomax_13_0= ruleInteger ) ) )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:504:18: otherlv_11= 'priomax' otherlv_12= '=' ( (lv_priomax_13_0= ruleInteger ) )
+            	    // InternalETPhys.g:504:16: (otherlv_11= 'priomax' otherlv_12= '=' ( (lv_priomax_13_0= ruleInteger ) ) )
+            	    // InternalETPhys.g:504:18: otherlv_11= 'priomax' otherlv_12= '=' ( (lv_priomax_13_0= ruleInteger ) )
             	    {
-            	    otherlv_11=(Token)match(input,22,FOLLOW_22_in_ruleNodeClass1003); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
+            	    otherlv_11=(Token)match(input,22,FOLLOW_12); 
 
-            	          	newLeafNode(otherlv_11, grammarAccess.getNodeClassAccess().getPriomaxKeyword_4_2_0());
-            	          
-            	    }
-            	    otherlv_12=(Token)match(input,20,FOLLOW_20_in_ruleNodeClass1015); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
+            	        	newLeafNode(otherlv_11, grammarAccess.getNodeClassAccess().getPriomaxKeyword_4_2_0());
+            	        
+            	    otherlv_12=(Token)match(input,20,FOLLOW_14); 
 
-            	          	newLeafNode(otherlv_12, grammarAccess.getNodeClassAccess().getEqualsSignKeyword_4_2_1());
-            	          
-            	    }
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:512:1: ( (lv_priomax_13_0= ruleInteger ) )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:513:1: (lv_priomax_13_0= ruleInteger )
+            	        	newLeafNode(otherlv_12, grammarAccess.getNodeClassAccess().getEqualsSignKeyword_4_2_1());
+            	        
+            	    // InternalETPhys.g:512:1: ( (lv_priomax_13_0= ruleInteger ) )
+            	    // InternalETPhys.g:513:1: (lv_priomax_13_0= ruleInteger )
             	    {
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:513:1: (lv_priomax_13_0= ruleInteger )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:514:3: lv_priomax_13_0= ruleInteger
+            	    // InternalETPhys.g:513:1: (lv_priomax_13_0= ruleInteger )
+            	    // InternalETPhys.g:514:3: lv_priomax_13_0= ruleInteger
             	    {
-            	    if ( state.backtracking==0 ) {
-            	       
-            	      	        newCompositeNode(grammarAccess.getNodeClassAccess().getPriomaxIntegerParserRuleCall_4_2_2_0()); 
-            	      	    
-            	    }
-            	    pushFollow(FOLLOW_ruleInteger_in_ruleNodeClass1036);
+            	     
+            	    	        newCompositeNode(grammarAccess.getNodeClassAccess().getPriomaxIntegerParserRuleCall_4_2_2_0()); 
+            	    	    
+            	    pushFollow(FOLLOW_13);
             	    lv_priomax_13_0=ruleInteger();
 
             	    state._fsp--;
-            	    if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
-
-            	      	        if (current==null) {
-            	      	            current = createModelElementForParent(grammarAccess.getNodeClassRule());
-            	      	        }
-            	             		set(
-            	             			current, 
-            	             			"priomax",
-            	              		lv_priomax_13_0, 
-            	              		"Integer");
-            	      	        afterParserOrEnumRuleCall();
-            	      	    
-            	    }
+
+
+            	    	        if (current==null) {
+            	    	            current = createModelElementForParent(grammarAccess.getNodeClassRule());
+            	    	        }
+            	           		set(
+            	           			current, 
+            	           			"priomax",
+            	            		lv_priomax_13_0, 
+            	            		"org.eclipse.etrice.core.common.Base.Integer");
+            	    	        afterParserOrEnumRuleCall();
+            	    	    
 
             	    }
 
@@ -1348,7 +1231,9 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    getUnorderedGroupHelper().returnFromSelection(grammarAccess.getNodeClassAccess().getUnorderedGroup_4());
+            	     
+            	    	 				  getUnorderedGroupHelper().returnFromSelection(grammarAccess.getNodeClassAccess().getUnorderedGroup_4());
+            	    	 				
 
             	    }
 
@@ -1361,7 +1246,6 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
             	default :
             	    if ( cnt7 >= 1 ) break loop7;
-            	    if (state.backtracking>0) {state.failed=true; return current;}
                         EarlyExitException eee =
                             new EarlyExitException(7, input);
                         throw eee;
@@ -1370,7 +1254,6 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
             } while (true);
 
             if ( ! getUnorderedGroupHelper().canLeave(grammarAccess.getNodeClassAccess().getUnorderedGroup_4()) ) {
-                if (state.backtracking>0) {state.failed=true; return current;}
                 throw new FailedPredicateException(input, "ruleNodeClass", "getUnorderedGroupHelper().canLeave(grammarAccess.getNodeClassAccess().getUnorderedGroup_4())");
             }
 
@@ -1379,11 +1262,13 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
             }
 
-            getUnorderedGroupHelper().leave(grammarAccess.getNodeClassAccess().getUnorderedGroup_4());
+             
+            	  getUnorderedGroupHelper().leave(grammarAccess.getNodeClassAccess().getUnorderedGroup_4());
+            	
 
             }
 
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:545:2: ( (lv_threads_14_0= rulePhysicalThread ) )*
+            // InternalETPhys.g:545:2: ( (lv_threads_14_0= rulePhysicalThread ) )*
             loop8:
             do {
                 int alt8=2;
@@ -1396,34 +1281,30 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
                 switch (alt8) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:546:1: (lv_threads_14_0= rulePhysicalThread )
+            	    // InternalETPhys.g:546:1: (lv_threads_14_0= rulePhysicalThread )
             	    {
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:546:1: (lv_threads_14_0= rulePhysicalThread )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:547:3: lv_threads_14_0= rulePhysicalThread
+            	    // InternalETPhys.g:546:1: (lv_threads_14_0= rulePhysicalThread )
+            	    // InternalETPhys.g:547:3: lv_threads_14_0= rulePhysicalThread
             	    {
-            	    if ( state.backtracking==0 ) {
-            	       
-            	      	        newCompositeNode(grammarAccess.getNodeClassAccess().getThreadsPhysicalThreadParserRuleCall_5_0()); 
-            	      	    
-            	    }
-            	    pushFollow(FOLLOW_rulePhysicalThread_in_ruleNodeClass1104);
+            	     
+            	    	        newCompositeNode(grammarAccess.getNodeClassAccess().getThreadsPhysicalThreadParserRuleCall_5_0()); 
+            	    	    
+            	    pushFollow(FOLLOW_15);
             	    lv_threads_14_0=rulePhysicalThread();
 
             	    state._fsp--;
-            	    if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
-
-            	      	        if (current==null) {
-            	      	            current = createModelElementForParent(grammarAccess.getNodeClassRule());
-            	      	        }
-            	             		add(
-            	             			current, 
-            	             			"threads",
-            	              		lv_threads_14_0, 
-            	              		"PhysicalThread");
-            	      	        afterParserOrEnumRuleCall();
-            	      	    
-            	    }
+
+
+            	    	        if (current==null) {
+            	    	            current = createModelElementForParent(grammarAccess.getNodeClassRule());
+            	    	        }
+            	           		add(
+            	           			current, 
+            	           			"threads",
+            	            		lv_threads_14_0, 
+            	            		"org.eclipse.etrice.core.etphys.ETPhys.PhysicalThread");
+            	    	        afterParserOrEnumRuleCall();
+            	    	    
 
             	    }
 
@@ -1436,21 +1317,17 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                 }
             } while (true);
 
-            otherlv_15=(Token)match(input,14,FOLLOW_14_in_ruleNodeClass1117); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_15=(Token)match(input,14,FOLLOW_2); 
 
-                  	newLeafNode(otherlv_15, grammarAccess.getNodeClassAccess().getRightCurlyBracketKeyword_6());
-                  
-            }
+                	newLeafNode(otherlv_15, grammarAccess.getNodeClassAccess().getRightCurlyBracketKeyword_6());
+                
 
             }
 
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -1465,7 +1342,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRulePhysicalThread"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:575:1: entryRulePhysicalThread returns [EObject current=null] : iv_rulePhysicalThread= rulePhysicalThread EOF ;
+    // InternalETPhys.g:575:1: entryRulePhysicalThread returns [EObject current=null] : iv_rulePhysicalThread= rulePhysicalThread EOF ;
     public final EObject entryRulePhysicalThread() throws RecognitionException {
         EObject current = null;
 
@@ -1473,21 +1350,17 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:576:2: (iv_rulePhysicalThread= rulePhysicalThread EOF )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:577:2: iv_rulePhysicalThread= rulePhysicalThread EOF
+            // InternalETPhys.g:576:2: (iv_rulePhysicalThread= rulePhysicalThread EOF )
+            // InternalETPhys.g:577:2: iv_rulePhysicalThread= rulePhysicalThread EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getPhysicalThreadRule()); 
-            }
-            pushFollow(FOLLOW_rulePhysicalThread_in_entryRulePhysicalThread1153);
+             newCompositeNode(grammarAccess.getPhysicalThreadRule()); 
+            pushFollow(FOLLOW_1);
             iv_rulePhysicalThread=rulePhysicalThread();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_rulePhysicalThread; 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRulePhysicalThread1163); if (state.failed) return current;
+
+             current =iv_rulePhysicalThread; 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1505,7 +1378,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "rulePhysicalThread"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:584:1: rulePhysicalThread returns [EObject current=null] : ( ( ( (lv_default_0_0= 'DefaultThread' ) ) | otherlv_1= 'Thread' ) ( (lv_name_2_0= RULE_ID ) ) otherlv_3= '{' ( ( ( ( ({...}? => ( ({...}? => (otherlv_5= 'execmode' otherlv_6= '=' ( (lv_execmode_7_0= ruleExecMode ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'interval' otherlv_9= '=' ( (lv_time_10_0= ruleTIME ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'prio' otherlv_12= '=' ( (lv_prio_13_0= ruleInteger ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_14= 'stacksize' otherlv_15= '=' ( (lv_stacksize_16_0= RULE_INT ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_17= 'msgblocksize' otherlv_18= '=' ( (lv_msgblocksize_19_0= RULE_INT ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_20= 'msgpoolsize' otherlv_21= '=' ( (lv_msgpoolsize_22_0= RULE_INT ) ) ) ) ) ) )+ {...}?) ) ) otherlv_23= '}' ) ;
+    // InternalETPhys.g:584:1: rulePhysicalThread returns [EObject current=null] : ( ( ( (lv_default_0_0= 'DefaultThread' ) ) | otherlv_1= 'Thread' ) ( (lv_name_2_0= RULE_ID ) ) otherlv_3= '{' ( ( ( ( ({...}? => ( ({...}? => (otherlv_5= 'execmode' otherlv_6= '=' ( (lv_execmode_7_0= ruleExecMode ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'interval' otherlv_9= '=' ( (lv_time_10_0= ruleTIME ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'prio' otherlv_12= '=' ( (lv_prio_13_0= ruleInteger ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_14= 'stacksize' otherlv_15= '=' ( (lv_stacksize_16_0= RULE_INT ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_17= 'msgblocksize' otherlv_18= '=' ( (lv_msgblocksize_19_0= RULE_INT ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_20= 'msgpoolsize' otherlv_21= '=' ( (lv_msgpoolsize_22_0= RULE_INT ) ) ) ) ) ) )+ {...}?) ) ) otherlv_23= '}' ) ;
     public final EObject rulePhysicalThread() throws RecognitionException {
         EObject current = null;
 
@@ -1539,13 +1412,13 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:587:28: ( ( ( ( (lv_default_0_0= 'DefaultThread' ) ) | otherlv_1= 'Thread' ) ( (lv_name_2_0= RULE_ID ) ) otherlv_3= '{' ( ( ( ( ({...}? => ( ({...}? => (otherlv_5= 'execmode' otherlv_6= '=' ( (lv_execmode_7_0= ruleExecMode ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'interval' otherlv_9= '=' ( (lv_time_10_0= ruleTIME ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'prio' otherlv_12= '=' ( (lv_prio_13_0= ruleInteger ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_14= 'stacksize' otherlv_15= '=' ( (lv_stacksize_16_0= RULE_INT ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_17= 'msgblocksize' otherlv_18= '=' ( (lv_msgblocksize_19_0= RULE_INT ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_20= 'msgpoolsize' otherlv_21= '=' ( (lv_msgpoolsize_22_0= RULE_INT ) ) ) ) ) ) )+ {...}?) ) ) otherlv_23= '}' ) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:588:1: ( ( ( (lv_default_0_0= 'DefaultThread' ) ) | otherlv_1= 'Thread' ) ( (lv_name_2_0= RULE_ID ) ) otherlv_3= '{' ( ( ( ( ({...}? => ( ({...}? => (otherlv_5= 'execmode' otherlv_6= '=' ( (lv_execmode_7_0= ruleExecMode ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'interval' otherlv_9= '=' ( (lv_time_10_0= ruleTIME ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'prio' otherlv_12= '=' ( (lv_prio_13_0= ruleInteger ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_14= 'stacksize' otherlv_15= '=' ( (lv_stacksize_16_0= RULE_INT ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_17= 'msgblocksize' otherlv_18= '=' ( (lv_msgblocksize_19_0= RULE_INT ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_20= 'msgpoolsize' otherlv_21= '=' ( (lv_msgpoolsize_22_0= RULE_INT ) ) ) ) ) ) )+ {...}?) ) ) otherlv_23= '}' )
+            // InternalETPhys.g:587:28: ( ( ( ( (lv_default_0_0= 'DefaultThread' ) ) | otherlv_1= 'Thread' ) ( (lv_name_2_0= RULE_ID ) ) otherlv_3= '{' ( ( ( ( ({...}? => ( ({...}? => (otherlv_5= 'execmode' otherlv_6= '=' ( (lv_execmode_7_0= ruleExecMode ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'interval' otherlv_9= '=' ( (lv_time_10_0= ruleTIME ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'prio' otherlv_12= '=' ( (lv_prio_13_0= ruleInteger ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_14= 'stacksize' otherlv_15= '=' ( (lv_stacksize_16_0= RULE_INT ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_17= 'msgblocksize' otherlv_18= '=' ( (lv_msgblocksize_19_0= RULE_INT ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_20= 'msgpoolsize' otherlv_21= '=' ( (lv_msgpoolsize_22_0= RULE_INT ) ) ) ) ) ) )+ {...}?) ) ) otherlv_23= '}' ) )
+            // InternalETPhys.g:588:1: ( ( ( (lv_default_0_0= 'DefaultThread' ) ) | otherlv_1= 'Thread' ) ( (lv_name_2_0= RULE_ID ) ) otherlv_3= '{' ( ( ( ( ({...}? => ( ({...}? => (otherlv_5= 'execmode' otherlv_6= '=' ( (lv_execmode_7_0= ruleExecMode ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'interval' otherlv_9= '=' ( (lv_time_10_0= ruleTIME ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'prio' otherlv_12= '=' ( (lv_prio_13_0= ruleInteger ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_14= 'stacksize' otherlv_15= '=' ( (lv_stacksize_16_0= RULE_INT ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_17= 'msgblocksize' otherlv_18= '=' ( (lv_msgblocksize_19_0= RULE_INT ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_20= 'msgpoolsize' otherlv_21= '=' ( (lv_msgpoolsize_22_0= RULE_INT ) ) ) ) ) ) )+ {...}?) ) ) otherlv_23= '}' )
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:588:1: ( ( ( (lv_default_0_0= 'DefaultThread' ) ) | otherlv_1= 'Thread' ) ( (lv_name_2_0= RULE_ID ) ) otherlv_3= '{' ( ( ( ( ({...}? => ( ({...}? => (otherlv_5= 'execmode' otherlv_6= '=' ( (lv_execmode_7_0= ruleExecMode ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'interval' otherlv_9= '=' ( (lv_time_10_0= ruleTIME ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'prio' otherlv_12= '=' ( (lv_prio_13_0= ruleInteger ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_14= 'stacksize' otherlv_15= '=' ( (lv_stacksize_16_0= RULE_INT ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_17= 'msgblocksize' otherlv_18= '=' ( (lv_msgblocksize_19_0= RULE_INT ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_20= 'msgpoolsize' otherlv_21= '=' ( (lv_msgpoolsize_22_0= RULE_INT ) ) ) ) ) ) )+ {...}?) ) ) otherlv_23= '}' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:588:2: ( ( (lv_default_0_0= 'DefaultThread' ) ) | otherlv_1= 'Thread' ) ( (lv_name_2_0= RULE_ID ) ) otherlv_3= '{' ( ( ( ( ({...}? => ( ({...}? => (otherlv_5= 'execmode' otherlv_6= '=' ( (lv_execmode_7_0= ruleExecMode ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'interval' otherlv_9= '=' ( (lv_time_10_0= ruleTIME ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'prio' otherlv_12= '=' ( (lv_prio_13_0= ruleInteger ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_14= 'stacksize' otherlv_15= '=' ( (lv_stacksize_16_0= RULE_INT ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_17= 'msgblocksize' otherlv_18= '=' ( (lv_msgblocksize_19_0= RULE_INT ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_20= 'msgpoolsize' otherlv_21= '=' ( (lv_msgpoolsize_22_0= RULE_INT ) ) ) ) ) ) )+ {...}?) ) ) otherlv_23= '}'
+            // InternalETPhys.g:588:1: ( ( ( (lv_default_0_0= 'DefaultThread' ) ) | otherlv_1= 'Thread' ) ( (lv_name_2_0= RULE_ID ) ) otherlv_3= '{' ( ( ( ( ({...}? => ( ({...}? => (otherlv_5= 'execmode' otherlv_6= '=' ( (lv_execmode_7_0= ruleExecMode ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'interval' otherlv_9= '=' ( (lv_time_10_0= ruleTIME ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'prio' otherlv_12= '=' ( (lv_prio_13_0= ruleInteger ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_14= 'stacksize' otherlv_15= '=' ( (lv_stacksize_16_0= RULE_INT ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_17= 'msgblocksize' otherlv_18= '=' ( (lv_msgblocksize_19_0= RULE_INT ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_20= 'msgpoolsize' otherlv_21= '=' ( (lv_msgpoolsize_22_0= RULE_INT ) ) ) ) ) ) )+ {...}?) ) ) otherlv_23= '}' )
+            // InternalETPhys.g:588:2: ( ( (lv_default_0_0= 'DefaultThread' ) ) | otherlv_1= 'Thread' ) ( (lv_name_2_0= RULE_ID ) ) otherlv_3= '{' ( ( ( ( ({...}? => ( ({...}? => (otherlv_5= 'execmode' otherlv_6= '=' ( (lv_execmode_7_0= ruleExecMode ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'interval' otherlv_9= '=' ( (lv_time_10_0= ruleTIME ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'prio' otherlv_12= '=' ( (lv_prio_13_0= ruleInteger ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_14= 'stacksize' otherlv_15= '=' ( (lv_stacksize_16_0= RULE_INT ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_17= 'msgblocksize' otherlv_18= '=' ( (lv_msgblocksize_19_0= RULE_INT ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_20= 'msgpoolsize' otherlv_21= '=' ( (lv_msgpoolsize_22_0= RULE_INT ) ) ) ) ) ) )+ {...}?) ) ) otherlv_23= '}'
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:588:2: ( ( (lv_default_0_0= 'DefaultThread' ) ) | otherlv_1= 'Thread' )
+            // InternalETPhys.g:588:2: ( ( (lv_default_0_0= 'DefaultThread' ) ) | otherlv_1= 'Thread' )
             int alt9=2;
             int LA9_0 = input.LA(1);
 
@@ -1556,7 +1429,6 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                 alt9=2;
             }
             else {
-                if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
                     new NoViableAltException("", 9, 0, input);
 
@@ -1564,28 +1436,24 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
             }
             switch (alt9) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:588:3: ( (lv_default_0_0= 'DefaultThread' ) )
+                    // InternalETPhys.g:588:3: ( (lv_default_0_0= 'DefaultThread' ) )
                     {
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:588:3: ( (lv_default_0_0= 'DefaultThread' ) )
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:589:1: (lv_default_0_0= 'DefaultThread' )
+                    // InternalETPhys.g:588:3: ( (lv_default_0_0= 'DefaultThread' ) )
+                    // InternalETPhys.g:589:1: (lv_default_0_0= 'DefaultThread' )
                     {
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:589:1: (lv_default_0_0= 'DefaultThread' )
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:590:3: lv_default_0_0= 'DefaultThread'
+                    // InternalETPhys.g:589:1: (lv_default_0_0= 'DefaultThread' )
+                    // InternalETPhys.g:590:3: lv_default_0_0= 'DefaultThread'
                     {
-                    lv_default_0_0=(Token)match(input,23,FOLLOW_23_in_rulePhysicalThread1207); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    lv_default_0_0=(Token)match(input,23,FOLLOW_3); 
 
-                              newLeafNode(lv_default_0_0, grammarAccess.getPhysicalThreadAccess().getDefaultDefaultThreadKeyword_0_0_0());
-                          
-                    }
-                    if ( state.backtracking==0 ) {
+                            newLeafNode(lv_default_0_0, grammarAccess.getPhysicalThreadAccess().getDefaultDefaultThreadKeyword_0_0_0());
+                        
 
-                      	        if (current==null) {
-                      	            current = createModelElement(grammarAccess.getPhysicalThreadRule());
-                      	        }
-                             		setWithLastConsumed(current, "default", true, "DefaultThread");
-                      	    
-                    }
+                    	        if (current==null) {
+                    	            current = createModelElement(grammarAccess.getPhysicalThreadRule());
+                    	        }
+                           		setWithLastConsumed(current, "default", true, "DefaultThread");
+                    	    
 
                     }
 
@@ -1596,159 +1464,145 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:604:7: otherlv_1= 'Thread'
+                    // InternalETPhys.g:604:7: otherlv_1= 'Thread'
                     {
-                    otherlv_1=(Token)match(input,24,FOLLOW_24_in_rulePhysicalThread1238); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    otherlv_1=(Token)match(input,24,FOLLOW_3); 
 
-                          	newLeafNode(otherlv_1, grammarAccess.getPhysicalThreadAccess().getThreadKeyword_0_1());
-                          
-                    }
+                        	newLeafNode(otherlv_1, grammarAccess.getPhysicalThreadAccess().getThreadKeyword_0_1());
+                        
 
                     }
                     break;
 
             }
 
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:608:2: ( (lv_name_2_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:609:1: (lv_name_2_0= RULE_ID )
+            // InternalETPhys.g:608:2: ( (lv_name_2_0= RULE_ID ) )
+            // InternalETPhys.g:609:1: (lv_name_2_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:609:1: (lv_name_2_0= RULE_ID )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:610:3: lv_name_2_0= RULE_ID
+            // InternalETPhys.g:609:1: (lv_name_2_0= RULE_ID )
+            // InternalETPhys.g:610:3: lv_name_2_0= RULE_ID
             {
-            lv_name_2_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_rulePhysicalThread1256); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            lv_name_2_0=(Token)match(input,RULE_ID,FOLLOW_4); 
 
-              			newLeafNode(lv_name_2_0, grammarAccess.getPhysicalThreadAccess().getNameIDTerminalRuleCall_1_0()); 
-              		
-            }
-            if ( state.backtracking==0 ) {
+            			newLeafNode(lv_name_2_0, grammarAccess.getPhysicalThreadAccess().getNameIDTerminalRuleCall_1_0()); 
+            		
 
-              	        if (current==null) {
-              	            current = createModelElement(grammarAccess.getPhysicalThreadRule());
-              	        }
-                     		setWithLastConsumed(
-                     			current, 
-                     			"name",
-                      		lv_name_2_0, 
-                      		"ID");
-              	    
-            }
+            	        if (current==null) {
+            	            current = createModelElement(grammarAccess.getPhysicalThreadRule());
+            	        }
+                   		setWithLastConsumed(
+                   			current, 
+                   			"name",
+                    		lv_name_2_0, 
+                    		"org.eclipse.xtext.common.Terminals.ID");
+            	    
 
             }
 
 
             }
 
-            otherlv_3=(Token)match(input,13,FOLLOW_13_in_rulePhysicalThread1273); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_3=(Token)match(input,13,FOLLOW_16); 
 
-                  	newLeafNode(otherlv_3, grammarAccess.getPhysicalThreadAccess().getLeftCurlyBracketKeyword_2());
-                  
-            }
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:630:1: ( ( ( ( ({...}? => ( ({...}? => (otherlv_5= 'execmode' otherlv_6= '=' ( (lv_execmode_7_0= ruleExecMode ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'interval' otherlv_9= '=' ( (lv_time_10_0= ruleTIME ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'prio' otherlv_12= '=' ( (lv_prio_13_0= ruleInteger ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_14= 'stacksize' otherlv_15= '=' ( (lv_stacksize_16_0= RULE_INT ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_17= 'msgblocksize' otherlv_18= '=' ( (lv_msgblocksize_19_0= RULE_INT ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_20= 'msgpoolsize' otherlv_21= '=' ( (lv_msgpoolsize_22_0= RULE_INT ) ) ) ) ) ) )+ {...}?) ) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:632:1: ( ( ( ({...}? => ( ({...}? => (otherlv_5= 'execmode' otherlv_6= '=' ( (lv_execmode_7_0= ruleExecMode ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'interval' otherlv_9= '=' ( (lv_time_10_0= ruleTIME ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'prio' otherlv_12= '=' ( (lv_prio_13_0= ruleInteger ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_14= 'stacksize' otherlv_15= '=' ( (lv_stacksize_16_0= RULE_INT ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_17= 'msgblocksize' otherlv_18= '=' ( (lv_msgblocksize_19_0= RULE_INT ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_20= 'msgpoolsize' otherlv_21= '=' ( (lv_msgpoolsize_22_0= RULE_INT ) ) ) ) ) ) )+ {...}?) )
+                	newLeafNode(otherlv_3, grammarAccess.getPhysicalThreadAccess().getLeftCurlyBracketKeyword_2());
+                
+            // InternalETPhys.g:630:1: ( ( ( ( ({...}? => ( ({...}? => (otherlv_5= 'execmode' otherlv_6= '=' ( (lv_execmode_7_0= ruleExecMode ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'interval' otherlv_9= '=' ( (lv_time_10_0= ruleTIME ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'prio' otherlv_12= '=' ( (lv_prio_13_0= ruleInteger ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_14= 'stacksize' otherlv_15= '=' ( (lv_stacksize_16_0= RULE_INT ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_17= 'msgblocksize' otherlv_18= '=' ( (lv_msgblocksize_19_0= RULE_INT ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_20= 'msgpoolsize' otherlv_21= '=' ( (lv_msgpoolsize_22_0= RULE_INT ) ) ) ) ) ) )+ {...}?) ) )
+            // InternalETPhys.g:632:1: ( ( ( ({...}? => ( ({...}? => (otherlv_5= 'execmode' otherlv_6= '=' ( (lv_execmode_7_0= ruleExecMode ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'interval' otherlv_9= '=' ( (lv_time_10_0= ruleTIME ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'prio' otherlv_12= '=' ( (lv_prio_13_0= ruleInteger ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_14= 'stacksize' otherlv_15= '=' ( (lv_stacksize_16_0= RULE_INT ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_17= 'msgblocksize' otherlv_18= '=' ( (lv_msgblocksize_19_0= RULE_INT ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_20= 'msgpoolsize' otherlv_21= '=' ( (lv_msgpoolsize_22_0= RULE_INT ) ) ) ) ) ) )+ {...}?) )
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:632:1: ( ( ( ({...}? => ( ({...}? => (otherlv_5= 'execmode' otherlv_6= '=' ( (lv_execmode_7_0= ruleExecMode ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'interval' otherlv_9= '=' ( (lv_time_10_0= ruleTIME ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'prio' otherlv_12= '=' ( (lv_prio_13_0= ruleInteger ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_14= 'stacksize' otherlv_15= '=' ( (lv_stacksize_16_0= RULE_INT ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_17= 'msgblocksize' otherlv_18= '=' ( (lv_msgblocksize_19_0= RULE_INT ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_20= 'msgpoolsize' otherlv_21= '=' ( (lv_msgpoolsize_22_0= RULE_INT ) ) ) ) ) ) )+ {...}?) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:633:2: ( ( ({...}? => ( ({...}? => (otherlv_5= 'execmode' otherlv_6= '=' ( (lv_execmode_7_0= ruleExecMode ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'interval' otherlv_9= '=' ( (lv_time_10_0= ruleTIME ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'prio' otherlv_12= '=' ( (lv_prio_13_0= ruleInteger ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_14= 'stacksize' otherlv_15= '=' ( (lv_stacksize_16_0= RULE_INT ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_17= 'msgblocksize' otherlv_18= '=' ( (lv_msgblocksize_19_0= RULE_INT ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_20= 'msgpoolsize' otherlv_21= '=' ( (lv_msgpoolsize_22_0= RULE_INT ) ) ) ) ) ) )+ {...}?)
+            // InternalETPhys.g:632:1: ( ( ( ({...}? => ( ({...}? => (otherlv_5= 'execmode' otherlv_6= '=' ( (lv_execmode_7_0= ruleExecMode ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'interval' otherlv_9= '=' ( (lv_time_10_0= ruleTIME ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'prio' otherlv_12= '=' ( (lv_prio_13_0= ruleInteger ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_14= 'stacksize' otherlv_15= '=' ( (lv_stacksize_16_0= RULE_INT ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_17= 'msgblocksize' otherlv_18= '=' ( (lv_msgblocksize_19_0= RULE_INT ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_20= 'msgpoolsize' otherlv_21= '=' ( (lv_msgpoolsize_22_0= RULE_INT ) ) ) ) ) ) )+ {...}?) )
+            // InternalETPhys.g:633:2: ( ( ({...}? => ( ({...}? => (otherlv_5= 'execmode' otherlv_6= '=' ( (lv_execmode_7_0= ruleExecMode ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'interval' otherlv_9= '=' ( (lv_time_10_0= ruleTIME ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'prio' otherlv_12= '=' ( (lv_prio_13_0= ruleInteger ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_14= 'stacksize' otherlv_15= '=' ( (lv_stacksize_16_0= RULE_INT ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_17= 'msgblocksize' otherlv_18= '=' ( (lv_msgblocksize_19_0= RULE_INT ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_20= 'msgpoolsize' otherlv_21= '=' ( (lv_msgpoolsize_22_0= RULE_INT ) ) ) ) ) ) )+ {...}?)
             {
-            getUnorderedGroupHelper().enter(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3());
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:636:2: ( ( ({...}? => ( ({...}? => (otherlv_5= 'execmode' otherlv_6= '=' ( (lv_execmode_7_0= ruleExecMode ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'interval' otherlv_9= '=' ( (lv_time_10_0= ruleTIME ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'prio' otherlv_12= '=' ( (lv_prio_13_0= ruleInteger ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_14= 'stacksize' otherlv_15= '=' ( (lv_stacksize_16_0= RULE_INT ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_17= 'msgblocksize' otherlv_18= '=' ( (lv_msgblocksize_19_0= RULE_INT ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_20= 'msgpoolsize' otherlv_21= '=' ( (lv_msgpoolsize_22_0= RULE_INT ) ) ) ) ) ) )+ {...}?)
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:637:3: ( ({...}? => ( ({...}? => (otherlv_5= 'execmode' otherlv_6= '=' ( (lv_execmode_7_0= ruleExecMode ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'interval' otherlv_9= '=' ( (lv_time_10_0= ruleTIME ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'prio' otherlv_12= '=' ( (lv_prio_13_0= ruleInteger ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_14= 'stacksize' otherlv_15= '=' ( (lv_stacksize_16_0= RULE_INT ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_17= 'msgblocksize' otherlv_18= '=' ( (lv_msgblocksize_19_0= RULE_INT ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_20= 'msgpoolsize' otherlv_21= '=' ( (lv_msgpoolsize_22_0= RULE_INT ) ) ) ) ) ) )+ {...}?
+             
+            	  getUnorderedGroupHelper().enter(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3());
+            	
+            // InternalETPhys.g:636:2: ( ( ({...}? => ( ({...}? => (otherlv_5= 'execmode' otherlv_6= '=' ( (lv_execmode_7_0= ruleExecMode ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'interval' otherlv_9= '=' ( (lv_time_10_0= ruleTIME ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'prio' otherlv_12= '=' ( (lv_prio_13_0= ruleInteger ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_14= 'stacksize' otherlv_15= '=' ( (lv_stacksize_16_0= RULE_INT ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_17= 'msgblocksize' otherlv_18= '=' ( (lv_msgblocksize_19_0= RULE_INT ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_20= 'msgpoolsize' otherlv_21= '=' ( (lv_msgpoolsize_22_0= RULE_INT ) ) ) ) ) ) )+ {...}?)
+            // InternalETPhys.g:637:3: ( ({...}? => ( ({...}? => (otherlv_5= 'execmode' otherlv_6= '=' ( (lv_execmode_7_0= ruleExecMode ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'interval' otherlv_9= '=' ( (lv_time_10_0= ruleTIME ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'prio' otherlv_12= '=' ( (lv_prio_13_0= ruleInteger ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_14= 'stacksize' otherlv_15= '=' ( (lv_stacksize_16_0= RULE_INT ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_17= 'msgblocksize' otherlv_18= '=' ( (lv_msgblocksize_19_0= RULE_INT ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_20= 'msgpoolsize' otherlv_21= '=' ( (lv_msgpoolsize_22_0= RULE_INT ) ) ) ) ) ) )+ {...}?
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:637:3: ( ({...}? => ( ({...}? => (otherlv_5= 'execmode' otherlv_6= '=' ( (lv_execmode_7_0= ruleExecMode ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'interval' otherlv_9= '=' ( (lv_time_10_0= ruleTIME ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'prio' otherlv_12= '=' ( (lv_prio_13_0= ruleInteger ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_14= 'stacksize' otherlv_15= '=' ( (lv_stacksize_16_0= RULE_INT ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_17= 'msgblocksize' otherlv_18= '=' ( (lv_msgblocksize_19_0= RULE_INT ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_20= 'msgpoolsize' otherlv_21= '=' ( (lv_msgpoolsize_22_0= RULE_INT ) ) ) ) ) ) )+
+            // InternalETPhys.g:637:3: ( ({...}? => ( ({...}? => (otherlv_5= 'execmode' otherlv_6= '=' ( (lv_execmode_7_0= ruleExecMode ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'interval' otherlv_9= '=' ( (lv_time_10_0= ruleTIME ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'prio' otherlv_12= '=' ( (lv_prio_13_0= ruleInteger ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_14= 'stacksize' otherlv_15= '=' ( (lv_stacksize_16_0= RULE_INT ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_17= 'msgblocksize' otherlv_18= '=' ( (lv_msgblocksize_19_0= RULE_INT ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_20= 'msgpoolsize' otherlv_21= '=' ( (lv_msgpoolsize_22_0= RULE_INT ) ) ) ) ) ) )+
             int cnt10=0;
             loop10:
             do {
                 int alt10=7;
                 int LA10_0 = input.LA(1);
 
-                if ( LA10_0 ==25 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 0) ) {
+                if ( LA10_0 == 25 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 0) ) {
                     alt10=1;
                 }
-                else if ( LA10_0 ==26 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 1) ) {
+                else if ( LA10_0 == 26 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 1) ) {
                     alt10=2;
                 }
-                else if ( LA10_0 ==27 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 2) ) {
+                else if ( LA10_0 == 27 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 2) ) {
                     alt10=3;
                 }
-                else if ( LA10_0 ==28 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 3) ) {
+                else if ( LA10_0 == 28 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 3) ) {
                     alt10=4;
                 }
-                else if ( LA10_0 ==29 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 4) ) {
+                else if ( LA10_0 == 29 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 4) ) {
                     alt10=5;
                 }
-                else if ( LA10_0 ==30 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 5) ) {
+                else if ( LA10_0 == 30 && getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 5) ) {
                     alt10=6;
                 }
 
 
                 switch (alt10) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:639:4: ({...}? => ( ({...}? => (otherlv_5= 'execmode' otherlv_6= '=' ( (lv_execmode_7_0= ruleExecMode ) ) ) ) ) )
+            	    // InternalETPhys.g:639:4: ({...}? => ( ({...}? => (otherlv_5= 'execmode' otherlv_6= '=' ( (lv_execmode_7_0= ruleExecMode ) ) ) ) ) )
             	    {
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:639:4: ({...}? => ( ({...}? => (otherlv_5= 'execmode' otherlv_6= '=' ( (lv_execmode_7_0= ruleExecMode ) ) ) ) ) )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:640:5: {...}? => ( ({...}? => (otherlv_5= 'execmode' otherlv_6= '=' ( (lv_execmode_7_0= ruleExecMode ) ) ) ) )
+            	    // InternalETPhys.g:639:4: ({...}? => ( ({...}? => (otherlv_5= 'execmode' otherlv_6= '=' ( (lv_execmode_7_0= ruleExecMode ) ) ) ) ) )
+            	    // InternalETPhys.g:640:5: {...}? => ( ({...}? => (otherlv_5= 'execmode' otherlv_6= '=' ( (lv_execmode_7_0= ruleExecMode ) ) ) ) )
             	    {
             	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 0) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "rulePhysicalThread", "getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 0)");
             	    }
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:640:111: ( ({...}? => (otherlv_5= 'execmode' otherlv_6= '=' ( (lv_execmode_7_0= ruleExecMode ) ) ) ) )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:641:6: ({...}? => (otherlv_5= 'execmode' otherlv_6= '=' ( (lv_execmode_7_0= ruleExecMode ) ) ) )
+            	    // InternalETPhys.g:640:111: ( ({...}? => (otherlv_5= 'execmode' otherlv_6= '=' ( (lv_execmode_7_0= ruleExecMode ) ) ) ) )
+            	    // InternalETPhys.g:641:6: ({...}? => (otherlv_5= 'execmode' otherlv_6= '=' ( (lv_execmode_7_0= ruleExecMode ) ) ) )
             	    {
-            	    getUnorderedGroupHelper().select(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 0);
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:644:6: ({...}? => (otherlv_5= 'execmode' otherlv_6= '=' ( (lv_execmode_7_0= ruleExecMode ) ) ) )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:644:7: {...}? => (otherlv_5= 'execmode' otherlv_6= '=' ( (lv_execmode_7_0= ruleExecMode ) ) )
+            	     
+            	    	 				  getUnorderedGroupHelper().select(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 0);
+            	    	 				
+            	    // InternalETPhys.g:644:6: ({...}? => (otherlv_5= 'execmode' otherlv_6= '=' ( (lv_execmode_7_0= ruleExecMode ) ) ) )
+            	    // InternalETPhys.g:644:7: {...}? => (otherlv_5= 'execmode' otherlv_6= '=' ( (lv_execmode_7_0= ruleExecMode ) ) )
             	    {
             	    if ( !((true)) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "rulePhysicalThread", "true");
             	    }
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:644:16: (otherlv_5= 'execmode' otherlv_6= '=' ( (lv_execmode_7_0= ruleExecMode ) ) )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:644:18: otherlv_5= 'execmode' otherlv_6= '=' ( (lv_execmode_7_0= ruleExecMode ) )
+            	    // InternalETPhys.g:644:16: (otherlv_5= 'execmode' otherlv_6= '=' ( (lv_execmode_7_0= ruleExecMode ) ) )
+            	    // InternalETPhys.g:644:18: otherlv_5= 'execmode' otherlv_6= '=' ( (lv_execmode_7_0= ruleExecMode ) )
             	    {
-            	    otherlv_5=(Token)match(input,25,FOLLOW_25_in_rulePhysicalThread1331); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
+            	    otherlv_5=(Token)match(input,25,FOLLOW_12); 
 
-            	          	newLeafNode(otherlv_5, grammarAccess.getPhysicalThreadAccess().getExecmodeKeyword_3_0_0());
-            	          
-            	    }
-            	    otherlv_6=(Token)match(input,20,FOLLOW_20_in_rulePhysicalThread1343); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
+            	        	newLeafNode(otherlv_5, grammarAccess.getPhysicalThreadAccess().getExecmodeKeyword_3_0_0());
+            	        
+            	    otherlv_6=(Token)match(input,20,FOLLOW_17); 
 
-            	          	newLeafNode(otherlv_6, grammarAccess.getPhysicalThreadAccess().getEqualsSignKeyword_3_0_1());
-            	          
-            	    }
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:652:1: ( (lv_execmode_7_0= ruleExecMode ) )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:653:1: (lv_execmode_7_0= ruleExecMode )
+            	        	newLeafNode(otherlv_6, grammarAccess.getPhysicalThreadAccess().getEqualsSignKeyword_3_0_1());
+            	        
+            	    // InternalETPhys.g:652:1: ( (lv_execmode_7_0= ruleExecMode ) )
+            	    // InternalETPhys.g:653:1: (lv_execmode_7_0= ruleExecMode )
             	    {
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:653:1: (lv_execmode_7_0= ruleExecMode )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:654:3: lv_execmode_7_0= ruleExecMode
+            	    // InternalETPhys.g:653:1: (lv_execmode_7_0= ruleExecMode )
+            	    // InternalETPhys.g:654:3: lv_execmode_7_0= ruleExecMode
             	    {
-            	    if ( state.backtracking==0 ) {
-            	       
-            	      	        newCompositeNode(grammarAccess.getPhysicalThreadAccess().getExecmodeExecModeEnumRuleCall_3_0_2_0()); 
-            	      	    
-            	    }
-            	    pushFollow(FOLLOW_ruleExecMode_in_rulePhysicalThread1364);
+            	     
+            	    	        newCompositeNode(grammarAccess.getPhysicalThreadAccess().getExecmodeExecModeEnumRuleCall_3_0_2_0()); 
+            	    	    
+            	    pushFollow(FOLLOW_18);
             	    lv_execmode_7_0=ruleExecMode();
 
             	    state._fsp--;
-            	    if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
-
-            	      	        if (current==null) {
-            	      	            current = createModelElementForParent(grammarAccess.getPhysicalThreadRule());
-            	      	        }
-            	             		set(
-            	             			current, 
-            	             			"execmode",
-            	              		lv_execmode_7_0, 
-            	              		"ExecMode");
-            	      	        afterParserOrEnumRuleCall();
-            	      	    
-            	    }
+
+
+            	    	        if (current==null) {
+            	    	            current = createModelElementForParent(grammarAccess.getPhysicalThreadRule());
+            	    	        }
+            	           		set(
+            	           			current, 
+            	           			"execmode",
+            	            		lv_execmode_7_0, 
+            	            		"org.eclipse.etrice.core.etphys.ETPhys.ExecMode");
+            	    	        afterParserOrEnumRuleCall();
+            	    	    
 
             	    }
 
@@ -1761,7 +1615,9 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    getUnorderedGroupHelper().returnFromSelection(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3());
+            	     
+            	    	 				  getUnorderedGroupHelper().returnFromSelection(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3());
+            	    	 				
 
             	    }
 
@@ -1772,70 +1628,62 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 2 :
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:677:4: ({...}? => ( ({...}? => (otherlv_8= 'interval' otherlv_9= '=' ( (lv_time_10_0= ruleTIME ) ) ) ) ) )
+            	    // InternalETPhys.g:677:4: ({...}? => ( ({...}? => (otherlv_8= 'interval' otherlv_9= '=' ( (lv_time_10_0= ruleTIME ) ) ) ) ) )
             	    {
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:677:4: ({...}? => ( ({...}? => (otherlv_8= 'interval' otherlv_9= '=' ( (lv_time_10_0= ruleTIME ) ) ) ) ) )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:678:5: {...}? => ( ({...}? => (otherlv_8= 'interval' otherlv_9= '=' ( (lv_time_10_0= ruleTIME ) ) ) ) )
+            	    // InternalETPhys.g:677:4: ({...}? => ( ({...}? => (otherlv_8= 'interval' otherlv_9= '=' ( (lv_time_10_0= ruleTIME ) ) ) ) ) )
+            	    // InternalETPhys.g:678:5: {...}? => ( ({...}? => (otherlv_8= 'interval' otherlv_9= '=' ( (lv_time_10_0= ruleTIME ) ) ) ) )
             	    {
             	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 1) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "rulePhysicalThread", "getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 1)");
             	    }
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:678:111: ( ({...}? => (otherlv_8= 'interval' otherlv_9= '=' ( (lv_time_10_0= ruleTIME ) ) ) ) )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:679:6: ({...}? => (otherlv_8= 'interval' otherlv_9= '=' ( (lv_time_10_0= ruleTIME ) ) ) )
+            	    // InternalETPhys.g:678:111: ( ({...}? => (otherlv_8= 'interval' otherlv_9= '=' ( (lv_time_10_0= ruleTIME ) ) ) ) )
+            	    // InternalETPhys.g:679:6: ({...}? => (otherlv_8= 'interval' otherlv_9= '=' ( (lv_time_10_0= ruleTIME ) ) ) )
             	    {
-            	    getUnorderedGroupHelper().select(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 1);
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:682:6: ({...}? => (otherlv_8= 'interval' otherlv_9= '=' ( (lv_time_10_0= ruleTIME ) ) ) )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:682:7: {...}? => (otherlv_8= 'interval' otherlv_9= '=' ( (lv_time_10_0= ruleTIME ) ) )
+            	     
+            	    	 				  getUnorderedGroupHelper().select(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 1);
+            	    	 				
+            	    // InternalETPhys.g:682:6: ({...}? => (otherlv_8= 'interval' otherlv_9= '=' ( (lv_time_10_0= ruleTIME ) ) ) )
+            	    // InternalETPhys.g:682:7: {...}? => (otherlv_8= 'interval' otherlv_9= '=' ( (lv_time_10_0= ruleTIME ) ) )
             	    {
             	    if ( !((true)) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "rulePhysicalThread", "true");
             	    }
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:682:16: (otherlv_8= 'interval' otherlv_9= '=' ( (lv_time_10_0= ruleTIME ) ) )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:682:18: otherlv_8= 'interval' otherlv_9= '=' ( (lv_time_10_0= ruleTIME ) )
+            	    // InternalETPhys.g:682:16: (otherlv_8= 'interval' otherlv_9= '=' ( (lv_time_10_0= ruleTIME ) ) )
+            	    // InternalETPhys.g:682:18: otherlv_8= 'interval' otherlv_9= '=' ( (lv_time_10_0= ruleTIME ) )
             	    {
-            	    otherlv_8=(Token)match(input,26,FOLLOW_26_in_rulePhysicalThread1432); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
+            	    otherlv_8=(Token)match(input,26,FOLLOW_12); 
 
-            	          	newLeafNode(otherlv_8, grammarAccess.getPhysicalThreadAccess().getIntervalKeyword_3_1_0());
-            	          
-            	    }
-            	    otherlv_9=(Token)match(input,20,FOLLOW_20_in_rulePhysicalThread1444); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
+            	        	newLeafNode(otherlv_8, grammarAccess.getPhysicalThreadAccess().getIntervalKeyword_3_1_0());
+            	        
+            	    otherlv_9=(Token)match(input,20,FOLLOW_19); 
 
-            	          	newLeafNode(otherlv_9, grammarAccess.getPhysicalThreadAccess().getEqualsSignKeyword_3_1_1());
-            	          
-            	    }
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:690:1: ( (lv_time_10_0= ruleTIME ) )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:691:1: (lv_time_10_0= ruleTIME )
+            	        	newLeafNode(otherlv_9, grammarAccess.getPhysicalThreadAccess().getEqualsSignKeyword_3_1_1());
+            	        
+            	    // InternalETPhys.g:690:1: ( (lv_time_10_0= ruleTIME ) )
+            	    // InternalETPhys.g:691:1: (lv_time_10_0= ruleTIME )
             	    {
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:691:1: (lv_time_10_0= ruleTIME )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:692:3: lv_time_10_0= ruleTIME
+            	    // InternalETPhys.g:691:1: (lv_time_10_0= ruleTIME )
+            	    // InternalETPhys.g:692:3: lv_time_10_0= ruleTIME
             	    {
-            	    if ( state.backtracking==0 ) {
-            	       
-            	      	        newCompositeNode(grammarAccess.getPhysicalThreadAccess().getTimeTIMEParserRuleCall_3_1_2_0()); 
-            	      	    
-            	    }
-            	    pushFollow(FOLLOW_ruleTIME_in_rulePhysicalThread1465);
+            	     
+            	    	        newCompositeNode(grammarAccess.getPhysicalThreadAccess().getTimeTIMEParserRuleCall_3_1_2_0()); 
+            	    	    
+            	    pushFollow(FOLLOW_18);
             	    lv_time_10_0=ruleTIME();
 
             	    state._fsp--;
-            	    if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
-
-            	      	        if (current==null) {
-            	      	            current = createModelElementForParent(grammarAccess.getPhysicalThreadRule());
-            	      	        }
-            	             		set(
-            	             			current, 
-            	             			"time",
-            	              		lv_time_10_0, 
-            	              		"TIME");
-            	      	        afterParserOrEnumRuleCall();
-            	      	    
-            	    }
+
+
+            	    	        if (current==null) {
+            	    	            current = createModelElementForParent(grammarAccess.getPhysicalThreadRule());
+            	    	        }
+            	           		set(
+            	           			current, 
+            	           			"time",
+            	            		lv_time_10_0, 
+            	            		"org.eclipse.etrice.core.common.Base.TIME");
+            	    	        afterParserOrEnumRuleCall();
+            	    	    
 
             	    }
 
@@ -1848,7 +1696,9 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    getUnorderedGroupHelper().returnFromSelection(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3());
+            	     
+            	    	 				  getUnorderedGroupHelper().returnFromSelection(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3());
+            	    	 				
 
             	    }
 
@@ -1859,70 +1709,62 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 3 :
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:715:4: ({...}? => ( ({...}? => (otherlv_11= 'prio' otherlv_12= '=' ( (lv_prio_13_0= ruleInteger ) ) ) ) ) )
+            	    // InternalETPhys.g:715:4: ({...}? => ( ({...}? => (otherlv_11= 'prio' otherlv_12= '=' ( (lv_prio_13_0= ruleInteger ) ) ) ) ) )
             	    {
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:715:4: ({...}? => ( ({...}? => (otherlv_11= 'prio' otherlv_12= '=' ( (lv_prio_13_0= ruleInteger ) ) ) ) ) )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:716:5: {...}? => ( ({...}? => (otherlv_11= 'prio' otherlv_12= '=' ( (lv_prio_13_0= ruleInteger ) ) ) ) )
+            	    // InternalETPhys.g:715:4: ({...}? => ( ({...}? => (otherlv_11= 'prio' otherlv_12= '=' ( (lv_prio_13_0= ruleInteger ) ) ) ) ) )
+            	    // InternalETPhys.g:716:5: {...}? => ( ({...}? => (otherlv_11= 'prio' otherlv_12= '=' ( (lv_prio_13_0= ruleInteger ) ) ) ) )
             	    {
             	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 2) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "rulePhysicalThread", "getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 2)");
             	    }
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:716:111: ( ({...}? => (otherlv_11= 'prio' otherlv_12= '=' ( (lv_prio_13_0= ruleInteger ) ) ) ) )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:717:6: ({...}? => (otherlv_11= 'prio' otherlv_12= '=' ( (lv_prio_13_0= ruleInteger ) ) ) )
+            	    // InternalETPhys.g:716:111: ( ({...}? => (otherlv_11= 'prio' otherlv_12= '=' ( (lv_prio_13_0= ruleInteger ) ) ) ) )
+            	    // InternalETPhys.g:717:6: ({...}? => (otherlv_11= 'prio' otherlv_12= '=' ( (lv_prio_13_0= ruleInteger ) ) ) )
             	    {
-            	    getUnorderedGroupHelper().select(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 2);
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:720:6: ({...}? => (otherlv_11= 'prio' otherlv_12= '=' ( (lv_prio_13_0= ruleInteger ) ) ) )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:720:7: {...}? => (otherlv_11= 'prio' otherlv_12= '=' ( (lv_prio_13_0= ruleInteger ) ) )
+            	     
+            	    	 				  getUnorderedGroupHelper().select(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 2);
+            	    	 				
+            	    // InternalETPhys.g:720:6: ({...}? => (otherlv_11= 'prio' otherlv_12= '=' ( (lv_prio_13_0= ruleInteger ) ) ) )
+            	    // InternalETPhys.g:720:7: {...}? => (otherlv_11= 'prio' otherlv_12= '=' ( (lv_prio_13_0= ruleInteger ) ) )
             	    {
             	    if ( !((true)) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "rulePhysicalThread", "true");
             	    }
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:720:16: (otherlv_11= 'prio' otherlv_12= '=' ( (lv_prio_13_0= ruleInteger ) ) )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:720:18: otherlv_11= 'prio' otherlv_12= '=' ( (lv_prio_13_0= ruleInteger ) )
+            	    // InternalETPhys.g:720:16: (otherlv_11= 'prio' otherlv_12= '=' ( (lv_prio_13_0= ruleInteger ) ) )
+            	    // InternalETPhys.g:720:18: otherlv_11= 'prio' otherlv_12= '=' ( (lv_prio_13_0= ruleInteger ) )
             	    {
-            	    otherlv_11=(Token)match(input,27,FOLLOW_27_in_rulePhysicalThread1533); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
+            	    otherlv_11=(Token)match(input,27,FOLLOW_12); 
 
-            	          	newLeafNode(otherlv_11, grammarAccess.getPhysicalThreadAccess().getPrioKeyword_3_2_0());
-            	          
-            	    }
-            	    otherlv_12=(Token)match(input,20,FOLLOW_20_in_rulePhysicalThread1545); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
+            	        	newLeafNode(otherlv_11, grammarAccess.getPhysicalThreadAccess().getPrioKeyword_3_2_0());
+            	        
+            	    otherlv_12=(Token)match(input,20,FOLLOW_14); 
 
-            	          	newLeafNode(otherlv_12, grammarAccess.getPhysicalThreadAccess().getEqualsSignKeyword_3_2_1());
-            	          
-            	    }
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:728:1: ( (lv_prio_13_0= ruleInteger ) )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:729:1: (lv_prio_13_0= ruleInteger )
+            	        	newLeafNode(otherlv_12, grammarAccess.getPhysicalThreadAccess().getEqualsSignKeyword_3_2_1());
+            	        
+            	    // InternalETPhys.g:728:1: ( (lv_prio_13_0= ruleInteger ) )
+            	    // InternalETPhys.g:729:1: (lv_prio_13_0= ruleInteger )
             	    {
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:729:1: (lv_prio_13_0= ruleInteger )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:730:3: lv_prio_13_0= ruleInteger
+            	    // InternalETPhys.g:729:1: (lv_prio_13_0= ruleInteger )
+            	    // InternalETPhys.g:730:3: lv_prio_13_0= ruleInteger
             	    {
-            	    if ( state.backtracking==0 ) {
-            	       
-            	      	        newCompositeNode(grammarAccess.getPhysicalThreadAccess().getPrioIntegerParserRuleCall_3_2_2_0()); 
-            	      	    
-            	    }
-            	    pushFollow(FOLLOW_ruleInteger_in_rulePhysicalThread1566);
+            	     
+            	    	        newCompositeNode(grammarAccess.getPhysicalThreadAccess().getPrioIntegerParserRuleCall_3_2_2_0()); 
+            	    	    
+            	    pushFollow(FOLLOW_18);
             	    lv_prio_13_0=ruleInteger();
 
             	    state._fsp--;
-            	    if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
-
-            	      	        if (current==null) {
-            	      	            current = createModelElementForParent(grammarAccess.getPhysicalThreadRule());
-            	      	        }
-            	             		set(
-            	             			current, 
-            	             			"prio",
-            	              		lv_prio_13_0, 
-            	              		"Integer");
-            	      	        afterParserOrEnumRuleCall();
-            	      	    
-            	    }
+
+
+            	    	        if (current==null) {
+            	    	            current = createModelElementForParent(grammarAccess.getPhysicalThreadRule());
+            	    	        }
+            	           		set(
+            	           			current, 
+            	           			"prio",
+            	            		lv_prio_13_0, 
+            	            		"org.eclipse.etrice.core.common.Base.Integer");
+            	    	        afterParserOrEnumRuleCall();
+            	    	    
 
             	    }
 
@@ -1935,7 +1777,9 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    getUnorderedGroupHelper().returnFromSelection(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3());
+            	     
+            	    	 				  getUnorderedGroupHelper().returnFromSelection(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3());
+            	    	 				
 
             	    }
 
@@ -1946,65 +1790,57 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 4 :
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:753:4: ({...}? => ( ({...}? => (otherlv_14= 'stacksize' otherlv_15= '=' ( (lv_stacksize_16_0= RULE_INT ) ) ) ) ) )
+            	    // InternalETPhys.g:753:4: ({...}? => ( ({...}? => (otherlv_14= 'stacksize' otherlv_15= '=' ( (lv_stacksize_16_0= RULE_INT ) ) ) ) ) )
             	    {
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:753:4: ({...}? => ( ({...}? => (otherlv_14= 'stacksize' otherlv_15= '=' ( (lv_stacksize_16_0= RULE_INT ) ) ) ) ) )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:754:5: {...}? => ( ({...}? => (otherlv_14= 'stacksize' otherlv_15= '=' ( (lv_stacksize_16_0= RULE_INT ) ) ) ) )
+            	    // InternalETPhys.g:753:4: ({...}? => ( ({...}? => (otherlv_14= 'stacksize' otherlv_15= '=' ( (lv_stacksize_16_0= RULE_INT ) ) ) ) ) )
+            	    // InternalETPhys.g:754:5: {...}? => ( ({...}? => (otherlv_14= 'stacksize' otherlv_15= '=' ( (lv_stacksize_16_0= RULE_INT ) ) ) ) )
             	    {
             	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 3) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "rulePhysicalThread", "getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 3)");
             	    }
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:754:111: ( ({...}? => (otherlv_14= 'stacksize' otherlv_15= '=' ( (lv_stacksize_16_0= RULE_INT ) ) ) ) )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:755:6: ({...}? => (otherlv_14= 'stacksize' otherlv_15= '=' ( (lv_stacksize_16_0= RULE_INT ) ) ) )
+            	    // InternalETPhys.g:754:111: ( ({...}? => (otherlv_14= 'stacksize' otherlv_15= '=' ( (lv_stacksize_16_0= RULE_INT ) ) ) ) )
+            	    // InternalETPhys.g:755:6: ({...}? => (otherlv_14= 'stacksize' otherlv_15= '=' ( (lv_stacksize_16_0= RULE_INT ) ) ) )
             	    {
-            	    getUnorderedGroupHelper().select(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 3);
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:758:6: ({...}? => (otherlv_14= 'stacksize' otherlv_15= '=' ( (lv_stacksize_16_0= RULE_INT ) ) ) )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:758:7: {...}? => (otherlv_14= 'stacksize' otherlv_15= '=' ( (lv_stacksize_16_0= RULE_INT ) ) )
+            	     
+            	    	 				  getUnorderedGroupHelper().select(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 3);
+            	    	 				
+            	    // InternalETPhys.g:758:6: ({...}? => (otherlv_14= 'stacksize' otherlv_15= '=' ( (lv_stacksize_16_0= RULE_INT ) ) ) )
+            	    // InternalETPhys.g:758:7: {...}? => (otherlv_14= 'stacksize' otherlv_15= '=' ( (lv_stacksize_16_0= RULE_INT ) ) )
             	    {
             	    if ( !((true)) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "rulePhysicalThread", "true");
             	    }
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:758:16: (otherlv_14= 'stacksize' otherlv_15= '=' ( (lv_stacksize_16_0= RULE_INT ) ) )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:758:18: otherlv_14= 'stacksize' otherlv_15= '=' ( (lv_stacksize_16_0= RULE_INT ) )
+            	    // InternalETPhys.g:758:16: (otherlv_14= 'stacksize' otherlv_15= '=' ( (lv_stacksize_16_0= RULE_INT ) ) )
+            	    // InternalETPhys.g:758:18: otherlv_14= 'stacksize' otherlv_15= '=' ( (lv_stacksize_16_0= RULE_INT ) )
             	    {
-            	    otherlv_14=(Token)match(input,28,FOLLOW_28_in_rulePhysicalThread1634); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
+            	    otherlv_14=(Token)match(input,28,FOLLOW_12); 
 
-            	          	newLeafNode(otherlv_14, grammarAccess.getPhysicalThreadAccess().getStacksizeKeyword_3_3_0());
-            	          
-            	    }
-            	    otherlv_15=(Token)match(input,20,FOLLOW_20_in_rulePhysicalThread1646); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
+            	        	newLeafNode(otherlv_14, grammarAccess.getPhysicalThreadAccess().getStacksizeKeyword_3_3_0());
+            	        
+            	    otherlv_15=(Token)match(input,20,FOLLOW_19); 
 
-            	          	newLeafNode(otherlv_15, grammarAccess.getPhysicalThreadAccess().getEqualsSignKeyword_3_3_1());
-            	          
-            	    }
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:766:1: ( (lv_stacksize_16_0= RULE_INT ) )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:767:1: (lv_stacksize_16_0= RULE_INT )
+            	        	newLeafNode(otherlv_15, grammarAccess.getPhysicalThreadAccess().getEqualsSignKeyword_3_3_1());
+            	        
+            	    // InternalETPhys.g:766:1: ( (lv_stacksize_16_0= RULE_INT ) )
+            	    // InternalETPhys.g:767:1: (lv_stacksize_16_0= RULE_INT )
             	    {
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:767:1: (lv_stacksize_16_0= RULE_INT )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:768:3: lv_stacksize_16_0= RULE_INT
+            	    // InternalETPhys.g:767:1: (lv_stacksize_16_0= RULE_INT )
+            	    // InternalETPhys.g:768:3: lv_stacksize_16_0= RULE_INT
             	    {
-            	    lv_stacksize_16_0=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_rulePhysicalThread1663); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
+            	    lv_stacksize_16_0=(Token)match(input,RULE_INT,FOLLOW_18); 
 
-            	      			newLeafNode(lv_stacksize_16_0, grammarAccess.getPhysicalThreadAccess().getStacksizeINTTerminalRuleCall_3_3_2_0()); 
-            	      		
-            	    }
-            	    if ( state.backtracking==0 ) {
-
-            	      	        if (current==null) {
-            	      	            current = createModelElement(grammarAccess.getPhysicalThreadRule());
-            	      	        }
-            	             		setWithLastConsumed(
-            	             			current, 
-            	             			"stacksize",
-            	              		lv_stacksize_16_0, 
-            	              		"INT");
-            	      	    
-            	    }
+            	    			newLeafNode(lv_stacksize_16_0, grammarAccess.getPhysicalThreadAccess().getStacksizeINTTerminalRuleCall_3_3_2_0()); 
+            	    		
+
+            	    	        if (current==null) {
+            	    	            current = createModelElement(grammarAccess.getPhysicalThreadRule());
+            	    	        }
+            	           		setWithLastConsumed(
+            	           			current, 
+            	           			"stacksize",
+            	            		lv_stacksize_16_0, 
+            	            		"org.eclipse.xtext.common.Terminals.INT");
+            	    	    
 
             	    }
 
@@ -2017,7 +1853,9 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    getUnorderedGroupHelper().returnFromSelection(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3());
+            	     
+            	    	 				  getUnorderedGroupHelper().returnFromSelection(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3());
+            	    	 				
 
             	    }
 
@@ -2028,65 +1866,57 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 5 :
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:791:4: ({...}? => ( ({...}? => (otherlv_17= 'msgblocksize' otherlv_18= '=' ( (lv_msgblocksize_19_0= RULE_INT ) ) ) ) ) )
+            	    // InternalETPhys.g:791:4: ({...}? => ( ({...}? => (otherlv_17= 'msgblocksize' otherlv_18= '=' ( (lv_msgblocksize_19_0= RULE_INT ) ) ) ) ) )
             	    {
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:791:4: ({...}? => ( ({...}? => (otherlv_17= 'msgblocksize' otherlv_18= '=' ( (lv_msgblocksize_19_0= RULE_INT ) ) ) ) ) )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:792:5: {...}? => ( ({...}? => (otherlv_17= 'msgblocksize' otherlv_18= '=' ( (lv_msgblocksize_19_0= RULE_INT ) ) ) ) )
+            	    // InternalETPhys.g:791:4: ({...}? => ( ({...}? => (otherlv_17= 'msgblocksize' otherlv_18= '=' ( (lv_msgblocksize_19_0= RULE_INT ) ) ) ) ) )
+            	    // InternalETPhys.g:792:5: {...}? => ( ({...}? => (otherlv_17= 'msgblocksize' otherlv_18= '=' ( (lv_msgblocksize_19_0= RULE_INT ) ) ) ) )
             	    {
             	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 4) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "rulePhysicalThread", "getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 4)");
             	    }
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:792:111: ( ({...}? => (otherlv_17= 'msgblocksize' otherlv_18= '=' ( (lv_msgblocksize_19_0= RULE_INT ) ) ) ) )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:793:6: ({...}? => (otherlv_17= 'msgblocksize' otherlv_18= '=' ( (lv_msgblocksize_19_0= RULE_INT ) ) ) )
+            	    // InternalETPhys.g:792:111: ( ({...}? => (otherlv_17= 'msgblocksize' otherlv_18= '=' ( (lv_msgblocksize_19_0= RULE_INT ) ) ) ) )
+            	    // InternalETPhys.g:793:6: ({...}? => (otherlv_17= 'msgblocksize' otherlv_18= '=' ( (lv_msgblocksize_19_0= RULE_INT ) ) ) )
             	    {
-            	    getUnorderedGroupHelper().select(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 4);
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:796:6: ({...}? => (otherlv_17= 'msgblocksize' otherlv_18= '=' ( (lv_msgblocksize_19_0= RULE_INT ) ) ) )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:796:7: {...}? => (otherlv_17= 'msgblocksize' otherlv_18= '=' ( (lv_msgblocksize_19_0= RULE_INT ) ) )
+            	     
+            	    	 				  getUnorderedGroupHelper().select(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 4);
+            	    	 				
+            	    // InternalETPhys.g:796:6: ({...}? => (otherlv_17= 'msgblocksize' otherlv_18= '=' ( (lv_msgblocksize_19_0= RULE_INT ) ) ) )
+            	    // InternalETPhys.g:796:7: {...}? => (otherlv_17= 'msgblocksize' otherlv_18= '=' ( (lv_msgblocksize_19_0= RULE_INT ) ) )
             	    {
             	    if ( !((true)) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "rulePhysicalThread", "true");
             	    }
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:796:16: (otherlv_17= 'msgblocksize' otherlv_18= '=' ( (lv_msgblocksize_19_0= RULE_INT ) ) )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:796:18: otherlv_17= 'msgblocksize' otherlv_18= '=' ( (lv_msgblocksize_19_0= RULE_INT ) )
+            	    // InternalETPhys.g:796:16: (otherlv_17= 'msgblocksize' otherlv_18= '=' ( (lv_msgblocksize_19_0= RULE_INT ) ) )
+            	    // InternalETPhys.g:796:18: otherlv_17= 'msgblocksize' otherlv_18= '=' ( (lv_msgblocksize_19_0= RULE_INT ) )
             	    {
-            	    otherlv_17=(Token)match(input,29,FOLLOW_29_in_rulePhysicalThread1736); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
+            	    otherlv_17=(Token)match(input,29,FOLLOW_12); 
 
-            	          	newLeafNode(otherlv_17, grammarAccess.getPhysicalThreadAccess().getMsgblocksizeKeyword_3_4_0());
-            	          
-            	    }
-            	    otherlv_18=(Token)match(input,20,FOLLOW_20_in_rulePhysicalThread1748); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
+            	        	newLeafNode(otherlv_17, grammarAccess.getPhysicalThreadAccess().getMsgblocksizeKeyword_3_4_0());
+            	        
+            	    otherlv_18=(Token)match(input,20,FOLLOW_19); 
 
-            	          	newLeafNode(otherlv_18, grammarAccess.getPhysicalThreadAccess().getEqualsSignKeyword_3_4_1());
-            	          
-            	    }
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:804:1: ( (lv_msgblocksize_19_0= RULE_INT ) )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:805:1: (lv_msgblocksize_19_0= RULE_INT )
+            	        	newLeafNode(otherlv_18, grammarAccess.getPhysicalThreadAccess().getEqualsSignKeyword_3_4_1());
+            	        
+            	    // InternalETPhys.g:804:1: ( (lv_msgblocksize_19_0= RULE_INT ) )
+            	    // InternalETPhys.g:805:1: (lv_msgblocksize_19_0= RULE_INT )
             	    {
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:805:1: (lv_msgblocksize_19_0= RULE_INT )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:806:3: lv_msgblocksize_19_0= RULE_INT
+            	    // InternalETPhys.g:805:1: (lv_msgblocksize_19_0= RULE_INT )
+            	    // InternalETPhys.g:806:3: lv_msgblocksize_19_0= RULE_INT
             	    {
-            	    lv_msgblocksize_19_0=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_rulePhysicalThread1765); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
+            	    lv_msgblocksize_19_0=(Token)match(input,RULE_INT,FOLLOW_18); 
 
-            	      			newLeafNode(lv_msgblocksize_19_0, grammarAccess.getPhysicalThreadAccess().getMsgblocksizeINTTerminalRuleCall_3_4_2_0()); 
-            	      		
-            	    }
-            	    if ( state.backtracking==0 ) {
-
-            	      	        if (current==null) {
-            	      	            current = createModelElement(grammarAccess.getPhysicalThreadRule());
-            	      	        }
-            	             		setWithLastConsumed(
-            	             			current, 
-            	             			"msgblocksize",
-            	              		lv_msgblocksize_19_0, 
-            	              		"INT");
-            	      	    
-            	    }
+            	    			newLeafNode(lv_msgblocksize_19_0, grammarAccess.getPhysicalThreadAccess().getMsgblocksizeINTTerminalRuleCall_3_4_2_0()); 
+            	    		
+
+            	    	        if (current==null) {
+            	    	            current = createModelElement(grammarAccess.getPhysicalThreadRule());
+            	    	        }
+            	           		setWithLastConsumed(
+            	           			current, 
+            	           			"msgblocksize",
+            	            		lv_msgblocksize_19_0, 
+            	            		"org.eclipse.xtext.common.Terminals.INT");
+            	    	    
 
             	    }
 
@@ -2099,7 +1929,9 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    getUnorderedGroupHelper().returnFromSelection(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3());
+            	     
+            	    	 				  getUnorderedGroupHelper().returnFromSelection(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3());
+            	    	 				
 
             	    }
 
@@ -2110,65 +1942,57 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 6 :
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:829:4: ({...}? => ( ({...}? => (otherlv_20= 'msgpoolsize' otherlv_21= '=' ( (lv_msgpoolsize_22_0= RULE_INT ) ) ) ) ) )
+            	    // InternalETPhys.g:829:4: ({...}? => ( ({...}? => (otherlv_20= 'msgpoolsize' otherlv_21= '=' ( (lv_msgpoolsize_22_0= RULE_INT ) ) ) ) ) )
             	    {
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:829:4: ({...}? => ( ({...}? => (otherlv_20= 'msgpoolsize' otherlv_21= '=' ( (lv_msgpoolsize_22_0= RULE_INT ) ) ) ) ) )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:830:5: {...}? => ( ({...}? => (otherlv_20= 'msgpoolsize' otherlv_21= '=' ( (lv_msgpoolsize_22_0= RULE_INT ) ) ) ) )
+            	    // InternalETPhys.g:829:4: ({...}? => ( ({...}? => (otherlv_20= 'msgpoolsize' otherlv_21= '=' ( (lv_msgpoolsize_22_0= RULE_INT ) ) ) ) ) )
+            	    // InternalETPhys.g:830:5: {...}? => ( ({...}? => (otherlv_20= 'msgpoolsize' otherlv_21= '=' ( (lv_msgpoolsize_22_0= RULE_INT ) ) ) ) )
             	    {
             	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 5) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "rulePhysicalThread", "getUnorderedGroupHelper().canSelect(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 5)");
             	    }
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:830:111: ( ({...}? => (otherlv_20= 'msgpoolsize' otherlv_21= '=' ( (lv_msgpoolsize_22_0= RULE_INT ) ) ) ) )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:831:6: ({...}? => (otherlv_20= 'msgpoolsize' otherlv_21= '=' ( (lv_msgpoolsize_22_0= RULE_INT ) ) ) )
+            	    // InternalETPhys.g:830:111: ( ({...}? => (otherlv_20= 'msgpoolsize' otherlv_21= '=' ( (lv_msgpoolsize_22_0= RULE_INT ) ) ) ) )
+            	    // InternalETPhys.g:831:6: ({...}? => (otherlv_20= 'msgpoolsize' otherlv_21= '=' ( (lv_msgpoolsize_22_0= RULE_INT ) ) ) )
             	    {
-            	    getUnorderedGroupHelper().select(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 5);
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:834:6: ({...}? => (otherlv_20= 'msgpoolsize' otherlv_21= '=' ( (lv_msgpoolsize_22_0= RULE_INT ) ) ) )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:834:7: {...}? => (otherlv_20= 'msgpoolsize' otherlv_21= '=' ( (lv_msgpoolsize_22_0= RULE_INT ) ) )
+            	     
+            	    	 				  getUnorderedGroupHelper().select(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3(), 5);
+            	    	 				
+            	    // InternalETPhys.g:834:6: ({...}? => (otherlv_20= 'msgpoolsize' otherlv_21= '=' ( (lv_msgpoolsize_22_0= RULE_INT ) ) ) )
+            	    // InternalETPhys.g:834:7: {...}? => (otherlv_20= 'msgpoolsize' otherlv_21= '=' ( (lv_msgpoolsize_22_0= RULE_INT ) ) )
             	    {
             	    if ( !((true)) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "rulePhysicalThread", "true");
             	    }
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:834:16: (otherlv_20= 'msgpoolsize' otherlv_21= '=' ( (lv_msgpoolsize_22_0= RULE_INT ) ) )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:834:18: otherlv_20= 'msgpoolsize' otherlv_21= '=' ( (lv_msgpoolsize_22_0= RULE_INT ) )
+            	    // InternalETPhys.g:834:16: (otherlv_20= 'msgpoolsize' otherlv_21= '=' ( (lv_msgpoolsize_22_0= RULE_INT ) ) )
+            	    // InternalETPhys.g:834:18: otherlv_20= 'msgpoolsize' otherlv_21= '=' ( (lv_msgpoolsize_22_0= RULE_INT ) )
             	    {
-            	    otherlv_20=(Token)match(input,30,FOLLOW_30_in_rulePhysicalThread1838); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
+            	    otherlv_20=(Token)match(input,30,FOLLOW_12); 
 
-            	          	newLeafNode(otherlv_20, grammarAccess.getPhysicalThreadAccess().getMsgpoolsizeKeyword_3_5_0());
-            	          
-            	    }
-            	    otherlv_21=(Token)match(input,20,FOLLOW_20_in_rulePhysicalThread1850); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
+            	        	newLeafNode(otherlv_20, grammarAccess.getPhysicalThreadAccess().getMsgpoolsizeKeyword_3_5_0());
+            	        
+            	    otherlv_21=(Token)match(input,20,FOLLOW_19); 
 
-            	          	newLeafNode(otherlv_21, grammarAccess.getPhysicalThreadAccess().getEqualsSignKeyword_3_5_1());
-            	          
-            	    }
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:842:1: ( (lv_msgpoolsize_22_0= RULE_INT ) )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:843:1: (lv_msgpoolsize_22_0= RULE_INT )
+            	        	newLeafNode(otherlv_21, grammarAccess.getPhysicalThreadAccess().getEqualsSignKeyword_3_5_1());
+            	        
+            	    // InternalETPhys.g:842:1: ( (lv_msgpoolsize_22_0= RULE_INT ) )
+            	    // InternalETPhys.g:843:1: (lv_msgpoolsize_22_0= RULE_INT )
             	    {
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:843:1: (lv_msgpoolsize_22_0= RULE_INT )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:844:3: lv_msgpoolsize_22_0= RULE_INT
+            	    // InternalETPhys.g:843:1: (lv_msgpoolsize_22_0= RULE_INT )
+            	    // InternalETPhys.g:844:3: lv_msgpoolsize_22_0= RULE_INT
             	    {
-            	    lv_msgpoolsize_22_0=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_rulePhysicalThread1867); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
+            	    lv_msgpoolsize_22_0=(Token)match(input,RULE_INT,FOLLOW_18); 
 
-            	      			newLeafNode(lv_msgpoolsize_22_0, grammarAccess.getPhysicalThreadAccess().getMsgpoolsizeINTTerminalRuleCall_3_5_2_0()); 
-            	      		
-            	    }
-            	    if ( state.backtracking==0 ) {
-
-            	      	        if (current==null) {
-            	      	            current = createModelElement(grammarAccess.getPhysicalThreadRule());
-            	      	        }
-            	             		setWithLastConsumed(
-            	             			current, 
-            	             			"msgpoolsize",
-            	              		lv_msgpoolsize_22_0, 
-            	              		"INT");
-            	      	    
-            	    }
+            	    			newLeafNode(lv_msgpoolsize_22_0, grammarAccess.getPhysicalThreadAccess().getMsgpoolsizeINTTerminalRuleCall_3_5_2_0()); 
+            	    		
+
+            	    	        if (current==null) {
+            	    	            current = createModelElement(grammarAccess.getPhysicalThreadRule());
+            	    	        }
+            	           		setWithLastConsumed(
+            	           			current, 
+            	           			"msgpoolsize",
+            	            		lv_msgpoolsize_22_0, 
+            	            		"org.eclipse.xtext.common.Terminals.INT");
+            	    	    
 
             	    }
 
@@ -2181,7 +2005,9 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    getUnorderedGroupHelper().returnFromSelection(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3());
+            	     
+            	    	 				  getUnorderedGroupHelper().returnFromSelection(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3());
+            	    	 				
 
             	    }
 
@@ -2194,7 +2020,6 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
             	default :
             	    if ( cnt10 >= 1 ) break loop10;
-            	    if (state.backtracking>0) {state.failed=true; return current;}
                         EarlyExitException eee =
                             new EarlyExitException(10, input);
                         throw eee;
@@ -2203,7 +2028,6 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
             } while (true);
 
             if ( ! getUnorderedGroupHelper().canLeave(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3()) ) {
-                if (state.backtracking>0) {state.failed=true; return current;}
                 throw new FailedPredicateException(input, "rulePhysicalThread", "getUnorderedGroupHelper().canLeave(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3())");
             }
 
@@ -2212,25 +2036,23 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
             }
 
-            getUnorderedGroupHelper().leave(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3());
+             
+            	  getUnorderedGroupHelper().leave(grammarAccess.getPhysicalThreadAccess().getUnorderedGroup_3());
+            	
 
             }
 
-            otherlv_23=(Token)match(input,14,FOLLOW_14_in_rulePhysicalThread1931); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_23=(Token)match(input,14,FOLLOW_2); 
 
-                  	newLeafNode(otherlv_23, grammarAccess.getPhysicalThreadAccess().getRightCurlyBracketKeyword_4());
-                  
-            }
+                	newLeafNode(otherlv_23, grammarAccess.getPhysicalThreadAccess().getRightCurlyBracketKeyword_4());
+                
 
             }
 
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -2245,7 +2067,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleRuntimeClass"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:887:1: entryRuleRuntimeClass returns [EObject current=null] : iv_ruleRuntimeClass= ruleRuntimeClass EOF ;
+    // InternalETPhys.g:887:1: entryRuleRuntimeClass returns [EObject current=null] : iv_ruleRuntimeClass= ruleRuntimeClass EOF ;
     public final EObject entryRuleRuntimeClass() throws RecognitionException {
         EObject current = null;
 
@@ -2253,21 +2075,17 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:888:2: (iv_ruleRuntimeClass= ruleRuntimeClass EOF )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:889:2: iv_ruleRuntimeClass= ruleRuntimeClass EOF
+            // InternalETPhys.g:888:2: (iv_ruleRuntimeClass= ruleRuntimeClass EOF )
+            // InternalETPhys.g:889:2: iv_ruleRuntimeClass= ruleRuntimeClass EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getRuntimeClassRule()); 
-            }
-            pushFollow(FOLLOW_ruleRuntimeClass_in_entryRuleRuntimeClass1967);
+             newCompositeNode(grammarAccess.getRuntimeClassRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleRuntimeClass=ruleRuntimeClass();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleRuntimeClass; 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRuntimeClass1977); if (state.failed) return current;
+
+             current =iv_ruleRuntimeClass; 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2285,7 +2103,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleRuntimeClass"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:896:1: ruleRuntimeClass returns [EObject current=null] : (otherlv_0= 'RuntimeClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' otherlv_4= 'model' otherlv_5= '=' ( (lv_threadModel_6_0= ruleThreadModel ) ) otherlv_7= '}' ) ;
+    // InternalETPhys.g:896:1: ruleRuntimeClass returns [EObject current=null] : (otherlv_0= 'RuntimeClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' otherlv_4= 'model' otherlv_5= '=' ( (lv_threadModel_6_0= ruleThreadModel ) ) otherlv_7= '}' ) ;
     public final EObject ruleRuntimeClass() throws RecognitionException {
         EObject current = null;
 
@@ -2303,49 +2121,43 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:899:28: ( (otherlv_0= 'RuntimeClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' otherlv_4= 'model' otherlv_5= '=' ( (lv_threadModel_6_0= ruleThreadModel ) ) otherlv_7= '}' ) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:900:1: (otherlv_0= 'RuntimeClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' otherlv_4= 'model' otherlv_5= '=' ( (lv_threadModel_6_0= ruleThreadModel ) ) otherlv_7= '}' )
+            // InternalETPhys.g:899:28: ( (otherlv_0= 'RuntimeClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' otherlv_4= 'model' otherlv_5= '=' ( (lv_threadModel_6_0= ruleThreadModel ) ) otherlv_7= '}' ) )
+            // InternalETPhys.g:900:1: (otherlv_0= 'RuntimeClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' otherlv_4= 'model' otherlv_5= '=' ( (lv_threadModel_6_0= ruleThreadModel ) ) otherlv_7= '}' )
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:900:1: (otherlv_0= 'RuntimeClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' otherlv_4= 'model' otherlv_5= '=' ( (lv_threadModel_6_0= ruleThreadModel ) ) otherlv_7= '}' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:900:3: otherlv_0= 'RuntimeClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' otherlv_4= 'model' otherlv_5= '=' ( (lv_threadModel_6_0= ruleThreadModel ) ) otherlv_7= '}'
+            // InternalETPhys.g:900:1: (otherlv_0= 'RuntimeClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' otherlv_4= 'model' otherlv_5= '=' ( (lv_threadModel_6_0= ruleThreadModel ) ) otherlv_7= '}' )
+            // InternalETPhys.g:900:3: otherlv_0= 'RuntimeClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' otherlv_4= 'model' otherlv_5= '=' ( (lv_threadModel_6_0= ruleThreadModel ) ) otherlv_7= '}'
             {
-            otherlv_0=(Token)match(input,31,FOLLOW_31_in_ruleRuntimeClass2014); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_0=(Token)match(input,31,FOLLOW_3); 
 
-                  	newLeafNode(otherlv_0, grammarAccess.getRuntimeClassAccess().getRuntimeClassKeyword_0());
-                  
-            }
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:904:1: ( (lv_name_1_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:905:1: (lv_name_1_0= RULE_ID )
+                	newLeafNode(otherlv_0, grammarAccess.getRuntimeClassAccess().getRuntimeClassKeyword_0());
+                
+            // InternalETPhys.g:904:1: ( (lv_name_1_0= RULE_ID ) )
+            // InternalETPhys.g:905:1: (lv_name_1_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:905:1: (lv_name_1_0= RULE_ID )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:906:3: lv_name_1_0= RULE_ID
+            // InternalETPhys.g:905:1: (lv_name_1_0= RULE_ID )
+            // InternalETPhys.g:906:3: lv_name_1_0= RULE_ID
             {
-            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleRuntimeClass2031); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_7); 
 
-              			newLeafNode(lv_name_1_0, grammarAccess.getRuntimeClassAccess().getNameIDTerminalRuleCall_1_0()); 
-              		
-            }
-            if ( state.backtracking==0 ) {
+            			newLeafNode(lv_name_1_0, grammarAccess.getRuntimeClassAccess().getNameIDTerminalRuleCall_1_0()); 
+            		
 
-              	        if (current==null) {
-              	            current = createModelElement(grammarAccess.getRuntimeClassRule());
-              	        }
-                     		setWithLastConsumed(
-                     			current, 
-                     			"name",
-                      		lv_name_1_0, 
-                      		"ID");
-              	    
-            }
+            	        if (current==null) {
+            	            current = createModelElement(grammarAccess.getRuntimeClassRule());
+            	        }
+                   		setWithLastConsumed(
+                   			current, 
+                   			"name",
+                    		lv_name_1_0, 
+                    		"org.eclipse.xtext.common.Terminals.ID");
+            	    
 
             }
 
 
             }
 
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:922:2: ( (lv_docu_2_0= ruleDocumentation ) )?
+            // InternalETPhys.g:922:2: ( (lv_docu_2_0= ruleDocumentation ) )?
             int alt11=2;
             int LA11_0 = input.LA(1);
 
@@ -2354,34 +2166,30 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
             }
             switch (alt11) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:923:1: (lv_docu_2_0= ruleDocumentation )
+                    // InternalETPhys.g:923:1: (lv_docu_2_0= ruleDocumentation )
                     {
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:923:1: (lv_docu_2_0= ruleDocumentation )
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:924:3: lv_docu_2_0= ruleDocumentation
+                    // InternalETPhys.g:923:1: (lv_docu_2_0= ruleDocumentation )
+                    // InternalETPhys.g:924:3: lv_docu_2_0= ruleDocumentation
                     {
-                    if ( state.backtracking==0 ) {
-                       
-                      	        newCompositeNode(grammarAccess.getRuntimeClassAccess().getDocuDocumentationParserRuleCall_2_0()); 
-                      	    
-                    }
-                    pushFollow(FOLLOW_ruleDocumentation_in_ruleRuntimeClass2057);
+                     
+                    	        newCompositeNode(grammarAccess.getRuntimeClassAccess().getDocuDocumentationParserRuleCall_2_0()); 
+                    	    
+                    pushFollow(FOLLOW_4);
                     lv_docu_2_0=ruleDocumentation();
 
                     state._fsp--;
-                    if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
-
-                      	        if (current==null) {
-                      	            current = createModelElementForParent(grammarAccess.getRuntimeClassRule());
-                      	        }
-                             		set(
-                             			current, 
-                             			"docu",
-                              		lv_docu_2_0, 
-                              		"Documentation");
-                      	        afterParserOrEnumRuleCall();
-                      	    
-                    }
+
+
+                    	        if (current==null) {
+                    	            current = createModelElementForParent(grammarAccess.getRuntimeClassRule());
+                    	        }
+                           		set(
+                           			current, 
+                           			"docu",
+                            		lv_docu_2_0, 
+                            		"org.eclipse.etrice.core.common.Base.Documentation");
+                    	        afterParserOrEnumRuleCall();
+                    	    
 
                     }
 
@@ -2391,74 +2199,60 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_3=(Token)match(input,13,FOLLOW_13_in_ruleRuntimeClass2070); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_3=(Token)match(input,13,FOLLOW_20); 
 
-                  	newLeafNode(otherlv_3, grammarAccess.getRuntimeClassAccess().getLeftCurlyBracketKeyword_3());
-                  
-            }
-            otherlv_4=(Token)match(input,32,FOLLOW_32_in_ruleRuntimeClass2082); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+                	newLeafNode(otherlv_3, grammarAccess.getRuntimeClassAccess().getLeftCurlyBracketKeyword_3());
+                
+            otherlv_4=(Token)match(input,32,FOLLOW_12); 
 
-                  	newLeafNode(otherlv_4, grammarAccess.getRuntimeClassAccess().getModelKeyword_4());
-                  
-            }
-            otherlv_5=(Token)match(input,20,FOLLOW_20_in_ruleRuntimeClass2094); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+                	newLeafNode(otherlv_4, grammarAccess.getRuntimeClassAccess().getModelKeyword_4());
+                
+            otherlv_5=(Token)match(input,20,FOLLOW_21); 
 
-                  	newLeafNode(otherlv_5, grammarAccess.getRuntimeClassAccess().getEqualsSignKeyword_5());
-                  
-            }
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:952:1: ( (lv_threadModel_6_0= ruleThreadModel ) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:953:1: (lv_threadModel_6_0= ruleThreadModel )
+                	newLeafNode(otherlv_5, grammarAccess.getRuntimeClassAccess().getEqualsSignKeyword_5());
+                
+            // InternalETPhys.g:952:1: ( (lv_threadModel_6_0= ruleThreadModel ) )
+            // InternalETPhys.g:953:1: (lv_threadModel_6_0= ruleThreadModel )
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:953:1: (lv_threadModel_6_0= ruleThreadModel )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:954:3: lv_threadModel_6_0= ruleThreadModel
+            // InternalETPhys.g:953:1: (lv_threadModel_6_0= ruleThreadModel )
+            // InternalETPhys.g:954:3: lv_threadModel_6_0= ruleThreadModel
             {
-            if ( state.backtracking==0 ) {
-               
-              	        newCompositeNode(grammarAccess.getRuntimeClassAccess().getThreadModelThreadModelEnumRuleCall_6_0()); 
-              	    
-            }
-            pushFollow(FOLLOW_ruleThreadModel_in_ruleRuntimeClass2115);
+             
+            	        newCompositeNode(grammarAccess.getRuntimeClassAccess().getThreadModelThreadModelEnumRuleCall_6_0()); 
+            	    
+            pushFollow(FOLLOW_22);
             lv_threadModel_6_0=ruleThreadModel();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
 
-              	        if (current==null) {
-              	            current = createModelElementForParent(grammarAccess.getRuntimeClassRule());
-              	        }
-                     		set(
-                     			current, 
-                     			"threadModel",
-                      		lv_threadModel_6_0, 
-                      		"ThreadModel");
-              	        afterParserOrEnumRuleCall();
-              	    
-            }
+
+            	        if (current==null) {
+            	            current = createModelElementForParent(grammarAccess.getRuntimeClassRule());
+            	        }
+                   		set(
+                   			current, 
+                   			"threadModel",
+                    		lv_threadModel_6_0, 
+                    		"org.eclipse.etrice.core.etphys.ETPhys.ThreadModel");
+            	        afterParserOrEnumRuleCall();
+            	    
 
             }
 
 
             }
 
-            otherlv_7=(Token)match(input,14,FOLLOW_14_in_ruleRuntimeClass2127); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_7=(Token)match(input,14,FOLLOW_2); 
 
-                  	newLeafNode(otherlv_7, grammarAccess.getRuntimeClassAccess().getRightCurlyBracketKeyword_7());
-                  
-            }
+                	newLeafNode(otherlv_7, grammarAccess.getRuntimeClassAccess().getRightCurlyBracketKeyword_7());
+                
 
             }
 
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -2473,7 +2267,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleKeyValue"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:984:1: entryRuleKeyValue returns [EObject current=null] : iv_ruleKeyValue= ruleKeyValue EOF ;
+    // InternalETPhys.g:984:1: entryRuleKeyValue returns [EObject current=null] : iv_ruleKeyValue= ruleKeyValue EOF ;
     public final EObject entryRuleKeyValue() throws RecognitionException {
         EObject current = null;
 
@@ -2481,21 +2275,17 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:985:2: (iv_ruleKeyValue= ruleKeyValue EOF )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:986:2: iv_ruleKeyValue= ruleKeyValue EOF
+            // InternalETPhys.g:985:2: (iv_ruleKeyValue= ruleKeyValue EOF )
+            // InternalETPhys.g:986:2: iv_ruleKeyValue= ruleKeyValue EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getKeyValueRule()); 
-            }
-            pushFollow(FOLLOW_ruleKeyValue_in_entryRuleKeyValue2165);
+             newCompositeNode(grammarAccess.getKeyValueRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleKeyValue=ruleKeyValue();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleKeyValue; 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleKeyValue2175); if (state.failed) return current;
+
+             current =iv_ruleKeyValue; 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2513,7 +2303,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleKeyValue"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:993:1: ruleKeyValue returns [EObject current=null] : ( ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) ) ) ;
+    // InternalETPhys.g:993: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;
 
@@ -2525,77 +2315,67 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:996:28: ( ( ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) ) ) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:997:1: ( ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) ) )
+            // InternalETPhys.g:996:28: ( ( ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) ) ) )
+            // InternalETPhys.g:997:1: ( ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) ) )
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:997:1: ( ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) ) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:997:2: ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) )
+            // InternalETPhys.g:997:1: ( ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) ) )
+            // InternalETPhys.g:997:2: ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) )
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:997:2: ( (lv_key_0_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:998:1: (lv_key_0_0= RULE_ID )
+            // InternalETPhys.g:997:2: ( (lv_key_0_0= RULE_ID ) )
+            // InternalETPhys.g:998:1: (lv_key_0_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:998:1: (lv_key_0_0= RULE_ID )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:999:3: lv_key_0_0= RULE_ID
+            // InternalETPhys.g:998:1: (lv_key_0_0= RULE_ID )
+            // InternalETPhys.g:999:3: lv_key_0_0= RULE_ID
             {
-            lv_key_0_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleKeyValue2217); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            lv_key_0_0=(Token)match(input,RULE_ID,FOLLOW_12); 
 
-              			newLeafNode(lv_key_0_0, grammarAccess.getKeyValueAccess().getKeyIDTerminalRuleCall_0_0()); 
-              		
-            }
-            if ( state.backtracking==0 ) {
+            			newLeafNode(lv_key_0_0, grammarAccess.getKeyValueAccess().getKeyIDTerminalRuleCall_0_0()); 
+            		
 
-              	        if (current==null) {
-              	            current = createModelElement(grammarAccess.getKeyValueRule());
-              	        }
-                     		setWithLastConsumed(
-                     			current, 
-                     			"key",
-                      		lv_key_0_0, 
-                      		"ID");
-              	    
-            }
+            	        if (current==null) {
+            	            current = createModelElement(grammarAccess.getKeyValueRule());
+            	        }
+                   		setWithLastConsumed(
+                   			current, 
+                   			"key",
+                    		lv_key_0_0, 
+                    		"org.eclipse.xtext.common.Terminals.ID");
+            	    
 
             }
 
 
             }
 
-            otherlv_1=(Token)match(input,20,FOLLOW_20_in_ruleKeyValue2234); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_1=(Token)match(input,20,FOLLOW_23); 
 
-                  	newLeafNode(otherlv_1, grammarAccess.getKeyValueAccess().getEqualsSignKeyword_1());
-                  
-            }
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1019:1: ( (lv_value_2_0= ruleLiteral ) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1020:1: (lv_value_2_0= ruleLiteral )
+                	newLeafNode(otherlv_1, grammarAccess.getKeyValueAccess().getEqualsSignKeyword_1());
+                
+            // InternalETPhys.g:1019:1: ( (lv_value_2_0= ruleLiteral ) )
+            // InternalETPhys.g:1020:1: (lv_value_2_0= ruleLiteral )
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1020:1: (lv_value_2_0= ruleLiteral )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1021:3: lv_value_2_0= ruleLiteral
+            // InternalETPhys.g:1020:1: (lv_value_2_0= ruleLiteral )
+            // InternalETPhys.g:1021:3: lv_value_2_0= ruleLiteral
             {
-            if ( state.backtracking==0 ) {
-               
-              	        newCompositeNode(grammarAccess.getKeyValueAccess().getValueLiteralParserRuleCall_2_0()); 
-              	    
-            }
-            pushFollow(FOLLOW_ruleLiteral_in_ruleKeyValue2255);
+             
+            	        newCompositeNode(grammarAccess.getKeyValueAccess().getValueLiteralParserRuleCall_2_0()); 
+            	    
+            pushFollow(FOLLOW_2);
             lv_value_2_0=ruleLiteral();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
 
-              	        if (current==null) {
-              	            current = createModelElementForParent(grammarAccess.getKeyValueRule());
-              	        }
-                     		set(
-                     			current, 
-                     			"value",
-                      		lv_value_2_0, 
-                      		"Literal");
-              	        afterParserOrEnumRuleCall();
-              	    
-            }
+
+            	        if (current==null) {
+            	            current = createModelElementForParent(grammarAccess.getKeyValueRule());
+            	        }
+                   		set(
+                   			current, 
+                   			"value",
+                    		lv_value_2_0, 
+                    		"org.eclipse.etrice.core.common.Base.Literal");
+            	        afterParserOrEnumRuleCall();
+            	    
 
             }
 
@@ -2608,9 +2388,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -2625,7 +2403,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleAnnotationTargetType"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1047:1: entryRuleAnnotationTargetType returns [String current=null] : iv_ruleAnnotationTargetType= ruleAnnotationTargetType EOF ;
+    // InternalETPhys.g:1047:1: entryRuleAnnotationTargetType returns [String current=null] : iv_ruleAnnotationTargetType= ruleAnnotationTargetType EOF ;
     public final String entryRuleAnnotationTargetType() throws RecognitionException {
         String current = null;
 
@@ -2633,21 +2411,17 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1048:2: (iv_ruleAnnotationTargetType= ruleAnnotationTargetType EOF )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1049:2: iv_ruleAnnotationTargetType= ruleAnnotationTargetType EOF
+            // InternalETPhys.g:1048:2: (iv_ruleAnnotationTargetType= ruleAnnotationTargetType EOF )
+            // InternalETPhys.g:1049:2: iv_ruleAnnotationTargetType= ruleAnnotationTargetType EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getAnnotationTargetTypeRule()); 
-            }
-            pushFollow(FOLLOW_ruleAnnotationTargetType_in_entryRuleAnnotationTargetType2294);
+             newCompositeNode(grammarAccess.getAnnotationTargetTypeRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleAnnotationTargetType=ruleAnnotationTargetType();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleAnnotationTargetType.getText(); 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAnnotationTargetType2305); if (state.failed) return current;
+
+             current =iv_ruleAnnotationTargetType.getText(); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2665,7 +2439,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleAnnotationTargetType"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1056:1: ruleAnnotationTargetType returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_ID_0= RULE_ID ;
+    // InternalETPhys.g:1056:1: ruleAnnotationTargetType returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_ID_0= RULE_ID ;
     public final AntlrDatatypeRuleToken ruleAnnotationTargetType() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -2674,26 +2448,20 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1059:28: (this_ID_0= RULE_ID )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1060:5: this_ID_0= RULE_ID
+            // InternalETPhys.g:1059:28: (this_ID_0= RULE_ID )
+            // InternalETPhys.g:1060:5: this_ID_0= RULE_ID
             {
-            this_ID_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleAnnotationTargetType2344); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            this_ID_0=(Token)match(input,RULE_ID,FOLLOW_2); 
 
-              		current.merge(this_ID_0);
-                  
-            }
-            if ( state.backtracking==0 ) {
-               
-                  newLeafNode(this_ID_0, grammarAccess.getAnnotationTargetTypeAccess().getIDTerminalRuleCall()); 
-                  
-            }
+            		current.merge(this_ID_0);
+                
+             
+                newLeafNode(this_ID_0, grammarAccess.getAnnotationTargetTypeAccess().getIDTerminalRuleCall()); 
+                
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -2708,7 +2476,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleAnnotationAttribute"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1075:1: entryRuleAnnotationAttribute returns [EObject current=null] : iv_ruleAnnotationAttribute= ruleAnnotationAttribute EOF ;
+    // InternalETPhys.g:1075:1: entryRuleAnnotationAttribute returns [EObject current=null] : iv_ruleAnnotationAttribute= ruleAnnotationAttribute EOF ;
     public final EObject entryRuleAnnotationAttribute() throws RecognitionException {
         EObject current = null;
 
@@ -2716,21 +2484,17 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1076:2: (iv_ruleAnnotationAttribute= ruleAnnotationAttribute EOF )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1077:2: iv_ruleAnnotationAttribute= ruleAnnotationAttribute EOF
+            // InternalETPhys.g:1076:2: (iv_ruleAnnotationAttribute= ruleAnnotationAttribute EOF )
+            // InternalETPhys.g:1077:2: iv_ruleAnnotationAttribute= ruleAnnotationAttribute EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getAnnotationAttributeRule()); 
-            }
-            pushFollow(FOLLOW_ruleAnnotationAttribute_in_entryRuleAnnotationAttribute2388);
+             newCompositeNode(grammarAccess.getAnnotationAttributeRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleAnnotationAttribute=ruleAnnotationAttribute();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleAnnotationAttribute; 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAnnotationAttribute2398); if (state.failed) return current;
+
+             current =iv_ruleAnnotationAttribute; 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2748,7 +2512,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleAnnotationAttribute"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1084:1: ruleAnnotationAttribute returns [EObject current=null] : (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute ) ;
+    // InternalETPhys.g:1084:1: ruleAnnotationAttribute returns [EObject current=null] : (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute ) ;
     public final EObject ruleAnnotationAttribute() throws RecognitionException {
         EObject current = null;
 
@@ -2760,10 +2524,10 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1087:28: ( (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute ) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1088:1: (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute )
+            // InternalETPhys.g:1087:28: ( (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute ) )
+            // InternalETPhys.g:1088:1: (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute )
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1088:1: (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute )
+            // InternalETPhys.g:1088:1: (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute )
             int alt12=2;
             int LA12_0 = input.LA(1);
 
@@ -2786,7 +2550,6 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                                 alt12=2;
                             }
                             else {
-                                if (state.backtracking>0) {state.failed=true; return current;}
                                 NoViableAltException nvae =
                                     new NoViableAltException("", 12, 5, input);
 
@@ -2794,7 +2557,6 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                             }
                         }
                         else {
-                            if (state.backtracking>0) {state.failed=true; return current;}
                             NoViableAltException nvae =
                                 new NoViableAltException("", 12, 4, input);
 
@@ -2802,7 +2564,6 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                         }
                     }
                     else {
-                        if (state.backtracking>0) {state.failed=true; return current;}
                         NoViableAltException nvae =
                             new NoViableAltException("", 12, 3, input);
 
@@ -2810,7 +2571,6 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                     }
                 }
                 else {
-                    if (state.backtracking>0) {state.failed=true; return current;}
                     NoViableAltException nvae =
                         new NoViableAltException("", 12, 1, input);
 
@@ -2836,7 +2596,6 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                                 alt12=2;
                             }
                             else {
-                                if (state.backtracking>0) {state.failed=true; return current;}
                                 NoViableAltException nvae =
                                     new NoViableAltException("", 12, 5, input);
 
@@ -2844,7 +2603,6 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                             }
                         }
                         else {
-                            if (state.backtracking>0) {state.failed=true; return current;}
                             NoViableAltException nvae =
                                 new NoViableAltException("", 12, 4, input);
 
@@ -2852,7 +2610,6 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                         }
                     }
                     else {
-                        if (state.backtracking>0) {state.failed=true; return current;}
                         NoViableAltException nvae =
                             new NoViableAltException("", 12, 3, input);
 
@@ -2860,7 +2617,6 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                     }
                 }
                 else {
-                    if (state.backtracking>0) {state.failed=true; return current;}
                     NoViableAltException nvae =
                         new NoViableAltException("", 12, 2, input);
 
@@ -2868,7 +2624,6 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                 }
             }
             else {
-                if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
                     new NoViableAltException("", 12, 0, input);
 
@@ -2876,46 +2631,38 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
             }
             switch (alt12) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1089:5: this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute
+                    // InternalETPhys.g:1089:5: this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute
                     {
-                    if ( state.backtracking==0 ) {
-                       
-                              newCompositeNode(grammarAccess.getAnnotationAttributeAccess().getSimpleAnnotationAttributeParserRuleCall_0()); 
-                          
-                    }
-                    pushFollow(FOLLOW_ruleSimpleAnnotationAttribute_in_ruleAnnotationAttribute2445);
+                     
+                            newCompositeNode(grammarAccess.getAnnotationAttributeAccess().getSimpleAnnotationAttributeParserRuleCall_0()); 
+                        
+                    pushFollow(FOLLOW_2);
                     this_SimpleAnnotationAttribute_0=ruleSimpleAnnotationAttribute();
 
                     state._fsp--;
-                    if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
-                       
-                              current = this_SimpleAnnotationAttribute_0; 
-                              afterParserOrEnumRuleCall();
-                          
-                    }
+
+                     
+                            current = this_SimpleAnnotationAttribute_0; 
+                            afterParserOrEnumRuleCall();
+                        
 
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1099:5: this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute
+                    // InternalETPhys.g:1099:5: this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute
                     {
-                    if ( state.backtracking==0 ) {
-                       
-                              newCompositeNode(grammarAccess.getAnnotationAttributeAccess().getEnumAnnotationAttributeParserRuleCall_1()); 
-                          
-                    }
-                    pushFollow(FOLLOW_ruleEnumAnnotationAttribute_in_ruleAnnotationAttribute2472);
+                     
+                            newCompositeNode(grammarAccess.getAnnotationAttributeAccess().getEnumAnnotationAttributeParserRuleCall_1()); 
+                        
+                    pushFollow(FOLLOW_2);
                     this_EnumAnnotationAttribute_1=ruleEnumAnnotationAttribute();
 
                     state._fsp--;
-                    if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
-                       
-                              current = this_EnumAnnotationAttribute_1; 
-                              afterParserOrEnumRuleCall();
-                          
-                    }
+
+                     
+                            current = this_EnumAnnotationAttribute_1; 
+                            afterParserOrEnumRuleCall();
+                        
 
                     }
                     break;
@@ -2925,9 +2672,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -2942,7 +2687,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleSimpleAnnotationAttribute"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1115:1: entryRuleSimpleAnnotationAttribute returns [EObject current=null] : iv_ruleSimpleAnnotationAttribute= ruleSimpleAnnotationAttribute EOF ;
+    // InternalETPhys.g:1115:1: entryRuleSimpleAnnotationAttribute returns [EObject current=null] : iv_ruleSimpleAnnotationAttribute= ruleSimpleAnnotationAttribute EOF ;
     public final EObject entryRuleSimpleAnnotationAttribute() throws RecognitionException {
         EObject current = null;
 
@@ -2950,21 +2695,17 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1116:2: (iv_ruleSimpleAnnotationAttribute= ruleSimpleAnnotationAttribute EOF )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1117:2: iv_ruleSimpleAnnotationAttribute= ruleSimpleAnnotationAttribute EOF
+            // InternalETPhys.g:1116:2: (iv_ruleSimpleAnnotationAttribute= ruleSimpleAnnotationAttribute EOF )
+            // InternalETPhys.g:1117:2: iv_ruleSimpleAnnotationAttribute= ruleSimpleAnnotationAttribute EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getSimpleAnnotationAttributeRule()); 
-            }
-            pushFollow(FOLLOW_ruleSimpleAnnotationAttribute_in_entryRuleSimpleAnnotationAttribute2507);
+             newCompositeNode(grammarAccess.getSimpleAnnotationAttributeRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleSimpleAnnotationAttribute=ruleSimpleAnnotationAttribute();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleSimpleAnnotationAttribute; 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSimpleAnnotationAttribute2517); if (state.failed) return current;
+
+             current =iv_ruleSimpleAnnotationAttribute; 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2982,7 +2723,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleSimpleAnnotationAttribute"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1124: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 ) ) ) ;
+    // InternalETPhys.g:1124: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;
 
@@ -2997,13 +2738,13 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1127: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.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1128: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 ) ) )
+            // InternalETPhys.g:1127: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 ) ) ) )
+            // InternalETPhys.g:1128: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.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1128: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.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1128: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 ) )
+            // InternalETPhys.g:1128: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 ) ) )
+            // InternalETPhys.g:1128: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.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1128:2: ( ( (lv_optional_0_0= 'optional' ) ) | otherlv_1= 'mandatory' )
+            // InternalETPhys.g:1128:2: ( ( (lv_optional_0_0= 'optional' ) ) | otherlv_1= 'mandatory' )
             int alt13=2;
             int LA13_0 = input.LA(1);
 
@@ -3014,7 +2755,6 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                 alt13=2;
             }
             else {
-                if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
                     new NoViableAltException("", 13, 0, input);
 
@@ -3022,28 +2762,24 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
             }
             switch (alt13) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1128:3: ( (lv_optional_0_0= 'optional' ) )
+                    // InternalETPhys.g:1128:3: ( (lv_optional_0_0= 'optional' ) )
                     {
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1128:3: ( (lv_optional_0_0= 'optional' ) )
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1129:1: (lv_optional_0_0= 'optional' )
+                    // InternalETPhys.g:1128:3: ( (lv_optional_0_0= 'optional' ) )
+                    // InternalETPhys.g:1129:1: (lv_optional_0_0= 'optional' )
                     {
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1129:1: (lv_optional_0_0= 'optional' )
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1130:3: lv_optional_0_0= 'optional'
+                    // InternalETPhys.g:1129:1: (lv_optional_0_0= 'optional' )
+                    // InternalETPhys.g:1130:3: lv_optional_0_0= 'optional'
                     {
-                    lv_optional_0_0=(Token)match(input,33,FOLLOW_33_in_ruleSimpleAnnotationAttribute2561); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    lv_optional_0_0=(Token)match(input,33,FOLLOW_24); 
 
-                              newLeafNode(lv_optional_0_0, grammarAccess.getSimpleAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0());
-                          
-                    }
-                    if ( state.backtracking==0 ) {
+                            newLeafNode(lv_optional_0_0, grammarAccess.getSimpleAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0());
+                        
 
-                      	        if (current==null) {
-                      	            current = createModelElement(grammarAccess.getSimpleAnnotationAttributeRule());
-                      	        }
-                             		setWithLastConsumed(current, "optional", true, "optional");
-                      	    
-                    }
+                    	        if (current==null) {
+                    	            current = createModelElement(grammarAccess.getSimpleAnnotationAttributeRule());
+                    	        }
+                           		setWithLastConsumed(current, "optional", true, "optional");
+                    	    
 
                     }
 
@@ -3054,91 +2790,77 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1144:7: otherlv_1= 'mandatory'
+                    // InternalETPhys.g:1144:7: otherlv_1= 'mandatory'
                     {
-                    otherlv_1=(Token)match(input,34,FOLLOW_34_in_ruleSimpleAnnotationAttribute2592); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    otherlv_1=(Token)match(input,34,FOLLOW_24); 
 
-                          	newLeafNode(otherlv_1, grammarAccess.getSimpleAnnotationAttributeAccess().getMandatoryKeyword_0_1());
-                          
-                    }
+                        	newLeafNode(otherlv_1, grammarAccess.getSimpleAnnotationAttributeAccess().getMandatoryKeyword_0_1());
+                        
 
                     }
                     break;
 
             }
 
-            otherlv_2=(Token)match(input,35,FOLLOW_35_in_ruleSimpleAnnotationAttribute2605); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_2=(Token)match(input,35,FOLLOW_3); 
 
-                  	newLeafNode(otherlv_2, grammarAccess.getSimpleAnnotationAttributeAccess().getAttributeKeyword_1());
-                  
-            }
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1152:1: ( (lv_name_3_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1153:1: (lv_name_3_0= RULE_ID )
+                	newLeafNode(otherlv_2, grammarAccess.getSimpleAnnotationAttributeAccess().getAttributeKeyword_1());
+                
+            // InternalETPhys.g:1152:1: ( (lv_name_3_0= RULE_ID ) )
+            // InternalETPhys.g:1153:1: (lv_name_3_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1153:1: (lv_name_3_0= RULE_ID )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1154:3: lv_name_3_0= RULE_ID
+            // InternalETPhys.g:1153:1: (lv_name_3_0= RULE_ID )
+            // InternalETPhys.g:1154:3: lv_name_3_0= RULE_ID
             {
-            lv_name_3_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleSimpleAnnotationAttribute2622); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            lv_name_3_0=(Token)match(input,RULE_ID,FOLLOW_9); 
 
-              			newLeafNode(lv_name_3_0, grammarAccess.getSimpleAnnotationAttributeAccess().getNameIDTerminalRuleCall_2_0()); 
-              		
-            }
-            if ( state.backtracking==0 ) {
+            			newLeafNode(lv_name_3_0, grammarAccess.getSimpleAnnotationAttributeAccess().getNameIDTerminalRuleCall_2_0()); 
+            		
 
-              	        if (current==null) {
-              	            current = createModelElement(grammarAccess.getSimpleAnnotationAttributeRule());
-              	        }
-                     		setWithLastConsumed(
-                     			current, 
-                     			"name",
-                      		lv_name_3_0, 
-                      		"ID");
-              	    
-            }
+            	        if (current==null) {
+            	            current = createModelElement(grammarAccess.getSimpleAnnotationAttributeRule());
+            	        }
+                   		setWithLastConsumed(
+                   			current, 
+                   			"name",
+                    		lv_name_3_0, 
+                    		"org.eclipse.xtext.common.Terminals.ID");
+            	    
 
             }
 
 
             }
 
-            otherlv_4=(Token)match(input,17,FOLLOW_17_in_ruleSimpleAnnotationAttribute2639); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_4=(Token)match(input,17,FOLLOW_25); 
 
-                  	newLeafNode(otherlv_4, grammarAccess.getSimpleAnnotationAttributeAccess().getColonKeyword_3());
-                  
-            }
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1174:1: ( (lv_type_5_0= ruleLiteralType ) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1175:1: (lv_type_5_0= ruleLiteralType )
+                	newLeafNode(otherlv_4, grammarAccess.getSimpleAnnotationAttributeAccess().getColonKeyword_3());
+                
+            // InternalETPhys.g:1174:1: ( (lv_type_5_0= ruleLiteralType ) )
+            // InternalETPhys.g:1175:1: (lv_type_5_0= ruleLiteralType )
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1175:1: (lv_type_5_0= ruleLiteralType )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1176:3: lv_type_5_0= ruleLiteralType
+            // InternalETPhys.g:1175:1: (lv_type_5_0= ruleLiteralType )
+            // InternalETPhys.g:1176:3: lv_type_5_0= ruleLiteralType
             {
-            if ( state.backtracking==0 ) {
-               
-              	        newCompositeNode(grammarAccess.getSimpleAnnotationAttributeAccess().getTypeLiteralTypeEnumRuleCall_4_0()); 
-              	    
-            }
-            pushFollow(FOLLOW_ruleLiteralType_in_ruleSimpleAnnotationAttribute2660);
+             
+            	        newCompositeNode(grammarAccess.getSimpleAnnotationAttributeAccess().getTypeLiteralTypeEnumRuleCall_4_0()); 
+            	    
+            pushFollow(FOLLOW_2);
             lv_type_5_0=ruleLiteralType();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
 
-              	        if (current==null) {
-              	            current = createModelElementForParent(grammarAccess.getSimpleAnnotationAttributeRule());
-              	        }
-                     		set(
-                     			current, 
-                     			"type",
-                      		lv_type_5_0, 
-                      		"LiteralType");
-              	        afterParserOrEnumRuleCall();
-              	    
-            }
+
+            	        if (current==null) {
+            	            current = createModelElementForParent(grammarAccess.getSimpleAnnotationAttributeRule());
+            	        }
+                   		set(
+                   			current, 
+                   			"type",
+                    		lv_type_5_0, 
+                    		"org.eclipse.etrice.core.common.Base.LiteralType");
+            	        afterParserOrEnumRuleCall();
+            	    
 
             }
 
@@ -3151,9 +2873,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -3168,7 +2888,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleEnumAnnotationAttribute"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1200:1: entryRuleEnumAnnotationAttribute returns [EObject current=null] : iv_ruleEnumAnnotationAttribute= ruleEnumAnnotationAttribute EOF ;
+    // InternalETPhys.g:1200:1: entryRuleEnumAnnotationAttribute returns [EObject current=null] : iv_ruleEnumAnnotationAttribute= ruleEnumAnnotationAttribute EOF ;
     public final EObject entryRuleEnumAnnotationAttribute() throws RecognitionException {
         EObject current = null;
 
@@ -3176,21 +2896,17 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1201:2: (iv_ruleEnumAnnotationAttribute= ruleEnumAnnotationAttribute EOF )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1202:2: iv_ruleEnumAnnotationAttribute= ruleEnumAnnotationAttribute EOF
+            // InternalETPhys.g:1201:2: (iv_ruleEnumAnnotationAttribute= ruleEnumAnnotationAttribute EOF )
+            // InternalETPhys.g:1202:2: iv_ruleEnumAnnotationAttribute= ruleEnumAnnotationAttribute EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getEnumAnnotationAttributeRule()); 
-            }
-            pushFollow(FOLLOW_ruleEnumAnnotationAttribute_in_entryRuleEnumAnnotationAttribute2696);
+             newCompositeNode(grammarAccess.getEnumAnnotationAttributeRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleEnumAnnotationAttribute=ruleEnumAnnotationAttribute();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleEnumAnnotationAttribute; 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleEnumAnnotationAttribute2706); if (state.failed) return current;
+
+             current =iv_ruleEnumAnnotationAttribute; 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3208,7 +2924,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleEnumAnnotationAttribute"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1209: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= '}' ) ;
+    // InternalETPhys.g:1209: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;
 
@@ -3226,13 +2942,13 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1212: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.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1213: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= '}' )
+            // InternalETPhys.g:1212: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= '}' ) )
+            // InternalETPhys.g:1213: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.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1213: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.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1213: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= '}'
+            // InternalETPhys.g:1213: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= '}' )
+            // InternalETPhys.g:1213: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.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1213:2: ( ( (lv_optional_0_0= 'optional' ) ) | otherlv_1= 'mandatory' )
+            // InternalETPhys.g:1213:2: ( ( (lv_optional_0_0= 'optional' ) ) | otherlv_1= 'mandatory' )
             int alt14=2;
             int LA14_0 = input.LA(1);
 
@@ -3243,7 +2959,6 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                 alt14=2;
             }
             else {
-                if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
                     new NoViableAltException("", 14, 0, input);
 
@@ -3251,28 +2966,24 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
             }
             switch (alt14) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1213:3: ( (lv_optional_0_0= 'optional' ) )
+                    // InternalETPhys.g:1213:3: ( (lv_optional_0_0= 'optional' ) )
                     {
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1213:3: ( (lv_optional_0_0= 'optional' ) )
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1214:1: (lv_optional_0_0= 'optional' )
+                    // InternalETPhys.g:1213:3: ( (lv_optional_0_0= 'optional' ) )
+                    // InternalETPhys.g:1214:1: (lv_optional_0_0= 'optional' )
                     {
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1214:1: (lv_optional_0_0= 'optional' )
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1215:3: lv_optional_0_0= 'optional'
+                    // InternalETPhys.g:1214:1: (lv_optional_0_0= 'optional' )
+                    // InternalETPhys.g:1215:3: lv_optional_0_0= 'optional'
                     {
-                    lv_optional_0_0=(Token)match(input,33,FOLLOW_33_in_ruleEnumAnnotationAttribute2750); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    lv_optional_0_0=(Token)match(input,33,FOLLOW_24); 
 
-                              newLeafNode(lv_optional_0_0, grammarAccess.getEnumAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0());
-                          
-                    }
-                    if ( state.backtracking==0 ) {
+                            newLeafNode(lv_optional_0_0, grammarAccess.getEnumAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0());
+                        
 
-                      	        if (current==null) {
-                      	            current = createModelElement(grammarAccess.getEnumAnnotationAttributeRule());
-                      	        }
-                             		setWithLastConsumed(current, "optional", true, "optional");
-                      	    
-                    }
+                    	        if (current==null) {
+                    	            current = createModelElement(grammarAccess.getEnumAnnotationAttributeRule());
+                    	        }
+                           		setWithLastConsumed(current, "optional", true, "optional");
+                    	    
 
                     }
 
@@ -3283,99 +2994,83 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1229:7: otherlv_1= 'mandatory'
+                    // InternalETPhys.g:1229:7: otherlv_1= 'mandatory'
                     {
-                    otherlv_1=(Token)match(input,34,FOLLOW_34_in_ruleEnumAnnotationAttribute2781); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    otherlv_1=(Token)match(input,34,FOLLOW_24); 
 
-                          	newLeafNode(otherlv_1, grammarAccess.getEnumAnnotationAttributeAccess().getMandatoryKeyword_0_1());
-                          
-                    }
+                        	newLeafNode(otherlv_1, grammarAccess.getEnumAnnotationAttributeAccess().getMandatoryKeyword_0_1());
+                        
 
                     }
                     break;
 
             }
 
-            otherlv_2=(Token)match(input,35,FOLLOW_35_in_ruleEnumAnnotationAttribute2794); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_2=(Token)match(input,35,FOLLOW_3); 
 
-                  	newLeafNode(otherlv_2, grammarAccess.getEnumAnnotationAttributeAccess().getAttributeKeyword_1());
-                  
-            }
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1237:1: ( (lv_name_3_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1238:1: (lv_name_3_0= RULE_ID )
+                	newLeafNode(otherlv_2, grammarAccess.getEnumAnnotationAttributeAccess().getAttributeKeyword_1());
+                
+            // InternalETPhys.g:1237:1: ( (lv_name_3_0= RULE_ID ) )
+            // InternalETPhys.g:1238:1: (lv_name_3_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1238:1: (lv_name_3_0= RULE_ID )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1239:3: lv_name_3_0= RULE_ID
+            // InternalETPhys.g:1238:1: (lv_name_3_0= RULE_ID )
+            // InternalETPhys.g:1239:3: lv_name_3_0= RULE_ID
             {
-            lv_name_3_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEnumAnnotationAttribute2811); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            lv_name_3_0=(Token)match(input,RULE_ID,FOLLOW_9); 
 
-              			newLeafNode(lv_name_3_0, grammarAccess.getEnumAnnotationAttributeAccess().getNameIDTerminalRuleCall_2_0()); 
-              		
-            }
-            if ( state.backtracking==0 ) {
+            			newLeafNode(lv_name_3_0, grammarAccess.getEnumAnnotationAttributeAccess().getNameIDTerminalRuleCall_2_0()); 
+            		
 
-              	        if (current==null) {
-              	            current = createModelElement(grammarAccess.getEnumAnnotationAttributeRule());
-              	        }
-                     		setWithLastConsumed(
-                     			current, 
-                     			"name",
-                      		lv_name_3_0, 
-                      		"ID");
-              	    
-            }
+            	        if (current==null) {
+            	            current = createModelElement(grammarAccess.getEnumAnnotationAttributeRule());
+            	        }
+                   		setWithLastConsumed(
+                   			current, 
+                   			"name",
+                    		lv_name_3_0, 
+                    		"org.eclipse.xtext.common.Terminals.ID");
+            	    
 
             }
 
 
             }
 
-            otherlv_4=(Token)match(input,17,FOLLOW_17_in_ruleEnumAnnotationAttribute2828); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_4=(Token)match(input,17,FOLLOW_4); 
 
-                  	newLeafNode(otherlv_4, grammarAccess.getEnumAnnotationAttributeAccess().getColonKeyword_3());
-                  
-            }
-            otherlv_5=(Token)match(input,13,FOLLOW_13_in_ruleEnumAnnotationAttribute2840); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+                	newLeafNode(otherlv_4, grammarAccess.getEnumAnnotationAttributeAccess().getColonKeyword_3());
+                
+            otherlv_5=(Token)match(input,13,FOLLOW_26); 
 
-                  	newLeafNode(otherlv_5, grammarAccess.getEnumAnnotationAttributeAccess().getLeftCurlyBracketKeyword_4());
-                  
-            }
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1263:1: ( (lv_values_6_0= RULE_STRING ) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1264:1: (lv_values_6_0= RULE_STRING )
+                	newLeafNode(otherlv_5, grammarAccess.getEnumAnnotationAttributeAccess().getLeftCurlyBracketKeyword_4());
+                
+            // InternalETPhys.g:1263:1: ( (lv_values_6_0= RULE_STRING ) )
+            // InternalETPhys.g:1264:1: (lv_values_6_0= RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1264:1: (lv_values_6_0= RULE_STRING )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1265:3: lv_values_6_0= RULE_STRING
+            // InternalETPhys.g:1264:1: (lv_values_6_0= RULE_STRING )
+            // InternalETPhys.g:1265:3: lv_values_6_0= RULE_STRING
             {
-            lv_values_6_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleEnumAnnotationAttribute2857); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            lv_values_6_0=(Token)match(input,RULE_STRING,FOLLOW_27); 
 
-              			newLeafNode(lv_values_6_0, grammarAccess.getEnumAnnotationAttributeAccess().getValuesSTRINGTerminalRuleCall_5_0()); 
-              		
-            }
-            if ( state.backtracking==0 ) {
+            			newLeafNode(lv_values_6_0, grammarAccess.getEnumAnnotationAttributeAccess().getValuesSTRINGTerminalRuleCall_5_0()); 
+            		
 
-              	        if (current==null) {
-              	            current = createModelElement(grammarAccess.getEnumAnnotationAttributeRule());
-              	        }
-                     		addWithLastConsumed(
-                     			current, 
-                     			"values",
-                      		lv_values_6_0, 
-                      		"STRING");
-              	    
-            }
+            	        if (current==null) {
+            	            current = createModelElement(grammarAccess.getEnumAnnotationAttributeRule());
+            	        }
+                   		addWithLastConsumed(
+                   			current, 
+                   			"values",
+                    		lv_values_6_0, 
+                    		"org.eclipse.xtext.common.Terminals.STRING");
+            	    
 
             }
 
 
             }
 
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1281:2: (otherlv_7= ',' ( (lv_values_8_0= RULE_STRING ) ) )*
+            // InternalETPhys.g:1281:2: (otherlv_7= ',' ( (lv_values_8_0= RULE_STRING ) ) )*
             loop15:
             do {
                 int alt15=2;
@@ -3388,38 +3083,32 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
                 switch (alt15) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1281:4: otherlv_7= ',' ( (lv_values_8_0= RULE_STRING ) )
+            	    // InternalETPhys.g:1281:4: otherlv_7= ',' ( (lv_values_8_0= RULE_STRING ) )
             	    {
-            	    otherlv_7=(Token)match(input,36,FOLLOW_36_in_ruleEnumAnnotationAttribute2875); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
+            	    otherlv_7=(Token)match(input,36,FOLLOW_26); 
 
-            	          	newLeafNode(otherlv_7, grammarAccess.getEnumAnnotationAttributeAccess().getCommaKeyword_6_0());
-            	          
-            	    }
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1285:1: ( (lv_values_8_0= RULE_STRING ) )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1286:1: (lv_values_8_0= RULE_STRING )
+            	        	newLeafNode(otherlv_7, grammarAccess.getEnumAnnotationAttributeAccess().getCommaKeyword_6_0());
+            	        
+            	    // InternalETPhys.g:1285:1: ( (lv_values_8_0= RULE_STRING ) )
+            	    // InternalETPhys.g:1286:1: (lv_values_8_0= RULE_STRING )
             	    {
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1286:1: (lv_values_8_0= RULE_STRING )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1287:3: lv_values_8_0= RULE_STRING
+            	    // InternalETPhys.g:1286:1: (lv_values_8_0= RULE_STRING )
+            	    // InternalETPhys.g:1287:3: lv_values_8_0= RULE_STRING
             	    {
-            	    lv_values_8_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleEnumAnnotationAttribute2892); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
+            	    lv_values_8_0=(Token)match(input,RULE_STRING,FOLLOW_27); 
 
-            	      			newLeafNode(lv_values_8_0, grammarAccess.getEnumAnnotationAttributeAccess().getValuesSTRINGTerminalRuleCall_6_1_0()); 
-            	      		
-            	    }
-            	    if ( state.backtracking==0 ) {
-
-            	      	        if (current==null) {
-            	      	            current = createModelElement(grammarAccess.getEnumAnnotationAttributeRule());
-            	      	        }
-            	             		addWithLastConsumed(
-            	             			current, 
-            	             			"values",
-            	              		lv_values_8_0, 
-            	              		"STRING");
-            	      	    
-            	    }
+            	    			newLeafNode(lv_values_8_0, grammarAccess.getEnumAnnotationAttributeAccess().getValuesSTRINGTerminalRuleCall_6_1_0()); 
+            	    		
+
+            	    	        if (current==null) {
+            	    	            current = createModelElement(grammarAccess.getEnumAnnotationAttributeRule());
+            	    	        }
+            	           		addWithLastConsumed(
+            	           			current, 
+            	           			"values",
+            	            		lv_values_8_0, 
+            	            		"org.eclipse.xtext.common.Terminals.STRING");
+            	    	    
 
             	    }
 
@@ -3435,21 +3124,17 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                 }
             } while (true);
 
-            otherlv_9=(Token)match(input,14,FOLLOW_14_in_ruleEnumAnnotationAttribute2911); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_9=(Token)match(input,14,FOLLOW_2); 
 
-                  	newLeafNode(otherlv_9, grammarAccess.getEnumAnnotationAttributeAccess().getRightCurlyBracketKeyword_7());
-                  
-            }
+                	newLeafNode(otherlv_9, grammarAccess.getEnumAnnotationAttributeAccess().getRightCurlyBracketKeyword_7());
+                
 
             }
 
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -3464,7 +3149,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleImport"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1315:1: entryRuleImport returns [EObject current=null] : iv_ruleImport= ruleImport EOF ;
+    // InternalETPhys.g:1315:1: entryRuleImport returns [EObject current=null] : iv_ruleImport= ruleImport EOF ;
     public final EObject entryRuleImport() throws RecognitionException {
         EObject current = null;
 
@@ -3472,21 +3157,17 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1316:2: (iv_ruleImport= ruleImport EOF )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1317:2: iv_ruleImport= ruleImport EOF
+            // InternalETPhys.g:1316:2: (iv_ruleImport= ruleImport EOF )
+            // InternalETPhys.g:1317:2: iv_ruleImport= ruleImport EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getImportRule()); 
-            }
-            pushFollow(FOLLOW_ruleImport_in_entryRuleImport2947);
+             newCompositeNode(grammarAccess.getImportRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleImport=ruleImport();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleImport; 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleImport2957); if (state.failed) return current;
+
+             current =iv_ruleImport; 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3504,7 +3185,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleImport"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1324:1: ruleImport returns [EObject current=null] : (otherlv_0= 'import' ( ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' ) | otherlv_3= 'model' ) ( (lv_importURI_4_0= RULE_STRING ) ) ) ;
+    // InternalETPhys.g:1324:1: ruleImport returns [EObject current=null] : (otherlv_0= 'import' ( ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' ) | otherlv_3= 'model' ) ( (lv_importURI_4_0= RULE_STRING ) ) ) ;
     public final EObject ruleImport() throws RecognitionException {
         EObject current = null;
 
@@ -3518,19 +3199,17 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1327:28: ( (otherlv_0= 'import' ( ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' ) | otherlv_3= 'model' ) ( (lv_importURI_4_0= RULE_STRING ) ) ) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1328:1: (otherlv_0= 'import' ( ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' ) | otherlv_3= 'model' ) ( (lv_importURI_4_0= RULE_STRING ) ) )
+            // InternalETPhys.g:1327:28: ( (otherlv_0= 'import' ( ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' ) | otherlv_3= 'model' ) ( (lv_importURI_4_0= RULE_STRING ) ) ) )
+            // InternalETPhys.g:1328:1: (otherlv_0= 'import' ( ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' ) | otherlv_3= 'model' ) ( (lv_importURI_4_0= RULE_STRING ) ) )
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1328:1: (otherlv_0= 'import' ( ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' ) | otherlv_3= 'model' ) ( (lv_importURI_4_0= RULE_STRING ) ) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1328:3: otherlv_0= 'import' ( ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' ) | otherlv_3= 'model' ) ( (lv_importURI_4_0= RULE_STRING ) )
+            // InternalETPhys.g:1328:1: (otherlv_0= 'import' ( ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' ) | otherlv_3= 'model' ) ( (lv_importURI_4_0= RULE_STRING ) ) )
+            // InternalETPhys.g:1328:3: otherlv_0= 'import' ( ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' ) | otherlv_3= 'model' ) ( (lv_importURI_4_0= RULE_STRING ) )
             {
-            otherlv_0=(Token)match(input,37,FOLLOW_37_in_ruleImport2994); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_0=(Token)match(input,37,FOLLOW_28); 
 
-                  	newLeafNode(otherlv_0, grammarAccess.getImportAccess().getImportKeyword_0());
-                  
-            }
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1332:1: ( ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' ) | otherlv_3= 'model' )
+                	newLeafNode(otherlv_0, grammarAccess.getImportAccess().getImportKeyword_0());
+                
+            // InternalETPhys.g:1332:1: ( ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' ) | otherlv_3= 'model' )
             int alt16=2;
             int LA16_0 = input.LA(1);
 
@@ -3541,7 +3220,6 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                 alt16=2;
             }
             else {
-                if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
                     new NoViableAltException("", 16, 0, input);
 
@@ -3549,97 +3227,85 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
             }
             switch (alt16) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1332:2: ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' )
+                    // InternalETPhys.g:1332:2: ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' )
                     {
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1332:2: ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' )
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1332:3: ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from'
+                    // InternalETPhys.g:1332:2: ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' )
+                    // InternalETPhys.g:1332:3: ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from'
                     {
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1332:3: ( (lv_importedNamespace_1_0= ruleImportedFQN ) )
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1333:1: (lv_importedNamespace_1_0= ruleImportedFQN )
+                    // InternalETPhys.g:1332:3: ( (lv_importedNamespace_1_0= ruleImportedFQN ) )
+                    // InternalETPhys.g:1333:1: (lv_importedNamespace_1_0= ruleImportedFQN )
                     {
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1333:1: (lv_importedNamespace_1_0= ruleImportedFQN )
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1334:3: lv_importedNamespace_1_0= ruleImportedFQN
+                    // InternalETPhys.g:1333:1: (lv_importedNamespace_1_0= ruleImportedFQN )
+                    // InternalETPhys.g:1334:3: lv_importedNamespace_1_0= ruleImportedFQN
                     {
-                    if ( state.backtracking==0 ) {
-                       
-                      	        newCompositeNode(grammarAccess.getImportAccess().getImportedNamespaceImportedFQNParserRuleCall_1_0_0_0()); 
-                      	    
-                    }
-                    pushFollow(FOLLOW_ruleImportedFQN_in_ruleImport3017);
+                     
+                    	        newCompositeNode(grammarAccess.getImportAccess().getImportedNamespaceImportedFQNParserRuleCall_1_0_0_0()); 
+                    	    
+                    pushFollow(FOLLOW_29);
                     lv_importedNamespace_1_0=ruleImportedFQN();
 
                     state._fsp--;
-                    if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
-
-                      	        if (current==null) {
-                      	            current = createModelElementForParent(grammarAccess.getImportRule());
-                      	        }
-                             		set(
-                             			current, 
-                             			"importedNamespace",
-                              		lv_importedNamespace_1_0, 
-                              		"ImportedFQN");
-                      	        afterParserOrEnumRuleCall();
-                      	    
-                    }
 
-                    }
 
+                    	        if (current==null) {
+                    	            current = createModelElementForParent(grammarAccess.getImportRule());
+                    	        }
+                           		set(
+                           			current, 
+                           			"importedNamespace",
+                            		lv_importedNamespace_1_0, 
+                            		"org.eclipse.etrice.core.common.Base.ImportedFQN");
+                    	        afterParserOrEnumRuleCall();
+                    	    
 
                     }
 
-                    otherlv_2=(Token)match(input,38,FOLLOW_38_in_ruleImport3029); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
 
-                          	newLeafNode(otherlv_2, grammarAccess.getImportAccess().getFromKeyword_1_0_1());
-                          
                     }
 
+                    otherlv_2=(Token)match(input,38,FOLLOW_26); 
+
+                        	newLeafNode(otherlv_2, grammarAccess.getImportAccess().getFromKeyword_1_0_1());
+                        
+
                     }
 
 
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1355:7: otherlv_3= 'model'
+                    // InternalETPhys.g:1355:7: otherlv_3= 'model'
                     {
-                    otherlv_3=(Token)match(input,32,FOLLOW_32_in_ruleImport3048); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    otherlv_3=(Token)match(input,32,FOLLOW_26); 
 
-                          	newLeafNode(otherlv_3, grammarAccess.getImportAccess().getModelKeyword_1_1());
-                          
-                    }
+                        	newLeafNode(otherlv_3, grammarAccess.getImportAccess().getModelKeyword_1_1());
+                        
 
                     }
                     break;
 
             }
 
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1359:2: ( (lv_importURI_4_0= RULE_STRING ) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1360:1: (lv_importURI_4_0= RULE_STRING )
+            // InternalETPhys.g:1359:2: ( (lv_importURI_4_0= RULE_STRING ) )
+            // InternalETPhys.g:1360:1: (lv_importURI_4_0= RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1360:1: (lv_importURI_4_0= RULE_STRING )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1361:3: lv_importURI_4_0= RULE_STRING
+            // InternalETPhys.g:1360:1: (lv_importURI_4_0= RULE_STRING )
+            // InternalETPhys.g:1361:3: lv_importURI_4_0= RULE_STRING
             {
-            lv_importURI_4_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleImport3066); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            lv_importURI_4_0=(Token)match(input,RULE_STRING,FOLLOW_2); 
 
-              			newLeafNode(lv_importURI_4_0, grammarAccess.getImportAccess().getImportURISTRINGTerminalRuleCall_2_0()); 
-              		
-            }
-            if ( state.backtracking==0 ) {
+            			newLeafNode(lv_importURI_4_0, grammarAccess.getImportAccess().getImportURISTRINGTerminalRuleCall_2_0()); 
+            		
 
-              	        if (current==null) {
-              	            current = createModelElement(grammarAccess.getImportRule());
-              	        }
-                     		setWithLastConsumed(
-                     			current, 
-                     			"importURI",
-                      		lv_importURI_4_0, 
-                      		"STRING");
-              	    
-            }
+            	        if (current==null) {
+            	            current = createModelElement(grammarAccess.getImportRule());
+            	        }
+                   		setWithLastConsumed(
+                   			current, 
+                   			"importURI",
+                    		lv_importURI_4_0, 
+                    		"org.eclipse.xtext.common.Terminals.STRING");
+            	    
 
             }
 
@@ -3652,9 +3318,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -3669,7 +3333,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleImportedFQN"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1385:1: entryRuleImportedFQN returns [String current=null] : iv_ruleImportedFQN= ruleImportedFQN EOF ;
+    // InternalETPhys.g:1385:1: entryRuleImportedFQN returns [String current=null] : iv_ruleImportedFQN= ruleImportedFQN EOF ;
     public final String entryRuleImportedFQN() throws RecognitionException {
         String current = null;
 
@@ -3677,21 +3341,17 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1386:2: (iv_ruleImportedFQN= ruleImportedFQN EOF )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1387:2: iv_ruleImportedFQN= ruleImportedFQN EOF
+            // InternalETPhys.g:1386:2: (iv_ruleImportedFQN= ruleImportedFQN EOF )
+            // InternalETPhys.g:1387:2: iv_ruleImportedFQN= ruleImportedFQN EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getImportedFQNRule()); 
-            }
-            pushFollow(FOLLOW_ruleImportedFQN_in_entryRuleImportedFQN3108);
+             newCompositeNode(grammarAccess.getImportedFQNRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleImportedFQN=ruleImportedFQN();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleImportedFQN.getText(); 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleImportedFQN3119); if (state.failed) return current;
+
+             current =iv_ruleImportedFQN.getText(); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3709,7 +3369,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleImportedFQN"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1394:1: ruleImportedFQN returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_FQN_0= ruleFQN (kw= '.*' )? ) ;
+    // InternalETPhys.g:1394:1: ruleImportedFQN returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_FQN_0= ruleFQN (kw= '.*' )? ) ;
     public final AntlrDatatypeRuleToken ruleImportedFQN() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -3720,33 +3380,27 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1397:28: ( (this_FQN_0= ruleFQN (kw= '.*' )? ) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1398:1: (this_FQN_0= ruleFQN (kw= '.*' )? )
+            // InternalETPhys.g:1397:28: ( (this_FQN_0= ruleFQN (kw= '.*' )? ) )
+            // InternalETPhys.g:1398:1: (this_FQN_0= ruleFQN (kw= '.*' )? )
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1398:1: (this_FQN_0= ruleFQN (kw= '.*' )? )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1399:5: this_FQN_0= ruleFQN (kw= '.*' )?
+            // InternalETPhys.g:1398:1: (this_FQN_0= ruleFQN (kw= '.*' )? )
+            // InternalETPhys.g:1399:5: this_FQN_0= ruleFQN (kw= '.*' )?
             {
-            if ( state.backtracking==0 ) {
-               
-                      newCompositeNode(grammarAccess.getImportedFQNAccess().getFQNParserRuleCall_0()); 
-                  
-            }
-            pushFollow(FOLLOW_ruleFQN_in_ruleImportedFQN3166);
+             
+                    newCompositeNode(grammarAccess.getImportedFQNAccess().getFQNParserRuleCall_0()); 
+                
+            pushFollow(FOLLOW_30);
             this_FQN_0=ruleFQN();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
 
-              		current.merge(this_FQN_0);
-                  
-            }
-            if ( state.backtracking==0 ) {
-               
-                      afterParserOrEnumRuleCall();
-                  
-            }
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1409:1: (kw= '.*' )?
+
+            		current.merge(this_FQN_0);
+                
+             
+                    afterParserOrEnumRuleCall();
+                
+            // InternalETPhys.g:1409:1: (kw= '.*' )?
             int alt17=2;
             int LA17_0 = input.LA(1);
 
@@ -3755,15 +3409,13 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
             }
             switch (alt17) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1410:2: kw= '.*'
+                    // InternalETPhys.g:1410:2: kw= '.*'
                     {
-                    kw=(Token)match(input,39,FOLLOW_39_in_ruleImportedFQN3185); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    kw=(Token)match(input,39,FOLLOW_2); 
 
-                              current.merge(kw);
-                              newLeafNode(kw, grammarAccess.getImportedFQNAccess().getFullStopAsteriskKeyword_1()); 
-                          
-                    }
+                            current.merge(kw);
+                            newLeafNode(kw, grammarAccess.getImportedFQNAccess().getFullStopAsteriskKeyword_1()); 
+                        
 
                     }
                     break;
@@ -3776,9 +3428,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -3793,7 +3443,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleDocumentation"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1423:1: entryRuleDocumentation returns [EObject current=null] : iv_ruleDocumentation= ruleDocumentation EOF ;
+    // InternalETPhys.g:1423:1: entryRuleDocumentation returns [EObject current=null] : iv_ruleDocumentation= ruleDocumentation EOF ;
     public final EObject entryRuleDocumentation() throws RecognitionException {
         EObject current = null;
 
@@ -3801,21 +3451,17 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1424:2: (iv_ruleDocumentation= ruleDocumentation EOF )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1425:2: iv_ruleDocumentation= ruleDocumentation EOF
+            // InternalETPhys.g:1424:2: (iv_ruleDocumentation= ruleDocumentation EOF )
+            // InternalETPhys.g:1425:2: iv_ruleDocumentation= ruleDocumentation EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getDocumentationRule()); 
-            }
-            pushFollow(FOLLOW_ruleDocumentation_in_entryRuleDocumentation3227);
+             newCompositeNode(grammarAccess.getDocumentationRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleDocumentation=ruleDocumentation();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleDocumentation; 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDocumentation3237); if (state.failed) return current;
+
+             current =iv_ruleDocumentation; 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3833,7 +3479,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleDocumentation"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1432:1: ruleDocumentation returns [EObject current=null] : ( () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']' ) ;
+    // InternalETPhys.g:1432: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;
 
@@ -3844,32 +3490,28 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1435:28: ( ( () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']' ) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1436:1: ( () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']' )
+            // InternalETPhys.g:1435:28: ( ( () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']' ) )
+            // InternalETPhys.g:1436:1: ( () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']' )
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1436:1: ( () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']' )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1436:2: () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']'
+            // InternalETPhys.g:1436:1: ( () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']' )
+            // InternalETPhys.g:1436:2: () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']'
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1436:2: ()
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1437:5: 
+            // InternalETPhys.g:1436:2: ()
+            // InternalETPhys.g:1437:5: 
             {
-            if ( state.backtracking==0 ) {
 
-                      current = forceCreateModelElement(
-                          grammarAccess.getDocumentationAccess().getDocumentationAction_0(),
-                          current);
-                  
-            }
+                    current = forceCreateModelElement(
+                        grammarAccess.getDocumentationAccess().getDocumentationAction_0(),
+                        current);
+                
 
             }
 
-            otherlv_1=(Token)match(input,40,FOLLOW_40_in_ruleDocumentation3283); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_1=(Token)match(input,40,FOLLOW_31); 
 
-                  	newLeafNode(otherlv_1, grammarAccess.getDocumentationAccess().getLeftSquareBracketKeyword_1());
-                  
-            }
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1446:1: ( (lv_lines_2_0= RULE_STRING ) )*
+                	newLeafNode(otherlv_1, grammarAccess.getDocumentationAccess().getLeftSquareBracketKeyword_1());
+                
+            // InternalETPhys.g:1446:1: ( (lv_lines_2_0= RULE_STRING ) )*
             loop18:
             do {
                 int alt18=2;
@@ -3882,29 +3524,25 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
                 switch (alt18) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1447:1: (lv_lines_2_0= RULE_STRING )
+            	    // InternalETPhys.g:1447:1: (lv_lines_2_0= RULE_STRING )
             	    {
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1447:1: (lv_lines_2_0= RULE_STRING )
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1448:3: lv_lines_2_0= RULE_STRING
+            	    // InternalETPhys.g:1447:1: (lv_lines_2_0= RULE_STRING )
+            	    // InternalETPhys.g:1448:3: lv_lines_2_0= RULE_STRING
             	    {
-            	    lv_lines_2_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleDocumentation3300); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
+            	    lv_lines_2_0=(Token)match(input,RULE_STRING,FOLLOW_31); 
 
-            	      			newLeafNode(lv_lines_2_0, grammarAccess.getDocumentationAccess().getLinesSTRINGTerminalRuleCall_2_0()); 
-            	      		
-            	    }
-            	    if ( state.backtracking==0 ) {
-
-            	      	        if (current==null) {
-            	      	            current = createModelElement(grammarAccess.getDocumentationRule());
-            	      	        }
-            	             		addWithLastConsumed(
-            	             			current, 
-            	             			"lines",
-            	              		lv_lines_2_0, 
-            	              		"STRING");
-            	      	    
-            	    }
+            	    			newLeafNode(lv_lines_2_0, grammarAccess.getDocumentationAccess().getLinesSTRINGTerminalRuleCall_2_0()); 
+            	    		
+
+            	    	        if (current==null) {
+            	    	            current = createModelElement(grammarAccess.getDocumentationRule());
+            	    	        }
+            	           		addWithLastConsumed(
+            	           			current, 
+            	           			"lines",
+            	            		lv_lines_2_0, 
+            	            		"org.eclipse.xtext.common.Terminals.STRING");
+            	    	    
 
             	    }
 
@@ -3917,21 +3555,17 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                 }
             } while (true);
 
-            otherlv_3=(Token)match(input,41,FOLLOW_41_in_ruleDocumentation3318); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            otherlv_3=(Token)match(input,41,FOLLOW_2); 
 
-                  	newLeafNode(otherlv_3, grammarAccess.getDocumentationAccess().getRightSquareBracketKeyword_3());
-                  
-            }
+                	newLeafNode(otherlv_3, grammarAccess.getDocumentationAccess().getRightSquareBracketKeyword_3());
+                
 
             }
 
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -3946,7 +3580,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTIME"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1476:1: entryRuleTIME returns [String current=null] : iv_ruleTIME= ruleTIME EOF ;
+    // InternalETPhys.g:1476:1: entryRuleTIME returns [String current=null] : iv_ruleTIME= ruleTIME EOF ;
     public final String entryRuleTIME() throws RecognitionException {
         String current = null;
 
@@ -3954,21 +3588,17 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1477:2: (iv_ruleTIME= ruleTIME EOF )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1478:2: iv_ruleTIME= ruleTIME EOF
+            // InternalETPhys.g:1477:2: (iv_ruleTIME= ruleTIME EOF )
+            // InternalETPhys.g:1478:2: iv_ruleTIME= ruleTIME EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getTIMERule()); 
-            }
-            pushFollow(FOLLOW_ruleTIME_in_entryRuleTIME3355);
+             newCompositeNode(grammarAccess.getTIMERule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleTIME=ruleTIME();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleTIME.getText(); 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleTIME3366); if (state.failed) return current;
+
+             current =iv_ruleTIME.getText(); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3986,7 +3616,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTIME"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1485:1: ruleTIME returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : ( (this_INT_0= RULE_INT kw= 's' ) | (this_INT_2= RULE_INT kw= 'ms' ) | (this_INT_4= RULE_INT kw= 'us' ) | (this_INT_6= RULE_INT kw= 'ns' ) ) ;
+    // InternalETPhys.g:1485:1: ruleTIME returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : ( (this_INT_0= RULE_INT kw= 's' ) | (this_INT_2= RULE_INT kw= 'ms' ) | (this_INT_4= RULE_INT kw= 'us' ) | (this_INT_6= RULE_INT kw= 'ns' ) ) ;
     public final AntlrDatatypeRuleToken ruleTIME() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -3999,10 +3629,10 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1488:28: ( ( (this_INT_0= RULE_INT kw= 's' ) | (this_INT_2= RULE_INT kw= 'ms' ) | (this_INT_4= RULE_INT kw= 'us' ) | (this_INT_6= RULE_INT kw= 'ns' ) ) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1489:1: ( (this_INT_0= RULE_INT kw= 's' ) | (this_INT_2= RULE_INT kw= 'ms' ) | (this_INT_4= RULE_INT kw= 'us' ) | (this_INT_6= RULE_INT kw= 'ns' ) )
+            // InternalETPhys.g:1488:28: ( ( (this_INT_0= RULE_INT kw= 's' ) | (this_INT_2= RULE_INT kw= 'ms' ) | (this_INT_4= RULE_INT kw= 'us' ) | (this_INT_6= RULE_INT kw= 'ns' ) ) )
+            // InternalETPhys.g:1489:1: ( (this_INT_0= RULE_INT kw= 's' ) | (this_INT_2= RULE_INT kw= 'ms' ) | (this_INT_4= RULE_INT kw= 'us' ) | (this_INT_6= RULE_INT kw= 'ns' ) )
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1489:1: ( (this_INT_0= RULE_INT kw= 's' ) | (this_INT_2= RULE_INT kw= 'ms' ) | (this_INT_4= RULE_INT kw= 'us' ) | (this_INT_6= RULE_INT kw= 'ns' ) )
+            // InternalETPhys.g:1489:1: ( (this_INT_0= RULE_INT kw= 's' ) | (this_INT_2= RULE_INT kw= 'ms' ) | (this_INT_4= RULE_INT kw= 'us' ) | (this_INT_6= RULE_INT kw= 'ns' ) )
             int alt19=4;
             int LA19_0 = input.LA(1);
 
@@ -4029,7 +3659,6 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 default:
-                    if (state.backtracking>0) {state.failed=true; return current;}
                     NoViableAltException nvae =
                         new NoViableAltException("", 19, 1, input);
 
@@ -4038,7 +3667,6 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
             }
             else {
-                if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
                     new NoViableAltException("", 19, 0, input);
 
@@ -4046,29 +3674,23 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
             }
             switch (alt19) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1489:2: (this_INT_0= RULE_INT kw= 's' )
+                    // InternalETPhys.g:1489:2: (this_INT_0= RULE_INT kw= 's' )
                     {
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1489:2: (this_INT_0= RULE_INT kw= 's' )
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1489:7: this_INT_0= RULE_INT kw= 's'
+                    // InternalETPhys.g:1489:2: (this_INT_0= RULE_INT kw= 's' )
+                    // InternalETPhys.g:1489:7: this_INT_0= RULE_INT kw= 's'
                     {
-                    this_INT_0=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleTIME3407); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    this_INT_0=(Token)match(input,RULE_INT,FOLLOW_32); 
 
-                      		current.merge(this_INT_0);
-                          
-                    }
-                    if ( state.backtracking==0 ) {
-                       
-                          newLeafNode(this_INT_0, grammarAccess.getTIMEAccess().getINTTerminalRuleCall_0_0()); 
-                          
-                    }
-                    kw=(Token)match(input,42,FOLLOW_42_in_ruleTIME3425); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    		current.merge(this_INT_0);
+                        
+                     
+                        newLeafNode(this_INT_0, grammarAccess.getTIMEAccess().getINTTerminalRuleCall_0_0()); 
+                        
+                    kw=(Token)match(input,42,FOLLOW_2); 
 
-                              current.merge(kw);
-                              newLeafNode(kw, grammarAccess.getTIMEAccess().getSKeyword_0_1()); 
-                          
-                    }
+                            current.merge(kw);
+                            newLeafNode(kw, grammarAccess.getTIMEAccess().getSKeyword_0_1()); 
+                        
 
                     }
 
@@ -4076,29 +3698,23 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1503:6: (this_INT_2= RULE_INT kw= 'ms' )
+                    // InternalETPhys.g:1503:6: (this_INT_2= RULE_INT kw= 'ms' )
                     {
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1503:6: (this_INT_2= RULE_INT kw= 'ms' )
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1503:11: this_INT_2= RULE_INT kw= 'ms'
+                    // InternalETPhys.g:1503:6: (this_INT_2= RULE_INT kw= 'ms' )
+                    // InternalETPhys.g:1503:11: this_INT_2= RULE_INT kw= 'ms'
                     {
-                    this_INT_2=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleTIME3448); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    this_INT_2=(Token)match(input,RULE_INT,FOLLOW_33); 
 
-                      		current.merge(this_INT_2);
-                          
-                    }
-                    if ( state.backtracking==0 ) {
-                       
-                          newLeafNode(this_INT_2, grammarAccess.getTIMEAccess().getINTTerminalRuleCall_1_0()); 
-                          
-                    }
-                    kw=(Token)match(input,43,FOLLOW_43_in_ruleTIME3466); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    		current.merge(this_INT_2);
+                        
+                     
+                        newLeafNode(this_INT_2, grammarAccess.getTIMEAccess().getINTTerminalRuleCall_1_0()); 
+                        
+                    kw=(Token)match(input,43,FOLLOW_2); 
 
-                              current.merge(kw);
-                              newLeafNode(kw, grammarAccess.getTIMEAccess().getMsKeyword_1_1()); 
-                          
-                    }
+                            current.merge(kw);
+                            newLeafNode(kw, grammarAccess.getTIMEAccess().getMsKeyword_1_1()); 
+                        
 
                     }
 
@@ -4106,29 +3722,23 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1517:6: (this_INT_4= RULE_INT kw= 'us' )
+                    // InternalETPhys.g:1517:6: (this_INT_4= RULE_INT kw= 'us' )
                     {
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1517:6: (this_INT_4= RULE_INT kw= 'us' )
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1517:11: this_INT_4= RULE_INT kw= 'us'
+                    // InternalETPhys.g:1517:6: (this_INT_4= RULE_INT kw= 'us' )
+                    // InternalETPhys.g:1517:11: this_INT_4= RULE_INT kw= 'us'
                     {
-                    this_INT_4=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleTIME3489); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    this_INT_4=(Token)match(input,RULE_INT,FOLLOW_34); 
 
-                      		current.merge(this_INT_4);
-                          
-                    }
-                    if ( state.backtracking==0 ) {
-                       
-                          newLeafNode(this_INT_4, grammarAccess.getTIMEAccess().getINTTerminalRuleCall_2_0()); 
-                          
-                    }
-                    kw=(Token)match(input,44,FOLLOW_44_in_ruleTIME3507); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    		current.merge(this_INT_4);
+                        
+                     
+                        newLeafNode(this_INT_4, grammarAccess.getTIMEAccess().getINTTerminalRuleCall_2_0()); 
+                        
+                    kw=(Token)match(input,44,FOLLOW_2); 
 
-                              current.merge(kw);
-                              newLeafNode(kw, grammarAccess.getTIMEAccess().getUsKeyword_2_1()); 
-                          
-                    }
+                            current.merge(kw);
+                            newLeafNode(kw, grammarAccess.getTIMEAccess().getUsKeyword_2_1()); 
+                        
 
                     }
 
@@ -4136,29 +3746,23 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 4 :
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1531:6: (this_INT_6= RULE_INT kw= 'ns' )
+                    // InternalETPhys.g:1531:6: (this_INT_6= RULE_INT kw= 'ns' )
                     {
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1531:6: (this_INT_6= RULE_INT kw= 'ns' )
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1531:11: this_INT_6= RULE_INT kw= 'ns'
+                    // InternalETPhys.g:1531:6: (this_INT_6= RULE_INT kw= 'ns' )
+                    // InternalETPhys.g:1531:11: this_INT_6= RULE_INT kw= 'ns'
                     {
-                    this_INT_6=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleTIME3530); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    this_INT_6=(Token)match(input,RULE_INT,FOLLOW_35); 
 
-                      		current.merge(this_INT_6);
-                          
-                    }
-                    if ( state.backtracking==0 ) {
-                       
-                          newLeafNode(this_INT_6, grammarAccess.getTIMEAccess().getINTTerminalRuleCall_3_0()); 
-                          
-                    }
-                    kw=(Token)match(input,45,FOLLOW_45_in_ruleTIME3548); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    		current.merge(this_INT_6);
+                        
+                     
+                        newLeafNode(this_INT_6, grammarAccess.getTIMEAccess().getINTTerminalRuleCall_3_0()); 
+                        
+                    kw=(Token)match(input,45,FOLLOW_2); 
 
-                              current.merge(kw);
-                              newLeafNode(kw, grammarAccess.getTIMEAccess().getNsKeyword_3_1()); 
-                          
-                    }
+                            current.merge(kw);
+                            newLeafNode(kw, grammarAccess.getTIMEAccess().getNsKeyword_3_1()); 
+                        
 
                     }
 
@@ -4171,9 +3775,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -4188,7 +3790,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleLiteral"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1554:1: entryRuleLiteral returns [EObject current=null] : iv_ruleLiteral= ruleLiteral EOF ;
+    // InternalETPhys.g:1554:1: entryRuleLiteral returns [EObject current=null] : iv_ruleLiteral= ruleLiteral EOF ;
     public final EObject entryRuleLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -4196,21 +3798,17 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1555:2: (iv_ruleLiteral= ruleLiteral EOF )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1556:2: iv_ruleLiteral= ruleLiteral EOF
+            // InternalETPhys.g:1555:2: (iv_ruleLiteral= ruleLiteral EOF )
+            // InternalETPhys.g:1556:2: iv_ruleLiteral= ruleLiteral EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getLiteralRule()); 
-            }
-            pushFollow(FOLLOW_ruleLiteral_in_entryRuleLiteral3591);
+             newCompositeNode(grammarAccess.getLiteralRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleLiteral=ruleLiteral();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleLiteral; 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleLiteral3601); if (state.failed) return current;
+
+             current =iv_ruleLiteral; 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -4228,7 +3826,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleLiteral"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1563:1: ruleLiteral returns [EObject current=null] : (this_BooleanLiteral_0= ruleBooleanLiteral | this_NumberLiteral_1= ruleNumberLiteral | this_StringLiteral_2= ruleStringLiteral ) ;
+    // InternalETPhys.g:1563: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;
 
@@ -4242,10 +3840,10 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1566:28: ( (this_BooleanLiteral_0= ruleBooleanLiteral | this_NumberLiteral_1= ruleNumberLiteral | this_StringLiteral_2= ruleStringLiteral ) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1567:1: (this_BooleanLiteral_0= ruleBooleanLiteral | this_NumberLiteral_1= ruleNumberLiteral | this_StringLiteral_2= ruleStringLiteral )
+            // InternalETPhys.g:1566:28: ( (this_BooleanLiteral_0= ruleBooleanLiteral | this_NumberLiteral_1= ruleNumberLiteral | this_StringLiteral_2= ruleStringLiteral ) )
+            // InternalETPhys.g:1567:1: (this_BooleanLiteral_0= ruleBooleanLiteral | this_NumberLiteral_1= ruleNumberLiteral | this_StringLiteral_2= ruleStringLiteral )
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1567:1: (this_BooleanLiteral_0= ruleBooleanLiteral | this_NumberLiteral_1= ruleNumberLiteral | this_StringLiteral_2= ruleStringLiteral )
+            // InternalETPhys.g:1567:1: (this_BooleanLiteral_0= ruleBooleanLiteral | this_NumberLiteral_1= ruleNumberLiteral | this_StringLiteral_2= ruleStringLiteral )
             int alt20=3;
             switch ( input.LA(1) ) {
             case 46:
@@ -4268,7 +3866,6 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                 }
                 break;
             default:
-                if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
                     new NoViableAltException("", 20, 0, input);
 
@@ -4277,68 +3874,56 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
             switch (alt20) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1568:5: this_BooleanLiteral_0= ruleBooleanLiteral
+                    // InternalETPhys.g:1568:5: this_BooleanLiteral_0= ruleBooleanLiteral
                     {
-                    if ( state.backtracking==0 ) {
-                       
-                              newCompositeNode(grammarAccess.getLiteralAccess().getBooleanLiteralParserRuleCall_0()); 
-                          
-                    }
-                    pushFollow(FOLLOW_ruleBooleanLiteral_in_ruleLiteral3648);
+                     
+                            newCompositeNode(grammarAccess.getLiteralAccess().getBooleanLiteralParserRuleCall_0()); 
+                        
+                    pushFollow(FOLLOW_2);
                     this_BooleanLiteral_0=ruleBooleanLiteral();
 
                     state._fsp--;
-                    if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
-                       
-                              current = this_BooleanLiteral_0; 
-                              afterParserOrEnumRuleCall();
-                          
-                    }
+
+                     
+                            current = this_BooleanLiteral_0; 
+                            afterParserOrEnumRuleCall();
+                        
 
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1578:5: this_NumberLiteral_1= ruleNumberLiteral
+                    // InternalETPhys.g:1578:5: this_NumberLiteral_1= ruleNumberLiteral
                     {
-                    if ( state.backtracking==0 ) {
-                       
-                              newCompositeNode(grammarAccess.getLiteralAccess().getNumberLiteralParserRuleCall_1()); 
-                          
-                    }
-                    pushFollow(FOLLOW_ruleNumberLiteral_in_ruleLiteral3675);
+                     
+                            newCompositeNode(grammarAccess.getLiteralAccess().getNumberLiteralParserRuleCall_1()); 
+                        
+                    pushFollow(FOLLOW_2);
                     this_NumberLiteral_1=ruleNumberLiteral();
 
                     state._fsp--;
-                    if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
-                       
-                              current = this_NumberLiteral_1; 
-                              afterParserOrEnumRuleCall();
-                          
-                    }
+
+                     
+                            current = this_NumberLiteral_1; 
+                            afterParserOrEnumRuleCall();
+                        
 
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1588:5: this_StringLiteral_2= ruleStringLiteral
+                    // InternalETPhys.g:1588:5: this_StringLiteral_2= ruleStringLiteral
                     {
-                    if ( state.backtracking==0 ) {
-                       
-                              newCompositeNode(grammarAccess.getLiteralAccess().getStringLiteralParserRuleCall_2()); 
-                          
-                    }
-                    pushFollow(FOLLOW_ruleStringLiteral_in_ruleLiteral3702);
+                     
+                            newCompositeNode(grammarAccess.getLiteralAccess().getStringLiteralParserRuleCall_2()); 
+                        
+                    pushFollow(FOLLOW_2);
                     this_StringLiteral_2=ruleStringLiteral();
 
                     state._fsp--;
-                    if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
-                       
-                              current = this_StringLiteral_2; 
-                              afterParserOrEnumRuleCall();
-                          
-                    }
+
+                     
+                            current = this_StringLiteral_2; 
+                            afterParserOrEnumRuleCall();
+                        
 
                     }
                     break;
@@ -4348,9 +3933,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -4365,7 +3948,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleBooleanLiteral"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1604:1: entryRuleBooleanLiteral returns [EObject current=null] : iv_ruleBooleanLiteral= ruleBooleanLiteral EOF ;
+    // InternalETPhys.g:1604:1: entryRuleBooleanLiteral returns [EObject current=null] : iv_ruleBooleanLiteral= ruleBooleanLiteral EOF ;
     public final EObject entryRuleBooleanLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -4373,21 +3956,17 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1605:2: (iv_ruleBooleanLiteral= ruleBooleanLiteral EOF )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1606:2: iv_ruleBooleanLiteral= ruleBooleanLiteral EOF
+            // InternalETPhys.g:1605:2: (iv_ruleBooleanLiteral= ruleBooleanLiteral EOF )
+            // InternalETPhys.g:1606:2: iv_ruleBooleanLiteral= ruleBooleanLiteral EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getBooleanLiteralRule()); 
-            }
-            pushFollow(FOLLOW_ruleBooleanLiteral_in_entryRuleBooleanLiteral3737);
+             newCompositeNode(grammarAccess.getBooleanLiteralRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleBooleanLiteral=ruleBooleanLiteral();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleBooleanLiteral; 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleBooleanLiteral3747); if (state.failed) return current;
+
+             current =iv_ruleBooleanLiteral; 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -4405,7 +3984,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleBooleanLiteral"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1613:1: ruleBooleanLiteral returns [EObject current=null] : ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) ) ;
+    // InternalETPhys.g:1613:1: ruleBooleanLiteral returns [EObject current=null] : ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) ) ;
     public final EObject ruleBooleanLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -4415,26 +3994,24 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1616:28: ( ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) ) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1617:1: ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) )
+            // InternalETPhys.g:1616:28: ( ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) ) )
+            // InternalETPhys.g:1617:1: ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) )
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1617:1: ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1617:2: () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) )
+            // InternalETPhys.g:1617:1: ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) )
+            // InternalETPhys.g:1617:2: () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) )
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1617:2: ()
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1618:5: 
+            // InternalETPhys.g:1617:2: ()
+            // InternalETPhys.g:1618:5: 
             {
-            if ( state.backtracking==0 ) {
 
-                      current = forceCreateModelElement(
-                          grammarAccess.getBooleanLiteralAccess().getBooleanLiteralAction_0(),
-                          current);
-                  
-            }
+                    current = forceCreateModelElement(
+                        grammarAccess.getBooleanLiteralAccess().getBooleanLiteralAction_0(),
+                        current);
+                
 
             }
 
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1623:2: (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) )
+            // InternalETPhys.g:1623:2: (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) )
             int alt21=2;
             int LA21_0 = input.LA(1);
 
@@ -4445,7 +4022,6 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                 alt21=2;
             }
             else {
-                if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
                     new NoViableAltException("", 21, 0, input);
 
@@ -4453,40 +4029,34 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
             }
             switch (alt21) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1623:4: otherlv_1= 'false'
+                    // InternalETPhys.g:1623:4: otherlv_1= 'false'
                     {
-                    otherlv_1=(Token)match(input,46,FOLLOW_46_in_ruleBooleanLiteral3794); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    otherlv_1=(Token)match(input,46,FOLLOW_2); 
 
-                          	newLeafNode(otherlv_1, grammarAccess.getBooleanLiteralAccess().getFalseKeyword_1_0());
-                          
-                    }
+                        	newLeafNode(otherlv_1, grammarAccess.getBooleanLiteralAccess().getFalseKeyword_1_0());
+                        
 
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1628:6: ( (lv_isTrue_2_0= 'true' ) )
+                    // InternalETPhys.g:1628:6: ( (lv_isTrue_2_0= 'true' ) )
                     {
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1628:6: ( (lv_isTrue_2_0= 'true' ) )
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1629:1: (lv_isTrue_2_0= 'true' )
+                    // InternalETPhys.g:1628:6: ( (lv_isTrue_2_0= 'true' ) )
+                    // InternalETPhys.g:1629:1: (lv_isTrue_2_0= 'true' )
                     {
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1629:1: (lv_isTrue_2_0= 'true' )
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1630:3: lv_isTrue_2_0= 'true'
+                    // InternalETPhys.g:1629:1: (lv_isTrue_2_0= 'true' )
+                    // InternalETPhys.g:1630:3: lv_isTrue_2_0= 'true'
                     {
-                    lv_isTrue_2_0=(Token)match(input,47,FOLLOW_47_in_ruleBooleanLiteral3818); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    lv_isTrue_2_0=(Token)match(input,47,FOLLOW_2); 
 
-                              newLeafNode(lv_isTrue_2_0, grammarAccess.getBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0());
-                          
-                    }
-                    if ( state.backtracking==0 ) {
+                            newLeafNode(lv_isTrue_2_0, grammarAccess.getBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0());
+                        
 
-                      	        if (current==null) {
-                      	            current = createModelElement(grammarAccess.getBooleanLiteralRule());
-                      	        }
-                             		setWithLastConsumed(current, "isTrue", true, "true");
-                      	    
-                    }
+                    	        if (current==null) {
+                    	            current = createModelElement(grammarAccess.getBooleanLiteralRule());
+                    	        }
+                           		setWithLastConsumed(current, "isTrue", true, "true");
+                    	    
 
                     }
 
@@ -4505,9 +4075,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -4522,7 +4090,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleNumberLiteral"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1651:1: entryRuleNumberLiteral returns [EObject current=null] : iv_ruleNumberLiteral= ruleNumberLiteral EOF ;
+    // InternalETPhys.g:1651:1: entryRuleNumberLiteral returns [EObject current=null] : iv_ruleNumberLiteral= ruleNumberLiteral EOF ;
     public final EObject entryRuleNumberLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -4530,21 +4098,17 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1652:2: (iv_ruleNumberLiteral= ruleNumberLiteral EOF )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1653:2: iv_ruleNumberLiteral= ruleNumberLiteral EOF
+            // InternalETPhys.g:1652:2: (iv_ruleNumberLiteral= ruleNumberLiteral EOF )
+            // InternalETPhys.g:1653:2: iv_ruleNumberLiteral= ruleNumberLiteral EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getNumberLiteralRule()); 
-            }
-            pushFollow(FOLLOW_ruleNumberLiteral_in_entryRuleNumberLiteral3868);
+             newCompositeNode(grammarAccess.getNumberLiteralRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleNumberLiteral=ruleNumberLiteral();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleNumberLiteral; 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleNumberLiteral3878); if (state.failed) return current;
+
+             current =iv_ruleNumberLiteral; 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -4562,7 +4126,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleNumberLiteral"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1660:1: ruleNumberLiteral returns [EObject current=null] : (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral ) ;
+    // InternalETPhys.g:1660:1: ruleNumberLiteral returns [EObject current=null] : (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral ) ;
     public final EObject ruleNumberLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -4574,10 +4138,10 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1663:28: ( (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral ) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1664:1: (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral )
+            // InternalETPhys.g:1663:28: ( (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral ) )
+            // InternalETPhys.g:1664:1: (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral )
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1664:1: (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral )
+            // InternalETPhys.g:1664:1: (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral )
             int alt22=2;
             switch ( input.LA(1) ) {
             case 48:
@@ -4587,14 +4151,13 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                 if ( (LA22_1==RULE_INT) ) {
                     int LA22_3 = input.LA(3);
 
-                    if ( (LA22_3==EOF) ) {
-                        alt22=1;
-                    }
-                    else if ( (LA22_3==50) ) {
+                    if ( (LA22_3==50) ) {
                         alt22=2;
                     }
+                    else if ( (LA22_3==EOF) ) {
+                        alt22=1;
+                    }
                     else {
-                        if (state.backtracking>0) {state.failed=true; return current;}
                         NoViableAltException nvae =
                             new NoViableAltException("", 22, 3, input);
 
@@ -4602,7 +4165,6 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                     }
                 }
                 else {
-                    if (state.backtracking>0) {state.failed=true; return current;}
                     NoViableAltException nvae =
                         new NoViableAltException("", 22, 1, input);
 
@@ -4617,14 +4179,13 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                 if ( (LA22_2==RULE_INT) ) {
                     int LA22_3 = input.LA(3);
 
-                    if ( (LA22_3==EOF) ) {
-                        alt22=1;
-                    }
-                    else if ( (LA22_3==50) ) {
+                    if ( (LA22_3==50) ) {
                         alt22=2;
                     }
+                    else if ( (LA22_3==EOF) ) {
+                        alt22=1;
+                    }
                     else {
-                        if (state.backtracking>0) {state.failed=true; return current;}
                         NoViableAltException nvae =
                             new NoViableAltException("", 22, 3, input);
 
@@ -4632,7 +4193,6 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                     }
                 }
                 else {
-                    if (state.backtracking>0) {state.failed=true; return current;}
                     NoViableAltException nvae =
                         new NoViableAltException("", 22, 2, input);
 
@@ -4644,14 +4204,13 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                 {
                 int LA22_3 = input.LA(2);
 
-                if ( (LA22_3==EOF) ) {
-                    alt22=1;
-                }
-                else if ( (LA22_3==50) ) {
+                if ( (LA22_3==50) ) {
                     alt22=2;
                 }
+                else if ( (LA22_3==EOF) ) {
+                    alt22=1;
+                }
                 else {
-                    if (state.backtracking>0) {state.failed=true; return current;}
                     NoViableAltException nvae =
                         new NoViableAltException("", 22, 3, input);
 
@@ -4665,7 +4224,6 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                 }
                 break;
             default:
-                if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
                     new NoViableAltException("", 22, 0, input);
 
@@ -4674,46 +4232,38 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
             switch (alt22) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1665:5: this_IntLiteral_0= ruleIntLiteral
+                    // InternalETPhys.g:1665:5: this_IntLiteral_0= ruleIntLiteral
                     {
-                    if ( state.backtracking==0 ) {
-                       
-                              newCompositeNode(grammarAccess.getNumberLiteralAccess().getIntLiteralParserRuleCall_0()); 
-                          
-                    }
-                    pushFollow(FOLLOW_ruleIntLiteral_in_ruleNumberLiteral3925);
+                     
+                            newCompositeNode(grammarAccess.getNumberLiteralAccess().getIntLiteralParserRuleCall_0()); 
+                        
+                    pushFollow(FOLLOW_2);
                     this_IntLiteral_0=ruleIntLiteral();
 
                     state._fsp--;
-                    if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
-                       
-                              current = this_IntLiteral_0; 
-                              afterParserOrEnumRuleCall();
-                          
-                    }
+
+                     
+                            current = this_IntLiteral_0; 
+                            afterParserOrEnumRuleCall();
+                        
 
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1675:5: this_RealLiteral_1= ruleRealLiteral
+                    // InternalETPhys.g:1675:5: this_RealLiteral_1= ruleRealLiteral
                     {
-                    if ( state.backtracking==0 ) {
-                       
-                              newCompositeNode(grammarAccess.getNumberLiteralAccess().getRealLiteralParserRuleCall_1()); 
-                          
-                    }
-                    pushFollow(FOLLOW_ruleRealLiteral_in_ruleNumberLiteral3952);
+                     
+                            newCompositeNode(grammarAccess.getNumberLiteralAccess().getRealLiteralParserRuleCall_1()); 
+                        
+                    pushFollow(FOLLOW_2);
                     this_RealLiteral_1=ruleRealLiteral();
 
                     state._fsp--;
-                    if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
-                       
-                              current = this_RealLiteral_1; 
-                              afterParserOrEnumRuleCall();
-                          
-                    }
+
+                     
+                            current = this_RealLiteral_1; 
+                            afterParserOrEnumRuleCall();
+                        
 
                     }
                     break;
@@ -4723,9 +4273,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -4740,7 +4288,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleRealLiteral"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1691:1: entryRuleRealLiteral returns [EObject current=null] : iv_ruleRealLiteral= ruleRealLiteral EOF ;
+    // InternalETPhys.g:1691:1: entryRuleRealLiteral returns [EObject current=null] : iv_ruleRealLiteral= ruleRealLiteral EOF ;
     public final EObject entryRuleRealLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -4748,21 +4296,17 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1692:2: (iv_ruleRealLiteral= ruleRealLiteral EOF )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1693:2: iv_ruleRealLiteral= ruleRealLiteral EOF
+            // InternalETPhys.g:1692:2: (iv_ruleRealLiteral= ruleRealLiteral EOF )
+            // InternalETPhys.g:1693:2: iv_ruleRealLiteral= ruleRealLiteral EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getRealLiteralRule()); 
-            }
-            pushFollow(FOLLOW_ruleRealLiteral_in_entryRuleRealLiteral3987);
+             newCompositeNode(grammarAccess.getRealLiteralRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleRealLiteral=ruleRealLiteral();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleRealLiteral; 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRealLiteral3997); if (state.failed) return current;
+
+             current =iv_ruleRealLiteral; 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -4780,7 +4324,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleRealLiteral"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1700:1: ruleRealLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= ruleReal ) ) ) ;
+    // InternalETPhys.g:1700:1: ruleRealLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= ruleReal ) ) ) ;
     public final EObject ruleRealLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -4790,54 +4334,48 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1703:28: ( ( () ( (lv_value_1_0= ruleReal ) ) ) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1704:1: ( () ( (lv_value_1_0= ruleReal ) ) )
+            // InternalETPhys.g:1703:28: ( ( () ( (lv_value_1_0= ruleReal ) ) ) )
+            // InternalETPhys.g:1704:1: ( () ( (lv_value_1_0= ruleReal ) ) )
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1704:1: ( () ( (lv_value_1_0= ruleReal ) ) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1704:2: () ( (lv_value_1_0= ruleReal ) )
+            // InternalETPhys.g:1704:1: ( () ( (lv_value_1_0= ruleReal ) ) )
+            // InternalETPhys.g:1704:2: () ( (lv_value_1_0= ruleReal ) )
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1704:2: ()
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1705:5: 
+            // InternalETPhys.g:1704:2: ()
+            // InternalETPhys.g:1705:5: 
             {
-            if ( state.backtracking==0 ) {
 
-                      current = forceCreateModelElement(
-                          grammarAccess.getRealLiteralAccess().getRealLiteralAction_0(),
-                          current);
-                  
-            }
+                    current = forceCreateModelElement(
+                        grammarAccess.getRealLiteralAccess().getRealLiteralAction_0(),
+                        current);
+                
 
             }
 
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1710:2: ( (lv_value_1_0= ruleReal ) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1711:1: (lv_value_1_0= ruleReal )
+            // InternalETPhys.g:1710:2: ( (lv_value_1_0= ruleReal ) )
+            // InternalETPhys.g:1711:1: (lv_value_1_0= ruleReal )
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1711:1: (lv_value_1_0= ruleReal )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1712:3: lv_value_1_0= ruleReal
+            // InternalETPhys.g:1711:1: (lv_value_1_0= ruleReal )
+            // InternalETPhys.g:1712:3: lv_value_1_0= ruleReal
             {
-            if ( state.backtracking==0 ) {
-               
-              	        newCompositeNode(grammarAccess.getRealLiteralAccess().getValueRealParserRuleCall_1_0()); 
-              	    
-            }
-            pushFollow(FOLLOW_ruleReal_in_ruleRealLiteral4052);
+             
+            	        newCompositeNode(grammarAccess.getRealLiteralAccess().getValueRealParserRuleCall_1_0()); 
+            	    
+            pushFollow(FOLLOW_2);
             lv_value_1_0=ruleReal();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
 
-              	        if (current==null) {
-              	            current = createModelElementForParent(grammarAccess.getRealLiteralRule());
-              	        }
-                     		set(
-                     			current, 
-                     			"value",
-                      		lv_value_1_0, 
-                      		"Real");
-              	        afterParserOrEnumRuleCall();
-              	    
-            }
+
+            	        if (current==null) {
+            	            current = createModelElementForParent(grammarAccess.getRealLiteralRule());
+            	        }
+                   		set(
+                   			current, 
+                   			"value",
+                    		lv_value_1_0, 
+                    		"org.eclipse.etrice.core.common.Base.Real");
+            	        afterParserOrEnumRuleCall();
+            	    
 
             }
 
@@ -4850,9 +4388,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -4867,7 +4403,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleIntLiteral"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1736:1: entryRuleIntLiteral returns [EObject current=null] : iv_ruleIntLiteral= ruleIntLiteral EOF ;
+    // InternalETPhys.g:1736:1: entryRuleIntLiteral returns [EObject current=null] : iv_ruleIntLiteral= ruleIntLiteral EOF ;
     public final EObject entryRuleIntLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -4875,21 +4411,17 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1737:2: (iv_ruleIntLiteral= ruleIntLiteral EOF )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1738:2: iv_ruleIntLiteral= ruleIntLiteral EOF
+            // InternalETPhys.g:1737:2: (iv_ruleIntLiteral= ruleIntLiteral EOF )
+            // InternalETPhys.g:1738:2: iv_ruleIntLiteral= ruleIntLiteral EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getIntLiteralRule()); 
-            }
-            pushFollow(FOLLOW_ruleIntLiteral_in_entryRuleIntLiteral4088);
+             newCompositeNode(grammarAccess.getIntLiteralRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleIntLiteral=ruleIntLiteral();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleIntLiteral; 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIntLiteral4098); if (state.failed) return current;
+
+             current =iv_ruleIntLiteral; 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -4907,7 +4439,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleIntLiteral"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1745:1: ruleIntLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= ruleInteger ) ) ) ;
+    // InternalETPhys.g:1745:1: ruleIntLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= ruleInteger ) ) ) ;
     public final EObject ruleIntLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -4917,54 +4449,48 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1748:28: ( ( () ( (lv_value_1_0= ruleInteger ) ) ) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1749:1: ( () ( (lv_value_1_0= ruleInteger ) ) )
+            // InternalETPhys.g:1748:28: ( ( () ( (lv_value_1_0= ruleInteger ) ) ) )
+            // InternalETPhys.g:1749:1: ( () ( (lv_value_1_0= ruleInteger ) ) )
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1749:1: ( () ( (lv_value_1_0= ruleInteger ) ) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1749:2: () ( (lv_value_1_0= ruleInteger ) )
+            // InternalETPhys.g:1749:1: ( () ( (lv_value_1_0= ruleInteger ) ) )
+            // InternalETPhys.g:1749:2: () ( (lv_value_1_0= ruleInteger ) )
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1749:2: ()
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1750:5: 
+            // InternalETPhys.g:1749:2: ()
+            // InternalETPhys.g:1750:5: 
             {
-            if ( state.backtracking==0 ) {
 
-                      current = forceCreateModelElement(
-                          grammarAccess.getIntLiteralAccess().getIntLiteralAction_0(),
-                          current);
-                  
-            }
+                    current = forceCreateModelElement(
+                        grammarAccess.getIntLiteralAccess().getIntLiteralAction_0(),
+                        current);
+                
 
             }
 
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1755:2: ( (lv_value_1_0= ruleInteger ) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1756:1: (lv_value_1_0= ruleInteger )
+            // InternalETPhys.g:1755:2: ( (lv_value_1_0= ruleInteger ) )
+            // InternalETPhys.g:1756:1: (lv_value_1_0= ruleInteger )
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1756:1: (lv_value_1_0= ruleInteger )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1757:3: lv_value_1_0= ruleInteger
+            // InternalETPhys.g:1756:1: (lv_value_1_0= ruleInteger )
+            // InternalETPhys.g:1757:3: lv_value_1_0= ruleInteger
             {
-            if ( state.backtracking==0 ) {
-               
-              	        newCompositeNode(grammarAccess.getIntLiteralAccess().getValueIntegerParserRuleCall_1_0()); 
-              	    
-            }
-            pushFollow(FOLLOW_ruleInteger_in_ruleIntLiteral4153);
+             
+            	        newCompositeNode(grammarAccess.getIntLiteralAccess().getValueIntegerParserRuleCall_1_0()); 
+            	    
+            pushFollow(FOLLOW_2);
             lv_value_1_0=ruleInteger();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
 
-              	        if (current==null) {
-              	            current = createModelElementForParent(grammarAccess.getIntLiteralRule());
-              	        }
-                     		set(
-                     			current, 
-                     			"value",
-                      		lv_value_1_0, 
-                      		"Integer");
-              	        afterParserOrEnumRuleCall();
-              	    
-            }
+
+            	        if (current==null) {
+            	            current = createModelElementForParent(grammarAccess.getIntLiteralRule());
+            	        }
+                   		set(
+                   			current, 
+                   			"value",
+                    		lv_value_1_0, 
+                    		"org.eclipse.etrice.core.common.Base.Integer");
+            	        afterParserOrEnumRuleCall();
+            	    
 
             }
 
@@ -4977,9 +4503,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -4994,7 +4518,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleStringLiteral"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1781:1: entryRuleStringLiteral returns [EObject current=null] : iv_ruleStringLiteral= ruleStringLiteral EOF ;
+    // InternalETPhys.g:1781:1: entryRuleStringLiteral returns [EObject current=null] : iv_ruleStringLiteral= ruleStringLiteral EOF ;
     public final EObject entryRuleStringLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -5002,21 +4526,17 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1782:2: (iv_ruleStringLiteral= ruleStringLiteral EOF )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1783:2: iv_ruleStringLiteral= ruleStringLiteral EOF
+            // InternalETPhys.g:1782:2: (iv_ruleStringLiteral= ruleStringLiteral EOF )
+            // InternalETPhys.g:1783:2: iv_ruleStringLiteral= ruleStringLiteral EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getStringLiteralRule()); 
-            }
-            pushFollow(FOLLOW_ruleStringLiteral_in_entryRuleStringLiteral4189);
+             newCompositeNode(grammarAccess.getStringLiteralRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleStringLiteral=ruleStringLiteral();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleStringLiteral; 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleStringLiteral4199); if (state.failed) return current;
+
+             current =iv_ruleStringLiteral; 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -5034,7 +4554,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleStringLiteral"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1790:1: ruleStringLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= RULE_STRING ) ) ) ;
+    // InternalETPhys.g:1790:1: ruleStringLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= RULE_STRING ) ) ) ;
     public final EObject ruleStringLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -5043,49 +4563,43 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1793:28: ( ( () ( (lv_value_1_0= RULE_STRING ) ) ) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1794:1: ( () ( (lv_value_1_0= RULE_STRING ) ) )
+            // InternalETPhys.g:1793:28: ( ( () ( (lv_value_1_0= RULE_STRING ) ) ) )
+            // InternalETPhys.g:1794:1: ( () ( (lv_value_1_0= RULE_STRING ) ) )
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1794:1: ( () ( (lv_value_1_0= RULE_STRING ) ) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1794:2: () ( (lv_value_1_0= RULE_STRING ) )
+            // InternalETPhys.g:1794:1: ( () ( (lv_value_1_0= RULE_STRING ) ) )
+            // InternalETPhys.g:1794:2: () ( (lv_value_1_0= RULE_STRING ) )
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1794:2: ()
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1795:5: 
+            // InternalETPhys.g:1794:2: ()
+            // InternalETPhys.g:1795:5: 
             {
-            if ( state.backtracking==0 ) {
 
-                      current = forceCreateModelElement(
-                          grammarAccess.getStringLiteralAccess().getStringLiteralAction_0(),
-                          current);
-                  
-            }
+                    current = forceCreateModelElement(
+                        grammarAccess.getStringLiteralAccess().getStringLiteralAction_0(),
+                        current);
+                
 
             }
 
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1800:2: ( (lv_value_1_0= RULE_STRING ) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1801:1: (lv_value_1_0= RULE_STRING )
+            // InternalETPhys.g:1800:2: ( (lv_value_1_0= RULE_STRING ) )
+            // InternalETPhys.g:1801:1: (lv_value_1_0= RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1801:1: (lv_value_1_0= RULE_STRING )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1802:3: lv_value_1_0= RULE_STRING
+            // InternalETPhys.g:1801:1: (lv_value_1_0= RULE_STRING )
+            // InternalETPhys.g:1802:3: lv_value_1_0= RULE_STRING
             {
-            lv_value_1_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleStringLiteral4250); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            lv_value_1_0=(Token)match(input,RULE_STRING,FOLLOW_2); 
 
-              			newLeafNode(lv_value_1_0, grammarAccess.getStringLiteralAccess().getValueSTRINGTerminalRuleCall_1_0()); 
-              		
-            }
-            if ( state.backtracking==0 ) {
+            			newLeafNode(lv_value_1_0, grammarAccess.getStringLiteralAccess().getValueSTRINGTerminalRuleCall_1_0()); 
+            		
 
-              	        if (current==null) {
-              	            current = createModelElement(grammarAccess.getStringLiteralRule());
-              	        }
-                     		setWithLastConsumed(
-                     			current, 
-                     			"value",
-                      		lv_value_1_0, 
-                      		"STRING");
-              	    
-            }
+            	        if (current==null) {
+            	            current = createModelElement(grammarAccess.getStringLiteralRule());
+            	        }
+                   		setWithLastConsumed(
+                   			current, 
+                   			"value",
+                    		lv_value_1_0, 
+                    		"org.eclipse.xtext.common.Terminals.STRING");
+            	    
 
             }
 
@@ -5098,9 +4612,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -5115,7 +4627,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleInteger"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1826:1: entryRuleInteger returns [String current=null] : iv_ruleInteger= ruleInteger EOF ;
+    // InternalETPhys.g:1826:1: entryRuleInteger returns [String current=null] : iv_ruleInteger= ruleInteger EOF ;
     public final String entryRuleInteger() throws RecognitionException {
         String current = null;
 
@@ -5123,21 +4635,17 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1827:2: (iv_ruleInteger= ruleInteger EOF )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1828:2: iv_ruleInteger= ruleInteger EOF
+            // InternalETPhys.g:1827:2: (iv_ruleInteger= ruleInteger EOF )
+            // InternalETPhys.g:1828:2: iv_ruleInteger= ruleInteger EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getIntegerRule()); 
-            }
-            pushFollow(FOLLOW_ruleInteger_in_entryRuleInteger4292);
+             newCompositeNode(grammarAccess.getIntegerRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleInteger=ruleInteger();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleInteger.getText(); 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleInteger4303); if (state.failed) return current;
+
+             current =iv_ruleInteger.getText(); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -5155,7 +4663,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleInteger"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1835:1: ruleInteger returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT ) | this_HEX_3= RULE_HEX ) ;
+    // InternalETPhys.g:1835: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();
 
@@ -5166,10 +4674,10 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1838:28: ( ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT ) | this_HEX_3= RULE_HEX ) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1839:1: ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT ) | this_HEX_3= RULE_HEX )
+            // InternalETPhys.g:1838:28: ( ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT ) | this_HEX_3= RULE_HEX ) )
+            // InternalETPhys.g:1839:1: ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT ) | this_HEX_3= RULE_HEX )
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1839:1: ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT ) | this_HEX_3= RULE_HEX )
+            // InternalETPhys.g:1839:1: ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT ) | this_HEX_3= RULE_HEX )
             int alt24=2;
             int LA24_0 = input.LA(1);
 
@@ -5180,7 +4688,6 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                 alt24=2;
             }
             else {
-                if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
                     new NoViableAltException("", 24, 0, input);
 
@@ -5188,12 +4695,12 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
             }
             switch (alt24) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1839:2: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT )
+                    // InternalETPhys.g:1839:2: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT )
                     {
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1839:2: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT )
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1839:3: (kw= '+' | kw= '-' )? this_INT_2= RULE_INT
+                    // InternalETPhys.g:1839:2: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT )
+                    // InternalETPhys.g:1839:3: (kw= '+' | kw= '-' )? this_INT_2= RULE_INT
                     {
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1839:3: (kw= '+' | kw= '-' )?
+                    // InternalETPhys.g:1839:3: (kw= '+' | kw= '-' )?
                     int alt23=3;
                     int LA23_0 = input.LA(1);
 
@@ -5205,45 +4712,37 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                     }
                     switch (alt23) {
                         case 1 :
-                            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1840:2: kw= '+'
+                            // InternalETPhys.g:1840:2: kw= '+'
                             {
-                            kw=(Token)match(input,48,FOLLOW_48_in_ruleInteger4343); if (state.failed) return current;
-                            if ( state.backtracking==0 ) {
+                            kw=(Token)match(input,48,FOLLOW_19); 
 
-                                      current.merge(kw);
-                                      newLeafNode(kw, grammarAccess.getIntegerAccess().getPlusSignKeyword_0_0_0()); 
-                                  
-                            }
+                                    current.merge(kw);
+                                    newLeafNode(kw, grammarAccess.getIntegerAccess().getPlusSignKeyword_0_0_0()); 
+                                
 
                             }
                             break;
                         case 2 :
-                            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1847:2: kw= '-'
+                            // InternalETPhys.g:1847:2: kw= '-'
                             {
-                            kw=(Token)match(input,49,FOLLOW_49_in_ruleInteger4362); if (state.failed) return current;
-                            if ( state.backtracking==0 ) {
+                            kw=(Token)match(input,49,FOLLOW_19); 
 
-                                      current.merge(kw);
-                                      newLeafNode(kw, grammarAccess.getIntegerAccess().getHyphenMinusKeyword_0_0_1()); 
-                                  
-                            }
+                                    current.merge(kw);
+                                    newLeafNode(kw, grammarAccess.getIntegerAccess().getHyphenMinusKeyword_0_0_1()); 
+                                
 
                             }
                             break;
 
                     }
 
-                    this_INT_2=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleInteger4379); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    this_INT_2=(Token)match(input,RULE_INT,FOLLOW_2); 
 
-                      		current.merge(this_INT_2);
-                          
-                    }
-                    if ( state.backtracking==0 ) {
-                       
-                          newLeafNode(this_INT_2, grammarAccess.getIntegerAccess().getINTTerminalRuleCall_0_1()); 
-                          
-                    }
+                    		current.merge(this_INT_2);
+                        
+                     
+                        newLeafNode(this_INT_2, grammarAccess.getIntegerAccess().getINTTerminalRuleCall_0_1()); 
+                        
 
                     }
 
@@ -5251,19 +4750,15 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1860:10: this_HEX_3= RULE_HEX
+                    // InternalETPhys.g:1860:10: this_HEX_3= RULE_HEX
                     {
-                    this_HEX_3=(Token)match(input,RULE_HEX,FOLLOW_RULE_HEX_in_ruleInteger4406); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    this_HEX_3=(Token)match(input,RULE_HEX,FOLLOW_2); 
 
-                      		current.merge(this_HEX_3);
-                          
-                    }
-                    if ( state.backtracking==0 ) {
-                       
-                          newLeafNode(this_HEX_3, grammarAccess.getIntegerAccess().getHEXTerminalRuleCall_1()); 
-                          
-                    }
+                    		current.merge(this_HEX_3);
+                        
+                     
+                        newLeafNode(this_HEX_3, grammarAccess.getIntegerAccess().getHEXTerminalRuleCall_1()); 
+                        
 
                     }
                     break;
@@ -5273,9 +4768,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -5290,7 +4783,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleReal"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1875:1: entryRuleReal returns [String current=null] : iv_ruleReal= ruleReal EOF ;
+    // InternalETPhys.g:1875:1: entryRuleReal returns [String current=null] : iv_ruleReal= ruleReal EOF ;
     public final String entryRuleReal() throws RecognitionException {
         String current = null;
 
@@ -5298,21 +4791,17 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1876:2: (iv_ruleReal= ruleReal EOF )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1877:2: iv_ruleReal= ruleReal EOF
+            // InternalETPhys.g:1876:2: (iv_ruleReal= ruleReal EOF )
+            // InternalETPhys.g:1877:2: iv_ruleReal= ruleReal EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getRealRule()); 
-            }
-            pushFollow(FOLLOW_ruleReal_in_entryRuleReal4452);
+             newCompositeNode(grammarAccess.getRealRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleReal=ruleReal();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleReal.getText(); 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleReal4463); if (state.failed) return current;
+
+             current =iv_ruleReal.getText(); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -5330,7 +4819,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleReal"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1884:1: ruleReal returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_Decimal_0= ruleDecimal | this_DecimalExp_1= ruleDecimalExp ) ;
+    // InternalETPhys.g:1884: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();
 
@@ -5342,10 +4831,10 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1887:28: ( (this_Decimal_0= ruleDecimal | this_DecimalExp_1= ruleDecimalExp ) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1888:1: (this_Decimal_0= ruleDecimal | this_DecimalExp_1= ruleDecimalExp )
+            // InternalETPhys.g:1887:28: ( (this_Decimal_0= ruleDecimal | this_DecimalExp_1= ruleDecimalExp ) )
+            // InternalETPhys.g:1888:1: (this_Decimal_0= ruleDecimal | this_DecimalExp_1= ruleDecimalExp )
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1888:1: (this_Decimal_0= ruleDecimal | this_DecimalExp_1= ruleDecimalExp )
+            // InternalETPhys.g:1888:1: (this_Decimal_0= ruleDecimal | this_DecimalExp_1= ruleDecimalExp )
             int alt25=2;
             switch ( input.LA(1) ) {
             case 48:
@@ -5368,7 +4857,6 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                                 alt25=2;
                             }
                             else {
-                                if (state.backtracking>0) {state.failed=true; return current;}
                                 NoViableAltException nvae =
                                     new NoViableAltException("", 25, 5, input);
 
@@ -5376,7 +4864,6 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                             }
                         }
                         else {
-                            if (state.backtracking>0) {state.failed=true; return current;}
                             NoViableAltException nvae =
                                 new NoViableAltException("", 25, 4, input);
 
@@ -5384,7 +4871,6 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                         }
                     }
                     else {
-                        if (state.backtracking>0) {state.failed=true; return current;}
                         NoViableAltException nvae =
                             new NoViableAltException("", 25, 3, input);
 
@@ -5392,7 +4878,6 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                     }
                 }
                 else {
-                    if (state.backtracking>0) {state.failed=true; return current;}
                     NoViableAltException nvae =
                         new NoViableAltException("", 25, 1, input);
 
@@ -5420,7 +4905,6 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                                 alt25=2;
                             }
                             else {
-                                if (state.backtracking>0) {state.failed=true; return current;}
                                 NoViableAltException nvae =
                                     new NoViableAltException("", 25, 5, input);
 
@@ -5428,7 +4912,6 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                             }
                         }
                         else {
-                            if (state.backtracking>0) {state.failed=true; return current;}
                             NoViableAltException nvae =
                                 new NoViableAltException("", 25, 4, input);
 
@@ -5436,7 +4919,6 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                         }
                     }
                     else {
-                        if (state.backtracking>0) {state.failed=true; return current;}
                         NoViableAltException nvae =
                             new NoViableAltException("", 25, 3, input);
 
@@ -5444,7 +4926,6 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                     }
                 }
                 else {
-                    if (state.backtracking>0) {state.failed=true; return current;}
                     NoViableAltException nvae =
                         new NoViableAltException("", 25, 2, input);
 
@@ -5469,7 +4950,6 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                             alt25=2;
                         }
                         else {
-                            if (state.backtracking>0) {state.failed=true; return current;}
                             NoViableAltException nvae =
                                 new NoViableAltException("", 25, 5, input);
 
@@ -5477,7 +4957,6 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                         }
                     }
                     else {
-                        if (state.backtracking>0) {state.failed=true; return current;}
                         NoViableAltException nvae =
                             new NoViableAltException("", 25, 4, input);
 
@@ -5485,7 +4964,6 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                     }
                 }
                 else {
-                    if (state.backtracking>0) {state.failed=true; return current;}
                     NoViableAltException nvae =
                         new NoViableAltException("", 25, 3, input);
 
@@ -5494,7 +4972,6 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                 }
                 break;
             default:
-                if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
                     new NoViableAltException("", 25, 0, input);
 
@@ -5503,54 +4980,42 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
             switch (alt25) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1889:5: this_Decimal_0= ruleDecimal
+                    // InternalETPhys.g:1889:5: this_Decimal_0= ruleDecimal
                     {
-                    if ( state.backtracking==0 ) {
-                       
-                              newCompositeNode(grammarAccess.getRealAccess().getDecimalParserRuleCall_0()); 
-                          
-                    }
-                    pushFollow(FOLLOW_ruleDecimal_in_ruleReal4510);
+                     
+                            newCompositeNode(grammarAccess.getRealAccess().getDecimalParserRuleCall_0()); 
+                        
+                    pushFollow(FOLLOW_2);
                     this_Decimal_0=ruleDecimal();
 
                     state._fsp--;
-                    if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
 
-                      		current.merge(this_Decimal_0);
-                          
-                    }
-                    if ( state.backtracking==0 ) {
-                       
-                              afterParserOrEnumRuleCall();
-                          
-                    }
+
+                    		current.merge(this_Decimal_0);
+                        
+                     
+                            afterParserOrEnumRuleCall();
+                        
 
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1901:5: this_DecimalExp_1= ruleDecimalExp
+                    // InternalETPhys.g:1901:5: this_DecimalExp_1= ruleDecimalExp
                     {
-                    if ( state.backtracking==0 ) {
-                       
-                              newCompositeNode(grammarAccess.getRealAccess().getDecimalExpParserRuleCall_1()); 
-                          
-                    }
-                    pushFollow(FOLLOW_ruleDecimalExp_in_ruleReal4543);
+                     
+                            newCompositeNode(grammarAccess.getRealAccess().getDecimalExpParserRuleCall_1()); 
+                        
+                    pushFollow(FOLLOW_2);
                     this_DecimalExp_1=ruleDecimalExp();
 
                     state._fsp--;
-                    if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
 
-                      		current.merge(this_DecimalExp_1);
-                          
-                    }
-                    if ( state.backtracking==0 ) {
-                       
-                              afterParserOrEnumRuleCall();
-                          
-                    }
+
+                    		current.merge(this_DecimalExp_1);
+                        
+                     
+                            afterParserOrEnumRuleCall();
+                        
 
                     }
                     break;
@@ -5560,9 +5025,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -5577,7 +5040,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleDecimal"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1919:1: entryRuleDecimal returns [String current=null] : iv_ruleDecimal= ruleDecimal EOF ;
+    // InternalETPhys.g:1919:1: entryRuleDecimal returns [String current=null] : iv_ruleDecimal= ruleDecimal EOF ;
     public final String entryRuleDecimal() throws RecognitionException {
         String current = null;
 
@@ -5588,21 +5051,17 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
         	
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1923:2: (iv_ruleDecimal= ruleDecimal EOF )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1924:2: iv_ruleDecimal= ruleDecimal EOF
+            // InternalETPhys.g:1923:2: (iv_ruleDecimal= ruleDecimal EOF )
+            // InternalETPhys.g:1924:2: iv_ruleDecimal= ruleDecimal EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getDecimalRule()); 
-            }
-            pushFollow(FOLLOW_ruleDecimal_in_entryRuleDecimal4595);
+             newCompositeNode(grammarAccess.getDecimalRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleDecimal=ruleDecimal();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleDecimal.getText(); 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDecimal4606); if (state.failed) return current;
+
+             current =iv_ruleDecimal.getText(); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -5623,7 +5082,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleDecimal"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1934:1: ruleDecimal returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT ) ;
+    // InternalETPhys.g:1934: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();
 
@@ -5635,13 +5094,13 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
             
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1938:28: ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT ) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1939:1: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT )
+            // InternalETPhys.g:1938:28: ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT ) )
+            // InternalETPhys.g:1939:1: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT )
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1939:1: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1939:2: (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT
+            // InternalETPhys.g:1939:1: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT )
+            // InternalETPhys.g:1939:2: (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1939:2: (kw= '+' | kw= '-' )?
+            // InternalETPhys.g:1939:2: (kw= '+' | kw= '-' )?
             int alt26=3;
             int LA26_0 = input.LA(1);
 
@@ -5653,72 +5112,56 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
             }
             switch (alt26) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1940:2: kw= '+'
+                    // InternalETPhys.g:1940:2: kw= '+'
                     {
-                    kw=(Token)match(input,48,FOLLOW_48_in_ruleDecimal4649); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    kw=(Token)match(input,48,FOLLOW_19); 
 
-                              current.merge(kw);
-                              newLeafNode(kw, grammarAccess.getDecimalAccess().getPlusSignKeyword_0_0()); 
-                          
-                    }
+                            current.merge(kw);
+                            newLeafNode(kw, grammarAccess.getDecimalAccess().getPlusSignKeyword_0_0()); 
+                        
 
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1947:2: kw= '-'
+                    // InternalETPhys.g:1947:2: kw= '-'
                     {
-                    kw=(Token)match(input,49,FOLLOW_49_in_ruleDecimal4668); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    kw=(Token)match(input,49,FOLLOW_19); 
 
-                              current.merge(kw);
-                              newLeafNode(kw, grammarAccess.getDecimalAccess().getHyphenMinusKeyword_0_1()); 
-                          
-                    }
+                            current.merge(kw);
+                            newLeafNode(kw, grammarAccess.getDecimalAccess().getHyphenMinusKeyword_0_1()); 
+                        
 
                     }
                     break;
 
             }
 
-            this_INT_2=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleDecimal4685); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            this_INT_2=(Token)match(input,RULE_INT,FOLLOW_36); 
 
-              		current.merge(this_INT_2);
-                  
-            }
-            if ( state.backtracking==0 ) {
-               
-                  newLeafNode(this_INT_2, grammarAccess.getDecimalAccess().getINTTerminalRuleCall_1()); 
-                  
-            }
-            kw=(Token)match(input,50,FOLLOW_50_in_ruleDecimal4703); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            		current.merge(this_INT_2);
+                
+             
+                newLeafNode(this_INT_2, grammarAccess.getDecimalAccess().getINTTerminalRuleCall_1()); 
+                
+            kw=(Token)match(input,50,FOLLOW_19); 
 
-                      current.merge(kw);
-                      newLeafNode(kw, grammarAccess.getDecimalAccess().getFullStopKeyword_2()); 
-                  
-            }
-            this_INT_4=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleDecimal4718); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+                    current.merge(kw);
+                    newLeafNode(kw, grammarAccess.getDecimalAccess().getFullStopKeyword_2()); 
+                
+            this_INT_4=(Token)match(input,RULE_INT,FOLLOW_2); 
 
-              		current.merge(this_INT_4);
-                  
-            }
-            if ( state.backtracking==0 ) {
-               
-                  newLeafNode(this_INT_4, grammarAccess.getDecimalAccess().getINTTerminalRuleCall_3()); 
-                  
-            }
+            		current.merge(this_INT_4);
+                
+             
+                newLeafNode(this_INT_4, grammarAccess.getDecimalAccess().getINTTerminalRuleCall_3()); 
+                
 
             }
 
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -5736,7 +5179,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleDecimalExp"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1983:1: entryRuleDecimalExp returns [String current=null] : iv_ruleDecimalExp= ruleDecimalExp EOF ;
+    // InternalETPhys.g:1983:1: entryRuleDecimalExp returns [String current=null] : iv_ruleDecimalExp= ruleDecimalExp EOF ;
     public final String entryRuleDecimalExp() throws RecognitionException {
         String current = null;
 
@@ -5747,21 +5190,17 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
         	
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1987:2: (iv_ruleDecimalExp= ruleDecimalExp EOF )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1988:2: iv_ruleDecimalExp= ruleDecimalExp EOF
+            // InternalETPhys.g:1987:2: (iv_ruleDecimalExp= ruleDecimalExp EOF )
+            // InternalETPhys.g:1988:2: iv_ruleDecimalExp= ruleDecimalExp EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getDecimalExpRule()); 
-            }
-            pushFollow(FOLLOW_ruleDecimalExp_in_entryRuleDecimalExp4774);
+             newCompositeNode(grammarAccess.getDecimalExpRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleDecimalExp=ruleDecimalExp();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleDecimalExp.getText(); 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDecimalExp4785); if (state.failed) return current;
+
+             current =iv_ruleDecimalExp.getText(); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -5782,7 +5221,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleDecimalExp"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:1998: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= '-' )? ( ( RULE_INT )=>this_INT_9= RULE_INT ) ) ;
+    // InternalETPhys.g:1998: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();
 
@@ -5795,13 +5234,13 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
             
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2002:28: ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT (kw= 'e' | kw= 'E' ) (kw= '+' | kw= '-' )? ( ( RULE_INT )=>this_INT_9= RULE_INT ) ) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2003:1: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT (kw= 'e' | kw= 'E' ) (kw= '+' | kw= '-' )? ( ( RULE_INT )=>this_INT_9= RULE_INT ) )
+            // InternalETPhys.g:2002: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 ) )
+            // InternalETPhys.g:2003: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.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2003:1: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT (kw= 'e' | kw= 'E' ) (kw= '+' | kw= '-' )? ( ( RULE_INT )=>this_INT_9= RULE_INT ) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2003:2: (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT (kw= 'e' | kw= 'E' ) (kw= '+' | kw= '-' )? ( ( RULE_INT )=>this_INT_9= RULE_INT )
+            // InternalETPhys.g:2003: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 )
+            // InternalETPhys.g:2003: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.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2003:2: (kw= '+' | kw= '-' )?
+            // InternalETPhys.g:2003:2: (kw= '+' | kw= '-' )?
             int alt27=3;
             int LA27_0 = input.LA(1);
 
@@ -5813,64 +5252,50 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
             }
             switch (alt27) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2004:2: kw= '+'
+                    // InternalETPhys.g:2004:2: kw= '+'
                     {
-                    kw=(Token)match(input,48,FOLLOW_48_in_ruleDecimalExp4828); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    kw=(Token)match(input,48,FOLLOW_19); 
 
-                              current.merge(kw);
-                              newLeafNode(kw, grammarAccess.getDecimalExpAccess().getPlusSignKeyword_0_0()); 
-                          
-                    }
+                            current.merge(kw);
+                            newLeafNode(kw, grammarAccess.getDecimalExpAccess().getPlusSignKeyword_0_0()); 
+                        
 
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2011:2: kw= '-'
+                    // InternalETPhys.g:2011:2: kw= '-'
                     {
-                    kw=(Token)match(input,49,FOLLOW_49_in_ruleDecimalExp4847); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    kw=(Token)match(input,49,FOLLOW_19); 
 
-                              current.merge(kw);
-                              newLeafNode(kw, grammarAccess.getDecimalExpAccess().getHyphenMinusKeyword_0_1()); 
-                          
-                    }
+                            current.merge(kw);
+                            newLeafNode(kw, grammarAccess.getDecimalExpAccess().getHyphenMinusKeyword_0_1()); 
+                        
 
                     }
                     break;
 
             }
 
-            this_INT_2=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleDecimalExp4864); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            this_INT_2=(Token)match(input,RULE_INT,FOLLOW_36); 
 
-              		current.merge(this_INT_2);
-                  
-            }
-            if ( state.backtracking==0 ) {
-               
-                  newLeafNode(this_INT_2, grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_1()); 
-                  
-            }
-            kw=(Token)match(input,50,FOLLOW_50_in_ruleDecimalExp4882); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            		current.merge(this_INT_2);
+                
+             
+                newLeafNode(this_INT_2, grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_1()); 
+                
+            kw=(Token)match(input,50,FOLLOW_19); 
 
-                      current.merge(kw);
-                      newLeafNode(kw, grammarAccess.getDecimalExpAccess().getFullStopKeyword_2()); 
-                  
-            }
-            this_INT_4=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleDecimalExp4897); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+                    current.merge(kw);
+                    newLeafNode(kw, grammarAccess.getDecimalExpAccess().getFullStopKeyword_2()); 
+                
+            this_INT_4=(Token)match(input,RULE_INT,FOLLOW_37); 
 
-              		current.merge(this_INT_4);
-                  
-            }
-            if ( state.backtracking==0 ) {
-               
-                  newLeafNode(this_INT_4, grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_3()); 
-                  
-            }
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2036:1: (kw= 'e' | kw= 'E' )
+            		current.merge(this_INT_4);
+                
+             
+                newLeafNode(this_INT_4, grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_3()); 
+                
+            // InternalETPhys.g:2036:1: (kw= 'e' | kw= 'E' )
             int alt28=2;
             int LA28_0 = input.LA(1);
 
@@ -5881,7 +5306,6 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                 alt28=2;
             }
             else {
-                if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
                     new NoViableAltException("", 28, 0, input);
 
@@ -5889,35 +5313,31 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
             }
             switch (alt28) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2037:2: kw= 'e'
+                    // InternalETPhys.g:2037:2: kw= 'e'
                     {
-                    kw=(Token)match(input,51,FOLLOW_51_in_ruleDecimalExp4916); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    kw=(Token)match(input,51,FOLLOW_38); 
 
-                              current.merge(kw);
-                              newLeafNode(kw, grammarAccess.getDecimalExpAccess().getEKeyword_4_0()); 
-                          
-                    }
+                            current.merge(kw);
+                            newLeafNode(kw, grammarAccess.getDecimalExpAccess().getEKeyword_4_0()); 
+                        
 
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2044:2: kw= 'E'
+                    // InternalETPhys.g:2044:2: kw= 'E'
                     {
-                    kw=(Token)match(input,52,FOLLOW_52_in_ruleDecimalExp4935); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    kw=(Token)match(input,52,FOLLOW_38); 
 
-                              current.merge(kw);
-                              newLeafNode(kw, grammarAccess.getDecimalExpAccess().getEKeyword_4_1()); 
-                          
-                    }
+                            current.merge(kw);
+                            newLeafNode(kw, grammarAccess.getDecimalExpAccess().getEKeyword_4_1()); 
+                        
 
                     }
                     break;
 
             }
 
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2049:2: (kw= '+' | kw= '-' )?
+            // InternalETPhys.g:2049:2: (kw= '+' | kw= '-' )?
             int alt29=3;
             int LA29_0 = input.LA(1);
 
@@ -5929,60 +5349,44 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
             }
             switch (alt29) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2050:2: kw= '+'
+                    // InternalETPhys.g:2050:2: kw= '+'
                     {
-                    kw=(Token)match(input,48,FOLLOW_48_in_ruleDecimalExp4950); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    kw=(Token)match(input,48,FOLLOW_19); 
 
-                              current.merge(kw);
-                              newLeafNode(kw, grammarAccess.getDecimalExpAccess().getPlusSignKeyword_5_0()); 
-                          
-                    }
+                            current.merge(kw);
+                            newLeafNode(kw, grammarAccess.getDecimalExpAccess().getPlusSignKeyword_5_0()); 
+                        
 
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2057:2: kw= '-'
+                    // InternalETPhys.g:2057:2: kw= '-'
                     {
-                    kw=(Token)match(input,49,FOLLOW_49_in_ruleDecimalExp4969); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    kw=(Token)match(input,49,FOLLOW_19); 
 
-                              current.merge(kw);
-                              newLeafNode(kw, grammarAccess.getDecimalExpAccess().getHyphenMinusKeyword_5_1()); 
-                          
-                    }
+                            current.merge(kw);
+                            newLeafNode(kw, grammarAccess.getDecimalExpAccess().getHyphenMinusKeyword_5_1()); 
+                        
 
                     }
                     break;
 
             }
 
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2062:3: ( ( RULE_INT )=>this_INT_9= RULE_INT )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2062:4: ( RULE_INT )=>this_INT_9= RULE_INT
-            {
-            this_INT_9=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleDecimalExp4992); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-
-              		current.merge(this_INT_9);
-                  
-            }
-            if ( state.backtracking==0 ) {
-               
-                  newLeafNode(this_INT_9, grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_6()); 
-                  
-            }
-
-            }
+            this_INT_9=(Token)match(input,RULE_INT,FOLLOW_2); 
 
+            		current.merge(this_INT_9);
+                
+             
+                newLeafNode(this_INT_9, grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_6()); 
+                
 
             }
 
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -6000,7 +5404,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleFQN"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2080:1: entryRuleFQN returns [String current=null] : iv_ruleFQN= ruleFQN EOF ;
+    // InternalETPhys.g:2080:1: entryRuleFQN returns [String current=null] : iv_ruleFQN= ruleFQN EOF ;
     public final String entryRuleFQN() throws RecognitionException {
         String current = null;
 
@@ -6008,21 +5412,17 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2081:2: (iv_ruleFQN= ruleFQN EOF )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2082:2: iv_ruleFQN= ruleFQN EOF
+            // InternalETPhys.g:2081:2: (iv_ruleFQN= ruleFQN EOF )
+            // InternalETPhys.g:2082:2: iv_ruleFQN= ruleFQN EOF
             {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getFQNRule()); 
-            }
-            pushFollow(FOLLOW_ruleFQN_in_entryRuleFQN5043);
+             newCompositeNode(grammarAccess.getFQNRule()); 
+            pushFollow(FOLLOW_1);
             iv_ruleFQN=ruleFQN();
 
             state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleFQN.getText(); 
-            }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleFQN5054); if (state.failed) return current;
+
+             current =iv_ruleFQN.getText(); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -6040,7 +5440,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleFQN"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2089:1: ruleFQN returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* ) ;
+    // InternalETPhys.g:2089: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();
 
@@ -6051,24 +5451,20 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2092:28: ( (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* ) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2093:1: (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* )
+            // InternalETPhys.g:2092:28: ( (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* ) )
+            // InternalETPhys.g:2093:1: (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* )
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2093:1: (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2093:6: this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )*
+            // InternalETPhys.g:2093:1: (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* )
+            // InternalETPhys.g:2093:6: this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )*
             {
-            this_ID_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFQN5094); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
+            this_ID_0=(Token)match(input,RULE_ID,FOLLOW_39); 
 
-              		current.merge(this_ID_0);
-                  
-            }
-            if ( state.backtracking==0 ) {
-               
-                  newLeafNode(this_ID_0, grammarAccess.getFQNAccess().getIDTerminalRuleCall_0()); 
-                  
-            }
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2100:1: (kw= '.' this_ID_2= RULE_ID )*
+            		current.merge(this_ID_0);
+                
+             
+                newLeafNode(this_ID_0, grammarAccess.getFQNAccess().getIDTerminalRuleCall_0()); 
+                
+            // InternalETPhys.g:2100:1: (kw= '.' this_ID_2= RULE_ID )*
             loop30:
             do {
                 int alt30=2;
@@ -6081,26 +5477,20 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
                 switch (alt30) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2101:2: kw= '.' this_ID_2= RULE_ID
+            	    // InternalETPhys.g:2101:2: kw= '.' this_ID_2= RULE_ID
             	    {
-            	    kw=(Token)match(input,50,FOLLOW_50_in_ruleFQN5113); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
+            	    kw=(Token)match(input,50,FOLLOW_3); 
 
-            	              current.merge(kw);
-            	              newLeafNode(kw, grammarAccess.getFQNAccess().getFullStopKeyword_1_0()); 
-            	          
-            	    }
-            	    this_ID_2=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFQN5128); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
+            	            current.merge(kw);
+            	            newLeafNode(kw, grammarAccess.getFQNAccess().getFullStopKeyword_1_0()); 
+            	        
+            	    this_ID_2=(Token)match(input,RULE_ID,FOLLOW_39); 
 
-            	      		current.merge(this_ID_2);
-            	          
-            	    }
-            	    if ( state.backtracking==0 ) {
-            	       
-            	          newLeafNode(this_ID_2, grammarAccess.getFQNAccess().getIDTerminalRuleCall_1_1()); 
-            	          
-            	    }
+            	    		current.merge(this_ID_2);
+            	        
+            	     
+            	        newLeafNode(this_ID_2, grammarAccess.getFQNAccess().getIDTerminalRuleCall_1_1()); 
+            	        
 
             	    }
             	    break;
@@ -6116,9 +5506,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -6133,7 +5521,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleExecMode"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2121:1: ruleExecMode returns [Enumerator current=null] : ( (enumLiteral_0= 'polled' ) | (enumLiteral_1= 'blocked' ) | (enumLiteral_2= 'mixed' ) ) ;
+    // InternalETPhys.g:2121:1: ruleExecMode returns [Enumerator current=null] : ( (enumLiteral_0= 'polled' ) | (enumLiteral_1= 'blocked' ) | (enumLiteral_2= 'mixed' ) ) ;
     public final Enumerator ruleExecMode() throws RecognitionException {
         Enumerator current = null;
 
@@ -6143,10 +5531,10 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
          enterRule(); 
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2123:28: ( ( (enumLiteral_0= 'polled' ) | (enumLiteral_1= 'blocked' ) | (enumLiteral_2= 'mixed' ) ) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2124:1: ( (enumLiteral_0= 'polled' ) | (enumLiteral_1= 'blocked' ) | (enumLiteral_2= 'mixed' ) )
+            // InternalETPhys.g:2123:28: ( ( (enumLiteral_0= 'polled' ) | (enumLiteral_1= 'blocked' ) | (enumLiteral_2= 'mixed' ) ) )
+            // InternalETPhys.g:2124:1: ( (enumLiteral_0= 'polled' ) | (enumLiteral_1= 'blocked' ) | (enumLiteral_2= 'mixed' ) )
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2124:1: ( (enumLiteral_0= 'polled' ) | (enumLiteral_1= 'blocked' ) | (enumLiteral_2= 'mixed' ) )
+            // InternalETPhys.g:2124:1: ( (enumLiteral_0= 'polled' ) | (enumLiteral_1= 'blocked' ) | (enumLiteral_2= 'mixed' ) )
             int alt31=3;
             switch ( input.LA(1) ) {
             case 53:
@@ -6165,7 +5553,6 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                 }
                 break;
             default:
-                if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
                     new NoViableAltException("", 31, 0, input);
 
@@ -6174,18 +5561,16 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
             switch (alt31) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2124:2: (enumLiteral_0= 'polled' )
+                    // InternalETPhys.g:2124:2: (enumLiteral_0= 'polled' )
                     {
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2124:2: (enumLiteral_0= 'polled' )
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2124:4: enumLiteral_0= 'polled'
+                    // InternalETPhys.g:2124:2: (enumLiteral_0= 'polled' )
+                    // InternalETPhys.g:2124:4: enumLiteral_0= 'polled'
                     {
-                    enumLiteral_0=(Token)match(input,53,FOLLOW_53_in_ruleExecMode5189); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    enumLiteral_0=(Token)match(input,53,FOLLOW_2); 
 
-                              current = grammarAccess.getExecModeAccess().getPOLLEDEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
-                              newLeafNode(enumLiteral_0, grammarAccess.getExecModeAccess().getPOLLEDEnumLiteralDeclaration_0()); 
-                          
-                    }
+                            current = grammarAccess.getExecModeAccess().getPOLLEDEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
+                            newLeafNode(enumLiteral_0, grammarAccess.getExecModeAccess().getPOLLEDEnumLiteralDeclaration_0()); 
+                        
 
                     }
 
@@ -6193,18 +5578,16 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2130:6: (enumLiteral_1= 'blocked' )
+                    // InternalETPhys.g:2130:6: (enumLiteral_1= 'blocked' )
                     {
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2130:6: (enumLiteral_1= 'blocked' )
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2130:8: enumLiteral_1= 'blocked'
+                    // InternalETPhys.g:2130:6: (enumLiteral_1= 'blocked' )
+                    // InternalETPhys.g:2130:8: enumLiteral_1= 'blocked'
                     {
-                    enumLiteral_1=(Token)match(input,54,FOLLOW_54_in_ruleExecMode5206); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    enumLiteral_1=(Token)match(input,54,FOLLOW_2); 
 
-                              current = grammarAccess.getExecModeAccess().getBLOCKEDEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
-                              newLeafNode(enumLiteral_1, grammarAccess.getExecModeAccess().getBLOCKEDEnumLiteralDeclaration_1()); 
-                          
-                    }
+                            current = grammarAccess.getExecModeAccess().getBLOCKEDEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
+                            newLeafNode(enumLiteral_1, grammarAccess.getExecModeAccess().getBLOCKEDEnumLiteralDeclaration_1()); 
+                        
 
                     }
 
@@ -6212,18 +5595,16 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2136:6: (enumLiteral_2= 'mixed' )
+                    // InternalETPhys.g:2136:6: (enumLiteral_2= 'mixed' )
                     {
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2136:6: (enumLiteral_2= 'mixed' )
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2136:8: enumLiteral_2= 'mixed'
+                    // InternalETPhys.g:2136:6: (enumLiteral_2= 'mixed' )
+                    // InternalETPhys.g:2136:8: enumLiteral_2= 'mixed'
                     {
-                    enumLiteral_2=(Token)match(input,55,FOLLOW_55_in_ruleExecMode5223); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    enumLiteral_2=(Token)match(input,55,FOLLOW_2); 
 
-                              current = grammarAccess.getExecModeAccess().getMIXEDEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
-                              newLeafNode(enumLiteral_2, grammarAccess.getExecModeAccess().getMIXEDEnumLiteralDeclaration_2()); 
-                          
-                    }
+                            current = grammarAccess.getExecModeAccess().getMIXEDEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
+                            newLeafNode(enumLiteral_2, grammarAccess.getExecModeAccess().getMIXEDEnumLiteralDeclaration_2()); 
+                        
 
                     }
 
@@ -6236,9 +5617,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -6253,7 +5632,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleThreadModel"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2146:1: ruleThreadModel returns [Enumerator current=null] : ( (enumLiteral_0= 'singleThreaded' ) | (enumLiteral_1= 'multiThreaded' ) ) ;
+    // InternalETPhys.g:2146:1: ruleThreadModel returns [Enumerator current=null] : ( (enumLiteral_0= 'singleThreaded' ) | (enumLiteral_1= 'multiThreaded' ) ) ;
     public final Enumerator ruleThreadModel() throws RecognitionException {
         Enumerator current = null;
 
@@ -6262,10 +5641,10 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
          enterRule(); 
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2148:28: ( ( (enumLiteral_0= 'singleThreaded' ) | (enumLiteral_1= 'multiThreaded' ) ) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2149:1: ( (enumLiteral_0= 'singleThreaded' ) | (enumLiteral_1= 'multiThreaded' ) )
+            // InternalETPhys.g:2148:28: ( ( (enumLiteral_0= 'singleThreaded' ) | (enumLiteral_1= 'multiThreaded' ) ) )
+            // InternalETPhys.g:2149:1: ( (enumLiteral_0= 'singleThreaded' ) | (enumLiteral_1= 'multiThreaded' ) )
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2149:1: ( (enumLiteral_0= 'singleThreaded' ) | (enumLiteral_1= 'multiThreaded' ) )
+            // InternalETPhys.g:2149:1: ( (enumLiteral_0= 'singleThreaded' ) | (enumLiteral_1= 'multiThreaded' ) )
             int alt32=2;
             int LA32_0 = input.LA(1);
 
@@ -6276,7 +5655,6 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                 alt32=2;
             }
             else {
-                if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
                     new NoViableAltException("", 32, 0, input);
 
@@ -6284,18 +5662,16 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
             }
             switch (alt32) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2149:2: (enumLiteral_0= 'singleThreaded' )
+                    // InternalETPhys.g:2149:2: (enumLiteral_0= 'singleThreaded' )
                     {
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2149:2: (enumLiteral_0= 'singleThreaded' )
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2149:4: enumLiteral_0= 'singleThreaded'
+                    // InternalETPhys.g:2149:2: (enumLiteral_0= 'singleThreaded' )
+                    // InternalETPhys.g:2149:4: enumLiteral_0= 'singleThreaded'
                     {
-                    enumLiteral_0=(Token)match(input,56,FOLLOW_56_in_ruleThreadModel5268); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    enumLiteral_0=(Token)match(input,56,FOLLOW_2); 
 
-                              current = grammarAccess.getThreadModelAccess().getSINGLE_THREADEDEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
-                              newLeafNode(enumLiteral_0, grammarAccess.getThreadModelAccess().getSINGLE_THREADEDEnumLiteralDeclaration_0()); 
-                          
-                    }
+                            current = grammarAccess.getThreadModelAccess().getSINGLE_THREADEDEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
+                            newLeafNode(enumLiteral_0, grammarAccess.getThreadModelAccess().getSINGLE_THREADEDEnumLiteralDeclaration_0()); 
+                        
 
                     }
 
@@ -6303,18 +5679,16 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2155:6: (enumLiteral_1= 'multiThreaded' )
+                    // InternalETPhys.g:2155:6: (enumLiteral_1= 'multiThreaded' )
                     {
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2155:6: (enumLiteral_1= 'multiThreaded' )
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2155:8: enumLiteral_1= 'multiThreaded'
+                    // InternalETPhys.g:2155:6: (enumLiteral_1= 'multiThreaded' )
+                    // InternalETPhys.g:2155:8: enumLiteral_1= 'multiThreaded'
                     {
-                    enumLiteral_1=(Token)match(input,57,FOLLOW_57_in_ruleThreadModel5285); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    enumLiteral_1=(Token)match(input,57,FOLLOW_2); 
 
-                              current = grammarAccess.getThreadModelAccess().getMULTI_THREADEDEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
-                              newLeafNode(enumLiteral_1, grammarAccess.getThreadModelAccess().getMULTI_THREADEDEnumLiteralDeclaration_1()); 
-                          
-                    }
+                            current = grammarAccess.getThreadModelAccess().getMULTI_THREADEDEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
+                            newLeafNode(enumLiteral_1, grammarAccess.getThreadModelAccess().getMULTI_THREADEDEnumLiteralDeclaration_1()); 
+                        
 
                     }
 
@@ -6327,9 +5701,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -6344,7 +5716,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleLiteralType"
-    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2165:1: ruleLiteralType returns [Enumerator current=null] : ( (enumLiteral_0= 'ptBoolean' ) | (enumLiteral_1= 'ptInteger' ) | (enumLiteral_2= 'ptReal' ) | (enumLiteral_3= 'ptCharacter' ) ) ;
+    // InternalETPhys.g:2165: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;
 
@@ -6355,10 +5727,10 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
          enterRule(); 
         try {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2167:28: ( ( (enumLiteral_0= 'ptBoolean' ) | (enumLiteral_1= 'ptInteger' ) | (enumLiteral_2= 'ptReal' ) | (enumLiteral_3= 'ptCharacter' ) ) )
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2168:1: ( (enumLiteral_0= 'ptBoolean' ) | (enumLiteral_1= 'ptInteger' ) | (enumLiteral_2= 'ptReal' ) | (enumLiteral_3= 'ptCharacter' ) )
+            // InternalETPhys.g:2167:28: ( ( (enumLiteral_0= 'ptBoolean' ) | (enumLiteral_1= 'ptInteger' ) | (enumLiteral_2= 'ptReal' ) | (enumLiteral_3= 'ptCharacter' ) ) )
+            // InternalETPhys.g:2168:1: ( (enumLiteral_0= 'ptBoolean' ) | (enumLiteral_1= 'ptInteger' ) | (enumLiteral_2= 'ptReal' ) | (enumLiteral_3= 'ptCharacter' ) )
             {
-            // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2168:1: ( (enumLiteral_0= 'ptBoolean' ) | (enumLiteral_1= 'ptInteger' ) | (enumLiteral_2= 'ptReal' ) | (enumLiteral_3= 'ptCharacter' ) )
+            // InternalETPhys.g:2168:1: ( (enumLiteral_0= 'ptBoolean' ) | (enumLiteral_1= 'ptInteger' ) | (enumLiteral_2= 'ptReal' ) | (enumLiteral_3= 'ptCharacter' ) )
             int alt33=4;
             switch ( input.LA(1) ) {
             case 58:
@@ -6382,7 +5754,6 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                 }
                 break;
             default:
-                if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
                     new NoViableAltException("", 33, 0, input);
 
@@ -6391,18 +5762,16 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
             switch (alt33) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2168:2: (enumLiteral_0= 'ptBoolean' )
+                    // InternalETPhys.g:2168:2: (enumLiteral_0= 'ptBoolean' )
                     {
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2168:2: (enumLiteral_0= 'ptBoolean' )
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2168:4: enumLiteral_0= 'ptBoolean'
+                    // InternalETPhys.g:2168:2: (enumLiteral_0= 'ptBoolean' )
+                    // InternalETPhys.g:2168:4: enumLiteral_0= 'ptBoolean'
                     {
-                    enumLiteral_0=(Token)match(input,58,FOLLOW_58_in_ruleLiteralType5330); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    enumLiteral_0=(Token)match(input,58,FOLLOW_2); 
 
-                              current = grammarAccess.getLiteralTypeAccess().getBOOLEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
-                              newLeafNode(enumLiteral_0, grammarAccess.getLiteralTypeAccess().getBOOLEnumLiteralDeclaration_0()); 
-                          
-                    }
+                            current = grammarAccess.getLiteralTypeAccess().getBOOLEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
+                            newLeafNode(enumLiteral_0, grammarAccess.getLiteralTypeAccess().getBOOLEnumLiteralDeclaration_0()); 
+                        
 
                     }
 
@@ -6410,18 +5779,16 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2174:6: (enumLiteral_1= 'ptInteger' )
+                    // InternalETPhys.g:2174:6: (enumLiteral_1= 'ptInteger' )
                     {
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2174:6: (enumLiteral_1= 'ptInteger' )
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2174:8: enumLiteral_1= 'ptInteger'
+                    // InternalETPhys.g:2174:6: (enumLiteral_1= 'ptInteger' )
+                    // InternalETPhys.g:2174:8: enumLiteral_1= 'ptInteger'
                     {
-                    enumLiteral_1=(Token)match(input,59,FOLLOW_59_in_ruleLiteralType5347); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    enumLiteral_1=(Token)match(input,59,FOLLOW_2); 
 
-                              current = grammarAccess.getLiteralTypeAccess().getINTEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
-                              newLeafNode(enumLiteral_1, grammarAccess.getLiteralTypeAccess().getINTEnumLiteralDeclaration_1()); 
-                          
-                    }
+                            current = grammarAccess.getLiteralTypeAccess().getINTEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
+                            newLeafNode(enumLiteral_1, grammarAccess.getLiteralTypeAccess().getINTEnumLiteralDeclaration_1()); 
+                        
 
                     }
 
@@ -6429,18 +5796,16 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2180:6: (enumLiteral_2= 'ptReal' )
+                    // InternalETPhys.g:2180:6: (enumLiteral_2= 'ptReal' )
                     {
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2180:6: (enumLiteral_2= 'ptReal' )
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2180:8: enumLiteral_2= 'ptReal'
+                    // InternalETPhys.g:2180:6: (enumLiteral_2= 'ptReal' )
+                    // InternalETPhys.g:2180:8: enumLiteral_2= 'ptReal'
                     {
-                    enumLiteral_2=(Token)match(input,60,FOLLOW_60_in_ruleLiteralType5364); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    enumLiteral_2=(Token)match(input,60,FOLLOW_2); 
 
-                              current = grammarAccess.getLiteralTypeAccess().getREALEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
-                              newLeafNode(enumLiteral_2, grammarAccess.getLiteralTypeAccess().getREALEnumLiteralDeclaration_2()); 
-                          
-                    }
+                            current = grammarAccess.getLiteralTypeAccess().getREALEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
+                            newLeafNode(enumLiteral_2, grammarAccess.getLiteralTypeAccess().getREALEnumLiteralDeclaration_2()); 
+                        
 
                     }
 
@@ -6448,18 +5813,16 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 4 :
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2186:6: (enumLiteral_3= 'ptCharacter' )
+                    // InternalETPhys.g:2186:6: (enumLiteral_3= 'ptCharacter' )
                     {
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2186:6: (enumLiteral_3= 'ptCharacter' )
-                    // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2186:8: enumLiteral_3= 'ptCharacter'
+                    // InternalETPhys.g:2186:6: (enumLiteral_3= 'ptCharacter' )
+                    // InternalETPhys.g:2186:8: enumLiteral_3= 'ptCharacter'
                     {
-                    enumLiteral_3=(Token)match(input,61,FOLLOW_61_in_ruleLiteralType5381); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
+                    enumLiteral_3=(Token)match(input,61,FOLLOW_2); 
 
-                              current = grammarAccess.getLiteralTypeAccess().getCHAREnumLiteralDeclaration_3().getEnumLiteral().getInstance();
-                              newLeafNode(enumLiteral_3, grammarAccess.getLiteralTypeAccess().getCHAREnumLiteralDeclaration_3()); 
-                          
-                    }
+                            current = grammarAccess.getLiteralTypeAccess().getCHAREnumLiteralDeclaration_3().getEnumLiteral().getInstance();
+                            newLeafNode(enumLiteral_3, grammarAccess.getLiteralTypeAccess().getCHAREnumLiteralDeclaration_3()); 
+                        
 
                     }
 
@@ -6472,9 +5835,7 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
 
             }
 
-            if ( state.backtracking==0 ) {
-               leaveRule(); 
-            }
+             leaveRule(); 
         }
          
             catch (RecognitionException re) { 
@@ -6487,237 +5848,49 @@ public class InternalETPhysParser extends AbstractInternalAntlrParser {
     }
     // $ANTLR end "ruleLiteralType"
 
-    // $ANTLR start synpred1_InternalETPhys
-    public final void synpred1_InternalETPhys_fragment() throws RecognitionException {   
-        // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2062:4: ( RULE_INT )
-        // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2062:6: RULE_INT
-        {
-        match(input,RULE_INT,FOLLOW_RULE_INT_in_synpred1_InternalETPhys4983); if (state.failed) return ;
-
-        }
-    }
-    // $ANTLR end synpred1_InternalETPhys
-
     // Delegated rules
 
-    public final boolean synpred1_InternalETPhys() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred1_InternalETPhys_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
-
 
  
 
-    public static final BitSet FOLLOW_rulePhysicalModel_in_entryRulePhysicalModel75 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRulePhysicalModel85 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_12_in_rulePhysicalModel122 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleFQN_in_rulePhysicalModel143 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_13_in_rulePhysicalModel155 = new BitSet(new long[]{0x000000208004C000L});
-    public static final BitSet FOLLOW_ruleImport_in_rulePhysicalModel176 = new BitSet(new long[]{0x000000208004C000L});
-    public static final BitSet FOLLOW_rulePhysicalSystem_in_rulePhysicalModel199 = new BitSet(new long[]{0x000000008004C000L});
-    public static final BitSet FOLLOW_ruleNodeClass_in_rulePhysicalModel226 = new BitSet(new long[]{0x000000008004C000L});
-    public static final BitSet FOLLOW_ruleRuntimeClass_in_rulePhysicalModel253 = new BitSet(new long[]{0x000000008004C000L});
-    public static final BitSet FOLLOW_14_in_rulePhysicalModel267 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rulePhysicalSystem_in_entryRulePhysicalSystem303 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRulePhysicalSystem313 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_15_in_rulePhysicalSystem350 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_rulePhysicalSystem367 = new BitSet(new long[]{0x0000010000002000L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_rulePhysicalSystem393 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_13_in_rulePhysicalSystem406 = new BitSet(new long[]{0x0000000000014000L});
-    public static final BitSet FOLLOW_ruleNodeRef_in_rulePhysicalSystem427 = new BitSet(new long[]{0x0000000000014000L});
-    public static final BitSet FOLLOW_14_in_rulePhysicalSystem440 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNodeRef_in_entryRuleNodeRef476 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleNodeRef486 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_16_in_ruleNodeRef523 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleNodeRef540 = new BitSet(new long[]{0x0000000000020000L});
-    public static final BitSet FOLLOW_17_in_ruleNodeRef557 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleFQN_in_ruleNodeRef580 = new BitSet(new long[]{0x0000010000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_ruleNodeRef601 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNodeClass_in_entryRuleNodeClass638 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleNodeClass648 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_18_in_ruleNodeClass685 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleNodeClass702 = new BitSet(new long[]{0x0000010000002000L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_ruleNodeClass728 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_13_in_ruleNodeClass741 = new BitSet(new long[]{0x0000000000680000L});
-    public static final BitSet FOLLOW_19_in_ruleNodeClass799 = new BitSet(new long[]{0x0000000000100000L});
-    public static final BitSet FOLLOW_20_in_ruleNodeClass811 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleFQN_in_ruleNodeClass834 = new BitSet(new long[]{0x0000000001E84000L});
-    public static final BitSet FOLLOW_21_in_ruleNodeClass902 = new BitSet(new long[]{0x0000000000100000L});
-    public static final BitSet FOLLOW_20_in_ruleNodeClass914 = new BitSet(new long[]{0x00030000000000A0L});
-    public static final BitSet FOLLOW_ruleInteger_in_ruleNodeClass935 = new BitSet(new long[]{0x0000000001E84000L});
-    public static final BitSet FOLLOW_22_in_ruleNodeClass1003 = new BitSet(new long[]{0x0000000000100000L});
-    public static final BitSet FOLLOW_20_in_ruleNodeClass1015 = new BitSet(new long[]{0x00030000000000A0L});
-    public static final BitSet FOLLOW_ruleInteger_in_ruleNodeClass1036 = new BitSet(new long[]{0x0000000001E84000L});
-    public static final BitSet FOLLOW_rulePhysicalThread_in_ruleNodeClass1104 = new BitSet(new long[]{0x0000000001804000L});
-    public static final BitSet FOLLOW_14_in_ruleNodeClass1117 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rulePhysicalThread_in_entryRulePhysicalThread1153 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRulePhysicalThread1163 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_23_in_rulePhysicalThread1207 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_24_in_rulePhysicalThread1238 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_rulePhysicalThread1256 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_13_in_rulePhysicalThread1273 = new BitSet(new long[]{0x000000007E000000L});
-    public static final BitSet FOLLOW_25_in_rulePhysicalThread1331 = new BitSet(new long[]{0x0000000000100000L});
-    public static final BitSet FOLLOW_20_in_rulePhysicalThread1343 = new BitSet(new long[]{0x00E0000000000000L});
-    public static final BitSet FOLLOW_ruleExecMode_in_rulePhysicalThread1364 = new BitSet(new long[]{0x000000007E004000L});
-    public static final BitSet FOLLOW_26_in_rulePhysicalThread1432 = new BitSet(new long[]{0x0000000000100000L});
-    public static final BitSet FOLLOW_20_in_rulePhysicalThread1444 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_ruleTIME_in_rulePhysicalThread1465 = new BitSet(new long[]{0x000000007E004000L});
-    public static final BitSet FOLLOW_27_in_rulePhysicalThread1533 = new BitSet(new long[]{0x0000000000100000L});
-    public static final BitSet FOLLOW_20_in_rulePhysicalThread1545 = new BitSet(new long[]{0x00030000000000A0L});
-    public static final BitSet FOLLOW_ruleInteger_in_rulePhysicalThread1566 = new BitSet(new long[]{0x000000007E004000L});
-    public static final BitSet FOLLOW_28_in_rulePhysicalThread1634 = new BitSet(new long[]{0x0000000000100000L});
-    public static final BitSet FOLLOW_20_in_rulePhysicalThread1646 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_INT_in_rulePhysicalThread1663 = new BitSet(new long[]{0x000000007E004000L});
-    public static final BitSet FOLLOW_29_in_rulePhysicalThread1736 = new BitSet(new long[]{0x0000000000100000L});
-    public static final BitSet FOLLOW_20_in_rulePhysicalThread1748 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_INT_in_rulePhysicalThread1765 = new BitSet(new long[]{0x000000007E004000L});
-    public static final BitSet FOLLOW_30_in_rulePhysicalThread1838 = new BitSet(new long[]{0x0000000000100000L});
-    public static final BitSet FOLLOW_20_in_rulePhysicalThread1850 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_INT_in_rulePhysicalThread1867 = new BitSet(new long[]{0x000000007E004000L});
-    public static final BitSet FOLLOW_14_in_rulePhysicalThread1931 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRuntimeClass_in_entryRuleRuntimeClass1967 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRuntimeClass1977 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_31_in_ruleRuntimeClass2014 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleRuntimeClass2031 = new BitSet(new long[]{0x0000010000002000L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_ruleRuntimeClass2057 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_13_in_ruleRuntimeClass2070 = new BitSet(new long[]{0x0000000100000000L});
-    public static final BitSet FOLLOW_32_in_ruleRuntimeClass2082 = new BitSet(new long[]{0x0000000000100000L});
-    public static final BitSet FOLLOW_20_in_ruleRuntimeClass2094 = new BitSet(new long[]{0x0300000000000000L});
-    public static final BitSet FOLLOW_ruleThreadModel_in_ruleRuntimeClass2115 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_14_in_ruleRuntimeClass2127 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleKeyValue_in_entryRuleKeyValue2165 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleKeyValue2175 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleKeyValue2217 = new BitSet(new long[]{0x0000000000100000L});
-    public static final BitSet FOLLOW_20_in_ruleKeyValue2234 = new BitSet(new long[]{0x0003C000000000E0L});
-    public static final BitSet FOLLOW_ruleLiteral_in_ruleKeyValue2255 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAnnotationTargetType_in_entryRuleAnnotationTargetType2294 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAnnotationTargetType2305 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleAnnotationTargetType2344 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAnnotationAttribute_in_entryRuleAnnotationAttribute2388 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAnnotationAttribute2398 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleAnnotationAttribute_in_ruleAnnotationAttribute2445 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleEnumAnnotationAttribute_in_ruleAnnotationAttribute2472 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleAnnotationAttribute_in_entryRuleSimpleAnnotationAttribute2507 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSimpleAnnotationAttribute2517 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_ruleSimpleAnnotationAttribute2561 = new BitSet(new long[]{0x0000000800000000L});
-    public static final BitSet FOLLOW_34_in_ruleSimpleAnnotationAttribute2592 = new BitSet(new long[]{0x0000000800000000L});
-    public static final BitSet FOLLOW_35_in_ruleSimpleAnnotationAttribute2605 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleSimpleAnnotationAttribute2622 = new BitSet(new long[]{0x0000000000020000L});
-    public static final BitSet FOLLOW_17_in_ruleSimpleAnnotationAttribute2639 = new BitSet(new long[]{0x3C00000000000000L});
-    public static final BitSet FOLLOW_ruleLiteralType_in_ruleSimpleAnnotationAttribute2660 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleEnumAnnotationAttribute_in_entryRuleEnumAnnotationAttribute2696 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleEnumAnnotationAttribute2706 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_ruleEnumAnnotationAttribute2750 = new BitSet(new long[]{0x0000000800000000L});
-    public static final BitSet FOLLOW_34_in_ruleEnumAnnotationAttribute2781 = new BitSet(new long[]{0x0000000800000000L});
-    public static final BitSet FOLLOW_35_in_ruleEnumAnnotationAttribute2794 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleEnumAnnotationAttribute2811 = new BitSet(new long[]{0x0000000000020000L});
-    public static final BitSet FOLLOW_17_in_ruleEnumAnnotationAttribute2828 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_13_in_ruleEnumAnnotationAttribute2840 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleEnumAnnotationAttribute2857 = new BitSet(new long[]{0x0000001000004000L});
-    public static final BitSet FOLLOW_36_in_ruleEnumAnnotationAttribute2875 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleEnumAnnotationAttribute2892 = new BitSet(new long[]{0x0000001000004000L});
-    public static final BitSet FOLLOW_14_in_ruleEnumAnnotationAttribute2911 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleImport_in_entryRuleImport2947 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleImport2957 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_37_in_ruleImport2994 = new BitSet(new long[]{0x0000000100000010L});
-    public static final BitSet FOLLOW_ruleImportedFQN_in_ruleImport3017 = new BitSet(new long[]{0x0000004000000000L});
-    public static final BitSet FOLLOW_38_in_ruleImport3029 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_32_in_ruleImport3048 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleImport3066 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleImportedFQN_in_entryRuleImportedFQN3108 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleImportedFQN3119 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_ruleImportedFQN3166 = new BitSet(new long[]{0x0000008000000002L});
-    public static final BitSet FOLLOW_39_in_ruleImportedFQN3185 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_entryRuleDocumentation3227 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDocumentation3237 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_40_in_ruleDocumentation3283 = new BitSet(new long[]{0x0000020000000040L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleDocumentation3300 = new BitSet(new long[]{0x0000020000000040L});
-    public static final BitSet FOLLOW_41_in_ruleDocumentation3318 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTIME_in_entryRuleTIME3355 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleTIME3366 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleTIME3407 = new BitSet(new long[]{0x0000040000000000L});
-    public static final BitSet FOLLOW_42_in_ruleTIME3425 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleTIME3448 = new BitSet(new long[]{0x0000080000000000L});
-    public static final BitSet FOLLOW_43_in_ruleTIME3466 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleTIME3489 = new BitSet(new long[]{0x0000100000000000L});
-    public static final BitSet FOLLOW_44_in_ruleTIME3507 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleTIME3530 = new BitSet(new long[]{0x0000200000000000L});
-    public static final BitSet FOLLOW_45_in_ruleTIME3548 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLiteral_in_entryRuleLiteral3591 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleLiteral3601 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleBooleanLiteral_in_ruleLiteral3648 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNumberLiteral_in_ruleLiteral3675 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStringLiteral_in_ruleLiteral3702 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleBooleanLiteral_in_entryRuleBooleanLiteral3737 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleBooleanLiteral3747 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_ruleBooleanLiteral3794 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_ruleBooleanLiteral3818 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNumberLiteral_in_entryRuleNumberLiteral3868 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleNumberLiteral3878 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntLiteral_in_ruleNumberLiteral3925 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRealLiteral_in_ruleNumberLiteral3952 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRealLiteral_in_entryRuleRealLiteral3987 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRealLiteral3997 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleReal_in_ruleRealLiteral4052 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntLiteral_in_entryRuleIntLiteral4088 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIntLiteral4098 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInteger_in_ruleIntLiteral4153 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStringLiteral_in_entryRuleStringLiteral4189 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleStringLiteral4199 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleStringLiteral4250 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInteger_in_entryRuleInteger4292 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleInteger4303 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_48_in_ruleInteger4343 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_49_in_ruleInteger4362 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleInteger4379 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_HEX_in_ruleInteger4406 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleReal_in_entryRuleReal4452 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleReal4463 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDecimal_in_ruleReal4510 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDecimalExp_in_ruleReal4543 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDecimal_in_entryRuleDecimal4595 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDecimal4606 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_48_in_ruleDecimal4649 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_49_in_ruleDecimal4668 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleDecimal4685 = new BitSet(new long[]{0x0004000000000000L});
-    public static final BitSet FOLLOW_50_in_ruleDecimal4703 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleDecimal4718 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDecimalExp_in_entryRuleDecimalExp4774 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDecimalExp4785 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_48_in_ruleDecimalExp4828 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_49_in_ruleDecimalExp4847 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleDecimalExp4864 = new BitSet(new long[]{0x0004000000000000L});
-    public static final BitSet FOLLOW_50_in_ruleDecimalExp4882 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleDecimalExp4897 = new BitSet(new long[]{0x0018000000000000L});
-    public static final BitSet FOLLOW_51_in_ruleDecimalExp4916 = new BitSet(new long[]{0x0003000000000020L});
-    public static final BitSet FOLLOW_52_in_ruleDecimalExp4935 = new BitSet(new long[]{0x0003000000000020L});
-    public static final BitSet FOLLOW_48_in_ruleDecimalExp4950 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_49_in_ruleDecimalExp4969 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleDecimalExp4992 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_entryRuleFQN5043 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleFQN5054 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleFQN5094 = new BitSet(new long[]{0x0004000000000002L});
-    public static final BitSet FOLLOW_50_in_ruleFQN5113 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleFQN5128 = new BitSet(new long[]{0x0004000000000002L});
-    public static final BitSet FOLLOW_53_in_ruleExecMode5189 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_54_in_ruleExecMode5206 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_55_in_ruleExecMode5223 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_56_in_ruleThreadModel5268 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_57_in_ruleThreadModel5285 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_58_in_ruleLiteralType5330 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_59_in_ruleLiteralType5347 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_60_in_ruleLiteralType5364 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_61_in_ruleLiteralType5381 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_synpred1_InternalETPhys4983 = 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[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x0000000000002000L});
+    public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x000000208004C000L});
+    public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x000000008004C000L});
+    public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x0000010000002000L});
+    public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x0000000000014000L});
+    public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x0000000000020000L});
+    public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0000010000000002L});
+    public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0000000000680000L});
+    public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0000000000100000L});
+    public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000000001E84000L});
+    public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x00030000000000A0L});
+    public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0000000001804000L});
+    public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x000000007E000000L});
+    public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x00E0000000000000L});
+    public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x000000007E004000L});
+    public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x0000000100000000L});
+    public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x0300000000000000L});
+    public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0000000000004000L});
+    public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x0003C000000000E0L});
+    public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x0000000800000000L});
+    public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x3C00000000000000L});
+    public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x0000000000000040L});
+    public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x0000001000004000L});
+    public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x0000000100000010L});
+    public static final BitSet FOLLOW_29 = new BitSet(new long[]{0x0000004000000000L});
+    public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x0000008000000002L});
+    public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x0000020000000040L});
+    public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x0000040000000000L});
+    public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x0000080000000000L});
+    public static final BitSet FOLLOW_34 = new BitSet(new long[]{0x0000100000000000L});
+    public static final BitSet FOLLOW_35 = new BitSet(new long[]{0x0000200000000000L});
+    public static final BitSet FOLLOW_36 = new BitSet(new long[]{0x0004000000000000L});
+    public static final BitSet FOLLOW_37 = new BitSet(new long[]{0x0018000000000000L});
+    public static final BitSet FOLLOW_38 = new BitSet(new long[]{0x0003000000000020L});
+    public static final BitSet FOLLOW_39 = new BitSet(new long[]{0x0004000000000002L});
 
 }
diff --git a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/serializer/ETPhysSemanticSequencer.java b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/serializer/ETPhysSemanticSequencer.java
index 71b8b6218..7f305f99c 100644
--- a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/serializer/ETPhysSemanticSequencer.java
+++ b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/serializer/ETPhysSemanticSequencer.java
@@ -1,8 +1,12 @@
+/*
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.etphys.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;
@@ -25,12 +29,10 @@ import org.eclipse.etrice.core.etphys.eTPhys.PhysicalSystem;
 import org.eclipse.etrice.core.etphys.eTPhys.PhysicalThread;
 import org.eclipse.etrice.core.etphys.eTPhys.RuntimeClass;
 import org.eclipse.etrice.core.etphys.services.ETPhysGrammarAccess;
-import org.eclipse.xtext.serializer.acceptor.ISemanticSequenceAcceptor;
-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.ISemanticSequencer;
-import org.eclipse.xtext.serializer.sequencer.ITransientValueService;
+import org.eclipse.xtext.Action;
+import org.eclipse.xtext.Parameter;
+import org.eclipse.xtext.ParserRule;
+import org.eclipse.xtext.serializer.ISerializationContext;
 
 @SuppressWarnings("all")
 public class ETPhysSemanticSequencer extends BaseSemanticSequencer {
@@ -38,196 +40,157 @@ public class ETPhysSemanticSequencer extends BaseSemanticSequencer {
 	@Inject
 	private ETPhysGrammarAccess 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() == ETPhysPackage.eINSTANCE) switch(semanticObject.eClass().getClassifierID()) {
+		else if (epackage == ETPhysPackage.eINSTANCE)
+			switch (semanticObject.eClass().getClassifierID()) {
 			case ETPhysPackage.NODE_CLASS:
-				if(context == grammarAccess.getNodeClassRule()) {
-					sequence_NodeClass(context, (NodeClass) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_NodeClass(context, (NodeClass) semanticObject); 
+				return; 
 			case ETPhysPackage.NODE_REF:
-				if(context == grammarAccess.getNodeRefRule()) {
-					sequence_NodeRef(context, (NodeRef) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_NodeRef(context, (NodeRef) semanticObject); 
+				return; 
 			case ETPhysPackage.PHYSICAL_MODEL:
-				if(context == grammarAccess.getPhysicalModelRule()) {
-					sequence_PhysicalModel(context, (PhysicalModel) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_PhysicalModel(context, (PhysicalModel) semanticObject); 
+				return; 
 			case ETPhysPackage.PHYSICAL_SYSTEM:
-				if(context == grammarAccess.getPhysicalSystemRule()) {
-					sequence_PhysicalSystem(context, (PhysicalSystem) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_PhysicalSystem(context, (PhysicalSystem) semanticObject); 
+				return; 
 			case ETPhysPackage.PHYSICAL_THREAD:
-				if(context == grammarAccess.getPhysicalThreadRule()) {
-					sequence_PhysicalThread(context, (PhysicalThread) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_PhysicalThread(context, (PhysicalThread) semanticObject); 
+				return; 
 			case ETPhysPackage.RUNTIME_CLASS:
-				if(context == grammarAccess.getRuntimeClassRule()) {
-					sequence_RuntimeClass(context, (RuntimeClass) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_RuntimeClass(context, (RuntimeClass) semanticObject); 
+				return; 
 			}
-		if (errorAcceptor != null) errorAcceptor.accept(diagnosticProvider.createInvalidContextOrTypeDiagnostic(semanticObject, context));
+		if (errorAcceptor != null)
+			errorAcceptor.accept(diagnosticProvider.createInvalidContextOrTypeDiagnostic(semanticObject, context));
 	}
 	
 	/**
+	 * Contexts:
+	 *     NodeClass returns NodeClass
+	 *
 	 * Constraint:
-	 *     (
-	 *         name=ID 
-	 *         docu=Documentation? 
-	 *         runtime=[RuntimeClass|FQN] 
-	 *         priomin=Integer 
-	 *         priomax=Integer 
-	 *         threads+=PhysicalThread*
-	 *     )
+	 *     (name=ID docu=Documentation? (runtime=[RuntimeClass|FQN] | priomin=Integer | priomax=Integer)+ threads+=PhysicalThread*)
 	 */
-	protected void sequence_NodeClass(EObject context, NodeClass semanticObject) {
+	protected void sequence_NodeClass(ISerializationContext context, NodeClass semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     NodeRef returns NodeRef
+	 *
 	 * Constraint:
 	 *     (name=ID type=[NodeClass|FQN] docu=Documentation?)
 	 */
-	protected void sequence_NodeRef(EObject context, NodeRef semanticObject) {
+	protected void sequence_NodeRef(ISerializationContext context, NodeRef semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     PhysicalModel returns PhysicalModel
+	 *
 	 * Constraint:
 	 *     (name=FQN imports+=Import* (systems+=PhysicalSystem | nodeClasses+=NodeClass | runtimeClasses+=RuntimeClass)*)
 	 */
-	protected void sequence_PhysicalModel(EObject context, PhysicalModel semanticObject) {
+	protected void sequence_PhysicalModel(ISerializationContext context, PhysicalModel semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     PhysicalSystem returns PhysicalSystem
+	 *
 	 * Constraint:
 	 *     (name=ID docu=Documentation? nodeRefs+=NodeRef*)
 	 */
-	protected void sequence_PhysicalSystem(EObject context, PhysicalSystem semanticObject) {
+	protected void sequence_PhysicalSystem(ISerializationContext context, PhysicalSystem semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     PhysicalThread returns PhysicalThread
+	 *
 	 * Constraint:
 	 *     (
 	 *         default?='DefaultThread'? 
 	 *         name=ID 
-	 *         execmode=ExecMode 
-	 *         time=TIME? 
-	 *         prio=Integer 
-	 *         stacksize=INT 
-	 *         msgblocksize=INT 
-	 *         msgpoolsize=INT
+	 *         (
+	 *             execmode=ExecMode | 
+	 *             time=TIME | 
+	 *             prio=Integer | 
+	 *             stacksize=INT | 
+	 *             msgblocksize=INT | 
+	 *             msgpoolsize=INT
+	 *         )*
 	 *     )
 	 */
-	protected void sequence_PhysicalThread(EObject context, PhysicalThread semanticObject) {
+	protected void sequence_PhysicalThread(ISerializationContext context, PhysicalThread semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     RuntimeClass returns RuntimeClass
+	 *
 	 * Constraint:
 	 *     (name=ID docu=Documentation? threadModel=ThreadModel)
 	 */
-	protected void sequence_RuntimeClass(EObject context, RuntimeClass semanticObject) {
+	protected void sequence_RuntimeClass(ISerializationContext context, RuntimeClass semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
+	
+	
 }
diff --git a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/serializer/ETPhysSyntacticSequencer.java b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/serializer/ETPhysSyntacticSequencer.java
index 3a3d448c8..014101292 100644
--- a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/serializer/ETPhysSyntacticSequencer.java
+++ b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/serializer/ETPhysSyntacticSequencer.java
@@ -1,3 +1,6 @@
+/*
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.etphys.serializer;
 
 import com.google.inject.Inject;
diff --git a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/services/ETPhysGrammarAccess.java b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/services/ETPhysGrammarAccess.java
index 126c5c651..b722dc225 100644
--- a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/services/ETPhysGrammarAccess.java
+++ b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/services/ETPhysGrammarAccess.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.etphys.services;
 
 import com.google.inject.Singleton;
@@ -13,13 +13,14 @@ 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 ETPhysGrammarAccess extends AbstractGrammarElementFinder {
 	
 	
 	public class PhysicalModelElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "PhysicalModel");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.etphys.ETPhys.PhysicalModel");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cPhysicalModelKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -37,15 +38,16 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cRightCurlyBracketKeyword_5 = (Keyword)cGroup.eContents().get(5);
 		
 		//PhysicalModel:
-		//	"PhysicalModel" name=FQN "{" imports+=Import* (systems+=PhysicalSystem | nodeClasses+=NodeClass |
-		//	runtimeClasses+=RuntimeClass)* "}";
-		public ParserRule getRule() { return rule; }
+		//	'PhysicalModel' name=FQN '{'
+		//	imports+=Import* (systems+=PhysicalSystem | nodeClasses+=NodeClass | runtimeClasses+=RuntimeClass)*
+		//	'}';
+		@Override public ParserRule getRule() { return rule; }
 
-		//"PhysicalModel" name=FQN "{" imports+=Import* (systems+=PhysicalSystem | nodeClasses+=NodeClass |
-		//runtimeClasses+=RuntimeClass)* "}"
+		//'PhysicalModel' name=FQN '{' imports+=Import* (systems+=PhysicalSystem | nodeClasses+=NodeClass |
+		//runtimeClasses+=RuntimeClass)* '}'
 		public Group getGroup() { return cGroup; }
 
-		//"PhysicalModel"
+		//'PhysicalModel'
 		public Keyword getPhysicalModelKeyword_0() { return cPhysicalModelKeyword_0; }
 
 		//name=FQN
@@ -54,7 +56,7 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
 		//FQN
 		public RuleCall getNameFQNParserRuleCall_1_0() { return cNameFQNParserRuleCall_1_0; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_2() { return cLeftCurlyBracketKeyword_2; }
 
 		//imports+=Import*
@@ -84,12 +86,12 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
 		//RuntimeClass
 		public RuleCall getRuntimeClassesRuntimeClassParserRuleCall_4_2_0() { return cRuntimeClassesRuntimeClassParserRuleCall_4_2_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_5() { return cRightCurlyBracketKeyword_5; }
 	}
 
 	public class PhysicalSystemElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "PhysicalSystem");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.etphys.ETPhys.PhysicalSystem");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cPhysicalSystemKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -102,13 +104,15 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cRightCurlyBracketKeyword_5 = (Keyword)cGroup.eContents().get(5);
 		
 		//PhysicalSystem:
-		//	"PhysicalSystem" name=ID docu=Documentation? "{" nodeRefs+=NodeRef* "}";
-		public ParserRule getRule() { return rule; }
+		//	'PhysicalSystem' name=ID docu=Documentation? '{'
+		//	nodeRefs+=NodeRef*
+		//	'}';
+		@Override public ParserRule getRule() { return rule; }
 
-		//"PhysicalSystem" name=ID docu=Documentation? "{" nodeRefs+=NodeRef* "}"
+		//'PhysicalSystem' name=ID docu=Documentation? '{' nodeRefs+=NodeRef* '}'
 		public Group getGroup() { return cGroup; }
 
-		//"PhysicalSystem"
+		//'PhysicalSystem'
 		public Keyword getPhysicalSystemKeyword_0() { return cPhysicalSystemKeyword_0; }
 
 		//name=ID
@@ -123,7 +127,7 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
 		//Documentation
 		public RuleCall getDocuDocumentationParserRuleCall_2_0() { return cDocuDocumentationParserRuleCall_2_0; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_3() { return cLeftCurlyBracketKeyword_3; }
 
 		//nodeRefs+=NodeRef*
@@ -132,12 +136,12 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
 		//NodeRef
 		public RuleCall getNodeRefsNodeRefParserRuleCall_4_0() { return cNodeRefsNodeRefParserRuleCall_4_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_5() { return cRightCurlyBracketKeyword_5; }
 	}
 
 	public class NodeRefElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "NodeRef");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.etphys.ETPhys.NodeRef");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cNodeRefKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -150,13 +154,13 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cDocuDocumentationParserRuleCall_4_0 = (RuleCall)cDocuAssignment_4.eContents().get(0);
 		
 		//NodeRef:
-		//	"NodeRef" name=ID ":" type=[NodeClass|FQN] docu=Documentation?;
-		public ParserRule getRule() { return rule; }
+		//	'NodeRef' name=ID ':' type=[NodeClass|FQN] docu=Documentation?;
+		@Override public ParserRule getRule() { return rule; }
 
-		//"NodeRef" name=ID ":" type=[NodeClass|FQN] docu=Documentation?
+		//'NodeRef' name=ID ':' type=[NodeClass|FQN] docu=Documentation?
 		public Group getGroup() { return cGroup; }
 
-		//"NodeRef"
+		//'NodeRef'
 		public Keyword getNodeRefKeyword_0() { return cNodeRefKeyword_0; }
 
 		//name=ID
@@ -165,7 +169,7 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
 		//ID
 		public RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }
 
-		//":"
+		//':'
 		public Keyword getColonKeyword_2() { return cColonKeyword_2; }
 
 		//type=[NodeClass|FQN]
@@ -185,7 +189,7 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class NodeClassElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "NodeClass");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.etphys.ETPhys.NodeClass");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cNodeClassKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -215,15 +219,17 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cRightCurlyBracketKeyword_6 = (Keyword)cGroup.eContents().get(6);
 		
 		//NodeClass:
-		//	"NodeClass" name=ID docu=Documentation? "{" ("runtime" "=" runtime=[RuntimeClass|FQN] & "priomin" "=" priomin=Integer
-		//	& "priomax" "=" priomax=Integer) threads+=PhysicalThread* "}";
-		public ParserRule getRule() { return rule; }
-
-		//"NodeClass" name=ID docu=Documentation? "{" ("runtime" "=" runtime=[RuntimeClass|FQN] & "priomin" "=" priomin=Integer &
-		//"priomax" "=" priomax=Integer) threads+=PhysicalThread* "}"
+		//	'NodeClass' name=ID docu=Documentation? '{' ('runtime' '=' runtime=[RuntimeClass|FQN] &
+		//	'priomin' '=' priomin=Integer &
+		//	'priomax' '=' priomax=Integer) threads+=PhysicalThread*
+		//	'}';
+		@Override public ParserRule getRule() { return rule; }
+
+		//'NodeClass' name=ID docu=Documentation? '{' ('runtime' '=' runtime=[RuntimeClass|FQN] & 'priomin' '=' priomin=Integer &
+		//'priomax' '=' priomax=Integer) threads+=PhysicalThread* '}'
 		public Group getGroup() { return cGroup; }
 
-		//"NodeClass"
+		//'NodeClass'
 		public Keyword getNodeClassKeyword_0() { return cNodeClassKeyword_0; }
 
 		//name=ID
@@ -238,19 +244,19 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
 		//Documentation
 		public RuleCall getDocuDocumentationParserRuleCall_2_0() { return cDocuDocumentationParserRuleCall_2_0; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_3() { return cLeftCurlyBracketKeyword_3; }
 
-		//"runtime" "=" runtime=[RuntimeClass|FQN] & "priomin" "=" priomin=Integer & "priomax" "=" priomax=Integer
+		//('runtime' '=' runtime=[RuntimeClass|FQN] & 'priomin' '=' priomin=Integer & 'priomax' '=' priomax=Integer)
 		public UnorderedGroup getUnorderedGroup_4() { return cUnorderedGroup_4; }
 
-		//"runtime" "=" runtime=[RuntimeClass|FQN]
+		//'runtime' '=' runtime=[RuntimeClass|FQN]
 		public Group getGroup_4_0() { return cGroup_4_0; }
 
-		//"runtime"
+		//'runtime'
 		public Keyword getRuntimeKeyword_4_0_0() { return cRuntimeKeyword_4_0_0; }
 
-		//"="
+		//'='
 		public Keyword getEqualsSignKeyword_4_0_1() { return cEqualsSignKeyword_4_0_1; }
 
 		//runtime=[RuntimeClass|FQN]
@@ -262,13 +268,13 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
 		//FQN
 		public RuleCall getRuntimeRuntimeClassFQNParserRuleCall_4_0_2_0_1() { return cRuntimeRuntimeClassFQNParserRuleCall_4_0_2_0_1; }
 
-		//"priomin" "=" priomin=Integer
+		//'priomin' '=' priomin=Integer
 		public Group getGroup_4_1() { return cGroup_4_1; }
 
-		//"priomin"
+		//'priomin'
 		public Keyword getPriominKeyword_4_1_0() { return cPriominKeyword_4_1_0; }
 
-		//"="
+		//'='
 		public Keyword getEqualsSignKeyword_4_1_1() { return cEqualsSignKeyword_4_1_1; }
 
 		//priomin=Integer
@@ -277,13 +283,13 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
 		//Integer
 		public RuleCall getPriominIntegerParserRuleCall_4_1_2_0() { return cPriominIntegerParserRuleCall_4_1_2_0; }
 
-		//"priomax" "=" priomax=Integer
+		//'priomax' '=' priomax=Integer
 		public Group getGroup_4_2() { return cGroup_4_2; }
 
-		//"priomax"
+		//'priomax'
 		public Keyword getPriomaxKeyword_4_2_0() { return cPriomaxKeyword_4_2_0; }
 
-		//"="
+		//'='
 		public Keyword getEqualsSignKeyword_4_2_1() { return cEqualsSignKeyword_4_2_1; }
 
 		//priomax=Integer
@@ -298,12 +304,12 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
 		//PhysicalThread
 		public RuleCall getThreadsPhysicalThreadParserRuleCall_5_0() { return cThreadsPhysicalThreadParserRuleCall_5_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_6() { return cRightCurlyBracketKeyword_6; }
 	}
 
 	public class PhysicalThreadElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "PhysicalThread");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.etphys.ETPhys.PhysicalThread");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Alternatives cAlternatives_0 = (Alternatives)cGroup.eContents().get(0);
 		private final Assignment cDefaultAssignment_0_0 = (Assignment)cAlternatives_0.eContents().get(0);
@@ -346,26 +352,29 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cRightCurlyBracketKeyword_4 = (Keyword)cGroup.eContents().get(4);
 		
 		//PhysicalThread:
-		//	(default?="DefaultThread" | "Thread") name=ID "{" ("execmode" "=" execmode=ExecMode & ("interval" "=" time=TIME)? &
-		//	"prio" "=" prio=Integer & "stacksize" "=" stacksize=INT & "msgblocksize" "=" msgblocksize=INT & "msgpoolsize" "="
-		//	msgpoolsize=INT) "}";
-		public ParserRule getRule() { return rule; }
-
-		//(default?="DefaultThread" | "Thread") name=ID "{" ("execmode" "=" execmode=ExecMode & ("interval" "=" time=TIME)? &
-		//"prio" "=" prio=Integer & "stacksize" "=" stacksize=INT & "msgblocksize" "=" msgblocksize=INT & "msgpoolsize" "="
-		//msgpoolsize=INT) "}"
+		//	(default?='DefaultThread' | 'Thread') name=ID '{' ('execmode' '=' execmode=ExecMode & ('interval' '=' time=TIME)? &
+		//	'prio' '=' prio=Integer &
+		//	'stacksize' '=' stacksize=INT &
+		//	'msgblocksize' '=' msgblocksize=INT &
+		//	'msgpoolsize' '=' msgpoolsize=INT)
+		//	'}';
+		@Override public ParserRule getRule() { return rule; }
+
+		//(default?='DefaultThread' | 'Thread') name=ID '{' ('execmode' '=' execmode=ExecMode & ('interval' '=' time=TIME)? &
+		//'prio' '=' prio=Integer & 'stacksize' '=' stacksize=INT & 'msgblocksize' '=' msgblocksize=INT & 'msgpoolsize' '='
+		//msgpoolsize=INT) '}'
 		public Group getGroup() { return cGroup; }
 
-		//default?="DefaultThread" | "Thread"
+		//(default?='DefaultThread' | 'Thread')
 		public Alternatives getAlternatives_0() { return cAlternatives_0; }
 
-		//default?="DefaultThread"
+		//default?='DefaultThread'
 		public Assignment getDefaultAssignment_0_0() { return cDefaultAssignment_0_0; }
 
-		//"DefaultThread"
+		//'DefaultThread'
 		public Keyword getDefaultDefaultThreadKeyword_0_0_0() { return cDefaultDefaultThreadKeyword_0_0_0; }
 
-		//"Thread"
+		//'Thread'
 		public Keyword getThreadKeyword_0_1() { return cThreadKeyword_0_1; }
 
 		//name=ID
@@ -374,20 +383,20 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
 		//ID
 		public RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_2() { return cLeftCurlyBracketKeyword_2; }
 
-		//"execmode" "=" execmode=ExecMode & ("interval" "=" time=TIME)? & "prio" "=" prio=Integer & "stacksize" "=" stacksize=INT
-		//& "msgblocksize" "=" msgblocksize=INT & "msgpoolsize" "=" msgpoolsize=INT
+		//('execmode' '=' execmode=ExecMode & ('interval' '=' time=TIME)? & 'prio' '=' prio=Integer & 'stacksize' '='
+		//stacksize=INT & 'msgblocksize' '=' msgblocksize=INT & 'msgpoolsize' '=' msgpoolsize=INT)
 		public UnorderedGroup getUnorderedGroup_3() { return cUnorderedGroup_3; }
 
-		//"execmode" "=" execmode=ExecMode
+		//'execmode' '=' execmode=ExecMode
 		public Group getGroup_3_0() { return cGroup_3_0; }
 
-		//"execmode"
+		//'execmode'
 		public Keyword getExecmodeKeyword_3_0_0() { return cExecmodeKeyword_3_0_0; }
 
-		//"="
+		//'='
 		public Keyword getEqualsSignKeyword_3_0_1() { return cEqualsSignKeyword_3_0_1; }
 
 		//execmode=ExecMode
@@ -396,13 +405,13 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
 		//ExecMode
 		public RuleCall getExecmodeExecModeEnumRuleCall_3_0_2_0() { return cExecmodeExecModeEnumRuleCall_3_0_2_0; }
 
-		//("interval" "=" time=TIME)?
+		//('interval' '=' time=TIME)?
 		public Group getGroup_3_1() { return cGroup_3_1; }
 
-		//"interval"
+		//'interval'
 		public Keyword getIntervalKeyword_3_1_0() { return cIntervalKeyword_3_1_0; }
 
-		//"="
+		//'='
 		public Keyword getEqualsSignKeyword_3_1_1() { return cEqualsSignKeyword_3_1_1; }
 
 		//time=TIME
@@ -411,13 +420,13 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
 		//TIME
 		public RuleCall getTimeTIMEParserRuleCall_3_1_2_0() { return cTimeTIMEParserRuleCall_3_1_2_0; }
 
-		//"prio" "=" prio=Integer
+		//'prio' '=' prio=Integer
 		public Group getGroup_3_2() { return cGroup_3_2; }
 
-		//"prio"
+		//'prio'
 		public Keyword getPrioKeyword_3_2_0() { return cPrioKeyword_3_2_0; }
 
-		//"="
+		//'='
 		public Keyword getEqualsSignKeyword_3_2_1() { return cEqualsSignKeyword_3_2_1; }
 
 		//prio=Integer
@@ -426,13 +435,13 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
 		//Integer
 		public RuleCall getPrioIntegerParserRuleCall_3_2_2_0() { return cPrioIntegerParserRuleCall_3_2_2_0; }
 
-		//"stacksize" "=" stacksize=INT
+		//'stacksize' '=' stacksize=INT
 		public Group getGroup_3_3() { return cGroup_3_3; }
 
-		//"stacksize"
+		//'stacksize'
 		public Keyword getStacksizeKeyword_3_3_0() { return cStacksizeKeyword_3_3_0; }
 
-		//"="
+		//'='
 		public Keyword getEqualsSignKeyword_3_3_1() { return cEqualsSignKeyword_3_3_1; }
 
 		//stacksize=INT
@@ -441,13 +450,13 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
 		//INT
 		public RuleCall getStacksizeINTTerminalRuleCall_3_3_2_0() { return cStacksizeINTTerminalRuleCall_3_3_2_0; }
 
-		//"msgblocksize" "=" msgblocksize=INT
+		//'msgblocksize' '=' msgblocksize=INT
 		public Group getGroup_3_4() { return cGroup_3_4; }
 
-		//"msgblocksize"
+		//'msgblocksize'
 		public Keyword getMsgblocksizeKeyword_3_4_0() { return cMsgblocksizeKeyword_3_4_0; }
 
-		//"="
+		//'='
 		public Keyword getEqualsSignKeyword_3_4_1() { return cEqualsSignKeyword_3_4_1; }
 
 		//msgblocksize=INT
@@ -456,13 +465,13 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
 		//INT
 		public RuleCall getMsgblocksizeINTTerminalRuleCall_3_4_2_0() { return cMsgblocksizeINTTerminalRuleCall_3_4_2_0; }
 
-		//"msgpoolsize" "=" msgpoolsize=INT
+		//'msgpoolsize' '=' msgpoolsize=INT
 		public Group getGroup_3_5() { return cGroup_3_5; }
 
-		//"msgpoolsize"
+		//'msgpoolsize'
 		public Keyword getMsgpoolsizeKeyword_3_5_0() { return cMsgpoolsizeKeyword_3_5_0; }
 
-		//"="
+		//'='
 		public Keyword getEqualsSignKeyword_3_5_1() { return cEqualsSignKeyword_3_5_1; }
 
 		//msgpoolsize=INT
@@ -471,12 +480,12 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
 		//INT
 		public RuleCall getMsgpoolsizeINTTerminalRuleCall_3_5_2_0() { return cMsgpoolsizeINTTerminalRuleCall_3_5_2_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_4() { return cRightCurlyBracketKeyword_4; }
 	}
 
 	public class RuntimeClassElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "RuntimeClass");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.etphys.ETPhys.RuntimeClass");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cRuntimeClassKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -491,13 +500,15 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cRightCurlyBracketKeyword_7 = (Keyword)cGroup.eContents().get(7);
 		
 		//RuntimeClass:
-		//	"RuntimeClass" name=ID docu=Documentation? "{" "model" "=" threadModel=ThreadModel "}";
-		public ParserRule getRule() { return rule; }
+		//	'RuntimeClass' name=ID docu=Documentation? '{'
+		//	'model' '=' threadModel=ThreadModel
+		//	'}';
+		@Override public ParserRule getRule() { return rule; }
 
-		//"RuntimeClass" name=ID docu=Documentation? "{" "model" "=" threadModel=ThreadModel "}"
+		//'RuntimeClass' name=ID docu=Documentation? '{' 'model' '=' threadModel=ThreadModel '}'
 		public Group getGroup() { return cGroup; }
 
-		//"RuntimeClass"
+		//'RuntimeClass'
 		public Keyword getRuntimeClassKeyword_0() { return cRuntimeClassKeyword_0; }
 
 		//name=ID
@@ -512,13 +523,13 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
 		//Documentation
 		public RuleCall getDocuDocumentationParserRuleCall_2_0() { return cDocuDocumentationParserRuleCall_2_0; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_3() { return cLeftCurlyBracketKeyword_3; }
 
-		//"model"
+		//'model'
 		public Keyword getModelKeyword_4() { return cModelKeyword_4; }
 
-		//"="
+		//'='
 		public Keyword getEqualsSignKeyword_5() { return cEqualsSignKeyword_5; }
 
 		//threadModel=ThreadModel
@@ -527,13 +538,13 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
 		//ThreadModel
 		public RuleCall getThreadModelThreadModelEnumRuleCall_6_0() { return cThreadModelThreadModelEnumRuleCall_6_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_7() { return cRightCurlyBracketKeyword_7; }
 	}
 	
 	
 	public class ExecModeElements extends AbstractEnumRuleElementFinder {
-		private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "ExecMode");
+		private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.etphys.ETPhys.ExecMode");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final EnumLiteralDeclaration cPOLLEDEnumLiteralDeclaration_0 = (EnumLiteralDeclaration)cAlternatives.eContents().get(0);
 		private final Keyword cPOLLEDPolledKeyword_0_0 = (Keyword)cPOLLEDEnumLiteralDeclaration_0.eContents().get(0);
@@ -543,33 +554,35 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cMIXEDMixedKeyword_2_0 = (Keyword)cMIXEDEnumLiteralDeclaration_2.eContents().get(0);
 		
 		//enum ExecMode:
-		//	POLLED="polled" | BLOCKED="blocked" | MIXED="mixed";
+		//	POLLED='polled' |
+		//	BLOCKED='blocked' |
+		//	MIXED='mixed';
 		public EnumRule getRule() { return rule; }
 
-		//POLLED="polled" | BLOCKED="blocked" | MIXED="mixed"
+		//POLLED='polled' | BLOCKED='blocked' | MIXED='mixed'
 		public Alternatives getAlternatives() { return cAlternatives; }
 
-		//POLLED="polled"
+		//POLLED='polled'
 		public EnumLiteralDeclaration getPOLLEDEnumLiteralDeclaration_0() { return cPOLLEDEnumLiteralDeclaration_0; }
 
-		//"polled"
+		//'polled'
 		public Keyword getPOLLEDPolledKeyword_0_0() { return cPOLLEDPolledKeyword_0_0; }
 
-		//BLOCKED="blocked"
+		//BLOCKED='blocked'
 		public EnumLiteralDeclaration getBLOCKEDEnumLiteralDeclaration_1() { return cBLOCKEDEnumLiteralDeclaration_1; }
 
-		//"blocked"
+		//'blocked'
 		public Keyword getBLOCKEDBlockedKeyword_1_0() { return cBLOCKEDBlockedKeyword_1_0; }
 
-		//MIXED="mixed"
+		//MIXED='mixed'
 		public EnumLiteralDeclaration getMIXEDEnumLiteralDeclaration_2() { return cMIXEDEnumLiteralDeclaration_2; }
 
-		//"mixed"
+		//'mixed'
 		public Keyword getMIXEDMixedKeyword_2_0() { return cMIXEDMixedKeyword_2_0; }
 	}
 
 	public class ThreadModelElements extends AbstractEnumRuleElementFinder {
-		private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "ThreadModel");
+		private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.etphys.ETPhys.ThreadModel");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final EnumLiteralDeclaration cSINGLE_THREADEDEnumLiteralDeclaration_0 = (EnumLiteralDeclaration)cAlternatives.eContents().get(0);
 		private final Keyword cSINGLE_THREADEDSingleThreadedKeyword_0_0 = (Keyword)cSINGLE_THREADEDEnumLiteralDeclaration_0.eContents().get(0);
@@ -577,22 +590,23 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cMULTI_THREADEDMultiThreadedKeyword_1_0 = (Keyword)cMULTI_THREADEDEnumLiteralDeclaration_1.eContents().get(0);
 		
 		//enum ThreadModel:
-		//	SINGLE_THREADED="singleThreaded" | MULTI_THREADED="multiThreaded";
+		//	SINGLE_THREADED='singleThreaded' |
+		//	MULTI_THREADED='multiThreaded';
 		public EnumRule getRule() { return rule; }
 
-		//SINGLE_THREADED="singleThreaded" | MULTI_THREADED="multiThreaded"
+		//SINGLE_THREADED='singleThreaded' | MULTI_THREADED='multiThreaded'
 		public Alternatives getAlternatives() { return cAlternatives; }
 
-		//SINGLE_THREADED="singleThreaded"
+		//SINGLE_THREADED='singleThreaded'
 		public EnumLiteralDeclaration getSINGLE_THREADEDEnumLiteralDeclaration_0() { return cSINGLE_THREADEDEnumLiteralDeclaration_0; }
 
-		//"singleThreaded"
+		//'singleThreaded'
 		public Keyword getSINGLE_THREADEDSingleThreadedKeyword_0_0() { return cSINGLE_THREADEDSingleThreadedKeyword_0_0; }
 
-		//MULTI_THREADED="multiThreaded"
+		//MULTI_THREADED='multiThreaded'
 		public EnumLiteralDeclaration getMULTI_THREADEDEnumLiteralDeclaration_1() { return cMULTI_THREADEDEnumLiteralDeclaration_1; }
 
-		//"multiThreaded"
+		//'multiThreaded'
 		public Keyword getMULTI_THREADEDMultiThreadedKeyword_1_0() { return cMULTI_THREADEDMultiThreadedKeyword_1_0; }
 	}
 	
@@ -601,27 +615,31 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
 	private final NodeRefElements pNodeRef;
 	private final NodeClassElements pNodeClass;
 	private final PhysicalThreadElements pPhysicalThread;
-	private final ExecModeElements unknownRuleExecMode;
+	private final ExecModeElements eExecMode;
 	private final RuntimeClassElements pRuntimeClass;
-	private final ThreadModelElements unknownRuleThreadModel;
+	private final ThreadModelElements eThreadModel;
 	
 	private final Grammar grammar;
 
 	private final BaseGrammarAccess gaBase;
 
+	private final TerminalsGrammarAccess gaTerminals;
+
 	@Inject
 	public ETPhysGrammarAccess(GrammarProvider grammarProvider,
-		BaseGrammarAccess gaBase) {
+		BaseGrammarAccess gaBase,
+		TerminalsGrammarAccess gaTerminals) {
 		this.grammar = internalFindGrammar(grammarProvider);
 		this.gaBase = gaBase;
+		this.gaTerminals = gaTerminals;
 		this.pPhysicalModel = new PhysicalModelElements();
 		this.pPhysicalSystem = new PhysicalSystemElements();
 		this.pNodeRef = new NodeRefElements();
 		this.pNodeClass = new NodeClassElements();
 		this.pPhysicalThread = new PhysicalThreadElements();
-		this.unknownRuleExecMode = new ExecModeElements();
+		this.eExecMode = new ExecModeElements();
 		this.pRuntimeClass = new RuntimeClassElements();
-		this.unknownRuleThreadModel = new ThreadModelElements();
+		this.eThreadModel = new ThreadModelElements();
 	}
 	
 	protected Grammar internalFindGrammar(GrammarProvider grammarProvider) {
@@ -640,7 +658,7 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
 		return grammar;
 	}
 	
-	
+	@Override
 	public Grammar getGrammar() {
 		return grammar;
 	}
@@ -650,10 +668,15 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
 		return gaBase;
 	}
 
+	public TerminalsGrammarAccess getTerminalsGrammarAccess() {
+		return gaTerminals;
+	}
+
 	
 	//PhysicalModel:
-	//	"PhysicalModel" name=FQN "{" imports+=Import* (systems+=PhysicalSystem | nodeClasses+=NodeClass |
-	//	runtimeClasses+=RuntimeClass)* "}";
+	//	'PhysicalModel' name=FQN '{'
+	//	imports+=Import* (systems+=PhysicalSystem | nodeClasses+=NodeClass | runtimeClasses+=RuntimeClass)*
+	//	'}';
 	public PhysicalModelElements getPhysicalModelAccess() {
 		return pPhysicalModel;
 	}
@@ -663,7 +686,9 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//PhysicalSystem:
-	//	"PhysicalSystem" name=ID docu=Documentation? "{" nodeRefs+=NodeRef* "}";
+	//	'PhysicalSystem' name=ID docu=Documentation? '{'
+	//	nodeRefs+=NodeRef*
+	//	'}';
 	public PhysicalSystemElements getPhysicalSystemAccess() {
 		return pPhysicalSystem;
 	}
@@ -673,7 +698,7 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//NodeRef:
-	//	"NodeRef" name=ID ":" type=[NodeClass|FQN] docu=Documentation?;
+	//	'NodeRef' name=ID ':' type=[NodeClass|FQN] docu=Documentation?;
 	public NodeRefElements getNodeRefAccess() {
 		return pNodeRef;
 	}
@@ -683,8 +708,10 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//NodeClass:
-	//	"NodeClass" name=ID docu=Documentation? "{" ("runtime" "=" runtime=[RuntimeClass|FQN] & "priomin" "=" priomin=Integer
-	//	& "priomax" "=" priomax=Integer) threads+=PhysicalThread* "}";
+	//	'NodeClass' name=ID docu=Documentation? '{' ('runtime' '=' runtime=[RuntimeClass|FQN] &
+	//	'priomin' '=' priomin=Integer &
+	//	'priomax' '=' priomax=Integer) threads+=PhysicalThread*
+	//	'}';
 	public NodeClassElements getNodeClassAccess() {
 		return pNodeClass;
 	}
@@ -694,9 +721,12 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//PhysicalThread:
-	//	(default?="DefaultThread" | "Thread") name=ID "{" ("execmode" "=" execmode=ExecMode & ("interval" "=" time=TIME)? &
-	//	"prio" "=" prio=Integer & "stacksize" "=" stacksize=INT & "msgblocksize" "=" msgblocksize=INT & "msgpoolsize" "="
-	//	msgpoolsize=INT) "}";
+	//	(default?='DefaultThread' | 'Thread') name=ID '{' ('execmode' '=' execmode=ExecMode & ('interval' '=' time=TIME)? &
+	//	'prio' '=' prio=Integer &
+	//	'stacksize' '=' stacksize=INT &
+	//	'msgblocksize' '=' msgblocksize=INT &
+	//	'msgpoolsize' '=' msgpoolsize=INT)
+	//	'}';
 	public PhysicalThreadElements getPhysicalThreadAccess() {
 		return pPhysicalThread;
 	}
@@ -706,9 +736,11 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//enum ExecMode:
-	//	POLLED="polled" | BLOCKED="blocked" | MIXED="mixed";
+	//	POLLED='polled' |
+	//	BLOCKED='blocked' |
+	//	MIXED='mixed';
 	public ExecModeElements getExecModeAccess() {
-		return unknownRuleExecMode;
+		return eExecMode;
 	}
 	
 	public EnumRule getExecModeRule() {
@@ -716,7 +748,9 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//RuntimeClass:
-	//	"RuntimeClass" name=ID docu=Documentation? "{" "model" "=" threadModel=ThreadModel "}";
+	//	'RuntimeClass' name=ID docu=Documentation? '{'
+	//	'model' '=' threadModel=ThreadModel
+	//	'}';
 	public RuntimeClassElements getRuntimeClassAccess() {
 		return pRuntimeClass;
 	}
@@ -726,9 +760,10 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//enum ThreadModel:
-	//	SINGLE_THREADED="singleThreaded" | MULTI_THREADED="multiThreaded";
+	//	SINGLE_THREADED='singleThreaded' |
+	//	MULTI_THREADED='multiThreaded';
 	public ThreadModelElements getThreadModelAccess() {
-		return unknownRuleThreadModel;
+		return eThreadModel;
 	}
 	
 	public EnumRule getThreadModelRule() {
@@ -738,7 +773,7 @@ public class ETPhysGrammarAccess 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();
 	}
@@ -748,7 +783,7 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//KeyValue:
-	//	key=ID "=" value=Literal;
+	//	key=ID '=' value=Literal;
 	public BaseGrammarAccess.KeyValueElements getKeyValueAccess() {
 		return gaBase.getKeyValueAccess();
 	}
@@ -758,8 +793,10 @@ public class ETPhysGrammarAccess 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();
 	}
@@ -797,7 +834,7 @@ public class ETPhysGrammarAccess 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();
 	}
@@ -807,7 +844,7 @@ public class ETPhysGrammarAccess 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();
 	}
@@ -837,7 +874,7 @@ public class ETPhysGrammarAccess 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();
 	}
@@ -847,7 +884,7 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//ImportedFQN:
-	//	FQN ".*"?;
+	//	FQN '.*'?;
 	public BaseGrammarAccess.ImportedFQNElements getImportedFQNAccess() {
 		return gaBase.getImportedFQNAccess();
 	}
@@ -859,7 +896,10 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
 	//// **************************************************************
 	//// Documentation Rule
 	//Documentation:
-	//	{Documentation} "[" lines+=STRING* "]";
+	//	{Documentation}
+	//	'['
+	//	lines+=STRING*
+	//	']';
 	public BaseGrammarAccess.DocumentationElements getDocumentationAccess() {
 		return gaBase.getDocumentationAccess();
 	}
@@ -870,8 +910,8 @@ public class ETPhysGrammarAccess 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();
 	}
@@ -880,10 +920,11 @@ public class ETPhysGrammarAccess 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();
 	}
@@ -893,7 +934,7 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//LiteralArray:
-	//	literals+=Literal ("," literals+=Literal)*;
+	//	literals+=Literal (',' literals+=Literal)*;
 	public BaseGrammarAccess.LiteralArrayElements getLiteralArrayAccess() {
 		return gaBase.getLiteralArrayAccess();
 	}
@@ -914,7 +955,7 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//BooleanLiteral:
-	//	{BooleanLiteral} ("false" | isTrue?="true");
+	//	{BooleanLiteral} ('false' | isTrue?='true');
 	public BaseGrammarAccess.BooleanLiteralElements getBooleanLiteralAccess() {
 		return gaBase.getBooleanLiteralAccess();
 	}
@@ -963,8 +1004,8 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
 		return getStringLiteralAccess().getRule();
 	}
 
-	//Integer returns ecore::ELong:
-	//	("+" | "-")? INT | HEX;
+	//Integer ecore::ELong:
+	//	('+' | '-')? INT | HEX
 	public BaseGrammarAccess.IntegerElements getIntegerAccess() {
 		return gaBase.getIntegerAccess();
 	}
@@ -973,8 +1014,8 @@ public class ETPhysGrammarAccess 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();
 	}
@@ -984,7 +1025,7 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//Decimal hidden():
-	//	("+" | "-")? INT "." INT;
+	//	('+' | '-')? INT '.' INT;
 	public BaseGrammarAccess.DecimalElements getDecimalAccess() {
 		return gaBase.getDecimalAccess();
 	}
@@ -999,7 +1040,7 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
 	////DecimalDot hidden():
 	////	('+' | '-')? INT '.';
 	//DecimalExp hidden():
-	//	("+" | "-")? INT "." INT ("e" | "E") ("+" | "-")? -> INT;
+	//	('+' | '-')? INT '.' INT ('e' | 'E') ('+' | '-')? INT;
 	public BaseGrammarAccess.DecimalExpElements getDecimalExpAccess() {
 		return gaBase.getDecimalExpAccess();
 	}
@@ -1009,7 +1050,7 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//FQN:
-	//	ID ("." ID)*;
+	//	ID ('.' ID)*;
 	public BaseGrammarAccess.FQNElements getFQNAccess() {
 		return gaBase.getFQNAccess();
 	}
@@ -1019,51 +1060,50 @@ public class ETPhysGrammarAccess 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.etphys/src-gen/org/eclipse/etrice/core/etphys/validation/AbstractETPhysJavaValidator.java b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/validation/AbstractETPhysJavaValidator.java
index e570d69ef..6560f2f4d 100644
--- a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/validation/AbstractETPhysJavaValidator.java
+++ b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/validation/AbstractETPhysJavaValidator.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.etphys.validation;
  
 import java.util.ArrayList;
diff --git a/plugins/org.eclipse.etrice.core.fsm.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.fsm.ui/META-INF/MANIFEST.MF
index a9a671584..78b11ef45 100644
--- a/plugins/org.eclipse.etrice.core.fsm.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.fsm.ui/META-INF/MANIFEST.MF
@@ -26,5 +26,6 @@ Export-Package: org.eclipse.etrice.core.fsm.ui,
  org.eclipse.etrice.core.fsm.ui.contentassist.antlr,
  org.eclipse.etrice.core.fsm.ui.internal,
  org.eclipse.etrice.core.fsm.ui.labeling,
- org.eclipse.etrice.core.fsm.ui.quickfix
+ org.eclipse.etrice.core.fsm.ui.quickfix,
+ org.eclipse.etrice.core.fsm.ui.contentassist.antlr.internal
 Bundle-Activator: org.eclipse.etrice.core.fsm.ui.internal.FSMActivator
diff --git a/plugins/org.eclipse.etrice.core.fsm.ui/plugin.xml_gen b/plugins/org.eclipse.etrice.core.fsm.ui/plugin.xml_gen
index b0eb15887..03a8f032c 100644
--- a/plugins/org.eclipse.etrice.core.fsm.ui/plugin.xml_gen
+++ b/plugins/org.eclipse.etrice.core.fsm.ui/plugin.xml_gen
@@ -279,6 +279,27 @@
 	        <filter name="projectNature" value="org.eclipse.xtext.ui.shared.xtextNature"/>
         </page>
     </extension>
+    <extension point="org.eclipse.ui.menus">
+		<menuContribution locationURI="popup:#TextEditorContext?after=xtext.ui.openDeclaration">
+			<command
+				commandId="org.eclipse.xtext.ui.OpenGeneratedFileCommand"
+				id="org.eclipse.etrice.core.fsm.FSM.OpenGeneratedCode"
+				style="push">
+					<visibleWhen checkEnabled="false">
+						<reference definitionId="org.eclipse.etrice.core.fsm.FSM.Editor.opened" />
+					</visibleWhen>
+			</command>
+		</menuContribution>
+	</extension>
+	<extension point="org.eclipse.ui.handlers">
+		<handler
+			class="org.eclipse.etrice.core.fsm.ui.FSMExecutableExtensionFactory:org.eclipse.xtext.ui.generator.trace.OpenGeneratedFileHandler"
+			commandId="org.eclipse.xtext.ui.OpenGeneratedFileCommand">
+				<activeWhen>
+					<reference definitionId="org.eclipse.etrice.core.fsm.FSM.Editor.opened" />
+				</activeWhen>
+		</handler>
+	</extension>
 
 	<!-- Quick Outline -->
 	<extension
@@ -394,5 +415,11 @@
             extensions="fsm">
     </provider>
   </extension>
+  <extension point="org.eclipse.team.core.fileTypes">
+    <fileTypes
+            extension="fsm"
+            type="text">
+    </fileTypes>
+  </extension>
 
 </plugin>
diff --git a/plugins/org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/AbstractFSMUiModule.java b/plugins/org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/AbstractFSMUiModule.java
index 850f64b3e..45a1dc342 100644
--- a/plugins/org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/AbstractFSMUiModule.java
+++ b/plugins/org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/AbstractFSMUiModule.java
@@ -4,14 +4,13 @@
  */
 package org.eclipse.etrice.core.fsm.ui;
 
-import org.eclipse.xtext.ui.DefaultUiModule;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 
 /**
  * Manual modifications go to {org.eclipse.etrice.core.fsm.ui.FSMUiModule}
  */
 @SuppressWarnings("all")
-public abstract class AbstractFSMUiModule extends DefaultUiModule {
+public abstract class AbstractFSMUiModule extends org.eclipse.xtext.ui.DefaultUiModule {
 	
 	public AbstractFSMUiModule(AbstractUIPlugin plugin) {
 		super(plugin);
@@ -59,6 +58,11 @@ public abstract class AbstractFSMUiModule extends DefaultUiModule {
 	}
 
 	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
+	public Class<? extends org.eclipse.xtext.generator.IContextualOutputConfigurationProvider> bindIContextualOutputConfigurationProvider() {
+		return org.eclipse.xtext.builder.EclipseOutputConfigurationProvider.class;
+	}
+
+	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
 	public void configureIResourceDescriptionsPersisted(com.google.inject.Binder binder) {
 		binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.PERSISTED_DESCRIPTIONS)).to(org.eclipse.xtext.builder.builderState.IBuilderState.class);
 	}
diff --git a/plugins/org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/AbstractFSMProposalProvider.java b/plugins/org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/AbstractFSMProposalProvider.java
index 39c396339..e67229bc4 100644
--- a/plugins/org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/AbstractFSMProposalProvider.java
+++ b/plugins/org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/AbstractFSMProposalProvider.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.fsm.ui.contentassist;
 
 import org.eclipse.emf.ecore.EObject;
@@ -311,6 +311,9 @@ public class AbstractFSMProposalProvider extends org.eclipse.etrice.core.common.
 	public void complete_ChoicePoint(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
+	public void complete_TransitionBase(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		// subclasses may override
+	}
 	public void complete_Transition(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
diff --git a/plugins/org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/FSMParser.java b/plugins/org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/FSMParser.java
index 6511908f6..e018236ba 100644
--- a/plugins/org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/FSMParser.java
+++ b/plugins/org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/FSMParser.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.fsm.ui.contentassist.antlr;
 
 import java.util.Collection;
@@ -43,6 +43,7 @@ public class FSMParser extends AbstractContentAssistParser {
 					put(grammarAccess.getStateMachineAccess().getAlternatives_3(), "rule__StateMachine__Alternatives_3");
 					put(grammarAccess.getStateAccess().getAlternatives(), "rule__State__Alternatives");
 					put(grammarAccess.getTrPointAccess().getAlternatives(), "rule__TrPoint__Alternatives");
+					put(grammarAccess.getTransitionBaseAccess().getAlternatives(), "rule__TransitionBase__Alternatives");
 					put(grammarAccess.getTransitionAccess().getAlternatives(), "rule__Transition__Alternatives");
 					put(grammarAccess.getNonInitialTransitionAccess().getAlternatives(), "rule__NonInitialTransition__Alternatives");
 					put(grammarAccess.getTransitionChainStartTransitionAccess().getAlternatives(), "rule__TransitionChainStartTransition__Alternatives");
diff --git a/plugins/org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/PartialFSMContentAssistParser.java b/plugins/org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/PartialFSMContentAssistParser.java
index f30185465..78cf9783c 100644
--- a/plugins/org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/PartialFSMContentAssistParser.java
+++ b/plugins/org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/PartialFSMContentAssistParser.java
@@ -12,14 +12,14 @@ import org.eclipse.xtext.ui.editor.contentassist.antlr.FollowElement;
 import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.AbstractInternalContentAssistParser;
 import org.eclipse.xtext.util.PolymorphicDispatcher;
 
-/**
- * @author Sebastian Zarnekow - Initial contribution and API
+/*
+ * Template CodetemplatesGeneratorFragment.xpt
  */
-@SuppressWarnings("restriction")
 public class PartialFSMContentAssistParser extends FSMParser implements IPartialContentAssistParser {
 
 	private AbstractRule rule;
 
+	@Override
 	public void initializeFor(AbstractRule rule) {
 		this.rule = rule;
 	}
diff --git a/plugins/org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g b/plugins/org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g
index 648aaab1b..a6784637d 100644
--- a/plugins/org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g
+++ b/plugins/org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 grammar InternalFSM;
 
 options {
@@ -450,6 +450,8 @@ finally {
 
 
 
+
+
 // Entry rule entryRuleTransition
 entryRuleTransition 
 :
@@ -1742,6 +1744,7 @@ finally {
 	restoreStackSize(stackSize);
 }
 
+
 rule__Transition__Alternatives
     @init {
 		int stackSize = keepStackSize();
diff --git a/plugins/org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSMLexer.java b/plugins/org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSMLexer.java
index b8892e6a3..d72cf9b35 100644
--- a/plugins/org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSMLexer.java
+++ b/plugins/org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/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.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/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.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11:7: ( 'mandatory' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11:9: 'mandatory'
+            // InternalFSM.g:11:7: ( 'mandatory' )
+            // InternalFSM.g:11:9: 'mandatory'
             {
             match("mandatory"); 
 
@@ -121,8 +121,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__13;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:12:7: ( 'false' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:12:9: 'false'
+            // InternalFSM.g:12:7: ( 'false' )
+            // InternalFSM.g:12:9: 'false'
             {
             match("false"); 
 
@@ -142,8 +142,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__14;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:13:7: ( '+' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:13:9: '+'
+            // InternalFSM.g:13:7: ( '+' )
+            // InternalFSM.g:13:9: '+'
             {
             match('+'); 
 
@@ -162,8 +162,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__15;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:14:7: ( '-' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:14:9: '-'
+            // InternalFSM.g:14:7: ( '-' )
+            // InternalFSM.g:14:9: '-'
             {
             match('-'); 
 
@@ -182,8 +182,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__16;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:15:7: ( 'e' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:15:9: 'e'
+            // InternalFSM.g:15:7: ( 'e' )
+            // InternalFSM.g:15:9: 'e'
             {
             match('e'); 
 
@@ -202,8 +202,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__17;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:16:7: ( 'E' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:16:9: 'E'
+            // InternalFSM.g:16:7: ( 'E' )
+            // InternalFSM.g:16:9: 'E'
             {
             match('E'); 
 
@@ -222,8 +222,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__18;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:17:7: ( 'eventdriven' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:17:9: 'eventdriven'
+            // InternalFSM.g:17:7: ( 'eventdriven' )
+            // InternalFSM.g:17:9: 'eventdriven'
             {
             match("eventdriven"); 
 
@@ -243,8 +243,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__19;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:18:7: ( 'datadriven' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:18:9: 'datadriven'
+            // InternalFSM.g:18:7: ( 'datadriven' )
+            // InternalFSM.g:18:9: 'datadriven'
             {
             match("datadriven"); 
 
@@ -264,8 +264,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__20;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:19:7: ( 'async' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:19:9: 'async'
+            // InternalFSM.g:19:7: ( 'async' )
+            // InternalFSM.g:19:9: 'async'
             {
             match("async"); 
 
@@ -285,8 +285,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__21;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:20:7: ( 'sync' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:20:9: 'sync'
+            // InternalFSM.g:20:7: ( 'sync' )
+            // InternalFSM.g:20:9: 'sync'
             {
             match("sync"); 
 
@@ -306,8 +306,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__22;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:21:7: ( 'ptBoolean' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:21:9: 'ptBoolean'
+            // InternalFSM.g:21:7: ( 'ptBoolean' )
+            // InternalFSM.g:21:9: 'ptBoolean'
             {
             match("ptBoolean"); 
 
@@ -327,8 +327,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__23;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:22:7: ( 'ptInteger' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:22:9: 'ptInteger'
+            // InternalFSM.g:22:7: ( 'ptInteger' )
+            // InternalFSM.g:22:9: 'ptInteger'
             {
             match("ptInteger"); 
 
@@ -348,8 +348,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__24;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:23:7: ( 'ptReal' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:23:9: 'ptReal'
+            // InternalFSM.g:23:7: ( 'ptReal' )
+            // InternalFSM.g:23:9: 'ptReal'
             {
             match("ptReal"); 
 
@@ -369,8 +369,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__25;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:24:7: ( 'ptCharacter' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:24:9: 'ptCharacter'
+            // InternalFSM.g:24:7: ( 'ptCharacter' )
+            // InternalFSM.g:24:9: 'ptCharacter'
             {
             match("ptCharacter"); 
 
@@ -390,8 +390,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__26;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:25:7: ( 'ModelComponent' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:25:9: 'ModelComponent'
+            // InternalFSM.g:25:7: ( 'ModelComponent' )
+            // InternalFSM.g:25:9: 'ModelComponent'
             {
             match("ModelComponent"); 
 
@@ -411,8 +411,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__27;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:26:7: ( 'extends' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:26:9: 'extends'
+            // InternalFSM.g:26:7: ( 'extends' )
+            // InternalFSM.g:26:9: 'extends'
             {
             match("extends"); 
 
@@ -432,8 +432,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__28;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:27:7: ( '{' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:27:9: '{'
+            // InternalFSM.g:27:7: ( '{' )
+            // InternalFSM.g:27:9: '{'
             {
             match('{'); 
 
@@ -452,8 +452,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__29;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:28:7: ( '}' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:28:9: '}'
+            // InternalFSM.g:28:7: ( '}' )
+            // InternalFSM.g:28:9: '}'
             {
             match('}'); 
 
@@ -472,8 +472,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__30;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:29:7: ( 'StateMachine' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:29:9: 'StateMachine'
+            // InternalFSM.g:29:7: ( 'StateMachine' )
+            // InternalFSM.g:29:9: 'StateMachine'
             {
             match("StateMachine"); 
 
@@ -493,8 +493,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__31;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:30:7: ( 'State' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:30:9: 'State'
+            // InternalFSM.g:30:7: ( 'State' )
+            // InternalFSM.g:30:9: 'State'
             {
             match("State"); 
 
@@ -514,8 +514,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__32;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:31:7: ( 'entry' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:31:9: 'entry'
+            // InternalFSM.g:31:7: ( 'entry' )
+            // InternalFSM.g:31:9: 'entry'
             {
             match("entry"); 
 
@@ -535,8 +535,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__33;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:32:7: ( 'exit' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:32:9: 'exit'
+            // InternalFSM.g:32:7: ( 'exit' )
+            // InternalFSM.g:32:9: 'exit'
             {
             match("exit"); 
 
@@ -556,8 +556,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__34;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:33:7: ( 'do' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:33:9: 'do'
+            // InternalFSM.g:33:7: ( 'do' )
+            // InternalFSM.g:33:9: 'do'
             {
             match("do"); 
 
@@ -577,8 +577,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__35;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:34:7: ( 'subgraph' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:34:9: 'subgraph'
+            // InternalFSM.g:34:7: ( 'subgraph' )
+            // InternalFSM.g:34:9: 'subgraph'
             {
             match("subgraph"); 
 
@@ -598,8 +598,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__36;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:35:7: ( 'RefinedState' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:35:9: 'RefinedState'
+            // InternalFSM.g:35:7: ( 'RefinedState' )
+            // InternalFSM.g:35:9: 'RefinedState'
             {
             match("RefinedState"); 
 
@@ -619,8 +619,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__37;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:36:7: ( 'TransitionPoint' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:36:9: 'TransitionPoint'
+            // InternalFSM.g:36:7: ( 'TransitionPoint' )
+            // InternalFSM.g:36:9: 'TransitionPoint'
             {
             match("TransitionPoint"); 
 
@@ -640,8 +640,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__38;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:37:7: ( 'EntryPoint' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:37:9: 'EntryPoint'
+            // InternalFSM.g:37:7: ( 'EntryPoint' )
+            // InternalFSM.g:37:9: 'EntryPoint'
             {
             match("EntryPoint"); 
 
@@ -661,8 +661,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__39;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:38:7: ( 'ExitPoint' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:38:9: 'ExitPoint'
+            // InternalFSM.g:38:7: ( 'ExitPoint' )
+            // InternalFSM.g:38:9: 'ExitPoint'
             {
             match("ExitPoint"); 
 
@@ -682,8 +682,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__40;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:39:7: ( 'ChoicePoint' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:39:9: 'ChoicePoint'
+            // InternalFSM.g:39:7: ( 'ChoicePoint' )
+            // InternalFSM.g:39:9: 'ChoicePoint'
             {
             match("ChoicePoint"); 
 
@@ -703,8 +703,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__41;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:40:7: ( 'Transition' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:40:9: 'Transition'
+            // InternalFSM.g:40:7: ( 'Transition' )
+            // InternalFSM.g:40:9: 'Transition'
             {
             match("Transition"); 
 
@@ -724,8 +724,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__42;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:41:7: ( ':' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:41:9: ':'
+            // InternalFSM.g:41:7: ( ':' )
+            // InternalFSM.g:41:9: ':'
             {
             match(':'); 
 
@@ -744,8 +744,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__43;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:42:7: ( 'initial' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:42:9: 'initial'
+            // InternalFSM.g:42:7: ( 'initial' )
+            // InternalFSM.g:42:9: 'initial'
             {
             match("initial"); 
 
@@ -765,8 +765,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__44;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:43:7: ( '->' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:43:9: '->'
+            // InternalFSM.g:43:7: ( '->' )
+            // InternalFSM.g:43:9: '->'
             {
             match("->"); 
 
@@ -786,8 +786,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__45;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:44:7: ( 'action' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:44:9: 'action'
+            // InternalFSM.g:44:7: ( 'action' )
+            // InternalFSM.g:44:9: 'action'
             {
             match("action"); 
 
@@ -807,8 +807,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__46;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:45:7: ( 'triggers' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:45:9: 'triggers'
+            // InternalFSM.g:45:7: ( 'triggers' )
+            // InternalFSM.g:45:9: 'triggers'
             {
             match("triggers"); 
 
@@ -828,8 +828,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__47;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:46:7: ( 'or' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:46:9: 'or'
+            // InternalFSM.g:46:7: ( 'or' )
+            // InternalFSM.g:46:9: 'or'
             {
             match("or"); 
 
@@ -849,8 +849,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__48;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:47:7: ( 'guard' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:47:9: 'guard'
+            // InternalFSM.g:47:7: ( 'guard' )
+            // InternalFSM.g:47:9: 'guard'
             {
             match("guard"); 
 
@@ -870,8 +870,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__49;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:48:7: ( 'cond' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:48:9: 'cond'
+            // InternalFSM.g:48:7: ( 'cond' )
+            // InternalFSM.g:48:9: 'cond'
             {
             match("cond"); 
 
@@ -891,8 +891,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__50;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:49:7: ( 'RefinedTransition' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:49:9: 'RefinedTransition'
+            // InternalFSM.g:49:7: ( 'RefinedTransition' )
+            // InternalFSM.g:49:9: 'RefinedTransition'
             {
             match("RefinedTransition"); 
 
@@ -912,8 +912,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__51;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:50:7: ( 'my' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:50:9: 'my'
+            // InternalFSM.g:50:7: ( 'my' )
+            // InternalFSM.g:50:9: 'my'
             {
             match("my"); 
 
@@ -933,8 +933,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__52;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:51:7: ( 'of' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:51:9: 'of'
+            // InternalFSM.g:51:7: ( 'of' )
+            // InternalFSM.g:51:9: 'of'
             {
             match("of"); 
 
@@ -954,8 +954,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__53;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:52:7: ( 'cp' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:52:9: 'cp'
+            // InternalFSM.g:52:7: ( 'cp' )
+            // InternalFSM.g:52:9: 'cp'
             {
             match("cp"); 
 
@@ -975,8 +975,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__54;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:53:7: ( '<' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:53:9: '<'
+            // InternalFSM.g:53:7: ( '<' )
+            // InternalFSM.g:53:9: '<'
             {
             match('<'); 
 
@@ -995,8 +995,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__55;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:54:7: ( '>' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:54:9: '>'
+            // InternalFSM.g:54:7: ( '>' )
+            // InternalFSM.g:54:9: '>'
             {
             match('>'); 
 
@@ -1015,8 +1015,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__56;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:55:7: ( '|' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:55:9: '|'
+            // InternalFSM.g:55:7: ( '|' )
+            // InternalFSM.g:55:9: '|'
             {
             match('|'); 
 
@@ -1035,8 +1035,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__57;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:56:7: ( 'in' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:56:9: 'in'
+            // InternalFSM.g:56:7: ( 'in' )
+            // InternalFSM.g:56:9: 'in'
             {
             match("in"); 
 
@@ -1056,8 +1056,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__58;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:57:7: ( '(' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:57:9: '('
+            // InternalFSM.g:57:7: ( '(' )
+            // InternalFSM.g:57:9: '('
             {
             match('('); 
 
@@ -1076,8 +1076,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__59;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:58:7: ( ')' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:58:9: ')'
+            // InternalFSM.g:58:7: ( ')' )
+            // InternalFSM.g:58:9: ')'
             {
             match(')'); 
 
@@ -1096,8 +1096,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__60;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:59:7: ( ',' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:59:9: ','
+            // InternalFSM.g:59:7: ( ',' )
+            // InternalFSM.g:59:9: ','
             {
             match(','); 
 
@@ -1116,8 +1116,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__61;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:60:7: ( 'out' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:60:9: 'out'
+            // InternalFSM.g:60:7: ( 'out' )
+            // InternalFSM.g:60:9: 'out'
             {
             match("out"); 
 
@@ -1137,8 +1137,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__62;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:61:7: ( '=' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:61:9: '='
+            // InternalFSM.g:61:7: ( '=' )
+            // InternalFSM.g:61:9: '='
             {
             match('='); 
 
@@ -1157,8 +1157,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__63;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:62:7: ( 'attribute' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:62:9: 'attribute'
+            // InternalFSM.g:62:7: ( 'attribute' )
+            // InternalFSM.g:62:9: 'attribute'
             {
             match("attribute"); 
 
@@ -1178,8 +1178,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__64;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:63:7: ( '.*' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:63:9: '.*'
+            // InternalFSM.g:63:7: ( '.*' )
+            // InternalFSM.g:63:9: '.*'
             {
             match(".*"); 
 
@@ -1199,8 +1199,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__65;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:64:7: ( '[' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:64:9: '['
+            // InternalFSM.g:64:7: ( '[' )
+            // InternalFSM.g:64:9: '['
             {
             match('['); 
 
@@ -1219,8 +1219,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__66;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:65:7: ( ']' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:65:9: ']'
+            // InternalFSM.g:65:7: ( ']' )
+            // InternalFSM.g:65:9: ']'
             {
             match(']'); 
 
@@ -1239,8 +1239,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__67;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:66:7: ( '.' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:66:9: '.'
+            // InternalFSM.g:66:7: ( '.' )
+            // InternalFSM.g:66:9: '.'
             {
             match('.'); 
 
@@ -1259,8 +1259,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__68;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:67:7: ( 'abstract' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:67:9: 'abstract'
+            // InternalFSM.g:67:7: ( 'abstract' )
+            // InternalFSM.g:67:9: 'abstract'
             {
             match("abstract"); 
 
@@ -1280,8 +1280,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__69;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:68:7: ( 'handler' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:68:9: 'handler'
+            // InternalFSM.g:68:7: ( 'handler' )
+            // InternalFSM.g:68:9: 'handler'
             {
             match("handler"); 
 
@@ -1301,8 +1301,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__70;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:69:7: ( 'optional' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:69:9: 'optional'
+            // InternalFSM.g:69:7: ( 'optional' )
+            // InternalFSM.g:69:9: 'optional'
             {
             match("optional"); 
 
@@ -1322,8 +1322,8 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = T__71;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:70:7: ( 'true' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:70:9: 'true'
+            // InternalFSM.g:70:7: ( 'true' )
+            // InternalFSM.g:70:9: 'true'
             {
             match("true"); 
 
@@ -1343,10 +1343,10 @@ public class InternalFSMLexer extends Lexer {
         try {
             int _type = RULE_HEX;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11555:10: ( ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+ )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11555:12: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+
+            // InternalFSM.g:11558:10: ( ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+ )
+            // InternalFSM.g:11558:12: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11555:12: ( '0x' | '0X' )
+            // InternalFSM.g:11558: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.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11555:13: '0x'
+                    // InternalFSM.g:11558:13: '0x'
                     {
                     match("0x"); 
 
@@ -1382,7 +1382,7 @@ public class InternalFSMLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11555:18: '0X'
+                    // InternalFSM.g:11558:18: '0X'
                     {
                     match("0X"); 
 
@@ -1392,7 +1392,7 @@ public class InternalFSMLexer extends Lexer {
 
             }
 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11555:24: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+
+            // InternalFSM.g:11558: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.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/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.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11557:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11557:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalFSM.g:11560:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+            // InternalFSM.g:11560:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11557:11: ( '^' )?
+            // InternalFSM.g:11560: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.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11557:11: '^'
+                    // InternalFSM.g:11560:11: '^'
                     {
                     match('^'); 
 
@@ -1476,7 +1476,7 @@ public class InternalFSMLexer extends Lexer {
                 recover(mse);
                 throw mse;}
 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11557:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalFSM.g:11560: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.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/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.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11559:10: ( ( '0' .. '9' )+ )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11559:12: ( '0' .. '9' )+
+            // InternalFSM.g:11562:10: ( ( '0' .. '9' )+ )
+            // InternalFSM.g:11562:12: ( '0' .. '9' )+
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11559:12: ( '0' .. '9' )+
+            // InternalFSM.g:11562: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.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11559:13: '0' .. '9'
+            	    // InternalFSM.g:11562: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.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11561:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11561:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalFSM.g:11564:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+            // InternalFSM.g:11564:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11561:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalFSM.g:11564: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.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11561:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+                    // InternalFSM.g:11564:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
                     {
                     match('\"'); 
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11561:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+                    // InternalFSM.g:11564:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
                     loop6:
                     do {
                         int alt6=3;
@@ -1614,7 +1614,7 @@ public class InternalFSMLexer extends Lexer {
 
                         switch (alt6) {
                     	case 1 :
-                    	    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11561:21: '\\\\' .
+                    	    // InternalFSM.g:11564:21: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -1622,7 +1622,7 @@ public class InternalFSMLexer extends Lexer {
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11561:28: ~ ( ( '\\\\' | '\"' ) )
+                    	    // InternalFSM.g:11564: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.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11561:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+                    // InternalFSM.g:11564:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
                     {
                     match('\''); 
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11561:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+                    // InternalFSM.g:11564:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
                     loop7:
                     do {
                         int alt7=3;
@@ -1666,7 +1666,7 @@ public class InternalFSMLexer extends Lexer {
 
                         switch (alt7) {
                     	case 1 :
-                    	    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11561:54: '\\\\' .
+                    	    // InternalFSM.g:11564:54: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -1674,7 +1674,7 @@ public class InternalFSMLexer extends Lexer {
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11561:61: ~ ( ( '\\\\' | '\\'' ) )
+                    	    // InternalFSM.g:11564: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.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11563:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11563:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // InternalFSM.g:11566:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // InternalFSM.g:11566:19: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); 
 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11563:24: ( options {greedy=false; } : . )*
+            // InternalFSM.g:11566: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.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11563:52: .
+            	    // InternalFSM.g:11566: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.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11565:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11565:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // InternalFSM.g:11568:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // InternalFSM.g:11568:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
             {
             match("//"); 
 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11565:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            // InternalFSM.g:11568: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.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11565:24: ~ ( ( '\\n' | '\\r' ) )
+            	    // InternalFSM.g:11568: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.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11565:40: ( ( '\\r' )? '\\n' )?
+            // InternalFSM.g:11568: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.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11565:41: ( '\\r' )? '\\n'
+                    // InternalFSM.g:11568:41: ( '\\r' )? '\\n'
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11565:41: ( '\\r' )?
+                    // InternalFSM.g:11568: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.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11565:41: '\\r'
+                            // InternalFSM.g:11568: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.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11567:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11567:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalFSM.g:11570:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // InternalFSM.g:11570:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11567:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalFSM.g:11570: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.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/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.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11569:16: ( . )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11569:18: .
+            // InternalFSM.g:11572:16: ( . )
+            // InternalFSM.g:11572: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.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/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.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:10: T__12
+                // InternalFSM.g:1:10: T__12
                 {
                 mT__12(); 
 
                 }
                 break;
             case 2 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:16: T__13
+                // InternalFSM.g:1:16: T__13
                 {
                 mT__13(); 
 
                 }
                 break;
             case 3 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:22: T__14
+                // InternalFSM.g:1:22: T__14
                 {
                 mT__14(); 
 
                 }
                 break;
             case 4 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:28: T__15
+                // InternalFSM.g:1:28: T__15
                 {
                 mT__15(); 
 
                 }
                 break;
             case 5 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:34: T__16
+                // InternalFSM.g:1:34: T__16
                 {
                 mT__16(); 
 
                 }
                 break;
             case 6 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:40: T__17
+                // InternalFSM.g:1:40: T__17
                 {
                 mT__17(); 
 
                 }
                 break;
             case 7 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:46: T__18
+                // InternalFSM.g:1:46: T__18
                 {
                 mT__18(); 
 
                 }
                 break;
             case 8 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:52: T__19
+                // InternalFSM.g:1:52: T__19
                 {
                 mT__19(); 
 
                 }
                 break;
             case 9 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:58: T__20
+                // InternalFSM.g:1:58: T__20
                 {
                 mT__20(); 
 
                 }
                 break;
             case 10 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:64: T__21
+                // InternalFSM.g:1:64: T__21
                 {
                 mT__21(); 
 
                 }
                 break;
             case 11 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:70: T__22
+                // InternalFSM.g:1:70: T__22
                 {
                 mT__22(); 
 
                 }
                 break;
             case 12 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:76: T__23
+                // InternalFSM.g:1:76: T__23
                 {
                 mT__23(); 
 
                 }
                 break;
             case 13 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:82: T__24
+                // InternalFSM.g:1:82: T__24
                 {
                 mT__24(); 
 
                 }
                 break;
             case 14 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:88: T__25
+                // InternalFSM.g:1:88: T__25
                 {
                 mT__25(); 
 
                 }
                 break;
             case 15 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:94: T__26
+                // InternalFSM.g:1:94: T__26
                 {
                 mT__26(); 
 
                 }
                 break;
             case 16 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:100: T__27
+                // InternalFSM.g:1:100: T__27
                 {
                 mT__27(); 
 
                 }
                 break;
             case 17 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:106: T__28
+                // InternalFSM.g:1:106: T__28
                 {
                 mT__28(); 
 
                 }
                 break;
             case 18 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:112: T__29
+                // InternalFSM.g:1:112: T__29
                 {
                 mT__29(); 
 
                 }
                 break;
             case 19 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:118: T__30
+                // InternalFSM.g:1:118: T__30
                 {
                 mT__30(); 
 
                 }
                 break;
             case 20 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:124: T__31
+                // InternalFSM.g:1:124: T__31
                 {
                 mT__31(); 
 
                 }
                 break;
             case 21 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:130: T__32
+                // InternalFSM.g:1:130: T__32
                 {
                 mT__32(); 
 
                 }
                 break;
             case 22 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:136: T__33
+                // InternalFSM.g:1:136: T__33
                 {
                 mT__33(); 
 
                 }
                 break;
             case 23 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:142: T__34
+                // InternalFSM.g:1:142: T__34
                 {
                 mT__34(); 
 
                 }
                 break;
             case 24 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:148: T__35
+                // InternalFSM.g:1:148: T__35
                 {
                 mT__35(); 
 
                 }
                 break;
             case 25 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:154: T__36
+                // InternalFSM.g:1:154: T__36
                 {
                 mT__36(); 
 
                 }
                 break;
             case 26 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:160: T__37
+                // InternalFSM.g:1:160: T__37
                 {
                 mT__37(); 
 
                 }
                 break;
             case 27 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:166: T__38
+                // InternalFSM.g:1:166: T__38
                 {
                 mT__38(); 
 
                 }
                 break;
             case 28 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:172: T__39
+                // InternalFSM.g:1:172: T__39
                 {
                 mT__39(); 
 
                 }
                 break;
             case 29 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:178: T__40
+                // InternalFSM.g:1:178: T__40
                 {
                 mT__40(); 
 
                 }
                 break;
             case 30 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:184: T__41
+                // InternalFSM.g:1:184: T__41
                 {
                 mT__41(); 
 
                 }
                 break;
             case 31 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:190: T__42
+                // InternalFSM.g:1:190: T__42
                 {
                 mT__42(); 
 
                 }
                 break;
             case 32 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:196: T__43
+                // InternalFSM.g:1:196: T__43
                 {
                 mT__43(); 
 
                 }
                 break;
             case 33 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:202: T__44
+                // InternalFSM.g:1:202: T__44
                 {
                 mT__44(); 
 
                 }
                 break;
             case 34 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:208: T__45
+                // InternalFSM.g:1:208: T__45
                 {
                 mT__45(); 
 
                 }
                 break;
             case 35 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:214: T__46
+                // InternalFSM.g:1:214: T__46
                 {
                 mT__46(); 
 
                 }
                 break;
             case 36 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:220: T__47
+                // InternalFSM.g:1:220: T__47
                 {
                 mT__47(); 
 
                 }
                 break;
             case 37 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:226: T__48
+                // InternalFSM.g:1:226: T__48
                 {
                 mT__48(); 
 
                 }
                 break;
             case 38 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:232: T__49
+                // InternalFSM.g:1:232: T__49
                 {
                 mT__49(); 
 
                 }
                 break;
             case 39 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:238: T__50
+                // InternalFSM.g:1:238: T__50
                 {
                 mT__50(); 
 
                 }
                 break;
             case 40 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:244: T__51
+                // InternalFSM.g:1:244: T__51
                 {
                 mT__51(); 
 
                 }
                 break;
             case 41 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:250: T__52
+                // InternalFSM.g:1:250: T__52
                 {
                 mT__52(); 
 
                 }
                 break;
             case 42 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:256: T__53
+                // InternalFSM.g:1:256: T__53
                 {
                 mT__53(); 
 
                 }
                 break;
             case 43 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:262: T__54
+                // InternalFSM.g:1:262: T__54
                 {
                 mT__54(); 
 
                 }
                 break;
             case 44 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:268: T__55
+                // InternalFSM.g:1:268: T__55
                 {
                 mT__55(); 
 
                 }
                 break;
             case 45 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:274: T__56
+                // InternalFSM.g:1:274: T__56
                 {
                 mT__56(); 
 
                 }
                 break;
             case 46 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:280: T__57
+                // InternalFSM.g:1:280: T__57
                 {
                 mT__57(); 
 
                 }
                 break;
             case 47 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:286: T__58
+                // InternalFSM.g:1:286: T__58
                 {
                 mT__58(); 
 
                 }
                 break;
             case 48 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:292: T__59
+                // InternalFSM.g:1:292: T__59
                 {
                 mT__59(); 
 
                 }
                 break;
             case 49 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:298: T__60
+                // InternalFSM.g:1:298: T__60
                 {
                 mT__60(); 
 
                 }
                 break;
             case 50 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:304: T__61
+                // InternalFSM.g:1:304: T__61
                 {
                 mT__61(); 
 
                 }
                 break;
             case 51 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:310: T__62
+                // InternalFSM.g:1:310: T__62
                 {
                 mT__62(); 
 
                 }
                 break;
             case 52 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:316: T__63
+                // InternalFSM.g:1:316: T__63
                 {
                 mT__63(); 
 
                 }
                 break;
             case 53 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:322: T__64
+                // InternalFSM.g:1:322: T__64
                 {
                 mT__64(); 
 
                 }
                 break;
             case 54 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:328: T__65
+                // InternalFSM.g:1:328: T__65
                 {
                 mT__65(); 
 
                 }
                 break;
             case 55 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:334: T__66
+                // InternalFSM.g:1:334: T__66
                 {
                 mT__66(); 
 
                 }
                 break;
             case 56 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:340: T__67
+                // InternalFSM.g:1:340: T__67
                 {
                 mT__67(); 
 
                 }
                 break;
             case 57 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:346: T__68
+                // InternalFSM.g:1:346: T__68
                 {
                 mT__68(); 
 
                 }
                 break;
             case 58 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:352: T__69
+                // InternalFSM.g:1:352: T__69
                 {
                 mT__69(); 
 
                 }
                 break;
             case 59 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:358: T__70
+                // InternalFSM.g:1:358: T__70
                 {
                 mT__70(); 
 
                 }
                 break;
             case 60 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:364: T__71
+                // InternalFSM.g:1:364: T__71
                 {
                 mT__71(); 
 
                 }
                 break;
             case 61 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:370: RULE_HEX
+                // InternalFSM.g:1:370: RULE_HEX
                 {
                 mRULE_HEX(); 
 
                 }
                 break;
             case 62 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:379: RULE_ID
+                // InternalFSM.g:1:379: RULE_ID
                 {
                 mRULE_ID(); 
 
                 }
                 break;
             case 63 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:387: RULE_INT
+                // InternalFSM.g:1:387: RULE_INT
                 {
                 mRULE_INT(); 
 
                 }
                 break;
             case 64 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:396: RULE_STRING
+                // InternalFSM.g:1:396: RULE_STRING
                 {
                 mRULE_STRING(); 
 
                 }
                 break;
             case 65 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/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.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/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.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:440: RULE_WS
+                // InternalFSM.g:1:440: RULE_WS
                 {
                 mRULE_WS(); 
 
                 }
                 break;
             case 68 :
-                // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1:448: RULE_ANY_OTHER
+                // InternalFSM.g:1:448: RULE_ANY_OTHER
                 {
                 mRULE_ANY_OTHER(); 
 
@@ -2428,114 +2428,25 @@ public class InternalFSMLexer extends Lexer {
 
     protected DFA14 dfa14 = new DFA14(this);
     static final String DFA14_eotS =
-        "\1\uffff\2\56\1\uffff\1\62\1\66\1\71\5\56\2\uffff\4\56\1\uffff"+
-        "\5\56\7\uffff\1\134\2\uffff\1\56\1\141\1\53\2\uffff\3\53\2\uffff"+
-        "\1\56\1\147\1\uffff\1\56\3\uffff\3\56\1\uffff\2\56\1\uffff\1\56"+
-        "\1\160\10\56\2\uffff\4\56\1\uffff\1\u0081\1\56\1\u0084\1\u0085\4"+
-        "\56\1\u008a\13\uffff\1\56\6\uffff\1\56\1\uffff\10\56\1\uffff\20"+
-        "\56\1\uffff\2\56\2\uffff\1\u00a7\3\56\1\uffff\5\56\1\u00b0\10\56"+
-        "\1\u00b9\14\56\1\u00c6\1\uffff\2\56\1\u00c9\2\56\1\u00cc\2\56\1"+
-        "\uffff\1\u00cf\3\56\1\u00d3\3\56\1\uffff\6\56\1\u00de\5\56\1\uffff"+
-        "\1\56\1\u00e5\1\uffff\2\56\1\uffff\2\56\1\uffff\3\56\1\uffff\1\u00ed"+
-        "\5\56\1\u00f3\3\56\1\uffff\6\56\1\uffff\3\56\1\u0100\3\56\1\uffff"+
-        "\5\56\1\uffff\6\56\1\u0110\2\56\1\u0113\2\56\1\uffff\4\56\1\u011a"+
-        "\1\u011b\11\56\1\uffff\1\u0125\1\u0126\1\uffff\1\u0127\2\56\1\u012a"+
-        "\1\56\1\u012c\2\uffff\1\u012d\1\u012e\7\56\3\uffff\1\56\1\u0137"+
-        "\1\uffff\1\u0138\3\uffff\5\56\1\u013f\1\56\1\u0141\2\uffff\1\u0142"+
-        "\5\56\1\uffff\1\u0148\2\uffff\1\56\1\u014a\1\u014b\2\56\1\uffff"+
-        "\1\56\2\uffff\2\56\1\u0151\2\56\1\uffff\1\56\1\u0155\1\56\1\uffff"+
-        "\1\u0157\1\uffff";
+        "\1\uffff\2\56\1\uffff\1\62\1\66\1\71\5\56\2\uffff\4\56\1\uffff\5\56\7\uffff\1\134\2\uffff\1\56\1\141\1\53\2\uffff\3\53\2\uffff\1\56\1\147\1\uffff\1\56\3\uffff\3\56\1\uffff\2\56\1\uffff\1\56\1\160\10\56\2\uffff\4\56\1\uffff\1\u0081\1\56\1\u0084\1\u0085\4\56\1\u008a\13\uffff\1\56\6\uffff\1\56\1\uffff\10\56\1\uffff\20\56\1\uffff\2\56\2\uffff\1\u00a7\3\56\1\uffff\5\56\1\u00b0\10\56\1\u00b9\14\56\1\u00c6\1\uffff\2\56\1\u00c9\2\56\1\u00cc\2\56\1\uffff\1\u00cf\3\56\1\u00d3\3\56\1\uffff\6\56\1\u00de\5\56\1\uffff\1\56\1\u00e5\1\uffff\2\56\1\uffff\2\56\1\uffff\3\56\1\uffff\1\u00ed\5\56\1\u00f3\3\56\1\uffff\6\56\1\uffff\3\56\1\u0100\3\56\1\uffff\5\56\1\uffff\6\56\1\u0110\2\56\1\u0113\2\56\1\uffff\4\56\1\u011a\1\u011b\11\56\1\uffff\1\u0125\1\u0126\1\uffff\1\u0127\2\56\1\u012a\1\56\1\u012c\2\uffff\1\u012d\1\u012e\7\56\3\uffff\1\56\1\u0137\1\uffff\1\u0138\3\uffff\5\56\1\u013f\1\56\1\u0141\2\uffff\1\u0142\5\56\1\uffff\1\u0148\2\uffff\1\56\1\u014a\1\u014b\2\56\1\uffff\1\56\2\uffff\2\56\1\u0151\2\56\1\uffff\1\56\1\u0155\1\56\1\uffff\1\u0157\1\uffff";
     static final String DFA14_eofS =
         "\u0158\uffff";
     static final String DFA14_minS =
-        "\1\0\2\141\1\uffff\1\76\2\60\1\141\1\142\1\165\1\164\1\157\2\uffff"+
-        "\1\164\1\145\1\162\1\150\1\uffff\1\156\1\162\1\146\1\165\1\157\7"+
-        "\uffff\1\52\2\uffff\1\141\1\130\1\101\2\uffff\2\0\1\52\2\uffff\1"+
-        "\156\1\60\1\uffff\1\154\3\uffff\1\145\1\151\1\164\1\uffff\1\164"+
-        "\1\151\1\uffff\1\164\1\60\1\171\2\164\1\163\1\156\1\142\1\102\1"+
-        "\144\2\uffff\1\141\1\146\1\141\1\157\1\uffff\1\60\1\151\2\60\2\164"+
-        "\1\141\1\156\1\60\13\uffff\1\156\6\uffff\1\144\1\uffff\1\163\1\156"+
-        "\1\145\1\164\2\162\1\164\1\141\1\uffff\1\156\1\151\1\162\1\164\1"+
-        "\143\1\147\1\157\1\156\1\145\1\150\1\145\1\164\1\151\1\156\1\151"+
-        "\1\164\1\uffff\1\147\1\145\2\uffff\1\60\1\151\1\162\1\144\1\uffff"+
-        "\1\144\1\141\1\145\1\164\1\156\1\60\2\171\1\120\1\144\1\143\1\157"+
-        "\1\151\1\162\1\60\1\162\1\157\1\164\2\141\1\154\1\145\1\156\1\163"+
-        "\1\143\1\151\1\147\1\60\1\uffff\1\157\1\144\1\60\1\154\1\164\1\60"+
-        "\2\144\1\uffff\1\60\1\120\1\157\1\162\1\60\1\156\1\142\1\141\1\uffff"+
-        "\1\141\1\154\1\145\1\154\1\162\1\103\1\60\1\145\1\151\1\145\1\141"+
-        "\1\145\1\uffff\1\156\1\60\1\uffff\1\145\1\157\1\uffff\1\162\1\163"+
-        "\1\uffff\1\157\2\151\1\uffff\1\60\1\165\1\143\1\160\1\145\1\147"+
-        "\1\60\1\141\1\157\1\141\1\uffff\1\144\1\164\1\120\1\154\1\162\1"+
-        "\141\1\uffff\2\162\1\151\1\60\1\151\1\156\1\166\1\uffff\2\164\1"+
-        "\150\1\141\1\145\1\uffff\1\143\1\155\1\143\1\123\1\151\1\157\1\60"+
-        "\1\163\1\154\1\60\1\171\1\166\1\uffff\1\156\1\164\2\145\2\60\1\156"+
-        "\1\162\1\164\1\160\1\150\1\164\1\162\1\157\1\151\1\uffff\2\60\1"+
-        "\uffff\1\60\1\145\1\164\1\60\1\156\1\60\2\uffff\2\60\1\145\1\157"+
-        "\1\151\2\141\2\156\3\uffff\1\156\1\60\1\uffff\1\60\3\uffff\1\162"+
-        "\2\156\1\164\1\156\1\60\1\164\1\60\2\uffff\1\60\3\145\1\163\1\157"+
-        "\1\uffff\1\60\2\uffff\1\156\2\60\2\151\1\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\2\141\1\uffff\1\76\2\60\1\141\1\142\1\165\1\164\1\157\2\uffff\1\164\1\145\1\162\1\150\1\uffff\1\156\1\162\1\146\1\165\1\157\7\uffff\1\52\2\uffff\1\141\1\130\1\101\2\uffff\2\0\1\52\2\uffff\1\156\1\60\1\uffff\1\154\3\uffff\1\145\1\151\1\164\1\uffff\1\164\1\151\1\uffff\1\164\1\60\1\171\2\164\1\163\1\156\1\142\1\102\1\144\2\uffff\1\141\1\146\1\141\1\157\1\uffff\1\60\1\151\2\60\2\164\1\141\1\156\1\60\13\uffff\1\156\6\uffff\1\144\1\uffff\1\163\1\156\1\145\1\164\2\162\1\164\1\141\1\uffff\1\156\1\151\1\162\1\164\1\143\1\147\1\157\1\156\1\145\1\150\1\145\1\164\1\151\1\156\1\151\1\164\1\uffff\1\147\1\145\2\uffff\1\60\1\151\1\162\1\144\1\uffff\1\144\1\141\1\145\1\164\1\156\1\60\2\171\1\120\1\144\1\143\1\157\1\151\1\162\1\60\1\162\1\157\1\164\2\141\1\154\1\145\1\156\1\163\1\143\1\151\1\147\1\60\1\uffff\1\157\1\144\1\60\1\154\1\164\1\60\2\144\1\uffff\1\60\1\120\1\157\1\162\1\60\1\156\1\142\1\141\1\uffff\1\141\1\154\1\145\1\154\1\162\1\103\1\60\1\145\1\151\1\145\1\141\1\145\1\uffff\1\156\1\60\1\uffff\1\145\1\157\1\uffff\1\162\1\163\1\uffff\1\157\2\151\1\uffff\1\60\1\165\1\143\1\160\1\145\1\147\1\60\1\141\1\157\1\141\1\uffff\1\144\1\164\1\120\1\154\1\162\1\141\1\uffff\2\162\1\151\1\60\1\151\1\156\1\166\1\uffff\2\164\1\150\1\141\1\145\1\uffff\1\143\1\155\1\143\1\123\1\151\1\157\1\60\1\163\1\154\1\60\1\171\1\166\1\uffff\1\156\1\164\2\145\2\60\1\156\1\162\1\164\1\160\1\150\1\164\1\162\1\157\1\151\1\uffff\2\60\1\uffff\1\60\1\145\1\164\1\60\1\156\1\60\2\uffff\2\60\1\145\1\157\1\151\2\141\2\156\3\uffff\1\156\1\60\1\uffff\1\60\3\uffff\1\162\2\156\1\164\1\156\1\60\1\164\1\60\2\uffff\1\60\3\145\1\163\1\157\1\uffff\1\60\2\uffff\1\156\2\60\2\151\1\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\171\1\141\1\uffff\1\76\2\172\1\157\1\164\1\171\1\164"+
-        "\1\157\2\uffff\1\164\1\145\1\162\1\150\1\uffff\1\156\1\162\2\165"+
-        "\1\160\7\uffff\1\52\2\uffff\1\141\1\170\1\172\2\uffff\2\uffff\1"+
-        "\57\2\uffff\1\156\1\172\1\uffff\1\154\3\uffff\1\145\2\164\1\uffff"+
-        "\1\164\1\151\1\uffff\1\164\1\172\1\171\2\164\1\163\1\156\1\142\1"+
-        "\122\1\144\2\uffff\1\141\1\146\1\141\1\157\1\uffff\1\172\1\165\2"+
-        "\172\2\164\1\141\1\156\1\172\13\uffff\1\156\6\uffff\1\144\1\uffff"+
-        "\1\163\1\156\1\145\1\164\2\162\1\164\1\141\1\uffff\1\156\1\151\1"+
-        "\162\1\164\1\143\1\147\1\157\1\156\1\145\1\150\1\145\1\164\1\151"+
-        "\1\156\1\151\1\164\1\uffff\1\147\1\145\2\uffff\1\172\1\151\1\162"+
-        "\1\144\1\uffff\1\144\1\141\1\145\1\164\1\156\1\172\2\171\1\120\1"+
-        "\144\1\143\1\157\1\151\1\162\1\172\1\162\1\157\1\164\2\141\1\154"+
-        "\1\145\1\156\1\163\1\143\1\151\1\147\1\172\1\uffff\1\157\1\144\1"+
-        "\172\1\154\1\164\1\172\2\144\1\uffff\1\172\1\120\1\157\1\162\1\172"+
-        "\1\156\1\142\1\141\1\uffff\1\141\1\154\1\145\1\154\1\162\1\103\1"+
-        "\172\1\145\1\151\1\145\1\141\1\145\1\uffff\1\156\1\172\1\uffff\1"+
-        "\145\1\157\1\uffff\1\162\1\163\1\uffff\1\157\2\151\1\uffff\1\172"+
-        "\1\165\1\143\1\160\1\145\1\147\1\172\1\141\1\157\1\141\1\uffff\1"+
-        "\144\1\164\1\120\1\154\1\162\1\141\1\uffff\2\162\1\151\1\172\1\151"+
-        "\1\156\1\166\1\uffff\2\164\1\150\1\141\1\145\1\uffff\1\143\1\155"+
-        "\1\143\1\124\1\151\1\157\1\172\1\163\1\154\1\172\1\171\1\166\1\uffff"+
-        "\1\156\1\164\2\145\2\172\1\156\1\162\1\164\1\160\1\150\1\164\1\162"+
-        "\1\157\1\151\1\uffff\2\172\1\uffff\1\172\1\145\1\164\1\172\1\156"+
-        "\1\172\2\uffff\2\172\1\145\1\157\1\151\2\141\2\156\3\uffff\1\156"+
-        "\1\172\1\uffff\1\172\3\uffff\1\162\2\156\1\164\1\156\1\172\1\164"+
-        "\1\172\2\uffff\1\172\3\145\1\163\1\157\1\uffff\1\172\2\uffff\1\156"+
-        "\2\172\2\151\1\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\171\1\141\1\uffff\1\76\2\172\1\157\1\164\1\171\1\164\1\157\2\uffff\1\164\1\145\1\162\1\150\1\uffff\1\156\1\162\2\165\1\160\7\uffff\1\52\2\uffff\1\141\1\170\1\172\2\uffff\2\uffff\1\57\2\uffff\1\156\1\172\1\uffff\1\154\3\uffff\1\145\2\164\1\uffff\1\164\1\151\1\uffff\1\164\1\172\1\171\2\164\1\163\1\156\1\142\1\122\1\144\2\uffff\1\141\1\146\1\141\1\157\1\uffff\1\172\1\165\2\172\2\164\1\141\1\156\1\172\13\uffff\1\156\6\uffff\1\144\1\uffff\1\163\1\156\1\145\1\164\2\162\1\164\1\141\1\uffff\1\156\1\151\1\162\1\164\1\143\1\147\1\157\1\156\1\145\1\150\1\145\1\164\1\151\1\156\1\151\1\164\1\uffff\1\147\1\145\2\uffff\1\172\1\151\1\162\1\144\1\uffff\1\144\1\141\1\145\1\164\1\156\1\172\2\171\1\120\1\144\1\143\1\157\1\151\1\162\1\172\1\162\1\157\1\164\2\141\1\154\1\145\1\156\1\163\1\143\1\151\1\147\1\172\1\uffff\1\157\1\144\1\172\1\154\1\164\1\172\2\144\1\uffff\1\172\1\120\1\157\1\162\1\172\1\156\1\142\1\141\1\uffff\1\141\1\154\1\145\1\154\1\162\1\103\1\172\1\145\1\151\1\145\1\141\1\145\1\uffff\1\156\1\172\1\uffff\1\145\1\157\1\uffff\1\162\1\163\1\uffff\1\157\2\151\1\uffff\1\172\1\165\1\143\1\160\1\145\1\147\1\172\1\141\1\157\1\141\1\uffff\1\144\1\164\1\120\1\154\1\162\1\141\1\uffff\2\162\1\151\1\172\1\151\1\156\1\166\1\uffff\2\164\1\150\1\141\1\145\1\uffff\1\143\1\155\1\143\1\124\1\151\1\157\1\172\1\163\1\154\1\172\1\171\1\166\1\uffff\1\156\1\164\2\145\2\172\1\156\1\162\1\164\1\160\1\150\1\164\1\162\1\157\1\151\1\uffff\2\172\1\uffff\1\172\1\145\1\164\1\172\1\156\1\172\2\uffff\2\172\1\145\1\157\1\151\2\141\2\156\3\uffff\1\156\1\172\1\uffff\1\172\3\uffff\1\162\2\156\1\164\1\156\1\172\1\164\1\172\2\uffff\1\172\3\145\1\163\1\157\1\uffff\1\172\2\uffff\1\156\2\172\2\151\1\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 =
-        "\3\uffff\1\3\10\uffff\1\21\1\22\4\uffff\1\37\5\uffff\1\53\1\54"+
-        "\1\55\1\57\1\60\1\61\1\63\1\uffff\1\66\1\67\3\uffff\1\76\1\77\3"+
-        "\uffff\1\103\1\104\2\uffff\1\76\1\uffff\1\3\1\41\1\4\3\uffff\1\5"+
-        "\2\uffff\1\6\12\uffff\1\21\1\22\4\uffff\1\37\11\uffff\1\53\1\54"+
-        "\1\55\1\57\1\60\1\61\1\63\1\65\1\70\1\66\1\67\1\uffff\1\75\1\77"+
-        "\1\100\1\101\1\102\1\103\1\uffff\1\50\10\uffff\1\27\20\uffff\1\56"+
-        "\2\uffff\1\44\1\51\4\uffff\1\52\34\uffff\1\62\10\uffff\1\26\10\uffff"+
-        "\1\12\14\uffff\1\74\2\uffff\1\46\2\uffff\1\2\2\uffff\1\25\3\uffff"+
-        "\1\11\12\uffff\1\24\6\uffff\1\45\7\uffff\1\42\5\uffff\1\15\14\uffff"+
-        "\1\20\17\uffff\1\40\2\uffff\1\72\6\uffff\1\71\1\30\11\uffff\1\43"+
-        "\1\73\1\1\2\uffff\1\34\1\uffff\1\64\1\13\1\14\10\uffff\1\33\1\10"+
-        "\6\uffff\1\36\1\uffff\1\7\1\16\5\uffff\1\35\1\uffff\1\23\1\31\5"+
-        "\uffff\1\17\3\uffff\1\32\1\uffff\1\47";
+        "\3\uffff\1\3\10\uffff\1\21\1\22\4\uffff\1\37\5\uffff\1\53\1\54\1\55\1\57\1\60\1\61\1\63\1\uffff\1\66\1\67\3\uffff\1\76\1\77\3\uffff\1\103\1\104\2\uffff\1\76\1\uffff\1\3\1\41\1\4\3\uffff\1\5\2\uffff\1\6\12\uffff\1\21\1\22\4\uffff\1\37\11\uffff\1\53\1\54\1\55\1\57\1\60\1\61\1\63\1\65\1\70\1\66\1\67\1\uffff\1\75\1\77\1\100\1\101\1\102\1\103\1\uffff\1\50\10\uffff\1\27\20\uffff\1\56\2\uffff\1\44\1\51\4\uffff\1\52\34\uffff\1\62\10\uffff\1\26\10\uffff\1\12\14\uffff\1\74\2\uffff\1\46\2\uffff\1\2\2\uffff\1\25\3\uffff\1\11\12\uffff\1\24\6\uffff\1\45\7\uffff\1\42\5\uffff\1\15\14\uffff\1\20\17\uffff\1\40\2\uffff\1\72\6\uffff\1\71\1\30\11\uffff\1\43\1\73\1\1\2\uffff\1\34\1\uffff\1\64\1\13\1\14\10\uffff\1\33\1\10\6\uffff\1\36\1\uffff\1\7\1\16\5\uffff\1\35\1\uffff\1\23\1\31\5\uffff\1\17\3\uffff\1\32\1\uffff\1\47";
     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\33\1"+
-            "\34\1\53\1\3\1\35\1\4\1\37\1\51\1\43\11\46\1\22\1\53\1\30\1"+
-            "\36\1\31\2\53\2\45\1\21\1\45\1\6\7\45\1\13\4\45\1\17\1\16\1"+
-            "\20\6\45\1\40\1\53\1\41\1\44\1\45\1\53\1\10\1\45\1\27\1\7\1"+
-            "\5\1\2\1\26\1\42\1\23\3\45\1\1\1\45\1\25\1\12\2\45\1\11\1\24"+
-            "\6\45\1\14\1\32\1\15\uff82\53",
+            "\11\53\2\52\2\53\1\52\22\53\1\52\1\53\1\47\4\53\1\50\1\33\1\34\1\53\1\3\1\35\1\4\1\37\1\51\1\43\11\46\1\22\1\53\1\30\1\36\1\31\2\53\2\45\1\21\1\45\1\6\7\45\1\13\4\45\1\17\1\16\1\20\6\45\1\40\1\53\1\41\1\44\1\45\1\53\1\10\1\45\1\27\1\7\1\5\1\2\1\26\1\42\1\23\3\45\1\1\1\45\1\25\1\12\2\45\1\11\1\24\6\45\1\14\1\32\1\15\uff82\53",
             "\1\54\27\uffff\1\55",
             "\1\57",
             "",
             "\1\61",
-            "\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\15\56\1\65\7\56"+
-            "\1\63\1\56\1\64\2\56",
-            "\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\15\56\1\67\11\56"+
-            "\1\70\2\56",
+            "\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\15\56\1\65\7\56\1\63\1\56\1\64\2\56",
+            "\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\15\56\1\67\11\56\1\70\2\56",
             "\1\72\15\uffff\1\73",
             "\1\77\1\75\17\uffff\1\74\1\76",
             "\1\101\3\uffff\1\100",
@@ -2604,8 +2515,7 @@ public class InternalFSMLexer extends Lexer {
             "\1\176",
             "\1\177",
             "",
-            "\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\10\56\1\u0080\21"+
-            "\56",
+            "\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\10\56\1\u0080\21\56",
             "\1\u0082\13\uffff\1\u0083",
             "\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
             "\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
@@ -2722,8 +2632,7 @@ public class InternalFSMLexer extends Lexer {
             "\1\u00da",
             "\1\u00db",
             "\1\u00dc",
-            "\12\56\7\uffff\14\56\1\u00dd\15\56\4\uffff\1\56\1\uffff\32"+
-            "\56",
+            "\12\56\7\uffff\14\56\1\u00dd\15\56\4\uffff\1\56\1\uffff\32\56",
             "\1\u00df",
             "\1\u00e0",
             "\1\u00e1",
@@ -2839,8 +2748,7 @@ public class InternalFSMLexer extends Lexer {
             "\1\u013b",
             "\1\u013c",
             "\1\u013d",
-            "\12\56\7\uffff\17\56\1\u013e\12\56\4\uffff\1\56\1\uffff\32"+
-            "\56",
+            "\12\56\7\uffff\17\56\1\u013e\12\56\4\uffff\1\56\1\uffff\32\56",
             "\1\u0140",
             "\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
             "",
diff --git a/plugins/org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSMParser.java b/plugins/org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSMParser.java
index c99d3b4b3..05ce7e221 100644
--- a/plugins/org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSMParser.java
+++ b/plugins/org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSMParser.java
@@ -108,7 +108,7 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
         
 
     public String[] getTokenNames() { return InternalFSMParser.tokenNames; }
-    public String getGrammarFileName() { return "../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g"; }
+    public String getGrammarFileName() { return "InternalFSM.g"; }
 
 
      
@@ -132,20 +132,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleFSMModel"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:60:1: entryRuleFSMModel : ruleFSMModel EOF ;
+    // InternalFSM.g:60:1: entryRuleFSMModel : ruleFSMModel EOF ;
     public final void entryRuleFSMModel() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:61:1: ( ruleFSMModel EOF )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:62:1: ruleFSMModel EOF
+            // InternalFSM.g:61:1: ( ruleFSMModel EOF )
+            // InternalFSM.g:62:1: ruleFSMModel EOF
             {
              before(grammarAccess.getFSMModelRule()); 
-            pushFollow(FOLLOW_ruleFSMModel_in_entryRuleFSMModel61);
+            pushFollow(FOLLOW_1);
             ruleFSMModel();
 
             state._fsp--;
 
              after(grammarAccess.getFSMModelRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleFSMModel68); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -162,20 +162,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleFSMModel"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:69:1: ruleFSMModel : ( ( rule__FSMModel__ComponentsAssignment )* ) ;
+    // InternalFSM.g:69:1: ruleFSMModel : ( ( rule__FSMModel__ComponentsAssignment )* ) ;
     public final void ruleFSMModel() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:73:2: ( ( ( rule__FSMModel__ComponentsAssignment )* ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:74:1: ( ( rule__FSMModel__ComponentsAssignment )* )
+            // InternalFSM.g:73:2: ( ( ( rule__FSMModel__ComponentsAssignment )* ) )
+            // InternalFSM.g:74:1: ( ( rule__FSMModel__ComponentsAssignment )* )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:74:1: ( ( rule__FSMModel__ComponentsAssignment )* )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:75:1: ( rule__FSMModel__ComponentsAssignment )*
+            // InternalFSM.g:74:1: ( ( rule__FSMModel__ComponentsAssignment )* )
+            // InternalFSM.g:75:1: ( rule__FSMModel__ComponentsAssignment )*
             {
              before(grammarAccess.getFSMModelAccess().getComponentsAssignment()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:76:1: ( rule__FSMModel__ComponentsAssignment )*
+            // InternalFSM.g:76:1: ( rule__FSMModel__ComponentsAssignment )*
             loop1:
             do {
                 int alt1=2;
@@ -188,9 +188,9 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
                 switch (alt1) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:76:2: rule__FSMModel__ComponentsAssignment
+            	    // InternalFSM.g:76:2: rule__FSMModel__ComponentsAssignment
             	    {
-            	    pushFollow(FOLLOW_rule__FSMModel__ComponentsAssignment_in_ruleFSMModel94);
+            	    pushFollow(FOLLOW_3);
             	    rule__FSMModel__ComponentsAssignment();
 
             	    state._fsp--;
@@ -227,20 +227,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleModelComponent"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:88:1: entryRuleModelComponent : ruleModelComponent EOF ;
+    // InternalFSM.g:88:1: entryRuleModelComponent : ruleModelComponent EOF ;
     public final void entryRuleModelComponent() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:89:1: ( ruleModelComponent EOF )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:90:1: ruleModelComponent EOF
+            // InternalFSM.g:89:1: ( ruleModelComponent EOF )
+            // InternalFSM.g:90:1: ruleModelComponent EOF
             {
              before(grammarAccess.getModelComponentRule()); 
-            pushFollow(FOLLOW_ruleModelComponent_in_entryRuleModelComponent122);
+            pushFollow(FOLLOW_1);
             ruleModelComponent();
 
             state._fsp--;
 
              after(grammarAccess.getModelComponentRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleModelComponent129); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -257,23 +257,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleModelComponent"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:97:1: ruleModelComponent : ( ( rule__ModelComponent__Group__0 ) ) ;
+    // InternalFSM.g:97:1: ruleModelComponent : ( ( rule__ModelComponent__Group__0 ) ) ;
     public final void ruleModelComponent() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:101:2: ( ( ( rule__ModelComponent__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:102:1: ( ( rule__ModelComponent__Group__0 ) )
+            // InternalFSM.g:101:2: ( ( ( rule__ModelComponent__Group__0 ) ) )
+            // InternalFSM.g:102:1: ( ( rule__ModelComponent__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:102:1: ( ( rule__ModelComponent__Group__0 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:103:1: ( rule__ModelComponent__Group__0 )
+            // InternalFSM.g:102:1: ( ( rule__ModelComponent__Group__0 ) )
+            // InternalFSM.g:103:1: ( rule__ModelComponent__Group__0 )
             {
              before(grammarAccess.getModelComponentAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:104:1: ( rule__ModelComponent__Group__0 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:104:2: rule__ModelComponent__Group__0
+            // InternalFSM.g:104:1: ( rule__ModelComponent__Group__0 )
+            // InternalFSM.g:104:2: rule__ModelComponent__Group__0
             {
-            pushFollow(FOLLOW_rule__ModelComponent__Group__0_in_ruleModelComponent155);
+            pushFollow(FOLLOW_2);
             rule__ModelComponent__Group__0();
 
             state._fsp--;
@@ -304,20 +304,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleStateGraphNode"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:116:1: entryRuleStateGraphNode : ruleStateGraphNode EOF ;
+    // InternalFSM.g:116:1: entryRuleStateGraphNode : ruleStateGraphNode EOF ;
     public final void entryRuleStateGraphNode() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:117:1: ( ruleStateGraphNode EOF )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:118:1: ruleStateGraphNode EOF
+            // InternalFSM.g:117:1: ( ruleStateGraphNode EOF )
+            // InternalFSM.g:118:1: ruleStateGraphNode EOF
             {
              before(grammarAccess.getStateGraphNodeRule()); 
-            pushFollow(FOLLOW_ruleStateGraphNode_in_entryRuleStateGraphNode182);
+            pushFollow(FOLLOW_1);
             ruleStateGraphNode();
 
             state._fsp--;
 
              after(grammarAccess.getStateGraphNodeRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleStateGraphNode189); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -334,23 +334,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleStateGraphNode"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:125:1: ruleStateGraphNode : ( ( rule__StateGraphNode__Alternatives ) ) ;
+    // InternalFSM.g:125:1: ruleStateGraphNode : ( ( rule__StateGraphNode__Alternatives ) ) ;
     public final void ruleStateGraphNode() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:129:2: ( ( ( rule__StateGraphNode__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:130:1: ( ( rule__StateGraphNode__Alternatives ) )
+            // InternalFSM.g:129:2: ( ( ( rule__StateGraphNode__Alternatives ) ) )
+            // InternalFSM.g:130:1: ( ( rule__StateGraphNode__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:130:1: ( ( rule__StateGraphNode__Alternatives ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:131:1: ( rule__StateGraphNode__Alternatives )
+            // InternalFSM.g:130:1: ( ( rule__StateGraphNode__Alternatives ) )
+            // InternalFSM.g:131:1: ( rule__StateGraphNode__Alternatives )
             {
              before(grammarAccess.getStateGraphNodeAccess().getAlternatives()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:132:1: ( rule__StateGraphNode__Alternatives )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:132:2: rule__StateGraphNode__Alternatives
+            // InternalFSM.g:132:1: ( rule__StateGraphNode__Alternatives )
+            // InternalFSM.g:132:2: rule__StateGraphNode__Alternatives
             {
-            pushFollow(FOLLOW_rule__StateGraphNode__Alternatives_in_ruleStateGraphNode215);
+            pushFollow(FOLLOW_2);
             rule__StateGraphNode__Alternatives();
 
             state._fsp--;
@@ -381,20 +381,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleStateGraph"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:146:1: entryRuleStateGraph : ruleStateGraph EOF ;
+    // InternalFSM.g:146:1: entryRuleStateGraph : ruleStateGraph EOF ;
     public final void entryRuleStateGraph() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:147:1: ( ruleStateGraph EOF )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:148:1: ruleStateGraph EOF
+            // InternalFSM.g:147:1: ( ruleStateGraph EOF )
+            // InternalFSM.g:148:1: ruleStateGraph EOF
             {
              before(grammarAccess.getStateGraphRule()); 
-            pushFollow(FOLLOW_ruleStateGraph_in_entryRuleStateGraph244);
+            pushFollow(FOLLOW_1);
             ruleStateGraph();
 
             state._fsp--;
 
              after(grammarAccess.getStateGraphRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleStateGraph251); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -411,23 +411,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleStateGraph"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:155:1: ruleStateGraph : ( ( rule__StateGraph__Group__0 ) ) ;
+    // InternalFSM.g:155:1: ruleStateGraph : ( ( rule__StateGraph__Group__0 ) ) ;
     public final void ruleStateGraph() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:159:2: ( ( ( rule__StateGraph__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:160:1: ( ( rule__StateGraph__Group__0 ) )
+            // InternalFSM.g:159:2: ( ( ( rule__StateGraph__Group__0 ) ) )
+            // InternalFSM.g:160:1: ( ( rule__StateGraph__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:160:1: ( ( rule__StateGraph__Group__0 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:161:1: ( rule__StateGraph__Group__0 )
+            // InternalFSM.g:160:1: ( ( rule__StateGraph__Group__0 ) )
+            // InternalFSM.g:161:1: ( rule__StateGraph__Group__0 )
             {
              before(grammarAccess.getStateGraphAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:162:1: ( rule__StateGraph__Group__0 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:162:2: rule__StateGraph__Group__0
+            // InternalFSM.g:162:1: ( rule__StateGraph__Group__0 )
+            // InternalFSM.g:162:2: rule__StateGraph__Group__0
             {
-            pushFollow(FOLLOW_rule__StateGraph__Group__0_in_ruleStateGraph277);
+            pushFollow(FOLLOW_2);
             rule__StateGraph__Group__0();
 
             state._fsp--;
@@ -458,20 +458,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleStateMachine"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:174:1: entryRuleStateMachine : ruleStateMachine EOF ;
+    // InternalFSM.g:174:1: entryRuleStateMachine : ruleStateMachine EOF ;
     public final void entryRuleStateMachine() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:175:1: ( ruleStateMachine EOF )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:176:1: ruleStateMachine EOF
+            // InternalFSM.g:175:1: ( ruleStateMachine EOF )
+            // InternalFSM.g:176:1: ruleStateMachine EOF
             {
              before(grammarAccess.getStateMachineRule()); 
-            pushFollow(FOLLOW_ruleStateMachine_in_entryRuleStateMachine304);
+            pushFollow(FOLLOW_1);
             ruleStateMachine();
 
             state._fsp--;
 
              after(grammarAccess.getStateMachineRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleStateMachine311); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -488,23 +488,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleStateMachine"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:183:1: ruleStateMachine : ( ( rule__StateMachine__Group__0 ) ) ;
+    // InternalFSM.g:183:1: ruleStateMachine : ( ( rule__StateMachine__Group__0 ) ) ;
     public final void ruleStateMachine() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:187:2: ( ( ( rule__StateMachine__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:188:1: ( ( rule__StateMachine__Group__0 ) )
+            // InternalFSM.g:187:2: ( ( ( rule__StateMachine__Group__0 ) ) )
+            // InternalFSM.g:188:1: ( ( rule__StateMachine__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:188:1: ( ( rule__StateMachine__Group__0 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:189:1: ( rule__StateMachine__Group__0 )
+            // InternalFSM.g:188:1: ( ( rule__StateMachine__Group__0 ) )
+            // InternalFSM.g:189:1: ( rule__StateMachine__Group__0 )
             {
              before(grammarAccess.getStateMachineAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:190:1: ( rule__StateMachine__Group__0 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:190:2: rule__StateMachine__Group__0
+            // InternalFSM.g:190:1: ( rule__StateMachine__Group__0 )
+            // InternalFSM.g:190:2: rule__StateMachine__Group__0
             {
-            pushFollow(FOLLOW_rule__StateMachine__Group__0_in_ruleStateMachine337);
+            pushFollow(FOLLOW_2);
             rule__StateMachine__Group__0();
 
             state._fsp--;
@@ -535,20 +535,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleState"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:202:1: entryRuleState : ruleState EOF ;
+    // InternalFSM.g:202:1: entryRuleState : ruleState EOF ;
     public final void entryRuleState() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:203:1: ( ruleState EOF )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:204:1: ruleState EOF
+            // InternalFSM.g:203:1: ( ruleState EOF )
+            // InternalFSM.g:204:1: ruleState EOF
             {
              before(grammarAccess.getStateRule()); 
-            pushFollow(FOLLOW_ruleState_in_entryRuleState364);
+            pushFollow(FOLLOW_1);
             ruleState();
 
             state._fsp--;
 
              after(grammarAccess.getStateRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleState371); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -565,23 +565,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleState"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:211:1: ruleState : ( ( rule__State__Alternatives ) ) ;
+    // InternalFSM.g:211:1: ruleState : ( ( rule__State__Alternatives ) ) ;
     public final void ruleState() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:215:2: ( ( ( rule__State__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:216:1: ( ( rule__State__Alternatives ) )
+            // InternalFSM.g:215:2: ( ( ( rule__State__Alternatives ) ) )
+            // InternalFSM.g:216:1: ( ( rule__State__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:216:1: ( ( rule__State__Alternatives ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:217:1: ( rule__State__Alternatives )
+            // InternalFSM.g:216:1: ( ( rule__State__Alternatives ) )
+            // InternalFSM.g:217:1: ( rule__State__Alternatives )
             {
              before(grammarAccess.getStateAccess().getAlternatives()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:218:1: ( rule__State__Alternatives )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:218:2: rule__State__Alternatives
+            // InternalFSM.g:218:1: ( rule__State__Alternatives )
+            // InternalFSM.g:218:2: rule__State__Alternatives
             {
-            pushFollow(FOLLOW_rule__State__Alternatives_in_ruleState397);
+            pushFollow(FOLLOW_2);
             rule__State__Alternatives();
 
             state._fsp--;
@@ -612,20 +612,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleSimpleState"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:230:1: entryRuleSimpleState : ruleSimpleState EOF ;
+    // InternalFSM.g:230:1: entryRuleSimpleState : ruleSimpleState EOF ;
     public final void entryRuleSimpleState() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:231:1: ( ruleSimpleState EOF )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:232:1: ruleSimpleState EOF
+            // InternalFSM.g:231:1: ( ruleSimpleState EOF )
+            // InternalFSM.g:232:1: ruleSimpleState EOF
             {
              before(grammarAccess.getSimpleStateRule()); 
-            pushFollow(FOLLOW_ruleSimpleState_in_entryRuleSimpleState424);
+            pushFollow(FOLLOW_1);
             ruleSimpleState();
 
             state._fsp--;
 
              after(grammarAccess.getSimpleStateRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSimpleState431); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -642,23 +642,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleSimpleState"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:239:1: ruleSimpleState : ( ( rule__SimpleState__Group__0 ) ) ;
+    // InternalFSM.g:239:1: ruleSimpleState : ( ( rule__SimpleState__Group__0 ) ) ;
     public final void ruleSimpleState() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:243:2: ( ( ( rule__SimpleState__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:244:1: ( ( rule__SimpleState__Group__0 ) )
+            // InternalFSM.g:243:2: ( ( ( rule__SimpleState__Group__0 ) ) )
+            // InternalFSM.g:244:1: ( ( rule__SimpleState__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:244:1: ( ( rule__SimpleState__Group__0 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:245:1: ( rule__SimpleState__Group__0 )
+            // InternalFSM.g:244:1: ( ( rule__SimpleState__Group__0 ) )
+            // InternalFSM.g:245:1: ( rule__SimpleState__Group__0 )
             {
              before(grammarAccess.getSimpleStateAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:246:1: ( rule__SimpleState__Group__0 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:246:2: rule__SimpleState__Group__0
+            // InternalFSM.g:246:1: ( rule__SimpleState__Group__0 )
+            // InternalFSM.g:246:2: rule__SimpleState__Group__0
             {
-            pushFollow(FOLLOW_rule__SimpleState__Group__0_in_ruleSimpleState457);
+            pushFollow(FOLLOW_2);
             rule__SimpleState__Group__0();
 
             state._fsp--;
@@ -689,20 +689,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleRefinedState"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:258:1: entryRuleRefinedState : ruleRefinedState EOF ;
+    // InternalFSM.g:258:1: entryRuleRefinedState : ruleRefinedState EOF ;
     public final void entryRuleRefinedState() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:259:1: ( ruleRefinedState EOF )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:260:1: ruleRefinedState EOF
+            // InternalFSM.g:259:1: ( ruleRefinedState EOF )
+            // InternalFSM.g:260:1: ruleRefinedState EOF
             {
              before(grammarAccess.getRefinedStateRule()); 
-            pushFollow(FOLLOW_ruleRefinedState_in_entryRuleRefinedState484);
+            pushFollow(FOLLOW_1);
             ruleRefinedState();
 
             state._fsp--;
 
              after(grammarAccess.getRefinedStateRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRefinedState491); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -719,23 +719,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleRefinedState"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:267:1: ruleRefinedState : ( ( rule__RefinedState__Group__0 ) ) ;
+    // InternalFSM.g:267:1: ruleRefinedState : ( ( rule__RefinedState__Group__0 ) ) ;
     public final void ruleRefinedState() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:271:2: ( ( ( rule__RefinedState__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:272:1: ( ( rule__RefinedState__Group__0 ) )
+            // InternalFSM.g:271:2: ( ( ( rule__RefinedState__Group__0 ) ) )
+            // InternalFSM.g:272:1: ( ( rule__RefinedState__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:272:1: ( ( rule__RefinedState__Group__0 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:273:1: ( rule__RefinedState__Group__0 )
+            // InternalFSM.g:272:1: ( ( rule__RefinedState__Group__0 ) )
+            // InternalFSM.g:273:1: ( rule__RefinedState__Group__0 )
             {
              before(grammarAccess.getRefinedStateAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:274:1: ( rule__RefinedState__Group__0 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:274:2: rule__RefinedState__Group__0
+            // InternalFSM.g:274:1: ( rule__RefinedState__Group__0 )
+            // InternalFSM.g:274:2: rule__RefinedState__Group__0
             {
-            pushFollow(FOLLOW_rule__RefinedState__Group__0_in_ruleRefinedState517);
+            pushFollow(FOLLOW_2);
             rule__RefinedState__Group__0();
 
             state._fsp--;
@@ -766,20 +766,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleDetailCode"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:286:1: entryRuleDetailCode : ruleDetailCode EOF ;
+    // InternalFSM.g:286:1: entryRuleDetailCode : ruleDetailCode EOF ;
     public final void entryRuleDetailCode() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:287:1: ( ruleDetailCode EOF )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:288:1: ruleDetailCode EOF
+            // InternalFSM.g:287:1: ( ruleDetailCode EOF )
+            // InternalFSM.g:288:1: ruleDetailCode EOF
             {
              before(grammarAccess.getDetailCodeRule()); 
-            pushFollow(FOLLOW_ruleDetailCode_in_entryRuleDetailCode544);
+            pushFollow(FOLLOW_1);
             ruleDetailCode();
 
             state._fsp--;
 
              after(grammarAccess.getDetailCodeRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDetailCode551); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -796,23 +796,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleDetailCode"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:295:1: ruleDetailCode : ( ( rule__DetailCode__Group__0 ) ) ;
+    // InternalFSM.g:295:1: ruleDetailCode : ( ( rule__DetailCode__Group__0 ) ) ;
     public final void ruleDetailCode() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:299:2: ( ( ( rule__DetailCode__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:300:1: ( ( rule__DetailCode__Group__0 ) )
+            // InternalFSM.g:299:2: ( ( ( rule__DetailCode__Group__0 ) ) )
+            // InternalFSM.g:300:1: ( ( rule__DetailCode__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:300:1: ( ( rule__DetailCode__Group__0 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:301:1: ( rule__DetailCode__Group__0 )
+            // InternalFSM.g:300:1: ( ( rule__DetailCode__Group__0 ) )
+            // InternalFSM.g:301:1: ( rule__DetailCode__Group__0 )
             {
              before(grammarAccess.getDetailCodeAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:302:1: ( rule__DetailCode__Group__0 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:302:2: rule__DetailCode__Group__0
+            // InternalFSM.g:302:1: ( rule__DetailCode__Group__0 )
+            // InternalFSM.g:302:2: rule__DetailCode__Group__0
             {
-            pushFollow(FOLLOW_rule__DetailCode__Group__0_in_ruleDetailCode577);
+            pushFollow(FOLLOW_2);
             rule__DetailCode__Group__0();
 
             state._fsp--;
@@ -843,20 +843,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleTrPoint"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:314:1: entryRuleTrPoint : ruleTrPoint EOF ;
+    // InternalFSM.g:314:1: entryRuleTrPoint : ruleTrPoint EOF ;
     public final void entryRuleTrPoint() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:315:1: ( ruleTrPoint EOF )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:316:1: ruleTrPoint EOF
+            // InternalFSM.g:315:1: ( ruleTrPoint EOF )
+            // InternalFSM.g:316:1: ruleTrPoint EOF
             {
              before(grammarAccess.getTrPointRule()); 
-            pushFollow(FOLLOW_ruleTrPoint_in_entryRuleTrPoint604);
+            pushFollow(FOLLOW_1);
             ruleTrPoint();
 
             state._fsp--;
 
              after(grammarAccess.getTrPointRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleTrPoint611); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -873,23 +873,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleTrPoint"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:323:1: ruleTrPoint : ( ( rule__TrPoint__Alternatives ) ) ;
+    // InternalFSM.g:323:1: ruleTrPoint : ( ( rule__TrPoint__Alternatives ) ) ;
     public final void ruleTrPoint() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:327:2: ( ( ( rule__TrPoint__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:328:1: ( ( rule__TrPoint__Alternatives ) )
+            // InternalFSM.g:327:2: ( ( ( rule__TrPoint__Alternatives ) ) )
+            // InternalFSM.g:328:1: ( ( rule__TrPoint__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:328:1: ( ( rule__TrPoint__Alternatives ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:329:1: ( rule__TrPoint__Alternatives )
+            // InternalFSM.g:328:1: ( ( rule__TrPoint__Alternatives ) )
+            // InternalFSM.g:329:1: ( rule__TrPoint__Alternatives )
             {
              before(grammarAccess.getTrPointAccess().getAlternatives()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:330:1: ( rule__TrPoint__Alternatives )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:330:2: rule__TrPoint__Alternatives
+            // InternalFSM.g:330:1: ( rule__TrPoint__Alternatives )
+            // InternalFSM.g:330:2: rule__TrPoint__Alternatives
             {
-            pushFollow(FOLLOW_rule__TrPoint__Alternatives_in_ruleTrPoint637);
+            pushFollow(FOLLOW_2);
             rule__TrPoint__Alternatives();
 
             state._fsp--;
@@ -920,20 +920,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleTransitionPoint"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:342:1: entryRuleTransitionPoint : ruleTransitionPoint EOF ;
+    // InternalFSM.g:342:1: entryRuleTransitionPoint : ruleTransitionPoint EOF ;
     public final void entryRuleTransitionPoint() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:343:1: ( ruleTransitionPoint EOF )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:344:1: ruleTransitionPoint EOF
+            // InternalFSM.g:343:1: ( ruleTransitionPoint EOF )
+            // InternalFSM.g:344:1: ruleTransitionPoint EOF
             {
              before(grammarAccess.getTransitionPointRule()); 
-            pushFollow(FOLLOW_ruleTransitionPoint_in_entryRuleTransitionPoint664);
+            pushFollow(FOLLOW_1);
             ruleTransitionPoint();
 
             state._fsp--;
 
              after(grammarAccess.getTransitionPointRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleTransitionPoint671); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -950,23 +950,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleTransitionPoint"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:351:1: ruleTransitionPoint : ( ( rule__TransitionPoint__Group__0 ) ) ;
+    // InternalFSM.g:351:1: ruleTransitionPoint : ( ( rule__TransitionPoint__Group__0 ) ) ;
     public final void ruleTransitionPoint() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:355:2: ( ( ( rule__TransitionPoint__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:356:1: ( ( rule__TransitionPoint__Group__0 ) )
+            // InternalFSM.g:355:2: ( ( ( rule__TransitionPoint__Group__0 ) ) )
+            // InternalFSM.g:356:1: ( ( rule__TransitionPoint__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:356:1: ( ( rule__TransitionPoint__Group__0 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:357:1: ( rule__TransitionPoint__Group__0 )
+            // InternalFSM.g:356:1: ( ( rule__TransitionPoint__Group__0 ) )
+            // InternalFSM.g:357:1: ( rule__TransitionPoint__Group__0 )
             {
              before(grammarAccess.getTransitionPointAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:358:1: ( rule__TransitionPoint__Group__0 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:358:2: rule__TransitionPoint__Group__0
+            // InternalFSM.g:358:1: ( rule__TransitionPoint__Group__0 )
+            // InternalFSM.g:358:2: rule__TransitionPoint__Group__0
             {
-            pushFollow(FOLLOW_rule__TransitionPoint__Group__0_in_ruleTransitionPoint697);
+            pushFollow(FOLLOW_2);
             rule__TransitionPoint__Group__0();
 
             state._fsp--;
@@ -997,20 +997,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleEntryPoint"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:370:1: entryRuleEntryPoint : ruleEntryPoint EOF ;
+    // InternalFSM.g:370:1: entryRuleEntryPoint : ruleEntryPoint EOF ;
     public final void entryRuleEntryPoint() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:371:1: ( ruleEntryPoint EOF )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:372:1: ruleEntryPoint EOF
+            // InternalFSM.g:371:1: ( ruleEntryPoint EOF )
+            // InternalFSM.g:372:1: ruleEntryPoint EOF
             {
              before(grammarAccess.getEntryPointRule()); 
-            pushFollow(FOLLOW_ruleEntryPoint_in_entryRuleEntryPoint724);
+            pushFollow(FOLLOW_1);
             ruleEntryPoint();
 
             state._fsp--;
 
              after(grammarAccess.getEntryPointRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleEntryPoint731); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1027,23 +1027,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleEntryPoint"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:379:1: ruleEntryPoint : ( ( rule__EntryPoint__Group__0 ) ) ;
+    // InternalFSM.g:379:1: ruleEntryPoint : ( ( rule__EntryPoint__Group__0 ) ) ;
     public final void ruleEntryPoint() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:383:2: ( ( ( rule__EntryPoint__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:384:1: ( ( rule__EntryPoint__Group__0 ) )
+            // InternalFSM.g:383:2: ( ( ( rule__EntryPoint__Group__0 ) ) )
+            // InternalFSM.g:384:1: ( ( rule__EntryPoint__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:384:1: ( ( rule__EntryPoint__Group__0 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:385:1: ( rule__EntryPoint__Group__0 )
+            // InternalFSM.g:384:1: ( ( rule__EntryPoint__Group__0 ) )
+            // InternalFSM.g:385:1: ( rule__EntryPoint__Group__0 )
             {
              before(grammarAccess.getEntryPointAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:386:1: ( rule__EntryPoint__Group__0 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:386:2: rule__EntryPoint__Group__0
+            // InternalFSM.g:386:1: ( rule__EntryPoint__Group__0 )
+            // InternalFSM.g:386:2: rule__EntryPoint__Group__0
             {
-            pushFollow(FOLLOW_rule__EntryPoint__Group__0_in_ruleEntryPoint757);
+            pushFollow(FOLLOW_2);
             rule__EntryPoint__Group__0();
 
             state._fsp--;
@@ -1074,20 +1074,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleExitPoint"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:398:1: entryRuleExitPoint : ruleExitPoint EOF ;
+    // InternalFSM.g:398:1: entryRuleExitPoint : ruleExitPoint EOF ;
     public final void entryRuleExitPoint() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:399:1: ( ruleExitPoint EOF )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:400:1: ruleExitPoint EOF
+            // InternalFSM.g:399:1: ( ruleExitPoint EOF )
+            // InternalFSM.g:400:1: ruleExitPoint EOF
             {
              before(grammarAccess.getExitPointRule()); 
-            pushFollow(FOLLOW_ruleExitPoint_in_entryRuleExitPoint784);
+            pushFollow(FOLLOW_1);
             ruleExitPoint();
 
             state._fsp--;
 
              after(grammarAccess.getExitPointRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleExitPoint791); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1104,23 +1104,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleExitPoint"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:407:1: ruleExitPoint : ( ( rule__ExitPoint__Group__0 ) ) ;
+    // InternalFSM.g:407:1: ruleExitPoint : ( ( rule__ExitPoint__Group__0 ) ) ;
     public final void ruleExitPoint() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:411:2: ( ( ( rule__ExitPoint__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:412:1: ( ( rule__ExitPoint__Group__0 ) )
+            // InternalFSM.g:411:2: ( ( ( rule__ExitPoint__Group__0 ) ) )
+            // InternalFSM.g:412:1: ( ( rule__ExitPoint__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:412:1: ( ( rule__ExitPoint__Group__0 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:413:1: ( rule__ExitPoint__Group__0 )
+            // InternalFSM.g:412:1: ( ( rule__ExitPoint__Group__0 ) )
+            // InternalFSM.g:413:1: ( rule__ExitPoint__Group__0 )
             {
              before(grammarAccess.getExitPointAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:414:1: ( rule__ExitPoint__Group__0 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:414:2: rule__ExitPoint__Group__0
+            // InternalFSM.g:414:1: ( rule__ExitPoint__Group__0 )
+            // InternalFSM.g:414:2: rule__ExitPoint__Group__0
             {
-            pushFollow(FOLLOW_rule__ExitPoint__Group__0_in_ruleExitPoint817);
+            pushFollow(FOLLOW_2);
             rule__ExitPoint__Group__0();
 
             state._fsp--;
@@ -1151,20 +1151,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleChoicePoint"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:426:1: entryRuleChoicePoint : ruleChoicePoint EOF ;
+    // InternalFSM.g:426:1: entryRuleChoicePoint : ruleChoicePoint EOF ;
     public final void entryRuleChoicePoint() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:427:1: ( ruleChoicePoint EOF )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:428:1: ruleChoicePoint EOF
+            // InternalFSM.g:427:1: ( ruleChoicePoint EOF )
+            // InternalFSM.g:428:1: ruleChoicePoint EOF
             {
              before(grammarAccess.getChoicePointRule()); 
-            pushFollow(FOLLOW_ruleChoicePoint_in_entryRuleChoicePoint844);
+            pushFollow(FOLLOW_1);
             ruleChoicePoint();
 
             state._fsp--;
 
              after(grammarAccess.getChoicePointRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleChoicePoint851); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1181,23 +1181,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleChoicePoint"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:435:1: ruleChoicePoint : ( ( rule__ChoicePoint__Group__0 ) ) ;
+    // InternalFSM.g:435:1: ruleChoicePoint : ( ( rule__ChoicePoint__Group__0 ) ) ;
     public final void ruleChoicePoint() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:439:2: ( ( ( rule__ChoicePoint__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:440:1: ( ( rule__ChoicePoint__Group__0 ) )
+            // InternalFSM.g:439:2: ( ( ( rule__ChoicePoint__Group__0 ) ) )
+            // InternalFSM.g:440:1: ( ( rule__ChoicePoint__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:440:1: ( ( rule__ChoicePoint__Group__0 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:441:1: ( rule__ChoicePoint__Group__0 )
+            // InternalFSM.g:440:1: ( ( rule__ChoicePoint__Group__0 ) )
+            // InternalFSM.g:441:1: ( rule__ChoicePoint__Group__0 )
             {
              before(grammarAccess.getChoicePointAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:442:1: ( rule__ChoicePoint__Group__0 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:442:2: rule__ChoicePoint__Group__0
+            // InternalFSM.g:442:1: ( rule__ChoicePoint__Group__0 )
+            // InternalFSM.g:442:2: rule__ChoicePoint__Group__0
             {
-            pushFollow(FOLLOW_rule__ChoicePoint__Group__0_in_ruleChoicePoint877);
+            pushFollow(FOLLOW_2);
             rule__ChoicePoint__Group__0();
 
             state._fsp--;
@@ -1228,20 +1228,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleTransition"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:454:1: entryRuleTransition : ruleTransition EOF ;
+    // InternalFSM.g:456:1: entryRuleTransition : ruleTransition EOF ;
     public final void entryRuleTransition() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:455:1: ( ruleTransition EOF )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:456:1: ruleTransition EOF
+            // InternalFSM.g:457:1: ( ruleTransition EOF )
+            // InternalFSM.g:458:1: ruleTransition EOF
             {
              before(grammarAccess.getTransitionRule()); 
-            pushFollow(FOLLOW_ruleTransition_in_entryRuleTransition904);
+            pushFollow(FOLLOW_1);
             ruleTransition();
 
             state._fsp--;
 
              after(grammarAccess.getTransitionRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleTransition911); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1258,23 +1258,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleTransition"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:463:1: ruleTransition : ( ( rule__Transition__Alternatives ) ) ;
+    // InternalFSM.g:465:1: ruleTransition : ( ( rule__Transition__Alternatives ) ) ;
     public final void ruleTransition() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:467:2: ( ( ( rule__Transition__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:468:1: ( ( rule__Transition__Alternatives ) )
+            // InternalFSM.g:469:2: ( ( ( rule__Transition__Alternatives ) ) )
+            // InternalFSM.g:470:1: ( ( rule__Transition__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:468:1: ( ( rule__Transition__Alternatives ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:469:1: ( rule__Transition__Alternatives )
+            // InternalFSM.g:470:1: ( ( rule__Transition__Alternatives ) )
+            // InternalFSM.g:471:1: ( rule__Transition__Alternatives )
             {
              before(grammarAccess.getTransitionAccess().getAlternatives()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:470:1: ( rule__Transition__Alternatives )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:470:2: rule__Transition__Alternatives
+            // InternalFSM.g:472:1: ( rule__Transition__Alternatives )
+            // InternalFSM.g:472:2: rule__Transition__Alternatives
             {
-            pushFollow(FOLLOW_rule__Transition__Alternatives_in_ruleTransition937);
+            pushFollow(FOLLOW_2);
             rule__Transition__Alternatives();
 
             state._fsp--;
@@ -1305,20 +1305,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleNonInitialTransition"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:482:1: entryRuleNonInitialTransition : ruleNonInitialTransition EOF ;
+    // InternalFSM.g:484:1: entryRuleNonInitialTransition : ruleNonInitialTransition EOF ;
     public final void entryRuleNonInitialTransition() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:483:1: ( ruleNonInitialTransition EOF )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:484:1: ruleNonInitialTransition EOF
+            // InternalFSM.g:485:1: ( ruleNonInitialTransition EOF )
+            // InternalFSM.g:486:1: ruleNonInitialTransition EOF
             {
              before(grammarAccess.getNonInitialTransitionRule()); 
-            pushFollow(FOLLOW_ruleNonInitialTransition_in_entryRuleNonInitialTransition964);
+            pushFollow(FOLLOW_1);
             ruleNonInitialTransition();
 
             state._fsp--;
 
              after(grammarAccess.getNonInitialTransitionRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleNonInitialTransition971); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1335,23 +1335,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleNonInitialTransition"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:491:1: ruleNonInitialTransition : ( ( rule__NonInitialTransition__Alternatives ) ) ;
+    // InternalFSM.g:493:1: ruleNonInitialTransition : ( ( rule__NonInitialTransition__Alternatives ) ) ;
     public final void ruleNonInitialTransition() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:495:2: ( ( ( rule__NonInitialTransition__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:496:1: ( ( rule__NonInitialTransition__Alternatives ) )
+            // InternalFSM.g:497:2: ( ( ( rule__NonInitialTransition__Alternatives ) ) )
+            // InternalFSM.g:498:1: ( ( rule__NonInitialTransition__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:496:1: ( ( rule__NonInitialTransition__Alternatives ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:497:1: ( rule__NonInitialTransition__Alternatives )
+            // InternalFSM.g:498:1: ( ( rule__NonInitialTransition__Alternatives ) )
+            // InternalFSM.g:499:1: ( rule__NonInitialTransition__Alternatives )
             {
              before(grammarAccess.getNonInitialTransitionAccess().getAlternatives()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:498:1: ( rule__NonInitialTransition__Alternatives )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:498:2: rule__NonInitialTransition__Alternatives
+            // InternalFSM.g:500:1: ( rule__NonInitialTransition__Alternatives )
+            // InternalFSM.g:500:2: rule__NonInitialTransition__Alternatives
             {
-            pushFollow(FOLLOW_rule__NonInitialTransition__Alternatives_in_ruleNonInitialTransition997);
+            pushFollow(FOLLOW_2);
             rule__NonInitialTransition__Alternatives();
 
             state._fsp--;
@@ -1382,20 +1382,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleTransitionChainStartTransition"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:510:1: entryRuleTransitionChainStartTransition : ruleTransitionChainStartTransition EOF ;
+    // InternalFSM.g:512:1: entryRuleTransitionChainStartTransition : ruleTransitionChainStartTransition EOF ;
     public final void entryRuleTransitionChainStartTransition() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:511:1: ( ruleTransitionChainStartTransition EOF )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:512:1: ruleTransitionChainStartTransition EOF
+            // InternalFSM.g:513:1: ( ruleTransitionChainStartTransition EOF )
+            // InternalFSM.g:514:1: ruleTransitionChainStartTransition EOF
             {
              before(grammarAccess.getTransitionChainStartTransitionRule()); 
-            pushFollow(FOLLOW_ruleTransitionChainStartTransition_in_entryRuleTransitionChainStartTransition1024);
+            pushFollow(FOLLOW_1);
             ruleTransitionChainStartTransition();
 
             state._fsp--;
 
              after(grammarAccess.getTransitionChainStartTransitionRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleTransitionChainStartTransition1031); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1412,23 +1412,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleTransitionChainStartTransition"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:519:1: ruleTransitionChainStartTransition : ( ( rule__TransitionChainStartTransition__Alternatives ) ) ;
+    // InternalFSM.g:521:1: ruleTransitionChainStartTransition : ( ( rule__TransitionChainStartTransition__Alternatives ) ) ;
     public final void ruleTransitionChainStartTransition() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:523:2: ( ( ( rule__TransitionChainStartTransition__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:524:1: ( ( rule__TransitionChainStartTransition__Alternatives ) )
+            // InternalFSM.g:525:2: ( ( ( rule__TransitionChainStartTransition__Alternatives ) ) )
+            // InternalFSM.g:526:1: ( ( rule__TransitionChainStartTransition__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:524:1: ( ( rule__TransitionChainStartTransition__Alternatives ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:525:1: ( rule__TransitionChainStartTransition__Alternatives )
+            // InternalFSM.g:526:1: ( ( rule__TransitionChainStartTransition__Alternatives ) )
+            // InternalFSM.g:527:1: ( rule__TransitionChainStartTransition__Alternatives )
             {
              before(grammarAccess.getTransitionChainStartTransitionAccess().getAlternatives()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:526:1: ( rule__TransitionChainStartTransition__Alternatives )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:526:2: rule__TransitionChainStartTransition__Alternatives
+            // InternalFSM.g:528:1: ( rule__TransitionChainStartTransition__Alternatives )
+            // InternalFSM.g:528:2: rule__TransitionChainStartTransition__Alternatives
             {
-            pushFollow(FOLLOW_rule__TransitionChainStartTransition__Alternatives_in_ruleTransitionChainStartTransition1057);
+            pushFollow(FOLLOW_2);
             rule__TransitionChainStartTransition__Alternatives();
 
             state._fsp--;
@@ -1459,20 +1459,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleInitialTransition"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:538:1: entryRuleInitialTransition : ruleInitialTransition EOF ;
+    // InternalFSM.g:540:1: entryRuleInitialTransition : ruleInitialTransition EOF ;
     public final void entryRuleInitialTransition() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:539:1: ( ruleInitialTransition EOF )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:540:1: ruleInitialTransition EOF
+            // InternalFSM.g:541:1: ( ruleInitialTransition EOF )
+            // InternalFSM.g:542:1: ruleInitialTransition EOF
             {
              before(grammarAccess.getInitialTransitionRule()); 
-            pushFollow(FOLLOW_ruleInitialTransition_in_entryRuleInitialTransition1084);
+            pushFollow(FOLLOW_1);
             ruleInitialTransition();
 
             state._fsp--;
 
              after(grammarAccess.getInitialTransitionRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleInitialTransition1091); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1489,23 +1489,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleInitialTransition"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:547:1: ruleInitialTransition : ( ( rule__InitialTransition__Group__0 ) ) ;
+    // InternalFSM.g:549:1: ruleInitialTransition : ( ( rule__InitialTransition__Group__0 ) ) ;
     public final void ruleInitialTransition() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:551:2: ( ( ( rule__InitialTransition__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:552:1: ( ( rule__InitialTransition__Group__0 ) )
+            // InternalFSM.g:553:2: ( ( ( rule__InitialTransition__Group__0 ) ) )
+            // InternalFSM.g:554:1: ( ( rule__InitialTransition__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:552:1: ( ( rule__InitialTransition__Group__0 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:553:1: ( rule__InitialTransition__Group__0 )
+            // InternalFSM.g:554:1: ( ( rule__InitialTransition__Group__0 ) )
+            // InternalFSM.g:555:1: ( rule__InitialTransition__Group__0 )
             {
              before(grammarAccess.getInitialTransitionAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:554:1: ( rule__InitialTransition__Group__0 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:554:2: rule__InitialTransition__Group__0
+            // InternalFSM.g:556:1: ( rule__InitialTransition__Group__0 )
+            // InternalFSM.g:556:2: rule__InitialTransition__Group__0
             {
-            pushFollow(FOLLOW_rule__InitialTransition__Group__0_in_ruleInitialTransition1117);
+            pushFollow(FOLLOW_2);
             rule__InitialTransition__Group__0();
 
             state._fsp--;
@@ -1536,20 +1536,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleContinuationTransition"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:566:1: entryRuleContinuationTransition : ruleContinuationTransition EOF ;
+    // InternalFSM.g:568:1: entryRuleContinuationTransition : ruleContinuationTransition EOF ;
     public final void entryRuleContinuationTransition() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:567:1: ( ruleContinuationTransition EOF )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:568:1: ruleContinuationTransition EOF
+            // InternalFSM.g:569:1: ( ruleContinuationTransition EOF )
+            // InternalFSM.g:570:1: ruleContinuationTransition EOF
             {
              before(grammarAccess.getContinuationTransitionRule()); 
-            pushFollow(FOLLOW_ruleContinuationTransition_in_entryRuleContinuationTransition1144);
+            pushFollow(FOLLOW_1);
             ruleContinuationTransition();
 
             state._fsp--;
 
              after(grammarAccess.getContinuationTransitionRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleContinuationTransition1151); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1566,23 +1566,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleContinuationTransition"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:575:1: ruleContinuationTransition : ( ( rule__ContinuationTransition__Group__0 ) ) ;
+    // InternalFSM.g:577:1: ruleContinuationTransition : ( ( rule__ContinuationTransition__Group__0 ) ) ;
     public final void ruleContinuationTransition() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:579:2: ( ( ( rule__ContinuationTransition__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:580:1: ( ( rule__ContinuationTransition__Group__0 ) )
+            // InternalFSM.g:581:2: ( ( ( rule__ContinuationTransition__Group__0 ) ) )
+            // InternalFSM.g:582:1: ( ( rule__ContinuationTransition__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:580:1: ( ( rule__ContinuationTransition__Group__0 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:581:1: ( rule__ContinuationTransition__Group__0 )
+            // InternalFSM.g:582:1: ( ( rule__ContinuationTransition__Group__0 ) )
+            // InternalFSM.g:583:1: ( rule__ContinuationTransition__Group__0 )
             {
              before(grammarAccess.getContinuationTransitionAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:582:1: ( rule__ContinuationTransition__Group__0 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:582:2: rule__ContinuationTransition__Group__0
+            // InternalFSM.g:584:1: ( rule__ContinuationTransition__Group__0 )
+            // InternalFSM.g:584:2: rule__ContinuationTransition__Group__0
             {
-            pushFollow(FOLLOW_rule__ContinuationTransition__Group__0_in_ruleContinuationTransition1177);
+            pushFollow(FOLLOW_2);
             rule__ContinuationTransition__Group__0();
 
             state._fsp--;
@@ -1613,20 +1613,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleTriggeredTransition"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:594:1: entryRuleTriggeredTransition : ruleTriggeredTransition EOF ;
+    // InternalFSM.g:596:1: entryRuleTriggeredTransition : ruleTriggeredTransition EOF ;
     public final void entryRuleTriggeredTransition() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:595:1: ( ruleTriggeredTransition EOF )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:596:1: ruleTriggeredTransition EOF
+            // InternalFSM.g:597:1: ( ruleTriggeredTransition EOF )
+            // InternalFSM.g:598:1: ruleTriggeredTransition EOF
             {
              before(grammarAccess.getTriggeredTransitionRule()); 
-            pushFollow(FOLLOW_ruleTriggeredTransition_in_entryRuleTriggeredTransition1204);
+            pushFollow(FOLLOW_1);
             ruleTriggeredTransition();
 
             state._fsp--;
 
              after(grammarAccess.getTriggeredTransitionRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleTriggeredTransition1211); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1643,23 +1643,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleTriggeredTransition"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:603:1: ruleTriggeredTransition : ( ( rule__TriggeredTransition__Group__0 ) ) ;
+    // InternalFSM.g:605:1: ruleTriggeredTransition : ( ( rule__TriggeredTransition__Group__0 ) ) ;
     public final void ruleTriggeredTransition() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:607:2: ( ( ( rule__TriggeredTransition__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:608:1: ( ( rule__TriggeredTransition__Group__0 ) )
+            // InternalFSM.g:609:2: ( ( ( rule__TriggeredTransition__Group__0 ) ) )
+            // InternalFSM.g:610:1: ( ( rule__TriggeredTransition__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:608:1: ( ( rule__TriggeredTransition__Group__0 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:609:1: ( rule__TriggeredTransition__Group__0 )
+            // InternalFSM.g:610:1: ( ( rule__TriggeredTransition__Group__0 ) )
+            // InternalFSM.g:611:1: ( rule__TriggeredTransition__Group__0 )
             {
              before(grammarAccess.getTriggeredTransitionAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:610:1: ( rule__TriggeredTransition__Group__0 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:610:2: rule__TriggeredTransition__Group__0
+            // InternalFSM.g:612:1: ( rule__TriggeredTransition__Group__0 )
+            // InternalFSM.g:612:2: rule__TriggeredTransition__Group__0
             {
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__0_in_ruleTriggeredTransition1237);
+            pushFollow(FOLLOW_2);
             rule__TriggeredTransition__Group__0();
 
             state._fsp--;
@@ -1690,20 +1690,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleGuardedTransition"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:622:1: entryRuleGuardedTransition : ruleGuardedTransition EOF ;
+    // InternalFSM.g:624:1: entryRuleGuardedTransition : ruleGuardedTransition EOF ;
     public final void entryRuleGuardedTransition() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:623:1: ( ruleGuardedTransition EOF )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:624:1: ruleGuardedTransition EOF
+            // InternalFSM.g:625:1: ( ruleGuardedTransition EOF )
+            // InternalFSM.g:626:1: ruleGuardedTransition EOF
             {
              before(grammarAccess.getGuardedTransitionRule()); 
-            pushFollow(FOLLOW_ruleGuardedTransition_in_entryRuleGuardedTransition1264);
+            pushFollow(FOLLOW_1);
             ruleGuardedTransition();
 
             state._fsp--;
 
              after(grammarAccess.getGuardedTransitionRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleGuardedTransition1271); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1720,23 +1720,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleGuardedTransition"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:631:1: ruleGuardedTransition : ( ( rule__GuardedTransition__Group__0 ) ) ;
+    // InternalFSM.g:633:1: ruleGuardedTransition : ( ( rule__GuardedTransition__Group__0 ) ) ;
     public final void ruleGuardedTransition() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:635:2: ( ( ( rule__GuardedTransition__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:636:1: ( ( rule__GuardedTransition__Group__0 ) )
+            // InternalFSM.g:637:2: ( ( ( rule__GuardedTransition__Group__0 ) ) )
+            // InternalFSM.g:638:1: ( ( rule__GuardedTransition__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:636:1: ( ( rule__GuardedTransition__Group__0 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:637:1: ( rule__GuardedTransition__Group__0 )
+            // InternalFSM.g:638:1: ( ( rule__GuardedTransition__Group__0 ) )
+            // InternalFSM.g:639:1: ( rule__GuardedTransition__Group__0 )
             {
              before(grammarAccess.getGuardedTransitionAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:638:1: ( rule__GuardedTransition__Group__0 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:638:2: rule__GuardedTransition__Group__0
+            // InternalFSM.g:640:1: ( rule__GuardedTransition__Group__0 )
+            // InternalFSM.g:640:2: rule__GuardedTransition__Group__0
             {
-            pushFollow(FOLLOW_rule__GuardedTransition__Group__0_in_ruleGuardedTransition1297);
+            pushFollow(FOLLOW_2);
             rule__GuardedTransition__Group__0();
 
             state._fsp--;
@@ -1767,20 +1767,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleCPBranchTransition"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:650:1: entryRuleCPBranchTransition : ruleCPBranchTransition EOF ;
+    // InternalFSM.g:652:1: entryRuleCPBranchTransition : ruleCPBranchTransition EOF ;
     public final void entryRuleCPBranchTransition() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:651:1: ( ruleCPBranchTransition EOF )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:652:1: ruleCPBranchTransition EOF
+            // InternalFSM.g:653:1: ( ruleCPBranchTransition EOF )
+            // InternalFSM.g:654:1: ruleCPBranchTransition EOF
             {
              before(grammarAccess.getCPBranchTransitionRule()); 
-            pushFollow(FOLLOW_ruleCPBranchTransition_in_entryRuleCPBranchTransition1324);
+            pushFollow(FOLLOW_1);
             ruleCPBranchTransition();
 
             state._fsp--;
 
              after(grammarAccess.getCPBranchTransitionRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleCPBranchTransition1331); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1797,23 +1797,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleCPBranchTransition"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:659:1: ruleCPBranchTransition : ( ( rule__CPBranchTransition__Group__0 ) ) ;
+    // InternalFSM.g:661:1: ruleCPBranchTransition : ( ( rule__CPBranchTransition__Group__0 ) ) ;
     public final void ruleCPBranchTransition() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:663:2: ( ( ( rule__CPBranchTransition__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:664:1: ( ( rule__CPBranchTransition__Group__0 ) )
+            // InternalFSM.g:665:2: ( ( ( rule__CPBranchTransition__Group__0 ) ) )
+            // InternalFSM.g:666:1: ( ( rule__CPBranchTransition__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:664:1: ( ( rule__CPBranchTransition__Group__0 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:665:1: ( rule__CPBranchTransition__Group__0 )
+            // InternalFSM.g:666:1: ( ( rule__CPBranchTransition__Group__0 ) )
+            // InternalFSM.g:667:1: ( rule__CPBranchTransition__Group__0 )
             {
              before(grammarAccess.getCPBranchTransitionAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:666:1: ( rule__CPBranchTransition__Group__0 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:666:2: rule__CPBranchTransition__Group__0
+            // InternalFSM.g:668:1: ( rule__CPBranchTransition__Group__0 )
+            // InternalFSM.g:668:2: rule__CPBranchTransition__Group__0
             {
-            pushFollow(FOLLOW_rule__CPBranchTransition__Group__0_in_ruleCPBranchTransition1357);
+            pushFollow(FOLLOW_2);
             rule__CPBranchTransition__Group__0();
 
             state._fsp--;
@@ -1844,20 +1844,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleRefinedTransition"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:678:1: entryRuleRefinedTransition : ruleRefinedTransition EOF ;
+    // InternalFSM.g:680:1: entryRuleRefinedTransition : ruleRefinedTransition EOF ;
     public final void entryRuleRefinedTransition() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:679:1: ( ruleRefinedTransition EOF )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:680:1: ruleRefinedTransition EOF
+            // InternalFSM.g:681:1: ( ruleRefinedTransition EOF )
+            // InternalFSM.g:682:1: ruleRefinedTransition EOF
             {
              before(grammarAccess.getRefinedTransitionRule()); 
-            pushFollow(FOLLOW_ruleRefinedTransition_in_entryRuleRefinedTransition1384);
+            pushFollow(FOLLOW_1);
             ruleRefinedTransition();
 
             state._fsp--;
 
              after(grammarAccess.getRefinedTransitionRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRefinedTransition1391); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1874,23 +1874,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleRefinedTransition"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:687:1: ruleRefinedTransition : ( ( rule__RefinedTransition__Group__0 ) ) ;
+    // InternalFSM.g:689:1: ruleRefinedTransition : ( ( rule__RefinedTransition__Group__0 ) ) ;
     public final void ruleRefinedTransition() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:691:2: ( ( ( rule__RefinedTransition__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:692:1: ( ( rule__RefinedTransition__Group__0 ) )
+            // InternalFSM.g:693:2: ( ( ( rule__RefinedTransition__Group__0 ) ) )
+            // InternalFSM.g:694:1: ( ( rule__RefinedTransition__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:692:1: ( ( rule__RefinedTransition__Group__0 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:693:1: ( rule__RefinedTransition__Group__0 )
+            // InternalFSM.g:694:1: ( ( rule__RefinedTransition__Group__0 ) )
+            // InternalFSM.g:695:1: ( rule__RefinedTransition__Group__0 )
             {
              before(grammarAccess.getRefinedTransitionAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:694:1: ( rule__RefinedTransition__Group__0 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:694:2: rule__RefinedTransition__Group__0
+            // InternalFSM.g:696:1: ( rule__RefinedTransition__Group__0 )
+            // InternalFSM.g:696:2: rule__RefinedTransition__Group__0
             {
-            pushFollow(FOLLOW_rule__RefinedTransition__Group__0_in_ruleRefinedTransition1417);
+            pushFollow(FOLLOW_2);
             rule__RefinedTransition__Group__0();
 
             state._fsp--;
@@ -1921,20 +1921,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleTransitionTerminal"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:706:1: entryRuleTransitionTerminal : ruleTransitionTerminal EOF ;
+    // InternalFSM.g:708:1: entryRuleTransitionTerminal : ruleTransitionTerminal EOF ;
     public final void entryRuleTransitionTerminal() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:707:1: ( ruleTransitionTerminal EOF )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:708:1: ruleTransitionTerminal EOF
+            // InternalFSM.g:709:1: ( ruleTransitionTerminal EOF )
+            // InternalFSM.g:710:1: ruleTransitionTerminal EOF
             {
              before(grammarAccess.getTransitionTerminalRule()); 
-            pushFollow(FOLLOW_ruleTransitionTerminal_in_entryRuleTransitionTerminal1444);
+            pushFollow(FOLLOW_1);
             ruleTransitionTerminal();
 
             state._fsp--;
 
              after(grammarAccess.getTransitionTerminalRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleTransitionTerminal1451); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1951,23 +1951,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleTransitionTerminal"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:715:1: ruleTransitionTerminal : ( ( rule__TransitionTerminal__Alternatives ) ) ;
+    // InternalFSM.g:717:1: ruleTransitionTerminal : ( ( rule__TransitionTerminal__Alternatives ) ) ;
     public final void ruleTransitionTerminal() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:719:2: ( ( ( rule__TransitionTerminal__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:720:1: ( ( rule__TransitionTerminal__Alternatives ) )
+            // InternalFSM.g:721:2: ( ( ( rule__TransitionTerminal__Alternatives ) ) )
+            // InternalFSM.g:722:1: ( ( rule__TransitionTerminal__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:720:1: ( ( rule__TransitionTerminal__Alternatives ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:721:1: ( rule__TransitionTerminal__Alternatives )
+            // InternalFSM.g:722:1: ( ( rule__TransitionTerminal__Alternatives ) )
+            // InternalFSM.g:723:1: ( rule__TransitionTerminal__Alternatives )
             {
              before(grammarAccess.getTransitionTerminalAccess().getAlternatives()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:722:1: ( rule__TransitionTerminal__Alternatives )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:722:2: rule__TransitionTerminal__Alternatives
+            // InternalFSM.g:724:1: ( rule__TransitionTerminal__Alternatives )
+            // InternalFSM.g:724:2: rule__TransitionTerminal__Alternatives
             {
-            pushFollow(FOLLOW_rule__TransitionTerminal__Alternatives_in_ruleTransitionTerminal1477);
+            pushFollow(FOLLOW_2);
             rule__TransitionTerminal__Alternatives();
 
             state._fsp--;
@@ -1998,20 +1998,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleStateTerminal"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:734:1: entryRuleStateTerminal : ruleStateTerminal EOF ;
+    // InternalFSM.g:736:1: entryRuleStateTerminal : ruleStateTerminal EOF ;
     public final void entryRuleStateTerminal() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:735:1: ( ruleStateTerminal EOF )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:736:1: ruleStateTerminal EOF
+            // InternalFSM.g:737:1: ( ruleStateTerminal EOF )
+            // InternalFSM.g:738:1: ruleStateTerminal EOF
             {
              before(grammarAccess.getStateTerminalRule()); 
-            pushFollow(FOLLOW_ruleStateTerminal_in_entryRuleStateTerminal1504);
+            pushFollow(FOLLOW_1);
             ruleStateTerminal();
 
             state._fsp--;
 
              after(grammarAccess.getStateTerminalRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleStateTerminal1511); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2028,23 +2028,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleStateTerminal"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:743:1: ruleStateTerminal : ( ( rule__StateTerminal__StateAssignment ) ) ;
+    // InternalFSM.g:745:1: ruleStateTerminal : ( ( rule__StateTerminal__StateAssignment ) ) ;
     public final void ruleStateTerminal() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:747:2: ( ( ( rule__StateTerminal__StateAssignment ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:748:1: ( ( rule__StateTerminal__StateAssignment ) )
+            // InternalFSM.g:749:2: ( ( ( rule__StateTerminal__StateAssignment ) ) )
+            // InternalFSM.g:750:1: ( ( rule__StateTerminal__StateAssignment ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:748:1: ( ( rule__StateTerminal__StateAssignment ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:749:1: ( rule__StateTerminal__StateAssignment )
+            // InternalFSM.g:750:1: ( ( rule__StateTerminal__StateAssignment ) )
+            // InternalFSM.g:751:1: ( rule__StateTerminal__StateAssignment )
             {
              before(grammarAccess.getStateTerminalAccess().getStateAssignment()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:750:1: ( rule__StateTerminal__StateAssignment )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:750:2: rule__StateTerminal__StateAssignment
+            // InternalFSM.g:752:1: ( rule__StateTerminal__StateAssignment )
+            // InternalFSM.g:752:2: rule__StateTerminal__StateAssignment
             {
-            pushFollow(FOLLOW_rule__StateTerminal__StateAssignment_in_ruleStateTerminal1537);
+            pushFollow(FOLLOW_2);
             rule__StateTerminal__StateAssignment();
 
             state._fsp--;
@@ -2075,20 +2075,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleTrPointTerminal"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:762:1: entryRuleTrPointTerminal : ruleTrPointTerminal EOF ;
+    // InternalFSM.g:764:1: entryRuleTrPointTerminal : ruleTrPointTerminal EOF ;
     public final void entryRuleTrPointTerminal() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:763:1: ( ruleTrPointTerminal EOF )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:764:1: ruleTrPointTerminal EOF
+            // InternalFSM.g:765:1: ( ruleTrPointTerminal EOF )
+            // InternalFSM.g:766:1: ruleTrPointTerminal EOF
             {
              before(grammarAccess.getTrPointTerminalRule()); 
-            pushFollow(FOLLOW_ruleTrPointTerminal_in_entryRuleTrPointTerminal1564);
+            pushFollow(FOLLOW_1);
             ruleTrPointTerminal();
 
             state._fsp--;
 
              after(grammarAccess.getTrPointTerminalRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleTrPointTerminal1571); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2105,23 +2105,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleTrPointTerminal"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:771:1: ruleTrPointTerminal : ( ( rule__TrPointTerminal__Group__0 ) ) ;
+    // InternalFSM.g:773:1: ruleTrPointTerminal : ( ( rule__TrPointTerminal__Group__0 ) ) ;
     public final void ruleTrPointTerminal() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:775:2: ( ( ( rule__TrPointTerminal__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:776:1: ( ( rule__TrPointTerminal__Group__0 ) )
+            // InternalFSM.g:777:2: ( ( ( rule__TrPointTerminal__Group__0 ) ) )
+            // InternalFSM.g:778:1: ( ( rule__TrPointTerminal__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:776:1: ( ( rule__TrPointTerminal__Group__0 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:777:1: ( rule__TrPointTerminal__Group__0 )
+            // InternalFSM.g:778:1: ( ( rule__TrPointTerminal__Group__0 ) )
+            // InternalFSM.g:779:1: ( rule__TrPointTerminal__Group__0 )
             {
              before(grammarAccess.getTrPointTerminalAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:778:1: ( rule__TrPointTerminal__Group__0 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:778:2: rule__TrPointTerminal__Group__0
+            // InternalFSM.g:780:1: ( rule__TrPointTerminal__Group__0 )
+            // InternalFSM.g:780:2: rule__TrPointTerminal__Group__0
             {
-            pushFollow(FOLLOW_rule__TrPointTerminal__Group__0_in_ruleTrPointTerminal1597);
+            pushFollow(FOLLOW_2);
             rule__TrPointTerminal__Group__0();
 
             state._fsp--;
@@ -2152,20 +2152,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleSubStateTrPointTerminal"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:790:1: entryRuleSubStateTrPointTerminal : ruleSubStateTrPointTerminal EOF ;
+    // InternalFSM.g:792:1: entryRuleSubStateTrPointTerminal : ruleSubStateTrPointTerminal EOF ;
     public final void entryRuleSubStateTrPointTerminal() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:791:1: ( ruleSubStateTrPointTerminal EOF )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:792:1: ruleSubStateTrPointTerminal EOF
+            // InternalFSM.g:793:1: ( ruleSubStateTrPointTerminal EOF )
+            // InternalFSM.g:794:1: ruleSubStateTrPointTerminal EOF
             {
              before(grammarAccess.getSubStateTrPointTerminalRule()); 
-            pushFollow(FOLLOW_ruleSubStateTrPointTerminal_in_entryRuleSubStateTrPointTerminal1624);
+            pushFollow(FOLLOW_1);
             ruleSubStateTrPointTerminal();
 
             state._fsp--;
 
              after(grammarAccess.getSubStateTrPointTerminalRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSubStateTrPointTerminal1631); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2182,23 +2182,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleSubStateTrPointTerminal"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:799:1: ruleSubStateTrPointTerminal : ( ( rule__SubStateTrPointTerminal__Group__0 ) ) ;
+    // InternalFSM.g:801:1: ruleSubStateTrPointTerminal : ( ( rule__SubStateTrPointTerminal__Group__0 ) ) ;
     public final void ruleSubStateTrPointTerminal() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:803:2: ( ( ( rule__SubStateTrPointTerminal__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:804:1: ( ( rule__SubStateTrPointTerminal__Group__0 ) )
+            // InternalFSM.g:805:2: ( ( ( rule__SubStateTrPointTerminal__Group__0 ) ) )
+            // InternalFSM.g:806:1: ( ( rule__SubStateTrPointTerminal__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:804:1: ( ( rule__SubStateTrPointTerminal__Group__0 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:805:1: ( rule__SubStateTrPointTerminal__Group__0 )
+            // InternalFSM.g:806:1: ( ( rule__SubStateTrPointTerminal__Group__0 ) )
+            // InternalFSM.g:807:1: ( rule__SubStateTrPointTerminal__Group__0 )
             {
              before(grammarAccess.getSubStateTrPointTerminalAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:806:1: ( rule__SubStateTrPointTerminal__Group__0 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:806:2: rule__SubStateTrPointTerminal__Group__0
+            // InternalFSM.g:808:1: ( rule__SubStateTrPointTerminal__Group__0 )
+            // InternalFSM.g:808:2: rule__SubStateTrPointTerminal__Group__0
             {
-            pushFollow(FOLLOW_rule__SubStateTrPointTerminal__Group__0_in_ruleSubStateTrPointTerminal1657);
+            pushFollow(FOLLOW_2);
             rule__SubStateTrPointTerminal__Group__0();
 
             state._fsp--;
@@ -2229,20 +2229,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleChoicepointTerminal"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:818:1: entryRuleChoicepointTerminal : ruleChoicepointTerminal EOF ;
+    // InternalFSM.g:820:1: entryRuleChoicepointTerminal : ruleChoicepointTerminal EOF ;
     public final void entryRuleChoicepointTerminal() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:819:1: ( ruleChoicepointTerminal EOF )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:820:1: ruleChoicepointTerminal EOF
+            // InternalFSM.g:821:1: ( ruleChoicepointTerminal EOF )
+            // InternalFSM.g:822:1: ruleChoicepointTerminal EOF
             {
              before(grammarAccess.getChoicepointTerminalRule()); 
-            pushFollow(FOLLOW_ruleChoicepointTerminal_in_entryRuleChoicepointTerminal1684);
+            pushFollow(FOLLOW_1);
             ruleChoicepointTerminal();
 
             state._fsp--;
 
              after(grammarAccess.getChoicepointTerminalRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleChoicepointTerminal1691); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2259,23 +2259,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleChoicepointTerminal"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:827:1: ruleChoicepointTerminal : ( ( rule__ChoicepointTerminal__Group__0 ) ) ;
+    // InternalFSM.g:829:1: ruleChoicepointTerminal : ( ( rule__ChoicepointTerminal__Group__0 ) ) ;
     public final void ruleChoicepointTerminal() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:831:2: ( ( ( rule__ChoicepointTerminal__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:832:1: ( ( rule__ChoicepointTerminal__Group__0 ) )
+            // InternalFSM.g:833:2: ( ( ( rule__ChoicepointTerminal__Group__0 ) ) )
+            // InternalFSM.g:834:1: ( ( rule__ChoicepointTerminal__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:832:1: ( ( rule__ChoicepointTerminal__Group__0 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:833:1: ( rule__ChoicepointTerminal__Group__0 )
+            // InternalFSM.g:834:1: ( ( rule__ChoicepointTerminal__Group__0 ) )
+            // InternalFSM.g:835:1: ( rule__ChoicepointTerminal__Group__0 )
             {
              before(grammarAccess.getChoicepointTerminalAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:834:1: ( rule__ChoicepointTerminal__Group__0 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:834:2: rule__ChoicepointTerminal__Group__0
+            // InternalFSM.g:836:1: ( rule__ChoicepointTerminal__Group__0 )
+            // InternalFSM.g:836:2: rule__ChoicepointTerminal__Group__0
             {
-            pushFollow(FOLLOW_rule__ChoicepointTerminal__Group__0_in_ruleChoicepointTerminal1717);
+            pushFollow(FOLLOW_2);
             rule__ChoicepointTerminal__Group__0();
 
             state._fsp--;
@@ -2306,20 +2306,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleTrigger"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:846:1: entryRuleTrigger : ruleTrigger EOF ;
+    // InternalFSM.g:848:1: entryRuleTrigger : ruleTrigger EOF ;
     public final void entryRuleTrigger() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:847:1: ( ruleTrigger EOF )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:848:1: ruleTrigger EOF
+            // InternalFSM.g:849:1: ( ruleTrigger EOF )
+            // InternalFSM.g:850:1: ruleTrigger EOF
             {
              before(grammarAccess.getTriggerRule()); 
-            pushFollow(FOLLOW_ruleTrigger_in_entryRuleTrigger1744);
+            pushFollow(FOLLOW_1);
             ruleTrigger();
 
             state._fsp--;
 
              after(grammarAccess.getTriggerRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleTrigger1751); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2336,23 +2336,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleTrigger"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:855:1: ruleTrigger : ( ( rule__Trigger__Group__0 ) ) ;
+    // InternalFSM.g:857:1: ruleTrigger : ( ( rule__Trigger__Group__0 ) ) ;
     public final void ruleTrigger() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:859:2: ( ( ( rule__Trigger__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:860:1: ( ( rule__Trigger__Group__0 ) )
+            // InternalFSM.g:861:2: ( ( ( rule__Trigger__Group__0 ) ) )
+            // InternalFSM.g:862:1: ( ( rule__Trigger__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:860:1: ( ( rule__Trigger__Group__0 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:861:1: ( rule__Trigger__Group__0 )
+            // InternalFSM.g:862:1: ( ( rule__Trigger__Group__0 ) )
+            // InternalFSM.g:863:1: ( rule__Trigger__Group__0 )
             {
              before(grammarAccess.getTriggerAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:862:1: ( rule__Trigger__Group__0 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:862:2: rule__Trigger__Group__0
+            // InternalFSM.g:864:1: ( rule__Trigger__Group__0 )
+            // InternalFSM.g:864:2: rule__Trigger__Group__0
             {
-            pushFollow(FOLLOW_rule__Trigger__Group__0_in_ruleTrigger1777);
+            pushFollow(FOLLOW_2);
             rule__Trigger__Group__0();
 
             state._fsp--;
@@ -2383,20 +2383,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleMessageFromIf"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:874:1: entryRuleMessageFromIf : ruleMessageFromIf EOF ;
+    // InternalFSM.g:876:1: entryRuleMessageFromIf : ruleMessageFromIf EOF ;
     public final void entryRuleMessageFromIf() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:875:1: ( ruleMessageFromIf EOF )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:876:1: ruleMessageFromIf EOF
+            // InternalFSM.g:877:1: ( ruleMessageFromIf EOF )
+            // InternalFSM.g:878:1: ruleMessageFromIf EOF
             {
              before(grammarAccess.getMessageFromIfRule()); 
-            pushFollow(FOLLOW_ruleMessageFromIf_in_entryRuleMessageFromIf1804);
+            pushFollow(FOLLOW_1);
             ruleMessageFromIf();
 
             state._fsp--;
 
              after(grammarAccess.getMessageFromIfRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleMessageFromIf1811); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2413,23 +2413,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleMessageFromIf"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:883:1: ruleMessageFromIf : ( ( rule__MessageFromIf__Group__0 ) ) ;
+    // InternalFSM.g:885:1: ruleMessageFromIf : ( ( rule__MessageFromIf__Group__0 ) ) ;
     public final void ruleMessageFromIf() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:887:2: ( ( ( rule__MessageFromIf__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:888:1: ( ( rule__MessageFromIf__Group__0 ) )
+            // InternalFSM.g:889:2: ( ( ( rule__MessageFromIf__Group__0 ) ) )
+            // InternalFSM.g:890:1: ( ( rule__MessageFromIf__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:888:1: ( ( rule__MessageFromIf__Group__0 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:889:1: ( rule__MessageFromIf__Group__0 )
+            // InternalFSM.g:890:1: ( ( rule__MessageFromIf__Group__0 ) )
+            // InternalFSM.g:891:1: ( rule__MessageFromIf__Group__0 )
             {
              before(grammarAccess.getMessageFromIfAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:890:1: ( rule__MessageFromIf__Group__0 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:890:2: rule__MessageFromIf__Group__0
+            // InternalFSM.g:892:1: ( rule__MessageFromIf__Group__0 )
+            // InternalFSM.g:892:2: rule__MessageFromIf__Group__0
             {
-            pushFollow(FOLLOW_rule__MessageFromIf__Group__0_in_ruleMessageFromIf1837);
+            pushFollow(FOLLOW_2);
             rule__MessageFromIf__Group__0();
 
             state._fsp--;
@@ -2460,20 +2460,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleGuard"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:904:1: entryRuleGuard : ruleGuard EOF ;
+    // InternalFSM.g:906:1: entryRuleGuard : ruleGuard EOF ;
     public final void entryRuleGuard() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:905:1: ( ruleGuard EOF )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:906:1: ruleGuard EOF
+            // InternalFSM.g:907:1: ( ruleGuard EOF )
+            // InternalFSM.g:908:1: ruleGuard EOF
             {
              before(grammarAccess.getGuardRule()); 
-            pushFollow(FOLLOW_ruleGuard_in_entryRuleGuard1866);
+            pushFollow(FOLLOW_1);
             ruleGuard();
 
             state._fsp--;
 
              after(grammarAccess.getGuardRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleGuard1873); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2490,23 +2490,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleGuard"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:913:1: ruleGuard : ( ( rule__Guard__Group__0 ) ) ;
+    // InternalFSM.g:915:1: ruleGuard : ( ( rule__Guard__Group__0 ) ) ;
     public final void ruleGuard() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:917:2: ( ( ( rule__Guard__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:918:1: ( ( rule__Guard__Group__0 ) )
+            // InternalFSM.g:919:2: ( ( ( rule__Guard__Group__0 ) ) )
+            // InternalFSM.g:920:1: ( ( rule__Guard__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:918:1: ( ( rule__Guard__Group__0 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:919:1: ( rule__Guard__Group__0 )
+            // InternalFSM.g:920:1: ( ( rule__Guard__Group__0 ) )
+            // InternalFSM.g:921:1: ( rule__Guard__Group__0 )
             {
              before(grammarAccess.getGuardAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:920:1: ( rule__Guard__Group__0 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:920:2: rule__Guard__Group__0
+            // InternalFSM.g:922:1: ( rule__Guard__Group__0 )
+            // InternalFSM.g:922:2: rule__Guard__Group__0
             {
-            pushFollow(FOLLOW_rule__Guard__Group__0_in_ruleGuard1899);
+            pushFollow(FOLLOW_2);
             rule__Guard__Group__0();
 
             state._fsp--;
@@ -2537,20 +2537,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleSemanticsRule"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:934:1: entryRuleSemanticsRule : ruleSemanticsRule EOF ;
+    // InternalFSM.g:936:1: entryRuleSemanticsRule : ruleSemanticsRule EOF ;
     public final void entryRuleSemanticsRule() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:935:1: ( ruleSemanticsRule EOF )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:936:1: ruleSemanticsRule EOF
+            // InternalFSM.g:937:1: ( ruleSemanticsRule EOF )
+            // InternalFSM.g:938:1: ruleSemanticsRule EOF
             {
              before(grammarAccess.getSemanticsRuleRule()); 
-            pushFollow(FOLLOW_ruleSemanticsRule_in_entryRuleSemanticsRule1928);
+            pushFollow(FOLLOW_1);
             ruleSemanticsRule();
 
             state._fsp--;
 
              after(grammarAccess.getSemanticsRuleRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSemanticsRule1935); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2567,23 +2567,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleSemanticsRule"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:943:1: ruleSemanticsRule : ( ( rule__SemanticsRule__Alternatives ) ) ;
+    // InternalFSM.g:945:1: ruleSemanticsRule : ( ( rule__SemanticsRule__Alternatives ) ) ;
     public final void ruleSemanticsRule() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:947:2: ( ( ( rule__SemanticsRule__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:948:1: ( ( rule__SemanticsRule__Alternatives ) )
+            // InternalFSM.g:949:2: ( ( ( rule__SemanticsRule__Alternatives ) ) )
+            // InternalFSM.g:950:1: ( ( rule__SemanticsRule__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:948:1: ( ( rule__SemanticsRule__Alternatives ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:949:1: ( rule__SemanticsRule__Alternatives )
+            // InternalFSM.g:950:1: ( ( rule__SemanticsRule__Alternatives ) )
+            // InternalFSM.g:951:1: ( rule__SemanticsRule__Alternatives )
             {
              before(grammarAccess.getSemanticsRuleAccess().getAlternatives()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:950:1: ( rule__SemanticsRule__Alternatives )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:950:2: rule__SemanticsRule__Alternatives
+            // InternalFSM.g:952:1: ( rule__SemanticsRule__Alternatives )
+            // InternalFSM.g:952:2: rule__SemanticsRule__Alternatives
             {
-            pushFollow(FOLLOW_rule__SemanticsRule__Alternatives_in_ruleSemanticsRule1961);
+            pushFollow(FOLLOW_2);
             rule__SemanticsRule__Alternatives();
 
             state._fsp--;
@@ -2614,20 +2614,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleInSemanticsRule"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:962:1: entryRuleInSemanticsRule : ruleInSemanticsRule EOF ;
+    // InternalFSM.g:964:1: entryRuleInSemanticsRule : ruleInSemanticsRule EOF ;
     public final void entryRuleInSemanticsRule() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:963:1: ( ruleInSemanticsRule EOF )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:964:1: ruleInSemanticsRule EOF
+            // InternalFSM.g:965:1: ( ruleInSemanticsRule EOF )
+            // InternalFSM.g:966:1: ruleInSemanticsRule EOF
             {
              before(grammarAccess.getInSemanticsRuleRule()); 
-            pushFollow(FOLLOW_ruleInSemanticsRule_in_entryRuleInSemanticsRule1988);
+            pushFollow(FOLLOW_1);
             ruleInSemanticsRule();
 
             state._fsp--;
 
              after(grammarAccess.getInSemanticsRuleRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleInSemanticsRule1995); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2644,23 +2644,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleInSemanticsRule"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:971:1: ruleInSemanticsRule : ( ( rule__InSemanticsRule__Group__0 ) ) ;
+    // InternalFSM.g:973:1: ruleInSemanticsRule : ( ( rule__InSemanticsRule__Group__0 ) ) ;
     public final void ruleInSemanticsRule() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:975:2: ( ( ( rule__InSemanticsRule__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:976:1: ( ( rule__InSemanticsRule__Group__0 ) )
+            // InternalFSM.g:977:2: ( ( ( rule__InSemanticsRule__Group__0 ) ) )
+            // InternalFSM.g:978:1: ( ( rule__InSemanticsRule__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:976:1: ( ( rule__InSemanticsRule__Group__0 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:977:1: ( rule__InSemanticsRule__Group__0 )
+            // InternalFSM.g:978:1: ( ( rule__InSemanticsRule__Group__0 ) )
+            // InternalFSM.g:979:1: ( rule__InSemanticsRule__Group__0 )
             {
              before(grammarAccess.getInSemanticsRuleAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:978:1: ( rule__InSemanticsRule__Group__0 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:978:2: rule__InSemanticsRule__Group__0
+            // InternalFSM.g:980:1: ( rule__InSemanticsRule__Group__0 )
+            // InternalFSM.g:980:2: rule__InSemanticsRule__Group__0
             {
-            pushFollow(FOLLOW_rule__InSemanticsRule__Group__0_in_ruleInSemanticsRule2021);
+            pushFollow(FOLLOW_2);
             rule__InSemanticsRule__Group__0();
 
             state._fsp--;
@@ -2691,20 +2691,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleOutSemanticsRule"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:990:1: entryRuleOutSemanticsRule : ruleOutSemanticsRule EOF ;
+    // InternalFSM.g:992:1: entryRuleOutSemanticsRule : ruleOutSemanticsRule EOF ;
     public final void entryRuleOutSemanticsRule() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:991:1: ( ruleOutSemanticsRule EOF )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:992:1: ruleOutSemanticsRule EOF
+            // InternalFSM.g:993:1: ( ruleOutSemanticsRule EOF )
+            // InternalFSM.g:994:1: ruleOutSemanticsRule EOF
             {
              before(grammarAccess.getOutSemanticsRuleRule()); 
-            pushFollow(FOLLOW_ruleOutSemanticsRule_in_entryRuleOutSemanticsRule2048);
+            pushFollow(FOLLOW_1);
             ruleOutSemanticsRule();
 
             state._fsp--;
 
              after(grammarAccess.getOutSemanticsRuleRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOutSemanticsRule2055); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2721,23 +2721,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleOutSemanticsRule"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:999:1: ruleOutSemanticsRule : ( ( rule__OutSemanticsRule__Group__0 ) ) ;
+    // InternalFSM.g:1001:1: ruleOutSemanticsRule : ( ( rule__OutSemanticsRule__Group__0 ) ) ;
     public final void ruleOutSemanticsRule() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1003:2: ( ( ( rule__OutSemanticsRule__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1004:1: ( ( rule__OutSemanticsRule__Group__0 ) )
+            // InternalFSM.g:1005:2: ( ( ( rule__OutSemanticsRule__Group__0 ) ) )
+            // InternalFSM.g:1006:1: ( ( rule__OutSemanticsRule__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1004:1: ( ( rule__OutSemanticsRule__Group__0 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1005:1: ( rule__OutSemanticsRule__Group__0 )
+            // InternalFSM.g:1006:1: ( ( rule__OutSemanticsRule__Group__0 ) )
+            // InternalFSM.g:1007:1: ( rule__OutSemanticsRule__Group__0 )
             {
              before(grammarAccess.getOutSemanticsRuleAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1006:1: ( rule__OutSemanticsRule__Group__0 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1006:2: rule__OutSemanticsRule__Group__0
+            // InternalFSM.g:1008:1: ( rule__OutSemanticsRule__Group__0 )
+            // InternalFSM.g:1008:2: rule__OutSemanticsRule__Group__0
             {
-            pushFollow(FOLLOW_rule__OutSemanticsRule__Group__0_in_ruleOutSemanticsRule2081);
+            pushFollow(FOLLOW_2);
             rule__OutSemanticsRule__Group__0();
 
             state._fsp--;
@@ -2768,20 +2768,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleKeyValue"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1020:1: entryRuleKeyValue : ruleKeyValue EOF ;
+    // InternalFSM.g:1022:1: entryRuleKeyValue : ruleKeyValue EOF ;
     public final void entryRuleKeyValue() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1021:1: ( ruleKeyValue EOF )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1022:1: ruleKeyValue EOF
+            // InternalFSM.g:1023:1: ( ruleKeyValue EOF )
+            // InternalFSM.g:1024:1: ruleKeyValue EOF
             {
              before(grammarAccess.getKeyValueRule()); 
-            pushFollow(FOLLOW_ruleKeyValue_in_entryRuleKeyValue2110);
+            pushFollow(FOLLOW_1);
             ruleKeyValue();
 
             state._fsp--;
 
              after(grammarAccess.getKeyValueRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleKeyValue2117); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2798,23 +2798,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleKeyValue"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1029:1: ruleKeyValue : ( ( rule__KeyValue__Group__0 ) ) ;
+    // InternalFSM.g:1031:1: ruleKeyValue : ( ( rule__KeyValue__Group__0 ) ) ;
     public final void ruleKeyValue() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1033:2: ( ( ( rule__KeyValue__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1034:1: ( ( rule__KeyValue__Group__0 ) )
+            // InternalFSM.g:1035:2: ( ( ( rule__KeyValue__Group__0 ) ) )
+            // InternalFSM.g:1036:1: ( ( rule__KeyValue__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1034:1: ( ( rule__KeyValue__Group__0 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1035:1: ( rule__KeyValue__Group__0 )
+            // InternalFSM.g:1036:1: ( ( rule__KeyValue__Group__0 ) )
+            // InternalFSM.g:1037:1: ( rule__KeyValue__Group__0 )
             {
              before(grammarAccess.getKeyValueAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1036:1: ( rule__KeyValue__Group__0 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1036:2: rule__KeyValue__Group__0
+            // InternalFSM.g:1038:1: ( rule__KeyValue__Group__0 )
+            // InternalFSM.g:1038:2: rule__KeyValue__Group__0
             {
-            pushFollow(FOLLOW_rule__KeyValue__Group__0_in_ruleKeyValue2143);
+            pushFollow(FOLLOW_2);
             rule__KeyValue__Group__0();
 
             state._fsp--;
@@ -2845,20 +2845,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleAnnotationTargetType"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1050:1: entryRuleAnnotationTargetType : ruleAnnotationTargetType EOF ;
+    // InternalFSM.g:1052:1: entryRuleAnnotationTargetType : ruleAnnotationTargetType EOF ;
     public final void entryRuleAnnotationTargetType() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1051:1: ( ruleAnnotationTargetType EOF )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1052:1: ruleAnnotationTargetType EOF
+            // InternalFSM.g:1053:1: ( ruleAnnotationTargetType EOF )
+            // InternalFSM.g:1054:1: ruleAnnotationTargetType EOF
             {
              before(grammarAccess.getAnnotationTargetTypeRule()); 
-            pushFollow(FOLLOW_ruleAnnotationTargetType_in_entryRuleAnnotationTargetType2172);
+            pushFollow(FOLLOW_1);
             ruleAnnotationTargetType();
 
             state._fsp--;
 
              after(grammarAccess.getAnnotationTargetTypeRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAnnotationTargetType2179); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2875,20 +2875,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleAnnotationTargetType"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1059:1: ruleAnnotationTargetType : ( RULE_ID ) ;
+    // InternalFSM.g:1061:1: ruleAnnotationTargetType : ( RULE_ID ) ;
     public final void ruleAnnotationTargetType() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1063:2: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1064:1: ( RULE_ID )
+            // InternalFSM.g:1065:2: ( ( RULE_ID ) )
+            // InternalFSM.g:1066:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1064:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1065:1: RULE_ID
+            // InternalFSM.g:1066:1: ( RULE_ID )
+            // InternalFSM.g:1067:1: RULE_ID
             {
              before(grammarAccess.getAnnotationTargetTypeAccess().getIDTerminalRuleCall()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleAnnotationTargetType2205); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getAnnotationTargetTypeAccess().getIDTerminalRuleCall()); 
 
             }
@@ -2912,20 +2912,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleAnnotationAttribute"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1078:1: entryRuleAnnotationAttribute : ruleAnnotationAttribute EOF ;
+    // InternalFSM.g:1080:1: entryRuleAnnotationAttribute : ruleAnnotationAttribute EOF ;
     public final void entryRuleAnnotationAttribute() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1079:1: ( ruleAnnotationAttribute EOF )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1080:1: ruleAnnotationAttribute EOF
+            // InternalFSM.g:1081:1: ( ruleAnnotationAttribute EOF )
+            // InternalFSM.g:1082:1: ruleAnnotationAttribute EOF
             {
              before(grammarAccess.getAnnotationAttributeRule()); 
-            pushFollow(FOLLOW_ruleAnnotationAttribute_in_entryRuleAnnotationAttribute2231);
+            pushFollow(FOLLOW_1);
             ruleAnnotationAttribute();
 
             state._fsp--;
 
              after(grammarAccess.getAnnotationAttributeRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAnnotationAttribute2238); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2942,23 +2942,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleAnnotationAttribute"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1087:1: ruleAnnotationAttribute : ( ( rule__AnnotationAttribute__Alternatives ) ) ;
+    // InternalFSM.g:1089:1: ruleAnnotationAttribute : ( ( rule__AnnotationAttribute__Alternatives ) ) ;
     public final void ruleAnnotationAttribute() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1091:2: ( ( ( rule__AnnotationAttribute__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1092:1: ( ( rule__AnnotationAttribute__Alternatives ) )
+            // InternalFSM.g:1093:2: ( ( ( rule__AnnotationAttribute__Alternatives ) ) )
+            // InternalFSM.g:1094:1: ( ( rule__AnnotationAttribute__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1092:1: ( ( rule__AnnotationAttribute__Alternatives ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1093:1: ( rule__AnnotationAttribute__Alternatives )
+            // InternalFSM.g:1094:1: ( ( rule__AnnotationAttribute__Alternatives ) )
+            // InternalFSM.g:1095:1: ( rule__AnnotationAttribute__Alternatives )
             {
              before(grammarAccess.getAnnotationAttributeAccess().getAlternatives()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1094:1: ( rule__AnnotationAttribute__Alternatives )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1094:2: rule__AnnotationAttribute__Alternatives
+            // InternalFSM.g:1096:1: ( rule__AnnotationAttribute__Alternatives )
+            // InternalFSM.g:1096:2: rule__AnnotationAttribute__Alternatives
             {
-            pushFollow(FOLLOW_rule__AnnotationAttribute__Alternatives_in_ruleAnnotationAttribute2264);
+            pushFollow(FOLLOW_2);
             rule__AnnotationAttribute__Alternatives();
 
             state._fsp--;
@@ -2989,20 +2989,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleSimpleAnnotationAttribute"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1106:1: entryRuleSimpleAnnotationAttribute : ruleSimpleAnnotationAttribute EOF ;
+    // InternalFSM.g:1108:1: entryRuleSimpleAnnotationAttribute : ruleSimpleAnnotationAttribute EOF ;
     public final void entryRuleSimpleAnnotationAttribute() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1107:1: ( ruleSimpleAnnotationAttribute EOF )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1108:1: ruleSimpleAnnotationAttribute EOF
+            // InternalFSM.g:1109:1: ( ruleSimpleAnnotationAttribute EOF )
+            // InternalFSM.g:1110:1: ruleSimpleAnnotationAttribute EOF
             {
              before(grammarAccess.getSimpleAnnotationAttributeRule()); 
-            pushFollow(FOLLOW_ruleSimpleAnnotationAttribute_in_entryRuleSimpleAnnotationAttribute2291);
+            pushFollow(FOLLOW_1);
             ruleSimpleAnnotationAttribute();
 
             state._fsp--;
 
              after(grammarAccess.getSimpleAnnotationAttributeRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSimpleAnnotationAttribute2298); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3019,23 +3019,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleSimpleAnnotationAttribute"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1115:1: ruleSimpleAnnotationAttribute : ( ( rule__SimpleAnnotationAttribute__Group__0 ) ) ;
+    // InternalFSM.g:1117:1: ruleSimpleAnnotationAttribute : ( ( rule__SimpleAnnotationAttribute__Group__0 ) ) ;
     public final void ruleSimpleAnnotationAttribute() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1119:2: ( ( ( rule__SimpleAnnotationAttribute__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1120:1: ( ( rule__SimpleAnnotationAttribute__Group__0 ) )
+            // InternalFSM.g:1121:2: ( ( ( rule__SimpleAnnotationAttribute__Group__0 ) ) )
+            // InternalFSM.g:1122:1: ( ( rule__SimpleAnnotationAttribute__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1120:1: ( ( rule__SimpleAnnotationAttribute__Group__0 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1121:1: ( rule__SimpleAnnotationAttribute__Group__0 )
+            // InternalFSM.g:1122:1: ( ( rule__SimpleAnnotationAttribute__Group__0 ) )
+            // InternalFSM.g:1123:1: ( rule__SimpleAnnotationAttribute__Group__0 )
             {
              before(grammarAccess.getSimpleAnnotationAttributeAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1122:1: ( rule__SimpleAnnotationAttribute__Group__0 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1122:2: rule__SimpleAnnotationAttribute__Group__0
+            // InternalFSM.g:1124:1: ( rule__SimpleAnnotationAttribute__Group__0 )
+            // InternalFSM.g:1124:2: rule__SimpleAnnotationAttribute__Group__0
             {
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__0_in_ruleSimpleAnnotationAttribute2324);
+            pushFollow(FOLLOW_2);
             rule__SimpleAnnotationAttribute__Group__0();
 
             state._fsp--;
@@ -3066,20 +3066,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleEnumAnnotationAttribute"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1134:1: entryRuleEnumAnnotationAttribute : ruleEnumAnnotationAttribute EOF ;
+    // InternalFSM.g:1136:1: entryRuleEnumAnnotationAttribute : ruleEnumAnnotationAttribute EOF ;
     public final void entryRuleEnumAnnotationAttribute() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1135:1: ( ruleEnumAnnotationAttribute EOF )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1136:1: ruleEnumAnnotationAttribute EOF
+            // InternalFSM.g:1137:1: ( ruleEnumAnnotationAttribute EOF )
+            // InternalFSM.g:1138:1: ruleEnumAnnotationAttribute EOF
             {
              before(grammarAccess.getEnumAnnotationAttributeRule()); 
-            pushFollow(FOLLOW_ruleEnumAnnotationAttribute_in_entryRuleEnumAnnotationAttribute2351);
+            pushFollow(FOLLOW_1);
             ruleEnumAnnotationAttribute();
 
             state._fsp--;
 
              after(grammarAccess.getEnumAnnotationAttributeRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleEnumAnnotationAttribute2358); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3096,23 +3096,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleEnumAnnotationAttribute"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1143:1: ruleEnumAnnotationAttribute : ( ( rule__EnumAnnotationAttribute__Group__0 ) ) ;
+    // InternalFSM.g:1145:1: ruleEnumAnnotationAttribute : ( ( rule__EnumAnnotationAttribute__Group__0 ) ) ;
     public final void ruleEnumAnnotationAttribute() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1147:2: ( ( ( rule__EnumAnnotationAttribute__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1148:1: ( ( rule__EnumAnnotationAttribute__Group__0 ) )
+            // InternalFSM.g:1149:2: ( ( ( rule__EnumAnnotationAttribute__Group__0 ) ) )
+            // InternalFSM.g:1150:1: ( ( rule__EnumAnnotationAttribute__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1148:1: ( ( rule__EnumAnnotationAttribute__Group__0 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1149:1: ( rule__EnumAnnotationAttribute__Group__0 )
+            // InternalFSM.g:1150:1: ( ( rule__EnumAnnotationAttribute__Group__0 ) )
+            // InternalFSM.g:1151:1: ( rule__EnumAnnotationAttribute__Group__0 )
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1150:1: ( rule__EnumAnnotationAttribute__Group__0 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1150:2: rule__EnumAnnotationAttribute__Group__0
+            // InternalFSM.g:1152:1: ( rule__EnumAnnotationAttribute__Group__0 )
+            // InternalFSM.g:1152:2: rule__EnumAnnotationAttribute__Group__0
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__0_in_ruleEnumAnnotationAttribute2384);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group__0();
 
             state._fsp--;
@@ -3143,20 +3143,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleImportedFQN"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1164:1: entryRuleImportedFQN : ruleImportedFQN EOF ;
+    // InternalFSM.g:1166:1: entryRuleImportedFQN : ruleImportedFQN EOF ;
     public final void entryRuleImportedFQN() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1165:1: ( ruleImportedFQN EOF )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1166:1: ruleImportedFQN EOF
+            // InternalFSM.g:1167:1: ( ruleImportedFQN EOF )
+            // InternalFSM.g:1168:1: ruleImportedFQN EOF
             {
              before(grammarAccess.getImportedFQNRule()); 
-            pushFollow(FOLLOW_ruleImportedFQN_in_entryRuleImportedFQN2413);
+            pushFollow(FOLLOW_1);
             ruleImportedFQN();
 
             state._fsp--;
 
              after(grammarAccess.getImportedFQNRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleImportedFQN2420); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3173,23 +3173,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleImportedFQN"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1173:1: ruleImportedFQN : ( ( rule__ImportedFQN__Group__0 ) ) ;
+    // InternalFSM.g:1175:1: ruleImportedFQN : ( ( rule__ImportedFQN__Group__0 ) ) ;
     public final void ruleImportedFQN() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1177:2: ( ( ( rule__ImportedFQN__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1178:1: ( ( rule__ImportedFQN__Group__0 ) )
+            // InternalFSM.g:1179:2: ( ( ( rule__ImportedFQN__Group__0 ) ) )
+            // InternalFSM.g:1180:1: ( ( rule__ImportedFQN__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1178:1: ( ( rule__ImportedFQN__Group__0 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1179:1: ( rule__ImportedFQN__Group__0 )
+            // InternalFSM.g:1180:1: ( ( rule__ImportedFQN__Group__0 ) )
+            // InternalFSM.g:1181:1: ( rule__ImportedFQN__Group__0 )
             {
              before(grammarAccess.getImportedFQNAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1180:1: ( rule__ImportedFQN__Group__0 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1180:2: rule__ImportedFQN__Group__0
+            // InternalFSM.g:1182:1: ( rule__ImportedFQN__Group__0 )
+            // InternalFSM.g:1182:2: rule__ImportedFQN__Group__0
             {
-            pushFollow(FOLLOW_rule__ImportedFQN__Group__0_in_ruleImportedFQN2446);
+            pushFollow(FOLLOW_2);
             rule__ImportedFQN__Group__0();
 
             state._fsp--;
@@ -3220,20 +3220,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleDocumentation"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1192:1: entryRuleDocumentation : ruleDocumentation EOF ;
+    // InternalFSM.g:1194:1: entryRuleDocumentation : ruleDocumentation EOF ;
     public final void entryRuleDocumentation() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1193:1: ( ruleDocumentation EOF )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1194:1: ruleDocumentation EOF
+            // InternalFSM.g:1195:1: ( ruleDocumentation EOF )
+            // InternalFSM.g:1196:1: ruleDocumentation EOF
             {
              before(grammarAccess.getDocumentationRule()); 
-            pushFollow(FOLLOW_ruleDocumentation_in_entryRuleDocumentation2473);
+            pushFollow(FOLLOW_1);
             ruleDocumentation();
 
             state._fsp--;
 
              after(grammarAccess.getDocumentationRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDocumentation2480); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3250,23 +3250,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleDocumentation"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1201:1: ruleDocumentation : ( ( rule__Documentation__Group__0 ) ) ;
+    // InternalFSM.g:1203:1: ruleDocumentation : ( ( rule__Documentation__Group__0 ) ) ;
     public final void ruleDocumentation() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1205:2: ( ( ( rule__Documentation__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1206:1: ( ( rule__Documentation__Group__0 ) )
+            // InternalFSM.g:1207:2: ( ( ( rule__Documentation__Group__0 ) ) )
+            // InternalFSM.g:1208:1: ( ( rule__Documentation__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1206:1: ( ( rule__Documentation__Group__0 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1207:1: ( rule__Documentation__Group__0 )
+            // InternalFSM.g:1208:1: ( ( rule__Documentation__Group__0 ) )
+            // InternalFSM.g:1209:1: ( rule__Documentation__Group__0 )
             {
              before(grammarAccess.getDocumentationAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1208:1: ( rule__Documentation__Group__0 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1208:2: rule__Documentation__Group__0
+            // InternalFSM.g:1210:1: ( rule__Documentation__Group__0 )
+            // InternalFSM.g:1210:2: rule__Documentation__Group__0
             {
-            pushFollow(FOLLOW_rule__Documentation__Group__0_in_ruleDocumentation2506);
+            pushFollow(FOLLOW_2);
             rule__Documentation__Group__0();
 
             state._fsp--;
@@ -3297,20 +3297,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleLiteral"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1224:1: entryRuleLiteral : ruleLiteral EOF ;
+    // InternalFSM.g:1226:1: entryRuleLiteral : ruleLiteral EOF ;
     public final void entryRuleLiteral() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1225:1: ( ruleLiteral EOF )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1226:1: ruleLiteral EOF
+            // InternalFSM.g:1227:1: ( ruleLiteral EOF )
+            // InternalFSM.g:1228:1: ruleLiteral EOF
             {
              before(grammarAccess.getLiteralRule()); 
-            pushFollow(FOLLOW_ruleLiteral_in_entryRuleLiteral2537);
+            pushFollow(FOLLOW_1);
             ruleLiteral();
 
             state._fsp--;
 
              after(grammarAccess.getLiteralRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleLiteral2544); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3327,23 +3327,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleLiteral"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1233:1: ruleLiteral : ( ( rule__Literal__Alternatives ) ) ;
+    // InternalFSM.g:1235:1: ruleLiteral : ( ( rule__Literal__Alternatives ) ) ;
     public final void ruleLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1237:2: ( ( ( rule__Literal__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1238:1: ( ( rule__Literal__Alternatives ) )
+            // InternalFSM.g:1239:2: ( ( ( rule__Literal__Alternatives ) ) )
+            // InternalFSM.g:1240:1: ( ( rule__Literal__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1238:1: ( ( rule__Literal__Alternatives ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1239:1: ( rule__Literal__Alternatives )
+            // InternalFSM.g:1240:1: ( ( rule__Literal__Alternatives ) )
+            // InternalFSM.g:1241:1: ( rule__Literal__Alternatives )
             {
              before(grammarAccess.getLiteralAccess().getAlternatives()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1240:1: ( rule__Literal__Alternatives )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1240:2: rule__Literal__Alternatives
+            // InternalFSM.g:1242:1: ( rule__Literal__Alternatives )
+            // InternalFSM.g:1242:2: rule__Literal__Alternatives
             {
-            pushFollow(FOLLOW_rule__Literal__Alternatives_in_ruleLiteral2570);
+            pushFollow(FOLLOW_2);
             rule__Literal__Alternatives();
 
             state._fsp--;
@@ -3374,20 +3374,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleBooleanLiteral"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1252:1: entryRuleBooleanLiteral : ruleBooleanLiteral EOF ;
+    // InternalFSM.g:1254:1: entryRuleBooleanLiteral : ruleBooleanLiteral EOF ;
     public final void entryRuleBooleanLiteral() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1253:1: ( ruleBooleanLiteral EOF )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1254:1: ruleBooleanLiteral EOF
+            // InternalFSM.g:1255:1: ( ruleBooleanLiteral EOF )
+            // InternalFSM.g:1256:1: ruleBooleanLiteral EOF
             {
              before(grammarAccess.getBooleanLiteralRule()); 
-            pushFollow(FOLLOW_ruleBooleanLiteral_in_entryRuleBooleanLiteral2597);
+            pushFollow(FOLLOW_1);
             ruleBooleanLiteral();
 
             state._fsp--;
 
              after(grammarAccess.getBooleanLiteralRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleBooleanLiteral2604); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3404,23 +3404,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleBooleanLiteral"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1261:1: ruleBooleanLiteral : ( ( rule__BooleanLiteral__Group__0 ) ) ;
+    // InternalFSM.g:1263:1: ruleBooleanLiteral : ( ( rule__BooleanLiteral__Group__0 ) ) ;
     public final void ruleBooleanLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1265:2: ( ( ( rule__BooleanLiteral__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1266:1: ( ( rule__BooleanLiteral__Group__0 ) )
+            // InternalFSM.g:1267:2: ( ( ( rule__BooleanLiteral__Group__0 ) ) )
+            // InternalFSM.g:1268:1: ( ( rule__BooleanLiteral__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1266:1: ( ( rule__BooleanLiteral__Group__0 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1267:1: ( rule__BooleanLiteral__Group__0 )
+            // InternalFSM.g:1268:1: ( ( rule__BooleanLiteral__Group__0 ) )
+            // InternalFSM.g:1269:1: ( rule__BooleanLiteral__Group__0 )
             {
              before(grammarAccess.getBooleanLiteralAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1268:1: ( rule__BooleanLiteral__Group__0 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1268:2: rule__BooleanLiteral__Group__0
+            // InternalFSM.g:1270:1: ( rule__BooleanLiteral__Group__0 )
+            // InternalFSM.g:1270:2: rule__BooleanLiteral__Group__0
             {
-            pushFollow(FOLLOW_rule__BooleanLiteral__Group__0_in_ruleBooleanLiteral2630);
+            pushFollow(FOLLOW_2);
             rule__BooleanLiteral__Group__0();
 
             state._fsp--;
@@ -3451,20 +3451,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleNumberLiteral"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1280:1: entryRuleNumberLiteral : ruleNumberLiteral EOF ;
+    // InternalFSM.g:1282:1: entryRuleNumberLiteral : ruleNumberLiteral EOF ;
     public final void entryRuleNumberLiteral() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1281:1: ( ruleNumberLiteral EOF )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1282:1: ruleNumberLiteral EOF
+            // InternalFSM.g:1283:1: ( ruleNumberLiteral EOF )
+            // InternalFSM.g:1284:1: ruleNumberLiteral EOF
             {
              before(grammarAccess.getNumberLiteralRule()); 
-            pushFollow(FOLLOW_ruleNumberLiteral_in_entryRuleNumberLiteral2657);
+            pushFollow(FOLLOW_1);
             ruleNumberLiteral();
 
             state._fsp--;
 
              after(grammarAccess.getNumberLiteralRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleNumberLiteral2664); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3481,23 +3481,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleNumberLiteral"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1289:1: ruleNumberLiteral : ( ( rule__NumberLiteral__Alternatives ) ) ;
+    // InternalFSM.g:1291:1: ruleNumberLiteral : ( ( rule__NumberLiteral__Alternatives ) ) ;
     public final void ruleNumberLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1293:2: ( ( ( rule__NumberLiteral__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1294:1: ( ( rule__NumberLiteral__Alternatives ) )
+            // InternalFSM.g:1295:2: ( ( ( rule__NumberLiteral__Alternatives ) ) )
+            // InternalFSM.g:1296:1: ( ( rule__NumberLiteral__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1294:1: ( ( rule__NumberLiteral__Alternatives ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1295:1: ( rule__NumberLiteral__Alternatives )
+            // InternalFSM.g:1296:1: ( ( rule__NumberLiteral__Alternatives ) )
+            // InternalFSM.g:1297:1: ( rule__NumberLiteral__Alternatives )
             {
              before(grammarAccess.getNumberLiteralAccess().getAlternatives()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1296:1: ( rule__NumberLiteral__Alternatives )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1296:2: rule__NumberLiteral__Alternatives
+            // InternalFSM.g:1298:1: ( rule__NumberLiteral__Alternatives )
+            // InternalFSM.g:1298:2: rule__NumberLiteral__Alternatives
             {
-            pushFollow(FOLLOW_rule__NumberLiteral__Alternatives_in_ruleNumberLiteral2690);
+            pushFollow(FOLLOW_2);
             rule__NumberLiteral__Alternatives();
 
             state._fsp--;
@@ -3528,20 +3528,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleRealLiteral"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1308:1: entryRuleRealLiteral : ruleRealLiteral EOF ;
+    // InternalFSM.g:1310:1: entryRuleRealLiteral : ruleRealLiteral EOF ;
     public final void entryRuleRealLiteral() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1309:1: ( ruleRealLiteral EOF )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1310:1: ruleRealLiteral EOF
+            // InternalFSM.g:1311:1: ( ruleRealLiteral EOF )
+            // InternalFSM.g:1312:1: ruleRealLiteral EOF
             {
              before(grammarAccess.getRealLiteralRule()); 
-            pushFollow(FOLLOW_ruleRealLiteral_in_entryRuleRealLiteral2717);
+            pushFollow(FOLLOW_1);
             ruleRealLiteral();
 
             state._fsp--;
 
              after(grammarAccess.getRealLiteralRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRealLiteral2724); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3558,23 +3558,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleRealLiteral"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1317:1: ruleRealLiteral : ( ( rule__RealLiteral__Group__0 ) ) ;
+    // InternalFSM.g:1319:1: ruleRealLiteral : ( ( rule__RealLiteral__Group__0 ) ) ;
     public final void ruleRealLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1321:2: ( ( ( rule__RealLiteral__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1322:1: ( ( rule__RealLiteral__Group__0 ) )
+            // InternalFSM.g:1323:2: ( ( ( rule__RealLiteral__Group__0 ) ) )
+            // InternalFSM.g:1324:1: ( ( rule__RealLiteral__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1322:1: ( ( rule__RealLiteral__Group__0 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1323:1: ( rule__RealLiteral__Group__0 )
+            // InternalFSM.g:1324:1: ( ( rule__RealLiteral__Group__0 ) )
+            // InternalFSM.g:1325:1: ( rule__RealLiteral__Group__0 )
             {
              before(grammarAccess.getRealLiteralAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1324:1: ( rule__RealLiteral__Group__0 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1324:2: rule__RealLiteral__Group__0
+            // InternalFSM.g:1326:1: ( rule__RealLiteral__Group__0 )
+            // InternalFSM.g:1326:2: rule__RealLiteral__Group__0
             {
-            pushFollow(FOLLOW_rule__RealLiteral__Group__0_in_ruleRealLiteral2750);
+            pushFollow(FOLLOW_2);
             rule__RealLiteral__Group__0();
 
             state._fsp--;
@@ -3605,20 +3605,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleIntLiteral"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1336:1: entryRuleIntLiteral : ruleIntLiteral EOF ;
+    // InternalFSM.g:1338:1: entryRuleIntLiteral : ruleIntLiteral EOF ;
     public final void entryRuleIntLiteral() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1337:1: ( ruleIntLiteral EOF )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1338:1: ruleIntLiteral EOF
+            // InternalFSM.g:1339:1: ( ruleIntLiteral EOF )
+            // InternalFSM.g:1340:1: ruleIntLiteral EOF
             {
              before(grammarAccess.getIntLiteralRule()); 
-            pushFollow(FOLLOW_ruleIntLiteral_in_entryRuleIntLiteral2777);
+            pushFollow(FOLLOW_1);
             ruleIntLiteral();
 
             state._fsp--;
 
              after(grammarAccess.getIntLiteralRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIntLiteral2784); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3635,23 +3635,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleIntLiteral"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1345:1: ruleIntLiteral : ( ( rule__IntLiteral__Group__0 ) ) ;
+    // InternalFSM.g:1347:1: ruleIntLiteral : ( ( rule__IntLiteral__Group__0 ) ) ;
     public final void ruleIntLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1349:2: ( ( ( rule__IntLiteral__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1350:1: ( ( rule__IntLiteral__Group__0 ) )
+            // InternalFSM.g:1351:2: ( ( ( rule__IntLiteral__Group__0 ) ) )
+            // InternalFSM.g:1352:1: ( ( rule__IntLiteral__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1350:1: ( ( rule__IntLiteral__Group__0 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1351:1: ( rule__IntLiteral__Group__0 )
+            // InternalFSM.g:1352:1: ( ( rule__IntLiteral__Group__0 ) )
+            // InternalFSM.g:1353:1: ( rule__IntLiteral__Group__0 )
             {
              before(grammarAccess.getIntLiteralAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1352:1: ( rule__IntLiteral__Group__0 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1352:2: rule__IntLiteral__Group__0
+            // InternalFSM.g:1354:1: ( rule__IntLiteral__Group__0 )
+            // InternalFSM.g:1354:2: rule__IntLiteral__Group__0
             {
-            pushFollow(FOLLOW_rule__IntLiteral__Group__0_in_ruleIntLiteral2810);
+            pushFollow(FOLLOW_2);
             rule__IntLiteral__Group__0();
 
             state._fsp--;
@@ -3682,20 +3682,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleStringLiteral"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1364:1: entryRuleStringLiteral : ruleStringLiteral EOF ;
+    // InternalFSM.g:1366:1: entryRuleStringLiteral : ruleStringLiteral EOF ;
     public final void entryRuleStringLiteral() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1365:1: ( ruleStringLiteral EOF )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1366:1: ruleStringLiteral EOF
+            // InternalFSM.g:1367:1: ( ruleStringLiteral EOF )
+            // InternalFSM.g:1368:1: ruleStringLiteral EOF
             {
              before(grammarAccess.getStringLiteralRule()); 
-            pushFollow(FOLLOW_ruleStringLiteral_in_entryRuleStringLiteral2837);
+            pushFollow(FOLLOW_1);
             ruleStringLiteral();
 
             state._fsp--;
 
              after(grammarAccess.getStringLiteralRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleStringLiteral2844); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3712,23 +3712,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleStringLiteral"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1373:1: ruleStringLiteral : ( ( rule__StringLiteral__Group__0 ) ) ;
+    // InternalFSM.g:1375:1: ruleStringLiteral : ( ( rule__StringLiteral__Group__0 ) ) ;
     public final void ruleStringLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1377:2: ( ( ( rule__StringLiteral__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1378:1: ( ( rule__StringLiteral__Group__0 ) )
+            // InternalFSM.g:1379:2: ( ( ( rule__StringLiteral__Group__0 ) ) )
+            // InternalFSM.g:1380:1: ( ( rule__StringLiteral__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1378:1: ( ( rule__StringLiteral__Group__0 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1379:1: ( rule__StringLiteral__Group__0 )
+            // InternalFSM.g:1380:1: ( ( rule__StringLiteral__Group__0 ) )
+            // InternalFSM.g:1381:1: ( rule__StringLiteral__Group__0 )
             {
              before(grammarAccess.getStringLiteralAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1380:1: ( rule__StringLiteral__Group__0 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1380:2: rule__StringLiteral__Group__0
+            // InternalFSM.g:1382:1: ( rule__StringLiteral__Group__0 )
+            // InternalFSM.g:1382:2: rule__StringLiteral__Group__0
             {
-            pushFollow(FOLLOW_rule__StringLiteral__Group__0_in_ruleStringLiteral2870);
+            pushFollow(FOLLOW_2);
             rule__StringLiteral__Group__0();
 
             state._fsp--;
@@ -3759,20 +3759,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleInteger"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1392:1: entryRuleInteger : ruleInteger EOF ;
+    // InternalFSM.g:1394:1: entryRuleInteger : ruleInteger EOF ;
     public final void entryRuleInteger() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1393:1: ( ruleInteger EOF )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1394:1: ruleInteger EOF
+            // InternalFSM.g:1395:1: ( ruleInteger EOF )
+            // InternalFSM.g:1396:1: ruleInteger EOF
             {
              before(grammarAccess.getIntegerRule()); 
-            pushFollow(FOLLOW_ruleInteger_in_entryRuleInteger2897);
+            pushFollow(FOLLOW_1);
             ruleInteger();
 
             state._fsp--;
 
              after(grammarAccess.getIntegerRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleInteger2904); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3789,23 +3789,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleInteger"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1401:1: ruleInteger : ( ( rule__Integer__Alternatives ) ) ;
+    // InternalFSM.g:1403:1: ruleInteger : ( ( rule__Integer__Alternatives ) ) ;
     public final void ruleInteger() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1405:2: ( ( ( rule__Integer__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1406:1: ( ( rule__Integer__Alternatives ) )
+            // InternalFSM.g:1407:2: ( ( ( rule__Integer__Alternatives ) ) )
+            // InternalFSM.g:1408:1: ( ( rule__Integer__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1406:1: ( ( rule__Integer__Alternatives ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1407:1: ( rule__Integer__Alternatives )
+            // InternalFSM.g:1408:1: ( ( rule__Integer__Alternatives ) )
+            // InternalFSM.g:1409:1: ( rule__Integer__Alternatives )
             {
              before(grammarAccess.getIntegerAccess().getAlternatives()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1408:1: ( rule__Integer__Alternatives )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1408:2: rule__Integer__Alternatives
+            // InternalFSM.g:1410:1: ( rule__Integer__Alternatives )
+            // InternalFSM.g:1410:2: rule__Integer__Alternatives
             {
-            pushFollow(FOLLOW_rule__Integer__Alternatives_in_ruleInteger2930);
+            pushFollow(FOLLOW_2);
             rule__Integer__Alternatives();
 
             state._fsp--;
@@ -3836,20 +3836,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleReal"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1420:1: entryRuleReal : ruleReal EOF ;
+    // InternalFSM.g:1422:1: entryRuleReal : ruleReal EOF ;
     public final void entryRuleReal() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1421:1: ( ruleReal EOF )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1422:1: ruleReal EOF
+            // InternalFSM.g:1423:1: ( ruleReal EOF )
+            // InternalFSM.g:1424:1: ruleReal EOF
             {
              before(grammarAccess.getRealRule()); 
-            pushFollow(FOLLOW_ruleReal_in_entryRuleReal2957);
+            pushFollow(FOLLOW_1);
             ruleReal();
 
             state._fsp--;
 
              after(grammarAccess.getRealRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleReal2964); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3866,23 +3866,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleReal"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1429:1: ruleReal : ( ( rule__Real__Alternatives ) ) ;
+    // InternalFSM.g:1431:1: ruleReal : ( ( rule__Real__Alternatives ) ) ;
     public final void ruleReal() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1433:2: ( ( ( rule__Real__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1434:1: ( ( rule__Real__Alternatives ) )
+            // InternalFSM.g:1435:2: ( ( ( rule__Real__Alternatives ) ) )
+            // InternalFSM.g:1436:1: ( ( rule__Real__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1434:1: ( ( rule__Real__Alternatives ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1435:1: ( rule__Real__Alternatives )
+            // InternalFSM.g:1436:1: ( ( rule__Real__Alternatives ) )
+            // InternalFSM.g:1437:1: ( rule__Real__Alternatives )
             {
              before(grammarAccess.getRealAccess().getAlternatives()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1436:1: ( rule__Real__Alternatives )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1436:2: rule__Real__Alternatives
+            // InternalFSM.g:1438:1: ( rule__Real__Alternatives )
+            // InternalFSM.g:1438:2: rule__Real__Alternatives
             {
-            pushFollow(FOLLOW_rule__Real__Alternatives_in_ruleReal2990);
+            pushFollow(FOLLOW_2);
             rule__Real__Alternatives();
 
             state._fsp--;
@@ -3913,23 +3913,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleDecimal"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1448:1: entryRuleDecimal : ruleDecimal EOF ;
+    // InternalFSM.g:1450:1: entryRuleDecimal : ruleDecimal EOF ;
     public final void entryRuleDecimal() throws RecognitionException {
 
         	HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
 
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1452:1: ( ruleDecimal EOF )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1453:1: ruleDecimal EOF
+            // InternalFSM.g:1454:1: ( ruleDecimal EOF )
+            // InternalFSM.g:1455:1: ruleDecimal EOF
             {
              before(grammarAccess.getDecimalRule()); 
-            pushFollow(FOLLOW_ruleDecimal_in_entryRuleDecimal3022);
+            pushFollow(FOLLOW_1);
             ruleDecimal();
 
             state._fsp--;
 
              after(grammarAccess.getDecimalRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDecimal3029); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3949,24 +3949,24 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleDecimal"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1463:1: ruleDecimal : ( ( rule__Decimal__Group__0 ) ) ;
+    // InternalFSM.g:1465:1: ruleDecimal : ( ( rule__Decimal__Group__0 ) ) ;
     public final void ruleDecimal() throws RecognitionException {
 
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1468:2: ( ( ( rule__Decimal__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1469:1: ( ( rule__Decimal__Group__0 ) )
+            // InternalFSM.g:1470:2: ( ( ( rule__Decimal__Group__0 ) ) )
+            // InternalFSM.g:1471:1: ( ( rule__Decimal__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1469:1: ( ( rule__Decimal__Group__0 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1470:1: ( rule__Decimal__Group__0 )
+            // InternalFSM.g:1471:1: ( ( rule__Decimal__Group__0 ) )
+            // InternalFSM.g:1472:1: ( rule__Decimal__Group__0 )
             {
              before(grammarAccess.getDecimalAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1471:1: ( rule__Decimal__Group__0 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1471:2: rule__Decimal__Group__0
+            // InternalFSM.g:1473:1: ( rule__Decimal__Group__0 )
+            // InternalFSM.g:1473:2: rule__Decimal__Group__0
             {
-            pushFollow(FOLLOW_rule__Decimal__Group__0_in_ruleDecimal3059);
+            pushFollow(FOLLOW_2);
             rule__Decimal__Group__0();
 
             state._fsp--;
@@ -3998,23 +3998,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleDecimalExp"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1484:1: entryRuleDecimalExp : ruleDecimalExp EOF ;
+    // InternalFSM.g:1486:1: entryRuleDecimalExp : ruleDecimalExp EOF ;
     public final void entryRuleDecimalExp() throws RecognitionException {
 
         	HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
 
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1488:1: ( ruleDecimalExp EOF )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1489:1: ruleDecimalExp EOF
+            // InternalFSM.g:1490:1: ( ruleDecimalExp EOF )
+            // InternalFSM.g:1491:1: ruleDecimalExp EOF
             {
              before(grammarAccess.getDecimalExpRule()); 
-            pushFollow(FOLLOW_ruleDecimalExp_in_entryRuleDecimalExp3091);
+            pushFollow(FOLLOW_1);
             ruleDecimalExp();
 
             state._fsp--;
 
              after(grammarAccess.getDecimalExpRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDecimalExp3098); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -4034,24 +4034,24 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleDecimalExp"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1499:1: ruleDecimalExp : ( ( rule__DecimalExp__Group__0 ) ) ;
+    // InternalFSM.g:1501:1: ruleDecimalExp : ( ( rule__DecimalExp__Group__0 ) ) ;
     public final void ruleDecimalExp() throws RecognitionException {
 
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1504:2: ( ( ( rule__DecimalExp__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1505:1: ( ( rule__DecimalExp__Group__0 ) )
+            // InternalFSM.g:1506:2: ( ( ( rule__DecimalExp__Group__0 ) ) )
+            // InternalFSM.g:1507:1: ( ( rule__DecimalExp__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1505:1: ( ( rule__DecimalExp__Group__0 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1506:1: ( rule__DecimalExp__Group__0 )
+            // InternalFSM.g:1507:1: ( ( rule__DecimalExp__Group__0 ) )
+            // InternalFSM.g:1508:1: ( rule__DecimalExp__Group__0 )
             {
              before(grammarAccess.getDecimalExpAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1507:1: ( rule__DecimalExp__Group__0 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1507:2: rule__DecimalExp__Group__0
+            // InternalFSM.g:1509:1: ( rule__DecimalExp__Group__0 )
+            // InternalFSM.g:1509:2: rule__DecimalExp__Group__0
             {
-            pushFollow(FOLLOW_rule__DecimalExp__Group__0_in_ruleDecimalExp3128);
+            pushFollow(FOLLOW_2);
             rule__DecimalExp__Group__0();
 
             state._fsp--;
@@ -4083,20 +4083,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleFQN"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1520:1: entryRuleFQN : ruleFQN EOF ;
+    // InternalFSM.g:1522:1: entryRuleFQN : ruleFQN EOF ;
     public final void entryRuleFQN() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1521:1: ( ruleFQN EOF )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1522:1: ruleFQN EOF
+            // InternalFSM.g:1523:1: ( ruleFQN EOF )
+            // InternalFSM.g:1524:1: ruleFQN EOF
             {
              before(grammarAccess.getFQNRule()); 
-            pushFollow(FOLLOW_ruleFQN_in_entryRuleFQN3155);
+            pushFollow(FOLLOW_1);
             ruleFQN();
 
             state._fsp--;
 
              after(grammarAccess.getFQNRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleFQN3162); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -4113,23 +4113,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleFQN"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1529:1: ruleFQN : ( ( rule__FQN__Group__0 ) ) ;
+    // InternalFSM.g:1531:1: ruleFQN : ( ( rule__FQN__Group__0 ) ) ;
     public final void ruleFQN() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1533:2: ( ( ( rule__FQN__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1534:1: ( ( rule__FQN__Group__0 ) )
+            // InternalFSM.g:1535:2: ( ( ( rule__FQN__Group__0 ) ) )
+            // InternalFSM.g:1536:1: ( ( rule__FQN__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1534:1: ( ( rule__FQN__Group__0 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1535:1: ( rule__FQN__Group__0 )
+            // InternalFSM.g:1536:1: ( ( rule__FQN__Group__0 ) )
+            // InternalFSM.g:1537:1: ( rule__FQN__Group__0 )
             {
              before(grammarAccess.getFQNAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1536:1: ( rule__FQN__Group__0 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1536:2: rule__FQN__Group__0
+            // InternalFSM.g:1538:1: ( rule__FQN__Group__0 )
+            // InternalFSM.g:1538:2: rule__FQN__Group__0
             {
-            pushFollow(FOLLOW_rule__FQN__Group__0_in_ruleFQN3188);
+            pushFollow(FOLLOW_2);
             rule__FQN__Group__0();
 
             state._fsp--;
@@ -4160,23 +4160,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleComponentCommunicationType"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1549:1: ruleComponentCommunicationType : ( ( rule__ComponentCommunicationType__Alternatives ) ) ;
+    // InternalFSM.g:1551:1: ruleComponentCommunicationType : ( ( rule__ComponentCommunicationType__Alternatives ) ) ;
     public final void ruleComponentCommunicationType() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1553:1: ( ( ( rule__ComponentCommunicationType__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1554:1: ( ( rule__ComponentCommunicationType__Alternatives ) )
+            // InternalFSM.g:1555:1: ( ( ( rule__ComponentCommunicationType__Alternatives ) ) )
+            // InternalFSM.g:1556:1: ( ( rule__ComponentCommunicationType__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1554:1: ( ( rule__ComponentCommunicationType__Alternatives ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1555:1: ( rule__ComponentCommunicationType__Alternatives )
+            // InternalFSM.g:1556:1: ( ( rule__ComponentCommunicationType__Alternatives ) )
+            // InternalFSM.g:1557:1: ( rule__ComponentCommunicationType__Alternatives )
             {
              before(grammarAccess.getComponentCommunicationTypeAccess().getAlternatives()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1556:1: ( rule__ComponentCommunicationType__Alternatives )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1556:2: rule__ComponentCommunicationType__Alternatives
+            // InternalFSM.g:1558:1: ( rule__ComponentCommunicationType__Alternatives )
+            // InternalFSM.g:1558:2: rule__ComponentCommunicationType__Alternatives
             {
-            pushFollow(FOLLOW_rule__ComponentCommunicationType__Alternatives_in_ruleComponentCommunicationType3225);
+            pushFollow(FOLLOW_2);
             rule__ComponentCommunicationType__Alternatives();
 
             state._fsp--;
@@ -4207,23 +4207,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleLiteralType"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1568:1: ruleLiteralType : ( ( rule__LiteralType__Alternatives ) ) ;
+    // InternalFSM.g:1570:1: ruleLiteralType : ( ( rule__LiteralType__Alternatives ) ) ;
     public final void ruleLiteralType() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1572:1: ( ( ( rule__LiteralType__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1573:1: ( ( rule__LiteralType__Alternatives ) )
+            // InternalFSM.g:1574:1: ( ( ( rule__LiteralType__Alternatives ) ) )
+            // InternalFSM.g:1575:1: ( ( rule__LiteralType__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1573:1: ( ( rule__LiteralType__Alternatives ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1574:1: ( rule__LiteralType__Alternatives )
+            // InternalFSM.g:1575:1: ( ( rule__LiteralType__Alternatives ) )
+            // InternalFSM.g:1576:1: ( rule__LiteralType__Alternatives )
             {
              before(grammarAccess.getLiteralTypeAccess().getAlternatives()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1575:1: ( rule__LiteralType__Alternatives )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1575:2: rule__LiteralType__Alternatives
+            // InternalFSM.g:1577:1: ( rule__LiteralType__Alternatives )
+            // InternalFSM.g:1577:2: rule__LiteralType__Alternatives
             {
-            pushFollow(FOLLOW_rule__LiteralType__Alternatives_in_ruleLiteralType3261);
+            pushFollow(FOLLOW_2);
             rule__LiteralType__Alternatives();
 
             state._fsp--;
@@ -4254,13 +4254,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateGraphNode__Alternatives"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1586:1: rule__StateGraphNode__Alternatives : ( ( ruleState ) | ( ruleChoicePoint ) | ( ruleTrPoint ) );
+    // InternalFSM.g:1588:1: rule__StateGraphNode__Alternatives : ( ( ruleState ) | ( ruleChoicePoint ) | ( ruleTrPoint ) );
     public final void rule__StateGraphNode__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1590:1: ( ( ruleState ) | ( ruleChoicePoint ) | ( ruleTrPoint ) )
+            // InternalFSM.g:1592:1: ( ( ruleState ) | ( ruleChoicePoint ) | ( ruleTrPoint ) )
             int alt2=3;
             switch ( input.LA(1) ) {
             case 31:
@@ -4291,13 +4291,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
             switch (alt2) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1591:1: ( ruleState )
+                    // InternalFSM.g:1593:1: ( ruleState )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1591:1: ( ruleState )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1592:1: ruleState
+                    // InternalFSM.g:1593:1: ( ruleState )
+                    // InternalFSM.g:1594:1: ruleState
                     {
                      before(grammarAccess.getStateGraphNodeAccess().getStateParserRuleCall_0()); 
-                    pushFollow(FOLLOW_ruleState_in_rule__StateGraphNode__Alternatives3296);
+                    pushFollow(FOLLOW_2);
                     ruleState();
 
                     state._fsp--;
@@ -4310,13 +4310,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1597:6: ( ruleChoicePoint )
+                    // InternalFSM.g:1599:6: ( ruleChoicePoint )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1597:6: ( ruleChoicePoint )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1598:1: ruleChoicePoint
+                    // InternalFSM.g:1599:6: ( ruleChoicePoint )
+                    // InternalFSM.g:1600:1: ruleChoicePoint
                     {
                      before(grammarAccess.getStateGraphNodeAccess().getChoicePointParserRuleCall_1()); 
-                    pushFollow(FOLLOW_ruleChoicePoint_in_rule__StateGraphNode__Alternatives3313);
+                    pushFollow(FOLLOW_2);
                     ruleChoicePoint();
 
                     state._fsp--;
@@ -4329,13 +4329,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1603:6: ( ruleTrPoint )
+                    // InternalFSM.g:1605:6: ( ruleTrPoint )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1603:6: ( ruleTrPoint )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1604:1: ruleTrPoint
+                    // InternalFSM.g:1605:6: ( ruleTrPoint )
+                    // InternalFSM.g:1606:1: ruleTrPoint
                     {
                      before(grammarAccess.getStateGraphNodeAccess().getTrPointParserRuleCall_2()); 
-                    pushFollow(FOLLOW_ruleTrPoint_in_rule__StateGraphNode__Alternatives3330);
+                    pushFollow(FOLLOW_2);
                     ruleTrPoint();
 
                     state._fsp--;
@@ -4365,13 +4365,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateGraph__Alternatives_2"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1615:1: rule__StateGraph__Alternatives_2 : ( ( ( rule__StateGraph__StatesAssignment_2_0 ) ) | ( ( rule__StateGraph__TrPointsAssignment_2_1 ) ) | ( ( rule__StateGraph__ChPointsAssignment_2_2 ) ) | ( ( rule__StateGraph__TransitionsAssignment_2_3 ) ) | ( ( rule__StateGraph__RefinedTransitionsAssignment_2_4 ) ) );
+    // InternalFSM.g:1617:1: rule__StateGraph__Alternatives_2 : ( ( ( rule__StateGraph__StatesAssignment_2_0 ) ) | ( ( rule__StateGraph__TrPointsAssignment_2_1 ) ) | ( ( rule__StateGraph__ChPointsAssignment_2_2 ) ) | ( ( rule__StateGraph__TransitionsAssignment_2_3 ) ) | ( ( rule__StateGraph__RefinedTransitionsAssignment_2_4 ) ) );
     public final void rule__StateGraph__Alternatives_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1619:1: ( ( ( rule__StateGraph__StatesAssignment_2_0 ) ) | ( ( rule__StateGraph__TrPointsAssignment_2_1 ) ) | ( ( rule__StateGraph__ChPointsAssignment_2_2 ) ) | ( ( rule__StateGraph__TransitionsAssignment_2_3 ) ) | ( ( rule__StateGraph__RefinedTransitionsAssignment_2_4 ) ) )
+            // InternalFSM.g:1621:1: ( ( ( rule__StateGraph__StatesAssignment_2_0 ) ) | ( ( rule__StateGraph__TrPointsAssignment_2_1 ) ) | ( ( rule__StateGraph__ChPointsAssignment_2_2 ) ) | ( ( rule__StateGraph__TransitionsAssignment_2_3 ) ) | ( ( rule__StateGraph__RefinedTransitionsAssignment_2_4 ) ) )
             int alt3=5;
             switch ( input.LA(1) ) {
             case 31:
@@ -4412,16 +4412,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
             switch (alt3) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1620:1: ( ( rule__StateGraph__StatesAssignment_2_0 ) )
+                    // InternalFSM.g:1622:1: ( ( rule__StateGraph__StatesAssignment_2_0 ) )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1620:1: ( ( rule__StateGraph__StatesAssignment_2_0 ) )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1621:1: ( rule__StateGraph__StatesAssignment_2_0 )
+                    // InternalFSM.g:1622:1: ( ( rule__StateGraph__StatesAssignment_2_0 ) )
+                    // InternalFSM.g:1623:1: ( rule__StateGraph__StatesAssignment_2_0 )
                     {
                      before(grammarAccess.getStateGraphAccess().getStatesAssignment_2_0()); 
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1622:1: ( rule__StateGraph__StatesAssignment_2_0 )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1622:2: rule__StateGraph__StatesAssignment_2_0
+                    // InternalFSM.g:1624:1: ( rule__StateGraph__StatesAssignment_2_0 )
+                    // InternalFSM.g:1624:2: rule__StateGraph__StatesAssignment_2_0
                     {
-                    pushFollow(FOLLOW_rule__StateGraph__StatesAssignment_2_0_in_rule__StateGraph__Alternatives_23363);
+                    pushFollow(FOLLOW_2);
                     rule__StateGraph__StatesAssignment_2_0();
 
                     state._fsp--;
@@ -4437,16 +4437,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1626:6: ( ( rule__StateGraph__TrPointsAssignment_2_1 ) )
+                    // InternalFSM.g:1628:6: ( ( rule__StateGraph__TrPointsAssignment_2_1 ) )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1626:6: ( ( rule__StateGraph__TrPointsAssignment_2_1 ) )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1627:1: ( rule__StateGraph__TrPointsAssignment_2_1 )
+                    // InternalFSM.g:1628:6: ( ( rule__StateGraph__TrPointsAssignment_2_1 ) )
+                    // InternalFSM.g:1629:1: ( rule__StateGraph__TrPointsAssignment_2_1 )
                     {
                      before(grammarAccess.getStateGraphAccess().getTrPointsAssignment_2_1()); 
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1628:1: ( rule__StateGraph__TrPointsAssignment_2_1 )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1628:2: rule__StateGraph__TrPointsAssignment_2_1
+                    // InternalFSM.g:1630:1: ( rule__StateGraph__TrPointsAssignment_2_1 )
+                    // InternalFSM.g:1630:2: rule__StateGraph__TrPointsAssignment_2_1
                     {
-                    pushFollow(FOLLOW_rule__StateGraph__TrPointsAssignment_2_1_in_rule__StateGraph__Alternatives_23381);
+                    pushFollow(FOLLOW_2);
                     rule__StateGraph__TrPointsAssignment_2_1();
 
                     state._fsp--;
@@ -4462,16 +4462,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1632:6: ( ( rule__StateGraph__ChPointsAssignment_2_2 ) )
+                    // InternalFSM.g:1634:6: ( ( rule__StateGraph__ChPointsAssignment_2_2 ) )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1632:6: ( ( rule__StateGraph__ChPointsAssignment_2_2 ) )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1633:1: ( rule__StateGraph__ChPointsAssignment_2_2 )
+                    // InternalFSM.g:1634:6: ( ( rule__StateGraph__ChPointsAssignment_2_2 ) )
+                    // InternalFSM.g:1635:1: ( rule__StateGraph__ChPointsAssignment_2_2 )
                     {
                      before(grammarAccess.getStateGraphAccess().getChPointsAssignment_2_2()); 
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1634:1: ( rule__StateGraph__ChPointsAssignment_2_2 )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1634:2: rule__StateGraph__ChPointsAssignment_2_2
+                    // InternalFSM.g:1636:1: ( rule__StateGraph__ChPointsAssignment_2_2 )
+                    // InternalFSM.g:1636:2: rule__StateGraph__ChPointsAssignment_2_2
                     {
-                    pushFollow(FOLLOW_rule__StateGraph__ChPointsAssignment_2_2_in_rule__StateGraph__Alternatives_23399);
+                    pushFollow(FOLLOW_2);
                     rule__StateGraph__ChPointsAssignment_2_2();
 
                     state._fsp--;
@@ -4487,16 +4487,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 4 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1638:6: ( ( rule__StateGraph__TransitionsAssignment_2_3 ) )
+                    // InternalFSM.g:1640:6: ( ( rule__StateGraph__TransitionsAssignment_2_3 ) )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1638:6: ( ( rule__StateGraph__TransitionsAssignment_2_3 ) )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1639:1: ( rule__StateGraph__TransitionsAssignment_2_3 )
+                    // InternalFSM.g:1640:6: ( ( rule__StateGraph__TransitionsAssignment_2_3 ) )
+                    // InternalFSM.g:1641:1: ( rule__StateGraph__TransitionsAssignment_2_3 )
                     {
                      before(grammarAccess.getStateGraphAccess().getTransitionsAssignment_2_3()); 
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1640:1: ( rule__StateGraph__TransitionsAssignment_2_3 )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1640:2: rule__StateGraph__TransitionsAssignment_2_3
+                    // InternalFSM.g:1642:1: ( rule__StateGraph__TransitionsAssignment_2_3 )
+                    // InternalFSM.g:1642:2: rule__StateGraph__TransitionsAssignment_2_3
                     {
-                    pushFollow(FOLLOW_rule__StateGraph__TransitionsAssignment_2_3_in_rule__StateGraph__Alternatives_23417);
+                    pushFollow(FOLLOW_2);
                     rule__StateGraph__TransitionsAssignment_2_3();
 
                     state._fsp--;
@@ -4512,16 +4512,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 5 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1644:6: ( ( rule__StateGraph__RefinedTransitionsAssignment_2_4 ) )
+                    // InternalFSM.g:1646:6: ( ( rule__StateGraph__RefinedTransitionsAssignment_2_4 ) )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1644:6: ( ( rule__StateGraph__RefinedTransitionsAssignment_2_4 ) )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1645:1: ( rule__StateGraph__RefinedTransitionsAssignment_2_4 )
+                    // InternalFSM.g:1646:6: ( ( rule__StateGraph__RefinedTransitionsAssignment_2_4 ) )
+                    // InternalFSM.g:1647:1: ( rule__StateGraph__RefinedTransitionsAssignment_2_4 )
                     {
                      before(grammarAccess.getStateGraphAccess().getRefinedTransitionsAssignment_2_4()); 
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1646:1: ( rule__StateGraph__RefinedTransitionsAssignment_2_4 )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1646:2: rule__StateGraph__RefinedTransitionsAssignment_2_4
+                    // InternalFSM.g:1648:1: ( rule__StateGraph__RefinedTransitionsAssignment_2_4 )
+                    // InternalFSM.g:1648:2: rule__StateGraph__RefinedTransitionsAssignment_2_4
                     {
-                    pushFollow(FOLLOW_rule__StateGraph__RefinedTransitionsAssignment_2_4_in_rule__StateGraph__Alternatives_23435);
+                    pushFollow(FOLLOW_2);
                     rule__StateGraph__RefinedTransitionsAssignment_2_4();
 
                     state._fsp--;
@@ -4554,13 +4554,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateMachine__Alternatives_3"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1655:1: rule__StateMachine__Alternatives_3 : ( ( ( rule__StateMachine__StatesAssignment_3_0 ) ) | ( ( rule__StateMachine__TrPointsAssignment_3_1 ) ) | ( ( rule__StateMachine__ChPointsAssignment_3_2 ) ) | ( ( rule__StateMachine__TransitionsAssignment_3_3 ) ) | ( ( rule__StateMachine__RefinedTransitionsAssignment_3_4 ) ) );
+    // InternalFSM.g:1657:1: rule__StateMachine__Alternatives_3 : ( ( ( rule__StateMachine__StatesAssignment_3_0 ) ) | ( ( rule__StateMachine__TrPointsAssignment_3_1 ) ) | ( ( rule__StateMachine__ChPointsAssignment_3_2 ) ) | ( ( rule__StateMachine__TransitionsAssignment_3_3 ) ) | ( ( rule__StateMachine__RefinedTransitionsAssignment_3_4 ) ) );
     public final void rule__StateMachine__Alternatives_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1659:1: ( ( ( rule__StateMachine__StatesAssignment_3_0 ) ) | ( ( rule__StateMachine__TrPointsAssignment_3_1 ) ) | ( ( rule__StateMachine__ChPointsAssignment_3_2 ) ) | ( ( rule__StateMachine__TransitionsAssignment_3_3 ) ) | ( ( rule__StateMachine__RefinedTransitionsAssignment_3_4 ) ) )
+            // InternalFSM.g:1661:1: ( ( ( rule__StateMachine__StatesAssignment_3_0 ) ) | ( ( rule__StateMachine__TrPointsAssignment_3_1 ) ) | ( ( rule__StateMachine__ChPointsAssignment_3_2 ) ) | ( ( rule__StateMachine__TransitionsAssignment_3_3 ) ) | ( ( rule__StateMachine__RefinedTransitionsAssignment_3_4 ) ) )
             int alt4=5;
             switch ( input.LA(1) ) {
             case 31:
@@ -4601,16 +4601,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
             switch (alt4) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1660:1: ( ( rule__StateMachine__StatesAssignment_3_0 ) )
+                    // InternalFSM.g:1662:1: ( ( rule__StateMachine__StatesAssignment_3_0 ) )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1660:1: ( ( rule__StateMachine__StatesAssignment_3_0 ) )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1661:1: ( rule__StateMachine__StatesAssignment_3_0 )
+                    // InternalFSM.g:1662:1: ( ( rule__StateMachine__StatesAssignment_3_0 ) )
+                    // InternalFSM.g:1663:1: ( rule__StateMachine__StatesAssignment_3_0 )
                     {
                      before(grammarAccess.getStateMachineAccess().getStatesAssignment_3_0()); 
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1662:1: ( rule__StateMachine__StatesAssignment_3_0 )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1662:2: rule__StateMachine__StatesAssignment_3_0
+                    // InternalFSM.g:1664:1: ( rule__StateMachine__StatesAssignment_3_0 )
+                    // InternalFSM.g:1664:2: rule__StateMachine__StatesAssignment_3_0
                     {
-                    pushFollow(FOLLOW_rule__StateMachine__StatesAssignment_3_0_in_rule__StateMachine__Alternatives_33468);
+                    pushFollow(FOLLOW_2);
                     rule__StateMachine__StatesAssignment_3_0();
 
                     state._fsp--;
@@ -4626,16 +4626,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1666:6: ( ( rule__StateMachine__TrPointsAssignment_3_1 ) )
+                    // InternalFSM.g:1668:6: ( ( rule__StateMachine__TrPointsAssignment_3_1 ) )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1666:6: ( ( rule__StateMachine__TrPointsAssignment_3_1 ) )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1667:1: ( rule__StateMachine__TrPointsAssignment_3_1 )
+                    // InternalFSM.g:1668:6: ( ( rule__StateMachine__TrPointsAssignment_3_1 ) )
+                    // InternalFSM.g:1669:1: ( rule__StateMachine__TrPointsAssignment_3_1 )
                     {
                      before(grammarAccess.getStateMachineAccess().getTrPointsAssignment_3_1()); 
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1668:1: ( rule__StateMachine__TrPointsAssignment_3_1 )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1668:2: rule__StateMachine__TrPointsAssignment_3_1
+                    // InternalFSM.g:1670:1: ( rule__StateMachine__TrPointsAssignment_3_1 )
+                    // InternalFSM.g:1670:2: rule__StateMachine__TrPointsAssignment_3_1
                     {
-                    pushFollow(FOLLOW_rule__StateMachine__TrPointsAssignment_3_1_in_rule__StateMachine__Alternatives_33486);
+                    pushFollow(FOLLOW_2);
                     rule__StateMachine__TrPointsAssignment_3_1();
 
                     state._fsp--;
@@ -4651,16 +4651,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1672:6: ( ( rule__StateMachine__ChPointsAssignment_3_2 ) )
+                    // InternalFSM.g:1674:6: ( ( rule__StateMachine__ChPointsAssignment_3_2 ) )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1672:6: ( ( rule__StateMachine__ChPointsAssignment_3_2 ) )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1673:1: ( rule__StateMachine__ChPointsAssignment_3_2 )
+                    // InternalFSM.g:1674:6: ( ( rule__StateMachine__ChPointsAssignment_3_2 ) )
+                    // InternalFSM.g:1675:1: ( rule__StateMachine__ChPointsAssignment_3_2 )
                     {
                      before(grammarAccess.getStateMachineAccess().getChPointsAssignment_3_2()); 
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1674:1: ( rule__StateMachine__ChPointsAssignment_3_2 )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1674:2: rule__StateMachine__ChPointsAssignment_3_2
+                    // InternalFSM.g:1676:1: ( rule__StateMachine__ChPointsAssignment_3_2 )
+                    // InternalFSM.g:1676:2: rule__StateMachine__ChPointsAssignment_3_2
                     {
-                    pushFollow(FOLLOW_rule__StateMachine__ChPointsAssignment_3_2_in_rule__StateMachine__Alternatives_33504);
+                    pushFollow(FOLLOW_2);
                     rule__StateMachine__ChPointsAssignment_3_2();
 
                     state._fsp--;
@@ -4676,16 +4676,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 4 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1678:6: ( ( rule__StateMachine__TransitionsAssignment_3_3 ) )
+                    // InternalFSM.g:1680:6: ( ( rule__StateMachine__TransitionsAssignment_3_3 ) )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1678:6: ( ( rule__StateMachine__TransitionsAssignment_3_3 ) )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1679:1: ( rule__StateMachine__TransitionsAssignment_3_3 )
+                    // InternalFSM.g:1680:6: ( ( rule__StateMachine__TransitionsAssignment_3_3 ) )
+                    // InternalFSM.g:1681:1: ( rule__StateMachine__TransitionsAssignment_3_3 )
                     {
                      before(grammarAccess.getStateMachineAccess().getTransitionsAssignment_3_3()); 
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1680:1: ( rule__StateMachine__TransitionsAssignment_3_3 )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1680:2: rule__StateMachine__TransitionsAssignment_3_3
+                    // InternalFSM.g:1682:1: ( rule__StateMachine__TransitionsAssignment_3_3 )
+                    // InternalFSM.g:1682:2: rule__StateMachine__TransitionsAssignment_3_3
                     {
-                    pushFollow(FOLLOW_rule__StateMachine__TransitionsAssignment_3_3_in_rule__StateMachine__Alternatives_33522);
+                    pushFollow(FOLLOW_2);
                     rule__StateMachine__TransitionsAssignment_3_3();
 
                     state._fsp--;
@@ -4701,16 +4701,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 5 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1684:6: ( ( rule__StateMachine__RefinedTransitionsAssignment_3_4 ) )
+                    // InternalFSM.g:1686:6: ( ( rule__StateMachine__RefinedTransitionsAssignment_3_4 ) )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1684:6: ( ( rule__StateMachine__RefinedTransitionsAssignment_3_4 ) )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1685:1: ( rule__StateMachine__RefinedTransitionsAssignment_3_4 )
+                    // InternalFSM.g:1686:6: ( ( rule__StateMachine__RefinedTransitionsAssignment_3_4 ) )
+                    // InternalFSM.g:1687:1: ( rule__StateMachine__RefinedTransitionsAssignment_3_4 )
                     {
                      before(grammarAccess.getStateMachineAccess().getRefinedTransitionsAssignment_3_4()); 
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1686:1: ( rule__StateMachine__RefinedTransitionsAssignment_3_4 )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1686:2: rule__StateMachine__RefinedTransitionsAssignment_3_4
+                    // InternalFSM.g:1688:1: ( rule__StateMachine__RefinedTransitionsAssignment_3_4 )
+                    // InternalFSM.g:1688:2: rule__StateMachine__RefinedTransitionsAssignment_3_4
                     {
-                    pushFollow(FOLLOW_rule__StateMachine__RefinedTransitionsAssignment_3_4_in_rule__StateMachine__Alternatives_33540);
+                    pushFollow(FOLLOW_2);
                     rule__StateMachine__RefinedTransitionsAssignment_3_4();
 
                     state._fsp--;
@@ -4743,13 +4743,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__State__Alternatives"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1695:1: rule__State__Alternatives : ( ( ruleSimpleState ) | ( ruleRefinedState ) );
+    // InternalFSM.g:1697:1: rule__State__Alternatives : ( ( ruleSimpleState ) | ( ruleRefinedState ) );
     public final void rule__State__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1699:1: ( ( ruleSimpleState ) | ( ruleRefinedState ) )
+            // InternalFSM.g:1701:1: ( ( ruleSimpleState ) | ( ruleRefinedState ) )
             int alt5=2;
             int LA5_0 = input.LA(1);
 
@@ -4767,13 +4767,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt5) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1700:1: ( ruleSimpleState )
+                    // InternalFSM.g:1702:1: ( ruleSimpleState )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1700:1: ( ruleSimpleState )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1701:1: ruleSimpleState
+                    // InternalFSM.g:1702:1: ( ruleSimpleState )
+                    // InternalFSM.g:1703:1: ruleSimpleState
                     {
                      before(grammarAccess.getStateAccess().getSimpleStateParserRuleCall_0()); 
-                    pushFollow(FOLLOW_ruleSimpleState_in_rule__State__Alternatives3573);
+                    pushFollow(FOLLOW_2);
                     ruleSimpleState();
 
                     state._fsp--;
@@ -4786,13 +4786,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1706:6: ( ruleRefinedState )
+                    // InternalFSM.g:1708:6: ( ruleRefinedState )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1706:6: ( ruleRefinedState )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1707:1: ruleRefinedState
+                    // InternalFSM.g:1708:6: ( ruleRefinedState )
+                    // InternalFSM.g:1709:1: ruleRefinedState
                     {
                      before(grammarAccess.getStateAccess().getRefinedStateParserRuleCall_1()); 
-                    pushFollow(FOLLOW_ruleRefinedState_in_rule__State__Alternatives3590);
+                    pushFollow(FOLLOW_2);
                     ruleRefinedState();
 
                     state._fsp--;
@@ -4822,13 +4822,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TrPoint__Alternatives"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1717:1: rule__TrPoint__Alternatives : ( ( ruleTransitionPoint ) | ( ruleEntryPoint ) | ( ruleExitPoint ) );
+    // InternalFSM.g:1719:1: rule__TrPoint__Alternatives : ( ( ruleTransitionPoint ) | ( ruleEntryPoint ) | ( ruleExitPoint ) );
     public final void rule__TrPoint__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1721:1: ( ( ruleTransitionPoint ) | ( ruleEntryPoint ) | ( ruleExitPoint ) )
+            // InternalFSM.g:1723:1: ( ( ruleTransitionPoint ) | ( ruleEntryPoint ) | ( ruleExitPoint ) )
             int alt6=3;
             switch ( input.LA(1) ) {
             case 37:
@@ -4856,13 +4856,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
             switch (alt6) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1722:1: ( ruleTransitionPoint )
+                    // InternalFSM.g:1724:1: ( ruleTransitionPoint )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1722:1: ( ruleTransitionPoint )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1723:1: ruleTransitionPoint
+                    // InternalFSM.g:1724:1: ( ruleTransitionPoint )
+                    // InternalFSM.g:1725:1: ruleTransitionPoint
                     {
                      before(grammarAccess.getTrPointAccess().getTransitionPointParserRuleCall_0()); 
-                    pushFollow(FOLLOW_ruleTransitionPoint_in_rule__TrPoint__Alternatives3622);
+                    pushFollow(FOLLOW_2);
                     ruleTransitionPoint();
 
                     state._fsp--;
@@ -4875,13 +4875,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1728:6: ( ruleEntryPoint )
+                    // InternalFSM.g:1730:6: ( ruleEntryPoint )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1728:6: ( ruleEntryPoint )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1729:1: ruleEntryPoint
+                    // InternalFSM.g:1730:6: ( ruleEntryPoint )
+                    // InternalFSM.g:1731:1: ruleEntryPoint
                     {
                      before(grammarAccess.getTrPointAccess().getEntryPointParserRuleCall_1()); 
-                    pushFollow(FOLLOW_ruleEntryPoint_in_rule__TrPoint__Alternatives3639);
+                    pushFollow(FOLLOW_2);
                     ruleEntryPoint();
 
                     state._fsp--;
@@ -4894,13 +4894,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1734:6: ( ruleExitPoint )
+                    // InternalFSM.g:1736:6: ( ruleExitPoint )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1734:6: ( ruleExitPoint )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1735:1: ruleExitPoint
+                    // InternalFSM.g:1736:6: ( ruleExitPoint )
+                    // InternalFSM.g:1737:1: ruleExitPoint
                     {
                      before(grammarAccess.getTrPointAccess().getExitPointParserRuleCall_2()); 
-                    pushFollow(FOLLOW_ruleExitPoint_in_rule__TrPoint__Alternatives3656);
+                    pushFollow(FOLLOW_2);
                     ruleExitPoint();
 
                     state._fsp--;
@@ -4930,13 +4930,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Transition__Alternatives"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1745:1: rule__Transition__Alternatives : ( ( ruleInitialTransition ) | ( ruleNonInitialTransition ) );
+    // InternalFSM.g:1748:1: rule__Transition__Alternatives : ( ( ruleInitialTransition ) | ( ruleNonInitialTransition ) );
     public final void rule__Transition__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1749:1: ( ( ruleInitialTransition ) | ( ruleNonInitialTransition ) )
+            // InternalFSM.g:1752:1: ( ( ruleInitialTransition ) | ( ruleNonInitialTransition ) )
             int alt7=2;
             int LA7_0 = input.LA(1);
 
@@ -5000,13 +5000,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt7) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1750:1: ( ruleInitialTransition )
+                    // InternalFSM.g:1753:1: ( ruleInitialTransition )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1750:1: ( ruleInitialTransition )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1751:1: ruleInitialTransition
+                    // InternalFSM.g:1753:1: ( ruleInitialTransition )
+                    // InternalFSM.g:1754:1: ruleInitialTransition
                     {
                      before(grammarAccess.getTransitionAccess().getInitialTransitionParserRuleCall_0()); 
-                    pushFollow(FOLLOW_ruleInitialTransition_in_rule__Transition__Alternatives3688);
+                    pushFollow(FOLLOW_2);
                     ruleInitialTransition();
 
                     state._fsp--;
@@ -5019,13 +5019,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1756:6: ( ruleNonInitialTransition )
+                    // InternalFSM.g:1759:6: ( ruleNonInitialTransition )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1756:6: ( ruleNonInitialTransition )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1757:1: ruleNonInitialTransition
+                    // InternalFSM.g:1759:6: ( ruleNonInitialTransition )
+                    // InternalFSM.g:1760:1: ruleNonInitialTransition
                     {
                      before(grammarAccess.getTransitionAccess().getNonInitialTransitionParserRuleCall_1()); 
-                    pushFollow(FOLLOW_ruleNonInitialTransition_in_rule__Transition__Alternatives3705);
+                    pushFollow(FOLLOW_2);
                     ruleNonInitialTransition();
 
                     state._fsp--;
@@ -5055,24 +5055,24 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NonInitialTransition__Alternatives"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1767:1: rule__NonInitialTransition__Alternatives : ( ( ruleTransitionChainStartTransition ) | ( ruleContinuationTransition ) | ( ruleCPBranchTransition ) );
+    // InternalFSM.g:1770:1: rule__NonInitialTransition__Alternatives : ( ( ruleTransitionChainStartTransition ) | ( ruleContinuationTransition ) | ( ruleCPBranchTransition ) );
     public final void rule__NonInitialTransition__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1771:1: ( ( ruleTransitionChainStartTransition ) | ( ruleContinuationTransition ) | ( ruleCPBranchTransition ) )
+            // InternalFSM.g:1774:1: ( ( ruleTransitionChainStartTransition ) | ( ruleContinuationTransition ) | ( ruleCPBranchTransition ) )
             int alt8=3;
             alt8 = dfa8.predict(input);
             switch (alt8) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1772:1: ( ruleTransitionChainStartTransition )
+                    // InternalFSM.g:1775:1: ( ruleTransitionChainStartTransition )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1772:1: ( ruleTransitionChainStartTransition )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1773:1: ruleTransitionChainStartTransition
+                    // InternalFSM.g:1775:1: ( ruleTransitionChainStartTransition )
+                    // InternalFSM.g:1776:1: ruleTransitionChainStartTransition
                     {
                      before(grammarAccess.getNonInitialTransitionAccess().getTransitionChainStartTransitionParserRuleCall_0()); 
-                    pushFollow(FOLLOW_ruleTransitionChainStartTransition_in_rule__NonInitialTransition__Alternatives3737);
+                    pushFollow(FOLLOW_2);
                     ruleTransitionChainStartTransition();
 
                     state._fsp--;
@@ -5085,13 +5085,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1778:6: ( ruleContinuationTransition )
+                    // InternalFSM.g:1781:6: ( ruleContinuationTransition )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1778:6: ( ruleContinuationTransition )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1779:1: ruleContinuationTransition
+                    // InternalFSM.g:1781:6: ( ruleContinuationTransition )
+                    // InternalFSM.g:1782:1: ruleContinuationTransition
                     {
                      before(grammarAccess.getNonInitialTransitionAccess().getContinuationTransitionParserRuleCall_1()); 
-                    pushFollow(FOLLOW_ruleContinuationTransition_in_rule__NonInitialTransition__Alternatives3754);
+                    pushFollow(FOLLOW_2);
                     ruleContinuationTransition();
 
                     state._fsp--;
@@ -5104,13 +5104,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1784:6: ( ruleCPBranchTransition )
+                    // InternalFSM.g:1787:6: ( ruleCPBranchTransition )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1784:6: ( ruleCPBranchTransition )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1785:1: ruleCPBranchTransition
+                    // InternalFSM.g:1787:6: ( ruleCPBranchTransition )
+                    // InternalFSM.g:1788:1: ruleCPBranchTransition
                     {
                      before(grammarAccess.getNonInitialTransitionAccess().getCPBranchTransitionParserRuleCall_2()); 
-                    pushFollow(FOLLOW_ruleCPBranchTransition_in_rule__NonInitialTransition__Alternatives3771);
+                    pushFollow(FOLLOW_2);
                     ruleCPBranchTransition();
 
                     state._fsp--;
@@ -5140,24 +5140,24 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TransitionChainStartTransition__Alternatives"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1795:1: rule__TransitionChainStartTransition__Alternatives : ( ( ruleTriggeredTransition ) | ( ruleGuardedTransition ) );
+    // InternalFSM.g:1798:1: rule__TransitionChainStartTransition__Alternatives : ( ( ruleTriggeredTransition ) | ( ruleGuardedTransition ) );
     public final void rule__TransitionChainStartTransition__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1799:1: ( ( ruleTriggeredTransition ) | ( ruleGuardedTransition ) )
+            // InternalFSM.g:1802:1: ( ( ruleTriggeredTransition ) | ( ruleGuardedTransition ) )
             int alt9=2;
             alt9 = dfa9.predict(input);
             switch (alt9) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1800:1: ( ruleTriggeredTransition )
+                    // InternalFSM.g:1803:1: ( ruleTriggeredTransition )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1800:1: ( ruleTriggeredTransition )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1801:1: ruleTriggeredTransition
+                    // InternalFSM.g:1803:1: ( ruleTriggeredTransition )
+                    // InternalFSM.g:1804:1: ruleTriggeredTransition
                     {
                      before(grammarAccess.getTransitionChainStartTransitionAccess().getTriggeredTransitionParserRuleCall_0()); 
-                    pushFollow(FOLLOW_ruleTriggeredTransition_in_rule__TransitionChainStartTransition__Alternatives3803);
+                    pushFollow(FOLLOW_2);
                     ruleTriggeredTransition();
 
                     state._fsp--;
@@ -5170,13 +5170,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1806:6: ( ruleGuardedTransition )
+                    // InternalFSM.g:1809:6: ( ruleGuardedTransition )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1806:6: ( ruleGuardedTransition )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1807:1: ruleGuardedTransition
+                    // InternalFSM.g:1809:6: ( ruleGuardedTransition )
+                    // InternalFSM.g:1810:1: ruleGuardedTransition
                     {
                      before(grammarAccess.getTransitionChainStartTransitionAccess().getGuardedTransitionParserRuleCall_1()); 
-                    pushFollow(FOLLOW_ruleGuardedTransition_in_rule__TransitionChainStartTransition__Alternatives3820);
+                    pushFollow(FOLLOW_2);
                     ruleGuardedTransition();
 
                     state._fsp--;
@@ -5206,13 +5206,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TransitionTerminal__Alternatives"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1817:1: rule__TransitionTerminal__Alternatives : ( ( ruleStateTerminal ) | ( ruleTrPointTerminal ) | ( ruleSubStateTrPointTerminal ) | ( ruleChoicepointTerminal ) );
+    // InternalFSM.g:1820:1: rule__TransitionTerminal__Alternatives : ( ( ruleStateTerminal ) | ( ruleTrPointTerminal ) | ( ruleSubStateTrPointTerminal ) | ( ruleChoicepointTerminal ) );
     public final void rule__TransitionTerminal__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1821:1: ( ( ruleStateTerminal ) | ( ruleTrPointTerminal ) | ( ruleSubStateTrPointTerminal ) | ( ruleChoicepointTerminal ) )
+            // InternalFSM.g:1824:1: ( ( ruleStateTerminal ) | ( ruleTrPointTerminal ) | ( ruleSubStateTrPointTerminal ) | ( ruleChoicepointTerminal ) )
             int alt10=4;
             switch ( input.LA(1) ) {
             case RULE_ID:
@@ -5252,13 +5252,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
             switch (alt10) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1822:1: ( ruleStateTerminal )
+                    // InternalFSM.g:1825:1: ( ruleStateTerminal )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1822:1: ( ruleStateTerminal )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1823:1: ruleStateTerminal
+                    // InternalFSM.g:1825:1: ( ruleStateTerminal )
+                    // InternalFSM.g:1826:1: ruleStateTerminal
                     {
                      before(grammarAccess.getTransitionTerminalAccess().getStateTerminalParserRuleCall_0()); 
-                    pushFollow(FOLLOW_ruleStateTerminal_in_rule__TransitionTerminal__Alternatives3852);
+                    pushFollow(FOLLOW_2);
                     ruleStateTerminal();
 
                     state._fsp--;
@@ -5271,13 +5271,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1828:6: ( ruleTrPointTerminal )
+                    // InternalFSM.g:1831:6: ( ruleTrPointTerminal )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1828:6: ( ruleTrPointTerminal )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1829:1: ruleTrPointTerminal
+                    // InternalFSM.g:1831:6: ( ruleTrPointTerminal )
+                    // InternalFSM.g:1832:1: ruleTrPointTerminal
                     {
                      before(grammarAccess.getTransitionTerminalAccess().getTrPointTerminalParserRuleCall_1()); 
-                    pushFollow(FOLLOW_ruleTrPointTerminal_in_rule__TransitionTerminal__Alternatives3869);
+                    pushFollow(FOLLOW_2);
                     ruleTrPointTerminal();
 
                     state._fsp--;
@@ -5290,13 +5290,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1834:6: ( ruleSubStateTrPointTerminal )
+                    // InternalFSM.g:1837:6: ( ruleSubStateTrPointTerminal )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1834:6: ( ruleSubStateTrPointTerminal )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1835:1: ruleSubStateTrPointTerminal
+                    // InternalFSM.g:1837:6: ( ruleSubStateTrPointTerminal )
+                    // InternalFSM.g:1838:1: ruleSubStateTrPointTerminal
                     {
                      before(grammarAccess.getTransitionTerminalAccess().getSubStateTrPointTerminalParserRuleCall_2()); 
-                    pushFollow(FOLLOW_ruleSubStateTrPointTerminal_in_rule__TransitionTerminal__Alternatives3886);
+                    pushFollow(FOLLOW_2);
                     ruleSubStateTrPointTerminal();
 
                     state._fsp--;
@@ -5309,13 +5309,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 4 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1840:6: ( ruleChoicepointTerminal )
+                    // InternalFSM.g:1843:6: ( ruleChoicepointTerminal )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1840:6: ( ruleChoicepointTerminal )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1841:1: ruleChoicepointTerminal
+                    // InternalFSM.g:1843:6: ( ruleChoicepointTerminal )
+                    // InternalFSM.g:1844:1: ruleChoicepointTerminal
                     {
                      before(grammarAccess.getTransitionTerminalAccess().getChoicepointTerminalParserRuleCall_3()); 
-                    pushFollow(FOLLOW_ruleChoicepointTerminal_in_rule__TransitionTerminal__Alternatives3903);
+                    pushFollow(FOLLOW_2);
                     ruleChoicepointTerminal();
 
                     state._fsp--;
@@ -5345,13 +5345,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SemanticsRule__Alternatives"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1851:1: rule__SemanticsRule__Alternatives : ( ( ruleInSemanticsRule ) | ( ruleOutSemanticsRule ) );
+    // InternalFSM.g:1854:1: rule__SemanticsRule__Alternatives : ( ( ruleInSemanticsRule ) | ( ruleOutSemanticsRule ) );
     public final void rule__SemanticsRule__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1855:1: ( ( ruleInSemanticsRule ) | ( ruleOutSemanticsRule ) )
+            // InternalFSM.g:1858:1: ( ( ruleInSemanticsRule ) | ( ruleOutSemanticsRule ) )
             int alt11=2;
             int LA11_0 = input.LA(1);
 
@@ -5369,13 +5369,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt11) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1856:1: ( ruleInSemanticsRule )
+                    // InternalFSM.g:1859:1: ( ruleInSemanticsRule )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1856:1: ( ruleInSemanticsRule )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1857:1: ruleInSemanticsRule
+                    // InternalFSM.g:1859:1: ( ruleInSemanticsRule )
+                    // InternalFSM.g:1860:1: ruleInSemanticsRule
                     {
                      before(grammarAccess.getSemanticsRuleAccess().getInSemanticsRuleParserRuleCall_0()); 
-                    pushFollow(FOLLOW_ruleInSemanticsRule_in_rule__SemanticsRule__Alternatives3935);
+                    pushFollow(FOLLOW_2);
                     ruleInSemanticsRule();
 
                     state._fsp--;
@@ -5388,13 +5388,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1862:6: ( ruleOutSemanticsRule )
+                    // InternalFSM.g:1865:6: ( ruleOutSemanticsRule )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1862:6: ( ruleOutSemanticsRule )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1863:1: ruleOutSemanticsRule
+                    // InternalFSM.g:1865:6: ( ruleOutSemanticsRule )
+                    // InternalFSM.g:1866:1: ruleOutSemanticsRule
                     {
                      before(grammarAccess.getSemanticsRuleAccess().getOutSemanticsRuleParserRuleCall_1()); 
-                    pushFollow(FOLLOW_ruleOutSemanticsRule_in_rule__SemanticsRule__Alternatives3952);
+                    pushFollow(FOLLOW_2);
                     ruleOutSemanticsRule();
 
                     state._fsp--;
@@ -5424,13 +5424,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__Alternatives_3_1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1873:1: rule__InSemanticsRule__Alternatives_3_1 : ( ( ( rule__InSemanticsRule__FollowUpsAssignment_3_1_0 ) ) | ( ( rule__InSemanticsRule__Group_3_1_1__0 ) ) );
+    // InternalFSM.g:1876:1: rule__InSemanticsRule__Alternatives_3_1 : ( ( ( rule__InSemanticsRule__FollowUpsAssignment_3_1_0 ) ) | ( ( rule__InSemanticsRule__Group_3_1_1__0 ) ) );
     public final void rule__InSemanticsRule__Alternatives_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1877:1: ( ( ( rule__InSemanticsRule__FollowUpsAssignment_3_1_0 ) ) | ( ( rule__InSemanticsRule__Group_3_1_1__0 ) ) )
+            // InternalFSM.g:1880:1: ( ( ( rule__InSemanticsRule__FollowUpsAssignment_3_1_0 ) ) | ( ( rule__InSemanticsRule__Group_3_1_1__0 ) ) )
             int alt12=2;
             int LA12_0 = input.LA(1);
 
@@ -5448,16 +5448,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt12) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1878:1: ( ( rule__InSemanticsRule__FollowUpsAssignment_3_1_0 ) )
+                    // InternalFSM.g:1881:1: ( ( rule__InSemanticsRule__FollowUpsAssignment_3_1_0 ) )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1878:1: ( ( rule__InSemanticsRule__FollowUpsAssignment_3_1_0 ) )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1879:1: ( rule__InSemanticsRule__FollowUpsAssignment_3_1_0 )
+                    // InternalFSM.g:1881:1: ( ( rule__InSemanticsRule__FollowUpsAssignment_3_1_0 ) )
+                    // InternalFSM.g:1882:1: ( rule__InSemanticsRule__FollowUpsAssignment_3_1_0 )
                     {
                      before(grammarAccess.getInSemanticsRuleAccess().getFollowUpsAssignment_3_1_0()); 
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1880:1: ( rule__InSemanticsRule__FollowUpsAssignment_3_1_0 )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1880:2: rule__InSemanticsRule__FollowUpsAssignment_3_1_0
+                    // InternalFSM.g:1883:1: ( rule__InSemanticsRule__FollowUpsAssignment_3_1_0 )
+                    // InternalFSM.g:1883:2: rule__InSemanticsRule__FollowUpsAssignment_3_1_0
                     {
-                    pushFollow(FOLLOW_rule__InSemanticsRule__FollowUpsAssignment_3_1_0_in_rule__InSemanticsRule__Alternatives_3_13984);
+                    pushFollow(FOLLOW_2);
                     rule__InSemanticsRule__FollowUpsAssignment_3_1_0();
 
                     state._fsp--;
@@ -5473,16 +5473,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1884:6: ( ( rule__InSemanticsRule__Group_3_1_1__0 ) )
+                    // InternalFSM.g:1887:6: ( ( rule__InSemanticsRule__Group_3_1_1__0 ) )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1884:6: ( ( rule__InSemanticsRule__Group_3_1_1__0 ) )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1885:1: ( rule__InSemanticsRule__Group_3_1_1__0 )
+                    // InternalFSM.g:1887:6: ( ( rule__InSemanticsRule__Group_3_1_1__0 ) )
+                    // InternalFSM.g:1888:1: ( rule__InSemanticsRule__Group_3_1_1__0 )
                     {
                      before(grammarAccess.getInSemanticsRuleAccess().getGroup_3_1_1()); 
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1886:1: ( rule__InSemanticsRule__Group_3_1_1__0 )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1886:2: rule__InSemanticsRule__Group_3_1_1__0
+                    // InternalFSM.g:1889:1: ( rule__InSemanticsRule__Group_3_1_1__0 )
+                    // InternalFSM.g:1889:2: rule__InSemanticsRule__Group_3_1_1__0
                     {
-                    pushFollow(FOLLOW_rule__InSemanticsRule__Group_3_1_1__0_in_rule__InSemanticsRule__Alternatives_3_14002);
+                    pushFollow(FOLLOW_2);
                     rule__InSemanticsRule__Group_3_1_1__0();
 
                     state._fsp--;
@@ -5515,13 +5515,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__Alternatives_3_1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1895:1: rule__OutSemanticsRule__Alternatives_3_1 : ( ( ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_0 ) ) | ( ( rule__OutSemanticsRule__Group_3_1_1__0 ) ) );
+    // InternalFSM.g:1898:1: rule__OutSemanticsRule__Alternatives_3_1 : ( ( ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_0 ) ) | ( ( rule__OutSemanticsRule__Group_3_1_1__0 ) ) );
     public final void rule__OutSemanticsRule__Alternatives_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1899:1: ( ( ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_0 ) ) | ( ( rule__OutSemanticsRule__Group_3_1_1__0 ) ) )
+            // InternalFSM.g:1902:1: ( ( ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_0 ) ) | ( ( rule__OutSemanticsRule__Group_3_1_1__0 ) ) )
             int alt13=2;
             int LA13_0 = input.LA(1);
 
@@ -5539,16 +5539,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt13) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1900:1: ( ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_0 ) )
+                    // InternalFSM.g:1903:1: ( ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_0 ) )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1900:1: ( ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_0 ) )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1901:1: ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_0 )
+                    // InternalFSM.g:1903:1: ( ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_0 ) )
+                    // InternalFSM.g:1904:1: ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_0 )
                     {
                      before(grammarAccess.getOutSemanticsRuleAccess().getFollowUpsAssignment_3_1_0()); 
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1902:1: ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_0 )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1902:2: rule__OutSemanticsRule__FollowUpsAssignment_3_1_0
+                    // InternalFSM.g:1905:1: ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_0 )
+                    // InternalFSM.g:1905:2: rule__OutSemanticsRule__FollowUpsAssignment_3_1_0
                     {
-                    pushFollow(FOLLOW_rule__OutSemanticsRule__FollowUpsAssignment_3_1_0_in_rule__OutSemanticsRule__Alternatives_3_14035);
+                    pushFollow(FOLLOW_2);
                     rule__OutSemanticsRule__FollowUpsAssignment_3_1_0();
 
                     state._fsp--;
@@ -5564,16 +5564,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1906:6: ( ( rule__OutSemanticsRule__Group_3_1_1__0 ) )
+                    // InternalFSM.g:1909:6: ( ( rule__OutSemanticsRule__Group_3_1_1__0 ) )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1906:6: ( ( rule__OutSemanticsRule__Group_3_1_1__0 ) )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1907:1: ( rule__OutSemanticsRule__Group_3_1_1__0 )
+                    // InternalFSM.g:1909:6: ( ( rule__OutSemanticsRule__Group_3_1_1__0 ) )
+                    // InternalFSM.g:1910:1: ( rule__OutSemanticsRule__Group_3_1_1__0 )
                     {
                      before(grammarAccess.getOutSemanticsRuleAccess().getGroup_3_1_1()); 
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1908:1: ( rule__OutSemanticsRule__Group_3_1_1__0 )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1908:2: rule__OutSemanticsRule__Group_3_1_1__0
+                    // InternalFSM.g:1911:1: ( rule__OutSemanticsRule__Group_3_1_1__0 )
+                    // InternalFSM.g:1911:2: rule__OutSemanticsRule__Group_3_1_1__0
                     {
-                    pushFollow(FOLLOW_rule__OutSemanticsRule__Group_3_1_1__0_in_rule__OutSemanticsRule__Alternatives_3_14053);
+                    pushFollow(FOLLOW_2);
                     rule__OutSemanticsRule__Group_3_1_1__0();
 
                     state._fsp--;
@@ -5606,13 +5606,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AnnotationAttribute__Alternatives"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1918:1: rule__AnnotationAttribute__Alternatives : ( ( ruleSimpleAnnotationAttribute ) | ( ruleEnumAnnotationAttribute ) );
+    // InternalFSM.g:1921:1: rule__AnnotationAttribute__Alternatives : ( ( ruleSimpleAnnotationAttribute ) | ( ruleEnumAnnotationAttribute ) );
     public final void rule__AnnotationAttribute__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1922:1: ( ( ruleSimpleAnnotationAttribute ) | ( ruleEnumAnnotationAttribute ) )
+            // InternalFSM.g:1925:1: ( ( ruleSimpleAnnotationAttribute ) | ( ruleEnumAnnotationAttribute ) )
             int alt14=2;
             int LA14_0 = input.LA(1);
 
@@ -5716,13 +5716,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt14) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1923:1: ( ruleSimpleAnnotationAttribute )
+                    // InternalFSM.g:1926:1: ( ruleSimpleAnnotationAttribute )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1923:1: ( ruleSimpleAnnotationAttribute )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1924:1: ruleSimpleAnnotationAttribute
+                    // InternalFSM.g:1926:1: ( ruleSimpleAnnotationAttribute )
+                    // InternalFSM.g:1927:1: ruleSimpleAnnotationAttribute
                     {
                      before(grammarAccess.getAnnotationAttributeAccess().getSimpleAnnotationAttributeParserRuleCall_0()); 
-                    pushFollow(FOLLOW_ruleSimpleAnnotationAttribute_in_rule__AnnotationAttribute__Alternatives4087);
+                    pushFollow(FOLLOW_2);
                     ruleSimpleAnnotationAttribute();
 
                     state._fsp--;
@@ -5735,13 +5735,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1929:6: ( ruleEnumAnnotationAttribute )
+                    // InternalFSM.g:1932:6: ( ruleEnumAnnotationAttribute )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1929:6: ( ruleEnumAnnotationAttribute )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1930:1: ruleEnumAnnotationAttribute
+                    // InternalFSM.g:1932:6: ( ruleEnumAnnotationAttribute )
+                    // InternalFSM.g:1933:1: ruleEnumAnnotationAttribute
                     {
                      before(grammarAccess.getAnnotationAttributeAccess().getEnumAnnotationAttributeParserRuleCall_1()); 
-                    pushFollow(FOLLOW_ruleEnumAnnotationAttribute_in_rule__AnnotationAttribute__Alternatives4104);
+                    pushFollow(FOLLOW_2);
                     ruleEnumAnnotationAttribute();
 
                     state._fsp--;
@@ -5771,13 +5771,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Alternatives_0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1940:1: rule__SimpleAnnotationAttribute__Alternatives_0 : ( ( ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 ) ) | ( 'mandatory' ) );
+    // InternalFSM.g:1943:1: rule__SimpleAnnotationAttribute__Alternatives_0 : ( ( ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 ) ) | ( 'mandatory' ) );
     public final void rule__SimpleAnnotationAttribute__Alternatives_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1944:1: ( ( ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 ) ) | ( 'mandatory' ) )
+            // InternalFSM.g:1947:1: ( ( ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 ) ) | ( 'mandatory' ) )
             int alt15=2;
             int LA15_0 = input.LA(1);
 
@@ -5795,16 +5795,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt15) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1945:1: ( ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 ) )
+                    // InternalFSM.g:1948:1: ( ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 ) )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1945:1: ( ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 ) )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1946:1: ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 )
+                    // InternalFSM.g:1948:1: ( ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 ) )
+                    // InternalFSM.g:1949:1: ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 )
                     {
                      before(grammarAccess.getSimpleAnnotationAttributeAccess().getOptionalAssignment_0_0()); 
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1947:1: ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1947:2: rule__SimpleAnnotationAttribute__OptionalAssignment_0_0
+                    // InternalFSM.g:1950:1: ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 )
+                    // InternalFSM.g:1950:2: rule__SimpleAnnotationAttribute__OptionalAssignment_0_0
                     {
-                    pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__OptionalAssignment_0_0_in_rule__SimpleAnnotationAttribute__Alternatives_04136);
+                    pushFollow(FOLLOW_2);
                     rule__SimpleAnnotationAttribute__OptionalAssignment_0_0();
 
                     state._fsp--;
@@ -5820,13 +5820,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1951:6: ( 'mandatory' )
+                    // InternalFSM.g:1954:6: ( 'mandatory' )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1951:6: ( 'mandatory' )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1952:1: 'mandatory'
+                    // InternalFSM.g:1954:6: ( 'mandatory' )
+                    // InternalFSM.g:1955:1: 'mandatory'
                     {
                      before(grammarAccess.getSimpleAnnotationAttributeAccess().getMandatoryKeyword_0_1()); 
-                    match(input,12,FOLLOW_12_in_rule__SimpleAnnotationAttribute__Alternatives_04155); 
+                    match(input,12,FOLLOW_2); 
                      after(grammarAccess.getSimpleAnnotationAttributeAccess().getMandatoryKeyword_0_1()); 
 
                     }
@@ -5852,13 +5852,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Alternatives_0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1964:1: rule__EnumAnnotationAttribute__Alternatives_0 : ( ( ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 ) ) | ( 'mandatory' ) );
+    // InternalFSM.g:1967:1: rule__EnumAnnotationAttribute__Alternatives_0 : ( ( ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 ) ) | ( 'mandatory' ) );
     public final void rule__EnumAnnotationAttribute__Alternatives_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1968:1: ( ( ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 ) ) | ( 'mandatory' ) )
+            // InternalFSM.g:1971:1: ( ( ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 ) ) | ( 'mandatory' ) )
             int alt16=2;
             int LA16_0 = input.LA(1);
 
@@ -5876,16 +5876,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt16) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1969:1: ( ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 ) )
+                    // InternalFSM.g:1972:1: ( ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 ) )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1969:1: ( ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 ) )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1970:1: ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 )
+                    // InternalFSM.g:1972:1: ( ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 ) )
+                    // InternalFSM.g:1973:1: ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 )
                     {
                      before(grammarAccess.getEnumAnnotationAttributeAccess().getOptionalAssignment_0_0()); 
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1971:1: ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1971:2: rule__EnumAnnotationAttribute__OptionalAssignment_0_0
+                    // InternalFSM.g:1974:1: ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 )
+                    // InternalFSM.g:1974:2: rule__EnumAnnotationAttribute__OptionalAssignment_0_0
                     {
-                    pushFollow(FOLLOW_rule__EnumAnnotationAttribute__OptionalAssignment_0_0_in_rule__EnumAnnotationAttribute__Alternatives_04189);
+                    pushFollow(FOLLOW_2);
                     rule__EnumAnnotationAttribute__OptionalAssignment_0_0();
 
                     state._fsp--;
@@ -5901,13 +5901,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1975:6: ( 'mandatory' )
+                    // InternalFSM.g:1978:6: ( 'mandatory' )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1975:6: ( 'mandatory' )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1976:1: 'mandatory'
+                    // InternalFSM.g:1978:6: ( 'mandatory' )
+                    // InternalFSM.g:1979:1: 'mandatory'
                     {
                      before(grammarAccess.getEnumAnnotationAttributeAccess().getMandatoryKeyword_0_1()); 
-                    match(input,12,FOLLOW_12_in_rule__EnumAnnotationAttribute__Alternatives_04208); 
+                    match(input,12,FOLLOW_2); 
                      after(grammarAccess.getEnumAnnotationAttributeAccess().getMandatoryKeyword_0_1()); 
 
                     }
@@ -5933,13 +5933,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Literal__Alternatives"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1990:1: rule__Literal__Alternatives : ( ( ruleBooleanLiteral ) | ( ruleNumberLiteral ) | ( ruleStringLiteral ) );
+    // InternalFSM.g:1993:1: rule__Literal__Alternatives : ( ( ruleBooleanLiteral ) | ( ruleNumberLiteral ) | ( ruleStringLiteral ) );
     public final void rule__Literal__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1994:1: ( ( ruleBooleanLiteral ) | ( ruleNumberLiteral ) | ( ruleStringLiteral ) )
+            // InternalFSM.g:1997:1: ( ( ruleBooleanLiteral ) | ( ruleNumberLiteral ) | ( ruleStringLiteral ) )
             int alt17=3;
             switch ( input.LA(1) ) {
             case 13:
@@ -5970,13 +5970,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
             switch (alt17) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1995:1: ( ruleBooleanLiteral )
+                    // InternalFSM.g:1998:1: ( ruleBooleanLiteral )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1995:1: ( ruleBooleanLiteral )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:1996:1: ruleBooleanLiteral
+                    // InternalFSM.g:1998:1: ( ruleBooleanLiteral )
+                    // InternalFSM.g:1999:1: ruleBooleanLiteral
                     {
                      before(grammarAccess.getLiteralAccess().getBooleanLiteralParserRuleCall_0()); 
-                    pushFollow(FOLLOW_ruleBooleanLiteral_in_rule__Literal__Alternatives4244);
+                    pushFollow(FOLLOW_2);
                     ruleBooleanLiteral();
 
                     state._fsp--;
@@ -5989,13 +5989,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2001:6: ( ruleNumberLiteral )
+                    // InternalFSM.g:2004:6: ( ruleNumberLiteral )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2001:6: ( ruleNumberLiteral )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2002:1: ruleNumberLiteral
+                    // InternalFSM.g:2004:6: ( ruleNumberLiteral )
+                    // InternalFSM.g:2005:1: ruleNumberLiteral
                     {
                      before(grammarAccess.getLiteralAccess().getNumberLiteralParserRuleCall_1()); 
-                    pushFollow(FOLLOW_ruleNumberLiteral_in_rule__Literal__Alternatives4261);
+                    pushFollow(FOLLOW_2);
                     ruleNumberLiteral();
 
                     state._fsp--;
@@ -6008,13 +6008,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2007:6: ( ruleStringLiteral )
+                    // InternalFSM.g:2010:6: ( ruleStringLiteral )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2007:6: ( ruleStringLiteral )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2008:1: ruleStringLiteral
+                    // InternalFSM.g:2010:6: ( ruleStringLiteral )
+                    // InternalFSM.g:2011:1: ruleStringLiteral
                     {
                      before(grammarAccess.getLiteralAccess().getStringLiteralParserRuleCall_2()); 
-                    pushFollow(FOLLOW_ruleStringLiteral_in_rule__Literal__Alternatives4278);
+                    pushFollow(FOLLOW_2);
                     ruleStringLiteral();
 
                     state._fsp--;
@@ -6044,13 +6044,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__BooleanLiteral__Alternatives_1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2018:1: rule__BooleanLiteral__Alternatives_1 : ( ( 'false' ) | ( ( rule__BooleanLiteral__IsTrueAssignment_1_1 ) ) );
+    // InternalFSM.g:2021:1: rule__BooleanLiteral__Alternatives_1 : ( ( 'false' ) | ( ( rule__BooleanLiteral__IsTrueAssignment_1_1 ) ) );
     public final void rule__BooleanLiteral__Alternatives_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2022:1: ( ( 'false' ) | ( ( rule__BooleanLiteral__IsTrueAssignment_1_1 ) ) )
+            // InternalFSM.g:2025:1: ( ( 'false' ) | ( ( rule__BooleanLiteral__IsTrueAssignment_1_1 ) ) )
             int alt18=2;
             int LA18_0 = input.LA(1);
 
@@ -6068,13 +6068,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt18) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2023:1: ( 'false' )
+                    // InternalFSM.g:2026:1: ( 'false' )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2023:1: ( 'false' )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2024:1: 'false'
+                    // InternalFSM.g:2026:1: ( 'false' )
+                    // InternalFSM.g:2027:1: 'false'
                     {
                      before(grammarAccess.getBooleanLiteralAccess().getFalseKeyword_1_0()); 
-                    match(input,13,FOLLOW_13_in_rule__BooleanLiteral__Alternatives_14311); 
+                    match(input,13,FOLLOW_2); 
                      after(grammarAccess.getBooleanLiteralAccess().getFalseKeyword_1_0()); 
 
                     }
@@ -6083,16 +6083,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2031:6: ( ( rule__BooleanLiteral__IsTrueAssignment_1_1 ) )
+                    // InternalFSM.g:2034:6: ( ( rule__BooleanLiteral__IsTrueAssignment_1_1 ) )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2031:6: ( ( rule__BooleanLiteral__IsTrueAssignment_1_1 ) )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2032:1: ( rule__BooleanLiteral__IsTrueAssignment_1_1 )
+                    // InternalFSM.g:2034:6: ( ( rule__BooleanLiteral__IsTrueAssignment_1_1 ) )
+                    // InternalFSM.g:2035:1: ( rule__BooleanLiteral__IsTrueAssignment_1_1 )
                     {
                      before(grammarAccess.getBooleanLiteralAccess().getIsTrueAssignment_1_1()); 
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2033:1: ( rule__BooleanLiteral__IsTrueAssignment_1_1 )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2033:2: rule__BooleanLiteral__IsTrueAssignment_1_1
+                    // InternalFSM.g:2036:1: ( rule__BooleanLiteral__IsTrueAssignment_1_1 )
+                    // InternalFSM.g:2036:2: rule__BooleanLiteral__IsTrueAssignment_1_1
                     {
-                    pushFollow(FOLLOW_rule__BooleanLiteral__IsTrueAssignment_1_1_in_rule__BooleanLiteral__Alternatives_14330);
+                    pushFollow(FOLLOW_2);
                     rule__BooleanLiteral__IsTrueAssignment_1_1();
 
                     state._fsp--;
@@ -6125,13 +6125,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NumberLiteral__Alternatives"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2042:1: rule__NumberLiteral__Alternatives : ( ( ruleIntLiteral ) | ( ruleRealLiteral ) );
+    // InternalFSM.g:2045:1: rule__NumberLiteral__Alternatives : ( ( ruleIntLiteral ) | ( ruleRealLiteral ) );
     public final void rule__NumberLiteral__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2046:1: ( ( ruleIntLiteral ) | ( ruleRealLiteral ) )
+            // InternalFSM.g:2049:1: ( ( ruleIntLiteral ) | ( ruleRealLiteral ) )
             int alt19=2;
             switch ( input.LA(1) ) {
             case 14:
@@ -6222,13 +6222,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
             switch (alt19) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2047:1: ( ruleIntLiteral )
+                    // InternalFSM.g:2050:1: ( ruleIntLiteral )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2047:1: ( ruleIntLiteral )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2048:1: ruleIntLiteral
+                    // InternalFSM.g:2050:1: ( ruleIntLiteral )
+                    // InternalFSM.g:2051:1: ruleIntLiteral
                     {
                      before(grammarAccess.getNumberLiteralAccess().getIntLiteralParserRuleCall_0()); 
-                    pushFollow(FOLLOW_ruleIntLiteral_in_rule__NumberLiteral__Alternatives4363);
+                    pushFollow(FOLLOW_2);
                     ruleIntLiteral();
 
                     state._fsp--;
@@ -6241,13 +6241,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2053:6: ( ruleRealLiteral )
+                    // InternalFSM.g:2056:6: ( ruleRealLiteral )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2053:6: ( ruleRealLiteral )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2054:1: ruleRealLiteral
+                    // InternalFSM.g:2056:6: ( ruleRealLiteral )
+                    // InternalFSM.g:2057:1: ruleRealLiteral
                     {
                      before(grammarAccess.getNumberLiteralAccess().getRealLiteralParserRuleCall_1()); 
-                    pushFollow(FOLLOW_ruleRealLiteral_in_rule__NumberLiteral__Alternatives4380);
+                    pushFollow(FOLLOW_2);
                     ruleRealLiteral();
 
                     state._fsp--;
@@ -6277,13 +6277,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Integer__Alternatives"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2064:1: rule__Integer__Alternatives : ( ( ( rule__Integer__Group_0__0 ) ) | ( RULE_HEX ) );
+    // InternalFSM.g:2067:1: rule__Integer__Alternatives : ( ( ( rule__Integer__Group_0__0 ) ) | ( RULE_HEX ) );
     public final void rule__Integer__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2068:1: ( ( ( rule__Integer__Group_0__0 ) ) | ( RULE_HEX ) )
+            // InternalFSM.g:2071:1: ( ( ( rule__Integer__Group_0__0 ) ) | ( RULE_HEX ) )
             int alt20=2;
             int LA20_0 = input.LA(1);
 
@@ -6301,16 +6301,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt20) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2069:1: ( ( rule__Integer__Group_0__0 ) )
+                    // InternalFSM.g:2072:1: ( ( rule__Integer__Group_0__0 ) )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2069:1: ( ( rule__Integer__Group_0__0 ) )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2070:1: ( rule__Integer__Group_0__0 )
+                    // InternalFSM.g:2072:1: ( ( rule__Integer__Group_0__0 ) )
+                    // InternalFSM.g:2073:1: ( rule__Integer__Group_0__0 )
                     {
                      before(grammarAccess.getIntegerAccess().getGroup_0()); 
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2071:1: ( rule__Integer__Group_0__0 )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2071:2: rule__Integer__Group_0__0
+                    // InternalFSM.g:2074:1: ( rule__Integer__Group_0__0 )
+                    // InternalFSM.g:2074:2: rule__Integer__Group_0__0
                     {
-                    pushFollow(FOLLOW_rule__Integer__Group_0__0_in_rule__Integer__Alternatives4412);
+                    pushFollow(FOLLOW_2);
                     rule__Integer__Group_0__0();
 
                     state._fsp--;
@@ -6326,13 +6326,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2075:6: ( RULE_HEX )
+                    // InternalFSM.g:2078:6: ( RULE_HEX )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2075:6: ( RULE_HEX )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2076:1: RULE_HEX
+                    // InternalFSM.g:2078:6: ( RULE_HEX )
+                    // InternalFSM.g:2079:1: RULE_HEX
                     {
                      before(grammarAccess.getIntegerAccess().getHEXTerminalRuleCall_1()); 
-                    match(input,RULE_HEX,FOLLOW_RULE_HEX_in_rule__Integer__Alternatives4430); 
+                    match(input,RULE_HEX,FOLLOW_2); 
                      after(grammarAccess.getIntegerAccess().getHEXTerminalRuleCall_1()); 
 
                     }
@@ -6358,13 +6358,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Integer__Alternatives_0_0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2086:1: rule__Integer__Alternatives_0_0 : ( ( '+' ) | ( '-' ) );
+    // InternalFSM.g:2089:1: rule__Integer__Alternatives_0_0 : ( ( '+' ) | ( '-' ) );
     public final void rule__Integer__Alternatives_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2090:1: ( ( '+' ) | ( '-' ) )
+            // InternalFSM.g:2093:1: ( ( '+' ) | ( '-' ) )
             int alt21=2;
             int LA21_0 = input.LA(1);
 
@@ -6382,13 +6382,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt21) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2091:1: ( '+' )
+                    // InternalFSM.g:2094:1: ( '+' )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2091:1: ( '+' )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2092:1: '+'
+                    // InternalFSM.g:2094:1: ( '+' )
+                    // InternalFSM.g:2095:1: '+'
                     {
                      before(grammarAccess.getIntegerAccess().getPlusSignKeyword_0_0_0()); 
-                    match(input,14,FOLLOW_14_in_rule__Integer__Alternatives_0_04463); 
+                    match(input,14,FOLLOW_2); 
                      after(grammarAccess.getIntegerAccess().getPlusSignKeyword_0_0_0()); 
 
                     }
@@ -6397,13 +6397,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2099:6: ( '-' )
+                    // InternalFSM.g:2102:6: ( '-' )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2099:6: ( '-' )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2100:1: '-'
+                    // InternalFSM.g:2102:6: ( '-' )
+                    // InternalFSM.g:2103:1: '-'
                     {
                      before(grammarAccess.getIntegerAccess().getHyphenMinusKeyword_0_0_1()); 
-                    match(input,15,FOLLOW_15_in_rule__Integer__Alternatives_0_04483); 
+                    match(input,15,FOLLOW_2); 
                      after(grammarAccess.getIntegerAccess().getHyphenMinusKeyword_0_0_1()); 
 
                     }
@@ -6429,13 +6429,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Real__Alternatives"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2112:1: rule__Real__Alternatives : ( ( ruleDecimal ) | ( ruleDecimalExp ) );
+    // InternalFSM.g:2115:1: rule__Real__Alternatives : ( ( ruleDecimal ) | ( ruleDecimalExp ) );
     public final void rule__Real__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2116:1: ( ( ruleDecimal ) | ( ruleDecimalExp ) )
+            // InternalFSM.g:2119:1: ( ( ruleDecimal ) | ( ruleDecimalExp ) )
             int alt22=2;
             switch ( input.LA(1) ) {
             case 14:
@@ -6581,13 +6581,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
             switch (alt22) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2117:1: ( ruleDecimal )
+                    // InternalFSM.g:2120:1: ( ruleDecimal )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2117:1: ( ruleDecimal )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2118:1: ruleDecimal
+                    // InternalFSM.g:2120:1: ( ruleDecimal )
+                    // InternalFSM.g:2121:1: ruleDecimal
                     {
                      before(grammarAccess.getRealAccess().getDecimalParserRuleCall_0()); 
-                    pushFollow(FOLLOW_ruleDecimal_in_rule__Real__Alternatives4517);
+                    pushFollow(FOLLOW_2);
                     ruleDecimal();
 
                     state._fsp--;
@@ -6600,13 +6600,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2123:6: ( ruleDecimalExp )
+                    // InternalFSM.g:2126:6: ( ruleDecimalExp )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2123:6: ( ruleDecimalExp )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2124:1: ruleDecimalExp
+                    // InternalFSM.g:2126:6: ( ruleDecimalExp )
+                    // InternalFSM.g:2127:1: ruleDecimalExp
                     {
                      before(grammarAccess.getRealAccess().getDecimalExpParserRuleCall_1()); 
-                    pushFollow(FOLLOW_ruleDecimalExp_in_rule__Real__Alternatives4534);
+                    pushFollow(FOLLOW_2);
                     ruleDecimalExp();
 
                     state._fsp--;
@@ -6636,13 +6636,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Decimal__Alternatives_0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2134:1: rule__Decimal__Alternatives_0 : ( ( '+' ) | ( '-' ) );
+    // InternalFSM.g:2137:1: rule__Decimal__Alternatives_0 : ( ( '+' ) | ( '-' ) );
     public final void rule__Decimal__Alternatives_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2138:1: ( ( '+' ) | ( '-' ) )
+            // InternalFSM.g:2141:1: ( ( '+' ) | ( '-' ) )
             int alt23=2;
             int LA23_0 = input.LA(1);
 
@@ -6660,13 +6660,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt23) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2139:1: ( '+' )
+                    // InternalFSM.g:2142:1: ( '+' )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2139:1: ( '+' )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2140:1: '+'
+                    // InternalFSM.g:2142:1: ( '+' )
+                    // InternalFSM.g:2143:1: '+'
                     {
                      before(grammarAccess.getDecimalAccess().getPlusSignKeyword_0_0()); 
-                    match(input,14,FOLLOW_14_in_rule__Decimal__Alternatives_04567); 
+                    match(input,14,FOLLOW_2); 
                      after(grammarAccess.getDecimalAccess().getPlusSignKeyword_0_0()); 
 
                     }
@@ -6675,13 +6675,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2147:6: ( '-' )
+                    // InternalFSM.g:2150:6: ( '-' )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2147:6: ( '-' )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2148:1: '-'
+                    // InternalFSM.g:2150:6: ( '-' )
+                    // InternalFSM.g:2151:1: '-'
                     {
                      before(grammarAccess.getDecimalAccess().getHyphenMinusKeyword_0_1()); 
-                    match(input,15,FOLLOW_15_in_rule__Decimal__Alternatives_04587); 
+                    match(input,15,FOLLOW_2); 
                      after(grammarAccess.getDecimalAccess().getHyphenMinusKeyword_0_1()); 
 
                     }
@@ -6707,13 +6707,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Alternatives_0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2160:1: rule__DecimalExp__Alternatives_0 : ( ( '+' ) | ( '-' ) );
+    // InternalFSM.g:2163:1: rule__DecimalExp__Alternatives_0 : ( ( '+' ) | ( '-' ) );
     public final void rule__DecimalExp__Alternatives_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2164:1: ( ( '+' ) | ( '-' ) )
+            // InternalFSM.g:2167:1: ( ( '+' ) | ( '-' ) )
             int alt24=2;
             int LA24_0 = input.LA(1);
 
@@ -6731,13 +6731,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt24) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2165:1: ( '+' )
+                    // InternalFSM.g:2168:1: ( '+' )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2165:1: ( '+' )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2166:1: '+'
+                    // InternalFSM.g:2168:1: ( '+' )
+                    // InternalFSM.g:2169:1: '+'
                     {
                      before(grammarAccess.getDecimalExpAccess().getPlusSignKeyword_0_0()); 
-                    match(input,14,FOLLOW_14_in_rule__DecimalExp__Alternatives_04622); 
+                    match(input,14,FOLLOW_2); 
                      after(grammarAccess.getDecimalExpAccess().getPlusSignKeyword_0_0()); 
 
                     }
@@ -6746,13 +6746,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2173:6: ( '-' )
+                    // InternalFSM.g:2176:6: ( '-' )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2173:6: ( '-' )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2174:1: '-'
+                    // InternalFSM.g:2176:6: ( '-' )
+                    // InternalFSM.g:2177:1: '-'
                     {
                      before(grammarAccess.getDecimalExpAccess().getHyphenMinusKeyword_0_1()); 
-                    match(input,15,FOLLOW_15_in_rule__DecimalExp__Alternatives_04642); 
+                    match(input,15,FOLLOW_2); 
                      after(grammarAccess.getDecimalExpAccess().getHyphenMinusKeyword_0_1()); 
 
                     }
@@ -6778,13 +6778,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Alternatives_4"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2186:1: rule__DecimalExp__Alternatives_4 : ( ( 'e' ) | ( 'E' ) );
+    // InternalFSM.g:2189:1: rule__DecimalExp__Alternatives_4 : ( ( 'e' ) | ( 'E' ) );
     public final void rule__DecimalExp__Alternatives_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2190:1: ( ( 'e' ) | ( 'E' ) )
+            // InternalFSM.g:2193:1: ( ( 'e' ) | ( 'E' ) )
             int alt25=2;
             int LA25_0 = input.LA(1);
 
@@ -6802,13 +6802,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt25) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2191:1: ( 'e' )
+                    // InternalFSM.g:2194:1: ( 'e' )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2191:1: ( 'e' )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2192:1: 'e'
+                    // InternalFSM.g:2194:1: ( 'e' )
+                    // InternalFSM.g:2195:1: 'e'
                     {
                      before(grammarAccess.getDecimalExpAccess().getEKeyword_4_0()); 
-                    match(input,16,FOLLOW_16_in_rule__DecimalExp__Alternatives_44677); 
+                    match(input,16,FOLLOW_2); 
                      after(grammarAccess.getDecimalExpAccess().getEKeyword_4_0()); 
 
                     }
@@ -6817,13 +6817,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2199:6: ( 'E' )
+                    // InternalFSM.g:2202:6: ( 'E' )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2199:6: ( 'E' )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2200:1: 'E'
+                    // InternalFSM.g:2202:6: ( 'E' )
+                    // InternalFSM.g:2203:1: 'E'
                     {
                      before(grammarAccess.getDecimalExpAccess().getEKeyword_4_1()); 
-                    match(input,17,FOLLOW_17_in_rule__DecimalExp__Alternatives_44697); 
+                    match(input,17,FOLLOW_2); 
                      after(grammarAccess.getDecimalExpAccess().getEKeyword_4_1()); 
 
                     }
@@ -6849,13 +6849,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Alternatives_5"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2212:1: rule__DecimalExp__Alternatives_5 : ( ( '+' ) | ( '-' ) );
+    // InternalFSM.g:2215:1: rule__DecimalExp__Alternatives_5 : ( ( '+' ) | ( '-' ) );
     public final void rule__DecimalExp__Alternatives_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2216:1: ( ( '+' ) | ( '-' ) )
+            // InternalFSM.g:2219:1: ( ( '+' ) | ( '-' ) )
             int alt26=2;
             int LA26_0 = input.LA(1);
 
@@ -6873,13 +6873,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt26) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2217:1: ( '+' )
+                    // InternalFSM.g:2220:1: ( '+' )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2217:1: ( '+' )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2218:1: '+'
+                    // InternalFSM.g:2220:1: ( '+' )
+                    // InternalFSM.g:2221:1: '+'
                     {
                      before(grammarAccess.getDecimalExpAccess().getPlusSignKeyword_5_0()); 
-                    match(input,14,FOLLOW_14_in_rule__DecimalExp__Alternatives_54732); 
+                    match(input,14,FOLLOW_2); 
                      after(grammarAccess.getDecimalExpAccess().getPlusSignKeyword_5_0()); 
 
                     }
@@ -6888,13 +6888,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2225:6: ( '-' )
+                    // InternalFSM.g:2228:6: ( '-' )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2225:6: ( '-' )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2226:1: '-'
+                    // InternalFSM.g:2228:6: ( '-' )
+                    // InternalFSM.g:2229:1: '-'
                     {
                      before(grammarAccess.getDecimalExpAccess().getHyphenMinusKeyword_5_1()); 
-                    match(input,15,FOLLOW_15_in_rule__DecimalExp__Alternatives_54752); 
+                    match(input,15,FOLLOW_2); 
                      after(grammarAccess.getDecimalExpAccess().getHyphenMinusKeyword_5_1()); 
 
                     }
@@ -6920,13 +6920,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ComponentCommunicationType__Alternatives"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2238:1: rule__ComponentCommunicationType__Alternatives : ( ( ( 'eventdriven' ) ) | ( ( 'datadriven' ) ) | ( ( 'async' ) ) | ( ( 'sync' ) ) );
+    // InternalFSM.g:2241:1: rule__ComponentCommunicationType__Alternatives : ( ( ( 'eventdriven' ) ) | ( ( 'datadriven' ) ) | ( ( 'async' ) ) | ( ( 'sync' ) ) );
     public final void rule__ComponentCommunicationType__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2242:1: ( ( ( 'eventdriven' ) ) | ( ( 'datadriven' ) ) | ( ( 'async' ) ) | ( ( 'sync' ) ) )
+            // InternalFSM.g:2245:1: ( ( ( 'eventdriven' ) ) | ( ( 'datadriven' ) ) | ( ( 'async' ) ) | ( ( 'sync' ) ) )
             int alt27=4;
             switch ( input.LA(1) ) {
             case 18:
@@ -6958,16 +6958,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
             switch (alt27) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2243:1: ( ( 'eventdriven' ) )
+                    // InternalFSM.g:2246:1: ( ( 'eventdriven' ) )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2243:1: ( ( 'eventdriven' ) )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2244:1: ( 'eventdriven' )
+                    // InternalFSM.g:2246:1: ( ( 'eventdriven' ) )
+                    // InternalFSM.g:2247:1: ( 'eventdriven' )
                     {
                      before(grammarAccess.getComponentCommunicationTypeAccess().getEVENT_DRIVENEnumLiteralDeclaration_0()); 
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2245:1: ( 'eventdriven' )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2245:3: 'eventdriven'
+                    // InternalFSM.g:2248:1: ( 'eventdriven' )
+                    // InternalFSM.g:2248:3: 'eventdriven'
                     {
-                    match(input,18,FOLLOW_18_in_rule__ComponentCommunicationType__Alternatives4787); 
+                    match(input,18,FOLLOW_2); 
 
                     }
 
@@ -6979,16 +6979,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2250:6: ( ( 'datadriven' ) )
+                    // InternalFSM.g:2253:6: ( ( 'datadriven' ) )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2250:6: ( ( 'datadriven' ) )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2251:1: ( 'datadriven' )
+                    // InternalFSM.g:2253:6: ( ( 'datadriven' ) )
+                    // InternalFSM.g:2254:1: ( 'datadriven' )
                     {
                      before(grammarAccess.getComponentCommunicationTypeAccess().getDATA_DRIVENEnumLiteralDeclaration_1()); 
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2252:1: ( 'datadriven' )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2252:3: 'datadriven'
+                    // InternalFSM.g:2255:1: ( 'datadriven' )
+                    // InternalFSM.g:2255:3: 'datadriven'
                     {
-                    match(input,19,FOLLOW_19_in_rule__ComponentCommunicationType__Alternatives4808); 
+                    match(input,19,FOLLOW_2); 
 
                     }
 
@@ -7000,16 +7000,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2257:6: ( ( 'async' ) )
+                    // InternalFSM.g:2260:6: ( ( 'async' ) )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2257:6: ( ( 'async' ) )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2258:1: ( 'async' )
+                    // InternalFSM.g:2260:6: ( ( 'async' ) )
+                    // InternalFSM.g:2261:1: ( 'async' )
                     {
                      before(grammarAccess.getComponentCommunicationTypeAccess().getASYNCHRONOUSEnumLiteralDeclaration_2()); 
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2259:1: ( 'async' )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2259:3: 'async'
+                    // InternalFSM.g:2262:1: ( 'async' )
+                    // InternalFSM.g:2262:3: 'async'
                     {
-                    match(input,20,FOLLOW_20_in_rule__ComponentCommunicationType__Alternatives4829); 
+                    match(input,20,FOLLOW_2); 
 
                     }
 
@@ -7021,16 +7021,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 4 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2264:6: ( ( 'sync' ) )
+                    // InternalFSM.g:2267:6: ( ( 'sync' ) )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2264:6: ( ( 'sync' ) )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2265:1: ( 'sync' )
+                    // InternalFSM.g:2267:6: ( ( 'sync' ) )
+                    // InternalFSM.g:2268:1: ( 'sync' )
                     {
                      before(grammarAccess.getComponentCommunicationTypeAccess().getSYNCHRONOUSEnumLiteralDeclaration_3()); 
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2266:1: ( 'sync' )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2266:3: 'sync'
+                    // InternalFSM.g:2269:1: ( 'sync' )
+                    // InternalFSM.g:2269:3: 'sync'
                     {
-                    match(input,21,FOLLOW_21_in_rule__ComponentCommunicationType__Alternatives4850); 
+                    match(input,21,FOLLOW_2); 
 
                     }
 
@@ -7059,13 +7059,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__LiteralType__Alternatives"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2276:1: rule__LiteralType__Alternatives : ( ( ( 'ptBoolean' ) ) | ( ( 'ptInteger' ) ) | ( ( 'ptReal' ) ) | ( ( 'ptCharacter' ) ) );
+    // InternalFSM.g:2279:1: rule__LiteralType__Alternatives : ( ( ( 'ptBoolean' ) ) | ( ( 'ptInteger' ) ) | ( ( 'ptReal' ) ) | ( ( 'ptCharacter' ) ) );
     public final void rule__LiteralType__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2280:1: ( ( ( 'ptBoolean' ) ) | ( ( 'ptInteger' ) ) | ( ( 'ptReal' ) ) | ( ( 'ptCharacter' ) ) )
+            // InternalFSM.g:2283:1: ( ( ( 'ptBoolean' ) ) | ( ( 'ptInteger' ) ) | ( ( 'ptReal' ) ) | ( ( 'ptCharacter' ) ) )
             int alt28=4;
             switch ( input.LA(1) ) {
             case 22:
@@ -7097,16 +7097,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
             switch (alt28) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2281:1: ( ( 'ptBoolean' ) )
+                    // InternalFSM.g:2284:1: ( ( 'ptBoolean' ) )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2281:1: ( ( 'ptBoolean' ) )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2282:1: ( 'ptBoolean' )
+                    // InternalFSM.g:2284:1: ( ( 'ptBoolean' ) )
+                    // InternalFSM.g:2285:1: ( 'ptBoolean' )
                     {
                      before(grammarAccess.getLiteralTypeAccess().getBOOLEnumLiteralDeclaration_0()); 
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2283:1: ( 'ptBoolean' )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2283:3: 'ptBoolean'
+                    // InternalFSM.g:2286:1: ( 'ptBoolean' )
+                    // InternalFSM.g:2286:3: 'ptBoolean'
                     {
-                    match(input,22,FOLLOW_22_in_rule__LiteralType__Alternatives4886); 
+                    match(input,22,FOLLOW_2); 
 
                     }
 
@@ -7118,16 +7118,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2288:6: ( ( 'ptInteger' ) )
+                    // InternalFSM.g:2291:6: ( ( 'ptInteger' ) )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2288:6: ( ( 'ptInteger' ) )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2289:1: ( 'ptInteger' )
+                    // InternalFSM.g:2291:6: ( ( 'ptInteger' ) )
+                    // InternalFSM.g:2292:1: ( 'ptInteger' )
                     {
                      before(grammarAccess.getLiteralTypeAccess().getINTEnumLiteralDeclaration_1()); 
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2290:1: ( 'ptInteger' )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2290:3: 'ptInteger'
+                    // InternalFSM.g:2293:1: ( 'ptInteger' )
+                    // InternalFSM.g:2293:3: 'ptInteger'
                     {
-                    match(input,23,FOLLOW_23_in_rule__LiteralType__Alternatives4907); 
+                    match(input,23,FOLLOW_2); 
 
                     }
 
@@ -7139,16 +7139,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2295:6: ( ( 'ptReal' ) )
+                    // InternalFSM.g:2298:6: ( ( 'ptReal' ) )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2295:6: ( ( 'ptReal' ) )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2296:1: ( 'ptReal' )
+                    // InternalFSM.g:2298:6: ( ( 'ptReal' ) )
+                    // InternalFSM.g:2299:1: ( 'ptReal' )
                     {
                      before(grammarAccess.getLiteralTypeAccess().getREALEnumLiteralDeclaration_2()); 
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2297:1: ( 'ptReal' )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2297:3: 'ptReal'
+                    // InternalFSM.g:2300:1: ( 'ptReal' )
+                    // InternalFSM.g:2300:3: 'ptReal'
                     {
-                    match(input,24,FOLLOW_24_in_rule__LiteralType__Alternatives4928); 
+                    match(input,24,FOLLOW_2); 
 
                     }
 
@@ -7160,16 +7160,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 4 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2302:6: ( ( 'ptCharacter' ) )
+                    // InternalFSM.g:2305:6: ( ( 'ptCharacter' ) )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2302:6: ( ( 'ptCharacter' ) )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2303:1: ( 'ptCharacter' )
+                    // InternalFSM.g:2305:6: ( ( 'ptCharacter' ) )
+                    // InternalFSM.g:2306:1: ( 'ptCharacter' )
                     {
                      before(grammarAccess.getLiteralTypeAccess().getCHAREnumLiteralDeclaration_3()); 
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2304:1: ( 'ptCharacter' )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2304:3: 'ptCharacter'
+                    // InternalFSM.g:2307:1: ( 'ptCharacter' )
+                    // InternalFSM.g:2307:3: 'ptCharacter'
                     {
-                    match(input,25,FOLLOW_25_in_rule__LiteralType__Alternatives4949); 
+                    match(input,25,FOLLOW_2); 
 
                     }
 
@@ -7198,21 +7198,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ModelComponent__Group__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2316:1: rule__ModelComponent__Group__0 : rule__ModelComponent__Group__0__Impl rule__ModelComponent__Group__1 ;
+    // InternalFSM.g:2319:1: rule__ModelComponent__Group__0 : rule__ModelComponent__Group__0__Impl rule__ModelComponent__Group__1 ;
     public final void rule__ModelComponent__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2320:1: ( rule__ModelComponent__Group__0__Impl rule__ModelComponent__Group__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2321:2: rule__ModelComponent__Group__0__Impl rule__ModelComponent__Group__1
+            // InternalFSM.g:2323:1: ( rule__ModelComponent__Group__0__Impl rule__ModelComponent__Group__1 )
+            // InternalFSM.g:2324:2: rule__ModelComponent__Group__0__Impl rule__ModelComponent__Group__1
             {
-            pushFollow(FOLLOW_rule__ModelComponent__Group__0__Impl_in_rule__ModelComponent__Group__04982);
+            pushFollow(FOLLOW_4);
             rule__ModelComponent__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ModelComponent__Group__1_in_rule__ModelComponent__Group__04985);
+            pushFollow(FOLLOW_2);
             rule__ModelComponent__Group__1();
 
             state._fsp--;
@@ -7236,23 +7236,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ModelComponent__Group__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2328:1: rule__ModelComponent__Group__0__Impl : ( ( rule__ModelComponent__UnorderedGroup_0 ) ) ;
+    // InternalFSM.g:2331:1: rule__ModelComponent__Group__0__Impl : ( ( rule__ModelComponent__UnorderedGroup_0 ) ) ;
     public final void rule__ModelComponent__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2332:1: ( ( ( rule__ModelComponent__UnorderedGroup_0 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2333:1: ( ( rule__ModelComponent__UnorderedGroup_0 ) )
+            // InternalFSM.g:2335:1: ( ( ( rule__ModelComponent__UnorderedGroup_0 ) ) )
+            // InternalFSM.g:2336:1: ( ( rule__ModelComponent__UnorderedGroup_0 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2333:1: ( ( rule__ModelComponent__UnorderedGroup_0 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2334:1: ( rule__ModelComponent__UnorderedGroup_0 )
+            // InternalFSM.g:2336:1: ( ( rule__ModelComponent__UnorderedGroup_0 ) )
+            // InternalFSM.g:2337:1: ( rule__ModelComponent__UnorderedGroup_0 )
             {
              before(grammarAccess.getModelComponentAccess().getUnorderedGroup_0()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2335:1: ( rule__ModelComponent__UnorderedGroup_0 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2335:2: rule__ModelComponent__UnorderedGroup_0
+            // InternalFSM.g:2338:1: ( rule__ModelComponent__UnorderedGroup_0 )
+            // InternalFSM.g:2338:2: rule__ModelComponent__UnorderedGroup_0
             {
-            pushFollow(FOLLOW_rule__ModelComponent__UnorderedGroup_0_in_rule__ModelComponent__Group__0__Impl5012);
+            pushFollow(FOLLOW_2);
             rule__ModelComponent__UnorderedGroup_0();
 
             state._fsp--;
@@ -7283,21 +7283,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ModelComponent__Group__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2345:1: rule__ModelComponent__Group__1 : rule__ModelComponent__Group__1__Impl rule__ModelComponent__Group__2 ;
+    // InternalFSM.g:2348:1: rule__ModelComponent__Group__1 : rule__ModelComponent__Group__1__Impl rule__ModelComponent__Group__2 ;
     public final void rule__ModelComponent__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2349:1: ( rule__ModelComponent__Group__1__Impl rule__ModelComponent__Group__2 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2350:2: rule__ModelComponent__Group__1__Impl rule__ModelComponent__Group__2
+            // InternalFSM.g:2352:1: ( rule__ModelComponent__Group__1__Impl rule__ModelComponent__Group__2 )
+            // InternalFSM.g:2353:2: rule__ModelComponent__Group__1__Impl rule__ModelComponent__Group__2
             {
-            pushFollow(FOLLOW_rule__ModelComponent__Group__1__Impl_in_rule__ModelComponent__Group__15042);
+            pushFollow(FOLLOW_5);
             rule__ModelComponent__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ModelComponent__Group__2_in_rule__ModelComponent__Group__15045);
+            pushFollow(FOLLOW_2);
             rule__ModelComponent__Group__2();
 
             state._fsp--;
@@ -7321,20 +7321,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ModelComponent__Group__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2357:1: rule__ModelComponent__Group__1__Impl : ( 'ModelComponent' ) ;
+    // InternalFSM.g:2360:1: rule__ModelComponent__Group__1__Impl : ( 'ModelComponent' ) ;
     public final void rule__ModelComponent__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2361:1: ( ( 'ModelComponent' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2362:1: ( 'ModelComponent' )
+            // InternalFSM.g:2364:1: ( ( 'ModelComponent' ) )
+            // InternalFSM.g:2365:1: ( 'ModelComponent' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2362:1: ( 'ModelComponent' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2363:1: 'ModelComponent'
+            // InternalFSM.g:2365:1: ( 'ModelComponent' )
+            // InternalFSM.g:2366:1: 'ModelComponent'
             {
              before(grammarAccess.getModelComponentAccess().getModelComponentKeyword_1()); 
-            match(input,26,FOLLOW_26_in_rule__ModelComponent__Group__1__Impl5073); 
+            match(input,26,FOLLOW_2); 
              after(grammarAccess.getModelComponentAccess().getModelComponentKeyword_1()); 
 
             }
@@ -7358,21 +7358,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ModelComponent__Group__2"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2376:1: rule__ModelComponent__Group__2 : rule__ModelComponent__Group__2__Impl rule__ModelComponent__Group__3 ;
+    // InternalFSM.g:2379:1: rule__ModelComponent__Group__2 : rule__ModelComponent__Group__2__Impl rule__ModelComponent__Group__3 ;
     public final void rule__ModelComponent__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2380:1: ( rule__ModelComponent__Group__2__Impl rule__ModelComponent__Group__3 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2381:2: rule__ModelComponent__Group__2__Impl rule__ModelComponent__Group__3
+            // InternalFSM.g:2383:1: ( rule__ModelComponent__Group__2__Impl rule__ModelComponent__Group__3 )
+            // InternalFSM.g:2384:2: rule__ModelComponent__Group__2__Impl rule__ModelComponent__Group__3
             {
-            pushFollow(FOLLOW_rule__ModelComponent__Group__2__Impl_in_rule__ModelComponent__Group__25104);
+            pushFollow(FOLLOW_6);
             rule__ModelComponent__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ModelComponent__Group__3_in_rule__ModelComponent__Group__25107);
+            pushFollow(FOLLOW_2);
             rule__ModelComponent__Group__3();
 
             state._fsp--;
@@ -7396,23 +7396,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ModelComponent__Group__2__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2388:1: rule__ModelComponent__Group__2__Impl : ( ( rule__ModelComponent__ComponentNameAssignment_2 ) ) ;
+    // InternalFSM.g:2391:1: rule__ModelComponent__Group__2__Impl : ( ( rule__ModelComponent__ComponentNameAssignment_2 ) ) ;
     public final void rule__ModelComponent__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2392:1: ( ( ( rule__ModelComponent__ComponentNameAssignment_2 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2393:1: ( ( rule__ModelComponent__ComponentNameAssignment_2 ) )
+            // InternalFSM.g:2395:1: ( ( ( rule__ModelComponent__ComponentNameAssignment_2 ) ) )
+            // InternalFSM.g:2396:1: ( ( rule__ModelComponent__ComponentNameAssignment_2 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2393:1: ( ( rule__ModelComponent__ComponentNameAssignment_2 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2394:1: ( rule__ModelComponent__ComponentNameAssignment_2 )
+            // InternalFSM.g:2396:1: ( ( rule__ModelComponent__ComponentNameAssignment_2 ) )
+            // InternalFSM.g:2397:1: ( rule__ModelComponent__ComponentNameAssignment_2 )
             {
              before(grammarAccess.getModelComponentAccess().getComponentNameAssignment_2()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2395:1: ( rule__ModelComponent__ComponentNameAssignment_2 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2395:2: rule__ModelComponent__ComponentNameAssignment_2
+            // InternalFSM.g:2398:1: ( rule__ModelComponent__ComponentNameAssignment_2 )
+            // InternalFSM.g:2398:2: rule__ModelComponent__ComponentNameAssignment_2
             {
-            pushFollow(FOLLOW_rule__ModelComponent__ComponentNameAssignment_2_in_rule__ModelComponent__Group__2__Impl5134);
+            pushFollow(FOLLOW_2);
             rule__ModelComponent__ComponentNameAssignment_2();
 
             state._fsp--;
@@ -7443,21 +7443,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ModelComponent__Group__3"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2405:1: rule__ModelComponent__Group__3 : rule__ModelComponent__Group__3__Impl rule__ModelComponent__Group__4 ;
+    // InternalFSM.g:2408:1: rule__ModelComponent__Group__3 : rule__ModelComponent__Group__3__Impl rule__ModelComponent__Group__4 ;
     public final void rule__ModelComponent__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2409:1: ( rule__ModelComponent__Group__3__Impl rule__ModelComponent__Group__4 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2410:2: rule__ModelComponent__Group__3__Impl rule__ModelComponent__Group__4
+            // InternalFSM.g:2412:1: ( rule__ModelComponent__Group__3__Impl rule__ModelComponent__Group__4 )
+            // InternalFSM.g:2413:2: rule__ModelComponent__Group__3__Impl rule__ModelComponent__Group__4
             {
-            pushFollow(FOLLOW_rule__ModelComponent__Group__3__Impl_in_rule__ModelComponent__Group__35164);
+            pushFollow(FOLLOW_6);
             rule__ModelComponent__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ModelComponent__Group__4_in_rule__ModelComponent__Group__35167);
+            pushFollow(FOLLOW_2);
             rule__ModelComponent__Group__4();
 
             state._fsp--;
@@ -7481,20 +7481,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ModelComponent__Group__3__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2417:1: rule__ModelComponent__Group__3__Impl : ( ( rule__ModelComponent__Group_3__0 )? ) ;
+    // InternalFSM.g:2420:1: rule__ModelComponent__Group__3__Impl : ( ( rule__ModelComponent__Group_3__0 )? ) ;
     public final void rule__ModelComponent__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2421:1: ( ( ( rule__ModelComponent__Group_3__0 )? ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2422:1: ( ( rule__ModelComponent__Group_3__0 )? )
+            // InternalFSM.g:2424:1: ( ( ( rule__ModelComponent__Group_3__0 )? ) )
+            // InternalFSM.g:2425:1: ( ( rule__ModelComponent__Group_3__0 )? )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2422:1: ( ( rule__ModelComponent__Group_3__0 )? )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2423:1: ( rule__ModelComponent__Group_3__0 )?
+            // InternalFSM.g:2425:1: ( ( rule__ModelComponent__Group_3__0 )? )
+            // InternalFSM.g:2426:1: ( rule__ModelComponent__Group_3__0 )?
             {
              before(grammarAccess.getModelComponentAccess().getGroup_3()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2424:1: ( rule__ModelComponent__Group_3__0 )?
+            // InternalFSM.g:2427:1: ( rule__ModelComponent__Group_3__0 )?
             int alt29=2;
             int LA29_0 = input.LA(1);
 
@@ -7503,9 +7503,9 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt29) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2424:2: rule__ModelComponent__Group_3__0
+                    // InternalFSM.g:2427:2: rule__ModelComponent__Group_3__0
                     {
-                    pushFollow(FOLLOW_rule__ModelComponent__Group_3__0_in_rule__ModelComponent__Group__3__Impl5194);
+                    pushFollow(FOLLOW_2);
                     rule__ModelComponent__Group_3__0();
 
                     state._fsp--;
@@ -7539,16 +7539,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ModelComponent__Group__4"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2434:1: rule__ModelComponent__Group__4 : rule__ModelComponent__Group__4__Impl ;
+    // InternalFSM.g:2437:1: rule__ModelComponent__Group__4 : rule__ModelComponent__Group__4__Impl ;
     public final void rule__ModelComponent__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2438:1: ( rule__ModelComponent__Group__4__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2439:2: rule__ModelComponent__Group__4__Impl
+            // InternalFSM.g:2441:1: ( rule__ModelComponent__Group__4__Impl )
+            // InternalFSM.g:2442:2: rule__ModelComponent__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__ModelComponent__Group__4__Impl_in_rule__ModelComponent__Group__45225);
+            pushFollow(FOLLOW_2);
             rule__ModelComponent__Group__4__Impl();
 
             state._fsp--;
@@ -7572,23 +7572,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ModelComponent__Group__4__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2445:1: rule__ModelComponent__Group__4__Impl : ( ( rule__ModelComponent__StateMachineAssignment_4 ) ) ;
+    // InternalFSM.g:2448:1: rule__ModelComponent__Group__4__Impl : ( ( rule__ModelComponent__StateMachineAssignment_4 ) ) ;
     public final void rule__ModelComponent__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2449:1: ( ( ( rule__ModelComponent__StateMachineAssignment_4 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2450:1: ( ( rule__ModelComponent__StateMachineAssignment_4 ) )
+            // InternalFSM.g:2452:1: ( ( ( rule__ModelComponent__StateMachineAssignment_4 ) ) )
+            // InternalFSM.g:2453:1: ( ( rule__ModelComponent__StateMachineAssignment_4 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2450:1: ( ( rule__ModelComponent__StateMachineAssignment_4 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2451:1: ( rule__ModelComponent__StateMachineAssignment_4 )
+            // InternalFSM.g:2453:1: ( ( rule__ModelComponent__StateMachineAssignment_4 ) )
+            // InternalFSM.g:2454:1: ( rule__ModelComponent__StateMachineAssignment_4 )
             {
              before(grammarAccess.getModelComponentAccess().getStateMachineAssignment_4()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2452:1: ( rule__ModelComponent__StateMachineAssignment_4 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2452:2: rule__ModelComponent__StateMachineAssignment_4
+            // InternalFSM.g:2455:1: ( rule__ModelComponent__StateMachineAssignment_4 )
+            // InternalFSM.g:2455:2: rule__ModelComponent__StateMachineAssignment_4
             {
-            pushFollow(FOLLOW_rule__ModelComponent__StateMachineAssignment_4_in_rule__ModelComponent__Group__4__Impl5252);
+            pushFollow(FOLLOW_2);
             rule__ModelComponent__StateMachineAssignment_4();
 
             state._fsp--;
@@ -7619,21 +7619,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ModelComponent__Group_3__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2472:1: rule__ModelComponent__Group_3__0 : rule__ModelComponent__Group_3__0__Impl rule__ModelComponent__Group_3__1 ;
+    // InternalFSM.g:2475:1: rule__ModelComponent__Group_3__0 : rule__ModelComponent__Group_3__0__Impl rule__ModelComponent__Group_3__1 ;
     public final void rule__ModelComponent__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2476:1: ( rule__ModelComponent__Group_3__0__Impl rule__ModelComponent__Group_3__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2477:2: rule__ModelComponent__Group_3__0__Impl rule__ModelComponent__Group_3__1
+            // InternalFSM.g:2479:1: ( rule__ModelComponent__Group_3__0__Impl rule__ModelComponent__Group_3__1 )
+            // InternalFSM.g:2480:2: rule__ModelComponent__Group_3__0__Impl rule__ModelComponent__Group_3__1
             {
-            pushFollow(FOLLOW_rule__ModelComponent__Group_3__0__Impl_in_rule__ModelComponent__Group_3__05292);
+            pushFollow(FOLLOW_5);
             rule__ModelComponent__Group_3__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ModelComponent__Group_3__1_in_rule__ModelComponent__Group_3__05295);
+            pushFollow(FOLLOW_2);
             rule__ModelComponent__Group_3__1();
 
             state._fsp--;
@@ -7657,20 +7657,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ModelComponent__Group_3__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2484:1: rule__ModelComponent__Group_3__0__Impl : ( 'extends' ) ;
+    // InternalFSM.g:2487:1: rule__ModelComponent__Group_3__0__Impl : ( 'extends' ) ;
     public final void rule__ModelComponent__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2488:1: ( ( 'extends' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2489:1: ( 'extends' )
+            // InternalFSM.g:2491:1: ( ( 'extends' ) )
+            // InternalFSM.g:2492:1: ( 'extends' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2489:1: ( 'extends' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2490:1: 'extends'
+            // InternalFSM.g:2492:1: ( 'extends' )
+            // InternalFSM.g:2493:1: 'extends'
             {
              before(grammarAccess.getModelComponentAccess().getExtendsKeyword_3_0()); 
-            match(input,27,FOLLOW_27_in_rule__ModelComponent__Group_3__0__Impl5323); 
+            match(input,27,FOLLOW_2); 
              after(grammarAccess.getModelComponentAccess().getExtendsKeyword_3_0()); 
 
             }
@@ -7694,16 +7694,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ModelComponent__Group_3__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2503:1: rule__ModelComponent__Group_3__1 : rule__ModelComponent__Group_3__1__Impl ;
+    // InternalFSM.g:2506:1: rule__ModelComponent__Group_3__1 : rule__ModelComponent__Group_3__1__Impl ;
     public final void rule__ModelComponent__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2507:1: ( rule__ModelComponent__Group_3__1__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2508:2: rule__ModelComponent__Group_3__1__Impl
+            // InternalFSM.g:2510:1: ( rule__ModelComponent__Group_3__1__Impl )
+            // InternalFSM.g:2511:2: rule__ModelComponent__Group_3__1__Impl
             {
-            pushFollow(FOLLOW_rule__ModelComponent__Group_3__1__Impl_in_rule__ModelComponent__Group_3__15354);
+            pushFollow(FOLLOW_2);
             rule__ModelComponent__Group_3__1__Impl();
 
             state._fsp--;
@@ -7727,23 +7727,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ModelComponent__Group_3__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2514:1: rule__ModelComponent__Group_3__1__Impl : ( ( rule__ModelComponent__BaseAssignment_3_1 ) ) ;
+    // InternalFSM.g:2517:1: rule__ModelComponent__Group_3__1__Impl : ( ( rule__ModelComponent__BaseAssignment_3_1 ) ) ;
     public final void rule__ModelComponent__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2518:1: ( ( ( rule__ModelComponent__BaseAssignment_3_1 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2519:1: ( ( rule__ModelComponent__BaseAssignment_3_1 ) )
+            // InternalFSM.g:2521:1: ( ( ( rule__ModelComponent__BaseAssignment_3_1 ) ) )
+            // InternalFSM.g:2522:1: ( ( rule__ModelComponent__BaseAssignment_3_1 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2519:1: ( ( rule__ModelComponent__BaseAssignment_3_1 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2520:1: ( rule__ModelComponent__BaseAssignment_3_1 )
+            // InternalFSM.g:2522:1: ( ( rule__ModelComponent__BaseAssignment_3_1 ) )
+            // InternalFSM.g:2523:1: ( rule__ModelComponent__BaseAssignment_3_1 )
             {
              before(grammarAccess.getModelComponentAccess().getBaseAssignment_3_1()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2521:1: ( rule__ModelComponent__BaseAssignment_3_1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2521:2: rule__ModelComponent__BaseAssignment_3_1
+            // InternalFSM.g:2524:1: ( rule__ModelComponent__BaseAssignment_3_1 )
+            // InternalFSM.g:2524:2: rule__ModelComponent__BaseAssignment_3_1
             {
-            pushFollow(FOLLOW_rule__ModelComponent__BaseAssignment_3_1_in_rule__ModelComponent__Group_3__1__Impl5381);
+            pushFollow(FOLLOW_2);
             rule__ModelComponent__BaseAssignment_3_1();
 
             state._fsp--;
@@ -7774,21 +7774,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateGraph__Group__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2535:1: rule__StateGraph__Group__0 : rule__StateGraph__Group__0__Impl rule__StateGraph__Group__1 ;
+    // InternalFSM.g:2538:1: rule__StateGraph__Group__0 : rule__StateGraph__Group__0__Impl rule__StateGraph__Group__1 ;
     public final void rule__StateGraph__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2539:1: ( rule__StateGraph__Group__0__Impl rule__StateGraph__Group__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2540:2: rule__StateGraph__Group__0__Impl rule__StateGraph__Group__1
+            // InternalFSM.g:2542:1: ( rule__StateGraph__Group__0__Impl rule__StateGraph__Group__1 )
+            // InternalFSM.g:2543:2: rule__StateGraph__Group__0__Impl rule__StateGraph__Group__1
             {
-            pushFollow(FOLLOW_rule__StateGraph__Group__0__Impl_in_rule__StateGraph__Group__05415);
+            pushFollow(FOLLOW_7);
             rule__StateGraph__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__StateGraph__Group__1_in_rule__StateGraph__Group__05418);
+            pushFollow(FOLLOW_2);
             rule__StateGraph__Group__1();
 
             state._fsp--;
@@ -7812,21 +7812,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateGraph__Group__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2547:1: rule__StateGraph__Group__0__Impl : ( () ) ;
+    // InternalFSM.g:2550:1: rule__StateGraph__Group__0__Impl : ( () ) ;
     public final void rule__StateGraph__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2551:1: ( ( () ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2552:1: ( () )
+            // InternalFSM.g:2554:1: ( ( () ) )
+            // InternalFSM.g:2555:1: ( () )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2552:1: ( () )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2553:1: ()
+            // InternalFSM.g:2555:1: ( () )
+            // InternalFSM.g:2556:1: ()
             {
              before(grammarAccess.getStateGraphAccess().getStateGraphAction_0()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2554:1: ()
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2556:1: 
+            // InternalFSM.g:2557:1: ()
+            // InternalFSM.g:2559:1: 
             {
             }
 
@@ -7849,21 +7849,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateGraph__Group__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2566:1: rule__StateGraph__Group__1 : rule__StateGraph__Group__1__Impl rule__StateGraph__Group__2 ;
+    // InternalFSM.g:2569:1: rule__StateGraph__Group__1 : rule__StateGraph__Group__1__Impl rule__StateGraph__Group__2 ;
     public final void rule__StateGraph__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2570:1: ( rule__StateGraph__Group__1__Impl rule__StateGraph__Group__2 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2571:2: rule__StateGraph__Group__1__Impl rule__StateGraph__Group__2
+            // InternalFSM.g:2573:1: ( rule__StateGraph__Group__1__Impl rule__StateGraph__Group__2 )
+            // InternalFSM.g:2574:2: rule__StateGraph__Group__1__Impl rule__StateGraph__Group__2
             {
-            pushFollow(FOLLOW_rule__StateGraph__Group__1__Impl_in_rule__StateGraph__Group__15476);
+            pushFollow(FOLLOW_8);
             rule__StateGraph__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__StateGraph__Group__2_in_rule__StateGraph__Group__15479);
+            pushFollow(FOLLOW_2);
             rule__StateGraph__Group__2();
 
             state._fsp--;
@@ -7887,20 +7887,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateGraph__Group__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2578:1: rule__StateGraph__Group__1__Impl : ( '{' ) ;
+    // InternalFSM.g:2581:1: rule__StateGraph__Group__1__Impl : ( '{' ) ;
     public final void rule__StateGraph__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2582:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2583:1: ( '{' )
+            // InternalFSM.g:2585:1: ( ( '{' ) )
+            // InternalFSM.g:2586:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2583:1: ( '{' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2584:1: '{'
+            // InternalFSM.g:2586:1: ( '{' )
+            // InternalFSM.g:2587:1: '{'
             {
              before(grammarAccess.getStateGraphAccess().getLeftCurlyBracketKeyword_1()); 
-            match(input,28,FOLLOW_28_in_rule__StateGraph__Group__1__Impl5507); 
+            match(input,28,FOLLOW_2); 
              after(grammarAccess.getStateGraphAccess().getLeftCurlyBracketKeyword_1()); 
 
             }
@@ -7924,21 +7924,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateGraph__Group__2"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2597:1: rule__StateGraph__Group__2 : rule__StateGraph__Group__2__Impl rule__StateGraph__Group__3 ;
+    // InternalFSM.g:2600:1: rule__StateGraph__Group__2 : rule__StateGraph__Group__2__Impl rule__StateGraph__Group__3 ;
     public final void rule__StateGraph__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2601:1: ( rule__StateGraph__Group__2__Impl rule__StateGraph__Group__3 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2602:2: rule__StateGraph__Group__2__Impl rule__StateGraph__Group__3
+            // InternalFSM.g:2604:1: ( rule__StateGraph__Group__2__Impl rule__StateGraph__Group__3 )
+            // InternalFSM.g:2605:2: rule__StateGraph__Group__2__Impl rule__StateGraph__Group__3
             {
-            pushFollow(FOLLOW_rule__StateGraph__Group__2__Impl_in_rule__StateGraph__Group__25538);
+            pushFollow(FOLLOW_8);
             rule__StateGraph__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__StateGraph__Group__3_in_rule__StateGraph__Group__25541);
+            pushFollow(FOLLOW_2);
             rule__StateGraph__Group__3();
 
             state._fsp--;
@@ -7962,20 +7962,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateGraph__Group__2__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2609:1: rule__StateGraph__Group__2__Impl : ( ( rule__StateGraph__Alternatives_2 )* ) ;
+    // InternalFSM.g:2612:1: rule__StateGraph__Group__2__Impl : ( ( rule__StateGraph__Alternatives_2 )* ) ;
     public final void rule__StateGraph__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2613:1: ( ( ( rule__StateGraph__Alternatives_2 )* ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2614:1: ( ( rule__StateGraph__Alternatives_2 )* )
+            // InternalFSM.g:2616:1: ( ( ( rule__StateGraph__Alternatives_2 )* ) )
+            // InternalFSM.g:2617:1: ( ( rule__StateGraph__Alternatives_2 )* )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2614:1: ( ( rule__StateGraph__Alternatives_2 )* )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2615:1: ( rule__StateGraph__Alternatives_2 )*
+            // InternalFSM.g:2617:1: ( ( rule__StateGraph__Alternatives_2 )* )
+            // InternalFSM.g:2618:1: ( rule__StateGraph__Alternatives_2 )*
             {
              before(grammarAccess.getStateGraphAccess().getAlternatives_2()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2616:1: ( rule__StateGraph__Alternatives_2 )*
+            // InternalFSM.g:2619:1: ( rule__StateGraph__Alternatives_2 )*
             loop30:
             do {
                 int alt30=2;
@@ -7988,9 +7988,9 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
                 switch (alt30) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2616:2: rule__StateGraph__Alternatives_2
+            	    // InternalFSM.g:2619:2: rule__StateGraph__Alternatives_2
             	    {
-            	    pushFollow(FOLLOW_rule__StateGraph__Alternatives_2_in_rule__StateGraph__Group__2__Impl5568);
+            	    pushFollow(FOLLOW_9);
             	    rule__StateGraph__Alternatives_2();
 
             	    state._fsp--;
@@ -8027,16 +8027,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateGraph__Group__3"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2626:1: rule__StateGraph__Group__3 : rule__StateGraph__Group__3__Impl ;
+    // InternalFSM.g:2629:1: rule__StateGraph__Group__3 : rule__StateGraph__Group__3__Impl ;
     public final void rule__StateGraph__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2630:1: ( rule__StateGraph__Group__3__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2631:2: rule__StateGraph__Group__3__Impl
+            // InternalFSM.g:2633:1: ( rule__StateGraph__Group__3__Impl )
+            // InternalFSM.g:2634:2: rule__StateGraph__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__StateGraph__Group__3__Impl_in_rule__StateGraph__Group__35599);
+            pushFollow(FOLLOW_2);
             rule__StateGraph__Group__3__Impl();
 
             state._fsp--;
@@ -8060,20 +8060,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateGraph__Group__3__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2637:1: rule__StateGraph__Group__3__Impl : ( '}' ) ;
+    // InternalFSM.g:2640:1: rule__StateGraph__Group__3__Impl : ( '}' ) ;
     public final void rule__StateGraph__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2641:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2642:1: ( '}' )
+            // InternalFSM.g:2644:1: ( ( '}' ) )
+            // InternalFSM.g:2645:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2642:1: ( '}' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2643:1: '}'
+            // InternalFSM.g:2645:1: ( '}' )
+            // InternalFSM.g:2646:1: '}'
             {
              before(grammarAccess.getStateGraphAccess().getRightCurlyBracketKeyword_3()); 
-            match(input,29,FOLLOW_29_in_rule__StateGraph__Group__3__Impl5627); 
+            match(input,29,FOLLOW_2); 
              after(grammarAccess.getStateGraphAccess().getRightCurlyBracketKeyword_3()); 
 
             }
@@ -8097,21 +8097,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateMachine__Group__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2664:1: rule__StateMachine__Group__0 : rule__StateMachine__Group__0__Impl rule__StateMachine__Group__1 ;
+    // InternalFSM.g:2667:1: rule__StateMachine__Group__0 : rule__StateMachine__Group__0__Impl rule__StateMachine__Group__1 ;
     public final void rule__StateMachine__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2668:1: ( rule__StateMachine__Group__0__Impl rule__StateMachine__Group__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2669:2: rule__StateMachine__Group__0__Impl rule__StateMachine__Group__1
+            // InternalFSM.g:2671:1: ( rule__StateMachine__Group__0__Impl rule__StateMachine__Group__1 )
+            // InternalFSM.g:2672:2: rule__StateMachine__Group__0__Impl rule__StateMachine__Group__1
             {
-            pushFollow(FOLLOW_rule__StateMachine__Group__0__Impl_in_rule__StateMachine__Group__05666);
+            pushFollow(FOLLOW_6);
             rule__StateMachine__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__StateMachine__Group__1_in_rule__StateMachine__Group__05669);
+            pushFollow(FOLLOW_2);
             rule__StateMachine__Group__1();
 
             state._fsp--;
@@ -8135,21 +8135,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateMachine__Group__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2676:1: rule__StateMachine__Group__0__Impl : ( () ) ;
+    // InternalFSM.g:2679:1: rule__StateMachine__Group__0__Impl : ( () ) ;
     public final void rule__StateMachine__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2680:1: ( ( () ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2681:1: ( () )
+            // InternalFSM.g:2683:1: ( ( () ) )
+            // InternalFSM.g:2684:1: ( () )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2681:1: ( () )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2682:1: ()
+            // InternalFSM.g:2684:1: ( () )
+            // InternalFSM.g:2685:1: ()
             {
              before(grammarAccess.getStateMachineAccess().getStateGraphAction_0()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2683:1: ()
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2685:1: 
+            // InternalFSM.g:2686:1: ()
+            // InternalFSM.g:2688:1: 
             {
             }
 
@@ -8172,21 +8172,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateMachine__Group__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2695:1: rule__StateMachine__Group__1 : rule__StateMachine__Group__1__Impl rule__StateMachine__Group__2 ;
+    // InternalFSM.g:2698:1: rule__StateMachine__Group__1 : rule__StateMachine__Group__1__Impl rule__StateMachine__Group__2 ;
     public final void rule__StateMachine__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2699:1: ( rule__StateMachine__Group__1__Impl rule__StateMachine__Group__2 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2700:2: rule__StateMachine__Group__1__Impl rule__StateMachine__Group__2
+            // InternalFSM.g:2702:1: ( rule__StateMachine__Group__1__Impl rule__StateMachine__Group__2 )
+            // InternalFSM.g:2703:2: rule__StateMachine__Group__1__Impl rule__StateMachine__Group__2
             {
-            pushFollow(FOLLOW_rule__StateMachine__Group__1__Impl_in_rule__StateMachine__Group__15727);
+            pushFollow(FOLLOW_7);
             rule__StateMachine__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__StateMachine__Group__2_in_rule__StateMachine__Group__15730);
+            pushFollow(FOLLOW_2);
             rule__StateMachine__Group__2();
 
             state._fsp--;
@@ -8210,20 +8210,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateMachine__Group__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2707:1: rule__StateMachine__Group__1__Impl : ( 'StateMachine' ) ;
+    // InternalFSM.g:2710:1: rule__StateMachine__Group__1__Impl : ( 'StateMachine' ) ;
     public final void rule__StateMachine__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2711:1: ( ( 'StateMachine' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2712:1: ( 'StateMachine' )
+            // InternalFSM.g:2714:1: ( ( 'StateMachine' ) )
+            // InternalFSM.g:2715:1: ( 'StateMachine' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2712:1: ( 'StateMachine' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2713:1: 'StateMachine'
+            // InternalFSM.g:2715:1: ( 'StateMachine' )
+            // InternalFSM.g:2716:1: 'StateMachine'
             {
              before(grammarAccess.getStateMachineAccess().getStateMachineKeyword_1()); 
-            match(input,30,FOLLOW_30_in_rule__StateMachine__Group__1__Impl5758); 
+            match(input,30,FOLLOW_2); 
              after(grammarAccess.getStateMachineAccess().getStateMachineKeyword_1()); 
 
             }
@@ -8247,21 +8247,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateMachine__Group__2"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2726:1: rule__StateMachine__Group__2 : rule__StateMachine__Group__2__Impl rule__StateMachine__Group__3 ;
+    // InternalFSM.g:2729:1: rule__StateMachine__Group__2 : rule__StateMachine__Group__2__Impl rule__StateMachine__Group__3 ;
     public final void rule__StateMachine__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2730:1: ( rule__StateMachine__Group__2__Impl rule__StateMachine__Group__3 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2731:2: rule__StateMachine__Group__2__Impl rule__StateMachine__Group__3
+            // InternalFSM.g:2733:1: ( rule__StateMachine__Group__2__Impl rule__StateMachine__Group__3 )
+            // InternalFSM.g:2734:2: rule__StateMachine__Group__2__Impl rule__StateMachine__Group__3
             {
-            pushFollow(FOLLOW_rule__StateMachine__Group__2__Impl_in_rule__StateMachine__Group__25789);
+            pushFollow(FOLLOW_8);
             rule__StateMachine__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__StateMachine__Group__3_in_rule__StateMachine__Group__25792);
+            pushFollow(FOLLOW_2);
             rule__StateMachine__Group__3();
 
             state._fsp--;
@@ -8285,20 +8285,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateMachine__Group__2__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2738:1: rule__StateMachine__Group__2__Impl : ( '{' ) ;
+    // InternalFSM.g:2741:1: rule__StateMachine__Group__2__Impl : ( '{' ) ;
     public final void rule__StateMachine__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2742:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2743:1: ( '{' )
+            // InternalFSM.g:2745:1: ( ( '{' ) )
+            // InternalFSM.g:2746:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2743:1: ( '{' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2744:1: '{'
+            // InternalFSM.g:2746:1: ( '{' )
+            // InternalFSM.g:2747:1: '{'
             {
              before(grammarAccess.getStateMachineAccess().getLeftCurlyBracketKeyword_2()); 
-            match(input,28,FOLLOW_28_in_rule__StateMachine__Group__2__Impl5820); 
+            match(input,28,FOLLOW_2); 
              after(grammarAccess.getStateMachineAccess().getLeftCurlyBracketKeyword_2()); 
 
             }
@@ -8322,21 +8322,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateMachine__Group__3"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2757:1: rule__StateMachine__Group__3 : rule__StateMachine__Group__3__Impl rule__StateMachine__Group__4 ;
+    // InternalFSM.g:2760:1: rule__StateMachine__Group__3 : rule__StateMachine__Group__3__Impl rule__StateMachine__Group__4 ;
     public final void rule__StateMachine__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2761:1: ( rule__StateMachine__Group__3__Impl rule__StateMachine__Group__4 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2762:2: rule__StateMachine__Group__3__Impl rule__StateMachine__Group__4
+            // InternalFSM.g:2764:1: ( rule__StateMachine__Group__3__Impl rule__StateMachine__Group__4 )
+            // InternalFSM.g:2765:2: rule__StateMachine__Group__3__Impl rule__StateMachine__Group__4
             {
-            pushFollow(FOLLOW_rule__StateMachine__Group__3__Impl_in_rule__StateMachine__Group__35851);
+            pushFollow(FOLLOW_8);
             rule__StateMachine__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__StateMachine__Group__4_in_rule__StateMachine__Group__35854);
+            pushFollow(FOLLOW_2);
             rule__StateMachine__Group__4();
 
             state._fsp--;
@@ -8360,20 +8360,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateMachine__Group__3__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2769:1: rule__StateMachine__Group__3__Impl : ( ( rule__StateMachine__Alternatives_3 )* ) ;
+    // InternalFSM.g:2772:1: rule__StateMachine__Group__3__Impl : ( ( rule__StateMachine__Alternatives_3 )* ) ;
     public final void rule__StateMachine__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2773:1: ( ( ( rule__StateMachine__Alternatives_3 )* ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2774:1: ( ( rule__StateMachine__Alternatives_3 )* )
+            // InternalFSM.g:2776:1: ( ( ( rule__StateMachine__Alternatives_3 )* ) )
+            // InternalFSM.g:2777:1: ( ( rule__StateMachine__Alternatives_3 )* )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2774:1: ( ( rule__StateMachine__Alternatives_3 )* )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2775:1: ( rule__StateMachine__Alternatives_3 )*
+            // InternalFSM.g:2777:1: ( ( rule__StateMachine__Alternatives_3 )* )
+            // InternalFSM.g:2778:1: ( rule__StateMachine__Alternatives_3 )*
             {
              before(grammarAccess.getStateMachineAccess().getAlternatives_3()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2776:1: ( rule__StateMachine__Alternatives_3 )*
+            // InternalFSM.g:2779:1: ( rule__StateMachine__Alternatives_3 )*
             loop31:
             do {
                 int alt31=2;
@@ -8386,9 +8386,9 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
                 switch (alt31) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2776:2: rule__StateMachine__Alternatives_3
+            	    // InternalFSM.g:2779:2: rule__StateMachine__Alternatives_3
             	    {
-            	    pushFollow(FOLLOW_rule__StateMachine__Alternatives_3_in_rule__StateMachine__Group__3__Impl5881);
+            	    pushFollow(FOLLOW_9);
             	    rule__StateMachine__Alternatives_3();
 
             	    state._fsp--;
@@ -8425,16 +8425,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateMachine__Group__4"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2786:1: rule__StateMachine__Group__4 : rule__StateMachine__Group__4__Impl ;
+    // InternalFSM.g:2789:1: rule__StateMachine__Group__4 : rule__StateMachine__Group__4__Impl ;
     public final void rule__StateMachine__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2790:1: ( rule__StateMachine__Group__4__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2791:2: rule__StateMachine__Group__4__Impl
+            // InternalFSM.g:2793:1: ( rule__StateMachine__Group__4__Impl )
+            // InternalFSM.g:2794:2: rule__StateMachine__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__StateMachine__Group__4__Impl_in_rule__StateMachine__Group__45912);
+            pushFollow(FOLLOW_2);
             rule__StateMachine__Group__4__Impl();
 
             state._fsp--;
@@ -8458,20 +8458,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateMachine__Group__4__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2797:1: rule__StateMachine__Group__4__Impl : ( '}' ) ;
+    // InternalFSM.g:2800:1: rule__StateMachine__Group__4__Impl : ( '}' ) ;
     public final void rule__StateMachine__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2801:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2802:1: ( '}' )
+            // InternalFSM.g:2804:1: ( ( '}' ) )
+            // InternalFSM.g:2805:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2802:1: ( '}' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2803:1: '}'
+            // InternalFSM.g:2805:1: ( '}' )
+            // InternalFSM.g:2806:1: '}'
             {
              before(grammarAccess.getStateMachineAccess().getRightCurlyBracketKeyword_4()); 
-            match(input,29,FOLLOW_29_in_rule__StateMachine__Group__4__Impl5940); 
+            match(input,29,FOLLOW_2); 
              after(grammarAccess.getStateMachineAccess().getRightCurlyBracketKeyword_4()); 
 
             }
@@ -8495,21 +8495,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2826:1: rule__SimpleState__Group__0 : rule__SimpleState__Group__0__Impl rule__SimpleState__Group__1 ;
+    // InternalFSM.g:2829:1: rule__SimpleState__Group__0 : rule__SimpleState__Group__0__Impl rule__SimpleState__Group__1 ;
     public final void rule__SimpleState__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2830:1: ( rule__SimpleState__Group__0__Impl rule__SimpleState__Group__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2831:2: rule__SimpleState__Group__0__Impl rule__SimpleState__Group__1
+            // InternalFSM.g:2833:1: ( rule__SimpleState__Group__0__Impl rule__SimpleState__Group__1 )
+            // InternalFSM.g:2834:2: rule__SimpleState__Group__0__Impl rule__SimpleState__Group__1
             {
-            pushFollow(FOLLOW_rule__SimpleState__Group__0__Impl_in_rule__SimpleState__Group__05981);
+            pushFollow(FOLLOW_5);
             rule__SimpleState__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SimpleState__Group__1_in_rule__SimpleState__Group__05984);
+            pushFollow(FOLLOW_2);
             rule__SimpleState__Group__1();
 
             state._fsp--;
@@ -8533,20 +8533,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2838:1: rule__SimpleState__Group__0__Impl : ( 'State' ) ;
+    // InternalFSM.g:2841:1: rule__SimpleState__Group__0__Impl : ( 'State' ) ;
     public final void rule__SimpleState__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2842:1: ( ( 'State' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2843:1: ( 'State' )
+            // InternalFSM.g:2845:1: ( ( 'State' ) )
+            // InternalFSM.g:2846:1: ( 'State' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2843:1: ( 'State' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2844:1: 'State'
+            // InternalFSM.g:2846:1: ( 'State' )
+            // InternalFSM.g:2847:1: 'State'
             {
              before(grammarAccess.getSimpleStateAccess().getStateKeyword_0()); 
-            match(input,31,FOLLOW_31_in_rule__SimpleState__Group__0__Impl6012); 
+            match(input,31,FOLLOW_2); 
              after(grammarAccess.getSimpleStateAccess().getStateKeyword_0()); 
 
             }
@@ -8570,21 +8570,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2857:1: rule__SimpleState__Group__1 : rule__SimpleState__Group__1__Impl rule__SimpleState__Group__2 ;
+    // InternalFSM.g:2860:1: rule__SimpleState__Group__1 : rule__SimpleState__Group__1__Impl rule__SimpleState__Group__2 ;
     public final void rule__SimpleState__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2861:1: ( rule__SimpleState__Group__1__Impl rule__SimpleState__Group__2 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2862:2: rule__SimpleState__Group__1__Impl rule__SimpleState__Group__2
+            // InternalFSM.g:2864:1: ( rule__SimpleState__Group__1__Impl rule__SimpleState__Group__2 )
+            // InternalFSM.g:2865:2: rule__SimpleState__Group__1__Impl rule__SimpleState__Group__2
             {
-            pushFollow(FOLLOW_rule__SimpleState__Group__1__Impl_in_rule__SimpleState__Group__16043);
+            pushFollow(FOLLOW_10);
             rule__SimpleState__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SimpleState__Group__2_in_rule__SimpleState__Group__16046);
+            pushFollow(FOLLOW_2);
             rule__SimpleState__Group__2();
 
             state._fsp--;
@@ -8608,23 +8608,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2869:1: rule__SimpleState__Group__1__Impl : ( ( rule__SimpleState__NameAssignment_1 ) ) ;
+    // InternalFSM.g:2872:1: rule__SimpleState__Group__1__Impl : ( ( rule__SimpleState__NameAssignment_1 ) ) ;
     public final void rule__SimpleState__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2873:1: ( ( ( rule__SimpleState__NameAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2874:1: ( ( rule__SimpleState__NameAssignment_1 ) )
+            // InternalFSM.g:2876:1: ( ( ( rule__SimpleState__NameAssignment_1 ) ) )
+            // InternalFSM.g:2877:1: ( ( rule__SimpleState__NameAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2874:1: ( ( rule__SimpleState__NameAssignment_1 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2875:1: ( rule__SimpleState__NameAssignment_1 )
+            // InternalFSM.g:2877:1: ( ( rule__SimpleState__NameAssignment_1 ) )
+            // InternalFSM.g:2878:1: ( rule__SimpleState__NameAssignment_1 )
             {
              before(grammarAccess.getSimpleStateAccess().getNameAssignment_1()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2876:1: ( rule__SimpleState__NameAssignment_1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2876:2: rule__SimpleState__NameAssignment_1
+            // InternalFSM.g:2879:1: ( rule__SimpleState__NameAssignment_1 )
+            // InternalFSM.g:2879:2: rule__SimpleState__NameAssignment_1
             {
-            pushFollow(FOLLOW_rule__SimpleState__NameAssignment_1_in_rule__SimpleState__Group__1__Impl6073);
+            pushFollow(FOLLOW_2);
             rule__SimpleState__NameAssignment_1();
 
             state._fsp--;
@@ -8655,21 +8655,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group__2"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2886:1: rule__SimpleState__Group__2 : rule__SimpleState__Group__2__Impl rule__SimpleState__Group__3 ;
+    // InternalFSM.g:2889:1: rule__SimpleState__Group__2 : rule__SimpleState__Group__2__Impl rule__SimpleState__Group__3 ;
     public final void rule__SimpleState__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2890:1: ( rule__SimpleState__Group__2__Impl rule__SimpleState__Group__3 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2891:2: rule__SimpleState__Group__2__Impl rule__SimpleState__Group__3
+            // InternalFSM.g:2893:1: ( rule__SimpleState__Group__2__Impl rule__SimpleState__Group__3 )
+            // InternalFSM.g:2894:2: rule__SimpleState__Group__2__Impl rule__SimpleState__Group__3
             {
-            pushFollow(FOLLOW_rule__SimpleState__Group__2__Impl_in_rule__SimpleState__Group__26103);
+            pushFollow(FOLLOW_10);
             rule__SimpleState__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SimpleState__Group__3_in_rule__SimpleState__Group__26106);
+            pushFollow(FOLLOW_2);
             rule__SimpleState__Group__3();
 
             state._fsp--;
@@ -8693,20 +8693,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group__2__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2898:1: rule__SimpleState__Group__2__Impl : ( ( rule__SimpleState__DocuAssignment_2 )? ) ;
+    // InternalFSM.g:2901:1: rule__SimpleState__Group__2__Impl : ( ( rule__SimpleState__DocuAssignment_2 )? ) ;
     public final void rule__SimpleState__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2902:1: ( ( ( rule__SimpleState__DocuAssignment_2 )? ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2903:1: ( ( rule__SimpleState__DocuAssignment_2 )? )
+            // InternalFSM.g:2905:1: ( ( ( rule__SimpleState__DocuAssignment_2 )? ) )
+            // InternalFSM.g:2906:1: ( ( rule__SimpleState__DocuAssignment_2 )? )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2903:1: ( ( rule__SimpleState__DocuAssignment_2 )? )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2904:1: ( rule__SimpleState__DocuAssignment_2 )?
+            // InternalFSM.g:2906:1: ( ( rule__SimpleState__DocuAssignment_2 )? )
+            // InternalFSM.g:2907:1: ( rule__SimpleState__DocuAssignment_2 )?
             {
              before(grammarAccess.getSimpleStateAccess().getDocuAssignment_2()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2905:1: ( rule__SimpleState__DocuAssignment_2 )?
+            // InternalFSM.g:2908:1: ( rule__SimpleState__DocuAssignment_2 )?
             int alt32=2;
             int LA32_0 = input.LA(1);
 
@@ -8715,9 +8715,9 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt32) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2905:2: rule__SimpleState__DocuAssignment_2
+                    // InternalFSM.g:2908:2: rule__SimpleState__DocuAssignment_2
                     {
-                    pushFollow(FOLLOW_rule__SimpleState__DocuAssignment_2_in_rule__SimpleState__Group__2__Impl6133);
+                    pushFollow(FOLLOW_2);
                     rule__SimpleState__DocuAssignment_2();
 
                     state._fsp--;
@@ -8751,16 +8751,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group__3"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2915:1: rule__SimpleState__Group__3 : rule__SimpleState__Group__3__Impl ;
+    // InternalFSM.g:2918:1: rule__SimpleState__Group__3 : rule__SimpleState__Group__3__Impl ;
     public final void rule__SimpleState__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2919:1: ( rule__SimpleState__Group__3__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2920:2: rule__SimpleState__Group__3__Impl
+            // InternalFSM.g:2922:1: ( rule__SimpleState__Group__3__Impl )
+            // InternalFSM.g:2923:2: rule__SimpleState__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__SimpleState__Group__3__Impl_in_rule__SimpleState__Group__36164);
+            pushFollow(FOLLOW_2);
             rule__SimpleState__Group__3__Impl();
 
             state._fsp--;
@@ -8784,20 +8784,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group__3__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2926:1: rule__SimpleState__Group__3__Impl : ( ( rule__SimpleState__Group_3__0 )? ) ;
+    // InternalFSM.g:2929:1: rule__SimpleState__Group__3__Impl : ( ( rule__SimpleState__Group_3__0 )? ) ;
     public final void rule__SimpleState__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2930:1: ( ( ( rule__SimpleState__Group_3__0 )? ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2931:1: ( ( rule__SimpleState__Group_3__0 )? )
+            // InternalFSM.g:2933:1: ( ( ( rule__SimpleState__Group_3__0 )? ) )
+            // InternalFSM.g:2934:1: ( ( rule__SimpleState__Group_3__0 )? )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2931:1: ( ( rule__SimpleState__Group_3__0 )? )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2932:1: ( rule__SimpleState__Group_3__0 )?
+            // InternalFSM.g:2934:1: ( ( rule__SimpleState__Group_3__0 )? )
+            // InternalFSM.g:2935:1: ( rule__SimpleState__Group_3__0 )?
             {
              before(grammarAccess.getSimpleStateAccess().getGroup_3()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2933:1: ( rule__SimpleState__Group_3__0 )?
+            // InternalFSM.g:2936:1: ( rule__SimpleState__Group_3__0 )?
             int alt33=2;
             int LA33_0 = input.LA(1);
 
@@ -8806,9 +8806,9 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt33) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2933:2: rule__SimpleState__Group_3__0
+                    // InternalFSM.g:2936:2: rule__SimpleState__Group_3__0
                     {
-                    pushFollow(FOLLOW_rule__SimpleState__Group_3__0_in_rule__SimpleState__Group__3__Impl6191);
+                    pushFollow(FOLLOW_2);
                     rule__SimpleState__Group_3__0();
 
                     state._fsp--;
@@ -8842,21 +8842,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2951:1: rule__SimpleState__Group_3__0 : rule__SimpleState__Group_3__0__Impl rule__SimpleState__Group_3__1 ;
+    // InternalFSM.g:2954:1: rule__SimpleState__Group_3__0 : rule__SimpleState__Group_3__0__Impl rule__SimpleState__Group_3__1 ;
     public final void rule__SimpleState__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2955:1: ( rule__SimpleState__Group_3__0__Impl rule__SimpleState__Group_3__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2956:2: rule__SimpleState__Group_3__0__Impl rule__SimpleState__Group_3__1
+            // InternalFSM.g:2958:1: ( rule__SimpleState__Group_3__0__Impl rule__SimpleState__Group_3__1 )
+            // InternalFSM.g:2959:2: rule__SimpleState__Group_3__0__Impl rule__SimpleState__Group_3__1
             {
-            pushFollow(FOLLOW_rule__SimpleState__Group_3__0__Impl_in_rule__SimpleState__Group_3__06230);
+            pushFollow(FOLLOW_11);
             rule__SimpleState__Group_3__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SimpleState__Group_3__1_in_rule__SimpleState__Group_3__06233);
+            pushFollow(FOLLOW_2);
             rule__SimpleState__Group_3__1();
 
             state._fsp--;
@@ -8880,20 +8880,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2963:1: rule__SimpleState__Group_3__0__Impl : ( '{' ) ;
+    // InternalFSM.g:2966:1: rule__SimpleState__Group_3__0__Impl : ( '{' ) ;
     public final void rule__SimpleState__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2967:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2968:1: ( '{' )
+            // InternalFSM.g:2970:1: ( ( '{' ) )
+            // InternalFSM.g:2971:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2968:1: ( '{' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2969:1: '{'
+            // InternalFSM.g:2971:1: ( '{' )
+            // InternalFSM.g:2972:1: '{'
             {
              before(grammarAccess.getSimpleStateAccess().getLeftCurlyBracketKeyword_3_0()); 
-            match(input,28,FOLLOW_28_in_rule__SimpleState__Group_3__0__Impl6261); 
+            match(input,28,FOLLOW_2); 
              after(grammarAccess.getSimpleStateAccess().getLeftCurlyBracketKeyword_3_0()); 
 
             }
@@ -8917,21 +8917,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2982:1: rule__SimpleState__Group_3__1 : rule__SimpleState__Group_3__1__Impl rule__SimpleState__Group_3__2 ;
+    // InternalFSM.g:2985:1: rule__SimpleState__Group_3__1 : rule__SimpleState__Group_3__1__Impl rule__SimpleState__Group_3__2 ;
     public final void rule__SimpleState__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2986:1: ( rule__SimpleState__Group_3__1__Impl rule__SimpleState__Group_3__2 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2987:2: rule__SimpleState__Group_3__1__Impl rule__SimpleState__Group_3__2
+            // InternalFSM.g:2989:1: ( rule__SimpleState__Group_3__1__Impl rule__SimpleState__Group_3__2 )
+            // InternalFSM.g:2990:2: rule__SimpleState__Group_3__1__Impl rule__SimpleState__Group_3__2
             {
-            pushFollow(FOLLOW_rule__SimpleState__Group_3__1__Impl_in_rule__SimpleState__Group_3__16292);
+            pushFollow(FOLLOW_11);
             rule__SimpleState__Group_3__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SimpleState__Group_3__2_in_rule__SimpleState__Group_3__16295);
+            pushFollow(FOLLOW_2);
             rule__SimpleState__Group_3__2();
 
             state._fsp--;
@@ -8955,20 +8955,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2994:1: rule__SimpleState__Group_3__1__Impl : ( ( rule__SimpleState__Group_3_1__0 )? ) ;
+    // InternalFSM.g:2997:1: rule__SimpleState__Group_3__1__Impl : ( ( rule__SimpleState__Group_3_1__0 )? ) ;
     public final void rule__SimpleState__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2998:1: ( ( ( rule__SimpleState__Group_3_1__0 )? ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2999:1: ( ( rule__SimpleState__Group_3_1__0 )? )
+            // InternalFSM.g:3001:1: ( ( ( rule__SimpleState__Group_3_1__0 )? ) )
+            // InternalFSM.g:3002:1: ( ( rule__SimpleState__Group_3_1__0 )? )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:2999:1: ( ( rule__SimpleState__Group_3_1__0 )? )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3000:1: ( rule__SimpleState__Group_3_1__0 )?
+            // InternalFSM.g:3002:1: ( ( rule__SimpleState__Group_3_1__0 )? )
+            // InternalFSM.g:3003:1: ( rule__SimpleState__Group_3_1__0 )?
             {
              before(grammarAccess.getSimpleStateAccess().getGroup_3_1()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3001:1: ( rule__SimpleState__Group_3_1__0 )?
+            // InternalFSM.g:3004:1: ( rule__SimpleState__Group_3_1__0 )?
             int alt34=2;
             int LA34_0 = input.LA(1);
 
@@ -8977,9 +8977,9 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt34) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3001:2: rule__SimpleState__Group_3_1__0
+                    // InternalFSM.g:3004:2: rule__SimpleState__Group_3_1__0
                     {
-                    pushFollow(FOLLOW_rule__SimpleState__Group_3_1__0_in_rule__SimpleState__Group_3__1__Impl6322);
+                    pushFollow(FOLLOW_2);
                     rule__SimpleState__Group_3_1__0();
 
                     state._fsp--;
@@ -9013,21 +9013,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3__2"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3011:1: rule__SimpleState__Group_3__2 : rule__SimpleState__Group_3__2__Impl rule__SimpleState__Group_3__3 ;
+    // InternalFSM.g:3014:1: rule__SimpleState__Group_3__2 : rule__SimpleState__Group_3__2__Impl rule__SimpleState__Group_3__3 ;
     public final void rule__SimpleState__Group_3__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3015:1: ( rule__SimpleState__Group_3__2__Impl rule__SimpleState__Group_3__3 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3016:2: rule__SimpleState__Group_3__2__Impl rule__SimpleState__Group_3__3
+            // InternalFSM.g:3018:1: ( rule__SimpleState__Group_3__2__Impl rule__SimpleState__Group_3__3 )
+            // InternalFSM.g:3019:2: rule__SimpleState__Group_3__2__Impl rule__SimpleState__Group_3__3
             {
-            pushFollow(FOLLOW_rule__SimpleState__Group_3__2__Impl_in_rule__SimpleState__Group_3__26353);
+            pushFollow(FOLLOW_11);
             rule__SimpleState__Group_3__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SimpleState__Group_3__3_in_rule__SimpleState__Group_3__26356);
+            pushFollow(FOLLOW_2);
             rule__SimpleState__Group_3__3();
 
             state._fsp--;
@@ -9051,20 +9051,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3__2__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3023:1: rule__SimpleState__Group_3__2__Impl : ( ( rule__SimpleState__Group_3_2__0 )? ) ;
+    // InternalFSM.g:3026:1: rule__SimpleState__Group_3__2__Impl : ( ( rule__SimpleState__Group_3_2__0 )? ) ;
     public final void rule__SimpleState__Group_3__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3027:1: ( ( ( rule__SimpleState__Group_3_2__0 )? ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3028:1: ( ( rule__SimpleState__Group_3_2__0 )? )
+            // InternalFSM.g:3030:1: ( ( ( rule__SimpleState__Group_3_2__0 )? ) )
+            // InternalFSM.g:3031:1: ( ( rule__SimpleState__Group_3_2__0 )? )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3028:1: ( ( rule__SimpleState__Group_3_2__0 )? )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3029:1: ( rule__SimpleState__Group_3_2__0 )?
+            // InternalFSM.g:3031:1: ( ( rule__SimpleState__Group_3_2__0 )? )
+            // InternalFSM.g:3032:1: ( rule__SimpleState__Group_3_2__0 )?
             {
              before(grammarAccess.getSimpleStateAccess().getGroup_3_2()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3030:1: ( rule__SimpleState__Group_3_2__0 )?
+            // InternalFSM.g:3033:1: ( rule__SimpleState__Group_3_2__0 )?
             int alt35=2;
             int LA35_0 = input.LA(1);
 
@@ -9073,9 +9073,9 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt35) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3030:2: rule__SimpleState__Group_3_2__0
+                    // InternalFSM.g:3033:2: rule__SimpleState__Group_3_2__0
                     {
-                    pushFollow(FOLLOW_rule__SimpleState__Group_3_2__0_in_rule__SimpleState__Group_3__2__Impl6383);
+                    pushFollow(FOLLOW_2);
                     rule__SimpleState__Group_3_2__0();
 
                     state._fsp--;
@@ -9109,21 +9109,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3__3"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3040:1: rule__SimpleState__Group_3__3 : rule__SimpleState__Group_3__3__Impl rule__SimpleState__Group_3__4 ;
+    // InternalFSM.g:3043:1: rule__SimpleState__Group_3__3 : rule__SimpleState__Group_3__3__Impl rule__SimpleState__Group_3__4 ;
     public final void rule__SimpleState__Group_3__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3044:1: ( rule__SimpleState__Group_3__3__Impl rule__SimpleState__Group_3__4 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3045:2: rule__SimpleState__Group_3__3__Impl rule__SimpleState__Group_3__4
+            // InternalFSM.g:3047:1: ( rule__SimpleState__Group_3__3__Impl rule__SimpleState__Group_3__4 )
+            // InternalFSM.g:3048:2: rule__SimpleState__Group_3__3__Impl rule__SimpleState__Group_3__4
             {
-            pushFollow(FOLLOW_rule__SimpleState__Group_3__3__Impl_in_rule__SimpleState__Group_3__36414);
+            pushFollow(FOLLOW_11);
             rule__SimpleState__Group_3__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SimpleState__Group_3__4_in_rule__SimpleState__Group_3__36417);
+            pushFollow(FOLLOW_2);
             rule__SimpleState__Group_3__4();
 
             state._fsp--;
@@ -9147,20 +9147,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3__3__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3052:1: rule__SimpleState__Group_3__3__Impl : ( ( rule__SimpleState__Group_3_3__0 )? ) ;
+    // InternalFSM.g:3055:1: rule__SimpleState__Group_3__3__Impl : ( ( rule__SimpleState__Group_3_3__0 )? ) ;
     public final void rule__SimpleState__Group_3__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3056:1: ( ( ( rule__SimpleState__Group_3_3__0 )? ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3057:1: ( ( rule__SimpleState__Group_3_3__0 )? )
+            // InternalFSM.g:3059:1: ( ( ( rule__SimpleState__Group_3_3__0 )? ) )
+            // InternalFSM.g:3060:1: ( ( rule__SimpleState__Group_3_3__0 )? )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3057:1: ( ( rule__SimpleState__Group_3_3__0 )? )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3058:1: ( rule__SimpleState__Group_3_3__0 )?
+            // InternalFSM.g:3060:1: ( ( rule__SimpleState__Group_3_3__0 )? )
+            // InternalFSM.g:3061:1: ( rule__SimpleState__Group_3_3__0 )?
             {
              before(grammarAccess.getSimpleStateAccess().getGroup_3_3()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3059:1: ( rule__SimpleState__Group_3_3__0 )?
+            // InternalFSM.g:3062:1: ( rule__SimpleState__Group_3_3__0 )?
             int alt36=2;
             int LA36_0 = input.LA(1);
 
@@ -9169,9 +9169,9 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt36) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3059:2: rule__SimpleState__Group_3_3__0
+                    // InternalFSM.g:3062:2: rule__SimpleState__Group_3_3__0
                     {
-                    pushFollow(FOLLOW_rule__SimpleState__Group_3_3__0_in_rule__SimpleState__Group_3__3__Impl6444);
+                    pushFollow(FOLLOW_2);
                     rule__SimpleState__Group_3_3__0();
 
                     state._fsp--;
@@ -9205,21 +9205,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3__4"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3069:1: rule__SimpleState__Group_3__4 : rule__SimpleState__Group_3__4__Impl rule__SimpleState__Group_3__5 ;
+    // InternalFSM.g:3072:1: rule__SimpleState__Group_3__4 : rule__SimpleState__Group_3__4__Impl rule__SimpleState__Group_3__5 ;
     public final void rule__SimpleState__Group_3__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3073:1: ( rule__SimpleState__Group_3__4__Impl rule__SimpleState__Group_3__5 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3074:2: rule__SimpleState__Group_3__4__Impl rule__SimpleState__Group_3__5
+            // InternalFSM.g:3076:1: ( rule__SimpleState__Group_3__4__Impl rule__SimpleState__Group_3__5 )
+            // InternalFSM.g:3077:2: rule__SimpleState__Group_3__4__Impl rule__SimpleState__Group_3__5
             {
-            pushFollow(FOLLOW_rule__SimpleState__Group_3__4__Impl_in_rule__SimpleState__Group_3__46475);
+            pushFollow(FOLLOW_11);
             rule__SimpleState__Group_3__4__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SimpleState__Group_3__5_in_rule__SimpleState__Group_3__46478);
+            pushFollow(FOLLOW_2);
             rule__SimpleState__Group_3__5();
 
             state._fsp--;
@@ -9243,20 +9243,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3__4__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3081:1: rule__SimpleState__Group_3__4__Impl : ( ( rule__SimpleState__Group_3_4__0 )? ) ;
+    // InternalFSM.g:3084:1: rule__SimpleState__Group_3__4__Impl : ( ( rule__SimpleState__Group_3_4__0 )? ) ;
     public final void rule__SimpleState__Group_3__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3085:1: ( ( ( rule__SimpleState__Group_3_4__0 )? ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3086:1: ( ( rule__SimpleState__Group_3_4__0 )? )
+            // InternalFSM.g:3088:1: ( ( ( rule__SimpleState__Group_3_4__0 )? ) )
+            // InternalFSM.g:3089:1: ( ( rule__SimpleState__Group_3_4__0 )? )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3086:1: ( ( rule__SimpleState__Group_3_4__0 )? )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3087:1: ( rule__SimpleState__Group_3_4__0 )?
+            // InternalFSM.g:3089:1: ( ( rule__SimpleState__Group_3_4__0 )? )
+            // InternalFSM.g:3090:1: ( rule__SimpleState__Group_3_4__0 )?
             {
              before(grammarAccess.getSimpleStateAccess().getGroup_3_4()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3088:1: ( rule__SimpleState__Group_3_4__0 )?
+            // InternalFSM.g:3091:1: ( rule__SimpleState__Group_3_4__0 )?
             int alt37=2;
             int LA37_0 = input.LA(1);
 
@@ -9265,9 +9265,9 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt37) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3088:2: rule__SimpleState__Group_3_4__0
+                    // InternalFSM.g:3091:2: rule__SimpleState__Group_3_4__0
                     {
-                    pushFollow(FOLLOW_rule__SimpleState__Group_3_4__0_in_rule__SimpleState__Group_3__4__Impl6505);
+                    pushFollow(FOLLOW_2);
                     rule__SimpleState__Group_3_4__0();
 
                     state._fsp--;
@@ -9301,16 +9301,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3__5"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3098:1: rule__SimpleState__Group_3__5 : rule__SimpleState__Group_3__5__Impl ;
+    // InternalFSM.g:3101:1: rule__SimpleState__Group_3__5 : rule__SimpleState__Group_3__5__Impl ;
     public final void rule__SimpleState__Group_3__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3102:1: ( rule__SimpleState__Group_3__5__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3103:2: rule__SimpleState__Group_3__5__Impl
+            // InternalFSM.g:3105:1: ( rule__SimpleState__Group_3__5__Impl )
+            // InternalFSM.g:3106:2: rule__SimpleState__Group_3__5__Impl
             {
-            pushFollow(FOLLOW_rule__SimpleState__Group_3__5__Impl_in_rule__SimpleState__Group_3__56536);
+            pushFollow(FOLLOW_2);
             rule__SimpleState__Group_3__5__Impl();
 
             state._fsp--;
@@ -9334,20 +9334,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3__5__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3109:1: rule__SimpleState__Group_3__5__Impl : ( '}' ) ;
+    // InternalFSM.g:3112:1: rule__SimpleState__Group_3__5__Impl : ( '}' ) ;
     public final void rule__SimpleState__Group_3__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3113:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3114:1: ( '}' )
+            // InternalFSM.g:3116:1: ( ( '}' ) )
+            // InternalFSM.g:3117:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3114:1: ( '}' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3115:1: '}'
+            // InternalFSM.g:3117:1: ( '}' )
+            // InternalFSM.g:3118:1: '}'
             {
              before(grammarAccess.getSimpleStateAccess().getRightCurlyBracketKeyword_3_5()); 
-            match(input,29,FOLLOW_29_in_rule__SimpleState__Group_3__5__Impl6564); 
+            match(input,29,FOLLOW_2); 
              after(grammarAccess.getSimpleStateAccess().getRightCurlyBracketKeyword_3_5()); 
 
             }
@@ -9371,21 +9371,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3_1__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3140:1: rule__SimpleState__Group_3_1__0 : rule__SimpleState__Group_3_1__0__Impl rule__SimpleState__Group_3_1__1 ;
+    // InternalFSM.g:3143:1: rule__SimpleState__Group_3_1__0 : rule__SimpleState__Group_3_1__0__Impl rule__SimpleState__Group_3_1__1 ;
     public final void rule__SimpleState__Group_3_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3144:1: ( rule__SimpleState__Group_3_1__0__Impl rule__SimpleState__Group_3_1__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3145:2: rule__SimpleState__Group_3_1__0__Impl rule__SimpleState__Group_3_1__1
+            // InternalFSM.g:3147:1: ( rule__SimpleState__Group_3_1__0__Impl rule__SimpleState__Group_3_1__1 )
+            // InternalFSM.g:3148:2: rule__SimpleState__Group_3_1__0__Impl rule__SimpleState__Group_3_1__1
             {
-            pushFollow(FOLLOW_rule__SimpleState__Group_3_1__0__Impl_in_rule__SimpleState__Group_3_1__06607);
+            pushFollow(FOLLOW_7);
             rule__SimpleState__Group_3_1__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SimpleState__Group_3_1__1_in_rule__SimpleState__Group_3_1__06610);
+            pushFollow(FOLLOW_2);
             rule__SimpleState__Group_3_1__1();
 
             state._fsp--;
@@ -9409,20 +9409,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3_1__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3152:1: rule__SimpleState__Group_3_1__0__Impl : ( 'entry' ) ;
+    // InternalFSM.g:3155:1: rule__SimpleState__Group_3_1__0__Impl : ( 'entry' ) ;
     public final void rule__SimpleState__Group_3_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3156:1: ( ( 'entry' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3157:1: ( 'entry' )
+            // InternalFSM.g:3159:1: ( ( 'entry' ) )
+            // InternalFSM.g:3160:1: ( 'entry' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3157:1: ( 'entry' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3158:1: 'entry'
+            // InternalFSM.g:3160:1: ( 'entry' )
+            // InternalFSM.g:3161:1: 'entry'
             {
              before(grammarAccess.getSimpleStateAccess().getEntryKeyword_3_1_0()); 
-            match(input,32,FOLLOW_32_in_rule__SimpleState__Group_3_1__0__Impl6638); 
+            match(input,32,FOLLOW_2); 
              after(grammarAccess.getSimpleStateAccess().getEntryKeyword_3_1_0()); 
 
             }
@@ -9446,16 +9446,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3_1__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3171:1: rule__SimpleState__Group_3_1__1 : rule__SimpleState__Group_3_1__1__Impl ;
+    // InternalFSM.g:3174:1: rule__SimpleState__Group_3_1__1 : rule__SimpleState__Group_3_1__1__Impl ;
     public final void rule__SimpleState__Group_3_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3175:1: ( rule__SimpleState__Group_3_1__1__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3176:2: rule__SimpleState__Group_3_1__1__Impl
+            // InternalFSM.g:3178:1: ( rule__SimpleState__Group_3_1__1__Impl )
+            // InternalFSM.g:3179:2: rule__SimpleState__Group_3_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__SimpleState__Group_3_1__1__Impl_in_rule__SimpleState__Group_3_1__16669);
+            pushFollow(FOLLOW_2);
             rule__SimpleState__Group_3_1__1__Impl();
 
             state._fsp--;
@@ -9479,23 +9479,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3_1__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3182:1: rule__SimpleState__Group_3_1__1__Impl : ( ( rule__SimpleState__EntryCodeAssignment_3_1_1 ) ) ;
+    // InternalFSM.g:3185:1: rule__SimpleState__Group_3_1__1__Impl : ( ( rule__SimpleState__EntryCodeAssignment_3_1_1 ) ) ;
     public final void rule__SimpleState__Group_3_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3186:1: ( ( ( rule__SimpleState__EntryCodeAssignment_3_1_1 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3187:1: ( ( rule__SimpleState__EntryCodeAssignment_3_1_1 ) )
+            // InternalFSM.g:3189:1: ( ( ( rule__SimpleState__EntryCodeAssignment_3_1_1 ) ) )
+            // InternalFSM.g:3190:1: ( ( rule__SimpleState__EntryCodeAssignment_3_1_1 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3187:1: ( ( rule__SimpleState__EntryCodeAssignment_3_1_1 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3188:1: ( rule__SimpleState__EntryCodeAssignment_3_1_1 )
+            // InternalFSM.g:3190:1: ( ( rule__SimpleState__EntryCodeAssignment_3_1_1 ) )
+            // InternalFSM.g:3191:1: ( rule__SimpleState__EntryCodeAssignment_3_1_1 )
             {
              before(grammarAccess.getSimpleStateAccess().getEntryCodeAssignment_3_1_1()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3189:1: ( rule__SimpleState__EntryCodeAssignment_3_1_1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3189:2: rule__SimpleState__EntryCodeAssignment_3_1_1
+            // InternalFSM.g:3192:1: ( rule__SimpleState__EntryCodeAssignment_3_1_1 )
+            // InternalFSM.g:3192:2: rule__SimpleState__EntryCodeAssignment_3_1_1
             {
-            pushFollow(FOLLOW_rule__SimpleState__EntryCodeAssignment_3_1_1_in_rule__SimpleState__Group_3_1__1__Impl6696);
+            pushFollow(FOLLOW_2);
             rule__SimpleState__EntryCodeAssignment_3_1_1();
 
             state._fsp--;
@@ -9526,21 +9526,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3_2__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3203:1: rule__SimpleState__Group_3_2__0 : rule__SimpleState__Group_3_2__0__Impl rule__SimpleState__Group_3_2__1 ;
+    // InternalFSM.g:3206:1: rule__SimpleState__Group_3_2__0 : rule__SimpleState__Group_3_2__0__Impl rule__SimpleState__Group_3_2__1 ;
     public final void rule__SimpleState__Group_3_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3207:1: ( rule__SimpleState__Group_3_2__0__Impl rule__SimpleState__Group_3_2__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3208:2: rule__SimpleState__Group_3_2__0__Impl rule__SimpleState__Group_3_2__1
+            // InternalFSM.g:3210:1: ( rule__SimpleState__Group_3_2__0__Impl rule__SimpleState__Group_3_2__1 )
+            // InternalFSM.g:3211:2: rule__SimpleState__Group_3_2__0__Impl rule__SimpleState__Group_3_2__1
             {
-            pushFollow(FOLLOW_rule__SimpleState__Group_3_2__0__Impl_in_rule__SimpleState__Group_3_2__06730);
+            pushFollow(FOLLOW_7);
             rule__SimpleState__Group_3_2__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SimpleState__Group_3_2__1_in_rule__SimpleState__Group_3_2__06733);
+            pushFollow(FOLLOW_2);
             rule__SimpleState__Group_3_2__1();
 
             state._fsp--;
@@ -9564,20 +9564,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3_2__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3215:1: rule__SimpleState__Group_3_2__0__Impl : ( 'exit' ) ;
+    // InternalFSM.g:3218:1: rule__SimpleState__Group_3_2__0__Impl : ( 'exit' ) ;
     public final void rule__SimpleState__Group_3_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3219:1: ( ( 'exit' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3220:1: ( 'exit' )
+            // InternalFSM.g:3222:1: ( ( 'exit' ) )
+            // InternalFSM.g:3223:1: ( 'exit' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3220:1: ( 'exit' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3221:1: 'exit'
+            // InternalFSM.g:3223:1: ( 'exit' )
+            // InternalFSM.g:3224:1: 'exit'
             {
              before(grammarAccess.getSimpleStateAccess().getExitKeyword_3_2_0()); 
-            match(input,33,FOLLOW_33_in_rule__SimpleState__Group_3_2__0__Impl6761); 
+            match(input,33,FOLLOW_2); 
              after(grammarAccess.getSimpleStateAccess().getExitKeyword_3_2_0()); 
 
             }
@@ -9601,16 +9601,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3_2__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3234:1: rule__SimpleState__Group_3_2__1 : rule__SimpleState__Group_3_2__1__Impl ;
+    // InternalFSM.g:3237:1: rule__SimpleState__Group_3_2__1 : rule__SimpleState__Group_3_2__1__Impl ;
     public final void rule__SimpleState__Group_3_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3238:1: ( rule__SimpleState__Group_3_2__1__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3239:2: rule__SimpleState__Group_3_2__1__Impl
+            // InternalFSM.g:3241:1: ( rule__SimpleState__Group_3_2__1__Impl )
+            // InternalFSM.g:3242:2: rule__SimpleState__Group_3_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__SimpleState__Group_3_2__1__Impl_in_rule__SimpleState__Group_3_2__16792);
+            pushFollow(FOLLOW_2);
             rule__SimpleState__Group_3_2__1__Impl();
 
             state._fsp--;
@@ -9634,23 +9634,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3_2__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3245:1: rule__SimpleState__Group_3_2__1__Impl : ( ( rule__SimpleState__ExitCodeAssignment_3_2_1 ) ) ;
+    // InternalFSM.g:3248:1: rule__SimpleState__Group_3_2__1__Impl : ( ( rule__SimpleState__ExitCodeAssignment_3_2_1 ) ) ;
     public final void rule__SimpleState__Group_3_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3249:1: ( ( ( rule__SimpleState__ExitCodeAssignment_3_2_1 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3250:1: ( ( rule__SimpleState__ExitCodeAssignment_3_2_1 ) )
+            // InternalFSM.g:3252:1: ( ( ( rule__SimpleState__ExitCodeAssignment_3_2_1 ) ) )
+            // InternalFSM.g:3253:1: ( ( rule__SimpleState__ExitCodeAssignment_3_2_1 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3250:1: ( ( rule__SimpleState__ExitCodeAssignment_3_2_1 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3251:1: ( rule__SimpleState__ExitCodeAssignment_3_2_1 )
+            // InternalFSM.g:3253:1: ( ( rule__SimpleState__ExitCodeAssignment_3_2_1 ) )
+            // InternalFSM.g:3254:1: ( rule__SimpleState__ExitCodeAssignment_3_2_1 )
             {
              before(grammarAccess.getSimpleStateAccess().getExitCodeAssignment_3_2_1()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3252:1: ( rule__SimpleState__ExitCodeAssignment_3_2_1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3252:2: rule__SimpleState__ExitCodeAssignment_3_2_1
+            // InternalFSM.g:3255:1: ( rule__SimpleState__ExitCodeAssignment_3_2_1 )
+            // InternalFSM.g:3255:2: rule__SimpleState__ExitCodeAssignment_3_2_1
             {
-            pushFollow(FOLLOW_rule__SimpleState__ExitCodeAssignment_3_2_1_in_rule__SimpleState__Group_3_2__1__Impl6819);
+            pushFollow(FOLLOW_2);
             rule__SimpleState__ExitCodeAssignment_3_2_1();
 
             state._fsp--;
@@ -9681,21 +9681,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3_3__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3266:1: rule__SimpleState__Group_3_3__0 : rule__SimpleState__Group_3_3__0__Impl rule__SimpleState__Group_3_3__1 ;
+    // InternalFSM.g:3269:1: rule__SimpleState__Group_3_3__0 : rule__SimpleState__Group_3_3__0__Impl rule__SimpleState__Group_3_3__1 ;
     public final void rule__SimpleState__Group_3_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3270:1: ( rule__SimpleState__Group_3_3__0__Impl rule__SimpleState__Group_3_3__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3271:2: rule__SimpleState__Group_3_3__0__Impl rule__SimpleState__Group_3_3__1
+            // InternalFSM.g:3273:1: ( rule__SimpleState__Group_3_3__0__Impl rule__SimpleState__Group_3_3__1 )
+            // InternalFSM.g:3274:2: rule__SimpleState__Group_3_3__0__Impl rule__SimpleState__Group_3_3__1
             {
-            pushFollow(FOLLOW_rule__SimpleState__Group_3_3__0__Impl_in_rule__SimpleState__Group_3_3__06853);
+            pushFollow(FOLLOW_7);
             rule__SimpleState__Group_3_3__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SimpleState__Group_3_3__1_in_rule__SimpleState__Group_3_3__06856);
+            pushFollow(FOLLOW_2);
             rule__SimpleState__Group_3_3__1();
 
             state._fsp--;
@@ -9719,20 +9719,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3_3__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3278:1: rule__SimpleState__Group_3_3__0__Impl : ( 'do' ) ;
+    // InternalFSM.g:3281:1: rule__SimpleState__Group_3_3__0__Impl : ( 'do' ) ;
     public final void rule__SimpleState__Group_3_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3282:1: ( ( 'do' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3283:1: ( 'do' )
+            // InternalFSM.g:3285:1: ( ( 'do' ) )
+            // InternalFSM.g:3286:1: ( 'do' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3283:1: ( 'do' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3284:1: 'do'
+            // InternalFSM.g:3286:1: ( 'do' )
+            // InternalFSM.g:3287:1: 'do'
             {
              before(grammarAccess.getSimpleStateAccess().getDoKeyword_3_3_0()); 
-            match(input,34,FOLLOW_34_in_rule__SimpleState__Group_3_3__0__Impl6884); 
+            match(input,34,FOLLOW_2); 
              after(grammarAccess.getSimpleStateAccess().getDoKeyword_3_3_0()); 
 
             }
@@ -9756,16 +9756,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3_3__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3297:1: rule__SimpleState__Group_3_3__1 : rule__SimpleState__Group_3_3__1__Impl ;
+    // InternalFSM.g:3300:1: rule__SimpleState__Group_3_3__1 : rule__SimpleState__Group_3_3__1__Impl ;
     public final void rule__SimpleState__Group_3_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3301:1: ( rule__SimpleState__Group_3_3__1__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3302:2: rule__SimpleState__Group_3_3__1__Impl
+            // InternalFSM.g:3304:1: ( rule__SimpleState__Group_3_3__1__Impl )
+            // InternalFSM.g:3305:2: rule__SimpleState__Group_3_3__1__Impl
             {
-            pushFollow(FOLLOW_rule__SimpleState__Group_3_3__1__Impl_in_rule__SimpleState__Group_3_3__16915);
+            pushFollow(FOLLOW_2);
             rule__SimpleState__Group_3_3__1__Impl();
 
             state._fsp--;
@@ -9789,23 +9789,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3_3__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3308:1: rule__SimpleState__Group_3_3__1__Impl : ( ( rule__SimpleState__DoCodeAssignment_3_3_1 ) ) ;
+    // InternalFSM.g:3311:1: rule__SimpleState__Group_3_3__1__Impl : ( ( rule__SimpleState__DoCodeAssignment_3_3_1 ) ) ;
     public final void rule__SimpleState__Group_3_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3312:1: ( ( ( rule__SimpleState__DoCodeAssignment_3_3_1 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3313:1: ( ( rule__SimpleState__DoCodeAssignment_3_3_1 ) )
+            // InternalFSM.g:3315:1: ( ( ( rule__SimpleState__DoCodeAssignment_3_3_1 ) ) )
+            // InternalFSM.g:3316:1: ( ( rule__SimpleState__DoCodeAssignment_3_3_1 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3313:1: ( ( rule__SimpleState__DoCodeAssignment_3_3_1 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3314:1: ( rule__SimpleState__DoCodeAssignment_3_3_1 )
+            // InternalFSM.g:3316:1: ( ( rule__SimpleState__DoCodeAssignment_3_3_1 ) )
+            // InternalFSM.g:3317:1: ( rule__SimpleState__DoCodeAssignment_3_3_1 )
             {
              before(grammarAccess.getSimpleStateAccess().getDoCodeAssignment_3_3_1()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3315:1: ( rule__SimpleState__DoCodeAssignment_3_3_1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3315:2: rule__SimpleState__DoCodeAssignment_3_3_1
+            // InternalFSM.g:3318:1: ( rule__SimpleState__DoCodeAssignment_3_3_1 )
+            // InternalFSM.g:3318:2: rule__SimpleState__DoCodeAssignment_3_3_1
             {
-            pushFollow(FOLLOW_rule__SimpleState__DoCodeAssignment_3_3_1_in_rule__SimpleState__Group_3_3__1__Impl6942);
+            pushFollow(FOLLOW_2);
             rule__SimpleState__DoCodeAssignment_3_3_1();
 
             state._fsp--;
@@ -9836,21 +9836,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3_4__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3329:1: rule__SimpleState__Group_3_4__0 : rule__SimpleState__Group_3_4__0__Impl rule__SimpleState__Group_3_4__1 ;
+    // InternalFSM.g:3332:1: rule__SimpleState__Group_3_4__0 : rule__SimpleState__Group_3_4__0__Impl rule__SimpleState__Group_3_4__1 ;
     public final void rule__SimpleState__Group_3_4__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3333:1: ( rule__SimpleState__Group_3_4__0__Impl rule__SimpleState__Group_3_4__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3334:2: rule__SimpleState__Group_3_4__0__Impl rule__SimpleState__Group_3_4__1
+            // InternalFSM.g:3336:1: ( rule__SimpleState__Group_3_4__0__Impl rule__SimpleState__Group_3_4__1 )
+            // InternalFSM.g:3337:2: rule__SimpleState__Group_3_4__0__Impl rule__SimpleState__Group_3_4__1
             {
-            pushFollow(FOLLOW_rule__SimpleState__Group_3_4__0__Impl_in_rule__SimpleState__Group_3_4__06976);
+            pushFollow(FOLLOW_7);
             rule__SimpleState__Group_3_4__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SimpleState__Group_3_4__1_in_rule__SimpleState__Group_3_4__06979);
+            pushFollow(FOLLOW_2);
             rule__SimpleState__Group_3_4__1();
 
             state._fsp--;
@@ -9874,20 +9874,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3_4__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3341:1: rule__SimpleState__Group_3_4__0__Impl : ( 'subgraph' ) ;
+    // InternalFSM.g:3344:1: rule__SimpleState__Group_3_4__0__Impl : ( 'subgraph' ) ;
     public final void rule__SimpleState__Group_3_4__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3345:1: ( ( 'subgraph' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3346:1: ( 'subgraph' )
+            // InternalFSM.g:3348:1: ( ( 'subgraph' ) )
+            // InternalFSM.g:3349:1: ( 'subgraph' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3346:1: ( 'subgraph' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3347:1: 'subgraph'
+            // InternalFSM.g:3349:1: ( 'subgraph' )
+            // InternalFSM.g:3350:1: 'subgraph'
             {
              before(grammarAccess.getSimpleStateAccess().getSubgraphKeyword_3_4_0()); 
-            match(input,35,FOLLOW_35_in_rule__SimpleState__Group_3_4__0__Impl7007); 
+            match(input,35,FOLLOW_2); 
              after(grammarAccess.getSimpleStateAccess().getSubgraphKeyword_3_4_0()); 
 
             }
@@ -9911,16 +9911,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3_4__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3360:1: rule__SimpleState__Group_3_4__1 : rule__SimpleState__Group_3_4__1__Impl ;
+    // InternalFSM.g:3363:1: rule__SimpleState__Group_3_4__1 : rule__SimpleState__Group_3_4__1__Impl ;
     public final void rule__SimpleState__Group_3_4__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3364:1: ( rule__SimpleState__Group_3_4__1__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3365:2: rule__SimpleState__Group_3_4__1__Impl
+            // InternalFSM.g:3367:1: ( rule__SimpleState__Group_3_4__1__Impl )
+            // InternalFSM.g:3368:2: rule__SimpleState__Group_3_4__1__Impl
             {
-            pushFollow(FOLLOW_rule__SimpleState__Group_3_4__1__Impl_in_rule__SimpleState__Group_3_4__17038);
+            pushFollow(FOLLOW_2);
             rule__SimpleState__Group_3_4__1__Impl();
 
             state._fsp--;
@@ -9944,23 +9944,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3_4__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3371:1: rule__SimpleState__Group_3_4__1__Impl : ( ( rule__SimpleState__SubgraphAssignment_3_4_1 ) ) ;
+    // InternalFSM.g:3374:1: rule__SimpleState__Group_3_4__1__Impl : ( ( rule__SimpleState__SubgraphAssignment_3_4_1 ) ) ;
     public final void rule__SimpleState__Group_3_4__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3375:1: ( ( ( rule__SimpleState__SubgraphAssignment_3_4_1 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3376:1: ( ( rule__SimpleState__SubgraphAssignment_3_4_1 ) )
+            // InternalFSM.g:3378:1: ( ( ( rule__SimpleState__SubgraphAssignment_3_4_1 ) ) )
+            // InternalFSM.g:3379:1: ( ( rule__SimpleState__SubgraphAssignment_3_4_1 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3376:1: ( ( rule__SimpleState__SubgraphAssignment_3_4_1 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3377:1: ( rule__SimpleState__SubgraphAssignment_3_4_1 )
+            // InternalFSM.g:3379:1: ( ( rule__SimpleState__SubgraphAssignment_3_4_1 ) )
+            // InternalFSM.g:3380:1: ( rule__SimpleState__SubgraphAssignment_3_4_1 )
             {
              before(grammarAccess.getSimpleStateAccess().getSubgraphAssignment_3_4_1()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3378:1: ( rule__SimpleState__SubgraphAssignment_3_4_1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3378:2: rule__SimpleState__SubgraphAssignment_3_4_1
+            // InternalFSM.g:3381:1: ( rule__SimpleState__SubgraphAssignment_3_4_1 )
+            // InternalFSM.g:3381:2: rule__SimpleState__SubgraphAssignment_3_4_1
             {
-            pushFollow(FOLLOW_rule__SimpleState__SubgraphAssignment_3_4_1_in_rule__SimpleState__Group_3_4__1__Impl7065);
+            pushFollow(FOLLOW_2);
             rule__SimpleState__SubgraphAssignment_3_4_1();
 
             state._fsp--;
@@ -9991,21 +9991,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3392:1: rule__RefinedState__Group__0 : rule__RefinedState__Group__0__Impl rule__RefinedState__Group__1 ;
+    // InternalFSM.g:3395:1: rule__RefinedState__Group__0 : rule__RefinedState__Group__0__Impl rule__RefinedState__Group__1 ;
     public final void rule__RefinedState__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3396:1: ( rule__RefinedState__Group__0__Impl rule__RefinedState__Group__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3397:2: rule__RefinedState__Group__0__Impl rule__RefinedState__Group__1
+            // InternalFSM.g:3399:1: ( rule__RefinedState__Group__0__Impl rule__RefinedState__Group__1 )
+            // InternalFSM.g:3400:2: rule__RefinedState__Group__0__Impl rule__RefinedState__Group__1
             {
-            pushFollow(FOLLOW_rule__RefinedState__Group__0__Impl_in_rule__RefinedState__Group__07099);
+            pushFollow(FOLLOW_5);
             rule__RefinedState__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RefinedState__Group__1_in_rule__RefinedState__Group__07102);
+            pushFollow(FOLLOW_2);
             rule__RefinedState__Group__1();
 
             state._fsp--;
@@ -10029,20 +10029,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3404:1: rule__RefinedState__Group__0__Impl : ( 'RefinedState' ) ;
+    // InternalFSM.g:3407:1: rule__RefinedState__Group__0__Impl : ( 'RefinedState' ) ;
     public final void rule__RefinedState__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3408:1: ( ( 'RefinedState' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3409:1: ( 'RefinedState' )
+            // InternalFSM.g:3411:1: ( ( 'RefinedState' ) )
+            // InternalFSM.g:3412:1: ( 'RefinedState' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3409:1: ( 'RefinedState' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3410:1: 'RefinedState'
+            // InternalFSM.g:3412:1: ( 'RefinedState' )
+            // InternalFSM.g:3413:1: 'RefinedState'
             {
              before(grammarAccess.getRefinedStateAccess().getRefinedStateKeyword_0()); 
-            match(input,36,FOLLOW_36_in_rule__RefinedState__Group__0__Impl7130); 
+            match(input,36,FOLLOW_2); 
              after(grammarAccess.getRefinedStateAccess().getRefinedStateKeyword_0()); 
 
             }
@@ -10066,21 +10066,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3423:1: rule__RefinedState__Group__1 : rule__RefinedState__Group__1__Impl rule__RefinedState__Group__2 ;
+    // InternalFSM.g:3426:1: rule__RefinedState__Group__1 : rule__RefinedState__Group__1__Impl rule__RefinedState__Group__2 ;
     public final void rule__RefinedState__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3427:1: ( rule__RefinedState__Group__1__Impl rule__RefinedState__Group__2 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3428:2: rule__RefinedState__Group__1__Impl rule__RefinedState__Group__2
+            // InternalFSM.g:3430:1: ( rule__RefinedState__Group__1__Impl rule__RefinedState__Group__2 )
+            // InternalFSM.g:3431:2: rule__RefinedState__Group__1__Impl rule__RefinedState__Group__2
             {
-            pushFollow(FOLLOW_rule__RefinedState__Group__1__Impl_in_rule__RefinedState__Group__17161);
+            pushFollow(FOLLOW_10);
             rule__RefinedState__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RefinedState__Group__2_in_rule__RefinedState__Group__17164);
+            pushFollow(FOLLOW_2);
             rule__RefinedState__Group__2();
 
             state._fsp--;
@@ -10104,23 +10104,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3435:1: rule__RefinedState__Group__1__Impl : ( ( rule__RefinedState__TargetAssignment_1 ) ) ;
+    // InternalFSM.g:3438:1: rule__RefinedState__Group__1__Impl : ( ( rule__RefinedState__TargetAssignment_1 ) ) ;
     public final void rule__RefinedState__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3439:1: ( ( ( rule__RefinedState__TargetAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3440:1: ( ( rule__RefinedState__TargetAssignment_1 ) )
+            // InternalFSM.g:3442:1: ( ( ( rule__RefinedState__TargetAssignment_1 ) ) )
+            // InternalFSM.g:3443:1: ( ( rule__RefinedState__TargetAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3440:1: ( ( rule__RefinedState__TargetAssignment_1 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3441:1: ( rule__RefinedState__TargetAssignment_1 )
+            // InternalFSM.g:3443:1: ( ( rule__RefinedState__TargetAssignment_1 ) )
+            // InternalFSM.g:3444:1: ( rule__RefinedState__TargetAssignment_1 )
             {
              before(grammarAccess.getRefinedStateAccess().getTargetAssignment_1()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3442:1: ( rule__RefinedState__TargetAssignment_1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3442:2: rule__RefinedState__TargetAssignment_1
+            // InternalFSM.g:3445:1: ( rule__RefinedState__TargetAssignment_1 )
+            // InternalFSM.g:3445:2: rule__RefinedState__TargetAssignment_1
             {
-            pushFollow(FOLLOW_rule__RefinedState__TargetAssignment_1_in_rule__RefinedState__Group__1__Impl7191);
+            pushFollow(FOLLOW_2);
             rule__RefinedState__TargetAssignment_1();
 
             state._fsp--;
@@ -10151,21 +10151,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group__2"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3452:1: rule__RefinedState__Group__2 : rule__RefinedState__Group__2__Impl rule__RefinedState__Group__3 ;
+    // InternalFSM.g:3455:1: rule__RefinedState__Group__2 : rule__RefinedState__Group__2__Impl rule__RefinedState__Group__3 ;
     public final void rule__RefinedState__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3456:1: ( rule__RefinedState__Group__2__Impl rule__RefinedState__Group__3 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3457:2: rule__RefinedState__Group__2__Impl rule__RefinedState__Group__3
+            // InternalFSM.g:3459:1: ( rule__RefinedState__Group__2__Impl rule__RefinedState__Group__3 )
+            // InternalFSM.g:3460:2: rule__RefinedState__Group__2__Impl rule__RefinedState__Group__3
             {
-            pushFollow(FOLLOW_rule__RefinedState__Group__2__Impl_in_rule__RefinedState__Group__27221);
+            pushFollow(FOLLOW_10);
             rule__RefinedState__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RefinedState__Group__3_in_rule__RefinedState__Group__27224);
+            pushFollow(FOLLOW_2);
             rule__RefinedState__Group__3();
 
             state._fsp--;
@@ -10189,20 +10189,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group__2__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3464:1: rule__RefinedState__Group__2__Impl : ( ( rule__RefinedState__DocuAssignment_2 )? ) ;
+    // InternalFSM.g:3467:1: rule__RefinedState__Group__2__Impl : ( ( rule__RefinedState__DocuAssignment_2 )? ) ;
     public final void rule__RefinedState__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3468:1: ( ( ( rule__RefinedState__DocuAssignment_2 )? ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3469:1: ( ( rule__RefinedState__DocuAssignment_2 )? )
+            // InternalFSM.g:3471:1: ( ( ( rule__RefinedState__DocuAssignment_2 )? ) )
+            // InternalFSM.g:3472:1: ( ( rule__RefinedState__DocuAssignment_2 )? )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3469:1: ( ( rule__RefinedState__DocuAssignment_2 )? )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3470:1: ( rule__RefinedState__DocuAssignment_2 )?
+            // InternalFSM.g:3472:1: ( ( rule__RefinedState__DocuAssignment_2 )? )
+            // InternalFSM.g:3473:1: ( rule__RefinedState__DocuAssignment_2 )?
             {
              before(grammarAccess.getRefinedStateAccess().getDocuAssignment_2()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3471:1: ( rule__RefinedState__DocuAssignment_2 )?
+            // InternalFSM.g:3474:1: ( rule__RefinedState__DocuAssignment_2 )?
             int alt38=2;
             int LA38_0 = input.LA(1);
 
@@ -10211,9 +10211,9 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt38) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3471:2: rule__RefinedState__DocuAssignment_2
+                    // InternalFSM.g:3474:2: rule__RefinedState__DocuAssignment_2
                     {
-                    pushFollow(FOLLOW_rule__RefinedState__DocuAssignment_2_in_rule__RefinedState__Group__2__Impl7251);
+                    pushFollow(FOLLOW_2);
                     rule__RefinedState__DocuAssignment_2();
 
                     state._fsp--;
@@ -10247,21 +10247,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group__3"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3481:1: rule__RefinedState__Group__3 : rule__RefinedState__Group__3__Impl rule__RefinedState__Group__4 ;
+    // InternalFSM.g:3484:1: rule__RefinedState__Group__3 : rule__RefinedState__Group__3__Impl rule__RefinedState__Group__4 ;
     public final void rule__RefinedState__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3485:1: ( rule__RefinedState__Group__3__Impl rule__RefinedState__Group__4 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3486:2: rule__RefinedState__Group__3__Impl rule__RefinedState__Group__4
+            // InternalFSM.g:3488:1: ( rule__RefinedState__Group__3__Impl rule__RefinedState__Group__4 )
+            // InternalFSM.g:3489:2: rule__RefinedState__Group__3__Impl rule__RefinedState__Group__4
             {
-            pushFollow(FOLLOW_rule__RefinedState__Group__3__Impl_in_rule__RefinedState__Group__37282);
+            pushFollow(FOLLOW_11);
             rule__RefinedState__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RefinedState__Group__4_in_rule__RefinedState__Group__37285);
+            pushFollow(FOLLOW_2);
             rule__RefinedState__Group__4();
 
             state._fsp--;
@@ -10285,20 +10285,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group__3__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3493:1: rule__RefinedState__Group__3__Impl : ( '{' ) ;
+    // InternalFSM.g:3496:1: rule__RefinedState__Group__3__Impl : ( '{' ) ;
     public final void rule__RefinedState__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3497:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3498:1: ( '{' )
+            // InternalFSM.g:3500:1: ( ( '{' ) )
+            // InternalFSM.g:3501:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3498:1: ( '{' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3499:1: '{'
+            // InternalFSM.g:3501:1: ( '{' )
+            // InternalFSM.g:3502:1: '{'
             {
              before(grammarAccess.getRefinedStateAccess().getLeftCurlyBracketKeyword_3()); 
-            match(input,28,FOLLOW_28_in_rule__RefinedState__Group__3__Impl7313); 
+            match(input,28,FOLLOW_2); 
              after(grammarAccess.getRefinedStateAccess().getLeftCurlyBracketKeyword_3()); 
 
             }
@@ -10322,21 +10322,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group__4"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3512:1: rule__RefinedState__Group__4 : rule__RefinedState__Group__4__Impl rule__RefinedState__Group__5 ;
+    // InternalFSM.g:3515:1: rule__RefinedState__Group__4 : rule__RefinedState__Group__4__Impl rule__RefinedState__Group__5 ;
     public final void rule__RefinedState__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3516:1: ( rule__RefinedState__Group__4__Impl rule__RefinedState__Group__5 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3517:2: rule__RefinedState__Group__4__Impl rule__RefinedState__Group__5
+            // InternalFSM.g:3519:1: ( rule__RefinedState__Group__4__Impl rule__RefinedState__Group__5 )
+            // InternalFSM.g:3520:2: rule__RefinedState__Group__4__Impl rule__RefinedState__Group__5
             {
-            pushFollow(FOLLOW_rule__RefinedState__Group__4__Impl_in_rule__RefinedState__Group__47344);
+            pushFollow(FOLLOW_11);
             rule__RefinedState__Group__4__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RefinedState__Group__5_in_rule__RefinedState__Group__47347);
+            pushFollow(FOLLOW_2);
             rule__RefinedState__Group__5();
 
             state._fsp--;
@@ -10360,20 +10360,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group__4__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3524:1: rule__RefinedState__Group__4__Impl : ( ( rule__RefinedState__Group_4__0 )? ) ;
+    // InternalFSM.g:3527:1: rule__RefinedState__Group__4__Impl : ( ( rule__RefinedState__Group_4__0 )? ) ;
     public final void rule__RefinedState__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3528:1: ( ( ( rule__RefinedState__Group_4__0 )? ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3529:1: ( ( rule__RefinedState__Group_4__0 )? )
+            // InternalFSM.g:3531:1: ( ( ( rule__RefinedState__Group_4__0 )? ) )
+            // InternalFSM.g:3532:1: ( ( rule__RefinedState__Group_4__0 )? )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3529:1: ( ( rule__RefinedState__Group_4__0 )? )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3530:1: ( rule__RefinedState__Group_4__0 )?
+            // InternalFSM.g:3532:1: ( ( rule__RefinedState__Group_4__0 )? )
+            // InternalFSM.g:3533:1: ( rule__RefinedState__Group_4__0 )?
             {
              before(grammarAccess.getRefinedStateAccess().getGroup_4()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3531:1: ( rule__RefinedState__Group_4__0 )?
+            // InternalFSM.g:3534:1: ( rule__RefinedState__Group_4__0 )?
             int alt39=2;
             int LA39_0 = input.LA(1);
 
@@ -10382,9 +10382,9 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt39) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3531:2: rule__RefinedState__Group_4__0
+                    // InternalFSM.g:3534:2: rule__RefinedState__Group_4__0
                     {
-                    pushFollow(FOLLOW_rule__RefinedState__Group_4__0_in_rule__RefinedState__Group__4__Impl7374);
+                    pushFollow(FOLLOW_2);
                     rule__RefinedState__Group_4__0();
 
                     state._fsp--;
@@ -10418,21 +10418,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group__5"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3541:1: rule__RefinedState__Group__5 : rule__RefinedState__Group__5__Impl rule__RefinedState__Group__6 ;
+    // InternalFSM.g:3544:1: rule__RefinedState__Group__5 : rule__RefinedState__Group__5__Impl rule__RefinedState__Group__6 ;
     public final void rule__RefinedState__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3545:1: ( rule__RefinedState__Group__5__Impl rule__RefinedState__Group__6 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3546:2: rule__RefinedState__Group__5__Impl rule__RefinedState__Group__6
+            // InternalFSM.g:3548:1: ( rule__RefinedState__Group__5__Impl rule__RefinedState__Group__6 )
+            // InternalFSM.g:3549:2: rule__RefinedState__Group__5__Impl rule__RefinedState__Group__6
             {
-            pushFollow(FOLLOW_rule__RefinedState__Group__5__Impl_in_rule__RefinedState__Group__57405);
+            pushFollow(FOLLOW_11);
             rule__RefinedState__Group__5__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RefinedState__Group__6_in_rule__RefinedState__Group__57408);
+            pushFollow(FOLLOW_2);
             rule__RefinedState__Group__6();
 
             state._fsp--;
@@ -10456,20 +10456,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group__5__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3553:1: rule__RefinedState__Group__5__Impl : ( ( rule__RefinedState__Group_5__0 )? ) ;
+    // InternalFSM.g:3556:1: rule__RefinedState__Group__5__Impl : ( ( rule__RefinedState__Group_5__0 )? ) ;
     public final void rule__RefinedState__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3557:1: ( ( ( rule__RefinedState__Group_5__0 )? ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3558:1: ( ( rule__RefinedState__Group_5__0 )? )
+            // InternalFSM.g:3560:1: ( ( ( rule__RefinedState__Group_5__0 )? ) )
+            // InternalFSM.g:3561:1: ( ( rule__RefinedState__Group_5__0 )? )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3558:1: ( ( rule__RefinedState__Group_5__0 )? )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3559:1: ( rule__RefinedState__Group_5__0 )?
+            // InternalFSM.g:3561:1: ( ( rule__RefinedState__Group_5__0 )? )
+            // InternalFSM.g:3562:1: ( rule__RefinedState__Group_5__0 )?
             {
              before(grammarAccess.getRefinedStateAccess().getGroup_5()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3560:1: ( rule__RefinedState__Group_5__0 )?
+            // InternalFSM.g:3563:1: ( rule__RefinedState__Group_5__0 )?
             int alt40=2;
             int LA40_0 = input.LA(1);
 
@@ -10478,9 +10478,9 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt40) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3560:2: rule__RefinedState__Group_5__0
+                    // InternalFSM.g:3563:2: rule__RefinedState__Group_5__0
                     {
-                    pushFollow(FOLLOW_rule__RefinedState__Group_5__0_in_rule__RefinedState__Group__5__Impl7435);
+                    pushFollow(FOLLOW_2);
                     rule__RefinedState__Group_5__0();
 
                     state._fsp--;
@@ -10514,21 +10514,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group__6"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3570:1: rule__RefinedState__Group__6 : rule__RefinedState__Group__6__Impl rule__RefinedState__Group__7 ;
+    // InternalFSM.g:3573:1: rule__RefinedState__Group__6 : rule__RefinedState__Group__6__Impl rule__RefinedState__Group__7 ;
     public final void rule__RefinedState__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3574:1: ( rule__RefinedState__Group__6__Impl rule__RefinedState__Group__7 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3575:2: rule__RefinedState__Group__6__Impl rule__RefinedState__Group__7
+            // InternalFSM.g:3577:1: ( rule__RefinedState__Group__6__Impl rule__RefinedState__Group__7 )
+            // InternalFSM.g:3578:2: rule__RefinedState__Group__6__Impl rule__RefinedState__Group__7
             {
-            pushFollow(FOLLOW_rule__RefinedState__Group__6__Impl_in_rule__RefinedState__Group__67466);
+            pushFollow(FOLLOW_11);
             rule__RefinedState__Group__6__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RefinedState__Group__7_in_rule__RefinedState__Group__67469);
+            pushFollow(FOLLOW_2);
             rule__RefinedState__Group__7();
 
             state._fsp--;
@@ -10552,20 +10552,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group__6__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3582:1: rule__RefinedState__Group__6__Impl : ( ( rule__RefinedState__Group_6__0 )? ) ;
+    // InternalFSM.g:3585:1: rule__RefinedState__Group__6__Impl : ( ( rule__RefinedState__Group_6__0 )? ) ;
     public final void rule__RefinedState__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3586:1: ( ( ( rule__RefinedState__Group_6__0 )? ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3587:1: ( ( rule__RefinedState__Group_6__0 )? )
+            // InternalFSM.g:3589:1: ( ( ( rule__RefinedState__Group_6__0 )? ) )
+            // InternalFSM.g:3590:1: ( ( rule__RefinedState__Group_6__0 )? )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3587:1: ( ( rule__RefinedState__Group_6__0 )? )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3588:1: ( rule__RefinedState__Group_6__0 )?
+            // InternalFSM.g:3590:1: ( ( rule__RefinedState__Group_6__0 )? )
+            // InternalFSM.g:3591:1: ( rule__RefinedState__Group_6__0 )?
             {
              before(grammarAccess.getRefinedStateAccess().getGroup_6()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3589:1: ( rule__RefinedState__Group_6__0 )?
+            // InternalFSM.g:3592:1: ( rule__RefinedState__Group_6__0 )?
             int alt41=2;
             int LA41_0 = input.LA(1);
 
@@ -10574,9 +10574,9 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt41) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3589:2: rule__RefinedState__Group_6__0
+                    // InternalFSM.g:3592:2: rule__RefinedState__Group_6__0
                     {
-                    pushFollow(FOLLOW_rule__RefinedState__Group_6__0_in_rule__RefinedState__Group__6__Impl7496);
+                    pushFollow(FOLLOW_2);
                     rule__RefinedState__Group_6__0();
 
                     state._fsp--;
@@ -10610,21 +10610,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group__7"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3599:1: rule__RefinedState__Group__7 : rule__RefinedState__Group__7__Impl rule__RefinedState__Group__8 ;
+    // InternalFSM.g:3602:1: rule__RefinedState__Group__7 : rule__RefinedState__Group__7__Impl rule__RefinedState__Group__8 ;
     public final void rule__RefinedState__Group__7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3603:1: ( rule__RefinedState__Group__7__Impl rule__RefinedState__Group__8 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3604:2: rule__RefinedState__Group__7__Impl rule__RefinedState__Group__8
+            // InternalFSM.g:3606:1: ( rule__RefinedState__Group__7__Impl rule__RefinedState__Group__8 )
+            // InternalFSM.g:3607:2: rule__RefinedState__Group__7__Impl rule__RefinedState__Group__8
             {
-            pushFollow(FOLLOW_rule__RefinedState__Group__7__Impl_in_rule__RefinedState__Group__77527);
+            pushFollow(FOLLOW_11);
             rule__RefinedState__Group__7__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RefinedState__Group__8_in_rule__RefinedState__Group__77530);
+            pushFollow(FOLLOW_2);
             rule__RefinedState__Group__8();
 
             state._fsp--;
@@ -10648,20 +10648,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group__7__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3611:1: rule__RefinedState__Group__7__Impl : ( ( rule__RefinedState__Group_7__0 )? ) ;
+    // InternalFSM.g:3614:1: rule__RefinedState__Group__7__Impl : ( ( rule__RefinedState__Group_7__0 )? ) ;
     public final void rule__RefinedState__Group__7__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3615:1: ( ( ( rule__RefinedState__Group_7__0 )? ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3616:1: ( ( rule__RefinedState__Group_7__0 )? )
+            // InternalFSM.g:3618:1: ( ( ( rule__RefinedState__Group_7__0 )? ) )
+            // InternalFSM.g:3619:1: ( ( rule__RefinedState__Group_7__0 )? )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3616:1: ( ( rule__RefinedState__Group_7__0 )? )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3617:1: ( rule__RefinedState__Group_7__0 )?
+            // InternalFSM.g:3619:1: ( ( rule__RefinedState__Group_7__0 )? )
+            // InternalFSM.g:3620:1: ( rule__RefinedState__Group_7__0 )?
             {
              before(grammarAccess.getRefinedStateAccess().getGroup_7()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3618:1: ( rule__RefinedState__Group_7__0 )?
+            // InternalFSM.g:3621:1: ( rule__RefinedState__Group_7__0 )?
             int alt42=2;
             int LA42_0 = input.LA(1);
 
@@ -10670,9 +10670,9 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt42) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3618:2: rule__RefinedState__Group_7__0
+                    // InternalFSM.g:3621:2: rule__RefinedState__Group_7__0
                     {
-                    pushFollow(FOLLOW_rule__RefinedState__Group_7__0_in_rule__RefinedState__Group__7__Impl7557);
+                    pushFollow(FOLLOW_2);
                     rule__RefinedState__Group_7__0();
 
                     state._fsp--;
@@ -10706,16 +10706,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group__8"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3628:1: rule__RefinedState__Group__8 : rule__RefinedState__Group__8__Impl ;
+    // InternalFSM.g:3631:1: rule__RefinedState__Group__8 : rule__RefinedState__Group__8__Impl ;
     public final void rule__RefinedState__Group__8() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3632:1: ( rule__RefinedState__Group__8__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3633:2: rule__RefinedState__Group__8__Impl
+            // InternalFSM.g:3635:1: ( rule__RefinedState__Group__8__Impl )
+            // InternalFSM.g:3636:2: rule__RefinedState__Group__8__Impl
             {
-            pushFollow(FOLLOW_rule__RefinedState__Group__8__Impl_in_rule__RefinedState__Group__87588);
+            pushFollow(FOLLOW_2);
             rule__RefinedState__Group__8__Impl();
 
             state._fsp--;
@@ -10739,20 +10739,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group__8__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3639:1: rule__RefinedState__Group__8__Impl : ( '}' ) ;
+    // InternalFSM.g:3642:1: rule__RefinedState__Group__8__Impl : ( '}' ) ;
     public final void rule__RefinedState__Group__8__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3643:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3644:1: ( '}' )
+            // InternalFSM.g:3646:1: ( ( '}' ) )
+            // InternalFSM.g:3647:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3644:1: ( '}' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3645:1: '}'
+            // InternalFSM.g:3647:1: ( '}' )
+            // InternalFSM.g:3648:1: '}'
             {
              before(grammarAccess.getRefinedStateAccess().getRightCurlyBracketKeyword_8()); 
-            match(input,29,FOLLOW_29_in_rule__RefinedState__Group__8__Impl7616); 
+            match(input,29,FOLLOW_2); 
              after(grammarAccess.getRefinedStateAccess().getRightCurlyBracketKeyword_8()); 
 
             }
@@ -10776,21 +10776,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group_4__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3676:1: rule__RefinedState__Group_4__0 : rule__RefinedState__Group_4__0__Impl rule__RefinedState__Group_4__1 ;
+    // InternalFSM.g:3679:1: rule__RefinedState__Group_4__0 : rule__RefinedState__Group_4__0__Impl rule__RefinedState__Group_4__1 ;
     public final void rule__RefinedState__Group_4__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3680:1: ( rule__RefinedState__Group_4__0__Impl rule__RefinedState__Group_4__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3681:2: rule__RefinedState__Group_4__0__Impl rule__RefinedState__Group_4__1
+            // InternalFSM.g:3683:1: ( rule__RefinedState__Group_4__0__Impl rule__RefinedState__Group_4__1 )
+            // InternalFSM.g:3684:2: rule__RefinedState__Group_4__0__Impl rule__RefinedState__Group_4__1
             {
-            pushFollow(FOLLOW_rule__RefinedState__Group_4__0__Impl_in_rule__RefinedState__Group_4__07665);
+            pushFollow(FOLLOW_7);
             rule__RefinedState__Group_4__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RefinedState__Group_4__1_in_rule__RefinedState__Group_4__07668);
+            pushFollow(FOLLOW_2);
             rule__RefinedState__Group_4__1();
 
             state._fsp--;
@@ -10814,20 +10814,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group_4__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3688:1: rule__RefinedState__Group_4__0__Impl : ( 'entry' ) ;
+    // InternalFSM.g:3691:1: rule__RefinedState__Group_4__0__Impl : ( 'entry' ) ;
     public final void rule__RefinedState__Group_4__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3692:1: ( ( 'entry' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3693:1: ( 'entry' )
+            // InternalFSM.g:3695:1: ( ( 'entry' ) )
+            // InternalFSM.g:3696:1: ( 'entry' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3693:1: ( 'entry' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3694:1: 'entry'
+            // InternalFSM.g:3696:1: ( 'entry' )
+            // InternalFSM.g:3697:1: 'entry'
             {
              before(grammarAccess.getRefinedStateAccess().getEntryKeyword_4_0()); 
-            match(input,32,FOLLOW_32_in_rule__RefinedState__Group_4__0__Impl7696); 
+            match(input,32,FOLLOW_2); 
              after(grammarAccess.getRefinedStateAccess().getEntryKeyword_4_0()); 
 
             }
@@ -10851,16 +10851,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group_4__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3707:1: rule__RefinedState__Group_4__1 : rule__RefinedState__Group_4__1__Impl ;
+    // InternalFSM.g:3710:1: rule__RefinedState__Group_4__1 : rule__RefinedState__Group_4__1__Impl ;
     public final void rule__RefinedState__Group_4__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3711:1: ( rule__RefinedState__Group_4__1__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3712:2: rule__RefinedState__Group_4__1__Impl
+            // InternalFSM.g:3714:1: ( rule__RefinedState__Group_4__1__Impl )
+            // InternalFSM.g:3715:2: rule__RefinedState__Group_4__1__Impl
             {
-            pushFollow(FOLLOW_rule__RefinedState__Group_4__1__Impl_in_rule__RefinedState__Group_4__17727);
+            pushFollow(FOLLOW_2);
             rule__RefinedState__Group_4__1__Impl();
 
             state._fsp--;
@@ -10884,23 +10884,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group_4__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3718:1: rule__RefinedState__Group_4__1__Impl : ( ( rule__RefinedState__EntryCodeAssignment_4_1 ) ) ;
+    // InternalFSM.g:3721:1: rule__RefinedState__Group_4__1__Impl : ( ( rule__RefinedState__EntryCodeAssignment_4_1 ) ) ;
     public final void rule__RefinedState__Group_4__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3722:1: ( ( ( rule__RefinedState__EntryCodeAssignment_4_1 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3723:1: ( ( rule__RefinedState__EntryCodeAssignment_4_1 ) )
+            // InternalFSM.g:3725:1: ( ( ( rule__RefinedState__EntryCodeAssignment_4_1 ) ) )
+            // InternalFSM.g:3726:1: ( ( rule__RefinedState__EntryCodeAssignment_4_1 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3723:1: ( ( rule__RefinedState__EntryCodeAssignment_4_1 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3724:1: ( rule__RefinedState__EntryCodeAssignment_4_1 )
+            // InternalFSM.g:3726:1: ( ( rule__RefinedState__EntryCodeAssignment_4_1 ) )
+            // InternalFSM.g:3727:1: ( rule__RefinedState__EntryCodeAssignment_4_1 )
             {
              before(grammarAccess.getRefinedStateAccess().getEntryCodeAssignment_4_1()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3725:1: ( rule__RefinedState__EntryCodeAssignment_4_1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3725:2: rule__RefinedState__EntryCodeAssignment_4_1
+            // InternalFSM.g:3728:1: ( rule__RefinedState__EntryCodeAssignment_4_1 )
+            // InternalFSM.g:3728:2: rule__RefinedState__EntryCodeAssignment_4_1
             {
-            pushFollow(FOLLOW_rule__RefinedState__EntryCodeAssignment_4_1_in_rule__RefinedState__Group_4__1__Impl7754);
+            pushFollow(FOLLOW_2);
             rule__RefinedState__EntryCodeAssignment_4_1();
 
             state._fsp--;
@@ -10931,21 +10931,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group_5__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3739:1: rule__RefinedState__Group_5__0 : rule__RefinedState__Group_5__0__Impl rule__RefinedState__Group_5__1 ;
+    // InternalFSM.g:3742:1: rule__RefinedState__Group_5__0 : rule__RefinedState__Group_5__0__Impl rule__RefinedState__Group_5__1 ;
     public final void rule__RefinedState__Group_5__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3743:1: ( rule__RefinedState__Group_5__0__Impl rule__RefinedState__Group_5__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3744:2: rule__RefinedState__Group_5__0__Impl rule__RefinedState__Group_5__1
+            // InternalFSM.g:3746:1: ( rule__RefinedState__Group_5__0__Impl rule__RefinedState__Group_5__1 )
+            // InternalFSM.g:3747:2: rule__RefinedState__Group_5__0__Impl rule__RefinedState__Group_5__1
             {
-            pushFollow(FOLLOW_rule__RefinedState__Group_5__0__Impl_in_rule__RefinedState__Group_5__07788);
+            pushFollow(FOLLOW_7);
             rule__RefinedState__Group_5__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RefinedState__Group_5__1_in_rule__RefinedState__Group_5__07791);
+            pushFollow(FOLLOW_2);
             rule__RefinedState__Group_5__1();
 
             state._fsp--;
@@ -10969,20 +10969,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group_5__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3751:1: rule__RefinedState__Group_5__0__Impl : ( 'exit' ) ;
+    // InternalFSM.g:3754:1: rule__RefinedState__Group_5__0__Impl : ( 'exit' ) ;
     public final void rule__RefinedState__Group_5__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3755:1: ( ( 'exit' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3756:1: ( 'exit' )
+            // InternalFSM.g:3758:1: ( ( 'exit' ) )
+            // InternalFSM.g:3759:1: ( 'exit' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3756:1: ( 'exit' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3757:1: 'exit'
+            // InternalFSM.g:3759:1: ( 'exit' )
+            // InternalFSM.g:3760:1: 'exit'
             {
              before(grammarAccess.getRefinedStateAccess().getExitKeyword_5_0()); 
-            match(input,33,FOLLOW_33_in_rule__RefinedState__Group_5__0__Impl7819); 
+            match(input,33,FOLLOW_2); 
              after(grammarAccess.getRefinedStateAccess().getExitKeyword_5_0()); 
 
             }
@@ -11006,16 +11006,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group_5__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3770:1: rule__RefinedState__Group_5__1 : rule__RefinedState__Group_5__1__Impl ;
+    // InternalFSM.g:3773:1: rule__RefinedState__Group_5__1 : rule__RefinedState__Group_5__1__Impl ;
     public final void rule__RefinedState__Group_5__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3774:1: ( rule__RefinedState__Group_5__1__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3775:2: rule__RefinedState__Group_5__1__Impl
+            // InternalFSM.g:3777:1: ( rule__RefinedState__Group_5__1__Impl )
+            // InternalFSM.g:3778:2: rule__RefinedState__Group_5__1__Impl
             {
-            pushFollow(FOLLOW_rule__RefinedState__Group_5__1__Impl_in_rule__RefinedState__Group_5__17850);
+            pushFollow(FOLLOW_2);
             rule__RefinedState__Group_5__1__Impl();
 
             state._fsp--;
@@ -11039,23 +11039,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group_5__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3781:1: rule__RefinedState__Group_5__1__Impl : ( ( rule__RefinedState__ExitCodeAssignment_5_1 ) ) ;
+    // InternalFSM.g:3784:1: rule__RefinedState__Group_5__1__Impl : ( ( rule__RefinedState__ExitCodeAssignment_5_1 ) ) ;
     public final void rule__RefinedState__Group_5__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3785:1: ( ( ( rule__RefinedState__ExitCodeAssignment_5_1 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3786:1: ( ( rule__RefinedState__ExitCodeAssignment_5_1 ) )
+            // InternalFSM.g:3788:1: ( ( ( rule__RefinedState__ExitCodeAssignment_5_1 ) ) )
+            // InternalFSM.g:3789:1: ( ( rule__RefinedState__ExitCodeAssignment_5_1 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3786:1: ( ( rule__RefinedState__ExitCodeAssignment_5_1 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3787:1: ( rule__RefinedState__ExitCodeAssignment_5_1 )
+            // InternalFSM.g:3789:1: ( ( rule__RefinedState__ExitCodeAssignment_5_1 ) )
+            // InternalFSM.g:3790:1: ( rule__RefinedState__ExitCodeAssignment_5_1 )
             {
              before(grammarAccess.getRefinedStateAccess().getExitCodeAssignment_5_1()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3788:1: ( rule__RefinedState__ExitCodeAssignment_5_1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3788:2: rule__RefinedState__ExitCodeAssignment_5_1
+            // InternalFSM.g:3791:1: ( rule__RefinedState__ExitCodeAssignment_5_1 )
+            // InternalFSM.g:3791:2: rule__RefinedState__ExitCodeAssignment_5_1
             {
-            pushFollow(FOLLOW_rule__RefinedState__ExitCodeAssignment_5_1_in_rule__RefinedState__Group_5__1__Impl7877);
+            pushFollow(FOLLOW_2);
             rule__RefinedState__ExitCodeAssignment_5_1();
 
             state._fsp--;
@@ -11086,21 +11086,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group_6__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3802:1: rule__RefinedState__Group_6__0 : rule__RefinedState__Group_6__0__Impl rule__RefinedState__Group_6__1 ;
+    // InternalFSM.g:3805:1: rule__RefinedState__Group_6__0 : rule__RefinedState__Group_6__0__Impl rule__RefinedState__Group_6__1 ;
     public final void rule__RefinedState__Group_6__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3806:1: ( rule__RefinedState__Group_6__0__Impl rule__RefinedState__Group_6__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3807:2: rule__RefinedState__Group_6__0__Impl rule__RefinedState__Group_6__1
+            // InternalFSM.g:3809:1: ( rule__RefinedState__Group_6__0__Impl rule__RefinedState__Group_6__1 )
+            // InternalFSM.g:3810:2: rule__RefinedState__Group_6__0__Impl rule__RefinedState__Group_6__1
             {
-            pushFollow(FOLLOW_rule__RefinedState__Group_6__0__Impl_in_rule__RefinedState__Group_6__07911);
+            pushFollow(FOLLOW_7);
             rule__RefinedState__Group_6__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RefinedState__Group_6__1_in_rule__RefinedState__Group_6__07914);
+            pushFollow(FOLLOW_2);
             rule__RefinedState__Group_6__1();
 
             state._fsp--;
@@ -11124,20 +11124,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group_6__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3814:1: rule__RefinedState__Group_6__0__Impl : ( 'do' ) ;
+    // InternalFSM.g:3817:1: rule__RefinedState__Group_6__0__Impl : ( 'do' ) ;
     public final void rule__RefinedState__Group_6__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3818:1: ( ( 'do' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3819:1: ( 'do' )
+            // InternalFSM.g:3821:1: ( ( 'do' ) )
+            // InternalFSM.g:3822:1: ( 'do' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3819:1: ( 'do' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3820:1: 'do'
+            // InternalFSM.g:3822:1: ( 'do' )
+            // InternalFSM.g:3823:1: 'do'
             {
              before(grammarAccess.getRefinedStateAccess().getDoKeyword_6_0()); 
-            match(input,34,FOLLOW_34_in_rule__RefinedState__Group_6__0__Impl7942); 
+            match(input,34,FOLLOW_2); 
              after(grammarAccess.getRefinedStateAccess().getDoKeyword_6_0()); 
 
             }
@@ -11161,16 +11161,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group_6__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3833:1: rule__RefinedState__Group_6__1 : rule__RefinedState__Group_6__1__Impl ;
+    // InternalFSM.g:3836:1: rule__RefinedState__Group_6__1 : rule__RefinedState__Group_6__1__Impl ;
     public final void rule__RefinedState__Group_6__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3837:1: ( rule__RefinedState__Group_6__1__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3838:2: rule__RefinedState__Group_6__1__Impl
+            // InternalFSM.g:3840:1: ( rule__RefinedState__Group_6__1__Impl )
+            // InternalFSM.g:3841:2: rule__RefinedState__Group_6__1__Impl
             {
-            pushFollow(FOLLOW_rule__RefinedState__Group_6__1__Impl_in_rule__RefinedState__Group_6__17973);
+            pushFollow(FOLLOW_2);
             rule__RefinedState__Group_6__1__Impl();
 
             state._fsp--;
@@ -11194,23 +11194,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group_6__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3844:1: rule__RefinedState__Group_6__1__Impl : ( ( rule__RefinedState__DoCodeAssignment_6_1 ) ) ;
+    // InternalFSM.g:3847:1: rule__RefinedState__Group_6__1__Impl : ( ( rule__RefinedState__DoCodeAssignment_6_1 ) ) ;
     public final void rule__RefinedState__Group_6__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3848:1: ( ( ( rule__RefinedState__DoCodeAssignment_6_1 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3849:1: ( ( rule__RefinedState__DoCodeAssignment_6_1 ) )
+            // InternalFSM.g:3851:1: ( ( ( rule__RefinedState__DoCodeAssignment_6_1 ) ) )
+            // InternalFSM.g:3852:1: ( ( rule__RefinedState__DoCodeAssignment_6_1 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3849:1: ( ( rule__RefinedState__DoCodeAssignment_6_1 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3850:1: ( rule__RefinedState__DoCodeAssignment_6_1 )
+            // InternalFSM.g:3852:1: ( ( rule__RefinedState__DoCodeAssignment_6_1 ) )
+            // InternalFSM.g:3853:1: ( rule__RefinedState__DoCodeAssignment_6_1 )
             {
              before(grammarAccess.getRefinedStateAccess().getDoCodeAssignment_6_1()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3851:1: ( rule__RefinedState__DoCodeAssignment_6_1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3851:2: rule__RefinedState__DoCodeAssignment_6_1
+            // InternalFSM.g:3854:1: ( rule__RefinedState__DoCodeAssignment_6_1 )
+            // InternalFSM.g:3854:2: rule__RefinedState__DoCodeAssignment_6_1
             {
-            pushFollow(FOLLOW_rule__RefinedState__DoCodeAssignment_6_1_in_rule__RefinedState__Group_6__1__Impl8000);
+            pushFollow(FOLLOW_2);
             rule__RefinedState__DoCodeAssignment_6_1();
 
             state._fsp--;
@@ -11241,21 +11241,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group_7__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3865:1: rule__RefinedState__Group_7__0 : rule__RefinedState__Group_7__0__Impl rule__RefinedState__Group_7__1 ;
+    // InternalFSM.g:3868:1: rule__RefinedState__Group_7__0 : rule__RefinedState__Group_7__0__Impl rule__RefinedState__Group_7__1 ;
     public final void rule__RefinedState__Group_7__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3869:1: ( rule__RefinedState__Group_7__0__Impl rule__RefinedState__Group_7__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3870:2: rule__RefinedState__Group_7__0__Impl rule__RefinedState__Group_7__1
+            // InternalFSM.g:3872:1: ( rule__RefinedState__Group_7__0__Impl rule__RefinedState__Group_7__1 )
+            // InternalFSM.g:3873:2: rule__RefinedState__Group_7__0__Impl rule__RefinedState__Group_7__1
             {
-            pushFollow(FOLLOW_rule__RefinedState__Group_7__0__Impl_in_rule__RefinedState__Group_7__08034);
+            pushFollow(FOLLOW_7);
             rule__RefinedState__Group_7__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RefinedState__Group_7__1_in_rule__RefinedState__Group_7__08037);
+            pushFollow(FOLLOW_2);
             rule__RefinedState__Group_7__1();
 
             state._fsp--;
@@ -11279,20 +11279,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group_7__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3877:1: rule__RefinedState__Group_7__0__Impl : ( 'subgraph' ) ;
+    // InternalFSM.g:3880:1: rule__RefinedState__Group_7__0__Impl : ( 'subgraph' ) ;
     public final void rule__RefinedState__Group_7__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3881:1: ( ( 'subgraph' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3882:1: ( 'subgraph' )
+            // InternalFSM.g:3884:1: ( ( 'subgraph' ) )
+            // InternalFSM.g:3885:1: ( 'subgraph' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3882:1: ( 'subgraph' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3883:1: 'subgraph'
+            // InternalFSM.g:3885:1: ( 'subgraph' )
+            // InternalFSM.g:3886:1: 'subgraph'
             {
              before(grammarAccess.getRefinedStateAccess().getSubgraphKeyword_7_0()); 
-            match(input,35,FOLLOW_35_in_rule__RefinedState__Group_7__0__Impl8065); 
+            match(input,35,FOLLOW_2); 
              after(grammarAccess.getRefinedStateAccess().getSubgraphKeyword_7_0()); 
 
             }
@@ -11316,16 +11316,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group_7__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3896:1: rule__RefinedState__Group_7__1 : rule__RefinedState__Group_7__1__Impl ;
+    // InternalFSM.g:3899:1: rule__RefinedState__Group_7__1 : rule__RefinedState__Group_7__1__Impl ;
     public final void rule__RefinedState__Group_7__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3900:1: ( rule__RefinedState__Group_7__1__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3901:2: rule__RefinedState__Group_7__1__Impl
+            // InternalFSM.g:3903:1: ( rule__RefinedState__Group_7__1__Impl )
+            // InternalFSM.g:3904:2: rule__RefinedState__Group_7__1__Impl
             {
-            pushFollow(FOLLOW_rule__RefinedState__Group_7__1__Impl_in_rule__RefinedState__Group_7__18096);
+            pushFollow(FOLLOW_2);
             rule__RefinedState__Group_7__1__Impl();
 
             state._fsp--;
@@ -11349,23 +11349,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group_7__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3907:1: rule__RefinedState__Group_7__1__Impl : ( ( rule__RefinedState__SubgraphAssignment_7_1 ) ) ;
+    // InternalFSM.g:3910:1: rule__RefinedState__Group_7__1__Impl : ( ( rule__RefinedState__SubgraphAssignment_7_1 ) ) ;
     public final void rule__RefinedState__Group_7__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3911:1: ( ( ( rule__RefinedState__SubgraphAssignment_7_1 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3912:1: ( ( rule__RefinedState__SubgraphAssignment_7_1 ) )
+            // InternalFSM.g:3914:1: ( ( ( rule__RefinedState__SubgraphAssignment_7_1 ) ) )
+            // InternalFSM.g:3915:1: ( ( rule__RefinedState__SubgraphAssignment_7_1 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3912:1: ( ( rule__RefinedState__SubgraphAssignment_7_1 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3913:1: ( rule__RefinedState__SubgraphAssignment_7_1 )
+            // InternalFSM.g:3915:1: ( ( rule__RefinedState__SubgraphAssignment_7_1 ) )
+            // InternalFSM.g:3916:1: ( rule__RefinedState__SubgraphAssignment_7_1 )
             {
              before(grammarAccess.getRefinedStateAccess().getSubgraphAssignment_7_1()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3914:1: ( rule__RefinedState__SubgraphAssignment_7_1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3914:2: rule__RefinedState__SubgraphAssignment_7_1
+            // InternalFSM.g:3917:1: ( rule__RefinedState__SubgraphAssignment_7_1 )
+            // InternalFSM.g:3917:2: rule__RefinedState__SubgraphAssignment_7_1
             {
-            pushFollow(FOLLOW_rule__RefinedState__SubgraphAssignment_7_1_in_rule__RefinedState__Group_7__1__Impl8123);
+            pushFollow(FOLLOW_2);
             rule__RefinedState__SubgraphAssignment_7_1();
 
             state._fsp--;
@@ -11396,21 +11396,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DetailCode__Group__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3928:1: rule__DetailCode__Group__0 : rule__DetailCode__Group__0__Impl rule__DetailCode__Group__1 ;
+    // InternalFSM.g:3931:1: rule__DetailCode__Group__0 : rule__DetailCode__Group__0__Impl rule__DetailCode__Group__1 ;
     public final void rule__DetailCode__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3932:1: ( rule__DetailCode__Group__0__Impl rule__DetailCode__Group__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3933:2: rule__DetailCode__Group__0__Impl rule__DetailCode__Group__1
+            // InternalFSM.g:3935:1: ( rule__DetailCode__Group__0__Impl rule__DetailCode__Group__1 )
+            // InternalFSM.g:3936:2: rule__DetailCode__Group__0__Impl rule__DetailCode__Group__1
             {
-            pushFollow(FOLLOW_rule__DetailCode__Group__0__Impl_in_rule__DetailCode__Group__08157);
+            pushFollow(FOLLOW_7);
             rule__DetailCode__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__DetailCode__Group__1_in_rule__DetailCode__Group__08160);
+            pushFollow(FOLLOW_2);
             rule__DetailCode__Group__1();
 
             state._fsp--;
@@ -11434,21 +11434,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DetailCode__Group__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3940:1: rule__DetailCode__Group__0__Impl : ( () ) ;
+    // InternalFSM.g:3943:1: rule__DetailCode__Group__0__Impl : ( () ) ;
     public final void rule__DetailCode__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3944:1: ( ( () ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3945:1: ( () )
+            // InternalFSM.g:3947:1: ( ( () ) )
+            // InternalFSM.g:3948:1: ( () )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3945:1: ( () )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3946:1: ()
+            // InternalFSM.g:3948:1: ( () )
+            // InternalFSM.g:3949:1: ()
             {
              before(grammarAccess.getDetailCodeAccess().getDetailCodeAction_0()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3947:1: ()
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3949:1: 
+            // InternalFSM.g:3950:1: ()
+            // InternalFSM.g:3952:1: 
             {
             }
 
@@ -11471,21 +11471,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DetailCode__Group__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3959:1: rule__DetailCode__Group__1 : rule__DetailCode__Group__1__Impl rule__DetailCode__Group__2 ;
+    // InternalFSM.g:3962:1: rule__DetailCode__Group__1 : rule__DetailCode__Group__1__Impl rule__DetailCode__Group__2 ;
     public final void rule__DetailCode__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3963:1: ( rule__DetailCode__Group__1__Impl rule__DetailCode__Group__2 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3964:2: rule__DetailCode__Group__1__Impl rule__DetailCode__Group__2
+            // InternalFSM.g:3966:1: ( rule__DetailCode__Group__1__Impl rule__DetailCode__Group__2 )
+            // InternalFSM.g:3967:2: rule__DetailCode__Group__1__Impl rule__DetailCode__Group__2
             {
-            pushFollow(FOLLOW_rule__DetailCode__Group__1__Impl_in_rule__DetailCode__Group__18218);
+            pushFollow(FOLLOW_12);
             rule__DetailCode__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__DetailCode__Group__2_in_rule__DetailCode__Group__18221);
+            pushFollow(FOLLOW_2);
             rule__DetailCode__Group__2();
 
             state._fsp--;
@@ -11509,23 +11509,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DetailCode__Group__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3971:1: rule__DetailCode__Group__1__Impl : ( ( rule__DetailCode__UsedAssignment_1 ) ) ;
+    // InternalFSM.g:3974:1: rule__DetailCode__Group__1__Impl : ( ( rule__DetailCode__UsedAssignment_1 ) ) ;
     public final void rule__DetailCode__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3975:1: ( ( ( rule__DetailCode__UsedAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3976:1: ( ( rule__DetailCode__UsedAssignment_1 ) )
+            // InternalFSM.g:3978:1: ( ( ( rule__DetailCode__UsedAssignment_1 ) ) )
+            // InternalFSM.g:3979:1: ( ( rule__DetailCode__UsedAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3976:1: ( ( rule__DetailCode__UsedAssignment_1 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3977:1: ( rule__DetailCode__UsedAssignment_1 )
+            // InternalFSM.g:3979:1: ( ( rule__DetailCode__UsedAssignment_1 ) )
+            // InternalFSM.g:3980:1: ( rule__DetailCode__UsedAssignment_1 )
             {
              before(grammarAccess.getDetailCodeAccess().getUsedAssignment_1()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3978:1: ( rule__DetailCode__UsedAssignment_1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3978:2: rule__DetailCode__UsedAssignment_1
+            // InternalFSM.g:3981:1: ( rule__DetailCode__UsedAssignment_1 )
+            // InternalFSM.g:3981:2: rule__DetailCode__UsedAssignment_1
             {
-            pushFollow(FOLLOW_rule__DetailCode__UsedAssignment_1_in_rule__DetailCode__Group__1__Impl8248);
+            pushFollow(FOLLOW_2);
             rule__DetailCode__UsedAssignment_1();
 
             state._fsp--;
@@ -11556,21 +11556,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DetailCode__Group__2"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3988:1: rule__DetailCode__Group__2 : rule__DetailCode__Group__2__Impl rule__DetailCode__Group__3 ;
+    // InternalFSM.g:3991:1: rule__DetailCode__Group__2 : rule__DetailCode__Group__2__Impl rule__DetailCode__Group__3 ;
     public final void rule__DetailCode__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3992:1: ( rule__DetailCode__Group__2__Impl rule__DetailCode__Group__3 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:3993:2: rule__DetailCode__Group__2__Impl rule__DetailCode__Group__3
+            // InternalFSM.g:3995:1: ( rule__DetailCode__Group__2__Impl rule__DetailCode__Group__3 )
+            // InternalFSM.g:3996:2: rule__DetailCode__Group__2__Impl rule__DetailCode__Group__3
             {
-            pushFollow(FOLLOW_rule__DetailCode__Group__2__Impl_in_rule__DetailCode__Group__28278);
+            pushFollow(FOLLOW_12);
             rule__DetailCode__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__DetailCode__Group__3_in_rule__DetailCode__Group__28281);
+            pushFollow(FOLLOW_2);
             rule__DetailCode__Group__3();
 
             state._fsp--;
@@ -11594,20 +11594,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DetailCode__Group__2__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4000:1: rule__DetailCode__Group__2__Impl : ( ( rule__DetailCode__LinesAssignment_2 )* ) ;
+    // InternalFSM.g:4003:1: rule__DetailCode__Group__2__Impl : ( ( rule__DetailCode__LinesAssignment_2 )* ) ;
     public final void rule__DetailCode__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4004:1: ( ( ( rule__DetailCode__LinesAssignment_2 )* ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4005:1: ( ( rule__DetailCode__LinesAssignment_2 )* )
+            // InternalFSM.g:4007:1: ( ( ( rule__DetailCode__LinesAssignment_2 )* ) )
+            // InternalFSM.g:4008:1: ( ( rule__DetailCode__LinesAssignment_2 )* )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4005:1: ( ( rule__DetailCode__LinesAssignment_2 )* )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4006:1: ( rule__DetailCode__LinesAssignment_2 )*
+            // InternalFSM.g:4008:1: ( ( rule__DetailCode__LinesAssignment_2 )* )
+            // InternalFSM.g:4009:1: ( rule__DetailCode__LinesAssignment_2 )*
             {
              before(grammarAccess.getDetailCodeAccess().getLinesAssignment_2()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4007:1: ( rule__DetailCode__LinesAssignment_2 )*
+            // InternalFSM.g:4010:1: ( rule__DetailCode__LinesAssignment_2 )*
             loop43:
             do {
                 int alt43=2;
@@ -11620,9 +11620,9 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
                 switch (alt43) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4007:2: rule__DetailCode__LinesAssignment_2
+            	    // InternalFSM.g:4010:2: rule__DetailCode__LinesAssignment_2
             	    {
-            	    pushFollow(FOLLOW_rule__DetailCode__LinesAssignment_2_in_rule__DetailCode__Group__2__Impl8308);
+            	    pushFollow(FOLLOW_13);
             	    rule__DetailCode__LinesAssignment_2();
 
             	    state._fsp--;
@@ -11659,16 +11659,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DetailCode__Group__3"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4017:1: rule__DetailCode__Group__3 : rule__DetailCode__Group__3__Impl ;
+    // InternalFSM.g:4020:1: rule__DetailCode__Group__3 : rule__DetailCode__Group__3__Impl ;
     public final void rule__DetailCode__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4021:1: ( rule__DetailCode__Group__3__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4022:2: rule__DetailCode__Group__3__Impl
+            // InternalFSM.g:4024:1: ( rule__DetailCode__Group__3__Impl )
+            // InternalFSM.g:4025:2: rule__DetailCode__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__DetailCode__Group__3__Impl_in_rule__DetailCode__Group__38339);
+            pushFollow(FOLLOW_2);
             rule__DetailCode__Group__3__Impl();
 
             state._fsp--;
@@ -11692,20 +11692,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DetailCode__Group__3__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4028:1: rule__DetailCode__Group__3__Impl : ( '}' ) ;
+    // InternalFSM.g:4031:1: rule__DetailCode__Group__3__Impl : ( '}' ) ;
     public final void rule__DetailCode__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4032:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4033:1: ( '}' )
+            // InternalFSM.g:4035:1: ( ( '}' ) )
+            // InternalFSM.g:4036:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4033:1: ( '}' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4034:1: '}'
+            // InternalFSM.g:4036:1: ( '}' )
+            // InternalFSM.g:4037:1: '}'
             {
              before(grammarAccess.getDetailCodeAccess().getRightCurlyBracketKeyword_3()); 
-            match(input,29,FOLLOW_29_in_rule__DetailCode__Group__3__Impl8367); 
+            match(input,29,FOLLOW_2); 
              after(grammarAccess.getDetailCodeAccess().getRightCurlyBracketKeyword_3()); 
 
             }
@@ -11729,21 +11729,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TransitionPoint__Group__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4055:1: rule__TransitionPoint__Group__0 : rule__TransitionPoint__Group__0__Impl rule__TransitionPoint__Group__1 ;
+    // InternalFSM.g:4058:1: rule__TransitionPoint__Group__0 : rule__TransitionPoint__Group__0__Impl rule__TransitionPoint__Group__1 ;
     public final void rule__TransitionPoint__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4059:1: ( rule__TransitionPoint__Group__0__Impl rule__TransitionPoint__Group__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4060:2: rule__TransitionPoint__Group__0__Impl rule__TransitionPoint__Group__1
+            // InternalFSM.g:4062:1: ( rule__TransitionPoint__Group__0__Impl rule__TransitionPoint__Group__1 )
+            // InternalFSM.g:4063:2: rule__TransitionPoint__Group__0__Impl rule__TransitionPoint__Group__1
             {
-            pushFollow(FOLLOW_rule__TransitionPoint__Group__0__Impl_in_rule__TransitionPoint__Group__08406);
+            pushFollow(FOLLOW_14);
             rule__TransitionPoint__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__TransitionPoint__Group__1_in_rule__TransitionPoint__Group__08409);
+            pushFollow(FOLLOW_2);
             rule__TransitionPoint__Group__1();
 
             state._fsp--;
@@ -11767,20 +11767,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TransitionPoint__Group__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4067:1: rule__TransitionPoint__Group__0__Impl : ( ( rule__TransitionPoint__HandlerAssignment_0 )? ) ;
+    // InternalFSM.g:4070:1: rule__TransitionPoint__Group__0__Impl : ( ( rule__TransitionPoint__HandlerAssignment_0 )? ) ;
     public final void rule__TransitionPoint__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4071:1: ( ( ( rule__TransitionPoint__HandlerAssignment_0 )? ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4072:1: ( ( rule__TransitionPoint__HandlerAssignment_0 )? )
+            // InternalFSM.g:4074:1: ( ( ( rule__TransitionPoint__HandlerAssignment_0 )? ) )
+            // InternalFSM.g:4075:1: ( ( rule__TransitionPoint__HandlerAssignment_0 )? )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4072:1: ( ( rule__TransitionPoint__HandlerAssignment_0 )? )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4073:1: ( rule__TransitionPoint__HandlerAssignment_0 )?
+            // InternalFSM.g:4075:1: ( ( rule__TransitionPoint__HandlerAssignment_0 )? )
+            // InternalFSM.g:4076:1: ( rule__TransitionPoint__HandlerAssignment_0 )?
             {
              before(grammarAccess.getTransitionPointAccess().getHandlerAssignment_0()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4074:1: ( rule__TransitionPoint__HandlerAssignment_0 )?
+            // InternalFSM.g:4077:1: ( rule__TransitionPoint__HandlerAssignment_0 )?
             int alt44=2;
             int LA44_0 = input.LA(1);
 
@@ -11789,9 +11789,9 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt44) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4074:2: rule__TransitionPoint__HandlerAssignment_0
+                    // InternalFSM.g:4077:2: rule__TransitionPoint__HandlerAssignment_0
                     {
-                    pushFollow(FOLLOW_rule__TransitionPoint__HandlerAssignment_0_in_rule__TransitionPoint__Group__0__Impl8436);
+                    pushFollow(FOLLOW_2);
                     rule__TransitionPoint__HandlerAssignment_0();
 
                     state._fsp--;
@@ -11825,21 +11825,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TransitionPoint__Group__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4084:1: rule__TransitionPoint__Group__1 : rule__TransitionPoint__Group__1__Impl rule__TransitionPoint__Group__2 ;
+    // InternalFSM.g:4087:1: rule__TransitionPoint__Group__1 : rule__TransitionPoint__Group__1__Impl rule__TransitionPoint__Group__2 ;
     public final void rule__TransitionPoint__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4088:1: ( rule__TransitionPoint__Group__1__Impl rule__TransitionPoint__Group__2 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4089:2: rule__TransitionPoint__Group__1__Impl rule__TransitionPoint__Group__2
+            // InternalFSM.g:4091:1: ( rule__TransitionPoint__Group__1__Impl rule__TransitionPoint__Group__2 )
+            // InternalFSM.g:4092:2: rule__TransitionPoint__Group__1__Impl rule__TransitionPoint__Group__2
             {
-            pushFollow(FOLLOW_rule__TransitionPoint__Group__1__Impl_in_rule__TransitionPoint__Group__18467);
+            pushFollow(FOLLOW_5);
             rule__TransitionPoint__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__TransitionPoint__Group__2_in_rule__TransitionPoint__Group__18470);
+            pushFollow(FOLLOW_2);
             rule__TransitionPoint__Group__2();
 
             state._fsp--;
@@ -11863,20 +11863,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TransitionPoint__Group__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4096:1: rule__TransitionPoint__Group__1__Impl : ( 'TransitionPoint' ) ;
+    // InternalFSM.g:4099:1: rule__TransitionPoint__Group__1__Impl : ( 'TransitionPoint' ) ;
     public final void rule__TransitionPoint__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4100:1: ( ( 'TransitionPoint' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4101:1: ( 'TransitionPoint' )
+            // InternalFSM.g:4103:1: ( ( 'TransitionPoint' ) )
+            // InternalFSM.g:4104:1: ( 'TransitionPoint' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4101:1: ( 'TransitionPoint' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4102:1: 'TransitionPoint'
+            // InternalFSM.g:4104:1: ( 'TransitionPoint' )
+            // InternalFSM.g:4105:1: 'TransitionPoint'
             {
              before(grammarAccess.getTransitionPointAccess().getTransitionPointKeyword_1()); 
-            match(input,37,FOLLOW_37_in_rule__TransitionPoint__Group__1__Impl8498); 
+            match(input,37,FOLLOW_2); 
              after(grammarAccess.getTransitionPointAccess().getTransitionPointKeyword_1()); 
 
             }
@@ -11900,16 +11900,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TransitionPoint__Group__2"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4115:1: rule__TransitionPoint__Group__2 : rule__TransitionPoint__Group__2__Impl ;
+    // InternalFSM.g:4118:1: rule__TransitionPoint__Group__2 : rule__TransitionPoint__Group__2__Impl ;
     public final void rule__TransitionPoint__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4119:1: ( rule__TransitionPoint__Group__2__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4120:2: rule__TransitionPoint__Group__2__Impl
+            // InternalFSM.g:4122:1: ( rule__TransitionPoint__Group__2__Impl )
+            // InternalFSM.g:4123:2: rule__TransitionPoint__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__TransitionPoint__Group__2__Impl_in_rule__TransitionPoint__Group__28529);
+            pushFollow(FOLLOW_2);
             rule__TransitionPoint__Group__2__Impl();
 
             state._fsp--;
@@ -11933,23 +11933,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TransitionPoint__Group__2__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4126:1: rule__TransitionPoint__Group__2__Impl : ( ( rule__TransitionPoint__NameAssignment_2 ) ) ;
+    // InternalFSM.g:4129:1: rule__TransitionPoint__Group__2__Impl : ( ( rule__TransitionPoint__NameAssignment_2 ) ) ;
     public final void rule__TransitionPoint__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4130:1: ( ( ( rule__TransitionPoint__NameAssignment_2 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4131:1: ( ( rule__TransitionPoint__NameAssignment_2 ) )
+            // InternalFSM.g:4133:1: ( ( ( rule__TransitionPoint__NameAssignment_2 ) ) )
+            // InternalFSM.g:4134:1: ( ( rule__TransitionPoint__NameAssignment_2 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4131:1: ( ( rule__TransitionPoint__NameAssignment_2 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4132:1: ( rule__TransitionPoint__NameAssignment_2 )
+            // InternalFSM.g:4134:1: ( ( rule__TransitionPoint__NameAssignment_2 ) )
+            // InternalFSM.g:4135:1: ( rule__TransitionPoint__NameAssignment_2 )
             {
              before(grammarAccess.getTransitionPointAccess().getNameAssignment_2()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4133:1: ( rule__TransitionPoint__NameAssignment_2 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4133:2: rule__TransitionPoint__NameAssignment_2
+            // InternalFSM.g:4136:1: ( rule__TransitionPoint__NameAssignment_2 )
+            // InternalFSM.g:4136:2: rule__TransitionPoint__NameAssignment_2
             {
-            pushFollow(FOLLOW_rule__TransitionPoint__NameAssignment_2_in_rule__TransitionPoint__Group__2__Impl8556);
+            pushFollow(FOLLOW_2);
             rule__TransitionPoint__NameAssignment_2();
 
             state._fsp--;
@@ -11980,21 +11980,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EntryPoint__Group__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4149:1: rule__EntryPoint__Group__0 : rule__EntryPoint__Group__0__Impl rule__EntryPoint__Group__1 ;
+    // InternalFSM.g:4152:1: rule__EntryPoint__Group__0 : rule__EntryPoint__Group__0__Impl rule__EntryPoint__Group__1 ;
     public final void rule__EntryPoint__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4153:1: ( rule__EntryPoint__Group__0__Impl rule__EntryPoint__Group__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4154:2: rule__EntryPoint__Group__0__Impl rule__EntryPoint__Group__1
+            // InternalFSM.g:4156:1: ( rule__EntryPoint__Group__0__Impl rule__EntryPoint__Group__1 )
+            // InternalFSM.g:4157:2: rule__EntryPoint__Group__0__Impl rule__EntryPoint__Group__1
             {
-            pushFollow(FOLLOW_rule__EntryPoint__Group__0__Impl_in_rule__EntryPoint__Group__08592);
+            pushFollow(FOLLOW_5);
             rule__EntryPoint__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__EntryPoint__Group__1_in_rule__EntryPoint__Group__08595);
+            pushFollow(FOLLOW_2);
             rule__EntryPoint__Group__1();
 
             state._fsp--;
@@ -12018,20 +12018,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EntryPoint__Group__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4161:1: rule__EntryPoint__Group__0__Impl : ( 'EntryPoint' ) ;
+    // InternalFSM.g:4164:1: rule__EntryPoint__Group__0__Impl : ( 'EntryPoint' ) ;
     public final void rule__EntryPoint__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4165:1: ( ( 'EntryPoint' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4166:1: ( 'EntryPoint' )
+            // InternalFSM.g:4168:1: ( ( 'EntryPoint' ) )
+            // InternalFSM.g:4169:1: ( 'EntryPoint' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4166:1: ( 'EntryPoint' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4167:1: 'EntryPoint'
+            // InternalFSM.g:4169:1: ( 'EntryPoint' )
+            // InternalFSM.g:4170:1: 'EntryPoint'
             {
              before(grammarAccess.getEntryPointAccess().getEntryPointKeyword_0()); 
-            match(input,38,FOLLOW_38_in_rule__EntryPoint__Group__0__Impl8623); 
+            match(input,38,FOLLOW_2); 
              after(grammarAccess.getEntryPointAccess().getEntryPointKeyword_0()); 
 
             }
@@ -12055,16 +12055,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EntryPoint__Group__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4180:1: rule__EntryPoint__Group__1 : rule__EntryPoint__Group__1__Impl ;
+    // InternalFSM.g:4183:1: rule__EntryPoint__Group__1 : rule__EntryPoint__Group__1__Impl ;
     public final void rule__EntryPoint__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4184:1: ( rule__EntryPoint__Group__1__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4185:2: rule__EntryPoint__Group__1__Impl
+            // InternalFSM.g:4187:1: ( rule__EntryPoint__Group__1__Impl )
+            // InternalFSM.g:4188:2: rule__EntryPoint__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__EntryPoint__Group__1__Impl_in_rule__EntryPoint__Group__18654);
+            pushFollow(FOLLOW_2);
             rule__EntryPoint__Group__1__Impl();
 
             state._fsp--;
@@ -12088,23 +12088,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EntryPoint__Group__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4191:1: rule__EntryPoint__Group__1__Impl : ( ( rule__EntryPoint__NameAssignment_1 ) ) ;
+    // InternalFSM.g:4194:1: rule__EntryPoint__Group__1__Impl : ( ( rule__EntryPoint__NameAssignment_1 ) ) ;
     public final void rule__EntryPoint__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4195:1: ( ( ( rule__EntryPoint__NameAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4196:1: ( ( rule__EntryPoint__NameAssignment_1 ) )
+            // InternalFSM.g:4198:1: ( ( ( rule__EntryPoint__NameAssignment_1 ) ) )
+            // InternalFSM.g:4199:1: ( ( rule__EntryPoint__NameAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4196:1: ( ( rule__EntryPoint__NameAssignment_1 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4197:1: ( rule__EntryPoint__NameAssignment_1 )
+            // InternalFSM.g:4199:1: ( ( rule__EntryPoint__NameAssignment_1 ) )
+            // InternalFSM.g:4200:1: ( rule__EntryPoint__NameAssignment_1 )
             {
              before(grammarAccess.getEntryPointAccess().getNameAssignment_1()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4198:1: ( rule__EntryPoint__NameAssignment_1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4198:2: rule__EntryPoint__NameAssignment_1
+            // InternalFSM.g:4201:1: ( rule__EntryPoint__NameAssignment_1 )
+            // InternalFSM.g:4201:2: rule__EntryPoint__NameAssignment_1
             {
-            pushFollow(FOLLOW_rule__EntryPoint__NameAssignment_1_in_rule__EntryPoint__Group__1__Impl8681);
+            pushFollow(FOLLOW_2);
             rule__EntryPoint__NameAssignment_1();
 
             state._fsp--;
@@ -12135,21 +12135,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ExitPoint__Group__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4212:1: rule__ExitPoint__Group__0 : rule__ExitPoint__Group__0__Impl rule__ExitPoint__Group__1 ;
+    // InternalFSM.g:4215:1: rule__ExitPoint__Group__0 : rule__ExitPoint__Group__0__Impl rule__ExitPoint__Group__1 ;
     public final void rule__ExitPoint__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4216:1: ( rule__ExitPoint__Group__0__Impl rule__ExitPoint__Group__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4217:2: rule__ExitPoint__Group__0__Impl rule__ExitPoint__Group__1
+            // InternalFSM.g:4219:1: ( rule__ExitPoint__Group__0__Impl rule__ExitPoint__Group__1 )
+            // InternalFSM.g:4220:2: rule__ExitPoint__Group__0__Impl rule__ExitPoint__Group__1
             {
-            pushFollow(FOLLOW_rule__ExitPoint__Group__0__Impl_in_rule__ExitPoint__Group__08715);
+            pushFollow(FOLLOW_5);
             rule__ExitPoint__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ExitPoint__Group__1_in_rule__ExitPoint__Group__08718);
+            pushFollow(FOLLOW_2);
             rule__ExitPoint__Group__1();
 
             state._fsp--;
@@ -12173,20 +12173,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ExitPoint__Group__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4224:1: rule__ExitPoint__Group__0__Impl : ( 'ExitPoint' ) ;
+    // InternalFSM.g:4227:1: rule__ExitPoint__Group__0__Impl : ( 'ExitPoint' ) ;
     public final void rule__ExitPoint__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4228:1: ( ( 'ExitPoint' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4229:1: ( 'ExitPoint' )
+            // InternalFSM.g:4231:1: ( ( 'ExitPoint' ) )
+            // InternalFSM.g:4232:1: ( 'ExitPoint' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4229:1: ( 'ExitPoint' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4230:1: 'ExitPoint'
+            // InternalFSM.g:4232:1: ( 'ExitPoint' )
+            // InternalFSM.g:4233:1: 'ExitPoint'
             {
              before(grammarAccess.getExitPointAccess().getExitPointKeyword_0()); 
-            match(input,39,FOLLOW_39_in_rule__ExitPoint__Group__0__Impl8746); 
+            match(input,39,FOLLOW_2); 
              after(grammarAccess.getExitPointAccess().getExitPointKeyword_0()); 
 
             }
@@ -12210,16 +12210,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ExitPoint__Group__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4243:1: rule__ExitPoint__Group__1 : rule__ExitPoint__Group__1__Impl ;
+    // InternalFSM.g:4246:1: rule__ExitPoint__Group__1 : rule__ExitPoint__Group__1__Impl ;
     public final void rule__ExitPoint__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4247:1: ( rule__ExitPoint__Group__1__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4248:2: rule__ExitPoint__Group__1__Impl
+            // InternalFSM.g:4250:1: ( rule__ExitPoint__Group__1__Impl )
+            // InternalFSM.g:4251:2: rule__ExitPoint__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__ExitPoint__Group__1__Impl_in_rule__ExitPoint__Group__18777);
+            pushFollow(FOLLOW_2);
             rule__ExitPoint__Group__1__Impl();
 
             state._fsp--;
@@ -12243,23 +12243,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ExitPoint__Group__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4254:1: rule__ExitPoint__Group__1__Impl : ( ( rule__ExitPoint__NameAssignment_1 ) ) ;
+    // InternalFSM.g:4257:1: rule__ExitPoint__Group__1__Impl : ( ( rule__ExitPoint__NameAssignment_1 ) ) ;
     public final void rule__ExitPoint__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4258:1: ( ( ( rule__ExitPoint__NameAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4259:1: ( ( rule__ExitPoint__NameAssignment_1 ) )
+            // InternalFSM.g:4261:1: ( ( ( rule__ExitPoint__NameAssignment_1 ) ) )
+            // InternalFSM.g:4262:1: ( ( rule__ExitPoint__NameAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4259:1: ( ( rule__ExitPoint__NameAssignment_1 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4260:1: ( rule__ExitPoint__NameAssignment_1 )
+            // InternalFSM.g:4262:1: ( ( rule__ExitPoint__NameAssignment_1 ) )
+            // InternalFSM.g:4263:1: ( rule__ExitPoint__NameAssignment_1 )
             {
              before(grammarAccess.getExitPointAccess().getNameAssignment_1()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4261:1: ( rule__ExitPoint__NameAssignment_1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4261:2: rule__ExitPoint__NameAssignment_1
+            // InternalFSM.g:4264:1: ( rule__ExitPoint__NameAssignment_1 )
+            // InternalFSM.g:4264:2: rule__ExitPoint__NameAssignment_1
             {
-            pushFollow(FOLLOW_rule__ExitPoint__NameAssignment_1_in_rule__ExitPoint__Group__1__Impl8804);
+            pushFollow(FOLLOW_2);
             rule__ExitPoint__NameAssignment_1();
 
             state._fsp--;
@@ -12290,21 +12290,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ChoicePoint__Group__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4275:1: rule__ChoicePoint__Group__0 : rule__ChoicePoint__Group__0__Impl rule__ChoicePoint__Group__1 ;
+    // InternalFSM.g:4278:1: rule__ChoicePoint__Group__0 : rule__ChoicePoint__Group__0__Impl rule__ChoicePoint__Group__1 ;
     public final void rule__ChoicePoint__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4279:1: ( rule__ChoicePoint__Group__0__Impl rule__ChoicePoint__Group__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4280:2: rule__ChoicePoint__Group__0__Impl rule__ChoicePoint__Group__1
+            // InternalFSM.g:4282:1: ( rule__ChoicePoint__Group__0__Impl rule__ChoicePoint__Group__1 )
+            // InternalFSM.g:4283:2: rule__ChoicePoint__Group__0__Impl rule__ChoicePoint__Group__1
             {
-            pushFollow(FOLLOW_rule__ChoicePoint__Group__0__Impl_in_rule__ChoicePoint__Group__08838);
+            pushFollow(FOLLOW_5);
             rule__ChoicePoint__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ChoicePoint__Group__1_in_rule__ChoicePoint__Group__08841);
+            pushFollow(FOLLOW_2);
             rule__ChoicePoint__Group__1();
 
             state._fsp--;
@@ -12328,20 +12328,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ChoicePoint__Group__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4287:1: rule__ChoicePoint__Group__0__Impl : ( 'ChoicePoint' ) ;
+    // InternalFSM.g:4290:1: rule__ChoicePoint__Group__0__Impl : ( 'ChoicePoint' ) ;
     public final void rule__ChoicePoint__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4291:1: ( ( 'ChoicePoint' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4292:1: ( 'ChoicePoint' )
+            // InternalFSM.g:4294:1: ( ( 'ChoicePoint' ) )
+            // InternalFSM.g:4295:1: ( 'ChoicePoint' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4292:1: ( 'ChoicePoint' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4293:1: 'ChoicePoint'
+            // InternalFSM.g:4295:1: ( 'ChoicePoint' )
+            // InternalFSM.g:4296:1: 'ChoicePoint'
             {
              before(grammarAccess.getChoicePointAccess().getChoicePointKeyword_0()); 
-            match(input,40,FOLLOW_40_in_rule__ChoicePoint__Group__0__Impl8869); 
+            match(input,40,FOLLOW_2); 
              after(grammarAccess.getChoicePointAccess().getChoicePointKeyword_0()); 
 
             }
@@ -12365,21 +12365,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ChoicePoint__Group__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4306:1: rule__ChoicePoint__Group__1 : rule__ChoicePoint__Group__1__Impl rule__ChoicePoint__Group__2 ;
+    // InternalFSM.g:4309:1: rule__ChoicePoint__Group__1 : rule__ChoicePoint__Group__1__Impl rule__ChoicePoint__Group__2 ;
     public final void rule__ChoicePoint__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4310:1: ( rule__ChoicePoint__Group__1__Impl rule__ChoicePoint__Group__2 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4311:2: rule__ChoicePoint__Group__1__Impl rule__ChoicePoint__Group__2
+            // InternalFSM.g:4313:1: ( rule__ChoicePoint__Group__1__Impl rule__ChoicePoint__Group__2 )
+            // InternalFSM.g:4314:2: rule__ChoicePoint__Group__1__Impl rule__ChoicePoint__Group__2
             {
-            pushFollow(FOLLOW_rule__ChoicePoint__Group__1__Impl_in_rule__ChoicePoint__Group__18900);
+            pushFollow(FOLLOW_15);
             rule__ChoicePoint__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ChoicePoint__Group__2_in_rule__ChoicePoint__Group__18903);
+            pushFollow(FOLLOW_2);
             rule__ChoicePoint__Group__2();
 
             state._fsp--;
@@ -12403,23 +12403,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ChoicePoint__Group__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4318:1: rule__ChoicePoint__Group__1__Impl : ( ( rule__ChoicePoint__NameAssignment_1 ) ) ;
+    // InternalFSM.g:4321:1: rule__ChoicePoint__Group__1__Impl : ( ( rule__ChoicePoint__NameAssignment_1 ) ) ;
     public final void rule__ChoicePoint__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4322:1: ( ( ( rule__ChoicePoint__NameAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4323:1: ( ( rule__ChoicePoint__NameAssignment_1 ) )
+            // InternalFSM.g:4325:1: ( ( ( rule__ChoicePoint__NameAssignment_1 ) ) )
+            // InternalFSM.g:4326:1: ( ( rule__ChoicePoint__NameAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4323:1: ( ( rule__ChoicePoint__NameAssignment_1 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4324:1: ( rule__ChoicePoint__NameAssignment_1 )
+            // InternalFSM.g:4326:1: ( ( rule__ChoicePoint__NameAssignment_1 ) )
+            // InternalFSM.g:4327:1: ( rule__ChoicePoint__NameAssignment_1 )
             {
              before(grammarAccess.getChoicePointAccess().getNameAssignment_1()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4325:1: ( rule__ChoicePoint__NameAssignment_1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4325:2: rule__ChoicePoint__NameAssignment_1
+            // InternalFSM.g:4328:1: ( rule__ChoicePoint__NameAssignment_1 )
+            // InternalFSM.g:4328:2: rule__ChoicePoint__NameAssignment_1
             {
-            pushFollow(FOLLOW_rule__ChoicePoint__NameAssignment_1_in_rule__ChoicePoint__Group__1__Impl8930);
+            pushFollow(FOLLOW_2);
             rule__ChoicePoint__NameAssignment_1();
 
             state._fsp--;
@@ -12450,16 +12450,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ChoicePoint__Group__2"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4335:1: rule__ChoicePoint__Group__2 : rule__ChoicePoint__Group__2__Impl ;
+    // InternalFSM.g:4338:1: rule__ChoicePoint__Group__2 : rule__ChoicePoint__Group__2__Impl ;
     public final void rule__ChoicePoint__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4339:1: ( rule__ChoicePoint__Group__2__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4340:2: rule__ChoicePoint__Group__2__Impl
+            // InternalFSM.g:4342:1: ( rule__ChoicePoint__Group__2__Impl )
+            // InternalFSM.g:4343:2: rule__ChoicePoint__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__ChoicePoint__Group__2__Impl_in_rule__ChoicePoint__Group__28960);
+            pushFollow(FOLLOW_2);
             rule__ChoicePoint__Group__2__Impl();
 
             state._fsp--;
@@ -12483,20 +12483,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ChoicePoint__Group__2__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4346:1: rule__ChoicePoint__Group__2__Impl : ( ( rule__ChoicePoint__DocuAssignment_2 )? ) ;
+    // InternalFSM.g:4349:1: rule__ChoicePoint__Group__2__Impl : ( ( rule__ChoicePoint__DocuAssignment_2 )? ) ;
     public final void rule__ChoicePoint__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4350:1: ( ( ( rule__ChoicePoint__DocuAssignment_2 )? ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4351:1: ( ( rule__ChoicePoint__DocuAssignment_2 )? )
+            // InternalFSM.g:4353:1: ( ( ( rule__ChoicePoint__DocuAssignment_2 )? ) )
+            // InternalFSM.g:4354:1: ( ( rule__ChoicePoint__DocuAssignment_2 )? )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4351:1: ( ( rule__ChoicePoint__DocuAssignment_2 )? )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4352:1: ( rule__ChoicePoint__DocuAssignment_2 )?
+            // InternalFSM.g:4354:1: ( ( rule__ChoicePoint__DocuAssignment_2 )? )
+            // InternalFSM.g:4355:1: ( rule__ChoicePoint__DocuAssignment_2 )?
             {
              before(grammarAccess.getChoicePointAccess().getDocuAssignment_2()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4353:1: ( rule__ChoicePoint__DocuAssignment_2 )?
+            // InternalFSM.g:4356:1: ( rule__ChoicePoint__DocuAssignment_2 )?
             int alt45=2;
             int LA45_0 = input.LA(1);
 
@@ -12505,9 +12505,9 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt45) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4353:2: rule__ChoicePoint__DocuAssignment_2
+                    // InternalFSM.g:4356:2: rule__ChoicePoint__DocuAssignment_2
                     {
-                    pushFollow(FOLLOW_rule__ChoicePoint__DocuAssignment_2_in_rule__ChoicePoint__Group__2__Impl8987);
+                    pushFollow(FOLLOW_2);
                     rule__ChoicePoint__DocuAssignment_2();
 
                     state._fsp--;
@@ -12541,21 +12541,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__Group__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4369:1: rule__InitialTransition__Group__0 : rule__InitialTransition__Group__0__Impl rule__InitialTransition__Group__1 ;
+    // InternalFSM.g:4372:1: rule__InitialTransition__Group__0 : rule__InitialTransition__Group__0__Impl rule__InitialTransition__Group__1 ;
     public final void rule__InitialTransition__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4373:1: ( rule__InitialTransition__Group__0__Impl rule__InitialTransition__Group__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4374:2: rule__InitialTransition__Group__0__Impl rule__InitialTransition__Group__1
+            // InternalFSM.g:4376:1: ( rule__InitialTransition__Group__0__Impl rule__InitialTransition__Group__1 )
+            // InternalFSM.g:4377:2: rule__InitialTransition__Group__0__Impl rule__InitialTransition__Group__1
             {
-            pushFollow(FOLLOW_rule__InitialTransition__Group__0__Impl_in_rule__InitialTransition__Group__09024);
+            pushFollow(FOLLOW_16);
             rule__InitialTransition__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__InitialTransition__Group__1_in_rule__InitialTransition__Group__09027);
+            pushFollow(FOLLOW_2);
             rule__InitialTransition__Group__1();
 
             state._fsp--;
@@ -12579,20 +12579,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__Group__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4381:1: rule__InitialTransition__Group__0__Impl : ( 'Transition' ) ;
+    // InternalFSM.g:4384:1: rule__InitialTransition__Group__0__Impl : ( 'Transition' ) ;
     public final void rule__InitialTransition__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4385:1: ( ( 'Transition' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4386:1: ( 'Transition' )
+            // InternalFSM.g:4388:1: ( ( 'Transition' ) )
+            // InternalFSM.g:4389:1: ( 'Transition' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4386:1: ( 'Transition' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4387:1: 'Transition'
+            // InternalFSM.g:4389:1: ( 'Transition' )
+            // InternalFSM.g:4390:1: 'Transition'
             {
              before(grammarAccess.getInitialTransitionAccess().getTransitionKeyword_0()); 
-            match(input,41,FOLLOW_41_in_rule__InitialTransition__Group__0__Impl9055); 
+            match(input,41,FOLLOW_2); 
              after(grammarAccess.getInitialTransitionAccess().getTransitionKeyword_0()); 
 
             }
@@ -12616,21 +12616,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__Group__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4400:1: rule__InitialTransition__Group__1 : rule__InitialTransition__Group__1__Impl rule__InitialTransition__Group__2 ;
+    // InternalFSM.g:4403:1: rule__InitialTransition__Group__1 : rule__InitialTransition__Group__1__Impl rule__InitialTransition__Group__2 ;
     public final void rule__InitialTransition__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4404:1: ( rule__InitialTransition__Group__1__Impl rule__InitialTransition__Group__2 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4405:2: rule__InitialTransition__Group__1__Impl rule__InitialTransition__Group__2
+            // InternalFSM.g:4407:1: ( rule__InitialTransition__Group__1__Impl rule__InitialTransition__Group__2 )
+            // InternalFSM.g:4408:2: rule__InitialTransition__Group__1__Impl rule__InitialTransition__Group__2
             {
-            pushFollow(FOLLOW_rule__InitialTransition__Group__1__Impl_in_rule__InitialTransition__Group__19086);
+            pushFollow(FOLLOW_16);
             rule__InitialTransition__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__InitialTransition__Group__2_in_rule__InitialTransition__Group__19089);
+            pushFollow(FOLLOW_2);
             rule__InitialTransition__Group__2();
 
             state._fsp--;
@@ -12654,20 +12654,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__Group__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4412:1: rule__InitialTransition__Group__1__Impl : ( ( rule__InitialTransition__NameAssignment_1 )? ) ;
+    // InternalFSM.g:4415:1: rule__InitialTransition__Group__1__Impl : ( ( rule__InitialTransition__NameAssignment_1 )? ) ;
     public final void rule__InitialTransition__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4416:1: ( ( ( rule__InitialTransition__NameAssignment_1 )? ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4417:1: ( ( rule__InitialTransition__NameAssignment_1 )? )
+            // InternalFSM.g:4419:1: ( ( ( rule__InitialTransition__NameAssignment_1 )? ) )
+            // InternalFSM.g:4420:1: ( ( rule__InitialTransition__NameAssignment_1 )? )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4417:1: ( ( rule__InitialTransition__NameAssignment_1 )? )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4418:1: ( rule__InitialTransition__NameAssignment_1 )?
+            // InternalFSM.g:4420:1: ( ( rule__InitialTransition__NameAssignment_1 )? )
+            // InternalFSM.g:4421:1: ( rule__InitialTransition__NameAssignment_1 )?
             {
              before(grammarAccess.getInitialTransitionAccess().getNameAssignment_1()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4419:1: ( rule__InitialTransition__NameAssignment_1 )?
+            // InternalFSM.g:4422:1: ( rule__InitialTransition__NameAssignment_1 )?
             int alt46=2;
             int LA46_0 = input.LA(1);
 
@@ -12676,9 +12676,9 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt46) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4419:2: rule__InitialTransition__NameAssignment_1
+                    // InternalFSM.g:4422:2: rule__InitialTransition__NameAssignment_1
                     {
-                    pushFollow(FOLLOW_rule__InitialTransition__NameAssignment_1_in_rule__InitialTransition__Group__1__Impl9116);
+                    pushFollow(FOLLOW_2);
                     rule__InitialTransition__NameAssignment_1();
 
                     state._fsp--;
@@ -12712,21 +12712,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__Group__2"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4429:1: rule__InitialTransition__Group__2 : rule__InitialTransition__Group__2__Impl rule__InitialTransition__Group__3 ;
+    // InternalFSM.g:4432:1: rule__InitialTransition__Group__2 : rule__InitialTransition__Group__2__Impl rule__InitialTransition__Group__3 ;
     public final void rule__InitialTransition__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4433:1: ( rule__InitialTransition__Group__2__Impl rule__InitialTransition__Group__3 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4434:2: rule__InitialTransition__Group__2__Impl rule__InitialTransition__Group__3
+            // InternalFSM.g:4436:1: ( rule__InitialTransition__Group__2__Impl rule__InitialTransition__Group__3 )
+            // InternalFSM.g:4437:2: rule__InitialTransition__Group__2__Impl rule__InitialTransition__Group__3
             {
-            pushFollow(FOLLOW_rule__InitialTransition__Group__2__Impl_in_rule__InitialTransition__Group__29147);
+            pushFollow(FOLLOW_17);
             rule__InitialTransition__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__InitialTransition__Group__3_in_rule__InitialTransition__Group__29150);
+            pushFollow(FOLLOW_2);
             rule__InitialTransition__Group__3();
 
             state._fsp--;
@@ -12750,20 +12750,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__Group__2__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4441:1: rule__InitialTransition__Group__2__Impl : ( ':' ) ;
+    // InternalFSM.g:4444:1: rule__InitialTransition__Group__2__Impl : ( ':' ) ;
     public final void rule__InitialTransition__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4445:1: ( ( ':' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4446:1: ( ':' )
+            // InternalFSM.g:4448:1: ( ( ':' ) )
+            // InternalFSM.g:4449:1: ( ':' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4446:1: ( ':' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4447:1: ':'
+            // InternalFSM.g:4449:1: ( ':' )
+            // InternalFSM.g:4450:1: ':'
             {
              before(grammarAccess.getInitialTransitionAccess().getColonKeyword_2()); 
-            match(input,42,FOLLOW_42_in_rule__InitialTransition__Group__2__Impl9178); 
+            match(input,42,FOLLOW_2); 
              after(grammarAccess.getInitialTransitionAccess().getColonKeyword_2()); 
 
             }
@@ -12787,21 +12787,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__Group__3"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4460:1: rule__InitialTransition__Group__3 : rule__InitialTransition__Group__3__Impl rule__InitialTransition__Group__4 ;
+    // InternalFSM.g:4463:1: rule__InitialTransition__Group__3 : rule__InitialTransition__Group__3__Impl rule__InitialTransition__Group__4 ;
     public final void rule__InitialTransition__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4464:1: ( rule__InitialTransition__Group__3__Impl rule__InitialTransition__Group__4 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4465:2: rule__InitialTransition__Group__3__Impl rule__InitialTransition__Group__4
+            // InternalFSM.g:4467:1: ( rule__InitialTransition__Group__3__Impl rule__InitialTransition__Group__4 )
+            // InternalFSM.g:4468:2: rule__InitialTransition__Group__3__Impl rule__InitialTransition__Group__4
             {
-            pushFollow(FOLLOW_rule__InitialTransition__Group__3__Impl_in_rule__InitialTransition__Group__39209);
+            pushFollow(FOLLOW_18);
             rule__InitialTransition__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__InitialTransition__Group__4_in_rule__InitialTransition__Group__39212);
+            pushFollow(FOLLOW_2);
             rule__InitialTransition__Group__4();
 
             state._fsp--;
@@ -12825,20 +12825,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__Group__3__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4472:1: rule__InitialTransition__Group__3__Impl : ( 'initial' ) ;
+    // InternalFSM.g:4475:1: rule__InitialTransition__Group__3__Impl : ( 'initial' ) ;
     public final void rule__InitialTransition__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4476:1: ( ( 'initial' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4477:1: ( 'initial' )
+            // InternalFSM.g:4479:1: ( ( 'initial' ) )
+            // InternalFSM.g:4480:1: ( 'initial' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4477:1: ( 'initial' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4478:1: 'initial'
+            // InternalFSM.g:4480:1: ( 'initial' )
+            // InternalFSM.g:4481:1: 'initial'
             {
              before(grammarAccess.getInitialTransitionAccess().getInitialKeyword_3()); 
-            match(input,43,FOLLOW_43_in_rule__InitialTransition__Group__3__Impl9240); 
+            match(input,43,FOLLOW_2); 
              after(grammarAccess.getInitialTransitionAccess().getInitialKeyword_3()); 
 
             }
@@ -12862,21 +12862,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__Group__4"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4491:1: rule__InitialTransition__Group__4 : rule__InitialTransition__Group__4__Impl rule__InitialTransition__Group__5 ;
+    // InternalFSM.g:4494:1: rule__InitialTransition__Group__4 : rule__InitialTransition__Group__4__Impl rule__InitialTransition__Group__5 ;
     public final void rule__InitialTransition__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4495:1: ( rule__InitialTransition__Group__4__Impl rule__InitialTransition__Group__5 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4496:2: rule__InitialTransition__Group__4__Impl rule__InitialTransition__Group__5
+            // InternalFSM.g:4498:1: ( rule__InitialTransition__Group__4__Impl rule__InitialTransition__Group__5 )
+            // InternalFSM.g:4499:2: rule__InitialTransition__Group__4__Impl rule__InitialTransition__Group__5
             {
-            pushFollow(FOLLOW_rule__InitialTransition__Group__4__Impl_in_rule__InitialTransition__Group__49271);
+            pushFollow(FOLLOW_19);
             rule__InitialTransition__Group__4__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__InitialTransition__Group__5_in_rule__InitialTransition__Group__49274);
+            pushFollow(FOLLOW_2);
             rule__InitialTransition__Group__5();
 
             state._fsp--;
@@ -12900,20 +12900,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__Group__4__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4503:1: rule__InitialTransition__Group__4__Impl : ( '->' ) ;
+    // InternalFSM.g:4506:1: rule__InitialTransition__Group__4__Impl : ( '->' ) ;
     public final void rule__InitialTransition__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4507:1: ( ( '->' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4508:1: ( '->' )
+            // InternalFSM.g:4510:1: ( ( '->' ) )
+            // InternalFSM.g:4511:1: ( '->' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4508:1: ( '->' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4509:1: '->'
+            // InternalFSM.g:4511:1: ( '->' )
+            // InternalFSM.g:4512:1: '->'
             {
              before(grammarAccess.getInitialTransitionAccess().getHyphenMinusGreaterThanSignKeyword_4()); 
-            match(input,44,FOLLOW_44_in_rule__InitialTransition__Group__4__Impl9302); 
+            match(input,44,FOLLOW_2); 
              after(grammarAccess.getInitialTransitionAccess().getHyphenMinusGreaterThanSignKeyword_4()); 
 
             }
@@ -12937,21 +12937,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__Group__5"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4522:1: rule__InitialTransition__Group__5 : rule__InitialTransition__Group__5__Impl rule__InitialTransition__Group__6 ;
+    // InternalFSM.g:4525:1: rule__InitialTransition__Group__5 : rule__InitialTransition__Group__5__Impl rule__InitialTransition__Group__6 ;
     public final void rule__InitialTransition__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4526:1: ( rule__InitialTransition__Group__5__Impl rule__InitialTransition__Group__6 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4527:2: rule__InitialTransition__Group__5__Impl rule__InitialTransition__Group__6
+            // InternalFSM.g:4529:1: ( rule__InitialTransition__Group__5__Impl rule__InitialTransition__Group__6 )
+            // InternalFSM.g:4530:2: rule__InitialTransition__Group__5__Impl rule__InitialTransition__Group__6
             {
-            pushFollow(FOLLOW_rule__InitialTransition__Group__5__Impl_in_rule__InitialTransition__Group__59333);
+            pushFollow(FOLLOW_10);
             rule__InitialTransition__Group__5__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__InitialTransition__Group__6_in_rule__InitialTransition__Group__59336);
+            pushFollow(FOLLOW_2);
             rule__InitialTransition__Group__6();
 
             state._fsp--;
@@ -12975,23 +12975,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__Group__5__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4534:1: rule__InitialTransition__Group__5__Impl : ( ( rule__InitialTransition__ToAssignment_5 ) ) ;
+    // InternalFSM.g:4537:1: rule__InitialTransition__Group__5__Impl : ( ( rule__InitialTransition__ToAssignment_5 ) ) ;
     public final void rule__InitialTransition__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4538:1: ( ( ( rule__InitialTransition__ToAssignment_5 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4539:1: ( ( rule__InitialTransition__ToAssignment_5 ) )
+            // InternalFSM.g:4541:1: ( ( ( rule__InitialTransition__ToAssignment_5 ) ) )
+            // InternalFSM.g:4542:1: ( ( rule__InitialTransition__ToAssignment_5 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4539:1: ( ( rule__InitialTransition__ToAssignment_5 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4540:1: ( rule__InitialTransition__ToAssignment_5 )
+            // InternalFSM.g:4542:1: ( ( rule__InitialTransition__ToAssignment_5 ) )
+            // InternalFSM.g:4543:1: ( rule__InitialTransition__ToAssignment_5 )
             {
              before(grammarAccess.getInitialTransitionAccess().getToAssignment_5()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4541:1: ( rule__InitialTransition__ToAssignment_5 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4541:2: rule__InitialTransition__ToAssignment_5
+            // InternalFSM.g:4544:1: ( rule__InitialTransition__ToAssignment_5 )
+            // InternalFSM.g:4544:2: rule__InitialTransition__ToAssignment_5
             {
-            pushFollow(FOLLOW_rule__InitialTransition__ToAssignment_5_in_rule__InitialTransition__Group__5__Impl9363);
+            pushFollow(FOLLOW_2);
             rule__InitialTransition__ToAssignment_5();
 
             state._fsp--;
@@ -13022,21 +13022,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__Group__6"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4551:1: rule__InitialTransition__Group__6 : rule__InitialTransition__Group__6__Impl rule__InitialTransition__Group__7 ;
+    // InternalFSM.g:4554:1: rule__InitialTransition__Group__6 : rule__InitialTransition__Group__6__Impl rule__InitialTransition__Group__7 ;
     public final void rule__InitialTransition__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4555:1: ( rule__InitialTransition__Group__6__Impl rule__InitialTransition__Group__7 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4556:2: rule__InitialTransition__Group__6__Impl rule__InitialTransition__Group__7
+            // InternalFSM.g:4558:1: ( rule__InitialTransition__Group__6__Impl rule__InitialTransition__Group__7 )
+            // InternalFSM.g:4559:2: rule__InitialTransition__Group__6__Impl rule__InitialTransition__Group__7
             {
-            pushFollow(FOLLOW_rule__InitialTransition__Group__6__Impl_in_rule__InitialTransition__Group__69393);
+            pushFollow(FOLLOW_10);
             rule__InitialTransition__Group__6__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__InitialTransition__Group__7_in_rule__InitialTransition__Group__69396);
+            pushFollow(FOLLOW_2);
             rule__InitialTransition__Group__7();
 
             state._fsp--;
@@ -13060,20 +13060,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__Group__6__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4563:1: rule__InitialTransition__Group__6__Impl : ( ( rule__InitialTransition__DocuAssignment_6 )? ) ;
+    // InternalFSM.g:4566:1: rule__InitialTransition__Group__6__Impl : ( ( rule__InitialTransition__DocuAssignment_6 )? ) ;
     public final void rule__InitialTransition__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4567:1: ( ( ( rule__InitialTransition__DocuAssignment_6 )? ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4568:1: ( ( rule__InitialTransition__DocuAssignment_6 )? )
+            // InternalFSM.g:4570:1: ( ( ( rule__InitialTransition__DocuAssignment_6 )? ) )
+            // InternalFSM.g:4571:1: ( ( rule__InitialTransition__DocuAssignment_6 )? )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4568:1: ( ( rule__InitialTransition__DocuAssignment_6 )? )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4569:1: ( rule__InitialTransition__DocuAssignment_6 )?
+            // InternalFSM.g:4571:1: ( ( rule__InitialTransition__DocuAssignment_6 )? )
+            // InternalFSM.g:4572:1: ( rule__InitialTransition__DocuAssignment_6 )?
             {
              before(grammarAccess.getInitialTransitionAccess().getDocuAssignment_6()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4570:1: ( rule__InitialTransition__DocuAssignment_6 )?
+            // InternalFSM.g:4573:1: ( rule__InitialTransition__DocuAssignment_6 )?
             int alt47=2;
             int LA47_0 = input.LA(1);
 
@@ -13082,9 +13082,9 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt47) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4570:2: rule__InitialTransition__DocuAssignment_6
+                    // InternalFSM.g:4573:2: rule__InitialTransition__DocuAssignment_6
                     {
-                    pushFollow(FOLLOW_rule__InitialTransition__DocuAssignment_6_in_rule__InitialTransition__Group__6__Impl9423);
+                    pushFollow(FOLLOW_2);
                     rule__InitialTransition__DocuAssignment_6();
 
                     state._fsp--;
@@ -13118,16 +13118,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__Group__7"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4580:1: rule__InitialTransition__Group__7 : rule__InitialTransition__Group__7__Impl ;
+    // InternalFSM.g:4583:1: rule__InitialTransition__Group__7 : rule__InitialTransition__Group__7__Impl ;
     public final void rule__InitialTransition__Group__7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4584:1: ( rule__InitialTransition__Group__7__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4585:2: rule__InitialTransition__Group__7__Impl
+            // InternalFSM.g:4587:1: ( rule__InitialTransition__Group__7__Impl )
+            // InternalFSM.g:4588:2: rule__InitialTransition__Group__7__Impl
             {
-            pushFollow(FOLLOW_rule__InitialTransition__Group__7__Impl_in_rule__InitialTransition__Group__79454);
+            pushFollow(FOLLOW_2);
             rule__InitialTransition__Group__7__Impl();
 
             state._fsp--;
@@ -13151,20 +13151,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__Group__7__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4591:1: rule__InitialTransition__Group__7__Impl : ( ( rule__InitialTransition__Group_7__0 )? ) ;
+    // InternalFSM.g:4594:1: rule__InitialTransition__Group__7__Impl : ( ( rule__InitialTransition__Group_7__0 )? ) ;
     public final void rule__InitialTransition__Group__7__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4595:1: ( ( ( rule__InitialTransition__Group_7__0 )? ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4596:1: ( ( rule__InitialTransition__Group_7__0 )? )
+            // InternalFSM.g:4598:1: ( ( ( rule__InitialTransition__Group_7__0 )? ) )
+            // InternalFSM.g:4599:1: ( ( rule__InitialTransition__Group_7__0 )? )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4596:1: ( ( rule__InitialTransition__Group_7__0 )? )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4597:1: ( rule__InitialTransition__Group_7__0 )?
+            // InternalFSM.g:4599:1: ( ( rule__InitialTransition__Group_7__0 )? )
+            // InternalFSM.g:4600:1: ( rule__InitialTransition__Group_7__0 )?
             {
              before(grammarAccess.getInitialTransitionAccess().getGroup_7()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4598:1: ( rule__InitialTransition__Group_7__0 )?
+            // InternalFSM.g:4601:1: ( rule__InitialTransition__Group_7__0 )?
             int alt48=2;
             int LA48_0 = input.LA(1);
 
@@ -13173,9 +13173,9 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt48) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4598:2: rule__InitialTransition__Group_7__0
+                    // InternalFSM.g:4601:2: rule__InitialTransition__Group_7__0
                     {
-                    pushFollow(FOLLOW_rule__InitialTransition__Group_7__0_in_rule__InitialTransition__Group__7__Impl9481);
+                    pushFollow(FOLLOW_2);
                     rule__InitialTransition__Group_7__0();
 
                     state._fsp--;
@@ -13209,21 +13209,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__Group_7__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4624:1: rule__InitialTransition__Group_7__0 : rule__InitialTransition__Group_7__0__Impl rule__InitialTransition__Group_7__1 ;
+    // InternalFSM.g:4627:1: rule__InitialTransition__Group_7__0 : rule__InitialTransition__Group_7__0__Impl rule__InitialTransition__Group_7__1 ;
     public final void rule__InitialTransition__Group_7__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4628:1: ( rule__InitialTransition__Group_7__0__Impl rule__InitialTransition__Group_7__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4629:2: rule__InitialTransition__Group_7__0__Impl rule__InitialTransition__Group_7__1
+            // InternalFSM.g:4631:1: ( rule__InitialTransition__Group_7__0__Impl rule__InitialTransition__Group_7__1 )
+            // InternalFSM.g:4632:2: rule__InitialTransition__Group_7__0__Impl rule__InitialTransition__Group_7__1
             {
-            pushFollow(FOLLOW_rule__InitialTransition__Group_7__0__Impl_in_rule__InitialTransition__Group_7__09528);
+            pushFollow(FOLLOW_20);
             rule__InitialTransition__Group_7__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__InitialTransition__Group_7__1_in_rule__InitialTransition__Group_7__09531);
+            pushFollow(FOLLOW_2);
             rule__InitialTransition__Group_7__1();
 
             state._fsp--;
@@ -13247,20 +13247,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__Group_7__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4636:1: rule__InitialTransition__Group_7__0__Impl : ( '{' ) ;
+    // InternalFSM.g:4639:1: rule__InitialTransition__Group_7__0__Impl : ( '{' ) ;
     public final void rule__InitialTransition__Group_7__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4640:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4641:1: ( '{' )
+            // InternalFSM.g:4643:1: ( ( '{' ) )
+            // InternalFSM.g:4644:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4641:1: ( '{' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4642:1: '{'
+            // InternalFSM.g:4644:1: ( '{' )
+            // InternalFSM.g:4645:1: '{'
             {
              before(grammarAccess.getInitialTransitionAccess().getLeftCurlyBracketKeyword_7_0()); 
-            match(input,28,FOLLOW_28_in_rule__InitialTransition__Group_7__0__Impl9559); 
+            match(input,28,FOLLOW_2); 
              after(grammarAccess.getInitialTransitionAccess().getLeftCurlyBracketKeyword_7_0()); 
 
             }
@@ -13284,21 +13284,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__Group_7__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4655:1: rule__InitialTransition__Group_7__1 : rule__InitialTransition__Group_7__1__Impl rule__InitialTransition__Group_7__2 ;
+    // InternalFSM.g:4658:1: rule__InitialTransition__Group_7__1 : rule__InitialTransition__Group_7__1__Impl rule__InitialTransition__Group_7__2 ;
     public final void rule__InitialTransition__Group_7__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4659:1: ( rule__InitialTransition__Group_7__1__Impl rule__InitialTransition__Group_7__2 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4660:2: rule__InitialTransition__Group_7__1__Impl rule__InitialTransition__Group_7__2
+            // InternalFSM.g:4662:1: ( rule__InitialTransition__Group_7__1__Impl rule__InitialTransition__Group_7__2 )
+            // InternalFSM.g:4663:2: rule__InitialTransition__Group_7__1__Impl rule__InitialTransition__Group_7__2
             {
-            pushFollow(FOLLOW_rule__InitialTransition__Group_7__1__Impl_in_rule__InitialTransition__Group_7__19590);
+            pushFollow(FOLLOW_20);
             rule__InitialTransition__Group_7__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__InitialTransition__Group_7__2_in_rule__InitialTransition__Group_7__19593);
+            pushFollow(FOLLOW_2);
             rule__InitialTransition__Group_7__2();
 
             state._fsp--;
@@ -13322,20 +13322,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__Group_7__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4667:1: rule__InitialTransition__Group_7__1__Impl : ( ( rule__InitialTransition__Group_7_1__0 )? ) ;
+    // InternalFSM.g:4670:1: rule__InitialTransition__Group_7__1__Impl : ( ( rule__InitialTransition__Group_7_1__0 )? ) ;
     public final void rule__InitialTransition__Group_7__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4671:1: ( ( ( rule__InitialTransition__Group_7_1__0 )? ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4672:1: ( ( rule__InitialTransition__Group_7_1__0 )? )
+            // InternalFSM.g:4674:1: ( ( ( rule__InitialTransition__Group_7_1__0 )? ) )
+            // InternalFSM.g:4675:1: ( ( rule__InitialTransition__Group_7_1__0 )? )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4672:1: ( ( rule__InitialTransition__Group_7_1__0 )? )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4673:1: ( rule__InitialTransition__Group_7_1__0 )?
+            // InternalFSM.g:4675:1: ( ( rule__InitialTransition__Group_7_1__0 )? )
+            // InternalFSM.g:4676:1: ( rule__InitialTransition__Group_7_1__0 )?
             {
              before(grammarAccess.getInitialTransitionAccess().getGroup_7_1()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4674:1: ( rule__InitialTransition__Group_7_1__0 )?
+            // InternalFSM.g:4677:1: ( rule__InitialTransition__Group_7_1__0 )?
             int alt49=2;
             int LA49_0 = input.LA(1);
 
@@ -13344,9 +13344,9 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt49) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4674:2: rule__InitialTransition__Group_7_1__0
+                    // InternalFSM.g:4677:2: rule__InitialTransition__Group_7_1__0
                     {
-                    pushFollow(FOLLOW_rule__InitialTransition__Group_7_1__0_in_rule__InitialTransition__Group_7__1__Impl9620);
+                    pushFollow(FOLLOW_2);
                     rule__InitialTransition__Group_7_1__0();
 
                     state._fsp--;
@@ -13380,16 +13380,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__Group_7__2"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4684:1: rule__InitialTransition__Group_7__2 : rule__InitialTransition__Group_7__2__Impl ;
+    // InternalFSM.g:4687:1: rule__InitialTransition__Group_7__2 : rule__InitialTransition__Group_7__2__Impl ;
     public final void rule__InitialTransition__Group_7__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4688:1: ( rule__InitialTransition__Group_7__2__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4689:2: rule__InitialTransition__Group_7__2__Impl
+            // InternalFSM.g:4691:1: ( rule__InitialTransition__Group_7__2__Impl )
+            // InternalFSM.g:4692:2: rule__InitialTransition__Group_7__2__Impl
             {
-            pushFollow(FOLLOW_rule__InitialTransition__Group_7__2__Impl_in_rule__InitialTransition__Group_7__29651);
+            pushFollow(FOLLOW_2);
             rule__InitialTransition__Group_7__2__Impl();
 
             state._fsp--;
@@ -13413,20 +13413,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__Group_7__2__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4695:1: rule__InitialTransition__Group_7__2__Impl : ( '}' ) ;
+    // InternalFSM.g:4698:1: rule__InitialTransition__Group_7__2__Impl : ( '}' ) ;
     public final void rule__InitialTransition__Group_7__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4699:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4700:1: ( '}' )
+            // InternalFSM.g:4702:1: ( ( '}' ) )
+            // InternalFSM.g:4703:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4700:1: ( '}' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4701:1: '}'
+            // InternalFSM.g:4703:1: ( '}' )
+            // InternalFSM.g:4704:1: '}'
             {
              before(grammarAccess.getInitialTransitionAccess().getRightCurlyBracketKeyword_7_2()); 
-            match(input,29,FOLLOW_29_in_rule__InitialTransition__Group_7__2__Impl9679); 
+            match(input,29,FOLLOW_2); 
              after(grammarAccess.getInitialTransitionAccess().getRightCurlyBracketKeyword_7_2()); 
 
             }
@@ -13450,21 +13450,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__Group_7_1__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4720:1: rule__InitialTransition__Group_7_1__0 : rule__InitialTransition__Group_7_1__0__Impl rule__InitialTransition__Group_7_1__1 ;
+    // InternalFSM.g:4723:1: rule__InitialTransition__Group_7_1__0 : rule__InitialTransition__Group_7_1__0__Impl rule__InitialTransition__Group_7_1__1 ;
     public final void rule__InitialTransition__Group_7_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4724:1: ( rule__InitialTransition__Group_7_1__0__Impl rule__InitialTransition__Group_7_1__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4725:2: rule__InitialTransition__Group_7_1__0__Impl rule__InitialTransition__Group_7_1__1
+            // InternalFSM.g:4727:1: ( rule__InitialTransition__Group_7_1__0__Impl rule__InitialTransition__Group_7_1__1 )
+            // InternalFSM.g:4728:2: rule__InitialTransition__Group_7_1__0__Impl rule__InitialTransition__Group_7_1__1
             {
-            pushFollow(FOLLOW_rule__InitialTransition__Group_7_1__0__Impl_in_rule__InitialTransition__Group_7_1__09716);
+            pushFollow(FOLLOW_7);
             rule__InitialTransition__Group_7_1__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__InitialTransition__Group_7_1__1_in_rule__InitialTransition__Group_7_1__09719);
+            pushFollow(FOLLOW_2);
             rule__InitialTransition__Group_7_1__1();
 
             state._fsp--;
@@ -13488,20 +13488,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__Group_7_1__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4732:1: rule__InitialTransition__Group_7_1__0__Impl : ( 'action' ) ;
+    // InternalFSM.g:4735:1: rule__InitialTransition__Group_7_1__0__Impl : ( 'action' ) ;
     public final void rule__InitialTransition__Group_7_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4736:1: ( ( 'action' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4737:1: ( 'action' )
+            // InternalFSM.g:4739:1: ( ( 'action' ) )
+            // InternalFSM.g:4740:1: ( 'action' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4737:1: ( 'action' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4738:1: 'action'
+            // InternalFSM.g:4740:1: ( 'action' )
+            // InternalFSM.g:4741:1: 'action'
             {
              before(grammarAccess.getInitialTransitionAccess().getActionKeyword_7_1_0()); 
-            match(input,45,FOLLOW_45_in_rule__InitialTransition__Group_7_1__0__Impl9747); 
+            match(input,45,FOLLOW_2); 
              after(grammarAccess.getInitialTransitionAccess().getActionKeyword_7_1_0()); 
 
             }
@@ -13525,16 +13525,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__Group_7_1__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4751:1: rule__InitialTransition__Group_7_1__1 : rule__InitialTransition__Group_7_1__1__Impl ;
+    // InternalFSM.g:4754:1: rule__InitialTransition__Group_7_1__1 : rule__InitialTransition__Group_7_1__1__Impl ;
     public final void rule__InitialTransition__Group_7_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4755:1: ( rule__InitialTransition__Group_7_1__1__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4756:2: rule__InitialTransition__Group_7_1__1__Impl
+            // InternalFSM.g:4758:1: ( rule__InitialTransition__Group_7_1__1__Impl )
+            // InternalFSM.g:4759:2: rule__InitialTransition__Group_7_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__InitialTransition__Group_7_1__1__Impl_in_rule__InitialTransition__Group_7_1__19778);
+            pushFollow(FOLLOW_2);
             rule__InitialTransition__Group_7_1__1__Impl();
 
             state._fsp--;
@@ -13558,23 +13558,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__Group_7_1__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4762:1: rule__InitialTransition__Group_7_1__1__Impl : ( ( rule__InitialTransition__ActionAssignment_7_1_1 ) ) ;
+    // InternalFSM.g:4765:1: rule__InitialTransition__Group_7_1__1__Impl : ( ( rule__InitialTransition__ActionAssignment_7_1_1 ) ) ;
     public final void rule__InitialTransition__Group_7_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4766:1: ( ( ( rule__InitialTransition__ActionAssignment_7_1_1 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4767:1: ( ( rule__InitialTransition__ActionAssignment_7_1_1 ) )
+            // InternalFSM.g:4769:1: ( ( ( rule__InitialTransition__ActionAssignment_7_1_1 ) ) )
+            // InternalFSM.g:4770:1: ( ( rule__InitialTransition__ActionAssignment_7_1_1 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4767:1: ( ( rule__InitialTransition__ActionAssignment_7_1_1 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4768:1: ( rule__InitialTransition__ActionAssignment_7_1_1 )
+            // InternalFSM.g:4770:1: ( ( rule__InitialTransition__ActionAssignment_7_1_1 ) )
+            // InternalFSM.g:4771:1: ( rule__InitialTransition__ActionAssignment_7_1_1 )
             {
              before(grammarAccess.getInitialTransitionAccess().getActionAssignment_7_1_1()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4769:1: ( rule__InitialTransition__ActionAssignment_7_1_1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4769:2: rule__InitialTransition__ActionAssignment_7_1_1
+            // InternalFSM.g:4772:1: ( rule__InitialTransition__ActionAssignment_7_1_1 )
+            // InternalFSM.g:4772:2: rule__InitialTransition__ActionAssignment_7_1_1
             {
-            pushFollow(FOLLOW_rule__InitialTransition__ActionAssignment_7_1_1_in_rule__InitialTransition__Group_7_1__1__Impl9805);
+            pushFollow(FOLLOW_2);
             rule__InitialTransition__ActionAssignment_7_1_1();
 
             state._fsp--;
@@ -13605,21 +13605,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__Group__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4783:1: rule__ContinuationTransition__Group__0 : rule__ContinuationTransition__Group__0__Impl rule__ContinuationTransition__Group__1 ;
+    // InternalFSM.g:4786:1: rule__ContinuationTransition__Group__0 : rule__ContinuationTransition__Group__0__Impl rule__ContinuationTransition__Group__1 ;
     public final void rule__ContinuationTransition__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4787:1: ( rule__ContinuationTransition__Group__0__Impl rule__ContinuationTransition__Group__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4788:2: rule__ContinuationTransition__Group__0__Impl rule__ContinuationTransition__Group__1
+            // InternalFSM.g:4790:1: ( rule__ContinuationTransition__Group__0__Impl rule__ContinuationTransition__Group__1 )
+            // InternalFSM.g:4791:2: rule__ContinuationTransition__Group__0__Impl rule__ContinuationTransition__Group__1
             {
-            pushFollow(FOLLOW_rule__ContinuationTransition__Group__0__Impl_in_rule__ContinuationTransition__Group__09839);
+            pushFollow(FOLLOW_16);
             rule__ContinuationTransition__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ContinuationTransition__Group__1_in_rule__ContinuationTransition__Group__09842);
+            pushFollow(FOLLOW_2);
             rule__ContinuationTransition__Group__1();
 
             state._fsp--;
@@ -13643,20 +13643,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__Group__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4795:1: rule__ContinuationTransition__Group__0__Impl : ( 'Transition' ) ;
+    // InternalFSM.g:4798:1: rule__ContinuationTransition__Group__0__Impl : ( 'Transition' ) ;
     public final void rule__ContinuationTransition__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4799:1: ( ( 'Transition' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4800:1: ( 'Transition' )
+            // InternalFSM.g:4802:1: ( ( 'Transition' ) )
+            // InternalFSM.g:4803:1: ( 'Transition' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4800:1: ( 'Transition' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4801:1: 'Transition'
+            // InternalFSM.g:4803:1: ( 'Transition' )
+            // InternalFSM.g:4804:1: 'Transition'
             {
              before(grammarAccess.getContinuationTransitionAccess().getTransitionKeyword_0()); 
-            match(input,41,FOLLOW_41_in_rule__ContinuationTransition__Group__0__Impl9870); 
+            match(input,41,FOLLOW_2); 
              after(grammarAccess.getContinuationTransitionAccess().getTransitionKeyword_0()); 
 
             }
@@ -13680,21 +13680,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__Group__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4814:1: rule__ContinuationTransition__Group__1 : rule__ContinuationTransition__Group__1__Impl rule__ContinuationTransition__Group__2 ;
+    // InternalFSM.g:4817:1: rule__ContinuationTransition__Group__1 : rule__ContinuationTransition__Group__1__Impl rule__ContinuationTransition__Group__2 ;
     public final void rule__ContinuationTransition__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4818:1: ( rule__ContinuationTransition__Group__1__Impl rule__ContinuationTransition__Group__2 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4819:2: rule__ContinuationTransition__Group__1__Impl rule__ContinuationTransition__Group__2
+            // InternalFSM.g:4821:1: ( rule__ContinuationTransition__Group__1__Impl rule__ContinuationTransition__Group__2 )
+            // InternalFSM.g:4822:2: rule__ContinuationTransition__Group__1__Impl rule__ContinuationTransition__Group__2
             {
-            pushFollow(FOLLOW_rule__ContinuationTransition__Group__1__Impl_in_rule__ContinuationTransition__Group__19901);
+            pushFollow(FOLLOW_16);
             rule__ContinuationTransition__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ContinuationTransition__Group__2_in_rule__ContinuationTransition__Group__19904);
+            pushFollow(FOLLOW_2);
             rule__ContinuationTransition__Group__2();
 
             state._fsp--;
@@ -13718,20 +13718,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__Group__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4826:1: rule__ContinuationTransition__Group__1__Impl : ( ( rule__ContinuationTransition__NameAssignment_1 )? ) ;
+    // InternalFSM.g:4829:1: rule__ContinuationTransition__Group__1__Impl : ( ( rule__ContinuationTransition__NameAssignment_1 )? ) ;
     public final void rule__ContinuationTransition__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4830:1: ( ( ( rule__ContinuationTransition__NameAssignment_1 )? ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4831:1: ( ( rule__ContinuationTransition__NameAssignment_1 )? )
+            // InternalFSM.g:4833:1: ( ( ( rule__ContinuationTransition__NameAssignment_1 )? ) )
+            // InternalFSM.g:4834:1: ( ( rule__ContinuationTransition__NameAssignment_1 )? )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4831:1: ( ( rule__ContinuationTransition__NameAssignment_1 )? )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4832:1: ( rule__ContinuationTransition__NameAssignment_1 )?
+            // InternalFSM.g:4834:1: ( ( rule__ContinuationTransition__NameAssignment_1 )? )
+            // InternalFSM.g:4835:1: ( rule__ContinuationTransition__NameAssignment_1 )?
             {
              before(grammarAccess.getContinuationTransitionAccess().getNameAssignment_1()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4833:1: ( rule__ContinuationTransition__NameAssignment_1 )?
+            // InternalFSM.g:4836:1: ( rule__ContinuationTransition__NameAssignment_1 )?
             int alt50=2;
             int LA50_0 = input.LA(1);
 
@@ -13740,9 +13740,9 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt50) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4833:2: rule__ContinuationTransition__NameAssignment_1
+                    // InternalFSM.g:4836:2: rule__ContinuationTransition__NameAssignment_1
                     {
-                    pushFollow(FOLLOW_rule__ContinuationTransition__NameAssignment_1_in_rule__ContinuationTransition__Group__1__Impl9931);
+                    pushFollow(FOLLOW_2);
                     rule__ContinuationTransition__NameAssignment_1();
 
                     state._fsp--;
@@ -13776,21 +13776,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__Group__2"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4843:1: rule__ContinuationTransition__Group__2 : rule__ContinuationTransition__Group__2__Impl rule__ContinuationTransition__Group__3 ;
+    // InternalFSM.g:4846:1: rule__ContinuationTransition__Group__2 : rule__ContinuationTransition__Group__2__Impl rule__ContinuationTransition__Group__3 ;
     public final void rule__ContinuationTransition__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4847:1: ( rule__ContinuationTransition__Group__2__Impl rule__ContinuationTransition__Group__3 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4848:2: rule__ContinuationTransition__Group__2__Impl rule__ContinuationTransition__Group__3
+            // InternalFSM.g:4850:1: ( rule__ContinuationTransition__Group__2__Impl rule__ContinuationTransition__Group__3 )
+            // InternalFSM.g:4851:2: rule__ContinuationTransition__Group__2__Impl rule__ContinuationTransition__Group__3
             {
-            pushFollow(FOLLOW_rule__ContinuationTransition__Group__2__Impl_in_rule__ContinuationTransition__Group__29962);
+            pushFollow(FOLLOW_19);
             rule__ContinuationTransition__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ContinuationTransition__Group__3_in_rule__ContinuationTransition__Group__29965);
+            pushFollow(FOLLOW_2);
             rule__ContinuationTransition__Group__3();
 
             state._fsp--;
@@ -13814,20 +13814,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__Group__2__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4855:1: rule__ContinuationTransition__Group__2__Impl : ( ':' ) ;
+    // InternalFSM.g:4858:1: rule__ContinuationTransition__Group__2__Impl : ( ':' ) ;
     public final void rule__ContinuationTransition__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4859:1: ( ( ':' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4860:1: ( ':' )
+            // InternalFSM.g:4862:1: ( ( ':' ) )
+            // InternalFSM.g:4863:1: ( ':' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4860:1: ( ':' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4861:1: ':'
+            // InternalFSM.g:4863:1: ( ':' )
+            // InternalFSM.g:4864:1: ':'
             {
              before(grammarAccess.getContinuationTransitionAccess().getColonKeyword_2()); 
-            match(input,42,FOLLOW_42_in_rule__ContinuationTransition__Group__2__Impl9993); 
+            match(input,42,FOLLOW_2); 
              after(grammarAccess.getContinuationTransitionAccess().getColonKeyword_2()); 
 
             }
@@ -13851,21 +13851,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__Group__3"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4874:1: rule__ContinuationTransition__Group__3 : rule__ContinuationTransition__Group__3__Impl rule__ContinuationTransition__Group__4 ;
+    // InternalFSM.g:4877:1: rule__ContinuationTransition__Group__3 : rule__ContinuationTransition__Group__3__Impl rule__ContinuationTransition__Group__4 ;
     public final void rule__ContinuationTransition__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4878:1: ( rule__ContinuationTransition__Group__3__Impl rule__ContinuationTransition__Group__4 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4879:2: rule__ContinuationTransition__Group__3__Impl rule__ContinuationTransition__Group__4
+            // InternalFSM.g:4881:1: ( rule__ContinuationTransition__Group__3__Impl rule__ContinuationTransition__Group__4 )
+            // InternalFSM.g:4882:2: rule__ContinuationTransition__Group__3__Impl rule__ContinuationTransition__Group__4
             {
-            pushFollow(FOLLOW_rule__ContinuationTransition__Group__3__Impl_in_rule__ContinuationTransition__Group__310024);
+            pushFollow(FOLLOW_18);
             rule__ContinuationTransition__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ContinuationTransition__Group__4_in_rule__ContinuationTransition__Group__310027);
+            pushFollow(FOLLOW_2);
             rule__ContinuationTransition__Group__4();
 
             state._fsp--;
@@ -13889,23 +13889,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__Group__3__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4886:1: rule__ContinuationTransition__Group__3__Impl : ( ( rule__ContinuationTransition__FromAssignment_3 ) ) ;
+    // InternalFSM.g:4889:1: rule__ContinuationTransition__Group__3__Impl : ( ( rule__ContinuationTransition__FromAssignment_3 ) ) ;
     public final void rule__ContinuationTransition__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4890:1: ( ( ( rule__ContinuationTransition__FromAssignment_3 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4891:1: ( ( rule__ContinuationTransition__FromAssignment_3 ) )
+            // InternalFSM.g:4893:1: ( ( ( rule__ContinuationTransition__FromAssignment_3 ) ) )
+            // InternalFSM.g:4894:1: ( ( rule__ContinuationTransition__FromAssignment_3 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4891:1: ( ( rule__ContinuationTransition__FromAssignment_3 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4892:1: ( rule__ContinuationTransition__FromAssignment_3 )
+            // InternalFSM.g:4894:1: ( ( rule__ContinuationTransition__FromAssignment_3 ) )
+            // InternalFSM.g:4895:1: ( rule__ContinuationTransition__FromAssignment_3 )
             {
              before(grammarAccess.getContinuationTransitionAccess().getFromAssignment_3()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4893:1: ( rule__ContinuationTransition__FromAssignment_3 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4893:2: rule__ContinuationTransition__FromAssignment_3
+            // InternalFSM.g:4896:1: ( rule__ContinuationTransition__FromAssignment_3 )
+            // InternalFSM.g:4896:2: rule__ContinuationTransition__FromAssignment_3
             {
-            pushFollow(FOLLOW_rule__ContinuationTransition__FromAssignment_3_in_rule__ContinuationTransition__Group__3__Impl10054);
+            pushFollow(FOLLOW_2);
             rule__ContinuationTransition__FromAssignment_3();
 
             state._fsp--;
@@ -13936,21 +13936,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__Group__4"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4903:1: rule__ContinuationTransition__Group__4 : rule__ContinuationTransition__Group__4__Impl rule__ContinuationTransition__Group__5 ;
+    // InternalFSM.g:4906:1: rule__ContinuationTransition__Group__4 : rule__ContinuationTransition__Group__4__Impl rule__ContinuationTransition__Group__5 ;
     public final void rule__ContinuationTransition__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4907:1: ( rule__ContinuationTransition__Group__4__Impl rule__ContinuationTransition__Group__5 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4908:2: rule__ContinuationTransition__Group__4__Impl rule__ContinuationTransition__Group__5
+            // InternalFSM.g:4910:1: ( rule__ContinuationTransition__Group__4__Impl rule__ContinuationTransition__Group__5 )
+            // InternalFSM.g:4911:2: rule__ContinuationTransition__Group__4__Impl rule__ContinuationTransition__Group__5
             {
-            pushFollow(FOLLOW_rule__ContinuationTransition__Group__4__Impl_in_rule__ContinuationTransition__Group__410084);
+            pushFollow(FOLLOW_19);
             rule__ContinuationTransition__Group__4__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ContinuationTransition__Group__5_in_rule__ContinuationTransition__Group__410087);
+            pushFollow(FOLLOW_2);
             rule__ContinuationTransition__Group__5();
 
             state._fsp--;
@@ -13974,20 +13974,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__Group__4__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4915:1: rule__ContinuationTransition__Group__4__Impl : ( '->' ) ;
+    // InternalFSM.g:4918:1: rule__ContinuationTransition__Group__4__Impl : ( '->' ) ;
     public final void rule__ContinuationTransition__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4919:1: ( ( '->' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4920:1: ( '->' )
+            // InternalFSM.g:4922:1: ( ( '->' ) )
+            // InternalFSM.g:4923:1: ( '->' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4920:1: ( '->' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4921:1: '->'
+            // InternalFSM.g:4923:1: ( '->' )
+            // InternalFSM.g:4924:1: '->'
             {
              before(grammarAccess.getContinuationTransitionAccess().getHyphenMinusGreaterThanSignKeyword_4()); 
-            match(input,44,FOLLOW_44_in_rule__ContinuationTransition__Group__4__Impl10115); 
+            match(input,44,FOLLOW_2); 
              after(grammarAccess.getContinuationTransitionAccess().getHyphenMinusGreaterThanSignKeyword_4()); 
 
             }
@@ -14011,21 +14011,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__Group__5"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4934:1: rule__ContinuationTransition__Group__5 : rule__ContinuationTransition__Group__5__Impl rule__ContinuationTransition__Group__6 ;
+    // InternalFSM.g:4937:1: rule__ContinuationTransition__Group__5 : rule__ContinuationTransition__Group__5__Impl rule__ContinuationTransition__Group__6 ;
     public final void rule__ContinuationTransition__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4938:1: ( rule__ContinuationTransition__Group__5__Impl rule__ContinuationTransition__Group__6 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4939:2: rule__ContinuationTransition__Group__5__Impl rule__ContinuationTransition__Group__6
+            // InternalFSM.g:4941:1: ( rule__ContinuationTransition__Group__5__Impl rule__ContinuationTransition__Group__6 )
+            // InternalFSM.g:4942:2: rule__ContinuationTransition__Group__5__Impl rule__ContinuationTransition__Group__6
             {
-            pushFollow(FOLLOW_rule__ContinuationTransition__Group__5__Impl_in_rule__ContinuationTransition__Group__510146);
+            pushFollow(FOLLOW_10);
             rule__ContinuationTransition__Group__5__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ContinuationTransition__Group__6_in_rule__ContinuationTransition__Group__510149);
+            pushFollow(FOLLOW_2);
             rule__ContinuationTransition__Group__6();
 
             state._fsp--;
@@ -14049,23 +14049,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__Group__5__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4946:1: rule__ContinuationTransition__Group__5__Impl : ( ( rule__ContinuationTransition__ToAssignment_5 ) ) ;
+    // InternalFSM.g:4949:1: rule__ContinuationTransition__Group__5__Impl : ( ( rule__ContinuationTransition__ToAssignment_5 ) ) ;
     public final void rule__ContinuationTransition__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4950:1: ( ( ( rule__ContinuationTransition__ToAssignment_5 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4951:1: ( ( rule__ContinuationTransition__ToAssignment_5 ) )
+            // InternalFSM.g:4953:1: ( ( ( rule__ContinuationTransition__ToAssignment_5 ) ) )
+            // InternalFSM.g:4954:1: ( ( rule__ContinuationTransition__ToAssignment_5 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4951:1: ( ( rule__ContinuationTransition__ToAssignment_5 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4952:1: ( rule__ContinuationTransition__ToAssignment_5 )
+            // InternalFSM.g:4954:1: ( ( rule__ContinuationTransition__ToAssignment_5 ) )
+            // InternalFSM.g:4955:1: ( rule__ContinuationTransition__ToAssignment_5 )
             {
              before(grammarAccess.getContinuationTransitionAccess().getToAssignment_5()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4953:1: ( rule__ContinuationTransition__ToAssignment_5 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4953:2: rule__ContinuationTransition__ToAssignment_5
+            // InternalFSM.g:4956:1: ( rule__ContinuationTransition__ToAssignment_5 )
+            // InternalFSM.g:4956:2: rule__ContinuationTransition__ToAssignment_5
             {
-            pushFollow(FOLLOW_rule__ContinuationTransition__ToAssignment_5_in_rule__ContinuationTransition__Group__5__Impl10176);
+            pushFollow(FOLLOW_2);
             rule__ContinuationTransition__ToAssignment_5();
 
             state._fsp--;
@@ -14096,21 +14096,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__Group__6"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4963:1: rule__ContinuationTransition__Group__6 : rule__ContinuationTransition__Group__6__Impl rule__ContinuationTransition__Group__7 ;
+    // InternalFSM.g:4966:1: rule__ContinuationTransition__Group__6 : rule__ContinuationTransition__Group__6__Impl rule__ContinuationTransition__Group__7 ;
     public final void rule__ContinuationTransition__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4967:1: ( rule__ContinuationTransition__Group__6__Impl rule__ContinuationTransition__Group__7 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4968:2: rule__ContinuationTransition__Group__6__Impl rule__ContinuationTransition__Group__7
+            // InternalFSM.g:4970:1: ( rule__ContinuationTransition__Group__6__Impl rule__ContinuationTransition__Group__7 )
+            // InternalFSM.g:4971:2: rule__ContinuationTransition__Group__6__Impl rule__ContinuationTransition__Group__7
             {
-            pushFollow(FOLLOW_rule__ContinuationTransition__Group__6__Impl_in_rule__ContinuationTransition__Group__610206);
+            pushFollow(FOLLOW_10);
             rule__ContinuationTransition__Group__6__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ContinuationTransition__Group__7_in_rule__ContinuationTransition__Group__610209);
+            pushFollow(FOLLOW_2);
             rule__ContinuationTransition__Group__7();
 
             state._fsp--;
@@ -14134,20 +14134,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__Group__6__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4975:1: rule__ContinuationTransition__Group__6__Impl : ( ( rule__ContinuationTransition__DocuAssignment_6 )? ) ;
+    // InternalFSM.g:4978:1: rule__ContinuationTransition__Group__6__Impl : ( ( rule__ContinuationTransition__DocuAssignment_6 )? ) ;
     public final void rule__ContinuationTransition__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4979:1: ( ( ( rule__ContinuationTransition__DocuAssignment_6 )? ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4980:1: ( ( rule__ContinuationTransition__DocuAssignment_6 )? )
+            // InternalFSM.g:4982:1: ( ( ( rule__ContinuationTransition__DocuAssignment_6 )? ) )
+            // InternalFSM.g:4983:1: ( ( rule__ContinuationTransition__DocuAssignment_6 )? )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4980:1: ( ( rule__ContinuationTransition__DocuAssignment_6 )? )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4981:1: ( rule__ContinuationTransition__DocuAssignment_6 )?
+            // InternalFSM.g:4983:1: ( ( rule__ContinuationTransition__DocuAssignment_6 )? )
+            // InternalFSM.g:4984:1: ( rule__ContinuationTransition__DocuAssignment_6 )?
             {
              before(grammarAccess.getContinuationTransitionAccess().getDocuAssignment_6()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4982:1: ( rule__ContinuationTransition__DocuAssignment_6 )?
+            // InternalFSM.g:4985:1: ( rule__ContinuationTransition__DocuAssignment_6 )?
             int alt51=2;
             int LA51_0 = input.LA(1);
 
@@ -14156,9 +14156,9 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt51) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4982:2: rule__ContinuationTransition__DocuAssignment_6
+                    // InternalFSM.g:4985:2: rule__ContinuationTransition__DocuAssignment_6
                     {
-                    pushFollow(FOLLOW_rule__ContinuationTransition__DocuAssignment_6_in_rule__ContinuationTransition__Group__6__Impl10236);
+                    pushFollow(FOLLOW_2);
                     rule__ContinuationTransition__DocuAssignment_6();
 
                     state._fsp--;
@@ -14192,16 +14192,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__Group__7"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4992:1: rule__ContinuationTransition__Group__7 : rule__ContinuationTransition__Group__7__Impl ;
+    // InternalFSM.g:4995:1: rule__ContinuationTransition__Group__7 : rule__ContinuationTransition__Group__7__Impl ;
     public final void rule__ContinuationTransition__Group__7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4996:1: ( rule__ContinuationTransition__Group__7__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:4997:2: rule__ContinuationTransition__Group__7__Impl
+            // InternalFSM.g:4999:1: ( rule__ContinuationTransition__Group__7__Impl )
+            // InternalFSM.g:5000:2: rule__ContinuationTransition__Group__7__Impl
             {
-            pushFollow(FOLLOW_rule__ContinuationTransition__Group__7__Impl_in_rule__ContinuationTransition__Group__710267);
+            pushFollow(FOLLOW_2);
             rule__ContinuationTransition__Group__7__Impl();
 
             state._fsp--;
@@ -14225,20 +14225,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__Group__7__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5003:1: rule__ContinuationTransition__Group__7__Impl : ( ( rule__ContinuationTransition__Group_7__0 )? ) ;
+    // InternalFSM.g:5006:1: rule__ContinuationTransition__Group__7__Impl : ( ( rule__ContinuationTransition__Group_7__0 )? ) ;
     public final void rule__ContinuationTransition__Group__7__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5007:1: ( ( ( rule__ContinuationTransition__Group_7__0 )? ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5008:1: ( ( rule__ContinuationTransition__Group_7__0 )? )
+            // InternalFSM.g:5010:1: ( ( ( rule__ContinuationTransition__Group_7__0 )? ) )
+            // InternalFSM.g:5011:1: ( ( rule__ContinuationTransition__Group_7__0 )? )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5008:1: ( ( rule__ContinuationTransition__Group_7__0 )? )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5009:1: ( rule__ContinuationTransition__Group_7__0 )?
+            // InternalFSM.g:5011:1: ( ( rule__ContinuationTransition__Group_7__0 )? )
+            // InternalFSM.g:5012:1: ( rule__ContinuationTransition__Group_7__0 )?
             {
              before(grammarAccess.getContinuationTransitionAccess().getGroup_7()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5010:1: ( rule__ContinuationTransition__Group_7__0 )?
+            // InternalFSM.g:5013:1: ( rule__ContinuationTransition__Group_7__0 )?
             int alt52=2;
             int LA52_0 = input.LA(1);
 
@@ -14247,9 +14247,9 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt52) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5010:2: rule__ContinuationTransition__Group_7__0
+                    // InternalFSM.g:5013:2: rule__ContinuationTransition__Group_7__0
                     {
-                    pushFollow(FOLLOW_rule__ContinuationTransition__Group_7__0_in_rule__ContinuationTransition__Group__7__Impl10294);
+                    pushFollow(FOLLOW_2);
                     rule__ContinuationTransition__Group_7__0();
 
                     state._fsp--;
@@ -14283,21 +14283,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__Group_7__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5036:1: rule__ContinuationTransition__Group_7__0 : rule__ContinuationTransition__Group_7__0__Impl rule__ContinuationTransition__Group_7__1 ;
+    // InternalFSM.g:5039:1: rule__ContinuationTransition__Group_7__0 : rule__ContinuationTransition__Group_7__0__Impl rule__ContinuationTransition__Group_7__1 ;
     public final void rule__ContinuationTransition__Group_7__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5040:1: ( rule__ContinuationTransition__Group_7__0__Impl rule__ContinuationTransition__Group_7__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5041:2: rule__ContinuationTransition__Group_7__0__Impl rule__ContinuationTransition__Group_7__1
+            // InternalFSM.g:5043:1: ( rule__ContinuationTransition__Group_7__0__Impl rule__ContinuationTransition__Group_7__1 )
+            // InternalFSM.g:5044:2: rule__ContinuationTransition__Group_7__0__Impl rule__ContinuationTransition__Group_7__1
             {
-            pushFollow(FOLLOW_rule__ContinuationTransition__Group_7__0__Impl_in_rule__ContinuationTransition__Group_7__010341);
+            pushFollow(FOLLOW_20);
             rule__ContinuationTransition__Group_7__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ContinuationTransition__Group_7__1_in_rule__ContinuationTransition__Group_7__010344);
+            pushFollow(FOLLOW_2);
             rule__ContinuationTransition__Group_7__1();
 
             state._fsp--;
@@ -14321,20 +14321,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__Group_7__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5048:1: rule__ContinuationTransition__Group_7__0__Impl : ( '{' ) ;
+    // InternalFSM.g:5051:1: rule__ContinuationTransition__Group_7__0__Impl : ( '{' ) ;
     public final void rule__ContinuationTransition__Group_7__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5052:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5053:1: ( '{' )
+            // InternalFSM.g:5055:1: ( ( '{' ) )
+            // InternalFSM.g:5056:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5053:1: ( '{' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5054:1: '{'
+            // InternalFSM.g:5056:1: ( '{' )
+            // InternalFSM.g:5057:1: '{'
             {
              before(grammarAccess.getContinuationTransitionAccess().getLeftCurlyBracketKeyword_7_0()); 
-            match(input,28,FOLLOW_28_in_rule__ContinuationTransition__Group_7__0__Impl10372); 
+            match(input,28,FOLLOW_2); 
              after(grammarAccess.getContinuationTransitionAccess().getLeftCurlyBracketKeyword_7_0()); 
 
             }
@@ -14358,21 +14358,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__Group_7__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5067:1: rule__ContinuationTransition__Group_7__1 : rule__ContinuationTransition__Group_7__1__Impl rule__ContinuationTransition__Group_7__2 ;
+    // InternalFSM.g:5070:1: rule__ContinuationTransition__Group_7__1 : rule__ContinuationTransition__Group_7__1__Impl rule__ContinuationTransition__Group_7__2 ;
     public final void rule__ContinuationTransition__Group_7__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5071:1: ( rule__ContinuationTransition__Group_7__1__Impl rule__ContinuationTransition__Group_7__2 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5072:2: rule__ContinuationTransition__Group_7__1__Impl rule__ContinuationTransition__Group_7__2
+            // InternalFSM.g:5074:1: ( rule__ContinuationTransition__Group_7__1__Impl rule__ContinuationTransition__Group_7__2 )
+            // InternalFSM.g:5075:2: rule__ContinuationTransition__Group_7__1__Impl rule__ContinuationTransition__Group_7__2
             {
-            pushFollow(FOLLOW_rule__ContinuationTransition__Group_7__1__Impl_in_rule__ContinuationTransition__Group_7__110403);
+            pushFollow(FOLLOW_20);
             rule__ContinuationTransition__Group_7__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ContinuationTransition__Group_7__2_in_rule__ContinuationTransition__Group_7__110406);
+            pushFollow(FOLLOW_2);
             rule__ContinuationTransition__Group_7__2();
 
             state._fsp--;
@@ -14396,20 +14396,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__Group_7__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5079:1: rule__ContinuationTransition__Group_7__1__Impl : ( ( rule__ContinuationTransition__Group_7_1__0 )? ) ;
+    // InternalFSM.g:5082:1: rule__ContinuationTransition__Group_7__1__Impl : ( ( rule__ContinuationTransition__Group_7_1__0 )? ) ;
     public final void rule__ContinuationTransition__Group_7__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5083:1: ( ( ( rule__ContinuationTransition__Group_7_1__0 )? ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5084:1: ( ( rule__ContinuationTransition__Group_7_1__0 )? )
+            // InternalFSM.g:5086:1: ( ( ( rule__ContinuationTransition__Group_7_1__0 )? ) )
+            // InternalFSM.g:5087:1: ( ( rule__ContinuationTransition__Group_7_1__0 )? )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5084:1: ( ( rule__ContinuationTransition__Group_7_1__0 )? )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5085:1: ( rule__ContinuationTransition__Group_7_1__0 )?
+            // InternalFSM.g:5087:1: ( ( rule__ContinuationTransition__Group_7_1__0 )? )
+            // InternalFSM.g:5088:1: ( rule__ContinuationTransition__Group_7_1__0 )?
             {
              before(grammarAccess.getContinuationTransitionAccess().getGroup_7_1()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5086:1: ( rule__ContinuationTransition__Group_7_1__0 )?
+            // InternalFSM.g:5089:1: ( rule__ContinuationTransition__Group_7_1__0 )?
             int alt53=2;
             int LA53_0 = input.LA(1);
 
@@ -14418,9 +14418,9 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt53) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5086:2: rule__ContinuationTransition__Group_7_1__0
+                    // InternalFSM.g:5089:2: rule__ContinuationTransition__Group_7_1__0
                     {
-                    pushFollow(FOLLOW_rule__ContinuationTransition__Group_7_1__0_in_rule__ContinuationTransition__Group_7__1__Impl10433);
+                    pushFollow(FOLLOW_2);
                     rule__ContinuationTransition__Group_7_1__0();
 
                     state._fsp--;
@@ -14454,16 +14454,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__Group_7__2"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5096:1: rule__ContinuationTransition__Group_7__2 : rule__ContinuationTransition__Group_7__2__Impl ;
+    // InternalFSM.g:5099:1: rule__ContinuationTransition__Group_7__2 : rule__ContinuationTransition__Group_7__2__Impl ;
     public final void rule__ContinuationTransition__Group_7__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5100:1: ( rule__ContinuationTransition__Group_7__2__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5101:2: rule__ContinuationTransition__Group_7__2__Impl
+            // InternalFSM.g:5103:1: ( rule__ContinuationTransition__Group_7__2__Impl )
+            // InternalFSM.g:5104:2: rule__ContinuationTransition__Group_7__2__Impl
             {
-            pushFollow(FOLLOW_rule__ContinuationTransition__Group_7__2__Impl_in_rule__ContinuationTransition__Group_7__210464);
+            pushFollow(FOLLOW_2);
             rule__ContinuationTransition__Group_7__2__Impl();
 
             state._fsp--;
@@ -14487,20 +14487,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__Group_7__2__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5107:1: rule__ContinuationTransition__Group_7__2__Impl : ( '}' ) ;
+    // InternalFSM.g:5110:1: rule__ContinuationTransition__Group_7__2__Impl : ( '}' ) ;
     public final void rule__ContinuationTransition__Group_7__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5111:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5112:1: ( '}' )
+            // InternalFSM.g:5114:1: ( ( '}' ) )
+            // InternalFSM.g:5115:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5112:1: ( '}' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5113:1: '}'
+            // InternalFSM.g:5115:1: ( '}' )
+            // InternalFSM.g:5116:1: '}'
             {
              before(grammarAccess.getContinuationTransitionAccess().getRightCurlyBracketKeyword_7_2()); 
-            match(input,29,FOLLOW_29_in_rule__ContinuationTransition__Group_7__2__Impl10492); 
+            match(input,29,FOLLOW_2); 
              after(grammarAccess.getContinuationTransitionAccess().getRightCurlyBracketKeyword_7_2()); 
 
             }
@@ -14524,21 +14524,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__Group_7_1__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5132:1: rule__ContinuationTransition__Group_7_1__0 : rule__ContinuationTransition__Group_7_1__0__Impl rule__ContinuationTransition__Group_7_1__1 ;
+    // InternalFSM.g:5135:1: rule__ContinuationTransition__Group_7_1__0 : rule__ContinuationTransition__Group_7_1__0__Impl rule__ContinuationTransition__Group_7_1__1 ;
     public final void rule__ContinuationTransition__Group_7_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5136:1: ( rule__ContinuationTransition__Group_7_1__0__Impl rule__ContinuationTransition__Group_7_1__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5137:2: rule__ContinuationTransition__Group_7_1__0__Impl rule__ContinuationTransition__Group_7_1__1
+            // InternalFSM.g:5139:1: ( rule__ContinuationTransition__Group_7_1__0__Impl rule__ContinuationTransition__Group_7_1__1 )
+            // InternalFSM.g:5140:2: rule__ContinuationTransition__Group_7_1__0__Impl rule__ContinuationTransition__Group_7_1__1
             {
-            pushFollow(FOLLOW_rule__ContinuationTransition__Group_7_1__0__Impl_in_rule__ContinuationTransition__Group_7_1__010529);
+            pushFollow(FOLLOW_7);
             rule__ContinuationTransition__Group_7_1__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ContinuationTransition__Group_7_1__1_in_rule__ContinuationTransition__Group_7_1__010532);
+            pushFollow(FOLLOW_2);
             rule__ContinuationTransition__Group_7_1__1();
 
             state._fsp--;
@@ -14562,20 +14562,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__Group_7_1__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5144:1: rule__ContinuationTransition__Group_7_1__0__Impl : ( 'action' ) ;
+    // InternalFSM.g:5147:1: rule__ContinuationTransition__Group_7_1__0__Impl : ( 'action' ) ;
     public final void rule__ContinuationTransition__Group_7_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5148:1: ( ( 'action' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5149:1: ( 'action' )
+            // InternalFSM.g:5151:1: ( ( 'action' ) )
+            // InternalFSM.g:5152:1: ( 'action' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5149:1: ( 'action' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5150:1: 'action'
+            // InternalFSM.g:5152:1: ( 'action' )
+            // InternalFSM.g:5153:1: 'action'
             {
              before(grammarAccess.getContinuationTransitionAccess().getActionKeyword_7_1_0()); 
-            match(input,45,FOLLOW_45_in_rule__ContinuationTransition__Group_7_1__0__Impl10560); 
+            match(input,45,FOLLOW_2); 
              after(grammarAccess.getContinuationTransitionAccess().getActionKeyword_7_1_0()); 
 
             }
@@ -14599,16 +14599,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__Group_7_1__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5163:1: rule__ContinuationTransition__Group_7_1__1 : rule__ContinuationTransition__Group_7_1__1__Impl ;
+    // InternalFSM.g:5166:1: rule__ContinuationTransition__Group_7_1__1 : rule__ContinuationTransition__Group_7_1__1__Impl ;
     public final void rule__ContinuationTransition__Group_7_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5167:1: ( rule__ContinuationTransition__Group_7_1__1__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5168:2: rule__ContinuationTransition__Group_7_1__1__Impl
+            // InternalFSM.g:5170:1: ( rule__ContinuationTransition__Group_7_1__1__Impl )
+            // InternalFSM.g:5171:2: rule__ContinuationTransition__Group_7_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__ContinuationTransition__Group_7_1__1__Impl_in_rule__ContinuationTransition__Group_7_1__110591);
+            pushFollow(FOLLOW_2);
             rule__ContinuationTransition__Group_7_1__1__Impl();
 
             state._fsp--;
@@ -14632,23 +14632,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__Group_7_1__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5174:1: rule__ContinuationTransition__Group_7_1__1__Impl : ( ( rule__ContinuationTransition__ActionAssignment_7_1_1 ) ) ;
+    // InternalFSM.g:5177:1: rule__ContinuationTransition__Group_7_1__1__Impl : ( ( rule__ContinuationTransition__ActionAssignment_7_1_1 ) ) ;
     public final void rule__ContinuationTransition__Group_7_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5178:1: ( ( ( rule__ContinuationTransition__ActionAssignment_7_1_1 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5179:1: ( ( rule__ContinuationTransition__ActionAssignment_7_1_1 ) )
+            // InternalFSM.g:5181:1: ( ( ( rule__ContinuationTransition__ActionAssignment_7_1_1 ) ) )
+            // InternalFSM.g:5182:1: ( ( rule__ContinuationTransition__ActionAssignment_7_1_1 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5179:1: ( ( rule__ContinuationTransition__ActionAssignment_7_1_1 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5180:1: ( rule__ContinuationTransition__ActionAssignment_7_1_1 )
+            // InternalFSM.g:5182:1: ( ( rule__ContinuationTransition__ActionAssignment_7_1_1 ) )
+            // InternalFSM.g:5183:1: ( rule__ContinuationTransition__ActionAssignment_7_1_1 )
             {
              before(grammarAccess.getContinuationTransitionAccess().getActionAssignment_7_1_1()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5181:1: ( rule__ContinuationTransition__ActionAssignment_7_1_1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5181:2: rule__ContinuationTransition__ActionAssignment_7_1_1
+            // InternalFSM.g:5184:1: ( rule__ContinuationTransition__ActionAssignment_7_1_1 )
+            // InternalFSM.g:5184:2: rule__ContinuationTransition__ActionAssignment_7_1_1
             {
-            pushFollow(FOLLOW_rule__ContinuationTransition__ActionAssignment_7_1_1_in_rule__ContinuationTransition__Group_7_1__1__Impl10618);
+            pushFollow(FOLLOW_2);
             rule__ContinuationTransition__ActionAssignment_7_1_1();
 
             state._fsp--;
@@ -14679,21 +14679,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5195:1: rule__TriggeredTransition__Group__0 : rule__TriggeredTransition__Group__0__Impl rule__TriggeredTransition__Group__1 ;
+    // InternalFSM.g:5198:1: rule__TriggeredTransition__Group__0 : rule__TriggeredTransition__Group__0__Impl rule__TriggeredTransition__Group__1 ;
     public final void rule__TriggeredTransition__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5199:1: ( rule__TriggeredTransition__Group__0__Impl rule__TriggeredTransition__Group__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5200:2: rule__TriggeredTransition__Group__0__Impl rule__TriggeredTransition__Group__1
+            // InternalFSM.g:5202:1: ( rule__TriggeredTransition__Group__0__Impl rule__TriggeredTransition__Group__1 )
+            // InternalFSM.g:5203:2: rule__TriggeredTransition__Group__0__Impl rule__TriggeredTransition__Group__1
             {
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__0__Impl_in_rule__TriggeredTransition__Group__010652);
+            pushFollow(FOLLOW_16);
             rule__TriggeredTransition__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__1_in_rule__TriggeredTransition__Group__010655);
+            pushFollow(FOLLOW_2);
             rule__TriggeredTransition__Group__1();
 
             state._fsp--;
@@ -14717,20 +14717,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5207:1: rule__TriggeredTransition__Group__0__Impl : ( 'Transition' ) ;
+    // InternalFSM.g:5210:1: rule__TriggeredTransition__Group__0__Impl : ( 'Transition' ) ;
     public final void rule__TriggeredTransition__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5211:1: ( ( 'Transition' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5212:1: ( 'Transition' )
+            // InternalFSM.g:5214:1: ( ( 'Transition' ) )
+            // InternalFSM.g:5215:1: ( 'Transition' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5212:1: ( 'Transition' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5213:1: 'Transition'
+            // InternalFSM.g:5215:1: ( 'Transition' )
+            // InternalFSM.g:5216:1: 'Transition'
             {
              before(grammarAccess.getTriggeredTransitionAccess().getTransitionKeyword_0()); 
-            match(input,41,FOLLOW_41_in_rule__TriggeredTransition__Group__0__Impl10683); 
+            match(input,41,FOLLOW_2); 
              after(grammarAccess.getTriggeredTransitionAccess().getTransitionKeyword_0()); 
 
             }
@@ -14754,21 +14754,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5226:1: rule__TriggeredTransition__Group__1 : rule__TriggeredTransition__Group__1__Impl rule__TriggeredTransition__Group__2 ;
+    // InternalFSM.g:5229:1: rule__TriggeredTransition__Group__1 : rule__TriggeredTransition__Group__1__Impl rule__TriggeredTransition__Group__2 ;
     public final void rule__TriggeredTransition__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5230:1: ( rule__TriggeredTransition__Group__1__Impl rule__TriggeredTransition__Group__2 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5231:2: rule__TriggeredTransition__Group__1__Impl rule__TriggeredTransition__Group__2
+            // InternalFSM.g:5233:1: ( rule__TriggeredTransition__Group__1__Impl rule__TriggeredTransition__Group__2 )
+            // InternalFSM.g:5234:2: rule__TriggeredTransition__Group__1__Impl rule__TriggeredTransition__Group__2
             {
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__1__Impl_in_rule__TriggeredTransition__Group__110714);
+            pushFollow(FOLLOW_16);
             rule__TriggeredTransition__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__2_in_rule__TriggeredTransition__Group__110717);
+            pushFollow(FOLLOW_2);
             rule__TriggeredTransition__Group__2();
 
             state._fsp--;
@@ -14792,20 +14792,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5238:1: rule__TriggeredTransition__Group__1__Impl : ( ( rule__TriggeredTransition__NameAssignment_1 )? ) ;
+    // InternalFSM.g:5241:1: rule__TriggeredTransition__Group__1__Impl : ( ( rule__TriggeredTransition__NameAssignment_1 )? ) ;
     public final void rule__TriggeredTransition__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5242:1: ( ( ( rule__TriggeredTransition__NameAssignment_1 )? ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5243:1: ( ( rule__TriggeredTransition__NameAssignment_1 )? )
+            // InternalFSM.g:5245:1: ( ( ( rule__TriggeredTransition__NameAssignment_1 )? ) )
+            // InternalFSM.g:5246:1: ( ( rule__TriggeredTransition__NameAssignment_1 )? )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5243:1: ( ( rule__TriggeredTransition__NameAssignment_1 )? )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5244:1: ( rule__TriggeredTransition__NameAssignment_1 )?
+            // InternalFSM.g:5246:1: ( ( rule__TriggeredTransition__NameAssignment_1 )? )
+            // InternalFSM.g:5247:1: ( rule__TriggeredTransition__NameAssignment_1 )?
             {
              before(grammarAccess.getTriggeredTransitionAccess().getNameAssignment_1()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5245:1: ( rule__TriggeredTransition__NameAssignment_1 )?
+            // InternalFSM.g:5248:1: ( rule__TriggeredTransition__NameAssignment_1 )?
             int alt54=2;
             int LA54_0 = input.LA(1);
 
@@ -14814,9 +14814,9 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt54) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5245:2: rule__TriggeredTransition__NameAssignment_1
+                    // InternalFSM.g:5248:2: rule__TriggeredTransition__NameAssignment_1
                     {
-                    pushFollow(FOLLOW_rule__TriggeredTransition__NameAssignment_1_in_rule__TriggeredTransition__Group__1__Impl10744);
+                    pushFollow(FOLLOW_2);
                     rule__TriggeredTransition__NameAssignment_1();
 
                     state._fsp--;
@@ -14850,21 +14850,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__2"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5255:1: rule__TriggeredTransition__Group__2 : rule__TriggeredTransition__Group__2__Impl rule__TriggeredTransition__Group__3 ;
+    // InternalFSM.g:5258:1: rule__TriggeredTransition__Group__2 : rule__TriggeredTransition__Group__2__Impl rule__TriggeredTransition__Group__3 ;
     public final void rule__TriggeredTransition__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5259:1: ( rule__TriggeredTransition__Group__2__Impl rule__TriggeredTransition__Group__3 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5260:2: rule__TriggeredTransition__Group__2__Impl rule__TriggeredTransition__Group__3
+            // InternalFSM.g:5262:1: ( rule__TriggeredTransition__Group__2__Impl rule__TriggeredTransition__Group__3 )
+            // InternalFSM.g:5263:2: rule__TriggeredTransition__Group__2__Impl rule__TriggeredTransition__Group__3
             {
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__2__Impl_in_rule__TriggeredTransition__Group__210775);
+            pushFollow(FOLLOW_19);
             rule__TriggeredTransition__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__3_in_rule__TriggeredTransition__Group__210778);
+            pushFollow(FOLLOW_2);
             rule__TriggeredTransition__Group__3();
 
             state._fsp--;
@@ -14888,20 +14888,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__2__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5267:1: rule__TriggeredTransition__Group__2__Impl : ( ':' ) ;
+    // InternalFSM.g:5270:1: rule__TriggeredTransition__Group__2__Impl : ( ':' ) ;
     public final void rule__TriggeredTransition__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5271:1: ( ( ':' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5272:1: ( ':' )
+            // InternalFSM.g:5274:1: ( ( ':' ) )
+            // InternalFSM.g:5275:1: ( ':' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5272:1: ( ':' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5273:1: ':'
+            // InternalFSM.g:5275:1: ( ':' )
+            // InternalFSM.g:5276:1: ':'
             {
              before(grammarAccess.getTriggeredTransitionAccess().getColonKeyword_2()); 
-            match(input,42,FOLLOW_42_in_rule__TriggeredTransition__Group__2__Impl10806); 
+            match(input,42,FOLLOW_2); 
              after(grammarAccess.getTriggeredTransitionAccess().getColonKeyword_2()); 
 
             }
@@ -14925,21 +14925,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__3"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5286:1: rule__TriggeredTransition__Group__3 : rule__TriggeredTransition__Group__3__Impl rule__TriggeredTransition__Group__4 ;
+    // InternalFSM.g:5289:1: rule__TriggeredTransition__Group__3 : rule__TriggeredTransition__Group__3__Impl rule__TriggeredTransition__Group__4 ;
     public final void rule__TriggeredTransition__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5290:1: ( rule__TriggeredTransition__Group__3__Impl rule__TriggeredTransition__Group__4 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5291:2: rule__TriggeredTransition__Group__3__Impl rule__TriggeredTransition__Group__4
+            // InternalFSM.g:5293:1: ( rule__TriggeredTransition__Group__3__Impl rule__TriggeredTransition__Group__4 )
+            // InternalFSM.g:5294:2: rule__TriggeredTransition__Group__3__Impl rule__TriggeredTransition__Group__4
             {
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__3__Impl_in_rule__TriggeredTransition__Group__310837);
+            pushFollow(FOLLOW_18);
             rule__TriggeredTransition__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__4_in_rule__TriggeredTransition__Group__310840);
+            pushFollow(FOLLOW_2);
             rule__TriggeredTransition__Group__4();
 
             state._fsp--;
@@ -14963,23 +14963,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__3__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5298:1: rule__TriggeredTransition__Group__3__Impl : ( ( rule__TriggeredTransition__FromAssignment_3 ) ) ;
+    // InternalFSM.g:5301:1: rule__TriggeredTransition__Group__3__Impl : ( ( rule__TriggeredTransition__FromAssignment_3 ) ) ;
     public final void rule__TriggeredTransition__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5302:1: ( ( ( rule__TriggeredTransition__FromAssignment_3 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5303:1: ( ( rule__TriggeredTransition__FromAssignment_3 ) )
+            // InternalFSM.g:5305:1: ( ( ( rule__TriggeredTransition__FromAssignment_3 ) ) )
+            // InternalFSM.g:5306:1: ( ( rule__TriggeredTransition__FromAssignment_3 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5303:1: ( ( rule__TriggeredTransition__FromAssignment_3 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5304:1: ( rule__TriggeredTransition__FromAssignment_3 )
+            // InternalFSM.g:5306:1: ( ( rule__TriggeredTransition__FromAssignment_3 ) )
+            // InternalFSM.g:5307:1: ( rule__TriggeredTransition__FromAssignment_3 )
             {
              before(grammarAccess.getTriggeredTransitionAccess().getFromAssignment_3()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5305:1: ( rule__TriggeredTransition__FromAssignment_3 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5305:2: rule__TriggeredTransition__FromAssignment_3
+            // InternalFSM.g:5308:1: ( rule__TriggeredTransition__FromAssignment_3 )
+            // InternalFSM.g:5308:2: rule__TriggeredTransition__FromAssignment_3
             {
-            pushFollow(FOLLOW_rule__TriggeredTransition__FromAssignment_3_in_rule__TriggeredTransition__Group__3__Impl10867);
+            pushFollow(FOLLOW_2);
             rule__TriggeredTransition__FromAssignment_3();
 
             state._fsp--;
@@ -15010,21 +15010,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__4"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5315:1: rule__TriggeredTransition__Group__4 : rule__TriggeredTransition__Group__4__Impl rule__TriggeredTransition__Group__5 ;
+    // InternalFSM.g:5318:1: rule__TriggeredTransition__Group__4 : rule__TriggeredTransition__Group__4__Impl rule__TriggeredTransition__Group__5 ;
     public final void rule__TriggeredTransition__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5319:1: ( rule__TriggeredTransition__Group__4__Impl rule__TriggeredTransition__Group__5 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5320:2: rule__TriggeredTransition__Group__4__Impl rule__TriggeredTransition__Group__5
+            // InternalFSM.g:5322:1: ( rule__TriggeredTransition__Group__4__Impl rule__TriggeredTransition__Group__5 )
+            // InternalFSM.g:5323:2: rule__TriggeredTransition__Group__4__Impl rule__TriggeredTransition__Group__5
             {
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__4__Impl_in_rule__TriggeredTransition__Group__410897);
+            pushFollow(FOLLOW_19);
             rule__TriggeredTransition__Group__4__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__5_in_rule__TriggeredTransition__Group__410900);
+            pushFollow(FOLLOW_2);
             rule__TriggeredTransition__Group__5();
 
             state._fsp--;
@@ -15048,20 +15048,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__4__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5327:1: rule__TriggeredTransition__Group__4__Impl : ( '->' ) ;
+    // InternalFSM.g:5330:1: rule__TriggeredTransition__Group__4__Impl : ( '->' ) ;
     public final void rule__TriggeredTransition__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5331:1: ( ( '->' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5332:1: ( '->' )
+            // InternalFSM.g:5334:1: ( ( '->' ) )
+            // InternalFSM.g:5335:1: ( '->' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5332:1: ( '->' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5333:1: '->'
+            // InternalFSM.g:5335:1: ( '->' )
+            // InternalFSM.g:5336:1: '->'
             {
              before(grammarAccess.getTriggeredTransitionAccess().getHyphenMinusGreaterThanSignKeyword_4()); 
-            match(input,44,FOLLOW_44_in_rule__TriggeredTransition__Group__4__Impl10928); 
+            match(input,44,FOLLOW_2); 
              after(grammarAccess.getTriggeredTransitionAccess().getHyphenMinusGreaterThanSignKeyword_4()); 
 
             }
@@ -15085,21 +15085,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__5"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5346:1: rule__TriggeredTransition__Group__5 : rule__TriggeredTransition__Group__5__Impl rule__TriggeredTransition__Group__6 ;
+    // InternalFSM.g:5349:1: rule__TriggeredTransition__Group__5 : rule__TriggeredTransition__Group__5__Impl rule__TriggeredTransition__Group__6 ;
     public final void rule__TriggeredTransition__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5350:1: ( rule__TriggeredTransition__Group__5__Impl rule__TriggeredTransition__Group__6 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5351:2: rule__TriggeredTransition__Group__5__Impl rule__TriggeredTransition__Group__6
+            // InternalFSM.g:5353:1: ( rule__TriggeredTransition__Group__5__Impl rule__TriggeredTransition__Group__6 )
+            // InternalFSM.g:5354:2: rule__TriggeredTransition__Group__5__Impl rule__TriggeredTransition__Group__6
             {
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__5__Impl_in_rule__TriggeredTransition__Group__510959);
+            pushFollow(FOLLOW_10);
             rule__TriggeredTransition__Group__5__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__6_in_rule__TriggeredTransition__Group__510962);
+            pushFollow(FOLLOW_2);
             rule__TriggeredTransition__Group__6();
 
             state._fsp--;
@@ -15123,23 +15123,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__5__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5358:1: rule__TriggeredTransition__Group__5__Impl : ( ( rule__TriggeredTransition__ToAssignment_5 ) ) ;
+    // InternalFSM.g:5361:1: rule__TriggeredTransition__Group__5__Impl : ( ( rule__TriggeredTransition__ToAssignment_5 ) ) ;
     public final void rule__TriggeredTransition__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5362:1: ( ( ( rule__TriggeredTransition__ToAssignment_5 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5363:1: ( ( rule__TriggeredTransition__ToAssignment_5 ) )
+            // InternalFSM.g:5365:1: ( ( ( rule__TriggeredTransition__ToAssignment_5 ) ) )
+            // InternalFSM.g:5366:1: ( ( rule__TriggeredTransition__ToAssignment_5 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5363:1: ( ( rule__TriggeredTransition__ToAssignment_5 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5364:1: ( rule__TriggeredTransition__ToAssignment_5 )
+            // InternalFSM.g:5366:1: ( ( rule__TriggeredTransition__ToAssignment_5 ) )
+            // InternalFSM.g:5367:1: ( rule__TriggeredTransition__ToAssignment_5 )
             {
              before(grammarAccess.getTriggeredTransitionAccess().getToAssignment_5()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5365:1: ( rule__TriggeredTransition__ToAssignment_5 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5365:2: rule__TriggeredTransition__ToAssignment_5
+            // InternalFSM.g:5368:1: ( rule__TriggeredTransition__ToAssignment_5 )
+            // InternalFSM.g:5368:2: rule__TriggeredTransition__ToAssignment_5
             {
-            pushFollow(FOLLOW_rule__TriggeredTransition__ToAssignment_5_in_rule__TriggeredTransition__Group__5__Impl10989);
+            pushFollow(FOLLOW_2);
             rule__TriggeredTransition__ToAssignment_5();
 
             state._fsp--;
@@ -15170,21 +15170,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__6"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5375:1: rule__TriggeredTransition__Group__6 : rule__TriggeredTransition__Group__6__Impl rule__TriggeredTransition__Group__7 ;
+    // InternalFSM.g:5378:1: rule__TriggeredTransition__Group__6 : rule__TriggeredTransition__Group__6__Impl rule__TriggeredTransition__Group__7 ;
     public final void rule__TriggeredTransition__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5379:1: ( rule__TriggeredTransition__Group__6__Impl rule__TriggeredTransition__Group__7 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5380:2: rule__TriggeredTransition__Group__6__Impl rule__TriggeredTransition__Group__7
+            // InternalFSM.g:5382:1: ( rule__TriggeredTransition__Group__6__Impl rule__TriggeredTransition__Group__7 )
+            // InternalFSM.g:5383:2: rule__TriggeredTransition__Group__6__Impl rule__TriggeredTransition__Group__7
             {
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__6__Impl_in_rule__TriggeredTransition__Group__611019);
+            pushFollow(FOLLOW_10);
             rule__TriggeredTransition__Group__6__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__7_in_rule__TriggeredTransition__Group__611022);
+            pushFollow(FOLLOW_2);
             rule__TriggeredTransition__Group__7();
 
             state._fsp--;
@@ -15208,20 +15208,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__6__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5387:1: rule__TriggeredTransition__Group__6__Impl : ( ( rule__TriggeredTransition__DocuAssignment_6 )? ) ;
+    // InternalFSM.g:5390:1: rule__TriggeredTransition__Group__6__Impl : ( ( rule__TriggeredTransition__DocuAssignment_6 )? ) ;
     public final void rule__TriggeredTransition__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5391:1: ( ( ( rule__TriggeredTransition__DocuAssignment_6 )? ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5392:1: ( ( rule__TriggeredTransition__DocuAssignment_6 )? )
+            // InternalFSM.g:5394:1: ( ( ( rule__TriggeredTransition__DocuAssignment_6 )? ) )
+            // InternalFSM.g:5395:1: ( ( rule__TriggeredTransition__DocuAssignment_6 )? )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5392:1: ( ( rule__TriggeredTransition__DocuAssignment_6 )? )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5393:1: ( rule__TriggeredTransition__DocuAssignment_6 )?
+            // InternalFSM.g:5395:1: ( ( rule__TriggeredTransition__DocuAssignment_6 )? )
+            // InternalFSM.g:5396:1: ( rule__TriggeredTransition__DocuAssignment_6 )?
             {
              before(grammarAccess.getTriggeredTransitionAccess().getDocuAssignment_6()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5394:1: ( rule__TriggeredTransition__DocuAssignment_6 )?
+            // InternalFSM.g:5397:1: ( rule__TriggeredTransition__DocuAssignment_6 )?
             int alt55=2;
             int LA55_0 = input.LA(1);
 
@@ -15230,9 +15230,9 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt55) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5394:2: rule__TriggeredTransition__DocuAssignment_6
+                    // InternalFSM.g:5397:2: rule__TriggeredTransition__DocuAssignment_6
                     {
-                    pushFollow(FOLLOW_rule__TriggeredTransition__DocuAssignment_6_in_rule__TriggeredTransition__Group__6__Impl11049);
+                    pushFollow(FOLLOW_2);
                     rule__TriggeredTransition__DocuAssignment_6();
 
                     state._fsp--;
@@ -15266,21 +15266,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__7"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5404:1: rule__TriggeredTransition__Group__7 : rule__TriggeredTransition__Group__7__Impl rule__TriggeredTransition__Group__8 ;
+    // InternalFSM.g:5407:1: rule__TriggeredTransition__Group__7 : rule__TriggeredTransition__Group__7__Impl rule__TriggeredTransition__Group__8 ;
     public final void rule__TriggeredTransition__Group__7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5408:1: ( rule__TriggeredTransition__Group__7__Impl rule__TriggeredTransition__Group__8 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5409:2: rule__TriggeredTransition__Group__7__Impl rule__TriggeredTransition__Group__8
+            // InternalFSM.g:5411:1: ( rule__TriggeredTransition__Group__7__Impl rule__TriggeredTransition__Group__8 )
+            // InternalFSM.g:5412:2: rule__TriggeredTransition__Group__7__Impl rule__TriggeredTransition__Group__8
             {
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__7__Impl_in_rule__TriggeredTransition__Group__711080);
+            pushFollow(FOLLOW_21);
             rule__TriggeredTransition__Group__7__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__8_in_rule__TriggeredTransition__Group__711083);
+            pushFollow(FOLLOW_2);
             rule__TriggeredTransition__Group__8();
 
             state._fsp--;
@@ -15304,20 +15304,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__7__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5416:1: rule__TriggeredTransition__Group__7__Impl : ( '{' ) ;
+    // InternalFSM.g:5419:1: rule__TriggeredTransition__Group__7__Impl : ( '{' ) ;
     public final void rule__TriggeredTransition__Group__7__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5420:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5421:1: ( '{' )
+            // InternalFSM.g:5423:1: ( ( '{' ) )
+            // InternalFSM.g:5424:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5421:1: ( '{' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5422:1: '{'
+            // InternalFSM.g:5424:1: ( '{' )
+            // InternalFSM.g:5425:1: '{'
             {
              before(grammarAccess.getTriggeredTransitionAccess().getLeftCurlyBracketKeyword_7()); 
-            match(input,28,FOLLOW_28_in_rule__TriggeredTransition__Group__7__Impl11111); 
+            match(input,28,FOLLOW_2); 
              after(grammarAccess.getTriggeredTransitionAccess().getLeftCurlyBracketKeyword_7()); 
 
             }
@@ -15341,21 +15341,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__8"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5435:1: rule__TriggeredTransition__Group__8 : rule__TriggeredTransition__Group__8__Impl rule__TriggeredTransition__Group__9 ;
+    // InternalFSM.g:5438:1: rule__TriggeredTransition__Group__8 : rule__TriggeredTransition__Group__8__Impl rule__TriggeredTransition__Group__9 ;
     public final void rule__TriggeredTransition__Group__8() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5439:1: ( rule__TriggeredTransition__Group__8__Impl rule__TriggeredTransition__Group__9 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5440:2: rule__TriggeredTransition__Group__8__Impl rule__TriggeredTransition__Group__9
+            // InternalFSM.g:5442:1: ( rule__TriggeredTransition__Group__8__Impl rule__TriggeredTransition__Group__9 )
+            // InternalFSM.g:5443:2: rule__TriggeredTransition__Group__8__Impl rule__TriggeredTransition__Group__9
             {
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__8__Impl_in_rule__TriggeredTransition__Group__811142);
+            pushFollow(FOLLOW_7);
             rule__TriggeredTransition__Group__8__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__9_in_rule__TriggeredTransition__Group__811145);
+            pushFollow(FOLLOW_2);
             rule__TriggeredTransition__Group__9();
 
             state._fsp--;
@@ -15379,20 +15379,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__8__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5447:1: rule__TriggeredTransition__Group__8__Impl : ( 'triggers' ) ;
+    // InternalFSM.g:5450:1: rule__TriggeredTransition__Group__8__Impl : ( 'triggers' ) ;
     public final void rule__TriggeredTransition__Group__8__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5451:1: ( ( 'triggers' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5452:1: ( 'triggers' )
+            // InternalFSM.g:5454:1: ( ( 'triggers' ) )
+            // InternalFSM.g:5455:1: ( 'triggers' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5452:1: ( 'triggers' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5453:1: 'triggers'
+            // InternalFSM.g:5455:1: ( 'triggers' )
+            // InternalFSM.g:5456:1: 'triggers'
             {
              before(grammarAccess.getTriggeredTransitionAccess().getTriggersKeyword_8()); 
-            match(input,46,FOLLOW_46_in_rule__TriggeredTransition__Group__8__Impl11173); 
+            match(input,46,FOLLOW_2); 
              after(grammarAccess.getTriggeredTransitionAccess().getTriggersKeyword_8()); 
 
             }
@@ -15416,21 +15416,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__9"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5466:1: rule__TriggeredTransition__Group__9 : rule__TriggeredTransition__Group__9__Impl rule__TriggeredTransition__Group__10 ;
+    // InternalFSM.g:5469:1: rule__TriggeredTransition__Group__9 : rule__TriggeredTransition__Group__9__Impl rule__TriggeredTransition__Group__10 ;
     public final void rule__TriggeredTransition__Group__9() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5470:1: ( rule__TriggeredTransition__Group__9__Impl rule__TriggeredTransition__Group__10 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5471:2: rule__TriggeredTransition__Group__9__Impl rule__TriggeredTransition__Group__10
+            // InternalFSM.g:5473:1: ( rule__TriggeredTransition__Group__9__Impl rule__TriggeredTransition__Group__10 )
+            // InternalFSM.g:5474:2: rule__TriggeredTransition__Group__9__Impl rule__TriggeredTransition__Group__10
             {
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__9__Impl_in_rule__TriggeredTransition__Group__911204);
+            pushFollow(FOLLOW_22);
             rule__TriggeredTransition__Group__9__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__10_in_rule__TriggeredTransition__Group__911207);
+            pushFollow(FOLLOW_2);
             rule__TriggeredTransition__Group__10();
 
             state._fsp--;
@@ -15454,20 +15454,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__9__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5478:1: rule__TriggeredTransition__Group__9__Impl : ( '{' ) ;
+    // InternalFSM.g:5481:1: rule__TriggeredTransition__Group__9__Impl : ( '{' ) ;
     public final void rule__TriggeredTransition__Group__9__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5482:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5483:1: ( '{' )
+            // InternalFSM.g:5485:1: ( ( '{' ) )
+            // InternalFSM.g:5486:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5483:1: ( '{' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5484:1: '{'
+            // InternalFSM.g:5486:1: ( '{' )
+            // InternalFSM.g:5487:1: '{'
             {
              before(grammarAccess.getTriggeredTransitionAccess().getLeftCurlyBracketKeyword_9()); 
-            match(input,28,FOLLOW_28_in_rule__TriggeredTransition__Group__9__Impl11235); 
+            match(input,28,FOLLOW_2); 
              after(grammarAccess.getTriggeredTransitionAccess().getLeftCurlyBracketKeyword_9()); 
 
             }
@@ -15491,21 +15491,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__10"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5497:1: rule__TriggeredTransition__Group__10 : rule__TriggeredTransition__Group__10__Impl rule__TriggeredTransition__Group__11 ;
+    // InternalFSM.g:5500:1: rule__TriggeredTransition__Group__10 : rule__TriggeredTransition__Group__10__Impl rule__TriggeredTransition__Group__11 ;
     public final void rule__TriggeredTransition__Group__10() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5501:1: ( rule__TriggeredTransition__Group__10__Impl rule__TriggeredTransition__Group__11 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5502:2: rule__TriggeredTransition__Group__10__Impl rule__TriggeredTransition__Group__11
+            // InternalFSM.g:5504:1: ( rule__TriggeredTransition__Group__10__Impl rule__TriggeredTransition__Group__11 )
+            // InternalFSM.g:5505:2: rule__TriggeredTransition__Group__10__Impl rule__TriggeredTransition__Group__11
             {
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__10__Impl_in_rule__TriggeredTransition__Group__1011266);
+            pushFollow(FOLLOW_23);
             rule__TriggeredTransition__Group__10__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__11_in_rule__TriggeredTransition__Group__1011269);
+            pushFollow(FOLLOW_2);
             rule__TriggeredTransition__Group__11();
 
             state._fsp--;
@@ -15529,23 +15529,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__10__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5509:1: rule__TriggeredTransition__Group__10__Impl : ( ( rule__TriggeredTransition__TriggersAssignment_10 ) ) ;
+    // InternalFSM.g:5512:1: rule__TriggeredTransition__Group__10__Impl : ( ( rule__TriggeredTransition__TriggersAssignment_10 ) ) ;
     public final void rule__TriggeredTransition__Group__10__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5513:1: ( ( ( rule__TriggeredTransition__TriggersAssignment_10 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5514:1: ( ( rule__TriggeredTransition__TriggersAssignment_10 ) )
+            // InternalFSM.g:5516:1: ( ( ( rule__TriggeredTransition__TriggersAssignment_10 ) ) )
+            // InternalFSM.g:5517:1: ( ( rule__TriggeredTransition__TriggersAssignment_10 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5514:1: ( ( rule__TriggeredTransition__TriggersAssignment_10 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5515:1: ( rule__TriggeredTransition__TriggersAssignment_10 )
+            // InternalFSM.g:5517:1: ( ( rule__TriggeredTransition__TriggersAssignment_10 ) )
+            // InternalFSM.g:5518:1: ( rule__TriggeredTransition__TriggersAssignment_10 )
             {
              before(grammarAccess.getTriggeredTransitionAccess().getTriggersAssignment_10()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5516:1: ( rule__TriggeredTransition__TriggersAssignment_10 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5516:2: rule__TriggeredTransition__TriggersAssignment_10
+            // InternalFSM.g:5519:1: ( rule__TriggeredTransition__TriggersAssignment_10 )
+            // InternalFSM.g:5519:2: rule__TriggeredTransition__TriggersAssignment_10
             {
-            pushFollow(FOLLOW_rule__TriggeredTransition__TriggersAssignment_10_in_rule__TriggeredTransition__Group__10__Impl11296);
+            pushFollow(FOLLOW_2);
             rule__TriggeredTransition__TriggersAssignment_10();
 
             state._fsp--;
@@ -15576,21 +15576,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__11"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5526:1: rule__TriggeredTransition__Group__11 : rule__TriggeredTransition__Group__11__Impl rule__TriggeredTransition__Group__12 ;
+    // InternalFSM.g:5529:1: rule__TriggeredTransition__Group__11 : rule__TriggeredTransition__Group__11__Impl rule__TriggeredTransition__Group__12 ;
     public final void rule__TriggeredTransition__Group__11() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5530:1: ( rule__TriggeredTransition__Group__11__Impl rule__TriggeredTransition__Group__12 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5531:2: rule__TriggeredTransition__Group__11__Impl rule__TriggeredTransition__Group__12
+            // InternalFSM.g:5533:1: ( rule__TriggeredTransition__Group__11__Impl rule__TriggeredTransition__Group__12 )
+            // InternalFSM.g:5534:2: rule__TriggeredTransition__Group__11__Impl rule__TriggeredTransition__Group__12
             {
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__11__Impl_in_rule__TriggeredTransition__Group__1111326);
+            pushFollow(FOLLOW_23);
             rule__TriggeredTransition__Group__11__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__12_in_rule__TriggeredTransition__Group__1111329);
+            pushFollow(FOLLOW_2);
             rule__TriggeredTransition__Group__12();
 
             state._fsp--;
@@ -15614,20 +15614,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__11__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5538:1: rule__TriggeredTransition__Group__11__Impl : ( ( rule__TriggeredTransition__Group_11__0 )* ) ;
+    // InternalFSM.g:5541:1: rule__TriggeredTransition__Group__11__Impl : ( ( rule__TriggeredTransition__Group_11__0 )* ) ;
     public final void rule__TriggeredTransition__Group__11__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5542:1: ( ( ( rule__TriggeredTransition__Group_11__0 )* ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5543:1: ( ( rule__TriggeredTransition__Group_11__0 )* )
+            // InternalFSM.g:5545:1: ( ( ( rule__TriggeredTransition__Group_11__0 )* ) )
+            // InternalFSM.g:5546:1: ( ( rule__TriggeredTransition__Group_11__0 )* )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5543:1: ( ( rule__TriggeredTransition__Group_11__0 )* )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5544:1: ( rule__TriggeredTransition__Group_11__0 )*
+            // InternalFSM.g:5546:1: ( ( rule__TriggeredTransition__Group_11__0 )* )
+            // InternalFSM.g:5547:1: ( rule__TriggeredTransition__Group_11__0 )*
             {
              before(grammarAccess.getTriggeredTransitionAccess().getGroup_11()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5545:1: ( rule__TriggeredTransition__Group_11__0 )*
+            // InternalFSM.g:5548:1: ( rule__TriggeredTransition__Group_11__0 )*
             loop56:
             do {
                 int alt56=2;
@@ -15640,9 +15640,9 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
                 switch (alt56) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5545:2: rule__TriggeredTransition__Group_11__0
+            	    // InternalFSM.g:5548:2: rule__TriggeredTransition__Group_11__0
             	    {
-            	    pushFollow(FOLLOW_rule__TriggeredTransition__Group_11__0_in_rule__TriggeredTransition__Group__11__Impl11356);
+            	    pushFollow(FOLLOW_24);
             	    rule__TriggeredTransition__Group_11__0();
 
             	    state._fsp--;
@@ -15679,21 +15679,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__12"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5555:1: rule__TriggeredTransition__Group__12 : rule__TriggeredTransition__Group__12__Impl rule__TriggeredTransition__Group__13 ;
+    // InternalFSM.g:5558:1: rule__TriggeredTransition__Group__12 : rule__TriggeredTransition__Group__12__Impl rule__TriggeredTransition__Group__13 ;
     public final void rule__TriggeredTransition__Group__12() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5559:1: ( rule__TriggeredTransition__Group__12__Impl rule__TriggeredTransition__Group__13 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5560:2: rule__TriggeredTransition__Group__12__Impl rule__TriggeredTransition__Group__13
+            // InternalFSM.g:5562:1: ( rule__TriggeredTransition__Group__12__Impl rule__TriggeredTransition__Group__13 )
+            // InternalFSM.g:5563:2: rule__TriggeredTransition__Group__12__Impl rule__TriggeredTransition__Group__13
             {
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__12__Impl_in_rule__TriggeredTransition__Group__1211387);
+            pushFollow(FOLLOW_20);
             rule__TriggeredTransition__Group__12__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__13_in_rule__TriggeredTransition__Group__1211390);
+            pushFollow(FOLLOW_2);
             rule__TriggeredTransition__Group__13();
 
             state._fsp--;
@@ -15717,20 +15717,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__12__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5567:1: rule__TriggeredTransition__Group__12__Impl : ( '}' ) ;
+    // InternalFSM.g:5570:1: rule__TriggeredTransition__Group__12__Impl : ( '}' ) ;
     public final void rule__TriggeredTransition__Group__12__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5571:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5572:1: ( '}' )
+            // InternalFSM.g:5574:1: ( ( '}' ) )
+            // InternalFSM.g:5575:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5572:1: ( '}' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5573:1: '}'
+            // InternalFSM.g:5575:1: ( '}' )
+            // InternalFSM.g:5576:1: '}'
             {
              before(grammarAccess.getTriggeredTransitionAccess().getRightCurlyBracketKeyword_12()); 
-            match(input,29,FOLLOW_29_in_rule__TriggeredTransition__Group__12__Impl11418); 
+            match(input,29,FOLLOW_2); 
              after(grammarAccess.getTriggeredTransitionAccess().getRightCurlyBracketKeyword_12()); 
 
             }
@@ -15754,21 +15754,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__13"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5586:1: rule__TriggeredTransition__Group__13 : rule__TriggeredTransition__Group__13__Impl rule__TriggeredTransition__Group__14 ;
+    // InternalFSM.g:5589:1: rule__TriggeredTransition__Group__13 : rule__TriggeredTransition__Group__13__Impl rule__TriggeredTransition__Group__14 ;
     public final void rule__TriggeredTransition__Group__13() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5590:1: ( rule__TriggeredTransition__Group__13__Impl rule__TriggeredTransition__Group__14 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5591:2: rule__TriggeredTransition__Group__13__Impl rule__TriggeredTransition__Group__14
+            // InternalFSM.g:5593:1: ( rule__TriggeredTransition__Group__13__Impl rule__TriggeredTransition__Group__14 )
+            // InternalFSM.g:5594:2: rule__TriggeredTransition__Group__13__Impl rule__TriggeredTransition__Group__14
             {
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__13__Impl_in_rule__TriggeredTransition__Group__1311449);
+            pushFollow(FOLLOW_20);
             rule__TriggeredTransition__Group__13__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__14_in_rule__TriggeredTransition__Group__1311452);
+            pushFollow(FOLLOW_2);
             rule__TriggeredTransition__Group__14();
 
             state._fsp--;
@@ -15792,20 +15792,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__13__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5598:1: rule__TriggeredTransition__Group__13__Impl : ( ( rule__TriggeredTransition__Group_13__0 )? ) ;
+    // InternalFSM.g:5601:1: rule__TriggeredTransition__Group__13__Impl : ( ( rule__TriggeredTransition__Group_13__0 )? ) ;
     public final void rule__TriggeredTransition__Group__13__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5602:1: ( ( ( rule__TriggeredTransition__Group_13__0 )? ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5603:1: ( ( rule__TriggeredTransition__Group_13__0 )? )
+            // InternalFSM.g:5605:1: ( ( ( rule__TriggeredTransition__Group_13__0 )? ) )
+            // InternalFSM.g:5606:1: ( ( rule__TriggeredTransition__Group_13__0 )? )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5603:1: ( ( rule__TriggeredTransition__Group_13__0 )? )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5604:1: ( rule__TriggeredTransition__Group_13__0 )?
+            // InternalFSM.g:5606:1: ( ( rule__TriggeredTransition__Group_13__0 )? )
+            // InternalFSM.g:5607:1: ( rule__TriggeredTransition__Group_13__0 )?
             {
              before(grammarAccess.getTriggeredTransitionAccess().getGroup_13()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5605:1: ( rule__TriggeredTransition__Group_13__0 )?
+            // InternalFSM.g:5608:1: ( rule__TriggeredTransition__Group_13__0 )?
             int alt57=2;
             int LA57_0 = input.LA(1);
 
@@ -15814,9 +15814,9 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt57) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5605:2: rule__TriggeredTransition__Group_13__0
+                    // InternalFSM.g:5608:2: rule__TriggeredTransition__Group_13__0
                     {
-                    pushFollow(FOLLOW_rule__TriggeredTransition__Group_13__0_in_rule__TriggeredTransition__Group__13__Impl11479);
+                    pushFollow(FOLLOW_2);
                     rule__TriggeredTransition__Group_13__0();
 
                     state._fsp--;
@@ -15850,16 +15850,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__14"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5615:1: rule__TriggeredTransition__Group__14 : rule__TriggeredTransition__Group__14__Impl ;
+    // InternalFSM.g:5618:1: rule__TriggeredTransition__Group__14 : rule__TriggeredTransition__Group__14__Impl ;
     public final void rule__TriggeredTransition__Group__14() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5619:1: ( rule__TriggeredTransition__Group__14__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5620:2: rule__TriggeredTransition__Group__14__Impl
+            // InternalFSM.g:5622:1: ( rule__TriggeredTransition__Group__14__Impl )
+            // InternalFSM.g:5623:2: rule__TriggeredTransition__Group__14__Impl
             {
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__14__Impl_in_rule__TriggeredTransition__Group__1411510);
+            pushFollow(FOLLOW_2);
             rule__TriggeredTransition__Group__14__Impl();
 
             state._fsp--;
@@ -15883,20 +15883,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__14__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5626:1: rule__TriggeredTransition__Group__14__Impl : ( '}' ) ;
+    // InternalFSM.g:5629:1: rule__TriggeredTransition__Group__14__Impl : ( '}' ) ;
     public final void rule__TriggeredTransition__Group__14__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5630:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5631:1: ( '}' )
+            // InternalFSM.g:5633:1: ( ( '}' ) )
+            // InternalFSM.g:5634:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5631:1: ( '}' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5632:1: '}'
+            // InternalFSM.g:5634:1: ( '}' )
+            // InternalFSM.g:5635:1: '}'
             {
              before(grammarAccess.getTriggeredTransitionAccess().getRightCurlyBracketKeyword_14()); 
-            match(input,29,FOLLOW_29_in_rule__TriggeredTransition__Group__14__Impl11538); 
+            match(input,29,FOLLOW_2); 
              after(grammarAccess.getTriggeredTransitionAccess().getRightCurlyBracketKeyword_14()); 
 
             }
@@ -15920,21 +15920,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group_11__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5675:1: rule__TriggeredTransition__Group_11__0 : rule__TriggeredTransition__Group_11__0__Impl rule__TriggeredTransition__Group_11__1 ;
+    // InternalFSM.g:5678:1: rule__TriggeredTransition__Group_11__0 : rule__TriggeredTransition__Group_11__0__Impl rule__TriggeredTransition__Group_11__1 ;
     public final void rule__TriggeredTransition__Group_11__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5679:1: ( rule__TriggeredTransition__Group_11__0__Impl rule__TriggeredTransition__Group_11__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5680:2: rule__TriggeredTransition__Group_11__0__Impl rule__TriggeredTransition__Group_11__1
+            // InternalFSM.g:5682:1: ( rule__TriggeredTransition__Group_11__0__Impl rule__TriggeredTransition__Group_11__1 )
+            // InternalFSM.g:5683:2: rule__TriggeredTransition__Group_11__0__Impl rule__TriggeredTransition__Group_11__1
             {
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group_11__0__Impl_in_rule__TriggeredTransition__Group_11__011599);
+            pushFollow(FOLLOW_22);
             rule__TriggeredTransition__Group_11__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group_11__1_in_rule__TriggeredTransition__Group_11__011602);
+            pushFollow(FOLLOW_2);
             rule__TriggeredTransition__Group_11__1();
 
             state._fsp--;
@@ -15958,20 +15958,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group_11__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5687:1: rule__TriggeredTransition__Group_11__0__Impl : ( 'or' ) ;
+    // InternalFSM.g:5690:1: rule__TriggeredTransition__Group_11__0__Impl : ( 'or' ) ;
     public final void rule__TriggeredTransition__Group_11__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5691:1: ( ( 'or' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5692:1: ( 'or' )
+            // InternalFSM.g:5694:1: ( ( 'or' ) )
+            // InternalFSM.g:5695:1: ( 'or' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5692:1: ( 'or' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5693:1: 'or'
+            // InternalFSM.g:5695:1: ( 'or' )
+            // InternalFSM.g:5696:1: 'or'
             {
              before(grammarAccess.getTriggeredTransitionAccess().getOrKeyword_11_0()); 
-            match(input,47,FOLLOW_47_in_rule__TriggeredTransition__Group_11__0__Impl11630); 
+            match(input,47,FOLLOW_2); 
              after(grammarAccess.getTriggeredTransitionAccess().getOrKeyword_11_0()); 
 
             }
@@ -15995,16 +15995,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group_11__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5706:1: rule__TriggeredTransition__Group_11__1 : rule__TriggeredTransition__Group_11__1__Impl ;
+    // InternalFSM.g:5709:1: rule__TriggeredTransition__Group_11__1 : rule__TriggeredTransition__Group_11__1__Impl ;
     public final void rule__TriggeredTransition__Group_11__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5710:1: ( rule__TriggeredTransition__Group_11__1__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5711:2: rule__TriggeredTransition__Group_11__1__Impl
+            // InternalFSM.g:5713:1: ( rule__TriggeredTransition__Group_11__1__Impl )
+            // InternalFSM.g:5714:2: rule__TriggeredTransition__Group_11__1__Impl
             {
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group_11__1__Impl_in_rule__TriggeredTransition__Group_11__111661);
+            pushFollow(FOLLOW_2);
             rule__TriggeredTransition__Group_11__1__Impl();
 
             state._fsp--;
@@ -16028,23 +16028,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group_11__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5717:1: rule__TriggeredTransition__Group_11__1__Impl : ( ( rule__TriggeredTransition__TriggersAssignment_11_1 ) ) ;
+    // InternalFSM.g:5720:1: rule__TriggeredTransition__Group_11__1__Impl : ( ( rule__TriggeredTransition__TriggersAssignment_11_1 ) ) ;
     public final void rule__TriggeredTransition__Group_11__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5721:1: ( ( ( rule__TriggeredTransition__TriggersAssignment_11_1 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5722:1: ( ( rule__TriggeredTransition__TriggersAssignment_11_1 ) )
+            // InternalFSM.g:5724:1: ( ( ( rule__TriggeredTransition__TriggersAssignment_11_1 ) ) )
+            // InternalFSM.g:5725:1: ( ( rule__TriggeredTransition__TriggersAssignment_11_1 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5722:1: ( ( rule__TriggeredTransition__TriggersAssignment_11_1 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5723:1: ( rule__TriggeredTransition__TriggersAssignment_11_1 )
+            // InternalFSM.g:5725:1: ( ( rule__TriggeredTransition__TriggersAssignment_11_1 ) )
+            // InternalFSM.g:5726:1: ( rule__TriggeredTransition__TriggersAssignment_11_1 )
             {
              before(grammarAccess.getTriggeredTransitionAccess().getTriggersAssignment_11_1()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5724:1: ( rule__TriggeredTransition__TriggersAssignment_11_1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5724:2: rule__TriggeredTransition__TriggersAssignment_11_1
+            // InternalFSM.g:5727:1: ( rule__TriggeredTransition__TriggersAssignment_11_1 )
+            // InternalFSM.g:5727:2: rule__TriggeredTransition__TriggersAssignment_11_1
             {
-            pushFollow(FOLLOW_rule__TriggeredTransition__TriggersAssignment_11_1_in_rule__TriggeredTransition__Group_11__1__Impl11688);
+            pushFollow(FOLLOW_2);
             rule__TriggeredTransition__TriggersAssignment_11_1();
 
             state._fsp--;
@@ -16075,21 +16075,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group_13__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5738:1: rule__TriggeredTransition__Group_13__0 : rule__TriggeredTransition__Group_13__0__Impl rule__TriggeredTransition__Group_13__1 ;
+    // InternalFSM.g:5741:1: rule__TriggeredTransition__Group_13__0 : rule__TriggeredTransition__Group_13__0__Impl rule__TriggeredTransition__Group_13__1 ;
     public final void rule__TriggeredTransition__Group_13__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5742:1: ( rule__TriggeredTransition__Group_13__0__Impl rule__TriggeredTransition__Group_13__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5743:2: rule__TriggeredTransition__Group_13__0__Impl rule__TriggeredTransition__Group_13__1
+            // InternalFSM.g:5745:1: ( rule__TriggeredTransition__Group_13__0__Impl rule__TriggeredTransition__Group_13__1 )
+            // InternalFSM.g:5746:2: rule__TriggeredTransition__Group_13__0__Impl rule__TriggeredTransition__Group_13__1
             {
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group_13__0__Impl_in_rule__TriggeredTransition__Group_13__011722);
+            pushFollow(FOLLOW_7);
             rule__TriggeredTransition__Group_13__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group_13__1_in_rule__TriggeredTransition__Group_13__011725);
+            pushFollow(FOLLOW_2);
             rule__TriggeredTransition__Group_13__1();
 
             state._fsp--;
@@ -16113,20 +16113,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group_13__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5750:1: rule__TriggeredTransition__Group_13__0__Impl : ( 'action' ) ;
+    // InternalFSM.g:5753:1: rule__TriggeredTransition__Group_13__0__Impl : ( 'action' ) ;
     public final void rule__TriggeredTransition__Group_13__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5754:1: ( ( 'action' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5755:1: ( 'action' )
+            // InternalFSM.g:5757:1: ( ( 'action' ) )
+            // InternalFSM.g:5758:1: ( 'action' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5755:1: ( 'action' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5756:1: 'action'
+            // InternalFSM.g:5758:1: ( 'action' )
+            // InternalFSM.g:5759:1: 'action'
             {
              before(grammarAccess.getTriggeredTransitionAccess().getActionKeyword_13_0()); 
-            match(input,45,FOLLOW_45_in_rule__TriggeredTransition__Group_13__0__Impl11753); 
+            match(input,45,FOLLOW_2); 
              after(grammarAccess.getTriggeredTransitionAccess().getActionKeyword_13_0()); 
 
             }
@@ -16150,16 +16150,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group_13__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5769:1: rule__TriggeredTransition__Group_13__1 : rule__TriggeredTransition__Group_13__1__Impl ;
+    // InternalFSM.g:5772:1: rule__TriggeredTransition__Group_13__1 : rule__TriggeredTransition__Group_13__1__Impl ;
     public final void rule__TriggeredTransition__Group_13__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5773:1: ( rule__TriggeredTransition__Group_13__1__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5774:2: rule__TriggeredTransition__Group_13__1__Impl
+            // InternalFSM.g:5776:1: ( rule__TriggeredTransition__Group_13__1__Impl )
+            // InternalFSM.g:5777:2: rule__TriggeredTransition__Group_13__1__Impl
             {
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group_13__1__Impl_in_rule__TriggeredTransition__Group_13__111784);
+            pushFollow(FOLLOW_2);
             rule__TriggeredTransition__Group_13__1__Impl();
 
             state._fsp--;
@@ -16183,23 +16183,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group_13__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5780:1: rule__TriggeredTransition__Group_13__1__Impl : ( ( rule__TriggeredTransition__ActionAssignment_13_1 ) ) ;
+    // InternalFSM.g:5783:1: rule__TriggeredTransition__Group_13__1__Impl : ( ( rule__TriggeredTransition__ActionAssignment_13_1 ) ) ;
     public final void rule__TriggeredTransition__Group_13__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5784:1: ( ( ( rule__TriggeredTransition__ActionAssignment_13_1 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5785:1: ( ( rule__TriggeredTransition__ActionAssignment_13_1 ) )
+            // InternalFSM.g:5787:1: ( ( ( rule__TriggeredTransition__ActionAssignment_13_1 ) ) )
+            // InternalFSM.g:5788:1: ( ( rule__TriggeredTransition__ActionAssignment_13_1 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5785:1: ( ( rule__TriggeredTransition__ActionAssignment_13_1 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5786:1: ( rule__TriggeredTransition__ActionAssignment_13_1 )
+            // InternalFSM.g:5788:1: ( ( rule__TriggeredTransition__ActionAssignment_13_1 ) )
+            // InternalFSM.g:5789:1: ( rule__TriggeredTransition__ActionAssignment_13_1 )
             {
              before(grammarAccess.getTriggeredTransitionAccess().getActionAssignment_13_1()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5787:1: ( rule__TriggeredTransition__ActionAssignment_13_1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5787:2: rule__TriggeredTransition__ActionAssignment_13_1
+            // InternalFSM.g:5790:1: ( rule__TriggeredTransition__ActionAssignment_13_1 )
+            // InternalFSM.g:5790:2: rule__TriggeredTransition__ActionAssignment_13_1
             {
-            pushFollow(FOLLOW_rule__TriggeredTransition__ActionAssignment_13_1_in_rule__TriggeredTransition__Group_13__1__Impl11811);
+            pushFollow(FOLLOW_2);
             rule__TriggeredTransition__ActionAssignment_13_1();
 
             state._fsp--;
@@ -16230,21 +16230,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5801:1: rule__GuardedTransition__Group__0 : rule__GuardedTransition__Group__0__Impl rule__GuardedTransition__Group__1 ;
+    // InternalFSM.g:5804:1: rule__GuardedTransition__Group__0 : rule__GuardedTransition__Group__0__Impl rule__GuardedTransition__Group__1 ;
     public final void rule__GuardedTransition__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5805:1: ( rule__GuardedTransition__Group__0__Impl rule__GuardedTransition__Group__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5806:2: rule__GuardedTransition__Group__0__Impl rule__GuardedTransition__Group__1
+            // InternalFSM.g:5808:1: ( rule__GuardedTransition__Group__0__Impl rule__GuardedTransition__Group__1 )
+            // InternalFSM.g:5809:2: rule__GuardedTransition__Group__0__Impl rule__GuardedTransition__Group__1
             {
-            pushFollow(FOLLOW_rule__GuardedTransition__Group__0__Impl_in_rule__GuardedTransition__Group__011845);
+            pushFollow(FOLLOW_16);
             rule__GuardedTransition__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__GuardedTransition__Group__1_in_rule__GuardedTransition__Group__011848);
+            pushFollow(FOLLOW_2);
             rule__GuardedTransition__Group__1();
 
             state._fsp--;
@@ -16268,20 +16268,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5813:1: rule__GuardedTransition__Group__0__Impl : ( 'Transition' ) ;
+    // InternalFSM.g:5816:1: rule__GuardedTransition__Group__0__Impl : ( 'Transition' ) ;
     public final void rule__GuardedTransition__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5817:1: ( ( 'Transition' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5818:1: ( 'Transition' )
+            // InternalFSM.g:5820:1: ( ( 'Transition' ) )
+            // InternalFSM.g:5821:1: ( 'Transition' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5818:1: ( 'Transition' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5819:1: 'Transition'
+            // InternalFSM.g:5821:1: ( 'Transition' )
+            // InternalFSM.g:5822:1: 'Transition'
             {
              before(grammarAccess.getGuardedTransitionAccess().getTransitionKeyword_0()); 
-            match(input,41,FOLLOW_41_in_rule__GuardedTransition__Group__0__Impl11876); 
+            match(input,41,FOLLOW_2); 
              after(grammarAccess.getGuardedTransitionAccess().getTransitionKeyword_0()); 
 
             }
@@ -16305,21 +16305,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5832:1: rule__GuardedTransition__Group__1 : rule__GuardedTransition__Group__1__Impl rule__GuardedTransition__Group__2 ;
+    // InternalFSM.g:5835:1: rule__GuardedTransition__Group__1 : rule__GuardedTransition__Group__1__Impl rule__GuardedTransition__Group__2 ;
     public final void rule__GuardedTransition__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5836:1: ( rule__GuardedTransition__Group__1__Impl rule__GuardedTransition__Group__2 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5837:2: rule__GuardedTransition__Group__1__Impl rule__GuardedTransition__Group__2
+            // InternalFSM.g:5839:1: ( rule__GuardedTransition__Group__1__Impl rule__GuardedTransition__Group__2 )
+            // InternalFSM.g:5840:2: rule__GuardedTransition__Group__1__Impl rule__GuardedTransition__Group__2
             {
-            pushFollow(FOLLOW_rule__GuardedTransition__Group__1__Impl_in_rule__GuardedTransition__Group__111907);
+            pushFollow(FOLLOW_16);
             rule__GuardedTransition__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__GuardedTransition__Group__2_in_rule__GuardedTransition__Group__111910);
+            pushFollow(FOLLOW_2);
             rule__GuardedTransition__Group__2();
 
             state._fsp--;
@@ -16343,20 +16343,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5844:1: rule__GuardedTransition__Group__1__Impl : ( ( rule__GuardedTransition__NameAssignment_1 )? ) ;
+    // InternalFSM.g:5847:1: rule__GuardedTransition__Group__1__Impl : ( ( rule__GuardedTransition__NameAssignment_1 )? ) ;
     public final void rule__GuardedTransition__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5848:1: ( ( ( rule__GuardedTransition__NameAssignment_1 )? ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5849:1: ( ( rule__GuardedTransition__NameAssignment_1 )? )
+            // InternalFSM.g:5851:1: ( ( ( rule__GuardedTransition__NameAssignment_1 )? ) )
+            // InternalFSM.g:5852:1: ( ( rule__GuardedTransition__NameAssignment_1 )? )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5849:1: ( ( rule__GuardedTransition__NameAssignment_1 )? )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5850:1: ( rule__GuardedTransition__NameAssignment_1 )?
+            // InternalFSM.g:5852:1: ( ( rule__GuardedTransition__NameAssignment_1 )? )
+            // InternalFSM.g:5853:1: ( rule__GuardedTransition__NameAssignment_1 )?
             {
              before(grammarAccess.getGuardedTransitionAccess().getNameAssignment_1()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5851:1: ( rule__GuardedTransition__NameAssignment_1 )?
+            // InternalFSM.g:5854:1: ( rule__GuardedTransition__NameAssignment_1 )?
             int alt58=2;
             int LA58_0 = input.LA(1);
 
@@ -16365,9 +16365,9 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt58) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5851:2: rule__GuardedTransition__NameAssignment_1
+                    // InternalFSM.g:5854:2: rule__GuardedTransition__NameAssignment_1
                     {
-                    pushFollow(FOLLOW_rule__GuardedTransition__NameAssignment_1_in_rule__GuardedTransition__Group__1__Impl11937);
+                    pushFollow(FOLLOW_2);
                     rule__GuardedTransition__NameAssignment_1();
 
                     state._fsp--;
@@ -16401,21 +16401,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group__2"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5861:1: rule__GuardedTransition__Group__2 : rule__GuardedTransition__Group__2__Impl rule__GuardedTransition__Group__3 ;
+    // InternalFSM.g:5864:1: rule__GuardedTransition__Group__2 : rule__GuardedTransition__Group__2__Impl rule__GuardedTransition__Group__3 ;
     public final void rule__GuardedTransition__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5865:1: ( rule__GuardedTransition__Group__2__Impl rule__GuardedTransition__Group__3 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5866:2: rule__GuardedTransition__Group__2__Impl rule__GuardedTransition__Group__3
+            // InternalFSM.g:5868:1: ( rule__GuardedTransition__Group__2__Impl rule__GuardedTransition__Group__3 )
+            // InternalFSM.g:5869:2: rule__GuardedTransition__Group__2__Impl rule__GuardedTransition__Group__3
             {
-            pushFollow(FOLLOW_rule__GuardedTransition__Group__2__Impl_in_rule__GuardedTransition__Group__211968);
+            pushFollow(FOLLOW_19);
             rule__GuardedTransition__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__GuardedTransition__Group__3_in_rule__GuardedTransition__Group__211971);
+            pushFollow(FOLLOW_2);
             rule__GuardedTransition__Group__3();
 
             state._fsp--;
@@ -16439,20 +16439,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group__2__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5873:1: rule__GuardedTransition__Group__2__Impl : ( ':' ) ;
+    // InternalFSM.g:5876:1: rule__GuardedTransition__Group__2__Impl : ( ':' ) ;
     public final void rule__GuardedTransition__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5877:1: ( ( ':' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5878:1: ( ':' )
+            // InternalFSM.g:5880:1: ( ( ':' ) )
+            // InternalFSM.g:5881:1: ( ':' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5878:1: ( ':' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5879:1: ':'
+            // InternalFSM.g:5881:1: ( ':' )
+            // InternalFSM.g:5882:1: ':'
             {
              before(grammarAccess.getGuardedTransitionAccess().getColonKeyword_2()); 
-            match(input,42,FOLLOW_42_in_rule__GuardedTransition__Group__2__Impl11999); 
+            match(input,42,FOLLOW_2); 
              after(grammarAccess.getGuardedTransitionAccess().getColonKeyword_2()); 
 
             }
@@ -16476,21 +16476,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group__3"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5892:1: rule__GuardedTransition__Group__3 : rule__GuardedTransition__Group__3__Impl rule__GuardedTransition__Group__4 ;
+    // InternalFSM.g:5895:1: rule__GuardedTransition__Group__3 : rule__GuardedTransition__Group__3__Impl rule__GuardedTransition__Group__4 ;
     public final void rule__GuardedTransition__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5896:1: ( rule__GuardedTransition__Group__3__Impl rule__GuardedTransition__Group__4 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5897:2: rule__GuardedTransition__Group__3__Impl rule__GuardedTransition__Group__4
+            // InternalFSM.g:5899:1: ( rule__GuardedTransition__Group__3__Impl rule__GuardedTransition__Group__4 )
+            // InternalFSM.g:5900:2: rule__GuardedTransition__Group__3__Impl rule__GuardedTransition__Group__4
             {
-            pushFollow(FOLLOW_rule__GuardedTransition__Group__3__Impl_in_rule__GuardedTransition__Group__312030);
+            pushFollow(FOLLOW_18);
             rule__GuardedTransition__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__GuardedTransition__Group__4_in_rule__GuardedTransition__Group__312033);
+            pushFollow(FOLLOW_2);
             rule__GuardedTransition__Group__4();
 
             state._fsp--;
@@ -16514,23 +16514,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group__3__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5904:1: rule__GuardedTransition__Group__3__Impl : ( ( rule__GuardedTransition__FromAssignment_3 ) ) ;
+    // InternalFSM.g:5907:1: rule__GuardedTransition__Group__3__Impl : ( ( rule__GuardedTransition__FromAssignment_3 ) ) ;
     public final void rule__GuardedTransition__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5908:1: ( ( ( rule__GuardedTransition__FromAssignment_3 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5909:1: ( ( rule__GuardedTransition__FromAssignment_3 ) )
+            // InternalFSM.g:5911:1: ( ( ( rule__GuardedTransition__FromAssignment_3 ) ) )
+            // InternalFSM.g:5912:1: ( ( rule__GuardedTransition__FromAssignment_3 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5909:1: ( ( rule__GuardedTransition__FromAssignment_3 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5910:1: ( rule__GuardedTransition__FromAssignment_3 )
+            // InternalFSM.g:5912:1: ( ( rule__GuardedTransition__FromAssignment_3 ) )
+            // InternalFSM.g:5913:1: ( rule__GuardedTransition__FromAssignment_3 )
             {
              before(grammarAccess.getGuardedTransitionAccess().getFromAssignment_3()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5911:1: ( rule__GuardedTransition__FromAssignment_3 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5911:2: rule__GuardedTransition__FromAssignment_3
+            // InternalFSM.g:5914:1: ( rule__GuardedTransition__FromAssignment_3 )
+            // InternalFSM.g:5914:2: rule__GuardedTransition__FromAssignment_3
             {
-            pushFollow(FOLLOW_rule__GuardedTransition__FromAssignment_3_in_rule__GuardedTransition__Group__3__Impl12060);
+            pushFollow(FOLLOW_2);
             rule__GuardedTransition__FromAssignment_3();
 
             state._fsp--;
@@ -16561,21 +16561,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group__4"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5921:1: rule__GuardedTransition__Group__4 : rule__GuardedTransition__Group__4__Impl rule__GuardedTransition__Group__5 ;
+    // InternalFSM.g:5924:1: rule__GuardedTransition__Group__4 : rule__GuardedTransition__Group__4__Impl rule__GuardedTransition__Group__5 ;
     public final void rule__GuardedTransition__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5925:1: ( rule__GuardedTransition__Group__4__Impl rule__GuardedTransition__Group__5 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5926:2: rule__GuardedTransition__Group__4__Impl rule__GuardedTransition__Group__5
+            // InternalFSM.g:5928:1: ( rule__GuardedTransition__Group__4__Impl rule__GuardedTransition__Group__5 )
+            // InternalFSM.g:5929:2: rule__GuardedTransition__Group__4__Impl rule__GuardedTransition__Group__5
             {
-            pushFollow(FOLLOW_rule__GuardedTransition__Group__4__Impl_in_rule__GuardedTransition__Group__412090);
+            pushFollow(FOLLOW_19);
             rule__GuardedTransition__Group__4__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__GuardedTransition__Group__5_in_rule__GuardedTransition__Group__412093);
+            pushFollow(FOLLOW_2);
             rule__GuardedTransition__Group__5();
 
             state._fsp--;
@@ -16599,20 +16599,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group__4__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5933:1: rule__GuardedTransition__Group__4__Impl : ( '->' ) ;
+    // InternalFSM.g:5936:1: rule__GuardedTransition__Group__4__Impl : ( '->' ) ;
     public final void rule__GuardedTransition__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5937:1: ( ( '->' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5938:1: ( '->' )
+            // InternalFSM.g:5940:1: ( ( '->' ) )
+            // InternalFSM.g:5941:1: ( '->' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5938:1: ( '->' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5939:1: '->'
+            // InternalFSM.g:5941:1: ( '->' )
+            // InternalFSM.g:5942:1: '->'
             {
              before(grammarAccess.getGuardedTransitionAccess().getHyphenMinusGreaterThanSignKeyword_4()); 
-            match(input,44,FOLLOW_44_in_rule__GuardedTransition__Group__4__Impl12121); 
+            match(input,44,FOLLOW_2); 
              after(grammarAccess.getGuardedTransitionAccess().getHyphenMinusGreaterThanSignKeyword_4()); 
 
             }
@@ -16636,21 +16636,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group__5"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5952:1: rule__GuardedTransition__Group__5 : rule__GuardedTransition__Group__5__Impl rule__GuardedTransition__Group__6 ;
+    // InternalFSM.g:5955:1: rule__GuardedTransition__Group__5 : rule__GuardedTransition__Group__5__Impl rule__GuardedTransition__Group__6 ;
     public final void rule__GuardedTransition__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5956:1: ( rule__GuardedTransition__Group__5__Impl rule__GuardedTransition__Group__6 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5957:2: rule__GuardedTransition__Group__5__Impl rule__GuardedTransition__Group__6
+            // InternalFSM.g:5959:1: ( rule__GuardedTransition__Group__5__Impl rule__GuardedTransition__Group__6 )
+            // InternalFSM.g:5960:2: rule__GuardedTransition__Group__5__Impl rule__GuardedTransition__Group__6
             {
-            pushFollow(FOLLOW_rule__GuardedTransition__Group__5__Impl_in_rule__GuardedTransition__Group__512152);
+            pushFollow(FOLLOW_10);
             rule__GuardedTransition__Group__5__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__GuardedTransition__Group__6_in_rule__GuardedTransition__Group__512155);
+            pushFollow(FOLLOW_2);
             rule__GuardedTransition__Group__6();
 
             state._fsp--;
@@ -16674,23 +16674,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group__5__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5964:1: rule__GuardedTransition__Group__5__Impl : ( ( rule__GuardedTransition__ToAssignment_5 ) ) ;
+    // InternalFSM.g:5967:1: rule__GuardedTransition__Group__5__Impl : ( ( rule__GuardedTransition__ToAssignment_5 ) ) ;
     public final void rule__GuardedTransition__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5968:1: ( ( ( rule__GuardedTransition__ToAssignment_5 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5969:1: ( ( rule__GuardedTransition__ToAssignment_5 ) )
+            // InternalFSM.g:5971:1: ( ( ( rule__GuardedTransition__ToAssignment_5 ) ) )
+            // InternalFSM.g:5972:1: ( ( rule__GuardedTransition__ToAssignment_5 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5969:1: ( ( rule__GuardedTransition__ToAssignment_5 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5970:1: ( rule__GuardedTransition__ToAssignment_5 )
+            // InternalFSM.g:5972:1: ( ( rule__GuardedTransition__ToAssignment_5 ) )
+            // InternalFSM.g:5973:1: ( rule__GuardedTransition__ToAssignment_5 )
             {
              before(grammarAccess.getGuardedTransitionAccess().getToAssignment_5()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5971:1: ( rule__GuardedTransition__ToAssignment_5 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5971:2: rule__GuardedTransition__ToAssignment_5
+            // InternalFSM.g:5974:1: ( rule__GuardedTransition__ToAssignment_5 )
+            // InternalFSM.g:5974:2: rule__GuardedTransition__ToAssignment_5
             {
-            pushFollow(FOLLOW_rule__GuardedTransition__ToAssignment_5_in_rule__GuardedTransition__Group__5__Impl12182);
+            pushFollow(FOLLOW_2);
             rule__GuardedTransition__ToAssignment_5();
 
             state._fsp--;
@@ -16721,21 +16721,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group__6"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5981:1: rule__GuardedTransition__Group__6 : rule__GuardedTransition__Group__6__Impl rule__GuardedTransition__Group__7 ;
+    // InternalFSM.g:5984:1: rule__GuardedTransition__Group__6 : rule__GuardedTransition__Group__6__Impl rule__GuardedTransition__Group__7 ;
     public final void rule__GuardedTransition__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5985:1: ( rule__GuardedTransition__Group__6__Impl rule__GuardedTransition__Group__7 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5986:2: rule__GuardedTransition__Group__6__Impl rule__GuardedTransition__Group__7
+            // InternalFSM.g:5988:1: ( rule__GuardedTransition__Group__6__Impl rule__GuardedTransition__Group__7 )
+            // InternalFSM.g:5989:2: rule__GuardedTransition__Group__6__Impl rule__GuardedTransition__Group__7
             {
-            pushFollow(FOLLOW_rule__GuardedTransition__Group__6__Impl_in_rule__GuardedTransition__Group__612212);
+            pushFollow(FOLLOW_10);
             rule__GuardedTransition__Group__6__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__GuardedTransition__Group__7_in_rule__GuardedTransition__Group__612215);
+            pushFollow(FOLLOW_2);
             rule__GuardedTransition__Group__7();
 
             state._fsp--;
@@ -16759,20 +16759,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group__6__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5993:1: rule__GuardedTransition__Group__6__Impl : ( ( rule__GuardedTransition__DocuAssignment_6 )? ) ;
+    // InternalFSM.g:5996:1: rule__GuardedTransition__Group__6__Impl : ( ( rule__GuardedTransition__DocuAssignment_6 )? ) ;
     public final void rule__GuardedTransition__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5997:1: ( ( ( rule__GuardedTransition__DocuAssignment_6 )? ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5998:1: ( ( rule__GuardedTransition__DocuAssignment_6 )? )
+            // InternalFSM.g:6000:1: ( ( ( rule__GuardedTransition__DocuAssignment_6 )? ) )
+            // InternalFSM.g:6001:1: ( ( rule__GuardedTransition__DocuAssignment_6 )? )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5998:1: ( ( rule__GuardedTransition__DocuAssignment_6 )? )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:5999:1: ( rule__GuardedTransition__DocuAssignment_6 )?
+            // InternalFSM.g:6001:1: ( ( rule__GuardedTransition__DocuAssignment_6 )? )
+            // InternalFSM.g:6002:1: ( rule__GuardedTransition__DocuAssignment_6 )?
             {
              before(grammarAccess.getGuardedTransitionAccess().getDocuAssignment_6()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6000:1: ( rule__GuardedTransition__DocuAssignment_6 )?
+            // InternalFSM.g:6003:1: ( rule__GuardedTransition__DocuAssignment_6 )?
             int alt59=2;
             int LA59_0 = input.LA(1);
 
@@ -16781,9 +16781,9 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt59) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6000:2: rule__GuardedTransition__DocuAssignment_6
+                    // InternalFSM.g:6003:2: rule__GuardedTransition__DocuAssignment_6
                     {
-                    pushFollow(FOLLOW_rule__GuardedTransition__DocuAssignment_6_in_rule__GuardedTransition__Group__6__Impl12242);
+                    pushFollow(FOLLOW_2);
                     rule__GuardedTransition__DocuAssignment_6();
 
                     state._fsp--;
@@ -16817,21 +16817,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group__7"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6010:1: rule__GuardedTransition__Group__7 : rule__GuardedTransition__Group__7__Impl rule__GuardedTransition__Group__8 ;
+    // InternalFSM.g:6013:1: rule__GuardedTransition__Group__7 : rule__GuardedTransition__Group__7__Impl rule__GuardedTransition__Group__8 ;
     public final void rule__GuardedTransition__Group__7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6014:1: ( rule__GuardedTransition__Group__7__Impl rule__GuardedTransition__Group__8 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6015:2: rule__GuardedTransition__Group__7__Impl rule__GuardedTransition__Group__8
+            // InternalFSM.g:6017:1: ( rule__GuardedTransition__Group__7__Impl rule__GuardedTransition__Group__8 )
+            // InternalFSM.g:6018:2: rule__GuardedTransition__Group__7__Impl rule__GuardedTransition__Group__8
             {
-            pushFollow(FOLLOW_rule__GuardedTransition__Group__7__Impl_in_rule__GuardedTransition__Group__712273);
+            pushFollow(FOLLOW_25);
             rule__GuardedTransition__Group__7__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__GuardedTransition__Group__8_in_rule__GuardedTransition__Group__712276);
+            pushFollow(FOLLOW_2);
             rule__GuardedTransition__Group__8();
 
             state._fsp--;
@@ -16855,20 +16855,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group__7__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6022:1: rule__GuardedTransition__Group__7__Impl : ( '{' ) ;
+    // InternalFSM.g:6025:1: rule__GuardedTransition__Group__7__Impl : ( '{' ) ;
     public final void rule__GuardedTransition__Group__7__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6026:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6027:1: ( '{' )
+            // InternalFSM.g:6029:1: ( ( '{' ) )
+            // InternalFSM.g:6030:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6027:1: ( '{' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6028:1: '{'
+            // InternalFSM.g:6030:1: ( '{' )
+            // InternalFSM.g:6031:1: '{'
             {
              before(grammarAccess.getGuardedTransitionAccess().getLeftCurlyBracketKeyword_7()); 
-            match(input,28,FOLLOW_28_in_rule__GuardedTransition__Group__7__Impl12304); 
+            match(input,28,FOLLOW_2); 
              after(grammarAccess.getGuardedTransitionAccess().getLeftCurlyBracketKeyword_7()); 
 
             }
@@ -16892,21 +16892,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group__8"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6041:1: rule__GuardedTransition__Group__8 : rule__GuardedTransition__Group__8__Impl rule__GuardedTransition__Group__9 ;
+    // InternalFSM.g:6044:1: rule__GuardedTransition__Group__8 : rule__GuardedTransition__Group__8__Impl rule__GuardedTransition__Group__9 ;
     public final void rule__GuardedTransition__Group__8() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6045:1: ( rule__GuardedTransition__Group__8__Impl rule__GuardedTransition__Group__9 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6046:2: rule__GuardedTransition__Group__8__Impl rule__GuardedTransition__Group__9
+            // InternalFSM.g:6048:1: ( rule__GuardedTransition__Group__8__Impl rule__GuardedTransition__Group__9 )
+            // InternalFSM.g:6049:2: rule__GuardedTransition__Group__8__Impl rule__GuardedTransition__Group__9
             {
-            pushFollow(FOLLOW_rule__GuardedTransition__Group__8__Impl_in_rule__GuardedTransition__Group__812335);
+            pushFollow(FOLLOW_7);
             rule__GuardedTransition__Group__8__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__GuardedTransition__Group__9_in_rule__GuardedTransition__Group__812338);
+            pushFollow(FOLLOW_2);
             rule__GuardedTransition__Group__9();
 
             state._fsp--;
@@ -16930,20 +16930,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group__8__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6053:1: rule__GuardedTransition__Group__8__Impl : ( 'guard' ) ;
+    // InternalFSM.g:6056:1: rule__GuardedTransition__Group__8__Impl : ( 'guard' ) ;
     public final void rule__GuardedTransition__Group__8__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6057:1: ( ( 'guard' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6058:1: ( 'guard' )
+            // InternalFSM.g:6060:1: ( ( 'guard' ) )
+            // InternalFSM.g:6061:1: ( 'guard' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6058:1: ( 'guard' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6059:1: 'guard'
+            // InternalFSM.g:6061:1: ( 'guard' )
+            // InternalFSM.g:6062:1: 'guard'
             {
              before(grammarAccess.getGuardedTransitionAccess().getGuardKeyword_8()); 
-            match(input,48,FOLLOW_48_in_rule__GuardedTransition__Group__8__Impl12366); 
+            match(input,48,FOLLOW_2); 
              after(grammarAccess.getGuardedTransitionAccess().getGuardKeyword_8()); 
 
             }
@@ -16967,21 +16967,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group__9"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6072:1: rule__GuardedTransition__Group__9 : rule__GuardedTransition__Group__9__Impl rule__GuardedTransition__Group__10 ;
+    // InternalFSM.g:6075:1: rule__GuardedTransition__Group__9 : rule__GuardedTransition__Group__9__Impl rule__GuardedTransition__Group__10 ;
     public final void rule__GuardedTransition__Group__9() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6076:1: ( rule__GuardedTransition__Group__9__Impl rule__GuardedTransition__Group__10 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6077:2: rule__GuardedTransition__Group__9__Impl rule__GuardedTransition__Group__10
+            // InternalFSM.g:6079:1: ( rule__GuardedTransition__Group__9__Impl rule__GuardedTransition__Group__10 )
+            // InternalFSM.g:6080:2: rule__GuardedTransition__Group__9__Impl rule__GuardedTransition__Group__10
             {
-            pushFollow(FOLLOW_rule__GuardedTransition__Group__9__Impl_in_rule__GuardedTransition__Group__912397);
+            pushFollow(FOLLOW_20);
             rule__GuardedTransition__Group__9__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__GuardedTransition__Group__10_in_rule__GuardedTransition__Group__912400);
+            pushFollow(FOLLOW_2);
             rule__GuardedTransition__Group__10();
 
             state._fsp--;
@@ -17005,23 +17005,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group__9__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6084:1: rule__GuardedTransition__Group__9__Impl : ( ( rule__GuardedTransition__GuardAssignment_9 ) ) ;
+    // InternalFSM.g:6087:1: rule__GuardedTransition__Group__9__Impl : ( ( rule__GuardedTransition__GuardAssignment_9 ) ) ;
     public final void rule__GuardedTransition__Group__9__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6088:1: ( ( ( rule__GuardedTransition__GuardAssignment_9 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6089:1: ( ( rule__GuardedTransition__GuardAssignment_9 ) )
+            // InternalFSM.g:6091:1: ( ( ( rule__GuardedTransition__GuardAssignment_9 ) ) )
+            // InternalFSM.g:6092:1: ( ( rule__GuardedTransition__GuardAssignment_9 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6089:1: ( ( rule__GuardedTransition__GuardAssignment_9 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6090:1: ( rule__GuardedTransition__GuardAssignment_9 )
+            // InternalFSM.g:6092:1: ( ( rule__GuardedTransition__GuardAssignment_9 ) )
+            // InternalFSM.g:6093:1: ( rule__GuardedTransition__GuardAssignment_9 )
             {
              before(grammarAccess.getGuardedTransitionAccess().getGuardAssignment_9()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6091:1: ( rule__GuardedTransition__GuardAssignment_9 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6091:2: rule__GuardedTransition__GuardAssignment_9
+            // InternalFSM.g:6094:1: ( rule__GuardedTransition__GuardAssignment_9 )
+            // InternalFSM.g:6094:2: rule__GuardedTransition__GuardAssignment_9
             {
-            pushFollow(FOLLOW_rule__GuardedTransition__GuardAssignment_9_in_rule__GuardedTransition__Group__9__Impl12427);
+            pushFollow(FOLLOW_2);
             rule__GuardedTransition__GuardAssignment_9();
 
             state._fsp--;
@@ -17052,21 +17052,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group__10"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6101:1: rule__GuardedTransition__Group__10 : rule__GuardedTransition__Group__10__Impl rule__GuardedTransition__Group__11 ;
+    // InternalFSM.g:6104:1: rule__GuardedTransition__Group__10 : rule__GuardedTransition__Group__10__Impl rule__GuardedTransition__Group__11 ;
     public final void rule__GuardedTransition__Group__10() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6105:1: ( rule__GuardedTransition__Group__10__Impl rule__GuardedTransition__Group__11 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6106:2: rule__GuardedTransition__Group__10__Impl rule__GuardedTransition__Group__11
+            // InternalFSM.g:6108:1: ( rule__GuardedTransition__Group__10__Impl rule__GuardedTransition__Group__11 )
+            // InternalFSM.g:6109:2: rule__GuardedTransition__Group__10__Impl rule__GuardedTransition__Group__11
             {
-            pushFollow(FOLLOW_rule__GuardedTransition__Group__10__Impl_in_rule__GuardedTransition__Group__1012457);
+            pushFollow(FOLLOW_20);
             rule__GuardedTransition__Group__10__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__GuardedTransition__Group__11_in_rule__GuardedTransition__Group__1012460);
+            pushFollow(FOLLOW_2);
             rule__GuardedTransition__Group__11();
 
             state._fsp--;
@@ -17090,20 +17090,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group__10__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6113:1: rule__GuardedTransition__Group__10__Impl : ( ( rule__GuardedTransition__Group_10__0 )? ) ;
+    // InternalFSM.g:6116:1: rule__GuardedTransition__Group__10__Impl : ( ( rule__GuardedTransition__Group_10__0 )? ) ;
     public final void rule__GuardedTransition__Group__10__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6117:1: ( ( ( rule__GuardedTransition__Group_10__0 )? ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6118:1: ( ( rule__GuardedTransition__Group_10__0 )? )
+            // InternalFSM.g:6120:1: ( ( ( rule__GuardedTransition__Group_10__0 )? ) )
+            // InternalFSM.g:6121:1: ( ( rule__GuardedTransition__Group_10__0 )? )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6118:1: ( ( rule__GuardedTransition__Group_10__0 )? )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6119:1: ( rule__GuardedTransition__Group_10__0 )?
+            // InternalFSM.g:6121:1: ( ( rule__GuardedTransition__Group_10__0 )? )
+            // InternalFSM.g:6122:1: ( rule__GuardedTransition__Group_10__0 )?
             {
              before(grammarAccess.getGuardedTransitionAccess().getGroup_10()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6120:1: ( rule__GuardedTransition__Group_10__0 )?
+            // InternalFSM.g:6123:1: ( rule__GuardedTransition__Group_10__0 )?
             int alt60=2;
             int LA60_0 = input.LA(1);
 
@@ -17112,9 +17112,9 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt60) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6120:2: rule__GuardedTransition__Group_10__0
+                    // InternalFSM.g:6123:2: rule__GuardedTransition__Group_10__0
                     {
-                    pushFollow(FOLLOW_rule__GuardedTransition__Group_10__0_in_rule__GuardedTransition__Group__10__Impl12487);
+                    pushFollow(FOLLOW_2);
                     rule__GuardedTransition__Group_10__0();
 
                     state._fsp--;
@@ -17148,16 +17148,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group__11"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6130:1: rule__GuardedTransition__Group__11 : rule__GuardedTransition__Group__11__Impl ;
+    // InternalFSM.g:6133:1: rule__GuardedTransition__Group__11 : rule__GuardedTransition__Group__11__Impl ;
     public final void rule__GuardedTransition__Group__11() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6134:1: ( rule__GuardedTransition__Group__11__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6135:2: rule__GuardedTransition__Group__11__Impl
+            // InternalFSM.g:6137:1: ( rule__GuardedTransition__Group__11__Impl )
+            // InternalFSM.g:6138:2: rule__GuardedTransition__Group__11__Impl
             {
-            pushFollow(FOLLOW_rule__GuardedTransition__Group__11__Impl_in_rule__GuardedTransition__Group__1112518);
+            pushFollow(FOLLOW_2);
             rule__GuardedTransition__Group__11__Impl();
 
             state._fsp--;
@@ -17181,20 +17181,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group__11__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6141:1: rule__GuardedTransition__Group__11__Impl : ( '}' ) ;
+    // InternalFSM.g:6144:1: rule__GuardedTransition__Group__11__Impl : ( '}' ) ;
     public final void rule__GuardedTransition__Group__11__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6145:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6146:1: ( '}' )
+            // InternalFSM.g:6148:1: ( ( '}' ) )
+            // InternalFSM.g:6149:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6146:1: ( '}' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6147:1: '}'
+            // InternalFSM.g:6149:1: ( '}' )
+            // InternalFSM.g:6150:1: '}'
             {
              before(grammarAccess.getGuardedTransitionAccess().getRightCurlyBracketKeyword_11()); 
-            match(input,29,FOLLOW_29_in_rule__GuardedTransition__Group__11__Impl12546); 
+            match(input,29,FOLLOW_2); 
              after(grammarAccess.getGuardedTransitionAccess().getRightCurlyBracketKeyword_11()); 
 
             }
@@ -17218,21 +17218,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group_10__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6184:1: rule__GuardedTransition__Group_10__0 : rule__GuardedTransition__Group_10__0__Impl rule__GuardedTransition__Group_10__1 ;
+    // InternalFSM.g:6187:1: rule__GuardedTransition__Group_10__0 : rule__GuardedTransition__Group_10__0__Impl rule__GuardedTransition__Group_10__1 ;
     public final void rule__GuardedTransition__Group_10__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6188:1: ( rule__GuardedTransition__Group_10__0__Impl rule__GuardedTransition__Group_10__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6189:2: rule__GuardedTransition__Group_10__0__Impl rule__GuardedTransition__Group_10__1
+            // InternalFSM.g:6191:1: ( rule__GuardedTransition__Group_10__0__Impl rule__GuardedTransition__Group_10__1 )
+            // InternalFSM.g:6192:2: rule__GuardedTransition__Group_10__0__Impl rule__GuardedTransition__Group_10__1
             {
-            pushFollow(FOLLOW_rule__GuardedTransition__Group_10__0__Impl_in_rule__GuardedTransition__Group_10__012601);
+            pushFollow(FOLLOW_7);
             rule__GuardedTransition__Group_10__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__GuardedTransition__Group_10__1_in_rule__GuardedTransition__Group_10__012604);
+            pushFollow(FOLLOW_2);
             rule__GuardedTransition__Group_10__1();
 
             state._fsp--;
@@ -17256,20 +17256,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group_10__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6196:1: rule__GuardedTransition__Group_10__0__Impl : ( 'action' ) ;
+    // InternalFSM.g:6199:1: rule__GuardedTransition__Group_10__0__Impl : ( 'action' ) ;
     public final void rule__GuardedTransition__Group_10__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6200:1: ( ( 'action' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6201:1: ( 'action' )
+            // InternalFSM.g:6203:1: ( ( 'action' ) )
+            // InternalFSM.g:6204:1: ( 'action' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6201:1: ( 'action' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6202:1: 'action'
+            // InternalFSM.g:6204:1: ( 'action' )
+            // InternalFSM.g:6205:1: 'action'
             {
              before(grammarAccess.getGuardedTransitionAccess().getActionKeyword_10_0()); 
-            match(input,45,FOLLOW_45_in_rule__GuardedTransition__Group_10__0__Impl12632); 
+            match(input,45,FOLLOW_2); 
              after(grammarAccess.getGuardedTransitionAccess().getActionKeyword_10_0()); 
 
             }
@@ -17293,16 +17293,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group_10__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6215:1: rule__GuardedTransition__Group_10__1 : rule__GuardedTransition__Group_10__1__Impl ;
+    // InternalFSM.g:6218:1: rule__GuardedTransition__Group_10__1 : rule__GuardedTransition__Group_10__1__Impl ;
     public final void rule__GuardedTransition__Group_10__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6219:1: ( rule__GuardedTransition__Group_10__1__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6220:2: rule__GuardedTransition__Group_10__1__Impl
+            // InternalFSM.g:6222:1: ( rule__GuardedTransition__Group_10__1__Impl )
+            // InternalFSM.g:6223:2: rule__GuardedTransition__Group_10__1__Impl
             {
-            pushFollow(FOLLOW_rule__GuardedTransition__Group_10__1__Impl_in_rule__GuardedTransition__Group_10__112663);
+            pushFollow(FOLLOW_2);
             rule__GuardedTransition__Group_10__1__Impl();
 
             state._fsp--;
@@ -17326,23 +17326,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group_10__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6226:1: rule__GuardedTransition__Group_10__1__Impl : ( ( rule__GuardedTransition__ActionAssignment_10_1 ) ) ;
+    // InternalFSM.g:6229:1: rule__GuardedTransition__Group_10__1__Impl : ( ( rule__GuardedTransition__ActionAssignment_10_1 ) ) ;
     public final void rule__GuardedTransition__Group_10__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6230:1: ( ( ( rule__GuardedTransition__ActionAssignment_10_1 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6231:1: ( ( rule__GuardedTransition__ActionAssignment_10_1 ) )
+            // InternalFSM.g:6233:1: ( ( ( rule__GuardedTransition__ActionAssignment_10_1 ) ) )
+            // InternalFSM.g:6234:1: ( ( rule__GuardedTransition__ActionAssignment_10_1 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6231:1: ( ( rule__GuardedTransition__ActionAssignment_10_1 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6232:1: ( rule__GuardedTransition__ActionAssignment_10_1 )
+            // InternalFSM.g:6234:1: ( ( rule__GuardedTransition__ActionAssignment_10_1 ) )
+            // InternalFSM.g:6235:1: ( rule__GuardedTransition__ActionAssignment_10_1 )
             {
              before(grammarAccess.getGuardedTransitionAccess().getActionAssignment_10_1()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6233:1: ( rule__GuardedTransition__ActionAssignment_10_1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6233:2: rule__GuardedTransition__ActionAssignment_10_1
+            // InternalFSM.g:6236:1: ( rule__GuardedTransition__ActionAssignment_10_1 )
+            // InternalFSM.g:6236:2: rule__GuardedTransition__ActionAssignment_10_1
             {
-            pushFollow(FOLLOW_rule__GuardedTransition__ActionAssignment_10_1_in_rule__GuardedTransition__Group_10__1__Impl12690);
+            pushFollow(FOLLOW_2);
             rule__GuardedTransition__ActionAssignment_10_1();
 
             state._fsp--;
@@ -17373,21 +17373,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6247:1: rule__CPBranchTransition__Group__0 : rule__CPBranchTransition__Group__0__Impl rule__CPBranchTransition__Group__1 ;
+    // InternalFSM.g:6250:1: rule__CPBranchTransition__Group__0 : rule__CPBranchTransition__Group__0__Impl rule__CPBranchTransition__Group__1 ;
     public final void rule__CPBranchTransition__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6251:1: ( rule__CPBranchTransition__Group__0__Impl rule__CPBranchTransition__Group__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6252:2: rule__CPBranchTransition__Group__0__Impl rule__CPBranchTransition__Group__1
+            // InternalFSM.g:6254:1: ( rule__CPBranchTransition__Group__0__Impl rule__CPBranchTransition__Group__1 )
+            // InternalFSM.g:6255:2: rule__CPBranchTransition__Group__0__Impl rule__CPBranchTransition__Group__1
             {
-            pushFollow(FOLLOW_rule__CPBranchTransition__Group__0__Impl_in_rule__CPBranchTransition__Group__012724);
+            pushFollow(FOLLOW_16);
             rule__CPBranchTransition__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__CPBranchTransition__Group__1_in_rule__CPBranchTransition__Group__012727);
+            pushFollow(FOLLOW_2);
             rule__CPBranchTransition__Group__1();
 
             state._fsp--;
@@ -17411,20 +17411,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6259:1: rule__CPBranchTransition__Group__0__Impl : ( 'Transition' ) ;
+    // InternalFSM.g:6262:1: rule__CPBranchTransition__Group__0__Impl : ( 'Transition' ) ;
     public final void rule__CPBranchTransition__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6263:1: ( ( 'Transition' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6264:1: ( 'Transition' )
+            // InternalFSM.g:6266:1: ( ( 'Transition' ) )
+            // InternalFSM.g:6267:1: ( 'Transition' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6264:1: ( 'Transition' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6265:1: 'Transition'
+            // InternalFSM.g:6267:1: ( 'Transition' )
+            // InternalFSM.g:6268:1: 'Transition'
             {
              before(grammarAccess.getCPBranchTransitionAccess().getTransitionKeyword_0()); 
-            match(input,41,FOLLOW_41_in_rule__CPBranchTransition__Group__0__Impl12755); 
+            match(input,41,FOLLOW_2); 
              after(grammarAccess.getCPBranchTransitionAccess().getTransitionKeyword_0()); 
 
             }
@@ -17448,21 +17448,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6278:1: rule__CPBranchTransition__Group__1 : rule__CPBranchTransition__Group__1__Impl rule__CPBranchTransition__Group__2 ;
+    // InternalFSM.g:6281:1: rule__CPBranchTransition__Group__1 : rule__CPBranchTransition__Group__1__Impl rule__CPBranchTransition__Group__2 ;
     public final void rule__CPBranchTransition__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6282:1: ( rule__CPBranchTransition__Group__1__Impl rule__CPBranchTransition__Group__2 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6283:2: rule__CPBranchTransition__Group__1__Impl rule__CPBranchTransition__Group__2
+            // InternalFSM.g:6285:1: ( rule__CPBranchTransition__Group__1__Impl rule__CPBranchTransition__Group__2 )
+            // InternalFSM.g:6286:2: rule__CPBranchTransition__Group__1__Impl rule__CPBranchTransition__Group__2
             {
-            pushFollow(FOLLOW_rule__CPBranchTransition__Group__1__Impl_in_rule__CPBranchTransition__Group__112786);
+            pushFollow(FOLLOW_16);
             rule__CPBranchTransition__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__CPBranchTransition__Group__2_in_rule__CPBranchTransition__Group__112789);
+            pushFollow(FOLLOW_2);
             rule__CPBranchTransition__Group__2();
 
             state._fsp--;
@@ -17486,20 +17486,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6290:1: rule__CPBranchTransition__Group__1__Impl : ( ( rule__CPBranchTransition__NameAssignment_1 )? ) ;
+    // InternalFSM.g:6293:1: rule__CPBranchTransition__Group__1__Impl : ( ( rule__CPBranchTransition__NameAssignment_1 )? ) ;
     public final void rule__CPBranchTransition__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6294:1: ( ( ( rule__CPBranchTransition__NameAssignment_1 )? ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6295:1: ( ( rule__CPBranchTransition__NameAssignment_1 )? )
+            // InternalFSM.g:6297:1: ( ( ( rule__CPBranchTransition__NameAssignment_1 )? ) )
+            // InternalFSM.g:6298:1: ( ( rule__CPBranchTransition__NameAssignment_1 )? )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6295:1: ( ( rule__CPBranchTransition__NameAssignment_1 )? )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6296:1: ( rule__CPBranchTransition__NameAssignment_1 )?
+            // InternalFSM.g:6298:1: ( ( rule__CPBranchTransition__NameAssignment_1 )? )
+            // InternalFSM.g:6299:1: ( rule__CPBranchTransition__NameAssignment_1 )?
             {
              before(grammarAccess.getCPBranchTransitionAccess().getNameAssignment_1()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6297:1: ( rule__CPBranchTransition__NameAssignment_1 )?
+            // InternalFSM.g:6300:1: ( rule__CPBranchTransition__NameAssignment_1 )?
             int alt61=2;
             int LA61_0 = input.LA(1);
 
@@ -17508,9 +17508,9 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt61) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6297:2: rule__CPBranchTransition__NameAssignment_1
+                    // InternalFSM.g:6300:2: rule__CPBranchTransition__NameAssignment_1
                     {
-                    pushFollow(FOLLOW_rule__CPBranchTransition__NameAssignment_1_in_rule__CPBranchTransition__Group__1__Impl12816);
+                    pushFollow(FOLLOW_2);
                     rule__CPBranchTransition__NameAssignment_1();
 
                     state._fsp--;
@@ -17544,21 +17544,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group__2"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6307:1: rule__CPBranchTransition__Group__2 : rule__CPBranchTransition__Group__2__Impl rule__CPBranchTransition__Group__3 ;
+    // InternalFSM.g:6310:1: rule__CPBranchTransition__Group__2 : rule__CPBranchTransition__Group__2__Impl rule__CPBranchTransition__Group__3 ;
     public final void rule__CPBranchTransition__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6311:1: ( rule__CPBranchTransition__Group__2__Impl rule__CPBranchTransition__Group__3 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6312:2: rule__CPBranchTransition__Group__2__Impl rule__CPBranchTransition__Group__3
+            // InternalFSM.g:6314:1: ( rule__CPBranchTransition__Group__2__Impl rule__CPBranchTransition__Group__3 )
+            // InternalFSM.g:6315:2: rule__CPBranchTransition__Group__2__Impl rule__CPBranchTransition__Group__3
             {
-            pushFollow(FOLLOW_rule__CPBranchTransition__Group__2__Impl_in_rule__CPBranchTransition__Group__212847);
+            pushFollow(FOLLOW_19);
             rule__CPBranchTransition__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__CPBranchTransition__Group__3_in_rule__CPBranchTransition__Group__212850);
+            pushFollow(FOLLOW_2);
             rule__CPBranchTransition__Group__3();
 
             state._fsp--;
@@ -17582,20 +17582,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group__2__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6319:1: rule__CPBranchTransition__Group__2__Impl : ( ':' ) ;
+    // InternalFSM.g:6322:1: rule__CPBranchTransition__Group__2__Impl : ( ':' ) ;
     public final void rule__CPBranchTransition__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6323:1: ( ( ':' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6324:1: ( ':' )
+            // InternalFSM.g:6326:1: ( ( ':' ) )
+            // InternalFSM.g:6327:1: ( ':' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6324:1: ( ':' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6325:1: ':'
+            // InternalFSM.g:6327:1: ( ':' )
+            // InternalFSM.g:6328:1: ':'
             {
              before(grammarAccess.getCPBranchTransitionAccess().getColonKeyword_2()); 
-            match(input,42,FOLLOW_42_in_rule__CPBranchTransition__Group__2__Impl12878); 
+            match(input,42,FOLLOW_2); 
              after(grammarAccess.getCPBranchTransitionAccess().getColonKeyword_2()); 
 
             }
@@ -17619,21 +17619,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group__3"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6338:1: rule__CPBranchTransition__Group__3 : rule__CPBranchTransition__Group__3__Impl rule__CPBranchTransition__Group__4 ;
+    // InternalFSM.g:6341:1: rule__CPBranchTransition__Group__3 : rule__CPBranchTransition__Group__3__Impl rule__CPBranchTransition__Group__4 ;
     public final void rule__CPBranchTransition__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6342:1: ( rule__CPBranchTransition__Group__3__Impl rule__CPBranchTransition__Group__4 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6343:2: rule__CPBranchTransition__Group__3__Impl rule__CPBranchTransition__Group__4
+            // InternalFSM.g:6345:1: ( rule__CPBranchTransition__Group__3__Impl rule__CPBranchTransition__Group__4 )
+            // InternalFSM.g:6346:2: rule__CPBranchTransition__Group__3__Impl rule__CPBranchTransition__Group__4
             {
-            pushFollow(FOLLOW_rule__CPBranchTransition__Group__3__Impl_in_rule__CPBranchTransition__Group__312909);
+            pushFollow(FOLLOW_18);
             rule__CPBranchTransition__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__CPBranchTransition__Group__4_in_rule__CPBranchTransition__Group__312912);
+            pushFollow(FOLLOW_2);
             rule__CPBranchTransition__Group__4();
 
             state._fsp--;
@@ -17657,23 +17657,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group__3__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6350:1: rule__CPBranchTransition__Group__3__Impl : ( ( rule__CPBranchTransition__FromAssignment_3 ) ) ;
+    // InternalFSM.g:6353:1: rule__CPBranchTransition__Group__3__Impl : ( ( rule__CPBranchTransition__FromAssignment_3 ) ) ;
     public final void rule__CPBranchTransition__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6354:1: ( ( ( rule__CPBranchTransition__FromAssignment_3 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6355:1: ( ( rule__CPBranchTransition__FromAssignment_3 ) )
+            // InternalFSM.g:6357:1: ( ( ( rule__CPBranchTransition__FromAssignment_3 ) ) )
+            // InternalFSM.g:6358:1: ( ( rule__CPBranchTransition__FromAssignment_3 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6355:1: ( ( rule__CPBranchTransition__FromAssignment_3 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6356:1: ( rule__CPBranchTransition__FromAssignment_3 )
+            // InternalFSM.g:6358:1: ( ( rule__CPBranchTransition__FromAssignment_3 ) )
+            // InternalFSM.g:6359:1: ( rule__CPBranchTransition__FromAssignment_3 )
             {
              before(grammarAccess.getCPBranchTransitionAccess().getFromAssignment_3()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6357:1: ( rule__CPBranchTransition__FromAssignment_3 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6357:2: rule__CPBranchTransition__FromAssignment_3
+            // InternalFSM.g:6360:1: ( rule__CPBranchTransition__FromAssignment_3 )
+            // InternalFSM.g:6360:2: rule__CPBranchTransition__FromAssignment_3
             {
-            pushFollow(FOLLOW_rule__CPBranchTransition__FromAssignment_3_in_rule__CPBranchTransition__Group__3__Impl12939);
+            pushFollow(FOLLOW_2);
             rule__CPBranchTransition__FromAssignment_3();
 
             state._fsp--;
@@ -17704,21 +17704,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group__4"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6367:1: rule__CPBranchTransition__Group__4 : rule__CPBranchTransition__Group__4__Impl rule__CPBranchTransition__Group__5 ;
+    // InternalFSM.g:6370:1: rule__CPBranchTransition__Group__4 : rule__CPBranchTransition__Group__4__Impl rule__CPBranchTransition__Group__5 ;
     public final void rule__CPBranchTransition__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6371:1: ( rule__CPBranchTransition__Group__4__Impl rule__CPBranchTransition__Group__5 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6372:2: rule__CPBranchTransition__Group__4__Impl rule__CPBranchTransition__Group__5
+            // InternalFSM.g:6374:1: ( rule__CPBranchTransition__Group__4__Impl rule__CPBranchTransition__Group__5 )
+            // InternalFSM.g:6375:2: rule__CPBranchTransition__Group__4__Impl rule__CPBranchTransition__Group__5
             {
-            pushFollow(FOLLOW_rule__CPBranchTransition__Group__4__Impl_in_rule__CPBranchTransition__Group__412969);
+            pushFollow(FOLLOW_19);
             rule__CPBranchTransition__Group__4__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__CPBranchTransition__Group__5_in_rule__CPBranchTransition__Group__412972);
+            pushFollow(FOLLOW_2);
             rule__CPBranchTransition__Group__5();
 
             state._fsp--;
@@ -17742,20 +17742,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group__4__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6379:1: rule__CPBranchTransition__Group__4__Impl : ( '->' ) ;
+    // InternalFSM.g:6382:1: rule__CPBranchTransition__Group__4__Impl : ( '->' ) ;
     public final void rule__CPBranchTransition__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6383:1: ( ( '->' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6384:1: ( '->' )
+            // InternalFSM.g:6386:1: ( ( '->' ) )
+            // InternalFSM.g:6387:1: ( '->' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6384:1: ( '->' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6385:1: '->'
+            // InternalFSM.g:6387:1: ( '->' )
+            // InternalFSM.g:6388:1: '->'
             {
              before(grammarAccess.getCPBranchTransitionAccess().getHyphenMinusGreaterThanSignKeyword_4()); 
-            match(input,44,FOLLOW_44_in_rule__CPBranchTransition__Group__4__Impl13000); 
+            match(input,44,FOLLOW_2); 
              after(grammarAccess.getCPBranchTransitionAccess().getHyphenMinusGreaterThanSignKeyword_4()); 
 
             }
@@ -17779,21 +17779,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group__5"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6398:1: rule__CPBranchTransition__Group__5 : rule__CPBranchTransition__Group__5__Impl rule__CPBranchTransition__Group__6 ;
+    // InternalFSM.g:6401:1: rule__CPBranchTransition__Group__5 : rule__CPBranchTransition__Group__5__Impl rule__CPBranchTransition__Group__6 ;
     public final void rule__CPBranchTransition__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6402:1: ( rule__CPBranchTransition__Group__5__Impl rule__CPBranchTransition__Group__6 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6403:2: rule__CPBranchTransition__Group__5__Impl rule__CPBranchTransition__Group__6
+            // InternalFSM.g:6405:1: ( rule__CPBranchTransition__Group__5__Impl rule__CPBranchTransition__Group__6 )
+            // InternalFSM.g:6406:2: rule__CPBranchTransition__Group__5__Impl rule__CPBranchTransition__Group__6
             {
-            pushFollow(FOLLOW_rule__CPBranchTransition__Group__5__Impl_in_rule__CPBranchTransition__Group__513031);
+            pushFollow(FOLLOW_10);
             rule__CPBranchTransition__Group__5__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__CPBranchTransition__Group__6_in_rule__CPBranchTransition__Group__513034);
+            pushFollow(FOLLOW_2);
             rule__CPBranchTransition__Group__6();
 
             state._fsp--;
@@ -17817,23 +17817,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group__5__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6410:1: rule__CPBranchTransition__Group__5__Impl : ( ( rule__CPBranchTransition__ToAssignment_5 ) ) ;
+    // InternalFSM.g:6413:1: rule__CPBranchTransition__Group__5__Impl : ( ( rule__CPBranchTransition__ToAssignment_5 ) ) ;
     public final void rule__CPBranchTransition__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6414:1: ( ( ( rule__CPBranchTransition__ToAssignment_5 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6415:1: ( ( rule__CPBranchTransition__ToAssignment_5 ) )
+            // InternalFSM.g:6417:1: ( ( ( rule__CPBranchTransition__ToAssignment_5 ) ) )
+            // InternalFSM.g:6418:1: ( ( rule__CPBranchTransition__ToAssignment_5 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6415:1: ( ( rule__CPBranchTransition__ToAssignment_5 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6416:1: ( rule__CPBranchTransition__ToAssignment_5 )
+            // InternalFSM.g:6418:1: ( ( rule__CPBranchTransition__ToAssignment_5 ) )
+            // InternalFSM.g:6419:1: ( rule__CPBranchTransition__ToAssignment_5 )
             {
              before(grammarAccess.getCPBranchTransitionAccess().getToAssignment_5()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6417:1: ( rule__CPBranchTransition__ToAssignment_5 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6417:2: rule__CPBranchTransition__ToAssignment_5
+            // InternalFSM.g:6420:1: ( rule__CPBranchTransition__ToAssignment_5 )
+            // InternalFSM.g:6420:2: rule__CPBranchTransition__ToAssignment_5
             {
-            pushFollow(FOLLOW_rule__CPBranchTransition__ToAssignment_5_in_rule__CPBranchTransition__Group__5__Impl13061);
+            pushFollow(FOLLOW_2);
             rule__CPBranchTransition__ToAssignment_5();
 
             state._fsp--;
@@ -17864,21 +17864,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group__6"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6427:1: rule__CPBranchTransition__Group__6 : rule__CPBranchTransition__Group__6__Impl rule__CPBranchTransition__Group__7 ;
+    // InternalFSM.g:6430:1: rule__CPBranchTransition__Group__6 : rule__CPBranchTransition__Group__6__Impl rule__CPBranchTransition__Group__7 ;
     public final void rule__CPBranchTransition__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6431:1: ( rule__CPBranchTransition__Group__6__Impl rule__CPBranchTransition__Group__7 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6432:2: rule__CPBranchTransition__Group__6__Impl rule__CPBranchTransition__Group__7
+            // InternalFSM.g:6434:1: ( rule__CPBranchTransition__Group__6__Impl rule__CPBranchTransition__Group__7 )
+            // InternalFSM.g:6435:2: rule__CPBranchTransition__Group__6__Impl rule__CPBranchTransition__Group__7
             {
-            pushFollow(FOLLOW_rule__CPBranchTransition__Group__6__Impl_in_rule__CPBranchTransition__Group__613091);
+            pushFollow(FOLLOW_10);
             rule__CPBranchTransition__Group__6__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__CPBranchTransition__Group__7_in_rule__CPBranchTransition__Group__613094);
+            pushFollow(FOLLOW_2);
             rule__CPBranchTransition__Group__7();
 
             state._fsp--;
@@ -17902,20 +17902,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group__6__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6439:1: rule__CPBranchTransition__Group__6__Impl : ( ( rule__CPBranchTransition__DocuAssignment_6 )? ) ;
+    // InternalFSM.g:6442:1: rule__CPBranchTransition__Group__6__Impl : ( ( rule__CPBranchTransition__DocuAssignment_6 )? ) ;
     public final void rule__CPBranchTransition__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6443:1: ( ( ( rule__CPBranchTransition__DocuAssignment_6 )? ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6444:1: ( ( rule__CPBranchTransition__DocuAssignment_6 )? )
+            // InternalFSM.g:6446:1: ( ( ( rule__CPBranchTransition__DocuAssignment_6 )? ) )
+            // InternalFSM.g:6447:1: ( ( rule__CPBranchTransition__DocuAssignment_6 )? )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6444:1: ( ( rule__CPBranchTransition__DocuAssignment_6 )? )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6445:1: ( rule__CPBranchTransition__DocuAssignment_6 )?
+            // InternalFSM.g:6447:1: ( ( rule__CPBranchTransition__DocuAssignment_6 )? )
+            // InternalFSM.g:6448:1: ( rule__CPBranchTransition__DocuAssignment_6 )?
             {
              before(grammarAccess.getCPBranchTransitionAccess().getDocuAssignment_6()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6446:1: ( rule__CPBranchTransition__DocuAssignment_6 )?
+            // InternalFSM.g:6449:1: ( rule__CPBranchTransition__DocuAssignment_6 )?
             int alt62=2;
             int LA62_0 = input.LA(1);
 
@@ -17924,9 +17924,9 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt62) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6446:2: rule__CPBranchTransition__DocuAssignment_6
+                    // InternalFSM.g:6449:2: rule__CPBranchTransition__DocuAssignment_6
                     {
-                    pushFollow(FOLLOW_rule__CPBranchTransition__DocuAssignment_6_in_rule__CPBranchTransition__Group__6__Impl13121);
+                    pushFollow(FOLLOW_2);
                     rule__CPBranchTransition__DocuAssignment_6();
 
                     state._fsp--;
@@ -17960,21 +17960,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group__7"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6456:1: rule__CPBranchTransition__Group__7 : rule__CPBranchTransition__Group__7__Impl rule__CPBranchTransition__Group__8 ;
+    // InternalFSM.g:6459:1: rule__CPBranchTransition__Group__7 : rule__CPBranchTransition__Group__7__Impl rule__CPBranchTransition__Group__8 ;
     public final void rule__CPBranchTransition__Group__7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6460:1: ( rule__CPBranchTransition__Group__7__Impl rule__CPBranchTransition__Group__8 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6461:2: rule__CPBranchTransition__Group__7__Impl rule__CPBranchTransition__Group__8
+            // InternalFSM.g:6463:1: ( rule__CPBranchTransition__Group__7__Impl rule__CPBranchTransition__Group__8 )
+            // InternalFSM.g:6464:2: rule__CPBranchTransition__Group__7__Impl rule__CPBranchTransition__Group__8
             {
-            pushFollow(FOLLOW_rule__CPBranchTransition__Group__7__Impl_in_rule__CPBranchTransition__Group__713152);
+            pushFollow(FOLLOW_26);
             rule__CPBranchTransition__Group__7__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__CPBranchTransition__Group__8_in_rule__CPBranchTransition__Group__713155);
+            pushFollow(FOLLOW_2);
             rule__CPBranchTransition__Group__8();
 
             state._fsp--;
@@ -17998,20 +17998,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group__7__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6468:1: rule__CPBranchTransition__Group__7__Impl : ( '{' ) ;
+    // InternalFSM.g:6471:1: rule__CPBranchTransition__Group__7__Impl : ( '{' ) ;
     public final void rule__CPBranchTransition__Group__7__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6472:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6473:1: ( '{' )
+            // InternalFSM.g:6475:1: ( ( '{' ) )
+            // InternalFSM.g:6476:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6473:1: ( '{' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6474:1: '{'
+            // InternalFSM.g:6476:1: ( '{' )
+            // InternalFSM.g:6477:1: '{'
             {
              before(grammarAccess.getCPBranchTransitionAccess().getLeftCurlyBracketKeyword_7()); 
-            match(input,28,FOLLOW_28_in_rule__CPBranchTransition__Group__7__Impl13183); 
+            match(input,28,FOLLOW_2); 
              after(grammarAccess.getCPBranchTransitionAccess().getLeftCurlyBracketKeyword_7()); 
 
             }
@@ -18035,21 +18035,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group__8"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6487:1: rule__CPBranchTransition__Group__8 : rule__CPBranchTransition__Group__8__Impl rule__CPBranchTransition__Group__9 ;
+    // InternalFSM.g:6490:1: rule__CPBranchTransition__Group__8 : rule__CPBranchTransition__Group__8__Impl rule__CPBranchTransition__Group__9 ;
     public final void rule__CPBranchTransition__Group__8() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6491:1: ( rule__CPBranchTransition__Group__8__Impl rule__CPBranchTransition__Group__9 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6492:2: rule__CPBranchTransition__Group__8__Impl rule__CPBranchTransition__Group__9
+            // InternalFSM.g:6494:1: ( rule__CPBranchTransition__Group__8__Impl rule__CPBranchTransition__Group__9 )
+            // InternalFSM.g:6495:2: rule__CPBranchTransition__Group__8__Impl rule__CPBranchTransition__Group__9
             {
-            pushFollow(FOLLOW_rule__CPBranchTransition__Group__8__Impl_in_rule__CPBranchTransition__Group__813214);
+            pushFollow(FOLLOW_7);
             rule__CPBranchTransition__Group__8__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__CPBranchTransition__Group__9_in_rule__CPBranchTransition__Group__813217);
+            pushFollow(FOLLOW_2);
             rule__CPBranchTransition__Group__9();
 
             state._fsp--;
@@ -18073,20 +18073,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group__8__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6499:1: rule__CPBranchTransition__Group__8__Impl : ( 'cond' ) ;
+    // InternalFSM.g:6502:1: rule__CPBranchTransition__Group__8__Impl : ( 'cond' ) ;
     public final void rule__CPBranchTransition__Group__8__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6503:1: ( ( 'cond' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6504:1: ( 'cond' )
+            // InternalFSM.g:6506:1: ( ( 'cond' ) )
+            // InternalFSM.g:6507:1: ( 'cond' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6504:1: ( 'cond' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6505:1: 'cond'
+            // InternalFSM.g:6507:1: ( 'cond' )
+            // InternalFSM.g:6508:1: 'cond'
             {
              before(grammarAccess.getCPBranchTransitionAccess().getCondKeyword_8()); 
-            match(input,49,FOLLOW_49_in_rule__CPBranchTransition__Group__8__Impl13245); 
+            match(input,49,FOLLOW_2); 
              after(grammarAccess.getCPBranchTransitionAccess().getCondKeyword_8()); 
 
             }
@@ -18110,21 +18110,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group__9"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6518:1: rule__CPBranchTransition__Group__9 : rule__CPBranchTransition__Group__9__Impl rule__CPBranchTransition__Group__10 ;
+    // InternalFSM.g:6521:1: rule__CPBranchTransition__Group__9 : rule__CPBranchTransition__Group__9__Impl rule__CPBranchTransition__Group__10 ;
     public final void rule__CPBranchTransition__Group__9() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6522:1: ( rule__CPBranchTransition__Group__9__Impl rule__CPBranchTransition__Group__10 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6523:2: rule__CPBranchTransition__Group__9__Impl rule__CPBranchTransition__Group__10
+            // InternalFSM.g:6525:1: ( rule__CPBranchTransition__Group__9__Impl rule__CPBranchTransition__Group__10 )
+            // InternalFSM.g:6526:2: rule__CPBranchTransition__Group__9__Impl rule__CPBranchTransition__Group__10
             {
-            pushFollow(FOLLOW_rule__CPBranchTransition__Group__9__Impl_in_rule__CPBranchTransition__Group__913276);
+            pushFollow(FOLLOW_20);
             rule__CPBranchTransition__Group__9__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__CPBranchTransition__Group__10_in_rule__CPBranchTransition__Group__913279);
+            pushFollow(FOLLOW_2);
             rule__CPBranchTransition__Group__10();
 
             state._fsp--;
@@ -18148,23 +18148,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group__9__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6530:1: rule__CPBranchTransition__Group__9__Impl : ( ( rule__CPBranchTransition__ConditionAssignment_9 ) ) ;
+    // InternalFSM.g:6533:1: rule__CPBranchTransition__Group__9__Impl : ( ( rule__CPBranchTransition__ConditionAssignment_9 ) ) ;
     public final void rule__CPBranchTransition__Group__9__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6534:1: ( ( ( rule__CPBranchTransition__ConditionAssignment_9 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6535:1: ( ( rule__CPBranchTransition__ConditionAssignment_9 ) )
+            // InternalFSM.g:6537:1: ( ( ( rule__CPBranchTransition__ConditionAssignment_9 ) ) )
+            // InternalFSM.g:6538:1: ( ( rule__CPBranchTransition__ConditionAssignment_9 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6535:1: ( ( rule__CPBranchTransition__ConditionAssignment_9 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6536:1: ( rule__CPBranchTransition__ConditionAssignment_9 )
+            // InternalFSM.g:6538:1: ( ( rule__CPBranchTransition__ConditionAssignment_9 ) )
+            // InternalFSM.g:6539:1: ( rule__CPBranchTransition__ConditionAssignment_9 )
             {
              before(grammarAccess.getCPBranchTransitionAccess().getConditionAssignment_9()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6537:1: ( rule__CPBranchTransition__ConditionAssignment_9 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6537:2: rule__CPBranchTransition__ConditionAssignment_9
+            // InternalFSM.g:6540:1: ( rule__CPBranchTransition__ConditionAssignment_9 )
+            // InternalFSM.g:6540:2: rule__CPBranchTransition__ConditionAssignment_9
             {
-            pushFollow(FOLLOW_rule__CPBranchTransition__ConditionAssignment_9_in_rule__CPBranchTransition__Group__9__Impl13306);
+            pushFollow(FOLLOW_2);
             rule__CPBranchTransition__ConditionAssignment_9();
 
             state._fsp--;
@@ -18195,21 +18195,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group__10"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6547:1: rule__CPBranchTransition__Group__10 : rule__CPBranchTransition__Group__10__Impl rule__CPBranchTransition__Group__11 ;
+    // InternalFSM.g:6550:1: rule__CPBranchTransition__Group__10 : rule__CPBranchTransition__Group__10__Impl rule__CPBranchTransition__Group__11 ;
     public final void rule__CPBranchTransition__Group__10() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6551:1: ( rule__CPBranchTransition__Group__10__Impl rule__CPBranchTransition__Group__11 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6552:2: rule__CPBranchTransition__Group__10__Impl rule__CPBranchTransition__Group__11
+            // InternalFSM.g:6554:1: ( rule__CPBranchTransition__Group__10__Impl rule__CPBranchTransition__Group__11 )
+            // InternalFSM.g:6555:2: rule__CPBranchTransition__Group__10__Impl rule__CPBranchTransition__Group__11
             {
-            pushFollow(FOLLOW_rule__CPBranchTransition__Group__10__Impl_in_rule__CPBranchTransition__Group__1013336);
+            pushFollow(FOLLOW_20);
             rule__CPBranchTransition__Group__10__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__CPBranchTransition__Group__11_in_rule__CPBranchTransition__Group__1013339);
+            pushFollow(FOLLOW_2);
             rule__CPBranchTransition__Group__11();
 
             state._fsp--;
@@ -18233,20 +18233,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group__10__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6559:1: rule__CPBranchTransition__Group__10__Impl : ( ( rule__CPBranchTransition__Group_10__0 )? ) ;
+    // InternalFSM.g:6562:1: rule__CPBranchTransition__Group__10__Impl : ( ( rule__CPBranchTransition__Group_10__0 )? ) ;
     public final void rule__CPBranchTransition__Group__10__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6563:1: ( ( ( rule__CPBranchTransition__Group_10__0 )? ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6564:1: ( ( rule__CPBranchTransition__Group_10__0 )? )
+            // InternalFSM.g:6566:1: ( ( ( rule__CPBranchTransition__Group_10__0 )? ) )
+            // InternalFSM.g:6567:1: ( ( rule__CPBranchTransition__Group_10__0 )? )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6564:1: ( ( rule__CPBranchTransition__Group_10__0 )? )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6565:1: ( rule__CPBranchTransition__Group_10__0 )?
+            // InternalFSM.g:6567:1: ( ( rule__CPBranchTransition__Group_10__0 )? )
+            // InternalFSM.g:6568:1: ( rule__CPBranchTransition__Group_10__0 )?
             {
              before(grammarAccess.getCPBranchTransitionAccess().getGroup_10()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6566:1: ( rule__CPBranchTransition__Group_10__0 )?
+            // InternalFSM.g:6569:1: ( rule__CPBranchTransition__Group_10__0 )?
             int alt63=2;
             int LA63_0 = input.LA(1);
 
@@ -18255,9 +18255,9 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt63) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6566:2: rule__CPBranchTransition__Group_10__0
+                    // InternalFSM.g:6569:2: rule__CPBranchTransition__Group_10__0
                     {
-                    pushFollow(FOLLOW_rule__CPBranchTransition__Group_10__0_in_rule__CPBranchTransition__Group__10__Impl13366);
+                    pushFollow(FOLLOW_2);
                     rule__CPBranchTransition__Group_10__0();
 
                     state._fsp--;
@@ -18291,16 +18291,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group__11"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6576:1: rule__CPBranchTransition__Group__11 : rule__CPBranchTransition__Group__11__Impl ;
+    // InternalFSM.g:6579:1: rule__CPBranchTransition__Group__11 : rule__CPBranchTransition__Group__11__Impl ;
     public final void rule__CPBranchTransition__Group__11() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6580:1: ( rule__CPBranchTransition__Group__11__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6581:2: rule__CPBranchTransition__Group__11__Impl
+            // InternalFSM.g:6583:1: ( rule__CPBranchTransition__Group__11__Impl )
+            // InternalFSM.g:6584:2: rule__CPBranchTransition__Group__11__Impl
             {
-            pushFollow(FOLLOW_rule__CPBranchTransition__Group__11__Impl_in_rule__CPBranchTransition__Group__1113397);
+            pushFollow(FOLLOW_2);
             rule__CPBranchTransition__Group__11__Impl();
 
             state._fsp--;
@@ -18324,20 +18324,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group__11__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6587:1: rule__CPBranchTransition__Group__11__Impl : ( '}' ) ;
+    // InternalFSM.g:6590:1: rule__CPBranchTransition__Group__11__Impl : ( '}' ) ;
     public final void rule__CPBranchTransition__Group__11__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6591:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6592:1: ( '}' )
+            // InternalFSM.g:6594:1: ( ( '}' ) )
+            // InternalFSM.g:6595:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6592:1: ( '}' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6593:1: '}'
+            // InternalFSM.g:6595:1: ( '}' )
+            // InternalFSM.g:6596:1: '}'
             {
              before(grammarAccess.getCPBranchTransitionAccess().getRightCurlyBracketKeyword_11()); 
-            match(input,29,FOLLOW_29_in_rule__CPBranchTransition__Group__11__Impl13425); 
+            match(input,29,FOLLOW_2); 
              after(grammarAccess.getCPBranchTransitionAccess().getRightCurlyBracketKeyword_11()); 
 
             }
@@ -18361,21 +18361,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group_10__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6630:1: rule__CPBranchTransition__Group_10__0 : rule__CPBranchTransition__Group_10__0__Impl rule__CPBranchTransition__Group_10__1 ;
+    // InternalFSM.g:6633:1: rule__CPBranchTransition__Group_10__0 : rule__CPBranchTransition__Group_10__0__Impl rule__CPBranchTransition__Group_10__1 ;
     public final void rule__CPBranchTransition__Group_10__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6634:1: ( rule__CPBranchTransition__Group_10__0__Impl rule__CPBranchTransition__Group_10__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6635:2: rule__CPBranchTransition__Group_10__0__Impl rule__CPBranchTransition__Group_10__1
+            // InternalFSM.g:6637:1: ( rule__CPBranchTransition__Group_10__0__Impl rule__CPBranchTransition__Group_10__1 )
+            // InternalFSM.g:6638:2: rule__CPBranchTransition__Group_10__0__Impl rule__CPBranchTransition__Group_10__1
             {
-            pushFollow(FOLLOW_rule__CPBranchTransition__Group_10__0__Impl_in_rule__CPBranchTransition__Group_10__013480);
+            pushFollow(FOLLOW_7);
             rule__CPBranchTransition__Group_10__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__CPBranchTransition__Group_10__1_in_rule__CPBranchTransition__Group_10__013483);
+            pushFollow(FOLLOW_2);
             rule__CPBranchTransition__Group_10__1();
 
             state._fsp--;
@@ -18399,20 +18399,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group_10__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6642:1: rule__CPBranchTransition__Group_10__0__Impl : ( 'action' ) ;
+    // InternalFSM.g:6645:1: rule__CPBranchTransition__Group_10__0__Impl : ( 'action' ) ;
     public final void rule__CPBranchTransition__Group_10__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6646:1: ( ( 'action' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6647:1: ( 'action' )
+            // InternalFSM.g:6649:1: ( ( 'action' ) )
+            // InternalFSM.g:6650:1: ( 'action' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6647:1: ( 'action' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6648:1: 'action'
+            // InternalFSM.g:6650:1: ( 'action' )
+            // InternalFSM.g:6651:1: 'action'
             {
              before(grammarAccess.getCPBranchTransitionAccess().getActionKeyword_10_0()); 
-            match(input,45,FOLLOW_45_in_rule__CPBranchTransition__Group_10__0__Impl13511); 
+            match(input,45,FOLLOW_2); 
              after(grammarAccess.getCPBranchTransitionAccess().getActionKeyword_10_0()); 
 
             }
@@ -18436,16 +18436,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group_10__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6661:1: rule__CPBranchTransition__Group_10__1 : rule__CPBranchTransition__Group_10__1__Impl ;
+    // InternalFSM.g:6664:1: rule__CPBranchTransition__Group_10__1 : rule__CPBranchTransition__Group_10__1__Impl ;
     public final void rule__CPBranchTransition__Group_10__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6665:1: ( rule__CPBranchTransition__Group_10__1__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6666:2: rule__CPBranchTransition__Group_10__1__Impl
+            // InternalFSM.g:6668:1: ( rule__CPBranchTransition__Group_10__1__Impl )
+            // InternalFSM.g:6669:2: rule__CPBranchTransition__Group_10__1__Impl
             {
-            pushFollow(FOLLOW_rule__CPBranchTransition__Group_10__1__Impl_in_rule__CPBranchTransition__Group_10__113542);
+            pushFollow(FOLLOW_2);
             rule__CPBranchTransition__Group_10__1__Impl();
 
             state._fsp--;
@@ -18469,23 +18469,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group_10__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6672:1: rule__CPBranchTransition__Group_10__1__Impl : ( ( rule__CPBranchTransition__ActionAssignment_10_1 ) ) ;
+    // InternalFSM.g:6675:1: rule__CPBranchTransition__Group_10__1__Impl : ( ( rule__CPBranchTransition__ActionAssignment_10_1 ) ) ;
     public final void rule__CPBranchTransition__Group_10__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6676:1: ( ( ( rule__CPBranchTransition__ActionAssignment_10_1 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6677:1: ( ( rule__CPBranchTransition__ActionAssignment_10_1 ) )
+            // InternalFSM.g:6679:1: ( ( ( rule__CPBranchTransition__ActionAssignment_10_1 ) ) )
+            // InternalFSM.g:6680:1: ( ( rule__CPBranchTransition__ActionAssignment_10_1 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6677:1: ( ( rule__CPBranchTransition__ActionAssignment_10_1 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6678:1: ( rule__CPBranchTransition__ActionAssignment_10_1 )
+            // InternalFSM.g:6680:1: ( ( rule__CPBranchTransition__ActionAssignment_10_1 ) )
+            // InternalFSM.g:6681:1: ( rule__CPBranchTransition__ActionAssignment_10_1 )
             {
              before(grammarAccess.getCPBranchTransitionAccess().getActionAssignment_10_1()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6679:1: ( rule__CPBranchTransition__ActionAssignment_10_1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6679:2: rule__CPBranchTransition__ActionAssignment_10_1
+            // InternalFSM.g:6682:1: ( rule__CPBranchTransition__ActionAssignment_10_1 )
+            // InternalFSM.g:6682:2: rule__CPBranchTransition__ActionAssignment_10_1
             {
-            pushFollow(FOLLOW_rule__CPBranchTransition__ActionAssignment_10_1_in_rule__CPBranchTransition__Group_10__1__Impl13569);
+            pushFollow(FOLLOW_2);
             rule__CPBranchTransition__ActionAssignment_10_1();
 
             state._fsp--;
@@ -18516,21 +18516,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedTransition__Group__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6693:1: rule__RefinedTransition__Group__0 : rule__RefinedTransition__Group__0__Impl rule__RefinedTransition__Group__1 ;
+    // InternalFSM.g:6696:1: rule__RefinedTransition__Group__0 : rule__RefinedTransition__Group__0__Impl rule__RefinedTransition__Group__1 ;
     public final void rule__RefinedTransition__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6697:1: ( rule__RefinedTransition__Group__0__Impl rule__RefinedTransition__Group__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6698:2: rule__RefinedTransition__Group__0__Impl rule__RefinedTransition__Group__1
+            // InternalFSM.g:6700:1: ( rule__RefinedTransition__Group__0__Impl rule__RefinedTransition__Group__1 )
+            // InternalFSM.g:6701:2: rule__RefinedTransition__Group__0__Impl rule__RefinedTransition__Group__1
             {
-            pushFollow(FOLLOW_rule__RefinedTransition__Group__0__Impl_in_rule__RefinedTransition__Group__013603);
+            pushFollow(FOLLOW_5);
             rule__RefinedTransition__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RefinedTransition__Group__1_in_rule__RefinedTransition__Group__013606);
+            pushFollow(FOLLOW_2);
             rule__RefinedTransition__Group__1();
 
             state._fsp--;
@@ -18554,20 +18554,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedTransition__Group__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6705:1: rule__RefinedTransition__Group__0__Impl : ( 'RefinedTransition' ) ;
+    // InternalFSM.g:6708:1: rule__RefinedTransition__Group__0__Impl : ( 'RefinedTransition' ) ;
     public final void rule__RefinedTransition__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6709:1: ( ( 'RefinedTransition' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6710:1: ( 'RefinedTransition' )
+            // InternalFSM.g:6712:1: ( ( 'RefinedTransition' ) )
+            // InternalFSM.g:6713:1: ( 'RefinedTransition' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6710:1: ( 'RefinedTransition' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6711:1: 'RefinedTransition'
+            // InternalFSM.g:6713:1: ( 'RefinedTransition' )
+            // InternalFSM.g:6714:1: 'RefinedTransition'
             {
              before(grammarAccess.getRefinedTransitionAccess().getRefinedTransitionKeyword_0()); 
-            match(input,50,FOLLOW_50_in_rule__RefinedTransition__Group__0__Impl13634); 
+            match(input,50,FOLLOW_2); 
              after(grammarAccess.getRefinedTransitionAccess().getRefinedTransitionKeyword_0()); 
 
             }
@@ -18591,21 +18591,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedTransition__Group__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6724:1: rule__RefinedTransition__Group__1 : rule__RefinedTransition__Group__1__Impl rule__RefinedTransition__Group__2 ;
+    // InternalFSM.g:6727:1: rule__RefinedTransition__Group__1 : rule__RefinedTransition__Group__1__Impl rule__RefinedTransition__Group__2 ;
     public final void rule__RefinedTransition__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6728:1: ( rule__RefinedTransition__Group__1__Impl rule__RefinedTransition__Group__2 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6729:2: rule__RefinedTransition__Group__1__Impl rule__RefinedTransition__Group__2
+            // InternalFSM.g:6731:1: ( rule__RefinedTransition__Group__1__Impl rule__RefinedTransition__Group__2 )
+            // InternalFSM.g:6732:2: rule__RefinedTransition__Group__1__Impl rule__RefinedTransition__Group__2
             {
-            pushFollow(FOLLOW_rule__RefinedTransition__Group__1__Impl_in_rule__RefinedTransition__Group__113665);
+            pushFollow(FOLLOW_10);
             rule__RefinedTransition__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RefinedTransition__Group__2_in_rule__RefinedTransition__Group__113668);
+            pushFollow(FOLLOW_2);
             rule__RefinedTransition__Group__2();
 
             state._fsp--;
@@ -18629,23 +18629,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedTransition__Group__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6736:1: rule__RefinedTransition__Group__1__Impl : ( ( rule__RefinedTransition__TargetAssignment_1 ) ) ;
+    // InternalFSM.g:6739:1: rule__RefinedTransition__Group__1__Impl : ( ( rule__RefinedTransition__TargetAssignment_1 ) ) ;
     public final void rule__RefinedTransition__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6740:1: ( ( ( rule__RefinedTransition__TargetAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6741:1: ( ( rule__RefinedTransition__TargetAssignment_1 ) )
+            // InternalFSM.g:6743:1: ( ( ( rule__RefinedTransition__TargetAssignment_1 ) ) )
+            // InternalFSM.g:6744:1: ( ( rule__RefinedTransition__TargetAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6741:1: ( ( rule__RefinedTransition__TargetAssignment_1 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6742:1: ( rule__RefinedTransition__TargetAssignment_1 )
+            // InternalFSM.g:6744:1: ( ( rule__RefinedTransition__TargetAssignment_1 ) )
+            // InternalFSM.g:6745:1: ( rule__RefinedTransition__TargetAssignment_1 )
             {
              before(grammarAccess.getRefinedTransitionAccess().getTargetAssignment_1()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6743:1: ( rule__RefinedTransition__TargetAssignment_1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6743:2: rule__RefinedTransition__TargetAssignment_1
+            // InternalFSM.g:6746:1: ( rule__RefinedTransition__TargetAssignment_1 )
+            // InternalFSM.g:6746:2: rule__RefinedTransition__TargetAssignment_1
             {
-            pushFollow(FOLLOW_rule__RefinedTransition__TargetAssignment_1_in_rule__RefinedTransition__Group__1__Impl13695);
+            pushFollow(FOLLOW_2);
             rule__RefinedTransition__TargetAssignment_1();
 
             state._fsp--;
@@ -18676,21 +18676,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedTransition__Group__2"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6753:1: rule__RefinedTransition__Group__2 : rule__RefinedTransition__Group__2__Impl rule__RefinedTransition__Group__3 ;
+    // InternalFSM.g:6756:1: rule__RefinedTransition__Group__2 : rule__RefinedTransition__Group__2__Impl rule__RefinedTransition__Group__3 ;
     public final void rule__RefinedTransition__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6757:1: ( rule__RefinedTransition__Group__2__Impl rule__RefinedTransition__Group__3 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6758:2: rule__RefinedTransition__Group__2__Impl rule__RefinedTransition__Group__3
+            // InternalFSM.g:6760:1: ( rule__RefinedTransition__Group__2__Impl rule__RefinedTransition__Group__3 )
+            // InternalFSM.g:6761:2: rule__RefinedTransition__Group__2__Impl rule__RefinedTransition__Group__3
             {
-            pushFollow(FOLLOW_rule__RefinedTransition__Group__2__Impl_in_rule__RefinedTransition__Group__213725);
+            pushFollow(FOLLOW_10);
             rule__RefinedTransition__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RefinedTransition__Group__3_in_rule__RefinedTransition__Group__213728);
+            pushFollow(FOLLOW_2);
             rule__RefinedTransition__Group__3();
 
             state._fsp--;
@@ -18714,20 +18714,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedTransition__Group__2__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6765:1: rule__RefinedTransition__Group__2__Impl : ( ( rule__RefinedTransition__DocuAssignment_2 )? ) ;
+    // InternalFSM.g:6768:1: rule__RefinedTransition__Group__2__Impl : ( ( rule__RefinedTransition__DocuAssignment_2 )? ) ;
     public final void rule__RefinedTransition__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6769:1: ( ( ( rule__RefinedTransition__DocuAssignment_2 )? ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6770:1: ( ( rule__RefinedTransition__DocuAssignment_2 )? )
+            // InternalFSM.g:6772:1: ( ( ( rule__RefinedTransition__DocuAssignment_2 )? ) )
+            // InternalFSM.g:6773:1: ( ( rule__RefinedTransition__DocuAssignment_2 )? )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6770:1: ( ( rule__RefinedTransition__DocuAssignment_2 )? )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6771:1: ( rule__RefinedTransition__DocuAssignment_2 )?
+            // InternalFSM.g:6773:1: ( ( rule__RefinedTransition__DocuAssignment_2 )? )
+            // InternalFSM.g:6774:1: ( rule__RefinedTransition__DocuAssignment_2 )?
             {
              before(grammarAccess.getRefinedTransitionAccess().getDocuAssignment_2()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6772:1: ( rule__RefinedTransition__DocuAssignment_2 )?
+            // InternalFSM.g:6775:1: ( rule__RefinedTransition__DocuAssignment_2 )?
             int alt64=2;
             int LA64_0 = input.LA(1);
 
@@ -18736,9 +18736,9 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt64) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6772:2: rule__RefinedTransition__DocuAssignment_2
+                    // InternalFSM.g:6775:2: rule__RefinedTransition__DocuAssignment_2
                     {
-                    pushFollow(FOLLOW_rule__RefinedTransition__DocuAssignment_2_in_rule__RefinedTransition__Group__2__Impl13755);
+                    pushFollow(FOLLOW_2);
                     rule__RefinedTransition__DocuAssignment_2();
 
                     state._fsp--;
@@ -18772,21 +18772,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedTransition__Group__3"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6782:1: rule__RefinedTransition__Group__3 : rule__RefinedTransition__Group__3__Impl rule__RefinedTransition__Group__4 ;
+    // InternalFSM.g:6785:1: rule__RefinedTransition__Group__3 : rule__RefinedTransition__Group__3__Impl rule__RefinedTransition__Group__4 ;
     public final void rule__RefinedTransition__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6786:1: ( rule__RefinedTransition__Group__3__Impl rule__RefinedTransition__Group__4 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6787:2: rule__RefinedTransition__Group__3__Impl rule__RefinedTransition__Group__4
+            // InternalFSM.g:6789:1: ( rule__RefinedTransition__Group__3__Impl rule__RefinedTransition__Group__4 )
+            // InternalFSM.g:6790:2: rule__RefinedTransition__Group__3__Impl rule__RefinedTransition__Group__4
             {
-            pushFollow(FOLLOW_rule__RefinedTransition__Group__3__Impl_in_rule__RefinedTransition__Group__313786);
+            pushFollow(FOLLOW_27);
             rule__RefinedTransition__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RefinedTransition__Group__4_in_rule__RefinedTransition__Group__313789);
+            pushFollow(FOLLOW_2);
             rule__RefinedTransition__Group__4();
 
             state._fsp--;
@@ -18810,20 +18810,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedTransition__Group__3__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6794:1: rule__RefinedTransition__Group__3__Impl : ( '{' ) ;
+    // InternalFSM.g:6797:1: rule__RefinedTransition__Group__3__Impl : ( '{' ) ;
     public final void rule__RefinedTransition__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6798:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6799:1: ( '{' )
+            // InternalFSM.g:6801:1: ( ( '{' ) )
+            // InternalFSM.g:6802:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6799:1: ( '{' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6800:1: '{'
+            // InternalFSM.g:6802:1: ( '{' )
+            // InternalFSM.g:6803:1: '{'
             {
              before(grammarAccess.getRefinedTransitionAccess().getLeftCurlyBracketKeyword_3()); 
-            match(input,28,FOLLOW_28_in_rule__RefinedTransition__Group__3__Impl13817); 
+            match(input,28,FOLLOW_2); 
              after(grammarAccess.getRefinedTransitionAccess().getLeftCurlyBracketKeyword_3()); 
 
             }
@@ -18847,21 +18847,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedTransition__Group__4"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6813:1: rule__RefinedTransition__Group__4 : rule__RefinedTransition__Group__4__Impl rule__RefinedTransition__Group__5 ;
+    // InternalFSM.g:6816:1: rule__RefinedTransition__Group__4 : rule__RefinedTransition__Group__4__Impl rule__RefinedTransition__Group__5 ;
     public final void rule__RefinedTransition__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6817:1: ( rule__RefinedTransition__Group__4__Impl rule__RefinedTransition__Group__5 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6818:2: rule__RefinedTransition__Group__4__Impl rule__RefinedTransition__Group__5
+            // InternalFSM.g:6820:1: ( rule__RefinedTransition__Group__4__Impl rule__RefinedTransition__Group__5 )
+            // InternalFSM.g:6821:2: rule__RefinedTransition__Group__4__Impl rule__RefinedTransition__Group__5
             {
-            pushFollow(FOLLOW_rule__RefinedTransition__Group__4__Impl_in_rule__RefinedTransition__Group__413848);
+            pushFollow(FOLLOW_7);
             rule__RefinedTransition__Group__4__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RefinedTransition__Group__5_in_rule__RefinedTransition__Group__413851);
+            pushFollow(FOLLOW_2);
             rule__RefinedTransition__Group__5();
 
             state._fsp--;
@@ -18885,20 +18885,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedTransition__Group__4__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6825:1: rule__RefinedTransition__Group__4__Impl : ( 'action' ) ;
+    // InternalFSM.g:6828:1: rule__RefinedTransition__Group__4__Impl : ( 'action' ) ;
     public final void rule__RefinedTransition__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6829:1: ( ( 'action' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6830:1: ( 'action' )
+            // InternalFSM.g:6832:1: ( ( 'action' ) )
+            // InternalFSM.g:6833:1: ( 'action' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6830:1: ( 'action' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6831:1: 'action'
+            // InternalFSM.g:6833:1: ( 'action' )
+            // InternalFSM.g:6834:1: 'action'
             {
              before(grammarAccess.getRefinedTransitionAccess().getActionKeyword_4()); 
-            match(input,45,FOLLOW_45_in_rule__RefinedTransition__Group__4__Impl13879); 
+            match(input,45,FOLLOW_2); 
              after(grammarAccess.getRefinedTransitionAccess().getActionKeyword_4()); 
 
             }
@@ -18922,21 +18922,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedTransition__Group__5"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6844:1: rule__RefinedTransition__Group__5 : rule__RefinedTransition__Group__5__Impl rule__RefinedTransition__Group__6 ;
+    // InternalFSM.g:6847:1: rule__RefinedTransition__Group__5 : rule__RefinedTransition__Group__5__Impl rule__RefinedTransition__Group__6 ;
     public final void rule__RefinedTransition__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6848:1: ( rule__RefinedTransition__Group__5__Impl rule__RefinedTransition__Group__6 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6849:2: rule__RefinedTransition__Group__5__Impl rule__RefinedTransition__Group__6
+            // InternalFSM.g:6851:1: ( rule__RefinedTransition__Group__5__Impl rule__RefinedTransition__Group__6 )
+            // InternalFSM.g:6852:2: rule__RefinedTransition__Group__5__Impl rule__RefinedTransition__Group__6
             {
-            pushFollow(FOLLOW_rule__RefinedTransition__Group__5__Impl_in_rule__RefinedTransition__Group__513910);
+            pushFollow(FOLLOW_28);
             rule__RefinedTransition__Group__5__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RefinedTransition__Group__6_in_rule__RefinedTransition__Group__513913);
+            pushFollow(FOLLOW_2);
             rule__RefinedTransition__Group__6();
 
             state._fsp--;
@@ -18960,23 +18960,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedTransition__Group__5__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6856:1: rule__RefinedTransition__Group__5__Impl : ( ( rule__RefinedTransition__ActionAssignment_5 ) ) ;
+    // InternalFSM.g:6859:1: rule__RefinedTransition__Group__5__Impl : ( ( rule__RefinedTransition__ActionAssignment_5 ) ) ;
     public final void rule__RefinedTransition__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6860:1: ( ( ( rule__RefinedTransition__ActionAssignment_5 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6861:1: ( ( rule__RefinedTransition__ActionAssignment_5 ) )
+            // InternalFSM.g:6863:1: ( ( ( rule__RefinedTransition__ActionAssignment_5 ) ) )
+            // InternalFSM.g:6864:1: ( ( rule__RefinedTransition__ActionAssignment_5 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6861:1: ( ( rule__RefinedTransition__ActionAssignment_5 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6862:1: ( rule__RefinedTransition__ActionAssignment_5 )
+            // InternalFSM.g:6864:1: ( ( rule__RefinedTransition__ActionAssignment_5 ) )
+            // InternalFSM.g:6865:1: ( rule__RefinedTransition__ActionAssignment_5 )
             {
              before(grammarAccess.getRefinedTransitionAccess().getActionAssignment_5()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6863:1: ( rule__RefinedTransition__ActionAssignment_5 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6863:2: rule__RefinedTransition__ActionAssignment_5
+            // InternalFSM.g:6866:1: ( rule__RefinedTransition__ActionAssignment_5 )
+            // InternalFSM.g:6866:2: rule__RefinedTransition__ActionAssignment_5
             {
-            pushFollow(FOLLOW_rule__RefinedTransition__ActionAssignment_5_in_rule__RefinedTransition__Group__5__Impl13940);
+            pushFollow(FOLLOW_2);
             rule__RefinedTransition__ActionAssignment_5();
 
             state._fsp--;
@@ -19007,16 +19007,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedTransition__Group__6"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6873:1: rule__RefinedTransition__Group__6 : rule__RefinedTransition__Group__6__Impl ;
+    // InternalFSM.g:6876:1: rule__RefinedTransition__Group__6 : rule__RefinedTransition__Group__6__Impl ;
     public final void rule__RefinedTransition__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6877:1: ( rule__RefinedTransition__Group__6__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6878:2: rule__RefinedTransition__Group__6__Impl
+            // InternalFSM.g:6880:1: ( rule__RefinedTransition__Group__6__Impl )
+            // InternalFSM.g:6881:2: rule__RefinedTransition__Group__6__Impl
             {
-            pushFollow(FOLLOW_rule__RefinedTransition__Group__6__Impl_in_rule__RefinedTransition__Group__613970);
+            pushFollow(FOLLOW_2);
             rule__RefinedTransition__Group__6__Impl();
 
             state._fsp--;
@@ -19040,20 +19040,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedTransition__Group__6__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6884:1: rule__RefinedTransition__Group__6__Impl : ( '}' ) ;
+    // InternalFSM.g:6887:1: rule__RefinedTransition__Group__6__Impl : ( '}' ) ;
     public final void rule__RefinedTransition__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6888:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6889:1: ( '}' )
+            // InternalFSM.g:6891:1: ( ( '}' ) )
+            // InternalFSM.g:6892:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6889:1: ( '}' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6890:1: '}'
+            // InternalFSM.g:6892:1: ( '}' )
+            // InternalFSM.g:6893:1: '}'
             {
              before(grammarAccess.getRefinedTransitionAccess().getRightCurlyBracketKeyword_6()); 
-            match(input,29,FOLLOW_29_in_rule__RefinedTransition__Group__6__Impl13998); 
+            match(input,29,FOLLOW_2); 
              after(grammarAccess.getRefinedTransitionAccess().getRightCurlyBracketKeyword_6()); 
 
             }
@@ -19077,21 +19077,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TrPointTerminal__Group__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6917:1: rule__TrPointTerminal__Group__0 : rule__TrPointTerminal__Group__0__Impl rule__TrPointTerminal__Group__1 ;
+    // InternalFSM.g:6920:1: rule__TrPointTerminal__Group__0 : rule__TrPointTerminal__Group__0__Impl rule__TrPointTerminal__Group__1 ;
     public final void rule__TrPointTerminal__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6921:1: ( rule__TrPointTerminal__Group__0__Impl rule__TrPointTerminal__Group__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6922:2: rule__TrPointTerminal__Group__0__Impl rule__TrPointTerminal__Group__1
+            // InternalFSM.g:6924:1: ( rule__TrPointTerminal__Group__0__Impl rule__TrPointTerminal__Group__1 )
+            // InternalFSM.g:6925:2: rule__TrPointTerminal__Group__0__Impl rule__TrPointTerminal__Group__1
             {
-            pushFollow(FOLLOW_rule__TrPointTerminal__Group__0__Impl_in_rule__TrPointTerminal__Group__014043);
+            pushFollow(FOLLOW_5);
             rule__TrPointTerminal__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__TrPointTerminal__Group__1_in_rule__TrPointTerminal__Group__014046);
+            pushFollow(FOLLOW_2);
             rule__TrPointTerminal__Group__1();
 
             state._fsp--;
@@ -19115,20 +19115,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TrPointTerminal__Group__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6929:1: rule__TrPointTerminal__Group__0__Impl : ( 'my' ) ;
+    // InternalFSM.g:6932:1: rule__TrPointTerminal__Group__0__Impl : ( 'my' ) ;
     public final void rule__TrPointTerminal__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6933:1: ( ( 'my' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6934:1: ( 'my' )
+            // InternalFSM.g:6936:1: ( ( 'my' ) )
+            // InternalFSM.g:6937:1: ( 'my' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6934:1: ( 'my' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6935:1: 'my'
+            // InternalFSM.g:6937:1: ( 'my' )
+            // InternalFSM.g:6938:1: 'my'
             {
              before(grammarAccess.getTrPointTerminalAccess().getMyKeyword_0()); 
-            match(input,51,FOLLOW_51_in_rule__TrPointTerminal__Group__0__Impl14074); 
+            match(input,51,FOLLOW_2); 
              after(grammarAccess.getTrPointTerminalAccess().getMyKeyword_0()); 
 
             }
@@ -19152,16 +19152,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TrPointTerminal__Group__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6948:1: rule__TrPointTerminal__Group__1 : rule__TrPointTerminal__Group__1__Impl ;
+    // InternalFSM.g:6951:1: rule__TrPointTerminal__Group__1 : rule__TrPointTerminal__Group__1__Impl ;
     public final void rule__TrPointTerminal__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6952:1: ( rule__TrPointTerminal__Group__1__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6953:2: rule__TrPointTerminal__Group__1__Impl
+            // InternalFSM.g:6955:1: ( rule__TrPointTerminal__Group__1__Impl )
+            // InternalFSM.g:6956:2: rule__TrPointTerminal__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__TrPointTerminal__Group__1__Impl_in_rule__TrPointTerminal__Group__114105);
+            pushFollow(FOLLOW_2);
             rule__TrPointTerminal__Group__1__Impl();
 
             state._fsp--;
@@ -19185,23 +19185,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TrPointTerminal__Group__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6959:1: rule__TrPointTerminal__Group__1__Impl : ( ( rule__TrPointTerminal__TrPointAssignment_1 ) ) ;
+    // InternalFSM.g:6962:1: rule__TrPointTerminal__Group__1__Impl : ( ( rule__TrPointTerminal__TrPointAssignment_1 ) ) ;
     public final void rule__TrPointTerminal__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6963:1: ( ( ( rule__TrPointTerminal__TrPointAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6964:1: ( ( rule__TrPointTerminal__TrPointAssignment_1 ) )
+            // InternalFSM.g:6966:1: ( ( ( rule__TrPointTerminal__TrPointAssignment_1 ) ) )
+            // InternalFSM.g:6967:1: ( ( rule__TrPointTerminal__TrPointAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6964:1: ( ( rule__TrPointTerminal__TrPointAssignment_1 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6965:1: ( rule__TrPointTerminal__TrPointAssignment_1 )
+            // InternalFSM.g:6967:1: ( ( rule__TrPointTerminal__TrPointAssignment_1 ) )
+            // InternalFSM.g:6968:1: ( rule__TrPointTerminal__TrPointAssignment_1 )
             {
              before(grammarAccess.getTrPointTerminalAccess().getTrPointAssignment_1()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6966:1: ( rule__TrPointTerminal__TrPointAssignment_1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6966:2: rule__TrPointTerminal__TrPointAssignment_1
+            // InternalFSM.g:6969:1: ( rule__TrPointTerminal__TrPointAssignment_1 )
+            // InternalFSM.g:6969:2: rule__TrPointTerminal__TrPointAssignment_1
             {
-            pushFollow(FOLLOW_rule__TrPointTerminal__TrPointAssignment_1_in_rule__TrPointTerminal__Group__1__Impl14132);
+            pushFollow(FOLLOW_2);
             rule__TrPointTerminal__TrPointAssignment_1();
 
             state._fsp--;
@@ -19232,21 +19232,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubStateTrPointTerminal__Group__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6980:1: rule__SubStateTrPointTerminal__Group__0 : rule__SubStateTrPointTerminal__Group__0__Impl rule__SubStateTrPointTerminal__Group__1 ;
+    // InternalFSM.g:6983:1: rule__SubStateTrPointTerminal__Group__0 : rule__SubStateTrPointTerminal__Group__0__Impl rule__SubStateTrPointTerminal__Group__1 ;
     public final void rule__SubStateTrPointTerminal__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6984:1: ( rule__SubStateTrPointTerminal__Group__0__Impl rule__SubStateTrPointTerminal__Group__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6985:2: rule__SubStateTrPointTerminal__Group__0__Impl rule__SubStateTrPointTerminal__Group__1
+            // InternalFSM.g:6987:1: ( rule__SubStateTrPointTerminal__Group__0__Impl rule__SubStateTrPointTerminal__Group__1 )
+            // InternalFSM.g:6988:2: rule__SubStateTrPointTerminal__Group__0__Impl rule__SubStateTrPointTerminal__Group__1
             {
-            pushFollow(FOLLOW_rule__SubStateTrPointTerminal__Group__0__Impl_in_rule__SubStateTrPointTerminal__Group__014166);
+            pushFollow(FOLLOW_29);
             rule__SubStateTrPointTerminal__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SubStateTrPointTerminal__Group__1_in_rule__SubStateTrPointTerminal__Group__014169);
+            pushFollow(FOLLOW_2);
             rule__SubStateTrPointTerminal__Group__1();
 
             state._fsp--;
@@ -19270,23 +19270,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubStateTrPointTerminal__Group__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6992:1: rule__SubStateTrPointTerminal__Group__0__Impl : ( ( rule__SubStateTrPointTerminal__TrPointAssignment_0 ) ) ;
+    // InternalFSM.g:6995:1: rule__SubStateTrPointTerminal__Group__0__Impl : ( ( rule__SubStateTrPointTerminal__TrPointAssignment_0 ) ) ;
     public final void rule__SubStateTrPointTerminal__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6996:1: ( ( ( rule__SubStateTrPointTerminal__TrPointAssignment_0 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6997:1: ( ( rule__SubStateTrPointTerminal__TrPointAssignment_0 ) )
+            // InternalFSM.g:6999:1: ( ( ( rule__SubStateTrPointTerminal__TrPointAssignment_0 ) ) )
+            // InternalFSM.g:7000:1: ( ( rule__SubStateTrPointTerminal__TrPointAssignment_0 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6997:1: ( ( rule__SubStateTrPointTerminal__TrPointAssignment_0 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6998:1: ( rule__SubStateTrPointTerminal__TrPointAssignment_0 )
+            // InternalFSM.g:7000:1: ( ( rule__SubStateTrPointTerminal__TrPointAssignment_0 ) )
+            // InternalFSM.g:7001:1: ( rule__SubStateTrPointTerminal__TrPointAssignment_0 )
             {
              before(grammarAccess.getSubStateTrPointTerminalAccess().getTrPointAssignment_0()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6999:1: ( rule__SubStateTrPointTerminal__TrPointAssignment_0 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:6999:2: rule__SubStateTrPointTerminal__TrPointAssignment_0
+            // InternalFSM.g:7002:1: ( rule__SubStateTrPointTerminal__TrPointAssignment_0 )
+            // InternalFSM.g:7002:2: rule__SubStateTrPointTerminal__TrPointAssignment_0
             {
-            pushFollow(FOLLOW_rule__SubStateTrPointTerminal__TrPointAssignment_0_in_rule__SubStateTrPointTerminal__Group__0__Impl14196);
+            pushFollow(FOLLOW_2);
             rule__SubStateTrPointTerminal__TrPointAssignment_0();
 
             state._fsp--;
@@ -19317,21 +19317,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubStateTrPointTerminal__Group__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7009:1: rule__SubStateTrPointTerminal__Group__1 : rule__SubStateTrPointTerminal__Group__1__Impl rule__SubStateTrPointTerminal__Group__2 ;
+    // InternalFSM.g:7012:1: rule__SubStateTrPointTerminal__Group__1 : rule__SubStateTrPointTerminal__Group__1__Impl rule__SubStateTrPointTerminal__Group__2 ;
     public final void rule__SubStateTrPointTerminal__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7013:1: ( rule__SubStateTrPointTerminal__Group__1__Impl rule__SubStateTrPointTerminal__Group__2 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7014:2: rule__SubStateTrPointTerminal__Group__1__Impl rule__SubStateTrPointTerminal__Group__2
+            // InternalFSM.g:7016:1: ( rule__SubStateTrPointTerminal__Group__1__Impl rule__SubStateTrPointTerminal__Group__2 )
+            // InternalFSM.g:7017:2: rule__SubStateTrPointTerminal__Group__1__Impl rule__SubStateTrPointTerminal__Group__2
             {
-            pushFollow(FOLLOW_rule__SubStateTrPointTerminal__Group__1__Impl_in_rule__SubStateTrPointTerminal__Group__114226);
+            pushFollow(FOLLOW_5);
             rule__SubStateTrPointTerminal__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SubStateTrPointTerminal__Group__2_in_rule__SubStateTrPointTerminal__Group__114229);
+            pushFollow(FOLLOW_2);
             rule__SubStateTrPointTerminal__Group__2();
 
             state._fsp--;
@@ -19355,20 +19355,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubStateTrPointTerminal__Group__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7021:1: rule__SubStateTrPointTerminal__Group__1__Impl : ( 'of' ) ;
+    // InternalFSM.g:7024:1: rule__SubStateTrPointTerminal__Group__1__Impl : ( 'of' ) ;
     public final void rule__SubStateTrPointTerminal__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7025:1: ( ( 'of' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7026:1: ( 'of' )
+            // InternalFSM.g:7028:1: ( ( 'of' ) )
+            // InternalFSM.g:7029:1: ( 'of' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7026:1: ( 'of' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7027:1: 'of'
+            // InternalFSM.g:7029:1: ( 'of' )
+            // InternalFSM.g:7030:1: 'of'
             {
              before(grammarAccess.getSubStateTrPointTerminalAccess().getOfKeyword_1()); 
-            match(input,52,FOLLOW_52_in_rule__SubStateTrPointTerminal__Group__1__Impl14257); 
+            match(input,52,FOLLOW_2); 
              after(grammarAccess.getSubStateTrPointTerminalAccess().getOfKeyword_1()); 
 
             }
@@ -19392,16 +19392,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubStateTrPointTerminal__Group__2"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7040:1: rule__SubStateTrPointTerminal__Group__2 : rule__SubStateTrPointTerminal__Group__2__Impl ;
+    // InternalFSM.g:7043:1: rule__SubStateTrPointTerminal__Group__2 : rule__SubStateTrPointTerminal__Group__2__Impl ;
     public final void rule__SubStateTrPointTerminal__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7044:1: ( rule__SubStateTrPointTerminal__Group__2__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7045:2: rule__SubStateTrPointTerminal__Group__2__Impl
+            // InternalFSM.g:7047:1: ( rule__SubStateTrPointTerminal__Group__2__Impl )
+            // InternalFSM.g:7048:2: rule__SubStateTrPointTerminal__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__SubStateTrPointTerminal__Group__2__Impl_in_rule__SubStateTrPointTerminal__Group__214288);
+            pushFollow(FOLLOW_2);
             rule__SubStateTrPointTerminal__Group__2__Impl();
 
             state._fsp--;
@@ -19425,23 +19425,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubStateTrPointTerminal__Group__2__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7051:1: rule__SubStateTrPointTerminal__Group__2__Impl : ( ( rule__SubStateTrPointTerminal__StateAssignment_2 ) ) ;
+    // InternalFSM.g:7054:1: rule__SubStateTrPointTerminal__Group__2__Impl : ( ( rule__SubStateTrPointTerminal__StateAssignment_2 ) ) ;
     public final void rule__SubStateTrPointTerminal__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7055:1: ( ( ( rule__SubStateTrPointTerminal__StateAssignment_2 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7056:1: ( ( rule__SubStateTrPointTerminal__StateAssignment_2 ) )
+            // InternalFSM.g:7058:1: ( ( ( rule__SubStateTrPointTerminal__StateAssignment_2 ) ) )
+            // InternalFSM.g:7059:1: ( ( rule__SubStateTrPointTerminal__StateAssignment_2 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7056:1: ( ( rule__SubStateTrPointTerminal__StateAssignment_2 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7057:1: ( rule__SubStateTrPointTerminal__StateAssignment_2 )
+            // InternalFSM.g:7059:1: ( ( rule__SubStateTrPointTerminal__StateAssignment_2 ) )
+            // InternalFSM.g:7060:1: ( rule__SubStateTrPointTerminal__StateAssignment_2 )
             {
              before(grammarAccess.getSubStateTrPointTerminalAccess().getStateAssignment_2()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7058:1: ( rule__SubStateTrPointTerminal__StateAssignment_2 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7058:2: rule__SubStateTrPointTerminal__StateAssignment_2
+            // InternalFSM.g:7061:1: ( rule__SubStateTrPointTerminal__StateAssignment_2 )
+            // InternalFSM.g:7061:2: rule__SubStateTrPointTerminal__StateAssignment_2
             {
-            pushFollow(FOLLOW_rule__SubStateTrPointTerminal__StateAssignment_2_in_rule__SubStateTrPointTerminal__Group__2__Impl14315);
+            pushFollow(FOLLOW_2);
             rule__SubStateTrPointTerminal__StateAssignment_2();
 
             state._fsp--;
@@ -19472,21 +19472,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ChoicepointTerminal__Group__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7074:1: rule__ChoicepointTerminal__Group__0 : rule__ChoicepointTerminal__Group__0__Impl rule__ChoicepointTerminal__Group__1 ;
+    // InternalFSM.g:7077:1: rule__ChoicepointTerminal__Group__0 : rule__ChoicepointTerminal__Group__0__Impl rule__ChoicepointTerminal__Group__1 ;
     public final void rule__ChoicepointTerminal__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7078:1: ( rule__ChoicepointTerminal__Group__0__Impl rule__ChoicepointTerminal__Group__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7079:2: rule__ChoicepointTerminal__Group__0__Impl rule__ChoicepointTerminal__Group__1
+            // InternalFSM.g:7081:1: ( rule__ChoicepointTerminal__Group__0__Impl rule__ChoicepointTerminal__Group__1 )
+            // InternalFSM.g:7082:2: rule__ChoicepointTerminal__Group__0__Impl rule__ChoicepointTerminal__Group__1
             {
-            pushFollow(FOLLOW_rule__ChoicepointTerminal__Group__0__Impl_in_rule__ChoicepointTerminal__Group__014351);
+            pushFollow(FOLLOW_5);
             rule__ChoicepointTerminal__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ChoicepointTerminal__Group__1_in_rule__ChoicepointTerminal__Group__014354);
+            pushFollow(FOLLOW_2);
             rule__ChoicepointTerminal__Group__1();
 
             state._fsp--;
@@ -19510,20 +19510,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ChoicepointTerminal__Group__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7086:1: rule__ChoicepointTerminal__Group__0__Impl : ( 'cp' ) ;
+    // InternalFSM.g:7089:1: rule__ChoicepointTerminal__Group__0__Impl : ( 'cp' ) ;
     public final void rule__ChoicepointTerminal__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7090:1: ( ( 'cp' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7091:1: ( 'cp' )
+            // InternalFSM.g:7093:1: ( ( 'cp' ) )
+            // InternalFSM.g:7094:1: ( 'cp' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7091:1: ( 'cp' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7092:1: 'cp'
+            // InternalFSM.g:7094:1: ( 'cp' )
+            // InternalFSM.g:7095:1: 'cp'
             {
              before(grammarAccess.getChoicepointTerminalAccess().getCpKeyword_0()); 
-            match(input,53,FOLLOW_53_in_rule__ChoicepointTerminal__Group__0__Impl14382); 
+            match(input,53,FOLLOW_2); 
              after(grammarAccess.getChoicepointTerminalAccess().getCpKeyword_0()); 
 
             }
@@ -19547,16 +19547,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ChoicepointTerminal__Group__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7105:1: rule__ChoicepointTerminal__Group__1 : rule__ChoicepointTerminal__Group__1__Impl ;
+    // InternalFSM.g:7108:1: rule__ChoicepointTerminal__Group__1 : rule__ChoicepointTerminal__Group__1__Impl ;
     public final void rule__ChoicepointTerminal__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7109:1: ( rule__ChoicepointTerminal__Group__1__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7110:2: rule__ChoicepointTerminal__Group__1__Impl
+            // InternalFSM.g:7112:1: ( rule__ChoicepointTerminal__Group__1__Impl )
+            // InternalFSM.g:7113:2: rule__ChoicepointTerminal__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__ChoicepointTerminal__Group__1__Impl_in_rule__ChoicepointTerminal__Group__114413);
+            pushFollow(FOLLOW_2);
             rule__ChoicepointTerminal__Group__1__Impl();
 
             state._fsp--;
@@ -19580,23 +19580,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ChoicepointTerminal__Group__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7116:1: rule__ChoicepointTerminal__Group__1__Impl : ( ( rule__ChoicepointTerminal__CpAssignment_1 ) ) ;
+    // InternalFSM.g:7119:1: rule__ChoicepointTerminal__Group__1__Impl : ( ( rule__ChoicepointTerminal__CpAssignment_1 ) ) ;
     public final void rule__ChoicepointTerminal__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7120:1: ( ( ( rule__ChoicepointTerminal__CpAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7121:1: ( ( rule__ChoicepointTerminal__CpAssignment_1 ) )
+            // InternalFSM.g:7123:1: ( ( ( rule__ChoicepointTerminal__CpAssignment_1 ) ) )
+            // InternalFSM.g:7124:1: ( ( rule__ChoicepointTerminal__CpAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7121:1: ( ( rule__ChoicepointTerminal__CpAssignment_1 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7122:1: ( rule__ChoicepointTerminal__CpAssignment_1 )
+            // InternalFSM.g:7124:1: ( ( rule__ChoicepointTerminal__CpAssignment_1 ) )
+            // InternalFSM.g:7125:1: ( rule__ChoicepointTerminal__CpAssignment_1 )
             {
              before(grammarAccess.getChoicepointTerminalAccess().getCpAssignment_1()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7123:1: ( rule__ChoicepointTerminal__CpAssignment_1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7123:2: rule__ChoicepointTerminal__CpAssignment_1
+            // InternalFSM.g:7126:1: ( rule__ChoicepointTerminal__CpAssignment_1 )
+            // InternalFSM.g:7126:2: rule__ChoicepointTerminal__CpAssignment_1
             {
-            pushFollow(FOLLOW_rule__ChoicepointTerminal__CpAssignment_1_in_rule__ChoicepointTerminal__Group__1__Impl14440);
+            pushFollow(FOLLOW_2);
             rule__ChoicepointTerminal__CpAssignment_1();
 
             state._fsp--;
@@ -19627,21 +19627,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Trigger__Group__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7137:1: rule__Trigger__Group__0 : rule__Trigger__Group__0__Impl rule__Trigger__Group__1 ;
+    // InternalFSM.g:7140:1: rule__Trigger__Group__0 : rule__Trigger__Group__0__Impl rule__Trigger__Group__1 ;
     public final void rule__Trigger__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7141:1: ( rule__Trigger__Group__0__Impl rule__Trigger__Group__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7142:2: rule__Trigger__Group__0__Impl rule__Trigger__Group__1
+            // InternalFSM.g:7144:1: ( rule__Trigger__Group__0__Impl rule__Trigger__Group__1 )
+            // InternalFSM.g:7145:2: rule__Trigger__Group__0__Impl rule__Trigger__Group__1
             {
-            pushFollow(FOLLOW_rule__Trigger__Group__0__Impl_in_rule__Trigger__Group__014474);
+            pushFollow(FOLLOW_5);
             rule__Trigger__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Trigger__Group__1_in_rule__Trigger__Group__014477);
+            pushFollow(FOLLOW_2);
             rule__Trigger__Group__1();
 
             state._fsp--;
@@ -19665,20 +19665,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Trigger__Group__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7149:1: rule__Trigger__Group__0__Impl : ( '<' ) ;
+    // InternalFSM.g:7152:1: rule__Trigger__Group__0__Impl : ( '<' ) ;
     public final void rule__Trigger__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7153:1: ( ( '<' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7154:1: ( '<' )
+            // InternalFSM.g:7156:1: ( ( '<' ) )
+            // InternalFSM.g:7157:1: ( '<' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7154:1: ( '<' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7155:1: '<'
+            // InternalFSM.g:7157:1: ( '<' )
+            // InternalFSM.g:7158:1: '<'
             {
              before(grammarAccess.getTriggerAccess().getLessThanSignKeyword_0()); 
-            match(input,54,FOLLOW_54_in_rule__Trigger__Group__0__Impl14505); 
+            match(input,54,FOLLOW_2); 
              after(grammarAccess.getTriggerAccess().getLessThanSignKeyword_0()); 
 
             }
@@ -19702,21 +19702,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Trigger__Group__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7168:1: rule__Trigger__Group__1 : rule__Trigger__Group__1__Impl rule__Trigger__Group__2 ;
+    // InternalFSM.g:7171:1: rule__Trigger__Group__1 : rule__Trigger__Group__1__Impl rule__Trigger__Group__2 ;
     public final void rule__Trigger__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7172:1: ( rule__Trigger__Group__1__Impl rule__Trigger__Group__2 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7173:2: rule__Trigger__Group__1__Impl rule__Trigger__Group__2
+            // InternalFSM.g:7175:1: ( rule__Trigger__Group__1__Impl rule__Trigger__Group__2 )
+            // InternalFSM.g:7176:2: rule__Trigger__Group__1__Impl rule__Trigger__Group__2
             {
-            pushFollow(FOLLOW_rule__Trigger__Group__1__Impl_in_rule__Trigger__Group__114536);
+            pushFollow(FOLLOW_30);
             rule__Trigger__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Trigger__Group__2_in_rule__Trigger__Group__114539);
+            pushFollow(FOLLOW_2);
             rule__Trigger__Group__2();
 
             state._fsp--;
@@ -19740,23 +19740,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Trigger__Group__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7180:1: rule__Trigger__Group__1__Impl : ( ( rule__Trigger__MsgFromIfPairsAssignment_1 ) ) ;
+    // InternalFSM.g:7183:1: rule__Trigger__Group__1__Impl : ( ( rule__Trigger__MsgFromIfPairsAssignment_1 ) ) ;
     public final void rule__Trigger__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7184:1: ( ( ( rule__Trigger__MsgFromIfPairsAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7185:1: ( ( rule__Trigger__MsgFromIfPairsAssignment_1 ) )
+            // InternalFSM.g:7187:1: ( ( ( rule__Trigger__MsgFromIfPairsAssignment_1 ) ) )
+            // InternalFSM.g:7188:1: ( ( rule__Trigger__MsgFromIfPairsAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7185:1: ( ( rule__Trigger__MsgFromIfPairsAssignment_1 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7186:1: ( rule__Trigger__MsgFromIfPairsAssignment_1 )
+            // InternalFSM.g:7188:1: ( ( rule__Trigger__MsgFromIfPairsAssignment_1 ) )
+            // InternalFSM.g:7189:1: ( rule__Trigger__MsgFromIfPairsAssignment_1 )
             {
              before(grammarAccess.getTriggerAccess().getMsgFromIfPairsAssignment_1()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7187:1: ( rule__Trigger__MsgFromIfPairsAssignment_1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7187:2: rule__Trigger__MsgFromIfPairsAssignment_1
+            // InternalFSM.g:7190:1: ( rule__Trigger__MsgFromIfPairsAssignment_1 )
+            // InternalFSM.g:7190:2: rule__Trigger__MsgFromIfPairsAssignment_1
             {
-            pushFollow(FOLLOW_rule__Trigger__MsgFromIfPairsAssignment_1_in_rule__Trigger__Group__1__Impl14566);
+            pushFollow(FOLLOW_2);
             rule__Trigger__MsgFromIfPairsAssignment_1();
 
             state._fsp--;
@@ -19787,21 +19787,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Trigger__Group__2"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7197:1: rule__Trigger__Group__2 : rule__Trigger__Group__2__Impl rule__Trigger__Group__3 ;
+    // InternalFSM.g:7200:1: rule__Trigger__Group__2 : rule__Trigger__Group__2__Impl rule__Trigger__Group__3 ;
     public final void rule__Trigger__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7201:1: ( rule__Trigger__Group__2__Impl rule__Trigger__Group__3 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7202:2: rule__Trigger__Group__2__Impl rule__Trigger__Group__3
+            // InternalFSM.g:7204:1: ( rule__Trigger__Group__2__Impl rule__Trigger__Group__3 )
+            // InternalFSM.g:7205:2: rule__Trigger__Group__2__Impl rule__Trigger__Group__3
             {
-            pushFollow(FOLLOW_rule__Trigger__Group__2__Impl_in_rule__Trigger__Group__214596);
+            pushFollow(FOLLOW_30);
             rule__Trigger__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Trigger__Group__3_in_rule__Trigger__Group__214599);
+            pushFollow(FOLLOW_2);
             rule__Trigger__Group__3();
 
             state._fsp--;
@@ -19825,20 +19825,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Trigger__Group__2__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7209:1: rule__Trigger__Group__2__Impl : ( ( rule__Trigger__Group_2__0 )* ) ;
+    // InternalFSM.g:7212:1: rule__Trigger__Group__2__Impl : ( ( rule__Trigger__Group_2__0 )* ) ;
     public final void rule__Trigger__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7213:1: ( ( ( rule__Trigger__Group_2__0 )* ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7214:1: ( ( rule__Trigger__Group_2__0 )* )
+            // InternalFSM.g:7216:1: ( ( ( rule__Trigger__Group_2__0 )* ) )
+            // InternalFSM.g:7217:1: ( ( rule__Trigger__Group_2__0 )* )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7214:1: ( ( rule__Trigger__Group_2__0 )* )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7215:1: ( rule__Trigger__Group_2__0 )*
+            // InternalFSM.g:7217:1: ( ( rule__Trigger__Group_2__0 )* )
+            // InternalFSM.g:7218:1: ( rule__Trigger__Group_2__0 )*
             {
              before(grammarAccess.getTriggerAccess().getGroup_2()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7216:1: ( rule__Trigger__Group_2__0 )*
+            // InternalFSM.g:7219:1: ( rule__Trigger__Group_2__0 )*
             loop65:
             do {
                 int alt65=2;
@@ -19851,9 +19851,9 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
                 switch (alt65) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7216:2: rule__Trigger__Group_2__0
+            	    // InternalFSM.g:7219:2: rule__Trigger__Group_2__0
             	    {
-            	    pushFollow(FOLLOW_rule__Trigger__Group_2__0_in_rule__Trigger__Group__2__Impl14626);
+            	    pushFollow(FOLLOW_31);
             	    rule__Trigger__Group_2__0();
 
             	    state._fsp--;
@@ -19890,21 +19890,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Trigger__Group__3"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7226:1: rule__Trigger__Group__3 : rule__Trigger__Group__3__Impl rule__Trigger__Group__4 ;
+    // InternalFSM.g:7229:1: rule__Trigger__Group__3 : rule__Trigger__Group__3__Impl rule__Trigger__Group__4 ;
     public final void rule__Trigger__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7230:1: ( rule__Trigger__Group__3__Impl rule__Trigger__Group__4 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7231:2: rule__Trigger__Group__3__Impl rule__Trigger__Group__4
+            // InternalFSM.g:7233:1: ( rule__Trigger__Group__3__Impl rule__Trigger__Group__4 )
+            // InternalFSM.g:7234:2: rule__Trigger__Group__3__Impl rule__Trigger__Group__4
             {
-            pushFollow(FOLLOW_rule__Trigger__Group__3__Impl_in_rule__Trigger__Group__314657);
+            pushFollow(FOLLOW_30);
             rule__Trigger__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Trigger__Group__4_in_rule__Trigger__Group__314660);
+            pushFollow(FOLLOW_2);
             rule__Trigger__Group__4();
 
             state._fsp--;
@@ -19928,20 +19928,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Trigger__Group__3__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7238:1: rule__Trigger__Group__3__Impl : ( ( rule__Trigger__GuardAssignment_3 )? ) ;
+    // InternalFSM.g:7241:1: rule__Trigger__Group__3__Impl : ( ( rule__Trigger__GuardAssignment_3 )? ) ;
     public final void rule__Trigger__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7242:1: ( ( ( rule__Trigger__GuardAssignment_3 )? ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7243:1: ( ( rule__Trigger__GuardAssignment_3 )? )
+            // InternalFSM.g:7245:1: ( ( ( rule__Trigger__GuardAssignment_3 )? ) )
+            // InternalFSM.g:7246:1: ( ( rule__Trigger__GuardAssignment_3 )? )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7243:1: ( ( rule__Trigger__GuardAssignment_3 )? )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7244:1: ( rule__Trigger__GuardAssignment_3 )?
+            // InternalFSM.g:7246:1: ( ( rule__Trigger__GuardAssignment_3 )? )
+            // InternalFSM.g:7247:1: ( rule__Trigger__GuardAssignment_3 )?
             {
              before(grammarAccess.getTriggerAccess().getGuardAssignment_3()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7245:1: ( rule__Trigger__GuardAssignment_3 )?
+            // InternalFSM.g:7248:1: ( rule__Trigger__GuardAssignment_3 )?
             int alt66=2;
             int LA66_0 = input.LA(1);
 
@@ -19950,9 +19950,9 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt66) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7245:2: rule__Trigger__GuardAssignment_3
+                    // InternalFSM.g:7248:2: rule__Trigger__GuardAssignment_3
                     {
-                    pushFollow(FOLLOW_rule__Trigger__GuardAssignment_3_in_rule__Trigger__Group__3__Impl14687);
+                    pushFollow(FOLLOW_2);
                     rule__Trigger__GuardAssignment_3();
 
                     state._fsp--;
@@ -19986,16 +19986,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Trigger__Group__4"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7255:1: rule__Trigger__Group__4 : rule__Trigger__Group__4__Impl ;
+    // InternalFSM.g:7258:1: rule__Trigger__Group__4 : rule__Trigger__Group__4__Impl ;
     public final void rule__Trigger__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7259:1: ( rule__Trigger__Group__4__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7260:2: rule__Trigger__Group__4__Impl
+            // InternalFSM.g:7262:1: ( rule__Trigger__Group__4__Impl )
+            // InternalFSM.g:7263:2: rule__Trigger__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__Trigger__Group__4__Impl_in_rule__Trigger__Group__414718);
+            pushFollow(FOLLOW_2);
             rule__Trigger__Group__4__Impl();
 
             state._fsp--;
@@ -20019,20 +20019,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Trigger__Group__4__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7266:1: rule__Trigger__Group__4__Impl : ( '>' ) ;
+    // InternalFSM.g:7269:1: rule__Trigger__Group__4__Impl : ( '>' ) ;
     public final void rule__Trigger__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7270:1: ( ( '>' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7271:1: ( '>' )
+            // InternalFSM.g:7273:1: ( ( '>' ) )
+            // InternalFSM.g:7274:1: ( '>' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7271:1: ( '>' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7272:1: '>'
+            // InternalFSM.g:7274:1: ( '>' )
+            // InternalFSM.g:7275:1: '>'
             {
              before(grammarAccess.getTriggerAccess().getGreaterThanSignKeyword_4()); 
-            match(input,55,FOLLOW_55_in_rule__Trigger__Group__4__Impl14746); 
+            match(input,55,FOLLOW_2); 
              after(grammarAccess.getTriggerAccess().getGreaterThanSignKeyword_4()); 
 
             }
@@ -20056,21 +20056,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Trigger__Group_2__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7295:1: rule__Trigger__Group_2__0 : rule__Trigger__Group_2__0__Impl rule__Trigger__Group_2__1 ;
+    // InternalFSM.g:7298:1: rule__Trigger__Group_2__0 : rule__Trigger__Group_2__0__Impl rule__Trigger__Group_2__1 ;
     public final void rule__Trigger__Group_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7299:1: ( rule__Trigger__Group_2__0__Impl rule__Trigger__Group_2__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7300:2: rule__Trigger__Group_2__0__Impl rule__Trigger__Group_2__1
+            // InternalFSM.g:7302:1: ( rule__Trigger__Group_2__0__Impl rule__Trigger__Group_2__1 )
+            // InternalFSM.g:7303:2: rule__Trigger__Group_2__0__Impl rule__Trigger__Group_2__1
             {
-            pushFollow(FOLLOW_rule__Trigger__Group_2__0__Impl_in_rule__Trigger__Group_2__014787);
+            pushFollow(FOLLOW_5);
             rule__Trigger__Group_2__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Trigger__Group_2__1_in_rule__Trigger__Group_2__014790);
+            pushFollow(FOLLOW_2);
             rule__Trigger__Group_2__1();
 
             state._fsp--;
@@ -20094,20 +20094,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Trigger__Group_2__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7307:1: rule__Trigger__Group_2__0__Impl : ( '|' ) ;
+    // InternalFSM.g:7310:1: rule__Trigger__Group_2__0__Impl : ( '|' ) ;
     public final void rule__Trigger__Group_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7311:1: ( ( '|' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7312:1: ( '|' )
+            // InternalFSM.g:7314:1: ( ( '|' ) )
+            // InternalFSM.g:7315:1: ( '|' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7312:1: ( '|' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7313:1: '|'
+            // InternalFSM.g:7315:1: ( '|' )
+            // InternalFSM.g:7316:1: '|'
             {
              before(grammarAccess.getTriggerAccess().getVerticalLineKeyword_2_0()); 
-            match(input,56,FOLLOW_56_in_rule__Trigger__Group_2__0__Impl14818); 
+            match(input,56,FOLLOW_2); 
              after(grammarAccess.getTriggerAccess().getVerticalLineKeyword_2_0()); 
 
             }
@@ -20131,16 +20131,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Trigger__Group_2__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7326:1: rule__Trigger__Group_2__1 : rule__Trigger__Group_2__1__Impl ;
+    // InternalFSM.g:7329:1: rule__Trigger__Group_2__1 : rule__Trigger__Group_2__1__Impl ;
     public final void rule__Trigger__Group_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7330:1: ( rule__Trigger__Group_2__1__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7331:2: rule__Trigger__Group_2__1__Impl
+            // InternalFSM.g:7333:1: ( rule__Trigger__Group_2__1__Impl )
+            // InternalFSM.g:7334:2: rule__Trigger__Group_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__Trigger__Group_2__1__Impl_in_rule__Trigger__Group_2__114849);
+            pushFollow(FOLLOW_2);
             rule__Trigger__Group_2__1__Impl();
 
             state._fsp--;
@@ -20164,23 +20164,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Trigger__Group_2__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7337:1: rule__Trigger__Group_2__1__Impl : ( ( rule__Trigger__MsgFromIfPairsAssignment_2_1 ) ) ;
+    // InternalFSM.g:7340:1: rule__Trigger__Group_2__1__Impl : ( ( rule__Trigger__MsgFromIfPairsAssignment_2_1 ) ) ;
     public final void rule__Trigger__Group_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7341:1: ( ( ( rule__Trigger__MsgFromIfPairsAssignment_2_1 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7342:1: ( ( rule__Trigger__MsgFromIfPairsAssignment_2_1 ) )
+            // InternalFSM.g:7344:1: ( ( ( rule__Trigger__MsgFromIfPairsAssignment_2_1 ) ) )
+            // InternalFSM.g:7345:1: ( ( rule__Trigger__MsgFromIfPairsAssignment_2_1 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7342:1: ( ( rule__Trigger__MsgFromIfPairsAssignment_2_1 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7343:1: ( rule__Trigger__MsgFromIfPairsAssignment_2_1 )
+            // InternalFSM.g:7345:1: ( ( rule__Trigger__MsgFromIfPairsAssignment_2_1 ) )
+            // InternalFSM.g:7346:1: ( rule__Trigger__MsgFromIfPairsAssignment_2_1 )
             {
              before(grammarAccess.getTriggerAccess().getMsgFromIfPairsAssignment_2_1()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7344:1: ( rule__Trigger__MsgFromIfPairsAssignment_2_1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7344:2: rule__Trigger__MsgFromIfPairsAssignment_2_1
+            // InternalFSM.g:7347:1: ( rule__Trigger__MsgFromIfPairsAssignment_2_1 )
+            // InternalFSM.g:7347:2: rule__Trigger__MsgFromIfPairsAssignment_2_1
             {
-            pushFollow(FOLLOW_rule__Trigger__MsgFromIfPairsAssignment_2_1_in_rule__Trigger__Group_2__1__Impl14876);
+            pushFollow(FOLLOW_2);
             rule__Trigger__MsgFromIfPairsAssignment_2_1();
 
             state._fsp--;
@@ -20211,21 +20211,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MessageFromIf__Group__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7358:1: rule__MessageFromIf__Group__0 : rule__MessageFromIf__Group__0__Impl rule__MessageFromIf__Group__1 ;
+    // InternalFSM.g:7361:1: rule__MessageFromIf__Group__0 : rule__MessageFromIf__Group__0__Impl rule__MessageFromIf__Group__1 ;
     public final void rule__MessageFromIf__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7362:1: ( rule__MessageFromIf__Group__0__Impl rule__MessageFromIf__Group__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7363:2: rule__MessageFromIf__Group__0__Impl rule__MessageFromIf__Group__1
+            // InternalFSM.g:7365:1: ( rule__MessageFromIf__Group__0__Impl rule__MessageFromIf__Group__1 )
+            // InternalFSM.g:7366:2: rule__MessageFromIf__Group__0__Impl rule__MessageFromIf__Group__1
             {
-            pushFollow(FOLLOW_rule__MessageFromIf__Group__0__Impl_in_rule__MessageFromIf__Group__014910);
+            pushFollow(FOLLOW_32);
             rule__MessageFromIf__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__MessageFromIf__Group__1_in_rule__MessageFromIf__Group__014913);
+            pushFollow(FOLLOW_2);
             rule__MessageFromIf__Group__1();
 
             state._fsp--;
@@ -20249,23 +20249,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MessageFromIf__Group__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7370:1: rule__MessageFromIf__Group__0__Impl : ( ( rule__MessageFromIf__MessageAssignment_0 ) ) ;
+    // InternalFSM.g:7373:1: rule__MessageFromIf__Group__0__Impl : ( ( rule__MessageFromIf__MessageAssignment_0 ) ) ;
     public final void rule__MessageFromIf__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7374:1: ( ( ( rule__MessageFromIf__MessageAssignment_0 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7375:1: ( ( rule__MessageFromIf__MessageAssignment_0 ) )
+            // InternalFSM.g:7377:1: ( ( ( rule__MessageFromIf__MessageAssignment_0 ) ) )
+            // InternalFSM.g:7378:1: ( ( rule__MessageFromIf__MessageAssignment_0 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7375:1: ( ( rule__MessageFromIf__MessageAssignment_0 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7376:1: ( rule__MessageFromIf__MessageAssignment_0 )
+            // InternalFSM.g:7378:1: ( ( rule__MessageFromIf__MessageAssignment_0 ) )
+            // InternalFSM.g:7379:1: ( rule__MessageFromIf__MessageAssignment_0 )
             {
              before(grammarAccess.getMessageFromIfAccess().getMessageAssignment_0()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7377:1: ( rule__MessageFromIf__MessageAssignment_0 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7377:2: rule__MessageFromIf__MessageAssignment_0
+            // InternalFSM.g:7380:1: ( rule__MessageFromIf__MessageAssignment_0 )
+            // InternalFSM.g:7380:2: rule__MessageFromIf__MessageAssignment_0
             {
-            pushFollow(FOLLOW_rule__MessageFromIf__MessageAssignment_0_in_rule__MessageFromIf__Group__0__Impl14940);
+            pushFollow(FOLLOW_2);
             rule__MessageFromIf__MessageAssignment_0();
 
             state._fsp--;
@@ -20296,21 +20296,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MessageFromIf__Group__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7387:1: rule__MessageFromIf__Group__1 : rule__MessageFromIf__Group__1__Impl rule__MessageFromIf__Group__2 ;
+    // InternalFSM.g:7390:1: rule__MessageFromIf__Group__1 : rule__MessageFromIf__Group__1__Impl rule__MessageFromIf__Group__2 ;
     public final void rule__MessageFromIf__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7391:1: ( rule__MessageFromIf__Group__1__Impl rule__MessageFromIf__Group__2 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7392:2: rule__MessageFromIf__Group__1__Impl rule__MessageFromIf__Group__2
+            // InternalFSM.g:7394:1: ( rule__MessageFromIf__Group__1__Impl rule__MessageFromIf__Group__2 )
+            // InternalFSM.g:7395:2: rule__MessageFromIf__Group__1__Impl rule__MessageFromIf__Group__2
             {
-            pushFollow(FOLLOW_rule__MessageFromIf__Group__1__Impl_in_rule__MessageFromIf__Group__114970);
+            pushFollow(FOLLOW_5);
             rule__MessageFromIf__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__MessageFromIf__Group__2_in_rule__MessageFromIf__Group__114973);
+            pushFollow(FOLLOW_2);
             rule__MessageFromIf__Group__2();
 
             state._fsp--;
@@ -20334,20 +20334,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MessageFromIf__Group__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7399:1: rule__MessageFromIf__Group__1__Impl : ( ':' ) ;
+    // InternalFSM.g:7402:1: rule__MessageFromIf__Group__1__Impl : ( ':' ) ;
     public final void rule__MessageFromIf__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7403:1: ( ( ':' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7404:1: ( ':' )
+            // InternalFSM.g:7406:1: ( ( ':' ) )
+            // InternalFSM.g:7407:1: ( ':' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7404:1: ( ':' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7405:1: ':'
+            // InternalFSM.g:7407:1: ( ':' )
+            // InternalFSM.g:7408:1: ':'
             {
              before(grammarAccess.getMessageFromIfAccess().getColonKeyword_1()); 
-            match(input,42,FOLLOW_42_in_rule__MessageFromIf__Group__1__Impl15001); 
+            match(input,42,FOLLOW_2); 
              after(grammarAccess.getMessageFromIfAccess().getColonKeyword_1()); 
 
             }
@@ -20371,16 +20371,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MessageFromIf__Group__2"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7418:1: rule__MessageFromIf__Group__2 : rule__MessageFromIf__Group__2__Impl ;
+    // InternalFSM.g:7421:1: rule__MessageFromIf__Group__2 : rule__MessageFromIf__Group__2__Impl ;
     public final void rule__MessageFromIf__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7422:1: ( rule__MessageFromIf__Group__2__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7423:2: rule__MessageFromIf__Group__2__Impl
+            // InternalFSM.g:7425:1: ( rule__MessageFromIf__Group__2__Impl )
+            // InternalFSM.g:7426:2: rule__MessageFromIf__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__MessageFromIf__Group__2__Impl_in_rule__MessageFromIf__Group__215032);
+            pushFollow(FOLLOW_2);
             rule__MessageFromIf__Group__2__Impl();
 
             state._fsp--;
@@ -20404,23 +20404,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MessageFromIf__Group__2__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7429:1: rule__MessageFromIf__Group__2__Impl : ( ( rule__MessageFromIf__FromAssignment_2 ) ) ;
+    // InternalFSM.g:7432:1: rule__MessageFromIf__Group__2__Impl : ( ( rule__MessageFromIf__FromAssignment_2 ) ) ;
     public final void rule__MessageFromIf__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7433:1: ( ( ( rule__MessageFromIf__FromAssignment_2 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7434:1: ( ( rule__MessageFromIf__FromAssignment_2 ) )
+            // InternalFSM.g:7436:1: ( ( ( rule__MessageFromIf__FromAssignment_2 ) ) )
+            // InternalFSM.g:7437:1: ( ( rule__MessageFromIf__FromAssignment_2 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7434:1: ( ( rule__MessageFromIf__FromAssignment_2 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7435:1: ( rule__MessageFromIf__FromAssignment_2 )
+            // InternalFSM.g:7437:1: ( ( rule__MessageFromIf__FromAssignment_2 ) )
+            // InternalFSM.g:7438:1: ( rule__MessageFromIf__FromAssignment_2 )
             {
              before(grammarAccess.getMessageFromIfAccess().getFromAssignment_2()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7436:1: ( rule__MessageFromIf__FromAssignment_2 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7436:2: rule__MessageFromIf__FromAssignment_2
+            // InternalFSM.g:7439:1: ( rule__MessageFromIf__FromAssignment_2 )
+            // InternalFSM.g:7439:2: rule__MessageFromIf__FromAssignment_2
             {
-            pushFollow(FOLLOW_rule__MessageFromIf__FromAssignment_2_in_rule__MessageFromIf__Group__2__Impl15059);
+            pushFollow(FOLLOW_2);
             rule__MessageFromIf__FromAssignment_2();
 
             state._fsp--;
@@ -20451,21 +20451,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Guard__Group__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7452:1: rule__Guard__Group__0 : rule__Guard__Group__0__Impl rule__Guard__Group__1 ;
+    // InternalFSM.g:7455:1: rule__Guard__Group__0 : rule__Guard__Group__0__Impl rule__Guard__Group__1 ;
     public final void rule__Guard__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7456:1: ( rule__Guard__Group__0__Impl rule__Guard__Group__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7457:2: rule__Guard__Group__0__Impl rule__Guard__Group__1
+            // InternalFSM.g:7459:1: ( rule__Guard__Group__0__Impl rule__Guard__Group__1 )
+            // InternalFSM.g:7460:2: rule__Guard__Group__0__Impl rule__Guard__Group__1
             {
-            pushFollow(FOLLOW_rule__Guard__Group__0__Impl_in_rule__Guard__Group__015095);
+            pushFollow(FOLLOW_7);
             rule__Guard__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Guard__Group__1_in_rule__Guard__Group__015098);
+            pushFollow(FOLLOW_2);
             rule__Guard__Group__1();
 
             state._fsp--;
@@ -20489,20 +20489,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Guard__Group__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7464:1: rule__Guard__Group__0__Impl : ( 'guard' ) ;
+    // InternalFSM.g:7467:1: rule__Guard__Group__0__Impl : ( 'guard' ) ;
     public final void rule__Guard__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7468:1: ( ( 'guard' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7469:1: ( 'guard' )
+            // InternalFSM.g:7471:1: ( ( 'guard' ) )
+            // InternalFSM.g:7472:1: ( 'guard' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7469:1: ( 'guard' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7470:1: 'guard'
+            // InternalFSM.g:7472:1: ( 'guard' )
+            // InternalFSM.g:7473:1: 'guard'
             {
              before(grammarAccess.getGuardAccess().getGuardKeyword_0()); 
-            match(input,48,FOLLOW_48_in_rule__Guard__Group__0__Impl15126); 
+            match(input,48,FOLLOW_2); 
              after(grammarAccess.getGuardAccess().getGuardKeyword_0()); 
 
             }
@@ -20526,16 +20526,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Guard__Group__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7483:1: rule__Guard__Group__1 : rule__Guard__Group__1__Impl ;
+    // InternalFSM.g:7486:1: rule__Guard__Group__1 : rule__Guard__Group__1__Impl ;
     public final void rule__Guard__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7487:1: ( rule__Guard__Group__1__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7488:2: rule__Guard__Group__1__Impl
+            // InternalFSM.g:7490:1: ( rule__Guard__Group__1__Impl )
+            // InternalFSM.g:7491:2: rule__Guard__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__Guard__Group__1__Impl_in_rule__Guard__Group__115157);
+            pushFollow(FOLLOW_2);
             rule__Guard__Group__1__Impl();
 
             state._fsp--;
@@ -20559,23 +20559,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Guard__Group__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7494:1: rule__Guard__Group__1__Impl : ( ( rule__Guard__GuardAssignment_1 ) ) ;
+    // InternalFSM.g:7497:1: rule__Guard__Group__1__Impl : ( ( rule__Guard__GuardAssignment_1 ) ) ;
     public final void rule__Guard__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7498:1: ( ( ( rule__Guard__GuardAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7499:1: ( ( rule__Guard__GuardAssignment_1 ) )
+            // InternalFSM.g:7501:1: ( ( ( rule__Guard__GuardAssignment_1 ) ) )
+            // InternalFSM.g:7502:1: ( ( rule__Guard__GuardAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7499:1: ( ( rule__Guard__GuardAssignment_1 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7500:1: ( rule__Guard__GuardAssignment_1 )
+            // InternalFSM.g:7502:1: ( ( rule__Guard__GuardAssignment_1 ) )
+            // InternalFSM.g:7503:1: ( rule__Guard__GuardAssignment_1 )
             {
              before(grammarAccess.getGuardAccess().getGuardAssignment_1()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7501:1: ( rule__Guard__GuardAssignment_1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7501:2: rule__Guard__GuardAssignment_1
+            // InternalFSM.g:7504:1: ( rule__Guard__GuardAssignment_1 )
+            // InternalFSM.g:7504:2: rule__Guard__GuardAssignment_1
             {
-            pushFollow(FOLLOW_rule__Guard__GuardAssignment_1_in_rule__Guard__Group__1__Impl15184);
+            pushFollow(FOLLOW_2);
             rule__Guard__GuardAssignment_1();
 
             state._fsp--;
@@ -20606,21 +20606,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__Group__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7516:1: rule__InSemanticsRule__Group__0 : rule__InSemanticsRule__Group__0__Impl rule__InSemanticsRule__Group__1 ;
+    // InternalFSM.g:7519:1: rule__InSemanticsRule__Group__0 : rule__InSemanticsRule__Group__0__Impl rule__InSemanticsRule__Group__1 ;
     public final void rule__InSemanticsRule__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7520:1: ( rule__InSemanticsRule__Group__0__Impl rule__InSemanticsRule__Group__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7521:2: rule__InSemanticsRule__Group__0__Impl rule__InSemanticsRule__Group__1
+            // InternalFSM.g:7523:1: ( rule__InSemanticsRule__Group__0__Impl rule__InSemanticsRule__Group__1 )
+            // InternalFSM.g:7524:2: rule__InSemanticsRule__Group__0__Impl rule__InSemanticsRule__Group__1
             {
-            pushFollow(FOLLOW_rule__InSemanticsRule__Group__0__Impl_in_rule__InSemanticsRule__Group__015219);
+            pushFollow(FOLLOW_32);
             rule__InSemanticsRule__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__InSemanticsRule__Group__1_in_rule__InSemanticsRule__Group__015222);
+            pushFollow(FOLLOW_2);
             rule__InSemanticsRule__Group__1();
 
             state._fsp--;
@@ -20644,20 +20644,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__Group__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7528:1: rule__InSemanticsRule__Group__0__Impl : ( 'in' ) ;
+    // InternalFSM.g:7531:1: rule__InSemanticsRule__Group__0__Impl : ( 'in' ) ;
     public final void rule__InSemanticsRule__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7532:1: ( ( 'in' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7533:1: ( 'in' )
+            // InternalFSM.g:7535:1: ( ( 'in' ) )
+            // InternalFSM.g:7536:1: ( 'in' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7533:1: ( 'in' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7534:1: 'in'
+            // InternalFSM.g:7536:1: ( 'in' )
+            // InternalFSM.g:7537:1: 'in'
             {
              before(grammarAccess.getInSemanticsRuleAccess().getInKeyword_0()); 
-            match(input,57,FOLLOW_57_in_rule__InSemanticsRule__Group__0__Impl15250); 
+            match(input,57,FOLLOW_2); 
              after(grammarAccess.getInSemanticsRuleAccess().getInKeyword_0()); 
 
             }
@@ -20681,21 +20681,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__Group__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7547:1: rule__InSemanticsRule__Group__1 : rule__InSemanticsRule__Group__1__Impl rule__InSemanticsRule__Group__2 ;
+    // InternalFSM.g:7550:1: rule__InSemanticsRule__Group__1 : rule__InSemanticsRule__Group__1__Impl rule__InSemanticsRule__Group__2 ;
     public final void rule__InSemanticsRule__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7551:1: ( rule__InSemanticsRule__Group__1__Impl rule__InSemanticsRule__Group__2 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7552:2: rule__InSemanticsRule__Group__1__Impl rule__InSemanticsRule__Group__2
+            // InternalFSM.g:7554:1: ( rule__InSemanticsRule__Group__1__Impl rule__InSemanticsRule__Group__2 )
+            // InternalFSM.g:7555:2: rule__InSemanticsRule__Group__1__Impl rule__InSemanticsRule__Group__2
             {
-            pushFollow(FOLLOW_rule__InSemanticsRule__Group__1__Impl_in_rule__InSemanticsRule__Group__115281);
+            pushFollow(FOLLOW_5);
             rule__InSemanticsRule__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__InSemanticsRule__Group__2_in_rule__InSemanticsRule__Group__115284);
+            pushFollow(FOLLOW_2);
             rule__InSemanticsRule__Group__2();
 
             state._fsp--;
@@ -20719,20 +20719,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__Group__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7559:1: rule__InSemanticsRule__Group__1__Impl : ( ':' ) ;
+    // InternalFSM.g:7562:1: rule__InSemanticsRule__Group__1__Impl : ( ':' ) ;
     public final void rule__InSemanticsRule__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7563:1: ( ( ':' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7564:1: ( ':' )
+            // InternalFSM.g:7566:1: ( ( ':' ) )
+            // InternalFSM.g:7567:1: ( ':' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7564:1: ( ':' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7565:1: ':'
+            // InternalFSM.g:7567:1: ( ':' )
+            // InternalFSM.g:7568:1: ':'
             {
              before(grammarAccess.getInSemanticsRuleAccess().getColonKeyword_1()); 
-            match(input,42,FOLLOW_42_in_rule__InSemanticsRule__Group__1__Impl15312); 
+            match(input,42,FOLLOW_2); 
              after(grammarAccess.getInSemanticsRuleAccess().getColonKeyword_1()); 
 
             }
@@ -20756,21 +20756,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__Group__2"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7578:1: rule__InSemanticsRule__Group__2 : rule__InSemanticsRule__Group__2__Impl rule__InSemanticsRule__Group__3 ;
+    // InternalFSM.g:7581:1: rule__InSemanticsRule__Group__2 : rule__InSemanticsRule__Group__2__Impl rule__InSemanticsRule__Group__3 ;
     public final void rule__InSemanticsRule__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7582:1: ( rule__InSemanticsRule__Group__2__Impl rule__InSemanticsRule__Group__3 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7583:2: rule__InSemanticsRule__Group__2__Impl rule__InSemanticsRule__Group__3
+            // InternalFSM.g:7585:1: ( rule__InSemanticsRule__Group__2__Impl rule__InSemanticsRule__Group__3 )
+            // InternalFSM.g:7586:2: rule__InSemanticsRule__Group__2__Impl rule__InSemanticsRule__Group__3
             {
-            pushFollow(FOLLOW_rule__InSemanticsRule__Group__2__Impl_in_rule__InSemanticsRule__Group__215343);
+            pushFollow(FOLLOW_18);
             rule__InSemanticsRule__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__InSemanticsRule__Group__3_in_rule__InSemanticsRule__Group__215346);
+            pushFollow(FOLLOW_2);
             rule__InSemanticsRule__Group__3();
 
             state._fsp--;
@@ -20794,23 +20794,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__Group__2__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7590:1: rule__InSemanticsRule__Group__2__Impl : ( ( rule__InSemanticsRule__MsgAssignment_2 ) ) ;
+    // InternalFSM.g:7593:1: rule__InSemanticsRule__Group__2__Impl : ( ( rule__InSemanticsRule__MsgAssignment_2 ) ) ;
     public final void rule__InSemanticsRule__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7594:1: ( ( ( rule__InSemanticsRule__MsgAssignment_2 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7595:1: ( ( rule__InSemanticsRule__MsgAssignment_2 ) )
+            // InternalFSM.g:7597:1: ( ( ( rule__InSemanticsRule__MsgAssignment_2 ) ) )
+            // InternalFSM.g:7598:1: ( ( rule__InSemanticsRule__MsgAssignment_2 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7595:1: ( ( rule__InSemanticsRule__MsgAssignment_2 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7596:1: ( rule__InSemanticsRule__MsgAssignment_2 )
+            // InternalFSM.g:7598:1: ( ( rule__InSemanticsRule__MsgAssignment_2 ) )
+            // InternalFSM.g:7599:1: ( rule__InSemanticsRule__MsgAssignment_2 )
             {
              before(grammarAccess.getInSemanticsRuleAccess().getMsgAssignment_2()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7597:1: ( rule__InSemanticsRule__MsgAssignment_2 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7597:2: rule__InSemanticsRule__MsgAssignment_2
+            // InternalFSM.g:7600:1: ( rule__InSemanticsRule__MsgAssignment_2 )
+            // InternalFSM.g:7600:2: rule__InSemanticsRule__MsgAssignment_2
             {
-            pushFollow(FOLLOW_rule__InSemanticsRule__MsgAssignment_2_in_rule__InSemanticsRule__Group__2__Impl15373);
+            pushFollow(FOLLOW_2);
             rule__InSemanticsRule__MsgAssignment_2();
 
             state._fsp--;
@@ -20841,16 +20841,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__Group__3"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7607:1: rule__InSemanticsRule__Group__3 : rule__InSemanticsRule__Group__3__Impl ;
+    // InternalFSM.g:7610:1: rule__InSemanticsRule__Group__3 : rule__InSemanticsRule__Group__3__Impl ;
     public final void rule__InSemanticsRule__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7611:1: ( rule__InSemanticsRule__Group__3__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7612:2: rule__InSemanticsRule__Group__3__Impl
+            // InternalFSM.g:7614:1: ( rule__InSemanticsRule__Group__3__Impl )
+            // InternalFSM.g:7615:2: rule__InSemanticsRule__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__InSemanticsRule__Group__3__Impl_in_rule__InSemanticsRule__Group__315403);
+            pushFollow(FOLLOW_2);
             rule__InSemanticsRule__Group__3__Impl();
 
             state._fsp--;
@@ -20874,20 +20874,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__Group__3__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7618:1: rule__InSemanticsRule__Group__3__Impl : ( ( rule__InSemanticsRule__Group_3__0 )? ) ;
+    // InternalFSM.g:7621:1: rule__InSemanticsRule__Group__3__Impl : ( ( rule__InSemanticsRule__Group_3__0 )? ) ;
     public final void rule__InSemanticsRule__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7622:1: ( ( ( rule__InSemanticsRule__Group_3__0 )? ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7623:1: ( ( rule__InSemanticsRule__Group_3__0 )? )
+            // InternalFSM.g:7625:1: ( ( ( rule__InSemanticsRule__Group_3__0 )? ) )
+            // InternalFSM.g:7626:1: ( ( rule__InSemanticsRule__Group_3__0 )? )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7623:1: ( ( rule__InSemanticsRule__Group_3__0 )? )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7624:1: ( rule__InSemanticsRule__Group_3__0 )?
+            // InternalFSM.g:7626:1: ( ( rule__InSemanticsRule__Group_3__0 )? )
+            // InternalFSM.g:7627:1: ( rule__InSemanticsRule__Group_3__0 )?
             {
              before(grammarAccess.getInSemanticsRuleAccess().getGroup_3()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7625:1: ( rule__InSemanticsRule__Group_3__0 )?
+            // InternalFSM.g:7628:1: ( rule__InSemanticsRule__Group_3__0 )?
             int alt67=2;
             int LA67_0 = input.LA(1);
 
@@ -20896,9 +20896,9 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt67) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7625:2: rule__InSemanticsRule__Group_3__0
+                    // InternalFSM.g:7628:2: rule__InSemanticsRule__Group_3__0
                     {
-                    pushFollow(FOLLOW_rule__InSemanticsRule__Group_3__0_in_rule__InSemanticsRule__Group__3__Impl15430);
+                    pushFollow(FOLLOW_2);
                     rule__InSemanticsRule__Group_3__0();
 
                     state._fsp--;
@@ -20932,21 +20932,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__Group_3__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7643:1: rule__InSemanticsRule__Group_3__0 : rule__InSemanticsRule__Group_3__0__Impl rule__InSemanticsRule__Group_3__1 ;
+    // InternalFSM.g:7646:1: rule__InSemanticsRule__Group_3__0 : rule__InSemanticsRule__Group_3__0__Impl rule__InSemanticsRule__Group_3__1 ;
     public final void rule__InSemanticsRule__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7647:1: ( rule__InSemanticsRule__Group_3__0__Impl rule__InSemanticsRule__Group_3__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7648:2: rule__InSemanticsRule__Group_3__0__Impl rule__InSemanticsRule__Group_3__1
+            // InternalFSM.g:7650:1: ( rule__InSemanticsRule__Group_3__0__Impl rule__InSemanticsRule__Group_3__1 )
+            // InternalFSM.g:7651:2: rule__InSemanticsRule__Group_3__0__Impl rule__InSemanticsRule__Group_3__1
             {
-            pushFollow(FOLLOW_rule__InSemanticsRule__Group_3__0__Impl_in_rule__InSemanticsRule__Group_3__015469);
+            pushFollow(FOLLOW_33);
             rule__InSemanticsRule__Group_3__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__InSemanticsRule__Group_3__1_in_rule__InSemanticsRule__Group_3__015472);
+            pushFollow(FOLLOW_2);
             rule__InSemanticsRule__Group_3__1();
 
             state._fsp--;
@@ -20970,20 +20970,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__Group_3__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7655:1: rule__InSemanticsRule__Group_3__0__Impl : ( '->' ) ;
+    // InternalFSM.g:7658:1: rule__InSemanticsRule__Group_3__0__Impl : ( '->' ) ;
     public final void rule__InSemanticsRule__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7659:1: ( ( '->' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7660:1: ( '->' )
+            // InternalFSM.g:7662:1: ( ( '->' ) )
+            // InternalFSM.g:7663:1: ( '->' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7660:1: ( '->' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7661:1: '->'
+            // InternalFSM.g:7663:1: ( '->' )
+            // InternalFSM.g:7664:1: '->'
             {
              before(grammarAccess.getInSemanticsRuleAccess().getHyphenMinusGreaterThanSignKeyword_3_0()); 
-            match(input,44,FOLLOW_44_in_rule__InSemanticsRule__Group_3__0__Impl15500); 
+            match(input,44,FOLLOW_2); 
              after(grammarAccess.getInSemanticsRuleAccess().getHyphenMinusGreaterThanSignKeyword_3_0()); 
 
             }
@@ -21007,16 +21007,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__Group_3__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7674:1: rule__InSemanticsRule__Group_3__1 : rule__InSemanticsRule__Group_3__1__Impl ;
+    // InternalFSM.g:7677:1: rule__InSemanticsRule__Group_3__1 : rule__InSemanticsRule__Group_3__1__Impl ;
     public final void rule__InSemanticsRule__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7678:1: ( rule__InSemanticsRule__Group_3__1__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7679:2: rule__InSemanticsRule__Group_3__1__Impl
+            // InternalFSM.g:7681:1: ( rule__InSemanticsRule__Group_3__1__Impl )
+            // InternalFSM.g:7682:2: rule__InSemanticsRule__Group_3__1__Impl
             {
-            pushFollow(FOLLOW_rule__InSemanticsRule__Group_3__1__Impl_in_rule__InSemanticsRule__Group_3__115531);
+            pushFollow(FOLLOW_2);
             rule__InSemanticsRule__Group_3__1__Impl();
 
             state._fsp--;
@@ -21040,23 +21040,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__Group_3__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7685:1: rule__InSemanticsRule__Group_3__1__Impl : ( ( rule__InSemanticsRule__Alternatives_3_1 ) ) ;
+    // InternalFSM.g:7688:1: rule__InSemanticsRule__Group_3__1__Impl : ( ( rule__InSemanticsRule__Alternatives_3_1 ) ) ;
     public final void rule__InSemanticsRule__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7689:1: ( ( ( rule__InSemanticsRule__Alternatives_3_1 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7690:1: ( ( rule__InSemanticsRule__Alternatives_3_1 ) )
+            // InternalFSM.g:7692:1: ( ( ( rule__InSemanticsRule__Alternatives_3_1 ) ) )
+            // InternalFSM.g:7693:1: ( ( rule__InSemanticsRule__Alternatives_3_1 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7690:1: ( ( rule__InSemanticsRule__Alternatives_3_1 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7691:1: ( rule__InSemanticsRule__Alternatives_3_1 )
+            // InternalFSM.g:7693:1: ( ( rule__InSemanticsRule__Alternatives_3_1 ) )
+            // InternalFSM.g:7694:1: ( rule__InSemanticsRule__Alternatives_3_1 )
             {
              before(grammarAccess.getInSemanticsRuleAccess().getAlternatives_3_1()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7692:1: ( rule__InSemanticsRule__Alternatives_3_1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7692:2: rule__InSemanticsRule__Alternatives_3_1
+            // InternalFSM.g:7695:1: ( rule__InSemanticsRule__Alternatives_3_1 )
+            // InternalFSM.g:7695:2: rule__InSemanticsRule__Alternatives_3_1
             {
-            pushFollow(FOLLOW_rule__InSemanticsRule__Alternatives_3_1_in_rule__InSemanticsRule__Group_3__1__Impl15558);
+            pushFollow(FOLLOW_2);
             rule__InSemanticsRule__Alternatives_3_1();
 
             state._fsp--;
@@ -21087,21 +21087,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__Group_3_1_1__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7706:1: rule__InSemanticsRule__Group_3_1_1__0 : rule__InSemanticsRule__Group_3_1_1__0__Impl rule__InSemanticsRule__Group_3_1_1__1 ;
+    // InternalFSM.g:7709:1: rule__InSemanticsRule__Group_3_1_1__0 : rule__InSemanticsRule__Group_3_1_1__0__Impl rule__InSemanticsRule__Group_3_1_1__1 ;
     public final void rule__InSemanticsRule__Group_3_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7710:1: ( rule__InSemanticsRule__Group_3_1_1__0__Impl rule__InSemanticsRule__Group_3_1_1__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7711:2: rule__InSemanticsRule__Group_3_1_1__0__Impl rule__InSemanticsRule__Group_3_1_1__1
+            // InternalFSM.g:7713:1: ( rule__InSemanticsRule__Group_3_1_1__0__Impl rule__InSemanticsRule__Group_3_1_1__1 )
+            // InternalFSM.g:7714:2: rule__InSemanticsRule__Group_3_1_1__0__Impl rule__InSemanticsRule__Group_3_1_1__1
             {
-            pushFollow(FOLLOW_rule__InSemanticsRule__Group_3_1_1__0__Impl_in_rule__InSemanticsRule__Group_3_1_1__015592);
+            pushFollow(FOLLOW_34);
             rule__InSemanticsRule__Group_3_1_1__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__InSemanticsRule__Group_3_1_1__1_in_rule__InSemanticsRule__Group_3_1_1__015595);
+            pushFollow(FOLLOW_2);
             rule__InSemanticsRule__Group_3_1_1__1();
 
             state._fsp--;
@@ -21125,20 +21125,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__Group_3_1_1__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7718:1: rule__InSemanticsRule__Group_3_1_1__0__Impl : ( '(' ) ;
+    // InternalFSM.g:7721:1: rule__InSemanticsRule__Group_3_1_1__0__Impl : ( '(' ) ;
     public final void rule__InSemanticsRule__Group_3_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7722:1: ( ( '(' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7723:1: ( '(' )
+            // InternalFSM.g:7725:1: ( ( '(' ) )
+            // InternalFSM.g:7726:1: ( '(' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7723:1: ( '(' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7724:1: '('
+            // InternalFSM.g:7726:1: ( '(' )
+            // InternalFSM.g:7727:1: '('
             {
              before(grammarAccess.getInSemanticsRuleAccess().getLeftParenthesisKeyword_3_1_1_0()); 
-            match(input,58,FOLLOW_58_in_rule__InSemanticsRule__Group_3_1_1__0__Impl15623); 
+            match(input,58,FOLLOW_2); 
              after(grammarAccess.getInSemanticsRuleAccess().getLeftParenthesisKeyword_3_1_1_0()); 
 
             }
@@ -21162,21 +21162,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__Group_3_1_1__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7737:1: rule__InSemanticsRule__Group_3_1_1__1 : rule__InSemanticsRule__Group_3_1_1__1__Impl rule__InSemanticsRule__Group_3_1_1__2 ;
+    // InternalFSM.g:7740:1: rule__InSemanticsRule__Group_3_1_1__1 : rule__InSemanticsRule__Group_3_1_1__1__Impl rule__InSemanticsRule__Group_3_1_1__2 ;
     public final void rule__InSemanticsRule__Group_3_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7741:1: ( rule__InSemanticsRule__Group_3_1_1__1__Impl rule__InSemanticsRule__Group_3_1_1__2 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7742:2: rule__InSemanticsRule__Group_3_1_1__1__Impl rule__InSemanticsRule__Group_3_1_1__2
+            // InternalFSM.g:7744:1: ( rule__InSemanticsRule__Group_3_1_1__1__Impl rule__InSemanticsRule__Group_3_1_1__2 )
+            // InternalFSM.g:7745:2: rule__InSemanticsRule__Group_3_1_1__1__Impl rule__InSemanticsRule__Group_3_1_1__2
             {
-            pushFollow(FOLLOW_rule__InSemanticsRule__Group_3_1_1__1__Impl_in_rule__InSemanticsRule__Group_3_1_1__115654);
+            pushFollow(FOLLOW_35);
             rule__InSemanticsRule__Group_3_1_1__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__InSemanticsRule__Group_3_1_1__2_in_rule__InSemanticsRule__Group_3_1_1__115657);
+            pushFollow(FOLLOW_2);
             rule__InSemanticsRule__Group_3_1_1__2();
 
             state._fsp--;
@@ -21200,23 +21200,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__Group_3_1_1__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7749:1: rule__InSemanticsRule__Group_3_1_1__1__Impl : ( ( rule__InSemanticsRule__FollowUpsAssignment_3_1_1_1 ) ) ;
+    // InternalFSM.g:7752:1: rule__InSemanticsRule__Group_3_1_1__1__Impl : ( ( rule__InSemanticsRule__FollowUpsAssignment_3_1_1_1 ) ) ;
     public final void rule__InSemanticsRule__Group_3_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7753:1: ( ( ( rule__InSemanticsRule__FollowUpsAssignment_3_1_1_1 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7754:1: ( ( rule__InSemanticsRule__FollowUpsAssignment_3_1_1_1 ) )
+            // InternalFSM.g:7756:1: ( ( ( rule__InSemanticsRule__FollowUpsAssignment_3_1_1_1 ) ) )
+            // InternalFSM.g:7757:1: ( ( rule__InSemanticsRule__FollowUpsAssignment_3_1_1_1 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7754:1: ( ( rule__InSemanticsRule__FollowUpsAssignment_3_1_1_1 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7755:1: ( rule__InSemanticsRule__FollowUpsAssignment_3_1_1_1 )
+            // InternalFSM.g:7757:1: ( ( rule__InSemanticsRule__FollowUpsAssignment_3_1_1_1 ) )
+            // InternalFSM.g:7758:1: ( rule__InSemanticsRule__FollowUpsAssignment_3_1_1_1 )
             {
              before(grammarAccess.getInSemanticsRuleAccess().getFollowUpsAssignment_3_1_1_1()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7756:1: ( rule__InSemanticsRule__FollowUpsAssignment_3_1_1_1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7756:2: rule__InSemanticsRule__FollowUpsAssignment_3_1_1_1
+            // InternalFSM.g:7759:1: ( rule__InSemanticsRule__FollowUpsAssignment_3_1_1_1 )
+            // InternalFSM.g:7759:2: rule__InSemanticsRule__FollowUpsAssignment_3_1_1_1
             {
-            pushFollow(FOLLOW_rule__InSemanticsRule__FollowUpsAssignment_3_1_1_1_in_rule__InSemanticsRule__Group_3_1_1__1__Impl15684);
+            pushFollow(FOLLOW_2);
             rule__InSemanticsRule__FollowUpsAssignment_3_1_1_1();
 
             state._fsp--;
@@ -21247,21 +21247,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__Group_3_1_1__2"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7766:1: rule__InSemanticsRule__Group_3_1_1__2 : rule__InSemanticsRule__Group_3_1_1__2__Impl rule__InSemanticsRule__Group_3_1_1__3 ;
+    // InternalFSM.g:7769:1: rule__InSemanticsRule__Group_3_1_1__2 : rule__InSemanticsRule__Group_3_1_1__2__Impl rule__InSemanticsRule__Group_3_1_1__3 ;
     public final void rule__InSemanticsRule__Group_3_1_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7770:1: ( rule__InSemanticsRule__Group_3_1_1__2__Impl rule__InSemanticsRule__Group_3_1_1__3 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7771:2: rule__InSemanticsRule__Group_3_1_1__2__Impl rule__InSemanticsRule__Group_3_1_1__3
+            // InternalFSM.g:7773:1: ( rule__InSemanticsRule__Group_3_1_1__2__Impl rule__InSemanticsRule__Group_3_1_1__3 )
+            // InternalFSM.g:7774:2: rule__InSemanticsRule__Group_3_1_1__2__Impl rule__InSemanticsRule__Group_3_1_1__3
             {
-            pushFollow(FOLLOW_rule__InSemanticsRule__Group_3_1_1__2__Impl_in_rule__InSemanticsRule__Group_3_1_1__215714);
+            pushFollow(FOLLOW_36);
             rule__InSemanticsRule__Group_3_1_1__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__InSemanticsRule__Group_3_1_1__3_in_rule__InSemanticsRule__Group_3_1_1__215717);
+            pushFollow(FOLLOW_2);
             rule__InSemanticsRule__Group_3_1_1__3();
 
             state._fsp--;
@@ -21285,26 +21285,26 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__Group_3_1_1__2__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7778:1: rule__InSemanticsRule__Group_3_1_1__2__Impl : ( ( ( rule__InSemanticsRule__Group_3_1_1_2__0 ) ) ( ( rule__InSemanticsRule__Group_3_1_1_2__0 )* ) ) ;
+    // InternalFSM.g:7781:1: rule__InSemanticsRule__Group_3_1_1__2__Impl : ( ( ( rule__InSemanticsRule__Group_3_1_1_2__0 ) ) ( ( rule__InSemanticsRule__Group_3_1_1_2__0 )* ) ) ;
     public final void rule__InSemanticsRule__Group_3_1_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7782:1: ( ( ( ( rule__InSemanticsRule__Group_3_1_1_2__0 ) ) ( ( rule__InSemanticsRule__Group_3_1_1_2__0 )* ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7783:1: ( ( ( rule__InSemanticsRule__Group_3_1_1_2__0 ) ) ( ( rule__InSemanticsRule__Group_3_1_1_2__0 )* ) )
+            // InternalFSM.g:7785:1: ( ( ( ( rule__InSemanticsRule__Group_3_1_1_2__0 ) ) ( ( rule__InSemanticsRule__Group_3_1_1_2__0 )* ) ) )
+            // InternalFSM.g:7786:1: ( ( ( rule__InSemanticsRule__Group_3_1_1_2__0 ) ) ( ( rule__InSemanticsRule__Group_3_1_1_2__0 )* ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7783:1: ( ( ( rule__InSemanticsRule__Group_3_1_1_2__0 ) ) ( ( rule__InSemanticsRule__Group_3_1_1_2__0 )* ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7784:1: ( ( rule__InSemanticsRule__Group_3_1_1_2__0 ) ) ( ( rule__InSemanticsRule__Group_3_1_1_2__0 )* )
+            // InternalFSM.g:7786:1: ( ( ( rule__InSemanticsRule__Group_3_1_1_2__0 ) ) ( ( rule__InSemanticsRule__Group_3_1_1_2__0 )* ) )
+            // InternalFSM.g:7787:1: ( ( rule__InSemanticsRule__Group_3_1_1_2__0 ) ) ( ( rule__InSemanticsRule__Group_3_1_1_2__0 )* )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7784:1: ( ( rule__InSemanticsRule__Group_3_1_1_2__0 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7785:1: ( rule__InSemanticsRule__Group_3_1_1_2__0 )
+            // InternalFSM.g:7787:1: ( ( rule__InSemanticsRule__Group_3_1_1_2__0 ) )
+            // InternalFSM.g:7788:1: ( rule__InSemanticsRule__Group_3_1_1_2__0 )
             {
              before(grammarAccess.getInSemanticsRuleAccess().getGroup_3_1_1_2()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7786:1: ( rule__InSemanticsRule__Group_3_1_1_2__0 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7786:2: rule__InSemanticsRule__Group_3_1_1_2__0
+            // InternalFSM.g:7789:1: ( rule__InSemanticsRule__Group_3_1_1_2__0 )
+            // InternalFSM.g:7789:2: rule__InSemanticsRule__Group_3_1_1_2__0
             {
-            pushFollow(FOLLOW_rule__InSemanticsRule__Group_3_1_1_2__0_in_rule__InSemanticsRule__Group_3_1_1__2__Impl15746);
+            pushFollow(FOLLOW_37);
             rule__InSemanticsRule__Group_3_1_1_2__0();
 
             state._fsp--;
@@ -21316,11 +21316,11 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
             }
 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7789:1: ( ( rule__InSemanticsRule__Group_3_1_1_2__0 )* )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7790:1: ( rule__InSemanticsRule__Group_3_1_1_2__0 )*
+            // InternalFSM.g:7792:1: ( ( rule__InSemanticsRule__Group_3_1_1_2__0 )* )
+            // InternalFSM.g:7793:1: ( rule__InSemanticsRule__Group_3_1_1_2__0 )*
             {
              before(grammarAccess.getInSemanticsRuleAccess().getGroup_3_1_1_2()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7791:1: ( rule__InSemanticsRule__Group_3_1_1_2__0 )*
+            // InternalFSM.g:7794:1: ( rule__InSemanticsRule__Group_3_1_1_2__0 )*
             loop68:
             do {
                 int alt68=2;
@@ -21333,9 +21333,9 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
                 switch (alt68) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7791:2: rule__InSemanticsRule__Group_3_1_1_2__0
+            	    // InternalFSM.g:7794:2: rule__InSemanticsRule__Group_3_1_1_2__0
             	    {
-            	    pushFollow(FOLLOW_rule__InSemanticsRule__Group_3_1_1_2__0_in_rule__InSemanticsRule__Group_3_1_1__2__Impl15758);
+            	    pushFollow(FOLLOW_37);
             	    rule__InSemanticsRule__Group_3_1_1_2__0();
 
             	    state._fsp--;
@@ -21375,16 +21375,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__Group_3_1_1__3"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7802:1: rule__InSemanticsRule__Group_3_1_1__3 : rule__InSemanticsRule__Group_3_1_1__3__Impl ;
+    // InternalFSM.g:7805:1: rule__InSemanticsRule__Group_3_1_1__3 : rule__InSemanticsRule__Group_3_1_1__3__Impl ;
     public final void rule__InSemanticsRule__Group_3_1_1__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7806:1: ( rule__InSemanticsRule__Group_3_1_1__3__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7807:2: rule__InSemanticsRule__Group_3_1_1__3__Impl
+            // InternalFSM.g:7809:1: ( rule__InSemanticsRule__Group_3_1_1__3__Impl )
+            // InternalFSM.g:7810:2: rule__InSemanticsRule__Group_3_1_1__3__Impl
             {
-            pushFollow(FOLLOW_rule__InSemanticsRule__Group_3_1_1__3__Impl_in_rule__InSemanticsRule__Group_3_1_1__315791);
+            pushFollow(FOLLOW_2);
             rule__InSemanticsRule__Group_3_1_1__3__Impl();
 
             state._fsp--;
@@ -21408,20 +21408,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__Group_3_1_1__3__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7813:1: rule__InSemanticsRule__Group_3_1_1__3__Impl : ( ')' ) ;
+    // InternalFSM.g:7816:1: rule__InSemanticsRule__Group_3_1_1__3__Impl : ( ')' ) ;
     public final void rule__InSemanticsRule__Group_3_1_1__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7817:1: ( ( ')' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7818:1: ( ')' )
+            // InternalFSM.g:7820:1: ( ( ')' ) )
+            // InternalFSM.g:7821:1: ( ')' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7818:1: ( ')' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7819:1: ')'
+            // InternalFSM.g:7821:1: ( ')' )
+            // InternalFSM.g:7822:1: ')'
             {
              before(grammarAccess.getInSemanticsRuleAccess().getRightParenthesisKeyword_3_1_1_3()); 
-            match(input,59,FOLLOW_59_in_rule__InSemanticsRule__Group_3_1_1__3__Impl15819); 
+            match(input,59,FOLLOW_2); 
              after(grammarAccess.getInSemanticsRuleAccess().getRightParenthesisKeyword_3_1_1_3()); 
 
             }
@@ -21445,21 +21445,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__Group_3_1_1_2__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7840:1: rule__InSemanticsRule__Group_3_1_1_2__0 : rule__InSemanticsRule__Group_3_1_1_2__0__Impl rule__InSemanticsRule__Group_3_1_1_2__1 ;
+    // InternalFSM.g:7843:1: rule__InSemanticsRule__Group_3_1_1_2__0 : rule__InSemanticsRule__Group_3_1_1_2__0__Impl rule__InSemanticsRule__Group_3_1_1_2__1 ;
     public final void rule__InSemanticsRule__Group_3_1_1_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7844:1: ( rule__InSemanticsRule__Group_3_1_1_2__0__Impl rule__InSemanticsRule__Group_3_1_1_2__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7845:2: rule__InSemanticsRule__Group_3_1_1_2__0__Impl rule__InSemanticsRule__Group_3_1_1_2__1
+            // InternalFSM.g:7847:1: ( rule__InSemanticsRule__Group_3_1_1_2__0__Impl rule__InSemanticsRule__Group_3_1_1_2__1 )
+            // InternalFSM.g:7848:2: rule__InSemanticsRule__Group_3_1_1_2__0__Impl rule__InSemanticsRule__Group_3_1_1_2__1
             {
-            pushFollow(FOLLOW_rule__InSemanticsRule__Group_3_1_1_2__0__Impl_in_rule__InSemanticsRule__Group_3_1_1_2__015858);
+            pushFollow(FOLLOW_34);
             rule__InSemanticsRule__Group_3_1_1_2__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__InSemanticsRule__Group_3_1_1_2__1_in_rule__InSemanticsRule__Group_3_1_1_2__015861);
+            pushFollow(FOLLOW_2);
             rule__InSemanticsRule__Group_3_1_1_2__1();
 
             state._fsp--;
@@ -21483,20 +21483,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__Group_3_1_1_2__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7852:1: rule__InSemanticsRule__Group_3_1_1_2__0__Impl : ( ',' ) ;
+    // InternalFSM.g:7855:1: rule__InSemanticsRule__Group_3_1_1_2__0__Impl : ( ',' ) ;
     public final void rule__InSemanticsRule__Group_3_1_1_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7856:1: ( ( ',' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7857:1: ( ',' )
+            // InternalFSM.g:7859:1: ( ( ',' ) )
+            // InternalFSM.g:7860:1: ( ',' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7857:1: ( ',' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7858:1: ','
+            // InternalFSM.g:7860:1: ( ',' )
+            // InternalFSM.g:7861:1: ','
             {
              before(grammarAccess.getInSemanticsRuleAccess().getCommaKeyword_3_1_1_2_0()); 
-            match(input,60,FOLLOW_60_in_rule__InSemanticsRule__Group_3_1_1_2__0__Impl15889); 
+            match(input,60,FOLLOW_2); 
              after(grammarAccess.getInSemanticsRuleAccess().getCommaKeyword_3_1_1_2_0()); 
 
             }
@@ -21520,16 +21520,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__Group_3_1_1_2__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7871:1: rule__InSemanticsRule__Group_3_1_1_2__1 : rule__InSemanticsRule__Group_3_1_1_2__1__Impl ;
+    // InternalFSM.g:7874:1: rule__InSemanticsRule__Group_3_1_1_2__1 : rule__InSemanticsRule__Group_3_1_1_2__1__Impl ;
     public final void rule__InSemanticsRule__Group_3_1_1_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7875:1: ( rule__InSemanticsRule__Group_3_1_1_2__1__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7876:2: rule__InSemanticsRule__Group_3_1_1_2__1__Impl
+            // InternalFSM.g:7878:1: ( rule__InSemanticsRule__Group_3_1_1_2__1__Impl )
+            // InternalFSM.g:7879:2: rule__InSemanticsRule__Group_3_1_1_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__InSemanticsRule__Group_3_1_1_2__1__Impl_in_rule__InSemanticsRule__Group_3_1_1_2__115920);
+            pushFollow(FOLLOW_2);
             rule__InSemanticsRule__Group_3_1_1_2__1__Impl();
 
             state._fsp--;
@@ -21553,23 +21553,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__Group_3_1_1_2__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7882:1: rule__InSemanticsRule__Group_3_1_1_2__1__Impl : ( ( rule__InSemanticsRule__FollowUpsAssignment_3_1_1_2_1 ) ) ;
+    // InternalFSM.g:7885:1: rule__InSemanticsRule__Group_3_1_1_2__1__Impl : ( ( rule__InSemanticsRule__FollowUpsAssignment_3_1_1_2_1 ) ) ;
     public final void rule__InSemanticsRule__Group_3_1_1_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7886:1: ( ( ( rule__InSemanticsRule__FollowUpsAssignment_3_1_1_2_1 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7887:1: ( ( rule__InSemanticsRule__FollowUpsAssignment_3_1_1_2_1 ) )
+            // InternalFSM.g:7889:1: ( ( ( rule__InSemanticsRule__FollowUpsAssignment_3_1_1_2_1 ) ) )
+            // InternalFSM.g:7890:1: ( ( rule__InSemanticsRule__FollowUpsAssignment_3_1_1_2_1 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7887:1: ( ( rule__InSemanticsRule__FollowUpsAssignment_3_1_1_2_1 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7888:1: ( rule__InSemanticsRule__FollowUpsAssignment_3_1_1_2_1 )
+            // InternalFSM.g:7890:1: ( ( rule__InSemanticsRule__FollowUpsAssignment_3_1_1_2_1 ) )
+            // InternalFSM.g:7891:1: ( rule__InSemanticsRule__FollowUpsAssignment_3_1_1_2_1 )
             {
              before(grammarAccess.getInSemanticsRuleAccess().getFollowUpsAssignment_3_1_1_2_1()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7889:1: ( rule__InSemanticsRule__FollowUpsAssignment_3_1_1_2_1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7889:2: rule__InSemanticsRule__FollowUpsAssignment_3_1_1_2_1
+            // InternalFSM.g:7892:1: ( rule__InSemanticsRule__FollowUpsAssignment_3_1_1_2_1 )
+            // InternalFSM.g:7892:2: rule__InSemanticsRule__FollowUpsAssignment_3_1_1_2_1
             {
-            pushFollow(FOLLOW_rule__InSemanticsRule__FollowUpsAssignment_3_1_1_2_1_in_rule__InSemanticsRule__Group_3_1_1_2__1__Impl15947);
+            pushFollow(FOLLOW_2);
             rule__InSemanticsRule__FollowUpsAssignment_3_1_1_2_1();
 
             state._fsp--;
@@ -21600,21 +21600,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__Group__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7903:1: rule__OutSemanticsRule__Group__0 : rule__OutSemanticsRule__Group__0__Impl rule__OutSemanticsRule__Group__1 ;
+    // InternalFSM.g:7906:1: rule__OutSemanticsRule__Group__0 : rule__OutSemanticsRule__Group__0__Impl rule__OutSemanticsRule__Group__1 ;
     public final void rule__OutSemanticsRule__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7907:1: ( rule__OutSemanticsRule__Group__0__Impl rule__OutSemanticsRule__Group__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7908:2: rule__OutSemanticsRule__Group__0__Impl rule__OutSemanticsRule__Group__1
+            // InternalFSM.g:7910:1: ( rule__OutSemanticsRule__Group__0__Impl rule__OutSemanticsRule__Group__1 )
+            // InternalFSM.g:7911:2: rule__OutSemanticsRule__Group__0__Impl rule__OutSemanticsRule__Group__1
             {
-            pushFollow(FOLLOW_rule__OutSemanticsRule__Group__0__Impl_in_rule__OutSemanticsRule__Group__015981);
+            pushFollow(FOLLOW_32);
             rule__OutSemanticsRule__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__OutSemanticsRule__Group__1_in_rule__OutSemanticsRule__Group__015984);
+            pushFollow(FOLLOW_2);
             rule__OutSemanticsRule__Group__1();
 
             state._fsp--;
@@ -21638,20 +21638,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__Group__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7915:1: rule__OutSemanticsRule__Group__0__Impl : ( 'out' ) ;
+    // InternalFSM.g:7918:1: rule__OutSemanticsRule__Group__0__Impl : ( 'out' ) ;
     public final void rule__OutSemanticsRule__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7919:1: ( ( 'out' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7920:1: ( 'out' )
+            // InternalFSM.g:7922:1: ( ( 'out' ) )
+            // InternalFSM.g:7923:1: ( 'out' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7920:1: ( 'out' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7921:1: 'out'
+            // InternalFSM.g:7923:1: ( 'out' )
+            // InternalFSM.g:7924:1: 'out'
             {
              before(grammarAccess.getOutSemanticsRuleAccess().getOutKeyword_0()); 
-            match(input,61,FOLLOW_61_in_rule__OutSemanticsRule__Group__0__Impl16012); 
+            match(input,61,FOLLOW_2); 
              after(grammarAccess.getOutSemanticsRuleAccess().getOutKeyword_0()); 
 
             }
@@ -21675,21 +21675,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__Group__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7934:1: rule__OutSemanticsRule__Group__1 : rule__OutSemanticsRule__Group__1__Impl rule__OutSemanticsRule__Group__2 ;
+    // InternalFSM.g:7937:1: rule__OutSemanticsRule__Group__1 : rule__OutSemanticsRule__Group__1__Impl rule__OutSemanticsRule__Group__2 ;
     public final void rule__OutSemanticsRule__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7938:1: ( rule__OutSemanticsRule__Group__1__Impl rule__OutSemanticsRule__Group__2 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7939:2: rule__OutSemanticsRule__Group__1__Impl rule__OutSemanticsRule__Group__2
+            // InternalFSM.g:7941:1: ( rule__OutSemanticsRule__Group__1__Impl rule__OutSemanticsRule__Group__2 )
+            // InternalFSM.g:7942:2: rule__OutSemanticsRule__Group__1__Impl rule__OutSemanticsRule__Group__2
             {
-            pushFollow(FOLLOW_rule__OutSemanticsRule__Group__1__Impl_in_rule__OutSemanticsRule__Group__116043);
+            pushFollow(FOLLOW_5);
             rule__OutSemanticsRule__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__OutSemanticsRule__Group__2_in_rule__OutSemanticsRule__Group__116046);
+            pushFollow(FOLLOW_2);
             rule__OutSemanticsRule__Group__2();
 
             state._fsp--;
@@ -21713,20 +21713,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__Group__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7946:1: rule__OutSemanticsRule__Group__1__Impl : ( ':' ) ;
+    // InternalFSM.g:7949:1: rule__OutSemanticsRule__Group__1__Impl : ( ':' ) ;
     public final void rule__OutSemanticsRule__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7950:1: ( ( ':' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7951:1: ( ':' )
+            // InternalFSM.g:7953:1: ( ( ':' ) )
+            // InternalFSM.g:7954:1: ( ':' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7951:1: ( ':' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7952:1: ':'
+            // InternalFSM.g:7954:1: ( ':' )
+            // InternalFSM.g:7955:1: ':'
             {
              before(grammarAccess.getOutSemanticsRuleAccess().getColonKeyword_1()); 
-            match(input,42,FOLLOW_42_in_rule__OutSemanticsRule__Group__1__Impl16074); 
+            match(input,42,FOLLOW_2); 
              after(grammarAccess.getOutSemanticsRuleAccess().getColonKeyword_1()); 
 
             }
@@ -21750,21 +21750,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__Group__2"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7965:1: rule__OutSemanticsRule__Group__2 : rule__OutSemanticsRule__Group__2__Impl rule__OutSemanticsRule__Group__3 ;
+    // InternalFSM.g:7968:1: rule__OutSemanticsRule__Group__2 : rule__OutSemanticsRule__Group__2__Impl rule__OutSemanticsRule__Group__3 ;
     public final void rule__OutSemanticsRule__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7969:1: ( rule__OutSemanticsRule__Group__2__Impl rule__OutSemanticsRule__Group__3 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7970:2: rule__OutSemanticsRule__Group__2__Impl rule__OutSemanticsRule__Group__3
+            // InternalFSM.g:7972:1: ( rule__OutSemanticsRule__Group__2__Impl rule__OutSemanticsRule__Group__3 )
+            // InternalFSM.g:7973:2: rule__OutSemanticsRule__Group__2__Impl rule__OutSemanticsRule__Group__3
             {
-            pushFollow(FOLLOW_rule__OutSemanticsRule__Group__2__Impl_in_rule__OutSemanticsRule__Group__216105);
+            pushFollow(FOLLOW_18);
             rule__OutSemanticsRule__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__OutSemanticsRule__Group__3_in_rule__OutSemanticsRule__Group__216108);
+            pushFollow(FOLLOW_2);
             rule__OutSemanticsRule__Group__3();
 
             state._fsp--;
@@ -21788,23 +21788,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__Group__2__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7977:1: rule__OutSemanticsRule__Group__2__Impl : ( ( rule__OutSemanticsRule__MsgAssignment_2 ) ) ;
+    // InternalFSM.g:7980:1: rule__OutSemanticsRule__Group__2__Impl : ( ( rule__OutSemanticsRule__MsgAssignment_2 ) ) ;
     public final void rule__OutSemanticsRule__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7981:1: ( ( ( rule__OutSemanticsRule__MsgAssignment_2 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7982:1: ( ( rule__OutSemanticsRule__MsgAssignment_2 ) )
+            // InternalFSM.g:7984:1: ( ( ( rule__OutSemanticsRule__MsgAssignment_2 ) ) )
+            // InternalFSM.g:7985:1: ( ( rule__OutSemanticsRule__MsgAssignment_2 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7982:1: ( ( rule__OutSemanticsRule__MsgAssignment_2 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7983:1: ( rule__OutSemanticsRule__MsgAssignment_2 )
+            // InternalFSM.g:7985:1: ( ( rule__OutSemanticsRule__MsgAssignment_2 ) )
+            // InternalFSM.g:7986:1: ( rule__OutSemanticsRule__MsgAssignment_2 )
             {
              before(grammarAccess.getOutSemanticsRuleAccess().getMsgAssignment_2()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7984:1: ( rule__OutSemanticsRule__MsgAssignment_2 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7984:2: rule__OutSemanticsRule__MsgAssignment_2
+            // InternalFSM.g:7987:1: ( rule__OutSemanticsRule__MsgAssignment_2 )
+            // InternalFSM.g:7987:2: rule__OutSemanticsRule__MsgAssignment_2
             {
-            pushFollow(FOLLOW_rule__OutSemanticsRule__MsgAssignment_2_in_rule__OutSemanticsRule__Group__2__Impl16135);
+            pushFollow(FOLLOW_2);
             rule__OutSemanticsRule__MsgAssignment_2();
 
             state._fsp--;
@@ -21835,16 +21835,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__Group__3"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7994:1: rule__OutSemanticsRule__Group__3 : rule__OutSemanticsRule__Group__3__Impl ;
+    // InternalFSM.g:7997:1: rule__OutSemanticsRule__Group__3 : rule__OutSemanticsRule__Group__3__Impl ;
     public final void rule__OutSemanticsRule__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7998:1: ( rule__OutSemanticsRule__Group__3__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:7999:2: rule__OutSemanticsRule__Group__3__Impl
+            // InternalFSM.g:8001:1: ( rule__OutSemanticsRule__Group__3__Impl )
+            // InternalFSM.g:8002:2: rule__OutSemanticsRule__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__OutSemanticsRule__Group__3__Impl_in_rule__OutSemanticsRule__Group__316165);
+            pushFollow(FOLLOW_2);
             rule__OutSemanticsRule__Group__3__Impl();
 
             state._fsp--;
@@ -21868,20 +21868,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__Group__3__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8005:1: rule__OutSemanticsRule__Group__3__Impl : ( ( rule__OutSemanticsRule__Group_3__0 )? ) ;
+    // InternalFSM.g:8008:1: rule__OutSemanticsRule__Group__3__Impl : ( ( rule__OutSemanticsRule__Group_3__0 )? ) ;
     public final void rule__OutSemanticsRule__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8009:1: ( ( ( rule__OutSemanticsRule__Group_3__0 )? ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8010:1: ( ( rule__OutSemanticsRule__Group_3__0 )? )
+            // InternalFSM.g:8012:1: ( ( ( rule__OutSemanticsRule__Group_3__0 )? ) )
+            // InternalFSM.g:8013:1: ( ( rule__OutSemanticsRule__Group_3__0 )? )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8010:1: ( ( rule__OutSemanticsRule__Group_3__0 )? )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8011:1: ( rule__OutSemanticsRule__Group_3__0 )?
+            // InternalFSM.g:8013:1: ( ( rule__OutSemanticsRule__Group_3__0 )? )
+            // InternalFSM.g:8014:1: ( rule__OutSemanticsRule__Group_3__0 )?
             {
              before(grammarAccess.getOutSemanticsRuleAccess().getGroup_3()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8012:1: ( rule__OutSemanticsRule__Group_3__0 )?
+            // InternalFSM.g:8015:1: ( rule__OutSemanticsRule__Group_3__0 )?
             int alt69=2;
             int LA69_0 = input.LA(1);
 
@@ -21890,9 +21890,9 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt69) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8012:2: rule__OutSemanticsRule__Group_3__0
+                    // InternalFSM.g:8015:2: rule__OutSemanticsRule__Group_3__0
                     {
-                    pushFollow(FOLLOW_rule__OutSemanticsRule__Group_3__0_in_rule__OutSemanticsRule__Group__3__Impl16192);
+                    pushFollow(FOLLOW_2);
                     rule__OutSemanticsRule__Group_3__0();
 
                     state._fsp--;
@@ -21926,21 +21926,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__Group_3__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8030:1: rule__OutSemanticsRule__Group_3__0 : rule__OutSemanticsRule__Group_3__0__Impl rule__OutSemanticsRule__Group_3__1 ;
+    // InternalFSM.g:8033:1: rule__OutSemanticsRule__Group_3__0 : rule__OutSemanticsRule__Group_3__0__Impl rule__OutSemanticsRule__Group_3__1 ;
     public final void rule__OutSemanticsRule__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8034:1: ( rule__OutSemanticsRule__Group_3__0__Impl rule__OutSemanticsRule__Group_3__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8035:2: rule__OutSemanticsRule__Group_3__0__Impl rule__OutSemanticsRule__Group_3__1
+            // InternalFSM.g:8037:1: ( rule__OutSemanticsRule__Group_3__0__Impl rule__OutSemanticsRule__Group_3__1 )
+            // InternalFSM.g:8038:2: rule__OutSemanticsRule__Group_3__0__Impl rule__OutSemanticsRule__Group_3__1
             {
-            pushFollow(FOLLOW_rule__OutSemanticsRule__Group_3__0__Impl_in_rule__OutSemanticsRule__Group_3__016231);
+            pushFollow(FOLLOW_33);
             rule__OutSemanticsRule__Group_3__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__OutSemanticsRule__Group_3__1_in_rule__OutSemanticsRule__Group_3__016234);
+            pushFollow(FOLLOW_2);
             rule__OutSemanticsRule__Group_3__1();
 
             state._fsp--;
@@ -21964,20 +21964,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__Group_3__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8042:1: rule__OutSemanticsRule__Group_3__0__Impl : ( '->' ) ;
+    // InternalFSM.g:8045:1: rule__OutSemanticsRule__Group_3__0__Impl : ( '->' ) ;
     public final void rule__OutSemanticsRule__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8046:1: ( ( '->' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8047:1: ( '->' )
+            // InternalFSM.g:8049:1: ( ( '->' ) )
+            // InternalFSM.g:8050:1: ( '->' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8047:1: ( '->' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8048:1: '->'
+            // InternalFSM.g:8050:1: ( '->' )
+            // InternalFSM.g:8051:1: '->'
             {
              before(grammarAccess.getOutSemanticsRuleAccess().getHyphenMinusGreaterThanSignKeyword_3_0()); 
-            match(input,44,FOLLOW_44_in_rule__OutSemanticsRule__Group_3__0__Impl16262); 
+            match(input,44,FOLLOW_2); 
              after(grammarAccess.getOutSemanticsRuleAccess().getHyphenMinusGreaterThanSignKeyword_3_0()); 
 
             }
@@ -22001,16 +22001,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__Group_3__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8061:1: rule__OutSemanticsRule__Group_3__1 : rule__OutSemanticsRule__Group_3__1__Impl ;
+    // InternalFSM.g:8064:1: rule__OutSemanticsRule__Group_3__1 : rule__OutSemanticsRule__Group_3__1__Impl ;
     public final void rule__OutSemanticsRule__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8065:1: ( rule__OutSemanticsRule__Group_3__1__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8066:2: rule__OutSemanticsRule__Group_3__1__Impl
+            // InternalFSM.g:8068:1: ( rule__OutSemanticsRule__Group_3__1__Impl )
+            // InternalFSM.g:8069:2: rule__OutSemanticsRule__Group_3__1__Impl
             {
-            pushFollow(FOLLOW_rule__OutSemanticsRule__Group_3__1__Impl_in_rule__OutSemanticsRule__Group_3__116293);
+            pushFollow(FOLLOW_2);
             rule__OutSemanticsRule__Group_3__1__Impl();
 
             state._fsp--;
@@ -22034,23 +22034,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__Group_3__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8072:1: rule__OutSemanticsRule__Group_3__1__Impl : ( ( rule__OutSemanticsRule__Alternatives_3_1 ) ) ;
+    // InternalFSM.g:8075:1: rule__OutSemanticsRule__Group_3__1__Impl : ( ( rule__OutSemanticsRule__Alternatives_3_1 ) ) ;
     public final void rule__OutSemanticsRule__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8076:1: ( ( ( rule__OutSemanticsRule__Alternatives_3_1 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8077:1: ( ( rule__OutSemanticsRule__Alternatives_3_1 ) )
+            // InternalFSM.g:8079:1: ( ( ( rule__OutSemanticsRule__Alternatives_3_1 ) ) )
+            // InternalFSM.g:8080:1: ( ( rule__OutSemanticsRule__Alternatives_3_1 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8077:1: ( ( rule__OutSemanticsRule__Alternatives_3_1 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8078:1: ( rule__OutSemanticsRule__Alternatives_3_1 )
+            // InternalFSM.g:8080:1: ( ( rule__OutSemanticsRule__Alternatives_3_1 ) )
+            // InternalFSM.g:8081:1: ( rule__OutSemanticsRule__Alternatives_3_1 )
             {
              before(grammarAccess.getOutSemanticsRuleAccess().getAlternatives_3_1()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8079:1: ( rule__OutSemanticsRule__Alternatives_3_1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8079:2: rule__OutSemanticsRule__Alternatives_3_1
+            // InternalFSM.g:8082:1: ( rule__OutSemanticsRule__Alternatives_3_1 )
+            // InternalFSM.g:8082:2: rule__OutSemanticsRule__Alternatives_3_1
             {
-            pushFollow(FOLLOW_rule__OutSemanticsRule__Alternatives_3_1_in_rule__OutSemanticsRule__Group_3__1__Impl16320);
+            pushFollow(FOLLOW_2);
             rule__OutSemanticsRule__Alternatives_3_1();
 
             state._fsp--;
@@ -22081,21 +22081,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__Group_3_1_1__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8093:1: rule__OutSemanticsRule__Group_3_1_1__0 : rule__OutSemanticsRule__Group_3_1_1__0__Impl rule__OutSemanticsRule__Group_3_1_1__1 ;
+    // InternalFSM.g:8096:1: rule__OutSemanticsRule__Group_3_1_1__0 : rule__OutSemanticsRule__Group_3_1_1__0__Impl rule__OutSemanticsRule__Group_3_1_1__1 ;
     public final void rule__OutSemanticsRule__Group_3_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8097:1: ( rule__OutSemanticsRule__Group_3_1_1__0__Impl rule__OutSemanticsRule__Group_3_1_1__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8098:2: rule__OutSemanticsRule__Group_3_1_1__0__Impl rule__OutSemanticsRule__Group_3_1_1__1
+            // InternalFSM.g:8100:1: ( rule__OutSemanticsRule__Group_3_1_1__0__Impl rule__OutSemanticsRule__Group_3_1_1__1 )
+            // InternalFSM.g:8101:2: rule__OutSemanticsRule__Group_3_1_1__0__Impl rule__OutSemanticsRule__Group_3_1_1__1
             {
-            pushFollow(FOLLOW_rule__OutSemanticsRule__Group_3_1_1__0__Impl_in_rule__OutSemanticsRule__Group_3_1_1__016354);
+            pushFollow(FOLLOW_34);
             rule__OutSemanticsRule__Group_3_1_1__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__OutSemanticsRule__Group_3_1_1__1_in_rule__OutSemanticsRule__Group_3_1_1__016357);
+            pushFollow(FOLLOW_2);
             rule__OutSemanticsRule__Group_3_1_1__1();
 
             state._fsp--;
@@ -22119,20 +22119,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__Group_3_1_1__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8105:1: rule__OutSemanticsRule__Group_3_1_1__0__Impl : ( '(' ) ;
+    // InternalFSM.g:8108:1: rule__OutSemanticsRule__Group_3_1_1__0__Impl : ( '(' ) ;
     public final void rule__OutSemanticsRule__Group_3_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8109:1: ( ( '(' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8110:1: ( '(' )
+            // InternalFSM.g:8112:1: ( ( '(' ) )
+            // InternalFSM.g:8113:1: ( '(' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8110:1: ( '(' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8111:1: '('
+            // InternalFSM.g:8113:1: ( '(' )
+            // InternalFSM.g:8114:1: '('
             {
              before(grammarAccess.getOutSemanticsRuleAccess().getLeftParenthesisKeyword_3_1_1_0()); 
-            match(input,58,FOLLOW_58_in_rule__OutSemanticsRule__Group_3_1_1__0__Impl16385); 
+            match(input,58,FOLLOW_2); 
              after(grammarAccess.getOutSemanticsRuleAccess().getLeftParenthesisKeyword_3_1_1_0()); 
 
             }
@@ -22156,21 +22156,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__Group_3_1_1__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8124:1: rule__OutSemanticsRule__Group_3_1_1__1 : rule__OutSemanticsRule__Group_3_1_1__1__Impl rule__OutSemanticsRule__Group_3_1_1__2 ;
+    // InternalFSM.g:8127:1: rule__OutSemanticsRule__Group_3_1_1__1 : rule__OutSemanticsRule__Group_3_1_1__1__Impl rule__OutSemanticsRule__Group_3_1_1__2 ;
     public final void rule__OutSemanticsRule__Group_3_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8128:1: ( rule__OutSemanticsRule__Group_3_1_1__1__Impl rule__OutSemanticsRule__Group_3_1_1__2 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8129:2: rule__OutSemanticsRule__Group_3_1_1__1__Impl rule__OutSemanticsRule__Group_3_1_1__2
+            // InternalFSM.g:8131:1: ( rule__OutSemanticsRule__Group_3_1_1__1__Impl rule__OutSemanticsRule__Group_3_1_1__2 )
+            // InternalFSM.g:8132:2: rule__OutSemanticsRule__Group_3_1_1__1__Impl rule__OutSemanticsRule__Group_3_1_1__2
             {
-            pushFollow(FOLLOW_rule__OutSemanticsRule__Group_3_1_1__1__Impl_in_rule__OutSemanticsRule__Group_3_1_1__116416);
+            pushFollow(FOLLOW_35);
             rule__OutSemanticsRule__Group_3_1_1__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__OutSemanticsRule__Group_3_1_1__2_in_rule__OutSemanticsRule__Group_3_1_1__116419);
+            pushFollow(FOLLOW_2);
             rule__OutSemanticsRule__Group_3_1_1__2();
 
             state._fsp--;
@@ -22194,23 +22194,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__Group_3_1_1__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8136:1: rule__OutSemanticsRule__Group_3_1_1__1__Impl : ( ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_1 ) ) ;
+    // InternalFSM.g:8139:1: rule__OutSemanticsRule__Group_3_1_1__1__Impl : ( ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_1 ) ) ;
     public final void rule__OutSemanticsRule__Group_3_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8140:1: ( ( ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_1 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8141:1: ( ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_1 ) )
+            // InternalFSM.g:8143:1: ( ( ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_1 ) ) )
+            // InternalFSM.g:8144:1: ( ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_1 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8141:1: ( ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_1 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8142:1: ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_1 )
+            // InternalFSM.g:8144:1: ( ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_1 ) )
+            // InternalFSM.g:8145:1: ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_1 )
             {
              before(grammarAccess.getOutSemanticsRuleAccess().getFollowUpsAssignment_3_1_1_1()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8143:1: ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8143:2: rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_1
+            // InternalFSM.g:8146:1: ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_1 )
+            // InternalFSM.g:8146:2: rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_1
             {
-            pushFollow(FOLLOW_rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_1_in_rule__OutSemanticsRule__Group_3_1_1__1__Impl16446);
+            pushFollow(FOLLOW_2);
             rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_1();
 
             state._fsp--;
@@ -22241,21 +22241,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__Group_3_1_1__2"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8153:1: rule__OutSemanticsRule__Group_3_1_1__2 : rule__OutSemanticsRule__Group_3_1_1__2__Impl rule__OutSemanticsRule__Group_3_1_1__3 ;
+    // InternalFSM.g:8156:1: rule__OutSemanticsRule__Group_3_1_1__2 : rule__OutSemanticsRule__Group_3_1_1__2__Impl rule__OutSemanticsRule__Group_3_1_1__3 ;
     public final void rule__OutSemanticsRule__Group_3_1_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8157:1: ( rule__OutSemanticsRule__Group_3_1_1__2__Impl rule__OutSemanticsRule__Group_3_1_1__3 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8158:2: rule__OutSemanticsRule__Group_3_1_1__2__Impl rule__OutSemanticsRule__Group_3_1_1__3
+            // InternalFSM.g:8160:1: ( rule__OutSemanticsRule__Group_3_1_1__2__Impl rule__OutSemanticsRule__Group_3_1_1__3 )
+            // InternalFSM.g:8161:2: rule__OutSemanticsRule__Group_3_1_1__2__Impl rule__OutSemanticsRule__Group_3_1_1__3
             {
-            pushFollow(FOLLOW_rule__OutSemanticsRule__Group_3_1_1__2__Impl_in_rule__OutSemanticsRule__Group_3_1_1__216476);
+            pushFollow(FOLLOW_36);
             rule__OutSemanticsRule__Group_3_1_1__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__OutSemanticsRule__Group_3_1_1__3_in_rule__OutSemanticsRule__Group_3_1_1__216479);
+            pushFollow(FOLLOW_2);
             rule__OutSemanticsRule__Group_3_1_1__3();
 
             state._fsp--;
@@ -22279,26 +22279,26 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__Group_3_1_1__2__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8165:1: rule__OutSemanticsRule__Group_3_1_1__2__Impl : ( ( ( rule__OutSemanticsRule__Group_3_1_1_2__0 ) ) ( ( rule__OutSemanticsRule__Group_3_1_1_2__0 )* ) ) ;
+    // InternalFSM.g:8168:1: rule__OutSemanticsRule__Group_3_1_1__2__Impl : ( ( ( rule__OutSemanticsRule__Group_3_1_1_2__0 ) ) ( ( rule__OutSemanticsRule__Group_3_1_1_2__0 )* ) ) ;
     public final void rule__OutSemanticsRule__Group_3_1_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8169:1: ( ( ( ( rule__OutSemanticsRule__Group_3_1_1_2__0 ) ) ( ( rule__OutSemanticsRule__Group_3_1_1_2__0 )* ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8170:1: ( ( ( rule__OutSemanticsRule__Group_3_1_1_2__0 ) ) ( ( rule__OutSemanticsRule__Group_3_1_1_2__0 )* ) )
+            // InternalFSM.g:8172:1: ( ( ( ( rule__OutSemanticsRule__Group_3_1_1_2__0 ) ) ( ( rule__OutSemanticsRule__Group_3_1_1_2__0 )* ) ) )
+            // InternalFSM.g:8173:1: ( ( ( rule__OutSemanticsRule__Group_3_1_1_2__0 ) ) ( ( rule__OutSemanticsRule__Group_3_1_1_2__0 )* ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8170:1: ( ( ( rule__OutSemanticsRule__Group_3_1_1_2__0 ) ) ( ( rule__OutSemanticsRule__Group_3_1_1_2__0 )* ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8171:1: ( ( rule__OutSemanticsRule__Group_3_1_1_2__0 ) ) ( ( rule__OutSemanticsRule__Group_3_1_1_2__0 )* )
+            // InternalFSM.g:8173:1: ( ( ( rule__OutSemanticsRule__Group_3_1_1_2__0 ) ) ( ( rule__OutSemanticsRule__Group_3_1_1_2__0 )* ) )
+            // InternalFSM.g:8174:1: ( ( rule__OutSemanticsRule__Group_3_1_1_2__0 ) ) ( ( rule__OutSemanticsRule__Group_3_1_1_2__0 )* )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8171:1: ( ( rule__OutSemanticsRule__Group_3_1_1_2__0 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8172:1: ( rule__OutSemanticsRule__Group_3_1_1_2__0 )
+            // InternalFSM.g:8174:1: ( ( rule__OutSemanticsRule__Group_3_1_1_2__0 ) )
+            // InternalFSM.g:8175:1: ( rule__OutSemanticsRule__Group_3_1_1_2__0 )
             {
              before(grammarAccess.getOutSemanticsRuleAccess().getGroup_3_1_1_2()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8173:1: ( rule__OutSemanticsRule__Group_3_1_1_2__0 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8173:2: rule__OutSemanticsRule__Group_3_1_1_2__0
+            // InternalFSM.g:8176:1: ( rule__OutSemanticsRule__Group_3_1_1_2__0 )
+            // InternalFSM.g:8176:2: rule__OutSemanticsRule__Group_3_1_1_2__0
             {
-            pushFollow(FOLLOW_rule__OutSemanticsRule__Group_3_1_1_2__0_in_rule__OutSemanticsRule__Group_3_1_1__2__Impl16508);
+            pushFollow(FOLLOW_37);
             rule__OutSemanticsRule__Group_3_1_1_2__0();
 
             state._fsp--;
@@ -22310,11 +22310,11 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
             }
 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8176:1: ( ( rule__OutSemanticsRule__Group_3_1_1_2__0 )* )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8177:1: ( rule__OutSemanticsRule__Group_3_1_1_2__0 )*
+            // InternalFSM.g:8179:1: ( ( rule__OutSemanticsRule__Group_3_1_1_2__0 )* )
+            // InternalFSM.g:8180:1: ( rule__OutSemanticsRule__Group_3_1_1_2__0 )*
             {
              before(grammarAccess.getOutSemanticsRuleAccess().getGroup_3_1_1_2()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8178:1: ( rule__OutSemanticsRule__Group_3_1_1_2__0 )*
+            // InternalFSM.g:8181:1: ( rule__OutSemanticsRule__Group_3_1_1_2__0 )*
             loop70:
             do {
                 int alt70=2;
@@ -22327,9 +22327,9 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
                 switch (alt70) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8178:2: rule__OutSemanticsRule__Group_3_1_1_2__0
+            	    // InternalFSM.g:8181:2: rule__OutSemanticsRule__Group_3_1_1_2__0
             	    {
-            	    pushFollow(FOLLOW_rule__OutSemanticsRule__Group_3_1_1_2__0_in_rule__OutSemanticsRule__Group_3_1_1__2__Impl16520);
+            	    pushFollow(FOLLOW_37);
             	    rule__OutSemanticsRule__Group_3_1_1_2__0();
 
             	    state._fsp--;
@@ -22369,16 +22369,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__Group_3_1_1__3"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8189:1: rule__OutSemanticsRule__Group_3_1_1__3 : rule__OutSemanticsRule__Group_3_1_1__3__Impl ;
+    // InternalFSM.g:8192:1: rule__OutSemanticsRule__Group_3_1_1__3 : rule__OutSemanticsRule__Group_3_1_1__3__Impl ;
     public final void rule__OutSemanticsRule__Group_3_1_1__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8193:1: ( rule__OutSemanticsRule__Group_3_1_1__3__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8194:2: rule__OutSemanticsRule__Group_3_1_1__3__Impl
+            // InternalFSM.g:8196:1: ( rule__OutSemanticsRule__Group_3_1_1__3__Impl )
+            // InternalFSM.g:8197:2: rule__OutSemanticsRule__Group_3_1_1__3__Impl
             {
-            pushFollow(FOLLOW_rule__OutSemanticsRule__Group_3_1_1__3__Impl_in_rule__OutSemanticsRule__Group_3_1_1__316553);
+            pushFollow(FOLLOW_2);
             rule__OutSemanticsRule__Group_3_1_1__3__Impl();
 
             state._fsp--;
@@ -22402,20 +22402,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__Group_3_1_1__3__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8200:1: rule__OutSemanticsRule__Group_3_1_1__3__Impl : ( ')' ) ;
+    // InternalFSM.g:8203:1: rule__OutSemanticsRule__Group_3_1_1__3__Impl : ( ')' ) ;
     public final void rule__OutSemanticsRule__Group_3_1_1__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8204:1: ( ( ')' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8205:1: ( ')' )
+            // InternalFSM.g:8207:1: ( ( ')' ) )
+            // InternalFSM.g:8208:1: ( ')' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8205:1: ( ')' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8206:1: ')'
+            // InternalFSM.g:8208:1: ( ')' )
+            // InternalFSM.g:8209:1: ')'
             {
              before(grammarAccess.getOutSemanticsRuleAccess().getRightParenthesisKeyword_3_1_1_3()); 
-            match(input,59,FOLLOW_59_in_rule__OutSemanticsRule__Group_3_1_1__3__Impl16581); 
+            match(input,59,FOLLOW_2); 
              after(grammarAccess.getOutSemanticsRuleAccess().getRightParenthesisKeyword_3_1_1_3()); 
 
             }
@@ -22439,21 +22439,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__Group_3_1_1_2__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8227:1: rule__OutSemanticsRule__Group_3_1_1_2__0 : rule__OutSemanticsRule__Group_3_1_1_2__0__Impl rule__OutSemanticsRule__Group_3_1_1_2__1 ;
+    // InternalFSM.g:8230:1: rule__OutSemanticsRule__Group_3_1_1_2__0 : rule__OutSemanticsRule__Group_3_1_1_2__0__Impl rule__OutSemanticsRule__Group_3_1_1_2__1 ;
     public final void rule__OutSemanticsRule__Group_3_1_1_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8231:1: ( rule__OutSemanticsRule__Group_3_1_1_2__0__Impl rule__OutSemanticsRule__Group_3_1_1_2__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8232:2: rule__OutSemanticsRule__Group_3_1_1_2__0__Impl rule__OutSemanticsRule__Group_3_1_1_2__1
+            // InternalFSM.g:8234:1: ( rule__OutSemanticsRule__Group_3_1_1_2__0__Impl rule__OutSemanticsRule__Group_3_1_1_2__1 )
+            // InternalFSM.g:8235:2: rule__OutSemanticsRule__Group_3_1_1_2__0__Impl rule__OutSemanticsRule__Group_3_1_1_2__1
             {
-            pushFollow(FOLLOW_rule__OutSemanticsRule__Group_3_1_1_2__0__Impl_in_rule__OutSemanticsRule__Group_3_1_1_2__016620);
+            pushFollow(FOLLOW_34);
             rule__OutSemanticsRule__Group_3_1_1_2__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__OutSemanticsRule__Group_3_1_1_2__1_in_rule__OutSemanticsRule__Group_3_1_1_2__016623);
+            pushFollow(FOLLOW_2);
             rule__OutSemanticsRule__Group_3_1_1_2__1();
 
             state._fsp--;
@@ -22477,20 +22477,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__Group_3_1_1_2__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8239:1: rule__OutSemanticsRule__Group_3_1_1_2__0__Impl : ( ',' ) ;
+    // InternalFSM.g:8242:1: rule__OutSemanticsRule__Group_3_1_1_2__0__Impl : ( ',' ) ;
     public final void rule__OutSemanticsRule__Group_3_1_1_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8243:1: ( ( ',' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8244:1: ( ',' )
+            // InternalFSM.g:8246:1: ( ( ',' ) )
+            // InternalFSM.g:8247:1: ( ',' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8244:1: ( ',' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8245:1: ','
+            // InternalFSM.g:8247:1: ( ',' )
+            // InternalFSM.g:8248:1: ','
             {
              before(grammarAccess.getOutSemanticsRuleAccess().getCommaKeyword_3_1_1_2_0()); 
-            match(input,60,FOLLOW_60_in_rule__OutSemanticsRule__Group_3_1_1_2__0__Impl16651); 
+            match(input,60,FOLLOW_2); 
              after(grammarAccess.getOutSemanticsRuleAccess().getCommaKeyword_3_1_1_2_0()); 
 
             }
@@ -22514,16 +22514,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__Group_3_1_1_2__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8258:1: rule__OutSemanticsRule__Group_3_1_1_2__1 : rule__OutSemanticsRule__Group_3_1_1_2__1__Impl ;
+    // InternalFSM.g:8261:1: rule__OutSemanticsRule__Group_3_1_1_2__1 : rule__OutSemanticsRule__Group_3_1_1_2__1__Impl ;
     public final void rule__OutSemanticsRule__Group_3_1_1_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8262:1: ( rule__OutSemanticsRule__Group_3_1_1_2__1__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8263:2: rule__OutSemanticsRule__Group_3_1_1_2__1__Impl
+            // InternalFSM.g:8265:1: ( rule__OutSemanticsRule__Group_3_1_1_2__1__Impl )
+            // InternalFSM.g:8266:2: rule__OutSemanticsRule__Group_3_1_1_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__OutSemanticsRule__Group_3_1_1_2__1__Impl_in_rule__OutSemanticsRule__Group_3_1_1_2__116682);
+            pushFollow(FOLLOW_2);
             rule__OutSemanticsRule__Group_3_1_1_2__1__Impl();
 
             state._fsp--;
@@ -22547,23 +22547,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__Group_3_1_1_2__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8269:1: rule__OutSemanticsRule__Group_3_1_1_2__1__Impl : ( ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_2_1 ) ) ;
+    // InternalFSM.g:8272:1: rule__OutSemanticsRule__Group_3_1_1_2__1__Impl : ( ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_2_1 ) ) ;
     public final void rule__OutSemanticsRule__Group_3_1_1_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8273:1: ( ( ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_2_1 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8274:1: ( ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_2_1 ) )
+            // InternalFSM.g:8276:1: ( ( ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_2_1 ) ) )
+            // InternalFSM.g:8277:1: ( ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_2_1 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8274:1: ( ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_2_1 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8275:1: ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_2_1 )
+            // InternalFSM.g:8277:1: ( ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_2_1 ) )
+            // InternalFSM.g:8278:1: ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_2_1 )
             {
              before(grammarAccess.getOutSemanticsRuleAccess().getFollowUpsAssignment_3_1_1_2_1()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8276:1: ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_2_1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8276:2: rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_2_1
+            // InternalFSM.g:8279:1: ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_2_1 )
+            // InternalFSM.g:8279:2: rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_2_1
             {
-            pushFollow(FOLLOW_rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_2_1_in_rule__OutSemanticsRule__Group_3_1_1_2__1__Impl16709);
+            pushFollow(FOLLOW_2);
             rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_2_1();
 
             state._fsp--;
@@ -22594,21 +22594,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__KeyValue__Group__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8293:1: rule__KeyValue__Group__0 : rule__KeyValue__Group__0__Impl rule__KeyValue__Group__1 ;
+    // InternalFSM.g:8296:1: rule__KeyValue__Group__0 : rule__KeyValue__Group__0__Impl rule__KeyValue__Group__1 ;
     public final void rule__KeyValue__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8297:1: ( rule__KeyValue__Group__0__Impl rule__KeyValue__Group__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8298:2: rule__KeyValue__Group__0__Impl rule__KeyValue__Group__1
+            // InternalFSM.g:8300:1: ( rule__KeyValue__Group__0__Impl rule__KeyValue__Group__1 )
+            // InternalFSM.g:8301:2: rule__KeyValue__Group__0__Impl rule__KeyValue__Group__1
             {
-            pushFollow(FOLLOW_rule__KeyValue__Group__0__Impl_in_rule__KeyValue__Group__016746);
+            pushFollow(FOLLOW_38);
             rule__KeyValue__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__KeyValue__Group__1_in_rule__KeyValue__Group__016749);
+            pushFollow(FOLLOW_2);
             rule__KeyValue__Group__1();
 
             state._fsp--;
@@ -22632,23 +22632,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__KeyValue__Group__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8305:1: rule__KeyValue__Group__0__Impl : ( ( rule__KeyValue__KeyAssignment_0 ) ) ;
+    // InternalFSM.g:8308:1: rule__KeyValue__Group__0__Impl : ( ( rule__KeyValue__KeyAssignment_0 ) ) ;
     public final void rule__KeyValue__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8309:1: ( ( ( rule__KeyValue__KeyAssignment_0 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8310:1: ( ( rule__KeyValue__KeyAssignment_0 ) )
+            // InternalFSM.g:8312:1: ( ( ( rule__KeyValue__KeyAssignment_0 ) ) )
+            // InternalFSM.g:8313:1: ( ( rule__KeyValue__KeyAssignment_0 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8310:1: ( ( rule__KeyValue__KeyAssignment_0 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8311:1: ( rule__KeyValue__KeyAssignment_0 )
+            // InternalFSM.g:8313:1: ( ( rule__KeyValue__KeyAssignment_0 ) )
+            // InternalFSM.g:8314:1: ( rule__KeyValue__KeyAssignment_0 )
             {
              before(grammarAccess.getKeyValueAccess().getKeyAssignment_0()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8312:1: ( rule__KeyValue__KeyAssignment_0 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8312:2: rule__KeyValue__KeyAssignment_0
+            // InternalFSM.g:8315:1: ( rule__KeyValue__KeyAssignment_0 )
+            // InternalFSM.g:8315:2: rule__KeyValue__KeyAssignment_0
             {
-            pushFollow(FOLLOW_rule__KeyValue__KeyAssignment_0_in_rule__KeyValue__Group__0__Impl16776);
+            pushFollow(FOLLOW_2);
             rule__KeyValue__KeyAssignment_0();
 
             state._fsp--;
@@ -22679,21 +22679,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__KeyValue__Group__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8322:1: rule__KeyValue__Group__1 : rule__KeyValue__Group__1__Impl rule__KeyValue__Group__2 ;
+    // InternalFSM.g:8325:1: rule__KeyValue__Group__1 : rule__KeyValue__Group__1__Impl rule__KeyValue__Group__2 ;
     public final void rule__KeyValue__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8326:1: ( rule__KeyValue__Group__1__Impl rule__KeyValue__Group__2 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8327:2: rule__KeyValue__Group__1__Impl rule__KeyValue__Group__2
+            // InternalFSM.g:8329:1: ( rule__KeyValue__Group__1__Impl rule__KeyValue__Group__2 )
+            // InternalFSM.g:8330:2: rule__KeyValue__Group__1__Impl rule__KeyValue__Group__2
             {
-            pushFollow(FOLLOW_rule__KeyValue__Group__1__Impl_in_rule__KeyValue__Group__116806);
+            pushFollow(FOLLOW_39);
             rule__KeyValue__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__KeyValue__Group__2_in_rule__KeyValue__Group__116809);
+            pushFollow(FOLLOW_2);
             rule__KeyValue__Group__2();
 
             state._fsp--;
@@ -22717,20 +22717,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__KeyValue__Group__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8334:1: rule__KeyValue__Group__1__Impl : ( '=' ) ;
+    // InternalFSM.g:8337:1: rule__KeyValue__Group__1__Impl : ( '=' ) ;
     public final void rule__KeyValue__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8338:1: ( ( '=' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8339:1: ( '=' )
+            // InternalFSM.g:8341:1: ( ( '=' ) )
+            // InternalFSM.g:8342:1: ( '=' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8339:1: ( '=' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8340:1: '='
+            // InternalFSM.g:8342:1: ( '=' )
+            // InternalFSM.g:8343:1: '='
             {
              before(grammarAccess.getKeyValueAccess().getEqualsSignKeyword_1()); 
-            match(input,62,FOLLOW_62_in_rule__KeyValue__Group__1__Impl16837); 
+            match(input,62,FOLLOW_2); 
              after(grammarAccess.getKeyValueAccess().getEqualsSignKeyword_1()); 
 
             }
@@ -22754,16 +22754,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__KeyValue__Group__2"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8353:1: rule__KeyValue__Group__2 : rule__KeyValue__Group__2__Impl ;
+    // InternalFSM.g:8356:1: rule__KeyValue__Group__2 : rule__KeyValue__Group__2__Impl ;
     public final void rule__KeyValue__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8357:1: ( rule__KeyValue__Group__2__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8358:2: rule__KeyValue__Group__2__Impl
+            // InternalFSM.g:8360:1: ( rule__KeyValue__Group__2__Impl )
+            // InternalFSM.g:8361:2: rule__KeyValue__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__KeyValue__Group__2__Impl_in_rule__KeyValue__Group__216868);
+            pushFollow(FOLLOW_2);
             rule__KeyValue__Group__2__Impl();
 
             state._fsp--;
@@ -22787,23 +22787,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__KeyValue__Group__2__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8364:1: rule__KeyValue__Group__2__Impl : ( ( rule__KeyValue__ValueAssignment_2 ) ) ;
+    // InternalFSM.g:8367:1: rule__KeyValue__Group__2__Impl : ( ( rule__KeyValue__ValueAssignment_2 ) ) ;
     public final void rule__KeyValue__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8368:1: ( ( ( rule__KeyValue__ValueAssignment_2 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8369:1: ( ( rule__KeyValue__ValueAssignment_2 ) )
+            // InternalFSM.g:8371:1: ( ( ( rule__KeyValue__ValueAssignment_2 ) ) )
+            // InternalFSM.g:8372:1: ( ( rule__KeyValue__ValueAssignment_2 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8369:1: ( ( rule__KeyValue__ValueAssignment_2 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8370:1: ( rule__KeyValue__ValueAssignment_2 )
+            // InternalFSM.g:8372:1: ( ( rule__KeyValue__ValueAssignment_2 ) )
+            // InternalFSM.g:8373:1: ( rule__KeyValue__ValueAssignment_2 )
             {
              before(grammarAccess.getKeyValueAccess().getValueAssignment_2()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8371:1: ( rule__KeyValue__ValueAssignment_2 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8371:2: rule__KeyValue__ValueAssignment_2
+            // InternalFSM.g:8374:1: ( rule__KeyValue__ValueAssignment_2 )
+            // InternalFSM.g:8374:2: rule__KeyValue__ValueAssignment_2
             {
-            pushFollow(FOLLOW_rule__KeyValue__ValueAssignment_2_in_rule__KeyValue__Group__2__Impl16895);
+            pushFollow(FOLLOW_2);
             rule__KeyValue__ValueAssignment_2();
 
             state._fsp--;
@@ -22834,21 +22834,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8390:1: rule__SimpleAnnotationAttribute__Group__0 : rule__SimpleAnnotationAttribute__Group__0__Impl rule__SimpleAnnotationAttribute__Group__1 ;
+    // InternalFSM.g:8393:1: rule__SimpleAnnotationAttribute__Group__0 : rule__SimpleAnnotationAttribute__Group__0__Impl rule__SimpleAnnotationAttribute__Group__1 ;
     public final void rule__SimpleAnnotationAttribute__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8394:1: ( rule__SimpleAnnotationAttribute__Group__0__Impl rule__SimpleAnnotationAttribute__Group__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8395:2: rule__SimpleAnnotationAttribute__Group__0__Impl rule__SimpleAnnotationAttribute__Group__1
+            // InternalFSM.g:8397:1: ( rule__SimpleAnnotationAttribute__Group__0__Impl rule__SimpleAnnotationAttribute__Group__1 )
+            // InternalFSM.g:8398:2: rule__SimpleAnnotationAttribute__Group__0__Impl rule__SimpleAnnotationAttribute__Group__1
             {
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__0__Impl_in_rule__SimpleAnnotationAttribute__Group__016934);
+            pushFollow(FOLLOW_40);
             rule__SimpleAnnotationAttribute__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__1_in_rule__SimpleAnnotationAttribute__Group__016937);
+            pushFollow(FOLLOW_2);
             rule__SimpleAnnotationAttribute__Group__1();
 
             state._fsp--;
@@ -22872,23 +22872,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8402:1: rule__SimpleAnnotationAttribute__Group__0__Impl : ( ( rule__SimpleAnnotationAttribute__Alternatives_0 ) ) ;
+    // InternalFSM.g:8405:1: rule__SimpleAnnotationAttribute__Group__0__Impl : ( ( rule__SimpleAnnotationAttribute__Alternatives_0 ) ) ;
     public final void rule__SimpleAnnotationAttribute__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8406:1: ( ( ( rule__SimpleAnnotationAttribute__Alternatives_0 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8407:1: ( ( rule__SimpleAnnotationAttribute__Alternatives_0 ) )
+            // InternalFSM.g:8409:1: ( ( ( rule__SimpleAnnotationAttribute__Alternatives_0 ) ) )
+            // InternalFSM.g:8410:1: ( ( rule__SimpleAnnotationAttribute__Alternatives_0 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8407:1: ( ( rule__SimpleAnnotationAttribute__Alternatives_0 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8408:1: ( rule__SimpleAnnotationAttribute__Alternatives_0 )
+            // InternalFSM.g:8410:1: ( ( rule__SimpleAnnotationAttribute__Alternatives_0 ) )
+            // InternalFSM.g:8411:1: ( rule__SimpleAnnotationAttribute__Alternatives_0 )
             {
              before(grammarAccess.getSimpleAnnotationAttributeAccess().getAlternatives_0()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8409:1: ( rule__SimpleAnnotationAttribute__Alternatives_0 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8409:2: rule__SimpleAnnotationAttribute__Alternatives_0
+            // InternalFSM.g:8412:1: ( rule__SimpleAnnotationAttribute__Alternatives_0 )
+            // InternalFSM.g:8412:2: rule__SimpleAnnotationAttribute__Alternatives_0
             {
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Alternatives_0_in_rule__SimpleAnnotationAttribute__Group__0__Impl16964);
+            pushFollow(FOLLOW_2);
             rule__SimpleAnnotationAttribute__Alternatives_0();
 
             state._fsp--;
@@ -22919,21 +22919,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8419:1: rule__SimpleAnnotationAttribute__Group__1 : rule__SimpleAnnotationAttribute__Group__1__Impl rule__SimpleAnnotationAttribute__Group__2 ;
+    // InternalFSM.g:8422:1: rule__SimpleAnnotationAttribute__Group__1 : rule__SimpleAnnotationAttribute__Group__1__Impl rule__SimpleAnnotationAttribute__Group__2 ;
     public final void rule__SimpleAnnotationAttribute__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8423:1: ( rule__SimpleAnnotationAttribute__Group__1__Impl rule__SimpleAnnotationAttribute__Group__2 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8424:2: rule__SimpleAnnotationAttribute__Group__1__Impl rule__SimpleAnnotationAttribute__Group__2
+            // InternalFSM.g:8426:1: ( rule__SimpleAnnotationAttribute__Group__1__Impl rule__SimpleAnnotationAttribute__Group__2 )
+            // InternalFSM.g:8427:2: rule__SimpleAnnotationAttribute__Group__1__Impl rule__SimpleAnnotationAttribute__Group__2
             {
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__1__Impl_in_rule__SimpleAnnotationAttribute__Group__116994);
+            pushFollow(FOLLOW_5);
             rule__SimpleAnnotationAttribute__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__2_in_rule__SimpleAnnotationAttribute__Group__116997);
+            pushFollow(FOLLOW_2);
             rule__SimpleAnnotationAttribute__Group__2();
 
             state._fsp--;
@@ -22957,20 +22957,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8431:1: rule__SimpleAnnotationAttribute__Group__1__Impl : ( 'attribute' ) ;
+    // InternalFSM.g:8434:1: rule__SimpleAnnotationAttribute__Group__1__Impl : ( 'attribute' ) ;
     public final void rule__SimpleAnnotationAttribute__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8435:1: ( ( 'attribute' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8436:1: ( 'attribute' )
+            // InternalFSM.g:8438:1: ( ( 'attribute' ) )
+            // InternalFSM.g:8439:1: ( 'attribute' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8436:1: ( 'attribute' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8437:1: 'attribute'
+            // InternalFSM.g:8439:1: ( 'attribute' )
+            // InternalFSM.g:8440:1: 'attribute'
             {
              before(grammarAccess.getSimpleAnnotationAttributeAccess().getAttributeKeyword_1()); 
-            match(input,63,FOLLOW_63_in_rule__SimpleAnnotationAttribute__Group__1__Impl17025); 
+            match(input,63,FOLLOW_2); 
              after(grammarAccess.getSimpleAnnotationAttributeAccess().getAttributeKeyword_1()); 
 
             }
@@ -22994,21 +22994,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__2"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8450:1: rule__SimpleAnnotationAttribute__Group__2 : rule__SimpleAnnotationAttribute__Group__2__Impl rule__SimpleAnnotationAttribute__Group__3 ;
+    // InternalFSM.g:8453:1: rule__SimpleAnnotationAttribute__Group__2 : rule__SimpleAnnotationAttribute__Group__2__Impl rule__SimpleAnnotationAttribute__Group__3 ;
     public final void rule__SimpleAnnotationAttribute__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8454:1: ( rule__SimpleAnnotationAttribute__Group__2__Impl rule__SimpleAnnotationAttribute__Group__3 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8455:2: rule__SimpleAnnotationAttribute__Group__2__Impl rule__SimpleAnnotationAttribute__Group__3
+            // InternalFSM.g:8457:1: ( rule__SimpleAnnotationAttribute__Group__2__Impl rule__SimpleAnnotationAttribute__Group__3 )
+            // InternalFSM.g:8458:2: rule__SimpleAnnotationAttribute__Group__2__Impl rule__SimpleAnnotationAttribute__Group__3
             {
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__2__Impl_in_rule__SimpleAnnotationAttribute__Group__217056);
+            pushFollow(FOLLOW_32);
             rule__SimpleAnnotationAttribute__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__3_in_rule__SimpleAnnotationAttribute__Group__217059);
+            pushFollow(FOLLOW_2);
             rule__SimpleAnnotationAttribute__Group__3();
 
             state._fsp--;
@@ -23032,23 +23032,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__2__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8462:1: rule__SimpleAnnotationAttribute__Group__2__Impl : ( ( rule__SimpleAnnotationAttribute__NameAssignment_2 ) ) ;
+    // InternalFSM.g:8465:1: rule__SimpleAnnotationAttribute__Group__2__Impl : ( ( rule__SimpleAnnotationAttribute__NameAssignment_2 ) ) ;
     public final void rule__SimpleAnnotationAttribute__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8466:1: ( ( ( rule__SimpleAnnotationAttribute__NameAssignment_2 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8467:1: ( ( rule__SimpleAnnotationAttribute__NameAssignment_2 ) )
+            // InternalFSM.g:8469:1: ( ( ( rule__SimpleAnnotationAttribute__NameAssignment_2 ) ) )
+            // InternalFSM.g:8470:1: ( ( rule__SimpleAnnotationAttribute__NameAssignment_2 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8467:1: ( ( rule__SimpleAnnotationAttribute__NameAssignment_2 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8468:1: ( rule__SimpleAnnotationAttribute__NameAssignment_2 )
+            // InternalFSM.g:8470:1: ( ( rule__SimpleAnnotationAttribute__NameAssignment_2 ) )
+            // InternalFSM.g:8471:1: ( rule__SimpleAnnotationAttribute__NameAssignment_2 )
             {
              before(grammarAccess.getSimpleAnnotationAttributeAccess().getNameAssignment_2()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8469:1: ( rule__SimpleAnnotationAttribute__NameAssignment_2 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8469:2: rule__SimpleAnnotationAttribute__NameAssignment_2
+            // InternalFSM.g:8472:1: ( rule__SimpleAnnotationAttribute__NameAssignment_2 )
+            // InternalFSM.g:8472:2: rule__SimpleAnnotationAttribute__NameAssignment_2
             {
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__NameAssignment_2_in_rule__SimpleAnnotationAttribute__Group__2__Impl17086);
+            pushFollow(FOLLOW_2);
             rule__SimpleAnnotationAttribute__NameAssignment_2();
 
             state._fsp--;
@@ -23079,21 +23079,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__3"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8479:1: rule__SimpleAnnotationAttribute__Group__3 : rule__SimpleAnnotationAttribute__Group__3__Impl rule__SimpleAnnotationAttribute__Group__4 ;
+    // InternalFSM.g:8482:1: rule__SimpleAnnotationAttribute__Group__3 : rule__SimpleAnnotationAttribute__Group__3__Impl rule__SimpleAnnotationAttribute__Group__4 ;
     public final void rule__SimpleAnnotationAttribute__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8483:1: ( rule__SimpleAnnotationAttribute__Group__3__Impl rule__SimpleAnnotationAttribute__Group__4 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8484:2: rule__SimpleAnnotationAttribute__Group__3__Impl rule__SimpleAnnotationAttribute__Group__4
+            // InternalFSM.g:8486:1: ( rule__SimpleAnnotationAttribute__Group__3__Impl rule__SimpleAnnotationAttribute__Group__4 )
+            // InternalFSM.g:8487:2: rule__SimpleAnnotationAttribute__Group__3__Impl rule__SimpleAnnotationAttribute__Group__4
             {
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__3__Impl_in_rule__SimpleAnnotationAttribute__Group__317116);
+            pushFollow(FOLLOW_41);
             rule__SimpleAnnotationAttribute__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__4_in_rule__SimpleAnnotationAttribute__Group__317119);
+            pushFollow(FOLLOW_2);
             rule__SimpleAnnotationAttribute__Group__4();
 
             state._fsp--;
@@ -23117,20 +23117,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__3__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8491:1: rule__SimpleAnnotationAttribute__Group__3__Impl : ( ':' ) ;
+    // InternalFSM.g:8494:1: rule__SimpleAnnotationAttribute__Group__3__Impl : ( ':' ) ;
     public final void rule__SimpleAnnotationAttribute__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8495:1: ( ( ':' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8496:1: ( ':' )
+            // InternalFSM.g:8498:1: ( ( ':' ) )
+            // InternalFSM.g:8499:1: ( ':' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8496:1: ( ':' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8497:1: ':'
+            // InternalFSM.g:8499:1: ( ':' )
+            // InternalFSM.g:8500:1: ':'
             {
              before(grammarAccess.getSimpleAnnotationAttributeAccess().getColonKeyword_3()); 
-            match(input,42,FOLLOW_42_in_rule__SimpleAnnotationAttribute__Group__3__Impl17147); 
+            match(input,42,FOLLOW_2); 
              after(grammarAccess.getSimpleAnnotationAttributeAccess().getColonKeyword_3()); 
 
             }
@@ -23154,16 +23154,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__4"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8510:1: rule__SimpleAnnotationAttribute__Group__4 : rule__SimpleAnnotationAttribute__Group__4__Impl ;
+    // InternalFSM.g:8513:1: rule__SimpleAnnotationAttribute__Group__4 : rule__SimpleAnnotationAttribute__Group__4__Impl ;
     public final void rule__SimpleAnnotationAttribute__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8514:1: ( rule__SimpleAnnotationAttribute__Group__4__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8515:2: rule__SimpleAnnotationAttribute__Group__4__Impl
+            // InternalFSM.g:8517:1: ( rule__SimpleAnnotationAttribute__Group__4__Impl )
+            // InternalFSM.g:8518:2: rule__SimpleAnnotationAttribute__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__4__Impl_in_rule__SimpleAnnotationAttribute__Group__417178);
+            pushFollow(FOLLOW_2);
             rule__SimpleAnnotationAttribute__Group__4__Impl();
 
             state._fsp--;
@@ -23187,23 +23187,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__4__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8521:1: rule__SimpleAnnotationAttribute__Group__4__Impl : ( ( rule__SimpleAnnotationAttribute__TypeAssignment_4 ) ) ;
+    // InternalFSM.g:8524:1: rule__SimpleAnnotationAttribute__Group__4__Impl : ( ( rule__SimpleAnnotationAttribute__TypeAssignment_4 ) ) ;
     public final void rule__SimpleAnnotationAttribute__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8525:1: ( ( ( rule__SimpleAnnotationAttribute__TypeAssignment_4 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8526:1: ( ( rule__SimpleAnnotationAttribute__TypeAssignment_4 ) )
+            // InternalFSM.g:8528:1: ( ( ( rule__SimpleAnnotationAttribute__TypeAssignment_4 ) ) )
+            // InternalFSM.g:8529:1: ( ( rule__SimpleAnnotationAttribute__TypeAssignment_4 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8526:1: ( ( rule__SimpleAnnotationAttribute__TypeAssignment_4 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8527:1: ( rule__SimpleAnnotationAttribute__TypeAssignment_4 )
+            // InternalFSM.g:8529:1: ( ( rule__SimpleAnnotationAttribute__TypeAssignment_4 ) )
+            // InternalFSM.g:8530:1: ( rule__SimpleAnnotationAttribute__TypeAssignment_4 )
             {
              before(grammarAccess.getSimpleAnnotationAttributeAccess().getTypeAssignment_4()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8528:1: ( rule__SimpleAnnotationAttribute__TypeAssignment_4 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8528:2: rule__SimpleAnnotationAttribute__TypeAssignment_4
+            // InternalFSM.g:8531:1: ( rule__SimpleAnnotationAttribute__TypeAssignment_4 )
+            // InternalFSM.g:8531:2: rule__SimpleAnnotationAttribute__TypeAssignment_4
             {
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__TypeAssignment_4_in_rule__SimpleAnnotationAttribute__Group__4__Impl17205);
+            pushFollow(FOLLOW_2);
             rule__SimpleAnnotationAttribute__TypeAssignment_4();
 
             state._fsp--;
@@ -23234,21 +23234,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8548:1: rule__EnumAnnotationAttribute__Group__0 : rule__EnumAnnotationAttribute__Group__0__Impl rule__EnumAnnotationAttribute__Group__1 ;
+    // InternalFSM.g:8551:1: rule__EnumAnnotationAttribute__Group__0 : rule__EnumAnnotationAttribute__Group__0__Impl rule__EnumAnnotationAttribute__Group__1 ;
     public final void rule__EnumAnnotationAttribute__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8552:1: ( rule__EnumAnnotationAttribute__Group__0__Impl rule__EnumAnnotationAttribute__Group__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8553:2: rule__EnumAnnotationAttribute__Group__0__Impl rule__EnumAnnotationAttribute__Group__1
+            // InternalFSM.g:8555:1: ( rule__EnumAnnotationAttribute__Group__0__Impl rule__EnumAnnotationAttribute__Group__1 )
+            // InternalFSM.g:8556:2: rule__EnumAnnotationAttribute__Group__0__Impl rule__EnumAnnotationAttribute__Group__1
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__0__Impl_in_rule__EnumAnnotationAttribute__Group__017245);
+            pushFollow(FOLLOW_40);
             rule__EnumAnnotationAttribute__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__1_in_rule__EnumAnnotationAttribute__Group__017248);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group__1();
 
             state._fsp--;
@@ -23272,23 +23272,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8560:1: rule__EnumAnnotationAttribute__Group__0__Impl : ( ( rule__EnumAnnotationAttribute__Alternatives_0 ) ) ;
+    // InternalFSM.g:8563:1: rule__EnumAnnotationAttribute__Group__0__Impl : ( ( rule__EnumAnnotationAttribute__Alternatives_0 ) ) ;
     public final void rule__EnumAnnotationAttribute__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8564:1: ( ( ( rule__EnumAnnotationAttribute__Alternatives_0 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8565:1: ( ( rule__EnumAnnotationAttribute__Alternatives_0 ) )
+            // InternalFSM.g:8567:1: ( ( ( rule__EnumAnnotationAttribute__Alternatives_0 ) ) )
+            // InternalFSM.g:8568:1: ( ( rule__EnumAnnotationAttribute__Alternatives_0 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8565:1: ( ( rule__EnumAnnotationAttribute__Alternatives_0 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8566:1: ( rule__EnumAnnotationAttribute__Alternatives_0 )
+            // InternalFSM.g:8568:1: ( ( rule__EnumAnnotationAttribute__Alternatives_0 ) )
+            // InternalFSM.g:8569:1: ( rule__EnumAnnotationAttribute__Alternatives_0 )
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getAlternatives_0()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8567:1: ( rule__EnumAnnotationAttribute__Alternatives_0 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8567:2: rule__EnumAnnotationAttribute__Alternatives_0
+            // InternalFSM.g:8570:1: ( rule__EnumAnnotationAttribute__Alternatives_0 )
+            // InternalFSM.g:8570:2: rule__EnumAnnotationAttribute__Alternatives_0
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Alternatives_0_in_rule__EnumAnnotationAttribute__Group__0__Impl17275);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Alternatives_0();
 
             state._fsp--;
@@ -23319,21 +23319,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8577:1: rule__EnumAnnotationAttribute__Group__1 : rule__EnumAnnotationAttribute__Group__1__Impl rule__EnumAnnotationAttribute__Group__2 ;
+    // InternalFSM.g:8580:1: rule__EnumAnnotationAttribute__Group__1 : rule__EnumAnnotationAttribute__Group__1__Impl rule__EnumAnnotationAttribute__Group__2 ;
     public final void rule__EnumAnnotationAttribute__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8581:1: ( rule__EnumAnnotationAttribute__Group__1__Impl rule__EnumAnnotationAttribute__Group__2 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8582:2: rule__EnumAnnotationAttribute__Group__1__Impl rule__EnumAnnotationAttribute__Group__2
+            // InternalFSM.g:8584:1: ( rule__EnumAnnotationAttribute__Group__1__Impl rule__EnumAnnotationAttribute__Group__2 )
+            // InternalFSM.g:8585:2: rule__EnumAnnotationAttribute__Group__1__Impl rule__EnumAnnotationAttribute__Group__2
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__1__Impl_in_rule__EnumAnnotationAttribute__Group__117305);
+            pushFollow(FOLLOW_5);
             rule__EnumAnnotationAttribute__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__2_in_rule__EnumAnnotationAttribute__Group__117308);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group__2();
 
             state._fsp--;
@@ -23357,20 +23357,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8589:1: rule__EnumAnnotationAttribute__Group__1__Impl : ( 'attribute' ) ;
+    // InternalFSM.g:8592:1: rule__EnumAnnotationAttribute__Group__1__Impl : ( 'attribute' ) ;
     public final void rule__EnumAnnotationAttribute__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8593:1: ( ( 'attribute' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8594:1: ( 'attribute' )
+            // InternalFSM.g:8596:1: ( ( 'attribute' ) )
+            // InternalFSM.g:8597:1: ( 'attribute' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8594:1: ( 'attribute' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8595:1: 'attribute'
+            // InternalFSM.g:8597:1: ( 'attribute' )
+            // InternalFSM.g:8598:1: 'attribute'
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getAttributeKeyword_1()); 
-            match(input,63,FOLLOW_63_in_rule__EnumAnnotationAttribute__Group__1__Impl17336); 
+            match(input,63,FOLLOW_2); 
              after(grammarAccess.getEnumAnnotationAttributeAccess().getAttributeKeyword_1()); 
 
             }
@@ -23394,21 +23394,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__2"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8608:1: rule__EnumAnnotationAttribute__Group__2 : rule__EnumAnnotationAttribute__Group__2__Impl rule__EnumAnnotationAttribute__Group__3 ;
+    // InternalFSM.g:8611:1: rule__EnumAnnotationAttribute__Group__2 : rule__EnumAnnotationAttribute__Group__2__Impl rule__EnumAnnotationAttribute__Group__3 ;
     public final void rule__EnumAnnotationAttribute__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8612:1: ( rule__EnumAnnotationAttribute__Group__2__Impl rule__EnumAnnotationAttribute__Group__3 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8613:2: rule__EnumAnnotationAttribute__Group__2__Impl rule__EnumAnnotationAttribute__Group__3
+            // InternalFSM.g:8615:1: ( rule__EnumAnnotationAttribute__Group__2__Impl rule__EnumAnnotationAttribute__Group__3 )
+            // InternalFSM.g:8616:2: rule__EnumAnnotationAttribute__Group__2__Impl rule__EnumAnnotationAttribute__Group__3
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__2__Impl_in_rule__EnumAnnotationAttribute__Group__217367);
+            pushFollow(FOLLOW_32);
             rule__EnumAnnotationAttribute__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__3_in_rule__EnumAnnotationAttribute__Group__217370);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group__3();
 
             state._fsp--;
@@ -23432,23 +23432,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__2__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8620:1: rule__EnumAnnotationAttribute__Group__2__Impl : ( ( rule__EnumAnnotationAttribute__NameAssignment_2 ) ) ;
+    // InternalFSM.g:8623:1: rule__EnumAnnotationAttribute__Group__2__Impl : ( ( rule__EnumAnnotationAttribute__NameAssignment_2 ) ) ;
     public final void rule__EnumAnnotationAttribute__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8624:1: ( ( ( rule__EnumAnnotationAttribute__NameAssignment_2 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8625:1: ( ( rule__EnumAnnotationAttribute__NameAssignment_2 ) )
+            // InternalFSM.g:8627:1: ( ( ( rule__EnumAnnotationAttribute__NameAssignment_2 ) ) )
+            // InternalFSM.g:8628:1: ( ( rule__EnumAnnotationAttribute__NameAssignment_2 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8625:1: ( ( rule__EnumAnnotationAttribute__NameAssignment_2 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8626:1: ( rule__EnumAnnotationAttribute__NameAssignment_2 )
+            // InternalFSM.g:8628:1: ( ( rule__EnumAnnotationAttribute__NameAssignment_2 ) )
+            // InternalFSM.g:8629:1: ( rule__EnumAnnotationAttribute__NameAssignment_2 )
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getNameAssignment_2()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8627:1: ( rule__EnumAnnotationAttribute__NameAssignment_2 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8627:2: rule__EnumAnnotationAttribute__NameAssignment_2
+            // InternalFSM.g:8630:1: ( rule__EnumAnnotationAttribute__NameAssignment_2 )
+            // InternalFSM.g:8630:2: rule__EnumAnnotationAttribute__NameAssignment_2
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__NameAssignment_2_in_rule__EnumAnnotationAttribute__Group__2__Impl17397);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__NameAssignment_2();
 
             state._fsp--;
@@ -23479,21 +23479,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__3"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8637:1: rule__EnumAnnotationAttribute__Group__3 : rule__EnumAnnotationAttribute__Group__3__Impl rule__EnumAnnotationAttribute__Group__4 ;
+    // InternalFSM.g:8640:1: rule__EnumAnnotationAttribute__Group__3 : rule__EnumAnnotationAttribute__Group__3__Impl rule__EnumAnnotationAttribute__Group__4 ;
     public final void rule__EnumAnnotationAttribute__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8641:1: ( rule__EnumAnnotationAttribute__Group__3__Impl rule__EnumAnnotationAttribute__Group__4 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8642:2: rule__EnumAnnotationAttribute__Group__3__Impl rule__EnumAnnotationAttribute__Group__4
+            // InternalFSM.g:8644:1: ( rule__EnumAnnotationAttribute__Group__3__Impl rule__EnumAnnotationAttribute__Group__4 )
+            // InternalFSM.g:8645:2: rule__EnumAnnotationAttribute__Group__3__Impl rule__EnumAnnotationAttribute__Group__4
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__3__Impl_in_rule__EnumAnnotationAttribute__Group__317427);
+            pushFollow(FOLLOW_7);
             rule__EnumAnnotationAttribute__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__4_in_rule__EnumAnnotationAttribute__Group__317430);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group__4();
 
             state._fsp--;
@@ -23517,20 +23517,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__3__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8649:1: rule__EnumAnnotationAttribute__Group__3__Impl : ( ':' ) ;
+    // InternalFSM.g:8652:1: rule__EnumAnnotationAttribute__Group__3__Impl : ( ':' ) ;
     public final void rule__EnumAnnotationAttribute__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8653:1: ( ( ':' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8654:1: ( ':' )
+            // InternalFSM.g:8656:1: ( ( ':' ) )
+            // InternalFSM.g:8657:1: ( ':' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8654:1: ( ':' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8655:1: ':'
+            // InternalFSM.g:8657:1: ( ':' )
+            // InternalFSM.g:8658:1: ':'
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getColonKeyword_3()); 
-            match(input,42,FOLLOW_42_in_rule__EnumAnnotationAttribute__Group__3__Impl17458); 
+            match(input,42,FOLLOW_2); 
              after(grammarAccess.getEnumAnnotationAttributeAccess().getColonKeyword_3()); 
 
             }
@@ -23554,21 +23554,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__4"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8668:1: rule__EnumAnnotationAttribute__Group__4 : rule__EnumAnnotationAttribute__Group__4__Impl rule__EnumAnnotationAttribute__Group__5 ;
+    // InternalFSM.g:8671:1: rule__EnumAnnotationAttribute__Group__4 : rule__EnumAnnotationAttribute__Group__4__Impl rule__EnumAnnotationAttribute__Group__5 ;
     public final void rule__EnumAnnotationAttribute__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8672:1: ( rule__EnumAnnotationAttribute__Group__4__Impl rule__EnumAnnotationAttribute__Group__5 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8673:2: rule__EnumAnnotationAttribute__Group__4__Impl rule__EnumAnnotationAttribute__Group__5
+            // InternalFSM.g:8675:1: ( rule__EnumAnnotationAttribute__Group__4__Impl rule__EnumAnnotationAttribute__Group__5 )
+            // InternalFSM.g:8676:2: rule__EnumAnnotationAttribute__Group__4__Impl rule__EnumAnnotationAttribute__Group__5
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__4__Impl_in_rule__EnumAnnotationAttribute__Group__417489);
+            pushFollow(FOLLOW_42);
             rule__EnumAnnotationAttribute__Group__4__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__5_in_rule__EnumAnnotationAttribute__Group__417492);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group__5();
 
             state._fsp--;
@@ -23592,20 +23592,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__4__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8680:1: rule__EnumAnnotationAttribute__Group__4__Impl : ( '{' ) ;
+    // InternalFSM.g:8683:1: rule__EnumAnnotationAttribute__Group__4__Impl : ( '{' ) ;
     public final void rule__EnumAnnotationAttribute__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8684:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8685:1: ( '{' )
+            // InternalFSM.g:8687:1: ( ( '{' ) )
+            // InternalFSM.g:8688:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8685:1: ( '{' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8686:1: '{'
+            // InternalFSM.g:8688:1: ( '{' )
+            // InternalFSM.g:8689:1: '{'
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getLeftCurlyBracketKeyword_4()); 
-            match(input,28,FOLLOW_28_in_rule__EnumAnnotationAttribute__Group__4__Impl17520); 
+            match(input,28,FOLLOW_2); 
              after(grammarAccess.getEnumAnnotationAttributeAccess().getLeftCurlyBracketKeyword_4()); 
 
             }
@@ -23629,21 +23629,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__5"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8699:1: rule__EnumAnnotationAttribute__Group__5 : rule__EnumAnnotationAttribute__Group__5__Impl rule__EnumAnnotationAttribute__Group__6 ;
+    // InternalFSM.g:8702:1: rule__EnumAnnotationAttribute__Group__5 : rule__EnumAnnotationAttribute__Group__5__Impl rule__EnumAnnotationAttribute__Group__6 ;
     public final void rule__EnumAnnotationAttribute__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8703:1: ( rule__EnumAnnotationAttribute__Group__5__Impl rule__EnumAnnotationAttribute__Group__6 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8704:2: rule__EnumAnnotationAttribute__Group__5__Impl rule__EnumAnnotationAttribute__Group__6
+            // InternalFSM.g:8706:1: ( rule__EnumAnnotationAttribute__Group__5__Impl rule__EnumAnnotationAttribute__Group__6 )
+            // InternalFSM.g:8707:2: rule__EnumAnnotationAttribute__Group__5__Impl rule__EnumAnnotationAttribute__Group__6
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__5__Impl_in_rule__EnumAnnotationAttribute__Group__517551);
+            pushFollow(FOLLOW_43);
             rule__EnumAnnotationAttribute__Group__5__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__6_in_rule__EnumAnnotationAttribute__Group__517554);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group__6();
 
             state._fsp--;
@@ -23667,23 +23667,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__5__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8711:1: rule__EnumAnnotationAttribute__Group__5__Impl : ( ( rule__EnumAnnotationAttribute__ValuesAssignment_5 ) ) ;
+    // InternalFSM.g:8714:1: rule__EnumAnnotationAttribute__Group__5__Impl : ( ( rule__EnumAnnotationAttribute__ValuesAssignment_5 ) ) ;
     public final void rule__EnumAnnotationAttribute__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8715:1: ( ( ( rule__EnumAnnotationAttribute__ValuesAssignment_5 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8716:1: ( ( rule__EnumAnnotationAttribute__ValuesAssignment_5 ) )
+            // InternalFSM.g:8718:1: ( ( ( rule__EnumAnnotationAttribute__ValuesAssignment_5 ) ) )
+            // InternalFSM.g:8719:1: ( ( rule__EnumAnnotationAttribute__ValuesAssignment_5 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8716:1: ( ( rule__EnumAnnotationAttribute__ValuesAssignment_5 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8717:1: ( rule__EnumAnnotationAttribute__ValuesAssignment_5 )
+            // InternalFSM.g:8719:1: ( ( rule__EnumAnnotationAttribute__ValuesAssignment_5 ) )
+            // InternalFSM.g:8720:1: ( rule__EnumAnnotationAttribute__ValuesAssignment_5 )
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getValuesAssignment_5()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8718:1: ( rule__EnumAnnotationAttribute__ValuesAssignment_5 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8718:2: rule__EnumAnnotationAttribute__ValuesAssignment_5
+            // InternalFSM.g:8721:1: ( rule__EnumAnnotationAttribute__ValuesAssignment_5 )
+            // InternalFSM.g:8721:2: rule__EnumAnnotationAttribute__ValuesAssignment_5
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__ValuesAssignment_5_in_rule__EnumAnnotationAttribute__Group__5__Impl17581);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__ValuesAssignment_5();
 
             state._fsp--;
@@ -23714,21 +23714,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__6"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8728:1: rule__EnumAnnotationAttribute__Group__6 : rule__EnumAnnotationAttribute__Group__6__Impl rule__EnumAnnotationAttribute__Group__7 ;
+    // InternalFSM.g:8731:1: rule__EnumAnnotationAttribute__Group__6 : rule__EnumAnnotationAttribute__Group__6__Impl rule__EnumAnnotationAttribute__Group__7 ;
     public final void rule__EnumAnnotationAttribute__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8732:1: ( rule__EnumAnnotationAttribute__Group__6__Impl rule__EnumAnnotationAttribute__Group__7 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8733:2: rule__EnumAnnotationAttribute__Group__6__Impl rule__EnumAnnotationAttribute__Group__7
+            // InternalFSM.g:8735:1: ( rule__EnumAnnotationAttribute__Group__6__Impl rule__EnumAnnotationAttribute__Group__7 )
+            // InternalFSM.g:8736:2: rule__EnumAnnotationAttribute__Group__6__Impl rule__EnumAnnotationAttribute__Group__7
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__6__Impl_in_rule__EnumAnnotationAttribute__Group__617611);
+            pushFollow(FOLLOW_43);
             rule__EnumAnnotationAttribute__Group__6__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__7_in_rule__EnumAnnotationAttribute__Group__617614);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group__7();
 
             state._fsp--;
@@ -23752,20 +23752,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__6__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8740:1: rule__EnumAnnotationAttribute__Group__6__Impl : ( ( rule__EnumAnnotationAttribute__Group_6__0 )* ) ;
+    // InternalFSM.g:8743:1: rule__EnumAnnotationAttribute__Group__6__Impl : ( ( rule__EnumAnnotationAttribute__Group_6__0 )* ) ;
     public final void rule__EnumAnnotationAttribute__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8744:1: ( ( ( rule__EnumAnnotationAttribute__Group_6__0 )* ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8745:1: ( ( rule__EnumAnnotationAttribute__Group_6__0 )* )
+            // InternalFSM.g:8747:1: ( ( ( rule__EnumAnnotationAttribute__Group_6__0 )* ) )
+            // InternalFSM.g:8748:1: ( ( rule__EnumAnnotationAttribute__Group_6__0 )* )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8745:1: ( ( rule__EnumAnnotationAttribute__Group_6__0 )* )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8746:1: ( rule__EnumAnnotationAttribute__Group_6__0 )*
+            // InternalFSM.g:8748:1: ( ( rule__EnumAnnotationAttribute__Group_6__0 )* )
+            // InternalFSM.g:8749:1: ( rule__EnumAnnotationAttribute__Group_6__0 )*
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getGroup_6()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8747:1: ( rule__EnumAnnotationAttribute__Group_6__0 )*
+            // InternalFSM.g:8750:1: ( rule__EnumAnnotationAttribute__Group_6__0 )*
             loop71:
             do {
                 int alt71=2;
@@ -23778,9 +23778,9 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
                 switch (alt71) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8747:2: rule__EnumAnnotationAttribute__Group_6__0
+            	    // InternalFSM.g:8750:2: rule__EnumAnnotationAttribute__Group_6__0
             	    {
-            	    pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group_6__0_in_rule__EnumAnnotationAttribute__Group__6__Impl17641);
+            	    pushFollow(FOLLOW_37);
             	    rule__EnumAnnotationAttribute__Group_6__0();
 
             	    state._fsp--;
@@ -23817,16 +23817,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__7"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8757:1: rule__EnumAnnotationAttribute__Group__7 : rule__EnumAnnotationAttribute__Group__7__Impl ;
+    // InternalFSM.g:8760:1: rule__EnumAnnotationAttribute__Group__7 : rule__EnumAnnotationAttribute__Group__7__Impl ;
     public final void rule__EnumAnnotationAttribute__Group__7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8761:1: ( rule__EnumAnnotationAttribute__Group__7__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8762:2: rule__EnumAnnotationAttribute__Group__7__Impl
+            // InternalFSM.g:8764:1: ( rule__EnumAnnotationAttribute__Group__7__Impl )
+            // InternalFSM.g:8765:2: rule__EnumAnnotationAttribute__Group__7__Impl
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__7__Impl_in_rule__EnumAnnotationAttribute__Group__717672);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group__7__Impl();
 
             state._fsp--;
@@ -23850,20 +23850,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__7__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8768:1: rule__EnumAnnotationAttribute__Group__7__Impl : ( '}' ) ;
+    // InternalFSM.g:8771:1: rule__EnumAnnotationAttribute__Group__7__Impl : ( '}' ) ;
     public final void rule__EnumAnnotationAttribute__Group__7__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8772:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8773:1: ( '}' )
+            // InternalFSM.g:8775:1: ( ( '}' ) )
+            // InternalFSM.g:8776:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8773:1: ( '}' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8774:1: '}'
+            // InternalFSM.g:8776:1: ( '}' )
+            // InternalFSM.g:8777:1: '}'
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getRightCurlyBracketKeyword_7()); 
-            match(input,29,FOLLOW_29_in_rule__EnumAnnotationAttribute__Group__7__Impl17700); 
+            match(input,29,FOLLOW_2); 
              after(grammarAccess.getEnumAnnotationAttributeAccess().getRightCurlyBracketKeyword_7()); 
 
             }
@@ -23887,21 +23887,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group_6__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8803:1: rule__EnumAnnotationAttribute__Group_6__0 : rule__EnumAnnotationAttribute__Group_6__0__Impl rule__EnumAnnotationAttribute__Group_6__1 ;
+    // InternalFSM.g:8806:1: rule__EnumAnnotationAttribute__Group_6__0 : rule__EnumAnnotationAttribute__Group_6__0__Impl rule__EnumAnnotationAttribute__Group_6__1 ;
     public final void rule__EnumAnnotationAttribute__Group_6__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8807:1: ( rule__EnumAnnotationAttribute__Group_6__0__Impl rule__EnumAnnotationAttribute__Group_6__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8808:2: rule__EnumAnnotationAttribute__Group_6__0__Impl rule__EnumAnnotationAttribute__Group_6__1
+            // InternalFSM.g:8810:1: ( rule__EnumAnnotationAttribute__Group_6__0__Impl rule__EnumAnnotationAttribute__Group_6__1 )
+            // InternalFSM.g:8811:2: rule__EnumAnnotationAttribute__Group_6__0__Impl rule__EnumAnnotationAttribute__Group_6__1
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group_6__0__Impl_in_rule__EnumAnnotationAttribute__Group_6__017747);
+            pushFollow(FOLLOW_42);
             rule__EnumAnnotationAttribute__Group_6__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group_6__1_in_rule__EnumAnnotationAttribute__Group_6__017750);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group_6__1();
 
             state._fsp--;
@@ -23925,20 +23925,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group_6__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8815:1: rule__EnumAnnotationAttribute__Group_6__0__Impl : ( ',' ) ;
+    // InternalFSM.g:8818:1: rule__EnumAnnotationAttribute__Group_6__0__Impl : ( ',' ) ;
     public final void rule__EnumAnnotationAttribute__Group_6__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8819:1: ( ( ',' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8820:1: ( ',' )
+            // InternalFSM.g:8822:1: ( ( ',' ) )
+            // InternalFSM.g:8823:1: ( ',' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8820:1: ( ',' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8821:1: ','
+            // InternalFSM.g:8823:1: ( ',' )
+            // InternalFSM.g:8824:1: ','
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getCommaKeyword_6_0()); 
-            match(input,60,FOLLOW_60_in_rule__EnumAnnotationAttribute__Group_6__0__Impl17778); 
+            match(input,60,FOLLOW_2); 
              after(grammarAccess.getEnumAnnotationAttributeAccess().getCommaKeyword_6_0()); 
 
             }
@@ -23962,16 +23962,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group_6__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8834:1: rule__EnumAnnotationAttribute__Group_6__1 : rule__EnumAnnotationAttribute__Group_6__1__Impl ;
+    // InternalFSM.g:8837:1: rule__EnumAnnotationAttribute__Group_6__1 : rule__EnumAnnotationAttribute__Group_6__1__Impl ;
     public final void rule__EnumAnnotationAttribute__Group_6__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8838:1: ( rule__EnumAnnotationAttribute__Group_6__1__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8839:2: rule__EnumAnnotationAttribute__Group_6__1__Impl
+            // InternalFSM.g:8841:1: ( rule__EnumAnnotationAttribute__Group_6__1__Impl )
+            // InternalFSM.g:8842:2: rule__EnumAnnotationAttribute__Group_6__1__Impl
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group_6__1__Impl_in_rule__EnumAnnotationAttribute__Group_6__117809);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group_6__1__Impl();
 
             state._fsp--;
@@ -23995,23 +23995,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group_6__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8845:1: rule__EnumAnnotationAttribute__Group_6__1__Impl : ( ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 ) ) ;
+    // InternalFSM.g:8848:1: rule__EnumAnnotationAttribute__Group_6__1__Impl : ( ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 ) ) ;
     public final void rule__EnumAnnotationAttribute__Group_6__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8849:1: ( ( ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8850:1: ( ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 ) )
+            // InternalFSM.g:8852:1: ( ( ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 ) ) )
+            // InternalFSM.g:8853:1: ( ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8850:1: ( ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8851:1: ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 )
+            // InternalFSM.g:8853:1: ( ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 ) )
+            // InternalFSM.g:8854:1: ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 )
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getValuesAssignment_6_1()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8852:1: ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8852:2: rule__EnumAnnotationAttribute__ValuesAssignment_6_1
+            // InternalFSM.g:8855:1: ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 )
+            // InternalFSM.g:8855:2: rule__EnumAnnotationAttribute__ValuesAssignment_6_1
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__ValuesAssignment_6_1_in_rule__EnumAnnotationAttribute__Group_6__1__Impl17836);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__ValuesAssignment_6_1();
 
             state._fsp--;
@@ -24042,21 +24042,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ImportedFQN__Group__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8868:1: rule__ImportedFQN__Group__0 : rule__ImportedFQN__Group__0__Impl rule__ImportedFQN__Group__1 ;
+    // InternalFSM.g:8871:1: rule__ImportedFQN__Group__0 : rule__ImportedFQN__Group__0__Impl rule__ImportedFQN__Group__1 ;
     public final void rule__ImportedFQN__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8872:1: ( rule__ImportedFQN__Group__0__Impl rule__ImportedFQN__Group__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8873:2: rule__ImportedFQN__Group__0__Impl rule__ImportedFQN__Group__1
+            // InternalFSM.g:8875:1: ( rule__ImportedFQN__Group__0__Impl rule__ImportedFQN__Group__1 )
+            // InternalFSM.g:8876:2: rule__ImportedFQN__Group__0__Impl rule__ImportedFQN__Group__1
             {
-            pushFollow(FOLLOW_rule__ImportedFQN__Group__0__Impl_in_rule__ImportedFQN__Group__017872);
+            pushFollow(FOLLOW_44);
             rule__ImportedFQN__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ImportedFQN__Group__1_in_rule__ImportedFQN__Group__017875);
+            pushFollow(FOLLOW_2);
             rule__ImportedFQN__Group__1();
 
             state._fsp--;
@@ -24080,20 +24080,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ImportedFQN__Group__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8880:1: rule__ImportedFQN__Group__0__Impl : ( ruleFQN ) ;
+    // InternalFSM.g:8883:1: rule__ImportedFQN__Group__0__Impl : ( ruleFQN ) ;
     public final void rule__ImportedFQN__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8884:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8885:1: ( ruleFQN )
+            // InternalFSM.g:8887:1: ( ( ruleFQN ) )
+            // InternalFSM.g:8888:1: ( ruleFQN )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8885:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8886:1: ruleFQN
+            // InternalFSM.g:8888:1: ( ruleFQN )
+            // InternalFSM.g:8889:1: ruleFQN
             {
              before(grammarAccess.getImportedFQNAccess().getFQNParserRuleCall_0()); 
-            pushFollow(FOLLOW_ruleFQN_in_rule__ImportedFQN__Group__0__Impl17902);
+            pushFollow(FOLLOW_2);
             ruleFQN();
 
             state._fsp--;
@@ -24121,16 +24121,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ImportedFQN__Group__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8897:1: rule__ImportedFQN__Group__1 : rule__ImportedFQN__Group__1__Impl ;
+    // InternalFSM.g:8900:1: rule__ImportedFQN__Group__1 : rule__ImportedFQN__Group__1__Impl ;
     public final void rule__ImportedFQN__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8901:1: ( rule__ImportedFQN__Group__1__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8902:2: rule__ImportedFQN__Group__1__Impl
+            // InternalFSM.g:8904:1: ( rule__ImportedFQN__Group__1__Impl )
+            // InternalFSM.g:8905:2: rule__ImportedFQN__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__ImportedFQN__Group__1__Impl_in_rule__ImportedFQN__Group__117931);
+            pushFollow(FOLLOW_2);
             rule__ImportedFQN__Group__1__Impl();
 
             state._fsp--;
@@ -24154,20 +24154,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ImportedFQN__Group__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8908:1: rule__ImportedFQN__Group__1__Impl : ( ( '.*' )? ) ;
+    // InternalFSM.g:8911:1: rule__ImportedFQN__Group__1__Impl : ( ( '.*' )? ) ;
     public final void rule__ImportedFQN__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8912:1: ( ( ( '.*' )? ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8913:1: ( ( '.*' )? )
+            // InternalFSM.g:8915:1: ( ( ( '.*' )? ) )
+            // InternalFSM.g:8916:1: ( ( '.*' )? )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8913:1: ( ( '.*' )? )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8914:1: ( '.*' )?
+            // InternalFSM.g:8916:1: ( ( '.*' )? )
+            // InternalFSM.g:8917:1: ( '.*' )?
             {
              before(grammarAccess.getImportedFQNAccess().getFullStopAsteriskKeyword_1()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8915:1: ( '.*' )?
+            // InternalFSM.g:8918:1: ( '.*' )?
             int alt72=2;
             int LA72_0 = input.LA(1);
 
@@ -24176,9 +24176,9 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt72) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8916:2: '.*'
+                    // InternalFSM.g:8919:2: '.*'
                     {
-                    match(input,64,FOLLOW_64_in_rule__ImportedFQN__Group__1__Impl17960); 
+                    match(input,64,FOLLOW_2); 
 
                     }
                     break;
@@ -24208,21 +24208,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Documentation__Group__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8931:1: rule__Documentation__Group__0 : rule__Documentation__Group__0__Impl rule__Documentation__Group__1 ;
+    // InternalFSM.g:8934:1: rule__Documentation__Group__0 : rule__Documentation__Group__0__Impl rule__Documentation__Group__1 ;
     public final void rule__Documentation__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8935:1: ( rule__Documentation__Group__0__Impl rule__Documentation__Group__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8936:2: rule__Documentation__Group__0__Impl rule__Documentation__Group__1
+            // InternalFSM.g:8938:1: ( rule__Documentation__Group__0__Impl rule__Documentation__Group__1 )
+            // InternalFSM.g:8939:2: rule__Documentation__Group__0__Impl rule__Documentation__Group__1
             {
-            pushFollow(FOLLOW_rule__Documentation__Group__0__Impl_in_rule__Documentation__Group__017997);
+            pushFollow(FOLLOW_15);
             rule__Documentation__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Documentation__Group__1_in_rule__Documentation__Group__018000);
+            pushFollow(FOLLOW_2);
             rule__Documentation__Group__1();
 
             state._fsp--;
@@ -24246,21 +24246,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Documentation__Group__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8943:1: rule__Documentation__Group__0__Impl : ( () ) ;
+    // InternalFSM.g:8946:1: rule__Documentation__Group__0__Impl : ( () ) ;
     public final void rule__Documentation__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8947:1: ( ( () ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8948:1: ( () )
+            // InternalFSM.g:8950:1: ( ( () ) )
+            // InternalFSM.g:8951:1: ( () )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8948:1: ( () )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8949:1: ()
+            // InternalFSM.g:8951:1: ( () )
+            // InternalFSM.g:8952:1: ()
             {
              before(grammarAccess.getDocumentationAccess().getDocumentationAction_0()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8950:1: ()
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8952:1: 
+            // InternalFSM.g:8953:1: ()
+            // InternalFSM.g:8955:1: 
             {
             }
 
@@ -24283,21 +24283,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Documentation__Group__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8962:1: rule__Documentation__Group__1 : rule__Documentation__Group__1__Impl rule__Documentation__Group__2 ;
+    // InternalFSM.g:8965:1: rule__Documentation__Group__1 : rule__Documentation__Group__1__Impl rule__Documentation__Group__2 ;
     public final void rule__Documentation__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8966:1: ( rule__Documentation__Group__1__Impl rule__Documentation__Group__2 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8967:2: rule__Documentation__Group__1__Impl rule__Documentation__Group__2
+            // InternalFSM.g:8969:1: ( rule__Documentation__Group__1__Impl rule__Documentation__Group__2 )
+            // InternalFSM.g:8970:2: rule__Documentation__Group__1__Impl rule__Documentation__Group__2
             {
-            pushFollow(FOLLOW_rule__Documentation__Group__1__Impl_in_rule__Documentation__Group__118058);
+            pushFollow(FOLLOW_45);
             rule__Documentation__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Documentation__Group__2_in_rule__Documentation__Group__118061);
+            pushFollow(FOLLOW_2);
             rule__Documentation__Group__2();
 
             state._fsp--;
@@ -24321,20 +24321,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Documentation__Group__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8974:1: rule__Documentation__Group__1__Impl : ( '[' ) ;
+    // InternalFSM.g:8977:1: rule__Documentation__Group__1__Impl : ( '[' ) ;
     public final void rule__Documentation__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8978:1: ( ( '[' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8979:1: ( '[' )
+            // InternalFSM.g:8981:1: ( ( '[' ) )
+            // InternalFSM.g:8982:1: ( '[' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8979:1: ( '[' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8980:1: '['
+            // InternalFSM.g:8982:1: ( '[' )
+            // InternalFSM.g:8983:1: '['
             {
              before(grammarAccess.getDocumentationAccess().getLeftSquareBracketKeyword_1()); 
-            match(input,65,FOLLOW_65_in_rule__Documentation__Group__1__Impl18089); 
+            match(input,65,FOLLOW_2); 
              after(grammarAccess.getDocumentationAccess().getLeftSquareBracketKeyword_1()); 
 
             }
@@ -24358,21 +24358,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Documentation__Group__2"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8993:1: rule__Documentation__Group__2 : rule__Documentation__Group__2__Impl rule__Documentation__Group__3 ;
+    // InternalFSM.g:8996:1: rule__Documentation__Group__2 : rule__Documentation__Group__2__Impl rule__Documentation__Group__3 ;
     public final void rule__Documentation__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8997:1: ( rule__Documentation__Group__2__Impl rule__Documentation__Group__3 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:8998:2: rule__Documentation__Group__2__Impl rule__Documentation__Group__3
+            // InternalFSM.g:9000:1: ( rule__Documentation__Group__2__Impl rule__Documentation__Group__3 )
+            // InternalFSM.g:9001:2: rule__Documentation__Group__2__Impl rule__Documentation__Group__3
             {
-            pushFollow(FOLLOW_rule__Documentation__Group__2__Impl_in_rule__Documentation__Group__218120);
+            pushFollow(FOLLOW_45);
             rule__Documentation__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Documentation__Group__3_in_rule__Documentation__Group__218123);
+            pushFollow(FOLLOW_2);
             rule__Documentation__Group__3();
 
             state._fsp--;
@@ -24396,20 +24396,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Documentation__Group__2__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9005:1: rule__Documentation__Group__2__Impl : ( ( rule__Documentation__LinesAssignment_2 )* ) ;
+    // InternalFSM.g:9008:1: rule__Documentation__Group__2__Impl : ( ( rule__Documentation__LinesAssignment_2 )* ) ;
     public final void rule__Documentation__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9009:1: ( ( ( rule__Documentation__LinesAssignment_2 )* ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9010:1: ( ( rule__Documentation__LinesAssignment_2 )* )
+            // InternalFSM.g:9012:1: ( ( ( rule__Documentation__LinesAssignment_2 )* ) )
+            // InternalFSM.g:9013:1: ( ( rule__Documentation__LinesAssignment_2 )* )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9010:1: ( ( rule__Documentation__LinesAssignment_2 )* )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9011:1: ( rule__Documentation__LinesAssignment_2 )*
+            // InternalFSM.g:9013:1: ( ( rule__Documentation__LinesAssignment_2 )* )
+            // InternalFSM.g:9014:1: ( rule__Documentation__LinesAssignment_2 )*
             {
              before(grammarAccess.getDocumentationAccess().getLinesAssignment_2()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9012:1: ( rule__Documentation__LinesAssignment_2 )*
+            // InternalFSM.g:9015:1: ( rule__Documentation__LinesAssignment_2 )*
             loop73:
             do {
                 int alt73=2;
@@ -24422,9 +24422,9 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
                 switch (alt73) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9012:2: rule__Documentation__LinesAssignment_2
+            	    // InternalFSM.g:9015:2: rule__Documentation__LinesAssignment_2
             	    {
-            	    pushFollow(FOLLOW_rule__Documentation__LinesAssignment_2_in_rule__Documentation__Group__2__Impl18150);
+            	    pushFollow(FOLLOW_13);
             	    rule__Documentation__LinesAssignment_2();
 
             	    state._fsp--;
@@ -24461,16 +24461,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Documentation__Group__3"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9022:1: rule__Documentation__Group__3 : rule__Documentation__Group__3__Impl ;
+    // InternalFSM.g:9025:1: rule__Documentation__Group__3 : rule__Documentation__Group__3__Impl ;
     public final void rule__Documentation__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9026:1: ( rule__Documentation__Group__3__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9027:2: rule__Documentation__Group__3__Impl
+            // InternalFSM.g:9029:1: ( rule__Documentation__Group__3__Impl )
+            // InternalFSM.g:9030:2: rule__Documentation__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__Documentation__Group__3__Impl_in_rule__Documentation__Group__318181);
+            pushFollow(FOLLOW_2);
             rule__Documentation__Group__3__Impl();
 
             state._fsp--;
@@ -24494,20 +24494,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Documentation__Group__3__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9033:1: rule__Documentation__Group__3__Impl : ( ']' ) ;
+    // InternalFSM.g:9036:1: rule__Documentation__Group__3__Impl : ( ']' ) ;
     public final void rule__Documentation__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9037:1: ( ( ']' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9038:1: ( ']' )
+            // InternalFSM.g:9040:1: ( ( ']' ) )
+            // InternalFSM.g:9041:1: ( ']' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9038:1: ( ']' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9039:1: ']'
+            // InternalFSM.g:9041:1: ( ']' )
+            // InternalFSM.g:9042:1: ']'
             {
              before(grammarAccess.getDocumentationAccess().getRightSquareBracketKeyword_3()); 
-            match(input,66,FOLLOW_66_in_rule__Documentation__Group__3__Impl18209); 
+            match(input,66,FOLLOW_2); 
              after(grammarAccess.getDocumentationAccess().getRightSquareBracketKeyword_3()); 
 
             }
@@ -24531,21 +24531,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__BooleanLiteral__Group__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9066:1: rule__BooleanLiteral__Group__0 : rule__BooleanLiteral__Group__0__Impl rule__BooleanLiteral__Group__1 ;
+    // InternalFSM.g:9069:1: rule__BooleanLiteral__Group__0 : rule__BooleanLiteral__Group__0__Impl rule__BooleanLiteral__Group__1 ;
     public final void rule__BooleanLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9070:1: ( rule__BooleanLiteral__Group__0__Impl rule__BooleanLiteral__Group__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9071:2: rule__BooleanLiteral__Group__0__Impl rule__BooleanLiteral__Group__1
+            // InternalFSM.g:9073:1: ( rule__BooleanLiteral__Group__0__Impl rule__BooleanLiteral__Group__1 )
+            // InternalFSM.g:9074:2: rule__BooleanLiteral__Group__0__Impl rule__BooleanLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__BooleanLiteral__Group__0__Impl_in_rule__BooleanLiteral__Group__018254);
+            pushFollow(FOLLOW_46);
             rule__BooleanLiteral__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__BooleanLiteral__Group__1_in_rule__BooleanLiteral__Group__018257);
+            pushFollow(FOLLOW_2);
             rule__BooleanLiteral__Group__1();
 
             state._fsp--;
@@ -24569,21 +24569,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__BooleanLiteral__Group__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9078:1: rule__BooleanLiteral__Group__0__Impl : ( () ) ;
+    // InternalFSM.g:9081:1: rule__BooleanLiteral__Group__0__Impl : ( () ) ;
     public final void rule__BooleanLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9082:1: ( ( () ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9083:1: ( () )
+            // InternalFSM.g:9085:1: ( ( () ) )
+            // InternalFSM.g:9086:1: ( () )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9083:1: ( () )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9084:1: ()
+            // InternalFSM.g:9086:1: ( () )
+            // InternalFSM.g:9087:1: ()
             {
              before(grammarAccess.getBooleanLiteralAccess().getBooleanLiteralAction_0()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9085:1: ()
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9087:1: 
+            // InternalFSM.g:9088:1: ()
+            // InternalFSM.g:9090:1: 
             {
             }
 
@@ -24606,16 +24606,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__BooleanLiteral__Group__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9097:1: rule__BooleanLiteral__Group__1 : rule__BooleanLiteral__Group__1__Impl ;
+    // InternalFSM.g:9100:1: rule__BooleanLiteral__Group__1 : rule__BooleanLiteral__Group__1__Impl ;
     public final void rule__BooleanLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9101:1: ( rule__BooleanLiteral__Group__1__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9102:2: rule__BooleanLiteral__Group__1__Impl
+            // InternalFSM.g:9104:1: ( rule__BooleanLiteral__Group__1__Impl )
+            // InternalFSM.g:9105:2: rule__BooleanLiteral__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__BooleanLiteral__Group__1__Impl_in_rule__BooleanLiteral__Group__118315);
+            pushFollow(FOLLOW_2);
             rule__BooleanLiteral__Group__1__Impl();
 
             state._fsp--;
@@ -24639,23 +24639,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__BooleanLiteral__Group__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9108:1: rule__BooleanLiteral__Group__1__Impl : ( ( rule__BooleanLiteral__Alternatives_1 ) ) ;
+    // InternalFSM.g:9111:1: rule__BooleanLiteral__Group__1__Impl : ( ( rule__BooleanLiteral__Alternatives_1 ) ) ;
     public final void rule__BooleanLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9112:1: ( ( ( rule__BooleanLiteral__Alternatives_1 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9113:1: ( ( rule__BooleanLiteral__Alternatives_1 ) )
+            // InternalFSM.g:9115:1: ( ( ( rule__BooleanLiteral__Alternatives_1 ) ) )
+            // InternalFSM.g:9116:1: ( ( rule__BooleanLiteral__Alternatives_1 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9113:1: ( ( rule__BooleanLiteral__Alternatives_1 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9114:1: ( rule__BooleanLiteral__Alternatives_1 )
+            // InternalFSM.g:9116:1: ( ( rule__BooleanLiteral__Alternatives_1 ) )
+            // InternalFSM.g:9117:1: ( rule__BooleanLiteral__Alternatives_1 )
             {
              before(grammarAccess.getBooleanLiteralAccess().getAlternatives_1()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9115:1: ( rule__BooleanLiteral__Alternatives_1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9115:2: rule__BooleanLiteral__Alternatives_1
+            // InternalFSM.g:9118:1: ( rule__BooleanLiteral__Alternatives_1 )
+            // InternalFSM.g:9118:2: rule__BooleanLiteral__Alternatives_1
             {
-            pushFollow(FOLLOW_rule__BooleanLiteral__Alternatives_1_in_rule__BooleanLiteral__Group__1__Impl18342);
+            pushFollow(FOLLOW_2);
             rule__BooleanLiteral__Alternatives_1();
 
             state._fsp--;
@@ -24686,21 +24686,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RealLiteral__Group__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9129:1: rule__RealLiteral__Group__0 : rule__RealLiteral__Group__0__Impl rule__RealLiteral__Group__1 ;
+    // InternalFSM.g:9132:1: rule__RealLiteral__Group__0 : rule__RealLiteral__Group__0__Impl rule__RealLiteral__Group__1 ;
     public final void rule__RealLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9133:1: ( rule__RealLiteral__Group__0__Impl rule__RealLiteral__Group__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9134:2: rule__RealLiteral__Group__0__Impl rule__RealLiteral__Group__1
+            // InternalFSM.g:9136:1: ( rule__RealLiteral__Group__0__Impl rule__RealLiteral__Group__1 )
+            // InternalFSM.g:9137:2: rule__RealLiteral__Group__0__Impl rule__RealLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__RealLiteral__Group__0__Impl_in_rule__RealLiteral__Group__018376);
+            pushFollow(FOLLOW_47);
             rule__RealLiteral__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RealLiteral__Group__1_in_rule__RealLiteral__Group__018379);
+            pushFollow(FOLLOW_2);
             rule__RealLiteral__Group__1();
 
             state._fsp--;
@@ -24724,21 +24724,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RealLiteral__Group__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9141:1: rule__RealLiteral__Group__0__Impl : ( () ) ;
+    // InternalFSM.g:9144:1: rule__RealLiteral__Group__0__Impl : ( () ) ;
     public final void rule__RealLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9145:1: ( ( () ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9146:1: ( () )
+            // InternalFSM.g:9148:1: ( ( () ) )
+            // InternalFSM.g:9149:1: ( () )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9146:1: ( () )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9147:1: ()
+            // InternalFSM.g:9149:1: ( () )
+            // InternalFSM.g:9150:1: ()
             {
              before(grammarAccess.getRealLiteralAccess().getRealLiteralAction_0()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9148:1: ()
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9150:1: 
+            // InternalFSM.g:9151:1: ()
+            // InternalFSM.g:9153:1: 
             {
             }
 
@@ -24761,16 +24761,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RealLiteral__Group__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9160:1: rule__RealLiteral__Group__1 : rule__RealLiteral__Group__1__Impl ;
+    // InternalFSM.g:9163:1: rule__RealLiteral__Group__1 : rule__RealLiteral__Group__1__Impl ;
     public final void rule__RealLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9164:1: ( rule__RealLiteral__Group__1__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9165:2: rule__RealLiteral__Group__1__Impl
+            // InternalFSM.g:9167:1: ( rule__RealLiteral__Group__1__Impl )
+            // InternalFSM.g:9168:2: rule__RealLiteral__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__RealLiteral__Group__1__Impl_in_rule__RealLiteral__Group__118437);
+            pushFollow(FOLLOW_2);
             rule__RealLiteral__Group__1__Impl();
 
             state._fsp--;
@@ -24794,23 +24794,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RealLiteral__Group__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9171:1: rule__RealLiteral__Group__1__Impl : ( ( rule__RealLiteral__ValueAssignment_1 ) ) ;
+    // InternalFSM.g:9174:1: rule__RealLiteral__Group__1__Impl : ( ( rule__RealLiteral__ValueAssignment_1 ) ) ;
     public final void rule__RealLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9175:1: ( ( ( rule__RealLiteral__ValueAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9176:1: ( ( rule__RealLiteral__ValueAssignment_1 ) )
+            // InternalFSM.g:9178:1: ( ( ( rule__RealLiteral__ValueAssignment_1 ) ) )
+            // InternalFSM.g:9179:1: ( ( rule__RealLiteral__ValueAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9176:1: ( ( rule__RealLiteral__ValueAssignment_1 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9177:1: ( rule__RealLiteral__ValueAssignment_1 )
+            // InternalFSM.g:9179:1: ( ( rule__RealLiteral__ValueAssignment_1 ) )
+            // InternalFSM.g:9180:1: ( rule__RealLiteral__ValueAssignment_1 )
             {
              before(grammarAccess.getRealLiteralAccess().getValueAssignment_1()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9178:1: ( rule__RealLiteral__ValueAssignment_1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9178:2: rule__RealLiteral__ValueAssignment_1
+            // InternalFSM.g:9181:1: ( rule__RealLiteral__ValueAssignment_1 )
+            // InternalFSM.g:9181:2: rule__RealLiteral__ValueAssignment_1
             {
-            pushFollow(FOLLOW_rule__RealLiteral__ValueAssignment_1_in_rule__RealLiteral__Group__1__Impl18464);
+            pushFollow(FOLLOW_2);
             rule__RealLiteral__ValueAssignment_1();
 
             state._fsp--;
@@ -24841,21 +24841,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__IntLiteral__Group__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9192:1: rule__IntLiteral__Group__0 : rule__IntLiteral__Group__0__Impl rule__IntLiteral__Group__1 ;
+    // InternalFSM.g:9195:1: rule__IntLiteral__Group__0 : rule__IntLiteral__Group__0__Impl rule__IntLiteral__Group__1 ;
     public final void rule__IntLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9196:1: ( rule__IntLiteral__Group__0__Impl rule__IntLiteral__Group__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9197:2: rule__IntLiteral__Group__0__Impl rule__IntLiteral__Group__1
+            // InternalFSM.g:9199:1: ( rule__IntLiteral__Group__0__Impl rule__IntLiteral__Group__1 )
+            // InternalFSM.g:9200:2: rule__IntLiteral__Group__0__Impl rule__IntLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__IntLiteral__Group__0__Impl_in_rule__IntLiteral__Group__018498);
+            pushFollow(FOLLOW_47);
             rule__IntLiteral__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__IntLiteral__Group__1_in_rule__IntLiteral__Group__018501);
+            pushFollow(FOLLOW_2);
             rule__IntLiteral__Group__1();
 
             state._fsp--;
@@ -24879,21 +24879,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__IntLiteral__Group__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9204:1: rule__IntLiteral__Group__0__Impl : ( () ) ;
+    // InternalFSM.g:9207:1: rule__IntLiteral__Group__0__Impl : ( () ) ;
     public final void rule__IntLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9208:1: ( ( () ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9209:1: ( () )
+            // InternalFSM.g:9211:1: ( ( () ) )
+            // InternalFSM.g:9212:1: ( () )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9209:1: ( () )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9210:1: ()
+            // InternalFSM.g:9212:1: ( () )
+            // InternalFSM.g:9213:1: ()
             {
              before(grammarAccess.getIntLiteralAccess().getIntLiteralAction_0()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9211:1: ()
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9213:1: 
+            // InternalFSM.g:9214:1: ()
+            // InternalFSM.g:9216:1: 
             {
             }
 
@@ -24916,16 +24916,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__IntLiteral__Group__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9223:1: rule__IntLiteral__Group__1 : rule__IntLiteral__Group__1__Impl ;
+    // InternalFSM.g:9226:1: rule__IntLiteral__Group__1 : rule__IntLiteral__Group__1__Impl ;
     public final void rule__IntLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9227:1: ( rule__IntLiteral__Group__1__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9228:2: rule__IntLiteral__Group__1__Impl
+            // InternalFSM.g:9230:1: ( rule__IntLiteral__Group__1__Impl )
+            // InternalFSM.g:9231:2: rule__IntLiteral__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__IntLiteral__Group__1__Impl_in_rule__IntLiteral__Group__118559);
+            pushFollow(FOLLOW_2);
             rule__IntLiteral__Group__1__Impl();
 
             state._fsp--;
@@ -24949,23 +24949,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__IntLiteral__Group__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9234:1: rule__IntLiteral__Group__1__Impl : ( ( rule__IntLiteral__ValueAssignment_1 ) ) ;
+    // InternalFSM.g:9237:1: rule__IntLiteral__Group__1__Impl : ( ( rule__IntLiteral__ValueAssignment_1 ) ) ;
     public final void rule__IntLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9238:1: ( ( ( rule__IntLiteral__ValueAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9239:1: ( ( rule__IntLiteral__ValueAssignment_1 ) )
+            // InternalFSM.g:9241:1: ( ( ( rule__IntLiteral__ValueAssignment_1 ) ) )
+            // InternalFSM.g:9242:1: ( ( rule__IntLiteral__ValueAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9239:1: ( ( rule__IntLiteral__ValueAssignment_1 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9240:1: ( rule__IntLiteral__ValueAssignment_1 )
+            // InternalFSM.g:9242:1: ( ( rule__IntLiteral__ValueAssignment_1 ) )
+            // InternalFSM.g:9243:1: ( rule__IntLiteral__ValueAssignment_1 )
             {
              before(grammarAccess.getIntLiteralAccess().getValueAssignment_1()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9241:1: ( rule__IntLiteral__ValueAssignment_1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9241:2: rule__IntLiteral__ValueAssignment_1
+            // InternalFSM.g:9244:1: ( rule__IntLiteral__ValueAssignment_1 )
+            // InternalFSM.g:9244:2: rule__IntLiteral__ValueAssignment_1
             {
-            pushFollow(FOLLOW_rule__IntLiteral__ValueAssignment_1_in_rule__IntLiteral__Group__1__Impl18586);
+            pushFollow(FOLLOW_2);
             rule__IntLiteral__ValueAssignment_1();
 
             state._fsp--;
@@ -24996,21 +24996,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StringLiteral__Group__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9255:1: rule__StringLiteral__Group__0 : rule__StringLiteral__Group__0__Impl rule__StringLiteral__Group__1 ;
+    // InternalFSM.g:9258:1: rule__StringLiteral__Group__0 : rule__StringLiteral__Group__0__Impl rule__StringLiteral__Group__1 ;
     public final void rule__StringLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9259:1: ( rule__StringLiteral__Group__0__Impl rule__StringLiteral__Group__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9260:2: rule__StringLiteral__Group__0__Impl rule__StringLiteral__Group__1
+            // InternalFSM.g:9262:1: ( rule__StringLiteral__Group__0__Impl rule__StringLiteral__Group__1 )
+            // InternalFSM.g:9263:2: rule__StringLiteral__Group__0__Impl rule__StringLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__StringLiteral__Group__0__Impl_in_rule__StringLiteral__Group__018620);
+            pushFollow(FOLLOW_39);
             rule__StringLiteral__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__StringLiteral__Group__1_in_rule__StringLiteral__Group__018623);
+            pushFollow(FOLLOW_2);
             rule__StringLiteral__Group__1();
 
             state._fsp--;
@@ -25034,21 +25034,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StringLiteral__Group__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9267:1: rule__StringLiteral__Group__0__Impl : ( () ) ;
+    // InternalFSM.g:9270:1: rule__StringLiteral__Group__0__Impl : ( () ) ;
     public final void rule__StringLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9271:1: ( ( () ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9272:1: ( () )
+            // InternalFSM.g:9274:1: ( ( () ) )
+            // InternalFSM.g:9275:1: ( () )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9272:1: ( () )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9273:1: ()
+            // InternalFSM.g:9275:1: ( () )
+            // InternalFSM.g:9276:1: ()
             {
              before(grammarAccess.getStringLiteralAccess().getStringLiteralAction_0()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9274:1: ()
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9276:1: 
+            // InternalFSM.g:9277:1: ()
+            // InternalFSM.g:9279:1: 
             {
             }
 
@@ -25071,16 +25071,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StringLiteral__Group__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9286:1: rule__StringLiteral__Group__1 : rule__StringLiteral__Group__1__Impl ;
+    // InternalFSM.g:9289:1: rule__StringLiteral__Group__1 : rule__StringLiteral__Group__1__Impl ;
     public final void rule__StringLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9290:1: ( rule__StringLiteral__Group__1__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9291:2: rule__StringLiteral__Group__1__Impl
+            // InternalFSM.g:9293:1: ( rule__StringLiteral__Group__1__Impl )
+            // InternalFSM.g:9294:2: rule__StringLiteral__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__StringLiteral__Group__1__Impl_in_rule__StringLiteral__Group__118681);
+            pushFollow(FOLLOW_2);
             rule__StringLiteral__Group__1__Impl();
 
             state._fsp--;
@@ -25104,23 +25104,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StringLiteral__Group__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9297:1: rule__StringLiteral__Group__1__Impl : ( ( rule__StringLiteral__ValueAssignment_1 ) ) ;
+    // InternalFSM.g:9300:1: rule__StringLiteral__Group__1__Impl : ( ( rule__StringLiteral__ValueAssignment_1 ) ) ;
     public final void rule__StringLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9301:1: ( ( ( rule__StringLiteral__ValueAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9302:1: ( ( rule__StringLiteral__ValueAssignment_1 ) )
+            // InternalFSM.g:9304:1: ( ( ( rule__StringLiteral__ValueAssignment_1 ) ) )
+            // InternalFSM.g:9305:1: ( ( rule__StringLiteral__ValueAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9302:1: ( ( rule__StringLiteral__ValueAssignment_1 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9303:1: ( rule__StringLiteral__ValueAssignment_1 )
+            // InternalFSM.g:9305:1: ( ( rule__StringLiteral__ValueAssignment_1 ) )
+            // InternalFSM.g:9306:1: ( rule__StringLiteral__ValueAssignment_1 )
             {
              before(grammarAccess.getStringLiteralAccess().getValueAssignment_1()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9304:1: ( rule__StringLiteral__ValueAssignment_1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9304:2: rule__StringLiteral__ValueAssignment_1
+            // InternalFSM.g:9307:1: ( rule__StringLiteral__ValueAssignment_1 )
+            // InternalFSM.g:9307:2: rule__StringLiteral__ValueAssignment_1
             {
-            pushFollow(FOLLOW_rule__StringLiteral__ValueAssignment_1_in_rule__StringLiteral__Group__1__Impl18708);
+            pushFollow(FOLLOW_2);
             rule__StringLiteral__ValueAssignment_1();
 
             state._fsp--;
@@ -25151,21 +25151,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Integer__Group_0__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9318:1: rule__Integer__Group_0__0 : rule__Integer__Group_0__0__Impl rule__Integer__Group_0__1 ;
+    // InternalFSM.g:9321:1: rule__Integer__Group_0__0 : rule__Integer__Group_0__0__Impl rule__Integer__Group_0__1 ;
     public final void rule__Integer__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9322:1: ( rule__Integer__Group_0__0__Impl rule__Integer__Group_0__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9323:2: rule__Integer__Group_0__0__Impl rule__Integer__Group_0__1
+            // InternalFSM.g:9325:1: ( rule__Integer__Group_0__0__Impl rule__Integer__Group_0__1 )
+            // InternalFSM.g:9326:2: rule__Integer__Group_0__0__Impl rule__Integer__Group_0__1
             {
-            pushFollow(FOLLOW_rule__Integer__Group_0__0__Impl_in_rule__Integer__Group_0__018742);
+            pushFollow(FOLLOW_48);
             rule__Integer__Group_0__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Integer__Group_0__1_in_rule__Integer__Group_0__018745);
+            pushFollow(FOLLOW_2);
             rule__Integer__Group_0__1();
 
             state._fsp--;
@@ -25189,20 +25189,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Integer__Group_0__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9330:1: rule__Integer__Group_0__0__Impl : ( ( rule__Integer__Alternatives_0_0 )? ) ;
+    // InternalFSM.g:9333:1: rule__Integer__Group_0__0__Impl : ( ( rule__Integer__Alternatives_0_0 )? ) ;
     public final void rule__Integer__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9334:1: ( ( ( rule__Integer__Alternatives_0_0 )? ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9335:1: ( ( rule__Integer__Alternatives_0_0 )? )
+            // InternalFSM.g:9337:1: ( ( ( rule__Integer__Alternatives_0_0 )? ) )
+            // InternalFSM.g:9338:1: ( ( rule__Integer__Alternatives_0_0 )? )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9335:1: ( ( rule__Integer__Alternatives_0_0 )? )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9336:1: ( rule__Integer__Alternatives_0_0 )?
+            // InternalFSM.g:9338:1: ( ( rule__Integer__Alternatives_0_0 )? )
+            // InternalFSM.g:9339:1: ( rule__Integer__Alternatives_0_0 )?
             {
              before(grammarAccess.getIntegerAccess().getAlternatives_0_0()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9337:1: ( rule__Integer__Alternatives_0_0 )?
+            // InternalFSM.g:9340:1: ( rule__Integer__Alternatives_0_0 )?
             int alt74=2;
             int LA74_0 = input.LA(1);
 
@@ -25211,9 +25211,9 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt74) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9337:2: rule__Integer__Alternatives_0_0
+                    // InternalFSM.g:9340:2: rule__Integer__Alternatives_0_0
                     {
-                    pushFollow(FOLLOW_rule__Integer__Alternatives_0_0_in_rule__Integer__Group_0__0__Impl18772);
+                    pushFollow(FOLLOW_2);
                     rule__Integer__Alternatives_0_0();
 
                     state._fsp--;
@@ -25247,16 +25247,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Integer__Group_0__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9347:1: rule__Integer__Group_0__1 : rule__Integer__Group_0__1__Impl ;
+    // InternalFSM.g:9350:1: rule__Integer__Group_0__1 : rule__Integer__Group_0__1__Impl ;
     public final void rule__Integer__Group_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9351:1: ( rule__Integer__Group_0__1__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9352:2: rule__Integer__Group_0__1__Impl
+            // InternalFSM.g:9354:1: ( rule__Integer__Group_0__1__Impl )
+            // InternalFSM.g:9355:2: rule__Integer__Group_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__Integer__Group_0__1__Impl_in_rule__Integer__Group_0__118803);
+            pushFollow(FOLLOW_2);
             rule__Integer__Group_0__1__Impl();
 
             state._fsp--;
@@ -25280,20 +25280,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Integer__Group_0__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9358:1: rule__Integer__Group_0__1__Impl : ( RULE_INT ) ;
+    // InternalFSM.g:9361:1: rule__Integer__Group_0__1__Impl : ( RULE_INT ) ;
     public final void rule__Integer__Group_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9362:1: ( ( RULE_INT ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9363:1: ( RULE_INT )
+            // InternalFSM.g:9365:1: ( ( RULE_INT ) )
+            // InternalFSM.g:9366:1: ( RULE_INT )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9363:1: ( RULE_INT )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9364:1: RULE_INT
+            // InternalFSM.g:9366:1: ( RULE_INT )
+            // InternalFSM.g:9367:1: RULE_INT
             {
              before(grammarAccess.getIntegerAccess().getINTTerminalRuleCall_0_1()); 
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__Integer__Group_0__1__Impl18830); 
+            match(input,RULE_INT,FOLLOW_2); 
              after(grammarAccess.getIntegerAccess().getINTTerminalRuleCall_0_1()); 
 
             }
@@ -25317,21 +25317,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Decimal__Group__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9379:1: rule__Decimal__Group__0 : rule__Decimal__Group__0__Impl rule__Decimal__Group__1 ;
+    // InternalFSM.g:9382:1: rule__Decimal__Group__0 : rule__Decimal__Group__0__Impl rule__Decimal__Group__1 ;
     public final void rule__Decimal__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9383:1: ( rule__Decimal__Group__0__Impl rule__Decimal__Group__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9384:2: rule__Decimal__Group__0__Impl rule__Decimal__Group__1
+            // InternalFSM.g:9386:1: ( rule__Decimal__Group__0__Impl rule__Decimal__Group__1 )
+            // InternalFSM.g:9387:2: rule__Decimal__Group__0__Impl rule__Decimal__Group__1
             {
-            pushFollow(FOLLOW_rule__Decimal__Group__0__Impl_in_rule__Decimal__Group__018863);
+            pushFollow(FOLLOW_48);
             rule__Decimal__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Decimal__Group__1_in_rule__Decimal__Group__018866);
+            pushFollow(FOLLOW_2);
             rule__Decimal__Group__1();
 
             state._fsp--;
@@ -25355,20 +25355,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Decimal__Group__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9391:1: rule__Decimal__Group__0__Impl : ( ( rule__Decimal__Alternatives_0 )? ) ;
+    // InternalFSM.g:9394:1: rule__Decimal__Group__0__Impl : ( ( rule__Decimal__Alternatives_0 )? ) ;
     public final void rule__Decimal__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9395:1: ( ( ( rule__Decimal__Alternatives_0 )? ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9396:1: ( ( rule__Decimal__Alternatives_0 )? )
+            // InternalFSM.g:9398:1: ( ( ( rule__Decimal__Alternatives_0 )? ) )
+            // InternalFSM.g:9399:1: ( ( rule__Decimal__Alternatives_0 )? )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9396:1: ( ( rule__Decimal__Alternatives_0 )? )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9397:1: ( rule__Decimal__Alternatives_0 )?
+            // InternalFSM.g:9399:1: ( ( rule__Decimal__Alternatives_0 )? )
+            // InternalFSM.g:9400:1: ( rule__Decimal__Alternatives_0 )?
             {
              before(grammarAccess.getDecimalAccess().getAlternatives_0()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9398:1: ( rule__Decimal__Alternatives_0 )?
+            // InternalFSM.g:9401:1: ( rule__Decimal__Alternatives_0 )?
             int alt75=2;
             int LA75_0 = input.LA(1);
 
@@ -25377,9 +25377,9 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt75) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9398:2: rule__Decimal__Alternatives_0
+                    // InternalFSM.g:9401:2: rule__Decimal__Alternatives_0
                     {
-                    pushFollow(FOLLOW_rule__Decimal__Alternatives_0_in_rule__Decimal__Group__0__Impl18893);
+                    pushFollow(FOLLOW_2);
                     rule__Decimal__Alternatives_0();
 
                     state._fsp--;
@@ -25413,21 +25413,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Decimal__Group__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9408:1: rule__Decimal__Group__1 : rule__Decimal__Group__1__Impl rule__Decimal__Group__2 ;
+    // InternalFSM.g:9411:1: rule__Decimal__Group__1 : rule__Decimal__Group__1__Impl rule__Decimal__Group__2 ;
     public final void rule__Decimal__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9412:1: ( rule__Decimal__Group__1__Impl rule__Decimal__Group__2 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9413:2: rule__Decimal__Group__1__Impl rule__Decimal__Group__2
+            // InternalFSM.g:9415:1: ( rule__Decimal__Group__1__Impl rule__Decimal__Group__2 )
+            // InternalFSM.g:9416:2: rule__Decimal__Group__1__Impl rule__Decimal__Group__2
             {
-            pushFollow(FOLLOW_rule__Decimal__Group__1__Impl_in_rule__Decimal__Group__118924);
+            pushFollow(FOLLOW_49);
             rule__Decimal__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Decimal__Group__2_in_rule__Decimal__Group__118927);
+            pushFollow(FOLLOW_2);
             rule__Decimal__Group__2();
 
             state._fsp--;
@@ -25451,20 +25451,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Decimal__Group__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9420:1: rule__Decimal__Group__1__Impl : ( RULE_INT ) ;
+    // InternalFSM.g:9423:1: rule__Decimal__Group__1__Impl : ( RULE_INT ) ;
     public final void rule__Decimal__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9424:1: ( ( RULE_INT ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9425:1: ( RULE_INT )
+            // InternalFSM.g:9427:1: ( ( RULE_INT ) )
+            // InternalFSM.g:9428:1: ( RULE_INT )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9425:1: ( RULE_INT )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9426:1: RULE_INT
+            // InternalFSM.g:9428:1: ( RULE_INT )
+            // InternalFSM.g:9429:1: RULE_INT
             {
              before(grammarAccess.getDecimalAccess().getINTTerminalRuleCall_1()); 
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__Decimal__Group__1__Impl18954); 
+            match(input,RULE_INT,FOLLOW_2); 
              after(grammarAccess.getDecimalAccess().getINTTerminalRuleCall_1()); 
 
             }
@@ -25488,21 +25488,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Decimal__Group__2"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9437:1: rule__Decimal__Group__2 : rule__Decimal__Group__2__Impl rule__Decimal__Group__3 ;
+    // InternalFSM.g:9440:1: rule__Decimal__Group__2 : rule__Decimal__Group__2__Impl rule__Decimal__Group__3 ;
     public final void rule__Decimal__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9441:1: ( rule__Decimal__Group__2__Impl rule__Decimal__Group__3 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9442:2: rule__Decimal__Group__2__Impl rule__Decimal__Group__3
+            // InternalFSM.g:9444:1: ( rule__Decimal__Group__2__Impl rule__Decimal__Group__3 )
+            // InternalFSM.g:9445:2: rule__Decimal__Group__2__Impl rule__Decimal__Group__3
             {
-            pushFollow(FOLLOW_rule__Decimal__Group__2__Impl_in_rule__Decimal__Group__218983);
+            pushFollow(FOLLOW_50);
             rule__Decimal__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Decimal__Group__3_in_rule__Decimal__Group__218986);
+            pushFollow(FOLLOW_2);
             rule__Decimal__Group__3();
 
             state._fsp--;
@@ -25526,20 +25526,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Decimal__Group__2__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9449:1: rule__Decimal__Group__2__Impl : ( '.' ) ;
+    // InternalFSM.g:9452:1: rule__Decimal__Group__2__Impl : ( '.' ) ;
     public final void rule__Decimal__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9453:1: ( ( '.' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9454:1: ( '.' )
+            // InternalFSM.g:9456:1: ( ( '.' ) )
+            // InternalFSM.g:9457:1: ( '.' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9454:1: ( '.' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9455:1: '.'
+            // InternalFSM.g:9457:1: ( '.' )
+            // InternalFSM.g:9458:1: '.'
             {
              before(grammarAccess.getDecimalAccess().getFullStopKeyword_2()); 
-            match(input,67,FOLLOW_67_in_rule__Decimal__Group__2__Impl19014); 
+            match(input,67,FOLLOW_2); 
              after(grammarAccess.getDecimalAccess().getFullStopKeyword_2()); 
 
             }
@@ -25563,16 +25563,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Decimal__Group__3"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9468:1: rule__Decimal__Group__3 : rule__Decimal__Group__3__Impl ;
+    // InternalFSM.g:9471:1: rule__Decimal__Group__3 : rule__Decimal__Group__3__Impl ;
     public final void rule__Decimal__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9472:1: ( rule__Decimal__Group__3__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9473:2: rule__Decimal__Group__3__Impl
+            // InternalFSM.g:9475:1: ( rule__Decimal__Group__3__Impl )
+            // InternalFSM.g:9476:2: rule__Decimal__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__Decimal__Group__3__Impl_in_rule__Decimal__Group__319045);
+            pushFollow(FOLLOW_2);
             rule__Decimal__Group__3__Impl();
 
             state._fsp--;
@@ -25596,20 +25596,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Decimal__Group__3__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9479:1: rule__Decimal__Group__3__Impl : ( RULE_INT ) ;
+    // InternalFSM.g:9482:1: rule__Decimal__Group__3__Impl : ( RULE_INT ) ;
     public final void rule__Decimal__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9483:1: ( ( RULE_INT ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9484:1: ( RULE_INT )
+            // InternalFSM.g:9486:1: ( ( RULE_INT ) )
+            // InternalFSM.g:9487:1: ( RULE_INT )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9484:1: ( RULE_INT )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9485:1: RULE_INT
+            // InternalFSM.g:9487:1: ( RULE_INT )
+            // InternalFSM.g:9488:1: RULE_INT
             {
              before(grammarAccess.getDecimalAccess().getINTTerminalRuleCall_3()); 
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__Decimal__Group__3__Impl19072); 
+            match(input,RULE_INT,FOLLOW_2); 
              after(grammarAccess.getDecimalAccess().getINTTerminalRuleCall_3()); 
 
             }
@@ -25633,21 +25633,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9504:1: rule__DecimalExp__Group__0 : rule__DecimalExp__Group__0__Impl rule__DecimalExp__Group__1 ;
+    // InternalFSM.g:9507:1: rule__DecimalExp__Group__0 : rule__DecimalExp__Group__0__Impl rule__DecimalExp__Group__1 ;
     public final void rule__DecimalExp__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9508:1: ( rule__DecimalExp__Group__0__Impl rule__DecimalExp__Group__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9509:2: rule__DecimalExp__Group__0__Impl rule__DecimalExp__Group__1
+            // InternalFSM.g:9511:1: ( rule__DecimalExp__Group__0__Impl rule__DecimalExp__Group__1 )
+            // InternalFSM.g:9512:2: rule__DecimalExp__Group__0__Impl rule__DecimalExp__Group__1
             {
-            pushFollow(FOLLOW_rule__DecimalExp__Group__0__Impl_in_rule__DecimalExp__Group__019109);
+            pushFollow(FOLLOW_47);
             rule__DecimalExp__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__DecimalExp__Group__1_in_rule__DecimalExp__Group__019112);
+            pushFollow(FOLLOW_2);
             rule__DecimalExp__Group__1();
 
             state._fsp--;
@@ -25671,20 +25671,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9516:1: rule__DecimalExp__Group__0__Impl : ( ( rule__DecimalExp__Alternatives_0 )? ) ;
+    // InternalFSM.g:9519:1: rule__DecimalExp__Group__0__Impl : ( ( rule__DecimalExp__Alternatives_0 )? ) ;
     public final void rule__DecimalExp__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9520:1: ( ( ( rule__DecimalExp__Alternatives_0 )? ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9521:1: ( ( rule__DecimalExp__Alternatives_0 )? )
+            // InternalFSM.g:9523:1: ( ( ( rule__DecimalExp__Alternatives_0 )? ) )
+            // InternalFSM.g:9524:1: ( ( rule__DecimalExp__Alternatives_0 )? )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9521:1: ( ( rule__DecimalExp__Alternatives_0 )? )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9522:1: ( rule__DecimalExp__Alternatives_0 )?
+            // InternalFSM.g:9524:1: ( ( rule__DecimalExp__Alternatives_0 )? )
+            // InternalFSM.g:9525:1: ( rule__DecimalExp__Alternatives_0 )?
             {
              before(grammarAccess.getDecimalExpAccess().getAlternatives_0()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9523:1: ( rule__DecimalExp__Alternatives_0 )?
+            // InternalFSM.g:9526:1: ( rule__DecimalExp__Alternatives_0 )?
             int alt76=2;
             int LA76_0 = input.LA(1);
 
@@ -25693,9 +25693,9 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt76) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9523:2: rule__DecimalExp__Alternatives_0
+                    // InternalFSM.g:9526:2: rule__DecimalExp__Alternatives_0
                     {
-                    pushFollow(FOLLOW_rule__DecimalExp__Alternatives_0_in_rule__DecimalExp__Group__0__Impl19139);
+                    pushFollow(FOLLOW_2);
                     rule__DecimalExp__Alternatives_0();
 
                     state._fsp--;
@@ -25729,21 +25729,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9533:1: rule__DecimalExp__Group__1 : rule__DecimalExp__Group__1__Impl rule__DecimalExp__Group__2 ;
+    // InternalFSM.g:9536:1: rule__DecimalExp__Group__1 : rule__DecimalExp__Group__1__Impl rule__DecimalExp__Group__2 ;
     public final void rule__DecimalExp__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9537:1: ( rule__DecimalExp__Group__1__Impl rule__DecimalExp__Group__2 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9538:2: rule__DecimalExp__Group__1__Impl rule__DecimalExp__Group__2
+            // InternalFSM.g:9540:1: ( rule__DecimalExp__Group__1__Impl rule__DecimalExp__Group__2 )
+            // InternalFSM.g:9541:2: rule__DecimalExp__Group__1__Impl rule__DecimalExp__Group__2
             {
-            pushFollow(FOLLOW_rule__DecimalExp__Group__1__Impl_in_rule__DecimalExp__Group__119170);
+            pushFollow(FOLLOW_49);
             rule__DecimalExp__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__DecimalExp__Group__2_in_rule__DecimalExp__Group__119173);
+            pushFollow(FOLLOW_2);
             rule__DecimalExp__Group__2();
 
             state._fsp--;
@@ -25767,20 +25767,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9545:1: rule__DecimalExp__Group__1__Impl : ( RULE_INT ) ;
+    // InternalFSM.g:9548:1: rule__DecimalExp__Group__1__Impl : ( RULE_INT ) ;
     public final void rule__DecimalExp__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9549:1: ( ( RULE_INT ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9550:1: ( RULE_INT )
+            // InternalFSM.g:9552:1: ( ( RULE_INT ) )
+            // InternalFSM.g:9553:1: ( RULE_INT )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9550:1: ( RULE_INT )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9551:1: RULE_INT
+            // InternalFSM.g:9553:1: ( RULE_INT )
+            // InternalFSM.g:9554:1: RULE_INT
             {
              before(grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_1()); 
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__DecimalExp__Group__1__Impl19200); 
+            match(input,RULE_INT,FOLLOW_2); 
              after(grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_1()); 
 
             }
@@ -25804,21 +25804,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__2"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9562:1: rule__DecimalExp__Group__2 : rule__DecimalExp__Group__2__Impl rule__DecimalExp__Group__3 ;
+    // InternalFSM.g:9565:1: rule__DecimalExp__Group__2 : rule__DecimalExp__Group__2__Impl rule__DecimalExp__Group__3 ;
     public final void rule__DecimalExp__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9566:1: ( rule__DecimalExp__Group__2__Impl rule__DecimalExp__Group__3 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9567:2: rule__DecimalExp__Group__2__Impl rule__DecimalExp__Group__3
+            // InternalFSM.g:9569:1: ( rule__DecimalExp__Group__2__Impl rule__DecimalExp__Group__3 )
+            // InternalFSM.g:9570:2: rule__DecimalExp__Group__2__Impl rule__DecimalExp__Group__3
             {
-            pushFollow(FOLLOW_rule__DecimalExp__Group__2__Impl_in_rule__DecimalExp__Group__219229);
+            pushFollow(FOLLOW_50);
             rule__DecimalExp__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__DecimalExp__Group__3_in_rule__DecimalExp__Group__219232);
+            pushFollow(FOLLOW_2);
             rule__DecimalExp__Group__3();
 
             state._fsp--;
@@ -25842,20 +25842,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__2__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9574:1: rule__DecimalExp__Group__2__Impl : ( '.' ) ;
+    // InternalFSM.g:9577:1: rule__DecimalExp__Group__2__Impl : ( '.' ) ;
     public final void rule__DecimalExp__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9578:1: ( ( '.' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9579:1: ( '.' )
+            // InternalFSM.g:9581:1: ( ( '.' ) )
+            // InternalFSM.g:9582:1: ( '.' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9579:1: ( '.' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9580:1: '.'
+            // InternalFSM.g:9582:1: ( '.' )
+            // InternalFSM.g:9583:1: '.'
             {
              before(grammarAccess.getDecimalExpAccess().getFullStopKeyword_2()); 
-            match(input,67,FOLLOW_67_in_rule__DecimalExp__Group__2__Impl19260); 
+            match(input,67,FOLLOW_2); 
              after(grammarAccess.getDecimalExpAccess().getFullStopKeyword_2()); 
 
             }
@@ -25879,21 +25879,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__3"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9593:1: rule__DecimalExp__Group__3 : rule__DecimalExp__Group__3__Impl rule__DecimalExp__Group__4 ;
+    // InternalFSM.g:9596:1: rule__DecimalExp__Group__3 : rule__DecimalExp__Group__3__Impl rule__DecimalExp__Group__4 ;
     public final void rule__DecimalExp__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9597:1: ( rule__DecimalExp__Group__3__Impl rule__DecimalExp__Group__4 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9598:2: rule__DecimalExp__Group__3__Impl rule__DecimalExp__Group__4
+            // InternalFSM.g:9600:1: ( rule__DecimalExp__Group__3__Impl rule__DecimalExp__Group__4 )
+            // InternalFSM.g:9601:2: rule__DecimalExp__Group__3__Impl rule__DecimalExp__Group__4
             {
-            pushFollow(FOLLOW_rule__DecimalExp__Group__3__Impl_in_rule__DecimalExp__Group__319291);
+            pushFollow(FOLLOW_51);
             rule__DecimalExp__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__DecimalExp__Group__4_in_rule__DecimalExp__Group__319294);
+            pushFollow(FOLLOW_2);
             rule__DecimalExp__Group__4();
 
             state._fsp--;
@@ -25917,20 +25917,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__3__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9605:1: rule__DecimalExp__Group__3__Impl : ( RULE_INT ) ;
+    // InternalFSM.g:9608:1: rule__DecimalExp__Group__3__Impl : ( RULE_INT ) ;
     public final void rule__DecimalExp__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9609:1: ( ( RULE_INT ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9610:1: ( RULE_INT )
+            // InternalFSM.g:9612:1: ( ( RULE_INT ) )
+            // InternalFSM.g:9613:1: ( RULE_INT )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9610:1: ( RULE_INT )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9611:1: RULE_INT
+            // InternalFSM.g:9613:1: ( RULE_INT )
+            // InternalFSM.g:9614:1: RULE_INT
             {
              before(grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_3()); 
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__DecimalExp__Group__3__Impl19321); 
+            match(input,RULE_INT,FOLLOW_2); 
              after(grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_3()); 
 
             }
@@ -25954,21 +25954,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__4"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9622:1: rule__DecimalExp__Group__4 : rule__DecimalExp__Group__4__Impl rule__DecimalExp__Group__5 ;
+    // InternalFSM.g:9625:1: rule__DecimalExp__Group__4 : rule__DecimalExp__Group__4__Impl rule__DecimalExp__Group__5 ;
     public final void rule__DecimalExp__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9626:1: ( rule__DecimalExp__Group__4__Impl rule__DecimalExp__Group__5 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9627:2: rule__DecimalExp__Group__4__Impl rule__DecimalExp__Group__5
+            // InternalFSM.g:9629:1: ( rule__DecimalExp__Group__4__Impl rule__DecimalExp__Group__5 )
+            // InternalFSM.g:9630:2: rule__DecimalExp__Group__4__Impl rule__DecimalExp__Group__5
             {
-            pushFollow(FOLLOW_rule__DecimalExp__Group__4__Impl_in_rule__DecimalExp__Group__419350);
+            pushFollow(FOLLOW_48);
             rule__DecimalExp__Group__4__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__DecimalExp__Group__5_in_rule__DecimalExp__Group__419353);
+            pushFollow(FOLLOW_2);
             rule__DecimalExp__Group__5();
 
             state._fsp--;
@@ -25992,23 +25992,23 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__4__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9634:1: rule__DecimalExp__Group__4__Impl : ( ( rule__DecimalExp__Alternatives_4 ) ) ;
+    // InternalFSM.g:9637:1: rule__DecimalExp__Group__4__Impl : ( ( rule__DecimalExp__Alternatives_4 ) ) ;
     public final void rule__DecimalExp__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9638:1: ( ( ( rule__DecimalExp__Alternatives_4 ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9639:1: ( ( rule__DecimalExp__Alternatives_4 ) )
+            // InternalFSM.g:9641:1: ( ( ( rule__DecimalExp__Alternatives_4 ) ) )
+            // InternalFSM.g:9642:1: ( ( rule__DecimalExp__Alternatives_4 ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9639:1: ( ( rule__DecimalExp__Alternatives_4 ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9640:1: ( rule__DecimalExp__Alternatives_4 )
+            // InternalFSM.g:9642:1: ( ( rule__DecimalExp__Alternatives_4 ) )
+            // InternalFSM.g:9643:1: ( rule__DecimalExp__Alternatives_4 )
             {
              before(grammarAccess.getDecimalExpAccess().getAlternatives_4()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9641:1: ( rule__DecimalExp__Alternatives_4 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9641:2: rule__DecimalExp__Alternatives_4
+            // InternalFSM.g:9644:1: ( rule__DecimalExp__Alternatives_4 )
+            // InternalFSM.g:9644:2: rule__DecimalExp__Alternatives_4
             {
-            pushFollow(FOLLOW_rule__DecimalExp__Alternatives_4_in_rule__DecimalExp__Group__4__Impl19380);
+            pushFollow(FOLLOW_2);
             rule__DecimalExp__Alternatives_4();
 
             state._fsp--;
@@ -26039,21 +26039,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__5"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9651:1: rule__DecimalExp__Group__5 : rule__DecimalExp__Group__5__Impl rule__DecimalExp__Group__6 ;
+    // InternalFSM.g:9654:1: rule__DecimalExp__Group__5 : rule__DecimalExp__Group__5__Impl rule__DecimalExp__Group__6 ;
     public final void rule__DecimalExp__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9655:1: ( rule__DecimalExp__Group__5__Impl rule__DecimalExp__Group__6 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9656:2: rule__DecimalExp__Group__5__Impl rule__DecimalExp__Group__6
+            // InternalFSM.g:9658:1: ( rule__DecimalExp__Group__5__Impl rule__DecimalExp__Group__6 )
+            // InternalFSM.g:9659:2: rule__DecimalExp__Group__5__Impl rule__DecimalExp__Group__6
             {
-            pushFollow(FOLLOW_rule__DecimalExp__Group__5__Impl_in_rule__DecimalExp__Group__519410);
+            pushFollow(FOLLOW_48);
             rule__DecimalExp__Group__5__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__DecimalExp__Group__6_in_rule__DecimalExp__Group__519413);
+            pushFollow(FOLLOW_2);
             rule__DecimalExp__Group__6();
 
             state._fsp--;
@@ -26077,20 +26077,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__5__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9663:1: rule__DecimalExp__Group__5__Impl : ( ( rule__DecimalExp__Alternatives_5 )? ) ;
+    // InternalFSM.g:9666:1: rule__DecimalExp__Group__5__Impl : ( ( rule__DecimalExp__Alternatives_5 )? ) ;
     public final void rule__DecimalExp__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9667:1: ( ( ( rule__DecimalExp__Alternatives_5 )? ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9668:1: ( ( rule__DecimalExp__Alternatives_5 )? )
+            // InternalFSM.g:9670:1: ( ( ( rule__DecimalExp__Alternatives_5 )? ) )
+            // InternalFSM.g:9671:1: ( ( rule__DecimalExp__Alternatives_5 )? )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9668:1: ( ( rule__DecimalExp__Alternatives_5 )? )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9669:1: ( rule__DecimalExp__Alternatives_5 )?
+            // InternalFSM.g:9671:1: ( ( rule__DecimalExp__Alternatives_5 )? )
+            // InternalFSM.g:9672:1: ( rule__DecimalExp__Alternatives_5 )?
             {
              before(grammarAccess.getDecimalExpAccess().getAlternatives_5()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9670:1: ( rule__DecimalExp__Alternatives_5 )?
+            // InternalFSM.g:9673:1: ( rule__DecimalExp__Alternatives_5 )?
             int alt77=2;
             int LA77_0 = input.LA(1);
 
@@ -26099,9 +26099,9 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt77) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9670:2: rule__DecimalExp__Alternatives_5
+                    // InternalFSM.g:9673:2: rule__DecimalExp__Alternatives_5
                     {
-                    pushFollow(FOLLOW_rule__DecimalExp__Alternatives_5_in_rule__DecimalExp__Group__5__Impl19440);
+                    pushFollow(FOLLOW_2);
                     rule__DecimalExp__Alternatives_5();
 
                     state._fsp--;
@@ -26135,16 +26135,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__6"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9680:1: rule__DecimalExp__Group__6 : rule__DecimalExp__Group__6__Impl ;
+    // InternalFSM.g:9683:1: rule__DecimalExp__Group__6 : rule__DecimalExp__Group__6__Impl ;
     public final void rule__DecimalExp__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9684:1: ( rule__DecimalExp__Group__6__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9685:2: rule__DecimalExp__Group__6__Impl
+            // InternalFSM.g:9687:1: ( rule__DecimalExp__Group__6__Impl )
+            // InternalFSM.g:9688:2: rule__DecimalExp__Group__6__Impl
             {
-            pushFollow(FOLLOW_rule__DecimalExp__Group__6__Impl_in_rule__DecimalExp__Group__619471);
+            pushFollow(FOLLOW_2);
             rule__DecimalExp__Group__6__Impl();
 
             state._fsp--;
@@ -26168,20 +26168,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__6__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9691:1: rule__DecimalExp__Group__6__Impl : ( RULE_INT ) ;
+    // InternalFSM.g:9694:1: rule__DecimalExp__Group__6__Impl : ( RULE_INT ) ;
     public final void rule__DecimalExp__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9695:1: ( ( RULE_INT ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9696:1: ( RULE_INT )
+            // InternalFSM.g:9698:1: ( ( RULE_INT ) )
+            // InternalFSM.g:9699:1: ( RULE_INT )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9696:1: ( RULE_INT )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9697:1: RULE_INT
+            // InternalFSM.g:9699:1: ( RULE_INT )
+            // InternalFSM.g:9700:1: RULE_INT
             {
              before(grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_6()); 
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__DecimalExp__Group__6__Impl19498); 
+            match(input,RULE_INT,FOLLOW_2); 
              after(grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_6()); 
 
             }
@@ -26205,21 +26205,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FQN__Group__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9722:1: rule__FQN__Group__0 : rule__FQN__Group__0__Impl rule__FQN__Group__1 ;
+    // InternalFSM.g:9725:1: rule__FQN__Group__0 : rule__FQN__Group__0__Impl rule__FQN__Group__1 ;
     public final void rule__FQN__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9726:1: ( rule__FQN__Group__0__Impl rule__FQN__Group__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9727:2: rule__FQN__Group__0__Impl rule__FQN__Group__1
+            // InternalFSM.g:9729:1: ( rule__FQN__Group__0__Impl rule__FQN__Group__1 )
+            // InternalFSM.g:9730:2: rule__FQN__Group__0__Impl rule__FQN__Group__1
             {
-            pushFollow(FOLLOW_rule__FQN__Group__0__Impl_in_rule__FQN__Group__019541);
+            pushFollow(FOLLOW_49);
             rule__FQN__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__FQN__Group__1_in_rule__FQN__Group__019544);
+            pushFollow(FOLLOW_2);
             rule__FQN__Group__1();
 
             state._fsp--;
@@ -26243,20 +26243,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FQN__Group__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9734:1: rule__FQN__Group__0__Impl : ( RULE_ID ) ;
+    // InternalFSM.g:9737:1: rule__FQN__Group__0__Impl : ( RULE_ID ) ;
     public final void rule__FQN__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9738:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9739:1: ( RULE_ID )
+            // InternalFSM.g:9741:1: ( ( RULE_ID ) )
+            // InternalFSM.g:9742:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9739:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9740:1: RULE_ID
+            // InternalFSM.g:9742:1: ( RULE_ID )
+            // InternalFSM.g:9743:1: RULE_ID
             {
              before(grammarAccess.getFQNAccess().getIDTerminalRuleCall_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__FQN__Group__0__Impl19571); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getFQNAccess().getIDTerminalRuleCall_0()); 
 
             }
@@ -26280,16 +26280,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FQN__Group__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9751:1: rule__FQN__Group__1 : rule__FQN__Group__1__Impl ;
+    // InternalFSM.g:9754:1: rule__FQN__Group__1 : rule__FQN__Group__1__Impl ;
     public final void rule__FQN__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9755:1: ( rule__FQN__Group__1__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9756:2: rule__FQN__Group__1__Impl
+            // InternalFSM.g:9758:1: ( rule__FQN__Group__1__Impl )
+            // InternalFSM.g:9759:2: rule__FQN__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__FQN__Group__1__Impl_in_rule__FQN__Group__119600);
+            pushFollow(FOLLOW_2);
             rule__FQN__Group__1__Impl();
 
             state._fsp--;
@@ -26313,20 +26313,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FQN__Group__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9762:1: rule__FQN__Group__1__Impl : ( ( rule__FQN__Group_1__0 )* ) ;
+    // InternalFSM.g:9765:1: rule__FQN__Group__1__Impl : ( ( rule__FQN__Group_1__0 )* ) ;
     public final void rule__FQN__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9766:1: ( ( ( rule__FQN__Group_1__0 )* ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9767:1: ( ( rule__FQN__Group_1__0 )* )
+            // InternalFSM.g:9769:1: ( ( ( rule__FQN__Group_1__0 )* ) )
+            // InternalFSM.g:9770:1: ( ( rule__FQN__Group_1__0 )* )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9767:1: ( ( rule__FQN__Group_1__0 )* )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9768:1: ( rule__FQN__Group_1__0 )*
+            // InternalFSM.g:9770:1: ( ( rule__FQN__Group_1__0 )* )
+            // InternalFSM.g:9771:1: ( rule__FQN__Group_1__0 )*
             {
              before(grammarAccess.getFQNAccess().getGroup_1()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9769:1: ( rule__FQN__Group_1__0 )*
+            // InternalFSM.g:9772:1: ( rule__FQN__Group_1__0 )*
             loop78:
             do {
                 int alt78=2;
@@ -26339,9 +26339,9 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
                 switch (alt78) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9769:2: rule__FQN__Group_1__0
+            	    // InternalFSM.g:9772:2: rule__FQN__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__FQN__Group_1__0_in_rule__FQN__Group__1__Impl19627);
+            	    pushFollow(FOLLOW_52);
             	    rule__FQN__Group_1__0();
 
             	    state._fsp--;
@@ -26378,21 +26378,21 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FQN__Group_1__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9783:1: rule__FQN__Group_1__0 : rule__FQN__Group_1__0__Impl rule__FQN__Group_1__1 ;
+    // InternalFSM.g:9786:1: rule__FQN__Group_1__0 : rule__FQN__Group_1__0__Impl rule__FQN__Group_1__1 ;
     public final void rule__FQN__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9787:1: ( rule__FQN__Group_1__0__Impl rule__FQN__Group_1__1 )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9788:2: rule__FQN__Group_1__0__Impl rule__FQN__Group_1__1
+            // InternalFSM.g:9790:1: ( rule__FQN__Group_1__0__Impl rule__FQN__Group_1__1 )
+            // InternalFSM.g:9791:2: rule__FQN__Group_1__0__Impl rule__FQN__Group_1__1
             {
-            pushFollow(FOLLOW_rule__FQN__Group_1__0__Impl_in_rule__FQN__Group_1__019662);
+            pushFollow(FOLLOW_5);
             rule__FQN__Group_1__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__FQN__Group_1__1_in_rule__FQN__Group_1__019665);
+            pushFollow(FOLLOW_2);
             rule__FQN__Group_1__1();
 
             state._fsp--;
@@ -26416,20 +26416,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FQN__Group_1__0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9795:1: rule__FQN__Group_1__0__Impl : ( '.' ) ;
+    // InternalFSM.g:9798:1: rule__FQN__Group_1__0__Impl : ( '.' ) ;
     public final void rule__FQN__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9799:1: ( ( '.' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9800:1: ( '.' )
+            // InternalFSM.g:9802:1: ( ( '.' ) )
+            // InternalFSM.g:9803:1: ( '.' )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9800:1: ( '.' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9801:1: '.'
+            // InternalFSM.g:9803:1: ( '.' )
+            // InternalFSM.g:9804:1: '.'
             {
              before(grammarAccess.getFQNAccess().getFullStopKeyword_1_0()); 
-            match(input,67,FOLLOW_67_in_rule__FQN__Group_1__0__Impl19693); 
+            match(input,67,FOLLOW_2); 
              after(grammarAccess.getFQNAccess().getFullStopKeyword_1_0()); 
 
             }
@@ -26453,16 +26453,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FQN__Group_1__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9814:1: rule__FQN__Group_1__1 : rule__FQN__Group_1__1__Impl ;
+    // InternalFSM.g:9817:1: rule__FQN__Group_1__1 : rule__FQN__Group_1__1__Impl ;
     public final void rule__FQN__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9818:1: ( rule__FQN__Group_1__1__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9819:2: rule__FQN__Group_1__1__Impl
+            // InternalFSM.g:9821:1: ( rule__FQN__Group_1__1__Impl )
+            // InternalFSM.g:9822:2: rule__FQN__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__FQN__Group_1__1__Impl_in_rule__FQN__Group_1__119724);
+            pushFollow(FOLLOW_2);
             rule__FQN__Group_1__1__Impl();
 
             state._fsp--;
@@ -26486,20 +26486,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FQN__Group_1__1__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9825:1: rule__FQN__Group_1__1__Impl : ( RULE_ID ) ;
+    // InternalFSM.g:9828:1: rule__FQN__Group_1__1__Impl : ( RULE_ID ) ;
     public final void rule__FQN__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9829:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9830:1: ( RULE_ID )
+            // InternalFSM.g:9832:1: ( ( RULE_ID ) )
+            // InternalFSM.g:9833:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9830:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9831:1: RULE_ID
+            // InternalFSM.g:9833:1: ( RULE_ID )
+            // InternalFSM.g:9834:1: RULE_ID
             {
              before(grammarAccess.getFQNAccess().getIDTerminalRuleCall_1_1()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__FQN__Group_1__1__Impl19751); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getFQNAccess().getIDTerminalRuleCall_1_1()); 
 
             }
@@ -26523,31 +26523,31 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ModelComponent__UnorderedGroup_0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9847:1: rule__ModelComponent__UnorderedGroup_0 : ( rule__ModelComponent__UnorderedGroup_0__0 )? ;
+    // InternalFSM.g:9850:1: rule__ModelComponent__UnorderedGroup_0 : ( rule__ModelComponent__UnorderedGroup_0__0 )? ;
     public final void rule__ModelComponent__UnorderedGroup_0() throws RecognitionException {
 
             	int stackSize = keepStackSize();
         		getUnorderedGroupHelper().enter(grammarAccess.getModelComponentAccess().getUnorderedGroup_0());
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9852:1: ( ( rule__ModelComponent__UnorderedGroup_0__0 )? )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9853:2: ( rule__ModelComponent__UnorderedGroup_0__0 )?
+            // InternalFSM.g:9855:1: ( ( rule__ModelComponent__UnorderedGroup_0__0 )? )
+            // InternalFSM.g:9856:2: ( rule__ModelComponent__UnorderedGroup_0__0 )?
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9853:2: ( rule__ModelComponent__UnorderedGroup_0__0 )?
+            // InternalFSM.g:9856:2: ( rule__ModelComponent__UnorderedGroup_0__0 )?
             int alt79=2;
             int LA79_0 = input.LA(1);
 
-            if ( LA79_0 ==68 && getUnorderedGroupHelper().canSelect(grammarAccess.getModelComponentAccess().getUnorderedGroup_0(), 0) ) {
+            if ( LA79_0 == 68 && getUnorderedGroupHelper().canSelect(grammarAccess.getModelComponentAccess().getUnorderedGroup_0(), 0) ) {
                 alt79=1;
             }
-            else if ( LA79_0 >=18 && LA79_0<=21 && getUnorderedGroupHelper().canSelect(grammarAccess.getModelComponentAccess().getUnorderedGroup_0(), 1) ) {
+            else if ( LA79_0 >= 18 && LA79_0 <= 21 && getUnorderedGroupHelper().canSelect(grammarAccess.getModelComponentAccess().getUnorderedGroup_0(), 1) ) {
                 alt79=1;
             }
             switch (alt79) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9853:2: rule__ModelComponent__UnorderedGroup_0__0
+                    // InternalFSM.g:9856:2: rule__ModelComponent__UnorderedGroup_0__0
                     {
-                    pushFollow(FOLLOW_rule__ModelComponent__UnorderedGroup_0__0_in_rule__ModelComponent__UnorderedGroup_019785);
+                    pushFollow(FOLLOW_2);
                     rule__ModelComponent__UnorderedGroup_0__0();
 
                     state._fsp--;
@@ -26578,24 +26578,24 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ModelComponent__UnorderedGroup_0__Impl"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9863:1: rule__ModelComponent__UnorderedGroup_0__Impl : ( ({...}? => ( ( ( rule__ModelComponent__AbstractAssignment_0_0 ) ) ) ) | ({...}? => ( ( ( rule__ModelComponent__CommTypeAssignment_0_1 ) ) ) ) ) ;
+    // InternalFSM.g:9866:1: rule__ModelComponent__UnorderedGroup_0__Impl : ( ({...}? => ( ( ( rule__ModelComponent__AbstractAssignment_0_0 ) ) ) ) | ({...}? => ( ( ( rule__ModelComponent__CommTypeAssignment_0_1 ) ) ) ) ) ;
     public final void rule__ModelComponent__UnorderedGroup_0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         		boolean selected = false;
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9868:1: ( ( ({...}? => ( ( ( rule__ModelComponent__AbstractAssignment_0_0 ) ) ) ) | ({...}? => ( ( ( rule__ModelComponent__CommTypeAssignment_0_1 ) ) ) ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9869:3: ( ({...}? => ( ( ( rule__ModelComponent__AbstractAssignment_0_0 ) ) ) ) | ({...}? => ( ( ( rule__ModelComponent__CommTypeAssignment_0_1 ) ) ) ) )
+            // InternalFSM.g:9871:1: ( ( ({...}? => ( ( ( rule__ModelComponent__AbstractAssignment_0_0 ) ) ) ) | ({...}? => ( ( ( rule__ModelComponent__CommTypeAssignment_0_1 ) ) ) ) ) )
+            // InternalFSM.g:9872:3: ( ({...}? => ( ( ( rule__ModelComponent__AbstractAssignment_0_0 ) ) ) ) | ({...}? => ( ( ( rule__ModelComponent__CommTypeAssignment_0_1 ) ) ) ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9869:3: ( ({...}? => ( ( ( rule__ModelComponent__AbstractAssignment_0_0 ) ) ) ) | ({...}? => ( ( ( rule__ModelComponent__CommTypeAssignment_0_1 ) ) ) ) )
+            // InternalFSM.g:9872:3: ( ({...}? => ( ( ( rule__ModelComponent__AbstractAssignment_0_0 ) ) ) ) | ({...}? => ( ( ( rule__ModelComponent__CommTypeAssignment_0_1 ) ) ) ) )
             int alt80=2;
             int LA80_0 = input.LA(1);
 
-            if ( LA80_0 ==68 && getUnorderedGroupHelper().canSelect(grammarAccess.getModelComponentAccess().getUnorderedGroup_0(), 0) ) {
+            if ( LA80_0 == 68 && getUnorderedGroupHelper().canSelect(grammarAccess.getModelComponentAccess().getUnorderedGroup_0(), 0) ) {
                 alt80=1;
             }
-            else if ( LA80_0 >=18 && LA80_0<=21 && getUnorderedGroupHelper().canSelect(grammarAccess.getModelComponentAccess().getUnorderedGroup_0(), 1) ) {
+            else if ( LA80_0 >= 18 && LA80_0 <= 21 && getUnorderedGroupHelper().canSelect(grammarAccess.getModelComponentAccess().getUnorderedGroup_0(), 1) ) {
                 alt80=2;
             }
             else {
@@ -26606,16 +26606,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             }
             switch (alt80) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9871:4: ({...}? => ( ( ( rule__ModelComponent__AbstractAssignment_0_0 ) ) ) )
+                    // InternalFSM.g:9874:4: ({...}? => ( ( ( rule__ModelComponent__AbstractAssignment_0_0 ) ) ) )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9871:4: ({...}? => ( ( ( rule__ModelComponent__AbstractAssignment_0_0 ) ) ) )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9872:5: {...}? => ( ( ( rule__ModelComponent__AbstractAssignment_0_0 ) ) )
+                    // InternalFSM.g:9874:4: ({...}? => ( ( ( rule__ModelComponent__AbstractAssignment_0_0 ) ) ) )
+                    // InternalFSM.g:9875:5: {...}? => ( ( ( rule__ModelComponent__AbstractAssignment_0_0 ) ) )
                     {
                     if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getModelComponentAccess().getUnorderedGroup_0(), 0) ) {
                         throw new FailedPredicateException(input, "rule__ModelComponent__UnorderedGroup_0__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getModelComponentAccess().getUnorderedGroup_0(), 0)");
                     }
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9872:111: ( ( ( rule__ModelComponent__AbstractAssignment_0_0 ) ) )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9873:6: ( ( rule__ModelComponent__AbstractAssignment_0_0 ) )
+                    // InternalFSM.g:9875:111: ( ( ( rule__ModelComponent__AbstractAssignment_0_0 ) ) )
+                    // InternalFSM.g:9876:6: ( ( rule__ModelComponent__AbstractAssignment_0_0 ) )
                     {
                      
                     	 				  getUnorderedGroupHelper().select(grammarAccess.getModelComponentAccess().getUnorderedGroup_0(), 0);
@@ -26623,14 +26623,14 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
                     	 				  selected = true;
                     	 				
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9879:6: ( ( rule__ModelComponent__AbstractAssignment_0_0 ) )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9881:7: ( rule__ModelComponent__AbstractAssignment_0_0 )
+                    // InternalFSM.g:9882:6: ( ( rule__ModelComponent__AbstractAssignment_0_0 ) )
+                    // InternalFSM.g:9884:7: ( rule__ModelComponent__AbstractAssignment_0_0 )
                     {
                      before(grammarAccess.getModelComponentAccess().getAbstractAssignment_0_0()); 
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9882:7: ( rule__ModelComponent__AbstractAssignment_0_0 )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9882:8: rule__ModelComponent__AbstractAssignment_0_0
+                    // InternalFSM.g:9885:7: ( rule__ModelComponent__AbstractAssignment_0_0 )
+                    // InternalFSM.g:9885:8: rule__ModelComponent__AbstractAssignment_0_0
                     {
-                    pushFollow(FOLLOW_rule__ModelComponent__AbstractAssignment_0_0_in_rule__ModelComponent__UnorderedGroup_0__Impl19872);
+                    pushFollow(FOLLOW_2);
                     rule__ModelComponent__AbstractAssignment_0_0();
 
                     state._fsp--;
@@ -26652,16 +26652,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9888:4: ({...}? => ( ( ( rule__ModelComponent__CommTypeAssignment_0_1 ) ) ) )
+                    // InternalFSM.g:9891:4: ({...}? => ( ( ( rule__ModelComponent__CommTypeAssignment_0_1 ) ) ) )
                     {
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9888:4: ({...}? => ( ( ( rule__ModelComponent__CommTypeAssignment_0_1 ) ) ) )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9889:5: {...}? => ( ( ( rule__ModelComponent__CommTypeAssignment_0_1 ) ) )
+                    // InternalFSM.g:9891:4: ({...}? => ( ( ( rule__ModelComponent__CommTypeAssignment_0_1 ) ) ) )
+                    // InternalFSM.g:9892:5: {...}? => ( ( ( rule__ModelComponent__CommTypeAssignment_0_1 ) ) )
                     {
                     if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getModelComponentAccess().getUnorderedGroup_0(), 1) ) {
                         throw new FailedPredicateException(input, "rule__ModelComponent__UnorderedGroup_0__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getModelComponentAccess().getUnorderedGroup_0(), 1)");
                     }
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9889:111: ( ( ( rule__ModelComponent__CommTypeAssignment_0_1 ) ) )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9890:6: ( ( rule__ModelComponent__CommTypeAssignment_0_1 ) )
+                    // InternalFSM.g:9892:111: ( ( ( rule__ModelComponent__CommTypeAssignment_0_1 ) ) )
+                    // InternalFSM.g:9893:6: ( ( rule__ModelComponent__CommTypeAssignment_0_1 ) )
                     {
                      
                     	 				  getUnorderedGroupHelper().select(grammarAccess.getModelComponentAccess().getUnorderedGroup_0(), 1);
@@ -26669,14 +26669,14 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
                     	 				  selected = true;
                     	 				
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9896:6: ( ( rule__ModelComponent__CommTypeAssignment_0_1 ) )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9898:7: ( rule__ModelComponent__CommTypeAssignment_0_1 )
+                    // InternalFSM.g:9899:6: ( ( rule__ModelComponent__CommTypeAssignment_0_1 ) )
+                    // InternalFSM.g:9901:7: ( rule__ModelComponent__CommTypeAssignment_0_1 )
                     {
                      before(grammarAccess.getModelComponentAccess().getCommTypeAssignment_0_1()); 
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9899:7: ( rule__ModelComponent__CommTypeAssignment_0_1 )
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9899:8: rule__ModelComponent__CommTypeAssignment_0_1
+                    // InternalFSM.g:9902:7: ( rule__ModelComponent__CommTypeAssignment_0_1 )
+                    // InternalFSM.g:9902:8: rule__ModelComponent__CommTypeAssignment_0_1
                     {
-                    pushFollow(FOLLOW_rule__ModelComponent__CommTypeAssignment_0_1_in_rule__ModelComponent__UnorderedGroup_0__Impl19963);
+                    pushFollow(FOLLOW_2);
                     rule__ModelComponent__CommTypeAssignment_0_1();
 
                     state._fsp--;
@@ -26721,35 +26721,35 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ModelComponent__UnorderedGroup_0__0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9914:1: rule__ModelComponent__UnorderedGroup_0__0 : rule__ModelComponent__UnorderedGroup_0__Impl ( rule__ModelComponent__UnorderedGroup_0__1 )? ;
+    // InternalFSM.g:9917:1: rule__ModelComponent__UnorderedGroup_0__0 : rule__ModelComponent__UnorderedGroup_0__Impl ( rule__ModelComponent__UnorderedGroup_0__1 )? ;
     public final void rule__ModelComponent__UnorderedGroup_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9918:1: ( rule__ModelComponent__UnorderedGroup_0__Impl ( rule__ModelComponent__UnorderedGroup_0__1 )? )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9919:2: rule__ModelComponent__UnorderedGroup_0__Impl ( rule__ModelComponent__UnorderedGroup_0__1 )?
+            // InternalFSM.g:9921:1: ( rule__ModelComponent__UnorderedGroup_0__Impl ( rule__ModelComponent__UnorderedGroup_0__1 )? )
+            // InternalFSM.g:9922:2: rule__ModelComponent__UnorderedGroup_0__Impl ( rule__ModelComponent__UnorderedGroup_0__1 )?
             {
-            pushFollow(FOLLOW_rule__ModelComponent__UnorderedGroup_0__Impl_in_rule__ModelComponent__UnorderedGroup_0__020022);
+            pushFollow(FOLLOW_3);
             rule__ModelComponent__UnorderedGroup_0__Impl();
 
             state._fsp--;
 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9920:2: ( rule__ModelComponent__UnorderedGroup_0__1 )?
+            // InternalFSM.g:9923:2: ( rule__ModelComponent__UnorderedGroup_0__1 )?
             int alt81=2;
             int LA81_0 = input.LA(1);
 
-            if ( LA81_0 ==68 && getUnorderedGroupHelper().canSelect(grammarAccess.getModelComponentAccess().getUnorderedGroup_0(), 0) ) {
+            if ( LA81_0 == 68 && getUnorderedGroupHelper().canSelect(grammarAccess.getModelComponentAccess().getUnorderedGroup_0(), 0) ) {
                 alt81=1;
             }
-            else if ( LA81_0 >=18 && LA81_0<=21 && getUnorderedGroupHelper().canSelect(grammarAccess.getModelComponentAccess().getUnorderedGroup_0(), 1) ) {
+            else if ( LA81_0 >= 18 && LA81_0 <= 21 && getUnorderedGroupHelper().canSelect(grammarAccess.getModelComponentAccess().getUnorderedGroup_0(), 1) ) {
                 alt81=1;
             }
             switch (alt81) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9920:2: rule__ModelComponent__UnorderedGroup_0__1
+                    // InternalFSM.g:9923:2: rule__ModelComponent__UnorderedGroup_0__1
                     {
-                    pushFollow(FOLLOW_rule__ModelComponent__UnorderedGroup_0__1_in_rule__ModelComponent__UnorderedGroup_0__020025);
+                    pushFollow(FOLLOW_2);
                     rule__ModelComponent__UnorderedGroup_0__1();
 
                     state._fsp--;
@@ -26779,16 +26779,16 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ModelComponent__UnorderedGroup_0__1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9927:1: rule__ModelComponent__UnorderedGroup_0__1 : rule__ModelComponent__UnorderedGroup_0__Impl ;
+    // InternalFSM.g:9930:1: rule__ModelComponent__UnorderedGroup_0__1 : rule__ModelComponent__UnorderedGroup_0__Impl ;
     public final void rule__ModelComponent__UnorderedGroup_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9931:1: ( rule__ModelComponent__UnorderedGroup_0__Impl )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9932:2: rule__ModelComponent__UnorderedGroup_0__Impl
+            // InternalFSM.g:9934:1: ( rule__ModelComponent__UnorderedGroup_0__Impl )
+            // InternalFSM.g:9935:2: rule__ModelComponent__UnorderedGroup_0__Impl
             {
-            pushFollow(FOLLOW_rule__ModelComponent__UnorderedGroup_0__Impl_in_rule__ModelComponent__UnorderedGroup_0__120050);
+            pushFollow(FOLLOW_2);
             rule__ModelComponent__UnorderedGroup_0__Impl();
 
             state._fsp--;
@@ -26812,20 +26812,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FSMModel__ComponentsAssignment"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9943:1: rule__FSMModel__ComponentsAssignment : ( ruleModelComponent ) ;
+    // InternalFSM.g:9946:1: rule__FSMModel__ComponentsAssignment : ( ruleModelComponent ) ;
     public final void rule__FSMModel__ComponentsAssignment() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9947:1: ( ( ruleModelComponent ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9948:1: ( ruleModelComponent )
+            // InternalFSM.g:9950:1: ( ( ruleModelComponent ) )
+            // InternalFSM.g:9951:1: ( ruleModelComponent )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9948:1: ( ruleModelComponent )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9949:1: ruleModelComponent
+            // InternalFSM.g:9951:1: ( ruleModelComponent )
+            // InternalFSM.g:9952:1: ruleModelComponent
             {
              before(grammarAccess.getFSMModelAccess().getComponentsModelComponentParserRuleCall_0()); 
-            pushFollow(FOLLOW_ruleModelComponent_in_rule__FSMModel__ComponentsAssignment20082);
+            pushFollow(FOLLOW_2);
             ruleModelComponent();
 
             state._fsp--;
@@ -26853,24 +26853,24 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ModelComponent__AbstractAssignment_0_0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9958:1: rule__ModelComponent__AbstractAssignment_0_0 : ( ( 'abstract' ) ) ;
+    // InternalFSM.g:9961:1: rule__ModelComponent__AbstractAssignment_0_0 : ( ( 'abstract' ) ) ;
     public final void rule__ModelComponent__AbstractAssignment_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9962:1: ( ( ( 'abstract' ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9963:1: ( ( 'abstract' ) )
+            // InternalFSM.g:9965:1: ( ( ( 'abstract' ) ) )
+            // InternalFSM.g:9966:1: ( ( 'abstract' ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9963:1: ( ( 'abstract' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9964:1: ( 'abstract' )
+            // InternalFSM.g:9966:1: ( ( 'abstract' ) )
+            // InternalFSM.g:9967:1: ( 'abstract' )
             {
              before(grammarAccess.getModelComponentAccess().getAbstractAbstractKeyword_0_0_0()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9965:1: ( 'abstract' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9966:1: 'abstract'
+            // InternalFSM.g:9968:1: ( 'abstract' )
+            // InternalFSM.g:9969:1: 'abstract'
             {
              before(grammarAccess.getModelComponentAccess().getAbstractAbstractKeyword_0_0_0()); 
-            match(input,68,FOLLOW_68_in_rule__ModelComponent__AbstractAssignment_0_020118); 
+            match(input,68,FOLLOW_2); 
              after(grammarAccess.getModelComponentAccess().getAbstractAbstractKeyword_0_0_0()); 
 
             }
@@ -26898,20 +26898,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ModelComponent__CommTypeAssignment_0_1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9981:1: rule__ModelComponent__CommTypeAssignment_0_1 : ( ruleComponentCommunicationType ) ;
+    // InternalFSM.g:9984:1: rule__ModelComponent__CommTypeAssignment_0_1 : ( ruleComponentCommunicationType ) ;
     public final void rule__ModelComponent__CommTypeAssignment_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9985:1: ( ( ruleComponentCommunicationType ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9986:1: ( ruleComponentCommunicationType )
+            // InternalFSM.g:9988:1: ( ( ruleComponentCommunicationType ) )
+            // InternalFSM.g:9989:1: ( ruleComponentCommunicationType )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9986:1: ( ruleComponentCommunicationType )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9987:1: ruleComponentCommunicationType
+            // InternalFSM.g:9989:1: ( ruleComponentCommunicationType )
+            // InternalFSM.g:9990:1: ruleComponentCommunicationType
             {
              before(grammarAccess.getModelComponentAccess().getCommTypeComponentCommunicationTypeEnumRuleCall_0_1_0()); 
-            pushFollow(FOLLOW_ruleComponentCommunicationType_in_rule__ModelComponent__CommTypeAssignment_0_120157);
+            pushFollow(FOLLOW_2);
             ruleComponentCommunicationType();
 
             state._fsp--;
@@ -26939,20 +26939,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ModelComponent__ComponentNameAssignment_2"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:9996:1: rule__ModelComponent__ComponentNameAssignment_2 : ( RULE_ID ) ;
+    // InternalFSM.g:9999:1: rule__ModelComponent__ComponentNameAssignment_2 : ( RULE_ID ) ;
     public final void rule__ModelComponent__ComponentNameAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10000:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10001:1: ( RULE_ID )
+            // InternalFSM.g:10003:1: ( ( RULE_ID ) )
+            // InternalFSM.g:10004:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10001:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10002:1: RULE_ID
+            // InternalFSM.g:10004:1: ( RULE_ID )
+            // InternalFSM.g:10005:1: RULE_ID
             {
              before(grammarAccess.getModelComponentAccess().getComponentNameIDTerminalRuleCall_2_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__ModelComponent__ComponentNameAssignment_220188); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getModelComponentAccess().getComponentNameIDTerminalRuleCall_2_0()); 
 
             }
@@ -26976,24 +26976,24 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ModelComponent__BaseAssignment_3_1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10011:1: rule__ModelComponent__BaseAssignment_3_1 : ( ( ruleFQN ) ) ;
+    // InternalFSM.g:10014:1: rule__ModelComponent__BaseAssignment_3_1 : ( ( ruleFQN ) ) ;
     public final void rule__ModelComponent__BaseAssignment_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10015:1: ( ( ( ruleFQN ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10016:1: ( ( ruleFQN ) )
+            // InternalFSM.g:10018:1: ( ( ( ruleFQN ) ) )
+            // InternalFSM.g:10019:1: ( ( ruleFQN ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10016:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10017:1: ( ruleFQN )
+            // InternalFSM.g:10019:1: ( ( ruleFQN ) )
+            // InternalFSM.g:10020:1: ( ruleFQN )
             {
              before(grammarAccess.getModelComponentAccess().getBaseModelComponentCrossReference_3_1_0()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10018:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10019:1: ruleFQN
+            // InternalFSM.g:10021:1: ( ruleFQN )
+            // InternalFSM.g:10022:1: ruleFQN
             {
              before(grammarAccess.getModelComponentAccess().getBaseModelComponentFQNParserRuleCall_3_1_0_1()); 
-            pushFollow(FOLLOW_ruleFQN_in_rule__ModelComponent__BaseAssignment_3_120223);
+            pushFollow(FOLLOW_2);
             ruleFQN();
 
             state._fsp--;
@@ -27025,20 +27025,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ModelComponent__StateMachineAssignment_4"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10030:1: rule__ModelComponent__StateMachineAssignment_4 : ( ruleStateMachine ) ;
+    // InternalFSM.g:10033:1: rule__ModelComponent__StateMachineAssignment_4 : ( ruleStateMachine ) ;
     public final void rule__ModelComponent__StateMachineAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10034:1: ( ( ruleStateMachine ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10035:1: ( ruleStateMachine )
+            // InternalFSM.g:10037:1: ( ( ruleStateMachine ) )
+            // InternalFSM.g:10038:1: ( ruleStateMachine )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10035:1: ( ruleStateMachine )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10036:1: ruleStateMachine
+            // InternalFSM.g:10038:1: ( ruleStateMachine )
+            // InternalFSM.g:10039:1: ruleStateMachine
             {
              before(grammarAccess.getModelComponentAccess().getStateMachineStateMachineParserRuleCall_4_0()); 
-            pushFollow(FOLLOW_ruleStateMachine_in_rule__ModelComponent__StateMachineAssignment_420258);
+            pushFollow(FOLLOW_2);
             ruleStateMachine();
 
             state._fsp--;
@@ -27066,20 +27066,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateGraph__StatesAssignment_2_0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10045:1: rule__StateGraph__StatesAssignment_2_0 : ( ruleState ) ;
+    // InternalFSM.g:10048:1: rule__StateGraph__StatesAssignment_2_0 : ( ruleState ) ;
     public final void rule__StateGraph__StatesAssignment_2_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10049:1: ( ( ruleState ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10050:1: ( ruleState )
+            // InternalFSM.g:10052:1: ( ( ruleState ) )
+            // InternalFSM.g:10053:1: ( ruleState )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10050:1: ( ruleState )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10051:1: ruleState
+            // InternalFSM.g:10053:1: ( ruleState )
+            // InternalFSM.g:10054:1: ruleState
             {
              before(grammarAccess.getStateGraphAccess().getStatesStateParserRuleCall_2_0_0()); 
-            pushFollow(FOLLOW_ruleState_in_rule__StateGraph__StatesAssignment_2_020289);
+            pushFollow(FOLLOW_2);
             ruleState();
 
             state._fsp--;
@@ -27107,20 +27107,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateGraph__TrPointsAssignment_2_1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10060:1: rule__StateGraph__TrPointsAssignment_2_1 : ( ruleTrPoint ) ;
+    // InternalFSM.g:10063:1: rule__StateGraph__TrPointsAssignment_2_1 : ( ruleTrPoint ) ;
     public final void rule__StateGraph__TrPointsAssignment_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10064:1: ( ( ruleTrPoint ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10065:1: ( ruleTrPoint )
+            // InternalFSM.g:10067:1: ( ( ruleTrPoint ) )
+            // InternalFSM.g:10068:1: ( ruleTrPoint )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10065:1: ( ruleTrPoint )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10066:1: ruleTrPoint
+            // InternalFSM.g:10068:1: ( ruleTrPoint )
+            // InternalFSM.g:10069:1: ruleTrPoint
             {
              before(grammarAccess.getStateGraphAccess().getTrPointsTrPointParserRuleCall_2_1_0()); 
-            pushFollow(FOLLOW_ruleTrPoint_in_rule__StateGraph__TrPointsAssignment_2_120320);
+            pushFollow(FOLLOW_2);
             ruleTrPoint();
 
             state._fsp--;
@@ -27148,20 +27148,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateGraph__ChPointsAssignment_2_2"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10075:1: rule__StateGraph__ChPointsAssignment_2_2 : ( ruleChoicePoint ) ;
+    // InternalFSM.g:10078:1: rule__StateGraph__ChPointsAssignment_2_2 : ( ruleChoicePoint ) ;
     public final void rule__StateGraph__ChPointsAssignment_2_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10079:1: ( ( ruleChoicePoint ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10080:1: ( ruleChoicePoint )
+            // InternalFSM.g:10082:1: ( ( ruleChoicePoint ) )
+            // InternalFSM.g:10083:1: ( ruleChoicePoint )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10080:1: ( ruleChoicePoint )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10081:1: ruleChoicePoint
+            // InternalFSM.g:10083:1: ( ruleChoicePoint )
+            // InternalFSM.g:10084:1: ruleChoicePoint
             {
              before(grammarAccess.getStateGraphAccess().getChPointsChoicePointParserRuleCall_2_2_0()); 
-            pushFollow(FOLLOW_ruleChoicePoint_in_rule__StateGraph__ChPointsAssignment_2_220351);
+            pushFollow(FOLLOW_2);
             ruleChoicePoint();
 
             state._fsp--;
@@ -27189,20 +27189,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateGraph__TransitionsAssignment_2_3"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10090:1: rule__StateGraph__TransitionsAssignment_2_3 : ( ruleTransition ) ;
+    // InternalFSM.g:10093:1: rule__StateGraph__TransitionsAssignment_2_3 : ( ruleTransition ) ;
     public final void rule__StateGraph__TransitionsAssignment_2_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10094:1: ( ( ruleTransition ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10095:1: ( ruleTransition )
+            // InternalFSM.g:10097:1: ( ( ruleTransition ) )
+            // InternalFSM.g:10098:1: ( ruleTransition )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10095:1: ( ruleTransition )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10096:1: ruleTransition
+            // InternalFSM.g:10098:1: ( ruleTransition )
+            // InternalFSM.g:10099:1: ruleTransition
             {
              before(grammarAccess.getStateGraphAccess().getTransitionsTransitionParserRuleCall_2_3_0()); 
-            pushFollow(FOLLOW_ruleTransition_in_rule__StateGraph__TransitionsAssignment_2_320382);
+            pushFollow(FOLLOW_2);
             ruleTransition();
 
             state._fsp--;
@@ -27230,20 +27230,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateGraph__RefinedTransitionsAssignment_2_4"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10105:1: rule__StateGraph__RefinedTransitionsAssignment_2_4 : ( ruleRefinedTransition ) ;
+    // InternalFSM.g:10108:1: rule__StateGraph__RefinedTransitionsAssignment_2_4 : ( ruleRefinedTransition ) ;
     public final void rule__StateGraph__RefinedTransitionsAssignment_2_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10109:1: ( ( ruleRefinedTransition ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10110:1: ( ruleRefinedTransition )
+            // InternalFSM.g:10112:1: ( ( ruleRefinedTransition ) )
+            // InternalFSM.g:10113:1: ( ruleRefinedTransition )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10110:1: ( ruleRefinedTransition )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10111:1: ruleRefinedTransition
+            // InternalFSM.g:10113:1: ( ruleRefinedTransition )
+            // InternalFSM.g:10114:1: ruleRefinedTransition
             {
              before(grammarAccess.getStateGraphAccess().getRefinedTransitionsRefinedTransitionParserRuleCall_2_4_0()); 
-            pushFollow(FOLLOW_ruleRefinedTransition_in_rule__StateGraph__RefinedTransitionsAssignment_2_420413);
+            pushFollow(FOLLOW_2);
             ruleRefinedTransition();
 
             state._fsp--;
@@ -27271,20 +27271,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateMachine__StatesAssignment_3_0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10120:1: rule__StateMachine__StatesAssignment_3_0 : ( ruleState ) ;
+    // InternalFSM.g:10123:1: rule__StateMachine__StatesAssignment_3_0 : ( ruleState ) ;
     public final void rule__StateMachine__StatesAssignment_3_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10124:1: ( ( ruleState ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10125:1: ( ruleState )
+            // InternalFSM.g:10127:1: ( ( ruleState ) )
+            // InternalFSM.g:10128:1: ( ruleState )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10125:1: ( ruleState )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10126:1: ruleState
+            // InternalFSM.g:10128:1: ( ruleState )
+            // InternalFSM.g:10129:1: ruleState
             {
              before(grammarAccess.getStateMachineAccess().getStatesStateParserRuleCall_3_0_0()); 
-            pushFollow(FOLLOW_ruleState_in_rule__StateMachine__StatesAssignment_3_020444);
+            pushFollow(FOLLOW_2);
             ruleState();
 
             state._fsp--;
@@ -27312,20 +27312,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateMachine__TrPointsAssignment_3_1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10135:1: rule__StateMachine__TrPointsAssignment_3_1 : ( ruleTrPoint ) ;
+    // InternalFSM.g:10138:1: rule__StateMachine__TrPointsAssignment_3_1 : ( ruleTrPoint ) ;
     public final void rule__StateMachine__TrPointsAssignment_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10139:1: ( ( ruleTrPoint ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10140:1: ( ruleTrPoint )
+            // InternalFSM.g:10142:1: ( ( ruleTrPoint ) )
+            // InternalFSM.g:10143:1: ( ruleTrPoint )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10140:1: ( ruleTrPoint )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10141:1: ruleTrPoint
+            // InternalFSM.g:10143:1: ( ruleTrPoint )
+            // InternalFSM.g:10144:1: ruleTrPoint
             {
              before(grammarAccess.getStateMachineAccess().getTrPointsTrPointParserRuleCall_3_1_0()); 
-            pushFollow(FOLLOW_ruleTrPoint_in_rule__StateMachine__TrPointsAssignment_3_120475);
+            pushFollow(FOLLOW_2);
             ruleTrPoint();
 
             state._fsp--;
@@ -27353,20 +27353,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateMachine__ChPointsAssignment_3_2"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10150:1: rule__StateMachine__ChPointsAssignment_3_2 : ( ruleChoicePoint ) ;
+    // InternalFSM.g:10153:1: rule__StateMachine__ChPointsAssignment_3_2 : ( ruleChoicePoint ) ;
     public final void rule__StateMachine__ChPointsAssignment_3_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10154:1: ( ( ruleChoicePoint ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10155:1: ( ruleChoicePoint )
+            // InternalFSM.g:10157:1: ( ( ruleChoicePoint ) )
+            // InternalFSM.g:10158:1: ( ruleChoicePoint )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10155:1: ( ruleChoicePoint )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10156:1: ruleChoicePoint
+            // InternalFSM.g:10158:1: ( ruleChoicePoint )
+            // InternalFSM.g:10159:1: ruleChoicePoint
             {
              before(grammarAccess.getStateMachineAccess().getChPointsChoicePointParserRuleCall_3_2_0()); 
-            pushFollow(FOLLOW_ruleChoicePoint_in_rule__StateMachine__ChPointsAssignment_3_220506);
+            pushFollow(FOLLOW_2);
             ruleChoicePoint();
 
             state._fsp--;
@@ -27394,20 +27394,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateMachine__TransitionsAssignment_3_3"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10165:1: rule__StateMachine__TransitionsAssignment_3_3 : ( ruleTransition ) ;
+    // InternalFSM.g:10168:1: rule__StateMachine__TransitionsAssignment_3_3 : ( ruleTransition ) ;
     public final void rule__StateMachine__TransitionsAssignment_3_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10169:1: ( ( ruleTransition ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10170:1: ( ruleTransition )
+            // InternalFSM.g:10172:1: ( ( ruleTransition ) )
+            // InternalFSM.g:10173:1: ( ruleTransition )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10170:1: ( ruleTransition )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10171:1: ruleTransition
+            // InternalFSM.g:10173:1: ( ruleTransition )
+            // InternalFSM.g:10174:1: ruleTransition
             {
              before(grammarAccess.getStateMachineAccess().getTransitionsTransitionParserRuleCall_3_3_0()); 
-            pushFollow(FOLLOW_ruleTransition_in_rule__StateMachine__TransitionsAssignment_3_320537);
+            pushFollow(FOLLOW_2);
             ruleTransition();
 
             state._fsp--;
@@ -27435,20 +27435,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateMachine__RefinedTransitionsAssignment_3_4"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10180:1: rule__StateMachine__RefinedTransitionsAssignment_3_4 : ( ruleRefinedTransition ) ;
+    // InternalFSM.g:10183:1: rule__StateMachine__RefinedTransitionsAssignment_3_4 : ( ruleRefinedTransition ) ;
     public final void rule__StateMachine__RefinedTransitionsAssignment_3_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10184:1: ( ( ruleRefinedTransition ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10185:1: ( ruleRefinedTransition )
+            // InternalFSM.g:10187:1: ( ( ruleRefinedTransition ) )
+            // InternalFSM.g:10188:1: ( ruleRefinedTransition )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10185:1: ( ruleRefinedTransition )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10186:1: ruleRefinedTransition
+            // InternalFSM.g:10188:1: ( ruleRefinedTransition )
+            // InternalFSM.g:10189:1: ruleRefinedTransition
             {
              before(grammarAccess.getStateMachineAccess().getRefinedTransitionsRefinedTransitionParserRuleCall_3_4_0()); 
-            pushFollow(FOLLOW_ruleRefinedTransition_in_rule__StateMachine__RefinedTransitionsAssignment_3_420568);
+            pushFollow(FOLLOW_2);
             ruleRefinedTransition();
 
             state._fsp--;
@@ -27476,20 +27476,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__NameAssignment_1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10195:1: rule__SimpleState__NameAssignment_1 : ( RULE_ID ) ;
+    // InternalFSM.g:10198:1: rule__SimpleState__NameAssignment_1 : ( RULE_ID ) ;
     public final void rule__SimpleState__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10199:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10200:1: ( RULE_ID )
+            // InternalFSM.g:10202:1: ( ( RULE_ID ) )
+            // InternalFSM.g:10203:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10200:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10201:1: RULE_ID
+            // InternalFSM.g:10203:1: ( RULE_ID )
+            // InternalFSM.g:10204:1: RULE_ID
             {
              before(grammarAccess.getSimpleStateAccess().getNameIDTerminalRuleCall_1_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__SimpleState__NameAssignment_120599); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getSimpleStateAccess().getNameIDTerminalRuleCall_1_0()); 
 
             }
@@ -27513,20 +27513,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__DocuAssignment_2"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10210:1: rule__SimpleState__DocuAssignment_2 : ( ruleDocumentation ) ;
+    // InternalFSM.g:10213:1: rule__SimpleState__DocuAssignment_2 : ( ruleDocumentation ) ;
     public final void rule__SimpleState__DocuAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10214:1: ( ( ruleDocumentation ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10215:1: ( ruleDocumentation )
+            // InternalFSM.g:10217:1: ( ( ruleDocumentation ) )
+            // InternalFSM.g:10218:1: ( ruleDocumentation )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10215:1: ( ruleDocumentation )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10216:1: ruleDocumentation
+            // InternalFSM.g:10218:1: ( ruleDocumentation )
+            // InternalFSM.g:10219:1: ruleDocumentation
             {
              before(grammarAccess.getSimpleStateAccess().getDocuDocumentationParserRuleCall_2_0()); 
-            pushFollow(FOLLOW_ruleDocumentation_in_rule__SimpleState__DocuAssignment_220630);
+            pushFollow(FOLLOW_2);
             ruleDocumentation();
 
             state._fsp--;
@@ -27554,20 +27554,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__EntryCodeAssignment_3_1_1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10225:1: rule__SimpleState__EntryCodeAssignment_3_1_1 : ( ruleDetailCode ) ;
+    // InternalFSM.g:10228:1: rule__SimpleState__EntryCodeAssignment_3_1_1 : ( ruleDetailCode ) ;
     public final void rule__SimpleState__EntryCodeAssignment_3_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10229:1: ( ( ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10230:1: ( ruleDetailCode )
+            // InternalFSM.g:10232:1: ( ( ruleDetailCode ) )
+            // InternalFSM.g:10233:1: ( ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10230:1: ( ruleDetailCode )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10231:1: ruleDetailCode
+            // InternalFSM.g:10233:1: ( ruleDetailCode )
+            // InternalFSM.g:10234:1: ruleDetailCode
             {
              before(grammarAccess.getSimpleStateAccess().getEntryCodeDetailCodeParserRuleCall_3_1_1_0()); 
-            pushFollow(FOLLOW_ruleDetailCode_in_rule__SimpleState__EntryCodeAssignment_3_1_120661);
+            pushFollow(FOLLOW_2);
             ruleDetailCode();
 
             state._fsp--;
@@ -27595,20 +27595,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__ExitCodeAssignment_3_2_1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10240:1: rule__SimpleState__ExitCodeAssignment_3_2_1 : ( ruleDetailCode ) ;
+    // InternalFSM.g:10243:1: rule__SimpleState__ExitCodeAssignment_3_2_1 : ( ruleDetailCode ) ;
     public final void rule__SimpleState__ExitCodeAssignment_3_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10244:1: ( ( ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10245:1: ( ruleDetailCode )
+            // InternalFSM.g:10247:1: ( ( ruleDetailCode ) )
+            // InternalFSM.g:10248:1: ( ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10245:1: ( ruleDetailCode )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10246:1: ruleDetailCode
+            // InternalFSM.g:10248:1: ( ruleDetailCode )
+            // InternalFSM.g:10249:1: ruleDetailCode
             {
              before(grammarAccess.getSimpleStateAccess().getExitCodeDetailCodeParserRuleCall_3_2_1_0()); 
-            pushFollow(FOLLOW_ruleDetailCode_in_rule__SimpleState__ExitCodeAssignment_3_2_120692);
+            pushFollow(FOLLOW_2);
             ruleDetailCode();
 
             state._fsp--;
@@ -27636,20 +27636,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__DoCodeAssignment_3_3_1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10255:1: rule__SimpleState__DoCodeAssignment_3_3_1 : ( ruleDetailCode ) ;
+    // InternalFSM.g:10258:1: rule__SimpleState__DoCodeAssignment_3_3_1 : ( ruleDetailCode ) ;
     public final void rule__SimpleState__DoCodeAssignment_3_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10259:1: ( ( ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10260:1: ( ruleDetailCode )
+            // InternalFSM.g:10262:1: ( ( ruleDetailCode ) )
+            // InternalFSM.g:10263:1: ( ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10260:1: ( ruleDetailCode )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10261:1: ruleDetailCode
+            // InternalFSM.g:10263:1: ( ruleDetailCode )
+            // InternalFSM.g:10264:1: ruleDetailCode
             {
              before(grammarAccess.getSimpleStateAccess().getDoCodeDetailCodeParserRuleCall_3_3_1_0()); 
-            pushFollow(FOLLOW_ruleDetailCode_in_rule__SimpleState__DoCodeAssignment_3_3_120723);
+            pushFollow(FOLLOW_2);
             ruleDetailCode();
 
             state._fsp--;
@@ -27677,20 +27677,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__SubgraphAssignment_3_4_1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10270:1: rule__SimpleState__SubgraphAssignment_3_4_1 : ( ruleStateGraph ) ;
+    // InternalFSM.g:10273:1: rule__SimpleState__SubgraphAssignment_3_4_1 : ( ruleStateGraph ) ;
     public final void rule__SimpleState__SubgraphAssignment_3_4_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10274:1: ( ( ruleStateGraph ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10275:1: ( ruleStateGraph )
+            // InternalFSM.g:10277:1: ( ( ruleStateGraph ) )
+            // InternalFSM.g:10278:1: ( ruleStateGraph )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10275:1: ( ruleStateGraph )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10276:1: ruleStateGraph
+            // InternalFSM.g:10278:1: ( ruleStateGraph )
+            // InternalFSM.g:10279:1: ruleStateGraph
             {
              before(grammarAccess.getSimpleStateAccess().getSubgraphStateGraphParserRuleCall_3_4_1_0()); 
-            pushFollow(FOLLOW_ruleStateGraph_in_rule__SimpleState__SubgraphAssignment_3_4_120754);
+            pushFollow(FOLLOW_2);
             ruleStateGraph();
 
             state._fsp--;
@@ -27718,24 +27718,24 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__TargetAssignment_1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10285:1: rule__RefinedState__TargetAssignment_1 : ( ( ruleFQN ) ) ;
+    // InternalFSM.g:10288:1: rule__RefinedState__TargetAssignment_1 : ( ( ruleFQN ) ) ;
     public final void rule__RefinedState__TargetAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10289:1: ( ( ( ruleFQN ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10290:1: ( ( ruleFQN ) )
+            // InternalFSM.g:10292:1: ( ( ( ruleFQN ) ) )
+            // InternalFSM.g:10293:1: ( ( ruleFQN ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10290:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10291:1: ( ruleFQN )
+            // InternalFSM.g:10293:1: ( ( ruleFQN ) )
+            // InternalFSM.g:10294:1: ( ruleFQN )
             {
              before(grammarAccess.getRefinedStateAccess().getTargetStateCrossReference_1_0()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10292:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10293:1: ruleFQN
+            // InternalFSM.g:10295:1: ( ruleFQN )
+            // InternalFSM.g:10296:1: ruleFQN
             {
              before(grammarAccess.getRefinedStateAccess().getTargetStateFQNParserRuleCall_1_0_1()); 
-            pushFollow(FOLLOW_ruleFQN_in_rule__RefinedState__TargetAssignment_120789);
+            pushFollow(FOLLOW_2);
             ruleFQN();
 
             state._fsp--;
@@ -27767,20 +27767,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__DocuAssignment_2"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10304:1: rule__RefinedState__DocuAssignment_2 : ( ruleDocumentation ) ;
+    // InternalFSM.g:10307:1: rule__RefinedState__DocuAssignment_2 : ( ruleDocumentation ) ;
     public final void rule__RefinedState__DocuAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10308:1: ( ( ruleDocumentation ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10309:1: ( ruleDocumentation )
+            // InternalFSM.g:10311:1: ( ( ruleDocumentation ) )
+            // InternalFSM.g:10312:1: ( ruleDocumentation )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10309:1: ( ruleDocumentation )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10310:1: ruleDocumentation
+            // InternalFSM.g:10312:1: ( ruleDocumentation )
+            // InternalFSM.g:10313:1: ruleDocumentation
             {
              before(grammarAccess.getRefinedStateAccess().getDocuDocumentationParserRuleCall_2_0()); 
-            pushFollow(FOLLOW_ruleDocumentation_in_rule__RefinedState__DocuAssignment_220824);
+            pushFollow(FOLLOW_2);
             ruleDocumentation();
 
             state._fsp--;
@@ -27808,20 +27808,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__EntryCodeAssignment_4_1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10319:1: rule__RefinedState__EntryCodeAssignment_4_1 : ( ruleDetailCode ) ;
+    // InternalFSM.g:10322:1: rule__RefinedState__EntryCodeAssignment_4_1 : ( ruleDetailCode ) ;
     public final void rule__RefinedState__EntryCodeAssignment_4_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10323:1: ( ( ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10324:1: ( ruleDetailCode )
+            // InternalFSM.g:10326:1: ( ( ruleDetailCode ) )
+            // InternalFSM.g:10327:1: ( ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10324:1: ( ruleDetailCode )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10325:1: ruleDetailCode
+            // InternalFSM.g:10327:1: ( ruleDetailCode )
+            // InternalFSM.g:10328:1: ruleDetailCode
             {
              before(grammarAccess.getRefinedStateAccess().getEntryCodeDetailCodeParserRuleCall_4_1_0()); 
-            pushFollow(FOLLOW_ruleDetailCode_in_rule__RefinedState__EntryCodeAssignment_4_120855);
+            pushFollow(FOLLOW_2);
             ruleDetailCode();
 
             state._fsp--;
@@ -27849,20 +27849,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__ExitCodeAssignment_5_1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10334:1: rule__RefinedState__ExitCodeAssignment_5_1 : ( ruleDetailCode ) ;
+    // InternalFSM.g:10337:1: rule__RefinedState__ExitCodeAssignment_5_1 : ( ruleDetailCode ) ;
     public final void rule__RefinedState__ExitCodeAssignment_5_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10338:1: ( ( ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10339:1: ( ruleDetailCode )
+            // InternalFSM.g:10341:1: ( ( ruleDetailCode ) )
+            // InternalFSM.g:10342:1: ( ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10339:1: ( ruleDetailCode )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10340:1: ruleDetailCode
+            // InternalFSM.g:10342:1: ( ruleDetailCode )
+            // InternalFSM.g:10343:1: ruleDetailCode
             {
              before(grammarAccess.getRefinedStateAccess().getExitCodeDetailCodeParserRuleCall_5_1_0()); 
-            pushFollow(FOLLOW_ruleDetailCode_in_rule__RefinedState__ExitCodeAssignment_5_120886);
+            pushFollow(FOLLOW_2);
             ruleDetailCode();
 
             state._fsp--;
@@ -27890,20 +27890,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__DoCodeAssignment_6_1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10349:1: rule__RefinedState__DoCodeAssignment_6_1 : ( ruleDetailCode ) ;
+    // InternalFSM.g:10352:1: rule__RefinedState__DoCodeAssignment_6_1 : ( ruleDetailCode ) ;
     public final void rule__RefinedState__DoCodeAssignment_6_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10353:1: ( ( ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10354:1: ( ruleDetailCode )
+            // InternalFSM.g:10356:1: ( ( ruleDetailCode ) )
+            // InternalFSM.g:10357:1: ( ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10354:1: ( ruleDetailCode )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10355:1: ruleDetailCode
+            // InternalFSM.g:10357:1: ( ruleDetailCode )
+            // InternalFSM.g:10358:1: ruleDetailCode
             {
              before(grammarAccess.getRefinedStateAccess().getDoCodeDetailCodeParserRuleCall_6_1_0()); 
-            pushFollow(FOLLOW_ruleDetailCode_in_rule__RefinedState__DoCodeAssignment_6_120917);
+            pushFollow(FOLLOW_2);
             ruleDetailCode();
 
             state._fsp--;
@@ -27931,20 +27931,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__SubgraphAssignment_7_1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10364:1: rule__RefinedState__SubgraphAssignment_7_1 : ( ruleStateGraph ) ;
+    // InternalFSM.g:10367:1: rule__RefinedState__SubgraphAssignment_7_1 : ( ruleStateGraph ) ;
     public final void rule__RefinedState__SubgraphAssignment_7_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10368:1: ( ( ruleStateGraph ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10369:1: ( ruleStateGraph )
+            // InternalFSM.g:10371:1: ( ( ruleStateGraph ) )
+            // InternalFSM.g:10372:1: ( ruleStateGraph )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10369:1: ( ruleStateGraph )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10370:1: ruleStateGraph
+            // InternalFSM.g:10372:1: ( ruleStateGraph )
+            // InternalFSM.g:10373:1: ruleStateGraph
             {
              before(grammarAccess.getRefinedStateAccess().getSubgraphStateGraphParserRuleCall_7_1_0()); 
-            pushFollow(FOLLOW_ruleStateGraph_in_rule__RefinedState__SubgraphAssignment_7_120948);
+            pushFollow(FOLLOW_2);
             ruleStateGraph();
 
             state._fsp--;
@@ -27972,24 +27972,24 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DetailCode__UsedAssignment_1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10379:1: rule__DetailCode__UsedAssignment_1 : ( ( '{' ) ) ;
+    // InternalFSM.g:10382:1: rule__DetailCode__UsedAssignment_1 : ( ( '{' ) ) ;
     public final void rule__DetailCode__UsedAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10383:1: ( ( ( '{' ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10384:1: ( ( '{' ) )
+            // InternalFSM.g:10386:1: ( ( ( '{' ) ) )
+            // InternalFSM.g:10387:1: ( ( '{' ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10384:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10385:1: ( '{' )
+            // InternalFSM.g:10387:1: ( ( '{' ) )
+            // InternalFSM.g:10388:1: ( '{' )
             {
              before(grammarAccess.getDetailCodeAccess().getUsedLeftCurlyBracketKeyword_1_0()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10386:1: ( '{' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10387:1: '{'
+            // InternalFSM.g:10389:1: ( '{' )
+            // InternalFSM.g:10390:1: '{'
             {
              before(grammarAccess.getDetailCodeAccess().getUsedLeftCurlyBracketKeyword_1_0()); 
-            match(input,28,FOLLOW_28_in_rule__DetailCode__UsedAssignment_120984); 
+            match(input,28,FOLLOW_2); 
              after(grammarAccess.getDetailCodeAccess().getUsedLeftCurlyBracketKeyword_1_0()); 
 
             }
@@ -28017,20 +28017,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DetailCode__LinesAssignment_2"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10402:1: rule__DetailCode__LinesAssignment_2 : ( RULE_STRING ) ;
+    // InternalFSM.g:10405:1: rule__DetailCode__LinesAssignment_2 : ( RULE_STRING ) ;
     public final void rule__DetailCode__LinesAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10406:1: ( ( RULE_STRING ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10407:1: ( RULE_STRING )
+            // InternalFSM.g:10409:1: ( ( RULE_STRING ) )
+            // InternalFSM.g:10410:1: ( RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10407:1: ( RULE_STRING )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10408:1: RULE_STRING
+            // InternalFSM.g:10410:1: ( RULE_STRING )
+            // InternalFSM.g:10411:1: RULE_STRING
             {
              before(grammarAccess.getDetailCodeAccess().getLinesSTRINGTerminalRuleCall_2_0()); 
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__DetailCode__LinesAssignment_221023); 
+            match(input,RULE_STRING,FOLLOW_2); 
              after(grammarAccess.getDetailCodeAccess().getLinesSTRINGTerminalRuleCall_2_0()); 
 
             }
@@ -28054,24 +28054,24 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TransitionPoint__HandlerAssignment_0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10417:1: rule__TransitionPoint__HandlerAssignment_0 : ( ( 'handler' ) ) ;
+    // InternalFSM.g:10420:1: rule__TransitionPoint__HandlerAssignment_0 : ( ( 'handler' ) ) ;
     public final void rule__TransitionPoint__HandlerAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10421:1: ( ( ( 'handler' ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10422:1: ( ( 'handler' ) )
+            // InternalFSM.g:10424:1: ( ( ( 'handler' ) ) )
+            // InternalFSM.g:10425:1: ( ( 'handler' ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10422:1: ( ( 'handler' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10423:1: ( 'handler' )
+            // InternalFSM.g:10425:1: ( ( 'handler' ) )
+            // InternalFSM.g:10426:1: ( 'handler' )
             {
              before(grammarAccess.getTransitionPointAccess().getHandlerHandlerKeyword_0_0()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10424:1: ( 'handler' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10425:1: 'handler'
+            // InternalFSM.g:10427:1: ( 'handler' )
+            // InternalFSM.g:10428:1: 'handler'
             {
              before(grammarAccess.getTransitionPointAccess().getHandlerHandlerKeyword_0_0()); 
-            match(input,69,FOLLOW_69_in_rule__TransitionPoint__HandlerAssignment_021059); 
+            match(input,69,FOLLOW_2); 
              after(grammarAccess.getTransitionPointAccess().getHandlerHandlerKeyword_0_0()); 
 
             }
@@ -28099,20 +28099,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TransitionPoint__NameAssignment_2"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10440:1: rule__TransitionPoint__NameAssignment_2 : ( RULE_ID ) ;
+    // InternalFSM.g:10443:1: rule__TransitionPoint__NameAssignment_2 : ( RULE_ID ) ;
     public final void rule__TransitionPoint__NameAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10444:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10445:1: ( RULE_ID )
+            // InternalFSM.g:10447:1: ( ( RULE_ID ) )
+            // InternalFSM.g:10448:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10445:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10446:1: RULE_ID
+            // InternalFSM.g:10448:1: ( RULE_ID )
+            // InternalFSM.g:10449:1: RULE_ID
             {
              before(grammarAccess.getTransitionPointAccess().getNameIDTerminalRuleCall_2_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__TransitionPoint__NameAssignment_221098); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getTransitionPointAccess().getNameIDTerminalRuleCall_2_0()); 
 
             }
@@ -28136,20 +28136,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EntryPoint__NameAssignment_1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10455:1: rule__EntryPoint__NameAssignment_1 : ( RULE_ID ) ;
+    // InternalFSM.g:10458:1: rule__EntryPoint__NameAssignment_1 : ( RULE_ID ) ;
     public final void rule__EntryPoint__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10459:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10460:1: ( RULE_ID )
+            // InternalFSM.g:10462:1: ( ( RULE_ID ) )
+            // InternalFSM.g:10463:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10460:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10461:1: RULE_ID
+            // InternalFSM.g:10463:1: ( RULE_ID )
+            // InternalFSM.g:10464:1: RULE_ID
             {
              before(grammarAccess.getEntryPointAccess().getNameIDTerminalRuleCall_1_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__EntryPoint__NameAssignment_121129); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getEntryPointAccess().getNameIDTerminalRuleCall_1_0()); 
 
             }
@@ -28173,20 +28173,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ExitPoint__NameAssignment_1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10470:1: rule__ExitPoint__NameAssignment_1 : ( RULE_ID ) ;
+    // InternalFSM.g:10473:1: rule__ExitPoint__NameAssignment_1 : ( RULE_ID ) ;
     public final void rule__ExitPoint__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10474:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10475:1: ( RULE_ID )
+            // InternalFSM.g:10477:1: ( ( RULE_ID ) )
+            // InternalFSM.g:10478:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10475:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10476:1: RULE_ID
+            // InternalFSM.g:10478:1: ( RULE_ID )
+            // InternalFSM.g:10479:1: RULE_ID
             {
              before(grammarAccess.getExitPointAccess().getNameIDTerminalRuleCall_1_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__ExitPoint__NameAssignment_121160); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getExitPointAccess().getNameIDTerminalRuleCall_1_0()); 
 
             }
@@ -28210,20 +28210,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ChoicePoint__NameAssignment_1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10485:1: rule__ChoicePoint__NameAssignment_1 : ( RULE_ID ) ;
+    // InternalFSM.g:10488:1: rule__ChoicePoint__NameAssignment_1 : ( RULE_ID ) ;
     public final void rule__ChoicePoint__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10489:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10490:1: ( RULE_ID )
+            // InternalFSM.g:10492:1: ( ( RULE_ID ) )
+            // InternalFSM.g:10493:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10490:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10491:1: RULE_ID
+            // InternalFSM.g:10493:1: ( RULE_ID )
+            // InternalFSM.g:10494:1: RULE_ID
             {
              before(grammarAccess.getChoicePointAccess().getNameIDTerminalRuleCall_1_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__ChoicePoint__NameAssignment_121191); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getChoicePointAccess().getNameIDTerminalRuleCall_1_0()); 
 
             }
@@ -28247,20 +28247,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ChoicePoint__DocuAssignment_2"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10500:1: rule__ChoicePoint__DocuAssignment_2 : ( ruleDocumentation ) ;
+    // InternalFSM.g:10503:1: rule__ChoicePoint__DocuAssignment_2 : ( ruleDocumentation ) ;
     public final void rule__ChoicePoint__DocuAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10504:1: ( ( ruleDocumentation ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10505:1: ( ruleDocumentation )
+            // InternalFSM.g:10507:1: ( ( ruleDocumentation ) )
+            // InternalFSM.g:10508:1: ( ruleDocumentation )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10505:1: ( ruleDocumentation )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10506:1: ruleDocumentation
+            // InternalFSM.g:10508:1: ( ruleDocumentation )
+            // InternalFSM.g:10509:1: ruleDocumentation
             {
              before(grammarAccess.getChoicePointAccess().getDocuDocumentationParserRuleCall_2_0()); 
-            pushFollow(FOLLOW_ruleDocumentation_in_rule__ChoicePoint__DocuAssignment_221222);
+            pushFollow(FOLLOW_2);
             ruleDocumentation();
 
             state._fsp--;
@@ -28288,20 +28288,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__NameAssignment_1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10515:1: rule__InitialTransition__NameAssignment_1 : ( RULE_ID ) ;
+    // InternalFSM.g:10518:1: rule__InitialTransition__NameAssignment_1 : ( RULE_ID ) ;
     public final void rule__InitialTransition__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10519:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10520:1: ( RULE_ID )
+            // InternalFSM.g:10522:1: ( ( RULE_ID ) )
+            // InternalFSM.g:10523:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10520:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10521:1: RULE_ID
+            // InternalFSM.g:10523:1: ( RULE_ID )
+            // InternalFSM.g:10524:1: RULE_ID
             {
              before(grammarAccess.getInitialTransitionAccess().getNameIDTerminalRuleCall_1_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__InitialTransition__NameAssignment_121253); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getInitialTransitionAccess().getNameIDTerminalRuleCall_1_0()); 
 
             }
@@ -28325,20 +28325,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__ToAssignment_5"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10530:1: rule__InitialTransition__ToAssignment_5 : ( ruleTransitionTerminal ) ;
+    // InternalFSM.g:10533:1: rule__InitialTransition__ToAssignment_5 : ( ruleTransitionTerminal ) ;
     public final void rule__InitialTransition__ToAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10534:1: ( ( ruleTransitionTerminal ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10535:1: ( ruleTransitionTerminal )
+            // InternalFSM.g:10537:1: ( ( ruleTransitionTerminal ) )
+            // InternalFSM.g:10538:1: ( ruleTransitionTerminal )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10535:1: ( ruleTransitionTerminal )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10536:1: ruleTransitionTerminal
+            // InternalFSM.g:10538:1: ( ruleTransitionTerminal )
+            // InternalFSM.g:10539:1: ruleTransitionTerminal
             {
              before(grammarAccess.getInitialTransitionAccess().getToTransitionTerminalParserRuleCall_5_0()); 
-            pushFollow(FOLLOW_ruleTransitionTerminal_in_rule__InitialTransition__ToAssignment_521284);
+            pushFollow(FOLLOW_2);
             ruleTransitionTerminal();
 
             state._fsp--;
@@ -28366,20 +28366,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__DocuAssignment_6"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10545:1: rule__InitialTransition__DocuAssignment_6 : ( ruleDocumentation ) ;
+    // InternalFSM.g:10548:1: rule__InitialTransition__DocuAssignment_6 : ( ruleDocumentation ) ;
     public final void rule__InitialTransition__DocuAssignment_6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10549:1: ( ( ruleDocumentation ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10550:1: ( ruleDocumentation )
+            // InternalFSM.g:10552:1: ( ( ruleDocumentation ) )
+            // InternalFSM.g:10553:1: ( ruleDocumentation )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10550:1: ( ruleDocumentation )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10551:1: ruleDocumentation
+            // InternalFSM.g:10553:1: ( ruleDocumentation )
+            // InternalFSM.g:10554:1: ruleDocumentation
             {
              before(grammarAccess.getInitialTransitionAccess().getDocuDocumentationParserRuleCall_6_0()); 
-            pushFollow(FOLLOW_ruleDocumentation_in_rule__InitialTransition__DocuAssignment_621315);
+            pushFollow(FOLLOW_2);
             ruleDocumentation();
 
             state._fsp--;
@@ -28407,20 +28407,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__ActionAssignment_7_1_1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10560:1: rule__InitialTransition__ActionAssignment_7_1_1 : ( ruleDetailCode ) ;
+    // InternalFSM.g:10563:1: rule__InitialTransition__ActionAssignment_7_1_1 : ( ruleDetailCode ) ;
     public final void rule__InitialTransition__ActionAssignment_7_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10564:1: ( ( ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10565:1: ( ruleDetailCode )
+            // InternalFSM.g:10567:1: ( ( ruleDetailCode ) )
+            // InternalFSM.g:10568:1: ( ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10565:1: ( ruleDetailCode )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10566:1: ruleDetailCode
+            // InternalFSM.g:10568:1: ( ruleDetailCode )
+            // InternalFSM.g:10569:1: ruleDetailCode
             {
              before(grammarAccess.getInitialTransitionAccess().getActionDetailCodeParserRuleCall_7_1_1_0()); 
-            pushFollow(FOLLOW_ruleDetailCode_in_rule__InitialTransition__ActionAssignment_7_1_121346);
+            pushFollow(FOLLOW_2);
             ruleDetailCode();
 
             state._fsp--;
@@ -28448,20 +28448,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__NameAssignment_1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10575:1: rule__ContinuationTransition__NameAssignment_1 : ( RULE_ID ) ;
+    // InternalFSM.g:10578:1: rule__ContinuationTransition__NameAssignment_1 : ( RULE_ID ) ;
     public final void rule__ContinuationTransition__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10579:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10580:1: ( RULE_ID )
+            // InternalFSM.g:10582:1: ( ( RULE_ID ) )
+            // InternalFSM.g:10583:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10580:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10581:1: RULE_ID
+            // InternalFSM.g:10583:1: ( RULE_ID )
+            // InternalFSM.g:10584:1: RULE_ID
             {
              before(grammarAccess.getContinuationTransitionAccess().getNameIDTerminalRuleCall_1_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__ContinuationTransition__NameAssignment_121377); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getContinuationTransitionAccess().getNameIDTerminalRuleCall_1_0()); 
 
             }
@@ -28485,20 +28485,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__FromAssignment_3"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10590:1: rule__ContinuationTransition__FromAssignment_3 : ( ruleTransitionTerminal ) ;
+    // InternalFSM.g:10593:1: rule__ContinuationTransition__FromAssignment_3 : ( ruleTransitionTerminal ) ;
     public final void rule__ContinuationTransition__FromAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10594:1: ( ( ruleTransitionTerminal ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10595:1: ( ruleTransitionTerminal )
+            // InternalFSM.g:10597:1: ( ( ruleTransitionTerminal ) )
+            // InternalFSM.g:10598:1: ( ruleTransitionTerminal )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10595:1: ( ruleTransitionTerminal )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10596:1: ruleTransitionTerminal
+            // InternalFSM.g:10598:1: ( ruleTransitionTerminal )
+            // InternalFSM.g:10599:1: ruleTransitionTerminal
             {
              before(grammarAccess.getContinuationTransitionAccess().getFromTransitionTerminalParserRuleCall_3_0()); 
-            pushFollow(FOLLOW_ruleTransitionTerminal_in_rule__ContinuationTransition__FromAssignment_321408);
+            pushFollow(FOLLOW_2);
             ruleTransitionTerminal();
 
             state._fsp--;
@@ -28526,20 +28526,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__ToAssignment_5"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10605:1: rule__ContinuationTransition__ToAssignment_5 : ( ruleTransitionTerminal ) ;
+    // InternalFSM.g:10608:1: rule__ContinuationTransition__ToAssignment_5 : ( ruleTransitionTerminal ) ;
     public final void rule__ContinuationTransition__ToAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10609:1: ( ( ruleTransitionTerminal ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10610:1: ( ruleTransitionTerminal )
+            // InternalFSM.g:10612:1: ( ( ruleTransitionTerminal ) )
+            // InternalFSM.g:10613:1: ( ruleTransitionTerminal )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10610:1: ( ruleTransitionTerminal )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10611:1: ruleTransitionTerminal
+            // InternalFSM.g:10613:1: ( ruleTransitionTerminal )
+            // InternalFSM.g:10614:1: ruleTransitionTerminal
             {
              before(grammarAccess.getContinuationTransitionAccess().getToTransitionTerminalParserRuleCall_5_0()); 
-            pushFollow(FOLLOW_ruleTransitionTerminal_in_rule__ContinuationTransition__ToAssignment_521439);
+            pushFollow(FOLLOW_2);
             ruleTransitionTerminal();
 
             state._fsp--;
@@ -28567,20 +28567,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__DocuAssignment_6"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10620:1: rule__ContinuationTransition__DocuAssignment_6 : ( ruleDocumentation ) ;
+    // InternalFSM.g:10623:1: rule__ContinuationTransition__DocuAssignment_6 : ( ruleDocumentation ) ;
     public final void rule__ContinuationTransition__DocuAssignment_6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10624:1: ( ( ruleDocumentation ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10625:1: ( ruleDocumentation )
+            // InternalFSM.g:10627:1: ( ( ruleDocumentation ) )
+            // InternalFSM.g:10628:1: ( ruleDocumentation )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10625:1: ( ruleDocumentation )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10626:1: ruleDocumentation
+            // InternalFSM.g:10628:1: ( ruleDocumentation )
+            // InternalFSM.g:10629:1: ruleDocumentation
             {
              before(grammarAccess.getContinuationTransitionAccess().getDocuDocumentationParserRuleCall_6_0()); 
-            pushFollow(FOLLOW_ruleDocumentation_in_rule__ContinuationTransition__DocuAssignment_621470);
+            pushFollow(FOLLOW_2);
             ruleDocumentation();
 
             state._fsp--;
@@ -28608,20 +28608,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__ActionAssignment_7_1_1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10635:1: rule__ContinuationTransition__ActionAssignment_7_1_1 : ( ruleDetailCode ) ;
+    // InternalFSM.g:10638:1: rule__ContinuationTransition__ActionAssignment_7_1_1 : ( ruleDetailCode ) ;
     public final void rule__ContinuationTransition__ActionAssignment_7_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10639:1: ( ( ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10640:1: ( ruleDetailCode )
+            // InternalFSM.g:10642:1: ( ( ruleDetailCode ) )
+            // InternalFSM.g:10643:1: ( ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10640:1: ( ruleDetailCode )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10641:1: ruleDetailCode
+            // InternalFSM.g:10643:1: ( ruleDetailCode )
+            // InternalFSM.g:10644:1: ruleDetailCode
             {
              before(grammarAccess.getContinuationTransitionAccess().getActionDetailCodeParserRuleCall_7_1_1_0()); 
-            pushFollow(FOLLOW_ruleDetailCode_in_rule__ContinuationTransition__ActionAssignment_7_1_121501);
+            pushFollow(FOLLOW_2);
             ruleDetailCode();
 
             state._fsp--;
@@ -28649,20 +28649,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__NameAssignment_1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10650:1: rule__TriggeredTransition__NameAssignment_1 : ( RULE_ID ) ;
+    // InternalFSM.g:10653:1: rule__TriggeredTransition__NameAssignment_1 : ( RULE_ID ) ;
     public final void rule__TriggeredTransition__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10654:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10655:1: ( RULE_ID )
+            // InternalFSM.g:10657:1: ( ( RULE_ID ) )
+            // InternalFSM.g:10658:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10655:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10656:1: RULE_ID
+            // InternalFSM.g:10658:1: ( RULE_ID )
+            // InternalFSM.g:10659:1: RULE_ID
             {
              before(grammarAccess.getTriggeredTransitionAccess().getNameIDTerminalRuleCall_1_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__TriggeredTransition__NameAssignment_121532); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getTriggeredTransitionAccess().getNameIDTerminalRuleCall_1_0()); 
 
             }
@@ -28686,20 +28686,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__FromAssignment_3"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10665:1: rule__TriggeredTransition__FromAssignment_3 : ( ruleTransitionTerminal ) ;
+    // InternalFSM.g:10668:1: rule__TriggeredTransition__FromAssignment_3 : ( ruleTransitionTerminal ) ;
     public final void rule__TriggeredTransition__FromAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10669:1: ( ( ruleTransitionTerminal ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10670:1: ( ruleTransitionTerminal )
+            // InternalFSM.g:10672:1: ( ( ruleTransitionTerminal ) )
+            // InternalFSM.g:10673:1: ( ruleTransitionTerminal )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10670:1: ( ruleTransitionTerminal )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10671:1: ruleTransitionTerminal
+            // InternalFSM.g:10673:1: ( ruleTransitionTerminal )
+            // InternalFSM.g:10674:1: ruleTransitionTerminal
             {
              before(grammarAccess.getTriggeredTransitionAccess().getFromTransitionTerminalParserRuleCall_3_0()); 
-            pushFollow(FOLLOW_ruleTransitionTerminal_in_rule__TriggeredTransition__FromAssignment_321563);
+            pushFollow(FOLLOW_2);
             ruleTransitionTerminal();
 
             state._fsp--;
@@ -28727,20 +28727,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__ToAssignment_5"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10680:1: rule__TriggeredTransition__ToAssignment_5 : ( ruleTransitionTerminal ) ;
+    // InternalFSM.g:10683:1: rule__TriggeredTransition__ToAssignment_5 : ( ruleTransitionTerminal ) ;
     public final void rule__TriggeredTransition__ToAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10684:1: ( ( ruleTransitionTerminal ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10685:1: ( ruleTransitionTerminal )
+            // InternalFSM.g:10687:1: ( ( ruleTransitionTerminal ) )
+            // InternalFSM.g:10688:1: ( ruleTransitionTerminal )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10685:1: ( ruleTransitionTerminal )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10686:1: ruleTransitionTerminal
+            // InternalFSM.g:10688:1: ( ruleTransitionTerminal )
+            // InternalFSM.g:10689:1: ruleTransitionTerminal
             {
              before(grammarAccess.getTriggeredTransitionAccess().getToTransitionTerminalParserRuleCall_5_0()); 
-            pushFollow(FOLLOW_ruleTransitionTerminal_in_rule__TriggeredTransition__ToAssignment_521594);
+            pushFollow(FOLLOW_2);
             ruleTransitionTerminal();
 
             state._fsp--;
@@ -28768,20 +28768,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__DocuAssignment_6"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10695:1: rule__TriggeredTransition__DocuAssignment_6 : ( ruleDocumentation ) ;
+    // InternalFSM.g:10698:1: rule__TriggeredTransition__DocuAssignment_6 : ( ruleDocumentation ) ;
     public final void rule__TriggeredTransition__DocuAssignment_6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10699:1: ( ( ruleDocumentation ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10700:1: ( ruleDocumentation )
+            // InternalFSM.g:10702:1: ( ( ruleDocumentation ) )
+            // InternalFSM.g:10703:1: ( ruleDocumentation )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10700:1: ( ruleDocumentation )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10701:1: ruleDocumentation
+            // InternalFSM.g:10703:1: ( ruleDocumentation )
+            // InternalFSM.g:10704:1: ruleDocumentation
             {
              before(grammarAccess.getTriggeredTransitionAccess().getDocuDocumentationParserRuleCall_6_0()); 
-            pushFollow(FOLLOW_ruleDocumentation_in_rule__TriggeredTransition__DocuAssignment_621625);
+            pushFollow(FOLLOW_2);
             ruleDocumentation();
 
             state._fsp--;
@@ -28809,20 +28809,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__TriggersAssignment_10"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10710:1: rule__TriggeredTransition__TriggersAssignment_10 : ( ruleTrigger ) ;
+    // InternalFSM.g:10713:1: rule__TriggeredTransition__TriggersAssignment_10 : ( ruleTrigger ) ;
     public final void rule__TriggeredTransition__TriggersAssignment_10() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10714:1: ( ( ruleTrigger ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10715:1: ( ruleTrigger )
+            // InternalFSM.g:10717:1: ( ( ruleTrigger ) )
+            // InternalFSM.g:10718:1: ( ruleTrigger )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10715:1: ( ruleTrigger )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10716:1: ruleTrigger
+            // InternalFSM.g:10718:1: ( ruleTrigger )
+            // InternalFSM.g:10719:1: ruleTrigger
             {
              before(grammarAccess.getTriggeredTransitionAccess().getTriggersTriggerParserRuleCall_10_0()); 
-            pushFollow(FOLLOW_ruleTrigger_in_rule__TriggeredTransition__TriggersAssignment_1021656);
+            pushFollow(FOLLOW_2);
             ruleTrigger();
 
             state._fsp--;
@@ -28850,20 +28850,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__TriggersAssignment_11_1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10725:1: rule__TriggeredTransition__TriggersAssignment_11_1 : ( ruleTrigger ) ;
+    // InternalFSM.g:10728:1: rule__TriggeredTransition__TriggersAssignment_11_1 : ( ruleTrigger ) ;
     public final void rule__TriggeredTransition__TriggersAssignment_11_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10729:1: ( ( ruleTrigger ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10730:1: ( ruleTrigger )
+            // InternalFSM.g:10732:1: ( ( ruleTrigger ) )
+            // InternalFSM.g:10733:1: ( ruleTrigger )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10730:1: ( ruleTrigger )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10731:1: ruleTrigger
+            // InternalFSM.g:10733:1: ( ruleTrigger )
+            // InternalFSM.g:10734:1: ruleTrigger
             {
              before(grammarAccess.getTriggeredTransitionAccess().getTriggersTriggerParserRuleCall_11_1_0()); 
-            pushFollow(FOLLOW_ruleTrigger_in_rule__TriggeredTransition__TriggersAssignment_11_121687);
+            pushFollow(FOLLOW_2);
             ruleTrigger();
 
             state._fsp--;
@@ -28891,20 +28891,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__ActionAssignment_13_1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10740:1: rule__TriggeredTransition__ActionAssignment_13_1 : ( ruleDetailCode ) ;
+    // InternalFSM.g:10743:1: rule__TriggeredTransition__ActionAssignment_13_1 : ( ruleDetailCode ) ;
     public final void rule__TriggeredTransition__ActionAssignment_13_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10744:1: ( ( ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10745:1: ( ruleDetailCode )
+            // InternalFSM.g:10747:1: ( ( ruleDetailCode ) )
+            // InternalFSM.g:10748:1: ( ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10745:1: ( ruleDetailCode )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10746:1: ruleDetailCode
+            // InternalFSM.g:10748:1: ( ruleDetailCode )
+            // InternalFSM.g:10749:1: ruleDetailCode
             {
              before(grammarAccess.getTriggeredTransitionAccess().getActionDetailCodeParserRuleCall_13_1_0()); 
-            pushFollow(FOLLOW_ruleDetailCode_in_rule__TriggeredTransition__ActionAssignment_13_121718);
+            pushFollow(FOLLOW_2);
             ruleDetailCode();
 
             state._fsp--;
@@ -28932,20 +28932,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__NameAssignment_1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10755:1: rule__GuardedTransition__NameAssignment_1 : ( RULE_ID ) ;
+    // InternalFSM.g:10758:1: rule__GuardedTransition__NameAssignment_1 : ( RULE_ID ) ;
     public final void rule__GuardedTransition__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10759:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10760:1: ( RULE_ID )
+            // InternalFSM.g:10762:1: ( ( RULE_ID ) )
+            // InternalFSM.g:10763:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10760:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10761:1: RULE_ID
+            // InternalFSM.g:10763:1: ( RULE_ID )
+            // InternalFSM.g:10764:1: RULE_ID
             {
              before(grammarAccess.getGuardedTransitionAccess().getNameIDTerminalRuleCall_1_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__GuardedTransition__NameAssignment_121749); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getGuardedTransitionAccess().getNameIDTerminalRuleCall_1_0()); 
 
             }
@@ -28969,20 +28969,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__FromAssignment_3"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10770:1: rule__GuardedTransition__FromAssignment_3 : ( ruleTransitionTerminal ) ;
+    // InternalFSM.g:10773:1: rule__GuardedTransition__FromAssignment_3 : ( ruleTransitionTerminal ) ;
     public final void rule__GuardedTransition__FromAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10774:1: ( ( ruleTransitionTerminal ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10775:1: ( ruleTransitionTerminal )
+            // InternalFSM.g:10777:1: ( ( ruleTransitionTerminal ) )
+            // InternalFSM.g:10778:1: ( ruleTransitionTerminal )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10775:1: ( ruleTransitionTerminal )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10776:1: ruleTransitionTerminal
+            // InternalFSM.g:10778:1: ( ruleTransitionTerminal )
+            // InternalFSM.g:10779:1: ruleTransitionTerminal
             {
              before(grammarAccess.getGuardedTransitionAccess().getFromTransitionTerminalParserRuleCall_3_0()); 
-            pushFollow(FOLLOW_ruleTransitionTerminal_in_rule__GuardedTransition__FromAssignment_321780);
+            pushFollow(FOLLOW_2);
             ruleTransitionTerminal();
 
             state._fsp--;
@@ -29010,20 +29010,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__ToAssignment_5"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10785:1: rule__GuardedTransition__ToAssignment_5 : ( ruleTransitionTerminal ) ;
+    // InternalFSM.g:10788:1: rule__GuardedTransition__ToAssignment_5 : ( ruleTransitionTerminal ) ;
     public final void rule__GuardedTransition__ToAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10789:1: ( ( ruleTransitionTerminal ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10790:1: ( ruleTransitionTerminal )
+            // InternalFSM.g:10792:1: ( ( ruleTransitionTerminal ) )
+            // InternalFSM.g:10793:1: ( ruleTransitionTerminal )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10790:1: ( ruleTransitionTerminal )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10791:1: ruleTransitionTerminal
+            // InternalFSM.g:10793:1: ( ruleTransitionTerminal )
+            // InternalFSM.g:10794:1: ruleTransitionTerminal
             {
              before(grammarAccess.getGuardedTransitionAccess().getToTransitionTerminalParserRuleCall_5_0()); 
-            pushFollow(FOLLOW_ruleTransitionTerminal_in_rule__GuardedTransition__ToAssignment_521811);
+            pushFollow(FOLLOW_2);
             ruleTransitionTerminal();
 
             state._fsp--;
@@ -29051,20 +29051,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__DocuAssignment_6"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10800:1: rule__GuardedTransition__DocuAssignment_6 : ( ruleDocumentation ) ;
+    // InternalFSM.g:10803:1: rule__GuardedTransition__DocuAssignment_6 : ( ruleDocumentation ) ;
     public final void rule__GuardedTransition__DocuAssignment_6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10804:1: ( ( ruleDocumentation ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10805:1: ( ruleDocumentation )
+            // InternalFSM.g:10807:1: ( ( ruleDocumentation ) )
+            // InternalFSM.g:10808:1: ( ruleDocumentation )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10805:1: ( ruleDocumentation )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10806:1: ruleDocumentation
+            // InternalFSM.g:10808:1: ( ruleDocumentation )
+            // InternalFSM.g:10809:1: ruleDocumentation
             {
              before(grammarAccess.getGuardedTransitionAccess().getDocuDocumentationParserRuleCall_6_0()); 
-            pushFollow(FOLLOW_ruleDocumentation_in_rule__GuardedTransition__DocuAssignment_621842);
+            pushFollow(FOLLOW_2);
             ruleDocumentation();
 
             state._fsp--;
@@ -29092,20 +29092,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__GuardAssignment_9"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10815:1: rule__GuardedTransition__GuardAssignment_9 : ( ruleDetailCode ) ;
+    // InternalFSM.g:10818:1: rule__GuardedTransition__GuardAssignment_9 : ( ruleDetailCode ) ;
     public final void rule__GuardedTransition__GuardAssignment_9() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10819:1: ( ( ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10820:1: ( ruleDetailCode )
+            // InternalFSM.g:10822:1: ( ( ruleDetailCode ) )
+            // InternalFSM.g:10823:1: ( ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10820:1: ( ruleDetailCode )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10821:1: ruleDetailCode
+            // InternalFSM.g:10823:1: ( ruleDetailCode )
+            // InternalFSM.g:10824:1: ruleDetailCode
             {
              before(grammarAccess.getGuardedTransitionAccess().getGuardDetailCodeParserRuleCall_9_0()); 
-            pushFollow(FOLLOW_ruleDetailCode_in_rule__GuardedTransition__GuardAssignment_921873);
+            pushFollow(FOLLOW_2);
             ruleDetailCode();
 
             state._fsp--;
@@ -29133,20 +29133,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__ActionAssignment_10_1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10830:1: rule__GuardedTransition__ActionAssignment_10_1 : ( ruleDetailCode ) ;
+    // InternalFSM.g:10833:1: rule__GuardedTransition__ActionAssignment_10_1 : ( ruleDetailCode ) ;
     public final void rule__GuardedTransition__ActionAssignment_10_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10834:1: ( ( ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10835:1: ( ruleDetailCode )
+            // InternalFSM.g:10837:1: ( ( ruleDetailCode ) )
+            // InternalFSM.g:10838:1: ( ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10835:1: ( ruleDetailCode )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10836:1: ruleDetailCode
+            // InternalFSM.g:10838:1: ( ruleDetailCode )
+            // InternalFSM.g:10839:1: ruleDetailCode
             {
              before(grammarAccess.getGuardedTransitionAccess().getActionDetailCodeParserRuleCall_10_1_0()); 
-            pushFollow(FOLLOW_ruleDetailCode_in_rule__GuardedTransition__ActionAssignment_10_121904);
+            pushFollow(FOLLOW_2);
             ruleDetailCode();
 
             state._fsp--;
@@ -29174,20 +29174,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__NameAssignment_1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10845:1: rule__CPBranchTransition__NameAssignment_1 : ( RULE_ID ) ;
+    // InternalFSM.g:10848:1: rule__CPBranchTransition__NameAssignment_1 : ( RULE_ID ) ;
     public final void rule__CPBranchTransition__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10849:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10850:1: ( RULE_ID )
+            // InternalFSM.g:10852:1: ( ( RULE_ID ) )
+            // InternalFSM.g:10853:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10850:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10851:1: RULE_ID
+            // InternalFSM.g:10853:1: ( RULE_ID )
+            // InternalFSM.g:10854:1: RULE_ID
             {
              before(grammarAccess.getCPBranchTransitionAccess().getNameIDTerminalRuleCall_1_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__CPBranchTransition__NameAssignment_121935); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getCPBranchTransitionAccess().getNameIDTerminalRuleCall_1_0()); 
 
             }
@@ -29211,20 +29211,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__FromAssignment_3"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10860:1: rule__CPBranchTransition__FromAssignment_3 : ( ruleTransitionTerminal ) ;
+    // InternalFSM.g:10863:1: rule__CPBranchTransition__FromAssignment_3 : ( ruleTransitionTerminal ) ;
     public final void rule__CPBranchTransition__FromAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10864:1: ( ( ruleTransitionTerminal ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10865:1: ( ruleTransitionTerminal )
+            // InternalFSM.g:10867:1: ( ( ruleTransitionTerminal ) )
+            // InternalFSM.g:10868:1: ( ruleTransitionTerminal )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10865:1: ( ruleTransitionTerminal )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10866:1: ruleTransitionTerminal
+            // InternalFSM.g:10868:1: ( ruleTransitionTerminal )
+            // InternalFSM.g:10869:1: ruleTransitionTerminal
             {
              before(grammarAccess.getCPBranchTransitionAccess().getFromTransitionTerminalParserRuleCall_3_0()); 
-            pushFollow(FOLLOW_ruleTransitionTerminal_in_rule__CPBranchTransition__FromAssignment_321966);
+            pushFollow(FOLLOW_2);
             ruleTransitionTerminal();
 
             state._fsp--;
@@ -29252,20 +29252,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__ToAssignment_5"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10875:1: rule__CPBranchTransition__ToAssignment_5 : ( ruleTransitionTerminal ) ;
+    // InternalFSM.g:10878:1: rule__CPBranchTransition__ToAssignment_5 : ( ruleTransitionTerminal ) ;
     public final void rule__CPBranchTransition__ToAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10879:1: ( ( ruleTransitionTerminal ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10880:1: ( ruleTransitionTerminal )
+            // InternalFSM.g:10882:1: ( ( ruleTransitionTerminal ) )
+            // InternalFSM.g:10883:1: ( ruleTransitionTerminal )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10880:1: ( ruleTransitionTerminal )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10881:1: ruleTransitionTerminal
+            // InternalFSM.g:10883:1: ( ruleTransitionTerminal )
+            // InternalFSM.g:10884:1: ruleTransitionTerminal
             {
              before(grammarAccess.getCPBranchTransitionAccess().getToTransitionTerminalParserRuleCall_5_0()); 
-            pushFollow(FOLLOW_ruleTransitionTerminal_in_rule__CPBranchTransition__ToAssignment_521997);
+            pushFollow(FOLLOW_2);
             ruleTransitionTerminal();
 
             state._fsp--;
@@ -29293,20 +29293,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__DocuAssignment_6"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10890:1: rule__CPBranchTransition__DocuAssignment_6 : ( ruleDocumentation ) ;
+    // InternalFSM.g:10893:1: rule__CPBranchTransition__DocuAssignment_6 : ( ruleDocumentation ) ;
     public final void rule__CPBranchTransition__DocuAssignment_6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10894:1: ( ( ruleDocumentation ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10895:1: ( ruleDocumentation )
+            // InternalFSM.g:10897:1: ( ( ruleDocumentation ) )
+            // InternalFSM.g:10898:1: ( ruleDocumentation )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10895:1: ( ruleDocumentation )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10896:1: ruleDocumentation
+            // InternalFSM.g:10898:1: ( ruleDocumentation )
+            // InternalFSM.g:10899:1: ruleDocumentation
             {
              before(grammarAccess.getCPBranchTransitionAccess().getDocuDocumentationParserRuleCall_6_0()); 
-            pushFollow(FOLLOW_ruleDocumentation_in_rule__CPBranchTransition__DocuAssignment_622028);
+            pushFollow(FOLLOW_2);
             ruleDocumentation();
 
             state._fsp--;
@@ -29334,20 +29334,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__ConditionAssignment_9"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10905:1: rule__CPBranchTransition__ConditionAssignment_9 : ( ruleDetailCode ) ;
+    // InternalFSM.g:10908:1: rule__CPBranchTransition__ConditionAssignment_9 : ( ruleDetailCode ) ;
     public final void rule__CPBranchTransition__ConditionAssignment_9() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10909:1: ( ( ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10910:1: ( ruleDetailCode )
+            // InternalFSM.g:10912:1: ( ( ruleDetailCode ) )
+            // InternalFSM.g:10913:1: ( ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10910:1: ( ruleDetailCode )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10911:1: ruleDetailCode
+            // InternalFSM.g:10913:1: ( ruleDetailCode )
+            // InternalFSM.g:10914:1: ruleDetailCode
             {
              before(grammarAccess.getCPBranchTransitionAccess().getConditionDetailCodeParserRuleCall_9_0()); 
-            pushFollow(FOLLOW_ruleDetailCode_in_rule__CPBranchTransition__ConditionAssignment_922059);
+            pushFollow(FOLLOW_2);
             ruleDetailCode();
 
             state._fsp--;
@@ -29375,20 +29375,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__ActionAssignment_10_1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10920:1: rule__CPBranchTransition__ActionAssignment_10_1 : ( ruleDetailCode ) ;
+    // InternalFSM.g:10923:1: rule__CPBranchTransition__ActionAssignment_10_1 : ( ruleDetailCode ) ;
     public final void rule__CPBranchTransition__ActionAssignment_10_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10924:1: ( ( ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10925:1: ( ruleDetailCode )
+            // InternalFSM.g:10927:1: ( ( ruleDetailCode ) )
+            // InternalFSM.g:10928:1: ( ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10925:1: ( ruleDetailCode )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10926:1: ruleDetailCode
+            // InternalFSM.g:10928:1: ( ruleDetailCode )
+            // InternalFSM.g:10929:1: ruleDetailCode
             {
              before(grammarAccess.getCPBranchTransitionAccess().getActionDetailCodeParserRuleCall_10_1_0()); 
-            pushFollow(FOLLOW_ruleDetailCode_in_rule__CPBranchTransition__ActionAssignment_10_122090);
+            pushFollow(FOLLOW_2);
             ruleDetailCode();
 
             state._fsp--;
@@ -29416,24 +29416,24 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedTransition__TargetAssignment_1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10935:1: rule__RefinedTransition__TargetAssignment_1 : ( ( ruleFQN ) ) ;
+    // InternalFSM.g:10938:1: rule__RefinedTransition__TargetAssignment_1 : ( ( ruleFQN ) ) ;
     public final void rule__RefinedTransition__TargetAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10939:1: ( ( ( ruleFQN ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10940:1: ( ( ruleFQN ) )
+            // InternalFSM.g:10942:1: ( ( ( ruleFQN ) ) )
+            // InternalFSM.g:10943:1: ( ( ruleFQN ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10940:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10941:1: ( ruleFQN )
+            // InternalFSM.g:10943:1: ( ( ruleFQN ) )
+            // InternalFSM.g:10944:1: ( ruleFQN )
             {
              before(grammarAccess.getRefinedTransitionAccess().getTargetTransitionCrossReference_1_0()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10942:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10943:1: ruleFQN
+            // InternalFSM.g:10945:1: ( ruleFQN )
+            // InternalFSM.g:10946:1: ruleFQN
             {
              before(grammarAccess.getRefinedTransitionAccess().getTargetTransitionFQNParserRuleCall_1_0_1()); 
-            pushFollow(FOLLOW_ruleFQN_in_rule__RefinedTransition__TargetAssignment_122125);
+            pushFollow(FOLLOW_2);
             ruleFQN();
 
             state._fsp--;
@@ -29465,20 +29465,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedTransition__DocuAssignment_2"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10954:1: rule__RefinedTransition__DocuAssignment_2 : ( ruleDocumentation ) ;
+    // InternalFSM.g:10957:1: rule__RefinedTransition__DocuAssignment_2 : ( ruleDocumentation ) ;
     public final void rule__RefinedTransition__DocuAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10958:1: ( ( ruleDocumentation ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10959:1: ( ruleDocumentation )
+            // InternalFSM.g:10961:1: ( ( ruleDocumentation ) )
+            // InternalFSM.g:10962:1: ( ruleDocumentation )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10959:1: ( ruleDocumentation )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10960:1: ruleDocumentation
+            // InternalFSM.g:10962:1: ( ruleDocumentation )
+            // InternalFSM.g:10963:1: ruleDocumentation
             {
              before(grammarAccess.getRefinedTransitionAccess().getDocuDocumentationParserRuleCall_2_0()); 
-            pushFollow(FOLLOW_ruleDocumentation_in_rule__RefinedTransition__DocuAssignment_222160);
+            pushFollow(FOLLOW_2);
             ruleDocumentation();
 
             state._fsp--;
@@ -29506,20 +29506,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedTransition__ActionAssignment_5"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10969:1: rule__RefinedTransition__ActionAssignment_5 : ( ruleDetailCode ) ;
+    // InternalFSM.g:10972:1: rule__RefinedTransition__ActionAssignment_5 : ( ruleDetailCode ) ;
     public final void rule__RefinedTransition__ActionAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10973:1: ( ( ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10974:1: ( ruleDetailCode )
+            // InternalFSM.g:10976:1: ( ( ruleDetailCode ) )
+            // InternalFSM.g:10977:1: ( ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10974:1: ( ruleDetailCode )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10975:1: ruleDetailCode
+            // InternalFSM.g:10977:1: ( ruleDetailCode )
+            // InternalFSM.g:10978:1: ruleDetailCode
             {
              before(grammarAccess.getRefinedTransitionAccess().getActionDetailCodeParserRuleCall_5_0()); 
-            pushFollow(FOLLOW_ruleDetailCode_in_rule__RefinedTransition__ActionAssignment_522191);
+            pushFollow(FOLLOW_2);
             ruleDetailCode();
 
             state._fsp--;
@@ -29547,24 +29547,24 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateTerminal__StateAssignment"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10984:1: rule__StateTerminal__StateAssignment : ( ( RULE_ID ) ) ;
+    // InternalFSM.g:10987:1: rule__StateTerminal__StateAssignment : ( ( RULE_ID ) ) ;
     public final void rule__StateTerminal__StateAssignment() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10988:1: ( ( ( RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10989:1: ( ( RULE_ID ) )
+            // InternalFSM.g:10991:1: ( ( ( RULE_ID ) ) )
+            // InternalFSM.g:10992:1: ( ( RULE_ID ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10989:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10990:1: ( RULE_ID )
+            // InternalFSM.g:10992:1: ( ( RULE_ID ) )
+            // InternalFSM.g:10993:1: ( RULE_ID )
             {
              before(grammarAccess.getStateTerminalAccess().getStateStateCrossReference_0()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10991:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:10992:1: RULE_ID
+            // InternalFSM.g:10994:1: ( RULE_ID )
+            // InternalFSM.g:10995:1: RULE_ID
             {
              before(grammarAccess.getStateTerminalAccess().getStateStateIDTerminalRuleCall_0_1()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__StateTerminal__StateAssignment22226); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getStateTerminalAccess().getStateStateIDTerminalRuleCall_0_1()); 
 
             }
@@ -29592,24 +29592,24 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TrPointTerminal__TrPointAssignment_1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11003:1: rule__TrPointTerminal__TrPointAssignment_1 : ( ( RULE_ID ) ) ;
+    // InternalFSM.g:11006:1: rule__TrPointTerminal__TrPointAssignment_1 : ( ( RULE_ID ) ) ;
     public final void rule__TrPointTerminal__TrPointAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11007:1: ( ( ( RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11008:1: ( ( RULE_ID ) )
+            // InternalFSM.g:11010:1: ( ( ( RULE_ID ) ) )
+            // InternalFSM.g:11011:1: ( ( RULE_ID ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11008:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11009:1: ( RULE_ID )
+            // InternalFSM.g:11011:1: ( ( RULE_ID ) )
+            // InternalFSM.g:11012:1: ( RULE_ID )
             {
              before(grammarAccess.getTrPointTerminalAccess().getTrPointTrPointCrossReference_1_0()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11010:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11011:1: RULE_ID
+            // InternalFSM.g:11013:1: ( RULE_ID )
+            // InternalFSM.g:11014:1: RULE_ID
             {
              before(grammarAccess.getTrPointTerminalAccess().getTrPointTrPointIDTerminalRuleCall_1_0_1()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__TrPointTerminal__TrPointAssignment_122265); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getTrPointTerminalAccess().getTrPointTrPointIDTerminalRuleCall_1_0_1()); 
 
             }
@@ -29637,24 +29637,24 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubStateTrPointTerminal__TrPointAssignment_0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11022:1: rule__SubStateTrPointTerminal__TrPointAssignment_0 : ( ( RULE_ID ) ) ;
+    // InternalFSM.g:11025:1: rule__SubStateTrPointTerminal__TrPointAssignment_0 : ( ( RULE_ID ) ) ;
     public final void rule__SubStateTrPointTerminal__TrPointAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11026:1: ( ( ( RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11027:1: ( ( RULE_ID ) )
+            // InternalFSM.g:11029:1: ( ( ( RULE_ID ) ) )
+            // InternalFSM.g:11030:1: ( ( RULE_ID ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11027:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11028:1: ( RULE_ID )
+            // InternalFSM.g:11030:1: ( ( RULE_ID ) )
+            // InternalFSM.g:11031:1: ( RULE_ID )
             {
              before(grammarAccess.getSubStateTrPointTerminalAccess().getTrPointTrPointCrossReference_0_0()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11029:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11030:1: RULE_ID
+            // InternalFSM.g:11032:1: ( RULE_ID )
+            // InternalFSM.g:11033:1: RULE_ID
             {
              before(grammarAccess.getSubStateTrPointTerminalAccess().getTrPointTrPointIDTerminalRuleCall_0_0_1()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__SubStateTrPointTerminal__TrPointAssignment_022304); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getSubStateTrPointTerminalAccess().getTrPointTrPointIDTerminalRuleCall_0_0_1()); 
 
             }
@@ -29682,24 +29682,24 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubStateTrPointTerminal__StateAssignment_2"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11041:1: rule__SubStateTrPointTerminal__StateAssignment_2 : ( ( RULE_ID ) ) ;
+    // InternalFSM.g:11044:1: rule__SubStateTrPointTerminal__StateAssignment_2 : ( ( RULE_ID ) ) ;
     public final void rule__SubStateTrPointTerminal__StateAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11045:1: ( ( ( RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11046:1: ( ( RULE_ID ) )
+            // InternalFSM.g:11048:1: ( ( ( RULE_ID ) ) )
+            // InternalFSM.g:11049:1: ( ( RULE_ID ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11046:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11047:1: ( RULE_ID )
+            // InternalFSM.g:11049:1: ( ( RULE_ID ) )
+            // InternalFSM.g:11050:1: ( RULE_ID )
             {
              before(grammarAccess.getSubStateTrPointTerminalAccess().getStateStateCrossReference_2_0()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11048:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11049:1: RULE_ID
+            // InternalFSM.g:11051:1: ( RULE_ID )
+            // InternalFSM.g:11052:1: RULE_ID
             {
              before(grammarAccess.getSubStateTrPointTerminalAccess().getStateStateIDTerminalRuleCall_2_0_1()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__SubStateTrPointTerminal__StateAssignment_222343); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getSubStateTrPointTerminalAccess().getStateStateIDTerminalRuleCall_2_0_1()); 
 
             }
@@ -29727,24 +29727,24 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ChoicepointTerminal__CpAssignment_1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11060:1: rule__ChoicepointTerminal__CpAssignment_1 : ( ( RULE_ID ) ) ;
+    // InternalFSM.g:11063:1: rule__ChoicepointTerminal__CpAssignment_1 : ( ( RULE_ID ) ) ;
     public final void rule__ChoicepointTerminal__CpAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11064:1: ( ( ( RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11065:1: ( ( RULE_ID ) )
+            // InternalFSM.g:11067:1: ( ( ( RULE_ID ) ) )
+            // InternalFSM.g:11068:1: ( ( RULE_ID ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11065:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11066:1: ( RULE_ID )
+            // InternalFSM.g:11068:1: ( ( RULE_ID ) )
+            // InternalFSM.g:11069:1: ( RULE_ID )
             {
              before(grammarAccess.getChoicepointTerminalAccess().getCpChoicePointCrossReference_1_0()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11067:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11068:1: RULE_ID
+            // InternalFSM.g:11070:1: ( RULE_ID )
+            // InternalFSM.g:11071:1: RULE_ID
             {
              before(grammarAccess.getChoicepointTerminalAccess().getCpChoicePointIDTerminalRuleCall_1_0_1()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__ChoicepointTerminal__CpAssignment_122382); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getChoicepointTerminalAccess().getCpChoicePointIDTerminalRuleCall_1_0_1()); 
 
             }
@@ -29772,20 +29772,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Trigger__MsgFromIfPairsAssignment_1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11079:1: rule__Trigger__MsgFromIfPairsAssignment_1 : ( ruleMessageFromIf ) ;
+    // InternalFSM.g:11082:1: rule__Trigger__MsgFromIfPairsAssignment_1 : ( ruleMessageFromIf ) ;
     public final void rule__Trigger__MsgFromIfPairsAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11083:1: ( ( ruleMessageFromIf ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11084:1: ( ruleMessageFromIf )
+            // InternalFSM.g:11086:1: ( ( ruleMessageFromIf ) )
+            // InternalFSM.g:11087:1: ( ruleMessageFromIf )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11084:1: ( ruleMessageFromIf )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11085:1: ruleMessageFromIf
+            // InternalFSM.g:11087:1: ( ruleMessageFromIf )
+            // InternalFSM.g:11088:1: ruleMessageFromIf
             {
              before(grammarAccess.getTriggerAccess().getMsgFromIfPairsMessageFromIfParserRuleCall_1_0()); 
-            pushFollow(FOLLOW_ruleMessageFromIf_in_rule__Trigger__MsgFromIfPairsAssignment_122417);
+            pushFollow(FOLLOW_2);
             ruleMessageFromIf();
 
             state._fsp--;
@@ -29813,20 +29813,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Trigger__MsgFromIfPairsAssignment_2_1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11094:1: rule__Trigger__MsgFromIfPairsAssignment_2_1 : ( ruleMessageFromIf ) ;
+    // InternalFSM.g:11097:1: rule__Trigger__MsgFromIfPairsAssignment_2_1 : ( ruleMessageFromIf ) ;
     public final void rule__Trigger__MsgFromIfPairsAssignment_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11098:1: ( ( ruleMessageFromIf ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11099:1: ( ruleMessageFromIf )
+            // InternalFSM.g:11101:1: ( ( ruleMessageFromIf ) )
+            // InternalFSM.g:11102:1: ( ruleMessageFromIf )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11099:1: ( ruleMessageFromIf )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11100:1: ruleMessageFromIf
+            // InternalFSM.g:11102:1: ( ruleMessageFromIf )
+            // InternalFSM.g:11103:1: ruleMessageFromIf
             {
              before(grammarAccess.getTriggerAccess().getMsgFromIfPairsMessageFromIfParserRuleCall_2_1_0()); 
-            pushFollow(FOLLOW_ruleMessageFromIf_in_rule__Trigger__MsgFromIfPairsAssignment_2_122448);
+            pushFollow(FOLLOW_2);
             ruleMessageFromIf();
 
             state._fsp--;
@@ -29854,20 +29854,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Trigger__GuardAssignment_3"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11109:1: rule__Trigger__GuardAssignment_3 : ( ruleGuard ) ;
+    // InternalFSM.g:11112:1: rule__Trigger__GuardAssignment_3 : ( ruleGuard ) ;
     public final void rule__Trigger__GuardAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11113:1: ( ( ruleGuard ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11114:1: ( ruleGuard )
+            // InternalFSM.g:11116:1: ( ( ruleGuard ) )
+            // InternalFSM.g:11117:1: ( ruleGuard )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11114:1: ( ruleGuard )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11115:1: ruleGuard
+            // InternalFSM.g:11117:1: ( ruleGuard )
+            // InternalFSM.g:11118:1: ruleGuard
             {
              before(grammarAccess.getTriggerAccess().getGuardGuardParserRuleCall_3_0()); 
-            pushFollow(FOLLOW_ruleGuard_in_rule__Trigger__GuardAssignment_322479);
+            pushFollow(FOLLOW_2);
             ruleGuard();
 
             state._fsp--;
@@ -29895,24 +29895,24 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MessageFromIf__MessageAssignment_0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11124:1: rule__MessageFromIf__MessageAssignment_0 : ( ( RULE_ID ) ) ;
+    // InternalFSM.g:11127:1: rule__MessageFromIf__MessageAssignment_0 : ( ( RULE_ID ) ) ;
     public final void rule__MessageFromIf__MessageAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11128:1: ( ( ( RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11129:1: ( ( RULE_ID ) )
+            // InternalFSM.g:11131:1: ( ( ( RULE_ID ) ) )
+            // InternalFSM.g:11132:1: ( ( RULE_ID ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11129:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11130:1: ( RULE_ID )
+            // InternalFSM.g:11132:1: ( ( RULE_ID ) )
+            // InternalFSM.g:11133:1: ( RULE_ID )
             {
              before(grammarAccess.getMessageFromIfAccess().getMessageEObjectCrossReference_0_0()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11131:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11132:1: RULE_ID
+            // InternalFSM.g:11134:1: ( RULE_ID )
+            // InternalFSM.g:11135:1: RULE_ID
             {
              before(grammarAccess.getMessageFromIfAccess().getMessageEObjectIDTerminalRuleCall_0_0_1()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__MessageFromIf__MessageAssignment_022514); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getMessageFromIfAccess().getMessageEObjectIDTerminalRuleCall_0_0_1()); 
 
             }
@@ -29940,24 +29940,24 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MessageFromIf__FromAssignment_2"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11143:1: rule__MessageFromIf__FromAssignment_2 : ( ( RULE_ID ) ) ;
+    // InternalFSM.g:11146:1: rule__MessageFromIf__FromAssignment_2 : ( ( RULE_ID ) ) ;
     public final void rule__MessageFromIf__FromAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11147:1: ( ( ( RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11148:1: ( ( RULE_ID ) )
+            // InternalFSM.g:11150:1: ( ( ( RULE_ID ) ) )
+            // InternalFSM.g:11151:1: ( ( RULE_ID ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11148:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11149:1: ( RULE_ID )
+            // InternalFSM.g:11151:1: ( ( RULE_ID ) )
+            // InternalFSM.g:11152:1: ( RULE_ID )
             {
              before(grammarAccess.getMessageFromIfAccess().getFromAbstractInterfaceItemCrossReference_2_0()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11150:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11151:1: RULE_ID
+            // InternalFSM.g:11153:1: ( RULE_ID )
+            // InternalFSM.g:11154:1: RULE_ID
             {
              before(grammarAccess.getMessageFromIfAccess().getFromAbstractInterfaceItemIDTerminalRuleCall_2_0_1()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__MessageFromIf__FromAssignment_222553); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getMessageFromIfAccess().getFromAbstractInterfaceItemIDTerminalRuleCall_2_0_1()); 
 
             }
@@ -29985,20 +29985,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Guard__GuardAssignment_1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11163:1: rule__Guard__GuardAssignment_1 : ( ruleDetailCode ) ;
+    // InternalFSM.g:11166:1: rule__Guard__GuardAssignment_1 : ( ruleDetailCode ) ;
     public final void rule__Guard__GuardAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11167:1: ( ( ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11168:1: ( ruleDetailCode )
+            // InternalFSM.g:11170:1: ( ( ruleDetailCode ) )
+            // InternalFSM.g:11171:1: ( ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11168:1: ( ruleDetailCode )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11169:1: ruleDetailCode
+            // InternalFSM.g:11171:1: ( ruleDetailCode )
+            // InternalFSM.g:11172:1: ruleDetailCode
             {
              before(grammarAccess.getGuardAccess().getGuardDetailCodeParserRuleCall_1_0()); 
-            pushFollow(FOLLOW_ruleDetailCode_in_rule__Guard__GuardAssignment_122589);
+            pushFollow(FOLLOW_2);
             ruleDetailCode();
 
             state._fsp--;
@@ -30026,24 +30026,24 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__MsgAssignment_2"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11179:1: rule__InSemanticsRule__MsgAssignment_2 : ( ( RULE_ID ) ) ;
+    // InternalFSM.g:11182:1: rule__InSemanticsRule__MsgAssignment_2 : ( ( RULE_ID ) ) ;
     public final void rule__InSemanticsRule__MsgAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11183:1: ( ( ( RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11184:1: ( ( RULE_ID ) )
+            // InternalFSM.g:11186:1: ( ( ( RULE_ID ) ) )
+            // InternalFSM.g:11187:1: ( ( RULE_ID ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11184:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11185:1: ( RULE_ID )
+            // InternalFSM.g:11187:1: ( ( RULE_ID ) )
+            // InternalFSM.g:11188:1: ( RULE_ID )
             {
              before(grammarAccess.getInSemanticsRuleAccess().getMsgEObjectCrossReference_2_0()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11186:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11187:1: RULE_ID
+            // InternalFSM.g:11189:1: ( RULE_ID )
+            // InternalFSM.g:11190:1: RULE_ID
             {
              before(grammarAccess.getInSemanticsRuleAccess().getMsgEObjectIDTerminalRuleCall_2_0_1()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__InSemanticsRule__MsgAssignment_222625); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getInSemanticsRuleAccess().getMsgEObjectIDTerminalRuleCall_2_0_1()); 
 
             }
@@ -30071,20 +30071,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__FollowUpsAssignment_3_1_0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11198:1: rule__InSemanticsRule__FollowUpsAssignment_3_1_0 : ( ruleSemanticsRule ) ;
+    // InternalFSM.g:11201:1: rule__InSemanticsRule__FollowUpsAssignment_3_1_0 : ( ruleSemanticsRule ) ;
     public final void rule__InSemanticsRule__FollowUpsAssignment_3_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11202:1: ( ( ruleSemanticsRule ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11203:1: ( ruleSemanticsRule )
+            // InternalFSM.g:11205:1: ( ( ruleSemanticsRule ) )
+            // InternalFSM.g:11206:1: ( ruleSemanticsRule )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11203:1: ( ruleSemanticsRule )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11204:1: ruleSemanticsRule
+            // InternalFSM.g:11206:1: ( ruleSemanticsRule )
+            // InternalFSM.g:11207:1: ruleSemanticsRule
             {
              before(grammarAccess.getInSemanticsRuleAccess().getFollowUpsSemanticsRuleParserRuleCall_3_1_0_0()); 
-            pushFollow(FOLLOW_ruleSemanticsRule_in_rule__InSemanticsRule__FollowUpsAssignment_3_1_022660);
+            pushFollow(FOLLOW_2);
             ruleSemanticsRule();
 
             state._fsp--;
@@ -30112,20 +30112,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__FollowUpsAssignment_3_1_1_1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11213:1: rule__InSemanticsRule__FollowUpsAssignment_3_1_1_1 : ( ruleSemanticsRule ) ;
+    // InternalFSM.g:11216:1: rule__InSemanticsRule__FollowUpsAssignment_3_1_1_1 : ( ruleSemanticsRule ) ;
     public final void rule__InSemanticsRule__FollowUpsAssignment_3_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11217:1: ( ( ruleSemanticsRule ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11218:1: ( ruleSemanticsRule )
+            // InternalFSM.g:11220:1: ( ( ruleSemanticsRule ) )
+            // InternalFSM.g:11221:1: ( ruleSemanticsRule )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11218:1: ( ruleSemanticsRule )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11219:1: ruleSemanticsRule
+            // InternalFSM.g:11221:1: ( ruleSemanticsRule )
+            // InternalFSM.g:11222:1: ruleSemanticsRule
             {
              before(grammarAccess.getInSemanticsRuleAccess().getFollowUpsSemanticsRuleParserRuleCall_3_1_1_1_0()); 
-            pushFollow(FOLLOW_ruleSemanticsRule_in_rule__InSemanticsRule__FollowUpsAssignment_3_1_1_122691);
+            pushFollow(FOLLOW_2);
             ruleSemanticsRule();
 
             state._fsp--;
@@ -30153,20 +30153,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__FollowUpsAssignment_3_1_1_2_1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11228:1: rule__InSemanticsRule__FollowUpsAssignment_3_1_1_2_1 : ( ruleSemanticsRule ) ;
+    // InternalFSM.g:11231:1: rule__InSemanticsRule__FollowUpsAssignment_3_1_1_2_1 : ( ruleSemanticsRule ) ;
     public final void rule__InSemanticsRule__FollowUpsAssignment_3_1_1_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11232:1: ( ( ruleSemanticsRule ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11233:1: ( ruleSemanticsRule )
+            // InternalFSM.g:11235:1: ( ( ruleSemanticsRule ) )
+            // InternalFSM.g:11236:1: ( ruleSemanticsRule )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11233:1: ( ruleSemanticsRule )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11234:1: ruleSemanticsRule
+            // InternalFSM.g:11236:1: ( ruleSemanticsRule )
+            // InternalFSM.g:11237:1: ruleSemanticsRule
             {
              before(grammarAccess.getInSemanticsRuleAccess().getFollowUpsSemanticsRuleParserRuleCall_3_1_1_2_1_0()); 
-            pushFollow(FOLLOW_ruleSemanticsRule_in_rule__InSemanticsRule__FollowUpsAssignment_3_1_1_2_122722);
+            pushFollow(FOLLOW_2);
             ruleSemanticsRule();
 
             state._fsp--;
@@ -30194,24 +30194,24 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__MsgAssignment_2"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11243:1: rule__OutSemanticsRule__MsgAssignment_2 : ( ( RULE_ID ) ) ;
+    // InternalFSM.g:11246:1: rule__OutSemanticsRule__MsgAssignment_2 : ( ( RULE_ID ) ) ;
     public final void rule__OutSemanticsRule__MsgAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11247:1: ( ( ( RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11248:1: ( ( RULE_ID ) )
+            // InternalFSM.g:11250:1: ( ( ( RULE_ID ) ) )
+            // InternalFSM.g:11251:1: ( ( RULE_ID ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11248:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11249:1: ( RULE_ID )
+            // InternalFSM.g:11251:1: ( ( RULE_ID ) )
+            // InternalFSM.g:11252:1: ( RULE_ID )
             {
              before(grammarAccess.getOutSemanticsRuleAccess().getMsgEObjectCrossReference_2_0()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11250:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11251:1: RULE_ID
+            // InternalFSM.g:11253:1: ( RULE_ID )
+            // InternalFSM.g:11254:1: RULE_ID
             {
              before(grammarAccess.getOutSemanticsRuleAccess().getMsgEObjectIDTerminalRuleCall_2_0_1()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__OutSemanticsRule__MsgAssignment_222757); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getOutSemanticsRuleAccess().getMsgEObjectIDTerminalRuleCall_2_0_1()); 
 
             }
@@ -30239,20 +30239,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__FollowUpsAssignment_3_1_0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11262:1: rule__OutSemanticsRule__FollowUpsAssignment_3_1_0 : ( ruleSemanticsRule ) ;
+    // InternalFSM.g:11265:1: rule__OutSemanticsRule__FollowUpsAssignment_3_1_0 : ( ruleSemanticsRule ) ;
     public final void rule__OutSemanticsRule__FollowUpsAssignment_3_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11266:1: ( ( ruleSemanticsRule ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11267:1: ( ruleSemanticsRule )
+            // InternalFSM.g:11269:1: ( ( ruleSemanticsRule ) )
+            // InternalFSM.g:11270:1: ( ruleSemanticsRule )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11267:1: ( ruleSemanticsRule )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11268:1: ruleSemanticsRule
+            // InternalFSM.g:11270:1: ( ruleSemanticsRule )
+            // InternalFSM.g:11271:1: ruleSemanticsRule
             {
              before(grammarAccess.getOutSemanticsRuleAccess().getFollowUpsSemanticsRuleParserRuleCall_3_1_0_0()); 
-            pushFollow(FOLLOW_ruleSemanticsRule_in_rule__OutSemanticsRule__FollowUpsAssignment_3_1_022792);
+            pushFollow(FOLLOW_2);
             ruleSemanticsRule();
 
             state._fsp--;
@@ -30280,20 +30280,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11277:1: rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_1 : ( ruleSemanticsRule ) ;
+    // InternalFSM.g:11280:1: rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_1 : ( ruleSemanticsRule ) ;
     public final void rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11281:1: ( ( ruleSemanticsRule ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11282:1: ( ruleSemanticsRule )
+            // InternalFSM.g:11284:1: ( ( ruleSemanticsRule ) )
+            // InternalFSM.g:11285:1: ( ruleSemanticsRule )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11282:1: ( ruleSemanticsRule )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11283:1: ruleSemanticsRule
+            // InternalFSM.g:11285:1: ( ruleSemanticsRule )
+            // InternalFSM.g:11286:1: ruleSemanticsRule
             {
              before(grammarAccess.getOutSemanticsRuleAccess().getFollowUpsSemanticsRuleParserRuleCall_3_1_1_1_0()); 
-            pushFollow(FOLLOW_ruleSemanticsRule_in_rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_122823);
+            pushFollow(FOLLOW_2);
             ruleSemanticsRule();
 
             state._fsp--;
@@ -30321,20 +30321,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_2_1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11292:1: rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_2_1 : ( ruleSemanticsRule ) ;
+    // InternalFSM.g:11295:1: rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_2_1 : ( ruleSemanticsRule ) ;
     public final void rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11296:1: ( ( ruleSemanticsRule ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11297:1: ( ruleSemanticsRule )
+            // InternalFSM.g:11299:1: ( ( ruleSemanticsRule ) )
+            // InternalFSM.g:11300:1: ( ruleSemanticsRule )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11297:1: ( ruleSemanticsRule )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11298:1: ruleSemanticsRule
+            // InternalFSM.g:11300:1: ( ruleSemanticsRule )
+            // InternalFSM.g:11301:1: ruleSemanticsRule
             {
              before(grammarAccess.getOutSemanticsRuleAccess().getFollowUpsSemanticsRuleParserRuleCall_3_1_1_2_1_0()); 
-            pushFollow(FOLLOW_ruleSemanticsRule_in_rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_2_122854);
+            pushFollow(FOLLOW_2);
             ruleSemanticsRule();
 
             state._fsp--;
@@ -30362,20 +30362,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__KeyValue__KeyAssignment_0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11310:1: rule__KeyValue__KeyAssignment_0 : ( RULE_ID ) ;
+    // InternalFSM.g:11313:1: rule__KeyValue__KeyAssignment_0 : ( RULE_ID ) ;
     public final void rule__KeyValue__KeyAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11314:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11315:1: ( RULE_ID )
+            // InternalFSM.g:11317:1: ( ( RULE_ID ) )
+            // InternalFSM.g:11318:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11315:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11316:1: RULE_ID
+            // InternalFSM.g:11318:1: ( RULE_ID )
+            // InternalFSM.g:11319:1: RULE_ID
             {
              before(grammarAccess.getKeyValueAccess().getKeyIDTerminalRuleCall_0_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__KeyValue__KeyAssignment_022888); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getKeyValueAccess().getKeyIDTerminalRuleCall_0_0()); 
 
             }
@@ -30399,20 +30399,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__KeyValue__ValueAssignment_2"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11325:1: rule__KeyValue__ValueAssignment_2 : ( ruleLiteral ) ;
+    // InternalFSM.g:11328:1: rule__KeyValue__ValueAssignment_2 : ( ruleLiteral ) ;
     public final void rule__KeyValue__ValueAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11329:1: ( ( ruleLiteral ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11330:1: ( ruleLiteral )
+            // InternalFSM.g:11332:1: ( ( ruleLiteral ) )
+            // InternalFSM.g:11333:1: ( ruleLiteral )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11330:1: ( ruleLiteral )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11331:1: ruleLiteral
+            // InternalFSM.g:11333:1: ( ruleLiteral )
+            // InternalFSM.g:11334:1: ruleLiteral
             {
              before(grammarAccess.getKeyValueAccess().getValueLiteralParserRuleCall_2_0()); 
-            pushFollow(FOLLOW_ruleLiteral_in_rule__KeyValue__ValueAssignment_222919);
+            pushFollow(FOLLOW_2);
             ruleLiteral();
 
             state._fsp--;
@@ -30440,24 +30440,24 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__OptionalAssignment_0_0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11346:1: rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 : ( ( 'optional' ) ) ;
+    // InternalFSM.g:11349:1: rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 : ( ( 'optional' ) ) ;
     public final void rule__SimpleAnnotationAttribute__OptionalAssignment_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11350:1: ( ( ( 'optional' ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11351:1: ( ( 'optional' ) )
+            // InternalFSM.g:11353:1: ( ( ( 'optional' ) ) )
+            // InternalFSM.g:11354:1: ( ( 'optional' ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11351:1: ( ( 'optional' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11352:1: ( 'optional' )
+            // InternalFSM.g:11354:1: ( ( 'optional' ) )
+            // InternalFSM.g:11355:1: ( 'optional' )
             {
              before(grammarAccess.getSimpleAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11353:1: ( 'optional' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11354:1: 'optional'
+            // InternalFSM.g:11356:1: ( 'optional' )
+            // InternalFSM.g:11357:1: 'optional'
             {
              before(grammarAccess.getSimpleAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0()); 
-            match(input,70,FOLLOW_70_in_rule__SimpleAnnotationAttribute__OptionalAssignment_0_022961); 
+            match(input,70,FOLLOW_2); 
              after(grammarAccess.getSimpleAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0()); 
 
             }
@@ -30485,20 +30485,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__NameAssignment_2"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11369:1: rule__SimpleAnnotationAttribute__NameAssignment_2 : ( RULE_ID ) ;
+    // InternalFSM.g:11372:1: rule__SimpleAnnotationAttribute__NameAssignment_2 : ( RULE_ID ) ;
     public final void rule__SimpleAnnotationAttribute__NameAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11373:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11374:1: ( RULE_ID )
+            // InternalFSM.g:11376:1: ( ( RULE_ID ) )
+            // InternalFSM.g:11377:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11374:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11375:1: RULE_ID
+            // InternalFSM.g:11377:1: ( RULE_ID )
+            // InternalFSM.g:11378:1: RULE_ID
             {
              before(grammarAccess.getSimpleAnnotationAttributeAccess().getNameIDTerminalRuleCall_2_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__SimpleAnnotationAttribute__NameAssignment_223000); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getSimpleAnnotationAttributeAccess().getNameIDTerminalRuleCall_2_0()); 
 
             }
@@ -30522,20 +30522,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__TypeAssignment_4"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11384:1: rule__SimpleAnnotationAttribute__TypeAssignment_4 : ( ruleLiteralType ) ;
+    // InternalFSM.g:11387:1: rule__SimpleAnnotationAttribute__TypeAssignment_4 : ( ruleLiteralType ) ;
     public final void rule__SimpleAnnotationAttribute__TypeAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11388:1: ( ( ruleLiteralType ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11389:1: ( ruleLiteralType )
+            // InternalFSM.g:11391:1: ( ( ruleLiteralType ) )
+            // InternalFSM.g:11392:1: ( ruleLiteralType )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11389:1: ( ruleLiteralType )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11390:1: ruleLiteralType
+            // InternalFSM.g:11392:1: ( ruleLiteralType )
+            // InternalFSM.g:11393:1: ruleLiteralType
             {
              before(grammarAccess.getSimpleAnnotationAttributeAccess().getTypeLiteralTypeEnumRuleCall_4_0()); 
-            pushFollow(FOLLOW_ruleLiteralType_in_rule__SimpleAnnotationAttribute__TypeAssignment_423031);
+            pushFollow(FOLLOW_2);
             ruleLiteralType();
 
             state._fsp--;
@@ -30563,24 +30563,24 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__OptionalAssignment_0_0"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11399:1: rule__EnumAnnotationAttribute__OptionalAssignment_0_0 : ( ( 'optional' ) ) ;
+    // InternalFSM.g:11402:1: rule__EnumAnnotationAttribute__OptionalAssignment_0_0 : ( ( 'optional' ) ) ;
     public final void rule__EnumAnnotationAttribute__OptionalAssignment_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11403:1: ( ( ( 'optional' ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11404:1: ( ( 'optional' ) )
+            // InternalFSM.g:11406:1: ( ( ( 'optional' ) ) )
+            // InternalFSM.g:11407:1: ( ( 'optional' ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11404:1: ( ( 'optional' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11405:1: ( 'optional' )
+            // InternalFSM.g:11407:1: ( ( 'optional' ) )
+            // InternalFSM.g:11408:1: ( 'optional' )
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11406:1: ( 'optional' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11407:1: 'optional'
+            // InternalFSM.g:11409:1: ( 'optional' )
+            // InternalFSM.g:11410:1: 'optional'
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0()); 
-            match(input,70,FOLLOW_70_in_rule__EnumAnnotationAttribute__OptionalAssignment_0_023067); 
+            match(input,70,FOLLOW_2); 
              after(grammarAccess.getEnumAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0()); 
 
             }
@@ -30608,20 +30608,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__NameAssignment_2"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11422:1: rule__EnumAnnotationAttribute__NameAssignment_2 : ( RULE_ID ) ;
+    // InternalFSM.g:11425:1: rule__EnumAnnotationAttribute__NameAssignment_2 : ( RULE_ID ) ;
     public final void rule__EnumAnnotationAttribute__NameAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11426:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11427:1: ( RULE_ID )
+            // InternalFSM.g:11429:1: ( ( RULE_ID ) )
+            // InternalFSM.g:11430:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11427:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11428:1: RULE_ID
+            // InternalFSM.g:11430:1: ( RULE_ID )
+            // InternalFSM.g:11431:1: RULE_ID
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getNameIDTerminalRuleCall_2_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__EnumAnnotationAttribute__NameAssignment_223106); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getEnumAnnotationAttributeAccess().getNameIDTerminalRuleCall_2_0()); 
 
             }
@@ -30645,20 +30645,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__ValuesAssignment_5"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11437:1: rule__EnumAnnotationAttribute__ValuesAssignment_5 : ( RULE_STRING ) ;
+    // InternalFSM.g:11440:1: rule__EnumAnnotationAttribute__ValuesAssignment_5 : ( RULE_STRING ) ;
     public final void rule__EnumAnnotationAttribute__ValuesAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11441:1: ( ( RULE_STRING ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11442:1: ( RULE_STRING )
+            // InternalFSM.g:11444:1: ( ( RULE_STRING ) )
+            // InternalFSM.g:11445:1: ( RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11442:1: ( RULE_STRING )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11443:1: RULE_STRING
+            // InternalFSM.g:11445:1: ( RULE_STRING )
+            // InternalFSM.g:11446:1: RULE_STRING
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getValuesSTRINGTerminalRuleCall_5_0()); 
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__EnumAnnotationAttribute__ValuesAssignment_523137); 
+            match(input,RULE_STRING,FOLLOW_2); 
              after(grammarAccess.getEnumAnnotationAttributeAccess().getValuesSTRINGTerminalRuleCall_5_0()); 
 
             }
@@ -30682,20 +30682,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__ValuesAssignment_6_1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11452:1: rule__EnumAnnotationAttribute__ValuesAssignment_6_1 : ( RULE_STRING ) ;
+    // InternalFSM.g:11455:1: rule__EnumAnnotationAttribute__ValuesAssignment_6_1 : ( RULE_STRING ) ;
     public final void rule__EnumAnnotationAttribute__ValuesAssignment_6_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11456:1: ( ( RULE_STRING ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11457:1: ( RULE_STRING )
+            // InternalFSM.g:11459:1: ( ( RULE_STRING ) )
+            // InternalFSM.g:11460:1: ( RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11457:1: ( RULE_STRING )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11458:1: RULE_STRING
+            // InternalFSM.g:11460:1: ( RULE_STRING )
+            // InternalFSM.g:11461:1: RULE_STRING
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getValuesSTRINGTerminalRuleCall_6_1_0()); 
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__EnumAnnotationAttribute__ValuesAssignment_6_123168); 
+            match(input,RULE_STRING,FOLLOW_2); 
              after(grammarAccess.getEnumAnnotationAttributeAccess().getValuesSTRINGTerminalRuleCall_6_1_0()); 
 
             }
@@ -30719,20 +30719,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Documentation__LinesAssignment_2"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11469:1: rule__Documentation__LinesAssignment_2 : ( RULE_STRING ) ;
+    // InternalFSM.g:11472:1: rule__Documentation__LinesAssignment_2 : ( RULE_STRING ) ;
     public final void rule__Documentation__LinesAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11473:1: ( ( RULE_STRING ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11474:1: ( RULE_STRING )
+            // InternalFSM.g:11476:1: ( ( RULE_STRING ) )
+            // InternalFSM.g:11477:1: ( RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11474:1: ( RULE_STRING )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11475:1: RULE_STRING
+            // InternalFSM.g:11477:1: ( RULE_STRING )
+            // InternalFSM.g:11478:1: RULE_STRING
             {
              before(grammarAccess.getDocumentationAccess().getLinesSTRINGTerminalRuleCall_2_0()); 
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__Documentation__LinesAssignment_223201); 
+            match(input,RULE_STRING,FOLLOW_2); 
              after(grammarAccess.getDocumentationAccess().getLinesSTRINGTerminalRuleCall_2_0()); 
 
             }
@@ -30756,24 +30756,24 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__BooleanLiteral__IsTrueAssignment_1_1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11486:1: rule__BooleanLiteral__IsTrueAssignment_1_1 : ( ( 'true' ) ) ;
+    // InternalFSM.g:11489:1: rule__BooleanLiteral__IsTrueAssignment_1_1 : ( ( 'true' ) ) ;
     public final void rule__BooleanLiteral__IsTrueAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11490:1: ( ( ( 'true' ) ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11491:1: ( ( 'true' ) )
+            // InternalFSM.g:11493:1: ( ( ( 'true' ) ) )
+            // InternalFSM.g:11494:1: ( ( 'true' ) )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11491:1: ( ( 'true' ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11492:1: ( 'true' )
+            // InternalFSM.g:11494:1: ( ( 'true' ) )
+            // InternalFSM.g:11495:1: ( 'true' )
             {
              before(grammarAccess.getBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0()); 
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11493:1: ( 'true' )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11494:1: 'true'
+            // InternalFSM.g:11496:1: ( 'true' )
+            // InternalFSM.g:11497:1: 'true'
             {
              before(grammarAccess.getBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0()); 
-            match(input,71,FOLLOW_71_in_rule__BooleanLiteral__IsTrueAssignment_1_123239); 
+            match(input,71,FOLLOW_2); 
              after(grammarAccess.getBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0()); 
 
             }
@@ -30801,20 +30801,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RealLiteral__ValueAssignment_1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11509:1: rule__RealLiteral__ValueAssignment_1 : ( ruleReal ) ;
+    // InternalFSM.g:11512:1: rule__RealLiteral__ValueAssignment_1 : ( ruleReal ) ;
     public final void rule__RealLiteral__ValueAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11513:1: ( ( ruleReal ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11514:1: ( ruleReal )
+            // InternalFSM.g:11516:1: ( ( ruleReal ) )
+            // InternalFSM.g:11517:1: ( ruleReal )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11514:1: ( ruleReal )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11515:1: ruleReal
+            // InternalFSM.g:11517:1: ( ruleReal )
+            // InternalFSM.g:11518:1: ruleReal
             {
              before(grammarAccess.getRealLiteralAccess().getValueRealParserRuleCall_1_0()); 
-            pushFollow(FOLLOW_ruleReal_in_rule__RealLiteral__ValueAssignment_123278);
+            pushFollow(FOLLOW_2);
             ruleReal();
 
             state._fsp--;
@@ -30842,20 +30842,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__IntLiteral__ValueAssignment_1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11524:1: rule__IntLiteral__ValueAssignment_1 : ( ruleInteger ) ;
+    // InternalFSM.g:11527:1: rule__IntLiteral__ValueAssignment_1 : ( ruleInteger ) ;
     public final void rule__IntLiteral__ValueAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11528:1: ( ( ruleInteger ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11529:1: ( ruleInteger )
+            // InternalFSM.g:11531:1: ( ( ruleInteger ) )
+            // InternalFSM.g:11532:1: ( ruleInteger )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11529:1: ( ruleInteger )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11530:1: ruleInteger
+            // InternalFSM.g:11532:1: ( ruleInteger )
+            // InternalFSM.g:11533:1: ruleInteger
             {
              before(grammarAccess.getIntLiteralAccess().getValueIntegerParserRuleCall_1_0()); 
-            pushFollow(FOLLOW_ruleInteger_in_rule__IntLiteral__ValueAssignment_123309);
+            pushFollow(FOLLOW_2);
             ruleInteger();
 
             state._fsp--;
@@ -30883,20 +30883,20 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StringLiteral__ValueAssignment_1"
-    // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11539:1: rule__StringLiteral__ValueAssignment_1 : ( RULE_STRING ) ;
+    // InternalFSM.g:11542:1: rule__StringLiteral__ValueAssignment_1 : ( RULE_STRING ) ;
     public final void rule__StringLiteral__ValueAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11543:1: ( ( RULE_STRING ) )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11544:1: ( RULE_STRING )
+            // InternalFSM.g:11546:1: ( ( RULE_STRING ) )
+            // InternalFSM.g:11547:1: ( RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11544:1: ( RULE_STRING )
-            // ../org.eclipse.etrice.core.fsm.ui/src-gen/org/eclipse/etrice/core/fsm/ui/contentassist/antlr/internal/InternalFSM.g:11545:1: RULE_STRING
+            // InternalFSM.g:11547:1: ( RULE_STRING )
+            // InternalFSM.g:11548:1: RULE_STRING
             {
              before(grammarAccess.getStringLiteralAccess().getValueSTRINGTerminalRuleCall_1_0()); 
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__StringLiteral__ValueAssignment_123340); 
+            match(input,RULE_STRING,FOLLOW_2); 
              after(grammarAccess.getStringLiteralAccess().getValueSTRINGTerminalRuleCall_1_0()); 
 
             }
@@ -30923,21 +30923,13 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
 
     protected DFA8 dfa8 = new DFA8(this);
     protected DFA9 dfa9 = new DFA9(this);
-    static final String DFA8_eotS =
-        "\32\uffff";
-    static final String DFA8_eofS =
-        "\13\uffff\1\22\7\uffff\2\22\1\uffff\1\22\2\uffff\1\22";
-    static final String DFA8_minS =
-        "\1\51\1\4\1\52\1\4\1\54\4\4\2\54\1\34\2\4\1\54\1\7\1\35\1\4\1\uffff"+
-        "\2\34\1\7\1\34\2\uffff\1\34";
-    static final String DFA8_maxS =
-        "\1\51\2\52\1\65\1\64\2\4\1\65\1\4\2\54\1\105\2\4\1\54\1\102\1\61"+
-        "\1\4\1\uffff\2\105\1\102\1\105\2\uffff\1\105";
-    static final String DFA8_acceptS =
-        "\22\uffff\1\2\4\uffff\1\3\1\1\1\uffff";
-    static final String DFA8_specialS =
-        "\32\uffff}>";
-    static final String[] DFA8_transitionS = {
+    static final String dfa_1s = "\32\uffff";
+    static final String dfa_2s = "\13\uffff\1\22\7\uffff\2\22\1\uffff\1\22\2\uffff\1\22";
+    static final String dfa_3s = "\1\51\1\4\1\52\1\4\1\54\4\4\2\54\1\34\2\4\1\54\1\7\1\35\1\4\1\uffff\2\34\1\7\1\34\2\uffff\1\34";
+    static final String dfa_4s = "\1\51\2\52\1\65\1\64\2\4\1\65\1\4\2\54\1\105\2\4\1\54\1\102\1\61\1\4\1\uffff\2\105\1\102\1\105\2\uffff\1\105";
+    static final String dfa_5s = "\22\uffff\1\2\4\uffff\1\3\1\1\1\uffff";
+    static final String dfa_6s = "\32\uffff}>";
+    static final String[] dfa_7s = {
             "\1\1",
             "\1\2\45\uffff\1\3",
             "\1\3",
@@ -30949,8 +30941,7 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             "\1\16",
             "\1\7",
             "\1\7",
-            "\1\20\1\22\1\uffff\1\22\4\uffff\6\22\10\uffff\1\22\1\uffff"+
-            "\1\21\14\uffff\1\17\3\uffff\1\22",
+            "\1\20\1\22\1\uffff\1\22\4\uffff\6\22\10\uffff\1\22\1\uffff\1\21\14\uffff\1\17\3\uffff\1\22",
             "\1\23",
             "\1\24",
             "\1\7",
@@ -30958,67 +30949,46 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             "\1\22\17\uffff\1\22\1\30\1\uffff\1\30\1\27",
             "\1\31",
             "",
-            "\1\20\1\22\1\uffff\1\22\4\uffff\6\22\10\uffff\1\22\16\uffff"+
-            "\1\17\3\uffff\1\22",
-            "\1\20\1\22\1\uffff\1\22\4\uffff\6\22\10\uffff\1\22\16\uffff"+
-            "\1\17\3\uffff\1\22",
+            "\1\20\1\22\1\uffff\1\22\4\uffff\6\22\10\uffff\1\22\16\uffff\1\17\3\uffff\1\22",
+            "\1\20\1\22\1\uffff\1\22\4\uffff\6\22\10\uffff\1\22\16\uffff\1\17\3\uffff\1\22",
             "\1\25\72\uffff\1\26",
-            "\1\20\1\22\1\uffff\1\22\4\uffff\6\22\10\uffff\1\22\22\uffff"+
-            "\1\22",
+            "\1\20\1\22\1\uffff\1\22\4\uffff\6\22\10\uffff\1\22\22\uffff\1\22",
             "",
             "",
-            "\1\20\1\22\1\uffff\1\22\4\uffff\6\22\10\uffff\1\22\16\uffff"+
-            "\1\17\3\uffff\1\22"
+            "\1\20\1\22\1\uffff\1\22\4\uffff\6\22\10\uffff\1\22\16\uffff\1\17\3\uffff\1\22"
     };
 
-    static final short[] DFA8_eot = DFA.unpackEncodedString(DFA8_eotS);
-    static final short[] DFA8_eof = DFA.unpackEncodedString(DFA8_eofS);
-    static final char[] DFA8_min = DFA.unpackEncodedStringToUnsignedChars(DFA8_minS);
-    static final char[] DFA8_max = DFA.unpackEncodedStringToUnsignedChars(DFA8_maxS);
-    static final short[] DFA8_accept = DFA.unpackEncodedString(DFA8_acceptS);
-    static final short[] DFA8_special = DFA.unpackEncodedString(DFA8_specialS);
-    static final short[][] DFA8_transition;
-
-    static {
-        int numStates = DFA8_transitionS.length;
-        DFA8_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA8_transition[i] = DFA.unpackEncodedString(DFA8_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 DFA8 extends DFA {
 
         public DFA8(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 8;
-            this.eot = DFA8_eot;
-            this.eof = DFA8_eof;
-            this.min = DFA8_min;
-            this.max = DFA8_max;
-            this.accept = DFA8_accept;
-            this.special = DFA8_special;
-            this.transition = DFA8_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 "1767:1: rule__NonInitialTransition__Alternatives : ( ( ruleTransitionChainStartTransition ) | ( ruleContinuationTransition ) | ( ruleCPBranchTransition ) );";
-        }
-    }
-    static final String DFA9_eotS =
-        "\31\uffff";
-    static final String DFA9_eofS =
-        "\31\uffff";
-    static final String DFA9_minS =
-        "\1\51\1\4\1\52\1\4\1\54\4\4\3\54\1\34\2\4\1\7\1\56\1\4\2\34\1\7"+
-        "\1\34\2\uffff\1\34";
-    static final String DFA9_maxS =
-        "\1\51\2\52\1\65\1\64\3\4\1\65\3\54\1\101\2\4\1\102\1\60\1\4\2\101"+
-        "\1\102\1\34\2\uffff\1\101";
-    static final String DFA9_acceptS =
-        "\26\uffff\1\1\1\2\1\uffff";
-    static final String DFA9_specialS =
-        "\31\uffff}>";
-    static final String[] DFA9_transitionS = {
+            return "1770:1: rule__NonInitialTransition__Alternatives : ( ( ruleTransitionChainStartTransition ) | ( ruleContinuationTransition ) | ( ruleCPBranchTransition ) );";
+        }
+    }
+    static final String dfa_8s = "\31\uffff";
+    static final String dfa_9s = "\1\51\1\4\1\52\1\4\1\54\4\4\3\54\1\34\2\4\1\7\1\56\1\4\2\34\1\7\1\34\2\uffff\1\34";
+    static final String dfa_10s = "\1\51\2\52\1\65\1\64\3\4\1\65\3\54\1\101\2\4\1\102\1\60\1\4\2\101\1\102\1\34\2\uffff\1\101";
+    static final String dfa_11s = "\26\uffff\1\1\1\2\1\uffff";
+    static final String dfa_12s = "\31\uffff}>";
+    static final String[] dfa_13s = {
             "\1\1",
             "\1\2\45\uffff\1\3",
             "\1\3",
@@ -31046,1015 +31016,83 @@ public class InternalFSMParser extends AbstractInternalContentAssistParser {
             "\1\20\44\uffff\1\17"
     };
 
-    static final short[] DFA9_eot = DFA.unpackEncodedString(DFA9_eotS);
-    static final short[] DFA9_eof = DFA.unpackEncodedString(DFA9_eofS);
-    static final char[] DFA9_min = DFA.unpackEncodedStringToUnsignedChars(DFA9_minS);
-    static final char[] DFA9_max = DFA.unpackEncodedStringToUnsignedChars(DFA9_maxS);
-    static final short[] DFA9_accept = DFA.unpackEncodedString(DFA9_acceptS);
-    static final short[] DFA9_special = DFA.unpackEncodedString(DFA9_specialS);
-    static final short[][] DFA9_transition;
-
-    static {
-        int numStates = DFA9_transitionS.length;
-        DFA9_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA9_transition[i] = DFA.unpackEncodedString(DFA9_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 DFA9 extends DFA {
 
         public DFA9(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 9;
-            this.eot = DFA9_eot;
-            this.eof = DFA9_eof;
-            this.min = DFA9_min;
-            this.max = DFA9_max;
-            this.accept = DFA9_accept;
-            this.special = DFA9_special;
-            this.transition = DFA9_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 "1795:1: rule__TransitionChainStartTransition__Alternatives : ( ( ruleTriggeredTransition ) | ( ruleGuardedTransition ) );";
+            return "1798:1: rule__TransitionChainStartTransition__Alternatives : ( ( ruleTriggeredTransition ) | ( ruleGuardedTransition ) );";
         }
     }
  
 
-    public static final BitSet FOLLOW_ruleFSMModel_in_entryRuleFSMModel61 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleFSMModel68 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FSMModel__ComponentsAssignment_in_ruleFSMModel94 = new BitSet(new long[]{0x00000000003C0002L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleModelComponent_in_entryRuleModelComponent122 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleModelComponent129 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ModelComponent__Group__0_in_ruleModelComponent155 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStateGraphNode_in_entryRuleStateGraphNode182 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleStateGraphNode189 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StateGraphNode__Alternatives_in_ruleStateGraphNode215 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStateGraph_in_entryRuleStateGraph244 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleStateGraph251 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StateGraph__Group__0_in_ruleStateGraph277 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStateMachine_in_entryRuleStateMachine304 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleStateMachine311 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StateMachine__Group__0_in_ruleStateMachine337 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleState_in_entryRuleState364 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleState371 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__State__Alternatives_in_ruleState397 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleState_in_entryRuleSimpleState424 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSimpleState431 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group__0_in_ruleSimpleState457 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRefinedState_in_entryRuleRefinedState484 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRefinedState491 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group__0_in_ruleRefinedState517 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_entryRuleDetailCode544 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDetailCode551 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DetailCode__Group__0_in_ruleDetailCode577 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTrPoint_in_entryRuleTrPoint604 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleTrPoint611 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TrPoint__Alternatives_in_ruleTrPoint637 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTransitionPoint_in_entryRuleTransitionPoint664 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleTransitionPoint671 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TransitionPoint__Group__0_in_ruleTransitionPoint697 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleEntryPoint_in_entryRuleEntryPoint724 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleEntryPoint731 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EntryPoint__Group__0_in_ruleEntryPoint757 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExitPoint_in_entryRuleExitPoint784 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleExitPoint791 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ExitPoint__Group__0_in_ruleExitPoint817 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChoicePoint_in_entryRuleChoicePoint844 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleChoicePoint851 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ChoicePoint__Group__0_in_ruleChoicePoint877 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTransition_in_entryRuleTransition904 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleTransition911 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Transition__Alternatives_in_ruleTransition937 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNonInitialTransition_in_entryRuleNonInitialTransition964 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleNonInitialTransition971 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NonInitialTransition__Alternatives_in_ruleNonInitialTransition997 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTransitionChainStartTransition_in_entryRuleTransitionChainStartTransition1024 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleTransitionChainStartTransition1031 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TransitionChainStartTransition__Alternatives_in_ruleTransitionChainStartTransition1057 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInitialTransition_in_entryRuleInitialTransition1084 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleInitialTransition1091 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InitialTransition__Group__0_in_ruleInitialTransition1117 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleContinuationTransition_in_entryRuleContinuationTransition1144 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleContinuationTransition1151 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__Group__0_in_ruleContinuationTransition1177 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTriggeredTransition_in_entryRuleTriggeredTransition1204 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleTriggeredTransition1211 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__0_in_ruleTriggeredTransition1237 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGuardedTransition_in_entryRuleGuardedTransition1264 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleGuardedTransition1271 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group__0_in_ruleGuardedTransition1297 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCPBranchTransition_in_entryRuleCPBranchTransition1324 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleCPBranchTransition1331 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group__0_in_ruleCPBranchTransition1357 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRefinedTransition_in_entryRuleRefinedTransition1384 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRefinedTransition1391 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedTransition__Group__0_in_ruleRefinedTransition1417 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTransitionTerminal_in_entryRuleTransitionTerminal1444 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleTransitionTerminal1451 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TransitionTerminal__Alternatives_in_ruleTransitionTerminal1477 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStateTerminal_in_entryRuleStateTerminal1504 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleStateTerminal1511 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StateTerminal__StateAssignment_in_ruleStateTerminal1537 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTrPointTerminal_in_entryRuleTrPointTerminal1564 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleTrPointTerminal1571 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TrPointTerminal__Group__0_in_ruleTrPointTerminal1597 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSubStateTrPointTerminal_in_entryRuleSubStateTrPointTerminal1624 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSubStateTrPointTerminal1631 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubStateTrPointTerminal__Group__0_in_ruleSubStateTrPointTerminal1657 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChoicepointTerminal_in_entryRuleChoicepointTerminal1684 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleChoicepointTerminal1691 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ChoicepointTerminal__Group__0_in_ruleChoicepointTerminal1717 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTrigger_in_entryRuleTrigger1744 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleTrigger1751 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Trigger__Group__0_in_ruleTrigger1777 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMessageFromIf_in_entryRuleMessageFromIf1804 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleMessageFromIf1811 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MessageFromIf__Group__0_in_ruleMessageFromIf1837 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGuard_in_entryRuleGuard1866 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleGuard1873 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Guard__Group__0_in_ruleGuard1899 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSemanticsRule_in_entryRuleSemanticsRule1928 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSemanticsRule1935 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SemanticsRule__Alternatives_in_ruleSemanticsRule1961 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInSemanticsRule_in_entryRuleInSemanticsRule1988 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleInSemanticsRule1995 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__Group__0_in_ruleInSemanticsRule2021 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOutSemanticsRule_in_entryRuleOutSemanticsRule2048 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOutSemanticsRule2055 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__Group__0_in_ruleOutSemanticsRule2081 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleKeyValue_in_entryRuleKeyValue2110 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleKeyValue2117 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeyValue__Group__0_in_ruleKeyValue2143 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAnnotationTargetType_in_entryRuleAnnotationTargetType2172 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAnnotationTargetType2179 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleAnnotationTargetType2205 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAnnotationAttribute_in_entryRuleAnnotationAttribute2231 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAnnotationAttribute2238 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AnnotationAttribute__Alternatives_in_ruleAnnotationAttribute2264 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleAnnotationAttribute_in_entryRuleSimpleAnnotationAttribute2291 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSimpleAnnotationAttribute2298 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__0_in_ruleSimpleAnnotationAttribute2324 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleEnumAnnotationAttribute_in_entryRuleEnumAnnotationAttribute2351 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleEnumAnnotationAttribute2358 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__0_in_ruleEnumAnnotationAttribute2384 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleImportedFQN_in_entryRuleImportedFQN2413 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleImportedFQN2420 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ImportedFQN__Group__0_in_ruleImportedFQN2446 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_entryRuleDocumentation2473 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDocumentation2480 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Documentation__Group__0_in_ruleDocumentation2506 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLiteral_in_entryRuleLiteral2537 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleLiteral2544 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Literal__Alternatives_in_ruleLiteral2570 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleBooleanLiteral_in_entryRuleBooleanLiteral2597 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleBooleanLiteral2604 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__BooleanLiteral__Group__0_in_ruleBooleanLiteral2630 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNumberLiteral_in_entryRuleNumberLiteral2657 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleNumberLiteral2664 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NumberLiteral__Alternatives_in_ruleNumberLiteral2690 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRealLiteral_in_entryRuleRealLiteral2717 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRealLiteral2724 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RealLiteral__Group__0_in_ruleRealLiteral2750 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntLiteral_in_entryRuleIntLiteral2777 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIntLiteral2784 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IntLiteral__Group__0_in_ruleIntLiteral2810 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStringLiteral_in_entryRuleStringLiteral2837 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleStringLiteral2844 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StringLiteral__Group__0_in_ruleStringLiteral2870 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInteger_in_entryRuleInteger2897 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleInteger2904 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Integer__Alternatives_in_ruleInteger2930 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleReal_in_entryRuleReal2957 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleReal2964 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Real__Alternatives_in_ruleReal2990 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDecimal_in_entryRuleDecimal3022 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDecimal3029 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Decimal__Group__0_in_ruleDecimal3059 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDecimalExp_in_entryRuleDecimalExp3091 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDecimalExp3098 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__0_in_ruleDecimalExp3128 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_entryRuleFQN3155 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleFQN3162 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FQN__Group__0_in_ruleFQN3188 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ComponentCommunicationType__Alternatives_in_ruleComponentCommunicationType3225 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LiteralType__Alternatives_in_ruleLiteralType3261 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleState_in_rule__StateGraphNode__Alternatives3296 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChoicePoint_in_rule__StateGraphNode__Alternatives3313 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTrPoint_in_rule__StateGraphNode__Alternatives3330 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StateGraph__StatesAssignment_2_0_in_rule__StateGraph__Alternatives_23363 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StateGraph__TrPointsAssignment_2_1_in_rule__StateGraph__Alternatives_23381 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StateGraph__ChPointsAssignment_2_2_in_rule__StateGraph__Alternatives_23399 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StateGraph__TransitionsAssignment_2_3_in_rule__StateGraph__Alternatives_23417 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StateGraph__RefinedTransitionsAssignment_2_4_in_rule__StateGraph__Alternatives_23435 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StateMachine__StatesAssignment_3_0_in_rule__StateMachine__Alternatives_33468 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StateMachine__TrPointsAssignment_3_1_in_rule__StateMachine__Alternatives_33486 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StateMachine__ChPointsAssignment_3_2_in_rule__StateMachine__Alternatives_33504 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StateMachine__TransitionsAssignment_3_3_in_rule__StateMachine__Alternatives_33522 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StateMachine__RefinedTransitionsAssignment_3_4_in_rule__StateMachine__Alternatives_33540 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleState_in_rule__State__Alternatives3573 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRefinedState_in_rule__State__Alternatives3590 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTransitionPoint_in_rule__TrPoint__Alternatives3622 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleEntryPoint_in_rule__TrPoint__Alternatives3639 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExitPoint_in_rule__TrPoint__Alternatives3656 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInitialTransition_in_rule__Transition__Alternatives3688 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNonInitialTransition_in_rule__Transition__Alternatives3705 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTransitionChainStartTransition_in_rule__NonInitialTransition__Alternatives3737 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleContinuationTransition_in_rule__NonInitialTransition__Alternatives3754 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCPBranchTransition_in_rule__NonInitialTransition__Alternatives3771 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTriggeredTransition_in_rule__TransitionChainStartTransition__Alternatives3803 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGuardedTransition_in_rule__TransitionChainStartTransition__Alternatives3820 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStateTerminal_in_rule__TransitionTerminal__Alternatives3852 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTrPointTerminal_in_rule__TransitionTerminal__Alternatives3869 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSubStateTrPointTerminal_in_rule__TransitionTerminal__Alternatives3886 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChoicepointTerminal_in_rule__TransitionTerminal__Alternatives3903 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInSemanticsRule_in_rule__SemanticsRule__Alternatives3935 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOutSemanticsRule_in_rule__SemanticsRule__Alternatives3952 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__FollowUpsAssignment_3_1_0_in_rule__InSemanticsRule__Alternatives_3_13984 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__Group_3_1_1__0_in_rule__InSemanticsRule__Alternatives_3_14002 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__FollowUpsAssignment_3_1_0_in_rule__OutSemanticsRule__Alternatives_3_14035 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__Group_3_1_1__0_in_rule__OutSemanticsRule__Alternatives_3_14053 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleAnnotationAttribute_in_rule__AnnotationAttribute__Alternatives4087 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleEnumAnnotationAttribute_in_rule__AnnotationAttribute__Alternatives4104 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__OptionalAssignment_0_0_in_rule__SimpleAnnotationAttribute__Alternatives_04136 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_12_in_rule__SimpleAnnotationAttribute__Alternatives_04155 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__OptionalAssignment_0_0_in_rule__EnumAnnotationAttribute__Alternatives_04189 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_12_in_rule__EnumAnnotationAttribute__Alternatives_04208 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleBooleanLiteral_in_rule__Literal__Alternatives4244 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNumberLiteral_in_rule__Literal__Alternatives4261 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStringLiteral_in_rule__Literal__Alternatives4278 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_13_in_rule__BooleanLiteral__Alternatives_14311 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__BooleanLiteral__IsTrueAssignment_1_1_in_rule__BooleanLiteral__Alternatives_14330 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntLiteral_in_rule__NumberLiteral__Alternatives4363 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRealLiteral_in_rule__NumberLiteral__Alternatives4380 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Integer__Group_0__0_in_rule__Integer__Alternatives4412 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_HEX_in_rule__Integer__Alternatives4430 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_14_in_rule__Integer__Alternatives_0_04463 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_15_in_rule__Integer__Alternatives_0_04483 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDecimal_in_rule__Real__Alternatives4517 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDecimalExp_in_rule__Real__Alternatives4534 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_14_in_rule__Decimal__Alternatives_04567 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_15_in_rule__Decimal__Alternatives_04587 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_14_in_rule__DecimalExp__Alternatives_04622 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_15_in_rule__DecimalExp__Alternatives_04642 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_16_in_rule__DecimalExp__Alternatives_44677 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_17_in_rule__DecimalExp__Alternatives_44697 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_14_in_rule__DecimalExp__Alternatives_54732 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_15_in_rule__DecimalExp__Alternatives_54752 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_18_in_rule__ComponentCommunicationType__Alternatives4787 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_19_in_rule__ComponentCommunicationType__Alternatives4808 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_20_in_rule__ComponentCommunicationType__Alternatives4829 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_21_in_rule__ComponentCommunicationType__Alternatives4850 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_22_in_rule__LiteralType__Alternatives4886 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_23_in_rule__LiteralType__Alternatives4907 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_24_in_rule__LiteralType__Alternatives4928 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_25_in_rule__LiteralType__Alternatives4949 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ModelComponent__Group__0__Impl_in_rule__ModelComponent__Group__04982 = new BitSet(new long[]{0x0000000004000000L});
-    public static final BitSet FOLLOW_rule__ModelComponent__Group__1_in_rule__ModelComponent__Group__04985 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ModelComponent__UnorderedGroup_0_in_rule__ModelComponent__Group__0__Impl5012 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ModelComponent__Group__1__Impl_in_rule__ModelComponent__Group__15042 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__ModelComponent__Group__2_in_rule__ModelComponent__Group__15045 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_26_in_rule__ModelComponent__Group__1__Impl5073 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ModelComponent__Group__2__Impl_in_rule__ModelComponent__Group__25104 = new BitSet(new long[]{0x0000000048000000L});
-    public static final BitSet FOLLOW_rule__ModelComponent__Group__3_in_rule__ModelComponent__Group__25107 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ModelComponent__ComponentNameAssignment_2_in_rule__ModelComponent__Group__2__Impl5134 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ModelComponent__Group__3__Impl_in_rule__ModelComponent__Group__35164 = new BitSet(new long[]{0x0000000048000000L});
-    public static final BitSet FOLLOW_rule__ModelComponent__Group__4_in_rule__ModelComponent__Group__35167 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ModelComponent__Group_3__0_in_rule__ModelComponent__Group__3__Impl5194 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ModelComponent__Group__4__Impl_in_rule__ModelComponent__Group__45225 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ModelComponent__StateMachineAssignment_4_in_rule__ModelComponent__Group__4__Impl5252 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ModelComponent__Group_3__0__Impl_in_rule__ModelComponent__Group_3__05292 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__ModelComponent__Group_3__1_in_rule__ModelComponent__Group_3__05295 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_rule__ModelComponent__Group_3__0__Impl5323 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ModelComponent__Group_3__1__Impl_in_rule__ModelComponent__Group_3__15354 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ModelComponent__BaseAssignment_3_1_in_rule__ModelComponent__Group_3__1__Impl5381 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StateGraph__Group__0__Impl_in_rule__StateGraph__Group__05415 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_rule__StateGraph__Group__1_in_rule__StateGraph__Group__05418 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StateGraph__Group__1__Impl_in_rule__StateGraph__Group__15476 = new BitSet(new long[]{0x000403F0A0000000L,0x0000000000000020L});
-    public static final BitSet FOLLOW_rule__StateGraph__Group__2_in_rule__StateGraph__Group__15479 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_rule__StateGraph__Group__1__Impl5507 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StateGraph__Group__2__Impl_in_rule__StateGraph__Group__25538 = new BitSet(new long[]{0x000403F0A0000000L,0x0000000000000020L});
-    public static final BitSet FOLLOW_rule__StateGraph__Group__3_in_rule__StateGraph__Group__25541 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StateGraph__Alternatives_2_in_rule__StateGraph__Group__2__Impl5568 = new BitSet(new long[]{0x000403F080000002L,0x0000000000000020L});
-    public static final BitSet FOLLOW_rule__StateGraph__Group__3__Impl_in_rule__StateGraph__Group__35599 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_rule__StateGraph__Group__3__Impl5627 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StateMachine__Group__0__Impl_in_rule__StateMachine__Group__05666 = new BitSet(new long[]{0x0000000048000000L});
-    public static final BitSet FOLLOW_rule__StateMachine__Group__1_in_rule__StateMachine__Group__05669 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StateMachine__Group__1__Impl_in_rule__StateMachine__Group__15727 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_rule__StateMachine__Group__2_in_rule__StateMachine__Group__15730 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_30_in_rule__StateMachine__Group__1__Impl5758 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StateMachine__Group__2__Impl_in_rule__StateMachine__Group__25789 = new BitSet(new long[]{0x000403F0A0000000L,0x0000000000000020L});
-    public static final BitSet FOLLOW_rule__StateMachine__Group__3_in_rule__StateMachine__Group__25792 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_rule__StateMachine__Group__2__Impl5820 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StateMachine__Group__3__Impl_in_rule__StateMachine__Group__35851 = new BitSet(new long[]{0x000403F0A0000000L,0x0000000000000020L});
-    public static final BitSet FOLLOW_rule__StateMachine__Group__4_in_rule__StateMachine__Group__35854 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StateMachine__Alternatives_3_in_rule__StateMachine__Group__3__Impl5881 = new BitSet(new long[]{0x000403F080000002L,0x0000000000000020L});
-    public static final BitSet FOLLOW_rule__StateMachine__Group__4__Impl_in_rule__StateMachine__Group__45912 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_rule__StateMachine__Group__4__Impl5940 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group__0__Impl_in_rule__SimpleState__Group__05981 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group__1_in_rule__SimpleState__Group__05984 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_31_in_rule__SimpleState__Group__0__Impl6012 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group__1__Impl_in_rule__SimpleState__Group__16043 = new BitSet(new long[]{0x0000000010000000L,0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group__2_in_rule__SimpleState__Group__16046 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__NameAssignment_1_in_rule__SimpleState__Group__1__Impl6073 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group__2__Impl_in_rule__SimpleState__Group__26103 = new BitSet(new long[]{0x0000000010000000L,0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group__3_in_rule__SimpleState__Group__26106 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__DocuAssignment_2_in_rule__SimpleState__Group__2__Impl6133 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group__3__Impl_in_rule__SimpleState__Group__36164 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3__0_in_rule__SimpleState__Group__3__Impl6191 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3__0__Impl_in_rule__SimpleState__Group_3__06230 = new BitSet(new long[]{0x0000000F20000000L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3__1_in_rule__SimpleState__Group_3__06233 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_rule__SimpleState__Group_3__0__Impl6261 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3__1__Impl_in_rule__SimpleState__Group_3__16292 = new BitSet(new long[]{0x0000000F20000000L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3__2_in_rule__SimpleState__Group_3__16295 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3_1__0_in_rule__SimpleState__Group_3__1__Impl6322 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3__2__Impl_in_rule__SimpleState__Group_3__26353 = new BitSet(new long[]{0x0000000F20000000L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3__3_in_rule__SimpleState__Group_3__26356 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3_2__0_in_rule__SimpleState__Group_3__2__Impl6383 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3__3__Impl_in_rule__SimpleState__Group_3__36414 = new BitSet(new long[]{0x0000000F20000000L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3__4_in_rule__SimpleState__Group_3__36417 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3_3__0_in_rule__SimpleState__Group_3__3__Impl6444 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3__4__Impl_in_rule__SimpleState__Group_3__46475 = new BitSet(new long[]{0x0000000F20000000L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3__5_in_rule__SimpleState__Group_3__46478 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3_4__0_in_rule__SimpleState__Group_3__4__Impl6505 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3__5__Impl_in_rule__SimpleState__Group_3__56536 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_rule__SimpleState__Group_3__5__Impl6564 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3_1__0__Impl_in_rule__SimpleState__Group_3_1__06607 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3_1__1_in_rule__SimpleState__Group_3_1__06610 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_rule__SimpleState__Group_3_1__0__Impl6638 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3_1__1__Impl_in_rule__SimpleState__Group_3_1__16669 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__EntryCodeAssignment_3_1_1_in_rule__SimpleState__Group_3_1__1__Impl6696 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3_2__0__Impl_in_rule__SimpleState__Group_3_2__06730 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3_2__1_in_rule__SimpleState__Group_3_2__06733 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_rule__SimpleState__Group_3_2__0__Impl6761 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3_2__1__Impl_in_rule__SimpleState__Group_3_2__16792 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__ExitCodeAssignment_3_2_1_in_rule__SimpleState__Group_3_2__1__Impl6819 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3_3__0__Impl_in_rule__SimpleState__Group_3_3__06853 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3_3__1_in_rule__SimpleState__Group_3_3__06856 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_34_in_rule__SimpleState__Group_3_3__0__Impl6884 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3_3__1__Impl_in_rule__SimpleState__Group_3_3__16915 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__DoCodeAssignment_3_3_1_in_rule__SimpleState__Group_3_3__1__Impl6942 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3_4__0__Impl_in_rule__SimpleState__Group_3_4__06976 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3_4__1_in_rule__SimpleState__Group_3_4__06979 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_35_in_rule__SimpleState__Group_3_4__0__Impl7007 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3_4__1__Impl_in_rule__SimpleState__Group_3_4__17038 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__SubgraphAssignment_3_4_1_in_rule__SimpleState__Group_3_4__1__Impl7065 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group__0__Impl_in_rule__RefinedState__Group__07099 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group__1_in_rule__RefinedState__Group__07102 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_36_in_rule__RefinedState__Group__0__Impl7130 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group__1__Impl_in_rule__RefinedState__Group__17161 = new BitSet(new long[]{0x0000000010000000L,0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group__2_in_rule__RefinedState__Group__17164 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__TargetAssignment_1_in_rule__RefinedState__Group__1__Impl7191 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group__2__Impl_in_rule__RefinedState__Group__27221 = new BitSet(new long[]{0x0000000010000000L,0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group__3_in_rule__RefinedState__Group__27224 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__DocuAssignment_2_in_rule__RefinedState__Group__2__Impl7251 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group__3__Impl_in_rule__RefinedState__Group__37282 = new BitSet(new long[]{0x0000000F20000000L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group__4_in_rule__RefinedState__Group__37285 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_rule__RefinedState__Group__3__Impl7313 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group__4__Impl_in_rule__RefinedState__Group__47344 = new BitSet(new long[]{0x0000000F20000000L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group__5_in_rule__RefinedState__Group__47347 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group_4__0_in_rule__RefinedState__Group__4__Impl7374 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group__5__Impl_in_rule__RefinedState__Group__57405 = new BitSet(new long[]{0x0000000F20000000L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group__6_in_rule__RefinedState__Group__57408 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group_5__0_in_rule__RefinedState__Group__5__Impl7435 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group__6__Impl_in_rule__RefinedState__Group__67466 = new BitSet(new long[]{0x0000000F20000000L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group__7_in_rule__RefinedState__Group__67469 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group_6__0_in_rule__RefinedState__Group__6__Impl7496 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group__7__Impl_in_rule__RefinedState__Group__77527 = new BitSet(new long[]{0x0000000F20000000L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group__8_in_rule__RefinedState__Group__77530 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group_7__0_in_rule__RefinedState__Group__7__Impl7557 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group__8__Impl_in_rule__RefinedState__Group__87588 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_rule__RefinedState__Group__8__Impl7616 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group_4__0__Impl_in_rule__RefinedState__Group_4__07665 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group_4__1_in_rule__RefinedState__Group_4__07668 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_rule__RefinedState__Group_4__0__Impl7696 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group_4__1__Impl_in_rule__RefinedState__Group_4__17727 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__EntryCodeAssignment_4_1_in_rule__RefinedState__Group_4__1__Impl7754 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group_5__0__Impl_in_rule__RefinedState__Group_5__07788 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group_5__1_in_rule__RefinedState__Group_5__07791 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_rule__RefinedState__Group_5__0__Impl7819 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group_5__1__Impl_in_rule__RefinedState__Group_5__17850 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__ExitCodeAssignment_5_1_in_rule__RefinedState__Group_5__1__Impl7877 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group_6__0__Impl_in_rule__RefinedState__Group_6__07911 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group_6__1_in_rule__RefinedState__Group_6__07914 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_34_in_rule__RefinedState__Group_6__0__Impl7942 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group_6__1__Impl_in_rule__RefinedState__Group_6__17973 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__DoCodeAssignment_6_1_in_rule__RefinedState__Group_6__1__Impl8000 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group_7__0__Impl_in_rule__RefinedState__Group_7__08034 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group_7__1_in_rule__RefinedState__Group_7__08037 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_35_in_rule__RefinedState__Group_7__0__Impl8065 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group_7__1__Impl_in_rule__RefinedState__Group_7__18096 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__SubgraphAssignment_7_1_in_rule__RefinedState__Group_7__1__Impl8123 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DetailCode__Group__0__Impl_in_rule__DetailCode__Group__08157 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_rule__DetailCode__Group__1_in_rule__DetailCode__Group__08160 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DetailCode__Group__1__Impl_in_rule__DetailCode__Group__18218 = new BitSet(new long[]{0x0000000020000080L});
-    public static final BitSet FOLLOW_rule__DetailCode__Group__2_in_rule__DetailCode__Group__18221 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DetailCode__UsedAssignment_1_in_rule__DetailCode__Group__1__Impl8248 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DetailCode__Group__2__Impl_in_rule__DetailCode__Group__28278 = new BitSet(new long[]{0x0000000020000080L});
-    public static final BitSet FOLLOW_rule__DetailCode__Group__3_in_rule__DetailCode__Group__28281 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DetailCode__LinesAssignment_2_in_rule__DetailCode__Group__2__Impl8308 = new BitSet(new long[]{0x0000000000000082L});
-    public static final BitSet FOLLOW_rule__DetailCode__Group__3__Impl_in_rule__DetailCode__Group__38339 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_rule__DetailCode__Group__3__Impl8367 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TransitionPoint__Group__0__Impl_in_rule__TransitionPoint__Group__08406 = new BitSet(new long[]{0x0000002000000000L,0x0000000000000020L});
-    public static final BitSet FOLLOW_rule__TransitionPoint__Group__1_in_rule__TransitionPoint__Group__08409 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TransitionPoint__HandlerAssignment_0_in_rule__TransitionPoint__Group__0__Impl8436 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TransitionPoint__Group__1__Impl_in_rule__TransitionPoint__Group__18467 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__TransitionPoint__Group__2_in_rule__TransitionPoint__Group__18470 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_37_in_rule__TransitionPoint__Group__1__Impl8498 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TransitionPoint__Group__2__Impl_in_rule__TransitionPoint__Group__28529 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TransitionPoint__NameAssignment_2_in_rule__TransitionPoint__Group__2__Impl8556 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EntryPoint__Group__0__Impl_in_rule__EntryPoint__Group__08592 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__EntryPoint__Group__1_in_rule__EntryPoint__Group__08595 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_38_in_rule__EntryPoint__Group__0__Impl8623 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EntryPoint__Group__1__Impl_in_rule__EntryPoint__Group__18654 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EntryPoint__NameAssignment_1_in_rule__EntryPoint__Group__1__Impl8681 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ExitPoint__Group__0__Impl_in_rule__ExitPoint__Group__08715 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__ExitPoint__Group__1_in_rule__ExitPoint__Group__08718 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_39_in_rule__ExitPoint__Group__0__Impl8746 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ExitPoint__Group__1__Impl_in_rule__ExitPoint__Group__18777 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ExitPoint__NameAssignment_1_in_rule__ExitPoint__Group__1__Impl8804 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ChoicePoint__Group__0__Impl_in_rule__ChoicePoint__Group__08838 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__ChoicePoint__Group__1_in_rule__ChoicePoint__Group__08841 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_40_in_rule__ChoicePoint__Group__0__Impl8869 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ChoicePoint__Group__1__Impl_in_rule__ChoicePoint__Group__18900 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ChoicePoint__Group__2_in_rule__ChoicePoint__Group__18903 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ChoicePoint__NameAssignment_1_in_rule__ChoicePoint__Group__1__Impl8930 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ChoicePoint__Group__2__Impl_in_rule__ChoicePoint__Group__28960 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ChoicePoint__DocuAssignment_2_in_rule__ChoicePoint__Group__2__Impl8987 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InitialTransition__Group__0__Impl_in_rule__InitialTransition__Group__09024 = new BitSet(new long[]{0x0000040000000010L});
-    public static final BitSet FOLLOW_rule__InitialTransition__Group__1_in_rule__InitialTransition__Group__09027 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_rule__InitialTransition__Group__0__Impl9055 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InitialTransition__Group__1__Impl_in_rule__InitialTransition__Group__19086 = new BitSet(new long[]{0x0000040000000010L});
-    public static final BitSet FOLLOW_rule__InitialTransition__Group__2_in_rule__InitialTransition__Group__19089 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InitialTransition__NameAssignment_1_in_rule__InitialTransition__Group__1__Impl9116 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InitialTransition__Group__2__Impl_in_rule__InitialTransition__Group__29147 = new BitSet(new long[]{0x0000080000000000L});
-    public static final BitSet FOLLOW_rule__InitialTransition__Group__3_in_rule__InitialTransition__Group__29150 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rule__InitialTransition__Group__2__Impl9178 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InitialTransition__Group__3__Impl_in_rule__InitialTransition__Group__39209 = new BitSet(new long[]{0x0000100000000000L});
-    public static final BitSet FOLLOW_rule__InitialTransition__Group__4_in_rule__InitialTransition__Group__39212 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_43_in_rule__InitialTransition__Group__3__Impl9240 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InitialTransition__Group__4__Impl_in_rule__InitialTransition__Group__49271 = new BitSet(new long[]{0x0028000000000010L});
-    public static final BitSet FOLLOW_rule__InitialTransition__Group__5_in_rule__InitialTransition__Group__49274 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_44_in_rule__InitialTransition__Group__4__Impl9302 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InitialTransition__Group__5__Impl_in_rule__InitialTransition__Group__59333 = new BitSet(new long[]{0x0000000010000000L,0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InitialTransition__Group__6_in_rule__InitialTransition__Group__59336 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InitialTransition__ToAssignment_5_in_rule__InitialTransition__Group__5__Impl9363 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InitialTransition__Group__6__Impl_in_rule__InitialTransition__Group__69393 = new BitSet(new long[]{0x0000000010000000L,0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InitialTransition__Group__7_in_rule__InitialTransition__Group__69396 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InitialTransition__DocuAssignment_6_in_rule__InitialTransition__Group__6__Impl9423 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InitialTransition__Group__7__Impl_in_rule__InitialTransition__Group__79454 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InitialTransition__Group_7__0_in_rule__InitialTransition__Group__7__Impl9481 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InitialTransition__Group_7__0__Impl_in_rule__InitialTransition__Group_7__09528 = new BitSet(new long[]{0x0000200020000000L});
-    public static final BitSet FOLLOW_rule__InitialTransition__Group_7__1_in_rule__InitialTransition__Group_7__09531 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_rule__InitialTransition__Group_7__0__Impl9559 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InitialTransition__Group_7__1__Impl_in_rule__InitialTransition__Group_7__19590 = new BitSet(new long[]{0x0000200020000000L});
-    public static final BitSet FOLLOW_rule__InitialTransition__Group_7__2_in_rule__InitialTransition__Group_7__19593 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InitialTransition__Group_7_1__0_in_rule__InitialTransition__Group_7__1__Impl9620 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InitialTransition__Group_7__2__Impl_in_rule__InitialTransition__Group_7__29651 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_rule__InitialTransition__Group_7__2__Impl9679 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InitialTransition__Group_7_1__0__Impl_in_rule__InitialTransition__Group_7_1__09716 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_rule__InitialTransition__Group_7_1__1_in_rule__InitialTransition__Group_7_1__09719 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_45_in_rule__InitialTransition__Group_7_1__0__Impl9747 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InitialTransition__Group_7_1__1__Impl_in_rule__InitialTransition__Group_7_1__19778 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InitialTransition__ActionAssignment_7_1_1_in_rule__InitialTransition__Group_7_1__1__Impl9805 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__Group__0__Impl_in_rule__ContinuationTransition__Group__09839 = new BitSet(new long[]{0x0000040000000010L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__Group__1_in_rule__ContinuationTransition__Group__09842 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_rule__ContinuationTransition__Group__0__Impl9870 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__Group__1__Impl_in_rule__ContinuationTransition__Group__19901 = new BitSet(new long[]{0x0000040000000010L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__Group__2_in_rule__ContinuationTransition__Group__19904 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__NameAssignment_1_in_rule__ContinuationTransition__Group__1__Impl9931 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__Group__2__Impl_in_rule__ContinuationTransition__Group__29962 = new BitSet(new long[]{0x0028000000000010L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__Group__3_in_rule__ContinuationTransition__Group__29965 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rule__ContinuationTransition__Group__2__Impl9993 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__Group__3__Impl_in_rule__ContinuationTransition__Group__310024 = new BitSet(new long[]{0x0000100000000000L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__Group__4_in_rule__ContinuationTransition__Group__310027 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__FromAssignment_3_in_rule__ContinuationTransition__Group__3__Impl10054 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__Group__4__Impl_in_rule__ContinuationTransition__Group__410084 = new BitSet(new long[]{0x0028000000000010L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__Group__5_in_rule__ContinuationTransition__Group__410087 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_44_in_rule__ContinuationTransition__Group__4__Impl10115 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__Group__5__Impl_in_rule__ContinuationTransition__Group__510146 = new BitSet(new long[]{0x0000000010000000L,0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__Group__6_in_rule__ContinuationTransition__Group__510149 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__ToAssignment_5_in_rule__ContinuationTransition__Group__5__Impl10176 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__Group__6__Impl_in_rule__ContinuationTransition__Group__610206 = new BitSet(new long[]{0x0000000010000000L,0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__Group__7_in_rule__ContinuationTransition__Group__610209 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__DocuAssignment_6_in_rule__ContinuationTransition__Group__6__Impl10236 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__Group__7__Impl_in_rule__ContinuationTransition__Group__710267 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__Group_7__0_in_rule__ContinuationTransition__Group__7__Impl10294 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__Group_7__0__Impl_in_rule__ContinuationTransition__Group_7__010341 = new BitSet(new long[]{0x0000200020000000L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__Group_7__1_in_rule__ContinuationTransition__Group_7__010344 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_rule__ContinuationTransition__Group_7__0__Impl10372 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__Group_7__1__Impl_in_rule__ContinuationTransition__Group_7__110403 = new BitSet(new long[]{0x0000200020000000L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__Group_7__2_in_rule__ContinuationTransition__Group_7__110406 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__Group_7_1__0_in_rule__ContinuationTransition__Group_7__1__Impl10433 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__Group_7__2__Impl_in_rule__ContinuationTransition__Group_7__210464 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_rule__ContinuationTransition__Group_7__2__Impl10492 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__Group_7_1__0__Impl_in_rule__ContinuationTransition__Group_7_1__010529 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__Group_7_1__1_in_rule__ContinuationTransition__Group_7_1__010532 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_45_in_rule__ContinuationTransition__Group_7_1__0__Impl10560 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__Group_7_1__1__Impl_in_rule__ContinuationTransition__Group_7_1__110591 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__ActionAssignment_7_1_1_in_rule__ContinuationTransition__Group_7_1__1__Impl10618 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__0__Impl_in_rule__TriggeredTransition__Group__010652 = new BitSet(new long[]{0x0000040000000010L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__1_in_rule__TriggeredTransition__Group__010655 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_rule__TriggeredTransition__Group__0__Impl10683 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__1__Impl_in_rule__TriggeredTransition__Group__110714 = new BitSet(new long[]{0x0000040000000010L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__2_in_rule__TriggeredTransition__Group__110717 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__NameAssignment_1_in_rule__TriggeredTransition__Group__1__Impl10744 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__2__Impl_in_rule__TriggeredTransition__Group__210775 = new BitSet(new long[]{0x0028000000000010L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__3_in_rule__TriggeredTransition__Group__210778 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rule__TriggeredTransition__Group__2__Impl10806 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__3__Impl_in_rule__TriggeredTransition__Group__310837 = new BitSet(new long[]{0x0000100000000000L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__4_in_rule__TriggeredTransition__Group__310840 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__FromAssignment_3_in_rule__TriggeredTransition__Group__3__Impl10867 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__4__Impl_in_rule__TriggeredTransition__Group__410897 = new BitSet(new long[]{0x0028000000000010L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__5_in_rule__TriggeredTransition__Group__410900 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_44_in_rule__TriggeredTransition__Group__4__Impl10928 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__5__Impl_in_rule__TriggeredTransition__Group__510959 = new BitSet(new long[]{0x0000000010000000L,0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__6_in_rule__TriggeredTransition__Group__510962 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__ToAssignment_5_in_rule__TriggeredTransition__Group__5__Impl10989 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__6__Impl_in_rule__TriggeredTransition__Group__611019 = new BitSet(new long[]{0x0000000010000000L,0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__7_in_rule__TriggeredTransition__Group__611022 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__DocuAssignment_6_in_rule__TriggeredTransition__Group__6__Impl11049 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__7__Impl_in_rule__TriggeredTransition__Group__711080 = new BitSet(new long[]{0x0000400000000000L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__8_in_rule__TriggeredTransition__Group__711083 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_rule__TriggeredTransition__Group__7__Impl11111 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__8__Impl_in_rule__TriggeredTransition__Group__811142 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__9_in_rule__TriggeredTransition__Group__811145 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_rule__TriggeredTransition__Group__8__Impl11173 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__9__Impl_in_rule__TriggeredTransition__Group__911204 = new BitSet(new long[]{0x0040000000000000L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__10_in_rule__TriggeredTransition__Group__911207 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_rule__TriggeredTransition__Group__9__Impl11235 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__10__Impl_in_rule__TriggeredTransition__Group__1011266 = new BitSet(new long[]{0x0000800020000000L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__11_in_rule__TriggeredTransition__Group__1011269 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__TriggersAssignment_10_in_rule__TriggeredTransition__Group__10__Impl11296 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__11__Impl_in_rule__TriggeredTransition__Group__1111326 = new BitSet(new long[]{0x0000800020000000L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__12_in_rule__TriggeredTransition__Group__1111329 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group_11__0_in_rule__TriggeredTransition__Group__11__Impl11356 = new BitSet(new long[]{0x0000800000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__12__Impl_in_rule__TriggeredTransition__Group__1211387 = new BitSet(new long[]{0x0000200020000000L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__13_in_rule__TriggeredTransition__Group__1211390 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_rule__TriggeredTransition__Group__12__Impl11418 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__13__Impl_in_rule__TriggeredTransition__Group__1311449 = new BitSet(new long[]{0x0000200020000000L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__14_in_rule__TriggeredTransition__Group__1311452 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group_13__0_in_rule__TriggeredTransition__Group__13__Impl11479 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__14__Impl_in_rule__TriggeredTransition__Group__1411510 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_rule__TriggeredTransition__Group__14__Impl11538 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group_11__0__Impl_in_rule__TriggeredTransition__Group_11__011599 = new BitSet(new long[]{0x0040000000000000L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group_11__1_in_rule__TriggeredTransition__Group_11__011602 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_rule__TriggeredTransition__Group_11__0__Impl11630 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group_11__1__Impl_in_rule__TriggeredTransition__Group_11__111661 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__TriggersAssignment_11_1_in_rule__TriggeredTransition__Group_11__1__Impl11688 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group_13__0__Impl_in_rule__TriggeredTransition__Group_13__011722 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group_13__1_in_rule__TriggeredTransition__Group_13__011725 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_45_in_rule__TriggeredTransition__Group_13__0__Impl11753 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group_13__1__Impl_in_rule__TriggeredTransition__Group_13__111784 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__ActionAssignment_13_1_in_rule__TriggeredTransition__Group_13__1__Impl11811 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group__0__Impl_in_rule__GuardedTransition__Group__011845 = new BitSet(new long[]{0x0000040000000010L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group__1_in_rule__GuardedTransition__Group__011848 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_rule__GuardedTransition__Group__0__Impl11876 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group__1__Impl_in_rule__GuardedTransition__Group__111907 = new BitSet(new long[]{0x0000040000000010L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group__2_in_rule__GuardedTransition__Group__111910 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__NameAssignment_1_in_rule__GuardedTransition__Group__1__Impl11937 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group__2__Impl_in_rule__GuardedTransition__Group__211968 = new BitSet(new long[]{0x0028000000000010L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group__3_in_rule__GuardedTransition__Group__211971 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rule__GuardedTransition__Group__2__Impl11999 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group__3__Impl_in_rule__GuardedTransition__Group__312030 = new BitSet(new long[]{0x0000100000000000L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group__4_in_rule__GuardedTransition__Group__312033 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__FromAssignment_3_in_rule__GuardedTransition__Group__3__Impl12060 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group__4__Impl_in_rule__GuardedTransition__Group__412090 = new BitSet(new long[]{0x0028000000000010L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group__5_in_rule__GuardedTransition__Group__412093 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_44_in_rule__GuardedTransition__Group__4__Impl12121 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group__5__Impl_in_rule__GuardedTransition__Group__512152 = new BitSet(new long[]{0x0000000010000000L,0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group__6_in_rule__GuardedTransition__Group__512155 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__ToAssignment_5_in_rule__GuardedTransition__Group__5__Impl12182 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group__6__Impl_in_rule__GuardedTransition__Group__612212 = new BitSet(new long[]{0x0000000010000000L,0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group__7_in_rule__GuardedTransition__Group__612215 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__DocuAssignment_6_in_rule__GuardedTransition__Group__6__Impl12242 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group__7__Impl_in_rule__GuardedTransition__Group__712273 = new BitSet(new long[]{0x0001000000000000L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group__8_in_rule__GuardedTransition__Group__712276 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_rule__GuardedTransition__Group__7__Impl12304 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group__8__Impl_in_rule__GuardedTransition__Group__812335 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group__9_in_rule__GuardedTransition__Group__812338 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_48_in_rule__GuardedTransition__Group__8__Impl12366 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group__9__Impl_in_rule__GuardedTransition__Group__912397 = new BitSet(new long[]{0x0000200020000000L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group__10_in_rule__GuardedTransition__Group__912400 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__GuardAssignment_9_in_rule__GuardedTransition__Group__9__Impl12427 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group__10__Impl_in_rule__GuardedTransition__Group__1012457 = new BitSet(new long[]{0x0000200020000000L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group__11_in_rule__GuardedTransition__Group__1012460 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group_10__0_in_rule__GuardedTransition__Group__10__Impl12487 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group__11__Impl_in_rule__GuardedTransition__Group__1112518 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_rule__GuardedTransition__Group__11__Impl12546 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group_10__0__Impl_in_rule__GuardedTransition__Group_10__012601 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group_10__1_in_rule__GuardedTransition__Group_10__012604 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_45_in_rule__GuardedTransition__Group_10__0__Impl12632 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group_10__1__Impl_in_rule__GuardedTransition__Group_10__112663 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__ActionAssignment_10_1_in_rule__GuardedTransition__Group_10__1__Impl12690 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group__0__Impl_in_rule__CPBranchTransition__Group__012724 = new BitSet(new long[]{0x0000040000000010L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group__1_in_rule__CPBranchTransition__Group__012727 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_rule__CPBranchTransition__Group__0__Impl12755 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group__1__Impl_in_rule__CPBranchTransition__Group__112786 = new BitSet(new long[]{0x0000040000000010L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group__2_in_rule__CPBranchTransition__Group__112789 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__NameAssignment_1_in_rule__CPBranchTransition__Group__1__Impl12816 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group__2__Impl_in_rule__CPBranchTransition__Group__212847 = new BitSet(new long[]{0x0028000000000010L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group__3_in_rule__CPBranchTransition__Group__212850 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rule__CPBranchTransition__Group__2__Impl12878 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group__3__Impl_in_rule__CPBranchTransition__Group__312909 = new BitSet(new long[]{0x0000100000000000L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group__4_in_rule__CPBranchTransition__Group__312912 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__FromAssignment_3_in_rule__CPBranchTransition__Group__3__Impl12939 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group__4__Impl_in_rule__CPBranchTransition__Group__412969 = new BitSet(new long[]{0x0028000000000010L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group__5_in_rule__CPBranchTransition__Group__412972 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_44_in_rule__CPBranchTransition__Group__4__Impl13000 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group__5__Impl_in_rule__CPBranchTransition__Group__513031 = new BitSet(new long[]{0x0000000010000000L,0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group__6_in_rule__CPBranchTransition__Group__513034 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__ToAssignment_5_in_rule__CPBranchTransition__Group__5__Impl13061 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group__6__Impl_in_rule__CPBranchTransition__Group__613091 = new BitSet(new long[]{0x0000000010000000L,0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group__7_in_rule__CPBranchTransition__Group__613094 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__DocuAssignment_6_in_rule__CPBranchTransition__Group__6__Impl13121 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group__7__Impl_in_rule__CPBranchTransition__Group__713152 = new BitSet(new long[]{0x0002000000000000L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group__8_in_rule__CPBranchTransition__Group__713155 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_rule__CPBranchTransition__Group__7__Impl13183 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group__8__Impl_in_rule__CPBranchTransition__Group__813214 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group__9_in_rule__CPBranchTransition__Group__813217 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_49_in_rule__CPBranchTransition__Group__8__Impl13245 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group__9__Impl_in_rule__CPBranchTransition__Group__913276 = new BitSet(new long[]{0x0000200020000000L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group__10_in_rule__CPBranchTransition__Group__913279 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__ConditionAssignment_9_in_rule__CPBranchTransition__Group__9__Impl13306 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group__10__Impl_in_rule__CPBranchTransition__Group__1013336 = new BitSet(new long[]{0x0000200020000000L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group__11_in_rule__CPBranchTransition__Group__1013339 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group_10__0_in_rule__CPBranchTransition__Group__10__Impl13366 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group__11__Impl_in_rule__CPBranchTransition__Group__1113397 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_rule__CPBranchTransition__Group__11__Impl13425 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group_10__0__Impl_in_rule__CPBranchTransition__Group_10__013480 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group_10__1_in_rule__CPBranchTransition__Group_10__013483 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_45_in_rule__CPBranchTransition__Group_10__0__Impl13511 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group_10__1__Impl_in_rule__CPBranchTransition__Group_10__113542 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__ActionAssignment_10_1_in_rule__CPBranchTransition__Group_10__1__Impl13569 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedTransition__Group__0__Impl_in_rule__RefinedTransition__Group__013603 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__RefinedTransition__Group__1_in_rule__RefinedTransition__Group__013606 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_50_in_rule__RefinedTransition__Group__0__Impl13634 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedTransition__Group__1__Impl_in_rule__RefinedTransition__Group__113665 = new BitSet(new long[]{0x0000000010000000L,0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedTransition__Group__2_in_rule__RefinedTransition__Group__113668 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedTransition__TargetAssignment_1_in_rule__RefinedTransition__Group__1__Impl13695 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedTransition__Group__2__Impl_in_rule__RefinedTransition__Group__213725 = new BitSet(new long[]{0x0000000010000000L,0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedTransition__Group__3_in_rule__RefinedTransition__Group__213728 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedTransition__DocuAssignment_2_in_rule__RefinedTransition__Group__2__Impl13755 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedTransition__Group__3__Impl_in_rule__RefinedTransition__Group__313786 = new BitSet(new long[]{0x0000200000000000L});
-    public static final BitSet FOLLOW_rule__RefinedTransition__Group__4_in_rule__RefinedTransition__Group__313789 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_rule__RefinedTransition__Group__3__Impl13817 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedTransition__Group__4__Impl_in_rule__RefinedTransition__Group__413848 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_rule__RefinedTransition__Group__5_in_rule__RefinedTransition__Group__413851 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_45_in_rule__RefinedTransition__Group__4__Impl13879 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedTransition__Group__5__Impl_in_rule__RefinedTransition__Group__513910 = new BitSet(new long[]{0x0000000020000000L});
-    public static final BitSet FOLLOW_rule__RefinedTransition__Group__6_in_rule__RefinedTransition__Group__513913 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedTransition__ActionAssignment_5_in_rule__RefinedTransition__Group__5__Impl13940 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedTransition__Group__6__Impl_in_rule__RefinedTransition__Group__613970 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_rule__RefinedTransition__Group__6__Impl13998 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TrPointTerminal__Group__0__Impl_in_rule__TrPointTerminal__Group__014043 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__TrPointTerminal__Group__1_in_rule__TrPointTerminal__Group__014046 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_rule__TrPointTerminal__Group__0__Impl14074 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TrPointTerminal__Group__1__Impl_in_rule__TrPointTerminal__Group__114105 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TrPointTerminal__TrPointAssignment_1_in_rule__TrPointTerminal__Group__1__Impl14132 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubStateTrPointTerminal__Group__0__Impl_in_rule__SubStateTrPointTerminal__Group__014166 = new BitSet(new long[]{0x0010000000000000L});
-    public static final BitSet FOLLOW_rule__SubStateTrPointTerminal__Group__1_in_rule__SubStateTrPointTerminal__Group__014169 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubStateTrPointTerminal__TrPointAssignment_0_in_rule__SubStateTrPointTerminal__Group__0__Impl14196 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubStateTrPointTerminal__Group__1__Impl_in_rule__SubStateTrPointTerminal__Group__114226 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__SubStateTrPointTerminal__Group__2_in_rule__SubStateTrPointTerminal__Group__114229 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_52_in_rule__SubStateTrPointTerminal__Group__1__Impl14257 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubStateTrPointTerminal__Group__2__Impl_in_rule__SubStateTrPointTerminal__Group__214288 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubStateTrPointTerminal__StateAssignment_2_in_rule__SubStateTrPointTerminal__Group__2__Impl14315 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ChoicepointTerminal__Group__0__Impl_in_rule__ChoicepointTerminal__Group__014351 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__ChoicepointTerminal__Group__1_in_rule__ChoicepointTerminal__Group__014354 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_53_in_rule__ChoicepointTerminal__Group__0__Impl14382 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ChoicepointTerminal__Group__1__Impl_in_rule__ChoicepointTerminal__Group__114413 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ChoicepointTerminal__CpAssignment_1_in_rule__ChoicepointTerminal__Group__1__Impl14440 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Trigger__Group__0__Impl_in_rule__Trigger__Group__014474 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__Trigger__Group__1_in_rule__Trigger__Group__014477 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_54_in_rule__Trigger__Group__0__Impl14505 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Trigger__Group__1__Impl_in_rule__Trigger__Group__114536 = new BitSet(new long[]{0x0181000000000000L});
-    public static final BitSet FOLLOW_rule__Trigger__Group__2_in_rule__Trigger__Group__114539 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Trigger__MsgFromIfPairsAssignment_1_in_rule__Trigger__Group__1__Impl14566 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Trigger__Group__2__Impl_in_rule__Trigger__Group__214596 = new BitSet(new long[]{0x0181000000000000L});
-    public static final BitSet FOLLOW_rule__Trigger__Group__3_in_rule__Trigger__Group__214599 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Trigger__Group_2__0_in_rule__Trigger__Group__2__Impl14626 = new BitSet(new long[]{0x0100000000000002L});
-    public static final BitSet FOLLOW_rule__Trigger__Group__3__Impl_in_rule__Trigger__Group__314657 = new BitSet(new long[]{0x0181000000000000L});
-    public static final BitSet FOLLOW_rule__Trigger__Group__4_in_rule__Trigger__Group__314660 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Trigger__GuardAssignment_3_in_rule__Trigger__Group__3__Impl14687 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Trigger__Group__4__Impl_in_rule__Trigger__Group__414718 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_55_in_rule__Trigger__Group__4__Impl14746 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Trigger__Group_2__0__Impl_in_rule__Trigger__Group_2__014787 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__Trigger__Group_2__1_in_rule__Trigger__Group_2__014790 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_56_in_rule__Trigger__Group_2__0__Impl14818 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Trigger__Group_2__1__Impl_in_rule__Trigger__Group_2__114849 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Trigger__MsgFromIfPairsAssignment_2_1_in_rule__Trigger__Group_2__1__Impl14876 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MessageFromIf__Group__0__Impl_in_rule__MessageFromIf__Group__014910 = new BitSet(new long[]{0x0000040000000000L});
-    public static final BitSet FOLLOW_rule__MessageFromIf__Group__1_in_rule__MessageFromIf__Group__014913 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MessageFromIf__MessageAssignment_0_in_rule__MessageFromIf__Group__0__Impl14940 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MessageFromIf__Group__1__Impl_in_rule__MessageFromIf__Group__114970 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__MessageFromIf__Group__2_in_rule__MessageFromIf__Group__114973 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rule__MessageFromIf__Group__1__Impl15001 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MessageFromIf__Group__2__Impl_in_rule__MessageFromIf__Group__215032 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MessageFromIf__FromAssignment_2_in_rule__MessageFromIf__Group__2__Impl15059 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Guard__Group__0__Impl_in_rule__Guard__Group__015095 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_rule__Guard__Group__1_in_rule__Guard__Group__015098 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_48_in_rule__Guard__Group__0__Impl15126 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Guard__Group__1__Impl_in_rule__Guard__Group__115157 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Guard__GuardAssignment_1_in_rule__Guard__Group__1__Impl15184 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__Group__0__Impl_in_rule__InSemanticsRule__Group__015219 = new BitSet(new long[]{0x0000040000000000L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__Group__1_in_rule__InSemanticsRule__Group__015222 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_57_in_rule__InSemanticsRule__Group__0__Impl15250 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__Group__1__Impl_in_rule__InSemanticsRule__Group__115281 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__Group__2_in_rule__InSemanticsRule__Group__115284 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rule__InSemanticsRule__Group__1__Impl15312 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__Group__2__Impl_in_rule__InSemanticsRule__Group__215343 = new BitSet(new long[]{0x0000100000000000L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__Group__3_in_rule__InSemanticsRule__Group__215346 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__MsgAssignment_2_in_rule__InSemanticsRule__Group__2__Impl15373 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__Group__3__Impl_in_rule__InSemanticsRule__Group__315403 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__Group_3__0_in_rule__InSemanticsRule__Group__3__Impl15430 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__Group_3__0__Impl_in_rule__InSemanticsRule__Group_3__015469 = new BitSet(new long[]{0x2600000000000000L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__Group_3__1_in_rule__InSemanticsRule__Group_3__015472 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_44_in_rule__InSemanticsRule__Group_3__0__Impl15500 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__Group_3__1__Impl_in_rule__InSemanticsRule__Group_3__115531 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__Alternatives_3_1_in_rule__InSemanticsRule__Group_3__1__Impl15558 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__Group_3_1_1__0__Impl_in_rule__InSemanticsRule__Group_3_1_1__015592 = new BitSet(new long[]{0x2200000000000000L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__Group_3_1_1__1_in_rule__InSemanticsRule__Group_3_1_1__015595 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_58_in_rule__InSemanticsRule__Group_3_1_1__0__Impl15623 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__Group_3_1_1__1__Impl_in_rule__InSemanticsRule__Group_3_1_1__115654 = new BitSet(new long[]{0x1000000000000000L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__Group_3_1_1__2_in_rule__InSemanticsRule__Group_3_1_1__115657 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__FollowUpsAssignment_3_1_1_1_in_rule__InSemanticsRule__Group_3_1_1__1__Impl15684 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__Group_3_1_1__2__Impl_in_rule__InSemanticsRule__Group_3_1_1__215714 = new BitSet(new long[]{0x0800000000000000L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__Group_3_1_1__3_in_rule__InSemanticsRule__Group_3_1_1__215717 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__Group_3_1_1_2__0_in_rule__InSemanticsRule__Group_3_1_1__2__Impl15746 = new BitSet(new long[]{0x1000000000000002L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__Group_3_1_1_2__0_in_rule__InSemanticsRule__Group_3_1_1__2__Impl15758 = new BitSet(new long[]{0x1000000000000002L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__Group_3_1_1__3__Impl_in_rule__InSemanticsRule__Group_3_1_1__315791 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_59_in_rule__InSemanticsRule__Group_3_1_1__3__Impl15819 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__Group_3_1_1_2__0__Impl_in_rule__InSemanticsRule__Group_3_1_1_2__015858 = new BitSet(new long[]{0x2200000000000000L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__Group_3_1_1_2__1_in_rule__InSemanticsRule__Group_3_1_1_2__015861 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_60_in_rule__InSemanticsRule__Group_3_1_1_2__0__Impl15889 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__Group_3_1_1_2__1__Impl_in_rule__InSemanticsRule__Group_3_1_1_2__115920 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__FollowUpsAssignment_3_1_1_2_1_in_rule__InSemanticsRule__Group_3_1_1_2__1__Impl15947 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__Group__0__Impl_in_rule__OutSemanticsRule__Group__015981 = new BitSet(new long[]{0x0000040000000000L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__Group__1_in_rule__OutSemanticsRule__Group__015984 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_61_in_rule__OutSemanticsRule__Group__0__Impl16012 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__Group__1__Impl_in_rule__OutSemanticsRule__Group__116043 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__Group__2_in_rule__OutSemanticsRule__Group__116046 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rule__OutSemanticsRule__Group__1__Impl16074 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__Group__2__Impl_in_rule__OutSemanticsRule__Group__216105 = new BitSet(new long[]{0x0000100000000000L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__Group__3_in_rule__OutSemanticsRule__Group__216108 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__MsgAssignment_2_in_rule__OutSemanticsRule__Group__2__Impl16135 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__Group__3__Impl_in_rule__OutSemanticsRule__Group__316165 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__Group_3__0_in_rule__OutSemanticsRule__Group__3__Impl16192 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__Group_3__0__Impl_in_rule__OutSemanticsRule__Group_3__016231 = new BitSet(new long[]{0x2600000000000000L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__Group_3__1_in_rule__OutSemanticsRule__Group_3__016234 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_44_in_rule__OutSemanticsRule__Group_3__0__Impl16262 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__Group_3__1__Impl_in_rule__OutSemanticsRule__Group_3__116293 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__Alternatives_3_1_in_rule__OutSemanticsRule__Group_3__1__Impl16320 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__Group_3_1_1__0__Impl_in_rule__OutSemanticsRule__Group_3_1_1__016354 = new BitSet(new long[]{0x2200000000000000L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__Group_3_1_1__1_in_rule__OutSemanticsRule__Group_3_1_1__016357 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_58_in_rule__OutSemanticsRule__Group_3_1_1__0__Impl16385 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__Group_3_1_1__1__Impl_in_rule__OutSemanticsRule__Group_3_1_1__116416 = new BitSet(new long[]{0x1000000000000000L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__Group_3_1_1__2_in_rule__OutSemanticsRule__Group_3_1_1__116419 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_1_in_rule__OutSemanticsRule__Group_3_1_1__1__Impl16446 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__Group_3_1_1__2__Impl_in_rule__OutSemanticsRule__Group_3_1_1__216476 = new BitSet(new long[]{0x0800000000000000L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__Group_3_1_1__3_in_rule__OutSemanticsRule__Group_3_1_1__216479 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__Group_3_1_1_2__0_in_rule__OutSemanticsRule__Group_3_1_1__2__Impl16508 = new BitSet(new long[]{0x1000000000000002L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__Group_3_1_1_2__0_in_rule__OutSemanticsRule__Group_3_1_1__2__Impl16520 = new BitSet(new long[]{0x1000000000000002L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__Group_3_1_1__3__Impl_in_rule__OutSemanticsRule__Group_3_1_1__316553 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_59_in_rule__OutSemanticsRule__Group_3_1_1__3__Impl16581 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__Group_3_1_1_2__0__Impl_in_rule__OutSemanticsRule__Group_3_1_1_2__016620 = new BitSet(new long[]{0x2200000000000000L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__Group_3_1_1_2__1_in_rule__OutSemanticsRule__Group_3_1_1_2__016623 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_60_in_rule__OutSemanticsRule__Group_3_1_1_2__0__Impl16651 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__Group_3_1_1_2__1__Impl_in_rule__OutSemanticsRule__Group_3_1_1_2__116682 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_2_1_in_rule__OutSemanticsRule__Group_3_1_1_2__1__Impl16709 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeyValue__Group__0__Impl_in_rule__KeyValue__Group__016746 = new BitSet(new long[]{0x4000000000000000L});
-    public static final BitSet FOLLOW_rule__KeyValue__Group__1_in_rule__KeyValue__Group__016749 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeyValue__KeyAssignment_0_in_rule__KeyValue__Group__0__Impl16776 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeyValue__Group__1__Impl_in_rule__KeyValue__Group__116806 = new BitSet(new long[]{0x000000000000E0E0L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__KeyValue__Group__2_in_rule__KeyValue__Group__116809 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_62_in_rule__KeyValue__Group__1__Impl16837 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeyValue__Group__2__Impl_in_rule__KeyValue__Group__216868 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeyValue__ValueAssignment_2_in_rule__KeyValue__Group__2__Impl16895 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__0__Impl_in_rule__SimpleAnnotationAttribute__Group__016934 = new BitSet(new long[]{0x8000000000000000L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__1_in_rule__SimpleAnnotationAttribute__Group__016937 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Alternatives_0_in_rule__SimpleAnnotationAttribute__Group__0__Impl16964 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__1__Impl_in_rule__SimpleAnnotationAttribute__Group__116994 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__2_in_rule__SimpleAnnotationAttribute__Group__116997 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_63_in_rule__SimpleAnnotationAttribute__Group__1__Impl17025 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__2__Impl_in_rule__SimpleAnnotationAttribute__Group__217056 = new BitSet(new long[]{0x0000040000000000L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__3_in_rule__SimpleAnnotationAttribute__Group__217059 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__NameAssignment_2_in_rule__SimpleAnnotationAttribute__Group__2__Impl17086 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__3__Impl_in_rule__SimpleAnnotationAttribute__Group__317116 = new BitSet(new long[]{0x0000000003C00000L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__4_in_rule__SimpleAnnotationAttribute__Group__317119 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rule__SimpleAnnotationAttribute__Group__3__Impl17147 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__4__Impl_in_rule__SimpleAnnotationAttribute__Group__417178 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__TypeAssignment_4_in_rule__SimpleAnnotationAttribute__Group__4__Impl17205 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__0__Impl_in_rule__EnumAnnotationAttribute__Group__017245 = new BitSet(new long[]{0x8000000000000000L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__1_in_rule__EnumAnnotationAttribute__Group__017248 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Alternatives_0_in_rule__EnumAnnotationAttribute__Group__0__Impl17275 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__1__Impl_in_rule__EnumAnnotationAttribute__Group__117305 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__2_in_rule__EnumAnnotationAttribute__Group__117308 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_63_in_rule__EnumAnnotationAttribute__Group__1__Impl17336 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__2__Impl_in_rule__EnumAnnotationAttribute__Group__217367 = new BitSet(new long[]{0x0000040000000000L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__3_in_rule__EnumAnnotationAttribute__Group__217370 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__NameAssignment_2_in_rule__EnumAnnotationAttribute__Group__2__Impl17397 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__3__Impl_in_rule__EnumAnnotationAttribute__Group__317427 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__4_in_rule__EnumAnnotationAttribute__Group__317430 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rule__EnumAnnotationAttribute__Group__3__Impl17458 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__4__Impl_in_rule__EnumAnnotationAttribute__Group__417489 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__5_in_rule__EnumAnnotationAttribute__Group__417492 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_rule__EnumAnnotationAttribute__Group__4__Impl17520 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__5__Impl_in_rule__EnumAnnotationAttribute__Group__517551 = new BitSet(new long[]{0x1000000020000000L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__6_in_rule__EnumAnnotationAttribute__Group__517554 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__ValuesAssignment_5_in_rule__EnumAnnotationAttribute__Group__5__Impl17581 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__6__Impl_in_rule__EnumAnnotationAttribute__Group__617611 = new BitSet(new long[]{0x1000000020000000L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__7_in_rule__EnumAnnotationAttribute__Group__617614 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group_6__0_in_rule__EnumAnnotationAttribute__Group__6__Impl17641 = new BitSet(new long[]{0x1000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__7__Impl_in_rule__EnumAnnotationAttribute__Group__717672 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_rule__EnumAnnotationAttribute__Group__7__Impl17700 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group_6__0__Impl_in_rule__EnumAnnotationAttribute__Group_6__017747 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group_6__1_in_rule__EnumAnnotationAttribute__Group_6__017750 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_60_in_rule__EnumAnnotationAttribute__Group_6__0__Impl17778 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group_6__1__Impl_in_rule__EnumAnnotationAttribute__Group_6__117809 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__ValuesAssignment_6_1_in_rule__EnumAnnotationAttribute__Group_6__1__Impl17836 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ImportedFQN__Group__0__Impl_in_rule__ImportedFQN__Group__017872 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000001L});
-    public static final BitSet FOLLOW_rule__ImportedFQN__Group__1_in_rule__ImportedFQN__Group__017875 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_rule__ImportedFQN__Group__0__Impl17902 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ImportedFQN__Group__1__Impl_in_rule__ImportedFQN__Group__117931 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_64_in_rule__ImportedFQN__Group__1__Impl17960 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Documentation__Group__0__Impl_in_rule__Documentation__Group__017997 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Documentation__Group__1_in_rule__Documentation__Group__018000 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Documentation__Group__1__Impl_in_rule__Documentation__Group__118058 = new BitSet(new long[]{0x0000000000000080L,0x0000000000000004L});
-    public static final BitSet FOLLOW_rule__Documentation__Group__2_in_rule__Documentation__Group__118061 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_65_in_rule__Documentation__Group__1__Impl18089 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Documentation__Group__2__Impl_in_rule__Documentation__Group__218120 = new BitSet(new long[]{0x0000000000000080L,0x0000000000000004L});
-    public static final BitSet FOLLOW_rule__Documentation__Group__3_in_rule__Documentation__Group__218123 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Documentation__LinesAssignment_2_in_rule__Documentation__Group__2__Impl18150 = new BitSet(new long[]{0x0000000000000082L});
-    public static final BitSet FOLLOW_rule__Documentation__Group__3__Impl_in_rule__Documentation__Group__318181 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_66_in_rule__Documentation__Group__3__Impl18209 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__BooleanLiteral__Group__0__Impl_in_rule__BooleanLiteral__Group__018254 = new BitSet(new long[]{0x0000000000002000L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__BooleanLiteral__Group__1_in_rule__BooleanLiteral__Group__018257 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__BooleanLiteral__Group__1__Impl_in_rule__BooleanLiteral__Group__118315 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__BooleanLiteral__Alternatives_1_in_rule__BooleanLiteral__Group__1__Impl18342 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RealLiteral__Group__0__Impl_in_rule__RealLiteral__Group__018376 = new BitSet(new long[]{0x000000000000C060L});
-    public static final BitSet FOLLOW_rule__RealLiteral__Group__1_in_rule__RealLiteral__Group__018379 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RealLiteral__Group__1__Impl_in_rule__RealLiteral__Group__118437 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RealLiteral__ValueAssignment_1_in_rule__RealLiteral__Group__1__Impl18464 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IntLiteral__Group__0__Impl_in_rule__IntLiteral__Group__018498 = new BitSet(new long[]{0x000000000000C060L});
-    public static final BitSet FOLLOW_rule__IntLiteral__Group__1_in_rule__IntLiteral__Group__018501 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IntLiteral__Group__1__Impl_in_rule__IntLiteral__Group__118559 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IntLiteral__ValueAssignment_1_in_rule__IntLiteral__Group__1__Impl18586 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StringLiteral__Group__0__Impl_in_rule__StringLiteral__Group__018620 = new BitSet(new long[]{0x000000000000E0E0L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__StringLiteral__Group__1_in_rule__StringLiteral__Group__018623 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StringLiteral__Group__1__Impl_in_rule__StringLiteral__Group__118681 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StringLiteral__ValueAssignment_1_in_rule__StringLiteral__Group__1__Impl18708 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Integer__Group_0__0__Impl_in_rule__Integer__Group_0__018742 = new BitSet(new long[]{0x000000000000C040L});
-    public static final BitSet FOLLOW_rule__Integer__Group_0__1_in_rule__Integer__Group_0__018745 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Integer__Alternatives_0_0_in_rule__Integer__Group_0__0__Impl18772 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Integer__Group_0__1__Impl_in_rule__Integer__Group_0__118803 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__Integer__Group_0__1__Impl18830 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Decimal__Group__0__Impl_in_rule__Decimal__Group__018863 = new BitSet(new long[]{0x000000000000C040L});
-    public static final BitSet FOLLOW_rule__Decimal__Group__1_in_rule__Decimal__Group__018866 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Decimal__Alternatives_0_in_rule__Decimal__Group__0__Impl18893 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Decimal__Group__1__Impl_in_rule__Decimal__Group__118924 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000008L});
-    public static final BitSet FOLLOW_rule__Decimal__Group__2_in_rule__Decimal__Group__118927 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__Decimal__Group__1__Impl18954 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Decimal__Group__2__Impl_in_rule__Decimal__Group__218983 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__Decimal__Group__3_in_rule__Decimal__Group__218986 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_67_in_rule__Decimal__Group__2__Impl19014 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Decimal__Group__3__Impl_in_rule__Decimal__Group__319045 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__Decimal__Group__3__Impl19072 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__0__Impl_in_rule__DecimalExp__Group__019109 = new BitSet(new long[]{0x000000000000C060L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__1_in_rule__DecimalExp__Group__019112 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Alternatives_0_in_rule__DecimalExp__Group__0__Impl19139 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__1__Impl_in_rule__DecimalExp__Group__119170 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000008L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__2_in_rule__DecimalExp__Group__119173 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__DecimalExp__Group__1__Impl19200 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__2__Impl_in_rule__DecimalExp__Group__219229 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__3_in_rule__DecimalExp__Group__219232 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_67_in_rule__DecimalExp__Group__2__Impl19260 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__3__Impl_in_rule__DecimalExp__Group__319291 = new BitSet(new long[]{0x0000000000030000L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__4_in_rule__DecimalExp__Group__319294 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__DecimalExp__Group__3__Impl19321 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__4__Impl_in_rule__DecimalExp__Group__419350 = new BitSet(new long[]{0x000000000000C040L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__5_in_rule__DecimalExp__Group__419353 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Alternatives_4_in_rule__DecimalExp__Group__4__Impl19380 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__5__Impl_in_rule__DecimalExp__Group__519410 = new BitSet(new long[]{0x000000000000C040L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__6_in_rule__DecimalExp__Group__519413 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Alternatives_5_in_rule__DecimalExp__Group__5__Impl19440 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__6__Impl_in_rule__DecimalExp__Group__619471 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__DecimalExp__Group__6__Impl19498 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FQN__Group__0__Impl_in_rule__FQN__Group__019541 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000008L});
-    public static final BitSet FOLLOW_rule__FQN__Group__1_in_rule__FQN__Group__019544 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__FQN__Group__0__Impl19571 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FQN__Group__1__Impl_in_rule__FQN__Group__119600 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FQN__Group_1__0_in_rule__FQN__Group__1__Impl19627 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000008L});
-    public static final BitSet FOLLOW_rule__FQN__Group_1__0__Impl_in_rule__FQN__Group_1__019662 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__FQN__Group_1__1_in_rule__FQN__Group_1__019665 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_67_in_rule__FQN__Group_1__0__Impl19693 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FQN__Group_1__1__Impl_in_rule__FQN__Group_1__119724 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__FQN__Group_1__1__Impl19751 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ModelComponent__UnorderedGroup_0__0_in_rule__ModelComponent__UnorderedGroup_019785 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ModelComponent__AbstractAssignment_0_0_in_rule__ModelComponent__UnorderedGroup_0__Impl19872 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ModelComponent__CommTypeAssignment_0_1_in_rule__ModelComponent__UnorderedGroup_0__Impl19963 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ModelComponent__UnorderedGroup_0__Impl_in_rule__ModelComponent__UnorderedGroup_0__020022 = new BitSet(new long[]{0x00000000003C0002L,0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__ModelComponent__UnorderedGroup_0__1_in_rule__ModelComponent__UnorderedGroup_0__020025 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ModelComponent__UnorderedGroup_0__Impl_in_rule__ModelComponent__UnorderedGroup_0__120050 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleModelComponent_in_rule__FSMModel__ComponentsAssignment20082 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_68_in_rule__ModelComponent__AbstractAssignment_0_020118 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleComponentCommunicationType_in_rule__ModelComponent__CommTypeAssignment_0_120157 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__ModelComponent__ComponentNameAssignment_220188 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_rule__ModelComponent__BaseAssignment_3_120223 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStateMachine_in_rule__ModelComponent__StateMachineAssignment_420258 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleState_in_rule__StateGraph__StatesAssignment_2_020289 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTrPoint_in_rule__StateGraph__TrPointsAssignment_2_120320 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChoicePoint_in_rule__StateGraph__ChPointsAssignment_2_220351 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTransition_in_rule__StateGraph__TransitionsAssignment_2_320382 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRefinedTransition_in_rule__StateGraph__RefinedTransitionsAssignment_2_420413 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleState_in_rule__StateMachine__StatesAssignment_3_020444 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTrPoint_in_rule__StateMachine__TrPointsAssignment_3_120475 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChoicePoint_in_rule__StateMachine__ChPointsAssignment_3_220506 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTransition_in_rule__StateMachine__TransitionsAssignment_3_320537 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRefinedTransition_in_rule__StateMachine__RefinedTransitionsAssignment_3_420568 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__SimpleState__NameAssignment_120599 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_rule__SimpleState__DocuAssignment_220630 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_rule__SimpleState__EntryCodeAssignment_3_1_120661 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_rule__SimpleState__ExitCodeAssignment_3_2_120692 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_rule__SimpleState__DoCodeAssignment_3_3_120723 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStateGraph_in_rule__SimpleState__SubgraphAssignment_3_4_120754 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_rule__RefinedState__TargetAssignment_120789 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_rule__RefinedState__DocuAssignment_220824 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_rule__RefinedState__EntryCodeAssignment_4_120855 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_rule__RefinedState__ExitCodeAssignment_5_120886 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_rule__RefinedState__DoCodeAssignment_6_120917 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStateGraph_in_rule__RefinedState__SubgraphAssignment_7_120948 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_rule__DetailCode__UsedAssignment_120984 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__DetailCode__LinesAssignment_221023 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_69_in_rule__TransitionPoint__HandlerAssignment_021059 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__TransitionPoint__NameAssignment_221098 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__EntryPoint__NameAssignment_121129 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__ExitPoint__NameAssignment_121160 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__ChoicePoint__NameAssignment_121191 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_rule__ChoicePoint__DocuAssignment_221222 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__InitialTransition__NameAssignment_121253 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTransitionTerminal_in_rule__InitialTransition__ToAssignment_521284 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_rule__InitialTransition__DocuAssignment_621315 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_rule__InitialTransition__ActionAssignment_7_1_121346 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__ContinuationTransition__NameAssignment_121377 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTransitionTerminal_in_rule__ContinuationTransition__FromAssignment_321408 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTransitionTerminal_in_rule__ContinuationTransition__ToAssignment_521439 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_rule__ContinuationTransition__DocuAssignment_621470 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_rule__ContinuationTransition__ActionAssignment_7_1_121501 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__TriggeredTransition__NameAssignment_121532 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTransitionTerminal_in_rule__TriggeredTransition__FromAssignment_321563 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTransitionTerminal_in_rule__TriggeredTransition__ToAssignment_521594 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_rule__TriggeredTransition__DocuAssignment_621625 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTrigger_in_rule__TriggeredTransition__TriggersAssignment_1021656 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTrigger_in_rule__TriggeredTransition__TriggersAssignment_11_121687 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_rule__TriggeredTransition__ActionAssignment_13_121718 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__GuardedTransition__NameAssignment_121749 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTransitionTerminal_in_rule__GuardedTransition__FromAssignment_321780 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTransitionTerminal_in_rule__GuardedTransition__ToAssignment_521811 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_rule__GuardedTransition__DocuAssignment_621842 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_rule__GuardedTransition__GuardAssignment_921873 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_rule__GuardedTransition__ActionAssignment_10_121904 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__CPBranchTransition__NameAssignment_121935 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTransitionTerminal_in_rule__CPBranchTransition__FromAssignment_321966 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTransitionTerminal_in_rule__CPBranchTransition__ToAssignment_521997 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_rule__CPBranchTransition__DocuAssignment_622028 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_rule__CPBranchTransition__ConditionAssignment_922059 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_rule__CPBranchTransition__ActionAssignment_10_122090 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_rule__RefinedTransition__TargetAssignment_122125 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_rule__RefinedTransition__DocuAssignment_222160 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_rule__RefinedTransition__ActionAssignment_522191 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__StateTerminal__StateAssignment22226 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__TrPointTerminal__TrPointAssignment_122265 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__SubStateTrPointTerminal__TrPointAssignment_022304 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__SubStateTrPointTerminal__StateAssignment_222343 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__ChoicepointTerminal__CpAssignment_122382 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMessageFromIf_in_rule__Trigger__MsgFromIfPairsAssignment_122417 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMessageFromIf_in_rule__Trigger__MsgFromIfPairsAssignment_2_122448 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGuard_in_rule__Trigger__GuardAssignment_322479 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__MessageFromIf__MessageAssignment_022514 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__MessageFromIf__FromAssignment_222553 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_rule__Guard__GuardAssignment_122589 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__InSemanticsRule__MsgAssignment_222625 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSemanticsRule_in_rule__InSemanticsRule__FollowUpsAssignment_3_1_022660 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSemanticsRule_in_rule__InSemanticsRule__FollowUpsAssignment_3_1_1_122691 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSemanticsRule_in_rule__InSemanticsRule__FollowUpsAssignment_3_1_1_2_122722 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__OutSemanticsRule__MsgAssignment_222757 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSemanticsRule_in_rule__OutSemanticsRule__FollowUpsAssignment_3_1_022792 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSemanticsRule_in_rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_122823 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSemanticsRule_in_rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_2_122854 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__KeyValue__KeyAssignment_022888 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLiteral_in_rule__KeyValue__ValueAssignment_222919 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_70_in_rule__SimpleAnnotationAttribute__OptionalAssignment_0_022961 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__SimpleAnnotationAttribute__NameAssignment_223000 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLiteralType_in_rule__SimpleAnnotationAttribute__TypeAssignment_423031 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_70_in_rule__EnumAnnotationAttribute__OptionalAssignment_0_023067 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__EnumAnnotationAttribute__NameAssignment_223106 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__EnumAnnotationAttribute__ValuesAssignment_523137 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__EnumAnnotationAttribute__ValuesAssignment_6_123168 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__Documentation__LinesAssignment_223201 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_71_in_rule__BooleanLiteral__IsTrueAssignment_1_123239 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleReal_in_rule__RealLiteral__ValueAssignment_123278 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInteger_in_rule__IntLiteral__ValueAssignment_123309 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__StringLiteral__ValueAssignment_123340 = 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[]{0x00000000003C0002L,0x0000000000000010L});
+    public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x0000000004000000L});
+    public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x0000000048000000L});
+    public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x0000000010000000L});
+    public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x000403F0A0000000L,0x0000000000000020L});
+    public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x000403F080000002L,0x0000000000000020L});
+    public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0000000010000000L,0x0000000000000002L});
+    public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0000000F20000000L});
+    public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0000000020000080L});
+    public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000000000000082L});
+    public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x0000002000000000L,0x0000000000000020L});
+    public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000002L});
+    public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x0000040000000010L});
+    public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0000080000000000L});
+    public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0000100000000000L});
+    public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0028000000000010L});
+    public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x0000200020000000L});
+    public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x0000400000000000L});
+    public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0040000000000000L});
+    public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x0000800020000000L});
+    public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x0000800000000002L});
+    public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x0001000000000000L});
+    public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x0002000000000000L});
+    public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x0000200000000000L});
+    public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x0000000020000000L});
+    public static final BitSet FOLLOW_29 = new BitSet(new long[]{0x0010000000000000L});
+    public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x0181000000000000L});
+    public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x0100000000000002L});
+    public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x0000040000000000L});
+    public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x2600000000000000L});
+    public static final BitSet FOLLOW_34 = new BitSet(new long[]{0x2200000000000000L});
+    public static final BitSet FOLLOW_35 = new BitSet(new long[]{0x1000000000000000L});
+    public static final BitSet FOLLOW_36 = new BitSet(new long[]{0x0800000000000000L});
+    public static final BitSet FOLLOW_37 = new BitSet(new long[]{0x1000000000000002L});
+    public static final BitSet FOLLOW_38 = new BitSet(new long[]{0x4000000000000000L});
+    public static final BitSet FOLLOW_39 = new BitSet(new long[]{0x000000000000E0E0L,0x0000000000000080L});
+    public static final BitSet FOLLOW_40 = new BitSet(new long[]{0x8000000000000000L});
+    public static final BitSet FOLLOW_41 = new BitSet(new long[]{0x0000000003C00000L});
+    public static final BitSet FOLLOW_42 = new BitSet(new long[]{0x0000000000000080L});
+    public static final BitSet FOLLOW_43 = new BitSet(new long[]{0x1000000020000000L});
+    public static final BitSet FOLLOW_44 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000001L});
+    public static final BitSet FOLLOW_45 = new BitSet(new long[]{0x0000000000000080L,0x0000000000000004L});
+    public static final BitSet FOLLOW_46 = new BitSet(new long[]{0x0000000000002000L,0x0000000000000080L});
+    public static final BitSet FOLLOW_47 = new BitSet(new long[]{0x000000000000C060L});
+    public static final BitSet FOLLOW_48 = new BitSet(new long[]{0x000000000000C040L});
+    public static final BitSet FOLLOW_49 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000008L});
+    public static final BitSet FOLLOW_50 = new BitSet(new long[]{0x0000000000000040L});
+    public static final BitSet FOLLOW_51 = new BitSet(new long[]{0x0000000000030000L});
+    public static final BitSet FOLLOW_52 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000008L});
 
 }
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;
diff --git a/plugins/org.eclipse.etrice.core.room.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.room.ui/META-INF/MANIFEST.MF
index 9159c9142..cc5db80ae 100644
--- a/plugins/org.eclipse.etrice.core.room.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.room.ui/META-INF/MANIFEST.MF
@@ -31,5 +31,6 @@ Export-Package: org.eclipse.etrice.core.ui,
  org.eclipse.etrice.core.ui.internal,
  org.eclipse.etrice.core.ui.linking,
  org.eclipse.etrice.core.ui.preferences,
- org.eclipse.etrice.core.ui.quickfix
+ org.eclipse.etrice.core.ui.quickfix,
+ org.eclipse.etrice.core.ui.contentassist.antlr.internal
 Bundle-Activator: org.eclipse.etrice.core.ui.RoomUiActivator
diff --git a/plugins/org.eclipse.etrice.core.room.ui/plugin.xml_gen b/plugins/org.eclipse.etrice.core.room.ui/plugin.xml_gen
index 42588c2d1..3e246443a 100644
--- a/plugins/org.eclipse.etrice.core.room.ui/plugin.xml_gen
+++ b/plugins/org.eclipse.etrice.core.room.ui/plugin.xml_gen
@@ -361,5 +361,11 @@
             extensions="room">
     </provider>
   </extension>
+  <extension point="org.eclipse.team.core.fileTypes">
+    <fileTypes
+            extension="room"
+            type="text">
+    </fileTypes>
+  </extension>
 
 </plugin>
diff --git a/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/AbstractRoomUiModule.java b/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/AbstractRoomUiModule.java
index 4badbcee6..793766d3e 100644
--- a/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/AbstractRoomUiModule.java
+++ b/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/AbstractRoomUiModule.java
@@ -4,14 +4,13 @@
  */
 package org.eclipse.etrice.core.ui;
 
-import org.eclipse.xtext.ui.DefaultUiModule;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 
 /**
  * Manual modifications go to {org.eclipse.etrice.core.ui.RoomUiModule}
  */
 @SuppressWarnings("all")
-public abstract class AbstractRoomUiModule extends DefaultUiModule {
+public abstract class AbstractRoomUiModule extends org.eclipse.xtext.ui.DefaultUiModule {
 	
 	public AbstractRoomUiModule(AbstractUIPlugin plugin) {
 		super(plugin);
@@ -59,6 +58,11 @@ public abstract class AbstractRoomUiModule extends DefaultUiModule {
 	}
 
 	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
+	public Class<? extends org.eclipse.xtext.generator.IContextualOutputConfigurationProvider> bindIContextualOutputConfigurationProvider() {
+		return org.eclipse.xtext.builder.EclipseOutputConfigurationProvider.class;
+	}
+
+	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
 	public void configureIResourceDescriptionsPersisted(com.google.inject.Binder binder) {
 		binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.PERSISTED_DESCRIPTIONS)).to(org.eclipse.xtext.builder.builderState.IBuilderState.class);
 	}
diff --git a/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/AbstractRoomProposalProvider.java b/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/AbstractRoomProposalProvider.java
index e206cbfc7..9f9378dfe 100644
--- a/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/AbstractRoomProposalProvider.java
+++ b/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/AbstractRoomProposalProvider.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.ui.contentassist;
 
 import org.eclipse.emf.ecore.EObject;
@@ -621,9 +621,6 @@ public class AbstractRoomProposalProvider extends org.eclipse.etrice.core.fsm.ui
 	public void complete_OutMessageHandler(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
-	public void complete_ModelComponent(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
 	public void complete_ActorClass(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
@@ -696,15 +693,9 @@ public class AbstractRoomProposalProvider extends org.eclipse.etrice.core.fsm.ui
 	public void complete_ReferenceType(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
-	public void complete_AbstractInterfaceItem(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
 	public void complete_MULTIPLICITY(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
-	public void complete_AnnotationTargetType(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
 	public void complete_RoomAnnotationTargetEnum(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
diff --git a/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/RoomParser.java b/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/RoomParser.java
index 102d76746..30a8cc7db 100644
--- a/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/RoomParser.java
+++ b/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/RoomParser.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.ui.contentassist.antlr;
 
 import java.util.Collection;
@@ -68,6 +68,7 @@ public class RoomParser extends AbstractContentAssistParser {
 					put(grammarAccess.getStateMachineAccess().getAlternatives_3(), "rule__StateMachine__Alternatives_3");
 					put(grammarAccess.getStateAccess().getAlternatives(), "rule__State__Alternatives");
 					put(grammarAccess.getTrPointAccess().getAlternatives(), "rule__TrPoint__Alternatives");
+					put(grammarAccess.getTransitionBaseAccess().getAlternatives(), "rule__TransitionBase__Alternatives");
 					put(grammarAccess.getTransitionAccess().getAlternatives(), "rule__Transition__Alternatives");
 					put(grammarAccess.getNonInitialTransitionAccess().getAlternatives(), "rule__NonInitialTransition__Alternatives");
 					put(grammarAccess.getTransitionChainStartTransitionAccess().getAlternatives(), "rule__TransitionChainStartTransition__Alternatives");
diff --git a/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g b/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g
index 2ab0e08d3..af7f36d10 100644
--- a/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g
+++ b/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 grammar InternalRoom;
 
 options {
@@ -1804,6 +1804,8 @@ finally {
 
 
 
+
+
 // Entry rule entryRuleTransition
 entryRuleTransition 
 :
@@ -3889,6 +3891,7 @@ finally {
 	restoreStackSize(stackSize);
 }
 
+
 rule__Transition__Alternatives
     @init {
 		int stackSize = keepStackSize();
diff --git a/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoomLexer.java b/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoomLexer.java
index 8e2d1b020..de01edd04 100644
--- a/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoomLexer.java
+++ b/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoomLexer.java
@@ -12,135 +12,135 @@ import java.util.ArrayList;
 
 @SuppressWarnings("all")
 public class InternalRoomLexer extends Lexer {
-    public static final int RULE_HEX=5;
-    public static final int T__50=50;
-    public static final int T__59=59;
-    public static final int T__55=55;
-    public static final int T__56=56;
-    public static final int T__57=57;
-    public static final int T__58=58;
-    public static final int T__51=51;
-    public static final int T__52=52;
-    public static final int T__53=53;
-    public static final int T__54=54;
-    public static final int T__60=60;
-    public static final int T__61=61;
     public static final int RULE_ID=6;
-    public static final int T__131=131;
-    public static final int T__130=130;
-    public static final int RULE_INT=4;
-    public static final int T__66=66;
-    public static final int RULE_ML_COMMENT=8;
-    public static final int T__67=67;
-    public static final int T__129=129;
-    public static final int T__68=68;
-    public static final int T__69=69;
-    public static final int T__62=62;
-    public static final int T__126=126;
-    public static final int T__63=63;
-    public static final int T__125=125;
-    public static final int T__64=64;
-    public static final int T__128=128;
-    public static final int T__65=65;
-    public static final int T__127=127;
-    public static final int T__37=37;
-    public static final int T__38=38;
-    public static final int T__39=39;
-    public static final int T__33=33;
-    public static final int T__34=34;
-    public static final int T__35=35;
-    public static final int T__36=36;
-    public static final int T__30=30;
-    public static final int T__31=31;
-    public static final int T__32=32;
-    public static final int T__48=48;
-    public static final int T__49=49;
-    public static final int T__44=44;
-    public static final int T__45=45;
-    public static final int T__46=46;
-    public static final int T__47=47;
-    public static final int T__40=40;
-    public static final int T__41=41;
-    public static final int T__42=42;
-    public static final int T__43=43;
-    public static final int T__91=91;
-    public static final int T__100=100;
-    public static final int T__92=92;
+    public static final int T__29=29;
+    public static final int T__28=28;
+    public static final int T__27=27;
+    public static final int T__26=26;
+    public static final int T__25=25;
+    public static final int T__24=24;
+    public static final int T__23=23;
+    public static final int T__22=22;
+    public static final int RULE_ANY_OTHER=11;
+    public static final int T__21=21;
+    public static final int T__20=20;
+    public static final int EOF=-1;
     public static final int T__93=93;
-    public static final int T__102=102;
+    public static final int T__19=19;
     public static final int T__94=94;
-    public static final int T__101=101;
+    public static final int T__91=91;
+    public static final int T__92=92;
+    public static final int RULE_HEX=5;
+    public static final int T__16=16;
     public static final int T__90=90;
-    public static final int T__19=19;
     public static final int T__15=15;
-    public static final int T__16=16;
-    public static final int T__17=17;
     public static final int T__18=18;
-    public static final int T__99=99;
+    public static final int T__17=17;
     public static final int T__12=12;
-    public static final int T__13=13;
     public static final int T__14=14;
-    public static final int T__95=95;
-    public static final int T__96=96;
-    public static final int T__97=97;
+    public static final int T__13=13;
+    public static final int T__99=99;
     public static final int T__98=98;
-    public static final int T__26=26;
-    public static final int T__27=27;
-    public static final int T__28=28;
-    public static final int T__29=29;
-    public static final int T__22=22;
-    public static final int T__23=23;
-    public static final int T__24=24;
-    public static final int T__25=25;
-    public static final int T__20=20;
-    public static final int T__21=21;
-    public static final int T__122=122;
-    public static final int T__70=70;
-    public static final int T__121=121;
+    public static final int T__97=97;
+    public static final int T__96=96;
+    public static final int T__95=95;
+    public static final int T__80=80;
+    public static final int T__81=81;
+    public static final int T__82=82;
+    public static final int T__83=83;
+    public static final int T__85=85;
+    public static final int T__84=84;
+    public static final int T__87=87;
+    public static final int T__86=86;
+    public static final int T__89=89;
+    public static final int T__88=88;
+    public static final int RULE_ML_COMMENT=8;
+    public static final int T__126=126;
+    public static final int T__125=125;
+    public static final int T__128=128;
+    public static final int RULE_STRING=7;
+    public static final int T__127=127;
     public static final int T__71=71;
-    public static final int T__124=124;
+    public static final int T__129=129;
     public static final int T__72=72;
-    public static final int T__123=123;
-    public static final int T__120=120;
-    public static final int RULE_STRING=7;
-    public static final int RULE_SL_COMMENT=9;
-    public static final int T__77=77;
-    public static final int T__119=119;
+    public static final int T__70=70;
+    public static final int T__76=76;
+    public static final int T__75=75;
+    public static final int T__130=130;
+    public static final int T__74=74;
+    public static final int T__131=131;
+    public static final int T__73=73;
+    public static final int T__79=79;
     public static final int T__78=78;
+    public static final int T__77=77;
+    public static final int T__68=68;
+    public static final int T__69=69;
+    public static final int T__66=66;
+    public static final int T__67=67;
+    public static final int T__64=64;
+    public static final int T__65=65;
+    public static final int T__62=62;
+    public static final int T__63=63;
     public static final int T__118=118;
-    public static final int T__79=79;
-    public static final int T__73=73;
-    public static final int T__115=115;
-    public static final int EOF=-1;
-    public static final int T__74=74;
-    public static final int T__114=114;
-    public static final int T__75=75;
-    public static final int T__117=117;
-    public static final int T__76=76;
+    public static final int T__119=119;
     public static final int T__116=116;
-    public static final int T__80=80;
+    public static final int T__117=117;
+    public static final int T__114=114;
+    public static final int T__115=115;
+    public static final int T__124=124;
+    public static final int T__123=123;
+    public static final int T__122=122;
+    public static final int T__121=121;
+    public static final int T__120=120;
+    public static final int T__61=61;
+    public static final int T__60=60;
+    public static final int T__55=55;
+    public static final int T__56=56;
+    public static final int T__57=57;
+    public static final int T__58=58;
+    public static final int T__51=51;
+    public static final int T__52=52;
+    public static final int T__53=53;
+    public static final int T__54=54;
+    public static final int T__107=107;
+    public static final int T__108=108;
+    public static final int T__109=109;
+    public static final int T__59=59;
+    public static final int T__103=103;
+    public static final int T__104=104;
+    public static final int T__105=105;
+    public static final int T__106=106;
     public static final int T__111=111;
-    public static final int T__81=81;
     public static final int T__110=110;
-    public static final int T__82=82;
     public static final int T__113=113;
-    public static final int T__83=83;
+    public static final int RULE_INT=4;
     public static final int T__112=112;
+    public static final int T__50=50;
+    public static final int T__42=42;
+    public static final int T__43=43;
+    public static final int T__40=40;
+    public static final int T__41=41;
+    public static final int T__46=46;
+    public static final int T__47=47;
+    public static final int T__44=44;
+    public static final int T__45=45;
+    public static final int T__48=48;
+    public static final int T__49=49;
+    public static final int T__102=102;
+    public static final int T__101=101;
+    public static final int T__100=100;
+    public static final int RULE_SL_COMMENT=9;
+    public static final int T__30=30;
+    public static final int T__31=31;
+    public static final int T__32=32;
+    public static final int T__33=33;
+    public static final int T__34=34;
+    public static final int T__35=35;
+    public static final int T__36=36;
+    public static final int T__37=37;
+    public static final int T__38=38;
+    public static final int T__39=39;
     public static final int RULE_WS=10;
-    public static final int RULE_ANY_OTHER=11;
-    public static final int T__88=88;
-    public static final int T__108=108;
-    public static final int T__89=89;
-    public static final int T__107=107;
-    public static final int T__109=109;
-    public static final int T__84=84;
-    public static final int T__104=104;
-    public static final int T__85=85;
-    public static final int T__103=103;
-    public static final int T__86=86;
-    public static final int T__106=106;
-    public static final int T__87=87;
-    public static final int T__105=105;
 
     // delegates
     // delegators
@@ -153,15 +153,15 @@ public class InternalRoomLexer extends Lexer {
         super(input,state);
 
     }
-    public String getGrammarFileName() { return "../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g"; }
+    public String getGrammarFileName() { return "InternalRoom.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.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11:7: ( 'void' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11:9: 'void'
+            // InternalRoom.g:11:7: ( 'void' )
+            // InternalRoom.g:11:9: 'void'
             {
             match("void"); 
 
@@ -181,8 +181,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__13;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12:7: ( 'ctor' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12:9: 'ctor'
+            // InternalRoom.g:12:7: ( 'ctor' )
+            // InternalRoom.g:12:9: 'ctor'
             {
             match("ctor"); 
 
@@ -202,8 +202,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__14;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13:7: ( 'dtor' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13:9: 'dtor'
+            // InternalRoom.g:13:7: ( 'dtor' )
+            // InternalRoom.g:13:9: 'dtor'
             {
             match("dtor"); 
 
@@ -223,8 +223,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__15;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14:7: ( '*' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14:9: '*'
+            // InternalRoom.g:14:7: ( '*' )
+            // InternalRoom.g:14:9: '*'
             {
             match('*'); 
 
@@ -243,8 +243,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__16;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15:7: ( 'DataClass' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15:9: 'DataClass'
+            // InternalRoom.g:15:7: ( 'DataClass' )
+            // InternalRoom.g:15:9: 'DataClass'
             {
             match("DataClass"); 
 
@@ -264,8 +264,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__17;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16:7: ( 'ActorClass' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16:9: 'ActorClass'
+            // InternalRoom.g:16:7: ( 'ActorClass' )
+            // InternalRoom.g:16:9: 'ActorClass'
             {
             match("ActorClass"); 
 
@@ -285,8 +285,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__18;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17:7: ( 'ActorBehavior' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17:9: 'ActorBehavior'
+            // InternalRoom.g:17:7: ( 'ActorBehavior' )
+            // InternalRoom.g:17:9: 'ActorBehavior'
             {
             match("ActorBehavior"); 
 
@@ -306,8 +306,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__19;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18:7: ( 'ProtocolClass' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18:9: 'ProtocolClass'
+            // InternalRoom.g:18:7: ( 'ProtocolClass' )
+            // InternalRoom.g:18:9: 'ProtocolClass'
             {
             match("ProtocolClass"); 
 
@@ -327,8 +327,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__20;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19:7: ( 'CompoundProtocolClass' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19:9: 'CompoundProtocolClass'
+            // InternalRoom.g:19:7: ( 'CompoundProtocolClass' )
+            // InternalRoom.g:19:9: 'CompoundProtocolClass'
             {
             match("CompoundProtocolClass"); 
 
@@ -348,8 +348,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__21;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20:7: ( 'SubSystemClass' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20:9: 'SubSystemClass'
+            // InternalRoom.g:20:7: ( 'SubSystemClass' )
+            // InternalRoom.g:20:9: 'SubSystemClass'
             {
             match("SubSystemClass"); 
 
@@ -369,8 +369,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__22;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21:7: ( 'LogicalSystem' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21:9: 'LogicalSystem'
+            // InternalRoom.g:21:7: ( 'LogicalSystem' )
+            // InternalRoom.g:21:9: 'LogicalSystem'
             {
             match("LogicalSystem"); 
 
@@ -390,8 +390,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__23;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22:7: ( 'mandatory' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22:9: 'mandatory'
+            // InternalRoom.g:22:7: ( 'mandatory' )
+            // InternalRoom.g:22:9: 'mandatory'
             {
             match("mandatory"); 
 
@@ -411,8 +411,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__24;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23:7: ( 'model' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23:9: 'model'
+            // InternalRoom.g:23:7: ( 'model' )
+            // InternalRoom.g:23:9: 'model'
             {
             match("model"); 
 
@@ -432,8 +432,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__25;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24:7: ( 'false' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24:9: 'false'
+            // InternalRoom.g:24:7: ( 'false' )
+            // InternalRoom.g:24:9: 'false'
             {
             match("false"); 
 
@@ -453,8 +453,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__26;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25:7: ( '+' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25:9: '+'
+            // InternalRoom.g:25:7: ( '+' )
+            // InternalRoom.g:25:9: '+'
             {
             match('+'); 
 
@@ -473,8 +473,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__27;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26:7: ( '-' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26:9: '-'
+            // InternalRoom.g:26:7: ( '-' )
+            // InternalRoom.g:26:9: '-'
             {
             match('-'); 
 
@@ -493,8 +493,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__28;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27:7: ( 'e' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27:9: 'e'
+            // InternalRoom.g:27:7: ( 'e' )
+            // InternalRoom.g:27:9: 'e'
             {
             match('e'); 
 
@@ -513,8 +513,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__29;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:28:7: ( 'E' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:28:9: 'E'
+            // InternalRoom.g:28:7: ( 'E' )
+            // InternalRoom.g:28:9: 'E'
             {
             match('E'); 
 
@@ -533,8 +533,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__30;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:29:7: ( 'eventdriven' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:29:9: 'eventdriven'
+            // InternalRoom.g:29:7: ( 'eventdriven' )
+            // InternalRoom.g:29:9: 'eventdriven'
             {
             match("eventdriven"); 
 
@@ -554,8 +554,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__31;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:30:7: ( 'datadriven' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:30:9: 'datadriven'
+            // InternalRoom.g:30:7: ( 'datadriven' )
+            // InternalRoom.g:30:9: 'datadriven'
             {
             match("datadriven"); 
 
@@ -575,8 +575,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__32;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:31:7: ( 'sync' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:31:9: 'sync'
+            // InternalRoom.g:31:7: ( 'sync' )
+            // InternalRoom.g:31:9: 'sync'
             {
             match("sync"); 
 
@@ -596,8 +596,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__33;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:32:7: ( 'fixed' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:32:9: 'fixed'
+            // InternalRoom.g:32:7: ( 'fixed' )
+            // InternalRoom.g:32:9: 'fixed'
             {
             match("fixed"); 
 
@@ -617,8 +617,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__34;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:33:7: ( 'optional' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:33:9: 'optional'
+            // InternalRoom.g:33:7: ( 'optional' )
+            // InternalRoom.g:33:9: 'optional'
             {
             match("optional"); 
 
@@ -638,8 +638,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__35;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:34:7: ( 'async' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:34:9: 'async'
+            // InternalRoom.g:34:7: ( 'async' )
+            // InternalRoom.g:34:9: 'async'
             {
             match("async"); 
 
@@ -659,8 +659,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__36;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:35:7: ( 'ptBoolean' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:35:9: 'ptBoolean'
+            // InternalRoom.g:35:7: ( 'ptBoolean' )
+            // InternalRoom.g:35:9: 'ptBoolean'
             {
             match("ptBoolean"); 
 
@@ -680,8 +680,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__37;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:36:7: ( 'ptInteger' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:36:9: 'ptInteger'
+            // InternalRoom.g:36:7: ( 'ptInteger' )
+            // InternalRoom.g:36:9: 'ptInteger'
             {
             match("ptInteger"); 
 
@@ -701,8 +701,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__38;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:37:7: ( 'ptReal' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:37:9: 'ptReal'
+            // InternalRoom.g:37:7: ( 'ptReal' )
+            // InternalRoom.g:37:9: 'ptReal'
             {
             match("ptReal"); 
 
@@ -722,8 +722,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__39;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:38:7: ( 'ptCharacter' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:38:9: 'ptCharacter'
+            // InternalRoom.g:38:7: ( 'ptCharacter' )
+            // InternalRoom.g:38:9: 'ptCharacter'
             {
             match("ptCharacter"); 
 
@@ -743,8 +743,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__40;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:39:7: ( 'RoomModel' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:39:9: 'RoomModel'
+            // InternalRoom.g:39:7: ( 'RoomModel' )
+            // InternalRoom.g:39:9: 'RoomModel'
             {
             match("RoomModel"); 
 
@@ -764,8 +764,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__41;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:40:7: ( '{' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:40:9: '{'
+            // InternalRoom.g:40:7: ( '{' )
+            // InternalRoom.g:40:9: '{'
             {
             match('{'); 
 
@@ -784,8 +784,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__42;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:41:7: ( '}' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:41:9: '}'
+            // InternalRoom.g:41:7: ( '}' )
+            // InternalRoom.g:41:9: '}'
             {
             match('}'); 
 
@@ -804,8 +804,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__43;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:42:7: ( ':' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:42:9: ':'
+            // InternalRoom.g:42:7: ( ':' )
+            // InternalRoom.g:42:9: ':'
             {
             match(':'); 
 
@@ -824,8 +824,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__44;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:43:7: ( 'PrimitiveType' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:43:9: 'PrimitiveType'
+            // InternalRoom.g:43:7: ( 'PrimitiveType' )
+            // InternalRoom.g:43:9: 'PrimitiveType'
             {
             match("PrimitiveType"); 
 
@@ -845,8 +845,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__45;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:44:7: ( '->' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:44:9: '->'
+            // InternalRoom.g:44:7: ( '->' )
+            // InternalRoom.g:44:9: '->'
             {
             match("->"); 
 
@@ -866,8 +866,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__46;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:45:7: ( 'default' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:45:9: 'default'
+            // InternalRoom.g:45:7: ( 'default' )
+            // InternalRoom.g:45:9: 'default'
             {
             match("default"); 
 
@@ -887,8 +887,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__47;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:46:7: ( '(' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:46:9: '('
+            // InternalRoom.g:46:7: ( '(' )
+            // InternalRoom.g:46:9: '('
             {
             match('('); 
 
@@ -907,8 +907,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__48;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:47:7: ( ')' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:47:9: ')'
+            // InternalRoom.g:47:7: ( ')' )
+            // InternalRoom.g:47:9: ')'
             {
             match(')'); 
 
@@ -927,8 +927,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__49;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:48:7: ( 'Enumeration' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:48:9: 'Enumeration'
+            // InternalRoom.g:48:7: ( 'Enumeration' )
+            // InternalRoom.g:48:9: 'Enumeration'
             {
             match("Enumeration"); 
 
@@ -948,8 +948,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__50;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:49:7: ( 'of' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:49:9: 'of'
+            // InternalRoom.g:49:7: ( 'of' )
+            // InternalRoom.g:49:9: 'of'
             {
             match("of"); 
 
@@ -969,8 +969,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__51;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:50:7: ( ',' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:50:9: ','
+            // InternalRoom.g:50:7: ( ',' )
+            // InternalRoom.g:50:9: ','
             {
             match(','); 
 
@@ -989,8 +989,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__52;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:51:7: ( '=' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:51:9: '='
+            // InternalRoom.g:51:7: ( '=' )
+            // InternalRoom.g:51:9: '='
             {
             match('='); 
 
@@ -1009,8 +1009,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__53;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:52:7: ( 'ExternalType' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:52:9: 'ExternalType'
+            // InternalRoom.g:52:7: ( 'ExternalType' )
+            // InternalRoom.g:52:9: 'ExternalType'
             {
             match("ExternalType"); 
 
@@ -1030,8 +1030,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__54;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:53:7: ( 'extends' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:53:9: 'extends'
+            // InternalRoom.g:53:7: ( 'extends' )
+            // InternalRoom.g:53:9: 'extends'
             {
             match("extends"); 
 
@@ -1051,8 +1051,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__55;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:54:7: ( 'usercode1' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:54:9: 'usercode1'
+            // InternalRoom.g:54:7: ( 'usercode1' )
+            // InternalRoom.g:54:9: 'usercode1'
             {
             match("usercode1"); 
 
@@ -1072,8 +1072,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__56;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:55:7: ( 'usercode2' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:55:9: 'usercode2'
+            // InternalRoom.g:55:7: ( 'usercode2' )
+            // InternalRoom.g:55:9: 'usercode2'
             {
             match("usercode2"); 
 
@@ -1093,8 +1093,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__57;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:56:7: ( 'usercode3' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:56:9: 'usercode3'
+            // InternalRoom.g:56:7: ( 'usercode3' )
+            // InternalRoom.g:56:9: 'usercode3'
             {
             match("usercode3"); 
 
@@ -1114,8 +1114,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__58;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:57:7: ( 'Attribute' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:57:9: 'Attribute'
+            // InternalRoom.g:57:7: ( 'Attribute' )
+            // InternalRoom.g:57:9: 'Attribute'
             {
             match("Attribute"); 
 
@@ -1135,8 +1135,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__59;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:58:7: ( '[' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:58:9: '['
+            // InternalRoom.g:58:7: ( '[' )
+            // InternalRoom.g:58:9: '['
             {
             match('['); 
 
@@ -1155,8 +1155,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__60;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:59:7: ( ']' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:59:9: ']'
+            // InternalRoom.g:59:7: ( ']' )
+            // InternalRoom.g:59:9: ']'
             {
             match(']'); 
 
@@ -1175,8 +1175,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__61;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:60:7: ( 'Operation' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:60:9: 'Operation'
+            // InternalRoom.g:60:7: ( 'Operation' )
+            // InternalRoom.g:60:9: 'Operation'
             {
             match("Operation"); 
 
@@ -1196,8 +1196,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__62;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:61:7: ( 'sends' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:61:9: 'sends'
+            // InternalRoom.g:61:7: ( 'sends' )
+            // InternalRoom.g:61:9: 'sends'
             {
             match("sends"); 
 
@@ -1217,8 +1217,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__63;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:62:7: ( 'incoming' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:62:9: 'incoming'
+            // InternalRoom.g:62:7: ( 'incoming' )
+            // InternalRoom.g:62:9: 'incoming'
             {
             match("incoming"); 
 
@@ -1238,8 +1238,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__64;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:63:7: ( 'outgoing' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:63:9: 'outgoing'
+            // InternalRoom.g:63:7: ( 'outgoing' )
+            // InternalRoom.g:63:9: 'outgoing'
             {
             match("outgoing"); 
 
@@ -1259,8 +1259,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__65;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:64:7: ( 'regular' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:64:9: 'regular'
+            // InternalRoom.g:64:7: ( 'regular' )
+            // InternalRoom.g:64:9: 'regular'
             {
             match("regular"); 
 
@@ -1280,8 +1280,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__66;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:65:7: ( 'PortClass' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:65:9: 'PortClass'
+            // InternalRoom.g:65:7: ( 'PortClass' )
+            // InternalRoom.g:65:9: 'PortClass'
             {
             match("PortClass"); 
 
@@ -1301,8 +1301,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__67;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:66:7: ( 'conjugated' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:66:9: 'conjugated'
+            // InternalRoom.g:66:7: ( 'conjugated' )
+            // InternalRoom.g:66:9: 'conjugated'
             {
             match("conjugated"); 
 
@@ -1322,8 +1322,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__68;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:67:7: ( 'SubProtocol' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:67:9: 'SubProtocol'
+            // InternalRoom.g:67:7: ( 'SubProtocol' )
+            // InternalRoom.g:67:9: 'SubProtocol'
             {
             match("SubProtocol"); 
 
@@ -1343,8 +1343,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__69;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:68:7: ( 'Message' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:68:9: 'Message'
+            // InternalRoom.g:68:7: ( 'Message' )
+            // InternalRoom.g:68:9: 'Message'
             {
             match("Message"); 
 
@@ -1364,8 +1364,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__70;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:69:7: ( 'usercode' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:69:9: 'usercode'
+            // InternalRoom.g:69:7: ( 'usercode' )
+            // InternalRoom.g:69:9: 'usercode'
             {
             match("usercode"); 
 
@@ -1385,8 +1385,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__71;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:70:7: ( 'handle' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:70:9: 'handle'
+            // InternalRoom.g:70:7: ( 'handle' )
+            // InternalRoom.g:70:9: 'handle'
             {
             match("handle"); 
 
@@ -1406,8 +1406,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__72;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:71:7: ( 'Interface' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:71:9: 'Interface'
+            // InternalRoom.g:71:7: ( 'Interface' )
+            // InternalRoom.g:71:9: 'Interface'
             {
             match("Interface"); 
 
@@ -1427,8 +1427,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__73;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:72:7: ( 'Structure' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:72:9: 'Structure'
+            // InternalRoom.g:72:7: ( 'Structure' )
+            // InternalRoom.g:72:9: 'Structure'
             {
             match("Structure"); 
 
@@ -1448,8 +1448,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__74;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:73:7: ( 'Behavior' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:73:9: 'Behavior'
+            // InternalRoom.g:73:7: ( 'Behavior' )
+            // InternalRoom.g:73:9: 'Behavior'
             {
             match("Behavior"); 
 
@@ -1469,8 +1469,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__75;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:74:7: ( 'Port' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:74:9: 'Port'
+            // InternalRoom.g:74:7: ( 'Port' )
+            // InternalRoom.g:74:9: 'Port'
             {
             match("Port"); 
 
@@ -1490,8 +1490,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__76;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:75:7: ( 'external' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:75:9: 'external'
+            // InternalRoom.g:75:7: ( 'external' )
+            // InternalRoom.g:75:9: 'external'
             {
             match("external"); 
 
@@ -1511,8 +1511,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__77;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:76:7: ( 'SAP' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:76:9: 'SAP'
+            // InternalRoom.g:76:7: ( 'SAP' )
+            // InternalRoom.g:76:9: 'SAP'
             {
             match("SAP"); 
 
@@ -1532,8 +1532,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__78;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:77:7: ( 'SPP' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:77:9: 'SPP'
+            // InternalRoom.g:77:7: ( 'SPP' )
+            // InternalRoom.g:77:9: 'SPP'
             {
             match("SPP"); 
 
@@ -1553,8 +1553,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__79;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:78:7: ( 'ServiceImplementation' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:78:9: 'ServiceImplementation'
+            // InternalRoom.g:78:7: ( 'ServiceImplementation' )
+            // InternalRoom.g:78:9: 'ServiceImplementation'
             {
             match("ServiceImplementation"); 
 
@@ -1574,8 +1574,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__80;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:79:7: ( 'SubSystemRef' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:79:9: 'SubSystemRef'
+            // InternalRoom.g:79:7: ( 'SubSystemRef' )
+            // InternalRoom.g:79:9: 'SubSystemRef'
             {
             match("SubSystemRef"); 
 
@@ -1595,8 +1595,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__81;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:80:7: ( 'LogicalThread' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:80:9: 'LogicalThread'
+            // InternalRoom.g:80:7: ( 'LogicalThread' )
+            // InternalRoom.g:80:9: 'LogicalThread'
             {
             match("LogicalThread"); 
 
@@ -1616,8 +1616,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__82;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:81:7: ( 'ActorInstanceMapping' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:81:9: 'ActorInstanceMapping'
+            // InternalRoom.g:81:7: ( 'ActorInstanceMapping' )
+            // InternalRoom.g:81:9: 'ActorInstanceMapping'
             {
             match("ActorInstanceMapping"); 
 
@@ -1637,8 +1637,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__83;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:82:7: ( '/' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:82:9: '/'
+            // InternalRoom.g:82:7: ( '/' )
+            // InternalRoom.g:82:9: '/'
             {
             match('/'); 
 
@@ -1657,8 +1657,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__84;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:83:7: ( 'Binding' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:83:9: 'Binding'
+            // InternalRoom.g:83:7: ( 'Binding' )
+            // InternalRoom.g:83:9: 'Binding'
             {
             match("Binding"); 
 
@@ -1678,8 +1678,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__85;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:84:7: ( 'and' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:84:9: 'and'
+            // InternalRoom.g:84:7: ( 'and' )
+            // InternalRoom.g:84:9: 'and'
             {
             match("and"); 
 
@@ -1699,8 +1699,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__86;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:85:7: ( '.' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:85:9: '.'
+            // InternalRoom.g:85:7: ( '.' )
+            // InternalRoom.g:85:9: '.'
             {
             match('.'); 
 
@@ -1719,8 +1719,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__87;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:86:7: ( 'sub' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:86:9: 'sub'
+            // InternalRoom.g:86:7: ( 'sub' )
+            // InternalRoom.g:86:9: 'sub'
             {
             match("sub"); 
 
@@ -1740,8 +1740,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__88;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:87:7: ( 'LayerConnection' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:87:9: 'LayerConnection'
+            // InternalRoom.g:87:7: ( 'LayerConnection' )
+            // InternalRoom.g:87:9: 'LayerConnection'
             {
             match("LayerConnection"); 
 
@@ -1761,8 +1761,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__89;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:88:7: ( 'satisfied_by' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:88:9: 'satisfied_by'
+            // InternalRoom.g:88:7: ( 'satisfied_by' )
+            // InternalRoom.g:88:9: 'satisfied_by'
             {
             match("satisfied_by"); 
 
@@ -1782,8 +1782,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__90;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:89:7: ( 'ref' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:89:9: 'ref'
+            // InternalRoom.g:89:7: ( 'ref' )
+            // InternalRoom.g:89:9: 'ref'
             {
             match("ref"); 
 
@@ -1803,8 +1803,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__91;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:90:7: ( 'relay_sap' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:90:9: 'relay_sap'
+            // InternalRoom.g:90:7: ( 'relay_sap' )
+            // InternalRoom.g:90:9: 'relay_sap'
             {
             match("relay_sap"); 
 
@@ -1824,8 +1824,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__92;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:91:7: ( 'ActorRef' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:91:9: 'ActorRef'
+            // InternalRoom.g:91:7: ( 'ActorRef' )
+            // InternalRoom.g:91:9: 'ActorRef'
             {
             match("ActorRef"); 
 
@@ -1845,8 +1845,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__93;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:92:7: ( 'StateMachine' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:92:9: 'StateMachine'
+            // InternalRoom.g:92:7: ( 'StateMachine' )
+            // InternalRoom.g:92:9: 'StateMachine'
             {
             match("StateMachine"); 
 
@@ -1866,8 +1866,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__94;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:93:7: ( 'State' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:93:9: 'State'
+            // InternalRoom.g:93:7: ( 'State' )
+            // InternalRoom.g:93:9: 'State'
             {
             match("State"); 
 
@@ -1887,8 +1887,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__95;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:94:7: ( 'entry' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:94:9: 'entry'
+            // InternalRoom.g:94:7: ( 'entry' )
+            // InternalRoom.g:94:9: 'entry'
             {
             match("entry"); 
 
@@ -1908,8 +1908,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__96;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:95:7: ( 'exit' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:95:9: 'exit'
+            // InternalRoom.g:95:7: ( 'exit' )
+            // InternalRoom.g:95:9: 'exit'
             {
             match("exit"); 
 
@@ -1929,8 +1929,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__97;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:96:7: ( 'do' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:96:9: 'do'
+            // InternalRoom.g:96:7: ( 'do' )
+            // InternalRoom.g:96:9: 'do'
             {
             match("do"); 
 
@@ -1950,8 +1950,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__98;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:97:7: ( 'subgraph' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:97:9: 'subgraph'
+            // InternalRoom.g:97:7: ( 'subgraph' )
+            // InternalRoom.g:97:9: 'subgraph'
             {
             match("subgraph"); 
 
@@ -1971,8 +1971,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__99;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:98:7: ( 'RefinedState' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:98:9: 'RefinedState'
+            // InternalRoom.g:98:7: ( 'RefinedState' )
+            // InternalRoom.g:98:9: 'RefinedState'
             {
             match("RefinedState"); 
 
@@ -1992,8 +1992,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__100;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:99:8: ( 'TransitionPoint' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:99:10: 'TransitionPoint'
+            // InternalRoom.g:99:8: ( 'TransitionPoint' )
+            // InternalRoom.g:99:10: 'TransitionPoint'
             {
             match("TransitionPoint"); 
 
@@ -2013,8 +2013,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__101;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:100:8: ( 'EntryPoint' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:100:10: 'EntryPoint'
+            // InternalRoom.g:100:8: ( 'EntryPoint' )
+            // InternalRoom.g:100:10: 'EntryPoint'
             {
             match("EntryPoint"); 
 
@@ -2034,8 +2034,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__102;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:101:8: ( 'ExitPoint' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:101:10: 'ExitPoint'
+            // InternalRoom.g:101:8: ( 'ExitPoint' )
+            // InternalRoom.g:101:10: 'ExitPoint'
             {
             match("ExitPoint"); 
 
@@ -2055,8 +2055,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__103;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:102:8: ( 'ChoicePoint' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:102:10: 'ChoicePoint'
+            // InternalRoom.g:102:8: ( 'ChoicePoint' )
+            // InternalRoom.g:102:10: 'ChoicePoint'
             {
             match("ChoicePoint"); 
 
@@ -2076,8 +2076,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__104;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:103:8: ( 'Transition' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:103:10: 'Transition'
+            // InternalRoom.g:103:8: ( 'Transition' )
+            // InternalRoom.g:103:10: 'Transition'
             {
             match("Transition"); 
 
@@ -2097,8 +2097,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__105;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:104:8: ( 'initial' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:104:10: 'initial'
+            // InternalRoom.g:104:8: ( 'initial' )
+            // InternalRoom.g:104:10: 'initial'
             {
             match("initial"); 
 
@@ -2118,8 +2118,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__106;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:105:8: ( 'action' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:105:10: 'action'
+            // InternalRoom.g:105:8: ( 'action' )
+            // InternalRoom.g:105:10: 'action'
             {
             match("action"); 
 
@@ -2139,8 +2139,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__107;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:106:8: ( 'triggers' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:106:10: 'triggers'
+            // InternalRoom.g:106:8: ( 'triggers' )
+            // InternalRoom.g:106:10: 'triggers'
             {
             match("triggers"); 
 
@@ -2160,8 +2160,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__108;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:107:8: ( 'or' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:107:10: 'or'
+            // InternalRoom.g:107:8: ( 'or' )
+            // InternalRoom.g:107:10: 'or'
             {
             match("or"); 
 
@@ -2181,8 +2181,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__109;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:108:8: ( 'guard' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:108:10: 'guard'
+            // InternalRoom.g:108:8: ( 'guard' )
+            // InternalRoom.g:108:10: 'guard'
             {
             match("guard"); 
 
@@ -2202,8 +2202,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__110;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:109:8: ( 'cond' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:109:10: 'cond'
+            // InternalRoom.g:109:8: ( 'cond' )
+            // InternalRoom.g:109:10: 'cond'
             {
             match("cond"); 
 
@@ -2223,8 +2223,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__111;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:110:8: ( 'RefinedTransition' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:110:10: 'RefinedTransition'
+            // InternalRoom.g:110:8: ( 'RefinedTransition' )
+            // InternalRoom.g:110:10: 'RefinedTransition'
             {
             match("RefinedTransition"); 
 
@@ -2244,8 +2244,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__112;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:111:8: ( 'my' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:111:10: 'my'
+            // InternalRoom.g:111:8: ( 'my' )
+            // InternalRoom.g:111:10: 'my'
             {
             match("my"); 
 
@@ -2265,8 +2265,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__113;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:112:8: ( 'cp' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:112:10: 'cp'
+            // InternalRoom.g:112:8: ( 'cp' )
+            // InternalRoom.g:112:10: 'cp'
             {
             match("cp"); 
 
@@ -2286,8 +2286,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__114;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:113:8: ( '<' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:113:10: '<'
+            // InternalRoom.g:113:8: ( '<' )
+            // InternalRoom.g:113:10: '<'
             {
             match('<'); 
 
@@ -2306,8 +2306,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__115;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:114:8: ( '>' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:114:10: '>'
+            // InternalRoom.g:114:8: ( '>' )
+            // InternalRoom.g:114:10: '>'
             {
             match('>'); 
 
@@ -2326,8 +2326,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__116;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:115:8: ( '|' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:115:10: '|'
+            // InternalRoom.g:115:8: ( '|' )
+            // InternalRoom.g:115:10: '|'
             {
             match('|'); 
 
@@ -2346,8 +2346,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__117;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:116:8: ( 'semantics' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:116:10: 'semantics'
+            // InternalRoom.g:116:8: ( 'semantics' )
+            // InternalRoom.g:116:10: 'semantics'
             {
             match("semantics"); 
 
@@ -2367,8 +2367,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__118;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:117:8: ( 'in' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:117:10: 'in'
+            // InternalRoom.g:117:8: ( 'in' )
+            // InternalRoom.g:117:10: 'in'
             {
             match("in"); 
 
@@ -2388,8 +2388,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__119;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:118:8: ( 'out' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:118:10: 'out'
+            // InternalRoom.g:118:8: ( 'out' )
+            // InternalRoom.g:118:10: 'out'
             {
             match("out"); 
 
@@ -2409,8 +2409,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__120;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:119:8: ( '@' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:119:10: '@'
+            // InternalRoom.g:119:8: ( '@' )
+            // InternalRoom.g:119:10: '@'
             {
             match('@'); 
 
@@ -2429,8 +2429,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__121;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:120:8: ( 'AnnotationType' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:120:10: 'AnnotationType'
+            // InternalRoom.g:120:8: ( 'AnnotationType' )
+            // InternalRoom.g:120:10: 'AnnotationType'
             {
             match("AnnotationType"); 
 
@@ -2450,8 +2450,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__122;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:121:8: ( 'target' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:121:10: 'target'
+            // InternalRoom.g:121:8: ( 'target' )
+            // InternalRoom.g:121:10: 'target'
             {
             match("target"); 
 
@@ -2471,8 +2471,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__123;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:122:8: ( 'attribute' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:122:10: 'attribute'
+            // InternalRoom.g:122:8: ( 'attribute' )
+            // InternalRoom.g:122:10: 'attribute'
             {
             match("attribute"); 
 
@@ -2492,8 +2492,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__124;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:123:8: ( 'import' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:123:10: 'import'
+            // InternalRoom.g:123:8: ( 'import' )
+            // InternalRoom.g:123:10: 'import'
             {
             match("import"); 
 
@@ -2513,8 +2513,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__125;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:124:8: ( 'from' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:124:10: 'from'
+            // InternalRoom.g:124:8: ( 'from' )
+            // InternalRoom.g:124:10: 'from'
             {
             match("from"); 
 
@@ -2534,8 +2534,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__126;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:125:8: ( '.*' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:125:10: '.*'
+            // InternalRoom.g:125:8: ( '.*' )
+            // InternalRoom.g:125:10: '.*'
             {
             match(".*"); 
 
@@ -2555,8 +2555,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__127;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:126:8: ( 'override' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:126:10: 'override'
+            // InternalRoom.g:126:8: ( 'override' )
+            // InternalRoom.g:126:10: 'override'
             {
             match("override"); 
 
@@ -2576,8 +2576,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__128;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:127:8: ( 'private' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:127:10: 'private'
+            // InternalRoom.g:127:8: ( 'private' )
+            // InternalRoom.g:127:10: 'private'
             {
             match("private"); 
 
@@ -2597,8 +2597,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__129;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:128:8: ( 'abstract' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:128:10: 'abstract'
+            // InternalRoom.g:128:8: ( 'abstract' )
+            // InternalRoom.g:128:10: 'abstract'
             {
             match("abstract"); 
 
@@ -2618,8 +2618,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__130;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:129:8: ( 'handler' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:129:10: 'handler'
+            // InternalRoom.g:129:8: ( 'handler' )
+            // InternalRoom.g:129:10: 'handler'
             {
             match("handler"); 
 
@@ -2639,8 +2639,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__131;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:130:8: ( 'true' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:130:10: 'true'
+            // InternalRoom.g:130:8: ( 'true' )
+            // InternalRoom.g:130:10: 'true'
             {
             match("true"); 
 
@@ -2660,10 +2660,10 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = RULE_HEX;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27680:10: ( ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+ )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27680:12: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+
+            // InternalRoom.g:27683:10: ( ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+ )
+            // InternalRoom.g:27683:12: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27680:12: ( '0x' | '0X' )
+            // InternalRoom.g:27683:12: ( '0x' | '0X' )
             int alt1=2;
             int LA1_0 = input.LA(1);
 
@@ -2691,7 +2691,7 @@ public class InternalRoomLexer extends Lexer {
             }
             switch (alt1) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27680:13: '0x'
+                    // InternalRoom.g:27683:13: '0x'
                     {
                     match("0x"); 
 
@@ -2699,7 +2699,7 @@ public class InternalRoomLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27680:18: '0X'
+                    // InternalRoom.g:27683:18: '0X'
                     {
                     match("0X"); 
 
@@ -2709,7 +2709,7 @@ public class InternalRoomLexer extends Lexer {
 
             }
 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27680:24: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+
+            // InternalRoom.g:27683:24: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+
             int cnt2=0;
             loop2:
             do {
@@ -2723,7 +2723,7 @@ public class InternalRoomLexer extends Lexer {
 
                 switch (alt2) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:
+            	    // InternalRoom.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();
@@ -2763,10 +2763,10 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = RULE_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27682:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27682:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalRoom.g:27685:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+            // InternalRoom.g:27685:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27682:11: ( '^' )?
+            // InternalRoom.g:27685:11: ( '^' )?
             int alt3=2;
             int LA3_0 = input.LA(1);
 
@@ -2775,7 +2775,7 @@ public class InternalRoomLexer extends Lexer {
             }
             switch (alt3) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27682:11: '^'
+                    // InternalRoom.g:27685:11: '^'
                     {
                     match('^'); 
 
@@ -2793,7 +2793,7 @@ public class InternalRoomLexer extends Lexer {
                 recover(mse);
                 throw mse;}
 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27682:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalRoom.g:27685:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             loop4:
             do {
                 int alt4=2;
@@ -2806,7 +2806,7 @@ public class InternalRoomLexer extends Lexer {
 
                 switch (alt4) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:
+            	    // InternalRoom.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();
@@ -2842,10 +2842,10 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = RULE_INT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27684:10: ( ( '0' .. '9' )+ )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27684:12: ( '0' .. '9' )+
+            // InternalRoom.g:27687:10: ( ( '0' .. '9' )+ )
+            // InternalRoom.g:27687:12: ( '0' .. '9' )+
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27684:12: ( '0' .. '9' )+
+            // InternalRoom.g:27687:12: ( '0' .. '9' )+
             int cnt5=0;
             loop5:
             do {
@@ -2859,7 +2859,7 @@ public class InternalRoomLexer extends Lexer {
 
                 switch (alt5) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27684:13: '0' .. '9'
+            	    // InternalRoom.g:27687:13: '0' .. '9'
             	    {
             	    matchRange('0','9'); 
 
@@ -2891,10 +2891,10 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = RULE_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27686:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27686:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalRoom.g:27689:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+            // InternalRoom.g:27689:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27686:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalRoom.g:27689:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             int alt8=2;
             int LA8_0 = input.LA(1);
 
@@ -2912,10 +2912,10 @@ public class InternalRoomLexer extends Lexer {
             }
             switch (alt8) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27686:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+                    // InternalRoom.g:27689:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
                     {
                     match('\"'); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27686:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+                    // InternalRoom.g:27689:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
                     loop6:
                     do {
                         int alt6=3;
@@ -2931,7 +2931,7 @@ public class InternalRoomLexer extends Lexer {
 
                         switch (alt6) {
                     	case 1 :
-                    	    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27686:21: '\\\\' .
+                    	    // InternalRoom.g:27689:21: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -2939,7 +2939,7 @@ public class InternalRoomLexer extends Lexer {
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27686:28: ~ ( ( '\\\\' | '\"' ) )
+                    	    // InternalRoom.g:27689:28: ~ ( ( '\\\\' | '\"' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -2964,10 +2964,10 @@ public class InternalRoomLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27686:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+                    // InternalRoom.g:27689:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
                     {
                     match('\''); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27686:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+                    // InternalRoom.g:27689:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
                     loop7:
                     do {
                         int alt7=3;
@@ -2983,7 +2983,7 @@ public class InternalRoomLexer extends Lexer {
 
                         switch (alt7) {
                     	case 1 :
-                    	    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27686:54: '\\\\' .
+                    	    // InternalRoom.g:27689:54: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -2991,7 +2991,7 @@ public class InternalRoomLexer extends Lexer {
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27686:61: ~ ( ( '\\\\' | '\\'' ) )
+                    	    // InternalRoom.g:27689:61: ~ ( ( '\\\\' | '\\'' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -3034,12 +3034,12 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = RULE_ML_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27688:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27688:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // InternalRoom.g:27691:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // InternalRoom.g:27691:19: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); 
 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27688:24: ( options {greedy=false; } : . )*
+            // InternalRoom.g:27691:24: ( options {greedy=false; } : . )*
             loop9:
             do {
                 int alt9=2;
@@ -3064,7 +3064,7 @@ public class InternalRoomLexer extends Lexer {
 
                 switch (alt9) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27688:52: .
+            	    // InternalRoom.g:27691:52: .
             	    {
             	    matchAny(); 
 
@@ -3094,12 +3094,12 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = RULE_SL_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27690:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27690:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // InternalRoom.g:27693:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // InternalRoom.g:27693:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
             {
             match("//"); 
 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27690:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            // InternalRoom.g:27693:24: (~ ( ( '\\n' | '\\r' ) ) )*
             loop10:
             do {
                 int alt10=2;
@@ -3112,7 +3112,7 @@ public class InternalRoomLexer extends Lexer {
 
                 switch (alt10) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27690:24: ~ ( ( '\\n' | '\\r' ) )
+            	    // InternalRoom.g:27693: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();
@@ -3132,7 +3132,7 @@ public class InternalRoomLexer extends Lexer {
                 }
             } while (true);
 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27690:40: ( ( '\\r' )? '\\n' )?
+            // InternalRoom.g:27693:40: ( ( '\\r' )? '\\n' )?
             int alt12=2;
             int LA12_0 = input.LA(1);
 
@@ -3141,9 +3141,9 @@ public class InternalRoomLexer extends Lexer {
             }
             switch (alt12) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27690:41: ( '\\r' )? '\\n'
+                    // InternalRoom.g:27693:41: ( '\\r' )? '\\n'
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27690:41: ( '\\r' )?
+                    // InternalRoom.g:27693:41: ( '\\r' )?
                     int alt11=2;
                     int LA11_0 = input.LA(1);
 
@@ -3152,7 +3152,7 @@ public class InternalRoomLexer extends Lexer {
                     }
                     switch (alt11) {
                         case 1 :
-                            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27690:41: '\\r'
+                            // InternalRoom.g:27693:41: '\\r'
                             {
                             match('\r'); 
 
@@ -3184,10 +3184,10 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = RULE_WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27692:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27692:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalRoom.g:27695:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // InternalRoom.g:27695:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27692:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalRoom.g:27695:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             int cnt13=0;
             loop13:
             do {
@@ -3201,7 +3201,7 @@ public class InternalRoomLexer extends Lexer {
 
                 switch (alt13) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:
+            	    // InternalRoom.g:
             	    {
             	    if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) {
             	        input.consume();
@@ -3241,8 +3241,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = RULE_ANY_OTHER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27694:16: ( . )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27694:18: .
+            // InternalRoom.g:27697:16: ( . )
+            // InternalRoom.g:27697:18: .
             {
             matchAny(); 
 
@@ -3257,901 +3257,901 @@ public class InternalRoomLexer extends Lexer {
     // $ANTLR end "RULE_ANY_OTHER"
 
     public void mTokens() throws RecognitionException {
-        // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.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 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | T__85 | T__86 | T__87 | T__88 | T__89 | T__90 | T__91 | T__92 | T__93 | T__94 | T__95 | T__96 | T__97 | T__98 | T__99 | T__100 | T__101 | T__102 | T__103 | T__104 | T__105 | T__106 | T__107 | T__108 | T__109 | T__110 | T__111 | T__112 | T__113 | T__114 | T__115 | T__116 | T__117 | T__118 | T__119 | T__120 | T__121 | T__122 | T__123 | T__124 | T__125 | T__126 | T__127 | T__128 | T__129 | T__130 | T__131 | RULE_HEX | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+        // InternalRoom.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 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | T__85 | T__86 | T__87 | T__88 | T__89 | T__90 | T__91 | T__92 | T__93 | T__94 | T__95 | T__96 | T__97 | T__98 | T__99 | T__100 | T__101 | T__102 | T__103 | T__104 | T__105 | T__106 | T__107 | T__108 | T__109 | T__110 | T__111 | T__112 | T__113 | T__114 | T__115 | T__116 | T__117 | T__118 | T__119 | T__120 | T__121 | T__122 | T__123 | T__124 | T__125 | T__126 | T__127 | T__128 | T__129 | T__130 | T__131 | RULE_HEX | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
         int alt14=128;
         alt14 = dfa14.predict(input);
         switch (alt14) {
             case 1 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:10: T__12
+                // InternalRoom.g:1:10: T__12
                 {
                 mT__12(); 
 
                 }
                 break;
             case 2 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:16: T__13
+                // InternalRoom.g:1:16: T__13
                 {
                 mT__13(); 
 
                 }
                 break;
             case 3 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:22: T__14
+                // InternalRoom.g:1:22: T__14
                 {
                 mT__14(); 
 
                 }
                 break;
             case 4 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:28: T__15
+                // InternalRoom.g:1:28: T__15
                 {
                 mT__15(); 
 
                 }
                 break;
             case 5 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:34: T__16
+                // InternalRoom.g:1:34: T__16
                 {
                 mT__16(); 
 
                 }
                 break;
             case 6 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:40: T__17
+                // InternalRoom.g:1:40: T__17
                 {
                 mT__17(); 
 
                 }
                 break;
             case 7 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:46: T__18
+                // InternalRoom.g:1:46: T__18
                 {
                 mT__18(); 
 
                 }
                 break;
             case 8 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:52: T__19
+                // InternalRoom.g:1:52: T__19
                 {
                 mT__19(); 
 
                 }
                 break;
             case 9 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:58: T__20
+                // InternalRoom.g:1:58: T__20
                 {
                 mT__20(); 
 
                 }
                 break;
             case 10 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:64: T__21
+                // InternalRoom.g:1:64: T__21
                 {
                 mT__21(); 
 
                 }
                 break;
             case 11 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:70: T__22
+                // InternalRoom.g:1:70: T__22
                 {
                 mT__22(); 
 
                 }
                 break;
             case 12 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:76: T__23
+                // InternalRoom.g:1:76: T__23
                 {
                 mT__23(); 
 
                 }
                 break;
             case 13 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:82: T__24
+                // InternalRoom.g:1:82: T__24
                 {
                 mT__24(); 
 
                 }
                 break;
             case 14 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:88: T__25
+                // InternalRoom.g:1:88: T__25
                 {
                 mT__25(); 
 
                 }
                 break;
             case 15 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:94: T__26
+                // InternalRoom.g:1:94: T__26
                 {
                 mT__26(); 
 
                 }
                 break;
             case 16 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:100: T__27
+                // InternalRoom.g:1:100: T__27
                 {
                 mT__27(); 
 
                 }
                 break;
             case 17 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:106: T__28
+                // InternalRoom.g:1:106: T__28
                 {
                 mT__28(); 
 
                 }
                 break;
             case 18 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:112: T__29
+                // InternalRoom.g:1:112: T__29
                 {
                 mT__29(); 
 
                 }
                 break;
             case 19 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:118: T__30
+                // InternalRoom.g:1:118: T__30
                 {
                 mT__30(); 
 
                 }
                 break;
             case 20 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:124: T__31
+                // InternalRoom.g:1:124: T__31
                 {
                 mT__31(); 
 
                 }
                 break;
             case 21 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:130: T__32
+                // InternalRoom.g:1:130: T__32
                 {
                 mT__32(); 
 
                 }
                 break;
             case 22 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:136: T__33
+                // InternalRoom.g:1:136: T__33
                 {
                 mT__33(); 
 
                 }
                 break;
             case 23 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:142: T__34
+                // InternalRoom.g:1:142: T__34
                 {
                 mT__34(); 
 
                 }
                 break;
             case 24 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:148: T__35
+                // InternalRoom.g:1:148: T__35
                 {
                 mT__35(); 
 
                 }
                 break;
             case 25 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:154: T__36
+                // InternalRoom.g:1:154: T__36
                 {
                 mT__36(); 
 
                 }
                 break;
             case 26 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:160: T__37
+                // InternalRoom.g:1:160: T__37
                 {
                 mT__37(); 
 
                 }
                 break;
             case 27 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:166: T__38
+                // InternalRoom.g:1:166: T__38
                 {
                 mT__38(); 
 
                 }
                 break;
             case 28 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:172: T__39
+                // InternalRoom.g:1:172: T__39
                 {
                 mT__39(); 
 
                 }
                 break;
             case 29 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:178: T__40
+                // InternalRoom.g:1:178: T__40
                 {
                 mT__40(); 
 
                 }
                 break;
             case 30 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:184: T__41
+                // InternalRoom.g:1:184: T__41
                 {
                 mT__41(); 
 
                 }
                 break;
             case 31 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:190: T__42
+                // InternalRoom.g:1:190: T__42
                 {
                 mT__42(); 
 
                 }
                 break;
             case 32 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:196: T__43
+                // InternalRoom.g:1:196: T__43
                 {
                 mT__43(); 
 
                 }
                 break;
             case 33 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:202: T__44
+                // InternalRoom.g:1:202: T__44
                 {
                 mT__44(); 
 
                 }
                 break;
             case 34 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:208: T__45
+                // InternalRoom.g:1:208: T__45
                 {
                 mT__45(); 
 
                 }
                 break;
             case 35 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:214: T__46
+                // InternalRoom.g:1:214: T__46
                 {
                 mT__46(); 
 
                 }
                 break;
             case 36 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:220: T__47
+                // InternalRoom.g:1:220: T__47
                 {
                 mT__47(); 
 
                 }
                 break;
             case 37 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:226: T__48
+                // InternalRoom.g:1:226: T__48
                 {
                 mT__48(); 
 
                 }
                 break;
             case 38 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:232: T__49
+                // InternalRoom.g:1:232: T__49
                 {
                 mT__49(); 
 
                 }
                 break;
             case 39 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:238: T__50
+                // InternalRoom.g:1:238: T__50
                 {
                 mT__50(); 
 
                 }
                 break;
             case 40 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:244: T__51
+                // InternalRoom.g:1:244: T__51
                 {
                 mT__51(); 
 
                 }
                 break;
             case 41 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:250: T__52
+                // InternalRoom.g:1:250: T__52
                 {
                 mT__52(); 
 
                 }
                 break;
             case 42 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:256: T__53
+                // InternalRoom.g:1:256: T__53
                 {
                 mT__53(); 
 
                 }
                 break;
             case 43 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:262: T__54
+                // InternalRoom.g:1:262: T__54
                 {
                 mT__54(); 
 
                 }
                 break;
             case 44 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:268: T__55
+                // InternalRoom.g:1:268: T__55
                 {
                 mT__55(); 
 
                 }
                 break;
             case 45 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:274: T__56
+                // InternalRoom.g:1:274: T__56
                 {
                 mT__56(); 
 
                 }
                 break;
             case 46 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:280: T__57
+                // InternalRoom.g:1:280: T__57
                 {
                 mT__57(); 
 
                 }
                 break;
             case 47 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:286: T__58
+                // InternalRoom.g:1:286: T__58
                 {
                 mT__58(); 
 
                 }
                 break;
             case 48 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:292: T__59
+                // InternalRoom.g:1:292: T__59
                 {
                 mT__59(); 
 
                 }
                 break;
             case 49 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:298: T__60
+                // InternalRoom.g:1:298: T__60
                 {
                 mT__60(); 
 
                 }
                 break;
             case 50 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:304: T__61
+                // InternalRoom.g:1:304: T__61
                 {
                 mT__61(); 
 
                 }
                 break;
             case 51 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:310: T__62
+                // InternalRoom.g:1:310: T__62
                 {
                 mT__62(); 
 
                 }
                 break;
             case 52 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:316: T__63
+                // InternalRoom.g:1:316: T__63
                 {
                 mT__63(); 
 
                 }
                 break;
             case 53 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:322: T__64
+                // InternalRoom.g:1:322: T__64
                 {
                 mT__64(); 
 
                 }
                 break;
             case 54 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:328: T__65
+                // InternalRoom.g:1:328: T__65
                 {
                 mT__65(); 
 
                 }
                 break;
             case 55 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:334: T__66
+                // InternalRoom.g:1:334: T__66
                 {
                 mT__66(); 
 
                 }
                 break;
             case 56 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:340: T__67
+                // InternalRoom.g:1:340: T__67
                 {
                 mT__67(); 
 
                 }
                 break;
             case 57 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:346: T__68
+                // InternalRoom.g:1:346: T__68
                 {
                 mT__68(); 
 
                 }
                 break;
             case 58 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:352: T__69
+                // InternalRoom.g:1:352: T__69
                 {
                 mT__69(); 
 
                 }
                 break;
             case 59 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:358: T__70
+                // InternalRoom.g:1:358: T__70
                 {
                 mT__70(); 
 
                 }
                 break;
             case 60 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:364: T__71
+                // InternalRoom.g:1:364: T__71
                 {
                 mT__71(); 
 
                 }
                 break;
             case 61 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:370: T__72
+                // InternalRoom.g:1:370: T__72
                 {
                 mT__72(); 
 
                 }
                 break;
             case 62 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:376: T__73
+                // InternalRoom.g:1:376: T__73
                 {
                 mT__73(); 
 
                 }
                 break;
             case 63 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:382: T__74
+                // InternalRoom.g:1:382: T__74
                 {
                 mT__74(); 
 
                 }
                 break;
             case 64 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:388: T__75
+                // InternalRoom.g:1:388: T__75
                 {
                 mT__75(); 
 
                 }
                 break;
             case 65 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:394: T__76
+                // InternalRoom.g:1:394: T__76
                 {
                 mT__76(); 
 
                 }
                 break;
             case 66 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:400: T__77
+                // InternalRoom.g:1:400: T__77
                 {
                 mT__77(); 
 
                 }
                 break;
             case 67 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:406: T__78
+                // InternalRoom.g:1:406: T__78
                 {
                 mT__78(); 
 
                 }
                 break;
             case 68 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:412: T__79
+                // InternalRoom.g:1:412: T__79
                 {
                 mT__79(); 
 
                 }
                 break;
             case 69 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:418: T__80
+                // InternalRoom.g:1:418: T__80
                 {
                 mT__80(); 
 
                 }
                 break;
             case 70 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:424: T__81
+                // InternalRoom.g:1:424: T__81
                 {
                 mT__81(); 
 
                 }
                 break;
             case 71 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:430: T__82
+                // InternalRoom.g:1:430: T__82
                 {
                 mT__82(); 
 
                 }
                 break;
             case 72 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:436: T__83
+                // InternalRoom.g:1:436: T__83
                 {
                 mT__83(); 
 
                 }
                 break;
             case 73 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:442: T__84
+                // InternalRoom.g:1:442: T__84
                 {
                 mT__84(); 
 
                 }
                 break;
             case 74 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:448: T__85
+                // InternalRoom.g:1:448: T__85
                 {
                 mT__85(); 
 
                 }
                 break;
             case 75 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:454: T__86
+                // InternalRoom.g:1:454: T__86
                 {
                 mT__86(); 
 
                 }
                 break;
             case 76 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:460: T__87
+                // InternalRoom.g:1:460: T__87
                 {
                 mT__87(); 
 
                 }
                 break;
             case 77 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:466: T__88
+                // InternalRoom.g:1:466: T__88
                 {
                 mT__88(); 
 
                 }
                 break;
             case 78 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:472: T__89
+                // InternalRoom.g:1:472: T__89
                 {
                 mT__89(); 
 
                 }
                 break;
             case 79 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:478: T__90
+                // InternalRoom.g:1:478: T__90
                 {
                 mT__90(); 
 
                 }
                 break;
             case 80 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:484: T__91
+                // InternalRoom.g:1:484: T__91
                 {
                 mT__91(); 
 
                 }
                 break;
             case 81 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:490: T__92
+                // InternalRoom.g:1:490: T__92
                 {
                 mT__92(); 
 
                 }
                 break;
             case 82 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:496: T__93
+                // InternalRoom.g:1:496: T__93
                 {
                 mT__93(); 
 
                 }
                 break;
             case 83 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:502: T__94
+                // InternalRoom.g:1:502: T__94
                 {
                 mT__94(); 
 
                 }
                 break;
             case 84 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:508: T__95
+                // InternalRoom.g:1:508: T__95
                 {
                 mT__95(); 
 
                 }
                 break;
             case 85 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:514: T__96
+                // InternalRoom.g:1:514: T__96
                 {
                 mT__96(); 
 
                 }
                 break;
             case 86 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:520: T__97
+                // InternalRoom.g:1:520: T__97
                 {
                 mT__97(); 
 
                 }
                 break;
             case 87 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:526: T__98
+                // InternalRoom.g:1:526: T__98
                 {
                 mT__98(); 
 
                 }
                 break;
             case 88 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:532: T__99
+                // InternalRoom.g:1:532: T__99
                 {
                 mT__99(); 
 
                 }
                 break;
             case 89 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:538: T__100
+                // InternalRoom.g:1:538: T__100
                 {
                 mT__100(); 
 
                 }
                 break;
             case 90 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:545: T__101
+                // InternalRoom.g:1:545: T__101
                 {
                 mT__101(); 
 
                 }
                 break;
             case 91 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:552: T__102
+                // InternalRoom.g:1:552: T__102
                 {
                 mT__102(); 
 
                 }
                 break;
             case 92 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:559: T__103
+                // InternalRoom.g:1:559: T__103
                 {
                 mT__103(); 
 
                 }
                 break;
             case 93 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:566: T__104
+                // InternalRoom.g:1:566: T__104
                 {
                 mT__104(); 
 
                 }
                 break;
             case 94 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:573: T__105
+                // InternalRoom.g:1:573: T__105
                 {
                 mT__105(); 
 
                 }
                 break;
             case 95 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:580: T__106
+                // InternalRoom.g:1:580: T__106
                 {
                 mT__106(); 
 
                 }
                 break;
             case 96 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:587: T__107
+                // InternalRoom.g:1:587: T__107
                 {
                 mT__107(); 
 
                 }
                 break;
             case 97 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:594: T__108
+                // InternalRoom.g:1:594: T__108
                 {
                 mT__108(); 
 
                 }
                 break;
             case 98 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:601: T__109
+                // InternalRoom.g:1:601: T__109
                 {
                 mT__109(); 
 
                 }
                 break;
             case 99 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:608: T__110
+                // InternalRoom.g:1:608: T__110
                 {
                 mT__110(); 
 
                 }
                 break;
             case 100 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:615: T__111
+                // InternalRoom.g:1:615: T__111
                 {
                 mT__111(); 
 
                 }
                 break;
             case 101 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:622: T__112
+                // InternalRoom.g:1:622: T__112
                 {
                 mT__112(); 
 
                 }
                 break;
             case 102 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:629: T__113
+                // InternalRoom.g:1:629: T__113
                 {
                 mT__113(); 
 
                 }
                 break;
             case 103 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:636: T__114
+                // InternalRoom.g:1:636: T__114
                 {
                 mT__114(); 
 
                 }
                 break;
             case 104 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:643: T__115
+                // InternalRoom.g:1:643: T__115
                 {
                 mT__115(); 
 
                 }
                 break;
             case 105 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:650: T__116
+                // InternalRoom.g:1:650: T__116
                 {
                 mT__116(); 
 
                 }
                 break;
             case 106 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:657: T__117
+                // InternalRoom.g:1:657: T__117
                 {
                 mT__117(); 
 
                 }
                 break;
             case 107 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:664: T__118
+                // InternalRoom.g:1:664: T__118
                 {
                 mT__118(); 
 
                 }
                 break;
             case 108 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:671: T__119
+                // InternalRoom.g:1:671: T__119
                 {
                 mT__119(); 
 
                 }
                 break;
             case 109 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:678: T__120
+                // InternalRoom.g:1:678: T__120
                 {
                 mT__120(); 
 
                 }
                 break;
             case 110 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:685: T__121
+                // InternalRoom.g:1:685: T__121
                 {
                 mT__121(); 
 
                 }
                 break;
             case 111 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:692: T__122
+                // InternalRoom.g:1:692: T__122
                 {
                 mT__122(); 
 
                 }
                 break;
             case 112 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:699: T__123
+                // InternalRoom.g:1:699: T__123
                 {
                 mT__123(); 
 
                 }
                 break;
             case 113 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:706: T__124
+                // InternalRoom.g:1:706: T__124
                 {
                 mT__124(); 
 
                 }
                 break;
             case 114 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:713: T__125
+                // InternalRoom.g:1:713: T__125
                 {
                 mT__125(); 
 
                 }
                 break;
             case 115 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:720: T__126
+                // InternalRoom.g:1:720: T__126
                 {
                 mT__126(); 
 
                 }
                 break;
             case 116 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:727: T__127
+                // InternalRoom.g:1:727: T__127
                 {
                 mT__127(); 
 
                 }
                 break;
             case 117 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:734: T__128
+                // InternalRoom.g:1:734: T__128
                 {
                 mT__128(); 
 
                 }
                 break;
             case 118 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:741: T__129
+                // InternalRoom.g:1:741: T__129
                 {
                 mT__129(); 
 
                 }
                 break;
             case 119 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:748: T__130
+                // InternalRoom.g:1:748: T__130
                 {
                 mT__130(); 
 
                 }
                 break;
             case 120 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:755: T__131
+                // InternalRoom.g:1:755: T__131
                 {
                 mT__131(); 
 
                 }
                 break;
             case 121 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:762: RULE_HEX
+                // InternalRoom.g:1:762: RULE_HEX
                 {
                 mRULE_HEX(); 
 
                 }
                 break;
             case 122 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:771: RULE_ID
+                // InternalRoom.g:1:771: RULE_ID
                 {
                 mRULE_ID(); 
 
                 }
                 break;
             case 123 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:779: RULE_INT
+                // InternalRoom.g:1:779: RULE_INT
                 {
                 mRULE_INT(); 
 
                 }
                 break;
             case 124 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:788: RULE_STRING
+                // InternalRoom.g:1:788: RULE_STRING
                 {
                 mRULE_STRING(); 
 
                 }
                 break;
             case 125 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:800: RULE_ML_COMMENT
+                // InternalRoom.g:1:800: RULE_ML_COMMENT
                 {
                 mRULE_ML_COMMENT(); 
 
                 }
                 break;
             case 126 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:816: RULE_SL_COMMENT
+                // InternalRoom.g:1:816: RULE_SL_COMMENT
                 {
                 mRULE_SL_COMMENT(); 
 
                 }
                 break;
             case 127 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:832: RULE_WS
+                // InternalRoom.g:1:832: RULE_WS
                 {
                 mRULE_WS(); 
 
                 }
                 break;
             case 128 :
-                // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1:840: RULE_ANY_OTHER
+                // InternalRoom.g:1:840: RULE_ANY_OTHER
                 {
                 mRULE_ANY_OTHER(); 
 
@@ -4165,211 +4165,19 @@ public class InternalRoomLexer extends Lexer {
 
     protected DFA14 dfa14 = new DFA14(this);
     static final String DFA14_eotS =
-        "\1\uffff\3\71\1\uffff\10\71\1\uffff\1\131\1\135\1\140\5\71\7\uffff"+
-        "\1\71\2\uffff\7\71\1\u0088\1\u008a\3\71\4\uffff\1\u0094\1\67\2\uffff"+
-        "\2\67\2\uffff\1\71\1\uffff\2\71\1\u009a\3\71\1\u009e\1\uffff\21"+
-        "\71\1\u00b2\3\71\3\uffff\3\71\1\uffff\2\71\1\uffff\5\71\1\u00c4"+
-        "\1\71\1\u00c6\12\71\7\uffff\1\71\2\uffff\1\71\1\u00d8\7\71\5\uffff"+
-        "\4\71\10\uffff\3\71\1\uffff\3\71\1\uffff\14\71\1\u00fb\1\u00fc\5"+
-        "\71\1\uffff\16\71\1\u0111\2\71\1\uffff\1\u0115\1\uffff\2\71\1\u0118"+
-        "\16\71\1\uffff\2\71\1\u0129\13\71\1\u0135\1\u0136\1\71\1\u0138\1"+
-        "\u0139\10\71\1\u0143\6\71\2\uffff\7\71\1\u0151\2\71\1\u0155\5\71"+
-        "\1\u015b\3\71\1\uffff\3\71\1\uffff\2\71\1\uffff\20\71\1\uffff\10"+
-        "\71\1\u017c\2\71\2\uffff\1\71\2\uffff\11\71\1\uffff\5\71\1\u0192"+
-        "\4\71\1\u0197\1\u0198\1\u0199\1\uffff\3\71\1\uffff\1\u019d\4\71"+
-        "\1\uffff\1\u01a2\6\71\1\u01a9\30\71\1\uffff\1\71\1\u01c3\23\71\1"+
-        "\uffff\4\71\3\uffff\3\71\1\uffff\4\71\1\uffff\6\71\1\uffff\1\u01e8"+
-        "\4\71\1\u01ed\10\71\1\u01f6\3\71\1\u01fb\5\71\1\u0201\1\uffff\2"+
-        "\71\1\u0204\25\71\1\u021b\13\71\1\uffff\4\71\1\uffff\1\71\1\u022c"+
-        "\5\71\1\u0233\1\uffff\1\u0234\1\71\1\u0236\1\u0237\1\uffff\2\71"+
-        "\1\u023a\2\71\1\uffff\2\71\1\uffff\4\71\1\u0243\21\71\1\uffff\1"+
-        "\u0255\5\71\1\u025b\1\71\1\u025d\1\u025e\1\u025f\1\71\1\u0261\3"+
-        "\71\1\uffff\3\71\1\u026b\1\71\1\u026d\2\uffff\1\71\2\uffff\1\71"+
-        "\1\u0270\1\uffff\1\71\1\u0272\2\71\1\u0275\3\71\1\uffff\1\u0279"+
-        "\3\71\1\u027d\4\71\1\u0283\5\71\1\u0289\1\71\1\uffff\3\71\1\u028e"+
-        "\1\u028f\1\uffff\1\71\3\uffff\1\u0291\1\uffff\1\u0292\1\u0293\1"+
-        "\71\1\u0295\2\71\1\u0298\1\u0299\1\u029a\1\uffff\1\u029b\1\uffff"+
-        "\1\u029c\1\u029d\1\uffff\1\71\1\uffff\1\u029f\1\u02a0\1\uffff\1"+
-        "\u02a1\2\71\1\uffff\3\71\1\uffff\5\71\1\uffff\5\71\1\uffff\2\71"+
-        "\1\u02b3\1\71\2\uffff\1\71\3\uffff\1\71\1\uffff\2\71\6\uffff\1\u02ba"+
-        "\3\uffff\6\71\1\u02c1\2\71\1\u02c4\5\71\1\u02ca\1\u02cb\1\uffff"+
-        "\2\71\1\u02ce\3\71\1\uffff\6\71\1\uffff\1\71\1\u02d9\1\uffff\1\u02da"+
-        "\4\71\2\uffff\1\u02df\1\u02e0\1\uffff\1\u02e1\2\71\1\u02e4\2\71"+
-        "\1\u02e7\1\u02e8\2\71\2\uffff\1\71\1\u02ec\1\u02ed\1\71\3\uffff"+
-        "\2\71\1\uffff\1\71\1\u02f2\2\uffff\1\71\1\u02f4\1\71\2\uffff\4\71"+
-        "\1\uffff\1\71\1\uffff\1\71\1\u02fc\1\71\1\u02fe\3\71\1\uffff\1\71"+
-        "\1\uffff\3\71\1\u0306\3\71\1\uffff\3\71\1\u030d\2\71\1\uffff\1\u0310"+
-        "\1\u0311\2\uffff";
+        "\1\uffff\3\71\1\uffff\10\71\1\uffff\1\131\1\135\1\140\5\71\7\uffff\1\71\2\uffff\7\71\1\u0088\1\u008a\3\71\4\uffff\1\u0094\1\67\2\uffff\2\67\2\uffff\1\71\1\uffff\2\71\1\u009a\3\71\1\u009e\1\uffff\21\71\1\u00b2\3\71\3\uffff\3\71\1\uffff\2\71\1\uffff\5\71\1\u00c4\1\71\1\u00c6\12\71\7\uffff\1\71\2\uffff\1\71\1\u00d8\7\71\5\uffff\4\71\10\uffff\3\71\1\uffff\3\71\1\uffff\14\71\1\u00fb\1\u00fc\5\71\1\uffff\16\71\1\u0111\2\71\1\uffff\1\u0115\1\uffff\2\71\1\u0118\16\71\1\uffff\2\71\1\u0129\13\71\1\u0135\1\u0136\1\71\1\u0138\1\u0139\10\71\1\u0143\6\71\2\uffff\7\71\1\u0151\2\71\1\u0155\5\71\1\u015b\3\71\1\uffff\3\71\1\uffff\2\71\1\uffff\20\71\1\uffff\10\71\1\u017c\2\71\2\uffff\1\71\2\uffff\11\71\1\uffff\5\71\1\u0192\4\71\1\u0197\1\u0198\1\u0199\1\uffff\3\71\1\uffff\1\u019d\4\71\1\uffff\1\u01a2\6\71\1\u01a9\30\71\1\uffff\1\71\1\u01c3\23\71\1\uffff\4\71\3\uffff\3\71\1\uffff\4\71\1\uffff\6\71\1\uffff\1\u01e8\4\71\1\u01ed\10\71\1\u01f6\3\71\1\u01fb\5\71\1\u0201\1\uffff\2\71\1\u0204\25\71\1\u021b\13\71\1\uffff\4\71\1\uffff\1\71\1\u022c\5\71\1\u0233\1\uffff\1\u0234\1\71\1\u0236\1\u0237\1\uffff\2\71\1\u023a\2\71\1\uffff\2\71\1\uffff\4\71\1\u0243\21\71\1\uffff\1\u0255\5\71\1\u025b\1\71\1\u025d\1\u025e\1\u025f\1\71\1\u0261\3\71\1\uffff\3\71\1\u026b\1\71\1\u026d\2\uffff\1\71\2\uffff\1\71\1\u0270\1\uffff\1\71\1\u0272\2\71\1\u0275\3\71\1\uffff\1\u0279\3\71\1\u027d\4\71\1\u0283\5\71\1\u0289\1\71\1\uffff\3\71\1\u028e\1\u028f\1\uffff\1\71\3\uffff\1\u0291\1\uffff\1\u0292\1\u0293\1\71\1\u0295\2\71\1\u0298\1\u0299\1\u029a\1\uffff\1\u029b\1\uffff\1\u029c\1\u029d\1\uffff\1\71\1\uffff\1\u029f\1\u02a0\1\uffff\1\u02a1\2\71\1\uffff\3\71\1\uffff\5\71\1\uffff\5\71\1\uffff\2\71\1\u02b3\1\71\2\uffff\1\71\3\uffff\1\71\1\uffff\2\71\6\uffff\1\u02ba\3\uffff\6\71\1\u02c1\2\71\1\u02c4\5\71\1\u02ca\1\u02cb\1\uffff\2\71\1\u02ce\3\71\1\uffff\6\71\1\uffff\1\71\1\u02d9\1\uffff\1\u02da\4\71\2\uffff\1\u02df\1\u02e0\1\uffff\1\u02e1\2\71\1\u02e4\2\71\1\u02e7\1\u02e8\2\71\2\uffff\1\71\1\u02ec\1\u02ed\1\71\3\uffff\2\71\1\uffff\1\71\1\u02f2\2\uffff\1\71\1\u02f4\1\71\2\uffff\4\71\1\uffff\1\71\1\uffff\1\71\1\u02fc\1\71\1\u02fe\3\71\1\uffff\1\71\1\uffff\3\71\1\u0306\3\71\1\uffff\3\71\1\u030d\2\71\1\uffff\1\u0310\1\u0311\2\uffff";
     static final String DFA14_eofS =
         "\u0312\uffff";
     static final String DFA14_minS =
-        "\1\0\2\157\1\141\1\uffff\1\141\1\143\1\157\1\150\1\101\3\141\1"+
-        "\uffff\1\76\2\60\1\141\1\146\1\142\1\162\1\145\7\uffff\1\163\2\uffff"+
-        "\1\160\1\155\2\145\1\141\1\156\1\145\2\52\1\162\1\141\1\165\4\uffff"+
-        "\1\130\1\101\2\uffff\2\0\2\uffff\1\151\1\uffff\1\157\1\156\1\60"+
-        "\1\157\1\164\1\146\1\60\1\uffff\3\164\1\156\1\151\1\162\1\155\1"+
-        "\157\1\142\1\141\2\120\1\162\1\147\1\171\1\156\1\144\1\60\1\154"+
-        "\1\170\1\157\3\uffff\1\145\1\151\1\164\1\uffff\1\164\1\151\1\uffff"+
-        "\1\156\1\155\1\142\2\164\1\60\1\164\1\60\1\145\1\171\1\144\2\164"+
-        "\1\163\1\102\1\151\1\157\1\146\7\uffff\1\145\2\uffff\1\145\1\60"+
-        "\1\160\1\146\1\163\1\156\1\164\1\150\1\156\5\uffff\1\141\1\151\1"+
-        "\162\1\141\10\uffff\1\144\1\162\1\144\1\uffff\1\162\2\141\1\uffff"+
-        "\1\141\1\157\1\162\1\157\1\164\1\155\1\164\1\160\1\151\1\120\1\165"+
-        "\1\164\2\60\1\166\1\151\1\145\1\144\1\145\1\uffff\1\163\1\145\1"+
-        "\155\1\156\1\145\1\164\1\162\1\155\1\162\1\145\1\164\1\143\1\144"+
-        "\1\141\1\60\2\151\1\uffff\1\60\1\uffff\1\162\1\156\1\60\1\151\1"+
-        "\162\1\164\1\157\1\156\1\145\1\150\1\166\1\155\1\151\2\162\1\157"+
-        "\1\164\1\uffff\1\157\1\165\1\60\1\141\1\163\1\144\1\145\1\141\1"+
-        "\144\1\156\1\147\1\145\1\147\1\162\2\60\1\165\2\60\1\144\1\165\1"+
-        "\103\1\162\1\151\1\164\1\157\1\151\1\60\1\157\1\143\1\171\1\162"+
-        "\1\143\1\145\2\uffff\1\151\1\143\1\162\1\141\1\154\1\145\1\144\1"+
-        "\60\1\164\1\156\1\60\1\171\1\145\1\171\1\162\1\120\1\60\1\163\1"+
-        "\156\1\162\1\uffff\1\163\2\157\1\uffff\1\162\1\143\1\uffff\1\157"+
-        "\1\151\1\162\1\157\1\164\3\141\1\115\1\156\1\143\1\141\1\155\1\151"+
-        "\1\162\1\154\1\uffff\1\171\1\141\1\154\1\162\1\166\1\151\1\163\1"+
-        "\147\1\60\1\145\1\144\2\uffff\1\147\2\uffff\1\162\2\154\1\102\1"+
-        "\142\1\141\1\143\1\164\1\154\1\uffff\1\165\1\145\1\163\1\157\1\164"+
-        "\1\60\1\143\1\141\1\103\1\164\3\60\1\uffff\2\144\1\156\1\uffff\1"+
-        "\60\1\162\1\120\1\156\1\157\1\uffff\1\60\1\164\1\141\1\146\1\156"+
-        "\2\151\1\60\1\156\1\142\1\141\1\154\1\145\1\154\1\162\1\164\1\157"+
-        "\1\145\1\157\1\164\1\151\1\141\1\164\1\141\1\137\1\147\1\145\1\146"+
-        "\1\151\1\156\1\151\1\145\1\uffff\1\164\1\60\1\141\1\151\1\164\1"+
-        "\141\1\154\1\145\1\156\1\145\1\165\1\164\1\157\1\151\1\141\1\156"+
-        "\1\120\2\164\1\165\1\141\1\uffff\1\145\1\154\2\157\3\uffff\1\162"+
-        "\1\163\1\141\1\uffff\1\141\1\157\1\141\1\151\1\uffff\1\151\1\160"+
-        "\1\151\1\141\1\156\1\144\1\uffff\1\60\1\165\1\143\1\145\1\147\1"+
-        "\60\1\141\1\145\3\144\1\151\1\156\1\154\1\60\1\162\1\163\1\145\1"+
-        "\60\1\141\1\157\1\147\1\164\1\162\1\60\1\uffff\1\164\1\166\1\60"+
-        "\1\163\1\141\1\150\1\163\1\146\1\164\1\151\1\154\1\166\1\163\1\144"+
-        "\1\157\1\145\1\157\1\162\1\143\1\111\1\123\1\156\1\162\1\151\1\60"+
-        "\1\154\1\164\1\151\1\154\1\156\1\143\1\150\1\145\1\154\1\147\1\145"+
-        "\1\uffff\2\164\1\141\1\145\1\uffff\1\143\1\60\1\145\1\123\1\145"+
-        "\1\157\1\147\1\60\1\uffff\1\60\1\141\2\60\1\uffff\1\143\1\162\1"+
-        "\60\1\151\1\163\1\uffff\2\145\1\uffff\2\163\1\141\1\164\1\60\1\145"+
-        "\1\157\1\103\1\145\1\163\1\120\1\151\1\155\1\143\1\145\1\150\1\155"+
-        "\1\171\1\150\1\156\1\171\1\166\1\uffff\1\60\1\151\1\156\1\124\1"+
-        "\164\1\163\1\60\1\144\3\60\1\145\1\60\1\156\1\162\1\164\1\uffff"+
-        "\1\154\1\164\1\162\1\60\1\156\1\60\2\uffff\1\160\2\uffff\1\145\1"+
-        "\60\1\uffff\1\157\1\60\1\144\1\156\1\60\1\163\1\166\1\141\1\uffff"+
-        "\1\60\1\156\1\154\1\124\1\60\1\162\1\156\1\103\1\157\1\60\1\151"+
-        "\1\160\1\163\1\162\1\145\1\60\1\145\1\uffff\1\157\1\164\1\171\2"+
-        "\60\1\uffff\1\137\3\uffff\1\60\1\uffff\2\60\1\145\1\60\2\141\3\60"+
-        "\1\uffff\1\60\1\uffff\2\60\1\uffff\1\156\1\uffff\2\60\1\uffff\1"+
-        "\60\1\151\1\156\1\uffff\1\124\1\141\1\171\1\uffff\1\157\1\164\1"+
-        "\154\1\145\1\154\1\uffff\1\156\1\154\1\164\1\145\1\143\1\uffff\2"+
-        "\156\1\60\1\160\2\uffff\1\142\3\uffff\1\162\1\uffff\1\164\1\156"+
-        "\6\uffff\1\60\3\uffff\1\157\1\143\1\171\1\163\1\160\1\164\1\60\1"+
-        "\141\1\146\1\60\3\145\1\141\1\164\2\60\1\uffff\1\145\1\171\1\60"+
-        "\1\145\1\163\1\157\1\uffff\1\162\1\145\1\160\1\163\1\145\1\157\1"+
-        "\uffff\1\163\1\60\1\uffff\1\60\2\155\1\144\1\151\2\uffff\2\60\1"+
-        "\uffff\1\60\2\151\1\60\1\115\1\145\2\60\1\143\1\163\2\uffff\1\145"+
-        "\2\60\1\157\3\uffff\1\164\1\156\1\uffff\1\141\1\60\2\uffff\1\157"+
-        "\1\60\1\156\2\uffff\1\156\1\151\1\164\1\160\1\uffff\1\154\1\uffff"+
-        "\1\164\1\60\1\157\1\60\1\160\1\103\1\141\1\uffff\1\156\1\uffff\1"+
-        "\151\1\154\1\164\1\60\1\156\1\141\1\151\1\uffff\1\147\1\163\1\157"+
-        "\1\60\1\163\1\156\1\uffff\2\60\2\uffff";
+        "\1\0\2\157\1\141\1\uffff\1\141\1\143\1\157\1\150\1\101\3\141\1\uffff\1\76\2\60\1\141\1\146\1\142\1\162\1\145\7\uffff\1\163\2\uffff\1\160\1\155\2\145\1\141\1\156\1\145\2\52\1\162\1\141\1\165\4\uffff\1\130\1\101\2\uffff\2\0\2\uffff\1\151\1\uffff\1\157\1\156\1\60\1\157\1\164\1\146\1\60\1\uffff\3\164\1\156\1\151\1\162\1\155\1\157\1\142\1\141\2\120\1\162\1\147\1\171\1\156\1\144\1\60\1\154\1\170\1\157\3\uffff\1\145\1\151\1\164\1\uffff\1\164\1\151\1\uffff\1\156\1\155\1\142\2\164\1\60\1\164\1\60\1\145\1\171\1\144\2\164\1\163\1\102\1\151\1\157\1\146\7\uffff\1\145\2\uffff\1\145\1\60\1\160\1\146\1\163\1\156\1\164\1\150\1\156\5\uffff\1\141\1\151\1\162\1\141\10\uffff\1\144\1\162\1\144\1\uffff\1\162\2\141\1\uffff\1\141\1\157\1\162\1\157\1\164\1\155\1\164\1\160\1\151\1\120\1\165\1\164\2\60\1\166\1\151\1\145\1\144\1\145\1\uffff\1\163\1\145\1\155\1\156\1\145\1\164\1\162\1\155\1\162\1\145\1\164\1\143\1\144\1\141\1\60\2\151\1\uffff\1\60\1\uffff\1\162\1\156\1\60\1\151\1\162\1\164\1\157\1\156\1\145\1\150\1\166\1\155\1\151\2\162\1\157\1\164\1\uffff\1\157\1\165\1\60\1\141\1\163\1\144\1\145\1\141\1\144\1\156\1\147\1\145\1\147\1\162\2\60\1\165\2\60\1\144\1\165\1\103\1\162\1\151\1\164\1\157\1\151\1\60\1\157\1\143\1\171\1\162\1\143\1\145\2\uffff\1\151\1\143\1\162\1\141\1\154\1\145\1\144\1\60\1\164\1\156\1\60\1\171\1\145\1\171\1\162\1\120\1\60\1\163\1\156\1\162\1\uffff\1\163\2\157\1\uffff\1\162\1\143\1\uffff\1\157\1\151\1\162\1\157\1\164\3\141\1\115\1\156\1\143\1\141\1\155\1\151\1\162\1\154\1\uffff\1\171\1\141\1\154\1\162\1\166\1\151\1\163\1\147\1\60\1\145\1\144\2\uffff\1\147\2\uffff\1\162\2\154\1\102\1\142\1\141\1\143\1\164\1\154\1\uffff\1\165\1\145\1\163\1\157\1\164\1\60\1\143\1\141\1\103\1\164\3\60\1\uffff\2\144\1\156\1\uffff\1\60\1\162\1\120\1\156\1\157\1\uffff\1\60\1\164\1\141\1\146\1\156\2\151\1\60\1\156\1\142\1\141\1\154\1\145\1\154\1\162\1\164\1\157\1\145\1\157\1\164\1\151\1\141\1\164\1\141\1\137\1\147\1\145\1\146\1\151\1\156\1\151\1\145\1\uffff\1\164\1\60\1\141\1\151\1\164\1\141\1\154\1\145\1\156\1\145\1\165\1\164\1\157\1\151\1\141\1\156\1\120\2\164\1\165\1\141\1\uffff\1\145\1\154\2\157\3\uffff\1\162\1\163\1\141\1\uffff\1\141\1\157\1\141\1\151\1\uffff\1\151\1\160\1\151\1\141\1\156\1\144\1\uffff\1\60\1\165\1\143\1\145\1\147\1\60\1\141\1\145\3\144\1\151\1\156\1\154\1\60\1\162\1\163\1\145\1\60\1\141\1\157\1\147\1\164\1\162\1\60\1\uffff\1\164\1\166\1\60\1\163\1\141\1\150\1\163\1\146\1\164\1\151\1\154\1\166\1\163\1\144\1\157\1\145\1\157\1\162\1\143\1\111\1\123\1\156\1\162\1\151\1\60\1\154\1\164\1\151\1\154\1\156\1\143\1\150\1\145\1\154\1\147\1\145\1\uffff\2\164\1\141\1\145\1\uffff\1\143\1\60\1\145\1\123\1\145\1\157\1\147\1\60\1\uffff\1\60\1\141\2\60\1\uffff\1\143\1\162\1\60\1\151\1\163\1\uffff\2\145\1\uffff\2\163\1\141\1\164\1\60\1\145\1\157\1\103\1\145\1\163\1\120\1\151\1\155\1\143\1\145\1\150\1\155\1\171\1\150\1\156\1\171\1\166\1\uffff\1\60\1\151\1\156\1\124\1\164\1\163\1\60\1\144\3\60\1\145\1\60\1\156\1\162\1\164\1\uffff\1\154\1\164\1\162\1\60\1\156\1\60\2\uffff\1\160\2\uffff\1\145\1\60\1\uffff\1\157\1\60\1\144\1\156\1\60\1\163\1\166\1\141\1\uffff\1\60\1\156\1\154\1\124\1\60\1\162\1\156\1\103\1\157\1\60\1\151\1\160\1\163\1\162\1\145\1\60\1\145\1\uffff\1\157\1\164\1\171\2\60\1\uffff\1\137\3\uffff\1\60\1\uffff\2\60\1\145\1\60\2\141\3\60\1\uffff\1\60\1\uffff\2\60\1\uffff\1\156\1\uffff\2\60\1\uffff\1\60\1\151\1\156\1\uffff\1\124\1\141\1\171\1\uffff\1\157\1\164\1\154\1\145\1\154\1\uffff\1\156\1\154\1\164\1\145\1\143\1\uffff\2\156\1\60\1\160\2\uffff\1\142\3\uffff\1\162\1\uffff\1\164\1\156\6\uffff\1\60\3\uffff\1\157\1\143\1\171\1\163\1\160\1\164\1\60\1\141\1\146\1\60\3\145\1\141\1\164\2\60\1\uffff\1\145\1\171\1\60\1\145\1\163\1\157\1\uffff\1\162\1\145\1\160\1\163\1\145\1\157\1\uffff\1\163\1\60\1\uffff\1\60\2\155\1\144\1\151\2\uffff\2\60\1\uffff\1\60\2\151\1\60\1\115\1\145\2\60\1\143\1\163\2\uffff\1\145\2\60\1\157\3\uffff\1\164\1\156\1\uffff\1\141\1\60\2\uffff\1\157\1\60\1\156\2\uffff\1\156\1\151\1\164\1\160\1\uffff\1\154\1\uffff\1\164\1\60\1\157\1\60\1\160\1\103\1\141\1\uffff\1\156\1\uffff\1\151\1\154\1\164\1\60\1\156\1\141\1\151\1\uffff\1\147\1\163\1\157\1\60\1\163\1\156\1\uffff\2\60\2\uffff";
     static final String DFA14_maxS =
-        "\1\uffff\1\157\2\164\1\uffff\1\141\1\164\1\162\1\157\1\165\1\157"+
-        "\1\171\1\162\1\uffff\1\76\2\172\1\171\1\166\2\164\1\157\7\uffff"+
-        "\1\163\2\uffff\1\160\1\156\2\145\1\141\1\156\1\151\1\57\1\52\2\162"+
-        "\1\165\4\uffff\1\170\1\172\2\uffff\2\uffff\2\uffff\1\151\1\uffff"+
-        "\1\157\1\156\1\172\1\157\1\164\1\146\1\172\1\uffff\3\164\1\156\1"+
-        "\157\1\162\1\155\1\157\1\142\1\162\2\120\1\162\1\147\1\171\1\156"+
-        "\1\144\1\172\1\154\1\170\1\157\3\uffff\1\145\2\164\1\uffff\1\165"+
-        "\1\164\1\uffff\2\156\1\142\2\164\1\172\1\164\1\172\1\145\1\171\1"+
-        "\144\2\164\1\163\1\122\1\151\1\157\1\146\7\uffff\1\145\2\uffff\1"+
-        "\145\1\172\1\160\1\154\1\163\1\156\1\164\1\150\1\156\5\uffff\1\141"+
-        "\1\165\1\162\1\141\10\uffff\1\144\1\162\1\152\1\uffff\1\162\2\141"+
-        "\1\uffff\1\141\1\157\1\162\1\157\1\164\1\155\1\164\1\160\1\151\1"+
-        "\123\1\165\1\164\2\172\1\166\1\151\1\145\1\144\1\145\1\uffff\1\163"+
-        "\1\145\1\155\1\156\1\145\1\164\1\162\1\155\1\162\1\145\1\164\1\143"+
-        "\1\144\1\141\1\172\2\151\1\uffff\1\172\1\uffff\1\162\1\156\1\172"+
-        "\1\151\1\162\1\164\1\157\1\156\1\145\1\150\1\166\1\155\1\151\2\162"+
-        "\1\157\1\164\1\uffff\1\157\1\165\1\172\1\141\1\163\1\144\1\145\1"+
-        "\141\1\144\1\156\1\147\1\145\1\147\1\162\2\172\1\165\2\172\1\144"+
-        "\1\165\1\103\1\162\1\151\1\164\1\157\1\151\1\172\1\157\1\143\1\171"+
-        "\1\162\1\143\1\145\2\uffff\1\151\1\143\1\162\1\141\1\154\1\145\1"+
-        "\144\1\172\1\164\1\162\1\172\1\171\1\145\1\171\1\162\1\120\1\172"+
-        "\1\163\1\156\1\162\1\uffff\1\163\2\157\1\uffff\1\162\1\143\1\uffff"+
-        "\1\157\1\151\1\162\1\157\1\164\3\141\1\115\1\156\1\143\1\141\1\155"+
-        "\1\151\1\162\1\154\1\uffff\1\171\1\141\1\154\1\162\1\166\1\151\1"+
-        "\163\1\147\1\172\1\145\1\144\2\uffff\1\147\2\uffff\1\162\2\154\1"+
-        "\122\1\142\1\141\1\143\1\164\1\154\1\uffff\1\165\1\145\1\163\1\157"+
-        "\1\164\1\172\1\143\1\141\1\103\1\164\3\172\1\uffff\2\144\1\156\1"+
-        "\uffff\1\172\1\162\1\120\1\156\1\157\1\uffff\1\172\1\164\1\141\1"+
-        "\146\1\156\2\151\1\172\1\156\1\142\1\141\1\154\1\145\1\154\1\162"+
-        "\1\164\1\157\1\145\1\157\1\164\1\151\1\141\1\164\1\141\1\137\1\147"+
-        "\1\145\1\146\1\151\1\156\1\151\1\145\1\uffff\1\164\1\172\1\141\1"+
-        "\151\1\164\1\141\1\154\1\145\1\156\1\145\1\165\1\164\1\157\1\151"+
-        "\1\141\1\156\1\120\2\164\1\165\1\141\1\uffff\1\145\1\154\2\157\3"+
-        "\uffff\1\162\1\163\1\141\1\uffff\1\141\1\157\1\141\1\151\1\uffff"+
-        "\1\151\1\160\1\151\1\141\1\156\1\144\1\uffff\1\172\1\165\1\143\1"+
-        "\145\1\147\1\172\1\141\1\145\3\144\1\151\1\156\1\154\1\172\1\162"+
-        "\1\163\1\145\1\172\1\141\1\157\1\147\1\164\1\162\1\172\1\uffff\1"+
-        "\164\1\166\1\172\1\163\1\141\1\150\1\163\1\146\1\164\1\151\1\154"+
-        "\1\166\1\163\1\144\1\157\1\145\1\157\1\162\1\143\1\111\1\124\1\156"+
-        "\1\162\1\151\1\172\1\154\1\164\1\151\1\154\1\156\1\143\1\150\1\145"+
-        "\1\154\1\147\1\145\1\uffff\2\164\1\141\1\145\1\uffff\1\143\1\172"+
-        "\1\145\1\124\1\145\1\157\1\147\1\172\1\uffff\1\172\1\141\2\172\1"+
-        "\uffff\1\143\1\162\1\172\1\151\1\163\1\uffff\2\145\1\uffff\2\163"+
-        "\1\141\1\164\1\172\1\145\1\157\1\103\1\145\1\163\1\120\1\151\1\155"+
-        "\1\143\1\145\1\150\1\155\1\171\1\150\1\156\1\171\1\166\1\uffff\1"+
-        "\172\1\151\1\156\1\124\1\164\1\163\1\172\1\144\3\172\1\145\1\172"+
-        "\1\156\1\162\1\164\1\uffff\1\154\1\164\1\162\1\172\1\156\1\172\2"+
-        "\uffff\1\160\2\uffff\1\145\1\172\1\uffff\1\157\1\172\1\144\1\156"+
-        "\1\172\1\163\1\166\1\141\1\uffff\1\172\1\156\1\154\1\124\1\172\1"+
-        "\162\1\156\1\122\1\157\1\172\1\151\1\160\1\163\1\162\1\145\1\172"+
-        "\1\145\1\uffff\1\157\1\164\1\171\2\172\1\uffff\1\137\3\uffff\1\172"+
-        "\1\uffff\2\172\1\145\1\172\2\141\3\172\1\uffff\1\172\1\uffff\2\172"+
-        "\1\uffff\1\156\1\uffff\2\172\1\uffff\1\172\1\151\1\156\1\uffff\1"+
-        "\124\1\141\1\171\1\uffff\1\157\1\164\1\154\1\145\1\154\1\uffff\1"+
-        "\156\1\154\1\164\1\145\1\143\1\uffff\2\156\1\172\1\160\2\uffff\1"+
-        "\142\3\uffff\1\162\1\uffff\1\164\1\156\6\uffff\1\172\3\uffff\1\157"+
-        "\1\143\1\171\1\163\1\160\1\164\1\172\1\141\1\146\1\172\3\145\1\141"+
-        "\1\164\2\172\1\uffff\1\145\1\171\1\172\1\145\1\163\1\157\1\uffff"+
-        "\1\162\1\145\1\160\1\163\1\145\1\157\1\uffff\1\163\1\172\1\uffff"+
-        "\1\172\2\155\1\144\1\151\2\uffff\2\172\1\uffff\1\172\2\151\1\172"+
-        "\1\115\1\145\2\172\1\143\1\163\2\uffff\1\145\2\172\1\157\3\uffff"+
-        "\1\164\1\156\1\uffff\1\141\1\172\2\uffff\1\157\1\172\1\156\2\uffff"+
-        "\1\156\1\151\1\164\1\160\1\uffff\1\154\1\uffff\1\164\1\172\1\157"+
-        "\1\172\1\160\1\103\1\141\1\uffff\1\156\1\uffff\1\151\1\154\1\164"+
-        "\1\172\1\156\1\141\1\151\1\uffff\1\147\1\163\1\157\1\172\1\163\1"+
-        "\156\1\uffff\2\172\2\uffff";
+        "\1\uffff\1\157\2\164\1\uffff\1\141\1\164\1\162\1\157\1\165\1\157\1\171\1\162\1\uffff\1\76\2\172\1\171\1\166\2\164\1\157\7\uffff\1\163\2\uffff\1\160\1\156\2\145\1\141\1\156\1\151\1\57\1\52\2\162\1\165\4\uffff\1\170\1\172\2\uffff\2\uffff\2\uffff\1\151\1\uffff\1\157\1\156\1\172\1\157\1\164\1\146\1\172\1\uffff\3\164\1\156\1\157\1\162\1\155\1\157\1\142\1\162\2\120\1\162\1\147\1\171\1\156\1\144\1\172\1\154\1\170\1\157\3\uffff\1\145\2\164\1\uffff\1\165\1\164\1\uffff\2\156\1\142\2\164\1\172\1\164\1\172\1\145\1\171\1\144\2\164\1\163\1\122\1\151\1\157\1\146\7\uffff\1\145\2\uffff\1\145\1\172\1\160\1\154\1\163\1\156\1\164\1\150\1\156\5\uffff\1\141\1\165\1\162\1\141\10\uffff\1\144\1\162\1\152\1\uffff\1\162\2\141\1\uffff\1\141\1\157\1\162\1\157\1\164\1\155\1\164\1\160\1\151\1\123\1\165\1\164\2\172\1\166\1\151\1\145\1\144\1\145\1\uffff\1\163\1\145\1\155\1\156\1\145\1\164\1\162\1\155\1\162\1\145\1\164\1\143\1\144\1\141\1\172\2\151\1\uffff\1\172\1\uffff\1\162\1\156\1\172\1\151\1\162\1\164\1\157\1\156\1\145\1\150\1\166\1\155\1\151\2\162\1\157\1\164\1\uffff\1\157\1\165\1\172\1\141\1\163\1\144\1\145\1\141\1\144\1\156\1\147\1\145\1\147\1\162\2\172\1\165\2\172\1\144\1\165\1\103\1\162\1\151\1\164\1\157\1\151\1\172\1\157\1\143\1\171\1\162\1\143\1\145\2\uffff\1\151\1\143\1\162\1\141\1\154\1\145\1\144\1\172\1\164\1\162\1\172\1\171\1\145\1\171\1\162\1\120\1\172\1\163\1\156\1\162\1\uffff\1\163\2\157\1\uffff\1\162\1\143\1\uffff\1\157\1\151\1\162\1\157\1\164\3\141\1\115\1\156\1\143\1\141\1\155\1\151\1\162\1\154\1\uffff\1\171\1\141\1\154\1\162\1\166\1\151\1\163\1\147\1\172\1\145\1\144\2\uffff\1\147\2\uffff\1\162\2\154\1\122\1\142\1\141\1\143\1\164\1\154\1\uffff\1\165\1\145\1\163\1\157\1\164\1\172\1\143\1\141\1\103\1\164\3\172\1\uffff\2\144\1\156\1\uffff\1\172\1\162\1\120\1\156\1\157\1\uffff\1\172\1\164\1\141\1\146\1\156\2\151\1\172\1\156\1\142\1\141\1\154\1\145\1\154\1\162\1\164\1\157\1\145\1\157\1\164\1\151\1\141\1\164\1\141\1\137\1\147\1\145\1\146\1\151\1\156\1\151\1\145\1\uffff\1\164\1\172\1\141\1\151\1\164\1\141\1\154\1\145\1\156\1\145\1\165\1\164\1\157\1\151\1\141\1\156\1\120\2\164\1\165\1\141\1\uffff\1\145\1\154\2\157\3\uffff\1\162\1\163\1\141\1\uffff\1\141\1\157\1\141\1\151\1\uffff\1\151\1\160\1\151\1\141\1\156\1\144\1\uffff\1\172\1\165\1\143\1\145\1\147\1\172\1\141\1\145\3\144\1\151\1\156\1\154\1\172\1\162\1\163\1\145\1\172\1\141\1\157\1\147\1\164\1\162\1\172\1\uffff\1\164\1\166\1\172\1\163\1\141\1\150\1\163\1\146\1\164\1\151\1\154\1\166\1\163\1\144\1\157\1\145\1\157\1\162\1\143\1\111\1\124\1\156\1\162\1\151\1\172\1\154\1\164\1\151\1\154\1\156\1\143\1\150\1\145\1\154\1\147\1\145\1\uffff\2\164\1\141\1\145\1\uffff\1\143\1\172\1\145\1\124\1\145\1\157\1\147\1\172\1\uffff\1\172\1\141\2\172\1\uffff\1\143\1\162\1\172\1\151\1\163\1\uffff\2\145\1\uffff\2\163\1\141\1\164\1\172\1\145\1\157\1\103\1\145\1\163\1\120\1\151\1\155\1\143\1\145\1\150\1\155\1\171\1\150\1\156\1\171\1\166\1\uffff\1\172\1\151\1\156\1\124\1\164\1\163\1\172\1\144\3\172\1\145\1\172\1\156\1\162\1\164\1\uffff\1\154\1\164\1\162\1\172\1\156\1\172\2\uffff\1\160\2\uffff\1\145\1\172\1\uffff\1\157\1\172\1\144\1\156\1\172\1\163\1\166\1\141\1\uffff\1\172\1\156\1\154\1\124\1\172\1\162\1\156\1\122\1\157\1\172\1\151\1\160\1\163\1\162\1\145\1\172\1\145\1\uffff\1\157\1\164\1\171\2\172\1\uffff\1\137\3\uffff\1\172\1\uffff\2\172\1\145\1\172\2\141\3\172\1\uffff\1\172\1\uffff\2\172\1\uffff\1\156\1\uffff\2\172\1\uffff\1\172\1\151\1\156\1\uffff\1\124\1\141\1\171\1\uffff\1\157\1\164\1\154\1\145\1\154\1\uffff\1\156\1\154\1\164\1\145\1\143\1\uffff\2\156\1\172\1\160\2\uffff\1\142\3\uffff\1\162\1\uffff\1\164\1\156\6\uffff\1\172\3\uffff\1\157\1\143\1\171\1\163\1\160\1\164\1\172\1\141\1\146\1\172\3\145\1\141\1\164\2\172\1\uffff\1\145\1\171\1\172\1\145\1\163\1\157\1\uffff\1\162\1\145\1\160\1\163\1\145\1\157\1\uffff\1\163\1\172\1\uffff\1\172\2\155\1\144\1\151\2\uffff\2\172\1\uffff\1\172\2\151\1\172\1\115\1\145\2\172\1\143\1\163\2\uffff\1\145\2\172\1\157\3\uffff\1\164\1\156\1\uffff\1\141\1\172\2\uffff\1\157\1\172\1\156\2\uffff\1\156\1\151\1\164\1\160\1\uffff\1\154\1\uffff\1\164\1\172\1\157\1\172\1\160\1\103\1\141\1\uffff\1\156\1\uffff\1\151\1\154\1\164\1\172\1\156\1\141\1\151\1\uffff\1\147\1\163\1\157\1\172\1\163\1\156\1\uffff\2\172\2\uffff";
     static final String DFA14_acceptS =
-        "\4\uffff\1\4\10\uffff\1\17\10\uffff\1\36\1\37\1\40\1\44\1\45\1"+
-        "\50\1\51\1\uffff\1\60\1\61\14\uffff\1\147\1\150\1\151\1\155\2\uffff"+
-        "\1\172\1\173\2\uffff\1\177\1\u0080\1\uffff\1\172\7\uffff\1\4\25"+
-        "\uffff\1\17\1\42\1\20\3\uffff\1\21\2\uffff\1\22\22\uffff\1\36\1"+
-        "\37\1\40\1\44\1\45\1\50\1\51\1\uffff\1\60\1\61\11\uffff\1\175\1"+
-        "\176\1\110\1\163\1\113\4\uffff\1\147\1\150\1\151\1\155\1\171\1\173"+
-        "\1\174\1\177\3\uffff\1\146\3\uffff\1\126\23\uffff\1\145\21\uffff"+
-        "\1\47\1\uffff\1\141\21\uffff\1\153\42\uffff\1\102\1\103\24\uffff"+
-        "\1\114\3\uffff\1\154\2\uffff\1\112\20\uffff\1\117\13\uffff\1\1\1"+
-        "\2\1\uffff\1\143\1\3\11\uffff\1\100\15\uffff\1\162\3\uffff\1\125"+
-        "\5\uffff\1\25\40\uffff\1\170\25\uffff\1\123\4\uffff\1\15\1\16\1"+
-        "\26\3\uffff\1\124\4\uffff\1\63\6\uffff\1\30\31\uffff\1\142\44\uffff"+
-        "\1\137\4\uffff\1\33\10\uffff\1\161\4\uffff\1\74\5\uffff\1\157\2"+
-        "\uffff\1\43\26\uffff\1\53\20\uffff\1\165\6\uffff\1\136\1\66\1\uffff"+
-        "\1\72\1\167\2\uffff\1\111\10\uffff\1\121\21\uffff\1\101\5\uffff"+
-        "\1\127\1\uffff\1\27\1\65\1\164\1\uffff\1\166\11\uffff\1\73\1\uffff"+
-        "\1\64\2\uffff\1\77\1\uffff\1\140\2\uffff\1\5\3\uffff\1\57\3\uffff"+
-        "\1\67\5\uffff\1\76\5\uffff\1\14\4\uffff\1\133\1\152\1\uffff\1\160"+
-        "\1\31\1\32\1\uffff\1\35\2\uffff\1\54\1\55\1\56\1\62\1\120\1\75\1"+
-        "\uffff\1\70\1\24\1\6\21\uffff\1\132\6\uffff\1\135\6\uffff\1\134"+
-        "\2\uffff\1\71\5\uffff\1\23\1\46\2\uffff\1\34\12\uffff\1\105\1\122"+
-        "\4\uffff\1\52\1\116\1\130\2\uffff\1\7\2\uffff\1\10\1\41\3\uffff"+
-        "\1\13\1\106\4\uffff\1\156\1\uffff\1\12\7\uffff\1\115\1\uffff\1\131"+
-        "\7\uffff\1\144\6\uffff\1\107\2\uffff\1\11\1\104";
+        "\4\uffff\1\4\10\uffff\1\17\10\uffff\1\36\1\37\1\40\1\44\1\45\1\50\1\51\1\uffff\1\60\1\61\14\uffff\1\147\1\150\1\151\1\155\2\uffff\1\172\1\173\2\uffff\1\177\1\u0080\1\uffff\1\172\7\uffff\1\4\25\uffff\1\17\1\42\1\20\3\uffff\1\21\2\uffff\1\22\22\uffff\1\36\1\37\1\40\1\44\1\45\1\50\1\51\1\uffff\1\60\1\61\11\uffff\1\175\1\176\1\110\1\163\1\113\4\uffff\1\147\1\150\1\151\1\155\1\171\1\173\1\174\1\177\3\uffff\1\146\3\uffff\1\126\23\uffff\1\145\21\uffff\1\47\1\uffff\1\141\21\uffff\1\153\42\uffff\1\102\1\103\24\uffff\1\114\3\uffff\1\154\2\uffff\1\112\20\uffff\1\117\13\uffff\1\1\1\2\1\uffff\1\143\1\3\11\uffff\1\100\15\uffff\1\162\3\uffff\1\125\5\uffff\1\25\40\uffff\1\170\25\uffff\1\123\4\uffff\1\15\1\16\1\26\3\uffff\1\124\4\uffff\1\63\6\uffff\1\30\31\uffff\1\142\44\uffff\1\137\4\uffff\1\33\10\uffff\1\161\4\uffff\1\74\5\uffff\1\157\2\uffff\1\43\26\uffff\1\53\20\uffff\1\165\6\uffff\1\136\1\66\1\uffff\1\72\1\167\2\uffff\1\111\10\uffff\1\121\21\uffff\1\101\5\uffff\1\127\1\uffff\1\27\1\65\1\164\1\uffff\1\166\11\uffff\1\73\1\uffff\1\64\2\uffff\1\77\1\uffff\1\140\2\uffff\1\5\3\uffff\1\57\3\uffff\1\67\5\uffff\1\76\5\uffff\1\14\4\uffff\1\133\1\152\1\uffff\1\160\1\31\1\32\1\uffff\1\35\2\uffff\1\54\1\55\1\56\1\62\1\120\1\75\1\uffff\1\70\1\24\1\6\21\uffff\1\132\6\uffff\1\135\6\uffff\1\134\2\uffff\1\71\5\uffff\1\23\1\46\2\uffff\1\34\12\uffff\1\105\1\122\4\uffff\1\52\1\116\1\130\2\uffff\1\7\2\uffff\1\10\1\41\3\uffff\1\13\1\106\4\uffff\1\156\1\uffff\1\12\7\uffff\1\115\1\uffff\1\131\7\uffff\1\144\6\uffff\1\107\2\uffff\1\11\1\104";
     static final String DFA14_specialS =
-        "\1\0\63\uffff\1\1\1\2\u02dc\uffff}>";
+        "\1\0\63\uffff\1\2\1\1\u02dc\uffff}>";
     static final String[] DFA14_transitionS = {
-            "\11\67\2\66\2\67\1\66\22\67\1\66\1\67\1\64\4\67\1\65\1\31\1"+
-            "\32\1\4\1\15\1\33\1\16\1\50\1\47\1\60\11\63\1\30\1\67\1\54\1"+
-            "\34\1\55\1\67\1\57\1\6\1\46\1\10\1\5\1\20\3\62\1\45\2\62\1\12"+
-            "\1\43\1\62\1\40\1\7\1\62\1\25\1\11\1\51\6\62\1\36\1\67\1\37"+
-            "\1\61\1\62\1\67\1\23\1\62\1\2\1\3\1\17\1\14\1\53\1\44\1\41\3"+
-            "\62\1\13\1\62\1\22\1\24\1\62\1\42\1\21\1\52\1\35\1\1\4\62\1"+
-            "\26\1\56\1\27\uff82\67",
+            "\11\67\2\66\2\67\1\66\22\67\1\66\1\67\1\64\4\67\1\65\1\31\1\32\1\4\1\15\1\33\1\16\1\50\1\47\1\60\11\63\1\30\1\67\1\54\1\34\1\55\1\67\1\57\1\6\1\46\1\10\1\5\1\20\3\62\1\45\2\62\1\12\1\43\1\62\1\40\1\7\1\62\1\25\1\11\1\51\6\62\1\36\1\67\1\37\1\61\1\62\1\67\1\23\1\62\1\2\1\3\1\17\1\14\1\53\1\44\1\41\3\62\1\13\1\62\1\22\1\24\1\62\1\42\1\21\1\52\1\35\1\1\4\62\1\26\1\56\1\27\uff82\67",
             "\1\70",
             "\1\73\1\74\3\uffff\1\72",
             "\1\76\3\uffff\1\77\11\uffff\1\100\4\uffff\1\75",
@@ -4384,10 +4192,8 @@ public class InternalRoomLexer extends Lexer {
             "\1\124\7\uffff\1\125\10\uffff\1\126",
             "",
             "\1\130",
-            "\12\71\7\uffff\32\71\4\uffff\1\71\1\uffff\15\71\1\134\7\71"+
-            "\1\132\1\71\1\133\2\71",
-            "\12\71\7\uffff\32\71\4\uffff\1\71\1\uffff\15\71\1\136\11\71"+
-            "\1\137\2\71",
+            "\12\71\7\uffff\32\71\4\uffff\1\71\1\uffff\15\71\1\134\7\71\1\132\1\71\1\133\2\71",
+            "\12\71\7\uffff\32\71\4\uffff\1\71\1\uffff\15\71\1\136\11\71\1\137\2\71",
             "\1\144\3\uffff\1\142\17\uffff\1\143\3\uffff\1\141",
             "\1\146\11\uffff\1\145\1\uffff\1\150\2\uffff\1\147\1\151",
             "\1\156\1\154\12\uffff\1\153\4\uffff\1\152\1\155",
@@ -4497,8 +4303,7 @@ public class InternalRoomLexer extends Lexer {
             "",
             "",
             "\1\u00d5",
-            "\12\71\7\uffff\32\71\4\uffff\1\71\1\uffff\2\71\1\u00d6\5\71"+
-            "\1\u00d7\21\71",
+            "\12\71\7\uffff\32\71\4\uffff\1\71\1\uffff\2\71\1\u00d6\5\71\1\u00d7\21\71",
             "\1\u00d9",
             "\1\u00db\1\u00da\4\uffff\1\u00dc",
             "\1\u00dd",
@@ -4565,13 +4370,11 @@ public class InternalRoomLexer extends Lexer {
             "\1\u010d",
             "\1\u010e",
             "\1\u010f",
-            "\12\71\7\uffff\32\71\4\uffff\1\71\1\uffff\6\71\1\u0110\23"+
-            "\71",
+            "\12\71\7\uffff\32\71\4\uffff\1\71\1\uffff\6\71\1\u0110\23\71",
             "\1\u0112",
             "\1\u0113",
             "",
-            "\12\71\7\uffff\32\71\4\uffff\1\71\1\uffff\6\71\1\u0114\23"+
-            "\71",
+            "\12\71\7\uffff\32\71\4\uffff\1\71\1\uffff\6\71\1\u0114\23\71",
             "",
             "\1\u0116",
             "\1\u0117",
@@ -4618,8 +4421,7 @@ public class InternalRoomLexer extends Lexer {
             "\1\u013f",
             "\1\u0140",
             "\1\u0141",
-            "\12\71\7\uffff\2\71\1\u0142\27\71\4\uffff\1\71\1\uffff\32"+
-            "\71",
+            "\12\71\7\uffff\2\71\1\u0142\27\71\4\uffff\1\71\1\uffff\32\71",
             "\1\u0144",
             "\1\u0145",
             "\1\u0146",
@@ -4704,8 +4506,7 @@ public class InternalRoomLexer extends Lexer {
             "\1\u018e",
             "\1\u018f",
             "\1\u0190",
-            "\12\71\7\uffff\14\71\1\u0191\15\71\4\uffff\1\71\1\uffff\32"+
-            "\71",
+            "\12\71\7\uffff\14\71\1\u0191\15\71\4\uffff\1\71\1\uffff\32\71",
             "\1\u0193",
             "\1\u0194",
             "\1\u0195",
@@ -4820,8 +4621,7 @@ public class InternalRoomLexer extends Lexer {
             "\1\u01f7",
             "\1\u01f8",
             "\1\u01f9",
-            "\12\71\7\uffff\32\71\4\uffff\1\71\1\uffff\21\71\1\u01fa\10"+
-            "\71",
+            "\12\71\7\uffff\32\71\4\uffff\1\71\1\uffff\21\71\1\u01fa\10\71",
             "\1\u01fc",
             "\1\u01fd",
             "\1\u01fe",
@@ -4937,8 +4737,7 @@ public class InternalRoomLexer extends Lexer {
             "\1\u0265",
             "\1\u0266",
             "\1\u0267",
-            "\1\71\1\u0268\1\u0269\1\u026a\6\71\7\uffff\32\71\4\uffff\1"+
-            "\71\1\uffff\32\71",
+            "\1\71\1\u0268\1\u0269\1\u026a\6\71\7\uffff\32\71\4\uffff\1\71\1\uffff\32\71",
             "\1\u026c",
             "\12\71\7\uffff\32\71\4\uffff\1\71\1\uffff\32\71",
             "",
@@ -5048,8 +4847,7 @@ public class InternalRoomLexer extends Lexer {
             "",
             "",
             "",
-            "\12\71\7\uffff\17\71\1\u02b9\12\71\4\uffff\1\71\1\uffff\32"+
-            "\71",
+            "\12\71\7\uffff\17\71\1\u02b9\12\71\4\uffff\1\71\1\uffff\32\71",
             "",
             "",
             "",
@@ -5320,20 +5118,20 @@ public class InternalRoomLexer extends Lexer {
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA14_52 = input.LA(1);
+                        int LA14_53 = input.LA(1);
 
                         s = -1;
-                        if ( ((LA14_52>='\u0000' && LA14_52<='\uFFFF')) ) {s = 149;}
+                        if ( ((LA14_53>='\u0000' && LA14_53<='\uFFFF')) ) {s = 149;}
 
                         else s = 55;
 
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA14_53 = input.LA(1);
+                        int LA14_52 = input.LA(1);
 
                         s = -1;
-                        if ( ((LA14_53>='\u0000' && LA14_53<='\uFFFF')) ) {s = 149;}
+                        if ( ((LA14_52>='\u0000' && LA14_52<='\uFFFF')) ) {s = 149;}
 
                         else s = 55;
 
diff --git a/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoomParser.java b/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoomParser.java
index 6260b5de0..da829d720 100644
--- a/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoomParser.java
+++ b/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoomParser.java
@@ -24,135 +24,135 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
     public static final String[] tokenNames = new String[] {
         "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_INT", "RULE_HEX", "RULE_ID", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'void'", "'ctor'", "'dtor'", "'*'", "'DataClass'", "'ActorClass'", "'ActorBehavior'", "'ProtocolClass'", "'CompoundProtocolClass'", "'SubSystemClass'", "'LogicalSystem'", "'mandatory'", "'model'", "'false'", "'+'", "'-'", "'e'", "'E'", "'eventdriven'", "'datadriven'", "'sync'", "'fixed'", "'optional'", "'async'", "'ptBoolean'", "'ptInteger'", "'ptReal'", "'ptCharacter'", "'RoomModel'", "'{'", "'}'", "':'", "'PrimitiveType'", "'->'", "'default'", "'('", "')'", "'Enumeration'", "'of'", "','", "'='", "'ExternalType'", "'extends'", "'usercode1'", "'usercode2'", "'usercode3'", "'Attribute'", "'['", "']'", "'Operation'", "'sends'", "'incoming'", "'outgoing'", "'regular'", "'PortClass'", "'conjugated'", "'SubProtocol'", "'Message'", "'usercode'", "'handle'", "'Interface'", "'Structure'", "'Behavior'", "'Port'", "'external'", "'SAP'", "'SPP'", "'ServiceImplementation'", "'SubSystemRef'", "'LogicalThread'", "'ActorInstanceMapping'", "'/'", "'Binding'", "'and'", "'.'", "'sub'", "'LayerConnection'", "'satisfied_by'", "'ref'", "'relay_sap'", "'ActorRef'", "'StateMachine'", "'State'", "'entry'", "'exit'", "'do'", "'subgraph'", "'RefinedState'", "'TransitionPoint'", "'EntryPoint'", "'ExitPoint'", "'ChoicePoint'", "'Transition'", "'initial'", "'action'", "'triggers'", "'or'", "'guard'", "'cond'", "'RefinedTransition'", "'my'", "'cp'", "'<'", "'>'", "'|'", "'semantics'", "'in'", "'out'", "'@'", "'AnnotationType'", "'target'", "'attribute'", "'import'", "'from'", "'.*'", "'override'", "'private'", "'abstract'", "'handler'", "'true'"
     };
-    public static final int RULE_HEX=5;
-    public static final int T__50=50;
-    public static final int T__59=59;
-    public static final int T__55=55;
-    public static final int T__56=56;
-    public static final int T__57=57;
-    public static final int T__58=58;
-    public static final int T__51=51;
-    public static final int T__52=52;
-    public static final int T__53=53;
-    public static final int T__54=54;
-    public static final int T__60=60;
-    public static final int T__61=61;
     public static final int RULE_ID=6;
-    public static final int T__131=131;
-    public static final int T__130=130;
-    public static final int RULE_INT=4;
-    public static final int T__66=66;
-    public static final int RULE_ML_COMMENT=8;
-    public static final int T__67=67;
-    public static final int T__129=129;
-    public static final int T__68=68;
-    public static final int T__69=69;
-    public static final int T__62=62;
-    public static final int T__126=126;
-    public static final int T__63=63;
-    public static final int T__125=125;
-    public static final int T__64=64;
-    public static final int T__128=128;
-    public static final int T__65=65;
-    public static final int T__127=127;
-    public static final int T__37=37;
-    public static final int T__38=38;
-    public static final int T__39=39;
-    public static final int T__33=33;
-    public static final int T__34=34;
-    public static final int T__35=35;
-    public static final int T__36=36;
-    public static final int T__30=30;
-    public static final int T__31=31;
-    public static final int T__32=32;
-    public static final int T__48=48;
-    public static final int T__49=49;
-    public static final int T__44=44;
-    public static final int T__45=45;
-    public static final int T__46=46;
-    public static final int T__47=47;
-    public static final int T__40=40;
-    public static final int T__41=41;
-    public static final int T__42=42;
-    public static final int T__43=43;
-    public static final int T__91=91;
-    public static final int T__100=100;
-    public static final int T__92=92;
+    public static final int T__29=29;
+    public static final int T__28=28;
+    public static final int T__27=27;
+    public static final int T__26=26;
+    public static final int T__25=25;
+    public static final int T__24=24;
+    public static final int T__23=23;
+    public static final int T__22=22;
+    public static final int RULE_ANY_OTHER=11;
+    public static final int T__21=21;
+    public static final int T__20=20;
+    public static final int EOF=-1;
     public static final int T__93=93;
-    public static final int T__102=102;
-    public static final int T__94=94;
-    public static final int T__101=101;
-    public static final int T__90=90;
     public static final int T__19=19;
-    public static final int T__15=15;
+    public static final int T__94=94;
+    public static final int T__91=91;
+    public static final int RULE_HEX=5;
+    public static final int T__92=92;
     public static final int T__16=16;
-    public static final int T__17=17;
+    public static final int T__15=15;
+    public static final int T__90=90;
     public static final int T__18=18;
-    public static final int T__99=99;
+    public static final int T__17=17;
     public static final int T__12=12;
-    public static final int T__13=13;
     public static final int T__14=14;
-    public static final int T__95=95;
-    public static final int T__96=96;
-    public static final int T__97=97;
+    public static final int T__13=13;
+    public static final int T__99=99;
     public static final int T__98=98;
-    public static final int T__26=26;
-    public static final int T__27=27;
-    public static final int T__28=28;
-    public static final int T__29=29;
-    public static final int T__22=22;
-    public static final int T__23=23;
-    public static final int T__24=24;
-    public static final int T__25=25;
-    public static final int T__20=20;
-    public static final int T__21=21;
-    public static final int T__122=122;
-    public static final int T__70=70;
-    public static final int T__121=121;
+    public static final int T__97=97;
+    public static final int T__96=96;
+    public static final int T__95=95;
+    public static final int T__80=80;
+    public static final int T__81=81;
+    public static final int T__82=82;
+    public static final int T__83=83;
+    public static final int T__85=85;
+    public static final int T__84=84;
+    public static final int T__87=87;
+    public static final int T__86=86;
+    public static final int T__89=89;
+    public static final int T__88=88;
+    public static final int RULE_ML_COMMENT=8;
+    public static final int T__126=126;
+    public static final int T__125=125;
+    public static final int T__128=128;
+    public static final int RULE_STRING=7;
+    public static final int T__127=127;
     public static final int T__71=71;
-    public static final int T__124=124;
+    public static final int T__129=129;
     public static final int T__72=72;
-    public static final int T__123=123;
-    public static final int T__120=120;
-    public static final int RULE_STRING=7;
-    public static final int RULE_SL_COMMENT=9;
-    public static final int T__77=77;
-    public static final int T__119=119;
+    public static final int T__70=70;
+    public static final int T__76=76;
+    public static final int T__75=75;
+    public static final int T__130=130;
+    public static final int T__74=74;
+    public static final int T__131=131;
+    public static final int T__73=73;
+    public static final int T__79=79;
     public static final int T__78=78;
+    public static final int T__77=77;
+    public static final int T__68=68;
+    public static final int T__69=69;
+    public static final int T__66=66;
+    public static final int T__67=67;
+    public static final int T__64=64;
+    public static final int T__65=65;
+    public static final int T__62=62;
+    public static final int T__63=63;
     public static final int T__118=118;
-    public static final int T__79=79;
-    public static final int T__73=73;
-    public static final int T__115=115;
-    public static final int EOF=-1;
-    public static final int T__74=74;
-    public static final int T__114=114;
-    public static final int T__75=75;
-    public static final int T__117=117;
-    public static final int T__76=76;
+    public static final int T__119=119;
     public static final int T__116=116;
-    public static final int T__80=80;
+    public static final int T__117=117;
+    public static final int T__114=114;
+    public static final int T__115=115;
+    public static final int T__124=124;
+    public static final int T__123=123;
+    public static final int T__122=122;
+    public static final int T__121=121;
+    public static final int T__120=120;
+    public static final int T__61=61;
+    public static final int T__60=60;
+    public static final int T__55=55;
+    public static final int T__56=56;
+    public static final int T__57=57;
+    public static final int T__58=58;
+    public static final int T__51=51;
+    public static final int T__52=52;
+    public static final int T__53=53;
+    public static final int T__54=54;
+    public static final int T__107=107;
+    public static final int T__108=108;
+    public static final int T__109=109;
+    public static final int T__103=103;
+    public static final int T__59=59;
+    public static final int T__104=104;
+    public static final int T__105=105;
+    public static final int T__106=106;
     public static final int T__111=111;
-    public static final int T__81=81;
     public static final int T__110=110;
-    public static final int T__82=82;
+    public static final int RULE_INT=4;
     public static final int T__113=113;
-    public static final int T__83=83;
     public static final int T__112=112;
+    public static final int T__50=50;
+    public static final int T__42=42;
+    public static final int T__43=43;
+    public static final int T__40=40;
+    public static final int T__41=41;
+    public static final int T__46=46;
+    public static final int T__47=47;
+    public static final int T__44=44;
+    public static final int T__45=45;
+    public static final int T__48=48;
+    public static final int T__49=49;
+    public static final int T__102=102;
+    public static final int T__101=101;
+    public static final int T__100=100;
+    public static final int RULE_SL_COMMENT=9;
+    public static final int T__30=30;
+    public static final int T__31=31;
+    public static final int T__32=32;
+    public static final int T__33=33;
+    public static final int T__34=34;
+    public static final int T__35=35;
+    public static final int T__36=36;
+    public static final int T__37=37;
+    public static final int T__38=38;
+    public static final int T__39=39;
     public static final int RULE_WS=10;
-    public static final int RULE_ANY_OTHER=11;
-    public static final int T__88=88;
-    public static final int T__108=108;
-    public static final int T__89=89;
-    public static final int T__107=107;
-    public static final int T__109=109;
-    public static final int T__84=84;
-    public static final int T__104=104;
-    public static final int T__85=85;
-    public static final int T__103=103;
-    public static final int T__86=86;
-    public static final int T__106=106;
-    public static final int T__87=87;
-    public static final int T__105=105;
 
     // delegates
     // delegators
@@ -168,7 +168,7 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
         
 
     public String[] getTokenNames() { return InternalRoomParser.tokenNames; }
-    public String getGrammarFileName() { return "../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g"; }
+    public String getGrammarFileName() { return "InternalRoom.g"; }
 
 
      
@@ -192,20 +192,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleRoomModel"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:60:1: entryRuleRoomModel : ruleRoomModel EOF ;
+    // InternalRoom.g:60:1: entryRuleRoomModel : ruleRoomModel EOF ;
     public final void entryRuleRoomModel() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:61:1: ( ruleRoomModel EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:62:1: ruleRoomModel EOF
+            // InternalRoom.g:61:1: ( ruleRoomModel EOF )
+            // InternalRoom.g:62:1: ruleRoomModel EOF
             {
              before(grammarAccess.getRoomModelRule()); 
-            pushFollow(FOLLOW_ruleRoomModel_in_entryRuleRoomModel61);
+            pushFollow(FOLLOW_1);
             ruleRoomModel();
 
             state._fsp--;
 
              after(grammarAccess.getRoomModelRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRoomModel68); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -222,23 +222,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleRoomModel"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:69:1: ruleRoomModel : ( ( rule__RoomModel__Group__0 ) ) ;
+    // InternalRoom.g:69:1: ruleRoomModel : ( ( rule__RoomModel__Group__0 ) ) ;
     public final void ruleRoomModel() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:73:2: ( ( ( rule__RoomModel__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:74:1: ( ( rule__RoomModel__Group__0 ) )
+            // InternalRoom.g:73:2: ( ( ( rule__RoomModel__Group__0 ) ) )
+            // InternalRoom.g:74:1: ( ( rule__RoomModel__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:74:1: ( ( rule__RoomModel__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:75:1: ( rule__RoomModel__Group__0 )
+            // InternalRoom.g:74:1: ( ( rule__RoomModel__Group__0 ) )
+            // InternalRoom.g:75:1: ( rule__RoomModel__Group__0 )
             {
              before(grammarAccess.getRoomModelAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:76:1: ( rule__RoomModel__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:76:2: rule__RoomModel__Group__0
+            // InternalRoom.g:76:1: ( rule__RoomModel__Group__0 )
+            // InternalRoom.g:76:2: rule__RoomModel__Group__0
             {
-            pushFollow(FOLLOW_rule__RoomModel__Group__0_in_ruleRoomModel94);
+            pushFollow(FOLLOW_2);
             rule__RoomModel__Group__0();
 
             state._fsp--;
@@ -269,20 +269,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleStructureClass"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:90:1: entryRuleStructureClass : ruleStructureClass EOF ;
+    // InternalRoom.g:90:1: entryRuleStructureClass : ruleStructureClass EOF ;
     public final void entryRuleStructureClass() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:91:1: ( ruleStructureClass EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:92:1: ruleStructureClass EOF
+            // InternalRoom.g:91:1: ( ruleStructureClass EOF )
+            // InternalRoom.g:92:1: ruleStructureClass EOF
             {
              before(grammarAccess.getStructureClassRule()); 
-            pushFollow(FOLLOW_ruleStructureClass_in_entryRuleStructureClass123);
+            pushFollow(FOLLOW_1);
             ruleStructureClass();
 
             state._fsp--;
 
              after(grammarAccess.getStructureClassRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleStructureClass130); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -299,23 +299,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleStructureClass"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:99:1: ruleStructureClass : ( ( rule__StructureClass__Alternatives ) ) ;
+    // InternalRoom.g:99:1: ruleStructureClass : ( ( rule__StructureClass__Alternatives ) ) ;
     public final void ruleStructureClass() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:103:2: ( ( ( rule__StructureClass__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:104:1: ( ( rule__StructureClass__Alternatives ) )
+            // InternalRoom.g:103:2: ( ( ( rule__StructureClass__Alternatives ) ) )
+            // InternalRoom.g:104:1: ( ( rule__StructureClass__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:104:1: ( ( rule__StructureClass__Alternatives ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:105:1: ( rule__StructureClass__Alternatives )
+            // InternalRoom.g:104:1: ( ( rule__StructureClass__Alternatives ) )
+            // InternalRoom.g:105:1: ( rule__StructureClass__Alternatives )
             {
              before(grammarAccess.getStructureClassAccess().getAlternatives()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:106:1: ( rule__StructureClass__Alternatives )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:106:2: rule__StructureClass__Alternatives
+            // InternalRoom.g:106:1: ( rule__StructureClass__Alternatives )
+            // InternalRoom.g:106:2: rule__StructureClass__Alternatives
             {
-            pushFollow(FOLLOW_rule__StructureClass__Alternatives_in_ruleStructureClass156);
+            pushFollow(FOLLOW_2);
             rule__StructureClass__Alternatives();
 
             state._fsp--;
@@ -346,20 +346,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleActorContainerClass"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:118:1: entryRuleActorContainerClass : ruleActorContainerClass EOF ;
+    // InternalRoom.g:118:1: entryRuleActorContainerClass : ruleActorContainerClass EOF ;
     public final void entryRuleActorContainerClass() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:119:1: ( ruleActorContainerClass EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:120:1: ruleActorContainerClass EOF
+            // InternalRoom.g:119:1: ( ruleActorContainerClass EOF )
+            // InternalRoom.g:120:1: ruleActorContainerClass EOF
             {
              before(grammarAccess.getActorContainerClassRule()); 
-            pushFollow(FOLLOW_ruleActorContainerClass_in_entryRuleActorContainerClass183);
+            pushFollow(FOLLOW_1);
             ruleActorContainerClass();
 
             state._fsp--;
 
              after(grammarAccess.getActorContainerClassRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleActorContainerClass190); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -376,23 +376,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleActorContainerClass"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:127:1: ruleActorContainerClass : ( ( rule__ActorContainerClass__Alternatives ) ) ;
+    // InternalRoom.g:127:1: ruleActorContainerClass : ( ( rule__ActorContainerClass__Alternatives ) ) ;
     public final void ruleActorContainerClass() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:131:2: ( ( ( rule__ActorContainerClass__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:132:1: ( ( rule__ActorContainerClass__Alternatives ) )
+            // InternalRoom.g:131:2: ( ( ( rule__ActorContainerClass__Alternatives ) ) )
+            // InternalRoom.g:132:1: ( ( rule__ActorContainerClass__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:132:1: ( ( rule__ActorContainerClass__Alternatives ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:133:1: ( rule__ActorContainerClass__Alternatives )
+            // InternalRoom.g:132:1: ( ( rule__ActorContainerClass__Alternatives ) )
+            // InternalRoom.g:133:1: ( rule__ActorContainerClass__Alternatives )
             {
              before(grammarAccess.getActorContainerClassAccess().getAlternatives()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:134:1: ( rule__ActorContainerClass__Alternatives )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:134:2: rule__ActorContainerClass__Alternatives
+            // InternalRoom.g:134:1: ( rule__ActorContainerClass__Alternatives )
+            // InternalRoom.g:134:2: rule__ActorContainerClass__Alternatives
             {
-            pushFollow(FOLLOW_rule__ActorContainerClass__Alternatives_in_ruleActorContainerClass216);
+            pushFollow(FOLLOW_2);
             rule__ActorContainerClass__Alternatives();
 
             state._fsp--;
@@ -423,20 +423,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleVarDecl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:146:1: entryRuleVarDecl : ruleVarDecl EOF ;
+    // InternalRoom.g:146:1: entryRuleVarDecl : ruleVarDecl EOF ;
     public final void entryRuleVarDecl() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:147:1: ( ruleVarDecl EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:148:1: ruleVarDecl EOF
+            // InternalRoom.g:147:1: ( ruleVarDecl EOF )
+            // InternalRoom.g:148:1: ruleVarDecl EOF
             {
              before(grammarAccess.getVarDeclRule()); 
-            pushFollow(FOLLOW_ruleVarDecl_in_entryRuleVarDecl243);
+            pushFollow(FOLLOW_1);
             ruleVarDecl();
 
             state._fsp--;
 
              after(grammarAccess.getVarDeclRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleVarDecl250); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -453,23 +453,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleVarDecl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:155:1: ruleVarDecl : ( ( rule__VarDecl__Group__0 ) ) ;
+    // InternalRoom.g:155:1: ruleVarDecl : ( ( rule__VarDecl__Group__0 ) ) ;
     public final void ruleVarDecl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:159:2: ( ( ( rule__VarDecl__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:160:1: ( ( rule__VarDecl__Group__0 ) )
+            // InternalRoom.g:159:2: ( ( ( rule__VarDecl__Group__0 ) ) )
+            // InternalRoom.g:160:1: ( ( rule__VarDecl__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:160:1: ( ( rule__VarDecl__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:161:1: ( rule__VarDecl__Group__0 )
+            // InternalRoom.g:160:1: ( ( rule__VarDecl__Group__0 ) )
+            // InternalRoom.g:161:1: ( rule__VarDecl__Group__0 )
             {
              before(grammarAccess.getVarDeclAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:162:1: ( rule__VarDecl__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:162:2: rule__VarDecl__Group__0
+            // InternalRoom.g:162:1: ( rule__VarDecl__Group__0 )
+            // InternalRoom.g:162:2: rule__VarDecl__Group__0
             {
-            pushFollow(FOLLOW_rule__VarDecl__Group__0_in_ruleVarDecl276);
+            pushFollow(FOLLOW_2);
             rule__VarDecl__Group__0();
 
             state._fsp--;
@@ -500,20 +500,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleRefableType"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:174:1: entryRuleRefableType : ruleRefableType EOF ;
+    // InternalRoom.g:174:1: entryRuleRefableType : ruleRefableType EOF ;
     public final void entryRuleRefableType() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:175:1: ( ruleRefableType EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:176:1: ruleRefableType EOF
+            // InternalRoom.g:175:1: ( ruleRefableType EOF )
+            // InternalRoom.g:176:1: ruleRefableType EOF
             {
              before(grammarAccess.getRefableTypeRule()); 
-            pushFollow(FOLLOW_ruleRefableType_in_entryRuleRefableType303);
+            pushFollow(FOLLOW_1);
             ruleRefableType();
 
             state._fsp--;
 
              after(grammarAccess.getRefableTypeRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRefableType310); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -530,23 +530,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleRefableType"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:183:1: ruleRefableType : ( ( rule__RefableType__Group__0 ) ) ;
+    // InternalRoom.g:183:1: ruleRefableType : ( ( rule__RefableType__Group__0 ) ) ;
     public final void ruleRefableType() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:187:2: ( ( ( rule__RefableType__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:188:1: ( ( rule__RefableType__Group__0 ) )
+            // InternalRoom.g:187:2: ( ( ( rule__RefableType__Group__0 ) ) )
+            // InternalRoom.g:188:1: ( ( rule__RefableType__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:188:1: ( ( rule__RefableType__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:189:1: ( rule__RefableType__Group__0 )
+            // InternalRoom.g:188:1: ( ( rule__RefableType__Group__0 ) )
+            // InternalRoom.g:189:1: ( rule__RefableType__Group__0 )
             {
              before(grammarAccess.getRefableTypeAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:190:1: ( rule__RefableType__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:190:2: rule__RefableType__Group__0
+            // InternalRoom.g:190:1: ( rule__RefableType__Group__0 )
+            // InternalRoom.g:190:2: rule__RefableType__Group__0
             {
-            pushFollow(FOLLOW_rule__RefableType__Group__0_in_ruleRefableType336);
+            pushFollow(FOLLOW_2);
             rule__RefableType__Group__0();
 
             state._fsp--;
@@ -577,20 +577,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleDataType"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:202:1: entryRuleDataType : ruleDataType EOF ;
+    // InternalRoom.g:202:1: entryRuleDataType : ruleDataType EOF ;
     public final void entryRuleDataType() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:203:1: ( ruleDataType EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:204:1: ruleDataType EOF
+            // InternalRoom.g:203:1: ( ruleDataType EOF )
+            // InternalRoom.g:204:1: ruleDataType EOF
             {
              before(grammarAccess.getDataTypeRule()); 
-            pushFollow(FOLLOW_ruleDataType_in_entryRuleDataType363);
+            pushFollow(FOLLOW_1);
             ruleDataType();
 
             state._fsp--;
 
              after(grammarAccess.getDataTypeRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDataType370); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -607,23 +607,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleDataType"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:211:1: ruleDataType : ( ( rule__DataType__Alternatives ) ) ;
+    // InternalRoom.g:211:1: ruleDataType : ( ( rule__DataType__Alternatives ) ) ;
     public final void ruleDataType() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:215:2: ( ( ( rule__DataType__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:216:1: ( ( rule__DataType__Alternatives ) )
+            // InternalRoom.g:215:2: ( ( ( rule__DataType__Alternatives ) ) )
+            // InternalRoom.g:216:1: ( ( rule__DataType__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:216:1: ( ( rule__DataType__Alternatives ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:217:1: ( rule__DataType__Alternatives )
+            // InternalRoom.g:216:1: ( ( rule__DataType__Alternatives ) )
+            // InternalRoom.g:217:1: ( rule__DataType__Alternatives )
             {
              before(grammarAccess.getDataTypeAccess().getAlternatives()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:218:1: ( rule__DataType__Alternatives )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:218:2: rule__DataType__Alternatives
+            // InternalRoom.g:218:1: ( rule__DataType__Alternatives )
+            // InternalRoom.g:218:2: rule__DataType__Alternatives
             {
-            pushFollow(FOLLOW_rule__DataType__Alternatives_in_ruleDataType396);
+            pushFollow(FOLLOW_2);
             rule__DataType__Alternatives();
 
             state._fsp--;
@@ -654,20 +654,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleComplexType"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:230:1: entryRuleComplexType : ruleComplexType EOF ;
+    // InternalRoom.g:230:1: entryRuleComplexType : ruleComplexType EOF ;
     public final void entryRuleComplexType() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:231:1: ( ruleComplexType EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:232:1: ruleComplexType EOF
+            // InternalRoom.g:231:1: ( ruleComplexType EOF )
+            // InternalRoom.g:232:1: ruleComplexType EOF
             {
              before(grammarAccess.getComplexTypeRule()); 
-            pushFollow(FOLLOW_ruleComplexType_in_entryRuleComplexType423);
+            pushFollow(FOLLOW_1);
             ruleComplexType();
 
             state._fsp--;
 
              after(grammarAccess.getComplexTypeRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleComplexType430); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -684,23 +684,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleComplexType"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:239:1: ruleComplexType : ( ( rule__ComplexType__Alternatives ) ) ;
+    // InternalRoom.g:239:1: ruleComplexType : ( ( rule__ComplexType__Alternatives ) ) ;
     public final void ruleComplexType() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:243:2: ( ( ( rule__ComplexType__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:244:1: ( ( rule__ComplexType__Alternatives ) )
+            // InternalRoom.g:243:2: ( ( ( rule__ComplexType__Alternatives ) ) )
+            // InternalRoom.g:244:1: ( ( rule__ComplexType__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:244:1: ( ( rule__ComplexType__Alternatives ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:245:1: ( rule__ComplexType__Alternatives )
+            // InternalRoom.g:244:1: ( ( rule__ComplexType__Alternatives ) )
+            // InternalRoom.g:245:1: ( rule__ComplexType__Alternatives )
             {
              before(grammarAccess.getComplexTypeAccess().getAlternatives()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:246:1: ( rule__ComplexType__Alternatives )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:246:2: rule__ComplexType__Alternatives
+            // InternalRoom.g:246:1: ( rule__ComplexType__Alternatives )
+            // InternalRoom.g:246:2: rule__ComplexType__Alternatives
             {
-            pushFollow(FOLLOW_rule__ComplexType__Alternatives_in_ruleComplexType456);
+            pushFollow(FOLLOW_2);
             rule__ComplexType__Alternatives();
 
             state._fsp--;
@@ -731,20 +731,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRulePrimitiveType"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:258:1: entryRulePrimitiveType : rulePrimitiveType EOF ;
+    // InternalRoom.g:258:1: entryRulePrimitiveType : rulePrimitiveType EOF ;
     public final void entryRulePrimitiveType() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:259:1: ( rulePrimitiveType EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:260:1: rulePrimitiveType EOF
+            // InternalRoom.g:259:1: ( rulePrimitiveType EOF )
+            // InternalRoom.g:260:1: rulePrimitiveType EOF
             {
              before(grammarAccess.getPrimitiveTypeRule()); 
-            pushFollow(FOLLOW_rulePrimitiveType_in_entryRulePrimitiveType483);
+            pushFollow(FOLLOW_1);
             rulePrimitiveType();
 
             state._fsp--;
 
              after(grammarAccess.getPrimitiveTypeRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRulePrimitiveType490); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -761,23 +761,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rulePrimitiveType"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:267:1: rulePrimitiveType : ( ( rule__PrimitiveType__Group__0 ) ) ;
+    // InternalRoom.g:267:1: rulePrimitiveType : ( ( rule__PrimitiveType__Group__0 ) ) ;
     public final void rulePrimitiveType() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:271:2: ( ( ( rule__PrimitiveType__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:272:1: ( ( rule__PrimitiveType__Group__0 ) )
+            // InternalRoom.g:271:2: ( ( ( rule__PrimitiveType__Group__0 ) ) )
+            // InternalRoom.g:272:1: ( ( rule__PrimitiveType__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:272:1: ( ( rule__PrimitiveType__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:273:1: ( rule__PrimitiveType__Group__0 )
+            // InternalRoom.g:272:1: ( ( rule__PrimitiveType__Group__0 ) )
+            // InternalRoom.g:273:1: ( rule__PrimitiveType__Group__0 )
             {
              before(grammarAccess.getPrimitiveTypeAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:274:1: ( rule__PrimitiveType__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:274:2: rule__PrimitiveType__Group__0
+            // InternalRoom.g:274:1: ( rule__PrimitiveType__Group__0 )
+            // InternalRoom.g:274:2: rule__PrimitiveType__Group__0
             {
-            pushFollow(FOLLOW_rule__PrimitiveType__Group__0_in_rulePrimitiveType516);
+            pushFollow(FOLLOW_2);
             rule__PrimitiveType__Group__0();
 
             state._fsp--;
@@ -808,20 +808,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleEnumerationType"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:286:1: entryRuleEnumerationType : ruleEnumerationType EOF ;
+    // InternalRoom.g:286:1: entryRuleEnumerationType : ruleEnumerationType EOF ;
     public final void entryRuleEnumerationType() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:287:1: ( ruleEnumerationType EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:288:1: ruleEnumerationType EOF
+            // InternalRoom.g:287:1: ( ruleEnumerationType EOF )
+            // InternalRoom.g:288:1: ruleEnumerationType EOF
             {
              before(grammarAccess.getEnumerationTypeRule()); 
-            pushFollow(FOLLOW_ruleEnumerationType_in_entryRuleEnumerationType543);
+            pushFollow(FOLLOW_1);
             ruleEnumerationType();
 
             state._fsp--;
 
              after(grammarAccess.getEnumerationTypeRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleEnumerationType550); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -838,23 +838,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleEnumerationType"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:295:1: ruleEnumerationType : ( ( rule__EnumerationType__Group__0 ) ) ;
+    // InternalRoom.g:295:1: ruleEnumerationType : ( ( rule__EnumerationType__Group__0 ) ) ;
     public final void ruleEnumerationType() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:299:2: ( ( ( rule__EnumerationType__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:300:1: ( ( rule__EnumerationType__Group__0 ) )
+            // InternalRoom.g:299:2: ( ( ( rule__EnumerationType__Group__0 ) ) )
+            // InternalRoom.g:300:1: ( ( rule__EnumerationType__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:300:1: ( ( rule__EnumerationType__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:301:1: ( rule__EnumerationType__Group__0 )
+            // InternalRoom.g:300:1: ( ( rule__EnumerationType__Group__0 ) )
+            // InternalRoom.g:301:1: ( rule__EnumerationType__Group__0 )
             {
              before(grammarAccess.getEnumerationTypeAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:302:1: ( rule__EnumerationType__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:302:2: rule__EnumerationType__Group__0
+            // InternalRoom.g:302:1: ( rule__EnumerationType__Group__0 )
+            // InternalRoom.g:302:2: rule__EnumerationType__Group__0
             {
-            pushFollow(FOLLOW_rule__EnumerationType__Group__0_in_ruleEnumerationType576);
+            pushFollow(FOLLOW_2);
             rule__EnumerationType__Group__0();
 
             state._fsp--;
@@ -885,20 +885,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleEnumLiteral"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:314:1: entryRuleEnumLiteral : ruleEnumLiteral EOF ;
+    // InternalRoom.g:314:1: entryRuleEnumLiteral : ruleEnumLiteral EOF ;
     public final void entryRuleEnumLiteral() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:315:1: ( ruleEnumLiteral EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:316:1: ruleEnumLiteral EOF
+            // InternalRoom.g:315:1: ( ruleEnumLiteral EOF )
+            // InternalRoom.g:316:1: ruleEnumLiteral EOF
             {
              before(grammarAccess.getEnumLiteralRule()); 
-            pushFollow(FOLLOW_ruleEnumLiteral_in_entryRuleEnumLiteral603);
+            pushFollow(FOLLOW_1);
             ruleEnumLiteral();
 
             state._fsp--;
 
              after(grammarAccess.getEnumLiteralRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleEnumLiteral610); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -915,23 +915,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleEnumLiteral"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:323:1: ruleEnumLiteral : ( ( rule__EnumLiteral__Group__0 ) ) ;
+    // InternalRoom.g:323:1: ruleEnumLiteral : ( ( rule__EnumLiteral__Group__0 ) ) ;
     public final void ruleEnumLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:327:2: ( ( ( rule__EnumLiteral__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:328:1: ( ( rule__EnumLiteral__Group__0 ) )
+            // InternalRoom.g:327:2: ( ( ( rule__EnumLiteral__Group__0 ) ) )
+            // InternalRoom.g:328:1: ( ( rule__EnumLiteral__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:328:1: ( ( rule__EnumLiteral__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:329:1: ( rule__EnumLiteral__Group__0 )
+            // InternalRoom.g:328:1: ( ( rule__EnumLiteral__Group__0 ) )
+            // InternalRoom.g:329:1: ( rule__EnumLiteral__Group__0 )
             {
              before(grammarAccess.getEnumLiteralAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:330:1: ( rule__EnumLiteral__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:330:2: rule__EnumLiteral__Group__0
+            // InternalRoom.g:330:1: ( rule__EnumLiteral__Group__0 )
+            // InternalRoom.g:330:2: rule__EnumLiteral__Group__0
             {
-            pushFollow(FOLLOW_rule__EnumLiteral__Group__0_in_ruleEnumLiteral636);
+            pushFollow(FOLLOW_2);
             rule__EnumLiteral__Group__0();
 
             state._fsp--;
@@ -962,20 +962,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleExternalType"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:342:1: entryRuleExternalType : ruleExternalType EOF ;
+    // InternalRoom.g:342:1: entryRuleExternalType : ruleExternalType EOF ;
     public final void entryRuleExternalType() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:343:1: ( ruleExternalType EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:344:1: ruleExternalType EOF
+            // InternalRoom.g:343:1: ( ruleExternalType EOF )
+            // InternalRoom.g:344:1: ruleExternalType EOF
             {
              before(grammarAccess.getExternalTypeRule()); 
-            pushFollow(FOLLOW_ruleExternalType_in_entryRuleExternalType663);
+            pushFollow(FOLLOW_1);
             ruleExternalType();
 
             state._fsp--;
 
              after(grammarAccess.getExternalTypeRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleExternalType670); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -992,23 +992,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleExternalType"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:351:1: ruleExternalType : ( ( rule__ExternalType__Group__0 ) ) ;
+    // InternalRoom.g:351:1: ruleExternalType : ( ( rule__ExternalType__Group__0 ) ) ;
     public final void ruleExternalType() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:355:2: ( ( ( rule__ExternalType__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:356:1: ( ( rule__ExternalType__Group__0 ) )
+            // InternalRoom.g:355:2: ( ( ( rule__ExternalType__Group__0 ) ) )
+            // InternalRoom.g:356:1: ( ( rule__ExternalType__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:356:1: ( ( rule__ExternalType__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:357:1: ( rule__ExternalType__Group__0 )
+            // InternalRoom.g:356:1: ( ( rule__ExternalType__Group__0 ) )
+            // InternalRoom.g:357:1: ( rule__ExternalType__Group__0 )
             {
              before(grammarAccess.getExternalTypeAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:358:1: ( rule__ExternalType__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:358:2: rule__ExternalType__Group__0
+            // InternalRoom.g:358:1: ( rule__ExternalType__Group__0 )
+            // InternalRoom.g:358:2: rule__ExternalType__Group__0
             {
-            pushFollow(FOLLOW_rule__ExternalType__Group__0_in_ruleExternalType696);
+            pushFollow(FOLLOW_2);
             rule__ExternalType__Group__0();
 
             state._fsp--;
@@ -1039,20 +1039,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleDataClass"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:370:1: entryRuleDataClass : ruleDataClass EOF ;
+    // InternalRoom.g:370:1: entryRuleDataClass : ruleDataClass EOF ;
     public final void entryRuleDataClass() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:371:1: ( ruleDataClass EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:372:1: ruleDataClass EOF
+            // InternalRoom.g:371:1: ( ruleDataClass EOF )
+            // InternalRoom.g:372:1: ruleDataClass EOF
             {
              before(grammarAccess.getDataClassRule()); 
-            pushFollow(FOLLOW_ruleDataClass_in_entryRuleDataClass723);
+            pushFollow(FOLLOW_1);
             ruleDataClass();
 
             state._fsp--;
 
              after(grammarAccess.getDataClassRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDataClass730); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1069,23 +1069,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleDataClass"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:379:1: ruleDataClass : ( ( rule__DataClass__Group__0 ) ) ;
+    // InternalRoom.g:379:1: ruleDataClass : ( ( rule__DataClass__Group__0 ) ) ;
     public final void ruleDataClass() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:383:2: ( ( ( rule__DataClass__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:384:1: ( ( rule__DataClass__Group__0 ) )
+            // InternalRoom.g:383:2: ( ( ( rule__DataClass__Group__0 ) ) )
+            // InternalRoom.g:384:1: ( ( rule__DataClass__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:384:1: ( ( rule__DataClass__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:385:1: ( rule__DataClass__Group__0 )
+            // InternalRoom.g:384:1: ( ( rule__DataClass__Group__0 ) )
+            // InternalRoom.g:385:1: ( rule__DataClass__Group__0 )
             {
              before(grammarAccess.getDataClassAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:386:1: ( rule__DataClass__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:386:2: rule__DataClass__Group__0
+            // InternalRoom.g:386:1: ( rule__DataClass__Group__0 )
+            // InternalRoom.g:386:2: rule__DataClass__Group__0
             {
-            pushFollow(FOLLOW_rule__DataClass__Group__0_in_ruleDataClass756);
+            pushFollow(FOLLOW_2);
             rule__DataClass__Group__0();
 
             state._fsp--;
@@ -1116,20 +1116,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleAttribute"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:398:1: entryRuleAttribute : ruleAttribute EOF ;
+    // InternalRoom.g:398:1: entryRuleAttribute : ruleAttribute EOF ;
     public final void entryRuleAttribute() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:399:1: ( ruleAttribute EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:400:1: ruleAttribute EOF
+            // InternalRoom.g:399:1: ( ruleAttribute EOF )
+            // InternalRoom.g:400:1: ruleAttribute EOF
             {
              before(grammarAccess.getAttributeRule()); 
-            pushFollow(FOLLOW_ruleAttribute_in_entryRuleAttribute783);
+            pushFollow(FOLLOW_1);
             ruleAttribute();
 
             state._fsp--;
 
              after(grammarAccess.getAttributeRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAttribute790); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1146,23 +1146,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleAttribute"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:407:1: ruleAttribute : ( ( rule__Attribute__Group__0 ) ) ;
+    // InternalRoom.g:407:1: ruleAttribute : ( ( rule__Attribute__Group__0 ) ) ;
     public final void ruleAttribute() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:411:2: ( ( ( rule__Attribute__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:412:1: ( ( rule__Attribute__Group__0 ) )
+            // InternalRoom.g:411:2: ( ( ( rule__Attribute__Group__0 ) ) )
+            // InternalRoom.g:412:1: ( ( rule__Attribute__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:412:1: ( ( rule__Attribute__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:413:1: ( rule__Attribute__Group__0 )
+            // InternalRoom.g:412:1: ( ( rule__Attribute__Group__0 ) )
+            // InternalRoom.g:413:1: ( rule__Attribute__Group__0 )
             {
              before(grammarAccess.getAttributeAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:414:1: ( rule__Attribute__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:414:2: rule__Attribute__Group__0
+            // InternalRoom.g:414:1: ( rule__Attribute__Group__0 )
+            // InternalRoom.g:414:2: rule__Attribute__Group__0
             {
-            pushFollow(FOLLOW_rule__Attribute__Group__0_in_ruleAttribute816);
+            pushFollow(FOLLOW_2);
             rule__Attribute__Group__0();
 
             state._fsp--;
@@ -1193,20 +1193,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleStandardOperation"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:428:1: entryRuleStandardOperation : ruleStandardOperation EOF ;
+    // InternalRoom.g:428:1: entryRuleStandardOperation : ruleStandardOperation EOF ;
     public final void entryRuleStandardOperation() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:429:1: ( ruleStandardOperation EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:430:1: ruleStandardOperation EOF
+            // InternalRoom.g:429:1: ( ruleStandardOperation EOF )
+            // InternalRoom.g:430:1: ruleStandardOperation EOF
             {
              before(grammarAccess.getStandardOperationRule()); 
-            pushFollow(FOLLOW_ruleStandardOperation_in_entryRuleStandardOperation845);
+            pushFollow(FOLLOW_1);
             ruleStandardOperation();
 
             state._fsp--;
 
              after(grammarAccess.getStandardOperationRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleStandardOperation852); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1223,23 +1223,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleStandardOperation"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:437:1: ruleStandardOperation : ( ( rule__StandardOperation__Group__0 ) ) ;
+    // InternalRoom.g:437:1: ruleStandardOperation : ( ( rule__StandardOperation__Group__0 ) ) ;
     public final void ruleStandardOperation() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:441:2: ( ( ( rule__StandardOperation__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:442:1: ( ( rule__StandardOperation__Group__0 ) )
+            // InternalRoom.g:441:2: ( ( ( rule__StandardOperation__Group__0 ) ) )
+            // InternalRoom.g:442:1: ( ( rule__StandardOperation__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:442:1: ( ( rule__StandardOperation__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:443:1: ( rule__StandardOperation__Group__0 )
+            // InternalRoom.g:442:1: ( ( rule__StandardOperation__Group__0 ) )
+            // InternalRoom.g:443:1: ( rule__StandardOperation__Group__0 )
             {
              before(grammarAccess.getStandardOperationAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:444:1: ( rule__StandardOperation__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:444:2: rule__StandardOperation__Group__0
+            // InternalRoom.g:444:1: ( rule__StandardOperation__Group__0 )
+            // InternalRoom.g:444:2: rule__StandardOperation__Group__0
             {
-            pushFollow(FOLLOW_rule__StandardOperation__Group__0_in_ruleStandardOperation878);
+            pushFollow(FOLLOW_2);
             rule__StandardOperation__Group__0();
 
             state._fsp--;
@@ -1270,20 +1270,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRulePortOperation"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:456:1: entryRulePortOperation : rulePortOperation EOF ;
+    // InternalRoom.g:456:1: entryRulePortOperation : rulePortOperation EOF ;
     public final void entryRulePortOperation() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:457:1: ( rulePortOperation EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:458:1: rulePortOperation EOF
+            // InternalRoom.g:457:1: ( rulePortOperation EOF )
+            // InternalRoom.g:458:1: rulePortOperation EOF
             {
              before(grammarAccess.getPortOperationRule()); 
-            pushFollow(FOLLOW_rulePortOperation_in_entryRulePortOperation905);
+            pushFollow(FOLLOW_1);
             rulePortOperation();
 
             state._fsp--;
 
              after(grammarAccess.getPortOperationRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRulePortOperation912); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1300,23 +1300,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rulePortOperation"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:465:1: rulePortOperation : ( ( rule__PortOperation__Group__0 ) ) ;
+    // InternalRoom.g:465:1: rulePortOperation : ( ( rule__PortOperation__Group__0 ) ) ;
     public final void rulePortOperation() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:469:2: ( ( ( rule__PortOperation__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:470:1: ( ( rule__PortOperation__Group__0 ) )
+            // InternalRoom.g:469:2: ( ( ( rule__PortOperation__Group__0 ) ) )
+            // InternalRoom.g:470:1: ( ( rule__PortOperation__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:470:1: ( ( rule__PortOperation__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:471:1: ( rule__PortOperation__Group__0 )
+            // InternalRoom.g:470:1: ( ( rule__PortOperation__Group__0 ) )
+            // InternalRoom.g:471:1: ( rule__PortOperation__Group__0 )
             {
              before(grammarAccess.getPortOperationAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:472:1: ( rule__PortOperation__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:472:2: rule__PortOperation__Group__0
+            // InternalRoom.g:472:1: ( rule__PortOperation__Group__0 )
+            // InternalRoom.g:472:2: rule__PortOperation__Group__0
             {
-            pushFollow(FOLLOW_rule__PortOperation__Group__0_in_rulePortOperation938);
+            pushFollow(FOLLOW_2);
             rule__PortOperation__Group__0();
 
             state._fsp--;
@@ -1347,20 +1347,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleClassStructor"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:484:1: entryRuleClassStructor : ruleClassStructor EOF ;
+    // InternalRoom.g:484:1: entryRuleClassStructor : ruleClassStructor EOF ;
     public final void entryRuleClassStructor() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:485:1: ( ruleClassStructor EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:486:1: ruleClassStructor EOF
+            // InternalRoom.g:485:1: ( ruleClassStructor EOF )
+            // InternalRoom.g:486:1: ruleClassStructor EOF
             {
              before(grammarAccess.getClassStructorRule()); 
-            pushFollow(FOLLOW_ruleClassStructor_in_entryRuleClassStructor965);
+            pushFollow(FOLLOW_1);
             ruleClassStructor();
 
             state._fsp--;
 
              after(grammarAccess.getClassStructorRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleClassStructor972); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1377,23 +1377,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleClassStructor"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:493:1: ruleClassStructor : ( ( rule__ClassStructor__Group__0 ) ) ;
+    // InternalRoom.g:493:1: ruleClassStructor : ( ( rule__ClassStructor__Group__0 ) ) ;
     public final void ruleClassStructor() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:497:2: ( ( ( rule__ClassStructor__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:498:1: ( ( rule__ClassStructor__Group__0 ) )
+            // InternalRoom.g:497:2: ( ( ( rule__ClassStructor__Group__0 ) ) )
+            // InternalRoom.g:498:1: ( ( rule__ClassStructor__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:498:1: ( ( rule__ClassStructor__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:499:1: ( rule__ClassStructor__Group__0 )
+            // InternalRoom.g:498:1: ( ( rule__ClassStructor__Group__0 ) )
+            // InternalRoom.g:499:1: ( rule__ClassStructor__Group__0 )
             {
              before(grammarAccess.getClassStructorAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:500:1: ( rule__ClassStructor__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:500:2: rule__ClassStructor__Group__0
+            // InternalRoom.g:500:1: ( rule__ClassStructor__Group__0 )
+            // InternalRoom.g:500:2: rule__ClassStructor__Group__0
             {
-            pushFollow(FOLLOW_rule__ClassStructor__Group__0_in_ruleClassStructor998);
+            pushFollow(FOLLOW_2);
             rule__ClassStructor__Group__0();
 
             state._fsp--;
@@ -1424,20 +1424,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleGeneralProtocolClass"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:512:1: entryRuleGeneralProtocolClass : ruleGeneralProtocolClass EOF ;
+    // InternalRoom.g:512:1: entryRuleGeneralProtocolClass : ruleGeneralProtocolClass EOF ;
     public final void entryRuleGeneralProtocolClass() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:513:1: ( ruleGeneralProtocolClass EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:514:1: ruleGeneralProtocolClass EOF
+            // InternalRoom.g:513:1: ( ruleGeneralProtocolClass EOF )
+            // InternalRoom.g:514:1: ruleGeneralProtocolClass EOF
             {
              before(grammarAccess.getGeneralProtocolClassRule()); 
-            pushFollow(FOLLOW_ruleGeneralProtocolClass_in_entryRuleGeneralProtocolClass1025);
+            pushFollow(FOLLOW_1);
             ruleGeneralProtocolClass();
 
             state._fsp--;
 
              after(grammarAccess.getGeneralProtocolClassRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleGeneralProtocolClass1032); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1454,23 +1454,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleGeneralProtocolClass"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:521:1: ruleGeneralProtocolClass : ( ( rule__GeneralProtocolClass__Alternatives ) ) ;
+    // InternalRoom.g:521:1: ruleGeneralProtocolClass : ( ( rule__GeneralProtocolClass__Alternatives ) ) ;
     public final void ruleGeneralProtocolClass() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:525:2: ( ( ( rule__GeneralProtocolClass__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:526:1: ( ( rule__GeneralProtocolClass__Alternatives ) )
+            // InternalRoom.g:525:2: ( ( ( rule__GeneralProtocolClass__Alternatives ) ) )
+            // InternalRoom.g:526:1: ( ( rule__GeneralProtocolClass__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:526:1: ( ( rule__GeneralProtocolClass__Alternatives ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:527:1: ( rule__GeneralProtocolClass__Alternatives )
+            // InternalRoom.g:526:1: ( ( rule__GeneralProtocolClass__Alternatives ) )
+            // InternalRoom.g:527:1: ( rule__GeneralProtocolClass__Alternatives )
             {
              before(grammarAccess.getGeneralProtocolClassAccess().getAlternatives()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:528:1: ( rule__GeneralProtocolClass__Alternatives )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:528:2: rule__GeneralProtocolClass__Alternatives
+            // InternalRoom.g:528:1: ( rule__GeneralProtocolClass__Alternatives )
+            // InternalRoom.g:528:2: rule__GeneralProtocolClass__Alternatives
             {
-            pushFollow(FOLLOW_rule__GeneralProtocolClass__Alternatives_in_ruleGeneralProtocolClass1058);
+            pushFollow(FOLLOW_2);
             rule__GeneralProtocolClass__Alternatives();
 
             state._fsp--;
@@ -1501,20 +1501,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleProtocolClass"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:540:1: entryRuleProtocolClass : ruleProtocolClass EOF ;
+    // InternalRoom.g:540:1: entryRuleProtocolClass : ruleProtocolClass EOF ;
     public final void entryRuleProtocolClass() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:541:1: ( ruleProtocolClass EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:542:1: ruleProtocolClass EOF
+            // InternalRoom.g:541:1: ( ruleProtocolClass EOF )
+            // InternalRoom.g:542:1: ruleProtocolClass EOF
             {
              before(grammarAccess.getProtocolClassRule()); 
-            pushFollow(FOLLOW_ruleProtocolClass_in_entryRuleProtocolClass1085);
+            pushFollow(FOLLOW_1);
             ruleProtocolClass();
 
             state._fsp--;
 
              after(grammarAccess.getProtocolClassRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleProtocolClass1092); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1531,23 +1531,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleProtocolClass"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:549:1: ruleProtocolClass : ( ( rule__ProtocolClass__Group__0 ) ) ;
+    // InternalRoom.g:549:1: ruleProtocolClass : ( ( rule__ProtocolClass__Group__0 ) ) ;
     public final void ruleProtocolClass() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:553:2: ( ( ( rule__ProtocolClass__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:554:1: ( ( rule__ProtocolClass__Group__0 ) )
+            // InternalRoom.g:553:2: ( ( ( rule__ProtocolClass__Group__0 ) ) )
+            // InternalRoom.g:554:1: ( ( rule__ProtocolClass__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:554:1: ( ( rule__ProtocolClass__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:555:1: ( rule__ProtocolClass__Group__0 )
+            // InternalRoom.g:554:1: ( ( rule__ProtocolClass__Group__0 ) )
+            // InternalRoom.g:555:1: ( rule__ProtocolClass__Group__0 )
             {
              before(grammarAccess.getProtocolClassAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:556:1: ( rule__ProtocolClass__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:556:2: rule__ProtocolClass__Group__0
+            // InternalRoom.g:556:1: ( rule__ProtocolClass__Group__0 )
+            // InternalRoom.g:556:2: rule__ProtocolClass__Group__0
             {
-            pushFollow(FOLLOW_rule__ProtocolClass__Group__0_in_ruleProtocolClass1118);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClass__Group__0();
 
             state._fsp--;
@@ -1578,20 +1578,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleCompoundProtocolClass"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:568:1: entryRuleCompoundProtocolClass : ruleCompoundProtocolClass EOF ;
+    // InternalRoom.g:568:1: entryRuleCompoundProtocolClass : ruleCompoundProtocolClass EOF ;
     public final void entryRuleCompoundProtocolClass() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:569:1: ( ruleCompoundProtocolClass EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:570:1: ruleCompoundProtocolClass EOF
+            // InternalRoom.g:569:1: ( ruleCompoundProtocolClass EOF )
+            // InternalRoom.g:570:1: ruleCompoundProtocolClass EOF
             {
              before(grammarAccess.getCompoundProtocolClassRule()); 
-            pushFollow(FOLLOW_ruleCompoundProtocolClass_in_entryRuleCompoundProtocolClass1145);
+            pushFollow(FOLLOW_1);
             ruleCompoundProtocolClass();
 
             state._fsp--;
 
              after(grammarAccess.getCompoundProtocolClassRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleCompoundProtocolClass1152); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1608,23 +1608,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleCompoundProtocolClass"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:577:1: ruleCompoundProtocolClass : ( ( rule__CompoundProtocolClass__Group__0 ) ) ;
+    // InternalRoom.g:577:1: ruleCompoundProtocolClass : ( ( rule__CompoundProtocolClass__Group__0 ) ) ;
     public final void ruleCompoundProtocolClass() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:581:2: ( ( ( rule__CompoundProtocolClass__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:582:1: ( ( rule__CompoundProtocolClass__Group__0 ) )
+            // InternalRoom.g:581:2: ( ( ( rule__CompoundProtocolClass__Group__0 ) ) )
+            // InternalRoom.g:582:1: ( ( rule__CompoundProtocolClass__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:582:1: ( ( rule__CompoundProtocolClass__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:583:1: ( rule__CompoundProtocolClass__Group__0 )
+            // InternalRoom.g:582:1: ( ( rule__CompoundProtocolClass__Group__0 ) )
+            // InternalRoom.g:583:1: ( rule__CompoundProtocolClass__Group__0 )
             {
              before(grammarAccess.getCompoundProtocolClassAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:584:1: ( rule__CompoundProtocolClass__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:584:2: rule__CompoundProtocolClass__Group__0
+            // InternalRoom.g:584:1: ( rule__CompoundProtocolClass__Group__0 )
+            // InternalRoom.g:584:2: rule__CompoundProtocolClass__Group__0
             {
-            pushFollow(FOLLOW_rule__CompoundProtocolClass__Group__0_in_ruleCompoundProtocolClass1178);
+            pushFollow(FOLLOW_2);
             rule__CompoundProtocolClass__Group__0();
 
             state._fsp--;
@@ -1655,20 +1655,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleSubProtocol"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:596:1: entryRuleSubProtocol : ruleSubProtocol EOF ;
+    // InternalRoom.g:596:1: entryRuleSubProtocol : ruleSubProtocol EOF ;
     public final void entryRuleSubProtocol() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:597:1: ( ruleSubProtocol EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:598:1: ruleSubProtocol EOF
+            // InternalRoom.g:597:1: ( ruleSubProtocol EOF )
+            // InternalRoom.g:598:1: ruleSubProtocol EOF
             {
              before(grammarAccess.getSubProtocolRule()); 
-            pushFollow(FOLLOW_ruleSubProtocol_in_entryRuleSubProtocol1205);
+            pushFollow(FOLLOW_1);
             ruleSubProtocol();
 
             state._fsp--;
 
              after(grammarAccess.getSubProtocolRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSubProtocol1212); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1685,23 +1685,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleSubProtocol"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:605:1: ruleSubProtocol : ( ( rule__SubProtocol__Group__0 ) ) ;
+    // InternalRoom.g:605:1: ruleSubProtocol : ( ( rule__SubProtocol__Group__0 ) ) ;
     public final void ruleSubProtocol() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:609:2: ( ( ( rule__SubProtocol__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:610:1: ( ( rule__SubProtocol__Group__0 ) )
+            // InternalRoom.g:609:2: ( ( ( rule__SubProtocol__Group__0 ) ) )
+            // InternalRoom.g:610:1: ( ( rule__SubProtocol__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:610:1: ( ( rule__SubProtocol__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:611:1: ( rule__SubProtocol__Group__0 )
+            // InternalRoom.g:610:1: ( ( rule__SubProtocol__Group__0 ) )
+            // InternalRoom.g:611:1: ( rule__SubProtocol__Group__0 )
             {
              before(grammarAccess.getSubProtocolAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:612:1: ( rule__SubProtocol__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:612:2: rule__SubProtocol__Group__0
+            // InternalRoom.g:612:1: ( rule__SubProtocol__Group__0 )
+            // InternalRoom.g:612:2: rule__SubProtocol__Group__0
             {
-            pushFollow(FOLLOW_rule__SubProtocol__Group__0_in_ruleSubProtocol1238);
+            pushFollow(FOLLOW_2);
             rule__SubProtocol__Group__0();
 
             state._fsp--;
@@ -1732,20 +1732,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleMessage"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:624:1: entryRuleMessage : ruleMessage EOF ;
+    // InternalRoom.g:624:1: entryRuleMessage : ruleMessage EOF ;
     public final void entryRuleMessage() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:625:1: ( ruleMessage EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:626:1: ruleMessage EOF
+            // InternalRoom.g:625:1: ( ruleMessage EOF )
+            // InternalRoom.g:626:1: ruleMessage EOF
             {
              before(grammarAccess.getMessageRule()); 
-            pushFollow(FOLLOW_ruleMessage_in_entryRuleMessage1265);
+            pushFollow(FOLLOW_1);
             ruleMessage();
 
             state._fsp--;
 
              after(grammarAccess.getMessageRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleMessage1272); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1762,23 +1762,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleMessage"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:633:1: ruleMessage : ( ( rule__Message__Group__0 ) ) ;
+    // InternalRoom.g:633:1: ruleMessage : ( ( rule__Message__Group__0 ) ) ;
     public final void ruleMessage() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:637:2: ( ( ( rule__Message__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:638:1: ( ( rule__Message__Group__0 ) )
+            // InternalRoom.g:637:2: ( ( ( rule__Message__Group__0 ) ) )
+            // InternalRoom.g:638:1: ( ( rule__Message__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:638:1: ( ( rule__Message__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:639:1: ( rule__Message__Group__0 )
+            // InternalRoom.g:638:1: ( ( rule__Message__Group__0 ) )
+            // InternalRoom.g:639:1: ( rule__Message__Group__0 )
             {
              before(grammarAccess.getMessageAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:640:1: ( rule__Message__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:640:2: rule__Message__Group__0
+            // InternalRoom.g:640:1: ( rule__Message__Group__0 )
+            // InternalRoom.g:640:2: rule__Message__Group__0
             {
-            pushFollow(FOLLOW_rule__Message__Group__0_in_ruleMessage1298);
+            pushFollow(FOLLOW_2);
             rule__Message__Group__0();
 
             state._fsp--;
@@ -1809,20 +1809,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRulePortClass"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:652:1: entryRulePortClass : rulePortClass EOF ;
+    // InternalRoom.g:652:1: entryRulePortClass : rulePortClass EOF ;
     public final void entryRulePortClass() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:653:1: ( rulePortClass EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:654:1: rulePortClass EOF
+            // InternalRoom.g:653:1: ( rulePortClass EOF )
+            // InternalRoom.g:654:1: rulePortClass EOF
             {
              before(grammarAccess.getPortClassRule()); 
-            pushFollow(FOLLOW_rulePortClass_in_entryRulePortClass1325);
+            pushFollow(FOLLOW_1);
             rulePortClass();
 
             state._fsp--;
 
              after(grammarAccess.getPortClassRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRulePortClass1332); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1839,23 +1839,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rulePortClass"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:661:1: rulePortClass : ( ( rule__PortClass__Group__0 ) ) ;
+    // InternalRoom.g:661:1: rulePortClass : ( ( rule__PortClass__Group__0 ) ) ;
     public final void rulePortClass() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:665:2: ( ( ( rule__PortClass__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:666:1: ( ( rule__PortClass__Group__0 ) )
+            // InternalRoom.g:665:2: ( ( ( rule__PortClass__Group__0 ) ) )
+            // InternalRoom.g:666:1: ( ( rule__PortClass__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:666:1: ( ( rule__PortClass__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:667:1: ( rule__PortClass__Group__0 )
+            // InternalRoom.g:666:1: ( ( rule__PortClass__Group__0 ) )
+            // InternalRoom.g:667:1: ( rule__PortClass__Group__0 )
             {
              before(grammarAccess.getPortClassAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:668:1: ( rule__PortClass__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:668:2: rule__PortClass__Group__0
+            // InternalRoom.g:668:1: ( rule__PortClass__Group__0 )
+            // InternalRoom.g:668:2: rule__PortClass__Group__0
             {
-            pushFollow(FOLLOW_rule__PortClass__Group__0_in_rulePortClass1358);
+            pushFollow(FOLLOW_2);
             rule__PortClass__Group__0();
 
             state._fsp--;
@@ -1886,20 +1886,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleMessageHandler"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:680:1: entryRuleMessageHandler : ruleMessageHandler EOF ;
+    // InternalRoom.g:680:1: entryRuleMessageHandler : ruleMessageHandler EOF ;
     public final void entryRuleMessageHandler() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:681:1: ( ruleMessageHandler EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:682:1: ruleMessageHandler EOF
+            // InternalRoom.g:681:1: ( ruleMessageHandler EOF )
+            // InternalRoom.g:682:1: ruleMessageHandler EOF
             {
              before(grammarAccess.getMessageHandlerRule()); 
-            pushFollow(FOLLOW_ruleMessageHandler_in_entryRuleMessageHandler1385);
+            pushFollow(FOLLOW_1);
             ruleMessageHandler();
 
             state._fsp--;
 
              after(grammarAccess.getMessageHandlerRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleMessageHandler1392); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1916,23 +1916,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleMessageHandler"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:689:1: ruleMessageHandler : ( ( rule__MessageHandler__Alternatives ) ) ;
+    // InternalRoom.g:689:1: ruleMessageHandler : ( ( rule__MessageHandler__Alternatives ) ) ;
     public final void ruleMessageHandler() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:693:2: ( ( ( rule__MessageHandler__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:694:1: ( ( rule__MessageHandler__Alternatives ) )
+            // InternalRoom.g:693:2: ( ( ( rule__MessageHandler__Alternatives ) ) )
+            // InternalRoom.g:694:1: ( ( rule__MessageHandler__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:694:1: ( ( rule__MessageHandler__Alternatives ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:695:1: ( rule__MessageHandler__Alternatives )
+            // InternalRoom.g:694:1: ( ( rule__MessageHandler__Alternatives ) )
+            // InternalRoom.g:695:1: ( rule__MessageHandler__Alternatives )
             {
              before(grammarAccess.getMessageHandlerAccess().getAlternatives()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:696:1: ( rule__MessageHandler__Alternatives )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:696:2: rule__MessageHandler__Alternatives
+            // InternalRoom.g:696:1: ( rule__MessageHandler__Alternatives )
+            // InternalRoom.g:696:2: rule__MessageHandler__Alternatives
             {
-            pushFollow(FOLLOW_rule__MessageHandler__Alternatives_in_ruleMessageHandler1418);
+            pushFollow(FOLLOW_2);
             rule__MessageHandler__Alternatives();
 
             state._fsp--;
@@ -1963,20 +1963,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleInMessageHandler"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:708:1: entryRuleInMessageHandler : ruleInMessageHandler EOF ;
+    // InternalRoom.g:708:1: entryRuleInMessageHandler : ruleInMessageHandler EOF ;
     public final void entryRuleInMessageHandler() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:709:1: ( ruleInMessageHandler EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:710:1: ruleInMessageHandler EOF
+            // InternalRoom.g:709:1: ( ruleInMessageHandler EOF )
+            // InternalRoom.g:710:1: ruleInMessageHandler EOF
             {
              before(grammarAccess.getInMessageHandlerRule()); 
-            pushFollow(FOLLOW_ruleInMessageHandler_in_entryRuleInMessageHandler1445);
+            pushFollow(FOLLOW_1);
             ruleInMessageHandler();
 
             state._fsp--;
 
              after(grammarAccess.getInMessageHandlerRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleInMessageHandler1452); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1993,23 +1993,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleInMessageHandler"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:717:1: ruleInMessageHandler : ( ( rule__InMessageHandler__Group__0 ) ) ;
+    // InternalRoom.g:717:1: ruleInMessageHandler : ( ( rule__InMessageHandler__Group__0 ) ) ;
     public final void ruleInMessageHandler() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:721:2: ( ( ( rule__InMessageHandler__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:722:1: ( ( rule__InMessageHandler__Group__0 ) )
+            // InternalRoom.g:721:2: ( ( ( rule__InMessageHandler__Group__0 ) ) )
+            // InternalRoom.g:722:1: ( ( rule__InMessageHandler__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:722:1: ( ( rule__InMessageHandler__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:723:1: ( rule__InMessageHandler__Group__0 )
+            // InternalRoom.g:722:1: ( ( rule__InMessageHandler__Group__0 ) )
+            // InternalRoom.g:723:1: ( rule__InMessageHandler__Group__0 )
             {
              before(grammarAccess.getInMessageHandlerAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:724:1: ( rule__InMessageHandler__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:724:2: rule__InMessageHandler__Group__0
+            // InternalRoom.g:724:1: ( rule__InMessageHandler__Group__0 )
+            // InternalRoom.g:724:2: rule__InMessageHandler__Group__0
             {
-            pushFollow(FOLLOW_rule__InMessageHandler__Group__0_in_ruleInMessageHandler1478);
+            pushFollow(FOLLOW_2);
             rule__InMessageHandler__Group__0();
 
             state._fsp--;
@@ -2040,20 +2040,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleOutMessageHandler"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:736:1: entryRuleOutMessageHandler : ruleOutMessageHandler EOF ;
+    // InternalRoom.g:736:1: entryRuleOutMessageHandler : ruleOutMessageHandler EOF ;
     public final void entryRuleOutMessageHandler() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:737:1: ( ruleOutMessageHandler EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:738:1: ruleOutMessageHandler EOF
+            // InternalRoom.g:737:1: ( ruleOutMessageHandler EOF )
+            // InternalRoom.g:738:1: ruleOutMessageHandler EOF
             {
              before(grammarAccess.getOutMessageHandlerRule()); 
-            pushFollow(FOLLOW_ruleOutMessageHandler_in_entryRuleOutMessageHandler1505);
+            pushFollow(FOLLOW_1);
             ruleOutMessageHandler();
 
             state._fsp--;
 
              after(grammarAccess.getOutMessageHandlerRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOutMessageHandler1512); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2070,23 +2070,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleOutMessageHandler"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:745:1: ruleOutMessageHandler : ( ( rule__OutMessageHandler__Group__0 ) ) ;
+    // InternalRoom.g:745:1: ruleOutMessageHandler : ( ( rule__OutMessageHandler__Group__0 ) ) ;
     public final void ruleOutMessageHandler() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:749:2: ( ( ( rule__OutMessageHandler__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:750:1: ( ( rule__OutMessageHandler__Group__0 ) )
+            // InternalRoom.g:749:2: ( ( ( rule__OutMessageHandler__Group__0 ) ) )
+            // InternalRoom.g:750:1: ( ( rule__OutMessageHandler__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:750:1: ( ( rule__OutMessageHandler__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:751:1: ( rule__OutMessageHandler__Group__0 )
+            // InternalRoom.g:750:1: ( ( rule__OutMessageHandler__Group__0 ) )
+            // InternalRoom.g:751:1: ( rule__OutMessageHandler__Group__0 )
             {
              before(grammarAccess.getOutMessageHandlerAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:752:1: ( rule__OutMessageHandler__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:752:2: rule__OutMessageHandler__Group__0
+            // InternalRoom.g:752:1: ( rule__OutMessageHandler__Group__0 )
+            // InternalRoom.g:752:2: rule__OutMessageHandler__Group__0
             {
-            pushFollow(FOLLOW_rule__OutMessageHandler__Group__0_in_ruleOutMessageHandler1538);
+            pushFollow(FOLLOW_2);
             rule__OutMessageHandler__Group__0();
 
             state._fsp--;
@@ -2117,20 +2117,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleModelComponent"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:764:1: entryRuleModelComponent : ruleModelComponent EOF ;
+    // InternalRoom.g:764:1: entryRuleModelComponent : ruleModelComponent EOF ;
     public final void entryRuleModelComponent() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:765:1: ( ruleModelComponent EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:766:1: ruleModelComponent EOF
+            // InternalRoom.g:765:1: ( ruleModelComponent EOF )
+            // InternalRoom.g:766:1: ruleModelComponent EOF
             {
              before(grammarAccess.getModelComponentRule()); 
-            pushFollow(FOLLOW_ruleModelComponent_in_entryRuleModelComponent1565);
+            pushFollow(FOLLOW_1);
             ruleModelComponent();
 
             state._fsp--;
 
              after(grammarAccess.getModelComponentRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleModelComponent1572); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2147,20 +2147,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleModelComponent"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:773:1: ruleModelComponent : ( ruleActorClass ) ;
+    // InternalRoom.g:773:1: ruleModelComponent : ( ruleActorClass ) ;
     public final void ruleModelComponent() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:777:2: ( ( ruleActorClass ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:778:1: ( ruleActorClass )
+            // InternalRoom.g:777:2: ( ( ruleActorClass ) )
+            // InternalRoom.g:778:1: ( ruleActorClass )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:778:1: ( ruleActorClass )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:779:1: ruleActorClass
+            // InternalRoom.g:778:1: ( ruleActorClass )
+            // InternalRoom.g:779:1: ruleActorClass
             {
              before(grammarAccess.getModelComponentAccess().getActorClassParserRuleCall()); 
-            pushFollow(FOLLOW_ruleActorClass_in_ruleModelComponent1598);
+            pushFollow(FOLLOW_2);
             ruleActorClass();
 
             state._fsp--;
@@ -2188,20 +2188,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleActorClass"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:792:1: entryRuleActorClass : ruleActorClass EOF ;
+    // InternalRoom.g:792:1: entryRuleActorClass : ruleActorClass EOF ;
     public final void entryRuleActorClass() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:793:1: ( ruleActorClass EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:794:1: ruleActorClass EOF
+            // InternalRoom.g:793:1: ( ruleActorClass EOF )
+            // InternalRoom.g:794:1: ruleActorClass EOF
             {
              before(grammarAccess.getActorClassRule()); 
-            pushFollow(FOLLOW_ruleActorClass_in_entryRuleActorClass1624);
+            pushFollow(FOLLOW_1);
             ruleActorClass();
 
             state._fsp--;
 
              after(grammarAccess.getActorClassRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleActorClass1631); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2218,23 +2218,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleActorClass"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:801:1: ruleActorClass : ( ( rule__ActorClass__Group__0 ) ) ;
+    // InternalRoom.g:801:1: ruleActorClass : ( ( rule__ActorClass__Group__0 ) ) ;
     public final void ruleActorClass() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:805:2: ( ( ( rule__ActorClass__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:806:1: ( ( rule__ActorClass__Group__0 ) )
+            // InternalRoom.g:805:2: ( ( ( rule__ActorClass__Group__0 ) ) )
+            // InternalRoom.g:806:1: ( ( rule__ActorClass__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:806:1: ( ( rule__ActorClass__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:807:1: ( rule__ActorClass__Group__0 )
+            // InternalRoom.g:806:1: ( ( rule__ActorClass__Group__0 ) )
+            // InternalRoom.g:807:1: ( rule__ActorClass__Group__0 )
             {
              before(grammarAccess.getActorClassAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:808:1: ( rule__ActorClass__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:808:2: rule__ActorClass__Group__0
+            // InternalRoom.g:808:1: ( rule__ActorClass__Group__0 )
+            // InternalRoom.g:808:2: rule__ActorClass__Group__0
             {
-            pushFollow(FOLLOW_rule__ActorClass__Group__0_in_ruleActorClass1657);
+            pushFollow(FOLLOW_2);
             rule__ActorClass__Group__0();
 
             state._fsp--;
@@ -2265,20 +2265,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleInterfaceItem"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:820:1: entryRuleInterfaceItem : ruleInterfaceItem EOF ;
+    // InternalRoom.g:820:1: entryRuleInterfaceItem : ruleInterfaceItem EOF ;
     public final void entryRuleInterfaceItem() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:821:1: ( ruleInterfaceItem EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:822:1: ruleInterfaceItem EOF
+            // InternalRoom.g:821:1: ( ruleInterfaceItem EOF )
+            // InternalRoom.g:822:1: ruleInterfaceItem EOF
             {
              before(grammarAccess.getInterfaceItemRule()); 
-            pushFollow(FOLLOW_ruleInterfaceItem_in_entryRuleInterfaceItem1684);
+            pushFollow(FOLLOW_1);
             ruleInterfaceItem();
 
             state._fsp--;
 
              after(grammarAccess.getInterfaceItemRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleInterfaceItem1691); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2295,23 +2295,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleInterfaceItem"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:829:1: ruleInterfaceItem : ( ( rule__InterfaceItem__Alternatives ) ) ;
+    // InternalRoom.g:829:1: ruleInterfaceItem : ( ( rule__InterfaceItem__Alternatives ) ) ;
     public final void ruleInterfaceItem() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:833:2: ( ( ( rule__InterfaceItem__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:834:1: ( ( rule__InterfaceItem__Alternatives ) )
+            // InternalRoom.g:833:2: ( ( ( rule__InterfaceItem__Alternatives ) ) )
+            // InternalRoom.g:834:1: ( ( rule__InterfaceItem__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:834:1: ( ( rule__InterfaceItem__Alternatives ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:835:1: ( rule__InterfaceItem__Alternatives )
+            // InternalRoom.g:834:1: ( ( rule__InterfaceItem__Alternatives ) )
+            // InternalRoom.g:835:1: ( rule__InterfaceItem__Alternatives )
             {
              before(grammarAccess.getInterfaceItemAccess().getAlternatives()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:836:1: ( rule__InterfaceItem__Alternatives )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:836:2: rule__InterfaceItem__Alternatives
+            // InternalRoom.g:836:1: ( rule__InterfaceItem__Alternatives )
+            // InternalRoom.g:836:2: rule__InterfaceItem__Alternatives
             {
-            pushFollow(FOLLOW_rule__InterfaceItem__Alternatives_in_ruleInterfaceItem1717);
+            pushFollow(FOLLOW_2);
             rule__InterfaceItem__Alternatives();
 
             state._fsp--;
@@ -2342,20 +2342,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRulePort"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:848:1: entryRulePort : rulePort EOF ;
+    // InternalRoom.g:848:1: entryRulePort : rulePort EOF ;
     public final void entryRulePort() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:849:1: ( rulePort EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:850:1: rulePort EOF
+            // InternalRoom.g:849:1: ( rulePort EOF )
+            // InternalRoom.g:850:1: rulePort EOF
             {
              before(grammarAccess.getPortRule()); 
-            pushFollow(FOLLOW_rulePort_in_entryRulePort1744);
+            pushFollow(FOLLOW_1);
             rulePort();
 
             state._fsp--;
 
              after(grammarAccess.getPortRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRulePort1751); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2372,23 +2372,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rulePort"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:857:1: rulePort : ( ( rule__Port__Group__0 ) ) ;
+    // InternalRoom.g:857:1: rulePort : ( ( rule__Port__Group__0 ) ) ;
     public final void rulePort() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:861:2: ( ( ( rule__Port__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:862:1: ( ( rule__Port__Group__0 ) )
+            // InternalRoom.g:861:2: ( ( ( rule__Port__Group__0 ) ) )
+            // InternalRoom.g:862:1: ( ( rule__Port__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:862:1: ( ( rule__Port__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:863:1: ( rule__Port__Group__0 )
+            // InternalRoom.g:862:1: ( ( rule__Port__Group__0 ) )
+            // InternalRoom.g:863:1: ( rule__Port__Group__0 )
             {
              before(grammarAccess.getPortAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:864:1: ( rule__Port__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:864:2: rule__Port__Group__0
+            // InternalRoom.g:864:1: ( rule__Port__Group__0 )
+            // InternalRoom.g:864:2: rule__Port__Group__0
             {
-            pushFollow(FOLLOW_rule__Port__Group__0_in_rulePort1777);
+            pushFollow(FOLLOW_2);
             rule__Port__Group__0();
 
             state._fsp--;
@@ -2419,20 +2419,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleExternalPort"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:876:1: entryRuleExternalPort : ruleExternalPort EOF ;
+    // InternalRoom.g:876:1: entryRuleExternalPort : ruleExternalPort EOF ;
     public final void entryRuleExternalPort() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:877:1: ( ruleExternalPort EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:878:1: ruleExternalPort EOF
+            // InternalRoom.g:877:1: ( ruleExternalPort EOF )
+            // InternalRoom.g:878:1: ruleExternalPort EOF
             {
              before(grammarAccess.getExternalPortRule()); 
-            pushFollow(FOLLOW_ruleExternalPort_in_entryRuleExternalPort1804);
+            pushFollow(FOLLOW_1);
             ruleExternalPort();
 
             state._fsp--;
 
              after(grammarAccess.getExternalPortRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleExternalPort1811); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2449,23 +2449,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleExternalPort"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:885:1: ruleExternalPort : ( ( rule__ExternalPort__Group__0 ) ) ;
+    // InternalRoom.g:885:1: ruleExternalPort : ( ( rule__ExternalPort__Group__0 ) ) ;
     public final void ruleExternalPort() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:889:2: ( ( ( rule__ExternalPort__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:890:1: ( ( rule__ExternalPort__Group__0 ) )
+            // InternalRoom.g:889:2: ( ( ( rule__ExternalPort__Group__0 ) ) )
+            // InternalRoom.g:890:1: ( ( rule__ExternalPort__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:890:1: ( ( rule__ExternalPort__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:891:1: ( rule__ExternalPort__Group__0 )
+            // InternalRoom.g:890:1: ( ( rule__ExternalPort__Group__0 ) )
+            // InternalRoom.g:891:1: ( rule__ExternalPort__Group__0 )
             {
              before(grammarAccess.getExternalPortAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:892:1: ( rule__ExternalPort__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:892:2: rule__ExternalPort__Group__0
+            // InternalRoom.g:892:1: ( rule__ExternalPort__Group__0 )
+            // InternalRoom.g:892:2: rule__ExternalPort__Group__0
             {
-            pushFollow(FOLLOW_rule__ExternalPort__Group__0_in_ruleExternalPort1837);
+            pushFollow(FOLLOW_2);
             rule__ExternalPort__Group__0();
 
             state._fsp--;
@@ -2496,20 +2496,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleSAP"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:904:1: entryRuleSAP : ruleSAP EOF ;
+    // InternalRoom.g:904:1: entryRuleSAP : ruleSAP EOF ;
     public final void entryRuleSAP() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:905:1: ( ruleSAP EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:906:1: ruleSAP EOF
+            // InternalRoom.g:905:1: ( ruleSAP EOF )
+            // InternalRoom.g:906:1: ruleSAP EOF
             {
              before(grammarAccess.getSAPRule()); 
-            pushFollow(FOLLOW_ruleSAP_in_entryRuleSAP1864);
+            pushFollow(FOLLOW_1);
             ruleSAP();
 
             state._fsp--;
 
              after(grammarAccess.getSAPRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSAP1871); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2526,23 +2526,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleSAP"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:913:1: ruleSAP : ( ( rule__SAP__Group__0 ) ) ;
+    // InternalRoom.g:913:1: ruleSAP : ( ( rule__SAP__Group__0 ) ) ;
     public final void ruleSAP() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:917:2: ( ( ( rule__SAP__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:918:1: ( ( rule__SAP__Group__0 ) )
+            // InternalRoom.g:917:2: ( ( ( rule__SAP__Group__0 ) ) )
+            // InternalRoom.g:918:1: ( ( rule__SAP__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:918:1: ( ( rule__SAP__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:919:1: ( rule__SAP__Group__0 )
+            // InternalRoom.g:918:1: ( ( rule__SAP__Group__0 ) )
+            // InternalRoom.g:919:1: ( rule__SAP__Group__0 )
             {
              before(grammarAccess.getSAPAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:920:1: ( rule__SAP__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:920:2: rule__SAP__Group__0
+            // InternalRoom.g:920:1: ( rule__SAP__Group__0 )
+            // InternalRoom.g:920:2: rule__SAP__Group__0
             {
-            pushFollow(FOLLOW_rule__SAP__Group__0_in_ruleSAP1897);
+            pushFollow(FOLLOW_2);
             rule__SAP__Group__0();
 
             state._fsp--;
@@ -2573,20 +2573,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleSPP"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:932:1: entryRuleSPP : ruleSPP EOF ;
+    // InternalRoom.g:932:1: entryRuleSPP : ruleSPP EOF ;
     public final void entryRuleSPP() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:933:1: ( ruleSPP EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:934:1: ruleSPP EOF
+            // InternalRoom.g:933:1: ( ruleSPP EOF )
+            // InternalRoom.g:934:1: ruleSPP EOF
             {
              before(grammarAccess.getSPPRule()); 
-            pushFollow(FOLLOW_ruleSPP_in_entryRuleSPP1924);
+            pushFollow(FOLLOW_1);
             ruleSPP();
 
             state._fsp--;
 
              after(grammarAccess.getSPPRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSPP1931); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2603,23 +2603,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleSPP"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:941:1: ruleSPP : ( ( rule__SPP__Group__0 ) ) ;
+    // InternalRoom.g:941:1: ruleSPP : ( ( rule__SPP__Group__0 ) ) ;
     public final void ruleSPP() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:945:2: ( ( ( rule__SPP__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:946:1: ( ( rule__SPP__Group__0 ) )
+            // InternalRoom.g:945:2: ( ( ( rule__SPP__Group__0 ) ) )
+            // InternalRoom.g:946:1: ( ( rule__SPP__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:946:1: ( ( rule__SPP__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:947:1: ( rule__SPP__Group__0 )
+            // InternalRoom.g:946:1: ( ( rule__SPP__Group__0 ) )
+            // InternalRoom.g:947:1: ( rule__SPP__Group__0 )
             {
              before(grammarAccess.getSPPAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:948:1: ( rule__SPP__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:948:2: rule__SPP__Group__0
+            // InternalRoom.g:948:1: ( rule__SPP__Group__0 )
+            // InternalRoom.g:948:2: rule__SPP__Group__0
             {
-            pushFollow(FOLLOW_rule__SPP__Group__0_in_ruleSPP1957);
+            pushFollow(FOLLOW_2);
             rule__SPP__Group__0();
 
             state._fsp--;
@@ -2650,20 +2650,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleServiceImplementation"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:960:1: entryRuleServiceImplementation : ruleServiceImplementation EOF ;
+    // InternalRoom.g:960:1: entryRuleServiceImplementation : ruleServiceImplementation EOF ;
     public final void entryRuleServiceImplementation() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:961:1: ( ruleServiceImplementation EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:962:1: ruleServiceImplementation EOF
+            // InternalRoom.g:961:1: ( ruleServiceImplementation EOF )
+            // InternalRoom.g:962:1: ruleServiceImplementation EOF
             {
              before(grammarAccess.getServiceImplementationRule()); 
-            pushFollow(FOLLOW_ruleServiceImplementation_in_entryRuleServiceImplementation1984);
+            pushFollow(FOLLOW_1);
             ruleServiceImplementation();
 
             state._fsp--;
 
              after(grammarAccess.getServiceImplementationRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleServiceImplementation1991); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2680,23 +2680,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleServiceImplementation"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:969:1: ruleServiceImplementation : ( ( rule__ServiceImplementation__Group__0 ) ) ;
+    // InternalRoom.g:969:1: ruleServiceImplementation : ( ( rule__ServiceImplementation__Group__0 ) ) ;
     public final void ruleServiceImplementation() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:973:2: ( ( ( rule__ServiceImplementation__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:974:1: ( ( rule__ServiceImplementation__Group__0 ) )
+            // InternalRoom.g:973:2: ( ( ( rule__ServiceImplementation__Group__0 ) ) )
+            // InternalRoom.g:974:1: ( ( rule__ServiceImplementation__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:974:1: ( ( rule__ServiceImplementation__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:975:1: ( rule__ServiceImplementation__Group__0 )
+            // InternalRoom.g:974:1: ( ( rule__ServiceImplementation__Group__0 ) )
+            // InternalRoom.g:975:1: ( rule__ServiceImplementation__Group__0 )
             {
              before(grammarAccess.getServiceImplementationAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:976:1: ( rule__ServiceImplementation__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:976:2: rule__ServiceImplementation__Group__0
+            // InternalRoom.g:976:1: ( rule__ServiceImplementation__Group__0 )
+            // InternalRoom.g:976:2: rule__ServiceImplementation__Group__0
             {
-            pushFollow(FOLLOW_rule__ServiceImplementation__Group__0_in_ruleServiceImplementation2017);
+            pushFollow(FOLLOW_2);
             rule__ServiceImplementation__Group__0();
 
             state._fsp--;
@@ -2727,20 +2727,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleLogicalSystem"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:988:1: entryRuleLogicalSystem : ruleLogicalSystem EOF ;
+    // InternalRoom.g:988:1: entryRuleLogicalSystem : ruleLogicalSystem EOF ;
     public final void entryRuleLogicalSystem() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:989:1: ( ruleLogicalSystem EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:990:1: ruleLogicalSystem EOF
+            // InternalRoom.g:989:1: ( ruleLogicalSystem EOF )
+            // InternalRoom.g:990:1: ruleLogicalSystem EOF
             {
              before(grammarAccess.getLogicalSystemRule()); 
-            pushFollow(FOLLOW_ruleLogicalSystem_in_entryRuleLogicalSystem2044);
+            pushFollow(FOLLOW_1);
             ruleLogicalSystem();
 
             state._fsp--;
 
              after(grammarAccess.getLogicalSystemRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleLogicalSystem2051); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2757,23 +2757,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleLogicalSystem"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:997:1: ruleLogicalSystem : ( ( rule__LogicalSystem__Group__0 ) ) ;
+    // InternalRoom.g:997:1: ruleLogicalSystem : ( ( rule__LogicalSystem__Group__0 ) ) ;
     public final void ruleLogicalSystem() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1001:2: ( ( ( rule__LogicalSystem__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1002:1: ( ( rule__LogicalSystem__Group__0 ) )
+            // InternalRoom.g:1001:2: ( ( ( rule__LogicalSystem__Group__0 ) ) )
+            // InternalRoom.g:1002:1: ( ( rule__LogicalSystem__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1002:1: ( ( rule__LogicalSystem__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1003:1: ( rule__LogicalSystem__Group__0 )
+            // InternalRoom.g:1002:1: ( ( rule__LogicalSystem__Group__0 ) )
+            // InternalRoom.g:1003:1: ( rule__LogicalSystem__Group__0 )
             {
              before(grammarAccess.getLogicalSystemAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1004:1: ( rule__LogicalSystem__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1004:2: rule__LogicalSystem__Group__0
+            // InternalRoom.g:1004:1: ( rule__LogicalSystem__Group__0 )
+            // InternalRoom.g:1004:2: rule__LogicalSystem__Group__0
             {
-            pushFollow(FOLLOW_rule__LogicalSystem__Group__0_in_ruleLogicalSystem2077);
+            pushFollow(FOLLOW_2);
             rule__LogicalSystem__Group__0();
 
             state._fsp--;
@@ -2804,20 +2804,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleSubSystemRef"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1018:1: entryRuleSubSystemRef : ruleSubSystemRef EOF ;
+    // InternalRoom.g:1018:1: entryRuleSubSystemRef : ruleSubSystemRef EOF ;
     public final void entryRuleSubSystemRef() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1019:1: ( ruleSubSystemRef EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1020:1: ruleSubSystemRef EOF
+            // InternalRoom.g:1019:1: ( ruleSubSystemRef EOF )
+            // InternalRoom.g:1020:1: ruleSubSystemRef EOF
             {
              before(grammarAccess.getSubSystemRefRule()); 
-            pushFollow(FOLLOW_ruleSubSystemRef_in_entryRuleSubSystemRef2106);
+            pushFollow(FOLLOW_1);
             ruleSubSystemRef();
 
             state._fsp--;
 
              after(grammarAccess.getSubSystemRefRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSubSystemRef2113); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2834,23 +2834,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleSubSystemRef"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1027:1: ruleSubSystemRef : ( ( rule__SubSystemRef__Group__0 ) ) ;
+    // InternalRoom.g:1027:1: ruleSubSystemRef : ( ( rule__SubSystemRef__Group__0 ) ) ;
     public final void ruleSubSystemRef() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1031:2: ( ( ( rule__SubSystemRef__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1032:1: ( ( rule__SubSystemRef__Group__0 ) )
+            // InternalRoom.g:1031:2: ( ( ( rule__SubSystemRef__Group__0 ) ) )
+            // InternalRoom.g:1032:1: ( ( rule__SubSystemRef__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1032:1: ( ( rule__SubSystemRef__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1033:1: ( rule__SubSystemRef__Group__0 )
+            // InternalRoom.g:1032:1: ( ( rule__SubSystemRef__Group__0 ) )
+            // InternalRoom.g:1033:1: ( rule__SubSystemRef__Group__0 )
             {
              before(grammarAccess.getSubSystemRefAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1034:1: ( rule__SubSystemRef__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1034:2: rule__SubSystemRef__Group__0
+            // InternalRoom.g:1034:1: ( rule__SubSystemRef__Group__0 )
+            // InternalRoom.g:1034:2: rule__SubSystemRef__Group__0
             {
-            pushFollow(FOLLOW_rule__SubSystemRef__Group__0_in_ruleSubSystemRef2139);
+            pushFollow(FOLLOW_2);
             rule__SubSystemRef__Group__0();
 
             state._fsp--;
@@ -2881,20 +2881,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleSubSystemClass"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1046:1: entryRuleSubSystemClass : ruleSubSystemClass EOF ;
+    // InternalRoom.g:1046:1: entryRuleSubSystemClass : ruleSubSystemClass EOF ;
     public final void entryRuleSubSystemClass() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1047:1: ( ruleSubSystemClass EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1048:1: ruleSubSystemClass EOF
+            // InternalRoom.g:1047:1: ( ruleSubSystemClass EOF )
+            // InternalRoom.g:1048:1: ruleSubSystemClass EOF
             {
              before(grammarAccess.getSubSystemClassRule()); 
-            pushFollow(FOLLOW_ruleSubSystemClass_in_entryRuleSubSystemClass2166);
+            pushFollow(FOLLOW_1);
             ruleSubSystemClass();
 
             state._fsp--;
 
              after(grammarAccess.getSubSystemClassRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSubSystemClass2173); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2911,23 +2911,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleSubSystemClass"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1055:1: ruleSubSystemClass : ( ( rule__SubSystemClass__Group__0 ) ) ;
+    // InternalRoom.g:1055:1: ruleSubSystemClass : ( ( rule__SubSystemClass__Group__0 ) ) ;
     public final void ruleSubSystemClass() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1059:2: ( ( ( rule__SubSystemClass__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1060:1: ( ( rule__SubSystemClass__Group__0 ) )
+            // InternalRoom.g:1059:2: ( ( ( rule__SubSystemClass__Group__0 ) ) )
+            // InternalRoom.g:1060:1: ( ( rule__SubSystemClass__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1060:1: ( ( rule__SubSystemClass__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1061:1: ( rule__SubSystemClass__Group__0 )
+            // InternalRoom.g:1060:1: ( ( rule__SubSystemClass__Group__0 ) )
+            // InternalRoom.g:1061:1: ( rule__SubSystemClass__Group__0 )
             {
              before(grammarAccess.getSubSystemClassAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1062:1: ( rule__SubSystemClass__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1062:2: rule__SubSystemClass__Group__0
+            // InternalRoom.g:1062:1: ( rule__SubSystemClass__Group__0 )
+            // InternalRoom.g:1062:2: rule__SubSystemClass__Group__0
             {
-            pushFollow(FOLLOW_rule__SubSystemClass__Group__0_in_ruleSubSystemClass2199);
+            pushFollow(FOLLOW_2);
             rule__SubSystemClass__Group__0();
 
             state._fsp--;
@@ -2958,20 +2958,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleLogicalThread"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1074:1: entryRuleLogicalThread : ruleLogicalThread EOF ;
+    // InternalRoom.g:1074:1: entryRuleLogicalThread : ruleLogicalThread EOF ;
     public final void entryRuleLogicalThread() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1075:1: ( ruleLogicalThread EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1076:1: ruleLogicalThread EOF
+            // InternalRoom.g:1075:1: ( ruleLogicalThread EOF )
+            // InternalRoom.g:1076:1: ruleLogicalThread EOF
             {
              before(grammarAccess.getLogicalThreadRule()); 
-            pushFollow(FOLLOW_ruleLogicalThread_in_entryRuleLogicalThread2226);
+            pushFollow(FOLLOW_1);
             ruleLogicalThread();
 
             state._fsp--;
 
              after(grammarAccess.getLogicalThreadRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleLogicalThread2233); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2988,23 +2988,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleLogicalThread"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1083:1: ruleLogicalThread : ( ( rule__LogicalThread__Group__0 ) ) ;
+    // InternalRoom.g:1083:1: ruleLogicalThread : ( ( rule__LogicalThread__Group__0 ) ) ;
     public final void ruleLogicalThread() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1087:2: ( ( ( rule__LogicalThread__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1088:1: ( ( rule__LogicalThread__Group__0 ) )
+            // InternalRoom.g:1087:2: ( ( ( rule__LogicalThread__Group__0 ) ) )
+            // InternalRoom.g:1088:1: ( ( rule__LogicalThread__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1088:1: ( ( rule__LogicalThread__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1089:1: ( rule__LogicalThread__Group__0 )
+            // InternalRoom.g:1088:1: ( ( rule__LogicalThread__Group__0 ) )
+            // InternalRoom.g:1089:1: ( rule__LogicalThread__Group__0 )
             {
              before(grammarAccess.getLogicalThreadAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1090:1: ( rule__LogicalThread__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1090:2: rule__LogicalThread__Group__0
+            // InternalRoom.g:1090:1: ( rule__LogicalThread__Group__0 )
+            // InternalRoom.g:1090:2: rule__LogicalThread__Group__0
             {
-            pushFollow(FOLLOW_rule__LogicalThread__Group__0_in_ruleLogicalThread2259);
+            pushFollow(FOLLOW_2);
             rule__LogicalThread__Group__0();
 
             state._fsp--;
@@ -3035,20 +3035,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleActorInstanceMapping"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1102:1: entryRuleActorInstanceMapping : ruleActorInstanceMapping EOF ;
+    // InternalRoom.g:1102:1: entryRuleActorInstanceMapping : ruleActorInstanceMapping EOF ;
     public final void entryRuleActorInstanceMapping() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1103:1: ( ruleActorInstanceMapping EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1104:1: ruleActorInstanceMapping EOF
+            // InternalRoom.g:1103:1: ( ruleActorInstanceMapping EOF )
+            // InternalRoom.g:1104:1: ruleActorInstanceMapping EOF
             {
              before(grammarAccess.getActorInstanceMappingRule()); 
-            pushFollow(FOLLOW_ruleActorInstanceMapping_in_entryRuleActorInstanceMapping2286);
+            pushFollow(FOLLOW_1);
             ruleActorInstanceMapping();
 
             state._fsp--;
 
              after(grammarAccess.getActorInstanceMappingRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleActorInstanceMapping2293); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3065,23 +3065,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleActorInstanceMapping"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1111:1: ruleActorInstanceMapping : ( ( rule__ActorInstanceMapping__Group__0 ) ) ;
+    // InternalRoom.g:1111:1: ruleActorInstanceMapping : ( ( rule__ActorInstanceMapping__Group__0 ) ) ;
     public final void ruleActorInstanceMapping() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1115:2: ( ( ( rule__ActorInstanceMapping__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1116:1: ( ( rule__ActorInstanceMapping__Group__0 ) )
+            // InternalRoom.g:1115:2: ( ( ( rule__ActorInstanceMapping__Group__0 ) ) )
+            // InternalRoom.g:1116:1: ( ( rule__ActorInstanceMapping__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1116:1: ( ( rule__ActorInstanceMapping__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1117:1: ( rule__ActorInstanceMapping__Group__0 )
+            // InternalRoom.g:1116:1: ( ( rule__ActorInstanceMapping__Group__0 ) )
+            // InternalRoom.g:1117:1: ( rule__ActorInstanceMapping__Group__0 )
             {
              before(grammarAccess.getActorInstanceMappingAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1118:1: ( rule__ActorInstanceMapping__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1118:2: rule__ActorInstanceMapping__Group__0
+            // InternalRoom.g:1118:1: ( rule__ActorInstanceMapping__Group__0 )
+            // InternalRoom.g:1118:2: rule__ActorInstanceMapping__Group__0
             {
-            pushFollow(FOLLOW_rule__ActorInstanceMapping__Group__0_in_ruleActorInstanceMapping2319);
+            pushFollow(FOLLOW_2);
             rule__ActorInstanceMapping__Group__0();
 
             state._fsp--;
@@ -3112,20 +3112,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleRefPath"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1130:1: entryRuleRefPath : ruleRefPath EOF ;
+    // InternalRoom.g:1130:1: entryRuleRefPath : ruleRefPath EOF ;
     public final void entryRuleRefPath() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1131:1: ( ruleRefPath EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1132:1: ruleRefPath EOF
+            // InternalRoom.g:1131:1: ( ruleRefPath EOF )
+            // InternalRoom.g:1132:1: ruleRefPath EOF
             {
              before(grammarAccess.getRefPathRule()); 
-            pushFollow(FOLLOW_ruleRefPath_in_entryRuleRefPath2346);
+            pushFollow(FOLLOW_1);
             ruleRefPath();
 
             state._fsp--;
 
              after(grammarAccess.getRefPathRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRefPath2353); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3142,23 +3142,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleRefPath"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1139:1: ruleRefPath : ( ( rule__RefPath__Group__0 ) ) ;
+    // InternalRoom.g:1139:1: ruleRefPath : ( ( rule__RefPath__Group__0 ) ) ;
     public final void ruleRefPath() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1143:2: ( ( ( rule__RefPath__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1144:1: ( ( rule__RefPath__Group__0 ) )
+            // InternalRoom.g:1143:2: ( ( ( rule__RefPath__Group__0 ) ) )
+            // InternalRoom.g:1144:1: ( ( rule__RefPath__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1144:1: ( ( rule__RefPath__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1145:1: ( rule__RefPath__Group__0 )
+            // InternalRoom.g:1144:1: ( ( rule__RefPath__Group__0 ) )
+            // InternalRoom.g:1145:1: ( rule__RefPath__Group__0 )
             {
              before(grammarAccess.getRefPathAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1146:1: ( rule__RefPath__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1146:2: rule__RefPath__Group__0
+            // InternalRoom.g:1146:1: ( rule__RefPath__Group__0 )
+            // InternalRoom.g:1146:2: rule__RefPath__Group__0
             {
-            pushFollow(FOLLOW_rule__RefPath__Group__0_in_ruleRefPath2379);
+            pushFollow(FOLLOW_2);
             rule__RefPath__Group__0();
 
             state._fsp--;
@@ -3189,20 +3189,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleRefSegment"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1158:1: entryRuleRefSegment : ruleRefSegment EOF ;
+    // InternalRoom.g:1158:1: entryRuleRefSegment : ruleRefSegment EOF ;
     public final void entryRuleRefSegment() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1159:1: ( ruleRefSegment EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1160:1: ruleRefSegment EOF
+            // InternalRoom.g:1159:1: ( ruleRefSegment EOF )
+            // InternalRoom.g:1160:1: ruleRefSegment EOF
             {
              before(grammarAccess.getRefSegmentRule()); 
-            pushFollow(FOLLOW_ruleRefSegment_in_entryRuleRefSegment2406);
+            pushFollow(FOLLOW_1);
             ruleRefSegment();
 
             state._fsp--;
 
              after(grammarAccess.getRefSegmentRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRefSegment2413); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3219,23 +3219,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleRefSegment"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1167:1: ruleRefSegment : ( ( rule__RefSegment__Group__0 ) ) ;
+    // InternalRoom.g:1167:1: ruleRefSegment : ( ( rule__RefSegment__Group__0 ) ) ;
     public final void ruleRefSegment() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1171:2: ( ( ( rule__RefSegment__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1172:1: ( ( rule__RefSegment__Group__0 ) )
+            // InternalRoom.g:1171:2: ( ( ( rule__RefSegment__Group__0 ) ) )
+            // InternalRoom.g:1172:1: ( ( rule__RefSegment__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1172:1: ( ( rule__RefSegment__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1173:1: ( rule__RefSegment__Group__0 )
+            // InternalRoom.g:1172:1: ( ( rule__RefSegment__Group__0 ) )
+            // InternalRoom.g:1173:1: ( rule__RefSegment__Group__0 )
             {
              before(grammarAccess.getRefSegmentAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1174:1: ( rule__RefSegment__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1174:2: rule__RefSegment__Group__0
+            // InternalRoom.g:1174:1: ( rule__RefSegment__Group__0 )
+            // InternalRoom.g:1174:2: rule__RefSegment__Group__0
             {
-            pushFollow(FOLLOW_rule__RefSegment__Group__0_in_ruleRefSegment2439);
+            pushFollow(FOLLOW_2);
             rule__RefSegment__Group__0();
 
             state._fsp--;
@@ -3266,20 +3266,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleBinding"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1186:1: entryRuleBinding : ruleBinding EOF ;
+    // InternalRoom.g:1186:1: entryRuleBinding : ruleBinding EOF ;
     public final void entryRuleBinding() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1187:1: ( ruleBinding EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1188:1: ruleBinding EOF
+            // InternalRoom.g:1187:1: ( ruleBinding EOF )
+            // InternalRoom.g:1188:1: ruleBinding EOF
             {
              before(grammarAccess.getBindingRule()); 
-            pushFollow(FOLLOW_ruleBinding_in_entryRuleBinding2466);
+            pushFollow(FOLLOW_1);
             ruleBinding();
 
             state._fsp--;
 
              after(grammarAccess.getBindingRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleBinding2473); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3296,23 +3296,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleBinding"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1195:1: ruleBinding : ( ( rule__Binding__Group__0 ) ) ;
+    // InternalRoom.g:1195:1: ruleBinding : ( ( rule__Binding__Group__0 ) ) ;
     public final void ruleBinding() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1199:2: ( ( ( rule__Binding__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1200:1: ( ( rule__Binding__Group__0 ) )
+            // InternalRoom.g:1199:2: ( ( ( rule__Binding__Group__0 ) ) )
+            // InternalRoom.g:1200:1: ( ( rule__Binding__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1200:1: ( ( rule__Binding__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1201:1: ( rule__Binding__Group__0 )
+            // InternalRoom.g:1200:1: ( ( rule__Binding__Group__0 ) )
+            // InternalRoom.g:1201:1: ( rule__Binding__Group__0 )
             {
              before(grammarAccess.getBindingAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1202:1: ( rule__Binding__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1202:2: rule__Binding__Group__0
+            // InternalRoom.g:1202:1: ( rule__Binding__Group__0 )
+            // InternalRoom.g:1202:2: rule__Binding__Group__0
             {
-            pushFollow(FOLLOW_rule__Binding__Group__0_in_ruleBinding2499);
+            pushFollow(FOLLOW_2);
             rule__Binding__Group__0();
 
             state._fsp--;
@@ -3343,20 +3343,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleBindingEndPoint"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1214:1: entryRuleBindingEndPoint : ruleBindingEndPoint EOF ;
+    // InternalRoom.g:1214:1: entryRuleBindingEndPoint : ruleBindingEndPoint EOF ;
     public final void entryRuleBindingEndPoint() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1215:1: ( ruleBindingEndPoint EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1216:1: ruleBindingEndPoint EOF
+            // InternalRoom.g:1215:1: ( ruleBindingEndPoint EOF )
+            // InternalRoom.g:1216:1: ruleBindingEndPoint EOF
             {
              before(grammarAccess.getBindingEndPointRule()); 
-            pushFollow(FOLLOW_ruleBindingEndPoint_in_entryRuleBindingEndPoint2526);
+            pushFollow(FOLLOW_1);
             ruleBindingEndPoint();
 
             state._fsp--;
 
              after(grammarAccess.getBindingEndPointRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleBindingEndPoint2533); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3373,23 +3373,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleBindingEndPoint"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1223:1: ruleBindingEndPoint : ( ( rule__BindingEndPoint__Group__0 ) ) ;
+    // InternalRoom.g:1223:1: ruleBindingEndPoint : ( ( rule__BindingEndPoint__Group__0 ) ) ;
     public final void ruleBindingEndPoint() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1227:2: ( ( ( rule__BindingEndPoint__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1228:1: ( ( rule__BindingEndPoint__Group__0 ) )
+            // InternalRoom.g:1227:2: ( ( ( rule__BindingEndPoint__Group__0 ) ) )
+            // InternalRoom.g:1228:1: ( ( rule__BindingEndPoint__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1228:1: ( ( rule__BindingEndPoint__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1229:1: ( rule__BindingEndPoint__Group__0 )
+            // InternalRoom.g:1228:1: ( ( rule__BindingEndPoint__Group__0 ) )
+            // InternalRoom.g:1229:1: ( rule__BindingEndPoint__Group__0 )
             {
              before(grammarAccess.getBindingEndPointAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1230:1: ( rule__BindingEndPoint__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1230:2: rule__BindingEndPoint__Group__0
+            // InternalRoom.g:1230:1: ( rule__BindingEndPoint__Group__0 )
+            // InternalRoom.g:1230:2: rule__BindingEndPoint__Group__0
             {
-            pushFollow(FOLLOW_rule__BindingEndPoint__Group__0_in_ruleBindingEndPoint2559);
+            pushFollow(FOLLOW_2);
             rule__BindingEndPoint__Group__0();
 
             state._fsp--;
@@ -3420,20 +3420,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleLayerConnection"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1242:1: entryRuleLayerConnection : ruleLayerConnection EOF ;
+    // InternalRoom.g:1242:1: entryRuleLayerConnection : ruleLayerConnection EOF ;
     public final void entryRuleLayerConnection() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1243:1: ( ruleLayerConnection EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1244:1: ruleLayerConnection EOF
+            // InternalRoom.g:1243:1: ( ruleLayerConnection EOF )
+            // InternalRoom.g:1244:1: ruleLayerConnection EOF
             {
              before(grammarAccess.getLayerConnectionRule()); 
-            pushFollow(FOLLOW_ruleLayerConnection_in_entryRuleLayerConnection2586);
+            pushFollow(FOLLOW_1);
             ruleLayerConnection();
 
             state._fsp--;
 
              after(grammarAccess.getLayerConnectionRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleLayerConnection2593); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3450,23 +3450,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleLayerConnection"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1251:1: ruleLayerConnection : ( ( rule__LayerConnection__Group__0 ) ) ;
+    // InternalRoom.g:1251:1: ruleLayerConnection : ( ( rule__LayerConnection__Group__0 ) ) ;
     public final void ruleLayerConnection() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1255:2: ( ( ( rule__LayerConnection__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1256:1: ( ( rule__LayerConnection__Group__0 ) )
+            // InternalRoom.g:1255:2: ( ( ( rule__LayerConnection__Group__0 ) ) )
+            // InternalRoom.g:1256:1: ( ( rule__LayerConnection__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1256:1: ( ( rule__LayerConnection__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1257:1: ( rule__LayerConnection__Group__0 )
+            // InternalRoom.g:1256:1: ( ( rule__LayerConnection__Group__0 ) )
+            // InternalRoom.g:1257:1: ( rule__LayerConnection__Group__0 )
             {
              before(grammarAccess.getLayerConnectionAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1258:1: ( rule__LayerConnection__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1258:2: rule__LayerConnection__Group__0
+            // InternalRoom.g:1258:1: ( rule__LayerConnection__Group__0 )
+            // InternalRoom.g:1258:2: rule__LayerConnection__Group__0
             {
-            pushFollow(FOLLOW_rule__LayerConnection__Group__0_in_ruleLayerConnection2619);
+            pushFollow(FOLLOW_2);
             rule__LayerConnection__Group__0();
 
             state._fsp--;
@@ -3497,20 +3497,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleSAPoint"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1270:1: entryRuleSAPoint : ruleSAPoint EOF ;
+    // InternalRoom.g:1270:1: entryRuleSAPoint : ruleSAPoint EOF ;
     public final void entryRuleSAPoint() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1271:1: ( ruleSAPoint EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1272:1: ruleSAPoint EOF
+            // InternalRoom.g:1271:1: ( ruleSAPoint EOF )
+            // InternalRoom.g:1272:1: ruleSAPoint EOF
             {
              before(grammarAccess.getSAPointRule()); 
-            pushFollow(FOLLOW_ruleSAPoint_in_entryRuleSAPoint2646);
+            pushFollow(FOLLOW_1);
             ruleSAPoint();
 
             state._fsp--;
 
              after(grammarAccess.getSAPointRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSAPoint2653); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3527,23 +3527,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleSAPoint"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1279:1: ruleSAPoint : ( ( rule__SAPoint__Alternatives ) ) ;
+    // InternalRoom.g:1279:1: ruleSAPoint : ( ( rule__SAPoint__Alternatives ) ) ;
     public final void ruleSAPoint() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1283:2: ( ( ( rule__SAPoint__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1284:1: ( ( rule__SAPoint__Alternatives ) )
+            // InternalRoom.g:1283:2: ( ( ( rule__SAPoint__Alternatives ) ) )
+            // InternalRoom.g:1284:1: ( ( rule__SAPoint__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1284:1: ( ( rule__SAPoint__Alternatives ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1285:1: ( rule__SAPoint__Alternatives )
+            // InternalRoom.g:1284:1: ( ( rule__SAPoint__Alternatives ) )
+            // InternalRoom.g:1285:1: ( rule__SAPoint__Alternatives )
             {
              before(grammarAccess.getSAPointAccess().getAlternatives()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1286:1: ( rule__SAPoint__Alternatives )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1286:2: rule__SAPoint__Alternatives
+            // InternalRoom.g:1286:1: ( rule__SAPoint__Alternatives )
+            // InternalRoom.g:1286:2: rule__SAPoint__Alternatives
             {
-            pushFollow(FOLLOW_rule__SAPoint__Alternatives_in_ruleSAPoint2679);
+            pushFollow(FOLLOW_2);
             rule__SAPoint__Alternatives();
 
             state._fsp--;
@@ -3574,20 +3574,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleRefSAPoint"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1298:1: entryRuleRefSAPoint : ruleRefSAPoint EOF ;
+    // InternalRoom.g:1298:1: entryRuleRefSAPoint : ruleRefSAPoint EOF ;
     public final void entryRuleRefSAPoint() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1299:1: ( ruleRefSAPoint EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1300:1: ruleRefSAPoint EOF
+            // InternalRoom.g:1299:1: ( ruleRefSAPoint EOF )
+            // InternalRoom.g:1300:1: ruleRefSAPoint EOF
             {
              before(grammarAccess.getRefSAPointRule()); 
-            pushFollow(FOLLOW_ruleRefSAPoint_in_entryRuleRefSAPoint2706);
+            pushFollow(FOLLOW_1);
             ruleRefSAPoint();
 
             state._fsp--;
 
              after(grammarAccess.getRefSAPointRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRefSAPoint2713); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3604,23 +3604,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleRefSAPoint"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1307:1: ruleRefSAPoint : ( ( rule__RefSAPoint__Group__0 ) ) ;
+    // InternalRoom.g:1307:1: ruleRefSAPoint : ( ( rule__RefSAPoint__Group__0 ) ) ;
     public final void ruleRefSAPoint() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1311:2: ( ( ( rule__RefSAPoint__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1312:1: ( ( rule__RefSAPoint__Group__0 ) )
+            // InternalRoom.g:1311:2: ( ( ( rule__RefSAPoint__Group__0 ) ) )
+            // InternalRoom.g:1312:1: ( ( rule__RefSAPoint__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1312:1: ( ( rule__RefSAPoint__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1313:1: ( rule__RefSAPoint__Group__0 )
+            // InternalRoom.g:1312:1: ( ( rule__RefSAPoint__Group__0 ) )
+            // InternalRoom.g:1313:1: ( rule__RefSAPoint__Group__0 )
             {
              before(grammarAccess.getRefSAPointAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1314:1: ( rule__RefSAPoint__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1314:2: rule__RefSAPoint__Group__0
+            // InternalRoom.g:1314:1: ( rule__RefSAPoint__Group__0 )
+            // InternalRoom.g:1314:2: rule__RefSAPoint__Group__0
             {
-            pushFollow(FOLLOW_rule__RefSAPoint__Group__0_in_ruleRefSAPoint2739);
+            pushFollow(FOLLOW_2);
             rule__RefSAPoint__Group__0();
 
             state._fsp--;
@@ -3651,20 +3651,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleRelaySAPoint"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1326:1: entryRuleRelaySAPoint : ruleRelaySAPoint EOF ;
+    // InternalRoom.g:1326:1: entryRuleRelaySAPoint : ruleRelaySAPoint EOF ;
     public final void entryRuleRelaySAPoint() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1327:1: ( ruleRelaySAPoint EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1328:1: ruleRelaySAPoint EOF
+            // InternalRoom.g:1327:1: ( ruleRelaySAPoint EOF )
+            // InternalRoom.g:1328:1: ruleRelaySAPoint EOF
             {
              before(grammarAccess.getRelaySAPointRule()); 
-            pushFollow(FOLLOW_ruleRelaySAPoint_in_entryRuleRelaySAPoint2766);
+            pushFollow(FOLLOW_1);
             ruleRelaySAPoint();
 
             state._fsp--;
 
              after(grammarAccess.getRelaySAPointRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRelaySAPoint2773); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3681,23 +3681,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleRelaySAPoint"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1335:1: ruleRelaySAPoint : ( ( rule__RelaySAPoint__Group__0 ) ) ;
+    // InternalRoom.g:1335:1: ruleRelaySAPoint : ( ( rule__RelaySAPoint__Group__0 ) ) ;
     public final void ruleRelaySAPoint() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1339:2: ( ( ( rule__RelaySAPoint__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1340:1: ( ( rule__RelaySAPoint__Group__0 ) )
+            // InternalRoom.g:1339:2: ( ( ( rule__RelaySAPoint__Group__0 ) ) )
+            // InternalRoom.g:1340:1: ( ( rule__RelaySAPoint__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1340:1: ( ( rule__RelaySAPoint__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1341:1: ( rule__RelaySAPoint__Group__0 )
+            // InternalRoom.g:1340:1: ( ( rule__RelaySAPoint__Group__0 ) )
+            // InternalRoom.g:1341:1: ( rule__RelaySAPoint__Group__0 )
             {
              before(grammarAccess.getRelaySAPointAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1342:1: ( rule__RelaySAPoint__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1342:2: rule__RelaySAPoint__Group__0
+            // InternalRoom.g:1342:1: ( rule__RelaySAPoint__Group__0 )
+            // InternalRoom.g:1342:2: rule__RelaySAPoint__Group__0
             {
-            pushFollow(FOLLOW_rule__RelaySAPoint__Group__0_in_ruleRelaySAPoint2799);
+            pushFollow(FOLLOW_2);
             rule__RelaySAPoint__Group__0();
 
             state._fsp--;
@@ -3728,20 +3728,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleSPPoint"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1354:1: entryRuleSPPoint : ruleSPPoint EOF ;
+    // InternalRoom.g:1354:1: entryRuleSPPoint : ruleSPPoint EOF ;
     public final void entryRuleSPPoint() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1355:1: ( ruleSPPoint EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1356:1: ruleSPPoint EOF
+            // InternalRoom.g:1355:1: ( ruleSPPoint EOF )
+            // InternalRoom.g:1356:1: ruleSPPoint EOF
             {
              before(grammarAccess.getSPPointRule()); 
-            pushFollow(FOLLOW_ruleSPPoint_in_entryRuleSPPoint2826);
+            pushFollow(FOLLOW_1);
             ruleSPPoint();
 
             state._fsp--;
 
              after(grammarAccess.getSPPointRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSPPoint2833); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3758,23 +3758,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleSPPoint"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1363:1: ruleSPPoint : ( ( rule__SPPoint__Group__0 ) ) ;
+    // InternalRoom.g:1363:1: ruleSPPoint : ( ( rule__SPPoint__Group__0 ) ) ;
     public final void ruleSPPoint() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1367:2: ( ( ( rule__SPPoint__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1368:1: ( ( rule__SPPoint__Group__0 ) )
+            // InternalRoom.g:1367:2: ( ( ( rule__SPPoint__Group__0 ) ) )
+            // InternalRoom.g:1368:1: ( ( rule__SPPoint__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1368:1: ( ( rule__SPPoint__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1369:1: ( rule__SPPoint__Group__0 )
+            // InternalRoom.g:1368:1: ( ( rule__SPPoint__Group__0 ) )
+            // InternalRoom.g:1369:1: ( rule__SPPoint__Group__0 )
             {
              before(grammarAccess.getSPPointAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1370:1: ( rule__SPPoint__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1370:2: rule__SPPoint__Group__0
+            // InternalRoom.g:1370:1: ( rule__SPPoint__Group__0 )
+            // InternalRoom.g:1370:2: rule__SPPoint__Group__0
             {
-            pushFollow(FOLLOW_rule__SPPoint__Group__0_in_ruleSPPoint2859);
+            pushFollow(FOLLOW_2);
             rule__SPPoint__Group__0();
 
             state._fsp--;
@@ -3805,20 +3805,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleActorRef"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1382:1: entryRuleActorRef : ruleActorRef EOF ;
+    // InternalRoom.g:1382:1: entryRuleActorRef : ruleActorRef EOF ;
     public final void entryRuleActorRef() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1383:1: ( ruleActorRef EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1384:1: ruleActorRef EOF
+            // InternalRoom.g:1383:1: ( ruleActorRef EOF )
+            // InternalRoom.g:1384:1: ruleActorRef EOF
             {
              before(grammarAccess.getActorRefRule()); 
-            pushFollow(FOLLOW_ruleActorRef_in_entryRuleActorRef2886);
+            pushFollow(FOLLOW_1);
             ruleActorRef();
 
             state._fsp--;
 
              after(grammarAccess.getActorRefRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleActorRef2893); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3835,23 +3835,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleActorRef"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1391:1: ruleActorRef : ( ( rule__ActorRef__Group__0 ) ) ;
+    // InternalRoom.g:1391:1: ruleActorRef : ( ( rule__ActorRef__Group__0 ) ) ;
     public final void ruleActorRef() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1395:2: ( ( ( rule__ActorRef__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1396:1: ( ( rule__ActorRef__Group__0 ) )
+            // InternalRoom.g:1395:2: ( ( ( rule__ActorRef__Group__0 ) ) )
+            // InternalRoom.g:1396:1: ( ( rule__ActorRef__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1396:1: ( ( rule__ActorRef__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1397:1: ( rule__ActorRef__Group__0 )
+            // InternalRoom.g:1396:1: ( ( rule__ActorRef__Group__0 ) )
+            // InternalRoom.g:1397:1: ( rule__ActorRef__Group__0 )
             {
              before(grammarAccess.getActorRefAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1398:1: ( rule__ActorRef__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1398:2: rule__ActorRef__Group__0
+            // InternalRoom.g:1398:1: ( rule__ActorRef__Group__0 )
+            // InternalRoom.g:1398:2: rule__ActorRef__Group__0
             {
-            pushFollow(FOLLOW_rule__ActorRef__Group__0_in_ruleActorRef2919);
+            pushFollow(FOLLOW_2);
             rule__ActorRef__Group__0();
 
             state._fsp--;
@@ -3882,20 +3882,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleMULTIPLICITY"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1412:1: entryRuleMULTIPLICITY : ruleMULTIPLICITY EOF ;
+    // InternalRoom.g:1412:1: entryRuleMULTIPLICITY : ruleMULTIPLICITY EOF ;
     public final void entryRuleMULTIPLICITY() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1413:1: ( ruleMULTIPLICITY EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1414:1: ruleMULTIPLICITY EOF
+            // InternalRoom.g:1413:1: ( ruleMULTIPLICITY EOF )
+            // InternalRoom.g:1414:1: ruleMULTIPLICITY EOF
             {
              before(grammarAccess.getMULTIPLICITYRule()); 
-            pushFollow(FOLLOW_ruleMULTIPLICITY_in_entryRuleMULTIPLICITY2948);
+            pushFollow(FOLLOW_1);
             ruleMULTIPLICITY();
 
             state._fsp--;
 
              after(grammarAccess.getMULTIPLICITYRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleMULTIPLICITY2955); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3912,23 +3912,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleMULTIPLICITY"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1421:1: ruleMULTIPLICITY : ( ( rule__MULTIPLICITY__Group__0 ) ) ;
+    // InternalRoom.g:1421:1: ruleMULTIPLICITY : ( ( rule__MULTIPLICITY__Group__0 ) ) ;
     public final void ruleMULTIPLICITY() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1425:2: ( ( ( rule__MULTIPLICITY__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1426:1: ( ( rule__MULTIPLICITY__Group__0 ) )
+            // InternalRoom.g:1425:2: ( ( ( rule__MULTIPLICITY__Group__0 ) ) )
+            // InternalRoom.g:1426:1: ( ( rule__MULTIPLICITY__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1426:1: ( ( rule__MULTIPLICITY__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1427:1: ( rule__MULTIPLICITY__Group__0 )
+            // InternalRoom.g:1426:1: ( ( rule__MULTIPLICITY__Group__0 ) )
+            // InternalRoom.g:1427:1: ( rule__MULTIPLICITY__Group__0 )
             {
              before(grammarAccess.getMULTIPLICITYAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1428:1: ( rule__MULTIPLICITY__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1428:2: rule__MULTIPLICITY__Group__0
+            // InternalRoom.g:1428:1: ( rule__MULTIPLICITY__Group__0 )
+            // InternalRoom.g:1428:2: rule__MULTIPLICITY__Group__0
             {
-            pushFollow(FOLLOW_rule__MULTIPLICITY__Group__0_in_ruleMULTIPLICITY2981);
+            pushFollow(FOLLOW_2);
             rule__MULTIPLICITY__Group__0();
 
             state._fsp--;
@@ -3959,20 +3959,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleAnnotationTargetType"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1440:1: entryRuleAnnotationTargetType : ruleAnnotationTargetType EOF ;
+    // InternalRoom.g:1440:1: entryRuleAnnotationTargetType : ruleAnnotationTargetType EOF ;
     public final void entryRuleAnnotationTargetType() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1441:1: ( ruleAnnotationTargetType EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1442:1: ruleAnnotationTargetType EOF
+            // InternalRoom.g:1441:1: ( ruleAnnotationTargetType EOF )
+            // InternalRoom.g:1442:1: ruleAnnotationTargetType EOF
             {
              before(grammarAccess.getAnnotationTargetTypeRule()); 
-            pushFollow(FOLLOW_ruleAnnotationTargetType_in_entryRuleAnnotationTargetType3008);
+            pushFollow(FOLLOW_1);
             ruleAnnotationTargetType();
 
             state._fsp--;
 
              after(grammarAccess.getAnnotationTargetTypeRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAnnotationTargetType3015); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3989,23 +3989,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleAnnotationTargetType"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1449:1: ruleAnnotationTargetType : ( ( rule__AnnotationTargetType__Alternatives ) ) ;
+    // InternalRoom.g:1449:1: ruleAnnotationTargetType : ( ( rule__AnnotationTargetType__Alternatives ) ) ;
     public final void ruleAnnotationTargetType() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1453:2: ( ( ( rule__AnnotationTargetType__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1454:1: ( ( rule__AnnotationTargetType__Alternatives ) )
+            // InternalRoom.g:1453:2: ( ( ( rule__AnnotationTargetType__Alternatives ) ) )
+            // InternalRoom.g:1454:1: ( ( rule__AnnotationTargetType__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1454:1: ( ( rule__AnnotationTargetType__Alternatives ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1455:1: ( rule__AnnotationTargetType__Alternatives )
+            // InternalRoom.g:1454:1: ( ( rule__AnnotationTargetType__Alternatives ) )
+            // InternalRoom.g:1455:1: ( rule__AnnotationTargetType__Alternatives )
             {
              before(grammarAccess.getAnnotationTargetTypeAccess().getAlternatives()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1456:1: ( rule__AnnotationTargetType__Alternatives )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1456:2: rule__AnnotationTargetType__Alternatives
+            // InternalRoom.g:1456:1: ( rule__AnnotationTargetType__Alternatives )
+            // InternalRoom.g:1456:2: rule__AnnotationTargetType__Alternatives
             {
-            pushFollow(FOLLOW_rule__AnnotationTargetType__Alternatives_in_ruleAnnotationTargetType3041);
+            pushFollow(FOLLOW_2);
             rule__AnnotationTargetType__Alternatives();
 
             state._fsp--;
@@ -4036,20 +4036,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleStateGraphNode"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1470:1: entryRuleStateGraphNode : ruleStateGraphNode EOF ;
+    // InternalRoom.g:1470:1: entryRuleStateGraphNode : ruleStateGraphNode EOF ;
     public final void entryRuleStateGraphNode() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1471:1: ( ruleStateGraphNode EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1472:1: ruleStateGraphNode EOF
+            // InternalRoom.g:1471:1: ( ruleStateGraphNode EOF )
+            // InternalRoom.g:1472:1: ruleStateGraphNode EOF
             {
              before(grammarAccess.getStateGraphNodeRule()); 
-            pushFollow(FOLLOW_ruleStateGraphNode_in_entryRuleStateGraphNode3070);
+            pushFollow(FOLLOW_1);
             ruleStateGraphNode();
 
             state._fsp--;
 
              after(grammarAccess.getStateGraphNodeRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleStateGraphNode3077); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -4066,23 +4066,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleStateGraphNode"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1479:1: ruleStateGraphNode : ( ( rule__StateGraphNode__Alternatives ) ) ;
+    // InternalRoom.g:1479:1: ruleStateGraphNode : ( ( rule__StateGraphNode__Alternatives ) ) ;
     public final void ruleStateGraphNode() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1483:2: ( ( ( rule__StateGraphNode__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1484:1: ( ( rule__StateGraphNode__Alternatives ) )
+            // InternalRoom.g:1483:2: ( ( ( rule__StateGraphNode__Alternatives ) ) )
+            // InternalRoom.g:1484:1: ( ( rule__StateGraphNode__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1484:1: ( ( rule__StateGraphNode__Alternatives ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1485:1: ( rule__StateGraphNode__Alternatives )
+            // InternalRoom.g:1484:1: ( ( rule__StateGraphNode__Alternatives ) )
+            // InternalRoom.g:1485:1: ( rule__StateGraphNode__Alternatives )
             {
              before(grammarAccess.getStateGraphNodeAccess().getAlternatives()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1486:1: ( rule__StateGraphNode__Alternatives )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1486:2: rule__StateGraphNode__Alternatives
+            // InternalRoom.g:1486:1: ( rule__StateGraphNode__Alternatives )
+            // InternalRoom.g:1486:2: rule__StateGraphNode__Alternatives
             {
-            pushFollow(FOLLOW_rule__StateGraphNode__Alternatives_in_ruleStateGraphNode3103);
+            pushFollow(FOLLOW_2);
             rule__StateGraphNode__Alternatives();
 
             state._fsp--;
@@ -4113,20 +4113,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleStateGraph"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1500:1: entryRuleStateGraph : ruleStateGraph EOF ;
+    // InternalRoom.g:1500:1: entryRuleStateGraph : ruleStateGraph EOF ;
     public final void entryRuleStateGraph() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1501:1: ( ruleStateGraph EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1502:1: ruleStateGraph EOF
+            // InternalRoom.g:1501:1: ( ruleStateGraph EOF )
+            // InternalRoom.g:1502:1: ruleStateGraph EOF
             {
              before(grammarAccess.getStateGraphRule()); 
-            pushFollow(FOLLOW_ruleStateGraph_in_entryRuleStateGraph3132);
+            pushFollow(FOLLOW_1);
             ruleStateGraph();
 
             state._fsp--;
 
              after(grammarAccess.getStateGraphRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleStateGraph3139); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -4143,23 +4143,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleStateGraph"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1509:1: ruleStateGraph : ( ( rule__StateGraph__Group__0 ) ) ;
+    // InternalRoom.g:1509:1: ruleStateGraph : ( ( rule__StateGraph__Group__0 ) ) ;
     public final void ruleStateGraph() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1513:2: ( ( ( rule__StateGraph__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1514:1: ( ( rule__StateGraph__Group__0 ) )
+            // InternalRoom.g:1513:2: ( ( ( rule__StateGraph__Group__0 ) ) )
+            // InternalRoom.g:1514:1: ( ( rule__StateGraph__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1514:1: ( ( rule__StateGraph__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1515:1: ( rule__StateGraph__Group__0 )
+            // InternalRoom.g:1514:1: ( ( rule__StateGraph__Group__0 ) )
+            // InternalRoom.g:1515:1: ( rule__StateGraph__Group__0 )
             {
              before(grammarAccess.getStateGraphAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1516:1: ( rule__StateGraph__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1516:2: rule__StateGraph__Group__0
+            // InternalRoom.g:1516:1: ( rule__StateGraph__Group__0 )
+            // InternalRoom.g:1516:2: rule__StateGraph__Group__0
             {
-            pushFollow(FOLLOW_rule__StateGraph__Group__0_in_ruleStateGraph3165);
+            pushFollow(FOLLOW_2);
             rule__StateGraph__Group__0();
 
             state._fsp--;
@@ -4190,20 +4190,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleStateMachine"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1528:1: entryRuleStateMachine : ruleStateMachine EOF ;
+    // InternalRoom.g:1528:1: entryRuleStateMachine : ruleStateMachine EOF ;
     public final void entryRuleStateMachine() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1529:1: ( ruleStateMachine EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1530:1: ruleStateMachine EOF
+            // InternalRoom.g:1529:1: ( ruleStateMachine EOF )
+            // InternalRoom.g:1530:1: ruleStateMachine EOF
             {
              before(grammarAccess.getStateMachineRule()); 
-            pushFollow(FOLLOW_ruleStateMachine_in_entryRuleStateMachine3192);
+            pushFollow(FOLLOW_1);
             ruleStateMachine();
 
             state._fsp--;
 
              after(grammarAccess.getStateMachineRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleStateMachine3199); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -4220,23 +4220,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleStateMachine"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1537:1: ruleStateMachine : ( ( rule__StateMachine__Group__0 ) ) ;
+    // InternalRoom.g:1537:1: ruleStateMachine : ( ( rule__StateMachine__Group__0 ) ) ;
     public final void ruleStateMachine() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1541:2: ( ( ( rule__StateMachine__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1542:1: ( ( rule__StateMachine__Group__0 ) )
+            // InternalRoom.g:1541:2: ( ( ( rule__StateMachine__Group__0 ) ) )
+            // InternalRoom.g:1542:1: ( ( rule__StateMachine__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1542:1: ( ( rule__StateMachine__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1543:1: ( rule__StateMachine__Group__0 )
+            // InternalRoom.g:1542:1: ( ( rule__StateMachine__Group__0 ) )
+            // InternalRoom.g:1543:1: ( rule__StateMachine__Group__0 )
             {
              before(grammarAccess.getStateMachineAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1544:1: ( rule__StateMachine__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1544:2: rule__StateMachine__Group__0
+            // InternalRoom.g:1544:1: ( rule__StateMachine__Group__0 )
+            // InternalRoom.g:1544:2: rule__StateMachine__Group__0
             {
-            pushFollow(FOLLOW_rule__StateMachine__Group__0_in_ruleStateMachine3225);
+            pushFollow(FOLLOW_2);
             rule__StateMachine__Group__0();
 
             state._fsp--;
@@ -4267,20 +4267,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleState"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1556:1: entryRuleState : ruleState EOF ;
+    // InternalRoom.g:1556:1: entryRuleState : ruleState EOF ;
     public final void entryRuleState() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1557:1: ( ruleState EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1558:1: ruleState EOF
+            // InternalRoom.g:1557:1: ( ruleState EOF )
+            // InternalRoom.g:1558:1: ruleState EOF
             {
              before(grammarAccess.getStateRule()); 
-            pushFollow(FOLLOW_ruleState_in_entryRuleState3252);
+            pushFollow(FOLLOW_1);
             ruleState();
 
             state._fsp--;
 
              after(grammarAccess.getStateRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleState3259); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -4297,23 +4297,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleState"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1565:1: ruleState : ( ( rule__State__Alternatives ) ) ;
+    // InternalRoom.g:1565:1: ruleState : ( ( rule__State__Alternatives ) ) ;
     public final void ruleState() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1569:2: ( ( ( rule__State__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1570:1: ( ( rule__State__Alternatives ) )
+            // InternalRoom.g:1569:2: ( ( ( rule__State__Alternatives ) ) )
+            // InternalRoom.g:1570:1: ( ( rule__State__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1570:1: ( ( rule__State__Alternatives ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1571:1: ( rule__State__Alternatives )
+            // InternalRoom.g:1570:1: ( ( rule__State__Alternatives ) )
+            // InternalRoom.g:1571:1: ( rule__State__Alternatives )
             {
              before(grammarAccess.getStateAccess().getAlternatives()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1572:1: ( rule__State__Alternatives )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1572:2: rule__State__Alternatives
+            // InternalRoom.g:1572:1: ( rule__State__Alternatives )
+            // InternalRoom.g:1572:2: rule__State__Alternatives
             {
-            pushFollow(FOLLOW_rule__State__Alternatives_in_ruleState3285);
+            pushFollow(FOLLOW_2);
             rule__State__Alternatives();
 
             state._fsp--;
@@ -4344,20 +4344,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleSimpleState"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1584:1: entryRuleSimpleState : ruleSimpleState EOF ;
+    // InternalRoom.g:1584:1: entryRuleSimpleState : ruleSimpleState EOF ;
     public final void entryRuleSimpleState() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1585:1: ( ruleSimpleState EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1586:1: ruleSimpleState EOF
+            // InternalRoom.g:1585:1: ( ruleSimpleState EOF )
+            // InternalRoom.g:1586:1: ruleSimpleState EOF
             {
              before(grammarAccess.getSimpleStateRule()); 
-            pushFollow(FOLLOW_ruleSimpleState_in_entryRuleSimpleState3312);
+            pushFollow(FOLLOW_1);
             ruleSimpleState();
 
             state._fsp--;
 
              after(grammarAccess.getSimpleStateRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSimpleState3319); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -4374,23 +4374,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleSimpleState"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1593:1: ruleSimpleState : ( ( rule__SimpleState__Group__0 ) ) ;
+    // InternalRoom.g:1593:1: ruleSimpleState : ( ( rule__SimpleState__Group__0 ) ) ;
     public final void ruleSimpleState() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1597:2: ( ( ( rule__SimpleState__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1598:1: ( ( rule__SimpleState__Group__0 ) )
+            // InternalRoom.g:1597:2: ( ( ( rule__SimpleState__Group__0 ) ) )
+            // InternalRoom.g:1598:1: ( ( rule__SimpleState__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1598:1: ( ( rule__SimpleState__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1599:1: ( rule__SimpleState__Group__0 )
+            // InternalRoom.g:1598:1: ( ( rule__SimpleState__Group__0 ) )
+            // InternalRoom.g:1599:1: ( rule__SimpleState__Group__0 )
             {
              before(grammarAccess.getSimpleStateAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1600:1: ( rule__SimpleState__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1600:2: rule__SimpleState__Group__0
+            // InternalRoom.g:1600:1: ( rule__SimpleState__Group__0 )
+            // InternalRoom.g:1600:2: rule__SimpleState__Group__0
             {
-            pushFollow(FOLLOW_rule__SimpleState__Group__0_in_ruleSimpleState3345);
+            pushFollow(FOLLOW_2);
             rule__SimpleState__Group__0();
 
             state._fsp--;
@@ -4421,20 +4421,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleRefinedState"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1612:1: entryRuleRefinedState : ruleRefinedState EOF ;
+    // InternalRoom.g:1612:1: entryRuleRefinedState : ruleRefinedState EOF ;
     public final void entryRuleRefinedState() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1613:1: ( ruleRefinedState EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1614:1: ruleRefinedState EOF
+            // InternalRoom.g:1613:1: ( ruleRefinedState EOF )
+            // InternalRoom.g:1614:1: ruleRefinedState EOF
             {
              before(grammarAccess.getRefinedStateRule()); 
-            pushFollow(FOLLOW_ruleRefinedState_in_entryRuleRefinedState3372);
+            pushFollow(FOLLOW_1);
             ruleRefinedState();
 
             state._fsp--;
 
              after(grammarAccess.getRefinedStateRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRefinedState3379); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -4451,23 +4451,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleRefinedState"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1621:1: ruleRefinedState : ( ( rule__RefinedState__Group__0 ) ) ;
+    // InternalRoom.g:1621:1: ruleRefinedState : ( ( rule__RefinedState__Group__0 ) ) ;
     public final void ruleRefinedState() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1625:2: ( ( ( rule__RefinedState__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1626:1: ( ( rule__RefinedState__Group__0 ) )
+            // InternalRoom.g:1625:2: ( ( ( rule__RefinedState__Group__0 ) ) )
+            // InternalRoom.g:1626:1: ( ( rule__RefinedState__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1626:1: ( ( rule__RefinedState__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1627:1: ( rule__RefinedState__Group__0 )
+            // InternalRoom.g:1626:1: ( ( rule__RefinedState__Group__0 ) )
+            // InternalRoom.g:1627:1: ( rule__RefinedState__Group__0 )
             {
              before(grammarAccess.getRefinedStateAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1628:1: ( rule__RefinedState__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1628:2: rule__RefinedState__Group__0
+            // InternalRoom.g:1628:1: ( rule__RefinedState__Group__0 )
+            // InternalRoom.g:1628:2: rule__RefinedState__Group__0
             {
-            pushFollow(FOLLOW_rule__RefinedState__Group__0_in_ruleRefinedState3405);
+            pushFollow(FOLLOW_2);
             rule__RefinedState__Group__0();
 
             state._fsp--;
@@ -4498,20 +4498,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleDetailCode"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1640:1: entryRuleDetailCode : ruleDetailCode EOF ;
+    // InternalRoom.g:1640:1: entryRuleDetailCode : ruleDetailCode EOF ;
     public final void entryRuleDetailCode() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1641:1: ( ruleDetailCode EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1642:1: ruleDetailCode EOF
+            // InternalRoom.g:1641:1: ( ruleDetailCode EOF )
+            // InternalRoom.g:1642:1: ruleDetailCode EOF
             {
              before(grammarAccess.getDetailCodeRule()); 
-            pushFollow(FOLLOW_ruleDetailCode_in_entryRuleDetailCode3432);
+            pushFollow(FOLLOW_1);
             ruleDetailCode();
 
             state._fsp--;
 
              after(grammarAccess.getDetailCodeRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDetailCode3439); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -4528,23 +4528,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleDetailCode"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1649:1: ruleDetailCode : ( ( rule__DetailCode__Group__0 ) ) ;
+    // InternalRoom.g:1649:1: ruleDetailCode : ( ( rule__DetailCode__Group__0 ) ) ;
     public final void ruleDetailCode() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1653:2: ( ( ( rule__DetailCode__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1654:1: ( ( rule__DetailCode__Group__0 ) )
+            // InternalRoom.g:1653:2: ( ( ( rule__DetailCode__Group__0 ) ) )
+            // InternalRoom.g:1654:1: ( ( rule__DetailCode__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1654:1: ( ( rule__DetailCode__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1655:1: ( rule__DetailCode__Group__0 )
+            // InternalRoom.g:1654:1: ( ( rule__DetailCode__Group__0 ) )
+            // InternalRoom.g:1655:1: ( rule__DetailCode__Group__0 )
             {
              before(grammarAccess.getDetailCodeAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1656:1: ( rule__DetailCode__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1656:2: rule__DetailCode__Group__0
+            // InternalRoom.g:1656:1: ( rule__DetailCode__Group__0 )
+            // InternalRoom.g:1656:2: rule__DetailCode__Group__0
             {
-            pushFollow(FOLLOW_rule__DetailCode__Group__0_in_ruleDetailCode3465);
+            pushFollow(FOLLOW_2);
             rule__DetailCode__Group__0();
 
             state._fsp--;
@@ -4575,20 +4575,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleTrPoint"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1668:1: entryRuleTrPoint : ruleTrPoint EOF ;
+    // InternalRoom.g:1668:1: entryRuleTrPoint : ruleTrPoint EOF ;
     public final void entryRuleTrPoint() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1669:1: ( ruleTrPoint EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1670:1: ruleTrPoint EOF
+            // InternalRoom.g:1669:1: ( ruleTrPoint EOF )
+            // InternalRoom.g:1670:1: ruleTrPoint EOF
             {
              before(grammarAccess.getTrPointRule()); 
-            pushFollow(FOLLOW_ruleTrPoint_in_entryRuleTrPoint3492);
+            pushFollow(FOLLOW_1);
             ruleTrPoint();
 
             state._fsp--;
 
              after(grammarAccess.getTrPointRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleTrPoint3499); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -4605,23 +4605,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleTrPoint"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1677:1: ruleTrPoint : ( ( rule__TrPoint__Alternatives ) ) ;
+    // InternalRoom.g:1677:1: ruleTrPoint : ( ( rule__TrPoint__Alternatives ) ) ;
     public final void ruleTrPoint() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1681:2: ( ( ( rule__TrPoint__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1682:1: ( ( rule__TrPoint__Alternatives ) )
+            // InternalRoom.g:1681:2: ( ( ( rule__TrPoint__Alternatives ) ) )
+            // InternalRoom.g:1682:1: ( ( rule__TrPoint__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1682:1: ( ( rule__TrPoint__Alternatives ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1683:1: ( rule__TrPoint__Alternatives )
+            // InternalRoom.g:1682:1: ( ( rule__TrPoint__Alternatives ) )
+            // InternalRoom.g:1683:1: ( rule__TrPoint__Alternatives )
             {
              before(grammarAccess.getTrPointAccess().getAlternatives()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1684:1: ( rule__TrPoint__Alternatives )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1684:2: rule__TrPoint__Alternatives
+            // InternalRoom.g:1684:1: ( rule__TrPoint__Alternatives )
+            // InternalRoom.g:1684:2: rule__TrPoint__Alternatives
             {
-            pushFollow(FOLLOW_rule__TrPoint__Alternatives_in_ruleTrPoint3525);
+            pushFollow(FOLLOW_2);
             rule__TrPoint__Alternatives();
 
             state._fsp--;
@@ -4652,20 +4652,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleTransitionPoint"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1696:1: entryRuleTransitionPoint : ruleTransitionPoint EOF ;
+    // InternalRoom.g:1696:1: entryRuleTransitionPoint : ruleTransitionPoint EOF ;
     public final void entryRuleTransitionPoint() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1697:1: ( ruleTransitionPoint EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1698:1: ruleTransitionPoint EOF
+            // InternalRoom.g:1697:1: ( ruleTransitionPoint EOF )
+            // InternalRoom.g:1698:1: ruleTransitionPoint EOF
             {
              before(grammarAccess.getTransitionPointRule()); 
-            pushFollow(FOLLOW_ruleTransitionPoint_in_entryRuleTransitionPoint3552);
+            pushFollow(FOLLOW_1);
             ruleTransitionPoint();
 
             state._fsp--;
 
              after(grammarAccess.getTransitionPointRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleTransitionPoint3559); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -4682,23 +4682,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleTransitionPoint"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1705:1: ruleTransitionPoint : ( ( rule__TransitionPoint__Group__0 ) ) ;
+    // InternalRoom.g:1705:1: ruleTransitionPoint : ( ( rule__TransitionPoint__Group__0 ) ) ;
     public final void ruleTransitionPoint() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1709:2: ( ( ( rule__TransitionPoint__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1710:1: ( ( rule__TransitionPoint__Group__0 ) )
+            // InternalRoom.g:1709:2: ( ( ( rule__TransitionPoint__Group__0 ) ) )
+            // InternalRoom.g:1710:1: ( ( rule__TransitionPoint__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1710:1: ( ( rule__TransitionPoint__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1711:1: ( rule__TransitionPoint__Group__0 )
+            // InternalRoom.g:1710:1: ( ( rule__TransitionPoint__Group__0 ) )
+            // InternalRoom.g:1711:1: ( rule__TransitionPoint__Group__0 )
             {
              before(grammarAccess.getTransitionPointAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1712:1: ( rule__TransitionPoint__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1712:2: rule__TransitionPoint__Group__0
+            // InternalRoom.g:1712:1: ( rule__TransitionPoint__Group__0 )
+            // InternalRoom.g:1712:2: rule__TransitionPoint__Group__0
             {
-            pushFollow(FOLLOW_rule__TransitionPoint__Group__0_in_ruleTransitionPoint3585);
+            pushFollow(FOLLOW_2);
             rule__TransitionPoint__Group__0();
 
             state._fsp--;
@@ -4729,20 +4729,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleEntryPoint"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1724:1: entryRuleEntryPoint : ruleEntryPoint EOF ;
+    // InternalRoom.g:1724:1: entryRuleEntryPoint : ruleEntryPoint EOF ;
     public final void entryRuleEntryPoint() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1725:1: ( ruleEntryPoint EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1726:1: ruleEntryPoint EOF
+            // InternalRoom.g:1725:1: ( ruleEntryPoint EOF )
+            // InternalRoom.g:1726:1: ruleEntryPoint EOF
             {
              before(grammarAccess.getEntryPointRule()); 
-            pushFollow(FOLLOW_ruleEntryPoint_in_entryRuleEntryPoint3612);
+            pushFollow(FOLLOW_1);
             ruleEntryPoint();
 
             state._fsp--;
 
              after(grammarAccess.getEntryPointRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleEntryPoint3619); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -4759,23 +4759,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleEntryPoint"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1733:1: ruleEntryPoint : ( ( rule__EntryPoint__Group__0 ) ) ;
+    // InternalRoom.g:1733:1: ruleEntryPoint : ( ( rule__EntryPoint__Group__0 ) ) ;
     public final void ruleEntryPoint() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1737:2: ( ( ( rule__EntryPoint__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1738:1: ( ( rule__EntryPoint__Group__0 ) )
+            // InternalRoom.g:1737:2: ( ( ( rule__EntryPoint__Group__0 ) ) )
+            // InternalRoom.g:1738:1: ( ( rule__EntryPoint__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1738:1: ( ( rule__EntryPoint__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1739:1: ( rule__EntryPoint__Group__0 )
+            // InternalRoom.g:1738:1: ( ( rule__EntryPoint__Group__0 ) )
+            // InternalRoom.g:1739:1: ( rule__EntryPoint__Group__0 )
             {
              before(grammarAccess.getEntryPointAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1740:1: ( rule__EntryPoint__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1740:2: rule__EntryPoint__Group__0
+            // InternalRoom.g:1740:1: ( rule__EntryPoint__Group__0 )
+            // InternalRoom.g:1740:2: rule__EntryPoint__Group__0
             {
-            pushFollow(FOLLOW_rule__EntryPoint__Group__0_in_ruleEntryPoint3645);
+            pushFollow(FOLLOW_2);
             rule__EntryPoint__Group__0();
 
             state._fsp--;
@@ -4806,20 +4806,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleExitPoint"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1752:1: entryRuleExitPoint : ruleExitPoint EOF ;
+    // InternalRoom.g:1752:1: entryRuleExitPoint : ruleExitPoint EOF ;
     public final void entryRuleExitPoint() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1753:1: ( ruleExitPoint EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1754:1: ruleExitPoint EOF
+            // InternalRoom.g:1753:1: ( ruleExitPoint EOF )
+            // InternalRoom.g:1754:1: ruleExitPoint EOF
             {
              before(grammarAccess.getExitPointRule()); 
-            pushFollow(FOLLOW_ruleExitPoint_in_entryRuleExitPoint3672);
+            pushFollow(FOLLOW_1);
             ruleExitPoint();
 
             state._fsp--;
 
              after(grammarAccess.getExitPointRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleExitPoint3679); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -4836,23 +4836,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleExitPoint"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1761:1: ruleExitPoint : ( ( rule__ExitPoint__Group__0 ) ) ;
+    // InternalRoom.g:1761:1: ruleExitPoint : ( ( rule__ExitPoint__Group__0 ) ) ;
     public final void ruleExitPoint() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1765:2: ( ( ( rule__ExitPoint__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1766:1: ( ( rule__ExitPoint__Group__0 ) )
+            // InternalRoom.g:1765:2: ( ( ( rule__ExitPoint__Group__0 ) ) )
+            // InternalRoom.g:1766:1: ( ( rule__ExitPoint__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1766:1: ( ( rule__ExitPoint__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1767:1: ( rule__ExitPoint__Group__0 )
+            // InternalRoom.g:1766:1: ( ( rule__ExitPoint__Group__0 ) )
+            // InternalRoom.g:1767:1: ( rule__ExitPoint__Group__0 )
             {
              before(grammarAccess.getExitPointAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1768:1: ( rule__ExitPoint__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1768:2: rule__ExitPoint__Group__0
+            // InternalRoom.g:1768:1: ( rule__ExitPoint__Group__0 )
+            // InternalRoom.g:1768:2: rule__ExitPoint__Group__0
             {
-            pushFollow(FOLLOW_rule__ExitPoint__Group__0_in_ruleExitPoint3705);
+            pushFollow(FOLLOW_2);
             rule__ExitPoint__Group__0();
 
             state._fsp--;
@@ -4883,20 +4883,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleChoicePoint"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1780:1: entryRuleChoicePoint : ruleChoicePoint EOF ;
+    // InternalRoom.g:1780:1: entryRuleChoicePoint : ruleChoicePoint EOF ;
     public final void entryRuleChoicePoint() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1781:1: ( ruleChoicePoint EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1782:1: ruleChoicePoint EOF
+            // InternalRoom.g:1781:1: ( ruleChoicePoint EOF )
+            // InternalRoom.g:1782:1: ruleChoicePoint EOF
             {
              before(grammarAccess.getChoicePointRule()); 
-            pushFollow(FOLLOW_ruleChoicePoint_in_entryRuleChoicePoint3732);
+            pushFollow(FOLLOW_1);
             ruleChoicePoint();
 
             state._fsp--;
 
              after(grammarAccess.getChoicePointRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleChoicePoint3739); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -4913,23 +4913,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleChoicePoint"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1789:1: ruleChoicePoint : ( ( rule__ChoicePoint__Group__0 ) ) ;
+    // InternalRoom.g:1789:1: ruleChoicePoint : ( ( rule__ChoicePoint__Group__0 ) ) ;
     public final void ruleChoicePoint() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1793:2: ( ( ( rule__ChoicePoint__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1794:1: ( ( rule__ChoicePoint__Group__0 ) )
+            // InternalRoom.g:1793:2: ( ( ( rule__ChoicePoint__Group__0 ) ) )
+            // InternalRoom.g:1794:1: ( ( rule__ChoicePoint__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1794:1: ( ( rule__ChoicePoint__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1795:1: ( rule__ChoicePoint__Group__0 )
+            // InternalRoom.g:1794:1: ( ( rule__ChoicePoint__Group__0 ) )
+            // InternalRoom.g:1795:1: ( rule__ChoicePoint__Group__0 )
             {
              before(grammarAccess.getChoicePointAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1796:1: ( rule__ChoicePoint__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1796:2: rule__ChoicePoint__Group__0
+            // InternalRoom.g:1796:1: ( rule__ChoicePoint__Group__0 )
+            // InternalRoom.g:1796:2: rule__ChoicePoint__Group__0
             {
-            pushFollow(FOLLOW_rule__ChoicePoint__Group__0_in_ruleChoicePoint3765);
+            pushFollow(FOLLOW_2);
             rule__ChoicePoint__Group__0();
 
             state._fsp--;
@@ -4960,20 +4960,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleTransition"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1808:1: entryRuleTransition : ruleTransition EOF ;
+    // InternalRoom.g:1810:1: entryRuleTransition : ruleTransition EOF ;
     public final void entryRuleTransition() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1809:1: ( ruleTransition EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1810:1: ruleTransition EOF
+            // InternalRoom.g:1811:1: ( ruleTransition EOF )
+            // InternalRoom.g:1812:1: ruleTransition EOF
             {
              before(grammarAccess.getTransitionRule()); 
-            pushFollow(FOLLOW_ruleTransition_in_entryRuleTransition3792);
+            pushFollow(FOLLOW_1);
             ruleTransition();
 
             state._fsp--;
 
              after(grammarAccess.getTransitionRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleTransition3799); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -4990,23 +4990,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleTransition"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1817:1: ruleTransition : ( ( rule__Transition__Alternatives ) ) ;
+    // InternalRoom.g:1819:1: ruleTransition : ( ( rule__Transition__Alternatives ) ) ;
     public final void ruleTransition() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1821:2: ( ( ( rule__Transition__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1822:1: ( ( rule__Transition__Alternatives ) )
+            // InternalRoom.g:1823:2: ( ( ( rule__Transition__Alternatives ) ) )
+            // InternalRoom.g:1824:1: ( ( rule__Transition__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1822:1: ( ( rule__Transition__Alternatives ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1823:1: ( rule__Transition__Alternatives )
+            // InternalRoom.g:1824:1: ( ( rule__Transition__Alternatives ) )
+            // InternalRoom.g:1825:1: ( rule__Transition__Alternatives )
             {
              before(grammarAccess.getTransitionAccess().getAlternatives()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1824:1: ( rule__Transition__Alternatives )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1824:2: rule__Transition__Alternatives
+            // InternalRoom.g:1826:1: ( rule__Transition__Alternatives )
+            // InternalRoom.g:1826:2: rule__Transition__Alternatives
             {
-            pushFollow(FOLLOW_rule__Transition__Alternatives_in_ruleTransition3825);
+            pushFollow(FOLLOW_2);
             rule__Transition__Alternatives();
 
             state._fsp--;
@@ -5037,20 +5037,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleNonInitialTransition"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1836:1: entryRuleNonInitialTransition : ruleNonInitialTransition EOF ;
+    // InternalRoom.g:1838:1: entryRuleNonInitialTransition : ruleNonInitialTransition EOF ;
     public final void entryRuleNonInitialTransition() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1837:1: ( ruleNonInitialTransition EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1838:1: ruleNonInitialTransition EOF
+            // InternalRoom.g:1839:1: ( ruleNonInitialTransition EOF )
+            // InternalRoom.g:1840:1: ruleNonInitialTransition EOF
             {
              before(grammarAccess.getNonInitialTransitionRule()); 
-            pushFollow(FOLLOW_ruleNonInitialTransition_in_entryRuleNonInitialTransition3852);
+            pushFollow(FOLLOW_1);
             ruleNonInitialTransition();
 
             state._fsp--;
 
              after(grammarAccess.getNonInitialTransitionRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleNonInitialTransition3859); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -5067,23 +5067,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleNonInitialTransition"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1845:1: ruleNonInitialTransition : ( ( rule__NonInitialTransition__Alternatives ) ) ;
+    // InternalRoom.g:1847:1: ruleNonInitialTransition : ( ( rule__NonInitialTransition__Alternatives ) ) ;
     public final void ruleNonInitialTransition() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1849:2: ( ( ( rule__NonInitialTransition__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1850:1: ( ( rule__NonInitialTransition__Alternatives ) )
+            // InternalRoom.g:1851:2: ( ( ( rule__NonInitialTransition__Alternatives ) ) )
+            // InternalRoom.g:1852:1: ( ( rule__NonInitialTransition__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1850:1: ( ( rule__NonInitialTransition__Alternatives ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1851:1: ( rule__NonInitialTransition__Alternatives )
+            // InternalRoom.g:1852:1: ( ( rule__NonInitialTransition__Alternatives ) )
+            // InternalRoom.g:1853:1: ( rule__NonInitialTransition__Alternatives )
             {
              before(grammarAccess.getNonInitialTransitionAccess().getAlternatives()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1852:1: ( rule__NonInitialTransition__Alternatives )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1852:2: rule__NonInitialTransition__Alternatives
+            // InternalRoom.g:1854:1: ( rule__NonInitialTransition__Alternatives )
+            // InternalRoom.g:1854:2: rule__NonInitialTransition__Alternatives
             {
-            pushFollow(FOLLOW_rule__NonInitialTransition__Alternatives_in_ruleNonInitialTransition3885);
+            pushFollow(FOLLOW_2);
             rule__NonInitialTransition__Alternatives();
 
             state._fsp--;
@@ -5114,20 +5114,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleTransitionChainStartTransition"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1864:1: entryRuleTransitionChainStartTransition : ruleTransitionChainStartTransition EOF ;
+    // InternalRoom.g:1866:1: entryRuleTransitionChainStartTransition : ruleTransitionChainStartTransition EOF ;
     public final void entryRuleTransitionChainStartTransition() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1865:1: ( ruleTransitionChainStartTransition EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1866:1: ruleTransitionChainStartTransition EOF
+            // InternalRoom.g:1867:1: ( ruleTransitionChainStartTransition EOF )
+            // InternalRoom.g:1868:1: ruleTransitionChainStartTransition EOF
             {
              before(grammarAccess.getTransitionChainStartTransitionRule()); 
-            pushFollow(FOLLOW_ruleTransitionChainStartTransition_in_entryRuleTransitionChainStartTransition3912);
+            pushFollow(FOLLOW_1);
             ruleTransitionChainStartTransition();
 
             state._fsp--;
 
              after(grammarAccess.getTransitionChainStartTransitionRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleTransitionChainStartTransition3919); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -5144,23 +5144,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleTransitionChainStartTransition"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1873:1: ruleTransitionChainStartTransition : ( ( rule__TransitionChainStartTransition__Alternatives ) ) ;
+    // InternalRoom.g:1875:1: ruleTransitionChainStartTransition : ( ( rule__TransitionChainStartTransition__Alternatives ) ) ;
     public final void ruleTransitionChainStartTransition() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1877:2: ( ( ( rule__TransitionChainStartTransition__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1878:1: ( ( rule__TransitionChainStartTransition__Alternatives ) )
+            // InternalRoom.g:1879:2: ( ( ( rule__TransitionChainStartTransition__Alternatives ) ) )
+            // InternalRoom.g:1880:1: ( ( rule__TransitionChainStartTransition__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1878:1: ( ( rule__TransitionChainStartTransition__Alternatives ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1879:1: ( rule__TransitionChainStartTransition__Alternatives )
+            // InternalRoom.g:1880:1: ( ( rule__TransitionChainStartTransition__Alternatives ) )
+            // InternalRoom.g:1881:1: ( rule__TransitionChainStartTransition__Alternatives )
             {
              before(grammarAccess.getTransitionChainStartTransitionAccess().getAlternatives()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1880:1: ( rule__TransitionChainStartTransition__Alternatives )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1880:2: rule__TransitionChainStartTransition__Alternatives
+            // InternalRoom.g:1882:1: ( rule__TransitionChainStartTransition__Alternatives )
+            // InternalRoom.g:1882:2: rule__TransitionChainStartTransition__Alternatives
             {
-            pushFollow(FOLLOW_rule__TransitionChainStartTransition__Alternatives_in_ruleTransitionChainStartTransition3945);
+            pushFollow(FOLLOW_2);
             rule__TransitionChainStartTransition__Alternatives();
 
             state._fsp--;
@@ -5191,20 +5191,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleInitialTransition"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1892:1: entryRuleInitialTransition : ruleInitialTransition EOF ;
+    // InternalRoom.g:1894:1: entryRuleInitialTransition : ruleInitialTransition EOF ;
     public final void entryRuleInitialTransition() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1893:1: ( ruleInitialTransition EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1894:1: ruleInitialTransition EOF
+            // InternalRoom.g:1895:1: ( ruleInitialTransition EOF )
+            // InternalRoom.g:1896:1: ruleInitialTransition EOF
             {
              before(grammarAccess.getInitialTransitionRule()); 
-            pushFollow(FOLLOW_ruleInitialTransition_in_entryRuleInitialTransition3972);
+            pushFollow(FOLLOW_1);
             ruleInitialTransition();
 
             state._fsp--;
 
              after(grammarAccess.getInitialTransitionRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleInitialTransition3979); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -5221,23 +5221,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleInitialTransition"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1901:1: ruleInitialTransition : ( ( rule__InitialTransition__Group__0 ) ) ;
+    // InternalRoom.g:1903:1: ruleInitialTransition : ( ( rule__InitialTransition__Group__0 ) ) ;
     public final void ruleInitialTransition() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1905:2: ( ( ( rule__InitialTransition__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1906:1: ( ( rule__InitialTransition__Group__0 ) )
+            // InternalRoom.g:1907:2: ( ( ( rule__InitialTransition__Group__0 ) ) )
+            // InternalRoom.g:1908:1: ( ( rule__InitialTransition__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1906:1: ( ( rule__InitialTransition__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1907:1: ( rule__InitialTransition__Group__0 )
+            // InternalRoom.g:1908:1: ( ( rule__InitialTransition__Group__0 ) )
+            // InternalRoom.g:1909:1: ( rule__InitialTransition__Group__0 )
             {
              before(grammarAccess.getInitialTransitionAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1908:1: ( rule__InitialTransition__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1908:2: rule__InitialTransition__Group__0
+            // InternalRoom.g:1910:1: ( rule__InitialTransition__Group__0 )
+            // InternalRoom.g:1910:2: rule__InitialTransition__Group__0
             {
-            pushFollow(FOLLOW_rule__InitialTransition__Group__0_in_ruleInitialTransition4005);
+            pushFollow(FOLLOW_2);
             rule__InitialTransition__Group__0();
 
             state._fsp--;
@@ -5268,20 +5268,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleContinuationTransition"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1920:1: entryRuleContinuationTransition : ruleContinuationTransition EOF ;
+    // InternalRoom.g:1922:1: entryRuleContinuationTransition : ruleContinuationTransition EOF ;
     public final void entryRuleContinuationTransition() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1921:1: ( ruleContinuationTransition EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1922:1: ruleContinuationTransition EOF
+            // InternalRoom.g:1923:1: ( ruleContinuationTransition EOF )
+            // InternalRoom.g:1924:1: ruleContinuationTransition EOF
             {
              before(grammarAccess.getContinuationTransitionRule()); 
-            pushFollow(FOLLOW_ruleContinuationTransition_in_entryRuleContinuationTransition4032);
+            pushFollow(FOLLOW_1);
             ruleContinuationTransition();
 
             state._fsp--;
 
              after(grammarAccess.getContinuationTransitionRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleContinuationTransition4039); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -5298,23 +5298,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleContinuationTransition"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1929:1: ruleContinuationTransition : ( ( rule__ContinuationTransition__Group__0 ) ) ;
+    // InternalRoom.g:1931:1: ruleContinuationTransition : ( ( rule__ContinuationTransition__Group__0 ) ) ;
     public final void ruleContinuationTransition() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1933:2: ( ( ( rule__ContinuationTransition__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1934:1: ( ( rule__ContinuationTransition__Group__0 ) )
+            // InternalRoom.g:1935:2: ( ( ( rule__ContinuationTransition__Group__0 ) ) )
+            // InternalRoom.g:1936:1: ( ( rule__ContinuationTransition__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1934:1: ( ( rule__ContinuationTransition__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1935:1: ( rule__ContinuationTransition__Group__0 )
+            // InternalRoom.g:1936:1: ( ( rule__ContinuationTransition__Group__0 ) )
+            // InternalRoom.g:1937:1: ( rule__ContinuationTransition__Group__0 )
             {
              before(grammarAccess.getContinuationTransitionAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1936:1: ( rule__ContinuationTransition__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1936:2: rule__ContinuationTransition__Group__0
+            // InternalRoom.g:1938:1: ( rule__ContinuationTransition__Group__0 )
+            // InternalRoom.g:1938:2: rule__ContinuationTransition__Group__0
             {
-            pushFollow(FOLLOW_rule__ContinuationTransition__Group__0_in_ruleContinuationTransition4065);
+            pushFollow(FOLLOW_2);
             rule__ContinuationTransition__Group__0();
 
             state._fsp--;
@@ -5345,20 +5345,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleTriggeredTransition"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1948:1: entryRuleTriggeredTransition : ruleTriggeredTransition EOF ;
+    // InternalRoom.g:1950:1: entryRuleTriggeredTransition : ruleTriggeredTransition EOF ;
     public final void entryRuleTriggeredTransition() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1949:1: ( ruleTriggeredTransition EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1950:1: ruleTriggeredTransition EOF
+            // InternalRoom.g:1951:1: ( ruleTriggeredTransition EOF )
+            // InternalRoom.g:1952:1: ruleTriggeredTransition EOF
             {
              before(grammarAccess.getTriggeredTransitionRule()); 
-            pushFollow(FOLLOW_ruleTriggeredTransition_in_entryRuleTriggeredTransition4092);
+            pushFollow(FOLLOW_1);
             ruleTriggeredTransition();
 
             state._fsp--;
 
              after(grammarAccess.getTriggeredTransitionRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleTriggeredTransition4099); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -5375,23 +5375,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleTriggeredTransition"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1957:1: ruleTriggeredTransition : ( ( rule__TriggeredTransition__Group__0 ) ) ;
+    // InternalRoom.g:1959:1: ruleTriggeredTransition : ( ( rule__TriggeredTransition__Group__0 ) ) ;
     public final void ruleTriggeredTransition() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1961:2: ( ( ( rule__TriggeredTransition__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1962:1: ( ( rule__TriggeredTransition__Group__0 ) )
+            // InternalRoom.g:1963:2: ( ( ( rule__TriggeredTransition__Group__0 ) ) )
+            // InternalRoom.g:1964:1: ( ( rule__TriggeredTransition__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1962:1: ( ( rule__TriggeredTransition__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1963:1: ( rule__TriggeredTransition__Group__0 )
+            // InternalRoom.g:1964:1: ( ( rule__TriggeredTransition__Group__0 ) )
+            // InternalRoom.g:1965:1: ( rule__TriggeredTransition__Group__0 )
             {
              before(grammarAccess.getTriggeredTransitionAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1964:1: ( rule__TriggeredTransition__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1964:2: rule__TriggeredTransition__Group__0
+            // InternalRoom.g:1966:1: ( rule__TriggeredTransition__Group__0 )
+            // InternalRoom.g:1966:2: rule__TriggeredTransition__Group__0
             {
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__0_in_ruleTriggeredTransition4125);
+            pushFollow(FOLLOW_2);
             rule__TriggeredTransition__Group__0();
 
             state._fsp--;
@@ -5422,20 +5422,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleGuardedTransition"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1976:1: entryRuleGuardedTransition : ruleGuardedTransition EOF ;
+    // InternalRoom.g:1978:1: entryRuleGuardedTransition : ruleGuardedTransition EOF ;
     public final void entryRuleGuardedTransition() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1977:1: ( ruleGuardedTransition EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1978:1: ruleGuardedTransition EOF
+            // InternalRoom.g:1979:1: ( ruleGuardedTransition EOF )
+            // InternalRoom.g:1980:1: ruleGuardedTransition EOF
             {
              before(grammarAccess.getGuardedTransitionRule()); 
-            pushFollow(FOLLOW_ruleGuardedTransition_in_entryRuleGuardedTransition4152);
+            pushFollow(FOLLOW_1);
             ruleGuardedTransition();
 
             state._fsp--;
 
              after(grammarAccess.getGuardedTransitionRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleGuardedTransition4159); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -5452,23 +5452,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleGuardedTransition"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1985:1: ruleGuardedTransition : ( ( rule__GuardedTransition__Group__0 ) ) ;
+    // InternalRoom.g:1987:1: ruleGuardedTransition : ( ( rule__GuardedTransition__Group__0 ) ) ;
     public final void ruleGuardedTransition() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1989:2: ( ( ( rule__GuardedTransition__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1990:1: ( ( rule__GuardedTransition__Group__0 ) )
+            // InternalRoom.g:1991:2: ( ( ( rule__GuardedTransition__Group__0 ) ) )
+            // InternalRoom.g:1992:1: ( ( rule__GuardedTransition__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1990:1: ( ( rule__GuardedTransition__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1991:1: ( rule__GuardedTransition__Group__0 )
+            // InternalRoom.g:1992:1: ( ( rule__GuardedTransition__Group__0 ) )
+            // InternalRoom.g:1993:1: ( rule__GuardedTransition__Group__0 )
             {
              before(grammarAccess.getGuardedTransitionAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1992:1: ( rule__GuardedTransition__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:1992:2: rule__GuardedTransition__Group__0
+            // InternalRoom.g:1994:1: ( rule__GuardedTransition__Group__0 )
+            // InternalRoom.g:1994:2: rule__GuardedTransition__Group__0
             {
-            pushFollow(FOLLOW_rule__GuardedTransition__Group__0_in_ruleGuardedTransition4185);
+            pushFollow(FOLLOW_2);
             rule__GuardedTransition__Group__0();
 
             state._fsp--;
@@ -5499,20 +5499,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleCPBranchTransition"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2004:1: entryRuleCPBranchTransition : ruleCPBranchTransition EOF ;
+    // InternalRoom.g:2006:1: entryRuleCPBranchTransition : ruleCPBranchTransition EOF ;
     public final void entryRuleCPBranchTransition() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2005:1: ( ruleCPBranchTransition EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2006:1: ruleCPBranchTransition EOF
+            // InternalRoom.g:2007:1: ( ruleCPBranchTransition EOF )
+            // InternalRoom.g:2008:1: ruleCPBranchTransition EOF
             {
              before(grammarAccess.getCPBranchTransitionRule()); 
-            pushFollow(FOLLOW_ruleCPBranchTransition_in_entryRuleCPBranchTransition4212);
+            pushFollow(FOLLOW_1);
             ruleCPBranchTransition();
 
             state._fsp--;
 
              after(grammarAccess.getCPBranchTransitionRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleCPBranchTransition4219); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -5529,23 +5529,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleCPBranchTransition"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2013:1: ruleCPBranchTransition : ( ( rule__CPBranchTransition__Group__0 ) ) ;
+    // InternalRoom.g:2015:1: ruleCPBranchTransition : ( ( rule__CPBranchTransition__Group__0 ) ) ;
     public final void ruleCPBranchTransition() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2017:2: ( ( ( rule__CPBranchTransition__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2018:1: ( ( rule__CPBranchTransition__Group__0 ) )
+            // InternalRoom.g:2019:2: ( ( ( rule__CPBranchTransition__Group__0 ) ) )
+            // InternalRoom.g:2020:1: ( ( rule__CPBranchTransition__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2018:1: ( ( rule__CPBranchTransition__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2019:1: ( rule__CPBranchTransition__Group__0 )
+            // InternalRoom.g:2020:1: ( ( rule__CPBranchTransition__Group__0 ) )
+            // InternalRoom.g:2021:1: ( rule__CPBranchTransition__Group__0 )
             {
              before(grammarAccess.getCPBranchTransitionAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2020:1: ( rule__CPBranchTransition__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2020:2: rule__CPBranchTransition__Group__0
+            // InternalRoom.g:2022:1: ( rule__CPBranchTransition__Group__0 )
+            // InternalRoom.g:2022:2: rule__CPBranchTransition__Group__0
             {
-            pushFollow(FOLLOW_rule__CPBranchTransition__Group__0_in_ruleCPBranchTransition4245);
+            pushFollow(FOLLOW_2);
             rule__CPBranchTransition__Group__0();
 
             state._fsp--;
@@ -5576,20 +5576,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleRefinedTransition"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2032:1: entryRuleRefinedTransition : ruleRefinedTransition EOF ;
+    // InternalRoom.g:2034:1: entryRuleRefinedTransition : ruleRefinedTransition EOF ;
     public final void entryRuleRefinedTransition() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2033:1: ( ruleRefinedTransition EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2034:1: ruleRefinedTransition EOF
+            // InternalRoom.g:2035:1: ( ruleRefinedTransition EOF )
+            // InternalRoom.g:2036:1: ruleRefinedTransition EOF
             {
              before(grammarAccess.getRefinedTransitionRule()); 
-            pushFollow(FOLLOW_ruleRefinedTransition_in_entryRuleRefinedTransition4272);
+            pushFollow(FOLLOW_1);
             ruleRefinedTransition();
 
             state._fsp--;
 
              after(grammarAccess.getRefinedTransitionRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRefinedTransition4279); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -5606,23 +5606,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleRefinedTransition"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2041:1: ruleRefinedTransition : ( ( rule__RefinedTransition__Group__0 ) ) ;
+    // InternalRoom.g:2043:1: ruleRefinedTransition : ( ( rule__RefinedTransition__Group__0 ) ) ;
     public final void ruleRefinedTransition() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2045:2: ( ( ( rule__RefinedTransition__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2046:1: ( ( rule__RefinedTransition__Group__0 ) )
+            // InternalRoom.g:2047:2: ( ( ( rule__RefinedTransition__Group__0 ) ) )
+            // InternalRoom.g:2048:1: ( ( rule__RefinedTransition__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2046:1: ( ( rule__RefinedTransition__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2047:1: ( rule__RefinedTransition__Group__0 )
+            // InternalRoom.g:2048:1: ( ( rule__RefinedTransition__Group__0 ) )
+            // InternalRoom.g:2049:1: ( rule__RefinedTransition__Group__0 )
             {
              before(grammarAccess.getRefinedTransitionAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2048:1: ( rule__RefinedTransition__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2048:2: rule__RefinedTransition__Group__0
+            // InternalRoom.g:2050:1: ( rule__RefinedTransition__Group__0 )
+            // InternalRoom.g:2050:2: rule__RefinedTransition__Group__0
             {
-            pushFollow(FOLLOW_rule__RefinedTransition__Group__0_in_ruleRefinedTransition4305);
+            pushFollow(FOLLOW_2);
             rule__RefinedTransition__Group__0();
 
             state._fsp--;
@@ -5653,20 +5653,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleTransitionTerminal"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2060:1: entryRuleTransitionTerminal : ruleTransitionTerminal EOF ;
+    // InternalRoom.g:2062:1: entryRuleTransitionTerminal : ruleTransitionTerminal EOF ;
     public final void entryRuleTransitionTerminal() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2061:1: ( ruleTransitionTerminal EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2062:1: ruleTransitionTerminal EOF
+            // InternalRoom.g:2063:1: ( ruleTransitionTerminal EOF )
+            // InternalRoom.g:2064:1: ruleTransitionTerminal EOF
             {
              before(grammarAccess.getTransitionTerminalRule()); 
-            pushFollow(FOLLOW_ruleTransitionTerminal_in_entryRuleTransitionTerminal4332);
+            pushFollow(FOLLOW_1);
             ruleTransitionTerminal();
 
             state._fsp--;
 
              after(grammarAccess.getTransitionTerminalRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleTransitionTerminal4339); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -5683,23 +5683,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleTransitionTerminal"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2069:1: ruleTransitionTerminal : ( ( rule__TransitionTerminal__Alternatives ) ) ;
+    // InternalRoom.g:2071:1: ruleTransitionTerminal : ( ( rule__TransitionTerminal__Alternatives ) ) ;
     public final void ruleTransitionTerminal() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2073:2: ( ( ( rule__TransitionTerminal__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2074:1: ( ( rule__TransitionTerminal__Alternatives ) )
+            // InternalRoom.g:2075:2: ( ( ( rule__TransitionTerminal__Alternatives ) ) )
+            // InternalRoom.g:2076:1: ( ( rule__TransitionTerminal__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2074:1: ( ( rule__TransitionTerminal__Alternatives ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2075:1: ( rule__TransitionTerminal__Alternatives )
+            // InternalRoom.g:2076:1: ( ( rule__TransitionTerminal__Alternatives ) )
+            // InternalRoom.g:2077:1: ( rule__TransitionTerminal__Alternatives )
             {
              before(grammarAccess.getTransitionTerminalAccess().getAlternatives()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2076:1: ( rule__TransitionTerminal__Alternatives )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2076:2: rule__TransitionTerminal__Alternatives
+            // InternalRoom.g:2078:1: ( rule__TransitionTerminal__Alternatives )
+            // InternalRoom.g:2078:2: rule__TransitionTerminal__Alternatives
             {
-            pushFollow(FOLLOW_rule__TransitionTerminal__Alternatives_in_ruleTransitionTerminal4365);
+            pushFollow(FOLLOW_2);
             rule__TransitionTerminal__Alternatives();
 
             state._fsp--;
@@ -5730,20 +5730,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleStateTerminal"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2088:1: entryRuleStateTerminal : ruleStateTerminal EOF ;
+    // InternalRoom.g:2090:1: entryRuleStateTerminal : ruleStateTerminal EOF ;
     public final void entryRuleStateTerminal() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2089:1: ( ruleStateTerminal EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2090:1: ruleStateTerminal EOF
+            // InternalRoom.g:2091:1: ( ruleStateTerminal EOF )
+            // InternalRoom.g:2092:1: ruleStateTerminal EOF
             {
              before(grammarAccess.getStateTerminalRule()); 
-            pushFollow(FOLLOW_ruleStateTerminal_in_entryRuleStateTerminal4392);
+            pushFollow(FOLLOW_1);
             ruleStateTerminal();
 
             state._fsp--;
 
              after(grammarAccess.getStateTerminalRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleStateTerminal4399); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -5760,23 +5760,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleStateTerminal"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2097:1: ruleStateTerminal : ( ( rule__StateTerminal__StateAssignment ) ) ;
+    // InternalRoom.g:2099:1: ruleStateTerminal : ( ( rule__StateTerminal__StateAssignment ) ) ;
     public final void ruleStateTerminal() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2101:2: ( ( ( rule__StateTerminal__StateAssignment ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2102:1: ( ( rule__StateTerminal__StateAssignment ) )
+            // InternalRoom.g:2103:2: ( ( ( rule__StateTerminal__StateAssignment ) ) )
+            // InternalRoom.g:2104:1: ( ( rule__StateTerminal__StateAssignment ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2102:1: ( ( rule__StateTerminal__StateAssignment ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2103:1: ( rule__StateTerminal__StateAssignment )
+            // InternalRoom.g:2104:1: ( ( rule__StateTerminal__StateAssignment ) )
+            // InternalRoom.g:2105:1: ( rule__StateTerminal__StateAssignment )
             {
              before(grammarAccess.getStateTerminalAccess().getStateAssignment()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2104:1: ( rule__StateTerminal__StateAssignment )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2104:2: rule__StateTerminal__StateAssignment
+            // InternalRoom.g:2106:1: ( rule__StateTerminal__StateAssignment )
+            // InternalRoom.g:2106:2: rule__StateTerminal__StateAssignment
             {
-            pushFollow(FOLLOW_rule__StateTerminal__StateAssignment_in_ruleStateTerminal4425);
+            pushFollow(FOLLOW_2);
             rule__StateTerminal__StateAssignment();
 
             state._fsp--;
@@ -5807,20 +5807,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleTrPointTerminal"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2116:1: entryRuleTrPointTerminal : ruleTrPointTerminal EOF ;
+    // InternalRoom.g:2118:1: entryRuleTrPointTerminal : ruleTrPointTerminal EOF ;
     public final void entryRuleTrPointTerminal() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2117:1: ( ruleTrPointTerminal EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2118:1: ruleTrPointTerminal EOF
+            // InternalRoom.g:2119:1: ( ruleTrPointTerminal EOF )
+            // InternalRoom.g:2120:1: ruleTrPointTerminal EOF
             {
              before(grammarAccess.getTrPointTerminalRule()); 
-            pushFollow(FOLLOW_ruleTrPointTerminal_in_entryRuleTrPointTerminal4452);
+            pushFollow(FOLLOW_1);
             ruleTrPointTerminal();
 
             state._fsp--;
 
              after(grammarAccess.getTrPointTerminalRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleTrPointTerminal4459); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -5837,23 +5837,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleTrPointTerminal"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2125:1: ruleTrPointTerminal : ( ( rule__TrPointTerminal__Group__0 ) ) ;
+    // InternalRoom.g:2127:1: ruleTrPointTerminal : ( ( rule__TrPointTerminal__Group__0 ) ) ;
     public final void ruleTrPointTerminal() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2129:2: ( ( ( rule__TrPointTerminal__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2130:1: ( ( rule__TrPointTerminal__Group__0 ) )
+            // InternalRoom.g:2131:2: ( ( ( rule__TrPointTerminal__Group__0 ) ) )
+            // InternalRoom.g:2132:1: ( ( rule__TrPointTerminal__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2130:1: ( ( rule__TrPointTerminal__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2131:1: ( rule__TrPointTerminal__Group__0 )
+            // InternalRoom.g:2132:1: ( ( rule__TrPointTerminal__Group__0 ) )
+            // InternalRoom.g:2133:1: ( rule__TrPointTerminal__Group__0 )
             {
              before(grammarAccess.getTrPointTerminalAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2132:1: ( rule__TrPointTerminal__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2132:2: rule__TrPointTerminal__Group__0
+            // InternalRoom.g:2134:1: ( rule__TrPointTerminal__Group__0 )
+            // InternalRoom.g:2134:2: rule__TrPointTerminal__Group__0
             {
-            pushFollow(FOLLOW_rule__TrPointTerminal__Group__0_in_ruleTrPointTerminal4485);
+            pushFollow(FOLLOW_2);
             rule__TrPointTerminal__Group__0();
 
             state._fsp--;
@@ -5884,20 +5884,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleSubStateTrPointTerminal"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2144:1: entryRuleSubStateTrPointTerminal : ruleSubStateTrPointTerminal EOF ;
+    // InternalRoom.g:2146:1: entryRuleSubStateTrPointTerminal : ruleSubStateTrPointTerminal EOF ;
     public final void entryRuleSubStateTrPointTerminal() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2145:1: ( ruleSubStateTrPointTerminal EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2146:1: ruleSubStateTrPointTerminal EOF
+            // InternalRoom.g:2147:1: ( ruleSubStateTrPointTerminal EOF )
+            // InternalRoom.g:2148:1: ruleSubStateTrPointTerminal EOF
             {
              before(grammarAccess.getSubStateTrPointTerminalRule()); 
-            pushFollow(FOLLOW_ruleSubStateTrPointTerminal_in_entryRuleSubStateTrPointTerminal4512);
+            pushFollow(FOLLOW_1);
             ruleSubStateTrPointTerminal();
 
             state._fsp--;
 
              after(grammarAccess.getSubStateTrPointTerminalRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSubStateTrPointTerminal4519); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -5914,23 +5914,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleSubStateTrPointTerminal"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2153:1: ruleSubStateTrPointTerminal : ( ( rule__SubStateTrPointTerminal__Group__0 ) ) ;
+    // InternalRoom.g:2155:1: ruleSubStateTrPointTerminal : ( ( rule__SubStateTrPointTerminal__Group__0 ) ) ;
     public final void ruleSubStateTrPointTerminal() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2157:2: ( ( ( rule__SubStateTrPointTerminal__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2158:1: ( ( rule__SubStateTrPointTerminal__Group__0 ) )
+            // InternalRoom.g:2159:2: ( ( ( rule__SubStateTrPointTerminal__Group__0 ) ) )
+            // InternalRoom.g:2160:1: ( ( rule__SubStateTrPointTerminal__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2158:1: ( ( rule__SubStateTrPointTerminal__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2159:1: ( rule__SubStateTrPointTerminal__Group__0 )
+            // InternalRoom.g:2160:1: ( ( rule__SubStateTrPointTerminal__Group__0 ) )
+            // InternalRoom.g:2161:1: ( rule__SubStateTrPointTerminal__Group__0 )
             {
              before(grammarAccess.getSubStateTrPointTerminalAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2160:1: ( rule__SubStateTrPointTerminal__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2160:2: rule__SubStateTrPointTerminal__Group__0
+            // InternalRoom.g:2162:1: ( rule__SubStateTrPointTerminal__Group__0 )
+            // InternalRoom.g:2162:2: rule__SubStateTrPointTerminal__Group__0
             {
-            pushFollow(FOLLOW_rule__SubStateTrPointTerminal__Group__0_in_ruleSubStateTrPointTerminal4545);
+            pushFollow(FOLLOW_2);
             rule__SubStateTrPointTerminal__Group__0();
 
             state._fsp--;
@@ -5961,20 +5961,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleChoicepointTerminal"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2172:1: entryRuleChoicepointTerminal : ruleChoicepointTerminal EOF ;
+    // InternalRoom.g:2174:1: entryRuleChoicepointTerminal : ruleChoicepointTerminal EOF ;
     public final void entryRuleChoicepointTerminal() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2173:1: ( ruleChoicepointTerminal EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2174:1: ruleChoicepointTerminal EOF
+            // InternalRoom.g:2175:1: ( ruleChoicepointTerminal EOF )
+            // InternalRoom.g:2176:1: ruleChoicepointTerminal EOF
             {
              before(grammarAccess.getChoicepointTerminalRule()); 
-            pushFollow(FOLLOW_ruleChoicepointTerminal_in_entryRuleChoicepointTerminal4572);
+            pushFollow(FOLLOW_1);
             ruleChoicepointTerminal();
 
             state._fsp--;
 
              after(grammarAccess.getChoicepointTerminalRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleChoicepointTerminal4579); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -5991,23 +5991,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleChoicepointTerminal"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2181:1: ruleChoicepointTerminal : ( ( rule__ChoicepointTerminal__Group__0 ) ) ;
+    // InternalRoom.g:2183:1: ruleChoicepointTerminal : ( ( rule__ChoicepointTerminal__Group__0 ) ) ;
     public final void ruleChoicepointTerminal() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2185:2: ( ( ( rule__ChoicepointTerminal__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2186:1: ( ( rule__ChoicepointTerminal__Group__0 ) )
+            // InternalRoom.g:2187:2: ( ( ( rule__ChoicepointTerminal__Group__0 ) ) )
+            // InternalRoom.g:2188:1: ( ( rule__ChoicepointTerminal__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2186:1: ( ( rule__ChoicepointTerminal__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2187:1: ( rule__ChoicepointTerminal__Group__0 )
+            // InternalRoom.g:2188:1: ( ( rule__ChoicepointTerminal__Group__0 ) )
+            // InternalRoom.g:2189:1: ( rule__ChoicepointTerminal__Group__0 )
             {
              before(grammarAccess.getChoicepointTerminalAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2188:1: ( rule__ChoicepointTerminal__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2188:2: rule__ChoicepointTerminal__Group__0
+            // InternalRoom.g:2190:1: ( rule__ChoicepointTerminal__Group__0 )
+            // InternalRoom.g:2190:2: rule__ChoicepointTerminal__Group__0
             {
-            pushFollow(FOLLOW_rule__ChoicepointTerminal__Group__0_in_ruleChoicepointTerminal4605);
+            pushFollow(FOLLOW_2);
             rule__ChoicepointTerminal__Group__0();
 
             state._fsp--;
@@ -6038,20 +6038,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleTrigger"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2200:1: entryRuleTrigger : ruleTrigger EOF ;
+    // InternalRoom.g:2202:1: entryRuleTrigger : ruleTrigger EOF ;
     public final void entryRuleTrigger() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2201:1: ( ruleTrigger EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2202:1: ruleTrigger EOF
+            // InternalRoom.g:2203:1: ( ruleTrigger EOF )
+            // InternalRoom.g:2204:1: ruleTrigger EOF
             {
              before(grammarAccess.getTriggerRule()); 
-            pushFollow(FOLLOW_ruleTrigger_in_entryRuleTrigger4632);
+            pushFollow(FOLLOW_1);
             ruleTrigger();
 
             state._fsp--;
 
              after(grammarAccess.getTriggerRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleTrigger4639); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -6068,23 +6068,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleTrigger"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2209:1: ruleTrigger : ( ( rule__Trigger__Group__0 ) ) ;
+    // InternalRoom.g:2211:1: ruleTrigger : ( ( rule__Trigger__Group__0 ) ) ;
     public final void ruleTrigger() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2213:2: ( ( ( rule__Trigger__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2214:1: ( ( rule__Trigger__Group__0 ) )
+            // InternalRoom.g:2215:2: ( ( ( rule__Trigger__Group__0 ) ) )
+            // InternalRoom.g:2216:1: ( ( rule__Trigger__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2214:1: ( ( rule__Trigger__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2215:1: ( rule__Trigger__Group__0 )
+            // InternalRoom.g:2216:1: ( ( rule__Trigger__Group__0 ) )
+            // InternalRoom.g:2217:1: ( rule__Trigger__Group__0 )
             {
              before(grammarAccess.getTriggerAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2216:1: ( rule__Trigger__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2216:2: rule__Trigger__Group__0
+            // InternalRoom.g:2218:1: ( rule__Trigger__Group__0 )
+            // InternalRoom.g:2218:2: rule__Trigger__Group__0
             {
-            pushFollow(FOLLOW_rule__Trigger__Group__0_in_ruleTrigger4665);
+            pushFollow(FOLLOW_2);
             rule__Trigger__Group__0();
 
             state._fsp--;
@@ -6115,20 +6115,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleMessageFromIf"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2228:1: entryRuleMessageFromIf : ruleMessageFromIf EOF ;
+    // InternalRoom.g:2230:1: entryRuleMessageFromIf : ruleMessageFromIf EOF ;
     public final void entryRuleMessageFromIf() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2229:1: ( ruleMessageFromIf EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2230:1: ruleMessageFromIf EOF
+            // InternalRoom.g:2231:1: ( ruleMessageFromIf EOF )
+            // InternalRoom.g:2232:1: ruleMessageFromIf EOF
             {
              before(grammarAccess.getMessageFromIfRule()); 
-            pushFollow(FOLLOW_ruleMessageFromIf_in_entryRuleMessageFromIf4692);
+            pushFollow(FOLLOW_1);
             ruleMessageFromIf();
 
             state._fsp--;
 
              after(grammarAccess.getMessageFromIfRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleMessageFromIf4699); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -6145,23 +6145,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleMessageFromIf"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2237:1: ruleMessageFromIf : ( ( rule__MessageFromIf__Group__0 ) ) ;
+    // InternalRoom.g:2239:1: ruleMessageFromIf : ( ( rule__MessageFromIf__Group__0 ) ) ;
     public final void ruleMessageFromIf() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2241:2: ( ( ( rule__MessageFromIf__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2242:1: ( ( rule__MessageFromIf__Group__0 ) )
+            // InternalRoom.g:2243:2: ( ( ( rule__MessageFromIf__Group__0 ) ) )
+            // InternalRoom.g:2244:1: ( ( rule__MessageFromIf__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2242:1: ( ( rule__MessageFromIf__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2243:1: ( rule__MessageFromIf__Group__0 )
+            // InternalRoom.g:2244:1: ( ( rule__MessageFromIf__Group__0 ) )
+            // InternalRoom.g:2245:1: ( rule__MessageFromIf__Group__0 )
             {
              before(grammarAccess.getMessageFromIfAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2244:1: ( rule__MessageFromIf__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2244:2: rule__MessageFromIf__Group__0
+            // InternalRoom.g:2246:1: ( rule__MessageFromIf__Group__0 )
+            // InternalRoom.g:2246:2: rule__MessageFromIf__Group__0
             {
-            pushFollow(FOLLOW_rule__MessageFromIf__Group__0_in_ruleMessageFromIf4725);
+            pushFollow(FOLLOW_2);
             rule__MessageFromIf__Group__0();
 
             state._fsp--;
@@ -6192,20 +6192,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleGuard"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2256:1: entryRuleGuard : ruleGuard EOF ;
+    // InternalRoom.g:2258:1: entryRuleGuard : ruleGuard EOF ;
     public final void entryRuleGuard() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2257:1: ( ruleGuard EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2258:1: ruleGuard EOF
+            // InternalRoom.g:2259:1: ( ruleGuard EOF )
+            // InternalRoom.g:2260:1: ruleGuard EOF
             {
              before(grammarAccess.getGuardRule()); 
-            pushFollow(FOLLOW_ruleGuard_in_entryRuleGuard4752);
+            pushFollow(FOLLOW_1);
             ruleGuard();
 
             state._fsp--;
 
              after(grammarAccess.getGuardRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleGuard4759); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -6222,23 +6222,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleGuard"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2265:1: ruleGuard : ( ( rule__Guard__Group__0 ) ) ;
+    // InternalRoom.g:2267:1: ruleGuard : ( ( rule__Guard__Group__0 ) ) ;
     public final void ruleGuard() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2269:2: ( ( ( rule__Guard__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2270:1: ( ( rule__Guard__Group__0 ) )
+            // InternalRoom.g:2271:2: ( ( ( rule__Guard__Group__0 ) ) )
+            // InternalRoom.g:2272:1: ( ( rule__Guard__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2270:1: ( ( rule__Guard__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2271:1: ( rule__Guard__Group__0 )
+            // InternalRoom.g:2272:1: ( ( rule__Guard__Group__0 ) )
+            // InternalRoom.g:2273:1: ( rule__Guard__Group__0 )
             {
              before(grammarAccess.getGuardAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2272:1: ( rule__Guard__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2272:2: rule__Guard__Group__0
+            // InternalRoom.g:2274:1: ( rule__Guard__Group__0 )
+            // InternalRoom.g:2274:2: rule__Guard__Group__0
             {
-            pushFollow(FOLLOW_rule__Guard__Group__0_in_ruleGuard4785);
+            pushFollow(FOLLOW_2);
             rule__Guard__Group__0();
 
             state._fsp--;
@@ -6269,20 +6269,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleProtocolSemantics"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2284:1: entryRuleProtocolSemantics : ruleProtocolSemantics EOF ;
+    // InternalRoom.g:2286:1: entryRuleProtocolSemantics : ruleProtocolSemantics EOF ;
     public final void entryRuleProtocolSemantics() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2285:1: ( ruleProtocolSemantics EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2286:1: ruleProtocolSemantics EOF
+            // InternalRoom.g:2287:1: ( ruleProtocolSemantics EOF )
+            // InternalRoom.g:2288:1: ruleProtocolSemantics EOF
             {
              before(grammarAccess.getProtocolSemanticsRule()); 
-            pushFollow(FOLLOW_ruleProtocolSemantics_in_entryRuleProtocolSemantics4812);
+            pushFollow(FOLLOW_1);
             ruleProtocolSemantics();
 
             state._fsp--;
 
              after(grammarAccess.getProtocolSemanticsRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleProtocolSemantics4819); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -6299,23 +6299,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleProtocolSemantics"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2293:1: ruleProtocolSemantics : ( ( rule__ProtocolSemantics__Group__0 ) ) ;
+    // InternalRoom.g:2295:1: ruleProtocolSemantics : ( ( rule__ProtocolSemantics__Group__0 ) ) ;
     public final void ruleProtocolSemantics() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2297:2: ( ( ( rule__ProtocolSemantics__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2298:1: ( ( rule__ProtocolSemantics__Group__0 ) )
+            // InternalRoom.g:2299:2: ( ( ( rule__ProtocolSemantics__Group__0 ) ) )
+            // InternalRoom.g:2300:1: ( ( rule__ProtocolSemantics__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2298:1: ( ( rule__ProtocolSemantics__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2299:1: ( rule__ProtocolSemantics__Group__0 )
+            // InternalRoom.g:2300:1: ( ( rule__ProtocolSemantics__Group__0 ) )
+            // InternalRoom.g:2301:1: ( rule__ProtocolSemantics__Group__0 )
             {
              before(grammarAccess.getProtocolSemanticsAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2300:1: ( rule__ProtocolSemantics__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2300:2: rule__ProtocolSemantics__Group__0
+            // InternalRoom.g:2302:1: ( rule__ProtocolSemantics__Group__0 )
+            // InternalRoom.g:2302:2: rule__ProtocolSemantics__Group__0
             {
-            pushFollow(FOLLOW_rule__ProtocolSemantics__Group__0_in_ruleProtocolSemantics4845);
+            pushFollow(FOLLOW_2);
             rule__ProtocolSemantics__Group__0();
 
             state._fsp--;
@@ -6346,20 +6346,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleSemanticsRule"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2312:1: entryRuleSemanticsRule : ruleSemanticsRule EOF ;
+    // InternalRoom.g:2314:1: entryRuleSemanticsRule : ruleSemanticsRule EOF ;
     public final void entryRuleSemanticsRule() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2313:1: ( ruleSemanticsRule EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2314:1: ruleSemanticsRule EOF
+            // InternalRoom.g:2315:1: ( ruleSemanticsRule EOF )
+            // InternalRoom.g:2316:1: ruleSemanticsRule EOF
             {
              before(grammarAccess.getSemanticsRuleRule()); 
-            pushFollow(FOLLOW_ruleSemanticsRule_in_entryRuleSemanticsRule4872);
+            pushFollow(FOLLOW_1);
             ruleSemanticsRule();
 
             state._fsp--;
 
              after(grammarAccess.getSemanticsRuleRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSemanticsRule4879); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -6376,23 +6376,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleSemanticsRule"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2321:1: ruleSemanticsRule : ( ( rule__SemanticsRule__Alternatives ) ) ;
+    // InternalRoom.g:2323:1: ruleSemanticsRule : ( ( rule__SemanticsRule__Alternatives ) ) ;
     public final void ruleSemanticsRule() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2325:2: ( ( ( rule__SemanticsRule__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2326:1: ( ( rule__SemanticsRule__Alternatives ) )
+            // InternalRoom.g:2327:2: ( ( ( rule__SemanticsRule__Alternatives ) ) )
+            // InternalRoom.g:2328:1: ( ( rule__SemanticsRule__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2326:1: ( ( rule__SemanticsRule__Alternatives ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2327:1: ( rule__SemanticsRule__Alternatives )
+            // InternalRoom.g:2328:1: ( ( rule__SemanticsRule__Alternatives ) )
+            // InternalRoom.g:2329:1: ( rule__SemanticsRule__Alternatives )
             {
              before(grammarAccess.getSemanticsRuleAccess().getAlternatives()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2328:1: ( rule__SemanticsRule__Alternatives )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2328:2: rule__SemanticsRule__Alternatives
+            // InternalRoom.g:2330:1: ( rule__SemanticsRule__Alternatives )
+            // InternalRoom.g:2330:2: rule__SemanticsRule__Alternatives
             {
-            pushFollow(FOLLOW_rule__SemanticsRule__Alternatives_in_ruleSemanticsRule4905);
+            pushFollow(FOLLOW_2);
             rule__SemanticsRule__Alternatives();
 
             state._fsp--;
@@ -6423,20 +6423,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleInSemanticsRule"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2340:1: entryRuleInSemanticsRule : ruleInSemanticsRule EOF ;
+    // InternalRoom.g:2342:1: entryRuleInSemanticsRule : ruleInSemanticsRule EOF ;
     public final void entryRuleInSemanticsRule() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2341:1: ( ruleInSemanticsRule EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2342:1: ruleInSemanticsRule EOF
+            // InternalRoom.g:2343:1: ( ruleInSemanticsRule EOF )
+            // InternalRoom.g:2344:1: ruleInSemanticsRule EOF
             {
              before(grammarAccess.getInSemanticsRuleRule()); 
-            pushFollow(FOLLOW_ruleInSemanticsRule_in_entryRuleInSemanticsRule4932);
+            pushFollow(FOLLOW_1);
             ruleInSemanticsRule();
 
             state._fsp--;
 
              after(grammarAccess.getInSemanticsRuleRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleInSemanticsRule4939); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -6453,23 +6453,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleInSemanticsRule"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2349:1: ruleInSemanticsRule : ( ( rule__InSemanticsRule__Group__0 ) ) ;
+    // InternalRoom.g:2351:1: ruleInSemanticsRule : ( ( rule__InSemanticsRule__Group__0 ) ) ;
     public final void ruleInSemanticsRule() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2353:2: ( ( ( rule__InSemanticsRule__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2354:1: ( ( rule__InSemanticsRule__Group__0 ) )
+            // InternalRoom.g:2355:2: ( ( ( rule__InSemanticsRule__Group__0 ) ) )
+            // InternalRoom.g:2356:1: ( ( rule__InSemanticsRule__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2354:1: ( ( rule__InSemanticsRule__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2355:1: ( rule__InSemanticsRule__Group__0 )
+            // InternalRoom.g:2356:1: ( ( rule__InSemanticsRule__Group__0 ) )
+            // InternalRoom.g:2357:1: ( rule__InSemanticsRule__Group__0 )
             {
              before(grammarAccess.getInSemanticsRuleAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2356:1: ( rule__InSemanticsRule__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2356:2: rule__InSemanticsRule__Group__0
+            // InternalRoom.g:2358:1: ( rule__InSemanticsRule__Group__0 )
+            // InternalRoom.g:2358:2: rule__InSemanticsRule__Group__0
             {
-            pushFollow(FOLLOW_rule__InSemanticsRule__Group__0_in_ruleInSemanticsRule4965);
+            pushFollow(FOLLOW_2);
             rule__InSemanticsRule__Group__0();
 
             state._fsp--;
@@ -6500,20 +6500,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleOutSemanticsRule"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2368:1: entryRuleOutSemanticsRule : ruleOutSemanticsRule EOF ;
+    // InternalRoom.g:2370:1: entryRuleOutSemanticsRule : ruleOutSemanticsRule EOF ;
     public final void entryRuleOutSemanticsRule() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2369:1: ( ruleOutSemanticsRule EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2370:1: ruleOutSemanticsRule EOF
+            // InternalRoom.g:2371:1: ( ruleOutSemanticsRule EOF )
+            // InternalRoom.g:2372:1: ruleOutSemanticsRule EOF
             {
              before(grammarAccess.getOutSemanticsRuleRule()); 
-            pushFollow(FOLLOW_ruleOutSemanticsRule_in_entryRuleOutSemanticsRule4992);
+            pushFollow(FOLLOW_1);
             ruleOutSemanticsRule();
 
             state._fsp--;
 
              after(grammarAccess.getOutSemanticsRuleRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOutSemanticsRule4999); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -6530,23 +6530,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleOutSemanticsRule"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2377:1: ruleOutSemanticsRule : ( ( rule__OutSemanticsRule__Group__0 ) ) ;
+    // InternalRoom.g:2379:1: ruleOutSemanticsRule : ( ( rule__OutSemanticsRule__Group__0 ) ) ;
     public final void ruleOutSemanticsRule() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2381:2: ( ( ( rule__OutSemanticsRule__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2382:1: ( ( rule__OutSemanticsRule__Group__0 ) )
+            // InternalRoom.g:2383:2: ( ( ( rule__OutSemanticsRule__Group__0 ) ) )
+            // InternalRoom.g:2384:1: ( ( rule__OutSemanticsRule__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2382:1: ( ( rule__OutSemanticsRule__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2383:1: ( rule__OutSemanticsRule__Group__0 )
+            // InternalRoom.g:2384:1: ( ( rule__OutSemanticsRule__Group__0 ) )
+            // InternalRoom.g:2385:1: ( rule__OutSemanticsRule__Group__0 )
             {
              before(grammarAccess.getOutSemanticsRuleAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2384:1: ( rule__OutSemanticsRule__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2384:2: rule__OutSemanticsRule__Group__0
+            // InternalRoom.g:2386:1: ( rule__OutSemanticsRule__Group__0 )
+            // InternalRoom.g:2386:2: rule__OutSemanticsRule__Group__0
             {
-            pushFollow(FOLLOW_rule__OutSemanticsRule__Group__0_in_ruleOutSemanticsRule5025);
+            pushFollow(FOLLOW_2);
             rule__OutSemanticsRule__Group__0();
 
             state._fsp--;
@@ -6577,20 +6577,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleAnnotation"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2396:1: entryRuleAnnotation : ruleAnnotation EOF ;
+    // InternalRoom.g:2398:1: entryRuleAnnotation : ruleAnnotation EOF ;
     public final void entryRuleAnnotation() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2397:1: ( ruleAnnotation EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2398:1: ruleAnnotation EOF
+            // InternalRoom.g:2399:1: ( ruleAnnotation EOF )
+            // InternalRoom.g:2400:1: ruleAnnotation EOF
             {
              before(grammarAccess.getAnnotationRule()); 
-            pushFollow(FOLLOW_ruleAnnotation_in_entryRuleAnnotation5052);
+            pushFollow(FOLLOW_1);
             ruleAnnotation();
 
             state._fsp--;
 
              after(grammarAccess.getAnnotationRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAnnotation5059); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -6607,23 +6607,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleAnnotation"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2405:1: ruleAnnotation : ( ( rule__Annotation__Group__0 ) ) ;
+    // InternalRoom.g:2407:1: ruleAnnotation : ( ( rule__Annotation__Group__0 ) ) ;
     public final void ruleAnnotation() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2409:2: ( ( ( rule__Annotation__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2410:1: ( ( rule__Annotation__Group__0 ) )
+            // InternalRoom.g:2411:2: ( ( ( rule__Annotation__Group__0 ) ) )
+            // InternalRoom.g:2412:1: ( ( rule__Annotation__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2410:1: ( ( rule__Annotation__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2411:1: ( rule__Annotation__Group__0 )
+            // InternalRoom.g:2412:1: ( ( rule__Annotation__Group__0 ) )
+            // InternalRoom.g:2413:1: ( rule__Annotation__Group__0 )
             {
              before(grammarAccess.getAnnotationAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2412:1: ( rule__Annotation__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2412:2: rule__Annotation__Group__0
+            // InternalRoom.g:2414:1: ( rule__Annotation__Group__0 )
+            // InternalRoom.g:2414:2: rule__Annotation__Group__0
             {
-            pushFollow(FOLLOW_rule__Annotation__Group__0_in_ruleAnnotation5085);
+            pushFollow(FOLLOW_2);
             rule__Annotation__Group__0();
 
             state._fsp--;
@@ -6654,20 +6654,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleKeyValue"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2424:1: entryRuleKeyValue : ruleKeyValue EOF ;
+    // InternalRoom.g:2426:1: entryRuleKeyValue : ruleKeyValue EOF ;
     public final void entryRuleKeyValue() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2425:1: ( ruleKeyValue EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2426:1: ruleKeyValue EOF
+            // InternalRoom.g:2427:1: ( ruleKeyValue EOF )
+            // InternalRoom.g:2428:1: ruleKeyValue EOF
             {
              before(grammarAccess.getKeyValueRule()); 
-            pushFollow(FOLLOW_ruleKeyValue_in_entryRuleKeyValue5112);
+            pushFollow(FOLLOW_1);
             ruleKeyValue();
 
             state._fsp--;
 
              after(grammarAccess.getKeyValueRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleKeyValue5119); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -6684,23 +6684,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleKeyValue"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2433:1: ruleKeyValue : ( ( rule__KeyValue__Group__0 ) ) ;
+    // InternalRoom.g:2435:1: ruleKeyValue : ( ( rule__KeyValue__Group__0 ) ) ;
     public final void ruleKeyValue() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2437:2: ( ( ( rule__KeyValue__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2438:1: ( ( rule__KeyValue__Group__0 ) )
+            // InternalRoom.g:2439:2: ( ( ( rule__KeyValue__Group__0 ) ) )
+            // InternalRoom.g:2440:1: ( ( rule__KeyValue__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2438:1: ( ( rule__KeyValue__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2439:1: ( rule__KeyValue__Group__0 )
+            // InternalRoom.g:2440:1: ( ( rule__KeyValue__Group__0 ) )
+            // InternalRoom.g:2441:1: ( rule__KeyValue__Group__0 )
             {
              before(grammarAccess.getKeyValueAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2440:1: ( rule__KeyValue__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2440:2: rule__KeyValue__Group__0
+            // InternalRoom.g:2442:1: ( rule__KeyValue__Group__0 )
+            // InternalRoom.g:2442:2: rule__KeyValue__Group__0
             {
-            pushFollow(FOLLOW_rule__KeyValue__Group__0_in_ruleKeyValue5145);
+            pushFollow(FOLLOW_2);
             rule__KeyValue__Group__0();
 
             state._fsp--;
@@ -6731,20 +6731,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleAnnotationType"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2452:1: entryRuleAnnotationType : ruleAnnotationType EOF ;
+    // InternalRoom.g:2454:1: entryRuleAnnotationType : ruleAnnotationType EOF ;
     public final void entryRuleAnnotationType() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2453:1: ( ruleAnnotationType EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2454:1: ruleAnnotationType EOF
+            // InternalRoom.g:2455:1: ( ruleAnnotationType EOF )
+            // InternalRoom.g:2456:1: ruleAnnotationType EOF
             {
              before(grammarAccess.getAnnotationTypeRule()); 
-            pushFollow(FOLLOW_ruleAnnotationType_in_entryRuleAnnotationType5172);
+            pushFollow(FOLLOW_1);
             ruleAnnotationType();
 
             state._fsp--;
 
              after(grammarAccess.getAnnotationTypeRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAnnotationType5179); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -6761,23 +6761,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleAnnotationType"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2461:1: ruleAnnotationType : ( ( rule__AnnotationType__Group__0 ) ) ;
+    // InternalRoom.g:2463:1: ruleAnnotationType : ( ( rule__AnnotationType__Group__0 ) ) ;
     public final void ruleAnnotationType() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2465:2: ( ( ( rule__AnnotationType__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2466:1: ( ( rule__AnnotationType__Group__0 ) )
+            // InternalRoom.g:2467:2: ( ( ( rule__AnnotationType__Group__0 ) ) )
+            // InternalRoom.g:2468:1: ( ( rule__AnnotationType__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2466:1: ( ( rule__AnnotationType__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2467:1: ( rule__AnnotationType__Group__0 )
+            // InternalRoom.g:2468:1: ( ( rule__AnnotationType__Group__0 ) )
+            // InternalRoom.g:2469:1: ( rule__AnnotationType__Group__0 )
             {
              before(grammarAccess.getAnnotationTypeAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2468:1: ( rule__AnnotationType__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2468:2: rule__AnnotationType__Group__0
+            // InternalRoom.g:2470:1: ( rule__AnnotationType__Group__0 )
+            // InternalRoom.g:2470:2: rule__AnnotationType__Group__0
             {
-            pushFollow(FOLLOW_rule__AnnotationType__Group__0_in_ruleAnnotationType5205);
+            pushFollow(FOLLOW_2);
             rule__AnnotationType__Group__0();
 
             state._fsp--;
@@ -6808,20 +6808,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleAnnotationAttribute"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2480:1: entryRuleAnnotationAttribute : ruleAnnotationAttribute EOF ;
+    // InternalRoom.g:2482:1: entryRuleAnnotationAttribute : ruleAnnotationAttribute EOF ;
     public final void entryRuleAnnotationAttribute() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2481:1: ( ruleAnnotationAttribute EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2482:1: ruleAnnotationAttribute EOF
+            // InternalRoom.g:2483:1: ( ruleAnnotationAttribute EOF )
+            // InternalRoom.g:2484:1: ruleAnnotationAttribute EOF
             {
              before(grammarAccess.getAnnotationAttributeRule()); 
-            pushFollow(FOLLOW_ruleAnnotationAttribute_in_entryRuleAnnotationAttribute5232);
+            pushFollow(FOLLOW_1);
             ruleAnnotationAttribute();
 
             state._fsp--;
 
              after(grammarAccess.getAnnotationAttributeRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAnnotationAttribute5239); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -6838,23 +6838,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleAnnotationAttribute"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2489:1: ruleAnnotationAttribute : ( ( rule__AnnotationAttribute__Alternatives ) ) ;
+    // InternalRoom.g:2491:1: ruleAnnotationAttribute : ( ( rule__AnnotationAttribute__Alternatives ) ) ;
     public final void ruleAnnotationAttribute() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2493:2: ( ( ( rule__AnnotationAttribute__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2494:1: ( ( rule__AnnotationAttribute__Alternatives ) )
+            // InternalRoom.g:2495:2: ( ( ( rule__AnnotationAttribute__Alternatives ) ) )
+            // InternalRoom.g:2496:1: ( ( rule__AnnotationAttribute__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2494:1: ( ( rule__AnnotationAttribute__Alternatives ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2495:1: ( rule__AnnotationAttribute__Alternatives )
+            // InternalRoom.g:2496:1: ( ( rule__AnnotationAttribute__Alternatives ) )
+            // InternalRoom.g:2497:1: ( rule__AnnotationAttribute__Alternatives )
             {
              before(grammarAccess.getAnnotationAttributeAccess().getAlternatives()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2496:1: ( rule__AnnotationAttribute__Alternatives )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2496:2: rule__AnnotationAttribute__Alternatives
+            // InternalRoom.g:2498:1: ( rule__AnnotationAttribute__Alternatives )
+            // InternalRoom.g:2498:2: rule__AnnotationAttribute__Alternatives
             {
-            pushFollow(FOLLOW_rule__AnnotationAttribute__Alternatives_in_ruleAnnotationAttribute5265);
+            pushFollow(FOLLOW_2);
             rule__AnnotationAttribute__Alternatives();
 
             state._fsp--;
@@ -6885,20 +6885,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleSimpleAnnotationAttribute"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2508:1: entryRuleSimpleAnnotationAttribute : ruleSimpleAnnotationAttribute EOF ;
+    // InternalRoom.g:2510:1: entryRuleSimpleAnnotationAttribute : ruleSimpleAnnotationAttribute EOF ;
     public final void entryRuleSimpleAnnotationAttribute() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2509:1: ( ruleSimpleAnnotationAttribute EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2510:1: ruleSimpleAnnotationAttribute EOF
+            // InternalRoom.g:2511:1: ( ruleSimpleAnnotationAttribute EOF )
+            // InternalRoom.g:2512:1: ruleSimpleAnnotationAttribute EOF
             {
              before(grammarAccess.getSimpleAnnotationAttributeRule()); 
-            pushFollow(FOLLOW_ruleSimpleAnnotationAttribute_in_entryRuleSimpleAnnotationAttribute5292);
+            pushFollow(FOLLOW_1);
             ruleSimpleAnnotationAttribute();
 
             state._fsp--;
 
              after(grammarAccess.getSimpleAnnotationAttributeRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSimpleAnnotationAttribute5299); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -6915,23 +6915,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleSimpleAnnotationAttribute"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2517:1: ruleSimpleAnnotationAttribute : ( ( rule__SimpleAnnotationAttribute__Group__0 ) ) ;
+    // InternalRoom.g:2519:1: ruleSimpleAnnotationAttribute : ( ( rule__SimpleAnnotationAttribute__Group__0 ) ) ;
     public final void ruleSimpleAnnotationAttribute() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2521:2: ( ( ( rule__SimpleAnnotationAttribute__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2522:1: ( ( rule__SimpleAnnotationAttribute__Group__0 ) )
+            // InternalRoom.g:2523:2: ( ( ( rule__SimpleAnnotationAttribute__Group__0 ) ) )
+            // InternalRoom.g:2524:1: ( ( rule__SimpleAnnotationAttribute__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2522:1: ( ( rule__SimpleAnnotationAttribute__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2523:1: ( rule__SimpleAnnotationAttribute__Group__0 )
+            // InternalRoom.g:2524:1: ( ( rule__SimpleAnnotationAttribute__Group__0 ) )
+            // InternalRoom.g:2525:1: ( rule__SimpleAnnotationAttribute__Group__0 )
             {
              before(grammarAccess.getSimpleAnnotationAttributeAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2524:1: ( rule__SimpleAnnotationAttribute__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2524:2: rule__SimpleAnnotationAttribute__Group__0
+            // InternalRoom.g:2526:1: ( rule__SimpleAnnotationAttribute__Group__0 )
+            // InternalRoom.g:2526:2: rule__SimpleAnnotationAttribute__Group__0
             {
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__0_in_ruleSimpleAnnotationAttribute5325);
+            pushFollow(FOLLOW_2);
             rule__SimpleAnnotationAttribute__Group__0();
 
             state._fsp--;
@@ -6962,20 +6962,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleEnumAnnotationAttribute"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2536:1: entryRuleEnumAnnotationAttribute : ruleEnumAnnotationAttribute EOF ;
+    // InternalRoom.g:2538:1: entryRuleEnumAnnotationAttribute : ruleEnumAnnotationAttribute EOF ;
     public final void entryRuleEnumAnnotationAttribute() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2537:1: ( ruleEnumAnnotationAttribute EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2538:1: ruleEnumAnnotationAttribute EOF
+            // InternalRoom.g:2539:1: ( ruleEnumAnnotationAttribute EOF )
+            // InternalRoom.g:2540:1: ruleEnumAnnotationAttribute EOF
             {
              before(grammarAccess.getEnumAnnotationAttributeRule()); 
-            pushFollow(FOLLOW_ruleEnumAnnotationAttribute_in_entryRuleEnumAnnotationAttribute5352);
+            pushFollow(FOLLOW_1);
             ruleEnumAnnotationAttribute();
 
             state._fsp--;
 
              after(grammarAccess.getEnumAnnotationAttributeRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleEnumAnnotationAttribute5359); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -6992,23 +6992,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleEnumAnnotationAttribute"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2545:1: ruleEnumAnnotationAttribute : ( ( rule__EnumAnnotationAttribute__Group__0 ) ) ;
+    // InternalRoom.g:2547:1: ruleEnumAnnotationAttribute : ( ( rule__EnumAnnotationAttribute__Group__0 ) ) ;
     public final void ruleEnumAnnotationAttribute() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2549:2: ( ( ( rule__EnumAnnotationAttribute__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2550:1: ( ( rule__EnumAnnotationAttribute__Group__0 ) )
+            // InternalRoom.g:2551:2: ( ( ( rule__EnumAnnotationAttribute__Group__0 ) ) )
+            // InternalRoom.g:2552:1: ( ( rule__EnumAnnotationAttribute__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2550:1: ( ( rule__EnumAnnotationAttribute__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2551:1: ( rule__EnumAnnotationAttribute__Group__0 )
+            // InternalRoom.g:2552:1: ( ( rule__EnumAnnotationAttribute__Group__0 ) )
+            // InternalRoom.g:2553:1: ( rule__EnumAnnotationAttribute__Group__0 )
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2552:1: ( rule__EnumAnnotationAttribute__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2552:2: rule__EnumAnnotationAttribute__Group__0
+            // InternalRoom.g:2554:1: ( rule__EnumAnnotationAttribute__Group__0 )
+            // InternalRoom.g:2554:2: rule__EnumAnnotationAttribute__Group__0
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__0_in_ruleEnumAnnotationAttribute5385);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group__0();
 
             state._fsp--;
@@ -7039,20 +7039,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleImport"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2564:1: entryRuleImport : ruleImport EOF ;
+    // InternalRoom.g:2566:1: entryRuleImport : ruleImport EOF ;
     public final void entryRuleImport() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2565:1: ( ruleImport EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2566:1: ruleImport EOF
+            // InternalRoom.g:2567:1: ( ruleImport EOF )
+            // InternalRoom.g:2568:1: ruleImport EOF
             {
              before(grammarAccess.getImportRule()); 
-            pushFollow(FOLLOW_ruleImport_in_entryRuleImport5412);
+            pushFollow(FOLLOW_1);
             ruleImport();
 
             state._fsp--;
 
              after(grammarAccess.getImportRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleImport5419); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -7069,23 +7069,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleImport"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2573:1: ruleImport : ( ( rule__Import__Group__0 ) ) ;
+    // InternalRoom.g:2575:1: ruleImport : ( ( rule__Import__Group__0 ) ) ;
     public final void ruleImport() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2577:2: ( ( ( rule__Import__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2578:1: ( ( rule__Import__Group__0 ) )
+            // InternalRoom.g:2579:2: ( ( ( rule__Import__Group__0 ) ) )
+            // InternalRoom.g:2580:1: ( ( rule__Import__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2578:1: ( ( rule__Import__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2579:1: ( rule__Import__Group__0 )
+            // InternalRoom.g:2580:1: ( ( rule__Import__Group__0 ) )
+            // InternalRoom.g:2581:1: ( rule__Import__Group__0 )
             {
              before(grammarAccess.getImportAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2580:1: ( rule__Import__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2580:2: rule__Import__Group__0
+            // InternalRoom.g:2582:1: ( rule__Import__Group__0 )
+            // InternalRoom.g:2582:2: rule__Import__Group__0
             {
-            pushFollow(FOLLOW_rule__Import__Group__0_in_ruleImport5445);
+            pushFollow(FOLLOW_2);
             rule__Import__Group__0();
 
             state._fsp--;
@@ -7116,20 +7116,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleImportedFQN"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2592:1: entryRuleImportedFQN : ruleImportedFQN EOF ;
+    // InternalRoom.g:2594:1: entryRuleImportedFQN : ruleImportedFQN EOF ;
     public final void entryRuleImportedFQN() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2593:1: ( ruleImportedFQN EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2594:1: ruleImportedFQN EOF
+            // InternalRoom.g:2595:1: ( ruleImportedFQN EOF )
+            // InternalRoom.g:2596:1: ruleImportedFQN EOF
             {
              before(grammarAccess.getImportedFQNRule()); 
-            pushFollow(FOLLOW_ruleImportedFQN_in_entryRuleImportedFQN5472);
+            pushFollow(FOLLOW_1);
             ruleImportedFQN();
 
             state._fsp--;
 
              after(grammarAccess.getImportedFQNRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleImportedFQN5479); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -7146,23 +7146,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleImportedFQN"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2601:1: ruleImportedFQN : ( ( rule__ImportedFQN__Group__0 ) ) ;
+    // InternalRoom.g:2603:1: ruleImportedFQN : ( ( rule__ImportedFQN__Group__0 ) ) ;
     public final void ruleImportedFQN() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2605:2: ( ( ( rule__ImportedFQN__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2606:1: ( ( rule__ImportedFQN__Group__0 ) )
+            // InternalRoom.g:2607:2: ( ( ( rule__ImportedFQN__Group__0 ) ) )
+            // InternalRoom.g:2608:1: ( ( rule__ImportedFQN__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2606:1: ( ( rule__ImportedFQN__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2607:1: ( rule__ImportedFQN__Group__0 )
+            // InternalRoom.g:2608:1: ( ( rule__ImportedFQN__Group__0 ) )
+            // InternalRoom.g:2609:1: ( rule__ImportedFQN__Group__0 )
             {
              before(grammarAccess.getImportedFQNAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2608:1: ( rule__ImportedFQN__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2608:2: rule__ImportedFQN__Group__0
+            // InternalRoom.g:2610:1: ( rule__ImportedFQN__Group__0 )
+            // InternalRoom.g:2610:2: rule__ImportedFQN__Group__0
             {
-            pushFollow(FOLLOW_rule__ImportedFQN__Group__0_in_ruleImportedFQN5505);
+            pushFollow(FOLLOW_2);
             rule__ImportedFQN__Group__0();
 
             state._fsp--;
@@ -7193,20 +7193,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleDocumentation"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2620:1: entryRuleDocumentation : ruleDocumentation EOF ;
+    // InternalRoom.g:2622:1: entryRuleDocumentation : ruleDocumentation EOF ;
     public final void entryRuleDocumentation() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2621:1: ( ruleDocumentation EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2622:1: ruleDocumentation EOF
+            // InternalRoom.g:2623:1: ( ruleDocumentation EOF )
+            // InternalRoom.g:2624:1: ruleDocumentation EOF
             {
              before(grammarAccess.getDocumentationRule()); 
-            pushFollow(FOLLOW_ruleDocumentation_in_entryRuleDocumentation5532);
+            pushFollow(FOLLOW_1);
             ruleDocumentation();
 
             state._fsp--;
 
              after(grammarAccess.getDocumentationRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDocumentation5539); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -7223,23 +7223,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleDocumentation"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2629:1: ruleDocumentation : ( ( rule__Documentation__Group__0 ) ) ;
+    // InternalRoom.g:2631:1: ruleDocumentation : ( ( rule__Documentation__Group__0 ) ) ;
     public final void ruleDocumentation() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2633:2: ( ( ( rule__Documentation__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2634:1: ( ( rule__Documentation__Group__0 ) )
+            // InternalRoom.g:2635:2: ( ( ( rule__Documentation__Group__0 ) ) )
+            // InternalRoom.g:2636:1: ( ( rule__Documentation__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2634:1: ( ( rule__Documentation__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2635:1: ( rule__Documentation__Group__0 )
+            // InternalRoom.g:2636:1: ( ( rule__Documentation__Group__0 ) )
+            // InternalRoom.g:2637:1: ( rule__Documentation__Group__0 )
             {
              before(grammarAccess.getDocumentationAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2636:1: ( rule__Documentation__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2636:2: rule__Documentation__Group__0
+            // InternalRoom.g:2638:1: ( rule__Documentation__Group__0 )
+            // InternalRoom.g:2638:2: rule__Documentation__Group__0
             {
-            pushFollow(FOLLOW_rule__Documentation__Group__0_in_ruleDocumentation5565);
+            pushFollow(FOLLOW_2);
             rule__Documentation__Group__0();
 
             state._fsp--;
@@ -7270,20 +7270,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleLiteral"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2652:1: entryRuleLiteral : ruleLiteral EOF ;
+    // InternalRoom.g:2654:1: entryRuleLiteral : ruleLiteral EOF ;
     public final void entryRuleLiteral() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2653:1: ( ruleLiteral EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2654:1: ruleLiteral EOF
+            // InternalRoom.g:2655:1: ( ruleLiteral EOF )
+            // InternalRoom.g:2656:1: ruleLiteral EOF
             {
              before(grammarAccess.getLiteralRule()); 
-            pushFollow(FOLLOW_ruleLiteral_in_entryRuleLiteral5596);
+            pushFollow(FOLLOW_1);
             ruleLiteral();
 
             state._fsp--;
 
              after(grammarAccess.getLiteralRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleLiteral5603); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -7300,23 +7300,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleLiteral"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2661:1: ruleLiteral : ( ( rule__Literal__Alternatives ) ) ;
+    // InternalRoom.g:2663:1: ruleLiteral : ( ( rule__Literal__Alternatives ) ) ;
     public final void ruleLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2665:2: ( ( ( rule__Literal__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2666:1: ( ( rule__Literal__Alternatives ) )
+            // InternalRoom.g:2667:2: ( ( ( rule__Literal__Alternatives ) ) )
+            // InternalRoom.g:2668:1: ( ( rule__Literal__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2666:1: ( ( rule__Literal__Alternatives ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2667:1: ( rule__Literal__Alternatives )
+            // InternalRoom.g:2668:1: ( ( rule__Literal__Alternatives ) )
+            // InternalRoom.g:2669:1: ( rule__Literal__Alternatives )
             {
              before(grammarAccess.getLiteralAccess().getAlternatives()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2668:1: ( rule__Literal__Alternatives )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2668:2: rule__Literal__Alternatives
+            // InternalRoom.g:2670:1: ( rule__Literal__Alternatives )
+            // InternalRoom.g:2670:2: rule__Literal__Alternatives
             {
-            pushFollow(FOLLOW_rule__Literal__Alternatives_in_ruleLiteral5629);
+            pushFollow(FOLLOW_2);
             rule__Literal__Alternatives();
 
             state._fsp--;
@@ -7347,20 +7347,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleBooleanLiteral"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2680:1: entryRuleBooleanLiteral : ruleBooleanLiteral EOF ;
+    // InternalRoom.g:2682:1: entryRuleBooleanLiteral : ruleBooleanLiteral EOF ;
     public final void entryRuleBooleanLiteral() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2681:1: ( ruleBooleanLiteral EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2682:1: ruleBooleanLiteral EOF
+            // InternalRoom.g:2683:1: ( ruleBooleanLiteral EOF )
+            // InternalRoom.g:2684:1: ruleBooleanLiteral EOF
             {
              before(grammarAccess.getBooleanLiteralRule()); 
-            pushFollow(FOLLOW_ruleBooleanLiteral_in_entryRuleBooleanLiteral5656);
+            pushFollow(FOLLOW_1);
             ruleBooleanLiteral();
 
             state._fsp--;
 
              after(grammarAccess.getBooleanLiteralRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleBooleanLiteral5663); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -7377,23 +7377,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleBooleanLiteral"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2689:1: ruleBooleanLiteral : ( ( rule__BooleanLiteral__Group__0 ) ) ;
+    // InternalRoom.g:2691:1: ruleBooleanLiteral : ( ( rule__BooleanLiteral__Group__0 ) ) ;
     public final void ruleBooleanLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2693:2: ( ( ( rule__BooleanLiteral__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2694:1: ( ( rule__BooleanLiteral__Group__0 ) )
+            // InternalRoom.g:2695:2: ( ( ( rule__BooleanLiteral__Group__0 ) ) )
+            // InternalRoom.g:2696:1: ( ( rule__BooleanLiteral__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2694:1: ( ( rule__BooleanLiteral__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2695:1: ( rule__BooleanLiteral__Group__0 )
+            // InternalRoom.g:2696:1: ( ( rule__BooleanLiteral__Group__0 ) )
+            // InternalRoom.g:2697:1: ( rule__BooleanLiteral__Group__0 )
             {
              before(grammarAccess.getBooleanLiteralAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2696:1: ( rule__BooleanLiteral__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2696:2: rule__BooleanLiteral__Group__0
+            // InternalRoom.g:2698:1: ( rule__BooleanLiteral__Group__0 )
+            // InternalRoom.g:2698:2: rule__BooleanLiteral__Group__0
             {
-            pushFollow(FOLLOW_rule__BooleanLiteral__Group__0_in_ruleBooleanLiteral5689);
+            pushFollow(FOLLOW_2);
             rule__BooleanLiteral__Group__0();
 
             state._fsp--;
@@ -7424,20 +7424,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleNumberLiteral"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2708:1: entryRuleNumberLiteral : ruleNumberLiteral EOF ;
+    // InternalRoom.g:2710:1: entryRuleNumberLiteral : ruleNumberLiteral EOF ;
     public final void entryRuleNumberLiteral() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2709:1: ( ruleNumberLiteral EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2710:1: ruleNumberLiteral EOF
+            // InternalRoom.g:2711:1: ( ruleNumberLiteral EOF )
+            // InternalRoom.g:2712:1: ruleNumberLiteral EOF
             {
              before(grammarAccess.getNumberLiteralRule()); 
-            pushFollow(FOLLOW_ruleNumberLiteral_in_entryRuleNumberLiteral5716);
+            pushFollow(FOLLOW_1);
             ruleNumberLiteral();
 
             state._fsp--;
 
              after(grammarAccess.getNumberLiteralRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleNumberLiteral5723); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -7454,23 +7454,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleNumberLiteral"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2717:1: ruleNumberLiteral : ( ( rule__NumberLiteral__Alternatives ) ) ;
+    // InternalRoom.g:2719:1: ruleNumberLiteral : ( ( rule__NumberLiteral__Alternatives ) ) ;
     public final void ruleNumberLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2721:2: ( ( ( rule__NumberLiteral__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2722:1: ( ( rule__NumberLiteral__Alternatives ) )
+            // InternalRoom.g:2723:2: ( ( ( rule__NumberLiteral__Alternatives ) ) )
+            // InternalRoom.g:2724:1: ( ( rule__NumberLiteral__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2722:1: ( ( rule__NumberLiteral__Alternatives ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2723:1: ( rule__NumberLiteral__Alternatives )
+            // InternalRoom.g:2724:1: ( ( rule__NumberLiteral__Alternatives ) )
+            // InternalRoom.g:2725:1: ( rule__NumberLiteral__Alternatives )
             {
              before(grammarAccess.getNumberLiteralAccess().getAlternatives()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2724:1: ( rule__NumberLiteral__Alternatives )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2724:2: rule__NumberLiteral__Alternatives
+            // InternalRoom.g:2726:1: ( rule__NumberLiteral__Alternatives )
+            // InternalRoom.g:2726:2: rule__NumberLiteral__Alternatives
             {
-            pushFollow(FOLLOW_rule__NumberLiteral__Alternatives_in_ruleNumberLiteral5749);
+            pushFollow(FOLLOW_2);
             rule__NumberLiteral__Alternatives();
 
             state._fsp--;
@@ -7501,20 +7501,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleRealLiteral"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2736:1: entryRuleRealLiteral : ruleRealLiteral EOF ;
+    // InternalRoom.g:2738:1: entryRuleRealLiteral : ruleRealLiteral EOF ;
     public final void entryRuleRealLiteral() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2737:1: ( ruleRealLiteral EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2738:1: ruleRealLiteral EOF
+            // InternalRoom.g:2739:1: ( ruleRealLiteral EOF )
+            // InternalRoom.g:2740:1: ruleRealLiteral EOF
             {
              before(grammarAccess.getRealLiteralRule()); 
-            pushFollow(FOLLOW_ruleRealLiteral_in_entryRuleRealLiteral5776);
+            pushFollow(FOLLOW_1);
             ruleRealLiteral();
 
             state._fsp--;
 
              after(grammarAccess.getRealLiteralRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRealLiteral5783); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -7531,23 +7531,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleRealLiteral"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2745:1: ruleRealLiteral : ( ( rule__RealLiteral__Group__0 ) ) ;
+    // InternalRoom.g:2747:1: ruleRealLiteral : ( ( rule__RealLiteral__Group__0 ) ) ;
     public final void ruleRealLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2749:2: ( ( ( rule__RealLiteral__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2750:1: ( ( rule__RealLiteral__Group__0 ) )
+            // InternalRoom.g:2751:2: ( ( ( rule__RealLiteral__Group__0 ) ) )
+            // InternalRoom.g:2752:1: ( ( rule__RealLiteral__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2750:1: ( ( rule__RealLiteral__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2751:1: ( rule__RealLiteral__Group__0 )
+            // InternalRoom.g:2752:1: ( ( rule__RealLiteral__Group__0 ) )
+            // InternalRoom.g:2753:1: ( rule__RealLiteral__Group__0 )
             {
              before(grammarAccess.getRealLiteralAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2752:1: ( rule__RealLiteral__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2752:2: rule__RealLiteral__Group__0
+            // InternalRoom.g:2754:1: ( rule__RealLiteral__Group__0 )
+            // InternalRoom.g:2754:2: rule__RealLiteral__Group__0
             {
-            pushFollow(FOLLOW_rule__RealLiteral__Group__0_in_ruleRealLiteral5809);
+            pushFollow(FOLLOW_2);
             rule__RealLiteral__Group__0();
 
             state._fsp--;
@@ -7578,20 +7578,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleIntLiteral"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2764:1: entryRuleIntLiteral : ruleIntLiteral EOF ;
+    // InternalRoom.g:2766:1: entryRuleIntLiteral : ruleIntLiteral EOF ;
     public final void entryRuleIntLiteral() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2765:1: ( ruleIntLiteral EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2766:1: ruleIntLiteral EOF
+            // InternalRoom.g:2767:1: ( ruleIntLiteral EOF )
+            // InternalRoom.g:2768:1: ruleIntLiteral EOF
             {
              before(grammarAccess.getIntLiteralRule()); 
-            pushFollow(FOLLOW_ruleIntLiteral_in_entryRuleIntLiteral5836);
+            pushFollow(FOLLOW_1);
             ruleIntLiteral();
 
             state._fsp--;
 
              after(grammarAccess.getIntLiteralRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIntLiteral5843); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -7608,23 +7608,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleIntLiteral"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2773:1: ruleIntLiteral : ( ( rule__IntLiteral__Group__0 ) ) ;
+    // InternalRoom.g:2775:1: ruleIntLiteral : ( ( rule__IntLiteral__Group__0 ) ) ;
     public final void ruleIntLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2777:2: ( ( ( rule__IntLiteral__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2778:1: ( ( rule__IntLiteral__Group__0 ) )
+            // InternalRoom.g:2779:2: ( ( ( rule__IntLiteral__Group__0 ) ) )
+            // InternalRoom.g:2780:1: ( ( rule__IntLiteral__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2778:1: ( ( rule__IntLiteral__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2779:1: ( rule__IntLiteral__Group__0 )
+            // InternalRoom.g:2780:1: ( ( rule__IntLiteral__Group__0 ) )
+            // InternalRoom.g:2781:1: ( rule__IntLiteral__Group__0 )
             {
              before(grammarAccess.getIntLiteralAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2780:1: ( rule__IntLiteral__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2780:2: rule__IntLiteral__Group__0
+            // InternalRoom.g:2782:1: ( rule__IntLiteral__Group__0 )
+            // InternalRoom.g:2782:2: rule__IntLiteral__Group__0
             {
-            pushFollow(FOLLOW_rule__IntLiteral__Group__0_in_ruleIntLiteral5869);
+            pushFollow(FOLLOW_2);
             rule__IntLiteral__Group__0();
 
             state._fsp--;
@@ -7655,20 +7655,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleStringLiteral"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2792:1: entryRuleStringLiteral : ruleStringLiteral EOF ;
+    // InternalRoom.g:2794:1: entryRuleStringLiteral : ruleStringLiteral EOF ;
     public final void entryRuleStringLiteral() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2793:1: ( ruleStringLiteral EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2794:1: ruleStringLiteral EOF
+            // InternalRoom.g:2795:1: ( ruleStringLiteral EOF )
+            // InternalRoom.g:2796:1: ruleStringLiteral EOF
             {
              before(grammarAccess.getStringLiteralRule()); 
-            pushFollow(FOLLOW_ruleStringLiteral_in_entryRuleStringLiteral5896);
+            pushFollow(FOLLOW_1);
             ruleStringLiteral();
 
             state._fsp--;
 
              after(grammarAccess.getStringLiteralRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleStringLiteral5903); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -7685,23 +7685,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleStringLiteral"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2801:1: ruleStringLiteral : ( ( rule__StringLiteral__Group__0 ) ) ;
+    // InternalRoom.g:2803:1: ruleStringLiteral : ( ( rule__StringLiteral__Group__0 ) ) ;
     public final void ruleStringLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2805:2: ( ( ( rule__StringLiteral__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2806:1: ( ( rule__StringLiteral__Group__0 ) )
+            // InternalRoom.g:2807:2: ( ( ( rule__StringLiteral__Group__0 ) ) )
+            // InternalRoom.g:2808:1: ( ( rule__StringLiteral__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2806:1: ( ( rule__StringLiteral__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2807:1: ( rule__StringLiteral__Group__0 )
+            // InternalRoom.g:2808:1: ( ( rule__StringLiteral__Group__0 ) )
+            // InternalRoom.g:2809:1: ( rule__StringLiteral__Group__0 )
             {
              before(grammarAccess.getStringLiteralAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2808:1: ( rule__StringLiteral__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2808:2: rule__StringLiteral__Group__0
+            // InternalRoom.g:2810:1: ( rule__StringLiteral__Group__0 )
+            // InternalRoom.g:2810:2: rule__StringLiteral__Group__0
             {
-            pushFollow(FOLLOW_rule__StringLiteral__Group__0_in_ruleStringLiteral5929);
+            pushFollow(FOLLOW_2);
             rule__StringLiteral__Group__0();
 
             state._fsp--;
@@ -7732,20 +7732,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleInteger"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2820:1: entryRuleInteger : ruleInteger EOF ;
+    // InternalRoom.g:2822:1: entryRuleInteger : ruleInteger EOF ;
     public final void entryRuleInteger() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2821:1: ( ruleInteger EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2822:1: ruleInteger EOF
+            // InternalRoom.g:2823:1: ( ruleInteger EOF )
+            // InternalRoom.g:2824:1: ruleInteger EOF
             {
              before(grammarAccess.getIntegerRule()); 
-            pushFollow(FOLLOW_ruleInteger_in_entryRuleInteger5956);
+            pushFollow(FOLLOW_1);
             ruleInteger();
 
             state._fsp--;
 
              after(grammarAccess.getIntegerRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleInteger5963); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -7762,23 +7762,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleInteger"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2829:1: ruleInteger : ( ( rule__Integer__Alternatives ) ) ;
+    // InternalRoom.g:2831:1: ruleInteger : ( ( rule__Integer__Alternatives ) ) ;
     public final void ruleInteger() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2833:2: ( ( ( rule__Integer__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2834:1: ( ( rule__Integer__Alternatives ) )
+            // InternalRoom.g:2835:2: ( ( ( rule__Integer__Alternatives ) ) )
+            // InternalRoom.g:2836:1: ( ( rule__Integer__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2834:1: ( ( rule__Integer__Alternatives ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2835:1: ( rule__Integer__Alternatives )
+            // InternalRoom.g:2836:1: ( ( rule__Integer__Alternatives ) )
+            // InternalRoom.g:2837:1: ( rule__Integer__Alternatives )
             {
              before(grammarAccess.getIntegerAccess().getAlternatives()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2836:1: ( rule__Integer__Alternatives )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2836:2: rule__Integer__Alternatives
+            // InternalRoom.g:2838:1: ( rule__Integer__Alternatives )
+            // InternalRoom.g:2838:2: rule__Integer__Alternatives
             {
-            pushFollow(FOLLOW_rule__Integer__Alternatives_in_ruleInteger5989);
+            pushFollow(FOLLOW_2);
             rule__Integer__Alternatives();
 
             state._fsp--;
@@ -7809,20 +7809,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleReal"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2848:1: entryRuleReal : ruleReal EOF ;
+    // InternalRoom.g:2850:1: entryRuleReal : ruleReal EOF ;
     public final void entryRuleReal() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2849:1: ( ruleReal EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2850:1: ruleReal EOF
+            // InternalRoom.g:2851:1: ( ruleReal EOF )
+            // InternalRoom.g:2852:1: ruleReal EOF
             {
              before(grammarAccess.getRealRule()); 
-            pushFollow(FOLLOW_ruleReal_in_entryRuleReal6016);
+            pushFollow(FOLLOW_1);
             ruleReal();
 
             state._fsp--;
 
              after(grammarAccess.getRealRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleReal6023); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -7839,23 +7839,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleReal"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2857:1: ruleReal : ( ( rule__Real__Alternatives ) ) ;
+    // InternalRoom.g:2859:1: ruleReal : ( ( rule__Real__Alternatives ) ) ;
     public final void ruleReal() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2861:2: ( ( ( rule__Real__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2862:1: ( ( rule__Real__Alternatives ) )
+            // InternalRoom.g:2863:2: ( ( ( rule__Real__Alternatives ) ) )
+            // InternalRoom.g:2864:1: ( ( rule__Real__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2862:1: ( ( rule__Real__Alternatives ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2863:1: ( rule__Real__Alternatives )
+            // InternalRoom.g:2864:1: ( ( rule__Real__Alternatives ) )
+            // InternalRoom.g:2865:1: ( rule__Real__Alternatives )
             {
              before(grammarAccess.getRealAccess().getAlternatives()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2864:1: ( rule__Real__Alternatives )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2864:2: rule__Real__Alternatives
+            // InternalRoom.g:2866:1: ( rule__Real__Alternatives )
+            // InternalRoom.g:2866:2: rule__Real__Alternatives
             {
-            pushFollow(FOLLOW_rule__Real__Alternatives_in_ruleReal6049);
+            pushFollow(FOLLOW_2);
             rule__Real__Alternatives();
 
             state._fsp--;
@@ -7886,23 +7886,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleDecimal"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2876:1: entryRuleDecimal : ruleDecimal EOF ;
+    // InternalRoom.g:2878:1: entryRuleDecimal : ruleDecimal EOF ;
     public final void entryRuleDecimal() throws RecognitionException {
 
         	HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
 
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2880:1: ( ruleDecimal EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2881:1: ruleDecimal EOF
+            // InternalRoom.g:2882:1: ( ruleDecimal EOF )
+            // InternalRoom.g:2883:1: ruleDecimal EOF
             {
              before(grammarAccess.getDecimalRule()); 
-            pushFollow(FOLLOW_ruleDecimal_in_entryRuleDecimal6081);
+            pushFollow(FOLLOW_1);
             ruleDecimal();
 
             state._fsp--;
 
              after(grammarAccess.getDecimalRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDecimal6088); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -7922,24 +7922,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleDecimal"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2891:1: ruleDecimal : ( ( rule__Decimal__Group__0 ) ) ;
+    // InternalRoom.g:2893:1: ruleDecimal : ( ( rule__Decimal__Group__0 ) ) ;
     public final void ruleDecimal() throws RecognitionException {
 
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2896:2: ( ( ( rule__Decimal__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2897:1: ( ( rule__Decimal__Group__0 ) )
+            // InternalRoom.g:2898:2: ( ( ( rule__Decimal__Group__0 ) ) )
+            // InternalRoom.g:2899:1: ( ( rule__Decimal__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2897:1: ( ( rule__Decimal__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2898:1: ( rule__Decimal__Group__0 )
+            // InternalRoom.g:2899:1: ( ( rule__Decimal__Group__0 ) )
+            // InternalRoom.g:2900:1: ( rule__Decimal__Group__0 )
             {
              before(grammarAccess.getDecimalAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2899:1: ( rule__Decimal__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2899:2: rule__Decimal__Group__0
+            // InternalRoom.g:2901:1: ( rule__Decimal__Group__0 )
+            // InternalRoom.g:2901:2: rule__Decimal__Group__0
             {
-            pushFollow(FOLLOW_rule__Decimal__Group__0_in_ruleDecimal6118);
+            pushFollow(FOLLOW_2);
             rule__Decimal__Group__0();
 
             state._fsp--;
@@ -7971,23 +7971,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleDecimalExp"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2912:1: entryRuleDecimalExp : ruleDecimalExp EOF ;
+    // InternalRoom.g:2914:1: entryRuleDecimalExp : ruleDecimalExp EOF ;
     public final void entryRuleDecimalExp() throws RecognitionException {
 
         	HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
 
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2916:1: ( ruleDecimalExp EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2917:1: ruleDecimalExp EOF
+            // InternalRoom.g:2918:1: ( ruleDecimalExp EOF )
+            // InternalRoom.g:2919:1: ruleDecimalExp EOF
             {
              before(grammarAccess.getDecimalExpRule()); 
-            pushFollow(FOLLOW_ruleDecimalExp_in_entryRuleDecimalExp6150);
+            pushFollow(FOLLOW_1);
             ruleDecimalExp();
 
             state._fsp--;
 
              after(grammarAccess.getDecimalExpRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDecimalExp6157); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -8007,24 +8007,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleDecimalExp"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2927:1: ruleDecimalExp : ( ( rule__DecimalExp__Group__0 ) ) ;
+    // InternalRoom.g:2929:1: ruleDecimalExp : ( ( rule__DecimalExp__Group__0 ) ) ;
     public final void ruleDecimalExp() throws RecognitionException {
 
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2932:2: ( ( ( rule__DecimalExp__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2933:1: ( ( rule__DecimalExp__Group__0 ) )
+            // InternalRoom.g:2934:2: ( ( ( rule__DecimalExp__Group__0 ) ) )
+            // InternalRoom.g:2935:1: ( ( rule__DecimalExp__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2933:1: ( ( rule__DecimalExp__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2934:1: ( rule__DecimalExp__Group__0 )
+            // InternalRoom.g:2935:1: ( ( rule__DecimalExp__Group__0 ) )
+            // InternalRoom.g:2936:1: ( rule__DecimalExp__Group__0 )
             {
              before(grammarAccess.getDecimalExpAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2935:1: ( rule__DecimalExp__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2935:2: rule__DecimalExp__Group__0
+            // InternalRoom.g:2937:1: ( rule__DecimalExp__Group__0 )
+            // InternalRoom.g:2937:2: rule__DecimalExp__Group__0
             {
-            pushFollow(FOLLOW_rule__DecimalExp__Group__0_in_ruleDecimalExp6187);
+            pushFollow(FOLLOW_2);
             rule__DecimalExp__Group__0();
 
             state._fsp--;
@@ -8056,20 +8056,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleFQN"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2948:1: entryRuleFQN : ruleFQN EOF ;
+    // InternalRoom.g:2950:1: entryRuleFQN : ruleFQN EOF ;
     public final void entryRuleFQN() throws RecognitionException {
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2949:1: ( ruleFQN EOF )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2950:1: ruleFQN EOF
+            // InternalRoom.g:2951:1: ( ruleFQN EOF )
+            // InternalRoom.g:2952:1: ruleFQN EOF
             {
              before(grammarAccess.getFQNRule()); 
-            pushFollow(FOLLOW_ruleFQN_in_entryRuleFQN6214);
+            pushFollow(FOLLOW_1);
             ruleFQN();
 
             state._fsp--;
 
              after(grammarAccess.getFQNRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleFQN6221); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -8086,23 +8086,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleFQN"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2957:1: ruleFQN : ( ( rule__FQN__Group__0 ) ) ;
+    // InternalRoom.g:2959:1: ruleFQN : ( ( rule__FQN__Group__0 ) ) ;
     public final void ruleFQN() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2961:2: ( ( ( rule__FQN__Group__0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2962:1: ( ( rule__FQN__Group__0 ) )
+            // InternalRoom.g:2963:2: ( ( ( rule__FQN__Group__0 ) ) )
+            // InternalRoom.g:2964:1: ( ( rule__FQN__Group__0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2962:1: ( ( rule__FQN__Group__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2963:1: ( rule__FQN__Group__0 )
+            // InternalRoom.g:2964:1: ( ( rule__FQN__Group__0 ) )
+            // InternalRoom.g:2965:1: ( rule__FQN__Group__0 )
             {
              before(grammarAccess.getFQNAccess().getGroup()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2964:1: ( rule__FQN__Group__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2964:2: rule__FQN__Group__0
+            // InternalRoom.g:2966:1: ( rule__FQN__Group__0 )
+            // InternalRoom.g:2966:2: rule__FQN__Group__0
             {
-            pushFollow(FOLLOW_rule__FQN__Group__0_in_ruleFQN6247);
+            pushFollow(FOLLOW_2);
             rule__FQN__Group__0();
 
             state._fsp--;
@@ -8133,23 +8133,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleCommunicationType"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2977:1: ruleCommunicationType : ( ( rule__CommunicationType__Alternatives ) ) ;
+    // InternalRoom.g:2979:1: ruleCommunicationType : ( ( rule__CommunicationType__Alternatives ) ) ;
     public final void ruleCommunicationType() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2981:1: ( ( ( rule__CommunicationType__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2982:1: ( ( rule__CommunicationType__Alternatives ) )
+            // InternalRoom.g:2983:1: ( ( ( rule__CommunicationType__Alternatives ) ) )
+            // InternalRoom.g:2984:1: ( ( rule__CommunicationType__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2982:1: ( ( rule__CommunicationType__Alternatives ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2983:1: ( rule__CommunicationType__Alternatives )
+            // InternalRoom.g:2984:1: ( ( rule__CommunicationType__Alternatives ) )
+            // InternalRoom.g:2985:1: ( rule__CommunicationType__Alternatives )
             {
              before(grammarAccess.getCommunicationTypeAccess().getAlternatives()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2984:1: ( rule__CommunicationType__Alternatives )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2984:2: rule__CommunicationType__Alternatives
+            // InternalRoom.g:2986:1: ( rule__CommunicationType__Alternatives )
+            // InternalRoom.g:2986:2: rule__CommunicationType__Alternatives
             {
-            pushFollow(FOLLOW_rule__CommunicationType__Alternatives_in_ruleCommunicationType6284);
+            pushFollow(FOLLOW_2);
             rule__CommunicationType__Alternatives();
 
             state._fsp--;
@@ -8180,23 +8180,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleReferenceType"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:2996:1: ruleReferenceType : ( ( rule__ReferenceType__Alternatives ) ) ;
+    // InternalRoom.g:2998:1: ruleReferenceType : ( ( rule__ReferenceType__Alternatives ) ) ;
     public final void ruleReferenceType() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3000:1: ( ( ( rule__ReferenceType__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3001:1: ( ( rule__ReferenceType__Alternatives ) )
+            // InternalRoom.g:3002:1: ( ( ( rule__ReferenceType__Alternatives ) ) )
+            // InternalRoom.g:3003:1: ( ( rule__ReferenceType__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3001:1: ( ( rule__ReferenceType__Alternatives ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3002:1: ( rule__ReferenceType__Alternatives )
+            // InternalRoom.g:3003:1: ( ( rule__ReferenceType__Alternatives ) )
+            // InternalRoom.g:3004:1: ( rule__ReferenceType__Alternatives )
             {
              before(grammarAccess.getReferenceTypeAccess().getAlternatives()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3003:1: ( rule__ReferenceType__Alternatives )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3003:2: rule__ReferenceType__Alternatives
+            // InternalRoom.g:3005:1: ( rule__ReferenceType__Alternatives )
+            // InternalRoom.g:3005:2: rule__ReferenceType__Alternatives
             {
-            pushFollow(FOLLOW_rule__ReferenceType__Alternatives_in_ruleReferenceType6320);
+            pushFollow(FOLLOW_2);
             rule__ReferenceType__Alternatives();
 
             state._fsp--;
@@ -8227,23 +8227,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleComponentCommunicationType"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3017:1: ruleComponentCommunicationType : ( ( rule__ComponentCommunicationType__Alternatives ) ) ;
+    // InternalRoom.g:3019:1: ruleComponentCommunicationType : ( ( rule__ComponentCommunicationType__Alternatives ) ) ;
     public final void ruleComponentCommunicationType() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3021:1: ( ( ( rule__ComponentCommunicationType__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3022:1: ( ( rule__ComponentCommunicationType__Alternatives ) )
+            // InternalRoom.g:3023:1: ( ( ( rule__ComponentCommunicationType__Alternatives ) ) )
+            // InternalRoom.g:3024:1: ( ( rule__ComponentCommunicationType__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3022:1: ( ( rule__ComponentCommunicationType__Alternatives ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3023:1: ( rule__ComponentCommunicationType__Alternatives )
+            // InternalRoom.g:3024:1: ( ( rule__ComponentCommunicationType__Alternatives ) )
+            // InternalRoom.g:3025:1: ( rule__ComponentCommunicationType__Alternatives )
             {
              before(grammarAccess.getComponentCommunicationTypeAccess().getAlternatives()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3024:1: ( rule__ComponentCommunicationType__Alternatives )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3024:2: rule__ComponentCommunicationType__Alternatives
+            // InternalRoom.g:3026:1: ( rule__ComponentCommunicationType__Alternatives )
+            // InternalRoom.g:3026:2: rule__ComponentCommunicationType__Alternatives
             {
-            pushFollow(FOLLOW_rule__ComponentCommunicationType__Alternatives_in_ruleComponentCommunicationType6358);
+            pushFollow(FOLLOW_2);
             rule__ComponentCommunicationType__Alternatives();
 
             state._fsp--;
@@ -8274,23 +8274,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleLiteralType"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3036:1: ruleLiteralType : ( ( rule__LiteralType__Alternatives ) ) ;
+    // InternalRoom.g:3038:1: ruleLiteralType : ( ( rule__LiteralType__Alternatives ) ) ;
     public final void ruleLiteralType() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3040:1: ( ( ( rule__LiteralType__Alternatives ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3041:1: ( ( rule__LiteralType__Alternatives ) )
+            // InternalRoom.g:3042:1: ( ( ( rule__LiteralType__Alternatives ) ) )
+            // InternalRoom.g:3043:1: ( ( rule__LiteralType__Alternatives ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3041:1: ( ( rule__LiteralType__Alternatives ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3042:1: ( rule__LiteralType__Alternatives )
+            // InternalRoom.g:3043:1: ( ( rule__LiteralType__Alternatives ) )
+            // InternalRoom.g:3044:1: ( rule__LiteralType__Alternatives )
             {
              before(grammarAccess.getLiteralTypeAccess().getAlternatives()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3043:1: ( rule__LiteralType__Alternatives )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3043:2: rule__LiteralType__Alternatives
+            // InternalRoom.g:3045:1: ( rule__LiteralType__Alternatives )
+            // InternalRoom.g:3045:2: rule__LiteralType__Alternatives
             {
-            pushFollow(FOLLOW_rule__LiteralType__Alternatives_in_ruleLiteralType6394);
+            pushFollow(FOLLOW_2);
             rule__LiteralType__Alternatives();
 
             state._fsp--;
@@ -8321,27 +8321,27 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RoomModel__Alternatives_5"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3054:1: rule__RoomModel__Alternatives_5 : ( ( ( rule__RoomModel__PrimitiveTypesAssignment_5_0 ) ) | ( ( rule__RoomModel__EnumerationTypesAssignment_5_1 ) ) | ( ( rule__RoomModel__ExternalTypesAssignment_5_2 ) ) | ( ( rule__RoomModel__DataClassesAssignment_5_3 ) ) | ( ( rule__RoomModel__ProtocolClassesAssignment_5_4 ) ) | ( ( rule__RoomModel__ActorClassesAssignment_5_5 ) ) | ( ( rule__RoomModel__SubSystemClassesAssignment_5_6 ) ) | ( ( rule__RoomModel__SystemsAssignment_5_7 ) ) | ( ( rule__RoomModel__AnnotationTypesAssignment_5_8 ) ) );
+    // InternalRoom.g:3056:1: rule__RoomModel__Alternatives_5 : ( ( ( rule__RoomModel__PrimitiveTypesAssignment_5_0 ) ) | ( ( rule__RoomModel__EnumerationTypesAssignment_5_1 ) ) | ( ( rule__RoomModel__ExternalTypesAssignment_5_2 ) ) | ( ( rule__RoomModel__DataClassesAssignment_5_3 ) ) | ( ( rule__RoomModel__ProtocolClassesAssignment_5_4 ) ) | ( ( rule__RoomModel__ActorClassesAssignment_5_5 ) ) | ( ( rule__RoomModel__SubSystemClassesAssignment_5_6 ) ) | ( ( rule__RoomModel__SystemsAssignment_5_7 ) ) | ( ( rule__RoomModel__AnnotationTypesAssignment_5_8 ) ) );
     public final void rule__RoomModel__Alternatives_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3058:1: ( ( ( rule__RoomModel__PrimitiveTypesAssignment_5_0 ) ) | ( ( rule__RoomModel__EnumerationTypesAssignment_5_1 ) ) | ( ( rule__RoomModel__ExternalTypesAssignment_5_2 ) ) | ( ( rule__RoomModel__DataClassesAssignment_5_3 ) ) | ( ( rule__RoomModel__ProtocolClassesAssignment_5_4 ) ) | ( ( rule__RoomModel__ActorClassesAssignment_5_5 ) ) | ( ( rule__RoomModel__SubSystemClassesAssignment_5_6 ) ) | ( ( rule__RoomModel__SystemsAssignment_5_7 ) ) | ( ( rule__RoomModel__AnnotationTypesAssignment_5_8 ) ) )
+            // InternalRoom.g:3060:1: ( ( ( rule__RoomModel__PrimitiveTypesAssignment_5_0 ) ) | ( ( rule__RoomModel__EnumerationTypesAssignment_5_1 ) ) | ( ( rule__RoomModel__ExternalTypesAssignment_5_2 ) ) | ( ( rule__RoomModel__DataClassesAssignment_5_3 ) ) | ( ( rule__RoomModel__ProtocolClassesAssignment_5_4 ) ) | ( ( rule__RoomModel__ActorClassesAssignment_5_5 ) ) | ( ( rule__RoomModel__SubSystemClassesAssignment_5_6 ) ) | ( ( rule__RoomModel__SystemsAssignment_5_7 ) ) | ( ( rule__RoomModel__AnnotationTypesAssignment_5_8 ) ) )
             int alt1=9;
             alt1 = dfa1.predict(input);
             switch (alt1) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3059:1: ( ( rule__RoomModel__PrimitiveTypesAssignment_5_0 ) )
+                    // InternalRoom.g:3061:1: ( ( rule__RoomModel__PrimitiveTypesAssignment_5_0 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3059:1: ( ( rule__RoomModel__PrimitiveTypesAssignment_5_0 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3060:1: ( rule__RoomModel__PrimitiveTypesAssignment_5_0 )
+                    // InternalRoom.g:3061:1: ( ( rule__RoomModel__PrimitiveTypesAssignment_5_0 ) )
+                    // InternalRoom.g:3062:1: ( rule__RoomModel__PrimitiveTypesAssignment_5_0 )
                     {
                      before(grammarAccess.getRoomModelAccess().getPrimitiveTypesAssignment_5_0()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3061:1: ( rule__RoomModel__PrimitiveTypesAssignment_5_0 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3061:2: rule__RoomModel__PrimitiveTypesAssignment_5_0
+                    // InternalRoom.g:3063:1: ( rule__RoomModel__PrimitiveTypesAssignment_5_0 )
+                    // InternalRoom.g:3063:2: rule__RoomModel__PrimitiveTypesAssignment_5_0
                     {
-                    pushFollow(FOLLOW_rule__RoomModel__PrimitiveTypesAssignment_5_0_in_rule__RoomModel__Alternatives_56429);
+                    pushFollow(FOLLOW_2);
                     rule__RoomModel__PrimitiveTypesAssignment_5_0();
 
                     state._fsp--;
@@ -8357,16 +8357,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3065:6: ( ( rule__RoomModel__EnumerationTypesAssignment_5_1 ) )
+                    // InternalRoom.g:3067:6: ( ( rule__RoomModel__EnumerationTypesAssignment_5_1 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3065:6: ( ( rule__RoomModel__EnumerationTypesAssignment_5_1 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3066:1: ( rule__RoomModel__EnumerationTypesAssignment_5_1 )
+                    // InternalRoom.g:3067:6: ( ( rule__RoomModel__EnumerationTypesAssignment_5_1 ) )
+                    // InternalRoom.g:3068:1: ( rule__RoomModel__EnumerationTypesAssignment_5_1 )
                     {
                      before(grammarAccess.getRoomModelAccess().getEnumerationTypesAssignment_5_1()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3067:1: ( rule__RoomModel__EnumerationTypesAssignment_5_1 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3067:2: rule__RoomModel__EnumerationTypesAssignment_5_1
+                    // InternalRoom.g:3069:1: ( rule__RoomModel__EnumerationTypesAssignment_5_1 )
+                    // InternalRoom.g:3069:2: rule__RoomModel__EnumerationTypesAssignment_5_1
                     {
-                    pushFollow(FOLLOW_rule__RoomModel__EnumerationTypesAssignment_5_1_in_rule__RoomModel__Alternatives_56447);
+                    pushFollow(FOLLOW_2);
                     rule__RoomModel__EnumerationTypesAssignment_5_1();
 
                     state._fsp--;
@@ -8382,16 +8382,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3071:6: ( ( rule__RoomModel__ExternalTypesAssignment_5_2 ) )
+                    // InternalRoom.g:3073:6: ( ( rule__RoomModel__ExternalTypesAssignment_5_2 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3071:6: ( ( rule__RoomModel__ExternalTypesAssignment_5_2 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3072:1: ( rule__RoomModel__ExternalTypesAssignment_5_2 )
+                    // InternalRoom.g:3073:6: ( ( rule__RoomModel__ExternalTypesAssignment_5_2 ) )
+                    // InternalRoom.g:3074:1: ( rule__RoomModel__ExternalTypesAssignment_5_2 )
                     {
                      before(grammarAccess.getRoomModelAccess().getExternalTypesAssignment_5_2()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3073:1: ( rule__RoomModel__ExternalTypesAssignment_5_2 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3073:2: rule__RoomModel__ExternalTypesAssignment_5_2
+                    // InternalRoom.g:3075:1: ( rule__RoomModel__ExternalTypesAssignment_5_2 )
+                    // InternalRoom.g:3075:2: rule__RoomModel__ExternalTypesAssignment_5_2
                     {
-                    pushFollow(FOLLOW_rule__RoomModel__ExternalTypesAssignment_5_2_in_rule__RoomModel__Alternatives_56465);
+                    pushFollow(FOLLOW_2);
                     rule__RoomModel__ExternalTypesAssignment_5_2();
 
                     state._fsp--;
@@ -8407,16 +8407,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 4 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3077:6: ( ( rule__RoomModel__DataClassesAssignment_5_3 ) )
+                    // InternalRoom.g:3079:6: ( ( rule__RoomModel__DataClassesAssignment_5_3 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3077:6: ( ( rule__RoomModel__DataClassesAssignment_5_3 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3078:1: ( rule__RoomModel__DataClassesAssignment_5_3 )
+                    // InternalRoom.g:3079:6: ( ( rule__RoomModel__DataClassesAssignment_5_3 ) )
+                    // InternalRoom.g:3080:1: ( rule__RoomModel__DataClassesAssignment_5_3 )
                     {
                      before(grammarAccess.getRoomModelAccess().getDataClassesAssignment_5_3()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3079:1: ( rule__RoomModel__DataClassesAssignment_5_3 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3079:2: rule__RoomModel__DataClassesAssignment_5_3
+                    // InternalRoom.g:3081:1: ( rule__RoomModel__DataClassesAssignment_5_3 )
+                    // InternalRoom.g:3081:2: rule__RoomModel__DataClassesAssignment_5_3
                     {
-                    pushFollow(FOLLOW_rule__RoomModel__DataClassesAssignment_5_3_in_rule__RoomModel__Alternatives_56483);
+                    pushFollow(FOLLOW_2);
                     rule__RoomModel__DataClassesAssignment_5_3();
 
                     state._fsp--;
@@ -8432,16 +8432,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 5 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3083:6: ( ( rule__RoomModel__ProtocolClassesAssignment_5_4 ) )
+                    // InternalRoom.g:3085:6: ( ( rule__RoomModel__ProtocolClassesAssignment_5_4 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3083:6: ( ( rule__RoomModel__ProtocolClassesAssignment_5_4 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3084:1: ( rule__RoomModel__ProtocolClassesAssignment_5_4 )
+                    // InternalRoom.g:3085:6: ( ( rule__RoomModel__ProtocolClassesAssignment_5_4 ) )
+                    // InternalRoom.g:3086:1: ( rule__RoomModel__ProtocolClassesAssignment_5_4 )
                     {
                      before(grammarAccess.getRoomModelAccess().getProtocolClassesAssignment_5_4()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3085:1: ( rule__RoomModel__ProtocolClassesAssignment_5_4 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3085:2: rule__RoomModel__ProtocolClassesAssignment_5_4
+                    // InternalRoom.g:3087:1: ( rule__RoomModel__ProtocolClassesAssignment_5_4 )
+                    // InternalRoom.g:3087:2: rule__RoomModel__ProtocolClassesAssignment_5_4
                     {
-                    pushFollow(FOLLOW_rule__RoomModel__ProtocolClassesAssignment_5_4_in_rule__RoomModel__Alternatives_56501);
+                    pushFollow(FOLLOW_2);
                     rule__RoomModel__ProtocolClassesAssignment_5_4();
 
                     state._fsp--;
@@ -8457,16 +8457,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 6 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3089:6: ( ( rule__RoomModel__ActorClassesAssignment_5_5 ) )
+                    // InternalRoom.g:3091:6: ( ( rule__RoomModel__ActorClassesAssignment_5_5 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3089:6: ( ( rule__RoomModel__ActorClassesAssignment_5_5 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3090:1: ( rule__RoomModel__ActorClassesAssignment_5_5 )
+                    // InternalRoom.g:3091:6: ( ( rule__RoomModel__ActorClassesAssignment_5_5 ) )
+                    // InternalRoom.g:3092:1: ( rule__RoomModel__ActorClassesAssignment_5_5 )
                     {
                      before(grammarAccess.getRoomModelAccess().getActorClassesAssignment_5_5()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3091:1: ( rule__RoomModel__ActorClassesAssignment_5_5 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3091:2: rule__RoomModel__ActorClassesAssignment_5_5
+                    // InternalRoom.g:3093:1: ( rule__RoomModel__ActorClassesAssignment_5_5 )
+                    // InternalRoom.g:3093:2: rule__RoomModel__ActorClassesAssignment_5_5
                     {
-                    pushFollow(FOLLOW_rule__RoomModel__ActorClassesAssignment_5_5_in_rule__RoomModel__Alternatives_56519);
+                    pushFollow(FOLLOW_2);
                     rule__RoomModel__ActorClassesAssignment_5_5();
 
                     state._fsp--;
@@ -8482,16 +8482,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 7 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3095:6: ( ( rule__RoomModel__SubSystemClassesAssignment_5_6 ) )
+                    // InternalRoom.g:3097:6: ( ( rule__RoomModel__SubSystemClassesAssignment_5_6 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3095:6: ( ( rule__RoomModel__SubSystemClassesAssignment_5_6 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3096:1: ( rule__RoomModel__SubSystemClassesAssignment_5_6 )
+                    // InternalRoom.g:3097:6: ( ( rule__RoomModel__SubSystemClassesAssignment_5_6 ) )
+                    // InternalRoom.g:3098:1: ( rule__RoomModel__SubSystemClassesAssignment_5_6 )
                     {
                      before(grammarAccess.getRoomModelAccess().getSubSystemClassesAssignment_5_6()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3097:1: ( rule__RoomModel__SubSystemClassesAssignment_5_6 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3097:2: rule__RoomModel__SubSystemClassesAssignment_5_6
+                    // InternalRoom.g:3099:1: ( rule__RoomModel__SubSystemClassesAssignment_5_6 )
+                    // InternalRoom.g:3099:2: rule__RoomModel__SubSystemClassesAssignment_5_6
                     {
-                    pushFollow(FOLLOW_rule__RoomModel__SubSystemClassesAssignment_5_6_in_rule__RoomModel__Alternatives_56537);
+                    pushFollow(FOLLOW_2);
                     rule__RoomModel__SubSystemClassesAssignment_5_6();
 
                     state._fsp--;
@@ -8507,16 +8507,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 8 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3101:6: ( ( rule__RoomModel__SystemsAssignment_5_7 ) )
+                    // InternalRoom.g:3103:6: ( ( rule__RoomModel__SystemsAssignment_5_7 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3101:6: ( ( rule__RoomModel__SystemsAssignment_5_7 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3102:1: ( rule__RoomModel__SystemsAssignment_5_7 )
+                    // InternalRoom.g:3103:6: ( ( rule__RoomModel__SystemsAssignment_5_7 ) )
+                    // InternalRoom.g:3104:1: ( rule__RoomModel__SystemsAssignment_5_7 )
                     {
                      before(grammarAccess.getRoomModelAccess().getSystemsAssignment_5_7()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3103:1: ( rule__RoomModel__SystemsAssignment_5_7 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3103:2: rule__RoomModel__SystemsAssignment_5_7
+                    // InternalRoom.g:3105:1: ( rule__RoomModel__SystemsAssignment_5_7 )
+                    // InternalRoom.g:3105:2: rule__RoomModel__SystemsAssignment_5_7
                     {
-                    pushFollow(FOLLOW_rule__RoomModel__SystemsAssignment_5_7_in_rule__RoomModel__Alternatives_56555);
+                    pushFollow(FOLLOW_2);
                     rule__RoomModel__SystemsAssignment_5_7();
 
                     state._fsp--;
@@ -8532,16 +8532,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 9 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3107:6: ( ( rule__RoomModel__AnnotationTypesAssignment_5_8 ) )
+                    // InternalRoom.g:3109:6: ( ( rule__RoomModel__AnnotationTypesAssignment_5_8 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3107:6: ( ( rule__RoomModel__AnnotationTypesAssignment_5_8 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3108:1: ( rule__RoomModel__AnnotationTypesAssignment_5_8 )
+                    // InternalRoom.g:3109:6: ( ( rule__RoomModel__AnnotationTypesAssignment_5_8 ) )
+                    // InternalRoom.g:3110:1: ( rule__RoomModel__AnnotationTypesAssignment_5_8 )
                     {
                      before(grammarAccess.getRoomModelAccess().getAnnotationTypesAssignment_5_8()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3109:1: ( rule__RoomModel__AnnotationTypesAssignment_5_8 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3109:2: rule__RoomModel__AnnotationTypesAssignment_5_8
+                    // InternalRoom.g:3111:1: ( rule__RoomModel__AnnotationTypesAssignment_5_8 )
+                    // InternalRoom.g:3111:2: rule__RoomModel__AnnotationTypesAssignment_5_8
                     {
-                    pushFollow(FOLLOW_rule__RoomModel__AnnotationTypesAssignment_5_8_in_rule__RoomModel__Alternatives_56573);
+                    pushFollow(FOLLOW_2);
                     rule__RoomModel__AnnotationTypesAssignment_5_8();
 
                     state._fsp--;
@@ -8574,13 +8574,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StructureClass__Alternatives"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3119:1: rule__StructureClass__Alternatives : ( ( ruleActorContainerClass ) | ( ruleLogicalSystem ) );
+    // InternalRoom.g:3121:1: rule__StructureClass__Alternatives : ( ( ruleActorContainerClass ) | ( ruleLogicalSystem ) );
     public final void rule__StructureClass__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3123:1: ( ( ruleActorContainerClass ) | ( ruleLogicalSystem ) )
+            // InternalRoom.g:3125:1: ( ( ruleActorContainerClass ) | ( ruleLogicalSystem ) )
             int alt2=2;
             int LA2_0 = input.LA(1);
 
@@ -8598,13 +8598,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt2) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3124:1: ( ruleActorContainerClass )
+                    // InternalRoom.g:3126:1: ( ruleActorContainerClass )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3124:1: ( ruleActorContainerClass )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3125:1: ruleActorContainerClass
+                    // InternalRoom.g:3126:1: ( ruleActorContainerClass )
+                    // InternalRoom.g:3127:1: ruleActorContainerClass
                     {
                      before(grammarAccess.getStructureClassAccess().getActorContainerClassParserRuleCall_0()); 
-                    pushFollow(FOLLOW_ruleActorContainerClass_in_rule__StructureClass__Alternatives6607);
+                    pushFollow(FOLLOW_2);
                     ruleActorContainerClass();
 
                     state._fsp--;
@@ -8617,13 +8617,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3130:6: ( ruleLogicalSystem )
+                    // InternalRoom.g:3132:6: ( ruleLogicalSystem )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3130:6: ( ruleLogicalSystem )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3131:1: ruleLogicalSystem
+                    // InternalRoom.g:3132:6: ( ruleLogicalSystem )
+                    // InternalRoom.g:3133:1: ruleLogicalSystem
                     {
                      before(grammarAccess.getStructureClassAccess().getLogicalSystemParserRuleCall_1()); 
-                    pushFollow(FOLLOW_ruleLogicalSystem_in_rule__StructureClass__Alternatives6624);
+                    pushFollow(FOLLOW_2);
                     ruleLogicalSystem();
 
                     state._fsp--;
@@ -8653,13 +8653,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorContainerClass__Alternatives"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3141:1: rule__ActorContainerClass__Alternatives : ( ( ruleActorClass ) | ( ruleSubSystemClass ) );
+    // InternalRoom.g:3143:1: rule__ActorContainerClass__Alternatives : ( ( ruleActorClass ) | ( ruleSubSystemClass ) );
     public final void rule__ActorContainerClass__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3145:1: ( ( ruleActorClass ) | ( ruleSubSystemClass ) )
+            // InternalRoom.g:3147:1: ( ( ruleActorClass ) | ( ruleSubSystemClass ) )
             int alt3=2;
             int LA3_0 = input.LA(1);
 
@@ -8677,13 +8677,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt3) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3146:1: ( ruleActorClass )
+                    // InternalRoom.g:3148:1: ( ruleActorClass )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3146:1: ( ruleActorClass )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3147:1: ruleActorClass
+                    // InternalRoom.g:3148:1: ( ruleActorClass )
+                    // InternalRoom.g:3149:1: ruleActorClass
                     {
                      before(grammarAccess.getActorContainerClassAccess().getActorClassParserRuleCall_0()); 
-                    pushFollow(FOLLOW_ruleActorClass_in_rule__ActorContainerClass__Alternatives6656);
+                    pushFollow(FOLLOW_2);
                     ruleActorClass();
 
                     state._fsp--;
@@ -8696,13 +8696,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3152:6: ( ruleSubSystemClass )
+                    // InternalRoom.g:3154:6: ( ruleSubSystemClass )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3152:6: ( ruleSubSystemClass )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3153:1: ruleSubSystemClass
+                    // InternalRoom.g:3154:6: ( ruleSubSystemClass )
+                    // InternalRoom.g:3155:1: ruleSubSystemClass
                     {
                      before(grammarAccess.getActorContainerClassAccess().getSubSystemClassParserRuleCall_1()); 
-                    pushFollow(FOLLOW_ruleSubSystemClass_in_rule__ActorContainerClass__Alternatives6673);
+                    pushFollow(FOLLOW_2);
                     ruleSubSystemClass();
 
                     state._fsp--;
@@ -8732,13 +8732,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DataType__Alternatives"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3163:1: rule__DataType__Alternatives : ( ( rulePrimitiveType ) | ( ruleEnumerationType ) | ( ruleComplexType ) );
+    // InternalRoom.g:3165:1: rule__DataType__Alternatives : ( ( rulePrimitiveType ) | ( ruleEnumerationType ) | ( ruleComplexType ) );
     public final void rule__DataType__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3167:1: ( ( rulePrimitiveType ) | ( ruleEnumerationType ) | ( ruleComplexType ) )
+            // InternalRoom.g:3169:1: ( ( rulePrimitiveType ) | ( ruleEnumerationType ) | ( ruleComplexType ) )
             int alt4=3;
             switch ( input.LA(1) ) {
             case 44:
@@ -8766,13 +8766,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
             switch (alt4) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3168:1: ( rulePrimitiveType )
+                    // InternalRoom.g:3170:1: ( rulePrimitiveType )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3168:1: ( rulePrimitiveType )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3169:1: rulePrimitiveType
+                    // InternalRoom.g:3170:1: ( rulePrimitiveType )
+                    // InternalRoom.g:3171:1: rulePrimitiveType
                     {
                      before(grammarAccess.getDataTypeAccess().getPrimitiveTypeParserRuleCall_0()); 
-                    pushFollow(FOLLOW_rulePrimitiveType_in_rule__DataType__Alternatives6705);
+                    pushFollow(FOLLOW_2);
                     rulePrimitiveType();
 
                     state._fsp--;
@@ -8785,13 +8785,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3174:6: ( ruleEnumerationType )
+                    // InternalRoom.g:3176:6: ( ruleEnumerationType )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3174:6: ( ruleEnumerationType )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3175:1: ruleEnumerationType
+                    // InternalRoom.g:3176:6: ( ruleEnumerationType )
+                    // InternalRoom.g:3177:1: ruleEnumerationType
                     {
                      before(grammarAccess.getDataTypeAccess().getEnumerationTypeParserRuleCall_1()); 
-                    pushFollow(FOLLOW_ruleEnumerationType_in_rule__DataType__Alternatives6722);
+                    pushFollow(FOLLOW_2);
                     ruleEnumerationType();
 
                     state._fsp--;
@@ -8804,13 +8804,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3180:6: ( ruleComplexType )
+                    // InternalRoom.g:3182:6: ( ruleComplexType )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3180:6: ( ruleComplexType )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3181:1: ruleComplexType
+                    // InternalRoom.g:3182:6: ( ruleComplexType )
+                    // InternalRoom.g:3183:1: ruleComplexType
                     {
                      before(grammarAccess.getDataTypeAccess().getComplexTypeParserRuleCall_2()); 
-                    pushFollow(FOLLOW_ruleComplexType_in_rule__DataType__Alternatives6739);
+                    pushFollow(FOLLOW_2);
                     ruleComplexType();
 
                     state._fsp--;
@@ -8840,13 +8840,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ComplexType__Alternatives"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3191:1: rule__ComplexType__Alternatives : ( ( ruleDataClass ) | ( ruleExternalType ) );
+    // InternalRoom.g:3193:1: rule__ComplexType__Alternatives : ( ( ruleDataClass ) | ( ruleExternalType ) );
     public final void rule__ComplexType__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3195:1: ( ( ruleDataClass ) | ( ruleExternalType ) )
+            // InternalRoom.g:3197:1: ( ( ruleDataClass ) | ( ruleExternalType ) )
             int alt5=2;
             int LA5_0 = input.LA(1);
 
@@ -8864,13 +8864,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt5) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3196:1: ( ruleDataClass )
+                    // InternalRoom.g:3198:1: ( ruleDataClass )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3196:1: ( ruleDataClass )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3197:1: ruleDataClass
+                    // InternalRoom.g:3198:1: ( ruleDataClass )
+                    // InternalRoom.g:3199:1: ruleDataClass
                     {
                      before(grammarAccess.getComplexTypeAccess().getDataClassParserRuleCall_0()); 
-                    pushFollow(FOLLOW_ruleDataClass_in_rule__ComplexType__Alternatives6771);
+                    pushFollow(FOLLOW_2);
                     ruleDataClass();
 
                     state._fsp--;
@@ -8883,13 +8883,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3202:6: ( ruleExternalType )
+                    // InternalRoom.g:3204:6: ( ruleExternalType )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3202:6: ( ruleExternalType )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3203:1: ruleExternalType
+                    // InternalRoom.g:3204:6: ( ruleExternalType )
+                    // InternalRoom.g:3205:1: ruleExternalType
                     {
                      before(grammarAccess.getComplexTypeAccess().getExternalTypeParserRuleCall_1()); 
-                    pushFollow(FOLLOW_ruleExternalType_in_rule__ComplexType__Alternatives6788);
+                    pushFollow(FOLLOW_2);
                     ruleExternalType();
 
                     state._fsp--;
@@ -8919,13 +8919,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DataClass__Alternatives_9"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3213:1: rule__DataClass__Alternatives_9 : ( ( ( rule__DataClass__OperationsAssignment_9_0 ) ) | ( ( rule__DataClass__StructorsAssignment_9_1 ) ) | ( ( rule__DataClass__AttributesAssignment_9_2 ) ) );
+    // InternalRoom.g:3215:1: rule__DataClass__Alternatives_9 : ( ( ( rule__DataClass__OperationsAssignment_9_0 ) ) | ( ( rule__DataClass__StructorsAssignment_9_1 ) ) | ( ( rule__DataClass__AttributesAssignment_9_2 ) ) );
     public final void rule__DataClass__Alternatives_9() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3217:1: ( ( ( rule__DataClass__OperationsAssignment_9_0 ) ) | ( ( rule__DataClass__StructorsAssignment_9_1 ) ) | ( ( rule__DataClass__AttributesAssignment_9_2 ) ) )
+            // InternalRoom.g:3219:1: ( ( ( rule__DataClass__OperationsAssignment_9_0 ) ) | ( ( rule__DataClass__StructorsAssignment_9_1 ) ) | ( ( rule__DataClass__AttributesAssignment_9_2 ) ) )
             int alt6=3;
             switch ( input.LA(1) ) {
             case 61:
@@ -8954,16 +8954,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
             switch (alt6) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3218:1: ( ( rule__DataClass__OperationsAssignment_9_0 ) )
+                    // InternalRoom.g:3220:1: ( ( rule__DataClass__OperationsAssignment_9_0 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3218:1: ( ( rule__DataClass__OperationsAssignment_9_0 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3219:1: ( rule__DataClass__OperationsAssignment_9_0 )
+                    // InternalRoom.g:3220:1: ( ( rule__DataClass__OperationsAssignment_9_0 ) )
+                    // InternalRoom.g:3221:1: ( rule__DataClass__OperationsAssignment_9_0 )
                     {
                      before(grammarAccess.getDataClassAccess().getOperationsAssignment_9_0()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3220:1: ( rule__DataClass__OperationsAssignment_9_0 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3220:2: rule__DataClass__OperationsAssignment_9_0
+                    // InternalRoom.g:3222:1: ( rule__DataClass__OperationsAssignment_9_0 )
+                    // InternalRoom.g:3222:2: rule__DataClass__OperationsAssignment_9_0
                     {
-                    pushFollow(FOLLOW_rule__DataClass__OperationsAssignment_9_0_in_rule__DataClass__Alternatives_96820);
+                    pushFollow(FOLLOW_2);
                     rule__DataClass__OperationsAssignment_9_0();
 
                     state._fsp--;
@@ -8979,16 +8979,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3224:6: ( ( rule__DataClass__StructorsAssignment_9_1 ) )
+                    // InternalRoom.g:3226:6: ( ( rule__DataClass__StructorsAssignment_9_1 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3224:6: ( ( rule__DataClass__StructorsAssignment_9_1 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3225:1: ( rule__DataClass__StructorsAssignment_9_1 )
+                    // InternalRoom.g:3226:6: ( ( rule__DataClass__StructorsAssignment_9_1 ) )
+                    // InternalRoom.g:3227:1: ( rule__DataClass__StructorsAssignment_9_1 )
                     {
                      before(grammarAccess.getDataClassAccess().getStructorsAssignment_9_1()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3226:1: ( rule__DataClass__StructorsAssignment_9_1 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3226:2: rule__DataClass__StructorsAssignment_9_1
+                    // InternalRoom.g:3228:1: ( rule__DataClass__StructorsAssignment_9_1 )
+                    // InternalRoom.g:3228:2: rule__DataClass__StructorsAssignment_9_1
                     {
-                    pushFollow(FOLLOW_rule__DataClass__StructorsAssignment_9_1_in_rule__DataClass__Alternatives_96838);
+                    pushFollow(FOLLOW_2);
                     rule__DataClass__StructorsAssignment_9_1();
 
                     state._fsp--;
@@ -9004,16 +9004,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3230:6: ( ( rule__DataClass__AttributesAssignment_9_2 ) )
+                    // InternalRoom.g:3232:6: ( ( rule__DataClass__AttributesAssignment_9_2 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3230:6: ( ( rule__DataClass__AttributesAssignment_9_2 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3231:1: ( rule__DataClass__AttributesAssignment_9_2 )
+                    // InternalRoom.g:3232:6: ( ( rule__DataClass__AttributesAssignment_9_2 ) )
+                    // InternalRoom.g:3233:1: ( rule__DataClass__AttributesAssignment_9_2 )
                     {
                      before(grammarAccess.getDataClassAccess().getAttributesAssignment_9_2()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3232:1: ( rule__DataClass__AttributesAssignment_9_2 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3232:2: rule__DataClass__AttributesAssignment_9_2
+                    // InternalRoom.g:3234:1: ( rule__DataClass__AttributesAssignment_9_2 )
+                    // InternalRoom.g:3234:2: rule__DataClass__AttributesAssignment_9_2
                     {
-                    pushFollow(FOLLOW_rule__DataClass__AttributesAssignment_9_2_in_rule__DataClass__Alternatives_96856);
+                    pushFollow(FOLLOW_2);
                     rule__DataClass__AttributesAssignment_9_2();
 
                     state._fsp--;
@@ -9046,13 +9046,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StandardOperation__Alternatives_6_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3242:1: rule__StandardOperation__Alternatives_6_1 : ( ( 'void' ) | ( ( rule__StandardOperation__ReturnTypeAssignment_6_1_1 ) ) );
+    // InternalRoom.g:3244:1: rule__StandardOperation__Alternatives_6_1 : ( ( 'void' ) | ( ( rule__StandardOperation__ReturnTypeAssignment_6_1_1 ) ) );
     public final void rule__StandardOperation__Alternatives_6_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3246:1: ( ( 'void' ) | ( ( rule__StandardOperation__ReturnTypeAssignment_6_1_1 ) ) )
+            // InternalRoom.g:3248:1: ( ( 'void' ) | ( ( rule__StandardOperation__ReturnTypeAssignment_6_1_1 ) ) )
             int alt7=2;
             int LA7_0 = input.LA(1);
 
@@ -9070,13 +9070,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt7) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3247:1: ( 'void' )
+                    // InternalRoom.g:3249:1: ( 'void' )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3247:1: ( 'void' )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3248:1: 'void'
+                    // InternalRoom.g:3249:1: ( 'void' )
+                    // InternalRoom.g:3250:1: 'void'
                     {
                      before(grammarAccess.getStandardOperationAccess().getVoidKeyword_6_1_0()); 
-                    match(input,12,FOLLOW_12_in_rule__StandardOperation__Alternatives_6_16891); 
+                    match(input,12,FOLLOW_2); 
                      after(grammarAccess.getStandardOperationAccess().getVoidKeyword_6_1_0()); 
 
                     }
@@ -9085,16 +9085,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3255:6: ( ( rule__StandardOperation__ReturnTypeAssignment_6_1_1 ) )
+                    // InternalRoom.g:3257:6: ( ( rule__StandardOperation__ReturnTypeAssignment_6_1_1 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3255:6: ( ( rule__StandardOperation__ReturnTypeAssignment_6_1_1 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3256:1: ( rule__StandardOperation__ReturnTypeAssignment_6_1_1 )
+                    // InternalRoom.g:3257:6: ( ( rule__StandardOperation__ReturnTypeAssignment_6_1_1 ) )
+                    // InternalRoom.g:3258:1: ( rule__StandardOperation__ReturnTypeAssignment_6_1_1 )
                     {
                      before(grammarAccess.getStandardOperationAccess().getReturnTypeAssignment_6_1_1()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3257:1: ( rule__StandardOperation__ReturnTypeAssignment_6_1_1 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3257:2: rule__StandardOperation__ReturnTypeAssignment_6_1_1
+                    // InternalRoom.g:3259:1: ( rule__StandardOperation__ReturnTypeAssignment_6_1_1 )
+                    // InternalRoom.g:3259:2: rule__StandardOperation__ReturnTypeAssignment_6_1_1
                     {
-                    pushFollow(FOLLOW_rule__StandardOperation__ReturnTypeAssignment_6_1_1_in_rule__StandardOperation__Alternatives_6_16910);
+                    pushFollow(FOLLOW_2);
                     rule__StandardOperation__ReturnTypeAssignment_6_1_1();
 
                     state._fsp--;
@@ -9127,13 +9127,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortOperation__Alternatives_5"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3266:1: rule__PortOperation__Alternatives_5 : ( ( ( rule__PortOperation__Group_5_0__0 ) ) | ( ( rule__PortOperation__Group_5_1__0 ) ) );
+    // InternalRoom.g:3268:1: rule__PortOperation__Alternatives_5 : ( ( ( rule__PortOperation__Group_5_0__0 ) ) | ( ( rule__PortOperation__Group_5_1__0 ) ) );
     public final void rule__PortOperation__Alternatives_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3270:1: ( ( ( rule__PortOperation__Group_5_0__0 ) ) | ( ( rule__PortOperation__Group_5_1__0 ) ) )
+            // InternalRoom.g:3272:1: ( ( ( rule__PortOperation__Group_5_0__0 ) ) | ( ( rule__PortOperation__Group_5_1__0 ) ) )
             int alt8=2;
             int LA8_0 = input.LA(1);
 
@@ -9151,16 +9151,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt8) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3271:1: ( ( rule__PortOperation__Group_5_0__0 ) )
+                    // InternalRoom.g:3273:1: ( ( rule__PortOperation__Group_5_0__0 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3271:1: ( ( rule__PortOperation__Group_5_0__0 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3272:1: ( rule__PortOperation__Group_5_0__0 )
+                    // InternalRoom.g:3273:1: ( ( rule__PortOperation__Group_5_0__0 ) )
+                    // InternalRoom.g:3274:1: ( rule__PortOperation__Group_5_0__0 )
                     {
                      before(grammarAccess.getPortOperationAccess().getGroup_5_0()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3273:1: ( rule__PortOperation__Group_5_0__0 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3273:2: rule__PortOperation__Group_5_0__0
+                    // InternalRoom.g:3275:1: ( rule__PortOperation__Group_5_0__0 )
+                    // InternalRoom.g:3275:2: rule__PortOperation__Group_5_0__0
                     {
-                    pushFollow(FOLLOW_rule__PortOperation__Group_5_0__0_in_rule__PortOperation__Alternatives_56943);
+                    pushFollow(FOLLOW_2);
                     rule__PortOperation__Group_5_0__0();
 
                     state._fsp--;
@@ -9176,16 +9176,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3277:6: ( ( rule__PortOperation__Group_5_1__0 ) )
+                    // InternalRoom.g:3279:6: ( ( rule__PortOperation__Group_5_1__0 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3277:6: ( ( rule__PortOperation__Group_5_1__0 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3278:1: ( rule__PortOperation__Group_5_1__0 )
+                    // InternalRoom.g:3279:6: ( ( rule__PortOperation__Group_5_1__0 ) )
+                    // InternalRoom.g:3280:1: ( rule__PortOperation__Group_5_1__0 )
                     {
                      before(grammarAccess.getPortOperationAccess().getGroup_5_1()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3279:1: ( rule__PortOperation__Group_5_1__0 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3279:2: rule__PortOperation__Group_5_1__0
+                    // InternalRoom.g:3281:1: ( rule__PortOperation__Group_5_1__0 )
+                    // InternalRoom.g:3281:2: rule__PortOperation__Group_5_1__0
                     {
-                    pushFollow(FOLLOW_rule__PortOperation__Group_5_1__0_in_rule__PortOperation__Alternatives_56961);
+                    pushFollow(FOLLOW_2);
                     rule__PortOperation__Group_5_1__0();
 
                     state._fsp--;
@@ -9218,13 +9218,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortOperation__Alternatives_5_0_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3288:1: rule__PortOperation__Alternatives_5_0_1 : ( ( 'void' ) | ( ( rule__PortOperation__ReturnTypeAssignment_5_0_1_1 ) ) );
+    // InternalRoom.g:3290:1: rule__PortOperation__Alternatives_5_0_1 : ( ( 'void' ) | ( ( rule__PortOperation__ReturnTypeAssignment_5_0_1_1 ) ) );
     public final void rule__PortOperation__Alternatives_5_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3292:1: ( ( 'void' ) | ( ( rule__PortOperation__ReturnTypeAssignment_5_0_1_1 ) ) )
+            // InternalRoom.g:3294:1: ( ( 'void' ) | ( ( rule__PortOperation__ReturnTypeAssignment_5_0_1_1 ) ) )
             int alt9=2;
             int LA9_0 = input.LA(1);
 
@@ -9242,13 +9242,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt9) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3293:1: ( 'void' )
+                    // InternalRoom.g:3295:1: ( 'void' )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3293:1: ( 'void' )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3294:1: 'void'
+                    // InternalRoom.g:3295:1: ( 'void' )
+                    // InternalRoom.g:3296:1: 'void'
                     {
                      before(grammarAccess.getPortOperationAccess().getVoidKeyword_5_0_1_0()); 
-                    match(input,12,FOLLOW_12_in_rule__PortOperation__Alternatives_5_0_16995); 
+                    match(input,12,FOLLOW_2); 
                      after(grammarAccess.getPortOperationAccess().getVoidKeyword_5_0_1_0()); 
 
                     }
@@ -9257,16 +9257,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3301:6: ( ( rule__PortOperation__ReturnTypeAssignment_5_0_1_1 ) )
+                    // InternalRoom.g:3303:6: ( ( rule__PortOperation__ReturnTypeAssignment_5_0_1_1 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3301:6: ( ( rule__PortOperation__ReturnTypeAssignment_5_0_1_1 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3302:1: ( rule__PortOperation__ReturnTypeAssignment_5_0_1_1 )
+                    // InternalRoom.g:3303:6: ( ( rule__PortOperation__ReturnTypeAssignment_5_0_1_1 ) )
+                    // InternalRoom.g:3304:1: ( rule__PortOperation__ReturnTypeAssignment_5_0_1_1 )
                     {
                      before(grammarAccess.getPortOperationAccess().getReturnTypeAssignment_5_0_1_1()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3303:1: ( rule__PortOperation__ReturnTypeAssignment_5_0_1_1 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3303:2: rule__PortOperation__ReturnTypeAssignment_5_0_1_1
+                    // InternalRoom.g:3305:1: ( rule__PortOperation__ReturnTypeAssignment_5_0_1_1 )
+                    // InternalRoom.g:3305:2: rule__PortOperation__ReturnTypeAssignment_5_0_1_1
                     {
-                    pushFollow(FOLLOW_rule__PortOperation__ReturnTypeAssignment_5_0_1_1_in_rule__PortOperation__Alternatives_5_0_17014);
+                    pushFollow(FOLLOW_2);
                     rule__PortOperation__ReturnTypeAssignment_5_0_1_1();
 
                     state._fsp--;
@@ -9299,13 +9299,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassStructor__NameAlternatives_0_0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3312:1: rule__ClassStructor__NameAlternatives_0_0 : ( ( 'ctor' ) | ( 'dtor' ) );
+    // InternalRoom.g:3314:1: rule__ClassStructor__NameAlternatives_0_0 : ( ( 'ctor' ) | ( 'dtor' ) );
     public final void rule__ClassStructor__NameAlternatives_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3316:1: ( ( 'ctor' ) | ( 'dtor' ) )
+            // InternalRoom.g:3318:1: ( ( 'ctor' ) | ( 'dtor' ) )
             int alt10=2;
             int LA10_0 = input.LA(1);
 
@@ -9323,13 +9323,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt10) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3317:1: ( 'ctor' )
+                    // InternalRoom.g:3319:1: ( 'ctor' )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3317:1: ( 'ctor' )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3318:1: 'ctor'
+                    // InternalRoom.g:3319:1: ( 'ctor' )
+                    // InternalRoom.g:3320:1: 'ctor'
                     {
                      before(grammarAccess.getClassStructorAccess().getNameCtorKeyword_0_0_0()); 
-                    match(input,13,FOLLOW_13_in_rule__ClassStructor__NameAlternatives_0_07048); 
+                    match(input,13,FOLLOW_2); 
                      after(grammarAccess.getClassStructorAccess().getNameCtorKeyword_0_0_0()); 
 
                     }
@@ -9338,13 +9338,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3325:6: ( 'dtor' )
+                    // InternalRoom.g:3327:6: ( 'dtor' )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3325:6: ( 'dtor' )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3326:1: 'dtor'
+                    // InternalRoom.g:3327:6: ( 'dtor' )
+                    // InternalRoom.g:3328:1: 'dtor'
                     {
                      before(grammarAccess.getClassStructorAccess().getNameDtorKeyword_0_0_1()); 
-                    match(input,14,FOLLOW_14_in_rule__ClassStructor__NameAlternatives_0_07068); 
+                    match(input,14,FOLLOW_2); 
                      after(grammarAccess.getClassStructorAccess().getNameDtorKeyword_0_0_1()); 
 
                     }
@@ -9370,13 +9370,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GeneralProtocolClass__Alternatives"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3338:1: rule__GeneralProtocolClass__Alternatives : ( ( ruleProtocolClass ) | ( ruleCompoundProtocolClass ) );
+    // InternalRoom.g:3340:1: rule__GeneralProtocolClass__Alternatives : ( ( ruleProtocolClass ) | ( ruleCompoundProtocolClass ) );
     public final void rule__GeneralProtocolClass__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3342:1: ( ( ruleProtocolClass ) | ( ruleCompoundProtocolClass ) )
+            // InternalRoom.g:3344:1: ( ( ruleProtocolClass ) | ( ruleCompoundProtocolClass ) )
             int alt11=2;
             int LA11_0 = input.LA(1);
 
@@ -9394,13 +9394,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt11) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3343:1: ( ruleProtocolClass )
+                    // InternalRoom.g:3345:1: ( ruleProtocolClass )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3343:1: ( ruleProtocolClass )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3344:1: ruleProtocolClass
+                    // InternalRoom.g:3345:1: ( ruleProtocolClass )
+                    // InternalRoom.g:3346:1: ruleProtocolClass
                     {
                      before(grammarAccess.getGeneralProtocolClassAccess().getProtocolClassParserRuleCall_0()); 
-                    pushFollow(FOLLOW_ruleProtocolClass_in_rule__GeneralProtocolClass__Alternatives7102);
+                    pushFollow(FOLLOW_2);
                     ruleProtocolClass();
 
                     state._fsp--;
@@ -9413,13 +9413,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3349:6: ( ruleCompoundProtocolClass )
+                    // InternalRoom.g:3351:6: ( ruleCompoundProtocolClass )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3349:6: ( ruleCompoundProtocolClass )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3350:1: ruleCompoundProtocolClass
+                    // InternalRoom.g:3351:6: ( ruleCompoundProtocolClass )
+                    // InternalRoom.g:3352:1: ruleCompoundProtocolClass
                     {
                      before(grammarAccess.getGeneralProtocolClassAccess().getCompoundProtocolClassParserRuleCall_1()); 
-                    pushFollow(FOLLOW_ruleCompoundProtocolClass_in_rule__GeneralProtocolClass__Alternatives7119);
+                    pushFollow(FOLLOW_2);
                     ruleCompoundProtocolClass();
 
                     state._fsp--;
@@ -9449,13 +9449,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortClass__Alternatives_3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3360:1: rule__PortClass__Alternatives_3 : ( ( ( rule__PortClass__MsgHandlersAssignment_3_0 ) ) | ( ( rule__PortClass__OperationsAssignment_3_1 ) ) | ( ( rule__PortClass__AttributesAssignment_3_2 ) ) );
+    // InternalRoom.g:3362:1: rule__PortClass__Alternatives_3 : ( ( ( rule__PortClass__MsgHandlersAssignment_3_0 ) ) | ( ( rule__PortClass__OperationsAssignment_3_1 ) ) | ( ( rule__PortClass__AttributesAssignment_3_2 ) ) );
     public final void rule__PortClass__Alternatives_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3364:1: ( ( ( rule__PortClass__MsgHandlersAssignment_3_0 ) ) | ( ( rule__PortClass__OperationsAssignment_3_1 ) ) | ( ( rule__PortClass__AttributesAssignment_3_2 ) ) )
+            // InternalRoom.g:3366:1: ( ( ( rule__PortClass__MsgHandlersAssignment_3_0 ) ) | ( ( rule__PortClass__OperationsAssignment_3_1 ) ) | ( ( rule__PortClass__AttributesAssignment_3_2 ) ) )
             int alt12=3;
             switch ( input.LA(1) ) {
             case 71:
@@ -9482,16 +9482,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
             switch (alt12) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3365:1: ( ( rule__PortClass__MsgHandlersAssignment_3_0 ) )
+                    // InternalRoom.g:3367:1: ( ( rule__PortClass__MsgHandlersAssignment_3_0 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3365:1: ( ( rule__PortClass__MsgHandlersAssignment_3_0 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3366:1: ( rule__PortClass__MsgHandlersAssignment_3_0 )
+                    // InternalRoom.g:3367:1: ( ( rule__PortClass__MsgHandlersAssignment_3_0 ) )
+                    // InternalRoom.g:3368:1: ( rule__PortClass__MsgHandlersAssignment_3_0 )
                     {
                      before(grammarAccess.getPortClassAccess().getMsgHandlersAssignment_3_0()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3367:1: ( rule__PortClass__MsgHandlersAssignment_3_0 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3367:2: rule__PortClass__MsgHandlersAssignment_3_0
+                    // InternalRoom.g:3369:1: ( rule__PortClass__MsgHandlersAssignment_3_0 )
+                    // InternalRoom.g:3369:2: rule__PortClass__MsgHandlersAssignment_3_0
                     {
-                    pushFollow(FOLLOW_rule__PortClass__MsgHandlersAssignment_3_0_in_rule__PortClass__Alternatives_37151);
+                    pushFollow(FOLLOW_2);
                     rule__PortClass__MsgHandlersAssignment_3_0();
 
                     state._fsp--;
@@ -9507,16 +9507,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3371:6: ( ( rule__PortClass__OperationsAssignment_3_1 ) )
+                    // InternalRoom.g:3373:6: ( ( rule__PortClass__OperationsAssignment_3_1 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3371:6: ( ( rule__PortClass__OperationsAssignment_3_1 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3372:1: ( rule__PortClass__OperationsAssignment_3_1 )
+                    // InternalRoom.g:3373:6: ( ( rule__PortClass__OperationsAssignment_3_1 ) )
+                    // InternalRoom.g:3374:1: ( rule__PortClass__OperationsAssignment_3_1 )
                     {
                      before(grammarAccess.getPortClassAccess().getOperationsAssignment_3_1()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3373:1: ( rule__PortClass__OperationsAssignment_3_1 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3373:2: rule__PortClass__OperationsAssignment_3_1
+                    // InternalRoom.g:3375:1: ( rule__PortClass__OperationsAssignment_3_1 )
+                    // InternalRoom.g:3375:2: rule__PortClass__OperationsAssignment_3_1
                     {
-                    pushFollow(FOLLOW_rule__PortClass__OperationsAssignment_3_1_in_rule__PortClass__Alternatives_37169);
+                    pushFollow(FOLLOW_2);
                     rule__PortClass__OperationsAssignment_3_1();
 
                     state._fsp--;
@@ -9532,16 +9532,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3377:6: ( ( rule__PortClass__AttributesAssignment_3_2 ) )
+                    // InternalRoom.g:3379:6: ( ( rule__PortClass__AttributesAssignment_3_2 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3377:6: ( ( rule__PortClass__AttributesAssignment_3_2 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3378:1: ( rule__PortClass__AttributesAssignment_3_2 )
+                    // InternalRoom.g:3379:6: ( ( rule__PortClass__AttributesAssignment_3_2 ) )
+                    // InternalRoom.g:3380:1: ( rule__PortClass__AttributesAssignment_3_2 )
                     {
                      before(grammarAccess.getPortClassAccess().getAttributesAssignment_3_2()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3379:1: ( rule__PortClass__AttributesAssignment_3_2 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3379:2: rule__PortClass__AttributesAssignment_3_2
+                    // InternalRoom.g:3381:1: ( rule__PortClass__AttributesAssignment_3_2 )
+                    // InternalRoom.g:3381:2: rule__PortClass__AttributesAssignment_3_2
                     {
-                    pushFollow(FOLLOW_rule__PortClass__AttributesAssignment_3_2_in_rule__PortClass__Alternatives_37187);
+                    pushFollow(FOLLOW_2);
                     rule__PortClass__AttributesAssignment_3_2();
 
                     state._fsp--;
@@ -9574,13 +9574,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MessageHandler__Alternatives"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3388:1: rule__MessageHandler__Alternatives : ( ( ruleInMessageHandler ) | ( ruleOutMessageHandler ) );
+    // InternalRoom.g:3390:1: rule__MessageHandler__Alternatives : ( ( ruleInMessageHandler ) | ( ruleOutMessageHandler ) );
     public final void rule__MessageHandler__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3392:1: ( ( ruleInMessageHandler ) | ( ruleOutMessageHandler ) )
+            // InternalRoom.g:3394:1: ( ( ruleInMessageHandler ) | ( ruleOutMessageHandler ) )
             int alt13=2;
             int LA13_0 = input.LA(1);
 
@@ -9608,13 +9608,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt13) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3393:1: ( ruleInMessageHandler )
+                    // InternalRoom.g:3395:1: ( ruleInMessageHandler )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3393:1: ( ruleInMessageHandler )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3394:1: ruleInMessageHandler
+                    // InternalRoom.g:3395:1: ( ruleInMessageHandler )
+                    // InternalRoom.g:3396:1: ruleInMessageHandler
                     {
                      before(grammarAccess.getMessageHandlerAccess().getInMessageHandlerParserRuleCall_0()); 
-                    pushFollow(FOLLOW_ruleInMessageHandler_in_rule__MessageHandler__Alternatives7220);
+                    pushFollow(FOLLOW_2);
                     ruleInMessageHandler();
 
                     state._fsp--;
@@ -9627,13 +9627,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3399:6: ( ruleOutMessageHandler )
+                    // InternalRoom.g:3401:6: ( ruleOutMessageHandler )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3399:6: ( ruleOutMessageHandler )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3400:1: ruleOutMessageHandler
+                    // InternalRoom.g:3401:6: ( ruleOutMessageHandler )
+                    // InternalRoom.g:3402:1: ruleOutMessageHandler
                     {
                      before(grammarAccess.getMessageHandlerAccess().getOutMessageHandlerParserRuleCall_1()); 
-                    pushFollow(FOLLOW_ruleOutMessageHandler_in_rule__MessageHandler__Alternatives7237);
+                    pushFollow(FOLLOW_2);
                     ruleOutMessageHandler();
 
                     state._fsp--;
@@ -9663,13 +9663,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Alternatives_7_2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3410:1: rule__ActorClass__Alternatives_7_2 : ( ( ( rule__ActorClass__ServiceProvisionPointsAssignment_7_2_0 ) ) | ( ( rule__ActorClass__InterfacePortsAssignment_7_2_1 ) ) );
+    // InternalRoom.g:3412:1: rule__ActorClass__Alternatives_7_2 : ( ( ( rule__ActorClass__ServiceProvisionPointsAssignment_7_2_0 ) ) | ( ( rule__ActorClass__InterfacePortsAssignment_7_2_1 ) ) );
     public final void rule__ActorClass__Alternatives_7_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3414:1: ( ( ( rule__ActorClass__ServiceProvisionPointsAssignment_7_2_0 ) ) | ( ( rule__ActorClass__InterfacePortsAssignment_7_2_1 ) ) )
+            // InternalRoom.g:3416:1: ( ( ( rule__ActorClass__ServiceProvisionPointsAssignment_7_2_0 ) ) | ( ( rule__ActorClass__InterfacePortsAssignment_7_2_1 ) ) )
             int alt14=2;
             int LA14_0 = input.LA(1);
 
@@ -9687,16 +9687,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt14) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3415:1: ( ( rule__ActorClass__ServiceProvisionPointsAssignment_7_2_0 ) )
+                    // InternalRoom.g:3417:1: ( ( rule__ActorClass__ServiceProvisionPointsAssignment_7_2_0 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3415:1: ( ( rule__ActorClass__ServiceProvisionPointsAssignment_7_2_0 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3416:1: ( rule__ActorClass__ServiceProvisionPointsAssignment_7_2_0 )
+                    // InternalRoom.g:3417:1: ( ( rule__ActorClass__ServiceProvisionPointsAssignment_7_2_0 ) )
+                    // InternalRoom.g:3418:1: ( rule__ActorClass__ServiceProvisionPointsAssignment_7_2_0 )
                     {
                      before(grammarAccess.getActorClassAccess().getServiceProvisionPointsAssignment_7_2_0()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3417:1: ( rule__ActorClass__ServiceProvisionPointsAssignment_7_2_0 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3417:2: rule__ActorClass__ServiceProvisionPointsAssignment_7_2_0
+                    // InternalRoom.g:3419:1: ( rule__ActorClass__ServiceProvisionPointsAssignment_7_2_0 )
+                    // InternalRoom.g:3419:2: rule__ActorClass__ServiceProvisionPointsAssignment_7_2_0
                     {
-                    pushFollow(FOLLOW_rule__ActorClass__ServiceProvisionPointsAssignment_7_2_0_in_rule__ActorClass__Alternatives_7_27269);
+                    pushFollow(FOLLOW_2);
                     rule__ActorClass__ServiceProvisionPointsAssignment_7_2_0();
 
                     state._fsp--;
@@ -9712,16 +9712,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3421:6: ( ( rule__ActorClass__InterfacePortsAssignment_7_2_1 ) )
+                    // InternalRoom.g:3423:6: ( ( rule__ActorClass__InterfacePortsAssignment_7_2_1 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3421:6: ( ( rule__ActorClass__InterfacePortsAssignment_7_2_1 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3422:1: ( rule__ActorClass__InterfacePortsAssignment_7_2_1 )
+                    // InternalRoom.g:3423:6: ( ( rule__ActorClass__InterfacePortsAssignment_7_2_1 ) )
+                    // InternalRoom.g:3424:1: ( rule__ActorClass__InterfacePortsAssignment_7_2_1 )
                     {
                      before(grammarAccess.getActorClassAccess().getInterfacePortsAssignment_7_2_1()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3423:1: ( rule__ActorClass__InterfacePortsAssignment_7_2_1 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3423:2: rule__ActorClass__InterfacePortsAssignment_7_2_1
+                    // InternalRoom.g:3425:1: ( rule__ActorClass__InterfacePortsAssignment_7_2_1 )
+                    // InternalRoom.g:3425:2: rule__ActorClass__InterfacePortsAssignment_7_2_1
                     {
-                    pushFollow(FOLLOW_rule__ActorClass__InterfacePortsAssignment_7_2_1_in_rule__ActorClass__Alternatives_7_27287);
+                    pushFollow(FOLLOW_2);
                     rule__ActorClass__InterfacePortsAssignment_7_2_1();
 
                     state._fsp--;
@@ -9754,13 +9754,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Alternatives_8_6"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3432:1: rule__ActorClass__Alternatives_8_6 : ( ( ( rule__ActorClass__ConnectionsAssignment_8_6_0 ) ) | ( ( rule__ActorClass__BindingsAssignment_8_6_1 ) ) | ( ( rule__ActorClass__ServiceImplementationsAssignment_8_6_2 ) ) | ( ( rule__ActorClass__AttributesAssignment_8_6_3 ) ) | ( ( rule__ActorClass__ActorRefsAssignment_8_6_4 ) ) | ( ( rule__ActorClass__ServiceAccessPointsAssignment_8_6_5 ) ) | ( ( rule__ActorClass__InternalPortsAssignment_8_6_6 ) ) | ( ( rule__ActorClass__ExternalPortsAssignment_8_6_7 ) ) );
+    // InternalRoom.g:3434:1: rule__ActorClass__Alternatives_8_6 : ( ( ( rule__ActorClass__ConnectionsAssignment_8_6_0 ) ) | ( ( rule__ActorClass__BindingsAssignment_8_6_1 ) ) | ( ( rule__ActorClass__ServiceImplementationsAssignment_8_6_2 ) ) | ( ( rule__ActorClass__AttributesAssignment_8_6_3 ) ) | ( ( rule__ActorClass__ActorRefsAssignment_8_6_4 ) ) | ( ( rule__ActorClass__ServiceAccessPointsAssignment_8_6_5 ) ) | ( ( rule__ActorClass__InternalPortsAssignment_8_6_6 ) ) | ( ( rule__ActorClass__ExternalPortsAssignment_8_6_7 ) ) );
     public final void rule__ActorClass__Alternatives_8_6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3436:1: ( ( ( rule__ActorClass__ConnectionsAssignment_8_6_0 ) ) | ( ( rule__ActorClass__BindingsAssignment_8_6_1 ) ) | ( ( rule__ActorClass__ServiceImplementationsAssignment_8_6_2 ) ) | ( ( rule__ActorClass__AttributesAssignment_8_6_3 ) ) | ( ( rule__ActorClass__ActorRefsAssignment_8_6_4 ) ) | ( ( rule__ActorClass__ServiceAccessPointsAssignment_8_6_5 ) ) | ( ( rule__ActorClass__InternalPortsAssignment_8_6_6 ) ) | ( ( rule__ActorClass__ExternalPortsAssignment_8_6_7 ) ) )
+            // InternalRoom.g:3438:1: ( ( ( rule__ActorClass__ConnectionsAssignment_8_6_0 ) ) | ( ( rule__ActorClass__BindingsAssignment_8_6_1 ) ) | ( ( rule__ActorClass__ServiceImplementationsAssignment_8_6_2 ) ) | ( ( rule__ActorClass__AttributesAssignment_8_6_3 ) ) | ( ( rule__ActorClass__ActorRefsAssignment_8_6_4 ) ) | ( ( rule__ActorClass__ServiceAccessPointsAssignment_8_6_5 ) ) | ( ( rule__ActorClass__InternalPortsAssignment_8_6_6 ) ) | ( ( rule__ActorClass__ExternalPortsAssignment_8_6_7 ) ) )
             int alt15=8;
             switch ( input.LA(1) ) {
             case 88:
@@ -9815,16 +9815,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
             switch (alt15) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3437:1: ( ( rule__ActorClass__ConnectionsAssignment_8_6_0 ) )
+                    // InternalRoom.g:3439:1: ( ( rule__ActorClass__ConnectionsAssignment_8_6_0 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3437:1: ( ( rule__ActorClass__ConnectionsAssignment_8_6_0 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3438:1: ( rule__ActorClass__ConnectionsAssignment_8_6_0 )
+                    // InternalRoom.g:3439:1: ( ( rule__ActorClass__ConnectionsAssignment_8_6_0 ) )
+                    // InternalRoom.g:3440:1: ( rule__ActorClass__ConnectionsAssignment_8_6_0 )
                     {
                      before(grammarAccess.getActorClassAccess().getConnectionsAssignment_8_6_0()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3439:1: ( rule__ActorClass__ConnectionsAssignment_8_6_0 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3439:2: rule__ActorClass__ConnectionsAssignment_8_6_0
+                    // InternalRoom.g:3441:1: ( rule__ActorClass__ConnectionsAssignment_8_6_0 )
+                    // InternalRoom.g:3441:2: rule__ActorClass__ConnectionsAssignment_8_6_0
                     {
-                    pushFollow(FOLLOW_rule__ActorClass__ConnectionsAssignment_8_6_0_in_rule__ActorClass__Alternatives_8_67320);
+                    pushFollow(FOLLOW_2);
                     rule__ActorClass__ConnectionsAssignment_8_6_0();
 
                     state._fsp--;
@@ -9840,16 +9840,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3443:6: ( ( rule__ActorClass__BindingsAssignment_8_6_1 ) )
+                    // InternalRoom.g:3445:6: ( ( rule__ActorClass__BindingsAssignment_8_6_1 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3443:6: ( ( rule__ActorClass__BindingsAssignment_8_6_1 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3444:1: ( rule__ActorClass__BindingsAssignment_8_6_1 )
+                    // InternalRoom.g:3445:6: ( ( rule__ActorClass__BindingsAssignment_8_6_1 ) )
+                    // InternalRoom.g:3446:1: ( rule__ActorClass__BindingsAssignment_8_6_1 )
                     {
                      before(grammarAccess.getActorClassAccess().getBindingsAssignment_8_6_1()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3445:1: ( rule__ActorClass__BindingsAssignment_8_6_1 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3445:2: rule__ActorClass__BindingsAssignment_8_6_1
+                    // InternalRoom.g:3447:1: ( rule__ActorClass__BindingsAssignment_8_6_1 )
+                    // InternalRoom.g:3447:2: rule__ActorClass__BindingsAssignment_8_6_1
                     {
-                    pushFollow(FOLLOW_rule__ActorClass__BindingsAssignment_8_6_1_in_rule__ActorClass__Alternatives_8_67338);
+                    pushFollow(FOLLOW_2);
                     rule__ActorClass__BindingsAssignment_8_6_1();
 
                     state._fsp--;
@@ -9865,16 +9865,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3449:6: ( ( rule__ActorClass__ServiceImplementationsAssignment_8_6_2 ) )
+                    // InternalRoom.g:3451:6: ( ( rule__ActorClass__ServiceImplementationsAssignment_8_6_2 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3449:6: ( ( rule__ActorClass__ServiceImplementationsAssignment_8_6_2 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3450:1: ( rule__ActorClass__ServiceImplementationsAssignment_8_6_2 )
+                    // InternalRoom.g:3451:6: ( ( rule__ActorClass__ServiceImplementationsAssignment_8_6_2 ) )
+                    // InternalRoom.g:3452:1: ( rule__ActorClass__ServiceImplementationsAssignment_8_6_2 )
                     {
                      before(grammarAccess.getActorClassAccess().getServiceImplementationsAssignment_8_6_2()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3451:1: ( rule__ActorClass__ServiceImplementationsAssignment_8_6_2 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3451:2: rule__ActorClass__ServiceImplementationsAssignment_8_6_2
+                    // InternalRoom.g:3453:1: ( rule__ActorClass__ServiceImplementationsAssignment_8_6_2 )
+                    // InternalRoom.g:3453:2: rule__ActorClass__ServiceImplementationsAssignment_8_6_2
                     {
-                    pushFollow(FOLLOW_rule__ActorClass__ServiceImplementationsAssignment_8_6_2_in_rule__ActorClass__Alternatives_8_67356);
+                    pushFollow(FOLLOW_2);
                     rule__ActorClass__ServiceImplementationsAssignment_8_6_2();
 
                     state._fsp--;
@@ -9890,16 +9890,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 4 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3455:6: ( ( rule__ActorClass__AttributesAssignment_8_6_3 ) )
+                    // InternalRoom.g:3457:6: ( ( rule__ActorClass__AttributesAssignment_8_6_3 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3455:6: ( ( rule__ActorClass__AttributesAssignment_8_6_3 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3456:1: ( rule__ActorClass__AttributesAssignment_8_6_3 )
+                    // InternalRoom.g:3457:6: ( ( rule__ActorClass__AttributesAssignment_8_6_3 ) )
+                    // InternalRoom.g:3458:1: ( rule__ActorClass__AttributesAssignment_8_6_3 )
                     {
                      before(grammarAccess.getActorClassAccess().getAttributesAssignment_8_6_3()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3457:1: ( rule__ActorClass__AttributesAssignment_8_6_3 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3457:2: rule__ActorClass__AttributesAssignment_8_6_3
+                    // InternalRoom.g:3459:1: ( rule__ActorClass__AttributesAssignment_8_6_3 )
+                    // InternalRoom.g:3459:2: rule__ActorClass__AttributesAssignment_8_6_3
                     {
-                    pushFollow(FOLLOW_rule__ActorClass__AttributesAssignment_8_6_3_in_rule__ActorClass__Alternatives_8_67374);
+                    pushFollow(FOLLOW_2);
                     rule__ActorClass__AttributesAssignment_8_6_3();
 
                     state._fsp--;
@@ -9915,16 +9915,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 5 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3461:6: ( ( rule__ActorClass__ActorRefsAssignment_8_6_4 ) )
+                    // InternalRoom.g:3463:6: ( ( rule__ActorClass__ActorRefsAssignment_8_6_4 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3461:6: ( ( rule__ActorClass__ActorRefsAssignment_8_6_4 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3462:1: ( rule__ActorClass__ActorRefsAssignment_8_6_4 )
+                    // InternalRoom.g:3463:6: ( ( rule__ActorClass__ActorRefsAssignment_8_6_4 ) )
+                    // InternalRoom.g:3464:1: ( rule__ActorClass__ActorRefsAssignment_8_6_4 )
                     {
                      before(grammarAccess.getActorClassAccess().getActorRefsAssignment_8_6_4()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3463:1: ( rule__ActorClass__ActorRefsAssignment_8_6_4 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3463:2: rule__ActorClass__ActorRefsAssignment_8_6_4
+                    // InternalRoom.g:3465:1: ( rule__ActorClass__ActorRefsAssignment_8_6_4 )
+                    // InternalRoom.g:3465:2: rule__ActorClass__ActorRefsAssignment_8_6_4
                     {
-                    pushFollow(FOLLOW_rule__ActorClass__ActorRefsAssignment_8_6_4_in_rule__ActorClass__Alternatives_8_67392);
+                    pushFollow(FOLLOW_2);
                     rule__ActorClass__ActorRefsAssignment_8_6_4();
 
                     state._fsp--;
@@ -9940,16 +9940,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 6 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3467:6: ( ( rule__ActorClass__ServiceAccessPointsAssignment_8_6_5 ) )
+                    // InternalRoom.g:3469:6: ( ( rule__ActorClass__ServiceAccessPointsAssignment_8_6_5 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3467:6: ( ( rule__ActorClass__ServiceAccessPointsAssignment_8_6_5 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3468:1: ( rule__ActorClass__ServiceAccessPointsAssignment_8_6_5 )
+                    // InternalRoom.g:3469:6: ( ( rule__ActorClass__ServiceAccessPointsAssignment_8_6_5 ) )
+                    // InternalRoom.g:3470:1: ( rule__ActorClass__ServiceAccessPointsAssignment_8_6_5 )
                     {
                      before(grammarAccess.getActorClassAccess().getServiceAccessPointsAssignment_8_6_5()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3469:1: ( rule__ActorClass__ServiceAccessPointsAssignment_8_6_5 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3469:2: rule__ActorClass__ServiceAccessPointsAssignment_8_6_5
+                    // InternalRoom.g:3471:1: ( rule__ActorClass__ServiceAccessPointsAssignment_8_6_5 )
+                    // InternalRoom.g:3471:2: rule__ActorClass__ServiceAccessPointsAssignment_8_6_5
                     {
-                    pushFollow(FOLLOW_rule__ActorClass__ServiceAccessPointsAssignment_8_6_5_in_rule__ActorClass__Alternatives_8_67410);
+                    pushFollow(FOLLOW_2);
                     rule__ActorClass__ServiceAccessPointsAssignment_8_6_5();
 
                     state._fsp--;
@@ -9965,16 +9965,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 7 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3473:6: ( ( rule__ActorClass__InternalPortsAssignment_8_6_6 ) )
+                    // InternalRoom.g:3475:6: ( ( rule__ActorClass__InternalPortsAssignment_8_6_6 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3473:6: ( ( rule__ActorClass__InternalPortsAssignment_8_6_6 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3474:1: ( rule__ActorClass__InternalPortsAssignment_8_6_6 )
+                    // InternalRoom.g:3475:6: ( ( rule__ActorClass__InternalPortsAssignment_8_6_6 ) )
+                    // InternalRoom.g:3476:1: ( rule__ActorClass__InternalPortsAssignment_8_6_6 )
                     {
                      before(grammarAccess.getActorClassAccess().getInternalPortsAssignment_8_6_6()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3475:1: ( rule__ActorClass__InternalPortsAssignment_8_6_6 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3475:2: rule__ActorClass__InternalPortsAssignment_8_6_6
+                    // InternalRoom.g:3477:1: ( rule__ActorClass__InternalPortsAssignment_8_6_6 )
+                    // InternalRoom.g:3477:2: rule__ActorClass__InternalPortsAssignment_8_6_6
                     {
-                    pushFollow(FOLLOW_rule__ActorClass__InternalPortsAssignment_8_6_6_in_rule__ActorClass__Alternatives_8_67428);
+                    pushFollow(FOLLOW_2);
                     rule__ActorClass__InternalPortsAssignment_8_6_6();
 
                     state._fsp--;
@@ -9990,16 +9990,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 8 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3479:6: ( ( rule__ActorClass__ExternalPortsAssignment_8_6_7 ) )
+                    // InternalRoom.g:3481:6: ( ( rule__ActorClass__ExternalPortsAssignment_8_6_7 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3479:6: ( ( rule__ActorClass__ExternalPortsAssignment_8_6_7 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3480:1: ( rule__ActorClass__ExternalPortsAssignment_8_6_7 )
+                    // InternalRoom.g:3481:6: ( ( rule__ActorClass__ExternalPortsAssignment_8_6_7 ) )
+                    // InternalRoom.g:3482:1: ( rule__ActorClass__ExternalPortsAssignment_8_6_7 )
                     {
                      before(grammarAccess.getActorClassAccess().getExternalPortsAssignment_8_6_7()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3481:1: ( rule__ActorClass__ExternalPortsAssignment_8_6_7 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3481:2: rule__ActorClass__ExternalPortsAssignment_8_6_7
+                    // InternalRoom.g:3483:1: ( rule__ActorClass__ExternalPortsAssignment_8_6_7 )
+                    // InternalRoom.g:3483:2: rule__ActorClass__ExternalPortsAssignment_8_6_7
                     {
-                    pushFollow(FOLLOW_rule__ActorClass__ExternalPortsAssignment_8_6_7_in_rule__ActorClass__Alternatives_8_67446);
+                    pushFollow(FOLLOW_2);
                     rule__ActorClass__ExternalPortsAssignment_8_6_7();
 
                     state._fsp--;
@@ -10032,13 +10032,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Alternatives_9_4"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3490:1: rule__ActorClass__Alternatives_9_4 : ( ( ( rule__ActorClass__OperationsAssignment_9_4_0 ) ) | ( ( rule__ActorClass__StructorsAssignment_9_4_1 ) ) );
+    // InternalRoom.g:3492:1: rule__ActorClass__Alternatives_9_4 : ( ( ( rule__ActorClass__OperationsAssignment_9_4_0 ) ) | ( ( rule__ActorClass__StructorsAssignment_9_4_1 ) ) );
     public final void rule__ActorClass__Alternatives_9_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3494:1: ( ( ( rule__ActorClass__OperationsAssignment_9_4_0 ) ) | ( ( rule__ActorClass__StructorsAssignment_9_4_1 ) ) )
+            // InternalRoom.g:3496:1: ( ( ( rule__ActorClass__OperationsAssignment_9_4_0 ) ) | ( ( rule__ActorClass__StructorsAssignment_9_4_1 ) ) )
             int alt16=2;
             int LA16_0 = input.LA(1);
 
@@ -10056,16 +10056,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt16) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3495:1: ( ( rule__ActorClass__OperationsAssignment_9_4_0 ) )
+                    // InternalRoom.g:3497:1: ( ( rule__ActorClass__OperationsAssignment_9_4_0 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3495:1: ( ( rule__ActorClass__OperationsAssignment_9_4_0 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3496:1: ( rule__ActorClass__OperationsAssignment_9_4_0 )
+                    // InternalRoom.g:3497:1: ( ( rule__ActorClass__OperationsAssignment_9_4_0 ) )
+                    // InternalRoom.g:3498:1: ( rule__ActorClass__OperationsAssignment_9_4_0 )
                     {
                      before(grammarAccess.getActorClassAccess().getOperationsAssignment_9_4_0()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3497:1: ( rule__ActorClass__OperationsAssignment_9_4_0 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3497:2: rule__ActorClass__OperationsAssignment_9_4_0
+                    // InternalRoom.g:3499:1: ( rule__ActorClass__OperationsAssignment_9_4_0 )
+                    // InternalRoom.g:3499:2: rule__ActorClass__OperationsAssignment_9_4_0
                     {
-                    pushFollow(FOLLOW_rule__ActorClass__OperationsAssignment_9_4_0_in_rule__ActorClass__Alternatives_9_47479);
+                    pushFollow(FOLLOW_2);
                     rule__ActorClass__OperationsAssignment_9_4_0();
 
                     state._fsp--;
@@ -10081,16 +10081,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3501:6: ( ( rule__ActorClass__StructorsAssignment_9_4_1 ) )
+                    // InternalRoom.g:3503:6: ( ( rule__ActorClass__StructorsAssignment_9_4_1 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3501:6: ( ( rule__ActorClass__StructorsAssignment_9_4_1 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3502:1: ( rule__ActorClass__StructorsAssignment_9_4_1 )
+                    // InternalRoom.g:3503:6: ( ( rule__ActorClass__StructorsAssignment_9_4_1 ) )
+                    // InternalRoom.g:3504:1: ( rule__ActorClass__StructorsAssignment_9_4_1 )
                     {
                      before(grammarAccess.getActorClassAccess().getStructorsAssignment_9_4_1()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3503:1: ( rule__ActorClass__StructorsAssignment_9_4_1 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3503:2: rule__ActorClass__StructorsAssignment_9_4_1
+                    // InternalRoom.g:3505:1: ( rule__ActorClass__StructorsAssignment_9_4_1 )
+                    // InternalRoom.g:3505:2: rule__ActorClass__StructorsAssignment_9_4_1
                     {
-                    pushFollow(FOLLOW_rule__ActorClass__StructorsAssignment_9_4_1_in_rule__ActorClass__Alternatives_9_47497);
+                    pushFollow(FOLLOW_2);
                     rule__ActorClass__StructorsAssignment_9_4_1();
 
                     state._fsp--;
@@ -10123,13 +10123,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InterfaceItem__Alternatives"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3512:1: rule__InterfaceItem__Alternatives : ( ( rulePort ) | ( ruleSAP ) | ( ruleSPP ) );
+    // InternalRoom.g:3514:1: rule__InterfaceItem__Alternatives : ( ( rulePort ) | ( ruleSAP ) | ( ruleSPP ) );
     public final void rule__InterfaceItem__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3516:1: ( ( rulePort ) | ( ruleSAP ) | ( ruleSPP ) )
+            // InternalRoom.g:3518:1: ( ( rulePort ) | ( ruleSAP ) | ( ruleSPP ) )
             int alt17=3;
             switch ( input.LA(1) ) {
             case 67:
@@ -10157,13 +10157,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
             switch (alt17) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3517:1: ( rulePort )
+                    // InternalRoom.g:3519:1: ( rulePort )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3517:1: ( rulePort )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3518:1: rulePort
+                    // InternalRoom.g:3519:1: ( rulePort )
+                    // InternalRoom.g:3520:1: rulePort
                     {
                      before(grammarAccess.getInterfaceItemAccess().getPortParserRuleCall_0()); 
-                    pushFollow(FOLLOW_rulePort_in_rule__InterfaceItem__Alternatives7530);
+                    pushFollow(FOLLOW_2);
                     rulePort();
 
                     state._fsp--;
@@ -10176,13 +10176,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3523:6: ( ruleSAP )
+                    // InternalRoom.g:3525:6: ( ruleSAP )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3523:6: ( ruleSAP )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3524:1: ruleSAP
+                    // InternalRoom.g:3525:6: ( ruleSAP )
+                    // InternalRoom.g:3526:1: ruleSAP
                     {
                      before(grammarAccess.getInterfaceItemAccess().getSAPParserRuleCall_1()); 
-                    pushFollow(FOLLOW_ruleSAP_in_rule__InterfaceItem__Alternatives7547);
+                    pushFollow(FOLLOW_2);
                     ruleSAP();
 
                     state._fsp--;
@@ -10195,13 +10195,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3529:6: ( ruleSPP )
+                    // InternalRoom.g:3531:6: ( ruleSPP )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3529:6: ( ruleSPP )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3530:1: ruleSPP
+                    // InternalRoom.g:3531:6: ( ruleSPP )
+                    // InternalRoom.g:3532:1: ruleSPP
                     {
                      before(grammarAccess.getInterfaceItemAccess().getSPPParserRuleCall_2()); 
-                    pushFollow(FOLLOW_ruleSPP_in_rule__InterfaceItem__Alternatives7564);
+                    pushFollow(FOLLOW_2);
                     ruleSPP();
 
                     state._fsp--;
@@ -10231,13 +10231,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__LogicalSystem__Alternatives_5"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3540:1: rule__LogicalSystem__Alternatives_5 : ( ( ( rule__LogicalSystem__ConnectionsAssignment_5_0 ) ) | ( ( rule__LogicalSystem__BindingsAssignment_5_1 ) ) | ( ( rule__LogicalSystem__SubSystemsAssignment_5_2 ) ) );
+    // InternalRoom.g:3542:1: rule__LogicalSystem__Alternatives_5 : ( ( ( rule__LogicalSystem__ConnectionsAssignment_5_0 ) ) | ( ( rule__LogicalSystem__BindingsAssignment_5_1 ) ) | ( ( rule__LogicalSystem__SubSystemsAssignment_5_2 ) ) );
     public final void rule__LogicalSystem__Alternatives_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3544:1: ( ( ( rule__LogicalSystem__ConnectionsAssignment_5_0 ) ) | ( ( rule__LogicalSystem__BindingsAssignment_5_1 ) ) | ( ( rule__LogicalSystem__SubSystemsAssignment_5_2 ) ) )
+            // InternalRoom.g:3546:1: ( ( ( rule__LogicalSystem__ConnectionsAssignment_5_0 ) ) | ( ( rule__LogicalSystem__BindingsAssignment_5_1 ) ) | ( ( rule__LogicalSystem__SubSystemsAssignment_5_2 ) ) )
             int alt18=3;
             switch ( input.LA(1) ) {
             case 88:
@@ -10264,16 +10264,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
             switch (alt18) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3545:1: ( ( rule__LogicalSystem__ConnectionsAssignment_5_0 ) )
+                    // InternalRoom.g:3547:1: ( ( rule__LogicalSystem__ConnectionsAssignment_5_0 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3545:1: ( ( rule__LogicalSystem__ConnectionsAssignment_5_0 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3546:1: ( rule__LogicalSystem__ConnectionsAssignment_5_0 )
+                    // InternalRoom.g:3547:1: ( ( rule__LogicalSystem__ConnectionsAssignment_5_0 ) )
+                    // InternalRoom.g:3548:1: ( rule__LogicalSystem__ConnectionsAssignment_5_0 )
                     {
                      before(grammarAccess.getLogicalSystemAccess().getConnectionsAssignment_5_0()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3547:1: ( rule__LogicalSystem__ConnectionsAssignment_5_0 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3547:2: rule__LogicalSystem__ConnectionsAssignment_5_0
+                    // InternalRoom.g:3549:1: ( rule__LogicalSystem__ConnectionsAssignment_5_0 )
+                    // InternalRoom.g:3549:2: rule__LogicalSystem__ConnectionsAssignment_5_0
                     {
-                    pushFollow(FOLLOW_rule__LogicalSystem__ConnectionsAssignment_5_0_in_rule__LogicalSystem__Alternatives_57596);
+                    pushFollow(FOLLOW_2);
                     rule__LogicalSystem__ConnectionsAssignment_5_0();
 
                     state._fsp--;
@@ -10289,16 +10289,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3551:6: ( ( rule__LogicalSystem__BindingsAssignment_5_1 ) )
+                    // InternalRoom.g:3553:6: ( ( rule__LogicalSystem__BindingsAssignment_5_1 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3551:6: ( ( rule__LogicalSystem__BindingsAssignment_5_1 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3552:1: ( rule__LogicalSystem__BindingsAssignment_5_1 )
+                    // InternalRoom.g:3553:6: ( ( rule__LogicalSystem__BindingsAssignment_5_1 ) )
+                    // InternalRoom.g:3554:1: ( rule__LogicalSystem__BindingsAssignment_5_1 )
                     {
                      before(grammarAccess.getLogicalSystemAccess().getBindingsAssignment_5_1()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3553:1: ( rule__LogicalSystem__BindingsAssignment_5_1 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3553:2: rule__LogicalSystem__BindingsAssignment_5_1
+                    // InternalRoom.g:3555:1: ( rule__LogicalSystem__BindingsAssignment_5_1 )
+                    // InternalRoom.g:3555:2: rule__LogicalSystem__BindingsAssignment_5_1
                     {
-                    pushFollow(FOLLOW_rule__LogicalSystem__BindingsAssignment_5_1_in_rule__LogicalSystem__Alternatives_57614);
+                    pushFollow(FOLLOW_2);
                     rule__LogicalSystem__BindingsAssignment_5_1();
 
                     state._fsp--;
@@ -10314,16 +10314,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3557:6: ( ( rule__LogicalSystem__SubSystemsAssignment_5_2 ) )
+                    // InternalRoom.g:3559:6: ( ( rule__LogicalSystem__SubSystemsAssignment_5_2 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3557:6: ( ( rule__LogicalSystem__SubSystemsAssignment_5_2 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3558:1: ( rule__LogicalSystem__SubSystemsAssignment_5_2 )
+                    // InternalRoom.g:3559:6: ( ( rule__LogicalSystem__SubSystemsAssignment_5_2 ) )
+                    // InternalRoom.g:3560:1: ( rule__LogicalSystem__SubSystemsAssignment_5_2 )
                     {
                      before(grammarAccess.getLogicalSystemAccess().getSubSystemsAssignment_5_2()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3559:1: ( rule__LogicalSystem__SubSystemsAssignment_5_2 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3559:2: rule__LogicalSystem__SubSystemsAssignment_5_2
+                    // InternalRoom.g:3561:1: ( rule__LogicalSystem__SubSystemsAssignment_5_2 )
+                    // InternalRoom.g:3561:2: rule__LogicalSystem__SubSystemsAssignment_5_2
                     {
-                    pushFollow(FOLLOW_rule__LogicalSystem__SubSystemsAssignment_5_2_in_rule__LogicalSystem__Alternatives_57632);
+                    pushFollow(FOLLOW_2);
                     rule__LogicalSystem__SubSystemsAssignment_5_2();
 
                     state._fsp--;
@@ -10356,13 +10356,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemClass__Alternatives_8"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3569:1: rule__SubSystemClass__Alternatives_8 : ( ( ( rule__SubSystemClass__ActorInstanceMappingsAssignment_8_0 ) ) | ( ( rule__SubSystemClass__ThreadsAssignment_8_1 ) ) | ( ( rule__SubSystemClass__ConnectionsAssignment_8_2 ) ) | ( ( rule__SubSystemClass__BindingsAssignment_8_3 ) ) | ( ( rule__SubSystemClass__ActorRefsAssignment_8_4 ) ) | ( ( rule__SubSystemClass__ServiceProvisionPointsAssignment_8_5 ) ) | ( ( rule__SubSystemClass__RelayPortsAssignment_8_6 ) ) );
+    // InternalRoom.g:3571:1: rule__SubSystemClass__Alternatives_8 : ( ( ( rule__SubSystemClass__ActorInstanceMappingsAssignment_8_0 ) ) | ( ( rule__SubSystemClass__ThreadsAssignment_8_1 ) ) | ( ( rule__SubSystemClass__ConnectionsAssignment_8_2 ) ) | ( ( rule__SubSystemClass__BindingsAssignment_8_3 ) ) | ( ( rule__SubSystemClass__ActorRefsAssignment_8_4 ) ) | ( ( rule__SubSystemClass__ServiceProvisionPointsAssignment_8_5 ) ) | ( ( rule__SubSystemClass__RelayPortsAssignment_8_6 ) ) );
     public final void rule__SubSystemClass__Alternatives_8() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3573:1: ( ( ( rule__SubSystemClass__ActorInstanceMappingsAssignment_8_0 ) ) | ( ( rule__SubSystemClass__ThreadsAssignment_8_1 ) ) | ( ( rule__SubSystemClass__ConnectionsAssignment_8_2 ) ) | ( ( rule__SubSystemClass__BindingsAssignment_8_3 ) ) | ( ( rule__SubSystemClass__ActorRefsAssignment_8_4 ) ) | ( ( rule__SubSystemClass__ServiceProvisionPointsAssignment_8_5 ) ) | ( ( rule__SubSystemClass__RelayPortsAssignment_8_6 ) ) )
+            // InternalRoom.g:3575:1: ( ( ( rule__SubSystemClass__ActorInstanceMappingsAssignment_8_0 ) ) | ( ( rule__SubSystemClass__ThreadsAssignment_8_1 ) ) | ( ( rule__SubSystemClass__ConnectionsAssignment_8_2 ) ) | ( ( rule__SubSystemClass__BindingsAssignment_8_3 ) ) | ( ( rule__SubSystemClass__ActorRefsAssignment_8_4 ) ) | ( ( rule__SubSystemClass__ServiceProvisionPointsAssignment_8_5 ) ) | ( ( rule__SubSystemClass__RelayPortsAssignment_8_6 ) ) )
             int alt19=7;
             switch ( input.LA(1) ) {
             case 82:
@@ -10412,16 +10412,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
             switch (alt19) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3574:1: ( ( rule__SubSystemClass__ActorInstanceMappingsAssignment_8_0 ) )
+                    // InternalRoom.g:3576:1: ( ( rule__SubSystemClass__ActorInstanceMappingsAssignment_8_0 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3574:1: ( ( rule__SubSystemClass__ActorInstanceMappingsAssignment_8_0 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3575:1: ( rule__SubSystemClass__ActorInstanceMappingsAssignment_8_0 )
+                    // InternalRoom.g:3576:1: ( ( rule__SubSystemClass__ActorInstanceMappingsAssignment_8_0 ) )
+                    // InternalRoom.g:3577:1: ( rule__SubSystemClass__ActorInstanceMappingsAssignment_8_0 )
                     {
                      before(grammarAccess.getSubSystemClassAccess().getActorInstanceMappingsAssignment_8_0()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3576:1: ( rule__SubSystemClass__ActorInstanceMappingsAssignment_8_0 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3576:2: rule__SubSystemClass__ActorInstanceMappingsAssignment_8_0
+                    // InternalRoom.g:3578:1: ( rule__SubSystemClass__ActorInstanceMappingsAssignment_8_0 )
+                    // InternalRoom.g:3578:2: rule__SubSystemClass__ActorInstanceMappingsAssignment_8_0
                     {
-                    pushFollow(FOLLOW_rule__SubSystemClass__ActorInstanceMappingsAssignment_8_0_in_rule__SubSystemClass__Alternatives_87666);
+                    pushFollow(FOLLOW_2);
                     rule__SubSystemClass__ActorInstanceMappingsAssignment_8_0();
 
                     state._fsp--;
@@ -10437,16 +10437,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3580:6: ( ( rule__SubSystemClass__ThreadsAssignment_8_1 ) )
+                    // InternalRoom.g:3582:6: ( ( rule__SubSystemClass__ThreadsAssignment_8_1 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3580:6: ( ( rule__SubSystemClass__ThreadsAssignment_8_1 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3581:1: ( rule__SubSystemClass__ThreadsAssignment_8_1 )
+                    // InternalRoom.g:3582:6: ( ( rule__SubSystemClass__ThreadsAssignment_8_1 ) )
+                    // InternalRoom.g:3583:1: ( rule__SubSystemClass__ThreadsAssignment_8_1 )
                     {
                      before(grammarAccess.getSubSystemClassAccess().getThreadsAssignment_8_1()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3582:1: ( rule__SubSystemClass__ThreadsAssignment_8_1 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3582:2: rule__SubSystemClass__ThreadsAssignment_8_1
+                    // InternalRoom.g:3584:1: ( rule__SubSystemClass__ThreadsAssignment_8_1 )
+                    // InternalRoom.g:3584:2: rule__SubSystemClass__ThreadsAssignment_8_1
                     {
-                    pushFollow(FOLLOW_rule__SubSystemClass__ThreadsAssignment_8_1_in_rule__SubSystemClass__Alternatives_87684);
+                    pushFollow(FOLLOW_2);
                     rule__SubSystemClass__ThreadsAssignment_8_1();
 
                     state._fsp--;
@@ -10462,16 +10462,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3586:6: ( ( rule__SubSystemClass__ConnectionsAssignment_8_2 ) )
+                    // InternalRoom.g:3588:6: ( ( rule__SubSystemClass__ConnectionsAssignment_8_2 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3586:6: ( ( rule__SubSystemClass__ConnectionsAssignment_8_2 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3587:1: ( rule__SubSystemClass__ConnectionsAssignment_8_2 )
+                    // InternalRoom.g:3588:6: ( ( rule__SubSystemClass__ConnectionsAssignment_8_2 ) )
+                    // InternalRoom.g:3589:1: ( rule__SubSystemClass__ConnectionsAssignment_8_2 )
                     {
                      before(grammarAccess.getSubSystemClassAccess().getConnectionsAssignment_8_2()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3588:1: ( rule__SubSystemClass__ConnectionsAssignment_8_2 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3588:2: rule__SubSystemClass__ConnectionsAssignment_8_2
+                    // InternalRoom.g:3590:1: ( rule__SubSystemClass__ConnectionsAssignment_8_2 )
+                    // InternalRoom.g:3590:2: rule__SubSystemClass__ConnectionsAssignment_8_2
                     {
-                    pushFollow(FOLLOW_rule__SubSystemClass__ConnectionsAssignment_8_2_in_rule__SubSystemClass__Alternatives_87702);
+                    pushFollow(FOLLOW_2);
                     rule__SubSystemClass__ConnectionsAssignment_8_2();
 
                     state._fsp--;
@@ -10487,16 +10487,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 4 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3592:6: ( ( rule__SubSystemClass__BindingsAssignment_8_3 ) )
+                    // InternalRoom.g:3594:6: ( ( rule__SubSystemClass__BindingsAssignment_8_3 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3592:6: ( ( rule__SubSystemClass__BindingsAssignment_8_3 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3593:1: ( rule__SubSystemClass__BindingsAssignment_8_3 )
+                    // InternalRoom.g:3594:6: ( ( rule__SubSystemClass__BindingsAssignment_8_3 ) )
+                    // InternalRoom.g:3595:1: ( rule__SubSystemClass__BindingsAssignment_8_3 )
                     {
                      before(grammarAccess.getSubSystemClassAccess().getBindingsAssignment_8_3()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3594:1: ( rule__SubSystemClass__BindingsAssignment_8_3 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3594:2: rule__SubSystemClass__BindingsAssignment_8_3
+                    // InternalRoom.g:3596:1: ( rule__SubSystemClass__BindingsAssignment_8_3 )
+                    // InternalRoom.g:3596:2: rule__SubSystemClass__BindingsAssignment_8_3
                     {
-                    pushFollow(FOLLOW_rule__SubSystemClass__BindingsAssignment_8_3_in_rule__SubSystemClass__Alternatives_87720);
+                    pushFollow(FOLLOW_2);
                     rule__SubSystemClass__BindingsAssignment_8_3();
 
                     state._fsp--;
@@ -10512,16 +10512,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 5 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3598:6: ( ( rule__SubSystemClass__ActorRefsAssignment_8_4 ) )
+                    // InternalRoom.g:3600:6: ( ( rule__SubSystemClass__ActorRefsAssignment_8_4 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3598:6: ( ( rule__SubSystemClass__ActorRefsAssignment_8_4 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3599:1: ( rule__SubSystemClass__ActorRefsAssignment_8_4 )
+                    // InternalRoom.g:3600:6: ( ( rule__SubSystemClass__ActorRefsAssignment_8_4 ) )
+                    // InternalRoom.g:3601:1: ( rule__SubSystemClass__ActorRefsAssignment_8_4 )
                     {
                      before(grammarAccess.getSubSystemClassAccess().getActorRefsAssignment_8_4()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3600:1: ( rule__SubSystemClass__ActorRefsAssignment_8_4 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3600:2: rule__SubSystemClass__ActorRefsAssignment_8_4
+                    // InternalRoom.g:3602:1: ( rule__SubSystemClass__ActorRefsAssignment_8_4 )
+                    // InternalRoom.g:3602:2: rule__SubSystemClass__ActorRefsAssignment_8_4
                     {
-                    pushFollow(FOLLOW_rule__SubSystemClass__ActorRefsAssignment_8_4_in_rule__SubSystemClass__Alternatives_87738);
+                    pushFollow(FOLLOW_2);
                     rule__SubSystemClass__ActorRefsAssignment_8_4();
 
                     state._fsp--;
@@ -10537,16 +10537,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 6 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3604:6: ( ( rule__SubSystemClass__ServiceProvisionPointsAssignment_8_5 ) )
+                    // InternalRoom.g:3606:6: ( ( rule__SubSystemClass__ServiceProvisionPointsAssignment_8_5 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3604:6: ( ( rule__SubSystemClass__ServiceProvisionPointsAssignment_8_5 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3605:1: ( rule__SubSystemClass__ServiceProvisionPointsAssignment_8_5 )
+                    // InternalRoom.g:3606:6: ( ( rule__SubSystemClass__ServiceProvisionPointsAssignment_8_5 ) )
+                    // InternalRoom.g:3607:1: ( rule__SubSystemClass__ServiceProvisionPointsAssignment_8_5 )
                     {
                      before(grammarAccess.getSubSystemClassAccess().getServiceProvisionPointsAssignment_8_5()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3606:1: ( rule__SubSystemClass__ServiceProvisionPointsAssignment_8_5 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3606:2: rule__SubSystemClass__ServiceProvisionPointsAssignment_8_5
+                    // InternalRoom.g:3608:1: ( rule__SubSystemClass__ServiceProvisionPointsAssignment_8_5 )
+                    // InternalRoom.g:3608:2: rule__SubSystemClass__ServiceProvisionPointsAssignment_8_5
                     {
-                    pushFollow(FOLLOW_rule__SubSystemClass__ServiceProvisionPointsAssignment_8_5_in_rule__SubSystemClass__Alternatives_87756);
+                    pushFollow(FOLLOW_2);
                     rule__SubSystemClass__ServiceProvisionPointsAssignment_8_5();
 
                     state._fsp--;
@@ -10562,16 +10562,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 7 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3610:6: ( ( rule__SubSystemClass__RelayPortsAssignment_8_6 ) )
+                    // InternalRoom.g:3612:6: ( ( rule__SubSystemClass__RelayPortsAssignment_8_6 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3610:6: ( ( rule__SubSystemClass__RelayPortsAssignment_8_6 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3611:1: ( rule__SubSystemClass__RelayPortsAssignment_8_6 )
+                    // InternalRoom.g:3612:6: ( ( rule__SubSystemClass__RelayPortsAssignment_8_6 ) )
+                    // InternalRoom.g:3613:1: ( rule__SubSystemClass__RelayPortsAssignment_8_6 )
                     {
                      before(grammarAccess.getSubSystemClassAccess().getRelayPortsAssignment_8_6()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3612:1: ( rule__SubSystemClass__RelayPortsAssignment_8_6 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3612:2: rule__SubSystemClass__RelayPortsAssignment_8_6
+                    // InternalRoom.g:3614:1: ( rule__SubSystemClass__RelayPortsAssignment_8_6 )
+                    // InternalRoom.g:3614:2: rule__SubSystemClass__RelayPortsAssignment_8_6
                     {
-                    pushFollow(FOLLOW_rule__SubSystemClass__RelayPortsAssignment_8_6_in_rule__SubSystemClass__Alternatives_87774);
+                    pushFollow(FOLLOW_2);
                     rule__SubSystemClass__RelayPortsAssignment_8_6();
 
                     state._fsp--;
@@ -10604,13 +10604,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SAPoint__Alternatives"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3621:1: rule__SAPoint__Alternatives : ( ( ruleRefSAPoint ) | ( ruleRelaySAPoint ) );
+    // InternalRoom.g:3623:1: rule__SAPoint__Alternatives : ( ( ruleRefSAPoint ) | ( ruleRelaySAPoint ) );
     public final void rule__SAPoint__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3625:1: ( ( ruleRefSAPoint ) | ( ruleRelaySAPoint ) )
+            // InternalRoom.g:3627:1: ( ( ruleRefSAPoint ) | ( ruleRelaySAPoint ) )
             int alt20=2;
             int LA20_0 = input.LA(1);
 
@@ -10628,13 +10628,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt20) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3626:1: ( ruleRefSAPoint )
+                    // InternalRoom.g:3628:1: ( ruleRefSAPoint )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3626:1: ( ruleRefSAPoint )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3627:1: ruleRefSAPoint
+                    // InternalRoom.g:3628:1: ( ruleRefSAPoint )
+                    // InternalRoom.g:3629:1: ruleRefSAPoint
                     {
                      before(grammarAccess.getSAPointAccess().getRefSAPointParserRuleCall_0()); 
-                    pushFollow(FOLLOW_ruleRefSAPoint_in_rule__SAPoint__Alternatives7807);
+                    pushFollow(FOLLOW_2);
                     ruleRefSAPoint();
 
                     state._fsp--;
@@ -10647,13 +10647,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3632:6: ( ruleRelaySAPoint )
+                    // InternalRoom.g:3634:6: ( ruleRelaySAPoint )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3632:6: ( ruleRelaySAPoint )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3633:1: ruleRelaySAPoint
+                    // InternalRoom.g:3634:6: ( ruleRelaySAPoint )
+                    // InternalRoom.g:3635:1: ruleRelaySAPoint
                     {
                      before(grammarAccess.getSAPointAccess().getRelaySAPointParserRuleCall_1()); 
-                    pushFollow(FOLLOW_ruleRelaySAPoint_in_rule__SAPoint__Alternatives7824);
+                    pushFollow(FOLLOW_2);
                     ruleRelaySAPoint();
 
                     state._fsp--;
@@ -10683,13 +10683,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MULTIPLICITY__Alternatives_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3643:1: rule__MULTIPLICITY__Alternatives_1 : ( ( '*' ) | ( RULE_INT ) );
+    // InternalRoom.g:3645:1: rule__MULTIPLICITY__Alternatives_1 : ( ( '*' ) | ( RULE_INT ) );
     public final void rule__MULTIPLICITY__Alternatives_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3647:1: ( ( '*' ) | ( RULE_INT ) )
+            // InternalRoom.g:3649:1: ( ( '*' ) | ( RULE_INT ) )
             int alt21=2;
             int LA21_0 = input.LA(1);
 
@@ -10707,13 +10707,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt21) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3648:1: ( '*' )
+                    // InternalRoom.g:3650:1: ( '*' )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3648:1: ( '*' )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3649:1: '*'
+                    // InternalRoom.g:3650:1: ( '*' )
+                    // InternalRoom.g:3651:1: '*'
                     {
                      before(grammarAccess.getMULTIPLICITYAccess().getAsteriskKeyword_1_0()); 
-                    match(input,15,FOLLOW_15_in_rule__MULTIPLICITY__Alternatives_17857); 
+                    match(input,15,FOLLOW_2); 
                      after(grammarAccess.getMULTIPLICITYAccess().getAsteriskKeyword_1_0()); 
 
                     }
@@ -10722,13 +10722,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3656:6: ( RULE_INT )
+                    // InternalRoom.g:3658:6: ( RULE_INT )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3656:6: ( RULE_INT )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3657:1: RULE_INT
+                    // InternalRoom.g:3658:6: ( RULE_INT )
+                    // InternalRoom.g:3659:1: RULE_INT
                     {
                      before(grammarAccess.getMULTIPLICITYAccess().getINTTerminalRuleCall_1_1()); 
-                    match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__MULTIPLICITY__Alternatives_17876); 
+                    match(input,RULE_INT,FOLLOW_2); 
                      after(grammarAccess.getMULTIPLICITYAccess().getINTTerminalRuleCall_1_1()); 
 
                     }
@@ -10754,13 +10754,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AnnotationTargetType__Alternatives"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3667:1: rule__AnnotationTargetType__Alternatives : ( ( 'DataClass' ) | ( 'ActorClass' ) | ( 'ActorBehavior' ) | ( 'ProtocolClass' ) | ( 'CompoundProtocolClass' ) | ( 'SubSystemClass' ) | ( 'LogicalSystem' ) );
+    // InternalRoom.g:3669:1: rule__AnnotationTargetType__Alternatives : ( ( 'DataClass' ) | ( 'ActorClass' ) | ( 'ActorBehavior' ) | ( 'ProtocolClass' ) | ( 'CompoundProtocolClass' ) | ( 'SubSystemClass' ) | ( 'LogicalSystem' ) );
     public final void rule__AnnotationTargetType__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3671:1: ( ( 'DataClass' ) | ( 'ActorClass' ) | ( 'ActorBehavior' ) | ( 'ProtocolClass' ) | ( 'CompoundProtocolClass' ) | ( 'SubSystemClass' ) | ( 'LogicalSystem' ) )
+            // InternalRoom.g:3673:1: ( ( 'DataClass' ) | ( 'ActorClass' ) | ( 'ActorBehavior' ) | ( 'ProtocolClass' ) | ( 'CompoundProtocolClass' ) | ( 'SubSystemClass' ) | ( 'LogicalSystem' ) )
             int alt22=7;
             switch ( input.LA(1) ) {
             case 16:
@@ -10807,13 +10807,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
             switch (alt22) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3672:1: ( 'DataClass' )
+                    // InternalRoom.g:3674:1: ( 'DataClass' )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3672:1: ( 'DataClass' )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3673:1: 'DataClass'
+                    // InternalRoom.g:3674:1: ( 'DataClass' )
+                    // InternalRoom.g:3675:1: 'DataClass'
                     {
                      before(grammarAccess.getAnnotationTargetTypeAccess().getDataClassKeyword_0()); 
-                    match(input,16,FOLLOW_16_in_rule__AnnotationTargetType__Alternatives7909); 
+                    match(input,16,FOLLOW_2); 
                      after(grammarAccess.getAnnotationTargetTypeAccess().getDataClassKeyword_0()); 
 
                     }
@@ -10822,13 +10822,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3680:6: ( 'ActorClass' )
+                    // InternalRoom.g:3682:6: ( 'ActorClass' )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3680:6: ( 'ActorClass' )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3681:1: 'ActorClass'
+                    // InternalRoom.g:3682:6: ( 'ActorClass' )
+                    // InternalRoom.g:3683:1: 'ActorClass'
                     {
                      before(grammarAccess.getAnnotationTargetTypeAccess().getActorClassKeyword_1()); 
-                    match(input,17,FOLLOW_17_in_rule__AnnotationTargetType__Alternatives7929); 
+                    match(input,17,FOLLOW_2); 
                      after(grammarAccess.getAnnotationTargetTypeAccess().getActorClassKeyword_1()); 
 
                     }
@@ -10837,13 +10837,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3688:6: ( 'ActorBehavior' )
+                    // InternalRoom.g:3690:6: ( 'ActorBehavior' )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3688:6: ( 'ActorBehavior' )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3689:1: 'ActorBehavior'
+                    // InternalRoom.g:3690:6: ( 'ActorBehavior' )
+                    // InternalRoom.g:3691:1: 'ActorBehavior'
                     {
                      before(grammarAccess.getAnnotationTargetTypeAccess().getActorBehaviorKeyword_2()); 
-                    match(input,18,FOLLOW_18_in_rule__AnnotationTargetType__Alternatives7949); 
+                    match(input,18,FOLLOW_2); 
                      after(grammarAccess.getAnnotationTargetTypeAccess().getActorBehaviorKeyword_2()); 
 
                     }
@@ -10852,13 +10852,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 4 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3696:6: ( 'ProtocolClass' )
+                    // InternalRoom.g:3698:6: ( 'ProtocolClass' )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3696:6: ( 'ProtocolClass' )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3697:1: 'ProtocolClass'
+                    // InternalRoom.g:3698:6: ( 'ProtocolClass' )
+                    // InternalRoom.g:3699:1: 'ProtocolClass'
                     {
                      before(grammarAccess.getAnnotationTargetTypeAccess().getProtocolClassKeyword_3()); 
-                    match(input,19,FOLLOW_19_in_rule__AnnotationTargetType__Alternatives7969); 
+                    match(input,19,FOLLOW_2); 
                      after(grammarAccess.getAnnotationTargetTypeAccess().getProtocolClassKeyword_3()); 
 
                     }
@@ -10867,13 +10867,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 5 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3704:6: ( 'CompoundProtocolClass' )
+                    // InternalRoom.g:3706:6: ( 'CompoundProtocolClass' )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3704:6: ( 'CompoundProtocolClass' )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3705:1: 'CompoundProtocolClass'
+                    // InternalRoom.g:3706:6: ( 'CompoundProtocolClass' )
+                    // InternalRoom.g:3707:1: 'CompoundProtocolClass'
                     {
                      before(grammarAccess.getAnnotationTargetTypeAccess().getCompoundProtocolClassKeyword_4()); 
-                    match(input,20,FOLLOW_20_in_rule__AnnotationTargetType__Alternatives7989); 
+                    match(input,20,FOLLOW_2); 
                      after(grammarAccess.getAnnotationTargetTypeAccess().getCompoundProtocolClassKeyword_4()); 
 
                     }
@@ -10882,13 +10882,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 6 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3712:6: ( 'SubSystemClass' )
+                    // InternalRoom.g:3714:6: ( 'SubSystemClass' )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3712:6: ( 'SubSystemClass' )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3713:1: 'SubSystemClass'
+                    // InternalRoom.g:3714:6: ( 'SubSystemClass' )
+                    // InternalRoom.g:3715:1: 'SubSystemClass'
                     {
                      before(grammarAccess.getAnnotationTargetTypeAccess().getSubSystemClassKeyword_5()); 
-                    match(input,21,FOLLOW_21_in_rule__AnnotationTargetType__Alternatives8009); 
+                    match(input,21,FOLLOW_2); 
                      after(grammarAccess.getAnnotationTargetTypeAccess().getSubSystemClassKeyword_5()); 
 
                     }
@@ -10897,13 +10897,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 7 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3720:6: ( 'LogicalSystem' )
+                    // InternalRoom.g:3722:6: ( 'LogicalSystem' )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3720:6: ( 'LogicalSystem' )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3721:1: 'LogicalSystem'
+                    // InternalRoom.g:3722:6: ( 'LogicalSystem' )
+                    // InternalRoom.g:3723:1: 'LogicalSystem'
                     {
                      before(grammarAccess.getAnnotationTargetTypeAccess().getLogicalSystemKeyword_6()); 
-                    match(input,22,FOLLOW_22_in_rule__AnnotationTargetType__Alternatives8029); 
+                    match(input,22,FOLLOW_2); 
                      after(grammarAccess.getAnnotationTargetTypeAccess().getLogicalSystemKeyword_6()); 
 
                     }
@@ -10929,13 +10929,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateGraphNode__Alternatives"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3733:1: rule__StateGraphNode__Alternatives : ( ( ruleState ) | ( ruleChoicePoint ) | ( ruleTrPoint ) );
+    // InternalRoom.g:3735:1: rule__StateGraphNode__Alternatives : ( ( ruleState ) | ( ruleChoicePoint ) | ( ruleTrPoint ) );
     public final void rule__StateGraphNode__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3737:1: ( ( ruleState ) | ( ruleChoicePoint ) | ( ruleTrPoint ) )
+            // InternalRoom.g:3739:1: ( ( ruleState ) | ( ruleChoicePoint ) | ( ruleTrPoint ) )
             int alt23=3;
             switch ( input.LA(1) ) {
             case 94:
@@ -10966,13 +10966,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
             switch (alt23) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3738:1: ( ruleState )
+                    // InternalRoom.g:3740:1: ( ruleState )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3738:1: ( ruleState )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3739:1: ruleState
+                    // InternalRoom.g:3740:1: ( ruleState )
+                    // InternalRoom.g:3741:1: ruleState
                     {
                      before(grammarAccess.getStateGraphNodeAccess().getStateParserRuleCall_0()); 
-                    pushFollow(FOLLOW_ruleState_in_rule__StateGraphNode__Alternatives8063);
+                    pushFollow(FOLLOW_2);
                     ruleState();
 
                     state._fsp--;
@@ -10985,13 +10985,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3744:6: ( ruleChoicePoint )
+                    // InternalRoom.g:3746:6: ( ruleChoicePoint )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3744:6: ( ruleChoicePoint )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3745:1: ruleChoicePoint
+                    // InternalRoom.g:3746:6: ( ruleChoicePoint )
+                    // InternalRoom.g:3747:1: ruleChoicePoint
                     {
                      before(grammarAccess.getStateGraphNodeAccess().getChoicePointParserRuleCall_1()); 
-                    pushFollow(FOLLOW_ruleChoicePoint_in_rule__StateGraphNode__Alternatives8080);
+                    pushFollow(FOLLOW_2);
                     ruleChoicePoint();
 
                     state._fsp--;
@@ -11004,13 +11004,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3750:6: ( ruleTrPoint )
+                    // InternalRoom.g:3752:6: ( ruleTrPoint )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3750:6: ( ruleTrPoint )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3751:1: ruleTrPoint
+                    // InternalRoom.g:3752:6: ( ruleTrPoint )
+                    // InternalRoom.g:3753:1: ruleTrPoint
                     {
                      before(grammarAccess.getStateGraphNodeAccess().getTrPointParserRuleCall_2()); 
-                    pushFollow(FOLLOW_ruleTrPoint_in_rule__StateGraphNode__Alternatives8097);
+                    pushFollow(FOLLOW_2);
                     ruleTrPoint();
 
                     state._fsp--;
@@ -11040,13 +11040,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateGraph__Alternatives_2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3762:1: rule__StateGraph__Alternatives_2 : ( ( ( rule__StateGraph__StatesAssignment_2_0 ) ) | ( ( rule__StateGraph__TrPointsAssignment_2_1 ) ) | ( ( rule__StateGraph__ChPointsAssignment_2_2 ) ) | ( ( rule__StateGraph__TransitionsAssignment_2_3 ) ) | ( ( rule__StateGraph__RefinedTransitionsAssignment_2_4 ) ) );
+    // InternalRoom.g:3764:1: rule__StateGraph__Alternatives_2 : ( ( ( rule__StateGraph__StatesAssignment_2_0 ) ) | ( ( rule__StateGraph__TrPointsAssignment_2_1 ) ) | ( ( rule__StateGraph__ChPointsAssignment_2_2 ) ) | ( ( rule__StateGraph__TransitionsAssignment_2_3 ) ) | ( ( rule__StateGraph__RefinedTransitionsAssignment_2_4 ) ) );
     public final void rule__StateGraph__Alternatives_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3766:1: ( ( ( rule__StateGraph__StatesAssignment_2_0 ) ) | ( ( rule__StateGraph__TrPointsAssignment_2_1 ) ) | ( ( rule__StateGraph__ChPointsAssignment_2_2 ) ) | ( ( rule__StateGraph__TransitionsAssignment_2_3 ) ) | ( ( rule__StateGraph__RefinedTransitionsAssignment_2_4 ) ) )
+            // InternalRoom.g:3768:1: ( ( ( rule__StateGraph__StatesAssignment_2_0 ) ) | ( ( rule__StateGraph__TrPointsAssignment_2_1 ) ) | ( ( rule__StateGraph__ChPointsAssignment_2_2 ) ) | ( ( rule__StateGraph__TransitionsAssignment_2_3 ) ) | ( ( rule__StateGraph__RefinedTransitionsAssignment_2_4 ) ) )
             int alt24=5;
             switch ( input.LA(1) ) {
             case 94:
@@ -11087,16 +11087,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
             switch (alt24) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3767:1: ( ( rule__StateGraph__StatesAssignment_2_0 ) )
+                    // InternalRoom.g:3769:1: ( ( rule__StateGraph__StatesAssignment_2_0 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3767:1: ( ( rule__StateGraph__StatesAssignment_2_0 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3768:1: ( rule__StateGraph__StatesAssignment_2_0 )
+                    // InternalRoom.g:3769:1: ( ( rule__StateGraph__StatesAssignment_2_0 ) )
+                    // InternalRoom.g:3770:1: ( rule__StateGraph__StatesAssignment_2_0 )
                     {
                      before(grammarAccess.getStateGraphAccess().getStatesAssignment_2_0()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3769:1: ( rule__StateGraph__StatesAssignment_2_0 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3769:2: rule__StateGraph__StatesAssignment_2_0
+                    // InternalRoom.g:3771:1: ( rule__StateGraph__StatesAssignment_2_0 )
+                    // InternalRoom.g:3771:2: rule__StateGraph__StatesAssignment_2_0
                     {
-                    pushFollow(FOLLOW_rule__StateGraph__StatesAssignment_2_0_in_rule__StateGraph__Alternatives_28130);
+                    pushFollow(FOLLOW_2);
                     rule__StateGraph__StatesAssignment_2_0();
 
                     state._fsp--;
@@ -11112,16 +11112,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3773:6: ( ( rule__StateGraph__TrPointsAssignment_2_1 ) )
+                    // InternalRoom.g:3775:6: ( ( rule__StateGraph__TrPointsAssignment_2_1 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3773:6: ( ( rule__StateGraph__TrPointsAssignment_2_1 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3774:1: ( rule__StateGraph__TrPointsAssignment_2_1 )
+                    // InternalRoom.g:3775:6: ( ( rule__StateGraph__TrPointsAssignment_2_1 ) )
+                    // InternalRoom.g:3776:1: ( rule__StateGraph__TrPointsAssignment_2_1 )
                     {
                      before(grammarAccess.getStateGraphAccess().getTrPointsAssignment_2_1()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3775:1: ( rule__StateGraph__TrPointsAssignment_2_1 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3775:2: rule__StateGraph__TrPointsAssignment_2_1
+                    // InternalRoom.g:3777:1: ( rule__StateGraph__TrPointsAssignment_2_1 )
+                    // InternalRoom.g:3777:2: rule__StateGraph__TrPointsAssignment_2_1
                     {
-                    pushFollow(FOLLOW_rule__StateGraph__TrPointsAssignment_2_1_in_rule__StateGraph__Alternatives_28148);
+                    pushFollow(FOLLOW_2);
                     rule__StateGraph__TrPointsAssignment_2_1();
 
                     state._fsp--;
@@ -11137,16 +11137,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3779:6: ( ( rule__StateGraph__ChPointsAssignment_2_2 ) )
+                    // InternalRoom.g:3781:6: ( ( rule__StateGraph__ChPointsAssignment_2_2 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3779:6: ( ( rule__StateGraph__ChPointsAssignment_2_2 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3780:1: ( rule__StateGraph__ChPointsAssignment_2_2 )
+                    // InternalRoom.g:3781:6: ( ( rule__StateGraph__ChPointsAssignment_2_2 ) )
+                    // InternalRoom.g:3782:1: ( rule__StateGraph__ChPointsAssignment_2_2 )
                     {
                      before(grammarAccess.getStateGraphAccess().getChPointsAssignment_2_2()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3781:1: ( rule__StateGraph__ChPointsAssignment_2_2 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3781:2: rule__StateGraph__ChPointsAssignment_2_2
+                    // InternalRoom.g:3783:1: ( rule__StateGraph__ChPointsAssignment_2_2 )
+                    // InternalRoom.g:3783:2: rule__StateGraph__ChPointsAssignment_2_2
                     {
-                    pushFollow(FOLLOW_rule__StateGraph__ChPointsAssignment_2_2_in_rule__StateGraph__Alternatives_28166);
+                    pushFollow(FOLLOW_2);
                     rule__StateGraph__ChPointsAssignment_2_2();
 
                     state._fsp--;
@@ -11162,16 +11162,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 4 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3785:6: ( ( rule__StateGraph__TransitionsAssignment_2_3 ) )
+                    // InternalRoom.g:3787:6: ( ( rule__StateGraph__TransitionsAssignment_2_3 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3785:6: ( ( rule__StateGraph__TransitionsAssignment_2_3 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3786:1: ( rule__StateGraph__TransitionsAssignment_2_3 )
+                    // InternalRoom.g:3787:6: ( ( rule__StateGraph__TransitionsAssignment_2_3 ) )
+                    // InternalRoom.g:3788:1: ( rule__StateGraph__TransitionsAssignment_2_3 )
                     {
                      before(grammarAccess.getStateGraphAccess().getTransitionsAssignment_2_3()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3787:1: ( rule__StateGraph__TransitionsAssignment_2_3 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3787:2: rule__StateGraph__TransitionsAssignment_2_3
+                    // InternalRoom.g:3789:1: ( rule__StateGraph__TransitionsAssignment_2_3 )
+                    // InternalRoom.g:3789:2: rule__StateGraph__TransitionsAssignment_2_3
                     {
-                    pushFollow(FOLLOW_rule__StateGraph__TransitionsAssignment_2_3_in_rule__StateGraph__Alternatives_28184);
+                    pushFollow(FOLLOW_2);
                     rule__StateGraph__TransitionsAssignment_2_3();
 
                     state._fsp--;
@@ -11187,16 +11187,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 5 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3791:6: ( ( rule__StateGraph__RefinedTransitionsAssignment_2_4 ) )
+                    // InternalRoom.g:3793:6: ( ( rule__StateGraph__RefinedTransitionsAssignment_2_4 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3791:6: ( ( rule__StateGraph__RefinedTransitionsAssignment_2_4 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3792:1: ( rule__StateGraph__RefinedTransitionsAssignment_2_4 )
+                    // InternalRoom.g:3793:6: ( ( rule__StateGraph__RefinedTransitionsAssignment_2_4 ) )
+                    // InternalRoom.g:3794:1: ( rule__StateGraph__RefinedTransitionsAssignment_2_4 )
                     {
                      before(grammarAccess.getStateGraphAccess().getRefinedTransitionsAssignment_2_4()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3793:1: ( rule__StateGraph__RefinedTransitionsAssignment_2_4 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3793:2: rule__StateGraph__RefinedTransitionsAssignment_2_4
+                    // InternalRoom.g:3795:1: ( rule__StateGraph__RefinedTransitionsAssignment_2_4 )
+                    // InternalRoom.g:3795:2: rule__StateGraph__RefinedTransitionsAssignment_2_4
                     {
-                    pushFollow(FOLLOW_rule__StateGraph__RefinedTransitionsAssignment_2_4_in_rule__StateGraph__Alternatives_28202);
+                    pushFollow(FOLLOW_2);
                     rule__StateGraph__RefinedTransitionsAssignment_2_4();
 
                     state._fsp--;
@@ -11229,13 +11229,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateMachine__Alternatives_3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3802:1: rule__StateMachine__Alternatives_3 : ( ( ( rule__StateMachine__StatesAssignment_3_0 ) ) | ( ( rule__StateMachine__TrPointsAssignment_3_1 ) ) | ( ( rule__StateMachine__ChPointsAssignment_3_2 ) ) | ( ( rule__StateMachine__TransitionsAssignment_3_3 ) ) | ( ( rule__StateMachine__RefinedTransitionsAssignment_3_4 ) ) );
+    // InternalRoom.g:3804:1: rule__StateMachine__Alternatives_3 : ( ( ( rule__StateMachine__StatesAssignment_3_0 ) ) | ( ( rule__StateMachine__TrPointsAssignment_3_1 ) ) | ( ( rule__StateMachine__ChPointsAssignment_3_2 ) ) | ( ( rule__StateMachine__TransitionsAssignment_3_3 ) ) | ( ( rule__StateMachine__RefinedTransitionsAssignment_3_4 ) ) );
     public final void rule__StateMachine__Alternatives_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3806:1: ( ( ( rule__StateMachine__StatesAssignment_3_0 ) ) | ( ( rule__StateMachine__TrPointsAssignment_3_1 ) ) | ( ( rule__StateMachine__ChPointsAssignment_3_2 ) ) | ( ( rule__StateMachine__TransitionsAssignment_3_3 ) ) | ( ( rule__StateMachine__RefinedTransitionsAssignment_3_4 ) ) )
+            // InternalRoom.g:3808:1: ( ( ( rule__StateMachine__StatesAssignment_3_0 ) ) | ( ( rule__StateMachine__TrPointsAssignment_3_1 ) ) | ( ( rule__StateMachine__ChPointsAssignment_3_2 ) ) | ( ( rule__StateMachine__TransitionsAssignment_3_3 ) ) | ( ( rule__StateMachine__RefinedTransitionsAssignment_3_4 ) ) )
             int alt25=5;
             switch ( input.LA(1) ) {
             case 94:
@@ -11276,16 +11276,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
             switch (alt25) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3807:1: ( ( rule__StateMachine__StatesAssignment_3_0 ) )
+                    // InternalRoom.g:3809:1: ( ( rule__StateMachine__StatesAssignment_3_0 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3807:1: ( ( rule__StateMachine__StatesAssignment_3_0 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3808:1: ( rule__StateMachine__StatesAssignment_3_0 )
+                    // InternalRoom.g:3809:1: ( ( rule__StateMachine__StatesAssignment_3_0 ) )
+                    // InternalRoom.g:3810:1: ( rule__StateMachine__StatesAssignment_3_0 )
                     {
                      before(grammarAccess.getStateMachineAccess().getStatesAssignment_3_0()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3809:1: ( rule__StateMachine__StatesAssignment_3_0 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3809:2: rule__StateMachine__StatesAssignment_3_0
+                    // InternalRoom.g:3811:1: ( rule__StateMachine__StatesAssignment_3_0 )
+                    // InternalRoom.g:3811:2: rule__StateMachine__StatesAssignment_3_0
                     {
-                    pushFollow(FOLLOW_rule__StateMachine__StatesAssignment_3_0_in_rule__StateMachine__Alternatives_38235);
+                    pushFollow(FOLLOW_2);
                     rule__StateMachine__StatesAssignment_3_0();
 
                     state._fsp--;
@@ -11301,16 +11301,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3813:6: ( ( rule__StateMachine__TrPointsAssignment_3_1 ) )
+                    // InternalRoom.g:3815:6: ( ( rule__StateMachine__TrPointsAssignment_3_1 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3813:6: ( ( rule__StateMachine__TrPointsAssignment_3_1 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3814:1: ( rule__StateMachine__TrPointsAssignment_3_1 )
+                    // InternalRoom.g:3815:6: ( ( rule__StateMachine__TrPointsAssignment_3_1 ) )
+                    // InternalRoom.g:3816:1: ( rule__StateMachine__TrPointsAssignment_3_1 )
                     {
                      before(grammarAccess.getStateMachineAccess().getTrPointsAssignment_3_1()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3815:1: ( rule__StateMachine__TrPointsAssignment_3_1 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3815:2: rule__StateMachine__TrPointsAssignment_3_1
+                    // InternalRoom.g:3817:1: ( rule__StateMachine__TrPointsAssignment_3_1 )
+                    // InternalRoom.g:3817:2: rule__StateMachine__TrPointsAssignment_3_1
                     {
-                    pushFollow(FOLLOW_rule__StateMachine__TrPointsAssignment_3_1_in_rule__StateMachine__Alternatives_38253);
+                    pushFollow(FOLLOW_2);
                     rule__StateMachine__TrPointsAssignment_3_1();
 
                     state._fsp--;
@@ -11326,16 +11326,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3819:6: ( ( rule__StateMachine__ChPointsAssignment_3_2 ) )
+                    // InternalRoom.g:3821:6: ( ( rule__StateMachine__ChPointsAssignment_3_2 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3819:6: ( ( rule__StateMachine__ChPointsAssignment_3_2 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3820:1: ( rule__StateMachine__ChPointsAssignment_3_2 )
+                    // InternalRoom.g:3821:6: ( ( rule__StateMachine__ChPointsAssignment_3_2 ) )
+                    // InternalRoom.g:3822:1: ( rule__StateMachine__ChPointsAssignment_3_2 )
                     {
                      before(grammarAccess.getStateMachineAccess().getChPointsAssignment_3_2()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3821:1: ( rule__StateMachine__ChPointsAssignment_3_2 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3821:2: rule__StateMachine__ChPointsAssignment_3_2
+                    // InternalRoom.g:3823:1: ( rule__StateMachine__ChPointsAssignment_3_2 )
+                    // InternalRoom.g:3823:2: rule__StateMachine__ChPointsAssignment_3_2
                     {
-                    pushFollow(FOLLOW_rule__StateMachine__ChPointsAssignment_3_2_in_rule__StateMachine__Alternatives_38271);
+                    pushFollow(FOLLOW_2);
                     rule__StateMachine__ChPointsAssignment_3_2();
 
                     state._fsp--;
@@ -11351,16 +11351,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 4 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3825:6: ( ( rule__StateMachine__TransitionsAssignment_3_3 ) )
+                    // InternalRoom.g:3827:6: ( ( rule__StateMachine__TransitionsAssignment_3_3 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3825:6: ( ( rule__StateMachine__TransitionsAssignment_3_3 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3826:1: ( rule__StateMachine__TransitionsAssignment_3_3 )
+                    // InternalRoom.g:3827:6: ( ( rule__StateMachine__TransitionsAssignment_3_3 ) )
+                    // InternalRoom.g:3828:1: ( rule__StateMachine__TransitionsAssignment_3_3 )
                     {
                      before(grammarAccess.getStateMachineAccess().getTransitionsAssignment_3_3()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3827:1: ( rule__StateMachine__TransitionsAssignment_3_3 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3827:2: rule__StateMachine__TransitionsAssignment_3_3
+                    // InternalRoom.g:3829:1: ( rule__StateMachine__TransitionsAssignment_3_3 )
+                    // InternalRoom.g:3829:2: rule__StateMachine__TransitionsAssignment_3_3
                     {
-                    pushFollow(FOLLOW_rule__StateMachine__TransitionsAssignment_3_3_in_rule__StateMachine__Alternatives_38289);
+                    pushFollow(FOLLOW_2);
                     rule__StateMachine__TransitionsAssignment_3_3();
 
                     state._fsp--;
@@ -11376,16 +11376,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 5 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3831:6: ( ( rule__StateMachine__RefinedTransitionsAssignment_3_4 ) )
+                    // InternalRoom.g:3833:6: ( ( rule__StateMachine__RefinedTransitionsAssignment_3_4 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3831:6: ( ( rule__StateMachine__RefinedTransitionsAssignment_3_4 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3832:1: ( rule__StateMachine__RefinedTransitionsAssignment_3_4 )
+                    // InternalRoom.g:3833:6: ( ( rule__StateMachine__RefinedTransitionsAssignment_3_4 ) )
+                    // InternalRoom.g:3834:1: ( rule__StateMachine__RefinedTransitionsAssignment_3_4 )
                     {
                      before(grammarAccess.getStateMachineAccess().getRefinedTransitionsAssignment_3_4()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3833:1: ( rule__StateMachine__RefinedTransitionsAssignment_3_4 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3833:2: rule__StateMachine__RefinedTransitionsAssignment_3_4
+                    // InternalRoom.g:3835:1: ( rule__StateMachine__RefinedTransitionsAssignment_3_4 )
+                    // InternalRoom.g:3835:2: rule__StateMachine__RefinedTransitionsAssignment_3_4
                     {
-                    pushFollow(FOLLOW_rule__StateMachine__RefinedTransitionsAssignment_3_4_in_rule__StateMachine__Alternatives_38307);
+                    pushFollow(FOLLOW_2);
                     rule__StateMachine__RefinedTransitionsAssignment_3_4();
 
                     state._fsp--;
@@ -11418,13 +11418,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__State__Alternatives"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3842:1: rule__State__Alternatives : ( ( ruleSimpleState ) | ( ruleRefinedState ) );
+    // InternalRoom.g:3844:1: rule__State__Alternatives : ( ( ruleSimpleState ) | ( ruleRefinedState ) );
     public final void rule__State__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3846:1: ( ( ruleSimpleState ) | ( ruleRefinedState ) )
+            // InternalRoom.g:3848:1: ( ( ruleSimpleState ) | ( ruleRefinedState ) )
             int alt26=2;
             int LA26_0 = input.LA(1);
 
@@ -11442,13 +11442,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt26) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3847:1: ( ruleSimpleState )
+                    // InternalRoom.g:3849:1: ( ruleSimpleState )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3847:1: ( ruleSimpleState )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3848:1: ruleSimpleState
+                    // InternalRoom.g:3849:1: ( ruleSimpleState )
+                    // InternalRoom.g:3850:1: ruleSimpleState
                     {
                      before(grammarAccess.getStateAccess().getSimpleStateParserRuleCall_0()); 
-                    pushFollow(FOLLOW_ruleSimpleState_in_rule__State__Alternatives8340);
+                    pushFollow(FOLLOW_2);
                     ruleSimpleState();
 
                     state._fsp--;
@@ -11461,13 +11461,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3853:6: ( ruleRefinedState )
+                    // InternalRoom.g:3855:6: ( ruleRefinedState )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3853:6: ( ruleRefinedState )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3854:1: ruleRefinedState
+                    // InternalRoom.g:3855:6: ( ruleRefinedState )
+                    // InternalRoom.g:3856:1: ruleRefinedState
                     {
                      before(grammarAccess.getStateAccess().getRefinedStateParserRuleCall_1()); 
-                    pushFollow(FOLLOW_ruleRefinedState_in_rule__State__Alternatives8357);
+                    pushFollow(FOLLOW_2);
                     ruleRefinedState();
 
                     state._fsp--;
@@ -11497,13 +11497,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TrPoint__Alternatives"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3864:1: rule__TrPoint__Alternatives : ( ( ruleTransitionPoint ) | ( ruleEntryPoint ) | ( ruleExitPoint ) );
+    // InternalRoom.g:3866:1: rule__TrPoint__Alternatives : ( ( ruleTransitionPoint ) | ( ruleEntryPoint ) | ( ruleExitPoint ) );
     public final void rule__TrPoint__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3868:1: ( ( ruleTransitionPoint ) | ( ruleEntryPoint ) | ( ruleExitPoint ) )
+            // InternalRoom.g:3870:1: ( ( ruleTransitionPoint ) | ( ruleEntryPoint ) | ( ruleExitPoint ) )
             int alt27=3;
             switch ( input.LA(1) ) {
             case 100:
@@ -11531,13 +11531,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
             switch (alt27) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3869:1: ( ruleTransitionPoint )
+                    // InternalRoom.g:3871:1: ( ruleTransitionPoint )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3869:1: ( ruleTransitionPoint )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3870:1: ruleTransitionPoint
+                    // InternalRoom.g:3871:1: ( ruleTransitionPoint )
+                    // InternalRoom.g:3872:1: ruleTransitionPoint
                     {
                      before(grammarAccess.getTrPointAccess().getTransitionPointParserRuleCall_0()); 
-                    pushFollow(FOLLOW_ruleTransitionPoint_in_rule__TrPoint__Alternatives8389);
+                    pushFollow(FOLLOW_2);
                     ruleTransitionPoint();
 
                     state._fsp--;
@@ -11550,13 +11550,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3875:6: ( ruleEntryPoint )
+                    // InternalRoom.g:3877:6: ( ruleEntryPoint )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3875:6: ( ruleEntryPoint )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3876:1: ruleEntryPoint
+                    // InternalRoom.g:3877:6: ( ruleEntryPoint )
+                    // InternalRoom.g:3878:1: ruleEntryPoint
                     {
                      before(grammarAccess.getTrPointAccess().getEntryPointParserRuleCall_1()); 
-                    pushFollow(FOLLOW_ruleEntryPoint_in_rule__TrPoint__Alternatives8406);
+                    pushFollow(FOLLOW_2);
                     ruleEntryPoint();
 
                     state._fsp--;
@@ -11569,13 +11569,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3881:6: ( ruleExitPoint )
+                    // InternalRoom.g:3883:6: ( ruleExitPoint )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3881:6: ( ruleExitPoint )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3882:1: ruleExitPoint
+                    // InternalRoom.g:3883:6: ( ruleExitPoint )
+                    // InternalRoom.g:3884:1: ruleExitPoint
                     {
                      before(grammarAccess.getTrPointAccess().getExitPointParserRuleCall_2()); 
-                    pushFollow(FOLLOW_ruleExitPoint_in_rule__TrPoint__Alternatives8423);
+                    pushFollow(FOLLOW_2);
                     ruleExitPoint();
 
                     state._fsp--;
@@ -11605,13 +11605,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Transition__Alternatives"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3892:1: rule__Transition__Alternatives : ( ( ruleInitialTransition ) | ( ruleNonInitialTransition ) );
+    // InternalRoom.g:3895:1: rule__Transition__Alternatives : ( ( ruleInitialTransition ) | ( ruleNonInitialTransition ) );
     public final void rule__Transition__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3896:1: ( ( ruleInitialTransition ) | ( ruleNonInitialTransition ) )
+            // InternalRoom.g:3899:1: ( ( ruleInitialTransition ) | ( ruleNonInitialTransition ) )
             int alt28=2;
             int LA28_0 = input.LA(1);
 
@@ -11624,12 +11624,12 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     if ( (LA28_2==43) ) {
                         int LA28_3 = input.LA(4);
 
-                        if ( (LA28_3==RULE_ID||(LA28_3>=112 && LA28_3<=113)) ) {
-                            alt28=2;
-                        }
-                        else if ( (LA28_3==105) ) {
+                        if ( (LA28_3==105) ) {
                             alt28=1;
                         }
+                        else if ( (LA28_3==RULE_ID||(LA28_3>=112 && LA28_3<=113)) ) {
+                            alt28=2;
+                        }
                         else {
                             NoViableAltException nvae =
                                 new NoViableAltException("", 28, 3, input);
@@ -11647,12 +11647,12 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                 else if ( (LA28_1==43) ) {
                     int LA28_3 = input.LA(3);
 
-                    if ( (LA28_3==RULE_ID||(LA28_3>=112 && LA28_3<=113)) ) {
-                        alt28=2;
-                    }
-                    else if ( (LA28_3==105) ) {
+                    if ( (LA28_3==105) ) {
                         alt28=1;
                     }
+                    else if ( (LA28_3==RULE_ID||(LA28_3>=112 && LA28_3<=113)) ) {
+                        alt28=2;
+                    }
                     else {
                         NoViableAltException nvae =
                             new NoViableAltException("", 28, 3, input);
@@ -11675,13 +11675,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt28) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3897:1: ( ruleInitialTransition )
+                    // InternalRoom.g:3900:1: ( ruleInitialTransition )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3897:1: ( ruleInitialTransition )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3898:1: ruleInitialTransition
+                    // InternalRoom.g:3900:1: ( ruleInitialTransition )
+                    // InternalRoom.g:3901:1: ruleInitialTransition
                     {
                      before(grammarAccess.getTransitionAccess().getInitialTransitionParserRuleCall_0()); 
-                    pushFollow(FOLLOW_ruleInitialTransition_in_rule__Transition__Alternatives8455);
+                    pushFollow(FOLLOW_2);
                     ruleInitialTransition();
 
                     state._fsp--;
@@ -11694,13 +11694,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3903:6: ( ruleNonInitialTransition )
+                    // InternalRoom.g:3906:6: ( ruleNonInitialTransition )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3903:6: ( ruleNonInitialTransition )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3904:1: ruleNonInitialTransition
+                    // InternalRoom.g:3906:6: ( ruleNonInitialTransition )
+                    // InternalRoom.g:3907:1: ruleNonInitialTransition
                     {
                      before(grammarAccess.getTransitionAccess().getNonInitialTransitionParserRuleCall_1()); 
-                    pushFollow(FOLLOW_ruleNonInitialTransition_in_rule__Transition__Alternatives8472);
+                    pushFollow(FOLLOW_2);
                     ruleNonInitialTransition();
 
                     state._fsp--;
@@ -11730,24 +11730,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NonInitialTransition__Alternatives"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3914:1: rule__NonInitialTransition__Alternatives : ( ( ruleTransitionChainStartTransition ) | ( ruleContinuationTransition ) | ( ruleCPBranchTransition ) );
+    // InternalRoom.g:3917:1: rule__NonInitialTransition__Alternatives : ( ( ruleTransitionChainStartTransition ) | ( ruleContinuationTransition ) | ( ruleCPBranchTransition ) );
     public final void rule__NonInitialTransition__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3918:1: ( ( ruleTransitionChainStartTransition ) | ( ruleContinuationTransition ) | ( ruleCPBranchTransition ) )
+            // InternalRoom.g:3921:1: ( ( ruleTransitionChainStartTransition ) | ( ruleContinuationTransition ) | ( ruleCPBranchTransition ) )
             int alt29=3;
             alt29 = dfa29.predict(input);
             switch (alt29) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3919:1: ( ruleTransitionChainStartTransition )
+                    // InternalRoom.g:3922:1: ( ruleTransitionChainStartTransition )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3919:1: ( ruleTransitionChainStartTransition )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3920:1: ruleTransitionChainStartTransition
+                    // InternalRoom.g:3922:1: ( ruleTransitionChainStartTransition )
+                    // InternalRoom.g:3923:1: ruleTransitionChainStartTransition
                     {
                      before(grammarAccess.getNonInitialTransitionAccess().getTransitionChainStartTransitionParserRuleCall_0()); 
-                    pushFollow(FOLLOW_ruleTransitionChainStartTransition_in_rule__NonInitialTransition__Alternatives8504);
+                    pushFollow(FOLLOW_2);
                     ruleTransitionChainStartTransition();
 
                     state._fsp--;
@@ -11760,13 +11760,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3925:6: ( ruleContinuationTransition )
+                    // InternalRoom.g:3928:6: ( ruleContinuationTransition )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3925:6: ( ruleContinuationTransition )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3926:1: ruleContinuationTransition
+                    // InternalRoom.g:3928:6: ( ruleContinuationTransition )
+                    // InternalRoom.g:3929:1: ruleContinuationTransition
                     {
                      before(grammarAccess.getNonInitialTransitionAccess().getContinuationTransitionParserRuleCall_1()); 
-                    pushFollow(FOLLOW_ruleContinuationTransition_in_rule__NonInitialTransition__Alternatives8521);
+                    pushFollow(FOLLOW_2);
                     ruleContinuationTransition();
 
                     state._fsp--;
@@ -11779,13 +11779,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3931:6: ( ruleCPBranchTransition )
+                    // InternalRoom.g:3934:6: ( ruleCPBranchTransition )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3931:6: ( ruleCPBranchTransition )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3932:1: ruleCPBranchTransition
+                    // InternalRoom.g:3934:6: ( ruleCPBranchTransition )
+                    // InternalRoom.g:3935:1: ruleCPBranchTransition
                     {
                      before(grammarAccess.getNonInitialTransitionAccess().getCPBranchTransitionParserRuleCall_2()); 
-                    pushFollow(FOLLOW_ruleCPBranchTransition_in_rule__NonInitialTransition__Alternatives8538);
+                    pushFollow(FOLLOW_2);
                     ruleCPBranchTransition();
 
                     state._fsp--;
@@ -11815,24 +11815,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TransitionChainStartTransition__Alternatives"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3942:1: rule__TransitionChainStartTransition__Alternatives : ( ( ruleTriggeredTransition ) | ( ruleGuardedTransition ) );
+    // InternalRoom.g:3945:1: rule__TransitionChainStartTransition__Alternatives : ( ( ruleTriggeredTransition ) | ( ruleGuardedTransition ) );
     public final void rule__TransitionChainStartTransition__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3946:1: ( ( ruleTriggeredTransition ) | ( ruleGuardedTransition ) )
+            // InternalRoom.g:3949:1: ( ( ruleTriggeredTransition ) | ( ruleGuardedTransition ) )
             int alt30=2;
             alt30 = dfa30.predict(input);
             switch (alt30) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3947:1: ( ruleTriggeredTransition )
+                    // InternalRoom.g:3950:1: ( ruleTriggeredTransition )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3947:1: ( ruleTriggeredTransition )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3948:1: ruleTriggeredTransition
+                    // InternalRoom.g:3950:1: ( ruleTriggeredTransition )
+                    // InternalRoom.g:3951:1: ruleTriggeredTransition
                     {
                      before(grammarAccess.getTransitionChainStartTransitionAccess().getTriggeredTransitionParserRuleCall_0()); 
-                    pushFollow(FOLLOW_ruleTriggeredTransition_in_rule__TransitionChainStartTransition__Alternatives8570);
+                    pushFollow(FOLLOW_2);
                     ruleTriggeredTransition();
 
                     state._fsp--;
@@ -11845,13 +11845,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3953:6: ( ruleGuardedTransition )
+                    // InternalRoom.g:3956:6: ( ruleGuardedTransition )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3953:6: ( ruleGuardedTransition )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3954:1: ruleGuardedTransition
+                    // InternalRoom.g:3956:6: ( ruleGuardedTransition )
+                    // InternalRoom.g:3957:1: ruleGuardedTransition
                     {
                      before(grammarAccess.getTransitionChainStartTransitionAccess().getGuardedTransitionParserRuleCall_1()); 
-                    pushFollow(FOLLOW_ruleGuardedTransition_in_rule__TransitionChainStartTransition__Alternatives8587);
+                    pushFollow(FOLLOW_2);
                     ruleGuardedTransition();
 
                     state._fsp--;
@@ -11881,25 +11881,25 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TransitionTerminal__Alternatives"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3964:1: rule__TransitionTerminal__Alternatives : ( ( ruleStateTerminal ) | ( ruleTrPointTerminal ) | ( ruleSubStateTrPointTerminal ) | ( ruleChoicepointTerminal ) );
+    // InternalRoom.g:3967:1: rule__TransitionTerminal__Alternatives : ( ( ruleStateTerminal ) | ( ruleTrPointTerminal ) | ( ruleSubStateTrPointTerminal ) | ( ruleChoicepointTerminal ) );
     public final void rule__TransitionTerminal__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3968:1: ( ( ruleStateTerminal ) | ( ruleTrPointTerminal ) | ( ruleSubStateTrPointTerminal ) | ( ruleChoicepointTerminal ) )
+            // InternalRoom.g:3971:1: ( ( ruleStateTerminal ) | ( ruleTrPointTerminal ) | ( ruleSubStateTrPointTerminal ) | ( ruleChoicepointTerminal ) )
             int alt31=4;
             switch ( input.LA(1) ) {
             case RULE_ID:
                 {
                 int LA31_1 = input.LA(2);
 
-                if ( (LA31_1==EOF||(LA31_1>=41 && LA31_1<=42)||LA31_1==45||LA31_1==59||LA31_1==94||(LA31_1>=99 && LA31_1<=104)||LA31_1==111||LA31_1==130) ) {
-                    alt31=1;
-                }
-                else if ( (LA31_1==50) ) {
+                if ( (LA31_1==50) ) {
                     alt31=3;
                 }
+                else if ( (LA31_1==EOF||(LA31_1>=41 && LA31_1<=42)||LA31_1==45||LA31_1==59||LA31_1==94||(LA31_1>=99 && LA31_1<=104)||LA31_1==111||LA31_1==130) ) {
+                    alt31=1;
+                }
                 else {
                     NoViableAltException nvae =
                         new NoViableAltException("", 31, 1, input);
@@ -11927,13 +11927,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
             switch (alt31) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3969:1: ( ruleStateTerminal )
+                    // InternalRoom.g:3972:1: ( ruleStateTerminal )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3969:1: ( ruleStateTerminal )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3970:1: ruleStateTerminal
+                    // InternalRoom.g:3972:1: ( ruleStateTerminal )
+                    // InternalRoom.g:3973:1: ruleStateTerminal
                     {
                      before(grammarAccess.getTransitionTerminalAccess().getStateTerminalParserRuleCall_0()); 
-                    pushFollow(FOLLOW_ruleStateTerminal_in_rule__TransitionTerminal__Alternatives8619);
+                    pushFollow(FOLLOW_2);
                     ruleStateTerminal();
 
                     state._fsp--;
@@ -11946,13 +11946,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3975:6: ( ruleTrPointTerminal )
+                    // InternalRoom.g:3978:6: ( ruleTrPointTerminal )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3975:6: ( ruleTrPointTerminal )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3976:1: ruleTrPointTerminal
+                    // InternalRoom.g:3978:6: ( ruleTrPointTerminal )
+                    // InternalRoom.g:3979:1: ruleTrPointTerminal
                     {
                      before(grammarAccess.getTransitionTerminalAccess().getTrPointTerminalParserRuleCall_1()); 
-                    pushFollow(FOLLOW_ruleTrPointTerminal_in_rule__TransitionTerminal__Alternatives8636);
+                    pushFollow(FOLLOW_2);
                     ruleTrPointTerminal();
 
                     state._fsp--;
@@ -11965,13 +11965,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3981:6: ( ruleSubStateTrPointTerminal )
+                    // InternalRoom.g:3984:6: ( ruleSubStateTrPointTerminal )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3981:6: ( ruleSubStateTrPointTerminal )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3982:1: ruleSubStateTrPointTerminal
+                    // InternalRoom.g:3984:6: ( ruleSubStateTrPointTerminal )
+                    // InternalRoom.g:3985:1: ruleSubStateTrPointTerminal
                     {
                      before(grammarAccess.getTransitionTerminalAccess().getSubStateTrPointTerminalParserRuleCall_2()); 
-                    pushFollow(FOLLOW_ruleSubStateTrPointTerminal_in_rule__TransitionTerminal__Alternatives8653);
+                    pushFollow(FOLLOW_2);
                     ruleSubStateTrPointTerminal();
 
                     state._fsp--;
@@ -11984,13 +11984,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 4 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3987:6: ( ruleChoicepointTerminal )
+                    // InternalRoom.g:3990:6: ( ruleChoicepointTerminal )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3987:6: ( ruleChoicepointTerminal )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3988:1: ruleChoicepointTerminal
+                    // InternalRoom.g:3990:6: ( ruleChoicepointTerminal )
+                    // InternalRoom.g:3991:1: ruleChoicepointTerminal
                     {
                      before(grammarAccess.getTransitionTerminalAccess().getChoicepointTerminalParserRuleCall_3()); 
-                    pushFollow(FOLLOW_ruleChoicepointTerminal_in_rule__TransitionTerminal__Alternatives8670);
+                    pushFollow(FOLLOW_2);
                     ruleChoicepointTerminal();
 
                     state._fsp--;
@@ -12020,13 +12020,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SemanticsRule__Alternatives"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:3998:1: rule__SemanticsRule__Alternatives : ( ( ruleInSemanticsRule ) | ( ruleOutSemanticsRule ) );
+    // InternalRoom.g:4001:1: rule__SemanticsRule__Alternatives : ( ( ruleInSemanticsRule ) | ( ruleOutSemanticsRule ) );
     public final void rule__SemanticsRule__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4002:1: ( ( ruleInSemanticsRule ) | ( ruleOutSemanticsRule ) )
+            // InternalRoom.g:4005:1: ( ( ruleInSemanticsRule ) | ( ruleOutSemanticsRule ) )
             int alt32=2;
             int LA32_0 = input.LA(1);
 
@@ -12044,13 +12044,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt32) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4003:1: ( ruleInSemanticsRule )
+                    // InternalRoom.g:4006:1: ( ruleInSemanticsRule )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4003:1: ( ruleInSemanticsRule )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4004:1: ruleInSemanticsRule
+                    // InternalRoom.g:4006:1: ( ruleInSemanticsRule )
+                    // InternalRoom.g:4007:1: ruleInSemanticsRule
                     {
                      before(grammarAccess.getSemanticsRuleAccess().getInSemanticsRuleParserRuleCall_0()); 
-                    pushFollow(FOLLOW_ruleInSemanticsRule_in_rule__SemanticsRule__Alternatives8702);
+                    pushFollow(FOLLOW_2);
                     ruleInSemanticsRule();
 
                     state._fsp--;
@@ -12063,13 +12063,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4009:6: ( ruleOutSemanticsRule )
+                    // InternalRoom.g:4012:6: ( ruleOutSemanticsRule )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4009:6: ( ruleOutSemanticsRule )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4010:1: ruleOutSemanticsRule
+                    // InternalRoom.g:4012:6: ( ruleOutSemanticsRule )
+                    // InternalRoom.g:4013:1: ruleOutSemanticsRule
                     {
                      before(grammarAccess.getSemanticsRuleAccess().getOutSemanticsRuleParserRuleCall_1()); 
-                    pushFollow(FOLLOW_ruleOutSemanticsRule_in_rule__SemanticsRule__Alternatives8719);
+                    pushFollow(FOLLOW_2);
                     ruleOutSemanticsRule();
 
                     state._fsp--;
@@ -12099,13 +12099,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__Alternatives_3_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4020:1: rule__InSemanticsRule__Alternatives_3_1 : ( ( ( rule__InSemanticsRule__FollowUpsAssignment_3_1_0 ) ) | ( ( rule__InSemanticsRule__Group_3_1_1__0 ) ) );
+    // InternalRoom.g:4023:1: rule__InSemanticsRule__Alternatives_3_1 : ( ( ( rule__InSemanticsRule__FollowUpsAssignment_3_1_0 ) ) | ( ( rule__InSemanticsRule__Group_3_1_1__0 ) ) );
     public final void rule__InSemanticsRule__Alternatives_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4024:1: ( ( ( rule__InSemanticsRule__FollowUpsAssignment_3_1_0 ) ) | ( ( rule__InSemanticsRule__Group_3_1_1__0 ) ) )
+            // InternalRoom.g:4027:1: ( ( ( rule__InSemanticsRule__FollowUpsAssignment_3_1_0 ) ) | ( ( rule__InSemanticsRule__Group_3_1_1__0 ) ) )
             int alt33=2;
             int LA33_0 = input.LA(1);
 
@@ -12123,16 +12123,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt33) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4025:1: ( ( rule__InSemanticsRule__FollowUpsAssignment_3_1_0 ) )
+                    // InternalRoom.g:4028:1: ( ( rule__InSemanticsRule__FollowUpsAssignment_3_1_0 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4025:1: ( ( rule__InSemanticsRule__FollowUpsAssignment_3_1_0 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4026:1: ( rule__InSemanticsRule__FollowUpsAssignment_3_1_0 )
+                    // InternalRoom.g:4028:1: ( ( rule__InSemanticsRule__FollowUpsAssignment_3_1_0 ) )
+                    // InternalRoom.g:4029:1: ( rule__InSemanticsRule__FollowUpsAssignment_3_1_0 )
                     {
                      before(grammarAccess.getInSemanticsRuleAccess().getFollowUpsAssignment_3_1_0()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4027:1: ( rule__InSemanticsRule__FollowUpsAssignment_3_1_0 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4027:2: rule__InSemanticsRule__FollowUpsAssignment_3_1_0
+                    // InternalRoom.g:4030:1: ( rule__InSemanticsRule__FollowUpsAssignment_3_1_0 )
+                    // InternalRoom.g:4030:2: rule__InSemanticsRule__FollowUpsAssignment_3_1_0
                     {
-                    pushFollow(FOLLOW_rule__InSemanticsRule__FollowUpsAssignment_3_1_0_in_rule__InSemanticsRule__Alternatives_3_18751);
+                    pushFollow(FOLLOW_2);
                     rule__InSemanticsRule__FollowUpsAssignment_3_1_0();
 
                     state._fsp--;
@@ -12148,16 +12148,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4031:6: ( ( rule__InSemanticsRule__Group_3_1_1__0 ) )
+                    // InternalRoom.g:4034:6: ( ( rule__InSemanticsRule__Group_3_1_1__0 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4031:6: ( ( rule__InSemanticsRule__Group_3_1_1__0 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4032:1: ( rule__InSemanticsRule__Group_3_1_1__0 )
+                    // InternalRoom.g:4034:6: ( ( rule__InSemanticsRule__Group_3_1_1__0 ) )
+                    // InternalRoom.g:4035:1: ( rule__InSemanticsRule__Group_3_1_1__0 )
                     {
                      before(grammarAccess.getInSemanticsRuleAccess().getGroup_3_1_1()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4033:1: ( rule__InSemanticsRule__Group_3_1_1__0 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4033:2: rule__InSemanticsRule__Group_3_1_1__0
+                    // InternalRoom.g:4036:1: ( rule__InSemanticsRule__Group_3_1_1__0 )
+                    // InternalRoom.g:4036:2: rule__InSemanticsRule__Group_3_1_1__0
                     {
-                    pushFollow(FOLLOW_rule__InSemanticsRule__Group_3_1_1__0_in_rule__InSemanticsRule__Alternatives_3_18769);
+                    pushFollow(FOLLOW_2);
                     rule__InSemanticsRule__Group_3_1_1__0();
 
                     state._fsp--;
@@ -12190,13 +12190,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__Alternatives_3_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4042:1: rule__OutSemanticsRule__Alternatives_3_1 : ( ( ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_0 ) ) | ( ( rule__OutSemanticsRule__Group_3_1_1__0 ) ) );
+    // InternalRoom.g:4045:1: rule__OutSemanticsRule__Alternatives_3_1 : ( ( ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_0 ) ) | ( ( rule__OutSemanticsRule__Group_3_1_1__0 ) ) );
     public final void rule__OutSemanticsRule__Alternatives_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4046:1: ( ( ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_0 ) ) | ( ( rule__OutSemanticsRule__Group_3_1_1__0 ) ) )
+            // InternalRoom.g:4049:1: ( ( ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_0 ) ) | ( ( rule__OutSemanticsRule__Group_3_1_1__0 ) ) )
             int alt34=2;
             int LA34_0 = input.LA(1);
 
@@ -12214,16 +12214,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt34) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4047:1: ( ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_0 ) )
+                    // InternalRoom.g:4050:1: ( ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_0 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4047:1: ( ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_0 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4048:1: ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_0 )
+                    // InternalRoom.g:4050:1: ( ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_0 ) )
+                    // InternalRoom.g:4051:1: ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_0 )
                     {
                      before(grammarAccess.getOutSemanticsRuleAccess().getFollowUpsAssignment_3_1_0()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4049:1: ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_0 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4049:2: rule__OutSemanticsRule__FollowUpsAssignment_3_1_0
+                    // InternalRoom.g:4052:1: ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_0 )
+                    // InternalRoom.g:4052:2: rule__OutSemanticsRule__FollowUpsAssignment_3_1_0
                     {
-                    pushFollow(FOLLOW_rule__OutSemanticsRule__FollowUpsAssignment_3_1_0_in_rule__OutSemanticsRule__Alternatives_3_18802);
+                    pushFollow(FOLLOW_2);
                     rule__OutSemanticsRule__FollowUpsAssignment_3_1_0();
 
                     state._fsp--;
@@ -12239,16 +12239,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4053:6: ( ( rule__OutSemanticsRule__Group_3_1_1__0 ) )
+                    // InternalRoom.g:4056:6: ( ( rule__OutSemanticsRule__Group_3_1_1__0 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4053:6: ( ( rule__OutSemanticsRule__Group_3_1_1__0 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4054:1: ( rule__OutSemanticsRule__Group_3_1_1__0 )
+                    // InternalRoom.g:4056:6: ( ( rule__OutSemanticsRule__Group_3_1_1__0 ) )
+                    // InternalRoom.g:4057:1: ( rule__OutSemanticsRule__Group_3_1_1__0 )
                     {
                      before(grammarAccess.getOutSemanticsRuleAccess().getGroup_3_1_1()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4055:1: ( rule__OutSemanticsRule__Group_3_1_1__0 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4055:2: rule__OutSemanticsRule__Group_3_1_1__0
+                    // InternalRoom.g:4058:1: ( rule__OutSemanticsRule__Group_3_1_1__0 )
+                    // InternalRoom.g:4058:2: rule__OutSemanticsRule__Group_3_1_1__0
                     {
-                    pushFollow(FOLLOW_rule__OutSemanticsRule__Group_3_1_1__0_in_rule__OutSemanticsRule__Alternatives_3_18820);
+                    pushFollow(FOLLOW_2);
                     rule__OutSemanticsRule__Group_3_1_1__0();
 
                     state._fsp--;
@@ -12281,13 +12281,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AnnotationType__Alternatives_6"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4064:1: rule__AnnotationType__Alternatives_6 : ( ( ( rule__AnnotationType__TargetsAssignment_6_0 ) ) | ( ( rule__AnnotationType__Group_6_1__0 ) ) );
+    // InternalRoom.g:4067:1: rule__AnnotationType__Alternatives_6 : ( ( ( rule__AnnotationType__TargetsAssignment_6_0 ) ) | ( ( rule__AnnotationType__Group_6_1__0 ) ) );
     public final void rule__AnnotationType__Alternatives_6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4068:1: ( ( ( rule__AnnotationType__TargetsAssignment_6_0 ) ) | ( ( rule__AnnotationType__Group_6_1__0 ) ) )
+            // InternalRoom.g:4071:1: ( ( ( rule__AnnotationType__TargetsAssignment_6_0 ) ) | ( ( rule__AnnotationType__Group_6_1__0 ) ) )
             int alt35=2;
             int LA35_0 = input.LA(1);
 
@@ -12305,16 +12305,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt35) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4069:1: ( ( rule__AnnotationType__TargetsAssignment_6_0 ) )
+                    // InternalRoom.g:4072:1: ( ( rule__AnnotationType__TargetsAssignment_6_0 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4069:1: ( ( rule__AnnotationType__TargetsAssignment_6_0 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4070:1: ( rule__AnnotationType__TargetsAssignment_6_0 )
+                    // InternalRoom.g:4072:1: ( ( rule__AnnotationType__TargetsAssignment_6_0 ) )
+                    // InternalRoom.g:4073:1: ( rule__AnnotationType__TargetsAssignment_6_0 )
                     {
                      before(grammarAccess.getAnnotationTypeAccess().getTargetsAssignment_6_0()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4071:1: ( rule__AnnotationType__TargetsAssignment_6_0 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4071:2: rule__AnnotationType__TargetsAssignment_6_0
+                    // InternalRoom.g:4074:1: ( rule__AnnotationType__TargetsAssignment_6_0 )
+                    // InternalRoom.g:4074:2: rule__AnnotationType__TargetsAssignment_6_0
                     {
-                    pushFollow(FOLLOW_rule__AnnotationType__TargetsAssignment_6_0_in_rule__AnnotationType__Alternatives_68853);
+                    pushFollow(FOLLOW_2);
                     rule__AnnotationType__TargetsAssignment_6_0();
 
                     state._fsp--;
@@ -12330,16 +12330,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4075:6: ( ( rule__AnnotationType__Group_6_1__0 ) )
+                    // InternalRoom.g:4078:6: ( ( rule__AnnotationType__Group_6_1__0 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4075:6: ( ( rule__AnnotationType__Group_6_1__0 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4076:1: ( rule__AnnotationType__Group_6_1__0 )
+                    // InternalRoom.g:4078:6: ( ( rule__AnnotationType__Group_6_1__0 ) )
+                    // InternalRoom.g:4079:1: ( rule__AnnotationType__Group_6_1__0 )
                     {
                      before(grammarAccess.getAnnotationTypeAccess().getGroup_6_1()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4077:1: ( rule__AnnotationType__Group_6_1__0 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4077:2: rule__AnnotationType__Group_6_1__0
+                    // InternalRoom.g:4080:1: ( rule__AnnotationType__Group_6_1__0 )
+                    // InternalRoom.g:4080:2: rule__AnnotationType__Group_6_1__0
                     {
-                    pushFollow(FOLLOW_rule__AnnotationType__Group_6_1__0_in_rule__AnnotationType__Alternatives_68871);
+                    pushFollow(FOLLOW_2);
                     rule__AnnotationType__Group_6_1__0();
 
                     state._fsp--;
@@ -12372,13 +12372,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AnnotationAttribute__Alternatives"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4086:1: rule__AnnotationAttribute__Alternatives : ( ( ruleSimpleAnnotationAttribute ) | ( ruleEnumAnnotationAttribute ) );
+    // InternalRoom.g:4089:1: rule__AnnotationAttribute__Alternatives : ( ( ruleSimpleAnnotationAttribute ) | ( ruleEnumAnnotationAttribute ) );
     public final void rule__AnnotationAttribute__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4090:1: ( ( ruleSimpleAnnotationAttribute ) | ( ruleEnumAnnotationAttribute ) )
+            // InternalRoom.g:4093:1: ( ( ruleSimpleAnnotationAttribute ) | ( ruleEnumAnnotationAttribute ) )
             int alt36=2;
             int LA36_0 = input.LA(1);
 
@@ -12482,13 +12482,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt36) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4091:1: ( ruleSimpleAnnotationAttribute )
+                    // InternalRoom.g:4094:1: ( ruleSimpleAnnotationAttribute )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4091:1: ( ruleSimpleAnnotationAttribute )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4092:1: ruleSimpleAnnotationAttribute
+                    // InternalRoom.g:4094:1: ( ruleSimpleAnnotationAttribute )
+                    // InternalRoom.g:4095:1: ruleSimpleAnnotationAttribute
                     {
                      before(grammarAccess.getAnnotationAttributeAccess().getSimpleAnnotationAttributeParserRuleCall_0()); 
-                    pushFollow(FOLLOW_ruleSimpleAnnotationAttribute_in_rule__AnnotationAttribute__Alternatives8904);
+                    pushFollow(FOLLOW_2);
                     ruleSimpleAnnotationAttribute();
 
                     state._fsp--;
@@ -12501,13 +12501,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4097:6: ( ruleEnumAnnotationAttribute )
+                    // InternalRoom.g:4100:6: ( ruleEnumAnnotationAttribute )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4097:6: ( ruleEnumAnnotationAttribute )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4098:1: ruleEnumAnnotationAttribute
+                    // InternalRoom.g:4100:6: ( ruleEnumAnnotationAttribute )
+                    // InternalRoom.g:4101:1: ruleEnumAnnotationAttribute
                     {
                      before(grammarAccess.getAnnotationAttributeAccess().getEnumAnnotationAttributeParserRuleCall_1()); 
-                    pushFollow(FOLLOW_ruleEnumAnnotationAttribute_in_rule__AnnotationAttribute__Alternatives8921);
+                    pushFollow(FOLLOW_2);
                     ruleEnumAnnotationAttribute();
 
                     state._fsp--;
@@ -12537,13 +12537,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Alternatives_0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4108:1: rule__SimpleAnnotationAttribute__Alternatives_0 : ( ( ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 ) ) | ( 'mandatory' ) );
+    // InternalRoom.g:4111:1: rule__SimpleAnnotationAttribute__Alternatives_0 : ( ( ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 ) ) | ( 'mandatory' ) );
     public final void rule__SimpleAnnotationAttribute__Alternatives_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4112:1: ( ( ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 ) ) | ( 'mandatory' ) )
+            // InternalRoom.g:4115:1: ( ( ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 ) ) | ( 'mandatory' ) )
             int alt37=2;
             int LA37_0 = input.LA(1);
 
@@ -12561,16 +12561,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt37) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4113:1: ( ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 ) )
+                    // InternalRoom.g:4116:1: ( ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4113:1: ( ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4114:1: ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 )
+                    // InternalRoom.g:4116:1: ( ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 ) )
+                    // InternalRoom.g:4117:1: ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 )
                     {
                      before(grammarAccess.getSimpleAnnotationAttributeAccess().getOptionalAssignment_0_0()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4115:1: ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4115:2: rule__SimpleAnnotationAttribute__OptionalAssignment_0_0
+                    // InternalRoom.g:4118:1: ( rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 )
+                    // InternalRoom.g:4118:2: rule__SimpleAnnotationAttribute__OptionalAssignment_0_0
                     {
-                    pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__OptionalAssignment_0_0_in_rule__SimpleAnnotationAttribute__Alternatives_08953);
+                    pushFollow(FOLLOW_2);
                     rule__SimpleAnnotationAttribute__OptionalAssignment_0_0();
 
                     state._fsp--;
@@ -12586,13 +12586,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4119:6: ( 'mandatory' )
+                    // InternalRoom.g:4122:6: ( 'mandatory' )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4119:6: ( 'mandatory' )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4120:1: 'mandatory'
+                    // InternalRoom.g:4122:6: ( 'mandatory' )
+                    // InternalRoom.g:4123:1: 'mandatory'
                     {
                      before(grammarAccess.getSimpleAnnotationAttributeAccess().getMandatoryKeyword_0_1()); 
-                    match(input,23,FOLLOW_23_in_rule__SimpleAnnotationAttribute__Alternatives_08972); 
+                    match(input,23,FOLLOW_2); 
                      after(grammarAccess.getSimpleAnnotationAttributeAccess().getMandatoryKeyword_0_1()); 
 
                     }
@@ -12618,13 +12618,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Alternatives_0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4132:1: rule__EnumAnnotationAttribute__Alternatives_0 : ( ( ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 ) ) | ( 'mandatory' ) );
+    // InternalRoom.g:4135:1: rule__EnumAnnotationAttribute__Alternatives_0 : ( ( ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 ) ) | ( 'mandatory' ) );
     public final void rule__EnumAnnotationAttribute__Alternatives_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4136:1: ( ( ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 ) ) | ( 'mandatory' ) )
+            // InternalRoom.g:4139:1: ( ( ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 ) ) | ( 'mandatory' ) )
             int alt38=2;
             int LA38_0 = input.LA(1);
 
@@ -12642,16 +12642,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt38) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4137:1: ( ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 ) )
+                    // InternalRoom.g:4140:1: ( ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4137:1: ( ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4138:1: ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 )
+                    // InternalRoom.g:4140:1: ( ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 ) )
+                    // InternalRoom.g:4141:1: ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 )
                     {
                      before(grammarAccess.getEnumAnnotationAttributeAccess().getOptionalAssignment_0_0()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4139:1: ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4139:2: rule__EnumAnnotationAttribute__OptionalAssignment_0_0
+                    // InternalRoom.g:4142:1: ( rule__EnumAnnotationAttribute__OptionalAssignment_0_0 )
+                    // InternalRoom.g:4142:2: rule__EnumAnnotationAttribute__OptionalAssignment_0_0
                     {
-                    pushFollow(FOLLOW_rule__EnumAnnotationAttribute__OptionalAssignment_0_0_in_rule__EnumAnnotationAttribute__Alternatives_09006);
+                    pushFollow(FOLLOW_2);
                     rule__EnumAnnotationAttribute__OptionalAssignment_0_0();
 
                     state._fsp--;
@@ -12667,13 +12667,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4143:6: ( 'mandatory' )
+                    // InternalRoom.g:4146:6: ( 'mandatory' )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4143:6: ( 'mandatory' )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4144:1: 'mandatory'
+                    // InternalRoom.g:4146:6: ( 'mandatory' )
+                    // InternalRoom.g:4147:1: 'mandatory'
                     {
                      before(grammarAccess.getEnumAnnotationAttributeAccess().getMandatoryKeyword_0_1()); 
-                    match(input,23,FOLLOW_23_in_rule__EnumAnnotationAttribute__Alternatives_09025); 
+                    match(input,23,FOLLOW_2); 
                      after(grammarAccess.getEnumAnnotationAttributeAccess().getMandatoryKeyword_0_1()); 
 
                     }
@@ -12699,13 +12699,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Import__Alternatives_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4156:1: rule__Import__Alternatives_1 : ( ( ( rule__Import__Group_1_0__0 ) ) | ( 'model' ) );
+    // InternalRoom.g:4159:1: rule__Import__Alternatives_1 : ( ( ( rule__Import__Group_1_0__0 ) ) | ( 'model' ) );
     public final void rule__Import__Alternatives_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4160:1: ( ( ( rule__Import__Group_1_0__0 ) ) | ( 'model' ) )
+            // InternalRoom.g:4163:1: ( ( ( rule__Import__Group_1_0__0 ) ) | ( 'model' ) )
             int alt39=2;
             int LA39_0 = input.LA(1);
 
@@ -12723,16 +12723,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt39) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4161:1: ( ( rule__Import__Group_1_0__0 ) )
+                    // InternalRoom.g:4164:1: ( ( rule__Import__Group_1_0__0 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4161:1: ( ( rule__Import__Group_1_0__0 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4162:1: ( rule__Import__Group_1_0__0 )
+                    // InternalRoom.g:4164:1: ( ( rule__Import__Group_1_0__0 ) )
+                    // InternalRoom.g:4165:1: ( rule__Import__Group_1_0__0 )
                     {
                      before(grammarAccess.getImportAccess().getGroup_1_0()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4163:1: ( rule__Import__Group_1_0__0 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4163:2: rule__Import__Group_1_0__0
+                    // InternalRoom.g:4166:1: ( rule__Import__Group_1_0__0 )
+                    // InternalRoom.g:4166:2: rule__Import__Group_1_0__0
                     {
-                    pushFollow(FOLLOW_rule__Import__Group_1_0__0_in_rule__Import__Alternatives_19059);
+                    pushFollow(FOLLOW_2);
                     rule__Import__Group_1_0__0();
 
                     state._fsp--;
@@ -12748,13 +12748,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4167:6: ( 'model' )
+                    // InternalRoom.g:4170:6: ( 'model' )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4167:6: ( 'model' )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4168:1: 'model'
+                    // InternalRoom.g:4170:6: ( 'model' )
+                    // InternalRoom.g:4171:1: 'model'
                     {
                      before(grammarAccess.getImportAccess().getModelKeyword_1_1()); 
-                    match(input,24,FOLLOW_24_in_rule__Import__Alternatives_19078); 
+                    match(input,24,FOLLOW_2); 
                      after(grammarAccess.getImportAccess().getModelKeyword_1_1()); 
 
                     }
@@ -12780,13 +12780,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Literal__Alternatives"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4181:1: rule__Literal__Alternatives : ( ( ruleBooleanLiteral ) | ( ruleNumberLiteral ) | ( ruleStringLiteral ) );
+    // InternalRoom.g:4184:1: rule__Literal__Alternatives : ( ( ruleBooleanLiteral ) | ( ruleNumberLiteral ) | ( ruleStringLiteral ) );
     public final void rule__Literal__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4185:1: ( ( ruleBooleanLiteral ) | ( ruleNumberLiteral ) | ( ruleStringLiteral ) )
+            // InternalRoom.g:4188:1: ( ( ruleBooleanLiteral ) | ( ruleNumberLiteral ) | ( ruleStringLiteral ) )
             int alt40=3;
             switch ( input.LA(1) ) {
             case 25:
@@ -12817,13 +12817,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
             switch (alt40) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4186:1: ( ruleBooleanLiteral )
+                    // InternalRoom.g:4189:1: ( ruleBooleanLiteral )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4186:1: ( ruleBooleanLiteral )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4187:1: ruleBooleanLiteral
+                    // InternalRoom.g:4189:1: ( ruleBooleanLiteral )
+                    // InternalRoom.g:4190:1: ruleBooleanLiteral
                     {
                      before(grammarAccess.getLiteralAccess().getBooleanLiteralParserRuleCall_0()); 
-                    pushFollow(FOLLOW_ruleBooleanLiteral_in_rule__Literal__Alternatives9113);
+                    pushFollow(FOLLOW_2);
                     ruleBooleanLiteral();
 
                     state._fsp--;
@@ -12836,13 +12836,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4192:6: ( ruleNumberLiteral )
+                    // InternalRoom.g:4195:6: ( ruleNumberLiteral )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4192:6: ( ruleNumberLiteral )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4193:1: ruleNumberLiteral
+                    // InternalRoom.g:4195:6: ( ruleNumberLiteral )
+                    // InternalRoom.g:4196:1: ruleNumberLiteral
                     {
                      before(grammarAccess.getLiteralAccess().getNumberLiteralParserRuleCall_1()); 
-                    pushFollow(FOLLOW_ruleNumberLiteral_in_rule__Literal__Alternatives9130);
+                    pushFollow(FOLLOW_2);
                     ruleNumberLiteral();
 
                     state._fsp--;
@@ -12855,13 +12855,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4198:6: ( ruleStringLiteral )
+                    // InternalRoom.g:4201:6: ( ruleStringLiteral )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4198:6: ( ruleStringLiteral )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4199:1: ruleStringLiteral
+                    // InternalRoom.g:4201:6: ( ruleStringLiteral )
+                    // InternalRoom.g:4202:1: ruleStringLiteral
                     {
                      before(grammarAccess.getLiteralAccess().getStringLiteralParserRuleCall_2()); 
-                    pushFollow(FOLLOW_ruleStringLiteral_in_rule__Literal__Alternatives9147);
+                    pushFollow(FOLLOW_2);
                     ruleStringLiteral();
 
                     state._fsp--;
@@ -12891,13 +12891,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__BooleanLiteral__Alternatives_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4209:1: rule__BooleanLiteral__Alternatives_1 : ( ( 'false' ) | ( ( rule__BooleanLiteral__IsTrueAssignment_1_1 ) ) );
+    // InternalRoom.g:4212:1: rule__BooleanLiteral__Alternatives_1 : ( ( 'false' ) | ( ( rule__BooleanLiteral__IsTrueAssignment_1_1 ) ) );
     public final void rule__BooleanLiteral__Alternatives_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4213:1: ( ( 'false' ) | ( ( rule__BooleanLiteral__IsTrueAssignment_1_1 ) ) )
+            // InternalRoom.g:4216:1: ( ( 'false' ) | ( ( rule__BooleanLiteral__IsTrueAssignment_1_1 ) ) )
             int alt41=2;
             int LA41_0 = input.LA(1);
 
@@ -12915,13 +12915,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt41) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4214:1: ( 'false' )
+                    // InternalRoom.g:4217:1: ( 'false' )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4214:1: ( 'false' )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4215:1: 'false'
+                    // InternalRoom.g:4217:1: ( 'false' )
+                    // InternalRoom.g:4218:1: 'false'
                     {
                      before(grammarAccess.getBooleanLiteralAccess().getFalseKeyword_1_0()); 
-                    match(input,25,FOLLOW_25_in_rule__BooleanLiteral__Alternatives_19180); 
+                    match(input,25,FOLLOW_2); 
                      after(grammarAccess.getBooleanLiteralAccess().getFalseKeyword_1_0()); 
 
                     }
@@ -12930,16 +12930,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4222:6: ( ( rule__BooleanLiteral__IsTrueAssignment_1_1 ) )
+                    // InternalRoom.g:4225:6: ( ( rule__BooleanLiteral__IsTrueAssignment_1_1 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4222:6: ( ( rule__BooleanLiteral__IsTrueAssignment_1_1 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4223:1: ( rule__BooleanLiteral__IsTrueAssignment_1_1 )
+                    // InternalRoom.g:4225:6: ( ( rule__BooleanLiteral__IsTrueAssignment_1_1 ) )
+                    // InternalRoom.g:4226:1: ( rule__BooleanLiteral__IsTrueAssignment_1_1 )
                     {
                      before(grammarAccess.getBooleanLiteralAccess().getIsTrueAssignment_1_1()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4224:1: ( rule__BooleanLiteral__IsTrueAssignment_1_1 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4224:2: rule__BooleanLiteral__IsTrueAssignment_1_1
+                    // InternalRoom.g:4227:1: ( rule__BooleanLiteral__IsTrueAssignment_1_1 )
+                    // InternalRoom.g:4227:2: rule__BooleanLiteral__IsTrueAssignment_1_1
                     {
-                    pushFollow(FOLLOW_rule__BooleanLiteral__IsTrueAssignment_1_1_in_rule__BooleanLiteral__Alternatives_19199);
+                    pushFollow(FOLLOW_2);
                     rule__BooleanLiteral__IsTrueAssignment_1_1();
 
                     state._fsp--;
@@ -12972,13 +12972,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NumberLiteral__Alternatives"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4233:1: rule__NumberLiteral__Alternatives : ( ( ruleIntLiteral ) | ( ruleRealLiteral ) );
+    // InternalRoom.g:4236:1: rule__NumberLiteral__Alternatives : ( ( ruleIntLiteral ) | ( ruleRealLiteral ) );
     public final void rule__NumberLiteral__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4237:1: ( ( ruleIntLiteral ) | ( ruleRealLiteral ) )
+            // InternalRoom.g:4240:1: ( ( ruleIntLiteral ) | ( ruleRealLiteral ) )
             int alt42=2;
             switch ( input.LA(1) ) {
             case 26:
@@ -13069,13 +13069,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
             switch (alt42) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4238:1: ( ruleIntLiteral )
+                    // InternalRoom.g:4241:1: ( ruleIntLiteral )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4238:1: ( ruleIntLiteral )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4239:1: ruleIntLiteral
+                    // InternalRoom.g:4241:1: ( ruleIntLiteral )
+                    // InternalRoom.g:4242:1: ruleIntLiteral
                     {
                      before(grammarAccess.getNumberLiteralAccess().getIntLiteralParserRuleCall_0()); 
-                    pushFollow(FOLLOW_ruleIntLiteral_in_rule__NumberLiteral__Alternatives9232);
+                    pushFollow(FOLLOW_2);
                     ruleIntLiteral();
 
                     state._fsp--;
@@ -13088,13 +13088,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4244:6: ( ruleRealLiteral )
+                    // InternalRoom.g:4247:6: ( ruleRealLiteral )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4244:6: ( ruleRealLiteral )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4245:1: ruleRealLiteral
+                    // InternalRoom.g:4247:6: ( ruleRealLiteral )
+                    // InternalRoom.g:4248:1: ruleRealLiteral
                     {
                      before(grammarAccess.getNumberLiteralAccess().getRealLiteralParserRuleCall_1()); 
-                    pushFollow(FOLLOW_ruleRealLiteral_in_rule__NumberLiteral__Alternatives9249);
+                    pushFollow(FOLLOW_2);
                     ruleRealLiteral();
 
                     state._fsp--;
@@ -13124,13 +13124,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Integer__Alternatives"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4255:1: rule__Integer__Alternatives : ( ( ( rule__Integer__Group_0__0 ) ) | ( RULE_HEX ) );
+    // InternalRoom.g:4258:1: rule__Integer__Alternatives : ( ( ( rule__Integer__Group_0__0 ) ) | ( RULE_HEX ) );
     public final void rule__Integer__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4259:1: ( ( ( rule__Integer__Group_0__0 ) ) | ( RULE_HEX ) )
+            // InternalRoom.g:4262:1: ( ( ( rule__Integer__Group_0__0 ) ) | ( RULE_HEX ) )
             int alt43=2;
             int LA43_0 = input.LA(1);
 
@@ -13148,16 +13148,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt43) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4260:1: ( ( rule__Integer__Group_0__0 ) )
+                    // InternalRoom.g:4263:1: ( ( rule__Integer__Group_0__0 ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4260:1: ( ( rule__Integer__Group_0__0 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4261:1: ( rule__Integer__Group_0__0 )
+                    // InternalRoom.g:4263:1: ( ( rule__Integer__Group_0__0 ) )
+                    // InternalRoom.g:4264:1: ( rule__Integer__Group_0__0 )
                     {
                      before(grammarAccess.getIntegerAccess().getGroup_0()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4262:1: ( rule__Integer__Group_0__0 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4262:2: rule__Integer__Group_0__0
+                    // InternalRoom.g:4265:1: ( rule__Integer__Group_0__0 )
+                    // InternalRoom.g:4265:2: rule__Integer__Group_0__0
                     {
-                    pushFollow(FOLLOW_rule__Integer__Group_0__0_in_rule__Integer__Alternatives9281);
+                    pushFollow(FOLLOW_2);
                     rule__Integer__Group_0__0();
 
                     state._fsp--;
@@ -13173,13 +13173,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4266:6: ( RULE_HEX )
+                    // InternalRoom.g:4269:6: ( RULE_HEX )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4266:6: ( RULE_HEX )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4267:1: RULE_HEX
+                    // InternalRoom.g:4269:6: ( RULE_HEX )
+                    // InternalRoom.g:4270:1: RULE_HEX
                     {
                      before(grammarAccess.getIntegerAccess().getHEXTerminalRuleCall_1()); 
-                    match(input,RULE_HEX,FOLLOW_RULE_HEX_in_rule__Integer__Alternatives9299); 
+                    match(input,RULE_HEX,FOLLOW_2); 
                      after(grammarAccess.getIntegerAccess().getHEXTerminalRuleCall_1()); 
 
                     }
@@ -13205,13 +13205,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Integer__Alternatives_0_0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4277:1: rule__Integer__Alternatives_0_0 : ( ( '+' ) | ( '-' ) );
+    // InternalRoom.g:4280:1: rule__Integer__Alternatives_0_0 : ( ( '+' ) | ( '-' ) );
     public final void rule__Integer__Alternatives_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4281:1: ( ( '+' ) | ( '-' ) )
+            // InternalRoom.g:4284:1: ( ( '+' ) | ( '-' ) )
             int alt44=2;
             int LA44_0 = input.LA(1);
 
@@ -13229,13 +13229,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt44) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4282:1: ( '+' )
+                    // InternalRoom.g:4285:1: ( '+' )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4282:1: ( '+' )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4283:1: '+'
+                    // InternalRoom.g:4285:1: ( '+' )
+                    // InternalRoom.g:4286:1: '+'
                     {
                      before(grammarAccess.getIntegerAccess().getPlusSignKeyword_0_0_0()); 
-                    match(input,26,FOLLOW_26_in_rule__Integer__Alternatives_0_09332); 
+                    match(input,26,FOLLOW_2); 
                      after(grammarAccess.getIntegerAccess().getPlusSignKeyword_0_0_0()); 
 
                     }
@@ -13244,13 +13244,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4290:6: ( '-' )
+                    // InternalRoom.g:4293:6: ( '-' )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4290:6: ( '-' )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4291:1: '-'
+                    // InternalRoom.g:4293:6: ( '-' )
+                    // InternalRoom.g:4294:1: '-'
                     {
                      before(grammarAccess.getIntegerAccess().getHyphenMinusKeyword_0_0_1()); 
-                    match(input,27,FOLLOW_27_in_rule__Integer__Alternatives_0_09352); 
+                    match(input,27,FOLLOW_2); 
                      after(grammarAccess.getIntegerAccess().getHyphenMinusKeyword_0_0_1()); 
 
                     }
@@ -13276,13 +13276,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Real__Alternatives"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4303:1: rule__Real__Alternatives : ( ( ruleDecimal ) | ( ruleDecimalExp ) );
+    // InternalRoom.g:4306:1: rule__Real__Alternatives : ( ( ruleDecimal ) | ( ruleDecimalExp ) );
     public final void rule__Real__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4307:1: ( ( ruleDecimal ) | ( ruleDecimalExp ) )
+            // InternalRoom.g:4310:1: ( ( ruleDecimal ) | ( ruleDecimalExp ) )
             int alt45=2;
             switch ( input.LA(1) ) {
             case 26:
@@ -13298,12 +13298,12 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                         if ( (LA45_4==RULE_INT) ) {
                             int LA45_5 = input.LA(5);
 
-                            if ( (LA45_5==EOF||LA45_5==48||LA45_5==51) ) {
-                                alt45=1;
-                            }
-                            else if ( ((LA45_5>=28 && LA45_5<=29)) ) {
+                            if ( ((LA45_5>=28 && LA45_5<=29)) ) {
                                 alt45=2;
                             }
+                            else if ( (LA45_5==EOF||LA45_5==48||LA45_5==51) ) {
+                                alt45=1;
+                            }
                             else {
                                 NoViableAltException nvae =
                                     new NoViableAltException("", 45, 5, input);
@@ -13346,12 +13346,12 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                         if ( (LA45_4==RULE_INT) ) {
                             int LA45_5 = input.LA(5);
 
-                            if ( (LA45_5==EOF||LA45_5==48||LA45_5==51) ) {
-                                alt45=1;
-                            }
-                            else if ( ((LA45_5>=28 && LA45_5<=29)) ) {
+                            if ( ((LA45_5>=28 && LA45_5<=29)) ) {
                                 alt45=2;
                             }
+                            else if ( (LA45_5==EOF||LA45_5==48||LA45_5==51) ) {
+                                alt45=1;
+                            }
                             else {
                                 NoViableAltException nvae =
                                     new NoViableAltException("", 45, 5, input);
@@ -13391,12 +13391,12 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     if ( (LA45_4==RULE_INT) ) {
                         int LA45_5 = input.LA(4);
 
-                        if ( (LA45_5==EOF||LA45_5==48||LA45_5==51) ) {
-                            alt45=1;
-                        }
-                        else if ( ((LA45_5>=28 && LA45_5<=29)) ) {
+                        if ( ((LA45_5>=28 && LA45_5<=29)) ) {
                             alt45=2;
                         }
+                        else if ( (LA45_5==EOF||LA45_5==48||LA45_5==51) ) {
+                            alt45=1;
+                        }
                         else {
                             NoViableAltException nvae =
                                 new NoViableAltException("", 45, 5, input);
@@ -13428,13 +13428,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
             switch (alt45) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4308:1: ( ruleDecimal )
+                    // InternalRoom.g:4311:1: ( ruleDecimal )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4308:1: ( ruleDecimal )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4309:1: ruleDecimal
+                    // InternalRoom.g:4311:1: ( ruleDecimal )
+                    // InternalRoom.g:4312:1: ruleDecimal
                     {
                      before(grammarAccess.getRealAccess().getDecimalParserRuleCall_0()); 
-                    pushFollow(FOLLOW_ruleDecimal_in_rule__Real__Alternatives9386);
+                    pushFollow(FOLLOW_2);
                     ruleDecimal();
 
                     state._fsp--;
@@ -13447,13 +13447,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4314:6: ( ruleDecimalExp )
+                    // InternalRoom.g:4317:6: ( ruleDecimalExp )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4314:6: ( ruleDecimalExp )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4315:1: ruleDecimalExp
+                    // InternalRoom.g:4317:6: ( ruleDecimalExp )
+                    // InternalRoom.g:4318:1: ruleDecimalExp
                     {
                      before(grammarAccess.getRealAccess().getDecimalExpParserRuleCall_1()); 
-                    pushFollow(FOLLOW_ruleDecimalExp_in_rule__Real__Alternatives9403);
+                    pushFollow(FOLLOW_2);
                     ruleDecimalExp();
 
                     state._fsp--;
@@ -13483,13 +13483,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Decimal__Alternatives_0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4325:1: rule__Decimal__Alternatives_0 : ( ( '+' ) | ( '-' ) );
+    // InternalRoom.g:4328:1: rule__Decimal__Alternatives_0 : ( ( '+' ) | ( '-' ) );
     public final void rule__Decimal__Alternatives_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4329:1: ( ( '+' ) | ( '-' ) )
+            // InternalRoom.g:4332:1: ( ( '+' ) | ( '-' ) )
             int alt46=2;
             int LA46_0 = input.LA(1);
 
@@ -13507,13 +13507,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt46) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4330:1: ( '+' )
+                    // InternalRoom.g:4333:1: ( '+' )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4330:1: ( '+' )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4331:1: '+'
+                    // InternalRoom.g:4333:1: ( '+' )
+                    // InternalRoom.g:4334:1: '+'
                     {
                      before(grammarAccess.getDecimalAccess().getPlusSignKeyword_0_0()); 
-                    match(input,26,FOLLOW_26_in_rule__Decimal__Alternatives_09436); 
+                    match(input,26,FOLLOW_2); 
                      after(grammarAccess.getDecimalAccess().getPlusSignKeyword_0_0()); 
 
                     }
@@ -13522,13 +13522,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4338:6: ( '-' )
+                    // InternalRoom.g:4341:6: ( '-' )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4338:6: ( '-' )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4339:1: '-'
+                    // InternalRoom.g:4341:6: ( '-' )
+                    // InternalRoom.g:4342:1: '-'
                     {
                      before(grammarAccess.getDecimalAccess().getHyphenMinusKeyword_0_1()); 
-                    match(input,27,FOLLOW_27_in_rule__Decimal__Alternatives_09456); 
+                    match(input,27,FOLLOW_2); 
                      after(grammarAccess.getDecimalAccess().getHyphenMinusKeyword_0_1()); 
 
                     }
@@ -13554,13 +13554,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Alternatives_0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4351:1: rule__DecimalExp__Alternatives_0 : ( ( '+' ) | ( '-' ) );
+    // InternalRoom.g:4354:1: rule__DecimalExp__Alternatives_0 : ( ( '+' ) | ( '-' ) );
     public final void rule__DecimalExp__Alternatives_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4355:1: ( ( '+' ) | ( '-' ) )
+            // InternalRoom.g:4358:1: ( ( '+' ) | ( '-' ) )
             int alt47=2;
             int LA47_0 = input.LA(1);
 
@@ -13578,13 +13578,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt47) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4356:1: ( '+' )
+                    // InternalRoom.g:4359:1: ( '+' )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4356:1: ( '+' )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4357:1: '+'
+                    // InternalRoom.g:4359:1: ( '+' )
+                    // InternalRoom.g:4360:1: '+'
                     {
                      before(grammarAccess.getDecimalExpAccess().getPlusSignKeyword_0_0()); 
-                    match(input,26,FOLLOW_26_in_rule__DecimalExp__Alternatives_09491); 
+                    match(input,26,FOLLOW_2); 
                      after(grammarAccess.getDecimalExpAccess().getPlusSignKeyword_0_0()); 
 
                     }
@@ -13593,13 +13593,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4364:6: ( '-' )
+                    // InternalRoom.g:4367:6: ( '-' )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4364:6: ( '-' )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4365:1: '-'
+                    // InternalRoom.g:4367:6: ( '-' )
+                    // InternalRoom.g:4368:1: '-'
                     {
                      before(grammarAccess.getDecimalExpAccess().getHyphenMinusKeyword_0_1()); 
-                    match(input,27,FOLLOW_27_in_rule__DecimalExp__Alternatives_09511); 
+                    match(input,27,FOLLOW_2); 
                      after(grammarAccess.getDecimalExpAccess().getHyphenMinusKeyword_0_1()); 
 
                     }
@@ -13625,13 +13625,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Alternatives_4"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4377:1: rule__DecimalExp__Alternatives_4 : ( ( 'e' ) | ( 'E' ) );
+    // InternalRoom.g:4380:1: rule__DecimalExp__Alternatives_4 : ( ( 'e' ) | ( 'E' ) );
     public final void rule__DecimalExp__Alternatives_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4381:1: ( ( 'e' ) | ( 'E' ) )
+            // InternalRoom.g:4384:1: ( ( 'e' ) | ( 'E' ) )
             int alt48=2;
             int LA48_0 = input.LA(1);
 
@@ -13649,13 +13649,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt48) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4382:1: ( 'e' )
+                    // InternalRoom.g:4385:1: ( 'e' )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4382:1: ( 'e' )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4383:1: 'e'
+                    // InternalRoom.g:4385:1: ( 'e' )
+                    // InternalRoom.g:4386:1: 'e'
                     {
                      before(grammarAccess.getDecimalExpAccess().getEKeyword_4_0()); 
-                    match(input,28,FOLLOW_28_in_rule__DecimalExp__Alternatives_49546); 
+                    match(input,28,FOLLOW_2); 
                      after(grammarAccess.getDecimalExpAccess().getEKeyword_4_0()); 
 
                     }
@@ -13664,13 +13664,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4390:6: ( 'E' )
+                    // InternalRoom.g:4393:6: ( 'E' )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4390:6: ( 'E' )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4391:1: 'E'
+                    // InternalRoom.g:4393:6: ( 'E' )
+                    // InternalRoom.g:4394:1: 'E'
                     {
                      before(grammarAccess.getDecimalExpAccess().getEKeyword_4_1()); 
-                    match(input,29,FOLLOW_29_in_rule__DecimalExp__Alternatives_49566); 
+                    match(input,29,FOLLOW_2); 
                      after(grammarAccess.getDecimalExpAccess().getEKeyword_4_1()); 
 
                     }
@@ -13696,13 +13696,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Alternatives_5"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4403:1: rule__DecimalExp__Alternatives_5 : ( ( '+' ) | ( '-' ) );
+    // InternalRoom.g:4406:1: rule__DecimalExp__Alternatives_5 : ( ( '+' ) | ( '-' ) );
     public final void rule__DecimalExp__Alternatives_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4407:1: ( ( '+' ) | ( '-' ) )
+            // InternalRoom.g:4410:1: ( ( '+' ) | ( '-' ) )
             int alt49=2;
             int LA49_0 = input.LA(1);
 
@@ -13720,13 +13720,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt49) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4408:1: ( '+' )
+                    // InternalRoom.g:4411:1: ( '+' )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4408:1: ( '+' )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4409:1: '+'
+                    // InternalRoom.g:4411:1: ( '+' )
+                    // InternalRoom.g:4412:1: '+'
                     {
                      before(grammarAccess.getDecimalExpAccess().getPlusSignKeyword_5_0()); 
-                    match(input,26,FOLLOW_26_in_rule__DecimalExp__Alternatives_59601); 
+                    match(input,26,FOLLOW_2); 
                      after(grammarAccess.getDecimalExpAccess().getPlusSignKeyword_5_0()); 
 
                     }
@@ -13735,13 +13735,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4416:6: ( '-' )
+                    // InternalRoom.g:4419:6: ( '-' )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4416:6: ( '-' )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4417:1: '-'
+                    // InternalRoom.g:4419:6: ( '-' )
+                    // InternalRoom.g:4420:1: '-'
                     {
                      before(grammarAccess.getDecimalExpAccess().getHyphenMinusKeyword_5_1()); 
-                    match(input,27,FOLLOW_27_in_rule__DecimalExp__Alternatives_59621); 
+                    match(input,27,FOLLOW_2); 
                      after(grammarAccess.getDecimalExpAccess().getHyphenMinusKeyword_5_1()); 
 
                     }
@@ -13767,13 +13767,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CommunicationType__Alternatives"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4429:1: rule__CommunicationType__Alternatives : ( ( ( 'eventdriven' ) ) | ( ( 'datadriven' ) ) | ( ( 'sync' ) ) );
+    // InternalRoom.g:4432:1: rule__CommunicationType__Alternatives : ( ( ( 'eventdriven' ) ) | ( ( 'datadriven' ) ) | ( ( 'sync' ) ) );
     public final void rule__CommunicationType__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4433:1: ( ( ( 'eventdriven' ) ) | ( ( 'datadriven' ) ) | ( ( 'sync' ) ) )
+            // InternalRoom.g:4436:1: ( ( ( 'eventdriven' ) ) | ( ( 'datadriven' ) ) | ( ( 'sync' ) ) )
             int alt50=3;
             switch ( input.LA(1) ) {
             case 30:
@@ -13800,16 +13800,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
             switch (alt50) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4434:1: ( ( 'eventdriven' ) )
+                    // InternalRoom.g:4437:1: ( ( 'eventdriven' ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4434:1: ( ( 'eventdriven' ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4435:1: ( 'eventdriven' )
+                    // InternalRoom.g:4437:1: ( ( 'eventdriven' ) )
+                    // InternalRoom.g:4438:1: ( 'eventdriven' )
                     {
                      before(grammarAccess.getCommunicationTypeAccess().getEVENT_DRIVENEnumLiteralDeclaration_0()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4436:1: ( 'eventdriven' )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4436:3: 'eventdriven'
+                    // InternalRoom.g:4439:1: ( 'eventdriven' )
+                    // InternalRoom.g:4439:3: 'eventdriven'
                     {
-                    match(input,30,FOLLOW_30_in_rule__CommunicationType__Alternatives9656); 
+                    match(input,30,FOLLOW_2); 
 
                     }
 
@@ -13821,16 +13821,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4441:6: ( ( 'datadriven' ) )
+                    // InternalRoom.g:4444:6: ( ( 'datadriven' ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4441:6: ( ( 'datadriven' ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4442:1: ( 'datadriven' )
+                    // InternalRoom.g:4444:6: ( ( 'datadriven' ) )
+                    // InternalRoom.g:4445:1: ( 'datadriven' )
                     {
                      before(grammarAccess.getCommunicationTypeAccess().getDATA_DRIVENEnumLiteralDeclaration_1()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4443:1: ( 'datadriven' )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4443:3: 'datadriven'
+                    // InternalRoom.g:4446:1: ( 'datadriven' )
+                    // InternalRoom.g:4446:3: 'datadriven'
                     {
-                    match(input,31,FOLLOW_31_in_rule__CommunicationType__Alternatives9677); 
+                    match(input,31,FOLLOW_2); 
 
                     }
 
@@ -13842,16 +13842,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4448:6: ( ( 'sync' ) )
+                    // InternalRoom.g:4451:6: ( ( 'sync' ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4448:6: ( ( 'sync' ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4449:1: ( 'sync' )
+                    // InternalRoom.g:4451:6: ( ( 'sync' ) )
+                    // InternalRoom.g:4452:1: ( 'sync' )
                     {
                      before(grammarAccess.getCommunicationTypeAccess().getSYNCHRONOUSEnumLiteralDeclaration_2()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4450:1: ( 'sync' )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4450:3: 'sync'
+                    // InternalRoom.g:4453:1: ( 'sync' )
+                    // InternalRoom.g:4453:3: 'sync'
                     {
-                    match(input,32,FOLLOW_32_in_rule__CommunicationType__Alternatives9698); 
+                    match(input,32,FOLLOW_2); 
 
                     }
 
@@ -13880,13 +13880,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceType__Alternatives"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4460:1: rule__ReferenceType__Alternatives : ( ( ( 'fixed' ) ) | ( ( 'optional' ) ) );
+    // InternalRoom.g:4463:1: rule__ReferenceType__Alternatives : ( ( ( 'fixed' ) ) | ( ( 'optional' ) ) );
     public final void rule__ReferenceType__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4464:1: ( ( ( 'fixed' ) ) | ( ( 'optional' ) ) )
+            // InternalRoom.g:4467:1: ( ( ( 'fixed' ) ) | ( ( 'optional' ) ) )
             int alt51=2;
             int LA51_0 = input.LA(1);
 
@@ -13904,16 +13904,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt51) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4465:1: ( ( 'fixed' ) )
+                    // InternalRoom.g:4468:1: ( ( 'fixed' ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4465:1: ( ( 'fixed' ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4466:1: ( 'fixed' )
+                    // InternalRoom.g:4468:1: ( ( 'fixed' ) )
+                    // InternalRoom.g:4469:1: ( 'fixed' )
                     {
                      before(grammarAccess.getReferenceTypeAccess().getFIXEDEnumLiteralDeclaration_0()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4467:1: ( 'fixed' )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4467:3: 'fixed'
+                    // InternalRoom.g:4470:1: ( 'fixed' )
+                    // InternalRoom.g:4470:3: 'fixed'
                     {
-                    match(input,33,FOLLOW_33_in_rule__ReferenceType__Alternatives9734); 
+                    match(input,33,FOLLOW_2); 
 
                     }
 
@@ -13925,16 +13925,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4472:6: ( ( 'optional' ) )
+                    // InternalRoom.g:4475:6: ( ( 'optional' ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4472:6: ( ( 'optional' ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4473:1: ( 'optional' )
+                    // InternalRoom.g:4475:6: ( ( 'optional' ) )
+                    // InternalRoom.g:4476:1: ( 'optional' )
                     {
                      before(grammarAccess.getReferenceTypeAccess().getOPTIONALEnumLiteralDeclaration_1()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4474:1: ( 'optional' )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4474:3: 'optional'
+                    // InternalRoom.g:4477:1: ( 'optional' )
+                    // InternalRoom.g:4477:3: 'optional'
                     {
-                    match(input,34,FOLLOW_34_in_rule__ReferenceType__Alternatives9755); 
+                    match(input,34,FOLLOW_2); 
 
                     }
 
@@ -13963,13 +13963,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ComponentCommunicationType__Alternatives"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4485:1: rule__ComponentCommunicationType__Alternatives : ( ( ( 'eventdriven' ) ) | ( ( 'datadriven' ) ) | ( ( 'async' ) ) | ( ( 'sync' ) ) );
+    // InternalRoom.g:4488:1: rule__ComponentCommunicationType__Alternatives : ( ( ( 'eventdriven' ) ) | ( ( 'datadriven' ) ) | ( ( 'async' ) ) | ( ( 'sync' ) ) );
     public final void rule__ComponentCommunicationType__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4489:1: ( ( ( 'eventdriven' ) ) | ( ( 'datadriven' ) ) | ( ( 'async' ) ) | ( ( 'sync' ) ) )
+            // InternalRoom.g:4492:1: ( ( ( 'eventdriven' ) ) | ( ( 'datadriven' ) ) | ( ( 'async' ) ) | ( ( 'sync' ) ) )
             int alt52=4;
             switch ( input.LA(1) ) {
             case 30:
@@ -14001,16 +14001,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
             switch (alt52) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4490:1: ( ( 'eventdriven' ) )
+                    // InternalRoom.g:4493:1: ( ( 'eventdriven' ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4490:1: ( ( 'eventdriven' ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4491:1: ( 'eventdriven' )
+                    // InternalRoom.g:4493:1: ( ( 'eventdriven' ) )
+                    // InternalRoom.g:4494:1: ( 'eventdriven' )
                     {
                      before(grammarAccess.getComponentCommunicationTypeAccess().getEVENT_DRIVENEnumLiteralDeclaration_0()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4492:1: ( 'eventdriven' )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4492:3: 'eventdriven'
+                    // InternalRoom.g:4495:1: ( 'eventdriven' )
+                    // InternalRoom.g:4495:3: 'eventdriven'
                     {
-                    match(input,30,FOLLOW_30_in_rule__ComponentCommunicationType__Alternatives9792); 
+                    match(input,30,FOLLOW_2); 
 
                     }
 
@@ -14022,16 +14022,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4497:6: ( ( 'datadriven' ) )
+                    // InternalRoom.g:4500:6: ( ( 'datadriven' ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4497:6: ( ( 'datadriven' ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4498:1: ( 'datadriven' )
+                    // InternalRoom.g:4500:6: ( ( 'datadriven' ) )
+                    // InternalRoom.g:4501:1: ( 'datadriven' )
                     {
                      before(grammarAccess.getComponentCommunicationTypeAccess().getDATA_DRIVENEnumLiteralDeclaration_1()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4499:1: ( 'datadriven' )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4499:3: 'datadriven'
+                    // InternalRoom.g:4502:1: ( 'datadriven' )
+                    // InternalRoom.g:4502:3: 'datadriven'
                     {
-                    match(input,31,FOLLOW_31_in_rule__ComponentCommunicationType__Alternatives9813); 
+                    match(input,31,FOLLOW_2); 
 
                     }
 
@@ -14043,16 +14043,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4504:6: ( ( 'async' ) )
+                    // InternalRoom.g:4507:6: ( ( 'async' ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4504:6: ( ( 'async' ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4505:1: ( 'async' )
+                    // InternalRoom.g:4507:6: ( ( 'async' ) )
+                    // InternalRoom.g:4508:1: ( 'async' )
                     {
                      before(grammarAccess.getComponentCommunicationTypeAccess().getASYNCHRONOUSEnumLiteralDeclaration_2()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4506:1: ( 'async' )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4506:3: 'async'
+                    // InternalRoom.g:4509:1: ( 'async' )
+                    // InternalRoom.g:4509:3: 'async'
                     {
-                    match(input,35,FOLLOW_35_in_rule__ComponentCommunicationType__Alternatives9834); 
+                    match(input,35,FOLLOW_2); 
 
                     }
 
@@ -14064,16 +14064,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 4 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4511:6: ( ( 'sync' ) )
+                    // InternalRoom.g:4514:6: ( ( 'sync' ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4511:6: ( ( 'sync' ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4512:1: ( 'sync' )
+                    // InternalRoom.g:4514:6: ( ( 'sync' ) )
+                    // InternalRoom.g:4515:1: ( 'sync' )
                     {
                      before(grammarAccess.getComponentCommunicationTypeAccess().getSYNCHRONOUSEnumLiteralDeclaration_3()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4513:1: ( 'sync' )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4513:3: 'sync'
+                    // InternalRoom.g:4516:1: ( 'sync' )
+                    // InternalRoom.g:4516:3: 'sync'
                     {
-                    match(input,32,FOLLOW_32_in_rule__ComponentCommunicationType__Alternatives9855); 
+                    match(input,32,FOLLOW_2); 
 
                     }
 
@@ -14102,13 +14102,13 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__LiteralType__Alternatives"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4523:1: rule__LiteralType__Alternatives : ( ( ( 'ptBoolean' ) ) | ( ( 'ptInteger' ) ) | ( ( 'ptReal' ) ) | ( ( 'ptCharacter' ) ) );
+    // InternalRoom.g:4526:1: rule__LiteralType__Alternatives : ( ( ( 'ptBoolean' ) ) | ( ( 'ptInteger' ) ) | ( ( 'ptReal' ) ) | ( ( 'ptCharacter' ) ) );
     public final void rule__LiteralType__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4527:1: ( ( ( 'ptBoolean' ) ) | ( ( 'ptInteger' ) ) | ( ( 'ptReal' ) ) | ( ( 'ptCharacter' ) ) )
+            // InternalRoom.g:4530:1: ( ( ( 'ptBoolean' ) ) | ( ( 'ptInteger' ) ) | ( ( 'ptReal' ) ) | ( ( 'ptCharacter' ) ) )
             int alt53=4;
             switch ( input.LA(1) ) {
             case 36:
@@ -14140,16 +14140,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
             switch (alt53) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4528:1: ( ( 'ptBoolean' ) )
+                    // InternalRoom.g:4531:1: ( ( 'ptBoolean' ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4528:1: ( ( 'ptBoolean' ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4529:1: ( 'ptBoolean' )
+                    // InternalRoom.g:4531:1: ( ( 'ptBoolean' ) )
+                    // InternalRoom.g:4532:1: ( 'ptBoolean' )
                     {
                      before(grammarAccess.getLiteralTypeAccess().getBOOLEnumLiteralDeclaration_0()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4530:1: ( 'ptBoolean' )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4530:3: 'ptBoolean'
+                    // InternalRoom.g:4533:1: ( 'ptBoolean' )
+                    // InternalRoom.g:4533:3: 'ptBoolean'
                     {
-                    match(input,36,FOLLOW_36_in_rule__LiteralType__Alternatives9891); 
+                    match(input,36,FOLLOW_2); 
 
                     }
 
@@ -14161,16 +14161,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4535:6: ( ( 'ptInteger' ) )
+                    // InternalRoom.g:4538:6: ( ( 'ptInteger' ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4535:6: ( ( 'ptInteger' ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4536:1: ( 'ptInteger' )
+                    // InternalRoom.g:4538:6: ( ( 'ptInteger' ) )
+                    // InternalRoom.g:4539:1: ( 'ptInteger' )
                     {
                      before(grammarAccess.getLiteralTypeAccess().getINTEnumLiteralDeclaration_1()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4537:1: ( 'ptInteger' )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4537:3: 'ptInteger'
+                    // InternalRoom.g:4540:1: ( 'ptInteger' )
+                    // InternalRoom.g:4540:3: 'ptInteger'
                     {
-                    match(input,37,FOLLOW_37_in_rule__LiteralType__Alternatives9912); 
+                    match(input,37,FOLLOW_2); 
 
                     }
 
@@ -14182,16 +14182,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4542:6: ( ( 'ptReal' ) )
+                    // InternalRoom.g:4545:6: ( ( 'ptReal' ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4542:6: ( ( 'ptReal' ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4543:1: ( 'ptReal' )
+                    // InternalRoom.g:4545:6: ( ( 'ptReal' ) )
+                    // InternalRoom.g:4546:1: ( 'ptReal' )
                     {
                      before(grammarAccess.getLiteralTypeAccess().getREALEnumLiteralDeclaration_2()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4544:1: ( 'ptReal' )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4544:3: 'ptReal'
+                    // InternalRoom.g:4547:1: ( 'ptReal' )
+                    // InternalRoom.g:4547:3: 'ptReal'
                     {
-                    match(input,38,FOLLOW_38_in_rule__LiteralType__Alternatives9933); 
+                    match(input,38,FOLLOW_2); 
 
                     }
 
@@ -14203,16 +14203,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 4 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4549:6: ( ( 'ptCharacter' ) )
+                    // InternalRoom.g:4552:6: ( ( 'ptCharacter' ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4549:6: ( ( 'ptCharacter' ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4550:1: ( 'ptCharacter' )
+                    // InternalRoom.g:4552:6: ( ( 'ptCharacter' ) )
+                    // InternalRoom.g:4553:1: ( 'ptCharacter' )
                     {
                      before(grammarAccess.getLiteralTypeAccess().getCHAREnumLiteralDeclaration_3()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4551:1: ( 'ptCharacter' )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4551:3: 'ptCharacter'
+                    // InternalRoom.g:4554:1: ( 'ptCharacter' )
+                    // InternalRoom.g:4554:3: 'ptCharacter'
                     {
-                    match(input,39,FOLLOW_39_in_rule__LiteralType__Alternatives9954); 
+                    match(input,39,FOLLOW_2); 
 
                     }
 
@@ -14241,21 +14241,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RoomModel__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4563:1: rule__RoomModel__Group__0 : rule__RoomModel__Group__0__Impl rule__RoomModel__Group__1 ;
+    // InternalRoom.g:4566:1: rule__RoomModel__Group__0 : rule__RoomModel__Group__0__Impl rule__RoomModel__Group__1 ;
     public final void rule__RoomModel__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4567:1: ( rule__RoomModel__Group__0__Impl rule__RoomModel__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4568:2: rule__RoomModel__Group__0__Impl rule__RoomModel__Group__1
+            // InternalRoom.g:4570:1: ( rule__RoomModel__Group__0__Impl rule__RoomModel__Group__1 )
+            // InternalRoom.g:4571:2: rule__RoomModel__Group__0__Impl rule__RoomModel__Group__1
             {
-            pushFollow(FOLLOW_rule__RoomModel__Group__0__Impl_in_rule__RoomModel__Group__09987);
+            pushFollow(FOLLOW_3);
             rule__RoomModel__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RoomModel__Group__1_in_rule__RoomModel__Group__09990);
+            pushFollow(FOLLOW_2);
             rule__RoomModel__Group__1();
 
             state._fsp--;
@@ -14279,20 +14279,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RoomModel__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4575:1: rule__RoomModel__Group__0__Impl : ( 'RoomModel' ) ;
+    // InternalRoom.g:4578:1: rule__RoomModel__Group__0__Impl : ( 'RoomModel' ) ;
     public final void rule__RoomModel__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4579:1: ( ( 'RoomModel' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4580:1: ( 'RoomModel' )
+            // InternalRoom.g:4582:1: ( ( 'RoomModel' ) )
+            // InternalRoom.g:4583:1: ( 'RoomModel' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4580:1: ( 'RoomModel' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4581:1: 'RoomModel'
+            // InternalRoom.g:4583:1: ( 'RoomModel' )
+            // InternalRoom.g:4584:1: 'RoomModel'
             {
              before(grammarAccess.getRoomModelAccess().getRoomModelKeyword_0()); 
-            match(input,40,FOLLOW_40_in_rule__RoomModel__Group__0__Impl10018); 
+            match(input,40,FOLLOW_2); 
              after(grammarAccess.getRoomModelAccess().getRoomModelKeyword_0()); 
 
             }
@@ -14316,21 +14316,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RoomModel__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4594:1: rule__RoomModel__Group__1 : rule__RoomModel__Group__1__Impl rule__RoomModel__Group__2 ;
+    // InternalRoom.g:4597:1: rule__RoomModel__Group__1 : rule__RoomModel__Group__1__Impl rule__RoomModel__Group__2 ;
     public final void rule__RoomModel__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4598:1: ( rule__RoomModel__Group__1__Impl rule__RoomModel__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4599:2: rule__RoomModel__Group__1__Impl rule__RoomModel__Group__2
+            // InternalRoom.g:4601:1: ( rule__RoomModel__Group__1__Impl rule__RoomModel__Group__2 )
+            // InternalRoom.g:4602:2: rule__RoomModel__Group__1__Impl rule__RoomModel__Group__2
             {
-            pushFollow(FOLLOW_rule__RoomModel__Group__1__Impl_in_rule__RoomModel__Group__110049);
+            pushFollow(FOLLOW_4);
             rule__RoomModel__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RoomModel__Group__2_in_rule__RoomModel__Group__110052);
+            pushFollow(FOLLOW_2);
             rule__RoomModel__Group__2();
 
             state._fsp--;
@@ -14354,23 +14354,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RoomModel__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4606:1: rule__RoomModel__Group__1__Impl : ( ( rule__RoomModel__NameAssignment_1 ) ) ;
+    // InternalRoom.g:4609:1: rule__RoomModel__Group__1__Impl : ( ( rule__RoomModel__NameAssignment_1 ) ) ;
     public final void rule__RoomModel__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4610:1: ( ( ( rule__RoomModel__NameAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4611:1: ( ( rule__RoomModel__NameAssignment_1 ) )
+            // InternalRoom.g:4613:1: ( ( ( rule__RoomModel__NameAssignment_1 ) ) )
+            // InternalRoom.g:4614:1: ( ( rule__RoomModel__NameAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4611:1: ( ( rule__RoomModel__NameAssignment_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4612:1: ( rule__RoomModel__NameAssignment_1 )
+            // InternalRoom.g:4614:1: ( ( rule__RoomModel__NameAssignment_1 ) )
+            // InternalRoom.g:4615:1: ( rule__RoomModel__NameAssignment_1 )
             {
              before(grammarAccess.getRoomModelAccess().getNameAssignment_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4613:1: ( rule__RoomModel__NameAssignment_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4613:2: rule__RoomModel__NameAssignment_1
+            // InternalRoom.g:4616:1: ( rule__RoomModel__NameAssignment_1 )
+            // InternalRoom.g:4616:2: rule__RoomModel__NameAssignment_1
             {
-            pushFollow(FOLLOW_rule__RoomModel__NameAssignment_1_in_rule__RoomModel__Group__1__Impl10079);
+            pushFollow(FOLLOW_2);
             rule__RoomModel__NameAssignment_1();
 
             state._fsp--;
@@ -14401,21 +14401,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RoomModel__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4623:1: rule__RoomModel__Group__2 : rule__RoomModel__Group__2__Impl rule__RoomModel__Group__3 ;
+    // InternalRoom.g:4626:1: rule__RoomModel__Group__2 : rule__RoomModel__Group__2__Impl rule__RoomModel__Group__3 ;
     public final void rule__RoomModel__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4627:1: ( rule__RoomModel__Group__2__Impl rule__RoomModel__Group__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4628:2: rule__RoomModel__Group__2__Impl rule__RoomModel__Group__3
+            // InternalRoom.g:4630:1: ( rule__RoomModel__Group__2__Impl rule__RoomModel__Group__3 )
+            // InternalRoom.g:4631:2: rule__RoomModel__Group__2__Impl rule__RoomModel__Group__3
             {
-            pushFollow(FOLLOW_rule__RoomModel__Group__2__Impl_in_rule__RoomModel__Group__210109);
+            pushFollow(FOLLOW_4);
             rule__RoomModel__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RoomModel__Group__3_in_rule__RoomModel__Group__210112);
+            pushFollow(FOLLOW_2);
             rule__RoomModel__Group__3();
 
             state._fsp--;
@@ -14439,20 +14439,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RoomModel__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4635:1: rule__RoomModel__Group__2__Impl : ( ( rule__RoomModel__DocuAssignment_2 )? ) ;
+    // InternalRoom.g:4638:1: rule__RoomModel__Group__2__Impl : ( ( rule__RoomModel__DocuAssignment_2 )? ) ;
     public final void rule__RoomModel__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4639:1: ( ( ( rule__RoomModel__DocuAssignment_2 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4640:1: ( ( rule__RoomModel__DocuAssignment_2 )? )
+            // InternalRoom.g:4642:1: ( ( ( rule__RoomModel__DocuAssignment_2 )? ) )
+            // InternalRoom.g:4643:1: ( ( rule__RoomModel__DocuAssignment_2 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4640:1: ( ( rule__RoomModel__DocuAssignment_2 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4641:1: ( rule__RoomModel__DocuAssignment_2 )?
+            // InternalRoom.g:4643:1: ( ( rule__RoomModel__DocuAssignment_2 )? )
+            // InternalRoom.g:4644:1: ( rule__RoomModel__DocuAssignment_2 )?
             {
              before(grammarAccess.getRoomModelAccess().getDocuAssignment_2()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4642:1: ( rule__RoomModel__DocuAssignment_2 )?
+            // InternalRoom.g:4645:1: ( rule__RoomModel__DocuAssignment_2 )?
             int alt54=2;
             int LA54_0 = input.LA(1);
 
@@ -14461,9 +14461,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt54) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4642:2: rule__RoomModel__DocuAssignment_2
+                    // InternalRoom.g:4645:2: rule__RoomModel__DocuAssignment_2
                     {
-                    pushFollow(FOLLOW_rule__RoomModel__DocuAssignment_2_in_rule__RoomModel__Group__2__Impl10139);
+                    pushFollow(FOLLOW_2);
                     rule__RoomModel__DocuAssignment_2();
 
                     state._fsp--;
@@ -14497,21 +14497,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RoomModel__Group__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4652:1: rule__RoomModel__Group__3 : rule__RoomModel__Group__3__Impl rule__RoomModel__Group__4 ;
+    // InternalRoom.g:4655:1: rule__RoomModel__Group__3 : rule__RoomModel__Group__3__Impl rule__RoomModel__Group__4 ;
     public final void rule__RoomModel__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4656:1: ( rule__RoomModel__Group__3__Impl rule__RoomModel__Group__4 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4657:2: rule__RoomModel__Group__3__Impl rule__RoomModel__Group__4
+            // InternalRoom.g:4659:1: ( rule__RoomModel__Group__3__Impl rule__RoomModel__Group__4 )
+            // InternalRoom.g:4660:2: rule__RoomModel__Group__3__Impl rule__RoomModel__Group__4
             {
-            pushFollow(FOLLOW_rule__RoomModel__Group__3__Impl_in_rule__RoomModel__Group__310170);
+            pushFollow(FOLLOW_5);
             rule__RoomModel__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RoomModel__Group__4_in_rule__RoomModel__Group__310173);
+            pushFollow(FOLLOW_2);
             rule__RoomModel__Group__4();
 
             state._fsp--;
@@ -14535,20 +14535,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RoomModel__Group__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4664:1: rule__RoomModel__Group__3__Impl : ( '{' ) ;
+    // InternalRoom.g:4667:1: rule__RoomModel__Group__3__Impl : ( '{' ) ;
     public final void rule__RoomModel__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4668:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4669:1: ( '{' )
+            // InternalRoom.g:4671:1: ( ( '{' ) )
+            // InternalRoom.g:4672:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4669:1: ( '{' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4670:1: '{'
+            // InternalRoom.g:4672:1: ( '{' )
+            // InternalRoom.g:4673:1: '{'
             {
              before(grammarAccess.getRoomModelAccess().getLeftCurlyBracketKeyword_3()); 
-            match(input,41,FOLLOW_41_in_rule__RoomModel__Group__3__Impl10201); 
+            match(input,41,FOLLOW_2); 
              after(grammarAccess.getRoomModelAccess().getLeftCurlyBracketKeyword_3()); 
 
             }
@@ -14572,21 +14572,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RoomModel__Group__4"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4683:1: rule__RoomModel__Group__4 : rule__RoomModel__Group__4__Impl rule__RoomModel__Group__5 ;
+    // InternalRoom.g:4686:1: rule__RoomModel__Group__4 : rule__RoomModel__Group__4__Impl rule__RoomModel__Group__5 ;
     public final void rule__RoomModel__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4687:1: ( rule__RoomModel__Group__4__Impl rule__RoomModel__Group__5 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4688:2: rule__RoomModel__Group__4__Impl rule__RoomModel__Group__5
+            // InternalRoom.g:4690:1: ( rule__RoomModel__Group__4__Impl rule__RoomModel__Group__5 )
+            // InternalRoom.g:4691:2: rule__RoomModel__Group__4__Impl rule__RoomModel__Group__5
             {
-            pushFollow(FOLLOW_rule__RoomModel__Group__4__Impl_in_rule__RoomModel__Group__410232);
+            pushFollow(FOLLOW_5);
             rule__RoomModel__Group__4__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RoomModel__Group__5_in_rule__RoomModel__Group__410235);
+            pushFollow(FOLLOW_2);
             rule__RoomModel__Group__5();
 
             state._fsp--;
@@ -14610,20 +14610,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RoomModel__Group__4__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4695:1: rule__RoomModel__Group__4__Impl : ( ( rule__RoomModel__ImportsAssignment_4 )* ) ;
+    // InternalRoom.g:4698:1: rule__RoomModel__Group__4__Impl : ( ( rule__RoomModel__ImportsAssignment_4 )* ) ;
     public final void rule__RoomModel__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4699:1: ( ( ( rule__RoomModel__ImportsAssignment_4 )* ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4700:1: ( ( rule__RoomModel__ImportsAssignment_4 )* )
+            // InternalRoom.g:4702:1: ( ( ( rule__RoomModel__ImportsAssignment_4 )* ) )
+            // InternalRoom.g:4703:1: ( ( rule__RoomModel__ImportsAssignment_4 )* )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4700:1: ( ( rule__RoomModel__ImportsAssignment_4 )* )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4701:1: ( rule__RoomModel__ImportsAssignment_4 )*
+            // InternalRoom.g:4703:1: ( ( rule__RoomModel__ImportsAssignment_4 )* )
+            // InternalRoom.g:4704:1: ( rule__RoomModel__ImportsAssignment_4 )*
             {
              before(grammarAccess.getRoomModelAccess().getImportsAssignment_4()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4702:1: ( rule__RoomModel__ImportsAssignment_4 )*
+            // InternalRoom.g:4705:1: ( rule__RoomModel__ImportsAssignment_4 )*
             loop55:
             do {
                 int alt55=2;
@@ -14636,9 +14636,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
                 switch (alt55) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4702:2: rule__RoomModel__ImportsAssignment_4
+            	    // InternalRoom.g:4705:2: rule__RoomModel__ImportsAssignment_4
             	    {
-            	    pushFollow(FOLLOW_rule__RoomModel__ImportsAssignment_4_in_rule__RoomModel__Group__4__Impl10262);
+            	    pushFollow(FOLLOW_6);
             	    rule__RoomModel__ImportsAssignment_4();
 
             	    state._fsp--;
@@ -14675,21 +14675,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RoomModel__Group__5"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4712:1: rule__RoomModel__Group__5 : rule__RoomModel__Group__5__Impl rule__RoomModel__Group__6 ;
+    // InternalRoom.g:4715:1: rule__RoomModel__Group__5 : rule__RoomModel__Group__5__Impl rule__RoomModel__Group__6 ;
     public final void rule__RoomModel__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4716:1: ( rule__RoomModel__Group__5__Impl rule__RoomModel__Group__6 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4717:2: rule__RoomModel__Group__5__Impl rule__RoomModel__Group__6
+            // InternalRoom.g:4719:1: ( rule__RoomModel__Group__5__Impl rule__RoomModel__Group__6 )
+            // InternalRoom.g:4720:2: rule__RoomModel__Group__5__Impl rule__RoomModel__Group__6
             {
-            pushFollow(FOLLOW_rule__RoomModel__Group__5__Impl_in_rule__RoomModel__Group__510293);
+            pushFollow(FOLLOW_5);
             rule__RoomModel__Group__5__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RoomModel__Group__6_in_rule__RoomModel__Group__510296);
+            pushFollow(FOLLOW_2);
             rule__RoomModel__Group__6();
 
             state._fsp--;
@@ -14713,20 +14713,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RoomModel__Group__5__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4724:1: rule__RoomModel__Group__5__Impl : ( ( rule__RoomModel__Alternatives_5 )* ) ;
+    // InternalRoom.g:4727:1: rule__RoomModel__Group__5__Impl : ( ( rule__RoomModel__Alternatives_5 )* ) ;
     public final void rule__RoomModel__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4728:1: ( ( ( rule__RoomModel__Alternatives_5 )* ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4729:1: ( ( rule__RoomModel__Alternatives_5 )* )
+            // InternalRoom.g:4731:1: ( ( ( rule__RoomModel__Alternatives_5 )* ) )
+            // InternalRoom.g:4732:1: ( ( rule__RoomModel__Alternatives_5 )* )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4729:1: ( ( rule__RoomModel__Alternatives_5 )* )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4730:1: ( rule__RoomModel__Alternatives_5 )*
+            // InternalRoom.g:4732:1: ( ( rule__RoomModel__Alternatives_5 )* )
+            // InternalRoom.g:4733:1: ( rule__RoomModel__Alternatives_5 )*
             {
              before(grammarAccess.getRoomModelAccess().getAlternatives_5()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4731:1: ( rule__RoomModel__Alternatives_5 )*
+            // InternalRoom.g:4734:1: ( rule__RoomModel__Alternatives_5 )*
             loop56:
             do {
                 int alt56=2;
@@ -14739,9 +14739,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
                 switch (alt56) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4731:2: rule__RoomModel__Alternatives_5
+            	    // InternalRoom.g:4734:2: rule__RoomModel__Alternatives_5
             	    {
-            	    pushFollow(FOLLOW_rule__RoomModel__Alternatives_5_in_rule__RoomModel__Group__5__Impl10323);
+            	    pushFollow(FOLLOW_7);
             	    rule__RoomModel__Alternatives_5();
 
             	    state._fsp--;
@@ -14778,16 +14778,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RoomModel__Group__6"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4741:1: rule__RoomModel__Group__6 : rule__RoomModel__Group__6__Impl ;
+    // InternalRoom.g:4744:1: rule__RoomModel__Group__6 : rule__RoomModel__Group__6__Impl ;
     public final void rule__RoomModel__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4745:1: ( rule__RoomModel__Group__6__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4746:2: rule__RoomModel__Group__6__Impl
+            // InternalRoom.g:4748:1: ( rule__RoomModel__Group__6__Impl )
+            // InternalRoom.g:4749:2: rule__RoomModel__Group__6__Impl
             {
-            pushFollow(FOLLOW_rule__RoomModel__Group__6__Impl_in_rule__RoomModel__Group__610354);
+            pushFollow(FOLLOW_2);
             rule__RoomModel__Group__6__Impl();
 
             state._fsp--;
@@ -14811,20 +14811,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RoomModel__Group__6__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4752:1: rule__RoomModel__Group__6__Impl : ( '}' ) ;
+    // InternalRoom.g:4755:1: rule__RoomModel__Group__6__Impl : ( '}' ) ;
     public final void rule__RoomModel__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4756:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4757:1: ( '}' )
+            // InternalRoom.g:4759:1: ( ( '}' ) )
+            // InternalRoom.g:4760:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4757:1: ( '}' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4758:1: '}'
+            // InternalRoom.g:4760:1: ( '}' )
+            // InternalRoom.g:4761:1: '}'
             {
              before(grammarAccess.getRoomModelAccess().getRightCurlyBracketKeyword_6()); 
-            match(input,42,FOLLOW_42_in_rule__RoomModel__Group__6__Impl10382); 
+            match(input,42,FOLLOW_2); 
              after(grammarAccess.getRoomModelAccess().getRightCurlyBracketKeyword_6()); 
 
             }
@@ -14848,21 +14848,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__VarDecl__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4785:1: rule__VarDecl__Group__0 : rule__VarDecl__Group__0__Impl rule__VarDecl__Group__1 ;
+    // InternalRoom.g:4788:1: rule__VarDecl__Group__0 : rule__VarDecl__Group__0__Impl rule__VarDecl__Group__1 ;
     public final void rule__VarDecl__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4789:1: ( rule__VarDecl__Group__0__Impl rule__VarDecl__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4790:2: rule__VarDecl__Group__0__Impl rule__VarDecl__Group__1
+            // InternalRoom.g:4792:1: ( rule__VarDecl__Group__0__Impl rule__VarDecl__Group__1 )
+            // InternalRoom.g:4793:2: rule__VarDecl__Group__0__Impl rule__VarDecl__Group__1
             {
-            pushFollow(FOLLOW_rule__VarDecl__Group__0__Impl_in_rule__VarDecl__Group__010427);
+            pushFollow(FOLLOW_8);
             rule__VarDecl__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__VarDecl__Group__1_in_rule__VarDecl__Group__010430);
+            pushFollow(FOLLOW_2);
             rule__VarDecl__Group__1();
 
             state._fsp--;
@@ -14886,23 +14886,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__VarDecl__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4797:1: rule__VarDecl__Group__0__Impl : ( ( rule__VarDecl__NameAssignment_0 ) ) ;
+    // InternalRoom.g:4800:1: rule__VarDecl__Group__0__Impl : ( ( rule__VarDecl__NameAssignment_0 ) ) ;
     public final void rule__VarDecl__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4801:1: ( ( ( rule__VarDecl__NameAssignment_0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4802:1: ( ( rule__VarDecl__NameAssignment_0 ) )
+            // InternalRoom.g:4804:1: ( ( ( rule__VarDecl__NameAssignment_0 ) ) )
+            // InternalRoom.g:4805:1: ( ( rule__VarDecl__NameAssignment_0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4802:1: ( ( rule__VarDecl__NameAssignment_0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4803:1: ( rule__VarDecl__NameAssignment_0 )
+            // InternalRoom.g:4805:1: ( ( rule__VarDecl__NameAssignment_0 ) )
+            // InternalRoom.g:4806:1: ( rule__VarDecl__NameAssignment_0 )
             {
              before(grammarAccess.getVarDeclAccess().getNameAssignment_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4804:1: ( rule__VarDecl__NameAssignment_0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4804:2: rule__VarDecl__NameAssignment_0
+            // InternalRoom.g:4807:1: ( rule__VarDecl__NameAssignment_0 )
+            // InternalRoom.g:4807:2: rule__VarDecl__NameAssignment_0
             {
-            pushFollow(FOLLOW_rule__VarDecl__NameAssignment_0_in_rule__VarDecl__Group__0__Impl10457);
+            pushFollow(FOLLOW_2);
             rule__VarDecl__NameAssignment_0();
 
             state._fsp--;
@@ -14933,21 +14933,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__VarDecl__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4814:1: rule__VarDecl__Group__1 : rule__VarDecl__Group__1__Impl rule__VarDecl__Group__2 ;
+    // InternalRoom.g:4817:1: rule__VarDecl__Group__1 : rule__VarDecl__Group__1__Impl rule__VarDecl__Group__2 ;
     public final void rule__VarDecl__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4818:1: ( rule__VarDecl__Group__1__Impl rule__VarDecl__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4819:2: rule__VarDecl__Group__1__Impl rule__VarDecl__Group__2
+            // InternalRoom.g:4821:1: ( rule__VarDecl__Group__1__Impl rule__VarDecl__Group__2 )
+            // InternalRoom.g:4822:2: rule__VarDecl__Group__1__Impl rule__VarDecl__Group__2
             {
-            pushFollow(FOLLOW_rule__VarDecl__Group__1__Impl_in_rule__VarDecl__Group__110487);
+            pushFollow(FOLLOW_3);
             rule__VarDecl__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__VarDecl__Group__2_in_rule__VarDecl__Group__110490);
+            pushFollow(FOLLOW_2);
             rule__VarDecl__Group__2();
 
             state._fsp--;
@@ -14971,20 +14971,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__VarDecl__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4826:1: rule__VarDecl__Group__1__Impl : ( ':' ) ;
+    // InternalRoom.g:4829:1: rule__VarDecl__Group__1__Impl : ( ':' ) ;
     public final void rule__VarDecl__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4830:1: ( ( ':' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4831:1: ( ':' )
+            // InternalRoom.g:4833:1: ( ( ':' ) )
+            // InternalRoom.g:4834:1: ( ':' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4831:1: ( ':' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4832:1: ':'
+            // InternalRoom.g:4834:1: ( ':' )
+            // InternalRoom.g:4835:1: ':'
             {
              before(grammarAccess.getVarDeclAccess().getColonKeyword_1()); 
-            match(input,43,FOLLOW_43_in_rule__VarDecl__Group__1__Impl10518); 
+            match(input,43,FOLLOW_2); 
              after(grammarAccess.getVarDeclAccess().getColonKeyword_1()); 
 
             }
@@ -15008,16 +15008,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__VarDecl__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4845:1: rule__VarDecl__Group__2 : rule__VarDecl__Group__2__Impl ;
+    // InternalRoom.g:4848:1: rule__VarDecl__Group__2 : rule__VarDecl__Group__2__Impl ;
     public final void rule__VarDecl__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4849:1: ( rule__VarDecl__Group__2__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4850:2: rule__VarDecl__Group__2__Impl
+            // InternalRoom.g:4852:1: ( rule__VarDecl__Group__2__Impl )
+            // InternalRoom.g:4853:2: rule__VarDecl__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__VarDecl__Group__2__Impl_in_rule__VarDecl__Group__210549);
+            pushFollow(FOLLOW_2);
             rule__VarDecl__Group__2__Impl();
 
             state._fsp--;
@@ -15041,23 +15041,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__VarDecl__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4856:1: rule__VarDecl__Group__2__Impl : ( ( rule__VarDecl__RefTypeAssignment_2 ) ) ;
+    // InternalRoom.g:4859:1: rule__VarDecl__Group__2__Impl : ( ( rule__VarDecl__RefTypeAssignment_2 ) ) ;
     public final void rule__VarDecl__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4860:1: ( ( ( rule__VarDecl__RefTypeAssignment_2 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4861:1: ( ( rule__VarDecl__RefTypeAssignment_2 ) )
+            // InternalRoom.g:4863:1: ( ( ( rule__VarDecl__RefTypeAssignment_2 ) ) )
+            // InternalRoom.g:4864:1: ( ( rule__VarDecl__RefTypeAssignment_2 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4861:1: ( ( rule__VarDecl__RefTypeAssignment_2 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4862:1: ( rule__VarDecl__RefTypeAssignment_2 )
+            // InternalRoom.g:4864:1: ( ( rule__VarDecl__RefTypeAssignment_2 ) )
+            // InternalRoom.g:4865:1: ( rule__VarDecl__RefTypeAssignment_2 )
             {
              before(grammarAccess.getVarDeclAccess().getRefTypeAssignment_2()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4863:1: ( rule__VarDecl__RefTypeAssignment_2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4863:2: rule__VarDecl__RefTypeAssignment_2
+            // InternalRoom.g:4866:1: ( rule__VarDecl__RefTypeAssignment_2 )
+            // InternalRoom.g:4866:2: rule__VarDecl__RefTypeAssignment_2
             {
-            pushFollow(FOLLOW_rule__VarDecl__RefTypeAssignment_2_in_rule__VarDecl__Group__2__Impl10576);
+            pushFollow(FOLLOW_2);
             rule__VarDecl__RefTypeAssignment_2();
 
             state._fsp--;
@@ -15088,21 +15088,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefableType__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4879:1: rule__RefableType__Group__0 : rule__RefableType__Group__0__Impl rule__RefableType__Group__1 ;
+    // InternalRoom.g:4882:1: rule__RefableType__Group__0 : rule__RefableType__Group__0__Impl rule__RefableType__Group__1 ;
     public final void rule__RefableType__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4883:1: ( rule__RefableType__Group__0__Impl rule__RefableType__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4884:2: rule__RefableType__Group__0__Impl rule__RefableType__Group__1
+            // InternalRoom.g:4886:1: ( rule__RefableType__Group__0__Impl rule__RefableType__Group__1 )
+            // InternalRoom.g:4887:2: rule__RefableType__Group__0__Impl rule__RefableType__Group__1
             {
-            pushFollow(FOLLOW_rule__RefableType__Group__0__Impl_in_rule__RefableType__Group__010612);
+            pushFollow(FOLLOW_9);
             rule__RefableType__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RefableType__Group__1_in_rule__RefableType__Group__010615);
+            pushFollow(FOLLOW_2);
             rule__RefableType__Group__1();
 
             state._fsp--;
@@ -15126,23 +15126,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefableType__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4891:1: rule__RefableType__Group__0__Impl : ( ( rule__RefableType__TypeAssignment_0 ) ) ;
+    // InternalRoom.g:4894:1: rule__RefableType__Group__0__Impl : ( ( rule__RefableType__TypeAssignment_0 ) ) ;
     public final void rule__RefableType__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4895:1: ( ( ( rule__RefableType__TypeAssignment_0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4896:1: ( ( rule__RefableType__TypeAssignment_0 ) )
+            // InternalRoom.g:4898:1: ( ( ( rule__RefableType__TypeAssignment_0 ) ) )
+            // InternalRoom.g:4899:1: ( ( rule__RefableType__TypeAssignment_0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4896:1: ( ( rule__RefableType__TypeAssignment_0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4897:1: ( rule__RefableType__TypeAssignment_0 )
+            // InternalRoom.g:4899:1: ( ( rule__RefableType__TypeAssignment_0 ) )
+            // InternalRoom.g:4900:1: ( rule__RefableType__TypeAssignment_0 )
             {
              before(grammarAccess.getRefableTypeAccess().getTypeAssignment_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4898:1: ( rule__RefableType__TypeAssignment_0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4898:2: rule__RefableType__TypeAssignment_0
+            // InternalRoom.g:4901:1: ( rule__RefableType__TypeAssignment_0 )
+            // InternalRoom.g:4901:2: rule__RefableType__TypeAssignment_0
             {
-            pushFollow(FOLLOW_rule__RefableType__TypeAssignment_0_in_rule__RefableType__Group__0__Impl10642);
+            pushFollow(FOLLOW_2);
             rule__RefableType__TypeAssignment_0();
 
             state._fsp--;
@@ -15173,16 +15173,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefableType__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4908:1: rule__RefableType__Group__1 : rule__RefableType__Group__1__Impl ;
+    // InternalRoom.g:4911:1: rule__RefableType__Group__1 : rule__RefableType__Group__1__Impl ;
     public final void rule__RefableType__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4912:1: ( rule__RefableType__Group__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4913:2: rule__RefableType__Group__1__Impl
+            // InternalRoom.g:4915:1: ( rule__RefableType__Group__1__Impl )
+            // InternalRoom.g:4916:2: rule__RefableType__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__RefableType__Group__1__Impl_in_rule__RefableType__Group__110672);
+            pushFollow(FOLLOW_2);
             rule__RefableType__Group__1__Impl();
 
             state._fsp--;
@@ -15206,20 +15206,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefableType__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4919:1: rule__RefableType__Group__1__Impl : ( ( rule__RefableType__RefAssignment_1 )? ) ;
+    // InternalRoom.g:4922:1: rule__RefableType__Group__1__Impl : ( ( rule__RefableType__RefAssignment_1 )? ) ;
     public final void rule__RefableType__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4923:1: ( ( ( rule__RefableType__RefAssignment_1 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4924:1: ( ( rule__RefableType__RefAssignment_1 )? )
+            // InternalRoom.g:4926:1: ( ( ( rule__RefableType__RefAssignment_1 )? ) )
+            // InternalRoom.g:4927:1: ( ( rule__RefableType__RefAssignment_1 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4924:1: ( ( rule__RefableType__RefAssignment_1 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4925:1: ( rule__RefableType__RefAssignment_1 )?
+            // InternalRoom.g:4927:1: ( ( rule__RefableType__RefAssignment_1 )? )
+            // InternalRoom.g:4928:1: ( rule__RefableType__RefAssignment_1 )?
             {
              before(grammarAccess.getRefableTypeAccess().getRefAssignment_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4926:1: ( rule__RefableType__RefAssignment_1 )?
+            // InternalRoom.g:4929:1: ( rule__RefableType__RefAssignment_1 )?
             int alt57=2;
             int LA57_0 = input.LA(1);
 
@@ -15228,9 +15228,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt57) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4926:2: rule__RefableType__RefAssignment_1
+                    // InternalRoom.g:4929:2: rule__RefableType__RefAssignment_1
                     {
-                    pushFollow(FOLLOW_rule__RefableType__RefAssignment_1_in_rule__RefableType__Group__1__Impl10699);
+                    pushFollow(FOLLOW_2);
                     rule__RefableType__RefAssignment_1();
 
                     state._fsp--;
@@ -15264,21 +15264,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PrimitiveType__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4940:1: rule__PrimitiveType__Group__0 : rule__PrimitiveType__Group__0__Impl rule__PrimitiveType__Group__1 ;
+    // InternalRoom.g:4943:1: rule__PrimitiveType__Group__0 : rule__PrimitiveType__Group__0__Impl rule__PrimitiveType__Group__1 ;
     public final void rule__PrimitiveType__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4944:1: ( rule__PrimitiveType__Group__0__Impl rule__PrimitiveType__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4945:2: rule__PrimitiveType__Group__0__Impl rule__PrimitiveType__Group__1
+            // InternalRoom.g:4947:1: ( rule__PrimitiveType__Group__0__Impl rule__PrimitiveType__Group__1 )
+            // InternalRoom.g:4948:2: rule__PrimitiveType__Group__0__Impl rule__PrimitiveType__Group__1
             {
-            pushFollow(FOLLOW_rule__PrimitiveType__Group__0__Impl_in_rule__PrimitiveType__Group__010734);
+            pushFollow(FOLLOW_3);
             rule__PrimitiveType__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__PrimitiveType__Group__1_in_rule__PrimitiveType__Group__010737);
+            pushFollow(FOLLOW_2);
             rule__PrimitiveType__Group__1();
 
             state._fsp--;
@@ -15302,20 +15302,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PrimitiveType__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4952:1: rule__PrimitiveType__Group__0__Impl : ( 'PrimitiveType' ) ;
+    // InternalRoom.g:4955:1: rule__PrimitiveType__Group__0__Impl : ( 'PrimitiveType' ) ;
     public final void rule__PrimitiveType__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4956:1: ( ( 'PrimitiveType' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4957:1: ( 'PrimitiveType' )
+            // InternalRoom.g:4959:1: ( ( 'PrimitiveType' ) )
+            // InternalRoom.g:4960:1: ( 'PrimitiveType' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4957:1: ( 'PrimitiveType' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4958:1: 'PrimitiveType'
+            // InternalRoom.g:4960:1: ( 'PrimitiveType' )
+            // InternalRoom.g:4961:1: 'PrimitiveType'
             {
              before(grammarAccess.getPrimitiveTypeAccess().getPrimitiveTypeKeyword_0()); 
-            match(input,44,FOLLOW_44_in_rule__PrimitiveType__Group__0__Impl10765); 
+            match(input,44,FOLLOW_2); 
              after(grammarAccess.getPrimitiveTypeAccess().getPrimitiveTypeKeyword_0()); 
 
             }
@@ -15339,21 +15339,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PrimitiveType__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4971:1: rule__PrimitiveType__Group__1 : rule__PrimitiveType__Group__1__Impl rule__PrimitiveType__Group__2 ;
+    // InternalRoom.g:4974:1: rule__PrimitiveType__Group__1 : rule__PrimitiveType__Group__1__Impl rule__PrimitiveType__Group__2 ;
     public final void rule__PrimitiveType__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4975:1: ( rule__PrimitiveType__Group__1__Impl rule__PrimitiveType__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4976:2: rule__PrimitiveType__Group__1__Impl rule__PrimitiveType__Group__2
+            // InternalRoom.g:4978:1: ( rule__PrimitiveType__Group__1__Impl rule__PrimitiveType__Group__2 )
+            // InternalRoom.g:4979:2: rule__PrimitiveType__Group__1__Impl rule__PrimitiveType__Group__2
             {
-            pushFollow(FOLLOW_rule__PrimitiveType__Group__1__Impl_in_rule__PrimitiveType__Group__110796);
+            pushFollow(FOLLOW_8);
             rule__PrimitiveType__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__PrimitiveType__Group__2_in_rule__PrimitiveType__Group__110799);
+            pushFollow(FOLLOW_2);
             rule__PrimitiveType__Group__2();
 
             state._fsp--;
@@ -15377,23 +15377,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PrimitiveType__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4983:1: rule__PrimitiveType__Group__1__Impl : ( ( rule__PrimitiveType__NameAssignment_1 ) ) ;
+    // InternalRoom.g:4986:1: rule__PrimitiveType__Group__1__Impl : ( ( rule__PrimitiveType__NameAssignment_1 ) ) ;
     public final void rule__PrimitiveType__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4987:1: ( ( ( rule__PrimitiveType__NameAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4988:1: ( ( rule__PrimitiveType__NameAssignment_1 ) )
+            // InternalRoom.g:4990:1: ( ( ( rule__PrimitiveType__NameAssignment_1 ) ) )
+            // InternalRoom.g:4991:1: ( ( rule__PrimitiveType__NameAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4988:1: ( ( rule__PrimitiveType__NameAssignment_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4989:1: ( rule__PrimitiveType__NameAssignment_1 )
+            // InternalRoom.g:4991:1: ( ( rule__PrimitiveType__NameAssignment_1 ) )
+            // InternalRoom.g:4992:1: ( rule__PrimitiveType__NameAssignment_1 )
             {
              before(grammarAccess.getPrimitiveTypeAccess().getNameAssignment_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4990:1: ( rule__PrimitiveType__NameAssignment_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:4990:2: rule__PrimitiveType__NameAssignment_1
+            // InternalRoom.g:4993:1: ( rule__PrimitiveType__NameAssignment_1 )
+            // InternalRoom.g:4993:2: rule__PrimitiveType__NameAssignment_1
             {
-            pushFollow(FOLLOW_rule__PrimitiveType__NameAssignment_1_in_rule__PrimitiveType__Group__1__Impl10826);
+            pushFollow(FOLLOW_2);
             rule__PrimitiveType__NameAssignment_1();
 
             state._fsp--;
@@ -15424,21 +15424,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PrimitiveType__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5000:1: rule__PrimitiveType__Group__2 : rule__PrimitiveType__Group__2__Impl rule__PrimitiveType__Group__3 ;
+    // InternalRoom.g:5003:1: rule__PrimitiveType__Group__2 : rule__PrimitiveType__Group__2__Impl rule__PrimitiveType__Group__3 ;
     public final void rule__PrimitiveType__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5004:1: ( rule__PrimitiveType__Group__2__Impl rule__PrimitiveType__Group__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5005:2: rule__PrimitiveType__Group__2__Impl rule__PrimitiveType__Group__3
+            // InternalRoom.g:5007:1: ( rule__PrimitiveType__Group__2__Impl rule__PrimitiveType__Group__3 )
+            // InternalRoom.g:5008:2: rule__PrimitiveType__Group__2__Impl rule__PrimitiveType__Group__3
             {
-            pushFollow(FOLLOW_rule__PrimitiveType__Group__2__Impl_in_rule__PrimitiveType__Group__210856);
+            pushFollow(FOLLOW_10);
             rule__PrimitiveType__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__PrimitiveType__Group__3_in_rule__PrimitiveType__Group__210859);
+            pushFollow(FOLLOW_2);
             rule__PrimitiveType__Group__3();
 
             state._fsp--;
@@ -15462,20 +15462,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PrimitiveType__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5012:1: rule__PrimitiveType__Group__2__Impl : ( ':' ) ;
+    // InternalRoom.g:5015:1: rule__PrimitiveType__Group__2__Impl : ( ':' ) ;
     public final void rule__PrimitiveType__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5016:1: ( ( ':' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5017:1: ( ':' )
+            // InternalRoom.g:5019:1: ( ( ':' ) )
+            // InternalRoom.g:5020:1: ( ':' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5017:1: ( ':' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5018:1: ':'
+            // InternalRoom.g:5020:1: ( ':' )
+            // InternalRoom.g:5021:1: ':'
             {
              before(grammarAccess.getPrimitiveTypeAccess().getColonKeyword_2()); 
-            match(input,43,FOLLOW_43_in_rule__PrimitiveType__Group__2__Impl10887); 
+            match(input,43,FOLLOW_2); 
              after(grammarAccess.getPrimitiveTypeAccess().getColonKeyword_2()); 
 
             }
@@ -15499,21 +15499,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PrimitiveType__Group__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5031:1: rule__PrimitiveType__Group__3 : rule__PrimitiveType__Group__3__Impl rule__PrimitiveType__Group__4 ;
+    // InternalRoom.g:5034:1: rule__PrimitiveType__Group__3 : rule__PrimitiveType__Group__3__Impl rule__PrimitiveType__Group__4 ;
     public final void rule__PrimitiveType__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5035:1: ( rule__PrimitiveType__Group__3__Impl rule__PrimitiveType__Group__4 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5036:2: rule__PrimitiveType__Group__3__Impl rule__PrimitiveType__Group__4
+            // InternalRoom.g:5038:1: ( rule__PrimitiveType__Group__3__Impl rule__PrimitiveType__Group__4 )
+            // InternalRoom.g:5039:2: rule__PrimitiveType__Group__3__Impl rule__PrimitiveType__Group__4
             {
-            pushFollow(FOLLOW_rule__PrimitiveType__Group__3__Impl_in_rule__PrimitiveType__Group__310918);
+            pushFollow(FOLLOW_11);
             rule__PrimitiveType__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__PrimitiveType__Group__4_in_rule__PrimitiveType__Group__310921);
+            pushFollow(FOLLOW_2);
             rule__PrimitiveType__Group__4();
 
             state._fsp--;
@@ -15537,23 +15537,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PrimitiveType__Group__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5043:1: rule__PrimitiveType__Group__3__Impl : ( ( rule__PrimitiveType__TypeAssignment_3 ) ) ;
+    // InternalRoom.g:5046:1: rule__PrimitiveType__Group__3__Impl : ( ( rule__PrimitiveType__TypeAssignment_3 ) ) ;
     public final void rule__PrimitiveType__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5047:1: ( ( ( rule__PrimitiveType__TypeAssignment_3 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5048:1: ( ( rule__PrimitiveType__TypeAssignment_3 ) )
+            // InternalRoom.g:5050:1: ( ( ( rule__PrimitiveType__TypeAssignment_3 ) ) )
+            // InternalRoom.g:5051:1: ( ( rule__PrimitiveType__TypeAssignment_3 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5048:1: ( ( rule__PrimitiveType__TypeAssignment_3 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5049:1: ( rule__PrimitiveType__TypeAssignment_3 )
+            // InternalRoom.g:5051:1: ( ( rule__PrimitiveType__TypeAssignment_3 ) )
+            // InternalRoom.g:5052:1: ( rule__PrimitiveType__TypeAssignment_3 )
             {
              before(grammarAccess.getPrimitiveTypeAccess().getTypeAssignment_3()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5050:1: ( rule__PrimitiveType__TypeAssignment_3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5050:2: rule__PrimitiveType__TypeAssignment_3
+            // InternalRoom.g:5053:1: ( rule__PrimitiveType__TypeAssignment_3 )
+            // InternalRoom.g:5053:2: rule__PrimitiveType__TypeAssignment_3
             {
-            pushFollow(FOLLOW_rule__PrimitiveType__TypeAssignment_3_in_rule__PrimitiveType__Group__3__Impl10948);
+            pushFollow(FOLLOW_2);
             rule__PrimitiveType__TypeAssignment_3();
 
             state._fsp--;
@@ -15584,21 +15584,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PrimitiveType__Group__4"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5060:1: rule__PrimitiveType__Group__4 : rule__PrimitiveType__Group__4__Impl rule__PrimitiveType__Group__5 ;
+    // InternalRoom.g:5063:1: rule__PrimitiveType__Group__4 : rule__PrimitiveType__Group__4__Impl rule__PrimitiveType__Group__5 ;
     public final void rule__PrimitiveType__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5064:1: ( rule__PrimitiveType__Group__4__Impl rule__PrimitiveType__Group__5 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5065:2: rule__PrimitiveType__Group__4__Impl rule__PrimitiveType__Group__5
+            // InternalRoom.g:5067:1: ( rule__PrimitiveType__Group__4__Impl rule__PrimitiveType__Group__5 )
+            // InternalRoom.g:5068:2: rule__PrimitiveType__Group__4__Impl rule__PrimitiveType__Group__5
             {
-            pushFollow(FOLLOW_rule__PrimitiveType__Group__4__Impl_in_rule__PrimitiveType__Group__410978);
+            pushFollow(FOLLOW_12);
             rule__PrimitiveType__Group__4__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__PrimitiveType__Group__5_in_rule__PrimitiveType__Group__410981);
+            pushFollow(FOLLOW_2);
             rule__PrimitiveType__Group__5();
 
             state._fsp--;
@@ -15622,20 +15622,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PrimitiveType__Group__4__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5072:1: rule__PrimitiveType__Group__4__Impl : ( '->' ) ;
+    // InternalRoom.g:5075:1: rule__PrimitiveType__Group__4__Impl : ( '->' ) ;
     public final void rule__PrimitiveType__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5076:1: ( ( '->' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5077:1: ( '->' )
+            // InternalRoom.g:5079:1: ( ( '->' ) )
+            // InternalRoom.g:5080:1: ( '->' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5077:1: ( '->' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5078:1: '->'
+            // InternalRoom.g:5080:1: ( '->' )
+            // InternalRoom.g:5081:1: '->'
             {
              before(grammarAccess.getPrimitiveTypeAccess().getHyphenMinusGreaterThanSignKeyword_4()); 
-            match(input,45,FOLLOW_45_in_rule__PrimitiveType__Group__4__Impl11009); 
+            match(input,45,FOLLOW_2); 
              after(grammarAccess.getPrimitiveTypeAccess().getHyphenMinusGreaterThanSignKeyword_4()); 
 
             }
@@ -15659,21 +15659,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PrimitiveType__Group__5"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5091:1: rule__PrimitiveType__Group__5 : rule__PrimitiveType__Group__5__Impl rule__PrimitiveType__Group__6 ;
+    // InternalRoom.g:5094:1: rule__PrimitiveType__Group__5 : rule__PrimitiveType__Group__5__Impl rule__PrimitiveType__Group__6 ;
     public final void rule__PrimitiveType__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5095:1: ( rule__PrimitiveType__Group__5__Impl rule__PrimitiveType__Group__6 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5096:2: rule__PrimitiveType__Group__5__Impl rule__PrimitiveType__Group__6
+            // InternalRoom.g:5098:1: ( rule__PrimitiveType__Group__5__Impl rule__PrimitiveType__Group__6 )
+            // InternalRoom.g:5099:2: rule__PrimitiveType__Group__5__Impl rule__PrimitiveType__Group__6
             {
-            pushFollow(FOLLOW_rule__PrimitiveType__Group__5__Impl_in_rule__PrimitiveType__Group__511040);
+            pushFollow(FOLLOW_13);
             rule__PrimitiveType__Group__5__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__PrimitiveType__Group__6_in_rule__PrimitiveType__Group__511043);
+            pushFollow(FOLLOW_2);
             rule__PrimitiveType__Group__6();
 
             state._fsp--;
@@ -15697,23 +15697,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PrimitiveType__Group__5__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5103:1: rule__PrimitiveType__Group__5__Impl : ( ( rule__PrimitiveType__TargetNameAssignment_5 ) ) ;
+    // InternalRoom.g:5106:1: rule__PrimitiveType__Group__5__Impl : ( ( rule__PrimitiveType__TargetNameAssignment_5 ) ) ;
     public final void rule__PrimitiveType__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5107:1: ( ( ( rule__PrimitiveType__TargetNameAssignment_5 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5108:1: ( ( rule__PrimitiveType__TargetNameAssignment_5 ) )
+            // InternalRoom.g:5110:1: ( ( ( rule__PrimitiveType__TargetNameAssignment_5 ) ) )
+            // InternalRoom.g:5111:1: ( ( rule__PrimitiveType__TargetNameAssignment_5 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5108:1: ( ( rule__PrimitiveType__TargetNameAssignment_5 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5109:1: ( rule__PrimitiveType__TargetNameAssignment_5 )
+            // InternalRoom.g:5111:1: ( ( rule__PrimitiveType__TargetNameAssignment_5 ) )
+            // InternalRoom.g:5112:1: ( rule__PrimitiveType__TargetNameAssignment_5 )
             {
              before(grammarAccess.getPrimitiveTypeAccess().getTargetNameAssignment_5()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5110:1: ( rule__PrimitiveType__TargetNameAssignment_5 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5110:2: rule__PrimitiveType__TargetNameAssignment_5
+            // InternalRoom.g:5113:1: ( rule__PrimitiveType__TargetNameAssignment_5 )
+            // InternalRoom.g:5113:2: rule__PrimitiveType__TargetNameAssignment_5
             {
-            pushFollow(FOLLOW_rule__PrimitiveType__TargetNameAssignment_5_in_rule__PrimitiveType__Group__5__Impl11070);
+            pushFollow(FOLLOW_2);
             rule__PrimitiveType__TargetNameAssignment_5();
 
             state._fsp--;
@@ -15744,21 +15744,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PrimitiveType__Group__6"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5120:1: rule__PrimitiveType__Group__6 : rule__PrimitiveType__Group__6__Impl rule__PrimitiveType__Group__7 ;
+    // InternalRoom.g:5123:1: rule__PrimitiveType__Group__6 : rule__PrimitiveType__Group__6__Impl rule__PrimitiveType__Group__7 ;
     public final void rule__PrimitiveType__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5124:1: ( rule__PrimitiveType__Group__6__Impl rule__PrimitiveType__Group__7 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5125:2: rule__PrimitiveType__Group__6__Impl rule__PrimitiveType__Group__7
+            // InternalRoom.g:5127:1: ( rule__PrimitiveType__Group__6__Impl rule__PrimitiveType__Group__7 )
+            // InternalRoom.g:5128:2: rule__PrimitiveType__Group__6__Impl rule__PrimitiveType__Group__7
             {
-            pushFollow(FOLLOW_rule__PrimitiveType__Group__6__Impl_in_rule__PrimitiveType__Group__611100);
+            pushFollow(FOLLOW_13);
             rule__PrimitiveType__Group__6__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__PrimitiveType__Group__7_in_rule__PrimitiveType__Group__611103);
+            pushFollow(FOLLOW_2);
             rule__PrimitiveType__Group__7();
 
             state._fsp--;
@@ -15782,20 +15782,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PrimitiveType__Group__6__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5132:1: rule__PrimitiveType__Group__6__Impl : ( ( rule__PrimitiveType__Group_6__0 )? ) ;
+    // InternalRoom.g:5135:1: rule__PrimitiveType__Group__6__Impl : ( ( rule__PrimitiveType__Group_6__0 )? ) ;
     public final void rule__PrimitiveType__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5136:1: ( ( ( rule__PrimitiveType__Group_6__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5137:1: ( ( rule__PrimitiveType__Group_6__0 )? )
+            // InternalRoom.g:5139:1: ( ( ( rule__PrimitiveType__Group_6__0 )? ) )
+            // InternalRoom.g:5140:1: ( ( rule__PrimitiveType__Group_6__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5137:1: ( ( rule__PrimitiveType__Group_6__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5138:1: ( rule__PrimitiveType__Group_6__0 )?
+            // InternalRoom.g:5140:1: ( ( rule__PrimitiveType__Group_6__0 )? )
+            // InternalRoom.g:5141:1: ( rule__PrimitiveType__Group_6__0 )?
             {
              before(grammarAccess.getPrimitiveTypeAccess().getGroup_6()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5139:1: ( rule__PrimitiveType__Group_6__0 )?
+            // InternalRoom.g:5142:1: ( rule__PrimitiveType__Group_6__0 )?
             int alt58=2;
             int LA58_0 = input.LA(1);
 
@@ -15804,9 +15804,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt58) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5139:2: rule__PrimitiveType__Group_6__0
+                    // InternalRoom.g:5142:2: rule__PrimitiveType__Group_6__0
                     {
-                    pushFollow(FOLLOW_rule__PrimitiveType__Group_6__0_in_rule__PrimitiveType__Group__6__Impl11130);
+                    pushFollow(FOLLOW_2);
                     rule__PrimitiveType__Group_6__0();
 
                     state._fsp--;
@@ -15840,21 +15840,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PrimitiveType__Group__7"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5149:1: rule__PrimitiveType__Group__7 : rule__PrimitiveType__Group__7__Impl rule__PrimitiveType__Group__8 ;
+    // InternalRoom.g:5152:1: rule__PrimitiveType__Group__7 : rule__PrimitiveType__Group__7__Impl rule__PrimitiveType__Group__8 ;
     public final void rule__PrimitiveType__Group__7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5153:1: ( rule__PrimitiveType__Group__7__Impl rule__PrimitiveType__Group__8 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5154:2: rule__PrimitiveType__Group__7__Impl rule__PrimitiveType__Group__8
+            // InternalRoom.g:5156:1: ( rule__PrimitiveType__Group__7__Impl rule__PrimitiveType__Group__8 )
+            // InternalRoom.g:5157:2: rule__PrimitiveType__Group__7__Impl rule__PrimitiveType__Group__8
             {
-            pushFollow(FOLLOW_rule__PrimitiveType__Group__7__Impl_in_rule__PrimitiveType__Group__711161);
+            pushFollow(FOLLOW_12);
             rule__PrimitiveType__Group__7__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__PrimitiveType__Group__8_in_rule__PrimitiveType__Group__711164);
+            pushFollow(FOLLOW_2);
             rule__PrimitiveType__Group__8();
 
             state._fsp--;
@@ -15878,20 +15878,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PrimitiveType__Group__7__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5161:1: rule__PrimitiveType__Group__7__Impl : ( 'default' ) ;
+    // InternalRoom.g:5164:1: rule__PrimitiveType__Group__7__Impl : ( 'default' ) ;
     public final void rule__PrimitiveType__Group__7__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5165:1: ( ( 'default' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5166:1: ( 'default' )
+            // InternalRoom.g:5168:1: ( ( 'default' ) )
+            // InternalRoom.g:5169:1: ( 'default' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5166:1: ( 'default' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5167:1: 'default'
+            // InternalRoom.g:5169:1: ( 'default' )
+            // InternalRoom.g:5170:1: 'default'
             {
              before(grammarAccess.getPrimitiveTypeAccess().getDefaultKeyword_7()); 
-            match(input,46,FOLLOW_46_in_rule__PrimitiveType__Group__7__Impl11192); 
+            match(input,46,FOLLOW_2); 
              after(grammarAccess.getPrimitiveTypeAccess().getDefaultKeyword_7()); 
 
             }
@@ -15915,21 +15915,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PrimitiveType__Group__8"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5180:1: rule__PrimitiveType__Group__8 : rule__PrimitiveType__Group__8__Impl rule__PrimitiveType__Group__9 ;
+    // InternalRoom.g:5183:1: rule__PrimitiveType__Group__8 : rule__PrimitiveType__Group__8__Impl rule__PrimitiveType__Group__9 ;
     public final void rule__PrimitiveType__Group__8() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5184:1: ( rule__PrimitiveType__Group__8__Impl rule__PrimitiveType__Group__9 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5185:2: rule__PrimitiveType__Group__8__Impl rule__PrimitiveType__Group__9
+            // InternalRoom.g:5187:1: ( rule__PrimitiveType__Group__8__Impl rule__PrimitiveType__Group__9 )
+            // InternalRoom.g:5188:2: rule__PrimitiveType__Group__8__Impl rule__PrimitiveType__Group__9
             {
-            pushFollow(FOLLOW_rule__PrimitiveType__Group__8__Impl_in_rule__PrimitiveType__Group__811223);
+            pushFollow(FOLLOW_14);
             rule__PrimitiveType__Group__8__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__PrimitiveType__Group__9_in_rule__PrimitiveType__Group__811226);
+            pushFollow(FOLLOW_2);
             rule__PrimitiveType__Group__9();
 
             state._fsp--;
@@ -15953,23 +15953,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PrimitiveType__Group__8__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5192:1: rule__PrimitiveType__Group__8__Impl : ( ( rule__PrimitiveType__DefaultValueLiteralAssignment_8 ) ) ;
+    // InternalRoom.g:5195:1: rule__PrimitiveType__Group__8__Impl : ( ( rule__PrimitiveType__DefaultValueLiteralAssignment_8 ) ) ;
     public final void rule__PrimitiveType__Group__8__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5196:1: ( ( ( rule__PrimitiveType__DefaultValueLiteralAssignment_8 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5197:1: ( ( rule__PrimitiveType__DefaultValueLiteralAssignment_8 ) )
+            // InternalRoom.g:5199:1: ( ( ( rule__PrimitiveType__DefaultValueLiteralAssignment_8 ) ) )
+            // InternalRoom.g:5200:1: ( ( rule__PrimitiveType__DefaultValueLiteralAssignment_8 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5197:1: ( ( rule__PrimitiveType__DefaultValueLiteralAssignment_8 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5198:1: ( rule__PrimitiveType__DefaultValueLiteralAssignment_8 )
+            // InternalRoom.g:5200:1: ( ( rule__PrimitiveType__DefaultValueLiteralAssignment_8 ) )
+            // InternalRoom.g:5201:1: ( rule__PrimitiveType__DefaultValueLiteralAssignment_8 )
             {
              before(grammarAccess.getPrimitiveTypeAccess().getDefaultValueLiteralAssignment_8()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5199:1: ( rule__PrimitiveType__DefaultValueLiteralAssignment_8 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5199:2: rule__PrimitiveType__DefaultValueLiteralAssignment_8
+            // InternalRoom.g:5202:1: ( rule__PrimitiveType__DefaultValueLiteralAssignment_8 )
+            // InternalRoom.g:5202:2: rule__PrimitiveType__DefaultValueLiteralAssignment_8
             {
-            pushFollow(FOLLOW_rule__PrimitiveType__DefaultValueLiteralAssignment_8_in_rule__PrimitiveType__Group__8__Impl11253);
+            pushFollow(FOLLOW_2);
             rule__PrimitiveType__DefaultValueLiteralAssignment_8();
 
             state._fsp--;
@@ -16000,16 +16000,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PrimitiveType__Group__9"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5209:1: rule__PrimitiveType__Group__9 : rule__PrimitiveType__Group__9__Impl ;
+    // InternalRoom.g:5212:1: rule__PrimitiveType__Group__9 : rule__PrimitiveType__Group__9__Impl ;
     public final void rule__PrimitiveType__Group__9() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5213:1: ( rule__PrimitiveType__Group__9__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5214:2: rule__PrimitiveType__Group__9__Impl
+            // InternalRoom.g:5216:1: ( rule__PrimitiveType__Group__9__Impl )
+            // InternalRoom.g:5217:2: rule__PrimitiveType__Group__9__Impl
             {
-            pushFollow(FOLLOW_rule__PrimitiveType__Group__9__Impl_in_rule__PrimitiveType__Group__911283);
+            pushFollow(FOLLOW_2);
             rule__PrimitiveType__Group__9__Impl();
 
             state._fsp--;
@@ -16033,20 +16033,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PrimitiveType__Group__9__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5220:1: rule__PrimitiveType__Group__9__Impl : ( ( rule__PrimitiveType__DocuAssignment_9 )? ) ;
+    // InternalRoom.g:5223:1: rule__PrimitiveType__Group__9__Impl : ( ( rule__PrimitiveType__DocuAssignment_9 )? ) ;
     public final void rule__PrimitiveType__Group__9__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5224:1: ( ( ( rule__PrimitiveType__DocuAssignment_9 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5225:1: ( ( rule__PrimitiveType__DocuAssignment_9 )? )
+            // InternalRoom.g:5227:1: ( ( ( rule__PrimitiveType__DocuAssignment_9 )? ) )
+            // InternalRoom.g:5228:1: ( ( rule__PrimitiveType__DocuAssignment_9 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5225:1: ( ( rule__PrimitiveType__DocuAssignment_9 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5226:1: ( rule__PrimitiveType__DocuAssignment_9 )?
+            // InternalRoom.g:5228:1: ( ( rule__PrimitiveType__DocuAssignment_9 )? )
+            // InternalRoom.g:5229:1: ( rule__PrimitiveType__DocuAssignment_9 )?
             {
              before(grammarAccess.getPrimitiveTypeAccess().getDocuAssignment_9()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5227:1: ( rule__PrimitiveType__DocuAssignment_9 )?
+            // InternalRoom.g:5230:1: ( rule__PrimitiveType__DocuAssignment_9 )?
             int alt59=2;
             int LA59_0 = input.LA(1);
 
@@ -16055,9 +16055,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt59) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5227:2: rule__PrimitiveType__DocuAssignment_9
+                    // InternalRoom.g:5230:2: rule__PrimitiveType__DocuAssignment_9
                     {
-                    pushFollow(FOLLOW_rule__PrimitiveType__DocuAssignment_9_in_rule__PrimitiveType__Group__9__Impl11310);
+                    pushFollow(FOLLOW_2);
                     rule__PrimitiveType__DocuAssignment_9();
 
                     state._fsp--;
@@ -16091,21 +16091,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PrimitiveType__Group_6__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5257:1: rule__PrimitiveType__Group_6__0 : rule__PrimitiveType__Group_6__0__Impl rule__PrimitiveType__Group_6__1 ;
+    // InternalRoom.g:5260:1: rule__PrimitiveType__Group_6__0 : rule__PrimitiveType__Group_6__0__Impl rule__PrimitiveType__Group_6__1 ;
     public final void rule__PrimitiveType__Group_6__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5261:1: ( rule__PrimitiveType__Group_6__0__Impl rule__PrimitiveType__Group_6__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5262:2: rule__PrimitiveType__Group_6__0__Impl rule__PrimitiveType__Group_6__1
+            // InternalRoom.g:5264:1: ( rule__PrimitiveType__Group_6__0__Impl rule__PrimitiveType__Group_6__1 )
+            // InternalRoom.g:5265:2: rule__PrimitiveType__Group_6__0__Impl rule__PrimitiveType__Group_6__1
             {
-            pushFollow(FOLLOW_rule__PrimitiveType__Group_6__0__Impl_in_rule__PrimitiveType__Group_6__011361);
+            pushFollow(FOLLOW_3);
             rule__PrimitiveType__Group_6__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__PrimitiveType__Group_6__1_in_rule__PrimitiveType__Group_6__011364);
+            pushFollow(FOLLOW_2);
             rule__PrimitiveType__Group_6__1();
 
             state._fsp--;
@@ -16129,20 +16129,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PrimitiveType__Group_6__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5269:1: rule__PrimitiveType__Group_6__0__Impl : ( '(' ) ;
+    // InternalRoom.g:5272:1: rule__PrimitiveType__Group_6__0__Impl : ( '(' ) ;
     public final void rule__PrimitiveType__Group_6__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5273:1: ( ( '(' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5274:1: ( '(' )
+            // InternalRoom.g:5276:1: ( ( '(' ) )
+            // InternalRoom.g:5277:1: ( '(' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5274:1: ( '(' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5275:1: '('
+            // InternalRoom.g:5277:1: ( '(' )
+            // InternalRoom.g:5278:1: '('
             {
              before(grammarAccess.getPrimitiveTypeAccess().getLeftParenthesisKeyword_6_0()); 
-            match(input,47,FOLLOW_47_in_rule__PrimitiveType__Group_6__0__Impl11392); 
+            match(input,47,FOLLOW_2); 
              after(grammarAccess.getPrimitiveTypeAccess().getLeftParenthesisKeyword_6_0()); 
 
             }
@@ -16166,21 +16166,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PrimitiveType__Group_6__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5288:1: rule__PrimitiveType__Group_6__1 : rule__PrimitiveType__Group_6__1__Impl rule__PrimitiveType__Group_6__2 ;
+    // InternalRoom.g:5291:1: rule__PrimitiveType__Group_6__1 : rule__PrimitiveType__Group_6__1__Impl rule__PrimitiveType__Group_6__2 ;
     public final void rule__PrimitiveType__Group_6__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5292:1: ( rule__PrimitiveType__Group_6__1__Impl rule__PrimitiveType__Group_6__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5293:2: rule__PrimitiveType__Group_6__1__Impl rule__PrimitiveType__Group_6__2
+            // InternalRoom.g:5295:1: ( rule__PrimitiveType__Group_6__1__Impl rule__PrimitiveType__Group_6__2 )
+            // InternalRoom.g:5296:2: rule__PrimitiveType__Group_6__1__Impl rule__PrimitiveType__Group_6__2
             {
-            pushFollow(FOLLOW_rule__PrimitiveType__Group_6__1__Impl_in_rule__PrimitiveType__Group_6__111423);
+            pushFollow(FOLLOW_15);
             rule__PrimitiveType__Group_6__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__PrimitiveType__Group_6__2_in_rule__PrimitiveType__Group_6__111426);
+            pushFollow(FOLLOW_2);
             rule__PrimitiveType__Group_6__2();
 
             state._fsp--;
@@ -16204,23 +16204,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PrimitiveType__Group_6__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5300:1: rule__PrimitiveType__Group_6__1__Impl : ( ( rule__PrimitiveType__CastNameAssignment_6_1 ) ) ;
+    // InternalRoom.g:5303:1: rule__PrimitiveType__Group_6__1__Impl : ( ( rule__PrimitiveType__CastNameAssignment_6_1 ) ) ;
     public final void rule__PrimitiveType__Group_6__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5304:1: ( ( ( rule__PrimitiveType__CastNameAssignment_6_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5305:1: ( ( rule__PrimitiveType__CastNameAssignment_6_1 ) )
+            // InternalRoom.g:5307:1: ( ( ( rule__PrimitiveType__CastNameAssignment_6_1 ) ) )
+            // InternalRoom.g:5308:1: ( ( rule__PrimitiveType__CastNameAssignment_6_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5305:1: ( ( rule__PrimitiveType__CastNameAssignment_6_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5306:1: ( rule__PrimitiveType__CastNameAssignment_6_1 )
+            // InternalRoom.g:5308:1: ( ( rule__PrimitiveType__CastNameAssignment_6_1 ) )
+            // InternalRoom.g:5309:1: ( rule__PrimitiveType__CastNameAssignment_6_1 )
             {
              before(grammarAccess.getPrimitiveTypeAccess().getCastNameAssignment_6_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5307:1: ( rule__PrimitiveType__CastNameAssignment_6_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5307:2: rule__PrimitiveType__CastNameAssignment_6_1
+            // InternalRoom.g:5310:1: ( rule__PrimitiveType__CastNameAssignment_6_1 )
+            // InternalRoom.g:5310:2: rule__PrimitiveType__CastNameAssignment_6_1
             {
-            pushFollow(FOLLOW_rule__PrimitiveType__CastNameAssignment_6_1_in_rule__PrimitiveType__Group_6__1__Impl11453);
+            pushFollow(FOLLOW_2);
             rule__PrimitiveType__CastNameAssignment_6_1();
 
             state._fsp--;
@@ -16251,16 +16251,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PrimitiveType__Group_6__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5317:1: rule__PrimitiveType__Group_6__2 : rule__PrimitiveType__Group_6__2__Impl ;
+    // InternalRoom.g:5320:1: rule__PrimitiveType__Group_6__2 : rule__PrimitiveType__Group_6__2__Impl ;
     public final void rule__PrimitiveType__Group_6__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5321:1: ( rule__PrimitiveType__Group_6__2__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5322:2: rule__PrimitiveType__Group_6__2__Impl
+            // InternalRoom.g:5324:1: ( rule__PrimitiveType__Group_6__2__Impl )
+            // InternalRoom.g:5325:2: rule__PrimitiveType__Group_6__2__Impl
             {
-            pushFollow(FOLLOW_rule__PrimitiveType__Group_6__2__Impl_in_rule__PrimitiveType__Group_6__211483);
+            pushFollow(FOLLOW_2);
             rule__PrimitiveType__Group_6__2__Impl();
 
             state._fsp--;
@@ -16284,20 +16284,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PrimitiveType__Group_6__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5328:1: rule__PrimitiveType__Group_6__2__Impl : ( ')' ) ;
+    // InternalRoom.g:5331:1: rule__PrimitiveType__Group_6__2__Impl : ( ')' ) ;
     public final void rule__PrimitiveType__Group_6__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5332:1: ( ( ')' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5333:1: ( ')' )
+            // InternalRoom.g:5335:1: ( ( ')' ) )
+            // InternalRoom.g:5336:1: ( ')' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5333:1: ( ')' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5334:1: ')'
+            // InternalRoom.g:5336:1: ( ')' )
+            // InternalRoom.g:5337:1: ')'
             {
              before(grammarAccess.getPrimitiveTypeAccess().getRightParenthesisKeyword_6_2()); 
-            match(input,48,FOLLOW_48_in_rule__PrimitiveType__Group_6__2__Impl11511); 
+            match(input,48,FOLLOW_2); 
              after(grammarAccess.getPrimitiveTypeAccess().getRightParenthesisKeyword_6_2()); 
 
             }
@@ -16321,21 +16321,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumerationType__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5353:1: rule__EnumerationType__Group__0 : rule__EnumerationType__Group__0__Impl rule__EnumerationType__Group__1 ;
+    // InternalRoom.g:5356:1: rule__EnumerationType__Group__0 : rule__EnumerationType__Group__0__Impl rule__EnumerationType__Group__1 ;
     public final void rule__EnumerationType__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5357:1: ( rule__EnumerationType__Group__0__Impl rule__EnumerationType__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5358:2: rule__EnumerationType__Group__0__Impl rule__EnumerationType__Group__1
+            // InternalRoom.g:5360:1: ( rule__EnumerationType__Group__0__Impl rule__EnumerationType__Group__1 )
+            // InternalRoom.g:5361:2: rule__EnumerationType__Group__0__Impl rule__EnumerationType__Group__1
             {
-            pushFollow(FOLLOW_rule__EnumerationType__Group__0__Impl_in_rule__EnumerationType__Group__011548);
+            pushFollow(FOLLOW_3);
             rule__EnumerationType__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__EnumerationType__Group__1_in_rule__EnumerationType__Group__011551);
+            pushFollow(FOLLOW_2);
             rule__EnumerationType__Group__1();
 
             state._fsp--;
@@ -16359,20 +16359,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumerationType__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5365:1: rule__EnumerationType__Group__0__Impl : ( 'Enumeration' ) ;
+    // InternalRoom.g:5368:1: rule__EnumerationType__Group__0__Impl : ( 'Enumeration' ) ;
     public final void rule__EnumerationType__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5369:1: ( ( 'Enumeration' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5370:1: ( 'Enumeration' )
+            // InternalRoom.g:5372:1: ( ( 'Enumeration' ) )
+            // InternalRoom.g:5373:1: ( 'Enumeration' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5370:1: ( 'Enumeration' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5371:1: 'Enumeration'
+            // InternalRoom.g:5373:1: ( 'Enumeration' )
+            // InternalRoom.g:5374:1: 'Enumeration'
             {
              before(grammarAccess.getEnumerationTypeAccess().getEnumerationKeyword_0()); 
-            match(input,49,FOLLOW_49_in_rule__EnumerationType__Group__0__Impl11579); 
+            match(input,49,FOLLOW_2); 
              after(grammarAccess.getEnumerationTypeAccess().getEnumerationKeyword_0()); 
 
             }
@@ -16396,21 +16396,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumerationType__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5384:1: rule__EnumerationType__Group__1 : rule__EnumerationType__Group__1__Impl rule__EnumerationType__Group__2 ;
+    // InternalRoom.g:5387:1: rule__EnumerationType__Group__1 : rule__EnumerationType__Group__1__Impl rule__EnumerationType__Group__2 ;
     public final void rule__EnumerationType__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5388:1: ( rule__EnumerationType__Group__1__Impl rule__EnumerationType__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5389:2: rule__EnumerationType__Group__1__Impl rule__EnumerationType__Group__2
+            // InternalRoom.g:5391:1: ( rule__EnumerationType__Group__1__Impl rule__EnumerationType__Group__2 )
+            // InternalRoom.g:5392:2: rule__EnumerationType__Group__1__Impl rule__EnumerationType__Group__2
             {
-            pushFollow(FOLLOW_rule__EnumerationType__Group__1__Impl_in_rule__EnumerationType__Group__111610);
+            pushFollow(FOLLOW_16);
             rule__EnumerationType__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__EnumerationType__Group__2_in_rule__EnumerationType__Group__111613);
+            pushFollow(FOLLOW_2);
             rule__EnumerationType__Group__2();
 
             state._fsp--;
@@ -16434,23 +16434,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumerationType__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5396:1: rule__EnumerationType__Group__1__Impl : ( ( rule__EnumerationType__NameAssignment_1 ) ) ;
+    // InternalRoom.g:5399:1: rule__EnumerationType__Group__1__Impl : ( ( rule__EnumerationType__NameAssignment_1 ) ) ;
     public final void rule__EnumerationType__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5400:1: ( ( ( rule__EnumerationType__NameAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5401:1: ( ( rule__EnumerationType__NameAssignment_1 ) )
+            // InternalRoom.g:5403:1: ( ( ( rule__EnumerationType__NameAssignment_1 ) ) )
+            // InternalRoom.g:5404:1: ( ( rule__EnumerationType__NameAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5401:1: ( ( rule__EnumerationType__NameAssignment_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5402:1: ( rule__EnumerationType__NameAssignment_1 )
+            // InternalRoom.g:5404:1: ( ( rule__EnumerationType__NameAssignment_1 ) )
+            // InternalRoom.g:5405:1: ( rule__EnumerationType__NameAssignment_1 )
             {
              before(grammarAccess.getEnumerationTypeAccess().getNameAssignment_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5403:1: ( rule__EnumerationType__NameAssignment_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5403:2: rule__EnumerationType__NameAssignment_1
+            // InternalRoom.g:5406:1: ( rule__EnumerationType__NameAssignment_1 )
+            // InternalRoom.g:5406:2: rule__EnumerationType__NameAssignment_1
             {
-            pushFollow(FOLLOW_rule__EnumerationType__NameAssignment_1_in_rule__EnumerationType__Group__1__Impl11640);
+            pushFollow(FOLLOW_2);
             rule__EnumerationType__NameAssignment_1();
 
             state._fsp--;
@@ -16481,21 +16481,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumerationType__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5413:1: rule__EnumerationType__Group__2 : rule__EnumerationType__Group__2__Impl rule__EnumerationType__Group__3 ;
+    // InternalRoom.g:5416:1: rule__EnumerationType__Group__2 : rule__EnumerationType__Group__2__Impl rule__EnumerationType__Group__3 ;
     public final void rule__EnumerationType__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5417:1: ( rule__EnumerationType__Group__2__Impl rule__EnumerationType__Group__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5418:2: rule__EnumerationType__Group__2__Impl rule__EnumerationType__Group__3
+            // InternalRoom.g:5420:1: ( rule__EnumerationType__Group__2__Impl rule__EnumerationType__Group__3 )
+            // InternalRoom.g:5421:2: rule__EnumerationType__Group__2__Impl rule__EnumerationType__Group__3
             {
-            pushFollow(FOLLOW_rule__EnumerationType__Group__2__Impl_in_rule__EnumerationType__Group__211670);
+            pushFollow(FOLLOW_16);
             rule__EnumerationType__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__EnumerationType__Group__3_in_rule__EnumerationType__Group__211673);
+            pushFollow(FOLLOW_2);
             rule__EnumerationType__Group__3();
 
             state._fsp--;
@@ -16519,20 +16519,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumerationType__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5425:1: rule__EnumerationType__Group__2__Impl : ( ( rule__EnumerationType__DocuAssignment_2 )? ) ;
+    // InternalRoom.g:5428:1: rule__EnumerationType__Group__2__Impl : ( ( rule__EnumerationType__DocuAssignment_2 )? ) ;
     public final void rule__EnumerationType__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5429:1: ( ( ( rule__EnumerationType__DocuAssignment_2 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5430:1: ( ( rule__EnumerationType__DocuAssignment_2 )? )
+            // InternalRoom.g:5432:1: ( ( ( rule__EnumerationType__DocuAssignment_2 )? ) )
+            // InternalRoom.g:5433:1: ( ( rule__EnumerationType__DocuAssignment_2 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5430:1: ( ( rule__EnumerationType__DocuAssignment_2 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5431:1: ( rule__EnumerationType__DocuAssignment_2 )?
+            // InternalRoom.g:5433:1: ( ( rule__EnumerationType__DocuAssignment_2 )? )
+            // InternalRoom.g:5434:1: ( rule__EnumerationType__DocuAssignment_2 )?
             {
              before(grammarAccess.getEnumerationTypeAccess().getDocuAssignment_2()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5432:1: ( rule__EnumerationType__DocuAssignment_2 )?
+            // InternalRoom.g:5435:1: ( rule__EnumerationType__DocuAssignment_2 )?
             int alt60=2;
             int LA60_0 = input.LA(1);
 
@@ -16541,9 +16541,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt60) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5432:2: rule__EnumerationType__DocuAssignment_2
+                    // InternalRoom.g:5435:2: rule__EnumerationType__DocuAssignment_2
                     {
-                    pushFollow(FOLLOW_rule__EnumerationType__DocuAssignment_2_in_rule__EnumerationType__Group__2__Impl11700);
+                    pushFollow(FOLLOW_2);
                     rule__EnumerationType__DocuAssignment_2();
 
                     state._fsp--;
@@ -16577,21 +16577,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumerationType__Group__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5442:1: rule__EnumerationType__Group__3 : rule__EnumerationType__Group__3__Impl rule__EnumerationType__Group__4 ;
+    // InternalRoom.g:5445:1: rule__EnumerationType__Group__3 : rule__EnumerationType__Group__3__Impl rule__EnumerationType__Group__4 ;
     public final void rule__EnumerationType__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5446:1: ( rule__EnumerationType__Group__3__Impl rule__EnumerationType__Group__4 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5447:2: rule__EnumerationType__Group__3__Impl rule__EnumerationType__Group__4
+            // InternalRoom.g:5449:1: ( rule__EnumerationType__Group__3__Impl rule__EnumerationType__Group__4 )
+            // InternalRoom.g:5450:2: rule__EnumerationType__Group__3__Impl rule__EnumerationType__Group__4
             {
-            pushFollow(FOLLOW_rule__EnumerationType__Group__3__Impl_in_rule__EnumerationType__Group__311731);
+            pushFollow(FOLLOW_16);
             rule__EnumerationType__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__EnumerationType__Group__4_in_rule__EnumerationType__Group__311734);
+            pushFollow(FOLLOW_2);
             rule__EnumerationType__Group__4();
 
             state._fsp--;
@@ -16615,20 +16615,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumerationType__Group__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5454:1: rule__EnumerationType__Group__3__Impl : ( ( rule__EnumerationType__Group_3__0 )? ) ;
+    // InternalRoom.g:5457:1: rule__EnumerationType__Group__3__Impl : ( ( rule__EnumerationType__Group_3__0 )? ) ;
     public final void rule__EnumerationType__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5458:1: ( ( ( rule__EnumerationType__Group_3__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5459:1: ( ( rule__EnumerationType__Group_3__0 )? )
+            // InternalRoom.g:5461:1: ( ( ( rule__EnumerationType__Group_3__0 )? ) )
+            // InternalRoom.g:5462:1: ( ( rule__EnumerationType__Group_3__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5459:1: ( ( rule__EnumerationType__Group_3__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5460:1: ( rule__EnumerationType__Group_3__0 )?
+            // InternalRoom.g:5462:1: ( ( rule__EnumerationType__Group_3__0 )? )
+            // InternalRoom.g:5463:1: ( rule__EnumerationType__Group_3__0 )?
             {
              before(grammarAccess.getEnumerationTypeAccess().getGroup_3()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5461:1: ( rule__EnumerationType__Group_3__0 )?
+            // InternalRoom.g:5464:1: ( rule__EnumerationType__Group_3__0 )?
             int alt61=2;
             int LA61_0 = input.LA(1);
 
@@ -16637,9 +16637,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt61) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5461:2: rule__EnumerationType__Group_3__0
+                    // InternalRoom.g:5464:2: rule__EnumerationType__Group_3__0
                     {
-                    pushFollow(FOLLOW_rule__EnumerationType__Group_3__0_in_rule__EnumerationType__Group__3__Impl11761);
+                    pushFollow(FOLLOW_2);
                     rule__EnumerationType__Group_3__0();
 
                     state._fsp--;
@@ -16673,21 +16673,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumerationType__Group__4"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5471:1: rule__EnumerationType__Group__4 : rule__EnumerationType__Group__4__Impl rule__EnumerationType__Group__5 ;
+    // InternalRoom.g:5474:1: rule__EnumerationType__Group__4 : rule__EnumerationType__Group__4__Impl rule__EnumerationType__Group__5 ;
     public final void rule__EnumerationType__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5475:1: ( rule__EnumerationType__Group__4__Impl rule__EnumerationType__Group__5 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5476:2: rule__EnumerationType__Group__4__Impl rule__EnumerationType__Group__5
+            // InternalRoom.g:5478:1: ( rule__EnumerationType__Group__4__Impl rule__EnumerationType__Group__5 )
+            // InternalRoom.g:5479:2: rule__EnumerationType__Group__4__Impl rule__EnumerationType__Group__5
             {
-            pushFollow(FOLLOW_rule__EnumerationType__Group__4__Impl_in_rule__EnumerationType__Group__411792);
+            pushFollow(FOLLOW_17);
             rule__EnumerationType__Group__4__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__EnumerationType__Group__5_in_rule__EnumerationType__Group__411795);
+            pushFollow(FOLLOW_2);
             rule__EnumerationType__Group__5();
 
             state._fsp--;
@@ -16711,20 +16711,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumerationType__Group__4__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5483:1: rule__EnumerationType__Group__4__Impl : ( '{' ) ;
+    // InternalRoom.g:5486:1: rule__EnumerationType__Group__4__Impl : ( '{' ) ;
     public final void rule__EnumerationType__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5487:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5488:1: ( '{' )
+            // InternalRoom.g:5490:1: ( ( '{' ) )
+            // InternalRoom.g:5491:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5488:1: ( '{' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5489:1: '{'
+            // InternalRoom.g:5491:1: ( '{' )
+            // InternalRoom.g:5492:1: '{'
             {
              before(grammarAccess.getEnumerationTypeAccess().getLeftCurlyBracketKeyword_4()); 
-            match(input,41,FOLLOW_41_in_rule__EnumerationType__Group__4__Impl11823); 
+            match(input,41,FOLLOW_2); 
              after(grammarAccess.getEnumerationTypeAccess().getLeftCurlyBracketKeyword_4()); 
 
             }
@@ -16748,21 +16748,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumerationType__Group__5"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5502:1: rule__EnumerationType__Group__5 : rule__EnumerationType__Group__5__Impl rule__EnumerationType__Group__6 ;
+    // InternalRoom.g:5505:1: rule__EnumerationType__Group__5 : rule__EnumerationType__Group__5__Impl rule__EnumerationType__Group__6 ;
     public final void rule__EnumerationType__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5506:1: ( rule__EnumerationType__Group__5__Impl rule__EnumerationType__Group__6 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5507:2: rule__EnumerationType__Group__5__Impl rule__EnumerationType__Group__6
+            // InternalRoom.g:5509:1: ( rule__EnumerationType__Group__5__Impl rule__EnumerationType__Group__6 )
+            // InternalRoom.g:5510:2: rule__EnumerationType__Group__5__Impl rule__EnumerationType__Group__6
             {
-            pushFollow(FOLLOW_rule__EnumerationType__Group__5__Impl_in_rule__EnumerationType__Group__511854);
+            pushFollow(FOLLOW_17);
             rule__EnumerationType__Group__5__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__EnumerationType__Group__6_in_rule__EnumerationType__Group__511857);
+            pushFollow(FOLLOW_2);
             rule__EnumerationType__Group__6();
 
             state._fsp--;
@@ -16786,20 +16786,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumerationType__Group__5__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5514:1: rule__EnumerationType__Group__5__Impl : ( ( rule__EnumerationType__Group_5__0 )? ) ;
+    // InternalRoom.g:5517:1: rule__EnumerationType__Group__5__Impl : ( ( rule__EnumerationType__Group_5__0 )? ) ;
     public final void rule__EnumerationType__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5518:1: ( ( ( rule__EnumerationType__Group_5__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5519:1: ( ( rule__EnumerationType__Group_5__0 )? )
+            // InternalRoom.g:5521:1: ( ( ( rule__EnumerationType__Group_5__0 )? ) )
+            // InternalRoom.g:5522:1: ( ( rule__EnumerationType__Group_5__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5519:1: ( ( rule__EnumerationType__Group_5__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5520:1: ( rule__EnumerationType__Group_5__0 )?
+            // InternalRoom.g:5522:1: ( ( rule__EnumerationType__Group_5__0 )? )
+            // InternalRoom.g:5523:1: ( rule__EnumerationType__Group_5__0 )?
             {
              before(grammarAccess.getEnumerationTypeAccess().getGroup_5()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5521:1: ( rule__EnumerationType__Group_5__0 )?
+            // InternalRoom.g:5524:1: ( rule__EnumerationType__Group_5__0 )?
             int alt62=2;
             int LA62_0 = input.LA(1);
 
@@ -16808,9 +16808,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt62) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5521:2: rule__EnumerationType__Group_5__0
+                    // InternalRoom.g:5524:2: rule__EnumerationType__Group_5__0
                     {
-                    pushFollow(FOLLOW_rule__EnumerationType__Group_5__0_in_rule__EnumerationType__Group__5__Impl11884);
+                    pushFollow(FOLLOW_2);
                     rule__EnumerationType__Group_5__0();
 
                     state._fsp--;
@@ -16844,16 +16844,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumerationType__Group__6"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5531:1: rule__EnumerationType__Group__6 : rule__EnumerationType__Group__6__Impl ;
+    // InternalRoom.g:5534:1: rule__EnumerationType__Group__6 : rule__EnumerationType__Group__6__Impl ;
     public final void rule__EnumerationType__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5535:1: ( rule__EnumerationType__Group__6__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5536:2: rule__EnumerationType__Group__6__Impl
+            // InternalRoom.g:5538:1: ( rule__EnumerationType__Group__6__Impl )
+            // InternalRoom.g:5539:2: rule__EnumerationType__Group__6__Impl
             {
-            pushFollow(FOLLOW_rule__EnumerationType__Group__6__Impl_in_rule__EnumerationType__Group__611915);
+            pushFollow(FOLLOW_2);
             rule__EnumerationType__Group__6__Impl();
 
             state._fsp--;
@@ -16877,20 +16877,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumerationType__Group__6__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5542:1: rule__EnumerationType__Group__6__Impl : ( '}' ) ;
+    // InternalRoom.g:5545:1: rule__EnumerationType__Group__6__Impl : ( '}' ) ;
     public final void rule__EnumerationType__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5546:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5547:1: ( '}' )
+            // InternalRoom.g:5549:1: ( ( '}' ) )
+            // InternalRoom.g:5550:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5547:1: ( '}' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5548:1: '}'
+            // InternalRoom.g:5550:1: ( '}' )
+            // InternalRoom.g:5551:1: '}'
             {
              before(grammarAccess.getEnumerationTypeAccess().getRightCurlyBracketKeyword_6()); 
-            match(input,42,FOLLOW_42_in_rule__EnumerationType__Group__6__Impl11943); 
+            match(input,42,FOLLOW_2); 
              after(grammarAccess.getEnumerationTypeAccess().getRightCurlyBracketKeyword_6()); 
 
             }
@@ -16914,21 +16914,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumerationType__Group_3__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5575:1: rule__EnumerationType__Group_3__0 : rule__EnumerationType__Group_3__0__Impl rule__EnumerationType__Group_3__1 ;
+    // InternalRoom.g:5578:1: rule__EnumerationType__Group_3__0 : rule__EnumerationType__Group_3__0__Impl rule__EnumerationType__Group_3__1 ;
     public final void rule__EnumerationType__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5579:1: ( rule__EnumerationType__Group_3__0__Impl rule__EnumerationType__Group_3__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5580:2: rule__EnumerationType__Group_3__0__Impl rule__EnumerationType__Group_3__1
+            // InternalRoom.g:5582:1: ( rule__EnumerationType__Group_3__0__Impl rule__EnumerationType__Group_3__1 )
+            // InternalRoom.g:5583:2: rule__EnumerationType__Group_3__0__Impl rule__EnumerationType__Group_3__1
             {
-            pushFollow(FOLLOW_rule__EnumerationType__Group_3__0__Impl_in_rule__EnumerationType__Group_3__011988);
+            pushFollow(FOLLOW_3);
             rule__EnumerationType__Group_3__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__EnumerationType__Group_3__1_in_rule__EnumerationType__Group_3__011991);
+            pushFollow(FOLLOW_2);
             rule__EnumerationType__Group_3__1();
 
             state._fsp--;
@@ -16952,20 +16952,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumerationType__Group_3__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5587:1: rule__EnumerationType__Group_3__0__Impl : ( 'of' ) ;
+    // InternalRoom.g:5590:1: rule__EnumerationType__Group_3__0__Impl : ( 'of' ) ;
     public final void rule__EnumerationType__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5591:1: ( ( 'of' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5592:1: ( 'of' )
+            // InternalRoom.g:5594:1: ( ( 'of' ) )
+            // InternalRoom.g:5595:1: ( 'of' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5592:1: ( 'of' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5593:1: 'of'
+            // InternalRoom.g:5595:1: ( 'of' )
+            // InternalRoom.g:5596:1: 'of'
             {
              before(grammarAccess.getEnumerationTypeAccess().getOfKeyword_3_0()); 
-            match(input,50,FOLLOW_50_in_rule__EnumerationType__Group_3__0__Impl12019); 
+            match(input,50,FOLLOW_2); 
              after(grammarAccess.getEnumerationTypeAccess().getOfKeyword_3_0()); 
 
             }
@@ -16989,16 +16989,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumerationType__Group_3__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5606:1: rule__EnumerationType__Group_3__1 : rule__EnumerationType__Group_3__1__Impl ;
+    // InternalRoom.g:5609:1: rule__EnumerationType__Group_3__1 : rule__EnumerationType__Group_3__1__Impl ;
     public final void rule__EnumerationType__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5610:1: ( rule__EnumerationType__Group_3__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5611:2: rule__EnumerationType__Group_3__1__Impl
+            // InternalRoom.g:5613:1: ( rule__EnumerationType__Group_3__1__Impl )
+            // InternalRoom.g:5614:2: rule__EnumerationType__Group_3__1__Impl
             {
-            pushFollow(FOLLOW_rule__EnumerationType__Group_3__1__Impl_in_rule__EnumerationType__Group_3__112050);
+            pushFollow(FOLLOW_2);
             rule__EnumerationType__Group_3__1__Impl();
 
             state._fsp--;
@@ -17022,23 +17022,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumerationType__Group_3__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5617:1: rule__EnumerationType__Group_3__1__Impl : ( ( rule__EnumerationType__PrimitiveTypeAssignment_3_1 ) ) ;
+    // InternalRoom.g:5620:1: rule__EnumerationType__Group_3__1__Impl : ( ( rule__EnumerationType__PrimitiveTypeAssignment_3_1 ) ) ;
     public final void rule__EnumerationType__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5621:1: ( ( ( rule__EnumerationType__PrimitiveTypeAssignment_3_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5622:1: ( ( rule__EnumerationType__PrimitiveTypeAssignment_3_1 ) )
+            // InternalRoom.g:5624:1: ( ( ( rule__EnumerationType__PrimitiveTypeAssignment_3_1 ) ) )
+            // InternalRoom.g:5625:1: ( ( rule__EnumerationType__PrimitiveTypeAssignment_3_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5622:1: ( ( rule__EnumerationType__PrimitiveTypeAssignment_3_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5623:1: ( rule__EnumerationType__PrimitiveTypeAssignment_3_1 )
+            // InternalRoom.g:5625:1: ( ( rule__EnumerationType__PrimitiveTypeAssignment_3_1 ) )
+            // InternalRoom.g:5626:1: ( rule__EnumerationType__PrimitiveTypeAssignment_3_1 )
             {
              before(grammarAccess.getEnumerationTypeAccess().getPrimitiveTypeAssignment_3_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5624:1: ( rule__EnumerationType__PrimitiveTypeAssignment_3_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5624:2: rule__EnumerationType__PrimitiveTypeAssignment_3_1
+            // InternalRoom.g:5627:1: ( rule__EnumerationType__PrimitiveTypeAssignment_3_1 )
+            // InternalRoom.g:5627:2: rule__EnumerationType__PrimitiveTypeAssignment_3_1
             {
-            pushFollow(FOLLOW_rule__EnumerationType__PrimitiveTypeAssignment_3_1_in_rule__EnumerationType__Group_3__1__Impl12077);
+            pushFollow(FOLLOW_2);
             rule__EnumerationType__PrimitiveTypeAssignment_3_1();
 
             state._fsp--;
@@ -17069,21 +17069,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumerationType__Group_5__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5638:1: rule__EnumerationType__Group_5__0 : rule__EnumerationType__Group_5__0__Impl rule__EnumerationType__Group_5__1 ;
+    // InternalRoom.g:5641:1: rule__EnumerationType__Group_5__0 : rule__EnumerationType__Group_5__0__Impl rule__EnumerationType__Group_5__1 ;
     public final void rule__EnumerationType__Group_5__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5642:1: ( rule__EnumerationType__Group_5__0__Impl rule__EnumerationType__Group_5__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5643:2: rule__EnumerationType__Group_5__0__Impl rule__EnumerationType__Group_5__1
+            // InternalRoom.g:5645:1: ( rule__EnumerationType__Group_5__0__Impl rule__EnumerationType__Group_5__1 )
+            // InternalRoom.g:5646:2: rule__EnumerationType__Group_5__0__Impl rule__EnumerationType__Group_5__1
             {
-            pushFollow(FOLLOW_rule__EnumerationType__Group_5__0__Impl_in_rule__EnumerationType__Group_5__012111);
+            pushFollow(FOLLOW_18);
             rule__EnumerationType__Group_5__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__EnumerationType__Group_5__1_in_rule__EnumerationType__Group_5__012114);
+            pushFollow(FOLLOW_2);
             rule__EnumerationType__Group_5__1();
 
             state._fsp--;
@@ -17107,23 +17107,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumerationType__Group_5__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5650:1: rule__EnumerationType__Group_5__0__Impl : ( ( rule__EnumerationType__LiteralsAssignment_5_0 ) ) ;
+    // InternalRoom.g:5653:1: rule__EnumerationType__Group_5__0__Impl : ( ( rule__EnumerationType__LiteralsAssignment_5_0 ) ) ;
     public final void rule__EnumerationType__Group_5__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5654:1: ( ( ( rule__EnumerationType__LiteralsAssignment_5_0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5655:1: ( ( rule__EnumerationType__LiteralsAssignment_5_0 ) )
+            // InternalRoom.g:5657:1: ( ( ( rule__EnumerationType__LiteralsAssignment_5_0 ) ) )
+            // InternalRoom.g:5658:1: ( ( rule__EnumerationType__LiteralsAssignment_5_0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5655:1: ( ( rule__EnumerationType__LiteralsAssignment_5_0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5656:1: ( rule__EnumerationType__LiteralsAssignment_5_0 )
+            // InternalRoom.g:5658:1: ( ( rule__EnumerationType__LiteralsAssignment_5_0 ) )
+            // InternalRoom.g:5659:1: ( rule__EnumerationType__LiteralsAssignment_5_0 )
             {
              before(grammarAccess.getEnumerationTypeAccess().getLiteralsAssignment_5_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5657:1: ( rule__EnumerationType__LiteralsAssignment_5_0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5657:2: rule__EnumerationType__LiteralsAssignment_5_0
+            // InternalRoom.g:5660:1: ( rule__EnumerationType__LiteralsAssignment_5_0 )
+            // InternalRoom.g:5660:2: rule__EnumerationType__LiteralsAssignment_5_0
             {
-            pushFollow(FOLLOW_rule__EnumerationType__LiteralsAssignment_5_0_in_rule__EnumerationType__Group_5__0__Impl12141);
+            pushFollow(FOLLOW_2);
             rule__EnumerationType__LiteralsAssignment_5_0();
 
             state._fsp--;
@@ -17154,16 +17154,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumerationType__Group_5__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5667:1: rule__EnumerationType__Group_5__1 : rule__EnumerationType__Group_5__1__Impl ;
+    // InternalRoom.g:5670:1: rule__EnumerationType__Group_5__1 : rule__EnumerationType__Group_5__1__Impl ;
     public final void rule__EnumerationType__Group_5__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5671:1: ( rule__EnumerationType__Group_5__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5672:2: rule__EnumerationType__Group_5__1__Impl
+            // InternalRoom.g:5674:1: ( rule__EnumerationType__Group_5__1__Impl )
+            // InternalRoom.g:5675:2: rule__EnumerationType__Group_5__1__Impl
             {
-            pushFollow(FOLLOW_rule__EnumerationType__Group_5__1__Impl_in_rule__EnumerationType__Group_5__112171);
+            pushFollow(FOLLOW_2);
             rule__EnumerationType__Group_5__1__Impl();
 
             state._fsp--;
@@ -17187,20 +17187,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumerationType__Group_5__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5678:1: rule__EnumerationType__Group_5__1__Impl : ( ( rule__EnumerationType__Group_5_1__0 )* ) ;
+    // InternalRoom.g:5681:1: rule__EnumerationType__Group_5__1__Impl : ( ( rule__EnumerationType__Group_5_1__0 )* ) ;
     public final void rule__EnumerationType__Group_5__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5682:1: ( ( ( rule__EnumerationType__Group_5_1__0 )* ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5683:1: ( ( rule__EnumerationType__Group_5_1__0 )* )
+            // InternalRoom.g:5685:1: ( ( ( rule__EnumerationType__Group_5_1__0 )* ) )
+            // InternalRoom.g:5686:1: ( ( rule__EnumerationType__Group_5_1__0 )* )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5683:1: ( ( rule__EnumerationType__Group_5_1__0 )* )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5684:1: ( rule__EnumerationType__Group_5_1__0 )*
+            // InternalRoom.g:5686:1: ( ( rule__EnumerationType__Group_5_1__0 )* )
+            // InternalRoom.g:5687:1: ( rule__EnumerationType__Group_5_1__0 )*
             {
              before(grammarAccess.getEnumerationTypeAccess().getGroup_5_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5685:1: ( rule__EnumerationType__Group_5_1__0 )*
+            // InternalRoom.g:5688:1: ( rule__EnumerationType__Group_5_1__0 )*
             loop63:
             do {
                 int alt63=2;
@@ -17213,9 +17213,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
                 switch (alt63) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5685:2: rule__EnumerationType__Group_5_1__0
+            	    // InternalRoom.g:5688:2: rule__EnumerationType__Group_5_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__EnumerationType__Group_5_1__0_in_rule__EnumerationType__Group_5__1__Impl12198);
+            	    pushFollow(FOLLOW_19);
             	    rule__EnumerationType__Group_5_1__0();
 
             	    state._fsp--;
@@ -17252,21 +17252,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumerationType__Group_5_1__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5699:1: rule__EnumerationType__Group_5_1__0 : rule__EnumerationType__Group_5_1__0__Impl rule__EnumerationType__Group_5_1__1 ;
+    // InternalRoom.g:5702:1: rule__EnumerationType__Group_5_1__0 : rule__EnumerationType__Group_5_1__0__Impl rule__EnumerationType__Group_5_1__1 ;
     public final void rule__EnumerationType__Group_5_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5703:1: ( rule__EnumerationType__Group_5_1__0__Impl rule__EnumerationType__Group_5_1__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5704:2: rule__EnumerationType__Group_5_1__0__Impl rule__EnumerationType__Group_5_1__1
+            // InternalRoom.g:5706:1: ( rule__EnumerationType__Group_5_1__0__Impl rule__EnumerationType__Group_5_1__1 )
+            // InternalRoom.g:5707:2: rule__EnumerationType__Group_5_1__0__Impl rule__EnumerationType__Group_5_1__1
             {
-            pushFollow(FOLLOW_rule__EnumerationType__Group_5_1__0__Impl_in_rule__EnumerationType__Group_5_1__012233);
+            pushFollow(FOLLOW_3);
             rule__EnumerationType__Group_5_1__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__EnumerationType__Group_5_1__1_in_rule__EnumerationType__Group_5_1__012236);
+            pushFollow(FOLLOW_2);
             rule__EnumerationType__Group_5_1__1();
 
             state._fsp--;
@@ -17290,20 +17290,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumerationType__Group_5_1__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5711:1: rule__EnumerationType__Group_5_1__0__Impl : ( ',' ) ;
+    // InternalRoom.g:5714:1: rule__EnumerationType__Group_5_1__0__Impl : ( ',' ) ;
     public final void rule__EnumerationType__Group_5_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5715:1: ( ( ',' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5716:1: ( ',' )
+            // InternalRoom.g:5718:1: ( ( ',' ) )
+            // InternalRoom.g:5719:1: ( ',' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5716:1: ( ',' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5717:1: ','
+            // InternalRoom.g:5719:1: ( ',' )
+            // InternalRoom.g:5720:1: ','
             {
              before(grammarAccess.getEnumerationTypeAccess().getCommaKeyword_5_1_0()); 
-            match(input,51,FOLLOW_51_in_rule__EnumerationType__Group_5_1__0__Impl12264); 
+            match(input,51,FOLLOW_2); 
              after(grammarAccess.getEnumerationTypeAccess().getCommaKeyword_5_1_0()); 
 
             }
@@ -17327,16 +17327,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumerationType__Group_5_1__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5730:1: rule__EnumerationType__Group_5_1__1 : rule__EnumerationType__Group_5_1__1__Impl ;
+    // InternalRoom.g:5733:1: rule__EnumerationType__Group_5_1__1 : rule__EnumerationType__Group_5_1__1__Impl ;
     public final void rule__EnumerationType__Group_5_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5734:1: ( rule__EnumerationType__Group_5_1__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5735:2: rule__EnumerationType__Group_5_1__1__Impl
+            // InternalRoom.g:5737:1: ( rule__EnumerationType__Group_5_1__1__Impl )
+            // InternalRoom.g:5738:2: rule__EnumerationType__Group_5_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__EnumerationType__Group_5_1__1__Impl_in_rule__EnumerationType__Group_5_1__112295);
+            pushFollow(FOLLOW_2);
             rule__EnumerationType__Group_5_1__1__Impl();
 
             state._fsp--;
@@ -17360,23 +17360,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumerationType__Group_5_1__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5741:1: rule__EnumerationType__Group_5_1__1__Impl : ( ( rule__EnumerationType__LiteralsAssignment_5_1_1 ) ) ;
+    // InternalRoom.g:5744:1: rule__EnumerationType__Group_5_1__1__Impl : ( ( rule__EnumerationType__LiteralsAssignment_5_1_1 ) ) ;
     public final void rule__EnumerationType__Group_5_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5745:1: ( ( ( rule__EnumerationType__LiteralsAssignment_5_1_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5746:1: ( ( rule__EnumerationType__LiteralsAssignment_5_1_1 ) )
+            // InternalRoom.g:5748:1: ( ( ( rule__EnumerationType__LiteralsAssignment_5_1_1 ) ) )
+            // InternalRoom.g:5749:1: ( ( rule__EnumerationType__LiteralsAssignment_5_1_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5746:1: ( ( rule__EnumerationType__LiteralsAssignment_5_1_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5747:1: ( rule__EnumerationType__LiteralsAssignment_5_1_1 )
+            // InternalRoom.g:5749:1: ( ( rule__EnumerationType__LiteralsAssignment_5_1_1 ) )
+            // InternalRoom.g:5750:1: ( rule__EnumerationType__LiteralsAssignment_5_1_1 )
             {
              before(grammarAccess.getEnumerationTypeAccess().getLiteralsAssignment_5_1_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5748:1: ( rule__EnumerationType__LiteralsAssignment_5_1_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5748:2: rule__EnumerationType__LiteralsAssignment_5_1_1
+            // InternalRoom.g:5751:1: ( rule__EnumerationType__LiteralsAssignment_5_1_1 )
+            // InternalRoom.g:5751:2: rule__EnumerationType__LiteralsAssignment_5_1_1
             {
-            pushFollow(FOLLOW_rule__EnumerationType__LiteralsAssignment_5_1_1_in_rule__EnumerationType__Group_5_1__1__Impl12322);
+            pushFollow(FOLLOW_2);
             rule__EnumerationType__LiteralsAssignment_5_1_1();
 
             state._fsp--;
@@ -17407,21 +17407,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumLiteral__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5762:1: rule__EnumLiteral__Group__0 : rule__EnumLiteral__Group__0__Impl rule__EnumLiteral__Group__1 ;
+    // InternalRoom.g:5765:1: rule__EnumLiteral__Group__0 : rule__EnumLiteral__Group__0__Impl rule__EnumLiteral__Group__1 ;
     public final void rule__EnumLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5766:1: ( rule__EnumLiteral__Group__0__Impl rule__EnumLiteral__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5767:2: rule__EnumLiteral__Group__0__Impl rule__EnumLiteral__Group__1
+            // InternalRoom.g:5769:1: ( rule__EnumLiteral__Group__0__Impl rule__EnumLiteral__Group__1 )
+            // InternalRoom.g:5770:2: rule__EnumLiteral__Group__0__Impl rule__EnumLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__EnumLiteral__Group__0__Impl_in_rule__EnumLiteral__Group__012356);
+            pushFollow(FOLLOW_20);
             rule__EnumLiteral__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__EnumLiteral__Group__1_in_rule__EnumLiteral__Group__012359);
+            pushFollow(FOLLOW_2);
             rule__EnumLiteral__Group__1();
 
             state._fsp--;
@@ -17445,23 +17445,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumLiteral__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5774:1: rule__EnumLiteral__Group__0__Impl : ( ( rule__EnumLiteral__NameAssignment_0 ) ) ;
+    // InternalRoom.g:5777:1: rule__EnumLiteral__Group__0__Impl : ( ( rule__EnumLiteral__NameAssignment_0 ) ) ;
     public final void rule__EnumLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5778:1: ( ( ( rule__EnumLiteral__NameAssignment_0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5779:1: ( ( rule__EnumLiteral__NameAssignment_0 ) )
+            // InternalRoom.g:5781:1: ( ( ( rule__EnumLiteral__NameAssignment_0 ) ) )
+            // InternalRoom.g:5782:1: ( ( rule__EnumLiteral__NameAssignment_0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5779:1: ( ( rule__EnumLiteral__NameAssignment_0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5780:1: ( rule__EnumLiteral__NameAssignment_0 )
+            // InternalRoom.g:5782:1: ( ( rule__EnumLiteral__NameAssignment_0 ) )
+            // InternalRoom.g:5783:1: ( rule__EnumLiteral__NameAssignment_0 )
             {
              before(grammarAccess.getEnumLiteralAccess().getNameAssignment_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5781:1: ( rule__EnumLiteral__NameAssignment_0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5781:2: rule__EnumLiteral__NameAssignment_0
+            // InternalRoom.g:5784:1: ( rule__EnumLiteral__NameAssignment_0 )
+            // InternalRoom.g:5784:2: rule__EnumLiteral__NameAssignment_0
             {
-            pushFollow(FOLLOW_rule__EnumLiteral__NameAssignment_0_in_rule__EnumLiteral__Group__0__Impl12386);
+            pushFollow(FOLLOW_2);
             rule__EnumLiteral__NameAssignment_0();
 
             state._fsp--;
@@ -17492,16 +17492,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumLiteral__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5791:1: rule__EnumLiteral__Group__1 : rule__EnumLiteral__Group__1__Impl ;
+    // InternalRoom.g:5794:1: rule__EnumLiteral__Group__1 : rule__EnumLiteral__Group__1__Impl ;
     public final void rule__EnumLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5795:1: ( rule__EnumLiteral__Group__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5796:2: rule__EnumLiteral__Group__1__Impl
+            // InternalRoom.g:5798:1: ( rule__EnumLiteral__Group__1__Impl )
+            // InternalRoom.g:5799:2: rule__EnumLiteral__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__EnumLiteral__Group__1__Impl_in_rule__EnumLiteral__Group__112416);
+            pushFollow(FOLLOW_2);
             rule__EnumLiteral__Group__1__Impl();
 
             state._fsp--;
@@ -17525,20 +17525,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumLiteral__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5802:1: rule__EnumLiteral__Group__1__Impl : ( ( rule__EnumLiteral__Group_1__0 )? ) ;
+    // InternalRoom.g:5805:1: rule__EnumLiteral__Group__1__Impl : ( ( rule__EnumLiteral__Group_1__0 )? ) ;
     public final void rule__EnumLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5806:1: ( ( ( rule__EnumLiteral__Group_1__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5807:1: ( ( rule__EnumLiteral__Group_1__0 )? )
+            // InternalRoom.g:5809:1: ( ( ( rule__EnumLiteral__Group_1__0 )? ) )
+            // InternalRoom.g:5810:1: ( ( rule__EnumLiteral__Group_1__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5807:1: ( ( rule__EnumLiteral__Group_1__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5808:1: ( rule__EnumLiteral__Group_1__0 )?
+            // InternalRoom.g:5810:1: ( ( rule__EnumLiteral__Group_1__0 )? )
+            // InternalRoom.g:5811:1: ( rule__EnumLiteral__Group_1__0 )?
             {
              before(grammarAccess.getEnumLiteralAccess().getGroup_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5809:1: ( rule__EnumLiteral__Group_1__0 )?
+            // InternalRoom.g:5812:1: ( rule__EnumLiteral__Group_1__0 )?
             int alt64=2;
             int LA64_0 = input.LA(1);
 
@@ -17547,9 +17547,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt64) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5809:2: rule__EnumLiteral__Group_1__0
+                    // InternalRoom.g:5812:2: rule__EnumLiteral__Group_1__0
                     {
-                    pushFollow(FOLLOW_rule__EnumLiteral__Group_1__0_in_rule__EnumLiteral__Group__1__Impl12443);
+                    pushFollow(FOLLOW_2);
                     rule__EnumLiteral__Group_1__0();
 
                     state._fsp--;
@@ -17583,21 +17583,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumLiteral__Group_1__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5823:1: rule__EnumLiteral__Group_1__0 : rule__EnumLiteral__Group_1__0__Impl rule__EnumLiteral__Group_1__1 ;
+    // InternalRoom.g:5826:1: rule__EnumLiteral__Group_1__0 : rule__EnumLiteral__Group_1__0__Impl rule__EnumLiteral__Group_1__1 ;
     public final void rule__EnumLiteral__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5827:1: ( rule__EnumLiteral__Group_1__0__Impl rule__EnumLiteral__Group_1__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5828:2: rule__EnumLiteral__Group_1__0__Impl rule__EnumLiteral__Group_1__1
+            // InternalRoom.g:5830:1: ( rule__EnumLiteral__Group_1__0__Impl rule__EnumLiteral__Group_1__1 )
+            // InternalRoom.g:5831:2: rule__EnumLiteral__Group_1__0__Impl rule__EnumLiteral__Group_1__1
             {
-            pushFollow(FOLLOW_rule__EnumLiteral__Group_1__0__Impl_in_rule__EnumLiteral__Group_1__012478);
+            pushFollow(FOLLOW_21);
             rule__EnumLiteral__Group_1__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__EnumLiteral__Group_1__1_in_rule__EnumLiteral__Group_1__012481);
+            pushFollow(FOLLOW_2);
             rule__EnumLiteral__Group_1__1();
 
             state._fsp--;
@@ -17621,20 +17621,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumLiteral__Group_1__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5835:1: rule__EnumLiteral__Group_1__0__Impl : ( '=' ) ;
+    // InternalRoom.g:5838:1: rule__EnumLiteral__Group_1__0__Impl : ( '=' ) ;
     public final void rule__EnumLiteral__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5839:1: ( ( '=' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5840:1: ( '=' )
+            // InternalRoom.g:5842:1: ( ( '=' ) )
+            // InternalRoom.g:5843:1: ( '=' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5840:1: ( '=' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5841:1: '='
+            // InternalRoom.g:5843:1: ( '=' )
+            // InternalRoom.g:5844:1: '='
             {
              before(grammarAccess.getEnumLiteralAccess().getEqualsSignKeyword_1_0()); 
-            match(input,52,FOLLOW_52_in_rule__EnumLiteral__Group_1__0__Impl12509); 
+            match(input,52,FOLLOW_2); 
              after(grammarAccess.getEnumLiteralAccess().getEqualsSignKeyword_1_0()); 
 
             }
@@ -17658,16 +17658,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumLiteral__Group_1__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5854:1: rule__EnumLiteral__Group_1__1 : rule__EnumLiteral__Group_1__1__Impl ;
+    // InternalRoom.g:5857:1: rule__EnumLiteral__Group_1__1 : rule__EnumLiteral__Group_1__1__Impl ;
     public final void rule__EnumLiteral__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5858:1: ( rule__EnumLiteral__Group_1__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5859:2: rule__EnumLiteral__Group_1__1__Impl
+            // InternalRoom.g:5861:1: ( rule__EnumLiteral__Group_1__1__Impl )
+            // InternalRoom.g:5862:2: rule__EnumLiteral__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__EnumLiteral__Group_1__1__Impl_in_rule__EnumLiteral__Group_1__112540);
+            pushFollow(FOLLOW_2);
             rule__EnumLiteral__Group_1__1__Impl();
 
             state._fsp--;
@@ -17691,23 +17691,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumLiteral__Group_1__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5865:1: rule__EnumLiteral__Group_1__1__Impl : ( ( rule__EnumLiteral__LiteralAssignment_1_1 ) ) ;
+    // InternalRoom.g:5868:1: rule__EnumLiteral__Group_1__1__Impl : ( ( rule__EnumLiteral__LiteralAssignment_1_1 ) ) ;
     public final void rule__EnumLiteral__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5869:1: ( ( ( rule__EnumLiteral__LiteralAssignment_1_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5870:1: ( ( rule__EnumLiteral__LiteralAssignment_1_1 ) )
+            // InternalRoom.g:5872:1: ( ( ( rule__EnumLiteral__LiteralAssignment_1_1 ) ) )
+            // InternalRoom.g:5873:1: ( ( rule__EnumLiteral__LiteralAssignment_1_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5870:1: ( ( rule__EnumLiteral__LiteralAssignment_1_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5871:1: ( rule__EnumLiteral__LiteralAssignment_1_1 )
+            // InternalRoom.g:5873:1: ( ( rule__EnumLiteral__LiteralAssignment_1_1 ) )
+            // InternalRoom.g:5874:1: ( rule__EnumLiteral__LiteralAssignment_1_1 )
             {
              before(grammarAccess.getEnumLiteralAccess().getLiteralAssignment_1_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5872:1: ( rule__EnumLiteral__LiteralAssignment_1_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5872:2: rule__EnumLiteral__LiteralAssignment_1_1
+            // InternalRoom.g:5875:1: ( rule__EnumLiteral__LiteralAssignment_1_1 )
+            // InternalRoom.g:5875:2: rule__EnumLiteral__LiteralAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__EnumLiteral__LiteralAssignment_1_1_in_rule__EnumLiteral__Group_1__1__Impl12567);
+            pushFollow(FOLLOW_2);
             rule__EnumLiteral__LiteralAssignment_1_1();
 
             state._fsp--;
@@ -17738,21 +17738,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ExternalType__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5886:1: rule__ExternalType__Group__0 : rule__ExternalType__Group__0__Impl rule__ExternalType__Group__1 ;
+    // InternalRoom.g:5889:1: rule__ExternalType__Group__0 : rule__ExternalType__Group__0__Impl rule__ExternalType__Group__1 ;
     public final void rule__ExternalType__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5890:1: ( rule__ExternalType__Group__0__Impl rule__ExternalType__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5891:2: rule__ExternalType__Group__0__Impl rule__ExternalType__Group__1
+            // InternalRoom.g:5893:1: ( rule__ExternalType__Group__0__Impl rule__ExternalType__Group__1 )
+            // InternalRoom.g:5894:2: rule__ExternalType__Group__0__Impl rule__ExternalType__Group__1
             {
-            pushFollow(FOLLOW_rule__ExternalType__Group__0__Impl_in_rule__ExternalType__Group__012601);
+            pushFollow(FOLLOW_3);
             rule__ExternalType__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ExternalType__Group__1_in_rule__ExternalType__Group__012604);
+            pushFollow(FOLLOW_2);
             rule__ExternalType__Group__1();
 
             state._fsp--;
@@ -17776,20 +17776,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ExternalType__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5898:1: rule__ExternalType__Group__0__Impl : ( 'ExternalType' ) ;
+    // InternalRoom.g:5901:1: rule__ExternalType__Group__0__Impl : ( 'ExternalType' ) ;
     public final void rule__ExternalType__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5902:1: ( ( 'ExternalType' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5903:1: ( 'ExternalType' )
+            // InternalRoom.g:5905:1: ( ( 'ExternalType' ) )
+            // InternalRoom.g:5906:1: ( 'ExternalType' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5903:1: ( 'ExternalType' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5904:1: 'ExternalType'
+            // InternalRoom.g:5906:1: ( 'ExternalType' )
+            // InternalRoom.g:5907:1: 'ExternalType'
             {
              before(grammarAccess.getExternalTypeAccess().getExternalTypeKeyword_0()); 
-            match(input,53,FOLLOW_53_in_rule__ExternalType__Group__0__Impl12632); 
+            match(input,53,FOLLOW_2); 
              after(grammarAccess.getExternalTypeAccess().getExternalTypeKeyword_0()); 
 
             }
@@ -17813,21 +17813,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ExternalType__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5917:1: rule__ExternalType__Group__1 : rule__ExternalType__Group__1__Impl rule__ExternalType__Group__2 ;
+    // InternalRoom.g:5920:1: rule__ExternalType__Group__1 : rule__ExternalType__Group__1__Impl rule__ExternalType__Group__2 ;
     public final void rule__ExternalType__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5921:1: ( rule__ExternalType__Group__1__Impl rule__ExternalType__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5922:2: rule__ExternalType__Group__1__Impl rule__ExternalType__Group__2
+            // InternalRoom.g:5924:1: ( rule__ExternalType__Group__1__Impl rule__ExternalType__Group__2 )
+            // InternalRoom.g:5925:2: rule__ExternalType__Group__1__Impl rule__ExternalType__Group__2
             {
-            pushFollow(FOLLOW_rule__ExternalType__Group__1__Impl_in_rule__ExternalType__Group__112663);
+            pushFollow(FOLLOW_11);
             rule__ExternalType__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ExternalType__Group__2_in_rule__ExternalType__Group__112666);
+            pushFollow(FOLLOW_2);
             rule__ExternalType__Group__2();
 
             state._fsp--;
@@ -17851,23 +17851,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ExternalType__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5929:1: rule__ExternalType__Group__1__Impl : ( ( rule__ExternalType__NameAssignment_1 ) ) ;
+    // InternalRoom.g:5932:1: rule__ExternalType__Group__1__Impl : ( ( rule__ExternalType__NameAssignment_1 ) ) ;
     public final void rule__ExternalType__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5933:1: ( ( ( rule__ExternalType__NameAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5934:1: ( ( rule__ExternalType__NameAssignment_1 ) )
+            // InternalRoom.g:5936:1: ( ( ( rule__ExternalType__NameAssignment_1 ) ) )
+            // InternalRoom.g:5937:1: ( ( rule__ExternalType__NameAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5934:1: ( ( rule__ExternalType__NameAssignment_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5935:1: ( rule__ExternalType__NameAssignment_1 )
+            // InternalRoom.g:5937:1: ( ( rule__ExternalType__NameAssignment_1 ) )
+            // InternalRoom.g:5938:1: ( rule__ExternalType__NameAssignment_1 )
             {
              before(grammarAccess.getExternalTypeAccess().getNameAssignment_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5936:1: ( rule__ExternalType__NameAssignment_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5936:2: rule__ExternalType__NameAssignment_1
+            // InternalRoom.g:5939:1: ( rule__ExternalType__NameAssignment_1 )
+            // InternalRoom.g:5939:2: rule__ExternalType__NameAssignment_1
             {
-            pushFollow(FOLLOW_rule__ExternalType__NameAssignment_1_in_rule__ExternalType__Group__1__Impl12693);
+            pushFollow(FOLLOW_2);
             rule__ExternalType__NameAssignment_1();
 
             state._fsp--;
@@ -17898,21 +17898,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ExternalType__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5946:1: rule__ExternalType__Group__2 : rule__ExternalType__Group__2__Impl rule__ExternalType__Group__3 ;
+    // InternalRoom.g:5949:1: rule__ExternalType__Group__2 : rule__ExternalType__Group__2__Impl rule__ExternalType__Group__3 ;
     public final void rule__ExternalType__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5950:1: ( rule__ExternalType__Group__2__Impl rule__ExternalType__Group__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5951:2: rule__ExternalType__Group__2__Impl rule__ExternalType__Group__3
+            // InternalRoom.g:5953:1: ( rule__ExternalType__Group__2__Impl rule__ExternalType__Group__3 )
+            // InternalRoom.g:5954:2: rule__ExternalType__Group__2__Impl rule__ExternalType__Group__3
             {
-            pushFollow(FOLLOW_rule__ExternalType__Group__2__Impl_in_rule__ExternalType__Group__212723);
+            pushFollow(FOLLOW_12);
             rule__ExternalType__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ExternalType__Group__3_in_rule__ExternalType__Group__212726);
+            pushFollow(FOLLOW_2);
             rule__ExternalType__Group__3();
 
             state._fsp--;
@@ -17936,20 +17936,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ExternalType__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5958:1: rule__ExternalType__Group__2__Impl : ( '->' ) ;
+    // InternalRoom.g:5961:1: rule__ExternalType__Group__2__Impl : ( '->' ) ;
     public final void rule__ExternalType__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5962:1: ( ( '->' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5963:1: ( '->' )
+            // InternalRoom.g:5965:1: ( ( '->' ) )
+            // InternalRoom.g:5966:1: ( '->' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5963:1: ( '->' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5964:1: '->'
+            // InternalRoom.g:5966:1: ( '->' )
+            // InternalRoom.g:5967:1: '->'
             {
              before(grammarAccess.getExternalTypeAccess().getHyphenMinusGreaterThanSignKeyword_2()); 
-            match(input,45,FOLLOW_45_in_rule__ExternalType__Group__2__Impl12754); 
+            match(input,45,FOLLOW_2); 
              after(grammarAccess.getExternalTypeAccess().getHyphenMinusGreaterThanSignKeyword_2()); 
 
             }
@@ -17973,21 +17973,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ExternalType__Group__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5977:1: rule__ExternalType__Group__3 : rule__ExternalType__Group__3__Impl rule__ExternalType__Group__4 ;
+    // InternalRoom.g:5980:1: rule__ExternalType__Group__3 : rule__ExternalType__Group__3__Impl rule__ExternalType__Group__4 ;
     public final void rule__ExternalType__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5981:1: ( rule__ExternalType__Group__3__Impl rule__ExternalType__Group__4 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5982:2: rule__ExternalType__Group__3__Impl rule__ExternalType__Group__4
+            // InternalRoom.g:5984:1: ( rule__ExternalType__Group__3__Impl rule__ExternalType__Group__4 )
+            // InternalRoom.g:5985:2: rule__ExternalType__Group__3__Impl rule__ExternalType__Group__4
             {
-            pushFollow(FOLLOW_rule__ExternalType__Group__3__Impl_in_rule__ExternalType__Group__312785);
+            pushFollow(FOLLOW_22);
             rule__ExternalType__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ExternalType__Group__4_in_rule__ExternalType__Group__312788);
+            pushFollow(FOLLOW_2);
             rule__ExternalType__Group__4();
 
             state._fsp--;
@@ -18011,23 +18011,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ExternalType__Group__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5989:1: rule__ExternalType__Group__3__Impl : ( ( rule__ExternalType__TargetNameAssignment_3 ) ) ;
+    // InternalRoom.g:5992:1: rule__ExternalType__Group__3__Impl : ( ( rule__ExternalType__TargetNameAssignment_3 ) ) ;
     public final void rule__ExternalType__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5993:1: ( ( ( rule__ExternalType__TargetNameAssignment_3 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5994:1: ( ( rule__ExternalType__TargetNameAssignment_3 ) )
+            // InternalRoom.g:5996:1: ( ( ( rule__ExternalType__TargetNameAssignment_3 ) ) )
+            // InternalRoom.g:5997:1: ( ( rule__ExternalType__TargetNameAssignment_3 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5994:1: ( ( rule__ExternalType__TargetNameAssignment_3 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5995:1: ( rule__ExternalType__TargetNameAssignment_3 )
+            // InternalRoom.g:5997:1: ( ( rule__ExternalType__TargetNameAssignment_3 ) )
+            // InternalRoom.g:5998:1: ( rule__ExternalType__TargetNameAssignment_3 )
             {
              before(grammarAccess.getExternalTypeAccess().getTargetNameAssignment_3()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5996:1: ( rule__ExternalType__TargetNameAssignment_3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:5996:2: rule__ExternalType__TargetNameAssignment_3
+            // InternalRoom.g:5999:1: ( rule__ExternalType__TargetNameAssignment_3 )
+            // InternalRoom.g:5999:2: rule__ExternalType__TargetNameAssignment_3
             {
-            pushFollow(FOLLOW_rule__ExternalType__TargetNameAssignment_3_in_rule__ExternalType__Group__3__Impl12815);
+            pushFollow(FOLLOW_2);
             rule__ExternalType__TargetNameAssignment_3();
 
             state._fsp--;
@@ -18058,21 +18058,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ExternalType__Group__4"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6006:1: rule__ExternalType__Group__4 : rule__ExternalType__Group__4__Impl rule__ExternalType__Group__5 ;
+    // InternalRoom.g:6009:1: rule__ExternalType__Group__4 : rule__ExternalType__Group__4__Impl rule__ExternalType__Group__5 ;
     public final void rule__ExternalType__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6010:1: ( rule__ExternalType__Group__4__Impl rule__ExternalType__Group__5 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6011:2: rule__ExternalType__Group__4__Impl rule__ExternalType__Group__5
+            // InternalRoom.g:6013:1: ( rule__ExternalType__Group__4__Impl rule__ExternalType__Group__5 )
+            // InternalRoom.g:6014:2: rule__ExternalType__Group__4__Impl rule__ExternalType__Group__5
             {
-            pushFollow(FOLLOW_rule__ExternalType__Group__4__Impl_in_rule__ExternalType__Group__412845);
+            pushFollow(FOLLOW_22);
             rule__ExternalType__Group__4__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ExternalType__Group__5_in_rule__ExternalType__Group__412848);
+            pushFollow(FOLLOW_2);
             rule__ExternalType__Group__5();
 
             state._fsp--;
@@ -18096,20 +18096,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ExternalType__Group__4__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6018:1: rule__ExternalType__Group__4__Impl : ( ( rule__ExternalType__Group_4__0 )? ) ;
+    // InternalRoom.g:6021:1: rule__ExternalType__Group__4__Impl : ( ( rule__ExternalType__Group_4__0 )? ) ;
     public final void rule__ExternalType__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6022:1: ( ( ( rule__ExternalType__Group_4__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6023:1: ( ( rule__ExternalType__Group_4__0 )? )
+            // InternalRoom.g:6025:1: ( ( ( rule__ExternalType__Group_4__0 )? ) )
+            // InternalRoom.g:6026:1: ( ( rule__ExternalType__Group_4__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6023:1: ( ( rule__ExternalType__Group_4__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6024:1: ( rule__ExternalType__Group_4__0 )?
+            // InternalRoom.g:6026:1: ( ( rule__ExternalType__Group_4__0 )? )
+            // InternalRoom.g:6027:1: ( rule__ExternalType__Group_4__0 )?
             {
              before(grammarAccess.getExternalTypeAccess().getGroup_4()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6025:1: ( rule__ExternalType__Group_4__0 )?
+            // InternalRoom.g:6028:1: ( rule__ExternalType__Group_4__0 )?
             int alt65=2;
             int LA65_0 = input.LA(1);
 
@@ -18118,9 +18118,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt65) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6025:2: rule__ExternalType__Group_4__0
+                    // InternalRoom.g:6028:2: rule__ExternalType__Group_4__0
                     {
-                    pushFollow(FOLLOW_rule__ExternalType__Group_4__0_in_rule__ExternalType__Group__4__Impl12875);
+                    pushFollow(FOLLOW_2);
                     rule__ExternalType__Group_4__0();
 
                     state._fsp--;
@@ -18154,16 +18154,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ExternalType__Group__5"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6035:1: rule__ExternalType__Group__5 : rule__ExternalType__Group__5__Impl ;
+    // InternalRoom.g:6038:1: rule__ExternalType__Group__5 : rule__ExternalType__Group__5__Impl ;
     public final void rule__ExternalType__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6039:1: ( rule__ExternalType__Group__5__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6040:2: rule__ExternalType__Group__5__Impl
+            // InternalRoom.g:6042:1: ( rule__ExternalType__Group__5__Impl )
+            // InternalRoom.g:6043:2: rule__ExternalType__Group__5__Impl
             {
-            pushFollow(FOLLOW_rule__ExternalType__Group__5__Impl_in_rule__ExternalType__Group__512906);
+            pushFollow(FOLLOW_2);
             rule__ExternalType__Group__5__Impl();
 
             state._fsp--;
@@ -18187,20 +18187,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ExternalType__Group__5__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6046:1: rule__ExternalType__Group__5__Impl : ( ( rule__ExternalType__DocuAssignment_5 )? ) ;
+    // InternalRoom.g:6049:1: rule__ExternalType__Group__5__Impl : ( ( rule__ExternalType__DocuAssignment_5 )? ) ;
     public final void rule__ExternalType__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6050:1: ( ( ( rule__ExternalType__DocuAssignment_5 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6051:1: ( ( rule__ExternalType__DocuAssignment_5 )? )
+            // InternalRoom.g:6053:1: ( ( ( rule__ExternalType__DocuAssignment_5 )? ) )
+            // InternalRoom.g:6054:1: ( ( rule__ExternalType__DocuAssignment_5 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6051:1: ( ( rule__ExternalType__DocuAssignment_5 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6052:1: ( rule__ExternalType__DocuAssignment_5 )?
+            // InternalRoom.g:6054:1: ( ( rule__ExternalType__DocuAssignment_5 )? )
+            // InternalRoom.g:6055:1: ( rule__ExternalType__DocuAssignment_5 )?
             {
              before(grammarAccess.getExternalTypeAccess().getDocuAssignment_5()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6053:1: ( rule__ExternalType__DocuAssignment_5 )?
+            // InternalRoom.g:6056:1: ( rule__ExternalType__DocuAssignment_5 )?
             int alt66=2;
             int LA66_0 = input.LA(1);
 
@@ -18209,9 +18209,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt66) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6053:2: rule__ExternalType__DocuAssignment_5
+                    // InternalRoom.g:6056:2: rule__ExternalType__DocuAssignment_5
                     {
-                    pushFollow(FOLLOW_rule__ExternalType__DocuAssignment_5_in_rule__ExternalType__Group__5__Impl12933);
+                    pushFollow(FOLLOW_2);
                     rule__ExternalType__DocuAssignment_5();
 
                     state._fsp--;
@@ -18245,21 +18245,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ExternalType__Group_4__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6075:1: rule__ExternalType__Group_4__0 : rule__ExternalType__Group_4__0__Impl rule__ExternalType__Group_4__1 ;
+    // InternalRoom.g:6078:1: rule__ExternalType__Group_4__0 : rule__ExternalType__Group_4__0__Impl rule__ExternalType__Group_4__1 ;
     public final void rule__ExternalType__Group_4__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6079:1: ( rule__ExternalType__Group_4__0__Impl rule__ExternalType__Group_4__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6080:2: rule__ExternalType__Group_4__0__Impl rule__ExternalType__Group_4__1
+            // InternalRoom.g:6082:1: ( rule__ExternalType__Group_4__0__Impl rule__ExternalType__Group_4__1 )
+            // InternalRoom.g:6083:2: rule__ExternalType__Group_4__0__Impl rule__ExternalType__Group_4__1
             {
-            pushFollow(FOLLOW_rule__ExternalType__Group_4__0__Impl_in_rule__ExternalType__Group_4__012976);
+            pushFollow(FOLLOW_12);
             rule__ExternalType__Group_4__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ExternalType__Group_4__1_in_rule__ExternalType__Group_4__012979);
+            pushFollow(FOLLOW_2);
             rule__ExternalType__Group_4__1();
 
             state._fsp--;
@@ -18283,20 +18283,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ExternalType__Group_4__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6087:1: rule__ExternalType__Group_4__0__Impl : ( 'default' ) ;
+    // InternalRoom.g:6090:1: rule__ExternalType__Group_4__0__Impl : ( 'default' ) ;
     public final void rule__ExternalType__Group_4__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6091:1: ( ( 'default' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6092:1: ( 'default' )
+            // InternalRoom.g:6094:1: ( ( 'default' ) )
+            // InternalRoom.g:6095:1: ( 'default' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6092:1: ( 'default' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6093:1: 'default'
+            // InternalRoom.g:6095:1: ( 'default' )
+            // InternalRoom.g:6096:1: 'default'
             {
              before(grammarAccess.getExternalTypeAccess().getDefaultKeyword_4_0()); 
-            match(input,46,FOLLOW_46_in_rule__ExternalType__Group_4__0__Impl13007); 
+            match(input,46,FOLLOW_2); 
              after(grammarAccess.getExternalTypeAccess().getDefaultKeyword_4_0()); 
 
             }
@@ -18320,16 +18320,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ExternalType__Group_4__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6106:1: rule__ExternalType__Group_4__1 : rule__ExternalType__Group_4__1__Impl ;
+    // InternalRoom.g:6109:1: rule__ExternalType__Group_4__1 : rule__ExternalType__Group_4__1__Impl ;
     public final void rule__ExternalType__Group_4__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6110:1: ( rule__ExternalType__Group_4__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6111:2: rule__ExternalType__Group_4__1__Impl
+            // InternalRoom.g:6113:1: ( rule__ExternalType__Group_4__1__Impl )
+            // InternalRoom.g:6114:2: rule__ExternalType__Group_4__1__Impl
             {
-            pushFollow(FOLLOW_rule__ExternalType__Group_4__1__Impl_in_rule__ExternalType__Group_4__113038);
+            pushFollow(FOLLOW_2);
             rule__ExternalType__Group_4__1__Impl();
 
             state._fsp--;
@@ -18353,23 +18353,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ExternalType__Group_4__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6117:1: rule__ExternalType__Group_4__1__Impl : ( ( rule__ExternalType__DefaultValueLiteralAssignment_4_1 ) ) ;
+    // InternalRoom.g:6120:1: rule__ExternalType__Group_4__1__Impl : ( ( rule__ExternalType__DefaultValueLiteralAssignment_4_1 ) ) ;
     public final void rule__ExternalType__Group_4__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6121:1: ( ( ( rule__ExternalType__DefaultValueLiteralAssignment_4_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6122:1: ( ( rule__ExternalType__DefaultValueLiteralAssignment_4_1 ) )
+            // InternalRoom.g:6124:1: ( ( ( rule__ExternalType__DefaultValueLiteralAssignment_4_1 ) ) )
+            // InternalRoom.g:6125:1: ( ( rule__ExternalType__DefaultValueLiteralAssignment_4_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6122:1: ( ( rule__ExternalType__DefaultValueLiteralAssignment_4_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6123:1: ( rule__ExternalType__DefaultValueLiteralAssignment_4_1 )
+            // InternalRoom.g:6125:1: ( ( rule__ExternalType__DefaultValueLiteralAssignment_4_1 ) )
+            // InternalRoom.g:6126:1: ( rule__ExternalType__DefaultValueLiteralAssignment_4_1 )
             {
              before(grammarAccess.getExternalTypeAccess().getDefaultValueLiteralAssignment_4_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6124:1: ( rule__ExternalType__DefaultValueLiteralAssignment_4_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6124:2: rule__ExternalType__DefaultValueLiteralAssignment_4_1
+            // InternalRoom.g:6127:1: ( rule__ExternalType__DefaultValueLiteralAssignment_4_1 )
+            // InternalRoom.g:6127:2: rule__ExternalType__DefaultValueLiteralAssignment_4_1
             {
-            pushFollow(FOLLOW_rule__ExternalType__DefaultValueLiteralAssignment_4_1_in_rule__ExternalType__Group_4__1__Impl13065);
+            pushFollow(FOLLOW_2);
             rule__ExternalType__DefaultValueLiteralAssignment_4_1();
 
             state._fsp--;
@@ -18400,21 +18400,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DataClass__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6138:1: rule__DataClass__Group__0 : rule__DataClass__Group__0__Impl rule__DataClass__Group__1 ;
+    // InternalRoom.g:6141:1: rule__DataClass__Group__0 : rule__DataClass__Group__0__Impl rule__DataClass__Group__1 ;
     public final void rule__DataClass__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6142:1: ( rule__DataClass__Group__0__Impl rule__DataClass__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6143:2: rule__DataClass__Group__0__Impl rule__DataClass__Group__1
+            // InternalRoom.g:6145:1: ( rule__DataClass__Group__0__Impl rule__DataClass__Group__1 )
+            // InternalRoom.g:6146:2: rule__DataClass__Group__0__Impl rule__DataClass__Group__1
             {
-            pushFollow(FOLLOW_rule__DataClass__Group__0__Impl_in_rule__DataClass__Group__013099);
+            pushFollow(FOLLOW_3);
             rule__DataClass__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__DataClass__Group__1_in_rule__DataClass__Group__013102);
+            pushFollow(FOLLOW_2);
             rule__DataClass__Group__1();
 
             state._fsp--;
@@ -18438,20 +18438,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DataClass__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6150:1: rule__DataClass__Group__0__Impl : ( 'DataClass' ) ;
+    // InternalRoom.g:6153:1: rule__DataClass__Group__0__Impl : ( 'DataClass' ) ;
     public final void rule__DataClass__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6154:1: ( ( 'DataClass' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6155:1: ( 'DataClass' )
+            // InternalRoom.g:6157:1: ( ( 'DataClass' ) )
+            // InternalRoom.g:6158:1: ( 'DataClass' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6155:1: ( 'DataClass' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6156:1: 'DataClass'
+            // InternalRoom.g:6158:1: ( 'DataClass' )
+            // InternalRoom.g:6159:1: 'DataClass'
             {
              before(grammarAccess.getDataClassAccess().getDataClassKeyword_0()); 
-            match(input,16,FOLLOW_16_in_rule__DataClass__Group__0__Impl13130); 
+            match(input,16,FOLLOW_2); 
              after(grammarAccess.getDataClassAccess().getDataClassKeyword_0()); 
 
             }
@@ -18475,21 +18475,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DataClass__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6169:1: rule__DataClass__Group__1 : rule__DataClass__Group__1__Impl rule__DataClass__Group__2 ;
+    // InternalRoom.g:6172:1: rule__DataClass__Group__1 : rule__DataClass__Group__1__Impl rule__DataClass__Group__2 ;
     public final void rule__DataClass__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6173:1: ( rule__DataClass__Group__1__Impl rule__DataClass__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6174:2: rule__DataClass__Group__1__Impl rule__DataClass__Group__2
+            // InternalRoom.g:6176:1: ( rule__DataClass__Group__1__Impl rule__DataClass__Group__2 )
+            // InternalRoom.g:6177:2: rule__DataClass__Group__1__Impl rule__DataClass__Group__2
             {
-            pushFollow(FOLLOW_rule__DataClass__Group__1__Impl_in_rule__DataClass__Group__113161);
+            pushFollow(FOLLOW_23);
             rule__DataClass__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__DataClass__Group__2_in_rule__DataClass__Group__113164);
+            pushFollow(FOLLOW_2);
             rule__DataClass__Group__2();
 
             state._fsp--;
@@ -18513,23 +18513,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DataClass__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6181:1: rule__DataClass__Group__1__Impl : ( ( rule__DataClass__NameAssignment_1 ) ) ;
+    // InternalRoom.g:6184:1: rule__DataClass__Group__1__Impl : ( ( rule__DataClass__NameAssignment_1 ) ) ;
     public final void rule__DataClass__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6185:1: ( ( ( rule__DataClass__NameAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6186:1: ( ( rule__DataClass__NameAssignment_1 ) )
+            // InternalRoom.g:6188:1: ( ( ( rule__DataClass__NameAssignment_1 ) ) )
+            // InternalRoom.g:6189:1: ( ( rule__DataClass__NameAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6186:1: ( ( rule__DataClass__NameAssignment_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6187:1: ( rule__DataClass__NameAssignment_1 )
+            // InternalRoom.g:6189:1: ( ( rule__DataClass__NameAssignment_1 ) )
+            // InternalRoom.g:6190:1: ( rule__DataClass__NameAssignment_1 )
             {
              before(grammarAccess.getDataClassAccess().getNameAssignment_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6188:1: ( rule__DataClass__NameAssignment_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6188:2: rule__DataClass__NameAssignment_1
+            // InternalRoom.g:6191:1: ( rule__DataClass__NameAssignment_1 )
+            // InternalRoom.g:6191:2: rule__DataClass__NameAssignment_1
             {
-            pushFollow(FOLLOW_rule__DataClass__NameAssignment_1_in_rule__DataClass__Group__1__Impl13191);
+            pushFollow(FOLLOW_2);
             rule__DataClass__NameAssignment_1();
 
             state._fsp--;
@@ -18560,21 +18560,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DataClass__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6198:1: rule__DataClass__Group__2 : rule__DataClass__Group__2__Impl rule__DataClass__Group__3 ;
+    // InternalRoom.g:6201:1: rule__DataClass__Group__2 : rule__DataClass__Group__2__Impl rule__DataClass__Group__3 ;
     public final void rule__DataClass__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6202:1: ( rule__DataClass__Group__2__Impl rule__DataClass__Group__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6203:2: rule__DataClass__Group__2__Impl rule__DataClass__Group__3
+            // InternalRoom.g:6205:1: ( rule__DataClass__Group__2__Impl rule__DataClass__Group__3 )
+            // InternalRoom.g:6206:2: rule__DataClass__Group__2__Impl rule__DataClass__Group__3
             {
-            pushFollow(FOLLOW_rule__DataClass__Group__2__Impl_in_rule__DataClass__Group__213221);
+            pushFollow(FOLLOW_23);
             rule__DataClass__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__DataClass__Group__3_in_rule__DataClass__Group__213224);
+            pushFollow(FOLLOW_2);
             rule__DataClass__Group__3();
 
             state._fsp--;
@@ -18598,20 +18598,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DataClass__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6210:1: rule__DataClass__Group__2__Impl : ( ( rule__DataClass__DocuAssignment_2 )? ) ;
+    // InternalRoom.g:6213:1: rule__DataClass__Group__2__Impl : ( ( rule__DataClass__DocuAssignment_2 )? ) ;
     public final void rule__DataClass__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6214:1: ( ( ( rule__DataClass__DocuAssignment_2 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6215:1: ( ( rule__DataClass__DocuAssignment_2 )? )
+            // InternalRoom.g:6217:1: ( ( ( rule__DataClass__DocuAssignment_2 )? ) )
+            // InternalRoom.g:6218:1: ( ( rule__DataClass__DocuAssignment_2 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6215:1: ( ( rule__DataClass__DocuAssignment_2 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6216:1: ( rule__DataClass__DocuAssignment_2 )?
+            // InternalRoom.g:6218:1: ( ( rule__DataClass__DocuAssignment_2 )? )
+            // InternalRoom.g:6219:1: ( rule__DataClass__DocuAssignment_2 )?
             {
              before(grammarAccess.getDataClassAccess().getDocuAssignment_2()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6217:1: ( rule__DataClass__DocuAssignment_2 )?
+            // InternalRoom.g:6220:1: ( rule__DataClass__DocuAssignment_2 )?
             int alt67=2;
             int LA67_0 = input.LA(1);
 
@@ -18620,9 +18620,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt67) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6217:2: rule__DataClass__DocuAssignment_2
+                    // InternalRoom.g:6220:2: rule__DataClass__DocuAssignment_2
                     {
-                    pushFollow(FOLLOW_rule__DataClass__DocuAssignment_2_in_rule__DataClass__Group__2__Impl13251);
+                    pushFollow(FOLLOW_2);
                     rule__DataClass__DocuAssignment_2();
 
                     state._fsp--;
@@ -18656,21 +18656,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DataClass__Group__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6227:1: rule__DataClass__Group__3 : rule__DataClass__Group__3__Impl rule__DataClass__Group__4 ;
+    // InternalRoom.g:6230:1: rule__DataClass__Group__3 : rule__DataClass__Group__3__Impl rule__DataClass__Group__4 ;
     public final void rule__DataClass__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6231:1: ( rule__DataClass__Group__3__Impl rule__DataClass__Group__4 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6232:2: rule__DataClass__Group__3__Impl rule__DataClass__Group__4
+            // InternalRoom.g:6234:1: ( rule__DataClass__Group__3__Impl rule__DataClass__Group__4 )
+            // InternalRoom.g:6235:2: rule__DataClass__Group__3__Impl rule__DataClass__Group__4
             {
-            pushFollow(FOLLOW_rule__DataClass__Group__3__Impl_in_rule__DataClass__Group__313282);
+            pushFollow(FOLLOW_23);
             rule__DataClass__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__DataClass__Group__4_in_rule__DataClass__Group__313285);
+            pushFollow(FOLLOW_2);
             rule__DataClass__Group__4();
 
             state._fsp--;
@@ -18694,20 +18694,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DataClass__Group__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6239:1: rule__DataClass__Group__3__Impl : ( ( rule__DataClass__Group_3__0 )? ) ;
+    // InternalRoom.g:6242:1: rule__DataClass__Group__3__Impl : ( ( rule__DataClass__Group_3__0 )? ) ;
     public final void rule__DataClass__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6243:1: ( ( ( rule__DataClass__Group_3__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6244:1: ( ( rule__DataClass__Group_3__0 )? )
+            // InternalRoom.g:6246:1: ( ( ( rule__DataClass__Group_3__0 )? ) )
+            // InternalRoom.g:6247:1: ( ( rule__DataClass__Group_3__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6244:1: ( ( rule__DataClass__Group_3__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6245:1: ( rule__DataClass__Group_3__0 )?
+            // InternalRoom.g:6247:1: ( ( rule__DataClass__Group_3__0 )? )
+            // InternalRoom.g:6248:1: ( rule__DataClass__Group_3__0 )?
             {
              before(grammarAccess.getDataClassAccess().getGroup_3()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6246:1: ( rule__DataClass__Group_3__0 )?
+            // InternalRoom.g:6249:1: ( rule__DataClass__Group_3__0 )?
             int alt68=2;
             int LA68_0 = input.LA(1);
 
@@ -18716,9 +18716,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt68) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6246:2: rule__DataClass__Group_3__0
+                    // InternalRoom.g:6249:2: rule__DataClass__Group_3__0
                     {
-                    pushFollow(FOLLOW_rule__DataClass__Group_3__0_in_rule__DataClass__Group__3__Impl13312);
+                    pushFollow(FOLLOW_2);
                     rule__DataClass__Group_3__0();
 
                     state._fsp--;
@@ -18752,21 +18752,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DataClass__Group__4"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6256:1: rule__DataClass__Group__4 : rule__DataClass__Group__4__Impl rule__DataClass__Group__5 ;
+    // InternalRoom.g:6259:1: rule__DataClass__Group__4 : rule__DataClass__Group__4__Impl rule__DataClass__Group__5 ;
     public final void rule__DataClass__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6260:1: ( rule__DataClass__Group__4__Impl rule__DataClass__Group__5 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6261:2: rule__DataClass__Group__4__Impl rule__DataClass__Group__5
+            // InternalRoom.g:6263:1: ( rule__DataClass__Group__4__Impl rule__DataClass__Group__5 )
+            // InternalRoom.g:6264:2: rule__DataClass__Group__4__Impl rule__DataClass__Group__5
             {
-            pushFollow(FOLLOW_rule__DataClass__Group__4__Impl_in_rule__DataClass__Group__413343);
+            pushFollow(FOLLOW_24);
             rule__DataClass__Group__4__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__DataClass__Group__5_in_rule__DataClass__Group__413346);
+            pushFollow(FOLLOW_2);
             rule__DataClass__Group__5();
 
             state._fsp--;
@@ -18790,20 +18790,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DataClass__Group__4__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6268:1: rule__DataClass__Group__4__Impl : ( '{' ) ;
+    // InternalRoom.g:6271:1: rule__DataClass__Group__4__Impl : ( '{' ) ;
     public final void rule__DataClass__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6272:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6273:1: ( '{' )
+            // InternalRoom.g:6275:1: ( ( '{' ) )
+            // InternalRoom.g:6276:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6273:1: ( '{' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6274:1: '{'
+            // InternalRoom.g:6276:1: ( '{' )
+            // InternalRoom.g:6277:1: '{'
             {
              before(grammarAccess.getDataClassAccess().getLeftCurlyBracketKeyword_4()); 
-            match(input,41,FOLLOW_41_in_rule__DataClass__Group__4__Impl13374); 
+            match(input,41,FOLLOW_2); 
              after(grammarAccess.getDataClassAccess().getLeftCurlyBracketKeyword_4()); 
 
             }
@@ -18827,21 +18827,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DataClass__Group__5"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6287:1: rule__DataClass__Group__5 : rule__DataClass__Group__5__Impl rule__DataClass__Group__6 ;
+    // InternalRoom.g:6290:1: rule__DataClass__Group__5 : rule__DataClass__Group__5__Impl rule__DataClass__Group__6 ;
     public final void rule__DataClass__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6291:1: ( rule__DataClass__Group__5__Impl rule__DataClass__Group__6 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6292:2: rule__DataClass__Group__5__Impl rule__DataClass__Group__6
+            // InternalRoom.g:6294:1: ( rule__DataClass__Group__5__Impl rule__DataClass__Group__6 )
+            // InternalRoom.g:6295:2: rule__DataClass__Group__5__Impl rule__DataClass__Group__6
             {
-            pushFollow(FOLLOW_rule__DataClass__Group__5__Impl_in_rule__DataClass__Group__513405);
+            pushFollow(FOLLOW_24);
             rule__DataClass__Group__5__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__DataClass__Group__6_in_rule__DataClass__Group__513408);
+            pushFollow(FOLLOW_2);
             rule__DataClass__Group__6();
 
             state._fsp--;
@@ -18865,20 +18865,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DataClass__Group__5__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6299:1: rule__DataClass__Group__5__Impl : ( ( rule__DataClass__AnnotationsAssignment_5 )* ) ;
+    // InternalRoom.g:6302:1: rule__DataClass__Group__5__Impl : ( ( rule__DataClass__AnnotationsAssignment_5 )* ) ;
     public final void rule__DataClass__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6303:1: ( ( ( rule__DataClass__AnnotationsAssignment_5 )* ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6304:1: ( ( rule__DataClass__AnnotationsAssignment_5 )* )
+            // InternalRoom.g:6306:1: ( ( ( rule__DataClass__AnnotationsAssignment_5 )* ) )
+            // InternalRoom.g:6307:1: ( ( rule__DataClass__AnnotationsAssignment_5 )* )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6304:1: ( ( rule__DataClass__AnnotationsAssignment_5 )* )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6305:1: ( rule__DataClass__AnnotationsAssignment_5 )*
+            // InternalRoom.g:6307:1: ( ( rule__DataClass__AnnotationsAssignment_5 )* )
+            // InternalRoom.g:6308:1: ( rule__DataClass__AnnotationsAssignment_5 )*
             {
              before(grammarAccess.getDataClassAccess().getAnnotationsAssignment_5()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6306:1: ( rule__DataClass__AnnotationsAssignment_5 )*
+            // InternalRoom.g:6309:1: ( rule__DataClass__AnnotationsAssignment_5 )*
             loop69:
             do {
                 int alt69=2;
@@ -18891,9 +18891,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
                 switch (alt69) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6306:2: rule__DataClass__AnnotationsAssignment_5
+            	    // InternalRoom.g:6309:2: rule__DataClass__AnnotationsAssignment_5
             	    {
-            	    pushFollow(FOLLOW_rule__DataClass__AnnotationsAssignment_5_in_rule__DataClass__Group__5__Impl13435);
+            	    pushFollow(FOLLOW_25);
             	    rule__DataClass__AnnotationsAssignment_5();
 
             	    state._fsp--;
@@ -18930,21 +18930,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DataClass__Group__6"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6316:1: rule__DataClass__Group__6 : rule__DataClass__Group__6__Impl rule__DataClass__Group__7 ;
+    // InternalRoom.g:6319:1: rule__DataClass__Group__6 : rule__DataClass__Group__6__Impl rule__DataClass__Group__7 ;
     public final void rule__DataClass__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6320:1: ( rule__DataClass__Group__6__Impl rule__DataClass__Group__7 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6321:2: rule__DataClass__Group__6__Impl rule__DataClass__Group__7
+            // InternalRoom.g:6323:1: ( rule__DataClass__Group__6__Impl rule__DataClass__Group__7 )
+            // InternalRoom.g:6324:2: rule__DataClass__Group__6__Impl rule__DataClass__Group__7
             {
-            pushFollow(FOLLOW_rule__DataClass__Group__6__Impl_in_rule__DataClass__Group__613466);
+            pushFollow(FOLLOW_24);
             rule__DataClass__Group__6__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__DataClass__Group__7_in_rule__DataClass__Group__613469);
+            pushFollow(FOLLOW_2);
             rule__DataClass__Group__7();
 
             state._fsp--;
@@ -18968,20 +18968,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DataClass__Group__6__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6328:1: rule__DataClass__Group__6__Impl : ( ( rule__DataClass__Group_6__0 )? ) ;
+    // InternalRoom.g:6331:1: rule__DataClass__Group__6__Impl : ( ( rule__DataClass__Group_6__0 )? ) ;
     public final void rule__DataClass__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6332:1: ( ( ( rule__DataClass__Group_6__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6333:1: ( ( rule__DataClass__Group_6__0 )? )
+            // InternalRoom.g:6335:1: ( ( ( rule__DataClass__Group_6__0 )? ) )
+            // InternalRoom.g:6336:1: ( ( rule__DataClass__Group_6__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6333:1: ( ( rule__DataClass__Group_6__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6334:1: ( rule__DataClass__Group_6__0 )?
+            // InternalRoom.g:6336:1: ( ( rule__DataClass__Group_6__0 )? )
+            // InternalRoom.g:6337:1: ( rule__DataClass__Group_6__0 )?
             {
              before(grammarAccess.getDataClassAccess().getGroup_6()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6335:1: ( rule__DataClass__Group_6__0 )?
+            // InternalRoom.g:6338:1: ( rule__DataClass__Group_6__0 )?
             int alt70=2;
             int LA70_0 = input.LA(1);
 
@@ -18990,9 +18990,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt70) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6335:2: rule__DataClass__Group_6__0
+                    // InternalRoom.g:6338:2: rule__DataClass__Group_6__0
                     {
-                    pushFollow(FOLLOW_rule__DataClass__Group_6__0_in_rule__DataClass__Group__6__Impl13496);
+                    pushFollow(FOLLOW_2);
                     rule__DataClass__Group_6__0();
 
                     state._fsp--;
@@ -19026,21 +19026,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DataClass__Group__7"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6345:1: rule__DataClass__Group__7 : rule__DataClass__Group__7__Impl rule__DataClass__Group__8 ;
+    // InternalRoom.g:6348:1: rule__DataClass__Group__7 : rule__DataClass__Group__7__Impl rule__DataClass__Group__8 ;
     public final void rule__DataClass__Group__7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6349:1: ( rule__DataClass__Group__7__Impl rule__DataClass__Group__8 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6350:2: rule__DataClass__Group__7__Impl rule__DataClass__Group__8
+            // InternalRoom.g:6352:1: ( rule__DataClass__Group__7__Impl rule__DataClass__Group__8 )
+            // InternalRoom.g:6353:2: rule__DataClass__Group__7__Impl rule__DataClass__Group__8
             {
-            pushFollow(FOLLOW_rule__DataClass__Group__7__Impl_in_rule__DataClass__Group__713527);
+            pushFollow(FOLLOW_24);
             rule__DataClass__Group__7__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__DataClass__Group__8_in_rule__DataClass__Group__713530);
+            pushFollow(FOLLOW_2);
             rule__DataClass__Group__8();
 
             state._fsp--;
@@ -19064,20 +19064,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DataClass__Group__7__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6357:1: rule__DataClass__Group__7__Impl : ( ( rule__DataClass__Group_7__0 )? ) ;
+    // InternalRoom.g:6360:1: rule__DataClass__Group__7__Impl : ( ( rule__DataClass__Group_7__0 )? ) ;
     public final void rule__DataClass__Group__7__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6361:1: ( ( ( rule__DataClass__Group_7__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6362:1: ( ( rule__DataClass__Group_7__0 )? )
+            // InternalRoom.g:6364:1: ( ( ( rule__DataClass__Group_7__0 )? ) )
+            // InternalRoom.g:6365:1: ( ( rule__DataClass__Group_7__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6362:1: ( ( rule__DataClass__Group_7__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6363:1: ( rule__DataClass__Group_7__0 )?
+            // InternalRoom.g:6365:1: ( ( rule__DataClass__Group_7__0 )? )
+            // InternalRoom.g:6366:1: ( rule__DataClass__Group_7__0 )?
             {
              before(grammarAccess.getDataClassAccess().getGroup_7()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6364:1: ( rule__DataClass__Group_7__0 )?
+            // InternalRoom.g:6367:1: ( rule__DataClass__Group_7__0 )?
             int alt71=2;
             int LA71_0 = input.LA(1);
 
@@ -19086,9 +19086,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt71) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6364:2: rule__DataClass__Group_7__0
+                    // InternalRoom.g:6367:2: rule__DataClass__Group_7__0
                     {
-                    pushFollow(FOLLOW_rule__DataClass__Group_7__0_in_rule__DataClass__Group__7__Impl13557);
+                    pushFollow(FOLLOW_2);
                     rule__DataClass__Group_7__0();
 
                     state._fsp--;
@@ -19122,21 +19122,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DataClass__Group__8"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6374:1: rule__DataClass__Group__8 : rule__DataClass__Group__8__Impl rule__DataClass__Group__9 ;
+    // InternalRoom.g:6377:1: rule__DataClass__Group__8 : rule__DataClass__Group__8__Impl rule__DataClass__Group__9 ;
     public final void rule__DataClass__Group__8() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6378:1: ( rule__DataClass__Group__8__Impl rule__DataClass__Group__9 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6379:2: rule__DataClass__Group__8__Impl rule__DataClass__Group__9
+            // InternalRoom.g:6381:1: ( rule__DataClass__Group__8__Impl rule__DataClass__Group__9 )
+            // InternalRoom.g:6382:2: rule__DataClass__Group__8__Impl rule__DataClass__Group__9
             {
-            pushFollow(FOLLOW_rule__DataClass__Group__8__Impl_in_rule__DataClass__Group__813588);
+            pushFollow(FOLLOW_24);
             rule__DataClass__Group__8__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__DataClass__Group__9_in_rule__DataClass__Group__813591);
+            pushFollow(FOLLOW_2);
             rule__DataClass__Group__9();
 
             state._fsp--;
@@ -19160,20 +19160,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DataClass__Group__8__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6386:1: rule__DataClass__Group__8__Impl : ( ( rule__DataClass__Group_8__0 )? ) ;
+    // InternalRoom.g:6389:1: rule__DataClass__Group__8__Impl : ( ( rule__DataClass__Group_8__0 )? ) ;
     public final void rule__DataClass__Group__8__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6390:1: ( ( ( rule__DataClass__Group_8__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6391:1: ( ( rule__DataClass__Group_8__0 )? )
+            // InternalRoom.g:6393:1: ( ( ( rule__DataClass__Group_8__0 )? ) )
+            // InternalRoom.g:6394:1: ( ( rule__DataClass__Group_8__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6391:1: ( ( rule__DataClass__Group_8__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6392:1: ( rule__DataClass__Group_8__0 )?
+            // InternalRoom.g:6394:1: ( ( rule__DataClass__Group_8__0 )? )
+            // InternalRoom.g:6395:1: ( rule__DataClass__Group_8__0 )?
             {
              before(grammarAccess.getDataClassAccess().getGroup_8()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6393:1: ( rule__DataClass__Group_8__0 )?
+            // InternalRoom.g:6396:1: ( rule__DataClass__Group_8__0 )?
             int alt72=2;
             int LA72_0 = input.LA(1);
 
@@ -19182,9 +19182,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt72) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6393:2: rule__DataClass__Group_8__0
+                    // InternalRoom.g:6396:2: rule__DataClass__Group_8__0
                     {
-                    pushFollow(FOLLOW_rule__DataClass__Group_8__0_in_rule__DataClass__Group__8__Impl13618);
+                    pushFollow(FOLLOW_2);
                     rule__DataClass__Group_8__0();
 
                     state._fsp--;
@@ -19218,21 +19218,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DataClass__Group__9"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6403:1: rule__DataClass__Group__9 : rule__DataClass__Group__9__Impl rule__DataClass__Group__10 ;
+    // InternalRoom.g:6406:1: rule__DataClass__Group__9 : rule__DataClass__Group__9__Impl rule__DataClass__Group__10 ;
     public final void rule__DataClass__Group__9() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6407:1: ( rule__DataClass__Group__9__Impl rule__DataClass__Group__10 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6408:2: rule__DataClass__Group__9__Impl rule__DataClass__Group__10
+            // InternalRoom.g:6410:1: ( rule__DataClass__Group__9__Impl rule__DataClass__Group__10 )
+            // InternalRoom.g:6411:2: rule__DataClass__Group__9__Impl rule__DataClass__Group__10
             {
-            pushFollow(FOLLOW_rule__DataClass__Group__9__Impl_in_rule__DataClass__Group__913649);
+            pushFollow(FOLLOW_24);
             rule__DataClass__Group__9__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__DataClass__Group__10_in_rule__DataClass__Group__913652);
+            pushFollow(FOLLOW_2);
             rule__DataClass__Group__10();
 
             state._fsp--;
@@ -19256,20 +19256,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DataClass__Group__9__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6415:1: rule__DataClass__Group__9__Impl : ( ( rule__DataClass__Alternatives_9 )* ) ;
+    // InternalRoom.g:6418:1: rule__DataClass__Group__9__Impl : ( ( rule__DataClass__Alternatives_9 )* ) ;
     public final void rule__DataClass__Group__9__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6419:1: ( ( ( rule__DataClass__Alternatives_9 )* ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6420:1: ( ( rule__DataClass__Alternatives_9 )* )
+            // InternalRoom.g:6422:1: ( ( ( rule__DataClass__Alternatives_9 )* ) )
+            // InternalRoom.g:6423:1: ( ( rule__DataClass__Alternatives_9 )* )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6420:1: ( ( rule__DataClass__Alternatives_9 )* )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6421:1: ( rule__DataClass__Alternatives_9 )*
+            // InternalRoom.g:6423:1: ( ( rule__DataClass__Alternatives_9 )* )
+            // InternalRoom.g:6424:1: ( rule__DataClass__Alternatives_9 )*
             {
              before(grammarAccess.getDataClassAccess().getAlternatives_9()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6422:1: ( rule__DataClass__Alternatives_9 )*
+            // InternalRoom.g:6425:1: ( rule__DataClass__Alternatives_9 )*
             loop73:
             do {
                 int alt73=2;
@@ -19282,9 +19282,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
                 switch (alt73) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6422:2: rule__DataClass__Alternatives_9
+            	    // InternalRoom.g:6425:2: rule__DataClass__Alternatives_9
             	    {
-            	    pushFollow(FOLLOW_rule__DataClass__Alternatives_9_in_rule__DataClass__Group__9__Impl13679);
+            	    pushFollow(FOLLOW_26);
             	    rule__DataClass__Alternatives_9();
 
             	    state._fsp--;
@@ -19321,16 +19321,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DataClass__Group__10"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6432:1: rule__DataClass__Group__10 : rule__DataClass__Group__10__Impl ;
+    // InternalRoom.g:6435:1: rule__DataClass__Group__10 : rule__DataClass__Group__10__Impl ;
     public final void rule__DataClass__Group__10() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6436:1: ( rule__DataClass__Group__10__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6437:2: rule__DataClass__Group__10__Impl
+            // InternalRoom.g:6439:1: ( rule__DataClass__Group__10__Impl )
+            // InternalRoom.g:6440:2: rule__DataClass__Group__10__Impl
             {
-            pushFollow(FOLLOW_rule__DataClass__Group__10__Impl_in_rule__DataClass__Group__1013710);
+            pushFollow(FOLLOW_2);
             rule__DataClass__Group__10__Impl();
 
             state._fsp--;
@@ -19354,20 +19354,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DataClass__Group__10__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6443:1: rule__DataClass__Group__10__Impl : ( '}' ) ;
+    // InternalRoom.g:6446:1: rule__DataClass__Group__10__Impl : ( '}' ) ;
     public final void rule__DataClass__Group__10__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6447:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6448:1: ( '}' )
+            // InternalRoom.g:6450:1: ( ( '}' ) )
+            // InternalRoom.g:6451:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6448:1: ( '}' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6449:1: '}'
+            // InternalRoom.g:6451:1: ( '}' )
+            // InternalRoom.g:6452:1: '}'
             {
              before(grammarAccess.getDataClassAccess().getRightCurlyBracketKeyword_10()); 
-            match(input,42,FOLLOW_42_in_rule__DataClass__Group__10__Impl13738); 
+            match(input,42,FOLLOW_2); 
              after(grammarAccess.getDataClassAccess().getRightCurlyBracketKeyword_10()); 
 
             }
@@ -19391,21 +19391,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DataClass__Group_3__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6484:1: rule__DataClass__Group_3__0 : rule__DataClass__Group_3__0__Impl rule__DataClass__Group_3__1 ;
+    // InternalRoom.g:6487:1: rule__DataClass__Group_3__0 : rule__DataClass__Group_3__0__Impl rule__DataClass__Group_3__1 ;
     public final void rule__DataClass__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6488:1: ( rule__DataClass__Group_3__0__Impl rule__DataClass__Group_3__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6489:2: rule__DataClass__Group_3__0__Impl rule__DataClass__Group_3__1
+            // InternalRoom.g:6491:1: ( rule__DataClass__Group_3__0__Impl rule__DataClass__Group_3__1 )
+            // InternalRoom.g:6492:2: rule__DataClass__Group_3__0__Impl rule__DataClass__Group_3__1
             {
-            pushFollow(FOLLOW_rule__DataClass__Group_3__0__Impl_in_rule__DataClass__Group_3__013791);
+            pushFollow(FOLLOW_3);
             rule__DataClass__Group_3__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__DataClass__Group_3__1_in_rule__DataClass__Group_3__013794);
+            pushFollow(FOLLOW_2);
             rule__DataClass__Group_3__1();
 
             state._fsp--;
@@ -19429,20 +19429,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DataClass__Group_3__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6496:1: rule__DataClass__Group_3__0__Impl : ( 'extends' ) ;
+    // InternalRoom.g:6499:1: rule__DataClass__Group_3__0__Impl : ( 'extends' ) ;
     public final void rule__DataClass__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6500:1: ( ( 'extends' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6501:1: ( 'extends' )
+            // InternalRoom.g:6503:1: ( ( 'extends' ) )
+            // InternalRoom.g:6504:1: ( 'extends' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6501:1: ( 'extends' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6502:1: 'extends'
+            // InternalRoom.g:6504:1: ( 'extends' )
+            // InternalRoom.g:6505:1: 'extends'
             {
              before(grammarAccess.getDataClassAccess().getExtendsKeyword_3_0()); 
-            match(input,54,FOLLOW_54_in_rule__DataClass__Group_3__0__Impl13822); 
+            match(input,54,FOLLOW_2); 
              after(grammarAccess.getDataClassAccess().getExtendsKeyword_3_0()); 
 
             }
@@ -19466,16 +19466,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DataClass__Group_3__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6515:1: rule__DataClass__Group_3__1 : rule__DataClass__Group_3__1__Impl ;
+    // InternalRoom.g:6518:1: rule__DataClass__Group_3__1 : rule__DataClass__Group_3__1__Impl ;
     public final void rule__DataClass__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6519:1: ( rule__DataClass__Group_3__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6520:2: rule__DataClass__Group_3__1__Impl
+            // InternalRoom.g:6522:1: ( rule__DataClass__Group_3__1__Impl )
+            // InternalRoom.g:6523:2: rule__DataClass__Group_3__1__Impl
             {
-            pushFollow(FOLLOW_rule__DataClass__Group_3__1__Impl_in_rule__DataClass__Group_3__113853);
+            pushFollow(FOLLOW_2);
             rule__DataClass__Group_3__1__Impl();
 
             state._fsp--;
@@ -19499,23 +19499,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DataClass__Group_3__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6526:1: rule__DataClass__Group_3__1__Impl : ( ( rule__DataClass__BaseAssignment_3_1 ) ) ;
+    // InternalRoom.g:6529:1: rule__DataClass__Group_3__1__Impl : ( ( rule__DataClass__BaseAssignment_3_1 ) ) ;
     public final void rule__DataClass__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6530:1: ( ( ( rule__DataClass__BaseAssignment_3_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6531:1: ( ( rule__DataClass__BaseAssignment_3_1 ) )
+            // InternalRoom.g:6533:1: ( ( ( rule__DataClass__BaseAssignment_3_1 ) ) )
+            // InternalRoom.g:6534:1: ( ( rule__DataClass__BaseAssignment_3_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6531:1: ( ( rule__DataClass__BaseAssignment_3_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6532:1: ( rule__DataClass__BaseAssignment_3_1 )
+            // InternalRoom.g:6534:1: ( ( rule__DataClass__BaseAssignment_3_1 ) )
+            // InternalRoom.g:6535:1: ( rule__DataClass__BaseAssignment_3_1 )
             {
              before(grammarAccess.getDataClassAccess().getBaseAssignment_3_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6533:1: ( rule__DataClass__BaseAssignment_3_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6533:2: rule__DataClass__BaseAssignment_3_1
+            // InternalRoom.g:6536:1: ( rule__DataClass__BaseAssignment_3_1 )
+            // InternalRoom.g:6536:2: rule__DataClass__BaseAssignment_3_1
             {
-            pushFollow(FOLLOW_rule__DataClass__BaseAssignment_3_1_in_rule__DataClass__Group_3__1__Impl13880);
+            pushFollow(FOLLOW_2);
             rule__DataClass__BaseAssignment_3_1();
 
             state._fsp--;
@@ -19546,21 +19546,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DataClass__Group_6__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6547:1: rule__DataClass__Group_6__0 : rule__DataClass__Group_6__0__Impl rule__DataClass__Group_6__1 ;
+    // InternalRoom.g:6550:1: rule__DataClass__Group_6__0 : rule__DataClass__Group_6__0__Impl rule__DataClass__Group_6__1 ;
     public final void rule__DataClass__Group_6__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6551:1: ( rule__DataClass__Group_6__0__Impl rule__DataClass__Group_6__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6552:2: rule__DataClass__Group_6__0__Impl rule__DataClass__Group_6__1
+            // InternalRoom.g:6554:1: ( rule__DataClass__Group_6__0__Impl rule__DataClass__Group_6__1 )
+            // InternalRoom.g:6555:2: rule__DataClass__Group_6__0__Impl rule__DataClass__Group_6__1
             {
-            pushFollow(FOLLOW_rule__DataClass__Group_6__0__Impl_in_rule__DataClass__Group_6__013914);
+            pushFollow(FOLLOW_27);
             rule__DataClass__Group_6__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__DataClass__Group_6__1_in_rule__DataClass__Group_6__013917);
+            pushFollow(FOLLOW_2);
             rule__DataClass__Group_6__1();
 
             state._fsp--;
@@ -19584,20 +19584,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DataClass__Group_6__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6559:1: rule__DataClass__Group_6__0__Impl : ( 'usercode1' ) ;
+    // InternalRoom.g:6562:1: rule__DataClass__Group_6__0__Impl : ( 'usercode1' ) ;
     public final void rule__DataClass__Group_6__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6563:1: ( ( 'usercode1' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6564:1: ( 'usercode1' )
+            // InternalRoom.g:6566:1: ( ( 'usercode1' ) )
+            // InternalRoom.g:6567:1: ( 'usercode1' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6564:1: ( 'usercode1' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6565:1: 'usercode1'
+            // InternalRoom.g:6567:1: ( 'usercode1' )
+            // InternalRoom.g:6568:1: 'usercode1'
             {
              before(grammarAccess.getDataClassAccess().getUsercode1Keyword_6_0()); 
-            match(input,55,FOLLOW_55_in_rule__DataClass__Group_6__0__Impl13945); 
+            match(input,55,FOLLOW_2); 
              after(grammarAccess.getDataClassAccess().getUsercode1Keyword_6_0()); 
 
             }
@@ -19621,16 +19621,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DataClass__Group_6__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6578:1: rule__DataClass__Group_6__1 : rule__DataClass__Group_6__1__Impl ;
+    // InternalRoom.g:6581:1: rule__DataClass__Group_6__1 : rule__DataClass__Group_6__1__Impl ;
     public final void rule__DataClass__Group_6__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6582:1: ( rule__DataClass__Group_6__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6583:2: rule__DataClass__Group_6__1__Impl
+            // InternalRoom.g:6585:1: ( rule__DataClass__Group_6__1__Impl )
+            // InternalRoom.g:6586:2: rule__DataClass__Group_6__1__Impl
             {
-            pushFollow(FOLLOW_rule__DataClass__Group_6__1__Impl_in_rule__DataClass__Group_6__113976);
+            pushFollow(FOLLOW_2);
             rule__DataClass__Group_6__1__Impl();
 
             state._fsp--;
@@ -19654,23 +19654,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DataClass__Group_6__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6589:1: rule__DataClass__Group_6__1__Impl : ( ( rule__DataClass__UserCode1Assignment_6_1 ) ) ;
+    // InternalRoom.g:6592:1: rule__DataClass__Group_6__1__Impl : ( ( rule__DataClass__UserCode1Assignment_6_1 ) ) ;
     public final void rule__DataClass__Group_6__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6593:1: ( ( ( rule__DataClass__UserCode1Assignment_6_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6594:1: ( ( rule__DataClass__UserCode1Assignment_6_1 ) )
+            // InternalRoom.g:6596:1: ( ( ( rule__DataClass__UserCode1Assignment_6_1 ) ) )
+            // InternalRoom.g:6597:1: ( ( rule__DataClass__UserCode1Assignment_6_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6594:1: ( ( rule__DataClass__UserCode1Assignment_6_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6595:1: ( rule__DataClass__UserCode1Assignment_6_1 )
+            // InternalRoom.g:6597:1: ( ( rule__DataClass__UserCode1Assignment_6_1 ) )
+            // InternalRoom.g:6598:1: ( rule__DataClass__UserCode1Assignment_6_1 )
             {
              before(grammarAccess.getDataClassAccess().getUserCode1Assignment_6_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6596:1: ( rule__DataClass__UserCode1Assignment_6_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6596:2: rule__DataClass__UserCode1Assignment_6_1
+            // InternalRoom.g:6599:1: ( rule__DataClass__UserCode1Assignment_6_1 )
+            // InternalRoom.g:6599:2: rule__DataClass__UserCode1Assignment_6_1
             {
-            pushFollow(FOLLOW_rule__DataClass__UserCode1Assignment_6_1_in_rule__DataClass__Group_6__1__Impl14003);
+            pushFollow(FOLLOW_2);
             rule__DataClass__UserCode1Assignment_6_1();
 
             state._fsp--;
@@ -19701,21 +19701,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DataClass__Group_7__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6610:1: rule__DataClass__Group_7__0 : rule__DataClass__Group_7__0__Impl rule__DataClass__Group_7__1 ;
+    // InternalRoom.g:6613:1: rule__DataClass__Group_7__0 : rule__DataClass__Group_7__0__Impl rule__DataClass__Group_7__1 ;
     public final void rule__DataClass__Group_7__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6614:1: ( rule__DataClass__Group_7__0__Impl rule__DataClass__Group_7__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6615:2: rule__DataClass__Group_7__0__Impl rule__DataClass__Group_7__1
+            // InternalRoom.g:6617:1: ( rule__DataClass__Group_7__0__Impl rule__DataClass__Group_7__1 )
+            // InternalRoom.g:6618:2: rule__DataClass__Group_7__0__Impl rule__DataClass__Group_7__1
             {
-            pushFollow(FOLLOW_rule__DataClass__Group_7__0__Impl_in_rule__DataClass__Group_7__014037);
+            pushFollow(FOLLOW_27);
             rule__DataClass__Group_7__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__DataClass__Group_7__1_in_rule__DataClass__Group_7__014040);
+            pushFollow(FOLLOW_2);
             rule__DataClass__Group_7__1();
 
             state._fsp--;
@@ -19739,20 +19739,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DataClass__Group_7__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6622:1: rule__DataClass__Group_7__0__Impl : ( 'usercode2' ) ;
+    // InternalRoom.g:6625:1: rule__DataClass__Group_7__0__Impl : ( 'usercode2' ) ;
     public final void rule__DataClass__Group_7__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6626:1: ( ( 'usercode2' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6627:1: ( 'usercode2' )
+            // InternalRoom.g:6629:1: ( ( 'usercode2' ) )
+            // InternalRoom.g:6630:1: ( 'usercode2' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6627:1: ( 'usercode2' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6628:1: 'usercode2'
+            // InternalRoom.g:6630:1: ( 'usercode2' )
+            // InternalRoom.g:6631:1: 'usercode2'
             {
              before(grammarAccess.getDataClassAccess().getUsercode2Keyword_7_0()); 
-            match(input,56,FOLLOW_56_in_rule__DataClass__Group_7__0__Impl14068); 
+            match(input,56,FOLLOW_2); 
              after(grammarAccess.getDataClassAccess().getUsercode2Keyword_7_0()); 
 
             }
@@ -19776,16 +19776,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DataClass__Group_7__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6641:1: rule__DataClass__Group_7__1 : rule__DataClass__Group_7__1__Impl ;
+    // InternalRoom.g:6644:1: rule__DataClass__Group_7__1 : rule__DataClass__Group_7__1__Impl ;
     public final void rule__DataClass__Group_7__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6645:1: ( rule__DataClass__Group_7__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6646:2: rule__DataClass__Group_7__1__Impl
+            // InternalRoom.g:6648:1: ( rule__DataClass__Group_7__1__Impl )
+            // InternalRoom.g:6649:2: rule__DataClass__Group_7__1__Impl
             {
-            pushFollow(FOLLOW_rule__DataClass__Group_7__1__Impl_in_rule__DataClass__Group_7__114099);
+            pushFollow(FOLLOW_2);
             rule__DataClass__Group_7__1__Impl();
 
             state._fsp--;
@@ -19809,23 +19809,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DataClass__Group_7__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6652:1: rule__DataClass__Group_7__1__Impl : ( ( rule__DataClass__UserCode2Assignment_7_1 ) ) ;
+    // InternalRoom.g:6655:1: rule__DataClass__Group_7__1__Impl : ( ( rule__DataClass__UserCode2Assignment_7_1 ) ) ;
     public final void rule__DataClass__Group_7__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6656:1: ( ( ( rule__DataClass__UserCode2Assignment_7_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6657:1: ( ( rule__DataClass__UserCode2Assignment_7_1 ) )
+            // InternalRoom.g:6659:1: ( ( ( rule__DataClass__UserCode2Assignment_7_1 ) ) )
+            // InternalRoom.g:6660:1: ( ( rule__DataClass__UserCode2Assignment_7_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6657:1: ( ( rule__DataClass__UserCode2Assignment_7_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6658:1: ( rule__DataClass__UserCode2Assignment_7_1 )
+            // InternalRoom.g:6660:1: ( ( rule__DataClass__UserCode2Assignment_7_1 ) )
+            // InternalRoom.g:6661:1: ( rule__DataClass__UserCode2Assignment_7_1 )
             {
              before(grammarAccess.getDataClassAccess().getUserCode2Assignment_7_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6659:1: ( rule__DataClass__UserCode2Assignment_7_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6659:2: rule__DataClass__UserCode2Assignment_7_1
+            // InternalRoom.g:6662:1: ( rule__DataClass__UserCode2Assignment_7_1 )
+            // InternalRoom.g:6662:2: rule__DataClass__UserCode2Assignment_7_1
             {
-            pushFollow(FOLLOW_rule__DataClass__UserCode2Assignment_7_1_in_rule__DataClass__Group_7__1__Impl14126);
+            pushFollow(FOLLOW_2);
             rule__DataClass__UserCode2Assignment_7_1();
 
             state._fsp--;
@@ -19856,21 +19856,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DataClass__Group_8__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6673:1: rule__DataClass__Group_8__0 : rule__DataClass__Group_8__0__Impl rule__DataClass__Group_8__1 ;
+    // InternalRoom.g:6676:1: rule__DataClass__Group_8__0 : rule__DataClass__Group_8__0__Impl rule__DataClass__Group_8__1 ;
     public final void rule__DataClass__Group_8__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6677:1: ( rule__DataClass__Group_8__0__Impl rule__DataClass__Group_8__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6678:2: rule__DataClass__Group_8__0__Impl rule__DataClass__Group_8__1
+            // InternalRoom.g:6680:1: ( rule__DataClass__Group_8__0__Impl rule__DataClass__Group_8__1 )
+            // InternalRoom.g:6681:2: rule__DataClass__Group_8__0__Impl rule__DataClass__Group_8__1
             {
-            pushFollow(FOLLOW_rule__DataClass__Group_8__0__Impl_in_rule__DataClass__Group_8__014160);
+            pushFollow(FOLLOW_27);
             rule__DataClass__Group_8__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__DataClass__Group_8__1_in_rule__DataClass__Group_8__014163);
+            pushFollow(FOLLOW_2);
             rule__DataClass__Group_8__1();
 
             state._fsp--;
@@ -19894,20 +19894,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DataClass__Group_8__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6685:1: rule__DataClass__Group_8__0__Impl : ( 'usercode3' ) ;
+    // InternalRoom.g:6688:1: rule__DataClass__Group_8__0__Impl : ( 'usercode3' ) ;
     public final void rule__DataClass__Group_8__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6689:1: ( ( 'usercode3' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6690:1: ( 'usercode3' )
+            // InternalRoom.g:6692:1: ( ( 'usercode3' ) )
+            // InternalRoom.g:6693:1: ( 'usercode3' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6690:1: ( 'usercode3' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6691:1: 'usercode3'
+            // InternalRoom.g:6693:1: ( 'usercode3' )
+            // InternalRoom.g:6694:1: 'usercode3'
             {
              before(grammarAccess.getDataClassAccess().getUsercode3Keyword_8_0()); 
-            match(input,57,FOLLOW_57_in_rule__DataClass__Group_8__0__Impl14191); 
+            match(input,57,FOLLOW_2); 
              after(grammarAccess.getDataClassAccess().getUsercode3Keyword_8_0()); 
 
             }
@@ -19931,16 +19931,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DataClass__Group_8__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6704:1: rule__DataClass__Group_8__1 : rule__DataClass__Group_8__1__Impl ;
+    // InternalRoom.g:6707:1: rule__DataClass__Group_8__1 : rule__DataClass__Group_8__1__Impl ;
     public final void rule__DataClass__Group_8__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6708:1: ( rule__DataClass__Group_8__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6709:2: rule__DataClass__Group_8__1__Impl
+            // InternalRoom.g:6711:1: ( rule__DataClass__Group_8__1__Impl )
+            // InternalRoom.g:6712:2: rule__DataClass__Group_8__1__Impl
             {
-            pushFollow(FOLLOW_rule__DataClass__Group_8__1__Impl_in_rule__DataClass__Group_8__114222);
+            pushFollow(FOLLOW_2);
             rule__DataClass__Group_8__1__Impl();
 
             state._fsp--;
@@ -19964,23 +19964,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DataClass__Group_8__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6715:1: rule__DataClass__Group_8__1__Impl : ( ( rule__DataClass__UserCode3Assignment_8_1 ) ) ;
+    // InternalRoom.g:6718:1: rule__DataClass__Group_8__1__Impl : ( ( rule__DataClass__UserCode3Assignment_8_1 ) ) ;
     public final void rule__DataClass__Group_8__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6719:1: ( ( ( rule__DataClass__UserCode3Assignment_8_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6720:1: ( ( rule__DataClass__UserCode3Assignment_8_1 ) )
+            // InternalRoom.g:6722:1: ( ( ( rule__DataClass__UserCode3Assignment_8_1 ) ) )
+            // InternalRoom.g:6723:1: ( ( rule__DataClass__UserCode3Assignment_8_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6720:1: ( ( rule__DataClass__UserCode3Assignment_8_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6721:1: ( rule__DataClass__UserCode3Assignment_8_1 )
+            // InternalRoom.g:6723:1: ( ( rule__DataClass__UserCode3Assignment_8_1 ) )
+            // InternalRoom.g:6724:1: ( rule__DataClass__UserCode3Assignment_8_1 )
             {
              before(grammarAccess.getDataClassAccess().getUserCode3Assignment_8_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6722:1: ( rule__DataClass__UserCode3Assignment_8_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6722:2: rule__DataClass__UserCode3Assignment_8_1
+            // InternalRoom.g:6725:1: ( rule__DataClass__UserCode3Assignment_8_1 )
+            // InternalRoom.g:6725:2: rule__DataClass__UserCode3Assignment_8_1
             {
-            pushFollow(FOLLOW_rule__DataClass__UserCode3Assignment_8_1_in_rule__DataClass__Group_8__1__Impl14249);
+            pushFollow(FOLLOW_2);
             rule__DataClass__UserCode3Assignment_8_1();
 
             state._fsp--;
@@ -20011,21 +20011,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Attribute__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6736:1: rule__Attribute__Group__0 : rule__Attribute__Group__0__Impl rule__Attribute__Group__1 ;
+    // InternalRoom.g:6739:1: rule__Attribute__Group__0 : rule__Attribute__Group__0__Impl rule__Attribute__Group__1 ;
     public final void rule__Attribute__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6740:1: ( rule__Attribute__Group__0__Impl rule__Attribute__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6741:2: rule__Attribute__Group__0__Impl rule__Attribute__Group__1
+            // InternalRoom.g:6743:1: ( rule__Attribute__Group__0__Impl rule__Attribute__Group__1 )
+            // InternalRoom.g:6744:2: rule__Attribute__Group__0__Impl rule__Attribute__Group__1
             {
-            pushFollow(FOLLOW_rule__Attribute__Group__0__Impl_in_rule__Attribute__Group__014283);
+            pushFollow(FOLLOW_3);
             rule__Attribute__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Attribute__Group__1_in_rule__Attribute__Group__014286);
+            pushFollow(FOLLOW_2);
             rule__Attribute__Group__1();
 
             state._fsp--;
@@ -20049,20 +20049,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Attribute__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6748:1: rule__Attribute__Group__0__Impl : ( 'Attribute' ) ;
+    // InternalRoom.g:6751:1: rule__Attribute__Group__0__Impl : ( 'Attribute' ) ;
     public final void rule__Attribute__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6752:1: ( ( 'Attribute' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6753:1: ( 'Attribute' )
+            // InternalRoom.g:6755:1: ( ( 'Attribute' ) )
+            // InternalRoom.g:6756:1: ( 'Attribute' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6753:1: ( 'Attribute' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6754:1: 'Attribute'
+            // InternalRoom.g:6756:1: ( 'Attribute' )
+            // InternalRoom.g:6757:1: 'Attribute'
             {
              before(grammarAccess.getAttributeAccess().getAttributeKeyword_0()); 
-            match(input,58,FOLLOW_58_in_rule__Attribute__Group__0__Impl14314); 
+            match(input,58,FOLLOW_2); 
              after(grammarAccess.getAttributeAccess().getAttributeKeyword_0()); 
 
             }
@@ -20086,21 +20086,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Attribute__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6767:1: rule__Attribute__Group__1 : rule__Attribute__Group__1__Impl rule__Attribute__Group__2 ;
+    // InternalRoom.g:6770:1: rule__Attribute__Group__1 : rule__Attribute__Group__1__Impl rule__Attribute__Group__2 ;
     public final void rule__Attribute__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6771:1: ( rule__Attribute__Group__1__Impl rule__Attribute__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6772:2: rule__Attribute__Group__1__Impl rule__Attribute__Group__2
+            // InternalRoom.g:6774:1: ( rule__Attribute__Group__1__Impl rule__Attribute__Group__2 )
+            // InternalRoom.g:6775:2: rule__Attribute__Group__1__Impl rule__Attribute__Group__2
             {
-            pushFollow(FOLLOW_rule__Attribute__Group__1__Impl_in_rule__Attribute__Group__114345);
+            pushFollow(FOLLOW_28);
             rule__Attribute__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Attribute__Group__2_in_rule__Attribute__Group__114348);
+            pushFollow(FOLLOW_2);
             rule__Attribute__Group__2();
 
             state._fsp--;
@@ -20124,23 +20124,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Attribute__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6779:1: rule__Attribute__Group__1__Impl : ( ( rule__Attribute__NameAssignment_1 ) ) ;
+    // InternalRoom.g:6782:1: rule__Attribute__Group__1__Impl : ( ( rule__Attribute__NameAssignment_1 ) ) ;
     public final void rule__Attribute__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6783:1: ( ( ( rule__Attribute__NameAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6784:1: ( ( rule__Attribute__NameAssignment_1 ) )
+            // InternalRoom.g:6786:1: ( ( ( rule__Attribute__NameAssignment_1 ) ) )
+            // InternalRoom.g:6787:1: ( ( rule__Attribute__NameAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6784:1: ( ( rule__Attribute__NameAssignment_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6785:1: ( rule__Attribute__NameAssignment_1 )
+            // InternalRoom.g:6787:1: ( ( rule__Attribute__NameAssignment_1 ) )
+            // InternalRoom.g:6788:1: ( rule__Attribute__NameAssignment_1 )
             {
              before(grammarAccess.getAttributeAccess().getNameAssignment_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6786:1: ( rule__Attribute__NameAssignment_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6786:2: rule__Attribute__NameAssignment_1
+            // InternalRoom.g:6789:1: ( rule__Attribute__NameAssignment_1 )
+            // InternalRoom.g:6789:2: rule__Attribute__NameAssignment_1
             {
-            pushFollow(FOLLOW_rule__Attribute__NameAssignment_1_in_rule__Attribute__Group__1__Impl14375);
+            pushFollow(FOLLOW_2);
             rule__Attribute__NameAssignment_1();
 
             state._fsp--;
@@ -20171,21 +20171,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Attribute__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6796:1: rule__Attribute__Group__2 : rule__Attribute__Group__2__Impl rule__Attribute__Group__3 ;
+    // InternalRoom.g:6799:1: rule__Attribute__Group__2 : rule__Attribute__Group__2__Impl rule__Attribute__Group__3 ;
     public final void rule__Attribute__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6800:1: ( rule__Attribute__Group__2__Impl rule__Attribute__Group__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6801:2: rule__Attribute__Group__2__Impl rule__Attribute__Group__3
+            // InternalRoom.g:6803:1: ( rule__Attribute__Group__2__Impl rule__Attribute__Group__3 )
+            // InternalRoom.g:6804:2: rule__Attribute__Group__2__Impl rule__Attribute__Group__3
             {
-            pushFollow(FOLLOW_rule__Attribute__Group__2__Impl_in_rule__Attribute__Group__214405);
+            pushFollow(FOLLOW_28);
             rule__Attribute__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Attribute__Group__3_in_rule__Attribute__Group__214408);
+            pushFollow(FOLLOW_2);
             rule__Attribute__Group__3();
 
             state._fsp--;
@@ -20209,20 +20209,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Attribute__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6808:1: rule__Attribute__Group__2__Impl : ( ( rule__Attribute__Group_2__0 )? ) ;
+    // InternalRoom.g:6811:1: rule__Attribute__Group__2__Impl : ( ( rule__Attribute__Group_2__0 )? ) ;
     public final void rule__Attribute__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6812:1: ( ( ( rule__Attribute__Group_2__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6813:1: ( ( rule__Attribute__Group_2__0 )? )
+            // InternalRoom.g:6815:1: ( ( ( rule__Attribute__Group_2__0 )? ) )
+            // InternalRoom.g:6816:1: ( ( rule__Attribute__Group_2__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6813:1: ( ( rule__Attribute__Group_2__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6814:1: ( rule__Attribute__Group_2__0 )?
+            // InternalRoom.g:6816:1: ( ( rule__Attribute__Group_2__0 )? )
+            // InternalRoom.g:6817:1: ( rule__Attribute__Group_2__0 )?
             {
              before(grammarAccess.getAttributeAccess().getGroup_2()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6815:1: ( rule__Attribute__Group_2__0 )?
+            // InternalRoom.g:6818:1: ( rule__Attribute__Group_2__0 )?
             int alt74=2;
             int LA74_0 = input.LA(1);
 
@@ -20231,9 +20231,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt74) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6815:2: rule__Attribute__Group_2__0
+                    // InternalRoom.g:6818:2: rule__Attribute__Group_2__0
                     {
-                    pushFollow(FOLLOW_rule__Attribute__Group_2__0_in_rule__Attribute__Group__2__Impl14435);
+                    pushFollow(FOLLOW_2);
                     rule__Attribute__Group_2__0();
 
                     state._fsp--;
@@ -20267,21 +20267,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Attribute__Group__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6825:1: rule__Attribute__Group__3 : rule__Attribute__Group__3__Impl rule__Attribute__Group__4 ;
+    // InternalRoom.g:6828:1: rule__Attribute__Group__3 : rule__Attribute__Group__3__Impl rule__Attribute__Group__4 ;
     public final void rule__Attribute__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6829:1: ( rule__Attribute__Group__3__Impl rule__Attribute__Group__4 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6830:2: rule__Attribute__Group__3__Impl rule__Attribute__Group__4
+            // InternalRoom.g:6832:1: ( rule__Attribute__Group__3__Impl rule__Attribute__Group__4 )
+            // InternalRoom.g:6833:2: rule__Attribute__Group__3__Impl rule__Attribute__Group__4
             {
-            pushFollow(FOLLOW_rule__Attribute__Group__3__Impl_in_rule__Attribute__Group__314466);
+            pushFollow(FOLLOW_29);
             rule__Attribute__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Attribute__Group__4_in_rule__Attribute__Group__314469);
+            pushFollow(FOLLOW_2);
             rule__Attribute__Group__4();
 
             state._fsp--;
@@ -20305,20 +20305,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Attribute__Group__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6837:1: rule__Attribute__Group__3__Impl : ( ':' ) ;
+    // InternalRoom.g:6840:1: rule__Attribute__Group__3__Impl : ( ':' ) ;
     public final void rule__Attribute__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6841:1: ( ( ':' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6842:1: ( ':' )
+            // InternalRoom.g:6844:1: ( ( ':' ) )
+            // InternalRoom.g:6845:1: ( ':' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6842:1: ( ':' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6843:1: ':'
+            // InternalRoom.g:6845:1: ( ':' )
+            // InternalRoom.g:6846:1: ':'
             {
              before(grammarAccess.getAttributeAccess().getColonKeyword_3()); 
-            match(input,43,FOLLOW_43_in_rule__Attribute__Group__3__Impl14497); 
+            match(input,43,FOLLOW_2); 
              after(grammarAccess.getAttributeAccess().getColonKeyword_3()); 
 
             }
@@ -20342,21 +20342,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Attribute__Group__4"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6856:1: rule__Attribute__Group__4 : rule__Attribute__Group__4__Impl rule__Attribute__Group__5 ;
+    // InternalRoom.g:6859:1: rule__Attribute__Group__4 : rule__Attribute__Group__4__Impl rule__Attribute__Group__5 ;
     public final void rule__Attribute__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6860:1: ( rule__Attribute__Group__4__Impl rule__Attribute__Group__5 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6861:2: rule__Attribute__Group__4__Impl rule__Attribute__Group__5
+            // InternalRoom.g:6863:1: ( rule__Attribute__Group__4__Impl rule__Attribute__Group__5 )
+            // InternalRoom.g:6864:2: rule__Attribute__Group__4__Impl rule__Attribute__Group__5
             {
-            pushFollow(FOLLOW_rule__Attribute__Group__4__Impl_in_rule__Attribute__Group__414528);
+            pushFollow(FOLLOW_29);
             rule__Attribute__Group__4__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Attribute__Group__5_in_rule__Attribute__Group__414531);
+            pushFollow(FOLLOW_2);
             rule__Attribute__Group__5();
 
             state._fsp--;
@@ -20380,20 +20380,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Attribute__Group__4__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6868:1: rule__Attribute__Group__4__Impl : ( ( rule__Attribute__TypeAssignment_4 )? ) ;
+    // InternalRoom.g:6871:1: rule__Attribute__Group__4__Impl : ( ( rule__Attribute__TypeAssignment_4 )? ) ;
     public final void rule__Attribute__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6872:1: ( ( ( rule__Attribute__TypeAssignment_4 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6873:1: ( ( rule__Attribute__TypeAssignment_4 )? )
+            // InternalRoom.g:6875:1: ( ( ( rule__Attribute__TypeAssignment_4 )? ) )
+            // InternalRoom.g:6876:1: ( ( rule__Attribute__TypeAssignment_4 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6873:1: ( ( rule__Attribute__TypeAssignment_4 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6874:1: ( rule__Attribute__TypeAssignment_4 )?
+            // InternalRoom.g:6876:1: ( ( rule__Attribute__TypeAssignment_4 )? )
+            // InternalRoom.g:6877:1: ( rule__Attribute__TypeAssignment_4 )?
             {
              before(grammarAccess.getAttributeAccess().getTypeAssignment_4()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6875:1: ( rule__Attribute__TypeAssignment_4 )?
+            // InternalRoom.g:6878:1: ( rule__Attribute__TypeAssignment_4 )?
             int alt75=2;
             int LA75_0 = input.LA(1);
 
@@ -20402,9 +20402,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt75) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6875:2: rule__Attribute__TypeAssignment_4
+                    // InternalRoom.g:6878:2: rule__Attribute__TypeAssignment_4
                     {
-                    pushFollow(FOLLOW_rule__Attribute__TypeAssignment_4_in_rule__Attribute__Group__4__Impl14558);
+                    pushFollow(FOLLOW_2);
                     rule__Attribute__TypeAssignment_4();
 
                     state._fsp--;
@@ -20438,21 +20438,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Attribute__Group__5"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6885:1: rule__Attribute__Group__5 : rule__Attribute__Group__5__Impl rule__Attribute__Group__6 ;
+    // InternalRoom.g:6888:1: rule__Attribute__Group__5 : rule__Attribute__Group__5__Impl rule__Attribute__Group__6 ;
     public final void rule__Attribute__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6889:1: ( rule__Attribute__Group__5__Impl rule__Attribute__Group__6 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6890:2: rule__Attribute__Group__5__Impl rule__Attribute__Group__6
+            // InternalRoom.g:6892:1: ( rule__Attribute__Group__5__Impl rule__Attribute__Group__6 )
+            // InternalRoom.g:6893:2: rule__Attribute__Group__5__Impl rule__Attribute__Group__6
             {
-            pushFollow(FOLLOW_rule__Attribute__Group__5__Impl_in_rule__Attribute__Group__514589);
+            pushFollow(FOLLOW_29);
             rule__Attribute__Group__5__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Attribute__Group__6_in_rule__Attribute__Group__514592);
+            pushFollow(FOLLOW_2);
             rule__Attribute__Group__6();
 
             state._fsp--;
@@ -20476,20 +20476,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Attribute__Group__5__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6897:1: rule__Attribute__Group__5__Impl : ( ( rule__Attribute__Group_5__0 )? ) ;
+    // InternalRoom.g:6900:1: rule__Attribute__Group__5__Impl : ( ( rule__Attribute__Group_5__0 )? ) ;
     public final void rule__Attribute__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6901:1: ( ( ( rule__Attribute__Group_5__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6902:1: ( ( rule__Attribute__Group_5__0 )? )
+            // InternalRoom.g:6904:1: ( ( ( rule__Attribute__Group_5__0 )? ) )
+            // InternalRoom.g:6905:1: ( ( rule__Attribute__Group_5__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6902:1: ( ( rule__Attribute__Group_5__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6903:1: ( rule__Attribute__Group_5__0 )?
+            // InternalRoom.g:6905:1: ( ( rule__Attribute__Group_5__0 )? )
+            // InternalRoom.g:6906:1: ( rule__Attribute__Group_5__0 )?
             {
              before(grammarAccess.getAttributeAccess().getGroup_5()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6904:1: ( rule__Attribute__Group_5__0 )?
+            // InternalRoom.g:6907:1: ( rule__Attribute__Group_5__0 )?
             int alt76=2;
             int LA76_0 = input.LA(1);
 
@@ -20498,9 +20498,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt76) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6904:2: rule__Attribute__Group_5__0
+                    // InternalRoom.g:6907:2: rule__Attribute__Group_5__0
                     {
-                    pushFollow(FOLLOW_rule__Attribute__Group_5__0_in_rule__Attribute__Group__5__Impl14619);
+                    pushFollow(FOLLOW_2);
                     rule__Attribute__Group_5__0();
 
                     state._fsp--;
@@ -20534,16 +20534,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Attribute__Group__6"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6914:1: rule__Attribute__Group__6 : rule__Attribute__Group__6__Impl ;
+    // InternalRoom.g:6917:1: rule__Attribute__Group__6 : rule__Attribute__Group__6__Impl ;
     public final void rule__Attribute__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6918:1: ( rule__Attribute__Group__6__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6919:2: rule__Attribute__Group__6__Impl
+            // InternalRoom.g:6921:1: ( rule__Attribute__Group__6__Impl )
+            // InternalRoom.g:6922:2: rule__Attribute__Group__6__Impl
             {
-            pushFollow(FOLLOW_rule__Attribute__Group__6__Impl_in_rule__Attribute__Group__614650);
+            pushFollow(FOLLOW_2);
             rule__Attribute__Group__6__Impl();
 
             state._fsp--;
@@ -20567,20 +20567,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Attribute__Group__6__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6925:1: rule__Attribute__Group__6__Impl : ( ( rule__Attribute__DocuAssignment_6 )? ) ;
+    // InternalRoom.g:6928:1: rule__Attribute__Group__6__Impl : ( ( rule__Attribute__DocuAssignment_6 )? ) ;
     public final void rule__Attribute__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6929:1: ( ( ( rule__Attribute__DocuAssignment_6 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6930:1: ( ( rule__Attribute__DocuAssignment_6 )? )
+            // InternalRoom.g:6932:1: ( ( ( rule__Attribute__DocuAssignment_6 )? ) )
+            // InternalRoom.g:6933:1: ( ( rule__Attribute__DocuAssignment_6 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6930:1: ( ( rule__Attribute__DocuAssignment_6 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6931:1: ( rule__Attribute__DocuAssignment_6 )?
+            // InternalRoom.g:6933:1: ( ( rule__Attribute__DocuAssignment_6 )? )
+            // InternalRoom.g:6934:1: ( rule__Attribute__DocuAssignment_6 )?
             {
              before(grammarAccess.getAttributeAccess().getDocuAssignment_6()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6932:1: ( rule__Attribute__DocuAssignment_6 )?
+            // InternalRoom.g:6935:1: ( rule__Attribute__DocuAssignment_6 )?
             int alt77=2;
             int LA77_0 = input.LA(1);
 
@@ -20589,9 +20589,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt77) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6932:2: rule__Attribute__DocuAssignment_6
+                    // InternalRoom.g:6935:2: rule__Attribute__DocuAssignment_6
                     {
-                    pushFollow(FOLLOW_rule__Attribute__DocuAssignment_6_in_rule__Attribute__Group__6__Impl14677);
+                    pushFollow(FOLLOW_2);
                     rule__Attribute__DocuAssignment_6();
 
                     state._fsp--;
@@ -20625,21 +20625,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Attribute__Group_2__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6956:1: rule__Attribute__Group_2__0 : rule__Attribute__Group_2__0__Impl rule__Attribute__Group_2__1 ;
+    // InternalRoom.g:6959:1: rule__Attribute__Group_2__0 : rule__Attribute__Group_2__0__Impl rule__Attribute__Group_2__1 ;
     public final void rule__Attribute__Group_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6960:1: ( rule__Attribute__Group_2__0__Impl rule__Attribute__Group_2__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6961:2: rule__Attribute__Group_2__0__Impl rule__Attribute__Group_2__1
+            // InternalRoom.g:6963:1: ( rule__Attribute__Group_2__0__Impl rule__Attribute__Group_2__1 )
+            // InternalRoom.g:6964:2: rule__Attribute__Group_2__0__Impl rule__Attribute__Group_2__1
             {
-            pushFollow(FOLLOW_rule__Attribute__Group_2__0__Impl_in_rule__Attribute__Group_2__014722);
+            pushFollow(FOLLOW_30);
             rule__Attribute__Group_2__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Attribute__Group_2__1_in_rule__Attribute__Group_2__014725);
+            pushFollow(FOLLOW_2);
             rule__Attribute__Group_2__1();
 
             state._fsp--;
@@ -20663,20 +20663,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Attribute__Group_2__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6968:1: rule__Attribute__Group_2__0__Impl : ( '[' ) ;
+    // InternalRoom.g:6971:1: rule__Attribute__Group_2__0__Impl : ( '[' ) ;
     public final void rule__Attribute__Group_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6972:1: ( ( '[' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6973:1: ( '[' )
+            // InternalRoom.g:6975:1: ( ( '[' ) )
+            // InternalRoom.g:6976:1: ( '[' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6973:1: ( '[' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6974:1: '['
+            // InternalRoom.g:6976:1: ( '[' )
+            // InternalRoom.g:6977:1: '['
             {
              before(grammarAccess.getAttributeAccess().getLeftSquareBracketKeyword_2_0()); 
-            match(input,59,FOLLOW_59_in_rule__Attribute__Group_2__0__Impl14753); 
+            match(input,59,FOLLOW_2); 
              after(grammarAccess.getAttributeAccess().getLeftSquareBracketKeyword_2_0()); 
 
             }
@@ -20700,21 +20700,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Attribute__Group_2__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6987:1: rule__Attribute__Group_2__1 : rule__Attribute__Group_2__1__Impl rule__Attribute__Group_2__2 ;
+    // InternalRoom.g:6990:1: rule__Attribute__Group_2__1 : rule__Attribute__Group_2__1__Impl rule__Attribute__Group_2__2 ;
     public final void rule__Attribute__Group_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6991:1: ( rule__Attribute__Group_2__1__Impl rule__Attribute__Group_2__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6992:2: rule__Attribute__Group_2__1__Impl rule__Attribute__Group_2__2
+            // InternalRoom.g:6994:1: ( rule__Attribute__Group_2__1__Impl rule__Attribute__Group_2__2 )
+            // InternalRoom.g:6995:2: rule__Attribute__Group_2__1__Impl rule__Attribute__Group_2__2
             {
-            pushFollow(FOLLOW_rule__Attribute__Group_2__1__Impl_in_rule__Attribute__Group_2__114784);
+            pushFollow(FOLLOW_31);
             rule__Attribute__Group_2__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Attribute__Group_2__2_in_rule__Attribute__Group_2__114787);
+            pushFollow(FOLLOW_2);
             rule__Attribute__Group_2__2();
 
             state._fsp--;
@@ -20738,23 +20738,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Attribute__Group_2__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:6999:1: rule__Attribute__Group_2__1__Impl : ( ( rule__Attribute__SizeAssignment_2_1 ) ) ;
+    // InternalRoom.g:7002:1: rule__Attribute__Group_2__1__Impl : ( ( rule__Attribute__SizeAssignment_2_1 ) ) ;
     public final void rule__Attribute__Group_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7003:1: ( ( ( rule__Attribute__SizeAssignment_2_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7004:1: ( ( rule__Attribute__SizeAssignment_2_1 ) )
+            // InternalRoom.g:7006:1: ( ( ( rule__Attribute__SizeAssignment_2_1 ) ) )
+            // InternalRoom.g:7007:1: ( ( rule__Attribute__SizeAssignment_2_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7004:1: ( ( rule__Attribute__SizeAssignment_2_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7005:1: ( rule__Attribute__SizeAssignment_2_1 )
+            // InternalRoom.g:7007:1: ( ( rule__Attribute__SizeAssignment_2_1 ) )
+            // InternalRoom.g:7008:1: ( rule__Attribute__SizeAssignment_2_1 )
             {
              before(grammarAccess.getAttributeAccess().getSizeAssignment_2_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7006:1: ( rule__Attribute__SizeAssignment_2_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7006:2: rule__Attribute__SizeAssignment_2_1
+            // InternalRoom.g:7009:1: ( rule__Attribute__SizeAssignment_2_1 )
+            // InternalRoom.g:7009:2: rule__Attribute__SizeAssignment_2_1
             {
-            pushFollow(FOLLOW_rule__Attribute__SizeAssignment_2_1_in_rule__Attribute__Group_2__1__Impl14814);
+            pushFollow(FOLLOW_2);
             rule__Attribute__SizeAssignment_2_1();
 
             state._fsp--;
@@ -20785,16 +20785,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Attribute__Group_2__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7016:1: rule__Attribute__Group_2__2 : rule__Attribute__Group_2__2__Impl ;
+    // InternalRoom.g:7019:1: rule__Attribute__Group_2__2 : rule__Attribute__Group_2__2__Impl ;
     public final void rule__Attribute__Group_2__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7020:1: ( rule__Attribute__Group_2__2__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7021:2: rule__Attribute__Group_2__2__Impl
+            // InternalRoom.g:7023:1: ( rule__Attribute__Group_2__2__Impl )
+            // InternalRoom.g:7024:2: rule__Attribute__Group_2__2__Impl
             {
-            pushFollow(FOLLOW_rule__Attribute__Group_2__2__Impl_in_rule__Attribute__Group_2__214844);
+            pushFollow(FOLLOW_2);
             rule__Attribute__Group_2__2__Impl();
 
             state._fsp--;
@@ -20818,20 +20818,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Attribute__Group_2__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7027:1: rule__Attribute__Group_2__2__Impl : ( ']' ) ;
+    // InternalRoom.g:7030:1: rule__Attribute__Group_2__2__Impl : ( ']' ) ;
     public final void rule__Attribute__Group_2__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7031:1: ( ( ']' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7032:1: ( ']' )
+            // InternalRoom.g:7034:1: ( ( ']' ) )
+            // InternalRoom.g:7035:1: ( ']' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7032:1: ( ']' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7033:1: ']'
+            // InternalRoom.g:7035:1: ( ']' )
+            // InternalRoom.g:7036:1: ']'
             {
              before(grammarAccess.getAttributeAccess().getRightSquareBracketKeyword_2_2()); 
-            match(input,60,FOLLOW_60_in_rule__Attribute__Group_2__2__Impl14872); 
+            match(input,60,FOLLOW_2); 
              after(grammarAccess.getAttributeAccess().getRightSquareBracketKeyword_2_2()); 
 
             }
@@ -20855,21 +20855,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Attribute__Group_5__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7052:1: rule__Attribute__Group_5__0 : rule__Attribute__Group_5__0__Impl rule__Attribute__Group_5__1 ;
+    // InternalRoom.g:7055:1: rule__Attribute__Group_5__0 : rule__Attribute__Group_5__0__Impl rule__Attribute__Group_5__1 ;
     public final void rule__Attribute__Group_5__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7056:1: ( rule__Attribute__Group_5__0__Impl rule__Attribute__Group_5__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7057:2: rule__Attribute__Group_5__0__Impl rule__Attribute__Group_5__1
+            // InternalRoom.g:7059:1: ( rule__Attribute__Group_5__0__Impl rule__Attribute__Group_5__1 )
+            // InternalRoom.g:7060:2: rule__Attribute__Group_5__0__Impl rule__Attribute__Group_5__1
             {
-            pushFollow(FOLLOW_rule__Attribute__Group_5__0__Impl_in_rule__Attribute__Group_5__014909);
+            pushFollow(FOLLOW_12);
             rule__Attribute__Group_5__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Attribute__Group_5__1_in_rule__Attribute__Group_5__014912);
+            pushFollow(FOLLOW_2);
             rule__Attribute__Group_5__1();
 
             state._fsp--;
@@ -20893,20 +20893,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Attribute__Group_5__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7064:1: rule__Attribute__Group_5__0__Impl : ( '=' ) ;
+    // InternalRoom.g:7067:1: rule__Attribute__Group_5__0__Impl : ( '=' ) ;
     public final void rule__Attribute__Group_5__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7068:1: ( ( '=' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7069:1: ( '=' )
+            // InternalRoom.g:7071:1: ( ( '=' ) )
+            // InternalRoom.g:7072:1: ( '=' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7069:1: ( '=' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7070:1: '='
+            // InternalRoom.g:7072:1: ( '=' )
+            // InternalRoom.g:7073:1: '='
             {
              before(grammarAccess.getAttributeAccess().getEqualsSignKeyword_5_0()); 
-            match(input,52,FOLLOW_52_in_rule__Attribute__Group_5__0__Impl14940); 
+            match(input,52,FOLLOW_2); 
              after(grammarAccess.getAttributeAccess().getEqualsSignKeyword_5_0()); 
 
             }
@@ -20930,16 +20930,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Attribute__Group_5__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7083:1: rule__Attribute__Group_5__1 : rule__Attribute__Group_5__1__Impl ;
+    // InternalRoom.g:7086:1: rule__Attribute__Group_5__1 : rule__Attribute__Group_5__1__Impl ;
     public final void rule__Attribute__Group_5__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7087:1: ( rule__Attribute__Group_5__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7088:2: rule__Attribute__Group_5__1__Impl
+            // InternalRoom.g:7090:1: ( rule__Attribute__Group_5__1__Impl )
+            // InternalRoom.g:7091:2: rule__Attribute__Group_5__1__Impl
             {
-            pushFollow(FOLLOW_rule__Attribute__Group_5__1__Impl_in_rule__Attribute__Group_5__114971);
+            pushFollow(FOLLOW_2);
             rule__Attribute__Group_5__1__Impl();
 
             state._fsp--;
@@ -20963,23 +20963,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Attribute__Group_5__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7094:1: rule__Attribute__Group_5__1__Impl : ( ( rule__Attribute__DefaultValueLiteralAssignment_5_1 ) ) ;
+    // InternalRoom.g:7097:1: rule__Attribute__Group_5__1__Impl : ( ( rule__Attribute__DefaultValueLiteralAssignment_5_1 ) ) ;
     public final void rule__Attribute__Group_5__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7098:1: ( ( ( rule__Attribute__DefaultValueLiteralAssignment_5_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7099:1: ( ( rule__Attribute__DefaultValueLiteralAssignment_5_1 ) )
+            // InternalRoom.g:7101:1: ( ( ( rule__Attribute__DefaultValueLiteralAssignment_5_1 ) ) )
+            // InternalRoom.g:7102:1: ( ( rule__Attribute__DefaultValueLiteralAssignment_5_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7099:1: ( ( rule__Attribute__DefaultValueLiteralAssignment_5_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7100:1: ( rule__Attribute__DefaultValueLiteralAssignment_5_1 )
+            // InternalRoom.g:7102:1: ( ( rule__Attribute__DefaultValueLiteralAssignment_5_1 ) )
+            // InternalRoom.g:7103:1: ( rule__Attribute__DefaultValueLiteralAssignment_5_1 )
             {
              before(grammarAccess.getAttributeAccess().getDefaultValueLiteralAssignment_5_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7101:1: ( rule__Attribute__DefaultValueLiteralAssignment_5_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7101:2: rule__Attribute__DefaultValueLiteralAssignment_5_1
+            // InternalRoom.g:7104:1: ( rule__Attribute__DefaultValueLiteralAssignment_5_1 )
+            // InternalRoom.g:7104:2: rule__Attribute__DefaultValueLiteralAssignment_5_1
             {
-            pushFollow(FOLLOW_rule__Attribute__DefaultValueLiteralAssignment_5_1_in_rule__Attribute__Group_5__1__Impl14998);
+            pushFollow(FOLLOW_2);
             rule__Attribute__DefaultValueLiteralAssignment_5_1();
 
             state._fsp--;
@@ -21010,21 +21010,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StandardOperation__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7115:1: rule__StandardOperation__Group__0 : rule__StandardOperation__Group__0__Impl rule__StandardOperation__Group__1 ;
+    // InternalRoom.g:7118:1: rule__StandardOperation__Group__0 : rule__StandardOperation__Group__0__Impl rule__StandardOperation__Group__1 ;
     public final void rule__StandardOperation__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7119:1: ( rule__StandardOperation__Group__0__Impl rule__StandardOperation__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7120:2: rule__StandardOperation__Group__0__Impl rule__StandardOperation__Group__1
+            // InternalRoom.g:7122:1: ( rule__StandardOperation__Group__0__Impl rule__StandardOperation__Group__1 )
+            // InternalRoom.g:7123:2: rule__StandardOperation__Group__0__Impl rule__StandardOperation__Group__1
             {
-            pushFollow(FOLLOW_rule__StandardOperation__Group__0__Impl_in_rule__StandardOperation__Group__015032);
+            pushFollow(FOLLOW_32);
             rule__StandardOperation__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__StandardOperation__Group__1_in_rule__StandardOperation__Group__015035);
+            pushFollow(FOLLOW_2);
             rule__StandardOperation__Group__1();
 
             state._fsp--;
@@ -21048,20 +21048,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StandardOperation__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7127:1: rule__StandardOperation__Group__0__Impl : ( ( rule__StandardOperation__OverrideAssignment_0 )? ) ;
+    // InternalRoom.g:7130:1: rule__StandardOperation__Group__0__Impl : ( ( rule__StandardOperation__OverrideAssignment_0 )? ) ;
     public final void rule__StandardOperation__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7131:1: ( ( ( rule__StandardOperation__OverrideAssignment_0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7132:1: ( ( rule__StandardOperation__OverrideAssignment_0 )? )
+            // InternalRoom.g:7134:1: ( ( ( rule__StandardOperation__OverrideAssignment_0 )? ) )
+            // InternalRoom.g:7135:1: ( ( rule__StandardOperation__OverrideAssignment_0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7132:1: ( ( rule__StandardOperation__OverrideAssignment_0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7133:1: ( rule__StandardOperation__OverrideAssignment_0 )?
+            // InternalRoom.g:7135:1: ( ( rule__StandardOperation__OverrideAssignment_0 )? )
+            // InternalRoom.g:7136:1: ( rule__StandardOperation__OverrideAssignment_0 )?
             {
              before(grammarAccess.getStandardOperationAccess().getOverrideAssignment_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7134:1: ( rule__StandardOperation__OverrideAssignment_0 )?
+            // InternalRoom.g:7137:1: ( rule__StandardOperation__OverrideAssignment_0 )?
             int alt78=2;
             int LA78_0 = input.LA(1);
 
@@ -21070,9 +21070,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt78) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7134:2: rule__StandardOperation__OverrideAssignment_0
+                    // InternalRoom.g:7137:2: rule__StandardOperation__OverrideAssignment_0
                     {
-                    pushFollow(FOLLOW_rule__StandardOperation__OverrideAssignment_0_in_rule__StandardOperation__Group__0__Impl15062);
+                    pushFollow(FOLLOW_2);
                     rule__StandardOperation__OverrideAssignment_0();
 
                     state._fsp--;
@@ -21106,21 +21106,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StandardOperation__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7144:1: rule__StandardOperation__Group__1 : rule__StandardOperation__Group__1__Impl rule__StandardOperation__Group__2 ;
+    // InternalRoom.g:7147:1: rule__StandardOperation__Group__1 : rule__StandardOperation__Group__1__Impl rule__StandardOperation__Group__2 ;
     public final void rule__StandardOperation__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7148:1: ( rule__StandardOperation__Group__1__Impl rule__StandardOperation__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7149:2: rule__StandardOperation__Group__1__Impl rule__StandardOperation__Group__2
+            // InternalRoom.g:7151:1: ( rule__StandardOperation__Group__1__Impl rule__StandardOperation__Group__2 )
+            // InternalRoom.g:7152:2: rule__StandardOperation__Group__1__Impl rule__StandardOperation__Group__2
             {
-            pushFollow(FOLLOW_rule__StandardOperation__Group__1__Impl_in_rule__StandardOperation__Group__115093);
+            pushFollow(FOLLOW_3);
             rule__StandardOperation__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__StandardOperation__Group__2_in_rule__StandardOperation__Group__115096);
+            pushFollow(FOLLOW_2);
             rule__StandardOperation__Group__2();
 
             state._fsp--;
@@ -21144,20 +21144,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StandardOperation__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7156:1: rule__StandardOperation__Group__1__Impl : ( 'Operation' ) ;
+    // InternalRoom.g:7159:1: rule__StandardOperation__Group__1__Impl : ( 'Operation' ) ;
     public final void rule__StandardOperation__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7160:1: ( ( 'Operation' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7161:1: ( 'Operation' )
+            // InternalRoom.g:7163:1: ( ( 'Operation' ) )
+            // InternalRoom.g:7164:1: ( 'Operation' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7161:1: ( 'Operation' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7162:1: 'Operation'
+            // InternalRoom.g:7164:1: ( 'Operation' )
+            // InternalRoom.g:7165:1: 'Operation'
             {
              before(grammarAccess.getStandardOperationAccess().getOperationKeyword_1()); 
-            match(input,61,FOLLOW_61_in_rule__StandardOperation__Group__1__Impl15124); 
+            match(input,61,FOLLOW_2); 
              after(grammarAccess.getStandardOperationAccess().getOperationKeyword_1()); 
 
             }
@@ -21181,21 +21181,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StandardOperation__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7175:1: rule__StandardOperation__Group__2 : rule__StandardOperation__Group__2__Impl rule__StandardOperation__Group__3 ;
+    // InternalRoom.g:7178:1: rule__StandardOperation__Group__2 : rule__StandardOperation__Group__2__Impl rule__StandardOperation__Group__3 ;
     public final void rule__StandardOperation__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7179:1: ( rule__StandardOperation__Group__2__Impl rule__StandardOperation__Group__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7180:2: rule__StandardOperation__Group__2__Impl rule__StandardOperation__Group__3
+            // InternalRoom.g:7182:1: ( rule__StandardOperation__Group__2__Impl rule__StandardOperation__Group__3 )
+            // InternalRoom.g:7183:2: rule__StandardOperation__Group__2__Impl rule__StandardOperation__Group__3
             {
-            pushFollow(FOLLOW_rule__StandardOperation__Group__2__Impl_in_rule__StandardOperation__Group__215155);
+            pushFollow(FOLLOW_33);
             rule__StandardOperation__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__StandardOperation__Group__3_in_rule__StandardOperation__Group__215158);
+            pushFollow(FOLLOW_2);
             rule__StandardOperation__Group__3();
 
             state._fsp--;
@@ -21219,23 +21219,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StandardOperation__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7187:1: rule__StandardOperation__Group__2__Impl : ( ( rule__StandardOperation__NameAssignment_2 ) ) ;
+    // InternalRoom.g:7190:1: rule__StandardOperation__Group__2__Impl : ( ( rule__StandardOperation__NameAssignment_2 ) ) ;
     public final void rule__StandardOperation__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7191:1: ( ( ( rule__StandardOperation__NameAssignment_2 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7192:1: ( ( rule__StandardOperation__NameAssignment_2 ) )
+            // InternalRoom.g:7194:1: ( ( ( rule__StandardOperation__NameAssignment_2 ) ) )
+            // InternalRoom.g:7195:1: ( ( rule__StandardOperation__NameAssignment_2 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7192:1: ( ( rule__StandardOperation__NameAssignment_2 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7193:1: ( rule__StandardOperation__NameAssignment_2 )
+            // InternalRoom.g:7195:1: ( ( rule__StandardOperation__NameAssignment_2 ) )
+            // InternalRoom.g:7196:1: ( rule__StandardOperation__NameAssignment_2 )
             {
              before(grammarAccess.getStandardOperationAccess().getNameAssignment_2()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7194:1: ( rule__StandardOperation__NameAssignment_2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7194:2: rule__StandardOperation__NameAssignment_2
+            // InternalRoom.g:7197:1: ( rule__StandardOperation__NameAssignment_2 )
+            // InternalRoom.g:7197:2: rule__StandardOperation__NameAssignment_2
             {
-            pushFollow(FOLLOW_rule__StandardOperation__NameAssignment_2_in_rule__StandardOperation__Group__2__Impl15185);
+            pushFollow(FOLLOW_2);
             rule__StandardOperation__NameAssignment_2();
 
             state._fsp--;
@@ -21266,21 +21266,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StandardOperation__Group__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7204:1: rule__StandardOperation__Group__3 : rule__StandardOperation__Group__3__Impl rule__StandardOperation__Group__4 ;
+    // InternalRoom.g:7207:1: rule__StandardOperation__Group__3 : rule__StandardOperation__Group__3__Impl rule__StandardOperation__Group__4 ;
     public final void rule__StandardOperation__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7208:1: ( rule__StandardOperation__Group__3__Impl rule__StandardOperation__Group__4 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7209:2: rule__StandardOperation__Group__3__Impl rule__StandardOperation__Group__4
+            // InternalRoom.g:7211:1: ( rule__StandardOperation__Group__3__Impl rule__StandardOperation__Group__4 )
+            // InternalRoom.g:7212:2: rule__StandardOperation__Group__3__Impl rule__StandardOperation__Group__4
             {
-            pushFollow(FOLLOW_rule__StandardOperation__Group__3__Impl_in_rule__StandardOperation__Group__315215);
+            pushFollow(FOLLOW_34);
             rule__StandardOperation__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__StandardOperation__Group__4_in_rule__StandardOperation__Group__315218);
+            pushFollow(FOLLOW_2);
             rule__StandardOperation__Group__4();
 
             state._fsp--;
@@ -21304,20 +21304,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StandardOperation__Group__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7216:1: rule__StandardOperation__Group__3__Impl : ( '(' ) ;
+    // InternalRoom.g:7219:1: rule__StandardOperation__Group__3__Impl : ( '(' ) ;
     public final void rule__StandardOperation__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7220:1: ( ( '(' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7221:1: ( '(' )
+            // InternalRoom.g:7223:1: ( ( '(' ) )
+            // InternalRoom.g:7224:1: ( '(' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7221:1: ( '(' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7222:1: '('
+            // InternalRoom.g:7224:1: ( '(' )
+            // InternalRoom.g:7225:1: '('
             {
              before(grammarAccess.getStandardOperationAccess().getLeftParenthesisKeyword_3()); 
-            match(input,47,FOLLOW_47_in_rule__StandardOperation__Group__3__Impl15246); 
+            match(input,47,FOLLOW_2); 
              after(grammarAccess.getStandardOperationAccess().getLeftParenthesisKeyword_3()); 
 
             }
@@ -21341,21 +21341,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StandardOperation__Group__4"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7235:1: rule__StandardOperation__Group__4 : rule__StandardOperation__Group__4__Impl rule__StandardOperation__Group__5 ;
+    // InternalRoom.g:7238:1: rule__StandardOperation__Group__4 : rule__StandardOperation__Group__4__Impl rule__StandardOperation__Group__5 ;
     public final void rule__StandardOperation__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7239:1: ( rule__StandardOperation__Group__4__Impl rule__StandardOperation__Group__5 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7240:2: rule__StandardOperation__Group__4__Impl rule__StandardOperation__Group__5
+            // InternalRoom.g:7242:1: ( rule__StandardOperation__Group__4__Impl rule__StandardOperation__Group__5 )
+            // InternalRoom.g:7243:2: rule__StandardOperation__Group__4__Impl rule__StandardOperation__Group__5
             {
-            pushFollow(FOLLOW_rule__StandardOperation__Group__4__Impl_in_rule__StandardOperation__Group__415277);
+            pushFollow(FOLLOW_34);
             rule__StandardOperation__Group__4__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__StandardOperation__Group__5_in_rule__StandardOperation__Group__415280);
+            pushFollow(FOLLOW_2);
             rule__StandardOperation__Group__5();
 
             state._fsp--;
@@ -21379,20 +21379,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StandardOperation__Group__4__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7247:1: rule__StandardOperation__Group__4__Impl : ( ( rule__StandardOperation__Group_4__0 )? ) ;
+    // InternalRoom.g:7250:1: rule__StandardOperation__Group__4__Impl : ( ( rule__StandardOperation__Group_4__0 )? ) ;
     public final void rule__StandardOperation__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7251:1: ( ( ( rule__StandardOperation__Group_4__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7252:1: ( ( rule__StandardOperation__Group_4__0 )? )
+            // InternalRoom.g:7254:1: ( ( ( rule__StandardOperation__Group_4__0 )? ) )
+            // InternalRoom.g:7255:1: ( ( rule__StandardOperation__Group_4__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7252:1: ( ( rule__StandardOperation__Group_4__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7253:1: ( rule__StandardOperation__Group_4__0 )?
+            // InternalRoom.g:7255:1: ( ( rule__StandardOperation__Group_4__0 )? )
+            // InternalRoom.g:7256:1: ( rule__StandardOperation__Group_4__0 )?
             {
              before(grammarAccess.getStandardOperationAccess().getGroup_4()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7254:1: ( rule__StandardOperation__Group_4__0 )?
+            // InternalRoom.g:7257:1: ( rule__StandardOperation__Group_4__0 )?
             int alt79=2;
             int LA79_0 = input.LA(1);
 
@@ -21401,9 +21401,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt79) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7254:2: rule__StandardOperation__Group_4__0
+                    // InternalRoom.g:7257:2: rule__StandardOperation__Group_4__0
                     {
-                    pushFollow(FOLLOW_rule__StandardOperation__Group_4__0_in_rule__StandardOperation__Group__4__Impl15307);
+                    pushFollow(FOLLOW_2);
                     rule__StandardOperation__Group_4__0();
 
                     state._fsp--;
@@ -21437,21 +21437,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StandardOperation__Group__5"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7264:1: rule__StandardOperation__Group__5 : rule__StandardOperation__Group__5__Impl rule__StandardOperation__Group__6 ;
+    // InternalRoom.g:7267:1: rule__StandardOperation__Group__5 : rule__StandardOperation__Group__5__Impl rule__StandardOperation__Group__6 ;
     public final void rule__StandardOperation__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7268:1: ( rule__StandardOperation__Group__5__Impl rule__StandardOperation__Group__6 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7269:2: rule__StandardOperation__Group__5__Impl rule__StandardOperation__Group__6
+            // InternalRoom.g:7271:1: ( rule__StandardOperation__Group__5__Impl rule__StandardOperation__Group__6 )
+            // InternalRoom.g:7272:2: rule__StandardOperation__Group__5__Impl rule__StandardOperation__Group__6
             {
-            pushFollow(FOLLOW_rule__StandardOperation__Group__5__Impl_in_rule__StandardOperation__Group__515338);
+            pushFollow(FOLLOW_35);
             rule__StandardOperation__Group__5__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__StandardOperation__Group__6_in_rule__StandardOperation__Group__515341);
+            pushFollow(FOLLOW_2);
             rule__StandardOperation__Group__6();
 
             state._fsp--;
@@ -21475,20 +21475,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StandardOperation__Group__5__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7276:1: rule__StandardOperation__Group__5__Impl : ( ')' ) ;
+    // InternalRoom.g:7279:1: rule__StandardOperation__Group__5__Impl : ( ')' ) ;
     public final void rule__StandardOperation__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7280:1: ( ( ')' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7281:1: ( ')' )
+            // InternalRoom.g:7283:1: ( ( ')' ) )
+            // InternalRoom.g:7284:1: ( ')' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7281:1: ( ')' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7282:1: ')'
+            // InternalRoom.g:7284:1: ( ')' )
+            // InternalRoom.g:7285:1: ')'
             {
              before(grammarAccess.getStandardOperationAccess().getRightParenthesisKeyword_5()); 
-            match(input,48,FOLLOW_48_in_rule__StandardOperation__Group__5__Impl15369); 
+            match(input,48,FOLLOW_2); 
              after(grammarAccess.getStandardOperationAccess().getRightParenthesisKeyword_5()); 
 
             }
@@ -21512,21 +21512,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StandardOperation__Group__6"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7295:1: rule__StandardOperation__Group__6 : rule__StandardOperation__Group__6__Impl rule__StandardOperation__Group__7 ;
+    // InternalRoom.g:7298:1: rule__StandardOperation__Group__6 : rule__StandardOperation__Group__6__Impl rule__StandardOperation__Group__7 ;
     public final void rule__StandardOperation__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7299:1: ( rule__StandardOperation__Group__6__Impl rule__StandardOperation__Group__7 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7300:2: rule__StandardOperation__Group__6__Impl rule__StandardOperation__Group__7
+            // InternalRoom.g:7302:1: ( rule__StandardOperation__Group__6__Impl rule__StandardOperation__Group__7 )
+            // InternalRoom.g:7303:2: rule__StandardOperation__Group__6__Impl rule__StandardOperation__Group__7
             {
-            pushFollow(FOLLOW_rule__StandardOperation__Group__6__Impl_in_rule__StandardOperation__Group__615400);
+            pushFollow(FOLLOW_35);
             rule__StandardOperation__Group__6__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__StandardOperation__Group__7_in_rule__StandardOperation__Group__615403);
+            pushFollow(FOLLOW_2);
             rule__StandardOperation__Group__7();
 
             state._fsp--;
@@ -21550,20 +21550,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StandardOperation__Group__6__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7307:1: rule__StandardOperation__Group__6__Impl : ( ( rule__StandardOperation__Group_6__0 )? ) ;
+    // InternalRoom.g:7310:1: rule__StandardOperation__Group__6__Impl : ( ( rule__StandardOperation__Group_6__0 )? ) ;
     public final void rule__StandardOperation__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7311:1: ( ( ( rule__StandardOperation__Group_6__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7312:1: ( ( rule__StandardOperation__Group_6__0 )? )
+            // InternalRoom.g:7314:1: ( ( ( rule__StandardOperation__Group_6__0 )? ) )
+            // InternalRoom.g:7315:1: ( ( rule__StandardOperation__Group_6__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7312:1: ( ( rule__StandardOperation__Group_6__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7313:1: ( rule__StandardOperation__Group_6__0 )?
+            // InternalRoom.g:7315:1: ( ( rule__StandardOperation__Group_6__0 )? )
+            // InternalRoom.g:7316:1: ( rule__StandardOperation__Group_6__0 )?
             {
              before(grammarAccess.getStandardOperationAccess().getGroup_6()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7314:1: ( rule__StandardOperation__Group_6__0 )?
+            // InternalRoom.g:7317:1: ( rule__StandardOperation__Group_6__0 )?
             int alt80=2;
             int LA80_0 = input.LA(1);
 
@@ -21572,9 +21572,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt80) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7314:2: rule__StandardOperation__Group_6__0
+                    // InternalRoom.g:7317:2: rule__StandardOperation__Group_6__0
                     {
-                    pushFollow(FOLLOW_rule__StandardOperation__Group_6__0_in_rule__StandardOperation__Group__6__Impl15430);
+                    pushFollow(FOLLOW_2);
                     rule__StandardOperation__Group_6__0();
 
                     state._fsp--;
@@ -21608,21 +21608,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StandardOperation__Group__7"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7324:1: rule__StandardOperation__Group__7 : rule__StandardOperation__Group__7__Impl rule__StandardOperation__Group__8 ;
+    // InternalRoom.g:7327:1: rule__StandardOperation__Group__7 : rule__StandardOperation__Group__7__Impl rule__StandardOperation__Group__8 ;
     public final void rule__StandardOperation__Group__7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7328:1: ( rule__StandardOperation__Group__7__Impl rule__StandardOperation__Group__8 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7329:2: rule__StandardOperation__Group__7__Impl rule__StandardOperation__Group__8
+            // InternalRoom.g:7331:1: ( rule__StandardOperation__Group__7__Impl rule__StandardOperation__Group__8 )
+            // InternalRoom.g:7332:2: rule__StandardOperation__Group__7__Impl rule__StandardOperation__Group__8
             {
-            pushFollow(FOLLOW_rule__StandardOperation__Group__7__Impl_in_rule__StandardOperation__Group__715461);
+            pushFollow(FOLLOW_35);
             rule__StandardOperation__Group__7__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__StandardOperation__Group__8_in_rule__StandardOperation__Group__715464);
+            pushFollow(FOLLOW_2);
             rule__StandardOperation__Group__8();
 
             state._fsp--;
@@ -21646,20 +21646,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StandardOperation__Group__7__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7336:1: rule__StandardOperation__Group__7__Impl : ( ( rule__StandardOperation__DocuAssignment_7 )? ) ;
+    // InternalRoom.g:7339:1: rule__StandardOperation__Group__7__Impl : ( ( rule__StandardOperation__DocuAssignment_7 )? ) ;
     public final void rule__StandardOperation__Group__7__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7340:1: ( ( ( rule__StandardOperation__DocuAssignment_7 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7341:1: ( ( rule__StandardOperation__DocuAssignment_7 )? )
+            // InternalRoom.g:7343:1: ( ( ( rule__StandardOperation__DocuAssignment_7 )? ) )
+            // InternalRoom.g:7344:1: ( ( rule__StandardOperation__DocuAssignment_7 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7341:1: ( ( rule__StandardOperation__DocuAssignment_7 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7342:1: ( rule__StandardOperation__DocuAssignment_7 )?
+            // InternalRoom.g:7344:1: ( ( rule__StandardOperation__DocuAssignment_7 )? )
+            // InternalRoom.g:7345:1: ( rule__StandardOperation__DocuAssignment_7 )?
             {
              before(grammarAccess.getStandardOperationAccess().getDocuAssignment_7()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7343:1: ( rule__StandardOperation__DocuAssignment_7 )?
+            // InternalRoom.g:7346:1: ( rule__StandardOperation__DocuAssignment_7 )?
             int alt81=2;
             int LA81_0 = input.LA(1);
 
@@ -21668,9 +21668,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt81) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7343:2: rule__StandardOperation__DocuAssignment_7
+                    // InternalRoom.g:7346:2: rule__StandardOperation__DocuAssignment_7
                     {
-                    pushFollow(FOLLOW_rule__StandardOperation__DocuAssignment_7_in_rule__StandardOperation__Group__7__Impl15491);
+                    pushFollow(FOLLOW_2);
                     rule__StandardOperation__DocuAssignment_7();
 
                     state._fsp--;
@@ -21704,16 +21704,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StandardOperation__Group__8"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7353:1: rule__StandardOperation__Group__8 : rule__StandardOperation__Group__8__Impl ;
+    // InternalRoom.g:7356:1: rule__StandardOperation__Group__8 : rule__StandardOperation__Group__8__Impl ;
     public final void rule__StandardOperation__Group__8() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7357:1: ( rule__StandardOperation__Group__8__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7358:2: rule__StandardOperation__Group__8__Impl
+            // InternalRoom.g:7360:1: ( rule__StandardOperation__Group__8__Impl )
+            // InternalRoom.g:7361:2: rule__StandardOperation__Group__8__Impl
             {
-            pushFollow(FOLLOW_rule__StandardOperation__Group__8__Impl_in_rule__StandardOperation__Group__815522);
+            pushFollow(FOLLOW_2);
             rule__StandardOperation__Group__8__Impl();
 
             state._fsp--;
@@ -21737,23 +21737,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StandardOperation__Group__8__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7364:1: rule__StandardOperation__Group__8__Impl : ( ( rule__StandardOperation__DetailCodeAssignment_8 ) ) ;
+    // InternalRoom.g:7367:1: rule__StandardOperation__Group__8__Impl : ( ( rule__StandardOperation__DetailCodeAssignment_8 ) ) ;
     public final void rule__StandardOperation__Group__8__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7368:1: ( ( ( rule__StandardOperation__DetailCodeAssignment_8 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7369:1: ( ( rule__StandardOperation__DetailCodeAssignment_8 ) )
+            // InternalRoom.g:7371:1: ( ( ( rule__StandardOperation__DetailCodeAssignment_8 ) ) )
+            // InternalRoom.g:7372:1: ( ( rule__StandardOperation__DetailCodeAssignment_8 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7369:1: ( ( rule__StandardOperation__DetailCodeAssignment_8 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7370:1: ( rule__StandardOperation__DetailCodeAssignment_8 )
+            // InternalRoom.g:7372:1: ( ( rule__StandardOperation__DetailCodeAssignment_8 ) )
+            // InternalRoom.g:7373:1: ( rule__StandardOperation__DetailCodeAssignment_8 )
             {
              before(grammarAccess.getStandardOperationAccess().getDetailCodeAssignment_8()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7371:1: ( rule__StandardOperation__DetailCodeAssignment_8 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7371:2: rule__StandardOperation__DetailCodeAssignment_8
+            // InternalRoom.g:7374:1: ( rule__StandardOperation__DetailCodeAssignment_8 )
+            // InternalRoom.g:7374:2: rule__StandardOperation__DetailCodeAssignment_8
             {
-            pushFollow(FOLLOW_rule__StandardOperation__DetailCodeAssignment_8_in_rule__StandardOperation__Group__8__Impl15549);
+            pushFollow(FOLLOW_2);
             rule__StandardOperation__DetailCodeAssignment_8();
 
             state._fsp--;
@@ -21784,21 +21784,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StandardOperation__Group_4__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7399:1: rule__StandardOperation__Group_4__0 : rule__StandardOperation__Group_4__0__Impl rule__StandardOperation__Group_4__1 ;
+    // InternalRoom.g:7402:1: rule__StandardOperation__Group_4__0 : rule__StandardOperation__Group_4__0__Impl rule__StandardOperation__Group_4__1 ;
     public final void rule__StandardOperation__Group_4__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7403:1: ( rule__StandardOperation__Group_4__0__Impl rule__StandardOperation__Group_4__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7404:2: rule__StandardOperation__Group_4__0__Impl rule__StandardOperation__Group_4__1
+            // InternalRoom.g:7406:1: ( rule__StandardOperation__Group_4__0__Impl rule__StandardOperation__Group_4__1 )
+            // InternalRoom.g:7407:2: rule__StandardOperation__Group_4__0__Impl rule__StandardOperation__Group_4__1
             {
-            pushFollow(FOLLOW_rule__StandardOperation__Group_4__0__Impl_in_rule__StandardOperation__Group_4__015597);
+            pushFollow(FOLLOW_18);
             rule__StandardOperation__Group_4__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__StandardOperation__Group_4__1_in_rule__StandardOperation__Group_4__015600);
+            pushFollow(FOLLOW_2);
             rule__StandardOperation__Group_4__1();
 
             state._fsp--;
@@ -21822,23 +21822,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StandardOperation__Group_4__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7411:1: rule__StandardOperation__Group_4__0__Impl : ( ( rule__StandardOperation__ArgumentsAssignment_4_0 ) ) ;
+    // InternalRoom.g:7414:1: rule__StandardOperation__Group_4__0__Impl : ( ( rule__StandardOperation__ArgumentsAssignment_4_0 ) ) ;
     public final void rule__StandardOperation__Group_4__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7415:1: ( ( ( rule__StandardOperation__ArgumentsAssignment_4_0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7416:1: ( ( rule__StandardOperation__ArgumentsAssignment_4_0 ) )
+            // InternalRoom.g:7418:1: ( ( ( rule__StandardOperation__ArgumentsAssignment_4_0 ) ) )
+            // InternalRoom.g:7419:1: ( ( rule__StandardOperation__ArgumentsAssignment_4_0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7416:1: ( ( rule__StandardOperation__ArgumentsAssignment_4_0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7417:1: ( rule__StandardOperation__ArgumentsAssignment_4_0 )
+            // InternalRoom.g:7419:1: ( ( rule__StandardOperation__ArgumentsAssignment_4_0 ) )
+            // InternalRoom.g:7420:1: ( rule__StandardOperation__ArgumentsAssignment_4_0 )
             {
              before(grammarAccess.getStandardOperationAccess().getArgumentsAssignment_4_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7418:1: ( rule__StandardOperation__ArgumentsAssignment_4_0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7418:2: rule__StandardOperation__ArgumentsAssignment_4_0
+            // InternalRoom.g:7421:1: ( rule__StandardOperation__ArgumentsAssignment_4_0 )
+            // InternalRoom.g:7421:2: rule__StandardOperation__ArgumentsAssignment_4_0
             {
-            pushFollow(FOLLOW_rule__StandardOperation__ArgumentsAssignment_4_0_in_rule__StandardOperation__Group_4__0__Impl15627);
+            pushFollow(FOLLOW_2);
             rule__StandardOperation__ArgumentsAssignment_4_0();
 
             state._fsp--;
@@ -21869,16 +21869,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StandardOperation__Group_4__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7428:1: rule__StandardOperation__Group_4__1 : rule__StandardOperation__Group_4__1__Impl ;
+    // InternalRoom.g:7431:1: rule__StandardOperation__Group_4__1 : rule__StandardOperation__Group_4__1__Impl ;
     public final void rule__StandardOperation__Group_4__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7432:1: ( rule__StandardOperation__Group_4__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7433:2: rule__StandardOperation__Group_4__1__Impl
+            // InternalRoom.g:7435:1: ( rule__StandardOperation__Group_4__1__Impl )
+            // InternalRoom.g:7436:2: rule__StandardOperation__Group_4__1__Impl
             {
-            pushFollow(FOLLOW_rule__StandardOperation__Group_4__1__Impl_in_rule__StandardOperation__Group_4__115657);
+            pushFollow(FOLLOW_2);
             rule__StandardOperation__Group_4__1__Impl();
 
             state._fsp--;
@@ -21902,20 +21902,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StandardOperation__Group_4__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7439:1: rule__StandardOperation__Group_4__1__Impl : ( ( rule__StandardOperation__Group_4_1__0 )* ) ;
+    // InternalRoom.g:7442:1: rule__StandardOperation__Group_4__1__Impl : ( ( rule__StandardOperation__Group_4_1__0 )* ) ;
     public final void rule__StandardOperation__Group_4__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7443:1: ( ( ( rule__StandardOperation__Group_4_1__0 )* ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7444:1: ( ( rule__StandardOperation__Group_4_1__0 )* )
+            // InternalRoom.g:7446:1: ( ( ( rule__StandardOperation__Group_4_1__0 )* ) )
+            // InternalRoom.g:7447:1: ( ( rule__StandardOperation__Group_4_1__0 )* )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7444:1: ( ( rule__StandardOperation__Group_4_1__0 )* )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7445:1: ( rule__StandardOperation__Group_4_1__0 )*
+            // InternalRoom.g:7447:1: ( ( rule__StandardOperation__Group_4_1__0 )* )
+            // InternalRoom.g:7448:1: ( rule__StandardOperation__Group_4_1__0 )*
             {
              before(grammarAccess.getStandardOperationAccess().getGroup_4_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7446:1: ( rule__StandardOperation__Group_4_1__0 )*
+            // InternalRoom.g:7449:1: ( rule__StandardOperation__Group_4_1__0 )*
             loop82:
             do {
                 int alt82=2;
@@ -21928,9 +21928,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
                 switch (alt82) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7446:2: rule__StandardOperation__Group_4_1__0
+            	    // InternalRoom.g:7449:2: rule__StandardOperation__Group_4_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__StandardOperation__Group_4_1__0_in_rule__StandardOperation__Group_4__1__Impl15684);
+            	    pushFollow(FOLLOW_19);
             	    rule__StandardOperation__Group_4_1__0();
 
             	    state._fsp--;
@@ -21967,21 +21967,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StandardOperation__Group_4_1__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7460:1: rule__StandardOperation__Group_4_1__0 : rule__StandardOperation__Group_4_1__0__Impl rule__StandardOperation__Group_4_1__1 ;
+    // InternalRoom.g:7463:1: rule__StandardOperation__Group_4_1__0 : rule__StandardOperation__Group_4_1__0__Impl rule__StandardOperation__Group_4_1__1 ;
     public final void rule__StandardOperation__Group_4_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7464:1: ( rule__StandardOperation__Group_4_1__0__Impl rule__StandardOperation__Group_4_1__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7465:2: rule__StandardOperation__Group_4_1__0__Impl rule__StandardOperation__Group_4_1__1
+            // InternalRoom.g:7467:1: ( rule__StandardOperation__Group_4_1__0__Impl rule__StandardOperation__Group_4_1__1 )
+            // InternalRoom.g:7468:2: rule__StandardOperation__Group_4_1__0__Impl rule__StandardOperation__Group_4_1__1
             {
-            pushFollow(FOLLOW_rule__StandardOperation__Group_4_1__0__Impl_in_rule__StandardOperation__Group_4_1__015719);
+            pushFollow(FOLLOW_3);
             rule__StandardOperation__Group_4_1__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__StandardOperation__Group_4_1__1_in_rule__StandardOperation__Group_4_1__015722);
+            pushFollow(FOLLOW_2);
             rule__StandardOperation__Group_4_1__1();
 
             state._fsp--;
@@ -22005,20 +22005,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StandardOperation__Group_4_1__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7472:1: rule__StandardOperation__Group_4_1__0__Impl : ( ',' ) ;
+    // InternalRoom.g:7475:1: rule__StandardOperation__Group_4_1__0__Impl : ( ',' ) ;
     public final void rule__StandardOperation__Group_4_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7476:1: ( ( ',' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7477:1: ( ',' )
+            // InternalRoom.g:7479:1: ( ( ',' ) )
+            // InternalRoom.g:7480:1: ( ',' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7477:1: ( ',' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7478:1: ','
+            // InternalRoom.g:7480:1: ( ',' )
+            // InternalRoom.g:7481:1: ','
             {
              before(grammarAccess.getStandardOperationAccess().getCommaKeyword_4_1_0()); 
-            match(input,51,FOLLOW_51_in_rule__StandardOperation__Group_4_1__0__Impl15750); 
+            match(input,51,FOLLOW_2); 
              after(grammarAccess.getStandardOperationAccess().getCommaKeyword_4_1_0()); 
 
             }
@@ -22042,16 +22042,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StandardOperation__Group_4_1__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7491:1: rule__StandardOperation__Group_4_1__1 : rule__StandardOperation__Group_4_1__1__Impl ;
+    // InternalRoom.g:7494:1: rule__StandardOperation__Group_4_1__1 : rule__StandardOperation__Group_4_1__1__Impl ;
     public final void rule__StandardOperation__Group_4_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7495:1: ( rule__StandardOperation__Group_4_1__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7496:2: rule__StandardOperation__Group_4_1__1__Impl
+            // InternalRoom.g:7498:1: ( rule__StandardOperation__Group_4_1__1__Impl )
+            // InternalRoom.g:7499:2: rule__StandardOperation__Group_4_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__StandardOperation__Group_4_1__1__Impl_in_rule__StandardOperation__Group_4_1__115781);
+            pushFollow(FOLLOW_2);
             rule__StandardOperation__Group_4_1__1__Impl();
 
             state._fsp--;
@@ -22075,23 +22075,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StandardOperation__Group_4_1__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7502:1: rule__StandardOperation__Group_4_1__1__Impl : ( ( rule__StandardOperation__ArgumentsAssignment_4_1_1 ) ) ;
+    // InternalRoom.g:7505:1: rule__StandardOperation__Group_4_1__1__Impl : ( ( rule__StandardOperation__ArgumentsAssignment_4_1_1 ) ) ;
     public final void rule__StandardOperation__Group_4_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7506:1: ( ( ( rule__StandardOperation__ArgumentsAssignment_4_1_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7507:1: ( ( rule__StandardOperation__ArgumentsAssignment_4_1_1 ) )
+            // InternalRoom.g:7509:1: ( ( ( rule__StandardOperation__ArgumentsAssignment_4_1_1 ) ) )
+            // InternalRoom.g:7510:1: ( ( rule__StandardOperation__ArgumentsAssignment_4_1_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7507:1: ( ( rule__StandardOperation__ArgumentsAssignment_4_1_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7508:1: ( rule__StandardOperation__ArgumentsAssignment_4_1_1 )
+            // InternalRoom.g:7510:1: ( ( rule__StandardOperation__ArgumentsAssignment_4_1_1 ) )
+            // InternalRoom.g:7511:1: ( rule__StandardOperation__ArgumentsAssignment_4_1_1 )
             {
              before(grammarAccess.getStandardOperationAccess().getArgumentsAssignment_4_1_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7509:1: ( rule__StandardOperation__ArgumentsAssignment_4_1_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7509:2: rule__StandardOperation__ArgumentsAssignment_4_1_1
+            // InternalRoom.g:7512:1: ( rule__StandardOperation__ArgumentsAssignment_4_1_1 )
+            // InternalRoom.g:7512:2: rule__StandardOperation__ArgumentsAssignment_4_1_1
             {
-            pushFollow(FOLLOW_rule__StandardOperation__ArgumentsAssignment_4_1_1_in_rule__StandardOperation__Group_4_1__1__Impl15808);
+            pushFollow(FOLLOW_2);
             rule__StandardOperation__ArgumentsAssignment_4_1_1();
 
             state._fsp--;
@@ -22122,21 +22122,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StandardOperation__Group_6__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7523:1: rule__StandardOperation__Group_6__0 : rule__StandardOperation__Group_6__0__Impl rule__StandardOperation__Group_6__1 ;
+    // InternalRoom.g:7526:1: rule__StandardOperation__Group_6__0 : rule__StandardOperation__Group_6__0__Impl rule__StandardOperation__Group_6__1 ;
     public final void rule__StandardOperation__Group_6__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7527:1: ( rule__StandardOperation__Group_6__0__Impl rule__StandardOperation__Group_6__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7528:2: rule__StandardOperation__Group_6__0__Impl rule__StandardOperation__Group_6__1
+            // InternalRoom.g:7530:1: ( rule__StandardOperation__Group_6__0__Impl rule__StandardOperation__Group_6__1 )
+            // InternalRoom.g:7531:2: rule__StandardOperation__Group_6__0__Impl rule__StandardOperation__Group_6__1
             {
-            pushFollow(FOLLOW_rule__StandardOperation__Group_6__0__Impl_in_rule__StandardOperation__Group_6__015842);
+            pushFollow(FOLLOW_36);
             rule__StandardOperation__Group_6__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__StandardOperation__Group_6__1_in_rule__StandardOperation__Group_6__015845);
+            pushFollow(FOLLOW_2);
             rule__StandardOperation__Group_6__1();
 
             state._fsp--;
@@ -22160,20 +22160,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StandardOperation__Group_6__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7535:1: rule__StandardOperation__Group_6__0__Impl : ( ':' ) ;
+    // InternalRoom.g:7538:1: rule__StandardOperation__Group_6__0__Impl : ( ':' ) ;
     public final void rule__StandardOperation__Group_6__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7539:1: ( ( ':' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7540:1: ( ':' )
+            // InternalRoom.g:7542:1: ( ( ':' ) )
+            // InternalRoom.g:7543:1: ( ':' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7540:1: ( ':' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7541:1: ':'
+            // InternalRoom.g:7543:1: ( ':' )
+            // InternalRoom.g:7544:1: ':'
             {
              before(grammarAccess.getStandardOperationAccess().getColonKeyword_6_0()); 
-            match(input,43,FOLLOW_43_in_rule__StandardOperation__Group_6__0__Impl15873); 
+            match(input,43,FOLLOW_2); 
              after(grammarAccess.getStandardOperationAccess().getColonKeyword_6_0()); 
 
             }
@@ -22197,16 +22197,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StandardOperation__Group_6__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7554:1: rule__StandardOperation__Group_6__1 : rule__StandardOperation__Group_6__1__Impl ;
+    // InternalRoom.g:7557:1: rule__StandardOperation__Group_6__1 : rule__StandardOperation__Group_6__1__Impl ;
     public final void rule__StandardOperation__Group_6__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7558:1: ( rule__StandardOperation__Group_6__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7559:2: rule__StandardOperation__Group_6__1__Impl
+            // InternalRoom.g:7561:1: ( rule__StandardOperation__Group_6__1__Impl )
+            // InternalRoom.g:7562:2: rule__StandardOperation__Group_6__1__Impl
             {
-            pushFollow(FOLLOW_rule__StandardOperation__Group_6__1__Impl_in_rule__StandardOperation__Group_6__115904);
+            pushFollow(FOLLOW_2);
             rule__StandardOperation__Group_6__1__Impl();
 
             state._fsp--;
@@ -22230,23 +22230,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StandardOperation__Group_6__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7565:1: rule__StandardOperation__Group_6__1__Impl : ( ( rule__StandardOperation__Alternatives_6_1 ) ) ;
+    // InternalRoom.g:7568:1: rule__StandardOperation__Group_6__1__Impl : ( ( rule__StandardOperation__Alternatives_6_1 ) ) ;
     public final void rule__StandardOperation__Group_6__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7569:1: ( ( ( rule__StandardOperation__Alternatives_6_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7570:1: ( ( rule__StandardOperation__Alternatives_6_1 ) )
+            // InternalRoom.g:7572:1: ( ( ( rule__StandardOperation__Alternatives_6_1 ) ) )
+            // InternalRoom.g:7573:1: ( ( rule__StandardOperation__Alternatives_6_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7570:1: ( ( rule__StandardOperation__Alternatives_6_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7571:1: ( rule__StandardOperation__Alternatives_6_1 )
+            // InternalRoom.g:7573:1: ( ( rule__StandardOperation__Alternatives_6_1 ) )
+            // InternalRoom.g:7574:1: ( rule__StandardOperation__Alternatives_6_1 )
             {
              before(grammarAccess.getStandardOperationAccess().getAlternatives_6_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7572:1: ( rule__StandardOperation__Alternatives_6_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7572:2: rule__StandardOperation__Alternatives_6_1
+            // InternalRoom.g:7575:1: ( rule__StandardOperation__Alternatives_6_1 )
+            // InternalRoom.g:7575:2: rule__StandardOperation__Alternatives_6_1
             {
-            pushFollow(FOLLOW_rule__StandardOperation__Alternatives_6_1_in_rule__StandardOperation__Group_6__1__Impl15931);
+            pushFollow(FOLLOW_2);
             rule__StandardOperation__Alternatives_6_1();
 
             state._fsp--;
@@ -22277,21 +22277,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortOperation__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7586:1: rule__PortOperation__Group__0 : rule__PortOperation__Group__0__Impl rule__PortOperation__Group__1 ;
+    // InternalRoom.g:7589:1: rule__PortOperation__Group__0 : rule__PortOperation__Group__0__Impl rule__PortOperation__Group__1 ;
     public final void rule__PortOperation__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7590:1: ( rule__PortOperation__Group__0__Impl rule__PortOperation__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7591:2: rule__PortOperation__Group__0__Impl rule__PortOperation__Group__1
+            // InternalRoom.g:7593:1: ( rule__PortOperation__Group__0__Impl rule__PortOperation__Group__1 )
+            // InternalRoom.g:7594:2: rule__PortOperation__Group__0__Impl rule__PortOperation__Group__1
             {
-            pushFollow(FOLLOW_rule__PortOperation__Group__0__Impl_in_rule__PortOperation__Group__015965);
+            pushFollow(FOLLOW_3);
             rule__PortOperation__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__PortOperation__Group__1_in_rule__PortOperation__Group__015968);
+            pushFollow(FOLLOW_2);
             rule__PortOperation__Group__1();
 
             state._fsp--;
@@ -22315,20 +22315,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortOperation__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7598:1: rule__PortOperation__Group__0__Impl : ( 'Operation' ) ;
+    // InternalRoom.g:7601:1: rule__PortOperation__Group__0__Impl : ( 'Operation' ) ;
     public final void rule__PortOperation__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7602:1: ( ( 'Operation' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7603:1: ( 'Operation' )
+            // InternalRoom.g:7605:1: ( ( 'Operation' ) )
+            // InternalRoom.g:7606:1: ( 'Operation' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7603:1: ( 'Operation' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7604:1: 'Operation'
+            // InternalRoom.g:7606:1: ( 'Operation' )
+            // InternalRoom.g:7607:1: 'Operation'
             {
              before(grammarAccess.getPortOperationAccess().getOperationKeyword_0()); 
-            match(input,61,FOLLOW_61_in_rule__PortOperation__Group__0__Impl15996); 
+            match(input,61,FOLLOW_2); 
              after(grammarAccess.getPortOperationAccess().getOperationKeyword_0()); 
 
             }
@@ -22352,21 +22352,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortOperation__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7617:1: rule__PortOperation__Group__1 : rule__PortOperation__Group__1__Impl rule__PortOperation__Group__2 ;
+    // InternalRoom.g:7620:1: rule__PortOperation__Group__1 : rule__PortOperation__Group__1__Impl rule__PortOperation__Group__2 ;
     public final void rule__PortOperation__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7621:1: ( rule__PortOperation__Group__1__Impl rule__PortOperation__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7622:2: rule__PortOperation__Group__1__Impl rule__PortOperation__Group__2
+            // InternalRoom.g:7624:1: ( rule__PortOperation__Group__1__Impl rule__PortOperation__Group__2 )
+            // InternalRoom.g:7625:2: rule__PortOperation__Group__1__Impl rule__PortOperation__Group__2
             {
-            pushFollow(FOLLOW_rule__PortOperation__Group__1__Impl_in_rule__PortOperation__Group__116027);
+            pushFollow(FOLLOW_33);
             rule__PortOperation__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__PortOperation__Group__2_in_rule__PortOperation__Group__116030);
+            pushFollow(FOLLOW_2);
             rule__PortOperation__Group__2();
 
             state._fsp--;
@@ -22390,23 +22390,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortOperation__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7629:1: rule__PortOperation__Group__1__Impl : ( ( rule__PortOperation__NameAssignment_1 ) ) ;
+    // InternalRoom.g:7632:1: rule__PortOperation__Group__1__Impl : ( ( rule__PortOperation__NameAssignment_1 ) ) ;
     public final void rule__PortOperation__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7633:1: ( ( ( rule__PortOperation__NameAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7634:1: ( ( rule__PortOperation__NameAssignment_1 ) )
+            // InternalRoom.g:7636:1: ( ( ( rule__PortOperation__NameAssignment_1 ) ) )
+            // InternalRoom.g:7637:1: ( ( rule__PortOperation__NameAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7634:1: ( ( rule__PortOperation__NameAssignment_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7635:1: ( rule__PortOperation__NameAssignment_1 )
+            // InternalRoom.g:7637:1: ( ( rule__PortOperation__NameAssignment_1 ) )
+            // InternalRoom.g:7638:1: ( rule__PortOperation__NameAssignment_1 )
             {
              before(grammarAccess.getPortOperationAccess().getNameAssignment_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7636:1: ( rule__PortOperation__NameAssignment_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7636:2: rule__PortOperation__NameAssignment_1
+            // InternalRoom.g:7639:1: ( rule__PortOperation__NameAssignment_1 )
+            // InternalRoom.g:7639:2: rule__PortOperation__NameAssignment_1
             {
-            pushFollow(FOLLOW_rule__PortOperation__NameAssignment_1_in_rule__PortOperation__Group__1__Impl16057);
+            pushFollow(FOLLOW_2);
             rule__PortOperation__NameAssignment_1();
 
             state._fsp--;
@@ -22437,21 +22437,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortOperation__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7646:1: rule__PortOperation__Group__2 : rule__PortOperation__Group__2__Impl rule__PortOperation__Group__3 ;
+    // InternalRoom.g:7649:1: rule__PortOperation__Group__2 : rule__PortOperation__Group__2__Impl rule__PortOperation__Group__3 ;
     public final void rule__PortOperation__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7650:1: ( rule__PortOperation__Group__2__Impl rule__PortOperation__Group__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7651:2: rule__PortOperation__Group__2__Impl rule__PortOperation__Group__3
+            // InternalRoom.g:7653:1: ( rule__PortOperation__Group__2__Impl rule__PortOperation__Group__3 )
+            // InternalRoom.g:7654:2: rule__PortOperation__Group__2__Impl rule__PortOperation__Group__3
             {
-            pushFollow(FOLLOW_rule__PortOperation__Group__2__Impl_in_rule__PortOperation__Group__216087);
+            pushFollow(FOLLOW_34);
             rule__PortOperation__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__PortOperation__Group__3_in_rule__PortOperation__Group__216090);
+            pushFollow(FOLLOW_2);
             rule__PortOperation__Group__3();
 
             state._fsp--;
@@ -22475,20 +22475,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortOperation__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7658:1: rule__PortOperation__Group__2__Impl : ( '(' ) ;
+    // InternalRoom.g:7661:1: rule__PortOperation__Group__2__Impl : ( '(' ) ;
     public final void rule__PortOperation__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7662:1: ( ( '(' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7663:1: ( '(' )
+            // InternalRoom.g:7665:1: ( ( '(' ) )
+            // InternalRoom.g:7666:1: ( '(' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7663:1: ( '(' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7664:1: '('
+            // InternalRoom.g:7666:1: ( '(' )
+            // InternalRoom.g:7667:1: '('
             {
              before(grammarAccess.getPortOperationAccess().getLeftParenthesisKeyword_2()); 
-            match(input,47,FOLLOW_47_in_rule__PortOperation__Group__2__Impl16118); 
+            match(input,47,FOLLOW_2); 
              after(grammarAccess.getPortOperationAccess().getLeftParenthesisKeyword_2()); 
 
             }
@@ -22512,21 +22512,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortOperation__Group__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7677:1: rule__PortOperation__Group__3 : rule__PortOperation__Group__3__Impl rule__PortOperation__Group__4 ;
+    // InternalRoom.g:7680:1: rule__PortOperation__Group__3 : rule__PortOperation__Group__3__Impl rule__PortOperation__Group__4 ;
     public final void rule__PortOperation__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7681:1: ( rule__PortOperation__Group__3__Impl rule__PortOperation__Group__4 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7682:2: rule__PortOperation__Group__3__Impl rule__PortOperation__Group__4
+            // InternalRoom.g:7684:1: ( rule__PortOperation__Group__3__Impl rule__PortOperation__Group__4 )
+            // InternalRoom.g:7685:2: rule__PortOperation__Group__3__Impl rule__PortOperation__Group__4
             {
-            pushFollow(FOLLOW_rule__PortOperation__Group__3__Impl_in_rule__PortOperation__Group__316149);
+            pushFollow(FOLLOW_34);
             rule__PortOperation__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__PortOperation__Group__4_in_rule__PortOperation__Group__316152);
+            pushFollow(FOLLOW_2);
             rule__PortOperation__Group__4();
 
             state._fsp--;
@@ -22550,20 +22550,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortOperation__Group__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7689:1: rule__PortOperation__Group__3__Impl : ( ( rule__PortOperation__Group_3__0 )? ) ;
+    // InternalRoom.g:7692:1: rule__PortOperation__Group__3__Impl : ( ( rule__PortOperation__Group_3__0 )? ) ;
     public final void rule__PortOperation__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7693:1: ( ( ( rule__PortOperation__Group_3__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7694:1: ( ( rule__PortOperation__Group_3__0 )? )
+            // InternalRoom.g:7696:1: ( ( ( rule__PortOperation__Group_3__0 )? ) )
+            // InternalRoom.g:7697:1: ( ( rule__PortOperation__Group_3__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7694:1: ( ( rule__PortOperation__Group_3__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7695:1: ( rule__PortOperation__Group_3__0 )?
+            // InternalRoom.g:7697:1: ( ( rule__PortOperation__Group_3__0 )? )
+            // InternalRoom.g:7698:1: ( rule__PortOperation__Group_3__0 )?
             {
              before(grammarAccess.getPortOperationAccess().getGroup_3()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7696:1: ( rule__PortOperation__Group_3__0 )?
+            // InternalRoom.g:7699:1: ( rule__PortOperation__Group_3__0 )?
             int alt83=2;
             int LA83_0 = input.LA(1);
 
@@ -22572,9 +22572,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt83) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7696:2: rule__PortOperation__Group_3__0
+                    // InternalRoom.g:7699:2: rule__PortOperation__Group_3__0
                     {
-                    pushFollow(FOLLOW_rule__PortOperation__Group_3__0_in_rule__PortOperation__Group__3__Impl16179);
+                    pushFollow(FOLLOW_2);
                     rule__PortOperation__Group_3__0();
 
                     state._fsp--;
@@ -22608,21 +22608,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortOperation__Group__4"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7706:1: rule__PortOperation__Group__4 : rule__PortOperation__Group__4__Impl rule__PortOperation__Group__5 ;
+    // InternalRoom.g:7709:1: rule__PortOperation__Group__4 : rule__PortOperation__Group__4__Impl rule__PortOperation__Group__5 ;
     public final void rule__PortOperation__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7710:1: ( rule__PortOperation__Group__4__Impl rule__PortOperation__Group__5 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7711:2: rule__PortOperation__Group__4__Impl rule__PortOperation__Group__5
+            // InternalRoom.g:7713:1: ( rule__PortOperation__Group__4__Impl rule__PortOperation__Group__5 )
+            // InternalRoom.g:7714:2: rule__PortOperation__Group__4__Impl rule__PortOperation__Group__5
             {
-            pushFollow(FOLLOW_rule__PortOperation__Group__4__Impl_in_rule__PortOperation__Group__416210);
+            pushFollow(FOLLOW_37);
             rule__PortOperation__Group__4__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__PortOperation__Group__5_in_rule__PortOperation__Group__416213);
+            pushFollow(FOLLOW_2);
             rule__PortOperation__Group__5();
 
             state._fsp--;
@@ -22646,20 +22646,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortOperation__Group__4__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7718:1: rule__PortOperation__Group__4__Impl : ( ')' ) ;
+    // InternalRoom.g:7721:1: rule__PortOperation__Group__4__Impl : ( ')' ) ;
     public final void rule__PortOperation__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7722:1: ( ( ')' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7723:1: ( ')' )
+            // InternalRoom.g:7725:1: ( ( ')' ) )
+            // InternalRoom.g:7726:1: ( ')' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7723:1: ( ')' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7724:1: ')'
+            // InternalRoom.g:7726:1: ( ')' )
+            // InternalRoom.g:7727:1: ')'
             {
              before(grammarAccess.getPortOperationAccess().getRightParenthesisKeyword_4()); 
-            match(input,48,FOLLOW_48_in_rule__PortOperation__Group__4__Impl16241); 
+            match(input,48,FOLLOW_2); 
              after(grammarAccess.getPortOperationAccess().getRightParenthesisKeyword_4()); 
 
             }
@@ -22683,21 +22683,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortOperation__Group__5"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7737:1: rule__PortOperation__Group__5 : rule__PortOperation__Group__5__Impl rule__PortOperation__Group__6 ;
+    // InternalRoom.g:7740:1: rule__PortOperation__Group__5 : rule__PortOperation__Group__5__Impl rule__PortOperation__Group__6 ;
     public final void rule__PortOperation__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7741:1: ( rule__PortOperation__Group__5__Impl rule__PortOperation__Group__6 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7742:2: rule__PortOperation__Group__5__Impl rule__PortOperation__Group__6
+            // InternalRoom.g:7744:1: ( rule__PortOperation__Group__5__Impl rule__PortOperation__Group__6 )
+            // InternalRoom.g:7745:2: rule__PortOperation__Group__5__Impl rule__PortOperation__Group__6
             {
-            pushFollow(FOLLOW_rule__PortOperation__Group__5__Impl_in_rule__PortOperation__Group__516272);
+            pushFollow(FOLLOW_37);
             rule__PortOperation__Group__5__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__PortOperation__Group__6_in_rule__PortOperation__Group__516275);
+            pushFollow(FOLLOW_2);
             rule__PortOperation__Group__6();
 
             state._fsp--;
@@ -22721,20 +22721,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortOperation__Group__5__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7749:1: rule__PortOperation__Group__5__Impl : ( ( rule__PortOperation__Alternatives_5 )? ) ;
+    // InternalRoom.g:7752:1: rule__PortOperation__Group__5__Impl : ( ( rule__PortOperation__Alternatives_5 )? ) ;
     public final void rule__PortOperation__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7753:1: ( ( ( rule__PortOperation__Alternatives_5 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7754:1: ( ( rule__PortOperation__Alternatives_5 )? )
+            // InternalRoom.g:7756:1: ( ( ( rule__PortOperation__Alternatives_5 )? ) )
+            // InternalRoom.g:7757:1: ( ( rule__PortOperation__Alternatives_5 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7754:1: ( ( rule__PortOperation__Alternatives_5 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7755:1: ( rule__PortOperation__Alternatives_5 )?
+            // InternalRoom.g:7757:1: ( ( rule__PortOperation__Alternatives_5 )? )
+            // InternalRoom.g:7758:1: ( rule__PortOperation__Alternatives_5 )?
             {
              before(grammarAccess.getPortOperationAccess().getAlternatives_5()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7756:1: ( rule__PortOperation__Alternatives_5 )?
+            // InternalRoom.g:7759:1: ( rule__PortOperation__Alternatives_5 )?
             int alt84=2;
             int LA84_0 = input.LA(1);
 
@@ -22743,9 +22743,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt84) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7756:2: rule__PortOperation__Alternatives_5
+                    // InternalRoom.g:7759:2: rule__PortOperation__Alternatives_5
                     {
-                    pushFollow(FOLLOW_rule__PortOperation__Alternatives_5_in_rule__PortOperation__Group__5__Impl16302);
+                    pushFollow(FOLLOW_2);
                     rule__PortOperation__Alternatives_5();
 
                     state._fsp--;
@@ -22779,21 +22779,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortOperation__Group__6"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7766:1: rule__PortOperation__Group__6 : rule__PortOperation__Group__6__Impl rule__PortOperation__Group__7 ;
+    // InternalRoom.g:7769:1: rule__PortOperation__Group__6 : rule__PortOperation__Group__6__Impl rule__PortOperation__Group__7 ;
     public final void rule__PortOperation__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7770:1: ( rule__PortOperation__Group__6__Impl rule__PortOperation__Group__7 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7771:2: rule__PortOperation__Group__6__Impl rule__PortOperation__Group__7
+            // InternalRoom.g:7773:1: ( rule__PortOperation__Group__6__Impl rule__PortOperation__Group__7 )
+            // InternalRoom.g:7774:2: rule__PortOperation__Group__6__Impl rule__PortOperation__Group__7
             {
-            pushFollow(FOLLOW_rule__PortOperation__Group__6__Impl_in_rule__PortOperation__Group__616333);
+            pushFollow(FOLLOW_37);
             rule__PortOperation__Group__6__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__PortOperation__Group__7_in_rule__PortOperation__Group__616336);
+            pushFollow(FOLLOW_2);
             rule__PortOperation__Group__7();
 
             state._fsp--;
@@ -22817,20 +22817,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortOperation__Group__6__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7778:1: rule__PortOperation__Group__6__Impl : ( ( rule__PortOperation__DocuAssignment_6 )? ) ;
+    // InternalRoom.g:7781:1: rule__PortOperation__Group__6__Impl : ( ( rule__PortOperation__DocuAssignment_6 )? ) ;
     public final void rule__PortOperation__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7782:1: ( ( ( rule__PortOperation__DocuAssignment_6 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7783:1: ( ( rule__PortOperation__DocuAssignment_6 )? )
+            // InternalRoom.g:7785:1: ( ( ( rule__PortOperation__DocuAssignment_6 )? ) )
+            // InternalRoom.g:7786:1: ( ( rule__PortOperation__DocuAssignment_6 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7783:1: ( ( rule__PortOperation__DocuAssignment_6 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7784:1: ( rule__PortOperation__DocuAssignment_6 )?
+            // InternalRoom.g:7786:1: ( ( rule__PortOperation__DocuAssignment_6 )? )
+            // InternalRoom.g:7787:1: ( rule__PortOperation__DocuAssignment_6 )?
             {
              before(grammarAccess.getPortOperationAccess().getDocuAssignment_6()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7785:1: ( rule__PortOperation__DocuAssignment_6 )?
+            // InternalRoom.g:7788:1: ( rule__PortOperation__DocuAssignment_6 )?
             int alt85=2;
             int LA85_0 = input.LA(1);
 
@@ -22839,9 +22839,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt85) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7785:2: rule__PortOperation__DocuAssignment_6
+                    // InternalRoom.g:7788:2: rule__PortOperation__DocuAssignment_6
                     {
-                    pushFollow(FOLLOW_rule__PortOperation__DocuAssignment_6_in_rule__PortOperation__Group__6__Impl16363);
+                    pushFollow(FOLLOW_2);
                     rule__PortOperation__DocuAssignment_6();
 
                     state._fsp--;
@@ -22875,16 +22875,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortOperation__Group__7"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7795:1: rule__PortOperation__Group__7 : rule__PortOperation__Group__7__Impl ;
+    // InternalRoom.g:7798:1: rule__PortOperation__Group__7 : rule__PortOperation__Group__7__Impl ;
     public final void rule__PortOperation__Group__7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7799:1: ( rule__PortOperation__Group__7__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7800:2: rule__PortOperation__Group__7__Impl
+            // InternalRoom.g:7802:1: ( rule__PortOperation__Group__7__Impl )
+            // InternalRoom.g:7803:2: rule__PortOperation__Group__7__Impl
             {
-            pushFollow(FOLLOW_rule__PortOperation__Group__7__Impl_in_rule__PortOperation__Group__716394);
+            pushFollow(FOLLOW_2);
             rule__PortOperation__Group__7__Impl();
 
             state._fsp--;
@@ -22908,23 +22908,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortOperation__Group__7__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7806:1: rule__PortOperation__Group__7__Impl : ( ( rule__PortOperation__DetailCodeAssignment_7 ) ) ;
+    // InternalRoom.g:7809:1: rule__PortOperation__Group__7__Impl : ( ( rule__PortOperation__DetailCodeAssignment_7 ) ) ;
     public final void rule__PortOperation__Group__7__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7810:1: ( ( ( rule__PortOperation__DetailCodeAssignment_7 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7811:1: ( ( rule__PortOperation__DetailCodeAssignment_7 ) )
+            // InternalRoom.g:7813:1: ( ( ( rule__PortOperation__DetailCodeAssignment_7 ) ) )
+            // InternalRoom.g:7814:1: ( ( rule__PortOperation__DetailCodeAssignment_7 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7811:1: ( ( rule__PortOperation__DetailCodeAssignment_7 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7812:1: ( rule__PortOperation__DetailCodeAssignment_7 )
+            // InternalRoom.g:7814:1: ( ( rule__PortOperation__DetailCodeAssignment_7 ) )
+            // InternalRoom.g:7815:1: ( rule__PortOperation__DetailCodeAssignment_7 )
             {
              before(grammarAccess.getPortOperationAccess().getDetailCodeAssignment_7()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7813:1: ( rule__PortOperation__DetailCodeAssignment_7 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7813:2: rule__PortOperation__DetailCodeAssignment_7
+            // InternalRoom.g:7816:1: ( rule__PortOperation__DetailCodeAssignment_7 )
+            // InternalRoom.g:7816:2: rule__PortOperation__DetailCodeAssignment_7
             {
-            pushFollow(FOLLOW_rule__PortOperation__DetailCodeAssignment_7_in_rule__PortOperation__Group__7__Impl16421);
+            pushFollow(FOLLOW_2);
             rule__PortOperation__DetailCodeAssignment_7();
 
             state._fsp--;
@@ -22955,21 +22955,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortOperation__Group_3__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7839:1: rule__PortOperation__Group_3__0 : rule__PortOperation__Group_3__0__Impl rule__PortOperation__Group_3__1 ;
+    // InternalRoom.g:7842:1: rule__PortOperation__Group_3__0 : rule__PortOperation__Group_3__0__Impl rule__PortOperation__Group_3__1 ;
     public final void rule__PortOperation__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7843:1: ( rule__PortOperation__Group_3__0__Impl rule__PortOperation__Group_3__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7844:2: rule__PortOperation__Group_3__0__Impl rule__PortOperation__Group_3__1
+            // InternalRoom.g:7846:1: ( rule__PortOperation__Group_3__0__Impl rule__PortOperation__Group_3__1 )
+            // InternalRoom.g:7847:2: rule__PortOperation__Group_3__0__Impl rule__PortOperation__Group_3__1
             {
-            pushFollow(FOLLOW_rule__PortOperation__Group_3__0__Impl_in_rule__PortOperation__Group_3__016467);
+            pushFollow(FOLLOW_18);
             rule__PortOperation__Group_3__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__PortOperation__Group_3__1_in_rule__PortOperation__Group_3__016470);
+            pushFollow(FOLLOW_2);
             rule__PortOperation__Group_3__1();
 
             state._fsp--;
@@ -22993,23 +22993,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortOperation__Group_3__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7851:1: rule__PortOperation__Group_3__0__Impl : ( ( rule__PortOperation__ArgumentsAssignment_3_0 ) ) ;
+    // InternalRoom.g:7854:1: rule__PortOperation__Group_3__0__Impl : ( ( rule__PortOperation__ArgumentsAssignment_3_0 ) ) ;
     public final void rule__PortOperation__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7855:1: ( ( ( rule__PortOperation__ArgumentsAssignment_3_0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7856:1: ( ( rule__PortOperation__ArgumentsAssignment_3_0 ) )
+            // InternalRoom.g:7858:1: ( ( ( rule__PortOperation__ArgumentsAssignment_3_0 ) ) )
+            // InternalRoom.g:7859:1: ( ( rule__PortOperation__ArgumentsAssignment_3_0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7856:1: ( ( rule__PortOperation__ArgumentsAssignment_3_0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7857:1: ( rule__PortOperation__ArgumentsAssignment_3_0 )
+            // InternalRoom.g:7859:1: ( ( rule__PortOperation__ArgumentsAssignment_3_0 ) )
+            // InternalRoom.g:7860:1: ( rule__PortOperation__ArgumentsAssignment_3_0 )
             {
              before(grammarAccess.getPortOperationAccess().getArgumentsAssignment_3_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7858:1: ( rule__PortOperation__ArgumentsAssignment_3_0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7858:2: rule__PortOperation__ArgumentsAssignment_3_0
+            // InternalRoom.g:7861:1: ( rule__PortOperation__ArgumentsAssignment_3_0 )
+            // InternalRoom.g:7861:2: rule__PortOperation__ArgumentsAssignment_3_0
             {
-            pushFollow(FOLLOW_rule__PortOperation__ArgumentsAssignment_3_0_in_rule__PortOperation__Group_3__0__Impl16497);
+            pushFollow(FOLLOW_2);
             rule__PortOperation__ArgumentsAssignment_3_0();
 
             state._fsp--;
@@ -23040,16 +23040,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortOperation__Group_3__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7868:1: rule__PortOperation__Group_3__1 : rule__PortOperation__Group_3__1__Impl ;
+    // InternalRoom.g:7871:1: rule__PortOperation__Group_3__1 : rule__PortOperation__Group_3__1__Impl ;
     public final void rule__PortOperation__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7872:1: ( rule__PortOperation__Group_3__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7873:2: rule__PortOperation__Group_3__1__Impl
+            // InternalRoom.g:7875:1: ( rule__PortOperation__Group_3__1__Impl )
+            // InternalRoom.g:7876:2: rule__PortOperation__Group_3__1__Impl
             {
-            pushFollow(FOLLOW_rule__PortOperation__Group_3__1__Impl_in_rule__PortOperation__Group_3__116527);
+            pushFollow(FOLLOW_2);
             rule__PortOperation__Group_3__1__Impl();
 
             state._fsp--;
@@ -23073,20 +23073,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortOperation__Group_3__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7879:1: rule__PortOperation__Group_3__1__Impl : ( ( rule__PortOperation__Group_3_1__0 )* ) ;
+    // InternalRoom.g:7882:1: rule__PortOperation__Group_3__1__Impl : ( ( rule__PortOperation__Group_3_1__0 )* ) ;
     public final void rule__PortOperation__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7883:1: ( ( ( rule__PortOperation__Group_3_1__0 )* ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7884:1: ( ( rule__PortOperation__Group_3_1__0 )* )
+            // InternalRoom.g:7886:1: ( ( ( rule__PortOperation__Group_3_1__0 )* ) )
+            // InternalRoom.g:7887:1: ( ( rule__PortOperation__Group_3_1__0 )* )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7884:1: ( ( rule__PortOperation__Group_3_1__0 )* )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7885:1: ( rule__PortOperation__Group_3_1__0 )*
+            // InternalRoom.g:7887:1: ( ( rule__PortOperation__Group_3_1__0 )* )
+            // InternalRoom.g:7888:1: ( rule__PortOperation__Group_3_1__0 )*
             {
              before(grammarAccess.getPortOperationAccess().getGroup_3_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7886:1: ( rule__PortOperation__Group_3_1__0 )*
+            // InternalRoom.g:7889:1: ( rule__PortOperation__Group_3_1__0 )*
             loop86:
             do {
                 int alt86=2;
@@ -23099,9 +23099,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
                 switch (alt86) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7886:2: rule__PortOperation__Group_3_1__0
+            	    // InternalRoom.g:7889:2: rule__PortOperation__Group_3_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__PortOperation__Group_3_1__0_in_rule__PortOperation__Group_3__1__Impl16554);
+            	    pushFollow(FOLLOW_19);
             	    rule__PortOperation__Group_3_1__0();
 
             	    state._fsp--;
@@ -23138,21 +23138,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortOperation__Group_3_1__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7900:1: rule__PortOperation__Group_3_1__0 : rule__PortOperation__Group_3_1__0__Impl rule__PortOperation__Group_3_1__1 ;
+    // InternalRoom.g:7903:1: rule__PortOperation__Group_3_1__0 : rule__PortOperation__Group_3_1__0__Impl rule__PortOperation__Group_3_1__1 ;
     public final void rule__PortOperation__Group_3_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7904:1: ( rule__PortOperation__Group_3_1__0__Impl rule__PortOperation__Group_3_1__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7905:2: rule__PortOperation__Group_3_1__0__Impl rule__PortOperation__Group_3_1__1
+            // InternalRoom.g:7907:1: ( rule__PortOperation__Group_3_1__0__Impl rule__PortOperation__Group_3_1__1 )
+            // InternalRoom.g:7908:2: rule__PortOperation__Group_3_1__0__Impl rule__PortOperation__Group_3_1__1
             {
-            pushFollow(FOLLOW_rule__PortOperation__Group_3_1__0__Impl_in_rule__PortOperation__Group_3_1__016589);
+            pushFollow(FOLLOW_3);
             rule__PortOperation__Group_3_1__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__PortOperation__Group_3_1__1_in_rule__PortOperation__Group_3_1__016592);
+            pushFollow(FOLLOW_2);
             rule__PortOperation__Group_3_1__1();
 
             state._fsp--;
@@ -23176,20 +23176,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortOperation__Group_3_1__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7912:1: rule__PortOperation__Group_3_1__0__Impl : ( ',' ) ;
+    // InternalRoom.g:7915:1: rule__PortOperation__Group_3_1__0__Impl : ( ',' ) ;
     public final void rule__PortOperation__Group_3_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7916:1: ( ( ',' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7917:1: ( ',' )
+            // InternalRoom.g:7919:1: ( ( ',' ) )
+            // InternalRoom.g:7920:1: ( ',' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7917:1: ( ',' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7918:1: ','
+            // InternalRoom.g:7920:1: ( ',' )
+            // InternalRoom.g:7921:1: ','
             {
              before(grammarAccess.getPortOperationAccess().getCommaKeyword_3_1_0()); 
-            match(input,51,FOLLOW_51_in_rule__PortOperation__Group_3_1__0__Impl16620); 
+            match(input,51,FOLLOW_2); 
              after(grammarAccess.getPortOperationAccess().getCommaKeyword_3_1_0()); 
 
             }
@@ -23213,16 +23213,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortOperation__Group_3_1__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7931:1: rule__PortOperation__Group_3_1__1 : rule__PortOperation__Group_3_1__1__Impl ;
+    // InternalRoom.g:7934:1: rule__PortOperation__Group_3_1__1 : rule__PortOperation__Group_3_1__1__Impl ;
     public final void rule__PortOperation__Group_3_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7935:1: ( rule__PortOperation__Group_3_1__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7936:2: rule__PortOperation__Group_3_1__1__Impl
+            // InternalRoom.g:7938:1: ( rule__PortOperation__Group_3_1__1__Impl )
+            // InternalRoom.g:7939:2: rule__PortOperation__Group_3_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__PortOperation__Group_3_1__1__Impl_in_rule__PortOperation__Group_3_1__116651);
+            pushFollow(FOLLOW_2);
             rule__PortOperation__Group_3_1__1__Impl();
 
             state._fsp--;
@@ -23246,23 +23246,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortOperation__Group_3_1__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7942:1: rule__PortOperation__Group_3_1__1__Impl : ( ( rule__PortOperation__ArgumentsAssignment_3_1_1 ) ) ;
+    // InternalRoom.g:7945:1: rule__PortOperation__Group_3_1__1__Impl : ( ( rule__PortOperation__ArgumentsAssignment_3_1_1 ) ) ;
     public final void rule__PortOperation__Group_3_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7946:1: ( ( ( rule__PortOperation__ArgumentsAssignment_3_1_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7947:1: ( ( rule__PortOperation__ArgumentsAssignment_3_1_1 ) )
+            // InternalRoom.g:7949:1: ( ( ( rule__PortOperation__ArgumentsAssignment_3_1_1 ) ) )
+            // InternalRoom.g:7950:1: ( ( rule__PortOperation__ArgumentsAssignment_3_1_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7947:1: ( ( rule__PortOperation__ArgumentsAssignment_3_1_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7948:1: ( rule__PortOperation__ArgumentsAssignment_3_1_1 )
+            // InternalRoom.g:7950:1: ( ( rule__PortOperation__ArgumentsAssignment_3_1_1 ) )
+            // InternalRoom.g:7951:1: ( rule__PortOperation__ArgumentsAssignment_3_1_1 )
             {
              before(grammarAccess.getPortOperationAccess().getArgumentsAssignment_3_1_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7949:1: ( rule__PortOperation__ArgumentsAssignment_3_1_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7949:2: rule__PortOperation__ArgumentsAssignment_3_1_1
+            // InternalRoom.g:7952:1: ( rule__PortOperation__ArgumentsAssignment_3_1_1 )
+            // InternalRoom.g:7952:2: rule__PortOperation__ArgumentsAssignment_3_1_1
             {
-            pushFollow(FOLLOW_rule__PortOperation__ArgumentsAssignment_3_1_1_in_rule__PortOperation__Group_3_1__1__Impl16678);
+            pushFollow(FOLLOW_2);
             rule__PortOperation__ArgumentsAssignment_3_1_1();
 
             state._fsp--;
@@ -23293,21 +23293,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortOperation__Group_5_0__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7963:1: rule__PortOperation__Group_5_0__0 : rule__PortOperation__Group_5_0__0__Impl rule__PortOperation__Group_5_0__1 ;
+    // InternalRoom.g:7966:1: rule__PortOperation__Group_5_0__0 : rule__PortOperation__Group_5_0__0__Impl rule__PortOperation__Group_5_0__1 ;
     public final void rule__PortOperation__Group_5_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7967:1: ( rule__PortOperation__Group_5_0__0__Impl rule__PortOperation__Group_5_0__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7968:2: rule__PortOperation__Group_5_0__0__Impl rule__PortOperation__Group_5_0__1
+            // InternalRoom.g:7970:1: ( rule__PortOperation__Group_5_0__0__Impl rule__PortOperation__Group_5_0__1 )
+            // InternalRoom.g:7971:2: rule__PortOperation__Group_5_0__0__Impl rule__PortOperation__Group_5_0__1
             {
-            pushFollow(FOLLOW_rule__PortOperation__Group_5_0__0__Impl_in_rule__PortOperation__Group_5_0__016712);
+            pushFollow(FOLLOW_36);
             rule__PortOperation__Group_5_0__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__PortOperation__Group_5_0__1_in_rule__PortOperation__Group_5_0__016715);
+            pushFollow(FOLLOW_2);
             rule__PortOperation__Group_5_0__1();
 
             state._fsp--;
@@ -23331,20 +23331,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortOperation__Group_5_0__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7975:1: rule__PortOperation__Group_5_0__0__Impl : ( ':' ) ;
+    // InternalRoom.g:7978:1: rule__PortOperation__Group_5_0__0__Impl : ( ':' ) ;
     public final void rule__PortOperation__Group_5_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7979:1: ( ( ':' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7980:1: ( ':' )
+            // InternalRoom.g:7982:1: ( ( ':' ) )
+            // InternalRoom.g:7983:1: ( ':' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7980:1: ( ':' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7981:1: ':'
+            // InternalRoom.g:7983:1: ( ':' )
+            // InternalRoom.g:7984:1: ':'
             {
              before(grammarAccess.getPortOperationAccess().getColonKeyword_5_0_0()); 
-            match(input,43,FOLLOW_43_in_rule__PortOperation__Group_5_0__0__Impl16743); 
+            match(input,43,FOLLOW_2); 
              after(grammarAccess.getPortOperationAccess().getColonKeyword_5_0_0()); 
 
             }
@@ -23368,16 +23368,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortOperation__Group_5_0__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7994:1: rule__PortOperation__Group_5_0__1 : rule__PortOperation__Group_5_0__1__Impl ;
+    // InternalRoom.g:7997:1: rule__PortOperation__Group_5_0__1 : rule__PortOperation__Group_5_0__1__Impl ;
     public final void rule__PortOperation__Group_5_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7998:1: ( rule__PortOperation__Group_5_0__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:7999:2: rule__PortOperation__Group_5_0__1__Impl
+            // InternalRoom.g:8001:1: ( rule__PortOperation__Group_5_0__1__Impl )
+            // InternalRoom.g:8002:2: rule__PortOperation__Group_5_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__PortOperation__Group_5_0__1__Impl_in_rule__PortOperation__Group_5_0__116774);
+            pushFollow(FOLLOW_2);
             rule__PortOperation__Group_5_0__1__Impl();
 
             state._fsp--;
@@ -23401,23 +23401,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortOperation__Group_5_0__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8005:1: rule__PortOperation__Group_5_0__1__Impl : ( ( rule__PortOperation__Alternatives_5_0_1 ) ) ;
+    // InternalRoom.g:8008:1: rule__PortOperation__Group_5_0__1__Impl : ( ( rule__PortOperation__Alternatives_5_0_1 ) ) ;
     public final void rule__PortOperation__Group_5_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8009:1: ( ( ( rule__PortOperation__Alternatives_5_0_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8010:1: ( ( rule__PortOperation__Alternatives_5_0_1 ) )
+            // InternalRoom.g:8012:1: ( ( ( rule__PortOperation__Alternatives_5_0_1 ) ) )
+            // InternalRoom.g:8013:1: ( ( rule__PortOperation__Alternatives_5_0_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8010:1: ( ( rule__PortOperation__Alternatives_5_0_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8011:1: ( rule__PortOperation__Alternatives_5_0_1 )
+            // InternalRoom.g:8013:1: ( ( rule__PortOperation__Alternatives_5_0_1 ) )
+            // InternalRoom.g:8014:1: ( rule__PortOperation__Alternatives_5_0_1 )
             {
              before(grammarAccess.getPortOperationAccess().getAlternatives_5_0_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8012:1: ( rule__PortOperation__Alternatives_5_0_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8012:2: rule__PortOperation__Alternatives_5_0_1
+            // InternalRoom.g:8015:1: ( rule__PortOperation__Alternatives_5_0_1 )
+            // InternalRoom.g:8015:2: rule__PortOperation__Alternatives_5_0_1
             {
-            pushFollow(FOLLOW_rule__PortOperation__Alternatives_5_0_1_in_rule__PortOperation__Group_5_0__1__Impl16801);
+            pushFollow(FOLLOW_2);
             rule__PortOperation__Alternatives_5_0_1();
 
             state._fsp--;
@@ -23448,21 +23448,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortOperation__Group_5_1__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8026:1: rule__PortOperation__Group_5_1__0 : rule__PortOperation__Group_5_1__0__Impl rule__PortOperation__Group_5_1__1 ;
+    // InternalRoom.g:8029:1: rule__PortOperation__Group_5_1__0 : rule__PortOperation__Group_5_1__0__Impl rule__PortOperation__Group_5_1__1 ;
     public final void rule__PortOperation__Group_5_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8030:1: ( rule__PortOperation__Group_5_1__0__Impl rule__PortOperation__Group_5_1__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8031:2: rule__PortOperation__Group_5_1__0__Impl rule__PortOperation__Group_5_1__1
+            // InternalRoom.g:8033:1: ( rule__PortOperation__Group_5_1__0__Impl rule__PortOperation__Group_5_1__1 )
+            // InternalRoom.g:8034:2: rule__PortOperation__Group_5_1__0__Impl rule__PortOperation__Group_5_1__1
             {
-            pushFollow(FOLLOW_rule__PortOperation__Group_5_1__0__Impl_in_rule__PortOperation__Group_5_1__016835);
+            pushFollow(FOLLOW_3);
             rule__PortOperation__Group_5_1__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__PortOperation__Group_5_1__1_in_rule__PortOperation__Group_5_1__016838);
+            pushFollow(FOLLOW_2);
             rule__PortOperation__Group_5_1__1();
 
             state._fsp--;
@@ -23486,20 +23486,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortOperation__Group_5_1__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8038:1: rule__PortOperation__Group_5_1__0__Impl : ( 'sends' ) ;
+    // InternalRoom.g:8041:1: rule__PortOperation__Group_5_1__0__Impl : ( 'sends' ) ;
     public final void rule__PortOperation__Group_5_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8042:1: ( ( 'sends' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8043:1: ( 'sends' )
+            // InternalRoom.g:8045:1: ( ( 'sends' ) )
+            // InternalRoom.g:8046:1: ( 'sends' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8043:1: ( 'sends' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8044:1: 'sends'
+            // InternalRoom.g:8046:1: ( 'sends' )
+            // InternalRoom.g:8047:1: 'sends'
             {
              before(grammarAccess.getPortOperationAccess().getSendsKeyword_5_1_0()); 
-            match(input,62,FOLLOW_62_in_rule__PortOperation__Group_5_1__0__Impl16866); 
+            match(input,62,FOLLOW_2); 
              after(grammarAccess.getPortOperationAccess().getSendsKeyword_5_1_0()); 
 
             }
@@ -23523,16 +23523,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortOperation__Group_5_1__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8057:1: rule__PortOperation__Group_5_1__1 : rule__PortOperation__Group_5_1__1__Impl ;
+    // InternalRoom.g:8060:1: rule__PortOperation__Group_5_1__1 : rule__PortOperation__Group_5_1__1__Impl ;
     public final void rule__PortOperation__Group_5_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8061:1: ( rule__PortOperation__Group_5_1__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8062:2: rule__PortOperation__Group_5_1__1__Impl
+            // InternalRoom.g:8064:1: ( rule__PortOperation__Group_5_1__1__Impl )
+            // InternalRoom.g:8065:2: rule__PortOperation__Group_5_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__PortOperation__Group_5_1__1__Impl_in_rule__PortOperation__Group_5_1__116897);
+            pushFollow(FOLLOW_2);
             rule__PortOperation__Group_5_1__1__Impl();
 
             state._fsp--;
@@ -23556,23 +23556,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortOperation__Group_5_1__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8068:1: rule__PortOperation__Group_5_1__1__Impl : ( ( rule__PortOperation__SendsMsgAssignment_5_1_1 ) ) ;
+    // InternalRoom.g:8071:1: rule__PortOperation__Group_5_1__1__Impl : ( ( rule__PortOperation__SendsMsgAssignment_5_1_1 ) ) ;
     public final void rule__PortOperation__Group_5_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8072:1: ( ( ( rule__PortOperation__SendsMsgAssignment_5_1_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8073:1: ( ( rule__PortOperation__SendsMsgAssignment_5_1_1 ) )
+            // InternalRoom.g:8075:1: ( ( ( rule__PortOperation__SendsMsgAssignment_5_1_1 ) ) )
+            // InternalRoom.g:8076:1: ( ( rule__PortOperation__SendsMsgAssignment_5_1_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8073:1: ( ( rule__PortOperation__SendsMsgAssignment_5_1_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8074:1: ( rule__PortOperation__SendsMsgAssignment_5_1_1 )
+            // InternalRoom.g:8076:1: ( ( rule__PortOperation__SendsMsgAssignment_5_1_1 ) )
+            // InternalRoom.g:8077:1: ( rule__PortOperation__SendsMsgAssignment_5_1_1 )
             {
              before(grammarAccess.getPortOperationAccess().getSendsMsgAssignment_5_1_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8075:1: ( rule__PortOperation__SendsMsgAssignment_5_1_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8075:2: rule__PortOperation__SendsMsgAssignment_5_1_1
+            // InternalRoom.g:8078:1: ( rule__PortOperation__SendsMsgAssignment_5_1_1 )
+            // InternalRoom.g:8078:2: rule__PortOperation__SendsMsgAssignment_5_1_1
             {
-            pushFollow(FOLLOW_rule__PortOperation__SendsMsgAssignment_5_1_1_in_rule__PortOperation__Group_5_1__1__Impl16924);
+            pushFollow(FOLLOW_2);
             rule__PortOperation__SendsMsgAssignment_5_1_1();
 
             state._fsp--;
@@ -23603,21 +23603,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassStructor__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8089:1: rule__ClassStructor__Group__0 : rule__ClassStructor__Group__0__Impl rule__ClassStructor__Group__1 ;
+    // InternalRoom.g:8092:1: rule__ClassStructor__Group__0 : rule__ClassStructor__Group__0__Impl rule__ClassStructor__Group__1 ;
     public final void rule__ClassStructor__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8093:1: ( rule__ClassStructor__Group__0__Impl rule__ClassStructor__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8094:2: rule__ClassStructor__Group__0__Impl rule__ClassStructor__Group__1
+            // InternalRoom.g:8096:1: ( rule__ClassStructor__Group__0__Impl rule__ClassStructor__Group__1 )
+            // InternalRoom.g:8097:2: rule__ClassStructor__Group__0__Impl rule__ClassStructor__Group__1
             {
-            pushFollow(FOLLOW_rule__ClassStructor__Group__0__Impl_in_rule__ClassStructor__Group__016958);
+            pushFollow(FOLLOW_27);
             rule__ClassStructor__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ClassStructor__Group__1_in_rule__ClassStructor__Group__016961);
+            pushFollow(FOLLOW_2);
             rule__ClassStructor__Group__1();
 
             state._fsp--;
@@ -23641,23 +23641,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassStructor__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8101:1: rule__ClassStructor__Group__0__Impl : ( ( rule__ClassStructor__NameAssignment_0 ) ) ;
+    // InternalRoom.g:8104:1: rule__ClassStructor__Group__0__Impl : ( ( rule__ClassStructor__NameAssignment_0 ) ) ;
     public final void rule__ClassStructor__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8105:1: ( ( ( rule__ClassStructor__NameAssignment_0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8106:1: ( ( rule__ClassStructor__NameAssignment_0 ) )
+            // InternalRoom.g:8108:1: ( ( ( rule__ClassStructor__NameAssignment_0 ) ) )
+            // InternalRoom.g:8109:1: ( ( rule__ClassStructor__NameAssignment_0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8106:1: ( ( rule__ClassStructor__NameAssignment_0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8107:1: ( rule__ClassStructor__NameAssignment_0 )
+            // InternalRoom.g:8109:1: ( ( rule__ClassStructor__NameAssignment_0 ) )
+            // InternalRoom.g:8110:1: ( rule__ClassStructor__NameAssignment_0 )
             {
              before(grammarAccess.getClassStructorAccess().getNameAssignment_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8108:1: ( rule__ClassStructor__NameAssignment_0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8108:2: rule__ClassStructor__NameAssignment_0
+            // InternalRoom.g:8111:1: ( rule__ClassStructor__NameAssignment_0 )
+            // InternalRoom.g:8111:2: rule__ClassStructor__NameAssignment_0
             {
-            pushFollow(FOLLOW_rule__ClassStructor__NameAssignment_0_in_rule__ClassStructor__Group__0__Impl16988);
+            pushFollow(FOLLOW_2);
             rule__ClassStructor__NameAssignment_0();
 
             state._fsp--;
@@ -23688,16 +23688,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassStructor__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8118:1: rule__ClassStructor__Group__1 : rule__ClassStructor__Group__1__Impl ;
+    // InternalRoom.g:8121:1: rule__ClassStructor__Group__1 : rule__ClassStructor__Group__1__Impl ;
     public final void rule__ClassStructor__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8122:1: ( rule__ClassStructor__Group__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8123:2: rule__ClassStructor__Group__1__Impl
+            // InternalRoom.g:8125:1: ( rule__ClassStructor__Group__1__Impl )
+            // InternalRoom.g:8126:2: rule__ClassStructor__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__ClassStructor__Group__1__Impl_in_rule__ClassStructor__Group__117018);
+            pushFollow(FOLLOW_2);
             rule__ClassStructor__Group__1__Impl();
 
             state._fsp--;
@@ -23721,23 +23721,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassStructor__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8129:1: rule__ClassStructor__Group__1__Impl : ( ( rule__ClassStructor__DetailCodeAssignment_1 ) ) ;
+    // InternalRoom.g:8132:1: rule__ClassStructor__Group__1__Impl : ( ( rule__ClassStructor__DetailCodeAssignment_1 ) ) ;
     public final void rule__ClassStructor__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8133:1: ( ( ( rule__ClassStructor__DetailCodeAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8134:1: ( ( rule__ClassStructor__DetailCodeAssignment_1 ) )
+            // InternalRoom.g:8136:1: ( ( ( rule__ClassStructor__DetailCodeAssignment_1 ) ) )
+            // InternalRoom.g:8137:1: ( ( rule__ClassStructor__DetailCodeAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8134:1: ( ( rule__ClassStructor__DetailCodeAssignment_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8135:1: ( rule__ClassStructor__DetailCodeAssignment_1 )
+            // InternalRoom.g:8137:1: ( ( rule__ClassStructor__DetailCodeAssignment_1 ) )
+            // InternalRoom.g:8138:1: ( rule__ClassStructor__DetailCodeAssignment_1 )
             {
              before(grammarAccess.getClassStructorAccess().getDetailCodeAssignment_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8136:1: ( rule__ClassStructor__DetailCodeAssignment_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8136:2: rule__ClassStructor__DetailCodeAssignment_1
+            // InternalRoom.g:8139:1: ( rule__ClassStructor__DetailCodeAssignment_1 )
+            // InternalRoom.g:8139:2: rule__ClassStructor__DetailCodeAssignment_1
             {
-            pushFollow(FOLLOW_rule__ClassStructor__DetailCodeAssignment_1_in_rule__ClassStructor__Group__1__Impl17045);
+            pushFollow(FOLLOW_2);
             rule__ClassStructor__DetailCodeAssignment_1();
 
             state._fsp--;
@@ -23768,21 +23768,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8150:1: rule__ProtocolClass__Group__0 : rule__ProtocolClass__Group__0__Impl rule__ProtocolClass__Group__1 ;
+    // InternalRoom.g:8153:1: rule__ProtocolClass__Group__0 : rule__ProtocolClass__Group__0__Impl rule__ProtocolClass__Group__1 ;
     public final void rule__ProtocolClass__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8154:1: ( rule__ProtocolClass__Group__0__Impl rule__ProtocolClass__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8155:2: rule__ProtocolClass__Group__0__Impl rule__ProtocolClass__Group__1
+            // InternalRoom.g:8157:1: ( rule__ProtocolClass__Group__0__Impl rule__ProtocolClass__Group__1 )
+            // InternalRoom.g:8158:2: rule__ProtocolClass__Group__0__Impl rule__ProtocolClass__Group__1
             {
-            pushFollow(FOLLOW_rule__ProtocolClass__Group__0__Impl_in_rule__ProtocolClass__Group__017079);
+            pushFollow(FOLLOW_38);
             rule__ProtocolClass__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ProtocolClass__Group__1_in_rule__ProtocolClass__Group__017082);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClass__Group__1();
 
             state._fsp--;
@@ -23806,20 +23806,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8162:1: rule__ProtocolClass__Group__0__Impl : ( ( rule__ProtocolClass__CommTypeAssignment_0 )? ) ;
+    // InternalRoom.g:8165:1: rule__ProtocolClass__Group__0__Impl : ( ( rule__ProtocolClass__CommTypeAssignment_0 )? ) ;
     public final void rule__ProtocolClass__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8166:1: ( ( ( rule__ProtocolClass__CommTypeAssignment_0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8167:1: ( ( rule__ProtocolClass__CommTypeAssignment_0 )? )
+            // InternalRoom.g:8169:1: ( ( ( rule__ProtocolClass__CommTypeAssignment_0 )? ) )
+            // InternalRoom.g:8170:1: ( ( rule__ProtocolClass__CommTypeAssignment_0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8167:1: ( ( rule__ProtocolClass__CommTypeAssignment_0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8168:1: ( rule__ProtocolClass__CommTypeAssignment_0 )?
+            // InternalRoom.g:8170:1: ( ( rule__ProtocolClass__CommTypeAssignment_0 )? )
+            // InternalRoom.g:8171:1: ( rule__ProtocolClass__CommTypeAssignment_0 )?
             {
              before(grammarAccess.getProtocolClassAccess().getCommTypeAssignment_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8169:1: ( rule__ProtocolClass__CommTypeAssignment_0 )?
+            // InternalRoom.g:8172:1: ( rule__ProtocolClass__CommTypeAssignment_0 )?
             int alt87=2;
             int LA87_0 = input.LA(1);
 
@@ -23828,9 +23828,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt87) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8169:2: rule__ProtocolClass__CommTypeAssignment_0
+                    // InternalRoom.g:8172:2: rule__ProtocolClass__CommTypeAssignment_0
                     {
-                    pushFollow(FOLLOW_rule__ProtocolClass__CommTypeAssignment_0_in_rule__ProtocolClass__Group__0__Impl17109);
+                    pushFollow(FOLLOW_2);
                     rule__ProtocolClass__CommTypeAssignment_0();
 
                     state._fsp--;
@@ -23864,21 +23864,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8179:1: rule__ProtocolClass__Group__1 : rule__ProtocolClass__Group__1__Impl rule__ProtocolClass__Group__2 ;
+    // InternalRoom.g:8182:1: rule__ProtocolClass__Group__1 : rule__ProtocolClass__Group__1__Impl rule__ProtocolClass__Group__2 ;
     public final void rule__ProtocolClass__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8183:1: ( rule__ProtocolClass__Group__1__Impl rule__ProtocolClass__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8184:2: rule__ProtocolClass__Group__1__Impl rule__ProtocolClass__Group__2
+            // InternalRoom.g:8186:1: ( rule__ProtocolClass__Group__1__Impl rule__ProtocolClass__Group__2 )
+            // InternalRoom.g:8187:2: rule__ProtocolClass__Group__1__Impl rule__ProtocolClass__Group__2
             {
-            pushFollow(FOLLOW_rule__ProtocolClass__Group__1__Impl_in_rule__ProtocolClass__Group__117140);
+            pushFollow(FOLLOW_3);
             rule__ProtocolClass__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ProtocolClass__Group__2_in_rule__ProtocolClass__Group__117143);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClass__Group__2();
 
             state._fsp--;
@@ -23902,20 +23902,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8191:1: rule__ProtocolClass__Group__1__Impl : ( 'ProtocolClass' ) ;
+    // InternalRoom.g:8194:1: rule__ProtocolClass__Group__1__Impl : ( 'ProtocolClass' ) ;
     public final void rule__ProtocolClass__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8195:1: ( ( 'ProtocolClass' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8196:1: ( 'ProtocolClass' )
+            // InternalRoom.g:8198:1: ( ( 'ProtocolClass' ) )
+            // InternalRoom.g:8199:1: ( 'ProtocolClass' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8196:1: ( 'ProtocolClass' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8197:1: 'ProtocolClass'
+            // InternalRoom.g:8199:1: ( 'ProtocolClass' )
+            // InternalRoom.g:8200:1: 'ProtocolClass'
             {
              before(grammarAccess.getProtocolClassAccess().getProtocolClassKeyword_1()); 
-            match(input,19,FOLLOW_19_in_rule__ProtocolClass__Group__1__Impl17171); 
+            match(input,19,FOLLOW_2); 
              after(grammarAccess.getProtocolClassAccess().getProtocolClassKeyword_1()); 
 
             }
@@ -23939,21 +23939,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8210:1: rule__ProtocolClass__Group__2 : rule__ProtocolClass__Group__2__Impl rule__ProtocolClass__Group__3 ;
+    // InternalRoom.g:8213:1: rule__ProtocolClass__Group__2 : rule__ProtocolClass__Group__2__Impl rule__ProtocolClass__Group__3 ;
     public final void rule__ProtocolClass__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8214:1: ( rule__ProtocolClass__Group__2__Impl rule__ProtocolClass__Group__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8215:2: rule__ProtocolClass__Group__2__Impl rule__ProtocolClass__Group__3
+            // InternalRoom.g:8217:1: ( rule__ProtocolClass__Group__2__Impl rule__ProtocolClass__Group__3 )
+            // InternalRoom.g:8218:2: rule__ProtocolClass__Group__2__Impl rule__ProtocolClass__Group__3
             {
-            pushFollow(FOLLOW_rule__ProtocolClass__Group__2__Impl_in_rule__ProtocolClass__Group__217202);
+            pushFollow(FOLLOW_23);
             rule__ProtocolClass__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ProtocolClass__Group__3_in_rule__ProtocolClass__Group__217205);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClass__Group__3();
 
             state._fsp--;
@@ -23977,23 +23977,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8222:1: rule__ProtocolClass__Group__2__Impl : ( ( rule__ProtocolClass__NameAssignment_2 ) ) ;
+    // InternalRoom.g:8225:1: rule__ProtocolClass__Group__2__Impl : ( ( rule__ProtocolClass__NameAssignment_2 ) ) ;
     public final void rule__ProtocolClass__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8226:1: ( ( ( rule__ProtocolClass__NameAssignment_2 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8227:1: ( ( rule__ProtocolClass__NameAssignment_2 ) )
+            // InternalRoom.g:8229:1: ( ( ( rule__ProtocolClass__NameAssignment_2 ) ) )
+            // InternalRoom.g:8230:1: ( ( rule__ProtocolClass__NameAssignment_2 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8227:1: ( ( rule__ProtocolClass__NameAssignment_2 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8228:1: ( rule__ProtocolClass__NameAssignment_2 )
+            // InternalRoom.g:8230:1: ( ( rule__ProtocolClass__NameAssignment_2 ) )
+            // InternalRoom.g:8231:1: ( rule__ProtocolClass__NameAssignment_2 )
             {
              before(grammarAccess.getProtocolClassAccess().getNameAssignment_2()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8229:1: ( rule__ProtocolClass__NameAssignment_2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8229:2: rule__ProtocolClass__NameAssignment_2
+            // InternalRoom.g:8232:1: ( rule__ProtocolClass__NameAssignment_2 )
+            // InternalRoom.g:8232:2: rule__ProtocolClass__NameAssignment_2
             {
-            pushFollow(FOLLOW_rule__ProtocolClass__NameAssignment_2_in_rule__ProtocolClass__Group__2__Impl17232);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClass__NameAssignment_2();
 
             state._fsp--;
@@ -24024,21 +24024,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8239:1: rule__ProtocolClass__Group__3 : rule__ProtocolClass__Group__3__Impl rule__ProtocolClass__Group__4 ;
+    // InternalRoom.g:8242:1: rule__ProtocolClass__Group__3 : rule__ProtocolClass__Group__3__Impl rule__ProtocolClass__Group__4 ;
     public final void rule__ProtocolClass__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8243:1: ( rule__ProtocolClass__Group__3__Impl rule__ProtocolClass__Group__4 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8244:2: rule__ProtocolClass__Group__3__Impl rule__ProtocolClass__Group__4
+            // InternalRoom.g:8246:1: ( rule__ProtocolClass__Group__3__Impl rule__ProtocolClass__Group__4 )
+            // InternalRoom.g:8247:2: rule__ProtocolClass__Group__3__Impl rule__ProtocolClass__Group__4
             {
-            pushFollow(FOLLOW_rule__ProtocolClass__Group__3__Impl_in_rule__ProtocolClass__Group__317262);
+            pushFollow(FOLLOW_23);
             rule__ProtocolClass__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ProtocolClass__Group__4_in_rule__ProtocolClass__Group__317265);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClass__Group__4();
 
             state._fsp--;
@@ -24062,20 +24062,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8251:1: rule__ProtocolClass__Group__3__Impl : ( ( rule__ProtocolClass__DocuAssignment_3 )? ) ;
+    // InternalRoom.g:8254:1: rule__ProtocolClass__Group__3__Impl : ( ( rule__ProtocolClass__DocuAssignment_3 )? ) ;
     public final void rule__ProtocolClass__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8255:1: ( ( ( rule__ProtocolClass__DocuAssignment_3 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8256:1: ( ( rule__ProtocolClass__DocuAssignment_3 )? )
+            // InternalRoom.g:8258:1: ( ( ( rule__ProtocolClass__DocuAssignment_3 )? ) )
+            // InternalRoom.g:8259:1: ( ( rule__ProtocolClass__DocuAssignment_3 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8256:1: ( ( rule__ProtocolClass__DocuAssignment_3 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8257:1: ( rule__ProtocolClass__DocuAssignment_3 )?
+            // InternalRoom.g:8259:1: ( ( rule__ProtocolClass__DocuAssignment_3 )? )
+            // InternalRoom.g:8260:1: ( rule__ProtocolClass__DocuAssignment_3 )?
             {
              before(grammarAccess.getProtocolClassAccess().getDocuAssignment_3()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8258:1: ( rule__ProtocolClass__DocuAssignment_3 )?
+            // InternalRoom.g:8261:1: ( rule__ProtocolClass__DocuAssignment_3 )?
             int alt88=2;
             int LA88_0 = input.LA(1);
 
@@ -24084,9 +24084,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt88) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8258:2: rule__ProtocolClass__DocuAssignment_3
+                    // InternalRoom.g:8261:2: rule__ProtocolClass__DocuAssignment_3
                     {
-                    pushFollow(FOLLOW_rule__ProtocolClass__DocuAssignment_3_in_rule__ProtocolClass__Group__3__Impl17292);
+                    pushFollow(FOLLOW_2);
                     rule__ProtocolClass__DocuAssignment_3();
 
                     state._fsp--;
@@ -24120,21 +24120,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group__4"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8268:1: rule__ProtocolClass__Group__4 : rule__ProtocolClass__Group__4__Impl rule__ProtocolClass__Group__5 ;
+    // InternalRoom.g:8271:1: rule__ProtocolClass__Group__4 : rule__ProtocolClass__Group__4__Impl rule__ProtocolClass__Group__5 ;
     public final void rule__ProtocolClass__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8272:1: ( rule__ProtocolClass__Group__4__Impl rule__ProtocolClass__Group__5 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8273:2: rule__ProtocolClass__Group__4__Impl rule__ProtocolClass__Group__5
+            // InternalRoom.g:8275:1: ( rule__ProtocolClass__Group__4__Impl rule__ProtocolClass__Group__5 )
+            // InternalRoom.g:8276:2: rule__ProtocolClass__Group__4__Impl rule__ProtocolClass__Group__5
             {
-            pushFollow(FOLLOW_rule__ProtocolClass__Group__4__Impl_in_rule__ProtocolClass__Group__417323);
+            pushFollow(FOLLOW_23);
             rule__ProtocolClass__Group__4__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ProtocolClass__Group__5_in_rule__ProtocolClass__Group__417326);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClass__Group__5();
 
             state._fsp--;
@@ -24158,20 +24158,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group__4__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8280:1: rule__ProtocolClass__Group__4__Impl : ( ( rule__ProtocolClass__Group_4__0 )? ) ;
+    // InternalRoom.g:8283:1: rule__ProtocolClass__Group__4__Impl : ( ( rule__ProtocolClass__Group_4__0 )? ) ;
     public final void rule__ProtocolClass__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8284:1: ( ( ( rule__ProtocolClass__Group_4__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8285:1: ( ( rule__ProtocolClass__Group_4__0 )? )
+            // InternalRoom.g:8287:1: ( ( ( rule__ProtocolClass__Group_4__0 )? ) )
+            // InternalRoom.g:8288:1: ( ( rule__ProtocolClass__Group_4__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8285:1: ( ( rule__ProtocolClass__Group_4__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8286:1: ( rule__ProtocolClass__Group_4__0 )?
+            // InternalRoom.g:8288:1: ( ( rule__ProtocolClass__Group_4__0 )? )
+            // InternalRoom.g:8289:1: ( rule__ProtocolClass__Group_4__0 )?
             {
              before(grammarAccess.getProtocolClassAccess().getGroup_4()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8287:1: ( rule__ProtocolClass__Group_4__0 )?
+            // InternalRoom.g:8290:1: ( rule__ProtocolClass__Group_4__0 )?
             int alt89=2;
             int LA89_0 = input.LA(1);
 
@@ -24180,9 +24180,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt89) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8287:2: rule__ProtocolClass__Group_4__0
+                    // InternalRoom.g:8290:2: rule__ProtocolClass__Group_4__0
                     {
-                    pushFollow(FOLLOW_rule__ProtocolClass__Group_4__0_in_rule__ProtocolClass__Group__4__Impl17353);
+                    pushFollow(FOLLOW_2);
                     rule__ProtocolClass__Group_4__0();
 
                     state._fsp--;
@@ -24216,21 +24216,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group__5"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8297:1: rule__ProtocolClass__Group__5 : rule__ProtocolClass__Group__5__Impl rule__ProtocolClass__Group__6 ;
+    // InternalRoom.g:8300:1: rule__ProtocolClass__Group__5 : rule__ProtocolClass__Group__5__Impl rule__ProtocolClass__Group__6 ;
     public final void rule__ProtocolClass__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8301:1: ( rule__ProtocolClass__Group__5__Impl rule__ProtocolClass__Group__6 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8302:2: rule__ProtocolClass__Group__5__Impl rule__ProtocolClass__Group__6
+            // InternalRoom.g:8304:1: ( rule__ProtocolClass__Group__5__Impl rule__ProtocolClass__Group__6 )
+            // InternalRoom.g:8305:2: rule__ProtocolClass__Group__5__Impl rule__ProtocolClass__Group__6
             {
-            pushFollow(FOLLOW_rule__ProtocolClass__Group__5__Impl_in_rule__ProtocolClass__Group__517384);
+            pushFollow(FOLLOW_39);
             rule__ProtocolClass__Group__5__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ProtocolClass__Group__6_in_rule__ProtocolClass__Group__517387);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClass__Group__6();
 
             state._fsp--;
@@ -24254,20 +24254,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group__5__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8309:1: rule__ProtocolClass__Group__5__Impl : ( '{' ) ;
+    // InternalRoom.g:8312:1: rule__ProtocolClass__Group__5__Impl : ( '{' ) ;
     public final void rule__ProtocolClass__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8313:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8314:1: ( '{' )
+            // InternalRoom.g:8316:1: ( ( '{' ) )
+            // InternalRoom.g:8317:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8314:1: ( '{' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8315:1: '{'
+            // InternalRoom.g:8317:1: ( '{' )
+            // InternalRoom.g:8318:1: '{'
             {
              before(grammarAccess.getProtocolClassAccess().getLeftCurlyBracketKeyword_5()); 
-            match(input,41,FOLLOW_41_in_rule__ProtocolClass__Group__5__Impl17415); 
+            match(input,41,FOLLOW_2); 
              after(grammarAccess.getProtocolClassAccess().getLeftCurlyBracketKeyword_5()); 
 
             }
@@ -24291,21 +24291,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group__6"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8328:1: rule__ProtocolClass__Group__6 : rule__ProtocolClass__Group__6__Impl rule__ProtocolClass__Group__7 ;
+    // InternalRoom.g:8331:1: rule__ProtocolClass__Group__6 : rule__ProtocolClass__Group__6__Impl rule__ProtocolClass__Group__7 ;
     public final void rule__ProtocolClass__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8332:1: ( rule__ProtocolClass__Group__6__Impl rule__ProtocolClass__Group__7 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8333:2: rule__ProtocolClass__Group__6__Impl rule__ProtocolClass__Group__7
+            // InternalRoom.g:8335:1: ( rule__ProtocolClass__Group__6__Impl rule__ProtocolClass__Group__7 )
+            // InternalRoom.g:8336:2: rule__ProtocolClass__Group__6__Impl rule__ProtocolClass__Group__7
             {
-            pushFollow(FOLLOW_rule__ProtocolClass__Group__6__Impl_in_rule__ProtocolClass__Group__617446);
+            pushFollow(FOLLOW_39);
             rule__ProtocolClass__Group__6__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ProtocolClass__Group__7_in_rule__ProtocolClass__Group__617449);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClass__Group__7();
 
             state._fsp--;
@@ -24329,20 +24329,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group__6__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8340:1: rule__ProtocolClass__Group__6__Impl : ( ( rule__ProtocolClass__AnnotationsAssignment_6 )* ) ;
+    // InternalRoom.g:8343:1: rule__ProtocolClass__Group__6__Impl : ( ( rule__ProtocolClass__AnnotationsAssignment_6 )* ) ;
     public final void rule__ProtocolClass__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8344:1: ( ( ( rule__ProtocolClass__AnnotationsAssignment_6 )* ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8345:1: ( ( rule__ProtocolClass__AnnotationsAssignment_6 )* )
+            // InternalRoom.g:8347:1: ( ( ( rule__ProtocolClass__AnnotationsAssignment_6 )* ) )
+            // InternalRoom.g:8348:1: ( ( rule__ProtocolClass__AnnotationsAssignment_6 )* )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8345:1: ( ( rule__ProtocolClass__AnnotationsAssignment_6 )* )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8346:1: ( rule__ProtocolClass__AnnotationsAssignment_6 )*
+            // InternalRoom.g:8348:1: ( ( rule__ProtocolClass__AnnotationsAssignment_6 )* )
+            // InternalRoom.g:8349:1: ( rule__ProtocolClass__AnnotationsAssignment_6 )*
             {
              before(grammarAccess.getProtocolClassAccess().getAnnotationsAssignment_6()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8347:1: ( rule__ProtocolClass__AnnotationsAssignment_6 )*
+            // InternalRoom.g:8350:1: ( rule__ProtocolClass__AnnotationsAssignment_6 )*
             loop90:
             do {
                 int alt90=2;
@@ -24355,9 +24355,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
                 switch (alt90) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8347:2: rule__ProtocolClass__AnnotationsAssignment_6
+            	    // InternalRoom.g:8350:2: rule__ProtocolClass__AnnotationsAssignment_6
             	    {
-            	    pushFollow(FOLLOW_rule__ProtocolClass__AnnotationsAssignment_6_in_rule__ProtocolClass__Group__6__Impl17476);
+            	    pushFollow(FOLLOW_25);
             	    rule__ProtocolClass__AnnotationsAssignment_6();
 
             	    state._fsp--;
@@ -24394,21 +24394,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group__7"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8357:1: rule__ProtocolClass__Group__7 : rule__ProtocolClass__Group__7__Impl rule__ProtocolClass__Group__8 ;
+    // InternalRoom.g:8360:1: rule__ProtocolClass__Group__7 : rule__ProtocolClass__Group__7__Impl rule__ProtocolClass__Group__8 ;
     public final void rule__ProtocolClass__Group__7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8361:1: ( rule__ProtocolClass__Group__7__Impl rule__ProtocolClass__Group__8 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8362:2: rule__ProtocolClass__Group__7__Impl rule__ProtocolClass__Group__8
+            // InternalRoom.g:8364:1: ( rule__ProtocolClass__Group__7__Impl rule__ProtocolClass__Group__8 )
+            // InternalRoom.g:8365:2: rule__ProtocolClass__Group__7__Impl rule__ProtocolClass__Group__8
             {
-            pushFollow(FOLLOW_rule__ProtocolClass__Group__7__Impl_in_rule__ProtocolClass__Group__717507);
+            pushFollow(FOLLOW_39);
             rule__ProtocolClass__Group__7__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ProtocolClass__Group__8_in_rule__ProtocolClass__Group__717510);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClass__Group__8();
 
             state._fsp--;
@@ -24432,20 +24432,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group__7__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8369:1: rule__ProtocolClass__Group__7__Impl : ( ( rule__ProtocolClass__Group_7__0 )? ) ;
+    // InternalRoom.g:8372:1: rule__ProtocolClass__Group__7__Impl : ( ( rule__ProtocolClass__Group_7__0 )? ) ;
     public final void rule__ProtocolClass__Group__7__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8373:1: ( ( ( rule__ProtocolClass__Group_7__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8374:1: ( ( rule__ProtocolClass__Group_7__0 )? )
+            // InternalRoom.g:8376:1: ( ( ( rule__ProtocolClass__Group_7__0 )? ) )
+            // InternalRoom.g:8377:1: ( ( rule__ProtocolClass__Group_7__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8374:1: ( ( rule__ProtocolClass__Group_7__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8375:1: ( rule__ProtocolClass__Group_7__0 )?
+            // InternalRoom.g:8377:1: ( ( rule__ProtocolClass__Group_7__0 )? )
+            // InternalRoom.g:8378:1: ( rule__ProtocolClass__Group_7__0 )?
             {
              before(grammarAccess.getProtocolClassAccess().getGroup_7()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8376:1: ( rule__ProtocolClass__Group_7__0 )?
+            // InternalRoom.g:8379:1: ( rule__ProtocolClass__Group_7__0 )?
             int alt91=2;
             int LA91_0 = input.LA(1);
 
@@ -24454,9 +24454,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt91) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8376:2: rule__ProtocolClass__Group_7__0
+                    // InternalRoom.g:8379:2: rule__ProtocolClass__Group_7__0
                     {
-                    pushFollow(FOLLOW_rule__ProtocolClass__Group_7__0_in_rule__ProtocolClass__Group__7__Impl17537);
+                    pushFollow(FOLLOW_2);
                     rule__ProtocolClass__Group_7__0();
 
                     state._fsp--;
@@ -24490,21 +24490,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group__8"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8386:1: rule__ProtocolClass__Group__8 : rule__ProtocolClass__Group__8__Impl rule__ProtocolClass__Group__9 ;
+    // InternalRoom.g:8389:1: rule__ProtocolClass__Group__8 : rule__ProtocolClass__Group__8__Impl rule__ProtocolClass__Group__9 ;
     public final void rule__ProtocolClass__Group__8() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8390:1: ( rule__ProtocolClass__Group__8__Impl rule__ProtocolClass__Group__9 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8391:2: rule__ProtocolClass__Group__8__Impl rule__ProtocolClass__Group__9
+            // InternalRoom.g:8393:1: ( rule__ProtocolClass__Group__8__Impl rule__ProtocolClass__Group__9 )
+            // InternalRoom.g:8394:2: rule__ProtocolClass__Group__8__Impl rule__ProtocolClass__Group__9
             {
-            pushFollow(FOLLOW_rule__ProtocolClass__Group__8__Impl_in_rule__ProtocolClass__Group__817568);
+            pushFollow(FOLLOW_39);
             rule__ProtocolClass__Group__8__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ProtocolClass__Group__9_in_rule__ProtocolClass__Group__817571);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClass__Group__9();
 
             state._fsp--;
@@ -24528,20 +24528,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group__8__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8398:1: rule__ProtocolClass__Group__8__Impl : ( ( rule__ProtocolClass__Group_8__0 )? ) ;
+    // InternalRoom.g:8401:1: rule__ProtocolClass__Group__8__Impl : ( ( rule__ProtocolClass__Group_8__0 )? ) ;
     public final void rule__ProtocolClass__Group__8__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8402:1: ( ( ( rule__ProtocolClass__Group_8__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8403:1: ( ( rule__ProtocolClass__Group_8__0 )? )
+            // InternalRoom.g:8405:1: ( ( ( rule__ProtocolClass__Group_8__0 )? ) )
+            // InternalRoom.g:8406:1: ( ( rule__ProtocolClass__Group_8__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8403:1: ( ( rule__ProtocolClass__Group_8__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8404:1: ( rule__ProtocolClass__Group_8__0 )?
+            // InternalRoom.g:8406:1: ( ( rule__ProtocolClass__Group_8__0 )? )
+            // InternalRoom.g:8407:1: ( rule__ProtocolClass__Group_8__0 )?
             {
              before(grammarAccess.getProtocolClassAccess().getGroup_8()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8405:1: ( rule__ProtocolClass__Group_8__0 )?
+            // InternalRoom.g:8408:1: ( rule__ProtocolClass__Group_8__0 )?
             int alt92=2;
             int LA92_0 = input.LA(1);
 
@@ -24550,9 +24550,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt92) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8405:2: rule__ProtocolClass__Group_8__0
+                    // InternalRoom.g:8408:2: rule__ProtocolClass__Group_8__0
                     {
-                    pushFollow(FOLLOW_rule__ProtocolClass__Group_8__0_in_rule__ProtocolClass__Group__8__Impl17598);
+                    pushFollow(FOLLOW_2);
                     rule__ProtocolClass__Group_8__0();
 
                     state._fsp--;
@@ -24586,21 +24586,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group__9"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8415:1: rule__ProtocolClass__Group__9 : rule__ProtocolClass__Group__9__Impl rule__ProtocolClass__Group__10 ;
+    // InternalRoom.g:8418:1: rule__ProtocolClass__Group__9 : rule__ProtocolClass__Group__9__Impl rule__ProtocolClass__Group__10 ;
     public final void rule__ProtocolClass__Group__9() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8419:1: ( rule__ProtocolClass__Group__9__Impl rule__ProtocolClass__Group__10 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8420:2: rule__ProtocolClass__Group__9__Impl rule__ProtocolClass__Group__10
+            // InternalRoom.g:8422:1: ( rule__ProtocolClass__Group__9__Impl rule__ProtocolClass__Group__10 )
+            // InternalRoom.g:8423:2: rule__ProtocolClass__Group__9__Impl rule__ProtocolClass__Group__10
             {
-            pushFollow(FOLLOW_rule__ProtocolClass__Group__9__Impl_in_rule__ProtocolClass__Group__917629);
+            pushFollow(FOLLOW_39);
             rule__ProtocolClass__Group__9__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ProtocolClass__Group__10_in_rule__ProtocolClass__Group__917632);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClass__Group__10();
 
             state._fsp--;
@@ -24624,20 +24624,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group__9__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8427:1: rule__ProtocolClass__Group__9__Impl : ( ( rule__ProtocolClass__Group_9__0 )? ) ;
+    // InternalRoom.g:8430:1: rule__ProtocolClass__Group__9__Impl : ( ( rule__ProtocolClass__Group_9__0 )? ) ;
     public final void rule__ProtocolClass__Group__9__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8431:1: ( ( ( rule__ProtocolClass__Group_9__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8432:1: ( ( rule__ProtocolClass__Group_9__0 )? )
+            // InternalRoom.g:8434:1: ( ( ( rule__ProtocolClass__Group_9__0 )? ) )
+            // InternalRoom.g:8435:1: ( ( rule__ProtocolClass__Group_9__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8432:1: ( ( rule__ProtocolClass__Group_9__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8433:1: ( rule__ProtocolClass__Group_9__0 )?
+            // InternalRoom.g:8435:1: ( ( rule__ProtocolClass__Group_9__0 )? )
+            // InternalRoom.g:8436:1: ( rule__ProtocolClass__Group_9__0 )?
             {
              before(grammarAccess.getProtocolClassAccess().getGroup_9()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8434:1: ( rule__ProtocolClass__Group_9__0 )?
+            // InternalRoom.g:8437:1: ( rule__ProtocolClass__Group_9__0 )?
             int alt93=2;
             int LA93_0 = input.LA(1);
 
@@ -24646,9 +24646,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt93) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8434:2: rule__ProtocolClass__Group_9__0
+                    // InternalRoom.g:8437:2: rule__ProtocolClass__Group_9__0
                     {
-                    pushFollow(FOLLOW_rule__ProtocolClass__Group_9__0_in_rule__ProtocolClass__Group__9__Impl17659);
+                    pushFollow(FOLLOW_2);
                     rule__ProtocolClass__Group_9__0();
 
                     state._fsp--;
@@ -24682,21 +24682,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group__10"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8444:1: rule__ProtocolClass__Group__10 : rule__ProtocolClass__Group__10__Impl rule__ProtocolClass__Group__11 ;
+    // InternalRoom.g:8447:1: rule__ProtocolClass__Group__10 : rule__ProtocolClass__Group__10__Impl rule__ProtocolClass__Group__11 ;
     public final void rule__ProtocolClass__Group__10() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8448:1: ( rule__ProtocolClass__Group__10__Impl rule__ProtocolClass__Group__11 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8449:2: rule__ProtocolClass__Group__10__Impl rule__ProtocolClass__Group__11
+            // InternalRoom.g:8451:1: ( rule__ProtocolClass__Group__10__Impl rule__ProtocolClass__Group__11 )
+            // InternalRoom.g:8452:2: rule__ProtocolClass__Group__10__Impl rule__ProtocolClass__Group__11
             {
-            pushFollow(FOLLOW_rule__ProtocolClass__Group__10__Impl_in_rule__ProtocolClass__Group__1017690);
+            pushFollow(FOLLOW_39);
             rule__ProtocolClass__Group__10__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ProtocolClass__Group__11_in_rule__ProtocolClass__Group__1017693);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClass__Group__11();
 
             state._fsp--;
@@ -24720,20 +24720,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group__10__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8456:1: rule__ProtocolClass__Group__10__Impl : ( ( rule__ProtocolClass__Group_10__0 )? ) ;
+    // InternalRoom.g:8459:1: rule__ProtocolClass__Group__10__Impl : ( ( rule__ProtocolClass__Group_10__0 )? ) ;
     public final void rule__ProtocolClass__Group__10__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8460:1: ( ( ( rule__ProtocolClass__Group_10__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8461:1: ( ( rule__ProtocolClass__Group_10__0 )? )
+            // InternalRoom.g:8463:1: ( ( ( rule__ProtocolClass__Group_10__0 )? ) )
+            // InternalRoom.g:8464:1: ( ( rule__ProtocolClass__Group_10__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8461:1: ( ( rule__ProtocolClass__Group_10__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8462:1: ( rule__ProtocolClass__Group_10__0 )?
+            // InternalRoom.g:8464:1: ( ( rule__ProtocolClass__Group_10__0 )? )
+            // InternalRoom.g:8465:1: ( rule__ProtocolClass__Group_10__0 )?
             {
              before(grammarAccess.getProtocolClassAccess().getGroup_10()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8463:1: ( rule__ProtocolClass__Group_10__0 )?
+            // InternalRoom.g:8466:1: ( rule__ProtocolClass__Group_10__0 )?
             int alt94=2;
             int LA94_0 = input.LA(1);
 
@@ -24742,9 +24742,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt94) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8463:2: rule__ProtocolClass__Group_10__0
+                    // InternalRoom.g:8466:2: rule__ProtocolClass__Group_10__0
                     {
-                    pushFollow(FOLLOW_rule__ProtocolClass__Group_10__0_in_rule__ProtocolClass__Group__10__Impl17720);
+                    pushFollow(FOLLOW_2);
                     rule__ProtocolClass__Group_10__0();
 
                     state._fsp--;
@@ -24778,21 +24778,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group__11"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8473:1: rule__ProtocolClass__Group__11 : rule__ProtocolClass__Group__11__Impl rule__ProtocolClass__Group__12 ;
+    // InternalRoom.g:8476:1: rule__ProtocolClass__Group__11 : rule__ProtocolClass__Group__11__Impl rule__ProtocolClass__Group__12 ;
     public final void rule__ProtocolClass__Group__11() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8477:1: ( rule__ProtocolClass__Group__11__Impl rule__ProtocolClass__Group__12 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8478:2: rule__ProtocolClass__Group__11__Impl rule__ProtocolClass__Group__12
+            // InternalRoom.g:8480:1: ( rule__ProtocolClass__Group__11__Impl rule__ProtocolClass__Group__12 )
+            // InternalRoom.g:8481:2: rule__ProtocolClass__Group__11__Impl rule__ProtocolClass__Group__12
             {
-            pushFollow(FOLLOW_rule__ProtocolClass__Group__11__Impl_in_rule__ProtocolClass__Group__1117751);
+            pushFollow(FOLLOW_39);
             rule__ProtocolClass__Group__11__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ProtocolClass__Group__12_in_rule__ProtocolClass__Group__1117754);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClass__Group__12();
 
             state._fsp--;
@@ -24816,20 +24816,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group__11__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8485:1: rule__ProtocolClass__Group__11__Impl : ( ( rule__ProtocolClass__Group_11__0 )? ) ;
+    // InternalRoom.g:8488:1: rule__ProtocolClass__Group__11__Impl : ( ( rule__ProtocolClass__Group_11__0 )? ) ;
     public final void rule__ProtocolClass__Group__11__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8489:1: ( ( ( rule__ProtocolClass__Group_11__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8490:1: ( ( rule__ProtocolClass__Group_11__0 )? )
+            // InternalRoom.g:8492:1: ( ( ( rule__ProtocolClass__Group_11__0 )? ) )
+            // InternalRoom.g:8493:1: ( ( rule__ProtocolClass__Group_11__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8490:1: ( ( rule__ProtocolClass__Group_11__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8491:1: ( rule__ProtocolClass__Group_11__0 )?
+            // InternalRoom.g:8493:1: ( ( rule__ProtocolClass__Group_11__0 )? )
+            // InternalRoom.g:8494:1: ( rule__ProtocolClass__Group_11__0 )?
             {
              before(grammarAccess.getProtocolClassAccess().getGroup_11()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8492:1: ( rule__ProtocolClass__Group_11__0 )?
+            // InternalRoom.g:8495:1: ( rule__ProtocolClass__Group_11__0 )?
             int alt95=2;
             int LA95_0 = input.LA(1);
 
@@ -24838,9 +24838,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt95) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8492:2: rule__ProtocolClass__Group_11__0
+                    // InternalRoom.g:8495:2: rule__ProtocolClass__Group_11__0
                     {
-                    pushFollow(FOLLOW_rule__ProtocolClass__Group_11__0_in_rule__ProtocolClass__Group__11__Impl17781);
+                    pushFollow(FOLLOW_2);
                     rule__ProtocolClass__Group_11__0();
 
                     state._fsp--;
@@ -24874,21 +24874,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group__12"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8502:1: rule__ProtocolClass__Group__12 : rule__ProtocolClass__Group__12__Impl rule__ProtocolClass__Group__13 ;
+    // InternalRoom.g:8505:1: rule__ProtocolClass__Group__12 : rule__ProtocolClass__Group__12__Impl rule__ProtocolClass__Group__13 ;
     public final void rule__ProtocolClass__Group__12() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8506:1: ( rule__ProtocolClass__Group__12__Impl rule__ProtocolClass__Group__13 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8507:2: rule__ProtocolClass__Group__12__Impl rule__ProtocolClass__Group__13
+            // InternalRoom.g:8509:1: ( rule__ProtocolClass__Group__12__Impl rule__ProtocolClass__Group__13 )
+            // InternalRoom.g:8510:2: rule__ProtocolClass__Group__12__Impl rule__ProtocolClass__Group__13
             {
-            pushFollow(FOLLOW_rule__ProtocolClass__Group__12__Impl_in_rule__ProtocolClass__Group__1217812);
+            pushFollow(FOLLOW_39);
             rule__ProtocolClass__Group__12__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ProtocolClass__Group__13_in_rule__ProtocolClass__Group__1217815);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClass__Group__13();
 
             state._fsp--;
@@ -24912,20 +24912,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group__12__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8514:1: rule__ProtocolClass__Group__12__Impl : ( ( rule__ProtocolClass__Group_12__0 )? ) ;
+    // InternalRoom.g:8517:1: rule__ProtocolClass__Group__12__Impl : ( ( rule__ProtocolClass__Group_12__0 )? ) ;
     public final void rule__ProtocolClass__Group__12__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8518:1: ( ( ( rule__ProtocolClass__Group_12__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8519:1: ( ( rule__ProtocolClass__Group_12__0 )? )
+            // InternalRoom.g:8521:1: ( ( ( rule__ProtocolClass__Group_12__0 )? ) )
+            // InternalRoom.g:8522:1: ( ( rule__ProtocolClass__Group_12__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8519:1: ( ( rule__ProtocolClass__Group_12__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8520:1: ( rule__ProtocolClass__Group_12__0 )?
+            // InternalRoom.g:8522:1: ( ( rule__ProtocolClass__Group_12__0 )? )
+            // InternalRoom.g:8523:1: ( rule__ProtocolClass__Group_12__0 )?
             {
              before(grammarAccess.getProtocolClassAccess().getGroup_12()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8521:1: ( rule__ProtocolClass__Group_12__0 )?
+            // InternalRoom.g:8524:1: ( rule__ProtocolClass__Group_12__0 )?
             int alt96=2;
             int LA96_0 = input.LA(1);
 
@@ -24934,9 +24934,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt96) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8521:2: rule__ProtocolClass__Group_12__0
+                    // InternalRoom.g:8524:2: rule__ProtocolClass__Group_12__0
                     {
-                    pushFollow(FOLLOW_rule__ProtocolClass__Group_12__0_in_rule__ProtocolClass__Group__12__Impl17842);
+                    pushFollow(FOLLOW_2);
                     rule__ProtocolClass__Group_12__0();
 
                     state._fsp--;
@@ -24970,21 +24970,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group__13"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8531:1: rule__ProtocolClass__Group__13 : rule__ProtocolClass__Group__13__Impl rule__ProtocolClass__Group__14 ;
+    // InternalRoom.g:8534:1: rule__ProtocolClass__Group__13 : rule__ProtocolClass__Group__13__Impl rule__ProtocolClass__Group__14 ;
     public final void rule__ProtocolClass__Group__13() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8535:1: ( rule__ProtocolClass__Group__13__Impl rule__ProtocolClass__Group__14 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8536:2: rule__ProtocolClass__Group__13__Impl rule__ProtocolClass__Group__14
+            // InternalRoom.g:8538:1: ( rule__ProtocolClass__Group__13__Impl rule__ProtocolClass__Group__14 )
+            // InternalRoom.g:8539:2: rule__ProtocolClass__Group__13__Impl rule__ProtocolClass__Group__14
             {
-            pushFollow(FOLLOW_rule__ProtocolClass__Group__13__Impl_in_rule__ProtocolClass__Group__1317873);
+            pushFollow(FOLLOW_39);
             rule__ProtocolClass__Group__13__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ProtocolClass__Group__14_in_rule__ProtocolClass__Group__1317876);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClass__Group__14();
 
             state._fsp--;
@@ -25008,20 +25008,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group__13__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8543:1: rule__ProtocolClass__Group__13__Impl : ( ( rule__ProtocolClass__Group_13__0 )? ) ;
+    // InternalRoom.g:8546:1: rule__ProtocolClass__Group__13__Impl : ( ( rule__ProtocolClass__Group_13__0 )? ) ;
     public final void rule__ProtocolClass__Group__13__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8547:1: ( ( ( rule__ProtocolClass__Group_13__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8548:1: ( ( rule__ProtocolClass__Group_13__0 )? )
+            // InternalRoom.g:8550:1: ( ( ( rule__ProtocolClass__Group_13__0 )? ) )
+            // InternalRoom.g:8551:1: ( ( rule__ProtocolClass__Group_13__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8548:1: ( ( rule__ProtocolClass__Group_13__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8549:1: ( rule__ProtocolClass__Group_13__0 )?
+            // InternalRoom.g:8551:1: ( ( rule__ProtocolClass__Group_13__0 )? )
+            // InternalRoom.g:8552:1: ( rule__ProtocolClass__Group_13__0 )?
             {
              before(grammarAccess.getProtocolClassAccess().getGroup_13()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8550:1: ( rule__ProtocolClass__Group_13__0 )?
+            // InternalRoom.g:8553:1: ( rule__ProtocolClass__Group_13__0 )?
             int alt97=2;
             int LA97_0 = input.LA(1);
 
@@ -25030,9 +25030,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt97) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8550:2: rule__ProtocolClass__Group_13__0
+                    // InternalRoom.g:8553:2: rule__ProtocolClass__Group_13__0
                     {
-                    pushFollow(FOLLOW_rule__ProtocolClass__Group_13__0_in_rule__ProtocolClass__Group__13__Impl17903);
+                    pushFollow(FOLLOW_2);
                     rule__ProtocolClass__Group_13__0();
 
                     state._fsp--;
@@ -25066,21 +25066,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group__14"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8560:1: rule__ProtocolClass__Group__14 : rule__ProtocolClass__Group__14__Impl rule__ProtocolClass__Group__15 ;
+    // InternalRoom.g:8563:1: rule__ProtocolClass__Group__14 : rule__ProtocolClass__Group__14__Impl rule__ProtocolClass__Group__15 ;
     public final void rule__ProtocolClass__Group__14() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8564:1: ( rule__ProtocolClass__Group__14__Impl rule__ProtocolClass__Group__15 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8565:2: rule__ProtocolClass__Group__14__Impl rule__ProtocolClass__Group__15
+            // InternalRoom.g:8567:1: ( rule__ProtocolClass__Group__14__Impl rule__ProtocolClass__Group__15 )
+            // InternalRoom.g:8568:2: rule__ProtocolClass__Group__14__Impl rule__ProtocolClass__Group__15
             {
-            pushFollow(FOLLOW_rule__ProtocolClass__Group__14__Impl_in_rule__ProtocolClass__Group__1417934);
+            pushFollow(FOLLOW_39);
             rule__ProtocolClass__Group__14__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ProtocolClass__Group__15_in_rule__ProtocolClass__Group__1417937);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClass__Group__15();
 
             state._fsp--;
@@ -25104,20 +25104,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group__14__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8572:1: rule__ProtocolClass__Group__14__Impl : ( ( rule__ProtocolClass__SemanticsAssignment_14 )? ) ;
+    // InternalRoom.g:8575:1: rule__ProtocolClass__Group__14__Impl : ( ( rule__ProtocolClass__SemanticsAssignment_14 )? ) ;
     public final void rule__ProtocolClass__Group__14__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8576:1: ( ( ( rule__ProtocolClass__SemanticsAssignment_14 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8577:1: ( ( rule__ProtocolClass__SemanticsAssignment_14 )? )
+            // InternalRoom.g:8579:1: ( ( ( rule__ProtocolClass__SemanticsAssignment_14 )? ) )
+            // InternalRoom.g:8580:1: ( ( rule__ProtocolClass__SemanticsAssignment_14 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8577:1: ( ( rule__ProtocolClass__SemanticsAssignment_14 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8578:1: ( rule__ProtocolClass__SemanticsAssignment_14 )?
+            // InternalRoom.g:8580:1: ( ( rule__ProtocolClass__SemanticsAssignment_14 )? )
+            // InternalRoom.g:8581:1: ( rule__ProtocolClass__SemanticsAssignment_14 )?
             {
              before(grammarAccess.getProtocolClassAccess().getSemanticsAssignment_14()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8579:1: ( rule__ProtocolClass__SemanticsAssignment_14 )?
+            // InternalRoom.g:8582:1: ( rule__ProtocolClass__SemanticsAssignment_14 )?
             int alt98=2;
             int LA98_0 = input.LA(1);
 
@@ -25126,9 +25126,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt98) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8579:2: rule__ProtocolClass__SemanticsAssignment_14
+                    // InternalRoom.g:8582:2: rule__ProtocolClass__SemanticsAssignment_14
                     {
-                    pushFollow(FOLLOW_rule__ProtocolClass__SemanticsAssignment_14_in_rule__ProtocolClass__Group__14__Impl17964);
+                    pushFollow(FOLLOW_2);
                     rule__ProtocolClass__SemanticsAssignment_14();
 
                     state._fsp--;
@@ -25162,16 +25162,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group__15"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8589:1: rule__ProtocolClass__Group__15 : rule__ProtocolClass__Group__15__Impl ;
+    // InternalRoom.g:8592:1: rule__ProtocolClass__Group__15 : rule__ProtocolClass__Group__15__Impl ;
     public final void rule__ProtocolClass__Group__15() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8593:1: ( rule__ProtocolClass__Group__15__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8594:2: rule__ProtocolClass__Group__15__Impl
+            // InternalRoom.g:8596:1: ( rule__ProtocolClass__Group__15__Impl )
+            // InternalRoom.g:8597:2: rule__ProtocolClass__Group__15__Impl
             {
-            pushFollow(FOLLOW_rule__ProtocolClass__Group__15__Impl_in_rule__ProtocolClass__Group__1517995);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClass__Group__15__Impl();
 
             state._fsp--;
@@ -25195,20 +25195,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group__15__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8600:1: rule__ProtocolClass__Group__15__Impl : ( '}' ) ;
+    // InternalRoom.g:8603:1: rule__ProtocolClass__Group__15__Impl : ( '}' ) ;
     public final void rule__ProtocolClass__Group__15__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8604:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8605:1: ( '}' )
+            // InternalRoom.g:8607:1: ( ( '}' ) )
+            // InternalRoom.g:8608:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8605:1: ( '}' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8606:1: '}'
+            // InternalRoom.g:8608:1: ( '}' )
+            // InternalRoom.g:8609:1: '}'
             {
              before(grammarAccess.getProtocolClassAccess().getRightCurlyBracketKeyword_15()); 
-            match(input,42,FOLLOW_42_in_rule__ProtocolClass__Group__15__Impl18023); 
+            match(input,42,FOLLOW_2); 
              after(grammarAccess.getProtocolClassAccess().getRightCurlyBracketKeyword_15()); 
 
             }
@@ -25232,21 +25232,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group_4__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8651:1: rule__ProtocolClass__Group_4__0 : rule__ProtocolClass__Group_4__0__Impl rule__ProtocolClass__Group_4__1 ;
+    // InternalRoom.g:8654:1: rule__ProtocolClass__Group_4__0 : rule__ProtocolClass__Group_4__0__Impl rule__ProtocolClass__Group_4__1 ;
     public final void rule__ProtocolClass__Group_4__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8655:1: ( rule__ProtocolClass__Group_4__0__Impl rule__ProtocolClass__Group_4__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8656:2: rule__ProtocolClass__Group_4__0__Impl rule__ProtocolClass__Group_4__1
+            // InternalRoom.g:8658:1: ( rule__ProtocolClass__Group_4__0__Impl rule__ProtocolClass__Group_4__1 )
+            // InternalRoom.g:8659:2: rule__ProtocolClass__Group_4__0__Impl rule__ProtocolClass__Group_4__1
             {
-            pushFollow(FOLLOW_rule__ProtocolClass__Group_4__0__Impl_in_rule__ProtocolClass__Group_4__018086);
+            pushFollow(FOLLOW_3);
             rule__ProtocolClass__Group_4__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ProtocolClass__Group_4__1_in_rule__ProtocolClass__Group_4__018089);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClass__Group_4__1();
 
             state._fsp--;
@@ -25270,20 +25270,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group_4__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8663:1: rule__ProtocolClass__Group_4__0__Impl : ( 'extends' ) ;
+    // InternalRoom.g:8666:1: rule__ProtocolClass__Group_4__0__Impl : ( 'extends' ) ;
     public final void rule__ProtocolClass__Group_4__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8667:1: ( ( 'extends' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8668:1: ( 'extends' )
+            // InternalRoom.g:8670:1: ( ( 'extends' ) )
+            // InternalRoom.g:8671:1: ( 'extends' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8668:1: ( 'extends' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8669:1: 'extends'
+            // InternalRoom.g:8671:1: ( 'extends' )
+            // InternalRoom.g:8672:1: 'extends'
             {
              before(grammarAccess.getProtocolClassAccess().getExtendsKeyword_4_0()); 
-            match(input,54,FOLLOW_54_in_rule__ProtocolClass__Group_4__0__Impl18117); 
+            match(input,54,FOLLOW_2); 
              after(grammarAccess.getProtocolClassAccess().getExtendsKeyword_4_0()); 
 
             }
@@ -25307,16 +25307,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group_4__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8682:1: rule__ProtocolClass__Group_4__1 : rule__ProtocolClass__Group_4__1__Impl ;
+    // InternalRoom.g:8685:1: rule__ProtocolClass__Group_4__1 : rule__ProtocolClass__Group_4__1__Impl ;
     public final void rule__ProtocolClass__Group_4__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8686:1: ( rule__ProtocolClass__Group_4__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8687:2: rule__ProtocolClass__Group_4__1__Impl
+            // InternalRoom.g:8689:1: ( rule__ProtocolClass__Group_4__1__Impl )
+            // InternalRoom.g:8690:2: rule__ProtocolClass__Group_4__1__Impl
             {
-            pushFollow(FOLLOW_rule__ProtocolClass__Group_4__1__Impl_in_rule__ProtocolClass__Group_4__118148);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClass__Group_4__1__Impl();
 
             state._fsp--;
@@ -25340,23 +25340,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group_4__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8693:1: rule__ProtocolClass__Group_4__1__Impl : ( ( rule__ProtocolClass__BaseAssignment_4_1 ) ) ;
+    // InternalRoom.g:8696:1: rule__ProtocolClass__Group_4__1__Impl : ( ( rule__ProtocolClass__BaseAssignment_4_1 ) ) ;
     public final void rule__ProtocolClass__Group_4__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8697:1: ( ( ( rule__ProtocolClass__BaseAssignment_4_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8698:1: ( ( rule__ProtocolClass__BaseAssignment_4_1 ) )
+            // InternalRoom.g:8700:1: ( ( ( rule__ProtocolClass__BaseAssignment_4_1 ) ) )
+            // InternalRoom.g:8701:1: ( ( rule__ProtocolClass__BaseAssignment_4_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8698:1: ( ( rule__ProtocolClass__BaseAssignment_4_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8699:1: ( rule__ProtocolClass__BaseAssignment_4_1 )
+            // InternalRoom.g:8701:1: ( ( rule__ProtocolClass__BaseAssignment_4_1 ) )
+            // InternalRoom.g:8702:1: ( rule__ProtocolClass__BaseAssignment_4_1 )
             {
              before(grammarAccess.getProtocolClassAccess().getBaseAssignment_4_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8700:1: ( rule__ProtocolClass__BaseAssignment_4_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8700:2: rule__ProtocolClass__BaseAssignment_4_1
+            // InternalRoom.g:8703:1: ( rule__ProtocolClass__BaseAssignment_4_1 )
+            // InternalRoom.g:8703:2: rule__ProtocolClass__BaseAssignment_4_1
             {
-            pushFollow(FOLLOW_rule__ProtocolClass__BaseAssignment_4_1_in_rule__ProtocolClass__Group_4__1__Impl18175);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClass__BaseAssignment_4_1();
 
             state._fsp--;
@@ -25387,21 +25387,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group_7__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8714:1: rule__ProtocolClass__Group_7__0 : rule__ProtocolClass__Group_7__0__Impl rule__ProtocolClass__Group_7__1 ;
+    // InternalRoom.g:8717:1: rule__ProtocolClass__Group_7__0 : rule__ProtocolClass__Group_7__0__Impl rule__ProtocolClass__Group_7__1 ;
     public final void rule__ProtocolClass__Group_7__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8718:1: ( rule__ProtocolClass__Group_7__0__Impl rule__ProtocolClass__Group_7__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8719:2: rule__ProtocolClass__Group_7__0__Impl rule__ProtocolClass__Group_7__1
+            // InternalRoom.g:8721:1: ( rule__ProtocolClass__Group_7__0__Impl rule__ProtocolClass__Group_7__1 )
+            // InternalRoom.g:8722:2: rule__ProtocolClass__Group_7__0__Impl rule__ProtocolClass__Group_7__1
             {
-            pushFollow(FOLLOW_rule__ProtocolClass__Group_7__0__Impl_in_rule__ProtocolClass__Group_7__018209);
+            pushFollow(FOLLOW_27);
             rule__ProtocolClass__Group_7__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ProtocolClass__Group_7__1_in_rule__ProtocolClass__Group_7__018212);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClass__Group_7__1();
 
             state._fsp--;
@@ -25425,20 +25425,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group_7__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8726:1: rule__ProtocolClass__Group_7__0__Impl : ( 'usercode1' ) ;
+    // InternalRoom.g:8729:1: rule__ProtocolClass__Group_7__0__Impl : ( 'usercode1' ) ;
     public final void rule__ProtocolClass__Group_7__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8730:1: ( ( 'usercode1' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8731:1: ( 'usercode1' )
+            // InternalRoom.g:8733:1: ( ( 'usercode1' ) )
+            // InternalRoom.g:8734:1: ( 'usercode1' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8731:1: ( 'usercode1' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8732:1: 'usercode1'
+            // InternalRoom.g:8734:1: ( 'usercode1' )
+            // InternalRoom.g:8735:1: 'usercode1'
             {
              before(grammarAccess.getProtocolClassAccess().getUsercode1Keyword_7_0()); 
-            match(input,55,FOLLOW_55_in_rule__ProtocolClass__Group_7__0__Impl18240); 
+            match(input,55,FOLLOW_2); 
              after(grammarAccess.getProtocolClassAccess().getUsercode1Keyword_7_0()); 
 
             }
@@ -25462,16 +25462,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group_7__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8745:1: rule__ProtocolClass__Group_7__1 : rule__ProtocolClass__Group_7__1__Impl ;
+    // InternalRoom.g:8748:1: rule__ProtocolClass__Group_7__1 : rule__ProtocolClass__Group_7__1__Impl ;
     public final void rule__ProtocolClass__Group_7__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8749:1: ( rule__ProtocolClass__Group_7__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8750:2: rule__ProtocolClass__Group_7__1__Impl
+            // InternalRoom.g:8752:1: ( rule__ProtocolClass__Group_7__1__Impl )
+            // InternalRoom.g:8753:2: rule__ProtocolClass__Group_7__1__Impl
             {
-            pushFollow(FOLLOW_rule__ProtocolClass__Group_7__1__Impl_in_rule__ProtocolClass__Group_7__118271);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClass__Group_7__1__Impl();
 
             state._fsp--;
@@ -25495,23 +25495,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group_7__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8756:1: rule__ProtocolClass__Group_7__1__Impl : ( ( rule__ProtocolClass__UserCode1Assignment_7_1 ) ) ;
+    // InternalRoom.g:8759:1: rule__ProtocolClass__Group_7__1__Impl : ( ( rule__ProtocolClass__UserCode1Assignment_7_1 ) ) ;
     public final void rule__ProtocolClass__Group_7__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8760:1: ( ( ( rule__ProtocolClass__UserCode1Assignment_7_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8761:1: ( ( rule__ProtocolClass__UserCode1Assignment_7_1 ) )
+            // InternalRoom.g:8763:1: ( ( ( rule__ProtocolClass__UserCode1Assignment_7_1 ) ) )
+            // InternalRoom.g:8764:1: ( ( rule__ProtocolClass__UserCode1Assignment_7_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8761:1: ( ( rule__ProtocolClass__UserCode1Assignment_7_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8762:1: ( rule__ProtocolClass__UserCode1Assignment_7_1 )
+            // InternalRoom.g:8764:1: ( ( rule__ProtocolClass__UserCode1Assignment_7_1 ) )
+            // InternalRoom.g:8765:1: ( rule__ProtocolClass__UserCode1Assignment_7_1 )
             {
              before(grammarAccess.getProtocolClassAccess().getUserCode1Assignment_7_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8763:1: ( rule__ProtocolClass__UserCode1Assignment_7_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8763:2: rule__ProtocolClass__UserCode1Assignment_7_1
+            // InternalRoom.g:8766:1: ( rule__ProtocolClass__UserCode1Assignment_7_1 )
+            // InternalRoom.g:8766:2: rule__ProtocolClass__UserCode1Assignment_7_1
             {
-            pushFollow(FOLLOW_rule__ProtocolClass__UserCode1Assignment_7_1_in_rule__ProtocolClass__Group_7__1__Impl18298);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClass__UserCode1Assignment_7_1();
 
             state._fsp--;
@@ -25542,21 +25542,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group_8__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8777:1: rule__ProtocolClass__Group_8__0 : rule__ProtocolClass__Group_8__0__Impl rule__ProtocolClass__Group_8__1 ;
+    // InternalRoom.g:8780:1: rule__ProtocolClass__Group_8__0 : rule__ProtocolClass__Group_8__0__Impl rule__ProtocolClass__Group_8__1 ;
     public final void rule__ProtocolClass__Group_8__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8781:1: ( rule__ProtocolClass__Group_8__0__Impl rule__ProtocolClass__Group_8__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8782:2: rule__ProtocolClass__Group_8__0__Impl rule__ProtocolClass__Group_8__1
+            // InternalRoom.g:8784:1: ( rule__ProtocolClass__Group_8__0__Impl rule__ProtocolClass__Group_8__1 )
+            // InternalRoom.g:8785:2: rule__ProtocolClass__Group_8__0__Impl rule__ProtocolClass__Group_8__1
             {
-            pushFollow(FOLLOW_rule__ProtocolClass__Group_8__0__Impl_in_rule__ProtocolClass__Group_8__018332);
+            pushFollow(FOLLOW_27);
             rule__ProtocolClass__Group_8__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ProtocolClass__Group_8__1_in_rule__ProtocolClass__Group_8__018335);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClass__Group_8__1();
 
             state._fsp--;
@@ -25580,20 +25580,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group_8__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8789:1: rule__ProtocolClass__Group_8__0__Impl : ( 'usercode2' ) ;
+    // InternalRoom.g:8792:1: rule__ProtocolClass__Group_8__0__Impl : ( 'usercode2' ) ;
     public final void rule__ProtocolClass__Group_8__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8793:1: ( ( 'usercode2' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8794:1: ( 'usercode2' )
+            // InternalRoom.g:8796:1: ( ( 'usercode2' ) )
+            // InternalRoom.g:8797:1: ( 'usercode2' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8794:1: ( 'usercode2' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8795:1: 'usercode2'
+            // InternalRoom.g:8797:1: ( 'usercode2' )
+            // InternalRoom.g:8798:1: 'usercode2'
             {
              before(grammarAccess.getProtocolClassAccess().getUsercode2Keyword_8_0()); 
-            match(input,56,FOLLOW_56_in_rule__ProtocolClass__Group_8__0__Impl18363); 
+            match(input,56,FOLLOW_2); 
              after(grammarAccess.getProtocolClassAccess().getUsercode2Keyword_8_0()); 
 
             }
@@ -25617,16 +25617,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group_8__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8808:1: rule__ProtocolClass__Group_8__1 : rule__ProtocolClass__Group_8__1__Impl ;
+    // InternalRoom.g:8811:1: rule__ProtocolClass__Group_8__1 : rule__ProtocolClass__Group_8__1__Impl ;
     public final void rule__ProtocolClass__Group_8__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8812:1: ( rule__ProtocolClass__Group_8__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8813:2: rule__ProtocolClass__Group_8__1__Impl
+            // InternalRoom.g:8815:1: ( rule__ProtocolClass__Group_8__1__Impl )
+            // InternalRoom.g:8816:2: rule__ProtocolClass__Group_8__1__Impl
             {
-            pushFollow(FOLLOW_rule__ProtocolClass__Group_8__1__Impl_in_rule__ProtocolClass__Group_8__118394);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClass__Group_8__1__Impl();
 
             state._fsp--;
@@ -25650,23 +25650,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group_8__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8819:1: rule__ProtocolClass__Group_8__1__Impl : ( ( rule__ProtocolClass__UserCode2Assignment_8_1 ) ) ;
+    // InternalRoom.g:8822:1: rule__ProtocolClass__Group_8__1__Impl : ( ( rule__ProtocolClass__UserCode2Assignment_8_1 ) ) ;
     public final void rule__ProtocolClass__Group_8__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8823:1: ( ( ( rule__ProtocolClass__UserCode2Assignment_8_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8824:1: ( ( rule__ProtocolClass__UserCode2Assignment_8_1 ) )
+            // InternalRoom.g:8826:1: ( ( ( rule__ProtocolClass__UserCode2Assignment_8_1 ) ) )
+            // InternalRoom.g:8827:1: ( ( rule__ProtocolClass__UserCode2Assignment_8_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8824:1: ( ( rule__ProtocolClass__UserCode2Assignment_8_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8825:1: ( rule__ProtocolClass__UserCode2Assignment_8_1 )
+            // InternalRoom.g:8827:1: ( ( rule__ProtocolClass__UserCode2Assignment_8_1 ) )
+            // InternalRoom.g:8828:1: ( rule__ProtocolClass__UserCode2Assignment_8_1 )
             {
              before(grammarAccess.getProtocolClassAccess().getUserCode2Assignment_8_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8826:1: ( rule__ProtocolClass__UserCode2Assignment_8_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8826:2: rule__ProtocolClass__UserCode2Assignment_8_1
+            // InternalRoom.g:8829:1: ( rule__ProtocolClass__UserCode2Assignment_8_1 )
+            // InternalRoom.g:8829:2: rule__ProtocolClass__UserCode2Assignment_8_1
             {
-            pushFollow(FOLLOW_rule__ProtocolClass__UserCode2Assignment_8_1_in_rule__ProtocolClass__Group_8__1__Impl18421);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClass__UserCode2Assignment_8_1();
 
             state._fsp--;
@@ -25697,21 +25697,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group_9__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8840:1: rule__ProtocolClass__Group_9__0 : rule__ProtocolClass__Group_9__0__Impl rule__ProtocolClass__Group_9__1 ;
+    // InternalRoom.g:8843:1: rule__ProtocolClass__Group_9__0 : rule__ProtocolClass__Group_9__0__Impl rule__ProtocolClass__Group_9__1 ;
     public final void rule__ProtocolClass__Group_9__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8844:1: ( rule__ProtocolClass__Group_9__0__Impl rule__ProtocolClass__Group_9__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8845:2: rule__ProtocolClass__Group_9__0__Impl rule__ProtocolClass__Group_9__1
+            // InternalRoom.g:8847:1: ( rule__ProtocolClass__Group_9__0__Impl rule__ProtocolClass__Group_9__1 )
+            // InternalRoom.g:8848:2: rule__ProtocolClass__Group_9__0__Impl rule__ProtocolClass__Group_9__1
             {
-            pushFollow(FOLLOW_rule__ProtocolClass__Group_9__0__Impl_in_rule__ProtocolClass__Group_9__018455);
+            pushFollow(FOLLOW_27);
             rule__ProtocolClass__Group_9__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ProtocolClass__Group_9__1_in_rule__ProtocolClass__Group_9__018458);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClass__Group_9__1();
 
             state._fsp--;
@@ -25735,20 +25735,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group_9__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8852:1: rule__ProtocolClass__Group_9__0__Impl : ( 'usercode3' ) ;
+    // InternalRoom.g:8855:1: rule__ProtocolClass__Group_9__0__Impl : ( 'usercode3' ) ;
     public final void rule__ProtocolClass__Group_9__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8856:1: ( ( 'usercode3' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8857:1: ( 'usercode3' )
+            // InternalRoom.g:8859:1: ( ( 'usercode3' ) )
+            // InternalRoom.g:8860:1: ( 'usercode3' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8857:1: ( 'usercode3' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8858:1: 'usercode3'
+            // InternalRoom.g:8860:1: ( 'usercode3' )
+            // InternalRoom.g:8861:1: 'usercode3'
             {
              before(grammarAccess.getProtocolClassAccess().getUsercode3Keyword_9_0()); 
-            match(input,57,FOLLOW_57_in_rule__ProtocolClass__Group_9__0__Impl18486); 
+            match(input,57,FOLLOW_2); 
              after(grammarAccess.getProtocolClassAccess().getUsercode3Keyword_9_0()); 
 
             }
@@ -25772,16 +25772,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group_9__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8871:1: rule__ProtocolClass__Group_9__1 : rule__ProtocolClass__Group_9__1__Impl ;
+    // InternalRoom.g:8874:1: rule__ProtocolClass__Group_9__1 : rule__ProtocolClass__Group_9__1__Impl ;
     public final void rule__ProtocolClass__Group_9__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8875:1: ( rule__ProtocolClass__Group_9__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8876:2: rule__ProtocolClass__Group_9__1__Impl
+            // InternalRoom.g:8878:1: ( rule__ProtocolClass__Group_9__1__Impl )
+            // InternalRoom.g:8879:2: rule__ProtocolClass__Group_9__1__Impl
             {
-            pushFollow(FOLLOW_rule__ProtocolClass__Group_9__1__Impl_in_rule__ProtocolClass__Group_9__118517);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClass__Group_9__1__Impl();
 
             state._fsp--;
@@ -25805,23 +25805,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group_9__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8882:1: rule__ProtocolClass__Group_9__1__Impl : ( ( rule__ProtocolClass__UserCode3Assignment_9_1 ) ) ;
+    // InternalRoom.g:8885:1: rule__ProtocolClass__Group_9__1__Impl : ( ( rule__ProtocolClass__UserCode3Assignment_9_1 ) ) ;
     public final void rule__ProtocolClass__Group_9__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8886:1: ( ( ( rule__ProtocolClass__UserCode3Assignment_9_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8887:1: ( ( rule__ProtocolClass__UserCode3Assignment_9_1 ) )
+            // InternalRoom.g:8889:1: ( ( ( rule__ProtocolClass__UserCode3Assignment_9_1 ) ) )
+            // InternalRoom.g:8890:1: ( ( rule__ProtocolClass__UserCode3Assignment_9_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8887:1: ( ( rule__ProtocolClass__UserCode3Assignment_9_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8888:1: ( rule__ProtocolClass__UserCode3Assignment_9_1 )
+            // InternalRoom.g:8890:1: ( ( rule__ProtocolClass__UserCode3Assignment_9_1 ) )
+            // InternalRoom.g:8891:1: ( rule__ProtocolClass__UserCode3Assignment_9_1 )
             {
              before(grammarAccess.getProtocolClassAccess().getUserCode3Assignment_9_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8889:1: ( rule__ProtocolClass__UserCode3Assignment_9_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8889:2: rule__ProtocolClass__UserCode3Assignment_9_1
+            // InternalRoom.g:8892:1: ( rule__ProtocolClass__UserCode3Assignment_9_1 )
+            // InternalRoom.g:8892:2: rule__ProtocolClass__UserCode3Assignment_9_1
             {
-            pushFollow(FOLLOW_rule__ProtocolClass__UserCode3Assignment_9_1_in_rule__ProtocolClass__Group_9__1__Impl18544);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClass__UserCode3Assignment_9_1();
 
             state._fsp--;
@@ -25852,21 +25852,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group_10__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8903:1: rule__ProtocolClass__Group_10__0 : rule__ProtocolClass__Group_10__0__Impl rule__ProtocolClass__Group_10__1 ;
+    // InternalRoom.g:8906:1: rule__ProtocolClass__Group_10__0 : rule__ProtocolClass__Group_10__0__Impl rule__ProtocolClass__Group_10__1 ;
     public final void rule__ProtocolClass__Group_10__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8907:1: ( rule__ProtocolClass__Group_10__0__Impl rule__ProtocolClass__Group_10__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8908:2: rule__ProtocolClass__Group_10__0__Impl rule__ProtocolClass__Group_10__1
+            // InternalRoom.g:8910:1: ( rule__ProtocolClass__Group_10__0__Impl rule__ProtocolClass__Group_10__1 )
+            // InternalRoom.g:8911:2: rule__ProtocolClass__Group_10__0__Impl rule__ProtocolClass__Group_10__1
             {
-            pushFollow(FOLLOW_rule__ProtocolClass__Group_10__0__Impl_in_rule__ProtocolClass__Group_10__018578);
+            pushFollow(FOLLOW_27);
             rule__ProtocolClass__Group_10__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ProtocolClass__Group_10__1_in_rule__ProtocolClass__Group_10__018581);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClass__Group_10__1();
 
             state._fsp--;
@@ -25890,20 +25890,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group_10__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8915:1: rule__ProtocolClass__Group_10__0__Impl : ( 'incoming' ) ;
+    // InternalRoom.g:8918:1: rule__ProtocolClass__Group_10__0__Impl : ( 'incoming' ) ;
     public final void rule__ProtocolClass__Group_10__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8919:1: ( ( 'incoming' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8920:1: ( 'incoming' )
+            // InternalRoom.g:8922:1: ( ( 'incoming' ) )
+            // InternalRoom.g:8923:1: ( 'incoming' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8920:1: ( 'incoming' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8921:1: 'incoming'
+            // InternalRoom.g:8923:1: ( 'incoming' )
+            // InternalRoom.g:8924:1: 'incoming'
             {
              before(grammarAccess.getProtocolClassAccess().getIncomingKeyword_10_0()); 
-            match(input,63,FOLLOW_63_in_rule__ProtocolClass__Group_10__0__Impl18609); 
+            match(input,63,FOLLOW_2); 
              after(grammarAccess.getProtocolClassAccess().getIncomingKeyword_10_0()); 
 
             }
@@ -25927,21 +25927,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group_10__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8934:1: rule__ProtocolClass__Group_10__1 : rule__ProtocolClass__Group_10__1__Impl rule__ProtocolClass__Group_10__2 ;
+    // InternalRoom.g:8937:1: rule__ProtocolClass__Group_10__1 : rule__ProtocolClass__Group_10__1__Impl rule__ProtocolClass__Group_10__2 ;
     public final void rule__ProtocolClass__Group_10__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8938:1: ( rule__ProtocolClass__Group_10__1__Impl rule__ProtocolClass__Group_10__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8939:2: rule__ProtocolClass__Group_10__1__Impl rule__ProtocolClass__Group_10__2
+            // InternalRoom.g:8941:1: ( rule__ProtocolClass__Group_10__1__Impl rule__ProtocolClass__Group_10__2 )
+            // InternalRoom.g:8942:2: rule__ProtocolClass__Group_10__1__Impl rule__ProtocolClass__Group_10__2
             {
-            pushFollow(FOLLOW_rule__ProtocolClass__Group_10__1__Impl_in_rule__ProtocolClass__Group_10__118640);
+            pushFollow(FOLLOW_40);
             rule__ProtocolClass__Group_10__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ProtocolClass__Group_10__2_in_rule__ProtocolClass__Group_10__118643);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClass__Group_10__2();
 
             state._fsp--;
@@ -25965,20 +25965,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group_10__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8946:1: rule__ProtocolClass__Group_10__1__Impl : ( '{' ) ;
+    // InternalRoom.g:8949:1: rule__ProtocolClass__Group_10__1__Impl : ( '{' ) ;
     public final void rule__ProtocolClass__Group_10__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8950:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8951:1: ( '{' )
+            // InternalRoom.g:8953:1: ( ( '{' ) )
+            // InternalRoom.g:8954:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8951:1: ( '{' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8952:1: '{'
+            // InternalRoom.g:8954:1: ( '{' )
+            // InternalRoom.g:8955:1: '{'
             {
              before(grammarAccess.getProtocolClassAccess().getLeftCurlyBracketKeyword_10_1()); 
-            match(input,41,FOLLOW_41_in_rule__ProtocolClass__Group_10__1__Impl18671); 
+            match(input,41,FOLLOW_2); 
              after(grammarAccess.getProtocolClassAccess().getLeftCurlyBracketKeyword_10_1()); 
 
             }
@@ -26002,21 +26002,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group_10__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8965:1: rule__ProtocolClass__Group_10__2 : rule__ProtocolClass__Group_10__2__Impl rule__ProtocolClass__Group_10__3 ;
+    // InternalRoom.g:8968:1: rule__ProtocolClass__Group_10__2 : rule__ProtocolClass__Group_10__2__Impl rule__ProtocolClass__Group_10__3 ;
     public final void rule__ProtocolClass__Group_10__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8969:1: ( rule__ProtocolClass__Group_10__2__Impl rule__ProtocolClass__Group_10__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8970:2: rule__ProtocolClass__Group_10__2__Impl rule__ProtocolClass__Group_10__3
+            // InternalRoom.g:8972:1: ( rule__ProtocolClass__Group_10__2__Impl rule__ProtocolClass__Group_10__3 )
+            // InternalRoom.g:8973:2: rule__ProtocolClass__Group_10__2__Impl rule__ProtocolClass__Group_10__3
             {
-            pushFollow(FOLLOW_rule__ProtocolClass__Group_10__2__Impl_in_rule__ProtocolClass__Group_10__218702);
+            pushFollow(FOLLOW_40);
             rule__ProtocolClass__Group_10__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ProtocolClass__Group_10__3_in_rule__ProtocolClass__Group_10__218705);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClass__Group_10__3();
 
             state._fsp--;
@@ -26040,20 +26040,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group_10__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8977:1: rule__ProtocolClass__Group_10__2__Impl : ( ( rule__ProtocolClass__IncomingMessagesAssignment_10_2 )* ) ;
+    // InternalRoom.g:8980:1: rule__ProtocolClass__Group_10__2__Impl : ( ( rule__ProtocolClass__IncomingMessagesAssignment_10_2 )* ) ;
     public final void rule__ProtocolClass__Group_10__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8981:1: ( ( ( rule__ProtocolClass__IncomingMessagesAssignment_10_2 )* ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8982:1: ( ( rule__ProtocolClass__IncomingMessagesAssignment_10_2 )* )
+            // InternalRoom.g:8984:1: ( ( ( rule__ProtocolClass__IncomingMessagesAssignment_10_2 )* ) )
+            // InternalRoom.g:8985:1: ( ( rule__ProtocolClass__IncomingMessagesAssignment_10_2 )* )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8982:1: ( ( rule__ProtocolClass__IncomingMessagesAssignment_10_2 )* )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8983:1: ( rule__ProtocolClass__IncomingMessagesAssignment_10_2 )*
+            // InternalRoom.g:8985:1: ( ( rule__ProtocolClass__IncomingMessagesAssignment_10_2 )* )
+            // InternalRoom.g:8986:1: ( rule__ProtocolClass__IncomingMessagesAssignment_10_2 )*
             {
              before(grammarAccess.getProtocolClassAccess().getIncomingMessagesAssignment_10_2()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8984:1: ( rule__ProtocolClass__IncomingMessagesAssignment_10_2 )*
+            // InternalRoom.g:8987:1: ( rule__ProtocolClass__IncomingMessagesAssignment_10_2 )*
             loop99:
             do {
                 int alt99=2;
@@ -26066,9 +26066,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
                 switch (alt99) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8984:2: rule__ProtocolClass__IncomingMessagesAssignment_10_2
+            	    // InternalRoom.g:8987:2: rule__ProtocolClass__IncomingMessagesAssignment_10_2
             	    {
-            	    pushFollow(FOLLOW_rule__ProtocolClass__IncomingMessagesAssignment_10_2_in_rule__ProtocolClass__Group_10__2__Impl18732);
+            	    pushFollow(FOLLOW_41);
             	    rule__ProtocolClass__IncomingMessagesAssignment_10_2();
 
             	    state._fsp--;
@@ -26105,16 +26105,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group_10__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8994:1: rule__ProtocolClass__Group_10__3 : rule__ProtocolClass__Group_10__3__Impl ;
+    // InternalRoom.g:8997:1: rule__ProtocolClass__Group_10__3 : rule__ProtocolClass__Group_10__3__Impl ;
     public final void rule__ProtocolClass__Group_10__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8998:1: ( rule__ProtocolClass__Group_10__3__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:8999:2: rule__ProtocolClass__Group_10__3__Impl
+            // InternalRoom.g:9001:1: ( rule__ProtocolClass__Group_10__3__Impl )
+            // InternalRoom.g:9002:2: rule__ProtocolClass__Group_10__3__Impl
             {
-            pushFollow(FOLLOW_rule__ProtocolClass__Group_10__3__Impl_in_rule__ProtocolClass__Group_10__318763);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClass__Group_10__3__Impl();
 
             state._fsp--;
@@ -26138,20 +26138,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group_10__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9005:1: rule__ProtocolClass__Group_10__3__Impl : ( '}' ) ;
+    // InternalRoom.g:9008:1: rule__ProtocolClass__Group_10__3__Impl : ( '}' ) ;
     public final void rule__ProtocolClass__Group_10__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9009:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9010:1: ( '}' )
+            // InternalRoom.g:9012:1: ( ( '}' ) )
+            // InternalRoom.g:9013:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9010:1: ( '}' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9011:1: '}'
+            // InternalRoom.g:9013:1: ( '}' )
+            // InternalRoom.g:9014:1: '}'
             {
              before(grammarAccess.getProtocolClassAccess().getRightCurlyBracketKeyword_10_3()); 
-            match(input,42,FOLLOW_42_in_rule__ProtocolClass__Group_10__3__Impl18791); 
+            match(input,42,FOLLOW_2); 
              after(grammarAccess.getProtocolClassAccess().getRightCurlyBracketKeyword_10_3()); 
 
             }
@@ -26175,21 +26175,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group_11__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9032:1: rule__ProtocolClass__Group_11__0 : rule__ProtocolClass__Group_11__0__Impl rule__ProtocolClass__Group_11__1 ;
+    // InternalRoom.g:9035:1: rule__ProtocolClass__Group_11__0 : rule__ProtocolClass__Group_11__0__Impl rule__ProtocolClass__Group_11__1 ;
     public final void rule__ProtocolClass__Group_11__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9036:1: ( rule__ProtocolClass__Group_11__0__Impl rule__ProtocolClass__Group_11__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9037:2: rule__ProtocolClass__Group_11__0__Impl rule__ProtocolClass__Group_11__1
+            // InternalRoom.g:9039:1: ( rule__ProtocolClass__Group_11__0__Impl rule__ProtocolClass__Group_11__1 )
+            // InternalRoom.g:9040:2: rule__ProtocolClass__Group_11__0__Impl rule__ProtocolClass__Group_11__1
             {
-            pushFollow(FOLLOW_rule__ProtocolClass__Group_11__0__Impl_in_rule__ProtocolClass__Group_11__018830);
+            pushFollow(FOLLOW_27);
             rule__ProtocolClass__Group_11__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ProtocolClass__Group_11__1_in_rule__ProtocolClass__Group_11__018833);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClass__Group_11__1();
 
             state._fsp--;
@@ -26213,20 +26213,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group_11__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9044:1: rule__ProtocolClass__Group_11__0__Impl : ( 'outgoing' ) ;
+    // InternalRoom.g:9047:1: rule__ProtocolClass__Group_11__0__Impl : ( 'outgoing' ) ;
     public final void rule__ProtocolClass__Group_11__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9048:1: ( ( 'outgoing' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9049:1: ( 'outgoing' )
+            // InternalRoom.g:9051:1: ( ( 'outgoing' ) )
+            // InternalRoom.g:9052:1: ( 'outgoing' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9049:1: ( 'outgoing' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9050:1: 'outgoing'
+            // InternalRoom.g:9052:1: ( 'outgoing' )
+            // InternalRoom.g:9053:1: 'outgoing'
             {
              before(grammarAccess.getProtocolClassAccess().getOutgoingKeyword_11_0()); 
-            match(input,64,FOLLOW_64_in_rule__ProtocolClass__Group_11__0__Impl18861); 
+            match(input,64,FOLLOW_2); 
              after(grammarAccess.getProtocolClassAccess().getOutgoingKeyword_11_0()); 
 
             }
@@ -26250,21 +26250,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group_11__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9063:1: rule__ProtocolClass__Group_11__1 : rule__ProtocolClass__Group_11__1__Impl rule__ProtocolClass__Group_11__2 ;
+    // InternalRoom.g:9066:1: rule__ProtocolClass__Group_11__1 : rule__ProtocolClass__Group_11__1__Impl rule__ProtocolClass__Group_11__2 ;
     public final void rule__ProtocolClass__Group_11__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9067:1: ( rule__ProtocolClass__Group_11__1__Impl rule__ProtocolClass__Group_11__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9068:2: rule__ProtocolClass__Group_11__1__Impl rule__ProtocolClass__Group_11__2
+            // InternalRoom.g:9070:1: ( rule__ProtocolClass__Group_11__1__Impl rule__ProtocolClass__Group_11__2 )
+            // InternalRoom.g:9071:2: rule__ProtocolClass__Group_11__1__Impl rule__ProtocolClass__Group_11__2
             {
-            pushFollow(FOLLOW_rule__ProtocolClass__Group_11__1__Impl_in_rule__ProtocolClass__Group_11__118892);
+            pushFollow(FOLLOW_40);
             rule__ProtocolClass__Group_11__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ProtocolClass__Group_11__2_in_rule__ProtocolClass__Group_11__118895);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClass__Group_11__2();
 
             state._fsp--;
@@ -26288,20 +26288,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group_11__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9075:1: rule__ProtocolClass__Group_11__1__Impl : ( '{' ) ;
+    // InternalRoom.g:9078:1: rule__ProtocolClass__Group_11__1__Impl : ( '{' ) ;
     public final void rule__ProtocolClass__Group_11__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9079:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9080:1: ( '{' )
+            // InternalRoom.g:9082:1: ( ( '{' ) )
+            // InternalRoom.g:9083:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9080:1: ( '{' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9081:1: '{'
+            // InternalRoom.g:9083:1: ( '{' )
+            // InternalRoom.g:9084:1: '{'
             {
              before(grammarAccess.getProtocolClassAccess().getLeftCurlyBracketKeyword_11_1()); 
-            match(input,41,FOLLOW_41_in_rule__ProtocolClass__Group_11__1__Impl18923); 
+            match(input,41,FOLLOW_2); 
              after(grammarAccess.getProtocolClassAccess().getLeftCurlyBracketKeyword_11_1()); 
 
             }
@@ -26325,21 +26325,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group_11__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9094:1: rule__ProtocolClass__Group_11__2 : rule__ProtocolClass__Group_11__2__Impl rule__ProtocolClass__Group_11__3 ;
+    // InternalRoom.g:9097:1: rule__ProtocolClass__Group_11__2 : rule__ProtocolClass__Group_11__2__Impl rule__ProtocolClass__Group_11__3 ;
     public final void rule__ProtocolClass__Group_11__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9098:1: ( rule__ProtocolClass__Group_11__2__Impl rule__ProtocolClass__Group_11__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9099:2: rule__ProtocolClass__Group_11__2__Impl rule__ProtocolClass__Group_11__3
+            // InternalRoom.g:9101:1: ( rule__ProtocolClass__Group_11__2__Impl rule__ProtocolClass__Group_11__3 )
+            // InternalRoom.g:9102:2: rule__ProtocolClass__Group_11__2__Impl rule__ProtocolClass__Group_11__3
             {
-            pushFollow(FOLLOW_rule__ProtocolClass__Group_11__2__Impl_in_rule__ProtocolClass__Group_11__218954);
+            pushFollow(FOLLOW_40);
             rule__ProtocolClass__Group_11__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ProtocolClass__Group_11__3_in_rule__ProtocolClass__Group_11__218957);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClass__Group_11__3();
 
             state._fsp--;
@@ -26363,20 +26363,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group_11__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9106:1: rule__ProtocolClass__Group_11__2__Impl : ( ( rule__ProtocolClass__OutgoingMessagesAssignment_11_2 )* ) ;
+    // InternalRoom.g:9109:1: rule__ProtocolClass__Group_11__2__Impl : ( ( rule__ProtocolClass__OutgoingMessagesAssignment_11_2 )* ) ;
     public final void rule__ProtocolClass__Group_11__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9110:1: ( ( ( rule__ProtocolClass__OutgoingMessagesAssignment_11_2 )* ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9111:1: ( ( rule__ProtocolClass__OutgoingMessagesAssignment_11_2 )* )
+            // InternalRoom.g:9113:1: ( ( ( rule__ProtocolClass__OutgoingMessagesAssignment_11_2 )* ) )
+            // InternalRoom.g:9114:1: ( ( rule__ProtocolClass__OutgoingMessagesAssignment_11_2 )* )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9111:1: ( ( rule__ProtocolClass__OutgoingMessagesAssignment_11_2 )* )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9112:1: ( rule__ProtocolClass__OutgoingMessagesAssignment_11_2 )*
+            // InternalRoom.g:9114:1: ( ( rule__ProtocolClass__OutgoingMessagesAssignment_11_2 )* )
+            // InternalRoom.g:9115:1: ( rule__ProtocolClass__OutgoingMessagesAssignment_11_2 )*
             {
              before(grammarAccess.getProtocolClassAccess().getOutgoingMessagesAssignment_11_2()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9113:1: ( rule__ProtocolClass__OutgoingMessagesAssignment_11_2 )*
+            // InternalRoom.g:9116:1: ( rule__ProtocolClass__OutgoingMessagesAssignment_11_2 )*
             loop100:
             do {
                 int alt100=2;
@@ -26389,9 +26389,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
                 switch (alt100) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9113:2: rule__ProtocolClass__OutgoingMessagesAssignment_11_2
+            	    // InternalRoom.g:9116:2: rule__ProtocolClass__OutgoingMessagesAssignment_11_2
             	    {
-            	    pushFollow(FOLLOW_rule__ProtocolClass__OutgoingMessagesAssignment_11_2_in_rule__ProtocolClass__Group_11__2__Impl18984);
+            	    pushFollow(FOLLOW_41);
             	    rule__ProtocolClass__OutgoingMessagesAssignment_11_2();
 
             	    state._fsp--;
@@ -26428,16 +26428,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group_11__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9123:1: rule__ProtocolClass__Group_11__3 : rule__ProtocolClass__Group_11__3__Impl ;
+    // InternalRoom.g:9126:1: rule__ProtocolClass__Group_11__3 : rule__ProtocolClass__Group_11__3__Impl ;
     public final void rule__ProtocolClass__Group_11__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9127:1: ( rule__ProtocolClass__Group_11__3__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9128:2: rule__ProtocolClass__Group_11__3__Impl
+            // InternalRoom.g:9130:1: ( rule__ProtocolClass__Group_11__3__Impl )
+            // InternalRoom.g:9131:2: rule__ProtocolClass__Group_11__3__Impl
             {
-            pushFollow(FOLLOW_rule__ProtocolClass__Group_11__3__Impl_in_rule__ProtocolClass__Group_11__319015);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClass__Group_11__3__Impl();
 
             state._fsp--;
@@ -26461,20 +26461,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group_11__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9134:1: rule__ProtocolClass__Group_11__3__Impl : ( '}' ) ;
+    // InternalRoom.g:9137:1: rule__ProtocolClass__Group_11__3__Impl : ( '}' ) ;
     public final void rule__ProtocolClass__Group_11__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9138:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9139:1: ( '}' )
+            // InternalRoom.g:9141:1: ( ( '}' ) )
+            // InternalRoom.g:9142:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9139:1: ( '}' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9140:1: '}'
+            // InternalRoom.g:9142:1: ( '}' )
+            // InternalRoom.g:9143:1: '}'
             {
              before(grammarAccess.getProtocolClassAccess().getRightCurlyBracketKeyword_11_3()); 
-            match(input,42,FOLLOW_42_in_rule__ProtocolClass__Group_11__3__Impl19043); 
+            match(input,42,FOLLOW_2); 
              after(grammarAccess.getProtocolClassAccess().getRightCurlyBracketKeyword_11_3()); 
 
             }
@@ -26498,21 +26498,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group_12__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9161:1: rule__ProtocolClass__Group_12__0 : rule__ProtocolClass__Group_12__0__Impl rule__ProtocolClass__Group_12__1 ;
+    // InternalRoom.g:9164:1: rule__ProtocolClass__Group_12__0 : rule__ProtocolClass__Group_12__0__Impl rule__ProtocolClass__Group_12__1 ;
     public final void rule__ProtocolClass__Group_12__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9165:1: ( rule__ProtocolClass__Group_12__0__Impl rule__ProtocolClass__Group_12__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9166:2: rule__ProtocolClass__Group_12__0__Impl rule__ProtocolClass__Group_12__1
+            // InternalRoom.g:9168:1: ( rule__ProtocolClass__Group_12__0__Impl rule__ProtocolClass__Group_12__1 )
+            // InternalRoom.g:9169:2: rule__ProtocolClass__Group_12__0__Impl rule__ProtocolClass__Group_12__1
             {
-            pushFollow(FOLLOW_rule__ProtocolClass__Group_12__0__Impl_in_rule__ProtocolClass__Group_12__019082);
+            pushFollow(FOLLOW_42);
             rule__ProtocolClass__Group_12__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ProtocolClass__Group_12__1_in_rule__ProtocolClass__Group_12__019085);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClass__Group_12__1();
 
             state._fsp--;
@@ -26536,20 +26536,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group_12__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9173:1: rule__ProtocolClass__Group_12__0__Impl : ( 'regular' ) ;
+    // InternalRoom.g:9176:1: rule__ProtocolClass__Group_12__0__Impl : ( 'regular' ) ;
     public final void rule__ProtocolClass__Group_12__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9177:1: ( ( 'regular' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9178:1: ( 'regular' )
+            // InternalRoom.g:9180:1: ( ( 'regular' ) )
+            // InternalRoom.g:9181:1: ( 'regular' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9178:1: ( 'regular' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9179:1: 'regular'
+            // InternalRoom.g:9181:1: ( 'regular' )
+            // InternalRoom.g:9182:1: 'regular'
             {
              before(grammarAccess.getProtocolClassAccess().getRegularKeyword_12_0()); 
-            match(input,65,FOLLOW_65_in_rule__ProtocolClass__Group_12__0__Impl19113); 
+            match(input,65,FOLLOW_2); 
              after(grammarAccess.getProtocolClassAccess().getRegularKeyword_12_0()); 
 
             }
@@ -26573,21 +26573,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group_12__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9192:1: rule__ProtocolClass__Group_12__1 : rule__ProtocolClass__Group_12__1__Impl rule__ProtocolClass__Group_12__2 ;
+    // InternalRoom.g:9195:1: rule__ProtocolClass__Group_12__1 : rule__ProtocolClass__Group_12__1__Impl rule__ProtocolClass__Group_12__2 ;
     public final void rule__ProtocolClass__Group_12__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9196:1: ( rule__ProtocolClass__Group_12__1__Impl rule__ProtocolClass__Group_12__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9197:2: rule__ProtocolClass__Group_12__1__Impl rule__ProtocolClass__Group_12__2
+            // InternalRoom.g:9199:1: ( rule__ProtocolClass__Group_12__1__Impl rule__ProtocolClass__Group_12__2 )
+            // InternalRoom.g:9200:2: rule__ProtocolClass__Group_12__1__Impl rule__ProtocolClass__Group_12__2
             {
-            pushFollow(FOLLOW_rule__ProtocolClass__Group_12__1__Impl_in_rule__ProtocolClass__Group_12__119144);
+            pushFollow(FOLLOW_27);
             rule__ProtocolClass__Group_12__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ProtocolClass__Group_12__2_in_rule__ProtocolClass__Group_12__119147);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClass__Group_12__2();
 
             state._fsp--;
@@ -26611,20 +26611,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group_12__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9204:1: rule__ProtocolClass__Group_12__1__Impl : ( 'PortClass' ) ;
+    // InternalRoom.g:9207:1: rule__ProtocolClass__Group_12__1__Impl : ( 'PortClass' ) ;
     public final void rule__ProtocolClass__Group_12__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9208:1: ( ( 'PortClass' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9209:1: ( 'PortClass' )
+            // InternalRoom.g:9211:1: ( ( 'PortClass' ) )
+            // InternalRoom.g:9212:1: ( 'PortClass' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9209:1: ( 'PortClass' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9210:1: 'PortClass'
+            // InternalRoom.g:9212:1: ( 'PortClass' )
+            // InternalRoom.g:9213:1: 'PortClass'
             {
              before(grammarAccess.getProtocolClassAccess().getPortClassKeyword_12_1()); 
-            match(input,66,FOLLOW_66_in_rule__ProtocolClass__Group_12__1__Impl19175); 
+            match(input,66,FOLLOW_2); 
              after(grammarAccess.getProtocolClassAccess().getPortClassKeyword_12_1()); 
 
             }
@@ -26648,16 +26648,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group_12__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9223:1: rule__ProtocolClass__Group_12__2 : rule__ProtocolClass__Group_12__2__Impl ;
+    // InternalRoom.g:9226:1: rule__ProtocolClass__Group_12__2 : rule__ProtocolClass__Group_12__2__Impl ;
     public final void rule__ProtocolClass__Group_12__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9227:1: ( rule__ProtocolClass__Group_12__2__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9228:2: rule__ProtocolClass__Group_12__2__Impl
+            // InternalRoom.g:9230:1: ( rule__ProtocolClass__Group_12__2__Impl )
+            // InternalRoom.g:9231:2: rule__ProtocolClass__Group_12__2__Impl
             {
-            pushFollow(FOLLOW_rule__ProtocolClass__Group_12__2__Impl_in_rule__ProtocolClass__Group_12__219206);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClass__Group_12__2__Impl();
 
             state._fsp--;
@@ -26681,23 +26681,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group_12__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9234:1: rule__ProtocolClass__Group_12__2__Impl : ( ( rule__ProtocolClass__RegularAssignment_12_2 ) ) ;
+    // InternalRoom.g:9237:1: rule__ProtocolClass__Group_12__2__Impl : ( ( rule__ProtocolClass__RegularAssignment_12_2 ) ) ;
     public final void rule__ProtocolClass__Group_12__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9238:1: ( ( ( rule__ProtocolClass__RegularAssignment_12_2 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9239:1: ( ( rule__ProtocolClass__RegularAssignment_12_2 ) )
+            // InternalRoom.g:9241:1: ( ( ( rule__ProtocolClass__RegularAssignment_12_2 ) ) )
+            // InternalRoom.g:9242:1: ( ( rule__ProtocolClass__RegularAssignment_12_2 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9239:1: ( ( rule__ProtocolClass__RegularAssignment_12_2 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9240:1: ( rule__ProtocolClass__RegularAssignment_12_2 )
+            // InternalRoom.g:9242:1: ( ( rule__ProtocolClass__RegularAssignment_12_2 ) )
+            // InternalRoom.g:9243:1: ( rule__ProtocolClass__RegularAssignment_12_2 )
             {
              before(grammarAccess.getProtocolClassAccess().getRegularAssignment_12_2()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9241:1: ( rule__ProtocolClass__RegularAssignment_12_2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9241:2: rule__ProtocolClass__RegularAssignment_12_2
+            // InternalRoom.g:9244:1: ( rule__ProtocolClass__RegularAssignment_12_2 )
+            // InternalRoom.g:9244:2: rule__ProtocolClass__RegularAssignment_12_2
             {
-            pushFollow(FOLLOW_rule__ProtocolClass__RegularAssignment_12_2_in_rule__ProtocolClass__Group_12__2__Impl19233);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClass__RegularAssignment_12_2();
 
             state._fsp--;
@@ -26728,21 +26728,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group_13__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9257:1: rule__ProtocolClass__Group_13__0 : rule__ProtocolClass__Group_13__0__Impl rule__ProtocolClass__Group_13__1 ;
+    // InternalRoom.g:9260:1: rule__ProtocolClass__Group_13__0 : rule__ProtocolClass__Group_13__0__Impl rule__ProtocolClass__Group_13__1 ;
     public final void rule__ProtocolClass__Group_13__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9261:1: ( rule__ProtocolClass__Group_13__0__Impl rule__ProtocolClass__Group_13__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9262:2: rule__ProtocolClass__Group_13__0__Impl rule__ProtocolClass__Group_13__1
+            // InternalRoom.g:9264:1: ( rule__ProtocolClass__Group_13__0__Impl rule__ProtocolClass__Group_13__1 )
+            // InternalRoom.g:9265:2: rule__ProtocolClass__Group_13__0__Impl rule__ProtocolClass__Group_13__1
             {
-            pushFollow(FOLLOW_rule__ProtocolClass__Group_13__0__Impl_in_rule__ProtocolClass__Group_13__019269);
+            pushFollow(FOLLOW_42);
             rule__ProtocolClass__Group_13__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ProtocolClass__Group_13__1_in_rule__ProtocolClass__Group_13__019272);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClass__Group_13__1();
 
             state._fsp--;
@@ -26766,20 +26766,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group_13__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9269:1: rule__ProtocolClass__Group_13__0__Impl : ( 'conjugated' ) ;
+    // InternalRoom.g:9272:1: rule__ProtocolClass__Group_13__0__Impl : ( 'conjugated' ) ;
     public final void rule__ProtocolClass__Group_13__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9273:1: ( ( 'conjugated' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9274:1: ( 'conjugated' )
+            // InternalRoom.g:9276:1: ( ( 'conjugated' ) )
+            // InternalRoom.g:9277:1: ( 'conjugated' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9274:1: ( 'conjugated' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9275:1: 'conjugated'
+            // InternalRoom.g:9277:1: ( 'conjugated' )
+            // InternalRoom.g:9278:1: 'conjugated'
             {
              before(grammarAccess.getProtocolClassAccess().getConjugatedKeyword_13_0()); 
-            match(input,67,FOLLOW_67_in_rule__ProtocolClass__Group_13__0__Impl19300); 
+            match(input,67,FOLLOW_2); 
              after(grammarAccess.getProtocolClassAccess().getConjugatedKeyword_13_0()); 
 
             }
@@ -26803,21 +26803,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group_13__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9288:1: rule__ProtocolClass__Group_13__1 : rule__ProtocolClass__Group_13__1__Impl rule__ProtocolClass__Group_13__2 ;
+    // InternalRoom.g:9291:1: rule__ProtocolClass__Group_13__1 : rule__ProtocolClass__Group_13__1__Impl rule__ProtocolClass__Group_13__2 ;
     public final void rule__ProtocolClass__Group_13__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9292:1: ( rule__ProtocolClass__Group_13__1__Impl rule__ProtocolClass__Group_13__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9293:2: rule__ProtocolClass__Group_13__1__Impl rule__ProtocolClass__Group_13__2
+            // InternalRoom.g:9295:1: ( rule__ProtocolClass__Group_13__1__Impl rule__ProtocolClass__Group_13__2 )
+            // InternalRoom.g:9296:2: rule__ProtocolClass__Group_13__1__Impl rule__ProtocolClass__Group_13__2
             {
-            pushFollow(FOLLOW_rule__ProtocolClass__Group_13__1__Impl_in_rule__ProtocolClass__Group_13__119331);
+            pushFollow(FOLLOW_27);
             rule__ProtocolClass__Group_13__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ProtocolClass__Group_13__2_in_rule__ProtocolClass__Group_13__119334);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClass__Group_13__2();
 
             state._fsp--;
@@ -26841,20 +26841,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group_13__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9300:1: rule__ProtocolClass__Group_13__1__Impl : ( 'PortClass' ) ;
+    // InternalRoom.g:9303:1: rule__ProtocolClass__Group_13__1__Impl : ( 'PortClass' ) ;
     public final void rule__ProtocolClass__Group_13__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9304:1: ( ( 'PortClass' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9305:1: ( 'PortClass' )
+            // InternalRoom.g:9307:1: ( ( 'PortClass' ) )
+            // InternalRoom.g:9308:1: ( 'PortClass' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9305:1: ( 'PortClass' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9306:1: 'PortClass'
+            // InternalRoom.g:9308:1: ( 'PortClass' )
+            // InternalRoom.g:9309:1: 'PortClass'
             {
              before(grammarAccess.getProtocolClassAccess().getPortClassKeyword_13_1()); 
-            match(input,66,FOLLOW_66_in_rule__ProtocolClass__Group_13__1__Impl19362); 
+            match(input,66,FOLLOW_2); 
              after(grammarAccess.getProtocolClassAccess().getPortClassKeyword_13_1()); 
 
             }
@@ -26878,16 +26878,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group_13__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9319:1: rule__ProtocolClass__Group_13__2 : rule__ProtocolClass__Group_13__2__Impl ;
+    // InternalRoom.g:9322:1: rule__ProtocolClass__Group_13__2 : rule__ProtocolClass__Group_13__2__Impl ;
     public final void rule__ProtocolClass__Group_13__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9323:1: ( rule__ProtocolClass__Group_13__2__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9324:2: rule__ProtocolClass__Group_13__2__Impl
+            // InternalRoom.g:9326:1: ( rule__ProtocolClass__Group_13__2__Impl )
+            // InternalRoom.g:9327:2: rule__ProtocolClass__Group_13__2__Impl
             {
-            pushFollow(FOLLOW_rule__ProtocolClass__Group_13__2__Impl_in_rule__ProtocolClass__Group_13__219393);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClass__Group_13__2__Impl();
 
             state._fsp--;
@@ -26911,23 +26911,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__Group_13__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9330:1: rule__ProtocolClass__Group_13__2__Impl : ( ( rule__ProtocolClass__ConjugatedAssignment_13_2 ) ) ;
+    // InternalRoom.g:9333:1: rule__ProtocolClass__Group_13__2__Impl : ( ( rule__ProtocolClass__ConjugatedAssignment_13_2 ) ) ;
     public final void rule__ProtocolClass__Group_13__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9334:1: ( ( ( rule__ProtocolClass__ConjugatedAssignment_13_2 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9335:1: ( ( rule__ProtocolClass__ConjugatedAssignment_13_2 ) )
+            // InternalRoom.g:9337:1: ( ( ( rule__ProtocolClass__ConjugatedAssignment_13_2 ) ) )
+            // InternalRoom.g:9338:1: ( ( rule__ProtocolClass__ConjugatedAssignment_13_2 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9335:1: ( ( rule__ProtocolClass__ConjugatedAssignment_13_2 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9336:1: ( rule__ProtocolClass__ConjugatedAssignment_13_2 )
+            // InternalRoom.g:9338:1: ( ( rule__ProtocolClass__ConjugatedAssignment_13_2 ) )
+            // InternalRoom.g:9339:1: ( rule__ProtocolClass__ConjugatedAssignment_13_2 )
             {
              before(grammarAccess.getProtocolClassAccess().getConjugatedAssignment_13_2()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9337:1: ( rule__ProtocolClass__ConjugatedAssignment_13_2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9337:2: rule__ProtocolClass__ConjugatedAssignment_13_2
+            // InternalRoom.g:9340:1: ( rule__ProtocolClass__ConjugatedAssignment_13_2 )
+            // InternalRoom.g:9340:2: rule__ProtocolClass__ConjugatedAssignment_13_2
             {
-            pushFollow(FOLLOW_rule__ProtocolClass__ConjugatedAssignment_13_2_in_rule__ProtocolClass__Group_13__2__Impl19420);
+            pushFollow(FOLLOW_2);
             rule__ProtocolClass__ConjugatedAssignment_13_2();
 
             state._fsp--;
@@ -26958,21 +26958,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CompoundProtocolClass__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9353:1: rule__CompoundProtocolClass__Group__0 : rule__CompoundProtocolClass__Group__0__Impl rule__CompoundProtocolClass__Group__1 ;
+    // InternalRoom.g:9356:1: rule__CompoundProtocolClass__Group__0 : rule__CompoundProtocolClass__Group__0__Impl rule__CompoundProtocolClass__Group__1 ;
     public final void rule__CompoundProtocolClass__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9357:1: ( rule__CompoundProtocolClass__Group__0__Impl rule__CompoundProtocolClass__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9358:2: rule__CompoundProtocolClass__Group__0__Impl rule__CompoundProtocolClass__Group__1
+            // InternalRoom.g:9360:1: ( rule__CompoundProtocolClass__Group__0__Impl rule__CompoundProtocolClass__Group__1 )
+            // InternalRoom.g:9361:2: rule__CompoundProtocolClass__Group__0__Impl rule__CompoundProtocolClass__Group__1
             {
-            pushFollow(FOLLOW_rule__CompoundProtocolClass__Group__0__Impl_in_rule__CompoundProtocolClass__Group__019456);
+            pushFollow(FOLLOW_3);
             rule__CompoundProtocolClass__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__CompoundProtocolClass__Group__1_in_rule__CompoundProtocolClass__Group__019459);
+            pushFollow(FOLLOW_2);
             rule__CompoundProtocolClass__Group__1();
 
             state._fsp--;
@@ -26996,20 +26996,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CompoundProtocolClass__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9365:1: rule__CompoundProtocolClass__Group__0__Impl : ( 'CompoundProtocolClass' ) ;
+    // InternalRoom.g:9368:1: rule__CompoundProtocolClass__Group__0__Impl : ( 'CompoundProtocolClass' ) ;
     public final void rule__CompoundProtocolClass__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9369:1: ( ( 'CompoundProtocolClass' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9370:1: ( 'CompoundProtocolClass' )
+            // InternalRoom.g:9372:1: ( ( 'CompoundProtocolClass' ) )
+            // InternalRoom.g:9373:1: ( 'CompoundProtocolClass' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9370:1: ( 'CompoundProtocolClass' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9371:1: 'CompoundProtocolClass'
+            // InternalRoom.g:9373:1: ( 'CompoundProtocolClass' )
+            // InternalRoom.g:9374:1: 'CompoundProtocolClass'
             {
              before(grammarAccess.getCompoundProtocolClassAccess().getCompoundProtocolClassKeyword_0()); 
-            match(input,20,FOLLOW_20_in_rule__CompoundProtocolClass__Group__0__Impl19487); 
+            match(input,20,FOLLOW_2); 
              after(grammarAccess.getCompoundProtocolClassAccess().getCompoundProtocolClassKeyword_0()); 
 
             }
@@ -27033,21 +27033,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CompoundProtocolClass__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9384:1: rule__CompoundProtocolClass__Group__1 : rule__CompoundProtocolClass__Group__1__Impl rule__CompoundProtocolClass__Group__2 ;
+    // InternalRoom.g:9387:1: rule__CompoundProtocolClass__Group__1 : rule__CompoundProtocolClass__Group__1__Impl rule__CompoundProtocolClass__Group__2 ;
     public final void rule__CompoundProtocolClass__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9388:1: ( rule__CompoundProtocolClass__Group__1__Impl rule__CompoundProtocolClass__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9389:2: rule__CompoundProtocolClass__Group__1__Impl rule__CompoundProtocolClass__Group__2
+            // InternalRoom.g:9391:1: ( rule__CompoundProtocolClass__Group__1__Impl rule__CompoundProtocolClass__Group__2 )
+            // InternalRoom.g:9392:2: rule__CompoundProtocolClass__Group__1__Impl rule__CompoundProtocolClass__Group__2
             {
-            pushFollow(FOLLOW_rule__CompoundProtocolClass__Group__1__Impl_in_rule__CompoundProtocolClass__Group__119518);
+            pushFollow(FOLLOW_4);
             rule__CompoundProtocolClass__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__CompoundProtocolClass__Group__2_in_rule__CompoundProtocolClass__Group__119521);
+            pushFollow(FOLLOW_2);
             rule__CompoundProtocolClass__Group__2();
 
             state._fsp--;
@@ -27071,23 +27071,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CompoundProtocolClass__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9396:1: rule__CompoundProtocolClass__Group__1__Impl : ( ( rule__CompoundProtocolClass__NameAssignment_1 ) ) ;
+    // InternalRoom.g:9399:1: rule__CompoundProtocolClass__Group__1__Impl : ( ( rule__CompoundProtocolClass__NameAssignment_1 ) ) ;
     public final void rule__CompoundProtocolClass__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9400:1: ( ( ( rule__CompoundProtocolClass__NameAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9401:1: ( ( rule__CompoundProtocolClass__NameAssignment_1 ) )
+            // InternalRoom.g:9403:1: ( ( ( rule__CompoundProtocolClass__NameAssignment_1 ) ) )
+            // InternalRoom.g:9404:1: ( ( rule__CompoundProtocolClass__NameAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9401:1: ( ( rule__CompoundProtocolClass__NameAssignment_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9402:1: ( rule__CompoundProtocolClass__NameAssignment_1 )
+            // InternalRoom.g:9404:1: ( ( rule__CompoundProtocolClass__NameAssignment_1 ) )
+            // InternalRoom.g:9405:1: ( rule__CompoundProtocolClass__NameAssignment_1 )
             {
              before(grammarAccess.getCompoundProtocolClassAccess().getNameAssignment_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9403:1: ( rule__CompoundProtocolClass__NameAssignment_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9403:2: rule__CompoundProtocolClass__NameAssignment_1
+            // InternalRoom.g:9406:1: ( rule__CompoundProtocolClass__NameAssignment_1 )
+            // InternalRoom.g:9406:2: rule__CompoundProtocolClass__NameAssignment_1
             {
-            pushFollow(FOLLOW_rule__CompoundProtocolClass__NameAssignment_1_in_rule__CompoundProtocolClass__Group__1__Impl19548);
+            pushFollow(FOLLOW_2);
             rule__CompoundProtocolClass__NameAssignment_1();
 
             state._fsp--;
@@ -27118,21 +27118,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CompoundProtocolClass__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9413:1: rule__CompoundProtocolClass__Group__2 : rule__CompoundProtocolClass__Group__2__Impl rule__CompoundProtocolClass__Group__3 ;
+    // InternalRoom.g:9416:1: rule__CompoundProtocolClass__Group__2 : rule__CompoundProtocolClass__Group__2__Impl rule__CompoundProtocolClass__Group__3 ;
     public final void rule__CompoundProtocolClass__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9417:1: ( rule__CompoundProtocolClass__Group__2__Impl rule__CompoundProtocolClass__Group__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9418:2: rule__CompoundProtocolClass__Group__2__Impl rule__CompoundProtocolClass__Group__3
+            // InternalRoom.g:9420:1: ( rule__CompoundProtocolClass__Group__2__Impl rule__CompoundProtocolClass__Group__3 )
+            // InternalRoom.g:9421:2: rule__CompoundProtocolClass__Group__2__Impl rule__CompoundProtocolClass__Group__3
             {
-            pushFollow(FOLLOW_rule__CompoundProtocolClass__Group__2__Impl_in_rule__CompoundProtocolClass__Group__219578);
+            pushFollow(FOLLOW_4);
             rule__CompoundProtocolClass__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__CompoundProtocolClass__Group__3_in_rule__CompoundProtocolClass__Group__219581);
+            pushFollow(FOLLOW_2);
             rule__CompoundProtocolClass__Group__3();
 
             state._fsp--;
@@ -27156,20 +27156,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CompoundProtocolClass__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9425:1: rule__CompoundProtocolClass__Group__2__Impl : ( ( rule__CompoundProtocolClass__DocuAssignment_2 )? ) ;
+    // InternalRoom.g:9428:1: rule__CompoundProtocolClass__Group__2__Impl : ( ( rule__CompoundProtocolClass__DocuAssignment_2 )? ) ;
     public final void rule__CompoundProtocolClass__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9429:1: ( ( ( rule__CompoundProtocolClass__DocuAssignment_2 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9430:1: ( ( rule__CompoundProtocolClass__DocuAssignment_2 )? )
+            // InternalRoom.g:9432:1: ( ( ( rule__CompoundProtocolClass__DocuAssignment_2 )? ) )
+            // InternalRoom.g:9433:1: ( ( rule__CompoundProtocolClass__DocuAssignment_2 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9430:1: ( ( rule__CompoundProtocolClass__DocuAssignment_2 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9431:1: ( rule__CompoundProtocolClass__DocuAssignment_2 )?
+            // InternalRoom.g:9433:1: ( ( rule__CompoundProtocolClass__DocuAssignment_2 )? )
+            // InternalRoom.g:9434:1: ( rule__CompoundProtocolClass__DocuAssignment_2 )?
             {
              before(grammarAccess.getCompoundProtocolClassAccess().getDocuAssignment_2()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9432:1: ( rule__CompoundProtocolClass__DocuAssignment_2 )?
+            // InternalRoom.g:9435:1: ( rule__CompoundProtocolClass__DocuAssignment_2 )?
             int alt101=2;
             int LA101_0 = input.LA(1);
 
@@ -27178,9 +27178,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt101) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9432:2: rule__CompoundProtocolClass__DocuAssignment_2
+                    // InternalRoom.g:9435:2: rule__CompoundProtocolClass__DocuAssignment_2
                     {
-                    pushFollow(FOLLOW_rule__CompoundProtocolClass__DocuAssignment_2_in_rule__CompoundProtocolClass__Group__2__Impl19608);
+                    pushFollow(FOLLOW_2);
                     rule__CompoundProtocolClass__DocuAssignment_2();
 
                     state._fsp--;
@@ -27214,21 +27214,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CompoundProtocolClass__Group__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9442:1: rule__CompoundProtocolClass__Group__3 : rule__CompoundProtocolClass__Group__3__Impl rule__CompoundProtocolClass__Group__4 ;
+    // InternalRoom.g:9445:1: rule__CompoundProtocolClass__Group__3 : rule__CompoundProtocolClass__Group__3__Impl rule__CompoundProtocolClass__Group__4 ;
     public final void rule__CompoundProtocolClass__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9446:1: ( rule__CompoundProtocolClass__Group__3__Impl rule__CompoundProtocolClass__Group__4 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9447:2: rule__CompoundProtocolClass__Group__3__Impl rule__CompoundProtocolClass__Group__4
+            // InternalRoom.g:9449:1: ( rule__CompoundProtocolClass__Group__3__Impl rule__CompoundProtocolClass__Group__4 )
+            // InternalRoom.g:9450:2: rule__CompoundProtocolClass__Group__3__Impl rule__CompoundProtocolClass__Group__4
             {
-            pushFollow(FOLLOW_rule__CompoundProtocolClass__Group__3__Impl_in_rule__CompoundProtocolClass__Group__319639);
+            pushFollow(FOLLOW_43);
             rule__CompoundProtocolClass__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__CompoundProtocolClass__Group__4_in_rule__CompoundProtocolClass__Group__319642);
+            pushFollow(FOLLOW_2);
             rule__CompoundProtocolClass__Group__4();
 
             state._fsp--;
@@ -27252,20 +27252,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CompoundProtocolClass__Group__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9454:1: rule__CompoundProtocolClass__Group__3__Impl : ( '{' ) ;
+    // InternalRoom.g:9457:1: rule__CompoundProtocolClass__Group__3__Impl : ( '{' ) ;
     public final void rule__CompoundProtocolClass__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9458:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9459:1: ( '{' )
+            // InternalRoom.g:9461:1: ( ( '{' ) )
+            // InternalRoom.g:9462:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9459:1: ( '{' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9460:1: '{'
+            // InternalRoom.g:9462:1: ( '{' )
+            // InternalRoom.g:9463:1: '{'
             {
              before(grammarAccess.getCompoundProtocolClassAccess().getLeftCurlyBracketKeyword_3()); 
-            match(input,41,FOLLOW_41_in_rule__CompoundProtocolClass__Group__3__Impl19670); 
+            match(input,41,FOLLOW_2); 
              after(grammarAccess.getCompoundProtocolClassAccess().getLeftCurlyBracketKeyword_3()); 
 
             }
@@ -27289,21 +27289,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CompoundProtocolClass__Group__4"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9473:1: rule__CompoundProtocolClass__Group__4 : rule__CompoundProtocolClass__Group__4__Impl rule__CompoundProtocolClass__Group__5 ;
+    // InternalRoom.g:9476:1: rule__CompoundProtocolClass__Group__4 : rule__CompoundProtocolClass__Group__4__Impl rule__CompoundProtocolClass__Group__5 ;
     public final void rule__CompoundProtocolClass__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9477:1: ( rule__CompoundProtocolClass__Group__4__Impl rule__CompoundProtocolClass__Group__5 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9478:2: rule__CompoundProtocolClass__Group__4__Impl rule__CompoundProtocolClass__Group__5
+            // InternalRoom.g:9480:1: ( rule__CompoundProtocolClass__Group__4__Impl rule__CompoundProtocolClass__Group__5 )
+            // InternalRoom.g:9481:2: rule__CompoundProtocolClass__Group__4__Impl rule__CompoundProtocolClass__Group__5
             {
-            pushFollow(FOLLOW_rule__CompoundProtocolClass__Group__4__Impl_in_rule__CompoundProtocolClass__Group__419701);
+            pushFollow(FOLLOW_43);
             rule__CompoundProtocolClass__Group__4__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__CompoundProtocolClass__Group__5_in_rule__CompoundProtocolClass__Group__419704);
+            pushFollow(FOLLOW_2);
             rule__CompoundProtocolClass__Group__5();
 
             state._fsp--;
@@ -27327,20 +27327,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CompoundProtocolClass__Group__4__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9485:1: rule__CompoundProtocolClass__Group__4__Impl : ( ( rule__CompoundProtocolClass__AnnotationsAssignment_4 )* ) ;
+    // InternalRoom.g:9488:1: rule__CompoundProtocolClass__Group__4__Impl : ( ( rule__CompoundProtocolClass__AnnotationsAssignment_4 )* ) ;
     public final void rule__CompoundProtocolClass__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9489:1: ( ( ( rule__CompoundProtocolClass__AnnotationsAssignment_4 )* ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9490:1: ( ( rule__CompoundProtocolClass__AnnotationsAssignment_4 )* )
+            // InternalRoom.g:9492:1: ( ( ( rule__CompoundProtocolClass__AnnotationsAssignment_4 )* ) )
+            // InternalRoom.g:9493:1: ( ( rule__CompoundProtocolClass__AnnotationsAssignment_4 )* )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9490:1: ( ( rule__CompoundProtocolClass__AnnotationsAssignment_4 )* )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9491:1: ( rule__CompoundProtocolClass__AnnotationsAssignment_4 )*
+            // InternalRoom.g:9493:1: ( ( rule__CompoundProtocolClass__AnnotationsAssignment_4 )* )
+            // InternalRoom.g:9494:1: ( rule__CompoundProtocolClass__AnnotationsAssignment_4 )*
             {
              before(grammarAccess.getCompoundProtocolClassAccess().getAnnotationsAssignment_4()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9492:1: ( rule__CompoundProtocolClass__AnnotationsAssignment_4 )*
+            // InternalRoom.g:9495:1: ( rule__CompoundProtocolClass__AnnotationsAssignment_4 )*
             loop102:
             do {
                 int alt102=2;
@@ -27353,9 +27353,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
                 switch (alt102) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9492:2: rule__CompoundProtocolClass__AnnotationsAssignment_4
+            	    // InternalRoom.g:9495:2: rule__CompoundProtocolClass__AnnotationsAssignment_4
             	    {
-            	    pushFollow(FOLLOW_rule__CompoundProtocolClass__AnnotationsAssignment_4_in_rule__CompoundProtocolClass__Group__4__Impl19731);
+            	    pushFollow(FOLLOW_25);
             	    rule__CompoundProtocolClass__AnnotationsAssignment_4();
 
             	    state._fsp--;
@@ -27392,21 +27392,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CompoundProtocolClass__Group__5"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9502:1: rule__CompoundProtocolClass__Group__5 : rule__CompoundProtocolClass__Group__5__Impl rule__CompoundProtocolClass__Group__6 ;
+    // InternalRoom.g:9505:1: rule__CompoundProtocolClass__Group__5 : rule__CompoundProtocolClass__Group__5__Impl rule__CompoundProtocolClass__Group__6 ;
     public final void rule__CompoundProtocolClass__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9506:1: ( rule__CompoundProtocolClass__Group__5__Impl rule__CompoundProtocolClass__Group__6 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9507:2: rule__CompoundProtocolClass__Group__5__Impl rule__CompoundProtocolClass__Group__6
+            // InternalRoom.g:9509:1: ( rule__CompoundProtocolClass__Group__5__Impl rule__CompoundProtocolClass__Group__6 )
+            // InternalRoom.g:9510:2: rule__CompoundProtocolClass__Group__5__Impl rule__CompoundProtocolClass__Group__6
             {
-            pushFollow(FOLLOW_rule__CompoundProtocolClass__Group__5__Impl_in_rule__CompoundProtocolClass__Group__519762);
+            pushFollow(FOLLOW_43);
             rule__CompoundProtocolClass__Group__5__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__CompoundProtocolClass__Group__6_in_rule__CompoundProtocolClass__Group__519765);
+            pushFollow(FOLLOW_2);
             rule__CompoundProtocolClass__Group__6();
 
             state._fsp--;
@@ -27430,20 +27430,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CompoundProtocolClass__Group__5__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9514:1: rule__CompoundProtocolClass__Group__5__Impl : ( ( rule__CompoundProtocolClass__SubProtocolsAssignment_5 )* ) ;
+    // InternalRoom.g:9517:1: rule__CompoundProtocolClass__Group__5__Impl : ( ( rule__CompoundProtocolClass__SubProtocolsAssignment_5 )* ) ;
     public final void rule__CompoundProtocolClass__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9518:1: ( ( ( rule__CompoundProtocolClass__SubProtocolsAssignment_5 )* ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9519:1: ( ( rule__CompoundProtocolClass__SubProtocolsAssignment_5 )* )
+            // InternalRoom.g:9521:1: ( ( ( rule__CompoundProtocolClass__SubProtocolsAssignment_5 )* ) )
+            // InternalRoom.g:9522:1: ( ( rule__CompoundProtocolClass__SubProtocolsAssignment_5 )* )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9519:1: ( ( rule__CompoundProtocolClass__SubProtocolsAssignment_5 )* )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9520:1: ( rule__CompoundProtocolClass__SubProtocolsAssignment_5 )*
+            // InternalRoom.g:9522:1: ( ( rule__CompoundProtocolClass__SubProtocolsAssignment_5 )* )
+            // InternalRoom.g:9523:1: ( rule__CompoundProtocolClass__SubProtocolsAssignment_5 )*
             {
              before(grammarAccess.getCompoundProtocolClassAccess().getSubProtocolsAssignment_5()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9521:1: ( rule__CompoundProtocolClass__SubProtocolsAssignment_5 )*
+            // InternalRoom.g:9524:1: ( rule__CompoundProtocolClass__SubProtocolsAssignment_5 )*
             loop103:
             do {
                 int alt103=2;
@@ -27456,9 +27456,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
                 switch (alt103) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9521:2: rule__CompoundProtocolClass__SubProtocolsAssignment_5
+            	    // InternalRoom.g:9524:2: rule__CompoundProtocolClass__SubProtocolsAssignment_5
             	    {
-            	    pushFollow(FOLLOW_rule__CompoundProtocolClass__SubProtocolsAssignment_5_in_rule__CompoundProtocolClass__Group__5__Impl19792);
+            	    pushFollow(FOLLOW_44);
             	    rule__CompoundProtocolClass__SubProtocolsAssignment_5();
 
             	    state._fsp--;
@@ -27495,16 +27495,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CompoundProtocolClass__Group__6"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9531:1: rule__CompoundProtocolClass__Group__6 : rule__CompoundProtocolClass__Group__6__Impl ;
+    // InternalRoom.g:9534:1: rule__CompoundProtocolClass__Group__6 : rule__CompoundProtocolClass__Group__6__Impl ;
     public final void rule__CompoundProtocolClass__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9535:1: ( rule__CompoundProtocolClass__Group__6__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9536:2: rule__CompoundProtocolClass__Group__6__Impl
+            // InternalRoom.g:9538:1: ( rule__CompoundProtocolClass__Group__6__Impl )
+            // InternalRoom.g:9539:2: rule__CompoundProtocolClass__Group__6__Impl
             {
-            pushFollow(FOLLOW_rule__CompoundProtocolClass__Group__6__Impl_in_rule__CompoundProtocolClass__Group__619823);
+            pushFollow(FOLLOW_2);
             rule__CompoundProtocolClass__Group__6__Impl();
 
             state._fsp--;
@@ -27528,20 +27528,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CompoundProtocolClass__Group__6__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9542:1: rule__CompoundProtocolClass__Group__6__Impl : ( '}' ) ;
+    // InternalRoom.g:9545:1: rule__CompoundProtocolClass__Group__6__Impl : ( '}' ) ;
     public final void rule__CompoundProtocolClass__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9546:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9547:1: ( '}' )
+            // InternalRoom.g:9549:1: ( ( '}' ) )
+            // InternalRoom.g:9550:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9547:1: ( '}' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9548:1: '}'
+            // InternalRoom.g:9550:1: ( '}' )
+            // InternalRoom.g:9551:1: '}'
             {
              before(grammarAccess.getCompoundProtocolClassAccess().getRightCurlyBracketKeyword_6()); 
-            match(input,42,FOLLOW_42_in_rule__CompoundProtocolClass__Group__6__Impl19851); 
+            match(input,42,FOLLOW_2); 
              after(grammarAccess.getCompoundProtocolClassAccess().getRightCurlyBracketKeyword_6()); 
 
             }
@@ -27565,21 +27565,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubProtocol__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9575:1: rule__SubProtocol__Group__0 : rule__SubProtocol__Group__0__Impl rule__SubProtocol__Group__1 ;
+    // InternalRoom.g:9578:1: rule__SubProtocol__Group__0 : rule__SubProtocol__Group__0__Impl rule__SubProtocol__Group__1 ;
     public final void rule__SubProtocol__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9579:1: ( rule__SubProtocol__Group__0__Impl rule__SubProtocol__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9580:2: rule__SubProtocol__Group__0__Impl rule__SubProtocol__Group__1
+            // InternalRoom.g:9582:1: ( rule__SubProtocol__Group__0__Impl rule__SubProtocol__Group__1 )
+            // InternalRoom.g:9583:2: rule__SubProtocol__Group__0__Impl rule__SubProtocol__Group__1
             {
-            pushFollow(FOLLOW_rule__SubProtocol__Group__0__Impl_in_rule__SubProtocol__Group__019896);
+            pushFollow(FOLLOW_3);
             rule__SubProtocol__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SubProtocol__Group__1_in_rule__SubProtocol__Group__019899);
+            pushFollow(FOLLOW_2);
             rule__SubProtocol__Group__1();
 
             state._fsp--;
@@ -27603,20 +27603,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubProtocol__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9587:1: rule__SubProtocol__Group__0__Impl : ( 'SubProtocol' ) ;
+    // InternalRoom.g:9590:1: rule__SubProtocol__Group__0__Impl : ( 'SubProtocol' ) ;
     public final void rule__SubProtocol__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9591:1: ( ( 'SubProtocol' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9592:1: ( 'SubProtocol' )
+            // InternalRoom.g:9594:1: ( ( 'SubProtocol' ) )
+            // InternalRoom.g:9595:1: ( 'SubProtocol' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9592:1: ( 'SubProtocol' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9593:1: 'SubProtocol'
+            // InternalRoom.g:9595:1: ( 'SubProtocol' )
+            // InternalRoom.g:9596:1: 'SubProtocol'
             {
              before(grammarAccess.getSubProtocolAccess().getSubProtocolKeyword_0()); 
-            match(input,68,FOLLOW_68_in_rule__SubProtocol__Group__0__Impl19927); 
+            match(input,68,FOLLOW_2); 
              after(grammarAccess.getSubProtocolAccess().getSubProtocolKeyword_0()); 
 
             }
@@ -27640,21 +27640,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubProtocol__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9606:1: rule__SubProtocol__Group__1 : rule__SubProtocol__Group__1__Impl rule__SubProtocol__Group__2 ;
+    // InternalRoom.g:9609:1: rule__SubProtocol__Group__1 : rule__SubProtocol__Group__1__Impl rule__SubProtocol__Group__2 ;
     public final void rule__SubProtocol__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9610:1: ( rule__SubProtocol__Group__1__Impl rule__SubProtocol__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9611:2: rule__SubProtocol__Group__1__Impl rule__SubProtocol__Group__2
+            // InternalRoom.g:9613:1: ( rule__SubProtocol__Group__1__Impl rule__SubProtocol__Group__2 )
+            // InternalRoom.g:9614:2: rule__SubProtocol__Group__1__Impl rule__SubProtocol__Group__2
             {
-            pushFollow(FOLLOW_rule__SubProtocol__Group__1__Impl_in_rule__SubProtocol__Group__119958);
+            pushFollow(FOLLOW_8);
             rule__SubProtocol__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SubProtocol__Group__2_in_rule__SubProtocol__Group__119961);
+            pushFollow(FOLLOW_2);
             rule__SubProtocol__Group__2();
 
             state._fsp--;
@@ -27678,23 +27678,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubProtocol__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9618:1: rule__SubProtocol__Group__1__Impl : ( ( rule__SubProtocol__NameAssignment_1 ) ) ;
+    // InternalRoom.g:9621:1: rule__SubProtocol__Group__1__Impl : ( ( rule__SubProtocol__NameAssignment_1 ) ) ;
     public final void rule__SubProtocol__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9622:1: ( ( ( rule__SubProtocol__NameAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9623:1: ( ( rule__SubProtocol__NameAssignment_1 ) )
+            // InternalRoom.g:9625:1: ( ( ( rule__SubProtocol__NameAssignment_1 ) ) )
+            // InternalRoom.g:9626:1: ( ( rule__SubProtocol__NameAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9623:1: ( ( rule__SubProtocol__NameAssignment_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9624:1: ( rule__SubProtocol__NameAssignment_1 )
+            // InternalRoom.g:9626:1: ( ( rule__SubProtocol__NameAssignment_1 ) )
+            // InternalRoom.g:9627:1: ( rule__SubProtocol__NameAssignment_1 )
             {
              before(grammarAccess.getSubProtocolAccess().getNameAssignment_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9625:1: ( rule__SubProtocol__NameAssignment_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9625:2: rule__SubProtocol__NameAssignment_1
+            // InternalRoom.g:9628:1: ( rule__SubProtocol__NameAssignment_1 )
+            // InternalRoom.g:9628:2: rule__SubProtocol__NameAssignment_1
             {
-            pushFollow(FOLLOW_rule__SubProtocol__NameAssignment_1_in_rule__SubProtocol__Group__1__Impl19988);
+            pushFollow(FOLLOW_2);
             rule__SubProtocol__NameAssignment_1();
 
             state._fsp--;
@@ -27725,21 +27725,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubProtocol__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9635:1: rule__SubProtocol__Group__2 : rule__SubProtocol__Group__2__Impl rule__SubProtocol__Group__3 ;
+    // InternalRoom.g:9638:1: rule__SubProtocol__Group__2 : rule__SubProtocol__Group__2__Impl rule__SubProtocol__Group__3 ;
     public final void rule__SubProtocol__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9639:1: ( rule__SubProtocol__Group__2__Impl rule__SubProtocol__Group__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9640:2: rule__SubProtocol__Group__2__Impl rule__SubProtocol__Group__3
+            // InternalRoom.g:9642:1: ( rule__SubProtocol__Group__2__Impl rule__SubProtocol__Group__3 )
+            // InternalRoom.g:9643:2: rule__SubProtocol__Group__2__Impl rule__SubProtocol__Group__3
             {
-            pushFollow(FOLLOW_rule__SubProtocol__Group__2__Impl_in_rule__SubProtocol__Group__220018);
+            pushFollow(FOLLOW_3);
             rule__SubProtocol__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SubProtocol__Group__3_in_rule__SubProtocol__Group__220021);
+            pushFollow(FOLLOW_2);
             rule__SubProtocol__Group__3();
 
             state._fsp--;
@@ -27763,20 +27763,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubProtocol__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9647:1: rule__SubProtocol__Group__2__Impl : ( ':' ) ;
+    // InternalRoom.g:9650:1: rule__SubProtocol__Group__2__Impl : ( ':' ) ;
     public final void rule__SubProtocol__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9651:1: ( ( ':' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9652:1: ( ':' )
+            // InternalRoom.g:9654:1: ( ( ':' ) )
+            // InternalRoom.g:9655:1: ( ':' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9652:1: ( ':' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9653:1: ':'
+            // InternalRoom.g:9655:1: ( ':' )
+            // InternalRoom.g:9656:1: ':'
             {
              before(grammarAccess.getSubProtocolAccess().getColonKeyword_2()); 
-            match(input,43,FOLLOW_43_in_rule__SubProtocol__Group__2__Impl20049); 
+            match(input,43,FOLLOW_2); 
              after(grammarAccess.getSubProtocolAccess().getColonKeyword_2()); 
 
             }
@@ -27800,16 +27800,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubProtocol__Group__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9666:1: rule__SubProtocol__Group__3 : rule__SubProtocol__Group__3__Impl ;
+    // InternalRoom.g:9669:1: rule__SubProtocol__Group__3 : rule__SubProtocol__Group__3__Impl ;
     public final void rule__SubProtocol__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9670:1: ( rule__SubProtocol__Group__3__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9671:2: rule__SubProtocol__Group__3__Impl
+            // InternalRoom.g:9673:1: ( rule__SubProtocol__Group__3__Impl )
+            // InternalRoom.g:9674:2: rule__SubProtocol__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__SubProtocol__Group__3__Impl_in_rule__SubProtocol__Group__320080);
+            pushFollow(FOLLOW_2);
             rule__SubProtocol__Group__3__Impl();
 
             state._fsp--;
@@ -27833,23 +27833,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubProtocol__Group__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9677:1: rule__SubProtocol__Group__3__Impl : ( ( rule__SubProtocol__ProtocolAssignment_3 ) ) ;
+    // InternalRoom.g:9680:1: rule__SubProtocol__Group__3__Impl : ( ( rule__SubProtocol__ProtocolAssignment_3 ) ) ;
     public final void rule__SubProtocol__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9681:1: ( ( ( rule__SubProtocol__ProtocolAssignment_3 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9682:1: ( ( rule__SubProtocol__ProtocolAssignment_3 ) )
+            // InternalRoom.g:9684:1: ( ( ( rule__SubProtocol__ProtocolAssignment_3 ) ) )
+            // InternalRoom.g:9685:1: ( ( rule__SubProtocol__ProtocolAssignment_3 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9682:1: ( ( rule__SubProtocol__ProtocolAssignment_3 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9683:1: ( rule__SubProtocol__ProtocolAssignment_3 )
+            // InternalRoom.g:9685:1: ( ( rule__SubProtocol__ProtocolAssignment_3 ) )
+            // InternalRoom.g:9686:1: ( rule__SubProtocol__ProtocolAssignment_3 )
             {
              before(grammarAccess.getSubProtocolAccess().getProtocolAssignment_3()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9684:1: ( rule__SubProtocol__ProtocolAssignment_3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9684:2: rule__SubProtocol__ProtocolAssignment_3
+            // InternalRoom.g:9687:1: ( rule__SubProtocol__ProtocolAssignment_3 )
+            // InternalRoom.g:9687:2: rule__SubProtocol__ProtocolAssignment_3
             {
-            pushFollow(FOLLOW_rule__SubProtocol__ProtocolAssignment_3_in_rule__SubProtocol__Group__3__Impl20107);
+            pushFollow(FOLLOW_2);
             rule__SubProtocol__ProtocolAssignment_3();
 
             state._fsp--;
@@ -27880,21 +27880,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Message__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9702:1: rule__Message__Group__0 : rule__Message__Group__0__Impl rule__Message__Group__1 ;
+    // InternalRoom.g:9705:1: rule__Message__Group__0 : rule__Message__Group__0__Impl rule__Message__Group__1 ;
     public final void rule__Message__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9706:1: ( rule__Message__Group__0__Impl rule__Message__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9707:2: rule__Message__Group__0__Impl rule__Message__Group__1
+            // InternalRoom.g:9709:1: ( rule__Message__Group__0__Impl rule__Message__Group__1 )
+            // InternalRoom.g:9710:2: rule__Message__Group__0__Impl rule__Message__Group__1
             {
-            pushFollow(FOLLOW_rule__Message__Group__0__Impl_in_rule__Message__Group__020145);
+            pushFollow(FOLLOW_45);
             rule__Message__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Message__Group__1_in_rule__Message__Group__020148);
+            pushFollow(FOLLOW_2);
             rule__Message__Group__1();
 
             state._fsp--;
@@ -27918,20 +27918,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Message__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9714:1: rule__Message__Group__0__Impl : ( ( rule__Message__PrivAssignment_0 )? ) ;
+    // InternalRoom.g:9717:1: rule__Message__Group__0__Impl : ( ( rule__Message__PrivAssignment_0 )? ) ;
     public final void rule__Message__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9718:1: ( ( ( rule__Message__PrivAssignment_0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9719:1: ( ( rule__Message__PrivAssignment_0 )? )
+            // InternalRoom.g:9721:1: ( ( ( rule__Message__PrivAssignment_0 )? ) )
+            // InternalRoom.g:9722:1: ( ( rule__Message__PrivAssignment_0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9719:1: ( ( rule__Message__PrivAssignment_0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9720:1: ( rule__Message__PrivAssignment_0 )?
+            // InternalRoom.g:9722:1: ( ( rule__Message__PrivAssignment_0 )? )
+            // InternalRoom.g:9723:1: ( rule__Message__PrivAssignment_0 )?
             {
              before(grammarAccess.getMessageAccess().getPrivAssignment_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9721:1: ( rule__Message__PrivAssignment_0 )?
+            // InternalRoom.g:9724:1: ( rule__Message__PrivAssignment_0 )?
             int alt104=2;
             int LA104_0 = input.LA(1);
 
@@ -27940,9 +27940,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt104) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9721:2: rule__Message__PrivAssignment_0
+                    // InternalRoom.g:9724:2: rule__Message__PrivAssignment_0
                     {
-                    pushFollow(FOLLOW_rule__Message__PrivAssignment_0_in_rule__Message__Group__0__Impl20175);
+                    pushFollow(FOLLOW_2);
                     rule__Message__PrivAssignment_0();
 
                     state._fsp--;
@@ -27976,21 +27976,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Message__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9731:1: rule__Message__Group__1 : rule__Message__Group__1__Impl rule__Message__Group__2 ;
+    // InternalRoom.g:9734:1: rule__Message__Group__1 : rule__Message__Group__1__Impl rule__Message__Group__2 ;
     public final void rule__Message__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9735:1: ( rule__Message__Group__1__Impl rule__Message__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9736:2: rule__Message__Group__1__Impl rule__Message__Group__2
+            // InternalRoom.g:9738:1: ( rule__Message__Group__1__Impl rule__Message__Group__2 )
+            // InternalRoom.g:9739:2: rule__Message__Group__1__Impl rule__Message__Group__2
             {
-            pushFollow(FOLLOW_rule__Message__Group__1__Impl_in_rule__Message__Group__120206);
+            pushFollow(FOLLOW_3);
             rule__Message__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Message__Group__2_in_rule__Message__Group__120209);
+            pushFollow(FOLLOW_2);
             rule__Message__Group__2();
 
             state._fsp--;
@@ -28014,20 +28014,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Message__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9743:1: rule__Message__Group__1__Impl : ( 'Message' ) ;
+    // InternalRoom.g:9746:1: rule__Message__Group__1__Impl : ( 'Message' ) ;
     public final void rule__Message__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9747:1: ( ( 'Message' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9748:1: ( 'Message' )
+            // InternalRoom.g:9750:1: ( ( 'Message' ) )
+            // InternalRoom.g:9751:1: ( 'Message' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9748:1: ( 'Message' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9749:1: 'Message'
+            // InternalRoom.g:9751:1: ( 'Message' )
+            // InternalRoom.g:9752:1: 'Message'
             {
              before(grammarAccess.getMessageAccess().getMessageKeyword_1()); 
-            match(input,69,FOLLOW_69_in_rule__Message__Group__1__Impl20237); 
+            match(input,69,FOLLOW_2); 
              after(grammarAccess.getMessageAccess().getMessageKeyword_1()); 
 
             }
@@ -28051,21 +28051,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Message__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9762:1: rule__Message__Group__2 : rule__Message__Group__2__Impl rule__Message__Group__3 ;
+    // InternalRoom.g:9765:1: rule__Message__Group__2 : rule__Message__Group__2__Impl rule__Message__Group__3 ;
     public final void rule__Message__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9766:1: ( rule__Message__Group__2__Impl rule__Message__Group__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9767:2: rule__Message__Group__2__Impl rule__Message__Group__3
+            // InternalRoom.g:9769:1: ( rule__Message__Group__2__Impl rule__Message__Group__3 )
+            // InternalRoom.g:9770:2: rule__Message__Group__2__Impl rule__Message__Group__3
             {
-            pushFollow(FOLLOW_rule__Message__Group__2__Impl_in_rule__Message__Group__220268);
+            pushFollow(FOLLOW_33);
             rule__Message__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Message__Group__3_in_rule__Message__Group__220271);
+            pushFollow(FOLLOW_2);
             rule__Message__Group__3();
 
             state._fsp--;
@@ -28089,23 +28089,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Message__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9774:1: rule__Message__Group__2__Impl : ( ( rule__Message__NameAssignment_2 ) ) ;
+    // InternalRoom.g:9777:1: rule__Message__Group__2__Impl : ( ( rule__Message__NameAssignment_2 ) ) ;
     public final void rule__Message__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9778:1: ( ( ( rule__Message__NameAssignment_2 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9779:1: ( ( rule__Message__NameAssignment_2 ) )
+            // InternalRoom.g:9781:1: ( ( ( rule__Message__NameAssignment_2 ) ) )
+            // InternalRoom.g:9782:1: ( ( rule__Message__NameAssignment_2 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9779:1: ( ( rule__Message__NameAssignment_2 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9780:1: ( rule__Message__NameAssignment_2 )
+            // InternalRoom.g:9782:1: ( ( rule__Message__NameAssignment_2 ) )
+            // InternalRoom.g:9783:1: ( rule__Message__NameAssignment_2 )
             {
              before(grammarAccess.getMessageAccess().getNameAssignment_2()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9781:1: ( rule__Message__NameAssignment_2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9781:2: rule__Message__NameAssignment_2
+            // InternalRoom.g:9784:1: ( rule__Message__NameAssignment_2 )
+            // InternalRoom.g:9784:2: rule__Message__NameAssignment_2
             {
-            pushFollow(FOLLOW_rule__Message__NameAssignment_2_in_rule__Message__Group__2__Impl20298);
+            pushFollow(FOLLOW_2);
             rule__Message__NameAssignment_2();
 
             state._fsp--;
@@ -28136,21 +28136,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Message__Group__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9791:1: rule__Message__Group__3 : rule__Message__Group__3__Impl rule__Message__Group__4 ;
+    // InternalRoom.g:9794:1: rule__Message__Group__3 : rule__Message__Group__3__Impl rule__Message__Group__4 ;
     public final void rule__Message__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9795:1: ( rule__Message__Group__3__Impl rule__Message__Group__4 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9796:2: rule__Message__Group__3__Impl rule__Message__Group__4
+            // InternalRoom.g:9798:1: ( rule__Message__Group__3__Impl rule__Message__Group__4 )
+            // InternalRoom.g:9799:2: rule__Message__Group__3__Impl rule__Message__Group__4
             {
-            pushFollow(FOLLOW_rule__Message__Group__3__Impl_in_rule__Message__Group__320328);
+            pushFollow(FOLLOW_34);
             rule__Message__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Message__Group__4_in_rule__Message__Group__320331);
+            pushFollow(FOLLOW_2);
             rule__Message__Group__4();
 
             state._fsp--;
@@ -28174,20 +28174,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Message__Group__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9803:1: rule__Message__Group__3__Impl : ( '(' ) ;
+    // InternalRoom.g:9806:1: rule__Message__Group__3__Impl : ( '(' ) ;
     public final void rule__Message__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9807:1: ( ( '(' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9808:1: ( '(' )
+            // InternalRoom.g:9810:1: ( ( '(' ) )
+            // InternalRoom.g:9811:1: ( '(' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9808:1: ( '(' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9809:1: '('
+            // InternalRoom.g:9811:1: ( '(' )
+            // InternalRoom.g:9812:1: '('
             {
              before(grammarAccess.getMessageAccess().getLeftParenthesisKeyword_3()); 
-            match(input,47,FOLLOW_47_in_rule__Message__Group__3__Impl20359); 
+            match(input,47,FOLLOW_2); 
              after(grammarAccess.getMessageAccess().getLeftParenthesisKeyword_3()); 
 
             }
@@ -28211,21 +28211,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Message__Group__4"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9822:1: rule__Message__Group__4 : rule__Message__Group__4__Impl rule__Message__Group__5 ;
+    // InternalRoom.g:9825:1: rule__Message__Group__4 : rule__Message__Group__4__Impl rule__Message__Group__5 ;
     public final void rule__Message__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9826:1: ( rule__Message__Group__4__Impl rule__Message__Group__5 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9827:2: rule__Message__Group__4__Impl rule__Message__Group__5
+            // InternalRoom.g:9829:1: ( rule__Message__Group__4__Impl rule__Message__Group__5 )
+            // InternalRoom.g:9830:2: rule__Message__Group__4__Impl rule__Message__Group__5
             {
-            pushFollow(FOLLOW_rule__Message__Group__4__Impl_in_rule__Message__Group__420390);
+            pushFollow(FOLLOW_34);
             rule__Message__Group__4__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Message__Group__5_in_rule__Message__Group__420393);
+            pushFollow(FOLLOW_2);
             rule__Message__Group__5();
 
             state._fsp--;
@@ -28249,20 +28249,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Message__Group__4__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9834:1: rule__Message__Group__4__Impl : ( ( rule__Message__DataAssignment_4 )? ) ;
+    // InternalRoom.g:9837:1: rule__Message__Group__4__Impl : ( ( rule__Message__DataAssignment_4 )? ) ;
     public final void rule__Message__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9838:1: ( ( ( rule__Message__DataAssignment_4 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9839:1: ( ( rule__Message__DataAssignment_4 )? )
+            // InternalRoom.g:9841:1: ( ( ( rule__Message__DataAssignment_4 )? ) )
+            // InternalRoom.g:9842:1: ( ( rule__Message__DataAssignment_4 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9839:1: ( ( rule__Message__DataAssignment_4 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9840:1: ( rule__Message__DataAssignment_4 )?
+            // InternalRoom.g:9842:1: ( ( rule__Message__DataAssignment_4 )? )
+            // InternalRoom.g:9843:1: ( rule__Message__DataAssignment_4 )?
             {
              before(grammarAccess.getMessageAccess().getDataAssignment_4()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9841:1: ( rule__Message__DataAssignment_4 )?
+            // InternalRoom.g:9844:1: ( rule__Message__DataAssignment_4 )?
             int alt105=2;
             int LA105_0 = input.LA(1);
 
@@ -28271,9 +28271,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt105) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9841:2: rule__Message__DataAssignment_4
+                    // InternalRoom.g:9844:2: rule__Message__DataAssignment_4
                     {
-                    pushFollow(FOLLOW_rule__Message__DataAssignment_4_in_rule__Message__Group__4__Impl20420);
+                    pushFollow(FOLLOW_2);
                     rule__Message__DataAssignment_4();
 
                     state._fsp--;
@@ -28307,21 +28307,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Message__Group__5"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9851:1: rule__Message__Group__5 : rule__Message__Group__5__Impl rule__Message__Group__6 ;
+    // InternalRoom.g:9854:1: rule__Message__Group__5 : rule__Message__Group__5__Impl rule__Message__Group__6 ;
     public final void rule__Message__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9855:1: ( rule__Message__Group__5__Impl rule__Message__Group__6 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9856:2: rule__Message__Group__5__Impl rule__Message__Group__6
+            // InternalRoom.g:9858:1: ( rule__Message__Group__5__Impl rule__Message__Group__6 )
+            // InternalRoom.g:9859:2: rule__Message__Group__5__Impl rule__Message__Group__6
             {
-            pushFollow(FOLLOW_rule__Message__Group__5__Impl_in_rule__Message__Group__520451);
+            pushFollow(FOLLOW_14);
             rule__Message__Group__5__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Message__Group__6_in_rule__Message__Group__520454);
+            pushFollow(FOLLOW_2);
             rule__Message__Group__6();
 
             state._fsp--;
@@ -28345,20 +28345,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Message__Group__5__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9863:1: rule__Message__Group__5__Impl : ( ')' ) ;
+    // InternalRoom.g:9866:1: rule__Message__Group__5__Impl : ( ')' ) ;
     public final void rule__Message__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9867:1: ( ( ')' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9868:1: ( ')' )
+            // InternalRoom.g:9870:1: ( ( ')' ) )
+            // InternalRoom.g:9871:1: ( ')' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9868:1: ( ')' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9869:1: ')'
+            // InternalRoom.g:9871:1: ( ')' )
+            // InternalRoom.g:9872:1: ')'
             {
              before(grammarAccess.getMessageAccess().getRightParenthesisKeyword_5()); 
-            match(input,48,FOLLOW_48_in_rule__Message__Group__5__Impl20482); 
+            match(input,48,FOLLOW_2); 
              after(grammarAccess.getMessageAccess().getRightParenthesisKeyword_5()); 
 
             }
@@ -28382,16 +28382,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Message__Group__6"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9882:1: rule__Message__Group__6 : rule__Message__Group__6__Impl ;
+    // InternalRoom.g:9885:1: rule__Message__Group__6 : rule__Message__Group__6__Impl ;
     public final void rule__Message__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9886:1: ( rule__Message__Group__6__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9887:2: rule__Message__Group__6__Impl
+            // InternalRoom.g:9889:1: ( rule__Message__Group__6__Impl )
+            // InternalRoom.g:9890:2: rule__Message__Group__6__Impl
             {
-            pushFollow(FOLLOW_rule__Message__Group__6__Impl_in_rule__Message__Group__620513);
+            pushFollow(FOLLOW_2);
             rule__Message__Group__6__Impl();
 
             state._fsp--;
@@ -28415,20 +28415,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Message__Group__6__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9893:1: rule__Message__Group__6__Impl : ( ( rule__Message__DocuAssignment_6 )? ) ;
+    // InternalRoom.g:9896:1: rule__Message__Group__6__Impl : ( ( rule__Message__DocuAssignment_6 )? ) ;
     public final void rule__Message__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9897:1: ( ( ( rule__Message__DocuAssignment_6 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9898:1: ( ( rule__Message__DocuAssignment_6 )? )
+            // InternalRoom.g:9900:1: ( ( ( rule__Message__DocuAssignment_6 )? ) )
+            // InternalRoom.g:9901:1: ( ( rule__Message__DocuAssignment_6 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9898:1: ( ( rule__Message__DocuAssignment_6 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9899:1: ( rule__Message__DocuAssignment_6 )?
+            // InternalRoom.g:9901:1: ( ( rule__Message__DocuAssignment_6 )? )
+            // InternalRoom.g:9902:1: ( rule__Message__DocuAssignment_6 )?
             {
              before(grammarAccess.getMessageAccess().getDocuAssignment_6()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9900:1: ( rule__Message__DocuAssignment_6 )?
+            // InternalRoom.g:9903:1: ( rule__Message__DocuAssignment_6 )?
             int alt106=2;
             int LA106_0 = input.LA(1);
 
@@ -28437,9 +28437,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt106) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9900:2: rule__Message__DocuAssignment_6
+                    // InternalRoom.g:9903:2: rule__Message__DocuAssignment_6
                     {
-                    pushFollow(FOLLOW_rule__Message__DocuAssignment_6_in_rule__Message__Group__6__Impl20540);
+                    pushFollow(FOLLOW_2);
                     rule__Message__DocuAssignment_6();
 
                     state._fsp--;
@@ -28473,21 +28473,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortClass__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9924:1: rule__PortClass__Group__0 : rule__PortClass__Group__0__Impl rule__PortClass__Group__1 ;
+    // InternalRoom.g:9927:1: rule__PortClass__Group__0 : rule__PortClass__Group__0__Impl rule__PortClass__Group__1 ;
     public final void rule__PortClass__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9928:1: ( rule__PortClass__Group__0__Impl rule__PortClass__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9929:2: rule__PortClass__Group__0__Impl rule__PortClass__Group__1
+            // InternalRoom.g:9931:1: ( rule__PortClass__Group__0__Impl rule__PortClass__Group__1 )
+            // InternalRoom.g:9932:2: rule__PortClass__Group__0__Impl rule__PortClass__Group__1
             {
-            pushFollow(FOLLOW_rule__PortClass__Group__0__Impl_in_rule__PortClass__Group__020585);
+            pushFollow(FOLLOW_27);
             rule__PortClass__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__PortClass__Group__1_in_rule__PortClass__Group__020588);
+            pushFollow(FOLLOW_2);
             rule__PortClass__Group__1();
 
             state._fsp--;
@@ -28511,21 +28511,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortClass__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9936:1: rule__PortClass__Group__0__Impl : ( () ) ;
+    // InternalRoom.g:9939:1: rule__PortClass__Group__0__Impl : ( () ) ;
     public final void rule__PortClass__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9940:1: ( ( () ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9941:1: ( () )
+            // InternalRoom.g:9943:1: ( ( () ) )
+            // InternalRoom.g:9944:1: ( () )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9941:1: ( () )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9942:1: ()
+            // InternalRoom.g:9944:1: ( () )
+            // InternalRoom.g:9945:1: ()
             {
              before(grammarAccess.getPortClassAccess().getPortClassAction_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9943:1: ()
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9945:1: 
+            // InternalRoom.g:9946:1: ()
+            // InternalRoom.g:9948:1: 
             {
             }
 
@@ -28548,21 +28548,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortClass__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9955:1: rule__PortClass__Group__1 : rule__PortClass__Group__1__Impl rule__PortClass__Group__2 ;
+    // InternalRoom.g:9958:1: rule__PortClass__Group__1 : rule__PortClass__Group__1__Impl rule__PortClass__Group__2 ;
     public final void rule__PortClass__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9959:1: ( rule__PortClass__Group__1__Impl rule__PortClass__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9960:2: rule__PortClass__Group__1__Impl rule__PortClass__Group__2
+            // InternalRoom.g:9962:1: ( rule__PortClass__Group__1__Impl rule__PortClass__Group__2 )
+            // InternalRoom.g:9963:2: rule__PortClass__Group__1__Impl rule__PortClass__Group__2
             {
-            pushFollow(FOLLOW_rule__PortClass__Group__1__Impl_in_rule__PortClass__Group__120646);
+            pushFollow(FOLLOW_46);
             rule__PortClass__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__PortClass__Group__2_in_rule__PortClass__Group__120649);
+            pushFollow(FOLLOW_2);
             rule__PortClass__Group__2();
 
             state._fsp--;
@@ -28586,20 +28586,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortClass__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9967:1: rule__PortClass__Group__1__Impl : ( '{' ) ;
+    // InternalRoom.g:9970:1: rule__PortClass__Group__1__Impl : ( '{' ) ;
     public final void rule__PortClass__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9971:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9972:1: ( '{' )
+            // InternalRoom.g:9974:1: ( ( '{' ) )
+            // InternalRoom.g:9975:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9972:1: ( '{' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9973:1: '{'
+            // InternalRoom.g:9975:1: ( '{' )
+            // InternalRoom.g:9976:1: '{'
             {
              before(grammarAccess.getPortClassAccess().getLeftCurlyBracketKeyword_1()); 
-            match(input,41,FOLLOW_41_in_rule__PortClass__Group__1__Impl20677); 
+            match(input,41,FOLLOW_2); 
              after(grammarAccess.getPortClassAccess().getLeftCurlyBracketKeyword_1()); 
 
             }
@@ -28623,21 +28623,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortClass__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9986:1: rule__PortClass__Group__2 : rule__PortClass__Group__2__Impl rule__PortClass__Group__3 ;
+    // InternalRoom.g:9989:1: rule__PortClass__Group__2 : rule__PortClass__Group__2__Impl rule__PortClass__Group__3 ;
     public final void rule__PortClass__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9990:1: ( rule__PortClass__Group__2__Impl rule__PortClass__Group__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9991:2: rule__PortClass__Group__2__Impl rule__PortClass__Group__3
+            // InternalRoom.g:9993:1: ( rule__PortClass__Group__2__Impl rule__PortClass__Group__3 )
+            // InternalRoom.g:9994:2: rule__PortClass__Group__2__Impl rule__PortClass__Group__3
             {
-            pushFollow(FOLLOW_rule__PortClass__Group__2__Impl_in_rule__PortClass__Group__220708);
+            pushFollow(FOLLOW_46);
             rule__PortClass__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__PortClass__Group__3_in_rule__PortClass__Group__220711);
+            pushFollow(FOLLOW_2);
             rule__PortClass__Group__3();
 
             state._fsp--;
@@ -28661,20 +28661,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortClass__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:9998:1: rule__PortClass__Group__2__Impl : ( ( rule__PortClass__Group_2__0 )? ) ;
+    // InternalRoom.g:10001:1: rule__PortClass__Group__2__Impl : ( ( rule__PortClass__Group_2__0 )? ) ;
     public final void rule__PortClass__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10002:1: ( ( ( rule__PortClass__Group_2__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10003:1: ( ( rule__PortClass__Group_2__0 )? )
+            // InternalRoom.g:10005:1: ( ( ( rule__PortClass__Group_2__0 )? ) )
+            // InternalRoom.g:10006:1: ( ( rule__PortClass__Group_2__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10003:1: ( ( rule__PortClass__Group_2__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10004:1: ( rule__PortClass__Group_2__0 )?
+            // InternalRoom.g:10006:1: ( ( rule__PortClass__Group_2__0 )? )
+            // InternalRoom.g:10007:1: ( rule__PortClass__Group_2__0 )?
             {
              before(grammarAccess.getPortClassAccess().getGroup_2()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10005:1: ( rule__PortClass__Group_2__0 )?
+            // InternalRoom.g:10008:1: ( rule__PortClass__Group_2__0 )?
             int alt107=2;
             int LA107_0 = input.LA(1);
 
@@ -28683,9 +28683,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt107) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10005:2: rule__PortClass__Group_2__0
+                    // InternalRoom.g:10008:2: rule__PortClass__Group_2__0
                     {
-                    pushFollow(FOLLOW_rule__PortClass__Group_2__0_in_rule__PortClass__Group__2__Impl20738);
+                    pushFollow(FOLLOW_2);
                     rule__PortClass__Group_2__0();
 
                     state._fsp--;
@@ -28719,21 +28719,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortClass__Group__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10015:1: rule__PortClass__Group__3 : rule__PortClass__Group__3__Impl rule__PortClass__Group__4 ;
+    // InternalRoom.g:10018:1: rule__PortClass__Group__3 : rule__PortClass__Group__3__Impl rule__PortClass__Group__4 ;
     public final void rule__PortClass__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10019:1: ( rule__PortClass__Group__3__Impl rule__PortClass__Group__4 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10020:2: rule__PortClass__Group__3__Impl rule__PortClass__Group__4
+            // InternalRoom.g:10022:1: ( rule__PortClass__Group__3__Impl rule__PortClass__Group__4 )
+            // InternalRoom.g:10023:2: rule__PortClass__Group__3__Impl rule__PortClass__Group__4
             {
-            pushFollow(FOLLOW_rule__PortClass__Group__3__Impl_in_rule__PortClass__Group__320769);
+            pushFollow(FOLLOW_46);
             rule__PortClass__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__PortClass__Group__4_in_rule__PortClass__Group__320772);
+            pushFollow(FOLLOW_2);
             rule__PortClass__Group__4();
 
             state._fsp--;
@@ -28757,20 +28757,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortClass__Group__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10027:1: rule__PortClass__Group__3__Impl : ( ( rule__PortClass__Alternatives_3 )* ) ;
+    // InternalRoom.g:10030:1: rule__PortClass__Group__3__Impl : ( ( rule__PortClass__Alternatives_3 )* ) ;
     public final void rule__PortClass__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10031:1: ( ( ( rule__PortClass__Alternatives_3 )* ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10032:1: ( ( rule__PortClass__Alternatives_3 )* )
+            // InternalRoom.g:10034:1: ( ( ( rule__PortClass__Alternatives_3 )* ) )
+            // InternalRoom.g:10035:1: ( ( rule__PortClass__Alternatives_3 )* )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10032:1: ( ( rule__PortClass__Alternatives_3 )* )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10033:1: ( rule__PortClass__Alternatives_3 )*
+            // InternalRoom.g:10035:1: ( ( rule__PortClass__Alternatives_3 )* )
+            // InternalRoom.g:10036:1: ( rule__PortClass__Alternatives_3 )*
             {
              before(grammarAccess.getPortClassAccess().getAlternatives_3()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10034:1: ( rule__PortClass__Alternatives_3 )*
+            // InternalRoom.g:10037:1: ( rule__PortClass__Alternatives_3 )*
             loop108:
             do {
                 int alt108=2;
@@ -28783,9 +28783,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
                 switch (alt108) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10034:2: rule__PortClass__Alternatives_3
+            	    // InternalRoom.g:10037:2: rule__PortClass__Alternatives_3
             	    {
-            	    pushFollow(FOLLOW_rule__PortClass__Alternatives_3_in_rule__PortClass__Group__3__Impl20799);
+            	    pushFollow(FOLLOW_47);
             	    rule__PortClass__Alternatives_3();
 
             	    state._fsp--;
@@ -28822,16 +28822,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortClass__Group__4"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10044:1: rule__PortClass__Group__4 : rule__PortClass__Group__4__Impl ;
+    // InternalRoom.g:10047:1: rule__PortClass__Group__4 : rule__PortClass__Group__4__Impl ;
     public final void rule__PortClass__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10048:1: ( rule__PortClass__Group__4__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10049:2: rule__PortClass__Group__4__Impl
+            // InternalRoom.g:10051:1: ( rule__PortClass__Group__4__Impl )
+            // InternalRoom.g:10052:2: rule__PortClass__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__PortClass__Group__4__Impl_in_rule__PortClass__Group__420830);
+            pushFollow(FOLLOW_2);
             rule__PortClass__Group__4__Impl();
 
             state._fsp--;
@@ -28855,20 +28855,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortClass__Group__4__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10055:1: rule__PortClass__Group__4__Impl : ( '}' ) ;
+    // InternalRoom.g:10058:1: rule__PortClass__Group__4__Impl : ( '}' ) ;
     public final void rule__PortClass__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10059:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10060:1: ( '}' )
+            // InternalRoom.g:10062:1: ( ( '}' ) )
+            // InternalRoom.g:10063:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10060:1: ( '}' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10061:1: '}'
+            // InternalRoom.g:10063:1: ( '}' )
+            // InternalRoom.g:10064:1: '}'
             {
              before(grammarAccess.getPortClassAccess().getRightCurlyBracketKeyword_4()); 
-            match(input,42,FOLLOW_42_in_rule__PortClass__Group__4__Impl20858); 
+            match(input,42,FOLLOW_2); 
              after(grammarAccess.getPortClassAccess().getRightCurlyBracketKeyword_4()); 
 
             }
@@ -28892,21 +28892,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortClass__Group_2__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10084:1: rule__PortClass__Group_2__0 : rule__PortClass__Group_2__0__Impl rule__PortClass__Group_2__1 ;
+    // InternalRoom.g:10087:1: rule__PortClass__Group_2__0 : rule__PortClass__Group_2__0__Impl rule__PortClass__Group_2__1 ;
     public final void rule__PortClass__Group_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10088:1: ( rule__PortClass__Group_2__0__Impl rule__PortClass__Group_2__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10089:2: rule__PortClass__Group_2__0__Impl rule__PortClass__Group_2__1
+            // InternalRoom.g:10091:1: ( rule__PortClass__Group_2__0__Impl rule__PortClass__Group_2__1 )
+            // InternalRoom.g:10092:2: rule__PortClass__Group_2__0__Impl rule__PortClass__Group_2__1
             {
-            pushFollow(FOLLOW_rule__PortClass__Group_2__0__Impl_in_rule__PortClass__Group_2__020899);
+            pushFollow(FOLLOW_27);
             rule__PortClass__Group_2__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__PortClass__Group_2__1_in_rule__PortClass__Group_2__020902);
+            pushFollow(FOLLOW_2);
             rule__PortClass__Group_2__1();
 
             state._fsp--;
@@ -28930,20 +28930,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortClass__Group_2__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10096:1: rule__PortClass__Group_2__0__Impl : ( 'usercode' ) ;
+    // InternalRoom.g:10099:1: rule__PortClass__Group_2__0__Impl : ( 'usercode' ) ;
     public final void rule__PortClass__Group_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10100:1: ( ( 'usercode' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10101:1: ( 'usercode' )
+            // InternalRoom.g:10103:1: ( ( 'usercode' ) )
+            // InternalRoom.g:10104:1: ( 'usercode' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10101:1: ( 'usercode' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10102:1: 'usercode'
+            // InternalRoom.g:10104:1: ( 'usercode' )
+            // InternalRoom.g:10105:1: 'usercode'
             {
              before(grammarAccess.getPortClassAccess().getUsercodeKeyword_2_0()); 
-            match(input,70,FOLLOW_70_in_rule__PortClass__Group_2__0__Impl20930); 
+            match(input,70,FOLLOW_2); 
              after(grammarAccess.getPortClassAccess().getUsercodeKeyword_2_0()); 
 
             }
@@ -28967,16 +28967,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortClass__Group_2__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10115:1: rule__PortClass__Group_2__1 : rule__PortClass__Group_2__1__Impl ;
+    // InternalRoom.g:10118:1: rule__PortClass__Group_2__1 : rule__PortClass__Group_2__1__Impl ;
     public final void rule__PortClass__Group_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10119:1: ( rule__PortClass__Group_2__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10120:2: rule__PortClass__Group_2__1__Impl
+            // InternalRoom.g:10122:1: ( rule__PortClass__Group_2__1__Impl )
+            // InternalRoom.g:10123:2: rule__PortClass__Group_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__PortClass__Group_2__1__Impl_in_rule__PortClass__Group_2__120961);
+            pushFollow(FOLLOW_2);
             rule__PortClass__Group_2__1__Impl();
 
             state._fsp--;
@@ -29000,23 +29000,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortClass__Group_2__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10126:1: rule__PortClass__Group_2__1__Impl : ( ( rule__PortClass__UserCodeAssignment_2_1 ) ) ;
+    // InternalRoom.g:10129:1: rule__PortClass__Group_2__1__Impl : ( ( rule__PortClass__UserCodeAssignment_2_1 ) ) ;
     public final void rule__PortClass__Group_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10130:1: ( ( ( rule__PortClass__UserCodeAssignment_2_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10131:1: ( ( rule__PortClass__UserCodeAssignment_2_1 ) )
+            // InternalRoom.g:10133:1: ( ( ( rule__PortClass__UserCodeAssignment_2_1 ) ) )
+            // InternalRoom.g:10134:1: ( ( rule__PortClass__UserCodeAssignment_2_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10131:1: ( ( rule__PortClass__UserCodeAssignment_2_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10132:1: ( rule__PortClass__UserCodeAssignment_2_1 )
+            // InternalRoom.g:10134:1: ( ( rule__PortClass__UserCodeAssignment_2_1 ) )
+            // InternalRoom.g:10135:1: ( rule__PortClass__UserCodeAssignment_2_1 )
             {
              before(grammarAccess.getPortClassAccess().getUserCodeAssignment_2_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10133:1: ( rule__PortClass__UserCodeAssignment_2_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10133:2: rule__PortClass__UserCodeAssignment_2_1
+            // InternalRoom.g:10136:1: ( rule__PortClass__UserCodeAssignment_2_1 )
+            // InternalRoom.g:10136:2: rule__PortClass__UserCodeAssignment_2_1
             {
-            pushFollow(FOLLOW_rule__PortClass__UserCodeAssignment_2_1_in_rule__PortClass__Group_2__1__Impl20988);
+            pushFollow(FOLLOW_2);
             rule__PortClass__UserCodeAssignment_2_1();
 
             state._fsp--;
@@ -29047,21 +29047,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InMessageHandler__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10147:1: rule__InMessageHandler__Group__0 : rule__InMessageHandler__Group__0__Impl rule__InMessageHandler__Group__1 ;
+    // InternalRoom.g:10150:1: rule__InMessageHandler__Group__0 : rule__InMessageHandler__Group__0__Impl rule__InMessageHandler__Group__1 ;
     public final void rule__InMessageHandler__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10151:1: ( rule__InMessageHandler__Group__0__Impl rule__InMessageHandler__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10152:2: rule__InMessageHandler__Group__0__Impl rule__InMessageHandler__Group__1
+            // InternalRoom.g:10154:1: ( rule__InMessageHandler__Group__0__Impl rule__InMessageHandler__Group__1 )
+            // InternalRoom.g:10155:2: rule__InMessageHandler__Group__0__Impl rule__InMessageHandler__Group__1
             {
-            pushFollow(FOLLOW_rule__InMessageHandler__Group__0__Impl_in_rule__InMessageHandler__Group__021022);
+            pushFollow(FOLLOW_48);
             rule__InMessageHandler__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__InMessageHandler__Group__1_in_rule__InMessageHandler__Group__021025);
+            pushFollow(FOLLOW_2);
             rule__InMessageHandler__Group__1();
 
             state._fsp--;
@@ -29085,20 +29085,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InMessageHandler__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10159:1: rule__InMessageHandler__Group__0__Impl : ( 'handle' ) ;
+    // InternalRoom.g:10162:1: rule__InMessageHandler__Group__0__Impl : ( 'handle' ) ;
     public final void rule__InMessageHandler__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10163:1: ( ( 'handle' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10164:1: ( 'handle' )
+            // InternalRoom.g:10166:1: ( ( 'handle' ) )
+            // InternalRoom.g:10167:1: ( 'handle' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10164:1: ( 'handle' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10165:1: 'handle'
+            // InternalRoom.g:10167:1: ( 'handle' )
+            // InternalRoom.g:10168:1: 'handle'
             {
              before(grammarAccess.getInMessageHandlerAccess().getHandleKeyword_0()); 
-            match(input,71,FOLLOW_71_in_rule__InMessageHandler__Group__0__Impl21053); 
+            match(input,71,FOLLOW_2); 
              after(grammarAccess.getInMessageHandlerAccess().getHandleKeyword_0()); 
 
             }
@@ -29122,21 +29122,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InMessageHandler__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10178:1: rule__InMessageHandler__Group__1 : rule__InMessageHandler__Group__1__Impl rule__InMessageHandler__Group__2 ;
+    // InternalRoom.g:10181:1: rule__InMessageHandler__Group__1 : rule__InMessageHandler__Group__1__Impl rule__InMessageHandler__Group__2 ;
     public final void rule__InMessageHandler__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10182:1: ( rule__InMessageHandler__Group__1__Impl rule__InMessageHandler__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10183:2: rule__InMessageHandler__Group__1__Impl rule__InMessageHandler__Group__2
+            // InternalRoom.g:10185:1: ( rule__InMessageHandler__Group__1__Impl rule__InMessageHandler__Group__2 )
+            // InternalRoom.g:10186:2: rule__InMessageHandler__Group__1__Impl rule__InMessageHandler__Group__2
             {
-            pushFollow(FOLLOW_rule__InMessageHandler__Group__1__Impl_in_rule__InMessageHandler__Group__121084);
+            pushFollow(FOLLOW_3);
             rule__InMessageHandler__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__InMessageHandler__Group__2_in_rule__InMessageHandler__Group__121087);
+            pushFollow(FOLLOW_2);
             rule__InMessageHandler__Group__2();
 
             state._fsp--;
@@ -29160,20 +29160,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InMessageHandler__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10190:1: rule__InMessageHandler__Group__1__Impl : ( 'incoming' ) ;
+    // InternalRoom.g:10193:1: rule__InMessageHandler__Group__1__Impl : ( 'incoming' ) ;
     public final void rule__InMessageHandler__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10194:1: ( ( 'incoming' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10195:1: ( 'incoming' )
+            // InternalRoom.g:10197:1: ( ( 'incoming' ) )
+            // InternalRoom.g:10198:1: ( 'incoming' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10195:1: ( 'incoming' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10196:1: 'incoming'
+            // InternalRoom.g:10198:1: ( 'incoming' )
+            // InternalRoom.g:10199:1: 'incoming'
             {
              before(grammarAccess.getInMessageHandlerAccess().getIncomingKeyword_1()); 
-            match(input,63,FOLLOW_63_in_rule__InMessageHandler__Group__1__Impl21115); 
+            match(input,63,FOLLOW_2); 
              after(grammarAccess.getInMessageHandlerAccess().getIncomingKeyword_1()); 
 
             }
@@ -29197,21 +29197,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InMessageHandler__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10209:1: rule__InMessageHandler__Group__2 : rule__InMessageHandler__Group__2__Impl rule__InMessageHandler__Group__3 ;
+    // InternalRoom.g:10212:1: rule__InMessageHandler__Group__2 : rule__InMessageHandler__Group__2__Impl rule__InMessageHandler__Group__3 ;
     public final void rule__InMessageHandler__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10213:1: ( rule__InMessageHandler__Group__2__Impl rule__InMessageHandler__Group__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10214:2: rule__InMessageHandler__Group__2__Impl rule__InMessageHandler__Group__3
+            // InternalRoom.g:10216:1: ( rule__InMessageHandler__Group__2__Impl rule__InMessageHandler__Group__3 )
+            // InternalRoom.g:10217:2: rule__InMessageHandler__Group__2__Impl rule__InMessageHandler__Group__3
             {
-            pushFollow(FOLLOW_rule__InMessageHandler__Group__2__Impl_in_rule__InMessageHandler__Group__221146);
+            pushFollow(FOLLOW_27);
             rule__InMessageHandler__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__InMessageHandler__Group__3_in_rule__InMessageHandler__Group__221149);
+            pushFollow(FOLLOW_2);
             rule__InMessageHandler__Group__3();
 
             state._fsp--;
@@ -29235,23 +29235,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InMessageHandler__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10221:1: rule__InMessageHandler__Group__2__Impl : ( ( rule__InMessageHandler__MsgAssignment_2 ) ) ;
+    // InternalRoom.g:10224:1: rule__InMessageHandler__Group__2__Impl : ( ( rule__InMessageHandler__MsgAssignment_2 ) ) ;
     public final void rule__InMessageHandler__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10225:1: ( ( ( rule__InMessageHandler__MsgAssignment_2 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10226:1: ( ( rule__InMessageHandler__MsgAssignment_2 ) )
+            // InternalRoom.g:10228:1: ( ( ( rule__InMessageHandler__MsgAssignment_2 ) ) )
+            // InternalRoom.g:10229:1: ( ( rule__InMessageHandler__MsgAssignment_2 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10226:1: ( ( rule__InMessageHandler__MsgAssignment_2 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10227:1: ( rule__InMessageHandler__MsgAssignment_2 )
+            // InternalRoom.g:10229:1: ( ( rule__InMessageHandler__MsgAssignment_2 ) )
+            // InternalRoom.g:10230:1: ( rule__InMessageHandler__MsgAssignment_2 )
             {
              before(grammarAccess.getInMessageHandlerAccess().getMsgAssignment_2()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10228:1: ( rule__InMessageHandler__MsgAssignment_2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10228:2: rule__InMessageHandler__MsgAssignment_2
+            // InternalRoom.g:10231:1: ( rule__InMessageHandler__MsgAssignment_2 )
+            // InternalRoom.g:10231:2: rule__InMessageHandler__MsgAssignment_2
             {
-            pushFollow(FOLLOW_rule__InMessageHandler__MsgAssignment_2_in_rule__InMessageHandler__Group__2__Impl21176);
+            pushFollow(FOLLOW_2);
             rule__InMessageHandler__MsgAssignment_2();
 
             state._fsp--;
@@ -29282,16 +29282,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InMessageHandler__Group__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10238:1: rule__InMessageHandler__Group__3 : rule__InMessageHandler__Group__3__Impl ;
+    // InternalRoom.g:10241:1: rule__InMessageHandler__Group__3 : rule__InMessageHandler__Group__3__Impl ;
     public final void rule__InMessageHandler__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10242:1: ( rule__InMessageHandler__Group__3__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10243:2: rule__InMessageHandler__Group__3__Impl
+            // InternalRoom.g:10245:1: ( rule__InMessageHandler__Group__3__Impl )
+            // InternalRoom.g:10246:2: rule__InMessageHandler__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__InMessageHandler__Group__3__Impl_in_rule__InMessageHandler__Group__321206);
+            pushFollow(FOLLOW_2);
             rule__InMessageHandler__Group__3__Impl();
 
             state._fsp--;
@@ -29315,23 +29315,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InMessageHandler__Group__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10249:1: rule__InMessageHandler__Group__3__Impl : ( ( rule__InMessageHandler__DetailCodeAssignment_3 ) ) ;
+    // InternalRoom.g:10252:1: rule__InMessageHandler__Group__3__Impl : ( ( rule__InMessageHandler__DetailCodeAssignment_3 ) ) ;
     public final void rule__InMessageHandler__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10253:1: ( ( ( rule__InMessageHandler__DetailCodeAssignment_3 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10254:1: ( ( rule__InMessageHandler__DetailCodeAssignment_3 ) )
+            // InternalRoom.g:10256:1: ( ( ( rule__InMessageHandler__DetailCodeAssignment_3 ) ) )
+            // InternalRoom.g:10257:1: ( ( rule__InMessageHandler__DetailCodeAssignment_3 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10254:1: ( ( rule__InMessageHandler__DetailCodeAssignment_3 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10255:1: ( rule__InMessageHandler__DetailCodeAssignment_3 )
+            // InternalRoom.g:10257:1: ( ( rule__InMessageHandler__DetailCodeAssignment_3 ) )
+            // InternalRoom.g:10258:1: ( rule__InMessageHandler__DetailCodeAssignment_3 )
             {
              before(grammarAccess.getInMessageHandlerAccess().getDetailCodeAssignment_3()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10256:1: ( rule__InMessageHandler__DetailCodeAssignment_3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10256:2: rule__InMessageHandler__DetailCodeAssignment_3
+            // InternalRoom.g:10259:1: ( rule__InMessageHandler__DetailCodeAssignment_3 )
+            // InternalRoom.g:10259:2: rule__InMessageHandler__DetailCodeAssignment_3
             {
-            pushFollow(FOLLOW_rule__InMessageHandler__DetailCodeAssignment_3_in_rule__InMessageHandler__Group__3__Impl21233);
+            pushFollow(FOLLOW_2);
             rule__InMessageHandler__DetailCodeAssignment_3();
 
             state._fsp--;
@@ -29362,21 +29362,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutMessageHandler__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10274:1: rule__OutMessageHandler__Group__0 : rule__OutMessageHandler__Group__0__Impl rule__OutMessageHandler__Group__1 ;
+    // InternalRoom.g:10277:1: rule__OutMessageHandler__Group__0 : rule__OutMessageHandler__Group__0__Impl rule__OutMessageHandler__Group__1 ;
     public final void rule__OutMessageHandler__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10278:1: ( rule__OutMessageHandler__Group__0__Impl rule__OutMessageHandler__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10279:2: rule__OutMessageHandler__Group__0__Impl rule__OutMessageHandler__Group__1
+            // InternalRoom.g:10281:1: ( rule__OutMessageHandler__Group__0__Impl rule__OutMessageHandler__Group__1 )
+            // InternalRoom.g:10282:2: rule__OutMessageHandler__Group__0__Impl rule__OutMessageHandler__Group__1
             {
-            pushFollow(FOLLOW_rule__OutMessageHandler__Group__0__Impl_in_rule__OutMessageHandler__Group__021271);
+            pushFollow(FOLLOW_49);
             rule__OutMessageHandler__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__OutMessageHandler__Group__1_in_rule__OutMessageHandler__Group__021274);
+            pushFollow(FOLLOW_2);
             rule__OutMessageHandler__Group__1();
 
             state._fsp--;
@@ -29400,20 +29400,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutMessageHandler__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10286:1: rule__OutMessageHandler__Group__0__Impl : ( 'handle' ) ;
+    // InternalRoom.g:10289:1: rule__OutMessageHandler__Group__0__Impl : ( 'handle' ) ;
     public final void rule__OutMessageHandler__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10290:1: ( ( 'handle' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10291:1: ( 'handle' )
+            // InternalRoom.g:10293:1: ( ( 'handle' ) )
+            // InternalRoom.g:10294:1: ( 'handle' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10291:1: ( 'handle' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10292:1: 'handle'
+            // InternalRoom.g:10294:1: ( 'handle' )
+            // InternalRoom.g:10295:1: 'handle'
             {
              before(grammarAccess.getOutMessageHandlerAccess().getHandleKeyword_0()); 
-            match(input,71,FOLLOW_71_in_rule__OutMessageHandler__Group__0__Impl21302); 
+            match(input,71,FOLLOW_2); 
              after(grammarAccess.getOutMessageHandlerAccess().getHandleKeyword_0()); 
 
             }
@@ -29437,21 +29437,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutMessageHandler__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10305:1: rule__OutMessageHandler__Group__1 : rule__OutMessageHandler__Group__1__Impl rule__OutMessageHandler__Group__2 ;
+    // InternalRoom.g:10308:1: rule__OutMessageHandler__Group__1 : rule__OutMessageHandler__Group__1__Impl rule__OutMessageHandler__Group__2 ;
     public final void rule__OutMessageHandler__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10309:1: ( rule__OutMessageHandler__Group__1__Impl rule__OutMessageHandler__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10310:2: rule__OutMessageHandler__Group__1__Impl rule__OutMessageHandler__Group__2
+            // InternalRoom.g:10312:1: ( rule__OutMessageHandler__Group__1__Impl rule__OutMessageHandler__Group__2 )
+            // InternalRoom.g:10313:2: rule__OutMessageHandler__Group__1__Impl rule__OutMessageHandler__Group__2
             {
-            pushFollow(FOLLOW_rule__OutMessageHandler__Group__1__Impl_in_rule__OutMessageHandler__Group__121333);
+            pushFollow(FOLLOW_3);
             rule__OutMessageHandler__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__OutMessageHandler__Group__2_in_rule__OutMessageHandler__Group__121336);
+            pushFollow(FOLLOW_2);
             rule__OutMessageHandler__Group__2();
 
             state._fsp--;
@@ -29475,20 +29475,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutMessageHandler__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10317:1: rule__OutMessageHandler__Group__1__Impl : ( 'outgoing' ) ;
+    // InternalRoom.g:10320:1: rule__OutMessageHandler__Group__1__Impl : ( 'outgoing' ) ;
     public final void rule__OutMessageHandler__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10321:1: ( ( 'outgoing' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10322:1: ( 'outgoing' )
+            // InternalRoom.g:10324:1: ( ( 'outgoing' ) )
+            // InternalRoom.g:10325:1: ( 'outgoing' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10322:1: ( 'outgoing' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10323:1: 'outgoing'
+            // InternalRoom.g:10325:1: ( 'outgoing' )
+            // InternalRoom.g:10326:1: 'outgoing'
             {
              before(grammarAccess.getOutMessageHandlerAccess().getOutgoingKeyword_1()); 
-            match(input,64,FOLLOW_64_in_rule__OutMessageHandler__Group__1__Impl21364); 
+            match(input,64,FOLLOW_2); 
              after(grammarAccess.getOutMessageHandlerAccess().getOutgoingKeyword_1()); 
 
             }
@@ -29512,21 +29512,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutMessageHandler__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10336:1: rule__OutMessageHandler__Group__2 : rule__OutMessageHandler__Group__2__Impl rule__OutMessageHandler__Group__3 ;
+    // InternalRoom.g:10339:1: rule__OutMessageHandler__Group__2 : rule__OutMessageHandler__Group__2__Impl rule__OutMessageHandler__Group__3 ;
     public final void rule__OutMessageHandler__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10340:1: ( rule__OutMessageHandler__Group__2__Impl rule__OutMessageHandler__Group__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10341:2: rule__OutMessageHandler__Group__2__Impl rule__OutMessageHandler__Group__3
+            // InternalRoom.g:10343:1: ( rule__OutMessageHandler__Group__2__Impl rule__OutMessageHandler__Group__3 )
+            // InternalRoom.g:10344:2: rule__OutMessageHandler__Group__2__Impl rule__OutMessageHandler__Group__3
             {
-            pushFollow(FOLLOW_rule__OutMessageHandler__Group__2__Impl_in_rule__OutMessageHandler__Group__221395);
+            pushFollow(FOLLOW_27);
             rule__OutMessageHandler__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__OutMessageHandler__Group__3_in_rule__OutMessageHandler__Group__221398);
+            pushFollow(FOLLOW_2);
             rule__OutMessageHandler__Group__3();
 
             state._fsp--;
@@ -29550,23 +29550,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutMessageHandler__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10348:1: rule__OutMessageHandler__Group__2__Impl : ( ( rule__OutMessageHandler__MsgAssignment_2 ) ) ;
+    // InternalRoom.g:10351:1: rule__OutMessageHandler__Group__2__Impl : ( ( rule__OutMessageHandler__MsgAssignment_2 ) ) ;
     public final void rule__OutMessageHandler__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10352:1: ( ( ( rule__OutMessageHandler__MsgAssignment_2 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10353:1: ( ( rule__OutMessageHandler__MsgAssignment_2 ) )
+            // InternalRoom.g:10355:1: ( ( ( rule__OutMessageHandler__MsgAssignment_2 ) ) )
+            // InternalRoom.g:10356:1: ( ( rule__OutMessageHandler__MsgAssignment_2 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10353:1: ( ( rule__OutMessageHandler__MsgAssignment_2 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10354:1: ( rule__OutMessageHandler__MsgAssignment_2 )
+            // InternalRoom.g:10356:1: ( ( rule__OutMessageHandler__MsgAssignment_2 ) )
+            // InternalRoom.g:10357:1: ( rule__OutMessageHandler__MsgAssignment_2 )
             {
              before(grammarAccess.getOutMessageHandlerAccess().getMsgAssignment_2()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10355:1: ( rule__OutMessageHandler__MsgAssignment_2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10355:2: rule__OutMessageHandler__MsgAssignment_2
+            // InternalRoom.g:10358:1: ( rule__OutMessageHandler__MsgAssignment_2 )
+            // InternalRoom.g:10358:2: rule__OutMessageHandler__MsgAssignment_2
             {
-            pushFollow(FOLLOW_rule__OutMessageHandler__MsgAssignment_2_in_rule__OutMessageHandler__Group__2__Impl21425);
+            pushFollow(FOLLOW_2);
             rule__OutMessageHandler__MsgAssignment_2();
 
             state._fsp--;
@@ -29597,16 +29597,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutMessageHandler__Group__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10365:1: rule__OutMessageHandler__Group__3 : rule__OutMessageHandler__Group__3__Impl ;
+    // InternalRoom.g:10368:1: rule__OutMessageHandler__Group__3 : rule__OutMessageHandler__Group__3__Impl ;
     public final void rule__OutMessageHandler__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10369:1: ( rule__OutMessageHandler__Group__3__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10370:2: rule__OutMessageHandler__Group__3__Impl
+            // InternalRoom.g:10372:1: ( rule__OutMessageHandler__Group__3__Impl )
+            // InternalRoom.g:10373:2: rule__OutMessageHandler__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__OutMessageHandler__Group__3__Impl_in_rule__OutMessageHandler__Group__321455);
+            pushFollow(FOLLOW_2);
             rule__OutMessageHandler__Group__3__Impl();
 
             state._fsp--;
@@ -29630,23 +29630,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutMessageHandler__Group__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10376:1: rule__OutMessageHandler__Group__3__Impl : ( ( rule__OutMessageHandler__DetailCodeAssignment_3 ) ) ;
+    // InternalRoom.g:10379:1: rule__OutMessageHandler__Group__3__Impl : ( ( rule__OutMessageHandler__DetailCodeAssignment_3 ) ) ;
     public final void rule__OutMessageHandler__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10380:1: ( ( ( rule__OutMessageHandler__DetailCodeAssignment_3 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10381:1: ( ( rule__OutMessageHandler__DetailCodeAssignment_3 ) )
+            // InternalRoom.g:10383:1: ( ( ( rule__OutMessageHandler__DetailCodeAssignment_3 ) ) )
+            // InternalRoom.g:10384:1: ( ( rule__OutMessageHandler__DetailCodeAssignment_3 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10381:1: ( ( rule__OutMessageHandler__DetailCodeAssignment_3 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10382:1: ( rule__OutMessageHandler__DetailCodeAssignment_3 )
+            // InternalRoom.g:10384:1: ( ( rule__OutMessageHandler__DetailCodeAssignment_3 ) )
+            // InternalRoom.g:10385:1: ( rule__OutMessageHandler__DetailCodeAssignment_3 )
             {
              before(grammarAccess.getOutMessageHandlerAccess().getDetailCodeAssignment_3()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10383:1: ( rule__OutMessageHandler__DetailCodeAssignment_3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10383:2: rule__OutMessageHandler__DetailCodeAssignment_3
+            // InternalRoom.g:10386:1: ( rule__OutMessageHandler__DetailCodeAssignment_3 )
+            // InternalRoom.g:10386:2: rule__OutMessageHandler__DetailCodeAssignment_3
             {
-            pushFollow(FOLLOW_rule__OutMessageHandler__DetailCodeAssignment_3_in_rule__OutMessageHandler__Group__3__Impl21482);
+            pushFollow(FOLLOW_2);
             rule__OutMessageHandler__DetailCodeAssignment_3();
 
             state._fsp--;
@@ -29677,21 +29677,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10401:1: rule__ActorClass__Group__0 : rule__ActorClass__Group__0__Impl rule__ActorClass__Group__1 ;
+    // InternalRoom.g:10404:1: rule__ActorClass__Group__0 : rule__ActorClass__Group__0__Impl rule__ActorClass__Group__1 ;
     public final void rule__ActorClass__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10405:1: ( rule__ActorClass__Group__0__Impl rule__ActorClass__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10406:2: rule__ActorClass__Group__0__Impl rule__ActorClass__Group__1
+            // InternalRoom.g:10408:1: ( rule__ActorClass__Group__0__Impl rule__ActorClass__Group__1 )
+            // InternalRoom.g:10409:2: rule__ActorClass__Group__0__Impl rule__ActorClass__Group__1
             {
-            pushFollow(FOLLOW_rule__ActorClass__Group__0__Impl_in_rule__ActorClass__Group__021520);
+            pushFollow(FOLLOW_50);
             rule__ActorClass__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ActorClass__Group__1_in_rule__ActorClass__Group__021523);
+            pushFollow(FOLLOW_2);
             rule__ActorClass__Group__1();
 
             state._fsp--;
@@ -29715,23 +29715,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10413:1: rule__ActorClass__Group__0__Impl : ( ( rule__ActorClass__UnorderedGroup_0 ) ) ;
+    // InternalRoom.g:10416:1: rule__ActorClass__Group__0__Impl : ( ( rule__ActorClass__UnorderedGroup_0 ) ) ;
     public final void rule__ActorClass__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10417:1: ( ( ( rule__ActorClass__UnorderedGroup_0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10418:1: ( ( rule__ActorClass__UnorderedGroup_0 ) )
+            // InternalRoom.g:10420:1: ( ( ( rule__ActorClass__UnorderedGroup_0 ) ) )
+            // InternalRoom.g:10421:1: ( ( rule__ActorClass__UnorderedGroup_0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10418:1: ( ( rule__ActorClass__UnorderedGroup_0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10419:1: ( rule__ActorClass__UnorderedGroup_0 )
+            // InternalRoom.g:10421:1: ( ( rule__ActorClass__UnorderedGroup_0 ) )
+            // InternalRoom.g:10422:1: ( rule__ActorClass__UnorderedGroup_0 )
             {
              before(grammarAccess.getActorClassAccess().getUnorderedGroup_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10420:1: ( rule__ActorClass__UnorderedGroup_0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10420:2: rule__ActorClass__UnorderedGroup_0
+            // InternalRoom.g:10423:1: ( rule__ActorClass__UnorderedGroup_0 )
+            // InternalRoom.g:10423:2: rule__ActorClass__UnorderedGroup_0
             {
-            pushFollow(FOLLOW_rule__ActorClass__UnorderedGroup_0_in_rule__ActorClass__Group__0__Impl21550);
+            pushFollow(FOLLOW_2);
             rule__ActorClass__UnorderedGroup_0();
 
             state._fsp--;
@@ -29762,21 +29762,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10430:1: rule__ActorClass__Group__1 : rule__ActorClass__Group__1__Impl rule__ActorClass__Group__2 ;
+    // InternalRoom.g:10433:1: rule__ActorClass__Group__1 : rule__ActorClass__Group__1__Impl rule__ActorClass__Group__2 ;
     public final void rule__ActorClass__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10434:1: ( rule__ActorClass__Group__1__Impl rule__ActorClass__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10435:2: rule__ActorClass__Group__1__Impl rule__ActorClass__Group__2
+            // InternalRoom.g:10437:1: ( rule__ActorClass__Group__1__Impl rule__ActorClass__Group__2 )
+            // InternalRoom.g:10438:2: rule__ActorClass__Group__1__Impl rule__ActorClass__Group__2
             {
-            pushFollow(FOLLOW_rule__ActorClass__Group__1__Impl_in_rule__ActorClass__Group__121580);
+            pushFollow(FOLLOW_3);
             rule__ActorClass__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ActorClass__Group__2_in_rule__ActorClass__Group__121583);
+            pushFollow(FOLLOW_2);
             rule__ActorClass__Group__2();
 
             state._fsp--;
@@ -29800,20 +29800,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10442:1: rule__ActorClass__Group__1__Impl : ( 'ActorClass' ) ;
+    // InternalRoom.g:10445:1: rule__ActorClass__Group__1__Impl : ( 'ActorClass' ) ;
     public final void rule__ActorClass__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10446:1: ( ( 'ActorClass' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10447:1: ( 'ActorClass' )
+            // InternalRoom.g:10449:1: ( ( 'ActorClass' ) )
+            // InternalRoom.g:10450:1: ( 'ActorClass' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10447:1: ( 'ActorClass' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10448:1: 'ActorClass'
+            // InternalRoom.g:10450:1: ( 'ActorClass' )
+            // InternalRoom.g:10451:1: 'ActorClass'
             {
              before(grammarAccess.getActorClassAccess().getActorClassKeyword_1()); 
-            match(input,17,FOLLOW_17_in_rule__ActorClass__Group__1__Impl21611); 
+            match(input,17,FOLLOW_2); 
              after(grammarAccess.getActorClassAccess().getActorClassKeyword_1()); 
 
             }
@@ -29837,21 +29837,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10461:1: rule__ActorClass__Group__2 : rule__ActorClass__Group__2__Impl rule__ActorClass__Group__3 ;
+    // InternalRoom.g:10464:1: rule__ActorClass__Group__2 : rule__ActorClass__Group__2__Impl rule__ActorClass__Group__3 ;
     public final void rule__ActorClass__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10465:1: ( rule__ActorClass__Group__2__Impl rule__ActorClass__Group__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10466:2: rule__ActorClass__Group__2__Impl rule__ActorClass__Group__3
+            // InternalRoom.g:10468:1: ( rule__ActorClass__Group__2__Impl rule__ActorClass__Group__3 )
+            // InternalRoom.g:10469:2: rule__ActorClass__Group__2__Impl rule__ActorClass__Group__3
             {
-            pushFollow(FOLLOW_rule__ActorClass__Group__2__Impl_in_rule__ActorClass__Group__221642);
+            pushFollow(FOLLOW_23);
             rule__ActorClass__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ActorClass__Group__3_in_rule__ActorClass__Group__221645);
+            pushFollow(FOLLOW_2);
             rule__ActorClass__Group__3();
 
             state._fsp--;
@@ -29875,23 +29875,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10473:1: rule__ActorClass__Group__2__Impl : ( ( rule__ActorClass__NameAssignment_2 ) ) ;
+    // InternalRoom.g:10476:1: rule__ActorClass__Group__2__Impl : ( ( rule__ActorClass__NameAssignment_2 ) ) ;
     public final void rule__ActorClass__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10477:1: ( ( ( rule__ActorClass__NameAssignment_2 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10478:1: ( ( rule__ActorClass__NameAssignment_2 ) )
+            // InternalRoom.g:10480:1: ( ( ( rule__ActorClass__NameAssignment_2 ) ) )
+            // InternalRoom.g:10481:1: ( ( rule__ActorClass__NameAssignment_2 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10478:1: ( ( rule__ActorClass__NameAssignment_2 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10479:1: ( rule__ActorClass__NameAssignment_2 )
+            // InternalRoom.g:10481:1: ( ( rule__ActorClass__NameAssignment_2 ) )
+            // InternalRoom.g:10482:1: ( rule__ActorClass__NameAssignment_2 )
             {
              before(grammarAccess.getActorClassAccess().getNameAssignment_2()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10480:1: ( rule__ActorClass__NameAssignment_2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10480:2: rule__ActorClass__NameAssignment_2
+            // InternalRoom.g:10483:1: ( rule__ActorClass__NameAssignment_2 )
+            // InternalRoom.g:10483:2: rule__ActorClass__NameAssignment_2
             {
-            pushFollow(FOLLOW_rule__ActorClass__NameAssignment_2_in_rule__ActorClass__Group__2__Impl21672);
+            pushFollow(FOLLOW_2);
             rule__ActorClass__NameAssignment_2();
 
             state._fsp--;
@@ -29922,21 +29922,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10490:1: rule__ActorClass__Group__3 : rule__ActorClass__Group__3__Impl rule__ActorClass__Group__4 ;
+    // InternalRoom.g:10493:1: rule__ActorClass__Group__3 : rule__ActorClass__Group__3__Impl rule__ActorClass__Group__4 ;
     public final void rule__ActorClass__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10494:1: ( rule__ActorClass__Group__3__Impl rule__ActorClass__Group__4 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10495:2: rule__ActorClass__Group__3__Impl rule__ActorClass__Group__4
+            // InternalRoom.g:10497:1: ( rule__ActorClass__Group__3__Impl rule__ActorClass__Group__4 )
+            // InternalRoom.g:10498:2: rule__ActorClass__Group__3__Impl rule__ActorClass__Group__4
             {
-            pushFollow(FOLLOW_rule__ActorClass__Group__3__Impl_in_rule__ActorClass__Group__321702);
+            pushFollow(FOLLOW_23);
             rule__ActorClass__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ActorClass__Group__4_in_rule__ActorClass__Group__321705);
+            pushFollow(FOLLOW_2);
             rule__ActorClass__Group__4();
 
             state._fsp--;
@@ -29960,20 +29960,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10502:1: rule__ActorClass__Group__3__Impl : ( ( rule__ActorClass__DocuAssignment_3 )? ) ;
+    // InternalRoom.g:10505:1: rule__ActorClass__Group__3__Impl : ( ( rule__ActorClass__DocuAssignment_3 )? ) ;
     public final void rule__ActorClass__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10506:1: ( ( ( rule__ActorClass__DocuAssignment_3 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10507:1: ( ( rule__ActorClass__DocuAssignment_3 )? )
+            // InternalRoom.g:10509:1: ( ( ( rule__ActorClass__DocuAssignment_3 )? ) )
+            // InternalRoom.g:10510:1: ( ( rule__ActorClass__DocuAssignment_3 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10507:1: ( ( rule__ActorClass__DocuAssignment_3 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10508:1: ( rule__ActorClass__DocuAssignment_3 )?
+            // InternalRoom.g:10510:1: ( ( rule__ActorClass__DocuAssignment_3 )? )
+            // InternalRoom.g:10511:1: ( rule__ActorClass__DocuAssignment_3 )?
             {
              before(grammarAccess.getActorClassAccess().getDocuAssignment_3()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10509:1: ( rule__ActorClass__DocuAssignment_3 )?
+            // InternalRoom.g:10512:1: ( rule__ActorClass__DocuAssignment_3 )?
             int alt109=2;
             int LA109_0 = input.LA(1);
 
@@ -29982,9 +29982,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt109) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10509:2: rule__ActorClass__DocuAssignment_3
+                    // InternalRoom.g:10512:2: rule__ActorClass__DocuAssignment_3
                     {
-                    pushFollow(FOLLOW_rule__ActorClass__DocuAssignment_3_in_rule__ActorClass__Group__3__Impl21732);
+                    pushFollow(FOLLOW_2);
                     rule__ActorClass__DocuAssignment_3();
 
                     state._fsp--;
@@ -30018,21 +30018,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group__4"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10519:1: rule__ActorClass__Group__4 : rule__ActorClass__Group__4__Impl rule__ActorClass__Group__5 ;
+    // InternalRoom.g:10522:1: rule__ActorClass__Group__4 : rule__ActorClass__Group__4__Impl rule__ActorClass__Group__5 ;
     public final void rule__ActorClass__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10523:1: ( rule__ActorClass__Group__4__Impl rule__ActorClass__Group__5 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10524:2: rule__ActorClass__Group__4__Impl rule__ActorClass__Group__5
+            // InternalRoom.g:10526:1: ( rule__ActorClass__Group__4__Impl rule__ActorClass__Group__5 )
+            // InternalRoom.g:10527:2: rule__ActorClass__Group__4__Impl rule__ActorClass__Group__5
             {
-            pushFollow(FOLLOW_rule__ActorClass__Group__4__Impl_in_rule__ActorClass__Group__421763);
+            pushFollow(FOLLOW_23);
             rule__ActorClass__Group__4__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ActorClass__Group__5_in_rule__ActorClass__Group__421766);
+            pushFollow(FOLLOW_2);
             rule__ActorClass__Group__5();
 
             state._fsp--;
@@ -30056,20 +30056,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group__4__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10531:1: rule__ActorClass__Group__4__Impl : ( ( rule__ActorClass__Group_4__0 )? ) ;
+    // InternalRoom.g:10534:1: rule__ActorClass__Group__4__Impl : ( ( rule__ActorClass__Group_4__0 )? ) ;
     public final void rule__ActorClass__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10535:1: ( ( ( rule__ActorClass__Group_4__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10536:1: ( ( rule__ActorClass__Group_4__0 )? )
+            // InternalRoom.g:10538:1: ( ( ( rule__ActorClass__Group_4__0 )? ) )
+            // InternalRoom.g:10539:1: ( ( rule__ActorClass__Group_4__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10536:1: ( ( rule__ActorClass__Group_4__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10537:1: ( rule__ActorClass__Group_4__0 )?
+            // InternalRoom.g:10539:1: ( ( rule__ActorClass__Group_4__0 )? )
+            // InternalRoom.g:10540:1: ( rule__ActorClass__Group_4__0 )?
             {
              before(grammarAccess.getActorClassAccess().getGroup_4()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10538:1: ( rule__ActorClass__Group_4__0 )?
+            // InternalRoom.g:10541:1: ( rule__ActorClass__Group_4__0 )?
             int alt110=2;
             int LA110_0 = input.LA(1);
 
@@ -30078,9 +30078,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt110) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10538:2: rule__ActorClass__Group_4__0
+                    // InternalRoom.g:10541:2: rule__ActorClass__Group_4__0
                     {
-                    pushFollow(FOLLOW_rule__ActorClass__Group_4__0_in_rule__ActorClass__Group__4__Impl21793);
+                    pushFollow(FOLLOW_2);
                     rule__ActorClass__Group_4__0();
 
                     state._fsp--;
@@ -30114,21 +30114,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group__5"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10548:1: rule__ActorClass__Group__5 : rule__ActorClass__Group__5__Impl rule__ActorClass__Group__6 ;
+    // InternalRoom.g:10551:1: rule__ActorClass__Group__5 : rule__ActorClass__Group__5__Impl rule__ActorClass__Group__6 ;
     public final void rule__ActorClass__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10552:1: ( rule__ActorClass__Group__5__Impl rule__ActorClass__Group__6 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10553:2: rule__ActorClass__Group__5__Impl rule__ActorClass__Group__6
+            // InternalRoom.g:10555:1: ( rule__ActorClass__Group__5__Impl rule__ActorClass__Group__6 )
+            // InternalRoom.g:10556:2: rule__ActorClass__Group__5__Impl rule__ActorClass__Group__6
             {
-            pushFollow(FOLLOW_rule__ActorClass__Group__5__Impl_in_rule__ActorClass__Group__521824);
+            pushFollow(FOLLOW_51);
             rule__ActorClass__Group__5__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ActorClass__Group__6_in_rule__ActorClass__Group__521827);
+            pushFollow(FOLLOW_2);
             rule__ActorClass__Group__6();
 
             state._fsp--;
@@ -30152,20 +30152,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group__5__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10560:1: rule__ActorClass__Group__5__Impl : ( '{' ) ;
+    // InternalRoom.g:10563:1: rule__ActorClass__Group__5__Impl : ( '{' ) ;
     public final void rule__ActorClass__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10564:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10565:1: ( '{' )
+            // InternalRoom.g:10567:1: ( ( '{' ) )
+            // InternalRoom.g:10568:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10565:1: ( '{' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10566:1: '{'
+            // InternalRoom.g:10568:1: ( '{' )
+            // InternalRoom.g:10569:1: '{'
             {
              before(grammarAccess.getActorClassAccess().getLeftCurlyBracketKeyword_5()); 
-            match(input,41,FOLLOW_41_in_rule__ActorClass__Group__5__Impl21855); 
+            match(input,41,FOLLOW_2); 
              after(grammarAccess.getActorClassAccess().getLeftCurlyBracketKeyword_5()); 
 
             }
@@ -30189,21 +30189,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group__6"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10579:1: rule__ActorClass__Group__6 : rule__ActorClass__Group__6__Impl rule__ActorClass__Group__7 ;
+    // InternalRoom.g:10582:1: rule__ActorClass__Group__6 : rule__ActorClass__Group__6__Impl rule__ActorClass__Group__7 ;
     public final void rule__ActorClass__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10583:1: ( rule__ActorClass__Group__6__Impl rule__ActorClass__Group__7 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10584:2: rule__ActorClass__Group__6__Impl rule__ActorClass__Group__7
+            // InternalRoom.g:10586:1: ( rule__ActorClass__Group__6__Impl rule__ActorClass__Group__7 )
+            // InternalRoom.g:10587:2: rule__ActorClass__Group__6__Impl rule__ActorClass__Group__7
             {
-            pushFollow(FOLLOW_rule__ActorClass__Group__6__Impl_in_rule__ActorClass__Group__621886);
+            pushFollow(FOLLOW_51);
             rule__ActorClass__Group__6__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ActorClass__Group__7_in_rule__ActorClass__Group__621889);
+            pushFollow(FOLLOW_2);
             rule__ActorClass__Group__7();
 
             state._fsp--;
@@ -30227,20 +30227,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group__6__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10591:1: rule__ActorClass__Group__6__Impl : ( ( rule__ActorClass__AnnotationsAssignment_6 )* ) ;
+    // InternalRoom.g:10594:1: rule__ActorClass__Group__6__Impl : ( ( rule__ActorClass__AnnotationsAssignment_6 )* ) ;
     public final void rule__ActorClass__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10595:1: ( ( ( rule__ActorClass__AnnotationsAssignment_6 )* ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10596:1: ( ( rule__ActorClass__AnnotationsAssignment_6 )* )
+            // InternalRoom.g:10598:1: ( ( ( rule__ActorClass__AnnotationsAssignment_6 )* ) )
+            // InternalRoom.g:10599:1: ( ( rule__ActorClass__AnnotationsAssignment_6 )* )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10596:1: ( ( rule__ActorClass__AnnotationsAssignment_6 )* )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10597:1: ( rule__ActorClass__AnnotationsAssignment_6 )*
+            // InternalRoom.g:10599:1: ( ( rule__ActorClass__AnnotationsAssignment_6 )* )
+            // InternalRoom.g:10600:1: ( rule__ActorClass__AnnotationsAssignment_6 )*
             {
              before(grammarAccess.getActorClassAccess().getAnnotationsAssignment_6()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10598:1: ( rule__ActorClass__AnnotationsAssignment_6 )*
+            // InternalRoom.g:10601:1: ( rule__ActorClass__AnnotationsAssignment_6 )*
             loop111:
             do {
                 int alt111=2;
@@ -30253,9 +30253,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
                 switch (alt111) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10598:2: rule__ActorClass__AnnotationsAssignment_6
+            	    // InternalRoom.g:10601:2: rule__ActorClass__AnnotationsAssignment_6
             	    {
-            	    pushFollow(FOLLOW_rule__ActorClass__AnnotationsAssignment_6_in_rule__ActorClass__Group__6__Impl21916);
+            	    pushFollow(FOLLOW_25);
             	    rule__ActorClass__AnnotationsAssignment_6();
 
             	    state._fsp--;
@@ -30292,21 +30292,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group__7"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10608:1: rule__ActorClass__Group__7 : rule__ActorClass__Group__7__Impl rule__ActorClass__Group__8 ;
+    // InternalRoom.g:10611:1: rule__ActorClass__Group__7 : rule__ActorClass__Group__7__Impl rule__ActorClass__Group__8 ;
     public final void rule__ActorClass__Group__7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10612:1: ( rule__ActorClass__Group__7__Impl rule__ActorClass__Group__8 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10613:2: rule__ActorClass__Group__7__Impl rule__ActorClass__Group__8
+            // InternalRoom.g:10615:1: ( rule__ActorClass__Group__7__Impl rule__ActorClass__Group__8 )
+            // InternalRoom.g:10616:2: rule__ActorClass__Group__7__Impl rule__ActorClass__Group__8
             {
-            pushFollow(FOLLOW_rule__ActorClass__Group__7__Impl_in_rule__ActorClass__Group__721947);
+            pushFollow(FOLLOW_51);
             rule__ActorClass__Group__7__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ActorClass__Group__8_in_rule__ActorClass__Group__721950);
+            pushFollow(FOLLOW_2);
             rule__ActorClass__Group__8();
 
             state._fsp--;
@@ -30330,20 +30330,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group__7__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10620:1: rule__ActorClass__Group__7__Impl : ( ( rule__ActorClass__Group_7__0 )? ) ;
+    // InternalRoom.g:10623:1: rule__ActorClass__Group__7__Impl : ( ( rule__ActorClass__Group_7__0 )? ) ;
     public final void rule__ActorClass__Group__7__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10624:1: ( ( ( rule__ActorClass__Group_7__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10625:1: ( ( rule__ActorClass__Group_7__0 )? )
+            // InternalRoom.g:10627:1: ( ( ( rule__ActorClass__Group_7__0 )? ) )
+            // InternalRoom.g:10628:1: ( ( rule__ActorClass__Group_7__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10625:1: ( ( rule__ActorClass__Group_7__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10626:1: ( rule__ActorClass__Group_7__0 )?
+            // InternalRoom.g:10628:1: ( ( rule__ActorClass__Group_7__0 )? )
+            // InternalRoom.g:10629:1: ( rule__ActorClass__Group_7__0 )?
             {
              before(grammarAccess.getActorClassAccess().getGroup_7()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10627:1: ( rule__ActorClass__Group_7__0 )?
+            // InternalRoom.g:10630:1: ( rule__ActorClass__Group_7__0 )?
             int alt112=2;
             int LA112_0 = input.LA(1);
 
@@ -30352,9 +30352,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt112) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10627:2: rule__ActorClass__Group_7__0
+                    // InternalRoom.g:10630:2: rule__ActorClass__Group_7__0
                     {
-                    pushFollow(FOLLOW_rule__ActorClass__Group_7__0_in_rule__ActorClass__Group__7__Impl21977);
+                    pushFollow(FOLLOW_2);
                     rule__ActorClass__Group_7__0();
 
                     state._fsp--;
@@ -30388,21 +30388,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group__8"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10637:1: rule__ActorClass__Group__8 : rule__ActorClass__Group__8__Impl rule__ActorClass__Group__9 ;
+    // InternalRoom.g:10640:1: rule__ActorClass__Group__8 : rule__ActorClass__Group__8__Impl rule__ActorClass__Group__9 ;
     public final void rule__ActorClass__Group__8() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10641:1: ( rule__ActorClass__Group__8__Impl rule__ActorClass__Group__9 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10642:2: rule__ActorClass__Group__8__Impl rule__ActorClass__Group__9
+            // InternalRoom.g:10644:1: ( rule__ActorClass__Group__8__Impl rule__ActorClass__Group__9 )
+            // InternalRoom.g:10645:2: rule__ActorClass__Group__8__Impl rule__ActorClass__Group__9
             {
-            pushFollow(FOLLOW_rule__ActorClass__Group__8__Impl_in_rule__ActorClass__Group__822008);
+            pushFollow(FOLLOW_51);
             rule__ActorClass__Group__8__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ActorClass__Group__9_in_rule__ActorClass__Group__822011);
+            pushFollow(FOLLOW_2);
             rule__ActorClass__Group__9();
 
             state._fsp--;
@@ -30426,20 +30426,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group__8__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10649:1: rule__ActorClass__Group__8__Impl : ( ( rule__ActorClass__Group_8__0 )? ) ;
+    // InternalRoom.g:10652:1: rule__ActorClass__Group__8__Impl : ( ( rule__ActorClass__Group_8__0 )? ) ;
     public final void rule__ActorClass__Group__8__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10653:1: ( ( ( rule__ActorClass__Group_8__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10654:1: ( ( rule__ActorClass__Group_8__0 )? )
+            // InternalRoom.g:10656:1: ( ( ( rule__ActorClass__Group_8__0 )? ) )
+            // InternalRoom.g:10657:1: ( ( rule__ActorClass__Group_8__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10654:1: ( ( rule__ActorClass__Group_8__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10655:1: ( rule__ActorClass__Group_8__0 )?
+            // InternalRoom.g:10657:1: ( ( rule__ActorClass__Group_8__0 )? )
+            // InternalRoom.g:10658:1: ( rule__ActorClass__Group_8__0 )?
             {
              before(grammarAccess.getActorClassAccess().getGroup_8()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10656:1: ( rule__ActorClass__Group_8__0 )?
+            // InternalRoom.g:10659:1: ( rule__ActorClass__Group_8__0 )?
             int alt113=2;
             int LA113_0 = input.LA(1);
 
@@ -30448,9 +30448,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt113) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10656:2: rule__ActorClass__Group_8__0
+                    // InternalRoom.g:10659:2: rule__ActorClass__Group_8__0
                     {
-                    pushFollow(FOLLOW_rule__ActorClass__Group_8__0_in_rule__ActorClass__Group__8__Impl22038);
+                    pushFollow(FOLLOW_2);
                     rule__ActorClass__Group_8__0();
 
                     state._fsp--;
@@ -30484,21 +30484,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group__9"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10666:1: rule__ActorClass__Group__9 : rule__ActorClass__Group__9__Impl rule__ActorClass__Group__10 ;
+    // InternalRoom.g:10669:1: rule__ActorClass__Group__9 : rule__ActorClass__Group__9__Impl rule__ActorClass__Group__10 ;
     public final void rule__ActorClass__Group__9() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10670:1: ( rule__ActorClass__Group__9__Impl rule__ActorClass__Group__10 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10671:2: rule__ActorClass__Group__9__Impl rule__ActorClass__Group__10
+            // InternalRoom.g:10673:1: ( rule__ActorClass__Group__9__Impl rule__ActorClass__Group__10 )
+            // InternalRoom.g:10674:2: rule__ActorClass__Group__9__Impl rule__ActorClass__Group__10
             {
-            pushFollow(FOLLOW_rule__ActorClass__Group__9__Impl_in_rule__ActorClass__Group__922069);
+            pushFollow(FOLLOW_51);
             rule__ActorClass__Group__9__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ActorClass__Group__10_in_rule__ActorClass__Group__922072);
+            pushFollow(FOLLOW_2);
             rule__ActorClass__Group__10();
 
             state._fsp--;
@@ -30522,20 +30522,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group__9__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10678:1: rule__ActorClass__Group__9__Impl : ( ( rule__ActorClass__Group_9__0 )? ) ;
+    // InternalRoom.g:10681:1: rule__ActorClass__Group__9__Impl : ( ( rule__ActorClass__Group_9__0 )? ) ;
     public final void rule__ActorClass__Group__9__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10682:1: ( ( ( rule__ActorClass__Group_9__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10683:1: ( ( rule__ActorClass__Group_9__0 )? )
+            // InternalRoom.g:10685:1: ( ( ( rule__ActorClass__Group_9__0 )? ) )
+            // InternalRoom.g:10686:1: ( ( rule__ActorClass__Group_9__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10683:1: ( ( rule__ActorClass__Group_9__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10684:1: ( rule__ActorClass__Group_9__0 )?
+            // InternalRoom.g:10686:1: ( ( rule__ActorClass__Group_9__0 )? )
+            // InternalRoom.g:10687:1: ( rule__ActorClass__Group_9__0 )?
             {
              before(grammarAccess.getActorClassAccess().getGroup_9()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10685:1: ( rule__ActorClass__Group_9__0 )?
+            // InternalRoom.g:10688:1: ( rule__ActorClass__Group_9__0 )?
             int alt114=2;
             int LA114_0 = input.LA(1);
 
@@ -30544,9 +30544,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt114) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10685:2: rule__ActorClass__Group_9__0
+                    // InternalRoom.g:10688:2: rule__ActorClass__Group_9__0
                     {
-                    pushFollow(FOLLOW_rule__ActorClass__Group_9__0_in_rule__ActorClass__Group__9__Impl22099);
+                    pushFollow(FOLLOW_2);
                     rule__ActorClass__Group_9__0();
 
                     state._fsp--;
@@ -30580,16 +30580,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group__10"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10695:1: rule__ActorClass__Group__10 : rule__ActorClass__Group__10__Impl ;
+    // InternalRoom.g:10698:1: rule__ActorClass__Group__10 : rule__ActorClass__Group__10__Impl ;
     public final void rule__ActorClass__Group__10() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10699:1: ( rule__ActorClass__Group__10__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10700:2: rule__ActorClass__Group__10__Impl
+            // InternalRoom.g:10702:1: ( rule__ActorClass__Group__10__Impl )
+            // InternalRoom.g:10703:2: rule__ActorClass__Group__10__Impl
             {
-            pushFollow(FOLLOW_rule__ActorClass__Group__10__Impl_in_rule__ActorClass__Group__1022130);
+            pushFollow(FOLLOW_2);
             rule__ActorClass__Group__10__Impl();
 
             state._fsp--;
@@ -30613,20 +30613,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group__10__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10706:1: rule__ActorClass__Group__10__Impl : ( '}' ) ;
+    // InternalRoom.g:10709:1: rule__ActorClass__Group__10__Impl : ( '}' ) ;
     public final void rule__ActorClass__Group__10__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10710:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10711:1: ( '}' )
+            // InternalRoom.g:10713:1: ( ( '}' ) )
+            // InternalRoom.g:10714:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10711:1: ( '}' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10712:1: '}'
+            // InternalRoom.g:10714:1: ( '}' )
+            // InternalRoom.g:10715:1: '}'
             {
              before(grammarAccess.getActorClassAccess().getRightCurlyBracketKeyword_10()); 
-            match(input,42,FOLLOW_42_in_rule__ActorClass__Group__10__Impl22158); 
+            match(input,42,FOLLOW_2); 
              after(grammarAccess.getActorClassAccess().getRightCurlyBracketKeyword_10()); 
 
             }
@@ -30650,21 +30650,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group_4__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10747:1: rule__ActorClass__Group_4__0 : rule__ActorClass__Group_4__0__Impl rule__ActorClass__Group_4__1 ;
+    // InternalRoom.g:10750:1: rule__ActorClass__Group_4__0 : rule__ActorClass__Group_4__0__Impl rule__ActorClass__Group_4__1 ;
     public final void rule__ActorClass__Group_4__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10751:1: ( rule__ActorClass__Group_4__0__Impl rule__ActorClass__Group_4__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10752:2: rule__ActorClass__Group_4__0__Impl rule__ActorClass__Group_4__1
+            // InternalRoom.g:10754:1: ( rule__ActorClass__Group_4__0__Impl rule__ActorClass__Group_4__1 )
+            // InternalRoom.g:10755:2: rule__ActorClass__Group_4__0__Impl rule__ActorClass__Group_4__1
             {
-            pushFollow(FOLLOW_rule__ActorClass__Group_4__0__Impl_in_rule__ActorClass__Group_4__022211);
+            pushFollow(FOLLOW_3);
             rule__ActorClass__Group_4__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ActorClass__Group_4__1_in_rule__ActorClass__Group_4__022214);
+            pushFollow(FOLLOW_2);
             rule__ActorClass__Group_4__1();
 
             state._fsp--;
@@ -30688,20 +30688,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group_4__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10759:1: rule__ActorClass__Group_4__0__Impl : ( 'extends' ) ;
+    // InternalRoom.g:10762:1: rule__ActorClass__Group_4__0__Impl : ( 'extends' ) ;
     public final void rule__ActorClass__Group_4__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10763:1: ( ( 'extends' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10764:1: ( 'extends' )
+            // InternalRoom.g:10766:1: ( ( 'extends' ) )
+            // InternalRoom.g:10767:1: ( 'extends' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10764:1: ( 'extends' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10765:1: 'extends'
+            // InternalRoom.g:10767:1: ( 'extends' )
+            // InternalRoom.g:10768:1: 'extends'
             {
              before(grammarAccess.getActorClassAccess().getExtendsKeyword_4_0()); 
-            match(input,54,FOLLOW_54_in_rule__ActorClass__Group_4__0__Impl22242); 
+            match(input,54,FOLLOW_2); 
              after(grammarAccess.getActorClassAccess().getExtendsKeyword_4_0()); 
 
             }
@@ -30725,16 +30725,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group_4__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10778:1: rule__ActorClass__Group_4__1 : rule__ActorClass__Group_4__1__Impl ;
+    // InternalRoom.g:10781:1: rule__ActorClass__Group_4__1 : rule__ActorClass__Group_4__1__Impl ;
     public final void rule__ActorClass__Group_4__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10782:1: ( rule__ActorClass__Group_4__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10783:2: rule__ActorClass__Group_4__1__Impl
+            // InternalRoom.g:10785:1: ( rule__ActorClass__Group_4__1__Impl )
+            // InternalRoom.g:10786:2: rule__ActorClass__Group_4__1__Impl
             {
-            pushFollow(FOLLOW_rule__ActorClass__Group_4__1__Impl_in_rule__ActorClass__Group_4__122273);
+            pushFollow(FOLLOW_2);
             rule__ActorClass__Group_4__1__Impl();
 
             state._fsp--;
@@ -30758,23 +30758,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group_4__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10789:1: rule__ActorClass__Group_4__1__Impl : ( ( rule__ActorClass__BaseAssignment_4_1 ) ) ;
+    // InternalRoom.g:10792:1: rule__ActorClass__Group_4__1__Impl : ( ( rule__ActorClass__BaseAssignment_4_1 ) ) ;
     public final void rule__ActorClass__Group_4__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10793:1: ( ( ( rule__ActorClass__BaseAssignment_4_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10794:1: ( ( rule__ActorClass__BaseAssignment_4_1 ) )
+            // InternalRoom.g:10796:1: ( ( ( rule__ActorClass__BaseAssignment_4_1 ) ) )
+            // InternalRoom.g:10797:1: ( ( rule__ActorClass__BaseAssignment_4_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10794:1: ( ( rule__ActorClass__BaseAssignment_4_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10795:1: ( rule__ActorClass__BaseAssignment_4_1 )
+            // InternalRoom.g:10797:1: ( ( rule__ActorClass__BaseAssignment_4_1 ) )
+            // InternalRoom.g:10798:1: ( rule__ActorClass__BaseAssignment_4_1 )
             {
              before(grammarAccess.getActorClassAccess().getBaseAssignment_4_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10796:1: ( rule__ActorClass__BaseAssignment_4_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10796:2: rule__ActorClass__BaseAssignment_4_1
+            // InternalRoom.g:10799:1: ( rule__ActorClass__BaseAssignment_4_1 )
+            // InternalRoom.g:10799:2: rule__ActorClass__BaseAssignment_4_1
             {
-            pushFollow(FOLLOW_rule__ActorClass__BaseAssignment_4_1_in_rule__ActorClass__Group_4__1__Impl22300);
+            pushFollow(FOLLOW_2);
             rule__ActorClass__BaseAssignment_4_1();
 
             state._fsp--;
@@ -30805,21 +30805,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group_7__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10810:1: rule__ActorClass__Group_7__0 : rule__ActorClass__Group_7__0__Impl rule__ActorClass__Group_7__1 ;
+    // InternalRoom.g:10813:1: rule__ActorClass__Group_7__0 : rule__ActorClass__Group_7__0__Impl rule__ActorClass__Group_7__1 ;
     public final void rule__ActorClass__Group_7__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10814:1: ( rule__ActorClass__Group_7__0__Impl rule__ActorClass__Group_7__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10815:2: rule__ActorClass__Group_7__0__Impl rule__ActorClass__Group_7__1
+            // InternalRoom.g:10817:1: ( rule__ActorClass__Group_7__0__Impl rule__ActorClass__Group_7__1 )
+            // InternalRoom.g:10818:2: rule__ActorClass__Group_7__0__Impl rule__ActorClass__Group_7__1
             {
-            pushFollow(FOLLOW_rule__ActorClass__Group_7__0__Impl_in_rule__ActorClass__Group_7__022334);
+            pushFollow(FOLLOW_27);
             rule__ActorClass__Group_7__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ActorClass__Group_7__1_in_rule__ActorClass__Group_7__022337);
+            pushFollow(FOLLOW_2);
             rule__ActorClass__Group_7__1();
 
             state._fsp--;
@@ -30843,20 +30843,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group_7__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10822:1: rule__ActorClass__Group_7__0__Impl : ( 'Interface' ) ;
+    // InternalRoom.g:10825:1: rule__ActorClass__Group_7__0__Impl : ( 'Interface' ) ;
     public final void rule__ActorClass__Group_7__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10826:1: ( ( 'Interface' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10827:1: ( 'Interface' )
+            // InternalRoom.g:10829:1: ( ( 'Interface' ) )
+            // InternalRoom.g:10830:1: ( 'Interface' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10827:1: ( 'Interface' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10828:1: 'Interface'
+            // InternalRoom.g:10830:1: ( 'Interface' )
+            // InternalRoom.g:10831:1: 'Interface'
             {
              before(grammarAccess.getActorClassAccess().getInterfaceKeyword_7_0()); 
-            match(input,72,FOLLOW_72_in_rule__ActorClass__Group_7__0__Impl22365); 
+            match(input,72,FOLLOW_2); 
              after(grammarAccess.getActorClassAccess().getInterfaceKeyword_7_0()); 
 
             }
@@ -30880,21 +30880,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group_7__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10841:1: rule__ActorClass__Group_7__1 : rule__ActorClass__Group_7__1__Impl rule__ActorClass__Group_7__2 ;
+    // InternalRoom.g:10844:1: rule__ActorClass__Group_7__1 : rule__ActorClass__Group_7__1__Impl rule__ActorClass__Group_7__2 ;
     public final void rule__ActorClass__Group_7__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10845:1: ( rule__ActorClass__Group_7__1__Impl rule__ActorClass__Group_7__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10846:2: rule__ActorClass__Group_7__1__Impl rule__ActorClass__Group_7__2
+            // InternalRoom.g:10848:1: ( rule__ActorClass__Group_7__1__Impl rule__ActorClass__Group_7__2 )
+            // InternalRoom.g:10849:2: rule__ActorClass__Group_7__1__Impl rule__ActorClass__Group_7__2
             {
-            pushFollow(FOLLOW_rule__ActorClass__Group_7__1__Impl_in_rule__ActorClass__Group_7__122396);
+            pushFollow(FOLLOW_52);
             rule__ActorClass__Group_7__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ActorClass__Group_7__2_in_rule__ActorClass__Group_7__122399);
+            pushFollow(FOLLOW_2);
             rule__ActorClass__Group_7__2();
 
             state._fsp--;
@@ -30918,20 +30918,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group_7__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10853:1: rule__ActorClass__Group_7__1__Impl : ( '{' ) ;
+    // InternalRoom.g:10856:1: rule__ActorClass__Group_7__1__Impl : ( '{' ) ;
     public final void rule__ActorClass__Group_7__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10857:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10858:1: ( '{' )
+            // InternalRoom.g:10860:1: ( ( '{' ) )
+            // InternalRoom.g:10861:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10858:1: ( '{' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10859:1: '{'
+            // InternalRoom.g:10861:1: ( '{' )
+            // InternalRoom.g:10862:1: '{'
             {
              before(grammarAccess.getActorClassAccess().getLeftCurlyBracketKeyword_7_1()); 
-            match(input,41,FOLLOW_41_in_rule__ActorClass__Group_7__1__Impl22427); 
+            match(input,41,FOLLOW_2); 
              after(grammarAccess.getActorClassAccess().getLeftCurlyBracketKeyword_7_1()); 
 
             }
@@ -30955,21 +30955,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group_7__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10872:1: rule__ActorClass__Group_7__2 : rule__ActorClass__Group_7__2__Impl rule__ActorClass__Group_7__3 ;
+    // InternalRoom.g:10875:1: rule__ActorClass__Group_7__2 : rule__ActorClass__Group_7__2__Impl rule__ActorClass__Group_7__3 ;
     public final void rule__ActorClass__Group_7__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10876:1: ( rule__ActorClass__Group_7__2__Impl rule__ActorClass__Group_7__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10877:2: rule__ActorClass__Group_7__2__Impl rule__ActorClass__Group_7__3
+            // InternalRoom.g:10879:1: ( rule__ActorClass__Group_7__2__Impl rule__ActorClass__Group_7__3 )
+            // InternalRoom.g:10880:2: rule__ActorClass__Group_7__2__Impl rule__ActorClass__Group_7__3
             {
-            pushFollow(FOLLOW_rule__ActorClass__Group_7__2__Impl_in_rule__ActorClass__Group_7__222458);
+            pushFollow(FOLLOW_52);
             rule__ActorClass__Group_7__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ActorClass__Group_7__3_in_rule__ActorClass__Group_7__222461);
+            pushFollow(FOLLOW_2);
             rule__ActorClass__Group_7__3();
 
             state._fsp--;
@@ -30993,20 +30993,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group_7__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10884:1: rule__ActorClass__Group_7__2__Impl : ( ( rule__ActorClass__Alternatives_7_2 )* ) ;
+    // InternalRoom.g:10887:1: rule__ActorClass__Group_7__2__Impl : ( ( rule__ActorClass__Alternatives_7_2 )* ) ;
     public final void rule__ActorClass__Group_7__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10888:1: ( ( ( rule__ActorClass__Alternatives_7_2 )* ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10889:1: ( ( rule__ActorClass__Alternatives_7_2 )* )
+            // InternalRoom.g:10891:1: ( ( ( rule__ActorClass__Alternatives_7_2 )* ) )
+            // InternalRoom.g:10892:1: ( ( rule__ActorClass__Alternatives_7_2 )* )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10889:1: ( ( rule__ActorClass__Alternatives_7_2 )* )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10890:1: ( rule__ActorClass__Alternatives_7_2 )*
+            // InternalRoom.g:10892:1: ( ( rule__ActorClass__Alternatives_7_2 )* )
+            // InternalRoom.g:10893:1: ( rule__ActorClass__Alternatives_7_2 )*
             {
              before(grammarAccess.getActorClassAccess().getAlternatives_7_2()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10891:1: ( rule__ActorClass__Alternatives_7_2 )*
+            // InternalRoom.g:10894:1: ( rule__ActorClass__Alternatives_7_2 )*
             loop115:
             do {
                 int alt115=2;
@@ -31019,9 +31019,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
                 switch (alt115) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10891:2: rule__ActorClass__Alternatives_7_2
+            	    // InternalRoom.g:10894:2: rule__ActorClass__Alternatives_7_2
             	    {
-            	    pushFollow(FOLLOW_rule__ActorClass__Alternatives_7_2_in_rule__ActorClass__Group_7__2__Impl22488);
+            	    pushFollow(FOLLOW_53);
             	    rule__ActorClass__Alternatives_7_2();
 
             	    state._fsp--;
@@ -31058,16 +31058,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group_7__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10901:1: rule__ActorClass__Group_7__3 : rule__ActorClass__Group_7__3__Impl ;
+    // InternalRoom.g:10904:1: rule__ActorClass__Group_7__3 : rule__ActorClass__Group_7__3__Impl ;
     public final void rule__ActorClass__Group_7__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10905:1: ( rule__ActorClass__Group_7__3__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10906:2: rule__ActorClass__Group_7__3__Impl
+            // InternalRoom.g:10908:1: ( rule__ActorClass__Group_7__3__Impl )
+            // InternalRoom.g:10909:2: rule__ActorClass__Group_7__3__Impl
             {
-            pushFollow(FOLLOW_rule__ActorClass__Group_7__3__Impl_in_rule__ActorClass__Group_7__322519);
+            pushFollow(FOLLOW_2);
             rule__ActorClass__Group_7__3__Impl();
 
             state._fsp--;
@@ -31091,20 +31091,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group_7__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10912:1: rule__ActorClass__Group_7__3__Impl : ( '}' ) ;
+    // InternalRoom.g:10915:1: rule__ActorClass__Group_7__3__Impl : ( '}' ) ;
     public final void rule__ActorClass__Group_7__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10916:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10917:1: ( '}' )
+            // InternalRoom.g:10919:1: ( ( '}' ) )
+            // InternalRoom.g:10920:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10917:1: ( '}' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10918:1: '}'
+            // InternalRoom.g:10920:1: ( '}' )
+            // InternalRoom.g:10921:1: '}'
             {
              before(grammarAccess.getActorClassAccess().getRightCurlyBracketKeyword_7_3()); 
-            match(input,42,FOLLOW_42_in_rule__ActorClass__Group_7__3__Impl22547); 
+            match(input,42,FOLLOW_2); 
              after(grammarAccess.getActorClassAccess().getRightCurlyBracketKeyword_7_3()); 
 
             }
@@ -31128,21 +31128,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group_8__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10939:1: rule__ActorClass__Group_8__0 : rule__ActorClass__Group_8__0__Impl rule__ActorClass__Group_8__1 ;
+    // InternalRoom.g:10942:1: rule__ActorClass__Group_8__0 : rule__ActorClass__Group_8__0__Impl rule__ActorClass__Group_8__1 ;
     public final void rule__ActorClass__Group_8__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10943:1: ( rule__ActorClass__Group_8__0__Impl rule__ActorClass__Group_8__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10944:2: rule__ActorClass__Group_8__0__Impl rule__ActorClass__Group_8__1
+            // InternalRoom.g:10946:1: ( rule__ActorClass__Group_8__0__Impl rule__ActorClass__Group_8__1 )
+            // InternalRoom.g:10947:2: rule__ActorClass__Group_8__0__Impl rule__ActorClass__Group_8__1
             {
-            pushFollow(FOLLOW_rule__ActorClass__Group_8__0__Impl_in_rule__ActorClass__Group_8__022586);
+            pushFollow(FOLLOW_4);
             rule__ActorClass__Group_8__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ActorClass__Group_8__1_in_rule__ActorClass__Group_8__022589);
+            pushFollow(FOLLOW_2);
             rule__ActorClass__Group_8__1();
 
             state._fsp--;
@@ -31166,20 +31166,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group_8__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10951:1: rule__ActorClass__Group_8__0__Impl : ( 'Structure' ) ;
+    // InternalRoom.g:10954:1: rule__ActorClass__Group_8__0__Impl : ( 'Structure' ) ;
     public final void rule__ActorClass__Group_8__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10955:1: ( ( 'Structure' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10956:1: ( 'Structure' )
+            // InternalRoom.g:10958:1: ( ( 'Structure' ) )
+            // InternalRoom.g:10959:1: ( 'Structure' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10956:1: ( 'Structure' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10957:1: 'Structure'
+            // InternalRoom.g:10959:1: ( 'Structure' )
+            // InternalRoom.g:10960:1: 'Structure'
             {
              before(grammarAccess.getActorClassAccess().getStructureKeyword_8_0()); 
-            match(input,73,FOLLOW_73_in_rule__ActorClass__Group_8__0__Impl22617); 
+            match(input,73,FOLLOW_2); 
              after(grammarAccess.getActorClassAccess().getStructureKeyword_8_0()); 
 
             }
@@ -31203,21 +31203,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group_8__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10970:1: rule__ActorClass__Group_8__1 : rule__ActorClass__Group_8__1__Impl rule__ActorClass__Group_8__2 ;
+    // InternalRoom.g:10973:1: rule__ActorClass__Group_8__1 : rule__ActorClass__Group_8__1__Impl rule__ActorClass__Group_8__2 ;
     public final void rule__ActorClass__Group_8__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10974:1: ( rule__ActorClass__Group_8__1__Impl rule__ActorClass__Group_8__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10975:2: rule__ActorClass__Group_8__1__Impl rule__ActorClass__Group_8__2
+            // InternalRoom.g:10977:1: ( rule__ActorClass__Group_8__1__Impl rule__ActorClass__Group_8__2 )
+            // InternalRoom.g:10978:2: rule__ActorClass__Group_8__1__Impl rule__ActorClass__Group_8__2
             {
-            pushFollow(FOLLOW_rule__ActorClass__Group_8__1__Impl_in_rule__ActorClass__Group_8__122648);
+            pushFollow(FOLLOW_4);
             rule__ActorClass__Group_8__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ActorClass__Group_8__2_in_rule__ActorClass__Group_8__122651);
+            pushFollow(FOLLOW_2);
             rule__ActorClass__Group_8__2();
 
             state._fsp--;
@@ -31241,20 +31241,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group_8__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10982:1: rule__ActorClass__Group_8__1__Impl : ( ( rule__ActorClass__StructureDocuAssignment_8_1 )? ) ;
+    // InternalRoom.g:10985:1: rule__ActorClass__Group_8__1__Impl : ( ( rule__ActorClass__StructureDocuAssignment_8_1 )? ) ;
     public final void rule__ActorClass__Group_8__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10986:1: ( ( ( rule__ActorClass__StructureDocuAssignment_8_1 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10987:1: ( ( rule__ActorClass__StructureDocuAssignment_8_1 )? )
+            // InternalRoom.g:10989:1: ( ( ( rule__ActorClass__StructureDocuAssignment_8_1 )? ) )
+            // InternalRoom.g:10990:1: ( ( rule__ActorClass__StructureDocuAssignment_8_1 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10987:1: ( ( rule__ActorClass__StructureDocuAssignment_8_1 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10988:1: ( rule__ActorClass__StructureDocuAssignment_8_1 )?
+            // InternalRoom.g:10990:1: ( ( rule__ActorClass__StructureDocuAssignment_8_1 )? )
+            // InternalRoom.g:10991:1: ( rule__ActorClass__StructureDocuAssignment_8_1 )?
             {
              before(grammarAccess.getActorClassAccess().getStructureDocuAssignment_8_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10989:1: ( rule__ActorClass__StructureDocuAssignment_8_1 )?
+            // InternalRoom.g:10992:1: ( rule__ActorClass__StructureDocuAssignment_8_1 )?
             int alt116=2;
             int LA116_0 = input.LA(1);
 
@@ -31263,9 +31263,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt116) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10989:2: rule__ActorClass__StructureDocuAssignment_8_1
+                    // InternalRoom.g:10992:2: rule__ActorClass__StructureDocuAssignment_8_1
                     {
-                    pushFollow(FOLLOW_rule__ActorClass__StructureDocuAssignment_8_1_in_rule__ActorClass__Group_8__1__Impl22678);
+                    pushFollow(FOLLOW_2);
                     rule__ActorClass__StructureDocuAssignment_8_1();
 
                     state._fsp--;
@@ -31299,21 +31299,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group_8__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:10999:1: rule__ActorClass__Group_8__2 : rule__ActorClass__Group_8__2__Impl rule__ActorClass__Group_8__3 ;
+    // InternalRoom.g:11002:1: rule__ActorClass__Group_8__2 : rule__ActorClass__Group_8__2__Impl rule__ActorClass__Group_8__3 ;
     public final void rule__ActorClass__Group_8__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11003:1: ( rule__ActorClass__Group_8__2__Impl rule__ActorClass__Group_8__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11004:2: rule__ActorClass__Group_8__2__Impl rule__ActorClass__Group_8__3
+            // InternalRoom.g:11006:1: ( rule__ActorClass__Group_8__2__Impl rule__ActorClass__Group_8__3 )
+            // InternalRoom.g:11007:2: rule__ActorClass__Group_8__2__Impl rule__ActorClass__Group_8__3
             {
-            pushFollow(FOLLOW_rule__ActorClass__Group_8__2__Impl_in_rule__ActorClass__Group_8__222709);
+            pushFollow(FOLLOW_54);
             rule__ActorClass__Group_8__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ActorClass__Group_8__3_in_rule__ActorClass__Group_8__222712);
+            pushFollow(FOLLOW_2);
             rule__ActorClass__Group_8__3();
 
             state._fsp--;
@@ -31337,20 +31337,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group_8__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11011:1: rule__ActorClass__Group_8__2__Impl : ( '{' ) ;
+    // InternalRoom.g:11014:1: rule__ActorClass__Group_8__2__Impl : ( '{' ) ;
     public final void rule__ActorClass__Group_8__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11015:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11016:1: ( '{' )
+            // InternalRoom.g:11018:1: ( ( '{' ) )
+            // InternalRoom.g:11019:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11016:1: ( '{' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11017:1: '{'
+            // InternalRoom.g:11019:1: ( '{' )
+            // InternalRoom.g:11020:1: '{'
             {
              before(grammarAccess.getActorClassAccess().getLeftCurlyBracketKeyword_8_2()); 
-            match(input,41,FOLLOW_41_in_rule__ActorClass__Group_8__2__Impl22740); 
+            match(input,41,FOLLOW_2); 
              after(grammarAccess.getActorClassAccess().getLeftCurlyBracketKeyword_8_2()); 
 
             }
@@ -31374,21 +31374,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group_8__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11030:1: rule__ActorClass__Group_8__3 : rule__ActorClass__Group_8__3__Impl rule__ActorClass__Group_8__4 ;
+    // InternalRoom.g:11033:1: rule__ActorClass__Group_8__3 : rule__ActorClass__Group_8__3__Impl rule__ActorClass__Group_8__4 ;
     public final void rule__ActorClass__Group_8__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11034:1: ( rule__ActorClass__Group_8__3__Impl rule__ActorClass__Group_8__4 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11035:2: rule__ActorClass__Group_8__3__Impl rule__ActorClass__Group_8__4
+            // InternalRoom.g:11037:1: ( rule__ActorClass__Group_8__3__Impl rule__ActorClass__Group_8__4 )
+            // InternalRoom.g:11038:2: rule__ActorClass__Group_8__3__Impl rule__ActorClass__Group_8__4
             {
-            pushFollow(FOLLOW_rule__ActorClass__Group_8__3__Impl_in_rule__ActorClass__Group_8__322771);
+            pushFollow(FOLLOW_54);
             rule__ActorClass__Group_8__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ActorClass__Group_8__4_in_rule__ActorClass__Group_8__322774);
+            pushFollow(FOLLOW_2);
             rule__ActorClass__Group_8__4();
 
             state._fsp--;
@@ -31412,20 +31412,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group_8__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11042:1: rule__ActorClass__Group_8__3__Impl : ( ( rule__ActorClass__Group_8_3__0 )? ) ;
+    // InternalRoom.g:11045:1: rule__ActorClass__Group_8__3__Impl : ( ( rule__ActorClass__Group_8_3__0 )? ) ;
     public final void rule__ActorClass__Group_8__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11046:1: ( ( ( rule__ActorClass__Group_8_3__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11047:1: ( ( rule__ActorClass__Group_8_3__0 )? )
+            // InternalRoom.g:11049:1: ( ( ( rule__ActorClass__Group_8_3__0 )? ) )
+            // InternalRoom.g:11050:1: ( ( rule__ActorClass__Group_8_3__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11047:1: ( ( rule__ActorClass__Group_8_3__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11048:1: ( rule__ActorClass__Group_8_3__0 )?
+            // InternalRoom.g:11050:1: ( ( rule__ActorClass__Group_8_3__0 )? )
+            // InternalRoom.g:11051:1: ( rule__ActorClass__Group_8_3__0 )?
             {
              before(grammarAccess.getActorClassAccess().getGroup_8_3()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11049:1: ( rule__ActorClass__Group_8_3__0 )?
+            // InternalRoom.g:11052:1: ( rule__ActorClass__Group_8_3__0 )?
             int alt117=2;
             int LA117_0 = input.LA(1);
 
@@ -31434,9 +31434,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt117) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11049:2: rule__ActorClass__Group_8_3__0
+                    // InternalRoom.g:11052:2: rule__ActorClass__Group_8_3__0
                     {
-                    pushFollow(FOLLOW_rule__ActorClass__Group_8_3__0_in_rule__ActorClass__Group_8__3__Impl22801);
+                    pushFollow(FOLLOW_2);
                     rule__ActorClass__Group_8_3__0();
 
                     state._fsp--;
@@ -31470,21 +31470,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group_8__4"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11059:1: rule__ActorClass__Group_8__4 : rule__ActorClass__Group_8__4__Impl rule__ActorClass__Group_8__5 ;
+    // InternalRoom.g:11062:1: rule__ActorClass__Group_8__4 : rule__ActorClass__Group_8__4__Impl rule__ActorClass__Group_8__5 ;
     public final void rule__ActorClass__Group_8__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11063:1: ( rule__ActorClass__Group_8__4__Impl rule__ActorClass__Group_8__5 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11064:2: rule__ActorClass__Group_8__4__Impl rule__ActorClass__Group_8__5
+            // InternalRoom.g:11066:1: ( rule__ActorClass__Group_8__4__Impl rule__ActorClass__Group_8__5 )
+            // InternalRoom.g:11067:2: rule__ActorClass__Group_8__4__Impl rule__ActorClass__Group_8__5
             {
-            pushFollow(FOLLOW_rule__ActorClass__Group_8__4__Impl_in_rule__ActorClass__Group_8__422832);
+            pushFollow(FOLLOW_54);
             rule__ActorClass__Group_8__4__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ActorClass__Group_8__5_in_rule__ActorClass__Group_8__422835);
+            pushFollow(FOLLOW_2);
             rule__ActorClass__Group_8__5();
 
             state._fsp--;
@@ -31508,20 +31508,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group_8__4__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11071:1: rule__ActorClass__Group_8__4__Impl : ( ( rule__ActorClass__Group_8_4__0 )? ) ;
+    // InternalRoom.g:11074:1: rule__ActorClass__Group_8__4__Impl : ( ( rule__ActorClass__Group_8_4__0 )? ) ;
     public final void rule__ActorClass__Group_8__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11075:1: ( ( ( rule__ActorClass__Group_8_4__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11076:1: ( ( rule__ActorClass__Group_8_4__0 )? )
+            // InternalRoom.g:11078:1: ( ( ( rule__ActorClass__Group_8_4__0 )? ) )
+            // InternalRoom.g:11079:1: ( ( rule__ActorClass__Group_8_4__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11076:1: ( ( rule__ActorClass__Group_8_4__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11077:1: ( rule__ActorClass__Group_8_4__0 )?
+            // InternalRoom.g:11079:1: ( ( rule__ActorClass__Group_8_4__0 )? )
+            // InternalRoom.g:11080:1: ( rule__ActorClass__Group_8_4__0 )?
             {
              before(grammarAccess.getActorClassAccess().getGroup_8_4()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11078:1: ( rule__ActorClass__Group_8_4__0 )?
+            // InternalRoom.g:11081:1: ( rule__ActorClass__Group_8_4__0 )?
             int alt118=2;
             int LA118_0 = input.LA(1);
 
@@ -31530,9 +31530,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt118) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11078:2: rule__ActorClass__Group_8_4__0
+                    // InternalRoom.g:11081:2: rule__ActorClass__Group_8_4__0
                     {
-                    pushFollow(FOLLOW_rule__ActorClass__Group_8_4__0_in_rule__ActorClass__Group_8__4__Impl22862);
+                    pushFollow(FOLLOW_2);
                     rule__ActorClass__Group_8_4__0();
 
                     state._fsp--;
@@ -31566,21 +31566,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group_8__5"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11088:1: rule__ActorClass__Group_8__5 : rule__ActorClass__Group_8__5__Impl rule__ActorClass__Group_8__6 ;
+    // InternalRoom.g:11091:1: rule__ActorClass__Group_8__5 : rule__ActorClass__Group_8__5__Impl rule__ActorClass__Group_8__6 ;
     public final void rule__ActorClass__Group_8__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11092:1: ( rule__ActorClass__Group_8__5__Impl rule__ActorClass__Group_8__6 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11093:2: rule__ActorClass__Group_8__5__Impl rule__ActorClass__Group_8__6
+            // InternalRoom.g:11095:1: ( rule__ActorClass__Group_8__5__Impl rule__ActorClass__Group_8__6 )
+            // InternalRoom.g:11096:2: rule__ActorClass__Group_8__5__Impl rule__ActorClass__Group_8__6
             {
-            pushFollow(FOLLOW_rule__ActorClass__Group_8__5__Impl_in_rule__ActorClass__Group_8__522893);
+            pushFollow(FOLLOW_54);
             rule__ActorClass__Group_8__5__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ActorClass__Group_8__6_in_rule__ActorClass__Group_8__522896);
+            pushFollow(FOLLOW_2);
             rule__ActorClass__Group_8__6();
 
             state._fsp--;
@@ -31604,20 +31604,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group_8__5__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11100:1: rule__ActorClass__Group_8__5__Impl : ( ( rule__ActorClass__Group_8_5__0 )? ) ;
+    // InternalRoom.g:11103:1: rule__ActorClass__Group_8__5__Impl : ( ( rule__ActorClass__Group_8_5__0 )? ) ;
     public final void rule__ActorClass__Group_8__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11104:1: ( ( ( rule__ActorClass__Group_8_5__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11105:1: ( ( rule__ActorClass__Group_8_5__0 )? )
+            // InternalRoom.g:11107:1: ( ( ( rule__ActorClass__Group_8_5__0 )? ) )
+            // InternalRoom.g:11108:1: ( ( rule__ActorClass__Group_8_5__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11105:1: ( ( rule__ActorClass__Group_8_5__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11106:1: ( rule__ActorClass__Group_8_5__0 )?
+            // InternalRoom.g:11108:1: ( ( rule__ActorClass__Group_8_5__0 )? )
+            // InternalRoom.g:11109:1: ( rule__ActorClass__Group_8_5__0 )?
             {
              before(grammarAccess.getActorClassAccess().getGroup_8_5()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11107:1: ( rule__ActorClass__Group_8_5__0 )?
+            // InternalRoom.g:11110:1: ( rule__ActorClass__Group_8_5__0 )?
             int alt119=2;
             int LA119_0 = input.LA(1);
 
@@ -31626,9 +31626,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt119) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11107:2: rule__ActorClass__Group_8_5__0
+                    // InternalRoom.g:11110:2: rule__ActorClass__Group_8_5__0
                     {
-                    pushFollow(FOLLOW_rule__ActorClass__Group_8_5__0_in_rule__ActorClass__Group_8__5__Impl22923);
+                    pushFollow(FOLLOW_2);
                     rule__ActorClass__Group_8_5__0();
 
                     state._fsp--;
@@ -31662,21 +31662,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group_8__6"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11117:1: rule__ActorClass__Group_8__6 : rule__ActorClass__Group_8__6__Impl rule__ActorClass__Group_8__7 ;
+    // InternalRoom.g:11120:1: rule__ActorClass__Group_8__6 : rule__ActorClass__Group_8__6__Impl rule__ActorClass__Group_8__7 ;
     public final void rule__ActorClass__Group_8__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11121:1: ( rule__ActorClass__Group_8__6__Impl rule__ActorClass__Group_8__7 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11122:2: rule__ActorClass__Group_8__6__Impl rule__ActorClass__Group_8__7
+            // InternalRoom.g:11124:1: ( rule__ActorClass__Group_8__6__Impl rule__ActorClass__Group_8__7 )
+            // InternalRoom.g:11125:2: rule__ActorClass__Group_8__6__Impl rule__ActorClass__Group_8__7
             {
-            pushFollow(FOLLOW_rule__ActorClass__Group_8__6__Impl_in_rule__ActorClass__Group_8__622954);
+            pushFollow(FOLLOW_54);
             rule__ActorClass__Group_8__6__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ActorClass__Group_8__7_in_rule__ActorClass__Group_8__622957);
+            pushFollow(FOLLOW_2);
             rule__ActorClass__Group_8__7();
 
             state._fsp--;
@@ -31700,20 +31700,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group_8__6__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11129:1: rule__ActorClass__Group_8__6__Impl : ( ( rule__ActorClass__Alternatives_8_6 )* ) ;
+    // InternalRoom.g:11132:1: rule__ActorClass__Group_8__6__Impl : ( ( rule__ActorClass__Alternatives_8_6 )* ) ;
     public final void rule__ActorClass__Group_8__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11133:1: ( ( ( rule__ActorClass__Alternatives_8_6 )* ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11134:1: ( ( rule__ActorClass__Alternatives_8_6 )* )
+            // InternalRoom.g:11136:1: ( ( ( rule__ActorClass__Alternatives_8_6 )* ) )
+            // InternalRoom.g:11137:1: ( ( rule__ActorClass__Alternatives_8_6 )* )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11134:1: ( ( rule__ActorClass__Alternatives_8_6 )* )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11135:1: ( rule__ActorClass__Alternatives_8_6 )*
+            // InternalRoom.g:11137:1: ( ( rule__ActorClass__Alternatives_8_6 )* )
+            // InternalRoom.g:11138:1: ( rule__ActorClass__Alternatives_8_6 )*
             {
              before(grammarAccess.getActorClassAccess().getAlternatives_8_6()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11136:1: ( rule__ActorClass__Alternatives_8_6 )*
+            // InternalRoom.g:11139:1: ( rule__ActorClass__Alternatives_8_6 )*
             loop120:
             do {
                 int alt120=2;
@@ -31726,9 +31726,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
                 switch (alt120) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11136:2: rule__ActorClass__Alternatives_8_6
+            	    // InternalRoom.g:11139:2: rule__ActorClass__Alternatives_8_6
             	    {
-            	    pushFollow(FOLLOW_rule__ActorClass__Alternatives_8_6_in_rule__ActorClass__Group_8__6__Impl22984);
+            	    pushFollow(FOLLOW_55);
             	    rule__ActorClass__Alternatives_8_6();
 
             	    state._fsp--;
@@ -31765,16 +31765,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group_8__7"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11146:1: rule__ActorClass__Group_8__7 : rule__ActorClass__Group_8__7__Impl ;
+    // InternalRoom.g:11149:1: rule__ActorClass__Group_8__7 : rule__ActorClass__Group_8__7__Impl ;
     public final void rule__ActorClass__Group_8__7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11150:1: ( rule__ActorClass__Group_8__7__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11151:2: rule__ActorClass__Group_8__7__Impl
+            // InternalRoom.g:11153:1: ( rule__ActorClass__Group_8__7__Impl )
+            // InternalRoom.g:11154:2: rule__ActorClass__Group_8__7__Impl
             {
-            pushFollow(FOLLOW_rule__ActorClass__Group_8__7__Impl_in_rule__ActorClass__Group_8__723015);
+            pushFollow(FOLLOW_2);
             rule__ActorClass__Group_8__7__Impl();
 
             state._fsp--;
@@ -31798,20 +31798,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group_8__7__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11157:1: rule__ActorClass__Group_8__7__Impl : ( '}' ) ;
+    // InternalRoom.g:11160:1: rule__ActorClass__Group_8__7__Impl : ( '}' ) ;
     public final void rule__ActorClass__Group_8__7__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11161:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11162:1: ( '}' )
+            // InternalRoom.g:11164:1: ( ( '}' ) )
+            // InternalRoom.g:11165:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11162:1: ( '}' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11163:1: '}'
+            // InternalRoom.g:11165:1: ( '}' )
+            // InternalRoom.g:11166:1: '}'
             {
              before(grammarAccess.getActorClassAccess().getRightCurlyBracketKeyword_8_7()); 
-            match(input,42,FOLLOW_42_in_rule__ActorClass__Group_8__7__Impl23043); 
+            match(input,42,FOLLOW_2); 
              after(grammarAccess.getActorClassAccess().getRightCurlyBracketKeyword_8_7()); 
 
             }
@@ -31835,21 +31835,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group_8_3__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11192:1: rule__ActorClass__Group_8_3__0 : rule__ActorClass__Group_8_3__0__Impl rule__ActorClass__Group_8_3__1 ;
+    // InternalRoom.g:11195:1: rule__ActorClass__Group_8_3__0 : rule__ActorClass__Group_8_3__0__Impl rule__ActorClass__Group_8_3__1 ;
     public final void rule__ActorClass__Group_8_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11196:1: ( rule__ActorClass__Group_8_3__0__Impl rule__ActorClass__Group_8_3__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11197:2: rule__ActorClass__Group_8_3__0__Impl rule__ActorClass__Group_8_3__1
+            // InternalRoom.g:11199:1: ( rule__ActorClass__Group_8_3__0__Impl rule__ActorClass__Group_8_3__1 )
+            // InternalRoom.g:11200:2: rule__ActorClass__Group_8_3__0__Impl rule__ActorClass__Group_8_3__1
             {
-            pushFollow(FOLLOW_rule__ActorClass__Group_8_3__0__Impl_in_rule__ActorClass__Group_8_3__023090);
+            pushFollow(FOLLOW_27);
             rule__ActorClass__Group_8_3__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ActorClass__Group_8_3__1_in_rule__ActorClass__Group_8_3__023093);
+            pushFollow(FOLLOW_2);
             rule__ActorClass__Group_8_3__1();
 
             state._fsp--;
@@ -31873,20 +31873,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group_8_3__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11204:1: rule__ActorClass__Group_8_3__0__Impl : ( 'usercode1' ) ;
+    // InternalRoom.g:11207:1: rule__ActorClass__Group_8_3__0__Impl : ( 'usercode1' ) ;
     public final void rule__ActorClass__Group_8_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11208:1: ( ( 'usercode1' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11209:1: ( 'usercode1' )
+            // InternalRoom.g:11211:1: ( ( 'usercode1' ) )
+            // InternalRoom.g:11212:1: ( 'usercode1' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11209:1: ( 'usercode1' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11210:1: 'usercode1'
+            // InternalRoom.g:11212:1: ( 'usercode1' )
+            // InternalRoom.g:11213:1: 'usercode1'
             {
              before(grammarAccess.getActorClassAccess().getUsercode1Keyword_8_3_0()); 
-            match(input,55,FOLLOW_55_in_rule__ActorClass__Group_8_3__0__Impl23121); 
+            match(input,55,FOLLOW_2); 
              after(grammarAccess.getActorClassAccess().getUsercode1Keyword_8_3_0()); 
 
             }
@@ -31910,16 +31910,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group_8_3__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11223:1: rule__ActorClass__Group_8_3__1 : rule__ActorClass__Group_8_3__1__Impl ;
+    // InternalRoom.g:11226:1: rule__ActorClass__Group_8_3__1 : rule__ActorClass__Group_8_3__1__Impl ;
     public final void rule__ActorClass__Group_8_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11227:1: ( rule__ActorClass__Group_8_3__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11228:2: rule__ActorClass__Group_8_3__1__Impl
+            // InternalRoom.g:11230:1: ( rule__ActorClass__Group_8_3__1__Impl )
+            // InternalRoom.g:11231:2: rule__ActorClass__Group_8_3__1__Impl
             {
-            pushFollow(FOLLOW_rule__ActorClass__Group_8_3__1__Impl_in_rule__ActorClass__Group_8_3__123152);
+            pushFollow(FOLLOW_2);
             rule__ActorClass__Group_8_3__1__Impl();
 
             state._fsp--;
@@ -31943,23 +31943,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group_8_3__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11234:1: rule__ActorClass__Group_8_3__1__Impl : ( ( rule__ActorClass__UserCode1Assignment_8_3_1 ) ) ;
+    // InternalRoom.g:11237:1: rule__ActorClass__Group_8_3__1__Impl : ( ( rule__ActorClass__UserCode1Assignment_8_3_1 ) ) ;
     public final void rule__ActorClass__Group_8_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11238:1: ( ( ( rule__ActorClass__UserCode1Assignment_8_3_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11239:1: ( ( rule__ActorClass__UserCode1Assignment_8_3_1 ) )
+            // InternalRoom.g:11241:1: ( ( ( rule__ActorClass__UserCode1Assignment_8_3_1 ) ) )
+            // InternalRoom.g:11242:1: ( ( rule__ActorClass__UserCode1Assignment_8_3_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11239:1: ( ( rule__ActorClass__UserCode1Assignment_8_3_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11240:1: ( rule__ActorClass__UserCode1Assignment_8_3_1 )
+            // InternalRoom.g:11242:1: ( ( rule__ActorClass__UserCode1Assignment_8_3_1 ) )
+            // InternalRoom.g:11243:1: ( rule__ActorClass__UserCode1Assignment_8_3_1 )
             {
              before(grammarAccess.getActorClassAccess().getUserCode1Assignment_8_3_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11241:1: ( rule__ActorClass__UserCode1Assignment_8_3_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11241:2: rule__ActorClass__UserCode1Assignment_8_3_1
+            // InternalRoom.g:11244:1: ( rule__ActorClass__UserCode1Assignment_8_3_1 )
+            // InternalRoom.g:11244:2: rule__ActorClass__UserCode1Assignment_8_3_1
             {
-            pushFollow(FOLLOW_rule__ActorClass__UserCode1Assignment_8_3_1_in_rule__ActorClass__Group_8_3__1__Impl23179);
+            pushFollow(FOLLOW_2);
             rule__ActorClass__UserCode1Assignment_8_3_1();
 
             state._fsp--;
@@ -31990,21 +31990,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group_8_4__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11255:1: rule__ActorClass__Group_8_4__0 : rule__ActorClass__Group_8_4__0__Impl rule__ActorClass__Group_8_4__1 ;
+    // InternalRoom.g:11258:1: rule__ActorClass__Group_8_4__0 : rule__ActorClass__Group_8_4__0__Impl rule__ActorClass__Group_8_4__1 ;
     public final void rule__ActorClass__Group_8_4__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11259:1: ( rule__ActorClass__Group_8_4__0__Impl rule__ActorClass__Group_8_4__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11260:2: rule__ActorClass__Group_8_4__0__Impl rule__ActorClass__Group_8_4__1
+            // InternalRoom.g:11262:1: ( rule__ActorClass__Group_8_4__0__Impl rule__ActorClass__Group_8_4__1 )
+            // InternalRoom.g:11263:2: rule__ActorClass__Group_8_4__0__Impl rule__ActorClass__Group_8_4__1
             {
-            pushFollow(FOLLOW_rule__ActorClass__Group_8_4__0__Impl_in_rule__ActorClass__Group_8_4__023213);
+            pushFollow(FOLLOW_27);
             rule__ActorClass__Group_8_4__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ActorClass__Group_8_4__1_in_rule__ActorClass__Group_8_4__023216);
+            pushFollow(FOLLOW_2);
             rule__ActorClass__Group_8_4__1();
 
             state._fsp--;
@@ -32028,20 +32028,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group_8_4__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11267:1: rule__ActorClass__Group_8_4__0__Impl : ( 'usercode2' ) ;
+    // InternalRoom.g:11270:1: rule__ActorClass__Group_8_4__0__Impl : ( 'usercode2' ) ;
     public final void rule__ActorClass__Group_8_4__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11271:1: ( ( 'usercode2' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11272:1: ( 'usercode2' )
+            // InternalRoom.g:11274:1: ( ( 'usercode2' ) )
+            // InternalRoom.g:11275:1: ( 'usercode2' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11272:1: ( 'usercode2' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11273:1: 'usercode2'
+            // InternalRoom.g:11275:1: ( 'usercode2' )
+            // InternalRoom.g:11276:1: 'usercode2'
             {
              before(grammarAccess.getActorClassAccess().getUsercode2Keyword_8_4_0()); 
-            match(input,56,FOLLOW_56_in_rule__ActorClass__Group_8_4__0__Impl23244); 
+            match(input,56,FOLLOW_2); 
              after(grammarAccess.getActorClassAccess().getUsercode2Keyword_8_4_0()); 
 
             }
@@ -32065,16 +32065,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group_8_4__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11286:1: rule__ActorClass__Group_8_4__1 : rule__ActorClass__Group_8_4__1__Impl ;
+    // InternalRoom.g:11289:1: rule__ActorClass__Group_8_4__1 : rule__ActorClass__Group_8_4__1__Impl ;
     public final void rule__ActorClass__Group_8_4__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11290:1: ( rule__ActorClass__Group_8_4__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11291:2: rule__ActorClass__Group_8_4__1__Impl
+            // InternalRoom.g:11293:1: ( rule__ActorClass__Group_8_4__1__Impl )
+            // InternalRoom.g:11294:2: rule__ActorClass__Group_8_4__1__Impl
             {
-            pushFollow(FOLLOW_rule__ActorClass__Group_8_4__1__Impl_in_rule__ActorClass__Group_8_4__123275);
+            pushFollow(FOLLOW_2);
             rule__ActorClass__Group_8_4__1__Impl();
 
             state._fsp--;
@@ -32098,23 +32098,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group_8_4__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11297:1: rule__ActorClass__Group_8_4__1__Impl : ( ( rule__ActorClass__UserCode2Assignment_8_4_1 ) ) ;
+    // InternalRoom.g:11300:1: rule__ActorClass__Group_8_4__1__Impl : ( ( rule__ActorClass__UserCode2Assignment_8_4_1 ) ) ;
     public final void rule__ActorClass__Group_8_4__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11301:1: ( ( ( rule__ActorClass__UserCode2Assignment_8_4_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11302:1: ( ( rule__ActorClass__UserCode2Assignment_8_4_1 ) )
+            // InternalRoom.g:11304:1: ( ( ( rule__ActorClass__UserCode2Assignment_8_4_1 ) ) )
+            // InternalRoom.g:11305:1: ( ( rule__ActorClass__UserCode2Assignment_8_4_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11302:1: ( ( rule__ActorClass__UserCode2Assignment_8_4_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11303:1: ( rule__ActorClass__UserCode2Assignment_8_4_1 )
+            // InternalRoom.g:11305:1: ( ( rule__ActorClass__UserCode2Assignment_8_4_1 ) )
+            // InternalRoom.g:11306:1: ( rule__ActorClass__UserCode2Assignment_8_4_1 )
             {
              before(grammarAccess.getActorClassAccess().getUserCode2Assignment_8_4_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11304:1: ( rule__ActorClass__UserCode2Assignment_8_4_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11304:2: rule__ActorClass__UserCode2Assignment_8_4_1
+            // InternalRoom.g:11307:1: ( rule__ActorClass__UserCode2Assignment_8_4_1 )
+            // InternalRoom.g:11307:2: rule__ActorClass__UserCode2Assignment_8_4_1
             {
-            pushFollow(FOLLOW_rule__ActorClass__UserCode2Assignment_8_4_1_in_rule__ActorClass__Group_8_4__1__Impl23302);
+            pushFollow(FOLLOW_2);
             rule__ActorClass__UserCode2Assignment_8_4_1();
 
             state._fsp--;
@@ -32145,21 +32145,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group_8_5__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11318:1: rule__ActorClass__Group_8_5__0 : rule__ActorClass__Group_8_5__0__Impl rule__ActorClass__Group_8_5__1 ;
+    // InternalRoom.g:11321:1: rule__ActorClass__Group_8_5__0 : rule__ActorClass__Group_8_5__0__Impl rule__ActorClass__Group_8_5__1 ;
     public final void rule__ActorClass__Group_8_5__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11322:1: ( rule__ActorClass__Group_8_5__0__Impl rule__ActorClass__Group_8_5__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11323:2: rule__ActorClass__Group_8_5__0__Impl rule__ActorClass__Group_8_5__1
+            // InternalRoom.g:11325:1: ( rule__ActorClass__Group_8_5__0__Impl rule__ActorClass__Group_8_5__1 )
+            // InternalRoom.g:11326:2: rule__ActorClass__Group_8_5__0__Impl rule__ActorClass__Group_8_5__1
             {
-            pushFollow(FOLLOW_rule__ActorClass__Group_8_5__0__Impl_in_rule__ActorClass__Group_8_5__023336);
+            pushFollow(FOLLOW_27);
             rule__ActorClass__Group_8_5__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ActorClass__Group_8_5__1_in_rule__ActorClass__Group_8_5__023339);
+            pushFollow(FOLLOW_2);
             rule__ActorClass__Group_8_5__1();
 
             state._fsp--;
@@ -32183,20 +32183,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group_8_5__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11330:1: rule__ActorClass__Group_8_5__0__Impl : ( 'usercode3' ) ;
+    // InternalRoom.g:11333:1: rule__ActorClass__Group_8_5__0__Impl : ( 'usercode3' ) ;
     public final void rule__ActorClass__Group_8_5__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11334:1: ( ( 'usercode3' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11335:1: ( 'usercode3' )
+            // InternalRoom.g:11337:1: ( ( 'usercode3' ) )
+            // InternalRoom.g:11338:1: ( 'usercode3' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11335:1: ( 'usercode3' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11336:1: 'usercode3'
+            // InternalRoom.g:11338:1: ( 'usercode3' )
+            // InternalRoom.g:11339:1: 'usercode3'
             {
              before(grammarAccess.getActorClassAccess().getUsercode3Keyword_8_5_0()); 
-            match(input,57,FOLLOW_57_in_rule__ActorClass__Group_8_5__0__Impl23367); 
+            match(input,57,FOLLOW_2); 
              after(grammarAccess.getActorClassAccess().getUsercode3Keyword_8_5_0()); 
 
             }
@@ -32220,16 +32220,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group_8_5__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11349:1: rule__ActorClass__Group_8_5__1 : rule__ActorClass__Group_8_5__1__Impl ;
+    // InternalRoom.g:11352:1: rule__ActorClass__Group_8_5__1 : rule__ActorClass__Group_8_5__1__Impl ;
     public final void rule__ActorClass__Group_8_5__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11353:1: ( rule__ActorClass__Group_8_5__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11354:2: rule__ActorClass__Group_8_5__1__Impl
+            // InternalRoom.g:11356:1: ( rule__ActorClass__Group_8_5__1__Impl )
+            // InternalRoom.g:11357:2: rule__ActorClass__Group_8_5__1__Impl
             {
-            pushFollow(FOLLOW_rule__ActorClass__Group_8_5__1__Impl_in_rule__ActorClass__Group_8_5__123398);
+            pushFollow(FOLLOW_2);
             rule__ActorClass__Group_8_5__1__Impl();
 
             state._fsp--;
@@ -32253,23 +32253,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group_8_5__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11360:1: rule__ActorClass__Group_8_5__1__Impl : ( ( rule__ActorClass__UserCode3Assignment_8_5_1 ) ) ;
+    // InternalRoom.g:11363:1: rule__ActorClass__Group_8_5__1__Impl : ( ( rule__ActorClass__UserCode3Assignment_8_5_1 ) ) ;
     public final void rule__ActorClass__Group_8_5__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11364:1: ( ( ( rule__ActorClass__UserCode3Assignment_8_5_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11365:1: ( ( rule__ActorClass__UserCode3Assignment_8_5_1 ) )
+            // InternalRoom.g:11367:1: ( ( ( rule__ActorClass__UserCode3Assignment_8_5_1 ) ) )
+            // InternalRoom.g:11368:1: ( ( rule__ActorClass__UserCode3Assignment_8_5_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11365:1: ( ( rule__ActorClass__UserCode3Assignment_8_5_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11366:1: ( rule__ActorClass__UserCode3Assignment_8_5_1 )
+            // InternalRoom.g:11368:1: ( ( rule__ActorClass__UserCode3Assignment_8_5_1 ) )
+            // InternalRoom.g:11369:1: ( rule__ActorClass__UserCode3Assignment_8_5_1 )
             {
              before(grammarAccess.getActorClassAccess().getUserCode3Assignment_8_5_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11367:1: ( rule__ActorClass__UserCode3Assignment_8_5_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11367:2: rule__ActorClass__UserCode3Assignment_8_5_1
+            // InternalRoom.g:11370:1: ( rule__ActorClass__UserCode3Assignment_8_5_1 )
+            // InternalRoom.g:11370:2: rule__ActorClass__UserCode3Assignment_8_5_1
             {
-            pushFollow(FOLLOW_rule__ActorClass__UserCode3Assignment_8_5_1_in_rule__ActorClass__Group_8_5__1__Impl23425);
+            pushFollow(FOLLOW_2);
             rule__ActorClass__UserCode3Assignment_8_5_1();
 
             state._fsp--;
@@ -32300,21 +32300,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group_9__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11381:1: rule__ActorClass__Group_9__0 : rule__ActorClass__Group_9__0__Impl rule__ActorClass__Group_9__1 ;
+    // InternalRoom.g:11384:1: rule__ActorClass__Group_9__0 : rule__ActorClass__Group_9__0__Impl rule__ActorClass__Group_9__1 ;
     public final void rule__ActorClass__Group_9__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11385:1: ( rule__ActorClass__Group_9__0__Impl rule__ActorClass__Group_9__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11386:2: rule__ActorClass__Group_9__0__Impl rule__ActorClass__Group_9__1
+            // InternalRoom.g:11388:1: ( rule__ActorClass__Group_9__0__Impl rule__ActorClass__Group_9__1 )
+            // InternalRoom.g:11389:2: rule__ActorClass__Group_9__0__Impl rule__ActorClass__Group_9__1
             {
-            pushFollow(FOLLOW_rule__ActorClass__Group_9__0__Impl_in_rule__ActorClass__Group_9__023459);
+            pushFollow(FOLLOW_4);
             rule__ActorClass__Group_9__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ActorClass__Group_9__1_in_rule__ActorClass__Group_9__023462);
+            pushFollow(FOLLOW_2);
             rule__ActorClass__Group_9__1();
 
             state._fsp--;
@@ -32338,20 +32338,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group_9__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11393:1: rule__ActorClass__Group_9__0__Impl : ( 'Behavior' ) ;
+    // InternalRoom.g:11396:1: rule__ActorClass__Group_9__0__Impl : ( 'Behavior' ) ;
     public final void rule__ActorClass__Group_9__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11397:1: ( ( 'Behavior' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11398:1: ( 'Behavior' )
+            // InternalRoom.g:11400:1: ( ( 'Behavior' ) )
+            // InternalRoom.g:11401:1: ( 'Behavior' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11398:1: ( 'Behavior' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11399:1: 'Behavior'
+            // InternalRoom.g:11401:1: ( 'Behavior' )
+            // InternalRoom.g:11402:1: 'Behavior'
             {
              before(grammarAccess.getActorClassAccess().getBehaviorKeyword_9_0()); 
-            match(input,74,FOLLOW_74_in_rule__ActorClass__Group_9__0__Impl23490); 
+            match(input,74,FOLLOW_2); 
              after(grammarAccess.getActorClassAccess().getBehaviorKeyword_9_0()); 
 
             }
@@ -32375,21 +32375,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group_9__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11412:1: rule__ActorClass__Group_9__1 : rule__ActorClass__Group_9__1__Impl rule__ActorClass__Group_9__2 ;
+    // InternalRoom.g:11415:1: rule__ActorClass__Group_9__1 : rule__ActorClass__Group_9__1__Impl rule__ActorClass__Group_9__2 ;
     public final void rule__ActorClass__Group_9__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11416:1: ( rule__ActorClass__Group_9__1__Impl rule__ActorClass__Group_9__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11417:2: rule__ActorClass__Group_9__1__Impl rule__ActorClass__Group_9__2
+            // InternalRoom.g:11419:1: ( rule__ActorClass__Group_9__1__Impl rule__ActorClass__Group_9__2 )
+            // InternalRoom.g:11420:2: rule__ActorClass__Group_9__1__Impl rule__ActorClass__Group_9__2
             {
-            pushFollow(FOLLOW_rule__ActorClass__Group_9__1__Impl_in_rule__ActorClass__Group_9__123521);
+            pushFollow(FOLLOW_4);
             rule__ActorClass__Group_9__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ActorClass__Group_9__2_in_rule__ActorClass__Group_9__123524);
+            pushFollow(FOLLOW_2);
             rule__ActorClass__Group_9__2();
 
             state._fsp--;
@@ -32413,20 +32413,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group_9__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11424:1: rule__ActorClass__Group_9__1__Impl : ( ( rule__ActorClass__BehaviorDocuAssignment_9_1 )? ) ;
+    // InternalRoom.g:11427:1: rule__ActorClass__Group_9__1__Impl : ( ( rule__ActorClass__BehaviorDocuAssignment_9_1 )? ) ;
     public final void rule__ActorClass__Group_9__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11428:1: ( ( ( rule__ActorClass__BehaviorDocuAssignment_9_1 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11429:1: ( ( rule__ActorClass__BehaviorDocuAssignment_9_1 )? )
+            // InternalRoom.g:11431:1: ( ( ( rule__ActorClass__BehaviorDocuAssignment_9_1 )? ) )
+            // InternalRoom.g:11432:1: ( ( rule__ActorClass__BehaviorDocuAssignment_9_1 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11429:1: ( ( rule__ActorClass__BehaviorDocuAssignment_9_1 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11430:1: ( rule__ActorClass__BehaviorDocuAssignment_9_1 )?
+            // InternalRoom.g:11432:1: ( ( rule__ActorClass__BehaviorDocuAssignment_9_1 )? )
+            // InternalRoom.g:11433:1: ( rule__ActorClass__BehaviorDocuAssignment_9_1 )?
             {
              before(grammarAccess.getActorClassAccess().getBehaviorDocuAssignment_9_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11431:1: ( rule__ActorClass__BehaviorDocuAssignment_9_1 )?
+            // InternalRoom.g:11434:1: ( rule__ActorClass__BehaviorDocuAssignment_9_1 )?
             int alt121=2;
             int LA121_0 = input.LA(1);
 
@@ -32435,9 +32435,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt121) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11431:2: rule__ActorClass__BehaviorDocuAssignment_9_1
+                    // InternalRoom.g:11434:2: rule__ActorClass__BehaviorDocuAssignment_9_1
                     {
-                    pushFollow(FOLLOW_rule__ActorClass__BehaviorDocuAssignment_9_1_in_rule__ActorClass__Group_9__1__Impl23551);
+                    pushFollow(FOLLOW_2);
                     rule__ActorClass__BehaviorDocuAssignment_9_1();
 
                     state._fsp--;
@@ -32471,21 +32471,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group_9__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11441:1: rule__ActorClass__Group_9__2 : rule__ActorClass__Group_9__2__Impl rule__ActorClass__Group_9__3 ;
+    // InternalRoom.g:11444:1: rule__ActorClass__Group_9__2 : rule__ActorClass__Group_9__2__Impl rule__ActorClass__Group_9__3 ;
     public final void rule__ActorClass__Group_9__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11445:1: ( rule__ActorClass__Group_9__2__Impl rule__ActorClass__Group_9__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11446:2: rule__ActorClass__Group_9__2__Impl rule__ActorClass__Group_9__3
+            // InternalRoom.g:11448:1: ( rule__ActorClass__Group_9__2__Impl rule__ActorClass__Group_9__3 )
+            // InternalRoom.g:11449:2: rule__ActorClass__Group_9__2__Impl rule__ActorClass__Group_9__3
             {
-            pushFollow(FOLLOW_rule__ActorClass__Group_9__2__Impl_in_rule__ActorClass__Group_9__223582);
+            pushFollow(FOLLOW_56);
             rule__ActorClass__Group_9__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ActorClass__Group_9__3_in_rule__ActorClass__Group_9__223585);
+            pushFollow(FOLLOW_2);
             rule__ActorClass__Group_9__3();
 
             state._fsp--;
@@ -32509,20 +32509,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group_9__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11453:1: rule__ActorClass__Group_9__2__Impl : ( '{' ) ;
+    // InternalRoom.g:11456:1: rule__ActorClass__Group_9__2__Impl : ( '{' ) ;
     public final void rule__ActorClass__Group_9__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11457:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11458:1: ( '{' )
+            // InternalRoom.g:11460:1: ( ( '{' ) )
+            // InternalRoom.g:11461:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11458:1: ( '{' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11459:1: '{'
+            // InternalRoom.g:11461:1: ( '{' )
+            // InternalRoom.g:11462:1: '{'
             {
              before(grammarAccess.getActorClassAccess().getLeftCurlyBracketKeyword_9_2()); 
-            match(input,41,FOLLOW_41_in_rule__ActorClass__Group_9__2__Impl23613); 
+            match(input,41,FOLLOW_2); 
              after(grammarAccess.getActorClassAccess().getLeftCurlyBracketKeyword_9_2()); 
 
             }
@@ -32546,21 +32546,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group_9__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11472:1: rule__ActorClass__Group_9__3 : rule__ActorClass__Group_9__3__Impl rule__ActorClass__Group_9__4 ;
+    // InternalRoom.g:11475:1: rule__ActorClass__Group_9__3 : rule__ActorClass__Group_9__3__Impl rule__ActorClass__Group_9__4 ;
     public final void rule__ActorClass__Group_9__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11476:1: ( rule__ActorClass__Group_9__3__Impl rule__ActorClass__Group_9__4 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11477:2: rule__ActorClass__Group_9__3__Impl rule__ActorClass__Group_9__4
+            // InternalRoom.g:11479:1: ( rule__ActorClass__Group_9__3__Impl rule__ActorClass__Group_9__4 )
+            // InternalRoom.g:11480:2: rule__ActorClass__Group_9__3__Impl rule__ActorClass__Group_9__4
             {
-            pushFollow(FOLLOW_rule__ActorClass__Group_9__3__Impl_in_rule__ActorClass__Group_9__323644);
+            pushFollow(FOLLOW_56);
             rule__ActorClass__Group_9__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ActorClass__Group_9__4_in_rule__ActorClass__Group_9__323647);
+            pushFollow(FOLLOW_2);
             rule__ActorClass__Group_9__4();
 
             state._fsp--;
@@ -32584,20 +32584,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group_9__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11484:1: rule__ActorClass__Group_9__3__Impl : ( ( rule__ActorClass__BehaviorAnnotationsAssignment_9_3 )* ) ;
+    // InternalRoom.g:11487:1: rule__ActorClass__Group_9__3__Impl : ( ( rule__ActorClass__BehaviorAnnotationsAssignment_9_3 )* ) ;
     public final void rule__ActorClass__Group_9__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11488:1: ( ( ( rule__ActorClass__BehaviorAnnotationsAssignment_9_3 )* ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11489:1: ( ( rule__ActorClass__BehaviorAnnotationsAssignment_9_3 )* )
+            // InternalRoom.g:11491:1: ( ( ( rule__ActorClass__BehaviorAnnotationsAssignment_9_3 )* ) )
+            // InternalRoom.g:11492:1: ( ( rule__ActorClass__BehaviorAnnotationsAssignment_9_3 )* )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11489:1: ( ( rule__ActorClass__BehaviorAnnotationsAssignment_9_3 )* )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11490:1: ( rule__ActorClass__BehaviorAnnotationsAssignment_9_3 )*
+            // InternalRoom.g:11492:1: ( ( rule__ActorClass__BehaviorAnnotationsAssignment_9_3 )* )
+            // InternalRoom.g:11493:1: ( rule__ActorClass__BehaviorAnnotationsAssignment_9_3 )*
             {
              before(grammarAccess.getActorClassAccess().getBehaviorAnnotationsAssignment_9_3()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11491:1: ( rule__ActorClass__BehaviorAnnotationsAssignment_9_3 )*
+            // InternalRoom.g:11494:1: ( rule__ActorClass__BehaviorAnnotationsAssignment_9_3 )*
             loop122:
             do {
                 int alt122=2;
@@ -32610,9 +32610,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
                 switch (alt122) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11491:2: rule__ActorClass__BehaviorAnnotationsAssignment_9_3
+            	    // InternalRoom.g:11494:2: rule__ActorClass__BehaviorAnnotationsAssignment_9_3
             	    {
-            	    pushFollow(FOLLOW_rule__ActorClass__BehaviorAnnotationsAssignment_9_3_in_rule__ActorClass__Group_9__3__Impl23674);
+            	    pushFollow(FOLLOW_25);
             	    rule__ActorClass__BehaviorAnnotationsAssignment_9_3();
 
             	    state._fsp--;
@@ -32649,21 +32649,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group_9__4"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11501:1: rule__ActorClass__Group_9__4 : rule__ActorClass__Group_9__4__Impl rule__ActorClass__Group_9__5 ;
+    // InternalRoom.g:11504:1: rule__ActorClass__Group_9__4 : rule__ActorClass__Group_9__4__Impl rule__ActorClass__Group_9__5 ;
     public final void rule__ActorClass__Group_9__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11505:1: ( rule__ActorClass__Group_9__4__Impl rule__ActorClass__Group_9__5 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11506:2: rule__ActorClass__Group_9__4__Impl rule__ActorClass__Group_9__5
+            // InternalRoom.g:11508:1: ( rule__ActorClass__Group_9__4__Impl rule__ActorClass__Group_9__5 )
+            // InternalRoom.g:11509:2: rule__ActorClass__Group_9__4__Impl rule__ActorClass__Group_9__5
             {
-            pushFollow(FOLLOW_rule__ActorClass__Group_9__4__Impl_in_rule__ActorClass__Group_9__423705);
+            pushFollow(FOLLOW_56);
             rule__ActorClass__Group_9__4__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ActorClass__Group_9__5_in_rule__ActorClass__Group_9__423708);
+            pushFollow(FOLLOW_2);
             rule__ActorClass__Group_9__5();
 
             state._fsp--;
@@ -32687,20 +32687,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group_9__4__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11513:1: rule__ActorClass__Group_9__4__Impl : ( ( rule__ActorClass__Alternatives_9_4 )* ) ;
+    // InternalRoom.g:11516:1: rule__ActorClass__Group_9__4__Impl : ( ( rule__ActorClass__Alternatives_9_4 )* ) ;
     public final void rule__ActorClass__Group_9__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11517:1: ( ( ( rule__ActorClass__Alternatives_9_4 )* ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11518:1: ( ( rule__ActorClass__Alternatives_9_4 )* )
+            // InternalRoom.g:11520:1: ( ( ( rule__ActorClass__Alternatives_9_4 )* ) )
+            // InternalRoom.g:11521:1: ( ( rule__ActorClass__Alternatives_9_4 )* )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11518:1: ( ( rule__ActorClass__Alternatives_9_4 )* )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11519:1: ( rule__ActorClass__Alternatives_9_4 )*
+            // InternalRoom.g:11521:1: ( ( rule__ActorClass__Alternatives_9_4 )* )
+            // InternalRoom.g:11522:1: ( rule__ActorClass__Alternatives_9_4 )*
             {
              before(grammarAccess.getActorClassAccess().getAlternatives_9_4()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11520:1: ( rule__ActorClass__Alternatives_9_4 )*
+            // InternalRoom.g:11523:1: ( rule__ActorClass__Alternatives_9_4 )*
             loop123:
             do {
                 int alt123=2;
@@ -32713,9 +32713,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
                 switch (alt123) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11520:2: rule__ActorClass__Alternatives_9_4
+            	    // InternalRoom.g:11523:2: rule__ActorClass__Alternatives_9_4
             	    {
-            	    pushFollow(FOLLOW_rule__ActorClass__Alternatives_9_4_in_rule__ActorClass__Group_9__4__Impl23735);
+            	    pushFollow(FOLLOW_57);
             	    rule__ActorClass__Alternatives_9_4();
 
             	    state._fsp--;
@@ -32752,21 +32752,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group_9__5"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11530:1: rule__ActorClass__Group_9__5 : rule__ActorClass__Group_9__5__Impl rule__ActorClass__Group_9__6 ;
+    // InternalRoom.g:11533:1: rule__ActorClass__Group_9__5 : rule__ActorClass__Group_9__5__Impl rule__ActorClass__Group_9__6 ;
     public final void rule__ActorClass__Group_9__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11534:1: ( rule__ActorClass__Group_9__5__Impl rule__ActorClass__Group_9__6 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11535:2: rule__ActorClass__Group_9__5__Impl rule__ActorClass__Group_9__6
+            // InternalRoom.g:11537:1: ( rule__ActorClass__Group_9__5__Impl rule__ActorClass__Group_9__6 )
+            // InternalRoom.g:11538:2: rule__ActorClass__Group_9__5__Impl rule__ActorClass__Group_9__6
             {
-            pushFollow(FOLLOW_rule__ActorClass__Group_9__5__Impl_in_rule__ActorClass__Group_9__523766);
+            pushFollow(FOLLOW_56);
             rule__ActorClass__Group_9__5__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ActorClass__Group_9__6_in_rule__ActorClass__Group_9__523769);
+            pushFollow(FOLLOW_2);
             rule__ActorClass__Group_9__6();
 
             state._fsp--;
@@ -32790,20 +32790,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group_9__5__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11542:1: rule__ActorClass__Group_9__5__Impl : ( ( rule__ActorClass__StateMachineAssignment_9_5 )? ) ;
+    // InternalRoom.g:11545:1: rule__ActorClass__Group_9__5__Impl : ( ( rule__ActorClass__StateMachineAssignment_9_5 )? ) ;
     public final void rule__ActorClass__Group_9__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11546:1: ( ( ( rule__ActorClass__StateMachineAssignment_9_5 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11547:1: ( ( rule__ActorClass__StateMachineAssignment_9_5 )? )
+            // InternalRoom.g:11549:1: ( ( ( rule__ActorClass__StateMachineAssignment_9_5 )? ) )
+            // InternalRoom.g:11550:1: ( ( rule__ActorClass__StateMachineAssignment_9_5 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11547:1: ( ( rule__ActorClass__StateMachineAssignment_9_5 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11548:1: ( rule__ActorClass__StateMachineAssignment_9_5 )?
+            // InternalRoom.g:11550:1: ( ( rule__ActorClass__StateMachineAssignment_9_5 )? )
+            // InternalRoom.g:11551:1: ( rule__ActorClass__StateMachineAssignment_9_5 )?
             {
              before(grammarAccess.getActorClassAccess().getStateMachineAssignment_9_5()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11549:1: ( rule__ActorClass__StateMachineAssignment_9_5 )?
+            // InternalRoom.g:11552:1: ( rule__ActorClass__StateMachineAssignment_9_5 )?
             int alt124=2;
             int LA124_0 = input.LA(1);
 
@@ -32812,9 +32812,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt124) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11549:2: rule__ActorClass__StateMachineAssignment_9_5
+                    // InternalRoom.g:11552:2: rule__ActorClass__StateMachineAssignment_9_5
                     {
-                    pushFollow(FOLLOW_rule__ActorClass__StateMachineAssignment_9_5_in_rule__ActorClass__Group_9__5__Impl23796);
+                    pushFollow(FOLLOW_2);
                     rule__ActorClass__StateMachineAssignment_9_5();
 
                     state._fsp--;
@@ -32848,16 +32848,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group_9__6"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11559:1: rule__ActorClass__Group_9__6 : rule__ActorClass__Group_9__6__Impl ;
+    // InternalRoom.g:11562:1: rule__ActorClass__Group_9__6 : rule__ActorClass__Group_9__6__Impl ;
     public final void rule__ActorClass__Group_9__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11563:1: ( rule__ActorClass__Group_9__6__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11564:2: rule__ActorClass__Group_9__6__Impl
+            // InternalRoom.g:11566:1: ( rule__ActorClass__Group_9__6__Impl )
+            // InternalRoom.g:11567:2: rule__ActorClass__Group_9__6__Impl
             {
-            pushFollow(FOLLOW_rule__ActorClass__Group_9__6__Impl_in_rule__ActorClass__Group_9__623827);
+            pushFollow(FOLLOW_2);
             rule__ActorClass__Group_9__6__Impl();
 
             state._fsp--;
@@ -32881,20 +32881,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__Group_9__6__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11570:1: rule__ActorClass__Group_9__6__Impl : ( '}' ) ;
+    // InternalRoom.g:11573:1: rule__ActorClass__Group_9__6__Impl : ( '}' ) ;
     public final void rule__ActorClass__Group_9__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11574:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11575:1: ( '}' )
+            // InternalRoom.g:11577:1: ( ( '}' ) )
+            // InternalRoom.g:11578:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11575:1: ( '}' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11576:1: '}'
+            // InternalRoom.g:11578:1: ( '}' )
+            // InternalRoom.g:11579:1: '}'
             {
              before(grammarAccess.getActorClassAccess().getRightCurlyBracketKeyword_9_6()); 
-            match(input,42,FOLLOW_42_in_rule__ActorClass__Group_9__6__Impl23855); 
+            match(input,42,FOLLOW_2); 
              after(grammarAccess.getActorClassAccess().getRightCurlyBracketKeyword_9_6()); 
 
             }
@@ -32918,21 +32918,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Port__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11603:1: rule__Port__Group__0 : rule__Port__Group__0__Impl rule__Port__Group__1 ;
+    // InternalRoom.g:11606:1: rule__Port__Group__0 : rule__Port__Group__0__Impl rule__Port__Group__1 ;
     public final void rule__Port__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11607:1: ( rule__Port__Group__0__Impl rule__Port__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11608:2: rule__Port__Group__0__Impl rule__Port__Group__1
+            // InternalRoom.g:11610:1: ( rule__Port__Group__0__Impl rule__Port__Group__1 )
+            // InternalRoom.g:11611:2: rule__Port__Group__0__Impl rule__Port__Group__1
             {
-            pushFollow(FOLLOW_rule__Port__Group__0__Impl_in_rule__Port__Group__023900);
+            pushFollow(FOLLOW_58);
             rule__Port__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Port__Group__1_in_rule__Port__Group__023903);
+            pushFollow(FOLLOW_2);
             rule__Port__Group__1();
 
             state._fsp--;
@@ -32956,20 +32956,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Port__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11615:1: rule__Port__Group__0__Impl : ( ( rule__Port__ConjugatedAssignment_0 )? ) ;
+    // InternalRoom.g:11618:1: rule__Port__Group__0__Impl : ( ( rule__Port__ConjugatedAssignment_0 )? ) ;
     public final void rule__Port__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11619:1: ( ( ( rule__Port__ConjugatedAssignment_0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11620:1: ( ( rule__Port__ConjugatedAssignment_0 )? )
+            // InternalRoom.g:11622:1: ( ( ( rule__Port__ConjugatedAssignment_0 )? ) )
+            // InternalRoom.g:11623:1: ( ( rule__Port__ConjugatedAssignment_0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11620:1: ( ( rule__Port__ConjugatedAssignment_0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11621:1: ( rule__Port__ConjugatedAssignment_0 )?
+            // InternalRoom.g:11623:1: ( ( rule__Port__ConjugatedAssignment_0 )? )
+            // InternalRoom.g:11624:1: ( rule__Port__ConjugatedAssignment_0 )?
             {
              before(grammarAccess.getPortAccess().getConjugatedAssignment_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11622:1: ( rule__Port__ConjugatedAssignment_0 )?
+            // InternalRoom.g:11625:1: ( rule__Port__ConjugatedAssignment_0 )?
             int alt125=2;
             int LA125_0 = input.LA(1);
 
@@ -32978,9 +32978,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt125) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11622:2: rule__Port__ConjugatedAssignment_0
+                    // InternalRoom.g:11625:2: rule__Port__ConjugatedAssignment_0
                     {
-                    pushFollow(FOLLOW_rule__Port__ConjugatedAssignment_0_in_rule__Port__Group__0__Impl23930);
+                    pushFollow(FOLLOW_2);
                     rule__Port__ConjugatedAssignment_0();
 
                     state._fsp--;
@@ -33014,21 +33014,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Port__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11632:1: rule__Port__Group__1 : rule__Port__Group__1__Impl rule__Port__Group__2 ;
+    // InternalRoom.g:11635:1: rule__Port__Group__1 : rule__Port__Group__1__Impl rule__Port__Group__2 ;
     public final void rule__Port__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11636:1: ( rule__Port__Group__1__Impl rule__Port__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11637:2: rule__Port__Group__1__Impl rule__Port__Group__2
+            // InternalRoom.g:11639:1: ( rule__Port__Group__1__Impl rule__Port__Group__2 )
+            // InternalRoom.g:11640:2: rule__Port__Group__1__Impl rule__Port__Group__2
             {
-            pushFollow(FOLLOW_rule__Port__Group__1__Impl_in_rule__Port__Group__123961);
+            pushFollow(FOLLOW_3);
             rule__Port__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Port__Group__2_in_rule__Port__Group__123964);
+            pushFollow(FOLLOW_2);
             rule__Port__Group__2();
 
             state._fsp--;
@@ -33052,20 +33052,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Port__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11644:1: rule__Port__Group__1__Impl : ( 'Port' ) ;
+    // InternalRoom.g:11647:1: rule__Port__Group__1__Impl : ( 'Port' ) ;
     public final void rule__Port__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11648:1: ( ( 'Port' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11649:1: ( 'Port' )
+            // InternalRoom.g:11651:1: ( ( 'Port' ) )
+            // InternalRoom.g:11652:1: ( 'Port' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11649:1: ( 'Port' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11650:1: 'Port'
+            // InternalRoom.g:11652:1: ( 'Port' )
+            // InternalRoom.g:11653:1: 'Port'
             {
              before(grammarAccess.getPortAccess().getPortKeyword_1()); 
-            match(input,75,FOLLOW_75_in_rule__Port__Group__1__Impl23992); 
+            match(input,75,FOLLOW_2); 
              after(grammarAccess.getPortAccess().getPortKeyword_1()); 
 
             }
@@ -33089,21 +33089,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Port__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11663:1: rule__Port__Group__2 : rule__Port__Group__2__Impl rule__Port__Group__3 ;
+    // InternalRoom.g:11666:1: rule__Port__Group__2 : rule__Port__Group__2__Impl rule__Port__Group__3 ;
     public final void rule__Port__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11667:1: ( rule__Port__Group__2__Impl rule__Port__Group__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11668:2: rule__Port__Group__2__Impl rule__Port__Group__3
+            // InternalRoom.g:11670:1: ( rule__Port__Group__2__Impl rule__Port__Group__3 )
+            // InternalRoom.g:11671:2: rule__Port__Group__2__Impl rule__Port__Group__3
             {
-            pushFollow(FOLLOW_rule__Port__Group__2__Impl_in_rule__Port__Group__224023);
+            pushFollow(FOLLOW_28);
             rule__Port__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Port__Group__3_in_rule__Port__Group__224026);
+            pushFollow(FOLLOW_2);
             rule__Port__Group__3();
 
             state._fsp--;
@@ -33127,23 +33127,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Port__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11675:1: rule__Port__Group__2__Impl : ( ( rule__Port__NameAssignment_2 ) ) ;
+    // InternalRoom.g:11678:1: rule__Port__Group__2__Impl : ( ( rule__Port__NameAssignment_2 ) ) ;
     public final void rule__Port__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11679:1: ( ( ( rule__Port__NameAssignment_2 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11680:1: ( ( rule__Port__NameAssignment_2 ) )
+            // InternalRoom.g:11682:1: ( ( ( rule__Port__NameAssignment_2 ) ) )
+            // InternalRoom.g:11683:1: ( ( rule__Port__NameAssignment_2 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11680:1: ( ( rule__Port__NameAssignment_2 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11681:1: ( rule__Port__NameAssignment_2 )
+            // InternalRoom.g:11683:1: ( ( rule__Port__NameAssignment_2 ) )
+            // InternalRoom.g:11684:1: ( rule__Port__NameAssignment_2 )
             {
              before(grammarAccess.getPortAccess().getNameAssignment_2()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11682:1: ( rule__Port__NameAssignment_2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11682:2: rule__Port__NameAssignment_2
+            // InternalRoom.g:11685:1: ( rule__Port__NameAssignment_2 )
+            // InternalRoom.g:11685:2: rule__Port__NameAssignment_2
             {
-            pushFollow(FOLLOW_rule__Port__NameAssignment_2_in_rule__Port__Group__2__Impl24053);
+            pushFollow(FOLLOW_2);
             rule__Port__NameAssignment_2();
 
             state._fsp--;
@@ -33174,21 +33174,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Port__Group__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11692:1: rule__Port__Group__3 : rule__Port__Group__3__Impl rule__Port__Group__4 ;
+    // InternalRoom.g:11695:1: rule__Port__Group__3 : rule__Port__Group__3__Impl rule__Port__Group__4 ;
     public final void rule__Port__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11696:1: ( rule__Port__Group__3__Impl rule__Port__Group__4 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11697:2: rule__Port__Group__3__Impl rule__Port__Group__4
+            // InternalRoom.g:11699:1: ( rule__Port__Group__3__Impl rule__Port__Group__4 )
+            // InternalRoom.g:11700:2: rule__Port__Group__3__Impl rule__Port__Group__4
             {
-            pushFollow(FOLLOW_rule__Port__Group__3__Impl_in_rule__Port__Group__324083);
+            pushFollow(FOLLOW_28);
             rule__Port__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Port__Group__4_in_rule__Port__Group__324086);
+            pushFollow(FOLLOW_2);
             rule__Port__Group__4();
 
             state._fsp--;
@@ -33212,20 +33212,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Port__Group__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11704:1: rule__Port__Group__3__Impl : ( ( rule__Port__MultiplicityAssignment_3 )? ) ;
+    // InternalRoom.g:11707:1: rule__Port__Group__3__Impl : ( ( rule__Port__MultiplicityAssignment_3 )? ) ;
     public final void rule__Port__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11708:1: ( ( ( rule__Port__MultiplicityAssignment_3 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11709:1: ( ( rule__Port__MultiplicityAssignment_3 )? )
+            // InternalRoom.g:11711:1: ( ( ( rule__Port__MultiplicityAssignment_3 )? ) )
+            // InternalRoom.g:11712:1: ( ( rule__Port__MultiplicityAssignment_3 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11709:1: ( ( rule__Port__MultiplicityAssignment_3 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11710:1: ( rule__Port__MultiplicityAssignment_3 )?
+            // InternalRoom.g:11712:1: ( ( rule__Port__MultiplicityAssignment_3 )? )
+            // InternalRoom.g:11713:1: ( rule__Port__MultiplicityAssignment_3 )?
             {
              before(grammarAccess.getPortAccess().getMultiplicityAssignment_3()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11711:1: ( rule__Port__MultiplicityAssignment_3 )?
+            // InternalRoom.g:11714:1: ( rule__Port__MultiplicityAssignment_3 )?
             int alt126=2;
             int LA126_0 = input.LA(1);
 
@@ -33234,9 +33234,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt126) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11711:2: rule__Port__MultiplicityAssignment_3
+                    // InternalRoom.g:11714:2: rule__Port__MultiplicityAssignment_3
                     {
-                    pushFollow(FOLLOW_rule__Port__MultiplicityAssignment_3_in_rule__Port__Group__3__Impl24113);
+                    pushFollow(FOLLOW_2);
                     rule__Port__MultiplicityAssignment_3();
 
                     state._fsp--;
@@ -33270,21 +33270,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Port__Group__4"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11721:1: rule__Port__Group__4 : rule__Port__Group__4__Impl rule__Port__Group__5 ;
+    // InternalRoom.g:11724:1: rule__Port__Group__4 : rule__Port__Group__4__Impl rule__Port__Group__5 ;
     public final void rule__Port__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11725:1: ( rule__Port__Group__4__Impl rule__Port__Group__5 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11726:2: rule__Port__Group__4__Impl rule__Port__Group__5
+            // InternalRoom.g:11728:1: ( rule__Port__Group__4__Impl rule__Port__Group__5 )
+            // InternalRoom.g:11729:2: rule__Port__Group__4__Impl rule__Port__Group__5
             {
-            pushFollow(FOLLOW_rule__Port__Group__4__Impl_in_rule__Port__Group__424144);
+            pushFollow(FOLLOW_3);
             rule__Port__Group__4__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Port__Group__5_in_rule__Port__Group__424147);
+            pushFollow(FOLLOW_2);
             rule__Port__Group__5();
 
             state._fsp--;
@@ -33308,20 +33308,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Port__Group__4__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11733:1: rule__Port__Group__4__Impl : ( ':' ) ;
+    // InternalRoom.g:11736:1: rule__Port__Group__4__Impl : ( ':' ) ;
     public final void rule__Port__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11737:1: ( ( ':' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11738:1: ( ':' )
+            // InternalRoom.g:11740:1: ( ( ':' ) )
+            // InternalRoom.g:11741:1: ( ':' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11738:1: ( ':' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11739:1: ':'
+            // InternalRoom.g:11741:1: ( ':' )
+            // InternalRoom.g:11742:1: ':'
             {
              before(grammarAccess.getPortAccess().getColonKeyword_4()); 
-            match(input,43,FOLLOW_43_in_rule__Port__Group__4__Impl24175); 
+            match(input,43,FOLLOW_2); 
              after(grammarAccess.getPortAccess().getColonKeyword_4()); 
 
             }
@@ -33345,21 +33345,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Port__Group__5"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11752:1: rule__Port__Group__5 : rule__Port__Group__5__Impl rule__Port__Group__6 ;
+    // InternalRoom.g:11755:1: rule__Port__Group__5 : rule__Port__Group__5__Impl rule__Port__Group__6 ;
     public final void rule__Port__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11756:1: ( rule__Port__Group__5__Impl rule__Port__Group__6 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11757:2: rule__Port__Group__5__Impl rule__Port__Group__6
+            // InternalRoom.g:11759:1: ( rule__Port__Group__5__Impl rule__Port__Group__6 )
+            // InternalRoom.g:11760:2: rule__Port__Group__5__Impl rule__Port__Group__6
             {
-            pushFollow(FOLLOW_rule__Port__Group__5__Impl_in_rule__Port__Group__524206);
+            pushFollow(FOLLOW_14);
             rule__Port__Group__5__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Port__Group__6_in_rule__Port__Group__524209);
+            pushFollow(FOLLOW_2);
             rule__Port__Group__6();
 
             state._fsp--;
@@ -33383,23 +33383,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Port__Group__5__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11764:1: rule__Port__Group__5__Impl : ( ( rule__Port__ProtocolAssignment_5 ) ) ;
+    // InternalRoom.g:11767:1: rule__Port__Group__5__Impl : ( ( rule__Port__ProtocolAssignment_5 ) ) ;
     public final void rule__Port__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11768:1: ( ( ( rule__Port__ProtocolAssignment_5 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11769:1: ( ( rule__Port__ProtocolAssignment_5 ) )
+            // InternalRoom.g:11771:1: ( ( ( rule__Port__ProtocolAssignment_5 ) ) )
+            // InternalRoom.g:11772:1: ( ( rule__Port__ProtocolAssignment_5 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11769:1: ( ( rule__Port__ProtocolAssignment_5 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11770:1: ( rule__Port__ProtocolAssignment_5 )
+            // InternalRoom.g:11772:1: ( ( rule__Port__ProtocolAssignment_5 ) )
+            // InternalRoom.g:11773:1: ( rule__Port__ProtocolAssignment_5 )
             {
              before(grammarAccess.getPortAccess().getProtocolAssignment_5()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11771:1: ( rule__Port__ProtocolAssignment_5 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11771:2: rule__Port__ProtocolAssignment_5
+            // InternalRoom.g:11774:1: ( rule__Port__ProtocolAssignment_5 )
+            // InternalRoom.g:11774:2: rule__Port__ProtocolAssignment_5
             {
-            pushFollow(FOLLOW_rule__Port__ProtocolAssignment_5_in_rule__Port__Group__5__Impl24236);
+            pushFollow(FOLLOW_2);
             rule__Port__ProtocolAssignment_5();
 
             state._fsp--;
@@ -33430,16 +33430,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Port__Group__6"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11781:1: rule__Port__Group__6 : rule__Port__Group__6__Impl ;
+    // InternalRoom.g:11784:1: rule__Port__Group__6 : rule__Port__Group__6__Impl ;
     public final void rule__Port__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11785:1: ( rule__Port__Group__6__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11786:2: rule__Port__Group__6__Impl
+            // InternalRoom.g:11788:1: ( rule__Port__Group__6__Impl )
+            // InternalRoom.g:11789:2: rule__Port__Group__6__Impl
             {
-            pushFollow(FOLLOW_rule__Port__Group__6__Impl_in_rule__Port__Group__624266);
+            pushFollow(FOLLOW_2);
             rule__Port__Group__6__Impl();
 
             state._fsp--;
@@ -33463,20 +33463,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Port__Group__6__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11792:1: rule__Port__Group__6__Impl : ( ( rule__Port__DocuAssignment_6 )? ) ;
+    // InternalRoom.g:11795:1: rule__Port__Group__6__Impl : ( ( rule__Port__DocuAssignment_6 )? ) ;
     public final void rule__Port__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11796:1: ( ( ( rule__Port__DocuAssignment_6 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11797:1: ( ( rule__Port__DocuAssignment_6 )? )
+            // InternalRoom.g:11799:1: ( ( ( rule__Port__DocuAssignment_6 )? ) )
+            // InternalRoom.g:11800:1: ( ( rule__Port__DocuAssignment_6 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11797:1: ( ( rule__Port__DocuAssignment_6 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11798:1: ( rule__Port__DocuAssignment_6 )?
+            // InternalRoom.g:11800:1: ( ( rule__Port__DocuAssignment_6 )? )
+            // InternalRoom.g:11801:1: ( rule__Port__DocuAssignment_6 )?
             {
              before(grammarAccess.getPortAccess().getDocuAssignment_6()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11799:1: ( rule__Port__DocuAssignment_6 )?
+            // InternalRoom.g:11802:1: ( rule__Port__DocuAssignment_6 )?
             int alt127=2;
             int LA127_0 = input.LA(1);
 
@@ -33485,9 +33485,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt127) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11799:2: rule__Port__DocuAssignment_6
+                    // InternalRoom.g:11802:2: rule__Port__DocuAssignment_6
                     {
-                    pushFollow(FOLLOW_rule__Port__DocuAssignment_6_in_rule__Port__Group__6__Impl24293);
+                    pushFollow(FOLLOW_2);
                     rule__Port__DocuAssignment_6();
 
                     state._fsp--;
@@ -33521,21 +33521,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ExternalPort__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11823:1: rule__ExternalPort__Group__0 : rule__ExternalPort__Group__0__Impl rule__ExternalPort__Group__1 ;
+    // InternalRoom.g:11826:1: rule__ExternalPort__Group__0 : rule__ExternalPort__Group__0__Impl rule__ExternalPort__Group__1 ;
     public final void rule__ExternalPort__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11827:1: ( rule__ExternalPort__Group__0__Impl rule__ExternalPort__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11828:2: rule__ExternalPort__Group__0__Impl rule__ExternalPort__Group__1
+            // InternalRoom.g:11830:1: ( rule__ExternalPort__Group__0__Impl rule__ExternalPort__Group__1 )
+            // InternalRoom.g:11831:2: rule__ExternalPort__Group__0__Impl rule__ExternalPort__Group__1
             {
-            pushFollow(FOLLOW_rule__ExternalPort__Group__0__Impl_in_rule__ExternalPort__Group__024338);
+            pushFollow(FOLLOW_59);
             rule__ExternalPort__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ExternalPort__Group__1_in_rule__ExternalPort__Group__024341);
+            pushFollow(FOLLOW_2);
             rule__ExternalPort__Group__1();
 
             state._fsp--;
@@ -33559,20 +33559,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ExternalPort__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11835:1: rule__ExternalPort__Group__0__Impl : ( 'external' ) ;
+    // InternalRoom.g:11838:1: rule__ExternalPort__Group__0__Impl : ( 'external' ) ;
     public final void rule__ExternalPort__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11839:1: ( ( 'external' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11840:1: ( 'external' )
+            // InternalRoom.g:11842:1: ( ( 'external' ) )
+            // InternalRoom.g:11843:1: ( 'external' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11840:1: ( 'external' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11841:1: 'external'
+            // InternalRoom.g:11843:1: ( 'external' )
+            // InternalRoom.g:11844:1: 'external'
             {
              before(grammarAccess.getExternalPortAccess().getExternalKeyword_0()); 
-            match(input,76,FOLLOW_76_in_rule__ExternalPort__Group__0__Impl24369); 
+            match(input,76,FOLLOW_2); 
              after(grammarAccess.getExternalPortAccess().getExternalKeyword_0()); 
 
             }
@@ -33596,21 +33596,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ExternalPort__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11854:1: rule__ExternalPort__Group__1 : rule__ExternalPort__Group__1__Impl rule__ExternalPort__Group__2 ;
+    // InternalRoom.g:11857:1: rule__ExternalPort__Group__1 : rule__ExternalPort__Group__1__Impl rule__ExternalPort__Group__2 ;
     public final void rule__ExternalPort__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11858:1: ( rule__ExternalPort__Group__1__Impl rule__ExternalPort__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11859:2: rule__ExternalPort__Group__1__Impl rule__ExternalPort__Group__2
+            // InternalRoom.g:11861:1: ( rule__ExternalPort__Group__1__Impl rule__ExternalPort__Group__2 )
+            // InternalRoom.g:11862:2: rule__ExternalPort__Group__1__Impl rule__ExternalPort__Group__2
             {
-            pushFollow(FOLLOW_rule__ExternalPort__Group__1__Impl_in_rule__ExternalPort__Group__124400);
+            pushFollow(FOLLOW_3);
             rule__ExternalPort__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ExternalPort__Group__2_in_rule__ExternalPort__Group__124403);
+            pushFollow(FOLLOW_2);
             rule__ExternalPort__Group__2();
 
             state._fsp--;
@@ -33634,20 +33634,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ExternalPort__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11866:1: rule__ExternalPort__Group__1__Impl : ( 'Port' ) ;
+    // InternalRoom.g:11869:1: rule__ExternalPort__Group__1__Impl : ( 'Port' ) ;
     public final void rule__ExternalPort__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11870:1: ( ( 'Port' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11871:1: ( 'Port' )
+            // InternalRoom.g:11873:1: ( ( 'Port' ) )
+            // InternalRoom.g:11874:1: ( 'Port' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11871:1: ( 'Port' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11872:1: 'Port'
+            // InternalRoom.g:11874:1: ( 'Port' )
+            // InternalRoom.g:11875:1: 'Port'
             {
              before(grammarAccess.getExternalPortAccess().getPortKeyword_1()); 
-            match(input,75,FOLLOW_75_in_rule__ExternalPort__Group__1__Impl24431); 
+            match(input,75,FOLLOW_2); 
              after(grammarAccess.getExternalPortAccess().getPortKeyword_1()); 
 
             }
@@ -33671,16 +33671,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ExternalPort__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11885:1: rule__ExternalPort__Group__2 : rule__ExternalPort__Group__2__Impl ;
+    // InternalRoom.g:11888:1: rule__ExternalPort__Group__2 : rule__ExternalPort__Group__2__Impl ;
     public final void rule__ExternalPort__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11889:1: ( rule__ExternalPort__Group__2__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11890:2: rule__ExternalPort__Group__2__Impl
+            // InternalRoom.g:11892:1: ( rule__ExternalPort__Group__2__Impl )
+            // InternalRoom.g:11893:2: rule__ExternalPort__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__ExternalPort__Group__2__Impl_in_rule__ExternalPort__Group__224462);
+            pushFollow(FOLLOW_2);
             rule__ExternalPort__Group__2__Impl();
 
             state._fsp--;
@@ -33704,23 +33704,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ExternalPort__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11896:1: rule__ExternalPort__Group__2__Impl : ( ( rule__ExternalPort__InterfacePortAssignment_2 ) ) ;
+    // InternalRoom.g:11899:1: rule__ExternalPort__Group__2__Impl : ( ( rule__ExternalPort__InterfacePortAssignment_2 ) ) ;
     public final void rule__ExternalPort__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11900:1: ( ( ( rule__ExternalPort__InterfacePortAssignment_2 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11901:1: ( ( rule__ExternalPort__InterfacePortAssignment_2 ) )
+            // InternalRoom.g:11903:1: ( ( ( rule__ExternalPort__InterfacePortAssignment_2 ) ) )
+            // InternalRoom.g:11904:1: ( ( rule__ExternalPort__InterfacePortAssignment_2 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11901:1: ( ( rule__ExternalPort__InterfacePortAssignment_2 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11902:1: ( rule__ExternalPort__InterfacePortAssignment_2 )
+            // InternalRoom.g:11904:1: ( ( rule__ExternalPort__InterfacePortAssignment_2 ) )
+            // InternalRoom.g:11905:1: ( rule__ExternalPort__InterfacePortAssignment_2 )
             {
              before(grammarAccess.getExternalPortAccess().getInterfacePortAssignment_2()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11903:1: ( rule__ExternalPort__InterfacePortAssignment_2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11903:2: rule__ExternalPort__InterfacePortAssignment_2
+            // InternalRoom.g:11906:1: ( rule__ExternalPort__InterfacePortAssignment_2 )
+            // InternalRoom.g:11906:2: rule__ExternalPort__InterfacePortAssignment_2
             {
-            pushFollow(FOLLOW_rule__ExternalPort__InterfacePortAssignment_2_in_rule__ExternalPort__Group__2__Impl24489);
+            pushFollow(FOLLOW_2);
             rule__ExternalPort__InterfacePortAssignment_2();
 
             state._fsp--;
@@ -33751,21 +33751,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SAP__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11919:1: rule__SAP__Group__0 : rule__SAP__Group__0__Impl rule__SAP__Group__1 ;
+    // InternalRoom.g:11922:1: rule__SAP__Group__0 : rule__SAP__Group__0__Impl rule__SAP__Group__1 ;
     public final void rule__SAP__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11923:1: ( rule__SAP__Group__0__Impl rule__SAP__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11924:2: rule__SAP__Group__0__Impl rule__SAP__Group__1
+            // InternalRoom.g:11926:1: ( rule__SAP__Group__0__Impl rule__SAP__Group__1 )
+            // InternalRoom.g:11927:2: rule__SAP__Group__0__Impl rule__SAP__Group__1
             {
-            pushFollow(FOLLOW_rule__SAP__Group__0__Impl_in_rule__SAP__Group__024525);
+            pushFollow(FOLLOW_3);
             rule__SAP__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SAP__Group__1_in_rule__SAP__Group__024528);
+            pushFollow(FOLLOW_2);
             rule__SAP__Group__1();
 
             state._fsp--;
@@ -33789,20 +33789,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SAP__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11931:1: rule__SAP__Group__0__Impl : ( 'SAP' ) ;
+    // InternalRoom.g:11934:1: rule__SAP__Group__0__Impl : ( 'SAP' ) ;
     public final void rule__SAP__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11935:1: ( ( 'SAP' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11936:1: ( 'SAP' )
+            // InternalRoom.g:11938:1: ( ( 'SAP' ) )
+            // InternalRoom.g:11939:1: ( 'SAP' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11936:1: ( 'SAP' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11937:1: 'SAP'
+            // InternalRoom.g:11939:1: ( 'SAP' )
+            // InternalRoom.g:11940:1: 'SAP'
             {
              before(grammarAccess.getSAPAccess().getSAPKeyword_0()); 
-            match(input,77,FOLLOW_77_in_rule__SAP__Group__0__Impl24556); 
+            match(input,77,FOLLOW_2); 
              after(grammarAccess.getSAPAccess().getSAPKeyword_0()); 
 
             }
@@ -33826,21 +33826,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SAP__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11950:1: rule__SAP__Group__1 : rule__SAP__Group__1__Impl rule__SAP__Group__2 ;
+    // InternalRoom.g:11953:1: rule__SAP__Group__1 : rule__SAP__Group__1__Impl rule__SAP__Group__2 ;
     public final void rule__SAP__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11954:1: ( rule__SAP__Group__1__Impl rule__SAP__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11955:2: rule__SAP__Group__1__Impl rule__SAP__Group__2
+            // InternalRoom.g:11957:1: ( rule__SAP__Group__1__Impl rule__SAP__Group__2 )
+            // InternalRoom.g:11958:2: rule__SAP__Group__1__Impl rule__SAP__Group__2
             {
-            pushFollow(FOLLOW_rule__SAP__Group__1__Impl_in_rule__SAP__Group__124587);
+            pushFollow(FOLLOW_8);
             rule__SAP__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SAP__Group__2_in_rule__SAP__Group__124590);
+            pushFollow(FOLLOW_2);
             rule__SAP__Group__2();
 
             state._fsp--;
@@ -33864,23 +33864,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SAP__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11962:1: rule__SAP__Group__1__Impl : ( ( rule__SAP__NameAssignment_1 ) ) ;
+    // InternalRoom.g:11965:1: rule__SAP__Group__1__Impl : ( ( rule__SAP__NameAssignment_1 ) ) ;
     public final void rule__SAP__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11966:1: ( ( ( rule__SAP__NameAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11967:1: ( ( rule__SAP__NameAssignment_1 ) )
+            // InternalRoom.g:11969:1: ( ( ( rule__SAP__NameAssignment_1 ) ) )
+            // InternalRoom.g:11970:1: ( ( rule__SAP__NameAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11967:1: ( ( rule__SAP__NameAssignment_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11968:1: ( rule__SAP__NameAssignment_1 )
+            // InternalRoom.g:11970:1: ( ( rule__SAP__NameAssignment_1 ) )
+            // InternalRoom.g:11971:1: ( rule__SAP__NameAssignment_1 )
             {
              before(grammarAccess.getSAPAccess().getNameAssignment_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11969:1: ( rule__SAP__NameAssignment_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11969:2: rule__SAP__NameAssignment_1
+            // InternalRoom.g:11972:1: ( rule__SAP__NameAssignment_1 )
+            // InternalRoom.g:11972:2: rule__SAP__NameAssignment_1
             {
-            pushFollow(FOLLOW_rule__SAP__NameAssignment_1_in_rule__SAP__Group__1__Impl24617);
+            pushFollow(FOLLOW_2);
             rule__SAP__NameAssignment_1();
 
             state._fsp--;
@@ -33911,21 +33911,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SAP__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11979:1: rule__SAP__Group__2 : rule__SAP__Group__2__Impl rule__SAP__Group__3 ;
+    // InternalRoom.g:11982:1: rule__SAP__Group__2 : rule__SAP__Group__2__Impl rule__SAP__Group__3 ;
     public final void rule__SAP__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11983:1: ( rule__SAP__Group__2__Impl rule__SAP__Group__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11984:2: rule__SAP__Group__2__Impl rule__SAP__Group__3
+            // InternalRoom.g:11986:1: ( rule__SAP__Group__2__Impl rule__SAP__Group__3 )
+            // InternalRoom.g:11987:2: rule__SAP__Group__2__Impl rule__SAP__Group__3
             {
-            pushFollow(FOLLOW_rule__SAP__Group__2__Impl_in_rule__SAP__Group__224647);
+            pushFollow(FOLLOW_3);
             rule__SAP__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SAP__Group__3_in_rule__SAP__Group__224650);
+            pushFollow(FOLLOW_2);
             rule__SAP__Group__3();
 
             state._fsp--;
@@ -33949,20 +33949,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SAP__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11991:1: rule__SAP__Group__2__Impl : ( ':' ) ;
+    // InternalRoom.g:11994:1: rule__SAP__Group__2__Impl : ( ':' ) ;
     public final void rule__SAP__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11995:1: ( ( ':' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11996:1: ( ':' )
+            // InternalRoom.g:11998:1: ( ( ':' ) )
+            // InternalRoom.g:11999:1: ( ':' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11996:1: ( ':' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:11997:1: ':'
+            // InternalRoom.g:11999:1: ( ':' )
+            // InternalRoom.g:12000:1: ':'
             {
              before(grammarAccess.getSAPAccess().getColonKeyword_2()); 
-            match(input,43,FOLLOW_43_in_rule__SAP__Group__2__Impl24678); 
+            match(input,43,FOLLOW_2); 
              after(grammarAccess.getSAPAccess().getColonKeyword_2()); 
 
             }
@@ -33986,16 +33986,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SAP__Group__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12010:1: rule__SAP__Group__3 : rule__SAP__Group__3__Impl ;
+    // InternalRoom.g:12013:1: rule__SAP__Group__3 : rule__SAP__Group__3__Impl ;
     public final void rule__SAP__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12014:1: ( rule__SAP__Group__3__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12015:2: rule__SAP__Group__3__Impl
+            // InternalRoom.g:12017:1: ( rule__SAP__Group__3__Impl )
+            // InternalRoom.g:12018:2: rule__SAP__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__SAP__Group__3__Impl_in_rule__SAP__Group__324709);
+            pushFollow(FOLLOW_2);
             rule__SAP__Group__3__Impl();
 
             state._fsp--;
@@ -34019,23 +34019,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SAP__Group__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12021:1: rule__SAP__Group__3__Impl : ( ( rule__SAP__ProtocolAssignment_3 ) ) ;
+    // InternalRoom.g:12024:1: rule__SAP__Group__3__Impl : ( ( rule__SAP__ProtocolAssignment_3 ) ) ;
     public final void rule__SAP__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12025:1: ( ( ( rule__SAP__ProtocolAssignment_3 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12026:1: ( ( rule__SAP__ProtocolAssignment_3 ) )
+            // InternalRoom.g:12028:1: ( ( ( rule__SAP__ProtocolAssignment_3 ) ) )
+            // InternalRoom.g:12029:1: ( ( rule__SAP__ProtocolAssignment_3 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12026:1: ( ( rule__SAP__ProtocolAssignment_3 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12027:1: ( rule__SAP__ProtocolAssignment_3 )
+            // InternalRoom.g:12029:1: ( ( rule__SAP__ProtocolAssignment_3 ) )
+            // InternalRoom.g:12030:1: ( rule__SAP__ProtocolAssignment_3 )
             {
              before(grammarAccess.getSAPAccess().getProtocolAssignment_3()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12028:1: ( rule__SAP__ProtocolAssignment_3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12028:2: rule__SAP__ProtocolAssignment_3
+            // InternalRoom.g:12031:1: ( rule__SAP__ProtocolAssignment_3 )
+            // InternalRoom.g:12031:2: rule__SAP__ProtocolAssignment_3
             {
-            pushFollow(FOLLOW_rule__SAP__ProtocolAssignment_3_in_rule__SAP__Group__3__Impl24736);
+            pushFollow(FOLLOW_2);
             rule__SAP__ProtocolAssignment_3();
 
             state._fsp--;
@@ -34066,21 +34066,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SPP__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12046:1: rule__SPP__Group__0 : rule__SPP__Group__0__Impl rule__SPP__Group__1 ;
+    // InternalRoom.g:12049:1: rule__SPP__Group__0 : rule__SPP__Group__0__Impl rule__SPP__Group__1 ;
     public final void rule__SPP__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12050:1: ( rule__SPP__Group__0__Impl rule__SPP__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12051:2: rule__SPP__Group__0__Impl rule__SPP__Group__1
+            // InternalRoom.g:12053:1: ( rule__SPP__Group__0__Impl rule__SPP__Group__1 )
+            // InternalRoom.g:12054:2: rule__SPP__Group__0__Impl rule__SPP__Group__1
             {
-            pushFollow(FOLLOW_rule__SPP__Group__0__Impl_in_rule__SPP__Group__024774);
+            pushFollow(FOLLOW_3);
             rule__SPP__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SPP__Group__1_in_rule__SPP__Group__024777);
+            pushFollow(FOLLOW_2);
             rule__SPP__Group__1();
 
             state._fsp--;
@@ -34104,20 +34104,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SPP__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12058:1: rule__SPP__Group__0__Impl : ( 'SPP' ) ;
+    // InternalRoom.g:12061:1: rule__SPP__Group__0__Impl : ( 'SPP' ) ;
     public final void rule__SPP__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12062:1: ( ( 'SPP' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12063:1: ( 'SPP' )
+            // InternalRoom.g:12065:1: ( ( 'SPP' ) )
+            // InternalRoom.g:12066:1: ( 'SPP' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12063:1: ( 'SPP' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12064:1: 'SPP'
+            // InternalRoom.g:12066:1: ( 'SPP' )
+            // InternalRoom.g:12067:1: 'SPP'
             {
              before(grammarAccess.getSPPAccess().getSPPKeyword_0()); 
-            match(input,78,FOLLOW_78_in_rule__SPP__Group__0__Impl24805); 
+            match(input,78,FOLLOW_2); 
              after(grammarAccess.getSPPAccess().getSPPKeyword_0()); 
 
             }
@@ -34141,21 +34141,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SPP__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12077:1: rule__SPP__Group__1 : rule__SPP__Group__1__Impl rule__SPP__Group__2 ;
+    // InternalRoom.g:12080:1: rule__SPP__Group__1 : rule__SPP__Group__1__Impl rule__SPP__Group__2 ;
     public final void rule__SPP__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12081:1: ( rule__SPP__Group__1__Impl rule__SPP__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12082:2: rule__SPP__Group__1__Impl rule__SPP__Group__2
+            // InternalRoom.g:12084:1: ( rule__SPP__Group__1__Impl rule__SPP__Group__2 )
+            // InternalRoom.g:12085:2: rule__SPP__Group__1__Impl rule__SPP__Group__2
             {
-            pushFollow(FOLLOW_rule__SPP__Group__1__Impl_in_rule__SPP__Group__124836);
+            pushFollow(FOLLOW_8);
             rule__SPP__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SPP__Group__2_in_rule__SPP__Group__124839);
+            pushFollow(FOLLOW_2);
             rule__SPP__Group__2();
 
             state._fsp--;
@@ -34179,23 +34179,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SPP__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12089:1: rule__SPP__Group__1__Impl : ( ( rule__SPP__NameAssignment_1 ) ) ;
+    // InternalRoom.g:12092:1: rule__SPP__Group__1__Impl : ( ( rule__SPP__NameAssignment_1 ) ) ;
     public final void rule__SPP__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12093:1: ( ( ( rule__SPP__NameAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12094:1: ( ( rule__SPP__NameAssignment_1 ) )
+            // InternalRoom.g:12096:1: ( ( ( rule__SPP__NameAssignment_1 ) ) )
+            // InternalRoom.g:12097:1: ( ( rule__SPP__NameAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12094:1: ( ( rule__SPP__NameAssignment_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12095:1: ( rule__SPP__NameAssignment_1 )
+            // InternalRoom.g:12097:1: ( ( rule__SPP__NameAssignment_1 ) )
+            // InternalRoom.g:12098:1: ( rule__SPP__NameAssignment_1 )
             {
              before(grammarAccess.getSPPAccess().getNameAssignment_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12096:1: ( rule__SPP__NameAssignment_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12096:2: rule__SPP__NameAssignment_1
+            // InternalRoom.g:12099:1: ( rule__SPP__NameAssignment_1 )
+            // InternalRoom.g:12099:2: rule__SPP__NameAssignment_1
             {
-            pushFollow(FOLLOW_rule__SPP__NameAssignment_1_in_rule__SPP__Group__1__Impl24866);
+            pushFollow(FOLLOW_2);
             rule__SPP__NameAssignment_1();
 
             state._fsp--;
@@ -34226,21 +34226,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SPP__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12106:1: rule__SPP__Group__2 : rule__SPP__Group__2__Impl rule__SPP__Group__3 ;
+    // InternalRoom.g:12109:1: rule__SPP__Group__2 : rule__SPP__Group__2__Impl rule__SPP__Group__3 ;
     public final void rule__SPP__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12110:1: ( rule__SPP__Group__2__Impl rule__SPP__Group__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12111:2: rule__SPP__Group__2__Impl rule__SPP__Group__3
+            // InternalRoom.g:12113:1: ( rule__SPP__Group__2__Impl rule__SPP__Group__3 )
+            // InternalRoom.g:12114:2: rule__SPP__Group__2__Impl rule__SPP__Group__3
             {
-            pushFollow(FOLLOW_rule__SPP__Group__2__Impl_in_rule__SPP__Group__224896);
+            pushFollow(FOLLOW_3);
             rule__SPP__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SPP__Group__3_in_rule__SPP__Group__224899);
+            pushFollow(FOLLOW_2);
             rule__SPP__Group__3();
 
             state._fsp--;
@@ -34264,20 +34264,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SPP__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12118:1: rule__SPP__Group__2__Impl : ( ':' ) ;
+    // InternalRoom.g:12121:1: rule__SPP__Group__2__Impl : ( ':' ) ;
     public final void rule__SPP__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12122:1: ( ( ':' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12123:1: ( ':' )
+            // InternalRoom.g:12125:1: ( ( ':' ) )
+            // InternalRoom.g:12126:1: ( ':' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12123:1: ( ':' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12124:1: ':'
+            // InternalRoom.g:12126:1: ( ':' )
+            // InternalRoom.g:12127:1: ':'
             {
              before(grammarAccess.getSPPAccess().getColonKeyword_2()); 
-            match(input,43,FOLLOW_43_in_rule__SPP__Group__2__Impl24927); 
+            match(input,43,FOLLOW_2); 
              after(grammarAccess.getSPPAccess().getColonKeyword_2()); 
 
             }
@@ -34301,16 +34301,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SPP__Group__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12137:1: rule__SPP__Group__3 : rule__SPP__Group__3__Impl ;
+    // InternalRoom.g:12140:1: rule__SPP__Group__3 : rule__SPP__Group__3__Impl ;
     public final void rule__SPP__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12141:1: ( rule__SPP__Group__3__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12142:2: rule__SPP__Group__3__Impl
+            // InternalRoom.g:12144:1: ( rule__SPP__Group__3__Impl )
+            // InternalRoom.g:12145:2: rule__SPP__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__SPP__Group__3__Impl_in_rule__SPP__Group__324958);
+            pushFollow(FOLLOW_2);
             rule__SPP__Group__3__Impl();
 
             state._fsp--;
@@ -34334,23 +34334,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SPP__Group__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12148:1: rule__SPP__Group__3__Impl : ( ( rule__SPP__ProtocolAssignment_3 ) ) ;
+    // InternalRoom.g:12151:1: rule__SPP__Group__3__Impl : ( ( rule__SPP__ProtocolAssignment_3 ) ) ;
     public final void rule__SPP__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12152:1: ( ( ( rule__SPP__ProtocolAssignment_3 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12153:1: ( ( rule__SPP__ProtocolAssignment_3 ) )
+            // InternalRoom.g:12155:1: ( ( ( rule__SPP__ProtocolAssignment_3 ) ) )
+            // InternalRoom.g:12156:1: ( ( rule__SPP__ProtocolAssignment_3 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12153:1: ( ( rule__SPP__ProtocolAssignment_3 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12154:1: ( rule__SPP__ProtocolAssignment_3 )
+            // InternalRoom.g:12156:1: ( ( rule__SPP__ProtocolAssignment_3 ) )
+            // InternalRoom.g:12157:1: ( rule__SPP__ProtocolAssignment_3 )
             {
              before(grammarAccess.getSPPAccess().getProtocolAssignment_3()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12155:1: ( rule__SPP__ProtocolAssignment_3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12155:2: rule__SPP__ProtocolAssignment_3
+            // InternalRoom.g:12158:1: ( rule__SPP__ProtocolAssignment_3 )
+            // InternalRoom.g:12158:2: rule__SPP__ProtocolAssignment_3
             {
-            pushFollow(FOLLOW_rule__SPP__ProtocolAssignment_3_in_rule__SPP__Group__3__Impl24985);
+            pushFollow(FOLLOW_2);
             rule__SPP__ProtocolAssignment_3();
 
             state._fsp--;
@@ -34381,21 +34381,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ServiceImplementation__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12173:1: rule__ServiceImplementation__Group__0 : rule__ServiceImplementation__Group__0__Impl rule__ServiceImplementation__Group__1 ;
+    // InternalRoom.g:12176:1: rule__ServiceImplementation__Group__0 : rule__ServiceImplementation__Group__0__Impl rule__ServiceImplementation__Group__1 ;
     public final void rule__ServiceImplementation__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12177:1: ( rule__ServiceImplementation__Group__0__Impl rule__ServiceImplementation__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12178:2: rule__ServiceImplementation__Group__0__Impl rule__ServiceImplementation__Group__1
+            // InternalRoom.g:12180:1: ( rule__ServiceImplementation__Group__0__Impl rule__ServiceImplementation__Group__1 )
+            // InternalRoom.g:12181:2: rule__ServiceImplementation__Group__0__Impl rule__ServiceImplementation__Group__1
             {
-            pushFollow(FOLLOW_rule__ServiceImplementation__Group__0__Impl_in_rule__ServiceImplementation__Group__025023);
+            pushFollow(FOLLOW_60);
             rule__ServiceImplementation__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ServiceImplementation__Group__1_in_rule__ServiceImplementation__Group__025026);
+            pushFollow(FOLLOW_2);
             rule__ServiceImplementation__Group__1();
 
             state._fsp--;
@@ -34419,20 +34419,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ServiceImplementation__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12185:1: rule__ServiceImplementation__Group__0__Impl : ( 'ServiceImplementation' ) ;
+    // InternalRoom.g:12188:1: rule__ServiceImplementation__Group__0__Impl : ( 'ServiceImplementation' ) ;
     public final void rule__ServiceImplementation__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12189:1: ( ( 'ServiceImplementation' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12190:1: ( 'ServiceImplementation' )
+            // InternalRoom.g:12192:1: ( ( 'ServiceImplementation' ) )
+            // InternalRoom.g:12193:1: ( 'ServiceImplementation' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12190:1: ( 'ServiceImplementation' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12191:1: 'ServiceImplementation'
+            // InternalRoom.g:12193:1: ( 'ServiceImplementation' )
+            // InternalRoom.g:12194:1: 'ServiceImplementation'
             {
              before(grammarAccess.getServiceImplementationAccess().getServiceImplementationKeyword_0()); 
-            match(input,79,FOLLOW_79_in_rule__ServiceImplementation__Group__0__Impl25054); 
+            match(input,79,FOLLOW_2); 
              after(grammarAccess.getServiceImplementationAccess().getServiceImplementationKeyword_0()); 
 
             }
@@ -34456,21 +34456,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ServiceImplementation__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12204:1: rule__ServiceImplementation__Group__1 : rule__ServiceImplementation__Group__1__Impl rule__ServiceImplementation__Group__2 ;
+    // InternalRoom.g:12207:1: rule__ServiceImplementation__Group__1 : rule__ServiceImplementation__Group__1__Impl rule__ServiceImplementation__Group__2 ;
     public final void rule__ServiceImplementation__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12208:1: ( rule__ServiceImplementation__Group__1__Impl rule__ServiceImplementation__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12209:2: rule__ServiceImplementation__Group__1__Impl rule__ServiceImplementation__Group__2
+            // InternalRoom.g:12211:1: ( rule__ServiceImplementation__Group__1__Impl rule__ServiceImplementation__Group__2 )
+            // InternalRoom.g:12212:2: rule__ServiceImplementation__Group__1__Impl rule__ServiceImplementation__Group__2
             {
-            pushFollow(FOLLOW_rule__ServiceImplementation__Group__1__Impl_in_rule__ServiceImplementation__Group__125085);
+            pushFollow(FOLLOW_3);
             rule__ServiceImplementation__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ServiceImplementation__Group__2_in_rule__ServiceImplementation__Group__125088);
+            pushFollow(FOLLOW_2);
             rule__ServiceImplementation__Group__2();
 
             state._fsp--;
@@ -34494,20 +34494,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ServiceImplementation__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12216:1: rule__ServiceImplementation__Group__1__Impl : ( 'of' ) ;
+    // InternalRoom.g:12219:1: rule__ServiceImplementation__Group__1__Impl : ( 'of' ) ;
     public final void rule__ServiceImplementation__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12220:1: ( ( 'of' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12221:1: ( 'of' )
+            // InternalRoom.g:12223:1: ( ( 'of' ) )
+            // InternalRoom.g:12224:1: ( 'of' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12221:1: ( 'of' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12222:1: 'of'
+            // InternalRoom.g:12224:1: ( 'of' )
+            // InternalRoom.g:12225:1: 'of'
             {
              before(grammarAccess.getServiceImplementationAccess().getOfKeyword_1()); 
-            match(input,50,FOLLOW_50_in_rule__ServiceImplementation__Group__1__Impl25116); 
+            match(input,50,FOLLOW_2); 
              after(grammarAccess.getServiceImplementationAccess().getOfKeyword_1()); 
 
             }
@@ -34531,16 +34531,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ServiceImplementation__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12235:1: rule__ServiceImplementation__Group__2 : rule__ServiceImplementation__Group__2__Impl ;
+    // InternalRoom.g:12238:1: rule__ServiceImplementation__Group__2 : rule__ServiceImplementation__Group__2__Impl ;
     public final void rule__ServiceImplementation__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12239:1: ( rule__ServiceImplementation__Group__2__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12240:2: rule__ServiceImplementation__Group__2__Impl
+            // InternalRoom.g:12242:1: ( rule__ServiceImplementation__Group__2__Impl )
+            // InternalRoom.g:12243:2: rule__ServiceImplementation__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__ServiceImplementation__Group__2__Impl_in_rule__ServiceImplementation__Group__225147);
+            pushFollow(FOLLOW_2);
             rule__ServiceImplementation__Group__2__Impl();
 
             state._fsp--;
@@ -34564,23 +34564,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ServiceImplementation__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12246:1: rule__ServiceImplementation__Group__2__Impl : ( ( rule__ServiceImplementation__SppAssignment_2 ) ) ;
+    // InternalRoom.g:12249:1: rule__ServiceImplementation__Group__2__Impl : ( ( rule__ServiceImplementation__SppAssignment_2 ) ) ;
     public final void rule__ServiceImplementation__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12250:1: ( ( ( rule__ServiceImplementation__SppAssignment_2 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12251:1: ( ( rule__ServiceImplementation__SppAssignment_2 ) )
+            // InternalRoom.g:12253:1: ( ( ( rule__ServiceImplementation__SppAssignment_2 ) ) )
+            // InternalRoom.g:12254:1: ( ( rule__ServiceImplementation__SppAssignment_2 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12251:1: ( ( rule__ServiceImplementation__SppAssignment_2 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12252:1: ( rule__ServiceImplementation__SppAssignment_2 )
+            // InternalRoom.g:12254:1: ( ( rule__ServiceImplementation__SppAssignment_2 ) )
+            // InternalRoom.g:12255:1: ( rule__ServiceImplementation__SppAssignment_2 )
             {
              before(grammarAccess.getServiceImplementationAccess().getSppAssignment_2()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12253:1: ( rule__ServiceImplementation__SppAssignment_2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12253:2: rule__ServiceImplementation__SppAssignment_2
+            // InternalRoom.g:12256:1: ( rule__ServiceImplementation__SppAssignment_2 )
+            // InternalRoom.g:12256:2: rule__ServiceImplementation__SppAssignment_2
             {
-            pushFollow(FOLLOW_rule__ServiceImplementation__SppAssignment_2_in_rule__ServiceImplementation__Group__2__Impl25174);
+            pushFollow(FOLLOW_2);
             rule__ServiceImplementation__SppAssignment_2();
 
             state._fsp--;
@@ -34611,21 +34611,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__LogicalSystem__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12269:1: rule__LogicalSystem__Group__0 : rule__LogicalSystem__Group__0__Impl rule__LogicalSystem__Group__1 ;
+    // InternalRoom.g:12272:1: rule__LogicalSystem__Group__0 : rule__LogicalSystem__Group__0__Impl rule__LogicalSystem__Group__1 ;
     public final void rule__LogicalSystem__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12273:1: ( rule__LogicalSystem__Group__0__Impl rule__LogicalSystem__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12274:2: rule__LogicalSystem__Group__0__Impl rule__LogicalSystem__Group__1
+            // InternalRoom.g:12276:1: ( rule__LogicalSystem__Group__0__Impl rule__LogicalSystem__Group__1 )
+            // InternalRoom.g:12277:2: rule__LogicalSystem__Group__0__Impl rule__LogicalSystem__Group__1
             {
-            pushFollow(FOLLOW_rule__LogicalSystem__Group__0__Impl_in_rule__LogicalSystem__Group__025210);
+            pushFollow(FOLLOW_3);
             rule__LogicalSystem__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__LogicalSystem__Group__1_in_rule__LogicalSystem__Group__025213);
+            pushFollow(FOLLOW_2);
             rule__LogicalSystem__Group__1();
 
             state._fsp--;
@@ -34649,20 +34649,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__LogicalSystem__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12281:1: rule__LogicalSystem__Group__0__Impl : ( 'LogicalSystem' ) ;
+    // InternalRoom.g:12284:1: rule__LogicalSystem__Group__0__Impl : ( 'LogicalSystem' ) ;
     public final void rule__LogicalSystem__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12285:1: ( ( 'LogicalSystem' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12286:1: ( 'LogicalSystem' )
+            // InternalRoom.g:12288:1: ( ( 'LogicalSystem' ) )
+            // InternalRoom.g:12289:1: ( 'LogicalSystem' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12286:1: ( 'LogicalSystem' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12287:1: 'LogicalSystem'
+            // InternalRoom.g:12289:1: ( 'LogicalSystem' )
+            // InternalRoom.g:12290:1: 'LogicalSystem'
             {
              before(grammarAccess.getLogicalSystemAccess().getLogicalSystemKeyword_0()); 
-            match(input,22,FOLLOW_22_in_rule__LogicalSystem__Group__0__Impl25241); 
+            match(input,22,FOLLOW_2); 
              after(grammarAccess.getLogicalSystemAccess().getLogicalSystemKeyword_0()); 
 
             }
@@ -34686,21 +34686,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__LogicalSystem__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12300:1: rule__LogicalSystem__Group__1 : rule__LogicalSystem__Group__1__Impl rule__LogicalSystem__Group__2 ;
+    // InternalRoom.g:12303:1: rule__LogicalSystem__Group__1 : rule__LogicalSystem__Group__1__Impl rule__LogicalSystem__Group__2 ;
     public final void rule__LogicalSystem__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12304:1: ( rule__LogicalSystem__Group__1__Impl rule__LogicalSystem__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12305:2: rule__LogicalSystem__Group__1__Impl rule__LogicalSystem__Group__2
+            // InternalRoom.g:12307:1: ( rule__LogicalSystem__Group__1__Impl rule__LogicalSystem__Group__2 )
+            // InternalRoom.g:12308:2: rule__LogicalSystem__Group__1__Impl rule__LogicalSystem__Group__2
             {
-            pushFollow(FOLLOW_rule__LogicalSystem__Group__1__Impl_in_rule__LogicalSystem__Group__125272);
+            pushFollow(FOLLOW_4);
             rule__LogicalSystem__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__LogicalSystem__Group__2_in_rule__LogicalSystem__Group__125275);
+            pushFollow(FOLLOW_2);
             rule__LogicalSystem__Group__2();
 
             state._fsp--;
@@ -34724,23 +34724,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__LogicalSystem__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12312:1: rule__LogicalSystem__Group__1__Impl : ( ( rule__LogicalSystem__NameAssignment_1 ) ) ;
+    // InternalRoom.g:12315:1: rule__LogicalSystem__Group__1__Impl : ( ( rule__LogicalSystem__NameAssignment_1 ) ) ;
     public final void rule__LogicalSystem__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12316:1: ( ( ( rule__LogicalSystem__NameAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12317:1: ( ( rule__LogicalSystem__NameAssignment_1 ) )
+            // InternalRoom.g:12319:1: ( ( ( rule__LogicalSystem__NameAssignment_1 ) ) )
+            // InternalRoom.g:12320:1: ( ( rule__LogicalSystem__NameAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12317:1: ( ( rule__LogicalSystem__NameAssignment_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12318:1: ( rule__LogicalSystem__NameAssignment_1 )
+            // InternalRoom.g:12320:1: ( ( rule__LogicalSystem__NameAssignment_1 ) )
+            // InternalRoom.g:12321:1: ( rule__LogicalSystem__NameAssignment_1 )
             {
              before(grammarAccess.getLogicalSystemAccess().getNameAssignment_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12319:1: ( rule__LogicalSystem__NameAssignment_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12319:2: rule__LogicalSystem__NameAssignment_1
+            // InternalRoom.g:12322:1: ( rule__LogicalSystem__NameAssignment_1 )
+            // InternalRoom.g:12322:2: rule__LogicalSystem__NameAssignment_1
             {
-            pushFollow(FOLLOW_rule__LogicalSystem__NameAssignment_1_in_rule__LogicalSystem__Group__1__Impl25302);
+            pushFollow(FOLLOW_2);
             rule__LogicalSystem__NameAssignment_1();
 
             state._fsp--;
@@ -34771,21 +34771,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__LogicalSystem__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12329:1: rule__LogicalSystem__Group__2 : rule__LogicalSystem__Group__2__Impl rule__LogicalSystem__Group__3 ;
+    // InternalRoom.g:12332:1: rule__LogicalSystem__Group__2 : rule__LogicalSystem__Group__2__Impl rule__LogicalSystem__Group__3 ;
     public final void rule__LogicalSystem__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12333:1: ( rule__LogicalSystem__Group__2__Impl rule__LogicalSystem__Group__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12334:2: rule__LogicalSystem__Group__2__Impl rule__LogicalSystem__Group__3
+            // InternalRoom.g:12336:1: ( rule__LogicalSystem__Group__2__Impl rule__LogicalSystem__Group__3 )
+            // InternalRoom.g:12337:2: rule__LogicalSystem__Group__2__Impl rule__LogicalSystem__Group__3
             {
-            pushFollow(FOLLOW_rule__LogicalSystem__Group__2__Impl_in_rule__LogicalSystem__Group__225332);
+            pushFollow(FOLLOW_4);
             rule__LogicalSystem__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__LogicalSystem__Group__3_in_rule__LogicalSystem__Group__225335);
+            pushFollow(FOLLOW_2);
             rule__LogicalSystem__Group__3();
 
             state._fsp--;
@@ -34809,20 +34809,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__LogicalSystem__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12341:1: rule__LogicalSystem__Group__2__Impl : ( ( rule__LogicalSystem__DocuAssignment_2 )? ) ;
+    // InternalRoom.g:12344:1: rule__LogicalSystem__Group__2__Impl : ( ( rule__LogicalSystem__DocuAssignment_2 )? ) ;
     public final void rule__LogicalSystem__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12345:1: ( ( ( rule__LogicalSystem__DocuAssignment_2 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12346:1: ( ( rule__LogicalSystem__DocuAssignment_2 )? )
+            // InternalRoom.g:12348:1: ( ( ( rule__LogicalSystem__DocuAssignment_2 )? ) )
+            // InternalRoom.g:12349:1: ( ( rule__LogicalSystem__DocuAssignment_2 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12346:1: ( ( rule__LogicalSystem__DocuAssignment_2 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12347:1: ( rule__LogicalSystem__DocuAssignment_2 )?
+            // InternalRoom.g:12349:1: ( ( rule__LogicalSystem__DocuAssignment_2 )? )
+            // InternalRoom.g:12350:1: ( rule__LogicalSystem__DocuAssignment_2 )?
             {
              before(grammarAccess.getLogicalSystemAccess().getDocuAssignment_2()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12348:1: ( rule__LogicalSystem__DocuAssignment_2 )?
+            // InternalRoom.g:12351:1: ( rule__LogicalSystem__DocuAssignment_2 )?
             int alt128=2;
             int LA128_0 = input.LA(1);
 
@@ -34831,9 +34831,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt128) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12348:2: rule__LogicalSystem__DocuAssignment_2
+                    // InternalRoom.g:12351:2: rule__LogicalSystem__DocuAssignment_2
                     {
-                    pushFollow(FOLLOW_rule__LogicalSystem__DocuAssignment_2_in_rule__LogicalSystem__Group__2__Impl25362);
+                    pushFollow(FOLLOW_2);
                     rule__LogicalSystem__DocuAssignment_2();
 
                     state._fsp--;
@@ -34867,21 +34867,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__LogicalSystem__Group__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12358:1: rule__LogicalSystem__Group__3 : rule__LogicalSystem__Group__3__Impl rule__LogicalSystem__Group__4 ;
+    // InternalRoom.g:12361:1: rule__LogicalSystem__Group__3 : rule__LogicalSystem__Group__3__Impl rule__LogicalSystem__Group__4 ;
     public final void rule__LogicalSystem__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12362:1: ( rule__LogicalSystem__Group__3__Impl rule__LogicalSystem__Group__4 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12363:2: rule__LogicalSystem__Group__3__Impl rule__LogicalSystem__Group__4
+            // InternalRoom.g:12365:1: ( rule__LogicalSystem__Group__3__Impl rule__LogicalSystem__Group__4 )
+            // InternalRoom.g:12366:2: rule__LogicalSystem__Group__3__Impl rule__LogicalSystem__Group__4
             {
-            pushFollow(FOLLOW_rule__LogicalSystem__Group__3__Impl_in_rule__LogicalSystem__Group__325393);
+            pushFollow(FOLLOW_61);
             rule__LogicalSystem__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__LogicalSystem__Group__4_in_rule__LogicalSystem__Group__325396);
+            pushFollow(FOLLOW_2);
             rule__LogicalSystem__Group__4();
 
             state._fsp--;
@@ -34905,20 +34905,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__LogicalSystem__Group__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12370:1: rule__LogicalSystem__Group__3__Impl : ( '{' ) ;
+    // InternalRoom.g:12373:1: rule__LogicalSystem__Group__3__Impl : ( '{' ) ;
     public final void rule__LogicalSystem__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12374:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12375:1: ( '{' )
+            // InternalRoom.g:12377:1: ( ( '{' ) )
+            // InternalRoom.g:12378:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12375:1: ( '{' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12376:1: '{'
+            // InternalRoom.g:12378:1: ( '{' )
+            // InternalRoom.g:12379:1: '{'
             {
              before(grammarAccess.getLogicalSystemAccess().getLeftCurlyBracketKeyword_3()); 
-            match(input,41,FOLLOW_41_in_rule__LogicalSystem__Group__3__Impl25424); 
+            match(input,41,FOLLOW_2); 
              after(grammarAccess.getLogicalSystemAccess().getLeftCurlyBracketKeyword_3()); 
 
             }
@@ -34942,21 +34942,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__LogicalSystem__Group__4"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12389:1: rule__LogicalSystem__Group__4 : rule__LogicalSystem__Group__4__Impl rule__LogicalSystem__Group__5 ;
+    // InternalRoom.g:12392:1: rule__LogicalSystem__Group__4 : rule__LogicalSystem__Group__4__Impl rule__LogicalSystem__Group__5 ;
     public final void rule__LogicalSystem__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12393:1: ( rule__LogicalSystem__Group__4__Impl rule__LogicalSystem__Group__5 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12394:2: rule__LogicalSystem__Group__4__Impl rule__LogicalSystem__Group__5
+            // InternalRoom.g:12396:1: ( rule__LogicalSystem__Group__4__Impl rule__LogicalSystem__Group__5 )
+            // InternalRoom.g:12397:2: rule__LogicalSystem__Group__4__Impl rule__LogicalSystem__Group__5
             {
-            pushFollow(FOLLOW_rule__LogicalSystem__Group__4__Impl_in_rule__LogicalSystem__Group__425455);
+            pushFollow(FOLLOW_61);
             rule__LogicalSystem__Group__4__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__LogicalSystem__Group__5_in_rule__LogicalSystem__Group__425458);
+            pushFollow(FOLLOW_2);
             rule__LogicalSystem__Group__5();
 
             state._fsp--;
@@ -34980,20 +34980,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__LogicalSystem__Group__4__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12401:1: rule__LogicalSystem__Group__4__Impl : ( ( rule__LogicalSystem__AnnotationsAssignment_4 )* ) ;
+    // InternalRoom.g:12404:1: rule__LogicalSystem__Group__4__Impl : ( ( rule__LogicalSystem__AnnotationsAssignment_4 )* ) ;
     public final void rule__LogicalSystem__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12405:1: ( ( ( rule__LogicalSystem__AnnotationsAssignment_4 )* ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12406:1: ( ( rule__LogicalSystem__AnnotationsAssignment_4 )* )
+            // InternalRoom.g:12408:1: ( ( ( rule__LogicalSystem__AnnotationsAssignment_4 )* ) )
+            // InternalRoom.g:12409:1: ( ( rule__LogicalSystem__AnnotationsAssignment_4 )* )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12406:1: ( ( rule__LogicalSystem__AnnotationsAssignment_4 )* )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12407:1: ( rule__LogicalSystem__AnnotationsAssignment_4 )*
+            // InternalRoom.g:12409:1: ( ( rule__LogicalSystem__AnnotationsAssignment_4 )* )
+            // InternalRoom.g:12410:1: ( rule__LogicalSystem__AnnotationsAssignment_4 )*
             {
              before(grammarAccess.getLogicalSystemAccess().getAnnotationsAssignment_4()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12408:1: ( rule__LogicalSystem__AnnotationsAssignment_4 )*
+            // InternalRoom.g:12411:1: ( rule__LogicalSystem__AnnotationsAssignment_4 )*
             loop129:
             do {
                 int alt129=2;
@@ -35006,9 +35006,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
                 switch (alt129) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12408:2: rule__LogicalSystem__AnnotationsAssignment_4
+            	    // InternalRoom.g:12411:2: rule__LogicalSystem__AnnotationsAssignment_4
             	    {
-            	    pushFollow(FOLLOW_rule__LogicalSystem__AnnotationsAssignment_4_in_rule__LogicalSystem__Group__4__Impl25485);
+            	    pushFollow(FOLLOW_25);
             	    rule__LogicalSystem__AnnotationsAssignment_4();
 
             	    state._fsp--;
@@ -35045,21 +35045,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__LogicalSystem__Group__5"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12418:1: rule__LogicalSystem__Group__5 : rule__LogicalSystem__Group__5__Impl rule__LogicalSystem__Group__6 ;
+    // InternalRoom.g:12421:1: rule__LogicalSystem__Group__5 : rule__LogicalSystem__Group__5__Impl rule__LogicalSystem__Group__6 ;
     public final void rule__LogicalSystem__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12422:1: ( rule__LogicalSystem__Group__5__Impl rule__LogicalSystem__Group__6 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12423:2: rule__LogicalSystem__Group__5__Impl rule__LogicalSystem__Group__6
+            // InternalRoom.g:12425:1: ( rule__LogicalSystem__Group__5__Impl rule__LogicalSystem__Group__6 )
+            // InternalRoom.g:12426:2: rule__LogicalSystem__Group__5__Impl rule__LogicalSystem__Group__6
             {
-            pushFollow(FOLLOW_rule__LogicalSystem__Group__5__Impl_in_rule__LogicalSystem__Group__525516);
+            pushFollow(FOLLOW_61);
             rule__LogicalSystem__Group__5__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__LogicalSystem__Group__6_in_rule__LogicalSystem__Group__525519);
+            pushFollow(FOLLOW_2);
             rule__LogicalSystem__Group__6();
 
             state._fsp--;
@@ -35083,20 +35083,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__LogicalSystem__Group__5__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12430:1: rule__LogicalSystem__Group__5__Impl : ( ( rule__LogicalSystem__Alternatives_5 )* ) ;
+    // InternalRoom.g:12433:1: rule__LogicalSystem__Group__5__Impl : ( ( rule__LogicalSystem__Alternatives_5 )* ) ;
     public final void rule__LogicalSystem__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12434:1: ( ( ( rule__LogicalSystem__Alternatives_5 )* ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12435:1: ( ( rule__LogicalSystem__Alternatives_5 )* )
+            // InternalRoom.g:12437:1: ( ( ( rule__LogicalSystem__Alternatives_5 )* ) )
+            // InternalRoom.g:12438:1: ( ( rule__LogicalSystem__Alternatives_5 )* )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12435:1: ( ( rule__LogicalSystem__Alternatives_5 )* )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12436:1: ( rule__LogicalSystem__Alternatives_5 )*
+            // InternalRoom.g:12438:1: ( ( rule__LogicalSystem__Alternatives_5 )* )
+            // InternalRoom.g:12439:1: ( rule__LogicalSystem__Alternatives_5 )*
             {
              before(grammarAccess.getLogicalSystemAccess().getAlternatives_5()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12437:1: ( rule__LogicalSystem__Alternatives_5 )*
+            // InternalRoom.g:12440:1: ( rule__LogicalSystem__Alternatives_5 )*
             loop130:
             do {
                 int alt130=2;
@@ -35109,9 +35109,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
                 switch (alt130) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12437:2: rule__LogicalSystem__Alternatives_5
+            	    // InternalRoom.g:12440:2: rule__LogicalSystem__Alternatives_5
             	    {
-            	    pushFollow(FOLLOW_rule__LogicalSystem__Alternatives_5_in_rule__LogicalSystem__Group__5__Impl25546);
+            	    pushFollow(FOLLOW_62);
             	    rule__LogicalSystem__Alternatives_5();
 
             	    state._fsp--;
@@ -35148,16 +35148,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__LogicalSystem__Group__6"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12447:1: rule__LogicalSystem__Group__6 : rule__LogicalSystem__Group__6__Impl ;
+    // InternalRoom.g:12450:1: rule__LogicalSystem__Group__6 : rule__LogicalSystem__Group__6__Impl ;
     public final void rule__LogicalSystem__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12451:1: ( rule__LogicalSystem__Group__6__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12452:2: rule__LogicalSystem__Group__6__Impl
+            // InternalRoom.g:12454:1: ( rule__LogicalSystem__Group__6__Impl )
+            // InternalRoom.g:12455:2: rule__LogicalSystem__Group__6__Impl
             {
-            pushFollow(FOLLOW_rule__LogicalSystem__Group__6__Impl_in_rule__LogicalSystem__Group__625577);
+            pushFollow(FOLLOW_2);
             rule__LogicalSystem__Group__6__Impl();
 
             state._fsp--;
@@ -35181,20 +35181,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__LogicalSystem__Group__6__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12458:1: rule__LogicalSystem__Group__6__Impl : ( '}' ) ;
+    // InternalRoom.g:12461:1: rule__LogicalSystem__Group__6__Impl : ( '}' ) ;
     public final void rule__LogicalSystem__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12462:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12463:1: ( '}' )
+            // InternalRoom.g:12465:1: ( ( '}' ) )
+            // InternalRoom.g:12466:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12463:1: ( '}' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12464:1: '}'
+            // InternalRoom.g:12466:1: ( '}' )
+            // InternalRoom.g:12467:1: '}'
             {
              before(grammarAccess.getLogicalSystemAccess().getRightCurlyBracketKeyword_6()); 
-            match(input,42,FOLLOW_42_in_rule__LogicalSystem__Group__6__Impl25605); 
+            match(input,42,FOLLOW_2); 
              after(grammarAccess.getLogicalSystemAccess().getRightCurlyBracketKeyword_6()); 
 
             }
@@ -35218,21 +35218,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemRef__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12491:1: rule__SubSystemRef__Group__0 : rule__SubSystemRef__Group__0__Impl rule__SubSystemRef__Group__1 ;
+    // InternalRoom.g:12494:1: rule__SubSystemRef__Group__0 : rule__SubSystemRef__Group__0__Impl rule__SubSystemRef__Group__1 ;
     public final void rule__SubSystemRef__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12495:1: ( rule__SubSystemRef__Group__0__Impl rule__SubSystemRef__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12496:2: rule__SubSystemRef__Group__0__Impl rule__SubSystemRef__Group__1
+            // InternalRoom.g:12498:1: ( rule__SubSystemRef__Group__0__Impl rule__SubSystemRef__Group__1 )
+            // InternalRoom.g:12499:2: rule__SubSystemRef__Group__0__Impl rule__SubSystemRef__Group__1
             {
-            pushFollow(FOLLOW_rule__SubSystemRef__Group__0__Impl_in_rule__SubSystemRef__Group__025650);
+            pushFollow(FOLLOW_3);
             rule__SubSystemRef__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SubSystemRef__Group__1_in_rule__SubSystemRef__Group__025653);
+            pushFollow(FOLLOW_2);
             rule__SubSystemRef__Group__1();
 
             state._fsp--;
@@ -35256,20 +35256,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemRef__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12503:1: rule__SubSystemRef__Group__0__Impl : ( 'SubSystemRef' ) ;
+    // InternalRoom.g:12506:1: rule__SubSystemRef__Group__0__Impl : ( 'SubSystemRef' ) ;
     public final void rule__SubSystemRef__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12507:1: ( ( 'SubSystemRef' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12508:1: ( 'SubSystemRef' )
+            // InternalRoom.g:12510:1: ( ( 'SubSystemRef' ) )
+            // InternalRoom.g:12511:1: ( 'SubSystemRef' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12508:1: ( 'SubSystemRef' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12509:1: 'SubSystemRef'
+            // InternalRoom.g:12511:1: ( 'SubSystemRef' )
+            // InternalRoom.g:12512:1: 'SubSystemRef'
             {
              before(grammarAccess.getSubSystemRefAccess().getSubSystemRefKeyword_0()); 
-            match(input,80,FOLLOW_80_in_rule__SubSystemRef__Group__0__Impl25681); 
+            match(input,80,FOLLOW_2); 
              after(grammarAccess.getSubSystemRefAccess().getSubSystemRefKeyword_0()); 
 
             }
@@ -35293,21 +35293,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemRef__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12522:1: rule__SubSystemRef__Group__1 : rule__SubSystemRef__Group__1__Impl rule__SubSystemRef__Group__2 ;
+    // InternalRoom.g:12525:1: rule__SubSystemRef__Group__1 : rule__SubSystemRef__Group__1__Impl rule__SubSystemRef__Group__2 ;
     public final void rule__SubSystemRef__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12526:1: ( rule__SubSystemRef__Group__1__Impl rule__SubSystemRef__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12527:2: rule__SubSystemRef__Group__1__Impl rule__SubSystemRef__Group__2
+            // InternalRoom.g:12529:1: ( rule__SubSystemRef__Group__1__Impl rule__SubSystemRef__Group__2 )
+            // InternalRoom.g:12530:2: rule__SubSystemRef__Group__1__Impl rule__SubSystemRef__Group__2
             {
-            pushFollow(FOLLOW_rule__SubSystemRef__Group__1__Impl_in_rule__SubSystemRef__Group__125712);
+            pushFollow(FOLLOW_8);
             rule__SubSystemRef__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SubSystemRef__Group__2_in_rule__SubSystemRef__Group__125715);
+            pushFollow(FOLLOW_2);
             rule__SubSystemRef__Group__2();
 
             state._fsp--;
@@ -35331,23 +35331,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemRef__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12534:1: rule__SubSystemRef__Group__1__Impl : ( ( rule__SubSystemRef__NameAssignment_1 ) ) ;
+    // InternalRoom.g:12537:1: rule__SubSystemRef__Group__1__Impl : ( ( rule__SubSystemRef__NameAssignment_1 ) ) ;
     public final void rule__SubSystemRef__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12538:1: ( ( ( rule__SubSystemRef__NameAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12539:1: ( ( rule__SubSystemRef__NameAssignment_1 ) )
+            // InternalRoom.g:12541:1: ( ( ( rule__SubSystemRef__NameAssignment_1 ) ) )
+            // InternalRoom.g:12542:1: ( ( rule__SubSystemRef__NameAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12539:1: ( ( rule__SubSystemRef__NameAssignment_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12540:1: ( rule__SubSystemRef__NameAssignment_1 )
+            // InternalRoom.g:12542:1: ( ( rule__SubSystemRef__NameAssignment_1 ) )
+            // InternalRoom.g:12543:1: ( rule__SubSystemRef__NameAssignment_1 )
             {
              before(grammarAccess.getSubSystemRefAccess().getNameAssignment_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12541:1: ( rule__SubSystemRef__NameAssignment_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12541:2: rule__SubSystemRef__NameAssignment_1
+            // InternalRoom.g:12544:1: ( rule__SubSystemRef__NameAssignment_1 )
+            // InternalRoom.g:12544:2: rule__SubSystemRef__NameAssignment_1
             {
-            pushFollow(FOLLOW_rule__SubSystemRef__NameAssignment_1_in_rule__SubSystemRef__Group__1__Impl25742);
+            pushFollow(FOLLOW_2);
             rule__SubSystemRef__NameAssignment_1();
 
             state._fsp--;
@@ -35378,21 +35378,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemRef__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12551:1: rule__SubSystemRef__Group__2 : rule__SubSystemRef__Group__2__Impl rule__SubSystemRef__Group__3 ;
+    // InternalRoom.g:12554:1: rule__SubSystemRef__Group__2 : rule__SubSystemRef__Group__2__Impl rule__SubSystemRef__Group__3 ;
     public final void rule__SubSystemRef__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12555:1: ( rule__SubSystemRef__Group__2__Impl rule__SubSystemRef__Group__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12556:2: rule__SubSystemRef__Group__2__Impl rule__SubSystemRef__Group__3
+            // InternalRoom.g:12558:1: ( rule__SubSystemRef__Group__2__Impl rule__SubSystemRef__Group__3 )
+            // InternalRoom.g:12559:2: rule__SubSystemRef__Group__2__Impl rule__SubSystemRef__Group__3
             {
-            pushFollow(FOLLOW_rule__SubSystemRef__Group__2__Impl_in_rule__SubSystemRef__Group__225772);
+            pushFollow(FOLLOW_3);
             rule__SubSystemRef__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SubSystemRef__Group__3_in_rule__SubSystemRef__Group__225775);
+            pushFollow(FOLLOW_2);
             rule__SubSystemRef__Group__3();
 
             state._fsp--;
@@ -35416,20 +35416,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemRef__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12563:1: rule__SubSystemRef__Group__2__Impl : ( ':' ) ;
+    // InternalRoom.g:12566:1: rule__SubSystemRef__Group__2__Impl : ( ':' ) ;
     public final void rule__SubSystemRef__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12567:1: ( ( ':' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12568:1: ( ':' )
+            // InternalRoom.g:12570:1: ( ( ':' ) )
+            // InternalRoom.g:12571:1: ( ':' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12568:1: ( ':' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12569:1: ':'
+            // InternalRoom.g:12571:1: ( ':' )
+            // InternalRoom.g:12572:1: ':'
             {
              before(grammarAccess.getSubSystemRefAccess().getColonKeyword_2()); 
-            match(input,43,FOLLOW_43_in_rule__SubSystemRef__Group__2__Impl25803); 
+            match(input,43,FOLLOW_2); 
              after(grammarAccess.getSubSystemRefAccess().getColonKeyword_2()); 
 
             }
@@ -35453,21 +35453,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemRef__Group__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12582:1: rule__SubSystemRef__Group__3 : rule__SubSystemRef__Group__3__Impl rule__SubSystemRef__Group__4 ;
+    // InternalRoom.g:12585:1: rule__SubSystemRef__Group__3 : rule__SubSystemRef__Group__3__Impl rule__SubSystemRef__Group__4 ;
     public final void rule__SubSystemRef__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12586:1: ( rule__SubSystemRef__Group__3__Impl rule__SubSystemRef__Group__4 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12587:2: rule__SubSystemRef__Group__3__Impl rule__SubSystemRef__Group__4
+            // InternalRoom.g:12589:1: ( rule__SubSystemRef__Group__3__Impl rule__SubSystemRef__Group__4 )
+            // InternalRoom.g:12590:2: rule__SubSystemRef__Group__3__Impl rule__SubSystemRef__Group__4
             {
-            pushFollow(FOLLOW_rule__SubSystemRef__Group__3__Impl_in_rule__SubSystemRef__Group__325834);
+            pushFollow(FOLLOW_14);
             rule__SubSystemRef__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SubSystemRef__Group__4_in_rule__SubSystemRef__Group__325837);
+            pushFollow(FOLLOW_2);
             rule__SubSystemRef__Group__4();
 
             state._fsp--;
@@ -35491,23 +35491,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemRef__Group__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12594:1: rule__SubSystemRef__Group__3__Impl : ( ( rule__SubSystemRef__TypeAssignment_3 ) ) ;
+    // InternalRoom.g:12597:1: rule__SubSystemRef__Group__3__Impl : ( ( rule__SubSystemRef__TypeAssignment_3 ) ) ;
     public final void rule__SubSystemRef__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12598:1: ( ( ( rule__SubSystemRef__TypeAssignment_3 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12599:1: ( ( rule__SubSystemRef__TypeAssignment_3 ) )
+            // InternalRoom.g:12601:1: ( ( ( rule__SubSystemRef__TypeAssignment_3 ) ) )
+            // InternalRoom.g:12602:1: ( ( rule__SubSystemRef__TypeAssignment_3 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12599:1: ( ( rule__SubSystemRef__TypeAssignment_3 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12600:1: ( rule__SubSystemRef__TypeAssignment_3 )
+            // InternalRoom.g:12602:1: ( ( rule__SubSystemRef__TypeAssignment_3 ) )
+            // InternalRoom.g:12603:1: ( rule__SubSystemRef__TypeAssignment_3 )
             {
              before(grammarAccess.getSubSystemRefAccess().getTypeAssignment_3()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12601:1: ( rule__SubSystemRef__TypeAssignment_3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12601:2: rule__SubSystemRef__TypeAssignment_3
+            // InternalRoom.g:12604:1: ( rule__SubSystemRef__TypeAssignment_3 )
+            // InternalRoom.g:12604:2: rule__SubSystemRef__TypeAssignment_3
             {
-            pushFollow(FOLLOW_rule__SubSystemRef__TypeAssignment_3_in_rule__SubSystemRef__Group__3__Impl25864);
+            pushFollow(FOLLOW_2);
             rule__SubSystemRef__TypeAssignment_3();
 
             state._fsp--;
@@ -35538,16 +35538,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemRef__Group__4"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12611:1: rule__SubSystemRef__Group__4 : rule__SubSystemRef__Group__4__Impl ;
+    // InternalRoom.g:12614:1: rule__SubSystemRef__Group__4 : rule__SubSystemRef__Group__4__Impl ;
     public final void rule__SubSystemRef__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12615:1: ( rule__SubSystemRef__Group__4__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12616:2: rule__SubSystemRef__Group__4__Impl
+            // InternalRoom.g:12618:1: ( rule__SubSystemRef__Group__4__Impl )
+            // InternalRoom.g:12619:2: rule__SubSystemRef__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__SubSystemRef__Group__4__Impl_in_rule__SubSystemRef__Group__425894);
+            pushFollow(FOLLOW_2);
             rule__SubSystemRef__Group__4__Impl();
 
             state._fsp--;
@@ -35571,20 +35571,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemRef__Group__4__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12622:1: rule__SubSystemRef__Group__4__Impl : ( ( rule__SubSystemRef__DocuAssignment_4 )? ) ;
+    // InternalRoom.g:12625:1: rule__SubSystemRef__Group__4__Impl : ( ( rule__SubSystemRef__DocuAssignment_4 )? ) ;
     public final void rule__SubSystemRef__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12626:1: ( ( ( rule__SubSystemRef__DocuAssignment_4 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12627:1: ( ( rule__SubSystemRef__DocuAssignment_4 )? )
+            // InternalRoom.g:12629:1: ( ( ( rule__SubSystemRef__DocuAssignment_4 )? ) )
+            // InternalRoom.g:12630:1: ( ( rule__SubSystemRef__DocuAssignment_4 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12627:1: ( ( rule__SubSystemRef__DocuAssignment_4 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12628:1: ( rule__SubSystemRef__DocuAssignment_4 )?
+            // InternalRoom.g:12630:1: ( ( rule__SubSystemRef__DocuAssignment_4 )? )
+            // InternalRoom.g:12631:1: ( rule__SubSystemRef__DocuAssignment_4 )?
             {
              before(grammarAccess.getSubSystemRefAccess().getDocuAssignment_4()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12629:1: ( rule__SubSystemRef__DocuAssignment_4 )?
+            // InternalRoom.g:12632:1: ( rule__SubSystemRef__DocuAssignment_4 )?
             int alt131=2;
             int LA131_0 = input.LA(1);
 
@@ -35593,9 +35593,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt131) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12629:2: rule__SubSystemRef__DocuAssignment_4
+                    // InternalRoom.g:12632:2: rule__SubSystemRef__DocuAssignment_4
                     {
-                    pushFollow(FOLLOW_rule__SubSystemRef__DocuAssignment_4_in_rule__SubSystemRef__Group__4__Impl25921);
+                    pushFollow(FOLLOW_2);
                     rule__SubSystemRef__DocuAssignment_4();
 
                     state._fsp--;
@@ -35629,21 +35629,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemClass__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12649:1: rule__SubSystemClass__Group__0 : rule__SubSystemClass__Group__0__Impl rule__SubSystemClass__Group__1 ;
+    // InternalRoom.g:12652:1: rule__SubSystemClass__Group__0 : rule__SubSystemClass__Group__0__Impl rule__SubSystemClass__Group__1 ;
     public final void rule__SubSystemClass__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12653:1: ( rule__SubSystemClass__Group__0__Impl rule__SubSystemClass__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12654:2: rule__SubSystemClass__Group__0__Impl rule__SubSystemClass__Group__1
+            // InternalRoom.g:12656:1: ( rule__SubSystemClass__Group__0__Impl rule__SubSystemClass__Group__1 )
+            // InternalRoom.g:12657:2: rule__SubSystemClass__Group__0__Impl rule__SubSystemClass__Group__1
             {
-            pushFollow(FOLLOW_rule__SubSystemClass__Group__0__Impl_in_rule__SubSystemClass__Group__025962);
+            pushFollow(FOLLOW_3);
             rule__SubSystemClass__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SubSystemClass__Group__1_in_rule__SubSystemClass__Group__025965);
+            pushFollow(FOLLOW_2);
             rule__SubSystemClass__Group__1();
 
             state._fsp--;
@@ -35667,20 +35667,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemClass__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12661:1: rule__SubSystemClass__Group__0__Impl : ( 'SubSystemClass' ) ;
+    // InternalRoom.g:12664:1: rule__SubSystemClass__Group__0__Impl : ( 'SubSystemClass' ) ;
     public final void rule__SubSystemClass__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12665:1: ( ( 'SubSystemClass' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12666:1: ( 'SubSystemClass' )
+            // InternalRoom.g:12668:1: ( ( 'SubSystemClass' ) )
+            // InternalRoom.g:12669:1: ( 'SubSystemClass' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12666:1: ( 'SubSystemClass' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12667:1: 'SubSystemClass'
+            // InternalRoom.g:12669:1: ( 'SubSystemClass' )
+            // InternalRoom.g:12670:1: 'SubSystemClass'
             {
              before(grammarAccess.getSubSystemClassAccess().getSubSystemClassKeyword_0()); 
-            match(input,21,FOLLOW_21_in_rule__SubSystemClass__Group__0__Impl25993); 
+            match(input,21,FOLLOW_2); 
              after(grammarAccess.getSubSystemClassAccess().getSubSystemClassKeyword_0()); 
 
             }
@@ -35704,21 +35704,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemClass__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12680:1: rule__SubSystemClass__Group__1 : rule__SubSystemClass__Group__1__Impl rule__SubSystemClass__Group__2 ;
+    // InternalRoom.g:12683:1: rule__SubSystemClass__Group__1 : rule__SubSystemClass__Group__1__Impl rule__SubSystemClass__Group__2 ;
     public final void rule__SubSystemClass__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12684:1: ( rule__SubSystemClass__Group__1__Impl rule__SubSystemClass__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12685:2: rule__SubSystemClass__Group__1__Impl rule__SubSystemClass__Group__2
+            // InternalRoom.g:12687:1: ( rule__SubSystemClass__Group__1__Impl rule__SubSystemClass__Group__2 )
+            // InternalRoom.g:12688:2: rule__SubSystemClass__Group__1__Impl rule__SubSystemClass__Group__2
             {
-            pushFollow(FOLLOW_rule__SubSystemClass__Group__1__Impl_in_rule__SubSystemClass__Group__126024);
+            pushFollow(FOLLOW_4);
             rule__SubSystemClass__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SubSystemClass__Group__2_in_rule__SubSystemClass__Group__126027);
+            pushFollow(FOLLOW_2);
             rule__SubSystemClass__Group__2();
 
             state._fsp--;
@@ -35742,23 +35742,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemClass__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12692:1: rule__SubSystemClass__Group__1__Impl : ( ( rule__SubSystemClass__NameAssignment_1 ) ) ;
+    // InternalRoom.g:12695:1: rule__SubSystemClass__Group__1__Impl : ( ( rule__SubSystemClass__NameAssignment_1 ) ) ;
     public final void rule__SubSystemClass__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12696:1: ( ( ( rule__SubSystemClass__NameAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12697:1: ( ( rule__SubSystemClass__NameAssignment_1 ) )
+            // InternalRoom.g:12699:1: ( ( ( rule__SubSystemClass__NameAssignment_1 ) ) )
+            // InternalRoom.g:12700:1: ( ( rule__SubSystemClass__NameAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12697:1: ( ( rule__SubSystemClass__NameAssignment_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12698:1: ( rule__SubSystemClass__NameAssignment_1 )
+            // InternalRoom.g:12700:1: ( ( rule__SubSystemClass__NameAssignment_1 ) )
+            // InternalRoom.g:12701:1: ( rule__SubSystemClass__NameAssignment_1 )
             {
              before(grammarAccess.getSubSystemClassAccess().getNameAssignment_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12699:1: ( rule__SubSystemClass__NameAssignment_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12699:2: rule__SubSystemClass__NameAssignment_1
+            // InternalRoom.g:12702:1: ( rule__SubSystemClass__NameAssignment_1 )
+            // InternalRoom.g:12702:2: rule__SubSystemClass__NameAssignment_1
             {
-            pushFollow(FOLLOW_rule__SubSystemClass__NameAssignment_1_in_rule__SubSystemClass__Group__1__Impl26054);
+            pushFollow(FOLLOW_2);
             rule__SubSystemClass__NameAssignment_1();
 
             state._fsp--;
@@ -35789,21 +35789,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemClass__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12709:1: rule__SubSystemClass__Group__2 : rule__SubSystemClass__Group__2__Impl rule__SubSystemClass__Group__3 ;
+    // InternalRoom.g:12712:1: rule__SubSystemClass__Group__2 : rule__SubSystemClass__Group__2__Impl rule__SubSystemClass__Group__3 ;
     public final void rule__SubSystemClass__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12713:1: ( rule__SubSystemClass__Group__2__Impl rule__SubSystemClass__Group__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12714:2: rule__SubSystemClass__Group__2__Impl rule__SubSystemClass__Group__3
+            // InternalRoom.g:12716:1: ( rule__SubSystemClass__Group__2__Impl rule__SubSystemClass__Group__3 )
+            // InternalRoom.g:12717:2: rule__SubSystemClass__Group__2__Impl rule__SubSystemClass__Group__3
             {
-            pushFollow(FOLLOW_rule__SubSystemClass__Group__2__Impl_in_rule__SubSystemClass__Group__226084);
+            pushFollow(FOLLOW_4);
             rule__SubSystemClass__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SubSystemClass__Group__3_in_rule__SubSystemClass__Group__226087);
+            pushFollow(FOLLOW_2);
             rule__SubSystemClass__Group__3();
 
             state._fsp--;
@@ -35827,20 +35827,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemClass__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12721:1: rule__SubSystemClass__Group__2__Impl : ( ( rule__SubSystemClass__DocuAssignment_2 )? ) ;
+    // InternalRoom.g:12724:1: rule__SubSystemClass__Group__2__Impl : ( ( rule__SubSystemClass__DocuAssignment_2 )? ) ;
     public final void rule__SubSystemClass__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12725:1: ( ( ( rule__SubSystemClass__DocuAssignment_2 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12726:1: ( ( rule__SubSystemClass__DocuAssignment_2 )? )
+            // InternalRoom.g:12728:1: ( ( ( rule__SubSystemClass__DocuAssignment_2 )? ) )
+            // InternalRoom.g:12729:1: ( ( rule__SubSystemClass__DocuAssignment_2 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12726:1: ( ( rule__SubSystemClass__DocuAssignment_2 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12727:1: ( rule__SubSystemClass__DocuAssignment_2 )?
+            // InternalRoom.g:12729:1: ( ( rule__SubSystemClass__DocuAssignment_2 )? )
+            // InternalRoom.g:12730:1: ( rule__SubSystemClass__DocuAssignment_2 )?
             {
              before(grammarAccess.getSubSystemClassAccess().getDocuAssignment_2()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12728:1: ( rule__SubSystemClass__DocuAssignment_2 )?
+            // InternalRoom.g:12731:1: ( rule__SubSystemClass__DocuAssignment_2 )?
             int alt132=2;
             int LA132_0 = input.LA(1);
 
@@ -35849,9 +35849,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt132) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12728:2: rule__SubSystemClass__DocuAssignment_2
+                    // InternalRoom.g:12731:2: rule__SubSystemClass__DocuAssignment_2
                     {
-                    pushFollow(FOLLOW_rule__SubSystemClass__DocuAssignment_2_in_rule__SubSystemClass__Group__2__Impl26114);
+                    pushFollow(FOLLOW_2);
                     rule__SubSystemClass__DocuAssignment_2();
 
                     state._fsp--;
@@ -35885,21 +35885,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemClass__Group__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12738:1: rule__SubSystemClass__Group__3 : rule__SubSystemClass__Group__3__Impl rule__SubSystemClass__Group__4 ;
+    // InternalRoom.g:12741:1: rule__SubSystemClass__Group__3 : rule__SubSystemClass__Group__3__Impl rule__SubSystemClass__Group__4 ;
     public final void rule__SubSystemClass__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12742:1: ( rule__SubSystemClass__Group__3__Impl rule__SubSystemClass__Group__4 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12743:2: rule__SubSystemClass__Group__3__Impl rule__SubSystemClass__Group__4
+            // InternalRoom.g:12745:1: ( rule__SubSystemClass__Group__3__Impl rule__SubSystemClass__Group__4 )
+            // InternalRoom.g:12746:2: rule__SubSystemClass__Group__3__Impl rule__SubSystemClass__Group__4
             {
-            pushFollow(FOLLOW_rule__SubSystemClass__Group__3__Impl_in_rule__SubSystemClass__Group__326145);
+            pushFollow(FOLLOW_63);
             rule__SubSystemClass__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SubSystemClass__Group__4_in_rule__SubSystemClass__Group__326148);
+            pushFollow(FOLLOW_2);
             rule__SubSystemClass__Group__4();
 
             state._fsp--;
@@ -35923,20 +35923,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemClass__Group__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12750:1: rule__SubSystemClass__Group__3__Impl : ( '{' ) ;
+    // InternalRoom.g:12753:1: rule__SubSystemClass__Group__3__Impl : ( '{' ) ;
     public final void rule__SubSystemClass__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12754:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12755:1: ( '{' )
+            // InternalRoom.g:12757:1: ( ( '{' ) )
+            // InternalRoom.g:12758:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12755:1: ( '{' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12756:1: '{'
+            // InternalRoom.g:12758:1: ( '{' )
+            // InternalRoom.g:12759:1: '{'
             {
              before(grammarAccess.getSubSystemClassAccess().getLeftCurlyBracketKeyword_3()); 
-            match(input,41,FOLLOW_41_in_rule__SubSystemClass__Group__3__Impl26176); 
+            match(input,41,FOLLOW_2); 
              after(grammarAccess.getSubSystemClassAccess().getLeftCurlyBracketKeyword_3()); 
 
             }
@@ -35960,21 +35960,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemClass__Group__4"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12769:1: rule__SubSystemClass__Group__4 : rule__SubSystemClass__Group__4__Impl rule__SubSystemClass__Group__5 ;
+    // InternalRoom.g:12772:1: rule__SubSystemClass__Group__4 : rule__SubSystemClass__Group__4__Impl rule__SubSystemClass__Group__5 ;
     public final void rule__SubSystemClass__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12773:1: ( rule__SubSystemClass__Group__4__Impl rule__SubSystemClass__Group__5 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12774:2: rule__SubSystemClass__Group__4__Impl rule__SubSystemClass__Group__5
+            // InternalRoom.g:12776:1: ( rule__SubSystemClass__Group__4__Impl rule__SubSystemClass__Group__5 )
+            // InternalRoom.g:12777:2: rule__SubSystemClass__Group__4__Impl rule__SubSystemClass__Group__5
             {
-            pushFollow(FOLLOW_rule__SubSystemClass__Group__4__Impl_in_rule__SubSystemClass__Group__426207);
+            pushFollow(FOLLOW_63);
             rule__SubSystemClass__Group__4__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SubSystemClass__Group__5_in_rule__SubSystemClass__Group__426210);
+            pushFollow(FOLLOW_2);
             rule__SubSystemClass__Group__5();
 
             state._fsp--;
@@ -35998,20 +35998,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemClass__Group__4__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12781:1: rule__SubSystemClass__Group__4__Impl : ( ( rule__SubSystemClass__AnnotationsAssignment_4 )* ) ;
+    // InternalRoom.g:12784:1: rule__SubSystemClass__Group__4__Impl : ( ( rule__SubSystemClass__AnnotationsAssignment_4 )* ) ;
     public final void rule__SubSystemClass__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12785:1: ( ( ( rule__SubSystemClass__AnnotationsAssignment_4 )* ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12786:1: ( ( rule__SubSystemClass__AnnotationsAssignment_4 )* )
+            // InternalRoom.g:12788:1: ( ( ( rule__SubSystemClass__AnnotationsAssignment_4 )* ) )
+            // InternalRoom.g:12789:1: ( ( rule__SubSystemClass__AnnotationsAssignment_4 )* )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12786:1: ( ( rule__SubSystemClass__AnnotationsAssignment_4 )* )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12787:1: ( rule__SubSystemClass__AnnotationsAssignment_4 )*
+            // InternalRoom.g:12789:1: ( ( rule__SubSystemClass__AnnotationsAssignment_4 )* )
+            // InternalRoom.g:12790:1: ( rule__SubSystemClass__AnnotationsAssignment_4 )*
             {
              before(grammarAccess.getSubSystemClassAccess().getAnnotationsAssignment_4()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12788:1: ( rule__SubSystemClass__AnnotationsAssignment_4 )*
+            // InternalRoom.g:12791:1: ( rule__SubSystemClass__AnnotationsAssignment_4 )*
             loop133:
             do {
                 int alt133=2;
@@ -36024,9 +36024,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
                 switch (alt133) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12788:2: rule__SubSystemClass__AnnotationsAssignment_4
+            	    // InternalRoom.g:12791:2: rule__SubSystemClass__AnnotationsAssignment_4
             	    {
-            	    pushFollow(FOLLOW_rule__SubSystemClass__AnnotationsAssignment_4_in_rule__SubSystemClass__Group__4__Impl26237);
+            	    pushFollow(FOLLOW_25);
             	    rule__SubSystemClass__AnnotationsAssignment_4();
 
             	    state._fsp--;
@@ -36063,21 +36063,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemClass__Group__5"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12798:1: rule__SubSystemClass__Group__5 : rule__SubSystemClass__Group__5__Impl rule__SubSystemClass__Group__6 ;
+    // InternalRoom.g:12801:1: rule__SubSystemClass__Group__5 : rule__SubSystemClass__Group__5__Impl rule__SubSystemClass__Group__6 ;
     public final void rule__SubSystemClass__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12802:1: ( rule__SubSystemClass__Group__5__Impl rule__SubSystemClass__Group__6 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12803:2: rule__SubSystemClass__Group__5__Impl rule__SubSystemClass__Group__6
+            // InternalRoom.g:12805:1: ( rule__SubSystemClass__Group__5__Impl rule__SubSystemClass__Group__6 )
+            // InternalRoom.g:12806:2: rule__SubSystemClass__Group__5__Impl rule__SubSystemClass__Group__6
             {
-            pushFollow(FOLLOW_rule__SubSystemClass__Group__5__Impl_in_rule__SubSystemClass__Group__526268);
+            pushFollow(FOLLOW_63);
             rule__SubSystemClass__Group__5__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SubSystemClass__Group__6_in_rule__SubSystemClass__Group__526271);
+            pushFollow(FOLLOW_2);
             rule__SubSystemClass__Group__6();
 
             state._fsp--;
@@ -36101,20 +36101,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemClass__Group__5__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12810:1: rule__SubSystemClass__Group__5__Impl : ( ( rule__SubSystemClass__Group_5__0 )? ) ;
+    // InternalRoom.g:12813:1: rule__SubSystemClass__Group__5__Impl : ( ( rule__SubSystemClass__Group_5__0 )? ) ;
     public final void rule__SubSystemClass__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12814:1: ( ( ( rule__SubSystemClass__Group_5__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12815:1: ( ( rule__SubSystemClass__Group_5__0 )? )
+            // InternalRoom.g:12817:1: ( ( ( rule__SubSystemClass__Group_5__0 )? ) )
+            // InternalRoom.g:12818:1: ( ( rule__SubSystemClass__Group_5__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12815:1: ( ( rule__SubSystemClass__Group_5__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12816:1: ( rule__SubSystemClass__Group_5__0 )?
+            // InternalRoom.g:12818:1: ( ( rule__SubSystemClass__Group_5__0 )? )
+            // InternalRoom.g:12819:1: ( rule__SubSystemClass__Group_5__0 )?
             {
              before(grammarAccess.getSubSystemClassAccess().getGroup_5()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12817:1: ( rule__SubSystemClass__Group_5__0 )?
+            // InternalRoom.g:12820:1: ( rule__SubSystemClass__Group_5__0 )?
             int alt134=2;
             int LA134_0 = input.LA(1);
 
@@ -36123,9 +36123,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt134) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12817:2: rule__SubSystemClass__Group_5__0
+                    // InternalRoom.g:12820:2: rule__SubSystemClass__Group_5__0
                     {
-                    pushFollow(FOLLOW_rule__SubSystemClass__Group_5__0_in_rule__SubSystemClass__Group__5__Impl26298);
+                    pushFollow(FOLLOW_2);
                     rule__SubSystemClass__Group_5__0();
 
                     state._fsp--;
@@ -36159,21 +36159,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemClass__Group__6"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12827:1: rule__SubSystemClass__Group__6 : rule__SubSystemClass__Group__6__Impl rule__SubSystemClass__Group__7 ;
+    // InternalRoom.g:12830:1: rule__SubSystemClass__Group__6 : rule__SubSystemClass__Group__6__Impl rule__SubSystemClass__Group__7 ;
     public final void rule__SubSystemClass__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12831:1: ( rule__SubSystemClass__Group__6__Impl rule__SubSystemClass__Group__7 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12832:2: rule__SubSystemClass__Group__6__Impl rule__SubSystemClass__Group__7
+            // InternalRoom.g:12834:1: ( rule__SubSystemClass__Group__6__Impl rule__SubSystemClass__Group__7 )
+            // InternalRoom.g:12835:2: rule__SubSystemClass__Group__6__Impl rule__SubSystemClass__Group__7
             {
-            pushFollow(FOLLOW_rule__SubSystemClass__Group__6__Impl_in_rule__SubSystemClass__Group__626329);
+            pushFollow(FOLLOW_63);
             rule__SubSystemClass__Group__6__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SubSystemClass__Group__7_in_rule__SubSystemClass__Group__626332);
+            pushFollow(FOLLOW_2);
             rule__SubSystemClass__Group__7();
 
             state._fsp--;
@@ -36197,20 +36197,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemClass__Group__6__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12839:1: rule__SubSystemClass__Group__6__Impl : ( ( rule__SubSystemClass__Group_6__0 )? ) ;
+    // InternalRoom.g:12842:1: rule__SubSystemClass__Group__6__Impl : ( ( rule__SubSystemClass__Group_6__0 )? ) ;
     public final void rule__SubSystemClass__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12843:1: ( ( ( rule__SubSystemClass__Group_6__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12844:1: ( ( rule__SubSystemClass__Group_6__0 )? )
+            // InternalRoom.g:12846:1: ( ( ( rule__SubSystemClass__Group_6__0 )? ) )
+            // InternalRoom.g:12847:1: ( ( rule__SubSystemClass__Group_6__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12844:1: ( ( rule__SubSystemClass__Group_6__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12845:1: ( rule__SubSystemClass__Group_6__0 )?
+            // InternalRoom.g:12847:1: ( ( rule__SubSystemClass__Group_6__0 )? )
+            // InternalRoom.g:12848:1: ( rule__SubSystemClass__Group_6__0 )?
             {
              before(grammarAccess.getSubSystemClassAccess().getGroup_6()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12846:1: ( rule__SubSystemClass__Group_6__0 )?
+            // InternalRoom.g:12849:1: ( rule__SubSystemClass__Group_6__0 )?
             int alt135=2;
             int LA135_0 = input.LA(1);
 
@@ -36219,9 +36219,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt135) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12846:2: rule__SubSystemClass__Group_6__0
+                    // InternalRoom.g:12849:2: rule__SubSystemClass__Group_6__0
                     {
-                    pushFollow(FOLLOW_rule__SubSystemClass__Group_6__0_in_rule__SubSystemClass__Group__6__Impl26359);
+                    pushFollow(FOLLOW_2);
                     rule__SubSystemClass__Group_6__0();
 
                     state._fsp--;
@@ -36255,21 +36255,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemClass__Group__7"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12856:1: rule__SubSystemClass__Group__7 : rule__SubSystemClass__Group__7__Impl rule__SubSystemClass__Group__8 ;
+    // InternalRoom.g:12859:1: rule__SubSystemClass__Group__7 : rule__SubSystemClass__Group__7__Impl rule__SubSystemClass__Group__8 ;
     public final void rule__SubSystemClass__Group__7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12860:1: ( rule__SubSystemClass__Group__7__Impl rule__SubSystemClass__Group__8 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12861:2: rule__SubSystemClass__Group__7__Impl rule__SubSystemClass__Group__8
+            // InternalRoom.g:12863:1: ( rule__SubSystemClass__Group__7__Impl rule__SubSystemClass__Group__8 )
+            // InternalRoom.g:12864:2: rule__SubSystemClass__Group__7__Impl rule__SubSystemClass__Group__8
             {
-            pushFollow(FOLLOW_rule__SubSystemClass__Group__7__Impl_in_rule__SubSystemClass__Group__726390);
+            pushFollow(FOLLOW_63);
             rule__SubSystemClass__Group__7__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SubSystemClass__Group__8_in_rule__SubSystemClass__Group__726393);
+            pushFollow(FOLLOW_2);
             rule__SubSystemClass__Group__8();
 
             state._fsp--;
@@ -36293,20 +36293,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemClass__Group__7__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12868:1: rule__SubSystemClass__Group__7__Impl : ( ( rule__SubSystemClass__Group_7__0 )? ) ;
+    // InternalRoom.g:12871:1: rule__SubSystemClass__Group__7__Impl : ( ( rule__SubSystemClass__Group_7__0 )? ) ;
     public final void rule__SubSystemClass__Group__7__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12872:1: ( ( ( rule__SubSystemClass__Group_7__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12873:1: ( ( rule__SubSystemClass__Group_7__0 )? )
+            // InternalRoom.g:12875:1: ( ( ( rule__SubSystemClass__Group_7__0 )? ) )
+            // InternalRoom.g:12876:1: ( ( rule__SubSystemClass__Group_7__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12873:1: ( ( rule__SubSystemClass__Group_7__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12874:1: ( rule__SubSystemClass__Group_7__0 )?
+            // InternalRoom.g:12876:1: ( ( rule__SubSystemClass__Group_7__0 )? )
+            // InternalRoom.g:12877:1: ( rule__SubSystemClass__Group_7__0 )?
             {
              before(grammarAccess.getSubSystemClassAccess().getGroup_7()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12875:1: ( rule__SubSystemClass__Group_7__0 )?
+            // InternalRoom.g:12878:1: ( rule__SubSystemClass__Group_7__0 )?
             int alt136=2;
             int LA136_0 = input.LA(1);
 
@@ -36315,9 +36315,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt136) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12875:2: rule__SubSystemClass__Group_7__0
+                    // InternalRoom.g:12878:2: rule__SubSystemClass__Group_7__0
                     {
-                    pushFollow(FOLLOW_rule__SubSystemClass__Group_7__0_in_rule__SubSystemClass__Group__7__Impl26420);
+                    pushFollow(FOLLOW_2);
                     rule__SubSystemClass__Group_7__0();
 
                     state._fsp--;
@@ -36351,21 +36351,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemClass__Group__8"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12885:1: rule__SubSystemClass__Group__8 : rule__SubSystemClass__Group__8__Impl rule__SubSystemClass__Group__9 ;
+    // InternalRoom.g:12888:1: rule__SubSystemClass__Group__8 : rule__SubSystemClass__Group__8__Impl rule__SubSystemClass__Group__9 ;
     public final void rule__SubSystemClass__Group__8() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12889:1: ( rule__SubSystemClass__Group__8__Impl rule__SubSystemClass__Group__9 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12890:2: rule__SubSystemClass__Group__8__Impl rule__SubSystemClass__Group__9
+            // InternalRoom.g:12892:1: ( rule__SubSystemClass__Group__8__Impl rule__SubSystemClass__Group__9 )
+            // InternalRoom.g:12893:2: rule__SubSystemClass__Group__8__Impl rule__SubSystemClass__Group__9
             {
-            pushFollow(FOLLOW_rule__SubSystemClass__Group__8__Impl_in_rule__SubSystemClass__Group__826451);
+            pushFollow(FOLLOW_63);
             rule__SubSystemClass__Group__8__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SubSystemClass__Group__9_in_rule__SubSystemClass__Group__826454);
+            pushFollow(FOLLOW_2);
             rule__SubSystemClass__Group__9();
 
             state._fsp--;
@@ -36389,20 +36389,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemClass__Group__8__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12897:1: rule__SubSystemClass__Group__8__Impl : ( ( rule__SubSystemClass__Alternatives_8 )* ) ;
+    // InternalRoom.g:12900:1: rule__SubSystemClass__Group__8__Impl : ( ( rule__SubSystemClass__Alternatives_8 )* ) ;
     public final void rule__SubSystemClass__Group__8__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12901:1: ( ( ( rule__SubSystemClass__Alternatives_8 )* ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12902:1: ( ( rule__SubSystemClass__Alternatives_8 )* )
+            // InternalRoom.g:12904:1: ( ( ( rule__SubSystemClass__Alternatives_8 )* ) )
+            // InternalRoom.g:12905:1: ( ( rule__SubSystemClass__Alternatives_8 )* )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12902:1: ( ( rule__SubSystemClass__Alternatives_8 )* )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12903:1: ( rule__SubSystemClass__Alternatives_8 )*
+            // InternalRoom.g:12905:1: ( ( rule__SubSystemClass__Alternatives_8 )* )
+            // InternalRoom.g:12906:1: ( rule__SubSystemClass__Alternatives_8 )*
             {
              before(grammarAccess.getSubSystemClassAccess().getAlternatives_8()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12904:1: ( rule__SubSystemClass__Alternatives_8 )*
+            // InternalRoom.g:12907:1: ( rule__SubSystemClass__Alternatives_8 )*
             loop137:
             do {
                 int alt137=2;
@@ -36415,9 +36415,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
                 switch (alt137) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12904:2: rule__SubSystemClass__Alternatives_8
+            	    // InternalRoom.g:12907:2: rule__SubSystemClass__Alternatives_8
             	    {
-            	    pushFollow(FOLLOW_rule__SubSystemClass__Alternatives_8_in_rule__SubSystemClass__Group__8__Impl26481);
+            	    pushFollow(FOLLOW_64);
             	    rule__SubSystemClass__Alternatives_8();
 
             	    state._fsp--;
@@ -36454,16 +36454,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemClass__Group__9"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12914:1: rule__SubSystemClass__Group__9 : rule__SubSystemClass__Group__9__Impl ;
+    // InternalRoom.g:12917:1: rule__SubSystemClass__Group__9 : rule__SubSystemClass__Group__9__Impl ;
     public final void rule__SubSystemClass__Group__9() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12918:1: ( rule__SubSystemClass__Group__9__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12919:2: rule__SubSystemClass__Group__9__Impl
+            // InternalRoom.g:12921:1: ( rule__SubSystemClass__Group__9__Impl )
+            // InternalRoom.g:12922:2: rule__SubSystemClass__Group__9__Impl
             {
-            pushFollow(FOLLOW_rule__SubSystemClass__Group__9__Impl_in_rule__SubSystemClass__Group__926512);
+            pushFollow(FOLLOW_2);
             rule__SubSystemClass__Group__9__Impl();
 
             state._fsp--;
@@ -36487,20 +36487,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemClass__Group__9__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12925:1: rule__SubSystemClass__Group__9__Impl : ( '}' ) ;
+    // InternalRoom.g:12928:1: rule__SubSystemClass__Group__9__Impl : ( '}' ) ;
     public final void rule__SubSystemClass__Group__9__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12929:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12930:1: ( '}' )
+            // InternalRoom.g:12932:1: ( ( '}' ) )
+            // InternalRoom.g:12933:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12930:1: ( '}' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12931:1: '}'
+            // InternalRoom.g:12933:1: ( '}' )
+            // InternalRoom.g:12934:1: '}'
             {
              before(grammarAccess.getSubSystemClassAccess().getRightCurlyBracketKeyword_9()); 
-            match(input,42,FOLLOW_42_in_rule__SubSystemClass__Group__9__Impl26540); 
+            match(input,42,FOLLOW_2); 
              after(grammarAccess.getSubSystemClassAccess().getRightCurlyBracketKeyword_9()); 
 
             }
@@ -36524,21 +36524,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemClass__Group_5__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12964:1: rule__SubSystemClass__Group_5__0 : rule__SubSystemClass__Group_5__0__Impl rule__SubSystemClass__Group_5__1 ;
+    // InternalRoom.g:12967:1: rule__SubSystemClass__Group_5__0 : rule__SubSystemClass__Group_5__0__Impl rule__SubSystemClass__Group_5__1 ;
     public final void rule__SubSystemClass__Group_5__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12968:1: ( rule__SubSystemClass__Group_5__0__Impl rule__SubSystemClass__Group_5__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12969:2: rule__SubSystemClass__Group_5__0__Impl rule__SubSystemClass__Group_5__1
+            // InternalRoom.g:12971:1: ( rule__SubSystemClass__Group_5__0__Impl rule__SubSystemClass__Group_5__1 )
+            // InternalRoom.g:12972:2: rule__SubSystemClass__Group_5__0__Impl rule__SubSystemClass__Group_5__1
             {
-            pushFollow(FOLLOW_rule__SubSystemClass__Group_5__0__Impl_in_rule__SubSystemClass__Group_5__026591);
+            pushFollow(FOLLOW_27);
             rule__SubSystemClass__Group_5__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SubSystemClass__Group_5__1_in_rule__SubSystemClass__Group_5__026594);
+            pushFollow(FOLLOW_2);
             rule__SubSystemClass__Group_5__1();
 
             state._fsp--;
@@ -36562,20 +36562,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemClass__Group_5__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12976:1: rule__SubSystemClass__Group_5__0__Impl : ( 'usercode1' ) ;
+    // InternalRoom.g:12979:1: rule__SubSystemClass__Group_5__0__Impl : ( 'usercode1' ) ;
     public final void rule__SubSystemClass__Group_5__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12980:1: ( ( 'usercode1' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12981:1: ( 'usercode1' )
+            // InternalRoom.g:12983:1: ( ( 'usercode1' ) )
+            // InternalRoom.g:12984:1: ( 'usercode1' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12981:1: ( 'usercode1' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12982:1: 'usercode1'
+            // InternalRoom.g:12984:1: ( 'usercode1' )
+            // InternalRoom.g:12985:1: 'usercode1'
             {
              before(grammarAccess.getSubSystemClassAccess().getUsercode1Keyword_5_0()); 
-            match(input,55,FOLLOW_55_in_rule__SubSystemClass__Group_5__0__Impl26622); 
+            match(input,55,FOLLOW_2); 
              after(grammarAccess.getSubSystemClassAccess().getUsercode1Keyword_5_0()); 
 
             }
@@ -36599,16 +36599,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemClass__Group_5__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12995:1: rule__SubSystemClass__Group_5__1 : rule__SubSystemClass__Group_5__1__Impl ;
+    // InternalRoom.g:12998:1: rule__SubSystemClass__Group_5__1 : rule__SubSystemClass__Group_5__1__Impl ;
     public final void rule__SubSystemClass__Group_5__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:12999:1: ( rule__SubSystemClass__Group_5__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13000:2: rule__SubSystemClass__Group_5__1__Impl
+            // InternalRoom.g:13002:1: ( rule__SubSystemClass__Group_5__1__Impl )
+            // InternalRoom.g:13003:2: rule__SubSystemClass__Group_5__1__Impl
             {
-            pushFollow(FOLLOW_rule__SubSystemClass__Group_5__1__Impl_in_rule__SubSystemClass__Group_5__126653);
+            pushFollow(FOLLOW_2);
             rule__SubSystemClass__Group_5__1__Impl();
 
             state._fsp--;
@@ -36632,23 +36632,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemClass__Group_5__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13006:1: rule__SubSystemClass__Group_5__1__Impl : ( ( rule__SubSystemClass__UserCode1Assignment_5_1 ) ) ;
+    // InternalRoom.g:13009:1: rule__SubSystemClass__Group_5__1__Impl : ( ( rule__SubSystemClass__UserCode1Assignment_5_1 ) ) ;
     public final void rule__SubSystemClass__Group_5__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13010:1: ( ( ( rule__SubSystemClass__UserCode1Assignment_5_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13011:1: ( ( rule__SubSystemClass__UserCode1Assignment_5_1 ) )
+            // InternalRoom.g:13013:1: ( ( ( rule__SubSystemClass__UserCode1Assignment_5_1 ) ) )
+            // InternalRoom.g:13014:1: ( ( rule__SubSystemClass__UserCode1Assignment_5_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13011:1: ( ( rule__SubSystemClass__UserCode1Assignment_5_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13012:1: ( rule__SubSystemClass__UserCode1Assignment_5_1 )
+            // InternalRoom.g:13014:1: ( ( rule__SubSystemClass__UserCode1Assignment_5_1 ) )
+            // InternalRoom.g:13015:1: ( rule__SubSystemClass__UserCode1Assignment_5_1 )
             {
              before(grammarAccess.getSubSystemClassAccess().getUserCode1Assignment_5_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13013:1: ( rule__SubSystemClass__UserCode1Assignment_5_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13013:2: rule__SubSystemClass__UserCode1Assignment_5_1
+            // InternalRoom.g:13016:1: ( rule__SubSystemClass__UserCode1Assignment_5_1 )
+            // InternalRoom.g:13016:2: rule__SubSystemClass__UserCode1Assignment_5_1
             {
-            pushFollow(FOLLOW_rule__SubSystemClass__UserCode1Assignment_5_1_in_rule__SubSystemClass__Group_5__1__Impl26680);
+            pushFollow(FOLLOW_2);
             rule__SubSystemClass__UserCode1Assignment_5_1();
 
             state._fsp--;
@@ -36679,21 +36679,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemClass__Group_6__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13027:1: rule__SubSystemClass__Group_6__0 : rule__SubSystemClass__Group_6__0__Impl rule__SubSystemClass__Group_6__1 ;
+    // InternalRoom.g:13030:1: rule__SubSystemClass__Group_6__0 : rule__SubSystemClass__Group_6__0__Impl rule__SubSystemClass__Group_6__1 ;
     public final void rule__SubSystemClass__Group_6__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13031:1: ( rule__SubSystemClass__Group_6__0__Impl rule__SubSystemClass__Group_6__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13032:2: rule__SubSystemClass__Group_6__0__Impl rule__SubSystemClass__Group_6__1
+            // InternalRoom.g:13034:1: ( rule__SubSystemClass__Group_6__0__Impl rule__SubSystemClass__Group_6__1 )
+            // InternalRoom.g:13035:2: rule__SubSystemClass__Group_6__0__Impl rule__SubSystemClass__Group_6__1
             {
-            pushFollow(FOLLOW_rule__SubSystemClass__Group_6__0__Impl_in_rule__SubSystemClass__Group_6__026714);
+            pushFollow(FOLLOW_27);
             rule__SubSystemClass__Group_6__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SubSystemClass__Group_6__1_in_rule__SubSystemClass__Group_6__026717);
+            pushFollow(FOLLOW_2);
             rule__SubSystemClass__Group_6__1();
 
             state._fsp--;
@@ -36717,20 +36717,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemClass__Group_6__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13039:1: rule__SubSystemClass__Group_6__0__Impl : ( 'usercode2' ) ;
+    // InternalRoom.g:13042:1: rule__SubSystemClass__Group_6__0__Impl : ( 'usercode2' ) ;
     public final void rule__SubSystemClass__Group_6__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13043:1: ( ( 'usercode2' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13044:1: ( 'usercode2' )
+            // InternalRoom.g:13046:1: ( ( 'usercode2' ) )
+            // InternalRoom.g:13047:1: ( 'usercode2' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13044:1: ( 'usercode2' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13045:1: 'usercode2'
+            // InternalRoom.g:13047:1: ( 'usercode2' )
+            // InternalRoom.g:13048:1: 'usercode2'
             {
              before(grammarAccess.getSubSystemClassAccess().getUsercode2Keyword_6_0()); 
-            match(input,56,FOLLOW_56_in_rule__SubSystemClass__Group_6__0__Impl26745); 
+            match(input,56,FOLLOW_2); 
              after(grammarAccess.getSubSystemClassAccess().getUsercode2Keyword_6_0()); 
 
             }
@@ -36754,16 +36754,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemClass__Group_6__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13058:1: rule__SubSystemClass__Group_6__1 : rule__SubSystemClass__Group_6__1__Impl ;
+    // InternalRoom.g:13061:1: rule__SubSystemClass__Group_6__1 : rule__SubSystemClass__Group_6__1__Impl ;
     public final void rule__SubSystemClass__Group_6__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13062:1: ( rule__SubSystemClass__Group_6__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13063:2: rule__SubSystemClass__Group_6__1__Impl
+            // InternalRoom.g:13065:1: ( rule__SubSystemClass__Group_6__1__Impl )
+            // InternalRoom.g:13066:2: rule__SubSystemClass__Group_6__1__Impl
             {
-            pushFollow(FOLLOW_rule__SubSystemClass__Group_6__1__Impl_in_rule__SubSystemClass__Group_6__126776);
+            pushFollow(FOLLOW_2);
             rule__SubSystemClass__Group_6__1__Impl();
 
             state._fsp--;
@@ -36787,23 +36787,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemClass__Group_6__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13069:1: rule__SubSystemClass__Group_6__1__Impl : ( ( rule__SubSystemClass__UserCode2Assignment_6_1 ) ) ;
+    // InternalRoom.g:13072:1: rule__SubSystemClass__Group_6__1__Impl : ( ( rule__SubSystemClass__UserCode2Assignment_6_1 ) ) ;
     public final void rule__SubSystemClass__Group_6__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13073:1: ( ( ( rule__SubSystemClass__UserCode2Assignment_6_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13074:1: ( ( rule__SubSystemClass__UserCode2Assignment_6_1 ) )
+            // InternalRoom.g:13076:1: ( ( ( rule__SubSystemClass__UserCode2Assignment_6_1 ) ) )
+            // InternalRoom.g:13077:1: ( ( rule__SubSystemClass__UserCode2Assignment_6_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13074:1: ( ( rule__SubSystemClass__UserCode2Assignment_6_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13075:1: ( rule__SubSystemClass__UserCode2Assignment_6_1 )
+            // InternalRoom.g:13077:1: ( ( rule__SubSystemClass__UserCode2Assignment_6_1 ) )
+            // InternalRoom.g:13078:1: ( rule__SubSystemClass__UserCode2Assignment_6_1 )
             {
              before(grammarAccess.getSubSystemClassAccess().getUserCode2Assignment_6_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13076:1: ( rule__SubSystemClass__UserCode2Assignment_6_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13076:2: rule__SubSystemClass__UserCode2Assignment_6_1
+            // InternalRoom.g:13079:1: ( rule__SubSystemClass__UserCode2Assignment_6_1 )
+            // InternalRoom.g:13079:2: rule__SubSystemClass__UserCode2Assignment_6_1
             {
-            pushFollow(FOLLOW_rule__SubSystemClass__UserCode2Assignment_6_1_in_rule__SubSystemClass__Group_6__1__Impl26803);
+            pushFollow(FOLLOW_2);
             rule__SubSystemClass__UserCode2Assignment_6_1();
 
             state._fsp--;
@@ -36834,21 +36834,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemClass__Group_7__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13090:1: rule__SubSystemClass__Group_7__0 : rule__SubSystemClass__Group_7__0__Impl rule__SubSystemClass__Group_7__1 ;
+    // InternalRoom.g:13093:1: rule__SubSystemClass__Group_7__0 : rule__SubSystemClass__Group_7__0__Impl rule__SubSystemClass__Group_7__1 ;
     public final void rule__SubSystemClass__Group_7__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13094:1: ( rule__SubSystemClass__Group_7__0__Impl rule__SubSystemClass__Group_7__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13095:2: rule__SubSystemClass__Group_7__0__Impl rule__SubSystemClass__Group_7__1
+            // InternalRoom.g:13097:1: ( rule__SubSystemClass__Group_7__0__Impl rule__SubSystemClass__Group_7__1 )
+            // InternalRoom.g:13098:2: rule__SubSystemClass__Group_7__0__Impl rule__SubSystemClass__Group_7__1
             {
-            pushFollow(FOLLOW_rule__SubSystemClass__Group_7__0__Impl_in_rule__SubSystemClass__Group_7__026837);
+            pushFollow(FOLLOW_27);
             rule__SubSystemClass__Group_7__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SubSystemClass__Group_7__1_in_rule__SubSystemClass__Group_7__026840);
+            pushFollow(FOLLOW_2);
             rule__SubSystemClass__Group_7__1();
 
             state._fsp--;
@@ -36872,20 +36872,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemClass__Group_7__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13102:1: rule__SubSystemClass__Group_7__0__Impl : ( 'usercode3' ) ;
+    // InternalRoom.g:13105:1: rule__SubSystemClass__Group_7__0__Impl : ( 'usercode3' ) ;
     public final void rule__SubSystemClass__Group_7__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13106:1: ( ( 'usercode3' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13107:1: ( 'usercode3' )
+            // InternalRoom.g:13109:1: ( ( 'usercode3' ) )
+            // InternalRoom.g:13110:1: ( 'usercode3' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13107:1: ( 'usercode3' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13108:1: 'usercode3'
+            // InternalRoom.g:13110:1: ( 'usercode3' )
+            // InternalRoom.g:13111:1: 'usercode3'
             {
              before(grammarAccess.getSubSystemClassAccess().getUsercode3Keyword_7_0()); 
-            match(input,57,FOLLOW_57_in_rule__SubSystemClass__Group_7__0__Impl26868); 
+            match(input,57,FOLLOW_2); 
              after(grammarAccess.getSubSystemClassAccess().getUsercode3Keyword_7_0()); 
 
             }
@@ -36909,16 +36909,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemClass__Group_7__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13121:1: rule__SubSystemClass__Group_7__1 : rule__SubSystemClass__Group_7__1__Impl ;
+    // InternalRoom.g:13124:1: rule__SubSystemClass__Group_7__1 : rule__SubSystemClass__Group_7__1__Impl ;
     public final void rule__SubSystemClass__Group_7__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13125:1: ( rule__SubSystemClass__Group_7__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13126:2: rule__SubSystemClass__Group_7__1__Impl
+            // InternalRoom.g:13128:1: ( rule__SubSystemClass__Group_7__1__Impl )
+            // InternalRoom.g:13129:2: rule__SubSystemClass__Group_7__1__Impl
             {
-            pushFollow(FOLLOW_rule__SubSystemClass__Group_7__1__Impl_in_rule__SubSystemClass__Group_7__126899);
+            pushFollow(FOLLOW_2);
             rule__SubSystemClass__Group_7__1__Impl();
 
             state._fsp--;
@@ -36942,23 +36942,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemClass__Group_7__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13132:1: rule__SubSystemClass__Group_7__1__Impl : ( ( rule__SubSystemClass__UserCode3Assignment_7_1 ) ) ;
+    // InternalRoom.g:13135:1: rule__SubSystemClass__Group_7__1__Impl : ( ( rule__SubSystemClass__UserCode3Assignment_7_1 ) ) ;
     public final void rule__SubSystemClass__Group_7__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13136:1: ( ( ( rule__SubSystemClass__UserCode3Assignment_7_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13137:1: ( ( rule__SubSystemClass__UserCode3Assignment_7_1 ) )
+            // InternalRoom.g:13139:1: ( ( ( rule__SubSystemClass__UserCode3Assignment_7_1 ) ) )
+            // InternalRoom.g:13140:1: ( ( rule__SubSystemClass__UserCode3Assignment_7_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13137:1: ( ( rule__SubSystemClass__UserCode3Assignment_7_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13138:1: ( rule__SubSystemClass__UserCode3Assignment_7_1 )
+            // InternalRoom.g:13140:1: ( ( rule__SubSystemClass__UserCode3Assignment_7_1 ) )
+            // InternalRoom.g:13141:1: ( rule__SubSystemClass__UserCode3Assignment_7_1 )
             {
              before(grammarAccess.getSubSystemClassAccess().getUserCode3Assignment_7_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13139:1: ( rule__SubSystemClass__UserCode3Assignment_7_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13139:2: rule__SubSystemClass__UserCode3Assignment_7_1
+            // InternalRoom.g:13142:1: ( rule__SubSystemClass__UserCode3Assignment_7_1 )
+            // InternalRoom.g:13142:2: rule__SubSystemClass__UserCode3Assignment_7_1
             {
-            pushFollow(FOLLOW_rule__SubSystemClass__UserCode3Assignment_7_1_in_rule__SubSystemClass__Group_7__1__Impl26926);
+            pushFollow(FOLLOW_2);
             rule__SubSystemClass__UserCode3Assignment_7_1();
 
             state._fsp--;
@@ -36989,21 +36989,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__LogicalThread__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13153:1: rule__LogicalThread__Group__0 : rule__LogicalThread__Group__0__Impl rule__LogicalThread__Group__1 ;
+    // InternalRoom.g:13156:1: rule__LogicalThread__Group__0 : rule__LogicalThread__Group__0__Impl rule__LogicalThread__Group__1 ;
     public final void rule__LogicalThread__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13157:1: ( rule__LogicalThread__Group__0__Impl rule__LogicalThread__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13158:2: rule__LogicalThread__Group__0__Impl rule__LogicalThread__Group__1
+            // InternalRoom.g:13160:1: ( rule__LogicalThread__Group__0__Impl rule__LogicalThread__Group__1 )
+            // InternalRoom.g:13161:2: rule__LogicalThread__Group__0__Impl rule__LogicalThread__Group__1
             {
-            pushFollow(FOLLOW_rule__LogicalThread__Group__0__Impl_in_rule__LogicalThread__Group__026960);
+            pushFollow(FOLLOW_3);
             rule__LogicalThread__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__LogicalThread__Group__1_in_rule__LogicalThread__Group__026963);
+            pushFollow(FOLLOW_2);
             rule__LogicalThread__Group__1();
 
             state._fsp--;
@@ -37027,20 +37027,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__LogicalThread__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13165:1: rule__LogicalThread__Group__0__Impl : ( 'LogicalThread' ) ;
+    // InternalRoom.g:13168:1: rule__LogicalThread__Group__0__Impl : ( 'LogicalThread' ) ;
     public final void rule__LogicalThread__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13169:1: ( ( 'LogicalThread' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13170:1: ( 'LogicalThread' )
+            // InternalRoom.g:13172:1: ( ( 'LogicalThread' ) )
+            // InternalRoom.g:13173:1: ( 'LogicalThread' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13170:1: ( 'LogicalThread' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13171:1: 'LogicalThread'
+            // InternalRoom.g:13173:1: ( 'LogicalThread' )
+            // InternalRoom.g:13174:1: 'LogicalThread'
             {
              before(grammarAccess.getLogicalThreadAccess().getLogicalThreadKeyword_0()); 
-            match(input,81,FOLLOW_81_in_rule__LogicalThread__Group__0__Impl26991); 
+            match(input,81,FOLLOW_2); 
              after(grammarAccess.getLogicalThreadAccess().getLogicalThreadKeyword_0()); 
 
             }
@@ -37064,16 +37064,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__LogicalThread__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13184:1: rule__LogicalThread__Group__1 : rule__LogicalThread__Group__1__Impl ;
+    // InternalRoom.g:13187:1: rule__LogicalThread__Group__1 : rule__LogicalThread__Group__1__Impl ;
     public final void rule__LogicalThread__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13188:1: ( rule__LogicalThread__Group__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13189:2: rule__LogicalThread__Group__1__Impl
+            // InternalRoom.g:13191:1: ( rule__LogicalThread__Group__1__Impl )
+            // InternalRoom.g:13192:2: rule__LogicalThread__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__LogicalThread__Group__1__Impl_in_rule__LogicalThread__Group__127022);
+            pushFollow(FOLLOW_2);
             rule__LogicalThread__Group__1__Impl();
 
             state._fsp--;
@@ -37097,23 +37097,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__LogicalThread__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13195:1: rule__LogicalThread__Group__1__Impl : ( ( rule__LogicalThread__NameAssignment_1 ) ) ;
+    // InternalRoom.g:13198:1: rule__LogicalThread__Group__1__Impl : ( ( rule__LogicalThread__NameAssignment_1 ) ) ;
     public final void rule__LogicalThread__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13199:1: ( ( ( rule__LogicalThread__NameAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13200:1: ( ( rule__LogicalThread__NameAssignment_1 ) )
+            // InternalRoom.g:13202:1: ( ( ( rule__LogicalThread__NameAssignment_1 ) ) )
+            // InternalRoom.g:13203:1: ( ( rule__LogicalThread__NameAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13200:1: ( ( rule__LogicalThread__NameAssignment_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13201:1: ( rule__LogicalThread__NameAssignment_1 )
+            // InternalRoom.g:13203:1: ( ( rule__LogicalThread__NameAssignment_1 ) )
+            // InternalRoom.g:13204:1: ( rule__LogicalThread__NameAssignment_1 )
             {
              before(grammarAccess.getLogicalThreadAccess().getNameAssignment_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13202:1: ( rule__LogicalThread__NameAssignment_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13202:2: rule__LogicalThread__NameAssignment_1
+            // InternalRoom.g:13205:1: ( rule__LogicalThread__NameAssignment_1 )
+            // InternalRoom.g:13205:2: rule__LogicalThread__NameAssignment_1
             {
-            pushFollow(FOLLOW_rule__LogicalThread__NameAssignment_1_in_rule__LogicalThread__Group__1__Impl27049);
+            pushFollow(FOLLOW_2);
             rule__LogicalThread__NameAssignment_1();
 
             state._fsp--;
@@ -37144,21 +37144,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorInstanceMapping__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13216:1: rule__ActorInstanceMapping__Group__0 : rule__ActorInstanceMapping__Group__0__Impl rule__ActorInstanceMapping__Group__1 ;
+    // InternalRoom.g:13219:1: rule__ActorInstanceMapping__Group__0 : rule__ActorInstanceMapping__Group__0__Impl rule__ActorInstanceMapping__Group__1 ;
     public final void rule__ActorInstanceMapping__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13220:1: ( rule__ActorInstanceMapping__Group__0__Impl rule__ActorInstanceMapping__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13221:2: rule__ActorInstanceMapping__Group__0__Impl rule__ActorInstanceMapping__Group__1
+            // InternalRoom.g:13223:1: ( rule__ActorInstanceMapping__Group__0__Impl rule__ActorInstanceMapping__Group__1 )
+            // InternalRoom.g:13224:2: rule__ActorInstanceMapping__Group__0__Impl rule__ActorInstanceMapping__Group__1
             {
-            pushFollow(FOLLOW_rule__ActorInstanceMapping__Group__0__Impl_in_rule__ActorInstanceMapping__Group__027083);
+            pushFollow(FOLLOW_3);
             rule__ActorInstanceMapping__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ActorInstanceMapping__Group__1_in_rule__ActorInstanceMapping__Group__027086);
+            pushFollow(FOLLOW_2);
             rule__ActorInstanceMapping__Group__1();
 
             state._fsp--;
@@ -37182,20 +37182,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorInstanceMapping__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13228:1: rule__ActorInstanceMapping__Group__0__Impl : ( 'ActorInstanceMapping' ) ;
+    // InternalRoom.g:13231:1: rule__ActorInstanceMapping__Group__0__Impl : ( 'ActorInstanceMapping' ) ;
     public final void rule__ActorInstanceMapping__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13232:1: ( ( 'ActorInstanceMapping' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13233:1: ( 'ActorInstanceMapping' )
+            // InternalRoom.g:13235:1: ( ( 'ActorInstanceMapping' ) )
+            // InternalRoom.g:13236:1: ( 'ActorInstanceMapping' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13233:1: ( 'ActorInstanceMapping' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13234:1: 'ActorInstanceMapping'
+            // InternalRoom.g:13236:1: ( 'ActorInstanceMapping' )
+            // InternalRoom.g:13237:1: 'ActorInstanceMapping'
             {
              before(grammarAccess.getActorInstanceMappingAccess().getActorInstanceMappingKeyword_0()); 
-            match(input,82,FOLLOW_82_in_rule__ActorInstanceMapping__Group__0__Impl27114); 
+            match(input,82,FOLLOW_2); 
              after(grammarAccess.getActorInstanceMappingAccess().getActorInstanceMappingKeyword_0()); 
 
             }
@@ -37219,21 +37219,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorInstanceMapping__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13247:1: rule__ActorInstanceMapping__Group__1 : rule__ActorInstanceMapping__Group__1__Impl rule__ActorInstanceMapping__Group__2 ;
+    // InternalRoom.g:13250:1: rule__ActorInstanceMapping__Group__1 : rule__ActorInstanceMapping__Group__1__Impl rule__ActorInstanceMapping__Group__2 ;
     public final void rule__ActorInstanceMapping__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13251:1: ( rule__ActorInstanceMapping__Group__1__Impl rule__ActorInstanceMapping__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13252:2: rule__ActorInstanceMapping__Group__1__Impl rule__ActorInstanceMapping__Group__2
+            // InternalRoom.g:13254:1: ( rule__ActorInstanceMapping__Group__1__Impl rule__ActorInstanceMapping__Group__2 )
+            // InternalRoom.g:13255:2: rule__ActorInstanceMapping__Group__1__Impl rule__ActorInstanceMapping__Group__2
             {
-            pushFollow(FOLLOW_rule__ActorInstanceMapping__Group__1__Impl_in_rule__ActorInstanceMapping__Group__127145);
+            pushFollow(FOLLOW_11);
             rule__ActorInstanceMapping__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ActorInstanceMapping__Group__2_in_rule__ActorInstanceMapping__Group__127148);
+            pushFollow(FOLLOW_2);
             rule__ActorInstanceMapping__Group__2();
 
             state._fsp--;
@@ -37257,23 +37257,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorInstanceMapping__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13259:1: rule__ActorInstanceMapping__Group__1__Impl : ( ( rule__ActorInstanceMapping__PathAssignment_1 ) ) ;
+    // InternalRoom.g:13262:1: rule__ActorInstanceMapping__Group__1__Impl : ( ( rule__ActorInstanceMapping__PathAssignment_1 ) ) ;
     public final void rule__ActorInstanceMapping__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13263:1: ( ( ( rule__ActorInstanceMapping__PathAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13264:1: ( ( rule__ActorInstanceMapping__PathAssignment_1 ) )
+            // InternalRoom.g:13266:1: ( ( ( rule__ActorInstanceMapping__PathAssignment_1 ) ) )
+            // InternalRoom.g:13267:1: ( ( rule__ActorInstanceMapping__PathAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13264:1: ( ( rule__ActorInstanceMapping__PathAssignment_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13265:1: ( rule__ActorInstanceMapping__PathAssignment_1 )
+            // InternalRoom.g:13267:1: ( ( rule__ActorInstanceMapping__PathAssignment_1 ) )
+            // InternalRoom.g:13268:1: ( rule__ActorInstanceMapping__PathAssignment_1 )
             {
              before(grammarAccess.getActorInstanceMappingAccess().getPathAssignment_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13266:1: ( rule__ActorInstanceMapping__PathAssignment_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13266:2: rule__ActorInstanceMapping__PathAssignment_1
+            // InternalRoom.g:13269:1: ( rule__ActorInstanceMapping__PathAssignment_1 )
+            // InternalRoom.g:13269:2: rule__ActorInstanceMapping__PathAssignment_1
             {
-            pushFollow(FOLLOW_rule__ActorInstanceMapping__PathAssignment_1_in_rule__ActorInstanceMapping__Group__1__Impl27175);
+            pushFollow(FOLLOW_2);
             rule__ActorInstanceMapping__PathAssignment_1();
 
             state._fsp--;
@@ -37304,21 +37304,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorInstanceMapping__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13276:1: rule__ActorInstanceMapping__Group__2 : rule__ActorInstanceMapping__Group__2__Impl rule__ActorInstanceMapping__Group__3 ;
+    // InternalRoom.g:13279:1: rule__ActorInstanceMapping__Group__2 : rule__ActorInstanceMapping__Group__2__Impl rule__ActorInstanceMapping__Group__3 ;
     public final void rule__ActorInstanceMapping__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13280:1: ( rule__ActorInstanceMapping__Group__2__Impl rule__ActorInstanceMapping__Group__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13281:2: rule__ActorInstanceMapping__Group__2__Impl rule__ActorInstanceMapping__Group__3
+            // InternalRoom.g:13283:1: ( rule__ActorInstanceMapping__Group__2__Impl rule__ActorInstanceMapping__Group__3 )
+            // InternalRoom.g:13284:2: rule__ActorInstanceMapping__Group__2__Impl rule__ActorInstanceMapping__Group__3
             {
-            pushFollow(FOLLOW_rule__ActorInstanceMapping__Group__2__Impl_in_rule__ActorInstanceMapping__Group__227205);
+            pushFollow(FOLLOW_3);
             rule__ActorInstanceMapping__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ActorInstanceMapping__Group__3_in_rule__ActorInstanceMapping__Group__227208);
+            pushFollow(FOLLOW_2);
             rule__ActorInstanceMapping__Group__3();
 
             state._fsp--;
@@ -37342,20 +37342,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorInstanceMapping__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13288:1: rule__ActorInstanceMapping__Group__2__Impl : ( '->' ) ;
+    // InternalRoom.g:13291:1: rule__ActorInstanceMapping__Group__2__Impl : ( '->' ) ;
     public final void rule__ActorInstanceMapping__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13292:1: ( ( '->' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13293:1: ( '->' )
+            // InternalRoom.g:13295:1: ( ( '->' ) )
+            // InternalRoom.g:13296:1: ( '->' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13293:1: ( '->' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13294:1: '->'
+            // InternalRoom.g:13296:1: ( '->' )
+            // InternalRoom.g:13297:1: '->'
             {
              before(grammarAccess.getActorInstanceMappingAccess().getHyphenMinusGreaterThanSignKeyword_2()); 
-            match(input,45,FOLLOW_45_in_rule__ActorInstanceMapping__Group__2__Impl27236); 
+            match(input,45,FOLLOW_2); 
              after(grammarAccess.getActorInstanceMappingAccess().getHyphenMinusGreaterThanSignKeyword_2()); 
 
             }
@@ -37379,21 +37379,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorInstanceMapping__Group__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13307:1: rule__ActorInstanceMapping__Group__3 : rule__ActorInstanceMapping__Group__3__Impl rule__ActorInstanceMapping__Group__4 ;
+    // InternalRoom.g:13310:1: rule__ActorInstanceMapping__Group__3 : rule__ActorInstanceMapping__Group__3__Impl rule__ActorInstanceMapping__Group__4 ;
     public final void rule__ActorInstanceMapping__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13311:1: ( rule__ActorInstanceMapping__Group__3__Impl rule__ActorInstanceMapping__Group__4 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13312:2: rule__ActorInstanceMapping__Group__3__Impl rule__ActorInstanceMapping__Group__4
+            // InternalRoom.g:13314:1: ( rule__ActorInstanceMapping__Group__3__Impl rule__ActorInstanceMapping__Group__4 )
+            // InternalRoom.g:13315:2: rule__ActorInstanceMapping__Group__3__Impl rule__ActorInstanceMapping__Group__4
             {
-            pushFollow(FOLLOW_rule__ActorInstanceMapping__Group__3__Impl_in_rule__ActorInstanceMapping__Group__327267);
+            pushFollow(FOLLOW_27);
             rule__ActorInstanceMapping__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ActorInstanceMapping__Group__4_in_rule__ActorInstanceMapping__Group__327270);
+            pushFollow(FOLLOW_2);
             rule__ActorInstanceMapping__Group__4();
 
             state._fsp--;
@@ -37417,23 +37417,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorInstanceMapping__Group__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13319:1: rule__ActorInstanceMapping__Group__3__Impl : ( ( rule__ActorInstanceMapping__ThreadAssignment_3 ) ) ;
+    // InternalRoom.g:13322:1: rule__ActorInstanceMapping__Group__3__Impl : ( ( rule__ActorInstanceMapping__ThreadAssignment_3 ) ) ;
     public final void rule__ActorInstanceMapping__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13323:1: ( ( ( rule__ActorInstanceMapping__ThreadAssignment_3 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13324:1: ( ( rule__ActorInstanceMapping__ThreadAssignment_3 ) )
+            // InternalRoom.g:13326:1: ( ( ( rule__ActorInstanceMapping__ThreadAssignment_3 ) ) )
+            // InternalRoom.g:13327:1: ( ( rule__ActorInstanceMapping__ThreadAssignment_3 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13324:1: ( ( rule__ActorInstanceMapping__ThreadAssignment_3 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13325:1: ( rule__ActorInstanceMapping__ThreadAssignment_3 )
+            // InternalRoom.g:13327:1: ( ( rule__ActorInstanceMapping__ThreadAssignment_3 ) )
+            // InternalRoom.g:13328:1: ( rule__ActorInstanceMapping__ThreadAssignment_3 )
             {
              before(grammarAccess.getActorInstanceMappingAccess().getThreadAssignment_3()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13326:1: ( rule__ActorInstanceMapping__ThreadAssignment_3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13326:2: rule__ActorInstanceMapping__ThreadAssignment_3
+            // InternalRoom.g:13329:1: ( rule__ActorInstanceMapping__ThreadAssignment_3 )
+            // InternalRoom.g:13329:2: rule__ActorInstanceMapping__ThreadAssignment_3
             {
-            pushFollow(FOLLOW_rule__ActorInstanceMapping__ThreadAssignment_3_in_rule__ActorInstanceMapping__Group__3__Impl27297);
+            pushFollow(FOLLOW_2);
             rule__ActorInstanceMapping__ThreadAssignment_3();
 
             state._fsp--;
@@ -37464,16 +37464,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorInstanceMapping__Group__4"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13336:1: rule__ActorInstanceMapping__Group__4 : rule__ActorInstanceMapping__Group__4__Impl ;
+    // InternalRoom.g:13339:1: rule__ActorInstanceMapping__Group__4 : rule__ActorInstanceMapping__Group__4__Impl ;
     public final void rule__ActorInstanceMapping__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13340:1: ( rule__ActorInstanceMapping__Group__4__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13341:2: rule__ActorInstanceMapping__Group__4__Impl
+            // InternalRoom.g:13343:1: ( rule__ActorInstanceMapping__Group__4__Impl )
+            // InternalRoom.g:13344:2: rule__ActorInstanceMapping__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__ActorInstanceMapping__Group__4__Impl_in_rule__ActorInstanceMapping__Group__427327);
+            pushFollow(FOLLOW_2);
             rule__ActorInstanceMapping__Group__4__Impl();
 
             state._fsp--;
@@ -37497,20 +37497,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorInstanceMapping__Group__4__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13347:1: rule__ActorInstanceMapping__Group__4__Impl : ( ( rule__ActorInstanceMapping__Group_4__0 )? ) ;
+    // InternalRoom.g:13350:1: rule__ActorInstanceMapping__Group__4__Impl : ( ( rule__ActorInstanceMapping__Group_4__0 )? ) ;
     public final void rule__ActorInstanceMapping__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13351:1: ( ( ( rule__ActorInstanceMapping__Group_4__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13352:1: ( ( rule__ActorInstanceMapping__Group_4__0 )? )
+            // InternalRoom.g:13354:1: ( ( ( rule__ActorInstanceMapping__Group_4__0 )? ) )
+            // InternalRoom.g:13355:1: ( ( rule__ActorInstanceMapping__Group_4__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13352:1: ( ( rule__ActorInstanceMapping__Group_4__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13353:1: ( rule__ActorInstanceMapping__Group_4__0 )?
+            // InternalRoom.g:13355:1: ( ( rule__ActorInstanceMapping__Group_4__0 )? )
+            // InternalRoom.g:13356:1: ( rule__ActorInstanceMapping__Group_4__0 )?
             {
              before(grammarAccess.getActorInstanceMappingAccess().getGroup_4()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13354:1: ( rule__ActorInstanceMapping__Group_4__0 )?
+            // InternalRoom.g:13357:1: ( rule__ActorInstanceMapping__Group_4__0 )?
             int alt138=2;
             int LA138_0 = input.LA(1);
 
@@ -37519,9 +37519,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt138) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13354:2: rule__ActorInstanceMapping__Group_4__0
+                    // InternalRoom.g:13357:2: rule__ActorInstanceMapping__Group_4__0
                     {
-                    pushFollow(FOLLOW_rule__ActorInstanceMapping__Group_4__0_in_rule__ActorInstanceMapping__Group__4__Impl27354);
+                    pushFollow(FOLLOW_2);
                     rule__ActorInstanceMapping__Group_4__0();
 
                     state._fsp--;
@@ -37555,21 +37555,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorInstanceMapping__Group_4__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13374:1: rule__ActorInstanceMapping__Group_4__0 : rule__ActorInstanceMapping__Group_4__0__Impl rule__ActorInstanceMapping__Group_4__1 ;
+    // InternalRoom.g:13377:1: rule__ActorInstanceMapping__Group_4__0 : rule__ActorInstanceMapping__Group_4__0__Impl rule__ActorInstanceMapping__Group_4__1 ;
     public final void rule__ActorInstanceMapping__Group_4__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13378:1: ( rule__ActorInstanceMapping__Group_4__0__Impl rule__ActorInstanceMapping__Group_4__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13379:2: rule__ActorInstanceMapping__Group_4__0__Impl rule__ActorInstanceMapping__Group_4__1
+            // InternalRoom.g:13381:1: ( rule__ActorInstanceMapping__Group_4__0__Impl rule__ActorInstanceMapping__Group_4__1 )
+            // InternalRoom.g:13382:2: rule__ActorInstanceMapping__Group_4__0__Impl rule__ActorInstanceMapping__Group_4__1
             {
-            pushFollow(FOLLOW_rule__ActorInstanceMapping__Group_4__0__Impl_in_rule__ActorInstanceMapping__Group_4__027395);
+            pushFollow(FOLLOW_65);
             rule__ActorInstanceMapping__Group_4__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ActorInstanceMapping__Group_4__1_in_rule__ActorInstanceMapping__Group_4__027398);
+            pushFollow(FOLLOW_2);
             rule__ActorInstanceMapping__Group_4__1();
 
             state._fsp--;
@@ -37593,20 +37593,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorInstanceMapping__Group_4__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13386:1: rule__ActorInstanceMapping__Group_4__0__Impl : ( '{' ) ;
+    // InternalRoom.g:13389:1: rule__ActorInstanceMapping__Group_4__0__Impl : ( '{' ) ;
     public final void rule__ActorInstanceMapping__Group_4__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13390:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13391:1: ( '{' )
+            // InternalRoom.g:13393:1: ( ( '{' ) )
+            // InternalRoom.g:13394:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13391:1: ( '{' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13392:1: '{'
+            // InternalRoom.g:13394:1: ( '{' )
+            // InternalRoom.g:13395:1: '{'
             {
              before(grammarAccess.getActorInstanceMappingAccess().getLeftCurlyBracketKeyword_4_0()); 
-            match(input,41,FOLLOW_41_in_rule__ActorInstanceMapping__Group_4__0__Impl27426); 
+            match(input,41,FOLLOW_2); 
              after(grammarAccess.getActorInstanceMappingAccess().getLeftCurlyBracketKeyword_4_0()); 
 
             }
@@ -37630,21 +37630,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorInstanceMapping__Group_4__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13405:1: rule__ActorInstanceMapping__Group_4__1 : rule__ActorInstanceMapping__Group_4__1__Impl rule__ActorInstanceMapping__Group_4__2 ;
+    // InternalRoom.g:13408:1: rule__ActorInstanceMapping__Group_4__1 : rule__ActorInstanceMapping__Group_4__1__Impl rule__ActorInstanceMapping__Group_4__2 ;
     public final void rule__ActorInstanceMapping__Group_4__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13409:1: ( rule__ActorInstanceMapping__Group_4__1__Impl rule__ActorInstanceMapping__Group_4__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13410:2: rule__ActorInstanceMapping__Group_4__1__Impl rule__ActorInstanceMapping__Group_4__2
+            // InternalRoom.g:13412:1: ( rule__ActorInstanceMapping__Group_4__1__Impl rule__ActorInstanceMapping__Group_4__2 )
+            // InternalRoom.g:13413:2: rule__ActorInstanceMapping__Group_4__1__Impl rule__ActorInstanceMapping__Group_4__2
             {
-            pushFollow(FOLLOW_rule__ActorInstanceMapping__Group_4__1__Impl_in_rule__ActorInstanceMapping__Group_4__127457);
+            pushFollow(FOLLOW_65);
             rule__ActorInstanceMapping__Group_4__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ActorInstanceMapping__Group_4__2_in_rule__ActorInstanceMapping__Group_4__127460);
+            pushFollow(FOLLOW_2);
             rule__ActorInstanceMapping__Group_4__2();
 
             state._fsp--;
@@ -37668,20 +37668,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorInstanceMapping__Group_4__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13417:1: rule__ActorInstanceMapping__Group_4__1__Impl : ( ( rule__ActorInstanceMapping__ActorInstanceMappingsAssignment_4_1 )* ) ;
+    // InternalRoom.g:13420:1: rule__ActorInstanceMapping__Group_4__1__Impl : ( ( rule__ActorInstanceMapping__ActorInstanceMappingsAssignment_4_1 )* ) ;
     public final void rule__ActorInstanceMapping__Group_4__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13421:1: ( ( ( rule__ActorInstanceMapping__ActorInstanceMappingsAssignment_4_1 )* ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13422:1: ( ( rule__ActorInstanceMapping__ActorInstanceMappingsAssignment_4_1 )* )
+            // InternalRoom.g:13424:1: ( ( ( rule__ActorInstanceMapping__ActorInstanceMappingsAssignment_4_1 )* ) )
+            // InternalRoom.g:13425:1: ( ( rule__ActorInstanceMapping__ActorInstanceMappingsAssignment_4_1 )* )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13422:1: ( ( rule__ActorInstanceMapping__ActorInstanceMappingsAssignment_4_1 )* )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13423:1: ( rule__ActorInstanceMapping__ActorInstanceMappingsAssignment_4_1 )*
+            // InternalRoom.g:13425:1: ( ( rule__ActorInstanceMapping__ActorInstanceMappingsAssignment_4_1 )* )
+            // InternalRoom.g:13426:1: ( rule__ActorInstanceMapping__ActorInstanceMappingsAssignment_4_1 )*
             {
              before(grammarAccess.getActorInstanceMappingAccess().getActorInstanceMappingsAssignment_4_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13424:1: ( rule__ActorInstanceMapping__ActorInstanceMappingsAssignment_4_1 )*
+            // InternalRoom.g:13427:1: ( rule__ActorInstanceMapping__ActorInstanceMappingsAssignment_4_1 )*
             loop139:
             do {
                 int alt139=2;
@@ -37694,9 +37694,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
                 switch (alt139) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13424:2: rule__ActorInstanceMapping__ActorInstanceMappingsAssignment_4_1
+            	    // InternalRoom.g:13427:2: rule__ActorInstanceMapping__ActorInstanceMappingsAssignment_4_1
             	    {
-            	    pushFollow(FOLLOW_rule__ActorInstanceMapping__ActorInstanceMappingsAssignment_4_1_in_rule__ActorInstanceMapping__Group_4__1__Impl27487);
+            	    pushFollow(FOLLOW_66);
             	    rule__ActorInstanceMapping__ActorInstanceMappingsAssignment_4_1();
 
             	    state._fsp--;
@@ -37733,16 +37733,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorInstanceMapping__Group_4__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13434:1: rule__ActorInstanceMapping__Group_4__2 : rule__ActorInstanceMapping__Group_4__2__Impl ;
+    // InternalRoom.g:13437:1: rule__ActorInstanceMapping__Group_4__2 : rule__ActorInstanceMapping__Group_4__2__Impl ;
     public final void rule__ActorInstanceMapping__Group_4__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13438:1: ( rule__ActorInstanceMapping__Group_4__2__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13439:2: rule__ActorInstanceMapping__Group_4__2__Impl
+            // InternalRoom.g:13441:1: ( rule__ActorInstanceMapping__Group_4__2__Impl )
+            // InternalRoom.g:13442:2: rule__ActorInstanceMapping__Group_4__2__Impl
             {
-            pushFollow(FOLLOW_rule__ActorInstanceMapping__Group_4__2__Impl_in_rule__ActorInstanceMapping__Group_4__227518);
+            pushFollow(FOLLOW_2);
             rule__ActorInstanceMapping__Group_4__2__Impl();
 
             state._fsp--;
@@ -37766,20 +37766,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorInstanceMapping__Group_4__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13445:1: rule__ActorInstanceMapping__Group_4__2__Impl : ( '}' ) ;
+    // InternalRoom.g:13448:1: rule__ActorInstanceMapping__Group_4__2__Impl : ( '}' ) ;
     public final void rule__ActorInstanceMapping__Group_4__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13449:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13450:1: ( '}' )
+            // InternalRoom.g:13452:1: ( ( '}' ) )
+            // InternalRoom.g:13453:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13450:1: ( '}' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13451:1: '}'
+            // InternalRoom.g:13453:1: ( '}' )
+            // InternalRoom.g:13454:1: '}'
             {
              before(grammarAccess.getActorInstanceMappingAccess().getRightCurlyBracketKeyword_4_2()); 
-            match(input,42,FOLLOW_42_in_rule__ActorInstanceMapping__Group_4__2__Impl27546); 
+            match(input,42,FOLLOW_2); 
              after(grammarAccess.getActorInstanceMappingAccess().getRightCurlyBracketKeyword_4_2()); 
 
             }
@@ -37803,21 +37803,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefPath__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13470:1: rule__RefPath__Group__0 : rule__RefPath__Group__0__Impl rule__RefPath__Group__1 ;
+    // InternalRoom.g:13473:1: rule__RefPath__Group__0 : rule__RefPath__Group__0__Impl rule__RefPath__Group__1 ;
     public final void rule__RefPath__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13474:1: ( rule__RefPath__Group__0__Impl rule__RefPath__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13475:2: rule__RefPath__Group__0__Impl rule__RefPath__Group__1
+            // InternalRoom.g:13477:1: ( rule__RefPath__Group__0__Impl rule__RefPath__Group__1 )
+            // InternalRoom.g:13478:2: rule__RefPath__Group__0__Impl rule__RefPath__Group__1
             {
-            pushFollow(FOLLOW_rule__RefPath__Group__0__Impl_in_rule__RefPath__Group__027583);
+            pushFollow(FOLLOW_67);
             rule__RefPath__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RefPath__Group__1_in_rule__RefPath__Group__027586);
+            pushFollow(FOLLOW_2);
             rule__RefPath__Group__1();
 
             state._fsp--;
@@ -37841,23 +37841,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefPath__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13482:1: rule__RefPath__Group__0__Impl : ( ( rule__RefPath__RefsAssignment_0 ) ) ;
+    // InternalRoom.g:13485:1: rule__RefPath__Group__0__Impl : ( ( rule__RefPath__RefsAssignment_0 ) ) ;
     public final void rule__RefPath__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13486:1: ( ( ( rule__RefPath__RefsAssignment_0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13487:1: ( ( rule__RefPath__RefsAssignment_0 ) )
+            // InternalRoom.g:13489:1: ( ( ( rule__RefPath__RefsAssignment_0 ) ) )
+            // InternalRoom.g:13490:1: ( ( rule__RefPath__RefsAssignment_0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13487:1: ( ( rule__RefPath__RefsAssignment_0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13488:1: ( rule__RefPath__RefsAssignment_0 )
+            // InternalRoom.g:13490:1: ( ( rule__RefPath__RefsAssignment_0 ) )
+            // InternalRoom.g:13491:1: ( rule__RefPath__RefsAssignment_0 )
             {
              before(grammarAccess.getRefPathAccess().getRefsAssignment_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13489:1: ( rule__RefPath__RefsAssignment_0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13489:2: rule__RefPath__RefsAssignment_0
+            // InternalRoom.g:13492:1: ( rule__RefPath__RefsAssignment_0 )
+            // InternalRoom.g:13492:2: rule__RefPath__RefsAssignment_0
             {
-            pushFollow(FOLLOW_rule__RefPath__RefsAssignment_0_in_rule__RefPath__Group__0__Impl27613);
+            pushFollow(FOLLOW_2);
             rule__RefPath__RefsAssignment_0();
 
             state._fsp--;
@@ -37888,16 +37888,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefPath__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13499:1: rule__RefPath__Group__1 : rule__RefPath__Group__1__Impl ;
+    // InternalRoom.g:13502:1: rule__RefPath__Group__1 : rule__RefPath__Group__1__Impl ;
     public final void rule__RefPath__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13503:1: ( rule__RefPath__Group__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13504:2: rule__RefPath__Group__1__Impl
+            // InternalRoom.g:13506:1: ( rule__RefPath__Group__1__Impl )
+            // InternalRoom.g:13507:2: rule__RefPath__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__RefPath__Group__1__Impl_in_rule__RefPath__Group__127643);
+            pushFollow(FOLLOW_2);
             rule__RefPath__Group__1__Impl();
 
             state._fsp--;
@@ -37921,20 +37921,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefPath__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13510:1: rule__RefPath__Group__1__Impl : ( ( rule__RefPath__Group_1__0 )* ) ;
+    // InternalRoom.g:13513:1: rule__RefPath__Group__1__Impl : ( ( rule__RefPath__Group_1__0 )* ) ;
     public final void rule__RefPath__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13514:1: ( ( ( rule__RefPath__Group_1__0 )* ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13515:1: ( ( rule__RefPath__Group_1__0 )* )
+            // InternalRoom.g:13517:1: ( ( ( rule__RefPath__Group_1__0 )* ) )
+            // InternalRoom.g:13518:1: ( ( rule__RefPath__Group_1__0 )* )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13515:1: ( ( rule__RefPath__Group_1__0 )* )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13516:1: ( rule__RefPath__Group_1__0 )*
+            // InternalRoom.g:13518:1: ( ( rule__RefPath__Group_1__0 )* )
+            // InternalRoom.g:13519:1: ( rule__RefPath__Group_1__0 )*
             {
              before(grammarAccess.getRefPathAccess().getGroup_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13517:1: ( rule__RefPath__Group_1__0 )*
+            // InternalRoom.g:13520:1: ( rule__RefPath__Group_1__0 )*
             loop140:
             do {
                 int alt140=2;
@@ -37947,9 +37947,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
                 switch (alt140) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13517:2: rule__RefPath__Group_1__0
+            	    // InternalRoom.g:13520:2: rule__RefPath__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__RefPath__Group_1__0_in_rule__RefPath__Group__1__Impl27670);
+            	    pushFollow(FOLLOW_68);
             	    rule__RefPath__Group_1__0();
 
             	    state._fsp--;
@@ -37986,21 +37986,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefPath__Group_1__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13531:1: rule__RefPath__Group_1__0 : rule__RefPath__Group_1__0__Impl rule__RefPath__Group_1__1 ;
+    // InternalRoom.g:13534:1: rule__RefPath__Group_1__0 : rule__RefPath__Group_1__0__Impl rule__RefPath__Group_1__1 ;
     public final void rule__RefPath__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13535:1: ( rule__RefPath__Group_1__0__Impl rule__RefPath__Group_1__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13536:2: rule__RefPath__Group_1__0__Impl rule__RefPath__Group_1__1
+            // InternalRoom.g:13538:1: ( rule__RefPath__Group_1__0__Impl rule__RefPath__Group_1__1 )
+            // InternalRoom.g:13539:2: rule__RefPath__Group_1__0__Impl rule__RefPath__Group_1__1
             {
-            pushFollow(FOLLOW_rule__RefPath__Group_1__0__Impl_in_rule__RefPath__Group_1__027705);
+            pushFollow(FOLLOW_3);
             rule__RefPath__Group_1__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RefPath__Group_1__1_in_rule__RefPath__Group_1__027708);
+            pushFollow(FOLLOW_2);
             rule__RefPath__Group_1__1();
 
             state._fsp--;
@@ -38024,20 +38024,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefPath__Group_1__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13543:1: rule__RefPath__Group_1__0__Impl : ( '/' ) ;
+    // InternalRoom.g:13546:1: rule__RefPath__Group_1__0__Impl : ( '/' ) ;
     public final void rule__RefPath__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13547:1: ( ( '/' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13548:1: ( '/' )
+            // InternalRoom.g:13550:1: ( ( '/' ) )
+            // InternalRoom.g:13551:1: ( '/' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13548:1: ( '/' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13549:1: '/'
+            // InternalRoom.g:13551:1: ( '/' )
+            // InternalRoom.g:13552:1: '/'
             {
              before(grammarAccess.getRefPathAccess().getSolidusKeyword_1_0()); 
-            match(input,83,FOLLOW_83_in_rule__RefPath__Group_1__0__Impl27736); 
+            match(input,83,FOLLOW_2); 
              after(grammarAccess.getRefPathAccess().getSolidusKeyword_1_0()); 
 
             }
@@ -38061,16 +38061,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefPath__Group_1__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13562:1: rule__RefPath__Group_1__1 : rule__RefPath__Group_1__1__Impl ;
+    // InternalRoom.g:13565:1: rule__RefPath__Group_1__1 : rule__RefPath__Group_1__1__Impl ;
     public final void rule__RefPath__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13566:1: ( rule__RefPath__Group_1__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13567:2: rule__RefPath__Group_1__1__Impl
+            // InternalRoom.g:13569:1: ( rule__RefPath__Group_1__1__Impl )
+            // InternalRoom.g:13570:2: rule__RefPath__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__RefPath__Group_1__1__Impl_in_rule__RefPath__Group_1__127767);
+            pushFollow(FOLLOW_2);
             rule__RefPath__Group_1__1__Impl();
 
             state._fsp--;
@@ -38094,23 +38094,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefPath__Group_1__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13573:1: rule__RefPath__Group_1__1__Impl : ( ( rule__RefPath__RefsAssignment_1_1 ) ) ;
+    // InternalRoom.g:13576:1: rule__RefPath__Group_1__1__Impl : ( ( rule__RefPath__RefsAssignment_1_1 ) ) ;
     public final void rule__RefPath__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13577:1: ( ( ( rule__RefPath__RefsAssignment_1_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13578:1: ( ( rule__RefPath__RefsAssignment_1_1 ) )
+            // InternalRoom.g:13580:1: ( ( ( rule__RefPath__RefsAssignment_1_1 ) ) )
+            // InternalRoom.g:13581:1: ( ( rule__RefPath__RefsAssignment_1_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13578:1: ( ( rule__RefPath__RefsAssignment_1_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13579:1: ( rule__RefPath__RefsAssignment_1_1 )
+            // InternalRoom.g:13581:1: ( ( rule__RefPath__RefsAssignment_1_1 ) )
+            // InternalRoom.g:13582:1: ( rule__RefPath__RefsAssignment_1_1 )
             {
              before(grammarAccess.getRefPathAccess().getRefsAssignment_1_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13580:1: ( rule__RefPath__RefsAssignment_1_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13580:2: rule__RefPath__RefsAssignment_1_1
+            // InternalRoom.g:13583:1: ( rule__RefPath__RefsAssignment_1_1 )
+            // InternalRoom.g:13583:2: rule__RefPath__RefsAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__RefPath__RefsAssignment_1_1_in_rule__RefPath__Group_1__1__Impl27794);
+            pushFollow(FOLLOW_2);
             rule__RefPath__RefsAssignment_1_1();
 
             state._fsp--;
@@ -38141,21 +38141,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefSegment__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13594:1: rule__RefSegment__Group__0 : rule__RefSegment__Group__0__Impl rule__RefSegment__Group__1 ;
+    // InternalRoom.g:13597:1: rule__RefSegment__Group__0 : rule__RefSegment__Group__0__Impl rule__RefSegment__Group__1 ;
     public final void rule__RefSegment__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13598:1: ( rule__RefSegment__Group__0__Impl rule__RefSegment__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13599:2: rule__RefSegment__Group__0__Impl rule__RefSegment__Group__1
+            // InternalRoom.g:13601:1: ( rule__RefSegment__Group__0__Impl rule__RefSegment__Group__1 )
+            // InternalRoom.g:13602:2: rule__RefSegment__Group__0__Impl rule__RefSegment__Group__1
             {
-            pushFollow(FOLLOW_rule__RefSegment__Group__0__Impl_in_rule__RefSegment__Group__027828);
+            pushFollow(FOLLOW_8);
             rule__RefSegment__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RefSegment__Group__1_in_rule__RefSegment__Group__027831);
+            pushFollow(FOLLOW_2);
             rule__RefSegment__Group__1();
 
             state._fsp--;
@@ -38179,23 +38179,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefSegment__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13606:1: rule__RefSegment__Group__0__Impl : ( ( rule__RefSegment__RefAssignment_0 ) ) ;
+    // InternalRoom.g:13609:1: rule__RefSegment__Group__0__Impl : ( ( rule__RefSegment__RefAssignment_0 ) ) ;
     public final void rule__RefSegment__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13610:1: ( ( ( rule__RefSegment__RefAssignment_0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13611:1: ( ( rule__RefSegment__RefAssignment_0 ) )
+            // InternalRoom.g:13613:1: ( ( ( rule__RefSegment__RefAssignment_0 ) ) )
+            // InternalRoom.g:13614:1: ( ( rule__RefSegment__RefAssignment_0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13611:1: ( ( rule__RefSegment__RefAssignment_0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13612:1: ( rule__RefSegment__RefAssignment_0 )
+            // InternalRoom.g:13614:1: ( ( rule__RefSegment__RefAssignment_0 ) )
+            // InternalRoom.g:13615:1: ( rule__RefSegment__RefAssignment_0 )
             {
              before(grammarAccess.getRefSegmentAccess().getRefAssignment_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13613:1: ( rule__RefSegment__RefAssignment_0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13613:2: rule__RefSegment__RefAssignment_0
+            // InternalRoom.g:13616:1: ( rule__RefSegment__RefAssignment_0 )
+            // InternalRoom.g:13616:2: rule__RefSegment__RefAssignment_0
             {
-            pushFollow(FOLLOW_rule__RefSegment__RefAssignment_0_in_rule__RefSegment__Group__0__Impl27858);
+            pushFollow(FOLLOW_2);
             rule__RefSegment__RefAssignment_0();
 
             state._fsp--;
@@ -38226,16 +38226,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefSegment__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13623:1: rule__RefSegment__Group__1 : rule__RefSegment__Group__1__Impl ;
+    // InternalRoom.g:13626:1: rule__RefSegment__Group__1 : rule__RefSegment__Group__1__Impl ;
     public final void rule__RefSegment__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13627:1: ( rule__RefSegment__Group__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13628:2: rule__RefSegment__Group__1__Impl
+            // InternalRoom.g:13630:1: ( rule__RefSegment__Group__1__Impl )
+            // InternalRoom.g:13631:2: rule__RefSegment__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__RefSegment__Group__1__Impl_in_rule__RefSegment__Group__127888);
+            pushFollow(FOLLOW_2);
             rule__RefSegment__Group__1__Impl();
 
             state._fsp--;
@@ -38259,20 +38259,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefSegment__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13634:1: rule__RefSegment__Group__1__Impl : ( ( rule__RefSegment__Group_1__0 )? ) ;
+    // InternalRoom.g:13637:1: rule__RefSegment__Group__1__Impl : ( ( rule__RefSegment__Group_1__0 )? ) ;
     public final void rule__RefSegment__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13638:1: ( ( ( rule__RefSegment__Group_1__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13639:1: ( ( rule__RefSegment__Group_1__0 )? )
+            // InternalRoom.g:13641:1: ( ( ( rule__RefSegment__Group_1__0 )? ) )
+            // InternalRoom.g:13642:1: ( ( rule__RefSegment__Group_1__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13639:1: ( ( rule__RefSegment__Group_1__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13640:1: ( rule__RefSegment__Group_1__0 )?
+            // InternalRoom.g:13642:1: ( ( rule__RefSegment__Group_1__0 )? )
+            // InternalRoom.g:13643:1: ( rule__RefSegment__Group_1__0 )?
             {
              before(grammarAccess.getRefSegmentAccess().getGroup_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13641:1: ( rule__RefSegment__Group_1__0 )?
+            // InternalRoom.g:13644:1: ( rule__RefSegment__Group_1__0 )?
             int alt141=2;
             int LA141_0 = input.LA(1);
 
@@ -38281,9 +38281,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt141) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13641:2: rule__RefSegment__Group_1__0
+                    // InternalRoom.g:13644:2: rule__RefSegment__Group_1__0
                     {
-                    pushFollow(FOLLOW_rule__RefSegment__Group_1__0_in_rule__RefSegment__Group__1__Impl27915);
+                    pushFollow(FOLLOW_2);
                     rule__RefSegment__Group_1__0();
 
                     state._fsp--;
@@ -38317,21 +38317,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefSegment__Group_1__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13655:1: rule__RefSegment__Group_1__0 : rule__RefSegment__Group_1__0__Impl rule__RefSegment__Group_1__1 ;
+    // InternalRoom.g:13658:1: rule__RefSegment__Group_1__0 : rule__RefSegment__Group_1__0__Impl rule__RefSegment__Group_1__1 ;
     public final void rule__RefSegment__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13659:1: ( rule__RefSegment__Group_1__0__Impl rule__RefSegment__Group_1__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13660:2: rule__RefSegment__Group_1__0__Impl rule__RefSegment__Group_1__1
+            // InternalRoom.g:13662:1: ( rule__RefSegment__Group_1__0__Impl rule__RefSegment__Group_1__1 )
+            // InternalRoom.g:13663:2: rule__RefSegment__Group_1__0__Impl rule__RefSegment__Group_1__1
             {
-            pushFollow(FOLLOW_rule__RefSegment__Group_1__0__Impl_in_rule__RefSegment__Group_1__027950);
+            pushFollow(FOLLOW_30);
             rule__RefSegment__Group_1__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RefSegment__Group_1__1_in_rule__RefSegment__Group_1__027953);
+            pushFollow(FOLLOW_2);
             rule__RefSegment__Group_1__1();
 
             state._fsp--;
@@ -38355,20 +38355,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefSegment__Group_1__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13667:1: rule__RefSegment__Group_1__0__Impl : ( ':' ) ;
+    // InternalRoom.g:13670:1: rule__RefSegment__Group_1__0__Impl : ( ':' ) ;
     public final void rule__RefSegment__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13671:1: ( ( ':' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13672:1: ( ':' )
+            // InternalRoom.g:13674:1: ( ( ':' ) )
+            // InternalRoom.g:13675:1: ( ':' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13672:1: ( ':' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13673:1: ':'
+            // InternalRoom.g:13675:1: ( ':' )
+            // InternalRoom.g:13676:1: ':'
             {
              before(grammarAccess.getRefSegmentAccess().getColonKeyword_1_0()); 
-            match(input,43,FOLLOW_43_in_rule__RefSegment__Group_1__0__Impl27981); 
+            match(input,43,FOLLOW_2); 
              after(grammarAccess.getRefSegmentAccess().getColonKeyword_1_0()); 
 
             }
@@ -38392,16 +38392,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefSegment__Group_1__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13686:1: rule__RefSegment__Group_1__1 : rule__RefSegment__Group_1__1__Impl ;
+    // InternalRoom.g:13689:1: rule__RefSegment__Group_1__1 : rule__RefSegment__Group_1__1__Impl ;
     public final void rule__RefSegment__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13690:1: ( rule__RefSegment__Group_1__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13691:2: rule__RefSegment__Group_1__1__Impl
+            // InternalRoom.g:13693:1: ( rule__RefSegment__Group_1__1__Impl )
+            // InternalRoom.g:13694:2: rule__RefSegment__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__RefSegment__Group_1__1__Impl_in_rule__RefSegment__Group_1__128012);
+            pushFollow(FOLLOW_2);
             rule__RefSegment__Group_1__1__Impl();
 
             state._fsp--;
@@ -38425,23 +38425,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefSegment__Group_1__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13697:1: rule__RefSegment__Group_1__1__Impl : ( ( rule__RefSegment__IdxAssignment_1_1 ) ) ;
+    // InternalRoom.g:13700:1: rule__RefSegment__Group_1__1__Impl : ( ( rule__RefSegment__IdxAssignment_1_1 ) ) ;
     public final void rule__RefSegment__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13701:1: ( ( ( rule__RefSegment__IdxAssignment_1_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13702:1: ( ( rule__RefSegment__IdxAssignment_1_1 ) )
+            // InternalRoom.g:13704:1: ( ( ( rule__RefSegment__IdxAssignment_1_1 ) ) )
+            // InternalRoom.g:13705:1: ( ( rule__RefSegment__IdxAssignment_1_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13702:1: ( ( rule__RefSegment__IdxAssignment_1_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13703:1: ( rule__RefSegment__IdxAssignment_1_1 )
+            // InternalRoom.g:13705:1: ( ( rule__RefSegment__IdxAssignment_1_1 ) )
+            // InternalRoom.g:13706:1: ( rule__RefSegment__IdxAssignment_1_1 )
             {
              before(grammarAccess.getRefSegmentAccess().getIdxAssignment_1_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13704:1: ( rule__RefSegment__IdxAssignment_1_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13704:2: rule__RefSegment__IdxAssignment_1_1
+            // InternalRoom.g:13707:1: ( rule__RefSegment__IdxAssignment_1_1 )
+            // InternalRoom.g:13707:2: rule__RefSegment__IdxAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__RefSegment__IdxAssignment_1_1_in_rule__RefSegment__Group_1__1__Impl28039);
+            pushFollow(FOLLOW_2);
             rule__RefSegment__IdxAssignment_1_1();
 
             state._fsp--;
@@ -38472,21 +38472,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Binding__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13718:1: rule__Binding__Group__0 : rule__Binding__Group__0__Impl rule__Binding__Group__1 ;
+    // InternalRoom.g:13721:1: rule__Binding__Group__0 : rule__Binding__Group__0__Impl rule__Binding__Group__1 ;
     public final void rule__Binding__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13722:1: ( rule__Binding__Group__0__Impl rule__Binding__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13723:2: rule__Binding__Group__0__Impl rule__Binding__Group__1
+            // InternalRoom.g:13725:1: ( rule__Binding__Group__0__Impl rule__Binding__Group__1 )
+            // InternalRoom.g:13726:2: rule__Binding__Group__0__Impl rule__Binding__Group__1
             {
-            pushFollow(FOLLOW_rule__Binding__Group__0__Impl_in_rule__Binding__Group__028073);
+            pushFollow(FOLLOW_3);
             rule__Binding__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Binding__Group__1_in_rule__Binding__Group__028076);
+            pushFollow(FOLLOW_2);
             rule__Binding__Group__1();
 
             state._fsp--;
@@ -38510,20 +38510,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Binding__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13730:1: rule__Binding__Group__0__Impl : ( 'Binding' ) ;
+    // InternalRoom.g:13733:1: rule__Binding__Group__0__Impl : ( 'Binding' ) ;
     public final void rule__Binding__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13734:1: ( ( 'Binding' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13735:1: ( 'Binding' )
+            // InternalRoom.g:13737:1: ( ( 'Binding' ) )
+            // InternalRoom.g:13738:1: ( 'Binding' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13735:1: ( 'Binding' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13736:1: 'Binding'
+            // InternalRoom.g:13738:1: ( 'Binding' )
+            // InternalRoom.g:13739:1: 'Binding'
             {
              before(grammarAccess.getBindingAccess().getBindingKeyword_0()); 
-            match(input,84,FOLLOW_84_in_rule__Binding__Group__0__Impl28104); 
+            match(input,84,FOLLOW_2); 
              after(grammarAccess.getBindingAccess().getBindingKeyword_0()); 
 
             }
@@ -38547,21 +38547,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Binding__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13749:1: rule__Binding__Group__1 : rule__Binding__Group__1__Impl rule__Binding__Group__2 ;
+    // InternalRoom.g:13752:1: rule__Binding__Group__1 : rule__Binding__Group__1__Impl rule__Binding__Group__2 ;
     public final void rule__Binding__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13753:1: ( rule__Binding__Group__1__Impl rule__Binding__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13754:2: rule__Binding__Group__1__Impl rule__Binding__Group__2
+            // InternalRoom.g:13756:1: ( rule__Binding__Group__1__Impl rule__Binding__Group__2 )
+            // InternalRoom.g:13757:2: rule__Binding__Group__1__Impl rule__Binding__Group__2
             {
-            pushFollow(FOLLOW_rule__Binding__Group__1__Impl_in_rule__Binding__Group__128135);
+            pushFollow(FOLLOW_69);
             rule__Binding__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Binding__Group__2_in_rule__Binding__Group__128138);
+            pushFollow(FOLLOW_2);
             rule__Binding__Group__2();
 
             state._fsp--;
@@ -38585,23 +38585,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Binding__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13761:1: rule__Binding__Group__1__Impl : ( ( rule__Binding__Endpoint1Assignment_1 ) ) ;
+    // InternalRoom.g:13764:1: rule__Binding__Group__1__Impl : ( ( rule__Binding__Endpoint1Assignment_1 ) ) ;
     public final void rule__Binding__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13765:1: ( ( ( rule__Binding__Endpoint1Assignment_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13766:1: ( ( rule__Binding__Endpoint1Assignment_1 ) )
+            // InternalRoom.g:13768:1: ( ( ( rule__Binding__Endpoint1Assignment_1 ) ) )
+            // InternalRoom.g:13769:1: ( ( rule__Binding__Endpoint1Assignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13766:1: ( ( rule__Binding__Endpoint1Assignment_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13767:1: ( rule__Binding__Endpoint1Assignment_1 )
+            // InternalRoom.g:13769:1: ( ( rule__Binding__Endpoint1Assignment_1 ) )
+            // InternalRoom.g:13770:1: ( rule__Binding__Endpoint1Assignment_1 )
             {
              before(grammarAccess.getBindingAccess().getEndpoint1Assignment_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13768:1: ( rule__Binding__Endpoint1Assignment_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13768:2: rule__Binding__Endpoint1Assignment_1
+            // InternalRoom.g:13771:1: ( rule__Binding__Endpoint1Assignment_1 )
+            // InternalRoom.g:13771:2: rule__Binding__Endpoint1Assignment_1
             {
-            pushFollow(FOLLOW_rule__Binding__Endpoint1Assignment_1_in_rule__Binding__Group__1__Impl28165);
+            pushFollow(FOLLOW_2);
             rule__Binding__Endpoint1Assignment_1();
 
             state._fsp--;
@@ -38632,21 +38632,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Binding__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13778:1: rule__Binding__Group__2 : rule__Binding__Group__2__Impl rule__Binding__Group__3 ;
+    // InternalRoom.g:13781:1: rule__Binding__Group__2 : rule__Binding__Group__2__Impl rule__Binding__Group__3 ;
     public final void rule__Binding__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13782:1: ( rule__Binding__Group__2__Impl rule__Binding__Group__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13783:2: rule__Binding__Group__2__Impl rule__Binding__Group__3
+            // InternalRoom.g:13785:1: ( rule__Binding__Group__2__Impl rule__Binding__Group__3 )
+            // InternalRoom.g:13786:2: rule__Binding__Group__2__Impl rule__Binding__Group__3
             {
-            pushFollow(FOLLOW_rule__Binding__Group__2__Impl_in_rule__Binding__Group__228195);
+            pushFollow(FOLLOW_3);
             rule__Binding__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Binding__Group__3_in_rule__Binding__Group__228198);
+            pushFollow(FOLLOW_2);
             rule__Binding__Group__3();
 
             state._fsp--;
@@ -38670,20 +38670,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Binding__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13790:1: rule__Binding__Group__2__Impl : ( 'and' ) ;
+    // InternalRoom.g:13793:1: rule__Binding__Group__2__Impl : ( 'and' ) ;
     public final void rule__Binding__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13794:1: ( ( 'and' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13795:1: ( 'and' )
+            // InternalRoom.g:13797:1: ( ( 'and' ) )
+            // InternalRoom.g:13798:1: ( 'and' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13795:1: ( 'and' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13796:1: 'and'
+            // InternalRoom.g:13798:1: ( 'and' )
+            // InternalRoom.g:13799:1: 'and'
             {
              before(grammarAccess.getBindingAccess().getAndKeyword_2()); 
-            match(input,85,FOLLOW_85_in_rule__Binding__Group__2__Impl28226); 
+            match(input,85,FOLLOW_2); 
              after(grammarAccess.getBindingAccess().getAndKeyword_2()); 
 
             }
@@ -38707,16 +38707,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Binding__Group__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13809:1: rule__Binding__Group__3 : rule__Binding__Group__3__Impl ;
+    // InternalRoom.g:13812:1: rule__Binding__Group__3 : rule__Binding__Group__3__Impl ;
     public final void rule__Binding__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13813:1: ( rule__Binding__Group__3__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13814:2: rule__Binding__Group__3__Impl
+            // InternalRoom.g:13816:1: ( rule__Binding__Group__3__Impl )
+            // InternalRoom.g:13817:2: rule__Binding__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__Binding__Group__3__Impl_in_rule__Binding__Group__328257);
+            pushFollow(FOLLOW_2);
             rule__Binding__Group__3__Impl();
 
             state._fsp--;
@@ -38740,23 +38740,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Binding__Group__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13820:1: rule__Binding__Group__3__Impl : ( ( rule__Binding__Endpoint2Assignment_3 ) ) ;
+    // InternalRoom.g:13823:1: rule__Binding__Group__3__Impl : ( ( rule__Binding__Endpoint2Assignment_3 ) ) ;
     public final void rule__Binding__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13824:1: ( ( ( rule__Binding__Endpoint2Assignment_3 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13825:1: ( ( rule__Binding__Endpoint2Assignment_3 ) )
+            // InternalRoom.g:13827:1: ( ( ( rule__Binding__Endpoint2Assignment_3 ) ) )
+            // InternalRoom.g:13828:1: ( ( rule__Binding__Endpoint2Assignment_3 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13825:1: ( ( rule__Binding__Endpoint2Assignment_3 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13826:1: ( rule__Binding__Endpoint2Assignment_3 )
+            // InternalRoom.g:13828:1: ( ( rule__Binding__Endpoint2Assignment_3 ) )
+            // InternalRoom.g:13829:1: ( rule__Binding__Endpoint2Assignment_3 )
             {
              before(grammarAccess.getBindingAccess().getEndpoint2Assignment_3()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13827:1: ( rule__Binding__Endpoint2Assignment_3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13827:2: rule__Binding__Endpoint2Assignment_3
+            // InternalRoom.g:13830:1: ( rule__Binding__Endpoint2Assignment_3 )
+            // InternalRoom.g:13830:2: rule__Binding__Endpoint2Assignment_3
             {
-            pushFollow(FOLLOW_rule__Binding__Endpoint2Assignment_3_in_rule__Binding__Group__3__Impl28284);
+            pushFollow(FOLLOW_2);
             rule__Binding__Endpoint2Assignment_3();
 
             state._fsp--;
@@ -38787,21 +38787,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__BindingEndPoint__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13845:1: rule__BindingEndPoint__Group__0 : rule__BindingEndPoint__Group__0__Impl rule__BindingEndPoint__Group__1 ;
+    // InternalRoom.g:13848:1: rule__BindingEndPoint__Group__0 : rule__BindingEndPoint__Group__0__Impl rule__BindingEndPoint__Group__1 ;
     public final void rule__BindingEndPoint__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13849:1: ( rule__BindingEndPoint__Group__0__Impl rule__BindingEndPoint__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13850:2: rule__BindingEndPoint__Group__0__Impl rule__BindingEndPoint__Group__1
+            // InternalRoom.g:13852:1: ( rule__BindingEndPoint__Group__0__Impl rule__BindingEndPoint__Group__1 )
+            // InternalRoom.g:13853:2: rule__BindingEndPoint__Group__0__Impl rule__BindingEndPoint__Group__1
             {
-            pushFollow(FOLLOW_rule__BindingEndPoint__Group__0__Impl_in_rule__BindingEndPoint__Group__028322);
+            pushFollow(FOLLOW_3);
             rule__BindingEndPoint__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__BindingEndPoint__Group__1_in_rule__BindingEndPoint__Group__028325);
+            pushFollow(FOLLOW_2);
             rule__BindingEndPoint__Group__1();
 
             state._fsp--;
@@ -38825,20 +38825,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__BindingEndPoint__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13857:1: rule__BindingEndPoint__Group__0__Impl : ( ( rule__BindingEndPoint__Group_0__0 )? ) ;
+    // InternalRoom.g:13860:1: rule__BindingEndPoint__Group__0__Impl : ( ( rule__BindingEndPoint__Group_0__0 )? ) ;
     public final void rule__BindingEndPoint__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13861:1: ( ( ( rule__BindingEndPoint__Group_0__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13862:1: ( ( rule__BindingEndPoint__Group_0__0 )? )
+            // InternalRoom.g:13864:1: ( ( ( rule__BindingEndPoint__Group_0__0 )? ) )
+            // InternalRoom.g:13865:1: ( ( rule__BindingEndPoint__Group_0__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13862:1: ( ( rule__BindingEndPoint__Group_0__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13863:1: ( rule__BindingEndPoint__Group_0__0 )?
+            // InternalRoom.g:13865:1: ( ( rule__BindingEndPoint__Group_0__0 )? )
+            // InternalRoom.g:13866:1: ( rule__BindingEndPoint__Group_0__0 )?
             {
              before(grammarAccess.getBindingEndPointAccess().getGroup_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13864:1: ( rule__BindingEndPoint__Group_0__0 )?
+            // InternalRoom.g:13867:1: ( rule__BindingEndPoint__Group_0__0 )?
             int alt142=2;
             int LA142_0 = input.LA(1);
 
@@ -38851,9 +38851,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt142) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13864:2: rule__BindingEndPoint__Group_0__0
+                    // InternalRoom.g:13867:2: rule__BindingEndPoint__Group_0__0
                     {
-                    pushFollow(FOLLOW_rule__BindingEndPoint__Group_0__0_in_rule__BindingEndPoint__Group__0__Impl28352);
+                    pushFollow(FOLLOW_2);
                     rule__BindingEndPoint__Group_0__0();
 
                     state._fsp--;
@@ -38887,21 +38887,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__BindingEndPoint__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13874:1: rule__BindingEndPoint__Group__1 : rule__BindingEndPoint__Group__1__Impl rule__BindingEndPoint__Group__2 ;
+    // InternalRoom.g:13877:1: rule__BindingEndPoint__Group__1 : rule__BindingEndPoint__Group__1__Impl rule__BindingEndPoint__Group__2 ;
     public final void rule__BindingEndPoint__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13878:1: ( rule__BindingEndPoint__Group__1__Impl rule__BindingEndPoint__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13879:2: rule__BindingEndPoint__Group__1__Impl rule__BindingEndPoint__Group__2
+            // InternalRoom.g:13881:1: ( rule__BindingEndPoint__Group__1__Impl rule__BindingEndPoint__Group__2 )
+            // InternalRoom.g:13882:2: rule__BindingEndPoint__Group__1__Impl rule__BindingEndPoint__Group__2
             {
-            pushFollow(FOLLOW_rule__BindingEndPoint__Group__1__Impl_in_rule__BindingEndPoint__Group__128383);
+            pushFollow(FOLLOW_70);
             rule__BindingEndPoint__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__BindingEndPoint__Group__2_in_rule__BindingEndPoint__Group__128386);
+            pushFollow(FOLLOW_2);
             rule__BindingEndPoint__Group__2();
 
             state._fsp--;
@@ -38925,23 +38925,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__BindingEndPoint__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13886:1: rule__BindingEndPoint__Group__1__Impl : ( ( rule__BindingEndPoint__PortAssignment_1 ) ) ;
+    // InternalRoom.g:13889:1: rule__BindingEndPoint__Group__1__Impl : ( ( rule__BindingEndPoint__PortAssignment_1 ) ) ;
     public final void rule__BindingEndPoint__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13890:1: ( ( ( rule__BindingEndPoint__PortAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13891:1: ( ( rule__BindingEndPoint__PortAssignment_1 ) )
+            // InternalRoom.g:13893:1: ( ( ( rule__BindingEndPoint__PortAssignment_1 ) ) )
+            // InternalRoom.g:13894:1: ( ( rule__BindingEndPoint__PortAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13891:1: ( ( rule__BindingEndPoint__PortAssignment_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13892:1: ( rule__BindingEndPoint__PortAssignment_1 )
+            // InternalRoom.g:13894:1: ( ( rule__BindingEndPoint__PortAssignment_1 ) )
+            // InternalRoom.g:13895:1: ( rule__BindingEndPoint__PortAssignment_1 )
             {
              before(grammarAccess.getBindingEndPointAccess().getPortAssignment_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13893:1: ( rule__BindingEndPoint__PortAssignment_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13893:2: rule__BindingEndPoint__PortAssignment_1
+            // InternalRoom.g:13896:1: ( rule__BindingEndPoint__PortAssignment_1 )
+            // InternalRoom.g:13896:2: rule__BindingEndPoint__PortAssignment_1
             {
-            pushFollow(FOLLOW_rule__BindingEndPoint__PortAssignment_1_in_rule__BindingEndPoint__Group__1__Impl28413);
+            pushFollow(FOLLOW_2);
             rule__BindingEndPoint__PortAssignment_1();
 
             state._fsp--;
@@ -38972,16 +38972,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__BindingEndPoint__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13903:1: rule__BindingEndPoint__Group__2 : rule__BindingEndPoint__Group__2__Impl ;
+    // InternalRoom.g:13906:1: rule__BindingEndPoint__Group__2 : rule__BindingEndPoint__Group__2__Impl ;
     public final void rule__BindingEndPoint__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13907:1: ( rule__BindingEndPoint__Group__2__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13908:2: rule__BindingEndPoint__Group__2__Impl
+            // InternalRoom.g:13910:1: ( rule__BindingEndPoint__Group__2__Impl )
+            // InternalRoom.g:13911:2: rule__BindingEndPoint__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__BindingEndPoint__Group__2__Impl_in_rule__BindingEndPoint__Group__228443);
+            pushFollow(FOLLOW_2);
             rule__BindingEndPoint__Group__2__Impl();
 
             state._fsp--;
@@ -39005,20 +39005,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__BindingEndPoint__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13914:1: rule__BindingEndPoint__Group__2__Impl : ( ( rule__BindingEndPoint__Group_2__0 )? ) ;
+    // InternalRoom.g:13917:1: rule__BindingEndPoint__Group__2__Impl : ( ( rule__BindingEndPoint__Group_2__0 )? ) ;
     public final void rule__BindingEndPoint__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13918:1: ( ( ( rule__BindingEndPoint__Group_2__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13919:1: ( ( rule__BindingEndPoint__Group_2__0 )? )
+            // InternalRoom.g:13921:1: ( ( ( rule__BindingEndPoint__Group_2__0 )? ) )
+            // InternalRoom.g:13922:1: ( ( rule__BindingEndPoint__Group_2__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13919:1: ( ( rule__BindingEndPoint__Group_2__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13920:1: ( rule__BindingEndPoint__Group_2__0 )?
+            // InternalRoom.g:13922:1: ( ( rule__BindingEndPoint__Group_2__0 )? )
+            // InternalRoom.g:13923:1: ( rule__BindingEndPoint__Group_2__0 )?
             {
              before(grammarAccess.getBindingEndPointAccess().getGroup_2()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13921:1: ( rule__BindingEndPoint__Group_2__0 )?
+            // InternalRoom.g:13924:1: ( rule__BindingEndPoint__Group_2__0 )?
             int alt143=2;
             int LA143_0 = input.LA(1);
 
@@ -39027,9 +39027,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt143) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13921:2: rule__BindingEndPoint__Group_2__0
+                    // InternalRoom.g:13924:2: rule__BindingEndPoint__Group_2__0
                     {
-                    pushFollow(FOLLOW_rule__BindingEndPoint__Group_2__0_in_rule__BindingEndPoint__Group__2__Impl28470);
+                    pushFollow(FOLLOW_2);
                     rule__BindingEndPoint__Group_2__0();
 
                     state._fsp--;
@@ -39063,21 +39063,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__BindingEndPoint__Group_0__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13937:1: rule__BindingEndPoint__Group_0__0 : rule__BindingEndPoint__Group_0__0__Impl rule__BindingEndPoint__Group_0__1 ;
+    // InternalRoom.g:13940:1: rule__BindingEndPoint__Group_0__0 : rule__BindingEndPoint__Group_0__0__Impl rule__BindingEndPoint__Group_0__1 ;
     public final void rule__BindingEndPoint__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13941:1: ( rule__BindingEndPoint__Group_0__0__Impl rule__BindingEndPoint__Group_0__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13942:2: rule__BindingEndPoint__Group_0__0__Impl rule__BindingEndPoint__Group_0__1
+            // InternalRoom.g:13944:1: ( rule__BindingEndPoint__Group_0__0__Impl rule__BindingEndPoint__Group_0__1 )
+            // InternalRoom.g:13945:2: rule__BindingEndPoint__Group_0__0__Impl rule__BindingEndPoint__Group_0__1
             {
-            pushFollow(FOLLOW_rule__BindingEndPoint__Group_0__0__Impl_in_rule__BindingEndPoint__Group_0__028507);
+            pushFollow(FOLLOW_71);
             rule__BindingEndPoint__Group_0__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__BindingEndPoint__Group_0__1_in_rule__BindingEndPoint__Group_0__028510);
+            pushFollow(FOLLOW_2);
             rule__BindingEndPoint__Group_0__1();
 
             state._fsp--;
@@ -39101,23 +39101,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__BindingEndPoint__Group_0__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13949:1: rule__BindingEndPoint__Group_0__0__Impl : ( ( rule__BindingEndPoint__ActorRefAssignment_0_0 ) ) ;
+    // InternalRoom.g:13952:1: rule__BindingEndPoint__Group_0__0__Impl : ( ( rule__BindingEndPoint__ActorRefAssignment_0_0 ) ) ;
     public final void rule__BindingEndPoint__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13953:1: ( ( ( rule__BindingEndPoint__ActorRefAssignment_0_0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13954:1: ( ( rule__BindingEndPoint__ActorRefAssignment_0_0 ) )
+            // InternalRoom.g:13956:1: ( ( ( rule__BindingEndPoint__ActorRefAssignment_0_0 ) ) )
+            // InternalRoom.g:13957:1: ( ( rule__BindingEndPoint__ActorRefAssignment_0_0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13954:1: ( ( rule__BindingEndPoint__ActorRefAssignment_0_0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13955:1: ( rule__BindingEndPoint__ActorRefAssignment_0_0 )
+            // InternalRoom.g:13957:1: ( ( rule__BindingEndPoint__ActorRefAssignment_0_0 ) )
+            // InternalRoom.g:13958:1: ( rule__BindingEndPoint__ActorRefAssignment_0_0 )
             {
              before(grammarAccess.getBindingEndPointAccess().getActorRefAssignment_0_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13956:1: ( rule__BindingEndPoint__ActorRefAssignment_0_0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13956:2: rule__BindingEndPoint__ActorRefAssignment_0_0
+            // InternalRoom.g:13959:1: ( rule__BindingEndPoint__ActorRefAssignment_0_0 )
+            // InternalRoom.g:13959:2: rule__BindingEndPoint__ActorRefAssignment_0_0
             {
-            pushFollow(FOLLOW_rule__BindingEndPoint__ActorRefAssignment_0_0_in_rule__BindingEndPoint__Group_0__0__Impl28537);
+            pushFollow(FOLLOW_2);
             rule__BindingEndPoint__ActorRefAssignment_0_0();
 
             state._fsp--;
@@ -39148,16 +39148,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__BindingEndPoint__Group_0__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13966:1: rule__BindingEndPoint__Group_0__1 : rule__BindingEndPoint__Group_0__1__Impl ;
+    // InternalRoom.g:13969:1: rule__BindingEndPoint__Group_0__1 : rule__BindingEndPoint__Group_0__1__Impl ;
     public final void rule__BindingEndPoint__Group_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13970:1: ( rule__BindingEndPoint__Group_0__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13971:2: rule__BindingEndPoint__Group_0__1__Impl
+            // InternalRoom.g:13973:1: ( rule__BindingEndPoint__Group_0__1__Impl )
+            // InternalRoom.g:13974:2: rule__BindingEndPoint__Group_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__BindingEndPoint__Group_0__1__Impl_in_rule__BindingEndPoint__Group_0__128567);
+            pushFollow(FOLLOW_2);
             rule__BindingEndPoint__Group_0__1__Impl();
 
             state._fsp--;
@@ -39181,20 +39181,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__BindingEndPoint__Group_0__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13977:1: rule__BindingEndPoint__Group_0__1__Impl : ( '.' ) ;
+    // InternalRoom.g:13980:1: rule__BindingEndPoint__Group_0__1__Impl : ( '.' ) ;
     public final void rule__BindingEndPoint__Group_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13981:1: ( ( '.' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13982:1: ( '.' )
+            // InternalRoom.g:13984:1: ( ( '.' ) )
+            // InternalRoom.g:13985:1: ( '.' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13982:1: ( '.' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:13983:1: '.'
+            // InternalRoom.g:13985:1: ( '.' )
+            // InternalRoom.g:13986:1: '.'
             {
              before(grammarAccess.getBindingEndPointAccess().getFullStopKeyword_0_1()); 
-            match(input,86,FOLLOW_86_in_rule__BindingEndPoint__Group_0__1__Impl28595); 
+            match(input,86,FOLLOW_2); 
              after(grammarAccess.getBindingEndPointAccess().getFullStopKeyword_0_1()); 
 
             }
@@ -39218,21 +39218,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__BindingEndPoint__Group_2__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14000:1: rule__BindingEndPoint__Group_2__0 : rule__BindingEndPoint__Group_2__0__Impl rule__BindingEndPoint__Group_2__1 ;
+    // InternalRoom.g:14003:1: rule__BindingEndPoint__Group_2__0 : rule__BindingEndPoint__Group_2__0__Impl rule__BindingEndPoint__Group_2__1 ;
     public final void rule__BindingEndPoint__Group_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14004:1: ( rule__BindingEndPoint__Group_2__0__Impl rule__BindingEndPoint__Group_2__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14005:2: rule__BindingEndPoint__Group_2__0__Impl rule__BindingEndPoint__Group_2__1
+            // InternalRoom.g:14007:1: ( rule__BindingEndPoint__Group_2__0__Impl rule__BindingEndPoint__Group_2__1 )
+            // InternalRoom.g:14008:2: rule__BindingEndPoint__Group_2__0__Impl rule__BindingEndPoint__Group_2__1
             {
-            pushFollow(FOLLOW_rule__BindingEndPoint__Group_2__0__Impl_in_rule__BindingEndPoint__Group_2__028630);
+            pushFollow(FOLLOW_3);
             rule__BindingEndPoint__Group_2__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__BindingEndPoint__Group_2__1_in_rule__BindingEndPoint__Group_2__028633);
+            pushFollow(FOLLOW_2);
             rule__BindingEndPoint__Group_2__1();
 
             state._fsp--;
@@ -39256,20 +39256,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__BindingEndPoint__Group_2__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14012:1: rule__BindingEndPoint__Group_2__0__Impl : ( 'sub' ) ;
+    // InternalRoom.g:14015:1: rule__BindingEndPoint__Group_2__0__Impl : ( 'sub' ) ;
     public final void rule__BindingEndPoint__Group_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14016:1: ( ( 'sub' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14017:1: ( 'sub' )
+            // InternalRoom.g:14019:1: ( ( 'sub' ) )
+            // InternalRoom.g:14020:1: ( 'sub' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14017:1: ( 'sub' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14018:1: 'sub'
+            // InternalRoom.g:14020:1: ( 'sub' )
+            // InternalRoom.g:14021:1: 'sub'
             {
              before(grammarAccess.getBindingEndPointAccess().getSubKeyword_2_0()); 
-            match(input,87,FOLLOW_87_in_rule__BindingEndPoint__Group_2__0__Impl28661); 
+            match(input,87,FOLLOW_2); 
              after(grammarAccess.getBindingEndPointAccess().getSubKeyword_2_0()); 
 
             }
@@ -39293,16 +39293,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__BindingEndPoint__Group_2__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14031:1: rule__BindingEndPoint__Group_2__1 : rule__BindingEndPoint__Group_2__1__Impl ;
+    // InternalRoom.g:14034:1: rule__BindingEndPoint__Group_2__1 : rule__BindingEndPoint__Group_2__1__Impl ;
     public final void rule__BindingEndPoint__Group_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14035:1: ( rule__BindingEndPoint__Group_2__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14036:2: rule__BindingEndPoint__Group_2__1__Impl
+            // InternalRoom.g:14038:1: ( rule__BindingEndPoint__Group_2__1__Impl )
+            // InternalRoom.g:14039:2: rule__BindingEndPoint__Group_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__BindingEndPoint__Group_2__1__Impl_in_rule__BindingEndPoint__Group_2__128692);
+            pushFollow(FOLLOW_2);
             rule__BindingEndPoint__Group_2__1__Impl();
 
             state._fsp--;
@@ -39326,23 +39326,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__BindingEndPoint__Group_2__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14042:1: rule__BindingEndPoint__Group_2__1__Impl : ( ( rule__BindingEndPoint__SubAssignment_2_1 ) ) ;
+    // InternalRoom.g:14045:1: rule__BindingEndPoint__Group_2__1__Impl : ( ( rule__BindingEndPoint__SubAssignment_2_1 ) ) ;
     public final void rule__BindingEndPoint__Group_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14046:1: ( ( ( rule__BindingEndPoint__SubAssignment_2_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14047:1: ( ( rule__BindingEndPoint__SubAssignment_2_1 ) )
+            // InternalRoom.g:14049:1: ( ( ( rule__BindingEndPoint__SubAssignment_2_1 ) ) )
+            // InternalRoom.g:14050:1: ( ( rule__BindingEndPoint__SubAssignment_2_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14047:1: ( ( rule__BindingEndPoint__SubAssignment_2_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14048:1: ( rule__BindingEndPoint__SubAssignment_2_1 )
+            // InternalRoom.g:14050:1: ( ( rule__BindingEndPoint__SubAssignment_2_1 ) )
+            // InternalRoom.g:14051:1: ( rule__BindingEndPoint__SubAssignment_2_1 )
             {
              before(grammarAccess.getBindingEndPointAccess().getSubAssignment_2_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14049:1: ( rule__BindingEndPoint__SubAssignment_2_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14049:2: rule__BindingEndPoint__SubAssignment_2_1
+            // InternalRoom.g:14052:1: ( rule__BindingEndPoint__SubAssignment_2_1 )
+            // InternalRoom.g:14052:2: rule__BindingEndPoint__SubAssignment_2_1
             {
-            pushFollow(FOLLOW_rule__BindingEndPoint__SubAssignment_2_1_in_rule__BindingEndPoint__Group_2__1__Impl28719);
+            pushFollow(FOLLOW_2);
             rule__BindingEndPoint__SubAssignment_2_1();
 
             state._fsp--;
@@ -39373,21 +39373,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__LayerConnection__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14063:1: rule__LayerConnection__Group__0 : rule__LayerConnection__Group__0__Impl rule__LayerConnection__Group__1 ;
+    // InternalRoom.g:14066:1: rule__LayerConnection__Group__0 : rule__LayerConnection__Group__0__Impl rule__LayerConnection__Group__1 ;
     public final void rule__LayerConnection__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14067:1: ( rule__LayerConnection__Group__0__Impl rule__LayerConnection__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14068:2: rule__LayerConnection__Group__0__Impl rule__LayerConnection__Group__1
+            // InternalRoom.g:14070:1: ( rule__LayerConnection__Group__0__Impl rule__LayerConnection__Group__1 )
+            // InternalRoom.g:14071:2: rule__LayerConnection__Group__0__Impl rule__LayerConnection__Group__1
             {
-            pushFollow(FOLLOW_rule__LayerConnection__Group__0__Impl_in_rule__LayerConnection__Group__028753);
+            pushFollow(FOLLOW_72);
             rule__LayerConnection__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__LayerConnection__Group__1_in_rule__LayerConnection__Group__028756);
+            pushFollow(FOLLOW_2);
             rule__LayerConnection__Group__1();
 
             state._fsp--;
@@ -39411,20 +39411,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__LayerConnection__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14075:1: rule__LayerConnection__Group__0__Impl : ( 'LayerConnection' ) ;
+    // InternalRoom.g:14078:1: rule__LayerConnection__Group__0__Impl : ( 'LayerConnection' ) ;
     public final void rule__LayerConnection__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14079:1: ( ( 'LayerConnection' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14080:1: ( 'LayerConnection' )
+            // InternalRoom.g:14082:1: ( ( 'LayerConnection' ) )
+            // InternalRoom.g:14083:1: ( 'LayerConnection' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14080:1: ( 'LayerConnection' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14081:1: 'LayerConnection'
+            // InternalRoom.g:14083:1: ( 'LayerConnection' )
+            // InternalRoom.g:14084:1: 'LayerConnection'
             {
              before(grammarAccess.getLayerConnectionAccess().getLayerConnectionKeyword_0()); 
-            match(input,88,FOLLOW_88_in_rule__LayerConnection__Group__0__Impl28784); 
+            match(input,88,FOLLOW_2); 
              after(grammarAccess.getLayerConnectionAccess().getLayerConnectionKeyword_0()); 
 
             }
@@ -39448,21 +39448,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__LayerConnection__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14094:1: rule__LayerConnection__Group__1 : rule__LayerConnection__Group__1__Impl rule__LayerConnection__Group__2 ;
+    // InternalRoom.g:14097:1: rule__LayerConnection__Group__1 : rule__LayerConnection__Group__1__Impl rule__LayerConnection__Group__2 ;
     public final void rule__LayerConnection__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14098:1: ( rule__LayerConnection__Group__1__Impl rule__LayerConnection__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14099:2: rule__LayerConnection__Group__1__Impl rule__LayerConnection__Group__2
+            // InternalRoom.g:14101:1: ( rule__LayerConnection__Group__1__Impl rule__LayerConnection__Group__2 )
+            // InternalRoom.g:14102:2: rule__LayerConnection__Group__1__Impl rule__LayerConnection__Group__2
             {
-            pushFollow(FOLLOW_rule__LayerConnection__Group__1__Impl_in_rule__LayerConnection__Group__128815);
+            pushFollow(FOLLOW_73);
             rule__LayerConnection__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__LayerConnection__Group__2_in_rule__LayerConnection__Group__128818);
+            pushFollow(FOLLOW_2);
             rule__LayerConnection__Group__2();
 
             state._fsp--;
@@ -39486,23 +39486,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__LayerConnection__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14106:1: rule__LayerConnection__Group__1__Impl : ( ( rule__LayerConnection__FromAssignment_1 ) ) ;
+    // InternalRoom.g:14109:1: rule__LayerConnection__Group__1__Impl : ( ( rule__LayerConnection__FromAssignment_1 ) ) ;
     public final void rule__LayerConnection__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14110:1: ( ( ( rule__LayerConnection__FromAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14111:1: ( ( rule__LayerConnection__FromAssignment_1 ) )
+            // InternalRoom.g:14113:1: ( ( ( rule__LayerConnection__FromAssignment_1 ) ) )
+            // InternalRoom.g:14114:1: ( ( rule__LayerConnection__FromAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14111:1: ( ( rule__LayerConnection__FromAssignment_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14112:1: ( rule__LayerConnection__FromAssignment_1 )
+            // InternalRoom.g:14114:1: ( ( rule__LayerConnection__FromAssignment_1 ) )
+            // InternalRoom.g:14115:1: ( rule__LayerConnection__FromAssignment_1 )
             {
              before(grammarAccess.getLayerConnectionAccess().getFromAssignment_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14113:1: ( rule__LayerConnection__FromAssignment_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14113:2: rule__LayerConnection__FromAssignment_1
+            // InternalRoom.g:14116:1: ( rule__LayerConnection__FromAssignment_1 )
+            // InternalRoom.g:14116:2: rule__LayerConnection__FromAssignment_1
             {
-            pushFollow(FOLLOW_rule__LayerConnection__FromAssignment_1_in_rule__LayerConnection__Group__1__Impl28845);
+            pushFollow(FOLLOW_2);
             rule__LayerConnection__FromAssignment_1();
 
             state._fsp--;
@@ -39533,21 +39533,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__LayerConnection__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14123:1: rule__LayerConnection__Group__2 : rule__LayerConnection__Group__2__Impl rule__LayerConnection__Group__3 ;
+    // InternalRoom.g:14126:1: rule__LayerConnection__Group__2 : rule__LayerConnection__Group__2__Impl rule__LayerConnection__Group__3 ;
     public final void rule__LayerConnection__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14127:1: ( rule__LayerConnection__Group__2__Impl rule__LayerConnection__Group__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14128:2: rule__LayerConnection__Group__2__Impl rule__LayerConnection__Group__3
+            // InternalRoom.g:14130:1: ( rule__LayerConnection__Group__2__Impl rule__LayerConnection__Group__3 )
+            // InternalRoom.g:14131:2: rule__LayerConnection__Group__2__Impl rule__LayerConnection__Group__3
             {
-            pushFollow(FOLLOW_rule__LayerConnection__Group__2__Impl_in_rule__LayerConnection__Group__228875);
+            pushFollow(FOLLOW_3);
             rule__LayerConnection__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__LayerConnection__Group__3_in_rule__LayerConnection__Group__228878);
+            pushFollow(FOLLOW_2);
             rule__LayerConnection__Group__3();
 
             state._fsp--;
@@ -39571,20 +39571,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__LayerConnection__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14135:1: rule__LayerConnection__Group__2__Impl : ( 'satisfied_by' ) ;
+    // InternalRoom.g:14138:1: rule__LayerConnection__Group__2__Impl : ( 'satisfied_by' ) ;
     public final void rule__LayerConnection__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14139:1: ( ( 'satisfied_by' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14140:1: ( 'satisfied_by' )
+            // InternalRoom.g:14142:1: ( ( 'satisfied_by' ) )
+            // InternalRoom.g:14143:1: ( 'satisfied_by' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14140:1: ( 'satisfied_by' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14141:1: 'satisfied_by'
+            // InternalRoom.g:14143:1: ( 'satisfied_by' )
+            // InternalRoom.g:14144:1: 'satisfied_by'
             {
              before(grammarAccess.getLayerConnectionAccess().getSatisfied_byKeyword_2()); 
-            match(input,89,FOLLOW_89_in_rule__LayerConnection__Group__2__Impl28906); 
+            match(input,89,FOLLOW_2); 
              after(grammarAccess.getLayerConnectionAccess().getSatisfied_byKeyword_2()); 
 
             }
@@ -39608,16 +39608,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__LayerConnection__Group__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14154:1: rule__LayerConnection__Group__3 : rule__LayerConnection__Group__3__Impl ;
+    // InternalRoom.g:14157:1: rule__LayerConnection__Group__3 : rule__LayerConnection__Group__3__Impl ;
     public final void rule__LayerConnection__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14158:1: ( rule__LayerConnection__Group__3__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14159:2: rule__LayerConnection__Group__3__Impl
+            // InternalRoom.g:14161:1: ( rule__LayerConnection__Group__3__Impl )
+            // InternalRoom.g:14162:2: rule__LayerConnection__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__LayerConnection__Group__3__Impl_in_rule__LayerConnection__Group__328937);
+            pushFollow(FOLLOW_2);
             rule__LayerConnection__Group__3__Impl();
 
             state._fsp--;
@@ -39641,23 +39641,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__LayerConnection__Group__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14165:1: rule__LayerConnection__Group__3__Impl : ( ( rule__LayerConnection__ToAssignment_3 ) ) ;
+    // InternalRoom.g:14168:1: rule__LayerConnection__Group__3__Impl : ( ( rule__LayerConnection__ToAssignment_3 ) ) ;
     public final void rule__LayerConnection__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14169:1: ( ( ( rule__LayerConnection__ToAssignment_3 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14170:1: ( ( rule__LayerConnection__ToAssignment_3 ) )
+            // InternalRoom.g:14172:1: ( ( ( rule__LayerConnection__ToAssignment_3 ) ) )
+            // InternalRoom.g:14173:1: ( ( rule__LayerConnection__ToAssignment_3 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14170:1: ( ( rule__LayerConnection__ToAssignment_3 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14171:1: ( rule__LayerConnection__ToAssignment_3 )
+            // InternalRoom.g:14173:1: ( ( rule__LayerConnection__ToAssignment_3 ) )
+            // InternalRoom.g:14174:1: ( rule__LayerConnection__ToAssignment_3 )
             {
              before(grammarAccess.getLayerConnectionAccess().getToAssignment_3()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14172:1: ( rule__LayerConnection__ToAssignment_3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14172:2: rule__LayerConnection__ToAssignment_3
+            // InternalRoom.g:14175:1: ( rule__LayerConnection__ToAssignment_3 )
+            // InternalRoom.g:14175:2: rule__LayerConnection__ToAssignment_3
             {
-            pushFollow(FOLLOW_rule__LayerConnection__ToAssignment_3_in_rule__LayerConnection__Group__3__Impl28964);
+            pushFollow(FOLLOW_2);
             rule__LayerConnection__ToAssignment_3();
 
             state._fsp--;
@@ -39688,21 +39688,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefSAPoint__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14190:1: rule__RefSAPoint__Group__0 : rule__RefSAPoint__Group__0__Impl rule__RefSAPoint__Group__1 ;
+    // InternalRoom.g:14193:1: rule__RefSAPoint__Group__0 : rule__RefSAPoint__Group__0__Impl rule__RefSAPoint__Group__1 ;
     public final void rule__RefSAPoint__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14194:1: ( rule__RefSAPoint__Group__0__Impl rule__RefSAPoint__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14195:2: rule__RefSAPoint__Group__0__Impl rule__RefSAPoint__Group__1
+            // InternalRoom.g:14197:1: ( rule__RefSAPoint__Group__0__Impl rule__RefSAPoint__Group__1 )
+            // InternalRoom.g:14198:2: rule__RefSAPoint__Group__0__Impl rule__RefSAPoint__Group__1
             {
-            pushFollow(FOLLOW_rule__RefSAPoint__Group__0__Impl_in_rule__RefSAPoint__Group__029002);
+            pushFollow(FOLLOW_3);
             rule__RefSAPoint__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RefSAPoint__Group__1_in_rule__RefSAPoint__Group__029005);
+            pushFollow(FOLLOW_2);
             rule__RefSAPoint__Group__1();
 
             state._fsp--;
@@ -39726,20 +39726,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefSAPoint__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14202:1: rule__RefSAPoint__Group__0__Impl : ( 'ref' ) ;
+    // InternalRoom.g:14205:1: rule__RefSAPoint__Group__0__Impl : ( 'ref' ) ;
     public final void rule__RefSAPoint__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14206:1: ( ( 'ref' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14207:1: ( 'ref' )
+            // InternalRoom.g:14209:1: ( ( 'ref' ) )
+            // InternalRoom.g:14210:1: ( 'ref' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14207:1: ( 'ref' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14208:1: 'ref'
+            // InternalRoom.g:14210:1: ( 'ref' )
+            // InternalRoom.g:14211:1: 'ref'
             {
              before(grammarAccess.getRefSAPointAccess().getRefKeyword_0()); 
-            match(input,90,FOLLOW_90_in_rule__RefSAPoint__Group__0__Impl29033); 
+            match(input,90,FOLLOW_2); 
              after(grammarAccess.getRefSAPointAccess().getRefKeyword_0()); 
 
             }
@@ -39763,16 +39763,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefSAPoint__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14221:1: rule__RefSAPoint__Group__1 : rule__RefSAPoint__Group__1__Impl ;
+    // InternalRoom.g:14224:1: rule__RefSAPoint__Group__1 : rule__RefSAPoint__Group__1__Impl ;
     public final void rule__RefSAPoint__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14225:1: ( rule__RefSAPoint__Group__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14226:2: rule__RefSAPoint__Group__1__Impl
+            // InternalRoom.g:14228:1: ( rule__RefSAPoint__Group__1__Impl )
+            // InternalRoom.g:14229:2: rule__RefSAPoint__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__RefSAPoint__Group__1__Impl_in_rule__RefSAPoint__Group__129064);
+            pushFollow(FOLLOW_2);
             rule__RefSAPoint__Group__1__Impl();
 
             state._fsp--;
@@ -39796,23 +39796,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefSAPoint__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14232:1: rule__RefSAPoint__Group__1__Impl : ( ( rule__RefSAPoint__RefAssignment_1 ) ) ;
+    // InternalRoom.g:14235:1: rule__RefSAPoint__Group__1__Impl : ( ( rule__RefSAPoint__RefAssignment_1 ) ) ;
     public final void rule__RefSAPoint__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14236:1: ( ( ( rule__RefSAPoint__RefAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14237:1: ( ( rule__RefSAPoint__RefAssignment_1 ) )
+            // InternalRoom.g:14239:1: ( ( ( rule__RefSAPoint__RefAssignment_1 ) ) )
+            // InternalRoom.g:14240:1: ( ( rule__RefSAPoint__RefAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14237:1: ( ( rule__RefSAPoint__RefAssignment_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14238:1: ( rule__RefSAPoint__RefAssignment_1 )
+            // InternalRoom.g:14240:1: ( ( rule__RefSAPoint__RefAssignment_1 ) )
+            // InternalRoom.g:14241:1: ( rule__RefSAPoint__RefAssignment_1 )
             {
              before(grammarAccess.getRefSAPointAccess().getRefAssignment_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14239:1: ( rule__RefSAPoint__RefAssignment_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14239:2: rule__RefSAPoint__RefAssignment_1
+            // InternalRoom.g:14242:1: ( rule__RefSAPoint__RefAssignment_1 )
+            // InternalRoom.g:14242:2: rule__RefSAPoint__RefAssignment_1
             {
-            pushFollow(FOLLOW_rule__RefSAPoint__RefAssignment_1_in_rule__RefSAPoint__Group__1__Impl29091);
+            pushFollow(FOLLOW_2);
             rule__RefSAPoint__RefAssignment_1();
 
             state._fsp--;
@@ -39843,21 +39843,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RelaySAPoint__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14253:1: rule__RelaySAPoint__Group__0 : rule__RelaySAPoint__Group__0__Impl rule__RelaySAPoint__Group__1 ;
+    // InternalRoom.g:14256:1: rule__RelaySAPoint__Group__0 : rule__RelaySAPoint__Group__0__Impl rule__RelaySAPoint__Group__1 ;
     public final void rule__RelaySAPoint__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14257:1: ( rule__RelaySAPoint__Group__0__Impl rule__RelaySAPoint__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14258:2: rule__RelaySAPoint__Group__0__Impl rule__RelaySAPoint__Group__1
+            // InternalRoom.g:14260:1: ( rule__RelaySAPoint__Group__0__Impl rule__RelaySAPoint__Group__1 )
+            // InternalRoom.g:14261:2: rule__RelaySAPoint__Group__0__Impl rule__RelaySAPoint__Group__1
             {
-            pushFollow(FOLLOW_rule__RelaySAPoint__Group__0__Impl_in_rule__RelaySAPoint__Group__029125);
+            pushFollow(FOLLOW_3);
             rule__RelaySAPoint__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RelaySAPoint__Group__1_in_rule__RelaySAPoint__Group__029128);
+            pushFollow(FOLLOW_2);
             rule__RelaySAPoint__Group__1();
 
             state._fsp--;
@@ -39881,20 +39881,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RelaySAPoint__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14265:1: rule__RelaySAPoint__Group__0__Impl : ( 'relay_sap' ) ;
+    // InternalRoom.g:14268:1: rule__RelaySAPoint__Group__0__Impl : ( 'relay_sap' ) ;
     public final void rule__RelaySAPoint__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14269:1: ( ( 'relay_sap' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14270:1: ( 'relay_sap' )
+            // InternalRoom.g:14272:1: ( ( 'relay_sap' ) )
+            // InternalRoom.g:14273:1: ( 'relay_sap' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14270:1: ( 'relay_sap' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14271:1: 'relay_sap'
+            // InternalRoom.g:14273:1: ( 'relay_sap' )
+            // InternalRoom.g:14274:1: 'relay_sap'
             {
              before(grammarAccess.getRelaySAPointAccess().getRelay_sapKeyword_0()); 
-            match(input,91,FOLLOW_91_in_rule__RelaySAPoint__Group__0__Impl29156); 
+            match(input,91,FOLLOW_2); 
              after(grammarAccess.getRelaySAPointAccess().getRelay_sapKeyword_0()); 
 
             }
@@ -39918,16 +39918,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RelaySAPoint__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14284:1: rule__RelaySAPoint__Group__1 : rule__RelaySAPoint__Group__1__Impl ;
+    // InternalRoom.g:14287:1: rule__RelaySAPoint__Group__1 : rule__RelaySAPoint__Group__1__Impl ;
     public final void rule__RelaySAPoint__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14288:1: ( rule__RelaySAPoint__Group__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14289:2: rule__RelaySAPoint__Group__1__Impl
+            // InternalRoom.g:14291:1: ( rule__RelaySAPoint__Group__1__Impl )
+            // InternalRoom.g:14292:2: rule__RelaySAPoint__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__RelaySAPoint__Group__1__Impl_in_rule__RelaySAPoint__Group__129187);
+            pushFollow(FOLLOW_2);
             rule__RelaySAPoint__Group__1__Impl();
 
             state._fsp--;
@@ -39951,23 +39951,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RelaySAPoint__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14295:1: rule__RelaySAPoint__Group__1__Impl : ( ( rule__RelaySAPoint__RelayAssignment_1 ) ) ;
+    // InternalRoom.g:14298:1: rule__RelaySAPoint__Group__1__Impl : ( ( rule__RelaySAPoint__RelayAssignment_1 ) ) ;
     public final void rule__RelaySAPoint__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14299:1: ( ( ( rule__RelaySAPoint__RelayAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14300:1: ( ( rule__RelaySAPoint__RelayAssignment_1 ) )
+            // InternalRoom.g:14302:1: ( ( ( rule__RelaySAPoint__RelayAssignment_1 ) ) )
+            // InternalRoom.g:14303:1: ( ( rule__RelaySAPoint__RelayAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14300:1: ( ( rule__RelaySAPoint__RelayAssignment_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14301:1: ( rule__RelaySAPoint__RelayAssignment_1 )
+            // InternalRoom.g:14303:1: ( ( rule__RelaySAPoint__RelayAssignment_1 ) )
+            // InternalRoom.g:14304:1: ( rule__RelaySAPoint__RelayAssignment_1 )
             {
              before(grammarAccess.getRelaySAPointAccess().getRelayAssignment_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14302:1: ( rule__RelaySAPoint__RelayAssignment_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14302:2: rule__RelaySAPoint__RelayAssignment_1
+            // InternalRoom.g:14305:1: ( rule__RelaySAPoint__RelayAssignment_1 )
+            // InternalRoom.g:14305:2: rule__RelaySAPoint__RelayAssignment_1
             {
-            pushFollow(FOLLOW_rule__RelaySAPoint__RelayAssignment_1_in_rule__RelaySAPoint__Group__1__Impl29214);
+            pushFollow(FOLLOW_2);
             rule__RelaySAPoint__RelayAssignment_1();
 
             state._fsp--;
@@ -39998,21 +39998,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SPPoint__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14316:1: rule__SPPoint__Group__0 : rule__SPPoint__Group__0__Impl rule__SPPoint__Group__1 ;
+    // InternalRoom.g:14319:1: rule__SPPoint__Group__0 : rule__SPPoint__Group__0__Impl rule__SPPoint__Group__1 ;
     public final void rule__SPPoint__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14320:1: ( rule__SPPoint__Group__0__Impl rule__SPPoint__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14321:2: rule__SPPoint__Group__0__Impl rule__SPPoint__Group__1
+            // InternalRoom.g:14323:1: ( rule__SPPoint__Group__0__Impl rule__SPPoint__Group__1 )
+            // InternalRoom.g:14324:2: rule__SPPoint__Group__0__Impl rule__SPPoint__Group__1
             {
-            pushFollow(FOLLOW_rule__SPPoint__Group__0__Impl_in_rule__SPPoint__Group__029248);
+            pushFollow(FOLLOW_71);
             rule__SPPoint__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SPPoint__Group__1_in_rule__SPPoint__Group__029251);
+            pushFollow(FOLLOW_2);
             rule__SPPoint__Group__1();
 
             state._fsp--;
@@ -40036,23 +40036,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SPPoint__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14328:1: rule__SPPoint__Group__0__Impl : ( ( rule__SPPoint__RefAssignment_0 ) ) ;
+    // InternalRoom.g:14331:1: rule__SPPoint__Group__0__Impl : ( ( rule__SPPoint__RefAssignment_0 ) ) ;
     public final void rule__SPPoint__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14332:1: ( ( ( rule__SPPoint__RefAssignment_0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14333:1: ( ( rule__SPPoint__RefAssignment_0 ) )
+            // InternalRoom.g:14335:1: ( ( ( rule__SPPoint__RefAssignment_0 ) ) )
+            // InternalRoom.g:14336:1: ( ( rule__SPPoint__RefAssignment_0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14333:1: ( ( rule__SPPoint__RefAssignment_0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14334:1: ( rule__SPPoint__RefAssignment_0 )
+            // InternalRoom.g:14336:1: ( ( rule__SPPoint__RefAssignment_0 ) )
+            // InternalRoom.g:14337:1: ( rule__SPPoint__RefAssignment_0 )
             {
              before(grammarAccess.getSPPointAccess().getRefAssignment_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14335:1: ( rule__SPPoint__RefAssignment_0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14335:2: rule__SPPoint__RefAssignment_0
+            // InternalRoom.g:14338:1: ( rule__SPPoint__RefAssignment_0 )
+            // InternalRoom.g:14338:2: rule__SPPoint__RefAssignment_0
             {
-            pushFollow(FOLLOW_rule__SPPoint__RefAssignment_0_in_rule__SPPoint__Group__0__Impl29278);
+            pushFollow(FOLLOW_2);
             rule__SPPoint__RefAssignment_0();
 
             state._fsp--;
@@ -40083,21 +40083,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SPPoint__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14345:1: rule__SPPoint__Group__1 : rule__SPPoint__Group__1__Impl rule__SPPoint__Group__2 ;
+    // InternalRoom.g:14348:1: rule__SPPoint__Group__1 : rule__SPPoint__Group__1__Impl rule__SPPoint__Group__2 ;
     public final void rule__SPPoint__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14349:1: ( rule__SPPoint__Group__1__Impl rule__SPPoint__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14350:2: rule__SPPoint__Group__1__Impl rule__SPPoint__Group__2
+            // InternalRoom.g:14352:1: ( rule__SPPoint__Group__1__Impl rule__SPPoint__Group__2 )
+            // InternalRoom.g:14353:2: rule__SPPoint__Group__1__Impl rule__SPPoint__Group__2
             {
-            pushFollow(FOLLOW_rule__SPPoint__Group__1__Impl_in_rule__SPPoint__Group__129308);
+            pushFollow(FOLLOW_3);
             rule__SPPoint__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SPPoint__Group__2_in_rule__SPPoint__Group__129311);
+            pushFollow(FOLLOW_2);
             rule__SPPoint__Group__2();
 
             state._fsp--;
@@ -40121,20 +40121,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SPPoint__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14357:1: rule__SPPoint__Group__1__Impl : ( '.' ) ;
+    // InternalRoom.g:14360:1: rule__SPPoint__Group__1__Impl : ( '.' ) ;
     public final void rule__SPPoint__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14361:1: ( ( '.' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14362:1: ( '.' )
+            // InternalRoom.g:14364:1: ( ( '.' ) )
+            // InternalRoom.g:14365:1: ( '.' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14362:1: ( '.' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14363:1: '.'
+            // InternalRoom.g:14365:1: ( '.' )
+            // InternalRoom.g:14366:1: '.'
             {
              before(grammarAccess.getSPPointAccess().getFullStopKeyword_1()); 
-            match(input,86,FOLLOW_86_in_rule__SPPoint__Group__1__Impl29339); 
+            match(input,86,FOLLOW_2); 
              after(grammarAccess.getSPPointAccess().getFullStopKeyword_1()); 
 
             }
@@ -40158,16 +40158,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SPPoint__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14376:1: rule__SPPoint__Group__2 : rule__SPPoint__Group__2__Impl ;
+    // InternalRoom.g:14379:1: rule__SPPoint__Group__2 : rule__SPPoint__Group__2__Impl ;
     public final void rule__SPPoint__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14380:1: ( rule__SPPoint__Group__2__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14381:2: rule__SPPoint__Group__2__Impl
+            // InternalRoom.g:14383:1: ( rule__SPPoint__Group__2__Impl )
+            // InternalRoom.g:14384:2: rule__SPPoint__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__SPPoint__Group__2__Impl_in_rule__SPPoint__Group__229370);
+            pushFollow(FOLLOW_2);
             rule__SPPoint__Group__2__Impl();
 
             state._fsp--;
@@ -40191,23 +40191,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SPPoint__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14387:1: rule__SPPoint__Group__2__Impl : ( ( rule__SPPoint__ServiceAssignment_2 ) ) ;
+    // InternalRoom.g:14390:1: rule__SPPoint__Group__2__Impl : ( ( rule__SPPoint__ServiceAssignment_2 ) ) ;
     public final void rule__SPPoint__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14391:1: ( ( ( rule__SPPoint__ServiceAssignment_2 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14392:1: ( ( rule__SPPoint__ServiceAssignment_2 ) )
+            // InternalRoom.g:14394:1: ( ( ( rule__SPPoint__ServiceAssignment_2 ) ) )
+            // InternalRoom.g:14395:1: ( ( rule__SPPoint__ServiceAssignment_2 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14392:1: ( ( rule__SPPoint__ServiceAssignment_2 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14393:1: ( rule__SPPoint__ServiceAssignment_2 )
+            // InternalRoom.g:14395:1: ( ( rule__SPPoint__ServiceAssignment_2 ) )
+            // InternalRoom.g:14396:1: ( rule__SPPoint__ServiceAssignment_2 )
             {
              before(grammarAccess.getSPPointAccess().getServiceAssignment_2()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14394:1: ( rule__SPPoint__ServiceAssignment_2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14394:2: rule__SPPoint__ServiceAssignment_2
+            // InternalRoom.g:14397:1: ( rule__SPPoint__ServiceAssignment_2 )
+            // InternalRoom.g:14397:2: rule__SPPoint__ServiceAssignment_2
             {
-            pushFollow(FOLLOW_rule__SPPoint__ServiceAssignment_2_in_rule__SPPoint__Group__2__Impl29397);
+            pushFollow(FOLLOW_2);
             rule__SPPoint__ServiceAssignment_2();
 
             state._fsp--;
@@ -40238,21 +40238,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorRef__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14410:1: rule__ActorRef__Group__0 : rule__ActorRef__Group__0__Impl rule__ActorRef__Group__1 ;
+    // InternalRoom.g:14413:1: rule__ActorRef__Group__0 : rule__ActorRef__Group__0__Impl rule__ActorRef__Group__1 ;
     public final void rule__ActorRef__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14414:1: ( rule__ActorRef__Group__0__Impl rule__ActorRef__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14415:2: rule__ActorRef__Group__0__Impl rule__ActorRef__Group__1
+            // InternalRoom.g:14417:1: ( rule__ActorRef__Group__0__Impl rule__ActorRef__Group__1 )
+            // InternalRoom.g:14418:2: rule__ActorRef__Group__0__Impl rule__ActorRef__Group__1
             {
-            pushFollow(FOLLOW_rule__ActorRef__Group__0__Impl_in_rule__ActorRef__Group__029433);
+            pushFollow(FOLLOW_74);
             rule__ActorRef__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ActorRef__Group__1_in_rule__ActorRef__Group__029436);
+            pushFollow(FOLLOW_2);
             rule__ActorRef__Group__1();
 
             state._fsp--;
@@ -40276,20 +40276,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorRef__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14422:1: rule__ActorRef__Group__0__Impl : ( ( rule__ActorRef__RefTypeAssignment_0 )? ) ;
+    // InternalRoom.g:14425:1: rule__ActorRef__Group__0__Impl : ( ( rule__ActorRef__RefTypeAssignment_0 )? ) ;
     public final void rule__ActorRef__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14426:1: ( ( ( rule__ActorRef__RefTypeAssignment_0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14427:1: ( ( rule__ActorRef__RefTypeAssignment_0 )? )
+            // InternalRoom.g:14429:1: ( ( ( rule__ActorRef__RefTypeAssignment_0 )? ) )
+            // InternalRoom.g:14430:1: ( ( rule__ActorRef__RefTypeAssignment_0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14427:1: ( ( rule__ActorRef__RefTypeAssignment_0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14428:1: ( rule__ActorRef__RefTypeAssignment_0 )?
+            // InternalRoom.g:14430:1: ( ( rule__ActorRef__RefTypeAssignment_0 )? )
+            // InternalRoom.g:14431:1: ( rule__ActorRef__RefTypeAssignment_0 )?
             {
              before(grammarAccess.getActorRefAccess().getRefTypeAssignment_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14429:1: ( rule__ActorRef__RefTypeAssignment_0 )?
+            // InternalRoom.g:14432:1: ( rule__ActorRef__RefTypeAssignment_0 )?
             int alt144=2;
             int LA144_0 = input.LA(1);
 
@@ -40298,9 +40298,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt144) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14429:2: rule__ActorRef__RefTypeAssignment_0
+                    // InternalRoom.g:14432:2: rule__ActorRef__RefTypeAssignment_0
                     {
-                    pushFollow(FOLLOW_rule__ActorRef__RefTypeAssignment_0_in_rule__ActorRef__Group__0__Impl29463);
+                    pushFollow(FOLLOW_2);
                     rule__ActorRef__RefTypeAssignment_0();
 
                     state._fsp--;
@@ -40334,21 +40334,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorRef__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14439:1: rule__ActorRef__Group__1 : rule__ActorRef__Group__1__Impl rule__ActorRef__Group__2 ;
+    // InternalRoom.g:14442:1: rule__ActorRef__Group__1 : rule__ActorRef__Group__1__Impl rule__ActorRef__Group__2 ;
     public final void rule__ActorRef__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14443:1: ( rule__ActorRef__Group__1__Impl rule__ActorRef__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14444:2: rule__ActorRef__Group__1__Impl rule__ActorRef__Group__2
+            // InternalRoom.g:14446:1: ( rule__ActorRef__Group__1__Impl rule__ActorRef__Group__2 )
+            // InternalRoom.g:14447:2: rule__ActorRef__Group__1__Impl rule__ActorRef__Group__2
             {
-            pushFollow(FOLLOW_rule__ActorRef__Group__1__Impl_in_rule__ActorRef__Group__129494);
+            pushFollow(FOLLOW_3);
             rule__ActorRef__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ActorRef__Group__2_in_rule__ActorRef__Group__129497);
+            pushFollow(FOLLOW_2);
             rule__ActorRef__Group__2();
 
             state._fsp--;
@@ -40372,20 +40372,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorRef__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14451:1: rule__ActorRef__Group__1__Impl : ( 'ActorRef' ) ;
+    // InternalRoom.g:14454:1: rule__ActorRef__Group__1__Impl : ( 'ActorRef' ) ;
     public final void rule__ActorRef__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14455:1: ( ( 'ActorRef' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14456:1: ( 'ActorRef' )
+            // InternalRoom.g:14458:1: ( ( 'ActorRef' ) )
+            // InternalRoom.g:14459:1: ( 'ActorRef' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14456:1: ( 'ActorRef' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14457:1: 'ActorRef'
+            // InternalRoom.g:14459:1: ( 'ActorRef' )
+            // InternalRoom.g:14460:1: 'ActorRef'
             {
              before(grammarAccess.getActorRefAccess().getActorRefKeyword_1()); 
-            match(input,92,FOLLOW_92_in_rule__ActorRef__Group__1__Impl29525); 
+            match(input,92,FOLLOW_2); 
              after(grammarAccess.getActorRefAccess().getActorRefKeyword_1()); 
 
             }
@@ -40409,21 +40409,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorRef__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14470:1: rule__ActorRef__Group__2 : rule__ActorRef__Group__2__Impl rule__ActorRef__Group__3 ;
+    // InternalRoom.g:14473:1: rule__ActorRef__Group__2 : rule__ActorRef__Group__2__Impl rule__ActorRef__Group__3 ;
     public final void rule__ActorRef__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14474:1: ( rule__ActorRef__Group__2__Impl rule__ActorRef__Group__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14475:2: rule__ActorRef__Group__2__Impl rule__ActorRef__Group__3
+            // InternalRoom.g:14477:1: ( rule__ActorRef__Group__2__Impl rule__ActorRef__Group__3 )
+            // InternalRoom.g:14478:2: rule__ActorRef__Group__2__Impl rule__ActorRef__Group__3
             {
-            pushFollow(FOLLOW_rule__ActorRef__Group__2__Impl_in_rule__ActorRef__Group__229556);
+            pushFollow(FOLLOW_28);
             rule__ActorRef__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ActorRef__Group__3_in_rule__ActorRef__Group__229559);
+            pushFollow(FOLLOW_2);
             rule__ActorRef__Group__3();
 
             state._fsp--;
@@ -40447,23 +40447,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorRef__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14482:1: rule__ActorRef__Group__2__Impl : ( ( rule__ActorRef__NameAssignment_2 ) ) ;
+    // InternalRoom.g:14485:1: rule__ActorRef__Group__2__Impl : ( ( rule__ActorRef__NameAssignment_2 ) ) ;
     public final void rule__ActorRef__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14486:1: ( ( ( rule__ActorRef__NameAssignment_2 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14487:1: ( ( rule__ActorRef__NameAssignment_2 ) )
+            // InternalRoom.g:14489:1: ( ( ( rule__ActorRef__NameAssignment_2 ) ) )
+            // InternalRoom.g:14490:1: ( ( rule__ActorRef__NameAssignment_2 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14487:1: ( ( rule__ActorRef__NameAssignment_2 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14488:1: ( rule__ActorRef__NameAssignment_2 )
+            // InternalRoom.g:14490:1: ( ( rule__ActorRef__NameAssignment_2 ) )
+            // InternalRoom.g:14491:1: ( rule__ActorRef__NameAssignment_2 )
             {
              before(grammarAccess.getActorRefAccess().getNameAssignment_2()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14489:1: ( rule__ActorRef__NameAssignment_2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14489:2: rule__ActorRef__NameAssignment_2
+            // InternalRoom.g:14492:1: ( rule__ActorRef__NameAssignment_2 )
+            // InternalRoom.g:14492:2: rule__ActorRef__NameAssignment_2
             {
-            pushFollow(FOLLOW_rule__ActorRef__NameAssignment_2_in_rule__ActorRef__Group__2__Impl29586);
+            pushFollow(FOLLOW_2);
             rule__ActorRef__NameAssignment_2();
 
             state._fsp--;
@@ -40494,21 +40494,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorRef__Group__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14499:1: rule__ActorRef__Group__3 : rule__ActorRef__Group__3__Impl rule__ActorRef__Group__4 ;
+    // InternalRoom.g:14502:1: rule__ActorRef__Group__3 : rule__ActorRef__Group__3__Impl rule__ActorRef__Group__4 ;
     public final void rule__ActorRef__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14503:1: ( rule__ActorRef__Group__3__Impl rule__ActorRef__Group__4 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14504:2: rule__ActorRef__Group__3__Impl rule__ActorRef__Group__4
+            // InternalRoom.g:14506:1: ( rule__ActorRef__Group__3__Impl rule__ActorRef__Group__4 )
+            // InternalRoom.g:14507:2: rule__ActorRef__Group__3__Impl rule__ActorRef__Group__4
             {
-            pushFollow(FOLLOW_rule__ActorRef__Group__3__Impl_in_rule__ActorRef__Group__329616);
+            pushFollow(FOLLOW_28);
             rule__ActorRef__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ActorRef__Group__4_in_rule__ActorRef__Group__329619);
+            pushFollow(FOLLOW_2);
             rule__ActorRef__Group__4();
 
             state._fsp--;
@@ -40532,20 +40532,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorRef__Group__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14511:1: rule__ActorRef__Group__3__Impl : ( ( rule__ActorRef__MultiplicityAssignment_3 )? ) ;
+    // InternalRoom.g:14514:1: rule__ActorRef__Group__3__Impl : ( ( rule__ActorRef__MultiplicityAssignment_3 )? ) ;
     public final void rule__ActorRef__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14515:1: ( ( ( rule__ActorRef__MultiplicityAssignment_3 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14516:1: ( ( rule__ActorRef__MultiplicityAssignment_3 )? )
+            // InternalRoom.g:14518:1: ( ( ( rule__ActorRef__MultiplicityAssignment_3 )? ) )
+            // InternalRoom.g:14519:1: ( ( rule__ActorRef__MultiplicityAssignment_3 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14516:1: ( ( rule__ActorRef__MultiplicityAssignment_3 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14517:1: ( rule__ActorRef__MultiplicityAssignment_3 )?
+            // InternalRoom.g:14519:1: ( ( rule__ActorRef__MultiplicityAssignment_3 )? )
+            // InternalRoom.g:14520:1: ( rule__ActorRef__MultiplicityAssignment_3 )?
             {
              before(grammarAccess.getActorRefAccess().getMultiplicityAssignment_3()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14518:1: ( rule__ActorRef__MultiplicityAssignment_3 )?
+            // InternalRoom.g:14521:1: ( rule__ActorRef__MultiplicityAssignment_3 )?
             int alt145=2;
             int LA145_0 = input.LA(1);
 
@@ -40554,9 +40554,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt145) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14518:2: rule__ActorRef__MultiplicityAssignment_3
+                    // InternalRoom.g:14521:2: rule__ActorRef__MultiplicityAssignment_3
                     {
-                    pushFollow(FOLLOW_rule__ActorRef__MultiplicityAssignment_3_in_rule__ActorRef__Group__3__Impl29646);
+                    pushFollow(FOLLOW_2);
                     rule__ActorRef__MultiplicityAssignment_3();
 
                     state._fsp--;
@@ -40590,21 +40590,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorRef__Group__4"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14528:1: rule__ActorRef__Group__4 : rule__ActorRef__Group__4__Impl rule__ActorRef__Group__5 ;
+    // InternalRoom.g:14531:1: rule__ActorRef__Group__4 : rule__ActorRef__Group__4__Impl rule__ActorRef__Group__5 ;
     public final void rule__ActorRef__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14532:1: ( rule__ActorRef__Group__4__Impl rule__ActorRef__Group__5 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14533:2: rule__ActorRef__Group__4__Impl rule__ActorRef__Group__5
+            // InternalRoom.g:14535:1: ( rule__ActorRef__Group__4__Impl rule__ActorRef__Group__5 )
+            // InternalRoom.g:14536:2: rule__ActorRef__Group__4__Impl rule__ActorRef__Group__5
             {
-            pushFollow(FOLLOW_rule__ActorRef__Group__4__Impl_in_rule__ActorRef__Group__429677);
+            pushFollow(FOLLOW_3);
             rule__ActorRef__Group__4__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ActorRef__Group__5_in_rule__ActorRef__Group__429680);
+            pushFollow(FOLLOW_2);
             rule__ActorRef__Group__5();
 
             state._fsp--;
@@ -40628,20 +40628,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorRef__Group__4__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14540:1: rule__ActorRef__Group__4__Impl : ( ':' ) ;
+    // InternalRoom.g:14543:1: rule__ActorRef__Group__4__Impl : ( ':' ) ;
     public final void rule__ActorRef__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14544:1: ( ( ':' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14545:1: ( ':' )
+            // InternalRoom.g:14547:1: ( ( ':' ) )
+            // InternalRoom.g:14548:1: ( ':' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14545:1: ( ':' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14546:1: ':'
+            // InternalRoom.g:14548:1: ( ':' )
+            // InternalRoom.g:14549:1: ':'
             {
              before(grammarAccess.getActorRefAccess().getColonKeyword_4()); 
-            match(input,43,FOLLOW_43_in_rule__ActorRef__Group__4__Impl29708); 
+            match(input,43,FOLLOW_2); 
              after(grammarAccess.getActorRefAccess().getColonKeyword_4()); 
 
             }
@@ -40665,21 +40665,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorRef__Group__5"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14559:1: rule__ActorRef__Group__5 : rule__ActorRef__Group__5__Impl rule__ActorRef__Group__6 ;
+    // InternalRoom.g:14562:1: rule__ActorRef__Group__5 : rule__ActorRef__Group__5__Impl rule__ActorRef__Group__6 ;
     public final void rule__ActorRef__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14563:1: ( rule__ActorRef__Group__5__Impl rule__ActorRef__Group__6 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14564:2: rule__ActorRef__Group__5__Impl rule__ActorRef__Group__6
+            // InternalRoom.g:14566:1: ( rule__ActorRef__Group__5__Impl rule__ActorRef__Group__6 )
+            // InternalRoom.g:14567:2: rule__ActorRef__Group__5__Impl rule__ActorRef__Group__6
             {
-            pushFollow(FOLLOW_rule__ActorRef__Group__5__Impl_in_rule__ActorRef__Group__529739);
+            pushFollow(FOLLOW_14);
             rule__ActorRef__Group__5__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ActorRef__Group__6_in_rule__ActorRef__Group__529742);
+            pushFollow(FOLLOW_2);
             rule__ActorRef__Group__6();
 
             state._fsp--;
@@ -40703,23 +40703,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorRef__Group__5__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14571:1: rule__ActorRef__Group__5__Impl : ( ( rule__ActorRef__TypeAssignment_5 ) ) ;
+    // InternalRoom.g:14574:1: rule__ActorRef__Group__5__Impl : ( ( rule__ActorRef__TypeAssignment_5 ) ) ;
     public final void rule__ActorRef__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14575:1: ( ( ( rule__ActorRef__TypeAssignment_5 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14576:1: ( ( rule__ActorRef__TypeAssignment_5 ) )
+            // InternalRoom.g:14578:1: ( ( ( rule__ActorRef__TypeAssignment_5 ) ) )
+            // InternalRoom.g:14579:1: ( ( rule__ActorRef__TypeAssignment_5 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14576:1: ( ( rule__ActorRef__TypeAssignment_5 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14577:1: ( rule__ActorRef__TypeAssignment_5 )
+            // InternalRoom.g:14579:1: ( ( rule__ActorRef__TypeAssignment_5 ) )
+            // InternalRoom.g:14580:1: ( rule__ActorRef__TypeAssignment_5 )
             {
              before(grammarAccess.getActorRefAccess().getTypeAssignment_5()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14578:1: ( rule__ActorRef__TypeAssignment_5 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14578:2: rule__ActorRef__TypeAssignment_5
+            // InternalRoom.g:14581:1: ( rule__ActorRef__TypeAssignment_5 )
+            // InternalRoom.g:14581:2: rule__ActorRef__TypeAssignment_5
             {
-            pushFollow(FOLLOW_rule__ActorRef__TypeAssignment_5_in_rule__ActorRef__Group__5__Impl29769);
+            pushFollow(FOLLOW_2);
             rule__ActorRef__TypeAssignment_5();
 
             state._fsp--;
@@ -40750,16 +40750,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorRef__Group__6"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14588:1: rule__ActorRef__Group__6 : rule__ActorRef__Group__6__Impl ;
+    // InternalRoom.g:14591:1: rule__ActorRef__Group__6 : rule__ActorRef__Group__6__Impl ;
     public final void rule__ActorRef__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14592:1: ( rule__ActorRef__Group__6__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14593:2: rule__ActorRef__Group__6__Impl
+            // InternalRoom.g:14595:1: ( rule__ActorRef__Group__6__Impl )
+            // InternalRoom.g:14596:2: rule__ActorRef__Group__6__Impl
             {
-            pushFollow(FOLLOW_rule__ActorRef__Group__6__Impl_in_rule__ActorRef__Group__629799);
+            pushFollow(FOLLOW_2);
             rule__ActorRef__Group__6__Impl();
 
             state._fsp--;
@@ -40783,20 +40783,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorRef__Group__6__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14599:1: rule__ActorRef__Group__6__Impl : ( ( rule__ActorRef__DocuAssignment_6 )? ) ;
+    // InternalRoom.g:14602:1: rule__ActorRef__Group__6__Impl : ( ( rule__ActorRef__DocuAssignment_6 )? ) ;
     public final void rule__ActorRef__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14603:1: ( ( ( rule__ActorRef__DocuAssignment_6 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14604:1: ( ( rule__ActorRef__DocuAssignment_6 )? )
+            // InternalRoom.g:14606:1: ( ( ( rule__ActorRef__DocuAssignment_6 )? ) )
+            // InternalRoom.g:14607:1: ( ( rule__ActorRef__DocuAssignment_6 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14604:1: ( ( rule__ActorRef__DocuAssignment_6 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14605:1: ( rule__ActorRef__DocuAssignment_6 )?
+            // InternalRoom.g:14607:1: ( ( rule__ActorRef__DocuAssignment_6 )? )
+            // InternalRoom.g:14608:1: ( rule__ActorRef__DocuAssignment_6 )?
             {
              before(grammarAccess.getActorRefAccess().getDocuAssignment_6()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14606:1: ( rule__ActorRef__DocuAssignment_6 )?
+            // InternalRoom.g:14609:1: ( rule__ActorRef__DocuAssignment_6 )?
             int alt146=2;
             int LA146_0 = input.LA(1);
 
@@ -40805,9 +40805,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt146) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14606:2: rule__ActorRef__DocuAssignment_6
+                    // InternalRoom.g:14609:2: rule__ActorRef__DocuAssignment_6
                     {
-                    pushFollow(FOLLOW_rule__ActorRef__DocuAssignment_6_in_rule__ActorRef__Group__6__Impl29826);
+                    pushFollow(FOLLOW_2);
                     rule__ActorRef__DocuAssignment_6();
 
                     state._fsp--;
@@ -40841,21 +40841,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MULTIPLICITY__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14630:1: rule__MULTIPLICITY__Group__0 : rule__MULTIPLICITY__Group__0__Impl rule__MULTIPLICITY__Group__1 ;
+    // InternalRoom.g:14633:1: rule__MULTIPLICITY__Group__0 : rule__MULTIPLICITY__Group__0__Impl rule__MULTIPLICITY__Group__1 ;
     public final void rule__MULTIPLICITY__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14634:1: ( rule__MULTIPLICITY__Group__0__Impl rule__MULTIPLICITY__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14635:2: rule__MULTIPLICITY__Group__0__Impl rule__MULTIPLICITY__Group__1
+            // InternalRoom.g:14637:1: ( rule__MULTIPLICITY__Group__0__Impl rule__MULTIPLICITY__Group__1 )
+            // InternalRoom.g:14638:2: rule__MULTIPLICITY__Group__0__Impl rule__MULTIPLICITY__Group__1
             {
-            pushFollow(FOLLOW_rule__MULTIPLICITY__Group__0__Impl_in_rule__MULTIPLICITY__Group__029871);
+            pushFollow(FOLLOW_75);
             rule__MULTIPLICITY__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__MULTIPLICITY__Group__1_in_rule__MULTIPLICITY__Group__029874);
+            pushFollow(FOLLOW_2);
             rule__MULTIPLICITY__Group__1();
 
             state._fsp--;
@@ -40879,20 +40879,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MULTIPLICITY__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14642:1: rule__MULTIPLICITY__Group__0__Impl : ( '[' ) ;
+    // InternalRoom.g:14645:1: rule__MULTIPLICITY__Group__0__Impl : ( '[' ) ;
     public final void rule__MULTIPLICITY__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14646:1: ( ( '[' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14647:1: ( '[' )
+            // InternalRoom.g:14649:1: ( ( '[' ) )
+            // InternalRoom.g:14650:1: ( '[' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14647:1: ( '[' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14648:1: '['
+            // InternalRoom.g:14650:1: ( '[' )
+            // InternalRoom.g:14651:1: '['
             {
              before(grammarAccess.getMULTIPLICITYAccess().getLeftSquareBracketKeyword_0()); 
-            match(input,59,FOLLOW_59_in_rule__MULTIPLICITY__Group__0__Impl29902); 
+            match(input,59,FOLLOW_2); 
              after(grammarAccess.getMULTIPLICITYAccess().getLeftSquareBracketKeyword_0()); 
 
             }
@@ -40916,21 +40916,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MULTIPLICITY__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14661:1: rule__MULTIPLICITY__Group__1 : rule__MULTIPLICITY__Group__1__Impl rule__MULTIPLICITY__Group__2 ;
+    // InternalRoom.g:14664:1: rule__MULTIPLICITY__Group__1 : rule__MULTIPLICITY__Group__1__Impl rule__MULTIPLICITY__Group__2 ;
     public final void rule__MULTIPLICITY__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14665:1: ( rule__MULTIPLICITY__Group__1__Impl rule__MULTIPLICITY__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14666:2: rule__MULTIPLICITY__Group__1__Impl rule__MULTIPLICITY__Group__2
+            // InternalRoom.g:14668:1: ( rule__MULTIPLICITY__Group__1__Impl rule__MULTIPLICITY__Group__2 )
+            // InternalRoom.g:14669:2: rule__MULTIPLICITY__Group__1__Impl rule__MULTIPLICITY__Group__2
             {
-            pushFollow(FOLLOW_rule__MULTIPLICITY__Group__1__Impl_in_rule__MULTIPLICITY__Group__129933);
+            pushFollow(FOLLOW_31);
             rule__MULTIPLICITY__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__MULTIPLICITY__Group__2_in_rule__MULTIPLICITY__Group__129936);
+            pushFollow(FOLLOW_2);
             rule__MULTIPLICITY__Group__2();
 
             state._fsp--;
@@ -40954,23 +40954,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MULTIPLICITY__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14673:1: rule__MULTIPLICITY__Group__1__Impl : ( ( rule__MULTIPLICITY__Alternatives_1 ) ) ;
+    // InternalRoom.g:14676:1: rule__MULTIPLICITY__Group__1__Impl : ( ( rule__MULTIPLICITY__Alternatives_1 ) ) ;
     public final void rule__MULTIPLICITY__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14677:1: ( ( ( rule__MULTIPLICITY__Alternatives_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14678:1: ( ( rule__MULTIPLICITY__Alternatives_1 ) )
+            // InternalRoom.g:14680:1: ( ( ( rule__MULTIPLICITY__Alternatives_1 ) ) )
+            // InternalRoom.g:14681:1: ( ( rule__MULTIPLICITY__Alternatives_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14678:1: ( ( rule__MULTIPLICITY__Alternatives_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14679:1: ( rule__MULTIPLICITY__Alternatives_1 )
+            // InternalRoom.g:14681:1: ( ( rule__MULTIPLICITY__Alternatives_1 ) )
+            // InternalRoom.g:14682:1: ( rule__MULTIPLICITY__Alternatives_1 )
             {
              before(grammarAccess.getMULTIPLICITYAccess().getAlternatives_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14680:1: ( rule__MULTIPLICITY__Alternatives_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14680:2: rule__MULTIPLICITY__Alternatives_1
+            // InternalRoom.g:14683:1: ( rule__MULTIPLICITY__Alternatives_1 )
+            // InternalRoom.g:14683:2: rule__MULTIPLICITY__Alternatives_1
             {
-            pushFollow(FOLLOW_rule__MULTIPLICITY__Alternatives_1_in_rule__MULTIPLICITY__Group__1__Impl29963);
+            pushFollow(FOLLOW_2);
             rule__MULTIPLICITY__Alternatives_1();
 
             state._fsp--;
@@ -41001,16 +41001,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MULTIPLICITY__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14690:1: rule__MULTIPLICITY__Group__2 : rule__MULTIPLICITY__Group__2__Impl ;
+    // InternalRoom.g:14693:1: rule__MULTIPLICITY__Group__2 : rule__MULTIPLICITY__Group__2__Impl ;
     public final void rule__MULTIPLICITY__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14694:1: ( rule__MULTIPLICITY__Group__2__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14695:2: rule__MULTIPLICITY__Group__2__Impl
+            // InternalRoom.g:14697:1: ( rule__MULTIPLICITY__Group__2__Impl )
+            // InternalRoom.g:14698:2: rule__MULTIPLICITY__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__MULTIPLICITY__Group__2__Impl_in_rule__MULTIPLICITY__Group__229993);
+            pushFollow(FOLLOW_2);
             rule__MULTIPLICITY__Group__2__Impl();
 
             state._fsp--;
@@ -41034,20 +41034,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MULTIPLICITY__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14701:1: rule__MULTIPLICITY__Group__2__Impl : ( ']' ) ;
+    // InternalRoom.g:14704:1: rule__MULTIPLICITY__Group__2__Impl : ( ']' ) ;
     public final void rule__MULTIPLICITY__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14705:1: ( ( ']' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14706:1: ( ']' )
+            // InternalRoom.g:14708:1: ( ( ']' ) )
+            // InternalRoom.g:14709:1: ( ']' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14706:1: ( ']' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14707:1: ']'
+            // InternalRoom.g:14709:1: ( ']' )
+            // InternalRoom.g:14710:1: ']'
             {
              before(grammarAccess.getMULTIPLICITYAccess().getRightSquareBracketKeyword_2()); 
-            match(input,60,FOLLOW_60_in_rule__MULTIPLICITY__Group__2__Impl30021); 
+            match(input,60,FOLLOW_2); 
              after(grammarAccess.getMULTIPLICITYAccess().getRightSquareBracketKeyword_2()); 
 
             }
@@ -41071,21 +41071,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateGraph__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14726:1: rule__StateGraph__Group__0 : rule__StateGraph__Group__0__Impl rule__StateGraph__Group__1 ;
+    // InternalRoom.g:14729:1: rule__StateGraph__Group__0 : rule__StateGraph__Group__0__Impl rule__StateGraph__Group__1 ;
     public final void rule__StateGraph__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14730:1: ( rule__StateGraph__Group__0__Impl rule__StateGraph__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14731:2: rule__StateGraph__Group__0__Impl rule__StateGraph__Group__1
+            // InternalRoom.g:14733:1: ( rule__StateGraph__Group__0__Impl rule__StateGraph__Group__1 )
+            // InternalRoom.g:14734:2: rule__StateGraph__Group__0__Impl rule__StateGraph__Group__1
             {
-            pushFollow(FOLLOW_rule__StateGraph__Group__0__Impl_in_rule__StateGraph__Group__030058);
+            pushFollow(FOLLOW_27);
             rule__StateGraph__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__StateGraph__Group__1_in_rule__StateGraph__Group__030061);
+            pushFollow(FOLLOW_2);
             rule__StateGraph__Group__1();
 
             state._fsp--;
@@ -41109,21 +41109,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateGraph__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14738:1: rule__StateGraph__Group__0__Impl : ( () ) ;
+    // InternalRoom.g:14741:1: rule__StateGraph__Group__0__Impl : ( () ) ;
     public final void rule__StateGraph__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14742:1: ( ( () ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14743:1: ( () )
+            // InternalRoom.g:14745:1: ( ( () ) )
+            // InternalRoom.g:14746:1: ( () )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14743:1: ( () )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14744:1: ()
+            // InternalRoom.g:14746:1: ( () )
+            // InternalRoom.g:14747:1: ()
             {
              before(grammarAccess.getStateGraphAccess().getStateGraphAction_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14745:1: ()
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14747:1: 
+            // InternalRoom.g:14748:1: ()
+            // InternalRoom.g:14750:1: 
             {
             }
 
@@ -41146,21 +41146,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateGraph__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14757:1: rule__StateGraph__Group__1 : rule__StateGraph__Group__1__Impl rule__StateGraph__Group__2 ;
+    // InternalRoom.g:14760:1: rule__StateGraph__Group__1 : rule__StateGraph__Group__1__Impl rule__StateGraph__Group__2 ;
     public final void rule__StateGraph__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14761:1: ( rule__StateGraph__Group__1__Impl rule__StateGraph__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14762:2: rule__StateGraph__Group__1__Impl rule__StateGraph__Group__2
+            // InternalRoom.g:14764:1: ( rule__StateGraph__Group__1__Impl rule__StateGraph__Group__2 )
+            // InternalRoom.g:14765:2: rule__StateGraph__Group__1__Impl rule__StateGraph__Group__2
             {
-            pushFollow(FOLLOW_rule__StateGraph__Group__1__Impl_in_rule__StateGraph__Group__130119);
+            pushFollow(FOLLOW_76);
             rule__StateGraph__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__StateGraph__Group__2_in_rule__StateGraph__Group__130122);
+            pushFollow(FOLLOW_2);
             rule__StateGraph__Group__2();
 
             state._fsp--;
@@ -41184,20 +41184,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateGraph__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14769:1: rule__StateGraph__Group__1__Impl : ( '{' ) ;
+    // InternalRoom.g:14772:1: rule__StateGraph__Group__1__Impl : ( '{' ) ;
     public final void rule__StateGraph__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14773:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14774:1: ( '{' )
+            // InternalRoom.g:14776:1: ( ( '{' ) )
+            // InternalRoom.g:14777:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14774:1: ( '{' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14775:1: '{'
+            // InternalRoom.g:14777:1: ( '{' )
+            // InternalRoom.g:14778:1: '{'
             {
              before(grammarAccess.getStateGraphAccess().getLeftCurlyBracketKeyword_1()); 
-            match(input,41,FOLLOW_41_in_rule__StateGraph__Group__1__Impl30150); 
+            match(input,41,FOLLOW_2); 
              after(grammarAccess.getStateGraphAccess().getLeftCurlyBracketKeyword_1()); 
 
             }
@@ -41221,21 +41221,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateGraph__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14788:1: rule__StateGraph__Group__2 : rule__StateGraph__Group__2__Impl rule__StateGraph__Group__3 ;
+    // InternalRoom.g:14791:1: rule__StateGraph__Group__2 : rule__StateGraph__Group__2__Impl rule__StateGraph__Group__3 ;
     public final void rule__StateGraph__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14792:1: ( rule__StateGraph__Group__2__Impl rule__StateGraph__Group__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14793:2: rule__StateGraph__Group__2__Impl rule__StateGraph__Group__3
+            // InternalRoom.g:14795:1: ( rule__StateGraph__Group__2__Impl rule__StateGraph__Group__3 )
+            // InternalRoom.g:14796:2: rule__StateGraph__Group__2__Impl rule__StateGraph__Group__3
             {
-            pushFollow(FOLLOW_rule__StateGraph__Group__2__Impl_in_rule__StateGraph__Group__230181);
+            pushFollow(FOLLOW_76);
             rule__StateGraph__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__StateGraph__Group__3_in_rule__StateGraph__Group__230184);
+            pushFollow(FOLLOW_2);
             rule__StateGraph__Group__3();
 
             state._fsp--;
@@ -41259,20 +41259,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateGraph__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14800:1: rule__StateGraph__Group__2__Impl : ( ( rule__StateGraph__Alternatives_2 )* ) ;
+    // InternalRoom.g:14803:1: rule__StateGraph__Group__2__Impl : ( ( rule__StateGraph__Alternatives_2 )* ) ;
     public final void rule__StateGraph__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14804:1: ( ( ( rule__StateGraph__Alternatives_2 )* ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14805:1: ( ( rule__StateGraph__Alternatives_2 )* )
+            // InternalRoom.g:14807:1: ( ( ( rule__StateGraph__Alternatives_2 )* ) )
+            // InternalRoom.g:14808:1: ( ( rule__StateGraph__Alternatives_2 )* )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14805:1: ( ( rule__StateGraph__Alternatives_2 )* )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14806:1: ( rule__StateGraph__Alternatives_2 )*
+            // InternalRoom.g:14808:1: ( ( rule__StateGraph__Alternatives_2 )* )
+            // InternalRoom.g:14809:1: ( rule__StateGraph__Alternatives_2 )*
             {
              before(grammarAccess.getStateGraphAccess().getAlternatives_2()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14807:1: ( rule__StateGraph__Alternatives_2 )*
+            // InternalRoom.g:14810:1: ( rule__StateGraph__Alternatives_2 )*
             loop147:
             do {
                 int alt147=2;
@@ -41285,9 +41285,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
                 switch (alt147) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14807:2: rule__StateGraph__Alternatives_2
+            	    // InternalRoom.g:14810:2: rule__StateGraph__Alternatives_2
             	    {
-            	    pushFollow(FOLLOW_rule__StateGraph__Alternatives_2_in_rule__StateGraph__Group__2__Impl30211);
+            	    pushFollow(FOLLOW_77);
             	    rule__StateGraph__Alternatives_2();
 
             	    state._fsp--;
@@ -41324,16 +41324,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateGraph__Group__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14817:1: rule__StateGraph__Group__3 : rule__StateGraph__Group__3__Impl ;
+    // InternalRoom.g:14820:1: rule__StateGraph__Group__3 : rule__StateGraph__Group__3__Impl ;
     public final void rule__StateGraph__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14821:1: ( rule__StateGraph__Group__3__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14822:2: rule__StateGraph__Group__3__Impl
+            // InternalRoom.g:14824:1: ( rule__StateGraph__Group__3__Impl )
+            // InternalRoom.g:14825:2: rule__StateGraph__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__StateGraph__Group__3__Impl_in_rule__StateGraph__Group__330242);
+            pushFollow(FOLLOW_2);
             rule__StateGraph__Group__3__Impl();
 
             state._fsp--;
@@ -41357,20 +41357,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateGraph__Group__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14828:1: rule__StateGraph__Group__3__Impl : ( '}' ) ;
+    // InternalRoom.g:14831:1: rule__StateGraph__Group__3__Impl : ( '}' ) ;
     public final void rule__StateGraph__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14832:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14833:1: ( '}' )
+            // InternalRoom.g:14835:1: ( ( '}' ) )
+            // InternalRoom.g:14836:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14833:1: ( '}' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14834:1: '}'
+            // InternalRoom.g:14836:1: ( '}' )
+            // InternalRoom.g:14837:1: '}'
             {
              before(grammarAccess.getStateGraphAccess().getRightCurlyBracketKeyword_3()); 
-            match(input,42,FOLLOW_42_in_rule__StateGraph__Group__3__Impl30270); 
+            match(input,42,FOLLOW_2); 
              after(grammarAccess.getStateGraphAccess().getRightCurlyBracketKeyword_3()); 
 
             }
@@ -41394,21 +41394,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateMachine__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14855:1: rule__StateMachine__Group__0 : rule__StateMachine__Group__0__Impl rule__StateMachine__Group__1 ;
+    // InternalRoom.g:14858:1: rule__StateMachine__Group__0 : rule__StateMachine__Group__0__Impl rule__StateMachine__Group__1 ;
     public final void rule__StateMachine__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14859:1: ( rule__StateMachine__Group__0__Impl rule__StateMachine__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14860:2: rule__StateMachine__Group__0__Impl rule__StateMachine__Group__1
+            // InternalRoom.g:14862:1: ( rule__StateMachine__Group__0__Impl rule__StateMachine__Group__1 )
+            // InternalRoom.g:14863:2: rule__StateMachine__Group__0__Impl rule__StateMachine__Group__1
             {
-            pushFollow(FOLLOW_rule__StateMachine__Group__0__Impl_in_rule__StateMachine__Group__030309);
+            pushFollow(FOLLOW_78);
             rule__StateMachine__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__StateMachine__Group__1_in_rule__StateMachine__Group__030312);
+            pushFollow(FOLLOW_2);
             rule__StateMachine__Group__1();
 
             state._fsp--;
@@ -41432,21 +41432,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateMachine__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14867:1: rule__StateMachine__Group__0__Impl : ( () ) ;
+    // InternalRoom.g:14870:1: rule__StateMachine__Group__0__Impl : ( () ) ;
     public final void rule__StateMachine__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14871:1: ( ( () ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14872:1: ( () )
+            // InternalRoom.g:14874:1: ( ( () ) )
+            // InternalRoom.g:14875:1: ( () )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14872:1: ( () )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14873:1: ()
+            // InternalRoom.g:14875:1: ( () )
+            // InternalRoom.g:14876:1: ()
             {
              before(grammarAccess.getStateMachineAccess().getStateGraphAction_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14874:1: ()
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14876:1: 
+            // InternalRoom.g:14877:1: ()
+            // InternalRoom.g:14879:1: 
             {
             }
 
@@ -41469,21 +41469,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateMachine__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14886:1: rule__StateMachine__Group__1 : rule__StateMachine__Group__1__Impl rule__StateMachine__Group__2 ;
+    // InternalRoom.g:14889:1: rule__StateMachine__Group__1 : rule__StateMachine__Group__1__Impl rule__StateMachine__Group__2 ;
     public final void rule__StateMachine__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14890:1: ( rule__StateMachine__Group__1__Impl rule__StateMachine__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14891:2: rule__StateMachine__Group__1__Impl rule__StateMachine__Group__2
+            // InternalRoom.g:14893:1: ( rule__StateMachine__Group__1__Impl rule__StateMachine__Group__2 )
+            // InternalRoom.g:14894:2: rule__StateMachine__Group__1__Impl rule__StateMachine__Group__2
             {
-            pushFollow(FOLLOW_rule__StateMachine__Group__1__Impl_in_rule__StateMachine__Group__130370);
+            pushFollow(FOLLOW_27);
             rule__StateMachine__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__StateMachine__Group__2_in_rule__StateMachine__Group__130373);
+            pushFollow(FOLLOW_2);
             rule__StateMachine__Group__2();
 
             state._fsp--;
@@ -41507,20 +41507,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateMachine__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14898:1: rule__StateMachine__Group__1__Impl : ( 'StateMachine' ) ;
+    // InternalRoom.g:14901:1: rule__StateMachine__Group__1__Impl : ( 'StateMachine' ) ;
     public final void rule__StateMachine__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14902:1: ( ( 'StateMachine' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14903:1: ( 'StateMachine' )
+            // InternalRoom.g:14905:1: ( ( 'StateMachine' ) )
+            // InternalRoom.g:14906:1: ( 'StateMachine' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14903:1: ( 'StateMachine' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14904:1: 'StateMachine'
+            // InternalRoom.g:14906:1: ( 'StateMachine' )
+            // InternalRoom.g:14907:1: 'StateMachine'
             {
              before(grammarAccess.getStateMachineAccess().getStateMachineKeyword_1()); 
-            match(input,93,FOLLOW_93_in_rule__StateMachine__Group__1__Impl30401); 
+            match(input,93,FOLLOW_2); 
              after(grammarAccess.getStateMachineAccess().getStateMachineKeyword_1()); 
 
             }
@@ -41544,21 +41544,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateMachine__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14917:1: rule__StateMachine__Group__2 : rule__StateMachine__Group__2__Impl rule__StateMachine__Group__3 ;
+    // InternalRoom.g:14920:1: rule__StateMachine__Group__2 : rule__StateMachine__Group__2__Impl rule__StateMachine__Group__3 ;
     public final void rule__StateMachine__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14921:1: ( rule__StateMachine__Group__2__Impl rule__StateMachine__Group__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14922:2: rule__StateMachine__Group__2__Impl rule__StateMachine__Group__3
+            // InternalRoom.g:14924:1: ( rule__StateMachine__Group__2__Impl rule__StateMachine__Group__3 )
+            // InternalRoom.g:14925:2: rule__StateMachine__Group__2__Impl rule__StateMachine__Group__3
             {
-            pushFollow(FOLLOW_rule__StateMachine__Group__2__Impl_in_rule__StateMachine__Group__230432);
+            pushFollow(FOLLOW_76);
             rule__StateMachine__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__StateMachine__Group__3_in_rule__StateMachine__Group__230435);
+            pushFollow(FOLLOW_2);
             rule__StateMachine__Group__3();
 
             state._fsp--;
@@ -41582,20 +41582,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateMachine__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14929:1: rule__StateMachine__Group__2__Impl : ( '{' ) ;
+    // InternalRoom.g:14932:1: rule__StateMachine__Group__2__Impl : ( '{' ) ;
     public final void rule__StateMachine__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14933:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14934:1: ( '{' )
+            // InternalRoom.g:14936:1: ( ( '{' ) )
+            // InternalRoom.g:14937:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14934:1: ( '{' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14935:1: '{'
+            // InternalRoom.g:14937:1: ( '{' )
+            // InternalRoom.g:14938:1: '{'
             {
              before(grammarAccess.getStateMachineAccess().getLeftCurlyBracketKeyword_2()); 
-            match(input,41,FOLLOW_41_in_rule__StateMachine__Group__2__Impl30463); 
+            match(input,41,FOLLOW_2); 
              after(grammarAccess.getStateMachineAccess().getLeftCurlyBracketKeyword_2()); 
 
             }
@@ -41619,21 +41619,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateMachine__Group__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14948:1: rule__StateMachine__Group__3 : rule__StateMachine__Group__3__Impl rule__StateMachine__Group__4 ;
+    // InternalRoom.g:14951:1: rule__StateMachine__Group__3 : rule__StateMachine__Group__3__Impl rule__StateMachine__Group__4 ;
     public final void rule__StateMachine__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14952:1: ( rule__StateMachine__Group__3__Impl rule__StateMachine__Group__4 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14953:2: rule__StateMachine__Group__3__Impl rule__StateMachine__Group__4
+            // InternalRoom.g:14955:1: ( rule__StateMachine__Group__3__Impl rule__StateMachine__Group__4 )
+            // InternalRoom.g:14956:2: rule__StateMachine__Group__3__Impl rule__StateMachine__Group__4
             {
-            pushFollow(FOLLOW_rule__StateMachine__Group__3__Impl_in_rule__StateMachine__Group__330494);
+            pushFollow(FOLLOW_76);
             rule__StateMachine__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__StateMachine__Group__4_in_rule__StateMachine__Group__330497);
+            pushFollow(FOLLOW_2);
             rule__StateMachine__Group__4();
 
             state._fsp--;
@@ -41657,20 +41657,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateMachine__Group__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14960:1: rule__StateMachine__Group__3__Impl : ( ( rule__StateMachine__Alternatives_3 )* ) ;
+    // InternalRoom.g:14963:1: rule__StateMachine__Group__3__Impl : ( ( rule__StateMachine__Alternatives_3 )* ) ;
     public final void rule__StateMachine__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14964:1: ( ( ( rule__StateMachine__Alternatives_3 )* ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14965:1: ( ( rule__StateMachine__Alternatives_3 )* )
+            // InternalRoom.g:14967:1: ( ( ( rule__StateMachine__Alternatives_3 )* ) )
+            // InternalRoom.g:14968:1: ( ( rule__StateMachine__Alternatives_3 )* )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14965:1: ( ( rule__StateMachine__Alternatives_3 )* )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14966:1: ( rule__StateMachine__Alternatives_3 )*
+            // InternalRoom.g:14968:1: ( ( rule__StateMachine__Alternatives_3 )* )
+            // InternalRoom.g:14969:1: ( rule__StateMachine__Alternatives_3 )*
             {
              before(grammarAccess.getStateMachineAccess().getAlternatives_3()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14967:1: ( rule__StateMachine__Alternatives_3 )*
+            // InternalRoom.g:14970:1: ( rule__StateMachine__Alternatives_3 )*
             loop148:
             do {
                 int alt148=2;
@@ -41683,9 +41683,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
                 switch (alt148) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14967:2: rule__StateMachine__Alternatives_3
+            	    // InternalRoom.g:14970:2: rule__StateMachine__Alternatives_3
             	    {
-            	    pushFollow(FOLLOW_rule__StateMachine__Alternatives_3_in_rule__StateMachine__Group__3__Impl30524);
+            	    pushFollow(FOLLOW_77);
             	    rule__StateMachine__Alternatives_3();
 
             	    state._fsp--;
@@ -41722,16 +41722,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateMachine__Group__4"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14977:1: rule__StateMachine__Group__4 : rule__StateMachine__Group__4__Impl ;
+    // InternalRoom.g:14980:1: rule__StateMachine__Group__4 : rule__StateMachine__Group__4__Impl ;
     public final void rule__StateMachine__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14981:1: ( rule__StateMachine__Group__4__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14982:2: rule__StateMachine__Group__4__Impl
+            // InternalRoom.g:14984:1: ( rule__StateMachine__Group__4__Impl )
+            // InternalRoom.g:14985:2: rule__StateMachine__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__StateMachine__Group__4__Impl_in_rule__StateMachine__Group__430555);
+            pushFollow(FOLLOW_2);
             rule__StateMachine__Group__4__Impl();
 
             state._fsp--;
@@ -41755,20 +41755,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateMachine__Group__4__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14988:1: rule__StateMachine__Group__4__Impl : ( '}' ) ;
+    // InternalRoom.g:14991:1: rule__StateMachine__Group__4__Impl : ( '}' ) ;
     public final void rule__StateMachine__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14992:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14993:1: ( '}' )
+            // InternalRoom.g:14995:1: ( ( '}' ) )
+            // InternalRoom.g:14996:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14993:1: ( '}' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:14994:1: '}'
+            // InternalRoom.g:14996:1: ( '}' )
+            // InternalRoom.g:14997:1: '}'
             {
              before(grammarAccess.getStateMachineAccess().getRightCurlyBracketKeyword_4()); 
-            match(input,42,FOLLOW_42_in_rule__StateMachine__Group__4__Impl30583); 
+            match(input,42,FOLLOW_2); 
              after(grammarAccess.getStateMachineAccess().getRightCurlyBracketKeyword_4()); 
 
             }
@@ -41792,21 +41792,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15017:1: rule__SimpleState__Group__0 : rule__SimpleState__Group__0__Impl rule__SimpleState__Group__1 ;
+    // InternalRoom.g:15020:1: rule__SimpleState__Group__0 : rule__SimpleState__Group__0__Impl rule__SimpleState__Group__1 ;
     public final void rule__SimpleState__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15021:1: ( rule__SimpleState__Group__0__Impl rule__SimpleState__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15022:2: rule__SimpleState__Group__0__Impl rule__SimpleState__Group__1
+            // InternalRoom.g:15024:1: ( rule__SimpleState__Group__0__Impl rule__SimpleState__Group__1 )
+            // InternalRoom.g:15025:2: rule__SimpleState__Group__0__Impl rule__SimpleState__Group__1
             {
-            pushFollow(FOLLOW_rule__SimpleState__Group__0__Impl_in_rule__SimpleState__Group__030624);
+            pushFollow(FOLLOW_3);
             rule__SimpleState__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SimpleState__Group__1_in_rule__SimpleState__Group__030627);
+            pushFollow(FOLLOW_2);
             rule__SimpleState__Group__1();
 
             state._fsp--;
@@ -41830,20 +41830,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15029:1: rule__SimpleState__Group__0__Impl : ( 'State' ) ;
+    // InternalRoom.g:15032:1: rule__SimpleState__Group__0__Impl : ( 'State' ) ;
     public final void rule__SimpleState__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15033:1: ( ( 'State' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15034:1: ( 'State' )
+            // InternalRoom.g:15036:1: ( ( 'State' ) )
+            // InternalRoom.g:15037:1: ( 'State' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15034:1: ( 'State' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15035:1: 'State'
+            // InternalRoom.g:15037:1: ( 'State' )
+            // InternalRoom.g:15038:1: 'State'
             {
              before(grammarAccess.getSimpleStateAccess().getStateKeyword_0()); 
-            match(input,94,FOLLOW_94_in_rule__SimpleState__Group__0__Impl30655); 
+            match(input,94,FOLLOW_2); 
              after(grammarAccess.getSimpleStateAccess().getStateKeyword_0()); 
 
             }
@@ -41867,21 +41867,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15048:1: rule__SimpleState__Group__1 : rule__SimpleState__Group__1__Impl rule__SimpleState__Group__2 ;
+    // InternalRoom.g:15051:1: rule__SimpleState__Group__1 : rule__SimpleState__Group__1__Impl rule__SimpleState__Group__2 ;
     public final void rule__SimpleState__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15052:1: ( rule__SimpleState__Group__1__Impl rule__SimpleState__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15053:2: rule__SimpleState__Group__1__Impl rule__SimpleState__Group__2
+            // InternalRoom.g:15055:1: ( rule__SimpleState__Group__1__Impl rule__SimpleState__Group__2 )
+            // InternalRoom.g:15056:2: rule__SimpleState__Group__1__Impl rule__SimpleState__Group__2
             {
-            pushFollow(FOLLOW_rule__SimpleState__Group__1__Impl_in_rule__SimpleState__Group__130686);
+            pushFollow(FOLLOW_4);
             rule__SimpleState__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SimpleState__Group__2_in_rule__SimpleState__Group__130689);
+            pushFollow(FOLLOW_2);
             rule__SimpleState__Group__2();
 
             state._fsp--;
@@ -41905,23 +41905,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15060:1: rule__SimpleState__Group__1__Impl : ( ( rule__SimpleState__NameAssignment_1 ) ) ;
+    // InternalRoom.g:15063:1: rule__SimpleState__Group__1__Impl : ( ( rule__SimpleState__NameAssignment_1 ) ) ;
     public final void rule__SimpleState__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15064:1: ( ( ( rule__SimpleState__NameAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15065:1: ( ( rule__SimpleState__NameAssignment_1 ) )
+            // InternalRoom.g:15067:1: ( ( ( rule__SimpleState__NameAssignment_1 ) ) )
+            // InternalRoom.g:15068:1: ( ( rule__SimpleState__NameAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15065:1: ( ( rule__SimpleState__NameAssignment_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15066:1: ( rule__SimpleState__NameAssignment_1 )
+            // InternalRoom.g:15068:1: ( ( rule__SimpleState__NameAssignment_1 ) )
+            // InternalRoom.g:15069:1: ( rule__SimpleState__NameAssignment_1 )
             {
              before(grammarAccess.getSimpleStateAccess().getNameAssignment_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15067:1: ( rule__SimpleState__NameAssignment_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15067:2: rule__SimpleState__NameAssignment_1
+            // InternalRoom.g:15070:1: ( rule__SimpleState__NameAssignment_1 )
+            // InternalRoom.g:15070:2: rule__SimpleState__NameAssignment_1
             {
-            pushFollow(FOLLOW_rule__SimpleState__NameAssignment_1_in_rule__SimpleState__Group__1__Impl30716);
+            pushFollow(FOLLOW_2);
             rule__SimpleState__NameAssignment_1();
 
             state._fsp--;
@@ -41952,21 +41952,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15077:1: rule__SimpleState__Group__2 : rule__SimpleState__Group__2__Impl rule__SimpleState__Group__3 ;
+    // InternalRoom.g:15080:1: rule__SimpleState__Group__2 : rule__SimpleState__Group__2__Impl rule__SimpleState__Group__3 ;
     public final void rule__SimpleState__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15081:1: ( rule__SimpleState__Group__2__Impl rule__SimpleState__Group__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15082:2: rule__SimpleState__Group__2__Impl rule__SimpleState__Group__3
+            // InternalRoom.g:15084:1: ( rule__SimpleState__Group__2__Impl rule__SimpleState__Group__3 )
+            // InternalRoom.g:15085:2: rule__SimpleState__Group__2__Impl rule__SimpleState__Group__3
             {
-            pushFollow(FOLLOW_rule__SimpleState__Group__2__Impl_in_rule__SimpleState__Group__230746);
+            pushFollow(FOLLOW_4);
             rule__SimpleState__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SimpleState__Group__3_in_rule__SimpleState__Group__230749);
+            pushFollow(FOLLOW_2);
             rule__SimpleState__Group__3();
 
             state._fsp--;
@@ -41990,20 +41990,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15089:1: rule__SimpleState__Group__2__Impl : ( ( rule__SimpleState__DocuAssignment_2 )? ) ;
+    // InternalRoom.g:15092:1: rule__SimpleState__Group__2__Impl : ( ( rule__SimpleState__DocuAssignment_2 )? ) ;
     public final void rule__SimpleState__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15093:1: ( ( ( rule__SimpleState__DocuAssignment_2 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15094:1: ( ( rule__SimpleState__DocuAssignment_2 )? )
+            // InternalRoom.g:15096:1: ( ( ( rule__SimpleState__DocuAssignment_2 )? ) )
+            // InternalRoom.g:15097:1: ( ( rule__SimpleState__DocuAssignment_2 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15094:1: ( ( rule__SimpleState__DocuAssignment_2 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15095:1: ( rule__SimpleState__DocuAssignment_2 )?
+            // InternalRoom.g:15097:1: ( ( rule__SimpleState__DocuAssignment_2 )? )
+            // InternalRoom.g:15098:1: ( rule__SimpleState__DocuAssignment_2 )?
             {
              before(grammarAccess.getSimpleStateAccess().getDocuAssignment_2()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15096:1: ( rule__SimpleState__DocuAssignment_2 )?
+            // InternalRoom.g:15099:1: ( rule__SimpleState__DocuAssignment_2 )?
             int alt149=2;
             int LA149_0 = input.LA(1);
 
@@ -42012,9 +42012,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt149) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15096:2: rule__SimpleState__DocuAssignment_2
+                    // InternalRoom.g:15099:2: rule__SimpleState__DocuAssignment_2
                     {
-                    pushFollow(FOLLOW_rule__SimpleState__DocuAssignment_2_in_rule__SimpleState__Group__2__Impl30776);
+                    pushFollow(FOLLOW_2);
                     rule__SimpleState__DocuAssignment_2();
 
                     state._fsp--;
@@ -42048,16 +42048,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15106:1: rule__SimpleState__Group__3 : rule__SimpleState__Group__3__Impl ;
+    // InternalRoom.g:15109:1: rule__SimpleState__Group__3 : rule__SimpleState__Group__3__Impl ;
     public final void rule__SimpleState__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15110:1: ( rule__SimpleState__Group__3__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15111:2: rule__SimpleState__Group__3__Impl
+            // InternalRoom.g:15113:1: ( rule__SimpleState__Group__3__Impl )
+            // InternalRoom.g:15114:2: rule__SimpleState__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__SimpleState__Group__3__Impl_in_rule__SimpleState__Group__330807);
+            pushFollow(FOLLOW_2);
             rule__SimpleState__Group__3__Impl();
 
             state._fsp--;
@@ -42081,20 +42081,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15117:1: rule__SimpleState__Group__3__Impl : ( ( rule__SimpleState__Group_3__0 )? ) ;
+    // InternalRoom.g:15120:1: rule__SimpleState__Group__3__Impl : ( ( rule__SimpleState__Group_3__0 )? ) ;
     public final void rule__SimpleState__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15121:1: ( ( ( rule__SimpleState__Group_3__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15122:1: ( ( rule__SimpleState__Group_3__0 )? )
+            // InternalRoom.g:15124:1: ( ( ( rule__SimpleState__Group_3__0 )? ) )
+            // InternalRoom.g:15125:1: ( ( rule__SimpleState__Group_3__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15122:1: ( ( rule__SimpleState__Group_3__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15123:1: ( rule__SimpleState__Group_3__0 )?
+            // InternalRoom.g:15125:1: ( ( rule__SimpleState__Group_3__0 )? )
+            // InternalRoom.g:15126:1: ( rule__SimpleState__Group_3__0 )?
             {
              before(grammarAccess.getSimpleStateAccess().getGroup_3()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15124:1: ( rule__SimpleState__Group_3__0 )?
+            // InternalRoom.g:15127:1: ( rule__SimpleState__Group_3__0 )?
             int alt150=2;
             int LA150_0 = input.LA(1);
 
@@ -42103,9 +42103,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt150) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15124:2: rule__SimpleState__Group_3__0
+                    // InternalRoom.g:15127:2: rule__SimpleState__Group_3__0
                     {
-                    pushFollow(FOLLOW_rule__SimpleState__Group_3__0_in_rule__SimpleState__Group__3__Impl30834);
+                    pushFollow(FOLLOW_2);
                     rule__SimpleState__Group_3__0();
 
                     state._fsp--;
@@ -42139,21 +42139,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15142:1: rule__SimpleState__Group_3__0 : rule__SimpleState__Group_3__0__Impl rule__SimpleState__Group_3__1 ;
+    // InternalRoom.g:15145:1: rule__SimpleState__Group_3__0 : rule__SimpleState__Group_3__0__Impl rule__SimpleState__Group_3__1 ;
     public final void rule__SimpleState__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15146:1: ( rule__SimpleState__Group_3__0__Impl rule__SimpleState__Group_3__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15147:2: rule__SimpleState__Group_3__0__Impl rule__SimpleState__Group_3__1
+            // InternalRoom.g:15149:1: ( rule__SimpleState__Group_3__0__Impl rule__SimpleState__Group_3__1 )
+            // InternalRoom.g:15150:2: rule__SimpleState__Group_3__0__Impl rule__SimpleState__Group_3__1
             {
-            pushFollow(FOLLOW_rule__SimpleState__Group_3__0__Impl_in_rule__SimpleState__Group_3__030873);
+            pushFollow(FOLLOW_79);
             rule__SimpleState__Group_3__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SimpleState__Group_3__1_in_rule__SimpleState__Group_3__030876);
+            pushFollow(FOLLOW_2);
             rule__SimpleState__Group_3__1();
 
             state._fsp--;
@@ -42177,20 +42177,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15154:1: rule__SimpleState__Group_3__0__Impl : ( '{' ) ;
+    // InternalRoom.g:15157:1: rule__SimpleState__Group_3__0__Impl : ( '{' ) ;
     public final void rule__SimpleState__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15158:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15159:1: ( '{' )
+            // InternalRoom.g:15161:1: ( ( '{' ) )
+            // InternalRoom.g:15162:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15159:1: ( '{' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15160:1: '{'
+            // InternalRoom.g:15162:1: ( '{' )
+            // InternalRoom.g:15163:1: '{'
             {
              before(grammarAccess.getSimpleStateAccess().getLeftCurlyBracketKeyword_3_0()); 
-            match(input,41,FOLLOW_41_in_rule__SimpleState__Group_3__0__Impl30904); 
+            match(input,41,FOLLOW_2); 
              after(grammarAccess.getSimpleStateAccess().getLeftCurlyBracketKeyword_3_0()); 
 
             }
@@ -42214,21 +42214,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15173:1: rule__SimpleState__Group_3__1 : rule__SimpleState__Group_3__1__Impl rule__SimpleState__Group_3__2 ;
+    // InternalRoom.g:15176:1: rule__SimpleState__Group_3__1 : rule__SimpleState__Group_3__1__Impl rule__SimpleState__Group_3__2 ;
     public final void rule__SimpleState__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15177:1: ( rule__SimpleState__Group_3__1__Impl rule__SimpleState__Group_3__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15178:2: rule__SimpleState__Group_3__1__Impl rule__SimpleState__Group_3__2
+            // InternalRoom.g:15180:1: ( rule__SimpleState__Group_3__1__Impl rule__SimpleState__Group_3__2 )
+            // InternalRoom.g:15181:2: rule__SimpleState__Group_3__1__Impl rule__SimpleState__Group_3__2
             {
-            pushFollow(FOLLOW_rule__SimpleState__Group_3__1__Impl_in_rule__SimpleState__Group_3__130935);
+            pushFollow(FOLLOW_79);
             rule__SimpleState__Group_3__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SimpleState__Group_3__2_in_rule__SimpleState__Group_3__130938);
+            pushFollow(FOLLOW_2);
             rule__SimpleState__Group_3__2();
 
             state._fsp--;
@@ -42252,20 +42252,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15185:1: rule__SimpleState__Group_3__1__Impl : ( ( rule__SimpleState__Group_3_1__0 )? ) ;
+    // InternalRoom.g:15188:1: rule__SimpleState__Group_3__1__Impl : ( ( rule__SimpleState__Group_3_1__0 )? ) ;
     public final void rule__SimpleState__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15189:1: ( ( ( rule__SimpleState__Group_3_1__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15190:1: ( ( rule__SimpleState__Group_3_1__0 )? )
+            // InternalRoom.g:15192:1: ( ( ( rule__SimpleState__Group_3_1__0 )? ) )
+            // InternalRoom.g:15193:1: ( ( rule__SimpleState__Group_3_1__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15190:1: ( ( rule__SimpleState__Group_3_1__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15191:1: ( rule__SimpleState__Group_3_1__0 )?
+            // InternalRoom.g:15193:1: ( ( rule__SimpleState__Group_3_1__0 )? )
+            // InternalRoom.g:15194:1: ( rule__SimpleState__Group_3_1__0 )?
             {
              before(grammarAccess.getSimpleStateAccess().getGroup_3_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15192:1: ( rule__SimpleState__Group_3_1__0 )?
+            // InternalRoom.g:15195:1: ( rule__SimpleState__Group_3_1__0 )?
             int alt151=2;
             int LA151_0 = input.LA(1);
 
@@ -42274,9 +42274,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt151) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15192:2: rule__SimpleState__Group_3_1__0
+                    // InternalRoom.g:15195:2: rule__SimpleState__Group_3_1__0
                     {
-                    pushFollow(FOLLOW_rule__SimpleState__Group_3_1__0_in_rule__SimpleState__Group_3__1__Impl30965);
+                    pushFollow(FOLLOW_2);
                     rule__SimpleState__Group_3_1__0();
 
                     state._fsp--;
@@ -42310,21 +42310,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15202:1: rule__SimpleState__Group_3__2 : rule__SimpleState__Group_3__2__Impl rule__SimpleState__Group_3__3 ;
+    // InternalRoom.g:15205:1: rule__SimpleState__Group_3__2 : rule__SimpleState__Group_3__2__Impl rule__SimpleState__Group_3__3 ;
     public final void rule__SimpleState__Group_3__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15206:1: ( rule__SimpleState__Group_3__2__Impl rule__SimpleState__Group_3__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15207:2: rule__SimpleState__Group_3__2__Impl rule__SimpleState__Group_3__3
+            // InternalRoom.g:15209:1: ( rule__SimpleState__Group_3__2__Impl rule__SimpleState__Group_3__3 )
+            // InternalRoom.g:15210:2: rule__SimpleState__Group_3__2__Impl rule__SimpleState__Group_3__3
             {
-            pushFollow(FOLLOW_rule__SimpleState__Group_3__2__Impl_in_rule__SimpleState__Group_3__230996);
+            pushFollow(FOLLOW_79);
             rule__SimpleState__Group_3__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SimpleState__Group_3__3_in_rule__SimpleState__Group_3__230999);
+            pushFollow(FOLLOW_2);
             rule__SimpleState__Group_3__3();
 
             state._fsp--;
@@ -42348,20 +42348,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15214:1: rule__SimpleState__Group_3__2__Impl : ( ( rule__SimpleState__Group_3_2__0 )? ) ;
+    // InternalRoom.g:15217:1: rule__SimpleState__Group_3__2__Impl : ( ( rule__SimpleState__Group_3_2__0 )? ) ;
     public final void rule__SimpleState__Group_3__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15218:1: ( ( ( rule__SimpleState__Group_3_2__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15219:1: ( ( rule__SimpleState__Group_3_2__0 )? )
+            // InternalRoom.g:15221:1: ( ( ( rule__SimpleState__Group_3_2__0 )? ) )
+            // InternalRoom.g:15222:1: ( ( rule__SimpleState__Group_3_2__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15219:1: ( ( rule__SimpleState__Group_3_2__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15220:1: ( rule__SimpleState__Group_3_2__0 )?
+            // InternalRoom.g:15222:1: ( ( rule__SimpleState__Group_3_2__0 )? )
+            // InternalRoom.g:15223:1: ( rule__SimpleState__Group_3_2__0 )?
             {
              before(grammarAccess.getSimpleStateAccess().getGroup_3_2()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15221:1: ( rule__SimpleState__Group_3_2__0 )?
+            // InternalRoom.g:15224:1: ( rule__SimpleState__Group_3_2__0 )?
             int alt152=2;
             int LA152_0 = input.LA(1);
 
@@ -42370,9 +42370,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt152) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15221:2: rule__SimpleState__Group_3_2__0
+                    // InternalRoom.g:15224:2: rule__SimpleState__Group_3_2__0
                     {
-                    pushFollow(FOLLOW_rule__SimpleState__Group_3_2__0_in_rule__SimpleState__Group_3__2__Impl31026);
+                    pushFollow(FOLLOW_2);
                     rule__SimpleState__Group_3_2__0();
 
                     state._fsp--;
@@ -42406,21 +42406,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15231:1: rule__SimpleState__Group_3__3 : rule__SimpleState__Group_3__3__Impl rule__SimpleState__Group_3__4 ;
+    // InternalRoom.g:15234:1: rule__SimpleState__Group_3__3 : rule__SimpleState__Group_3__3__Impl rule__SimpleState__Group_3__4 ;
     public final void rule__SimpleState__Group_3__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15235:1: ( rule__SimpleState__Group_3__3__Impl rule__SimpleState__Group_3__4 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15236:2: rule__SimpleState__Group_3__3__Impl rule__SimpleState__Group_3__4
+            // InternalRoom.g:15238:1: ( rule__SimpleState__Group_3__3__Impl rule__SimpleState__Group_3__4 )
+            // InternalRoom.g:15239:2: rule__SimpleState__Group_3__3__Impl rule__SimpleState__Group_3__4
             {
-            pushFollow(FOLLOW_rule__SimpleState__Group_3__3__Impl_in_rule__SimpleState__Group_3__331057);
+            pushFollow(FOLLOW_79);
             rule__SimpleState__Group_3__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SimpleState__Group_3__4_in_rule__SimpleState__Group_3__331060);
+            pushFollow(FOLLOW_2);
             rule__SimpleState__Group_3__4();
 
             state._fsp--;
@@ -42444,20 +42444,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15243:1: rule__SimpleState__Group_3__3__Impl : ( ( rule__SimpleState__Group_3_3__0 )? ) ;
+    // InternalRoom.g:15246:1: rule__SimpleState__Group_3__3__Impl : ( ( rule__SimpleState__Group_3_3__0 )? ) ;
     public final void rule__SimpleState__Group_3__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15247:1: ( ( ( rule__SimpleState__Group_3_3__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15248:1: ( ( rule__SimpleState__Group_3_3__0 )? )
+            // InternalRoom.g:15250:1: ( ( ( rule__SimpleState__Group_3_3__0 )? ) )
+            // InternalRoom.g:15251:1: ( ( rule__SimpleState__Group_3_3__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15248:1: ( ( rule__SimpleState__Group_3_3__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15249:1: ( rule__SimpleState__Group_3_3__0 )?
+            // InternalRoom.g:15251:1: ( ( rule__SimpleState__Group_3_3__0 )? )
+            // InternalRoom.g:15252:1: ( rule__SimpleState__Group_3_3__0 )?
             {
              before(grammarAccess.getSimpleStateAccess().getGroup_3_3()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15250:1: ( rule__SimpleState__Group_3_3__0 )?
+            // InternalRoom.g:15253:1: ( rule__SimpleState__Group_3_3__0 )?
             int alt153=2;
             int LA153_0 = input.LA(1);
 
@@ -42466,9 +42466,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt153) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15250:2: rule__SimpleState__Group_3_3__0
+                    // InternalRoom.g:15253:2: rule__SimpleState__Group_3_3__0
                     {
-                    pushFollow(FOLLOW_rule__SimpleState__Group_3_3__0_in_rule__SimpleState__Group_3__3__Impl31087);
+                    pushFollow(FOLLOW_2);
                     rule__SimpleState__Group_3_3__0();
 
                     state._fsp--;
@@ -42502,21 +42502,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3__4"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15260:1: rule__SimpleState__Group_3__4 : rule__SimpleState__Group_3__4__Impl rule__SimpleState__Group_3__5 ;
+    // InternalRoom.g:15263:1: rule__SimpleState__Group_3__4 : rule__SimpleState__Group_3__4__Impl rule__SimpleState__Group_3__5 ;
     public final void rule__SimpleState__Group_3__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15264:1: ( rule__SimpleState__Group_3__4__Impl rule__SimpleState__Group_3__5 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15265:2: rule__SimpleState__Group_3__4__Impl rule__SimpleState__Group_3__5
+            // InternalRoom.g:15267:1: ( rule__SimpleState__Group_3__4__Impl rule__SimpleState__Group_3__5 )
+            // InternalRoom.g:15268:2: rule__SimpleState__Group_3__4__Impl rule__SimpleState__Group_3__5
             {
-            pushFollow(FOLLOW_rule__SimpleState__Group_3__4__Impl_in_rule__SimpleState__Group_3__431118);
+            pushFollow(FOLLOW_79);
             rule__SimpleState__Group_3__4__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SimpleState__Group_3__5_in_rule__SimpleState__Group_3__431121);
+            pushFollow(FOLLOW_2);
             rule__SimpleState__Group_3__5();
 
             state._fsp--;
@@ -42540,20 +42540,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3__4__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15272:1: rule__SimpleState__Group_3__4__Impl : ( ( rule__SimpleState__Group_3_4__0 )? ) ;
+    // InternalRoom.g:15275:1: rule__SimpleState__Group_3__4__Impl : ( ( rule__SimpleState__Group_3_4__0 )? ) ;
     public final void rule__SimpleState__Group_3__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15276:1: ( ( ( rule__SimpleState__Group_3_4__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15277:1: ( ( rule__SimpleState__Group_3_4__0 )? )
+            // InternalRoom.g:15279:1: ( ( ( rule__SimpleState__Group_3_4__0 )? ) )
+            // InternalRoom.g:15280:1: ( ( rule__SimpleState__Group_3_4__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15277:1: ( ( rule__SimpleState__Group_3_4__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15278:1: ( rule__SimpleState__Group_3_4__0 )?
+            // InternalRoom.g:15280:1: ( ( rule__SimpleState__Group_3_4__0 )? )
+            // InternalRoom.g:15281:1: ( rule__SimpleState__Group_3_4__0 )?
             {
              before(grammarAccess.getSimpleStateAccess().getGroup_3_4()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15279:1: ( rule__SimpleState__Group_3_4__0 )?
+            // InternalRoom.g:15282:1: ( rule__SimpleState__Group_3_4__0 )?
             int alt154=2;
             int LA154_0 = input.LA(1);
 
@@ -42562,9 +42562,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt154) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15279:2: rule__SimpleState__Group_3_4__0
+                    // InternalRoom.g:15282:2: rule__SimpleState__Group_3_4__0
                     {
-                    pushFollow(FOLLOW_rule__SimpleState__Group_3_4__0_in_rule__SimpleState__Group_3__4__Impl31148);
+                    pushFollow(FOLLOW_2);
                     rule__SimpleState__Group_3_4__0();
 
                     state._fsp--;
@@ -42598,16 +42598,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3__5"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15289:1: rule__SimpleState__Group_3__5 : rule__SimpleState__Group_3__5__Impl ;
+    // InternalRoom.g:15292:1: rule__SimpleState__Group_3__5 : rule__SimpleState__Group_3__5__Impl ;
     public final void rule__SimpleState__Group_3__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15293:1: ( rule__SimpleState__Group_3__5__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15294:2: rule__SimpleState__Group_3__5__Impl
+            // InternalRoom.g:15296:1: ( rule__SimpleState__Group_3__5__Impl )
+            // InternalRoom.g:15297:2: rule__SimpleState__Group_3__5__Impl
             {
-            pushFollow(FOLLOW_rule__SimpleState__Group_3__5__Impl_in_rule__SimpleState__Group_3__531179);
+            pushFollow(FOLLOW_2);
             rule__SimpleState__Group_3__5__Impl();
 
             state._fsp--;
@@ -42631,20 +42631,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3__5__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15300:1: rule__SimpleState__Group_3__5__Impl : ( '}' ) ;
+    // InternalRoom.g:15303:1: rule__SimpleState__Group_3__5__Impl : ( '}' ) ;
     public final void rule__SimpleState__Group_3__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15304:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15305:1: ( '}' )
+            // InternalRoom.g:15307:1: ( ( '}' ) )
+            // InternalRoom.g:15308:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15305:1: ( '}' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15306:1: '}'
+            // InternalRoom.g:15308:1: ( '}' )
+            // InternalRoom.g:15309:1: '}'
             {
              before(grammarAccess.getSimpleStateAccess().getRightCurlyBracketKeyword_3_5()); 
-            match(input,42,FOLLOW_42_in_rule__SimpleState__Group_3__5__Impl31207); 
+            match(input,42,FOLLOW_2); 
              after(grammarAccess.getSimpleStateAccess().getRightCurlyBracketKeyword_3_5()); 
 
             }
@@ -42668,21 +42668,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3_1__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15331:1: rule__SimpleState__Group_3_1__0 : rule__SimpleState__Group_3_1__0__Impl rule__SimpleState__Group_3_1__1 ;
+    // InternalRoom.g:15334:1: rule__SimpleState__Group_3_1__0 : rule__SimpleState__Group_3_1__0__Impl rule__SimpleState__Group_3_1__1 ;
     public final void rule__SimpleState__Group_3_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15335:1: ( rule__SimpleState__Group_3_1__0__Impl rule__SimpleState__Group_3_1__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15336:2: rule__SimpleState__Group_3_1__0__Impl rule__SimpleState__Group_3_1__1
+            // InternalRoom.g:15338:1: ( rule__SimpleState__Group_3_1__0__Impl rule__SimpleState__Group_3_1__1 )
+            // InternalRoom.g:15339:2: rule__SimpleState__Group_3_1__0__Impl rule__SimpleState__Group_3_1__1
             {
-            pushFollow(FOLLOW_rule__SimpleState__Group_3_1__0__Impl_in_rule__SimpleState__Group_3_1__031250);
+            pushFollow(FOLLOW_27);
             rule__SimpleState__Group_3_1__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SimpleState__Group_3_1__1_in_rule__SimpleState__Group_3_1__031253);
+            pushFollow(FOLLOW_2);
             rule__SimpleState__Group_3_1__1();
 
             state._fsp--;
@@ -42706,20 +42706,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3_1__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15343:1: rule__SimpleState__Group_3_1__0__Impl : ( 'entry' ) ;
+    // InternalRoom.g:15346:1: rule__SimpleState__Group_3_1__0__Impl : ( 'entry' ) ;
     public final void rule__SimpleState__Group_3_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15347:1: ( ( 'entry' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15348:1: ( 'entry' )
+            // InternalRoom.g:15350:1: ( ( 'entry' ) )
+            // InternalRoom.g:15351:1: ( 'entry' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15348:1: ( 'entry' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15349:1: 'entry'
+            // InternalRoom.g:15351:1: ( 'entry' )
+            // InternalRoom.g:15352:1: 'entry'
             {
              before(grammarAccess.getSimpleStateAccess().getEntryKeyword_3_1_0()); 
-            match(input,95,FOLLOW_95_in_rule__SimpleState__Group_3_1__0__Impl31281); 
+            match(input,95,FOLLOW_2); 
              after(grammarAccess.getSimpleStateAccess().getEntryKeyword_3_1_0()); 
 
             }
@@ -42743,16 +42743,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3_1__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15362:1: rule__SimpleState__Group_3_1__1 : rule__SimpleState__Group_3_1__1__Impl ;
+    // InternalRoom.g:15365:1: rule__SimpleState__Group_3_1__1 : rule__SimpleState__Group_3_1__1__Impl ;
     public final void rule__SimpleState__Group_3_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15366:1: ( rule__SimpleState__Group_3_1__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15367:2: rule__SimpleState__Group_3_1__1__Impl
+            // InternalRoom.g:15369:1: ( rule__SimpleState__Group_3_1__1__Impl )
+            // InternalRoom.g:15370:2: rule__SimpleState__Group_3_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__SimpleState__Group_3_1__1__Impl_in_rule__SimpleState__Group_3_1__131312);
+            pushFollow(FOLLOW_2);
             rule__SimpleState__Group_3_1__1__Impl();
 
             state._fsp--;
@@ -42776,23 +42776,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3_1__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15373:1: rule__SimpleState__Group_3_1__1__Impl : ( ( rule__SimpleState__EntryCodeAssignment_3_1_1 ) ) ;
+    // InternalRoom.g:15376:1: rule__SimpleState__Group_3_1__1__Impl : ( ( rule__SimpleState__EntryCodeAssignment_3_1_1 ) ) ;
     public final void rule__SimpleState__Group_3_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15377:1: ( ( ( rule__SimpleState__EntryCodeAssignment_3_1_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15378:1: ( ( rule__SimpleState__EntryCodeAssignment_3_1_1 ) )
+            // InternalRoom.g:15380:1: ( ( ( rule__SimpleState__EntryCodeAssignment_3_1_1 ) ) )
+            // InternalRoom.g:15381:1: ( ( rule__SimpleState__EntryCodeAssignment_3_1_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15378:1: ( ( rule__SimpleState__EntryCodeAssignment_3_1_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15379:1: ( rule__SimpleState__EntryCodeAssignment_3_1_1 )
+            // InternalRoom.g:15381:1: ( ( rule__SimpleState__EntryCodeAssignment_3_1_1 ) )
+            // InternalRoom.g:15382:1: ( rule__SimpleState__EntryCodeAssignment_3_1_1 )
             {
              before(grammarAccess.getSimpleStateAccess().getEntryCodeAssignment_3_1_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15380:1: ( rule__SimpleState__EntryCodeAssignment_3_1_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15380:2: rule__SimpleState__EntryCodeAssignment_3_1_1
+            // InternalRoom.g:15383:1: ( rule__SimpleState__EntryCodeAssignment_3_1_1 )
+            // InternalRoom.g:15383:2: rule__SimpleState__EntryCodeAssignment_3_1_1
             {
-            pushFollow(FOLLOW_rule__SimpleState__EntryCodeAssignment_3_1_1_in_rule__SimpleState__Group_3_1__1__Impl31339);
+            pushFollow(FOLLOW_2);
             rule__SimpleState__EntryCodeAssignment_3_1_1();
 
             state._fsp--;
@@ -42823,21 +42823,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3_2__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15394:1: rule__SimpleState__Group_3_2__0 : rule__SimpleState__Group_3_2__0__Impl rule__SimpleState__Group_3_2__1 ;
+    // InternalRoom.g:15397:1: rule__SimpleState__Group_3_2__0 : rule__SimpleState__Group_3_2__0__Impl rule__SimpleState__Group_3_2__1 ;
     public final void rule__SimpleState__Group_3_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15398:1: ( rule__SimpleState__Group_3_2__0__Impl rule__SimpleState__Group_3_2__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15399:2: rule__SimpleState__Group_3_2__0__Impl rule__SimpleState__Group_3_2__1
+            // InternalRoom.g:15401:1: ( rule__SimpleState__Group_3_2__0__Impl rule__SimpleState__Group_3_2__1 )
+            // InternalRoom.g:15402:2: rule__SimpleState__Group_3_2__0__Impl rule__SimpleState__Group_3_2__1
             {
-            pushFollow(FOLLOW_rule__SimpleState__Group_3_2__0__Impl_in_rule__SimpleState__Group_3_2__031373);
+            pushFollow(FOLLOW_27);
             rule__SimpleState__Group_3_2__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SimpleState__Group_3_2__1_in_rule__SimpleState__Group_3_2__031376);
+            pushFollow(FOLLOW_2);
             rule__SimpleState__Group_3_2__1();
 
             state._fsp--;
@@ -42861,20 +42861,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3_2__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15406:1: rule__SimpleState__Group_3_2__0__Impl : ( 'exit' ) ;
+    // InternalRoom.g:15409:1: rule__SimpleState__Group_3_2__0__Impl : ( 'exit' ) ;
     public final void rule__SimpleState__Group_3_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15410:1: ( ( 'exit' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15411:1: ( 'exit' )
+            // InternalRoom.g:15413:1: ( ( 'exit' ) )
+            // InternalRoom.g:15414:1: ( 'exit' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15411:1: ( 'exit' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15412:1: 'exit'
+            // InternalRoom.g:15414:1: ( 'exit' )
+            // InternalRoom.g:15415:1: 'exit'
             {
              before(grammarAccess.getSimpleStateAccess().getExitKeyword_3_2_0()); 
-            match(input,96,FOLLOW_96_in_rule__SimpleState__Group_3_2__0__Impl31404); 
+            match(input,96,FOLLOW_2); 
              after(grammarAccess.getSimpleStateAccess().getExitKeyword_3_2_0()); 
 
             }
@@ -42898,16 +42898,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3_2__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15425:1: rule__SimpleState__Group_3_2__1 : rule__SimpleState__Group_3_2__1__Impl ;
+    // InternalRoom.g:15428:1: rule__SimpleState__Group_3_2__1 : rule__SimpleState__Group_3_2__1__Impl ;
     public final void rule__SimpleState__Group_3_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15429:1: ( rule__SimpleState__Group_3_2__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15430:2: rule__SimpleState__Group_3_2__1__Impl
+            // InternalRoom.g:15432:1: ( rule__SimpleState__Group_3_2__1__Impl )
+            // InternalRoom.g:15433:2: rule__SimpleState__Group_3_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__SimpleState__Group_3_2__1__Impl_in_rule__SimpleState__Group_3_2__131435);
+            pushFollow(FOLLOW_2);
             rule__SimpleState__Group_3_2__1__Impl();
 
             state._fsp--;
@@ -42931,23 +42931,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3_2__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15436:1: rule__SimpleState__Group_3_2__1__Impl : ( ( rule__SimpleState__ExitCodeAssignment_3_2_1 ) ) ;
+    // InternalRoom.g:15439:1: rule__SimpleState__Group_3_2__1__Impl : ( ( rule__SimpleState__ExitCodeAssignment_3_2_1 ) ) ;
     public final void rule__SimpleState__Group_3_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15440:1: ( ( ( rule__SimpleState__ExitCodeAssignment_3_2_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15441:1: ( ( rule__SimpleState__ExitCodeAssignment_3_2_1 ) )
+            // InternalRoom.g:15443:1: ( ( ( rule__SimpleState__ExitCodeAssignment_3_2_1 ) ) )
+            // InternalRoom.g:15444:1: ( ( rule__SimpleState__ExitCodeAssignment_3_2_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15441:1: ( ( rule__SimpleState__ExitCodeAssignment_3_2_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15442:1: ( rule__SimpleState__ExitCodeAssignment_3_2_1 )
+            // InternalRoom.g:15444:1: ( ( rule__SimpleState__ExitCodeAssignment_3_2_1 ) )
+            // InternalRoom.g:15445:1: ( rule__SimpleState__ExitCodeAssignment_3_2_1 )
             {
              before(grammarAccess.getSimpleStateAccess().getExitCodeAssignment_3_2_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15443:1: ( rule__SimpleState__ExitCodeAssignment_3_2_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15443:2: rule__SimpleState__ExitCodeAssignment_3_2_1
+            // InternalRoom.g:15446:1: ( rule__SimpleState__ExitCodeAssignment_3_2_1 )
+            // InternalRoom.g:15446:2: rule__SimpleState__ExitCodeAssignment_3_2_1
             {
-            pushFollow(FOLLOW_rule__SimpleState__ExitCodeAssignment_3_2_1_in_rule__SimpleState__Group_3_2__1__Impl31462);
+            pushFollow(FOLLOW_2);
             rule__SimpleState__ExitCodeAssignment_3_2_1();
 
             state._fsp--;
@@ -42978,21 +42978,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3_3__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15457:1: rule__SimpleState__Group_3_3__0 : rule__SimpleState__Group_3_3__0__Impl rule__SimpleState__Group_3_3__1 ;
+    // InternalRoom.g:15460:1: rule__SimpleState__Group_3_3__0 : rule__SimpleState__Group_3_3__0__Impl rule__SimpleState__Group_3_3__1 ;
     public final void rule__SimpleState__Group_3_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15461:1: ( rule__SimpleState__Group_3_3__0__Impl rule__SimpleState__Group_3_3__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15462:2: rule__SimpleState__Group_3_3__0__Impl rule__SimpleState__Group_3_3__1
+            // InternalRoom.g:15464:1: ( rule__SimpleState__Group_3_3__0__Impl rule__SimpleState__Group_3_3__1 )
+            // InternalRoom.g:15465:2: rule__SimpleState__Group_3_3__0__Impl rule__SimpleState__Group_3_3__1
             {
-            pushFollow(FOLLOW_rule__SimpleState__Group_3_3__0__Impl_in_rule__SimpleState__Group_3_3__031496);
+            pushFollow(FOLLOW_27);
             rule__SimpleState__Group_3_3__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SimpleState__Group_3_3__1_in_rule__SimpleState__Group_3_3__031499);
+            pushFollow(FOLLOW_2);
             rule__SimpleState__Group_3_3__1();
 
             state._fsp--;
@@ -43016,20 +43016,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3_3__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15469:1: rule__SimpleState__Group_3_3__0__Impl : ( 'do' ) ;
+    // InternalRoom.g:15472:1: rule__SimpleState__Group_3_3__0__Impl : ( 'do' ) ;
     public final void rule__SimpleState__Group_3_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15473:1: ( ( 'do' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15474:1: ( 'do' )
+            // InternalRoom.g:15476:1: ( ( 'do' ) )
+            // InternalRoom.g:15477:1: ( 'do' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15474:1: ( 'do' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15475:1: 'do'
+            // InternalRoom.g:15477:1: ( 'do' )
+            // InternalRoom.g:15478:1: 'do'
             {
              before(grammarAccess.getSimpleStateAccess().getDoKeyword_3_3_0()); 
-            match(input,97,FOLLOW_97_in_rule__SimpleState__Group_3_3__0__Impl31527); 
+            match(input,97,FOLLOW_2); 
              after(grammarAccess.getSimpleStateAccess().getDoKeyword_3_3_0()); 
 
             }
@@ -43053,16 +43053,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3_3__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15488:1: rule__SimpleState__Group_3_3__1 : rule__SimpleState__Group_3_3__1__Impl ;
+    // InternalRoom.g:15491:1: rule__SimpleState__Group_3_3__1 : rule__SimpleState__Group_3_3__1__Impl ;
     public final void rule__SimpleState__Group_3_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15492:1: ( rule__SimpleState__Group_3_3__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15493:2: rule__SimpleState__Group_3_3__1__Impl
+            // InternalRoom.g:15495:1: ( rule__SimpleState__Group_3_3__1__Impl )
+            // InternalRoom.g:15496:2: rule__SimpleState__Group_3_3__1__Impl
             {
-            pushFollow(FOLLOW_rule__SimpleState__Group_3_3__1__Impl_in_rule__SimpleState__Group_3_3__131558);
+            pushFollow(FOLLOW_2);
             rule__SimpleState__Group_3_3__1__Impl();
 
             state._fsp--;
@@ -43086,23 +43086,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3_3__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15499:1: rule__SimpleState__Group_3_3__1__Impl : ( ( rule__SimpleState__DoCodeAssignment_3_3_1 ) ) ;
+    // InternalRoom.g:15502:1: rule__SimpleState__Group_3_3__1__Impl : ( ( rule__SimpleState__DoCodeAssignment_3_3_1 ) ) ;
     public final void rule__SimpleState__Group_3_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15503:1: ( ( ( rule__SimpleState__DoCodeAssignment_3_3_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15504:1: ( ( rule__SimpleState__DoCodeAssignment_3_3_1 ) )
+            // InternalRoom.g:15506:1: ( ( ( rule__SimpleState__DoCodeAssignment_3_3_1 ) ) )
+            // InternalRoom.g:15507:1: ( ( rule__SimpleState__DoCodeAssignment_3_3_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15504:1: ( ( rule__SimpleState__DoCodeAssignment_3_3_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15505:1: ( rule__SimpleState__DoCodeAssignment_3_3_1 )
+            // InternalRoom.g:15507:1: ( ( rule__SimpleState__DoCodeAssignment_3_3_1 ) )
+            // InternalRoom.g:15508:1: ( rule__SimpleState__DoCodeAssignment_3_3_1 )
             {
              before(grammarAccess.getSimpleStateAccess().getDoCodeAssignment_3_3_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15506:1: ( rule__SimpleState__DoCodeAssignment_3_3_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15506:2: rule__SimpleState__DoCodeAssignment_3_3_1
+            // InternalRoom.g:15509:1: ( rule__SimpleState__DoCodeAssignment_3_3_1 )
+            // InternalRoom.g:15509:2: rule__SimpleState__DoCodeAssignment_3_3_1
             {
-            pushFollow(FOLLOW_rule__SimpleState__DoCodeAssignment_3_3_1_in_rule__SimpleState__Group_3_3__1__Impl31585);
+            pushFollow(FOLLOW_2);
             rule__SimpleState__DoCodeAssignment_3_3_1();
 
             state._fsp--;
@@ -43133,21 +43133,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3_4__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15520:1: rule__SimpleState__Group_3_4__0 : rule__SimpleState__Group_3_4__0__Impl rule__SimpleState__Group_3_4__1 ;
+    // InternalRoom.g:15523:1: rule__SimpleState__Group_3_4__0 : rule__SimpleState__Group_3_4__0__Impl rule__SimpleState__Group_3_4__1 ;
     public final void rule__SimpleState__Group_3_4__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15524:1: ( rule__SimpleState__Group_3_4__0__Impl rule__SimpleState__Group_3_4__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15525:2: rule__SimpleState__Group_3_4__0__Impl rule__SimpleState__Group_3_4__1
+            // InternalRoom.g:15527:1: ( rule__SimpleState__Group_3_4__0__Impl rule__SimpleState__Group_3_4__1 )
+            // InternalRoom.g:15528:2: rule__SimpleState__Group_3_4__0__Impl rule__SimpleState__Group_3_4__1
             {
-            pushFollow(FOLLOW_rule__SimpleState__Group_3_4__0__Impl_in_rule__SimpleState__Group_3_4__031619);
+            pushFollow(FOLLOW_27);
             rule__SimpleState__Group_3_4__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SimpleState__Group_3_4__1_in_rule__SimpleState__Group_3_4__031622);
+            pushFollow(FOLLOW_2);
             rule__SimpleState__Group_3_4__1();
 
             state._fsp--;
@@ -43171,20 +43171,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3_4__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15532:1: rule__SimpleState__Group_3_4__0__Impl : ( 'subgraph' ) ;
+    // InternalRoom.g:15535:1: rule__SimpleState__Group_3_4__0__Impl : ( 'subgraph' ) ;
     public final void rule__SimpleState__Group_3_4__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15536:1: ( ( 'subgraph' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15537:1: ( 'subgraph' )
+            // InternalRoom.g:15539:1: ( ( 'subgraph' ) )
+            // InternalRoom.g:15540:1: ( 'subgraph' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15537:1: ( 'subgraph' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15538:1: 'subgraph'
+            // InternalRoom.g:15540:1: ( 'subgraph' )
+            // InternalRoom.g:15541:1: 'subgraph'
             {
              before(grammarAccess.getSimpleStateAccess().getSubgraphKeyword_3_4_0()); 
-            match(input,98,FOLLOW_98_in_rule__SimpleState__Group_3_4__0__Impl31650); 
+            match(input,98,FOLLOW_2); 
              after(grammarAccess.getSimpleStateAccess().getSubgraphKeyword_3_4_0()); 
 
             }
@@ -43208,16 +43208,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3_4__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15551:1: rule__SimpleState__Group_3_4__1 : rule__SimpleState__Group_3_4__1__Impl ;
+    // InternalRoom.g:15554:1: rule__SimpleState__Group_3_4__1 : rule__SimpleState__Group_3_4__1__Impl ;
     public final void rule__SimpleState__Group_3_4__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15555:1: ( rule__SimpleState__Group_3_4__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15556:2: rule__SimpleState__Group_3_4__1__Impl
+            // InternalRoom.g:15558:1: ( rule__SimpleState__Group_3_4__1__Impl )
+            // InternalRoom.g:15559:2: rule__SimpleState__Group_3_4__1__Impl
             {
-            pushFollow(FOLLOW_rule__SimpleState__Group_3_4__1__Impl_in_rule__SimpleState__Group_3_4__131681);
+            pushFollow(FOLLOW_2);
             rule__SimpleState__Group_3_4__1__Impl();
 
             state._fsp--;
@@ -43241,23 +43241,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__Group_3_4__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15562:1: rule__SimpleState__Group_3_4__1__Impl : ( ( rule__SimpleState__SubgraphAssignment_3_4_1 ) ) ;
+    // InternalRoom.g:15565:1: rule__SimpleState__Group_3_4__1__Impl : ( ( rule__SimpleState__SubgraphAssignment_3_4_1 ) ) ;
     public final void rule__SimpleState__Group_3_4__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15566:1: ( ( ( rule__SimpleState__SubgraphAssignment_3_4_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15567:1: ( ( rule__SimpleState__SubgraphAssignment_3_4_1 ) )
+            // InternalRoom.g:15569:1: ( ( ( rule__SimpleState__SubgraphAssignment_3_4_1 ) ) )
+            // InternalRoom.g:15570:1: ( ( rule__SimpleState__SubgraphAssignment_3_4_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15567:1: ( ( rule__SimpleState__SubgraphAssignment_3_4_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15568:1: ( rule__SimpleState__SubgraphAssignment_3_4_1 )
+            // InternalRoom.g:15570:1: ( ( rule__SimpleState__SubgraphAssignment_3_4_1 ) )
+            // InternalRoom.g:15571:1: ( rule__SimpleState__SubgraphAssignment_3_4_1 )
             {
              before(grammarAccess.getSimpleStateAccess().getSubgraphAssignment_3_4_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15569:1: ( rule__SimpleState__SubgraphAssignment_3_4_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15569:2: rule__SimpleState__SubgraphAssignment_3_4_1
+            // InternalRoom.g:15572:1: ( rule__SimpleState__SubgraphAssignment_3_4_1 )
+            // InternalRoom.g:15572:2: rule__SimpleState__SubgraphAssignment_3_4_1
             {
-            pushFollow(FOLLOW_rule__SimpleState__SubgraphAssignment_3_4_1_in_rule__SimpleState__Group_3_4__1__Impl31708);
+            pushFollow(FOLLOW_2);
             rule__SimpleState__SubgraphAssignment_3_4_1();
 
             state._fsp--;
@@ -43288,21 +43288,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15583:1: rule__RefinedState__Group__0 : rule__RefinedState__Group__0__Impl rule__RefinedState__Group__1 ;
+    // InternalRoom.g:15586:1: rule__RefinedState__Group__0 : rule__RefinedState__Group__0__Impl rule__RefinedState__Group__1 ;
     public final void rule__RefinedState__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15587:1: ( rule__RefinedState__Group__0__Impl rule__RefinedState__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15588:2: rule__RefinedState__Group__0__Impl rule__RefinedState__Group__1
+            // InternalRoom.g:15590:1: ( rule__RefinedState__Group__0__Impl rule__RefinedState__Group__1 )
+            // InternalRoom.g:15591:2: rule__RefinedState__Group__0__Impl rule__RefinedState__Group__1
             {
-            pushFollow(FOLLOW_rule__RefinedState__Group__0__Impl_in_rule__RefinedState__Group__031742);
+            pushFollow(FOLLOW_3);
             rule__RefinedState__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RefinedState__Group__1_in_rule__RefinedState__Group__031745);
+            pushFollow(FOLLOW_2);
             rule__RefinedState__Group__1();
 
             state._fsp--;
@@ -43326,20 +43326,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15595:1: rule__RefinedState__Group__0__Impl : ( 'RefinedState' ) ;
+    // InternalRoom.g:15598:1: rule__RefinedState__Group__0__Impl : ( 'RefinedState' ) ;
     public final void rule__RefinedState__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15599:1: ( ( 'RefinedState' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15600:1: ( 'RefinedState' )
+            // InternalRoom.g:15602:1: ( ( 'RefinedState' ) )
+            // InternalRoom.g:15603:1: ( 'RefinedState' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15600:1: ( 'RefinedState' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15601:1: 'RefinedState'
+            // InternalRoom.g:15603:1: ( 'RefinedState' )
+            // InternalRoom.g:15604:1: 'RefinedState'
             {
              before(grammarAccess.getRefinedStateAccess().getRefinedStateKeyword_0()); 
-            match(input,99,FOLLOW_99_in_rule__RefinedState__Group__0__Impl31773); 
+            match(input,99,FOLLOW_2); 
              after(grammarAccess.getRefinedStateAccess().getRefinedStateKeyword_0()); 
 
             }
@@ -43363,21 +43363,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15614:1: rule__RefinedState__Group__1 : rule__RefinedState__Group__1__Impl rule__RefinedState__Group__2 ;
+    // InternalRoom.g:15617:1: rule__RefinedState__Group__1 : rule__RefinedState__Group__1__Impl rule__RefinedState__Group__2 ;
     public final void rule__RefinedState__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15618:1: ( rule__RefinedState__Group__1__Impl rule__RefinedState__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15619:2: rule__RefinedState__Group__1__Impl rule__RefinedState__Group__2
+            // InternalRoom.g:15621:1: ( rule__RefinedState__Group__1__Impl rule__RefinedState__Group__2 )
+            // InternalRoom.g:15622:2: rule__RefinedState__Group__1__Impl rule__RefinedState__Group__2
             {
-            pushFollow(FOLLOW_rule__RefinedState__Group__1__Impl_in_rule__RefinedState__Group__131804);
+            pushFollow(FOLLOW_4);
             rule__RefinedState__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RefinedState__Group__2_in_rule__RefinedState__Group__131807);
+            pushFollow(FOLLOW_2);
             rule__RefinedState__Group__2();
 
             state._fsp--;
@@ -43401,23 +43401,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15626:1: rule__RefinedState__Group__1__Impl : ( ( rule__RefinedState__TargetAssignment_1 ) ) ;
+    // InternalRoom.g:15629:1: rule__RefinedState__Group__1__Impl : ( ( rule__RefinedState__TargetAssignment_1 ) ) ;
     public final void rule__RefinedState__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15630:1: ( ( ( rule__RefinedState__TargetAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15631:1: ( ( rule__RefinedState__TargetAssignment_1 ) )
+            // InternalRoom.g:15633:1: ( ( ( rule__RefinedState__TargetAssignment_1 ) ) )
+            // InternalRoom.g:15634:1: ( ( rule__RefinedState__TargetAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15631:1: ( ( rule__RefinedState__TargetAssignment_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15632:1: ( rule__RefinedState__TargetAssignment_1 )
+            // InternalRoom.g:15634:1: ( ( rule__RefinedState__TargetAssignment_1 ) )
+            // InternalRoom.g:15635:1: ( rule__RefinedState__TargetAssignment_1 )
             {
              before(grammarAccess.getRefinedStateAccess().getTargetAssignment_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15633:1: ( rule__RefinedState__TargetAssignment_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15633:2: rule__RefinedState__TargetAssignment_1
+            // InternalRoom.g:15636:1: ( rule__RefinedState__TargetAssignment_1 )
+            // InternalRoom.g:15636:2: rule__RefinedState__TargetAssignment_1
             {
-            pushFollow(FOLLOW_rule__RefinedState__TargetAssignment_1_in_rule__RefinedState__Group__1__Impl31834);
+            pushFollow(FOLLOW_2);
             rule__RefinedState__TargetAssignment_1();
 
             state._fsp--;
@@ -43448,21 +43448,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15643:1: rule__RefinedState__Group__2 : rule__RefinedState__Group__2__Impl rule__RefinedState__Group__3 ;
+    // InternalRoom.g:15646:1: rule__RefinedState__Group__2 : rule__RefinedState__Group__2__Impl rule__RefinedState__Group__3 ;
     public final void rule__RefinedState__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15647:1: ( rule__RefinedState__Group__2__Impl rule__RefinedState__Group__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15648:2: rule__RefinedState__Group__2__Impl rule__RefinedState__Group__3
+            // InternalRoom.g:15650:1: ( rule__RefinedState__Group__2__Impl rule__RefinedState__Group__3 )
+            // InternalRoom.g:15651:2: rule__RefinedState__Group__2__Impl rule__RefinedState__Group__3
             {
-            pushFollow(FOLLOW_rule__RefinedState__Group__2__Impl_in_rule__RefinedState__Group__231864);
+            pushFollow(FOLLOW_4);
             rule__RefinedState__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RefinedState__Group__3_in_rule__RefinedState__Group__231867);
+            pushFollow(FOLLOW_2);
             rule__RefinedState__Group__3();
 
             state._fsp--;
@@ -43486,20 +43486,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15655:1: rule__RefinedState__Group__2__Impl : ( ( rule__RefinedState__DocuAssignment_2 )? ) ;
+    // InternalRoom.g:15658:1: rule__RefinedState__Group__2__Impl : ( ( rule__RefinedState__DocuAssignment_2 )? ) ;
     public final void rule__RefinedState__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15659:1: ( ( ( rule__RefinedState__DocuAssignment_2 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15660:1: ( ( rule__RefinedState__DocuAssignment_2 )? )
+            // InternalRoom.g:15662:1: ( ( ( rule__RefinedState__DocuAssignment_2 )? ) )
+            // InternalRoom.g:15663:1: ( ( rule__RefinedState__DocuAssignment_2 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15660:1: ( ( rule__RefinedState__DocuAssignment_2 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15661:1: ( rule__RefinedState__DocuAssignment_2 )?
+            // InternalRoom.g:15663:1: ( ( rule__RefinedState__DocuAssignment_2 )? )
+            // InternalRoom.g:15664:1: ( rule__RefinedState__DocuAssignment_2 )?
             {
              before(grammarAccess.getRefinedStateAccess().getDocuAssignment_2()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15662:1: ( rule__RefinedState__DocuAssignment_2 )?
+            // InternalRoom.g:15665:1: ( rule__RefinedState__DocuAssignment_2 )?
             int alt155=2;
             int LA155_0 = input.LA(1);
 
@@ -43508,9 +43508,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt155) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15662:2: rule__RefinedState__DocuAssignment_2
+                    // InternalRoom.g:15665:2: rule__RefinedState__DocuAssignment_2
                     {
-                    pushFollow(FOLLOW_rule__RefinedState__DocuAssignment_2_in_rule__RefinedState__Group__2__Impl31894);
+                    pushFollow(FOLLOW_2);
                     rule__RefinedState__DocuAssignment_2();
 
                     state._fsp--;
@@ -43544,21 +43544,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15672:1: rule__RefinedState__Group__3 : rule__RefinedState__Group__3__Impl rule__RefinedState__Group__4 ;
+    // InternalRoom.g:15675:1: rule__RefinedState__Group__3 : rule__RefinedState__Group__3__Impl rule__RefinedState__Group__4 ;
     public final void rule__RefinedState__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15676:1: ( rule__RefinedState__Group__3__Impl rule__RefinedState__Group__4 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15677:2: rule__RefinedState__Group__3__Impl rule__RefinedState__Group__4
+            // InternalRoom.g:15679:1: ( rule__RefinedState__Group__3__Impl rule__RefinedState__Group__4 )
+            // InternalRoom.g:15680:2: rule__RefinedState__Group__3__Impl rule__RefinedState__Group__4
             {
-            pushFollow(FOLLOW_rule__RefinedState__Group__3__Impl_in_rule__RefinedState__Group__331925);
+            pushFollow(FOLLOW_79);
             rule__RefinedState__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RefinedState__Group__4_in_rule__RefinedState__Group__331928);
+            pushFollow(FOLLOW_2);
             rule__RefinedState__Group__4();
 
             state._fsp--;
@@ -43582,20 +43582,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15684:1: rule__RefinedState__Group__3__Impl : ( '{' ) ;
+    // InternalRoom.g:15687:1: rule__RefinedState__Group__3__Impl : ( '{' ) ;
     public final void rule__RefinedState__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15688:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15689:1: ( '{' )
+            // InternalRoom.g:15691:1: ( ( '{' ) )
+            // InternalRoom.g:15692:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15689:1: ( '{' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15690:1: '{'
+            // InternalRoom.g:15692:1: ( '{' )
+            // InternalRoom.g:15693:1: '{'
             {
              before(grammarAccess.getRefinedStateAccess().getLeftCurlyBracketKeyword_3()); 
-            match(input,41,FOLLOW_41_in_rule__RefinedState__Group__3__Impl31956); 
+            match(input,41,FOLLOW_2); 
              after(grammarAccess.getRefinedStateAccess().getLeftCurlyBracketKeyword_3()); 
 
             }
@@ -43619,21 +43619,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group__4"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15703:1: rule__RefinedState__Group__4 : rule__RefinedState__Group__4__Impl rule__RefinedState__Group__5 ;
+    // InternalRoom.g:15706:1: rule__RefinedState__Group__4 : rule__RefinedState__Group__4__Impl rule__RefinedState__Group__5 ;
     public final void rule__RefinedState__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15707:1: ( rule__RefinedState__Group__4__Impl rule__RefinedState__Group__5 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15708:2: rule__RefinedState__Group__4__Impl rule__RefinedState__Group__5
+            // InternalRoom.g:15710:1: ( rule__RefinedState__Group__4__Impl rule__RefinedState__Group__5 )
+            // InternalRoom.g:15711:2: rule__RefinedState__Group__4__Impl rule__RefinedState__Group__5
             {
-            pushFollow(FOLLOW_rule__RefinedState__Group__4__Impl_in_rule__RefinedState__Group__431987);
+            pushFollow(FOLLOW_79);
             rule__RefinedState__Group__4__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RefinedState__Group__5_in_rule__RefinedState__Group__431990);
+            pushFollow(FOLLOW_2);
             rule__RefinedState__Group__5();
 
             state._fsp--;
@@ -43657,20 +43657,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group__4__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15715:1: rule__RefinedState__Group__4__Impl : ( ( rule__RefinedState__Group_4__0 )? ) ;
+    // InternalRoom.g:15718:1: rule__RefinedState__Group__4__Impl : ( ( rule__RefinedState__Group_4__0 )? ) ;
     public final void rule__RefinedState__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15719:1: ( ( ( rule__RefinedState__Group_4__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15720:1: ( ( rule__RefinedState__Group_4__0 )? )
+            // InternalRoom.g:15722:1: ( ( ( rule__RefinedState__Group_4__0 )? ) )
+            // InternalRoom.g:15723:1: ( ( rule__RefinedState__Group_4__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15720:1: ( ( rule__RefinedState__Group_4__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15721:1: ( rule__RefinedState__Group_4__0 )?
+            // InternalRoom.g:15723:1: ( ( rule__RefinedState__Group_4__0 )? )
+            // InternalRoom.g:15724:1: ( rule__RefinedState__Group_4__0 )?
             {
              before(grammarAccess.getRefinedStateAccess().getGroup_4()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15722:1: ( rule__RefinedState__Group_4__0 )?
+            // InternalRoom.g:15725:1: ( rule__RefinedState__Group_4__0 )?
             int alt156=2;
             int LA156_0 = input.LA(1);
 
@@ -43679,9 +43679,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt156) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15722:2: rule__RefinedState__Group_4__0
+                    // InternalRoom.g:15725:2: rule__RefinedState__Group_4__0
                     {
-                    pushFollow(FOLLOW_rule__RefinedState__Group_4__0_in_rule__RefinedState__Group__4__Impl32017);
+                    pushFollow(FOLLOW_2);
                     rule__RefinedState__Group_4__0();
 
                     state._fsp--;
@@ -43715,21 +43715,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group__5"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15732:1: rule__RefinedState__Group__5 : rule__RefinedState__Group__5__Impl rule__RefinedState__Group__6 ;
+    // InternalRoom.g:15735:1: rule__RefinedState__Group__5 : rule__RefinedState__Group__5__Impl rule__RefinedState__Group__6 ;
     public final void rule__RefinedState__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15736:1: ( rule__RefinedState__Group__5__Impl rule__RefinedState__Group__6 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15737:2: rule__RefinedState__Group__5__Impl rule__RefinedState__Group__6
+            // InternalRoom.g:15739:1: ( rule__RefinedState__Group__5__Impl rule__RefinedState__Group__6 )
+            // InternalRoom.g:15740:2: rule__RefinedState__Group__5__Impl rule__RefinedState__Group__6
             {
-            pushFollow(FOLLOW_rule__RefinedState__Group__5__Impl_in_rule__RefinedState__Group__532048);
+            pushFollow(FOLLOW_79);
             rule__RefinedState__Group__5__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RefinedState__Group__6_in_rule__RefinedState__Group__532051);
+            pushFollow(FOLLOW_2);
             rule__RefinedState__Group__6();
 
             state._fsp--;
@@ -43753,20 +43753,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group__5__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15744:1: rule__RefinedState__Group__5__Impl : ( ( rule__RefinedState__Group_5__0 )? ) ;
+    // InternalRoom.g:15747:1: rule__RefinedState__Group__5__Impl : ( ( rule__RefinedState__Group_5__0 )? ) ;
     public final void rule__RefinedState__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15748:1: ( ( ( rule__RefinedState__Group_5__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15749:1: ( ( rule__RefinedState__Group_5__0 )? )
+            // InternalRoom.g:15751:1: ( ( ( rule__RefinedState__Group_5__0 )? ) )
+            // InternalRoom.g:15752:1: ( ( rule__RefinedState__Group_5__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15749:1: ( ( rule__RefinedState__Group_5__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15750:1: ( rule__RefinedState__Group_5__0 )?
+            // InternalRoom.g:15752:1: ( ( rule__RefinedState__Group_5__0 )? )
+            // InternalRoom.g:15753:1: ( rule__RefinedState__Group_5__0 )?
             {
              before(grammarAccess.getRefinedStateAccess().getGroup_5()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15751:1: ( rule__RefinedState__Group_5__0 )?
+            // InternalRoom.g:15754:1: ( rule__RefinedState__Group_5__0 )?
             int alt157=2;
             int LA157_0 = input.LA(1);
 
@@ -43775,9 +43775,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt157) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15751:2: rule__RefinedState__Group_5__0
+                    // InternalRoom.g:15754:2: rule__RefinedState__Group_5__0
                     {
-                    pushFollow(FOLLOW_rule__RefinedState__Group_5__0_in_rule__RefinedState__Group__5__Impl32078);
+                    pushFollow(FOLLOW_2);
                     rule__RefinedState__Group_5__0();
 
                     state._fsp--;
@@ -43811,21 +43811,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group__6"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15761:1: rule__RefinedState__Group__6 : rule__RefinedState__Group__6__Impl rule__RefinedState__Group__7 ;
+    // InternalRoom.g:15764:1: rule__RefinedState__Group__6 : rule__RefinedState__Group__6__Impl rule__RefinedState__Group__7 ;
     public final void rule__RefinedState__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15765:1: ( rule__RefinedState__Group__6__Impl rule__RefinedState__Group__7 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15766:2: rule__RefinedState__Group__6__Impl rule__RefinedState__Group__7
+            // InternalRoom.g:15768:1: ( rule__RefinedState__Group__6__Impl rule__RefinedState__Group__7 )
+            // InternalRoom.g:15769:2: rule__RefinedState__Group__6__Impl rule__RefinedState__Group__7
             {
-            pushFollow(FOLLOW_rule__RefinedState__Group__6__Impl_in_rule__RefinedState__Group__632109);
+            pushFollow(FOLLOW_79);
             rule__RefinedState__Group__6__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RefinedState__Group__7_in_rule__RefinedState__Group__632112);
+            pushFollow(FOLLOW_2);
             rule__RefinedState__Group__7();
 
             state._fsp--;
@@ -43849,20 +43849,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group__6__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15773:1: rule__RefinedState__Group__6__Impl : ( ( rule__RefinedState__Group_6__0 )? ) ;
+    // InternalRoom.g:15776:1: rule__RefinedState__Group__6__Impl : ( ( rule__RefinedState__Group_6__0 )? ) ;
     public final void rule__RefinedState__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15777:1: ( ( ( rule__RefinedState__Group_6__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15778:1: ( ( rule__RefinedState__Group_6__0 )? )
+            // InternalRoom.g:15780:1: ( ( ( rule__RefinedState__Group_6__0 )? ) )
+            // InternalRoom.g:15781:1: ( ( rule__RefinedState__Group_6__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15778:1: ( ( rule__RefinedState__Group_6__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15779:1: ( rule__RefinedState__Group_6__0 )?
+            // InternalRoom.g:15781:1: ( ( rule__RefinedState__Group_6__0 )? )
+            // InternalRoom.g:15782:1: ( rule__RefinedState__Group_6__0 )?
             {
              before(grammarAccess.getRefinedStateAccess().getGroup_6()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15780:1: ( rule__RefinedState__Group_6__0 )?
+            // InternalRoom.g:15783:1: ( rule__RefinedState__Group_6__0 )?
             int alt158=2;
             int LA158_0 = input.LA(1);
 
@@ -43871,9 +43871,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt158) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15780:2: rule__RefinedState__Group_6__0
+                    // InternalRoom.g:15783:2: rule__RefinedState__Group_6__0
                     {
-                    pushFollow(FOLLOW_rule__RefinedState__Group_6__0_in_rule__RefinedState__Group__6__Impl32139);
+                    pushFollow(FOLLOW_2);
                     rule__RefinedState__Group_6__0();
 
                     state._fsp--;
@@ -43907,21 +43907,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group__7"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15790:1: rule__RefinedState__Group__7 : rule__RefinedState__Group__7__Impl rule__RefinedState__Group__8 ;
+    // InternalRoom.g:15793:1: rule__RefinedState__Group__7 : rule__RefinedState__Group__7__Impl rule__RefinedState__Group__8 ;
     public final void rule__RefinedState__Group__7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15794:1: ( rule__RefinedState__Group__7__Impl rule__RefinedState__Group__8 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15795:2: rule__RefinedState__Group__7__Impl rule__RefinedState__Group__8
+            // InternalRoom.g:15797:1: ( rule__RefinedState__Group__7__Impl rule__RefinedState__Group__8 )
+            // InternalRoom.g:15798:2: rule__RefinedState__Group__7__Impl rule__RefinedState__Group__8
             {
-            pushFollow(FOLLOW_rule__RefinedState__Group__7__Impl_in_rule__RefinedState__Group__732170);
+            pushFollow(FOLLOW_79);
             rule__RefinedState__Group__7__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RefinedState__Group__8_in_rule__RefinedState__Group__732173);
+            pushFollow(FOLLOW_2);
             rule__RefinedState__Group__8();
 
             state._fsp--;
@@ -43945,20 +43945,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group__7__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15802:1: rule__RefinedState__Group__7__Impl : ( ( rule__RefinedState__Group_7__0 )? ) ;
+    // InternalRoom.g:15805:1: rule__RefinedState__Group__7__Impl : ( ( rule__RefinedState__Group_7__0 )? ) ;
     public final void rule__RefinedState__Group__7__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15806:1: ( ( ( rule__RefinedState__Group_7__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15807:1: ( ( rule__RefinedState__Group_7__0 )? )
+            // InternalRoom.g:15809:1: ( ( ( rule__RefinedState__Group_7__0 )? ) )
+            // InternalRoom.g:15810:1: ( ( rule__RefinedState__Group_7__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15807:1: ( ( rule__RefinedState__Group_7__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15808:1: ( rule__RefinedState__Group_7__0 )?
+            // InternalRoom.g:15810:1: ( ( rule__RefinedState__Group_7__0 )? )
+            // InternalRoom.g:15811:1: ( rule__RefinedState__Group_7__0 )?
             {
              before(grammarAccess.getRefinedStateAccess().getGroup_7()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15809:1: ( rule__RefinedState__Group_7__0 )?
+            // InternalRoom.g:15812:1: ( rule__RefinedState__Group_7__0 )?
             int alt159=2;
             int LA159_0 = input.LA(1);
 
@@ -43967,9 +43967,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt159) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15809:2: rule__RefinedState__Group_7__0
+                    // InternalRoom.g:15812:2: rule__RefinedState__Group_7__0
                     {
-                    pushFollow(FOLLOW_rule__RefinedState__Group_7__0_in_rule__RefinedState__Group__7__Impl32200);
+                    pushFollow(FOLLOW_2);
                     rule__RefinedState__Group_7__0();
 
                     state._fsp--;
@@ -44003,16 +44003,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group__8"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15819:1: rule__RefinedState__Group__8 : rule__RefinedState__Group__8__Impl ;
+    // InternalRoom.g:15822:1: rule__RefinedState__Group__8 : rule__RefinedState__Group__8__Impl ;
     public final void rule__RefinedState__Group__8() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15823:1: ( rule__RefinedState__Group__8__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15824:2: rule__RefinedState__Group__8__Impl
+            // InternalRoom.g:15826:1: ( rule__RefinedState__Group__8__Impl )
+            // InternalRoom.g:15827:2: rule__RefinedState__Group__8__Impl
             {
-            pushFollow(FOLLOW_rule__RefinedState__Group__8__Impl_in_rule__RefinedState__Group__832231);
+            pushFollow(FOLLOW_2);
             rule__RefinedState__Group__8__Impl();
 
             state._fsp--;
@@ -44036,20 +44036,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group__8__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15830:1: rule__RefinedState__Group__8__Impl : ( '}' ) ;
+    // InternalRoom.g:15833:1: rule__RefinedState__Group__8__Impl : ( '}' ) ;
     public final void rule__RefinedState__Group__8__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15834:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15835:1: ( '}' )
+            // InternalRoom.g:15837:1: ( ( '}' ) )
+            // InternalRoom.g:15838:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15835:1: ( '}' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15836:1: '}'
+            // InternalRoom.g:15838:1: ( '}' )
+            // InternalRoom.g:15839:1: '}'
             {
              before(grammarAccess.getRefinedStateAccess().getRightCurlyBracketKeyword_8()); 
-            match(input,42,FOLLOW_42_in_rule__RefinedState__Group__8__Impl32259); 
+            match(input,42,FOLLOW_2); 
              after(grammarAccess.getRefinedStateAccess().getRightCurlyBracketKeyword_8()); 
 
             }
@@ -44073,21 +44073,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group_4__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15867:1: rule__RefinedState__Group_4__0 : rule__RefinedState__Group_4__0__Impl rule__RefinedState__Group_4__1 ;
+    // InternalRoom.g:15870:1: rule__RefinedState__Group_4__0 : rule__RefinedState__Group_4__0__Impl rule__RefinedState__Group_4__1 ;
     public final void rule__RefinedState__Group_4__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15871:1: ( rule__RefinedState__Group_4__0__Impl rule__RefinedState__Group_4__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15872:2: rule__RefinedState__Group_4__0__Impl rule__RefinedState__Group_4__1
+            // InternalRoom.g:15874:1: ( rule__RefinedState__Group_4__0__Impl rule__RefinedState__Group_4__1 )
+            // InternalRoom.g:15875:2: rule__RefinedState__Group_4__0__Impl rule__RefinedState__Group_4__1
             {
-            pushFollow(FOLLOW_rule__RefinedState__Group_4__0__Impl_in_rule__RefinedState__Group_4__032308);
+            pushFollow(FOLLOW_27);
             rule__RefinedState__Group_4__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RefinedState__Group_4__1_in_rule__RefinedState__Group_4__032311);
+            pushFollow(FOLLOW_2);
             rule__RefinedState__Group_4__1();
 
             state._fsp--;
@@ -44111,20 +44111,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group_4__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15879:1: rule__RefinedState__Group_4__0__Impl : ( 'entry' ) ;
+    // InternalRoom.g:15882:1: rule__RefinedState__Group_4__0__Impl : ( 'entry' ) ;
     public final void rule__RefinedState__Group_4__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15883:1: ( ( 'entry' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15884:1: ( 'entry' )
+            // InternalRoom.g:15886:1: ( ( 'entry' ) )
+            // InternalRoom.g:15887:1: ( 'entry' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15884:1: ( 'entry' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15885:1: 'entry'
+            // InternalRoom.g:15887:1: ( 'entry' )
+            // InternalRoom.g:15888:1: 'entry'
             {
              before(grammarAccess.getRefinedStateAccess().getEntryKeyword_4_0()); 
-            match(input,95,FOLLOW_95_in_rule__RefinedState__Group_4__0__Impl32339); 
+            match(input,95,FOLLOW_2); 
              after(grammarAccess.getRefinedStateAccess().getEntryKeyword_4_0()); 
 
             }
@@ -44148,16 +44148,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group_4__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15898:1: rule__RefinedState__Group_4__1 : rule__RefinedState__Group_4__1__Impl ;
+    // InternalRoom.g:15901:1: rule__RefinedState__Group_4__1 : rule__RefinedState__Group_4__1__Impl ;
     public final void rule__RefinedState__Group_4__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15902:1: ( rule__RefinedState__Group_4__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15903:2: rule__RefinedState__Group_4__1__Impl
+            // InternalRoom.g:15905:1: ( rule__RefinedState__Group_4__1__Impl )
+            // InternalRoom.g:15906:2: rule__RefinedState__Group_4__1__Impl
             {
-            pushFollow(FOLLOW_rule__RefinedState__Group_4__1__Impl_in_rule__RefinedState__Group_4__132370);
+            pushFollow(FOLLOW_2);
             rule__RefinedState__Group_4__1__Impl();
 
             state._fsp--;
@@ -44181,23 +44181,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group_4__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15909:1: rule__RefinedState__Group_4__1__Impl : ( ( rule__RefinedState__EntryCodeAssignment_4_1 ) ) ;
+    // InternalRoom.g:15912:1: rule__RefinedState__Group_4__1__Impl : ( ( rule__RefinedState__EntryCodeAssignment_4_1 ) ) ;
     public final void rule__RefinedState__Group_4__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15913:1: ( ( ( rule__RefinedState__EntryCodeAssignment_4_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15914:1: ( ( rule__RefinedState__EntryCodeAssignment_4_1 ) )
+            // InternalRoom.g:15916:1: ( ( ( rule__RefinedState__EntryCodeAssignment_4_1 ) ) )
+            // InternalRoom.g:15917:1: ( ( rule__RefinedState__EntryCodeAssignment_4_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15914:1: ( ( rule__RefinedState__EntryCodeAssignment_4_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15915:1: ( rule__RefinedState__EntryCodeAssignment_4_1 )
+            // InternalRoom.g:15917:1: ( ( rule__RefinedState__EntryCodeAssignment_4_1 ) )
+            // InternalRoom.g:15918:1: ( rule__RefinedState__EntryCodeAssignment_4_1 )
             {
              before(grammarAccess.getRefinedStateAccess().getEntryCodeAssignment_4_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15916:1: ( rule__RefinedState__EntryCodeAssignment_4_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15916:2: rule__RefinedState__EntryCodeAssignment_4_1
+            // InternalRoom.g:15919:1: ( rule__RefinedState__EntryCodeAssignment_4_1 )
+            // InternalRoom.g:15919:2: rule__RefinedState__EntryCodeAssignment_4_1
             {
-            pushFollow(FOLLOW_rule__RefinedState__EntryCodeAssignment_4_1_in_rule__RefinedState__Group_4__1__Impl32397);
+            pushFollow(FOLLOW_2);
             rule__RefinedState__EntryCodeAssignment_4_1();
 
             state._fsp--;
@@ -44228,21 +44228,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group_5__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15930:1: rule__RefinedState__Group_5__0 : rule__RefinedState__Group_5__0__Impl rule__RefinedState__Group_5__1 ;
+    // InternalRoom.g:15933:1: rule__RefinedState__Group_5__0 : rule__RefinedState__Group_5__0__Impl rule__RefinedState__Group_5__1 ;
     public final void rule__RefinedState__Group_5__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15934:1: ( rule__RefinedState__Group_5__0__Impl rule__RefinedState__Group_5__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15935:2: rule__RefinedState__Group_5__0__Impl rule__RefinedState__Group_5__1
+            // InternalRoom.g:15937:1: ( rule__RefinedState__Group_5__0__Impl rule__RefinedState__Group_5__1 )
+            // InternalRoom.g:15938:2: rule__RefinedState__Group_5__0__Impl rule__RefinedState__Group_5__1
             {
-            pushFollow(FOLLOW_rule__RefinedState__Group_5__0__Impl_in_rule__RefinedState__Group_5__032431);
+            pushFollow(FOLLOW_27);
             rule__RefinedState__Group_5__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RefinedState__Group_5__1_in_rule__RefinedState__Group_5__032434);
+            pushFollow(FOLLOW_2);
             rule__RefinedState__Group_5__1();
 
             state._fsp--;
@@ -44266,20 +44266,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group_5__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15942:1: rule__RefinedState__Group_5__0__Impl : ( 'exit' ) ;
+    // InternalRoom.g:15945:1: rule__RefinedState__Group_5__0__Impl : ( 'exit' ) ;
     public final void rule__RefinedState__Group_5__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15946:1: ( ( 'exit' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15947:1: ( 'exit' )
+            // InternalRoom.g:15949:1: ( ( 'exit' ) )
+            // InternalRoom.g:15950:1: ( 'exit' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15947:1: ( 'exit' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15948:1: 'exit'
+            // InternalRoom.g:15950:1: ( 'exit' )
+            // InternalRoom.g:15951:1: 'exit'
             {
              before(grammarAccess.getRefinedStateAccess().getExitKeyword_5_0()); 
-            match(input,96,FOLLOW_96_in_rule__RefinedState__Group_5__0__Impl32462); 
+            match(input,96,FOLLOW_2); 
              after(grammarAccess.getRefinedStateAccess().getExitKeyword_5_0()); 
 
             }
@@ -44303,16 +44303,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group_5__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15961:1: rule__RefinedState__Group_5__1 : rule__RefinedState__Group_5__1__Impl ;
+    // InternalRoom.g:15964:1: rule__RefinedState__Group_5__1 : rule__RefinedState__Group_5__1__Impl ;
     public final void rule__RefinedState__Group_5__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15965:1: ( rule__RefinedState__Group_5__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15966:2: rule__RefinedState__Group_5__1__Impl
+            // InternalRoom.g:15968:1: ( rule__RefinedState__Group_5__1__Impl )
+            // InternalRoom.g:15969:2: rule__RefinedState__Group_5__1__Impl
             {
-            pushFollow(FOLLOW_rule__RefinedState__Group_5__1__Impl_in_rule__RefinedState__Group_5__132493);
+            pushFollow(FOLLOW_2);
             rule__RefinedState__Group_5__1__Impl();
 
             state._fsp--;
@@ -44336,23 +44336,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group_5__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15972:1: rule__RefinedState__Group_5__1__Impl : ( ( rule__RefinedState__ExitCodeAssignment_5_1 ) ) ;
+    // InternalRoom.g:15975:1: rule__RefinedState__Group_5__1__Impl : ( ( rule__RefinedState__ExitCodeAssignment_5_1 ) ) ;
     public final void rule__RefinedState__Group_5__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15976:1: ( ( ( rule__RefinedState__ExitCodeAssignment_5_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15977:1: ( ( rule__RefinedState__ExitCodeAssignment_5_1 ) )
+            // InternalRoom.g:15979:1: ( ( ( rule__RefinedState__ExitCodeAssignment_5_1 ) ) )
+            // InternalRoom.g:15980:1: ( ( rule__RefinedState__ExitCodeAssignment_5_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15977:1: ( ( rule__RefinedState__ExitCodeAssignment_5_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15978:1: ( rule__RefinedState__ExitCodeAssignment_5_1 )
+            // InternalRoom.g:15980:1: ( ( rule__RefinedState__ExitCodeAssignment_5_1 ) )
+            // InternalRoom.g:15981:1: ( rule__RefinedState__ExitCodeAssignment_5_1 )
             {
              before(grammarAccess.getRefinedStateAccess().getExitCodeAssignment_5_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15979:1: ( rule__RefinedState__ExitCodeAssignment_5_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15979:2: rule__RefinedState__ExitCodeAssignment_5_1
+            // InternalRoom.g:15982:1: ( rule__RefinedState__ExitCodeAssignment_5_1 )
+            // InternalRoom.g:15982:2: rule__RefinedState__ExitCodeAssignment_5_1
             {
-            pushFollow(FOLLOW_rule__RefinedState__ExitCodeAssignment_5_1_in_rule__RefinedState__Group_5__1__Impl32520);
+            pushFollow(FOLLOW_2);
             rule__RefinedState__ExitCodeAssignment_5_1();
 
             state._fsp--;
@@ -44383,21 +44383,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group_6__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15993:1: rule__RefinedState__Group_6__0 : rule__RefinedState__Group_6__0__Impl rule__RefinedState__Group_6__1 ;
+    // InternalRoom.g:15996:1: rule__RefinedState__Group_6__0 : rule__RefinedState__Group_6__0__Impl rule__RefinedState__Group_6__1 ;
     public final void rule__RefinedState__Group_6__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15997:1: ( rule__RefinedState__Group_6__0__Impl rule__RefinedState__Group_6__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:15998:2: rule__RefinedState__Group_6__0__Impl rule__RefinedState__Group_6__1
+            // InternalRoom.g:16000:1: ( rule__RefinedState__Group_6__0__Impl rule__RefinedState__Group_6__1 )
+            // InternalRoom.g:16001:2: rule__RefinedState__Group_6__0__Impl rule__RefinedState__Group_6__1
             {
-            pushFollow(FOLLOW_rule__RefinedState__Group_6__0__Impl_in_rule__RefinedState__Group_6__032554);
+            pushFollow(FOLLOW_27);
             rule__RefinedState__Group_6__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RefinedState__Group_6__1_in_rule__RefinedState__Group_6__032557);
+            pushFollow(FOLLOW_2);
             rule__RefinedState__Group_6__1();
 
             state._fsp--;
@@ -44421,20 +44421,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group_6__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16005:1: rule__RefinedState__Group_6__0__Impl : ( 'do' ) ;
+    // InternalRoom.g:16008:1: rule__RefinedState__Group_6__0__Impl : ( 'do' ) ;
     public final void rule__RefinedState__Group_6__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16009:1: ( ( 'do' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16010:1: ( 'do' )
+            // InternalRoom.g:16012:1: ( ( 'do' ) )
+            // InternalRoom.g:16013:1: ( 'do' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16010:1: ( 'do' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16011:1: 'do'
+            // InternalRoom.g:16013:1: ( 'do' )
+            // InternalRoom.g:16014:1: 'do'
             {
              before(grammarAccess.getRefinedStateAccess().getDoKeyword_6_0()); 
-            match(input,97,FOLLOW_97_in_rule__RefinedState__Group_6__0__Impl32585); 
+            match(input,97,FOLLOW_2); 
              after(grammarAccess.getRefinedStateAccess().getDoKeyword_6_0()); 
 
             }
@@ -44458,16 +44458,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group_6__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16024:1: rule__RefinedState__Group_6__1 : rule__RefinedState__Group_6__1__Impl ;
+    // InternalRoom.g:16027:1: rule__RefinedState__Group_6__1 : rule__RefinedState__Group_6__1__Impl ;
     public final void rule__RefinedState__Group_6__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16028:1: ( rule__RefinedState__Group_6__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16029:2: rule__RefinedState__Group_6__1__Impl
+            // InternalRoom.g:16031:1: ( rule__RefinedState__Group_6__1__Impl )
+            // InternalRoom.g:16032:2: rule__RefinedState__Group_6__1__Impl
             {
-            pushFollow(FOLLOW_rule__RefinedState__Group_6__1__Impl_in_rule__RefinedState__Group_6__132616);
+            pushFollow(FOLLOW_2);
             rule__RefinedState__Group_6__1__Impl();
 
             state._fsp--;
@@ -44491,23 +44491,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group_6__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16035:1: rule__RefinedState__Group_6__1__Impl : ( ( rule__RefinedState__DoCodeAssignment_6_1 ) ) ;
+    // InternalRoom.g:16038:1: rule__RefinedState__Group_6__1__Impl : ( ( rule__RefinedState__DoCodeAssignment_6_1 ) ) ;
     public final void rule__RefinedState__Group_6__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16039:1: ( ( ( rule__RefinedState__DoCodeAssignment_6_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16040:1: ( ( rule__RefinedState__DoCodeAssignment_6_1 ) )
+            // InternalRoom.g:16042:1: ( ( ( rule__RefinedState__DoCodeAssignment_6_1 ) ) )
+            // InternalRoom.g:16043:1: ( ( rule__RefinedState__DoCodeAssignment_6_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16040:1: ( ( rule__RefinedState__DoCodeAssignment_6_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16041:1: ( rule__RefinedState__DoCodeAssignment_6_1 )
+            // InternalRoom.g:16043:1: ( ( rule__RefinedState__DoCodeAssignment_6_1 ) )
+            // InternalRoom.g:16044:1: ( rule__RefinedState__DoCodeAssignment_6_1 )
             {
              before(grammarAccess.getRefinedStateAccess().getDoCodeAssignment_6_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16042:1: ( rule__RefinedState__DoCodeAssignment_6_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16042:2: rule__RefinedState__DoCodeAssignment_6_1
+            // InternalRoom.g:16045:1: ( rule__RefinedState__DoCodeAssignment_6_1 )
+            // InternalRoom.g:16045:2: rule__RefinedState__DoCodeAssignment_6_1
             {
-            pushFollow(FOLLOW_rule__RefinedState__DoCodeAssignment_6_1_in_rule__RefinedState__Group_6__1__Impl32643);
+            pushFollow(FOLLOW_2);
             rule__RefinedState__DoCodeAssignment_6_1();
 
             state._fsp--;
@@ -44538,21 +44538,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group_7__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16056:1: rule__RefinedState__Group_7__0 : rule__RefinedState__Group_7__0__Impl rule__RefinedState__Group_7__1 ;
+    // InternalRoom.g:16059:1: rule__RefinedState__Group_7__0 : rule__RefinedState__Group_7__0__Impl rule__RefinedState__Group_7__1 ;
     public final void rule__RefinedState__Group_7__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16060:1: ( rule__RefinedState__Group_7__0__Impl rule__RefinedState__Group_7__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16061:2: rule__RefinedState__Group_7__0__Impl rule__RefinedState__Group_7__1
+            // InternalRoom.g:16063:1: ( rule__RefinedState__Group_7__0__Impl rule__RefinedState__Group_7__1 )
+            // InternalRoom.g:16064:2: rule__RefinedState__Group_7__0__Impl rule__RefinedState__Group_7__1
             {
-            pushFollow(FOLLOW_rule__RefinedState__Group_7__0__Impl_in_rule__RefinedState__Group_7__032677);
+            pushFollow(FOLLOW_27);
             rule__RefinedState__Group_7__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RefinedState__Group_7__1_in_rule__RefinedState__Group_7__032680);
+            pushFollow(FOLLOW_2);
             rule__RefinedState__Group_7__1();
 
             state._fsp--;
@@ -44576,20 +44576,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group_7__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16068:1: rule__RefinedState__Group_7__0__Impl : ( 'subgraph' ) ;
+    // InternalRoom.g:16071:1: rule__RefinedState__Group_7__0__Impl : ( 'subgraph' ) ;
     public final void rule__RefinedState__Group_7__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16072:1: ( ( 'subgraph' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16073:1: ( 'subgraph' )
+            // InternalRoom.g:16075:1: ( ( 'subgraph' ) )
+            // InternalRoom.g:16076:1: ( 'subgraph' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16073:1: ( 'subgraph' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16074:1: 'subgraph'
+            // InternalRoom.g:16076:1: ( 'subgraph' )
+            // InternalRoom.g:16077:1: 'subgraph'
             {
              before(grammarAccess.getRefinedStateAccess().getSubgraphKeyword_7_0()); 
-            match(input,98,FOLLOW_98_in_rule__RefinedState__Group_7__0__Impl32708); 
+            match(input,98,FOLLOW_2); 
              after(grammarAccess.getRefinedStateAccess().getSubgraphKeyword_7_0()); 
 
             }
@@ -44613,16 +44613,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group_7__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16087:1: rule__RefinedState__Group_7__1 : rule__RefinedState__Group_7__1__Impl ;
+    // InternalRoom.g:16090:1: rule__RefinedState__Group_7__1 : rule__RefinedState__Group_7__1__Impl ;
     public final void rule__RefinedState__Group_7__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16091:1: ( rule__RefinedState__Group_7__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16092:2: rule__RefinedState__Group_7__1__Impl
+            // InternalRoom.g:16094:1: ( rule__RefinedState__Group_7__1__Impl )
+            // InternalRoom.g:16095:2: rule__RefinedState__Group_7__1__Impl
             {
-            pushFollow(FOLLOW_rule__RefinedState__Group_7__1__Impl_in_rule__RefinedState__Group_7__132739);
+            pushFollow(FOLLOW_2);
             rule__RefinedState__Group_7__1__Impl();
 
             state._fsp--;
@@ -44646,23 +44646,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__Group_7__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16098:1: rule__RefinedState__Group_7__1__Impl : ( ( rule__RefinedState__SubgraphAssignment_7_1 ) ) ;
+    // InternalRoom.g:16101:1: rule__RefinedState__Group_7__1__Impl : ( ( rule__RefinedState__SubgraphAssignment_7_1 ) ) ;
     public final void rule__RefinedState__Group_7__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16102:1: ( ( ( rule__RefinedState__SubgraphAssignment_7_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16103:1: ( ( rule__RefinedState__SubgraphAssignment_7_1 ) )
+            // InternalRoom.g:16105:1: ( ( ( rule__RefinedState__SubgraphAssignment_7_1 ) ) )
+            // InternalRoom.g:16106:1: ( ( rule__RefinedState__SubgraphAssignment_7_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16103:1: ( ( rule__RefinedState__SubgraphAssignment_7_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16104:1: ( rule__RefinedState__SubgraphAssignment_7_1 )
+            // InternalRoom.g:16106:1: ( ( rule__RefinedState__SubgraphAssignment_7_1 ) )
+            // InternalRoom.g:16107:1: ( rule__RefinedState__SubgraphAssignment_7_1 )
             {
              before(grammarAccess.getRefinedStateAccess().getSubgraphAssignment_7_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16105:1: ( rule__RefinedState__SubgraphAssignment_7_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16105:2: rule__RefinedState__SubgraphAssignment_7_1
+            // InternalRoom.g:16108:1: ( rule__RefinedState__SubgraphAssignment_7_1 )
+            // InternalRoom.g:16108:2: rule__RefinedState__SubgraphAssignment_7_1
             {
-            pushFollow(FOLLOW_rule__RefinedState__SubgraphAssignment_7_1_in_rule__RefinedState__Group_7__1__Impl32766);
+            pushFollow(FOLLOW_2);
             rule__RefinedState__SubgraphAssignment_7_1();
 
             state._fsp--;
@@ -44693,21 +44693,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DetailCode__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16119:1: rule__DetailCode__Group__0 : rule__DetailCode__Group__0__Impl rule__DetailCode__Group__1 ;
+    // InternalRoom.g:16122:1: rule__DetailCode__Group__0 : rule__DetailCode__Group__0__Impl rule__DetailCode__Group__1 ;
     public final void rule__DetailCode__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16123:1: ( rule__DetailCode__Group__0__Impl rule__DetailCode__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16124:2: rule__DetailCode__Group__0__Impl rule__DetailCode__Group__1
+            // InternalRoom.g:16126:1: ( rule__DetailCode__Group__0__Impl rule__DetailCode__Group__1 )
+            // InternalRoom.g:16127:2: rule__DetailCode__Group__0__Impl rule__DetailCode__Group__1
             {
-            pushFollow(FOLLOW_rule__DetailCode__Group__0__Impl_in_rule__DetailCode__Group__032800);
+            pushFollow(FOLLOW_27);
             rule__DetailCode__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__DetailCode__Group__1_in_rule__DetailCode__Group__032803);
+            pushFollow(FOLLOW_2);
             rule__DetailCode__Group__1();
 
             state._fsp--;
@@ -44731,21 +44731,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DetailCode__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16131:1: rule__DetailCode__Group__0__Impl : ( () ) ;
+    // InternalRoom.g:16134:1: rule__DetailCode__Group__0__Impl : ( () ) ;
     public final void rule__DetailCode__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16135:1: ( ( () ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16136:1: ( () )
+            // InternalRoom.g:16138:1: ( ( () ) )
+            // InternalRoom.g:16139:1: ( () )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16136:1: ( () )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16137:1: ()
+            // InternalRoom.g:16139:1: ( () )
+            // InternalRoom.g:16140:1: ()
             {
              before(grammarAccess.getDetailCodeAccess().getDetailCodeAction_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16138:1: ()
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16140:1: 
+            // InternalRoom.g:16141:1: ()
+            // InternalRoom.g:16143:1: 
             {
             }
 
@@ -44768,21 +44768,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DetailCode__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16150:1: rule__DetailCode__Group__1 : rule__DetailCode__Group__1__Impl rule__DetailCode__Group__2 ;
+    // InternalRoom.g:16153:1: rule__DetailCode__Group__1 : rule__DetailCode__Group__1__Impl rule__DetailCode__Group__2 ;
     public final void rule__DetailCode__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16154:1: ( rule__DetailCode__Group__1__Impl rule__DetailCode__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16155:2: rule__DetailCode__Group__1__Impl rule__DetailCode__Group__2
+            // InternalRoom.g:16157:1: ( rule__DetailCode__Group__1__Impl rule__DetailCode__Group__2 )
+            // InternalRoom.g:16158:2: rule__DetailCode__Group__1__Impl rule__DetailCode__Group__2
             {
-            pushFollow(FOLLOW_rule__DetailCode__Group__1__Impl_in_rule__DetailCode__Group__132861);
+            pushFollow(FOLLOW_80);
             rule__DetailCode__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__DetailCode__Group__2_in_rule__DetailCode__Group__132864);
+            pushFollow(FOLLOW_2);
             rule__DetailCode__Group__2();
 
             state._fsp--;
@@ -44806,23 +44806,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DetailCode__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16162:1: rule__DetailCode__Group__1__Impl : ( ( rule__DetailCode__UsedAssignment_1 ) ) ;
+    // InternalRoom.g:16165:1: rule__DetailCode__Group__1__Impl : ( ( rule__DetailCode__UsedAssignment_1 ) ) ;
     public final void rule__DetailCode__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16166:1: ( ( ( rule__DetailCode__UsedAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16167:1: ( ( rule__DetailCode__UsedAssignment_1 ) )
+            // InternalRoom.g:16169:1: ( ( ( rule__DetailCode__UsedAssignment_1 ) ) )
+            // InternalRoom.g:16170:1: ( ( rule__DetailCode__UsedAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16167:1: ( ( rule__DetailCode__UsedAssignment_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16168:1: ( rule__DetailCode__UsedAssignment_1 )
+            // InternalRoom.g:16170:1: ( ( rule__DetailCode__UsedAssignment_1 ) )
+            // InternalRoom.g:16171:1: ( rule__DetailCode__UsedAssignment_1 )
             {
              before(grammarAccess.getDetailCodeAccess().getUsedAssignment_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16169:1: ( rule__DetailCode__UsedAssignment_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16169:2: rule__DetailCode__UsedAssignment_1
+            // InternalRoom.g:16172:1: ( rule__DetailCode__UsedAssignment_1 )
+            // InternalRoom.g:16172:2: rule__DetailCode__UsedAssignment_1
             {
-            pushFollow(FOLLOW_rule__DetailCode__UsedAssignment_1_in_rule__DetailCode__Group__1__Impl32891);
+            pushFollow(FOLLOW_2);
             rule__DetailCode__UsedAssignment_1();
 
             state._fsp--;
@@ -44853,21 +44853,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DetailCode__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16179:1: rule__DetailCode__Group__2 : rule__DetailCode__Group__2__Impl rule__DetailCode__Group__3 ;
+    // InternalRoom.g:16182:1: rule__DetailCode__Group__2 : rule__DetailCode__Group__2__Impl rule__DetailCode__Group__3 ;
     public final void rule__DetailCode__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16183:1: ( rule__DetailCode__Group__2__Impl rule__DetailCode__Group__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16184:2: rule__DetailCode__Group__2__Impl rule__DetailCode__Group__3
+            // InternalRoom.g:16186:1: ( rule__DetailCode__Group__2__Impl rule__DetailCode__Group__3 )
+            // InternalRoom.g:16187:2: rule__DetailCode__Group__2__Impl rule__DetailCode__Group__3
             {
-            pushFollow(FOLLOW_rule__DetailCode__Group__2__Impl_in_rule__DetailCode__Group__232921);
+            pushFollow(FOLLOW_80);
             rule__DetailCode__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__DetailCode__Group__3_in_rule__DetailCode__Group__232924);
+            pushFollow(FOLLOW_2);
             rule__DetailCode__Group__3();
 
             state._fsp--;
@@ -44891,20 +44891,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DetailCode__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16191:1: rule__DetailCode__Group__2__Impl : ( ( rule__DetailCode__LinesAssignment_2 )* ) ;
+    // InternalRoom.g:16194:1: rule__DetailCode__Group__2__Impl : ( ( rule__DetailCode__LinesAssignment_2 )* ) ;
     public final void rule__DetailCode__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16195:1: ( ( ( rule__DetailCode__LinesAssignment_2 )* ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16196:1: ( ( rule__DetailCode__LinesAssignment_2 )* )
+            // InternalRoom.g:16198:1: ( ( ( rule__DetailCode__LinesAssignment_2 )* ) )
+            // InternalRoom.g:16199:1: ( ( rule__DetailCode__LinesAssignment_2 )* )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16196:1: ( ( rule__DetailCode__LinesAssignment_2 )* )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16197:1: ( rule__DetailCode__LinesAssignment_2 )*
+            // InternalRoom.g:16199:1: ( ( rule__DetailCode__LinesAssignment_2 )* )
+            // InternalRoom.g:16200:1: ( rule__DetailCode__LinesAssignment_2 )*
             {
              before(grammarAccess.getDetailCodeAccess().getLinesAssignment_2()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16198:1: ( rule__DetailCode__LinesAssignment_2 )*
+            // InternalRoom.g:16201:1: ( rule__DetailCode__LinesAssignment_2 )*
             loop160:
             do {
                 int alt160=2;
@@ -44917,9 +44917,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
                 switch (alt160) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16198:2: rule__DetailCode__LinesAssignment_2
+            	    // InternalRoom.g:16201:2: rule__DetailCode__LinesAssignment_2
             	    {
-            	    pushFollow(FOLLOW_rule__DetailCode__LinesAssignment_2_in_rule__DetailCode__Group__2__Impl32951);
+            	    pushFollow(FOLLOW_81);
             	    rule__DetailCode__LinesAssignment_2();
 
             	    state._fsp--;
@@ -44956,16 +44956,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DetailCode__Group__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16208:1: rule__DetailCode__Group__3 : rule__DetailCode__Group__3__Impl ;
+    // InternalRoom.g:16211:1: rule__DetailCode__Group__3 : rule__DetailCode__Group__3__Impl ;
     public final void rule__DetailCode__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16212:1: ( rule__DetailCode__Group__3__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16213:2: rule__DetailCode__Group__3__Impl
+            // InternalRoom.g:16215:1: ( rule__DetailCode__Group__3__Impl )
+            // InternalRoom.g:16216:2: rule__DetailCode__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__DetailCode__Group__3__Impl_in_rule__DetailCode__Group__332982);
+            pushFollow(FOLLOW_2);
             rule__DetailCode__Group__3__Impl();
 
             state._fsp--;
@@ -44989,20 +44989,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DetailCode__Group__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16219:1: rule__DetailCode__Group__3__Impl : ( '}' ) ;
+    // InternalRoom.g:16222:1: rule__DetailCode__Group__3__Impl : ( '}' ) ;
     public final void rule__DetailCode__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16223:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16224:1: ( '}' )
+            // InternalRoom.g:16226:1: ( ( '}' ) )
+            // InternalRoom.g:16227:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16224:1: ( '}' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16225:1: '}'
+            // InternalRoom.g:16227:1: ( '}' )
+            // InternalRoom.g:16228:1: '}'
             {
              before(grammarAccess.getDetailCodeAccess().getRightCurlyBracketKeyword_3()); 
-            match(input,42,FOLLOW_42_in_rule__DetailCode__Group__3__Impl33010); 
+            match(input,42,FOLLOW_2); 
              after(grammarAccess.getDetailCodeAccess().getRightCurlyBracketKeyword_3()); 
 
             }
@@ -45026,21 +45026,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TransitionPoint__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16246:1: rule__TransitionPoint__Group__0 : rule__TransitionPoint__Group__0__Impl rule__TransitionPoint__Group__1 ;
+    // InternalRoom.g:16249:1: rule__TransitionPoint__Group__0 : rule__TransitionPoint__Group__0__Impl rule__TransitionPoint__Group__1 ;
     public final void rule__TransitionPoint__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16250:1: ( rule__TransitionPoint__Group__0__Impl rule__TransitionPoint__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16251:2: rule__TransitionPoint__Group__0__Impl rule__TransitionPoint__Group__1
+            // InternalRoom.g:16253:1: ( rule__TransitionPoint__Group__0__Impl rule__TransitionPoint__Group__1 )
+            // InternalRoom.g:16254:2: rule__TransitionPoint__Group__0__Impl rule__TransitionPoint__Group__1
             {
-            pushFollow(FOLLOW_rule__TransitionPoint__Group__0__Impl_in_rule__TransitionPoint__Group__033049);
+            pushFollow(FOLLOW_82);
             rule__TransitionPoint__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__TransitionPoint__Group__1_in_rule__TransitionPoint__Group__033052);
+            pushFollow(FOLLOW_2);
             rule__TransitionPoint__Group__1();
 
             state._fsp--;
@@ -45064,20 +45064,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TransitionPoint__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16258:1: rule__TransitionPoint__Group__0__Impl : ( ( rule__TransitionPoint__HandlerAssignment_0 )? ) ;
+    // InternalRoom.g:16261:1: rule__TransitionPoint__Group__0__Impl : ( ( rule__TransitionPoint__HandlerAssignment_0 )? ) ;
     public final void rule__TransitionPoint__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16262:1: ( ( ( rule__TransitionPoint__HandlerAssignment_0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16263:1: ( ( rule__TransitionPoint__HandlerAssignment_0 )? )
+            // InternalRoom.g:16265:1: ( ( ( rule__TransitionPoint__HandlerAssignment_0 )? ) )
+            // InternalRoom.g:16266:1: ( ( rule__TransitionPoint__HandlerAssignment_0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16263:1: ( ( rule__TransitionPoint__HandlerAssignment_0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16264:1: ( rule__TransitionPoint__HandlerAssignment_0 )?
+            // InternalRoom.g:16266:1: ( ( rule__TransitionPoint__HandlerAssignment_0 )? )
+            // InternalRoom.g:16267:1: ( rule__TransitionPoint__HandlerAssignment_0 )?
             {
              before(grammarAccess.getTransitionPointAccess().getHandlerAssignment_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16265:1: ( rule__TransitionPoint__HandlerAssignment_0 )?
+            // InternalRoom.g:16268:1: ( rule__TransitionPoint__HandlerAssignment_0 )?
             int alt161=2;
             int LA161_0 = input.LA(1);
 
@@ -45086,9 +45086,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt161) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16265:2: rule__TransitionPoint__HandlerAssignment_0
+                    // InternalRoom.g:16268:2: rule__TransitionPoint__HandlerAssignment_0
                     {
-                    pushFollow(FOLLOW_rule__TransitionPoint__HandlerAssignment_0_in_rule__TransitionPoint__Group__0__Impl33079);
+                    pushFollow(FOLLOW_2);
                     rule__TransitionPoint__HandlerAssignment_0();
 
                     state._fsp--;
@@ -45122,21 +45122,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TransitionPoint__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16275:1: rule__TransitionPoint__Group__1 : rule__TransitionPoint__Group__1__Impl rule__TransitionPoint__Group__2 ;
+    // InternalRoom.g:16278:1: rule__TransitionPoint__Group__1 : rule__TransitionPoint__Group__1__Impl rule__TransitionPoint__Group__2 ;
     public final void rule__TransitionPoint__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16279:1: ( rule__TransitionPoint__Group__1__Impl rule__TransitionPoint__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16280:2: rule__TransitionPoint__Group__1__Impl rule__TransitionPoint__Group__2
+            // InternalRoom.g:16282:1: ( rule__TransitionPoint__Group__1__Impl rule__TransitionPoint__Group__2 )
+            // InternalRoom.g:16283:2: rule__TransitionPoint__Group__1__Impl rule__TransitionPoint__Group__2
             {
-            pushFollow(FOLLOW_rule__TransitionPoint__Group__1__Impl_in_rule__TransitionPoint__Group__133110);
+            pushFollow(FOLLOW_3);
             rule__TransitionPoint__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__TransitionPoint__Group__2_in_rule__TransitionPoint__Group__133113);
+            pushFollow(FOLLOW_2);
             rule__TransitionPoint__Group__2();
 
             state._fsp--;
@@ -45160,20 +45160,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TransitionPoint__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16287:1: rule__TransitionPoint__Group__1__Impl : ( 'TransitionPoint' ) ;
+    // InternalRoom.g:16290:1: rule__TransitionPoint__Group__1__Impl : ( 'TransitionPoint' ) ;
     public final void rule__TransitionPoint__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16291:1: ( ( 'TransitionPoint' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16292:1: ( 'TransitionPoint' )
+            // InternalRoom.g:16294:1: ( ( 'TransitionPoint' ) )
+            // InternalRoom.g:16295:1: ( 'TransitionPoint' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16292:1: ( 'TransitionPoint' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16293:1: 'TransitionPoint'
+            // InternalRoom.g:16295:1: ( 'TransitionPoint' )
+            // InternalRoom.g:16296:1: 'TransitionPoint'
             {
              before(grammarAccess.getTransitionPointAccess().getTransitionPointKeyword_1()); 
-            match(input,100,FOLLOW_100_in_rule__TransitionPoint__Group__1__Impl33141); 
+            match(input,100,FOLLOW_2); 
              after(grammarAccess.getTransitionPointAccess().getTransitionPointKeyword_1()); 
 
             }
@@ -45197,16 +45197,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TransitionPoint__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16306:1: rule__TransitionPoint__Group__2 : rule__TransitionPoint__Group__2__Impl ;
+    // InternalRoom.g:16309:1: rule__TransitionPoint__Group__2 : rule__TransitionPoint__Group__2__Impl ;
     public final void rule__TransitionPoint__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16310:1: ( rule__TransitionPoint__Group__2__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16311:2: rule__TransitionPoint__Group__2__Impl
+            // InternalRoom.g:16313:1: ( rule__TransitionPoint__Group__2__Impl )
+            // InternalRoom.g:16314:2: rule__TransitionPoint__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__TransitionPoint__Group__2__Impl_in_rule__TransitionPoint__Group__233172);
+            pushFollow(FOLLOW_2);
             rule__TransitionPoint__Group__2__Impl();
 
             state._fsp--;
@@ -45230,23 +45230,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TransitionPoint__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16317:1: rule__TransitionPoint__Group__2__Impl : ( ( rule__TransitionPoint__NameAssignment_2 ) ) ;
+    // InternalRoom.g:16320:1: rule__TransitionPoint__Group__2__Impl : ( ( rule__TransitionPoint__NameAssignment_2 ) ) ;
     public final void rule__TransitionPoint__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16321:1: ( ( ( rule__TransitionPoint__NameAssignment_2 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16322:1: ( ( rule__TransitionPoint__NameAssignment_2 ) )
+            // InternalRoom.g:16324:1: ( ( ( rule__TransitionPoint__NameAssignment_2 ) ) )
+            // InternalRoom.g:16325:1: ( ( rule__TransitionPoint__NameAssignment_2 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16322:1: ( ( rule__TransitionPoint__NameAssignment_2 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16323:1: ( rule__TransitionPoint__NameAssignment_2 )
+            // InternalRoom.g:16325:1: ( ( rule__TransitionPoint__NameAssignment_2 ) )
+            // InternalRoom.g:16326:1: ( rule__TransitionPoint__NameAssignment_2 )
             {
              before(grammarAccess.getTransitionPointAccess().getNameAssignment_2()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16324:1: ( rule__TransitionPoint__NameAssignment_2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16324:2: rule__TransitionPoint__NameAssignment_2
+            // InternalRoom.g:16327:1: ( rule__TransitionPoint__NameAssignment_2 )
+            // InternalRoom.g:16327:2: rule__TransitionPoint__NameAssignment_2
             {
-            pushFollow(FOLLOW_rule__TransitionPoint__NameAssignment_2_in_rule__TransitionPoint__Group__2__Impl33199);
+            pushFollow(FOLLOW_2);
             rule__TransitionPoint__NameAssignment_2();
 
             state._fsp--;
@@ -45277,21 +45277,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EntryPoint__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16340:1: rule__EntryPoint__Group__0 : rule__EntryPoint__Group__0__Impl rule__EntryPoint__Group__1 ;
+    // InternalRoom.g:16343:1: rule__EntryPoint__Group__0 : rule__EntryPoint__Group__0__Impl rule__EntryPoint__Group__1 ;
     public final void rule__EntryPoint__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16344:1: ( rule__EntryPoint__Group__0__Impl rule__EntryPoint__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16345:2: rule__EntryPoint__Group__0__Impl rule__EntryPoint__Group__1
+            // InternalRoom.g:16347:1: ( rule__EntryPoint__Group__0__Impl rule__EntryPoint__Group__1 )
+            // InternalRoom.g:16348:2: rule__EntryPoint__Group__0__Impl rule__EntryPoint__Group__1
             {
-            pushFollow(FOLLOW_rule__EntryPoint__Group__0__Impl_in_rule__EntryPoint__Group__033235);
+            pushFollow(FOLLOW_3);
             rule__EntryPoint__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__EntryPoint__Group__1_in_rule__EntryPoint__Group__033238);
+            pushFollow(FOLLOW_2);
             rule__EntryPoint__Group__1();
 
             state._fsp--;
@@ -45315,20 +45315,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EntryPoint__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16352:1: rule__EntryPoint__Group__0__Impl : ( 'EntryPoint' ) ;
+    // InternalRoom.g:16355:1: rule__EntryPoint__Group__0__Impl : ( 'EntryPoint' ) ;
     public final void rule__EntryPoint__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16356:1: ( ( 'EntryPoint' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16357:1: ( 'EntryPoint' )
+            // InternalRoom.g:16359:1: ( ( 'EntryPoint' ) )
+            // InternalRoom.g:16360:1: ( 'EntryPoint' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16357:1: ( 'EntryPoint' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16358:1: 'EntryPoint'
+            // InternalRoom.g:16360:1: ( 'EntryPoint' )
+            // InternalRoom.g:16361:1: 'EntryPoint'
             {
              before(grammarAccess.getEntryPointAccess().getEntryPointKeyword_0()); 
-            match(input,101,FOLLOW_101_in_rule__EntryPoint__Group__0__Impl33266); 
+            match(input,101,FOLLOW_2); 
              after(grammarAccess.getEntryPointAccess().getEntryPointKeyword_0()); 
 
             }
@@ -45352,16 +45352,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EntryPoint__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16371:1: rule__EntryPoint__Group__1 : rule__EntryPoint__Group__1__Impl ;
+    // InternalRoom.g:16374:1: rule__EntryPoint__Group__1 : rule__EntryPoint__Group__1__Impl ;
     public final void rule__EntryPoint__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16375:1: ( rule__EntryPoint__Group__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16376:2: rule__EntryPoint__Group__1__Impl
+            // InternalRoom.g:16378:1: ( rule__EntryPoint__Group__1__Impl )
+            // InternalRoom.g:16379:2: rule__EntryPoint__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__EntryPoint__Group__1__Impl_in_rule__EntryPoint__Group__133297);
+            pushFollow(FOLLOW_2);
             rule__EntryPoint__Group__1__Impl();
 
             state._fsp--;
@@ -45385,23 +45385,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EntryPoint__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16382:1: rule__EntryPoint__Group__1__Impl : ( ( rule__EntryPoint__NameAssignment_1 ) ) ;
+    // InternalRoom.g:16385:1: rule__EntryPoint__Group__1__Impl : ( ( rule__EntryPoint__NameAssignment_1 ) ) ;
     public final void rule__EntryPoint__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16386:1: ( ( ( rule__EntryPoint__NameAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16387:1: ( ( rule__EntryPoint__NameAssignment_1 ) )
+            // InternalRoom.g:16389:1: ( ( ( rule__EntryPoint__NameAssignment_1 ) ) )
+            // InternalRoom.g:16390:1: ( ( rule__EntryPoint__NameAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16387:1: ( ( rule__EntryPoint__NameAssignment_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16388:1: ( rule__EntryPoint__NameAssignment_1 )
+            // InternalRoom.g:16390:1: ( ( rule__EntryPoint__NameAssignment_1 ) )
+            // InternalRoom.g:16391:1: ( rule__EntryPoint__NameAssignment_1 )
             {
              before(grammarAccess.getEntryPointAccess().getNameAssignment_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16389:1: ( rule__EntryPoint__NameAssignment_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16389:2: rule__EntryPoint__NameAssignment_1
+            // InternalRoom.g:16392:1: ( rule__EntryPoint__NameAssignment_1 )
+            // InternalRoom.g:16392:2: rule__EntryPoint__NameAssignment_1
             {
-            pushFollow(FOLLOW_rule__EntryPoint__NameAssignment_1_in_rule__EntryPoint__Group__1__Impl33324);
+            pushFollow(FOLLOW_2);
             rule__EntryPoint__NameAssignment_1();
 
             state._fsp--;
@@ -45432,21 +45432,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ExitPoint__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16403:1: rule__ExitPoint__Group__0 : rule__ExitPoint__Group__0__Impl rule__ExitPoint__Group__1 ;
+    // InternalRoom.g:16406:1: rule__ExitPoint__Group__0 : rule__ExitPoint__Group__0__Impl rule__ExitPoint__Group__1 ;
     public final void rule__ExitPoint__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16407:1: ( rule__ExitPoint__Group__0__Impl rule__ExitPoint__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16408:2: rule__ExitPoint__Group__0__Impl rule__ExitPoint__Group__1
+            // InternalRoom.g:16410:1: ( rule__ExitPoint__Group__0__Impl rule__ExitPoint__Group__1 )
+            // InternalRoom.g:16411:2: rule__ExitPoint__Group__0__Impl rule__ExitPoint__Group__1
             {
-            pushFollow(FOLLOW_rule__ExitPoint__Group__0__Impl_in_rule__ExitPoint__Group__033358);
+            pushFollow(FOLLOW_3);
             rule__ExitPoint__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ExitPoint__Group__1_in_rule__ExitPoint__Group__033361);
+            pushFollow(FOLLOW_2);
             rule__ExitPoint__Group__1();
 
             state._fsp--;
@@ -45470,20 +45470,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ExitPoint__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16415:1: rule__ExitPoint__Group__0__Impl : ( 'ExitPoint' ) ;
+    // InternalRoom.g:16418:1: rule__ExitPoint__Group__0__Impl : ( 'ExitPoint' ) ;
     public final void rule__ExitPoint__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16419:1: ( ( 'ExitPoint' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16420:1: ( 'ExitPoint' )
+            // InternalRoom.g:16422:1: ( ( 'ExitPoint' ) )
+            // InternalRoom.g:16423:1: ( 'ExitPoint' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16420:1: ( 'ExitPoint' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16421:1: 'ExitPoint'
+            // InternalRoom.g:16423:1: ( 'ExitPoint' )
+            // InternalRoom.g:16424:1: 'ExitPoint'
             {
              before(grammarAccess.getExitPointAccess().getExitPointKeyword_0()); 
-            match(input,102,FOLLOW_102_in_rule__ExitPoint__Group__0__Impl33389); 
+            match(input,102,FOLLOW_2); 
              after(grammarAccess.getExitPointAccess().getExitPointKeyword_0()); 
 
             }
@@ -45507,16 +45507,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ExitPoint__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16434:1: rule__ExitPoint__Group__1 : rule__ExitPoint__Group__1__Impl ;
+    // InternalRoom.g:16437:1: rule__ExitPoint__Group__1 : rule__ExitPoint__Group__1__Impl ;
     public final void rule__ExitPoint__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16438:1: ( rule__ExitPoint__Group__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16439:2: rule__ExitPoint__Group__1__Impl
+            // InternalRoom.g:16441:1: ( rule__ExitPoint__Group__1__Impl )
+            // InternalRoom.g:16442:2: rule__ExitPoint__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__ExitPoint__Group__1__Impl_in_rule__ExitPoint__Group__133420);
+            pushFollow(FOLLOW_2);
             rule__ExitPoint__Group__1__Impl();
 
             state._fsp--;
@@ -45540,23 +45540,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ExitPoint__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16445:1: rule__ExitPoint__Group__1__Impl : ( ( rule__ExitPoint__NameAssignment_1 ) ) ;
+    // InternalRoom.g:16448:1: rule__ExitPoint__Group__1__Impl : ( ( rule__ExitPoint__NameAssignment_1 ) ) ;
     public final void rule__ExitPoint__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16449:1: ( ( ( rule__ExitPoint__NameAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16450:1: ( ( rule__ExitPoint__NameAssignment_1 ) )
+            // InternalRoom.g:16452:1: ( ( ( rule__ExitPoint__NameAssignment_1 ) ) )
+            // InternalRoom.g:16453:1: ( ( rule__ExitPoint__NameAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16450:1: ( ( rule__ExitPoint__NameAssignment_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16451:1: ( rule__ExitPoint__NameAssignment_1 )
+            // InternalRoom.g:16453:1: ( ( rule__ExitPoint__NameAssignment_1 ) )
+            // InternalRoom.g:16454:1: ( rule__ExitPoint__NameAssignment_1 )
             {
              before(grammarAccess.getExitPointAccess().getNameAssignment_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16452:1: ( rule__ExitPoint__NameAssignment_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16452:2: rule__ExitPoint__NameAssignment_1
+            // InternalRoom.g:16455:1: ( rule__ExitPoint__NameAssignment_1 )
+            // InternalRoom.g:16455:2: rule__ExitPoint__NameAssignment_1
             {
-            pushFollow(FOLLOW_rule__ExitPoint__NameAssignment_1_in_rule__ExitPoint__Group__1__Impl33447);
+            pushFollow(FOLLOW_2);
             rule__ExitPoint__NameAssignment_1();
 
             state._fsp--;
@@ -45587,21 +45587,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ChoicePoint__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16466:1: rule__ChoicePoint__Group__0 : rule__ChoicePoint__Group__0__Impl rule__ChoicePoint__Group__1 ;
+    // InternalRoom.g:16469:1: rule__ChoicePoint__Group__0 : rule__ChoicePoint__Group__0__Impl rule__ChoicePoint__Group__1 ;
     public final void rule__ChoicePoint__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16470:1: ( rule__ChoicePoint__Group__0__Impl rule__ChoicePoint__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16471:2: rule__ChoicePoint__Group__0__Impl rule__ChoicePoint__Group__1
+            // InternalRoom.g:16473:1: ( rule__ChoicePoint__Group__0__Impl rule__ChoicePoint__Group__1 )
+            // InternalRoom.g:16474:2: rule__ChoicePoint__Group__0__Impl rule__ChoicePoint__Group__1
             {
-            pushFollow(FOLLOW_rule__ChoicePoint__Group__0__Impl_in_rule__ChoicePoint__Group__033481);
+            pushFollow(FOLLOW_3);
             rule__ChoicePoint__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ChoicePoint__Group__1_in_rule__ChoicePoint__Group__033484);
+            pushFollow(FOLLOW_2);
             rule__ChoicePoint__Group__1();
 
             state._fsp--;
@@ -45625,20 +45625,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ChoicePoint__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16478:1: rule__ChoicePoint__Group__0__Impl : ( 'ChoicePoint' ) ;
+    // InternalRoom.g:16481:1: rule__ChoicePoint__Group__0__Impl : ( 'ChoicePoint' ) ;
     public final void rule__ChoicePoint__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16482:1: ( ( 'ChoicePoint' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16483:1: ( 'ChoicePoint' )
+            // InternalRoom.g:16485:1: ( ( 'ChoicePoint' ) )
+            // InternalRoom.g:16486:1: ( 'ChoicePoint' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16483:1: ( 'ChoicePoint' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16484:1: 'ChoicePoint'
+            // InternalRoom.g:16486:1: ( 'ChoicePoint' )
+            // InternalRoom.g:16487:1: 'ChoicePoint'
             {
              before(grammarAccess.getChoicePointAccess().getChoicePointKeyword_0()); 
-            match(input,103,FOLLOW_103_in_rule__ChoicePoint__Group__0__Impl33512); 
+            match(input,103,FOLLOW_2); 
              after(grammarAccess.getChoicePointAccess().getChoicePointKeyword_0()); 
 
             }
@@ -45662,21 +45662,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ChoicePoint__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16497:1: rule__ChoicePoint__Group__1 : rule__ChoicePoint__Group__1__Impl rule__ChoicePoint__Group__2 ;
+    // InternalRoom.g:16500:1: rule__ChoicePoint__Group__1 : rule__ChoicePoint__Group__1__Impl rule__ChoicePoint__Group__2 ;
     public final void rule__ChoicePoint__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16501:1: ( rule__ChoicePoint__Group__1__Impl rule__ChoicePoint__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16502:2: rule__ChoicePoint__Group__1__Impl rule__ChoicePoint__Group__2
+            // InternalRoom.g:16504:1: ( rule__ChoicePoint__Group__1__Impl rule__ChoicePoint__Group__2 )
+            // InternalRoom.g:16505:2: rule__ChoicePoint__Group__1__Impl rule__ChoicePoint__Group__2
             {
-            pushFollow(FOLLOW_rule__ChoicePoint__Group__1__Impl_in_rule__ChoicePoint__Group__133543);
+            pushFollow(FOLLOW_14);
             rule__ChoicePoint__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ChoicePoint__Group__2_in_rule__ChoicePoint__Group__133546);
+            pushFollow(FOLLOW_2);
             rule__ChoicePoint__Group__2();
 
             state._fsp--;
@@ -45700,23 +45700,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ChoicePoint__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16509:1: rule__ChoicePoint__Group__1__Impl : ( ( rule__ChoicePoint__NameAssignment_1 ) ) ;
+    // InternalRoom.g:16512:1: rule__ChoicePoint__Group__1__Impl : ( ( rule__ChoicePoint__NameAssignment_1 ) ) ;
     public final void rule__ChoicePoint__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16513:1: ( ( ( rule__ChoicePoint__NameAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16514:1: ( ( rule__ChoicePoint__NameAssignment_1 ) )
+            // InternalRoom.g:16516:1: ( ( ( rule__ChoicePoint__NameAssignment_1 ) ) )
+            // InternalRoom.g:16517:1: ( ( rule__ChoicePoint__NameAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16514:1: ( ( rule__ChoicePoint__NameAssignment_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16515:1: ( rule__ChoicePoint__NameAssignment_1 )
+            // InternalRoom.g:16517:1: ( ( rule__ChoicePoint__NameAssignment_1 ) )
+            // InternalRoom.g:16518:1: ( rule__ChoicePoint__NameAssignment_1 )
             {
              before(grammarAccess.getChoicePointAccess().getNameAssignment_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16516:1: ( rule__ChoicePoint__NameAssignment_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16516:2: rule__ChoicePoint__NameAssignment_1
+            // InternalRoom.g:16519:1: ( rule__ChoicePoint__NameAssignment_1 )
+            // InternalRoom.g:16519:2: rule__ChoicePoint__NameAssignment_1
             {
-            pushFollow(FOLLOW_rule__ChoicePoint__NameAssignment_1_in_rule__ChoicePoint__Group__1__Impl33573);
+            pushFollow(FOLLOW_2);
             rule__ChoicePoint__NameAssignment_1();
 
             state._fsp--;
@@ -45747,16 +45747,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ChoicePoint__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16526:1: rule__ChoicePoint__Group__2 : rule__ChoicePoint__Group__2__Impl ;
+    // InternalRoom.g:16529:1: rule__ChoicePoint__Group__2 : rule__ChoicePoint__Group__2__Impl ;
     public final void rule__ChoicePoint__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16530:1: ( rule__ChoicePoint__Group__2__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16531:2: rule__ChoicePoint__Group__2__Impl
+            // InternalRoom.g:16533:1: ( rule__ChoicePoint__Group__2__Impl )
+            // InternalRoom.g:16534:2: rule__ChoicePoint__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__ChoicePoint__Group__2__Impl_in_rule__ChoicePoint__Group__233603);
+            pushFollow(FOLLOW_2);
             rule__ChoicePoint__Group__2__Impl();
 
             state._fsp--;
@@ -45780,20 +45780,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ChoicePoint__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16537:1: rule__ChoicePoint__Group__2__Impl : ( ( rule__ChoicePoint__DocuAssignment_2 )? ) ;
+    // InternalRoom.g:16540:1: rule__ChoicePoint__Group__2__Impl : ( ( rule__ChoicePoint__DocuAssignment_2 )? ) ;
     public final void rule__ChoicePoint__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16541:1: ( ( ( rule__ChoicePoint__DocuAssignment_2 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16542:1: ( ( rule__ChoicePoint__DocuAssignment_2 )? )
+            // InternalRoom.g:16544:1: ( ( ( rule__ChoicePoint__DocuAssignment_2 )? ) )
+            // InternalRoom.g:16545:1: ( ( rule__ChoicePoint__DocuAssignment_2 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16542:1: ( ( rule__ChoicePoint__DocuAssignment_2 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16543:1: ( rule__ChoicePoint__DocuAssignment_2 )?
+            // InternalRoom.g:16545:1: ( ( rule__ChoicePoint__DocuAssignment_2 )? )
+            // InternalRoom.g:16546:1: ( rule__ChoicePoint__DocuAssignment_2 )?
             {
              before(grammarAccess.getChoicePointAccess().getDocuAssignment_2()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16544:1: ( rule__ChoicePoint__DocuAssignment_2 )?
+            // InternalRoom.g:16547:1: ( rule__ChoicePoint__DocuAssignment_2 )?
             int alt162=2;
             int LA162_0 = input.LA(1);
 
@@ -45802,9 +45802,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt162) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16544:2: rule__ChoicePoint__DocuAssignment_2
+                    // InternalRoom.g:16547:2: rule__ChoicePoint__DocuAssignment_2
                     {
-                    pushFollow(FOLLOW_rule__ChoicePoint__DocuAssignment_2_in_rule__ChoicePoint__Group__2__Impl33630);
+                    pushFollow(FOLLOW_2);
                     rule__ChoicePoint__DocuAssignment_2();
 
                     state._fsp--;
@@ -45838,21 +45838,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16560:1: rule__InitialTransition__Group__0 : rule__InitialTransition__Group__0__Impl rule__InitialTransition__Group__1 ;
+    // InternalRoom.g:16563:1: rule__InitialTransition__Group__0 : rule__InitialTransition__Group__0__Impl rule__InitialTransition__Group__1 ;
     public final void rule__InitialTransition__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16564:1: ( rule__InitialTransition__Group__0__Impl rule__InitialTransition__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16565:2: rule__InitialTransition__Group__0__Impl rule__InitialTransition__Group__1
+            // InternalRoom.g:16567:1: ( rule__InitialTransition__Group__0__Impl rule__InitialTransition__Group__1 )
+            // InternalRoom.g:16568:2: rule__InitialTransition__Group__0__Impl rule__InitialTransition__Group__1
             {
-            pushFollow(FOLLOW_rule__InitialTransition__Group__0__Impl_in_rule__InitialTransition__Group__033667);
+            pushFollow(FOLLOW_83);
             rule__InitialTransition__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__InitialTransition__Group__1_in_rule__InitialTransition__Group__033670);
+            pushFollow(FOLLOW_2);
             rule__InitialTransition__Group__1();
 
             state._fsp--;
@@ -45876,20 +45876,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16572:1: rule__InitialTransition__Group__0__Impl : ( 'Transition' ) ;
+    // InternalRoom.g:16575:1: rule__InitialTransition__Group__0__Impl : ( 'Transition' ) ;
     public final void rule__InitialTransition__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16576:1: ( ( 'Transition' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16577:1: ( 'Transition' )
+            // InternalRoom.g:16579:1: ( ( 'Transition' ) )
+            // InternalRoom.g:16580:1: ( 'Transition' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16577:1: ( 'Transition' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16578:1: 'Transition'
+            // InternalRoom.g:16580:1: ( 'Transition' )
+            // InternalRoom.g:16581:1: 'Transition'
             {
              before(grammarAccess.getInitialTransitionAccess().getTransitionKeyword_0()); 
-            match(input,104,FOLLOW_104_in_rule__InitialTransition__Group__0__Impl33698); 
+            match(input,104,FOLLOW_2); 
              after(grammarAccess.getInitialTransitionAccess().getTransitionKeyword_0()); 
 
             }
@@ -45913,21 +45913,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16591:1: rule__InitialTransition__Group__1 : rule__InitialTransition__Group__1__Impl rule__InitialTransition__Group__2 ;
+    // InternalRoom.g:16594:1: rule__InitialTransition__Group__1 : rule__InitialTransition__Group__1__Impl rule__InitialTransition__Group__2 ;
     public final void rule__InitialTransition__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16595:1: ( rule__InitialTransition__Group__1__Impl rule__InitialTransition__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16596:2: rule__InitialTransition__Group__1__Impl rule__InitialTransition__Group__2
+            // InternalRoom.g:16598:1: ( rule__InitialTransition__Group__1__Impl rule__InitialTransition__Group__2 )
+            // InternalRoom.g:16599:2: rule__InitialTransition__Group__1__Impl rule__InitialTransition__Group__2
             {
-            pushFollow(FOLLOW_rule__InitialTransition__Group__1__Impl_in_rule__InitialTransition__Group__133729);
+            pushFollow(FOLLOW_83);
             rule__InitialTransition__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__InitialTransition__Group__2_in_rule__InitialTransition__Group__133732);
+            pushFollow(FOLLOW_2);
             rule__InitialTransition__Group__2();
 
             state._fsp--;
@@ -45951,20 +45951,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16603:1: rule__InitialTransition__Group__1__Impl : ( ( rule__InitialTransition__NameAssignment_1 )? ) ;
+    // InternalRoom.g:16606:1: rule__InitialTransition__Group__1__Impl : ( ( rule__InitialTransition__NameAssignment_1 )? ) ;
     public final void rule__InitialTransition__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16607:1: ( ( ( rule__InitialTransition__NameAssignment_1 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16608:1: ( ( rule__InitialTransition__NameAssignment_1 )? )
+            // InternalRoom.g:16610:1: ( ( ( rule__InitialTransition__NameAssignment_1 )? ) )
+            // InternalRoom.g:16611:1: ( ( rule__InitialTransition__NameAssignment_1 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16608:1: ( ( rule__InitialTransition__NameAssignment_1 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16609:1: ( rule__InitialTransition__NameAssignment_1 )?
+            // InternalRoom.g:16611:1: ( ( rule__InitialTransition__NameAssignment_1 )? )
+            // InternalRoom.g:16612:1: ( rule__InitialTransition__NameAssignment_1 )?
             {
              before(grammarAccess.getInitialTransitionAccess().getNameAssignment_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16610:1: ( rule__InitialTransition__NameAssignment_1 )?
+            // InternalRoom.g:16613:1: ( rule__InitialTransition__NameAssignment_1 )?
             int alt163=2;
             int LA163_0 = input.LA(1);
 
@@ -45973,9 +45973,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt163) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16610:2: rule__InitialTransition__NameAssignment_1
+                    // InternalRoom.g:16613:2: rule__InitialTransition__NameAssignment_1
                     {
-                    pushFollow(FOLLOW_rule__InitialTransition__NameAssignment_1_in_rule__InitialTransition__Group__1__Impl33759);
+                    pushFollow(FOLLOW_2);
                     rule__InitialTransition__NameAssignment_1();
 
                     state._fsp--;
@@ -46009,21 +46009,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16620:1: rule__InitialTransition__Group__2 : rule__InitialTransition__Group__2__Impl rule__InitialTransition__Group__3 ;
+    // InternalRoom.g:16623:1: rule__InitialTransition__Group__2 : rule__InitialTransition__Group__2__Impl rule__InitialTransition__Group__3 ;
     public final void rule__InitialTransition__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16624:1: ( rule__InitialTransition__Group__2__Impl rule__InitialTransition__Group__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16625:2: rule__InitialTransition__Group__2__Impl rule__InitialTransition__Group__3
+            // InternalRoom.g:16627:1: ( rule__InitialTransition__Group__2__Impl rule__InitialTransition__Group__3 )
+            // InternalRoom.g:16628:2: rule__InitialTransition__Group__2__Impl rule__InitialTransition__Group__3
             {
-            pushFollow(FOLLOW_rule__InitialTransition__Group__2__Impl_in_rule__InitialTransition__Group__233790);
+            pushFollow(FOLLOW_84);
             rule__InitialTransition__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__InitialTransition__Group__3_in_rule__InitialTransition__Group__233793);
+            pushFollow(FOLLOW_2);
             rule__InitialTransition__Group__3();
 
             state._fsp--;
@@ -46047,20 +46047,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16632:1: rule__InitialTransition__Group__2__Impl : ( ':' ) ;
+    // InternalRoom.g:16635:1: rule__InitialTransition__Group__2__Impl : ( ':' ) ;
     public final void rule__InitialTransition__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16636:1: ( ( ':' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16637:1: ( ':' )
+            // InternalRoom.g:16639:1: ( ( ':' ) )
+            // InternalRoom.g:16640:1: ( ':' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16637:1: ( ':' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16638:1: ':'
+            // InternalRoom.g:16640:1: ( ':' )
+            // InternalRoom.g:16641:1: ':'
             {
              before(grammarAccess.getInitialTransitionAccess().getColonKeyword_2()); 
-            match(input,43,FOLLOW_43_in_rule__InitialTransition__Group__2__Impl33821); 
+            match(input,43,FOLLOW_2); 
              after(grammarAccess.getInitialTransitionAccess().getColonKeyword_2()); 
 
             }
@@ -46084,21 +46084,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__Group__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16651:1: rule__InitialTransition__Group__3 : rule__InitialTransition__Group__3__Impl rule__InitialTransition__Group__4 ;
+    // InternalRoom.g:16654:1: rule__InitialTransition__Group__3 : rule__InitialTransition__Group__3__Impl rule__InitialTransition__Group__4 ;
     public final void rule__InitialTransition__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16655:1: ( rule__InitialTransition__Group__3__Impl rule__InitialTransition__Group__4 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16656:2: rule__InitialTransition__Group__3__Impl rule__InitialTransition__Group__4
+            // InternalRoom.g:16658:1: ( rule__InitialTransition__Group__3__Impl rule__InitialTransition__Group__4 )
+            // InternalRoom.g:16659:2: rule__InitialTransition__Group__3__Impl rule__InitialTransition__Group__4
             {
-            pushFollow(FOLLOW_rule__InitialTransition__Group__3__Impl_in_rule__InitialTransition__Group__333852);
+            pushFollow(FOLLOW_11);
             rule__InitialTransition__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__InitialTransition__Group__4_in_rule__InitialTransition__Group__333855);
+            pushFollow(FOLLOW_2);
             rule__InitialTransition__Group__4();
 
             state._fsp--;
@@ -46122,20 +46122,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__Group__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16663:1: rule__InitialTransition__Group__3__Impl : ( 'initial' ) ;
+    // InternalRoom.g:16666:1: rule__InitialTransition__Group__3__Impl : ( 'initial' ) ;
     public final void rule__InitialTransition__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16667:1: ( ( 'initial' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16668:1: ( 'initial' )
+            // InternalRoom.g:16670:1: ( ( 'initial' ) )
+            // InternalRoom.g:16671:1: ( 'initial' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16668:1: ( 'initial' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16669:1: 'initial'
+            // InternalRoom.g:16671:1: ( 'initial' )
+            // InternalRoom.g:16672:1: 'initial'
             {
              before(grammarAccess.getInitialTransitionAccess().getInitialKeyword_3()); 
-            match(input,105,FOLLOW_105_in_rule__InitialTransition__Group__3__Impl33883); 
+            match(input,105,FOLLOW_2); 
              after(grammarAccess.getInitialTransitionAccess().getInitialKeyword_3()); 
 
             }
@@ -46159,21 +46159,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__Group__4"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16682:1: rule__InitialTransition__Group__4 : rule__InitialTransition__Group__4__Impl rule__InitialTransition__Group__5 ;
+    // InternalRoom.g:16685:1: rule__InitialTransition__Group__4 : rule__InitialTransition__Group__4__Impl rule__InitialTransition__Group__5 ;
     public final void rule__InitialTransition__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16686:1: ( rule__InitialTransition__Group__4__Impl rule__InitialTransition__Group__5 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16687:2: rule__InitialTransition__Group__4__Impl rule__InitialTransition__Group__5
+            // InternalRoom.g:16689:1: ( rule__InitialTransition__Group__4__Impl rule__InitialTransition__Group__5 )
+            // InternalRoom.g:16690:2: rule__InitialTransition__Group__4__Impl rule__InitialTransition__Group__5
             {
-            pushFollow(FOLLOW_rule__InitialTransition__Group__4__Impl_in_rule__InitialTransition__Group__433914);
+            pushFollow(FOLLOW_85);
             rule__InitialTransition__Group__4__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__InitialTransition__Group__5_in_rule__InitialTransition__Group__433917);
+            pushFollow(FOLLOW_2);
             rule__InitialTransition__Group__5();
 
             state._fsp--;
@@ -46197,20 +46197,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__Group__4__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16694:1: rule__InitialTransition__Group__4__Impl : ( '->' ) ;
+    // InternalRoom.g:16697:1: rule__InitialTransition__Group__4__Impl : ( '->' ) ;
     public final void rule__InitialTransition__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16698:1: ( ( '->' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16699:1: ( '->' )
+            // InternalRoom.g:16701:1: ( ( '->' ) )
+            // InternalRoom.g:16702:1: ( '->' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16699:1: ( '->' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16700:1: '->'
+            // InternalRoom.g:16702:1: ( '->' )
+            // InternalRoom.g:16703:1: '->'
             {
              before(grammarAccess.getInitialTransitionAccess().getHyphenMinusGreaterThanSignKeyword_4()); 
-            match(input,45,FOLLOW_45_in_rule__InitialTransition__Group__4__Impl33945); 
+            match(input,45,FOLLOW_2); 
              after(grammarAccess.getInitialTransitionAccess().getHyphenMinusGreaterThanSignKeyword_4()); 
 
             }
@@ -46234,21 +46234,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__Group__5"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16713:1: rule__InitialTransition__Group__5 : rule__InitialTransition__Group__5__Impl rule__InitialTransition__Group__6 ;
+    // InternalRoom.g:16716:1: rule__InitialTransition__Group__5 : rule__InitialTransition__Group__5__Impl rule__InitialTransition__Group__6 ;
     public final void rule__InitialTransition__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16717:1: ( rule__InitialTransition__Group__5__Impl rule__InitialTransition__Group__6 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16718:2: rule__InitialTransition__Group__5__Impl rule__InitialTransition__Group__6
+            // InternalRoom.g:16720:1: ( rule__InitialTransition__Group__5__Impl rule__InitialTransition__Group__6 )
+            // InternalRoom.g:16721:2: rule__InitialTransition__Group__5__Impl rule__InitialTransition__Group__6
             {
-            pushFollow(FOLLOW_rule__InitialTransition__Group__5__Impl_in_rule__InitialTransition__Group__533976);
+            pushFollow(FOLLOW_4);
             rule__InitialTransition__Group__5__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__InitialTransition__Group__6_in_rule__InitialTransition__Group__533979);
+            pushFollow(FOLLOW_2);
             rule__InitialTransition__Group__6();
 
             state._fsp--;
@@ -46272,23 +46272,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__Group__5__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16725:1: rule__InitialTransition__Group__5__Impl : ( ( rule__InitialTransition__ToAssignment_5 ) ) ;
+    // InternalRoom.g:16728:1: rule__InitialTransition__Group__5__Impl : ( ( rule__InitialTransition__ToAssignment_5 ) ) ;
     public final void rule__InitialTransition__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16729:1: ( ( ( rule__InitialTransition__ToAssignment_5 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16730:1: ( ( rule__InitialTransition__ToAssignment_5 ) )
+            // InternalRoom.g:16732:1: ( ( ( rule__InitialTransition__ToAssignment_5 ) ) )
+            // InternalRoom.g:16733:1: ( ( rule__InitialTransition__ToAssignment_5 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16730:1: ( ( rule__InitialTransition__ToAssignment_5 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16731:1: ( rule__InitialTransition__ToAssignment_5 )
+            // InternalRoom.g:16733:1: ( ( rule__InitialTransition__ToAssignment_5 ) )
+            // InternalRoom.g:16734:1: ( rule__InitialTransition__ToAssignment_5 )
             {
              before(grammarAccess.getInitialTransitionAccess().getToAssignment_5()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16732:1: ( rule__InitialTransition__ToAssignment_5 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16732:2: rule__InitialTransition__ToAssignment_5
+            // InternalRoom.g:16735:1: ( rule__InitialTransition__ToAssignment_5 )
+            // InternalRoom.g:16735:2: rule__InitialTransition__ToAssignment_5
             {
-            pushFollow(FOLLOW_rule__InitialTransition__ToAssignment_5_in_rule__InitialTransition__Group__5__Impl34006);
+            pushFollow(FOLLOW_2);
             rule__InitialTransition__ToAssignment_5();
 
             state._fsp--;
@@ -46319,21 +46319,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__Group__6"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16742:1: rule__InitialTransition__Group__6 : rule__InitialTransition__Group__6__Impl rule__InitialTransition__Group__7 ;
+    // InternalRoom.g:16745:1: rule__InitialTransition__Group__6 : rule__InitialTransition__Group__6__Impl rule__InitialTransition__Group__7 ;
     public final void rule__InitialTransition__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16746:1: ( rule__InitialTransition__Group__6__Impl rule__InitialTransition__Group__7 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16747:2: rule__InitialTransition__Group__6__Impl rule__InitialTransition__Group__7
+            // InternalRoom.g:16749:1: ( rule__InitialTransition__Group__6__Impl rule__InitialTransition__Group__7 )
+            // InternalRoom.g:16750:2: rule__InitialTransition__Group__6__Impl rule__InitialTransition__Group__7
             {
-            pushFollow(FOLLOW_rule__InitialTransition__Group__6__Impl_in_rule__InitialTransition__Group__634036);
+            pushFollow(FOLLOW_4);
             rule__InitialTransition__Group__6__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__InitialTransition__Group__7_in_rule__InitialTransition__Group__634039);
+            pushFollow(FOLLOW_2);
             rule__InitialTransition__Group__7();
 
             state._fsp--;
@@ -46357,20 +46357,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__Group__6__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16754:1: rule__InitialTransition__Group__6__Impl : ( ( rule__InitialTransition__DocuAssignment_6 )? ) ;
+    // InternalRoom.g:16757:1: rule__InitialTransition__Group__6__Impl : ( ( rule__InitialTransition__DocuAssignment_6 )? ) ;
     public final void rule__InitialTransition__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16758:1: ( ( ( rule__InitialTransition__DocuAssignment_6 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16759:1: ( ( rule__InitialTransition__DocuAssignment_6 )? )
+            // InternalRoom.g:16761:1: ( ( ( rule__InitialTransition__DocuAssignment_6 )? ) )
+            // InternalRoom.g:16762:1: ( ( rule__InitialTransition__DocuAssignment_6 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16759:1: ( ( rule__InitialTransition__DocuAssignment_6 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16760:1: ( rule__InitialTransition__DocuAssignment_6 )?
+            // InternalRoom.g:16762:1: ( ( rule__InitialTransition__DocuAssignment_6 )? )
+            // InternalRoom.g:16763:1: ( rule__InitialTransition__DocuAssignment_6 )?
             {
              before(grammarAccess.getInitialTransitionAccess().getDocuAssignment_6()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16761:1: ( rule__InitialTransition__DocuAssignment_6 )?
+            // InternalRoom.g:16764:1: ( rule__InitialTransition__DocuAssignment_6 )?
             int alt164=2;
             int LA164_0 = input.LA(1);
 
@@ -46379,9 +46379,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt164) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16761:2: rule__InitialTransition__DocuAssignment_6
+                    // InternalRoom.g:16764:2: rule__InitialTransition__DocuAssignment_6
                     {
-                    pushFollow(FOLLOW_rule__InitialTransition__DocuAssignment_6_in_rule__InitialTransition__Group__6__Impl34066);
+                    pushFollow(FOLLOW_2);
                     rule__InitialTransition__DocuAssignment_6();
 
                     state._fsp--;
@@ -46415,16 +46415,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__Group__7"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16771:1: rule__InitialTransition__Group__7 : rule__InitialTransition__Group__7__Impl ;
+    // InternalRoom.g:16774:1: rule__InitialTransition__Group__7 : rule__InitialTransition__Group__7__Impl ;
     public final void rule__InitialTransition__Group__7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16775:1: ( rule__InitialTransition__Group__7__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16776:2: rule__InitialTransition__Group__7__Impl
+            // InternalRoom.g:16778:1: ( rule__InitialTransition__Group__7__Impl )
+            // InternalRoom.g:16779:2: rule__InitialTransition__Group__7__Impl
             {
-            pushFollow(FOLLOW_rule__InitialTransition__Group__7__Impl_in_rule__InitialTransition__Group__734097);
+            pushFollow(FOLLOW_2);
             rule__InitialTransition__Group__7__Impl();
 
             state._fsp--;
@@ -46448,20 +46448,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__Group__7__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16782:1: rule__InitialTransition__Group__7__Impl : ( ( rule__InitialTransition__Group_7__0 )? ) ;
+    // InternalRoom.g:16785:1: rule__InitialTransition__Group__7__Impl : ( ( rule__InitialTransition__Group_7__0 )? ) ;
     public final void rule__InitialTransition__Group__7__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16786:1: ( ( ( rule__InitialTransition__Group_7__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16787:1: ( ( rule__InitialTransition__Group_7__0 )? )
+            // InternalRoom.g:16789:1: ( ( ( rule__InitialTransition__Group_7__0 )? ) )
+            // InternalRoom.g:16790:1: ( ( rule__InitialTransition__Group_7__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16787:1: ( ( rule__InitialTransition__Group_7__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16788:1: ( rule__InitialTransition__Group_7__0 )?
+            // InternalRoom.g:16790:1: ( ( rule__InitialTransition__Group_7__0 )? )
+            // InternalRoom.g:16791:1: ( rule__InitialTransition__Group_7__0 )?
             {
              before(grammarAccess.getInitialTransitionAccess().getGroup_7()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16789:1: ( rule__InitialTransition__Group_7__0 )?
+            // InternalRoom.g:16792:1: ( rule__InitialTransition__Group_7__0 )?
             int alt165=2;
             int LA165_0 = input.LA(1);
 
@@ -46470,9 +46470,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt165) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16789:2: rule__InitialTransition__Group_7__0
+                    // InternalRoom.g:16792:2: rule__InitialTransition__Group_7__0
                     {
-                    pushFollow(FOLLOW_rule__InitialTransition__Group_7__0_in_rule__InitialTransition__Group__7__Impl34124);
+                    pushFollow(FOLLOW_2);
                     rule__InitialTransition__Group_7__0();
 
                     state._fsp--;
@@ -46506,21 +46506,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__Group_7__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16815:1: rule__InitialTransition__Group_7__0 : rule__InitialTransition__Group_7__0__Impl rule__InitialTransition__Group_7__1 ;
+    // InternalRoom.g:16818:1: rule__InitialTransition__Group_7__0 : rule__InitialTransition__Group_7__0__Impl rule__InitialTransition__Group_7__1 ;
     public final void rule__InitialTransition__Group_7__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16819:1: ( rule__InitialTransition__Group_7__0__Impl rule__InitialTransition__Group_7__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16820:2: rule__InitialTransition__Group_7__0__Impl rule__InitialTransition__Group_7__1
+            // InternalRoom.g:16822:1: ( rule__InitialTransition__Group_7__0__Impl rule__InitialTransition__Group_7__1 )
+            // InternalRoom.g:16823:2: rule__InitialTransition__Group_7__0__Impl rule__InitialTransition__Group_7__1
             {
-            pushFollow(FOLLOW_rule__InitialTransition__Group_7__0__Impl_in_rule__InitialTransition__Group_7__034171);
+            pushFollow(FOLLOW_86);
             rule__InitialTransition__Group_7__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__InitialTransition__Group_7__1_in_rule__InitialTransition__Group_7__034174);
+            pushFollow(FOLLOW_2);
             rule__InitialTransition__Group_7__1();
 
             state._fsp--;
@@ -46544,20 +46544,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__Group_7__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16827:1: rule__InitialTransition__Group_7__0__Impl : ( '{' ) ;
+    // InternalRoom.g:16830:1: rule__InitialTransition__Group_7__0__Impl : ( '{' ) ;
     public final void rule__InitialTransition__Group_7__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16831:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16832:1: ( '{' )
+            // InternalRoom.g:16834:1: ( ( '{' ) )
+            // InternalRoom.g:16835:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16832:1: ( '{' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16833:1: '{'
+            // InternalRoom.g:16835:1: ( '{' )
+            // InternalRoom.g:16836:1: '{'
             {
              before(grammarAccess.getInitialTransitionAccess().getLeftCurlyBracketKeyword_7_0()); 
-            match(input,41,FOLLOW_41_in_rule__InitialTransition__Group_7__0__Impl34202); 
+            match(input,41,FOLLOW_2); 
              after(grammarAccess.getInitialTransitionAccess().getLeftCurlyBracketKeyword_7_0()); 
 
             }
@@ -46581,21 +46581,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__Group_7__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16846:1: rule__InitialTransition__Group_7__1 : rule__InitialTransition__Group_7__1__Impl rule__InitialTransition__Group_7__2 ;
+    // InternalRoom.g:16849:1: rule__InitialTransition__Group_7__1 : rule__InitialTransition__Group_7__1__Impl rule__InitialTransition__Group_7__2 ;
     public final void rule__InitialTransition__Group_7__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16850:1: ( rule__InitialTransition__Group_7__1__Impl rule__InitialTransition__Group_7__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16851:2: rule__InitialTransition__Group_7__1__Impl rule__InitialTransition__Group_7__2
+            // InternalRoom.g:16853:1: ( rule__InitialTransition__Group_7__1__Impl rule__InitialTransition__Group_7__2 )
+            // InternalRoom.g:16854:2: rule__InitialTransition__Group_7__1__Impl rule__InitialTransition__Group_7__2
             {
-            pushFollow(FOLLOW_rule__InitialTransition__Group_7__1__Impl_in_rule__InitialTransition__Group_7__134233);
+            pushFollow(FOLLOW_86);
             rule__InitialTransition__Group_7__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__InitialTransition__Group_7__2_in_rule__InitialTransition__Group_7__134236);
+            pushFollow(FOLLOW_2);
             rule__InitialTransition__Group_7__2();
 
             state._fsp--;
@@ -46619,20 +46619,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__Group_7__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16858:1: rule__InitialTransition__Group_7__1__Impl : ( ( rule__InitialTransition__Group_7_1__0 )? ) ;
+    // InternalRoom.g:16861:1: rule__InitialTransition__Group_7__1__Impl : ( ( rule__InitialTransition__Group_7_1__0 )? ) ;
     public final void rule__InitialTransition__Group_7__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16862:1: ( ( ( rule__InitialTransition__Group_7_1__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16863:1: ( ( rule__InitialTransition__Group_7_1__0 )? )
+            // InternalRoom.g:16865:1: ( ( ( rule__InitialTransition__Group_7_1__0 )? ) )
+            // InternalRoom.g:16866:1: ( ( rule__InitialTransition__Group_7_1__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16863:1: ( ( rule__InitialTransition__Group_7_1__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16864:1: ( rule__InitialTransition__Group_7_1__0 )?
+            // InternalRoom.g:16866:1: ( ( rule__InitialTransition__Group_7_1__0 )? )
+            // InternalRoom.g:16867:1: ( rule__InitialTransition__Group_7_1__0 )?
             {
              before(grammarAccess.getInitialTransitionAccess().getGroup_7_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16865:1: ( rule__InitialTransition__Group_7_1__0 )?
+            // InternalRoom.g:16868:1: ( rule__InitialTransition__Group_7_1__0 )?
             int alt166=2;
             int LA166_0 = input.LA(1);
 
@@ -46641,9 +46641,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt166) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16865:2: rule__InitialTransition__Group_7_1__0
+                    // InternalRoom.g:16868:2: rule__InitialTransition__Group_7_1__0
                     {
-                    pushFollow(FOLLOW_rule__InitialTransition__Group_7_1__0_in_rule__InitialTransition__Group_7__1__Impl34263);
+                    pushFollow(FOLLOW_2);
                     rule__InitialTransition__Group_7_1__0();
 
                     state._fsp--;
@@ -46677,16 +46677,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__Group_7__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16875:1: rule__InitialTransition__Group_7__2 : rule__InitialTransition__Group_7__2__Impl ;
+    // InternalRoom.g:16878:1: rule__InitialTransition__Group_7__2 : rule__InitialTransition__Group_7__2__Impl ;
     public final void rule__InitialTransition__Group_7__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16879:1: ( rule__InitialTransition__Group_7__2__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16880:2: rule__InitialTransition__Group_7__2__Impl
+            // InternalRoom.g:16882:1: ( rule__InitialTransition__Group_7__2__Impl )
+            // InternalRoom.g:16883:2: rule__InitialTransition__Group_7__2__Impl
             {
-            pushFollow(FOLLOW_rule__InitialTransition__Group_7__2__Impl_in_rule__InitialTransition__Group_7__234294);
+            pushFollow(FOLLOW_2);
             rule__InitialTransition__Group_7__2__Impl();
 
             state._fsp--;
@@ -46710,20 +46710,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__Group_7__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16886:1: rule__InitialTransition__Group_7__2__Impl : ( '}' ) ;
+    // InternalRoom.g:16889:1: rule__InitialTransition__Group_7__2__Impl : ( '}' ) ;
     public final void rule__InitialTransition__Group_7__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16890:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16891:1: ( '}' )
+            // InternalRoom.g:16893:1: ( ( '}' ) )
+            // InternalRoom.g:16894:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16891:1: ( '}' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16892:1: '}'
+            // InternalRoom.g:16894:1: ( '}' )
+            // InternalRoom.g:16895:1: '}'
             {
              before(grammarAccess.getInitialTransitionAccess().getRightCurlyBracketKeyword_7_2()); 
-            match(input,42,FOLLOW_42_in_rule__InitialTransition__Group_7__2__Impl34322); 
+            match(input,42,FOLLOW_2); 
              after(grammarAccess.getInitialTransitionAccess().getRightCurlyBracketKeyword_7_2()); 
 
             }
@@ -46747,21 +46747,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__Group_7_1__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16911:1: rule__InitialTransition__Group_7_1__0 : rule__InitialTransition__Group_7_1__0__Impl rule__InitialTransition__Group_7_1__1 ;
+    // InternalRoom.g:16914:1: rule__InitialTransition__Group_7_1__0 : rule__InitialTransition__Group_7_1__0__Impl rule__InitialTransition__Group_7_1__1 ;
     public final void rule__InitialTransition__Group_7_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16915:1: ( rule__InitialTransition__Group_7_1__0__Impl rule__InitialTransition__Group_7_1__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16916:2: rule__InitialTransition__Group_7_1__0__Impl rule__InitialTransition__Group_7_1__1
+            // InternalRoom.g:16918:1: ( rule__InitialTransition__Group_7_1__0__Impl rule__InitialTransition__Group_7_1__1 )
+            // InternalRoom.g:16919:2: rule__InitialTransition__Group_7_1__0__Impl rule__InitialTransition__Group_7_1__1
             {
-            pushFollow(FOLLOW_rule__InitialTransition__Group_7_1__0__Impl_in_rule__InitialTransition__Group_7_1__034359);
+            pushFollow(FOLLOW_27);
             rule__InitialTransition__Group_7_1__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__InitialTransition__Group_7_1__1_in_rule__InitialTransition__Group_7_1__034362);
+            pushFollow(FOLLOW_2);
             rule__InitialTransition__Group_7_1__1();
 
             state._fsp--;
@@ -46785,20 +46785,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__Group_7_1__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16923:1: rule__InitialTransition__Group_7_1__0__Impl : ( 'action' ) ;
+    // InternalRoom.g:16926:1: rule__InitialTransition__Group_7_1__0__Impl : ( 'action' ) ;
     public final void rule__InitialTransition__Group_7_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16927:1: ( ( 'action' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16928:1: ( 'action' )
+            // InternalRoom.g:16930:1: ( ( 'action' ) )
+            // InternalRoom.g:16931:1: ( 'action' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16928:1: ( 'action' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16929:1: 'action'
+            // InternalRoom.g:16931:1: ( 'action' )
+            // InternalRoom.g:16932:1: 'action'
             {
              before(grammarAccess.getInitialTransitionAccess().getActionKeyword_7_1_0()); 
-            match(input,106,FOLLOW_106_in_rule__InitialTransition__Group_7_1__0__Impl34390); 
+            match(input,106,FOLLOW_2); 
              after(grammarAccess.getInitialTransitionAccess().getActionKeyword_7_1_0()); 
 
             }
@@ -46822,16 +46822,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__Group_7_1__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16942:1: rule__InitialTransition__Group_7_1__1 : rule__InitialTransition__Group_7_1__1__Impl ;
+    // InternalRoom.g:16945:1: rule__InitialTransition__Group_7_1__1 : rule__InitialTransition__Group_7_1__1__Impl ;
     public final void rule__InitialTransition__Group_7_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16946:1: ( rule__InitialTransition__Group_7_1__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16947:2: rule__InitialTransition__Group_7_1__1__Impl
+            // InternalRoom.g:16949:1: ( rule__InitialTransition__Group_7_1__1__Impl )
+            // InternalRoom.g:16950:2: rule__InitialTransition__Group_7_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__InitialTransition__Group_7_1__1__Impl_in_rule__InitialTransition__Group_7_1__134421);
+            pushFollow(FOLLOW_2);
             rule__InitialTransition__Group_7_1__1__Impl();
 
             state._fsp--;
@@ -46855,23 +46855,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__Group_7_1__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16953:1: rule__InitialTransition__Group_7_1__1__Impl : ( ( rule__InitialTransition__ActionAssignment_7_1_1 ) ) ;
+    // InternalRoom.g:16956:1: rule__InitialTransition__Group_7_1__1__Impl : ( ( rule__InitialTransition__ActionAssignment_7_1_1 ) ) ;
     public final void rule__InitialTransition__Group_7_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16957:1: ( ( ( rule__InitialTransition__ActionAssignment_7_1_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16958:1: ( ( rule__InitialTransition__ActionAssignment_7_1_1 ) )
+            // InternalRoom.g:16960:1: ( ( ( rule__InitialTransition__ActionAssignment_7_1_1 ) ) )
+            // InternalRoom.g:16961:1: ( ( rule__InitialTransition__ActionAssignment_7_1_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16958:1: ( ( rule__InitialTransition__ActionAssignment_7_1_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16959:1: ( rule__InitialTransition__ActionAssignment_7_1_1 )
+            // InternalRoom.g:16961:1: ( ( rule__InitialTransition__ActionAssignment_7_1_1 ) )
+            // InternalRoom.g:16962:1: ( rule__InitialTransition__ActionAssignment_7_1_1 )
             {
              before(grammarAccess.getInitialTransitionAccess().getActionAssignment_7_1_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16960:1: ( rule__InitialTransition__ActionAssignment_7_1_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16960:2: rule__InitialTransition__ActionAssignment_7_1_1
+            // InternalRoom.g:16963:1: ( rule__InitialTransition__ActionAssignment_7_1_1 )
+            // InternalRoom.g:16963:2: rule__InitialTransition__ActionAssignment_7_1_1
             {
-            pushFollow(FOLLOW_rule__InitialTransition__ActionAssignment_7_1_1_in_rule__InitialTransition__Group_7_1__1__Impl34448);
+            pushFollow(FOLLOW_2);
             rule__InitialTransition__ActionAssignment_7_1_1();
 
             state._fsp--;
@@ -46902,21 +46902,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16974:1: rule__ContinuationTransition__Group__0 : rule__ContinuationTransition__Group__0__Impl rule__ContinuationTransition__Group__1 ;
+    // InternalRoom.g:16977:1: rule__ContinuationTransition__Group__0 : rule__ContinuationTransition__Group__0__Impl rule__ContinuationTransition__Group__1 ;
     public final void rule__ContinuationTransition__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16978:1: ( rule__ContinuationTransition__Group__0__Impl rule__ContinuationTransition__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16979:2: rule__ContinuationTransition__Group__0__Impl rule__ContinuationTransition__Group__1
+            // InternalRoom.g:16981:1: ( rule__ContinuationTransition__Group__0__Impl rule__ContinuationTransition__Group__1 )
+            // InternalRoom.g:16982:2: rule__ContinuationTransition__Group__0__Impl rule__ContinuationTransition__Group__1
             {
-            pushFollow(FOLLOW_rule__ContinuationTransition__Group__0__Impl_in_rule__ContinuationTransition__Group__034482);
+            pushFollow(FOLLOW_83);
             rule__ContinuationTransition__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ContinuationTransition__Group__1_in_rule__ContinuationTransition__Group__034485);
+            pushFollow(FOLLOW_2);
             rule__ContinuationTransition__Group__1();
 
             state._fsp--;
@@ -46940,20 +46940,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16986:1: rule__ContinuationTransition__Group__0__Impl : ( 'Transition' ) ;
+    // InternalRoom.g:16989:1: rule__ContinuationTransition__Group__0__Impl : ( 'Transition' ) ;
     public final void rule__ContinuationTransition__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16990:1: ( ( 'Transition' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16991:1: ( 'Transition' )
+            // InternalRoom.g:16993:1: ( ( 'Transition' ) )
+            // InternalRoom.g:16994:1: ( 'Transition' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16991:1: ( 'Transition' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:16992:1: 'Transition'
+            // InternalRoom.g:16994:1: ( 'Transition' )
+            // InternalRoom.g:16995:1: 'Transition'
             {
              before(grammarAccess.getContinuationTransitionAccess().getTransitionKeyword_0()); 
-            match(input,104,FOLLOW_104_in_rule__ContinuationTransition__Group__0__Impl34513); 
+            match(input,104,FOLLOW_2); 
              after(grammarAccess.getContinuationTransitionAccess().getTransitionKeyword_0()); 
 
             }
@@ -46977,21 +46977,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17005:1: rule__ContinuationTransition__Group__1 : rule__ContinuationTransition__Group__1__Impl rule__ContinuationTransition__Group__2 ;
+    // InternalRoom.g:17008:1: rule__ContinuationTransition__Group__1 : rule__ContinuationTransition__Group__1__Impl rule__ContinuationTransition__Group__2 ;
     public final void rule__ContinuationTransition__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17009:1: ( rule__ContinuationTransition__Group__1__Impl rule__ContinuationTransition__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17010:2: rule__ContinuationTransition__Group__1__Impl rule__ContinuationTransition__Group__2
+            // InternalRoom.g:17012:1: ( rule__ContinuationTransition__Group__1__Impl rule__ContinuationTransition__Group__2 )
+            // InternalRoom.g:17013:2: rule__ContinuationTransition__Group__1__Impl rule__ContinuationTransition__Group__2
             {
-            pushFollow(FOLLOW_rule__ContinuationTransition__Group__1__Impl_in_rule__ContinuationTransition__Group__134544);
+            pushFollow(FOLLOW_83);
             rule__ContinuationTransition__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ContinuationTransition__Group__2_in_rule__ContinuationTransition__Group__134547);
+            pushFollow(FOLLOW_2);
             rule__ContinuationTransition__Group__2();
 
             state._fsp--;
@@ -47015,20 +47015,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17017:1: rule__ContinuationTransition__Group__1__Impl : ( ( rule__ContinuationTransition__NameAssignment_1 )? ) ;
+    // InternalRoom.g:17020:1: rule__ContinuationTransition__Group__1__Impl : ( ( rule__ContinuationTransition__NameAssignment_1 )? ) ;
     public final void rule__ContinuationTransition__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17021:1: ( ( ( rule__ContinuationTransition__NameAssignment_1 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17022:1: ( ( rule__ContinuationTransition__NameAssignment_1 )? )
+            // InternalRoom.g:17024:1: ( ( ( rule__ContinuationTransition__NameAssignment_1 )? ) )
+            // InternalRoom.g:17025:1: ( ( rule__ContinuationTransition__NameAssignment_1 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17022:1: ( ( rule__ContinuationTransition__NameAssignment_1 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17023:1: ( rule__ContinuationTransition__NameAssignment_1 )?
+            // InternalRoom.g:17025:1: ( ( rule__ContinuationTransition__NameAssignment_1 )? )
+            // InternalRoom.g:17026:1: ( rule__ContinuationTransition__NameAssignment_1 )?
             {
              before(grammarAccess.getContinuationTransitionAccess().getNameAssignment_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17024:1: ( rule__ContinuationTransition__NameAssignment_1 )?
+            // InternalRoom.g:17027:1: ( rule__ContinuationTransition__NameAssignment_1 )?
             int alt167=2;
             int LA167_0 = input.LA(1);
 
@@ -47037,9 +47037,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt167) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17024:2: rule__ContinuationTransition__NameAssignment_1
+                    // InternalRoom.g:17027:2: rule__ContinuationTransition__NameAssignment_1
                     {
-                    pushFollow(FOLLOW_rule__ContinuationTransition__NameAssignment_1_in_rule__ContinuationTransition__Group__1__Impl34574);
+                    pushFollow(FOLLOW_2);
                     rule__ContinuationTransition__NameAssignment_1();
 
                     state._fsp--;
@@ -47073,21 +47073,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17034:1: rule__ContinuationTransition__Group__2 : rule__ContinuationTransition__Group__2__Impl rule__ContinuationTransition__Group__3 ;
+    // InternalRoom.g:17037:1: rule__ContinuationTransition__Group__2 : rule__ContinuationTransition__Group__2__Impl rule__ContinuationTransition__Group__3 ;
     public final void rule__ContinuationTransition__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17038:1: ( rule__ContinuationTransition__Group__2__Impl rule__ContinuationTransition__Group__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17039:2: rule__ContinuationTransition__Group__2__Impl rule__ContinuationTransition__Group__3
+            // InternalRoom.g:17041:1: ( rule__ContinuationTransition__Group__2__Impl rule__ContinuationTransition__Group__3 )
+            // InternalRoom.g:17042:2: rule__ContinuationTransition__Group__2__Impl rule__ContinuationTransition__Group__3
             {
-            pushFollow(FOLLOW_rule__ContinuationTransition__Group__2__Impl_in_rule__ContinuationTransition__Group__234605);
+            pushFollow(FOLLOW_85);
             rule__ContinuationTransition__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ContinuationTransition__Group__3_in_rule__ContinuationTransition__Group__234608);
+            pushFollow(FOLLOW_2);
             rule__ContinuationTransition__Group__3();
 
             state._fsp--;
@@ -47111,20 +47111,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17046:1: rule__ContinuationTransition__Group__2__Impl : ( ':' ) ;
+    // InternalRoom.g:17049:1: rule__ContinuationTransition__Group__2__Impl : ( ':' ) ;
     public final void rule__ContinuationTransition__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17050:1: ( ( ':' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17051:1: ( ':' )
+            // InternalRoom.g:17053:1: ( ( ':' ) )
+            // InternalRoom.g:17054:1: ( ':' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17051:1: ( ':' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17052:1: ':'
+            // InternalRoom.g:17054:1: ( ':' )
+            // InternalRoom.g:17055:1: ':'
             {
              before(grammarAccess.getContinuationTransitionAccess().getColonKeyword_2()); 
-            match(input,43,FOLLOW_43_in_rule__ContinuationTransition__Group__2__Impl34636); 
+            match(input,43,FOLLOW_2); 
              after(grammarAccess.getContinuationTransitionAccess().getColonKeyword_2()); 
 
             }
@@ -47148,21 +47148,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__Group__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17065:1: rule__ContinuationTransition__Group__3 : rule__ContinuationTransition__Group__3__Impl rule__ContinuationTransition__Group__4 ;
+    // InternalRoom.g:17068:1: rule__ContinuationTransition__Group__3 : rule__ContinuationTransition__Group__3__Impl rule__ContinuationTransition__Group__4 ;
     public final void rule__ContinuationTransition__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17069:1: ( rule__ContinuationTransition__Group__3__Impl rule__ContinuationTransition__Group__4 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17070:2: rule__ContinuationTransition__Group__3__Impl rule__ContinuationTransition__Group__4
+            // InternalRoom.g:17072:1: ( rule__ContinuationTransition__Group__3__Impl rule__ContinuationTransition__Group__4 )
+            // InternalRoom.g:17073:2: rule__ContinuationTransition__Group__3__Impl rule__ContinuationTransition__Group__4
             {
-            pushFollow(FOLLOW_rule__ContinuationTransition__Group__3__Impl_in_rule__ContinuationTransition__Group__334667);
+            pushFollow(FOLLOW_11);
             rule__ContinuationTransition__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ContinuationTransition__Group__4_in_rule__ContinuationTransition__Group__334670);
+            pushFollow(FOLLOW_2);
             rule__ContinuationTransition__Group__4();
 
             state._fsp--;
@@ -47186,23 +47186,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__Group__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17077:1: rule__ContinuationTransition__Group__3__Impl : ( ( rule__ContinuationTransition__FromAssignment_3 ) ) ;
+    // InternalRoom.g:17080:1: rule__ContinuationTransition__Group__3__Impl : ( ( rule__ContinuationTransition__FromAssignment_3 ) ) ;
     public final void rule__ContinuationTransition__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17081:1: ( ( ( rule__ContinuationTransition__FromAssignment_3 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17082:1: ( ( rule__ContinuationTransition__FromAssignment_3 ) )
+            // InternalRoom.g:17084:1: ( ( ( rule__ContinuationTransition__FromAssignment_3 ) ) )
+            // InternalRoom.g:17085:1: ( ( rule__ContinuationTransition__FromAssignment_3 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17082:1: ( ( rule__ContinuationTransition__FromAssignment_3 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17083:1: ( rule__ContinuationTransition__FromAssignment_3 )
+            // InternalRoom.g:17085:1: ( ( rule__ContinuationTransition__FromAssignment_3 ) )
+            // InternalRoom.g:17086:1: ( rule__ContinuationTransition__FromAssignment_3 )
             {
              before(grammarAccess.getContinuationTransitionAccess().getFromAssignment_3()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17084:1: ( rule__ContinuationTransition__FromAssignment_3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17084:2: rule__ContinuationTransition__FromAssignment_3
+            // InternalRoom.g:17087:1: ( rule__ContinuationTransition__FromAssignment_3 )
+            // InternalRoom.g:17087:2: rule__ContinuationTransition__FromAssignment_3
             {
-            pushFollow(FOLLOW_rule__ContinuationTransition__FromAssignment_3_in_rule__ContinuationTransition__Group__3__Impl34697);
+            pushFollow(FOLLOW_2);
             rule__ContinuationTransition__FromAssignment_3();
 
             state._fsp--;
@@ -47233,21 +47233,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__Group__4"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17094:1: rule__ContinuationTransition__Group__4 : rule__ContinuationTransition__Group__4__Impl rule__ContinuationTransition__Group__5 ;
+    // InternalRoom.g:17097:1: rule__ContinuationTransition__Group__4 : rule__ContinuationTransition__Group__4__Impl rule__ContinuationTransition__Group__5 ;
     public final void rule__ContinuationTransition__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17098:1: ( rule__ContinuationTransition__Group__4__Impl rule__ContinuationTransition__Group__5 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17099:2: rule__ContinuationTransition__Group__4__Impl rule__ContinuationTransition__Group__5
+            // InternalRoom.g:17101:1: ( rule__ContinuationTransition__Group__4__Impl rule__ContinuationTransition__Group__5 )
+            // InternalRoom.g:17102:2: rule__ContinuationTransition__Group__4__Impl rule__ContinuationTransition__Group__5
             {
-            pushFollow(FOLLOW_rule__ContinuationTransition__Group__4__Impl_in_rule__ContinuationTransition__Group__434727);
+            pushFollow(FOLLOW_85);
             rule__ContinuationTransition__Group__4__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ContinuationTransition__Group__5_in_rule__ContinuationTransition__Group__434730);
+            pushFollow(FOLLOW_2);
             rule__ContinuationTransition__Group__5();
 
             state._fsp--;
@@ -47271,20 +47271,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__Group__4__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17106:1: rule__ContinuationTransition__Group__4__Impl : ( '->' ) ;
+    // InternalRoom.g:17109:1: rule__ContinuationTransition__Group__4__Impl : ( '->' ) ;
     public final void rule__ContinuationTransition__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17110:1: ( ( '->' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17111:1: ( '->' )
+            // InternalRoom.g:17113:1: ( ( '->' ) )
+            // InternalRoom.g:17114:1: ( '->' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17111:1: ( '->' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17112:1: '->'
+            // InternalRoom.g:17114:1: ( '->' )
+            // InternalRoom.g:17115:1: '->'
             {
              before(grammarAccess.getContinuationTransitionAccess().getHyphenMinusGreaterThanSignKeyword_4()); 
-            match(input,45,FOLLOW_45_in_rule__ContinuationTransition__Group__4__Impl34758); 
+            match(input,45,FOLLOW_2); 
              after(grammarAccess.getContinuationTransitionAccess().getHyphenMinusGreaterThanSignKeyword_4()); 
 
             }
@@ -47308,21 +47308,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__Group__5"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17125:1: rule__ContinuationTransition__Group__5 : rule__ContinuationTransition__Group__5__Impl rule__ContinuationTransition__Group__6 ;
+    // InternalRoom.g:17128:1: rule__ContinuationTransition__Group__5 : rule__ContinuationTransition__Group__5__Impl rule__ContinuationTransition__Group__6 ;
     public final void rule__ContinuationTransition__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17129:1: ( rule__ContinuationTransition__Group__5__Impl rule__ContinuationTransition__Group__6 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17130:2: rule__ContinuationTransition__Group__5__Impl rule__ContinuationTransition__Group__6
+            // InternalRoom.g:17132:1: ( rule__ContinuationTransition__Group__5__Impl rule__ContinuationTransition__Group__6 )
+            // InternalRoom.g:17133:2: rule__ContinuationTransition__Group__5__Impl rule__ContinuationTransition__Group__6
             {
-            pushFollow(FOLLOW_rule__ContinuationTransition__Group__5__Impl_in_rule__ContinuationTransition__Group__534789);
+            pushFollow(FOLLOW_4);
             rule__ContinuationTransition__Group__5__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ContinuationTransition__Group__6_in_rule__ContinuationTransition__Group__534792);
+            pushFollow(FOLLOW_2);
             rule__ContinuationTransition__Group__6();
 
             state._fsp--;
@@ -47346,23 +47346,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__Group__5__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17137:1: rule__ContinuationTransition__Group__5__Impl : ( ( rule__ContinuationTransition__ToAssignment_5 ) ) ;
+    // InternalRoom.g:17140:1: rule__ContinuationTransition__Group__5__Impl : ( ( rule__ContinuationTransition__ToAssignment_5 ) ) ;
     public final void rule__ContinuationTransition__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17141:1: ( ( ( rule__ContinuationTransition__ToAssignment_5 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17142:1: ( ( rule__ContinuationTransition__ToAssignment_5 ) )
+            // InternalRoom.g:17144:1: ( ( ( rule__ContinuationTransition__ToAssignment_5 ) ) )
+            // InternalRoom.g:17145:1: ( ( rule__ContinuationTransition__ToAssignment_5 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17142:1: ( ( rule__ContinuationTransition__ToAssignment_5 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17143:1: ( rule__ContinuationTransition__ToAssignment_5 )
+            // InternalRoom.g:17145:1: ( ( rule__ContinuationTransition__ToAssignment_5 ) )
+            // InternalRoom.g:17146:1: ( rule__ContinuationTransition__ToAssignment_5 )
             {
              before(grammarAccess.getContinuationTransitionAccess().getToAssignment_5()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17144:1: ( rule__ContinuationTransition__ToAssignment_5 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17144:2: rule__ContinuationTransition__ToAssignment_5
+            // InternalRoom.g:17147:1: ( rule__ContinuationTransition__ToAssignment_5 )
+            // InternalRoom.g:17147:2: rule__ContinuationTransition__ToAssignment_5
             {
-            pushFollow(FOLLOW_rule__ContinuationTransition__ToAssignment_5_in_rule__ContinuationTransition__Group__5__Impl34819);
+            pushFollow(FOLLOW_2);
             rule__ContinuationTransition__ToAssignment_5();
 
             state._fsp--;
@@ -47393,21 +47393,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__Group__6"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17154:1: rule__ContinuationTransition__Group__6 : rule__ContinuationTransition__Group__6__Impl rule__ContinuationTransition__Group__7 ;
+    // InternalRoom.g:17157:1: rule__ContinuationTransition__Group__6 : rule__ContinuationTransition__Group__6__Impl rule__ContinuationTransition__Group__7 ;
     public final void rule__ContinuationTransition__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17158:1: ( rule__ContinuationTransition__Group__6__Impl rule__ContinuationTransition__Group__7 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17159:2: rule__ContinuationTransition__Group__6__Impl rule__ContinuationTransition__Group__7
+            // InternalRoom.g:17161:1: ( rule__ContinuationTransition__Group__6__Impl rule__ContinuationTransition__Group__7 )
+            // InternalRoom.g:17162:2: rule__ContinuationTransition__Group__6__Impl rule__ContinuationTransition__Group__7
             {
-            pushFollow(FOLLOW_rule__ContinuationTransition__Group__6__Impl_in_rule__ContinuationTransition__Group__634849);
+            pushFollow(FOLLOW_4);
             rule__ContinuationTransition__Group__6__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ContinuationTransition__Group__7_in_rule__ContinuationTransition__Group__634852);
+            pushFollow(FOLLOW_2);
             rule__ContinuationTransition__Group__7();
 
             state._fsp--;
@@ -47431,20 +47431,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__Group__6__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17166:1: rule__ContinuationTransition__Group__6__Impl : ( ( rule__ContinuationTransition__DocuAssignment_6 )? ) ;
+    // InternalRoom.g:17169:1: rule__ContinuationTransition__Group__6__Impl : ( ( rule__ContinuationTransition__DocuAssignment_6 )? ) ;
     public final void rule__ContinuationTransition__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17170:1: ( ( ( rule__ContinuationTransition__DocuAssignment_6 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17171:1: ( ( rule__ContinuationTransition__DocuAssignment_6 )? )
+            // InternalRoom.g:17173:1: ( ( ( rule__ContinuationTransition__DocuAssignment_6 )? ) )
+            // InternalRoom.g:17174:1: ( ( rule__ContinuationTransition__DocuAssignment_6 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17171:1: ( ( rule__ContinuationTransition__DocuAssignment_6 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17172:1: ( rule__ContinuationTransition__DocuAssignment_6 )?
+            // InternalRoom.g:17174:1: ( ( rule__ContinuationTransition__DocuAssignment_6 )? )
+            // InternalRoom.g:17175:1: ( rule__ContinuationTransition__DocuAssignment_6 )?
             {
              before(grammarAccess.getContinuationTransitionAccess().getDocuAssignment_6()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17173:1: ( rule__ContinuationTransition__DocuAssignment_6 )?
+            // InternalRoom.g:17176:1: ( rule__ContinuationTransition__DocuAssignment_6 )?
             int alt168=2;
             int LA168_0 = input.LA(1);
 
@@ -47453,9 +47453,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt168) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17173:2: rule__ContinuationTransition__DocuAssignment_6
+                    // InternalRoom.g:17176:2: rule__ContinuationTransition__DocuAssignment_6
                     {
-                    pushFollow(FOLLOW_rule__ContinuationTransition__DocuAssignment_6_in_rule__ContinuationTransition__Group__6__Impl34879);
+                    pushFollow(FOLLOW_2);
                     rule__ContinuationTransition__DocuAssignment_6();
 
                     state._fsp--;
@@ -47489,16 +47489,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__Group__7"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17183:1: rule__ContinuationTransition__Group__7 : rule__ContinuationTransition__Group__7__Impl ;
+    // InternalRoom.g:17186:1: rule__ContinuationTransition__Group__7 : rule__ContinuationTransition__Group__7__Impl ;
     public final void rule__ContinuationTransition__Group__7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17187:1: ( rule__ContinuationTransition__Group__7__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17188:2: rule__ContinuationTransition__Group__7__Impl
+            // InternalRoom.g:17190:1: ( rule__ContinuationTransition__Group__7__Impl )
+            // InternalRoom.g:17191:2: rule__ContinuationTransition__Group__7__Impl
             {
-            pushFollow(FOLLOW_rule__ContinuationTransition__Group__7__Impl_in_rule__ContinuationTransition__Group__734910);
+            pushFollow(FOLLOW_2);
             rule__ContinuationTransition__Group__7__Impl();
 
             state._fsp--;
@@ -47522,20 +47522,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__Group__7__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17194:1: rule__ContinuationTransition__Group__7__Impl : ( ( rule__ContinuationTransition__Group_7__0 )? ) ;
+    // InternalRoom.g:17197:1: rule__ContinuationTransition__Group__7__Impl : ( ( rule__ContinuationTransition__Group_7__0 )? ) ;
     public final void rule__ContinuationTransition__Group__7__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17198:1: ( ( ( rule__ContinuationTransition__Group_7__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17199:1: ( ( rule__ContinuationTransition__Group_7__0 )? )
+            // InternalRoom.g:17201:1: ( ( ( rule__ContinuationTransition__Group_7__0 )? ) )
+            // InternalRoom.g:17202:1: ( ( rule__ContinuationTransition__Group_7__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17199:1: ( ( rule__ContinuationTransition__Group_7__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17200:1: ( rule__ContinuationTransition__Group_7__0 )?
+            // InternalRoom.g:17202:1: ( ( rule__ContinuationTransition__Group_7__0 )? )
+            // InternalRoom.g:17203:1: ( rule__ContinuationTransition__Group_7__0 )?
             {
              before(grammarAccess.getContinuationTransitionAccess().getGroup_7()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17201:1: ( rule__ContinuationTransition__Group_7__0 )?
+            // InternalRoom.g:17204:1: ( rule__ContinuationTransition__Group_7__0 )?
             int alt169=2;
             int LA169_0 = input.LA(1);
 
@@ -47544,9 +47544,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt169) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17201:2: rule__ContinuationTransition__Group_7__0
+                    // InternalRoom.g:17204:2: rule__ContinuationTransition__Group_7__0
                     {
-                    pushFollow(FOLLOW_rule__ContinuationTransition__Group_7__0_in_rule__ContinuationTransition__Group__7__Impl34937);
+                    pushFollow(FOLLOW_2);
                     rule__ContinuationTransition__Group_7__0();
 
                     state._fsp--;
@@ -47580,21 +47580,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__Group_7__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17227:1: rule__ContinuationTransition__Group_7__0 : rule__ContinuationTransition__Group_7__0__Impl rule__ContinuationTransition__Group_7__1 ;
+    // InternalRoom.g:17230:1: rule__ContinuationTransition__Group_7__0 : rule__ContinuationTransition__Group_7__0__Impl rule__ContinuationTransition__Group_7__1 ;
     public final void rule__ContinuationTransition__Group_7__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17231:1: ( rule__ContinuationTransition__Group_7__0__Impl rule__ContinuationTransition__Group_7__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17232:2: rule__ContinuationTransition__Group_7__0__Impl rule__ContinuationTransition__Group_7__1
+            // InternalRoom.g:17234:1: ( rule__ContinuationTransition__Group_7__0__Impl rule__ContinuationTransition__Group_7__1 )
+            // InternalRoom.g:17235:2: rule__ContinuationTransition__Group_7__0__Impl rule__ContinuationTransition__Group_7__1
             {
-            pushFollow(FOLLOW_rule__ContinuationTransition__Group_7__0__Impl_in_rule__ContinuationTransition__Group_7__034984);
+            pushFollow(FOLLOW_86);
             rule__ContinuationTransition__Group_7__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ContinuationTransition__Group_7__1_in_rule__ContinuationTransition__Group_7__034987);
+            pushFollow(FOLLOW_2);
             rule__ContinuationTransition__Group_7__1();
 
             state._fsp--;
@@ -47618,20 +47618,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__Group_7__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17239:1: rule__ContinuationTransition__Group_7__0__Impl : ( '{' ) ;
+    // InternalRoom.g:17242:1: rule__ContinuationTransition__Group_7__0__Impl : ( '{' ) ;
     public final void rule__ContinuationTransition__Group_7__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17243:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17244:1: ( '{' )
+            // InternalRoom.g:17246:1: ( ( '{' ) )
+            // InternalRoom.g:17247:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17244:1: ( '{' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17245:1: '{'
+            // InternalRoom.g:17247:1: ( '{' )
+            // InternalRoom.g:17248:1: '{'
             {
              before(grammarAccess.getContinuationTransitionAccess().getLeftCurlyBracketKeyword_7_0()); 
-            match(input,41,FOLLOW_41_in_rule__ContinuationTransition__Group_7__0__Impl35015); 
+            match(input,41,FOLLOW_2); 
              after(grammarAccess.getContinuationTransitionAccess().getLeftCurlyBracketKeyword_7_0()); 
 
             }
@@ -47655,21 +47655,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__Group_7__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17258:1: rule__ContinuationTransition__Group_7__1 : rule__ContinuationTransition__Group_7__1__Impl rule__ContinuationTransition__Group_7__2 ;
+    // InternalRoom.g:17261:1: rule__ContinuationTransition__Group_7__1 : rule__ContinuationTransition__Group_7__1__Impl rule__ContinuationTransition__Group_7__2 ;
     public final void rule__ContinuationTransition__Group_7__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17262:1: ( rule__ContinuationTransition__Group_7__1__Impl rule__ContinuationTransition__Group_7__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17263:2: rule__ContinuationTransition__Group_7__1__Impl rule__ContinuationTransition__Group_7__2
+            // InternalRoom.g:17265:1: ( rule__ContinuationTransition__Group_7__1__Impl rule__ContinuationTransition__Group_7__2 )
+            // InternalRoom.g:17266:2: rule__ContinuationTransition__Group_7__1__Impl rule__ContinuationTransition__Group_7__2
             {
-            pushFollow(FOLLOW_rule__ContinuationTransition__Group_7__1__Impl_in_rule__ContinuationTransition__Group_7__135046);
+            pushFollow(FOLLOW_86);
             rule__ContinuationTransition__Group_7__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ContinuationTransition__Group_7__2_in_rule__ContinuationTransition__Group_7__135049);
+            pushFollow(FOLLOW_2);
             rule__ContinuationTransition__Group_7__2();
 
             state._fsp--;
@@ -47693,20 +47693,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__Group_7__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17270:1: rule__ContinuationTransition__Group_7__1__Impl : ( ( rule__ContinuationTransition__Group_7_1__0 )? ) ;
+    // InternalRoom.g:17273:1: rule__ContinuationTransition__Group_7__1__Impl : ( ( rule__ContinuationTransition__Group_7_1__0 )? ) ;
     public final void rule__ContinuationTransition__Group_7__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17274:1: ( ( ( rule__ContinuationTransition__Group_7_1__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17275:1: ( ( rule__ContinuationTransition__Group_7_1__0 )? )
+            // InternalRoom.g:17277:1: ( ( ( rule__ContinuationTransition__Group_7_1__0 )? ) )
+            // InternalRoom.g:17278:1: ( ( rule__ContinuationTransition__Group_7_1__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17275:1: ( ( rule__ContinuationTransition__Group_7_1__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17276:1: ( rule__ContinuationTransition__Group_7_1__0 )?
+            // InternalRoom.g:17278:1: ( ( rule__ContinuationTransition__Group_7_1__0 )? )
+            // InternalRoom.g:17279:1: ( rule__ContinuationTransition__Group_7_1__0 )?
             {
              before(grammarAccess.getContinuationTransitionAccess().getGroup_7_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17277:1: ( rule__ContinuationTransition__Group_7_1__0 )?
+            // InternalRoom.g:17280:1: ( rule__ContinuationTransition__Group_7_1__0 )?
             int alt170=2;
             int LA170_0 = input.LA(1);
 
@@ -47715,9 +47715,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt170) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17277:2: rule__ContinuationTransition__Group_7_1__0
+                    // InternalRoom.g:17280:2: rule__ContinuationTransition__Group_7_1__0
                     {
-                    pushFollow(FOLLOW_rule__ContinuationTransition__Group_7_1__0_in_rule__ContinuationTransition__Group_7__1__Impl35076);
+                    pushFollow(FOLLOW_2);
                     rule__ContinuationTransition__Group_7_1__0();
 
                     state._fsp--;
@@ -47751,16 +47751,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__Group_7__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17287:1: rule__ContinuationTransition__Group_7__2 : rule__ContinuationTransition__Group_7__2__Impl ;
+    // InternalRoom.g:17290:1: rule__ContinuationTransition__Group_7__2 : rule__ContinuationTransition__Group_7__2__Impl ;
     public final void rule__ContinuationTransition__Group_7__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17291:1: ( rule__ContinuationTransition__Group_7__2__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17292:2: rule__ContinuationTransition__Group_7__2__Impl
+            // InternalRoom.g:17294:1: ( rule__ContinuationTransition__Group_7__2__Impl )
+            // InternalRoom.g:17295:2: rule__ContinuationTransition__Group_7__2__Impl
             {
-            pushFollow(FOLLOW_rule__ContinuationTransition__Group_7__2__Impl_in_rule__ContinuationTransition__Group_7__235107);
+            pushFollow(FOLLOW_2);
             rule__ContinuationTransition__Group_7__2__Impl();
 
             state._fsp--;
@@ -47784,20 +47784,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__Group_7__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17298:1: rule__ContinuationTransition__Group_7__2__Impl : ( '}' ) ;
+    // InternalRoom.g:17301:1: rule__ContinuationTransition__Group_7__2__Impl : ( '}' ) ;
     public final void rule__ContinuationTransition__Group_7__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17302:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17303:1: ( '}' )
+            // InternalRoom.g:17305:1: ( ( '}' ) )
+            // InternalRoom.g:17306:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17303:1: ( '}' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17304:1: '}'
+            // InternalRoom.g:17306:1: ( '}' )
+            // InternalRoom.g:17307:1: '}'
             {
              before(grammarAccess.getContinuationTransitionAccess().getRightCurlyBracketKeyword_7_2()); 
-            match(input,42,FOLLOW_42_in_rule__ContinuationTransition__Group_7__2__Impl35135); 
+            match(input,42,FOLLOW_2); 
              after(grammarAccess.getContinuationTransitionAccess().getRightCurlyBracketKeyword_7_2()); 
 
             }
@@ -47821,21 +47821,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__Group_7_1__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17323:1: rule__ContinuationTransition__Group_7_1__0 : rule__ContinuationTransition__Group_7_1__0__Impl rule__ContinuationTransition__Group_7_1__1 ;
+    // InternalRoom.g:17326:1: rule__ContinuationTransition__Group_7_1__0 : rule__ContinuationTransition__Group_7_1__0__Impl rule__ContinuationTransition__Group_7_1__1 ;
     public final void rule__ContinuationTransition__Group_7_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17327:1: ( rule__ContinuationTransition__Group_7_1__0__Impl rule__ContinuationTransition__Group_7_1__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17328:2: rule__ContinuationTransition__Group_7_1__0__Impl rule__ContinuationTransition__Group_7_1__1
+            // InternalRoom.g:17330:1: ( rule__ContinuationTransition__Group_7_1__0__Impl rule__ContinuationTransition__Group_7_1__1 )
+            // InternalRoom.g:17331:2: rule__ContinuationTransition__Group_7_1__0__Impl rule__ContinuationTransition__Group_7_1__1
             {
-            pushFollow(FOLLOW_rule__ContinuationTransition__Group_7_1__0__Impl_in_rule__ContinuationTransition__Group_7_1__035172);
+            pushFollow(FOLLOW_27);
             rule__ContinuationTransition__Group_7_1__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ContinuationTransition__Group_7_1__1_in_rule__ContinuationTransition__Group_7_1__035175);
+            pushFollow(FOLLOW_2);
             rule__ContinuationTransition__Group_7_1__1();
 
             state._fsp--;
@@ -47859,20 +47859,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__Group_7_1__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17335:1: rule__ContinuationTransition__Group_7_1__0__Impl : ( 'action' ) ;
+    // InternalRoom.g:17338:1: rule__ContinuationTransition__Group_7_1__0__Impl : ( 'action' ) ;
     public final void rule__ContinuationTransition__Group_7_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17339:1: ( ( 'action' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17340:1: ( 'action' )
+            // InternalRoom.g:17342:1: ( ( 'action' ) )
+            // InternalRoom.g:17343:1: ( 'action' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17340:1: ( 'action' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17341:1: 'action'
+            // InternalRoom.g:17343:1: ( 'action' )
+            // InternalRoom.g:17344:1: 'action'
             {
              before(grammarAccess.getContinuationTransitionAccess().getActionKeyword_7_1_0()); 
-            match(input,106,FOLLOW_106_in_rule__ContinuationTransition__Group_7_1__0__Impl35203); 
+            match(input,106,FOLLOW_2); 
              after(grammarAccess.getContinuationTransitionAccess().getActionKeyword_7_1_0()); 
 
             }
@@ -47896,16 +47896,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__Group_7_1__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17354:1: rule__ContinuationTransition__Group_7_1__1 : rule__ContinuationTransition__Group_7_1__1__Impl ;
+    // InternalRoom.g:17357:1: rule__ContinuationTransition__Group_7_1__1 : rule__ContinuationTransition__Group_7_1__1__Impl ;
     public final void rule__ContinuationTransition__Group_7_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17358:1: ( rule__ContinuationTransition__Group_7_1__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17359:2: rule__ContinuationTransition__Group_7_1__1__Impl
+            // InternalRoom.g:17361:1: ( rule__ContinuationTransition__Group_7_1__1__Impl )
+            // InternalRoom.g:17362:2: rule__ContinuationTransition__Group_7_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__ContinuationTransition__Group_7_1__1__Impl_in_rule__ContinuationTransition__Group_7_1__135234);
+            pushFollow(FOLLOW_2);
             rule__ContinuationTransition__Group_7_1__1__Impl();
 
             state._fsp--;
@@ -47929,23 +47929,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__Group_7_1__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17365:1: rule__ContinuationTransition__Group_7_1__1__Impl : ( ( rule__ContinuationTransition__ActionAssignment_7_1_1 ) ) ;
+    // InternalRoom.g:17368:1: rule__ContinuationTransition__Group_7_1__1__Impl : ( ( rule__ContinuationTransition__ActionAssignment_7_1_1 ) ) ;
     public final void rule__ContinuationTransition__Group_7_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17369:1: ( ( ( rule__ContinuationTransition__ActionAssignment_7_1_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17370:1: ( ( rule__ContinuationTransition__ActionAssignment_7_1_1 ) )
+            // InternalRoom.g:17372:1: ( ( ( rule__ContinuationTransition__ActionAssignment_7_1_1 ) ) )
+            // InternalRoom.g:17373:1: ( ( rule__ContinuationTransition__ActionAssignment_7_1_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17370:1: ( ( rule__ContinuationTransition__ActionAssignment_7_1_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17371:1: ( rule__ContinuationTransition__ActionAssignment_7_1_1 )
+            // InternalRoom.g:17373:1: ( ( rule__ContinuationTransition__ActionAssignment_7_1_1 ) )
+            // InternalRoom.g:17374:1: ( rule__ContinuationTransition__ActionAssignment_7_1_1 )
             {
              before(grammarAccess.getContinuationTransitionAccess().getActionAssignment_7_1_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17372:1: ( rule__ContinuationTransition__ActionAssignment_7_1_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17372:2: rule__ContinuationTransition__ActionAssignment_7_1_1
+            // InternalRoom.g:17375:1: ( rule__ContinuationTransition__ActionAssignment_7_1_1 )
+            // InternalRoom.g:17375:2: rule__ContinuationTransition__ActionAssignment_7_1_1
             {
-            pushFollow(FOLLOW_rule__ContinuationTransition__ActionAssignment_7_1_1_in_rule__ContinuationTransition__Group_7_1__1__Impl35261);
+            pushFollow(FOLLOW_2);
             rule__ContinuationTransition__ActionAssignment_7_1_1();
 
             state._fsp--;
@@ -47976,21 +47976,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17386:1: rule__TriggeredTransition__Group__0 : rule__TriggeredTransition__Group__0__Impl rule__TriggeredTransition__Group__1 ;
+    // InternalRoom.g:17389:1: rule__TriggeredTransition__Group__0 : rule__TriggeredTransition__Group__0__Impl rule__TriggeredTransition__Group__1 ;
     public final void rule__TriggeredTransition__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17390:1: ( rule__TriggeredTransition__Group__0__Impl rule__TriggeredTransition__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17391:2: rule__TriggeredTransition__Group__0__Impl rule__TriggeredTransition__Group__1
+            // InternalRoom.g:17393:1: ( rule__TriggeredTransition__Group__0__Impl rule__TriggeredTransition__Group__1 )
+            // InternalRoom.g:17394:2: rule__TriggeredTransition__Group__0__Impl rule__TriggeredTransition__Group__1
             {
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__0__Impl_in_rule__TriggeredTransition__Group__035295);
+            pushFollow(FOLLOW_83);
             rule__TriggeredTransition__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__1_in_rule__TriggeredTransition__Group__035298);
+            pushFollow(FOLLOW_2);
             rule__TriggeredTransition__Group__1();
 
             state._fsp--;
@@ -48014,20 +48014,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17398:1: rule__TriggeredTransition__Group__0__Impl : ( 'Transition' ) ;
+    // InternalRoom.g:17401:1: rule__TriggeredTransition__Group__0__Impl : ( 'Transition' ) ;
     public final void rule__TriggeredTransition__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17402:1: ( ( 'Transition' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17403:1: ( 'Transition' )
+            // InternalRoom.g:17405:1: ( ( 'Transition' ) )
+            // InternalRoom.g:17406:1: ( 'Transition' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17403:1: ( 'Transition' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17404:1: 'Transition'
+            // InternalRoom.g:17406:1: ( 'Transition' )
+            // InternalRoom.g:17407:1: 'Transition'
             {
              before(grammarAccess.getTriggeredTransitionAccess().getTransitionKeyword_0()); 
-            match(input,104,FOLLOW_104_in_rule__TriggeredTransition__Group__0__Impl35326); 
+            match(input,104,FOLLOW_2); 
              after(grammarAccess.getTriggeredTransitionAccess().getTransitionKeyword_0()); 
 
             }
@@ -48051,21 +48051,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17417:1: rule__TriggeredTransition__Group__1 : rule__TriggeredTransition__Group__1__Impl rule__TriggeredTransition__Group__2 ;
+    // InternalRoom.g:17420:1: rule__TriggeredTransition__Group__1 : rule__TriggeredTransition__Group__1__Impl rule__TriggeredTransition__Group__2 ;
     public final void rule__TriggeredTransition__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17421:1: ( rule__TriggeredTransition__Group__1__Impl rule__TriggeredTransition__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17422:2: rule__TriggeredTransition__Group__1__Impl rule__TriggeredTransition__Group__2
+            // InternalRoom.g:17424:1: ( rule__TriggeredTransition__Group__1__Impl rule__TriggeredTransition__Group__2 )
+            // InternalRoom.g:17425:2: rule__TriggeredTransition__Group__1__Impl rule__TriggeredTransition__Group__2
             {
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__1__Impl_in_rule__TriggeredTransition__Group__135357);
+            pushFollow(FOLLOW_83);
             rule__TriggeredTransition__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__2_in_rule__TriggeredTransition__Group__135360);
+            pushFollow(FOLLOW_2);
             rule__TriggeredTransition__Group__2();
 
             state._fsp--;
@@ -48089,20 +48089,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17429:1: rule__TriggeredTransition__Group__1__Impl : ( ( rule__TriggeredTransition__NameAssignment_1 )? ) ;
+    // InternalRoom.g:17432:1: rule__TriggeredTransition__Group__1__Impl : ( ( rule__TriggeredTransition__NameAssignment_1 )? ) ;
     public final void rule__TriggeredTransition__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17433:1: ( ( ( rule__TriggeredTransition__NameAssignment_1 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17434:1: ( ( rule__TriggeredTransition__NameAssignment_1 )? )
+            // InternalRoom.g:17436:1: ( ( ( rule__TriggeredTransition__NameAssignment_1 )? ) )
+            // InternalRoom.g:17437:1: ( ( rule__TriggeredTransition__NameAssignment_1 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17434:1: ( ( rule__TriggeredTransition__NameAssignment_1 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17435:1: ( rule__TriggeredTransition__NameAssignment_1 )?
+            // InternalRoom.g:17437:1: ( ( rule__TriggeredTransition__NameAssignment_1 )? )
+            // InternalRoom.g:17438:1: ( rule__TriggeredTransition__NameAssignment_1 )?
             {
              before(grammarAccess.getTriggeredTransitionAccess().getNameAssignment_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17436:1: ( rule__TriggeredTransition__NameAssignment_1 )?
+            // InternalRoom.g:17439:1: ( rule__TriggeredTransition__NameAssignment_1 )?
             int alt171=2;
             int LA171_0 = input.LA(1);
 
@@ -48111,9 +48111,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt171) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17436:2: rule__TriggeredTransition__NameAssignment_1
+                    // InternalRoom.g:17439:2: rule__TriggeredTransition__NameAssignment_1
                     {
-                    pushFollow(FOLLOW_rule__TriggeredTransition__NameAssignment_1_in_rule__TriggeredTransition__Group__1__Impl35387);
+                    pushFollow(FOLLOW_2);
                     rule__TriggeredTransition__NameAssignment_1();
 
                     state._fsp--;
@@ -48147,21 +48147,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17446:1: rule__TriggeredTransition__Group__2 : rule__TriggeredTransition__Group__2__Impl rule__TriggeredTransition__Group__3 ;
+    // InternalRoom.g:17449:1: rule__TriggeredTransition__Group__2 : rule__TriggeredTransition__Group__2__Impl rule__TriggeredTransition__Group__3 ;
     public final void rule__TriggeredTransition__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17450:1: ( rule__TriggeredTransition__Group__2__Impl rule__TriggeredTransition__Group__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17451:2: rule__TriggeredTransition__Group__2__Impl rule__TriggeredTransition__Group__3
+            // InternalRoom.g:17453:1: ( rule__TriggeredTransition__Group__2__Impl rule__TriggeredTransition__Group__3 )
+            // InternalRoom.g:17454:2: rule__TriggeredTransition__Group__2__Impl rule__TriggeredTransition__Group__3
             {
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__2__Impl_in_rule__TriggeredTransition__Group__235418);
+            pushFollow(FOLLOW_85);
             rule__TriggeredTransition__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__3_in_rule__TriggeredTransition__Group__235421);
+            pushFollow(FOLLOW_2);
             rule__TriggeredTransition__Group__3();
 
             state._fsp--;
@@ -48185,20 +48185,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17458:1: rule__TriggeredTransition__Group__2__Impl : ( ':' ) ;
+    // InternalRoom.g:17461:1: rule__TriggeredTransition__Group__2__Impl : ( ':' ) ;
     public final void rule__TriggeredTransition__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17462:1: ( ( ':' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17463:1: ( ':' )
+            // InternalRoom.g:17465:1: ( ( ':' ) )
+            // InternalRoom.g:17466:1: ( ':' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17463:1: ( ':' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17464:1: ':'
+            // InternalRoom.g:17466:1: ( ':' )
+            // InternalRoom.g:17467:1: ':'
             {
              before(grammarAccess.getTriggeredTransitionAccess().getColonKeyword_2()); 
-            match(input,43,FOLLOW_43_in_rule__TriggeredTransition__Group__2__Impl35449); 
+            match(input,43,FOLLOW_2); 
              after(grammarAccess.getTriggeredTransitionAccess().getColonKeyword_2()); 
 
             }
@@ -48222,21 +48222,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17477:1: rule__TriggeredTransition__Group__3 : rule__TriggeredTransition__Group__3__Impl rule__TriggeredTransition__Group__4 ;
+    // InternalRoom.g:17480:1: rule__TriggeredTransition__Group__3 : rule__TriggeredTransition__Group__3__Impl rule__TriggeredTransition__Group__4 ;
     public final void rule__TriggeredTransition__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17481:1: ( rule__TriggeredTransition__Group__3__Impl rule__TriggeredTransition__Group__4 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17482:2: rule__TriggeredTransition__Group__3__Impl rule__TriggeredTransition__Group__4
+            // InternalRoom.g:17484:1: ( rule__TriggeredTransition__Group__3__Impl rule__TriggeredTransition__Group__4 )
+            // InternalRoom.g:17485:2: rule__TriggeredTransition__Group__3__Impl rule__TriggeredTransition__Group__4
             {
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__3__Impl_in_rule__TriggeredTransition__Group__335480);
+            pushFollow(FOLLOW_11);
             rule__TriggeredTransition__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__4_in_rule__TriggeredTransition__Group__335483);
+            pushFollow(FOLLOW_2);
             rule__TriggeredTransition__Group__4();
 
             state._fsp--;
@@ -48260,23 +48260,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17489:1: rule__TriggeredTransition__Group__3__Impl : ( ( rule__TriggeredTransition__FromAssignment_3 ) ) ;
+    // InternalRoom.g:17492:1: rule__TriggeredTransition__Group__3__Impl : ( ( rule__TriggeredTransition__FromAssignment_3 ) ) ;
     public final void rule__TriggeredTransition__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17493:1: ( ( ( rule__TriggeredTransition__FromAssignment_3 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17494:1: ( ( rule__TriggeredTransition__FromAssignment_3 ) )
+            // InternalRoom.g:17496:1: ( ( ( rule__TriggeredTransition__FromAssignment_3 ) ) )
+            // InternalRoom.g:17497:1: ( ( rule__TriggeredTransition__FromAssignment_3 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17494:1: ( ( rule__TriggeredTransition__FromAssignment_3 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17495:1: ( rule__TriggeredTransition__FromAssignment_3 )
+            // InternalRoom.g:17497:1: ( ( rule__TriggeredTransition__FromAssignment_3 ) )
+            // InternalRoom.g:17498:1: ( rule__TriggeredTransition__FromAssignment_3 )
             {
              before(grammarAccess.getTriggeredTransitionAccess().getFromAssignment_3()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17496:1: ( rule__TriggeredTransition__FromAssignment_3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17496:2: rule__TriggeredTransition__FromAssignment_3
+            // InternalRoom.g:17499:1: ( rule__TriggeredTransition__FromAssignment_3 )
+            // InternalRoom.g:17499:2: rule__TriggeredTransition__FromAssignment_3
             {
-            pushFollow(FOLLOW_rule__TriggeredTransition__FromAssignment_3_in_rule__TriggeredTransition__Group__3__Impl35510);
+            pushFollow(FOLLOW_2);
             rule__TriggeredTransition__FromAssignment_3();
 
             state._fsp--;
@@ -48307,21 +48307,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__4"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17506:1: rule__TriggeredTransition__Group__4 : rule__TriggeredTransition__Group__4__Impl rule__TriggeredTransition__Group__5 ;
+    // InternalRoom.g:17509:1: rule__TriggeredTransition__Group__4 : rule__TriggeredTransition__Group__4__Impl rule__TriggeredTransition__Group__5 ;
     public final void rule__TriggeredTransition__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17510:1: ( rule__TriggeredTransition__Group__4__Impl rule__TriggeredTransition__Group__5 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17511:2: rule__TriggeredTransition__Group__4__Impl rule__TriggeredTransition__Group__5
+            // InternalRoom.g:17513:1: ( rule__TriggeredTransition__Group__4__Impl rule__TriggeredTransition__Group__5 )
+            // InternalRoom.g:17514:2: rule__TriggeredTransition__Group__4__Impl rule__TriggeredTransition__Group__5
             {
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__4__Impl_in_rule__TriggeredTransition__Group__435540);
+            pushFollow(FOLLOW_85);
             rule__TriggeredTransition__Group__4__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__5_in_rule__TriggeredTransition__Group__435543);
+            pushFollow(FOLLOW_2);
             rule__TriggeredTransition__Group__5();
 
             state._fsp--;
@@ -48345,20 +48345,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__4__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17518:1: rule__TriggeredTransition__Group__4__Impl : ( '->' ) ;
+    // InternalRoom.g:17521:1: rule__TriggeredTransition__Group__4__Impl : ( '->' ) ;
     public final void rule__TriggeredTransition__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17522:1: ( ( '->' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17523:1: ( '->' )
+            // InternalRoom.g:17525:1: ( ( '->' ) )
+            // InternalRoom.g:17526:1: ( '->' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17523:1: ( '->' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17524:1: '->'
+            // InternalRoom.g:17526:1: ( '->' )
+            // InternalRoom.g:17527:1: '->'
             {
              before(grammarAccess.getTriggeredTransitionAccess().getHyphenMinusGreaterThanSignKeyword_4()); 
-            match(input,45,FOLLOW_45_in_rule__TriggeredTransition__Group__4__Impl35571); 
+            match(input,45,FOLLOW_2); 
              after(grammarAccess.getTriggeredTransitionAccess().getHyphenMinusGreaterThanSignKeyword_4()); 
 
             }
@@ -48382,21 +48382,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__5"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17537:1: rule__TriggeredTransition__Group__5 : rule__TriggeredTransition__Group__5__Impl rule__TriggeredTransition__Group__6 ;
+    // InternalRoom.g:17540:1: rule__TriggeredTransition__Group__5 : rule__TriggeredTransition__Group__5__Impl rule__TriggeredTransition__Group__6 ;
     public final void rule__TriggeredTransition__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17541:1: ( rule__TriggeredTransition__Group__5__Impl rule__TriggeredTransition__Group__6 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17542:2: rule__TriggeredTransition__Group__5__Impl rule__TriggeredTransition__Group__6
+            // InternalRoom.g:17544:1: ( rule__TriggeredTransition__Group__5__Impl rule__TriggeredTransition__Group__6 )
+            // InternalRoom.g:17545:2: rule__TriggeredTransition__Group__5__Impl rule__TriggeredTransition__Group__6
             {
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__5__Impl_in_rule__TriggeredTransition__Group__535602);
+            pushFollow(FOLLOW_4);
             rule__TriggeredTransition__Group__5__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__6_in_rule__TriggeredTransition__Group__535605);
+            pushFollow(FOLLOW_2);
             rule__TriggeredTransition__Group__6();
 
             state._fsp--;
@@ -48420,23 +48420,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__5__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17549:1: rule__TriggeredTransition__Group__5__Impl : ( ( rule__TriggeredTransition__ToAssignment_5 ) ) ;
+    // InternalRoom.g:17552:1: rule__TriggeredTransition__Group__5__Impl : ( ( rule__TriggeredTransition__ToAssignment_5 ) ) ;
     public final void rule__TriggeredTransition__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17553:1: ( ( ( rule__TriggeredTransition__ToAssignment_5 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17554:1: ( ( rule__TriggeredTransition__ToAssignment_5 ) )
+            // InternalRoom.g:17556:1: ( ( ( rule__TriggeredTransition__ToAssignment_5 ) ) )
+            // InternalRoom.g:17557:1: ( ( rule__TriggeredTransition__ToAssignment_5 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17554:1: ( ( rule__TriggeredTransition__ToAssignment_5 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17555:1: ( rule__TriggeredTransition__ToAssignment_5 )
+            // InternalRoom.g:17557:1: ( ( rule__TriggeredTransition__ToAssignment_5 ) )
+            // InternalRoom.g:17558:1: ( rule__TriggeredTransition__ToAssignment_5 )
             {
              before(grammarAccess.getTriggeredTransitionAccess().getToAssignment_5()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17556:1: ( rule__TriggeredTransition__ToAssignment_5 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17556:2: rule__TriggeredTransition__ToAssignment_5
+            // InternalRoom.g:17559:1: ( rule__TriggeredTransition__ToAssignment_5 )
+            // InternalRoom.g:17559:2: rule__TriggeredTransition__ToAssignment_5
             {
-            pushFollow(FOLLOW_rule__TriggeredTransition__ToAssignment_5_in_rule__TriggeredTransition__Group__5__Impl35632);
+            pushFollow(FOLLOW_2);
             rule__TriggeredTransition__ToAssignment_5();
 
             state._fsp--;
@@ -48467,21 +48467,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__6"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17566:1: rule__TriggeredTransition__Group__6 : rule__TriggeredTransition__Group__6__Impl rule__TriggeredTransition__Group__7 ;
+    // InternalRoom.g:17569:1: rule__TriggeredTransition__Group__6 : rule__TriggeredTransition__Group__6__Impl rule__TriggeredTransition__Group__7 ;
     public final void rule__TriggeredTransition__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17570:1: ( rule__TriggeredTransition__Group__6__Impl rule__TriggeredTransition__Group__7 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17571:2: rule__TriggeredTransition__Group__6__Impl rule__TriggeredTransition__Group__7
+            // InternalRoom.g:17573:1: ( rule__TriggeredTransition__Group__6__Impl rule__TriggeredTransition__Group__7 )
+            // InternalRoom.g:17574:2: rule__TriggeredTransition__Group__6__Impl rule__TriggeredTransition__Group__7
             {
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__6__Impl_in_rule__TriggeredTransition__Group__635662);
+            pushFollow(FOLLOW_4);
             rule__TriggeredTransition__Group__6__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__7_in_rule__TriggeredTransition__Group__635665);
+            pushFollow(FOLLOW_2);
             rule__TriggeredTransition__Group__7();
 
             state._fsp--;
@@ -48505,20 +48505,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__6__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17578:1: rule__TriggeredTransition__Group__6__Impl : ( ( rule__TriggeredTransition__DocuAssignment_6 )? ) ;
+    // InternalRoom.g:17581:1: rule__TriggeredTransition__Group__6__Impl : ( ( rule__TriggeredTransition__DocuAssignment_6 )? ) ;
     public final void rule__TriggeredTransition__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17582:1: ( ( ( rule__TriggeredTransition__DocuAssignment_6 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17583:1: ( ( rule__TriggeredTransition__DocuAssignment_6 )? )
+            // InternalRoom.g:17585:1: ( ( ( rule__TriggeredTransition__DocuAssignment_6 )? ) )
+            // InternalRoom.g:17586:1: ( ( rule__TriggeredTransition__DocuAssignment_6 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17583:1: ( ( rule__TriggeredTransition__DocuAssignment_6 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17584:1: ( rule__TriggeredTransition__DocuAssignment_6 )?
+            // InternalRoom.g:17586:1: ( ( rule__TriggeredTransition__DocuAssignment_6 )? )
+            // InternalRoom.g:17587:1: ( rule__TriggeredTransition__DocuAssignment_6 )?
             {
              before(grammarAccess.getTriggeredTransitionAccess().getDocuAssignment_6()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17585:1: ( rule__TriggeredTransition__DocuAssignment_6 )?
+            // InternalRoom.g:17588:1: ( rule__TriggeredTransition__DocuAssignment_6 )?
             int alt172=2;
             int LA172_0 = input.LA(1);
 
@@ -48527,9 +48527,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt172) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17585:2: rule__TriggeredTransition__DocuAssignment_6
+                    // InternalRoom.g:17588:2: rule__TriggeredTransition__DocuAssignment_6
                     {
-                    pushFollow(FOLLOW_rule__TriggeredTransition__DocuAssignment_6_in_rule__TriggeredTransition__Group__6__Impl35692);
+                    pushFollow(FOLLOW_2);
                     rule__TriggeredTransition__DocuAssignment_6();
 
                     state._fsp--;
@@ -48563,21 +48563,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__7"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17595:1: rule__TriggeredTransition__Group__7 : rule__TriggeredTransition__Group__7__Impl rule__TriggeredTransition__Group__8 ;
+    // InternalRoom.g:17598:1: rule__TriggeredTransition__Group__7 : rule__TriggeredTransition__Group__7__Impl rule__TriggeredTransition__Group__8 ;
     public final void rule__TriggeredTransition__Group__7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17599:1: ( rule__TriggeredTransition__Group__7__Impl rule__TriggeredTransition__Group__8 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17600:2: rule__TriggeredTransition__Group__7__Impl rule__TriggeredTransition__Group__8
+            // InternalRoom.g:17602:1: ( rule__TriggeredTransition__Group__7__Impl rule__TriggeredTransition__Group__8 )
+            // InternalRoom.g:17603:2: rule__TriggeredTransition__Group__7__Impl rule__TriggeredTransition__Group__8
             {
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__7__Impl_in_rule__TriggeredTransition__Group__735723);
+            pushFollow(FOLLOW_87);
             rule__TriggeredTransition__Group__7__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__8_in_rule__TriggeredTransition__Group__735726);
+            pushFollow(FOLLOW_2);
             rule__TriggeredTransition__Group__8();
 
             state._fsp--;
@@ -48601,20 +48601,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__7__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17607:1: rule__TriggeredTransition__Group__7__Impl : ( '{' ) ;
+    // InternalRoom.g:17610:1: rule__TriggeredTransition__Group__7__Impl : ( '{' ) ;
     public final void rule__TriggeredTransition__Group__7__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17611:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17612:1: ( '{' )
+            // InternalRoom.g:17614:1: ( ( '{' ) )
+            // InternalRoom.g:17615:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17612:1: ( '{' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17613:1: '{'
+            // InternalRoom.g:17615:1: ( '{' )
+            // InternalRoom.g:17616:1: '{'
             {
              before(grammarAccess.getTriggeredTransitionAccess().getLeftCurlyBracketKeyword_7()); 
-            match(input,41,FOLLOW_41_in_rule__TriggeredTransition__Group__7__Impl35754); 
+            match(input,41,FOLLOW_2); 
              after(grammarAccess.getTriggeredTransitionAccess().getLeftCurlyBracketKeyword_7()); 
 
             }
@@ -48638,21 +48638,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__8"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17626:1: rule__TriggeredTransition__Group__8 : rule__TriggeredTransition__Group__8__Impl rule__TriggeredTransition__Group__9 ;
+    // InternalRoom.g:17629:1: rule__TriggeredTransition__Group__8 : rule__TriggeredTransition__Group__8__Impl rule__TriggeredTransition__Group__9 ;
     public final void rule__TriggeredTransition__Group__8() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17630:1: ( rule__TriggeredTransition__Group__8__Impl rule__TriggeredTransition__Group__9 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17631:2: rule__TriggeredTransition__Group__8__Impl rule__TriggeredTransition__Group__9
+            // InternalRoom.g:17633:1: ( rule__TriggeredTransition__Group__8__Impl rule__TriggeredTransition__Group__9 )
+            // InternalRoom.g:17634:2: rule__TriggeredTransition__Group__8__Impl rule__TriggeredTransition__Group__9
             {
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__8__Impl_in_rule__TriggeredTransition__Group__835785);
+            pushFollow(FOLLOW_27);
             rule__TriggeredTransition__Group__8__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__9_in_rule__TriggeredTransition__Group__835788);
+            pushFollow(FOLLOW_2);
             rule__TriggeredTransition__Group__9();
 
             state._fsp--;
@@ -48676,20 +48676,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__8__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17638:1: rule__TriggeredTransition__Group__8__Impl : ( 'triggers' ) ;
+    // InternalRoom.g:17641:1: rule__TriggeredTransition__Group__8__Impl : ( 'triggers' ) ;
     public final void rule__TriggeredTransition__Group__8__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17642:1: ( ( 'triggers' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17643:1: ( 'triggers' )
+            // InternalRoom.g:17645:1: ( ( 'triggers' ) )
+            // InternalRoom.g:17646:1: ( 'triggers' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17643:1: ( 'triggers' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17644:1: 'triggers'
+            // InternalRoom.g:17646:1: ( 'triggers' )
+            // InternalRoom.g:17647:1: 'triggers'
             {
              before(grammarAccess.getTriggeredTransitionAccess().getTriggersKeyword_8()); 
-            match(input,107,FOLLOW_107_in_rule__TriggeredTransition__Group__8__Impl35816); 
+            match(input,107,FOLLOW_2); 
              after(grammarAccess.getTriggeredTransitionAccess().getTriggersKeyword_8()); 
 
             }
@@ -48713,21 +48713,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__9"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17657:1: rule__TriggeredTransition__Group__9 : rule__TriggeredTransition__Group__9__Impl rule__TriggeredTransition__Group__10 ;
+    // InternalRoom.g:17660:1: rule__TriggeredTransition__Group__9 : rule__TriggeredTransition__Group__9__Impl rule__TriggeredTransition__Group__10 ;
     public final void rule__TriggeredTransition__Group__9() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17661:1: ( rule__TriggeredTransition__Group__9__Impl rule__TriggeredTransition__Group__10 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17662:2: rule__TriggeredTransition__Group__9__Impl rule__TriggeredTransition__Group__10
+            // InternalRoom.g:17664:1: ( rule__TriggeredTransition__Group__9__Impl rule__TriggeredTransition__Group__10 )
+            // InternalRoom.g:17665:2: rule__TriggeredTransition__Group__9__Impl rule__TriggeredTransition__Group__10
             {
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__9__Impl_in_rule__TriggeredTransition__Group__935847);
+            pushFollow(FOLLOW_88);
             rule__TriggeredTransition__Group__9__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__10_in_rule__TriggeredTransition__Group__935850);
+            pushFollow(FOLLOW_2);
             rule__TriggeredTransition__Group__10();
 
             state._fsp--;
@@ -48751,20 +48751,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__9__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17669:1: rule__TriggeredTransition__Group__9__Impl : ( '{' ) ;
+    // InternalRoom.g:17672:1: rule__TriggeredTransition__Group__9__Impl : ( '{' ) ;
     public final void rule__TriggeredTransition__Group__9__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17673:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17674:1: ( '{' )
+            // InternalRoom.g:17676:1: ( ( '{' ) )
+            // InternalRoom.g:17677:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17674:1: ( '{' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17675:1: '{'
+            // InternalRoom.g:17677:1: ( '{' )
+            // InternalRoom.g:17678:1: '{'
             {
              before(grammarAccess.getTriggeredTransitionAccess().getLeftCurlyBracketKeyword_9()); 
-            match(input,41,FOLLOW_41_in_rule__TriggeredTransition__Group__9__Impl35878); 
+            match(input,41,FOLLOW_2); 
              after(grammarAccess.getTriggeredTransitionAccess().getLeftCurlyBracketKeyword_9()); 
 
             }
@@ -48788,21 +48788,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__10"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17688:1: rule__TriggeredTransition__Group__10 : rule__TriggeredTransition__Group__10__Impl rule__TriggeredTransition__Group__11 ;
+    // InternalRoom.g:17691:1: rule__TriggeredTransition__Group__10 : rule__TriggeredTransition__Group__10__Impl rule__TriggeredTransition__Group__11 ;
     public final void rule__TriggeredTransition__Group__10() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17692:1: ( rule__TriggeredTransition__Group__10__Impl rule__TriggeredTransition__Group__11 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17693:2: rule__TriggeredTransition__Group__10__Impl rule__TriggeredTransition__Group__11
+            // InternalRoom.g:17695:1: ( rule__TriggeredTransition__Group__10__Impl rule__TriggeredTransition__Group__11 )
+            // InternalRoom.g:17696:2: rule__TriggeredTransition__Group__10__Impl rule__TriggeredTransition__Group__11
             {
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__10__Impl_in_rule__TriggeredTransition__Group__1035909);
+            pushFollow(FOLLOW_89);
             rule__TriggeredTransition__Group__10__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__11_in_rule__TriggeredTransition__Group__1035912);
+            pushFollow(FOLLOW_2);
             rule__TriggeredTransition__Group__11();
 
             state._fsp--;
@@ -48826,23 +48826,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__10__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17700:1: rule__TriggeredTransition__Group__10__Impl : ( ( rule__TriggeredTransition__TriggersAssignment_10 ) ) ;
+    // InternalRoom.g:17703:1: rule__TriggeredTransition__Group__10__Impl : ( ( rule__TriggeredTransition__TriggersAssignment_10 ) ) ;
     public final void rule__TriggeredTransition__Group__10__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17704:1: ( ( ( rule__TriggeredTransition__TriggersAssignment_10 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17705:1: ( ( rule__TriggeredTransition__TriggersAssignment_10 ) )
+            // InternalRoom.g:17707:1: ( ( ( rule__TriggeredTransition__TriggersAssignment_10 ) ) )
+            // InternalRoom.g:17708:1: ( ( rule__TriggeredTransition__TriggersAssignment_10 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17705:1: ( ( rule__TriggeredTransition__TriggersAssignment_10 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17706:1: ( rule__TriggeredTransition__TriggersAssignment_10 )
+            // InternalRoom.g:17708:1: ( ( rule__TriggeredTransition__TriggersAssignment_10 ) )
+            // InternalRoom.g:17709:1: ( rule__TriggeredTransition__TriggersAssignment_10 )
             {
              before(grammarAccess.getTriggeredTransitionAccess().getTriggersAssignment_10()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17707:1: ( rule__TriggeredTransition__TriggersAssignment_10 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17707:2: rule__TriggeredTransition__TriggersAssignment_10
+            // InternalRoom.g:17710:1: ( rule__TriggeredTransition__TriggersAssignment_10 )
+            // InternalRoom.g:17710:2: rule__TriggeredTransition__TriggersAssignment_10
             {
-            pushFollow(FOLLOW_rule__TriggeredTransition__TriggersAssignment_10_in_rule__TriggeredTransition__Group__10__Impl35939);
+            pushFollow(FOLLOW_2);
             rule__TriggeredTransition__TriggersAssignment_10();
 
             state._fsp--;
@@ -48873,21 +48873,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__11"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17717:1: rule__TriggeredTransition__Group__11 : rule__TriggeredTransition__Group__11__Impl rule__TriggeredTransition__Group__12 ;
+    // InternalRoom.g:17720:1: rule__TriggeredTransition__Group__11 : rule__TriggeredTransition__Group__11__Impl rule__TriggeredTransition__Group__12 ;
     public final void rule__TriggeredTransition__Group__11() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17721:1: ( rule__TriggeredTransition__Group__11__Impl rule__TriggeredTransition__Group__12 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17722:2: rule__TriggeredTransition__Group__11__Impl rule__TriggeredTransition__Group__12
+            // InternalRoom.g:17724:1: ( rule__TriggeredTransition__Group__11__Impl rule__TriggeredTransition__Group__12 )
+            // InternalRoom.g:17725:2: rule__TriggeredTransition__Group__11__Impl rule__TriggeredTransition__Group__12
             {
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__11__Impl_in_rule__TriggeredTransition__Group__1135969);
+            pushFollow(FOLLOW_89);
             rule__TriggeredTransition__Group__11__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__12_in_rule__TriggeredTransition__Group__1135972);
+            pushFollow(FOLLOW_2);
             rule__TriggeredTransition__Group__12();
 
             state._fsp--;
@@ -48911,20 +48911,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__11__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17729:1: rule__TriggeredTransition__Group__11__Impl : ( ( rule__TriggeredTransition__Group_11__0 )* ) ;
+    // InternalRoom.g:17732:1: rule__TriggeredTransition__Group__11__Impl : ( ( rule__TriggeredTransition__Group_11__0 )* ) ;
     public final void rule__TriggeredTransition__Group__11__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17733:1: ( ( ( rule__TriggeredTransition__Group_11__0 )* ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17734:1: ( ( rule__TriggeredTransition__Group_11__0 )* )
+            // InternalRoom.g:17736:1: ( ( ( rule__TriggeredTransition__Group_11__0 )* ) )
+            // InternalRoom.g:17737:1: ( ( rule__TriggeredTransition__Group_11__0 )* )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17734:1: ( ( rule__TriggeredTransition__Group_11__0 )* )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17735:1: ( rule__TriggeredTransition__Group_11__0 )*
+            // InternalRoom.g:17737:1: ( ( rule__TriggeredTransition__Group_11__0 )* )
+            // InternalRoom.g:17738:1: ( rule__TriggeredTransition__Group_11__0 )*
             {
              before(grammarAccess.getTriggeredTransitionAccess().getGroup_11()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17736:1: ( rule__TriggeredTransition__Group_11__0 )*
+            // InternalRoom.g:17739:1: ( rule__TriggeredTransition__Group_11__0 )*
             loop173:
             do {
                 int alt173=2;
@@ -48937,9 +48937,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
                 switch (alt173) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17736:2: rule__TriggeredTransition__Group_11__0
+            	    // InternalRoom.g:17739:2: rule__TriggeredTransition__Group_11__0
             	    {
-            	    pushFollow(FOLLOW_rule__TriggeredTransition__Group_11__0_in_rule__TriggeredTransition__Group__11__Impl35999);
+            	    pushFollow(FOLLOW_90);
             	    rule__TriggeredTransition__Group_11__0();
 
             	    state._fsp--;
@@ -48976,21 +48976,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__12"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17746:1: rule__TriggeredTransition__Group__12 : rule__TriggeredTransition__Group__12__Impl rule__TriggeredTransition__Group__13 ;
+    // InternalRoom.g:17749:1: rule__TriggeredTransition__Group__12 : rule__TriggeredTransition__Group__12__Impl rule__TriggeredTransition__Group__13 ;
     public final void rule__TriggeredTransition__Group__12() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17750:1: ( rule__TriggeredTransition__Group__12__Impl rule__TriggeredTransition__Group__13 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17751:2: rule__TriggeredTransition__Group__12__Impl rule__TriggeredTransition__Group__13
+            // InternalRoom.g:17753:1: ( rule__TriggeredTransition__Group__12__Impl rule__TriggeredTransition__Group__13 )
+            // InternalRoom.g:17754:2: rule__TriggeredTransition__Group__12__Impl rule__TriggeredTransition__Group__13
             {
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__12__Impl_in_rule__TriggeredTransition__Group__1236030);
+            pushFollow(FOLLOW_86);
             rule__TriggeredTransition__Group__12__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__13_in_rule__TriggeredTransition__Group__1236033);
+            pushFollow(FOLLOW_2);
             rule__TriggeredTransition__Group__13();
 
             state._fsp--;
@@ -49014,20 +49014,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__12__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17758:1: rule__TriggeredTransition__Group__12__Impl : ( '}' ) ;
+    // InternalRoom.g:17761:1: rule__TriggeredTransition__Group__12__Impl : ( '}' ) ;
     public final void rule__TriggeredTransition__Group__12__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17762:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17763:1: ( '}' )
+            // InternalRoom.g:17765:1: ( ( '}' ) )
+            // InternalRoom.g:17766:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17763:1: ( '}' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17764:1: '}'
+            // InternalRoom.g:17766:1: ( '}' )
+            // InternalRoom.g:17767:1: '}'
             {
              before(grammarAccess.getTriggeredTransitionAccess().getRightCurlyBracketKeyword_12()); 
-            match(input,42,FOLLOW_42_in_rule__TriggeredTransition__Group__12__Impl36061); 
+            match(input,42,FOLLOW_2); 
              after(grammarAccess.getTriggeredTransitionAccess().getRightCurlyBracketKeyword_12()); 
 
             }
@@ -49051,21 +49051,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__13"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17777:1: rule__TriggeredTransition__Group__13 : rule__TriggeredTransition__Group__13__Impl rule__TriggeredTransition__Group__14 ;
+    // InternalRoom.g:17780:1: rule__TriggeredTransition__Group__13 : rule__TriggeredTransition__Group__13__Impl rule__TriggeredTransition__Group__14 ;
     public final void rule__TriggeredTransition__Group__13() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17781:1: ( rule__TriggeredTransition__Group__13__Impl rule__TriggeredTransition__Group__14 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17782:2: rule__TriggeredTransition__Group__13__Impl rule__TriggeredTransition__Group__14
+            // InternalRoom.g:17784:1: ( rule__TriggeredTransition__Group__13__Impl rule__TriggeredTransition__Group__14 )
+            // InternalRoom.g:17785:2: rule__TriggeredTransition__Group__13__Impl rule__TriggeredTransition__Group__14
             {
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__13__Impl_in_rule__TriggeredTransition__Group__1336092);
+            pushFollow(FOLLOW_86);
             rule__TriggeredTransition__Group__13__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__14_in_rule__TriggeredTransition__Group__1336095);
+            pushFollow(FOLLOW_2);
             rule__TriggeredTransition__Group__14();
 
             state._fsp--;
@@ -49089,20 +49089,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__13__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17789:1: rule__TriggeredTransition__Group__13__Impl : ( ( rule__TriggeredTransition__Group_13__0 )? ) ;
+    // InternalRoom.g:17792:1: rule__TriggeredTransition__Group__13__Impl : ( ( rule__TriggeredTransition__Group_13__0 )? ) ;
     public final void rule__TriggeredTransition__Group__13__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17793:1: ( ( ( rule__TriggeredTransition__Group_13__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17794:1: ( ( rule__TriggeredTransition__Group_13__0 )? )
+            // InternalRoom.g:17796:1: ( ( ( rule__TriggeredTransition__Group_13__0 )? ) )
+            // InternalRoom.g:17797:1: ( ( rule__TriggeredTransition__Group_13__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17794:1: ( ( rule__TriggeredTransition__Group_13__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17795:1: ( rule__TriggeredTransition__Group_13__0 )?
+            // InternalRoom.g:17797:1: ( ( rule__TriggeredTransition__Group_13__0 )? )
+            // InternalRoom.g:17798:1: ( rule__TriggeredTransition__Group_13__0 )?
             {
              before(grammarAccess.getTriggeredTransitionAccess().getGroup_13()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17796:1: ( rule__TriggeredTransition__Group_13__0 )?
+            // InternalRoom.g:17799:1: ( rule__TriggeredTransition__Group_13__0 )?
             int alt174=2;
             int LA174_0 = input.LA(1);
 
@@ -49111,9 +49111,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt174) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17796:2: rule__TriggeredTransition__Group_13__0
+                    // InternalRoom.g:17799:2: rule__TriggeredTransition__Group_13__0
                     {
-                    pushFollow(FOLLOW_rule__TriggeredTransition__Group_13__0_in_rule__TriggeredTransition__Group__13__Impl36122);
+                    pushFollow(FOLLOW_2);
                     rule__TriggeredTransition__Group_13__0();
 
                     state._fsp--;
@@ -49147,16 +49147,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__14"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17806:1: rule__TriggeredTransition__Group__14 : rule__TriggeredTransition__Group__14__Impl ;
+    // InternalRoom.g:17809:1: rule__TriggeredTransition__Group__14 : rule__TriggeredTransition__Group__14__Impl ;
     public final void rule__TriggeredTransition__Group__14() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17810:1: ( rule__TriggeredTransition__Group__14__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17811:2: rule__TriggeredTransition__Group__14__Impl
+            // InternalRoom.g:17813:1: ( rule__TriggeredTransition__Group__14__Impl )
+            // InternalRoom.g:17814:2: rule__TriggeredTransition__Group__14__Impl
             {
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group__14__Impl_in_rule__TriggeredTransition__Group__1436153);
+            pushFollow(FOLLOW_2);
             rule__TriggeredTransition__Group__14__Impl();
 
             state._fsp--;
@@ -49180,20 +49180,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group__14__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17817:1: rule__TriggeredTransition__Group__14__Impl : ( '}' ) ;
+    // InternalRoom.g:17820:1: rule__TriggeredTransition__Group__14__Impl : ( '}' ) ;
     public final void rule__TriggeredTransition__Group__14__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17821:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17822:1: ( '}' )
+            // InternalRoom.g:17824:1: ( ( '}' ) )
+            // InternalRoom.g:17825:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17822:1: ( '}' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17823:1: '}'
+            // InternalRoom.g:17825:1: ( '}' )
+            // InternalRoom.g:17826:1: '}'
             {
              before(grammarAccess.getTriggeredTransitionAccess().getRightCurlyBracketKeyword_14()); 
-            match(input,42,FOLLOW_42_in_rule__TriggeredTransition__Group__14__Impl36181); 
+            match(input,42,FOLLOW_2); 
              after(grammarAccess.getTriggeredTransitionAccess().getRightCurlyBracketKeyword_14()); 
 
             }
@@ -49217,21 +49217,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group_11__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17866:1: rule__TriggeredTransition__Group_11__0 : rule__TriggeredTransition__Group_11__0__Impl rule__TriggeredTransition__Group_11__1 ;
+    // InternalRoom.g:17869:1: rule__TriggeredTransition__Group_11__0 : rule__TriggeredTransition__Group_11__0__Impl rule__TriggeredTransition__Group_11__1 ;
     public final void rule__TriggeredTransition__Group_11__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17870:1: ( rule__TriggeredTransition__Group_11__0__Impl rule__TriggeredTransition__Group_11__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17871:2: rule__TriggeredTransition__Group_11__0__Impl rule__TriggeredTransition__Group_11__1
+            // InternalRoom.g:17873:1: ( rule__TriggeredTransition__Group_11__0__Impl rule__TriggeredTransition__Group_11__1 )
+            // InternalRoom.g:17874:2: rule__TriggeredTransition__Group_11__0__Impl rule__TriggeredTransition__Group_11__1
             {
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group_11__0__Impl_in_rule__TriggeredTransition__Group_11__036242);
+            pushFollow(FOLLOW_88);
             rule__TriggeredTransition__Group_11__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group_11__1_in_rule__TriggeredTransition__Group_11__036245);
+            pushFollow(FOLLOW_2);
             rule__TriggeredTransition__Group_11__1();
 
             state._fsp--;
@@ -49255,20 +49255,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group_11__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17878:1: rule__TriggeredTransition__Group_11__0__Impl : ( 'or' ) ;
+    // InternalRoom.g:17881:1: rule__TriggeredTransition__Group_11__0__Impl : ( 'or' ) ;
     public final void rule__TriggeredTransition__Group_11__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17882:1: ( ( 'or' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17883:1: ( 'or' )
+            // InternalRoom.g:17885:1: ( ( 'or' ) )
+            // InternalRoom.g:17886:1: ( 'or' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17883:1: ( 'or' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17884:1: 'or'
+            // InternalRoom.g:17886:1: ( 'or' )
+            // InternalRoom.g:17887:1: 'or'
             {
              before(grammarAccess.getTriggeredTransitionAccess().getOrKeyword_11_0()); 
-            match(input,108,FOLLOW_108_in_rule__TriggeredTransition__Group_11__0__Impl36273); 
+            match(input,108,FOLLOW_2); 
              after(grammarAccess.getTriggeredTransitionAccess().getOrKeyword_11_0()); 
 
             }
@@ -49292,16 +49292,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group_11__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17897:1: rule__TriggeredTransition__Group_11__1 : rule__TriggeredTransition__Group_11__1__Impl ;
+    // InternalRoom.g:17900:1: rule__TriggeredTransition__Group_11__1 : rule__TriggeredTransition__Group_11__1__Impl ;
     public final void rule__TriggeredTransition__Group_11__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17901:1: ( rule__TriggeredTransition__Group_11__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17902:2: rule__TriggeredTransition__Group_11__1__Impl
+            // InternalRoom.g:17904:1: ( rule__TriggeredTransition__Group_11__1__Impl )
+            // InternalRoom.g:17905:2: rule__TriggeredTransition__Group_11__1__Impl
             {
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group_11__1__Impl_in_rule__TriggeredTransition__Group_11__136304);
+            pushFollow(FOLLOW_2);
             rule__TriggeredTransition__Group_11__1__Impl();
 
             state._fsp--;
@@ -49325,23 +49325,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group_11__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17908:1: rule__TriggeredTransition__Group_11__1__Impl : ( ( rule__TriggeredTransition__TriggersAssignment_11_1 ) ) ;
+    // InternalRoom.g:17911:1: rule__TriggeredTransition__Group_11__1__Impl : ( ( rule__TriggeredTransition__TriggersAssignment_11_1 ) ) ;
     public final void rule__TriggeredTransition__Group_11__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17912:1: ( ( ( rule__TriggeredTransition__TriggersAssignment_11_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17913:1: ( ( rule__TriggeredTransition__TriggersAssignment_11_1 ) )
+            // InternalRoom.g:17915:1: ( ( ( rule__TriggeredTransition__TriggersAssignment_11_1 ) ) )
+            // InternalRoom.g:17916:1: ( ( rule__TriggeredTransition__TriggersAssignment_11_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17913:1: ( ( rule__TriggeredTransition__TriggersAssignment_11_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17914:1: ( rule__TriggeredTransition__TriggersAssignment_11_1 )
+            // InternalRoom.g:17916:1: ( ( rule__TriggeredTransition__TriggersAssignment_11_1 ) )
+            // InternalRoom.g:17917:1: ( rule__TriggeredTransition__TriggersAssignment_11_1 )
             {
              before(grammarAccess.getTriggeredTransitionAccess().getTriggersAssignment_11_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17915:1: ( rule__TriggeredTransition__TriggersAssignment_11_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17915:2: rule__TriggeredTransition__TriggersAssignment_11_1
+            // InternalRoom.g:17918:1: ( rule__TriggeredTransition__TriggersAssignment_11_1 )
+            // InternalRoom.g:17918:2: rule__TriggeredTransition__TriggersAssignment_11_1
             {
-            pushFollow(FOLLOW_rule__TriggeredTransition__TriggersAssignment_11_1_in_rule__TriggeredTransition__Group_11__1__Impl36331);
+            pushFollow(FOLLOW_2);
             rule__TriggeredTransition__TriggersAssignment_11_1();
 
             state._fsp--;
@@ -49372,21 +49372,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group_13__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17929:1: rule__TriggeredTransition__Group_13__0 : rule__TriggeredTransition__Group_13__0__Impl rule__TriggeredTransition__Group_13__1 ;
+    // InternalRoom.g:17932:1: rule__TriggeredTransition__Group_13__0 : rule__TriggeredTransition__Group_13__0__Impl rule__TriggeredTransition__Group_13__1 ;
     public final void rule__TriggeredTransition__Group_13__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17933:1: ( rule__TriggeredTransition__Group_13__0__Impl rule__TriggeredTransition__Group_13__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17934:2: rule__TriggeredTransition__Group_13__0__Impl rule__TriggeredTransition__Group_13__1
+            // InternalRoom.g:17936:1: ( rule__TriggeredTransition__Group_13__0__Impl rule__TriggeredTransition__Group_13__1 )
+            // InternalRoom.g:17937:2: rule__TriggeredTransition__Group_13__0__Impl rule__TriggeredTransition__Group_13__1
             {
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group_13__0__Impl_in_rule__TriggeredTransition__Group_13__036365);
+            pushFollow(FOLLOW_27);
             rule__TriggeredTransition__Group_13__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group_13__1_in_rule__TriggeredTransition__Group_13__036368);
+            pushFollow(FOLLOW_2);
             rule__TriggeredTransition__Group_13__1();
 
             state._fsp--;
@@ -49410,20 +49410,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group_13__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17941:1: rule__TriggeredTransition__Group_13__0__Impl : ( 'action' ) ;
+    // InternalRoom.g:17944:1: rule__TriggeredTransition__Group_13__0__Impl : ( 'action' ) ;
     public final void rule__TriggeredTransition__Group_13__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17945:1: ( ( 'action' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17946:1: ( 'action' )
+            // InternalRoom.g:17948:1: ( ( 'action' ) )
+            // InternalRoom.g:17949:1: ( 'action' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17946:1: ( 'action' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17947:1: 'action'
+            // InternalRoom.g:17949:1: ( 'action' )
+            // InternalRoom.g:17950:1: 'action'
             {
              before(grammarAccess.getTriggeredTransitionAccess().getActionKeyword_13_0()); 
-            match(input,106,FOLLOW_106_in_rule__TriggeredTransition__Group_13__0__Impl36396); 
+            match(input,106,FOLLOW_2); 
              after(grammarAccess.getTriggeredTransitionAccess().getActionKeyword_13_0()); 
 
             }
@@ -49447,16 +49447,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group_13__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17960:1: rule__TriggeredTransition__Group_13__1 : rule__TriggeredTransition__Group_13__1__Impl ;
+    // InternalRoom.g:17963:1: rule__TriggeredTransition__Group_13__1 : rule__TriggeredTransition__Group_13__1__Impl ;
     public final void rule__TriggeredTransition__Group_13__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17964:1: ( rule__TriggeredTransition__Group_13__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17965:2: rule__TriggeredTransition__Group_13__1__Impl
+            // InternalRoom.g:17967:1: ( rule__TriggeredTransition__Group_13__1__Impl )
+            // InternalRoom.g:17968:2: rule__TriggeredTransition__Group_13__1__Impl
             {
-            pushFollow(FOLLOW_rule__TriggeredTransition__Group_13__1__Impl_in_rule__TriggeredTransition__Group_13__136427);
+            pushFollow(FOLLOW_2);
             rule__TriggeredTransition__Group_13__1__Impl();
 
             state._fsp--;
@@ -49480,23 +49480,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__Group_13__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17971:1: rule__TriggeredTransition__Group_13__1__Impl : ( ( rule__TriggeredTransition__ActionAssignment_13_1 ) ) ;
+    // InternalRoom.g:17974:1: rule__TriggeredTransition__Group_13__1__Impl : ( ( rule__TriggeredTransition__ActionAssignment_13_1 ) ) ;
     public final void rule__TriggeredTransition__Group_13__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17975:1: ( ( ( rule__TriggeredTransition__ActionAssignment_13_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17976:1: ( ( rule__TriggeredTransition__ActionAssignment_13_1 ) )
+            // InternalRoom.g:17978:1: ( ( ( rule__TriggeredTransition__ActionAssignment_13_1 ) ) )
+            // InternalRoom.g:17979:1: ( ( rule__TriggeredTransition__ActionAssignment_13_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17976:1: ( ( rule__TriggeredTransition__ActionAssignment_13_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17977:1: ( rule__TriggeredTransition__ActionAssignment_13_1 )
+            // InternalRoom.g:17979:1: ( ( rule__TriggeredTransition__ActionAssignment_13_1 ) )
+            // InternalRoom.g:17980:1: ( rule__TriggeredTransition__ActionAssignment_13_1 )
             {
              before(grammarAccess.getTriggeredTransitionAccess().getActionAssignment_13_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17978:1: ( rule__TriggeredTransition__ActionAssignment_13_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17978:2: rule__TriggeredTransition__ActionAssignment_13_1
+            // InternalRoom.g:17981:1: ( rule__TriggeredTransition__ActionAssignment_13_1 )
+            // InternalRoom.g:17981:2: rule__TriggeredTransition__ActionAssignment_13_1
             {
-            pushFollow(FOLLOW_rule__TriggeredTransition__ActionAssignment_13_1_in_rule__TriggeredTransition__Group_13__1__Impl36454);
+            pushFollow(FOLLOW_2);
             rule__TriggeredTransition__ActionAssignment_13_1();
 
             state._fsp--;
@@ -49527,21 +49527,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17992:1: rule__GuardedTransition__Group__0 : rule__GuardedTransition__Group__0__Impl rule__GuardedTransition__Group__1 ;
+    // InternalRoom.g:17995:1: rule__GuardedTransition__Group__0 : rule__GuardedTransition__Group__0__Impl rule__GuardedTransition__Group__1 ;
     public final void rule__GuardedTransition__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17996:1: ( rule__GuardedTransition__Group__0__Impl rule__GuardedTransition__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17997:2: rule__GuardedTransition__Group__0__Impl rule__GuardedTransition__Group__1
+            // InternalRoom.g:17999:1: ( rule__GuardedTransition__Group__0__Impl rule__GuardedTransition__Group__1 )
+            // InternalRoom.g:18000:2: rule__GuardedTransition__Group__0__Impl rule__GuardedTransition__Group__1
             {
-            pushFollow(FOLLOW_rule__GuardedTransition__Group__0__Impl_in_rule__GuardedTransition__Group__036488);
+            pushFollow(FOLLOW_83);
             rule__GuardedTransition__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__GuardedTransition__Group__1_in_rule__GuardedTransition__Group__036491);
+            pushFollow(FOLLOW_2);
             rule__GuardedTransition__Group__1();
 
             state._fsp--;
@@ -49565,20 +49565,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18004:1: rule__GuardedTransition__Group__0__Impl : ( 'Transition' ) ;
+    // InternalRoom.g:18007:1: rule__GuardedTransition__Group__0__Impl : ( 'Transition' ) ;
     public final void rule__GuardedTransition__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18008:1: ( ( 'Transition' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18009:1: ( 'Transition' )
+            // InternalRoom.g:18011:1: ( ( 'Transition' ) )
+            // InternalRoom.g:18012:1: ( 'Transition' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18009:1: ( 'Transition' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18010:1: 'Transition'
+            // InternalRoom.g:18012:1: ( 'Transition' )
+            // InternalRoom.g:18013:1: 'Transition'
             {
              before(grammarAccess.getGuardedTransitionAccess().getTransitionKeyword_0()); 
-            match(input,104,FOLLOW_104_in_rule__GuardedTransition__Group__0__Impl36519); 
+            match(input,104,FOLLOW_2); 
              after(grammarAccess.getGuardedTransitionAccess().getTransitionKeyword_0()); 
 
             }
@@ -49602,21 +49602,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18023:1: rule__GuardedTransition__Group__1 : rule__GuardedTransition__Group__1__Impl rule__GuardedTransition__Group__2 ;
+    // InternalRoom.g:18026:1: rule__GuardedTransition__Group__1 : rule__GuardedTransition__Group__1__Impl rule__GuardedTransition__Group__2 ;
     public final void rule__GuardedTransition__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18027:1: ( rule__GuardedTransition__Group__1__Impl rule__GuardedTransition__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18028:2: rule__GuardedTransition__Group__1__Impl rule__GuardedTransition__Group__2
+            // InternalRoom.g:18030:1: ( rule__GuardedTransition__Group__1__Impl rule__GuardedTransition__Group__2 )
+            // InternalRoom.g:18031:2: rule__GuardedTransition__Group__1__Impl rule__GuardedTransition__Group__2
             {
-            pushFollow(FOLLOW_rule__GuardedTransition__Group__1__Impl_in_rule__GuardedTransition__Group__136550);
+            pushFollow(FOLLOW_83);
             rule__GuardedTransition__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__GuardedTransition__Group__2_in_rule__GuardedTransition__Group__136553);
+            pushFollow(FOLLOW_2);
             rule__GuardedTransition__Group__2();
 
             state._fsp--;
@@ -49640,20 +49640,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18035:1: rule__GuardedTransition__Group__1__Impl : ( ( rule__GuardedTransition__NameAssignment_1 )? ) ;
+    // InternalRoom.g:18038:1: rule__GuardedTransition__Group__1__Impl : ( ( rule__GuardedTransition__NameAssignment_1 )? ) ;
     public final void rule__GuardedTransition__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18039:1: ( ( ( rule__GuardedTransition__NameAssignment_1 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18040:1: ( ( rule__GuardedTransition__NameAssignment_1 )? )
+            // InternalRoom.g:18042:1: ( ( ( rule__GuardedTransition__NameAssignment_1 )? ) )
+            // InternalRoom.g:18043:1: ( ( rule__GuardedTransition__NameAssignment_1 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18040:1: ( ( rule__GuardedTransition__NameAssignment_1 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18041:1: ( rule__GuardedTransition__NameAssignment_1 )?
+            // InternalRoom.g:18043:1: ( ( rule__GuardedTransition__NameAssignment_1 )? )
+            // InternalRoom.g:18044:1: ( rule__GuardedTransition__NameAssignment_1 )?
             {
              before(grammarAccess.getGuardedTransitionAccess().getNameAssignment_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18042:1: ( rule__GuardedTransition__NameAssignment_1 )?
+            // InternalRoom.g:18045:1: ( rule__GuardedTransition__NameAssignment_1 )?
             int alt175=2;
             int LA175_0 = input.LA(1);
 
@@ -49662,9 +49662,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt175) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18042:2: rule__GuardedTransition__NameAssignment_1
+                    // InternalRoom.g:18045:2: rule__GuardedTransition__NameAssignment_1
                     {
-                    pushFollow(FOLLOW_rule__GuardedTransition__NameAssignment_1_in_rule__GuardedTransition__Group__1__Impl36580);
+                    pushFollow(FOLLOW_2);
                     rule__GuardedTransition__NameAssignment_1();
 
                     state._fsp--;
@@ -49698,21 +49698,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18052:1: rule__GuardedTransition__Group__2 : rule__GuardedTransition__Group__2__Impl rule__GuardedTransition__Group__3 ;
+    // InternalRoom.g:18055:1: rule__GuardedTransition__Group__2 : rule__GuardedTransition__Group__2__Impl rule__GuardedTransition__Group__3 ;
     public final void rule__GuardedTransition__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18056:1: ( rule__GuardedTransition__Group__2__Impl rule__GuardedTransition__Group__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18057:2: rule__GuardedTransition__Group__2__Impl rule__GuardedTransition__Group__3
+            // InternalRoom.g:18059:1: ( rule__GuardedTransition__Group__2__Impl rule__GuardedTransition__Group__3 )
+            // InternalRoom.g:18060:2: rule__GuardedTransition__Group__2__Impl rule__GuardedTransition__Group__3
             {
-            pushFollow(FOLLOW_rule__GuardedTransition__Group__2__Impl_in_rule__GuardedTransition__Group__236611);
+            pushFollow(FOLLOW_85);
             rule__GuardedTransition__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__GuardedTransition__Group__3_in_rule__GuardedTransition__Group__236614);
+            pushFollow(FOLLOW_2);
             rule__GuardedTransition__Group__3();
 
             state._fsp--;
@@ -49736,20 +49736,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18064:1: rule__GuardedTransition__Group__2__Impl : ( ':' ) ;
+    // InternalRoom.g:18067:1: rule__GuardedTransition__Group__2__Impl : ( ':' ) ;
     public final void rule__GuardedTransition__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18068:1: ( ( ':' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18069:1: ( ':' )
+            // InternalRoom.g:18071:1: ( ( ':' ) )
+            // InternalRoom.g:18072:1: ( ':' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18069:1: ( ':' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18070:1: ':'
+            // InternalRoom.g:18072:1: ( ':' )
+            // InternalRoom.g:18073:1: ':'
             {
              before(grammarAccess.getGuardedTransitionAccess().getColonKeyword_2()); 
-            match(input,43,FOLLOW_43_in_rule__GuardedTransition__Group__2__Impl36642); 
+            match(input,43,FOLLOW_2); 
              after(grammarAccess.getGuardedTransitionAccess().getColonKeyword_2()); 
 
             }
@@ -49773,21 +49773,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18083:1: rule__GuardedTransition__Group__3 : rule__GuardedTransition__Group__3__Impl rule__GuardedTransition__Group__4 ;
+    // InternalRoom.g:18086:1: rule__GuardedTransition__Group__3 : rule__GuardedTransition__Group__3__Impl rule__GuardedTransition__Group__4 ;
     public final void rule__GuardedTransition__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18087:1: ( rule__GuardedTransition__Group__3__Impl rule__GuardedTransition__Group__4 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18088:2: rule__GuardedTransition__Group__3__Impl rule__GuardedTransition__Group__4
+            // InternalRoom.g:18090:1: ( rule__GuardedTransition__Group__3__Impl rule__GuardedTransition__Group__4 )
+            // InternalRoom.g:18091:2: rule__GuardedTransition__Group__3__Impl rule__GuardedTransition__Group__4
             {
-            pushFollow(FOLLOW_rule__GuardedTransition__Group__3__Impl_in_rule__GuardedTransition__Group__336673);
+            pushFollow(FOLLOW_11);
             rule__GuardedTransition__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__GuardedTransition__Group__4_in_rule__GuardedTransition__Group__336676);
+            pushFollow(FOLLOW_2);
             rule__GuardedTransition__Group__4();
 
             state._fsp--;
@@ -49811,23 +49811,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18095:1: rule__GuardedTransition__Group__3__Impl : ( ( rule__GuardedTransition__FromAssignment_3 ) ) ;
+    // InternalRoom.g:18098:1: rule__GuardedTransition__Group__3__Impl : ( ( rule__GuardedTransition__FromAssignment_3 ) ) ;
     public final void rule__GuardedTransition__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18099:1: ( ( ( rule__GuardedTransition__FromAssignment_3 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18100:1: ( ( rule__GuardedTransition__FromAssignment_3 ) )
+            // InternalRoom.g:18102:1: ( ( ( rule__GuardedTransition__FromAssignment_3 ) ) )
+            // InternalRoom.g:18103:1: ( ( rule__GuardedTransition__FromAssignment_3 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18100:1: ( ( rule__GuardedTransition__FromAssignment_3 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18101:1: ( rule__GuardedTransition__FromAssignment_3 )
+            // InternalRoom.g:18103:1: ( ( rule__GuardedTransition__FromAssignment_3 ) )
+            // InternalRoom.g:18104:1: ( rule__GuardedTransition__FromAssignment_3 )
             {
              before(grammarAccess.getGuardedTransitionAccess().getFromAssignment_3()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18102:1: ( rule__GuardedTransition__FromAssignment_3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18102:2: rule__GuardedTransition__FromAssignment_3
+            // InternalRoom.g:18105:1: ( rule__GuardedTransition__FromAssignment_3 )
+            // InternalRoom.g:18105:2: rule__GuardedTransition__FromAssignment_3
             {
-            pushFollow(FOLLOW_rule__GuardedTransition__FromAssignment_3_in_rule__GuardedTransition__Group__3__Impl36703);
+            pushFollow(FOLLOW_2);
             rule__GuardedTransition__FromAssignment_3();
 
             state._fsp--;
@@ -49858,21 +49858,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group__4"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18112:1: rule__GuardedTransition__Group__4 : rule__GuardedTransition__Group__4__Impl rule__GuardedTransition__Group__5 ;
+    // InternalRoom.g:18115:1: rule__GuardedTransition__Group__4 : rule__GuardedTransition__Group__4__Impl rule__GuardedTransition__Group__5 ;
     public final void rule__GuardedTransition__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18116:1: ( rule__GuardedTransition__Group__4__Impl rule__GuardedTransition__Group__5 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18117:2: rule__GuardedTransition__Group__4__Impl rule__GuardedTransition__Group__5
+            // InternalRoom.g:18119:1: ( rule__GuardedTransition__Group__4__Impl rule__GuardedTransition__Group__5 )
+            // InternalRoom.g:18120:2: rule__GuardedTransition__Group__4__Impl rule__GuardedTransition__Group__5
             {
-            pushFollow(FOLLOW_rule__GuardedTransition__Group__4__Impl_in_rule__GuardedTransition__Group__436733);
+            pushFollow(FOLLOW_85);
             rule__GuardedTransition__Group__4__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__GuardedTransition__Group__5_in_rule__GuardedTransition__Group__436736);
+            pushFollow(FOLLOW_2);
             rule__GuardedTransition__Group__5();
 
             state._fsp--;
@@ -49896,20 +49896,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group__4__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18124:1: rule__GuardedTransition__Group__4__Impl : ( '->' ) ;
+    // InternalRoom.g:18127:1: rule__GuardedTransition__Group__4__Impl : ( '->' ) ;
     public final void rule__GuardedTransition__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18128:1: ( ( '->' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18129:1: ( '->' )
+            // InternalRoom.g:18131:1: ( ( '->' ) )
+            // InternalRoom.g:18132:1: ( '->' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18129:1: ( '->' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18130:1: '->'
+            // InternalRoom.g:18132:1: ( '->' )
+            // InternalRoom.g:18133:1: '->'
             {
              before(grammarAccess.getGuardedTransitionAccess().getHyphenMinusGreaterThanSignKeyword_4()); 
-            match(input,45,FOLLOW_45_in_rule__GuardedTransition__Group__4__Impl36764); 
+            match(input,45,FOLLOW_2); 
              after(grammarAccess.getGuardedTransitionAccess().getHyphenMinusGreaterThanSignKeyword_4()); 
 
             }
@@ -49933,21 +49933,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group__5"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18143:1: rule__GuardedTransition__Group__5 : rule__GuardedTransition__Group__5__Impl rule__GuardedTransition__Group__6 ;
+    // InternalRoom.g:18146:1: rule__GuardedTransition__Group__5 : rule__GuardedTransition__Group__5__Impl rule__GuardedTransition__Group__6 ;
     public final void rule__GuardedTransition__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18147:1: ( rule__GuardedTransition__Group__5__Impl rule__GuardedTransition__Group__6 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18148:2: rule__GuardedTransition__Group__5__Impl rule__GuardedTransition__Group__6
+            // InternalRoom.g:18150:1: ( rule__GuardedTransition__Group__5__Impl rule__GuardedTransition__Group__6 )
+            // InternalRoom.g:18151:2: rule__GuardedTransition__Group__5__Impl rule__GuardedTransition__Group__6
             {
-            pushFollow(FOLLOW_rule__GuardedTransition__Group__5__Impl_in_rule__GuardedTransition__Group__536795);
+            pushFollow(FOLLOW_4);
             rule__GuardedTransition__Group__5__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__GuardedTransition__Group__6_in_rule__GuardedTransition__Group__536798);
+            pushFollow(FOLLOW_2);
             rule__GuardedTransition__Group__6();
 
             state._fsp--;
@@ -49971,23 +49971,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group__5__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18155:1: rule__GuardedTransition__Group__5__Impl : ( ( rule__GuardedTransition__ToAssignment_5 ) ) ;
+    // InternalRoom.g:18158:1: rule__GuardedTransition__Group__5__Impl : ( ( rule__GuardedTransition__ToAssignment_5 ) ) ;
     public final void rule__GuardedTransition__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18159:1: ( ( ( rule__GuardedTransition__ToAssignment_5 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18160:1: ( ( rule__GuardedTransition__ToAssignment_5 ) )
+            // InternalRoom.g:18162:1: ( ( ( rule__GuardedTransition__ToAssignment_5 ) ) )
+            // InternalRoom.g:18163:1: ( ( rule__GuardedTransition__ToAssignment_5 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18160:1: ( ( rule__GuardedTransition__ToAssignment_5 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18161:1: ( rule__GuardedTransition__ToAssignment_5 )
+            // InternalRoom.g:18163:1: ( ( rule__GuardedTransition__ToAssignment_5 ) )
+            // InternalRoom.g:18164:1: ( rule__GuardedTransition__ToAssignment_5 )
             {
              before(grammarAccess.getGuardedTransitionAccess().getToAssignment_5()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18162:1: ( rule__GuardedTransition__ToAssignment_5 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18162:2: rule__GuardedTransition__ToAssignment_5
+            // InternalRoom.g:18165:1: ( rule__GuardedTransition__ToAssignment_5 )
+            // InternalRoom.g:18165:2: rule__GuardedTransition__ToAssignment_5
             {
-            pushFollow(FOLLOW_rule__GuardedTransition__ToAssignment_5_in_rule__GuardedTransition__Group__5__Impl36825);
+            pushFollow(FOLLOW_2);
             rule__GuardedTransition__ToAssignment_5();
 
             state._fsp--;
@@ -50018,21 +50018,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group__6"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18172:1: rule__GuardedTransition__Group__6 : rule__GuardedTransition__Group__6__Impl rule__GuardedTransition__Group__7 ;
+    // InternalRoom.g:18175:1: rule__GuardedTransition__Group__6 : rule__GuardedTransition__Group__6__Impl rule__GuardedTransition__Group__7 ;
     public final void rule__GuardedTransition__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18176:1: ( rule__GuardedTransition__Group__6__Impl rule__GuardedTransition__Group__7 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18177:2: rule__GuardedTransition__Group__6__Impl rule__GuardedTransition__Group__7
+            // InternalRoom.g:18179:1: ( rule__GuardedTransition__Group__6__Impl rule__GuardedTransition__Group__7 )
+            // InternalRoom.g:18180:2: rule__GuardedTransition__Group__6__Impl rule__GuardedTransition__Group__7
             {
-            pushFollow(FOLLOW_rule__GuardedTransition__Group__6__Impl_in_rule__GuardedTransition__Group__636855);
+            pushFollow(FOLLOW_4);
             rule__GuardedTransition__Group__6__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__GuardedTransition__Group__7_in_rule__GuardedTransition__Group__636858);
+            pushFollow(FOLLOW_2);
             rule__GuardedTransition__Group__7();
 
             state._fsp--;
@@ -50056,20 +50056,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group__6__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18184:1: rule__GuardedTransition__Group__6__Impl : ( ( rule__GuardedTransition__DocuAssignment_6 )? ) ;
+    // InternalRoom.g:18187:1: rule__GuardedTransition__Group__6__Impl : ( ( rule__GuardedTransition__DocuAssignment_6 )? ) ;
     public final void rule__GuardedTransition__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18188:1: ( ( ( rule__GuardedTransition__DocuAssignment_6 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18189:1: ( ( rule__GuardedTransition__DocuAssignment_6 )? )
+            // InternalRoom.g:18191:1: ( ( ( rule__GuardedTransition__DocuAssignment_6 )? ) )
+            // InternalRoom.g:18192:1: ( ( rule__GuardedTransition__DocuAssignment_6 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18189:1: ( ( rule__GuardedTransition__DocuAssignment_6 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18190:1: ( rule__GuardedTransition__DocuAssignment_6 )?
+            // InternalRoom.g:18192:1: ( ( rule__GuardedTransition__DocuAssignment_6 )? )
+            // InternalRoom.g:18193:1: ( rule__GuardedTransition__DocuAssignment_6 )?
             {
              before(grammarAccess.getGuardedTransitionAccess().getDocuAssignment_6()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18191:1: ( rule__GuardedTransition__DocuAssignment_6 )?
+            // InternalRoom.g:18194:1: ( rule__GuardedTransition__DocuAssignment_6 )?
             int alt176=2;
             int LA176_0 = input.LA(1);
 
@@ -50078,9 +50078,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt176) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18191:2: rule__GuardedTransition__DocuAssignment_6
+                    // InternalRoom.g:18194:2: rule__GuardedTransition__DocuAssignment_6
                     {
-                    pushFollow(FOLLOW_rule__GuardedTransition__DocuAssignment_6_in_rule__GuardedTransition__Group__6__Impl36885);
+                    pushFollow(FOLLOW_2);
                     rule__GuardedTransition__DocuAssignment_6();
 
                     state._fsp--;
@@ -50114,21 +50114,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group__7"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18201:1: rule__GuardedTransition__Group__7 : rule__GuardedTransition__Group__7__Impl rule__GuardedTransition__Group__8 ;
+    // InternalRoom.g:18204:1: rule__GuardedTransition__Group__7 : rule__GuardedTransition__Group__7__Impl rule__GuardedTransition__Group__8 ;
     public final void rule__GuardedTransition__Group__7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18205:1: ( rule__GuardedTransition__Group__7__Impl rule__GuardedTransition__Group__8 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18206:2: rule__GuardedTransition__Group__7__Impl rule__GuardedTransition__Group__8
+            // InternalRoom.g:18208:1: ( rule__GuardedTransition__Group__7__Impl rule__GuardedTransition__Group__8 )
+            // InternalRoom.g:18209:2: rule__GuardedTransition__Group__7__Impl rule__GuardedTransition__Group__8
             {
-            pushFollow(FOLLOW_rule__GuardedTransition__Group__7__Impl_in_rule__GuardedTransition__Group__736916);
+            pushFollow(FOLLOW_91);
             rule__GuardedTransition__Group__7__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__GuardedTransition__Group__8_in_rule__GuardedTransition__Group__736919);
+            pushFollow(FOLLOW_2);
             rule__GuardedTransition__Group__8();
 
             state._fsp--;
@@ -50152,20 +50152,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group__7__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18213:1: rule__GuardedTransition__Group__7__Impl : ( '{' ) ;
+    // InternalRoom.g:18216:1: rule__GuardedTransition__Group__7__Impl : ( '{' ) ;
     public final void rule__GuardedTransition__Group__7__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18217:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18218:1: ( '{' )
+            // InternalRoom.g:18220:1: ( ( '{' ) )
+            // InternalRoom.g:18221:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18218:1: ( '{' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18219:1: '{'
+            // InternalRoom.g:18221:1: ( '{' )
+            // InternalRoom.g:18222:1: '{'
             {
              before(grammarAccess.getGuardedTransitionAccess().getLeftCurlyBracketKeyword_7()); 
-            match(input,41,FOLLOW_41_in_rule__GuardedTransition__Group__7__Impl36947); 
+            match(input,41,FOLLOW_2); 
              after(grammarAccess.getGuardedTransitionAccess().getLeftCurlyBracketKeyword_7()); 
 
             }
@@ -50189,21 +50189,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group__8"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18232:1: rule__GuardedTransition__Group__8 : rule__GuardedTransition__Group__8__Impl rule__GuardedTransition__Group__9 ;
+    // InternalRoom.g:18235:1: rule__GuardedTransition__Group__8 : rule__GuardedTransition__Group__8__Impl rule__GuardedTransition__Group__9 ;
     public final void rule__GuardedTransition__Group__8() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18236:1: ( rule__GuardedTransition__Group__8__Impl rule__GuardedTransition__Group__9 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18237:2: rule__GuardedTransition__Group__8__Impl rule__GuardedTransition__Group__9
+            // InternalRoom.g:18239:1: ( rule__GuardedTransition__Group__8__Impl rule__GuardedTransition__Group__9 )
+            // InternalRoom.g:18240:2: rule__GuardedTransition__Group__8__Impl rule__GuardedTransition__Group__9
             {
-            pushFollow(FOLLOW_rule__GuardedTransition__Group__8__Impl_in_rule__GuardedTransition__Group__836978);
+            pushFollow(FOLLOW_27);
             rule__GuardedTransition__Group__8__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__GuardedTransition__Group__9_in_rule__GuardedTransition__Group__836981);
+            pushFollow(FOLLOW_2);
             rule__GuardedTransition__Group__9();
 
             state._fsp--;
@@ -50227,20 +50227,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group__8__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18244:1: rule__GuardedTransition__Group__8__Impl : ( 'guard' ) ;
+    // InternalRoom.g:18247:1: rule__GuardedTransition__Group__8__Impl : ( 'guard' ) ;
     public final void rule__GuardedTransition__Group__8__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18248:1: ( ( 'guard' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18249:1: ( 'guard' )
+            // InternalRoom.g:18251:1: ( ( 'guard' ) )
+            // InternalRoom.g:18252:1: ( 'guard' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18249:1: ( 'guard' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18250:1: 'guard'
+            // InternalRoom.g:18252:1: ( 'guard' )
+            // InternalRoom.g:18253:1: 'guard'
             {
              before(grammarAccess.getGuardedTransitionAccess().getGuardKeyword_8()); 
-            match(input,109,FOLLOW_109_in_rule__GuardedTransition__Group__8__Impl37009); 
+            match(input,109,FOLLOW_2); 
              after(grammarAccess.getGuardedTransitionAccess().getGuardKeyword_8()); 
 
             }
@@ -50264,21 +50264,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group__9"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18263:1: rule__GuardedTransition__Group__9 : rule__GuardedTransition__Group__9__Impl rule__GuardedTransition__Group__10 ;
+    // InternalRoom.g:18266:1: rule__GuardedTransition__Group__9 : rule__GuardedTransition__Group__9__Impl rule__GuardedTransition__Group__10 ;
     public final void rule__GuardedTransition__Group__9() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18267:1: ( rule__GuardedTransition__Group__9__Impl rule__GuardedTransition__Group__10 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18268:2: rule__GuardedTransition__Group__9__Impl rule__GuardedTransition__Group__10
+            // InternalRoom.g:18270:1: ( rule__GuardedTransition__Group__9__Impl rule__GuardedTransition__Group__10 )
+            // InternalRoom.g:18271:2: rule__GuardedTransition__Group__9__Impl rule__GuardedTransition__Group__10
             {
-            pushFollow(FOLLOW_rule__GuardedTransition__Group__9__Impl_in_rule__GuardedTransition__Group__937040);
+            pushFollow(FOLLOW_86);
             rule__GuardedTransition__Group__9__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__GuardedTransition__Group__10_in_rule__GuardedTransition__Group__937043);
+            pushFollow(FOLLOW_2);
             rule__GuardedTransition__Group__10();
 
             state._fsp--;
@@ -50302,23 +50302,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group__9__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18275:1: rule__GuardedTransition__Group__9__Impl : ( ( rule__GuardedTransition__GuardAssignment_9 ) ) ;
+    // InternalRoom.g:18278:1: rule__GuardedTransition__Group__9__Impl : ( ( rule__GuardedTransition__GuardAssignment_9 ) ) ;
     public final void rule__GuardedTransition__Group__9__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18279:1: ( ( ( rule__GuardedTransition__GuardAssignment_9 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18280:1: ( ( rule__GuardedTransition__GuardAssignment_9 ) )
+            // InternalRoom.g:18282:1: ( ( ( rule__GuardedTransition__GuardAssignment_9 ) ) )
+            // InternalRoom.g:18283:1: ( ( rule__GuardedTransition__GuardAssignment_9 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18280:1: ( ( rule__GuardedTransition__GuardAssignment_9 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18281:1: ( rule__GuardedTransition__GuardAssignment_9 )
+            // InternalRoom.g:18283:1: ( ( rule__GuardedTransition__GuardAssignment_9 ) )
+            // InternalRoom.g:18284:1: ( rule__GuardedTransition__GuardAssignment_9 )
             {
              before(grammarAccess.getGuardedTransitionAccess().getGuardAssignment_9()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18282:1: ( rule__GuardedTransition__GuardAssignment_9 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18282:2: rule__GuardedTransition__GuardAssignment_9
+            // InternalRoom.g:18285:1: ( rule__GuardedTransition__GuardAssignment_9 )
+            // InternalRoom.g:18285:2: rule__GuardedTransition__GuardAssignment_9
             {
-            pushFollow(FOLLOW_rule__GuardedTransition__GuardAssignment_9_in_rule__GuardedTransition__Group__9__Impl37070);
+            pushFollow(FOLLOW_2);
             rule__GuardedTransition__GuardAssignment_9();
 
             state._fsp--;
@@ -50349,21 +50349,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group__10"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18292:1: rule__GuardedTransition__Group__10 : rule__GuardedTransition__Group__10__Impl rule__GuardedTransition__Group__11 ;
+    // InternalRoom.g:18295:1: rule__GuardedTransition__Group__10 : rule__GuardedTransition__Group__10__Impl rule__GuardedTransition__Group__11 ;
     public final void rule__GuardedTransition__Group__10() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18296:1: ( rule__GuardedTransition__Group__10__Impl rule__GuardedTransition__Group__11 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18297:2: rule__GuardedTransition__Group__10__Impl rule__GuardedTransition__Group__11
+            // InternalRoom.g:18299:1: ( rule__GuardedTransition__Group__10__Impl rule__GuardedTransition__Group__11 )
+            // InternalRoom.g:18300:2: rule__GuardedTransition__Group__10__Impl rule__GuardedTransition__Group__11
             {
-            pushFollow(FOLLOW_rule__GuardedTransition__Group__10__Impl_in_rule__GuardedTransition__Group__1037100);
+            pushFollow(FOLLOW_86);
             rule__GuardedTransition__Group__10__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__GuardedTransition__Group__11_in_rule__GuardedTransition__Group__1037103);
+            pushFollow(FOLLOW_2);
             rule__GuardedTransition__Group__11();
 
             state._fsp--;
@@ -50387,20 +50387,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group__10__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18304:1: rule__GuardedTransition__Group__10__Impl : ( ( rule__GuardedTransition__Group_10__0 )? ) ;
+    // InternalRoom.g:18307:1: rule__GuardedTransition__Group__10__Impl : ( ( rule__GuardedTransition__Group_10__0 )? ) ;
     public final void rule__GuardedTransition__Group__10__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18308:1: ( ( ( rule__GuardedTransition__Group_10__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18309:1: ( ( rule__GuardedTransition__Group_10__0 )? )
+            // InternalRoom.g:18311:1: ( ( ( rule__GuardedTransition__Group_10__0 )? ) )
+            // InternalRoom.g:18312:1: ( ( rule__GuardedTransition__Group_10__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18309:1: ( ( rule__GuardedTransition__Group_10__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18310:1: ( rule__GuardedTransition__Group_10__0 )?
+            // InternalRoom.g:18312:1: ( ( rule__GuardedTransition__Group_10__0 )? )
+            // InternalRoom.g:18313:1: ( rule__GuardedTransition__Group_10__0 )?
             {
              before(grammarAccess.getGuardedTransitionAccess().getGroup_10()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18311:1: ( rule__GuardedTransition__Group_10__0 )?
+            // InternalRoom.g:18314:1: ( rule__GuardedTransition__Group_10__0 )?
             int alt177=2;
             int LA177_0 = input.LA(1);
 
@@ -50409,9 +50409,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt177) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18311:2: rule__GuardedTransition__Group_10__0
+                    // InternalRoom.g:18314:2: rule__GuardedTransition__Group_10__0
                     {
-                    pushFollow(FOLLOW_rule__GuardedTransition__Group_10__0_in_rule__GuardedTransition__Group__10__Impl37130);
+                    pushFollow(FOLLOW_2);
                     rule__GuardedTransition__Group_10__0();
 
                     state._fsp--;
@@ -50445,16 +50445,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group__11"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18321:1: rule__GuardedTransition__Group__11 : rule__GuardedTransition__Group__11__Impl ;
+    // InternalRoom.g:18324:1: rule__GuardedTransition__Group__11 : rule__GuardedTransition__Group__11__Impl ;
     public final void rule__GuardedTransition__Group__11() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18325:1: ( rule__GuardedTransition__Group__11__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18326:2: rule__GuardedTransition__Group__11__Impl
+            // InternalRoom.g:18328:1: ( rule__GuardedTransition__Group__11__Impl )
+            // InternalRoom.g:18329:2: rule__GuardedTransition__Group__11__Impl
             {
-            pushFollow(FOLLOW_rule__GuardedTransition__Group__11__Impl_in_rule__GuardedTransition__Group__1137161);
+            pushFollow(FOLLOW_2);
             rule__GuardedTransition__Group__11__Impl();
 
             state._fsp--;
@@ -50478,20 +50478,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group__11__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18332:1: rule__GuardedTransition__Group__11__Impl : ( '}' ) ;
+    // InternalRoom.g:18335:1: rule__GuardedTransition__Group__11__Impl : ( '}' ) ;
     public final void rule__GuardedTransition__Group__11__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18336:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18337:1: ( '}' )
+            // InternalRoom.g:18339:1: ( ( '}' ) )
+            // InternalRoom.g:18340:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18337:1: ( '}' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18338:1: '}'
+            // InternalRoom.g:18340:1: ( '}' )
+            // InternalRoom.g:18341:1: '}'
             {
              before(grammarAccess.getGuardedTransitionAccess().getRightCurlyBracketKeyword_11()); 
-            match(input,42,FOLLOW_42_in_rule__GuardedTransition__Group__11__Impl37189); 
+            match(input,42,FOLLOW_2); 
              after(grammarAccess.getGuardedTransitionAccess().getRightCurlyBracketKeyword_11()); 
 
             }
@@ -50515,21 +50515,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group_10__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18375:1: rule__GuardedTransition__Group_10__0 : rule__GuardedTransition__Group_10__0__Impl rule__GuardedTransition__Group_10__1 ;
+    // InternalRoom.g:18378:1: rule__GuardedTransition__Group_10__0 : rule__GuardedTransition__Group_10__0__Impl rule__GuardedTransition__Group_10__1 ;
     public final void rule__GuardedTransition__Group_10__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18379:1: ( rule__GuardedTransition__Group_10__0__Impl rule__GuardedTransition__Group_10__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18380:2: rule__GuardedTransition__Group_10__0__Impl rule__GuardedTransition__Group_10__1
+            // InternalRoom.g:18382:1: ( rule__GuardedTransition__Group_10__0__Impl rule__GuardedTransition__Group_10__1 )
+            // InternalRoom.g:18383:2: rule__GuardedTransition__Group_10__0__Impl rule__GuardedTransition__Group_10__1
             {
-            pushFollow(FOLLOW_rule__GuardedTransition__Group_10__0__Impl_in_rule__GuardedTransition__Group_10__037244);
+            pushFollow(FOLLOW_27);
             rule__GuardedTransition__Group_10__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__GuardedTransition__Group_10__1_in_rule__GuardedTransition__Group_10__037247);
+            pushFollow(FOLLOW_2);
             rule__GuardedTransition__Group_10__1();
 
             state._fsp--;
@@ -50553,20 +50553,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group_10__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18387:1: rule__GuardedTransition__Group_10__0__Impl : ( 'action' ) ;
+    // InternalRoom.g:18390:1: rule__GuardedTransition__Group_10__0__Impl : ( 'action' ) ;
     public final void rule__GuardedTransition__Group_10__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18391:1: ( ( 'action' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18392:1: ( 'action' )
+            // InternalRoom.g:18394:1: ( ( 'action' ) )
+            // InternalRoom.g:18395:1: ( 'action' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18392:1: ( 'action' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18393:1: 'action'
+            // InternalRoom.g:18395:1: ( 'action' )
+            // InternalRoom.g:18396:1: 'action'
             {
              before(grammarAccess.getGuardedTransitionAccess().getActionKeyword_10_0()); 
-            match(input,106,FOLLOW_106_in_rule__GuardedTransition__Group_10__0__Impl37275); 
+            match(input,106,FOLLOW_2); 
              after(grammarAccess.getGuardedTransitionAccess().getActionKeyword_10_0()); 
 
             }
@@ -50590,16 +50590,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group_10__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18406:1: rule__GuardedTransition__Group_10__1 : rule__GuardedTransition__Group_10__1__Impl ;
+    // InternalRoom.g:18409:1: rule__GuardedTransition__Group_10__1 : rule__GuardedTransition__Group_10__1__Impl ;
     public final void rule__GuardedTransition__Group_10__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18410:1: ( rule__GuardedTransition__Group_10__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18411:2: rule__GuardedTransition__Group_10__1__Impl
+            // InternalRoom.g:18413:1: ( rule__GuardedTransition__Group_10__1__Impl )
+            // InternalRoom.g:18414:2: rule__GuardedTransition__Group_10__1__Impl
             {
-            pushFollow(FOLLOW_rule__GuardedTransition__Group_10__1__Impl_in_rule__GuardedTransition__Group_10__137306);
+            pushFollow(FOLLOW_2);
             rule__GuardedTransition__Group_10__1__Impl();
 
             state._fsp--;
@@ -50623,23 +50623,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__Group_10__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18417:1: rule__GuardedTransition__Group_10__1__Impl : ( ( rule__GuardedTransition__ActionAssignment_10_1 ) ) ;
+    // InternalRoom.g:18420:1: rule__GuardedTransition__Group_10__1__Impl : ( ( rule__GuardedTransition__ActionAssignment_10_1 ) ) ;
     public final void rule__GuardedTransition__Group_10__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18421:1: ( ( ( rule__GuardedTransition__ActionAssignment_10_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18422:1: ( ( rule__GuardedTransition__ActionAssignment_10_1 ) )
+            // InternalRoom.g:18424:1: ( ( ( rule__GuardedTransition__ActionAssignment_10_1 ) ) )
+            // InternalRoom.g:18425:1: ( ( rule__GuardedTransition__ActionAssignment_10_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18422:1: ( ( rule__GuardedTransition__ActionAssignment_10_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18423:1: ( rule__GuardedTransition__ActionAssignment_10_1 )
+            // InternalRoom.g:18425:1: ( ( rule__GuardedTransition__ActionAssignment_10_1 ) )
+            // InternalRoom.g:18426:1: ( rule__GuardedTransition__ActionAssignment_10_1 )
             {
              before(grammarAccess.getGuardedTransitionAccess().getActionAssignment_10_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18424:1: ( rule__GuardedTransition__ActionAssignment_10_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18424:2: rule__GuardedTransition__ActionAssignment_10_1
+            // InternalRoom.g:18427:1: ( rule__GuardedTransition__ActionAssignment_10_1 )
+            // InternalRoom.g:18427:2: rule__GuardedTransition__ActionAssignment_10_1
             {
-            pushFollow(FOLLOW_rule__GuardedTransition__ActionAssignment_10_1_in_rule__GuardedTransition__Group_10__1__Impl37333);
+            pushFollow(FOLLOW_2);
             rule__GuardedTransition__ActionAssignment_10_1();
 
             state._fsp--;
@@ -50670,21 +50670,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18438:1: rule__CPBranchTransition__Group__0 : rule__CPBranchTransition__Group__0__Impl rule__CPBranchTransition__Group__1 ;
+    // InternalRoom.g:18441:1: rule__CPBranchTransition__Group__0 : rule__CPBranchTransition__Group__0__Impl rule__CPBranchTransition__Group__1 ;
     public final void rule__CPBranchTransition__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18442:1: ( rule__CPBranchTransition__Group__0__Impl rule__CPBranchTransition__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18443:2: rule__CPBranchTransition__Group__0__Impl rule__CPBranchTransition__Group__1
+            // InternalRoom.g:18445:1: ( rule__CPBranchTransition__Group__0__Impl rule__CPBranchTransition__Group__1 )
+            // InternalRoom.g:18446:2: rule__CPBranchTransition__Group__0__Impl rule__CPBranchTransition__Group__1
             {
-            pushFollow(FOLLOW_rule__CPBranchTransition__Group__0__Impl_in_rule__CPBranchTransition__Group__037367);
+            pushFollow(FOLLOW_83);
             rule__CPBranchTransition__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__CPBranchTransition__Group__1_in_rule__CPBranchTransition__Group__037370);
+            pushFollow(FOLLOW_2);
             rule__CPBranchTransition__Group__1();
 
             state._fsp--;
@@ -50708,20 +50708,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18450:1: rule__CPBranchTransition__Group__0__Impl : ( 'Transition' ) ;
+    // InternalRoom.g:18453:1: rule__CPBranchTransition__Group__0__Impl : ( 'Transition' ) ;
     public final void rule__CPBranchTransition__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18454:1: ( ( 'Transition' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18455:1: ( 'Transition' )
+            // InternalRoom.g:18457:1: ( ( 'Transition' ) )
+            // InternalRoom.g:18458:1: ( 'Transition' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18455:1: ( 'Transition' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18456:1: 'Transition'
+            // InternalRoom.g:18458:1: ( 'Transition' )
+            // InternalRoom.g:18459:1: 'Transition'
             {
              before(grammarAccess.getCPBranchTransitionAccess().getTransitionKeyword_0()); 
-            match(input,104,FOLLOW_104_in_rule__CPBranchTransition__Group__0__Impl37398); 
+            match(input,104,FOLLOW_2); 
              after(grammarAccess.getCPBranchTransitionAccess().getTransitionKeyword_0()); 
 
             }
@@ -50745,21 +50745,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18469:1: rule__CPBranchTransition__Group__1 : rule__CPBranchTransition__Group__1__Impl rule__CPBranchTransition__Group__2 ;
+    // InternalRoom.g:18472:1: rule__CPBranchTransition__Group__1 : rule__CPBranchTransition__Group__1__Impl rule__CPBranchTransition__Group__2 ;
     public final void rule__CPBranchTransition__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18473:1: ( rule__CPBranchTransition__Group__1__Impl rule__CPBranchTransition__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18474:2: rule__CPBranchTransition__Group__1__Impl rule__CPBranchTransition__Group__2
+            // InternalRoom.g:18476:1: ( rule__CPBranchTransition__Group__1__Impl rule__CPBranchTransition__Group__2 )
+            // InternalRoom.g:18477:2: rule__CPBranchTransition__Group__1__Impl rule__CPBranchTransition__Group__2
             {
-            pushFollow(FOLLOW_rule__CPBranchTransition__Group__1__Impl_in_rule__CPBranchTransition__Group__137429);
+            pushFollow(FOLLOW_83);
             rule__CPBranchTransition__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__CPBranchTransition__Group__2_in_rule__CPBranchTransition__Group__137432);
+            pushFollow(FOLLOW_2);
             rule__CPBranchTransition__Group__2();
 
             state._fsp--;
@@ -50783,20 +50783,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18481:1: rule__CPBranchTransition__Group__1__Impl : ( ( rule__CPBranchTransition__NameAssignment_1 )? ) ;
+    // InternalRoom.g:18484:1: rule__CPBranchTransition__Group__1__Impl : ( ( rule__CPBranchTransition__NameAssignment_1 )? ) ;
     public final void rule__CPBranchTransition__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18485:1: ( ( ( rule__CPBranchTransition__NameAssignment_1 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18486:1: ( ( rule__CPBranchTransition__NameAssignment_1 )? )
+            // InternalRoom.g:18488:1: ( ( ( rule__CPBranchTransition__NameAssignment_1 )? ) )
+            // InternalRoom.g:18489:1: ( ( rule__CPBranchTransition__NameAssignment_1 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18486:1: ( ( rule__CPBranchTransition__NameAssignment_1 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18487:1: ( rule__CPBranchTransition__NameAssignment_1 )?
+            // InternalRoom.g:18489:1: ( ( rule__CPBranchTransition__NameAssignment_1 )? )
+            // InternalRoom.g:18490:1: ( rule__CPBranchTransition__NameAssignment_1 )?
             {
              before(grammarAccess.getCPBranchTransitionAccess().getNameAssignment_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18488:1: ( rule__CPBranchTransition__NameAssignment_1 )?
+            // InternalRoom.g:18491:1: ( rule__CPBranchTransition__NameAssignment_1 )?
             int alt178=2;
             int LA178_0 = input.LA(1);
 
@@ -50805,9 +50805,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt178) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18488:2: rule__CPBranchTransition__NameAssignment_1
+                    // InternalRoom.g:18491:2: rule__CPBranchTransition__NameAssignment_1
                     {
-                    pushFollow(FOLLOW_rule__CPBranchTransition__NameAssignment_1_in_rule__CPBranchTransition__Group__1__Impl37459);
+                    pushFollow(FOLLOW_2);
                     rule__CPBranchTransition__NameAssignment_1();
 
                     state._fsp--;
@@ -50841,21 +50841,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18498:1: rule__CPBranchTransition__Group__2 : rule__CPBranchTransition__Group__2__Impl rule__CPBranchTransition__Group__3 ;
+    // InternalRoom.g:18501:1: rule__CPBranchTransition__Group__2 : rule__CPBranchTransition__Group__2__Impl rule__CPBranchTransition__Group__3 ;
     public final void rule__CPBranchTransition__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18502:1: ( rule__CPBranchTransition__Group__2__Impl rule__CPBranchTransition__Group__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18503:2: rule__CPBranchTransition__Group__2__Impl rule__CPBranchTransition__Group__3
+            // InternalRoom.g:18505:1: ( rule__CPBranchTransition__Group__2__Impl rule__CPBranchTransition__Group__3 )
+            // InternalRoom.g:18506:2: rule__CPBranchTransition__Group__2__Impl rule__CPBranchTransition__Group__3
             {
-            pushFollow(FOLLOW_rule__CPBranchTransition__Group__2__Impl_in_rule__CPBranchTransition__Group__237490);
+            pushFollow(FOLLOW_85);
             rule__CPBranchTransition__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__CPBranchTransition__Group__3_in_rule__CPBranchTransition__Group__237493);
+            pushFollow(FOLLOW_2);
             rule__CPBranchTransition__Group__3();
 
             state._fsp--;
@@ -50879,20 +50879,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18510:1: rule__CPBranchTransition__Group__2__Impl : ( ':' ) ;
+    // InternalRoom.g:18513:1: rule__CPBranchTransition__Group__2__Impl : ( ':' ) ;
     public final void rule__CPBranchTransition__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18514:1: ( ( ':' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18515:1: ( ':' )
+            // InternalRoom.g:18517:1: ( ( ':' ) )
+            // InternalRoom.g:18518:1: ( ':' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18515:1: ( ':' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18516:1: ':'
+            // InternalRoom.g:18518:1: ( ':' )
+            // InternalRoom.g:18519:1: ':'
             {
              before(grammarAccess.getCPBranchTransitionAccess().getColonKeyword_2()); 
-            match(input,43,FOLLOW_43_in_rule__CPBranchTransition__Group__2__Impl37521); 
+            match(input,43,FOLLOW_2); 
              after(grammarAccess.getCPBranchTransitionAccess().getColonKeyword_2()); 
 
             }
@@ -50916,21 +50916,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18529:1: rule__CPBranchTransition__Group__3 : rule__CPBranchTransition__Group__3__Impl rule__CPBranchTransition__Group__4 ;
+    // InternalRoom.g:18532:1: rule__CPBranchTransition__Group__3 : rule__CPBranchTransition__Group__3__Impl rule__CPBranchTransition__Group__4 ;
     public final void rule__CPBranchTransition__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18533:1: ( rule__CPBranchTransition__Group__3__Impl rule__CPBranchTransition__Group__4 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18534:2: rule__CPBranchTransition__Group__3__Impl rule__CPBranchTransition__Group__4
+            // InternalRoom.g:18536:1: ( rule__CPBranchTransition__Group__3__Impl rule__CPBranchTransition__Group__4 )
+            // InternalRoom.g:18537:2: rule__CPBranchTransition__Group__3__Impl rule__CPBranchTransition__Group__4
             {
-            pushFollow(FOLLOW_rule__CPBranchTransition__Group__3__Impl_in_rule__CPBranchTransition__Group__337552);
+            pushFollow(FOLLOW_11);
             rule__CPBranchTransition__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__CPBranchTransition__Group__4_in_rule__CPBranchTransition__Group__337555);
+            pushFollow(FOLLOW_2);
             rule__CPBranchTransition__Group__4();
 
             state._fsp--;
@@ -50954,23 +50954,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18541:1: rule__CPBranchTransition__Group__3__Impl : ( ( rule__CPBranchTransition__FromAssignment_3 ) ) ;
+    // InternalRoom.g:18544:1: rule__CPBranchTransition__Group__3__Impl : ( ( rule__CPBranchTransition__FromAssignment_3 ) ) ;
     public final void rule__CPBranchTransition__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18545:1: ( ( ( rule__CPBranchTransition__FromAssignment_3 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18546:1: ( ( rule__CPBranchTransition__FromAssignment_3 ) )
+            // InternalRoom.g:18548:1: ( ( ( rule__CPBranchTransition__FromAssignment_3 ) ) )
+            // InternalRoom.g:18549:1: ( ( rule__CPBranchTransition__FromAssignment_3 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18546:1: ( ( rule__CPBranchTransition__FromAssignment_3 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18547:1: ( rule__CPBranchTransition__FromAssignment_3 )
+            // InternalRoom.g:18549:1: ( ( rule__CPBranchTransition__FromAssignment_3 ) )
+            // InternalRoom.g:18550:1: ( rule__CPBranchTransition__FromAssignment_3 )
             {
              before(grammarAccess.getCPBranchTransitionAccess().getFromAssignment_3()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18548:1: ( rule__CPBranchTransition__FromAssignment_3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18548:2: rule__CPBranchTransition__FromAssignment_3
+            // InternalRoom.g:18551:1: ( rule__CPBranchTransition__FromAssignment_3 )
+            // InternalRoom.g:18551:2: rule__CPBranchTransition__FromAssignment_3
             {
-            pushFollow(FOLLOW_rule__CPBranchTransition__FromAssignment_3_in_rule__CPBranchTransition__Group__3__Impl37582);
+            pushFollow(FOLLOW_2);
             rule__CPBranchTransition__FromAssignment_3();
 
             state._fsp--;
@@ -51001,21 +51001,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group__4"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18558:1: rule__CPBranchTransition__Group__4 : rule__CPBranchTransition__Group__4__Impl rule__CPBranchTransition__Group__5 ;
+    // InternalRoom.g:18561:1: rule__CPBranchTransition__Group__4 : rule__CPBranchTransition__Group__4__Impl rule__CPBranchTransition__Group__5 ;
     public final void rule__CPBranchTransition__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18562:1: ( rule__CPBranchTransition__Group__4__Impl rule__CPBranchTransition__Group__5 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18563:2: rule__CPBranchTransition__Group__4__Impl rule__CPBranchTransition__Group__5
+            // InternalRoom.g:18565:1: ( rule__CPBranchTransition__Group__4__Impl rule__CPBranchTransition__Group__5 )
+            // InternalRoom.g:18566:2: rule__CPBranchTransition__Group__4__Impl rule__CPBranchTransition__Group__5
             {
-            pushFollow(FOLLOW_rule__CPBranchTransition__Group__4__Impl_in_rule__CPBranchTransition__Group__437612);
+            pushFollow(FOLLOW_85);
             rule__CPBranchTransition__Group__4__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__CPBranchTransition__Group__5_in_rule__CPBranchTransition__Group__437615);
+            pushFollow(FOLLOW_2);
             rule__CPBranchTransition__Group__5();
 
             state._fsp--;
@@ -51039,20 +51039,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group__4__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18570:1: rule__CPBranchTransition__Group__4__Impl : ( '->' ) ;
+    // InternalRoom.g:18573:1: rule__CPBranchTransition__Group__4__Impl : ( '->' ) ;
     public final void rule__CPBranchTransition__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18574:1: ( ( '->' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18575:1: ( '->' )
+            // InternalRoom.g:18577:1: ( ( '->' ) )
+            // InternalRoom.g:18578:1: ( '->' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18575:1: ( '->' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18576:1: '->'
+            // InternalRoom.g:18578:1: ( '->' )
+            // InternalRoom.g:18579:1: '->'
             {
              before(grammarAccess.getCPBranchTransitionAccess().getHyphenMinusGreaterThanSignKeyword_4()); 
-            match(input,45,FOLLOW_45_in_rule__CPBranchTransition__Group__4__Impl37643); 
+            match(input,45,FOLLOW_2); 
              after(grammarAccess.getCPBranchTransitionAccess().getHyphenMinusGreaterThanSignKeyword_4()); 
 
             }
@@ -51076,21 +51076,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group__5"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18589:1: rule__CPBranchTransition__Group__5 : rule__CPBranchTransition__Group__5__Impl rule__CPBranchTransition__Group__6 ;
+    // InternalRoom.g:18592:1: rule__CPBranchTransition__Group__5 : rule__CPBranchTransition__Group__5__Impl rule__CPBranchTransition__Group__6 ;
     public final void rule__CPBranchTransition__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18593:1: ( rule__CPBranchTransition__Group__5__Impl rule__CPBranchTransition__Group__6 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18594:2: rule__CPBranchTransition__Group__5__Impl rule__CPBranchTransition__Group__6
+            // InternalRoom.g:18596:1: ( rule__CPBranchTransition__Group__5__Impl rule__CPBranchTransition__Group__6 )
+            // InternalRoom.g:18597:2: rule__CPBranchTransition__Group__5__Impl rule__CPBranchTransition__Group__6
             {
-            pushFollow(FOLLOW_rule__CPBranchTransition__Group__5__Impl_in_rule__CPBranchTransition__Group__537674);
+            pushFollow(FOLLOW_4);
             rule__CPBranchTransition__Group__5__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__CPBranchTransition__Group__6_in_rule__CPBranchTransition__Group__537677);
+            pushFollow(FOLLOW_2);
             rule__CPBranchTransition__Group__6();
 
             state._fsp--;
@@ -51114,23 +51114,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group__5__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18601:1: rule__CPBranchTransition__Group__5__Impl : ( ( rule__CPBranchTransition__ToAssignment_5 ) ) ;
+    // InternalRoom.g:18604:1: rule__CPBranchTransition__Group__5__Impl : ( ( rule__CPBranchTransition__ToAssignment_5 ) ) ;
     public final void rule__CPBranchTransition__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18605:1: ( ( ( rule__CPBranchTransition__ToAssignment_5 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18606:1: ( ( rule__CPBranchTransition__ToAssignment_5 ) )
+            // InternalRoom.g:18608:1: ( ( ( rule__CPBranchTransition__ToAssignment_5 ) ) )
+            // InternalRoom.g:18609:1: ( ( rule__CPBranchTransition__ToAssignment_5 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18606:1: ( ( rule__CPBranchTransition__ToAssignment_5 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18607:1: ( rule__CPBranchTransition__ToAssignment_5 )
+            // InternalRoom.g:18609:1: ( ( rule__CPBranchTransition__ToAssignment_5 ) )
+            // InternalRoom.g:18610:1: ( rule__CPBranchTransition__ToAssignment_5 )
             {
              before(grammarAccess.getCPBranchTransitionAccess().getToAssignment_5()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18608:1: ( rule__CPBranchTransition__ToAssignment_5 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18608:2: rule__CPBranchTransition__ToAssignment_5
+            // InternalRoom.g:18611:1: ( rule__CPBranchTransition__ToAssignment_5 )
+            // InternalRoom.g:18611:2: rule__CPBranchTransition__ToAssignment_5
             {
-            pushFollow(FOLLOW_rule__CPBranchTransition__ToAssignment_5_in_rule__CPBranchTransition__Group__5__Impl37704);
+            pushFollow(FOLLOW_2);
             rule__CPBranchTransition__ToAssignment_5();
 
             state._fsp--;
@@ -51161,21 +51161,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group__6"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18618:1: rule__CPBranchTransition__Group__6 : rule__CPBranchTransition__Group__6__Impl rule__CPBranchTransition__Group__7 ;
+    // InternalRoom.g:18621:1: rule__CPBranchTransition__Group__6 : rule__CPBranchTransition__Group__6__Impl rule__CPBranchTransition__Group__7 ;
     public final void rule__CPBranchTransition__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18622:1: ( rule__CPBranchTransition__Group__6__Impl rule__CPBranchTransition__Group__7 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18623:2: rule__CPBranchTransition__Group__6__Impl rule__CPBranchTransition__Group__7
+            // InternalRoom.g:18625:1: ( rule__CPBranchTransition__Group__6__Impl rule__CPBranchTransition__Group__7 )
+            // InternalRoom.g:18626:2: rule__CPBranchTransition__Group__6__Impl rule__CPBranchTransition__Group__7
             {
-            pushFollow(FOLLOW_rule__CPBranchTransition__Group__6__Impl_in_rule__CPBranchTransition__Group__637734);
+            pushFollow(FOLLOW_4);
             rule__CPBranchTransition__Group__6__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__CPBranchTransition__Group__7_in_rule__CPBranchTransition__Group__637737);
+            pushFollow(FOLLOW_2);
             rule__CPBranchTransition__Group__7();
 
             state._fsp--;
@@ -51199,20 +51199,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group__6__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18630:1: rule__CPBranchTransition__Group__6__Impl : ( ( rule__CPBranchTransition__DocuAssignment_6 )? ) ;
+    // InternalRoom.g:18633:1: rule__CPBranchTransition__Group__6__Impl : ( ( rule__CPBranchTransition__DocuAssignment_6 )? ) ;
     public final void rule__CPBranchTransition__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18634:1: ( ( ( rule__CPBranchTransition__DocuAssignment_6 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18635:1: ( ( rule__CPBranchTransition__DocuAssignment_6 )? )
+            // InternalRoom.g:18637:1: ( ( ( rule__CPBranchTransition__DocuAssignment_6 )? ) )
+            // InternalRoom.g:18638:1: ( ( rule__CPBranchTransition__DocuAssignment_6 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18635:1: ( ( rule__CPBranchTransition__DocuAssignment_6 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18636:1: ( rule__CPBranchTransition__DocuAssignment_6 )?
+            // InternalRoom.g:18638:1: ( ( rule__CPBranchTransition__DocuAssignment_6 )? )
+            // InternalRoom.g:18639:1: ( rule__CPBranchTransition__DocuAssignment_6 )?
             {
              before(grammarAccess.getCPBranchTransitionAccess().getDocuAssignment_6()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18637:1: ( rule__CPBranchTransition__DocuAssignment_6 )?
+            // InternalRoom.g:18640:1: ( rule__CPBranchTransition__DocuAssignment_6 )?
             int alt179=2;
             int LA179_0 = input.LA(1);
 
@@ -51221,9 +51221,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt179) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18637:2: rule__CPBranchTransition__DocuAssignment_6
+                    // InternalRoom.g:18640:2: rule__CPBranchTransition__DocuAssignment_6
                     {
-                    pushFollow(FOLLOW_rule__CPBranchTransition__DocuAssignment_6_in_rule__CPBranchTransition__Group__6__Impl37764);
+                    pushFollow(FOLLOW_2);
                     rule__CPBranchTransition__DocuAssignment_6();
 
                     state._fsp--;
@@ -51257,21 +51257,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group__7"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18647:1: rule__CPBranchTransition__Group__7 : rule__CPBranchTransition__Group__7__Impl rule__CPBranchTransition__Group__8 ;
+    // InternalRoom.g:18650:1: rule__CPBranchTransition__Group__7 : rule__CPBranchTransition__Group__7__Impl rule__CPBranchTransition__Group__8 ;
     public final void rule__CPBranchTransition__Group__7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18651:1: ( rule__CPBranchTransition__Group__7__Impl rule__CPBranchTransition__Group__8 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18652:2: rule__CPBranchTransition__Group__7__Impl rule__CPBranchTransition__Group__8
+            // InternalRoom.g:18654:1: ( rule__CPBranchTransition__Group__7__Impl rule__CPBranchTransition__Group__8 )
+            // InternalRoom.g:18655:2: rule__CPBranchTransition__Group__7__Impl rule__CPBranchTransition__Group__8
             {
-            pushFollow(FOLLOW_rule__CPBranchTransition__Group__7__Impl_in_rule__CPBranchTransition__Group__737795);
+            pushFollow(FOLLOW_92);
             rule__CPBranchTransition__Group__7__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__CPBranchTransition__Group__8_in_rule__CPBranchTransition__Group__737798);
+            pushFollow(FOLLOW_2);
             rule__CPBranchTransition__Group__8();
 
             state._fsp--;
@@ -51295,20 +51295,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group__7__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18659:1: rule__CPBranchTransition__Group__7__Impl : ( '{' ) ;
+    // InternalRoom.g:18662:1: rule__CPBranchTransition__Group__7__Impl : ( '{' ) ;
     public final void rule__CPBranchTransition__Group__7__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18663:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18664:1: ( '{' )
+            // InternalRoom.g:18666:1: ( ( '{' ) )
+            // InternalRoom.g:18667:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18664:1: ( '{' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18665:1: '{'
+            // InternalRoom.g:18667:1: ( '{' )
+            // InternalRoom.g:18668:1: '{'
             {
              before(grammarAccess.getCPBranchTransitionAccess().getLeftCurlyBracketKeyword_7()); 
-            match(input,41,FOLLOW_41_in_rule__CPBranchTransition__Group__7__Impl37826); 
+            match(input,41,FOLLOW_2); 
              after(grammarAccess.getCPBranchTransitionAccess().getLeftCurlyBracketKeyword_7()); 
 
             }
@@ -51332,21 +51332,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group__8"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18678:1: rule__CPBranchTransition__Group__8 : rule__CPBranchTransition__Group__8__Impl rule__CPBranchTransition__Group__9 ;
+    // InternalRoom.g:18681:1: rule__CPBranchTransition__Group__8 : rule__CPBranchTransition__Group__8__Impl rule__CPBranchTransition__Group__9 ;
     public final void rule__CPBranchTransition__Group__8() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18682:1: ( rule__CPBranchTransition__Group__8__Impl rule__CPBranchTransition__Group__9 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18683:2: rule__CPBranchTransition__Group__8__Impl rule__CPBranchTransition__Group__9
+            // InternalRoom.g:18685:1: ( rule__CPBranchTransition__Group__8__Impl rule__CPBranchTransition__Group__9 )
+            // InternalRoom.g:18686:2: rule__CPBranchTransition__Group__8__Impl rule__CPBranchTransition__Group__9
             {
-            pushFollow(FOLLOW_rule__CPBranchTransition__Group__8__Impl_in_rule__CPBranchTransition__Group__837857);
+            pushFollow(FOLLOW_27);
             rule__CPBranchTransition__Group__8__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__CPBranchTransition__Group__9_in_rule__CPBranchTransition__Group__837860);
+            pushFollow(FOLLOW_2);
             rule__CPBranchTransition__Group__9();
 
             state._fsp--;
@@ -51370,20 +51370,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group__8__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18690:1: rule__CPBranchTransition__Group__8__Impl : ( 'cond' ) ;
+    // InternalRoom.g:18693:1: rule__CPBranchTransition__Group__8__Impl : ( 'cond' ) ;
     public final void rule__CPBranchTransition__Group__8__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18694:1: ( ( 'cond' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18695:1: ( 'cond' )
+            // InternalRoom.g:18697:1: ( ( 'cond' ) )
+            // InternalRoom.g:18698:1: ( 'cond' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18695:1: ( 'cond' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18696:1: 'cond'
+            // InternalRoom.g:18698:1: ( 'cond' )
+            // InternalRoom.g:18699:1: 'cond'
             {
              before(grammarAccess.getCPBranchTransitionAccess().getCondKeyword_8()); 
-            match(input,110,FOLLOW_110_in_rule__CPBranchTransition__Group__8__Impl37888); 
+            match(input,110,FOLLOW_2); 
              after(grammarAccess.getCPBranchTransitionAccess().getCondKeyword_8()); 
 
             }
@@ -51407,21 +51407,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group__9"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18709:1: rule__CPBranchTransition__Group__9 : rule__CPBranchTransition__Group__9__Impl rule__CPBranchTransition__Group__10 ;
+    // InternalRoom.g:18712:1: rule__CPBranchTransition__Group__9 : rule__CPBranchTransition__Group__9__Impl rule__CPBranchTransition__Group__10 ;
     public final void rule__CPBranchTransition__Group__9() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18713:1: ( rule__CPBranchTransition__Group__9__Impl rule__CPBranchTransition__Group__10 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18714:2: rule__CPBranchTransition__Group__9__Impl rule__CPBranchTransition__Group__10
+            // InternalRoom.g:18716:1: ( rule__CPBranchTransition__Group__9__Impl rule__CPBranchTransition__Group__10 )
+            // InternalRoom.g:18717:2: rule__CPBranchTransition__Group__9__Impl rule__CPBranchTransition__Group__10
             {
-            pushFollow(FOLLOW_rule__CPBranchTransition__Group__9__Impl_in_rule__CPBranchTransition__Group__937919);
+            pushFollow(FOLLOW_86);
             rule__CPBranchTransition__Group__9__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__CPBranchTransition__Group__10_in_rule__CPBranchTransition__Group__937922);
+            pushFollow(FOLLOW_2);
             rule__CPBranchTransition__Group__10();
 
             state._fsp--;
@@ -51445,23 +51445,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group__9__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18721:1: rule__CPBranchTransition__Group__9__Impl : ( ( rule__CPBranchTransition__ConditionAssignment_9 ) ) ;
+    // InternalRoom.g:18724:1: rule__CPBranchTransition__Group__9__Impl : ( ( rule__CPBranchTransition__ConditionAssignment_9 ) ) ;
     public final void rule__CPBranchTransition__Group__9__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18725:1: ( ( ( rule__CPBranchTransition__ConditionAssignment_9 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18726:1: ( ( rule__CPBranchTransition__ConditionAssignment_9 ) )
+            // InternalRoom.g:18728:1: ( ( ( rule__CPBranchTransition__ConditionAssignment_9 ) ) )
+            // InternalRoom.g:18729:1: ( ( rule__CPBranchTransition__ConditionAssignment_9 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18726:1: ( ( rule__CPBranchTransition__ConditionAssignment_9 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18727:1: ( rule__CPBranchTransition__ConditionAssignment_9 )
+            // InternalRoom.g:18729:1: ( ( rule__CPBranchTransition__ConditionAssignment_9 ) )
+            // InternalRoom.g:18730:1: ( rule__CPBranchTransition__ConditionAssignment_9 )
             {
              before(grammarAccess.getCPBranchTransitionAccess().getConditionAssignment_9()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18728:1: ( rule__CPBranchTransition__ConditionAssignment_9 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18728:2: rule__CPBranchTransition__ConditionAssignment_9
+            // InternalRoom.g:18731:1: ( rule__CPBranchTransition__ConditionAssignment_9 )
+            // InternalRoom.g:18731:2: rule__CPBranchTransition__ConditionAssignment_9
             {
-            pushFollow(FOLLOW_rule__CPBranchTransition__ConditionAssignment_9_in_rule__CPBranchTransition__Group__9__Impl37949);
+            pushFollow(FOLLOW_2);
             rule__CPBranchTransition__ConditionAssignment_9();
 
             state._fsp--;
@@ -51492,21 +51492,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group__10"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18738:1: rule__CPBranchTransition__Group__10 : rule__CPBranchTransition__Group__10__Impl rule__CPBranchTransition__Group__11 ;
+    // InternalRoom.g:18741:1: rule__CPBranchTransition__Group__10 : rule__CPBranchTransition__Group__10__Impl rule__CPBranchTransition__Group__11 ;
     public final void rule__CPBranchTransition__Group__10() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18742:1: ( rule__CPBranchTransition__Group__10__Impl rule__CPBranchTransition__Group__11 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18743:2: rule__CPBranchTransition__Group__10__Impl rule__CPBranchTransition__Group__11
+            // InternalRoom.g:18745:1: ( rule__CPBranchTransition__Group__10__Impl rule__CPBranchTransition__Group__11 )
+            // InternalRoom.g:18746:2: rule__CPBranchTransition__Group__10__Impl rule__CPBranchTransition__Group__11
             {
-            pushFollow(FOLLOW_rule__CPBranchTransition__Group__10__Impl_in_rule__CPBranchTransition__Group__1037979);
+            pushFollow(FOLLOW_86);
             rule__CPBranchTransition__Group__10__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__CPBranchTransition__Group__11_in_rule__CPBranchTransition__Group__1037982);
+            pushFollow(FOLLOW_2);
             rule__CPBranchTransition__Group__11();
 
             state._fsp--;
@@ -51530,20 +51530,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group__10__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18750:1: rule__CPBranchTransition__Group__10__Impl : ( ( rule__CPBranchTransition__Group_10__0 )? ) ;
+    // InternalRoom.g:18753:1: rule__CPBranchTransition__Group__10__Impl : ( ( rule__CPBranchTransition__Group_10__0 )? ) ;
     public final void rule__CPBranchTransition__Group__10__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18754:1: ( ( ( rule__CPBranchTransition__Group_10__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18755:1: ( ( rule__CPBranchTransition__Group_10__0 )? )
+            // InternalRoom.g:18757:1: ( ( ( rule__CPBranchTransition__Group_10__0 )? ) )
+            // InternalRoom.g:18758:1: ( ( rule__CPBranchTransition__Group_10__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18755:1: ( ( rule__CPBranchTransition__Group_10__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18756:1: ( rule__CPBranchTransition__Group_10__0 )?
+            // InternalRoom.g:18758:1: ( ( rule__CPBranchTransition__Group_10__0 )? )
+            // InternalRoom.g:18759:1: ( rule__CPBranchTransition__Group_10__0 )?
             {
              before(grammarAccess.getCPBranchTransitionAccess().getGroup_10()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18757:1: ( rule__CPBranchTransition__Group_10__0 )?
+            // InternalRoom.g:18760:1: ( rule__CPBranchTransition__Group_10__0 )?
             int alt180=2;
             int LA180_0 = input.LA(1);
 
@@ -51552,9 +51552,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt180) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18757:2: rule__CPBranchTransition__Group_10__0
+                    // InternalRoom.g:18760:2: rule__CPBranchTransition__Group_10__0
                     {
-                    pushFollow(FOLLOW_rule__CPBranchTransition__Group_10__0_in_rule__CPBranchTransition__Group__10__Impl38009);
+                    pushFollow(FOLLOW_2);
                     rule__CPBranchTransition__Group_10__0();
 
                     state._fsp--;
@@ -51588,16 +51588,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group__11"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18767:1: rule__CPBranchTransition__Group__11 : rule__CPBranchTransition__Group__11__Impl ;
+    // InternalRoom.g:18770:1: rule__CPBranchTransition__Group__11 : rule__CPBranchTransition__Group__11__Impl ;
     public final void rule__CPBranchTransition__Group__11() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18771:1: ( rule__CPBranchTransition__Group__11__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18772:2: rule__CPBranchTransition__Group__11__Impl
+            // InternalRoom.g:18774:1: ( rule__CPBranchTransition__Group__11__Impl )
+            // InternalRoom.g:18775:2: rule__CPBranchTransition__Group__11__Impl
             {
-            pushFollow(FOLLOW_rule__CPBranchTransition__Group__11__Impl_in_rule__CPBranchTransition__Group__1138040);
+            pushFollow(FOLLOW_2);
             rule__CPBranchTransition__Group__11__Impl();
 
             state._fsp--;
@@ -51621,20 +51621,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group__11__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18778:1: rule__CPBranchTransition__Group__11__Impl : ( '}' ) ;
+    // InternalRoom.g:18781:1: rule__CPBranchTransition__Group__11__Impl : ( '}' ) ;
     public final void rule__CPBranchTransition__Group__11__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18782:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18783:1: ( '}' )
+            // InternalRoom.g:18785:1: ( ( '}' ) )
+            // InternalRoom.g:18786:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18783:1: ( '}' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18784:1: '}'
+            // InternalRoom.g:18786:1: ( '}' )
+            // InternalRoom.g:18787:1: '}'
             {
              before(grammarAccess.getCPBranchTransitionAccess().getRightCurlyBracketKeyword_11()); 
-            match(input,42,FOLLOW_42_in_rule__CPBranchTransition__Group__11__Impl38068); 
+            match(input,42,FOLLOW_2); 
              after(grammarAccess.getCPBranchTransitionAccess().getRightCurlyBracketKeyword_11()); 
 
             }
@@ -51658,21 +51658,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group_10__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18821:1: rule__CPBranchTransition__Group_10__0 : rule__CPBranchTransition__Group_10__0__Impl rule__CPBranchTransition__Group_10__1 ;
+    // InternalRoom.g:18824:1: rule__CPBranchTransition__Group_10__0 : rule__CPBranchTransition__Group_10__0__Impl rule__CPBranchTransition__Group_10__1 ;
     public final void rule__CPBranchTransition__Group_10__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18825:1: ( rule__CPBranchTransition__Group_10__0__Impl rule__CPBranchTransition__Group_10__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18826:2: rule__CPBranchTransition__Group_10__0__Impl rule__CPBranchTransition__Group_10__1
+            // InternalRoom.g:18828:1: ( rule__CPBranchTransition__Group_10__0__Impl rule__CPBranchTransition__Group_10__1 )
+            // InternalRoom.g:18829:2: rule__CPBranchTransition__Group_10__0__Impl rule__CPBranchTransition__Group_10__1
             {
-            pushFollow(FOLLOW_rule__CPBranchTransition__Group_10__0__Impl_in_rule__CPBranchTransition__Group_10__038123);
+            pushFollow(FOLLOW_27);
             rule__CPBranchTransition__Group_10__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__CPBranchTransition__Group_10__1_in_rule__CPBranchTransition__Group_10__038126);
+            pushFollow(FOLLOW_2);
             rule__CPBranchTransition__Group_10__1();
 
             state._fsp--;
@@ -51696,20 +51696,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group_10__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18833:1: rule__CPBranchTransition__Group_10__0__Impl : ( 'action' ) ;
+    // InternalRoom.g:18836:1: rule__CPBranchTransition__Group_10__0__Impl : ( 'action' ) ;
     public final void rule__CPBranchTransition__Group_10__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18837:1: ( ( 'action' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18838:1: ( 'action' )
+            // InternalRoom.g:18840:1: ( ( 'action' ) )
+            // InternalRoom.g:18841:1: ( 'action' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18838:1: ( 'action' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18839:1: 'action'
+            // InternalRoom.g:18841:1: ( 'action' )
+            // InternalRoom.g:18842:1: 'action'
             {
              before(grammarAccess.getCPBranchTransitionAccess().getActionKeyword_10_0()); 
-            match(input,106,FOLLOW_106_in_rule__CPBranchTransition__Group_10__0__Impl38154); 
+            match(input,106,FOLLOW_2); 
              after(grammarAccess.getCPBranchTransitionAccess().getActionKeyword_10_0()); 
 
             }
@@ -51733,16 +51733,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group_10__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18852:1: rule__CPBranchTransition__Group_10__1 : rule__CPBranchTransition__Group_10__1__Impl ;
+    // InternalRoom.g:18855:1: rule__CPBranchTransition__Group_10__1 : rule__CPBranchTransition__Group_10__1__Impl ;
     public final void rule__CPBranchTransition__Group_10__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18856:1: ( rule__CPBranchTransition__Group_10__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18857:2: rule__CPBranchTransition__Group_10__1__Impl
+            // InternalRoom.g:18859:1: ( rule__CPBranchTransition__Group_10__1__Impl )
+            // InternalRoom.g:18860:2: rule__CPBranchTransition__Group_10__1__Impl
             {
-            pushFollow(FOLLOW_rule__CPBranchTransition__Group_10__1__Impl_in_rule__CPBranchTransition__Group_10__138185);
+            pushFollow(FOLLOW_2);
             rule__CPBranchTransition__Group_10__1__Impl();
 
             state._fsp--;
@@ -51766,23 +51766,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__Group_10__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18863:1: rule__CPBranchTransition__Group_10__1__Impl : ( ( rule__CPBranchTransition__ActionAssignment_10_1 ) ) ;
+    // InternalRoom.g:18866:1: rule__CPBranchTransition__Group_10__1__Impl : ( ( rule__CPBranchTransition__ActionAssignment_10_1 ) ) ;
     public final void rule__CPBranchTransition__Group_10__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18867:1: ( ( ( rule__CPBranchTransition__ActionAssignment_10_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18868:1: ( ( rule__CPBranchTransition__ActionAssignment_10_1 ) )
+            // InternalRoom.g:18870:1: ( ( ( rule__CPBranchTransition__ActionAssignment_10_1 ) ) )
+            // InternalRoom.g:18871:1: ( ( rule__CPBranchTransition__ActionAssignment_10_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18868:1: ( ( rule__CPBranchTransition__ActionAssignment_10_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18869:1: ( rule__CPBranchTransition__ActionAssignment_10_1 )
+            // InternalRoom.g:18871:1: ( ( rule__CPBranchTransition__ActionAssignment_10_1 ) )
+            // InternalRoom.g:18872:1: ( rule__CPBranchTransition__ActionAssignment_10_1 )
             {
              before(grammarAccess.getCPBranchTransitionAccess().getActionAssignment_10_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18870:1: ( rule__CPBranchTransition__ActionAssignment_10_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18870:2: rule__CPBranchTransition__ActionAssignment_10_1
+            // InternalRoom.g:18873:1: ( rule__CPBranchTransition__ActionAssignment_10_1 )
+            // InternalRoom.g:18873:2: rule__CPBranchTransition__ActionAssignment_10_1
             {
-            pushFollow(FOLLOW_rule__CPBranchTransition__ActionAssignment_10_1_in_rule__CPBranchTransition__Group_10__1__Impl38212);
+            pushFollow(FOLLOW_2);
             rule__CPBranchTransition__ActionAssignment_10_1();
 
             state._fsp--;
@@ -51813,21 +51813,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedTransition__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18884:1: rule__RefinedTransition__Group__0 : rule__RefinedTransition__Group__0__Impl rule__RefinedTransition__Group__1 ;
+    // InternalRoom.g:18887:1: rule__RefinedTransition__Group__0 : rule__RefinedTransition__Group__0__Impl rule__RefinedTransition__Group__1 ;
     public final void rule__RefinedTransition__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18888:1: ( rule__RefinedTransition__Group__0__Impl rule__RefinedTransition__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18889:2: rule__RefinedTransition__Group__0__Impl rule__RefinedTransition__Group__1
+            // InternalRoom.g:18891:1: ( rule__RefinedTransition__Group__0__Impl rule__RefinedTransition__Group__1 )
+            // InternalRoom.g:18892:2: rule__RefinedTransition__Group__0__Impl rule__RefinedTransition__Group__1
             {
-            pushFollow(FOLLOW_rule__RefinedTransition__Group__0__Impl_in_rule__RefinedTransition__Group__038246);
+            pushFollow(FOLLOW_3);
             rule__RefinedTransition__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RefinedTransition__Group__1_in_rule__RefinedTransition__Group__038249);
+            pushFollow(FOLLOW_2);
             rule__RefinedTransition__Group__1();
 
             state._fsp--;
@@ -51851,20 +51851,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedTransition__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18896:1: rule__RefinedTransition__Group__0__Impl : ( 'RefinedTransition' ) ;
+    // InternalRoom.g:18899:1: rule__RefinedTransition__Group__0__Impl : ( 'RefinedTransition' ) ;
     public final void rule__RefinedTransition__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18900:1: ( ( 'RefinedTransition' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18901:1: ( 'RefinedTransition' )
+            // InternalRoom.g:18903:1: ( ( 'RefinedTransition' ) )
+            // InternalRoom.g:18904:1: ( 'RefinedTransition' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18901:1: ( 'RefinedTransition' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18902:1: 'RefinedTransition'
+            // InternalRoom.g:18904:1: ( 'RefinedTransition' )
+            // InternalRoom.g:18905:1: 'RefinedTransition'
             {
              before(grammarAccess.getRefinedTransitionAccess().getRefinedTransitionKeyword_0()); 
-            match(input,111,FOLLOW_111_in_rule__RefinedTransition__Group__0__Impl38277); 
+            match(input,111,FOLLOW_2); 
              after(grammarAccess.getRefinedTransitionAccess().getRefinedTransitionKeyword_0()); 
 
             }
@@ -51888,21 +51888,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedTransition__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18915:1: rule__RefinedTransition__Group__1 : rule__RefinedTransition__Group__1__Impl rule__RefinedTransition__Group__2 ;
+    // InternalRoom.g:18918:1: rule__RefinedTransition__Group__1 : rule__RefinedTransition__Group__1__Impl rule__RefinedTransition__Group__2 ;
     public final void rule__RefinedTransition__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18919:1: ( rule__RefinedTransition__Group__1__Impl rule__RefinedTransition__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18920:2: rule__RefinedTransition__Group__1__Impl rule__RefinedTransition__Group__2
+            // InternalRoom.g:18922:1: ( rule__RefinedTransition__Group__1__Impl rule__RefinedTransition__Group__2 )
+            // InternalRoom.g:18923:2: rule__RefinedTransition__Group__1__Impl rule__RefinedTransition__Group__2
             {
-            pushFollow(FOLLOW_rule__RefinedTransition__Group__1__Impl_in_rule__RefinedTransition__Group__138308);
+            pushFollow(FOLLOW_4);
             rule__RefinedTransition__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RefinedTransition__Group__2_in_rule__RefinedTransition__Group__138311);
+            pushFollow(FOLLOW_2);
             rule__RefinedTransition__Group__2();
 
             state._fsp--;
@@ -51926,23 +51926,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedTransition__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18927:1: rule__RefinedTransition__Group__1__Impl : ( ( rule__RefinedTransition__TargetAssignment_1 ) ) ;
+    // InternalRoom.g:18930:1: rule__RefinedTransition__Group__1__Impl : ( ( rule__RefinedTransition__TargetAssignment_1 ) ) ;
     public final void rule__RefinedTransition__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18931:1: ( ( ( rule__RefinedTransition__TargetAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18932:1: ( ( rule__RefinedTransition__TargetAssignment_1 ) )
+            // InternalRoom.g:18934:1: ( ( ( rule__RefinedTransition__TargetAssignment_1 ) ) )
+            // InternalRoom.g:18935:1: ( ( rule__RefinedTransition__TargetAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18932:1: ( ( rule__RefinedTransition__TargetAssignment_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18933:1: ( rule__RefinedTransition__TargetAssignment_1 )
+            // InternalRoom.g:18935:1: ( ( rule__RefinedTransition__TargetAssignment_1 ) )
+            // InternalRoom.g:18936:1: ( rule__RefinedTransition__TargetAssignment_1 )
             {
              before(grammarAccess.getRefinedTransitionAccess().getTargetAssignment_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18934:1: ( rule__RefinedTransition__TargetAssignment_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18934:2: rule__RefinedTransition__TargetAssignment_1
+            // InternalRoom.g:18937:1: ( rule__RefinedTransition__TargetAssignment_1 )
+            // InternalRoom.g:18937:2: rule__RefinedTransition__TargetAssignment_1
             {
-            pushFollow(FOLLOW_rule__RefinedTransition__TargetAssignment_1_in_rule__RefinedTransition__Group__1__Impl38338);
+            pushFollow(FOLLOW_2);
             rule__RefinedTransition__TargetAssignment_1();
 
             state._fsp--;
@@ -51973,21 +51973,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedTransition__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18944:1: rule__RefinedTransition__Group__2 : rule__RefinedTransition__Group__2__Impl rule__RefinedTransition__Group__3 ;
+    // InternalRoom.g:18947:1: rule__RefinedTransition__Group__2 : rule__RefinedTransition__Group__2__Impl rule__RefinedTransition__Group__3 ;
     public final void rule__RefinedTransition__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18948:1: ( rule__RefinedTransition__Group__2__Impl rule__RefinedTransition__Group__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18949:2: rule__RefinedTransition__Group__2__Impl rule__RefinedTransition__Group__3
+            // InternalRoom.g:18951:1: ( rule__RefinedTransition__Group__2__Impl rule__RefinedTransition__Group__3 )
+            // InternalRoom.g:18952:2: rule__RefinedTransition__Group__2__Impl rule__RefinedTransition__Group__3
             {
-            pushFollow(FOLLOW_rule__RefinedTransition__Group__2__Impl_in_rule__RefinedTransition__Group__238368);
+            pushFollow(FOLLOW_4);
             rule__RefinedTransition__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RefinedTransition__Group__3_in_rule__RefinedTransition__Group__238371);
+            pushFollow(FOLLOW_2);
             rule__RefinedTransition__Group__3();
 
             state._fsp--;
@@ -52011,20 +52011,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedTransition__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18956:1: rule__RefinedTransition__Group__2__Impl : ( ( rule__RefinedTransition__DocuAssignment_2 )? ) ;
+    // InternalRoom.g:18959:1: rule__RefinedTransition__Group__2__Impl : ( ( rule__RefinedTransition__DocuAssignment_2 )? ) ;
     public final void rule__RefinedTransition__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18960:1: ( ( ( rule__RefinedTransition__DocuAssignment_2 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18961:1: ( ( rule__RefinedTransition__DocuAssignment_2 )? )
+            // InternalRoom.g:18963:1: ( ( ( rule__RefinedTransition__DocuAssignment_2 )? ) )
+            // InternalRoom.g:18964:1: ( ( rule__RefinedTransition__DocuAssignment_2 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18961:1: ( ( rule__RefinedTransition__DocuAssignment_2 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18962:1: ( rule__RefinedTransition__DocuAssignment_2 )?
+            // InternalRoom.g:18964:1: ( ( rule__RefinedTransition__DocuAssignment_2 )? )
+            // InternalRoom.g:18965:1: ( rule__RefinedTransition__DocuAssignment_2 )?
             {
              before(grammarAccess.getRefinedTransitionAccess().getDocuAssignment_2()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18963:1: ( rule__RefinedTransition__DocuAssignment_2 )?
+            // InternalRoom.g:18966:1: ( rule__RefinedTransition__DocuAssignment_2 )?
             int alt181=2;
             int LA181_0 = input.LA(1);
 
@@ -52033,9 +52033,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt181) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18963:2: rule__RefinedTransition__DocuAssignment_2
+                    // InternalRoom.g:18966:2: rule__RefinedTransition__DocuAssignment_2
                     {
-                    pushFollow(FOLLOW_rule__RefinedTransition__DocuAssignment_2_in_rule__RefinedTransition__Group__2__Impl38398);
+                    pushFollow(FOLLOW_2);
                     rule__RefinedTransition__DocuAssignment_2();
 
                     state._fsp--;
@@ -52069,21 +52069,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedTransition__Group__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18973:1: rule__RefinedTransition__Group__3 : rule__RefinedTransition__Group__3__Impl rule__RefinedTransition__Group__4 ;
+    // InternalRoom.g:18976:1: rule__RefinedTransition__Group__3 : rule__RefinedTransition__Group__3__Impl rule__RefinedTransition__Group__4 ;
     public final void rule__RefinedTransition__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18977:1: ( rule__RefinedTransition__Group__3__Impl rule__RefinedTransition__Group__4 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18978:2: rule__RefinedTransition__Group__3__Impl rule__RefinedTransition__Group__4
+            // InternalRoom.g:18980:1: ( rule__RefinedTransition__Group__3__Impl rule__RefinedTransition__Group__4 )
+            // InternalRoom.g:18981:2: rule__RefinedTransition__Group__3__Impl rule__RefinedTransition__Group__4
             {
-            pushFollow(FOLLOW_rule__RefinedTransition__Group__3__Impl_in_rule__RefinedTransition__Group__338429);
+            pushFollow(FOLLOW_93);
             rule__RefinedTransition__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RefinedTransition__Group__4_in_rule__RefinedTransition__Group__338432);
+            pushFollow(FOLLOW_2);
             rule__RefinedTransition__Group__4();
 
             state._fsp--;
@@ -52107,20 +52107,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedTransition__Group__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18985:1: rule__RefinedTransition__Group__3__Impl : ( '{' ) ;
+    // InternalRoom.g:18988:1: rule__RefinedTransition__Group__3__Impl : ( '{' ) ;
     public final void rule__RefinedTransition__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18989:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18990:1: ( '{' )
+            // InternalRoom.g:18992:1: ( ( '{' ) )
+            // InternalRoom.g:18993:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18990:1: ( '{' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:18991:1: '{'
+            // InternalRoom.g:18993:1: ( '{' )
+            // InternalRoom.g:18994:1: '{'
             {
              before(grammarAccess.getRefinedTransitionAccess().getLeftCurlyBracketKeyword_3()); 
-            match(input,41,FOLLOW_41_in_rule__RefinedTransition__Group__3__Impl38460); 
+            match(input,41,FOLLOW_2); 
              after(grammarAccess.getRefinedTransitionAccess().getLeftCurlyBracketKeyword_3()); 
 
             }
@@ -52144,21 +52144,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedTransition__Group__4"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19004:1: rule__RefinedTransition__Group__4 : rule__RefinedTransition__Group__4__Impl rule__RefinedTransition__Group__5 ;
+    // InternalRoom.g:19007:1: rule__RefinedTransition__Group__4 : rule__RefinedTransition__Group__4__Impl rule__RefinedTransition__Group__5 ;
     public final void rule__RefinedTransition__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19008:1: ( rule__RefinedTransition__Group__4__Impl rule__RefinedTransition__Group__5 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19009:2: rule__RefinedTransition__Group__4__Impl rule__RefinedTransition__Group__5
+            // InternalRoom.g:19011:1: ( rule__RefinedTransition__Group__4__Impl rule__RefinedTransition__Group__5 )
+            // InternalRoom.g:19012:2: rule__RefinedTransition__Group__4__Impl rule__RefinedTransition__Group__5
             {
-            pushFollow(FOLLOW_rule__RefinedTransition__Group__4__Impl_in_rule__RefinedTransition__Group__438491);
+            pushFollow(FOLLOW_27);
             rule__RefinedTransition__Group__4__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RefinedTransition__Group__5_in_rule__RefinedTransition__Group__438494);
+            pushFollow(FOLLOW_2);
             rule__RefinedTransition__Group__5();
 
             state._fsp--;
@@ -52182,20 +52182,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedTransition__Group__4__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19016:1: rule__RefinedTransition__Group__4__Impl : ( 'action' ) ;
+    // InternalRoom.g:19019:1: rule__RefinedTransition__Group__4__Impl : ( 'action' ) ;
     public final void rule__RefinedTransition__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19020:1: ( ( 'action' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19021:1: ( 'action' )
+            // InternalRoom.g:19023:1: ( ( 'action' ) )
+            // InternalRoom.g:19024:1: ( 'action' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19021:1: ( 'action' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19022:1: 'action'
+            // InternalRoom.g:19024:1: ( 'action' )
+            // InternalRoom.g:19025:1: 'action'
             {
              before(grammarAccess.getRefinedTransitionAccess().getActionKeyword_4()); 
-            match(input,106,FOLLOW_106_in_rule__RefinedTransition__Group__4__Impl38522); 
+            match(input,106,FOLLOW_2); 
              after(grammarAccess.getRefinedTransitionAccess().getActionKeyword_4()); 
 
             }
@@ -52219,21 +52219,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedTransition__Group__5"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19035:1: rule__RefinedTransition__Group__5 : rule__RefinedTransition__Group__5__Impl rule__RefinedTransition__Group__6 ;
+    // InternalRoom.g:19038:1: rule__RefinedTransition__Group__5 : rule__RefinedTransition__Group__5__Impl rule__RefinedTransition__Group__6 ;
     public final void rule__RefinedTransition__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19039:1: ( rule__RefinedTransition__Group__5__Impl rule__RefinedTransition__Group__6 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19040:2: rule__RefinedTransition__Group__5__Impl rule__RefinedTransition__Group__6
+            // InternalRoom.g:19042:1: ( rule__RefinedTransition__Group__5__Impl rule__RefinedTransition__Group__6 )
+            // InternalRoom.g:19043:2: rule__RefinedTransition__Group__5__Impl rule__RefinedTransition__Group__6
             {
-            pushFollow(FOLLOW_rule__RefinedTransition__Group__5__Impl_in_rule__RefinedTransition__Group__538553);
+            pushFollow(FOLLOW_94);
             rule__RefinedTransition__Group__5__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RefinedTransition__Group__6_in_rule__RefinedTransition__Group__538556);
+            pushFollow(FOLLOW_2);
             rule__RefinedTransition__Group__6();
 
             state._fsp--;
@@ -52257,23 +52257,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedTransition__Group__5__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19047:1: rule__RefinedTransition__Group__5__Impl : ( ( rule__RefinedTransition__ActionAssignment_5 ) ) ;
+    // InternalRoom.g:19050:1: rule__RefinedTransition__Group__5__Impl : ( ( rule__RefinedTransition__ActionAssignment_5 ) ) ;
     public final void rule__RefinedTransition__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19051:1: ( ( ( rule__RefinedTransition__ActionAssignment_5 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19052:1: ( ( rule__RefinedTransition__ActionAssignment_5 ) )
+            // InternalRoom.g:19054:1: ( ( ( rule__RefinedTransition__ActionAssignment_5 ) ) )
+            // InternalRoom.g:19055:1: ( ( rule__RefinedTransition__ActionAssignment_5 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19052:1: ( ( rule__RefinedTransition__ActionAssignment_5 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19053:1: ( rule__RefinedTransition__ActionAssignment_5 )
+            // InternalRoom.g:19055:1: ( ( rule__RefinedTransition__ActionAssignment_5 ) )
+            // InternalRoom.g:19056:1: ( rule__RefinedTransition__ActionAssignment_5 )
             {
              before(grammarAccess.getRefinedTransitionAccess().getActionAssignment_5()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19054:1: ( rule__RefinedTransition__ActionAssignment_5 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19054:2: rule__RefinedTransition__ActionAssignment_5
+            // InternalRoom.g:19057:1: ( rule__RefinedTransition__ActionAssignment_5 )
+            // InternalRoom.g:19057:2: rule__RefinedTransition__ActionAssignment_5
             {
-            pushFollow(FOLLOW_rule__RefinedTransition__ActionAssignment_5_in_rule__RefinedTransition__Group__5__Impl38583);
+            pushFollow(FOLLOW_2);
             rule__RefinedTransition__ActionAssignment_5();
 
             state._fsp--;
@@ -52304,16 +52304,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedTransition__Group__6"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19064:1: rule__RefinedTransition__Group__6 : rule__RefinedTransition__Group__6__Impl ;
+    // InternalRoom.g:19067:1: rule__RefinedTransition__Group__6 : rule__RefinedTransition__Group__6__Impl ;
     public final void rule__RefinedTransition__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19068:1: ( rule__RefinedTransition__Group__6__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19069:2: rule__RefinedTransition__Group__6__Impl
+            // InternalRoom.g:19071:1: ( rule__RefinedTransition__Group__6__Impl )
+            // InternalRoom.g:19072:2: rule__RefinedTransition__Group__6__Impl
             {
-            pushFollow(FOLLOW_rule__RefinedTransition__Group__6__Impl_in_rule__RefinedTransition__Group__638613);
+            pushFollow(FOLLOW_2);
             rule__RefinedTransition__Group__6__Impl();
 
             state._fsp--;
@@ -52337,20 +52337,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedTransition__Group__6__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19075:1: rule__RefinedTransition__Group__6__Impl : ( '}' ) ;
+    // InternalRoom.g:19078:1: rule__RefinedTransition__Group__6__Impl : ( '}' ) ;
     public final void rule__RefinedTransition__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19079:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19080:1: ( '}' )
+            // InternalRoom.g:19082:1: ( ( '}' ) )
+            // InternalRoom.g:19083:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19080:1: ( '}' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19081:1: '}'
+            // InternalRoom.g:19083:1: ( '}' )
+            // InternalRoom.g:19084:1: '}'
             {
              before(grammarAccess.getRefinedTransitionAccess().getRightCurlyBracketKeyword_6()); 
-            match(input,42,FOLLOW_42_in_rule__RefinedTransition__Group__6__Impl38641); 
+            match(input,42,FOLLOW_2); 
              after(grammarAccess.getRefinedTransitionAccess().getRightCurlyBracketKeyword_6()); 
 
             }
@@ -52374,21 +52374,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TrPointTerminal__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19108:1: rule__TrPointTerminal__Group__0 : rule__TrPointTerminal__Group__0__Impl rule__TrPointTerminal__Group__1 ;
+    // InternalRoom.g:19111:1: rule__TrPointTerminal__Group__0 : rule__TrPointTerminal__Group__0__Impl rule__TrPointTerminal__Group__1 ;
     public final void rule__TrPointTerminal__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19112:1: ( rule__TrPointTerminal__Group__0__Impl rule__TrPointTerminal__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19113:2: rule__TrPointTerminal__Group__0__Impl rule__TrPointTerminal__Group__1
+            // InternalRoom.g:19115:1: ( rule__TrPointTerminal__Group__0__Impl rule__TrPointTerminal__Group__1 )
+            // InternalRoom.g:19116:2: rule__TrPointTerminal__Group__0__Impl rule__TrPointTerminal__Group__1
             {
-            pushFollow(FOLLOW_rule__TrPointTerminal__Group__0__Impl_in_rule__TrPointTerminal__Group__038686);
+            pushFollow(FOLLOW_3);
             rule__TrPointTerminal__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__TrPointTerminal__Group__1_in_rule__TrPointTerminal__Group__038689);
+            pushFollow(FOLLOW_2);
             rule__TrPointTerminal__Group__1();
 
             state._fsp--;
@@ -52412,20 +52412,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TrPointTerminal__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19120:1: rule__TrPointTerminal__Group__0__Impl : ( 'my' ) ;
+    // InternalRoom.g:19123:1: rule__TrPointTerminal__Group__0__Impl : ( 'my' ) ;
     public final void rule__TrPointTerminal__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19124:1: ( ( 'my' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19125:1: ( 'my' )
+            // InternalRoom.g:19127:1: ( ( 'my' ) )
+            // InternalRoom.g:19128:1: ( 'my' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19125:1: ( 'my' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19126:1: 'my'
+            // InternalRoom.g:19128:1: ( 'my' )
+            // InternalRoom.g:19129:1: 'my'
             {
              before(grammarAccess.getTrPointTerminalAccess().getMyKeyword_0()); 
-            match(input,112,FOLLOW_112_in_rule__TrPointTerminal__Group__0__Impl38717); 
+            match(input,112,FOLLOW_2); 
              after(grammarAccess.getTrPointTerminalAccess().getMyKeyword_0()); 
 
             }
@@ -52449,16 +52449,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TrPointTerminal__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19139:1: rule__TrPointTerminal__Group__1 : rule__TrPointTerminal__Group__1__Impl ;
+    // InternalRoom.g:19142:1: rule__TrPointTerminal__Group__1 : rule__TrPointTerminal__Group__1__Impl ;
     public final void rule__TrPointTerminal__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19143:1: ( rule__TrPointTerminal__Group__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19144:2: rule__TrPointTerminal__Group__1__Impl
+            // InternalRoom.g:19146:1: ( rule__TrPointTerminal__Group__1__Impl )
+            // InternalRoom.g:19147:2: rule__TrPointTerminal__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__TrPointTerminal__Group__1__Impl_in_rule__TrPointTerminal__Group__138748);
+            pushFollow(FOLLOW_2);
             rule__TrPointTerminal__Group__1__Impl();
 
             state._fsp--;
@@ -52482,23 +52482,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TrPointTerminal__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19150:1: rule__TrPointTerminal__Group__1__Impl : ( ( rule__TrPointTerminal__TrPointAssignment_1 ) ) ;
+    // InternalRoom.g:19153:1: rule__TrPointTerminal__Group__1__Impl : ( ( rule__TrPointTerminal__TrPointAssignment_1 ) ) ;
     public final void rule__TrPointTerminal__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19154:1: ( ( ( rule__TrPointTerminal__TrPointAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19155:1: ( ( rule__TrPointTerminal__TrPointAssignment_1 ) )
+            // InternalRoom.g:19157:1: ( ( ( rule__TrPointTerminal__TrPointAssignment_1 ) ) )
+            // InternalRoom.g:19158:1: ( ( rule__TrPointTerminal__TrPointAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19155:1: ( ( rule__TrPointTerminal__TrPointAssignment_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19156:1: ( rule__TrPointTerminal__TrPointAssignment_1 )
+            // InternalRoom.g:19158:1: ( ( rule__TrPointTerminal__TrPointAssignment_1 ) )
+            // InternalRoom.g:19159:1: ( rule__TrPointTerminal__TrPointAssignment_1 )
             {
              before(grammarAccess.getTrPointTerminalAccess().getTrPointAssignment_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19157:1: ( rule__TrPointTerminal__TrPointAssignment_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19157:2: rule__TrPointTerminal__TrPointAssignment_1
+            // InternalRoom.g:19160:1: ( rule__TrPointTerminal__TrPointAssignment_1 )
+            // InternalRoom.g:19160:2: rule__TrPointTerminal__TrPointAssignment_1
             {
-            pushFollow(FOLLOW_rule__TrPointTerminal__TrPointAssignment_1_in_rule__TrPointTerminal__Group__1__Impl38775);
+            pushFollow(FOLLOW_2);
             rule__TrPointTerminal__TrPointAssignment_1();
 
             state._fsp--;
@@ -52529,21 +52529,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubStateTrPointTerminal__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19171:1: rule__SubStateTrPointTerminal__Group__0 : rule__SubStateTrPointTerminal__Group__0__Impl rule__SubStateTrPointTerminal__Group__1 ;
+    // InternalRoom.g:19174:1: rule__SubStateTrPointTerminal__Group__0 : rule__SubStateTrPointTerminal__Group__0__Impl rule__SubStateTrPointTerminal__Group__1 ;
     public final void rule__SubStateTrPointTerminal__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19175:1: ( rule__SubStateTrPointTerminal__Group__0__Impl rule__SubStateTrPointTerminal__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19176:2: rule__SubStateTrPointTerminal__Group__0__Impl rule__SubStateTrPointTerminal__Group__1
+            // InternalRoom.g:19178:1: ( rule__SubStateTrPointTerminal__Group__0__Impl rule__SubStateTrPointTerminal__Group__1 )
+            // InternalRoom.g:19179:2: rule__SubStateTrPointTerminal__Group__0__Impl rule__SubStateTrPointTerminal__Group__1
             {
-            pushFollow(FOLLOW_rule__SubStateTrPointTerminal__Group__0__Impl_in_rule__SubStateTrPointTerminal__Group__038809);
+            pushFollow(FOLLOW_60);
             rule__SubStateTrPointTerminal__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SubStateTrPointTerminal__Group__1_in_rule__SubStateTrPointTerminal__Group__038812);
+            pushFollow(FOLLOW_2);
             rule__SubStateTrPointTerminal__Group__1();
 
             state._fsp--;
@@ -52567,23 +52567,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubStateTrPointTerminal__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19183:1: rule__SubStateTrPointTerminal__Group__0__Impl : ( ( rule__SubStateTrPointTerminal__TrPointAssignment_0 ) ) ;
+    // InternalRoom.g:19186:1: rule__SubStateTrPointTerminal__Group__0__Impl : ( ( rule__SubStateTrPointTerminal__TrPointAssignment_0 ) ) ;
     public final void rule__SubStateTrPointTerminal__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19187:1: ( ( ( rule__SubStateTrPointTerminal__TrPointAssignment_0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19188:1: ( ( rule__SubStateTrPointTerminal__TrPointAssignment_0 ) )
+            // InternalRoom.g:19190:1: ( ( ( rule__SubStateTrPointTerminal__TrPointAssignment_0 ) ) )
+            // InternalRoom.g:19191:1: ( ( rule__SubStateTrPointTerminal__TrPointAssignment_0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19188:1: ( ( rule__SubStateTrPointTerminal__TrPointAssignment_0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19189:1: ( rule__SubStateTrPointTerminal__TrPointAssignment_0 )
+            // InternalRoom.g:19191:1: ( ( rule__SubStateTrPointTerminal__TrPointAssignment_0 ) )
+            // InternalRoom.g:19192:1: ( rule__SubStateTrPointTerminal__TrPointAssignment_0 )
             {
              before(grammarAccess.getSubStateTrPointTerminalAccess().getTrPointAssignment_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19190:1: ( rule__SubStateTrPointTerminal__TrPointAssignment_0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19190:2: rule__SubStateTrPointTerminal__TrPointAssignment_0
+            // InternalRoom.g:19193:1: ( rule__SubStateTrPointTerminal__TrPointAssignment_0 )
+            // InternalRoom.g:19193:2: rule__SubStateTrPointTerminal__TrPointAssignment_0
             {
-            pushFollow(FOLLOW_rule__SubStateTrPointTerminal__TrPointAssignment_0_in_rule__SubStateTrPointTerminal__Group__0__Impl38839);
+            pushFollow(FOLLOW_2);
             rule__SubStateTrPointTerminal__TrPointAssignment_0();
 
             state._fsp--;
@@ -52614,21 +52614,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubStateTrPointTerminal__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19200:1: rule__SubStateTrPointTerminal__Group__1 : rule__SubStateTrPointTerminal__Group__1__Impl rule__SubStateTrPointTerminal__Group__2 ;
+    // InternalRoom.g:19203:1: rule__SubStateTrPointTerminal__Group__1 : rule__SubStateTrPointTerminal__Group__1__Impl rule__SubStateTrPointTerminal__Group__2 ;
     public final void rule__SubStateTrPointTerminal__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19204:1: ( rule__SubStateTrPointTerminal__Group__1__Impl rule__SubStateTrPointTerminal__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19205:2: rule__SubStateTrPointTerminal__Group__1__Impl rule__SubStateTrPointTerminal__Group__2
+            // InternalRoom.g:19207:1: ( rule__SubStateTrPointTerminal__Group__1__Impl rule__SubStateTrPointTerminal__Group__2 )
+            // InternalRoom.g:19208:2: rule__SubStateTrPointTerminal__Group__1__Impl rule__SubStateTrPointTerminal__Group__2
             {
-            pushFollow(FOLLOW_rule__SubStateTrPointTerminal__Group__1__Impl_in_rule__SubStateTrPointTerminal__Group__138869);
+            pushFollow(FOLLOW_3);
             rule__SubStateTrPointTerminal__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SubStateTrPointTerminal__Group__2_in_rule__SubStateTrPointTerminal__Group__138872);
+            pushFollow(FOLLOW_2);
             rule__SubStateTrPointTerminal__Group__2();
 
             state._fsp--;
@@ -52652,20 +52652,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubStateTrPointTerminal__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19212:1: rule__SubStateTrPointTerminal__Group__1__Impl : ( 'of' ) ;
+    // InternalRoom.g:19215:1: rule__SubStateTrPointTerminal__Group__1__Impl : ( 'of' ) ;
     public final void rule__SubStateTrPointTerminal__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19216:1: ( ( 'of' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19217:1: ( 'of' )
+            // InternalRoom.g:19219:1: ( ( 'of' ) )
+            // InternalRoom.g:19220:1: ( 'of' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19217:1: ( 'of' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19218:1: 'of'
+            // InternalRoom.g:19220:1: ( 'of' )
+            // InternalRoom.g:19221:1: 'of'
             {
              before(grammarAccess.getSubStateTrPointTerminalAccess().getOfKeyword_1()); 
-            match(input,50,FOLLOW_50_in_rule__SubStateTrPointTerminal__Group__1__Impl38900); 
+            match(input,50,FOLLOW_2); 
              after(grammarAccess.getSubStateTrPointTerminalAccess().getOfKeyword_1()); 
 
             }
@@ -52689,16 +52689,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubStateTrPointTerminal__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19231:1: rule__SubStateTrPointTerminal__Group__2 : rule__SubStateTrPointTerminal__Group__2__Impl ;
+    // InternalRoom.g:19234:1: rule__SubStateTrPointTerminal__Group__2 : rule__SubStateTrPointTerminal__Group__2__Impl ;
     public final void rule__SubStateTrPointTerminal__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19235:1: ( rule__SubStateTrPointTerminal__Group__2__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19236:2: rule__SubStateTrPointTerminal__Group__2__Impl
+            // InternalRoom.g:19238:1: ( rule__SubStateTrPointTerminal__Group__2__Impl )
+            // InternalRoom.g:19239:2: rule__SubStateTrPointTerminal__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__SubStateTrPointTerminal__Group__2__Impl_in_rule__SubStateTrPointTerminal__Group__238931);
+            pushFollow(FOLLOW_2);
             rule__SubStateTrPointTerminal__Group__2__Impl();
 
             state._fsp--;
@@ -52722,23 +52722,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubStateTrPointTerminal__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19242:1: rule__SubStateTrPointTerminal__Group__2__Impl : ( ( rule__SubStateTrPointTerminal__StateAssignment_2 ) ) ;
+    // InternalRoom.g:19245:1: rule__SubStateTrPointTerminal__Group__2__Impl : ( ( rule__SubStateTrPointTerminal__StateAssignment_2 ) ) ;
     public final void rule__SubStateTrPointTerminal__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19246:1: ( ( ( rule__SubStateTrPointTerminal__StateAssignment_2 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19247:1: ( ( rule__SubStateTrPointTerminal__StateAssignment_2 ) )
+            // InternalRoom.g:19249:1: ( ( ( rule__SubStateTrPointTerminal__StateAssignment_2 ) ) )
+            // InternalRoom.g:19250:1: ( ( rule__SubStateTrPointTerminal__StateAssignment_2 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19247:1: ( ( rule__SubStateTrPointTerminal__StateAssignment_2 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19248:1: ( rule__SubStateTrPointTerminal__StateAssignment_2 )
+            // InternalRoom.g:19250:1: ( ( rule__SubStateTrPointTerminal__StateAssignment_2 ) )
+            // InternalRoom.g:19251:1: ( rule__SubStateTrPointTerminal__StateAssignment_2 )
             {
              before(grammarAccess.getSubStateTrPointTerminalAccess().getStateAssignment_2()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19249:1: ( rule__SubStateTrPointTerminal__StateAssignment_2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19249:2: rule__SubStateTrPointTerminal__StateAssignment_2
+            // InternalRoom.g:19252:1: ( rule__SubStateTrPointTerminal__StateAssignment_2 )
+            // InternalRoom.g:19252:2: rule__SubStateTrPointTerminal__StateAssignment_2
             {
-            pushFollow(FOLLOW_rule__SubStateTrPointTerminal__StateAssignment_2_in_rule__SubStateTrPointTerminal__Group__2__Impl38958);
+            pushFollow(FOLLOW_2);
             rule__SubStateTrPointTerminal__StateAssignment_2();
 
             state._fsp--;
@@ -52769,21 +52769,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ChoicepointTerminal__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19265:1: rule__ChoicepointTerminal__Group__0 : rule__ChoicepointTerminal__Group__0__Impl rule__ChoicepointTerminal__Group__1 ;
+    // InternalRoom.g:19268:1: rule__ChoicepointTerminal__Group__0 : rule__ChoicepointTerminal__Group__0__Impl rule__ChoicepointTerminal__Group__1 ;
     public final void rule__ChoicepointTerminal__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19269:1: ( rule__ChoicepointTerminal__Group__0__Impl rule__ChoicepointTerminal__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19270:2: rule__ChoicepointTerminal__Group__0__Impl rule__ChoicepointTerminal__Group__1
+            // InternalRoom.g:19272:1: ( rule__ChoicepointTerminal__Group__0__Impl rule__ChoicepointTerminal__Group__1 )
+            // InternalRoom.g:19273:2: rule__ChoicepointTerminal__Group__0__Impl rule__ChoicepointTerminal__Group__1
             {
-            pushFollow(FOLLOW_rule__ChoicepointTerminal__Group__0__Impl_in_rule__ChoicepointTerminal__Group__038994);
+            pushFollow(FOLLOW_3);
             rule__ChoicepointTerminal__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ChoicepointTerminal__Group__1_in_rule__ChoicepointTerminal__Group__038997);
+            pushFollow(FOLLOW_2);
             rule__ChoicepointTerminal__Group__1();
 
             state._fsp--;
@@ -52807,20 +52807,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ChoicepointTerminal__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19277:1: rule__ChoicepointTerminal__Group__0__Impl : ( 'cp' ) ;
+    // InternalRoom.g:19280:1: rule__ChoicepointTerminal__Group__0__Impl : ( 'cp' ) ;
     public final void rule__ChoicepointTerminal__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19281:1: ( ( 'cp' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19282:1: ( 'cp' )
+            // InternalRoom.g:19284:1: ( ( 'cp' ) )
+            // InternalRoom.g:19285:1: ( 'cp' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19282:1: ( 'cp' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19283:1: 'cp'
+            // InternalRoom.g:19285:1: ( 'cp' )
+            // InternalRoom.g:19286:1: 'cp'
             {
              before(grammarAccess.getChoicepointTerminalAccess().getCpKeyword_0()); 
-            match(input,113,FOLLOW_113_in_rule__ChoicepointTerminal__Group__0__Impl39025); 
+            match(input,113,FOLLOW_2); 
              after(grammarAccess.getChoicepointTerminalAccess().getCpKeyword_0()); 
 
             }
@@ -52844,16 +52844,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ChoicepointTerminal__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19296:1: rule__ChoicepointTerminal__Group__1 : rule__ChoicepointTerminal__Group__1__Impl ;
+    // InternalRoom.g:19299:1: rule__ChoicepointTerminal__Group__1 : rule__ChoicepointTerminal__Group__1__Impl ;
     public final void rule__ChoicepointTerminal__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19300:1: ( rule__ChoicepointTerminal__Group__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19301:2: rule__ChoicepointTerminal__Group__1__Impl
+            // InternalRoom.g:19303:1: ( rule__ChoicepointTerminal__Group__1__Impl )
+            // InternalRoom.g:19304:2: rule__ChoicepointTerminal__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__ChoicepointTerminal__Group__1__Impl_in_rule__ChoicepointTerminal__Group__139056);
+            pushFollow(FOLLOW_2);
             rule__ChoicepointTerminal__Group__1__Impl();
 
             state._fsp--;
@@ -52877,23 +52877,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ChoicepointTerminal__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19307:1: rule__ChoicepointTerminal__Group__1__Impl : ( ( rule__ChoicepointTerminal__CpAssignment_1 ) ) ;
+    // InternalRoom.g:19310:1: rule__ChoicepointTerminal__Group__1__Impl : ( ( rule__ChoicepointTerminal__CpAssignment_1 ) ) ;
     public final void rule__ChoicepointTerminal__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19311:1: ( ( ( rule__ChoicepointTerminal__CpAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19312:1: ( ( rule__ChoicepointTerminal__CpAssignment_1 ) )
+            // InternalRoom.g:19314:1: ( ( ( rule__ChoicepointTerminal__CpAssignment_1 ) ) )
+            // InternalRoom.g:19315:1: ( ( rule__ChoicepointTerminal__CpAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19312:1: ( ( rule__ChoicepointTerminal__CpAssignment_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19313:1: ( rule__ChoicepointTerminal__CpAssignment_1 )
+            // InternalRoom.g:19315:1: ( ( rule__ChoicepointTerminal__CpAssignment_1 ) )
+            // InternalRoom.g:19316:1: ( rule__ChoicepointTerminal__CpAssignment_1 )
             {
              before(grammarAccess.getChoicepointTerminalAccess().getCpAssignment_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19314:1: ( rule__ChoicepointTerminal__CpAssignment_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19314:2: rule__ChoicepointTerminal__CpAssignment_1
+            // InternalRoom.g:19317:1: ( rule__ChoicepointTerminal__CpAssignment_1 )
+            // InternalRoom.g:19317:2: rule__ChoicepointTerminal__CpAssignment_1
             {
-            pushFollow(FOLLOW_rule__ChoicepointTerminal__CpAssignment_1_in_rule__ChoicepointTerminal__Group__1__Impl39083);
+            pushFollow(FOLLOW_2);
             rule__ChoicepointTerminal__CpAssignment_1();
 
             state._fsp--;
@@ -52924,21 +52924,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Trigger__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19328:1: rule__Trigger__Group__0 : rule__Trigger__Group__0__Impl rule__Trigger__Group__1 ;
+    // InternalRoom.g:19331:1: rule__Trigger__Group__0 : rule__Trigger__Group__0__Impl rule__Trigger__Group__1 ;
     public final void rule__Trigger__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19332:1: ( rule__Trigger__Group__0__Impl rule__Trigger__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19333:2: rule__Trigger__Group__0__Impl rule__Trigger__Group__1
+            // InternalRoom.g:19335:1: ( rule__Trigger__Group__0__Impl rule__Trigger__Group__1 )
+            // InternalRoom.g:19336:2: rule__Trigger__Group__0__Impl rule__Trigger__Group__1
             {
-            pushFollow(FOLLOW_rule__Trigger__Group__0__Impl_in_rule__Trigger__Group__039117);
+            pushFollow(FOLLOW_3);
             rule__Trigger__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Trigger__Group__1_in_rule__Trigger__Group__039120);
+            pushFollow(FOLLOW_2);
             rule__Trigger__Group__1();
 
             state._fsp--;
@@ -52962,20 +52962,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Trigger__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19340:1: rule__Trigger__Group__0__Impl : ( '<' ) ;
+    // InternalRoom.g:19343:1: rule__Trigger__Group__0__Impl : ( '<' ) ;
     public final void rule__Trigger__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19344:1: ( ( '<' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19345:1: ( '<' )
+            // InternalRoom.g:19347:1: ( ( '<' ) )
+            // InternalRoom.g:19348:1: ( '<' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19345:1: ( '<' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19346:1: '<'
+            // InternalRoom.g:19348:1: ( '<' )
+            // InternalRoom.g:19349:1: '<'
             {
              before(grammarAccess.getTriggerAccess().getLessThanSignKeyword_0()); 
-            match(input,114,FOLLOW_114_in_rule__Trigger__Group__0__Impl39148); 
+            match(input,114,FOLLOW_2); 
              after(grammarAccess.getTriggerAccess().getLessThanSignKeyword_0()); 
 
             }
@@ -52999,21 +52999,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Trigger__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19359:1: rule__Trigger__Group__1 : rule__Trigger__Group__1__Impl rule__Trigger__Group__2 ;
+    // InternalRoom.g:19362:1: rule__Trigger__Group__1 : rule__Trigger__Group__1__Impl rule__Trigger__Group__2 ;
     public final void rule__Trigger__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19363:1: ( rule__Trigger__Group__1__Impl rule__Trigger__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19364:2: rule__Trigger__Group__1__Impl rule__Trigger__Group__2
+            // InternalRoom.g:19366:1: ( rule__Trigger__Group__1__Impl rule__Trigger__Group__2 )
+            // InternalRoom.g:19367:2: rule__Trigger__Group__1__Impl rule__Trigger__Group__2
             {
-            pushFollow(FOLLOW_rule__Trigger__Group__1__Impl_in_rule__Trigger__Group__139179);
+            pushFollow(FOLLOW_95);
             rule__Trigger__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Trigger__Group__2_in_rule__Trigger__Group__139182);
+            pushFollow(FOLLOW_2);
             rule__Trigger__Group__2();
 
             state._fsp--;
@@ -53037,23 +53037,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Trigger__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19371:1: rule__Trigger__Group__1__Impl : ( ( rule__Trigger__MsgFromIfPairsAssignment_1 ) ) ;
+    // InternalRoom.g:19374:1: rule__Trigger__Group__1__Impl : ( ( rule__Trigger__MsgFromIfPairsAssignment_1 ) ) ;
     public final void rule__Trigger__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19375:1: ( ( ( rule__Trigger__MsgFromIfPairsAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19376:1: ( ( rule__Trigger__MsgFromIfPairsAssignment_1 ) )
+            // InternalRoom.g:19378:1: ( ( ( rule__Trigger__MsgFromIfPairsAssignment_1 ) ) )
+            // InternalRoom.g:19379:1: ( ( rule__Trigger__MsgFromIfPairsAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19376:1: ( ( rule__Trigger__MsgFromIfPairsAssignment_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19377:1: ( rule__Trigger__MsgFromIfPairsAssignment_1 )
+            // InternalRoom.g:19379:1: ( ( rule__Trigger__MsgFromIfPairsAssignment_1 ) )
+            // InternalRoom.g:19380:1: ( rule__Trigger__MsgFromIfPairsAssignment_1 )
             {
              before(grammarAccess.getTriggerAccess().getMsgFromIfPairsAssignment_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19378:1: ( rule__Trigger__MsgFromIfPairsAssignment_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19378:2: rule__Trigger__MsgFromIfPairsAssignment_1
+            // InternalRoom.g:19381:1: ( rule__Trigger__MsgFromIfPairsAssignment_1 )
+            // InternalRoom.g:19381:2: rule__Trigger__MsgFromIfPairsAssignment_1
             {
-            pushFollow(FOLLOW_rule__Trigger__MsgFromIfPairsAssignment_1_in_rule__Trigger__Group__1__Impl39209);
+            pushFollow(FOLLOW_2);
             rule__Trigger__MsgFromIfPairsAssignment_1();
 
             state._fsp--;
@@ -53084,21 +53084,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Trigger__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19388:1: rule__Trigger__Group__2 : rule__Trigger__Group__2__Impl rule__Trigger__Group__3 ;
+    // InternalRoom.g:19391:1: rule__Trigger__Group__2 : rule__Trigger__Group__2__Impl rule__Trigger__Group__3 ;
     public final void rule__Trigger__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19392:1: ( rule__Trigger__Group__2__Impl rule__Trigger__Group__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19393:2: rule__Trigger__Group__2__Impl rule__Trigger__Group__3
+            // InternalRoom.g:19395:1: ( rule__Trigger__Group__2__Impl rule__Trigger__Group__3 )
+            // InternalRoom.g:19396:2: rule__Trigger__Group__2__Impl rule__Trigger__Group__3
             {
-            pushFollow(FOLLOW_rule__Trigger__Group__2__Impl_in_rule__Trigger__Group__239239);
+            pushFollow(FOLLOW_95);
             rule__Trigger__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Trigger__Group__3_in_rule__Trigger__Group__239242);
+            pushFollow(FOLLOW_2);
             rule__Trigger__Group__3();
 
             state._fsp--;
@@ -53122,20 +53122,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Trigger__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19400:1: rule__Trigger__Group__2__Impl : ( ( rule__Trigger__Group_2__0 )* ) ;
+    // InternalRoom.g:19403:1: rule__Trigger__Group__2__Impl : ( ( rule__Trigger__Group_2__0 )* ) ;
     public final void rule__Trigger__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19404:1: ( ( ( rule__Trigger__Group_2__0 )* ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19405:1: ( ( rule__Trigger__Group_2__0 )* )
+            // InternalRoom.g:19407:1: ( ( ( rule__Trigger__Group_2__0 )* ) )
+            // InternalRoom.g:19408:1: ( ( rule__Trigger__Group_2__0 )* )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19405:1: ( ( rule__Trigger__Group_2__0 )* )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19406:1: ( rule__Trigger__Group_2__0 )*
+            // InternalRoom.g:19408:1: ( ( rule__Trigger__Group_2__0 )* )
+            // InternalRoom.g:19409:1: ( rule__Trigger__Group_2__0 )*
             {
              before(grammarAccess.getTriggerAccess().getGroup_2()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19407:1: ( rule__Trigger__Group_2__0 )*
+            // InternalRoom.g:19410:1: ( rule__Trigger__Group_2__0 )*
             loop182:
             do {
                 int alt182=2;
@@ -53148,9 +53148,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
                 switch (alt182) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19407:2: rule__Trigger__Group_2__0
+            	    // InternalRoom.g:19410:2: rule__Trigger__Group_2__0
             	    {
-            	    pushFollow(FOLLOW_rule__Trigger__Group_2__0_in_rule__Trigger__Group__2__Impl39269);
+            	    pushFollow(FOLLOW_96);
             	    rule__Trigger__Group_2__0();
 
             	    state._fsp--;
@@ -53187,21 +53187,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Trigger__Group__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19417:1: rule__Trigger__Group__3 : rule__Trigger__Group__3__Impl rule__Trigger__Group__4 ;
+    // InternalRoom.g:19420:1: rule__Trigger__Group__3 : rule__Trigger__Group__3__Impl rule__Trigger__Group__4 ;
     public final void rule__Trigger__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19421:1: ( rule__Trigger__Group__3__Impl rule__Trigger__Group__4 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19422:2: rule__Trigger__Group__3__Impl rule__Trigger__Group__4
+            // InternalRoom.g:19424:1: ( rule__Trigger__Group__3__Impl rule__Trigger__Group__4 )
+            // InternalRoom.g:19425:2: rule__Trigger__Group__3__Impl rule__Trigger__Group__4
             {
-            pushFollow(FOLLOW_rule__Trigger__Group__3__Impl_in_rule__Trigger__Group__339300);
+            pushFollow(FOLLOW_95);
             rule__Trigger__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Trigger__Group__4_in_rule__Trigger__Group__339303);
+            pushFollow(FOLLOW_2);
             rule__Trigger__Group__4();
 
             state._fsp--;
@@ -53225,20 +53225,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Trigger__Group__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19429:1: rule__Trigger__Group__3__Impl : ( ( rule__Trigger__GuardAssignment_3 )? ) ;
+    // InternalRoom.g:19432:1: rule__Trigger__Group__3__Impl : ( ( rule__Trigger__GuardAssignment_3 )? ) ;
     public final void rule__Trigger__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19433:1: ( ( ( rule__Trigger__GuardAssignment_3 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19434:1: ( ( rule__Trigger__GuardAssignment_3 )? )
+            // InternalRoom.g:19436:1: ( ( ( rule__Trigger__GuardAssignment_3 )? ) )
+            // InternalRoom.g:19437:1: ( ( rule__Trigger__GuardAssignment_3 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19434:1: ( ( rule__Trigger__GuardAssignment_3 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19435:1: ( rule__Trigger__GuardAssignment_3 )?
+            // InternalRoom.g:19437:1: ( ( rule__Trigger__GuardAssignment_3 )? )
+            // InternalRoom.g:19438:1: ( rule__Trigger__GuardAssignment_3 )?
             {
              before(grammarAccess.getTriggerAccess().getGuardAssignment_3()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19436:1: ( rule__Trigger__GuardAssignment_3 )?
+            // InternalRoom.g:19439:1: ( rule__Trigger__GuardAssignment_3 )?
             int alt183=2;
             int LA183_0 = input.LA(1);
 
@@ -53247,9 +53247,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt183) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19436:2: rule__Trigger__GuardAssignment_3
+                    // InternalRoom.g:19439:2: rule__Trigger__GuardAssignment_3
                     {
-                    pushFollow(FOLLOW_rule__Trigger__GuardAssignment_3_in_rule__Trigger__Group__3__Impl39330);
+                    pushFollow(FOLLOW_2);
                     rule__Trigger__GuardAssignment_3();
 
                     state._fsp--;
@@ -53283,16 +53283,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Trigger__Group__4"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19446:1: rule__Trigger__Group__4 : rule__Trigger__Group__4__Impl ;
+    // InternalRoom.g:19449:1: rule__Trigger__Group__4 : rule__Trigger__Group__4__Impl ;
     public final void rule__Trigger__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19450:1: ( rule__Trigger__Group__4__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19451:2: rule__Trigger__Group__4__Impl
+            // InternalRoom.g:19453:1: ( rule__Trigger__Group__4__Impl )
+            // InternalRoom.g:19454:2: rule__Trigger__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__Trigger__Group__4__Impl_in_rule__Trigger__Group__439361);
+            pushFollow(FOLLOW_2);
             rule__Trigger__Group__4__Impl();
 
             state._fsp--;
@@ -53316,20 +53316,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Trigger__Group__4__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19457:1: rule__Trigger__Group__4__Impl : ( '>' ) ;
+    // InternalRoom.g:19460:1: rule__Trigger__Group__4__Impl : ( '>' ) ;
     public final void rule__Trigger__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19461:1: ( ( '>' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19462:1: ( '>' )
+            // InternalRoom.g:19464:1: ( ( '>' ) )
+            // InternalRoom.g:19465:1: ( '>' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19462:1: ( '>' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19463:1: '>'
+            // InternalRoom.g:19465:1: ( '>' )
+            // InternalRoom.g:19466:1: '>'
             {
              before(grammarAccess.getTriggerAccess().getGreaterThanSignKeyword_4()); 
-            match(input,115,FOLLOW_115_in_rule__Trigger__Group__4__Impl39389); 
+            match(input,115,FOLLOW_2); 
              after(grammarAccess.getTriggerAccess().getGreaterThanSignKeyword_4()); 
 
             }
@@ -53353,21 +53353,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Trigger__Group_2__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19486:1: rule__Trigger__Group_2__0 : rule__Trigger__Group_2__0__Impl rule__Trigger__Group_2__1 ;
+    // InternalRoom.g:19489:1: rule__Trigger__Group_2__0 : rule__Trigger__Group_2__0__Impl rule__Trigger__Group_2__1 ;
     public final void rule__Trigger__Group_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19490:1: ( rule__Trigger__Group_2__0__Impl rule__Trigger__Group_2__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19491:2: rule__Trigger__Group_2__0__Impl rule__Trigger__Group_2__1
+            // InternalRoom.g:19493:1: ( rule__Trigger__Group_2__0__Impl rule__Trigger__Group_2__1 )
+            // InternalRoom.g:19494:2: rule__Trigger__Group_2__0__Impl rule__Trigger__Group_2__1
             {
-            pushFollow(FOLLOW_rule__Trigger__Group_2__0__Impl_in_rule__Trigger__Group_2__039430);
+            pushFollow(FOLLOW_3);
             rule__Trigger__Group_2__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Trigger__Group_2__1_in_rule__Trigger__Group_2__039433);
+            pushFollow(FOLLOW_2);
             rule__Trigger__Group_2__1();
 
             state._fsp--;
@@ -53391,20 +53391,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Trigger__Group_2__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19498:1: rule__Trigger__Group_2__0__Impl : ( '|' ) ;
+    // InternalRoom.g:19501:1: rule__Trigger__Group_2__0__Impl : ( '|' ) ;
     public final void rule__Trigger__Group_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19502:1: ( ( '|' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19503:1: ( '|' )
+            // InternalRoom.g:19505:1: ( ( '|' ) )
+            // InternalRoom.g:19506:1: ( '|' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19503:1: ( '|' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19504:1: '|'
+            // InternalRoom.g:19506:1: ( '|' )
+            // InternalRoom.g:19507:1: '|'
             {
              before(grammarAccess.getTriggerAccess().getVerticalLineKeyword_2_0()); 
-            match(input,116,FOLLOW_116_in_rule__Trigger__Group_2__0__Impl39461); 
+            match(input,116,FOLLOW_2); 
              after(grammarAccess.getTriggerAccess().getVerticalLineKeyword_2_0()); 
 
             }
@@ -53428,16 +53428,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Trigger__Group_2__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19517:1: rule__Trigger__Group_2__1 : rule__Trigger__Group_2__1__Impl ;
+    // InternalRoom.g:19520:1: rule__Trigger__Group_2__1 : rule__Trigger__Group_2__1__Impl ;
     public final void rule__Trigger__Group_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19521:1: ( rule__Trigger__Group_2__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19522:2: rule__Trigger__Group_2__1__Impl
+            // InternalRoom.g:19524:1: ( rule__Trigger__Group_2__1__Impl )
+            // InternalRoom.g:19525:2: rule__Trigger__Group_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__Trigger__Group_2__1__Impl_in_rule__Trigger__Group_2__139492);
+            pushFollow(FOLLOW_2);
             rule__Trigger__Group_2__1__Impl();
 
             state._fsp--;
@@ -53461,23 +53461,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Trigger__Group_2__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19528:1: rule__Trigger__Group_2__1__Impl : ( ( rule__Trigger__MsgFromIfPairsAssignment_2_1 ) ) ;
+    // InternalRoom.g:19531:1: rule__Trigger__Group_2__1__Impl : ( ( rule__Trigger__MsgFromIfPairsAssignment_2_1 ) ) ;
     public final void rule__Trigger__Group_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19532:1: ( ( ( rule__Trigger__MsgFromIfPairsAssignment_2_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19533:1: ( ( rule__Trigger__MsgFromIfPairsAssignment_2_1 ) )
+            // InternalRoom.g:19535:1: ( ( ( rule__Trigger__MsgFromIfPairsAssignment_2_1 ) ) )
+            // InternalRoom.g:19536:1: ( ( rule__Trigger__MsgFromIfPairsAssignment_2_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19533:1: ( ( rule__Trigger__MsgFromIfPairsAssignment_2_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19534:1: ( rule__Trigger__MsgFromIfPairsAssignment_2_1 )
+            // InternalRoom.g:19536:1: ( ( rule__Trigger__MsgFromIfPairsAssignment_2_1 ) )
+            // InternalRoom.g:19537:1: ( rule__Trigger__MsgFromIfPairsAssignment_2_1 )
             {
              before(grammarAccess.getTriggerAccess().getMsgFromIfPairsAssignment_2_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19535:1: ( rule__Trigger__MsgFromIfPairsAssignment_2_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19535:2: rule__Trigger__MsgFromIfPairsAssignment_2_1
+            // InternalRoom.g:19538:1: ( rule__Trigger__MsgFromIfPairsAssignment_2_1 )
+            // InternalRoom.g:19538:2: rule__Trigger__MsgFromIfPairsAssignment_2_1
             {
-            pushFollow(FOLLOW_rule__Trigger__MsgFromIfPairsAssignment_2_1_in_rule__Trigger__Group_2__1__Impl39519);
+            pushFollow(FOLLOW_2);
             rule__Trigger__MsgFromIfPairsAssignment_2_1();
 
             state._fsp--;
@@ -53508,21 +53508,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MessageFromIf__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19549:1: rule__MessageFromIf__Group__0 : rule__MessageFromIf__Group__0__Impl rule__MessageFromIf__Group__1 ;
+    // InternalRoom.g:19552:1: rule__MessageFromIf__Group__0 : rule__MessageFromIf__Group__0__Impl rule__MessageFromIf__Group__1 ;
     public final void rule__MessageFromIf__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19553:1: ( rule__MessageFromIf__Group__0__Impl rule__MessageFromIf__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19554:2: rule__MessageFromIf__Group__0__Impl rule__MessageFromIf__Group__1
+            // InternalRoom.g:19556:1: ( rule__MessageFromIf__Group__0__Impl rule__MessageFromIf__Group__1 )
+            // InternalRoom.g:19557:2: rule__MessageFromIf__Group__0__Impl rule__MessageFromIf__Group__1
             {
-            pushFollow(FOLLOW_rule__MessageFromIf__Group__0__Impl_in_rule__MessageFromIf__Group__039553);
+            pushFollow(FOLLOW_8);
             rule__MessageFromIf__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__MessageFromIf__Group__1_in_rule__MessageFromIf__Group__039556);
+            pushFollow(FOLLOW_2);
             rule__MessageFromIf__Group__1();
 
             state._fsp--;
@@ -53546,23 +53546,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MessageFromIf__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19561:1: rule__MessageFromIf__Group__0__Impl : ( ( rule__MessageFromIf__MessageAssignment_0 ) ) ;
+    // InternalRoom.g:19564:1: rule__MessageFromIf__Group__0__Impl : ( ( rule__MessageFromIf__MessageAssignment_0 ) ) ;
     public final void rule__MessageFromIf__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19565:1: ( ( ( rule__MessageFromIf__MessageAssignment_0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19566:1: ( ( rule__MessageFromIf__MessageAssignment_0 ) )
+            // InternalRoom.g:19568:1: ( ( ( rule__MessageFromIf__MessageAssignment_0 ) ) )
+            // InternalRoom.g:19569:1: ( ( rule__MessageFromIf__MessageAssignment_0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19566:1: ( ( rule__MessageFromIf__MessageAssignment_0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19567:1: ( rule__MessageFromIf__MessageAssignment_0 )
+            // InternalRoom.g:19569:1: ( ( rule__MessageFromIf__MessageAssignment_0 ) )
+            // InternalRoom.g:19570:1: ( rule__MessageFromIf__MessageAssignment_0 )
             {
              before(grammarAccess.getMessageFromIfAccess().getMessageAssignment_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19568:1: ( rule__MessageFromIf__MessageAssignment_0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19568:2: rule__MessageFromIf__MessageAssignment_0
+            // InternalRoom.g:19571:1: ( rule__MessageFromIf__MessageAssignment_0 )
+            // InternalRoom.g:19571:2: rule__MessageFromIf__MessageAssignment_0
             {
-            pushFollow(FOLLOW_rule__MessageFromIf__MessageAssignment_0_in_rule__MessageFromIf__Group__0__Impl39583);
+            pushFollow(FOLLOW_2);
             rule__MessageFromIf__MessageAssignment_0();
 
             state._fsp--;
@@ -53593,21 +53593,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MessageFromIf__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19578:1: rule__MessageFromIf__Group__1 : rule__MessageFromIf__Group__1__Impl rule__MessageFromIf__Group__2 ;
+    // InternalRoom.g:19581:1: rule__MessageFromIf__Group__1 : rule__MessageFromIf__Group__1__Impl rule__MessageFromIf__Group__2 ;
     public final void rule__MessageFromIf__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19582:1: ( rule__MessageFromIf__Group__1__Impl rule__MessageFromIf__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19583:2: rule__MessageFromIf__Group__1__Impl rule__MessageFromIf__Group__2
+            // InternalRoom.g:19585:1: ( rule__MessageFromIf__Group__1__Impl rule__MessageFromIf__Group__2 )
+            // InternalRoom.g:19586:2: rule__MessageFromIf__Group__1__Impl rule__MessageFromIf__Group__2
             {
-            pushFollow(FOLLOW_rule__MessageFromIf__Group__1__Impl_in_rule__MessageFromIf__Group__139613);
+            pushFollow(FOLLOW_3);
             rule__MessageFromIf__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__MessageFromIf__Group__2_in_rule__MessageFromIf__Group__139616);
+            pushFollow(FOLLOW_2);
             rule__MessageFromIf__Group__2();
 
             state._fsp--;
@@ -53631,20 +53631,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MessageFromIf__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19590:1: rule__MessageFromIf__Group__1__Impl : ( ':' ) ;
+    // InternalRoom.g:19593:1: rule__MessageFromIf__Group__1__Impl : ( ':' ) ;
     public final void rule__MessageFromIf__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19594:1: ( ( ':' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19595:1: ( ':' )
+            // InternalRoom.g:19597:1: ( ( ':' ) )
+            // InternalRoom.g:19598:1: ( ':' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19595:1: ( ':' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19596:1: ':'
+            // InternalRoom.g:19598:1: ( ':' )
+            // InternalRoom.g:19599:1: ':'
             {
              before(grammarAccess.getMessageFromIfAccess().getColonKeyword_1()); 
-            match(input,43,FOLLOW_43_in_rule__MessageFromIf__Group__1__Impl39644); 
+            match(input,43,FOLLOW_2); 
              after(grammarAccess.getMessageFromIfAccess().getColonKeyword_1()); 
 
             }
@@ -53668,16 +53668,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MessageFromIf__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19609:1: rule__MessageFromIf__Group__2 : rule__MessageFromIf__Group__2__Impl ;
+    // InternalRoom.g:19612:1: rule__MessageFromIf__Group__2 : rule__MessageFromIf__Group__2__Impl ;
     public final void rule__MessageFromIf__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19613:1: ( rule__MessageFromIf__Group__2__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19614:2: rule__MessageFromIf__Group__2__Impl
+            // InternalRoom.g:19616:1: ( rule__MessageFromIf__Group__2__Impl )
+            // InternalRoom.g:19617:2: rule__MessageFromIf__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__MessageFromIf__Group__2__Impl_in_rule__MessageFromIf__Group__239675);
+            pushFollow(FOLLOW_2);
             rule__MessageFromIf__Group__2__Impl();
 
             state._fsp--;
@@ -53701,23 +53701,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MessageFromIf__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19620:1: rule__MessageFromIf__Group__2__Impl : ( ( rule__MessageFromIf__FromAssignment_2 ) ) ;
+    // InternalRoom.g:19623:1: rule__MessageFromIf__Group__2__Impl : ( ( rule__MessageFromIf__FromAssignment_2 ) ) ;
     public final void rule__MessageFromIf__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19624:1: ( ( ( rule__MessageFromIf__FromAssignment_2 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19625:1: ( ( rule__MessageFromIf__FromAssignment_2 ) )
+            // InternalRoom.g:19627:1: ( ( ( rule__MessageFromIf__FromAssignment_2 ) ) )
+            // InternalRoom.g:19628:1: ( ( rule__MessageFromIf__FromAssignment_2 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19625:1: ( ( rule__MessageFromIf__FromAssignment_2 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19626:1: ( rule__MessageFromIf__FromAssignment_2 )
+            // InternalRoom.g:19628:1: ( ( rule__MessageFromIf__FromAssignment_2 ) )
+            // InternalRoom.g:19629:1: ( rule__MessageFromIf__FromAssignment_2 )
             {
              before(grammarAccess.getMessageFromIfAccess().getFromAssignment_2()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19627:1: ( rule__MessageFromIf__FromAssignment_2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19627:2: rule__MessageFromIf__FromAssignment_2
+            // InternalRoom.g:19630:1: ( rule__MessageFromIf__FromAssignment_2 )
+            // InternalRoom.g:19630:2: rule__MessageFromIf__FromAssignment_2
             {
-            pushFollow(FOLLOW_rule__MessageFromIf__FromAssignment_2_in_rule__MessageFromIf__Group__2__Impl39702);
+            pushFollow(FOLLOW_2);
             rule__MessageFromIf__FromAssignment_2();
 
             state._fsp--;
@@ -53748,21 +53748,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Guard__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19643:1: rule__Guard__Group__0 : rule__Guard__Group__0__Impl rule__Guard__Group__1 ;
+    // InternalRoom.g:19646:1: rule__Guard__Group__0 : rule__Guard__Group__0__Impl rule__Guard__Group__1 ;
     public final void rule__Guard__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19647:1: ( rule__Guard__Group__0__Impl rule__Guard__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19648:2: rule__Guard__Group__0__Impl rule__Guard__Group__1
+            // InternalRoom.g:19650:1: ( rule__Guard__Group__0__Impl rule__Guard__Group__1 )
+            // InternalRoom.g:19651:2: rule__Guard__Group__0__Impl rule__Guard__Group__1
             {
-            pushFollow(FOLLOW_rule__Guard__Group__0__Impl_in_rule__Guard__Group__039738);
+            pushFollow(FOLLOW_27);
             rule__Guard__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Guard__Group__1_in_rule__Guard__Group__039741);
+            pushFollow(FOLLOW_2);
             rule__Guard__Group__1();
 
             state._fsp--;
@@ -53786,20 +53786,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Guard__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19655:1: rule__Guard__Group__0__Impl : ( 'guard' ) ;
+    // InternalRoom.g:19658:1: rule__Guard__Group__0__Impl : ( 'guard' ) ;
     public final void rule__Guard__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19659:1: ( ( 'guard' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19660:1: ( 'guard' )
+            // InternalRoom.g:19662:1: ( ( 'guard' ) )
+            // InternalRoom.g:19663:1: ( 'guard' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19660:1: ( 'guard' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19661:1: 'guard'
+            // InternalRoom.g:19663:1: ( 'guard' )
+            // InternalRoom.g:19664:1: 'guard'
             {
              before(grammarAccess.getGuardAccess().getGuardKeyword_0()); 
-            match(input,109,FOLLOW_109_in_rule__Guard__Group__0__Impl39769); 
+            match(input,109,FOLLOW_2); 
              after(grammarAccess.getGuardAccess().getGuardKeyword_0()); 
 
             }
@@ -53823,16 +53823,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Guard__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19674:1: rule__Guard__Group__1 : rule__Guard__Group__1__Impl ;
+    // InternalRoom.g:19677:1: rule__Guard__Group__1 : rule__Guard__Group__1__Impl ;
     public final void rule__Guard__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19678:1: ( rule__Guard__Group__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19679:2: rule__Guard__Group__1__Impl
+            // InternalRoom.g:19681:1: ( rule__Guard__Group__1__Impl )
+            // InternalRoom.g:19682:2: rule__Guard__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__Guard__Group__1__Impl_in_rule__Guard__Group__139800);
+            pushFollow(FOLLOW_2);
             rule__Guard__Group__1__Impl();
 
             state._fsp--;
@@ -53856,23 +53856,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Guard__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19685:1: rule__Guard__Group__1__Impl : ( ( rule__Guard__GuardAssignment_1 ) ) ;
+    // InternalRoom.g:19688:1: rule__Guard__Group__1__Impl : ( ( rule__Guard__GuardAssignment_1 ) ) ;
     public final void rule__Guard__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19689:1: ( ( ( rule__Guard__GuardAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19690:1: ( ( rule__Guard__GuardAssignment_1 ) )
+            // InternalRoom.g:19692:1: ( ( ( rule__Guard__GuardAssignment_1 ) ) )
+            // InternalRoom.g:19693:1: ( ( rule__Guard__GuardAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19690:1: ( ( rule__Guard__GuardAssignment_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19691:1: ( rule__Guard__GuardAssignment_1 )
+            // InternalRoom.g:19693:1: ( ( rule__Guard__GuardAssignment_1 ) )
+            // InternalRoom.g:19694:1: ( rule__Guard__GuardAssignment_1 )
             {
              before(grammarAccess.getGuardAccess().getGuardAssignment_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19692:1: ( rule__Guard__GuardAssignment_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19692:2: rule__Guard__GuardAssignment_1
+            // InternalRoom.g:19695:1: ( rule__Guard__GuardAssignment_1 )
+            // InternalRoom.g:19695:2: rule__Guard__GuardAssignment_1
             {
-            pushFollow(FOLLOW_rule__Guard__GuardAssignment_1_in_rule__Guard__Group__1__Impl39827);
+            pushFollow(FOLLOW_2);
             rule__Guard__GuardAssignment_1();
 
             state._fsp--;
@@ -53903,21 +53903,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolSemantics__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19706:1: rule__ProtocolSemantics__Group__0 : rule__ProtocolSemantics__Group__0__Impl rule__ProtocolSemantics__Group__1 ;
+    // InternalRoom.g:19709:1: rule__ProtocolSemantics__Group__0 : rule__ProtocolSemantics__Group__0__Impl rule__ProtocolSemantics__Group__1 ;
     public final void rule__ProtocolSemantics__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19710:1: ( rule__ProtocolSemantics__Group__0__Impl rule__ProtocolSemantics__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19711:2: rule__ProtocolSemantics__Group__0__Impl rule__ProtocolSemantics__Group__1
+            // InternalRoom.g:19713:1: ( rule__ProtocolSemantics__Group__0__Impl rule__ProtocolSemantics__Group__1 )
+            // InternalRoom.g:19714:2: rule__ProtocolSemantics__Group__0__Impl rule__ProtocolSemantics__Group__1
             {
-            pushFollow(FOLLOW_rule__ProtocolSemantics__Group__0__Impl_in_rule__ProtocolSemantics__Group__039861);
+            pushFollow(FOLLOW_97);
             rule__ProtocolSemantics__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ProtocolSemantics__Group__1_in_rule__ProtocolSemantics__Group__039864);
+            pushFollow(FOLLOW_2);
             rule__ProtocolSemantics__Group__1();
 
             state._fsp--;
@@ -53941,21 +53941,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolSemantics__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19718:1: rule__ProtocolSemantics__Group__0__Impl : ( () ) ;
+    // InternalRoom.g:19721:1: rule__ProtocolSemantics__Group__0__Impl : ( () ) ;
     public final void rule__ProtocolSemantics__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19722:1: ( ( () ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19723:1: ( () )
+            // InternalRoom.g:19725:1: ( ( () ) )
+            // InternalRoom.g:19726:1: ( () )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19723:1: ( () )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19724:1: ()
+            // InternalRoom.g:19726:1: ( () )
+            // InternalRoom.g:19727:1: ()
             {
              before(grammarAccess.getProtocolSemanticsAccess().getProtocolSemanticsAction_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19725:1: ()
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19727:1: 
+            // InternalRoom.g:19728:1: ()
+            // InternalRoom.g:19730:1: 
             {
             }
 
@@ -53978,21 +53978,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolSemantics__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19737:1: rule__ProtocolSemantics__Group__1 : rule__ProtocolSemantics__Group__1__Impl rule__ProtocolSemantics__Group__2 ;
+    // InternalRoom.g:19740:1: rule__ProtocolSemantics__Group__1 : rule__ProtocolSemantics__Group__1__Impl rule__ProtocolSemantics__Group__2 ;
     public final void rule__ProtocolSemantics__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19741:1: ( rule__ProtocolSemantics__Group__1__Impl rule__ProtocolSemantics__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19742:2: rule__ProtocolSemantics__Group__1__Impl rule__ProtocolSemantics__Group__2
+            // InternalRoom.g:19744:1: ( rule__ProtocolSemantics__Group__1__Impl rule__ProtocolSemantics__Group__2 )
+            // InternalRoom.g:19745:2: rule__ProtocolSemantics__Group__1__Impl rule__ProtocolSemantics__Group__2
             {
-            pushFollow(FOLLOW_rule__ProtocolSemantics__Group__1__Impl_in_rule__ProtocolSemantics__Group__139922);
+            pushFollow(FOLLOW_27);
             rule__ProtocolSemantics__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ProtocolSemantics__Group__2_in_rule__ProtocolSemantics__Group__139925);
+            pushFollow(FOLLOW_2);
             rule__ProtocolSemantics__Group__2();
 
             state._fsp--;
@@ -54016,20 +54016,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolSemantics__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19749:1: rule__ProtocolSemantics__Group__1__Impl : ( 'semantics' ) ;
+    // InternalRoom.g:19752:1: rule__ProtocolSemantics__Group__1__Impl : ( 'semantics' ) ;
     public final void rule__ProtocolSemantics__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19753:1: ( ( 'semantics' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19754:1: ( 'semantics' )
+            // InternalRoom.g:19756:1: ( ( 'semantics' ) )
+            // InternalRoom.g:19757:1: ( 'semantics' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19754:1: ( 'semantics' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19755:1: 'semantics'
+            // InternalRoom.g:19757:1: ( 'semantics' )
+            // InternalRoom.g:19758:1: 'semantics'
             {
              before(grammarAccess.getProtocolSemanticsAccess().getSemanticsKeyword_1()); 
-            match(input,117,FOLLOW_117_in_rule__ProtocolSemantics__Group__1__Impl39953); 
+            match(input,117,FOLLOW_2); 
              after(grammarAccess.getProtocolSemanticsAccess().getSemanticsKeyword_1()); 
 
             }
@@ -54053,21 +54053,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolSemantics__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19768:1: rule__ProtocolSemantics__Group__2 : rule__ProtocolSemantics__Group__2__Impl rule__ProtocolSemantics__Group__3 ;
+    // InternalRoom.g:19771:1: rule__ProtocolSemantics__Group__2 : rule__ProtocolSemantics__Group__2__Impl rule__ProtocolSemantics__Group__3 ;
     public final void rule__ProtocolSemantics__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19772:1: ( rule__ProtocolSemantics__Group__2__Impl rule__ProtocolSemantics__Group__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19773:2: rule__ProtocolSemantics__Group__2__Impl rule__ProtocolSemantics__Group__3
+            // InternalRoom.g:19775:1: ( rule__ProtocolSemantics__Group__2__Impl rule__ProtocolSemantics__Group__3 )
+            // InternalRoom.g:19776:2: rule__ProtocolSemantics__Group__2__Impl rule__ProtocolSemantics__Group__3
             {
-            pushFollow(FOLLOW_rule__ProtocolSemantics__Group__2__Impl_in_rule__ProtocolSemantics__Group__239984);
+            pushFollow(FOLLOW_98);
             rule__ProtocolSemantics__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ProtocolSemantics__Group__3_in_rule__ProtocolSemantics__Group__239987);
+            pushFollow(FOLLOW_2);
             rule__ProtocolSemantics__Group__3();
 
             state._fsp--;
@@ -54091,20 +54091,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolSemantics__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19780:1: rule__ProtocolSemantics__Group__2__Impl : ( '{' ) ;
+    // InternalRoom.g:19783:1: rule__ProtocolSemantics__Group__2__Impl : ( '{' ) ;
     public final void rule__ProtocolSemantics__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19784:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19785:1: ( '{' )
+            // InternalRoom.g:19787:1: ( ( '{' ) )
+            // InternalRoom.g:19788:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19785:1: ( '{' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19786:1: '{'
+            // InternalRoom.g:19788:1: ( '{' )
+            // InternalRoom.g:19789:1: '{'
             {
              before(grammarAccess.getProtocolSemanticsAccess().getLeftCurlyBracketKeyword_2()); 
-            match(input,41,FOLLOW_41_in_rule__ProtocolSemantics__Group__2__Impl40015); 
+            match(input,41,FOLLOW_2); 
              after(grammarAccess.getProtocolSemanticsAccess().getLeftCurlyBracketKeyword_2()); 
 
             }
@@ -54128,21 +54128,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolSemantics__Group__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19799:1: rule__ProtocolSemantics__Group__3 : rule__ProtocolSemantics__Group__3__Impl rule__ProtocolSemantics__Group__4 ;
+    // InternalRoom.g:19802:1: rule__ProtocolSemantics__Group__3 : rule__ProtocolSemantics__Group__3__Impl rule__ProtocolSemantics__Group__4 ;
     public final void rule__ProtocolSemantics__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19803:1: ( rule__ProtocolSemantics__Group__3__Impl rule__ProtocolSemantics__Group__4 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19804:2: rule__ProtocolSemantics__Group__3__Impl rule__ProtocolSemantics__Group__4
+            // InternalRoom.g:19806:1: ( rule__ProtocolSemantics__Group__3__Impl rule__ProtocolSemantics__Group__4 )
+            // InternalRoom.g:19807:2: rule__ProtocolSemantics__Group__3__Impl rule__ProtocolSemantics__Group__4
             {
-            pushFollow(FOLLOW_rule__ProtocolSemantics__Group__3__Impl_in_rule__ProtocolSemantics__Group__340046);
+            pushFollow(FOLLOW_98);
             rule__ProtocolSemantics__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ProtocolSemantics__Group__4_in_rule__ProtocolSemantics__Group__340049);
+            pushFollow(FOLLOW_2);
             rule__ProtocolSemantics__Group__4();
 
             state._fsp--;
@@ -54166,20 +54166,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolSemantics__Group__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19811:1: rule__ProtocolSemantics__Group__3__Impl : ( ( rule__ProtocolSemantics__RulesAssignment_3 )* ) ;
+    // InternalRoom.g:19814:1: rule__ProtocolSemantics__Group__3__Impl : ( ( rule__ProtocolSemantics__RulesAssignment_3 )* ) ;
     public final void rule__ProtocolSemantics__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19815:1: ( ( ( rule__ProtocolSemantics__RulesAssignment_3 )* ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19816:1: ( ( rule__ProtocolSemantics__RulesAssignment_3 )* )
+            // InternalRoom.g:19818:1: ( ( ( rule__ProtocolSemantics__RulesAssignment_3 )* ) )
+            // InternalRoom.g:19819:1: ( ( rule__ProtocolSemantics__RulesAssignment_3 )* )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19816:1: ( ( rule__ProtocolSemantics__RulesAssignment_3 )* )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19817:1: ( rule__ProtocolSemantics__RulesAssignment_3 )*
+            // InternalRoom.g:19819:1: ( ( rule__ProtocolSemantics__RulesAssignment_3 )* )
+            // InternalRoom.g:19820:1: ( rule__ProtocolSemantics__RulesAssignment_3 )*
             {
              before(grammarAccess.getProtocolSemanticsAccess().getRulesAssignment_3()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19818:1: ( rule__ProtocolSemantics__RulesAssignment_3 )*
+            // InternalRoom.g:19821:1: ( rule__ProtocolSemantics__RulesAssignment_3 )*
             loop184:
             do {
                 int alt184=2;
@@ -54192,9 +54192,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
                 switch (alt184) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19818:2: rule__ProtocolSemantics__RulesAssignment_3
+            	    // InternalRoom.g:19821:2: rule__ProtocolSemantics__RulesAssignment_3
             	    {
-            	    pushFollow(FOLLOW_rule__ProtocolSemantics__RulesAssignment_3_in_rule__ProtocolSemantics__Group__3__Impl40076);
+            	    pushFollow(FOLLOW_99);
             	    rule__ProtocolSemantics__RulesAssignment_3();
 
             	    state._fsp--;
@@ -54231,16 +54231,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolSemantics__Group__4"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19828:1: rule__ProtocolSemantics__Group__4 : rule__ProtocolSemantics__Group__4__Impl ;
+    // InternalRoom.g:19831:1: rule__ProtocolSemantics__Group__4 : rule__ProtocolSemantics__Group__4__Impl ;
     public final void rule__ProtocolSemantics__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19832:1: ( rule__ProtocolSemantics__Group__4__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19833:2: rule__ProtocolSemantics__Group__4__Impl
+            // InternalRoom.g:19835:1: ( rule__ProtocolSemantics__Group__4__Impl )
+            // InternalRoom.g:19836:2: rule__ProtocolSemantics__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__ProtocolSemantics__Group__4__Impl_in_rule__ProtocolSemantics__Group__440107);
+            pushFollow(FOLLOW_2);
             rule__ProtocolSemantics__Group__4__Impl();
 
             state._fsp--;
@@ -54264,20 +54264,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolSemantics__Group__4__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19839:1: rule__ProtocolSemantics__Group__4__Impl : ( '}' ) ;
+    // InternalRoom.g:19842:1: rule__ProtocolSemantics__Group__4__Impl : ( '}' ) ;
     public final void rule__ProtocolSemantics__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19843:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19844:1: ( '}' )
+            // InternalRoom.g:19846:1: ( ( '}' ) )
+            // InternalRoom.g:19847:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19844:1: ( '}' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19845:1: '}'
+            // InternalRoom.g:19847:1: ( '}' )
+            // InternalRoom.g:19848:1: '}'
             {
              before(grammarAccess.getProtocolSemanticsAccess().getRightCurlyBracketKeyword_4()); 
-            match(input,42,FOLLOW_42_in_rule__ProtocolSemantics__Group__4__Impl40135); 
+            match(input,42,FOLLOW_2); 
              after(grammarAccess.getProtocolSemanticsAccess().getRightCurlyBracketKeyword_4()); 
 
             }
@@ -54301,21 +54301,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19868:1: rule__InSemanticsRule__Group__0 : rule__InSemanticsRule__Group__0__Impl rule__InSemanticsRule__Group__1 ;
+    // InternalRoom.g:19871:1: rule__InSemanticsRule__Group__0 : rule__InSemanticsRule__Group__0__Impl rule__InSemanticsRule__Group__1 ;
     public final void rule__InSemanticsRule__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19872:1: ( rule__InSemanticsRule__Group__0__Impl rule__InSemanticsRule__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19873:2: rule__InSemanticsRule__Group__0__Impl rule__InSemanticsRule__Group__1
+            // InternalRoom.g:19875:1: ( rule__InSemanticsRule__Group__0__Impl rule__InSemanticsRule__Group__1 )
+            // InternalRoom.g:19876:2: rule__InSemanticsRule__Group__0__Impl rule__InSemanticsRule__Group__1
             {
-            pushFollow(FOLLOW_rule__InSemanticsRule__Group__0__Impl_in_rule__InSemanticsRule__Group__040176);
+            pushFollow(FOLLOW_8);
             rule__InSemanticsRule__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__InSemanticsRule__Group__1_in_rule__InSemanticsRule__Group__040179);
+            pushFollow(FOLLOW_2);
             rule__InSemanticsRule__Group__1();
 
             state._fsp--;
@@ -54339,20 +54339,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19880:1: rule__InSemanticsRule__Group__0__Impl : ( 'in' ) ;
+    // InternalRoom.g:19883:1: rule__InSemanticsRule__Group__0__Impl : ( 'in' ) ;
     public final void rule__InSemanticsRule__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19884:1: ( ( 'in' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19885:1: ( 'in' )
+            // InternalRoom.g:19887:1: ( ( 'in' ) )
+            // InternalRoom.g:19888:1: ( 'in' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19885:1: ( 'in' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19886:1: 'in'
+            // InternalRoom.g:19888:1: ( 'in' )
+            // InternalRoom.g:19889:1: 'in'
             {
              before(grammarAccess.getInSemanticsRuleAccess().getInKeyword_0()); 
-            match(input,118,FOLLOW_118_in_rule__InSemanticsRule__Group__0__Impl40207); 
+            match(input,118,FOLLOW_2); 
              after(grammarAccess.getInSemanticsRuleAccess().getInKeyword_0()); 
 
             }
@@ -54376,21 +54376,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19899:1: rule__InSemanticsRule__Group__1 : rule__InSemanticsRule__Group__1__Impl rule__InSemanticsRule__Group__2 ;
+    // InternalRoom.g:19902:1: rule__InSemanticsRule__Group__1 : rule__InSemanticsRule__Group__1__Impl rule__InSemanticsRule__Group__2 ;
     public final void rule__InSemanticsRule__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19903:1: ( rule__InSemanticsRule__Group__1__Impl rule__InSemanticsRule__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19904:2: rule__InSemanticsRule__Group__1__Impl rule__InSemanticsRule__Group__2
+            // InternalRoom.g:19906:1: ( rule__InSemanticsRule__Group__1__Impl rule__InSemanticsRule__Group__2 )
+            // InternalRoom.g:19907:2: rule__InSemanticsRule__Group__1__Impl rule__InSemanticsRule__Group__2
             {
-            pushFollow(FOLLOW_rule__InSemanticsRule__Group__1__Impl_in_rule__InSemanticsRule__Group__140238);
+            pushFollow(FOLLOW_3);
             rule__InSemanticsRule__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__InSemanticsRule__Group__2_in_rule__InSemanticsRule__Group__140241);
+            pushFollow(FOLLOW_2);
             rule__InSemanticsRule__Group__2();
 
             state._fsp--;
@@ -54414,20 +54414,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19911:1: rule__InSemanticsRule__Group__1__Impl : ( ':' ) ;
+    // InternalRoom.g:19914:1: rule__InSemanticsRule__Group__1__Impl : ( ':' ) ;
     public final void rule__InSemanticsRule__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19915:1: ( ( ':' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19916:1: ( ':' )
+            // InternalRoom.g:19918:1: ( ( ':' ) )
+            // InternalRoom.g:19919:1: ( ':' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19916:1: ( ':' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19917:1: ':'
+            // InternalRoom.g:19919:1: ( ':' )
+            // InternalRoom.g:19920:1: ':'
             {
              before(grammarAccess.getInSemanticsRuleAccess().getColonKeyword_1()); 
-            match(input,43,FOLLOW_43_in_rule__InSemanticsRule__Group__1__Impl40269); 
+            match(input,43,FOLLOW_2); 
              after(grammarAccess.getInSemanticsRuleAccess().getColonKeyword_1()); 
 
             }
@@ -54451,21 +54451,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19930:1: rule__InSemanticsRule__Group__2 : rule__InSemanticsRule__Group__2__Impl rule__InSemanticsRule__Group__3 ;
+    // InternalRoom.g:19933:1: rule__InSemanticsRule__Group__2 : rule__InSemanticsRule__Group__2__Impl rule__InSemanticsRule__Group__3 ;
     public final void rule__InSemanticsRule__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19934:1: ( rule__InSemanticsRule__Group__2__Impl rule__InSemanticsRule__Group__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19935:2: rule__InSemanticsRule__Group__2__Impl rule__InSemanticsRule__Group__3
+            // InternalRoom.g:19937:1: ( rule__InSemanticsRule__Group__2__Impl rule__InSemanticsRule__Group__3 )
+            // InternalRoom.g:19938:2: rule__InSemanticsRule__Group__2__Impl rule__InSemanticsRule__Group__3
             {
-            pushFollow(FOLLOW_rule__InSemanticsRule__Group__2__Impl_in_rule__InSemanticsRule__Group__240300);
+            pushFollow(FOLLOW_11);
             rule__InSemanticsRule__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__InSemanticsRule__Group__3_in_rule__InSemanticsRule__Group__240303);
+            pushFollow(FOLLOW_2);
             rule__InSemanticsRule__Group__3();
 
             state._fsp--;
@@ -54489,23 +54489,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19942:1: rule__InSemanticsRule__Group__2__Impl : ( ( rule__InSemanticsRule__MsgAssignment_2 ) ) ;
+    // InternalRoom.g:19945:1: rule__InSemanticsRule__Group__2__Impl : ( ( rule__InSemanticsRule__MsgAssignment_2 ) ) ;
     public final void rule__InSemanticsRule__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19946:1: ( ( ( rule__InSemanticsRule__MsgAssignment_2 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19947:1: ( ( rule__InSemanticsRule__MsgAssignment_2 ) )
+            // InternalRoom.g:19949:1: ( ( ( rule__InSemanticsRule__MsgAssignment_2 ) ) )
+            // InternalRoom.g:19950:1: ( ( rule__InSemanticsRule__MsgAssignment_2 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19947:1: ( ( rule__InSemanticsRule__MsgAssignment_2 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19948:1: ( rule__InSemanticsRule__MsgAssignment_2 )
+            // InternalRoom.g:19950:1: ( ( rule__InSemanticsRule__MsgAssignment_2 ) )
+            // InternalRoom.g:19951:1: ( rule__InSemanticsRule__MsgAssignment_2 )
             {
              before(grammarAccess.getInSemanticsRuleAccess().getMsgAssignment_2()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19949:1: ( rule__InSemanticsRule__MsgAssignment_2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19949:2: rule__InSemanticsRule__MsgAssignment_2
+            // InternalRoom.g:19952:1: ( rule__InSemanticsRule__MsgAssignment_2 )
+            // InternalRoom.g:19952:2: rule__InSemanticsRule__MsgAssignment_2
             {
-            pushFollow(FOLLOW_rule__InSemanticsRule__MsgAssignment_2_in_rule__InSemanticsRule__Group__2__Impl40330);
+            pushFollow(FOLLOW_2);
             rule__InSemanticsRule__MsgAssignment_2();
 
             state._fsp--;
@@ -54536,16 +54536,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__Group__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19959:1: rule__InSemanticsRule__Group__3 : rule__InSemanticsRule__Group__3__Impl ;
+    // InternalRoom.g:19962:1: rule__InSemanticsRule__Group__3 : rule__InSemanticsRule__Group__3__Impl ;
     public final void rule__InSemanticsRule__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19963:1: ( rule__InSemanticsRule__Group__3__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19964:2: rule__InSemanticsRule__Group__3__Impl
+            // InternalRoom.g:19966:1: ( rule__InSemanticsRule__Group__3__Impl )
+            // InternalRoom.g:19967:2: rule__InSemanticsRule__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__InSemanticsRule__Group__3__Impl_in_rule__InSemanticsRule__Group__340360);
+            pushFollow(FOLLOW_2);
             rule__InSemanticsRule__Group__3__Impl();
 
             state._fsp--;
@@ -54569,20 +54569,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__Group__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19970:1: rule__InSemanticsRule__Group__3__Impl : ( ( rule__InSemanticsRule__Group_3__0 )? ) ;
+    // InternalRoom.g:19973:1: rule__InSemanticsRule__Group__3__Impl : ( ( rule__InSemanticsRule__Group_3__0 )? ) ;
     public final void rule__InSemanticsRule__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19974:1: ( ( ( rule__InSemanticsRule__Group_3__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19975:1: ( ( rule__InSemanticsRule__Group_3__0 )? )
+            // InternalRoom.g:19977:1: ( ( ( rule__InSemanticsRule__Group_3__0 )? ) )
+            // InternalRoom.g:19978:1: ( ( rule__InSemanticsRule__Group_3__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19975:1: ( ( rule__InSemanticsRule__Group_3__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19976:1: ( rule__InSemanticsRule__Group_3__0 )?
+            // InternalRoom.g:19978:1: ( ( rule__InSemanticsRule__Group_3__0 )? )
+            // InternalRoom.g:19979:1: ( rule__InSemanticsRule__Group_3__0 )?
             {
              before(grammarAccess.getInSemanticsRuleAccess().getGroup_3()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19977:1: ( rule__InSemanticsRule__Group_3__0 )?
+            // InternalRoom.g:19980:1: ( rule__InSemanticsRule__Group_3__0 )?
             int alt185=2;
             int LA185_0 = input.LA(1);
 
@@ -54591,9 +54591,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt185) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19977:2: rule__InSemanticsRule__Group_3__0
+                    // InternalRoom.g:19980:2: rule__InSemanticsRule__Group_3__0
                     {
-                    pushFollow(FOLLOW_rule__InSemanticsRule__Group_3__0_in_rule__InSemanticsRule__Group__3__Impl40387);
+                    pushFollow(FOLLOW_2);
                     rule__InSemanticsRule__Group_3__0();
 
                     state._fsp--;
@@ -54627,21 +54627,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__Group_3__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19995:1: rule__InSemanticsRule__Group_3__0 : rule__InSemanticsRule__Group_3__0__Impl rule__InSemanticsRule__Group_3__1 ;
+    // InternalRoom.g:19998:1: rule__InSemanticsRule__Group_3__0 : rule__InSemanticsRule__Group_3__0__Impl rule__InSemanticsRule__Group_3__1 ;
     public final void rule__InSemanticsRule__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:19999:1: ( rule__InSemanticsRule__Group_3__0__Impl rule__InSemanticsRule__Group_3__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20000:2: rule__InSemanticsRule__Group_3__0__Impl rule__InSemanticsRule__Group_3__1
+            // InternalRoom.g:20002:1: ( rule__InSemanticsRule__Group_3__0__Impl rule__InSemanticsRule__Group_3__1 )
+            // InternalRoom.g:20003:2: rule__InSemanticsRule__Group_3__0__Impl rule__InSemanticsRule__Group_3__1
             {
-            pushFollow(FOLLOW_rule__InSemanticsRule__Group_3__0__Impl_in_rule__InSemanticsRule__Group_3__040426);
+            pushFollow(FOLLOW_100);
             rule__InSemanticsRule__Group_3__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__InSemanticsRule__Group_3__1_in_rule__InSemanticsRule__Group_3__040429);
+            pushFollow(FOLLOW_2);
             rule__InSemanticsRule__Group_3__1();
 
             state._fsp--;
@@ -54665,20 +54665,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__Group_3__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20007:1: rule__InSemanticsRule__Group_3__0__Impl : ( '->' ) ;
+    // InternalRoom.g:20010:1: rule__InSemanticsRule__Group_3__0__Impl : ( '->' ) ;
     public final void rule__InSemanticsRule__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20011:1: ( ( '->' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20012:1: ( '->' )
+            // InternalRoom.g:20014:1: ( ( '->' ) )
+            // InternalRoom.g:20015:1: ( '->' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20012:1: ( '->' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20013:1: '->'
+            // InternalRoom.g:20015:1: ( '->' )
+            // InternalRoom.g:20016:1: '->'
             {
              before(grammarAccess.getInSemanticsRuleAccess().getHyphenMinusGreaterThanSignKeyword_3_0()); 
-            match(input,45,FOLLOW_45_in_rule__InSemanticsRule__Group_3__0__Impl40457); 
+            match(input,45,FOLLOW_2); 
              after(grammarAccess.getInSemanticsRuleAccess().getHyphenMinusGreaterThanSignKeyword_3_0()); 
 
             }
@@ -54702,16 +54702,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__Group_3__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20026:1: rule__InSemanticsRule__Group_3__1 : rule__InSemanticsRule__Group_3__1__Impl ;
+    // InternalRoom.g:20029:1: rule__InSemanticsRule__Group_3__1 : rule__InSemanticsRule__Group_3__1__Impl ;
     public final void rule__InSemanticsRule__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20030:1: ( rule__InSemanticsRule__Group_3__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20031:2: rule__InSemanticsRule__Group_3__1__Impl
+            // InternalRoom.g:20033:1: ( rule__InSemanticsRule__Group_3__1__Impl )
+            // InternalRoom.g:20034:2: rule__InSemanticsRule__Group_3__1__Impl
             {
-            pushFollow(FOLLOW_rule__InSemanticsRule__Group_3__1__Impl_in_rule__InSemanticsRule__Group_3__140488);
+            pushFollow(FOLLOW_2);
             rule__InSemanticsRule__Group_3__1__Impl();
 
             state._fsp--;
@@ -54735,23 +54735,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__Group_3__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20037:1: rule__InSemanticsRule__Group_3__1__Impl : ( ( rule__InSemanticsRule__Alternatives_3_1 ) ) ;
+    // InternalRoom.g:20040:1: rule__InSemanticsRule__Group_3__1__Impl : ( ( rule__InSemanticsRule__Alternatives_3_1 ) ) ;
     public final void rule__InSemanticsRule__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20041:1: ( ( ( rule__InSemanticsRule__Alternatives_3_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20042:1: ( ( rule__InSemanticsRule__Alternatives_3_1 ) )
+            // InternalRoom.g:20044:1: ( ( ( rule__InSemanticsRule__Alternatives_3_1 ) ) )
+            // InternalRoom.g:20045:1: ( ( rule__InSemanticsRule__Alternatives_3_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20042:1: ( ( rule__InSemanticsRule__Alternatives_3_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20043:1: ( rule__InSemanticsRule__Alternatives_3_1 )
+            // InternalRoom.g:20045:1: ( ( rule__InSemanticsRule__Alternatives_3_1 ) )
+            // InternalRoom.g:20046:1: ( rule__InSemanticsRule__Alternatives_3_1 )
             {
              before(grammarAccess.getInSemanticsRuleAccess().getAlternatives_3_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20044:1: ( rule__InSemanticsRule__Alternatives_3_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20044:2: rule__InSemanticsRule__Alternatives_3_1
+            // InternalRoom.g:20047:1: ( rule__InSemanticsRule__Alternatives_3_1 )
+            // InternalRoom.g:20047:2: rule__InSemanticsRule__Alternatives_3_1
             {
-            pushFollow(FOLLOW_rule__InSemanticsRule__Alternatives_3_1_in_rule__InSemanticsRule__Group_3__1__Impl40515);
+            pushFollow(FOLLOW_2);
             rule__InSemanticsRule__Alternatives_3_1();
 
             state._fsp--;
@@ -54782,21 +54782,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__Group_3_1_1__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20058:1: rule__InSemanticsRule__Group_3_1_1__0 : rule__InSemanticsRule__Group_3_1_1__0__Impl rule__InSemanticsRule__Group_3_1_1__1 ;
+    // InternalRoom.g:20061:1: rule__InSemanticsRule__Group_3_1_1__0 : rule__InSemanticsRule__Group_3_1_1__0__Impl rule__InSemanticsRule__Group_3_1_1__1 ;
     public final void rule__InSemanticsRule__Group_3_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20062:1: ( rule__InSemanticsRule__Group_3_1_1__0__Impl rule__InSemanticsRule__Group_3_1_1__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20063:2: rule__InSemanticsRule__Group_3_1_1__0__Impl rule__InSemanticsRule__Group_3_1_1__1
+            // InternalRoom.g:20065:1: ( rule__InSemanticsRule__Group_3_1_1__0__Impl rule__InSemanticsRule__Group_3_1_1__1 )
+            // InternalRoom.g:20066:2: rule__InSemanticsRule__Group_3_1_1__0__Impl rule__InSemanticsRule__Group_3_1_1__1
             {
-            pushFollow(FOLLOW_rule__InSemanticsRule__Group_3_1_1__0__Impl_in_rule__InSemanticsRule__Group_3_1_1__040549);
+            pushFollow(FOLLOW_101);
             rule__InSemanticsRule__Group_3_1_1__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__InSemanticsRule__Group_3_1_1__1_in_rule__InSemanticsRule__Group_3_1_1__040552);
+            pushFollow(FOLLOW_2);
             rule__InSemanticsRule__Group_3_1_1__1();
 
             state._fsp--;
@@ -54820,20 +54820,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__Group_3_1_1__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20070:1: rule__InSemanticsRule__Group_3_1_1__0__Impl : ( '(' ) ;
+    // InternalRoom.g:20073:1: rule__InSemanticsRule__Group_3_1_1__0__Impl : ( '(' ) ;
     public final void rule__InSemanticsRule__Group_3_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20074:1: ( ( '(' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20075:1: ( '(' )
+            // InternalRoom.g:20077:1: ( ( '(' ) )
+            // InternalRoom.g:20078:1: ( '(' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20075:1: ( '(' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20076:1: '('
+            // InternalRoom.g:20078:1: ( '(' )
+            // InternalRoom.g:20079:1: '('
             {
              before(grammarAccess.getInSemanticsRuleAccess().getLeftParenthesisKeyword_3_1_1_0()); 
-            match(input,47,FOLLOW_47_in_rule__InSemanticsRule__Group_3_1_1__0__Impl40580); 
+            match(input,47,FOLLOW_2); 
              after(grammarAccess.getInSemanticsRuleAccess().getLeftParenthesisKeyword_3_1_1_0()); 
 
             }
@@ -54857,21 +54857,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__Group_3_1_1__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20089:1: rule__InSemanticsRule__Group_3_1_1__1 : rule__InSemanticsRule__Group_3_1_1__1__Impl rule__InSemanticsRule__Group_3_1_1__2 ;
+    // InternalRoom.g:20092:1: rule__InSemanticsRule__Group_3_1_1__1 : rule__InSemanticsRule__Group_3_1_1__1__Impl rule__InSemanticsRule__Group_3_1_1__2 ;
     public final void rule__InSemanticsRule__Group_3_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20093:1: ( rule__InSemanticsRule__Group_3_1_1__1__Impl rule__InSemanticsRule__Group_3_1_1__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20094:2: rule__InSemanticsRule__Group_3_1_1__1__Impl rule__InSemanticsRule__Group_3_1_1__2
+            // InternalRoom.g:20096:1: ( rule__InSemanticsRule__Group_3_1_1__1__Impl rule__InSemanticsRule__Group_3_1_1__2 )
+            // InternalRoom.g:20097:2: rule__InSemanticsRule__Group_3_1_1__1__Impl rule__InSemanticsRule__Group_3_1_1__2
             {
-            pushFollow(FOLLOW_rule__InSemanticsRule__Group_3_1_1__1__Impl_in_rule__InSemanticsRule__Group_3_1_1__140611);
+            pushFollow(FOLLOW_18);
             rule__InSemanticsRule__Group_3_1_1__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__InSemanticsRule__Group_3_1_1__2_in_rule__InSemanticsRule__Group_3_1_1__140614);
+            pushFollow(FOLLOW_2);
             rule__InSemanticsRule__Group_3_1_1__2();
 
             state._fsp--;
@@ -54895,23 +54895,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__Group_3_1_1__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20101:1: rule__InSemanticsRule__Group_3_1_1__1__Impl : ( ( rule__InSemanticsRule__FollowUpsAssignment_3_1_1_1 ) ) ;
+    // InternalRoom.g:20104:1: rule__InSemanticsRule__Group_3_1_1__1__Impl : ( ( rule__InSemanticsRule__FollowUpsAssignment_3_1_1_1 ) ) ;
     public final void rule__InSemanticsRule__Group_3_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20105:1: ( ( ( rule__InSemanticsRule__FollowUpsAssignment_3_1_1_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20106:1: ( ( rule__InSemanticsRule__FollowUpsAssignment_3_1_1_1 ) )
+            // InternalRoom.g:20108:1: ( ( ( rule__InSemanticsRule__FollowUpsAssignment_3_1_1_1 ) ) )
+            // InternalRoom.g:20109:1: ( ( rule__InSemanticsRule__FollowUpsAssignment_3_1_1_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20106:1: ( ( rule__InSemanticsRule__FollowUpsAssignment_3_1_1_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20107:1: ( rule__InSemanticsRule__FollowUpsAssignment_3_1_1_1 )
+            // InternalRoom.g:20109:1: ( ( rule__InSemanticsRule__FollowUpsAssignment_3_1_1_1 ) )
+            // InternalRoom.g:20110:1: ( rule__InSemanticsRule__FollowUpsAssignment_3_1_1_1 )
             {
              before(grammarAccess.getInSemanticsRuleAccess().getFollowUpsAssignment_3_1_1_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20108:1: ( rule__InSemanticsRule__FollowUpsAssignment_3_1_1_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20108:2: rule__InSemanticsRule__FollowUpsAssignment_3_1_1_1
+            // InternalRoom.g:20111:1: ( rule__InSemanticsRule__FollowUpsAssignment_3_1_1_1 )
+            // InternalRoom.g:20111:2: rule__InSemanticsRule__FollowUpsAssignment_3_1_1_1
             {
-            pushFollow(FOLLOW_rule__InSemanticsRule__FollowUpsAssignment_3_1_1_1_in_rule__InSemanticsRule__Group_3_1_1__1__Impl40641);
+            pushFollow(FOLLOW_2);
             rule__InSemanticsRule__FollowUpsAssignment_3_1_1_1();
 
             state._fsp--;
@@ -54942,21 +54942,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__Group_3_1_1__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20118:1: rule__InSemanticsRule__Group_3_1_1__2 : rule__InSemanticsRule__Group_3_1_1__2__Impl rule__InSemanticsRule__Group_3_1_1__3 ;
+    // InternalRoom.g:20121:1: rule__InSemanticsRule__Group_3_1_1__2 : rule__InSemanticsRule__Group_3_1_1__2__Impl rule__InSemanticsRule__Group_3_1_1__3 ;
     public final void rule__InSemanticsRule__Group_3_1_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20122:1: ( rule__InSemanticsRule__Group_3_1_1__2__Impl rule__InSemanticsRule__Group_3_1_1__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20123:2: rule__InSemanticsRule__Group_3_1_1__2__Impl rule__InSemanticsRule__Group_3_1_1__3
+            // InternalRoom.g:20125:1: ( rule__InSemanticsRule__Group_3_1_1__2__Impl rule__InSemanticsRule__Group_3_1_1__3 )
+            // InternalRoom.g:20126:2: rule__InSemanticsRule__Group_3_1_1__2__Impl rule__InSemanticsRule__Group_3_1_1__3
             {
-            pushFollow(FOLLOW_rule__InSemanticsRule__Group_3_1_1__2__Impl_in_rule__InSemanticsRule__Group_3_1_1__240671);
+            pushFollow(FOLLOW_15);
             rule__InSemanticsRule__Group_3_1_1__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__InSemanticsRule__Group_3_1_1__3_in_rule__InSemanticsRule__Group_3_1_1__240674);
+            pushFollow(FOLLOW_2);
             rule__InSemanticsRule__Group_3_1_1__3();
 
             state._fsp--;
@@ -54980,26 +54980,26 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__Group_3_1_1__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20130:1: rule__InSemanticsRule__Group_3_1_1__2__Impl : ( ( ( rule__InSemanticsRule__Group_3_1_1_2__0 ) ) ( ( rule__InSemanticsRule__Group_3_1_1_2__0 )* ) ) ;
+    // InternalRoom.g:20133:1: rule__InSemanticsRule__Group_3_1_1__2__Impl : ( ( ( rule__InSemanticsRule__Group_3_1_1_2__0 ) ) ( ( rule__InSemanticsRule__Group_3_1_1_2__0 )* ) ) ;
     public final void rule__InSemanticsRule__Group_3_1_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20134:1: ( ( ( ( rule__InSemanticsRule__Group_3_1_1_2__0 ) ) ( ( rule__InSemanticsRule__Group_3_1_1_2__0 )* ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20135:1: ( ( ( rule__InSemanticsRule__Group_3_1_1_2__0 ) ) ( ( rule__InSemanticsRule__Group_3_1_1_2__0 )* ) )
+            // InternalRoom.g:20137:1: ( ( ( ( rule__InSemanticsRule__Group_3_1_1_2__0 ) ) ( ( rule__InSemanticsRule__Group_3_1_1_2__0 )* ) ) )
+            // InternalRoom.g:20138:1: ( ( ( rule__InSemanticsRule__Group_3_1_1_2__0 ) ) ( ( rule__InSemanticsRule__Group_3_1_1_2__0 )* ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20135:1: ( ( ( rule__InSemanticsRule__Group_3_1_1_2__0 ) ) ( ( rule__InSemanticsRule__Group_3_1_1_2__0 )* ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20136:1: ( ( rule__InSemanticsRule__Group_3_1_1_2__0 ) ) ( ( rule__InSemanticsRule__Group_3_1_1_2__0 )* )
+            // InternalRoom.g:20138:1: ( ( ( rule__InSemanticsRule__Group_3_1_1_2__0 ) ) ( ( rule__InSemanticsRule__Group_3_1_1_2__0 )* ) )
+            // InternalRoom.g:20139:1: ( ( rule__InSemanticsRule__Group_3_1_1_2__0 ) ) ( ( rule__InSemanticsRule__Group_3_1_1_2__0 )* )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20136:1: ( ( rule__InSemanticsRule__Group_3_1_1_2__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20137:1: ( rule__InSemanticsRule__Group_3_1_1_2__0 )
+            // InternalRoom.g:20139:1: ( ( rule__InSemanticsRule__Group_3_1_1_2__0 ) )
+            // InternalRoom.g:20140:1: ( rule__InSemanticsRule__Group_3_1_1_2__0 )
             {
              before(grammarAccess.getInSemanticsRuleAccess().getGroup_3_1_1_2()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20138:1: ( rule__InSemanticsRule__Group_3_1_1_2__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20138:2: rule__InSemanticsRule__Group_3_1_1_2__0
+            // InternalRoom.g:20141:1: ( rule__InSemanticsRule__Group_3_1_1_2__0 )
+            // InternalRoom.g:20141:2: rule__InSemanticsRule__Group_3_1_1_2__0
             {
-            pushFollow(FOLLOW_rule__InSemanticsRule__Group_3_1_1_2__0_in_rule__InSemanticsRule__Group_3_1_1__2__Impl40703);
+            pushFollow(FOLLOW_19);
             rule__InSemanticsRule__Group_3_1_1_2__0();
 
             state._fsp--;
@@ -55011,11 +55011,11 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20141:1: ( ( rule__InSemanticsRule__Group_3_1_1_2__0 )* )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20142:1: ( rule__InSemanticsRule__Group_3_1_1_2__0 )*
+            // InternalRoom.g:20144:1: ( ( rule__InSemanticsRule__Group_3_1_1_2__0 )* )
+            // InternalRoom.g:20145:1: ( rule__InSemanticsRule__Group_3_1_1_2__0 )*
             {
              before(grammarAccess.getInSemanticsRuleAccess().getGroup_3_1_1_2()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20143:1: ( rule__InSemanticsRule__Group_3_1_1_2__0 )*
+            // InternalRoom.g:20146:1: ( rule__InSemanticsRule__Group_3_1_1_2__0 )*
             loop186:
             do {
                 int alt186=2;
@@ -55028,9 +55028,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
                 switch (alt186) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20143:2: rule__InSemanticsRule__Group_3_1_1_2__0
+            	    // InternalRoom.g:20146:2: rule__InSemanticsRule__Group_3_1_1_2__0
             	    {
-            	    pushFollow(FOLLOW_rule__InSemanticsRule__Group_3_1_1_2__0_in_rule__InSemanticsRule__Group_3_1_1__2__Impl40715);
+            	    pushFollow(FOLLOW_19);
             	    rule__InSemanticsRule__Group_3_1_1_2__0();
 
             	    state._fsp--;
@@ -55070,16 +55070,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__Group_3_1_1__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20154:1: rule__InSemanticsRule__Group_3_1_1__3 : rule__InSemanticsRule__Group_3_1_1__3__Impl ;
+    // InternalRoom.g:20157:1: rule__InSemanticsRule__Group_3_1_1__3 : rule__InSemanticsRule__Group_3_1_1__3__Impl ;
     public final void rule__InSemanticsRule__Group_3_1_1__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20158:1: ( rule__InSemanticsRule__Group_3_1_1__3__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20159:2: rule__InSemanticsRule__Group_3_1_1__3__Impl
+            // InternalRoom.g:20161:1: ( rule__InSemanticsRule__Group_3_1_1__3__Impl )
+            // InternalRoom.g:20162:2: rule__InSemanticsRule__Group_3_1_1__3__Impl
             {
-            pushFollow(FOLLOW_rule__InSemanticsRule__Group_3_1_1__3__Impl_in_rule__InSemanticsRule__Group_3_1_1__340748);
+            pushFollow(FOLLOW_2);
             rule__InSemanticsRule__Group_3_1_1__3__Impl();
 
             state._fsp--;
@@ -55103,20 +55103,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__Group_3_1_1__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20165:1: rule__InSemanticsRule__Group_3_1_1__3__Impl : ( ')' ) ;
+    // InternalRoom.g:20168:1: rule__InSemanticsRule__Group_3_1_1__3__Impl : ( ')' ) ;
     public final void rule__InSemanticsRule__Group_3_1_1__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20169:1: ( ( ')' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20170:1: ( ')' )
+            // InternalRoom.g:20172:1: ( ( ')' ) )
+            // InternalRoom.g:20173:1: ( ')' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20170:1: ( ')' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20171:1: ')'
+            // InternalRoom.g:20173:1: ( ')' )
+            // InternalRoom.g:20174:1: ')'
             {
              before(grammarAccess.getInSemanticsRuleAccess().getRightParenthesisKeyword_3_1_1_3()); 
-            match(input,48,FOLLOW_48_in_rule__InSemanticsRule__Group_3_1_1__3__Impl40776); 
+            match(input,48,FOLLOW_2); 
              after(grammarAccess.getInSemanticsRuleAccess().getRightParenthesisKeyword_3_1_1_3()); 
 
             }
@@ -55140,21 +55140,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__Group_3_1_1_2__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20192:1: rule__InSemanticsRule__Group_3_1_1_2__0 : rule__InSemanticsRule__Group_3_1_1_2__0__Impl rule__InSemanticsRule__Group_3_1_1_2__1 ;
+    // InternalRoom.g:20195:1: rule__InSemanticsRule__Group_3_1_1_2__0 : rule__InSemanticsRule__Group_3_1_1_2__0__Impl rule__InSemanticsRule__Group_3_1_1_2__1 ;
     public final void rule__InSemanticsRule__Group_3_1_1_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20196:1: ( rule__InSemanticsRule__Group_3_1_1_2__0__Impl rule__InSemanticsRule__Group_3_1_1_2__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20197:2: rule__InSemanticsRule__Group_3_1_1_2__0__Impl rule__InSemanticsRule__Group_3_1_1_2__1
+            // InternalRoom.g:20199:1: ( rule__InSemanticsRule__Group_3_1_1_2__0__Impl rule__InSemanticsRule__Group_3_1_1_2__1 )
+            // InternalRoom.g:20200:2: rule__InSemanticsRule__Group_3_1_1_2__0__Impl rule__InSemanticsRule__Group_3_1_1_2__1
             {
-            pushFollow(FOLLOW_rule__InSemanticsRule__Group_3_1_1_2__0__Impl_in_rule__InSemanticsRule__Group_3_1_1_2__040815);
+            pushFollow(FOLLOW_101);
             rule__InSemanticsRule__Group_3_1_1_2__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__InSemanticsRule__Group_3_1_1_2__1_in_rule__InSemanticsRule__Group_3_1_1_2__040818);
+            pushFollow(FOLLOW_2);
             rule__InSemanticsRule__Group_3_1_1_2__1();
 
             state._fsp--;
@@ -55178,20 +55178,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__Group_3_1_1_2__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20204:1: rule__InSemanticsRule__Group_3_1_1_2__0__Impl : ( ',' ) ;
+    // InternalRoom.g:20207:1: rule__InSemanticsRule__Group_3_1_1_2__0__Impl : ( ',' ) ;
     public final void rule__InSemanticsRule__Group_3_1_1_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20208:1: ( ( ',' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20209:1: ( ',' )
+            // InternalRoom.g:20211:1: ( ( ',' ) )
+            // InternalRoom.g:20212:1: ( ',' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20209:1: ( ',' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20210:1: ','
+            // InternalRoom.g:20212:1: ( ',' )
+            // InternalRoom.g:20213:1: ','
             {
              before(grammarAccess.getInSemanticsRuleAccess().getCommaKeyword_3_1_1_2_0()); 
-            match(input,51,FOLLOW_51_in_rule__InSemanticsRule__Group_3_1_1_2__0__Impl40846); 
+            match(input,51,FOLLOW_2); 
              after(grammarAccess.getInSemanticsRuleAccess().getCommaKeyword_3_1_1_2_0()); 
 
             }
@@ -55215,16 +55215,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__Group_3_1_1_2__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20223:1: rule__InSemanticsRule__Group_3_1_1_2__1 : rule__InSemanticsRule__Group_3_1_1_2__1__Impl ;
+    // InternalRoom.g:20226:1: rule__InSemanticsRule__Group_3_1_1_2__1 : rule__InSemanticsRule__Group_3_1_1_2__1__Impl ;
     public final void rule__InSemanticsRule__Group_3_1_1_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20227:1: ( rule__InSemanticsRule__Group_3_1_1_2__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20228:2: rule__InSemanticsRule__Group_3_1_1_2__1__Impl
+            // InternalRoom.g:20230:1: ( rule__InSemanticsRule__Group_3_1_1_2__1__Impl )
+            // InternalRoom.g:20231:2: rule__InSemanticsRule__Group_3_1_1_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__InSemanticsRule__Group_3_1_1_2__1__Impl_in_rule__InSemanticsRule__Group_3_1_1_2__140877);
+            pushFollow(FOLLOW_2);
             rule__InSemanticsRule__Group_3_1_1_2__1__Impl();
 
             state._fsp--;
@@ -55248,23 +55248,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__Group_3_1_1_2__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20234:1: rule__InSemanticsRule__Group_3_1_1_2__1__Impl : ( ( rule__InSemanticsRule__FollowUpsAssignment_3_1_1_2_1 ) ) ;
+    // InternalRoom.g:20237:1: rule__InSemanticsRule__Group_3_1_1_2__1__Impl : ( ( rule__InSemanticsRule__FollowUpsAssignment_3_1_1_2_1 ) ) ;
     public final void rule__InSemanticsRule__Group_3_1_1_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20238:1: ( ( ( rule__InSemanticsRule__FollowUpsAssignment_3_1_1_2_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20239:1: ( ( rule__InSemanticsRule__FollowUpsAssignment_3_1_1_2_1 ) )
+            // InternalRoom.g:20241:1: ( ( ( rule__InSemanticsRule__FollowUpsAssignment_3_1_1_2_1 ) ) )
+            // InternalRoom.g:20242:1: ( ( rule__InSemanticsRule__FollowUpsAssignment_3_1_1_2_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20239:1: ( ( rule__InSemanticsRule__FollowUpsAssignment_3_1_1_2_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20240:1: ( rule__InSemanticsRule__FollowUpsAssignment_3_1_1_2_1 )
+            // InternalRoom.g:20242:1: ( ( rule__InSemanticsRule__FollowUpsAssignment_3_1_1_2_1 ) )
+            // InternalRoom.g:20243:1: ( rule__InSemanticsRule__FollowUpsAssignment_3_1_1_2_1 )
             {
              before(grammarAccess.getInSemanticsRuleAccess().getFollowUpsAssignment_3_1_1_2_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20241:1: ( rule__InSemanticsRule__FollowUpsAssignment_3_1_1_2_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20241:2: rule__InSemanticsRule__FollowUpsAssignment_3_1_1_2_1
+            // InternalRoom.g:20244:1: ( rule__InSemanticsRule__FollowUpsAssignment_3_1_1_2_1 )
+            // InternalRoom.g:20244:2: rule__InSemanticsRule__FollowUpsAssignment_3_1_1_2_1
             {
-            pushFollow(FOLLOW_rule__InSemanticsRule__FollowUpsAssignment_3_1_1_2_1_in_rule__InSemanticsRule__Group_3_1_1_2__1__Impl40904);
+            pushFollow(FOLLOW_2);
             rule__InSemanticsRule__FollowUpsAssignment_3_1_1_2_1();
 
             state._fsp--;
@@ -55295,21 +55295,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20255:1: rule__OutSemanticsRule__Group__0 : rule__OutSemanticsRule__Group__0__Impl rule__OutSemanticsRule__Group__1 ;
+    // InternalRoom.g:20258:1: rule__OutSemanticsRule__Group__0 : rule__OutSemanticsRule__Group__0__Impl rule__OutSemanticsRule__Group__1 ;
     public final void rule__OutSemanticsRule__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20259:1: ( rule__OutSemanticsRule__Group__0__Impl rule__OutSemanticsRule__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20260:2: rule__OutSemanticsRule__Group__0__Impl rule__OutSemanticsRule__Group__1
+            // InternalRoom.g:20262:1: ( rule__OutSemanticsRule__Group__0__Impl rule__OutSemanticsRule__Group__1 )
+            // InternalRoom.g:20263:2: rule__OutSemanticsRule__Group__0__Impl rule__OutSemanticsRule__Group__1
             {
-            pushFollow(FOLLOW_rule__OutSemanticsRule__Group__0__Impl_in_rule__OutSemanticsRule__Group__040938);
+            pushFollow(FOLLOW_8);
             rule__OutSemanticsRule__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__OutSemanticsRule__Group__1_in_rule__OutSemanticsRule__Group__040941);
+            pushFollow(FOLLOW_2);
             rule__OutSemanticsRule__Group__1();
 
             state._fsp--;
@@ -55333,20 +55333,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20267:1: rule__OutSemanticsRule__Group__0__Impl : ( 'out' ) ;
+    // InternalRoom.g:20270:1: rule__OutSemanticsRule__Group__0__Impl : ( 'out' ) ;
     public final void rule__OutSemanticsRule__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20271:1: ( ( 'out' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20272:1: ( 'out' )
+            // InternalRoom.g:20274:1: ( ( 'out' ) )
+            // InternalRoom.g:20275:1: ( 'out' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20272:1: ( 'out' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20273:1: 'out'
+            // InternalRoom.g:20275:1: ( 'out' )
+            // InternalRoom.g:20276:1: 'out'
             {
              before(grammarAccess.getOutSemanticsRuleAccess().getOutKeyword_0()); 
-            match(input,119,FOLLOW_119_in_rule__OutSemanticsRule__Group__0__Impl40969); 
+            match(input,119,FOLLOW_2); 
              after(grammarAccess.getOutSemanticsRuleAccess().getOutKeyword_0()); 
 
             }
@@ -55370,21 +55370,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20286:1: rule__OutSemanticsRule__Group__1 : rule__OutSemanticsRule__Group__1__Impl rule__OutSemanticsRule__Group__2 ;
+    // InternalRoom.g:20289:1: rule__OutSemanticsRule__Group__1 : rule__OutSemanticsRule__Group__1__Impl rule__OutSemanticsRule__Group__2 ;
     public final void rule__OutSemanticsRule__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20290:1: ( rule__OutSemanticsRule__Group__1__Impl rule__OutSemanticsRule__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20291:2: rule__OutSemanticsRule__Group__1__Impl rule__OutSemanticsRule__Group__2
+            // InternalRoom.g:20293:1: ( rule__OutSemanticsRule__Group__1__Impl rule__OutSemanticsRule__Group__2 )
+            // InternalRoom.g:20294:2: rule__OutSemanticsRule__Group__1__Impl rule__OutSemanticsRule__Group__2
             {
-            pushFollow(FOLLOW_rule__OutSemanticsRule__Group__1__Impl_in_rule__OutSemanticsRule__Group__141000);
+            pushFollow(FOLLOW_3);
             rule__OutSemanticsRule__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__OutSemanticsRule__Group__2_in_rule__OutSemanticsRule__Group__141003);
+            pushFollow(FOLLOW_2);
             rule__OutSemanticsRule__Group__2();
 
             state._fsp--;
@@ -55408,20 +55408,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20298:1: rule__OutSemanticsRule__Group__1__Impl : ( ':' ) ;
+    // InternalRoom.g:20301:1: rule__OutSemanticsRule__Group__1__Impl : ( ':' ) ;
     public final void rule__OutSemanticsRule__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20302:1: ( ( ':' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20303:1: ( ':' )
+            // InternalRoom.g:20305:1: ( ( ':' ) )
+            // InternalRoom.g:20306:1: ( ':' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20303:1: ( ':' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20304:1: ':'
+            // InternalRoom.g:20306:1: ( ':' )
+            // InternalRoom.g:20307:1: ':'
             {
              before(grammarAccess.getOutSemanticsRuleAccess().getColonKeyword_1()); 
-            match(input,43,FOLLOW_43_in_rule__OutSemanticsRule__Group__1__Impl41031); 
+            match(input,43,FOLLOW_2); 
              after(grammarAccess.getOutSemanticsRuleAccess().getColonKeyword_1()); 
 
             }
@@ -55445,21 +55445,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20317:1: rule__OutSemanticsRule__Group__2 : rule__OutSemanticsRule__Group__2__Impl rule__OutSemanticsRule__Group__3 ;
+    // InternalRoom.g:20320:1: rule__OutSemanticsRule__Group__2 : rule__OutSemanticsRule__Group__2__Impl rule__OutSemanticsRule__Group__3 ;
     public final void rule__OutSemanticsRule__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20321:1: ( rule__OutSemanticsRule__Group__2__Impl rule__OutSemanticsRule__Group__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20322:2: rule__OutSemanticsRule__Group__2__Impl rule__OutSemanticsRule__Group__3
+            // InternalRoom.g:20324:1: ( rule__OutSemanticsRule__Group__2__Impl rule__OutSemanticsRule__Group__3 )
+            // InternalRoom.g:20325:2: rule__OutSemanticsRule__Group__2__Impl rule__OutSemanticsRule__Group__3
             {
-            pushFollow(FOLLOW_rule__OutSemanticsRule__Group__2__Impl_in_rule__OutSemanticsRule__Group__241062);
+            pushFollow(FOLLOW_11);
             rule__OutSemanticsRule__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__OutSemanticsRule__Group__3_in_rule__OutSemanticsRule__Group__241065);
+            pushFollow(FOLLOW_2);
             rule__OutSemanticsRule__Group__3();
 
             state._fsp--;
@@ -55483,23 +55483,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20329:1: rule__OutSemanticsRule__Group__2__Impl : ( ( rule__OutSemanticsRule__MsgAssignment_2 ) ) ;
+    // InternalRoom.g:20332:1: rule__OutSemanticsRule__Group__2__Impl : ( ( rule__OutSemanticsRule__MsgAssignment_2 ) ) ;
     public final void rule__OutSemanticsRule__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20333:1: ( ( ( rule__OutSemanticsRule__MsgAssignment_2 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20334:1: ( ( rule__OutSemanticsRule__MsgAssignment_2 ) )
+            // InternalRoom.g:20336:1: ( ( ( rule__OutSemanticsRule__MsgAssignment_2 ) ) )
+            // InternalRoom.g:20337:1: ( ( rule__OutSemanticsRule__MsgAssignment_2 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20334:1: ( ( rule__OutSemanticsRule__MsgAssignment_2 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20335:1: ( rule__OutSemanticsRule__MsgAssignment_2 )
+            // InternalRoom.g:20337:1: ( ( rule__OutSemanticsRule__MsgAssignment_2 ) )
+            // InternalRoom.g:20338:1: ( rule__OutSemanticsRule__MsgAssignment_2 )
             {
              before(grammarAccess.getOutSemanticsRuleAccess().getMsgAssignment_2()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20336:1: ( rule__OutSemanticsRule__MsgAssignment_2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20336:2: rule__OutSemanticsRule__MsgAssignment_2
+            // InternalRoom.g:20339:1: ( rule__OutSemanticsRule__MsgAssignment_2 )
+            // InternalRoom.g:20339:2: rule__OutSemanticsRule__MsgAssignment_2
             {
-            pushFollow(FOLLOW_rule__OutSemanticsRule__MsgAssignment_2_in_rule__OutSemanticsRule__Group__2__Impl41092);
+            pushFollow(FOLLOW_2);
             rule__OutSemanticsRule__MsgAssignment_2();
 
             state._fsp--;
@@ -55530,16 +55530,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__Group__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20346:1: rule__OutSemanticsRule__Group__3 : rule__OutSemanticsRule__Group__3__Impl ;
+    // InternalRoom.g:20349:1: rule__OutSemanticsRule__Group__3 : rule__OutSemanticsRule__Group__3__Impl ;
     public final void rule__OutSemanticsRule__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20350:1: ( rule__OutSemanticsRule__Group__3__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20351:2: rule__OutSemanticsRule__Group__3__Impl
+            // InternalRoom.g:20353:1: ( rule__OutSemanticsRule__Group__3__Impl )
+            // InternalRoom.g:20354:2: rule__OutSemanticsRule__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__OutSemanticsRule__Group__3__Impl_in_rule__OutSemanticsRule__Group__341122);
+            pushFollow(FOLLOW_2);
             rule__OutSemanticsRule__Group__3__Impl();
 
             state._fsp--;
@@ -55563,20 +55563,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__Group__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20357:1: rule__OutSemanticsRule__Group__3__Impl : ( ( rule__OutSemanticsRule__Group_3__0 )? ) ;
+    // InternalRoom.g:20360:1: rule__OutSemanticsRule__Group__3__Impl : ( ( rule__OutSemanticsRule__Group_3__0 )? ) ;
     public final void rule__OutSemanticsRule__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20361:1: ( ( ( rule__OutSemanticsRule__Group_3__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20362:1: ( ( rule__OutSemanticsRule__Group_3__0 )? )
+            // InternalRoom.g:20364:1: ( ( ( rule__OutSemanticsRule__Group_3__0 )? ) )
+            // InternalRoom.g:20365:1: ( ( rule__OutSemanticsRule__Group_3__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20362:1: ( ( rule__OutSemanticsRule__Group_3__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20363:1: ( rule__OutSemanticsRule__Group_3__0 )?
+            // InternalRoom.g:20365:1: ( ( rule__OutSemanticsRule__Group_3__0 )? )
+            // InternalRoom.g:20366:1: ( rule__OutSemanticsRule__Group_3__0 )?
             {
              before(grammarAccess.getOutSemanticsRuleAccess().getGroup_3()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20364:1: ( rule__OutSemanticsRule__Group_3__0 )?
+            // InternalRoom.g:20367:1: ( rule__OutSemanticsRule__Group_3__0 )?
             int alt187=2;
             int LA187_0 = input.LA(1);
 
@@ -55585,9 +55585,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt187) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20364:2: rule__OutSemanticsRule__Group_3__0
+                    // InternalRoom.g:20367:2: rule__OutSemanticsRule__Group_3__0
                     {
-                    pushFollow(FOLLOW_rule__OutSemanticsRule__Group_3__0_in_rule__OutSemanticsRule__Group__3__Impl41149);
+                    pushFollow(FOLLOW_2);
                     rule__OutSemanticsRule__Group_3__0();
 
                     state._fsp--;
@@ -55621,21 +55621,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__Group_3__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20382:1: rule__OutSemanticsRule__Group_3__0 : rule__OutSemanticsRule__Group_3__0__Impl rule__OutSemanticsRule__Group_3__1 ;
+    // InternalRoom.g:20385:1: rule__OutSemanticsRule__Group_3__0 : rule__OutSemanticsRule__Group_3__0__Impl rule__OutSemanticsRule__Group_3__1 ;
     public final void rule__OutSemanticsRule__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20386:1: ( rule__OutSemanticsRule__Group_3__0__Impl rule__OutSemanticsRule__Group_3__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20387:2: rule__OutSemanticsRule__Group_3__0__Impl rule__OutSemanticsRule__Group_3__1
+            // InternalRoom.g:20389:1: ( rule__OutSemanticsRule__Group_3__0__Impl rule__OutSemanticsRule__Group_3__1 )
+            // InternalRoom.g:20390:2: rule__OutSemanticsRule__Group_3__0__Impl rule__OutSemanticsRule__Group_3__1
             {
-            pushFollow(FOLLOW_rule__OutSemanticsRule__Group_3__0__Impl_in_rule__OutSemanticsRule__Group_3__041188);
+            pushFollow(FOLLOW_100);
             rule__OutSemanticsRule__Group_3__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__OutSemanticsRule__Group_3__1_in_rule__OutSemanticsRule__Group_3__041191);
+            pushFollow(FOLLOW_2);
             rule__OutSemanticsRule__Group_3__1();
 
             state._fsp--;
@@ -55659,20 +55659,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__Group_3__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20394:1: rule__OutSemanticsRule__Group_3__0__Impl : ( '->' ) ;
+    // InternalRoom.g:20397:1: rule__OutSemanticsRule__Group_3__0__Impl : ( '->' ) ;
     public final void rule__OutSemanticsRule__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20398:1: ( ( '->' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20399:1: ( '->' )
+            // InternalRoom.g:20401:1: ( ( '->' ) )
+            // InternalRoom.g:20402:1: ( '->' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20399:1: ( '->' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20400:1: '->'
+            // InternalRoom.g:20402:1: ( '->' )
+            // InternalRoom.g:20403:1: '->'
             {
              before(grammarAccess.getOutSemanticsRuleAccess().getHyphenMinusGreaterThanSignKeyword_3_0()); 
-            match(input,45,FOLLOW_45_in_rule__OutSemanticsRule__Group_3__0__Impl41219); 
+            match(input,45,FOLLOW_2); 
              after(grammarAccess.getOutSemanticsRuleAccess().getHyphenMinusGreaterThanSignKeyword_3_0()); 
 
             }
@@ -55696,16 +55696,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__Group_3__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20413:1: rule__OutSemanticsRule__Group_3__1 : rule__OutSemanticsRule__Group_3__1__Impl ;
+    // InternalRoom.g:20416:1: rule__OutSemanticsRule__Group_3__1 : rule__OutSemanticsRule__Group_3__1__Impl ;
     public final void rule__OutSemanticsRule__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20417:1: ( rule__OutSemanticsRule__Group_3__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20418:2: rule__OutSemanticsRule__Group_3__1__Impl
+            // InternalRoom.g:20420:1: ( rule__OutSemanticsRule__Group_3__1__Impl )
+            // InternalRoom.g:20421:2: rule__OutSemanticsRule__Group_3__1__Impl
             {
-            pushFollow(FOLLOW_rule__OutSemanticsRule__Group_3__1__Impl_in_rule__OutSemanticsRule__Group_3__141250);
+            pushFollow(FOLLOW_2);
             rule__OutSemanticsRule__Group_3__1__Impl();
 
             state._fsp--;
@@ -55729,23 +55729,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__Group_3__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20424:1: rule__OutSemanticsRule__Group_3__1__Impl : ( ( rule__OutSemanticsRule__Alternatives_3_1 ) ) ;
+    // InternalRoom.g:20427:1: rule__OutSemanticsRule__Group_3__1__Impl : ( ( rule__OutSemanticsRule__Alternatives_3_1 ) ) ;
     public final void rule__OutSemanticsRule__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20428:1: ( ( ( rule__OutSemanticsRule__Alternatives_3_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20429:1: ( ( rule__OutSemanticsRule__Alternatives_3_1 ) )
+            // InternalRoom.g:20431:1: ( ( ( rule__OutSemanticsRule__Alternatives_3_1 ) ) )
+            // InternalRoom.g:20432:1: ( ( rule__OutSemanticsRule__Alternatives_3_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20429:1: ( ( rule__OutSemanticsRule__Alternatives_3_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20430:1: ( rule__OutSemanticsRule__Alternatives_3_1 )
+            // InternalRoom.g:20432:1: ( ( rule__OutSemanticsRule__Alternatives_3_1 ) )
+            // InternalRoom.g:20433:1: ( rule__OutSemanticsRule__Alternatives_3_1 )
             {
              before(grammarAccess.getOutSemanticsRuleAccess().getAlternatives_3_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20431:1: ( rule__OutSemanticsRule__Alternatives_3_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20431:2: rule__OutSemanticsRule__Alternatives_3_1
+            // InternalRoom.g:20434:1: ( rule__OutSemanticsRule__Alternatives_3_1 )
+            // InternalRoom.g:20434:2: rule__OutSemanticsRule__Alternatives_3_1
             {
-            pushFollow(FOLLOW_rule__OutSemanticsRule__Alternatives_3_1_in_rule__OutSemanticsRule__Group_3__1__Impl41277);
+            pushFollow(FOLLOW_2);
             rule__OutSemanticsRule__Alternatives_3_1();
 
             state._fsp--;
@@ -55776,21 +55776,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__Group_3_1_1__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20445:1: rule__OutSemanticsRule__Group_3_1_1__0 : rule__OutSemanticsRule__Group_3_1_1__0__Impl rule__OutSemanticsRule__Group_3_1_1__1 ;
+    // InternalRoom.g:20448:1: rule__OutSemanticsRule__Group_3_1_1__0 : rule__OutSemanticsRule__Group_3_1_1__0__Impl rule__OutSemanticsRule__Group_3_1_1__1 ;
     public final void rule__OutSemanticsRule__Group_3_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20449:1: ( rule__OutSemanticsRule__Group_3_1_1__0__Impl rule__OutSemanticsRule__Group_3_1_1__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20450:2: rule__OutSemanticsRule__Group_3_1_1__0__Impl rule__OutSemanticsRule__Group_3_1_1__1
+            // InternalRoom.g:20452:1: ( rule__OutSemanticsRule__Group_3_1_1__0__Impl rule__OutSemanticsRule__Group_3_1_1__1 )
+            // InternalRoom.g:20453:2: rule__OutSemanticsRule__Group_3_1_1__0__Impl rule__OutSemanticsRule__Group_3_1_1__1
             {
-            pushFollow(FOLLOW_rule__OutSemanticsRule__Group_3_1_1__0__Impl_in_rule__OutSemanticsRule__Group_3_1_1__041311);
+            pushFollow(FOLLOW_101);
             rule__OutSemanticsRule__Group_3_1_1__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__OutSemanticsRule__Group_3_1_1__1_in_rule__OutSemanticsRule__Group_3_1_1__041314);
+            pushFollow(FOLLOW_2);
             rule__OutSemanticsRule__Group_3_1_1__1();
 
             state._fsp--;
@@ -55814,20 +55814,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__Group_3_1_1__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20457:1: rule__OutSemanticsRule__Group_3_1_1__0__Impl : ( '(' ) ;
+    // InternalRoom.g:20460:1: rule__OutSemanticsRule__Group_3_1_1__0__Impl : ( '(' ) ;
     public final void rule__OutSemanticsRule__Group_3_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20461:1: ( ( '(' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20462:1: ( '(' )
+            // InternalRoom.g:20464:1: ( ( '(' ) )
+            // InternalRoom.g:20465:1: ( '(' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20462:1: ( '(' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20463:1: '('
+            // InternalRoom.g:20465:1: ( '(' )
+            // InternalRoom.g:20466:1: '('
             {
              before(grammarAccess.getOutSemanticsRuleAccess().getLeftParenthesisKeyword_3_1_1_0()); 
-            match(input,47,FOLLOW_47_in_rule__OutSemanticsRule__Group_3_1_1__0__Impl41342); 
+            match(input,47,FOLLOW_2); 
              after(grammarAccess.getOutSemanticsRuleAccess().getLeftParenthesisKeyword_3_1_1_0()); 
 
             }
@@ -55851,21 +55851,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__Group_3_1_1__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20476:1: rule__OutSemanticsRule__Group_3_1_1__1 : rule__OutSemanticsRule__Group_3_1_1__1__Impl rule__OutSemanticsRule__Group_3_1_1__2 ;
+    // InternalRoom.g:20479:1: rule__OutSemanticsRule__Group_3_1_1__1 : rule__OutSemanticsRule__Group_3_1_1__1__Impl rule__OutSemanticsRule__Group_3_1_1__2 ;
     public final void rule__OutSemanticsRule__Group_3_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20480:1: ( rule__OutSemanticsRule__Group_3_1_1__1__Impl rule__OutSemanticsRule__Group_3_1_1__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20481:2: rule__OutSemanticsRule__Group_3_1_1__1__Impl rule__OutSemanticsRule__Group_3_1_1__2
+            // InternalRoom.g:20483:1: ( rule__OutSemanticsRule__Group_3_1_1__1__Impl rule__OutSemanticsRule__Group_3_1_1__2 )
+            // InternalRoom.g:20484:2: rule__OutSemanticsRule__Group_3_1_1__1__Impl rule__OutSemanticsRule__Group_3_1_1__2
             {
-            pushFollow(FOLLOW_rule__OutSemanticsRule__Group_3_1_1__1__Impl_in_rule__OutSemanticsRule__Group_3_1_1__141373);
+            pushFollow(FOLLOW_18);
             rule__OutSemanticsRule__Group_3_1_1__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__OutSemanticsRule__Group_3_1_1__2_in_rule__OutSemanticsRule__Group_3_1_1__141376);
+            pushFollow(FOLLOW_2);
             rule__OutSemanticsRule__Group_3_1_1__2();
 
             state._fsp--;
@@ -55889,23 +55889,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__Group_3_1_1__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20488:1: rule__OutSemanticsRule__Group_3_1_1__1__Impl : ( ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_1 ) ) ;
+    // InternalRoom.g:20491:1: rule__OutSemanticsRule__Group_3_1_1__1__Impl : ( ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_1 ) ) ;
     public final void rule__OutSemanticsRule__Group_3_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20492:1: ( ( ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20493:1: ( ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_1 ) )
+            // InternalRoom.g:20495:1: ( ( ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_1 ) ) )
+            // InternalRoom.g:20496:1: ( ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20493:1: ( ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20494:1: ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_1 )
+            // InternalRoom.g:20496:1: ( ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_1 ) )
+            // InternalRoom.g:20497:1: ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_1 )
             {
              before(grammarAccess.getOutSemanticsRuleAccess().getFollowUpsAssignment_3_1_1_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20495:1: ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20495:2: rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_1
+            // InternalRoom.g:20498:1: ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_1 )
+            // InternalRoom.g:20498:2: rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_1
             {
-            pushFollow(FOLLOW_rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_1_in_rule__OutSemanticsRule__Group_3_1_1__1__Impl41403);
+            pushFollow(FOLLOW_2);
             rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_1();
 
             state._fsp--;
@@ -55936,21 +55936,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__Group_3_1_1__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20505:1: rule__OutSemanticsRule__Group_3_1_1__2 : rule__OutSemanticsRule__Group_3_1_1__2__Impl rule__OutSemanticsRule__Group_3_1_1__3 ;
+    // InternalRoom.g:20508:1: rule__OutSemanticsRule__Group_3_1_1__2 : rule__OutSemanticsRule__Group_3_1_1__2__Impl rule__OutSemanticsRule__Group_3_1_1__3 ;
     public final void rule__OutSemanticsRule__Group_3_1_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20509:1: ( rule__OutSemanticsRule__Group_3_1_1__2__Impl rule__OutSemanticsRule__Group_3_1_1__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20510:2: rule__OutSemanticsRule__Group_3_1_1__2__Impl rule__OutSemanticsRule__Group_3_1_1__3
+            // InternalRoom.g:20512:1: ( rule__OutSemanticsRule__Group_3_1_1__2__Impl rule__OutSemanticsRule__Group_3_1_1__3 )
+            // InternalRoom.g:20513:2: rule__OutSemanticsRule__Group_3_1_1__2__Impl rule__OutSemanticsRule__Group_3_1_1__3
             {
-            pushFollow(FOLLOW_rule__OutSemanticsRule__Group_3_1_1__2__Impl_in_rule__OutSemanticsRule__Group_3_1_1__241433);
+            pushFollow(FOLLOW_15);
             rule__OutSemanticsRule__Group_3_1_1__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__OutSemanticsRule__Group_3_1_1__3_in_rule__OutSemanticsRule__Group_3_1_1__241436);
+            pushFollow(FOLLOW_2);
             rule__OutSemanticsRule__Group_3_1_1__3();
 
             state._fsp--;
@@ -55974,26 +55974,26 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__Group_3_1_1__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20517:1: rule__OutSemanticsRule__Group_3_1_1__2__Impl : ( ( ( rule__OutSemanticsRule__Group_3_1_1_2__0 ) ) ( ( rule__OutSemanticsRule__Group_3_1_1_2__0 )* ) ) ;
+    // InternalRoom.g:20520:1: rule__OutSemanticsRule__Group_3_1_1__2__Impl : ( ( ( rule__OutSemanticsRule__Group_3_1_1_2__0 ) ) ( ( rule__OutSemanticsRule__Group_3_1_1_2__0 )* ) ) ;
     public final void rule__OutSemanticsRule__Group_3_1_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20521:1: ( ( ( ( rule__OutSemanticsRule__Group_3_1_1_2__0 ) ) ( ( rule__OutSemanticsRule__Group_3_1_1_2__0 )* ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20522:1: ( ( ( rule__OutSemanticsRule__Group_3_1_1_2__0 ) ) ( ( rule__OutSemanticsRule__Group_3_1_1_2__0 )* ) )
+            // InternalRoom.g:20524:1: ( ( ( ( rule__OutSemanticsRule__Group_3_1_1_2__0 ) ) ( ( rule__OutSemanticsRule__Group_3_1_1_2__0 )* ) ) )
+            // InternalRoom.g:20525:1: ( ( ( rule__OutSemanticsRule__Group_3_1_1_2__0 ) ) ( ( rule__OutSemanticsRule__Group_3_1_1_2__0 )* ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20522:1: ( ( ( rule__OutSemanticsRule__Group_3_1_1_2__0 ) ) ( ( rule__OutSemanticsRule__Group_3_1_1_2__0 )* ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20523:1: ( ( rule__OutSemanticsRule__Group_3_1_1_2__0 ) ) ( ( rule__OutSemanticsRule__Group_3_1_1_2__0 )* )
+            // InternalRoom.g:20525:1: ( ( ( rule__OutSemanticsRule__Group_3_1_1_2__0 ) ) ( ( rule__OutSemanticsRule__Group_3_1_1_2__0 )* ) )
+            // InternalRoom.g:20526:1: ( ( rule__OutSemanticsRule__Group_3_1_1_2__0 ) ) ( ( rule__OutSemanticsRule__Group_3_1_1_2__0 )* )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20523:1: ( ( rule__OutSemanticsRule__Group_3_1_1_2__0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20524:1: ( rule__OutSemanticsRule__Group_3_1_1_2__0 )
+            // InternalRoom.g:20526:1: ( ( rule__OutSemanticsRule__Group_3_1_1_2__0 ) )
+            // InternalRoom.g:20527:1: ( rule__OutSemanticsRule__Group_3_1_1_2__0 )
             {
              before(grammarAccess.getOutSemanticsRuleAccess().getGroup_3_1_1_2()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20525:1: ( rule__OutSemanticsRule__Group_3_1_1_2__0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20525:2: rule__OutSemanticsRule__Group_3_1_1_2__0
+            // InternalRoom.g:20528:1: ( rule__OutSemanticsRule__Group_3_1_1_2__0 )
+            // InternalRoom.g:20528:2: rule__OutSemanticsRule__Group_3_1_1_2__0
             {
-            pushFollow(FOLLOW_rule__OutSemanticsRule__Group_3_1_1_2__0_in_rule__OutSemanticsRule__Group_3_1_1__2__Impl41465);
+            pushFollow(FOLLOW_19);
             rule__OutSemanticsRule__Group_3_1_1_2__0();
 
             state._fsp--;
@@ -56005,11 +56005,11 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20528:1: ( ( rule__OutSemanticsRule__Group_3_1_1_2__0 )* )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20529:1: ( rule__OutSemanticsRule__Group_3_1_1_2__0 )*
+            // InternalRoom.g:20531:1: ( ( rule__OutSemanticsRule__Group_3_1_1_2__0 )* )
+            // InternalRoom.g:20532:1: ( rule__OutSemanticsRule__Group_3_1_1_2__0 )*
             {
              before(grammarAccess.getOutSemanticsRuleAccess().getGroup_3_1_1_2()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20530:1: ( rule__OutSemanticsRule__Group_3_1_1_2__0 )*
+            // InternalRoom.g:20533:1: ( rule__OutSemanticsRule__Group_3_1_1_2__0 )*
             loop188:
             do {
                 int alt188=2;
@@ -56022,9 +56022,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
                 switch (alt188) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20530:2: rule__OutSemanticsRule__Group_3_1_1_2__0
+            	    // InternalRoom.g:20533:2: rule__OutSemanticsRule__Group_3_1_1_2__0
             	    {
-            	    pushFollow(FOLLOW_rule__OutSemanticsRule__Group_3_1_1_2__0_in_rule__OutSemanticsRule__Group_3_1_1__2__Impl41477);
+            	    pushFollow(FOLLOW_19);
             	    rule__OutSemanticsRule__Group_3_1_1_2__0();
 
             	    state._fsp--;
@@ -56064,16 +56064,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__Group_3_1_1__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20541:1: rule__OutSemanticsRule__Group_3_1_1__3 : rule__OutSemanticsRule__Group_3_1_1__3__Impl ;
+    // InternalRoom.g:20544:1: rule__OutSemanticsRule__Group_3_1_1__3 : rule__OutSemanticsRule__Group_3_1_1__3__Impl ;
     public final void rule__OutSemanticsRule__Group_3_1_1__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20545:1: ( rule__OutSemanticsRule__Group_3_1_1__3__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20546:2: rule__OutSemanticsRule__Group_3_1_1__3__Impl
+            // InternalRoom.g:20548:1: ( rule__OutSemanticsRule__Group_3_1_1__3__Impl )
+            // InternalRoom.g:20549:2: rule__OutSemanticsRule__Group_3_1_1__3__Impl
             {
-            pushFollow(FOLLOW_rule__OutSemanticsRule__Group_3_1_1__3__Impl_in_rule__OutSemanticsRule__Group_3_1_1__341510);
+            pushFollow(FOLLOW_2);
             rule__OutSemanticsRule__Group_3_1_1__3__Impl();
 
             state._fsp--;
@@ -56097,20 +56097,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__Group_3_1_1__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20552:1: rule__OutSemanticsRule__Group_3_1_1__3__Impl : ( ')' ) ;
+    // InternalRoom.g:20555:1: rule__OutSemanticsRule__Group_3_1_1__3__Impl : ( ')' ) ;
     public final void rule__OutSemanticsRule__Group_3_1_1__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20556:1: ( ( ')' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20557:1: ( ')' )
+            // InternalRoom.g:20559:1: ( ( ')' ) )
+            // InternalRoom.g:20560:1: ( ')' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20557:1: ( ')' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20558:1: ')'
+            // InternalRoom.g:20560:1: ( ')' )
+            // InternalRoom.g:20561:1: ')'
             {
              before(grammarAccess.getOutSemanticsRuleAccess().getRightParenthesisKeyword_3_1_1_3()); 
-            match(input,48,FOLLOW_48_in_rule__OutSemanticsRule__Group_3_1_1__3__Impl41538); 
+            match(input,48,FOLLOW_2); 
              after(grammarAccess.getOutSemanticsRuleAccess().getRightParenthesisKeyword_3_1_1_3()); 
 
             }
@@ -56134,21 +56134,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__Group_3_1_1_2__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20579:1: rule__OutSemanticsRule__Group_3_1_1_2__0 : rule__OutSemanticsRule__Group_3_1_1_2__0__Impl rule__OutSemanticsRule__Group_3_1_1_2__1 ;
+    // InternalRoom.g:20582:1: rule__OutSemanticsRule__Group_3_1_1_2__0 : rule__OutSemanticsRule__Group_3_1_1_2__0__Impl rule__OutSemanticsRule__Group_3_1_1_2__1 ;
     public final void rule__OutSemanticsRule__Group_3_1_1_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20583:1: ( rule__OutSemanticsRule__Group_3_1_1_2__0__Impl rule__OutSemanticsRule__Group_3_1_1_2__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20584:2: rule__OutSemanticsRule__Group_3_1_1_2__0__Impl rule__OutSemanticsRule__Group_3_1_1_2__1
+            // InternalRoom.g:20586:1: ( rule__OutSemanticsRule__Group_3_1_1_2__0__Impl rule__OutSemanticsRule__Group_3_1_1_2__1 )
+            // InternalRoom.g:20587:2: rule__OutSemanticsRule__Group_3_1_1_2__0__Impl rule__OutSemanticsRule__Group_3_1_1_2__1
             {
-            pushFollow(FOLLOW_rule__OutSemanticsRule__Group_3_1_1_2__0__Impl_in_rule__OutSemanticsRule__Group_3_1_1_2__041577);
+            pushFollow(FOLLOW_101);
             rule__OutSemanticsRule__Group_3_1_1_2__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__OutSemanticsRule__Group_3_1_1_2__1_in_rule__OutSemanticsRule__Group_3_1_1_2__041580);
+            pushFollow(FOLLOW_2);
             rule__OutSemanticsRule__Group_3_1_1_2__1();
 
             state._fsp--;
@@ -56172,20 +56172,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__Group_3_1_1_2__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20591:1: rule__OutSemanticsRule__Group_3_1_1_2__0__Impl : ( ',' ) ;
+    // InternalRoom.g:20594:1: rule__OutSemanticsRule__Group_3_1_1_2__0__Impl : ( ',' ) ;
     public final void rule__OutSemanticsRule__Group_3_1_1_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20595:1: ( ( ',' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20596:1: ( ',' )
+            // InternalRoom.g:20598:1: ( ( ',' ) )
+            // InternalRoom.g:20599:1: ( ',' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20596:1: ( ',' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20597:1: ','
+            // InternalRoom.g:20599:1: ( ',' )
+            // InternalRoom.g:20600:1: ','
             {
              before(grammarAccess.getOutSemanticsRuleAccess().getCommaKeyword_3_1_1_2_0()); 
-            match(input,51,FOLLOW_51_in_rule__OutSemanticsRule__Group_3_1_1_2__0__Impl41608); 
+            match(input,51,FOLLOW_2); 
              after(grammarAccess.getOutSemanticsRuleAccess().getCommaKeyword_3_1_1_2_0()); 
 
             }
@@ -56209,16 +56209,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__Group_3_1_1_2__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20610:1: rule__OutSemanticsRule__Group_3_1_1_2__1 : rule__OutSemanticsRule__Group_3_1_1_2__1__Impl ;
+    // InternalRoom.g:20613:1: rule__OutSemanticsRule__Group_3_1_1_2__1 : rule__OutSemanticsRule__Group_3_1_1_2__1__Impl ;
     public final void rule__OutSemanticsRule__Group_3_1_1_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20614:1: ( rule__OutSemanticsRule__Group_3_1_1_2__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20615:2: rule__OutSemanticsRule__Group_3_1_1_2__1__Impl
+            // InternalRoom.g:20617:1: ( rule__OutSemanticsRule__Group_3_1_1_2__1__Impl )
+            // InternalRoom.g:20618:2: rule__OutSemanticsRule__Group_3_1_1_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__OutSemanticsRule__Group_3_1_1_2__1__Impl_in_rule__OutSemanticsRule__Group_3_1_1_2__141639);
+            pushFollow(FOLLOW_2);
             rule__OutSemanticsRule__Group_3_1_1_2__1__Impl();
 
             state._fsp--;
@@ -56242,23 +56242,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__Group_3_1_1_2__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20621:1: rule__OutSemanticsRule__Group_3_1_1_2__1__Impl : ( ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_2_1 ) ) ;
+    // InternalRoom.g:20624:1: rule__OutSemanticsRule__Group_3_1_1_2__1__Impl : ( ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_2_1 ) ) ;
     public final void rule__OutSemanticsRule__Group_3_1_1_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20625:1: ( ( ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_2_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20626:1: ( ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_2_1 ) )
+            // InternalRoom.g:20628:1: ( ( ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_2_1 ) ) )
+            // InternalRoom.g:20629:1: ( ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_2_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20626:1: ( ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_2_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20627:1: ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_2_1 )
+            // InternalRoom.g:20629:1: ( ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_2_1 ) )
+            // InternalRoom.g:20630:1: ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_2_1 )
             {
              before(grammarAccess.getOutSemanticsRuleAccess().getFollowUpsAssignment_3_1_1_2_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20628:1: ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_2_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20628:2: rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_2_1
+            // InternalRoom.g:20631:1: ( rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_2_1 )
+            // InternalRoom.g:20631:2: rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_2_1
             {
-            pushFollow(FOLLOW_rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_2_1_in_rule__OutSemanticsRule__Group_3_1_1_2__1__Impl41666);
+            pushFollow(FOLLOW_2);
             rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_2_1();
 
             state._fsp--;
@@ -56289,21 +56289,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Annotation__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20642:1: rule__Annotation__Group__0 : rule__Annotation__Group__0__Impl rule__Annotation__Group__1 ;
+    // InternalRoom.g:20645:1: rule__Annotation__Group__0 : rule__Annotation__Group__0__Impl rule__Annotation__Group__1 ;
     public final void rule__Annotation__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20646:1: ( rule__Annotation__Group__0__Impl rule__Annotation__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20647:2: rule__Annotation__Group__0__Impl rule__Annotation__Group__1
+            // InternalRoom.g:20649:1: ( rule__Annotation__Group__0__Impl rule__Annotation__Group__1 )
+            // InternalRoom.g:20650:2: rule__Annotation__Group__0__Impl rule__Annotation__Group__1
             {
-            pushFollow(FOLLOW_rule__Annotation__Group__0__Impl_in_rule__Annotation__Group__041700);
+            pushFollow(FOLLOW_3);
             rule__Annotation__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Annotation__Group__1_in_rule__Annotation__Group__041703);
+            pushFollow(FOLLOW_2);
             rule__Annotation__Group__1();
 
             state._fsp--;
@@ -56327,20 +56327,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Annotation__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20654:1: rule__Annotation__Group__0__Impl : ( '@' ) ;
+    // InternalRoom.g:20657:1: rule__Annotation__Group__0__Impl : ( '@' ) ;
     public final void rule__Annotation__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20658:1: ( ( '@' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20659:1: ( '@' )
+            // InternalRoom.g:20661:1: ( ( '@' ) )
+            // InternalRoom.g:20662:1: ( '@' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20659:1: ( '@' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20660:1: '@'
+            // InternalRoom.g:20662:1: ( '@' )
+            // InternalRoom.g:20663:1: '@'
             {
              before(grammarAccess.getAnnotationAccess().getCommercialAtKeyword_0()); 
-            match(input,120,FOLLOW_120_in_rule__Annotation__Group__0__Impl41731); 
+            match(input,120,FOLLOW_2); 
              after(grammarAccess.getAnnotationAccess().getCommercialAtKeyword_0()); 
 
             }
@@ -56364,21 +56364,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Annotation__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20673:1: rule__Annotation__Group__1 : rule__Annotation__Group__1__Impl rule__Annotation__Group__2 ;
+    // InternalRoom.g:20676:1: rule__Annotation__Group__1 : rule__Annotation__Group__1__Impl rule__Annotation__Group__2 ;
     public final void rule__Annotation__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20677:1: ( rule__Annotation__Group__1__Impl rule__Annotation__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20678:2: rule__Annotation__Group__1__Impl rule__Annotation__Group__2
+            // InternalRoom.g:20680:1: ( rule__Annotation__Group__1__Impl rule__Annotation__Group__2 )
+            // InternalRoom.g:20681:2: rule__Annotation__Group__1__Impl rule__Annotation__Group__2
             {
-            pushFollow(FOLLOW_rule__Annotation__Group__1__Impl_in_rule__Annotation__Group__141762);
+            pushFollow(FOLLOW_33);
             rule__Annotation__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Annotation__Group__2_in_rule__Annotation__Group__141765);
+            pushFollow(FOLLOW_2);
             rule__Annotation__Group__2();
 
             state._fsp--;
@@ -56402,23 +56402,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Annotation__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20685:1: rule__Annotation__Group__1__Impl : ( ( rule__Annotation__TypeAssignment_1 ) ) ;
+    // InternalRoom.g:20688:1: rule__Annotation__Group__1__Impl : ( ( rule__Annotation__TypeAssignment_1 ) ) ;
     public final void rule__Annotation__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20689:1: ( ( ( rule__Annotation__TypeAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20690:1: ( ( rule__Annotation__TypeAssignment_1 ) )
+            // InternalRoom.g:20692:1: ( ( ( rule__Annotation__TypeAssignment_1 ) ) )
+            // InternalRoom.g:20693:1: ( ( rule__Annotation__TypeAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20690:1: ( ( rule__Annotation__TypeAssignment_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20691:1: ( rule__Annotation__TypeAssignment_1 )
+            // InternalRoom.g:20693:1: ( ( rule__Annotation__TypeAssignment_1 ) )
+            // InternalRoom.g:20694:1: ( rule__Annotation__TypeAssignment_1 )
             {
              before(grammarAccess.getAnnotationAccess().getTypeAssignment_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20692:1: ( rule__Annotation__TypeAssignment_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20692:2: rule__Annotation__TypeAssignment_1
+            // InternalRoom.g:20695:1: ( rule__Annotation__TypeAssignment_1 )
+            // InternalRoom.g:20695:2: rule__Annotation__TypeAssignment_1
             {
-            pushFollow(FOLLOW_rule__Annotation__TypeAssignment_1_in_rule__Annotation__Group__1__Impl41792);
+            pushFollow(FOLLOW_2);
             rule__Annotation__TypeAssignment_1();
 
             state._fsp--;
@@ -56449,16 +56449,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Annotation__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20702:1: rule__Annotation__Group__2 : rule__Annotation__Group__2__Impl ;
+    // InternalRoom.g:20705:1: rule__Annotation__Group__2 : rule__Annotation__Group__2__Impl ;
     public final void rule__Annotation__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20706:1: ( rule__Annotation__Group__2__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20707:2: rule__Annotation__Group__2__Impl
+            // InternalRoom.g:20709:1: ( rule__Annotation__Group__2__Impl )
+            // InternalRoom.g:20710:2: rule__Annotation__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__Annotation__Group__2__Impl_in_rule__Annotation__Group__241822);
+            pushFollow(FOLLOW_2);
             rule__Annotation__Group__2__Impl();
 
             state._fsp--;
@@ -56482,20 +56482,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Annotation__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20713:1: rule__Annotation__Group__2__Impl : ( ( rule__Annotation__Group_2__0 )? ) ;
+    // InternalRoom.g:20716:1: rule__Annotation__Group__2__Impl : ( ( rule__Annotation__Group_2__0 )? ) ;
     public final void rule__Annotation__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20717:1: ( ( ( rule__Annotation__Group_2__0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20718:1: ( ( rule__Annotation__Group_2__0 )? )
+            // InternalRoom.g:20720:1: ( ( ( rule__Annotation__Group_2__0 )? ) )
+            // InternalRoom.g:20721:1: ( ( rule__Annotation__Group_2__0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20718:1: ( ( rule__Annotation__Group_2__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20719:1: ( rule__Annotation__Group_2__0 )?
+            // InternalRoom.g:20721:1: ( ( rule__Annotation__Group_2__0 )? )
+            // InternalRoom.g:20722:1: ( rule__Annotation__Group_2__0 )?
             {
              before(grammarAccess.getAnnotationAccess().getGroup_2()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20720:1: ( rule__Annotation__Group_2__0 )?
+            // InternalRoom.g:20723:1: ( rule__Annotation__Group_2__0 )?
             int alt189=2;
             int LA189_0 = input.LA(1);
 
@@ -56504,9 +56504,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt189) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20720:2: rule__Annotation__Group_2__0
+                    // InternalRoom.g:20723:2: rule__Annotation__Group_2__0
                     {
-                    pushFollow(FOLLOW_rule__Annotation__Group_2__0_in_rule__Annotation__Group__2__Impl41849);
+                    pushFollow(FOLLOW_2);
                     rule__Annotation__Group_2__0();
 
                     state._fsp--;
@@ -56540,21 +56540,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Annotation__Group_2__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20736:1: rule__Annotation__Group_2__0 : rule__Annotation__Group_2__0__Impl rule__Annotation__Group_2__1 ;
+    // InternalRoom.g:20739:1: rule__Annotation__Group_2__0 : rule__Annotation__Group_2__0__Impl rule__Annotation__Group_2__1 ;
     public final void rule__Annotation__Group_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20740:1: ( rule__Annotation__Group_2__0__Impl rule__Annotation__Group_2__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20741:2: rule__Annotation__Group_2__0__Impl rule__Annotation__Group_2__1
+            // InternalRoom.g:20743:1: ( rule__Annotation__Group_2__0__Impl rule__Annotation__Group_2__1 )
+            // InternalRoom.g:20744:2: rule__Annotation__Group_2__0__Impl rule__Annotation__Group_2__1
             {
-            pushFollow(FOLLOW_rule__Annotation__Group_2__0__Impl_in_rule__Annotation__Group_2__041886);
+            pushFollow(FOLLOW_3);
             rule__Annotation__Group_2__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Annotation__Group_2__1_in_rule__Annotation__Group_2__041889);
+            pushFollow(FOLLOW_2);
             rule__Annotation__Group_2__1();
 
             state._fsp--;
@@ -56578,20 +56578,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Annotation__Group_2__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20748:1: rule__Annotation__Group_2__0__Impl : ( '(' ) ;
+    // InternalRoom.g:20751:1: rule__Annotation__Group_2__0__Impl : ( '(' ) ;
     public final void rule__Annotation__Group_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20752:1: ( ( '(' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20753:1: ( '(' )
+            // InternalRoom.g:20755:1: ( ( '(' ) )
+            // InternalRoom.g:20756:1: ( '(' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20753:1: ( '(' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20754:1: '('
+            // InternalRoom.g:20756:1: ( '(' )
+            // InternalRoom.g:20757:1: '('
             {
              before(grammarAccess.getAnnotationAccess().getLeftParenthesisKeyword_2_0()); 
-            match(input,47,FOLLOW_47_in_rule__Annotation__Group_2__0__Impl41917); 
+            match(input,47,FOLLOW_2); 
              after(grammarAccess.getAnnotationAccess().getLeftParenthesisKeyword_2_0()); 
 
             }
@@ -56615,21 +56615,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Annotation__Group_2__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20767:1: rule__Annotation__Group_2__1 : rule__Annotation__Group_2__1__Impl rule__Annotation__Group_2__2 ;
+    // InternalRoom.g:20770:1: rule__Annotation__Group_2__1 : rule__Annotation__Group_2__1__Impl rule__Annotation__Group_2__2 ;
     public final void rule__Annotation__Group_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20771:1: ( rule__Annotation__Group_2__1__Impl rule__Annotation__Group_2__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20772:2: rule__Annotation__Group_2__1__Impl rule__Annotation__Group_2__2
+            // InternalRoom.g:20774:1: ( rule__Annotation__Group_2__1__Impl rule__Annotation__Group_2__2 )
+            // InternalRoom.g:20775:2: rule__Annotation__Group_2__1__Impl rule__Annotation__Group_2__2
             {
-            pushFollow(FOLLOW_rule__Annotation__Group_2__1__Impl_in_rule__Annotation__Group_2__141948);
+            pushFollow(FOLLOW_102);
             rule__Annotation__Group_2__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Annotation__Group_2__2_in_rule__Annotation__Group_2__141951);
+            pushFollow(FOLLOW_2);
             rule__Annotation__Group_2__2();
 
             state._fsp--;
@@ -56653,23 +56653,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Annotation__Group_2__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20779:1: rule__Annotation__Group_2__1__Impl : ( ( rule__Annotation__AttributesAssignment_2_1 ) ) ;
+    // InternalRoom.g:20782:1: rule__Annotation__Group_2__1__Impl : ( ( rule__Annotation__AttributesAssignment_2_1 ) ) ;
     public final void rule__Annotation__Group_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20783:1: ( ( ( rule__Annotation__AttributesAssignment_2_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20784:1: ( ( rule__Annotation__AttributesAssignment_2_1 ) )
+            // InternalRoom.g:20786:1: ( ( ( rule__Annotation__AttributesAssignment_2_1 ) ) )
+            // InternalRoom.g:20787:1: ( ( rule__Annotation__AttributesAssignment_2_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20784:1: ( ( rule__Annotation__AttributesAssignment_2_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20785:1: ( rule__Annotation__AttributesAssignment_2_1 )
+            // InternalRoom.g:20787:1: ( ( rule__Annotation__AttributesAssignment_2_1 ) )
+            // InternalRoom.g:20788:1: ( rule__Annotation__AttributesAssignment_2_1 )
             {
              before(grammarAccess.getAnnotationAccess().getAttributesAssignment_2_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20786:1: ( rule__Annotation__AttributesAssignment_2_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20786:2: rule__Annotation__AttributesAssignment_2_1
+            // InternalRoom.g:20789:1: ( rule__Annotation__AttributesAssignment_2_1 )
+            // InternalRoom.g:20789:2: rule__Annotation__AttributesAssignment_2_1
             {
-            pushFollow(FOLLOW_rule__Annotation__AttributesAssignment_2_1_in_rule__Annotation__Group_2__1__Impl41978);
+            pushFollow(FOLLOW_2);
             rule__Annotation__AttributesAssignment_2_1();
 
             state._fsp--;
@@ -56700,21 +56700,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Annotation__Group_2__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20796:1: rule__Annotation__Group_2__2 : rule__Annotation__Group_2__2__Impl rule__Annotation__Group_2__3 ;
+    // InternalRoom.g:20799:1: rule__Annotation__Group_2__2 : rule__Annotation__Group_2__2__Impl rule__Annotation__Group_2__3 ;
     public final void rule__Annotation__Group_2__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20800:1: ( rule__Annotation__Group_2__2__Impl rule__Annotation__Group_2__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20801:2: rule__Annotation__Group_2__2__Impl rule__Annotation__Group_2__3
+            // InternalRoom.g:20803:1: ( rule__Annotation__Group_2__2__Impl rule__Annotation__Group_2__3 )
+            // InternalRoom.g:20804:2: rule__Annotation__Group_2__2__Impl rule__Annotation__Group_2__3
             {
-            pushFollow(FOLLOW_rule__Annotation__Group_2__2__Impl_in_rule__Annotation__Group_2__242008);
+            pushFollow(FOLLOW_102);
             rule__Annotation__Group_2__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Annotation__Group_2__3_in_rule__Annotation__Group_2__242011);
+            pushFollow(FOLLOW_2);
             rule__Annotation__Group_2__3();
 
             state._fsp--;
@@ -56738,20 +56738,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Annotation__Group_2__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20808:1: rule__Annotation__Group_2__2__Impl : ( ( rule__Annotation__Group_2_2__0 )* ) ;
+    // InternalRoom.g:20811:1: rule__Annotation__Group_2__2__Impl : ( ( rule__Annotation__Group_2_2__0 )* ) ;
     public final void rule__Annotation__Group_2__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20812:1: ( ( ( rule__Annotation__Group_2_2__0 )* ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20813:1: ( ( rule__Annotation__Group_2_2__0 )* )
+            // InternalRoom.g:20815:1: ( ( ( rule__Annotation__Group_2_2__0 )* ) )
+            // InternalRoom.g:20816:1: ( ( rule__Annotation__Group_2_2__0 )* )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20813:1: ( ( rule__Annotation__Group_2_2__0 )* )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20814:1: ( rule__Annotation__Group_2_2__0 )*
+            // InternalRoom.g:20816:1: ( ( rule__Annotation__Group_2_2__0 )* )
+            // InternalRoom.g:20817:1: ( rule__Annotation__Group_2_2__0 )*
             {
              before(grammarAccess.getAnnotationAccess().getGroup_2_2()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20815:1: ( rule__Annotation__Group_2_2__0 )*
+            // InternalRoom.g:20818:1: ( rule__Annotation__Group_2_2__0 )*
             loop190:
             do {
                 int alt190=2;
@@ -56764,9 +56764,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
                 switch (alt190) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20815:2: rule__Annotation__Group_2_2__0
+            	    // InternalRoom.g:20818:2: rule__Annotation__Group_2_2__0
             	    {
-            	    pushFollow(FOLLOW_rule__Annotation__Group_2_2__0_in_rule__Annotation__Group_2__2__Impl42038);
+            	    pushFollow(FOLLOW_19);
             	    rule__Annotation__Group_2_2__0();
 
             	    state._fsp--;
@@ -56803,16 +56803,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Annotation__Group_2__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20825:1: rule__Annotation__Group_2__3 : rule__Annotation__Group_2__3__Impl ;
+    // InternalRoom.g:20828:1: rule__Annotation__Group_2__3 : rule__Annotation__Group_2__3__Impl ;
     public final void rule__Annotation__Group_2__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20829:1: ( rule__Annotation__Group_2__3__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20830:2: rule__Annotation__Group_2__3__Impl
+            // InternalRoom.g:20832:1: ( rule__Annotation__Group_2__3__Impl )
+            // InternalRoom.g:20833:2: rule__Annotation__Group_2__3__Impl
             {
-            pushFollow(FOLLOW_rule__Annotation__Group_2__3__Impl_in_rule__Annotation__Group_2__342069);
+            pushFollow(FOLLOW_2);
             rule__Annotation__Group_2__3__Impl();
 
             state._fsp--;
@@ -56836,20 +56836,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Annotation__Group_2__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20836:1: rule__Annotation__Group_2__3__Impl : ( ')' ) ;
+    // InternalRoom.g:20839:1: rule__Annotation__Group_2__3__Impl : ( ')' ) ;
     public final void rule__Annotation__Group_2__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20840:1: ( ( ')' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20841:1: ( ')' )
+            // InternalRoom.g:20843:1: ( ( ')' ) )
+            // InternalRoom.g:20844:1: ( ')' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20841:1: ( ')' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20842:1: ')'
+            // InternalRoom.g:20844:1: ( ')' )
+            // InternalRoom.g:20845:1: ')'
             {
              before(grammarAccess.getAnnotationAccess().getRightParenthesisKeyword_2_3()); 
-            match(input,48,FOLLOW_48_in_rule__Annotation__Group_2__3__Impl42097); 
+            match(input,48,FOLLOW_2); 
              after(grammarAccess.getAnnotationAccess().getRightParenthesisKeyword_2_3()); 
 
             }
@@ -56873,21 +56873,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Annotation__Group_2_2__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20863:1: rule__Annotation__Group_2_2__0 : rule__Annotation__Group_2_2__0__Impl rule__Annotation__Group_2_2__1 ;
+    // InternalRoom.g:20866:1: rule__Annotation__Group_2_2__0 : rule__Annotation__Group_2_2__0__Impl rule__Annotation__Group_2_2__1 ;
     public final void rule__Annotation__Group_2_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20867:1: ( rule__Annotation__Group_2_2__0__Impl rule__Annotation__Group_2_2__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20868:2: rule__Annotation__Group_2_2__0__Impl rule__Annotation__Group_2_2__1
+            // InternalRoom.g:20870:1: ( rule__Annotation__Group_2_2__0__Impl rule__Annotation__Group_2_2__1 )
+            // InternalRoom.g:20871:2: rule__Annotation__Group_2_2__0__Impl rule__Annotation__Group_2_2__1
             {
-            pushFollow(FOLLOW_rule__Annotation__Group_2_2__0__Impl_in_rule__Annotation__Group_2_2__042136);
+            pushFollow(FOLLOW_3);
             rule__Annotation__Group_2_2__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Annotation__Group_2_2__1_in_rule__Annotation__Group_2_2__042139);
+            pushFollow(FOLLOW_2);
             rule__Annotation__Group_2_2__1();
 
             state._fsp--;
@@ -56911,20 +56911,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Annotation__Group_2_2__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20875:1: rule__Annotation__Group_2_2__0__Impl : ( ',' ) ;
+    // InternalRoom.g:20878:1: rule__Annotation__Group_2_2__0__Impl : ( ',' ) ;
     public final void rule__Annotation__Group_2_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20879:1: ( ( ',' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20880:1: ( ',' )
+            // InternalRoom.g:20882:1: ( ( ',' ) )
+            // InternalRoom.g:20883:1: ( ',' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20880:1: ( ',' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20881:1: ','
+            // InternalRoom.g:20883:1: ( ',' )
+            // InternalRoom.g:20884:1: ','
             {
              before(grammarAccess.getAnnotationAccess().getCommaKeyword_2_2_0()); 
-            match(input,51,FOLLOW_51_in_rule__Annotation__Group_2_2__0__Impl42167); 
+            match(input,51,FOLLOW_2); 
              after(grammarAccess.getAnnotationAccess().getCommaKeyword_2_2_0()); 
 
             }
@@ -56948,16 +56948,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Annotation__Group_2_2__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20894:1: rule__Annotation__Group_2_2__1 : rule__Annotation__Group_2_2__1__Impl ;
+    // InternalRoom.g:20897:1: rule__Annotation__Group_2_2__1 : rule__Annotation__Group_2_2__1__Impl ;
     public final void rule__Annotation__Group_2_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20898:1: ( rule__Annotation__Group_2_2__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20899:2: rule__Annotation__Group_2_2__1__Impl
+            // InternalRoom.g:20901:1: ( rule__Annotation__Group_2_2__1__Impl )
+            // InternalRoom.g:20902:2: rule__Annotation__Group_2_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__Annotation__Group_2_2__1__Impl_in_rule__Annotation__Group_2_2__142198);
+            pushFollow(FOLLOW_2);
             rule__Annotation__Group_2_2__1__Impl();
 
             state._fsp--;
@@ -56981,23 +56981,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Annotation__Group_2_2__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20905:1: rule__Annotation__Group_2_2__1__Impl : ( ( rule__Annotation__AttributesAssignment_2_2_1 ) ) ;
+    // InternalRoom.g:20908:1: rule__Annotation__Group_2_2__1__Impl : ( ( rule__Annotation__AttributesAssignment_2_2_1 ) ) ;
     public final void rule__Annotation__Group_2_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20909:1: ( ( ( rule__Annotation__AttributesAssignment_2_2_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20910:1: ( ( rule__Annotation__AttributesAssignment_2_2_1 ) )
+            // InternalRoom.g:20912:1: ( ( ( rule__Annotation__AttributesAssignment_2_2_1 ) ) )
+            // InternalRoom.g:20913:1: ( ( rule__Annotation__AttributesAssignment_2_2_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20910:1: ( ( rule__Annotation__AttributesAssignment_2_2_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20911:1: ( rule__Annotation__AttributesAssignment_2_2_1 )
+            // InternalRoom.g:20913:1: ( ( rule__Annotation__AttributesAssignment_2_2_1 ) )
+            // InternalRoom.g:20914:1: ( rule__Annotation__AttributesAssignment_2_2_1 )
             {
              before(grammarAccess.getAnnotationAccess().getAttributesAssignment_2_2_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20912:1: ( rule__Annotation__AttributesAssignment_2_2_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20912:2: rule__Annotation__AttributesAssignment_2_2_1
+            // InternalRoom.g:20915:1: ( rule__Annotation__AttributesAssignment_2_2_1 )
+            // InternalRoom.g:20915:2: rule__Annotation__AttributesAssignment_2_2_1
             {
-            pushFollow(FOLLOW_rule__Annotation__AttributesAssignment_2_2_1_in_rule__Annotation__Group_2_2__1__Impl42225);
+            pushFollow(FOLLOW_2);
             rule__Annotation__AttributesAssignment_2_2_1();
 
             state._fsp--;
@@ -57028,21 +57028,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__KeyValue__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20926:1: rule__KeyValue__Group__0 : rule__KeyValue__Group__0__Impl rule__KeyValue__Group__1 ;
+    // InternalRoom.g:20929:1: rule__KeyValue__Group__0 : rule__KeyValue__Group__0__Impl rule__KeyValue__Group__1 ;
     public final void rule__KeyValue__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20930:1: ( rule__KeyValue__Group__0__Impl rule__KeyValue__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20931:2: rule__KeyValue__Group__0__Impl rule__KeyValue__Group__1
+            // InternalRoom.g:20933:1: ( rule__KeyValue__Group__0__Impl rule__KeyValue__Group__1 )
+            // InternalRoom.g:20934:2: rule__KeyValue__Group__0__Impl rule__KeyValue__Group__1
             {
-            pushFollow(FOLLOW_rule__KeyValue__Group__0__Impl_in_rule__KeyValue__Group__042259);
+            pushFollow(FOLLOW_20);
             rule__KeyValue__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__KeyValue__Group__1_in_rule__KeyValue__Group__042262);
+            pushFollow(FOLLOW_2);
             rule__KeyValue__Group__1();
 
             state._fsp--;
@@ -57066,23 +57066,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__KeyValue__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20938:1: rule__KeyValue__Group__0__Impl : ( ( rule__KeyValue__KeyAssignment_0 ) ) ;
+    // InternalRoom.g:20941:1: rule__KeyValue__Group__0__Impl : ( ( rule__KeyValue__KeyAssignment_0 ) ) ;
     public final void rule__KeyValue__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20942:1: ( ( ( rule__KeyValue__KeyAssignment_0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20943:1: ( ( rule__KeyValue__KeyAssignment_0 ) )
+            // InternalRoom.g:20945:1: ( ( ( rule__KeyValue__KeyAssignment_0 ) ) )
+            // InternalRoom.g:20946:1: ( ( rule__KeyValue__KeyAssignment_0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20943:1: ( ( rule__KeyValue__KeyAssignment_0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20944:1: ( rule__KeyValue__KeyAssignment_0 )
+            // InternalRoom.g:20946:1: ( ( rule__KeyValue__KeyAssignment_0 ) )
+            // InternalRoom.g:20947:1: ( rule__KeyValue__KeyAssignment_0 )
             {
              before(grammarAccess.getKeyValueAccess().getKeyAssignment_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20945:1: ( rule__KeyValue__KeyAssignment_0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20945:2: rule__KeyValue__KeyAssignment_0
+            // InternalRoom.g:20948:1: ( rule__KeyValue__KeyAssignment_0 )
+            // InternalRoom.g:20948:2: rule__KeyValue__KeyAssignment_0
             {
-            pushFollow(FOLLOW_rule__KeyValue__KeyAssignment_0_in_rule__KeyValue__Group__0__Impl42289);
+            pushFollow(FOLLOW_2);
             rule__KeyValue__KeyAssignment_0();
 
             state._fsp--;
@@ -57113,21 +57113,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__KeyValue__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20955:1: rule__KeyValue__Group__1 : rule__KeyValue__Group__1__Impl rule__KeyValue__Group__2 ;
+    // InternalRoom.g:20958:1: rule__KeyValue__Group__1 : rule__KeyValue__Group__1__Impl rule__KeyValue__Group__2 ;
     public final void rule__KeyValue__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20959:1: ( rule__KeyValue__Group__1__Impl rule__KeyValue__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20960:2: rule__KeyValue__Group__1__Impl rule__KeyValue__Group__2
+            // InternalRoom.g:20962:1: ( rule__KeyValue__Group__1__Impl rule__KeyValue__Group__2 )
+            // InternalRoom.g:20963:2: rule__KeyValue__Group__1__Impl rule__KeyValue__Group__2
             {
-            pushFollow(FOLLOW_rule__KeyValue__Group__1__Impl_in_rule__KeyValue__Group__142319);
+            pushFollow(FOLLOW_103);
             rule__KeyValue__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__KeyValue__Group__2_in_rule__KeyValue__Group__142322);
+            pushFollow(FOLLOW_2);
             rule__KeyValue__Group__2();
 
             state._fsp--;
@@ -57151,20 +57151,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__KeyValue__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20967:1: rule__KeyValue__Group__1__Impl : ( '=' ) ;
+    // InternalRoom.g:20970:1: rule__KeyValue__Group__1__Impl : ( '=' ) ;
     public final void rule__KeyValue__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20971:1: ( ( '=' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20972:1: ( '=' )
+            // InternalRoom.g:20974:1: ( ( '=' ) )
+            // InternalRoom.g:20975:1: ( '=' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20972:1: ( '=' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20973:1: '='
+            // InternalRoom.g:20975:1: ( '=' )
+            // InternalRoom.g:20976:1: '='
             {
              before(grammarAccess.getKeyValueAccess().getEqualsSignKeyword_1()); 
-            match(input,52,FOLLOW_52_in_rule__KeyValue__Group__1__Impl42350); 
+            match(input,52,FOLLOW_2); 
              after(grammarAccess.getKeyValueAccess().getEqualsSignKeyword_1()); 
 
             }
@@ -57188,16 +57188,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__KeyValue__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20986:1: rule__KeyValue__Group__2 : rule__KeyValue__Group__2__Impl ;
+    // InternalRoom.g:20989:1: rule__KeyValue__Group__2 : rule__KeyValue__Group__2__Impl ;
     public final void rule__KeyValue__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20990:1: ( rule__KeyValue__Group__2__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20991:2: rule__KeyValue__Group__2__Impl
+            // InternalRoom.g:20993:1: ( rule__KeyValue__Group__2__Impl )
+            // InternalRoom.g:20994:2: rule__KeyValue__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__KeyValue__Group__2__Impl_in_rule__KeyValue__Group__242381);
+            pushFollow(FOLLOW_2);
             rule__KeyValue__Group__2__Impl();
 
             state._fsp--;
@@ -57221,23 +57221,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__KeyValue__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:20997:1: rule__KeyValue__Group__2__Impl : ( ( rule__KeyValue__ValueAssignment_2 ) ) ;
+    // InternalRoom.g:21000:1: rule__KeyValue__Group__2__Impl : ( ( rule__KeyValue__ValueAssignment_2 ) ) ;
     public final void rule__KeyValue__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21001:1: ( ( ( rule__KeyValue__ValueAssignment_2 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21002:1: ( ( rule__KeyValue__ValueAssignment_2 ) )
+            // InternalRoom.g:21004:1: ( ( ( rule__KeyValue__ValueAssignment_2 ) ) )
+            // InternalRoom.g:21005:1: ( ( rule__KeyValue__ValueAssignment_2 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21002:1: ( ( rule__KeyValue__ValueAssignment_2 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21003:1: ( rule__KeyValue__ValueAssignment_2 )
+            // InternalRoom.g:21005:1: ( ( rule__KeyValue__ValueAssignment_2 ) )
+            // InternalRoom.g:21006:1: ( rule__KeyValue__ValueAssignment_2 )
             {
              before(grammarAccess.getKeyValueAccess().getValueAssignment_2()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21004:1: ( rule__KeyValue__ValueAssignment_2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21004:2: rule__KeyValue__ValueAssignment_2
+            // InternalRoom.g:21007:1: ( rule__KeyValue__ValueAssignment_2 )
+            // InternalRoom.g:21007:2: rule__KeyValue__ValueAssignment_2
             {
-            pushFollow(FOLLOW_rule__KeyValue__ValueAssignment_2_in_rule__KeyValue__Group__2__Impl42408);
+            pushFollow(FOLLOW_2);
             rule__KeyValue__ValueAssignment_2();
 
             state._fsp--;
@@ -57268,21 +57268,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AnnotationType__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21020:1: rule__AnnotationType__Group__0 : rule__AnnotationType__Group__0__Impl rule__AnnotationType__Group__1 ;
+    // InternalRoom.g:21023:1: rule__AnnotationType__Group__0 : rule__AnnotationType__Group__0__Impl rule__AnnotationType__Group__1 ;
     public final void rule__AnnotationType__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21024:1: ( rule__AnnotationType__Group__0__Impl rule__AnnotationType__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21025:2: rule__AnnotationType__Group__0__Impl rule__AnnotationType__Group__1
+            // InternalRoom.g:21027:1: ( rule__AnnotationType__Group__0__Impl rule__AnnotationType__Group__1 )
+            // InternalRoom.g:21028:2: rule__AnnotationType__Group__0__Impl rule__AnnotationType__Group__1
             {
-            pushFollow(FOLLOW_rule__AnnotationType__Group__0__Impl_in_rule__AnnotationType__Group__042444);
+            pushFollow(FOLLOW_3);
             rule__AnnotationType__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__AnnotationType__Group__1_in_rule__AnnotationType__Group__042447);
+            pushFollow(FOLLOW_2);
             rule__AnnotationType__Group__1();
 
             state._fsp--;
@@ -57306,20 +57306,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AnnotationType__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21032:1: rule__AnnotationType__Group__0__Impl : ( 'AnnotationType' ) ;
+    // InternalRoom.g:21035:1: rule__AnnotationType__Group__0__Impl : ( 'AnnotationType' ) ;
     public final void rule__AnnotationType__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21036:1: ( ( 'AnnotationType' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21037:1: ( 'AnnotationType' )
+            // InternalRoom.g:21039:1: ( ( 'AnnotationType' ) )
+            // InternalRoom.g:21040:1: ( 'AnnotationType' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21037:1: ( 'AnnotationType' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21038:1: 'AnnotationType'
+            // InternalRoom.g:21040:1: ( 'AnnotationType' )
+            // InternalRoom.g:21041:1: 'AnnotationType'
             {
              before(grammarAccess.getAnnotationTypeAccess().getAnnotationTypeKeyword_0()); 
-            match(input,121,FOLLOW_121_in_rule__AnnotationType__Group__0__Impl42475); 
+            match(input,121,FOLLOW_2); 
              after(grammarAccess.getAnnotationTypeAccess().getAnnotationTypeKeyword_0()); 
 
             }
@@ -57343,21 +57343,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AnnotationType__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21051:1: rule__AnnotationType__Group__1 : rule__AnnotationType__Group__1__Impl rule__AnnotationType__Group__2 ;
+    // InternalRoom.g:21054:1: rule__AnnotationType__Group__1 : rule__AnnotationType__Group__1__Impl rule__AnnotationType__Group__2 ;
     public final void rule__AnnotationType__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21055:1: ( rule__AnnotationType__Group__1__Impl rule__AnnotationType__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21056:2: rule__AnnotationType__Group__1__Impl rule__AnnotationType__Group__2
+            // InternalRoom.g:21058:1: ( rule__AnnotationType__Group__1__Impl rule__AnnotationType__Group__2 )
+            // InternalRoom.g:21059:2: rule__AnnotationType__Group__1__Impl rule__AnnotationType__Group__2
             {
-            pushFollow(FOLLOW_rule__AnnotationType__Group__1__Impl_in_rule__AnnotationType__Group__142506);
+            pushFollow(FOLLOW_4);
             rule__AnnotationType__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__AnnotationType__Group__2_in_rule__AnnotationType__Group__142509);
+            pushFollow(FOLLOW_2);
             rule__AnnotationType__Group__2();
 
             state._fsp--;
@@ -57381,23 +57381,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AnnotationType__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21063:1: rule__AnnotationType__Group__1__Impl : ( ( rule__AnnotationType__NameAssignment_1 ) ) ;
+    // InternalRoom.g:21066:1: rule__AnnotationType__Group__1__Impl : ( ( rule__AnnotationType__NameAssignment_1 ) ) ;
     public final void rule__AnnotationType__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21067:1: ( ( ( rule__AnnotationType__NameAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21068:1: ( ( rule__AnnotationType__NameAssignment_1 ) )
+            // InternalRoom.g:21070:1: ( ( ( rule__AnnotationType__NameAssignment_1 ) ) )
+            // InternalRoom.g:21071:1: ( ( rule__AnnotationType__NameAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21068:1: ( ( rule__AnnotationType__NameAssignment_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21069:1: ( rule__AnnotationType__NameAssignment_1 )
+            // InternalRoom.g:21071:1: ( ( rule__AnnotationType__NameAssignment_1 ) )
+            // InternalRoom.g:21072:1: ( rule__AnnotationType__NameAssignment_1 )
             {
              before(grammarAccess.getAnnotationTypeAccess().getNameAssignment_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21070:1: ( rule__AnnotationType__NameAssignment_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21070:2: rule__AnnotationType__NameAssignment_1
+            // InternalRoom.g:21073:1: ( rule__AnnotationType__NameAssignment_1 )
+            // InternalRoom.g:21073:2: rule__AnnotationType__NameAssignment_1
             {
-            pushFollow(FOLLOW_rule__AnnotationType__NameAssignment_1_in_rule__AnnotationType__Group__1__Impl42536);
+            pushFollow(FOLLOW_2);
             rule__AnnotationType__NameAssignment_1();
 
             state._fsp--;
@@ -57428,21 +57428,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AnnotationType__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21080:1: rule__AnnotationType__Group__2 : rule__AnnotationType__Group__2__Impl rule__AnnotationType__Group__3 ;
+    // InternalRoom.g:21083:1: rule__AnnotationType__Group__2 : rule__AnnotationType__Group__2__Impl rule__AnnotationType__Group__3 ;
     public final void rule__AnnotationType__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21084:1: ( rule__AnnotationType__Group__2__Impl rule__AnnotationType__Group__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21085:2: rule__AnnotationType__Group__2__Impl rule__AnnotationType__Group__3
+            // InternalRoom.g:21087:1: ( rule__AnnotationType__Group__2__Impl rule__AnnotationType__Group__3 )
+            // InternalRoom.g:21088:2: rule__AnnotationType__Group__2__Impl rule__AnnotationType__Group__3
             {
-            pushFollow(FOLLOW_rule__AnnotationType__Group__2__Impl_in_rule__AnnotationType__Group__242566);
+            pushFollow(FOLLOW_4);
             rule__AnnotationType__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__AnnotationType__Group__3_in_rule__AnnotationType__Group__242569);
+            pushFollow(FOLLOW_2);
             rule__AnnotationType__Group__3();
 
             state._fsp--;
@@ -57466,20 +57466,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AnnotationType__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21092:1: rule__AnnotationType__Group__2__Impl : ( ( rule__AnnotationType__DocuAssignment_2 )? ) ;
+    // InternalRoom.g:21095:1: rule__AnnotationType__Group__2__Impl : ( ( rule__AnnotationType__DocuAssignment_2 )? ) ;
     public final void rule__AnnotationType__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21096:1: ( ( ( rule__AnnotationType__DocuAssignment_2 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21097:1: ( ( rule__AnnotationType__DocuAssignment_2 )? )
+            // InternalRoom.g:21099:1: ( ( ( rule__AnnotationType__DocuAssignment_2 )? ) )
+            // InternalRoom.g:21100:1: ( ( rule__AnnotationType__DocuAssignment_2 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21097:1: ( ( rule__AnnotationType__DocuAssignment_2 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21098:1: ( rule__AnnotationType__DocuAssignment_2 )?
+            // InternalRoom.g:21100:1: ( ( rule__AnnotationType__DocuAssignment_2 )? )
+            // InternalRoom.g:21101:1: ( rule__AnnotationType__DocuAssignment_2 )?
             {
              before(grammarAccess.getAnnotationTypeAccess().getDocuAssignment_2()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21099:1: ( rule__AnnotationType__DocuAssignment_2 )?
+            // InternalRoom.g:21102:1: ( rule__AnnotationType__DocuAssignment_2 )?
             int alt191=2;
             int LA191_0 = input.LA(1);
 
@@ -57488,9 +57488,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt191) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21099:2: rule__AnnotationType__DocuAssignment_2
+                    // InternalRoom.g:21102:2: rule__AnnotationType__DocuAssignment_2
                     {
-                    pushFollow(FOLLOW_rule__AnnotationType__DocuAssignment_2_in_rule__AnnotationType__Group__2__Impl42596);
+                    pushFollow(FOLLOW_2);
                     rule__AnnotationType__DocuAssignment_2();
 
                     state._fsp--;
@@ -57524,21 +57524,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AnnotationType__Group__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21109:1: rule__AnnotationType__Group__3 : rule__AnnotationType__Group__3__Impl rule__AnnotationType__Group__4 ;
+    // InternalRoom.g:21112:1: rule__AnnotationType__Group__3 : rule__AnnotationType__Group__3__Impl rule__AnnotationType__Group__4 ;
     public final void rule__AnnotationType__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21113:1: ( rule__AnnotationType__Group__3__Impl rule__AnnotationType__Group__4 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21114:2: rule__AnnotationType__Group__3__Impl rule__AnnotationType__Group__4
+            // InternalRoom.g:21116:1: ( rule__AnnotationType__Group__3__Impl rule__AnnotationType__Group__4 )
+            // InternalRoom.g:21117:2: rule__AnnotationType__Group__3__Impl rule__AnnotationType__Group__4
             {
-            pushFollow(FOLLOW_rule__AnnotationType__Group__3__Impl_in_rule__AnnotationType__Group__342627);
+            pushFollow(FOLLOW_104);
             rule__AnnotationType__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__AnnotationType__Group__4_in_rule__AnnotationType__Group__342630);
+            pushFollow(FOLLOW_2);
             rule__AnnotationType__Group__4();
 
             state._fsp--;
@@ -57562,20 +57562,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AnnotationType__Group__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21121:1: rule__AnnotationType__Group__3__Impl : ( '{' ) ;
+    // InternalRoom.g:21124:1: rule__AnnotationType__Group__3__Impl : ( '{' ) ;
     public final void rule__AnnotationType__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21125:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21126:1: ( '{' )
+            // InternalRoom.g:21128:1: ( ( '{' ) )
+            // InternalRoom.g:21129:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21126:1: ( '{' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21127:1: '{'
+            // InternalRoom.g:21129:1: ( '{' )
+            // InternalRoom.g:21130:1: '{'
             {
              before(grammarAccess.getAnnotationTypeAccess().getLeftCurlyBracketKeyword_3()); 
-            match(input,41,FOLLOW_41_in_rule__AnnotationType__Group__3__Impl42658); 
+            match(input,41,FOLLOW_2); 
              after(grammarAccess.getAnnotationTypeAccess().getLeftCurlyBracketKeyword_3()); 
 
             }
@@ -57599,21 +57599,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AnnotationType__Group__4"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21140:1: rule__AnnotationType__Group__4 : rule__AnnotationType__Group__4__Impl rule__AnnotationType__Group__5 ;
+    // InternalRoom.g:21143:1: rule__AnnotationType__Group__4 : rule__AnnotationType__Group__4__Impl rule__AnnotationType__Group__5 ;
     public final void rule__AnnotationType__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21144:1: ( rule__AnnotationType__Group__4__Impl rule__AnnotationType__Group__5 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21145:2: rule__AnnotationType__Group__4__Impl rule__AnnotationType__Group__5
+            // InternalRoom.g:21147:1: ( rule__AnnotationType__Group__4__Impl rule__AnnotationType__Group__5 )
+            // InternalRoom.g:21148:2: rule__AnnotationType__Group__4__Impl rule__AnnotationType__Group__5
             {
-            pushFollow(FOLLOW_rule__AnnotationType__Group__4__Impl_in_rule__AnnotationType__Group__442689);
+            pushFollow(FOLLOW_20);
             rule__AnnotationType__Group__4__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__AnnotationType__Group__5_in_rule__AnnotationType__Group__442692);
+            pushFollow(FOLLOW_2);
             rule__AnnotationType__Group__5();
 
             state._fsp--;
@@ -57637,20 +57637,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AnnotationType__Group__4__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21152:1: rule__AnnotationType__Group__4__Impl : ( 'target' ) ;
+    // InternalRoom.g:21155:1: rule__AnnotationType__Group__4__Impl : ( 'target' ) ;
     public final void rule__AnnotationType__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21156:1: ( ( 'target' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21157:1: ( 'target' )
+            // InternalRoom.g:21159:1: ( ( 'target' ) )
+            // InternalRoom.g:21160:1: ( 'target' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21157:1: ( 'target' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21158:1: 'target'
+            // InternalRoom.g:21160:1: ( 'target' )
+            // InternalRoom.g:21161:1: 'target'
             {
              before(grammarAccess.getAnnotationTypeAccess().getTargetKeyword_4()); 
-            match(input,122,FOLLOW_122_in_rule__AnnotationType__Group__4__Impl42720); 
+            match(input,122,FOLLOW_2); 
              after(grammarAccess.getAnnotationTypeAccess().getTargetKeyword_4()); 
 
             }
@@ -57674,21 +57674,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AnnotationType__Group__5"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21171:1: rule__AnnotationType__Group__5 : rule__AnnotationType__Group__5__Impl rule__AnnotationType__Group__6 ;
+    // InternalRoom.g:21174:1: rule__AnnotationType__Group__5 : rule__AnnotationType__Group__5__Impl rule__AnnotationType__Group__6 ;
     public final void rule__AnnotationType__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21175:1: ( rule__AnnotationType__Group__5__Impl rule__AnnotationType__Group__6 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21176:2: rule__AnnotationType__Group__5__Impl rule__AnnotationType__Group__6
+            // InternalRoom.g:21178:1: ( rule__AnnotationType__Group__5__Impl rule__AnnotationType__Group__6 )
+            // InternalRoom.g:21179:2: rule__AnnotationType__Group__5__Impl rule__AnnotationType__Group__6
             {
-            pushFollow(FOLLOW_rule__AnnotationType__Group__5__Impl_in_rule__AnnotationType__Group__542751);
+            pushFollow(FOLLOW_105);
             rule__AnnotationType__Group__5__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__AnnotationType__Group__6_in_rule__AnnotationType__Group__542754);
+            pushFollow(FOLLOW_2);
             rule__AnnotationType__Group__6();
 
             state._fsp--;
@@ -57712,20 +57712,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AnnotationType__Group__5__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21183:1: rule__AnnotationType__Group__5__Impl : ( '=' ) ;
+    // InternalRoom.g:21186:1: rule__AnnotationType__Group__5__Impl : ( '=' ) ;
     public final void rule__AnnotationType__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21187:1: ( ( '=' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21188:1: ( '=' )
+            // InternalRoom.g:21190:1: ( ( '=' ) )
+            // InternalRoom.g:21191:1: ( '=' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21188:1: ( '=' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21189:1: '='
+            // InternalRoom.g:21191:1: ( '=' )
+            // InternalRoom.g:21192:1: '='
             {
              before(grammarAccess.getAnnotationTypeAccess().getEqualsSignKeyword_5()); 
-            match(input,52,FOLLOW_52_in_rule__AnnotationType__Group__5__Impl42782); 
+            match(input,52,FOLLOW_2); 
              after(grammarAccess.getAnnotationTypeAccess().getEqualsSignKeyword_5()); 
 
             }
@@ -57749,21 +57749,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AnnotationType__Group__6"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21202:1: rule__AnnotationType__Group__6 : rule__AnnotationType__Group__6__Impl rule__AnnotationType__Group__7 ;
+    // InternalRoom.g:21205:1: rule__AnnotationType__Group__6 : rule__AnnotationType__Group__6__Impl rule__AnnotationType__Group__7 ;
     public final void rule__AnnotationType__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21206:1: ( rule__AnnotationType__Group__6__Impl rule__AnnotationType__Group__7 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21207:2: rule__AnnotationType__Group__6__Impl rule__AnnotationType__Group__7
+            // InternalRoom.g:21209:1: ( rule__AnnotationType__Group__6__Impl rule__AnnotationType__Group__7 )
+            // InternalRoom.g:21210:2: rule__AnnotationType__Group__6__Impl rule__AnnotationType__Group__7
             {
-            pushFollow(FOLLOW_rule__AnnotationType__Group__6__Impl_in_rule__AnnotationType__Group__642813);
+            pushFollow(FOLLOW_106);
             rule__AnnotationType__Group__6__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__AnnotationType__Group__7_in_rule__AnnotationType__Group__642816);
+            pushFollow(FOLLOW_2);
             rule__AnnotationType__Group__7();
 
             state._fsp--;
@@ -57787,23 +57787,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AnnotationType__Group__6__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21214:1: rule__AnnotationType__Group__6__Impl : ( ( rule__AnnotationType__Alternatives_6 ) ) ;
+    // InternalRoom.g:21217:1: rule__AnnotationType__Group__6__Impl : ( ( rule__AnnotationType__Alternatives_6 ) ) ;
     public final void rule__AnnotationType__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21218:1: ( ( ( rule__AnnotationType__Alternatives_6 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21219:1: ( ( rule__AnnotationType__Alternatives_6 ) )
+            // InternalRoom.g:21221:1: ( ( ( rule__AnnotationType__Alternatives_6 ) ) )
+            // InternalRoom.g:21222:1: ( ( rule__AnnotationType__Alternatives_6 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21219:1: ( ( rule__AnnotationType__Alternatives_6 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21220:1: ( rule__AnnotationType__Alternatives_6 )
+            // InternalRoom.g:21222:1: ( ( rule__AnnotationType__Alternatives_6 ) )
+            // InternalRoom.g:21223:1: ( rule__AnnotationType__Alternatives_6 )
             {
              before(grammarAccess.getAnnotationTypeAccess().getAlternatives_6()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21221:1: ( rule__AnnotationType__Alternatives_6 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21221:2: rule__AnnotationType__Alternatives_6
+            // InternalRoom.g:21224:1: ( rule__AnnotationType__Alternatives_6 )
+            // InternalRoom.g:21224:2: rule__AnnotationType__Alternatives_6
             {
-            pushFollow(FOLLOW_rule__AnnotationType__Alternatives_6_in_rule__AnnotationType__Group__6__Impl42843);
+            pushFollow(FOLLOW_2);
             rule__AnnotationType__Alternatives_6();
 
             state._fsp--;
@@ -57834,21 +57834,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AnnotationType__Group__7"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21231:1: rule__AnnotationType__Group__7 : rule__AnnotationType__Group__7__Impl rule__AnnotationType__Group__8 ;
+    // InternalRoom.g:21234:1: rule__AnnotationType__Group__7 : rule__AnnotationType__Group__7__Impl rule__AnnotationType__Group__8 ;
     public final void rule__AnnotationType__Group__7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21235:1: ( rule__AnnotationType__Group__7__Impl rule__AnnotationType__Group__8 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21236:2: rule__AnnotationType__Group__7__Impl rule__AnnotationType__Group__8
+            // InternalRoom.g:21238:1: ( rule__AnnotationType__Group__7__Impl rule__AnnotationType__Group__8 )
+            // InternalRoom.g:21239:2: rule__AnnotationType__Group__7__Impl rule__AnnotationType__Group__8
             {
-            pushFollow(FOLLOW_rule__AnnotationType__Group__7__Impl_in_rule__AnnotationType__Group__742873);
+            pushFollow(FOLLOW_106);
             rule__AnnotationType__Group__7__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__AnnotationType__Group__8_in_rule__AnnotationType__Group__742876);
+            pushFollow(FOLLOW_2);
             rule__AnnotationType__Group__8();
 
             state._fsp--;
@@ -57872,20 +57872,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AnnotationType__Group__7__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21243:1: rule__AnnotationType__Group__7__Impl : ( ( rule__AnnotationType__AttributesAssignment_7 )* ) ;
+    // InternalRoom.g:21246:1: rule__AnnotationType__Group__7__Impl : ( ( rule__AnnotationType__AttributesAssignment_7 )* ) ;
     public final void rule__AnnotationType__Group__7__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21247:1: ( ( ( rule__AnnotationType__AttributesAssignment_7 )* ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21248:1: ( ( rule__AnnotationType__AttributesAssignment_7 )* )
+            // InternalRoom.g:21250:1: ( ( ( rule__AnnotationType__AttributesAssignment_7 )* ) )
+            // InternalRoom.g:21251:1: ( ( rule__AnnotationType__AttributesAssignment_7 )* )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21248:1: ( ( rule__AnnotationType__AttributesAssignment_7 )* )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21249:1: ( rule__AnnotationType__AttributesAssignment_7 )*
+            // InternalRoom.g:21251:1: ( ( rule__AnnotationType__AttributesAssignment_7 )* )
+            // InternalRoom.g:21252:1: ( rule__AnnotationType__AttributesAssignment_7 )*
             {
              before(grammarAccess.getAnnotationTypeAccess().getAttributesAssignment_7()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21250:1: ( rule__AnnotationType__AttributesAssignment_7 )*
+            // InternalRoom.g:21253:1: ( rule__AnnotationType__AttributesAssignment_7 )*
             loop192:
             do {
                 int alt192=2;
@@ -57898,9 +57898,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
                 switch (alt192) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21250:2: rule__AnnotationType__AttributesAssignment_7
+            	    // InternalRoom.g:21253:2: rule__AnnotationType__AttributesAssignment_7
             	    {
-            	    pushFollow(FOLLOW_rule__AnnotationType__AttributesAssignment_7_in_rule__AnnotationType__Group__7__Impl42903);
+            	    pushFollow(FOLLOW_107);
             	    rule__AnnotationType__AttributesAssignment_7();
 
             	    state._fsp--;
@@ -57937,16 +57937,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AnnotationType__Group__8"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21260:1: rule__AnnotationType__Group__8 : rule__AnnotationType__Group__8__Impl ;
+    // InternalRoom.g:21263:1: rule__AnnotationType__Group__8 : rule__AnnotationType__Group__8__Impl ;
     public final void rule__AnnotationType__Group__8() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21264:1: ( rule__AnnotationType__Group__8__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21265:2: rule__AnnotationType__Group__8__Impl
+            // InternalRoom.g:21267:1: ( rule__AnnotationType__Group__8__Impl )
+            // InternalRoom.g:21268:2: rule__AnnotationType__Group__8__Impl
             {
-            pushFollow(FOLLOW_rule__AnnotationType__Group__8__Impl_in_rule__AnnotationType__Group__842934);
+            pushFollow(FOLLOW_2);
             rule__AnnotationType__Group__8__Impl();
 
             state._fsp--;
@@ -57970,20 +57970,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AnnotationType__Group__8__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21271:1: rule__AnnotationType__Group__8__Impl : ( '}' ) ;
+    // InternalRoom.g:21274:1: rule__AnnotationType__Group__8__Impl : ( '}' ) ;
     public final void rule__AnnotationType__Group__8__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21275:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21276:1: ( '}' )
+            // InternalRoom.g:21278:1: ( ( '}' ) )
+            // InternalRoom.g:21279:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21276:1: ( '}' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21277:1: '}'
+            // InternalRoom.g:21279:1: ( '}' )
+            // InternalRoom.g:21280:1: '}'
             {
              before(grammarAccess.getAnnotationTypeAccess().getRightCurlyBracketKeyword_8()); 
-            match(input,42,FOLLOW_42_in_rule__AnnotationType__Group__8__Impl42962); 
+            match(input,42,FOLLOW_2); 
              after(grammarAccess.getAnnotationTypeAccess().getRightCurlyBracketKeyword_8()); 
 
             }
@@ -58007,21 +58007,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AnnotationType__Group_6_1__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21308:1: rule__AnnotationType__Group_6_1__0 : rule__AnnotationType__Group_6_1__0__Impl rule__AnnotationType__Group_6_1__1 ;
+    // InternalRoom.g:21311:1: rule__AnnotationType__Group_6_1__0 : rule__AnnotationType__Group_6_1__0__Impl rule__AnnotationType__Group_6_1__1 ;
     public final void rule__AnnotationType__Group_6_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21312:1: ( rule__AnnotationType__Group_6_1__0__Impl rule__AnnotationType__Group_6_1__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21313:2: rule__AnnotationType__Group_6_1__0__Impl rule__AnnotationType__Group_6_1__1
+            // InternalRoom.g:21315:1: ( rule__AnnotationType__Group_6_1__0__Impl rule__AnnotationType__Group_6_1__1 )
+            // InternalRoom.g:21316:2: rule__AnnotationType__Group_6_1__0__Impl rule__AnnotationType__Group_6_1__1
             {
-            pushFollow(FOLLOW_rule__AnnotationType__Group_6_1__0__Impl_in_rule__AnnotationType__Group_6_1__043011);
+            pushFollow(FOLLOW_108);
             rule__AnnotationType__Group_6_1__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__AnnotationType__Group_6_1__1_in_rule__AnnotationType__Group_6_1__043014);
+            pushFollow(FOLLOW_2);
             rule__AnnotationType__Group_6_1__1();
 
             state._fsp--;
@@ -58045,20 +58045,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AnnotationType__Group_6_1__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21320:1: rule__AnnotationType__Group_6_1__0__Impl : ( '{' ) ;
+    // InternalRoom.g:21323:1: rule__AnnotationType__Group_6_1__0__Impl : ( '{' ) ;
     public final void rule__AnnotationType__Group_6_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21324:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21325:1: ( '{' )
+            // InternalRoom.g:21327:1: ( ( '{' ) )
+            // InternalRoom.g:21328:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21325:1: ( '{' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21326:1: '{'
+            // InternalRoom.g:21328:1: ( '{' )
+            // InternalRoom.g:21329:1: '{'
             {
              before(grammarAccess.getAnnotationTypeAccess().getLeftCurlyBracketKeyword_6_1_0()); 
-            match(input,41,FOLLOW_41_in_rule__AnnotationType__Group_6_1__0__Impl43042); 
+            match(input,41,FOLLOW_2); 
              after(grammarAccess.getAnnotationTypeAccess().getLeftCurlyBracketKeyword_6_1_0()); 
 
             }
@@ -58082,21 +58082,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AnnotationType__Group_6_1__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21339:1: rule__AnnotationType__Group_6_1__1 : rule__AnnotationType__Group_6_1__1__Impl rule__AnnotationType__Group_6_1__2 ;
+    // InternalRoom.g:21342:1: rule__AnnotationType__Group_6_1__1 : rule__AnnotationType__Group_6_1__1__Impl rule__AnnotationType__Group_6_1__2 ;
     public final void rule__AnnotationType__Group_6_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21343:1: ( rule__AnnotationType__Group_6_1__1__Impl rule__AnnotationType__Group_6_1__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21344:2: rule__AnnotationType__Group_6_1__1__Impl rule__AnnotationType__Group_6_1__2
+            // InternalRoom.g:21346:1: ( rule__AnnotationType__Group_6_1__1__Impl rule__AnnotationType__Group_6_1__2 )
+            // InternalRoom.g:21347:2: rule__AnnotationType__Group_6_1__1__Impl rule__AnnotationType__Group_6_1__2
             {
-            pushFollow(FOLLOW_rule__AnnotationType__Group_6_1__1__Impl_in_rule__AnnotationType__Group_6_1__143073);
+            pushFollow(FOLLOW_109);
             rule__AnnotationType__Group_6_1__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__AnnotationType__Group_6_1__2_in_rule__AnnotationType__Group_6_1__143076);
+            pushFollow(FOLLOW_2);
             rule__AnnotationType__Group_6_1__2();
 
             state._fsp--;
@@ -58120,23 +58120,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AnnotationType__Group_6_1__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21351:1: rule__AnnotationType__Group_6_1__1__Impl : ( ( rule__AnnotationType__TargetsAssignment_6_1_1 ) ) ;
+    // InternalRoom.g:21354:1: rule__AnnotationType__Group_6_1__1__Impl : ( ( rule__AnnotationType__TargetsAssignment_6_1_1 ) ) ;
     public final void rule__AnnotationType__Group_6_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21355:1: ( ( ( rule__AnnotationType__TargetsAssignment_6_1_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21356:1: ( ( rule__AnnotationType__TargetsAssignment_6_1_1 ) )
+            // InternalRoom.g:21358:1: ( ( ( rule__AnnotationType__TargetsAssignment_6_1_1 ) ) )
+            // InternalRoom.g:21359:1: ( ( rule__AnnotationType__TargetsAssignment_6_1_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21356:1: ( ( rule__AnnotationType__TargetsAssignment_6_1_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21357:1: ( rule__AnnotationType__TargetsAssignment_6_1_1 )
+            // InternalRoom.g:21359:1: ( ( rule__AnnotationType__TargetsAssignment_6_1_1 ) )
+            // InternalRoom.g:21360:1: ( rule__AnnotationType__TargetsAssignment_6_1_1 )
             {
              before(grammarAccess.getAnnotationTypeAccess().getTargetsAssignment_6_1_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21358:1: ( rule__AnnotationType__TargetsAssignment_6_1_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21358:2: rule__AnnotationType__TargetsAssignment_6_1_1
+            // InternalRoom.g:21361:1: ( rule__AnnotationType__TargetsAssignment_6_1_1 )
+            // InternalRoom.g:21361:2: rule__AnnotationType__TargetsAssignment_6_1_1
             {
-            pushFollow(FOLLOW_rule__AnnotationType__TargetsAssignment_6_1_1_in_rule__AnnotationType__Group_6_1__1__Impl43103);
+            pushFollow(FOLLOW_2);
             rule__AnnotationType__TargetsAssignment_6_1_1();
 
             state._fsp--;
@@ -58167,21 +58167,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AnnotationType__Group_6_1__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21368:1: rule__AnnotationType__Group_6_1__2 : rule__AnnotationType__Group_6_1__2__Impl rule__AnnotationType__Group_6_1__3 ;
+    // InternalRoom.g:21371:1: rule__AnnotationType__Group_6_1__2 : rule__AnnotationType__Group_6_1__2__Impl rule__AnnotationType__Group_6_1__3 ;
     public final void rule__AnnotationType__Group_6_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21372:1: ( rule__AnnotationType__Group_6_1__2__Impl rule__AnnotationType__Group_6_1__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21373:2: rule__AnnotationType__Group_6_1__2__Impl rule__AnnotationType__Group_6_1__3
+            // InternalRoom.g:21375:1: ( rule__AnnotationType__Group_6_1__2__Impl rule__AnnotationType__Group_6_1__3 )
+            // InternalRoom.g:21376:2: rule__AnnotationType__Group_6_1__2__Impl rule__AnnotationType__Group_6_1__3
             {
-            pushFollow(FOLLOW_rule__AnnotationType__Group_6_1__2__Impl_in_rule__AnnotationType__Group_6_1__243133);
+            pushFollow(FOLLOW_109);
             rule__AnnotationType__Group_6_1__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__AnnotationType__Group_6_1__3_in_rule__AnnotationType__Group_6_1__243136);
+            pushFollow(FOLLOW_2);
             rule__AnnotationType__Group_6_1__3();
 
             state._fsp--;
@@ -58205,20 +58205,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AnnotationType__Group_6_1__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21380:1: rule__AnnotationType__Group_6_1__2__Impl : ( ( rule__AnnotationType__Group_6_1_2__0 )* ) ;
+    // InternalRoom.g:21383:1: rule__AnnotationType__Group_6_1__2__Impl : ( ( rule__AnnotationType__Group_6_1_2__0 )* ) ;
     public final void rule__AnnotationType__Group_6_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21384:1: ( ( ( rule__AnnotationType__Group_6_1_2__0 )* ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21385:1: ( ( rule__AnnotationType__Group_6_1_2__0 )* )
+            // InternalRoom.g:21387:1: ( ( ( rule__AnnotationType__Group_6_1_2__0 )* ) )
+            // InternalRoom.g:21388:1: ( ( rule__AnnotationType__Group_6_1_2__0 )* )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21385:1: ( ( rule__AnnotationType__Group_6_1_2__0 )* )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21386:1: ( rule__AnnotationType__Group_6_1_2__0 )*
+            // InternalRoom.g:21388:1: ( ( rule__AnnotationType__Group_6_1_2__0 )* )
+            // InternalRoom.g:21389:1: ( rule__AnnotationType__Group_6_1_2__0 )*
             {
              before(grammarAccess.getAnnotationTypeAccess().getGroup_6_1_2()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21387:1: ( rule__AnnotationType__Group_6_1_2__0 )*
+            // InternalRoom.g:21390:1: ( rule__AnnotationType__Group_6_1_2__0 )*
             loop193:
             do {
                 int alt193=2;
@@ -58231,9 +58231,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
                 switch (alt193) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21387:2: rule__AnnotationType__Group_6_1_2__0
+            	    // InternalRoom.g:21390:2: rule__AnnotationType__Group_6_1_2__0
             	    {
-            	    pushFollow(FOLLOW_rule__AnnotationType__Group_6_1_2__0_in_rule__AnnotationType__Group_6_1__2__Impl43163);
+            	    pushFollow(FOLLOW_19);
             	    rule__AnnotationType__Group_6_1_2__0();
 
             	    state._fsp--;
@@ -58270,16 +58270,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AnnotationType__Group_6_1__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21397:1: rule__AnnotationType__Group_6_1__3 : rule__AnnotationType__Group_6_1__3__Impl ;
+    // InternalRoom.g:21400:1: rule__AnnotationType__Group_6_1__3 : rule__AnnotationType__Group_6_1__3__Impl ;
     public final void rule__AnnotationType__Group_6_1__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21401:1: ( rule__AnnotationType__Group_6_1__3__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21402:2: rule__AnnotationType__Group_6_1__3__Impl
+            // InternalRoom.g:21404:1: ( rule__AnnotationType__Group_6_1__3__Impl )
+            // InternalRoom.g:21405:2: rule__AnnotationType__Group_6_1__3__Impl
             {
-            pushFollow(FOLLOW_rule__AnnotationType__Group_6_1__3__Impl_in_rule__AnnotationType__Group_6_1__343194);
+            pushFollow(FOLLOW_2);
             rule__AnnotationType__Group_6_1__3__Impl();
 
             state._fsp--;
@@ -58303,20 +58303,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AnnotationType__Group_6_1__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21408:1: rule__AnnotationType__Group_6_1__3__Impl : ( '}' ) ;
+    // InternalRoom.g:21411:1: rule__AnnotationType__Group_6_1__3__Impl : ( '}' ) ;
     public final void rule__AnnotationType__Group_6_1__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21412:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21413:1: ( '}' )
+            // InternalRoom.g:21415:1: ( ( '}' ) )
+            // InternalRoom.g:21416:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21413:1: ( '}' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21414:1: '}'
+            // InternalRoom.g:21416:1: ( '}' )
+            // InternalRoom.g:21417:1: '}'
             {
              before(grammarAccess.getAnnotationTypeAccess().getRightCurlyBracketKeyword_6_1_3()); 
-            match(input,42,FOLLOW_42_in_rule__AnnotationType__Group_6_1__3__Impl43222); 
+            match(input,42,FOLLOW_2); 
              after(grammarAccess.getAnnotationTypeAccess().getRightCurlyBracketKeyword_6_1_3()); 
 
             }
@@ -58340,21 +58340,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AnnotationType__Group_6_1_2__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21435:1: rule__AnnotationType__Group_6_1_2__0 : rule__AnnotationType__Group_6_1_2__0__Impl rule__AnnotationType__Group_6_1_2__1 ;
+    // InternalRoom.g:21438:1: rule__AnnotationType__Group_6_1_2__0 : rule__AnnotationType__Group_6_1_2__0__Impl rule__AnnotationType__Group_6_1_2__1 ;
     public final void rule__AnnotationType__Group_6_1_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21439:1: ( rule__AnnotationType__Group_6_1_2__0__Impl rule__AnnotationType__Group_6_1_2__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21440:2: rule__AnnotationType__Group_6_1_2__0__Impl rule__AnnotationType__Group_6_1_2__1
+            // InternalRoom.g:21442:1: ( rule__AnnotationType__Group_6_1_2__0__Impl rule__AnnotationType__Group_6_1_2__1 )
+            // InternalRoom.g:21443:2: rule__AnnotationType__Group_6_1_2__0__Impl rule__AnnotationType__Group_6_1_2__1
             {
-            pushFollow(FOLLOW_rule__AnnotationType__Group_6_1_2__0__Impl_in_rule__AnnotationType__Group_6_1_2__043261);
+            pushFollow(FOLLOW_108);
             rule__AnnotationType__Group_6_1_2__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__AnnotationType__Group_6_1_2__1_in_rule__AnnotationType__Group_6_1_2__043264);
+            pushFollow(FOLLOW_2);
             rule__AnnotationType__Group_6_1_2__1();
 
             state._fsp--;
@@ -58378,20 +58378,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AnnotationType__Group_6_1_2__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21447:1: rule__AnnotationType__Group_6_1_2__0__Impl : ( ',' ) ;
+    // InternalRoom.g:21450:1: rule__AnnotationType__Group_6_1_2__0__Impl : ( ',' ) ;
     public final void rule__AnnotationType__Group_6_1_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21451:1: ( ( ',' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21452:1: ( ',' )
+            // InternalRoom.g:21454:1: ( ( ',' ) )
+            // InternalRoom.g:21455:1: ( ',' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21452:1: ( ',' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21453:1: ','
+            // InternalRoom.g:21455:1: ( ',' )
+            // InternalRoom.g:21456:1: ','
             {
              before(grammarAccess.getAnnotationTypeAccess().getCommaKeyword_6_1_2_0()); 
-            match(input,51,FOLLOW_51_in_rule__AnnotationType__Group_6_1_2__0__Impl43292); 
+            match(input,51,FOLLOW_2); 
              after(grammarAccess.getAnnotationTypeAccess().getCommaKeyword_6_1_2_0()); 
 
             }
@@ -58415,16 +58415,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AnnotationType__Group_6_1_2__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21466:1: rule__AnnotationType__Group_6_1_2__1 : rule__AnnotationType__Group_6_1_2__1__Impl ;
+    // InternalRoom.g:21469:1: rule__AnnotationType__Group_6_1_2__1 : rule__AnnotationType__Group_6_1_2__1__Impl ;
     public final void rule__AnnotationType__Group_6_1_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21470:1: ( rule__AnnotationType__Group_6_1_2__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21471:2: rule__AnnotationType__Group_6_1_2__1__Impl
+            // InternalRoom.g:21473:1: ( rule__AnnotationType__Group_6_1_2__1__Impl )
+            // InternalRoom.g:21474:2: rule__AnnotationType__Group_6_1_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__AnnotationType__Group_6_1_2__1__Impl_in_rule__AnnotationType__Group_6_1_2__143323);
+            pushFollow(FOLLOW_2);
             rule__AnnotationType__Group_6_1_2__1__Impl();
 
             state._fsp--;
@@ -58448,23 +58448,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AnnotationType__Group_6_1_2__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21477:1: rule__AnnotationType__Group_6_1_2__1__Impl : ( ( rule__AnnotationType__TargetsAssignment_6_1_2_1 ) ) ;
+    // InternalRoom.g:21480:1: rule__AnnotationType__Group_6_1_2__1__Impl : ( ( rule__AnnotationType__TargetsAssignment_6_1_2_1 ) ) ;
     public final void rule__AnnotationType__Group_6_1_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21481:1: ( ( ( rule__AnnotationType__TargetsAssignment_6_1_2_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21482:1: ( ( rule__AnnotationType__TargetsAssignment_6_1_2_1 ) )
+            // InternalRoom.g:21484:1: ( ( ( rule__AnnotationType__TargetsAssignment_6_1_2_1 ) ) )
+            // InternalRoom.g:21485:1: ( ( rule__AnnotationType__TargetsAssignment_6_1_2_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21482:1: ( ( rule__AnnotationType__TargetsAssignment_6_1_2_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21483:1: ( rule__AnnotationType__TargetsAssignment_6_1_2_1 )
+            // InternalRoom.g:21485:1: ( ( rule__AnnotationType__TargetsAssignment_6_1_2_1 ) )
+            // InternalRoom.g:21486:1: ( rule__AnnotationType__TargetsAssignment_6_1_2_1 )
             {
              before(grammarAccess.getAnnotationTypeAccess().getTargetsAssignment_6_1_2_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21484:1: ( rule__AnnotationType__TargetsAssignment_6_1_2_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21484:2: rule__AnnotationType__TargetsAssignment_6_1_2_1
+            // InternalRoom.g:21487:1: ( rule__AnnotationType__TargetsAssignment_6_1_2_1 )
+            // InternalRoom.g:21487:2: rule__AnnotationType__TargetsAssignment_6_1_2_1
             {
-            pushFollow(FOLLOW_rule__AnnotationType__TargetsAssignment_6_1_2_1_in_rule__AnnotationType__Group_6_1_2__1__Impl43350);
+            pushFollow(FOLLOW_2);
             rule__AnnotationType__TargetsAssignment_6_1_2_1();
 
             state._fsp--;
@@ -58495,21 +58495,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21498:1: rule__SimpleAnnotationAttribute__Group__0 : rule__SimpleAnnotationAttribute__Group__0__Impl rule__SimpleAnnotationAttribute__Group__1 ;
+    // InternalRoom.g:21501:1: rule__SimpleAnnotationAttribute__Group__0 : rule__SimpleAnnotationAttribute__Group__0__Impl rule__SimpleAnnotationAttribute__Group__1 ;
     public final void rule__SimpleAnnotationAttribute__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21502:1: ( rule__SimpleAnnotationAttribute__Group__0__Impl rule__SimpleAnnotationAttribute__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21503:2: rule__SimpleAnnotationAttribute__Group__0__Impl rule__SimpleAnnotationAttribute__Group__1
+            // InternalRoom.g:21505:1: ( rule__SimpleAnnotationAttribute__Group__0__Impl rule__SimpleAnnotationAttribute__Group__1 )
+            // InternalRoom.g:21506:2: rule__SimpleAnnotationAttribute__Group__0__Impl rule__SimpleAnnotationAttribute__Group__1
             {
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__0__Impl_in_rule__SimpleAnnotationAttribute__Group__043384);
+            pushFollow(FOLLOW_110);
             rule__SimpleAnnotationAttribute__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__1_in_rule__SimpleAnnotationAttribute__Group__043387);
+            pushFollow(FOLLOW_2);
             rule__SimpleAnnotationAttribute__Group__1();
 
             state._fsp--;
@@ -58533,23 +58533,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21510:1: rule__SimpleAnnotationAttribute__Group__0__Impl : ( ( rule__SimpleAnnotationAttribute__Alternatives_0 ) ) ;
+    // InternalRoom.g:21513:1: rule__SimpleAnnotationAttribute__Group__0__Impl : ( ( rule__SimpleAnnotationAttribute__Alternatives_0 ) ) ;
     public final void rule__SimpleAnnotationAttribute__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21514:1: ( ( ( rule__SimpleAnnotationAttribute__Alternatives_0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21515:1: ( ( rule__SimpleAnnotationAttribute__Alternatives_0 ) )
+            // InternalRoom.g:21517:1: ( ( ( rule__SimpleAnnotationAttribute__Alternatives_0 ) ) )
+            // InternalRoom.g:21518:1: ( ( rule__SimpleAnnotationAttribute__Alternatives_0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21515:1: ( ( rule__SimpleAnnotationAttribute__Alternatives_0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21516:1: ( rule__SimpleAnnotationAttribute__Alternatives_0 )
+            // InternalRoom.g:21518:1: ( ( rule__SimpleAnnotationAttribute__Alternatives_0 ) )
+            // InternalRoom.g:21519:1: ( rule__SimpleAnnotationAttribute__Alternatives_0 )
             {
              before(grammarAccess.getSimpleAnnotationAttributeAccess().getAlternatives_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21517:1: ( rule__SimpleAnnotationAttribute__Alternatives_0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21517:2: rule__SimpleAnnotationAttribute__Alternatives_0
+            // InternalRoom.g:21520:1: ( rule__SimpleAnnotationAttribute__Alternatives_0 )
+            // InternalRoom.g:21520:2: rule__SimpleAnnotationAttribute__Alternatives_0
             {
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Alternatives_0_in_rule__SimpleAnnotationAttribute__Group__0__Impl43414);
+            pushFollow(FOLLOW_2);
             rule__SimpleAnnotationAttribute__Alternatives_0();
 
             state._fsp--;
@@ -58580,21 +58580,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21527:1: rule__SimpleAnnotationAttribute__Group__1 : rule__SimpleAnnotationAttribute__Group__1__Impl rule__SimpleAnnotationAttribute__Group__2 ;
+    // InternalRoom.g:21530:1: rule__SimpleAnnotationAttribute__Group__1 : rule__SimpleAnnotationAttribute__Group__1__Impl rule__SimpleAnnotationAttribute__Group__2 ;
     public final void rule__SimpleAnnotationAttribute__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21531:1: ( rule__SimpleAnnotationAttribute__Group__1__Impl rule__SimpleAnnotationAttribute__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21532:2: rule__SimpleAnnotationAttribute__Group__1__Impl rule__SimpleAnnotationAttribute__Group__2
+            // InternalRoom.g:21534:1: ( rule__SimpleAnnotationAttribute__Group__1__Impl rule__SimpleAnnotationAttribute__Group__2 )
+            // InternalRoom.g:21535:2: rule__SimpleAnnotationAttribute__Group__1__Impl rule__SimpleAnnotationAttribute__Group__2
             {
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__1__Impl_in_rule__SimpleAnnotationAttribute__Group__143444);
+            pushFollow(FOLLOW_3);
             rule__SimpleAnnotationAttribute__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__2_in_rule__SimpleAnnotationAttribute__Group__143447);
+            pushFollow(FOLLOW_2);
             rule__SimpleAnnotationAttribute__Group__2();
 
             state._fsp--;
@@ -58618,20 +58618,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21539:1: rule__SimpleAnnotationAttribute__Group__1__Impl : ( 'attribute' ) ;
+    // InternalRoom.g:21542:1: rule__SimpleAnnotationAttribute__Group__1__Impl : ( 'attribute' ) ;
     public final void rule__SimpleAnnotationAttribute__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21543:1: ( ( 'attribute' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21544:1: ( 'attribute' )
+            // InternalRoom.g:21546:1: ( ( 'attribute' ) )
+            // InternalRoom.g:21547:1: ( 'attribute' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21544:1: ( 'attribute' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21545:1: 'attribute'
+            // InternalRoom.g:21547:1: ( 'attribute' )
+            // InternalRoom.g:21548:1: 'attribute'
             {
              before(grammarAccess.getSimpleAnnotationAttributeAccess().getAttributeKeyword_1()); 
-            match(input,123,FOLLOW_123_in_rule__SimpleAnnotationAttribute__Group__1__Impl43475); 
+            match(input,123,FOLLOW_2); 
              after(grammarAccess.getSimpleAnnotationAttributeAccess().getAttributeKeyword_1()); 
 
             }
@@ -58655,21 +58655,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21558:1: rule__SimpleAnnotationAttribute__Group__2 : rule__SimpleAnnotationAttribute__Group__2__Impl rule__SimpleAnnotationAttribute__Group__3 ;
+    // InternalRoom.g:21561:1: rule__SimpleAnnotationAttribute__Group__2 : rule__SimpleAnnotationAttribute__Group__2__Impl rule__SimpleAnnotationAttribute__Group__3 ;
     public final void rule__SimpleAnnotationAttribute__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21562:1: ( rule__SimpleAnnotationAttribute__Group__2__Impl rule__SimpleAnnotationAttribute__Group__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21563:2: rule__SimpleAnnotationAttribute__Group__2__Impl rule__SimpleAnnotationAttribute__Group__3
+            // InternalRoom.g:21565:1: ( rule__SimpleAnnotationAttribute__Group__2__Impl rule__SimpleAnnotationAttribute__Group__3 )
+            // InternalRoom.g:21566:2: rule__SimpleAnnotationAttribute__Group__2__Impl rule__SimpleAnnotationAttribute__Group__3
             {
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__2__Impl_in_rule__SimpleAnnotationAttribute__Group__243506);
+            pushFollow(FOLLOW_8);
             rule__SimpleAnnotationAttribute__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__3_in_rule__SimpleAnnotationAttribute__Group__243509);
+            pushFollow(FOLLOW_2);
             rule__SimpleAnnotationAttribute__Group__3();
 
             state._fsp--;
@@ -58693,23 +58693,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21570:1: rule__SimpleAnnotationAttribute__Group__2__Impl : ( ( rule__SimpleAnnotationAttribute__NameAssignment_2 ) ) ;
+    // InternalRoom.g:21573:1: rule__SimpleAnnotationAttribute__Group__2__Impl : ( ( rule__SimpleAnnotationAttribute__NameAssignment_2 ) ) ;
     public final void rule__SimpleAnnotationAttribute__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21574:1: ( ( ( rule__SimpleAnnotationAttribute__NameAssignment_2 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21575:1: ( ( rule__SimpleAnnotationAttribute__NameAssignment_2 ) )
+            // InternalRoom.g:21577:1: ( ( ( rule__SimpleAnnotationAttribute__NameAssignment_2 ) ) )
+            // InternalRoom.g:21578:1: ( ( rule__SimpleAnnotationAttribute__NameAssignment_2 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21575:1: ( ( rule__SimpleAnnotationAttribute__NameAssignment_2 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21576:1: ( rule__SimpleAnnotationAttribute__NameAssignment_2 )
+            // InternalRoom.g:21578:1: ( ( rule__SimpleAnnotationAttribute__NameAssignment_2 ) )
+            // InternalRoom.g:21579:1: ( rule__SimpleAnnotationAttribute__NameAssignment_2 )
             {
              before(grammarAccess.getSimpleAnnotationAttributeAccess().getNameAssignment_2()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21577:1: ( rule__SimpleAnnotationAttribute__NameAssignment_2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21577:2: rule__SimpleAnnotationAttribute__NameAssignment_2
+            // InternalRoom.g:21580:1: ( rule__SimpleAnnotationAttribute__NameAssignment_2 )
+            // InternalRoom.g:21580:2: rule__SimpleAnnotationAttribute__NameAssignment_2
             {
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__NameAssignment_2_in_rule__SimpleAnnotationAttribute__Group__2__Impl43536);
+            pushFollow(FOLLOW_2);
             rule__SimpleAnnotationAttribute__NameAssignment_2();
 
             state._fsp--;
@@ -58740,21 +58740,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21587:1: rule__SimpleAnnotationAttribute__Group__3 : rule__SimpleAnnotationAttribute__Group__3__Impl rule__SimpleAnnotationAttribute__Group__4 ;
+    // InternalRoom.g:21590:1: rule__SimpleAnnotationAttribute__Group__3 : rule__SimpleAnnotationAttribute__Group__3__Impl rule__SimpleAnnotationAttribute__Group__4 ;
     public final void rule__SimpleAnnotationAttribute__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21591:1: ( rule__SimpleAnnotationAttribute__Group__3__Impl rule__SimpleAnnotationAttribute__Group__4 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21592:2: rule__SimpleAnnotationAttribute__Group__3__Impl rule__SimpleAnnotationAttribute__Group__4
+            // InternalRoom.g:21594:1: ( rule__SimpleAnnotationAttribute__Group__3__Impl rule__SimpleAnnotationAttribute__Group__4 )
+            // InternalRoom.g:21595:2: rule__SimpleAnnotationAttribute__Group__3__Impl rule__SimpleAnnotationAttribute__Group__4
             {
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__3__Impl_in_rule__SimpleAnnotationAttribute__Group__343566);
+            pushFollow(FOLLOW_10);
             rule__SimpleAnnotationAttribute__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__4_in_rule__SimpleAnnotationAttribute__Group__343569);
+            pushFollow(FOLLOW_2);
             rule__SimpleAnnotationAttribute__Group__4();
 
             state._fsp--;
@@ -58778,20 +58778,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21599:1: rule__SimpleAnnotationAttribute__Group__3__Impl : ( ':' ) ;
+    // InternalRoom.g:21602:1: rule__SimpleAnnotationAttribute__Group__3__Impl : ( ':' ) ;
     public final void rule__SimpleAnnotationAttribute__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21603:1: ( ( ':' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21604:1: ( ':' )
+            // InternalRoom.g:21606:1: ( ( ':' ) )
+            // InternalRoom.g:21607:1: ( ':' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21604:1: ( ':' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21605:1: ':'
+            // InternalRoom.g:21607:1: ( ':' )
+            // InternalRoom.g:21608:1: ':'
             {
              before(grammarAccess.getSimpleAnnotationAttributeAccess().getColonKeyword_3()); 
-            match(input,43,FOLLOW_43_in_rule__SimpleAnnotationAttribute__Group__3__Impl43597); 
+            match(input,43,FOLLOW_2); 
              after(grammarAccess.getSimpleAnnotationAttributeAccess().getColonKeyword_3()); 
 
             }
@@ -58815,16 +58815,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__4"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21618:1: rule__SimpleAnnotationAttribute__Group__4 : rule__SimpleAnnotationAttribute__Group__4__Impl ;
+    // InternalRoom.g:21621:1: rule__SimpleAnnotationAttribute__Group__4 : rule__SimpleAnnotationAttribute__Group__4__Impl ;
     public final void rule__SimpleAnnotationAttribute__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21622:1: ( rule__SimpleAnnotationAttribute__Group__4__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21623:2: rule__SimpleAnnotationAttribute__Group__4__Impl
+            // InternalRoom.g:21625:1: ( rule__SimpleAnnotationAttribute__Group__4__Impl )
+            // InternalRoom.g:21626:2: rule__SimpleAnnotationAttribute__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__Group__4__Impl_in_rule__SimpleAnnotationAttribute__Group__443628);
+            pushFollow(FOLLOW_2);
             rule__SimpleAnnotationAttribute__Group__4__Impl();
 
             state._fsp--;
@@ -58848,23 +58848,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__Group__4__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21629:1: rule__SimpleAnnotationAttribute__Group__4__Impl : ( ( rule__SimpleAnnotationAttribute__TypeAssignment_4 ) ) ;
+    // InternalRoom.g:21632:1: rule__SimpleAnnotationAttribute__Group__4__Impl : ( ( rule__SimpleAnnotationAttribute__TypeAssignment_4 ) ) ;
     public final void rule__SimpleAnnotationAttribute__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21633:1: ( ( ( rule__SimpleAnnotationAttribute__TypeAssignment_4 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21634:1: ( ( rule__SimpleAnnotationAttribute__TypeAssignment_4 ) )
+            // InternalRoom.g:21636:1: ( ( ( rule__SimpleAnnotationAttribute__TypeAssignment_4 ) ) )
+            // InternalRoom.g:21637:1: ( ( rule__SimpleAnnotationAttribute__TypeAssignment_4 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21634:1: ( ( rule__SimpleAnnotationAttribute__TypeAssignment_4 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21635:1: ( rule__SimpleAnnotationAttribute__TypeAssignment_4 )
+            // InternalRoom.g:21637:1: ( ( rule__SimpleAnnotationAttribute__TypeAssignment_4 ) )
+            // InternalRoom.g:21638:1: ( rule__SimpleAnnotationAttribute__TypeAssignment_4 )
             {
              before(grammarAccess.getSimpleAnnotationAttributeAccess().getTypeAssignment_4()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21636:1: ( rule__SimpleAnnotationAttribute__TypeAssignment_4 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21636:2: rule__SimpleAnnotationAttribute__TypeAssignment_4
+            // InternalRoom.g:21639:1: ( rule__SimpleAnnotationAttribute__TypeAssignment_4 )
+            // InternalRoom.g:21639:2: rule__SimpleAnnotationAttribute__TypeAssignment_4
             {
-            pushFollow(FOLLOW_rule__SimpleAnnotationAttribute__TypeAssignment_4_in_rule__SimpleAnnotationAttribute__Group__4__Impl43655);
+            pushFollow(FOLLOW_2);
             rule__SimpleAnnotationAttribute__TypeAssignment_4();
 
             state._fsp--;
@@ -58895,21 +58895,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21656:1: rule__EnumAnnotationAttribute__Group__0 : rule__EnumAnnotationAttribute__Group__0__Impl rule__EnumAnnotationAttribute__Group__1 ;
+    // InternalRoom.g:21659:1: rule__EnumAnnotationAttribute__Group__0 : rule__EnumAnnotationAttribute__Group__0__Impl rule__EnumAnnotationAttribute__Group__1 ;
     public final void rule__EnumAnnotationAttribute__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21660:1: ( rule__EnumAnnotationAttribute__Group__0__Impl rule__EnumAnnotationAttribute__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21661:2: rule__EnumAnnotationAttribute__Group__0__Impl rule__EnumAnnotationAttribute__Group__1
+            // InternalRoom.g:21663:1: ( rule__EnumAnnotationAttribute__Group__0__Impl rule__EnumAnnotationAttribute__Group__1 )
+            // InternalRoom.g:21664:2: rule__EnumAnnotationAttribute__Group__0__Impl rule__EnumAnnotationAttribute__Group__1
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__0__Impl_in_rule__EnumAnnotationAttribute__Group__043695);
+            pushFollow(FOLLOW_110);
             rule__EnumAnnotationAttribute__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__1_in_rule__EnumAnnotationAttribute__Group__043698);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group__1();
 
             state._fsp--;
@@ -58933,23 +58933,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21668:1: rule__EnumAnnotationAttribute__Group__0__Impl : ( ( rule__EnumAnnotationAttribute__Alternatives_0 ) ) ;
+    // InternalRoom.g:21671:1: rule__EnumAnnotationAttribute__Group__0__Impl : ( ( rule__EnumAnnotationAttribute__Alternatives_0 ) ) ;
     public final void rule__EnumAnnotationAttribute__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21672:1: ( ( ( rule__EnumAnnotationAttribute__Alternatives_0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21673:1: ( ( rule__EnumAnnotationAttribute__Alternatives_0 ) )
+            // InternalRoom.g:21675:1: ( ( ( rule__EnumAnnotationAttribute__Alternatives_0 ) ) )
+            // InternalRoom.g:21676:1: ( ( rule__EnumAnnotationAttribute__Alternatives_0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21673:1: ( ( rule__EnumAnnotationAttribute__Alternatives_0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21674:1: ( rule__EnumAnnotationAttribute__Alternatives_0 )
+            // InternalRoom.g:21676:1: ( ( rule__EnumAnnotationAttribute__Alternatives_0 ) )
+            // InternalRoom.g:21677:1: ( rule__EnumAnnotationAttribute__Alternatives_0 )
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getAlternatives_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21675:1: ( rule__EnumAnnotationAttribute__Alternatives_0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21675:2: rule__EnumAnnotationAttribute__Alternatives_0
+            // InternalRoom.g:21678:1: ( rule__EnumAnnotationAttribute__Alternatives_0 )
+            // InternalRoom.g:21678:2: rule__EnumAnnotationAttribute__Alternatives_0
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Alternatives_0_in_rule__EnumAnnotationAttribute__Group__0__Impl43725);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Alternatives_0();
 
             state._fsp--;
@@ -58980,21 +58980,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21685:1: rule__EnumAnnotationAttribute__Group__1 : rule__EnumAnnotationAttribute__Group__1__Impl rule__EnumAnnotationAttribute__Group__2 ;
+    // InternalRoom.g:21688:1: rule__EnumAnnotationAttribute__Group__1 : rule__EnumAnnotationAttribute__Group__1__Impl rule__EnumAnnotationAttribute__Group__2 ;
     public final void rule__EnumAnnotationAttribute__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21689:1: ( rule__EnumAnnotationAttribute__Group__1__Impl rule__EnumAnnotationAttribute__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21690:2: rule__EnumAnnotationAttribute__Group__1__Impl rule__EnumAnnotationAttribute__Group__2
+            // InternalRoom.g:21692:1: ( rule__EnumAnnotationAttribute__Group__1__Impl rule__EnumAnnotationAttribute__Group__2 )
+            // InternalRoom.g:21693:2: rule__EnumAnnotationAttribute__Group__1__Impl rule__EnumAnnotationAttribute__Group__2
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__1__Impl_in_rule__EnumAnnotationAttribute__Group__143755);
+            pushFollow(FOLLOW_3);
             rule__EnumAnnotationAttribute__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__2_in_rule__EnumAnnotationAttribute__Group__143758);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group__2();
 
             state._fsp--;
@@ -59018,20 +59018,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21697:1: rule__EnumAnnotationAttribute__Group__1__Impl : ( 'attribute' ) ;
+    // InternalRoom.g:21700:1: rule__EnumAnnotationAttribute__Group__1__Impl : ( 'attribute' ) ;
     public final void rule__EnumAnnotationAttribute__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21701:1: ( ( 'attribute' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21702:1: ( 'attribute' )
+            // InternalRoom.g:21704:1: ( ( 'attribute' ) )
+            // InternalRoom.g:21705:1: ( 'attribute' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21702:1: ( 'attribute' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21703:1: 'attribute'
+            // InternalRoom.g:21705:1: ( 'attribute' )
+            // InternalRoom.g:21706:1: 'attribute'
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getAttributeKeyword_1()); 
-            match(input,123,FOLLOW_123_in_rule__EnumAnnotationAttribute__Group__1__Impl43786); 
+            match(input,123,FOLLOW_2); 
              after(grammarAccess.getEnumAnnotationAttributeAccess().getAttributeKeyword_1()); 
 
             }
@@ -59055,21 +59055,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21716:1: rule__EnumAnnotationAttribute__Group__2 : rule__EnumAnnotationAttribute__Group__2__Impl rule__EnumAnnotationAttribute__Group__3 ;
+    // InternalRoom.g:21719:1: rule__EnumAnnotationAttribute__Group__2 : rule__EnumAnnotationAttribute__Group__2__Impl rule__EnumAnnotationAttribute__Group__3 ;
     public final void rule__EnumAnnotationAttribute__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21720:1: ( rule__EnumAnnotationAttribute__Group__2__Impl rule__EnumAnnotationAttribute__Group__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21721:2: rule__EnumAnnotationAttribute__Group__2__Impl rule__EnumAnnotationAttribute__Group__3
+            // InternalRoom.g:21723:1: ( rule__EnumAnnotationAttribute__Group__2__Impl rule__EnumAnnotationAttribute__Group__3 )
+            // InternalRoom.g:21724:2: rule__EnumAnnotationAttribute__Group__2__Impl rule__EnumAnnotationAttribute__Group__3
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__2__Impl_in_rule__EnumAnnotationAttribute__Group__243817);
+            pushFollow(FOLLOW_8);
             rule__EnumAnnotationAttribute__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__3_in_rule__EnumAnnotationAttribute__Group__243820);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group__3();
 
             state._fsp--;
@@ -59093,23 +59093,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21728:1: rule__EnumAnnotationAttribute__Group__2__Impl : ( ( rule__EnumAnnotationAttribute__NameAssignment_2 ) ) ;
+    // InternalRoom.g:21731:1: rule__EnumAnnotationAttribute__Group__2__Impl : ( ( rule__EnumAnnotationAttribute__NameAssignment_2 ) ) ;
     public final void rule__EnumAnnotationAttribute__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21732:1: ( ( ( rule__EnumAnnotationAttribute__NameAssignment_2 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21733:1: ( ( rule__EnumAnnotationAttribute__NameAssignment_2 ) )
+            // InternalRoom.g:21735:1: ( ( ( rule__EnumAnnotationAttribute__NameAssignment_2 ) ) )
+            // InternalRoom.g:21736:1: ( ( rule__EnumAnnotationAttribute__NameAssignment_2 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21733:1: ( ( rule__EnumAnnotationAttribute__NameAssignment_2 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21734:1: ( rule__EnumAnnotationAttribute__NameAssignment_2 )
+            // InternalRoom.g:21736:1: ( ( rule__EnumAnnotationAttribute__NameAssignment_2 ) )
+            // InternalRoom.g:21737:1: ( rule__EnumAnnotationAttribute__NameAssignment_2 )
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getNameAssignment_2()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21735:1: ( rule__EnumAnnotationAttribute__NameAssignment_2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21735:2: rule__EnumAnnotationAttribute__NameAssignment_2
+            // InternalRoom.g:21738:1: ( rule__EnumAnnotationAttribute__NameAssignment_2 )
+            // InternalRoom.g:21738:2: rule__EnumAnnotationAttribute__NameAssignment_2
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__NameAssignment_2_in_rule__EnumAnnotationAttribute__Group__2__Impl43847);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__NameAssignment_2();
 
             state._fsp--;
@@ -59140,21 +59140,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21745:1: rule__EnumAnnotationAttribute__Group__3 : rule__EnumAnnotationAttribute__Group__3__Impl rule__EnumAnnotationAttribute__Group__4 ;
+    // InternalRoom.g:21748:1: rule__EnumAnnotationAttribute__Group__3 : rule__EnumAnnotationAttribute__Group__3__Impl rule__EnumAnnotationAttribute__Group__4 ;
     public final void rule__EnumAnnotationAttribute__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21749:1: ( rule__EnumAnnotationAttribute__Group__3__Impl rule__EnumAnnotationAttribute__Group__4 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21750:2: rule__EnumAnnotationAttribute__Group__3__Impl rule__EnumAnnotationAttribute__Group__4
+            // InternalRoom.g:21752:1: ( rule__EnumAnnotationAttribute__Group__3__Impl rule__EnumAnnotationAttribute__Group__4 )
+            // InternalRoom.g:21753:2: rule__EnumAnnotationAttribute__Group__3__Impl rule__EnumAnnotationAttribute__Group__4
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__3__Impl_in_rule__EnumAnnotationAttribute__Group__343877);
+            pushFollow(FOLLOW_27);
             rule__EnumAnnotationAttribute__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__4_in_rule__EnumAnnotationAttribute__Group__343880);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group__4();
 
             state._fsp--;
@@ -59178,20 +59178,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21757:1: rule__EnumAnnotationAttribute__Group__3__Impl : ( ':' ) ;
+    // InternalRoom.g:21760:1: rule__EnumAnnotationAttribute__Group__3__Impl : ( ':' ) ;
     public final void rule__EnumAnnotationAttribute__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21761:1: ( ( ':' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21762:1: ( ':' )
+            // InternalRoom.g:21764:1: ( ( ':' ) )
+            // InternalRoom.g:21765:1: ( ':' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21762:1: ( ':' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21763:1: ':'
+            // InternalRoom.g:21765:1: ( ':' )
+            // InternalRoom.g:21766:1: ':'
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getColonKeyword_3()); 
-            match(input,43,FOLLOW_43_in_rule__EnumAnnotationAttribute__Group__3__Impl43908); 
+            match(input,43,FOLLOW_2); 
              after(grammarAccess.getEnumAnnotationAttributeAccess().getColonKeyword_3()); 
 
             }
@@ -59215,21 +59215,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__4"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21776:1: rule__EnumAnnotationAttribute__Group__4 : rule__EnumAnnotationAttribute__Group__4__Impl rule__EnumAnnotationAttribute__Group__5 ;
+    // InternalRoom.g:21779:1: rule__EnumAnnotationAttribute__Group__4 : rule__EnumAnnotationAttribute__Group__4__Impl rule__EnumAnnotationAttribute__Group__5 ;
     public final void rule__EnumAnnotationAttribute__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21780:1: ( rule__EnumAnnotationAttribute__Group__4__Impl rule__EnumAnnotationAttribute__Group__5 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21781:2: rule__EnumAnnotationAttribute__Group__4__Impl rule__EnumAnnotationAttribute__Group__5
+            // InternalRoom.g:21783:1: ( rule__EnumAnnotationAttribute__Group__4__Impl rule__EnumAnnotationAttribute__Group__5 )
+            // InternalRoom.g:21784:2: rule__EnumAnnotationAttribute__Group__4__Impl rule__EnumAnnotationAttribute__Group__5
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__4__Impl_in_rule__EnumAnnotationAttribute__Group__443939);
+            pushFollow(FOLLOW_12);
             rule__EnumAnnotationAttribute__Group__4__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__5_in_rule__EnumAnnotationAttribute__Group__443942);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group__5();
 
             state._fsp--;
@@ -59253,20 +59253,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__4__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21788:1: rule__EnumAnnotationAttribute__Group__4__Impl : ( '{' ) ;
+    // InternalRoom.g:21791:1: rule__EnumAnnotationAttribute__Group__4__Impl : ( '{' ) ;
     public final void rule__EnumAnnotationAttribute__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21792:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21793:1: ( '{' )
+            // InternalRoom.g:21795:1: ( ( '{' ) )
+            // InternalRoom.g:21796:1: ( '{' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21793:1: ( '{' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21794:1: '{'
+            // InternalRoom.g:21796:1: ( '{' )
+            // InternalRoom.g:21797:1: '{'
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getLeftCurlyBracketKeyword_4()); 
-            match(input,41,FOLLOW_41_in_rule__EnumAnnotationAttribute__Group__4__Impl43970); 
+            match(input,41,FOLLOW_2); 
              after(grammarAccess.getEnumAnnotationAttributeAccess().getLeftCurlyBracketKeyword_4()); 
 
             }
@@ -59290,21 +59290,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__5"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21807:1: rule__EnumAnnotationAttribute__Group__5 : rule__EnumAnnotationAttribute__Group__5__Impl rule__EnumAnnotationAttribute__Group__6 ;
+    // InternalRoom.g:21810:1: rule__EnumAnnotationAttribute__Group__5 : rule__EnumAnnotationAttribute__Group__5__Impl rule__EnumAnnotationAttribute__Group__6 ;
     public final void rule__EnumAnnotationAttribute__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21811:1: ( rule__EnumAnnotationAttribute__Group__5__Impl rule__EnumAnnotationAttribute__Group__6 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21812:2: rule__EnumAnnotationAttribute__Group__5__Impl rule__EnumAnnotationAttribute__Group__6
+            // InternalRoom.g:21814:1: ( rule__EnumAnnotationAttribute__Group__5__Impl rule__EnumAnnotationAttribute__Group__6 )
+            // InternalRoom.g:21815:2: rule__EnumAnnotationAttribute__Group__5__Impl rule__EnumAnnotationAttribute__Group__6
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__5__Impl_in_rule__EnumAnnotationAttribute__Group__544001);
+            pushFollow(FOLLOW_109);
             rule__EnumAnnotationAttribute__Group__5__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__6_in_rule__EnumAnnotationAttribute__Group__544004);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group__6();
 
             state._fsp--;
@@ -59328,23 +59328,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__5__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21819:1: rule__EnumAnnotationAttribute__Group__5__Impl : ( ( rule__EnumAnnotationAttribute__ValuesAssignment_5 ) ) ;
+    // InternalRoom.g:21822:1: rule__EnumAnnotationAttribute__Group__5__Impl : ( ( rule__EnumAnnotationAttribute__ValuesAssignment_5 ) ) ;
     public final void rule__EnumAnnotationAttribute__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21823:1: ( ( ( rule__EnumAnnotationAttribute__ValuesAssignment_5 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21824:1: ( ( rule__EnumAnnotationAttribute__ValuesAssignment_5 ) )
+            // InternalRoom.g:21826:1: ( ( ( rule__EnumAnnotationAttribute__ValuesAssignment_5 ) ) )
+            // InternalRoom.g:21827:1: ( ( rule__EnumAnnotationAttribute__ValuesAssignment_5 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21824:1: ( ( rule__EnumAnnotationAttribute__ValuesAssignment_5 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21825:1: ( rule__EnumAnnotationAttribute__ValuesAssignment_5 )
+            // InternalRoom.g:21827:1: ( ( rule__EnumAnnotationAttribute__ValuesAssignment_5 ) )
+            // InternalRoom.g:21828:1: ( rule__EnumAnnotationAttribute__ValuesAssignment_5 )
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getValuesAssignment_5()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21826:1: ( rule__EnumAnnotationAttribute__ValuesAssignment_5 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21826:2: rule__EnumAnnotationAttribute__ValuesAssignment_5
+            // InternalRoom.g:21829:1: ( rule__EnumAnnotationAttribute__ValuesAssignment_5 )
+            // InternalRoom.g:21829:2: rule__EnumAnnotationAttribute__ValuesAssignment_5
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__ValuesAssignment_5_in_rule__EnumAnnotationAttribute__Group__5__Impl44031);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__ValuesAssignment_5();
 
             state._fsp--;
@@ -59375,21 +59375,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__6"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21836:1: rule__EnumAnnotationAttribute__Group__6 : rule__EnumAnnotationAttribute__Group__6__Impl rule__EnumAnnotationAttribute__Group__7 ;
+    // InternalRoom.g:21839:1: rule__EnumAnnotationAttribute__Group__6 : rule__EnumAnnotationAttribute__Group__6__Impl rule__EnumAnnotationAttribute__Group__7 ;
     public final void rule__EnumAnnotationAttribute__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21840:1: ( rule__EnumAnnotationAttribute__Group__6__Impl rule__EnumAnnotationAttribute__Group__7 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21841:2: rule__EnumAnnotationAttribute__Group__6__Impl rule__EnumAnnotationAttribute__Group__7
+            // InternalRoom.g:21843:1: ( rule__EnumAnnotationAttribute__Group__6__Impl rule__EnumAnnotationAttribute__Group__7 )
+            // InternalRoom.g:21844:2: rule__EnumAnnotationAttribute__Group__6__Impl rule__EnumAnnotationAttribute__Group__7
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__6__Impl_in_rule__EnumAnnotationAttribute__Group__644061);
+            pushFollow(FOLLOW_109);
             rule__EnumAnnotationAttribute__Group__6__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__7_in_rule__EnumAnnotationAttribute__Group__644064);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group__7();
 
             state._fsp--;
@@ -59413,20 +59413,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__6__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21848:1: rule__EnumAnnotationAttribute__Group__6__Impl : ( ( rule__EnumAnnotationAttribute__Group_6__0 )* ) ;
+    // InternalRoom.g:21851:1: rule__EnumAnnotationAttribute__Group__6__Impl : ( ( rule__EnumAnnotationAttribute__Group_6__0 )* ) ;
     public final void rule__EnumAnnotationAttribute__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21852:1: ( ( ( rule__EnumAnnotationAttribute__Group_6__0 )* ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21853:1: ( ( rule__EnumAnnotationAttribute__Group_6__0 )* )
+            // InternalRoom.g:21855:1: ( ( ( rule__EnumAnnotationAttribute__Group_6__0 )* ) )
+            // InternalRoom.g:21856:1: ( ( rule__EnumAnnotationAttribute__Group_6__0 )* )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21853:1: ( ( rule__EnumAnnotationAttribute__Group_6__0 )* )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21854:1: ( rule__EnumAnnotationAttribute__Group_6__0 )*
+            // InternalRoom.g:21856:1: ( ( rule__EnumAnnotationAttribute__Group_6__0 )* )
+            // InternalRoom.g:21857:1: ( rule__EnumAnnotationAttribute__Group_6__0 )*
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getGroup_6()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21855:1: ( rule__EnumAnnotationAttribute__Group_6__0 )*
+            // InternalRoom.g:21858:1: ( rule__EnumAnnotationAttribute__Group_6__0 )*
             loop194:
             do {
                 int alt194=2;
@@ -59439,9 +59439,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
                 switch (alt194) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21855:2: rule__EnumAnnotationAttribute__Group_6__0
+            	    // InternalRoom.g:21858:2: rule__EnumAnnotationAttribute__Group_6__0
             	    {
-            	    pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group_6__0_in_rule__EnumAnnotationAttribute__Group__6__Impl44091);
+            	    pushFollow(FOLLOW_19);
             	    rule__EnumAnnotationAttribute__Group_6__0();
 
             	    state._fsp--;
@@ -59478,16 +59478,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__7"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21865:1: rule__EnumAnnotationAttribute__Group__7 : rule__EnumAnnotationAttribute__Group__7__Impl ;
+    // InternalRoom.g:21868:1: rule__EnumAnnotationAttribute__Group__7 : rule__EnumAnnotationAttribute__Group__7__Impl ;
     public final void rule__EnumAnnotationAttribute__Group__7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21869:1: ( rule__EnumAnnotationAttribute__Group__7__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21870:2: rule__EnumAnnotationAttribute__Group__7__Impl
+            // InternalRoom.g:21872:1: ( rule__EnumAnnotationAttribute__Group__7__Impl )
+            // InternalRoom.g:21873:2: rule__EnumAnnotationAttribute__Group__7__Impl
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group__7__Impl_in_rule__EnumAnnotationAttribute__Group__744122);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group__7__Impl();
 
             state._fsp--;
@@ -59511,20 +59511,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group__7__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21876:1: rule__EnumAnnotationAttribute__Group__7__Impl : ( '}' ) ;
+    // InternalRoom.g:21879:1: rule__EnumAnnotationAttribute__Group__7__Impl : ( '}' ) ;
     public final void rule__EnumAnnotationAttribute__Group__7__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21880:1: ( ( '}' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21881:1: ( '}' )
+            // InternalRoom.g:21883:1: ( ( '}' ) )
+            // InternalRoom.g:21884:1: ( '}' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21881:1: ( '}' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21882:1: '}'
+            // InternalRoom.g:21884:1: ( '}' )
+            // InternalRoom.g:21885:1: '}'
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getRightCurlyBracketKeyword_7()); 
-            match(input,42,FOLLOW_42_in_rule__EnumAnnotationAttribute__Group__7__Impl44150); 
+            match(input,42,FOLLOW_2); 
              after(grammarAccess.getEnumAnnotationAttributeAccess().getRightCurlyBracketKeyword_7()); 
 
             }
@@ -59548,21 +59548,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group_6__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21911:1: rule__EnumAnnotationAttribute__Group_6__0 : rule__EnumAnnotationAttribute__Group_6__0__Impl rule__EnumAnnotationAttribute__Group_6__1 ;
+    // InternalRoom.g:21914:1: rule__EnumAnnotationAttribute__Group_6__0 : rule__EnumAnnotationAttribute__Group_6__0__Impl rule__EnumAnnotationAttribute__Group_6__1 ;
     public final void rule__EnumAnnotationAttribute__Group_6__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21915:1: ( rule__EnumAnnotationAttribute__Group_6__0__Impl rule__EnumAnnotationAttribute__Group_6__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21916:2: rule__EnumAnnotationAttribute__Group_6__0__Impl rule__EnumAnnotationAttribute__Group_6__1
+            // InternalRoom.g:21918:1: ( rule__EnumAnnotationAttribute__Group_6__0__Impl rule__EnumAnnotationAttribute__Group_6__1 )
+            // InternalRoom.g:21919:2: rule__EnumAnnotationAttribute__Group_6__0__Impl rule__EnumAnnotationAttribute__Group_6__1
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group_6__0__Impl_in_rule__EnumAnnotationAttribute__Group_6__044197);
+            pushFollow(FOLLOW_12);
             rule__EnumAnnotationAttribute__Group_6__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group_6__1_in_rule__EnumAnnotationAttribute__Group_6__044200);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group_6__1();
 
             state._fsp--;
@@ -59586,20 +59586,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group_6__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21923:1: rule__EnumAnnotationAttribute__Group_6__0__Impl : ( ',' ) ;
+    // InternalRoom.g:21926:1: rule__EnumAnnotationAttribute__Group_6__0__Impl : ( ',' ) ;
     public final void rule__EnumAnnotationAttribute__Group_6__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21927:1: ( ( ',' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21928:1: ( ',' )
+            // InternalRoom.g:21930:1: ( ( ',' ) )
+            // InternalRoom.g:21931:1: ( ',' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21928:1: ( ',' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21929:1: ','
+            // InternalRoom.g:21931:1: ( ',' )
+            // InternalRoom.g:21932:1: ','
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getCommaKeyword_6_0()); 
-            match(input,51,FOLLOW_51_in_rule__EnumAnnotationAttribute__Group_6__0__Impl44228); 
+            match(input,51,FOLLOW_2); 
              after(grammarAccess.getEnumAnnotationAttributeAccess().getCommaKeyword_6_0()); 
 
             }
@@ -59623,16 +59623,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group_6__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21942:1: rule__EnumAnnotationAttribute__Group_6__1 : rule__EnumAnnotationAttribute__Group_6__1__Impl ;
+    // InternalRoom.g:21945:1: rule__EnumAnnotationAttribute__Group_6__1 : rule__EnumAnnotationAttribute__Group_6__1__Impl ;
     public final void rule__EnumAnnotationAttribute__Group_6__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21946:1: ( rule__EnumAnnotationAttribute__Group_6__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21947:2: rule__EnumAnnotationAttribute__Group_6__1__Impl
+            // InternalRoom.g:21949:1: ( rule__EnumAnnotationAttribute__Group_6__1__Impl )
+            // InternalRoom.g:21950:2: rule__EnumAnnotationAttribute__Group_6__1__Impl
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__Group_6__1__Impl_in_rule__EnumAnnotationAttribute__Group_6__144259);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__Group_6__1__Impl();
 
             state._fsp--;
@@ -59656,23 +59656,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__Group_6__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21953:1: rule__EnumAnnotationAttribute__Group_6__1__Impl : ( ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 ) ) ;
+    // InternalRoom.g:21956:1: rule__EnumAnnotationAttribute__Group_6__1__Impl : ( ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 ) ) ;
     public final void rule__EnumAnnotationAttribute__Group_6__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21957:1: ( ( ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21958:1: ( ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 ) )
+            // InternalRoom.g:21960:1: ( ( ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 ) ) )
+            // InternalRoom.g:21961:1: ( ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21958:1: ( ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21959:1: ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 )
+            // InternalRoom.g:21961:1: ( ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 ) )
+            // InternalRoom.g:21962:1: ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 )
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getValuesAssignment_6_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21960:1: ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21960:2: rule__EnumAnnotationAttribute__ValuesAssignment_6_1
+            // InternalRoom.g:21963:1: ( rule__EnumAnnotationAttribute__ValuesAssignment_6_1 )
+            // InternalRoom.g:21963:2: rule__EnumAnnotationAttribute__ValuesAssignment_6_1
             {
-            pushFollow(FOLLOW_rule__EnumAnnotationAttribute__ValuesAssignment_6_1_in_rule__EnumAnnotationAttribute__Group_6__1__Impl44286);
+            pushFollow(FOLLOW_2);
             rule__EnumAnnotationAttribute__ValuesAssignment_6_1();
 
             state._fsp--;
@@ -59703,21 +59703,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Import__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21974:1: rule__Import__Group__0 : rule__Import__Group__0__Impl rule__Import__Group__1 ;
+    // InternalRoom.g:21977:1: rule__Import__Group__0 : rule__Import__Group__0__Impl rule__Import__Group__1 ;
     public final void rule__Import__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21978:1: ( rule__Import__Group__0__Impl rule__Import__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21979:2: rule__Import__Group__0__Impl rule__Import__Group__1
+            // InternalRoom.g:21981:1: ( rule__Import__Group__0__Impl rule__Import__Group__1 )
+            // InternalRoom.g:21982:2: rule__Import__Group__0__Impl rule__Import__Group__1
             {
-            pushFollow(FOLLOW_rule__Import__Group__0__Impl_in_rule__Import__Group__044320);
+            pushFollow(FOLLOW_111);
             rule__Import__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Import__Group__1_in_rule__Import__Group__044323);
+            pushFollow(FOLLOW_2);
             rule__Import__Group__1();
 
             state._fsp--;
@@ -59741,20 +59741,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Import__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21986:1: rule__Import__Group__0__Impl : ( 'import' ) ;
+    // InternalRoom.g:21989:1: rule__Import__Group__0__Impl : ( 'import' ) ;
     public final void rule__Import__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21990:1: ( ( 'import' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21991:1: ( 'import' )
+            // InternalRoom.g:21993:1: ( ( 'import' ) )
+            // InternalRoom.g:21994:1: ( 'import' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21991:1: ( 'import' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:21992:1: 'import'
+            // InternalRoom.g:21994:1: ( 'import' )
+            // InternalRoom.g:21995:1: 'import'
             {
              before(grammarAccess.getImportAccess().getImportKeyword_0()); 
-            match(input,124,FOLLOW_124_in_rule__Import__Group__0__Impl44351); 
+            match(input,124,FOLLOW_2); 
              after(grammarAccess.getImportAccess().getImportKeyword_0()); 
 
             }
@@ -59778,21 +59778,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Import__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22005:1: rule__Import__Group__1 : rule__Import__Group__1__Impl rule__Import__Group__2 ;
+    // InternalRoom.g:22008:1: rule__Import__Group__1 : rule__Import__Group__1__Impl rule__Import__Group__2 ;
     public final void rule__Import__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22009:1: ( rule__Import__Group__1__Impl rule__Import__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22010:2: rule__Import__Group__1__Impl rule__Import__Group__2
+            // InternalRoom.g:22012:1: ( rule__Import__Group__1__Impl rule__Import__Group__2 )
+            // InternalRoom.g:22013:2: rule__Import__Group__1__Impl rule__Import__Group__2
             {
-            pushFollow(FOLLOW_rule__Import__Group__1__Impl_in_rule__Import__Group__144382);
+            pushFollow(FOLLOW_12);
             rule__Import__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Import__Group__2_in_rule__Import__Group__144385);
+            pushFollow(FOLLOW_2);
             rule__Import__Group__2();
 
             state._fsp--;
@@ -59816,23 +59816,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Import__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22017:1: rule__Import__Group__1__Impl : ( ( rule__Import__Alternatives_1 ) ) ;
+    // InternalRoom.g:22020:1: rule__Import__Group__1__Impl : ( ( rule__Import__Alternatives_1 ) ) ;
     public final void rule__Import__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22021:1: ( ( ( rule__Import__Alternatives_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22022:1: ( ( rule__Import__Alternatives_1 ) )
+            // InternalRoom.g:22024:1: ( ( ( rule__Import__Alternatives_1 ) ) )
+            // InternalRoom.g:22025:1: ( ( rule__Import__Alternatives_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22022:1: ( ( rule__Import__Alternatives_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22023:1: ( rule__Import__Alternatives_1 )
+            // InternalRoom.g:22025:1: ( ( rule__Import__Alternatives_1 ) )
+            // InternalRoom.g:22026:1: ( rule__Import__Alternatives_1 )
             {
              before(grammarAccess.getImportAccess().getAlternatives_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22024:1: ( rule__Import__Alternatives_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22024:2: rule__Import__Alternatives_1
+            // InternalRoom.g:22027:1: ( rule__Import__Alternatives_1 )
+            // InternalRoom.g:22027:2: rule__Import__Alternatives_1
             {
-            pushFollow(FOLLOW_rule__Import__Alternatives_1_in_rule__Import__Group__1__Impl44412);
+            pushFollow(FOLLOW_2);
             rule__Import__Alternatives_1();
 
             state._fsp--;
@@ -59863,16 +59863,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Import__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22034:1: rule__Import__Group__2 : rule__Import__Group__2__Impl ;
+    // InternalRoom.g:22037:1: rule__Import__Group__2 : rule__Import__Group__2__Impl ;
     public final void rule__Import__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22038:1: ( rule__Import__Group__2__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22039:2: rule__Import__Group__2__Impl
+            // InternalRoom.g:22041:1: ( rule__Import__Group__2__Impl )
+            // InternalRoom.g:22042:2: rule__Import__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__Import__Group__2__Impl_in_rule__Import__Group__244442);
+            pushFollow(FOLLOW_2);
             rule__Import__Group__2__Impl();
 
             state._fsp--;
@@ -59896,23 +59896,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Import__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22045:1: rule__Import__Group__2__Impl : ( ( rule__Import__ImportURIAssignment_2 ) ) ;
+    // InternalRoom.g:22048:1: rule__Import__Group__2__Impl : ( ( rule__Import__ImportURIAssignment_2 ) ) ;
     public final void rule__Import__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22049:1: ( ( ( rule__Import__ImportURIAssignment_2 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22050:1: ( ( rule__Import__ImportURIAssignment_2 ) )
+            // InternalRoom.g:22052:1: ( ( ( rule__Import__ImportURIAssignment_2 ) ) )
+            // InternalRoom.g:22053:1: ( ( rule__Import__ImportURIAssignment_2 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22050:1: ( ( rule__Import__ImportURIAssignment_2 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22051:1: ( rule__Import__ImportURIAssignment_2 )
+            // InternalRoom.g:22053:1: ( ( rule__Import__ImportURIAssignment_2 ) )
+            // InternalRoom.g:22054:1: ( rule__Import__ImportURIAssignment_2 )
             {
              before(grammarAccess.getImportAccess().getImportURIAssignment_2()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22052:1: ( rule__Import__ImportURIAssignment_2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22052:2: rule__Import__ImportURIAssignment_2
+            // InternalRoom.g:22055:1: ( rule__Import__ImportURIAssignment_2 )
+            // InternalRoom.g:22055:2: rule__Import__ImportURIAssignment_2
             {
-            pushFollow(FOLLOW_rule__Import__ImportURIAssignment_2_in_rule__Import__Group__2__Impl44469);
+            pushFollow(FOLLOW_2);
             rule__Import__ImportURIAssignment_2();
 
             state._fsp--;
@@ -59943,21 +59943,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Import__Group_1_0__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22068:1: rule__Import__Group_1_0__0 : rule__Import__Group_1_0__0__Impl rule__Import__Group_1_0__1 ;
+    // InternalRoom.g:22071:1: rule__Import__Group_1_0__0 : rule__Import__Group_1_0__0__Impl rule__Import__Group_1_0__1 ;
     public final void rule__Import__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22072:1: ( rule__Import__Group_1_0__0__Impl rule__Import__Group_1_0__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22073:2: rule__Import__Group_1_0__0__Impl rule__Import__Group_1_0__1
+            // InternalRoom.g:22075:1: ( rule__Import__Group_1_0__0__Impl rule__Import__Group_1_0__1 )
+            // InternalRoom.g:22076:2: rule__Import__Group_1_0__0__Impl rule__Import__Group_1_0__1
             {
-            pushFollow(FOLLOW_rule__Import__Group_1_0__0__Impl_in_rule__Import__Group_1_0__044505);
+            pushFollow(FOLLOW_112);
             rule__Import__Group_1_0__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Import__Group_1_0__1_in_rule__Import__Group_1_0__044508);
+            pushFollow(FOLLOW_2);
             rule__Import__Group_1_0__1();
 
             state._fsp--;
@@ -59981,23 +59981,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Import__Group_1_0__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22080:1: rule__Import__Group_1_0__0__Impl : ( ( rule__Import__ImportedNamespaceAssignment_1_0_0 ) ) ;
+    // InternalRoom.g:22083:1: rule__Import__Group_1_0__0__Impl : ( ( rule__Import__ImportedNamespaceAssignment_1_0_0 ) ) ;
     public final void rule__Import__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22084:1: ( ( ( rule__Import__ImportedNamespaceAssignment_1_0_0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22085:1: ( ( rule__Import__ImportedNamespaceAssignment_1_0_0 ) )
+            // InternalRoom.g:22087:1: ( ( ( rule__Import__ImportedNamespaceAssignment_1_0_0 ) ) )
+            // InternalRoom.g:22088:1: ( ( rule__Import__ImportedNamespaceAssignment_1_0_0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22085:1: ( ( rule__Import__ImportedNamespaceAssignment_1_0_0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22086:1: ( rule__Import__ImportedNamespaceAssignment_1_0_0 )
+            // InternalRoom.g:22088:1: ( ( rule__Import__ImportedNamespaceAssignment_1_0_0 ) )
+            // InternalRoom.g:22089:1: ( rule__Import__ImportedNamespaceAssignment_1_0_0 )
             {
              before(grammarAccess.getImportAccess().getImportedNamespaceAssignment_1_0_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22087:1: ( rule__Import__ImportedNamespaceAssignment_1_0_0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22087:2: rule__Import__ImportedNamespaceAssignment_1_0_0
+            // InternalRoom.g:22090:1: ( rule__Import__ImportedNamespaceAssignment_1_0_0 )
+            // InternalRoom.g:22090:2: rule__Import__ImportedNamespaceAssignment_1_0_0
             {
-            pushFollow(FOLLOW_rule__Import__ImportedNamespaceAssignment_1_0_0_in_rule__Import__Group_1_0__0__Impl44535);
+            pushFollow(FOLLOW_2);
             rule__Import__ImportedNamespaceAssignment_1_0_0();
 
             state._fsp--;
@@ -60028,16 +60028,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Import__Group_1_0__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22097:1: rule__Import__Group_1_0__1 : rule__Import__Group_1_0__1__Impl ;
+    // InternalRoom.g:22100:1: rule__Import__Group_1_0__1 : rule__Import__Group_1_0__1__Impl ;
     public final void rule__Import__Group_1_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22101:1: ( rule__Import__Group_1_0__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22102:2: rule__Import__Group_1_0__1__Impl
+            // InternalRoom.g:22104:1: ( rule__Import__Group_1_0__1__Impl )
+            // InternalRoom.g:22105:2: rule__Import__Group_1_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__Import__Group_1_0__1__Impl_in_rule__Import__Group_1_0__144565);
+            pushFollow(FOLLOW_2);
             rule__Import__Group_1_0__1__Impl();
 
             state._fsp--;
@@ -60061,20 +60061,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Import__Group_1_0__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22108:1: rule__Import__Group_1_0__1__Impl : ( 'from' ) ;
+    // InternalRoom.g:22111:1: rule__Import__Group_1_0__1__Impl : ( 'from' ) ;
     public final void rule__Import__Group_1_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22112:1: ( ( 'from' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22113:1: ( 'from' )
+            // InternalRoom.g:22115:1: ( ( 'from' ) )
+            // InternalRoom.g:22116:1: ( 'from' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22113:1: ( 'from' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22114:1: 'from'
+            // InternalRoom.g:22116:1: ( 'from' )
+            // InternalRoom.g:22117:1: 'from'
             {
              before(grammarAccess.getImportAccess().getFromKeyword_1_0_1()); 
-            match(input,125,FOLLOW_125_in_rule__Import__Group_1_0__1__Impl44593); 
+            match(input,125,FOLLOW_2); 
              after(grammarAccess.getImportAccess().getFromKeyword_1_0_1()); 
 
             }
@@ -60098,21 +60098,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ImportedFQN__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22131:1: rule__ImportedFQN__Group__0 : rule__ImportedFQN__Group__0__Impl rule__ImportedFQN__Group__1 ;
+    // InternalRoom.g:22134:1: rule__ImportedFQN__Group__0 : rule__ImportedFQN__Group__0__Impl rule__ImportedFQN__Group__1 ;
     public final void rule__ImportedFQN__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22135:1: ( rule__ImportedFQN__Group__0__Impl rule__ImportedFQN__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22136:2: rule__ImportedFQN__Group__0__Impl rule__ImportedFQN__Group__1
+            // InternalRoom.g:22138:1: ( rule__ImportedFQN__Group__0__Impl rule__ImportedFQN__Group__1 )
+            // InternalRoom.g:22139:2: rule__ImportedFQN__Group__0__Impl rule__ImportedFQN__Group__1
             {
-            pushFollow(FOLLOW_rule__ImportedFQN__Group__0__Impl_in_rule__ImportedFQN__Group__044628);
+            pushFollow(FOLLOW_113);
             rule__ImportedFQN__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ImportedFQN__Group__1_in_rule__ImportedFQN__Group__044631);
+            pushFollow(FOLLOW_2);
             rule__ImportedFQN__Group__1();
 
             state._fsp--;
@@ -60136,20 +60136,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ImportedFQN__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22143:1: rule__ImportedFQN__Group__0__Impl : ( ruleFQN ) ;
+    // InternalRoom.g:22146:1: rule__ImportedFQN__Group__0__Impl : ( ruleFQN ) ;
     public final void rule__ImportedFQN__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22147:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22148:1: ( ruleFQN )
+            // InternalRoom.g:22150:1: ( ( ruleFQN ) )
+            // InternalRoom.g:22151:1: ( ruleFQN )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22148:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22149:1: ruleFQN
+            // InternalRoom.g:22151:1: ( ruleFQN )
+            // InternalRoom.g:22152:1: ruleFQN
             {
              before(grammarAccess.getImportedFQNAccess().getFQNParserRuleCall_0()); 
-            pushFollow(FOLLOW_ruleFQN_in_rule__ImportedFQN__Group__0__Impl44658);
+            pushFollow(FOLLOW_2);
             ruleFQN();
 
             state._fsp--;
@@ -60177,16 +60177,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ImportedFQN__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22160:1: rule__ImportedFQN__Group__1 : rule__ImportedFQN__Group__1__Impl ;
+    // InternalRoom.g:22163:1: rule__ImportedFQN__Group__1 : rule__ImportedFQN__Group__1__Impl ;
     public final void rule__ImportedFQN__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22164:1: ( rule__ImportedFQN__Group__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22165:2: rule__ImportedFQN__Group__1__Impl
+            // InternalRoom.g:22167:1: ( rule__ImportedFQN__Group__1__Impl )
+            // InternalRoom.g:22168:2: rule__ImportedFQN__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__ImportedFQN__Group__1__Impl_in_rule__ImportedFQN__Group__144687);
+            pushFollow(FOLLOW_2);
             rule__ImportedFQN__Group__1__Impl();
 
             state._fsp--;
@@ -60210,20 +60210,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ImportedFQN__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22171:1: rule__ImportedFQN__Group__1__Impl : ( ( '.*' )? ) ;
+    // InternalRoom.g:22174:1: rule__ImportedFQN__Group__1__Impl : ( ( '.*' )? ) ;
     public final void rule__ImportedFQN__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22175:1: ( ( ( '.*' )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22176:1: ( ( '.*' )? )
+            // InternalRoom.g:22178:1: ( ( ( '.*' )? ) )
+            // InternalRoom.g:22179:1: ( ( '.*' )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22176:1: ( ( '.*' )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22177:1: ( '.*' )?
+            // InternalRoom.g:22179:1: ( ( '.*' )? )
+            // InternalRoom.g:22180:1: ( '.*' )?
             {
              before(grammarAccess.getImportedFQNAccess().getFullStopAsteriskKeyword_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22178:1: ( '.*' )?
+            // InternalRoom.g:22181:1: ( '.*' )?
             int alt195=2;
             int LA195_0 = input.LA(1);
 
@@ -60232,9 +60232,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt195) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22179:2: '.*'
+                    // InternalRoom.g:22182:2: '.*'
                     {
-                    match(input,126,FOLLOW_126_in_rule__ImportedFQN__Group__1__Impl44716); 
+                    match(input,126,FOLLOW_2); 
 
                     }
                     break;
@@ -60264,21 +60264,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Documentation__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22194:1: rule__Documentation__Group__0 : rule__Documentation__Group__0__Impl rule__Documentation__Group__1 ;
+    // InternalRoom.g:22197:1: rule__Documentation__Group__0 : rule__Documentation__Group__0__Impl rule__Documentation__Group__1 ;
     public final void rule__Documentation__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22198:1: ( rule__Documentation__Group__0__Impl rule__Documentation__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22199:2: rule__Documentation__Group__0__Impl rule__Documentation__Group__1
+            // InternalRoom.g:22201:1: ( rule__Documentation__Group__0__Impl rule__Documentation__Group__1 )
+            // InternalRoom.g:22202:2: rule__Documentation__Group__0__Impl rule__Documentation__Group__1
             {
-            pushFollow(FOLLOW_rule__Documentation__Group__0__Impl_in_rule__Documentation__Group__044753);
+            pushFollow(FOLLOW_14);
             rule__Documentation__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Documentation__Group__1_in_rule__Documentation__Group__044756);
+            pushFollow(FOLLOW_2);
             rule__Documentation__Group__1();
 
             state._fsp--;
@@ -60302,21 +60302,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Documentation__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22206:1: rule__Documentation__Group__0__Impl : ( () ) ;
+    // InternalRoom.g:22209:1: rule__Documentation__Group__0__Impl : ( () ) ;
     public final void rule__Documentation__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22210:1: ( ( () ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22211:1: ( () )
+            // InternalRoom.g:22213:1: ( ( () ) )
+            // InternalRoom.g:22214:1: ( () )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22211:1: ( () )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22212:1: ()
+            // InternalRoom.g:22214:1: ( () )
+            // InternalRoom.g:22215:1: ()
             {
              before(grammarAccess.getDocumentationAccess().getDocumentationAction_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22213:1: ()
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22215:1: 
+            // InternalRoom.g:22216:1: ()
+            // InternalRoom.g:22218:1: 
             {
             }
 
@@ -60339,21 +60339,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Documentation__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22225:1: rule__Documentation__Group__1 : rule__Documentation__Group__1__Impl rule__Documentation__Group__2 ;
+    // InternalRoom.g:22228:1: rule__Documentation__Group__1 : rule__Documentation__Group__1__Impl rule__Documentation__Group__2 ;
     public final void rule__Documentation__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22229:1: ( rule__Documentation__Group__1__Impl rule__Documentation__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22230:2: rule__Documentation__Group__1__Impl rule__Documentation__Group__2
+            // InternalRoom.g:22232:1: ( rule__Documentation__Group__1__Impl rule__Documentation__Group__2 )
+            // InternalRoom.g:22233:2: rule__Documentation__Group__1__Impl rule__Documentation__Group__2
             {
-            pushFollow(FOLLOW_rule__Documentation__Group__1__Impl_in_rule__Documentation__Group__144814);
+            pushFollow(FOLLOW_114);
             rule__Documentation__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Documentation__Group__2_in_rule__Documentation__Group__144817);
+            pushFollow(FOLLOW_2);
             rule__Documentation__Group__2();
 
             state._fsp--;
@@ -60377,20 +60377,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Documentation__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22237:1: rule__Documentation__Group__1__Impl : ( '[' ) ;
+    // InternalRoom.g:22240:1: rule__Documentation__Group__1__Impl : ( '[' ) ;
     public final void rule__Documentation__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22241:1: ( ( '[' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22242:1: ( '[' )
+            // InternalRoom.g:22244:1: ( ( '[' ) )
+            // InternalRoom.g:22245:1: ( '[' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22242:1: ( '[' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22243:1: '['
+            // InternalRoom.g:22245:1: ( '[' )
+            // InternalRoom.g:22246:1: '['
             {
              before(grammarAccess.getDocumentationAccess().getLeftSquareBracketKeyword_1()); 
-            match(input,59,FOLLOW_59_in_rule__Documentation__Group__1__Impl44845); 
+            match(input,59,FOLLOW_2); 
              after(grammarAccess.getDocumentationAccess().getLeftSquareBracketKeyword_1()); 
 
             }
@@ -60414,21 +60414,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Documentation__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22256:1: rule__Documentation__Group__2 : rule__Documentation__Group__2__Impl rule__Documentation__Group__3 ;
+    // InternalRoom.g:22259:1: rule__Documentation__Group__2 : rule__Documentation__Group__2__Impl rule__Documentation__Group__3 ;
     public final void rule__Documentation__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22260:1: ( rule__Documentation__Group__2__Impl rule__Documentation__Group__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22261:2: rule__Documentation__Group__2__Impl rule__Documentation__Group__3
+            // InternalRoom.g:22263:1: ( rule__Documentation__Group__2__Impl rule__Documentation__Group__3 )
+            // InternalRoom.g:22264:2: rule__Documentation__Group__2__Impl rule__Documentation__Group__3
             {
-            pushFollow(FOLLOW_rule__Documentation__Group__2__Impl_in_rule__Documentation__Group__244876);
+            pushFollow(FOLLOW_114);
             rule__Documentation__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Documentation__Group__3_in_rule__Documentation__Group__244879);
+            pushFollow(FOLLOW_2);
             rule__Documentation__Group__3();
 
             state._fsp--;
@@ -60452,20 +60452,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Documentation__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22268:1: rule__Documentation__Group__2__Impl : ( ( rule__Documentation__LinesAssignment_2 )* ) ;
+    // InternalRoom.g:22271:1: rule__Documentation__Group__2__Impl : ( ( rule__Documentation__LinesAssignment_2 )* ) ;
     public final void rule__Documentation__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22272:1: ( ( ( rule__Documentation__LinesAssignment_2 )* ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22273:1: ( ( rule__Documentation__LinesAssignment_2 )* )
+            // InternalRoom.g:22275:1: ( ( ( rule__Documentation__LinesAssignment_2 )* ) )
+            // InternalRoom.g:22276:1: ( ( rule__Documentation__LinesAssignment_2 )* )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22273:1: ( ( rule__Documentation__LinesAssignment_2 )* )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22274:1: ( rule__Documentation__LinesAssignment_2 )*
+            // InternalRoom.g:22276:1: ( ( rule__Documentation__LinesAssignment_2 )* )
+            // InternalRoom.g:22277:1: ( rule__Documentation__LinesAssignment_2 )*
             {
              before(grammarAccess.getDocumentationAccess().getLinesAssignment_2()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22275:1: ( rule__Documentation__LinesAssignment_2 )*
+            // InternalRoom.g:22278:1: ( rule__Documentation__LinesAssignment_2 )*
             loop196:
             do {
                 int alt196=2;
@@ -60478,9 +60478,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
                 switch (alt196) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22275:2: rule__Documentation__LinesAssignment_2
+            	    // InternalRoom.g:22278:2: rule__Documentation__LinesAssignment_2
             	    {
-            	    pushFollow(FOLLOW_rule__Documentation__LinesAssignment_2_in_rule__Documentation__Group__2__Impl44906);
+            	    pushFollow(FOLLOW_81);
             	    rule__Documentation__LinesAssignment_2();
 
             	    state._fsp--;
@@ -60517,16 +60517,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Documentation__Group__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22285:1: rule__Documentation__Group__3 : rule__Documentation__Group__3__Impl ;
+    // InternalRoom.g:22288:1: rule__Documentation__Group__3 : rule__Documentation__Group__3__Impl ;
     public final void rule__Documentation__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22289:1: ( rule__Documentation__Group__3__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22290:2: rule__Documentation__Group__3__Impl
+            // InternalRoom.g:22292:1: ( rule__Documentation__Group__3__Impl )
+            // InternalRoom.g:22293:2: rule__Documentation__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__Documentation__Group__3__Impl_in_rule__Documentation__Group__344937);
+            pushFollow(FOLLOW_2);
             rule__Documentation__Group__3__Impl();
 
             state._fsp--;
@@ -60550,20 +60550,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Documentation__Group__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22296:1: rule__Documentation__Group__3__Impl : ( ']' ) ;
+    // InternalRoom.g:22299:1: rule__Documentation__Group__3__Impl : ( ']' ) ;
     public final void rule__Documentation__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22300:1: ( ( ']' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22301:1: ( ']' )
+            // InternalRoom.g:22303:1: ( ( ']' ) )
+            // InternalRoom.g:22304:1: ( ']' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22301:1: ( ']' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22302:1: ']'
+            // InternalRoom.g:22304:1: ( ']' )
+            // InternalRoom.g:22305:1: ']'
             {
              before(grammarAccess.getDocumentationAccess().getRightSquareBracketKeyword_3()); 
-            match(input,60,FOLLOW_60_in_rule__Documentation__Group__3__Impl44965); 
+            match(input,60,FOLLOW_2); 
              after(grammarAccess.getDocumentationAccess().getRightSquareBracketKeyword_3()); 
 
             }
@@ -60587,21 +60587,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__BooleanLiteral__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22329:1: rule__BooleanLiteral__Group__0 : rule__BooleanLiteral__Group__0__Impl rule__BooleanLiteral__Group__1 ;
+    // InternalRoom.g:22332:1: rule__BooleanLiteral__Group__0 : rule__BooleanLiteral__Group__0__Impl rule__BooleanLiteral__Group__1 ;
     public final void rule__BooleanLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22333:1: ( rule__BooleanLiteral__Group__0__Impl rule__BooleanLiteral__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22334:2: rule__BooleanLiteral__Group__0__Impl rule__BooleanLiteral__Group__1
+            // InternalRoom.g:22336:1: ( rule__BooleanLiteral__Group__0__Impl rule__BooleanLiteral__Group__1 )
+            // InternalRoom.g:22337:2: rule__BooleanLiteral__Group__0__Impl rule__BooleanLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__BooleanLiteral__Group__0__Impl_in_rule__BooleanLiteral__Group__045010);
+            pushFollow(FOLLOW_115);
             rule__BooleanLiteral__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__BooleanLiteral__Group__1_in_rule__BooleanLiteral__Group__045013);
+            pushFollow(FOLLOW_2);
             rule__BooleanLiteral__Group__1();
 
             state._fsp--;
@@ -60625,21 +60625,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__BooleanLiteral__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22341:1: rule__BooleanLiteral__Group__0__Impl : ( () ) ;
+    // InternalRoom.g:22344:1: rule__BooleanLiteral__Group__0__Impl : ( () ) ;
     public final void rule__BooleanLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22345:1: ( ( () ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22346:1: ( () )
+            // InternalRoom.g:22348:1: ( ( () ) )
+            // InternalRoom.g:22349:1: ( () )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22346:1: ( () )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22347:1: ()
+            // InternalRoom.g:22349:1: ( () )
+            // InternalRoom.g:22350:1: ()
             {
              before(grammarAccess.getBooleanLiteralAccess().getBooleanLiteralAction_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22348:1: ()
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22350:1: 
+            // InternalRoom.g:22351:1: ()
+            // InternalRoom.g:22353:1: 
             {
             }
 
@@ -60662,16 +60662,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__BooleanLiteral__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22360:1: rule__BooleanLiteral__Group__1 : rule__BooleanLiteral__Group__1__Impl ;
+    // InternalRoom.g:22363:1: rule__BooleanLiteral__Group__1 : rule__BooleanLiteral__Group__1__Impl ;
     public final void rule__BooleanLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22364:1: ( rule__BooleanLiteral__Group__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22365:2: rule__BooleanLiteral__Group__1__Impl
+            // InternalRoom.g:22367:1: ( rule__BooleanLiteral__Group__1__Impl )
+            // InternalRoom.g:22368:2: rule__BooleanLiteral__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__BooleanLiteral__Group__1__Impl_in_rule__BooleanLiteral__Group__145071);
+            pushFollow(FOLLOW_2);
             rule__BooleanLiteral__Group__1__Impl();
 
             state._fsp--;
@@ -60695,23 +60695,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__BooleanLiteral__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22371:1: rule__BooleanLiteral__Group__1__Impl : ( ( rule__BooleanLiteral__Alternatives_1 ) ) ;
+    // InternalRoom.g:22374:1: rule__BooleanLiteral__Group__1__Impl : ( ( rule__BooleanLiteral__Alternatives_1 ) ) ;
     public final void rule__BooleanLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22375:1: ( ( ( rule__BooleanLiteral__Alternatives_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22376:1: ( ( rule__BooleanLiteral__Alternatives_1 ) )
+            // InternalRoom.g:22378:1: ( ( ( rule__BooleanLiteral__Alternatives_1 ) ) )
+            // InternalRoom.g:22379:1: ( ( rule__BooleanLiteral__Alternatives_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22376:1: ( ( rule__BooleanLiteral__Alternatives_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22377:1: ( rule__BooleanLiteral__Alternatives_1 )
+            // InternalRoom.g:22379:1: ( ( rule__BooleanLiteral__Alternatives_1 ) )
+            // InternalRoom.g:22380:1: ( rule__BooleanLiteral__Alternatives_1 )
             {
              before(grammarAccess.getBooleanLiteralAccess().getAlternatives_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22378:1: ( rule__BooleanLiteral__Alternatives_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22378:2: rule__BooleanLiteral__Alternatives_1
+            // InternalRoom.g:22381:1: ( rule__BooleanLiteral__Alternatives_1 )
+            // InternalRoom.g:22381:2: rule__BooleanLiteral__Alternatives_1
             {
-            pushFollow(FOLLOW_rule__BooleanLiteral__Alternatives_1_in_rule__BooleanLiteral__Group__1__Impl45098);
+            pushFollow(FOLLOW_2);
             rule__BooleanLiteral__Alternatives_1();
 
             state._fsp--;
@@ -60742,21 +60742,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RealLiteral__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22392:1: rule__RealLiteral__Group__0 : rule__RealLiteral__Group__0__Impl rule__RealLiteral__Group__1 ;
+    // InternalRoom.g:22395:1: rule__RealLiteral__Group__0 : rule__RealLiteral__Group__0__Impl rule__RealLiteral__Group__1 ;
     public final void rule__RealLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22396:1: ( rule__RealLiteral__Group__0__Impl rule__RealLiteral__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22397:2: rule__RealLiteral__Group__0__Impl rule__RealLiteral__Group__1
+            // InternalRoom.g:22399:1: ( rule__RealLiteral__Group__0__Impl rule__RealLiteral__Group__1 )
+            // InternalRoom.g:22400:2: rule__RealLiteral__Group__0__Impl rule__RealLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__RealLiteral__Group__0__Impl_in_rule__RealLiteral__Group__045132);
+            pushFollow(FOLLOW_21);
             rule__RealLiteral__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RealLiteral__Group__1_in_rule__RealLiteral__Group__045135);
+            pushFollow(FOLLOW_2);
             rule__RealLiteral__Group__1();
 
             state._fsp--;
@@ -60780,21 +60780,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RealLiteral__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22404:1: rule__RealLiteral__Group__0__Impl : ( () ) ;
+    // InternalRoom.g:22407:1: rule__RealLiteral__Group__0__Impl : ( () ) ;
     public final void rule__RealLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22408:1: ( ( () ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22409:1: ( () )
+            // InternalRoom.g:22411:1: ( ( () ) )
+            // InternalRoom.g:22412:1: ( () )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22409:1: ( () )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22410:1: ()
+            // InternalRoom.g:22412:1: ( () )
+            // InternalRoom.g:22413:1: ()
             {
              before(grammarAccess.getRealLiteralAccess().getRealLiteralAction_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22411:1: ()
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22413:1: 
+            // InternalRoom.g:22414:1: ()
+            // InternalRoom.g:22416:1: 
             {
             }
 
@@ -60817,16 +60817,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RealLiteral__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22423:1: rule__RealLiteral__Group__1 : rule__RealLiteral__Group__1__Impl ;
+    // InternalRoom.g:22426:1: rule__RealLiteral__Group__1 : rule__RealLiteral__Group__1__Impl ;
     public final void rule__RealLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22427:1: ( rule__RealLiteral__Group__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22428:2: rule__RealLiteral__Group__1__Impl
+            // InternalRoom.g:22430:1: ( rule__RealLiteral__Group__1__Impl )
+            // InternalRoom.g:22431:2: rule__RealLiteral__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__RealLiteral__Group__1__Impl_in_rule__RealLiteral__Group__145193);
+            pushFollow(FOLLOW_2);
             rule__RealLiteral__Group__1__Impl();
 
             state._fsp--;
@@ -60850,23 +60850,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RealLiteral__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22434:1: rule__RealLiteral__Group__1__Impl : ( ( rule__RealLiteral__ValueAssignment_1 ) ) ;
+    // InternalRoom.g:22437:1: rule__RealLiteral__Group__1__Impl : ( ( rule__RealLiteral__ValueAssignment_1 ) ) ;
     public final void rule__RealLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22438:1: ( ( ( rule__RealLiteral__ValueAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22439:1: ( ( rule__RealLiteral__ValueAssignment_1 ) )
+            // InternalRoom.g:22441:1: ( ( ( rule__RealLiteral__ValueAssignment_1 ) ) )
+            // InternalRoom.g:22442:1: ( ( rule__RealLiteral__ValueAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22439:1: ( ( rule__RealLiteral__ValueAssignment_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22440:1: ( rule__RealLiteral__ValueAssignment_1 )
+            // InternalRoom.g:22442:1: ( ( rule__RealLiteral__ValueAssignment_1 ) )
+            // InternalRoom.g:22443:1: ( rule__RealLiteral__ValueAssignment_1 )
             {
              before(grammarAccess.getRealLiteralAccess().getValueAssignment_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22441:1: ( rule__RealLiteral__ValueAssignment_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22441:2: rule__RealLiteral__ValueAssignment_1
+            // InternalRoom.g:22444:1: ( rule__RealLiteral__ValueAssignment_1 )
+            // InternalRoom.g:22444:2: rule__RealLiteral__ValueAssignment_1
             {
-            pushFollow(FOLLOW_rule__RealLiteral__ValueAssignment_1_in_rule__RealLiteral__Group__1__Impl45220);
+            pushFollow(FOLLOW_2);
             rule__RealLiteral__ValueAssignment_1();
 
             state._fsp--;
@@ -60897,21 +60897,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__IntLiteral__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22455:1: rule__IntLiteral__Group__0 : rule__IntLiteral__Group__0__Impl rule__IntLiteral__Group__1 ;
+    // InternalRoom.g:22458:1: rule__IntLiteral__Group__0 : rule__IntLiteral__Group__0__Impl rule__IntLiteral__Group__1 ;
     public final void rule__IntLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22459:1: ( rule__IntLiteral__Group__0__Impl rule__IntLiteral__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22460:2: rule__IntLiteral__Group__0__Impl rule__IntLiteral__Group__1
+            // InternalRoom.g:22462:1: ( rule__IntLiteral__Group__0__Impl rule__IntLiteral__Group__1 )
+            // InternalRoom.g:22463:2: rule__IntLiteral__Group__0__Impl rule__IntLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__IntLiteral__Group__0__Impl_in_rule__IntLiteral__Group__045254);
+            pushFollow(FOLLOW_21);
             rule__IntLiteral__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__IntLiteral__Group__1_in_rule__IntLiteral__Group__045257);
+            pushFollow(FOLLOW_2);
             rule__IntLiteral__Group__1();
 
             state._fsp--;
@@ -60935,21 +60935,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__IntLiteral__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22467:1: rule__IntLiteral__Group__0__Impl : ( () ) ;
+    // InternalRoom.g:22470:1: rule__IntLiteral__Group__0__Impl : ( () ) ;
     public final void rule__IntLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22471:1: ( ( () ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22472:1: ( () )
+            // InternalRoom.g:22474:1: ( ( () ) )
+            // InternalRoom.g:22475:1: ( () )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22472:1: ( () )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22473:1: ()
+            // InternalRoom.g:22475:1: ( () )
+            // InternalRoom.g:22476:1: ()
             {
              before(grammarAccess.getIntLiteralAccess().getIntLiteralAction_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22474:1: ()
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22476:1: 
+            // InternalRoom.g:22477:1: ()
+            // InternalRoom.g:22479:1: 
             {
             }
 
@@ -60972,16 +60972,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__IntLiteral__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22486:1: rule__IntLiteral__Group__1 : rule__IntLiteral__Group__1__Impl ;
+    // InternalRoom.g:22489:1: rule__IntLiteral__Group__1 : rule__IntLiteral__Group__1__Impl ;
     public final void rule__IntLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22490:1: ( rule__IntLiteral__Group__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22491:2: rule__IntLiteral__Group__1__Impl
+            // InternalRoom.g:22493:1: ( rule__IntLiteral__Group__1__Impl )
+            // InternalRoom.g:22494:2: rule__IntLiteral__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__IntLiteral__Group__1__Impl_in_rule__IntLiteral__Group__145315);
+            pushFollow(FOLLOW_2);
             rule__IntLiteral__Group__1__Impl();
 
             state._fsp--;
@@ -61005,23 +61005,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__IntLiteral__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22497:1: rule__IntLiteral__Group__1__Impl : ( ( rule__IntLiteral__ValueAssignment_1 ) ) ;
+    // InternalRoom.g:22500:1: rule__IntLiteral__Group__1__Impl : ( ( rule__IntLiteral__ValueAssignment_1 ) ) ;
     public final void rule__IntLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22501:1: ( ( ( rule__IntLiteral__ValueAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22502:1: ( ( rule__IntLiteral__ValueAssignment_1 ) )
+            // InternalRoom.g:22504:1: ( ( ( rule__IntLiteral__ValueAssignment_1 ) ) )
+            // InternalRoom.g:22505:1: ( ( rule__IntLiteral__ValueAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22502:1: ( ( rule__IntLiteral__ValueAssignment_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22503:1: ( rule__IntLiteral__ValueAssignment_1 )
+            // InternalRoom.g:22505:1: ( ( rule__IntLiteral__ValueAssignment_1 ) )
+            // InternalRoom.g:22506:1: ( rule__IntLiteral__ValueAssignment_1 )
             {
              before(grammarAccess.getIntLiteralAccess().getValueAssignment_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22504:1: ( rule__IntLiteral__ValueAssignment_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22504:2: rule__IntLiteral__ValueAssignment_1
+            // InternalRoom.g:22507:1: ( rule__IntLiteral__ValueAssignment_1 )
+            // InternalRoom.g:22507:2: rule__IntLiteral__ValueAssignment_1
             {
-            pushFollow(FOLLOW_rule__IntLiteral__ValueAssignment_1_in_rule__IntLiteral__Group__1__Impl45342);
+            pushFollow(FOLLOW_2);
             rule__IntLiteral__ValueAssignment_1();
 
             state._fsp--;
@@ -61052,21 +61052,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StringLiteral__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22518:1: rule__StringLiteral__Group__0 : rule__StringLiteral__Group__0__Impl rule__StringLiteral__Group__1 ;
+    // InternalRoom.g:22521:1: rule__StringLiteral__Group__0 : rule__StringLiteral__Group__0__Impl rule__StringLiteral__Group__1 ;
     public final void rule__StringLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22522:1: ( rule__StringLiteral__Group__0__Impl rule__StringLiteral__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22523:2: rule__StringLiteral__Group__0__Impl rule__StringLiteral__Group__1
+            // InternalRoom.g:22525:1: ( rule__StringLiteral__Group__0__Impl rule__StringLiteral__Group__1 )
+            // InternalRoom.g:22526:2: rule__StringLiteral__Group__0__Impl rule__StringLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__StringLiteral__Group__0__Impl_in_rule__StringLiteral__Group__045376);
+            pushFollow(FOLLOW_103);
             rule__StringLiteral__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__StringLiteral__Group__1_in_rule__StringLiteral__Group__045379);
+            pushFollow(FOLLOW_2);
             rule__StringLiteral__Group__1();
 
             state._fsp--;
@@ -61090,21 +61090,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StringLiteral__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22530:1: rule__StringLiteral__Group__0__Impl : ( () ) ;
+    // InternalRoom.g:22533:1: rule__StringLiteral__Group__0__Impl : ( () ) ;
     public final void rule__StringLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22534:1: ( ( () ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22535:1: ( () )
+            // InternalRoom.g:22537:1: ( ( () ) )
+            // InternalRoom.g:22538:1: ( () )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22535:1: ( () )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22536:1: ()
+            // InternalRoom.g:22538:1: ( () )
+            // InternalRoom.g:22539:1: ()
             {
              before(grammarAccess.getStringLiteralAccess().getStringLiteralAction_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22537:1: ()
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22539:1: 
+            // InternalRoom.g:22540:1: ()
+            // InternalRoom.g:22542:1: 
             {
             }
 
@@ -61127,16 +61127,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StringLiteral__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22549:1: rule__StringLiteral__Group__1 : rule__StringLiteral__Group__1__Impl ;
+    // InternalRoom.g:22552:1: rule__StringLiteral__Group__1 : rule__StringLiteral__Group__1__Impl ;
     public final void rule__StringLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22553:1: ( rule__StringLiteral__Group__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22554:2: rule__StringLiteral__Group__1__Impl
+            // InternalRoom.g:22556:1: ( rule__StringLiteral__Group__1__Impl )
+            // InternalRoom.g:22557:2: rule__StringLiteral__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__StringLiteral__Group__1__Impl_in_rule__StringLiteral__Group__145437);
+            pushFollow(FOLLOW_2);
             rule__StringLiteral__Group__1__Impl();
 
             state._fsp--;
@@ -61160,23 +61160,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StringLiteral__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22560:1: rule__StringLiteral__Group__1__Impl : ( ( rule__StringLiteral__ValueAssignment_1 ) ) ;
+    // InternalRoom.g:22563:1: rule__StringLiteral__Group__1__Impl : ( ( rule__StringLiteral__ValueAssignment_1 ) ) ;
     public final void rule__StringLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22564:1: ( ( ( rule__StringLiteral__ValueAssignment_1 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22565:1: ( ( rule__StringLiteral__ValueAssignment_1 ) )
+            // InternalRoom.g:22567:1: ( ( ( rule__StringLiteral__ValueAssignment_1 ) ) )
+            // InternalRoom.g:22568:1: ( ( rule__StringLiteral__ValueAssignment_1 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22565:1: ( ( rule__StringLiteral__ValueAssignment_1 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22566:1: ( rule__StringLiteral__ValueAssignment_1 )
+            // InternalRoom.g:22568:1: ( ( rule__StringLiteral__ValueAssignment_1 ) )
+            // InternalRoom.g:22569:1: ( rule__StringLiteral__ValueAssignment_1 )
             {
              before(grammarAccess.getStringLiteralAccess().getValueAssignment_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22567:1: ( rule__StringLiteral__ValueAssignment_1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22567:2: rule__StringLiteral__ValueAssignment_1
+            // InternalRoom.g:22570:1: ( rule__StringLiteral__ValueAssignment_1 )
+            // InternalRoom.g:22570:2: rule__StringLiteral__ValueAssignment_1
             {
-            pushFollow(FOLLOW_rule__StringLiteral__ValueAssignment_1_in_rule__StringLiteral__Group__1__Impl45464);
+            pushFollow(FOLLOW_2);
             rule__StringLiteral__ValueAssignment_1();
 
             state._fsp--;
@@ -61207,21 +61207,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Integer__Group_0__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22581:1: rule__Integer__Group_0__0 : rule__Integer__Group_0__0__Impl rule__Integer__Group_0__1 ;
+    // InternalRoom.g:22584:1: rule__Integer__Group_0__0 : rule__Integer__Group_0__0__Impl rule__Integer__Group_0__1 ;
     public final void rule__Integer__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22585:1: ( rule__Integer__Group_0__0__Impl rule__Integer__Group_0__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22586:2: rule__Integer__Group_0__0__Impl rule__Integer__Group_0__1
+            // InternalRoom.g:22588:1: ( rule__Integer__Group_0__0__Impl rule__Integer__Group_0__1 )
+            // InternalRoom.g:22589:2: rule__Integer__Group_0__0__Impl rule__Integer__Group_0__1
             {
-            pushFollow(FOLLOW_rule__Integer__Group_0__0__Impl_in_rule__Integer__Group_0__045498);
+            pushFollow(FOLLOW_116);
             rule__Integer__Group_0__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Integer__Group_0__1_in_rule__Integer__Group_0__045501);
+            pushFollow(FOLLOW_2);
             rule__Integer__Group_0__1();
 
             state._fsp--;
@@ -61245,20 +61245,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Integer__Group_0__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22593:1: rule__Integer__Group_0__0__Impl : ( ( rule__Integer__Alternatives_0_0 )? ) ;
+    // InternalRoom.g:22596:1: rule__Integer__Group_0__0__Impl : ( ( rule__Integer__Alternatives_0_0 )? ) ;
     public final void rule__Integer__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22597:1: ( ( ( rule__Integer__Alternatives_0_0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22598:1: ( ( rule__Integer__Alternatives_0_0 )? )
+            // InternalRoom.g:22600:1: ( ( ( rule__Integer__Alternatives_0_0 )? ) )
+            // InternalRoom.g:22601:1: ( ( rule__Integer__Alternatives_0_0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22598:1: ( ( rule__Integer__Alternatives_0_0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22599:1: ( rule__Integer__Alternatives_0_0 )?
+            // InternalRoom.g:22601:1: ( ( rule__Integer__Alternatives_0_0 )? )
+            // InternalRoom.g:22602:1: ( rule__Integer__Alternatives_0_0 )?
             {
              before(grammarAccess.getIntegerAccess().getAlternatives_0_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22600:1: ( rule__Integer__Alternatives_0_0 )?
+            // InternalRoom.g:22603:1: ( rule__Integer__Alternatives_0_0 )?
             int alt197=2;
             int LA197_0 = input.LA(1);
 
@@ -61267,9 +61267,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt197) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22600:2: rule__Integer__Alternatives_0_0
+                    // InternalRoom.g:22603:2: rule__Integer__Alternatives_0_0
                     {
-                    pushFollow(FOLLOW_rule__Integer__Alternatives_0_0_in_rule__Integer__Group_0__0__Impl45528);
+                    pushFollow(FOLLOW_2);
                     rule__Integer__Alternatives_0_0();
 
                     state._fsp--;
@@ -61303,16 +61303,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Integer__Group_0__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22610:1: rule__Integer__Group_0__1 : rule__Integer__Group_0__1__Impl ;
+    // InternalRoom.g:22613:1: rule__Integer__Group_0__1 : rule__Integer__Group_0__1__Impl ;
     public final void rule__Integer__Group_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22614:1: ( rule__Integer__Group_0__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22615:2: rule__Integer__Group_0__1__Impl
+            // InternalRoom.g:22617:1: ( rule__Integer__Group_0__1__Impl )
+            // InternalRoom.g:22618:2: rule__Integer__Group_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__Integer__Group_0__1__Impl_in_rule__Integer__Group_0__145559);
+            pushFollow(FOLLOW_2);
             rule__Integer__Group_0__1__Impl();
 
             state._fsp--;
@@ -61336,20 +61336,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Integer__Group_0__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22621:1: rule__Integer__Group_0__1__Impl : ( RULE_INT ) ;
+    // InternalRoom.g:22624:1: rule__Integer__Group_0__1__Impl : ( RULE_INT ) ;
     public final void rule__Integer__Group_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22625:1: ( ( RULE_INT ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22626:1: ( RULE_INT )
+            // InternalRoom.g:22628:1: ( ( RULE_INT ) )
+            // InternalRoom.g:22629:1: ( RULE_INT )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22626:1: ( RULE_INT )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22627:1: RULE_INT
+            // InternalRoom.g:22629:1: ( RULE_INT )
+            // InternalRoom.g:22630:1: RULE_INT
             {
              before(grammarAccess.getIntegerAccess().getINTTerminalRuleCall_0_1()); 
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__Integer__Group_0__1__Impl45586); 
+            match(input,RULE_INT,FOLLOW_2); 
              after(grammarAccess.getIntegerAccess().getINTTerminalRuleCall_0_1()); 
 
             }
@@ -61373,21 +61373,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Decimal__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22642:1: rule__Decimal__Group__0 : rule__Decimal__Group__0__Impl rule__Decimal__Group__1 ;
+    // InternalRoom.g:22645:1: rule__Decimal__Group__0 : rule__Decimal__Group__0__Impl rule__Decimal__Group__1 ;
     public final void rule__Decimal__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22646:1: ( rule__Decimal__Group__0__Impl rule__Decimal__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22647:2: rule__Decimal__Group__0__Impl rule__Decimal__Group__1
+            // InternalRoom.g:22649:1: ( rule__Decimal__Group__0__Impl rule__Decimal__Group__1 )
+            // InternalRoom.g:22650:2: rule__Decimal__Group__0__Impl rule__Decimal__Group__1
             {
-            pushFollow(FOLLOW_rule__Decimal__Group__0__Impl_in_rule__Decimal__Group__045619);
+            pushFollow(FOLLOW_116);
             rule__Decimal__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Decimal__Group__1_in_rule__Decimal__Group__045622);
+            pushFollow(FOLLOW_2);
             rule__Decimal__Group__1();
 
             state._fsp--;
@@ -61411,20 +61411,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Decimal__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22654:1: rule__Decimal__Group__0__Impl : ( ( rule__Decimal__Alternatives_0 )? ) ;
+    // InternalRoom.g:22657:1: rule__Decimal__Group__0__Impl : ( ( rule__Decimal__Alternatives_0 )? ) ;
     public final void rule__Decimal__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22658:1: ( ( ( rule__Decimal__Alternatives_0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22659:1: ( ( rule__Decimal__Alternatives_0 )? )
+            // InternalRoom.g:22661:1: ( ( ( rule__Decimal__Alternatives_0 )? ) )
+            // InternalRoom.g:22662:1: ( ( rule__Decimal__Alternatives_0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22659:1: ( ( rule__Decimal__Alternatives_0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22660:1: ( rule__Decimal__Alternatives_0 )?
+            // InternalRoom.g:22662:1: ( ( rule__Decimal__Alternatives_0 )? )
+            // InternalRoom.g:22663:1: ( rule__Decimal__Alternatives_0 )?
             {
              before(grammarAccess.getDecimalAccess().getAlternatives_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22661:1: ( rule__Decimal__Alternatives_0 )?
+            // InternalRoom.g:22664:1: ( rule__Decimal__Alternatives_0 )?
             int alt198=2;
             int LA198_0 = input.LA(1);
 
@@ -61433,9 +61433,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt198) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22661:2: rule__Decimal__Alternatives_0
+                    // InternalRoom.g:22664:2: rule__Decimal__Alternatives_0
                     {
-                    pushFollow(FOLLOW_rule__Decimal__Alternatives_0_in_rule__Decimal__Group__0__Impl45649);
+                    pushFollow(FOLLOW_2);
                     rule__Decimal__Alternatives_0();
 
                     state._fsp--;
@@ -61469,21 +61469,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Decimal__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22671:1: rule__Decimal__Group__1 : rule__Decimal__Group__1__Impl rule__Decimal__Group__2 ;
+    // InternalRoom.g:22674:1: rule__Decimal__Group__1 : rule__Decimal__Group__1__Impl rule__Decimal__Group__2 ;
     public final void rule__Decimal__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22675:1: ( rule__Decimal__Group__1__Impl rule__Decimal__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22676:2: rule__Decimal__Group__1__Impl rule__Decimal__Group__2
+            // InternalRoom.g:22678:1: ( rule__Decimal__Group__1__Impl rule__Decimal__Group__2 )
+            // InternalRoom.g:22679:2: rule__Decimal__Group__1__Impl rule__Decimal__Group__2
             {
-            pushFollow(FOLLOW_rule__Decimal__Group__1__Impl_in_rule__Decimal__Group__145680);
+            pushFollow(FOLLOW_71);
             rule__Decimal__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Decimal__Group__2_in_rule__Decimal__Group__145683);
+            pushFollow(FOLLOW_2);
             rule__Decimal__Group__2();
 
             state._fsp--;
@@ -61507,20 +61507,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Decimal__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22683:1: rule__Decimal__Group__1__Impl : ( RULE_INT ) ;
+    // InternalRoom.g:22686:1: rule__Decimal__Group__1__Impl : ( RULE_INT ) ;
     public final void rule__Decimal__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22687:1: ( ( RULE_INT ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22688:1: ( RULE_INT )
+            // InternalRoom.g:22690:1: ( ( RULE_INT ) )
+            // InternalRoom.g:22691:1: ( RULE_INT )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22688:1: ( RULE_INT )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22689:1: RULE_INT
+            // InternalRoom.g:22691:1: ( RULE_INT )
+            // InternalRoom.g:22692:1: RULE_INT
             {
              before(grammarAccess.getDecimalAccess().getINTTerminalRuleCall_1()); 
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__Decimal__Group__1__Impl45710); 
+            match(input,RULE_INT,FOLLOW_2); 
              after(grammarAccess.getDecimalAccess().getINTTerminalRuleCall_1()); 
 
             }
@@ -61544,21 +61544,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Decimal__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22700:1: rule__Decimal__Group__2 : rule__Decimal__Group__2__Impl rule__Decimal__Group__3 ;
+    // InternalRoom.g:22703:1: rule__Decimal__Group__2 : rule__Decimal__Group__2__Impl rule__Decimal__Group__3 ;
     public final void rule__Decimal__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22704:1: ( rule__Decimal__Group__2__Impl rule__Decimal__Group__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22705:2: rule__Decimal__Group__2__Impl rule__Decimal__Group__3
+            // InternalRoom.g:22707:1: ( rule__Decimal__Group__2__Impl rule__Decimal__Group__3 )
+            // InternalRoom.g:22708:2: rule__Decimal__Group__2__Impl rule__Decimal__Group__3
             {
-            pushFollow(FOLLOW_rule__Decimal__Group__2__Impl_in_rule__Decimal__Group__245739);
+            pushFollow(FOLLOW_30);
             rule__Decimal__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Decimal__Group__3_in_rule__Decimal__Group__245742);
+            pushFollow(FOLLOW_2);
             rule__Decimal__Group__3();
 
             state._fsp--;
@@ -61582,20 +61582,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Decimal__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22712:1: rule__Decimal__Group__2__Impl : ( '.' ) ;
+    // InternalRoom.g:22715:1: rule__Decimal__Group__2__Impl : ( '.' ) ;
     public final void rule__Decimal__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22716:1: ( ( '.' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22717:1: ( '.' )
+            // InternalRoom.g:22719:1: ( ( '.' ) )
+            // InternalRoom.g:22720:1: ( '.' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22717:1: ( '.' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22718:1: '.'
+            // InternalRoom.g:22720:1: ( '.' )
+            // InternalRoom.g:22721:1: '.'
             {
              before(grammarAccess.getDecimalAccess().getFullStopKeyword_2()); 
-            match(input,86,FOLLOW_86_in_rule__Decimal__Group__2__Impl45770); 
+            match(input,86,FOLLOW_2); 
              after(grammarAccess.getDecimalAccess().getFullStopKeyword_2()); 
 
             }
@@ -61619,16 +61619,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Decimal__Group__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22731:1: rule__Decimal__Group__3 : rule__Decimal__Group__3__Impl ;
+    // InternalRoom.g:22734:1: rule__Decimal__Group__3 : rule__Decimal__Group__3__Impl ;
     public final void rule__Decimal__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22735:1: ( rule__Decimal__Group__3__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22736:2: rule__Decimal__Group__3__Impl
+            // InternalRoom.g:22738:1: ( rule__Decimal__Group__3__Impl )
+            // InternalRoom.g:22739:2: rule__Decimal__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__Decimal__Group__3__Impl_in_rule__Decimal__Group__345801);
+            pushFollow(FOLLOW_2);
             rule__Decimal__Group__3__Impl();
 
             state._fsp--;
@@ -61652,20 +61652,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Decimal__Group__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22742:1: rule__Decimal__Group__3__Impl : ( RULE_INT ) ;
+    // InternalRoom.g:22745:1: rule__Decimal__Group__3__Impl : ( RULE_INT ) ;
     public final void rule__Decimal__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22746:1: ( ( RULE_INT ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22747:1: ( RULE_INT )
+            // InternalRoom.g:22749:1: ( ( RULE_INT ) )
+            // InternalRoom.g:22750:1: ( RULE_INT )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22747:1: ( RULE_INT )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22748:1: RULE_INT
+            // InternalRoom.g:22750:1: ( RULE_INT )
+            // InternalRoom.g:22751:1: RULE_INT
             {
              before(grammarAccess.getDecimalAccess().getINTTerminalRuleCall_3()); 
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__Decimal__Group__3__Impl45828); 
+            match(input,RULE_INT,FOLLOW_2); 
              after(grammarAccess.getDecimalAccess().getINTTerminalRuleCall_3()); 
 
             }
@@ -61689,21 +61689,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22767:1: rule__DecimalExp__Group__0 : rule__DecimalExp__Group__0__Impl rule__DecimalExp__Group__1 ;
+    // InternalRoom.g:22770:1: rule__DecimalExp__Group__0 : rule__DecimalExp__Group__0__Impl rule__DecimalExp__Group__1 ;
     public final void rule__DecimalExp__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22771:1: ( rule__DecimalExp__Group__0__Impl rule__DecimalExp__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22772:2: rule__DecimalExp__Group__0__Impl rule__DecimalExp__Group__1
+            // InternalRoom.g:22774:1: ( rule__DecimalExp__Group__0__Impl rule__DecimalExp__Group__1 )
+            // InternalRoom.g:22775:2: rule__DecimalExp__Group__0__Impl rule__DecimalExp__Group__1
             {
-            pushFollow(FOLLOW_rule__DecimalExp__Group__0__Impl_in_rule__DecimalExp__Group__045865);
+            pushFollow(FOLLOW_21);
             rule__DecimalExp__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__DecimalExp__Group__1_in_rule__DecimalExp__Group__045868);
+            pushFollow(FOLLOW_2);
             rule__DecimalExp__Group__1();
 
             state._fsp--;
@@ -61727,20 +61727,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22779:1: rule__DecimalExp__Group__0__Impl : ( ( rule__DecimalExp__Alternatives_0 )? ) ;
+    // InternalRoom.g:22782:1: rule__DecimalExp__Group__0__Impl : ( ( rule__DecimalExp__Alternatives_0 )? ) ;
     public final void rule__DecimalExp__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22783:1: ( ( ( rule__DecimalExp__Alternatives_0 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22784:1: ( ( rule__DecimalExp__Alternatives_0 )? )
+            // InternalRoom.g:22786:1: ( ( ( rule__DecimalExp__Alternatives_0 )? ) )
+            // InternalRoom.g:22787:1: ( ( rule__DecimalExp__Alternatives_0 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22784:1: ( ( rule__DecimalExp__Alternatives_0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22785:1: ( rule__DecimalExp__Alternatives_0 )?
+            // InternalRoom.g:22787:1: ( ( rule__DecimalExp__Alternatives_0 )? )
+            // InternalRoom.g:22788:1: ( rule__DecimalExp__Alternatives_0 )?
             {
              before(grammarAccess.getDecimalExpAccess().getAlternatives_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22786:1: ( rule__DecimalExp__Alternatives_0 )?
+            // InternalRoom.g:22789:1: ( rule__DecimalExp__Alternatives_0 )?
             int alt199=2;
             int LA199_0 = input.LA(1);
 
@@ -61749,9 +61749,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt199) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22786:2: rule__DecimalExp__Alternatives_0
+                    // InternalRoom.g:22789:2: rule__DecimalExp__Alternatives_0
                     {
-                    pushFollow(FOLLOW_rule__DecimalExp__Alternatives_0_in_rule__DecimalExp__Group__0__Impl45895);
+                    pushFollow(FOLLOW_2);
                     rule__DecimalExp__Alternatives_0();
 
                     state._fsp--;
@@ -61785,21 +61785,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22796:1: rule__DecimalExp__Group__1 : rule__DecimalExp__Group__1__Impl rule__DecimalExp__Group__2 ;
+    // InternalRoom.g:22799:1: rule__DecimalExp__Group__1 : rule__DecimalExp__Group__1__Impl rule__DecimalExp__Group__2 ;
     public final void rule__DecimalExp__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22800:1: ( rule__DecimalExp__Group__1__Impl rule__DecimalExp__Group__2 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22801:2: rule__DecimalExp__Group__1__Impl rule__DecimalExp__Group__2
+            // InternalRoom.g:22803:1: ( rule__DecimalExp__Group__1__Impl rule__DecimalExp__Group__2 )
+            // InternalRoom.g:22804:2: rule__DecimalExp__Group__1__Impl rule__DecimalExp__Group__2
             {
-            pushFollow(FOLLOW_rule__DecimalExp__Group__1__Impl_in_rule__DecimalExp__Group__145926);
+            pushFollow(FOLLOW_71);
             rule__DecimalExp__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__DecimalExp__Group__2_in_rule__DecimalExp__Group__145929);
+            pushFollow(FOLLOW_2);
             rule__DecimalExp__Group__2();
 
             state._fsp--;
@@ -61823,20 +61823,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22808:1: rule__DecimalExp__Group__1__Impl : ( RULE_INT ) ;
+    // InternalRoom.g:22811:1: rule__DecimalExp__Group__1__Impl : ( RULE_INT ) ;
     public final void rule__DecimalExp__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22812:1: ( ( RULE_INT ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22813:1: ( RULE_INT )
+            // InternalRoom.g:22815:1: ( ( RULE_INT ) )
+            // InternalRoom.g:22816:1: ( RULE_INT )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22813:1: ( RULE_INT )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22814:1: RULE_INT
+            // InternalRoom.g:22816:1: ( RULE_INT )
+            // InternalRoom.g:22817:1: RULE_INT
             {
              before(grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_1()); 
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__DecimalExp__Group__1__Impl45956); 
+            match(input,RULE_INT,FOLLOW_2); 
              after(grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_1()); 
 
             }
@@ -61860,21 +61860,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22825:1: rule__DecimalExp__Group__2 : rule__DecimalExp__Group__2__Impl rule__DecimalExp__Group__3 ;
+    // InternalRoom.g:22828:1: rule__DecimalExp__Group__2 : rule__DecimalExp__Group__2__Impl rule__DecimalExp__Group__3 ;
     public final void rule__DecimalExp__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22829:1: ( rule__DecimalExp__Group__2__Impl rule__DecimalExp__Group__3 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22830:2: rule__DecimalExp__Group__2__Impl rule__DecimalExp__Group__3
+            // InternalRoom.g:22832:1: ( rule__DecimalExp__Group__2__Impl rule__DecimalExp__Group__3 )
+            // InternalRoom.g:22833:2: rule__DecimalExp__Group__2__Impl rule__DecimalExp__Group__3
             {
-            pushFollow(FOLLOW_rule__DecimalExp__Group__2__Impl_in_rule__DecimalExp__Group__245985);
+            pushFollow(FOLLOW_30);
             rule__DecimalExp__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__DecimalExp__Group__3_in_rule__DecimalExp__Group__245988);
+            pushFollow(FOLLOW_2);
             rule__DecimalExp__Group__3();
 
             state._fsp--;
@@ -61898,20 +61898,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__2__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22837:1: rule__DecimalExp__Group__2__Impl : ( '.' ) ;
+    // InternalRoom.g:22840:1: rule__DecimalExp__Group__2__Impl : ( '.' ) ;
     public final void rule__DecimalExp__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22841:1: ( ( '.' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22842:1: ( '.' )
+            // InternalRoom.g:22844:1: ( ( '.' ) )
+            // InternalRoom.g:22845:1: ( '.' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22842:1: ( '.' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22843:1: '.'
+            // InternalRoom.g:22845:1: ( '.' )
+            // InternalRoom.g:22846:1: '.'
             {
              before(grammarAccess.getDecimalExpAccess().getFullStopKeyword_2()); 
-            match(input,86,FOLLOW_86_in_rule__DecimalExp__Group__2__Impl46016); 
+            match(input,86,FOLLOW_2); 
              after(grammarAccess.getDecimalExpAccess().getFullStopKeyword_2()); 
 
             }
@@ -61935,21 +61935,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22856:1: rule__DecimalExp__Group__3 : rule__DecimalExp__Group__3__Impl rule__DecimalExp__Group__4 ;
+    // InternalRoom.g:22859:1: rule__DecimalExp__Group__3 : rule__DecimalExp__Group__3__Impl rule__DecimalExp__Group__4 ;
     public final void rule__DecimalExp__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22860:1: ( rule__DecimalExp__Group__3__Impl rule__DecimalExp__Group__4 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22861:2: rule__DecimalExp__Group__3__Impl rule__DecimalExp__Group__4
+            // InternalRoom.g:22863:1: ( rule__DecimalExp__Group__3__Impl rule__DecimalExp__Group__4 )
+            // InternalRoom.g:22864:2: rule__DecimalExp__Group__3__Impl rule__DecimalExp__Group__4
             {
-            pushFollow(FOLLOW_rule__DecimalExp__Group__3__Impl_in_rule__DecimalExp__Group__346047);
+            pushFollow(FOLLOW_117);
             rule__DecimalExp__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__DecimalExp__Group__4_in_rule__DecimalExp__Group__346050);
+            pushFollow(FOLLOW_2);
             rule__DecimalExp__Group__4();
 
             state._fsp--;
@@ -61973,20 +61973,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__3__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22868:1: rule__DecimalExp__Group__3__Impl : ( RULE_INT ) ;
+    // InternalRoom.g:22871:1: rule__DecimalExp__Group__3__Impl : ( RULE_INT ) ;
     public final void rule__DecimalExp__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22872:1: ( ( RULE_INT ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22873:1: ( RULE_INT )
+            // InternalRoom.g:22875:1: ( ( RULE_INT ) )
+            // InternalRoom.g:22876:1: ( RULE_INT )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22873:1: ( RULE_INT )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22874:1: RULE_INT
+            // InternalRoom.g:22876:1: ( RULE_INT )
+            // InternalRoom.g:22877:1: RULE_INT
             {
              before(grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_3()); 
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__DecimalExp__Group__3__Impl46077); 
+            match(input,RULE_INT,FOLLOW_2); 
              after(grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_3()); 
 
             }
@@ -62010,21 +62010,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__4"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22885:1: rule__DecimalExp__Group__4 : rule__DecimalExp__Group__4__Impl rule__DecimalExp__Group__5 ;
+    // InternalRoom.g:22888:1: rule__DecimalExp__Group__4 : rule__DecimalExp__Group__4__Impl rule__DecimalExp__Group__5 ;
     public final void rule__DecimalExp__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22889:1: ( rule__DecimalExp__Group__4__Impl rule__DecimalExp__Group__5 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22890:2: rule__DecimalExp__Group__4__Impl rule__DecimalExp__Group__5
+            // InternalRoom.g:22892:1: ( rule__DecimalExp__Group__4__Impl rule__DecimalExp__Group__5 )
+            // InternalRoom.g:22893:2: rule__DecimalExp__Group__4__Impl rule__DecimalExp__Group__5
             {
-            pushFollow(FOLLOW_rule__DecimalExp__Group__4__Impl_in_rule__DecimalExp__Group__446106);
+            pushFollow(FOLLOW_116);
             rule__DecimalExp__Group__4__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__DecimalExp__Group__5_in_rule__DecimalExp__Group__446109);
+            pushFollow(FOLLOW_2);
             rule__DecimalExp__Group__5();
 
             state._fsp--;
@@ -62048,23 +62048,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__4__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22897:1: rule__DecimalExp__Group__4__Impl : ( ( rule__DecimalExp__Alternatives_4 ) ) ;
+    // InternalRoom.g:22900:1: rule__DecimalExp__Group__4__Impl : ( ( rule__DecimalExp__Alternatives_4 ) ) ;
     public final void rule__DecimalExp__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22901:1: ( ( ( rule__DecimalExp__Alternatives_4 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22902:1: ( ( rule__DecimalExp__Alternatives_4 ) )
+            // InternalRoom.g:22904:1: ( ( ( rule__DecimalExp__Alternatives_4 ) ) )
+            // InternalRoom.g:22905:1: ( ( rule__DecimalExp__Alternatives_4 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22902:1: ( ( rule__DecimalExp__Alternatives_4 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22903:1: ( rule__DecimalExp__Alternatives_4 )
+            // InternalRoom.g:22905:1: ( ( rule__DecimalExp__Alternatives_4 ) )
+            // InternalRoom.g:22906:1: ( rule__DecimalExp__Alternatives_4 )
             {
              before(grammarAccess.getDecimalExpAccess().getAlternatives_4()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22904:1: ( rule__DecimalExp__Alternatives_4 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22904:2: rule__DecimalExp__Alternatives_4
+            // InternalRoom.g:22907:1: ( rule__DecimalExp__Alternatives_4 )
+            // InternalRoom.g:22907:2: rule__DecimalExp__Alternatives_4
             {
-            pushFollow(FOLLOW_rule__DecimalExp__Alternatives_4_in_rule__DecimalExp__Group__4__Impl46136);
+            pushFollow(FOLLOW_2);
             rule__DecimalExp__Alternatives_4();
 
             state._fsp--;
@@ -62095,21 +62095,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__5"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22914:1: rule__DecimalExp__Group__5 : rule__DecimalExp__Group__5__Impl rule__DecimalExp__Group__6 ;
+    // InternalRoom.g:22917:1: rule__DecimalExp__Group__5 : rule__DecimalExp__Group__5__Impl rule__DecimalExp__Group__6 ;
     public final void rule__DecimalExp__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22918:1: ( rule__DecimalExp__Group__5__Impl rule__DecimalExp__Group__6 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22919:2: rule__DecimalExp__Group__5__Impl rule__DecimalExp__Group__6
+            // InternalRoom.g:22921:1: ( rule__DecimalExp__Group__5__Impl rule__DecimalExp__Group__6 )
+            // InternalRoom.g:22922:2: rule__DecimalExp__Group__5__Impl rule__DecimalExp__Group__6
             {
-            pushFollow(FOLLOW_rule__DecimalExp__Group__5__Impl_in_rule__DecimalExp__Group__546166);
+            pushFollow(FOLLOW_116);
             rule__DecimalExp__Group__5__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__DecimalExp__Group__6_in_rule__DecimalExp__Group__546169);
+            pushFollow(FOLLOW_2);
             rule__DecimalExp__Group__6();
 
             state._fsp--;
@@ -62133,20 +62133,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__5__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22926:1: rule__DecimalExp__Group__5__Impl : ( ( rule__DecimalExp__Alternatives_5 )? ) ;
+    // InternalRoom.g:22929:1: rule__DecimalExp__Group__5__Impl : ( ( rule__DecimalExp__Alternatives_5 )? ) ;
     public final void rule__DecimalExp__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22930:1: ( ( ( rule__DecimalExp__Alternatives_5 )? ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22931:1: ( ( rule__DecimalExp__Alternatives_5 )? )
+            // InternalRoom.g:22933:1: ( ( ( rule__DecimalExp__Alternatives_5 )? ) )
+            // InternalRoom.g:22934:1: ( ( rule__DecimalExp__Alternatives_5 )? )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22931:1: ( ( rule__DecimalExp__Alternatives_5 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22932:1: ( rule__DecimalExp__Alternatives_5 )?
+            // InternalRoom.g:22934:1: ( ( rule__DecimalExp__Alternatives_5 )? )
+            // InternalRoom.g:22935:1: ( rule__DecimalExp__Alternatives_5 )?
             {
              before(grammarAccess.getDecimalExpAccess().getAlternatives_5()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22933:1: ( rule__DecimalExp__Alternatives_5 )?
+            // InternalRoom.g:22936:1: ( rule__DecimalExp__Alternatives_5 )?
             int alt200=2;
             int LA200_0 = input.LA(1);
 
@@ -62155,9 +62155,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt200) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22933:2: rule__DecimalExp__Alternatives_5
+                    // InternalRoom.g:22936:2: rule__DecimalExp__Alternatives_5
                     {
-                    pushFollow(FOLLOW_rule__DecimalExp__Alternatives_5_in_rule__DecimalExp__Group__5__Impl46196);
+                    pushFollow(FOLLOW_2);
                     rule__DecimalExp__Alternatives_5();
 
                     state._fsp--;
@@ -62191,16 +62191,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__6"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22943:1: rule__DecimalExp__Group__6 : rule__DecimalExp__Group__6__Impl ;
+    // InternalRoom.g:22946:1: rule__DecimalExp__Group__6 : rule__DecimalExp__Group__6__Impl ;
     public final void rule__DecimalExp__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22947:1: ( rule__DecimalExp__Group__6__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22948:2: rule__DecimalExp__Group__6__Impl
+            // InternalRoom.g:22950:1: ( rule__DecimalExp__Group__6__Impl )
+            // InternalRoom.g:22951:2: rule__DecimalExp__Group__6__Impl
             {
-            pushFollow(FOLLOW_rule__DecimalExp__Group__6__Impl_in_rule__DecimalExp__Group__646227);
+            pushFollow(FOLLOW_2);
             rule__DecimalExp__Group__6__Impl();
 
             state._fsp--;
@@ -62224,20 +62224,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DecimalExp__Group__6__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22954:1: rule__DecimalExp__Group__6__Impl : ( RULE_INT ) ;
+    // InternalRoom.g:22957:1: rule__DecimalExp__Group__6__Impl : ( RULE_INT ) ;
     public final void rule__DecimalExp__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22958:1: ( ( RULE_INT ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22959:1: ( RULE_INT )
+            // InternalRoom.g:22961:1: ( ( RULE_INT ) )
+            // InternalRoom.g:22962:1: ( RULE_INT )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22959:1: ( RULE_INT )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22960:1: RULE_INT
+            // InternalRoom.g:22962:1: ( RULE_INT )
+            // InternalRoom.g:22963:1: RULE_INT
             {
              before(grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_6()); 
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__DecimalExp__Group__6__Impl46254); 
+            match(input,RULE_INT,FOLLOW_2); 
              after(grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_6()); 
 
             }
@@ -62261,21 +62261,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FQN__Group__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22985:1: rule__FQN__Group__0 : rule__FQN__Group__0__Impl rule__FQN__Group__1 ;
+    // InternalRoom.g:22988:1: rule__FQN__Group__0 : rule__FQN__Group__0__Impl rule__FQN__Group__1 ;
     public final void rule__FQN__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22989:1: ( rule__FQN__Group__0__Impl rule__FQN__Group__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22990:2: rule__FQN__Group__0__Impl rule__FQN__Group__1
+            // InternalRoom.g:22992:1: ( rule__FQN__Group__0__Impl rule__FQN__Group__1 )
+            // InternalRoom.g:22993:2: rule__FQN__Group__0__Impl rule__FQN__Group__1
             {
-            pushFollow(FOLLOW_rule__FQN__Group__0__Impl_in_rule__FQN__Group__046297);
+            pushFollow(FOLLOW_71);
             rule__FQN__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__FQN__Group__1_in_rule__FQN__Group__046300);
+            pushFollow(FOLLOW_2);
             rule__FQN__Group__1();
 
             state._fsp--;
@@ -62299,20 +62299,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FQN__Group__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:22997:1: rule__FQN__Group__0__Impl : ( RULE_ID ) ;
+    // InternalRoom.g:23000:1: rule__FQN__Group__0__Impl : ( RULE_ID ) ;
     public final void rule__FQN__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23001:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23002:1: ( RULE_ID )
+            // InternalRoom.g:23004:1: ( ( RULE_ID ) )
+            // InternalRoom.g:23005:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23002:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23003:1: RULE_ID
+            // InternalRoom.g:23005:1: ( RULE_ID )
+            // InternalRoom.g:23006:1: RULE_ID
             {
              before(grammarAccess.getFQNAccess().getIDTerminalRuleCall_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__FQN__Group__0__Impl46327); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getFQNAccess().getIDTerminalRuleCall_0()); 
 
             }
@@ -62336,16 +62336,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FQN__Group__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23014:1: rule__FQN__Group__1 : rule__FQN__Group__1__Impl ;
+    // InternalRoom.g:23017:1: rule__FQN__Group__1 : rule__FQN__Group__1__Impl ;
     public final void rule__FQN__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23018:1: ( rule__FQN__Group__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23019:2: rule__FQN__Group__1__Impl
+            // InternalRoom.g:23021:1: ( rule__FQN__Group__1__Impl )
+            // InternalRoom.g:23022:2: rule__FQN__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__FQN__Group__1__Impl_in_rule__FQN__Group__146356);
+            pushFollow(FOLLOW_2);
             rule__FQN__Group__1__Impl();
 
             state._fsp--;
@@ -62369,20 +62369,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FQN__Group__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23025:1: rule__FQN__Group__1__Impl : ( ( rule__FQN__Group_1__0 )* ) ;
+    // InternalRoom.g:23028:1: rule__FQN__Group__1__Impl : ( ( rule__FQN__Group_1__0 )* ) ;
     public final void rule__FQN__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23029:1: ( ( ( rule__FQN__Group_1__0 )* ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23030:1: ( ( rule__FQN__Group_1__0 )* )
+            // InternalRoom.g:23032:1: ( ( ( rule__FQN__Group_1__0 )* ) )
+            // InternalRoom.g:23033:1: ( ( rule__FQN__Group_1__0 )* )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23030:1: ( ( rule__FQN__Group_1__0 )* )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23031:1: ( rule__FQN__Group_1__0 )*
+            // InternalRoom.g:23033:1: ( ( rule__FQN__Group_1__0 )* )
+            // InternalRoom.g:23034:1: ( rule__FQN__Group_1__0 )*
             {
              before(grammarAccess.getFQNAccess().getGroup_1()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23032:1: ( rule__FQN__Group_1__0 )*
+            // InternalRoom.g:23035:1: ( rule__FQN__Group_1__0 )*
             loop201:
             do {
                 int alt201=2;
@@ -62395,9 +62395,9 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
                 switch (alt201) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23032:2: rule__FQN__Group_1__0
+            	    // InternalRoom.g:23035:2: rule__FQN__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__FQN__Group_1__0_in_rule__FQN__Group__1__Impl46383);
+            	    pushFollow(FOLLOW_118);
             	    rule__FQN__Group_1__0();
 
             	    state._fsp--;
@@ -62434,21 +62434,21 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FQN__Group_1__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23046:1: rule__FQN__Group_1__0 : rule__FQN__Group_1__0__Impl rule__FQN__Group_1__1 ;
+    // InternalRoom.g:23049:1: rule__FQN__Group_1__0 : rule__FQN__Group_1__0__Impl rule__FQN__Group_1__1 ;
     public final void rule__FQN__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23050:1: ( rule__FQN__Group_1__0__Impl rule__FQN__Group_1__1 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23051:2: rule__FQN__Group_1__0__Impl rule__FQN__Group_1__1
+            // InternalRoom.g:23053:1: ( rule__FQN__Group_1__0__Impl rule__FQN__Group_1__1 )
+            // InternalRoom.g:23054:2: rule__FQN__Group_1__0__Impl rule__FQN__Group_1__1
             {
-            pushFollow(FOLLOW_rule__FQN__Group_1__0__Impl_in_rule__FQN__Group_1__046418);
+            pushFollow(FOLLOW_3);
             rule__FQN__Group_1__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__FQN__Group_1__1_in_rule__FQN__Group_1__046421);
+            pushFollow(FOLLOW_2);
             rule__FQN__Group_1__1();
 
             state._fsp--;
@@ -62472,20 +62472,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FQN__Group_1__0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23058:1: rule__FQN__Group_1__0__Impl : ( '.' ) ;
+    // InternalRoom.g:23061:1: rule__FQN__Group_1__0__Impl : ( '.' ) ;
     public final void rule__FQN__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23062:1: ( ( '.' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23063:1: ( '.' )
+            // InternalRoom.g:23065:1: ( ( '.' ) )
+            // InternalRoom.g:23066:1: ( '.' )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23063:1: ( '.' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23064:1: '.'
+            // InternalRoom.g:23066:1: ( '.' )
+            // InternalRoom.g:23067:1: '.'
             {
              before(grammarAccess.getFQNAccess().getFullStopKeyword_1_0()); 
-            match(input,86,FOLLOW_86_in_rule__FQN__Group_1__0__Impl46449); 
+            match(input,86,FOLLOW_2); 
              after(grammarAccess.getFQNAccess().getFullStopKeyword_1_0()); 
 
             }
@@ -62509,16 +62509,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FQN__Group_1__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23077:1: rule__FQN__Group_1__1 : rule__FQN__Group_1__1__Impl ;
+    // InternalRoom.g:23080:1: rule__FQN__Group_1__1 : rule__FQN__Group_1__1__Impl ;
     public final void rule__FQN__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23081:1: ( rule__FQN__Group_1__1__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23082:2: rule__FQN__Group_1__1__Impl
+            // InternalRoom.g:23084:1: ( rule__FQN__Group_1__1__Impl )
+            // InternalRoom.g:23085:2: rule__FQN__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__FQN__Group_1__1__Impl_in_rule__FQN__Group_1__146480);
+            pushFollow(FOLLOW_2);
             rule__FQN__Group_1__1__Impl();
 
             state._fsp--;
@@ -62542,20 +62542,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FQN__Group_1__1__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23088:1: rule__FQN__Group_1__1__Impl : ( RULE_ID ) ;
+    // InternalRoom.g:23091:1: rule__FQN__Group_1__1__Impl : ( RULE_ID ) ;
     public final void rule__FQN__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23092:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23093:1: ( RULE_ID )
+            // InternalRoom.g:23095:1: ( ( RULE_ID ) )
+            // InternalRoom.g:23096:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23093:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23094:1: RULE_ID
+            // InternalRoom.g:23096:1: ( RULE_ID )
+            // InternalRoom.g:23097:1: RULE_ID
             {
              before(grammarAccess.getFQNAccess().getIDTerminalRuleCall_1_1()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__FQN__Group_1__1__Impl46507); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getFQNAccess().getIDTerminalRuleCall_1_1()); 
 
             }
@@ -62579,31 +62579,31 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__UnorderedGroup_0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23110:1: rule__ActorClass__UnorderedGroup_0 : ( rule__ActorClass__UnorderedGroup_0__0 )? ;
+    // InternalRoom.g:23113:1: rule__ActorClass__UnorderedGroup_0 : ( rule__ActorClass__UnorderedGroup_0__0 )? ;
     public final void rule__ActorClass__UnorderedGroup_0() throws RecognitionException {
 
             	int stackSize = keepStackSize();
         		getUnorderedGroupHelper().enter(grammarAccess.getActorClassAccess().getUnorderedGroup_0());
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23115:1: ( ( rule__ActorClass__UnorderedGroup_0__0 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23116:2: ( rule__ActorClass__UnorderedGroup_0__0 )?
+            // InternalRoom.g:23118:1: ( ( rule__ActorClass__UnorderedGroup_0__0 )? )
+            // InternalRoom.g:23119:2: ( rule__ActorClass__UnorderedGroup_0__0 )?
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23116:2: ( rule__ActorClass__UnorderedGroup_0__0 )?
+            // InternalRoom.g:23119:2: ( rule__ActorClass__UnorderedGroup_0__0 )?
             int alt202=2;
             int LA202_0 = input.LA(1);
 
-            if ( LA202_0 ==129 && getUnorderedGroupHelper().canSelect(grammarAccess.getActorClassAccess().getUnorderedGroup_0(), 0) ) {
+            if ( LA202_0 == 129 && getUnorderedGroupHelper().canSelect(grammarAccess.getActorClassAccess().getUnorderedGroup_0(), 0) ) {
                 alt202=1;
             }
-            else if ( ( LA202_0 >=30 && LA202_0<=32 ||LA202_0==35 ) && getUnorderedGroupHelper().canSelect(grammarAccess.getActorClassAccess().getUnorderedGroup_0(), 1) ) {
+            else if ( ( LA202_0 >= 30 && LA202_0 <= 32 || LA202_0 == 35 ) && getUnorderedGroupHelper().canSelect(grammarAccess.getActorClassAccess().getUnorderedGroup_0(), 1) ) {
                 alt202=1;
             }
             switch (alt202) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23116:2: rule__ActorClass__UnorderedGroup_0__0
+                    // InternalRoom.g:23119:2: rule__ActorClass__UnorderedGroup_0__0
                     {
-                    pushFollow(FOLLOW_rule__ActorClass__UnorderedGroup_0__0_in_rule__ActorClass__UnorderedGroup_046541);
+                    pushFollow(FOLLOW_2);
                     rule__ActorClass__UnorderedGroup_0__0();
 
                     state._fsp--;
@@ -62634,24 +62634,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__UnorderedGroup_0__Impl"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23126:1: rule__ActorClass__UnorderedGroup_0__Impl : ( ({...}? => ( ( ( rule__ActorClass__AbstractAssignment_0_0 ) ) ) ) | ({...}? => ( ( ( rule__ActorClass__CommTypeAssignment_0_1 ) ) ) ) ) ;
+    // InternalRoom.g:23129:1: rule__ActorClass__UnorderedGroup_0__Impl : ( ({...}? => ( ( ( rule__ActorClass__AbstractAssignment_0_0 ) ) ) ) | ({...}? => ( ( ( rule__ActorClass__CommTypeAssignment_0_1 ) ) ) ) ) ;
     public final void rule__ActorClass__UnorderedGroup_0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         		boolean selected = false;
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23131:1: ( ( ({...}? => ( ( ( rule__ActorClass__AbstractAssignment_0_0 ) ) ) ) | ({...}? => ( ( ( rule__ActorClass__CommTypeAssignment_0_1 ) ) ) ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23132:3: ( ({...}? => ( ( ( rule__ActorClass__AbstractAssignment_0_0 ) ) ) ) | ({...}? => ( ( ( rule__ActorClass__CommTypeAssignment_0_1 ) ) ) ) )
+            // InternalRoom.g:23134:1: ( ( ({...}? => ( ( ( rule__ActorClass__AbstractAssignment_0_0 ) ) ) ) | ({...}? => ( ( ( rule__ActorClass__CommTypeAssignment_0_1 ) ) ) ) ) )
+            // InternalRoom.g:23135:3: ( ({...}? => ( ( ( rule__ActorClass__AbstractAssignment_0_0 ) ) ) ) | ({...}? => ( ( ( rule__ActorClass__CommTypeAssignment_0_1 ) ) ) ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23132:3: ( ({...}? => ( ( ( rule__ActorClass__AbstractAssignment_0_0 ) ) ) ) | ({...}? => ( ( ( rule__ActorClass__CommTypeAssignment_0_1 ) ) ) ) )
+            // InternalRoom.g:23135:3: ( ({...}? => ( ( ( rule__ActorClass__AbstractAssignment_0_0 ) ) ) ) | ({...}? => ( ( ( rule__ActorClass__CommTypeAssignment_0_1 ) ) ) ) )
             int alt203=2;
             int LA203_0 = input.LA(1);
 
-            if ( LA203_0 ==129 && getUnorderedGroupHelper().canSelect(grammarAccess.getActorClassAccess().getUnorderedGroup_0(), 0) ) {
+            if ( LA203_0 == 129 && getUnorderedGroupHelper().canSelect(grammarAccess.getActorClassAccess().getUnorderedGroup_0(), 0) ) {
                 alt203=1;
             }
-            else if ( ( LA203_0 >=30 && LA203_0<=32 ||LA203_0==35 ) && getUnorderedGroupHelper().canSelect(grammarAccess.getActorClassAccess().getUnorderedGroup_0(), 1) ) {
+            else if ( ( LA203_0 >= 30 && LA203_0 <= 32 || LA203_0 == 35 ) && getUnorderedGroupHelper().canSelect(grammarAccess.getActorClassAccess().getUnorderedGroup_0(), 1) ) {
                 alt203=2;
             }
             else {
@@ -62662,16 +62662,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             }
             switch (alt203) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23134:4: ({...}? => ( ( ( rule__ActorClass__AbstractAssignment_0_0 ) ) ) )
+                    // InternalRoom.g:23137:4: ({...}? => ( ( ( rule__ActorClass__AbstractAssignment_0_0 ) ) ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23134:4: ({...}? => ( ( ( rule__ActorClass__AbstractAssignment_0_0 ) ) ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23135:5: {...}? => ( ( ( rule__ActorClass__AbstractAssignment_0_0 ) ) )
+                    // InternalRoom.g:23137:4: ({...}? => ( ( ( rule__ActorClass__AbstractAssignment_0_0 ) ) ) )
+                    // InternalRoom.g:23138:5: {...}? => ( ( ( rule__ActorClass__AbstractAssignment_0_0 ) ) )
                     {
                     if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getActorClassAccess().getUnorderedGroup_0(), 0) ) {
                         throw new FailedPredicateException(input, "rule__ActorClass__UnorderedGroup_0__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getActorClassAccess().getUnorderedGroup_0(), 0)");
                     }
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23135:107: ( ( ( rule__ActorClass__AbstractAssignment_0_0 ) ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23136:6: ( ( rule__ActorClass__AbstractAssignment_0_0 ) )
+                    // InternalRoom.g:23138:107: ( ( ( rule__ActorClass__AbstractAssignment_0_0 ) ) )
+                    // InternalRoom.g:23139:6: ( ( rule__ActorClass__AbstractAssignment_0_0 ) )
                     {
                      
                     	 				  getUnorderedGroupHelper().select(grammarAccess.getActorClassAccess().getUnorderedGroup_0(), 0);
@@ -62679,14 +62679,14 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
                     	 				  selected = true;
                     	 				
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23142:6: ( ( rule__ActorClass__AbstractAssignment_0_0 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23144:7: ( rule__ActorClass__AbstractAssignment_0_0 )
+                    // InternalRoom.g:23145:6: ( ( rule__ActorClass__AbstractAssignment_0_0 ) )
+                    // InternalRoom.g:23147:7: ( rule__ActorClass__AbstractAssignment_0_0 )
                     {
                      before(grammarAccess.getActorClassAccess().getAbstractAssignment_0_0()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23145:7: ( rule__ActorClass__AbstractAssignment_0_0 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23145:8: rule__ActorClass__AbstractAssignment_0_0
+                    // InternalRoom.g:23148:7: ( rule__ActorClass__AbstractAssignment_0_0 )
+                    // InternalRoom.g:23148:8: rule__ActorClass__AbstractAssignment_0_0
                     {
-                    pushFollow(FOLLOW_rule__ActorClass__AbstractAssignment_0_0_in_rule__ActorClass__UnorderedGroup_0__Impl46628);
+                    pushFollow(FOLLOW_2);
                     rule__ActorClass__AbstractAssignment_0_0();
 
                     state._fsp--;
@@ -62708,16 +62708,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23151:4: ({...}? => ( ( ( rule__ActorClass__CommTypeAssignment_0_1 ) ) ) )
+                    // InternalRoom.g:23154:4: ({...}? => ( ( ( rule__ActorClass__CommTypeAssignment_0_1 ) ) ) )
                     {
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23151:4: ({...}? => ( ( ( rule__ActorClass__CommTypeAssignment_0_1 ) ) ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23152:5: {...}? => ( ( ( rule__ActorClass__CommTypeAssignment_0_1 ) ) )
+                    // InternalRoom.g:23154:4: ({...}? => ( ( ( rule__ActorClass__CommTypeAssignment_0_1 ) ) ) )
+                    // InternalRoom.g:23155:5: {...}? => ( ( ( rule__ActorClass__CommTypeAssignment_0_1 ) ) )
                     {
                     if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getActorClassAccess().getUnorderedGroup_0(), 1) ) {
                         throw new FailedPredicateException(input, "rule__ActorClass__UnorderedGroup_0__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getActorClassAccess().getUnorderedGroup_0(), 1)");
                     }
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23152:107: ( ( ( rule__ActorClass__CommTypeAssignment_0_1 ) ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23153:6: ( ( rule__ActorClass__CommTypeAssignment_0_1 ) )
+                    // InternalRoom.g:23155:107: ( ( ( rule__ActorClass__CommTypeAssignment_0_1 ) ) )
+                    // InternalRoom.g:23156:6: ( ( rule__ActorClass__CommTypeAssignment_0_1 ) )
                     {
                      
                     	 				  getUnorderedGroupHelper().select(grammarAccess.getActorClassAccess().getUnorderedGroup_0(), 1);
@@ -62725,14 +62725,14 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
                     	 				  selected = true;
                     	 				
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23159:6: ( ( rule__ActorClass__CommTypeAssignment_0_1 ) )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23161:7: ( rule__ActorClass__CommTypeAssignment_0_1 )
+                    // InternalRoom.g:23162:6: ( ( rule__ActorClass__CommTypeAssignment_0_1 ) )
+                    // InternalRoom.g:23164:7: ( rule__ActorClass__CommTypeAssignment_0_1 )
                     {
                      before(grammarAccess.getActorClassAccess().getCommTypeAssignment_0_1()); 
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23162:7: ( rule__ActorClass__CommTypeAssignment_0_1 )
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23162:8: rule__ActorClass__CommTypeAssignment_0_1
+                    // InternalRoom.g:23165:7: ( rule__ActorClass__CommTypeAssignment_0_1 )
+                    // InternalRoom.g:23165:8: rule__ActorClass__CommTypeAssignment_0_1
                     {
-                    pushFollow(FOLLOW_rule__ActorClass__CommTypeAssignment_0_1_in_rule__ActorClass__UnorderedGroup_0__Impl46719);
+                    pushFollow(FOLLOW_2);
                     rule__ActorClass__CommTypeAssignment_0_1();
 
                     state._fsp--;
@@ -62777,35 +62777,35 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__UnorderedGroup_0__0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23177:1: rule__ActorClass__UnorderedGroup_0__0 : rule__ActorClass__UnorderedGroup_0__Impl ( rule__ActorClass__UnorderedGroup_0__1 )? ;
+    // InternalRoom.g:23180:1: rule__ActorClass__UnorderedGroup_0__0 : rule__ActorClass__UnorderedGroup_0__Impl ( rule__ActorClass__UnorderedGroup_0__1 )? ;
     public final void rule__ActorClass__UnorderedGroup_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23181:1: ( rule__ActorClass__UnorderedGroup_0__Impl ( rule__ActorClass__UnorderedGroup_0__1 )? )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23182:2: rule__ActorClass__UnorderedGroup_0__Impl ( rule__ActorClass__UnorderedGroup_0__1 )?
+            // InternalRoom.g:23184:1: ( rule__ActorClass__UnorderedGroup_0__Impl ( rule__ActorClass__UnorderedGroup_0__1 )? )
+            // InternalRoom.g:23185:2: rule__ActorClass__UnorderedGroup_0__Impl ( rule__ActorClass__UnorderedGroup_0__1 )?
             {
-            pushFollow(FOLLOW_rule__ActorClass__UnorderedGroup_0__Impl_in_rule__ActorClass__UnorderedGroup_0__046778);
+            pushFollow(FOLLOW_119);
             rule__ActorClass__UnorderedGroup_0__Impl();
 
             state._fsp--;
 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23183:2: ( rule__ActorClass__UnorderedGroup_0__1 )?
+            // InternalRoom.g:23186:2: ( rule__ActorClass__UnorderedGroup_0__1 )?
             int alt204=2;
             int LA204_0 = input.LA(1);
 
-            if ( LA204_0 ==129 && getUnorderedGroupHelper().canSelect(grammarAccess.getActorClassAccess().getUnorderedGroup_0(), 0) ) {
+            if ( LA204_0 == 129 && getUnorderedGroupHelper().canSelect(grammarAccess.getActorClassAccess().getUnorderedGroup_0(), 0) ) {
                 alt204=1;
             }
-            else if ( ( LA204_0 >=30 && LA204_0<=32 ||LA204_0==35 ) && getUnorderedGroupHelper().canSelect(grammarAccess.getActorClassAccess().getUnorderedGroup_0(), 1) ) {
+            else if ( ( LA204_0 >= 30 && LA204_0 <= 32 || LA204_0 == 35 ) && getUnorderedGroupHelper().canSelect(grammarAccess.getActorClassAccess().getUnorderedGroup_0(), 1) ) {
                 alt204=1;
             }
             switch (alt204) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23183:2: rule__ActorClass__UnorderedGroup_0__1
+                    // InternalRoom.g:23186:2: rule__ActorClass__UnorderedGroup_0__1
                     {
-                    pushFollow(FOLLOW_rule__ActorClass__UnorderedGroup_0__1_in_rule__ActorClass__UnorderedGroup_0__046781);
+                    pushFollow(FOLLOW_2);
                     rule__ActorClass__UnorderedGroup_0__1();
 
                     state._fsp--;
@@ -62835,16 +62835,16 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__UnorderedGroup_0__1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23190:1: rule__ActorClass__UnorderedGroup_0__1 : rule__ActorClass__UnorderedGroup_0__Impl ;
+    // InternalRoom.g:23193:1: rule__ActorClass__UnorderedGroup_0__1 : rule__ActorClass__UnorderedGroup_0__Impl ;
     public final void rule__ActorClass__UnorderedGroup_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23194:1: ( rule__ActorClass__UnorderedGroup_0__Impl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23195:2: rule__ActorClass__UnorderedGroup_0__Impl
+            // InternalRoom.g:23197:1: ( rule__ActorClass__UnorderedGroup_0__Impl )
+            // InternalRoom.g:23198:2: rule__ActorClass__UnorderedGroup_0__Impl
             {
-            pushFollow(FOLLOW_rule__ActorClass__UnorderedGroup_0__Impl_in_rule__ActorClass__UnorderedGroup_0__146806);
+            pushFollow(FOLLOW_2);
             rule__ActorClass__UnorderedGroup_0__Impl();
 
             state._fsp--;
@@ -62868,20 +62868,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RoomModel__NameAssignment_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23206:1: rule__RoomModel__NameAssignment_1 : ( ruleFQN ) ;
+    // InternalRoom.g:23209:1: rule__RoomModel__NameAssignment_1 : ( ruleFQN ) ;
     public final void rule__RoomModel__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23210:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23211:1: ( ruleFQN )
+            // InternalRoom.g:23213:1: ( ( ruleFQN ) )
+            // InternalRoom.g:23214:1: ( ruleFQN )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23211:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23212:1: ruleFQN
+            // InternalRoom.g:23214:1: ( ruleFQN )
+            // InternalRoom.g:23215:1: ruleFQN
             {
              before(grammarAccess.getRoomModelAccess().getNameFQNParserRuleCall_1_0()); 
-            pushFollow(FOLLOW_ruleFQN_in_rule__RoomModel__NameAssignment_146838);
+            pushFollow(FOLLOW_2);
             ruleFQN();
 
             state._fsp--;
@@ -62909,20 +62909,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RoomModel__DocuAssignment_2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23221:1: rule__RoomModel__DocuAssignment_2 : ( ruleDocumentation ) ;
+    // InternalRoom.g:23224:1: rule__RoomModel__DocuAssignment_2 : ( ruleDocumentation ) ;
     public final void rule__RoomModel__DocuAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23225:1: ( ( ruleDocumentation ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23226:1: ( ruleDocumentation )
+            // InternalRoom.g:23228:1: ( ( ruleDocumentation ) )
+            // InternalRoom.g:23229:1: ( ruleDocumentation )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23226:1: ( ruleDocumentation )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23227:1: ruleDocumentation
+            // InternalRoom.g:23229:1: ( ruleDocumentation )
+            // InternalRoom.g:23230:1: ruleDocumentation
             {
              before(grammarAccess.getRoomModelAccess().getDocuDocumentationParserRuleCall_2_0()); 
-            pushFollow(FOLLOW_ruleDocumentation_in_rule__RoomModel__DocuAssignment_246869);
+            pushFollow(FOLLOW_2);
             ruleDocumentation();
 
             state._fsp--;
@@ -62950,20 +62950,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RoomModel__ImportsAssignment_4"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23236:1: rule__RoomModel__ImportsAssignment_4 : ( ruleImport ) ;
+    // InternalRoom.g:23239:1: rule__RoomModel__ImportsAssignment_4 : ( ruleImport ) ;
     public final void rule__RoomModel__ImportsAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23240:1: ( ( ruleImport ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23241:1: ( ruleImport )
+            // InternalRoom.g:23243:1: ( ( ruleImport ) )
+            // InternalRoom.g:23244:1: ( ruleImport )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23241:1: ( ruleImport )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23242:1: ruleImport
+            // InternalRoom.g:23244:1: ( ruleImport )
+            // InternalRoom.g:23245:1: ruleImport
             {
              before(grammarAccess.getRoomModelAccess().getImportsImportParserRuleCall_4_0()); 
-            pushFollow(FOLLOW_ruleImport_in_rule__RoomModel__ImportsAssignment_446900);
+            pushFollow(FOLLOW_2);
             ruleImport();
 
             state._fsp--;
@@ -62991,20 +62991,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RoomModel__PrimitiveTypesAssignment_5_0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23251:1: rule__RoomModel__PrimitiveTypesAssignment_5_0 : ( rulePrimitiveType ) ;
+    // InternalRoom.g:23254:1: rule__RoomModel__PrimitiveTypesAssignment_5_0 : ( rulePrimitiveType ) ;
     public final void rule__RoomModel__PrimitiveTypesAssignment_5_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23255:1: ( ( rulePrimitiveType ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23256:1: ( rulePrimitiveType )
+            // InternalRoom.g:23258:1: ( ( rulePrimitiveType ) )
+            // InternalRoom.g:23259:1: ( rulePrimitiveType )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23256:1: ( rulePrimitiveType )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23257:1: rulePrimitiveType
+            // InternalRoom.g:23259:1: ( rulePrimitiveType )
+            // InternalRoom.g:23260:1: rulePrimitiveType
             {
              before(grammarAccess.getRoomModelAccess().getPrimitiveTypesPrimitiveTypeParserRuleCall_5_0_0()); 
-            pushFollow(FOLLOW_rulePrimitiveType_in_rule__RoomModel__PrimitiveTypesAssignment_5_046931);
+            pushFollow(FOLLOW_2);
             rulePrimitiveType();
 
             state._fsp--;
@@ -63032,20 +63032,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RoomModel__EnumerationTypesAssignment_5_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23266:1: rule__RoomModel__EnumerationTypesAssignment_5_1 : ( ruleEnumerationType ) ;
+    // InternalRoom.g:23269:1: rule__RoomModel__EnumerationTypesAssignment_5_1 : ( ruleEnumerationType ) ;
     public final void rule__RoomModel__EnumerationTypesAssignment_5_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23270:1: ( ( ruleEnumerationType ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23271:1: ( ruleEnumerationType )
+            // InternalRoom.g:23273:1: ( ( ruleEnumerationType ) )
+            // InternalRoom.g:23274:1: ( ruleEnumerationType )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23271:1: ( ruleEnumerationType )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23272:1: ruleEnumerationType
+            // InternalRoom.g:23274:1: ( ruleEnumerationType )
+            // InternalRoom.g:23275:1: ruleEnumerationType
             {
              before(grammarAccess.getRoomModelAccess().getEnumerationTypesEnumerationTypeParserRuleCall_5_1_0()); 
-            pushFollow(FOLLOW_ruleEnumerationType_in_rule__RoomModel__EnumerationTypesAssignment_5_146962);
+            pushFollow(FOLLOW_2);
             ruleEnumerationType();
 
             state._fsp--;
@@ -63073,20 +63073,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RoomModel__ExternalTypesAssignment_5_2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23281:1: rule__RoomModel__ExternalTypesAssignment_5_2 : ( ruleExternalType ) ;
+    // InternalRoom.g:23284:1: rule__RoomModel__ExternalTypesAssignment_5_2 : ( ruleExternalType ) ;
     public final void rule__RoomModel__ExternalTypesAssignment_5_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23285:1: ( ( ruleExternalType ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23286:1: ( ruleExternalType )
+            // InternalRoom.g:23288:1: ( ( ruleExternalType ) )
+            // InternalRoom.g:23289:1: ( ruleExternalType )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23286:1: ( ruleExternalType )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23287:1: ruleExternalType
+            // InternalRoom.g:23289:1: ( ruleExternalType )
+            // InternalRoom.g:23290:1: ruleExternalType
             {
              before(grammarAccess.getRoomModelAccess().getExternalTypesExternalTypeParserRuleCall_5_2_0()); 
-            pushFollow(FOLLOW_ruleExternalType_in_rule__RoomModel__ExternalTypesAssignment_5_246993);
+            pushFollow(FOLLOW_2);
             ruleExternalType();
 
             state._fsp--;
@@ -63114,20 +63114,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RoomModel__DataClassesAssignment_5_3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23296:1: rule__RoomModel__DataClassesAssignment_5_3 : ( ruleDataClass ) ;
+    // InternalRoom.g:23299:1: rule__RoomModel__DataClassesAssignment_5_3 : ( ruleDataClass ) ;
     public final void rule__RoomModel__DataClassesAssignment_5_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23300:1: ( ( ruleDataClass ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23301:1: ( ruleDataClass )
+            // InternalRoom.g:23303:1: ( ( ruleDataClass ) )
+            // InternalRoom.g:23304:1: ( ruleDataClass )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23301:1: ( ruleDataClass )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23302:1: ruleDataClass
+            // InternalRoom.g:23304:1: ( ruleDataClass )
+            // InternalRoom.g:23305:1: ruleDataClass
             {
              before(grammarAccess.getRoomModelAccess().getDataClassesDataClassParserRuleCall_5_3_0()); 
-            pushFollow(FOLLOW_ruleDataClass_in_rule__RoomModel__DataClassesAssignment_5_347024);
+            pushFollow(FOLLOW_2);
             ruleDataClass();
 
             state._fsp--;
@@ -63155,20 +63155,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RoomModel__ProtocolClassesAssignment_5_4"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23311:1: rule__RoomModel__ProtocolClassesAssignment_5_4 : ( ruleGeneralProtocolClass ) ;
+    // InternalRoom.g:23314:1: rule__RoomModel__ProtocolClassesAssignment_5_4 : ( ruleGeneralProtocolClass ) ;
     public final void rule__RoomModel__ProtocolClassesAssignment_5_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23315:1: ( ( ruleGeneralProtocolClass ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23316:1: ( ruleGeneralProtocolClass )
+            // InternalRoom.g:23318:1: ( ( ruleGeneralProtocolClass ) )
+            // InternalRoom.g:23319:1: ( ruleGeneralProtocolClass )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23316:1: ( ruleGeneralProtocolClass )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23317:1: ruleGeneralProtocolClass
+            // InternalRoom.g:23319:1: ( ruleGeneralProtocolClass )
+            // InternalRoom.g:23320:1: ruleGeneralProtocolClass
             {
              before(grammarAccess.getRoomModelAccess().getProtocolClassesGeneralProtocolClassParserRuleCall_5_4_0()); 
-            pushFollow(FOLLOW_ruleGeneralProtocolClass_in_rule__RoomModel__ProtocolClassesAssignment_5_447055);
+            pushFollow(FOLLOW_2);
             ruleGeneralProtocolClass();
 
             state._fsp--;
@@ -63196,20 +63196,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RoomModel__ActorClassesAssignment_5_5"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23326:1: rule__RoomModel__ActorClassesAssignment_5_5 : ( ruleActorClass ) ;
+    // InternalRoom.g:23329:1: rule__RoomModel__ActorClassesAssignment_5_5 : ( ruleActorClass ) ;
     public final void rule__RoomModel__ActorClassesAssignment_5_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23330:1: ( ( ruleActorClass ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23331:1: ( ruleActorClass )
+            // InternalRoom.g:23333:1: ( ( ruleActorClass ) )
+            // InternalRoom.g:23334:1: ( ruleActorClass )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23331:1: ( ruleActorClass )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23332:1: ruleActorClass
+            // InternalRoom.g:23334:1: ( ruleActorClass )
+            // InternalRoom.g:23335:1: ruleActorClass
             {
              before(grammarAccess.getRoomModelAccess().getActorClassesActorClassParserRuleCall_5_5_0()); 
-            pushFollow(FOLLOW_ruleActorClass_in_rule__RoomModel__ActorClassesAssignment_5_547086);
+            pushFollow(FOLLOW_2);
             ruleActorClass();
 
             state._fsp--;
@@ -63237,20 +63237,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RoomModel__SubSystemClassesAssignment_5_6"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23341:1: rule__RoomModel__SubSystemClassesAssignment_5_6 : ( ruleSubSystemClass ) ;
+    // InternalRoom.g:23344:1: rule__RoomModel__SubSystemClassesAssignment_5_6 : ( ruleSubSystemClass ) ;
     public final void rule__RoomModel__SubSystemClassesAssignment_5_6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23345:1: ( ( ruleSubSystemClass ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23346:1: ( ruleSubSystemClass )
+            // InternalRoom.g:23348:1: ( ( ruleSubSystemClass ) )
+            // InternalRoom.g:23349:1: ( ruleSubSystemClass )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23346:1: ( ruleSubSystemClass )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23347:1: ruleSubSystemClass
+            // InternalRoom.g:23349:1: ( ruleSubSystemClass )
+            // InternalRoom.g:23350:1: ruleSubSystemClass
             {
              before(grammarAccess.getRoomModelAccess().getSubSystemClassesSubSystemClassParserRuleCall_5_6_0()); 
-            pushFollow(FOLLOW_ruleSubSystemClass_in_rule__RoomModel__SubSystemClassesAssignment_5_647117);
+            pushFollow(FOLLOW_2);
             ruleSubSystemClass();
 
             state._fsp--;
@@ -63278,20 +63278,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RoomModel__SystemsAssignment_5_7"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23356:1: rule__RoomModel__SystemsAssignment_5_7 : ( ruleLogicalSystem ) ;
+    // InternalRoom.g:23359:1: rule__RoomModel__SystemsAssignment_5_7 : ( ruleLogicalSystem ) ;
     public final void rule__RoomModel__SystemsAssignment_5_7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23360:1: ( ( ruleLogicalSystem ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23361:1: ( ruleLogicalSystem )
+            // InternalRoom.g:23363:1: ( ( ruleLogicalSystem ) )
+            // InternalRoom.g:23364:1: ( ruleLogicalSystem )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23361:1: ( ruleLogicalSystem )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23362:1: ruleLogicalSystem
+            // InternalRoom.g:23364:1: ( ruleLogicalSystem )
+            // InternalRoom.g:23365:1: ruleLogicalSystem
             {
              before(grammarAccess.getRoomModelAccess().getSystemsLogicalSystemParserRuleCall_5_7_0()); 
-            pushFollow(FOLLOW_ruleLogicalSystem_in_rule__RoomModel__SystemsAssignment_5_747148);
+            pushFollow(FOLLOW_2);
             ruleLogicalSystem();
 
             state._fsp--;
@@ -63319,20 +63319,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RoomModel__AnnotationTypesAssignment_5_8"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23371:1: rule__RoomModel__AnnotationTypesAssignment_5_8 : ( ruleAnnotationType ) ;
+    // InternalRoom.g:23374:1: rule__RoomModel__AnnotationTypesAssignment_5_8 : ( ruleAnnotationType ) ;
     public final void rule__RoomModel__AnnotationTypesAssignment_5_8() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23375:1: ( ( ruleAnnotationType ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23376:1: ( ruleAnnotationType )
+            // InternalRoom.g:23378:1: ( ( ruleAnnotationType ) )
+            // InternalRoom.g:23379:1: ( ruleAnnotationType )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23376:1: ( ruleAnnotationType )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23377:1: ruleAnnotationType
+            // InternalRoom.g:23379:1: ( ruleAnnotationType )
+            // InternalRoom.g:23380:1: ruleAnnotationType
             {
              before(grammarAccess.getRoomModelAccess().getAnnotationTypesAnnotationTypeParserRuleCall_5_8_0()); 
-            pushFollow(FOLLOW_ruleAnnotationType_in_rule__RoomModel__AnnotationTypesAssignment_5_847179);
+            pushFollow(FOLLOW_2);
             ruleAnnotationType();
 
             state._fsp--;
@@ -63360,20 +63360,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__VarDecl__NameAssignment_0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23386:1: rule__VarDecl__NameAssignment_0 : ( RULE_ID ) ;
+    // InternalRoom.g:23389:1: rule__VarDecl__NameAssignment_0 : ( RULE_ID ) ;
     public final void rule__VarDecl__NameAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23390:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23391:1: ( RULE_ID )
+            // InternalRoom.g:23393:1: ( ( RULE_ID ) )
+            // InternalRoom.g:23394:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23391:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23392:1: RULE_ID
+            // InternalRoom.g:23394:1: ( RULE_ID )
+            // InternalRoom.g:23395:1: RULE_ID
             {
              before(grammarAccess.getVarDeclAccess().getNameIDTerminalRuleCall_0_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__VarDecl__NameAssignment_047210); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getVarDeclAccess().getNameIDTerminalRuleCall_0_0()); 
 
             }
@@ -63397,20 +63397,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__VarDecl__RefTypeAssignment_2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23401:1: rule__VarDecl__RefTypeAssignment_2 : ( ruleRefableType ) ;
+    // InternalRoom.g:23404:1: rule__VarDecl__RefTypeAssignment_2 : ( ruleRefableType ) ;
     public final void rule__VarDecl__RefTypeAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23405:1: ( ( ruleRefableType ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23406:1: ( ruleRefableType )
+            // InternalRoom.g:23408:1: ( ( ruleRefableType ) )
+            // InternalRoom.g:23409:1: ( ruleRefableType )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23406:1: ( ruleRefableType )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23407:1: ruleRefableType
+            // InternalRoom.g:23409:1: ( ruleRefableType )
+            // InternalRoom.g:23410:1: ruleRefableType
             {
              before(grammarAccess.getVarDeclAccess().getRefTypeRefableTypeParserRuleCall_2_0()); 
-            pushFollow(FOLLOW_ruleRefableType_in_rule__VarDecl__RefTypeAssignment_247241);
+            pushFollow(FOLLOW_2);
             ruleRefableType();
 
             state._fsp--;
@@ -63438,24 +63438,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefableType__TypeAssignment_0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23416:1: rule__RefableType__TypeAssignment_0 : ( ( ruleFQN ) ) ;
+    // InternalRoom.g:23419:1: rule__RefableType__TypeAssignment_0 : ( ( ruleFQN ) ) ;
     public final void rule__RefableType__TypeAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23420:1: ( ( ( ruleFQN ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23421:1: ( ( ruleFQN ) )
+            // InternalRoom.g:23423:1: ( ( ( ruleFQN ) ) )
+            // InternalRoom.g:23424:1: ( ( ruleFQN ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23421:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23422:1: ( ruleFQN )
+            // InternalRoom.g:23424:1: ( ( ruleFQN ) )
+            // InternalRoom.g:23425:1: ( ruleFQN )
             {
              before(grammarAccess.getRefableTypeAccess().getTypeDataTypeCrossReference_0_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23423:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23424:1: ruleFQN
+            // InternalRoom.g:23426:1: ( ruleFQN )
+            // InternalRoom.g:23427:1: ruleFQN
             {
              before(grammarAccess.getRefableTypeAccess().getTypeDataTypeFQNParserRuleCall_0_0_1()); 
-            pushFollow(FOLLOW_ruleFQN_in_rule__RefableType__TypeAssignment_047276);
+            pushFollow(FOLLOW_2);
             ruleFQN();
 
             state._fsp--;
@@ -63487,24 +63487,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefableType__RefAssignment_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23435:1: rule__RefableType__RefAssignment_1 : ( ( 'ref' ) ) ;
+    // InternalRoom.g:23438:1: rule__RefableType__RefAssignment_1 : ( ( 'ref' ) ) ;
     public final void rule__RefableType__RefAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23439:1: ( ( ( 'ref' ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23440:1: ( ( 'ref' ) )
+            // InternalRoom.g:23442:1: ( ( ( 'ref' ) ) )
+            // InternalRoom.g:23443:1: ( ( 'ref' ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23440:1: ( ( 'ref' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23441:1: ( 'ref' )
+            // InternalRoom.g:23443:1: ( ( 'ref' ) )
+            // InternalRoom.g:23444:1: ( 'ref' )
             {
              before(grammarAccess.getRefableTypeAccess().getRefRefKeyword_1_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23442:1: ( 'ref' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23443:1: 'ref'
+            // InternalRoom.g:23445:1: ( 'ref' )
+            // InternalRoom.g:23446:1: 'ref'
             {
              before(grammarAccess.getRefableTypeAccess().getRefRefKeyword_1_0()); 
-            match(input,90,FOLLOW_90_in_rule__RefableType__RefAssignment_147316); 
+            match(input,90,FOLLOW_2); 
              after(grammarAccess.getRefableTypeAccess().getRefRefKeyword_1_0()); 
 
             }
@@ -63532,20 +63532,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PrimitiveType__NameAssignment_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23458:1: rule__PrimitiveType__NameAssignment_1 : ( RULE_ID ) ;
+    // InternalRoom.g:23461:1: rule__PrimitiveType__NameAssignment_1 : ( RULE_ID ) ;
     public final void rule__PrimitiveType__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23462:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23463:1: ( RULE_ID )
+            // InternalRoom.g:23465:1: ( ( RULE_ID ) )
+            // InternalRoom.g:23466:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23463:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23464:1: RULE_ID
+            // InternalRoom.g:23466:1: ( RULE_ID )
+            // InternalRoom.g:23467:1: RULE_ID
             {
              before(grammarAccess.getPrimitiveTypeAccess().getNameIDTerminalRuleCall_1_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__PrimitiveType__NameAssignment_147355); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getPrimitiveTypeAccess().getNameIDTerminalRuleCall_1_0()); 
 
             }
@@ -63569,20 +63569,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PrimitiveType__TypeAssignment_3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23473:1: rule__PrimitiveType__TypeAssignment_3 : ( ruleLiteralType ) ;
+    // InternalRoom.g:23476:1: rule__PrimitiveType__TypeAssignment_3 : ( ruleLiteralType ) ;
     public final void rule__PrimitiveType__TypeAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23477:1: ( ( ruleLiteralType ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23478:1: ( ruleLiteralType )
+            // InternalRoom.g:23480:1: ( ( ruleLiteralType ) )
+            // InternalRoom.g:23481:1: ( ruleLiteralType )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23478:1: ( ruleLiteralType )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23479:1: ruleLiteralType
+            // InternalRoom.g:23481:1: ( ruleLiteralType )
+            // InternalRoom.g:23482:1: ruleLiteralType
             {
              before(grammarAccess.getPrimitiveTypeAccess().getTypeLiteralTypeEnumRuleCall_3_0()); 
-            pushFollow(FOLLOW_ruleLiteralType_in_rule__PrimitiveType__TypeAssignment_347386);
+            pushFollow(FOLLOW_2);
             ruleLiteralType();
 
             state._fsp--;
@@ -63610,20 +63610,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PrimitiveType__TargetNameAssignment_5"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23488:1: rule__PrimitiveType__TargetNameAssignment_5 : ( RULE_STRING ) ;
+    // InternalRoom.g:23491:1: rule__PrimitiveType__TargetNameAssignment_5 : ( RULE_STRING ) ;
     public final void rule__PrimitiveType__TargetNameAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23492:1: ( ( RULE_STRING ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23493:1: ( RULE_STRING )
+            // InternalRoom.g:23495:1: ( ( RULE_STRING ) )
+            // InternalRoom.g:23496:1: ( RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23493:1: ( RULE_STRING )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23494:1: RULE_STRING
+            // InternalRoom.g:23496:1: ( RULE_STRING )
+            // InternalRoom.g:23497:1: RULE_STRING
             {
              before(grammarAccess.getPrimitiveTypeAccess().getTargetNameSTRINGTerminalRuleCall_5_0()); 
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__PrimitiveType__TargetNameAssignment_547417); 
+            match(input,RULE_STRING,FOLLOW_2); 
              after(grammarAccess.getPrimitiveTypeAccess().getTargetNameSTRINGTerminalRuleCall_5_0()); 
 
             }
@@ -63647,20 +63647,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PrimitiveType__CastNameAssignment_6_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23503:1: rule__PrimitiveType__CastNameAssignment_6_1 : ( ruleFQN ) ;
+    // InternalRoom.g:23506:1: rule__PrimitiveType__CastNameAssignment_6_1 : ( ruleFQN ) ;
     public final void rule__PrimitiveType__CastNameAssignment_6_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23507:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23508:1: ( ruleFQN )
+            // InternalRoom.g:23510:1: ( ( ruleFQN ) )
+            // InternalRoom.g:23511:1: ( ruleFQN )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23508:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23509:1: ruleFQN
+            // InternalRoom.g:23511:1: ( ruleFQN )
+            // InternalRoom.g:23512:1: ruleFQN
             {
              before(grammarAccess.getPrimitiveTypeAccess().getCastNameFQNParserRuleCall_6_1_0()); 
-            pushFollow(FOLLOW_ruleFQN_in_rule__PrimitiveType__CastNameAssignment_6_147448);
+            pushFollow(FOLLOW_2);
             ruleFQN();
 
             state._fsp--;
@@ -63688,20 +63688,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PrimitiveType__DefaultValueLiteralAssignment_8"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23518:1: rule__PrimitiveType__DefaultValueLiteralAssignment_8 : ( RULE_STRING ) ;
+    // InternalRoom.g:23521:1: rule__PrimitiveType__DefaultValueLiteralAssignment_8 : ( RULE_STRING ) ;
     public final void rule__PrimitiveType__DefaultValueLiteralAssignment_8() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23522:1: ( ( RULE_STRING ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23523:1: ( RULE_STRING )
+            // InternalRoom.g:23525:1: ( ( RULE_STRING ) )
+            // InternalRoom.g:23526:1: ( RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23523:1: ( RULE_STRING )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23524:1: RULE_STRING
+            // InternalRoom.g:23526:1: ( RULE_STRING )
+            // InternalRoom.g:23527:1: RULE_STRING
             {
              before(grammarAccess.getPrimitiveTypeAccess().getDefaultValueLiteralSTRINGTerminalRuleCall_8_0()); 
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__PrimitiveType__DefaultValueLiteralAssignment_847479); 
+            match(input,RULE_STRING,FOLLOW_2); 
              after(grammarAccess.getPrimitiveTypeAccess().getDefaultValueLiteralSTRINGTerminalRuleCall_8_0()); 
 
             }
@@ -63725,20 +63725,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PrimitiveType__DocuAssignment_9"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23533:1: rule__PrimitiveType__DocuAssignment_9 : ( ruleDocumentation ) ;
+    // InternalRoom.g:23536:1: rule__PrimitiveType__DocuAssignment_9 : ( ruleDocumentation ) ;
     public final void rule__PrimitiveType__DocuAssignment_9() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23537:1: ( ( ruleDocumentation ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23538:1: ( ruleDocumentation )
+            // InternalRoom.g:23540:1: ( ( ruleDocumentation ) )
+            // InternalRoom.g:23541:1: ( ruleDocumentation )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23538:1: ( ruleDocumentation )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23539:1: ruleDocumentation
+            // InternalRoom.g:23541:1: ( ruleDocumentation )
+            // InternalRoom.g:23542:1: ruleDocumentation
             {
              before(grammarAccess.getPrimitiveTypeAccess().getDocuDocumentationParserRuleCall_9_0()); 
-            pushFollow(FOLLOW_ruleDocumentation_in_rule__PrimitiveType__DocuAssignment_947510);
+            pushFollow(FOLLOW_2);
             ruleDocumentation();
 
             state._fsp--;
@@ -63766,20 +63766,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumerationType__NameAssignment_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23548:1: rule__EnumerationType__NameAssignment_1 : ( RULE_ID ) ;
+    // InternalRoom.g:23551:1: rule__EnumerationType__NameAssignment_1 : ( RULE_ID ) ;
     public final void rule__EnumerationType__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23552:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23553:1: ( RULE_ID )
+            // InternalRoom.g:23555:1: ( ( RULE_ID ) )
+            // InternalRoom.g:23556:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23553:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23554:1: RULE_ID
+            // InternalRoom.g:23556:1: ( RULE_ID )
+            // InternalRoom.g:23557:1: RULE_ID
             {
              before(grammarAccess.getEnumerationTypeAccess().getNameIDTerminalRuleCall_1_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__EnumerationType__NameAssignment_147541); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getEnumerationTypeAccess().getNameIDTerminalRuleCall_1_0()); 
 
             }
@@ -63803,20 +63803,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumerationType__DocuAssignment_2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23563:1: rule__EnumerationType__DocuAssignment_2 : ( ruleDocumentation ) ;
+    // InternalRoom.g:23566:1: rule__EnumerationType__DocuAssignment_2 : ( ruleDocumentation ) ;
     public final void rule__EnumerationType__DocuAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23567:1: ( ( ruleDocumentation ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23568:1: ( ruleDocumentation )
+            // InternalRoom.g:23570:1: ( ( ruleDocumentation ) )
+            // InternalRoom.g:23571:1: ( ruleDocumentation )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23568:1: ( ruleDocumentation )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23569:1: ruleDocumentation
+            // InternalRoom.g:23571:1: ( ruleDocumentation )
+            // InternalRoom.g:23572:1: ruleDocumentation
             {
              before(grammarAccess.getEnumerationTypeAccess().getDocuDocumentationParserRuleCall_2_0()); 
-            pushFollow(FOLLOW_ruleDocumentation_in_rule__EnumerationType__DocuAssignment_247572);
+            pushFollow(FOLLOW_2);
             ruleDocumentation();
 
             state._fsp--;
@@ -63844,24 +63844,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumerationType__PrimitiveTypeAssignment_3_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23578:1: rule__EnumerationType__PrimitiveTypeAssignment_3_1 : ( ( ruleFQN ) ) ;
+    // InternalRoom.g:23581:1: rule__EnumerationType__PrimitiveTypeAssignment_3_1 : ( ( ruleFQN ) ) ;
     public final void rule__EnumerationType__PrimitiveTypeAssignment_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23582:1: ( ( ( ruleFQN ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23583:1: ( ( ruleFQN ) )
+            // InternalRoom.g:23585:1: ( ( ( ruleFQN ) ) )
+            // InternalRoom.g:23586:1: ( ( ruleFQN ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23583:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23584:1: ( ruleFQN )
+            // InternalRoom.g:23586:1: ( ( ruleFQN ) )
+            // InternalRoom.g:23587:1: ( ruleFQN )
             {
              before(grammarAccess.getEnumerationTypeAccess().getPrimitiveTypePrimitiveTypeCrossReference_3_1_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23585:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23586:1: ruleFQN
+            // InternalRoom.g:23588:1: ( ruleFQN )
+            // InternalRoom.g:23589:1: ruleFQN
             {
              before(grammarAccess.getEnumerationTypeAccess().getPrimitiveTypePrimitiveTypeFQNParserRuleCall_3_1_0_1()); 
-            pushFollow(FOLLOW_ruleFQN_in_rule__EnumerationType__PrimitiveTypeAssignment_3_147607);
+            pushFollow(FOLLOW_2);
             ruleFQN();
 
             state._fsp--;
@@ -63893,20 +63893,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumerationType__LiteralsAssignment_5_0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23597:1: rule__EnumerationType__LiteralsAssignment_5_0 : ( ruleEnumLiteral ) ;
+    // InternalRoom.g:23600:1: rule__EnumerationType__LiteralsAssignment_5_0 : ( ruleEnumLiteral ) ;
     public final void rule__EnumerationType__LiteralsAssignment_5_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23601:1: ( ( ruleEnumLiteral ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23602:1: ( ruleEnumLiteral )
+            // InternalRoom.g:23604:1: ( ( ruleEnumLiteral ) )
+            // InternalRoom.g:23605:1: ( ruleEnumLiteral )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23602:1: ( ruleEnumLiteral )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23603:1: ruleEnumLiteral
+            // InternalRoom.g:23605:1: ( ruleEnumLiteral )
+            // InternalRoom.g:23606:1: ruleEnumLiteral
             {
              before(grammarAccess.getEnumerationTypeAccess().getLiteralsEnumLiteralParserRuleCall_5_0_0()); 
-            pushFollow(FOLLOW_ruleEnumLiteral_in_rule__EnumerationType__LiteralsAssignment_5_047642);
+            pushFollow(FOLLOW_2);
             ruleEnumLiteral();
 
             state._fsp--;
@@ -63934,20 +63934,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumerationType__LiteralsAssignment_5_1_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23612:1: rule__EnumerationType__LiteralsAssignment_5_1_1 : ( ruleEnumLiteral ) ;
+    // InternalRoom.g:23615:1: rule__EnumerationType__LiteralsAssignment_5_1_1 : ( ruleEnumLiteral ) ;
     public final void rule__EnumerationType__LiteralsAssignment_5_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23616:1: ( ( ruleEnumLiteral ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23617:1: ( ruleEnumLiteral )
+            // InternalRoom.g:23619:1: ( ( ruleEnumLiteral ) )
+            // InternalRoom.g:23620:1: ( ruleEnumLiteral )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23617:1: ( ruleEnumLiteral )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23618:1: ruleEnumLiteral
+            // InternalRoom.g:23620:1: ( ruleEnumLiteral )
+            // InternalRoom.g:23621:1: ruleEnumLiteral
             {
              before(grammarAccess.getEnumerationTypeAccess().getLiteralsEnumLiteralParserRuleCall_5_1_1_0()); 
-            pushFollow(FOLLOW_ruleEnumLiteral_in_rule__EnumerationType__LiteralsAssignment_5_1_147673);
+            pushFollow(FOLLOW_2);
             ruleEnumLiteral();
 
             state._fsp--;
@@ -63975,20 +63975,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumLiteral__NameAssignment_0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23627:1: rule__EnumLiteral__NameAssignment_0 : ( RULE_ID ) ;
+    // InternalRoom.g:23630:1: rule__EnumLiteral__NameAssignment_0 : ( RULE_ID ) ;
     public final void rule__EnumLiteral__NameAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23631:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23632:1: ( RULE_ID )
+            // InternalRoom.g:23634:1: ( ( RULE_ID ) )
+            // InternalRoom.g:23635:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23632:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23633:1: RULE_ID
+            // InternalRoom.g:23635:1: ( RULE_ID )
+            // InternalRoom.g:23636:1: RULE_ID
             {
              before(grammarAccess.getEnumLiteralAccess().getNameIDTerminalRuleCall_0_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__EnumLiteral__NameAssignment_047704); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getEnumLiteralAccess().getNameIDTerminalRuleCall_0_0()); 
 
             }
@@ -64012,20 +64012,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumLiteral__LiteralAssignment_1_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23642:1: rule__EnumLiteral__LiteralAssignment_1_1 : ( ruleIntLiteral ) ;
+    // InternalRoom.g:23645:1: rule__EnumLiteral__LiteralAssignment_1_1 : ( ruleIntLiteral ) ;
     public final void rule__EnumLiteral__LiteralAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23646:1: ( ( ruleIntLiteral ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23647:1: ( ruleIntLiteral )
+            // InternalRoom.g:23649:1: ( ( ruleIntLiteral ) )
+            // InternalRoom.g:23650:1: ( ruleIntLiteral )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23647:1: ( ruleIntLiteral )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23648:1: ruleIntLiteral
+            // InternalRoom.g:23650:1: ( ruleIntLiteral )
+            // InternalRoom.g:23651:1: ruleIntLiteral
             {
              before(grammarAccess.getEnumLiteralAccess().getLiteralIntLiteralParserRuleCall_1_1_0()); 
-            pushFollow(FOLLOW_ruleIntLiteral_in_rule__EnumLiteral__LiteralAssignment_1_147735);
+            pushFollow(FOLLOW_2);
             ruleIntLiteral();
 
             state._fsp--;
@@ -64053,20 +64053,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ExternalType__NameAssignment_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23657:1: rule__ExternalType__NameAssignment_1 : ( RULE_ID ) ;
+    // InternalRoom.g:23660:1: rule__ExternalType__NameAssignment_1 : ( RULE_ID ) ;
     public final void rule__ExternalType__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23661:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23662:1: ( RULE_ID )
+            // InternalRoom.g:23664:1: ( ( RULE_ID ) )
+            // InternalRoom.g:23665:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23662:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23663:1: RULE_ID
+            // InternalRoom.g:23665:1: ( RULE_ID )
+            // InternalRoom.g:23666:1: RULE_ID
             {
              before(grammarAccess.getExternalTypeAccess().getNameIDTerminalRuleCall_1_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__ExternalType__NameAssignment_147766); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getExternalTypeAccess().getNameIDTerminalRuleCall_1_0()); 
 
             }
@@ -64090,20 +64090,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ExternalType__TargetNameAssignment_3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23672:1: rule__ExternalType__TargetNameAssignment_3 : ( RULE_STRING ) ;
+    // InternalRoom.g:23675:1: rule__ExternalType__TargetNameAssignment_3 : ( RULE_STRING ) ;
     public final void rule__ExternalType__TargetNameAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23676:1: ( ( RULE_STRING ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23677:1: ( RULE_STRING )
+            // InternalRoom.g:23679:1: ( ( RULE_STRING ) )
+            // InternalRoom.g:23680:1: ( RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23677:1: ( RULE_STRING )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23678:1: RULE_STRING
+            // InternalRoom.g:23680:1: ( RULE_STRING )
+            // InternalRoom.g:23681:1: RULE_STRING
             {
              before(grammarAccess.getExternalTypeAccess().getTargetNameSTRINGTerminalRuleCall_3_0()); 
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__ExternalType__TargetNameAssignment_347797); 
+            match(input,RULE_STRING,FOLLOW_2); 
              after(grammarAccess.getExternalTypeAccess().getTargetNameSTRINGTerminalRuleCall_3_0()); 
 
             }
@@ -64127,20 +64127,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ExternalType__DefaultValueLiteralAssignment_4_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23687:1: rule__ExternalType__DefaultValueLiteralAssignment_4_1 : ( RULE_STRING ) ;
+    // InternalRoom.g:23690:1: rule__ExternalType__DefaultValueLiteralAssignment_4_1 : ( RULE_STRING ) ;
     public final void rule__ExternalType__DefaultValueLiteralAssignment_4_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23691:1: ( ( RULE_STRING ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23692:1: ( RULE_STRING )
+            // InternalRoom.g:23694:1: ( ( RULE_STRING ) )
+            // InternalRoom.g:23695:1: ( RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23692:1: ( RULE_STRING )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23693:1: RULE_STRING
+            // InternalRoom.g:23695:1: ( RULE_STRING )
+            // InternalRoom.g:23696:1: RULE_STRING
             {
              before(grammarAccess.getExternalTypeAccess().getDefaultValueLiteralSTRINGTerminalRuleCall_4_1_0()); 
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__ExternalType__DefaultValueLiteralAssignment_4_147828); 
+            match(input,RULE_STRING,FOLLOW_2); 
              after(grammarAccess.getExternalTypeAccess().getDefaultValueLiteralSTRINGTerminalRuleCall_4_1_0()); 
 
             }
@@ -64164,20 +64164,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ExternalType__DocuAssignment_5"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23702:1: rule__ExternalType__DocuAssignment_5 : ( ruleDocumentation ) ;
+    // InternalRoom.g:23705:1: rule__ExternalType__DocuAssignment_5 : ( ruleDocumentation ) ;
     public final void rule__ExternalType__DocuAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23706:1: ( ( ruleDocumentation ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23707:1: ( ruleDocumentation )
+            // InternalRoom.g:23709:1: ( ( ruleDocumentation ) )
+            // InternalRoom.g:23710:1: ( ruleDocumentation )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23707:1: ( ruleDocumentation )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23708:1: ruleDocumentation
+            // InternalRoom.g:23710:1: ( ruleDocumentation )
+            // InternalRoom.g:23711:1: ruleDocumentation
             {
              before(grammarAccess.getExternalTypeAccess().getDocuDocumentationParserRuleCall_5_0()); 
-            pushFollow(FOLLOW_ruleDocumentation_in_rule__ExternalType__DocuAssignment_547859);
+            pushFollow(FOLLOW_2);
             ruleDocumentation();
 
             state._fsp--;
@@ -64205,20 +64205,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DataClass__NameAssignment_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23717:1: rule__DataClass__NameAssignment_1 : ( RULE_ID ) ;
+    // InternalRoom.g:23720:1: rule__DataClass__NameAssignment_1 : ( RULE_ID ) ;
     public final void rule__DataClass__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23721:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23722:1: ( RULE_ID )
+            // InternalRoom.g:23724:1: ( ( RULE_ID ) )
+            // InternalRoom.g:23725:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23722:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23723:1: RULE_ID
+            // InternalRoom.g:23725:1: ( RULE_ID )
+            // InternalRoom.g:23726:1: RULE_ID
             {
              before(grammarAccess.getDataClassAccess().getNameIDTerminalRuleCall_1_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__DataClass__NameAssignment_147890); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getDataClassAccess().getNameIDTerminalRuleCall_1_0()); 
 
             }
@@ -64242,20 +64242,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DataClass__DocuAssignment_2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23732:1: rule__DataClass__DocuAssignment_2 : ( ruleDocumentation ) ;
+    // InternalRoom.g:23735:1: rule__DataClass__DocuAssignment_2 : ( ruleDocumentation ) ;
     public final void rule__DataClass__DocuAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23736:1: ( ( ruleDocumentation ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23737:1: ( ruleDocumentation )
+            // InternalRoom.g:23739:1: ( ( ruleDocumentation ) )
+            // InternalRoom.g:23740:1: ( ruleDocumentation )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23737:1: ( ruleDocumentation )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23738:1: ruleDocumentation
+            // InternalRoom.g:23740:1: ( ruleDocumentation )
+            // InternalRoom.g:23741:1: ruleDocumentation
             {
              before(grammarAccess.getDataClassAccess().getDocuDocumentationParserRuleCall_2_0()); 
-            pushFollow(FOLLOW_ruleDocumentation_in_rule__DataClass__DocuAssignment_247921);
+            pushFollow(FOLLOW_2);
             ruleDocumentation();
 
             state._fsp--;
@@ -64283,24 +64283,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DataClass__BaseAssignment_3_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23747:1: rule__DataClass__BaseAssignment_3_1 : ( ( ruleFQN ) ) ;
+    // InternalRoom.g:23750:1: rule__DataClass__BaseAssignment_3_1 : ( ( ruleFQN ) ) ;
     public final void rule__DataClass__BaseAssignment_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23751:1: ( ( ( ruleFQN ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23752:1: ( ( ruleFQN ) )
+            // InternalRoom.g:23754:1: ( ( ( ruleFQN ) ) )
+            // InternalRoom.g:23755:1: ( ( ruleFQN ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23752:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23753:1: ( ruleFQN )
+            // InternalRoom.g:23755:1: ( ( ruleFQN ) )
+            // InternalRoom.g:23756:1: ( ruleFQN )
             {
              before(grammarAccess.getDataClassAccess().getBaseDataClassCrossReference_3_1_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23754:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23755:1: ruleFQN
+            // InternalRoom.g:23757:1: ( ruleFQN )
+            // InternalRoom.g:23758:1: ruleFQN
             {
              before(grammarAccess.getDataClassAccess().getBaseDataClassFQNParserRuleCall_3_1_0_1()); 
-            pushFollow(FOLLOW_ruleFQN_in_rule__DataClass__BaseAssignment_3_147956);
+            pushFollow(FOLLOW_2);
             ruleFQN();
 
             state._fsp--;
@@ -64332,20 +64332,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DataClass__AnnotationsAssignment_5"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23766:1: rule__DataClass__AnnotationsAssignment_5 : ( ruleAnnotation ) ;
+    // InternalRoom.g:23769:1: rule__DataClass__AnnotationsAssignment_5 : ( ruleAnnotation ) ;
     public final void rule__DataClass__AnnotationsAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23770:1: ( ( ruleAnnotation ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23771:1: ( ruleAnnotation )
+            // InternalRoom.g:23773:1: ( ( ruleAnnotation ) )
+            // InternalRoom.g:23774:1: ( ruleAnnotation )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23771:1: ( ruleAnnotation )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23772:1: ruleAnnotation
+            // InternalRoom.g:23774:1: ( ruleAnnotation )
+            // InternalRoom.g:23775:1: ruleAnnotation
             {
              before(grammarAccess.getDataClassAccess().getAnnotationsAnnotationParserRuleCall_5_0()); 
-            pushFollow(FOLLOW_ruleAnnotation_in_rule__DataClass__AnnotationsAssignment_547991);
+            pushFollow(FOLLOW_2);
             ruleAnnotation();
 
             state._fsp--;
@@ -64373,20 +64373,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DataClass__UserCode1Assignment_6_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23781:1: rule__DataClass__UserCode1Assignment_6_1 : ( ruleDetailCode ) ;
+    // InternalRoom.g:23784:1: rule__DataClass__UserCode1Assignment_6_1 : ( ruleDetailCode ) ;
     public final void rule__DataClass__UserCode1Assignment_6_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23785:1: ( ( ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23786:1: ( ruleDetailCode )
+            // InternalRoom.g:23788:1: ( ( ruleDetailCode ) )
+            // InternalRoom.g:23789:1: ( ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23786:1: ( ruleDetailCode )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23787:1: ruleDetailCode
+            // InternalRoom.g:23789:1: ( ruleDetailCode )
+            // InternalRoom.g:23790:1: ruleDetailCode
             {
              before(grammarAccess.getDataClassAccess().getUserCode1DetailCodeParserRuleCall_6_1_0()); 
-            pushFollow(FOLLOW_ruleDetailCode_in_rule__DataClass__UserCode1Assignment_6_148022);
+            pushFollow(FOLLOW_2);
             ruleDetailCode();
 
             state._fsp--;
@@ -64414,20 +64414,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DataClass__UserCode2Assignment_7_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23796:1: rule__DataClass__UserCode2Assignment_7_1 : ( ruleDetailCode ) ;
+    // InternalRoom.g:23799:1: rule__DataClass__UserCode2Assignment_7_1 : ( ruleDetailCode ) ;
     public final void rule__DataClass__UserCode2Assignment_7_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23800:1: ( ( ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23801:1: ( ruleDetailCode )
+            // InternalRoom.g:23803:1: ( ( ruleDetailCode ) )
+            // InternalRoom.g:23804:1: ( ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23801:1: ( ruleDetailCode )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23802:1: ruleDetailCode
+            // InternalRoom.g:23804:1: ( ruleDetailCode )
+            // InternalRoom.g:23805:1: ruleDetailCode
             {
              before(grammarAccess.getDataClassAccess().getUserCode2DetailCodeParserRuleCall_7_1_0()); 
-            pushFollow(FOLLOW_ruleDetailCode_in_rule__DataClass__UserCode2Assignment_7_148053);
+            pushFollow(FOLLOW_2);
             ruleDetailCode();
 
             state._fsp--;
@@ -64455,20 +64455,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DataClass__UserCode3Assignment_8_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23811:1: rule__DataClass__UserCode3Assignment_8_1 : ( ruleDetailCode ) ;
+    // InternalRoom.g:23814:1: rule__DataClass__UserCode3Assignment_8_1 : ( ruleDetailCode ) ;
     public final void rule__DataClass__UserCode3Assignment_8_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23815:1: ( ( ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23816:1: ( ruleDetailCode )
+            // InternalRoom.g:23818:1: ( ( ruleDetailCode ) )
+            // InternalRoom.g:23819:1: ( ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23816:1: ( ruleDetailCode )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23817:1: ruleDetailCode
+            // InternalRoom.g:23819:1: ( ruleDetailCode )
+            // InternalRoom.g:23820:1: ruleDetailCode
             {
              before(grammarAccess.getDataClassAccess().getUserCode3DetailCodeParserRuleCall_8_1_0()); 
-            pushFollow(FOLLOW_ruleDetailCode_in_rule__DataClass__UserCode3Assignment_8_148084);
+            pushFollow(FOLLOW_2);
             ruleDetailCode();
 
             state._fsp--;
@@ -64496,20 +64496,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DataClass__OperationsAssignment_9_0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23826:1: rule__DataClass__OperationsAssignment_9_0 : ( ruleStandardOperation ) ;
+    // InternalRoom.g:23829:1: rule__DataClass__OperationsAssignment_9_0 : ( ruleStandardOperation ) ;
     public final void rule__DataClass__OperationsAssignment_9_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23830:1: ( ( ruleStandardOperation ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23831:1: ( ruleStandardOperation )
+            // InternalRoom.g:23833:1: ( ( ruleStandardOperation ) )
+            // InternalRoom.g:23834:1: ( ruleStandardOperation )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23831:1: ( ruleStandardOperation )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23832:1: ruleStandardOperation
+            // InternalRoom.g:23834:1: ( ruleStandardOperation )
+            // InternalRoom.g:23835:1: ruleStandardOperation
             {
              before(grammarAccess.getDataClassAccess().getOperationsStandardOperationParserRuleCall_9_0_0()); 
-            pushFollow(FOLLOW_ruleStandardOperation_in_rule__DataClass__OperationsAssignment_9_048115);
+            pushFollow(FOLLOW_2);
             ruleStandardOperation();
 
             state._fsp--;
@@ -64537,20 +64537,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DataClass__StructorsAssignment_9_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23841:1: rule__DataClass__StructorsAssignment_9_1 : ( ruleClassStructor ) ;
+    // InternalRoom.g:23844:1: rule__DataClass__StructorsAssignment_9_1 : ( ruleClassStructor ) ;
     public final void rule__DataClass__StructorsAssignment_9_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23845:1: ( ( ruleClassStructor ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23846:1: ( ruleClassStructor )
+            // InternalRoom.g:23848:1: ( ( ruleClassStructor ) )
+            // InternalRoom.g:23849:1: ( ruleClassStructor )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23846:1: ( ruleClassStructor )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23847:1: ruleClassStructor
+            // InternalRoom.g:23849:1: ( ruleClassStructor )
+            // InternalRoom.g:23850:1: ruleClassStructor
             {
              before(grammarAccess.getDataClassAccess().getStructorsClassStructorParserRuleCall_9_1_0()); 
-            pushFollow(FOLLOW_ruleClassStructor_in_rule__DataClass__StructorsAssignment_9_148146);
+            pushFollow(FOLLOW_2);
             ruleClassStructor();
 
             state._fsp--;
@@ -64578,20 +64578,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DataClass__AttributesAssignment_9_2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23856:1: rule__DataClass__AttributesAssignment_9_2 : ( ruleAttribute ) ;
+    // InternalRoom.g:23859:1: rule__DataClass__AttributesAssignment_9_2 : ( ruleAttribute ) ;
     public final void rule__DataClass__AttributesAssignment_9_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23860:1: ( ( ruleAttribute ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23861:1: ( ruleAttribute )
+            // InternalRoom.g:23863:1: ( ( ruleAttribute ) )
+            // InternalRoom.g:23864:1: ( ruleAttribute )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23861:1: ( ruleAttribute )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23862:1: ruleAttribute
+            // InternalRoom.g:23864:1: ( ruleAttribute )
+            // InternalRoom.g:23865:1: ruleAttribute
             {
              before(grammarAccess.getDataClassAccess().getAttributesAttributeParserRuleCall_9_2_0()); 
-            pushFollow(FOLLOW_ruleAttribute_in_rule__DataClass__AttributesAssignment_9_248177);
+            pushFollow(FOLLOW_2);
             ruleAttribute();
 
             state._fsp--;
@@ -64619,20 +64619,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Attribute__NameAssignment_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23871:1: rule__Attribute__NameAssignment_1 : ( RULE_ID ) ;
+    // InternalRoom.g:23874:1: rule__Attribute__NameAssignment_1 : ( RULE_ID ) ;
     public final void rule__Attribute__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23875:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23876:1: ( RULE_ID )
+            // InternalRoom.g:23878:1: ( ( RULE_ID ) )
+            // InternalRoom.g:23879:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23876:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23877:1: RULE_ID
+            // InternalRoom.g:23879:1: ( RULE_ID )
+            // InternalRoom.g:23880:1: RULE_ID
             {
              before(grammarAccess.getAttributeAccess().getNameIDTerminalRuleCall_1_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__Attribute__NameAssignment_148208); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getAttributeAccess().getNameIDTerminalRuleCall_1_0()); 
 
             }
@@ -64656,20 +64656,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Attribute__SizeAssignment_2_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23886:1: rule__Attribute__SizeAssignment_2_1 : ( RULE_INT ) ;
+    // InternalRoom.g:23889:1: rule__Attribute__SizeAssignment_2_1 : ( RULE_INT ) ;
     public final void rule__Attribute__SizeAssignment_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23890:1: ( ( RULE_INT ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23891:1: ( RULE_INT )
+            // InternalRoom.g:23893:1: ( ( RULE_INT ) )
+            // InternalRoom.g:23894:1: ( RULE_INT )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23891:1: ( RULE_INT )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23892:1: RULE_INT
+            // InternalRoom.g:23894:1: ( RULE_INT )
+            // InternalRoom.g:23895:1: RULE_INT
             {
              before(grammarAccess.getAttributeAccess().getSizeINTTerminalRuleCall_2_1_0()); 
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__Attribute__SizeAssignment_2_148239); 
+            match(input,RULE_INT,FOLLOW_2); 
              after(grammarAccess.getAttributeAccess().getSizeINTTerminalRuleCall_2_1_0()); 
 
             }
@@ -64693,20 +64693,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Attribute__TypeAssignment_4"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23901:1: rule__Attribute__TypeAssignment_4 : ( ruleRefableType ) ;
+    // InternalRoom.g:23904:1: rule__Attribute__TypeAssignment_4 : ( ruleRefableType ) ;
     public final void rule__Attribute__TypeAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23905:1: ( ( ruleRefableType ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23906:1: ( ruleRefableType )
+            // InternalRoom.g:23908:1: ( ( ruleRefableType ) )
+            // InternalRoom.g:23909:1: ( ruleRefableType )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23906:1: ( ruleRefableType )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23907:1: ruleRefableType
+            // InternalRoom.g:23909:1: ( ruleRefableType )
+            // InternalRoom.g:23910:1: ruleRefableType
             {
              before(grammarAccess.getAttributeAccess().getTypeRefableTypeParserRuleCall_4_0()); 
-            pushFollow(FOLLOW_ruleRefableType_in_rule__Attribute__TypeAssignment_448270);
+            pushFollow(FOLLOW_2);
             ruleRefableType();
 
             state._fsp--;
@@ -64734,20 +64734,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Attribute__DefaultValueLiteralAssignment_5_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23916:1: rule__Attribute__DefaultValueLiteralAssignment_5_1 : ( RULE_STRING ) ;
+    // InternalRoom.g:23919:1: rule__Attribute__DefaultValueLiteralAssignment_5_1 : ( RULE_STRING ) ;
     public final void rule__Attribute__DefaultValueLiteralAssignment_5_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23920:1: ( ( RULE_STRING ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23921:1: ( RULE_STRING )
+            // InternalRoom.g:23923:1: ( ( RULE_STRING ) )
+            // InternalRoom.g:23924:1: ( RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23921:1: ( RULE_STRING )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23922:1: RULE_STRING
+            // InternalRoom.g:23924:1: ( RULE_STRING )
+            // InternalRoom.g:23925:1: RULE_STRING
             {
              before(grammarAccess.getAttributeAccess().getDefaultValueLiteralSTRINGTerminalRuleCall_5_1_0()); 
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__Attribute__DefaultValueLiteralAssignment_5_148301); 
+            match(input,RULE_STRING,FOLLOW_2); 
              after(grammarAccess.getAttributeAccess().getDefaultValueLiteralSTRINGTerminalRuleCall_5_1_0()); 
 
             }
@@ -64771,20 +64771,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Attribute__DocuAssignment_6"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23931:1: rule__Attribute__DocuAssignment_6 : ( ruleDocumentation ) ;
+    // InternalRoom.g:23934:1: rule__Attribute__DocuAssignment_6 : ( ruleDocumentation ) ;
     public final void rule__Attribute__DocuAssignment_6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23935:1: ( ( ruleDocumentation ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23936:1: ( ruleDocumentation )
+            // InternalRoom.g:23938:1: ( ( ruleDocumentation ) )
+            // InternalRoom.g:23939:1: ( ruleDocumentation )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23936:1: ( ruleDocumentation )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23937:1: ruleDocumentation
+            // InternalRoom.g:23939:1: ( ruleDocumentation )
+            // InternalRoom.g:23940:1: ruleDocumentation
             {
              before(grammarAccess.getAttributeAccess().getDocuDocumentationParserRuleCall_6_0()); 
-            pushFollow(FOLLOW_ruleDocumentation_in_rule__Attribute__DocuAssignment_648332);
+            pushFollow(FOLLOW_2);
             ruleDocumentation();
 
             state._fsp--;
@@ -64812,24 +64812,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StandardOperation__OverrideAssignment_0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23946:1: rule__StandardOperation__OverrideAssignment_0 : ( ( 'override' ) ) ;
+    // InternalRoom.g:23949:1: rule__StandardOperation__OverrideAssignment_0 : ( ( 'override' ) ) ;
     public final void rule__StandardOperation__OverrideAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23950:1: ( ( ( 'override' ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23951:1: ( ( 'override' ) )
+            // InternalRoom.g:23953:1: ( ( ( 'override' ) ) )
+            // InternalRoom.g:23954:1: ( ( 'override' ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23951:1: ( ( 'override' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23952:1: ( 'override' )
+            // InternalRoom.g:23954:1: ( ( 'override' ) )
+            // InternalRoom.g:23955:1: ( 'override' )
             {
              before(grammarAccess.getStandardOperationAccess().getOverrideOverrideKeyword_0_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23953:1: ( 'override' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23954:1: 'override'
+            // InternalRoom.g:23956:1: ( 'override' )
+            // InternalRoom.g:23957:1: 'override'
             {
              before(grammarAccess.getStandardOperationAccess().getOverrideOverrideKeyword_0_0()); 
-            match(input,127,FOLLOW_127_in_rule__StandardOperation__OverrideAssignment_048368); 
+            match(input,127,FOLLOW_2); 
              after(grammarAccess.getStandardOperationAccess().getOverrideOverrideKeyword_0_0()); 
 
             }
@@ -64857,20 +64857,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StandardOperation__NameAssignment_2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23969:1: rule__StandardOperation__NameAssignment_2 : ( RULE_ID ) ;
+    // InternalRoom.g:23972:1: rule__StandardOperation__NameAssignment_2 : ( RULE_ID ) ;
     public final void rule__StandardOperation__NameAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23973:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23974:1: ( RULE_ID )
+            // InternalRoom.g:23976:1: ( ( RULE_ID ) )
+            // InternalRoom.g:23977:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23974:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23975:1: RULE_ID
+            // InternalRoom.g:23977:1: ( RULE_ID )
+            // InternalRoom.g:23978:1: RULE_ID
             {
              before(grammarAccess.getStandardOperationAccess().getNameIDTerminalRuleCall_2_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__StandardOperation__NameAssignment_248407); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getStandardOperationAccess().getNameIDTerminalRuleCall_2_0()); 
 
             }
@@ -64894,20 +64894,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StandardOperation__ArgumentsAssignment_4_0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23984:1: rule__StandardOperation__ArgumentsAssignment_4_0 : ( ruleVarDecl ) ;
+    // InternalRoom.g:23987:1: rule__StandardOperation__ArgumentsAssignment_4_0 : ( ruleVarDecl ) ;
     public final void rule__StandardOperation__ArgumentsAssignment_4_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23988:1: ( ( ruleVarDecl ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23989:1: ( ruleVarDecl )
+            // InternalRoom.g:23991:1: ( ( ruleVarDecl ) )
+            // InternalRoom.g:23992:1: ( ruleVarDecl )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23989:1: ( ruleVarDecl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23990:1: ruleVarDecl
+            // InternalRoom.g:23992:1: ( ruleVarDecl )
+            // InternalRoom.g:23993:1: ruleVarDecl
             {
              before(grammarAccess.getStandardOperationAccess().getArgumentsVarDeclParserRuleCall_4_0_0()); 
-            pushFollow(FOLLOW_ruleVarDecl_in_rule__StandardOperation__ArgumentsAssignment_4_048438);
+            pushFollow(FOLLOW_2);
             ruleVarDecl();
 
             state._fsp--;
@@ -64935,20 +64935,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StandardOperation__ArgumentsAssignment_4_1_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:23999:1: rule__StandardOperation__ArgumentsAssignment_4_1_1 : ( ruleVarDecl ) ;
+    // InternalRoom.g:24002:1: rule__StandardOperation__ArgumentsAssignment_4_1_1 : ( ruleVarDecl ) ;
     public final void rule__StandardOperation__ArgumentsAssignment_4_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24003:1: ( ( ruleVarDecl ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24004:1: ( ruleVarDecl )
+            // InternalRoom.g:24006:1: ( ( ruleVarDecl ) )
+            // InternalRoom.g:24007:1: ( ruleVarDecl )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24004:1: ( ruleVarDecl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24005:1: ruleVarDecl
+            // InternalRoom.g:24007:1: ( ruleVarDecl )
+            // InternalRoom.g:24008:1: ruleVarDecl
             {
              before(grammarAccess.getStandardOperationAccess().getArgumentsVarDeclParserRuleCall_4_1_1_0()); 
-            pushFollow(FOLLOW_ruleVarDecl_in_rule__StandardOperation__ArgumentsAssignment_4_1_148469);
+            pushFollow(FOLLOW_2);
             ruleVarDecl();
 
             state._fsp--;
@@ -64976,20 +64976,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StandardOperation__ReturnTypeAssignment_6_1_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24014:1: rule__StandardOperation__ReturnTypeAssignment_6_1_1 : ( ruleRefableType ) ;
+    // InternalRoom.g:24017:1: rule__StandardOperation__ReturnTypeAssignment_6_1_1 : ( ruleRefableType ) ;
     public final void rule__StandardOperation__ReturnTypeAssignment_6_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24018:1: ( ( ruleRefableType ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24019:1: ( ruleRefableType )
+            // InternalRoom.g:24021:1: ( ( ruleRefableType ) )
+            // InternalRoom.g:24022:1: ( ruleRefableType )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24019:1: ( ruleRefableType )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24020:1: ruleRefableType
+            // InternalRoom.g:24022:1: ( ruleRefableType )
+            // InternalRoom.g:24023:1: ruleRefableType
             {
              before(grammarAccess.getStandardOperationAccess().getReturnTypeRefableTypeParserRuleCall_6_1_1_0()); 
-            pushFollow(FOLLOW_ruleRefableType_in_rule__StandardOperation__ReturnTypeAssignment_6_1_148500);
+            pushFollow(FOLLOW_2);
             ruleRefableType();
 
             state._fsp--;
@@ -65017,20 +65017,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StandardOperation__DocuAssignment_7"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24029:1: rule__StandardOperation__DocuAssignment_7 : ( ruleDocumentation ) ;
+    // InternalRoom.g:24032:1: rule__StandardOperation__DocuAssignment_7 : ( ruleDocumentation ) ;
     public final void rule__StandardOperation__DocuAssignment_7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24033:1: ( ( ruleDocumentation ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24034:1: ( ruleDocumentation )
+            // InternalRoom.g:24036:1: ( ( ruleDocumentation ) )
+            // InternalRoom.g:24037:1: ( ruleDocumentation )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24034:1: ( ruleDocumentation )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24035:1: ruleDocumentation
+            // InternalRoom.g:24037:1: ( ruleDocumentation )
+            // InternalRoom.g:24038:1: ruleDocumentation
             {
              before(grammarAccess.getStandardOperationAccess().getDocuDocumentationParserRuleCall_7_0()); 
-            pushFollow(FOLLOW_ruleDocumentation_in_rule__StandardOperation__DocuAssignment_748531);
+            pushFollow(FOLLOW_2);
             ruleDocumentation();
 
             state._fsp--;
@@ -65058,20 +65058,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StandardOperation__DetailCodeAssignment_8"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24044:1: rule__StandardOperation__DetailCodeAssignment_8 : ( ruleDetailCode ) ;
+    // InternalRoom.g:24047:1: rule__StandardOperation__DetailCodeAssignment_8 : ( ruleDetailCode ) ;
     public final void rule__StandardOperation__DetailCodeAssignment_8() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24048:1: ( ( ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24049:1: ( ruleDetailCode )
+            // InternalRoom.g:24051:1: ( ( ruleDetailCode ) )
+            // InternalRoom.g:24052:1: ( ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24049:1: ( ruleDetailCode )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24050:1: ruleDetailCode
+            // InternalRoom.g:24052:1: ( ruleDetailCode )
+            // InternalRoom.g:24053:1: ruleDetailCode
             {
              before(grammarAccess.getStandardOperationAccess().getDetailCodeDetailCodeParserRuleCall_8_0()); 
-            pushFollow(FOLLOW_ruleDetailCode_in_rule__StandardOperation__DetailCodeAssignment_848562);
+            pushFollow(FOLLOW_2);
             ruleDetailCode();
 
             state._fsp--;
@@ -65099,20 +65099,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortOperation__NameAssignment_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24059:1: rule__PortOperation__NameAssignment_1 : ( RULE_ID ) ;
+    // InternalRoom.g:24062:1: rule__PortOperation__NameAssignment_1 : ( RULE_ID ) ;
     public final void rule__PortOperation__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24063:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24064:1: ( RULE_ID )
+            // InternalRoom.g:24066:1: ( ( RULE_ID ) )
+            // InternalRoom.g:24067:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24064:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24065:1: RULE_ID
+            // InternalRoom.g:24067:1: ( RULE_ID )
+            // InternalRoom.g:24068:1: RULE_ID
             {
              before(grammarAccess.getPortOperationAccess().getNameIDTerminalRuleCall_1_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__PortOperation__NameAssignment_148593); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getPortOperationAccess().getNameIDTerminalRuleCall_1_0()); 
 
             }
@@ -65136,20 +65136,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortOperation__ArgumentsAssignment_3_0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24074:1: rule__PortOperation__ArgumentsAssignment_3_0 : ( ruleVarDecl ) ;
+    // InternalRoom.g:24077:1: rule__PortOperation__ArgumentsAssignment_3_0 : ( ruleVarDecl ) ;
     public final void rule__PortOperation__ArgumentsAssignment_3_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24078:1: ( ( ruleVarDecl ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24079:1: ( ruleVarDecl )
+            // InternalRoom.g:24081:1: ( ( ruleVarDecl ) )
+            // InternalRoom.g:24082:1: ( ruleVarDecl )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24079:1: ( ruleVarDecl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24080:1: ruleVarDecl
+            // InternalRoom.g:24082:1: ( ruleVarDecl )
+            // InternalRoom.g:24083:1: ruleVarDecl
             {
              before(grammarAccess.getPortOperationAccess().getArgumentsVarDeclParserRuleCall_3_0_0()); 
-            pushFollow(FOLLOW_ruleVarDecl_in_rule__PortOperation__ArgumentsAssignment_3_048624);
+            pushFollow(FOLLOW_2);
             ruleVarDecl();
 
             state._fsp--;
@@ -65177,20 +65177,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortOperation__ArgumentsAssignment_3_1_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24089:1: rule__PortOperation__ArgumentsAssignment_3_1_1 : ( ruleVarDecl ) ;
+    // InternalRoom.g:24092:1: rule__PortOperation__ArgumentsAssignment_3_1_1 : ( ruleVarDecl ) ;
     public final void rule__PortOperation__ArgumentsAssignment_3_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24093:1: ( ( ruleVarDecl ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24094:1: ( ruleVarDecl )
+            // InternalRoom.g:24096:1: ( ( ruleVarDecl ) )
+            // InternalRoom.g:24097:1: ( ruleVarDecl )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24094:1: ( ruleVarDecl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24095:1: ruleVarDecl
+            // InternalRoom.g:24097:1: ( ruleVarDecl )
+            // InternalRoom.g:24098:1: ruleVarDecl
             {
              before(grammarAccess.getPortOperationAccess().getArgumentsVarDeclParserRuleCall_3_1_1_0()); 
-            pushFollow(FOLLOW_ruleVarDecl_in_rule__PortOperation__ArgumentsAssignment_3_1_148655);
+            pushFollow(FOLLOW_2);
             ruleVarDecl();
 
             state._fsp--;
@@ -65218,20 +65218,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortOperation__ReturnTypeAssignment_5_0_1_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24104:1: rule__PortOperation__ReturnTypeAssignment_5_0_1_1 : ( ruleRefableType ) ;
+    // InternalRoom.g:24107:1: rule__PortOperation__ReturnTypeAssignment_5_0_1_1 : ( ruleRefableType ) ;
     public final void rule__PortOperation__ReturnTypeAssignment_5_0_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24108:1: ( ( ruleRefableType ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24109:1: ( ruleRefableType )
+            // InternalRoom.g:24111:1: ( ( ruleRefableType ) )
+            // InternalRoom.g:24112:1: ( ruleRefableType )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24109:1: ( ruleRefableType )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24110:1: ruleRefableType
+            // InternalRoom.g:24112:1: ( ruleRefableType )
+            // InternalRoom.g:24113:1: ruleRefableType
             {
              before(grammarAccess.getPortOperationAccess().getReturnTypeRefableTypeParserRuleCall_5_0_1_1_0()); 
-            pushFollow(FOLLOW_ruleRefableType_in_rule__PortOperation__ReturnTypeAssignment_5_0_1_148686);
+            pushFollow(FOLLOW_2);
             ruleRefableType();
 
             state._fsp--;
@@ -65259,24 +65259,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortOperation__SendsMsgAssignment_5_1_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24119:1: rule__PortOperation__SendsMsgAssignment_5_1_1 : ( ( RULE_ID ) ) ;
+    // InternalRoom.g:24122:1: rule__PortOperation__SendsMsgAssignment_5_1_1 : ( ( RULE_ID ) ) ;
     public final void rule__PortOperation__SendsMsgAssignment_5_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24123:1: ( ( ( RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24124:1: ( ( RULE_ID ) )
+            // InternalRoom.g:24126:1: ( ( ( RULE_ID ) ) )
+            // InternalRoom.g:24127:1: ( ( RULE_ID ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24124:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24125:1: ( RULE_ID )
+            // InternalRoom.g:24127:1: ( ( RULE_ID ) )
+            // InternalRoom.g:24128:1: ( RULE_ID )
             {
              before(grammarAccess.getPortOperationAccess().getSendsMsgMessageCrossReference_5_1_1_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24126:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24127:1: RULE_ID
+            // InternalRoom.g:24129:1: ( RULE_ID )
+            // InternalRoom.g:24130:1: RULE_ID
             {
              before(grammarAccess.getPortOperationAccess().getSendsMsgMessageIDTerminalRuleCall_5_1_1_0_1()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__PortOperation__SendsMsgAssignment_5_1_148721); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getPortOperationAccess().getSendsMsgMessageIDTerminalRuleCall_5_1_1_0_1()); 
 
             }
@@ -65304,20 +65304,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortOperation__DocuAssignment_6"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24138:1: rule__PortOperation__DocuAssignment_6 : ( ruleDocumentation ) ;
+    // InternalRoom.g:24141:1: rule__PortOperation__DocuAssignment_6 : ( ruleDocumentation ) ;
     public final void rule__PortOperation__DocuAssignment_6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24142:1: ( ( ruleDocumentation ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24143:1: ( ruleDocumentation )
+            // InternalRoom.g:24145:1: ( ( ruleDocumentation ) )
+            // InternalRoom.g:24146:1: ( ruleDocumentation )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24143:1: ( ruleDocumentation )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24144:1: ruleDocumentation
+            // InternalRoom.g:24146:1: ( ruleDocumentation )
+            // InternalRoom.g:24147:1: ruleDocumentation
             {
              before(grammarAccess.getPortOperationAccess().getDocuDocumentationParserRuleCall_6_0()); 
-            pushFollow(FOLLOW_ruleDocumentation_in_rule__PortOperation__DocuAssignment_648756);
+            pushFollow(FOLLOW_2);
             ruleDocumentation();
 
             state._fsp--;
@@ -65345,20 +65345,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortOperation__DetailCodeAssignment_7"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24153:1: rule__PortOperation__DetailCodeAssignment_7 : ( ruleDetailCode ) ;
+    // InternalRoom.g:24156:1: rule__PortOperation__DetailCodeAssignment_7 : ( ruleDetailCode ) ;
     public final void rule__PortOperation__DetailCodeAssignment_7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24157:1: ( ( ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24158:1: ( ruleDetailCode )
+            // InternalRoom.g:24160:1: ( ( ruleDetailCode ) )
+            // InternalRoom.g:24161:1: ( ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24158:1: ( ruleDetailCode )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24159:1: ruleDetailCode
+            // InternalRoom.g:24161:1: ( ruleDetailCode )
+            // InternalRoom.g:24162:1: ruleDetailCode
             {
              before(grammarAccess.getPortOperationAccess().getDetailCodeDetailCodeParserRuleCall_7_0()); 
-            pushFollow(FOLLOW_ruleDetailCode_in_rule__PortOperation__DetailCodeAssignment_748787);
+            pushFollow(FOLLOW_2);
             ruleDetailCode();
 
             state._fsp--;
@@ -65386,23 +65386,23 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassStructor__NameAssignment_0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24168:1: rule__ClassStructor__NameAssignment_0 : ( ( rule__ClassStructor__NameAlternatives_0_0 ) ) ;
+    // InternalRoom.g:24171:1: rule__ClassStructor__NameAssignment_0 : ( ( rule__ClassStructor__NameAlternatives_0_0 ) ) ;
     public final void rule__ClassStructor__NameAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24172:1: ( ( ( rule__ClassStructor__NameAlternatives_0_0 ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24173:1: ( ( rule__ClassStructor__NameAlternatives_0_0 ) )
+            // InternalRoom.g:24175:1: ( ( ( rule__ClassStructor__NameAlternatives_0_0 ) ) )
+            // InternalRoom.g:24176:1: ( ( rule__ClassStructor__NameAlternatives_0_0 ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24173:1: ( ( rule__ClassStructor__NameAlternatives_0_0 ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24174:1: ( rule__ClassStructor__NameAlternatives_0_0 )
+            // InternalRoom.g:24176:1: ( ( rule__ClassStructor__NameAlternatives_0_0 ) )
+            // InternalRoom.g:24177:1: ( rule__ClassStructor__NameAlternatives_0_0 )
             {
              before(grammarAccess.getClassStructorAccess().getNameAlternatives_0_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24175:1: ( rule__ClassStructor__NameAlternatives_0_0 )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24175:2: rule__ClassStructor__NameAlternatives_0_0
+            // InternalRoom.g:24178:1: ( rule__ClassStructor__NameAlternatives_0_0 )
+            // InternalRoom.g:24178:2: rule__ClassStructor__NameAlternatives_0_0
             {
-            pushFollow(FOLLOW_rule__ClassStructor__NameAlternatives_0_0_in_rule__ClassStructor__NameAssignment_048818);
+            pushFollow(FOLLOW_2);
             rule__ClassStructor__NameAlternatives_0_0();
 
             state._fsp--;
@@ -65433,20 +65433,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassStructor__DetailCodeAssignment_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24184:1: rule__ClassStructor__DetailCodeAssignment_1 : ( ruleDetailCode ) ;
+    // InternalRoom.g:24187:1: rule__ClassStructor__DetailCodeAssignment_1 : ( ruleDetailCode ) ;
     public final void rule__ClassStructor__DetailCodeAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24188:1: ( ( ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24189:1: ( ruleDetailCode )
+            // InternalRoom.g:24191:1: ( ( ruleDetailCode ) )
+            // InternalRoom.g:24192:1: ( ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24189:1: ( ruleDetailCode )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24190:1: ruleDetailCode
+            // InternalRoom.g:24192:1: ( ruleDetailCode )
+            // InternalRoom.g:24193:1: ruleDetailCode
             {
              before(grammarAccess.getClassStructorAccess().getDetailCodeDetailCodeParserRuleCall_1_0()); 
-            pushFollow(FOLLOW_ruleDetailCode_in_rule__ClassStructor__DetailCodeAssignment_148851);
+            pushFollow(FOLLOW_2);
             ruleDetailCode();
 
             state._fsp--;
@@ -65474,20 +65474,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__CommTypeAssignment_0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24199:1: rule__ProtocolClass__CommTypeAssignment_0 : ( ruleCommunicationType ) ;
+    // InternalRoom.g:24202:1: rule__ProtocolClass__CommTypeAssignment_0 : ( ruleCommunicationType ) ;
     public final void rule__ProtocolClass__CommTypeAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24203:1: ( ( ruleCommunicationType ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24204:1: ( ruleCommunicationType )
+            // InternalRoom.g:24206:1: ( ( ruleCommunicationType ) )
+            // InternalRoom.g:24207:1: ( ruleCommunicationType )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24204:1: ( ruleCommunicationType )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24205:1: ruleCommunicationType
+            // InternalRoom.g:24207:1: ( ruleCommunicationType )
+            // InternalRoom.g:24208:1: ruleCommunicationType
             {
              before(grammarAccess.getProtocolClassAccess().getCommTypeCommunicationTypeEnumRuleCall_0_0()); 
-            pushFollow(FOLLOW_ruleCommunicationType_in_rule__ProtocolClass__CommTypeAssignment_048882);
+            pushFollow(FOLLOW_2);
             ruleCommunicationType();
 
             state._fsp--;
@@ -65515,20 +65515,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__NameAssignment_2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24214:1: rule__ProtocolClass__NameAssignment_2 : ( RULE_ID ) ;
+    // InternalRoom.g:24217:1: rule__ProtocolClass__NameAssignment_2 : ( RULE_ID ) ;
     public final void rule__ProtocolClass__NameAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24218:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24219:1: ( RULE_ID )
+            // InternalRoom.g:24221:1: ( ( RULE_ID ) )
+            // InternalRoom.g:24222:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24219:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24220:1: RULE_ID
+            // InternalRoom.g:24222:1: ( RULE_ID )
+            // InternalRoom.g:24223:1: RULE_ID
             {
              before(grammarAccess.getProtocolClassAccess().getNameIDTerminalRuleCall_2_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__ProtocolClass__NameAssignment_248913); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getProtocolClassAccess().getNameIDTerminalRuleCall_2_0()); 
 
             }
@@ -65552,20 +65552,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__DocuAssignment_3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24229:1: rule__ProtocolClass__DocuAssignment_3 : ( ruleDocumentation ) ;
+    // InternalRoom.g:24232:1: rule__ProtocolClass__DocuAssignment_3 : ( ruleDocumentation ) ;
     public final void rule__ProtocolClass__DocuAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24233:1: ( ( ruleDocumentation ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24234:1: ( ruleDocumentation )
+            // InternalRoom.g:24236:1: ( ( ruleDocumentation ) )
+            // InternalRoom.g:24237:1: ( ruleDocumentation )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24234:1: ( ruleDocumentation )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24235:1: ruleDocumentation
+            // InternalRoom.g:24237:1: ( ruleDocumentation )
+            // InternalRoom.g:24238:1: ruleDocumentation
             {
              before(grammarAccess.getProtocolClassAccess().getDocuDocumentationParserRuleCall_3_0()); 
-            pushFollow(FOLLOW_ruleDocumentation_in_rule__ProtocolClass__DocuAssignment_348944);
+            pushFollow(FOLLOW_2);
             ruleDocumentation();
 
             state._fsp--;
@@ -65593,24 +65593,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__BaseAssignment_4_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24244:1: rule__ProtocolClass__BaseAssignment_4_1 : ( ( ruleFQN ) ) ;
+    // InternalRoom.g:24247:1: rule__ProtocolClass__BaseAssignment_4_1 : ( ( ruleFQN ) ) ;
     public final void rule__ProtocolClass__BaseAssignment_4_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24248:1: ( ( ( ruleFQN ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24249:1: ( ( ruleFQN ) )
+            // InternalRoom.g:24251:1: ( ( ( ruleFQN ) ) )
+            // InternalRoom.g:24252:1: ( ( ruleFQN ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24249:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24250:1: ( ruleFQN )
+            // InternalRoom.g:24252:1: ( ( ruleFQN ) )
+            // InternalRoom.g:24253:1: ( ruleFQN )
             {
              before(grammarAccess.getProtocolClassAccess().getBaseProtocolClassCrossReference_4_1_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24251:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24252:1: ruleFQN
+            // InternalRoom.g:24254:1: ( ruleFQN )
+            // InternalRoom.g:24255:1: ruleFQN
             {
              before(grammarAccess.getProtocolClassAccess().getBaseProtocolClassFQNParserRuleCall_4_1_0_1()); 
-            pushFollow(FOLLOW_ruleFQN_in_rule__ProtocolClass__BaseAssignment_4_148979);
+            pushFollow(FOLLOW_2);
             ruleFQN();
 
             state._fsp--;
@@ -65642,20 +65642,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__AnnotationsAssignment_6"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24263:1: rule__ProtocolClass__AnnotationsAssignment_6 : ( ruleAnnotation ) ;
+    // InternalRoom.g:24266:1: rule__ProtocolClass__AnnotationsAssignment_6 : ( ruleAnnotation ) ;
     public final void rule__ProtocolClass__AnnotationsAssignment_6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24267:1: ( ( ruleAnnotation ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24268:1: ( ruleAnnotation )
+            // InternalRoom.g:24270:1: ( ( ruleAnnotation ) )
+            // InternalRoom.g:24271:1: ( ruleAnnotation )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24268:1: ( ruleAnnotation )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24269:1: ruleAnnotation
+            // InternalRoom.g:24271:1: ( ruleAnnotation )
+            // InternalRoom.g:24272:1: ruleAnnotation
             {
              before(grammarAccess.getProtocolClassAccess().getAnnotationsAnnotationParserRuleCall_6_0()); 
-            pushFollow(FOLLOW_ruleAnnotation_in_rule__ProtocolClass__AnnotationsAssignment_649014);
+            pushFollow(FOLLOW_2);
             ruleAnnotation();
 
             state._fsp--;
@@ -65683,20 +65683,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__UserCode1Assignment_7_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24278:1: rule__ProtocolClass__UserCode1Assignment_7_1 : ( ruleDetailCode ) ;
+    // InternalRoom.g:24281:1: rule__ProtocolClass__UserCode1Assignment_7_1 : ( ruleDetailCode ) ;
     public final void rule__ProtocolClass__UserCode1Assignment_7_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24282:1: ( ( ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24283:1: ( ruleDetailCode )
+            // InternalRoom.g:24285:1: ( ( ruleDetailCode ) )
+            // InternalRoom.g:24286:1: ( ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24283:1: ( ruleDetailCode )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24284:1: ruleDetailCode
+            // InternalRoom.g:24286:1: ( ruleDetailCode )
+            // InternalRoom.g:24287:1: ruleDetailCode
             {
              before(grammarAccess.getProtocolClassAccess().getUserCode1DetailCodeParserRuleCall_7_1_0()); 
-            pushFollow(FOLLOW_ruleDetailCode_in_rule__ProtocolClass__UserCode1Assignment_7_149045);
+            pushFollow(FOLLOW_2);
             ruleDetailCode();
 
             state._fsp--;
@@ -65724,20 +65724,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__UserCode2Assignment_8_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24293:1: rule__ProtocolClass__UserCode2Assignment_8_1 : ( ruleDetailCode ) ;
+    // InternalRoom.g:24296:1: rule__ProtocolClass__UserCode2Assignment_8_1 : ( ruleDetailCode ) ;
     public final void rule__ProtocolClass__UserCode2Assignment_8_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24297:1: ( ( ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24298:1: ( ruleDetailCode )
+            // InternalRoom.g:24300:1: ( ( ruleDetailCode ) )
+            // InternalRoom.g:24301:1: ( ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24298:1: ( ruleDetailCode )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24299:1: ruleDetailCode
+            // InternalRoom.g:24301:1: ( ruleDetailCode )
+            // InternalRoom.g:24302:1: ruleDetailCode
             {
              before(grammarAccess.getProtocolClassAccess().getUserCode2DetailCodeParserRuleCall_8_1_0()); 
-            pushFollow(FOLLOW_ruleDetailCode_in_rule__ProtocolClass__UserCode2Assignment_8_149076);
+            pushFollow(FOLLOW_2);
             ruleDetailCode();
 
             state._fsp--;
@@ -65765,20 +65765,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__UserCode3Assignment_9_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24308:1: rule__ProtocolClass__UserCode3Assignment_9_1 : ( ruleDetailCode ) ;
+    // InternalRoom.g:24311:1: rule__ProtocolClass__UserCode3Assignment_9_1 : ( ruleDetailCode ) ;
     public final void rule__ProtocolClass__UserCode3Assignment_9_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24312:1: ( ( ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24313:1: ( ruleDetailCode )
+            // InternalRoom.g:24315:1: ( ( ruleDetailCode ) )
+            // InternalRoom.g:24316:1: ( ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24313:1: ( ruleDetailCode )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24314:1: ruleDetailCode
+            // InternalRoom.g:24316:1: ( ruleDetailCode )
+            // InternalRoom.g:24317:1: ruleDetailCode
             {
              before(grammarAccess.getProtocolClassAccess().getUserCode3DetailCodeParserRuleCall_9_1_0()); 
-            pushFollow(FOLLOW_ruleDetailCode_in_rule__ProtocolClass__UserCode3Assignment_9_149107);
+            pushFollow(FOLLOW_2);
             ruleDetailCode();
 
             state._fsp--;
@@ -65806,20 +65806,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__IncomingMessagesAssignment_10_2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24323:1: rule__ProtocolClass__IncomingMessagesAssignment_10_2 : ( ruleMessage ) ;
+    // InternalRoom.g:24326:1: rule__ProtocolClass__IncomingMessagesAssignment_10_2 : ( ruleMessage ) ;
     public final void rule__ProtocolClass__IncomingMessagesAssignment_10_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24327:1: ( ( ruleMessage ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24328:1: ( ruleMessage )
+            // InternalRoom.g:24330:1: ( ( ruleMessage ) )
+            // InternalRoom.g:24331:1: ( ruleMessage )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24328:1: ( ruleMessage )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24329:1: ruleMessage
+            // InternalRoom.g:24331:1: ( ruleMessage )
+            // InternalRoom.g:24332:1: ruleMessage
             {
              before(grammarAccess.getProtocolClassAccess().getIncomingMessagesMessageParserRuleCall_10_2_0()); 
-            pushFollow(FOLLOW_ruleMessage_in_rule__ProtocolClass__IncomingMessagesAssignment_10_249138);
+            pushFollow(FOLLOW_2);
             ruleMessage();
 
             state._fsp--;
@@ -65847,20 +65847,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__OutgoingMessagesAssignment_11_2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24338:1: rule__ProtocolClass__OutgoingMessagesAssignment_11_2 : ( ruleMessage ) ;
+    // InternalRoom.g:24341:1: rule__ProtocolClass__OutgoingMessagesAssignment_11_2 : ( ruleMessage ) ;
     public final void rule__ProtocolClass__OutgoingMessagesAssignment_11_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24342:1: ( ( ruleMessage ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24343:1: ( ruleMessage )
+            // InternalRoom.g:24345:1: ( ( ruleMessage ) )
+            // InternalRoom.g:24346:1: ( ruleMessage )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24343:1: ( ruleMessage )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24344:1: ruleMessage
+            // InternalRoom.g:24346:1: ( ruleMessage )
+            // InternalRoom.g:24347:1: ruleMessage
             {
              before(grammarAccess.getProtocolClassAccess().getOutgoingMessagesMessageParserRuleCall_11_2_0()); 
-            pushFollow(FOLLOW_ruleMessage_in_rule__ProtocolClass__OutgoingMessagesAssignment_11_249169);
+            pushFollow(FOLLOW_2);
             ruleMessage();
 
             state._fsp--;
@@ -65888,20 +65888,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__RegularAssignment_12_2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24353:1: rule__ProtocolClass__RegularAssignment_12_2 : ( rulePortClass ) ;
+    // InternalRoom.g:24356:1: rule__ProtocolClass__RegularAssignment_12_2 : ( rulePortClass ) ;
     public final void rule__ProtocolClass__RegularAssignment_12_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24357:1: ( ( rulePortClass ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24358:1: ( rulePortClass )
+            // InternalRoom.g:24360:1: ( ( rulePortClass ) )
+            // InternalRoom.g:24361:1: ( rulePortClass )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24358:1: ( rulePortClass )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24359:1: rulePortClass
+            // InternalRoom.g:24361:1: ( rulePortClass )
+            // InternalRoom.g:24362:1: rulePortClass
             {
              before(grammarAccess.getProtocolClassAccess().getRegularPortClassParserRuleCall_12_2_0()); 
-            pushFollow(FOLLOW_rulePortClass_in_rule__ProtocolClass__RegularAssignment_12_249200);
+            pushFollow(FOLLOW_2);
             rulePortClass();
 
             state._fsp--;
@@ -65929,20 +65929,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__ConjugatedAssignment_13_2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24368:1: rule__ProtocolClass__ConjugatedAssignment_13_2 : ( rulePortClass ) ;
+    // InternalRoom.g:24371:1: rule__ProtocolClass__ConjugatedAssignment_13_2 : ( rulePortClass ) ;
     public final void rule__ProtocolClass__ConjugatedAssignment_13_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24372:1: ( ( rulePortClass ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24373:1: ( rulePortClass )
+            // InternalRoom.g:24375:1: ( ( rulePortClass ) )
+            // InternalRoom.g:24376:1: ( rulePortClass )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24373:1: ( rulePortClass )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24374:1: rulePortClass
+            // InternalRoom.g:24376:1: ( rulePortClass )
+            // InternalRoom.g:24377:1: rulePortClass
             {
              before(grammarAccess.getProtocolClassAccess().getConjugatedPortClassParserRuleCall_13_2_0()); 
-            pushFollow(FOLLOW_rulePortClass_in_rule__ProtocolClass__ConjugatedAssignment_13_249231);
+            pushFollow(FOLLOW_2);
             rulePortClass();
 
             state._fsp--;
@@ -65970,20 +65970,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolClass__SemanticsAssignment_14"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24383:1: rule__ProtocolClass__SemanticsAssignment_14 : ( ruleProtocolSemantics ) ;
+    // InternalRoom.g:24386:1: rule__ProtocolClass__SemanticsAssignment_14 : ( ruleProtocolSemantics ) ;
     public final void rule__ProtocolClass__SemanticsAssignment_14() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24387:1: ( ( ruleProtocolSemantics ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24388:1: ( ruleProtocolSemantics )
+            // InternalRoom.g:24390:1: ( ( ruleProtocolSemantics ) )
+            // InternalRoom.g:24391:1: ( ruleProtocolSemantics )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24388:1: ( ruleProtocolSemantics )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24389:1: ruleProtocolSemantics
+            // InternalRoom.g:24391:1: ( ruleProtocolSemantics )
+            // InternalRoom.g:24392:1: ruleProtocolSemantics
             {
              before(grammarAccess.getProtocolClassAccess().getSemanticsProtocolSemanticsParserRuleCall_14_0()); 
-            pushFollow(FOLLOW_ruleProtocolSemantics_in_rule__ProtocolClass__SemanticsAssignment_1449262);
+            pushFollow(FOLLOW_2);
             ruleProtocolSemantics();
 
             state._fsp--;
@@ -66011,20 +66011,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CompoundProtocolClass__NameAssignment_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24398:1: rule__CompoundProtocolClass__NameAssignment_1 : ( RULE_ID ) ;
+    // InternalRoom.g:24401:1: rule__CompoundProtocolClass__NameAssignment_1 : ( RULE_ID ) ;
     public final void rule__CompoundProtocolClass__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24402:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24403:1: ( RULE_ID )
+            // InternalRoom.g:24405:1: ( ( RULE_ID ) )
+            // InternalRoom.g:24406:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24403:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24404:1: RULE_ID
+            // InternalRoom.g:24406:1: ( RULE_ID )
+            // InternalRoom.g:24407:1: RULE_ID
             {
              before(grammarAccess.getCompoundProtocolClassAccess().getNameIDTerminalRuleCall_1_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__CompoundProtocolClass__NameAssignment_149293); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getCompoundProtocolClassAccess().getNameIDTerminalRuleCall_1_0()); 
 
             }
@@ -66048,20 +66048,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CompoundProtocolClass__DocuAssignment_2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24413:1: rule__CompoundProtocolClass__DocuAssignment_2 : ( ruleDocumentation ) ;
+    // InternalRoom.g:24416:1: rule__CompoundProtocolClass__DocuAssignment_2 : ( ruleDocumentation ) ;
     public final void rule__CompoundProtocolClass__DocuAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24417:1: ( ( ruleDocumentation ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24418:1: ( ruleDocumentation )
+            // InternalRoom.g:24420:1: ( ( ruleDocumentation ) )
+            // InternalRoom.g:24421:1: ( ruleDocumentation )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24418:1: ( ruleDocumentation )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24419:1: ruleDocumentation
+            // InternalRoom.g:24421:1: ( ruleDocumentation )
+            // InternalRoom.g:24422:1: ruleDocumentation
             {
              before(grammarAccess.getCompoundProtocolClassAccess().getDocuDocumentationParserRuleCall_2_0()); 
-            pushFollow(FOLLOW_ruleDocumentation_in_rule__CompoundProtocolClass__DocuAssignment_249324);
+            pushFollow(FOLLOW_2);
             ruleDocumentation();
 
             state._fsp--;
@@ -66089,20 +66089,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CompoundProtocolClass__AnnotationsAssignment_4"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24428:1: rule__CompoundProtocolClass__AnnotationsAssignment_4 : ( ruleAnnotation ) ;
+    // InternalRoom.g:24431:1: rule__CompoundProtocolClass__AnnotationsAssignment_4 : ( ruleAnnotation ) ;
     public final void rule__CompoundProtocolClass__AnnotationsAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24432:1: ( ( ruleAnnotation ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24433:1: ( ruleAnnotation )
+            // InternalRoom.g:24435:1: ( ( ruleAnnotation ) )
+            // InternalRoom.g:24436:1: ( ruleAnnotation )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24433:1: ( ruleAnnotation )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24434:1: ruleAnnotation
+            // InternalRoom.g:24436:1: ( ruleAnnotation )
+            // InternalRoom.g:24437:1: ruleAnnotation
             {
              before(grammarAccess.getCompoundProtocolClassAccess().getAnnotationsAnnotationParserRuleCall_4_0()); 
-            pushFollow(FOLLOW_ruleAnnotation_in_rule__CompoundProtocolClass__AnnotationsAssignment_449355);
+            pushFollow(FOLLOW_2);
             ruleAnnotation();
 
             state._fsp--;
@@ -66130,20 +66130,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CompoundProtocolClass__SubProtocolsAssignment_5"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24443:1: rule__CompoundProtocolClass__SubProtocolsAssignment_5 : ( ruleSubProtocol ) ;
+    // InternalRoom.g:24446:1: rule__CompoundProtocolClass__SubProtocolsAssignment_5 : ( ruleSubProtocol ) ;
     public final void rule__CompoundProtocolClass__SubProtocolsAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24447:1: ( ( ruleSubProtocol ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24448:1: ( ruleSubProtocol )
+            // InternalRoom.g:24450:1: ( ( ruleSubProtocol ) )
+            // InternalRoom.g:24451:1: ( ruleSubProtocol )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24448:1: ( ruleSubProtocol )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24449:1: ruleSubProtocol
+            // InternalRoom.g:24451:1: ( ruleSubProtocol )
+            // InternalRoom.g:24452:1: ruleSubProtocol
             {
              before(grammarAccess.getCompoundProtocolClassAccess().getSubProtocolsSubProtocolParserRuleCall_5_0()); 
-            pushFollow(FOLLOW_ruleSubProtocol_in_rule__CompoundProtocolClass__SubProtocolsAssignment_549386);
+            pushFollow(FOLLOW_2);
             ruleSubProtocol();
 
             state._fsp--;
@@ -66171,20 +66171,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubProtocol__NameAssignment_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24458:1: rule__SubProtocol__NameAssignment_1 : ( RULE_ID ) ;
+    // InternalRoom.g:24461:1: rule__SubProtocol__NameAssignment_1 : ( RULE_ID ) ;
     public final void rule__SubProtocol__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24462:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24463:1: ( RULE_ID )
+            // InternalRoom.g:24465:1: ( ( RULE_ID ) )
+            // InternalRoom.g:24466:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24463:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24464:1: RULE_ID
+            // InternalRoom.g:24466:1: ( RULE_ID )
+            // InternalRoom.g:24467:1: RULE_ID
             {
              before(grammarAccess.getSubProtocolAccess().getNameIDTerminalRuleCall_1_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__SubProtocol__NameAssignment_149417); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getSubProtocolAccess().getNameIDTerminalRuleCall_1_0()); 
 
             }
@@ -66208,24 +66208,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubProtocol__ProtocolAssignment_3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24473:1: rule__SubProtocol__ProtocolAssignment_3 : ( ( ruleFQN ) ) ;
+    // InternalRoom.g:24476:1: rule__SubProtocol__ProtocolAssignment_3 : ( ( ruleFQN ) ) ;
     public final void rule__SubProtocol__ProtocolAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24477:1: ( ( ( ruleFQN ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24478:1: ( ( ruleFQN ) )
+            // InternalRoom.g:24480:1: ( ( ( ruleFQN ) ) )
+            // InternalRoom.g:24481:1: ( ( ruleFQN ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24478:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24479:1: ( ruleFQN )
+            // InternalRoom.g:24481:1: ( ( ruleFQN ) )
+            // InternalRoom.g:24482:1: ( ruleFQN )
             {
              before(grammarAccess.getSubProtocolAccess().getProtocolGeneralProtocolClassCrossReference_3_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24480:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24481:1: ruleFQN
+            // InternalRoom.g:24483:1: ( ruleFQN )
+            // InternalRoom.g:24484:1: ruleFQN
             {
              before(grammarAccess.getSubProtocolAccess().getProtocolGeneralProtocolClassFQNParserRuleCall_3_0_1()); 
-            pushFollow(FOLLOW_ruleFQN_in_rule__SubProtocol__ProtocolAssignment_349452);
+            pushFollow(FOLLOW_2);
             ruleFQN();
 
             state._fsp--;
@@ -66257,24 +66257,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Message__PrivAssignment_0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24492:1: rule__Message__PrivAssignment_0 : ( ( 'private' ) ) ;
+    // InternalRoom.g:24495:1: rule__Message__PrivAssignment_0 : ( ( 'private' ) ) ;
     public final void rule__Message__PrivAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24496:1: ( ( ( 'private' ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24497:1: ( ( 'private' ) )
+            // InternalRoom.g:24499:1: ( ( ( 'private' ) ) )
+            // InternalRoom.g:24500:1: ( ( 'private' ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24497:1: ( ( 'private' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24498:1: ( 'private' )
+            // InternalRoom.g:24500:1: ( ( 'private' ) )
+            // InternalRoom.g:24501:1: ( 'private' )
             {
              before(grammarAccess.getMessageAccess().getPrivPrivateKeyword_0_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24499:1: ( 'private' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24500:1: 'private'
+            // InternalRoom.g:24502:1: ( 'private' )
+            // InternalRoom.g:24503:1: 'private'
             {
              before(grammarAccess.getMessageAccess().getPrivPrivateKeyword_0_0()); 
-            match(input,128,FOLLOW_128_in_rule__Message__PrivAssignment_049492); 
+            match(input,128,FOLLOW_2); 
              after(grammarAccess.getMessageAccess().getPrivPrivateKeyword_0_0()); 
 
             }
@@ -66302,20 +66302,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Message__NameAssignment_2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24515:1: rule__Message__NameAssignment_2 : ( RULE_ID ) ;
+    // InternalRoom.g:24518:1: rule__Message__NameAssignment_2 : ( RULE_ID ) ;
     public final void rule__Message__NameAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24519:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24520:1: ( RULE_ID )
+            // InternalRoom.g:24522:1: ( ( RULE_ID ) )
+            // InternalRoom.g:24523:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24520:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24521:1: RULE_ID
+            // InternalRoom.g:24523:1: ( RULE_ID )
+            // InternalRoom.g:24524:1: RULE_ID
             {
              before(grammarAccess.getMessageAccess().getNameIDTerminalRuleCall_2_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__Message__NameAssignment_249531); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getMessageAccess().getNameIDTerminalRuleCall_2_0()); 
 
             }
@@ -66339,20 +66339,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Message__DataAssignment_4"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24530:1: rule__Message__DataAssignment_4 : ( ruleVarDecl ) ;
+    // InternalRoom.g:24533:1: rule__Message__DataAssignment_4 : ( ruleVarDecl ) ;
     public final void rule__Message__DataAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24534:1: ( ( ruleVarDecl ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24535:1: ( ruleVarDecl )
+            // InternalRoom.g:24537:1: ( ( ruleVarDecl ) )
+            // InternalRoom.g:24538:1: ( ruleVarDecl )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24535:1: ( ruleVarDecl )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24536:1: ruleVarDecl
+            // InternalRoom.g:24538:1: ( ruleVarDecl )
+            // InternalRoom.g:24539:1: ruleVarDecl
             {
              before(grammarAccess.getMessageAccess().getDataVarDeclParserRuleCall_4_0()); 
-            pushFollow(FOLLOW_ruleVarDecl_in_rule__Message__DataAssignment_449562);
+            pushFollow(FOLLOW_2);
             ruleVarDecl();
 
             state._fsp--;
@@ -66380,20 +66380,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Message__DocuAssignment_6"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24545:1: rule__Message__DocuAssignment_6 : ( ruleDocumentation ) ;
+    // InternalRoom.g:24548:1: rule__Message__DocuAssignment_6 : ( ruleDocumentation ) ;
     public final void rule__Message__DocuAssignment_6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24549:1: ( ( ruleDocumentation ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24550:1: ( ruleDocumentation )
+            // InternalRoom.g:24552:1: ( ( ruleDocumentation ) )
+            // InternalRoom.g:24553:1: ( ruleDocumentation )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24550:1: ( ruleDocumentation )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24551:1: ruleDocumentation
+            // InternalRoom.g:24553:1: ( ruleDocumentation )
+            // InternalRoom.g:24554:1: ruleDocumentation
             {
              before(grammarAccess.getMessageAccess().getDocuDocumentationParserRuleCall_6_0()); 
-            pushFollow(FOLLOW_ruleDocumentation_in_rule__Message__DocuAssignment_649593);
+            pushFollow(FOLLOW_2);
             ruleDocumentation();
 
             state._fsp--;
@@ -66421,20 +66421,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortClass__UserCodeAssignment_2_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24560:1: rule__PortClass__UserCodeAssignment_2_1 : ( ruleDetailCode ) ;
+    // InternalRoom.g:24563:1: rule__PortClass__UserCodeAssignment_2_1 : ( ruleDetailCode ) ;
     public final void rule__PortClass__UserCodeAssignment_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24564:1: ( ( ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24565:1: ( ruleDetailCode )
+            // InternalRoom.g:24567:1: ( ( ruleDetailCode ) )
+            // InternalRoom.g:24568:1: ( ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24565:1: ( ruleDetailCode )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24566:1: ruleDetailCode
+            // InternalRoom.g:24568:1: ( ruleDetailCode )
+            // InternalRoom.g:24569:1: ruleDetailCode
             {
              before(grammarAccess.getPortClassAccess().getUserCodeDetailCodeParserRuleCall_2_1_0()); 
-            pushFollow(FOLLOW_ruleDetailCode_in_rule__PortClass__UserCodeAssignment_2_149624);
+            pushFollow(FOLLOW_2);
             ruleDetailCode();
 
             state._fsp--;
@@ -66462,20 +66462,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortClass__MsgHandlersAssignment_3_0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24575:1: rule__PortClass__MsgHandlersAssignment_3_0 : ( ruleMessageHandler ) ;
+    // InternalRoom.g:24578:1: rule__PortClass__MsgHandlersAssignment_3_0 : ( ruleMessageHandler ) ;
     public final void rule__PortClass__MsgHandlersAssignment_3_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24579:1: ( ( ruleMessageHandler ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24580:1: ( ruleMessageHandler )
+            // InternalRoom.g:24582:1: ( ( ruleMessageHandler ) )
+            // InternalRoom.g:24583:1: ( ruleMessageHandler )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24580:1: ( ruleMessageHandler )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24581:1: ruleMessageHandler
+            // InternalRoom.g:24583:1: ( ruleMessageHandler )
+            // InternalRoom.g:24584:1: ruleMessageHandler
             {
              before(grammarAccess.getPortClassAccess().getMsgHandlersMessageHandlerParserRuleCall_3_0_0()); 
-            pushFollow(FOLLOW_ruleMessageHandler_in_rule__PortClass__MsgHandlersAssignment_3_049655);
+            pushFollow(FOLLOW_2);
             ruleMessageHandler();
 
             state._fsp--;
@@ -66503,20 +66503,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortClass__OperationsAssignment_3_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24590:1: rule__PortClass__OperationsAssignment_3_1 : ( rulePortOperation ) ;
+    // InternalRoom.g:24593:1: rule__PortClass__OperationsAssignment_3_1 : ( rulePortOperation ) ;
     public final void rule__PortClass__OperationsAssignment_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24594:1: ( ( rulePortOperation ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24595:1: ( rulePortOperation )
+            // InternalRoom.g:24597:1: ( ( rulePortOperation ) )
+            // InternalRoom.g:24598:1: ( rulePortOperation )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24595:1: ( rulePortOperation )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24596:1: rulePortOperation
+            // InternalRoom.g:24598:1: ( rulePortOperation )
+            // InternalRoom.g:24599:1: rulePortOperation
             {
              before(grammarAccess.getPortClassAccess().getOperationsPortOperationParserRuleCall_3_1_0()); 
-            pushFollow(FOLLOW_rulePortOperation_in_rule__PortClass__OperationsAssignment_3_149686);
+            pushFollow(FOLLOW_2);
             rulePortOperation();
 
             state._fsp--;
@@ -66544,20 +66544,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PortClass__AttributesAssignment_3_2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24605:1: rule__PortClass__AttributesAssignment_3_2 : ( ruleAttribute ) ;
+    // InternalRoom.g:24608:1: rule__PortClass__AttributesAssignment_3_2 : ( ruleAttribute ) ;
     public final void rule__PortClass__AttributesAssignment_3_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24609:1: ( ( ruleAttribute ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24610:1: ( ruleAttribute )
+            // InternalRoom.g:24612:1: ( ( ruleAttribute ) )
+            // InternalRoom.g:24613:1: ( ruleAttribute )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24610:1: ( ruleAttribute )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24611:1: ruleAttribute
+            // InternalRoom.g:24613:1: ( ruleAttribute )
+            // InternalRoom.g:24614:1: ruleAttribute
             {
              before(grammarAccess.getPortClassAccess().getAttributesAttributeParserRuleCall_3_2_0()); 
-            pushFollow(FOLLOW_ruleAttribute_in_rule__PortClass__AttributesAssignment_3_249717);
+            pushFollow(FOLLOW_2);
             ruleAttribute();
 
             state._fsp--;
@@ -66585,24 +66585,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InMessageHandler__MsgAssignment_2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24620:1: rule__InMessageHandler__MsgAssignment_2 : ( ( RULE_ID ) ) ;
+    // InternalRoom.g:24623:1: rule__InMessageHandler__MsgAssignment_2 : ( ( RULE_ID ) ) ;
     public final void rule__InMessageHandler__MsgAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24624:1: ( ( ( RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24625:1: ( ( RULE_ID ) )
+            // InternalRoom.g:24627:1: ( ( ( RULE_ID ) ) )
+            // InternalRoom.g:24628:1: ( ( RULE_ID ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24625:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24626:1: ( RULE_ID )
+            // InternalRoom.g:24628:1: ( ( RULE_ID ) )
+            // InternalRoom.g:24629:1: ( RULE_ID )
             {
              before(grammarAccess.getInMessageHandlerAccess().getMsgMessageCrossReference_2_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24627:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24628:1: RULE_ID
+            // InternalRoom.g:24630:1: ( RULE_ID )
+            // InternalRoom.g:24631:1: RULE_ID
             {
              before(grammarAccess.getInMessageHandlerAccess().getMsgMessageIDTerminalRuleCall_2_0_1()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__InMessageHandler__MsgAssignment_249752); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getInMessageHandlerAccess().getMsgMessageIDTerminalRuleCall_2_0_1()); 
 
             }
@@ -66630,20 +66630,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InMessageHandler__DetailCodeAssignment_3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24639:1: rule__InMessageHandler__DetailCodeAssignment_3 : ( ruleDetailCode ) ;
+    // InternalRoom.g:24642:1: rule__InMessageHandler__DetailCodeAssignment_3 : ( ruleDetailCode ) ;
     public final void rule__InMessageHandler__DetailCodeAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24643:1: ( ( ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24644:1: ( ruleDetailCode )
+            // InternalRoom.g:24646:1: ( ( ruleDetailCode ) )
+            // InternalRoom.g:24647:1: ( ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24644:1: ( ruleDetailCode )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24645:1: ruleDetailCode
+            // InternalRoom.g:24647:1: ( ruleDetailCode )
+            // InternalRoom.g:24648:1: ruleDetailCode
             {
              before(grammarAccess.getInMessageHandlerAccess().getDetailCodeDetailCodeParserRuleCall_3_0()); 
-            pushFollow(FOLLOW_ruleDetailCode_in_rule__InMessageHandler__DetailCodeAssignment_349787);
+            pushFollow(FOLLOW_2);
             ruleDetailCode();
 
             state._fsp--;
@@ -66671,24 +66671,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutMessageHandler__MsgAssignment_2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24654:1: rule__OutMessageHandler__MsgAssignment_2 : ( ( RULE_ID ) ) ;
+    // InternalRoom.g:24657:1: rule__OutMessageHandler__MsgAssignment_2 : ( ( RULE_ID ) ) ;
     public final void rule__OutMessageHandler__MsgAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24658:1: ( ( ( RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24659:1: ( ( RULE_ID ) )
+            // InternalRoom.g:24661:1: ( ( ( RULE_ID ) ) )
+            // InternalRoom.g:24662:1: ( ( RULE_ID ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24659:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24660:1: ( RULE_ID )
+            // InternalRoom.g:24662:1: ( ( RULE_ID ) )
+            // InternalRoom.g:24663:1: ( RULE_ID )
             {
              before(grammarAccess.getOutMessageHandlerAccess().getMsgMessageCrossReference_2_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24661:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24662:1: RULE_ID
+            // InternalRoom.g:24664:1: ( RULE_ID )
+            // InternalRoom.g:24665:1: RULE_ID
             {
              before(grammarAccess.getOutMessageHandlerAccess().getMsgMessageIDTerminalRuleCall_2_0_1()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__OutMessageHandler__MsgAssignment_249822); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getOutMessageHandlerAccess().getMsgMessageIDTerminalRuleCall_2_0_1()); 
 
             }
@@ -66716,20 +66716,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutMessageHandler__DetailCodeAssignment_3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24673:1: rule__OutMessageHandler__DetailCodeAssignment_3 : ( ruleDetailCode ) ;
+    // InternalRoom.g:24676:1: rule__OutMessageHandler__DetailCodeAssignment_3 : ( ruleDetailCode ) ;
     public final void rule__OutMessageHandler__DetailCodeAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24677:1: ( ( ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24678:1: ( ruleDetailCode )
+            // InternalRoom.g:24680:1: ( ( ruleDetailCode ) )
+            // InternalRoom.g:24681:1: ( ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24678:1: ( ruleDetailCode )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24679:1: ruleDetailCode
+            // InternalRoom.g:24681:1: ( ruleDetailCode )
+            // InternalRoom.g:24682:1: ruleDetailCode
             {
              before(grammarAccess.getOutMessageHandlerAccess().getDetailCodeDetailCodeParserRuleCall_3_0()); 
-            pushFollow(FOLLOW_ruleDetailCode_in_rule__OutMessageHandler__DetailCodeAssignment_349857);
+            pushFollow(FOLLOW_2);
             ruleDetailCode();
 
             state._fsp--;
@@ -66757,24 +66757,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__AbstractAssignment_0_0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24688:1: rule__ActorClass__AbstractAssignment_0_0 : ( ( 'abstract' ) ) ;
+    // InternalRoom.g:24691:1: rule__ActorClass__AbstractAssignment_0_0 : ( ( 'abstract' ) ) ;
     public final void rule__ActorClass__AbstractAssignment_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24692:1: ( ( ( 'abstract' ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24693:1: ( ( 'abstract' ) )
+            // InternalRoom.g:24695:1: ( ( ( 'abstract' ) ) )
+            // InternalRoom.g:24696:1: ( ( 'abstract' ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24693:1: ( ( 'abstract' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24694:1: ( 'abstract' )
+            // InternalRoom.g:24696:1: ( ( 'abstract' ) )
+            // InternalRoom.g:24697:1: ( 'abstract' )
             {
              before(grammarAccess.getActorClassAccess().getAbstractAbstractKeyword_0_0_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24695:1: ( 'abstract' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24696:1: 'abstract'
+            // InternalRoom.g:24698:1: ( 'abstract' )
+            // InternalRoom.g:24699:1: 'abstract'
             {
              before(grammarAccess.getActorClassAccess().getAbstractAbstractKeyword_0_0_0()); 
-            match(input,129,FOLLOW_129_in_rule__ActorClass__AbstractAssignment_0_049893); 
+            match(input,129,FOLLOW_2); 
              after(grammarAccess.getActorClassAccess().getAbstractAbstractKeyword_0_0_0()); 
 
             }
@@ -66802,20 +66802,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__CommTypeAssignment_0_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24711:1: rule__ActorClass__CommTypeAssignment_0_1 : ( ruleComponentCommunicationType ) ;
+    // InternalRoom.g:24714:1: rule__ActorClass__CommTypeAssignment_0_1 : ( ruleComponentCommunicationType ) ;
     public final void rule__ActorClass__CommTypeAssignment_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24715:1: ( ( ruleComponentCommunicationType ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24716:1: ( ruleComponentCommunicationType )
+            // InternalRoom.g:24718:1: ( ( ruleComponentCommunicationType ) )
+            // InternalRoom.g:24719:1: ( ruleComponentCommunicationType )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24716:1: ( ruleComponentCommunicationType )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24717:1: ruleComponentCommunicationType
+            // InternalRoom.g:24719:1: ( ruleComponentCommunicationType )
+            // InternalRoom.g:24720:1: ruleComponentCommunicationType
             {
              before(grammarAccess.getActorClassAccess().getCommTypeComponentCommunicationTypeEnumRuleCall_0_1_0()); 
-            pushFollow(FOLLOW_ruleComponentCommunicationType_in_rule__ActorClass__CommTypeAssignment_0_149932);
+            pushFollow(FOLLOW_2);
             ruleComponentCommunicationType();
 
             state._fsp--;
@@ -66843,20 +66843,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__NameAssignment_2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24726:1: rule__ActorClass__NameAssignment_2 : ( RULE_ID ) ;
+    // InternalRoom.g:24729:1: rule__ActorClass__NameAssignment_2 : ( RULE_ID ) ;
     public final void rule__ActorClass__NameAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24730:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24731:1: ( RULE_ID )
+            // InternalRoom.g:24733:1: ( ( RULE_ID ) )
+            // InternalRoom.g:24734:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24731:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24732:1: RULE_ID
+            // InternalRoom.g:24734:1: ( RULE_ID )
+            // InternalRoom.g:24735:1: RULE_ID
             {
              before(grammarAccess.getActorClassAccess().getNameIDTerminalRuleCall_2_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__ActorClass__NameAssignment_249963); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getActorClassAccess().getNameIDTerminalRuleCall_2_0()); 
 
             }
@@ -66880,20 +66880,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__DocuAssignment_3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24741:1: rule__ActorClass__DocuAssignment_3 : ( ruleDocumentation ) ;
+    // InternalRoom.g:24744:1: rule__ActorClass__DocuAssignment_3 : ( ruleDocumentation ) ;
     public final void rule__ActorClass__DocuAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24745:1: ( ( ruleDocumentation ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24746:1: ( ruleDocumentation )
+            // InternalRoom.g:24748:1: ( ( ruleDocumentation ) )
+            // InternalRoom.g:24749:1: ( ruleDocumentation )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24746:1: ( ruleDocumentation )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24747:1: ruleDocumentation
+            // InternalRoom.g:24749:1: ( ruleDocumentation )
+            // InternalRoom.g:24750:1: ruleDocumentation
             {
              before(grammarAccess.getActorClassAccess().getDocuDocumentationParserRuleCall_3_0()); 
-            pushFollow(FOLLOW_ruleDocumentation_in_rule__ActorClass__DocuAssignment_349994);
+            pushFollow(FOLLOW_2);
             ruleDocumentation();
 
             state._fsp--;
@@ -66921,24 +66921,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__BaseAssignment_4_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24756:1: rule__ActorClass__BaseAssignment_4_1 : ( ( ruleFQN ) ) ;
+    // InternalRoom.g:24759:1: rule__ActorClass__BaseAssignment_4_1 : ( ( ruleFQN ) ) ;
     public final void rule__ActorClass__BaseAssignment_4_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24760:1: ( ( ( ruleFQN ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24761:1: ( ( ruleFQN ) )
+            // InternalRoom.g:24763:1: ( ( ( ruleFQN ) ) )
+            // InternalRoom.g:24764:1: ( ( ruleFQN ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24761:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24762:1: ( ruleFQN )
+            // InternalRoom.g:24764:1: ( ( ruleFQN ) )
+            // InternalRoom.g:24765:1: ( ruleFQN )
             {
              before(grammarAccess.getActorClassAccess().getBaseActorClassCrossReference_4_1_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24763:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24764:1: ruleFQN
+            // InternalRoom.g:24766:1: ( ruleFQN )
+            // InternalRoom.g:24767:1: ruleFQN
             {
              before(grammarAccess.getActorClassAccess().getBaseActorClassFQNParserRuleCall_4_1_0_1()); 
-            pushFollow(FOLLOW_ruleFQN_in_rule__ActorClass__BaseAssignment_4_150029);
+            pushFollow(FOLLOW_2);
             ruleFQN();
 
             state._fsp--;
@@ -66970,20 +66970,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__AnnotationsAssignment_6"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24775:1: rule__ActorClass__AnnotationsAssignment_6 : ( ruleAnnotation ) ;
+    // InternalRoom.g:24778:1: rule__ActorClass__AnnotationsAssignment_6 : ( ruleAnnotation ) ;
     public final void rule__ActorClass__AnnotationsAssignment_6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24779:1: ( ( ruleAnnotation ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24780:1: ( ruleAnnotation )
+            // InternalRoom.g:24782:1: ( ( ruleAnnotation ) )
+            // InternalRoom.g:24783:1: ( ruleAnnotation )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24780:1: ( ruleAnnotation )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24781:1: ruleAnnotation
+            // InternalRoom.g:24783:1: ( ruleAnnotation )
+            // InternalRoom.g:24784:1: ruleAnnotation
             {
              before(grammarAccess.getActorClassAccess().getAnnotationsAnnotationParserRuleCall_6_0()); 
-            pushFollow(FOLLOW_ruleAnnotation_in_rule__ActorClass__AnnotationsAssignment_650064);
+            pushFollow(FOLLOW_2);
             ruleAnnotation();
 
             state._fsp--;
@@ -67011,20 +67011,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__ServiceProvisionPointsAssignment_7_2_0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24790:1: rule__ActorClass__ServiceProvisionPointsAssignment_7_2_0 : ( ruleSPP ) ;
+    // InternalRoom.g:24793:1: rule__ActorClass__ServiceProvisionPointsAssignment_7_2_0 : ( ruleSPP ) ;
     public final void rule__ActorClass__ServiceProvisionPointsAssignment_7_2_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24794:1: ( ( ruleSPP ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24795:1: ( ruleSPP )
+            // InternalRoom.g:24797:1: ( ( ruleSPP ) )
+            // InternalRoom.g:24798:1: ( ruleSPP )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24795:1: ( ruleSPP )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24796:1: ruleSPP
+            // InternalRoom.g:24798:1: ( ruleSPP )
+            // InternalRoom.g:24799:1: ruleSPP
             {
              before(grammarAccess.getActorClassAccess().getServiceProvisionPointsSPPParserRuleCall_7_2_0_0()); 
-            pushFollow(FOLLOW_ruleSPP_in_rule__ActorClass__ServiceProvisionPointsAssignment_7_2_050095);
+            pushFollow(FOLLOW_2);
             ruleSPP();
 
             state._fsp--;
@@ -67052,20 +67052,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__InterfacePortsAssignment_7_2_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24805:1: rule__ActorClass__InterfacePortsAssignment_7_2_1 : ( rulePort ) ;
+    // InternalRoom.g:24808:1: rule__ActorClass__InterfacePortsAssignment_7_2_1 : ( rulePort ) ;
     public final void rule__ActorClass__InterfacePortsAssignment_7_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24809:1: ( ( rulePort ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24810:1: ( rulePort )
+            // InternalRoom.g:24812:1: ( ( rulePort ) )
+            // InternalRoom.g:24813:1: ( rulePort )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24810:1: ( rulePort )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24811:1: rulePort
+            // InternalRoom.g:24813:1: ( rulePort )
+            // InternalRoom.g:24814:1: rulePort
             {
              before(grammarAccess.getActorClassAccess().getInterfacePortsPortParserRuleCall_7_2_1_0()); 
-            pushFollow(FOLLOW_rulePort_in_rule__ActorClass__InterfacePortsAssignment_7_2_150126);
+            pushFollow(FOLLOW_2);
             rulePort();
 
             state._fsp--;
@@ -67093,20 +67093,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__StructureDocuAssignment_8_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24820:1: rule__ActorClass__StructureDocuAssignment_8_1 : ( ruleDocumentation ) ;
+    // InternalRoom.g:24823:1: rule__ActorClass__StructureDocuAssignment_8_1 : ( ruleDocumentation ) ;
     public final void rule__ActorClass__StructureDocuAssignment_8_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24824:1: ( ( ruleDocumentation ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24825:1: ( ruleDocumentation )
+            // InternalRoom.g:24827:1: ( ( ruleDocumentation ) )
+            // InternalRoom.g:24828:1: ( ruleDocumentation )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24825:1: ( ruleDocumentation )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24826:1: ruleDocumentation
+            // InternalRoom.g:24828:1: ( ruleDocumentation )
+            // InternalRoom.g:24829:1: ruleDocumentation
             {
              before(grammarAccess.getActorClassAccess().getStructureDocuDocumentationParserRuleCall_8_1_0()); 
-            pushFollow(FOLLOW_ruleDocumentation_in_rule__ActorClass__StructureDocuAssignment_8_150157);
+            pushFollow(FOLLOW_2);
             ruleDocumentation();
 
             state._fsp--;
@@ -67134,20 +67134,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__UserCode1Assignment_8_3_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24835:1: rule__ActorClass__UserCode1Assignment_8_3_1 : ( ruleDetailCode ) ;
+    // InternalRoom.g:24838:1: rule__ActorClass__UserCode1Assignment_8_3_1 : ( ruleDetailCode ) ;
     public final void rule__ActorClass__UserCode1Assignment_8_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24839:1: ( ( ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24840:1: ( ruleDetailCode )
+            // InternalRoom.g:24842:1: ( ( ruleDetailCode ) )
+            // InternalRoom.g:24843:1: ( ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24840:1: ( ruleDetailCode )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24841:1: ruleDetailCode
+            // InternalRoom.g:24843:1: ( ruleDetailCode )
+            // InternalRoom.g:24844:1: ruleDetailCode
             {
              before(grammarAccess.getActorClassAccess().getUserCode1DetailCodeParserRuleCall_8_3_1_0()); 
-            pushFollow(FOLLOW_ruleDetailCode_in_rule__ActorClass__UserCode1Assignment_8_3_150188);
+            pushFollow(FOLLOW_2);
             ruleDetailCode();
 
             state._fsp--;
@@ -67175,20 +67175,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__UserCode2Assignment_8_4_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24850:1: rule__ActorClass__UserCode2Assignment_8_4_1 : ( ruleDetailCode ) ;
+    // InternalRoom.g:24853:1: rule__ActorClass__UserCode2Assignment_8_4_1 : ( ruleDetailCode ) ;
     public final void rule__ActorClass__UserCode2Assignment_8_4_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24854:1: ( ( ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24855:1: ( ruleDetailCode )
+            // InternalRoom.g:24857:1: ( ( ruleDetailCode ) )
+            // InternalRoom.g:24858:1: ( ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24855:1: ( ruleDetailCode )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24856:1: ruleDetailCode
+            // InternalRoom.g:24858:1: ( ruleDetailCode )
+            // InternalRoom.g:24859:1: ruleDetailCode
             {
              before(grammarAccess.getActorClassAccess().getUserCode2DetailCodeParserRuleCall_8_4_1_0()); 
-            pushFollow(FOLLOW_ruleDetailCode_in_rule__ActorClass__UserCode2Assignment_8_4_150219);
+            pushFollow(FOLLOW_2);
             ruleDetailCode();
 
             state._fsp--;
@@ -67216,20 +67216,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__UserCode3Assignment_8_5_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24865:1: rule__ActorClass__UserCode3Assignment_8_5_1 : ( ruleDetailCode ) ;
+    // InternalRoom.g:24868:1: rule__ActorClass__UserCode3Assignment_8_5_1 : ( ruleDetailCode ) ;
     public final void rule__ActorClass__UserCode3Assignment_8_5_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24869:1: ( ( ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24870:1: ( ruleDetailCode )
+            // InternalRoom.g:24872:1: ( ( ruleDetailCode ) )
+            // InternalRoom.g:24873:1: ( ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24870:1: ( ruleDetailCode )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24871:1: ruleDetailCode
+            // InternalRoom.g:24873:1: ( ruleDetailCode )
+            // InternalRoom.g:24874:1: ruleDetailCode
             {
              before(grammarAccess.getActorClassAccess().getUserCode3DetailCodeParserRuleCall_8_5_1_0()); 
-            pushFollow(FOLLOW_ruleDetailCode_in_rule__ActorClass__UserCode3Assignment_8_5_150250);
+            pushFollow(FOLLOW_2);
             ruleDetailCode();
 
             state._fsp--;
@@ -67257,20 +67257,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__ConnectionsAssignment_8_6_0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24880:1: rule__ActorClass__ConnectionsAssignment_8_6_0 : ( ruleLayerConnection ) ;
+    // InternalRoom.g:24883:1: rule__ActorClass__ConnectionsAssignment_8_6_0 : ( ruleLayerConnection ) ;
     public final void rule__ActorClass__ConnectionsAssignment_8_6_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24884:1: ( ( ruleLayerConnection ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24885:1: ( ruleLayerConnection )
+            // InternalRoom.g:24887:1: ( ( ruleLayerConnection ) )
+            // InternalRoom.g:24888:1: ( ruleLayerConnection )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24885:1: ( ruleLayerConnection )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24886:1: ruleLayerConnection
+            // InternalRoom.g:24888:1: ( ruleLayerConnection )
+            // InternalRoom.g:24889:1: ruleLayerConnection
             {
              before(grammarAccess.getActorClassAccess().getConnectionsLayerConnectionParserRuleCall_8_6_0_0()); 
-            pushFollow(FOLLOW_ruleLayerConnection_in_rule__ActorClass__ConnectionsAssignment_8_6_050281);
+            pushFollow(FOLLOW_2);
             ruleLayerConnection();
 
             state._fsp--;
@@ -67298,20 +67298,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__BindingsAssignment_8_6_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24895:1: rule__ActorClass__BindingsAssignment_8_6_1 : ( ruleBinding ) ;
+    // InternalRoom.g:24898:1: rule__ActorClass__BindingsAssignment_8_6_1 : ( ruleBinding ) ;
     public final void rule__ActorClass__BindingsAssignment_8_6_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24899:1: ( ( ruleBinding ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24900:1: ( ruleBinding )
+            // InternalRoom.g:24902:1: ( ( ruleBinding ) )
+            // InternalRoom.g:24903:1: ( ruleBinding )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24900:1: ( ruleBinding )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24901:1: ruleBinding
+            // InternalRoom.g:24903:1: ( ruleBinding )
+            // InternalRoom.g:24904:1: ruleBinding
             {
              before(grammarAccess.getActorClassAccess().getBindingsBindingParserRuleCall_8_6_1_0()); 
-            pushFollow(FOLLOW_ruleBinding_in_rule__ActorClass__BindingsAssignment_8_6_150312);
+            pushFollow(FOLLOW_2);
             ruleBinding();
 
             state._fsp--;
@@ -67339,20 +67339,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__ServiceImplementationsAssignment_8_6_2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24910:1: rule__ActorClass__ServiceImplementationsAssignment_8_6_2 : ( ruleServiceImplementation ) ;
+    // InternalRoom.g:24913:1: rule__ActorClass__ServiceImplementationsAssignment_8_6_2 : ( ruleServiceImplementation ) ;
     public final void rule__ActorClass__ServiceImplementationsAssignment_8_6_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24914:1: ( ( ruleServiceImplementation ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24915:1: ( ruleServiceImplementation )
+            // InternalRoom.g:24917:1: ( ( ruleServiceImplementation ) )
+            // InternalRoom.g:24918:1: ( ruleServiceImplementation )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24915:1: ( ruleServiceImplementation )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24916:1: ruleServiceImplementation
+            // InternalRoom.g:24918:1: ( ruleServiceImplementation )
+            // InternalRoom.g:24919:1: ruleServiceImplementation
             {
              before(grammarAccess.getActorClassAccess().getServiceImplementationsServiceImplementationParserRuleCall_8_6_2_0()); 
-            pushFollow(FOLLOW_ruleServiceImplementation_in_rule__ActorClass__ServiceImplementationsAssignment_8_6_250343);
+            pushFollow(FOLLOW_2);
             ruleServiceImplementation();
 
             state._fsp--;
@@ -67380,20 +67380,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__AttributesAssignment_8_6_3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24925:1: rule__ActorClass__AttributesAssignment_8_6_3 : ( ruleAttribute ) ;
+    // InternalRoom.g:24928:1: rule__ActorClass__AttributesAssignment_8_6_3 : ( ruleAttribute ) ;
     public final void rule__ActorClass__AttributesAssignment_8_6_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24929:1: ( ( ruleAttribute ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24930:1: ( ruleAttribute )
+            // InternalRoom.g:24932:1: ( ( ruleAttribute ) )
+            // InternalRoom.g:24933:1: ( ruleAttribute )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24930:1: ( ruleAttribute )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24931:1: ruleAttribute
+            // InternalRoom.g:24933:1: ( ruleAttribute )
+            // InternalRoom.g:24934:1: ruleAttribute
             {
              before(grammarAccess.getActorClassAccess().getAttributesAttributeParserRuleCall_8_6_3_0()); 
-            pushFollow(FOLLOW_ruleAttribute_in_rule__ActorClass__AttributesAssignment_8_6_350374);
+            pushFollow(FOLLOW_2);
             ruleAttribute();
 
             state._fsp--;
@@ -67421,20 +67421,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__ActorRefsAssignment_8_6_4"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24940:1: rule__ActorClass__ActorRefsAssignment_8_6_4 : ( ruleActorRef ) ;
+    // InternalRoom.g:24943:1: rule__ActorClass__ActorRefsAssignment_8_6_4 : ( ruleActorRef ) ;
     public final void rule__ActorClass__ActorRefsAssignment_8_6_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24944:1: ( ( ruleActorRef ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24945:1: ( ruleActorRef )
+            // InternalRoom.g:24947:1: ( ( ruleActorRef ) )
+            // InternalRoom.g:24948:1: ( ruleActorRef )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24945:1: ( ruleActorRef )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24946:1: ruleActorRef
+            // InternalRoom.g:24948:1: ( ruleActorRef )
+            // InternalRoom.g:24949:1: ruleActorRef
             {
              before(grammarAccess.getActorClassAccess().getActorRefsActorRefParserRuleCall_8_6_4_0()); 
-            pushFollow(FOLLOW_ruleActorRef_in_rule__ActorClass__ActorRefsAssignment_8_6_450405);
+            pushFollow(FOLLOW_2);
             ruleActorRef();
 
             state._fsp--;
@@ -67462,20 +67462,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__ServiceAccessPointsAssignment_8_6_5"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24955:1: rule__ActorClass__ServiceAccessPointsAssignment_8_6_5 : ( ruleSAP ) ;
+    // InternalRoom.g:24958:1: rule__ActorClass__ServiceAccessPointsAssignment_8_6_5 : ( ruleSAP ) ;
     public final void rule__ActorClass__ServiceAccessPointsAssignment_8_6_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24959:1: ( ( ruleSAP ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24960:1: ( ruleSAP )
+            // InternalRoom.g:24962:1: ( ( ruleSAP ) )
+            // InternalRoom.g:24963:1: ( ruleSAP )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24960:1: ( ruleSAP )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24961:1: ruleSAP
+            // InternalRoom.g:24963:1: ( ruleSAP )
+            // InternalRoom.g:24964:1: ruleSAP
             {
              before(grammarAccess.getActorClassAccess().getServiceAccessPointsSAPParserRuleCall_8_6_5_0()); 
-            pushFollow(FOLLOW_ruleSAP_in_rule__ActorClass__ServiceAccessPointsAssignment_8_6_550436);
+            pushFollow(FOLLOW_2);
             ruleSAP();
 
             state._fsp--;
@@ -67503,20 +67503,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__InternalPortsAssignment_8_6_6"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24970:1: rule__ActorClass__InternalPortsAssignment_8_6_6 : ( rulePort ) ;
+    // InternalRoom.g:24973:1: rule__ActorClass__InternalPortsAssignment_8_6_6 : ( rulePort ) ;
     public final void rule__ActorClass__InternalPortsAssignment_8_6_6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24974:1: ( ( rulePort ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24975:1: ( rulePort )
+            // InternalRoom.g:24977:1: ( ( rulePort ) )
+            // InternalRoom.g:24978:1: ( rulePort )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24975:1: ( rulePort )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24976:1: rulePort
+            // InternalRoom.g:24978:1: ( rulePort )
+            // InternalRoom.g:24979:1: rulePort
             {
              before(grammarAccess.getActorClassAccess().getInternalPortsPortParserRuleCall_8_6_6_0()); 
-            pushFollow(FOLLOW_rulePort_in_rule__ActorClass__InternalPortsAssignment_8_6_650467);
+            pushFollow(FOLLOW_2);
             rulePort();
 
             state._fsp--;
@@ -67544,20 +67544,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__ExternalPortsAssignment_8_6_7"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24985:1: rule__ActorClass__ExternalPortsAssignment_8_6_7 : ( ruleExternalPort ) ;
+    // InternalRoom.g:24988:1: rule__ActorClass__ExternalPortsAssignment_8_6_7 : ( ruleExternalPort ) ;
     public final void rule__ActorClass__ExternalPortsAssignment_8_6_7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24989:1: ( ( ruleExternalPort ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24990:1: ( ruleExternalPort )
+            // InternalRoom.g:24992:1: ( ( ruleExternalPort ) )
+            // InternalRoom.g:24993:1: ( ruleExternalPort )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24990:1: ( ruleExternalPort )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:24991:1: ruleExternalPort
+            // InternalRoom.g:24993:1: ( ruleExternalPort )
+            // InternalRoom.g:24994:1: ruleExternalPort
             {
              before(grammarAccess.getActorClassAccess().getExternalPortsExternalPortParserRuleCall_8_6_7_0()); 
-            pushFollow(FOLLOW_ruleExternalPort_in_rule__ActorClass__ExternalPortsAssignment_8_6_750498);
+            pushFollow(FOLLOW_2);
             ruleExternalPort();
 
             state._fsp--;
@@ -67585,20 +67585,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__BehaviorDocuAssignment_9_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25000:1: rule__ActorClass__BehaviorDocuAssignment_9_1 : ( ruleDocumentation ) ;
+    // InternalRoom.g:25003:1: rule__ActorClass__BehaviorDocuAssignment_9_1 : ( ruleDocumentation ) ;
     public final void rule__ActorClass__BehaviorDocuAssignment_9_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25004:1: ( ( ruleDocumentation ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25005:1: ( ruleDocumentation )
+            // InternalRoom.g:25007:1: ( ( ruleDocumentation ) )
+            // InternalRoom.g:25008:1: ( ruleDocumentation )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25005:1: ( ruleDocumentation )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25006:1: ruleDocumentation
+            // InternalRoom.g:25008:1: ( ruleDocumentation )
+            // InternalRoom.g:25009:1: ruleDocumentation
             {
              before(grammarAccess.getActorClassAccess().getBehaviorDocuDocumentationParserRuleCall_9_1_0()); 
-            pushFollow(FOLLOW_ruleDocumentation_in_rule__ActorClass__BehaviorDocuAssignment_9_150529);
+            pushFollow(FOLLOW_2);
             ruleDocumentation();
 
             state._fsp--;
@@ -67626,20 +67626,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__BehaviorAnnotationsAssignment_9_3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25015:1: rule__ActorClass__BehaviorAnnotationsAssignment_9_3 : ( ruleAnnotation ) ;
+    // InternalRoom.g:25018:1: rule__ActorClass__BehaviorAnnotationsAssignment_9_3 : ( ruleAnnotation ) ;
     public final void rule__ActorClass__BehaviorAnnotationsAssignment_9_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25019:1: ( ( ruleAnnotation ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25020:1: ( ruleAnnotation )
+            // InternalRoom.g:25022:1: ( ( ruleAnnotation ) )
+            // InternalRoom.g:25023:1: ( ruleAnnotation )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25020:1: ( ruleAnnotation )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25021:1: ruleAnnotation
+            // InternalRoom.g:25023:1: ( ruleAnnotation )
+            // InternalRoom.g:25024:1: ruleAnnotation
             {
              before(grammarAccess.getActorClassAccess().getBehaviorAnnotationsAnnotationParserRuleCall_9_3_0()); 
-            pushFollow(FOLLOW_ruleAnnotation_in_rule__ActorClass__BehaviorAnnotationsAssignment_9_350560);
+            pushFollow(FOLLOW_2);
             ruleAnnotation();
 
             state._fsp--;
@@ -67667,20 +67667,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__OperationsAssignment_9_4_0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25030:1: rule__ActorClass__OperationsAssignment_9_4_0 : ( ruleStandardOperation ) ;
+    // InternalRoom.g:25033:1: rule__ActorClass__OperationsAssignment_9_4_0 : ( ruleStandardOperation ) ;
     public final void rule__ActorClass__OperationsAssignment_9_4_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25034:1: ( ( ruleStandardOperation ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25035:1: ( ruleStandardOperation )
+            // InternalRoom.g:25037:1: ( ( ruleStandardOperation ) )
+            // InternalRoom.g:25038:1: ( ruleStandardOperation )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25035:1: ( ruleStandardOperation )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25036:1: ruleStandardOperation
+            // InternalRoom.g:25038:1: ( ruleStandardOperation )
+            // InternalRoom.g:25039:1: ruleStandardOperation
             {
              before(grammarAccess.getActorClassAccess().getOperationsStandardOperationParserRuleCall_9_4_0_0()); 
-            pushFollow(FOLLOW_ruleStandardOperation_in_rule__ActorClass__OperationsAssignment_9_4_050591);
+            pushFollow(FOLLOW_2);
             ruleStandardOperation();
 
             state._fsp--;
@@ -67708,20 +67708,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__StructorsAssignment_9_4_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25045:1: rule__ActorClass__StructorsAssignment_9_4_1 : ( ruleClassStructor ) ;
+    // InternalRoom.g:25048:1: rule__ActorClass__StructorsAssignment_9_4_1 : ( ruleClassStructor ) ;
     public final void rule__ActorClass__StructorsAssignment_9_4_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25049:1: ( ( ruleClassStructor ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25050:1: ( ruleClassStructor )
+            // InternalRoom.g:25052:1: ( ( ruleClassStructor ) )
+            // InternalRoom.g:25053:1: ( ruleClassStructor )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25050:1: ( ruleClassStructor )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25051:1: ruleClassStructor
+            // InternalRoom.g:25053:1: ( ruleClassStructor )
+            // InternalRoom.g:25054:1: ruleClassStructor
             {
              before(grammarAccess.getActorClassAccess().getStructorsClassStructorParserRuleCall_9_4_1_0()); 
-            pushFollow(FOLLOW_ruleClassStructor_in_rule__ActorClass__StructorsAssignment_9_4_150622);
+            pushFollow(FOLLOW_2);
             ruleClassStructor();
 
             state._fsp--;
@@ -67749,20 +67749,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorClass__StateMachineAssignment_9_5"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25060:1: rule__ActorClass__StateMachineAssignment_9_5 : ( ruleStateMachine ) ;
+    // InternalRoom.g:25063:1: rule__ActorClass__StateMachineAssignment_9_5 : ( ruleStateMachine ) ;
     public final void rule__ActorClass__StateMachineAssignment_9_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25064:1: ( ( ruleStateMachine ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25065:1: ( ruleStateMachine )
+            // InternalRoom.g:25067:1: ( ( ruleStateMachine ) )
+            // InternalRoom.g:25068:1: ( ruleStateMachine )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25065:1: ( ruleStateMachine )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25066:1: ruleStateMachine
+            // InternalRoom.g:25068:1: ( ruleStateMachine )
+            // InternalRoom.g:25069:1: ruleStateMachine
             {
              before(grammarAccess.getActorClassAccess().getStateMachineStateMachineParserRuleCall_9_5_0()); 
-            pushFollow(FOLLOW_ruleStateMachine_in_rule__ActorClass__StateMachineAssignment_9_550653);
+            pushFollow(FOLLOW_2);
             ruleStateMachine();
 
             state._fsp--;
@@ -67790,24 +67790,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Port__ConjugatedAssignment_0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25075:1: rule__Port__ConjugatedAssignment_0 : ( ( 'conjugated' ) ) ;
+    // InternalRoom.g:25078:1: rule__Port__ConjugatedAssignment_0 : ( ( 'conjugated' ) ) ;
     public final void rule__Port__ConjugatedAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25079:1: ( ( ( 'conjugated' ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25080:1: ( ( 'conjugated' ) )
+            // InternalRoom.g:25082:1: ( ( ( 'conjugated' ) ) )
+            // InternalRoom.g:25083:1: ( ( 'conjugated' ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25080:1: ( ( 'conjugated' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25081:1: ( 'conjugated' )
+            // InternalRoom.g:25083:1: ( ( 'conjugated' ) )
+            // InternalRoom.g:25084:1: ( 'conjugated' )
             {
              before(grammarAccess.getPortAccess().getConjugatedConjugatedKeyword_0_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25082:1: ( 'conjugated' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25083:1: 'conjugated'
+            // InternalRoom.g:25085:1: ( 'conjugated' )
+            // InternalRoom.g:25086:1: 'conjugated'
             {
              before(grammarAccess.getPortAccess().getConjugatedConjugatedKeyword_0_0()); 
-            match(input,67,FOLLOW_67_in_rule__Port__ConjugatedAssignment_050689); 
+            match(input,67,FOLLOW_2); 
              after(grammarAccess.getPortAccess().getConjugatedConjugatedKeyword_0_0()); 
 
             }
@@ -67835,20 +67835,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Port__NameAssignment_2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25098:1: rule__Port__NameAssignment_2 : ( RULE_ID ) ;
+    // InternalRoom.g:25101:1: rule__Port__NameAssignment_2 : ( RULE_ID ) ;
     public final void rule__Port__NameAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25102:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25103:1: ( RULE_ID )
+            // InternalRoom.g:25105:1: ( ( RULE_ID ) )
+            // InternalRoom.g:25106:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25103:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25104:1: RULE_ID
+            // InternalRoom.g:25106:1: ( RULE_ID )
+            // InternalRoom.g:25107:1: RULE_ID
             {
              before(grammarAccess.getPortAccess().getNameIDTerminalRuleCall_2_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__Port__NameAssignment_250728); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getPortAccess().getNameIDTerminalRuleCall_2_0()); 
 
             }
@@ -67872,20 +67872,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Port__MultiplicityAssignment_3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25113:1: rule__Port__MultiplicityAssignment_3 : ( ruleMULTIPLICITY ) ;
+    // InternalRoom.g:25116:1: rule__Port__MultiplicityAssignment_3 : ( ruleMULTIPLICITY ) ;
     public final void rule__Port__MultiplicityAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25117:1: ( ( ruleMULTIPLICITY ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25118:1: ( ruleMULTIPLICITY )
+            // InternalRoom.g:25120:1: ( ( ruleMULTIPLICITY ) )
+            // InternalRoom.g:25121:1: ( ruleMULTIPLICITY )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25118:1: ( ruleMULTIPLICITY )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25119:1: ruleMULTIPLICITY
+            // InternalRoom.g:25121:1: ( ruleMULTIPLICITY )
+            // InternalRoom.g:25122:1: ruleMULTIPLICITY
             {
              before(grammarAccess.getPortAccess().getMultiplicityMULTIPLICITYParserRuleCall_3_0()); 
-            pushFollow(FOLLOW_ruleMULTIPLICITY_in_rule__Port__MultiplicityAssignment_350759);
+            pushFollow(FOLLOW_2);
             ruleMULTIPLICITY();
 
             state._fsp--;
@@ -67913,24 +67913,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Port__ProtocolAssignment_5"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25128:1: rule__Port__ProtocolAssignment_5 : ( ( ruleFQN ) ) ;
+    // InternalRoom.g:25131:1: rule__Port__ProtocolAssignment_5 : ( ( ruleFQN ) ) ;
     public final void rule__Port__ProtocolAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25132:1: ( ( ( ruleFQN ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25133:1: ( ( ruleFQN ) )
+            // InternalRoom.g:25135:1: ( ( ( ruleFQN ) ) )
+            // InternalRoom.g:25136:1: ( ( ruleFQN ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25133:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25134:1: ( ruleFQN )
+            // InternalRoom.g:25136:1: ( ( ruleFQN ) )
+            // InternalRoom.g:25137:1: ( ruleFQN )
             {
              before(grammarAccess.getPortAccess().getProtocolGeneralProtocolClassCrossReference_5_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25135:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25136:1: ruleFQN
+            // InternalRoom.g:25138:1: ( ruleFQN )
+            // InternalRoom.g:25139:1: ruleFQN
             {
              before(grammarAccess.getPortAccess().getProtocolGeneralProtocolClassFQNParserRuleCall_5_0_1()); 
-            pushFollow(FOLLOW_ruleFQN_in_rule__Port__ProtocolAssignment_550794);
+            pushFollow(FOLLOW_2);
             ruleFQN();
 
             state._fsp--;
@@ -67962,20 +67962,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Port__DocuAssignment_6"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25147:1: rule__Port__DocuAssignment_6 : ( ruleDocumentation ) ;
+    // InternalRoom.g:25150:1: rule__Port__DocuAssignment_6 : ( ruleDocumentation ) ;
     public final void rule__Port__DocuAssignment_6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25151:1: ( ( ruleDocumentation ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25152:1: ( ruleDocumentation )
+            // InternalRoom.g:25154:1: ( ( ruleDocumentation ) )
+            // InternalRoom.g:25155:1: ( ruleDocumentation )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25152:1: ( ruleDocumentation )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25153:1: ruleDocumentation
+            // InternalRoom.g:25155:1: ( ruleDocumentation )
+            // InternalRoom.g:25156:1: ruleDocumentation
             {
              before(grammarAccess.getPortAccess().getDocuDocumentationParserRuleCall_6_0()); 
-            pushFollow(FOLLOW_ruleDocumentation_in_rule__Port__DocuAssignment_650829);
+            pushFollow(FOLLOW_2);
             ruleDocumentation();
 
             state._fsp--;
@@ -68003,24 +68003,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ExternalPort__InterfacePortAssignment_2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25162:1: rule__ExternalPort__InterfacePortAssignment_2 : ( ( RULE_ID ) ) ;
+    // InternalRoom.g:25165:1: rule__ExternalPort__InterfacePortAssignment_2 : ( ( RULE_ID ) ) ;
     public final void rule__ExternalPort__InterfacePortAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25166:1: ( ( ( RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25167:1: ( ( RULE_ID ) )
+            // InternalRoom.g:25169:1: ( ( ( RULE_ID ) ) )
+            // InternalRoom.g:25170:1: ( ( RULE_ID ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25167:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25168:1: ( RULE_ID )
+            // InternalRoom.g:25170:1: ( ( RULE_ID ) )
+            // InternalRoom.g:25171:1: ( RULE_ID )
             {
              before(grammarAccess.getExternalPortAccess().getInterfacePortPortCrossReference_2_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25169:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25170:1: RULE_ID
+            // InternalRoom.g:25172:1: ( RULE_ID )
+            // InternalRoom.g:25173:1: RULE_ID
             {
              before(grammarAccess.getExternalPortAccess().getInterfacePortPortIDTerminalRuleCall_2_0_1()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__ExternalPort__InterfacePortAssignment_250864); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getExternalPortAccess().getInterfacePortPortIDTerminalRuleCall_2_0_1()); 
 
             }
@@ -68048,20 +68048,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SAP__NameAssignment_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25181:1: rule__SAP__NameAssignment_1 : ( RULE_ID ) ;
+    // InternalRoom.g:25184:1: rule__SAP__NameAssignment_1 : ( RULE_ID ) ;
     public final void rule__SAP__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25185:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25186:1: ( RULE_ID )
+            // InternalRoom.g:25188:1: ( ( RULE_ID ) )
+            // InternalRoom.g:25189:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25186:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25187:1: RULE_ID
+            // InternalRoom.g:25189:1: ( RULE_ID )
+            // InternalRoom.g:25190:1: RULE_ID
             {
              before(grammarAccess.getSAPAccess().getNameIDTerminalRuleCall_1_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__SAP__NameAssignment_150899); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getSAPAccess().getNameIDTerminalRuleCall_1_0()); 
 
             }
@@ -68085,24 +68085,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SAP__ProtocolAssignment_3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25196:1: rule__SAP__ProtocolAssignment_3 : ( ( ruleFQN ) ) ;
+    // InternalRoom.g:25199:1: rule__SAP__ProtocolAssignment_3 : ( ( ruleFQN ) ) ;
     public final void rule__SAP__ProtocolAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25200:1: ( ( ( ruleFQN ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25201:1: ( ( ruleFQN ) )
+            // InternalRoom.g:25203:1: ( ( ( ruleFQN ) ) )
+            // InternalRoom.g:25204:1: ( ( ruleFQN ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25201:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25202:1: ( ruleFQN )
+            // InternalRoom.g:25204:1: ( ( ruleFQN ) )
+            // InternalRoom.g:25205:1: ( ruleFQN )
             {
              before(grammarAccess.getSAPAccess().getProtocolProtocolClassCrossReference_3_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25203:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25204:1: ruleFQN
+            // InternalRoom.g:25206:1: ( ruleFQN )
+            // InternalRoom.g:25207:1: ruleFQN
             {
              before(grammarAccess.getSAPAccess().getProtocolProtocolClassFQNParserRuleCall_3_0_1()); 
-            pushFollow(FOLLOW_ruleFQN_in_rule__SAP__ProtocolAssignment_350934);
+            pushFollow(FOLLOW_2);
             ruleFQN();
 
             state._fsp--;
@@ -68134,20 +68134,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SPP__NameAssignment_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25215:1: rule__SPP__NameAssignment_1 : ( RULE_ID ) ;
+    // InternalRoom.g:25218:1: rule__SPP__NameAssignment_1 : ( RULE_ID ) ;
     public final void rule__SPP__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25219:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25220:1: ( RULE_ID )
+            // InternalRoom.g:25222:1: ( ( RULE_ID ) )
+            // InternalRoom.g:25223:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25220:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25221:1: RULE_ID
+            // InternalRoom.g:25223:1: ( RULE_ID )
+            // InternalRoom.g:25224:1: RULE_ID
             {
              before(grammarAccess.getSPPAccess().getNameIDTerminalRuleCall_1_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__SPP__NameAssignment_150969); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getSPPAccess().getNameIDTerminalRuleCall_1_0()); 
 
             }
@@ -68171,24 +68171,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SPP__ProtocolAssignment_3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25230:1: rule__SPP__ProtocolAssignment_3 : ( ( ruleFQN ) ) ;
+    // InternalRoom.g:25233:1: rule__SPP__ProtocolAssignment_3 : ( ( ruleFQN ) ) ;
     public final void rule__SPP__ProtocolAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25234:1: ( ( ( ruleFQN ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25235:1: ( ( ruleFQN ) )
+            // InternalRoom.g:25237:1: ( ( ( ruleFQN ) ) )
+            // InternalRoom.g:25238:1: ( ( ruleFQN ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25235:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25236:1: ( ruleFQN )
+            // InternalRoom.g:25238:1: ( ( ruleFQN ) )
+            // InternalRoom.g:25239:1: ( ruleFQN )
             {
              before(grammarAccess.getSPPAccess().getProtocolProtocolClassCrossReference_3_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25237:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25238:1: ruleFQN
+            // InternalRoom.g:25240:1: ( ruleFQN )
+            // InternalRoom.g:25241:1: ruleFQN
             {
              before(grammarAccess.getSPPAccess().getProtocolProtocolClassFQNParserRuleCall_3_0_1()); 
-            pushFollow(FOLLOW_ruleFQN_in_rule__SPP__ProtocolAssignment_351004);
+            pushFollow(FOLLOW_2);
             ruleFQN();
 
             state._fsp--;
@@ -68220,24 +68220,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ServiceImplementation__SppAssignment_2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25249:1: rule__ServiceImplementation__SppAssignment_2 : ( ( RULE_ID ) ) ;
+    // InternalRoom.g:25252:1: rule__ServiceImplementation__SppAssignment_2 : ( ( RULE_ID ) ) ;
     public final void rule__ServiceImplementation__SppAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25253:1: ( ( ( RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25254:1: ( ( RULE_ID ) )
+            // InternalRoom.g:25256:1: ( ( ( RULE_ID ) ) )
+            // InternalRoom.g:25257:1: ( ( RULE_ID ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25254:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25255:1: ( RULE_ID )
+            // InternalRoom.g:25257:1: ( ( RULE_ID ) )
+            // InternalRoom.g:25258:1: ( RULE_ID )
             {
              before(grammarAccess.getServiceImplementationAccess().getSppSPPCrossReference_2_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25256:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25257:1: RULE_ID
+            // InternalRoom.g:25259:1: ( RULE_ID )
+            // InternalRoom.g:25260:1: RULE_ID
             {
              before(grammarAccess.getServiceImplementationAccess().getSppSPPIDTerminalRuleCall_2_0_1()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__ServiceImplementation__SppAssignment_251043); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getServiceImplementationAccess().getSppSPPIDTerminalRuleCall_2_0_1()); 
 
             }
@@ -68265,20 +68265,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__LogicalSystem__NameAssignment_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25268:1: rule__LogicalSystem__NameAssignment_1 : ( RULE_ID ) ;
+    // InternalRoom.g:25271:1: rule__LogicalSystem__NameAssignment_1 : ( RULE_ID ) ;
     public final void rule__LogicalSystem__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25272:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25273:1: ( RULE_ID )
+            // InternalRoom.g:25275:1: ( ( RULE_ID ) )
+            // InternalRoom.g:25276:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25273:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25274:1: RULE_ID
+            // InternalRoom.g:25276:1: ( RULE_ID )
+            // InternalRoom.g:25277:1: RULE_ID
             {
              before(grammarAccess.getLogicalSystemAccess().getNameIDTerminalRuleCall_1_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__LogicalSystem__NameAssignment_151078); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getLogicalSystemAccess().getNameIDTerminalRuleCall_1_0()); 
 
             }
@@ -68302,20 +68302,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__LogicalSystem__DocuAssignment_2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25283:1: rule__LogicalSystem__DocuAssignment_2 : ( ruleDocumentation ) ;
+    // InternalRoom.g:25286:1: rule__LogicalSystem__DocuAssignment_2 : ( ruleDocumentation ) ;
     public final void rule__LogicalSystem__DocuAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25287:1: ( ( ruleDocumentation ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25288:1: ( ruleDocumentation )
+            // InternalRoom.g:25290:1: ( ( ruleDocumentation ) )
+            // InternalRoom.g:25291:1: ( ruleDocumentation )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25288:1: ( ruleDocumentation )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25289:1: ruleDocumentation
+            // InternalRoom.g:25291:1: ( ruleDocumentation )
+            // InternalRoom.g:25292:1: ruleDocumentation
             {
              before(grammarAccess.getLogicalSystemAccess().getDocuDocumentationParserRuleCall_2_0()); 
-            pushFollow(FOLLOW_ruleDocumentation_in_rule__LogicalSystem__DocuAssignment_251109);
+            pushFollow(FOLLOW_2);
             ruleDocumentation();
 
             state._fsp--;
@@ -68343,20 +68343,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__LogicalSystem__AnnotationsAssignment_4"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25298:1: rule__LogicalSystem__AnnotationsAssignment_4 : ( ruleAnnotation ) ;
+    // InternalRoom.g:25301:1: rule__LogicalSystem__AnnotationsAssignment_4 : ( ruleAnnotation ) ;
     public final void rule__LogicalSystem__AnnotationsAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25302:1: ( ( ruleAnnotation ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25303:1: ( ruleAnnotation )
+            // InternalRoom.g:25305:1: ( ( ruleAnnotation ) )
+            // InternalRoom.g:25306:1: ( ruleAnnotation )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25303:1: ( ruleAnnotation )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25304:1: ruleAnnotation
+            // InternalRoom.g:25306:1: ( ruleAnnotation )
+            // InternalRoom.g:25307:1: ruleAnnotation
             {
              before(grammarAccess.getLogicalSystemAccess().getAnnotationsAnnotationParserRuleCall_4_0()); 
-            pushFollow(FOLLOW_ruleAnnotation_in_rule__LogicalSystem__AnnotationsAssignment_451140);
+            pushFollow(FOLLOW_2);
             ruleAnnotation();
 
             state._fsp--;
@@ -68384,20 +68384,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__LogicalSystem__ConnectionsAssignment_5_0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25313:1: rule__LogicalSystem__ConnectionsAssignment_5_0 : ( ruleLayerConnection ) ;
+    // InternalRoom.g:25316:1: rule__LogicalSystem__ConnectionsAssignment_5_0 : ( ruleLayerConnection ) ;
     public final void rule__LogicalSystem__ConnectionsAssignment_5_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25317:1: ( ( ruleLayerConnection ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25318:1: ( ruleLayerConnection )
+            // InternalRoom.g:25320:1: ( ( ruleLayerConnection ) )
+            // InternalRoom.g:25321:1: ( ruleLayerConnection )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25318:1: ( ruleLayerConnection )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25319:1: ruleLayerConnection
+            // InternalRoom.g:25321:1: ( ruleLayerConnection )
+            // InternalRoom.g:25322:1: ruleLayerConnection
             {
              before(grammarAccess.getLogicalSystemAccess().getConnectionsLayerConnectionParserRuleCall_5_0_0()); 
-            pushFollow(FOLLOW_ruleLayerConnection_in_rule__LogicalSystem__ConnectionsAssignment_5_051171);
+            pushFollow(FOLLOW_2);
             ruleLayerConnection();
 
             state._fsp--;
@@ -68425,20 +68425,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__LogicalSystem__BindingsAssignment_5_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25328:1: rule__LogicalSystem__BindingsAssignment_5_1 : ( ruleBinding ) ;
+    // InternalRoom.g:25331:1: rule__LogicalSystem__BindingsAssignment_5_1 : ( ruleBinding ) ;
     public final void rule__LogicalSystem__BindingsAssignment_5_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25332:1: ( ( ruleBinding ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25333:1: ( ruleBinding )
+            // InternalRoom.g:25335:1: ( ( ruleBinding ) )
+            // InternalRoom.g:25336:1: ( ruleBinding )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25333:1: ( ruleBinding )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25334:1: ruleBinding
+            // InternalRoom.g:25336:1: ( ruleBinding )
+            // InternalRoom.g:25337:1: ruleBinding
             {
              before(grammarAccess.getLogicalSystemAccess().getBindingsBindingParserRuleCall_5_1_0()); 
-            pushFollow(FOLLOW_ruleBinding_in_rule__LogicalSystem__BindingsAssignment_5_151202);
+            pushFollow(FOLLOW_2);
             ruleBinding();
 
             state._fsp--;
@@ -68466,20 +68466,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__LogicalSystem__SubSystemsAssignment_5_2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25343:1: rule__LogicalSystem__SubSystemsAssignment_5_2 : ( ruleSubSystemRef ) ;
+    // InternalRoom.g:25346:1: rule__LogicalSystem__SubSystemsAssignment_5_2 : ( ruleSubSystemRef ) ;
     public final void rule__LogicalSystem__SubSystemsAssignment_5_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25347:1: ( ( ruleSubSystemRef ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25348:1: ( ruleSubSystemRef )
+            // InternalRoom.g:25350:1: ( ( ruleSubSystemRef ) )
+            // InternalRoom.g:25351:1: ( ruleSubSystemRef )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25348:1: ( ruleSubSystemRef )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25349:1: ruleSubSystemRef
+            // InternalRoom.g:25351:1: ( ruleSubSystemRef )
+            // InternalRoom.g:25352:1: ruleSubSystemRef
             {
              before(grammarAccess.getLogicalSystemAccess().getSubSystemsSubSystemRefParserRuleCall_5_2_0()); 
-            pushFollow(FOLLOW_ruleSubSystemRef_in_rule__LogicalSystem__SubSystemsAssignment_5_251233);
+            pushFollow(FOLLOW_2);
             ruleSubSystemRef();
 
             state._fsp--;
@@ -68507,20 +68507,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemRef__NameAssignment_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25358:1: rule__SubSystemRef__NameAssignment_1 : ( RULE_ID ) ;
+    // InternalRoom.g:25361:1: rule__SubSystemRef__NameAssignment_1 : ( RULE_ID ) ;
     public final void rule__SubSystemRef__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25362:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25363:1: ( RULE_ID )
+            // InternalRoom.g:25365:1: ( ( RULE_ID ) )
+            // InternalRoom.g:25366:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25363:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25364:1: RULE_ID
+            // InternalRoom.g:25366:1: ( RULE_ID )
+            // InternalRoom.g:25367:1: RULE_ID
             {
              before(grammarAccess.getSubSystemRefAccess().getNameIDTerminalRuleCall_1_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__SubSystemRef__NameAssignment_151264); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getSubSystemRefAccess().getNameIDTerminalRuleCall_1_0()); 
 
             }
@@ -68544,24 +68544,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemRef__TypeAssignment_3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25373:1: rule__SubSystemRef__TypeAssignment_3 : ( ( ruleFQN ) ) ;
+    // InternalRoom.g:25376:1: rule__SubSystemRef__TypeAssignment_3 : ( ( ruleFQN ) ) ;
     public final void rule__SubSystemRef__TypeAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25377:1: ( ( ( ruleFQN ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25378:1: ( ( ruleFQN ) )
+            // InternalRoom.g:25380:1: ( ( ( ruleFQN ) ) )
+            // InternalRoom.g:25381:1: ( ( ruleFQN ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25378:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25379:1: ( ruleFQN )
+            // InternalRoom.g:25381:1: ( ( ruleFQN ) )
+            // InternalRoom.g:25382:1: ( ruleFQN )
             {
              before(grammarAccess.getSubSystemRefAccess().getTypeSubSystemClassCrossReference_3_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25380:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25381:1: ruleFQN
+            // InternalRoom.g:25383:1: ( ruleFQN )
+            // InternalRoom.g:25384:1: ruleFQN
             {
              before(grammarAccess.getSubSystemRefAccess().getTypeSubSystemClassFQNParserRuleCall_3_0_1()); 
-            pushFollow(FOLLOW_ruleFQN_in_rule__SubSystemRef__TypeAssignment_351299);
+            pushFollow(FOLLOW_2);
             ruleFQN();
 
             state._fsp--;
@@ -68593,20 +68593,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemRef__DocuAssignment_4"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25392:1: rule__SubSystemRef__DocuAssignment_4 : ( ruleDocumentation ) ;
+    // InternalRoom.g:25395:1: rule__SubSystemRef__DocuAssignment_4 : ( ruleDocumentation ) ;
     public final void rule__SubSystemRef__DocuAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25396:1: ( ( ruleDocumentation ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25397:1: ( ruleDocumentation )
+            // InternalRoom.g:25399:1: ( ( ruleDocumentation ) )
+            // InternalRoom.g:25400:1: ( ruleDocumentation )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25397:1: ( ruleDocumentation )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25398:1: ruleDocumentation
+            // InternalRoom.g:25400:1: ( ruleDocumentation )
+            // InternalRoom.g:25401:1: ruleDocumentation
             {
              before(grammarAccess.getSubSystemRefAccess().getDocuDocumentationParserRuleCall_4_0()); 
-            pushFollow(FOLLOW_ruleDocumentation_in_rule__SubSystemRef__DocuAssignment_451334);
+            pushFollow(FOLLOW_2);
             ruleDocumentation();
 
             state._fsp--;
@@ -68634,20 +68634,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemClass__NameAssignment_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25407:1: rule__SubSystemClass__NameAssignment_1 : ( RULE_ID ) ;
+    // InternalRoom.g:25410:1: rule__SubSystemClass__NameAssignment_1 : ( RULE_ID ) ;
     public final void rule__SubSystemClass__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25411:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25412:1: ( RULE_ID )
+            // InternalRoom.g:25414:1: ( ( RULE_ID ) )
+            // InternalRoom.g:25415:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25412:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25413:1: RULE_ID
+            // InternalRoom.g:25415:1: ( RULE_ID )
+            // InternalRoom.g:25416:1: RULE_ID
             {
              before(grammarAccess.getSubSystemClassAccess().getNameIDTerminalRuleCall_1_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__SubSystemClass__NameAssignment_151365); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getSubSystemClassAccess().getNameIDTerminalRuleCall_1_0()); 
 
             }
@@ -68671,20 +68671,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemClass__DocuAssignment_2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25422:1: rule__SubSystemClass__DocuAssignment_2 : ( ruleDocumentation ) ;
+    // InternalRoom.g:25425:1: rule__SubSystemClass__DocuAssignment_2 : ( ruleDocumentation ) ;
     public final void rule__SubSystemClass__DocuAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25426:1: ( ( ruleDocumentation ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25427:1: ( ruleDocumentation )
+            // InternalRoom.g:25429:1: ( ( ruleDocumentation ) )
+            // InternalRoom.g:25430:1: ( ruleDocumentation )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25427:1: ( ruleDocumentation )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25428:1: ruleDocumentation
+            // InternalRoom.g:25430:1: ( ruleDocumentation )
+            // InternalRoom.g:25431:1: ruleDocumentation
             {
              before(grammarAccess.getSubSystemClassAccess().getDocuDocumentationParserRuleCall_2_0()); 
-            pushFollow(FOLLOW_ruleDocumentation_in_rule__SubSystemClass__DocuAssignment_251396);
+            pushFollow(FOLLOW_2);
             ruleDocumentation();
 
             state._fsp--;
@@ -68712,20 +68712,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemClass__AnnotationsAssignment_4"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25437:1: rule__SubSystemClass__AnnotationsAssignment_4 : ( ruleAnnotation ) ;
+    // InternalRoom.g:25440:1: rule__SubSystemClass__AnnotationsAssignment_4 : ( ruleAnnotation ) ;
     public final void rule__SubSystemClass__AnnotationsAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25441:1: ( ( ruleAnnotation ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25442:1: ( ruleAnnotation )
+            // InternalRoom.g:25444:1: ( ( ruleAnnotation ) )
+            // InternalRoom.g:25445:1: ( ruleAnnotation )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25442:1: ( ruleAnnotation )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25443:1: ruleAnnotation
+            // InternalRoom.g:25445:1: ( ruleAnnotation )
+            // InternalRoom.g:25446:1: ruleAnnotation
             {
              before(grammarAccess.getSubSystemClassAccess().getAnnotationsAnnotationParserRuleCall_4_0()); 
-            pushFollow(FOLLOW_ruleAnnotation_in_rule__SubSystemClass__AnnotationsAssignment_451427);
+            pushFollow(FOLLOW_2);
             ruleAnnotation();
 
             state._fsp--;
@@ -68753,20 +68753,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemClass__UserCode1Assignment_5_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25452:1: rule__SubSystemClass__UserCode1Assignment_5_1 : ( ruleDetailCode ) ;
+    // InternalRoom.g:25455:1: rule__SubSystemClass__UserCode1Assignment_5_1 : ( ruleDetailCode ) ;
     public final void rule__SubSystemClass__UserCode1Assignment_5_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25456:1: ( ( ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25457:1: ( ruleDetailCode )
+            // InternalRoom.g:25459:1: ( ( ruleDetailCode ) )
+            // InternalRoom.g:25460:1: ( ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25457:1: ( ruleDetailCode )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25458:1: ruleDetailCode
+            // InternalRoom.g:25460:1: ( ruleDetailCode )
+            // InternalRoom.g:25461:1: ruleDetailCode
             {
              before(grammarAccess.getSubSystemClassAccess().getUserCode1DetailCodeParserRuleCall_5_1_0()); 
-            pushFollow(FOLLOW_ruleDetailCode_in_rule__SubSystemClass__UserCode1Assignment_5_151458);
+            pushFollow(FOLLOW_2);
             ruleDetailCode();
 
             state._fsp--;
@@ -68794,20 +68794,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemClass__UserCode2Assignment_6_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25467:1: rule__SubSystemClass__UserCode2Assignment_6_1 : ( ruleDetailCode ) ;
+    // InternalRoom.g:25470:1: rule__SubSystemClass__UserCode2Assignment_6_1 : ( ruleDetailCode ) ;
     public final void rule__SubSystemClass__UserCode2Assignment_6_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25471:1: ( ( ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25472:1: ( ruleDetailCode )
+            // InternalRoom.g:25474:1: ( ( ruleDetailCode ) )
+            // InternalRoom.g:25475:1: ( ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25472:1: ( ruleDetailCode )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25473:1: ruleDetailCode
+            // InternalRoom.g:25475:1: ( ruleDetailCode )
+            // InternalRoom.g:25476:1: ruleDetailCode
             {
              before(grammarAccess.getSubSystemClassAccess().getUserCode2DetailCodeParserRuleCall_6_1_0()); 
-            pushFollow(FOLLOW_ruleDetailCode_in_rule__SubSystemClass__UserCode2Assignment_6_151489);
+            pushFollow(FOLLOW_2);
             ruleDetailCode();
 
             state._fsp--;
@@ -68835,20 +68835,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemClass__UserCode3Assignment_7_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25482:1: rule__SubSystemClass__UserCode3Assignment_7_1 : ( ruleDetailCode ) ;
+    // InternalRoom.g:25485:1: rule__SubSystemClass__UserCode3Assignment_7_1 : ( ruleDetailCode ) ;
     public final void rule__SubSystemClass__UserCode3Assignment_7_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25486:1: ( ( ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25487:1: ( ruleDetailCode )
+            // InternalRoom.g:25489:1: ( ( ruleDetailCode ) )
+            // InternalRoom.g:25490:1: ( ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25487:1: ( ruleDetailCode )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25488:1: ruleDetailCode
+            // InternalRoom.g:25490:1: ( ruleDetailCode )
+            // InternalRoom.g:25491:1: ruleDetailCode
             {
              before(grammarAccess.getSubSystemClassAccess().getUserCode3DetailCodeParserRuleCall_7_1_0()); 
-            pushFollow(FOLLOW_ruleDetailCode_in_rule__SubSystemClass__UserCode3Assignment_7_151520);
+            pushFollow(FOLLOW_2);
             ruleDetailCode();
 
             state._fsp--;
@@ -68876,20 +68876,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemClass__ActorInstanceMappingsAssignment_8_0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25497:1: rule__SubSystemClass__ActorInstanceMappingsAssignment_8_0 : ( ruleActorInstanceMapping ) ;
+    // InternalRoom.g:25500:1: rule__SubSystemClass__ActorInstanceMappingsAssignment_8_0 : ( ruleActorInstanceMapping ) ;
     public final void rule__SubSystemClass__ActorInstanceMappingsAssignment_8_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25501:1: ( ( ruleActorInstanceMapping ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25502:1: ( ruleActorInstanceMapping )
+            // InternalRoom.g:25504:1: ( ( ruleActorInstanceMapping ) )
+            // InternalRoom.g:25505:1: ( ruleActorInstanceMapping )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25502:1: ( ruleActorInstanceMapping )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25503:1: ruleActorInstanceMapping
+            // InternalRoom.g:25505:1: ( ruleActorInstanceMapping )
+            // InternalRoom.g:25506:1: ruleActorInstanceMapping
             {
              before(grammarAccess.getSubSystemClassAccess().getActorInstanceMappingsActorInstanceMappingParserRuleCall_8_0_0()); 
-            pushFollow(FOLLOW_ruleActorInstanceMapping_in_rule__SubSystemClass__ActorInstanceMappingsAssignment_8_051551);
+            pushFollow(FOLLOW_2);
             ruleActorInstanceMapping();
 
             state._fsp--;
@@ -68917,20 +68917,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemClass__ThreadsAssignment_8_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25512:1: rule__SubSystemClass__ThreadsAssignment_8_1 : ( ruleLogicalThread ) ;
+    // InternalRoom.g:25515:1: rule__SubSystemClass__ThreadsAssignment_8_1 : ( ruleLogicalThread ) ;
     public final void rule__SubSystemClass__ThreadsAssignment_8_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25516:1: ( ( ruleLogicalThread ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25517:1: ( ruleLogicalThread )
+            // InternalRoom.g:25519:1: ( ( ruleLogicalThread ) )
+            // InternalRoom.g:25520:1: ( ruleLogicalThread )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25517:1: ( ruleLogicalThread )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25518:1: ruleLogicalThread
+            // InternalRoom.g:25520:1: ( ruleLogicalThread )
+            // InternalRoom.g:25521:1: ruleLogicalThread
             {
              before(grammarAccess.getSubSystemClassAccess().getThreadsLogicalThreadParserRuleCall_8_1_0()); 
-            pushFollow(FOLLOW_ruleLogicalThread_in_rule__SubSystemClass__ThreadsAssignment_8_151582);
+            pushFollow(FOLLOW_2);
             ruleLogicalThread();
 
             state._fsp--;
@@ -68958,20 +68958,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemClass__ConnectionsAssignment_8_2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25527:1: rule__SubSystemClass__ConnectionsAssignment_8_2 : ( ruleLayerConnection ) ;
+    // InternalRoom.g:25530:1: rule__SubSystemClass__ConnectionsAssignment_8_2 : ( ruleLayerConnection ) ;
     public final void rule__SubSystemClass__ConnectionsAssignment_8_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25531:1: ( ( ruleLayerConnection ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25532:1: ( ruleLayerConnection )
+            // InternalRoom.g:25534:1: ( ( ruleLayerConnection ) )
+            // InternalRoom.g:25535:1: ( ruleLayerConnection )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25532:1: ( ruleLayerConnection )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25533:1: ruleLayerConnection
+            // InternalRoom.g:25535:1: ( ruleLayerConnection )
+            // InternalRoom.g:25536:1: ruleLayerConnection
             {
              before(grammarAccess.getSubSystemClassAccess().getConnectionsLayerConnectionParserRuleCall_8_2_0()); 
-            pushFollow(FOLLOW_ruleLayerConnection_in_rule__SubSystemClass__ConnectionsAssignment_8_251613);
+            pushFollow(FOLLOW_2);
             ruleLayerConnection();
 
             state._fsp--;
@@ -68999,20 +68999,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemClass__BindingsAssignment_8_3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25542:1: rule__SubSystemClass__BindingsAssignment_8_3 : ( ruleBinding ) ;
+    // InternalRoom.g:25545:1: rule__SubSystemClass__BindingsAssignment_8_3 : ( ruleBinding ) ;
     public final void rule__SubSystemClass__BindingsAssignment_8_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25546:1: ( ( ruleBinding ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25547:1: ( ruleBinding )
+            // InternalRoom.g:25549:1: ( ( ruleBinding ) )
+            // InternalRoom.g:25550:1: ( ruleBinding )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25547:1: ( ruleBinding )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25548:1: ruleBinding
+            // InternalRoom.g:25550:1: ( ruleBinding )
+            // InternalRoom.g:25551:1: ruleBinding
             {
              before(grammarAccess.getSubSystemClassAccess().getBindingsBindingParserRuleCall_8_3_0()); 
-            pushFollow(FOLLOW_ruleBinding_in_rule__SubSystemClass__BindingsAssignment_8_351644);
+            pushFollow(FOLLOW_2);
             ruleBinding();
 
             state._fsp--;
@@ -69040,20 +69040,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemClass__ActorRefsAssignment_8_4"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25557:1: rule__SubSystemClass__ActorRefsAssignment_8_4 : ( ruleActorRef ) ;
+    // InternalRoom.g:25560:1: rule__SubSystemClass__ActorRefsAssignment_8_4 : ( ruleActorRef ) ;
     public final void rule__SubSystemClass__ActorRefsAssignment_8_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25561:1: ( ( ruleActorRef ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25562:1: ( ruleActorRef )
+            // InternalRoom.g:25564:1: ( ( ruleActorRef ) )
+            // InternalRoom.g:25565:1: ( ruleActorRef )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25562:1: ( ruleActorRef )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25563:1: ruleActorRef
+            // InternalRoom.g:25565:1: ( ruleActorRef )
+            // InternalRoom.g:25566:1: ruleActorRef
             {
              before(grammarAccess.getSubSystemClassAccess().getActorRefsActorRefParserRuleCall_8_4_0()); 
-            pushFollow(FOLLOW_ruleActorRef_in_rule__SubSystemClass__ActorRefsAssignment_8_451675);
+            pushFollow(FOLLOW_2);
             ruleActorRef();
 
             state._fsp--;
@@ -69081,20 +69081,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemClass__ServiceProvisionPointsAssignment_8_5"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25572:1: rule__SubSystemClass__ServiceProvisionPointsAssignment_8_5 : ( ruleSPP ) ;
+    // InternalRoom.g:25575:1: rule__SubSystemClass__ServiceProvisionPointsAssignment_8_5 : ( ruleSPP ) ;
     public final void rule__SubSystemClass__ServiceProvisionPointsAssignment_8_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25576:1: ( ( ruleSPP ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25577:1: ( ruleSPP )
+            // InternalRoom.g:25579:1: ( ( ruleSPP ) )
+            // InternalRoom.g:25580:1: ( ruleSPP )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25577:1: ( ruleSPP )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25578:1: ruleSPP
+            // InternalRoom.g:25580:1: ( ruleSPP )
+            // InternalRoom.g:25581:1: ruleSPP
             {
              before(grammarAccess.getSubSystemClassAccess().getServiceProvisionPointsSPPParserRuleCall_8_5_0()); 
-            pushFollow(FOLLOW_ruleSPP_in_rule__SubSystemClass__ServiceProvisionPointsAssignment_8_551706);
+            pushFollow(FOLLOW_2);
             ruleSPP();
 
             state._fsp--;
@@ -69122,20 +69122,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubSystemClass__RelayPortsAssignment_8_6"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25587:1: rule__SubSystemClass__RelayPortsAssignment_8_6 : ( rulePort ) ;
+    // InternalRoom.g:25590:1: rule__SubSystemClass__RelayPortsAssignment_8_6 : ( rulePort ) ;
     public final void rule__SubSystemClass__RelayPortsAssignment_8_6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25591:1: ( ( rulePort ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25592:1: ( rulePort )
+            // InternalRoom.g:25594:1: ( ( rulePort ) )
+            // InternalRoom.g:25595:1: ( rulePort )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25592:1: ( rulePort )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25593:1: rulePort
+            // InternalRoom.g:25595:1: ( rulePort )
+            // InternalRoom.g:25596:1: rulePort
             {
              before(grammarAccess.getSubSystemClassAccess().getRelayPortsPortParserRuleCall_8_6_0()); 
-            pushFollow(FOLLOW_rulePort_in_rule__SubSystemClass__RelayPortsAssignment_8_651737);
+            pushFollow(FOLLOW_2);
             rulePort();
 
             state._fsp--;
@@ -69163,20 +69163,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__LogicalThread__NameAssignment_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25602:1: rule__LogicalThread__NameAssignment_1 : ( RULE_ID ) ;
+    // InternalRoom.g:25605:1: rule__LogicalThread__NameAssignment_1 : ( RULE_ID ) ;
     public final void rule__LogicalThread__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25606:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25607:1: ( RULE_ID )
+            // InternalRoom.g:25609:1: ( ( RULE_ID ) )
+            // InternalRoom.g:25610:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25607:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25608:1: RULE_ID
+            // InternalRoom.g:25610:1: ( RULE_ID )
+            // InternalRoom.g:25611:1: RULE_ID
             {
              before(grammarAccess.getLogicalThreadAccess().getNameIDTerminalRuleCall_1_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__LogicalThread__NameAssignment_151768); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getLogicalThreadAccess().getNameIDTerminalRuleCall_1_0()); 
 
             }
@@ -69200,20 +69200,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorInstanceMapping__PathAssignment_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25617:1: rule__ActorInstanceMapping__PathAssignment_1 : ( ruleRefPath ) ;
+    // InternalRoom.g:25620:1: rule__ActorInstanceMapping__PathAssignment_1 : ( ruleRefPath ) ;
     public final void rule__ActorInstanceMapping__PathAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25621:1: ( ( ruleRefPath ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25622:1: ( ruleRefPath )
+            // InternalRoom.g:25624:1: ( ( ruleRefPath ) )
+            // InternalRoom.g:25625:1: ( ruleRefPath )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25622:1: ( ruleRefPath )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25623:1: ruleRefPath
+            // InternalRoom.g:25625:1: ( ruleRefPath )
+            // InternalRoom.g:25626:1: ruleRefPath
             {
              before(grammarAccess.getActorInstanceMappingAccess().getPathRefPathParserRuleCall_1_0()); 
-            pushFollow(FOLLOW_ruleRefPath_in_rule__ActorInstanceMapping__PathAssignment_151799);
+            pushFollow(FOLLOW_2);
             ruleRefPath();
 
             state._fsp--;
@@ -69241,24 +69241,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorInstanceMapping__ThreadAssignment_3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25632:1: rule__ActorInstanceMapping__ThreadAssignment_3 : ( ( RULE_ID ) ) ;
+    // InternalRoom.g:25635:1: rule__ActorInstanceMapping__ThreadAssignment_3 : ( ( RULE_ID ) ) ;
     public final void rule__ActorInstanceMapping__ThreadAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25636:1: ( ( ( RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25637:1: ( ( RULE_ID ) )
+            // InternalRoom.g:25639:1: ( ( ( RULE_ID ) ) )
+            // InternalRoom.g:25640:1: ( ( RULE_ID ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25637:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25638:1: ( RULE_ID )
+            // InternalRoom.g:25640:1: ( ( RULE_ID ) )
+            // InternalRoom.g:25641:1: ( RULE_ID )
             {
              before(grammarAccess.getActorInstanceMappingAccess().getThreadLogicalThreadCrossReference_3_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25639:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25640:1: RULE_ID
+            // InternalRoom.g:25642:1: ( RULE_ID )
+            // InternalRoom.g:25643:1: RULE_ID
             {
              before(grammarAccess.getActorInstanceMappingAccess().getThreadLogicalThreadIDTerminalRuleCall_3_0_1()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__ActorInstanceMapping__ThreadAssignment_351834); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getActorInstanceMappingAccess().getThreadLogicalThreadIDTerminalRuleCall_3_0_1()); 
 
             }
@@ -69286,20 +69286,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorInstanceMapping__ActorInstanceMappingsAssignment_4_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25651:1: rule__ActorInstanceMapping__ActorInstanceMappingsAssignment_4_1 : ( ruleActorInstanceMapping ) ;
+    // InternalRoom.g:25654:1: rule__ActorInstanceMapping__ActorInstanceMappingsAssignment_4_1 : ( ruleActorInstanceMapping ) ;
     public final void rule__ActorInstanceMapping__ActorInstanceMappingsAssignment_4_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25655:1: ( ( ruleActorInstanceMapping ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25656:1: ( ruleActorInstanceMapping )
+            // InternalRoom.g:25658:1: ( ( ruleActorInstanceMapping ) )
+            // InternalRoom.g:25659:1: ( ruleActorInstanceMapping )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25656:1: ( ruleActorInstanceMapping )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25657:1: ruleActorInstanceMapping
+            // InternalRoom.g:25659:1: ( ruleActorInstanceMapping )
+            // InternalRoom.g:25660:1: ruleActorInstanceMapping
             {
              before(grammarAccess.getActorInstanceMappingAccess().getActorInstanceMappingsActorInstanceMappingParserRuleCall_4_1_0()); 
-            pushFollow(FOLLOW_ruleActorInstanceMapping_in_rule__ActorInstanceMapping__ActorInstanceMappingsAssignment_4_151869);
+            pushFollow(FOLLOW_2);
             ruleActorInstanceMapping();
 
             state._fsp--;
@@ -69327,20 +69327,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefPath__RefsAssignment_0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25666:1: rule__RefPath__RefsAssignment_0 : ( ruleRefSegment ) ;
+    // InternalRoom.g:25669:1: rule__RefPath__RefsAssignment_0 : ( ruleRefSegment ) ;
     public final void rule__RefPath__RefsAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25670:1: ( ( ruleRefSegment ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25671:1: ( ruleRefSegment )
+            // InternalRoom.g:25673:1: ( ( ruleRefSegment ) )
+            // InternalRoom.g:25674:1: ( ruleRefSegment )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25671:1: ( ruleRefSegment )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25672:1: ruleRefSegment
+            // InternalRoom.g:25674:1: ( ruleRefSegment )
+            // InternalRoom.g:25675:1: ruleRefSegment
             {
              before(grammarAccess.getRefPathAccess().getRefsRefSegmentParserRuleCall_0_0()); 
-            pushFollow(FOLLOW_ruleRefSegment_in_rule__RefPath__RefsAssignment_051900);
+            pushFollow(FOLLOW_2);
             ruleRefSegment();
 
             state._fsp--;
@@ -69368,20 +69368,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefPath__RefsAssignment_1_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25681:1: rule__RefPath__RefsAssignment_1_1 : ( ruleRefSegment ) ;
+    // InternalRoom.g:25684:1: rule__RefPath__RefsAssignment_1_1 : ( ruleRefSegment ) ;
     public final void rule__RefPath__RefsAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25685:1: ( ( ruleRefSegment ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25686:1: ( ruleRefSegment )
+            // InternalRoom.g:25688:1: ( ( ruleRefSegment ) )
+            // InternalRoom.g:25689:1: ( ruleRefSegment )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25686:1: ( ruleRefSegment )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25687:1: ruleRefSegment
+            // InternalRoom.g:25689:1: ( ruleRefSegment )
+            // InternalRoom.g:25690:1: ruleRefSegment
             {
              before(grammarAccess.getRefPathAccess().getRefsRefSegmentParserRuleCall_1_1_0()); 
-            pushFollow(FOLLOW_ruleRefSegment_in_rule__RefPath__RefsAssignment_1_151931);
+            pushFollow(FOLLOW_2);
             ruleRefSegment();
 
             state._fsp--;
@@ -69409,20 +69409,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefSegment__RefAssignment_0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25696:1: rule__RefSegment__RefAssignment_0 : ( RULE_ID ) ;
+    // InternalRoom.g:25699:1: rule__RefSegment__RefAssignment_0 : ( RULE_ID ) ;
     public final void rule__RefSegment__RefAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25700:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25701:1: ( RULE_ID )
+            // InternalRoom.g:25703:1: ( ( RULE_ID ) )
+            // InternalRoom.g:25704:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25701:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25702:1: RULE_ID
+            // InternalRoom.g:25704:1: ( RULE_ID )
+            // InternalRoom.g:25705:1: RULE_ID
             {
              before(grammarAccess.getRefSegmentAccess().getRefIDTerminalRuleCall_0_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__RefSegment__RefAssignment_051962); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getRefSegmentAccess().getRefIDTerminalRuleCall_0_0()); 
 
             }
@@ -69446,20 +69446,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefSegment__IdxAssignment_1_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25711:1: rule__RefSegment__IdxAssignment_1_1 : ( RULE_INT ) ;
+    // InternalRoom.g:25714:1: rule__RefSegment__IdxAssignment_1_1 : ( RULE_INT ) ;
     public final void rule__RefSegment__IdxAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25715:1: ( ( RULE_INT ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25716:1: ( RULE_INT )
+            // InternalRoom.g:25718:1: ( ( RULE_INT ) )
+            // InternalRoom.g:25719:1: ( RULE_INT )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25716:1: ( RULE_INT )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25717:1: RULE_INT
+            // InternalRoom.g:25719:1: ( RULE_INT )
+            // InternalRoom.g:25720:1: RULE_INT
             {
              before(grammarAccess.getRefSegmentAccess().getIdxINTTerminalRuleCall_1_1_0()); 
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__RefSegment__IdxAssignment_1_151993); 
+            match(input,RULE_INT,FOLLOW_2); 
              after(grammarAccess.getRefSegmentAccess().getIdxINTTerminalRuleCall_1_1_0()); 
 
             }
@@ -69483,20 +69483,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Binding__Endpoint1Assignment_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25726:1: rule__Binding__Endpoint1Assignment_1 : ( ruleBindingEndPoint ) ;
+    // InternalRoom.g:25729:1: rule__Binding__Endpoint1Assignment_1 : ( ruleBindingEndPoint ) ;
     public final void rule__Binding__Endpoint1Assignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25730:1: ( ( ruleBindingEndPoint ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25731:1: ( ruleBindingEndPoint )
+            // InternalRoom.g:25733:1: ( ( ruleBindingEndPoint ) )
+            // InternalRoom.g:25734:1: ( ruleBindingEndPoint )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25731:1: ( ruleBindingEndPoint )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25732:1: ruleBindingEndPoint
+            // InternalRoom.g:25734:1: ( ruleBindingEndPoint )
+            // InternalRoom.g:25735:1: ruleBindingEndPoint
             {
              before(grammarAccess.getBindingAccess().getEndpoint1BindingEndPointParserRuleCall_1_0()); 
-            pushFollow(FOLLOW_ruleBindingEndPoint_in_rule__Binding__Endpoint1Assignment_152024);
+            pushFollow(FOLLOW_2);
             ruleBindingEndPoint();
 
             state._fsp--;
@@ -69524,20 +69524,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Binding__Endpoint2Assignment_3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25741:1: rule__Binding__Endpoint2Assignment_3 : ( ruleBindingEndPoint ) ;
+    // InternalRoom.g:25744:1: rule__Binding__Endpoint2Assignment_3 : ( ruleBindingEndPoint ) ;
     public final void rule__Binding__Endpoint2Assignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25745:1: ( ( ruleBindingEndPoint ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25746:1: ( ruleBindingEndPoint )
+            // InternalRoom.g:25748:1: ( ( ruleBindingEndPoint ) )
+            // InternalRoom.g:25749:1: ( ruleBindingEndPoint )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25746:1: ( ruleBindingEndPoint )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25747:1: ruleBindingEndPoint
+            // InternalRoom.g:25749:1: ( ruleBindingEndPoint )
+            // InternalRoom.g:25750:1: ruleBindingEndPoint
             {
              before(grammarAccess.getBindingAccess().getEndpoint2BindingEndPointParserRuleCall_3_0()); 
-            pushFollow(FOLLOW_ruleBindingEndPoint_in_rule__Binding__Endpoint2Assignment_352055);
+            pushFollow(FOLLOW_2);
             ruleBindingEndPoint();
 
             state._fsp--;
@@ -69565,24 +69565,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__BindingEndPoint__ActorRefAssignment_0_0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25756:1: rule__BindingEndPoint__ActorRefAssignment_0_0 : ( ( RULE_ID ) ) ;
+    // InternalRoom.g:25759:1: rule__BindingEndPoint__ActorRefAssignment_0_0 : ( ( RULE_ID ) ) ;
     public final void rule__BindingEndPoint__ActorRefAssignment_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25760:1: ( ( ( RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25761:1: ( ( RULE_ID ) )
+            // InternalRoom.g:25763:1: ( ( ( RULE_ID ) ) )
+            // InternalRoom.g:25764:1: ( ( RULE_ID ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25761:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25762:1: ( RULE_ID )
+            // InternalRoom.g:25764:1: ( ( RULE_ID ) )
+            // InternalRoom.g:25765:1: ( RULE_ID )
             {
              before(grammarAccess.getBindingEndPointAccess().getActorRefActorContainerRefCrossReference_0_0_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25763:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25764:1: RULE_ID
+            // InternalRoom.g:25766:1: ( RULE_ID )
+            // InternalRoom.g:25767:1: RULE_ID
             {
              before(grammarAccess.getBindingEndPointAccess().getActorRefActorContainerRefIDTerminalRuleCall_0_0_0_1()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__BindingEndPoint__ActorRefAssignment_0_052090); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getBindingEndPointAccess().getActorRefActorContainerRefIDTerminalRuleCall_0_0_0_1()); 
 
             }
@@ -69610,24 +69610,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__BindingEndPoint__PortAssignment_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25775:1: rule__BindingEndPoint__PortAssignment_1 : ( ( RULE_ID ) ) ;
+    // InternalRoom.g:25778:1: rule__BindingEndPoint__PortAssignment_1 : ( ( RULE_ID ) ) ;
     public final void rule__BindingEndPoint__PortAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25779:1: ( ( ( RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25780:1: ( ( RULE_ID ) )
+            // InternalRoom.g:25782:1: ( ( ( RULE_ID ) ) )
+            // InternalRoom.g:25783:1: ( ( RULE_ID ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25780:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25781:1: ( RULE_ID )
+            // InternalRoom.g:25783:1: ( ( RULE_ID ) )
+            // InternalRoom.g:25784:1: ( RULE_ID )
             {
              before(grammarAccess.getBindingEndPointAccess().getPortPortCrossReference_1_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25782:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25783:1: RULE_ID
+            // InternalRoom.g:25785:1: ( RULE_ID )
+            // InternalRoom.g:25786:1: RULE_ID
             {
              before(grammarAccess.getBindingEndPointAccess().getPortPortIDTerminalRuleCall_1_0_1()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__BindingEndPoint__PortAssignment_152129); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getBindingEndPointAccess().getPortPortIDTerminalRuleCall_1_0_1()); 
 
             }
@@ -69655,24 +69655,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__BindingEndPoint__SubAssignment_2_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25794:1: rule__BindingEndPoint__SubAssignment_2_1 : ( ( RULE_ID ) ) ;
+    // InternalRoom.g:25797:1: rule__BindingEndPoint__SubAssignment_2_1 : ( ( RULE_ID ) ) ;
     public final void rule__BindingEndPoint__SubAssignment_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25798:1: ( ( ( RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25799:1: ( ( RULE_ID ) )
+            // InternalRoom.g:25801:1: ( ( ( RULE_ID ) ) )
+            // InternalRoom.g:25802:1: ( ( RULE_ID ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25799:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25800:1: ( RULE_ID )
+            // InternalRoom.g:25802:1: ( ( RULE_ID ) )
+            // InternalRoom.g:25803:1: ( RULE_ID )
             {
              before(grammarAccess.getBindingEndPointAccess().getSubSubProtocolCrossReference_2_1_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25801:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25802:1: RULE_ID
+            // InternalRoom.g:25804:1: ( RULE_ID )
+            // InternalRoom.g:25805:1: RULE_ID
             {
              before(grammarAccess.getBindingEndPointAccess().getSubSubProtocolIDTerminalRuleCall_2_1_0_1()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__BindingEndPoint__SubAssignment_2_152168); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getBindingEndPointAccess().getSubSubProtocolIDTerminalRuleCall_2_1_0_1()); 
 
             }
@@ -69700,20 +69700,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__LayerConnection__FromAssignment_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25813:1: rule__LayerConnection__FromAssignment_1 : ( ruleSAPoint ) ;
+    // InternalRoom.g:25816:1: rule__LayerConnection__FromAssignment_1 : ( ruleSAPoint ) ;
     public final void rule__LayerConnection__FromAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25817:1: ( ( ruleSAPoint ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25818:1: ( ruleSAPoint )
+            // InternalRoom.g:25820:1: ( ( ruleSAPoint ) )
+            // InternalRoom.g:25821:1: ( ruleSAPoint )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25818:1: ( ruleSAPoint )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25819:1: ruleSAPoint
+            // InternalRoom.g:25821:1: ( ruleSAPoint )
+            // InternalRoom.g:25822:1: ruleSAPoint
             {
              before(grammarAccess.getLayerConnectionAccess().getFromSAPointParserRuleCall_1_0()); 
-            pushFollow(FOLLOW_ruleSAPoint_in_rule__LayerConnection__FromAssignment_152203);
+            pushFollow(FOLLOW_2);
             ruleSAPoint();
 
             state._fsp--;
@@ -69741,20 +69741,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__LayerConnection__ToAssignment_3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25828:1: rule__LayerConnection__ToAssignment_3 : ( ruleSPPoint ) ;
+    // InternalRoom.g:25831:1: rule__LayerConnection__ToAssignment_3 : ( ruleSPPoint ) ;
     public final void rule__LayerConnection__ToAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25832:1: ( ( ruleSPPoint ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25833:1: ( ruleSPPoint )
+            // InternalRoom.g:25835:1: ( ( ruleSPPoint ) )
+            // InternalRoom.g:25836:1: ( ruleSPPoint )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25833:1: ( ruleSPPoint )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25834:1: ruleSPPoint
+            // InternalRoom.g:25836:1: ( ruleSPPoint )
+            // InternalRoom.g:25837:1: ruleSPPoint
             {
              before(grammarAccess.getLayerConnectionAccess().getToSPPointParserRuleCall_3_0()); 
-            pushFollow(FOLLOW_ruleSPPoint_in_rule__LayerConnection__ToAssignment_352234);
+            pushFollow(FOLLOW_2);
             ruleSPPoint();
 
             state._fsp--;
@@ -69782,24 +69782,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefSAPoint__RefAssignment_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25843:1: rule__RefSAPoint__RefAssignment_1 : ( ( RULE_ID ) ) ;
+    // InternalRoom.g:25846:1: rule__RefSAPoint__RefAssignment_1 : ( ( RULE_ID ) ) ;
     public final void rule__RefSAPoint__RefAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25847:1: ( ( ( RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25848:1: ( ( RULE_ID ) )
+            // InternalRoom.g:25850:1: ( ( ( RULE_ID ) ) )
+            // InternalRoom.g:25851:1: ( ( RULE_ID ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25848:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25849:1: ( RULE_ID )
+            // InternalRoom.g:25851:1: ( ( RULE_ID ) )
+            // InternalRoom.g:25852:1: ( RULE_ID )
             {
              before(grammarAccess.getRefSAPointAccess().getRefActorContainerRefCrossReference_1_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25850:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25851:1: RULE_ID
+            // InternalRoom.g:25853:1: ( RULE_ID )
+            // InternalRoom.g:25854:1: RULE_ID
             {
              before(grammarAccess.getRefSAPointAccess().getRefActorContainerRefIDTerminalRuleCall_1_0_1()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__RefSAPoint__RefAssignment_152269); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getRefSAPointAccess().getRefActorContainerRefIDTerminalRuleCall_1_0_1()); 
 
             }
@@ -69827,24 +69827,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RelaySAPoint__RelayAssignment_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25862:1: rule__RelaySAPoint__RelayAssignment_1 : ( ( RULE_ID ) ) ;
+    // InternalRoom.g:25865:1: rule__RelaySAPoint__RelayAssignment_1 : ( ( RULE_ID ) ) ;
     public final void rule__RelaySAPoint__RelayAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25866:1: ( ( ( RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25867:1: ( ( RULE_ID ) )
+            // InternalRoom.g:25869:1: ( ( ( RULE_ID ) ) )
+            // InternalRoom.g:25870:1: ( ( RULE_ID ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25867:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25868:1: ( RULE_ID )
+            // InternalRoom.g:25870:1: ( ( RULE_ID ) )
+            // InternalRoom.g:25871:1: ( RULE_ID )
             {
              before(grammarAccess.getRelaySAPointAccess().getRelaySPPCrossReference_1_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25869:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25870:1: RULE_ID
+            // InternalRoom.g:25872:1: ( RULE_ID )
+            // InternalRoom.g:25873:1: RULE_ID
             {
              before(grammarAccess.getRelaySAPointAccess().getRelaySPPIDTerminalRuleCall_1_0_1()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__RelaySAPoint__RelayAssignment_152308); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getRelaySAPointAccess().getRelaySPPIDTerminalRuleCall_1_0_1()); 
 
             }
@@ -69872,24 +69872,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SPPoint__RefAssignment_0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25881:1: rule__SPPoint__RefAssignment_0 : ( ( RULE_ID ) ) ;
+    // InternalRoom.g:25884:1: rule__SPPoint__RefAssignment_0 : ( ( RULE_ID ) ) ;
     public final void rule__SPPoint__RefAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25885:1: ( ( ( RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25886:1: ( ( RULE_ID ) )
+            // InternalRoom.g:25888:1: ( ( ( RULE_ID ) ) )
+            // InternalRoom.g:25889:1: ( ( RULE_ID ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25886:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25887:1: ( RULE_ID )
+            // InternalRoom.g:25889:1: ( ( RULE_ID ) )
+            // InternalRoom.g:25890:1: ( RULE_ID )
             {
              before(grammarAccess.getSPPointAccess().getRefActorContainerRefCrossReference_0_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25888:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25889:1: RULE_ID
+            // InternalRoom.g:25891:1: ( RULE_ID )
+            // InternalRoom.g:25892:1: RULE_ID
             {
              before(grammarAccess.getSPPointAccess().getRefActorContainerRefIDTerminalRuleCall_0_0_1()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__SPPoint__RefAssignment_052347); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getSPPointAccess().getRefActorContainerRefIDTerminalRuleCall_0_0_1()); 
 
             }
@@ -69917,24 +69917,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SPPoint__ServiceAssignment_2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25900:1: rule__SPPoint__ServiceAssignment_2 : ( ( RULE_ID ) ) ;
+    // InternalRoom.g:25903:1: rule__SPPoint__ServiceAssignment_2 : ( ( RULE_ID ) ) ;
     public final void rule__SPPoint__ServiceAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25904:1: ( ( ( RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25905:1: ( ( RULE_ID ) )
+            // InternalRoom.g:25907:1: ( ( ( RULE_ID ) ) )
+            // InternalRoom.g:25908:1: ( ( RULE_ID ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25905:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25906:1: ( RULE_ID )
+            // InternalRoom.g:25908:1: ( ( RULE_ID ) )
+            // InternalRoom.g:25909:1: ( RULE_ID )
             {
              before(grammarAccess.getSPPointAccess().getServiceSPPCrossReference_2_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25907:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25908:1: RULE_ID
+            // InternalRoom.g:25910:1: ( RULE_ID )
+            // InternalRoom.g:25911:1: RULE_ID
             {
              before(grammarAccess.getSPPointAccess().getServiceSPPIDTerminalRuleCall_2_0_1()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__SPPoint__ServiceAssignment_252386); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getSPPointAccess().getServiceSPPIDTerminalRuleCall_2_0_1()); 
 
             }
@@ -69962,20 +69962,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorRef__RefTypeAssignment_0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25919:1: rule__ActorRef__RefTypeAssignment_0 : ( ruleReferenceType ) ;
+    // InternalRoom.g:25922:1: rule__ActorRef__RefTypeAssignment_0 : ( ruleReferenceType ) ;
     public final void rule__ActorRef__RefTypeAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25923:1: ( ( ruleReferenceType ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25924:1: ( ruleReferenceType )
+            // InternalRoom.g:25926:1: ( ( ruleReferenceType ) )
+            // InternalRoom.g:25927:1: ( ruleReferenceType )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25924:1: ( ruleReferenceType )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25925:1: ruleReferenceType
+            // InternalRoom.g:25927:1: ( ruleReferenceType )
+            // InternalRoom.g:25928:1: ruleReferenceType
             {
              before(grammarAccess.getActorRefAccess().getRefTypeReferenceTypeEnumRuleCall_0_0()); 
-            pushFollow(FOLLOW_ruleReferenceType_in_rule__ActorRef__RefTypeAssignment_052421);
+            pushFollow(FOLLOW_2);
             ruleReferenceType();
 
             state._fsp--;
@@ -70003,20 +70003,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorRef__NameAssignment_2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25934:1: rule__ActorRef__NameAssignment_2 : ( RULE_ID ) ;
+    // InternalRoom.g:25937:1: rule__ActorRef__NameAssignment_2 : ( RULE_ID ) ;
     public final void rule__ActorRef__NameAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25938:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25939:1: ( RULE_ID )
+            // InternalRoom.g:25941:1: ( ( RULE_ID ) )
+            // InternalRoom.g:25942:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25939:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25940:1: RULE_ID
+            // InternalRoom.g:25942:1: ( RULE_ID )
+            // InternalRoom.g:25943:1: RULE_ID
             {
              before(grammarAccess.getActorRefAccess().getNameIDTerminalRuleCall_2_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__ActorRef__NameAssignment_252452); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getActorRefAccess().getNameIDTerminalRuleCall_2_0()); 
 
             }
@@ -70040,20 +70040,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorRef__MultiplicityAssignment_3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25949:1: rule__ActorRef__MultiplicityAssignment_3 : ( ruleMULTIPLICITY ) ;
+    // InternalRoom.g:25952:1: rule__ActorRef__MultiplicityAssignment_3 : ( ruleMULTIPLICITY ) ;
     public final void rule__ActorRef__MultiplicityAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25953:1: ( ( ruleMULTIPLICITY ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25954:1: ( ruleMULTIPLICITY )
+            // InternalRoom.g:25956:1: ( ( ruleMULTIPLICITY ) )
+            // InternalRoom.g:25957:1: ( ruleMULTIPLICITY )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25954:1: ( ruleMULTIPLICITY )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25955:1: ruleMULTIPLICITY
+            // InternalRoom.g:25957:1: ( ruleMULTIPLICITY )
+            // InternalRoom.g:25958:1: ruleMULTIPLICITY
             {
              before(grammarAccess.getActorRefAccess().getMultiplicityMULTIPLICITYParserRuleCall_3_0()); 
-            pushFollow(FOLLOW_ruleMULTIPLICITY_in_rule__ActorRef__MultiplicityAssignment_352483);
+            pushFollow(FOLLOW_2);
             ruleMULTIPLICITY();
 
             state._fsp--;
@@ -70081,24 +70081,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorRef__TypeAssignment_5"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25964:1: rule__ActorRef__TypeAssignment_5 : ( ( ruleFQN ) ) ;
+    // InternalRoom.g:25967:1: rule__ActorRef__TypeAssignment_5 : ( ( ruleFQN ) ) ;
     public final void rule__ActorRef__TypeAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25968:1: ( ( ( ruleFQN ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25969:1: ( ( ruleFQN ) )
+            // InternalRoom.g:25971:1: ( ( ( ruleFQN ) ) )
+            // InternalRoom.g:25972:1: ( ( ruleFQN ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25969:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25970:1: ( ruleFQN )
+            // InternalRoom.g:25972:1: ( ( ruleFQN ) )
+            // InternalRoom.g:25973:1: ( ruleFQN )
             {
              before(grammarAccess.getActorRefAccess().getTypeActorClassCrossReference_5_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25971:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25972:1: ruleFQN
+            // InternalRoom.g:25974:1: ( ruleFQN )
+            // InternalRoom.g:25975:1: ruleFQN
             {
              before(grammarAccess.getActorRefAccess().getTypeActorClassFQNParserRuleCall_5_0_1()); 
-            pushFollow(FOLLOW_ruleFQN_in_rule__ActorRef__TypeAssignment_552518);
+            pushFollow(FOLLOW_2);
             ruleFQN();
 
             state._fsp--;
@@ -70130,20 +70130,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ActorRef__DocuAssignment_6"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25983:1: rule__ActorRef__DocuAssignment_6 : ( ruleDocumentation ) ;
+    // InternalRoom.g:25986:1: rule__ActorRef__DocuAssignment_6 : ( ruleDocumentation ) ;
     public final void rule__ActorRef__DocuAssignment_6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25987:1: ( ( ruleDocumentation ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25988:1: ( ruleDocumentation )
+            // InternalRoom.g:25990:1: ( ( ruleDocumentation ) )
+            // InternalRoom.g:25991:1: ( ruleDocumentation )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25988:1: ( ruleDocumentation )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25989:1: ruleDocumentation
+            // InternalRoom.g:25991:1: ( ruleDocumentation )
+            // InternalRoom.g:25992:1: ruleDocumentation
             {
              before(grammarAccess.getActorRefAccess().getDocuDocumentationParserRuleCall_6_0()); 
-            pushFollow(FOLLOW_ruleDocumentation_in_rule__ActorRef__DocuAssignment_652553);
+            pushFollow(FOLLOW_2);
             ruleDocumentation();
 
             state._fsp--;
@@ -70171,20 +70171,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateGraph__StatesAssignment_2_0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:25999:1: rule__StateGraph__StatesAssignment_2_0 : ( ruleState ) ;
+    // InternalRoom.g:26002:1: rule__StateGraph__StatesAssignment_2_0 : ( ruleState ) ;
     public final void rule__StateGraph__StatesAssignment_2_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26003:1: ( ( ruleState ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26004:1: ( ruleState )
+            // InternalRoom.g:26006:1: ( ( ruleState ) )
+            // InternalRoom.g:26007:1: ( ruleState )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26004:1: ( ruleState )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26005:1: ruleState
+            // InternalRoom.g:26007:1: ( ruleState )
+            // InternalRoom.g:26008:1: ruleState
             {
              before(grammarAccess.getStateGraphAccess().getStatesStateParserRuleCall_2_0_0()); 
-            pushFollow(FOLLOW_ruleState_in_rule__StateGraph__StatesAssignment_2_052585);
+            pushFollow(FOLLOW_2);
             ruleState();
 
             state._fsp--;
@@ -70212,20 +70212,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateGraph__TrPointsAssignment_2_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26014:1: rule__StateGraph__TrPointsAssignment_2_1 : ( ruleTrPoint ) ;
+    // InternalRoom.g:26017:1: rule__StateGraph__TrPointsAssignment_2_1 : ( ruleTrPoint ) ;
     public final void rule__StateGraph__TrPointsAssignment_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26018:1: ( ( ruleTrPoint ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26019:1: ( ruleTrPoint )
+            // InternalRoom.g:26021:1: ( ( ruleTrPoint ) )
+            // InternalRoom.g:26022:1: ( ruleTrPoint )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26019:1: ( ruleTrPoint )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26020:1: ruleTrPoint
+            // InternalRoom.g:26022:1: ( ruleTrPoint )
+            // InternalRoom.g:26023:1: ruleTrPoint
             {
              before(grammarAccess.getStateGraphAccess().getTrPointsTrPointParserRuleCall_2_1_0()); 
-            pushFollow(FOLLOW_ruleTrPoint_in_rule__StateGraph__TrPointsAssignment_2_152616);
+            pushFollow(FOLLOW_2);
             ruleTrPoint();
 
             state._fsp--;
@@ -70253,20 +70253,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateGraph__ChPointsAssignment_2_2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26029:1: rule__StateGraph__ChPointsAssignment_2_2 : ( ruleChoicePoint ) ;
+    // InternalRoom.g:26032:1: rule__StateGraph__ChPointsAssignment_2_2 : ( ruleChoicePoint ) ;
     public final void rule__StateGraph__ChPointsAssignment_2_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26033:1: ( ( ruleChoicePoint ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26034:1: ( ruleChoicePoint )
+            // InternalRoom.g:26036:1: ( ( ruleChoicePoint ) )
+            // InternalRoom.g:26037:1: ( ruleChoicePoint )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26034:1: ( ruleChoicePoint )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26035:1: ruleChoicePoint
+            // InternalRoom.g:26037:1: ( ruleChoicePoint )
+            // InternalRoom.g:26038:1: ruleChoicePoint
             {
              before(grammarAccess.getStateGraphAccess().getChPointsChoicePointParserRuleCall_2_2_0()); 
-            pushFollow(FOLLOW_ruleChoicePoint_in_rule__StateGraph__ChPointsAssignment_2_252647);
+            pushFollow(FOLLOW_2);
             ruleChoicePoint();
 
             state._fsp--;
@@ -70294,20 +70294,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateGraph__TransitionsAssignment_2_3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26044:1: rule__StateGraph__TransitionsAssignment_2_3 : ( ruleTransition ) ;
+    // InternalRoom.g:26047:1: rule__StateGraph__TransitionsAssignment_2_3 : ( ruleTransition ) ;
     public final void rule__StateGraph__TransitionsAssignment_2_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26048:1: ( ( ruleTransition ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26049:1: ( ruleTransition )
+            // InternalRoom.g:26051:1: ( ( ruleTransition ) )
+            // InternalRoom.g:26052:1: ( ruleTransition )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26049:1: ( ruleTransition )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26050:1: ruleTransition
+            // InternalRoom.g:26052:1: ( ruleTransition )
+            // InternalRoom.g:26053:1: ruleTransition
             {
              before(grammarAccess.getStateGraphAccess().getTransitionsTransitionParserRuleCall_2_3_0()); 
-            pushFollow(FOLLOW_ruleTransition_in_rule__StateGraph__TransitionsAssignment_2_352678);
+            pushFollow(FOLLOW_2);
             ruleTransition();
 
             state._fsp--;
@@ -70335,20 +70335,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateGraph__RefinedTransitionsAssignment_2_4"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26059:1: rule__StateGraph__RefinedTransitionsAssignment_2_4 : ( ruleRefinedTransition ) ;
+    // InternalRoom.g:26062:1: rule__StateGraph__RefinedTransitionsAssignment_2_4 : ( ruleRefinedTransition ) ;
     public final void rule__StateGraph__RefinedTransitionsAssignment_2_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26063:1: ( ( ruleRefinedTransition ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26064:1: ( ruleRefinedTransition )
+            // InternalRoom.g:26066:1: ( ( ruleRefinedTransition ) )
+            // InternalRoom.g:26067:1: ( ruleRefinedTransition )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26064:1: ( ruleRefinedTransition )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26065:1: ruleRefinedTransition
+            // InternalRoom.g:26067:1: ( ruleRefinedTransition )
+            // InternalRoom.g:26068:1: ruleRefinedTransition
             {
              before(grammarAccess.getStateGraphAccess().getRefinedTransitionsRefinedTransitionParserRuleCall_2_4_0()); 
-            pushFollow(FOLLOW_ruleRefinedTransition_in_rule__StateGraph__RefinedTransitionsAssignment_2_452709);
+            pushFollow(FOLLOW_2);
             ruleRefinedTransition();
 
             state._fsp--;
@@ -70376,20 +70376,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateMachine__StatesAssignment_3_0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26074:1: rule__StateMachine__StatesAssignment_3_0 : ( ruleState ) ;
+    // InternalRoom.g:26077:1: rule__StateMachine__StatesAssignment_3_0 : ( ruleState ) ;
     public final void rule__StateMachine__StatesAssignment_3_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26078:1: ( ( ruleState ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26079:1: ( ruleState )
+            // InternalRoom.g:26081:1: ( ( ruleState ) )
+            // InternalRoom.g:26082:1: ( ruleState )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26079:1: ( ruleState )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26080:1: ruleState
+            // InternalRoom.g:26082:1: ( ruleState )
+            // InternalRoom.g:26083:1: ruleState
             {
              before(grammarAccess.getStateMachineAccess().getStatesStateParserRuleCall_3_0_0()); 
-            pushFollow(FOLLOW_ruleState_in_rule__StateMachine__StatesAssignment_3_052740);
+            pushFollow(FOLLOW_2);
             ruleState();
 
             state._fsp--;
@@ -70417,20 +70417,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateMachine__TrPointsAssignment_3_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26089:1: rule__StateMachine__TrPointsAssignment_3_1 : ( ruleTrPoint ) ;
+    // InternalRoom.g:26092:1: rule__StateMachine__TrPointsAssignment_3_1 : ( ruleTrPoint ) ;
     public final void rule__StateMachine__TrPointsAssignment_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26093:1: ( ( ruleTrPoint ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26094:1: ( ruleTrPoint )
+            // InternalRoom.g:26096:1: ( ( ruleTrPoint ) )
+            // InternalRoom.g:26097:1: ( ruleTrPoint )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26094:1: ( ruleTrPoint )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26095:1: ruleTrPoint
+            // InternalRoom.g:26097:1: ( ruleTrPoint )
+            // InternalRoom.g:26098:1: ruleTrPoint
             {
              before(grammarAccess.getStateMachineAccess().getTrPointsTrPointParserRuleCall_3_1_0()); 
-            pushFollow(FOLLOW_ruleTrPoint_in_rule__StateMachine__TrPointsAssignment_3_152771);
+            pushFollow(FOLLOW_2);
             ruleTrPoint();
 
             state._fsp--;
@@ -70458,20 +70458,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateMachine__ChPointsAssignment_3_2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26104:1: rule__StateMachine__ChPointsAssignment_3_2 : ( ruleChoicePoint ) ;
+    // InternalRoom.g:26107:1: rule__StateMachine__ChPointsAssignment_3_2 : ( ruleChoicePoint ) ;
     public final void rule__StateMachine__ChPointsAssignment_3_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26108:1: ( ( ruleChoicePoint ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26109:1: ( ruleChoicePoint )
+            // InternalRoom.g:26111:1: ( ( ruleChoicePoint ) )
+            // InternalRoom.g:26112:1: ( ruleChoicePoint )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26109:1: ( ruleChoicePoint )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26110:1: ruleChoicePoint
+            // InternalRoom.g:26112:1: ( ruleChoicePoint )
+            // InternalRoom.g:26113:1: ruleChoicePoint
             {
              before(grammarAccess.getStateMachineAccess().getChPointsChoicePointParserRuleCall_3_2_0()); 
-            pushFollow(FOLLOW_ruleChoicePoint_in_rule__StateMachine__ChPointsAssignment_3_252802);
+            pushFollow(FOLLOW_2);
             ruleChoicePoint();
 
             state._fsp--;
@@ -70499,20 +70499,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateMachine__TransitionsAssignment_3_3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26119:1: rule__StateMachine__TransitionsAssignment_3_3 : ( ruleTransition ) ;
+    // InternalRoom.g:26122:1: rule__StateMachine__TransitionsAssignment_3_3 : ( ruleTransition ) ;
     public final void rule__StateMachine__TransitionsAssignment_3_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26123:1: ( ( ruleTransition ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26124:1: ( ruleTransition )
+            // InternalRoom.g:26126:1: ( ( ruleTransition ) )
+            // InternalRoom.g:26127:1: ( ruleTransition )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26124:1: ( ruleTransition )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26125:1: ruleTransition
+            // InternalRoom.g:26127:1: ( ruleTransition )
+            // InternalRoom.g:26128:1: ruleTransition
             {
              before(grammarAccess.getStateMachineAccess().getTransitionsTransitionParserRuleCall_3_3_0()); 
-            pushFollow(FOLLOW_ruleTransition_in_rule__StateMachine__TransitionsAssignment_3_352833);
+            pushFollow(FOLLOW_2);
             ruleTransition();
 
             state._fsp--;
@@ -70540,20 +70540,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateMachine__RefinedTransitionsAssignment_3_4"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26134:1: rule__StateMachine__RefinedTransitionsAssignment_3_4 : ( ruleRefinedTransition ) ;
+    // InternalRoom.g:26137:1: rule__StateMachine__RefinedTransitionsAssignment_3_4 : ( ruleRefinedTransition ) ;
     public final void rule__StateMachine__RefinedTransitionsAssignment_3_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26138:1: ( ( ruleRefinedTransition ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26139:1: ( ruleRefinedTransition )
+            // InternalRoom.g:26141:1: ( ( ruleRefinedTransition ) )
+            // InternalRoom.g:26142:1: ( ruleRefinedTransition )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26139:1: ( ruleRefinedTransition )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26140:1: ruleRefinedTransition
+            // InternalRoom.g:26142:1: ( ruleRefinedTransition )
+            // InternalRoom.g:26143:1: ruleRefinedTransition
             {
              before(grammarAccess.getStateMachineAccess().getRefinedTransitionsRefinedTransitionParserRuleCall_3_4_0()); 
-            pushFollow(FOLLOW_ruleRefinedTransition_in_rule__StateMachine__RefinedTransitionsAssignment_3_452864);
+            pushFollow(FOLLOW_2);
             ruleRefinedTransition();
 
             state._fsp--;
@@ -70581,20 +70581,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__NameAssignment_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26149:1: rule__SimpleState__NameAssignment_1 : ( RULE_ID ) ;
+    // InternalRoom.g:26152:1: rule__SimpleState__NameAssignment_1 : ( RULE_ID ) ;
     public final void rule__SimpleState__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26153:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26154:1: ( RULE_ID )
+            // InternalRoom.g:26156:1: ( ( RULE_ID ) )
+            // InternalRoom.g:26157:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26154:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26155:1: RULE_ID
+            // InternalRoom.g:26157:1: ( RULE_ID )
+            // InternalRoom.g:26158:1: RULE_ID
             {
              before(grammarAccess.getSimpleStateAccess().getNameIDTerminalRuleCall_1_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__SimpleState__NameAssignment_152895); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getSimpleStateAccess().getNameIDTerminalRuleCall_1_0()); 
 
             }
@@ -70618,20 +70618,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__DocuAssignment_2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26164:1: rule__SimpleState__DocuAssignment_2 : ( ruleDocumentation ) ;
+    // InternalRoom.g:26167:1: rule__SimpleState__DocuAssignment_2 : ( ruleDocumentation ) ;
     public final void rule__SimpleState__DocuAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26168:1: ( ( ruleDocumentation ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26169:1: ( ruleDocumentation )
+            // InternalRoom.g:26171:1: ( ( ruleDocumentation ) )
+            // InternalRoom.g:26172:1: ( ruleDocumentation )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26169:1: ( ruleDocumentation )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26170:1: ruleDocumentation
+            // InternalRoom.g:26172:1: ( ruleDocumentation )
+            // InternalRoom.g:26173:1: ruleDocumentation
             {
              before(grammarAccess.getSimpleStateAccess().getDocuDocumentationParserRuleCall_2_0()); 
-            pushFollow(FOLLOW_ruleDocumentation_in_rule__SimpleState__DocuAssignment_252926);
+            pushFollow(FOLLOW_2);
             ruleDocumentation();
 
             state._fsp--;
@@ -70659,20 +70659,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__EntryCodeAssignment_3_1_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26179:1: rule__SimpleState__EntryCodeAssignment_3_1_1 : ( ruleDetailCode ) ;
+    // InternalRoom.g:26182:1: rule__SimpleState__EntryCodeAssignment_3_1_1 : ( ruleDetailCode ) ;
     public final void rule__SimpleState__EntryCodeAssignment_3_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26183:1: ( ( ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26184:1: ( ruleDetailCode )
+            // InternalRoom.g:26186:1: ( ( ruleDetailCode ) )
+            // InternalRoom.g:26187:1: ( ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26184:1: ( ruleDetailCode )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26185:1: ruleDetailCode
+            // InternalRoom.g:26187:1: ( ruleDetailCode )
+            // InternalRoom.g:26188:1: ruleDetailCode
             {
              before(grammarAccess.getSimpleStateAccess().getEntryCodeDetailCodeParserRuleCall_3_1_1_0()); 
-            pushFollow(FOLLOW_ruleDetailCode_in_rule__SimpleState__EntryCodeAssignment_3_1_152957);
+            pushFollow(FOLLOW_2);
             ruleDetailCode();
 
             state._fsp--;
@@ -70700,20 +70700,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__ExitCodeAssignment_3_2_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26194:1: rule__SimpleState__ExitCodeAssignment_3_2_1 : ( ruleDetailCode ) ;
+    // InternalRoom.g:26197:1: rule__SimpleState__ExitCodeAssignment_3_2_1 : ( ruleDetailCode ) ;
     public final void rule__SimpleState__ExitCodeAssignment_3_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26198:1: ( ( ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26199:1: ( ruleDetailCode )
+            // InternalRoom.g:26201:1: ( ( ruleDetailCode ) )
+            // InternalRoom.g:26202:1: ( ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26199:1: ( ruleDetailCode )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26200:1: ruleDetailCode
+            // InternalRoom.g:26202:1: ( ruleDetailCode )
+            // InternalRoom.g:26203:1: ruleDetailCode
             {
              before(grammarAccess.getSimpleStateAccess().getExitCodeDetailCodeParserRuleCall_3_2_1_0()); 
-            pushFollow(FOLLOW_ruleDetailCode_in_rule__SimpleState__ExitCodeAssignment_3_2_152988);
+            pushFollow(FOLLOW_2);
             ruleDetailCode();
 
             state._fsp--;
@@ -70741,20 +70741,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__DoCodeAssignment_3_3_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26209:1: rule__SimpleState__DoCodeAssignment_3_3_1 : ( ruleDetailCode ) ;
+    // InternalRoom.g:26212:1: rule__SimpleState__DoCodeAssignment_3_3_1 : ( ruleDetailCode ) ;
     public final void rule__SimpleState__DoCodeAssignment_3_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26213:1: ( ( ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26214:1: ( ruleDetailCode )
+            // InternalRoom.g:26216:1: ( ( ruleDetailCode ) )
+            // InternalRoom.g:26217:1: ( ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26214:1: ( ruleDetailCode )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26215:1: ruleDetailCode
+            // InternalRoom.g:26217:1: ( ruleDetailCode )
+            // InternalRoom.g:26218:1: ruleDetailCode
             {
              before(grammarAccess.getSimpleStateAccess().getDoCodeDetailCodeParserRuleCall_3_3_1_0()); 
-            pushFollow(FOLLOW_ruleDetailCode_in_rule__SimpleState__DoCodeAssignment_3_3_153019);
+            pushFollow(FOLLOW_2);
             ruleDetailCode();
 
             state._fsp--;
@@ -70782,20 +70782,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleState__SubgraphAssignment_3_4_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26224:1: rule__SimpleState__SubgraphAssignment_3_4_1 : ( ruleStateGraph ) ;
+    // InternalRoom.g:26227:1: rule__SimpleState__SubgraphAssignment_3_4_1 : ( ruleStateGraph ) ;
     public final void rule__SimpleState__SubgraphAssignment_3_4_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26228:1: ( ( ruleStateGraph ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26229:1: ( ruleStateGraph )
+            // InternalRoom.g:26231:1: ( ( ruleStateGraph ) )
+            // InternalRoom.g:26232:1: ( ruleStateGraph )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26229:1: ( ruleStateGraph )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26230:1: ruleStateGraph
+            // InternalRoom.g:26232:1: ( ruleStateGraph )
+            // InternalRoom.g:26233:1: ruleStateGraph
             {
              before(grammarAccess.getSimpleStateAccess().getSubgraphStateGraphParserRuleCall_3_4_1_0()); 
-            pushFollow(FOLLOW_ruleStateGraph_in_rule__SimpleState__SubgraphAssignment_3_4_153050);
+            pushFollow(FOLLOW_2);
             ruleStateGraph();
 
             state._fsp--;
@@ -70823,24 +70823,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__TargetAssignment_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26239:1: rule__RefinedState__TargetAssignment_1 : ( ( ruleFQN ) ) ;
+    // InternalRoom.g:26242:1: rule__RefinedState__TargetAssignment_1 : ( ( ruleFQN ) ) ;
     public final void rule__RefinedState__TargetAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26243:1: ( ( ( ruleFQN ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26244:1: ( ( ruleFQN ) )
+            // InternalRoom.g:26246:1: ( ( ( ruleFQN ) ) )
+            // InternalRoom.g:26247:1: ( ( ruleFQN ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26244:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26245:1: ( ruleFQN )
+            // InternalRoom.g:26247:1: ( ( ruleFQN ) )
+            // InternalRoom.g:26248:1: ( ruleFQN )
             {
              before(grammarAccess.getRefinedStateAccess().getTargetStateCrossReference_1_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26246:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26247:1: ruleFQN
+            // InternalRoom.g:26249:1: ( ruleFQN )
+            // InternalRoom.g:26250:1: ruleFQN
             {
              before(grammarAccess.getRefinedStateAccess().getTargetStateFQNParserRuleCall_1_0_1()); 
-            pushFollow(FOLLOW_ruleFQN_in_rule__RefinedState__TargetAssignment_153085);
+            pushFollow(FOLLOW_2);
             ruleFQN();
 
             state._fsp--;
@@ -70872,20 +70872,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__DocuAssignment_2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26258:1: rule__RefinedState__DocuAssignment_2 : ( ruleDocumentation ) ;
+    // InternalRoom.g:26261:1: rule__RefinedState__DocuAssignment_2 : ( ruleDocumentation ) ;
     public final void rule__RefinedState__DocuAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26262:1: ( ( ruleDocumentation ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26263:1: ( ruleDocumentation )
+            // InternalRoom.g:26265:1: ( ( ruleDocumentation ) )
+            // InternalRoom.g:26266:1: ( ruleDocumentation )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26263:1: ( ruleDocumentation )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26264:1: ruleDocumentation
+            // InternalRoom.g:26266:1: ( ruleDocumentation )
+            // InternalRoom.g:26267:1: ruleDocumentation
             {
              before(grammarAccess.getRefinedStateAccess().getDocuDocumentationParserRuleCall_2_0()); 
-            pushFollow(FOLLOW_ruleDocumentation_in_rule__RefinedState__DocuAssignment_253120);
+            pushFollow(FOLLOW_2);
             ruleDocumentation();
 
             state._fsp--;
@@ -70913,20 +70913,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__EntryCodeAssignment_4_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26273:1: rule__RefinedState__EntryCodeAssignment_4_1 : ( ruleDetailCode ) ;
+    // InternalRoom.g:26276:1: rule__RefinedState__EntryCodeAssignment_4_1 : ( ruleDetailCode ) ;
     public final void rule__RefinedState__EntryCodeAssignment_4_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26277:1: ( ( ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26278:1: ( ruleDetailCode )
+            // InternalRoom.g:26280:1: ( ( ruleDetailCode ) )
+            // InternalRoom.g:26281:1: ( ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26278:1: ( ruleDetailCode )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26279:1: ruleDetailCode
+            // InternalRoom.g:26281:1: ( ruleDetailCode )
+            // InternalRoom.g:26282:1: ruleDetailCode
             {
              before(grammarAccess.getRefinedStateAccess().getEntryCodeDetailCodeParserRuleCall_4_1_0()); 
-            pushFollow(FOLLOW_ruleDetailCode_in_rule__RefinedState__EntryCodeAssignment_4_153151);
+            pushFollow(FOLLOW_2);
             ruleDetailCode();
 
             state._fsp--;
@@ -70954,20 +70954,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__ExitCodeAssignment_5_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26288:1: rule__RefinedState__ExitCodeAssignment_5_1 : ( ruleDetailCode ) ;
+    // InternalRoom.g:26291:1: rule__RefinedState__ExitCodeAssignment_5_1 : ( ruleDetailCode ) ;
     public final void rule__RefinedState__ExitCodeAssignment_5_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26292:1: ( ( ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26293:1: ( ruleDetailCode )
+            // InternalRoom.g:26295:1: ( ( ruleDetailCode ) )
+            // InternalRoom.g:26296:1: ( ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26293:1: ( ruleDetailCode )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26294:1: ruleDetailCode
+            // InternalRoom.g:26296:1: ( ruleDetailCode )
+            // InternalRoom.g:26297:1: ruleDetailCode
             {
              before(grammarAccess.getRefinedStateAccess().getExitCodeDetailCodeParserRuleCall_5_1_0()); 
-            pushFollow(FOLLOW_ruleDetailCode_in_rule__RefinedState__ExitCodeAssignment_5_153182);
+            pushFollow(FOLLOW_2);
             ruleDetailCode();
 
             state._fsp--;
@@ -70995,20 +70995,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__DoCodeAssignment_6_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26303:1: rule__RefinedState__DoCodeAssignment_6_1 : ( ruleDetailCode ) ;
+    // InternalRoom.g:26306:1: rule__RefinedState__DoCodeAssignment_6_1 : ( ruleDetailCode ) ;
     public final void rule__RefinedState__DoCodeAssignment_6_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26307:1: ( ( ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26308:1: ( ruleDetailCode )
+            // InternalRoom.g:26310:1: ( ( ruleDetailCode ) )
+            // InternalRoom.g:26311:1: ( ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26308:1: ( ruleDetailCode )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26309:1: ruleDetailCode
+            // InternalRoom.g:26311:1: ( ruleDetailCode )
+            // InternalRoom.g:26312:1: ruleDetailCode
             {
              before(grammarAccess.getRefinedStateAccess().getDoCodeDetailCodeParserRuleCall_6_1_0()); 
-            pushFollow(FOLLOW_ruleDetailCode_in_rule__RefinedState__DoCodeAssignment_6_153213);
+            pushFollow(FOLLOW_2);
             ruleDetailCode();
 
             state._fsp--;
@@ -71036,20 +71036,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedState__SubgraphAssignment_7_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26318:1: rule__RefinedState__SubgraphAssignment_7_1 : ( ruleStateGraph ) ;
+    // InternalRoom.g:26321:1: rule__RefinedState__SubgraphAssignment_7_1 : ( ruleStateGraph ) ;
     public final void rule__RefinedState__SubgraphAssignment_7_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26322:1: ( ( ruleStateGraph ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26323:1: ( ruleStateGraph )
+            // InternalRoom.g:26325:1: ( ( ruleStateGraph ) )
+            // InternalRoom.g:26326:1: ( ruleStateGraph )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26323:1: ( ruleStateGraph )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26324:1: ruleStateGraph
+            // InternalRoom.g:26326:1: ( ruleStateGraph )
+            // InternalRoom.g:26327:1: ruleStateGraph
             {
              before(grammarAccess.getRefinedStateAccess().getSubgraphStateGraphParserRuleCall_7_1_0()); 
-            pushFollow(FOLLOW_ruleStateGraph_in_rule__RefinedState__SubgraphAssignment_7_153244);
+            pushFollow(FOLLOW_2);
             ruleStateGraph();
 
             state._fsp--;
@@ -71077,24 +71077,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DetailCode__UsedAssignment_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26333:1: rule__DetailCode__UsedAssignment_1 : ( ( '{' ) ) ;
+    // InternalRoom.g:26336:1: rule__DetailCode__UsedAssignment_1 : ( ( '{' ) ) ;
     public final void rule__DetailCode__UsedAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26337:1: ( ( ( '{' ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26338:1: ( ( '{' ) )
+            // InternalRoom.g:26340:1: ( ( ( '{' ) ) )
+            // InternalRoom.g:26341:1: ( ( '{' ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26338:1: ( ( '{' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26339:1: ( '{' )
+            // InternalRoom.g:26341:1: ( ( '{' ) )
+            // InternalRoom.g:26342:1: ( '{' )
             {
              before(grammarAccess.getDetailCodeAccess().getUsedLeftCurlyBracketKeyword_1_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26340:1: ( '{' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26341:1: '{'
+            // InternalRoom.g:26343:1: ( '{' )
+            // InternalRoom.g:26344:1: '{'
             {
              before(grammarAccess.getDetailCodeAccess().getUsedLeftCurlyBracketKeyword_1_0()); 
-            match(input,41,FOLLOW_41_in_rule__DetailCode__UsedAssignment_153280); 
+            match(input,41,FOLLOW_2); 
              after(grammarAccess.getDetailCodeAccess().getUsedLeftCurlyBracketKeyword_1_0()); 
 
             }
@@ -71122,20 +71122,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DetailCode__LinesAssignment_2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26356:1: rule__DetailCode__LinesAssignment_2 : ( RULE_STRING ) ;
+    // InternalRoom.g:26359:1: rule__DetailCode__LinesAssignment_2 : ( RULE_STRING ) ;
     public final void rule__DetailCode__LinesAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26360:1: ( ( RULE_STRING ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26361:1: ( RULE_STRING )
+            // InternalRoom.g:26363:1: ( ( RULE_STRING ) )
+            // InternalRoom.g:26364:1: ( RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26361:1: ( RULE_STRING )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26362:1: RULE_STRING
+            // InternalRoom.g:26364:1: ( RULE_STRING )
+            // InternalRoom.g:26365:1: RULE_STRING
             {
              before(grammarAccess.getDetailCodeAccess().getLinesSTRINGTerminalRuleCall_2_0()); 
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__DetailCode__LinesAssignment_253319); 
+            match(input,RULE_STRING,FOLLOW_2); 
              after(grammarAccess.getDetailCodeAccess().getLinesSTRINGTerminalRuleCall_2_0()); 
 
             }
@@ -71159,24 +71159,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TransitionPoint__HandlerAssignment_0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26371:1: rule__TransitionPoint__HandlerAssignment_0 : ( ( 'handler' ) ) ;
+    // InternalRoom.g:26374:1: rule__TransitionPoint__HandlerAssignment_0 : ( ( 'handler' ) ) ;
     public final void rule__TransitionPoint__HandlerAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26375:1: ( ( ( 'handler' ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26376:1: ( ( 'handler' ) )
+            // InternalRoom.g:26378:1: ( ( ( 'handler' ) ) )
+            // InternalRoom.g:26379:1: ( ( 'handler' ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26376:1: ( ( 'handler' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26377:1: ( 'handler' )
+            // InternalRoom.g:26379:1: ( ( 'handler' ) )
+            // InternalRoom.g:26380:1: ( 'handler' )
             {
              before(grammarAccess.getTransitionPointAccess().getHandlerHandlerKeyword_0_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26378:1: ( 'handler' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26379:1: 'handler'
+            // InternalRoom.g:26381:1: ( 'handler' )
+            // InternalRoom.g:26382:1: 'handler'
             {
              before(grammarAccess.getTransitionPointAccess().getHandlerHandlerKeyword_0_0()); 
-            match(input,130,FOLLOW_130_in_rule__TransitionPoint__HandlerAssignment_053355); 
+            match(input,130,FOLLOW_2); 
              after(grammarAccess.getTransitionPointAccess().getHandlerHandlerKeyword_0_0()); 
 
             }
@@ -71204,20 +71204,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TransitionPoint__NameAssignment_2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26394:1: rule__TransitionPoint__NameAssignment_2 : ( RULE_ID ) ;
+    // InternalRoom.g:26397:1: rule__TransitionPoint__NameAssignment_2 : ( RULE_ID ) ;
     public final void rule__TransitionPoint__NameAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26398:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26399:1: ( RULE_ID )
+            // InternalRoom.g:26401:1: ( ( RULE_ID ) )
+            // InternalRoom.g:26402:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26399:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26400:1: RULE_ID
+            // InternalRoom.g:26402:1: ( RULE_ID )
+            // InternalRoom.g:26403:1: RULE_ID
             {
              before(grammarAccess.getTransitionPointAccess().getNameIDTerminalRuleCall_2_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__TransitionPoint__NameAssignment_253394); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getTransitionPointAccess().getNameIDTerminalRuleCall_2_0()); 
 
             }
@@ -71241,20 +71241,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EntryPoint__NameAssignment_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26409:1: rule__EntryPoint__NameAssignment_1 : ( RULE_ID ) ;
+    // InternalRoom.g:26412:1: rule__EntryPoint__NameAssignment_1 : ( RULE_ID ) ;
     public final void rule__EntryPoint__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26413:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26414:1: ( RULE_ID )
+            // InternalRoom.g:26416:1: ( ( RULE_ID ) )
+            // InternalRoom.g:26417:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26414:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26415:1: RULE_ID
+            // InternalRoom.g:26417:1: ( RULE_ID )
+            // InternalRoom.g:26418:1: RULE_ID
             {
              before(grammarAccess.getEntryPointAccess().getNameIDTerminalRuleCall_1_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__EntryPoint__NameAssignment_153425); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getEntryPointAccess().getNameIDTerminalRuleCall_1_0()); 
 
             }
@@ -71278,20 +71278,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ExitPoint__NameAssignment_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26424:1: rule__ExitPoint__NameAssignment_1 : ( RULE_ID ) ;
+    // InternalRoom.g:26427:1: rule__ExitPoint__NameAssignment_1 : ( RULE_ID ) ;
     public final void rule__ExitPoint__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26428:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26429:1: ( RULE_ID )
+            // InternalRoom.g:26431:1: ( ( RULE_ID ) )
+            // InternalRoom.g:26432:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26429:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26430:1: RULE_ID
+            // InternalRoom.g:26432:1: ( RULE_ID )
+            // InternalRoom.g:26433:1: RULE_ID
             {
              before(grammarAccess.getExitPointAccess().getNameIDTerminalRuleCall_1_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__ExitPoint__NameAssignment_153456); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getExitPointAccess().getNameIDTerminalRuleCall_1_0()); 
 
             }
@@ -71315,20 +71315,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ChoicePoint__NameAssignment_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26439:1: rule__ChoicePoint__NameAssignment_1 : ( RULE_ID ) ;
+    // InternalRoom.g:26442:1: rule__ChoicePoint__NameAssignment_1 : ( RULE_ID ) ;
     public final void rule__ChoicePoint__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26443:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26444:1: ( RULE_ID )
+            // InternalRoom.g:26446:1: ( ( RULE_ID ) )
+            // InternalRoom.g:26447:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26444:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26445:1: RULE_ID
+            // InternalRoom.g:26447:1: ( RULE_ID )
+            // InternalRoom.g:26448:1: RULE_ID
             {
              before(grammarAccess.getChoicePointAccess().getNameIDTerminalRuleCall_1_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__ChoicePoint__NameAssignment_153487); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getChoicePointAccess().getNameIDTerminalRuleCall_1_0()); 
 
             }
@@ -71352,20 +71352,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ChoicePoint__DocuAssignment_2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26454:1: rule__ChoicePoint__DocuAssignment_2 : ( ruleDocumentation ) ;
+    // InternalRoom.g:26457:1: rule__ChoicePoint__DocuAssignment_2 : ( ruleDocumentation ) ;
     public final void rule__ChoicePoint__DocuAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26458:1: ( ( ruleDocumentation ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26459:1: ( ruleDocumentation )
+            // InternalRoom.g:26461:1: ( ( ruleDocumentation ) )
+            // InternalRoom.g:26462:1: ( ruleDocumentation )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26459:1: ( ruleDocumentation )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26460:1: ruleDocumentation
+            // InternalRoom.g:26462:1: ( ruleDocumentation )
+            // InternalRoom.g:26463:1: ruleDocumentation
             {
              before(grammarAccess.getChoicePointAccess().getDocuDocumentationParserRuleCall_2_0()); 
-            pushFollow(FOLLOW_ruleDocumentation_in_rule__ChoicePoint__DocuAssignment_253518);
+            pushFollow(FOLLOW_2);
             ruleDocumentation();
 
             state._fsp--;
@@ -71393,20 +71393,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__NameAssignment_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26469:1: rule__InitialTransition__NameAssignment_1 : ( RULE_ID ) ;
+    // InternalRoom.g:26472:1: rule__InitialTransition__NameAssignment_1 : ( RULE_ID ) ;
     public final void rule__InitialTransition__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26473:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26474:1: ( RULE_ID )
+            // InternalRoom.g:26476:1: ( ( RULE_ID ) )
+            // InternalRoom.g:26477:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26474:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26475:1: RULE_ID
+            // InternalRoom.g:26477:1: ( RULE_ID )
+            // InternalRoom.g:26478:1: RULE_ID
             {
              before(grammarAccess.getInitialTransitionAccess().getNameIDTerminalRuleCall_1_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__InitialTransition__NameAssignment_153549); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getInitialTransitionAccess().getNameIDTerminalRuleCall_1_0()); 
 
             }
@@ -71430,20 +71430,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__ToAssignment_5"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26484:1: rule__InitialTransition__ToAssignment_5 : ( ruleTransitionTerminal ) ;
+    // InternalRoom.g:26487:1: rule__InitialTransition__ToAssignment_5 : ( ruleTransitionTerminal ) ;
     public final void rule__InitialTransition__ToAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26488:1: ( ( ruleTransitionTerminal ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26489:1: ( ruleTransitionTerminal )
+            // InternalRoom.g:26491:1: ( ( ruleTransitionTerminal ) )
+            // InternalRoom.g:26492:1: ( ruleTransitionTerminal )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26489:1: ( ruleTransitionTerminal )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26490:1: ruleTransitionTerminal
+            // InternalRoom.g:26492:1: ( ruleTransitionTerminal )
+            // InternalRoom.g:26493:1: ruleTransitionTerminal
             {
              before(grammarAccess.getInitialTransitionAccess().getToTransitionTerminalParserRuleCall_5_0()); 
-            pushFollow(FOLLOW_ruleTransitionTerminal_in_rule__InitialTransition__ToAssignment_553580);
+            pushFollow(FOLLOW_2);
             ruleTransitionTerminal();
 
             state._fsp--;
@@ -71471,20 +71471,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__DocuAssignment_6"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26499:1: rule__InitialTransition__DocuAssignment_6 : ( ruleDocumentation ) ;
+    // InternalRoom.g:26502:1: rule__InitialTransition__DocuAssignment_6 : ( ruleDocumentation ) ;
     public final void rule__InitialTransition__DocuAssignment_6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26503:1: ( ( ruleDocumentation ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26504:1: ( ruleDocumentation )
+            // InternalRoom.g:26506:1: ( ( ruleDocumentation ) )
+            // InternalRoom.g:26507:1: ( ruleDocumentation )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26504:1: ( ruleDocumentation )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26505:1: ruleDocumentation
+            // InternalRoom.g:26507:1: ( ruleDocumentation )
+            // InternalRoom.g:26508:1: ruleDocumentation
             {
              before(grammarAccess.getInitialTransitionAccess().getDocuDocumentationParserRuleCall_6_0()); 
-            pushFollow(FOLLOW_ruleDocumentation_in_rule__InitialTransition__DocuAssignment_653611);
+            pushFollow(FOLLOW_2);
             ruleDocumentation();
 
             state._fsp--;
@@ -71512,20 +71512,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InitialTransition__ActionAssignment_7_1_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26514:1: rule__InitialTransition__ActionAssignment_7_1_1 : ( ruleDetailCode ) ;
+    // InternalRoom.g:26517:1: rule__InitialTransition__ActionAssignment_7_1_1 : ( ruleDetailCode ) ;
     public final void rule__InitialTransition__ActionAssignment_7_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26518:1: ( ( ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26519:1: ( ruleDetailCode )
+            // InternalRoom.g:26521:1: ( ( ruleDetailCode ) )
+            // InternalRoom.g:26522:1: ( ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26519:1: ( ruleDetailCode )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26520:1: ruleDetailCode
+            // InternalRoom.g:26522:1: ( ruleDetailCode )
+            // InternalRoom.g:26523:1: ruleDetailCode
             {
              before(grammarAccess.getInitialTransitionAccess().getActionDetailCodeParserRuleCall_7_1_1_0()); 
-            pushFollow(FOLLOW_ruleDetailCode_in_rule__InitialTransition__ActionAssignment_7_1_153642);
+            pushFollow(FOLLOW_2);
             ruleDetailCode();
 
             state._fsp--;
@@ -71553,20 +71553,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__NameAssignment_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26529:1: rule__ContinuationTransition__NameAssignment_1 : ( RULE_ID ) ;
+    // InternalRoom.g:26532:1: rule__ContinuationTransition__NameAssignment_1 : ( RULE_ID ) ;
     public final void rule__ContinuationTransition__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26533:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26534:1: ( RULE_ID )
+            // InternalRoom.g:26536:1: ( ( RULE_ID ) )
+            // InternalRoom.g:26537:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26534:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26535:1: RULE_ID
+            // InternalRoom.g:26537:1: ( RULE_ID )
+            // InternalRoom.g:26538:1: RULE_ID
             {
              before(grammarAccess.getContinuationTransitionAccess().getNameIDTerminalRuleCall_1_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__ContinuationTransition__NameAssignment_153673); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getContinuationTransitionAccess().getNameIDTerminalRuleCall_1_0()); 
 
             }
@@ -71590,20 +71590,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__FromAssignment_3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26544:1: rule__ContinuationTransition__FromAssignment_3 : ( ruleTransitionTerminal ) ;
+    // InternalRoom.g:26547:1: rule__ContinuationTransition__FromAssignment_3 : ( ruleTransitionTerminal ) ;
     public final void rule__ContinuationTransition__FromAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26548:1: ( ( ruleTransitionTerminal ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26549:1: ( ruleTransitionTerminal )
+            // InternalRoom.g:26551:1: ( ( ruleTransitionTerminal ) )
+            // InternalRoom.g:26552:1: ( ruleTransitionTerminal )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26549:1: ( ruleTransitionTerminal )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26550:1: ruleTransitionTerminal
+            // InternalRoom.g:26552:1: ( ruleTransitionTerminal )
+            // InternalRoom.g:26553:1: ruleTransitionTerminal
             {
              before(grammarAccess.getContinuationTransitionAccess().getFromTransitionTerminalParserRuleCall_3_0()); 
-            pushFollow(FOLLOW_ruleTransitionTerminal_in_rule__ContinuationTransition__FromAssignment_353704);
+            pushFollow(FOLLOW_2);
             ruleTransitionTerminal();
 
             state._fsp--;
@@ -71631,20 +71631,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__ToAssignment_5"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26559:1: rule__ContinuationTransition__ToAssignment_5 : ( ruleTransitionTerminal ) ;
+    // InternalRoom.g:26562:1: rule__ContinuationTransition__ToAssignment_5 : ( ruleTransitionTerminal ) ;
     public final void rule__ContinuationTransition__ToAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26563:1: ( ( ruleTransitionTerminal ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26564:1: ( ruleTransitionTerminal )
+            // InternalRoom.g:26566:1: ( ( ruleTransitionTerminal ) )
+            // InternalRoom.g:26567:1: ( ruleTransitionTerminal )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26564:1: ( ruleTransitionTerminal )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26565:1: ruleTransitionTerminal
+            // InternalRoom.g:26567:1: ( ruleTransitionTerminal )
+            // InternalRoom.g:26568:1: ruleTransitionTerminal
             {
              before(grammarAccess.getContinuationTransitionAccess().getToTransitionTerminalParserRuleCall_5_0()); 
-            pushFollow(FOLLOW_ruleTransitionTerminal_in_rule__ContinuationTransition__ToAssignment_553735);
+            pushFollow(FOLLOW_2);
             ruleTransitionTerminal();
 
             state._fsp--;
@@ -71672,20 +71672,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__DocuAssignment_6"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26574:1: rule__ContinuationTransition__DocuAssignment_6 : ( ruleDocumentation ) ;
+    // InternalRoom.g:26577:1: rule__ContinuationTransition__DocuAssignment_6 : ( ruleDocumentation ) ;
     public final void rule__ContinuationTransition__DocuAssignment_6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26578:1: ( ( ruleDocumentation ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26579:1: ( ruleDocumentation )
+            // InternalRoom.g:26581:1: ( ( ruleDocumentation ) )
+            // InternalRoom.g:26582:1: ( ruleDocumentation )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26579:1: ( ruleDocumentation )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26580:1: ruleDocumentation
+            // InternalRoom.g:26582:1: ( ruleDocumentation )
+            // InternalRoom.g:26583:1: ruleDocumentation
             {
              before(grammarAccess.getContinuationTransitionAccess().getDocuDocumentationParserRuleCall_6_0()); 
-            pushFollow(FOLLOW_ruleDocumentation_in_rule__ContinuationTransition__DocuAssignment_653766);
+            pushFollow(FOLLOW_2);
             ruleDocumentation();
 
             state._fsp--;
@@ -71713,20 +71713,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ContinuationTransition__ActionAssignment_7_1_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26589:1: rule__ContinuationTransition__ActionAssignment_7_1_1 : ( ruleDetailCode ) ;
+    // InternalRoom.g:26592:1: rule__ContinuationTransition__ActionAssignment_7_1_1 : ( ruleDetailCode ) ;
     public final void rule__ContinuationTransition__ActionAssignment_7_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26593:1: ( ( ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26594:1: ( ruleDetailCode )
+            // InternalRoom.g:26596:1: ( ( ruleDetailCode ) )
+            // InternalRoom.g:26597:1: ( ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26594:1: ( ruleDetailCode )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26595:1: ruleDetailCode
+            // InternalRoom.g:26597:1: ( ruleDetailCode )
+            // InternalRoom.g:26598:1: ruleDetailCode
             {
              before(grammarAccess.getContinuationTransitionAccess().getActionDetailCodeParserRuleCall_7_1_1_0()); 
-            pushFollow(FOLLOW_ruleDetailCode_in_rule__ContinuationTransition__ActionAssignment_7_1_153797);
+            pushFollow(FOLLOW_2);
             ruleDetailCode();
 
             state._fsp--;
@@ -71754,20 +71754,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__NameAssignment_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26604:1: rule__TriggeredTransition__NameAssignment_1 : ( RULE_ID ) ;
+    // InternalRoom.g:26607:1: rule__TriggeredTransition__NameAssignment_1 : ( RULE_ID ) ;
     public final void rule__TriggeredTransition__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26608:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26609:1: ( RULE_ID )
+            // InternalRoom.g:26611:1: ( ( RULE_ID ) )
+            // InternalRoom.g:26612:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26609:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26610:1: RULE_ID
+            // InternalRoom.g:26612:1: ( RULE_ID )
+            // InternalRoom.g:26613:1: RULE_ID
             {
              before(grammarAccess.getTriggeredTransitionAccess().getNameIDTerminalRuleCall_1_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__TriggeredTransition__NameAssignment_153828); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getTriggeredTransitionAccess().getNameIDTerminalRuleCall_1_0()); 
 
             }
@@ -71791,20 +71791,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__FromAssignment_3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26619:1: rule__TriggeredTransition__FromAssignment_3 : ( ruleTransitionTerminal ) ;
+    // InternalRoom.g:26622:1: rule__TriggeredTransition__FromAssignment_3 : ( ruleTransitionTerminal ) ;
     public final void rule__TriggeredTransition__FromAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26623:1: ( ( ruleTransitionTerminal ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26624:1: ( ruleTransitionTerminal )
+            // InternalRoom.g:26626:1: ( ( ruleTransitionTerminal ) )
+            // InternalRoom.g:26627:1: ( ruleTransitionTerminal )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26624:1: ( ruleTransitionTerminal )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26625:1: ruleTransitionTerminal
+            // InternalRoom.g:26627:1: ( ruleTransitionTerminal )
+            // InternalRoom.g:26628:1: ruleTransitionTerminal
             {
              before(grammarAccess.getTriggeredTransitionAccess().getFromTransitionTerminalParserRuleCall_3_0()); 
-            pushFollow(FOLLOW_ruleTransitionTerminal_in_rule__TriggeredTransition__FromAssignment_353859);
+            pushFollow(FOLLOW_2);
             ruleTransitionTerminal();
 
             state._fsp--;
@@ -71832,20 +71832,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__ToAssignment_5"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26634:1: rule__TriggeredTransition__ToAssignment_5 : ( ruleTransitionTerminal ) ;
+    // InternalRoom.g:26637:1: rule__TriggeredTransition__ToAssignment_5 : ( ruleTransitionTerminal ) ;
     public final void rule__TriggeredTransition__ToAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26638:1: ( ( ruleTransitionTerminal ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26639:1: ( ruleTransitionTerminal )
+            // InternalRoom.g:26641:1: ( ( ruleTransitionTerminal ) )
+            // InternalRoom.g:26642:1: ( ruleTransitionTerminal )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26639:1: ( ruleTransitionTerminal )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26640:1: ruleTransitionTerminal
+            // InternalRoom.g:26642:1: ( ruleTransitionTerminal )
+            // InternalRoom.g:26643:1: ruleTransitionTerminal
             {
              before(grammarAccess.getTriggeredTransitionAccess().getToTransitionTerminalParserRuleCall_5_0()); 
-            pushFollow(FOLLOW_ruleTransitionTerminal_in_rule__TriggeredTransition__ToAssignment_553890);
+            pushFollow(FOLLOW_2);
             ruleTransitionTerminal();
 
             state._fsp--;
@@ -71873,20 +71873,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__DocuAssignment_6"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26649:1: rule__TriggeredTransition__DocuAssignment_6 : ( ruleDocumentation ) ;
+    // InternalRoom.g:26652:1: rule__TriggeredTransition__DocuAssignment_6 : ( ruleDocumentation ) ;
     public final void rule__TriggeredTransition__DocuAssignment_6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26653:1: ( ( ruleDocumentation ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26654:1: ( ruleDocumentation )
+            // InternalRoom.g:26656:1: ( ( ruleDocumentation ) )
+            // InternalRoom.g:26657:1: ( ruleDocumentation )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26654:1: ( ruleDocumentation )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26655:1: ruleDocumentation
+            // InternalRoom.g:26657:1: ( ruleDocumentation )
+            // InternalRoom.g:26658:1: ruleDocumentation
             {
              before(grammarAccess.getTriggeredTransitionAccess().getDocuDocumentationParserRuleCall_6_0()); 
-            pushFollow(FOLLOW_ruleDocumentation_in_rule__TriggeredTransition__DocuAssignment_653921);
+            pushFollow(FOLLOW_2);
             ruleDocumentation();
 
             state._fsp--;
@@ -71914,20 +71914,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__TriggersAssignment_10"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26664:1: rule__TriggeredTransition__TriggersAssignment_10 : ( ruleTrigger ) ;
+    // InternalRoom.g:26667:1: rule__TriggeredTransition__TriggersAssignment_10 : ( ruleTrigger ) ;
     public final void rule__TriggeredTransition__TriggersAssignment_10() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26668:1: ( ( ruleTrigger ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26669:1: ( ruleTrigger )
+            // InternalRoom.g:26671:1: ( ( ruleTrigger ) )
+            // InternalRoom.g:26672:1: ( ruleTrigger )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26669:1: ( ruleTrigger )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26670:1: ruleTrigger
+            // InternalRoom.g:26672:1: ( ruleTrigger )
+            // InternalRoom.g:26673:1: ruleTrigger
             {
              before(grammarAccess.getTriggeredTransitionAccess().getTriggersTriggerParserRuleCall_10_0()); 
-            pushFollow(FOLLOW_ruleTrigger_in_rule__TriggeredTransition__TriggersAssignment_1053952);
+            pushFollow(FOLLOW_2);
             ruleTrigger();
 
             state._fsp--;
@@ -71955,20 +71955,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__TriggersAssignment_11_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26679:1: rule__TriggeredTransition__TriggersAssignment_11_1 : ( ruleTrigger ) ;
+    // InternalRoom.g:26682:1: rule__TriggeredTransition__TriggersAssignment_11_1 : ( ruleTrigger ) ;
     public final void rule__TriggeredTransition__TriggersAssignment_11_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26683:1: ( ( ruleTrigger ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26684:1: ( ruleTrigger )
+            // InternalRoom.g:26686:1: ( ( ruleTrigger ) )
+            // InternalRoom.g:26687:1: ( ruleTrigger )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26684:1: ( ruleTrigger )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26685:1: ruleTrigger
+            // InternalRoom.g:26687:1: ( ruleTrigger )
+            // InternalRoom.g:26688:1: ruleTrigger
             {
              before(grammarAccess.getTriggeredTransitionAccess().getTriggersTriggerParserRuleCall_11_1_0()); 
-            pushFollow(FOLLOW_ruleTrigger_in_rule__TriggeredTransition__TriggersAssignment_11_153983);
+            pushFollow(FOLLOW_2);
             ruleTrigger();
 
             state._fsp--;
@@ -71996,20 +71996,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TriggeredTransition__ActionAssignment_13_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26694:1: rule__TriggeredTransition__ActionAssignment_13_1 : ( ruleDetailCode ) ;
+    // InternalRoom.g:26697:1: rule__TriggeredTransition__ActionAssignment_13_1 : ( ruleDetailCode ) ;
     public final void rule__TriggeredTransition__ActionAssignment_13_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26698:1: ( ( ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26699:1: ( ruleDetailCode )
+            // InternalRoom.g:26701:1: ( ( ruleDetailCode ) )
+            // InternalRoom.g:26702:1: ( ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26699:1: ( ruleDetailCode )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26700:1: ruleDetailCode
+            // InternalRoom.g:26702:1: ( ruleDetailCode )
+            // InternalRoom.g:26703:1: ruleDetailCode
             {
              before(grammarAccess.getTriggeredTransitionAccess().getActionDetailCodeParserRuleCall_13_1_0()); 
-            pushFollow(FOLLOW_ruleDetailCode_in_rule__TriggeredTransition__ActionAssignment_13_154014);
+            pushFollow(FOLLOW_2);
             ruleDetailCode();
 
             state._fsp--;
@@ -72037,20 +72037,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__NameAssignment_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26709:1: rule__GuardedTransition__NameAssignment_1 : ( RULE_ID ) ;
+    // InternalRoom.g:26712:1: rule__GuardedTransition__NameAssignment_1 : ( RULE_ID ) ;
     public final void rule__GuardedTransition__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26713:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26714:1: ( RULE_ID )
+            // InternalRoom.g:26716:1: ( ( RULE_ID ) )
+            // InternalRoom.g:26717:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26714:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26715:1: RULE_ID
+            // InternalRoom.g:26717:1: ( RULE_ID )
+            // InternalRoom.g:26718:1: RULE_ID
             {
              before(grammarAccess.getGuardedTransitionAccess().getNameIDTerminalRuleCall_1_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__GuardedTransition__NameAssignment_154045); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getGuardedTransitionAccess().getNameIDTerminalRuleCall_1_0()); 
 
             }
@@ -72074,20 +72074,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__FromAssignment_3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26724:1: rule__GuardedTransition__FromAssignment_3 : ( ruleTransitionTerminal ) ;
+    // InternalRoom.g:26727:1: rule__GuardedTransition__FromAssignment_3 : ( ruleTransitionTerminal ) ;
     public final void rule__GuardedTransition__FromAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26728:1: ( ( ruleTransitionTerminal ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26729:1: ( ruleTransitionTerminal )
+            // InternalRoom.g:26731:1: ( ( ruleTransitionTerminal ) )
+            // InternalRoom.g:26732:1: ( ruleTransitionTerminal )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26729:1: ( ruleTransitionTerminal )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26730:1: ruleTransitionTerminal
+            // InternalRoom.g:26732:1: ( ruleTransitionTerminal )
+            // InternalRoom.g:26733:1: ruleTransitionTerminal
             {
              before(grammarAccess.getGuardedTransitionAccess().getFromTransitionTerminalParserRuleCall_3_0()); 
-            pushFollow(FOLLOW_ruleTransitionTerminal_in_rule__GuardedTransition__FromAssignment_354076);
+            pushFollow(FOLLOW_2);
             ruleTransitionTerminal();
 
             state._fsp--;
@@ -72115,20 +72115,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__ToAssignment_5"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26739:1: rule__GuardedTransition__ToAssignment_5 : ( ruleTransitionTerminal ) ;
+    // InternalRoom.g:26742:1: rule__GuardedTransition__ToAssignment_5 : ( ruleTransitionTerminal ) ;
     public final void rule__GuardedTransition__ToAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26743:1: ( ( ruleTransitionTerminal ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26744:1: ( ruleTransitionTerminal )
+            // InternalRoom.g:26746:1: ( ( ruleTransitionTerminal ) )
+            // InternalRoom.g:26747:1: ( ruleTransitionTerminal )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26744:1: ( ruleTransitionTerminal )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26745:1: ruleTransitionTerminal
+            // InternalRoom.g:26747:1: ( ruleTransitionTerminal )
+            // InternalRoom.g:26748:1: ruleTransitionTerminal
             {
              before(grammarAccess.getGuardedTransitionAccess().getToTransitionTerminalParserRuleCall_5_0()); 
-            pushFollow(FOLLOW_ruleTransitionTerminal_in_rule__GuardedTransition__ToAssignment_554107);
+            pushFollow(FOLLOW_2);
             ruleTransitionTerminal();
 
             state._fsp--;
@@ -72156,20 +72156,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__DocuAssignment_6"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26754:1: rule__GuardedTransition__DocuAssignment_6 : ( ruleDocumentation ) ;
+    // InternalRoom.g:26757:1: rule__GuardedTransition__DocuAssignment_6 : ( ruleDocumentation ) ;
     public final void rule__GuardedTransition__DocuAssignment_6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26758:1: ( ( ruleDocumentation ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26759:1: ( ruleDocumentation )
+            // InternalRoom.g:26761:1: ( ( ruleDocumentation ) )
+            // InternalRoom.g:26762:1: ( ruleDocumentation )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26759:1: ( ruleDocumentation )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26760:1: ruleDocumentation
+            // InternalRoom.g:26762:1: ( ruleDocumentation )
+            // InternalRoom.g:26763:1: ruleDocumentation
             {
              before(grammarAccess.getGuardedTransitionAccess().getDocuDocumentationParserRuleCall_6_0()); 
-            pushFollow(FOLLOW_ruleDocumentation_in_rule__GuardedTransition__DocuAssignment_654138);
+            pushFollow(FOLLOW_2);
             ruleDocumentation();
 
             state._fsp--;
@@ -72197,20 +72197,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__GuardAssignment_9"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26769:1: rule__GuardedTransition__GuardAssignment_9 : ( ruleDetailCode ) ;
+    // InternalRoom.g:26772:1: rule__GuardedTransition__GuardAssignment_9 : ( ruleDetailCode ) ;
     public final void rule__GuardedTransition__GuardAssignment_9() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26773:1: ( ( ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26774:1: ( ruleDetailCode )
+            // InternalRoom.g:26776:1: ( ( ruleDetailCode ) )
+            // InternalRoom.g:26777:1: ( ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26774:1: ( ruleDetailCode )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26775:1: ruleDetailCode
+            // InternalRoom.g:26777:1: ( ruleDetailCode )
+            // InternalRoom.g:26778:1: ruleDetailCode
             {
              before(grammarAccess.getGuardedTransitionAccess().getGuardDetailCodeParserRuleCall_9_0()); 
-            pushFollow(FOLLOW_ruleDetailCode_in_rule__GuardedTransition__GuardAssignment_954169);
+            pushFollow(FOLLOW_2);
             ruleDetailCode();
 
             state._fsp--;
@@ -72238,20 +72238,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__GuardedTransition__ActionAssignment_10_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26784:1: rule__GuardedTransition__ActionAssignment_10_1 : ( ruleDetailCode ) ;
+    // InternalRoom.g:26787:1: rule__GuardedTransition__ActionAssignment_10_1 : ( ruleDetailCode ) ;
     public final void rule__GuardedTransition__ActionAssignment_10_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26788:1: ( ( ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26789:1: ( ruleDetailCode )
+            // InternalRoom.g:26791:1: ( ( ruleDetailCode ) )
+            // InternalRoom.g:26792:1: ( ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26789:1: ( ruleDetailCode )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26790:1: ruleDetailCode
+            // InternalRoom.g:26792:1: ( ruleDetailCode )
+            // InternalRoom.g:26793:1: ruleDetailCode
             {
              before(grammarAccess.getGuardedTransitionAccess().getActionDetailCodeParserRuleCall_10_1_0()); 
-            pushFollow(FOLLOW_ruleDetailCode_in_rule__GuardedTransition__ActionAssignment_10_154200);
+            pushFollow(FOLLOW_2);
             ruleDetailCode();
 
             state._fsp--;
@@ -72279,20 +72279,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__NameAssignment_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26799:1: rule__CPBranchTransition__NameAssignment_1 : ( RULE_ID ) ;
+    // InternalRoom.g:26802:1: rule__CPBranchTransition__NameAssignment_1 : ( RULE_ID ) ;
     public final void rule__CPBranchTransition__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26803:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26804:1: ( RULE_ID )
+            // InternalRoom.g:26806:1: ( ( RULE_ID ) )
+            // InternalRoom.g:26807:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26804:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26805:1: RULE_ID
+            // InternalRoom.g:26807:1: ( RULE_ID )
+            // InternalRoom.g:26808:1: RULE_ID
             {
              before(grammarAccess.getCPBranchTransitionAccess().getNameIDTerminalRuleCall_1_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__CPBranchTransition__NameAssignment_154231); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getCPBranchTransitionAccess().getNameIDTerminalRuleCall_1_0()); 
 
             }
@@ -72316,20 +72316,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__FromAssignment_3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26814:1: rule__CPBranchTransition__FromAssignment_3 : ( ruleTransitionTerminal ) ;
+    // InternalRoom.g:26817:1: rule__CPBranchTransition__FromAssignment_3 : ( ruleTransitionTerminal ) ;
     public final void rule__CPBranchTransition__FromAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26818:1: ( ( ruleTransitionTerminal ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26819:1: ( ruleTransitionTerminal )
+            // InternalRoom.g:26821:1: ( ( ruleTransitionTerminal ) )
+            // InternalRoom.g:26822:1: ( ruleTransitionTerminal )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26819:1: ( ruleTransitionTerminal )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26820:1: ruleTransitionTerminal
+            // InternalRoom.g:26822:1: ( ruleTransitionTerminal )
+            // InternalRoom.g:26823:1: ruleTransitionTerminal
             {
              before(grammarAccess.getCPBranchTransitionAccess().getFromTransitionTerminalParserRuleCall_3_0()); 
-            pushFollow(FOLLOW_ruleTransitionTerminal_in_rule__CPBranchTransition__FromAssignment_354262);
+            pushFollow(FOLLOW_2);
             ruleTransitionTerminal();
 
             state._fsp--;
@@ -72357,20 +72357,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__ToAssignment_5"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26829:1: rule__CPBranchTransition__ToAssignment_5 : ( ruleTransitionTerminal ) ;
+    // InternalRoom.g:26832:1: rule__CPBranchTransition__ToAssignment_5 : ( ruleTransitionTerminal ) ;
     public final void rule__CPBranchTransition__ToAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26833:1: ( ( ruleTransitionTerminal ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26834:1: ( ruleTransitionTerminal )
+            // InternalRoom.g:26836:1: ( ( ruleTransitionTerminal ) )
+            // InternalRoom.g:26837:1: ( ruleTransitionTerminal )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26834:1: ( ruleTransitionTerminal )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26835:1: ruleTransitionTerminal
+            // InternalRoom.g:26837:1: ( ruleTransitionTerminal )
+            // InternalRoom.g:26838:1: ruleTransitionTerminal
             {
              before(grammarAccess.getCPBranchTransitionAccess().getToTransitionTerminalParserRuleCall_5_0()); 
-            pushFollow(FOLLOW_ruleTransitionTerminal_in_rule__CPBranchTransition__ToAssignment_554293);
+            pushFollow(FOLLOW_2);
             ruleTransitionTerminal();
 
             state._fsp--;
@@ -72398,20 +72398,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__DocuAssignment_6"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26844:1: rule__CPBranchTransition__DocuAssignment_6 : ( ruleDocumentation ) ;
+    // InternalRoom.g:26847:1: rule__CPBranchTransition__DocuAssignment_6 : ( ruleDocumentation ) ;
     public final void rule__CPBranchTransition__DocuAssignment_6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26848:1: ( ( ruleDocumentation ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26849:1: ( ruleDocumentation )
+            // InternalRoom.g:26851:1: ( ( ruleDocumentation ) )
+            // InternalRoom.g:26852:1: ( ruleDocumentation )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26849:1: ( ruleDocumentation )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26850:1: ruleDocumentation
+            // InternalRoom.g:26852:1: ( ruleDocumentation )
+            // InternalRoom.g:26853:1: ruleDocumentation
             {
              before(grammarAccess.getCPBranchTransitionAccess().getDocuDocumentationParserRuleCall_6_0()); 
-            pushFollow(FOLLOW_ruleDocumentation_in_rule__CPBranchTransition__DocuAssignment_654324);
+            pushFollow(FOLLOW_2);
             ruleDocumentation();
 
             state._fsp--;
@@ -72439,20 +72439,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__ConditionAssignment_9"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26859:1: rule__CPBranchTransition__ConditionAssignment_9 : ( ruleDetailCode ) ;
+    // InternalRoom.g:26862:1: rule__CPBranchTransition__ConditionAssignment_9 : ( ruleDetailCode ) ;
     public final void rule__CPBranchTransition__ConditionAssignment_9() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26863:1: ( ( ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26864:1: ( ruleDetailCode )
+            // InternalRoom.g:26866:1: ( ( ruleDetailCode ) )
+            // InternalRoom.g:26867:1: ( ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26864:1: ( ruleDetailCode )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26865:1: ruleDetailCode
+            // InternalRoom.g:26867:1: ( ruleDetailCode )
+            // InternalRoom.g:26868:1: ruleDetailCode
             {
              before(grammarAccess.getCPBranchTransitionAccess().getConditionDetailCodeParserRuleCall_9_0()); 
-            pushFollow(FOLLOW_ruleDetailCode_in_rule__CPBranchTransition__ConditionAssignment_954355);
+            pushFollow(FOLLOW_2);
             ruleDetailCode();
 
             state._fsp--;
@@ -72480,20 +72480,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__CPBranchTransition__ActionAssignment_10_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26874:1: rule__CPBranchTransition__ActionAssignment_10_1 : ( ruleDetailCode ) ;
+    // InternalRoom.g:26877:1: rule__CPBranchTransition__ActionAssignment_10_1 : ( ruleDetailCode ) ;
     public final void rule__CPBranchTransition__ActionAssignment_10_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26878:1: ( ( ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26879:1: ( ruleDetailCode )
+            // InternalRoom.g:26881:1: ( ( ruleDetailCode ) )
+            // InternalRoom.g:26882:1: ( ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26879:1: ( ruleDetailCode )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26880:1: ruleDetailCode
+            // InternalRoom.g:26882:1: ( ruleDetailCode )
+            // InternalRoom.g:26883:1: ruleDetailCode
             {
              before(grammarAccess.getCPBranchTransitionAccess().getActionDetailCodeParserRuleCall_10_1_0()); 
-            pushFollow(FOLLOW_ruleDetailCode_in_rule__CPBranchTransition__ActionAssignment_10_154386);
+            pushFollow(FOLLOW_2);
             ruleDetailCode();
 
             state._fsp--;
@@ -72521,24 +72521,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedTransition__TargetAssignment_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26889:1: rule__RefinedTransition__TargetAssignment_1 : ( ( ruleFQN ) ) ;
+    // InternalRoom.g:26892:1: rule__RefinedTransition__TargetAssignment_1 : ( ( ruleFQN ) ) ;
     public final void rule__RefinedTransition__TargetAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26893:1: ( ( ( ruleFQN ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26894:1: ( ( ruleFQN ) )
+            // InternalRoom.g:26896:1: ( ( ( ruleFQN ) ) )
+            // InternalRoom.g:26897:1: ( ( ruleFQN ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26894:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26895:1: ( ruleFQN )
+            // InternalRoom.g:26897:1: ( ( ruleFQN ) )
+            // InternalRoom.g:26898:1: ( ruleFQN )
             {
              before(grammarAccess.getRefinedTransitionAccess().getTargetTransitionCrossReference_1_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26896:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26897:1: ruleFQN
+            // InternalRoom.g:26899:1: ( ruleFQN )
+            // InternalRoom.g:26900:1: ruleFQN
             {
              before(grammarAccess.getRefinedTransitionAccess().getTargetTransitionFQNParserRuleCall_1_0_1()); 
-            pushFollow(FOLLOW_ruleFQN_in_rule__RefinedTransition__TargetAssignment_154421);
+            pushFollow(FOLLOW_2);
             ruleFQN();
 
             state._fsp--;
@@ -72570,20 +72570,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedTransition__DocuAssignment_2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26908:1: rule__RefinedTransition__DocuAssignment_2 : ( ruleDocumentation ) ;
+    // InternalRoom.g:26911:1: rule__RefinedTransition__DocuAssignment_2 : ( ruleDocumentation ) ;
     public final void rule__RefinedTransition__DocuAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26912:1: ( ( ruleDocumentation ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26913:1: ( ruleDocumentation )
+            // InternalRoom.g:26915:1: ( ( ruleDocumentation ) )
+            // InternalRoom.g:26916:1: ( ruleDocumentation )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26913:1: ( ruleDocumentation )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26914:1: ruleDocumentation
+            // InternalRoom.g:26916:1: ( ruleDocumentation )
+            // InternalRoom.g:26917:1: ruleDocumentation
             {
              before(grammarAccess.getRefinedTransitionAccess().getDocuDocumentationParserRuleCall_2_0()); 
-            pushFollow(FOLLOW_ruleDocumentation_in_rule__RefinedTransition__DocuAssignment_254456);
+            pushFollow(FOLLOW_2);
             ruleDocumentation();
 
             state._fsp--;
@@ -72611,20 +72611,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RefinedTransition__ActionAssignment_5"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26923:1: rule__RefinedTransition__ActionAssignment_5 : ( ruleDetailCode ) ;
+    // InternalRoom.g:26926:1: rule__RefinedTransition__ActionAssignment_5 : ( ruleDetailCode ) ;
     public final void rule__RefinedTransition__ActionAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26927:1: ( ( ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26928:1: ( ruleDetailCode )
+            // InternalRoom.g:26930:1: ( ( ruleDetailCode ) )
+            // InternalRoom.g:26931:1: ( ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26928:1: ( ruleDetailCode )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26929:1: ruleDetailCode
+            // InternalRoom.g:26931:1: ( ruleDetailCode )
+            // InternalRoom.g:26932:1: ruleDetailCode
             {
              before(grammarAccess.getRefinedTransitionAccess().getActionDetailCodeParserRuleCall_5_0()); 
-            pushFollow(FOLLOW_ruleDetailCode_in_rule__RefinedTransition__ActionAssignment_554487);
+            pushFollow(FOLLOW_2);
             ruleDetailCode();
 
             state._fsp--;
@@ -72652,24 +72652,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StateTerminal__StateAssignment"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26938:1: rule__StateTerminal__StateAssignment : ( ( RULE_ID ) ) ;
+    // InternalRoom.g:26941:1: rule__StateTerminal__StateAssignment : ( ( RULE_ID ) ) ;
     public final void rule__StateTerminal__StateAssignment() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26942:1: ( ( ( RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26943:1: ( ( RULE_ID ) )
+            // InternalRoom.g:26945:1: ( ( ( RULE_ID ) ) )
+            // InternalRoom.g:26946:1: ( ( RULE_ID ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26943:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26944:1: ( RULE_ID )
+            // InternalRoom.g:26946:1: ( ( RULE_ID ) )
+            // InternalRoom.g:26947:1: ( RULE_ID )
             {
              before(grammarAccess.getStateTerminalAccess().getStateStateCrossReference_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26945:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26946:1: RULE_ID
+            // InternalRoom.g:26948:1: ( RULE_ID )
+            // InternalRoom.g:26949:1: RULE_ID
             {
              before(grammarAccess.getStateTerminalAccess().getStateStateIDTerminalRuleCall_0_1()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__StateTerminal__StateAssignment54522); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getStateTerminalAccess().getStateStateIDTerminalRuleCall_0_1()); 
 
             }
@@ -72697,24 +72697,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TrPointTerminal__TrPointAssignment_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26957:1: rule__TrPointTerminal__TrPointAssignment_1 : ( ( RULE_ID ) ) ;
+    // InternalRoom.g:26960:1: rule__TrPointTerminal__TrPointAssignment_1 : ( ( RULE_ID ) ) ;
     public final void rule__TrPointTerminal__TrPointAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26961:1: ( ( ( RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26962:1: ( ( RULE_ID ) )
+            // InternalRoom.g:26964:1: ( ( ( RULE_ID ) ) )
+            // InternalRoom.g:26965:1: ( ( RULE_ID ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26962:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26963:1: ( RULE_ID )
+            // InternalRoom.g:26965:1: ( ( RULE_ID ) )
+            // InternalRoom.g:26966:1: ( RULE_ID )
             {
              before(grammarAccess.getTrPointTerminalAccess().getTrPointTrPointCrossReference_1_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26964:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26965:1: RULE_ID
+            // InternalRoom.g:26967:1: ( RULE_ID )
+            // InternalRoom.g:26968:1: RULE_ID
             {
              before(grammarAccess.getTrPointTerminalAccess().getTrPointTrPointIDTerminalRuleCall_1_0_1()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__TrPointTerminal__TrPointAssignment_154561); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getTrPointTerminalAccess().getTrPointTrPointIDTerminalRuleCall_1_0_1()); 
 
             }
@@ -72742,24 +72742,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubStateTrPointTerminal__TrPointAssignment_0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26976:1: rule__SubStateTrPointTerminal__TrPointAssignment_0 : ( ( RULE_ID ) ) ;
+    // InternalRoom.g:26979:1: rule__SubStateTrPointTerminal__TrPointAssignment_0 : ( ( RULE_ID ) ) ;
     public final void rule__SubStateTrPointTerminal__TrPointAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26980:1: ( ( ( RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26981:1: ( ( RULE_ID ) )
+            // InternalRoom.g:26983:1: ( ( ( RULE_ID ) ) )
+            // InternalRoom.g:26984:1: ( ( RULE_ID ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26981:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26982:1: ( RULE_ID )
+            // InternalRoom.g:26984:1: ( ( RULE_ID ) )
+            // InternalRoom.g:26985:1: ( RULE_ID )
             {
              before(grammarAccess.getSubStateTrPointTerminalAccess().getTrPointTrPointCrossReference_0_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26983:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26984:1: RULE_ID
+            // InternalRoom.g:26986:1: ( RULE_ID )
+            // InternalRoom.g:26987:1: RULE_ID
             {
              before(grammarAccess.getSubStateTrPointTerminalAccess().getTrPointTrPointIDTerminalRuleCall_0_0_1()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__SubStateTrPointTerminal__TrPointAssignment_054600); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getSubStateTrPointTerminalAccess().getTrPointTrPointIDTerminalRuleCall_0_0_1()); 
 
             }
@@ -72787,24 +72787,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SubStateTrPointTerminal__StateAssignment_2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26995:1: rule__SubStateTrPointTerminal__StateAssignment_2 : ( ( RULE_ID ) ) ;
+    // InternalRoom.g:26998:1: rule__SubStateTrPointTerminal__StateAssignment_2 : ( ( RULE_ID ) ) ;
     public final void rule__SubStateTrPointTerminal__StateAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:26999:1: ( ( ( RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27000:1: ( ( RULE_ID ) )
+            // InternalRoom.g:27002:1: ( ( ( RULE_ID ) ) )
+            // InternalRoom.g:27003:1: ( ( RULE_ID ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27000:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27001:1: ( RULE_ID )
+            // InternalRoom.g:27003:1: ( ( RULE_ID ) )
+            // InternalRoom.g:27004:1: ( RULE_ID )
             {
              before(grammarAccess.getSubStateTrPointTerminalAccess().getStateStateCrossReference_2_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27002:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27003:1: RULE_ID
+            // InternalRoom.g:27005:1: ( RULE_ID )
+            // InternalRoom.g:27006:1: RULE_ID
             {
              before(grammarAccess.getSubStateTrPointTerminalAccess().getStateStateIDTerminalRuleCall_2_0_1()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__SubStateTrPointTerminal__StateAssignment_254639); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getSubStateTrPointTerminalAccess().getStateStateIDTerminalRuleCall_2_0_1()); 
 
             }
@@ -72832,24 +72832,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ChoicepointTerminal__CpAssignment_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27014:1: rule__ChoicepointTerminal__CpAssignment_1 : ( ( RULE_ID ) ) ;
+    // InternalRoom.g:27017:1: rule__ChoicepointTerminal__CpAssignment_1 : ( ( RULE_ID ) ) ;
     public final void rule__ChoicepointTerminal__CpAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27018:1: ( ( ( RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27019:1: ( ( RULE_ID ) )
+            // InternalRoom.g:27021:1: ( ( ( RULE_ID ) ) )
+            // InternalRoom.g:27022:1: ( ( RULE_ID ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27019:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27020:1: ( RULE_ID )
+            // InternalRoom.g:27022:1: ( ( RULE_ID ) )
+            // InternalRoom.g:27023:1: ( RULE_ID )
             {
              before(grammarAccess.getChoicepointTerminalAccess().getCpChoicePointCrossReference_1_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27021:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27022:1: RULE_ID
+            // InternalRoom.g:27024:1: ( RULE_ID )
+            // InternalRoom.g:27025:1: RULE_ID
             {
              before(grammarAccess.getChoicepointTerminalAccess().getCpChoicePointIDTerminalRuleCall_1_0_1()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__ChoicepointTerminal__CpAssignment_154678); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getChoicepointTerminalAccess().getCpChoicePointIDTerminalRuleCall_1_0_1()); 
 
             }
@@ -72877,20 +72877,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Trigger__MsgFromIfPairsAssignment_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27033:1: rule__Trigger__MsgFromIfPairsAssignment_1 : ( ruleMessageFromIf ) ;
+    // InternalRoom.g:27036:1: rule__Trigger__MsgFromIfPairsAssignment_1 : ( ruleMessageFromIf ) ;
     public final void rule__Trigger__MsgFromIfPairsAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27037:1: ( ( ruleMessageFromIf ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27038:1: ( ruleMessageFromIf )
+            // InternalRoom.g:27040:1: ( ( ruleMessageFromIf ) )
+            // InternalRoom.g:27041:1: ( ruleMessageFromIf )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27038:1: ( ruleMessageFromIf )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27039:1: ruleMessageFromIf
+            // InternalRoom.g:27041:1: ( ruleMessageFromIf )
+            // InternalRoom.g:27042:1: ruleMessageFromIf
             {
              before(grammarAccess.getTriggerAccess().getMsgFromIfPairsMessageFromIfParserRuleCall_1_0()); 
-            pushFollow(FOLLOW_ruleMessageFromIf_in_rule__Trigger__MsgFromIfPairsAssignment_154713);
+            pushFollow(FOLLOW_2);
             ruleMessageFromIf();
 
             state._fsp--;
@@ -72918,20 +72918,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Trigger__MsgFromIfPairsAssignment_2_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27048:1: rule__Trigger__MsgFromIfPairsAssignment_2_1 : ( ruleMessageFromIf ) ;
+    // InternalRoom.g:27051:1: rule__Trigger__MsgFromIfPairsAssignment_2_1 : ( ruleMessageFromIf ) ;
     public final void rule__Trigger__MsgFromIfPairsAssignment_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27052:1: ( ( ruleMessageFromIf ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27053:1: ( ruleMessageFromIf )
+            // InternalRoom.g:27055:1: ( ( ruleMessageFromIf ) )
+            // InternalRoom.g:27056:1: ( ruleMessageFromIf )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27053:1: ( ruleMessageFromIf )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27054:1: ruleMessageFromIf
+            // InternalRoom.g:27056:1: ( ruleMessageFromIf )
+            // InternalRoom.g:27057:1: ruleMessageFromIf
             {
              before(grammarAccess.getTriggerAccess().getMsgFromIfPairsMessageFromIfParserRuleCall_2_1_0()); 
-            pushFollow(FOLLOW_ruleMessageFromIf_in_rule__Trigger__MsgFromIfPairsAssignment_2_154744);
+            pushFollow(FOLLOW_2);
             ruleMessageFromIf();
 
             state._fsp--;
@@ -72959,20 +72959,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Trigger__GuardAssignment_3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27063:1: rule__Trigger__GuardAssignment_3 : ( ruleGuard ) ;
+    // InternalRoom.g:27066:1: rule__Trigger__GuardAssignment_3 : ( ruleGuard ) ;
     public final void rule__Trigger__GuardAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27067:1: ( ( ruleGuard ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27068:1: ( ruleGuard )
+            // InternalRoom.g:27070:1: ( ( ruleGuard ) )
+            // InternalRoom.g:27071:1: ( ruleGuard )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27068:1: ( ruleGuard )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27069:1: ruleGuard
+            // InternalRoom.g:27071:1: ( ruleGuard )
+            // InternalRoom.g:27072:1: ruleGuard
             {
              before(grammarAccess.getTriggerAccess().getGuardGuardParserRuleCall_3_0()); 
-            pushFollow(FOLLOW_ruleGuard_in_rule__Trigger__GuardAssignment_354775);
+            pushFollow(FOLLOW_2);
             ruleGuard();
 
             state._fsp--;
@@ -73000,24 +73000,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MessageFromIf__MessageAssignment_0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27078:1: rule__MessageFromIf__MessageAssignment_0 : ( ( RULE_ID ) ) ;
+    // InternalRoom.g:27081:1: rule__MessageFromIf__MessageAssignment_0 : ( ( RULE_ID ) ) ;
     public final void rule__MessageFromIf__MessageAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27082:1: ( ( ( RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27083:1: ( ( RULE_ID ) )
+            // InternalRoom.g:27085:1: ( ( ( RULE_ID ) ) )
+            // InternalRoom.g:27086:1: ( ( RULE_ID ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27083:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27084:1: ( RULE_ID )
+            // InternalRoom.g:27086:1: ( ( RULE_ID ) )
+            // InternalRoom.g:27087:1: ( RULE_ID )
             {
              before(grammarAccess.getMessageFromIfAccess().getMessageEObjectCrossReference_0_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27085:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27086:1: RULE_ID
+            // InternalRoom.g:27088:1: ( RULE_ID )
+            // InternalRoom.g:27089:1: RULE_ID
             {
              before(grammarAccess.getMessageFromIfAccess().getMessageEObjectIDTerminalRuleCall_0_0_1()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__MessageFromIf__MessageAssignment_054810); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getMessageFromIfAccess().getMessageEObjectIDTerminalRuleCall_0_0_1()); 
 
             }
@@ -73045,24 +73045,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MessageFromIf__FromAssignment_2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27097:1: rule__MessageFromIf__FromAssignment_2 : ( ( RULE_ID ) ) ;
+    // InternalRoom.g:27100:1: rule__MessageFromIf__FromAssignment_2 : ( ( RULE_ID ) ) ;
     public final void rule__MessageFromIf__FromAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27101:1: ( ( ( RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27102:1: ( ( RULE_ID ) )
+            // InternalRoom.g:27104:1: ( ( ( RULE_ID ) ) )
+            // InternalRoom.g:27105:1: ( ( RULE_ID ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27102:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27103:1: ( RULE_ID )
+            // InternalRoom.g:27105:1: ( ( RULE_ID ) )
+            // InternalRoom.g:27106:1: ( RULE_ID )
             {
              before(grammarAccess.getMessageFromIfAccess().getFromAbstractInterfaceItemCrossReference_2_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27104:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27105:1: RULE_ID
+            // InternalRoom.g:27107:1: ( RULE_ID )
+            // InternalRoom.g:27108:1: RULE_ID
             {
              before(grammarAccess.getMessageFromIfAccess().getFromAbstractInterfaceItemIDTerminalRuleCall_2_0_1()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__MessageFromIf__FromAssignment_254849); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getMessageFromIfAccess().getFromAbstractInterfaceItemIDTerminalRuleCall_2_0_1()); 
 
             }
@@ -73090,20 +73090,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Guard__GuardAssignment_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27116:1: rule__Guard__GuardAssignment_1 : ( ruleDetailCode ) ;
+    // InternalRoom.g:27119:1: rule__Guard__GuardAssignment_1 : ( ruleDetailCode ) ;
     public final void rule__Guard__GuardAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27120:1: ( ( ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27121:1: ( ruleDetailCode )
+            // InternalRoom.g:27123:1: ( ( ruleDetailCode ) )
+            // InternalRoom.g:27124:1: ( ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27121:1: ( ruleDetailCode )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27122:1: ruleDetailCode
+            // InternalRoom.g:27124:1: ( ruleDetailCode )
+            // InternalRoom.g:27125:1: ruleDetailCode
             {
              before(grammarAccess.getGuardAccess().getGuardDetailCodeParserRuleCall_1_0()); 
-            pushFollow(FOLLOW_ruleDetailCode_in_rule__Guard__GuardAssignment_154884);
+            pushFollow(FOLLOW_2);
             ruleDetailCode();
 
             state._fsp--;
@@ -73131,20 +73131,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ProtocolSemantics__RulesAssignment_3"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27131:1: rule__ProtocolSemantics__RulesAssignment_3 : ( ruleSemanticsRule ) ;
+    // InternalRoom.g:27134:1: rule__ProtocolSemantics__RulesAssignment_3 : ( ruleSemanticsRule ) ;
     public final void rule__ProtocolSemantics__RulesAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27135:1: ( ( ruleSemanticsRule ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27136:1: ( ruleSemanticsRule )
+            // InternalRoom.g:27138:1: ( ( ruleSemanticsRule ) )
+            // InternalRoom.g:27139:1: ( ruleSemanticsRule )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27136:1: ( ruleSemanticsRule )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27137:1: ruleSemanticsRule
+            // InternalRoom.g:27139:1: ( ruleSemanticsRule )
+            // InternalRoom.g:27140:1: ruleSemanticsRule
             {
              before(grammarAccess.getProtocolSemanticsAccess().getRulesSemanticsRuleParserRuleCall_3_0()); 
-            pushFollow(FOLLOW_ruleSemanticsRule_in_rule__ProtocolSemantics__RulesAssignment_354915);
+            pushFollow(FOLLOW_2);
             ruleSemanticsRule();
 
             state._fsp--;
@@ -73172,24 +73172,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__MsgAssignment_2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27146:1: rule__InSemanticsRule__MsgAssignment_2 : ( ( RULE_ID ) ) ;
+    // InternalRoom.g:27149:1: rule__InSemanticsRule__MsgAssignment_2 : ( ( RULE_ID ) ) ;
     public final void rule__InSemanticsRule__MsgAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27150:1: ( ( ( RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27151:1: ( ( RULE_ID ) )
+            // InternalRoom.g:27153:1: ( ( ( RULE_ID ) ) )
+            // InternalRoom.g:27154:1: ( ( RULE_ID ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27151:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27152:1: ( RULE_ID )
+            // InternalRoom.g:27154:1: ( ( RULE_ID ) )
+            // InternalRoom.g:27155:1: ( RULE_ID )
             {
              before(grammarAccess.getInSemanticsRuleAccess().getMsgEObjectCrossReference_2_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27153:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27154:1: RULE_ID
+            // InternalRoom.g:27156:1: ( RULE_ID )
+            // InternalRoom.g:27157:1: RULE_ID
             {
              before(grammarAccess.getInSemanticsRuleAccess().getMsgEObjectIDTerminalRuleCall_2_0_1()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__InSemanticsRule__MsgAssignment_254950); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getInSemanticsRuleAccess().getMsgEObjectIDTerminalRuleCall_2_0_1()); 
 
             }
@@ -73217,20 +73217,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__FollowUpsAssignment_3_1_0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27165:1: rule__InSemanticsRule__FollowUpsAssignment_3_1_0 : ( ruleSemanticsRule ) ;
+    // InternalRoom.g:27168:1: rule__InSemanticsRule__FollowUpsAssignment_3_1_0 : ( ruleSemanticsRule ) ;
     public final void rule__InSemanticsRule__FollowUpsAssignment_3_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27169:1: ( ( ruleSemanticsRule ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27170:1: ( ruleSemanticsRule )
+            // InternalRoom.g:27172:1: ( ( ruleSemanticsRule ) )
+            // InternalRoom.g:27173:1: ( ruleSemanticsRule )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27170:1: ( ruleSemanticsRule )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27171:1: ruleSemanticsRule
+            // InternalRoom.g:27173:1: ( ruleSemanticsRule )
+            // InternalRoom.g:27174:1: ruleSemanticsRule
             {
              before(grammarAccess.getInSemanticsRuleAccess().getFollowUpsSemanticsRuleParserRuleCall_3_1_0_0()); 
-            pushFollow(FOLLOW_ruleSemanticsRule_in_rule__InSemanticsRule__FollowUpsAssignment_3_1_054985);
+            pushFollow(FOLLOW_2);
             ruleSemanticsRule();
 
             state._fsp--;
@@ -73258,20 +73258,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__FollowUpsAssignment_3_1_1_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27180:1: rule__InSemanticsRule__FollowUpsAssignment_3_1_1_1 : ( ruleSemanticsRule ) ;
+    // InternalRoom.g:27183:1: rule__InSemanticsRule__FollowUpsAssignment_3_1_1_1 : ( ruleSemanticsRule ) ;
     public final void rule__InSemanticsRule__FollowUpsAssignment_3_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27184:1: ( ( ruleSemanticsRule ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27185:1: ( ruleSemanticsRule )
+            // InternalRoom.g:27187:1: ( ( ruleSemanticsRule ) )
+            // InternalRoom.g:27188:1: ( ruleSemanticsRule )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27185:1: ( ruleSemanticsRule )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27186:1: ruleSemanticsRule
+            // InternalRoom.g:27188:1: ( ruleSemanticsRule )
+            // InternalRoom.g:27189:1: ruleSemanticsRule
             {
              before(grammarAccess.getInSemanticsRuleAccess().getFollowUpsSemanticsRuleParserRuleCall_3_1_1_1_0()); 
-            pushFollow(FOLLOW_ruleSemanticsRule_in_rule__InSemanticsRule__FollowUpsAssignment_3_1_1_155016);
+            pushFollow(FOLLOW_2);
             ruleSemanticsRule();
 
             state._fsp--;
@@ -73299,20 +73299,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__InSemanticsRule__FollowUpsAssignment_3_1_1_2_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27195:1: rule__InSemanticsRule__FollowUpsAssignment_3_1_1_2_1 : ( ruleSemanticsRule ) ;
+    // InternalRoom.g:27198:1: rule__InSemanticsRule__FollowUpsAssignment_3_1_1_2_1 : ( ruleSemanticsRule ) ;
     public final void rule__InSemanticsRule__FollowUpsAssignment_3_1_1_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27199:1: ( ( ruleSemanticsRule ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27200:1: ( ruleSemanticsRule )
+            // InternalRoom.g:27202:1: ( ( ruleSemanticsRule ) )
+            // InternalRoom.g:27203:1: ( ruleSemanticsRule )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27200:1: ( ruleSemanticsRule )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27201:1: ruleSemanticsRule
+            // InternalRoom.g:27203:1: ( ruleSemanticsRule )
+            // InternalRoom.g:27204:1: ruleSemanticsRule
             {
              before(grammarAccess.getInSemanticsRuleAccess().getFollowUpsSemanticsRuleParserRuleCall_3_1_1_2_1_0()); 
-            pushFollow(FOLLOW_ruleSemanticsRule_in_rule__InSemanticsRule__FollowUpsAssignment_3_1_1_2_155047);
+            pushFollow(FOLLOW_2);
             ruleSemanticsRule();
 
             state._fsp--;
@@ -73340,24 +73340,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__MsgAssignment_2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27210:1: rule__OutSemanticsRule__MsgAssignment_2 : ( ( RULE_ID ) ) ;
+    // InternalRoom.g:27213:1: rule__OutSemanticsRule__MsgAssignment_2 : ( ( RULE_ID ) ) ;
     public final void rule__OutSemanticsRule__MsgAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27214:1: ( ( ( RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27215:1: ( ( RULE_ID ) )
+            // InternalRoom.g:27217:1: ( ( ( RULE_ID ) ) )
+            // InternalRoom.g:27218:1: ( ( RULE_ID ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27215:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27216:1: ( RULE_ID )
+            // InternalRoom.g:27218:1: ( ( RULE_ID ) )
+            // InternalRoom.g:27219:1: ( RULE_ID )
             {
              before(grammarAccess.getOutSemanticsRuleAccess().getMsgEObjectCrossReference_2_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27217:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27218:1: RULE_ID
+            // InternalRoom.g:27220:1: ( RULE_ID )
+            // InternalRoom.g:27221:1: RULE_ID
             {
              before(grammarAccess.getOutSemanticsRuleAccess().getMsgEObjectIDTerminalRuleCall_2_0_1()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__OutSemanticsRule__MsgAssignment_255082); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getOutSemanticsRuleAccess().getMsgEObjectIDTerminalRuleCall_2_0_1()); 
 
             }
@@ -73385,20 +73385,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__FollowUpsAssignment_3_1_0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27229:1: rule__OutSemanticsRule__FollowUpsAssignment_3_1_0 : ( ruleSemanticsRule ) ;
+    // InternalRoom.g:27232:1: rule__OutSemanticsRule__FollowUpsAssignment_3_1_0 : ( ruleSemanticsRule ) ;
     public final void rule__OutSemanticsRule__FollowUpsAssignment_3_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27233:1: ( ( ruleSemanticsRule ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27234:1: ( ruleSemanticsRule )
+            // InternalRoom.g:27236:1: ( ( ruleSemanticsRule ) )
+            // InternalRoom.g:27237:1: ( ruleSemanticsRule )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27234:1: ( ruleSemanticsRule )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27235:1: ruleSemanticsRule
+            // InternalRoom.g:27237:1: ( ruleSemanticsRule )
+            // InternalRoom.g:27238:1: ruleSemanticsRule
             {
              before(grammarAccess.getOutSemanticsRuleAccess().getFollowUpsSemanticsRuleParserRuleCall_3_1_0_0()); 
-            pushFollow(FOLLOW_ruleSemanticsRule_in_rule__OutSemanticsRule__FollowUpsAssignment_3_1_055117);
+            pushFollow(FOLLOW_2);
             ruleSemanticsRule();
 
             state._fsp--;
@@ -73426,20 +73426,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27244:1: rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_1 : ( ruleSemanticsRule ) ;
+    // InternalRoom.g:27247:1: rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_1 : ( ruleSemanticsRule ) ;
     public final void rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27248:1: ( ( ruleSemanticsRule ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27249:1: ( ruleSemanticsRule )
+            // InternalRoom.g:27251:1: ( ( ruleSemanticsRule ) )
+            // InternalRoom.g:27252:1: ( ruleSemanticsRule )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27249:1: ( ruleSemanticsRule )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27250:1: ruleSemanticsRule
+            // InternalRoom.g:27252:1: ( ruleSemanticsRule )
+            // InternalRoom.g:27253:1: ruleSemanticsRule
             {
              before(grammarAccess.getOutSemanticsRuleAccess().getFollowUpsSemanticsRuleParserRuleCall_3_1_1_1_0()); 
-            pushFollow(FOLLOW_ruleSemanticsRule_in_rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_155148);
+            pushFollow(FOLLOW_2);
             ruleSemanticsRule();
 
             state._fsp--;
@@ -73467,20 +73467,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_2_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27259:1: rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_2_1 : ( ruleSemanticsRule ) ;
+    // InternalRoom.g:27262:1: rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_2_1 : ( ruleSemanticsRule ) ;
     public final void rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27263:1: ( ( ruleSemanticsRule ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27264:1: ( ruleSemanticsRule )
+            // InternalRoom.g:27266:1: ( ( ruleSemanticsRule ) )
+            // InternalRoom.g:27267:1: ( ruleSemanticsRule )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27264:1: ( ruleSemanticsRule )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27265:1: ruleSemanticsRule
+            // InternalRoom.g:27267:1: ( ruleSemanticsRule )
+            // InternalRoom.g:27268:1: ruleSemanticsRule
             {
              before(grammarAccess.getOutSemanticsRuleAccess().getFollowUpsSemanticsRuleParserRuleCall_3_1_1_2_1_0()); 
-            pushFollow(FOLLOW_ruleSemanticsRule_in_rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_2_155179);
+            pushFollow(FOLLOW_2);
             ruleSemanticsRule();
 
             state._fsp--;
@@ -73508,24 +73508,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Annotation__TypeAssignment_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27274:1: rule__Annotation__TypeAssignment_1 : ( ( ruleFQN ) ) ;
+    // InternalRoom.g:27277:1: rule__Annotation__TypeAssignment_1 : ( ( ruleFQN ) ) ;
     public final void rule__Annotation__TypeAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27278:1: ( ( ( ruleFQN ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27279:1: ( ( ruleFQN ) )
+            // InternalRoom.g:27281:1: ( ( ( ruleFQN ) ) )
+            // InternalRoom.g:27282:1: ( ( ruleFQN ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27279:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27280:1: ( ruleFQN )
+            // InternalRoom.g:27282:1: ( ( ruleFQN ) )
+            // InternalRoom.g:27283:1: ( ruleFQN )
             {
              before(grammarAccess.getAnnotationAccess().getTypeAnnotationTypeCrossReference_1_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27281:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27282:1: ruleFQN
+            // InternalRoom.g:27284:1: ( ruleFQN )
+            // InternalRoom.g:27285:1: ruleFQN
             {
              before(grammarAccess.getAnnotationAccess().getTypeAnnotationTypeFQNParserRuleCall_1_0_1()); 
-            pushFollow(FOLLOW_ruleFQN_in_rule__Annotation__TypeAssignment_155214);
+            pushFollow(FOLLOW_2);
             ruleFQN();
 
             state._fsp--;
@@ -73557,20 +73557,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Annotation__AttributesAssignment_2_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27293:1: rule__Annotation__AttributesAssignment_2_1 : ( ruleKeyValue ) ;
+    // InternalRoom.g:27296:1: rule__Annotation__AttributesAssignment_2_1 : ( ruleKeyValue ) ;
     public final void rule__Annotation__AttributesAssignment_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27297:1: ( ( ruleKeyValue ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27298:1: ( ruleKeyValue )
+            // InternalRoom.g:27300:1: ( ( ruleKeyValue ) )
+            // InternalRoom.g:27301:1: ( ruleKeyValue )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27298:1: ( ruleKeyValue )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27299:1: ruleKeyValue
+            // InternalRoom.g:27301:1: ( ruleKeyValue )
+            // InternalRoom.g:27302:1: ruleKeyValue
             {
              before(grammarAccess.getAnnotationAccess().getAttributesKeyValueParserRuleCall_2_1_0()); 
-            pushFollow(FOLLOW_ruleKeyValue_in_rule__Annotation__AttributesAssignment_2_155249);
+            pushFollow(FOLLOW_2);
             ruleKeyValue();
 
             state._fsp--;
@@ -73598,20 +73598,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Annotation__AttributesAssignment_2_2_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27308:1: rule__Annotation__AttributesAssignment_2_2_1 : ( ruleKeyValue ) ;
+    // InternalRoom.g:27311:1: rule__Annotation__AttributesAssignment_2_2_1 : ( ruleKeyValue ) ;
     public final void rule__Annotation__AttributesAssignment_2_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27312:1: ( ( ruleKeyValue ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27313:1: ( ruleKeyValue )
+            // InternalRoom.g:27315:1: ( ( ruleKeyValue ) )
+            // InternalRoom.g:27316:1: ( ruleKeyValue )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27313:1: ( ruleKeyValue )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27314:1: ruleKeyValue
+            // InternalRoom.g:27316:1: ( ruleKeyValue )
+            // InternalRoom.g:27317:1: ruleKeyValue
             {
              before(grammarAccess.getAnnotationAccess().getAttributesKeyValueParserRuleCall_2_2_1_0()); 
-            pushFollow(FOLLOW_ruleKeyValue_in_rule__Annotation__AttributesAssignment_2_2_155280);
+            pushFollow(FOLLOW_2);
             ruleKeyValue();
 
             state._fsp--;
@@ -73639,20 +73639,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__KeyValue__KeyAssignment_0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27323:1: rule__KeyValue__KeyAssignment_0 : ( RULE_ID ) ;
+    // InternalRoom.g:27326:1: rule__KeyValue__KeyAssignment_0 : ( RULE_ID ) ;
     public final void rule__KeyValue__KeyAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27327:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27328:1: ( RULE_ID )
+            // InternalRoom.g:27330:1: ( ( RULE_ID ) )
+            // InternalRoom.g:27331:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27328:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27329:1: RULE_ID
+            // InternalRoom.g:27331:1: ( RULE_ID )
+            // InternalRoom.g:27332:1: RULE_ID
             {
              before(grammarAccess.getKeyValueAccess().getKeyIDTerminalRuleCall_0_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__KeyValue__KeyAssignment_055311); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getKeyValueAccess().getKeyIDTerminalRuleCall_0_0()); 
 
             }
@@ -73676,20 +73676,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__KeyValue__ValueAssignment_2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27338:1: rule__KeyValue__ValueAssignment_2 : ( ruleLiteral ) ;
+    // InternalRoom.g:27341:1: rule__KeyValue__ValueAssignment_2 : ( ruleLiteral ) ;
     public final void rule__KeyValue__ValueAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27342:1: ( ( ruleLiteral ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27343:1: ( ruleLiteral )
+            // InternalRoom.g:27345:1: ( ( ruleLiteral ) )
+            // InternalRoom.g:27346:1: ( ruleLiteral )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27343:1: ( ruleLiteral )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27344:1: ruleLiteral
+            // InternalRoom.g:27346:1: ( ruleLiteral )
+            // InternalRoom.g:27347:1: ruleLiteral
             {
              before(grammarAccess.getKeyValueAccess().getValueLiteralParserRuleCall_2_0()); 
-            pushFollow(FOLLOW_ruleLiteral_in_rule__KeyValue__ValueAssignment_255342);
+            pushFollow(FOLLOW_2);
             ruleLiteral();
 
             state._fsp--;
@@ -73717,20 +73717,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AnnotationType__NameAssignment_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27353:1: rule__AnnotationType__NameAssignment_1 : ( RULE_ID ) ;
+    // InternalRoom.g:27356:1: rule__AnnotationType__NameAssignment_1 : ( RULE_ID ) ;
     public final void rule__AnnotationType__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27357:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27358:1: ( RULE_ID )
+            // InternalRoom.g:27360:1: ( ( RULE_ID ) )
+            // InternalRoom.g:27361:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27358:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27359:1: RULE_ID
+            // InternalRoom.g:27361:1: ( RULE_ID )
+            // InternalRoom.g:27362:1: RULE_ID
             {
              before(grammarAccess.getAnnotationTypeAccess().getNameIDTerminalRuleCall_1_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__AnnotationType__NameAssignment_155373); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getAnnotationTypeAccess().getNameIDTerminalRuleCall_1_0()); 
 
             }
@@ -73754,20 +73754,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AnnotationType__DocuAssignment_2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27368:1: rule__AnnotationType__DocuAssignment_2 : ( ruleDocumentation ) ;
+    // InternalRoom.g:27371:1: rule__AnnotationType__DocuAssignment_2 : ( ruleDocumentation ) ;
     public final void rule__AnnotationType__DocuAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27372:1: ( ( ruleDocumentation ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27373:1: ( ruleDocumentation )
+            // InternalRoom.g:27375:1: ( ( ruleDocumentation ) )
+            // InternalRoom.g:27376:1: ( ruleDocumentation )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27373:1: ( ruleDocumentation )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27374:1: ruleDocumentation
+            // InternalRoom.g:27376:1: ( ruleDocumentation )
+            // InternalRoom.g:27377:1: ruleDocumentation
             {
              before(grammarAccess.getAnnotationTypeAccess().getDocuDocumentationParserRuleCall_2_0()); 
-            pushFollow(FOLLOW_ruleDocumentation_in_rule__AnnotationType__DocuAssignment_255404);
+            pushFollow(FOLLOW_2);
             ruleDocumentation();
 
             state._fsp--;
@@ -73795,20 +73795,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AnnotationType__TargetsAssignment_6_0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27383:1: rule__AnnotationType__TargetsAssignment_6_0 : ( ruleAnnotationTargetType ) ;
+    // InternalRoom.g:27386:1: rule__AnnotationType__TargetsAssignment_6_0 : ( ruleAnnotationTargetType ) ;
     public final void rule__AnnotationType__TargetsAssignment_6_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27387:1: ( ( ruleAnnotationTargetType ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27388:1: ( ruleAnnotationTargetType )
+            // InternalRoom.g:27390:1: ( ( ruleAnnotationTargetType ) )
+            // InternalRoom.g:27391:1: ( ruleAnnotationTargetType )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27388:1: ( ruleAnnotationTargetType )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27389:1: ruleAnnotationTargetType
+            // InternalRoom.g:27391:1: ( ruleAnnotationTargetType )
+            // InternalRoom.g:27392:1: ruleAnnotationTargetType
             {
              before(grammarAccess.getAnnotationTypeAccess().getTargetsAnnotationTargetTypeParserRuleCall_6_0_0()); 
-            pushFollow(FOLLOW_ruleAnnotationTargetType_in_rule__AnnotationType__TargetsAssignment_6_055435);
+            pushFollow(FOLLOW_2);
             ruleAnnotationTargetType();
 
             state._fsp--;
@@ -73836,20 +73836,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AnnotationType__TargetsAssignment_6_1_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27398:1: rule__AnnotationType__TargetsAssignment_6_1_1 : ( ruleAnnotationTargetType ) ;
+    // InternalRoom.g:27401:1: rule__AnnotationType__TargetsAssignment_6_1_1 : ( ruleAnnotationTargetType ) ;
     public final void rule__AnnotationType__TargetsAssignment_6_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27402:1: ( ( ruleAnnotationTargetType ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27403:1: ( ruleAnnotationTargetType )
+            // InternalRoom.g:27405:1: ( ( ruleAnnotationTargetType ) )
+            // InternalRoom.g:27406:1: ( ruleAnnotationTargetType )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27403:1: ( ruleAnnotationTargetType )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27404:1: ruleAnnotationTargetType
+            // InternalRoom.g:27406:1: ( ruleAnnotationTargetType )
+            // InternalRoom.g:27407:1: ruleAnnotationTargetType
             {
              before(grammarAccess.getAnnotationTypeAccess().getTargetsAnnotationTargetTypeParserRuleCall_6_1_1_0()); 
-            pushFollow(FOLLOW_ruleAnnotationTargetType_in_rule__AnnotationType__TargetsAssignment_6_1_155466);
+            pushFollow(FOLLOW_2);
             ruleAnnotationTargetType();
 
             state._fsp--;
@@ -73877,20 +73877,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AnnotationType__TargetsAssignment_6_1_2_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27413:1: rule__AnnotationType__TargetsAssignment_6_1_2_1 : ( ruleAnnotationTargetType ) ;
+    // InternalRoom.g:27416:1: rule__AnnotationType__TargetsAssignment_6_1_2_1 : ( ruleAnnotationTargetType ) ;
     public final void rule__AnnotationType__TargetsAssignment_6_1_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27417:1: ( ( ruleAnnotationTargetType ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27418:1: ( ruleAnnotationTargetType )
+            // InternalRoom.g:27420:1: ( ( ruleAnnotationTargetType ) )
+            // InternalRoom.g:27421:1: ( ruleAnnotationTargetType )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27418:1: ( ruleAnnotationTargetType )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27419:1: ruleAnnotationTargetType
+            // InternalRoom.g:27421:1: ( ruleAnnotationTargetType )
+            // InternalRoom.g:27422:1: ruleAnnotationTargetType
             {
              before(grammarAccess.getAnnotationTypeAccess().getTargetsAnnotationTargetTypeParserRuleCall_6_1_2_1_0()); 
-            pushFollow(FOLLOW_ruleAnnotationTargetType_in_rule__AnnotationType__TargetsAssignment_6_1_2_155497);
+            pushFollow(FOLLOW_2);
             ruleAnnotationTargetType();
 
             state._fsp--;
@@ -73918,20 +73918,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__AnnotationType__AttributesAssignment_7"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27428:1: rule__AnnotationType__AttributesAssignment_7 : ( ruleAnnotationAttribute ) ;
+    // InternalRoom.g:27431:1: rule__AnnotationType__AttributesAssignment_7 : ( ruleAnnotationAttribute ) ;
     public final void rule__AnnotationType__AttributesAssignment_7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27432:1: ( ( ruleAnnotationAttribute ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27433:1: ( ruleAnnotationAttribute )
+            // InternalRoom.g:27435:1: ( ( ruleAnnotationAttribute ) )
+            // InternalRoom.g:27436:1: ( ruleAnnotationAttribute )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27433:1: ( ruleAnnotationAttribute )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27434:1: ruleAnnotationAttribute
+            // InternalRoom.g:27436:1: ( ruleAnnotationAttribute )
+            // InternalRoom.g:27437:1: ruleAnnotationAttribute
             {
              before(grammarAccess.getAnnotationTypeAccess().getAttributesAnnotationAttributeParserRuleCall_7_0()); 
-            pushFollow(FOLLOW_ruleAnnotationAttribute_in_rule__AnnotationType__AttributesAssignment_755528);
+            pushFollow(FOLLOW_2);
             ruleAnnotationAttribute();
 
             state._fsp--;
@@ -73959,24 +73959,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__OptionalAssignment_0_0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27443:1: rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 : ( ( 'optional' ) ) ;
+    // InternalRoom.g:27446:1: rule__SimpleAnnotationAttribute__OptionalAssignment_0_0 : ( ( 'optional' ) ) ;
     public final void rule__SimpleAnnotationAttribute__OptionalAssignment_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27447:1: ( ( ( 'optional' ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27448:1: ( ( 'optional' ) )
+            // InternalRoom.g:27450:1: ( ( ( 'optional' ) ) )
+            // InternalRoom.g:27451:1: ( ( 'optional' ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27448:1: ( ( 'optional' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27449:1: ( 'optional' )
+            // InternalRoom.g:27451:1: ( ( 'optional' ) )
+            // InternalRoom.g:27452:1: ( 'optional' )
             {
              before(grammarAccess.getSimpleAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27450:1: ( 'optional' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27451:1: 'optional'
+            // InternalRoom.g:27453:1: ( 'optional' )
+            // InternalRoom.g:27454:1: 'optional'
             {
              before(grammarAccess.getSimpleAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0()); 
-            match(input,34,FOLLOW_34_in_rule__SimpleAnnotationAttribute__OptionalAssignment_0_055564); 
+            match(input,34,FOLLOW_2); 
              after(grammarAccess.getSimpleAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0()); 
 
             }
@@ -74004,20 +74004,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__NameAssignment_2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27466:1: rule__SimpleAnnotationAttribute__NameAssignment_2 : ( RULE_ID ) ;
+    // InternalRoom.g:27469:1: rule__SimpleAnnotationAttribute__NameAssignment_2 : ( RULE_ID ) ;
     public final void rule__SimpleAnnotationAttribute__NameAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27470:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27471:1: ( RULE_ID )
+            // InternalRoom.g:27473:1: ( ( RULE_ID ) )
+            // InternalRoom.g:27474:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27471:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27472:1: RULE_ID
+            // InternalRoom.g:27474:1: ( RULE_ID )
+            // InternalRoom.g:27475:1: RULE_ID
             {
              before(grammarAccess.getSimpleAnnotationAttributeAccess().getNameIDTerminalRuleCall_2_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__SimpleAnnotationAttribute__NameAssignment_255603); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getSimpleAnnotationAttributeAccess().getNameIDTerminalRuleCall_2_0()); 
 
             }
@@ -74041,20 +74041,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__SimpleAnnotationAttribute__TypeAssignment_4"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27481:1: rule__SimpleAnnotationAttribute__TypeAssignment_4 : ( ruleLiteralType ) ;
+    // InternalRoom.g:27484:1: rule__SimpleAnnotationAttribute__TypeAssignment_4 : ( ruleLiteralType ) ;
     public final void rule__SimpleAnnotationAttribute__TypeAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27485:1: ( ( ruleLiteralType ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27486:1: ( ruleLiteralType )
+            // InternalRoom.g:27488:1: ( ( ruleLiteralType ) )
+            // InternalRoom.g:27489:1: ( ruleLiteralType )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27486:1: ( ruleLiteralType )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27487:1: ruleLiteralType
+            // InternalRoom.g:27489:1: ( ruleLiteralType )
+            // InternalRoom.g:27490:1: ruleLiteralType
             {
              before(grammarAccess.getSimpleAnnotationAttributeAccess().getTypeLiteralTypeEnumRuleCall_4_0()); 
-            pushFollow(FOLLOW_ruleLiteralType_in_rule__SimpleAnnotationAttribute__TypeAssignment_455634);
+            pushFollow(FOLLOW_2);
             ruleLiteralType();
 
             state._fsp--;
@@ -74082,24 +74082,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__OptionalAssignment_0_0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27496:1: rule__EnumAnnotationAttribute__OptionalAssignment_0_0 : ( ( 'optional' ) ) ;
+    // InternalRoom.g:27499:1: rule__EnumAnnotationAttribute__OptionalAssignment_0_0 : ( ( 'optional' ) ) ;
     public final void rule__EnumAnnotationAttribute__OptionalAssignment_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27500:1: ( ( ( 'optional' ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27501:1: ( ( 'optional' ) )
+            // InternalRoom.g:27503:1: ( ( ( 'optional' ) ) )
+            // InternalRoom.g:27504:1: ( ( 'optional' ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27501:1: ( ( 'optional' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27502:1: ( 'optional' )
+            // InternalRoom.g:27504:1: ( ( 'optional' ) )
+            // InternalRoom.g:27505:1: ( 'optional' )
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27503:1: ( 'optional' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27504:1: 'optional'
+            // InternalRoom.g:27506:1: ( 'optional' )
+            // InternalRoom.g:27507:1: 'optional'
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0()); 
-            match(input,34,FOLLOW_34_in_rule__EnumAnnotationAttribute__OptionalAssignment_0_055670); 
+            match(input,34,FOLLOW_2); 
              after(grammarAccess.getEnumAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0()); 
 
             }
@@ -74127,20 +74127,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__NameAssignment_2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27519:1: rule__EnumAnnotationAttribute__NameAssignment_2 : ( RULE_ID ) ;
+    // InternalRoom.g:27522:1: rule__EnumAnnotationAttribute__NameAssignment_2 : ( RULE_ID ) ;
     public final void rule__EnumAnnotationAttribute__NameAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27523:1: ( ( RULE_ID ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27524:1: ( RULE_ID )
+            // InternalRoom.g:27526:1: ( ( RULE_ID ) )
+            // InternalRoom.g:27527:1: ( RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27524:1: ( RULE_ID )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27525:1: RULE_ID
+            // InternalRoom.g:27527:1: ( RULE_ID )
+            // InternalRoom.g:27528:1: RULE_ID
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getNameIDTerminalRuleCall_2_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__EnumAnnotationAttribute__NameAssignment_255709); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getEnumAnnotationAttributeAccess().getNameIDTerminalRuleCall_2_0()); 
 
             }
@@ -74164,20 +74164,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__ValuesAssignment_5"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27534:1: rule__EnumAnnotationAttribute__ValuesAssignment_5 : ( RULE_STRING ) ;
+    // InternalRoom.g:27537:1: rule__EnumAnnotationAttribute__ValuesAssignment_5 : ( RULE_STRING ) ;
     public final void rule__EnumAnnotationAttribute__ValuesAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27538:1: ( ( RULE_STRING ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27539:1: ( RULE_STRING )
+            // InternalRoom.g:27541:1: ( ( RULE_STRING ) )
+            // InternalRoom.g:27542:1: ( RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27539:1: ( RULE_STRING )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27540:1: RULE_STRING
+            // InternalRoom.g:27542:1: ( RULE_STRING )
+            // InternalRoom.g:27543:1: RULE_STRING
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getValuesSTRINGTerminalRuleCall_5_0()); 
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__EnumAnnotationAttribute__ValuesAssignment_555740); 
+            match(input,RULE_STRING,FOLLOW_2); 
              after(grammarAccess.getEnumAnnotationAttributeAccess().getValuesSTRINGTerminalRuleCall_5_0()); 
 
             }
@@ -74201,20 +74201,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumAnnotationAttribute__ValuesAssignment_6_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27549:1: rule__EnumAnnotationAttribute__ValuesAssignment_6_1 : ( RULE_STRING ) ;
+    // InternalRoom.g:27552:1: rule__EnumAnnotationAttribute__ValuesAssignment_6_1 : ( RULE_STRING ) ;
     public final void rule__EnumAnnotationAttribute__ValuesAssignment_6_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27553:1: ( ( RULE_STRING ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27554:1: ( RULE_STRING )
+            // InternalRoom.g:27556:1: ( ( RULE_STRING ) )
+            // InternalRoom.g:27557:1: ( RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27554:1: ( RULE_STRING )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27555:1: RULE_STRING
+            // InternalRoom.g:27557:1: ( RULE_STRING )
+            // InternalRoom.g:27558:1: RULE_STRING
             {
              before(grammarAccess.getEnumAnnotationAttributeAccess().getValuesSTRINGTerminalRuleCall_6_1_0()); 
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__EnumAnnotationAttribute__ValuesAssignment_6_155771); 
+            match(input,RULE_STRING,FOLLOW_2); 
              after(grammarAccess.getEnumAnnotationAttributeAccess().getValuesSTRINGTerminalRuleCall_6_1_0()); 
 
             }
@@ -74238,20 +74238,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Import__ImportedNamespaceAssignment_1_0_0"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27564:1: rule__Import__ImportedNamespaceAssignment_1_0_0 : ( ruleImportedFQN ) ;
+    // InternalRoom.g:27567:1: rule__Import__ImportedNamespaceAssignment_1_0_0 : ( ruleImportedFQN ) ;
     public final void rule__Import__ImportedNamespaceAssignment_1_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27568:1: ( ( ruleImportedFQN ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27569:1: ( ruleImportedFQN )
+            // InternalRoom.g:27571:1: ( ( ruleImportedFQN ) )
+            // InternalRoom.g:27572:1: ( ruleImportedFQN )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27569:1: ( ruleImportedFQN )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27570:1: ruleImportedFQN
+            // InternalRoom.g:27572:1: ( ruleImportedFQN )
+            // InternalRoom.g:27573:1: ruleImportedFQN
             {
              before(grammarAccess.getImportAccess().getImportedNamespaceImportedFQNParserRuleCall_1_0_0_0()); 
-            pushFollow(FOLLOW_ruleImportedFQN_in_rule__Import__ImportedNamespaceAssignment_1_0_055802);
+            pushFollow(FOLLOW_2);
             ruleImportedFQN();
 
             state._fsp--;
@@ -74279,20 +74279,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Import__ImportURIAssignment_2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27579:1: rule__Import__ImportURIAssignment_2 : ( RULE_STRING ) ;
+    // InternalRoom.g:27582:1: rule__Import__ImportURIAssignment_2 : ( RULE_STRING ) ;
     public final void rule__Import__ImportURIAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27583:1: ( ( RULE_STRING ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27584:1: ( RULE_STRING )
+            // InternalRoom.g:27586:1: ( ( RULE_STRING ) )
+            // InternalRoom.g:27587:1: ( RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27584:1: ( RULE_STRING )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27585:1: RULE_STRING
+            // InternalRoom.g:27587:1: ( RULE_STRING )
+            // InternalRoom.g:27588:1: RULE_STRING
             {
              before(grammarAccess.getImportAccess().getImportURISTRINGTerminalRuleCall_2_0()); 
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__Import__ImportURIAssignment_255833); 
+            match(input,RULE_STRING,FOLLOW_2); 
              after(grammarAccess.getImportAccess().getImportURISTRINGTerminalRuleCall_2_0()); 
 
             }
@@ -74316,20 +74316,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Documentation__LinesAssignment_2"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27594:1: rule__Documentation__LinesAssignment_2 : ( RULE_STRING ) ;
+    // InternalRoom.g:27597:1: rule__Documentation__LinesAssignment_2 : ( RULE_STRING ) ;
     public final void rule__Documentation__LinesAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27598:1: ( ( RULE_STRING ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27599:1: ( RULE_STRING )
+            // InternalRoom.g:27601:1: ( ( RULE_STRING ) )
+            // InternalRoom.g:27602:1: ( RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27599:1: ( RULE_STRING )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27600:1: RULE_STRING
+            // InternalRoom.g:27602:1: ( RULE_STRING )
+            // InternalRoom.g:27603:1: RULE_STRING
             {
              before(grammarAccess.getDocumentationAccess().getLinesSTRINGTerminalRuleCall_2_0()); 
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__Documentation__LinesAssignment_255864); 
+            match(input,RULE_STRING,FOLLOW_2); 
              after(grammarAccess.getDocumentationAccess().getLinesSTRINGTerminalRuleCall_2_0()); 
 
             }
@@ -74353,24 +74353,24 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__BooleanLiteral__IsTrueAssignment_1_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27611:1: rule__BooleanLiteral__IsTrueAssignment_1_1 : ( ( 'true' ) ) ;
+    // InternalRoom.g:27614:1: rule__BooleanLiteral__IsTrueAssignment_1_1 : ( ( 'true' ) ) ;
     public final void rule__BooleanLiteral__IsTrueAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27615:1: ( ( ( 'true' ) ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27616:1: ( ( 'true' ) )
+            // InternalRoom.g:27618:1: ( ( ( 'true' ) ) )
+            // InternalRoom.g:27619:1: ( ( 'true' ) )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27616:1: ( ( 'true' ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27617:1: ( 'true' )
+            // InternalRoom.g:27619:1: ( ( 'true' ) )
+            // InternalRoom.g:27620:1: ( 'true' )
             {
              before(grammarAccess.getBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0()); 
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27618:1: ( 'true' )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27619:1: 'true'
+            // InternalRoom.g:27621:1: ( 'true' )
+            // InternalRoom.g:27622:1: 'true'
             {
              before(grammarAccess.getBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0()); 
-            match(input,131,FOLLOW_131_in_rule__BooleanLiteral__IsTrueAssignment_1_155902); 
+            match(input,131,FOLLOW_2); 
              after(grammarAccess.getBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0()); 
 
             }
@@ -74398,20 +74398,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RealLiteral__ValueAssignment_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27634:1: rule__RealLiteral__ValueAssignment_1 : ( ruleReal ) ;
+    // InternalRoom.g:27637:1: rule__RealLiteral__ValueAssignment_1 : ( ruleReal ) ;
     public final void rule__RealLiteral__ValueAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27638:1: ( ( ruleReal ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27639:1: ( ruleReal )
+            // InternalRoom.g:27641:1: ( ( ruleReal ) )
+            // InternalRoom.g:27642:1: ( ruleReal )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27639:1: ( ruleReal )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27640:1: ruleReal
+            // InternalRoom.g:27642:1: ( ruleReal )
+            // InternalRoom.g:27643:1: ruleReal
             {
              before(grammarAccess.getRealLiteralAccess().getValueRealParserRuleCall_1_0()); 
-            pushFollow(FOLLOW_ruleReal_in_rule__RealLiteral__ValueAssignment_155941);
+            pushFollow(FOLLOW_2);
             ruleReal();
 
             state._fsp--;
@@ -74439,20 +74439,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__IntLiteral__ValueAssignment_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27649:1: rule__IntLiteral__ValueAssignment_1 : ( ruleInteger ) ;
+    // InternalRoom.g:27652:1: rule__IntLiteral__ValueAssignment_1 : ( ruleInteger ) ;
     public final void rule__IntLiteral__ValueAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27653:1: ( ( ruleInteger ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27654:1: ( ruleInteger )
+            // InternalRoom.g:27656:1: ( ( ruleInteger ) )
+            // InternalRoom.g:27657:1: ( ruleInteger )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27654:1: ( ruleInteger )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27655:1: ruleInteger
+            // InternalRoom.g:27657:1: ( ruleInteger )
+            // InternalRoom.g:27658:1: ruleInteger
             {
              before(grammarAccess.getIntLiteralAccess().getValueIntegerParserRuleCall_1_0()); 
-            pushFollow(FOLLOW_ruleInteger_in_rule__IntLiteral__ValueAssignment_155972);
+            pushFollow(FOLLOW_2);
             ruleInteger();
 
             state._fsp--;
@@ -74480,20 +74480,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__StringLiteral__ValueAssignment_1"
-    // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27664:1: rule__StringLiteral__ValueAssignment_1 : ( RULE_STRING ) ;
+    // InternalRoom.g:27667:1: rule__StringLiteral__ValueAssignment_1 : ( RULE_STRING ) ;
     public final void rule__StringLiteral__ValueAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27668:1: ( ( RULE_STRING ) )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27669:1: ( RULE_STRING )
+            // InternalRoom.g:27671:1: ( ( RULE_STRING ) )
+            // InternalRoom.g:27672:1: ( RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27669:1: ( RULE_STRING )
-            // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:27670:1: RULE_STRING
+            // InternalRoom.g:27672:1: ( RULE_STRING )
+            // InternalRoom.g:27673:1: RULE_STRING
             {
              before(grammarAccess.getStringLiteralAccess().getValueSTRINGTerminalRuleCall_1_0()); 
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__StringLiteral__ValueAssignment_156003); 
+            match(input,RULE_STRING,FOLLOW_2); 
              after(grammarAccess.getStringLiteralAccess().getValueSTRINGTerminalRuleCall_1_0()); 
 
             }
@@ -74521,32 +74521,20 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
     protected DFA1 dfa1 = new DFA1(this);
     protected DFA29 dfa29 = new DFA29(this);
     protected DFA30 dfa30 = new DFA30(this);
-    static final String DFA1_eotS =
-        "\15\uffff";
-    static final String DFA1_eofS =
-        "\15\uffff";
-    static final String DFA1_minS =
-        "\1\20\4\uffff\3\21\5\uffff";
-    static final String DFA1_maxS =
-        "\1\u0081\4\uffff\3\u0081\5\uffff";
-    static final String DFA1_acceptS =
-        "\1\uffff\1\1\1\2\1\3\1\4\3\uffff\1\5\1\6\1\7\1\10\1\11";
-    static final String DFA1_specialS =
-        "\15\uffff}>";
-    static final String[] DFA1_transitionS = {
-            "\1\4\1\11\1\uffff\2\10\1\12\1\13\7\uffff\1\5\1\6\1\7\2\uffff"+
-            "\1\11\10\uffff\1\1\4\uffff\1\2\3\uffff\1\3\103\uffff\1\14\7"+
-            "\uffff\1\11",
+    static final String dfa_1s = "\15\uffff";
+    static final String dfa_2s = "\1\20\4\uffff\3\21\5\uffff";
+    static final String dfa_3s = "\1\u0081\4\uffff\3\u0081\5\uffff";
+    static final String dfa_4s = "\1\uffff\1\1\1\2\1\3\1\4\3\uffff\1\5\1\6\1\7\1\10\1\11";
+    static final String dfa_5s = "\15\uffff}>";
+    static final String[] dfa_6s = {
+            "\1\4\1\11\1\uffff\2\10\1\12\1\13\7\uffff\1\5\1\6\1\7\2\uffff\1\11\10\uffff\1\1\4\uffff\1\2\3\uffff\1\3\103\uffff\1\14\7\uffff\1\11",
             "",
             "",
             "",
             "",
-            "\1\11\1\uffff\1\10\12\uffff\3\11\2\uffff\1\11\135\uffff\1"+
-            "\11",
-            "\1\11\1\uffff\1\10\12\uffff\3\11\2\uffff\1\11\135\uffff\1"+
-            "\11",
-            "\1\11\1\uffff\1\10\12\uffff\3\11\2\uffff\1\11\135\uffff\1"+
-            "\11",
+            "\1\11\1\uffff\1\10\12\uffff\3\11\2\uffff\1\11\135\uffff\1\11",
+            "\1\11\1\uffff\1\10\12\uffff\3\11\2\uffff\1\11\135\uffff\1\11",
+            "\1\11\1\uffff\1\10\12\uffff\3\11\2\uffff\1\11\135\uffff\1\11",
             "",
             "",
             "",
@@ -74554,54 +74542,37 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             ""
     };
 
-    static final short[] DFA1_eot = DFA.unpackEncodedString(DFA1_eotS);
-    static final short[] DFA1_eof = DFA.unpackEncodedString(DFA1_eofS);
-    static final char[] DFA1_min = DFA.unpackEncodedStringToUnsignedChars(DFA1_minS);
-    static final char[] DFA1_max = DFA.unpackEncodedStringToUnsignedChars(DFA1_maxS);
-    static final short[] DFA1_accept = DFA.unpackEncodedString(DFA1_acceptS);
-    static final short[] DFA1_special = DFA.unpackEncodedString(DFA1_specialS);
-    static final short[][] DFA1_transition;
-
-    static {
-        int numStates = DFA1_transitionS.length;
-        DFA1_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA1_transition[i] = DFA.unpackEncodedString(DFA1_transitionS[i]);
-        }
-    }
+    static final short[] dfa_1 = DFA.unpackEncodedString(dfa_1s);
+    static final char[] dfa_2 = DFA.unpackEncodedStringToUnsignedChars(dfa_2s);
+    static final char[] dfa_3 = DFA.unpackEncodedStringToUnsignedChars(dfa_3s);
+    static final short[] dfa_4 = DFA.unpackEncodedString(dfa_4s);
+    static final short[] dfa_5 = DFA.unpackEncodedString(dfa_5s);
+    static final short[][] dfa_6 = unpackEncodedStringArray(dfa_6s);
 
     class DFA1 extends DFA {
 
         public DFA1(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 1;
-            this.eot = DFA1_eot;
-            this.eof = DFA1_eof;
-            this.min = DFA1_min;
-            this.max = DFA1_max;
-            this.accept = DFA1_accept;
-            this.special = DFA1_special;
-            this.transition = DFA1_transition;
+            this.eot = dfa_1;
+            this.eof = dfa_1;
+            this.min = dfa_2;
+            this.max = dfa_3;
+            this.accept = dfa_4;
+            this.special = dfa_5;
+            this.transition = dfa_6;
         }
         public String getDescription() {
-            return "3054:1: rule__RoomModel__Alternatives_5 : ( ( ( rule__RoomModel__PrimitiveTypesAssignment_5_0 ) ) | ( ( rule__RoomModel__EnumerationTypesAssignment_5_1 ) ) | ( ( rule__RoomModel__ExternalTypesAssignment_5_2 ) ) | ( ( rule__RoomModel__DataClassesAssignment_5_3 ) ) | ( ( rule__RoomModel__ProtocolClassesAssignment_5_4 ) ) | ( ( rule__RoomModel__ActorClassesAssignment_5_5 ) ) | ( ( rule__RoomModel__SubSystemClassesAssignment_5_6 ) ) | ( ( rule__RoomModel__SystemsAssignment_5_7 ) ) | ( ( rule__RoomModel__AnnotationTypesAssignment_5_8 ) ) );";
-        }
-    }
-    static final String DFA29_eotS =
-        "\32\uffff";
-    static final String DFA29_eofS =
-        "\14\uffff\1\21\6\uffff\2\21\1\uffff\1\21\2\uffff\1\21";
-    static final String DFA29_minS =
-        "\1\150\1\6\1\53\1\6\1\55\4\6\3\55\1\51\2\6\1\7\1\52\1\uffff\1\6"+
-        "\2\51\1\7\1\51\2\uffff\1\51";
-    static final String DFA29_maxS =
-        "\1\150\2\53\1\161\1\62\3\6\1\161\3\55\1\u0082\2\6\1\74\1\156\1"+
-        "\uffff\1\6\2\u0082\1\74\1\u0082\2\uffff\1\u0082";
-    static final String DFA29_acceptS =
-        "\21\uffff\1\2\5\uffff\1\1\1\3\1\uffff";
-    static final String DFA29_specialS =
-        "\32\uffff}>";
-    static final String[] DFA29_transitionS = {
+            return "3056:1: rule__RoomModel__Alternatives_5 : ( ( ( rule__RoomModel__PrimitiveTypesAssignment_5_0 ) ) | ( ( rule__RoomModel__EnumerationTypesAssignment_5_1 ) ) | ( ( rule__RoomModel__ExternalTypesAssignment_5_2 ) ) | ( ( rule__RoomModel__DataClassesAssignment_5_3 ) ) | ( ( rule__RoomModel__ProtocolClassesAssignment_5_4 ) ) | ( ( rule__RoomModel__ActorClassesAssignment_5_5 ) ) | ( ( rule__RoomModel__SubSystemClassesAssignment_5_6 ) ) | ( ( rule__RoomModel__SystemsAssignment_5_7 ) ) | ( ( rule__RoomModel__AnnotationTypesAssignment_5_8 ) ) );";
+        }
+    }
+    static final String dfa_7s = "\32\uffff";
+    static final String dfa_8s = "\14\uffff\1\21\6\uffff\2\21\1\uffff\1\21\2\uffff\1\21";
+    static final String dfa_9s = "\1\150\1\6\1\53\1\6\1\55\4\6\3\55\1\51\2\6\1\7\1\52\1\uffff\1\6\2\51\1\7\1\51\2\uffff\1\51";
+    static final String dfa_10s = "\1\150\2\53\1\161\1\62\3\6\1\161\3\55\1\u0082\2\6\1\74\1\156\1\uffff\1\6\2\u0082\1\74\1\u0082\2\uffff\1\u0082";
+    static final String dfa_11s = "\21\uffff\1\2\5\uffff\1\1\1\3\1\uffff";
+    static final String dfa_12s = "\32\uffff}>";
+    static final String[] dfa_13s = {
             "\1\1",
             "\1\2\44\uffff\1\3",
             "\1\3",
@@ -74614,2485 +74585,224 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
             "\1\10",
             "\1\10",
             "\1\10",
-            "\1\20\1\21\7\uffff\1\22\10\uffff\1\17\42\uffff\1\21\4\uffff"+
-            "\6\21\6\uffff\1\21\22\uffff\1\21",
+            "\1\20\1\21\7\uffff\1\22\10\uffff\1\17\42\uffff\1\21\4\uffff\6\21\6\uffff\1\21\22\uffff\1\21",
             "\1\23",
             "\1\24",
             "\1\25\64\uffff\1\26",
             "\1\21\77\uffff\1\21\1\27\1\uffff\1\27\1\30",
             "",
             "\1\31",
-            "\1\20\1\21\20\uffff\1\17\42\uffff\1\21\4\uffff\6\21\6\uffff"+
-            "\1\21\22\uffff\1\21",
-            "\1\20\1\21\20\uffff\1\17\42\uffff\1\21\4\uffff\6\21\6\uffff"+
-            "\1\21\22\uffff\1\21",
+            "\1\20\1\21\20\uffff\1\17\42\uffff\1\21\4\uffff\6\21\6\uffff\1\21\22\uffff\1\21",
+            "\1\20\1\21\20\uffff\1\17\42\uffff\1\21\4\uffff\6\21\6\uffff\1\21\22\uffff\1\21",
             "\1\25\64\uffff\1\26",
-            "\1\20\1\21\63\uffff\1\21\4\uffff\6\21\6\uffff\1\21\22\uffff"+
-            "\1\21",
+            "\1\20\1\21\63\uffff\1\21\4\uffff\6\21\6\uffff\1\21\22\uffff\1\21",
             "",
             "",
-            "\1\20\1\21\20\uffff\1\17\42\uffff\1\21\4\uffff\6\21\6\uffff"+
-            "\1\21\22\uffff\1\21"
+            "\1\20\1\21\20\uffff\1\17\42\uffff\1\21\4\uffff\6\21\6\uffff\1\21\22\uffff\1\21"
     };
 
-    static final short[] DFA29_eot = DFA.unpackEncodedString(DFA29_eotS);
-    static final short[] DFA29_eof = DFA.unpackEncodedString(DFA29_eofS);
-    static final char[] DFA29_min = DFA.unpackEncodedStringToUnsignedChars(DFA29_minS);
-    static final char[] DFA29_max = DFA.unpackEncodedStringToUnsignedChars(DFA29_maxS);
-    static final short[] DFA29_accept = DFA.unpackEncodedString(DFA29_acceptS);
-    static final short[] DFA29_special = DFA.unpackEncodedString(DFA29_specialS);
-    static final short[][] DFA29_transition;
-
-    static {
-        int numStates = DFA29_transitionS.length;
-        DFA29_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA29_transition[i] = DFA.unpackEncodedString(DFA29_transitionS[i]);
-        }
-    }
+    static final short[] dfa_7 = DFA.unpackEncodedString(dfa_7s);
+    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 DFA29 extends DFA {
 
         public DFA29(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 29;
-            this.eot = DFA29_eot;
-            this.eof = DFA29_eof;
-            this.min = DFA29_min;
-            this.max = DFA29_max;
-            this.accept = DFA29_accept;
-            this.special = DFA29_special;
-            this.transition = DFA29_transition;
+            this.eot = dfa_7;
+            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 "3914:1: rule__NonInitialTransition__Alternatives : ( ( ruleTransitionChainStartTransition ) | ( ruleContinuationTransition ) | ( ruleCPBranchTransition ) );";
-        }
-    }
-    static final String DFA30_eotS =
-        "\31\uffff";
-    static final String DFA30_eofS =
-        "\31\uffff";
-    static final String DFA30_minS =
-        "\1\150\1\6\1\53\1\6\1\55\4\6\3\55\1\51\2\6\1\7\1\153\1\6\2\51\1"+
-        "\7\1\51\2\uffff\1\51";
-    static final String DFA30_maxS =
-        "\1\150\2\53\1\161\1\62\3\6\1\161\3\55\1\73\2\6\1\74\1\155\1\6\2"+
-        "\73\1\74\1\51\2\uffff\1\73";
-    static final String DFA30_acceptS =
-        "\26\uffff\1\2\1\1\1\uffff";
-    static final String DFA30_specialS =
-        "\31\uffff}>";
-    static final String[] DFA30_transitionS = {
+            return "3917:1: rule__NonInitialTransition__Alternatives : ( ( ruleTransitionChainStartTransition ) | ( ruleContinuationTransition ) | ( ruleCPBranchTransition ) );";
+        }
+    }
+    static final String dfa_14s = "\31\uffff";
+    static final String dfa_15s = "\1\150\1\6\1\53\1\6\1\55\4\6\2\55\1\51\2\6\1\55\1\6\1\7\1\153\3\51\1\7\1\51\2\uffff";
+    static final String dfa_16s = "\1\150\2\53\1\161\1\62\2\6\1\161\1\6\2\55\1\73\2\6\1\55\1\6\1\74\1\155\3\73\1\74\1\51\2\uffff";
+    static final String dfa_17s = "\27\uffff\1\2\1\1";
+    static final String dfa_18s = "\31\uffff}>";
+    static final String[] dfa_19s = {
             "\1\1",
             "\1\2\44\uffff\1\3",
             "\1\3",
             "\1\4\151\uffff\1\5\1\6",
-            "\1\10\4\uffff\1\7",
+            "\1\7\4\uffff\1\10",
             "\1\11",
             "\1\12",
-            "\1\13",
-            "\1\14\151\uffff\1\15\1\16",
-            "\1\10",
-            "\1\10",
-            "\1\10",
-            "\1\20\10\uffff\1\21\10\uffff\1\17",
+            "\1\13\151\uffff\1\14\1\15",
+            "\1\16",
+            "\1\7",
+            "\1\7",
+            "\1\21\10\uffff\1\17\10\uffff\1\20",
             "\1\22",
             "\1\23",
-            "\1\24\64\uffff\1\25",
-            "\1\27\1\uffff\1\26",
-            "\1\30",
-            "\1\20\21\uffff\1\17",
-            "\1\20\21\uffff\1\17",
-            "\1\24\64\uffff\1\25",
-            "\1\20",
-            "",
+            "\1\7",
+            "\1\24",
+            "\1\25\64\uffff\1\26",
+            "\1\30\1\uffff\1\27",
+            "\1\21\21\uffff\1\20",
+            "\1\21\21\uffff\1\20",
+            "\1\21\21\uffff\1\20",
+            "\1\25\64\uffff\1\26",
+            "\1\21",
             "",
-            "\1\20\21\uffff\1\17"
+            ""
     };
 
-    static final short[] DFA30_eot = DFA.unpackEncodedString(DFA30_eotS);
-    static final short[] DFA30_eof = DFA.unpackEncodedString(DFA30_eofS);
-    static final char[] DFA30_min = DFA.unpackEncodedStringToUnsignedChars(DFA30_minS);
-    static final char[] DFA30_max = DFA.unpackEncodedStringToUnsignedChars(DFA30_maxS);
-    static final short[] DFA30_accept = DFA.unpackEncodedString(DFA30_acceptS);
-    static final short[] DFA30_special = DFA.unpackEncodedString(DFA30_specialS);
-    static final short[][] DFA30_transition;
-
-    static {
-        int numStates = DFA30_transitionS.length;
-        DFA30_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA30_transition[i] = DFA.unpackEncodedString(DFA30_transitionS[i]);
-        }
-    }
+    static final short[] dfa_14 = DFA.unpackEncodedString(dfa_14s);
+    static final char[] dfa_15 = DFA.unpackEncodedStringToUnsignedChars(dfa_15s);
+    static final char[] dfa_16 = DFA.unpackEncodedStringToUnsignedChars(dfa_16s);
+    static final short[] dfa_17 = DFA.unpackEncodedString(dfa_17s);
+    static final short[] dfa_18 = DFA.unpackEncodedString(dfa_18s);
+    static final short[][] dfa_19 = unpackEncodedStringArray(dfa_19s);
 
     class DFA30 extends DFA {
 
         public DFA30(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 30;
-            this.eot = DFA30_eot;
-            this.eof = DFA30_eof;
-            this.min = DFA30_min;
-            this.max = DFA30_max;
-            this.accept = DFA30_accept;
-            this.special = DFA30_special;
-            this.transition = DFA30_transition;
+            this.eot = dfa_14;
+            this.eof = dfa_14;
+            this.min = dfa_15;
+            this.max = dfa_16;
+            this.accept = dfa_17;
+            this.special = dfa_18;
+            this.transition = dfa_19;
         }
         public String getDescription() {
-            return "3942:1: rule__TransitionChainStartTransition__Alternatives : ( ( ruleTriggeredTransition ) | ( ruleGuardedTransition ) );";
+            return "3945:1: rule__TransitionChainStartTransition__Alternatives : ( ( ruleTriggeredTransition ) | ( ruleGuardedTransition ) );";
         }
     }
  
 
-    public static final BitSet FOLLOW_ruleRoomModel_in_entryRuleRoomModel61 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRoomModel68 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RoomModel__Group__0_in_ruleRoomModel94 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStructureClass_in_entryRuleStructureClass123 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleStructureClass130 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StructureClass__Alternatives_in_ruleStructureClass156 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleActorContainerClass_in_entryRuleActorContainerClass183 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleActorContainerClass190 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorContainerClass__Alternatives_in_ruleActorContainerClass216 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleVarDecl_in_entryRuleVarDecl243 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleVarDecl250 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__VarDecl__Group__0_in_ruleVarDecl276 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRefableType_in_entryRuleRefableType303 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRefableType310 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefableType__Group__0_in_ruleRefableType336 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDataType_in_entryRuleDataType363 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDataType370 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DataType__Alternatives_in_ruleDataType396 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleComplexType_in_entryRuleComplexType423 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleComplexType430 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ComplexType__Alternatives_in_ruleComplexType456 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rulePrimitiveType_in_entryRulePrimitiveType483 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRulePrimitiveType490 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PrimitiveType__Group__0_in_rulePrimitiveType516 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleEnumerationType_in_entryRuleEnumerationType543 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleEnumerationType550 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumerationType__Group__0_in_ruleEnumerationType576 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleEnumLiteral_in_entryRuleEnumLiteral603 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleEnumLiteral610 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumLiteral__Group__0_in_ruleEnumLiteral636 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExternalType_in_entryRuleExternalType663 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleExternalType670 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ExternalType__Group__0_in_ruleExternalType696 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDataClass_in_entryRuleDataClass723 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDataClass730 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DataClass__Group__0_in_ruleDataClass756 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAttribute_in_entryRuleAttribute783 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAttribute790 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Attribute__Group__0_in_ruleAttribute816 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStandardOperation_in_entryRuleStandardOperation845 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleStandardOperation852 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StandardOperation__Group__0_in_ruleStandardOperation878 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rulePortOperation_in_entryRulePortOperation905 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRulePortOperation912 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortOperation__Group__0_in_rulePortOperation938 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleClassStructor_in_entryRuleClassStructor965 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleClassStructor972 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ClassStructor__Group__0_in_ruleClassStructor998 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGeneralProtocolClass_in_entryRuleGeneralProtocolClass1025 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleGeneralProtocolClass1032 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GeneralProtocolClass__Alternatives_in_ruleGeneralProtocolClass1058 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleProtocolClass_in_entryRuleProtocolClass1085 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleProtocolClass1092 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group__0_in_ruleProtocolClass1118 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCompoundProtocolClass_in_entryRuleCompoundProtocolClass1145 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleCompoundProtocolClass1152 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CompoundProtocolClass__Group__0_in_ruleCompoundProtocolClass1178 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSubProtocol_in_entryRuleSubProtocol1205 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSubProtocol1212 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubProtocol__Group__0_in_ruleSubProtocol1238 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMessage_in_entryRuleMessage1265 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleMessage1272 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Message__Group__0_in_ruleMessage1298 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rulePortClass_in_entryRulePortClass1325 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRulePortClass1332 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortClass__Group__0_in_rulePortClass1358 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMessageHandler_in_entryRuleMessageHandler1385 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleMessageHandler1392 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MessageHandler__Alternatives_in_ruleMessageHandler1418 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInMessageHandler_in_entryRuleInMessageHandler1445 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleInMessageHandler1452 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InMessageHandler__Group__0_in_ruleInMessageHandler1478 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOutMessageHandler_in_entryRuleOutMessageHandler1505 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOutMessageHandler1512 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutMessageHandler__Group__0_in_ruleOutMessageHandler1538 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleModelComponent_in_entryRuleModelComponent1565 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleModelComponent1572 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleActorClass_in_ruleModelComponent1598 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleActorClass_in_entryRuleActorClass1624 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleActorClass1631 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group__0_in_ruleActorClass1657 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInterfaceItem_in_entryRuleInterfaceItem1684 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleInterfaceItem1691 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InterfaceItem__Alternatives_in_ruleInterfaceItem1717 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rulePort_in_entryRulePort1744 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRulePort1751 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Port__Group__0_in_rulePort1777 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExternalPort_in_entryRuleExternalPort1804 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleExternalPort1811 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ExternalPort__Group__0_in_ruleExternalPort1837 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSAP_in_entryRuleSAP1864 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSAP1871 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SAP__Group__0_in_ruleSAP1897 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSPP_in_entryRuleSPP1924 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSPP1931 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SPP__Group__0_in_ruleSPP1957 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleServiceImplementation_in_entryRuleServiceImplementation1984 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleServiceImplementation1991 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ServiceImplementation__Group__0_in_ruleServiceImplementation2017 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLogicalSystem_in_entryRuleLogicalSystem2044 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleLogicalSystem2051 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LogicalSystem__Group__0_in_ruleLogicalSystem2077 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSubSystemRef_in_entryRuleSubSystemRef2106 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSubSystemRef2113 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemRef__Group__0_in_ruleSubSystemRef2139 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSubSystemClass_in_entryRuleSubSystemClass2166 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSubSystemClass2173 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemClass__Group__0_in_ruleSubSystemClass2199 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLogicalThread_in_entryRuleLogicalThread2226 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleLogicalThread2233 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LogicalThread__Group__0_in_ruleLogicalThread2259 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleActorInstanceMapping_in_entryRuleActorInstanceMapping2286 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleActorInstanceMapping2293 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorInstanceMapping__Group__0_in_ruleActorInstanceMapping2319 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRefPath_in_entryRuleRefPath2346 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRefPath2353 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefPath__Group__0_in_ruleRefPath2379 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRefSegment_in_entryRuleRefSegment2406 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRefSegment2413 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefSegment__Group__0_in_ruleRefSegment2439 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleBinding_in_entryRuleBinding2466 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleBinding2473 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Binding__Group__0_in_ruleBinding2499 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleBindingEndPoint_in_entryRuleBindingEndPoint2526 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleBindingEndPoint2533 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__BindingEndPoint__Group__0_in_ruleBindingEndPoint2559 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLayerConnection_in_entryRuleLayerConnection2586 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleLayerConnection2593 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LayerConnection__Group__0_in_ruleLayerConnection2619 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSAPoint_in_entryRuleSAPoint2646 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSAPoint2653 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SAPoint__Alternatives_in_ruleSAPoint2679 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRefSAPoint_in_entryRuleRefSAPoint2706 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRefSAPoint2713 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefSAPoint__Group__0_in_ruleRefSAPoint2739 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRelaySAPoint_in_entryRuleRelaySAPoint2766 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRelaySAPoint2773 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RelaySAPoint__Group__0_in_ruleRelaySAPoint2799 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSPPoint_in_entryRuleSPPoint2826 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSPPoint2833 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SPPoint__Group__0_in_ruleSPPoint2859 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleActorRef_in_entryRuleActorRef2886 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleActorRef2893 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorRef__Group__0_in_ruleActorRef2919 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMULTIPLICITY_in_entryRuleMULTIPLICITY2948 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleMULTIPLICITY2955 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MULTIPLICITY__Group__0_in_ruleMULTIPLICITY2981 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAnnotationTargetType_in_entryRuleAnnotationTargetType3008 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAnnotationTargetType3015 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AnnotationTargetType__Alternatives_in_ruleAnnotationTargetType3041 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStateGraphNode_in_entryRuleStateGraphNode3070 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleStateGraphNode3077 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StateGraphNode__Alternatives_in_ruleStateGraphNode3103 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStateGraph_in_entryRuleStateGraph3132 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleStateGraph3139 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StateGraph__Group__0_in_ruleStateGraph3165 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStateMachine_in_entryRuleStateMachine3192 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleStateMachine3199 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StateMachine__Group__0_in_ruleStateMachine3225 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleState_in_entryRuleState3252 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleState3259 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__State__Alternatives_in_ruleState3285 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleState_in_entryRuleSimpleState3312 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSimpleState3319 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group__0_in_ruleSimpleState3345 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRefinedState_in_entryRuleRefinedState3372 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRefinedState3379 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group__0_in_ruleRefinedState3405 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_entryRuleDetailCode3432 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDetailCode3439 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DetailCode__Group__0_in_ruleDetailCode3465 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTrPoint_in_entryRuleTrPoint3492 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleTrPoint3499 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TrPoint__Alternatives_in_ruleTrPoint3525 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTransitionPoint_in_entryRuleTransitionPoint3552 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleTransitionPoint3559 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TransitionPoint__Group__0_in_ruleTransitionPoint3585 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleEntryPoint_in_entryRuleEntryPoint3612 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleEntryPoint3619 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EntryPoint__Group__0_in_ruleEntryPoint3645 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExitPoint_in_entryRuleExitPoint3672 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleExitPoint3679 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ExitPoint__Group__0_in_ruleExitPoint3705 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChoicePoint_in_entryRuleChoicePoint3732 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleChoicePoint3739 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ChoicePoint__Group__0_in_ruleChoicePoint3765 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTransition_in_entryRuleTransition3792 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleTransition3799 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Transition__Alternatives_in_ruleTransition3825 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNonInitialTransition_in_entryRuleNonInitialTransition3852 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleNonInitialTransition3859 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NonInitialTransition__Alternatives_in_ruleNonInitialTransition3885 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTransitionChainStartTransition_in_entryRuleTransitionChainStartTransition3912 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleTransitionChainStartTransition3919 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TransitionChainStartTransition__Alternatives_in_ruleTransitionChainStartTransition3945 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInitialTransition_in_entryRuleInitialTransition3972 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleInitialTransition3979 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InitialTransition__Group__0_in_ruleInitialTransition4005 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleContinuationTransition_in_entryRuleContinuationTransition4032 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleContinuationTransition4039 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__Group__0_in_ruleContinuationTransition4065 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTriggeredTransition_in_entryRuleTriggeredTransition4092 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleTriggeredTransition4099 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__0_in_ruleTriggeredTransition4125 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGuardedTransition_in_entryRuleGuardedTransition4152 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleGuardedTransition4159 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group__0_in_ruleGuardedTransition4185 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCPBranchTransition_in_entryRuleCPBranchTransition4212 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleCPBranchTransition4219 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group__0_in_ruleCPBranchTransition4245 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRefinedTransition_in_entryRuleRefinedTransition4272 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRefinedTransition4279 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedTransition__Group__0_in_ruleRefinedTransition4305 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTransitionTerminal_in_entryRuleTransitionTerminal4332 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleTransitionTerminal4339 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TransitionTerminal__Alternatives_in_ruleTransitionTerminal4365 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStateTerminal_in_entryRuleStateTerminal4392 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleStateTerminal4399 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StateTerminal__StateAssignment_in_ruleStateTerminal4425 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTrPointTerminal_in_entryRuleTrPointTerminal4452 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleTrPointTerminal4459 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TrPointTerminal__Group__0_in_ruleTrPointTerminal4485 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSubStateTrPointTerminal_in_entryRuleSubStateTrPointTerminal4512 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSubStateTrPointTerminal4519 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubStateTrPointTerminal__Group__0_in_ruleSubStateTrPointTerminal4545 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChoicepointTerminal_in_entryRuleChoicepointTerminal4572 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleChoicepointTerminal4579 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ChoicepointTerminal__Group__0_in_ruleChoicepointTerminal4605 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTrigger_in_entryRuleTrigger4632 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleTrigger4639 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Trigger__Group__0_in_ruleTrigger4665 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMessageFromIf_in_entryRuleMessageFromIf4692 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleMessageFromIf4699 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MessageFromIf__Group__0_in_ruleMessageFromIf4725 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGuard_in_entryRuleGuard4752 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleGuard4759 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Guard__Group__0_in_ruleGuard4785 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleProtocolSemantics_in_entryRuleProtocolSemantics4812 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleProtocolSemantics4819 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolSemantics__Group__0_in_ruleProtocolSemantics4845 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSemanticsRule_in_entryRuleSemanticsRule4872 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSemanticsRule4879 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SemanticsRule__Alternatives_in_ruleSemanticsRule4905 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInSemanticsRule_in_entryRuleInSemanticsRule4932 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleInSemanticsRule4939 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__Group__0_in_ruleInSemanticsRule4965 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOutSemanticsRule_in_entryRuleOutSemanticsRule4992 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOutSemanticsRule4999 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__Group__0_in_ruleOutSemanticsRule5025 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAnnotation_in_entryRuleAnnotation5052 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAnnotation5059 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Annotation__Group__0_in_ruleAnnotation5085 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleKeyValue_in_entryRuleKeyValue5112 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleKeyValue5119 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeyValue__Group__0_in_ruleKeyValue5145 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAnnotationType_in_entryRuleAnnotationType5172 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAnnotationType5179 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AnnotationType__Group__0_in_ruleAnnotationType5205 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAnnotationAttribute_in_entryRuleAnnotationAttribute5232 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAnnotationAttribute5239 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AnnotationAttribute__Alternatives_in_ruleAnnotationAttribute5265 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleAnnotationAttribute_in_entryRuleSimpleAnnotationAttribute5292 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSimpleAnnotationAttribute5299 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__0_in_ruleSimpleAnnotationAttribute5325 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleEnumAnnotationAttribute_in_entryRuleEnumAnnotationAttribute5352 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleEnumAnnotationAttribute5359 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__0_in_ruleEnumAnnotationAttribute5385 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleImport_in_entryRuleImport5412 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleImport5419 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__Group__0_in_ruleImport5445 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleImportedFQN_in_entryRuleImportedFQN5472 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleImportedFQN5479 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ImportedFQN__Group__0_in_ruleImportedFQN5505 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_entryRuleDocumentation5532 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDocumentation5539 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Documentation__Group__0_in_ruleDocumentation5565 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLiteral_in_entryRuleLiteral5596 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleLiteral5603 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Literal__Alternatives_in_ruleLiteral5629 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleBooleanLiteral_in_entryRuleBooleanLiteral5656 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleBooleanLiteral5663 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__BooleanLiteral__Group__0_in_ruleBooleanLiteral5689 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNumberLiteral_in_entryRuleNumberLiteral5716 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleNumberLiteral5723 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NumberLiteral__Alternatives_in_ruleNumberLiteral5749 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRealLiteral_in_entryRuleRealLiteral5776 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRealLiteral5783 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RealLiteral__Group__0_in_ruleRealLiteral5809 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntLiteral_in_entryRuleIntLiteral5836 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIntLiteral5843 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IntLiteral__Group__0_in_ruleIntLiteral5869 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStringLiteral_in_entryRuleStringLiteral5896 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleStringLiteral5903 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StringLiteral__Group__0_in_ruleStringLiteral5929 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInteger_in_entryRuleInteger5956 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleInteger5963 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Integer__Alternatives_in_ruleInteger5989 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleReal_in_entryRuleReal6016 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleReal6023 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Real__Alternatives_in_ruleReal6049 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDecimal_in_entryRuleDecimal6081 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDecimal6088 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Decimal__Group__0_in_ruleDecimal6118 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDecimalExp_in_entryRuleDecimalExp6150 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDecimalExp6157 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__0_in_ruleDecimalExp6187 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_entryRuleFQN6214 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleFQN6221 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FQN__Group__0_in_ruleFQN6247 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CommunicationType__Alternatives_in_ruleCommunicationType6284 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ReferenceType__Alternatives_in_ruleReferenceType6320 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ComponentCommunicationType__Alternatives_in_ruleComponentCommunicationType6358 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LiteralType__Alternatives_in_ruleLiteralType6394 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RoomModel__PrimitiveTypesAssignment_5_0_in_rule__RoomModel__Alternatives_56429 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RoomModel__EnumerationTypesAssignment_5_1_in_rule__RoomModel__Alternatives_56447 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RoomModel__ExternalTypesAssignment_5_2_in_rule__RoomModel__Alternatives_56465 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RoomModel__DataClassesAssignment_5_3_in_rule__RoomModel__Alternatives_56483 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RoomModel__ProtocolClassesAssignment_5_4_in_rule__RoomModel__Alternatives_56501 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RoomModel__ActorClassesAssignment_5_5_in_rule__RoomModel__Alternatives_56519 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RoomModel__SubSystemClassesAssignment_5_6_in_rule__RoomModel__Alternatives_56537 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RoomModel__SystemsAssignment_5_7_in_rule__RoomModel__Alternatives_56555 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RoomModel__AnnotationTypesAssignment_5_8_in_rule__RoomModel__Alternatives_56573 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleActorContainerClass_in_rule__StructureClass__Alternatives6607 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLogicalSystem_in_rule__StructureClass__Alternatives6624 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleActorClass_in_rule__ActorContainerClass__Alternatives6656 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSubSystemClass_in_rule__ActorContainerClass__Alternatives6673 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rulePrimitiveType_in_rule__DataType__Alternatives6705 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleEnumerationType_in_rule__DataType__Alternatives6722 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleComplexType_in_rule__DataType__Alternatives6739 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDataClass_in_rule__ComplexType__Alternatives6771 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExternalType_in_rule__ComplexType__Alternatives6788 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DataClass__OperationsAssignment_9_0_in_rule__DataClass__Alternatives_96820 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DataClass__StructorsAssignment_9_1_in_rule__DataClass__Alternatives_96838 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DataClass__AttributesAssignment_9_2_in_rule__DataClass__Alternatives_96856 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_12_in_rule__StandardOperation__Alternatives_6_16891 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StandardOperation__ReturnTypeAssignment_6_1_1_in_rule__StandardOperation__Alternatives_6_16910 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortOperation__Group_5_0__0_in_rule__PortOperation__Alternatives_56943 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortOperation__Group_5_1__0_in_rule__PortOperation__Alternatives_56961 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_12_in_rule__PortOperation__Alternatives_5_0_16995 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortOperation__ReturnTypeAssignment_5_0_1_1_in_rule__PortOperation__Alternatives_5_0_17014 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_13_in_rule__ClassStructor__NameAlternatives_0_07048 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_14_in_rule__ClassStructor__NameAlternatives_0_07068 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleProtocolClass_in_rule__GeneralProtocolClass__Alternatives7102 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCompoundProtocolClass_in_rule__GeneralProtocolClass__Alternatives7119 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortClass__MsgHandlersAssignment_3_0_in_rule__PortClass__Alternatives_37151 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortClass__OperationsAssignment_3_1_in_rule__PortClass__Alternatives_37169 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortClass__AttributesAssignment_3_2_in_rule__PortClass__Alternatives_37187 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInMessageHandler_in_rule__MessageHandler__Alternatives7220 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOutMessageHandler_in_rule__MessageHandler__Alternatives7237 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__ServiceProvisionPointsAssignment_7_2_0_in_rule__ActorClass__Alternatives_7_27269 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__InterfacePortsAssignment_7_2_1_in_rule__ActorClass__Alternatives_7_27287 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__ConnectionsAssignment_8_6_0_in_rule__ActorClass__Alternatives_8_67320 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__BindingsAssignment_8_6_1_in_rule__ActorClass__Alternatives_8_67338 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__ServiceImplementationsAssignment_8_6_2_in_rule__ActorClass__Alternatives_8_67356 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__AttributesAssignment_8_6_3_in_rule__ActorClass__Alternatives_8_67374 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__ActorRefsAssignment_8_6_4_in_rule__ActorClass__Alternatives_8_67392 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__ServiceAccessPointsAssignment_8_6_5_in_rule__ActorClass__Alternatives_8_67410 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__InternalPortsAssignment_8_6_6_in_rule__ActorClass__Alternatives_8_67428 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__ExternalPortsAssignment_8_6_7_in_rule__ActorClass__Alternatives_8_67446 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__OperationsAssignment_9_4_0_in_rule__ActorClass__Alternatives_9_47479 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__StructorsAssignment_9_4_1_in_rule__ActorClass__Alternatives_9_47497 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rulePort_in_rule__InterfaceItem__Alternatives7530 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSAP_in_rule__InterfaceItem__Alternatives7547 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSPP_in_rule__InterfaceItem__Alternatives7564 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LogicalSystem__ConnectionsAssignment_5_0_in_rule__LogicalSystem__Alternatives_57596 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LogicalSystem__BindingsAssignment_5_1_in_rule__LogicalSystem__Alternatives_57614 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LogicalSystem__SubSystemsAssignment_5_2_in_rule__LogicalSystem__Alternatives_57632 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemClass__ActorInstanceMappingsAssignment_8_0_in_rule__SubSystemClass__Alternatives_87666 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemClass__ThreadsAssignment_8_1_in_rule__SubSystemClass__Alternatives_87684 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemClass__ConnectionsAssignment_8_2_in_rule__SubSystemClass__Alternatives_87702 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemClass__BindingsAssignment_8_3_in_rule__SubSystemClass__Alternatives_87720 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemClass__ActorRefsAssignment_8_4_in_rule__SubSystemClass__Alternatives_87738 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemClass__ServiceProvisionPointsAssignment_8_5_in_rule__SubSystemClass__Alternatives_87756 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemClass__RelayPortsAssignment_8_6_in_rule__SubSystemClass__Alternatives_87774 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRefSAPoint_in_rule__SAPoint__Alternatives7807 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRelaySAPoint_in_rule__SAPoint__Alternatives7824 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_15_in_rule__MULTIPLICITY__Alternatives_17857 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__MULTIPLICITY__Alternatives_17876 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_16_in_rule__AnnotationTargetType__Alternatives7909 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_17_in_rule__AnnotationTargetType__Alternatives7929 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_18_in_rule__AnnotationTargetType__Alternatives7949 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_19_in_rule__AnnotationTargetType__Alternatives7969 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_20_in_rule__AnnotationTargetType__Alternatives7989 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_21_in_rule__AnnotationTargetType__Alternatives8009 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_22_in_rule__AnnotationTargetType__Alternatives8029 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleState_in_rule__StateGraphNode__Alternatives8063 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChoicePoint_in_rule__StateGraphNode__Alternatives8080 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTrPoint_in_rule__StateGraphNode__Alternatives8097 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StateGraph__StatesAssignment_2_0_in_rule__StateGraph__Alternatives_28130 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StateGraph__TrPointsAssignment_2_1_in_rule__StateGraph__Alternatives_28148 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StateGraph__ChPointsAssignment_2_2_in_rule__StateGraph__Alternatives_28166 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StateGraph__TransitionsAssignment_2_3_in_rule__StateGraph__Alternatives_28184 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StateGraph__RefinedTransitionsAssignment_2_4_in_rule__StateGraph__Alternatives_28202 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StateMachine__StatesAssignment_3_0_in_rule__StateMachine__Alternatives_38235 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StateMachine__TrPointsAssignment_3_1_in_rule__StateMachine__Alternatives_38253 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StateMachine__ChPointsAssignment_3_2_in_rule__StateMachine__Alternatives_38271 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StateMachine__TransitionsAssignment_3_3_in_rule__StateMachine__Alternatives_38289 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StateMachine__RefinedTransitionsAssignment_3_4_in_rule__StateMachine__Alternatives_38307 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleState_in_rule__State__Alternatives8340 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRefinedState_in_rule__State__Alternatives8357 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTransitionPoint_in_rule__TrPoint__Alternatives8389 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleEntryPoint_in_rule__TrPoint__Alternatives8406 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExitPoint_in_rule__TrPoint__Alternatives8423 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInitialTransition_in_rule__Transition__Alternatives8455 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNonInitialTransition_in_rule__Transition__Alternatives8472 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTransitionChainStartTransition_in_rule__NonInitialTransition__Alternatives8504 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleContinuationTransition_in_rule__NonInitialTransition__Alternatives8521 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCPBranchTransition_in_rule__NonInitialTransition__Alternatives8538 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTriggeredTransition_in_rule__TransitionChainStartTransition__Alternatives8570 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGuardedTransition_in_rule__TransitionChainStartTransition__Alternatives8587 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStateTerminal_in_rule__TransitionTerminal__Alternatives8619 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTrPointTerminal_in_rule__TransitionTerminal__Alternatives8636 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSubStateTrPointTerminal_in_rule__TransitionTerminal__Alternatives8653 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChoicepointTerminal_in_rule__TransitionTerminal__Alternatives8670 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInSemanticsRule_in_rule__SemanticsRule__Alternatives8702 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOutSemanticsRule_in_rule__SemanticsRule__Alternatives8719 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__FollowUpsAssignment_3_1_0_in_rule__InSemanticsRule__Alternatives_3_18751 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__Group_3_1_1__0_in_rule__InSemanticsRule__Alternatives_3_18769 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__FollowUpsAssignment_3_1_0_in_rule__OutSemanticsRule__Alternatives_3_18802 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__Group_3_1_1__0_in_rule__OutSemanticsRule__Alternatives_3_18820 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AnnotationType__TargetsAssignment_6_0_in_rule__AnnotationType__Alternatives_68853 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AnnotationType__Group_6_1__0_in_rule__AnnotationType__Alternatives_68871 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleAnnotationAttribute_in_rule__AnnotationAttribute__Alternatives8904 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleEnumAnnotationAttribute_in_rule__AnnotationAttribute__Alternatives8921 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__OptionalAssignment_0_0_in_rule__SimpleAnnotationAttribute__Alternatives_08953 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_23_in_rule__SimpleAnnotationAttribute__Alternatives_08972 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__OptionalAssignment_0_0_in_rule__EnumAnnotationAttribute__Alternatives_09006 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_23_in_rule__EnumAnnotationAttribute__Alternatives_09025 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__Group_1_0__0_in_rule__Import__Alternatives_19059 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_24_in_rule__Import__Alternatives_19078 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleBooleanLiteral_in_rule__Literal__Alternatives9113 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNumberLiteral_in_rule__Literal__Alternatives9130 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStringLiteral_in_rule__Literal__Alternatives9147 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_25_in_rule__BooleanLiteral__Alternatives_19180 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__BooleanLiteral__IsTrueAssignment_1_1_in_rule__BooleanLiteral__Alternatives_19199 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntLiteral_in_rule__NumberLiteral__Alternatives9232 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRealLiteral_in_rule__NumberLiteral__Alternatives9249 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Integer__Group_0__0_in_rule__Integer__Alternatives9281 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_HEX_in_rule__Integer__Alternatives9299 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_26_in_rule__Integer__Alternatives_0_09332 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_rule__Integer__Alternatives_0_09352 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDecimal_in_rule__Real__Alternatives9386 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDecimalExp_in_rule__Real__Alternatives9403 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_26_in_rule__Decimal__Alternatives_09436 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_rule__Decimal__Alternatives_09456 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_26_in_rule__DecimalExp__Alternatives_09491 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_rule__DecimalExp__Alternatives_09511 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_rule__DecimalExp__Alternatives_49546 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_rule__DecimalExp__Alternatives_49566 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_26_in_rule__DecimalExp__Alternatives_59601 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_rule__DecimalExp__Alternatives_59621 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_30_in_rule__CommunicationType__Alternatives9656 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_31_in_rule__CommunicationType__Alternatives9677 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_rule__CommunicationType__Alternatives9698 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_rule__ReferenceType__Alternatives9734 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_34_in_rule__ReferenceType__Alternatives9755 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_30_in_rule__ComponentCommunicationType__Alternatives9792 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_31_in_rule__ComponentCommunicationType__Alternatives9813 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_35_in_rule__ComponentCommunicationType__Alternatives9834 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_rule__ComponentCommunicationType__Alternatives9855 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_36_in_rule__LiteralType__Alternatives9891 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_37_in_rule__LiteralType__Alternatives9912 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_38_in_rule__LiteralType__Alternatives9933 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_39_in_rule__LiteralType__Alternatives9954 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RoomModel__Group__0__Impl_in_rule__RoomModel__Group__09987 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__RoomModel__Group__1_in_rule__RoomModel__Group__09990 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_40_in_rule__RoomModel__Group__0__Impl10018 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RoomModel__Group__1__Impl_in_rule__RoomModel__Group__110049 = new BitSet(new long[]{0x0800020000000000L});
-    public static final BitSet FOLLOW_rule__RoomModel__Group__2_in_rule__RoomModel__Group__110052 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RoomModel__NameAssignment_1_in_rule__RoomModel__Group__1__Impl10079 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RoomModel__Group__2__Impl_in_rule__RoomModel__Group__210109 = new BitSet(new long[]{0x0800020000000000L});
-    public static final BitSet FOLLOW_rule__RoomModel__Group__3_in_rule__RoomModel__Group__210112 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RoomModel__DocuAssignment_2_in_rule__RoomModel__Group__2__Impl10139 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RoomModel__Group__3__Impl_in_rule__RoomModel__Group__310170 = new BitSet(new long[]{0x00221409C0790000L,0x1200000000000000L,0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RoomModel__Group__4_in_rule__RoomModel__Group__310173 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_rule__RoomModel__Group__3__Impl10201 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RoomModel__Group__4__Impl_in_rule__RoomModel__Group__410232 = new BitSet(new long[]{0x00221409C0790000L,0x1200000000000000L,0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RoomModel__Group__5_in_rule__RoomModel__Group__410235 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RoomModel__ImportsAssignment_4_in_rule__RoomModel__Group__4__Impl10262 = new BitSet(new long[]{0x0000000000000002L,0x1000000000000000L});
-    public static final BitSet FOLLOW_rule__RoomModel__Group__5__Impl_in_rule__RoomModel__Group__510293 = new BitSet(new long[]{0x00221409C0790000L,0x1200000000000000L,0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RoomModel__Group__6_in_rule__RoomModel__Group__510296 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RoomModel__Alternatives_5_in_rule__RoomModel__Group__5__Impl10323 = new BitSet(new long[]{0x00221009C0790002L,0x0200000000000000L,0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RoomModel__Group__6__Impl_in_rule__RoomModel__Group__610354 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rule__RoomModel__Group__6__Impl10382 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__VarDecl__Group__0__Impl_in_rule__VarDecl__Group__010427 = new BitSet(new long[]{0x0000080000000000L});
-    public static final BitSet FOLLOW_rule__VarDecl__Group__1_in_rule__VarDecl__Group__010430 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__VarDecl__NameAssignment_0_in_rule__VarDecl__Group__0__Impl10457 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__VarDecl__Group__1__Impl_in_rule__VarDecl__Group__110487 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__VarDecl__Group__2_in_rule__VarDecl__Group__110490 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_43_in_rule__VarDecl__Group__1__Impl10518 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__VarDecl__Group__2__Impl_in_rule__VarDecl__Group__210549 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__VarDecl__RefTypeAssignment_2_in_rule__VarDecl__Group__2__Impl10576 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefableType__Group__0__Impl_in_rule__RefableType__Group__010612 = new BitSet(new long[]{0x0000000000000000L,0x0000000004000000L});
-    public static final BitSet FOLLOW_rule__RefableType__Group__1_in_rule__RefableType__Group__010615 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefableType__TypeAssignment_0_in_rule__RefableType__Group__0__Impl10642 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefableType__Group__1__Impl_in_rule__RefableType__Group__110672 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefableType__RefAssignment_1_in_rule__RefableType__Group__1__Impl10699 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PrimitiveType__Group__0__Impl_in_rule__PrimitiveType__Group__010734 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__PrimitiveType__Group__1_in_rule__PrimitiveType__Group__010737 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_44_in_rule__PrimitiveType__Group__0__Impl10765 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PrimitiveType__Group__1__Impl_in_rule__PrimitiveType__Group__110796 = new BitSet(new long[]{0x0000080000000000L});
-    public static final BitSet FOLLOW_rule__PrimitiveType__Group__2_in_rule__PrimitiveType__Group__110799 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PrimitiveType__NameAssignment_1_in_rule__PrimitiveType__Group__1__Impl10826 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PrimitiveType__Group__2__Impl_in_rule__PrimitiveType__Group__210856 = new BitSet(new long[]{0x000000F000000000L});
-    public static final BitSet FOLLOW_rule__PrimitiveType__Group__3_in_rule__PrimitiveType__Group__210859 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_43_in_rule__PrimitiveType__Group__2__Impl10887 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PrimitiveType__Group__3__Impl_in_rule__PrimitiveType__Group__310918 = new BitSet(new long[]{0x0000200000000000L});
-    public static final BitSet FOLLOW_rule__PrimitiveType__Group__4_in_rule__PrimitiveType__Group__310921 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PrimitiveType__TypeAssignment_3_in_rule__PrimitiveType__Group__3__Impl10948 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PrimitiveType__Group__4__Impl_in_rule__PrimitiveType__Group__410978 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__PrimitiveType__Group__5_in_rule__PrimitiveType__Group__410981 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_45_in_rule__PrimitiveType__Group__4__Impl11009 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PrimitiveType__Group__5__Impl_in_rule__PrimitiveType__Group__511040 = new BitSet(new long[]{0x0000C00000000000L});
-    public static final BitSet FOLLOW_rule__PrimitiveType__Group__6_in_rule__PrimitiveType__Group__511043 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PrimitiveType__TargetNameAssignment_5_in_rule__PrimitiveType__Group__5__Impl11070 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PrimitiveType__Group__6__Impl_in_rule__PrimitiveType__Group__611100 = new BitSet(new long[]{0x0000C00000000000L});
-    public static final BitSet FOLLOW_rule__PrimitiveType__Group__7_in_rule__PrimitiveType__Group__611103 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PrimitiveType__Group_6__0_in_rule__PrimitiveType__Group__6__Impl11130 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PrimitiveType__Group__7__Impl_in_rule__PrimitiveType__Group__711161 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__PrimitiveType__Group__8_in_rule__PrimitiveType__Group__711164 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_rule__PrimitiveType__Group__7__Impl11192 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PrimitiveType__Group__8__Impl_in_rule__PrimitiveType__Group__811223 = new BitSet(new long[]{0x0800000000000000L});
-    public static final BitSet FOLLOW_rule__PrimitiveType__Group__9_in_rule__PrimitiveType__Group__811226 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PrimitiveType__DefaultValueLiteralAssignment_8_in_rule__PrimitiveType__Group__8__Impl11253 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PrimitiveType__Group__9__Impl_in_rule__PrimitiveType__Group__911283 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PrimitiveType__DocuAssignment_9_in_rule__PrimitiveType__Group__9__Impl11310 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PrimitiveType__Group_6__0__Impl_in_rule__PrimitiveType__Group_6__011361 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__PrimitiveType__Group_6__1_in_rule__PrimitiveType__Group_6__011364 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_rule__PrimitiveType__Group_6__0__Impl11392 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PrimitiveType__Group_6__1__Impl_in_rule__PrimitiveType__Group_6__111423 = new BitSet(new long[]{0x0001000000000000L});
-    public static final BitSet FOLLOW_rule__PrimitiveType__Group_6__2_in_rule__PrimitiveType__Group_6__111426 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PrimitiveType__CastNameAssignment_6_1_in_rule__PrimitiveType__Group_6__1__Impl11453 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PrimitiveType__Group_6__2__Impl_in_rule__PrimitiveType__Group_6__211483 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_48_in_rule__PrimitiveType__Group_6__2__Impl11511 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumerationType__Group__0__Impl_in_rule__EnumerationType__Group__011548 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__EnumerationType__Group__1_in_rule__EnumerationType__Group__011551 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_49_in_rule__EnumerationType__Group__0__Impl11579 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumerationType__Group__1__Impl_in_rule__EnumerationType__Group__111610 = new BitSet(new long[]{0x0804020000000000L});
-    public static final BitSet FOLLOW_rule__EnumerationType__Group__2_in_rule__EnumerationType__Group__111613 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumerationType__NameAssignment_1_in_rule__EnumerationType__Group__1__Impl11640 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumerationType__Group__2__Impl_in_rule__EnumerationType__Group__211670 = new BitSet(new long[]{0x0804020000000000L});
-    public static final BitSet FOLLOW_rule__EnumerationType__Group__3_in_rule__EnumerationType__Group__211673 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumerationType__DocuAssignment_2_in_rule__EnumerationType__Group__2__Impl11700 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumerationType__Group__3__Impl_in_rule__EnumerationType__Group__311731 = new BitSet(new long[]{0x0804020000000000L});
-    public static final BitSet FOLLOW_rule__EnumerationType__Group__4_in_rule__EnumerationType__Group__311734 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumerationType__Group_3__0_in_rule__EnumerationType__Group__3__Impl11761 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumerationType__Group__4__Impl_in_rule__EnumerationType__Group__411792 = new BitSet(new long[]{0x0000040000000040L});
-    public static final BitSet FOLLOW_rule__EnumerationType__Group__5_in_rule__EnumerationType__Group__411795 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_rule__EnumerationType__Group__4__Impl11823 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumerationType__Group__5__Impl_in_rule__EnumerationType__Group__511854 = new BitSet(new long[]{0x0000040000000040L});
-    public static final BitSet FOLLOW_rule__EnumerationType__Group__6_in_rule__EnumerationType__Group__511857 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumerationType__Group_5__0_in_rule__EnumerationType__Group__5__Impl11884 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumerationType__Group__6__Impl_in_rule__EnumerationType__Group__611915 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rule__EnumerationType__Group__6__Impl11943 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumerationType__Group_3__0__Impl_in_rule__EnumerationType__Group_3__011988 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__EnumerationType__Group_3__1_in_rule__EnumerationType__Group_3__011991 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_50_in_rule__EnumerationType__Group_3__0__Impl12019 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumerationType__Group_3__1__Impl_in_rule__EnumerationType__Group_3__112050 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumerationType__PrimitiveTypeAssignment_3_1_in_rule__EnumerationType__Group_3__1__Impl12077 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumerationType__Group_5__0__Impl_in_rule__EnumerationType__Group_5__012111 = new BitSet(new long[]{0x0008000000000000L});
-    public static final BitSet FOLLOW_rule__EnumerationType__Group_5__1_in_rule__EnumerationType__Group_5__012114 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumerationType__LiteralsAssignment_5_0_in_rule__EnumerationType__Group_5__0__Impl12141 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumerationType__Group_5__1__Impl_in_rule__EnumerationType__Group_5__112171 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumerationType__Group_5_1__0_in_rule__EnumerationType__Group_5__1__Impl12198 = new BitSet(new long[]{0x0008000000000002L});
-    public static final BitSet FOLLOW_rule__EnumerationType__Group_5_1__0__Impl_in_rule__EnumerationType__Group_5_1__012233 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__EnumerationType__Group_5_1__1_in_rule__EnumerationType__Group_5_1__012236 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_rule__EnumerationType__Group_5_1__0__Impl12264 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumerationType__Group_5_1__1__Impl_in_rule__EnumerationType__Group_5_1__112295 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumerationType__LiteralsAssignment_5_1_1_in_rule__EnumerationType__Group_5_1__1__Impl12322 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumLiteral__Group__0__Impl_in_rule__EnumLiteral__Group__012356 = new BitSet(new long[]{0x0010000000000000L});
-    public static final BitSet FOLLOW_rule__EnumLiteral__Group__1_in_rule__EnumLiteral__Group__012359 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumLiteral__NameAssignment_0_in_rule__EnumLiteral__Group__0__Impl12386 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumLiteral__Group__1__Impl_in_rule__EnumLiteral__Group__112416 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumLiteral__Group_1__0_in_rule__EnumLiteral__Group__1__Impl12443 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumLiteral__Group_1__0__Impl_in_rule__EnumLiteral__Group_1__012478 = new BitSet(new long[]{0x000000000C000030L});
-    public static final BitSet FOLLOW_rule__EnumLiteral__Group_1__1_in_rule__EnumLiteral__Group_1__012481 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_52_in_rule__EnumLiteral__Group_1__0__Impl12509 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumLiteral__Group_1__1__Impl_in_rule__EnumLiteral__Group_1__112540 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumLiteral__LiteralAssignment_1_1_in_rule__EnumLiteral__Group_1__1__Impl12567 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ExternalType__Group__0__Impl_in_rule__ExternalType__Group__012601 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__ExternalType__Group__1_in_rule__ExternalType__Group__012604 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_53_in_rule__ExternalType__Group__0__Impl12632 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ExternalType__Group__1__Impl_in_rule__ExternalType__Group__112663 = new BitSet(new long[]{0x0000200000000000L});
-    public static final BitSet FOLLOW_rule__ExternalType__Group__2_in_rule__ExternalType__Group__112666 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ExternalType__NameAssignment_1_in_rule__ExternalType__Group__1__Impl12693 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ExternalType__Group__2__Impl_in_rule__ExternalType__Group__212723 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__ExternalType__Group__3_in_rule__ExternalType__Group__212726 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_45_in_rule__ExternalType__Group__2__Impl12754 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ExternalType__Group__3__Impl_in_rule__ExternalType__Group__312785 = new BitSet(new long[]{0x0800400000000000L});
-    public static final BitSet FOLLOW_rule__ExternalType__Group__4_in_rule__ExternalType__Group__312788 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ExternalType__TargetNameAssignment_3_in_rule__ExternalType__Group__3__Impl12815 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ExternalType__Group__4__Impl_in_rule__ExternalType__Group__412845 = new BitSet(new long[]{0x0800400000000000L});
-    public static final BitSet FOLLOW_rule__ExternalType__Group__5_in_rule__ExternalType__Group__412848 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ExternalType__Group_4__0_in_rule__ExternalType__Group__4__Impl12875 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ExternalType__Group__5__Impl_in_rule__ExternalType__Group__512906 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ExternalType__DocuAssignment_5_in_rule__ExternalType__Group__5__Impl12933 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ExternalType__Group_4__0__Impl_in_rule__ExternalType__Group_4__012976 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__ExternalType__Group_4__1_in_rule__ExternalType__Group_4__012979 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_rule__ExternalType__Group_4__0__Impl13007 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ExternalType__Group_4__1__Impl_in_rule__ExternalType__Group_4__113038 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ExternalType__DefaultValueLiteralAssignment_4_1_in_rule__ExternalType__Group_4__1__Impl13065 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DataClass__Group__0__Impl_in_rule__DataClass__Group__013099 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__DataClass__Group__1_in_rule__DataClass__Group__013102 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_16_in_rule__DataClass__Group__0__Impl13130 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DataClass__Group__1__Impl_in_rule__DataClass__Group__113161 = new BitSet(new long[]{0x0840020000000000L});
-    public static final BitSet FOLLOW_rule__DataClass__Group__2_in_rule__DataClass__Group__113164 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DataClass__NameAssignment_1_in_rule__DataClass__Group__1__Impl13191 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DataClass__Group__2__Impl_in_rule__DataClass__Group__213221 = new BitSet(new long[]{0x0840020000000000L});
-    public static final BitSet FOLLOW_rule__DataClass__Group__3_in_rule__DataClass__Group__213224 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DataClass__DocuAssignment_2_in_rule__DataClass__Group__2__Impl13251 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DataClass__Group__3__Impl_in_rule__DataClass__Group__313282 = new BitSet(new long[]{0x0840020000000000L});
-    public static final BitSet FOLLOW_rule__DataClass__Group__4_in_rule__DataClass__Group__313285 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DataClass__Group_3__0_in_rule__DataClass__Group__3__Impl13312 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DataClass__Group__4__Impl_in_rule__DataClass__Group__413343 = new BitSet(new long[]{0x2780040000006000L,0x8100000000000000L});
-    public static final BitSet FOLLOW_rule__DataClass__Group__5_in_rule__DataClass__Group__413346 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_rule__DataClass__Group__4__Impl13374 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DataClass__Group__5__Impl_in_rule__DataClass__Group__513405 = new BitSet(new long[]{0x2780040000006000L,0x8100000000000000L});
-    public static final BitSet FOLLOW_rule__DataClass__Group__6_in_rule__DataClass__Group__513408 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DataClass__AnnotationsAssignment_5_in_rule__DataClass__Group__5__Impl13435 = new BitSet(new long[]{0x0000000000000002L,0x0100000000000000L});
-    public static final BitSet FOLLOW_rule__DataClass__Group__6__Impl_in_rule__DataClass__Group__613466 = new BitSet(new long[]{0x2780040000006000L,0x8100000000000000L});
-    public static final BitSet FOLLOW_rule__DataClass__Group__7_in_rule__DataClass__Group__613469 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DataClass__Group_6__0_in_rule__DataClass__Group__6__Impl13496 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DataClass__Group__7__Impl_in_rule__DataClass__Group__713527 = new BitSet(new long[]{0x2780040000006000L,0x8100000000000000L});
-    public static final BitSet FOLLOW_rule__DataClass__Group__8_in_rule__DataClass__Group__713530 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DataClass__Group_7__0_in_rule__DataClass__Group__7__Impl13557 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DataClass__Group__8__Impl_in_rule__DataClass__Group__813588 = new BitSet(new long[]{0x2780040000006000L,0x8100000000000000L});
-    public static final BitSet FOLLOW_rule__DataClass__Group__9_in_rule__DataClass__Group__813591 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DataClass__Group_8__0_in_rule__DataClass__Group__8__Impl13618 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DataClass__Group__9__Impl_in_rule__DataClass__Group__913649 = new BitSet(new long[]{0x2780040000006000L,0x8100000000000000L});
-    public static final BitSet FOLLOW_rule__DataClass__Group__10_in_rule__DataClass__Group__913652 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DataClass__Alternatives_9_in_rule__DataClass__Group__9__Impl13679 = new BitSet(new long[]{0x2400000000006002L,0x8000000000000000L});
-    public static final BitSet FOLLOW_rule__DataClass__Group__10__Impl_in_rule__DataClass__Group__1013710 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rule__DataClass__Group__10__Impl13738 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DataClass__Group_3__0__Impl_in_rule__DataClass__Group_3__013791 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__DataClass__Group_3__1_in_rule__DataClass__Group_3__013794 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_54_in_rule__DataClass__Group_3__0__Impl13822 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DataClass__Group_3__1__Impl_in_rule__DataClass__Group_3__113853 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DataClass__BaseAssignment_3_1_in_rule__DataClass__Group_3__1__Impl13880 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DataClass__Group_6__0__Impl_in_rule__DataClass__Group_6__013914 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_rule__DataClass__Group_6__1_in_rule__DataClass__Group_6__013917 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_55_in_rule__DataClass__Group_6__0__Impl13945 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DataClass__Group_6__1__Impl_in_rule__DataClass__Group_6__113976 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DataClass__UserCode1Assignment_6_1_in_rule__DataClass__Group_6__1__Impl14003 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DataClass__Group_7__0__Impl_in_rule__DataClass__Group_7__014037 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_rule__DataClass__Group_7__1_in_rule__DataClass__Group_7__014040 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_56_in_rule__DataClass__Group_7__0__Impl14068 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DataClass__Group_7__1__Impl_in_rule__DataClass__Group_7__114099 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DataClass__UserCode2Assignment_7_1_in_rule__DataClass__Group_7__1__Impl14126 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DataClass__Group_8__0__Impl_in_rule__DataClass__Group_8__014160 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_rule__DataClass__Group_8__1_in_rule__DataClass__Group_8__014163 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_57_in_rule__DataClass__Group_8__0__Impl14191 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DataClass__Group_8__1__Impl_in_rule__DataClass__Group_8__114222 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DataClass__UserCode3Assignment_8_1_in_rule__DataClass__Group_8__1__Impl14249 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Attribute__Group__0__Impl_in_rule__Attribute__Group__014283 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__Attribute__Group__1_in_rule__Attribute__Group__014286 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_58_in_rule__Attribute__Group__0__Impl14314 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Attribute__Group__1__Impl_in_rule__Attribute__Group__114345 = new BitSet(new long[]{0x0800080000000000L});
-    public static final BitSet FOLLOW_rule__Attribute__Group__2_in_rule__Attribute__Group__114348 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Attribute__NameAssignment_1_in_rule__Attribute__Group__1__Impl14375 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Attribute__Group__2__Impl_in_rule__Attribute__Group__214405 = new BitSet(new long[]{0x0800080000000000L});
-    public static final BitSet FOLLOW_rule__Attribute__Group__3_in_rule__Attribute__Group__214408 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Attribute__Group_2__0_in_rule__Attribute__Group__2__Impl14435 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Attribute__Group__3__Impl_in_rule__Attribute__Group__314466 = new BitSet(new long[]{0x0810000000000040L});
-    public static final BitSet FOLLOW_rule__Attribute__Group__4_in_rule__Attribute__Group__314469 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_43_in_rule__Attribute__Group__3__Impl14497 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Attribute__Group__4__Impl_in_rule__Attribute__Group__414528 = new BitSet(new long[]{0x0810000000000040L});
-    public static final BitSet FOLLOW_rule__Attribute__Group__5_in_rule__Attribute__Group__414531 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Attribute__TypeAssignment_4_in_rule__Attribute__Group__4__Impl14558 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Attribute__Group__5__Impl_in_rule__Attribute__Group__514589 = new BitSet(new long[]{0x0810000000000040L});
-    public static final BitSet FOLLOW_rule__Attribute__Group__6_in_rule__Attribute__Group__514592 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Attribute__Group_5__0_in_rule__Attribute__Group__5__Impl14619 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Attribute__Group__6__Impl_in_rule__Attribute__Group__614650 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Attribute__DocuAssignment_6_in_rule__Attribute__Group__6__Impl14677 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Attribute__Group_2__0__Impl_in_rule__Attribute__Group_2__014722 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__Attribute__Group_2__1_in_rule__Attribute__Group_2__014725 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_59_in_rule__Attribute__Group_2__0__Impl14753 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Attribute__Group_2__1__Impl_in_rule__Attribute__Group_2__114784 = new BitSet(new long[]{0x1000000000000000L});
-    public static final BitSet FOLLOW_rule__Attribute__Group_2__2_in_rule__Attribute__Group_2__114787 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Attribute__SizeAssignment_2_1_in_rule__Attribute__Group_2__1__Impl14814 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Attribute__Group_2__2__Impl_in_rule__Attribute__Group_2__214844 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_60_in_rule__Attribute__Group_2__2__Impl14872 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Attribute__Group_5__0__Impl_in_rule__Attribute__Group_5__014909 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__Attribute__Group_5__1_in_rule__Attribute__Group_5__014912 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_52_in_rule__Attribute__Group_5__0__Impl14940 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Attribute__Group_5__1__Impl_in_rule__Attribute__Group_5__114971 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Attribute__DefaultValueLiteralAssignment_5_1_in_rule__Attribute__Group_5__1__Impl14998 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StandardOperation__Group__0__Impl_in_rule__StandardOperation__Group__015032 = new BitSet(new long[]{0x2000000000000000L,0x8000000000000000L});
-    public static final BitSet FOLLOW_rule__StandardOperation__Group__1_in_rule__StandardOperation__Group__015035 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StandardOperation__OverrideAssignment_0_in_rule__StandardOperation__Group__0__Impl15062 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StandardOperation__Group__1__Impl_in_rule__StandardOperation__Group__115093 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__StandardOperation__Group__2_in_rule__StandardOperation__Group__115096 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_61_in_rule__StandardOperation__Group__1__Impl15124 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StandardOperation__Group__2__Impl_in_rule__StandardOperation__Group__215155 = new BitSet(new long[]{0x0000800000000000L});
-    public static final BitSet FOLLOW_rule__StandardOperation__Group__3_in_rule__StandardOperation__Group__215158 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StandardOperation__NameAssignment_2_in_rule__StandardOperation__Group__2__Impl15185 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StandardOperation__Group__3__Impl_in_rule__StandardOperation__Group__315215 = new BitSet(new long[]{0x0001000000000040L});
-    public static final BitSet FOLLOW_rule__StandardOperation__Group__4_in_rule__StandardOperation__Group__315218 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_rule__StandardOperation__Group__3__Impl15246 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StandardOperation__Group__4__Impl_in_rule__StandardOperation__Group__415277 = new BitSet(new long[]{0x0001000000000040L});
-    public static final BitSet FOLLOW_rule__StandardOperation__Group__5_in_rule__StandardOperation__Group__415280 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StandardOperation__Group_4__0_in_rule__StandardOperation__Group__4__Impl15307 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StandardOperation__Group__5__Impl_in_rule__StandardOperation__Group__515338 = new BitSet(new long[]{0x08000A0000000000L});
-    public static final BitSet FOLLOW_rule__StandardOperation__Group__6_in_rule__StandardOperation__Group__515341 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_48_in_rule__StandardOperation__Group__5__Impl15369 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StandardOperation__Group__6__Impl_in_rule__StandardOperation__Group__615400 = new BitSet(new long[]{0x08000A0000000000L});
-    public static final BitSet FOLLOW_rule__StandardOperation__Group__7_in_rule__StandardOperation__Group__615403 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StandardOperation__Group_6__0_in_rule__StandardOperation__Group__6__Impl15430 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StandardOperation__Group__7__Impl_in_rule__StandardOperation__Group__715461 = new BitSet(new long[]{0x08000A0000000000L});
-    public static final BitSet FOLLOW_rule__StandardOperation__Group__8_in_rule__StandardOperation__Group__715464 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StandardOperation__DocuAssignment_7_in_rule__StandardOperation__Group__7__Impl15491 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StandardOperation__Group__8__Impl_in_rule__StandardOperation__Group__815522 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StandardOperation__DetailCodeAssignment_8_in_rule__StandardOperation__Group__8__Impl15549 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StandardOperation__Group_4__0__Impl_in_rule__StandardOperation__Group_4__015597 = new BitSet(new long[]{0x0008000000000000L});
-    public static final BitSet FOLLOW_rule__StandardOperation__Group_4__1_in_rule__StandardOperation__Group_4__015600 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StandardOperation__ArgumentsAssignment_4_0_in_rule__StandardOperation__Group_4__0__Impl15627 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StandardOperation__Group_4__1__Impl_in_rule__StandardOperation__Group_4__115657 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StandardOperation__Group_4_1__0_in_rule__StandardOperation__Group_4__1__Impl15684 = new BitSet(new long[]{0x0008000000000002L});
-    public static final BitSet FOLLOW_rule__StandardOperation__Group_4_1__0__Impl_in_rule__StandardOperation__Group_4_1__015719 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__StandardOperation__Group_4_1__1_in_rule__StandardOperation__Group_4_1__015722 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_rule__StandardOperation__Group_4_1__0__Impl15750 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StandardOperation__Group_4_1__1__Impl_in_rule__StandardOperation__Group_4_1__115781 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StandardOperation__ArgumentsAssignment_4_1_1_in_rule__StandardOperation__Group_4_1__1__Impl15808 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StandardOperation__Group_6__0__Impl_in_rule__StandardOperation__Group_6__015842 = new BitSet(new long[]{0x0000000000001040L});
-    public static final BitSet FOLLOW_rule__StandardOperation__Group_6__1_in_rule__StandardOperation__Group_6__015845 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_43_in_rule__StandardOperation__Group_6__0__Impl15873 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StandardOperation__Group_6__1__Impl_in_rule__StandardOperation__Group_6__115904 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StandardOperation__Alternatives_6_1_in_rule__StandardOperation__Group_6__1__Impl15931 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortOperation__Group__0__Impl_in_rule__PortOperation__Group__015965 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__PortOperation__Group__1_in_rule__PortOperation__Group__015968 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_61_in_rule__PortOperation__Group__0__Impl15996 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortOperation__Group__1__Impl_in_rule__PortOperation__Group__116027 = new BitSet(new long[]{0x0000800000000000L});
-    public static final BitSet FOLLOW_rule__PortOperation__Group__2_in_rule__PortOperation__Group__116030 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortOperation__NameAssignment_1_in_rule__PortOperation__Group__1__Impl16057 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortOperation__Group__2__Impl_in_rule__PortOperation__Group__216087 = new BitSet(new long[]{0x0001000000000040L});
-    public static final BitSet FOLLOW_rule__PortOperation__Group__3_in_rule__PortOperation__Group__216090 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_rule__PortOperation__Group__2__Impl16118 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortOperation__Group__3__Impl_in_rule__PortOperation__Group__316149 = new BitSet(new long[]{0x0001000000000040L});
-    public static final BitSet FOLLOW_rule__PortOperation__Group__4_in_rule__PortOperation__Group__316152 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortOperation__Group_3__0_in_rule__PortOperation__Group__3__Impl16179 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortOperation__Group__4__Impl_in_rule__PortOperation__Group__416210 = new BitSet(new long[]{0x48000A0000000000L});
-    public static final BitSet FOLLOW_rule__PortOperation__Group__5_in_rule__PortOperation__Group__416213 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_48_in_rule__PortOperation__Group__4__Impl16241 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortOperation__Group__5__Impl_in_rule__PortOperation__Group__516272 = new BitSet(new long[]{0x48000A0000000000L});
-    public static final BitSet FOLLOW_rule__PortOperation__Group__6_in_rule__PortOperation__Group__516275 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortOperation__Alternatives_5_in_rule__PortOperation__Group__5__Impl16302 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortOperation__Group__6__Impl_in_rule__PortOperation__Group__616333 = new BitSet(new long[]{0x48000A0000000000L});
-    public static final BitSet FOLLOW_rule__PortOperation__Group__7_in_rule__PortOperation__Group__616336 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortOperation__DocuAssignment_6_in_rule__PortOperation__Group__6__Impl16363 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortOperation__Group__7__Impl_in_rule__PortOperation__Group__716394 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortOperation__DetailCodeAssignment_7_in_rule__PortOperation__Group__7__Impl16421 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortOperation__Group_3__0__Impl_in_rule__PortOperation__Group_3__016467 = new BitSet(new long[]{0x0008000000000000L});
-    public static final BitSet FOLLOW_rule__PortOperation__Group_3__1_in_rule__PortOperation__Group_3__016470 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortOperation__ArgumentsAssignment_3_0_in_rule__PortOperation__Group_3__0__Impl16497 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortOperation__Group_3__1__Impl_in_rule__PortOperation__Group_3__116527 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortOperation__Group_3_1__0_in_rule__PortOperation__Group_3__1__Impl16554 = new BitSet(new long[]{0x0008000000000002L});
-    public static final BitSet FOLLOW_rule__PortOperation__Group_3_1__0__Impl_in_rule__PortOperation__Group_3_1__016589 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__PortOperation__Group_3_1__1_in_rule__PortOperation__Group_3_1__016592 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_rule__PortOperation__Group_3_1__0__Impl16620 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortOperation__Group_3_1__1__Impl_in_rule__PortOperation__Group_3_1__116651 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortOperation__ArgumentsAssignment_3_1_1_in_rule__PortOperation__Group_3_1__1__Impl16678 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortOperation__Group_5_0__0__Impl_in_rule__PortOperation__Group_5_0__016712 = new BitSet(new long[]{0x0000000000001040L});
-    public static final BitSet FOLLOW_rule__PortOperation__Group_5_0__1_in_rule__PortOperation__Group_5_0__016715 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_43_in_rule__PortOperation__Group_5_0__0__Impl16743 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortOperation__Group_5_0__1__Impl_in_rule__PortOperation__Group_5_0__116774 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortOperation__Alternatives_5_0_1_in_rule__PortOperation__Group_5_0__1__Impl16801 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortOperation__Group_5_1__0__Impl_in_rule__PortOperation__Group_5_1__016835 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__PortOperation__Group_5_1__1_in_rule__PortOperation__Group_5_1__016838 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_62_in_rule__PortOperation__Group_5_1__0__Impl16866 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortOperation__Group_5_1__1__Impl_in_rule__PortOperation__Group_5_1__116897 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortOperation__SendsMsgAssignment_5_1_1_in_rule__PortOperation__Group_5_1__1__Impl16924 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ClassStructor__Group__0__Impl_in_rule__ClassStructor__Group__016958 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_rule__ClassStructor__Group__1_in_rule__ClassStructor__Group__016961 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ClassStructor__NameAssignment_0_in_rule__ClassStructor__Group__0__Impl16988 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ClassStructor__Group__1__Impl_in_rule__ClassStructor__Group__117018 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ClassStructor__DetailCodeAssignment_1_in_rule__ClassStructor__Group__1__Impl17045 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group__0__Impl_in_rule__ProtocolClass__Group__017079 = new BitSet(new long[]{0x00000001C0080000L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group__1_in_rule__ProtocolClass__Group__017082 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__CommTypeAssignment_0_in_rule__ProtocolClass__Group__0__Impl17109 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group__1__Impl_in_rule__ProtocolClass__Group__117140 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group__2_in_rule__ProtocolClass__Group__117143 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_19_in_rule__ProtocolClass__Group__1__Impl17171 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group__2__Impl_in_rule__ProtocolClass__Group__217202 = new BitSet(new long[]{0x0840020000000000L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group__3_in_rule__ProtocolClass__Group__217205 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__NameAssignment_2_in_rule__ProtocolClass__Group__2__Impl17232 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group__3__Impl_in_rule__ProtocolClass__Group__317262 = new BitSet(new long[]{0x0840020000000000L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group__4_in_rule__ProtocolClass__Group__317265 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__DocuAssignment_3_in_rule__ProtocolClass__Group__3__Impl17292 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group__4__Impl_in_rule__ProtocolClass__Group__417323 = new BitSet(new long[]{0x0840020000000000L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group__5_in_rule__ProtocolClass__Group__417326 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group_4__0_in_rule__ProtocolClass__Group__4__Impl17353 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group__5__Impl_in_rule__ProtocolClass__Group__517384 = new BitSet(new long[]{0x8380040000000000L,0x012000000000000BL});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group__6_in_rule__ProtocolClass__Group__517387 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_rule__ProtocolClass__Group__5__Impl17415 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group__6__Impl_in_rule__ProtocolClass__Group__617446 = new BitSet(new long[]{0x8380040000000000L,0x012000000000000BL});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group__7_in_rule__ProtocolClass__Group__617449 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__AnnotationsAssignment_6_in_rule__ProtocolClass__Group__6__Impl17476 = new BitSet(new long[]{0x0000000000000002L,0x0100000000000000L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group__7__Impl_in_rule__ProtocolClass__Group__717507 = new BitSet(new long[]{0x8380040000000000L,0x012000000000000BL});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group__8_in_rule__ProtocolClass__Group__717510 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group_7__0_in_rule__ProtocolClass__Group__7__Impl17537 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group__8__Impl_in_rule__ProtocolClass__Group__817568 = new BitSet(new long[]{0x8380040000000000L,0x012000000000000BL});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group__9_in_rule__ProtocolClass__Group__817571 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group_8__0_in_rule__ProtocolClass__Group__8__Impl17598 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group__9__Impl_in_rule__ProtocolClass__Group__917629 = new BitSet(new long[]{0x8380040000000000L,0x012000000000000BL});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group__10_in_rule__ProtocolClass__Group__917632 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group_9__0_in_rule__ProtocolClass__Group__9__Impl17659 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group__10__Impl_in_rule__ProtocolClass__Group__1017690 = new BitSet(new long[]{0x8380040000000000L,0x012000000000000BL});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group__11_in_rule__ProtocolClass__Group__1017693 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group_10__0_in_rule__ProtocolClass__Group__10__Impl17720 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group__11__Impl_in_rule__ProtocolClass__Group__1117751 = new BitSet(new long[]{0x8380040000000000L,0x012000000000000BL});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group__12_in_rule__ProtocolClass__Group__1117754 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group_11__0_in_rule__ProtocolClass__Group__11__Impl17781 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group__12__Impl_in_rule__ProtocolClass__Group__1217812 = new BitSet(new long[]{0x8380040000000000L,0x012000000000000BL});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group__13_in_rule__ProtocolClass__Group__1217815 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group_12__0_in_rule__ProtocolClass__Group__12__Impl17842 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group__13__Impl_in_rule__ProtocolClass__Group__1317873 = new BitSet(new long[]{0x8380040000000000L,0x012000000000000BL});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group__14_in_rule__ProtocolClass__Group__1317876 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group_13__0_in_rule__ProtocolClass__Group__13__Impl17903 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group__14__Impl_in_rule__ProtocolClass__Group__1417934 = new BitSet(new long[]{0x8380040000000000L,0x012000000000000BL});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group__15_in_rule__ProtocolClass__Group__1417937 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__SemanticsAssignment_14_in_rule__ProtocolClass__Group__14__Impl17964 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group__15__Impl_in_rule__ProtocolClass__Group__1517995 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rule__ProtocolClass__Group__15__Impl18023 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group_4__0__Impl_in_rule__ProtocolClass__Group_4__018086 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group_4__1_in_rule__ProtocolClass__Group_4__018089 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_54_in_rule__ProtocolClass__Group_4__0__Impl18117 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group_4__1__Impl_in_rule__ProtocolClass__Group_4__118148 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__BaseAssignment_4_1_in_rule__ProtocolClass__Group_4__1__Impl18175 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group_7__0__Impl_in_rule__ProtocolClass__Group_7__018209 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group_7__1_in_rule__ProtocolClass__Group_7__018212 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_55_in_rule__ProtocolClass__Group_7__0__Impl18240 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group_7__1__Impl_in_rule__ProtocolClass__Group_7__118271 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__UserCode1Assignment_7_1_in_rule__ProtocolClass__Group_7__1__Impl18298 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group_8__0__Impl_in_rule__ProtocolClass__Group_8__018332 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group_8__1_in_rule__ProtocolClass__Group_8__018335 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_56_in_rule__ProtocolClass__Group_8__0__Impl18363 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group_8__1__Impl_in_rule__ProtocolClass__Group_8__118394 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__UserCode2Assignment_8_1_in_rule__ProtocolClass__Group_8__1__Impl18421 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group_9__0__Impl_in_rule__ProtocolClass__Group_9__018455 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group_9__1_in_rule__ProtocolClass__Group_9__018458 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_57_in_rule__ProtocolClass__Group_9__0__Impl18486 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group_9__1__Impl_in_rule__ProtocolClass__Group_9__118517 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__UserCode3Assignment_9_1_in_rule__ProtocolClass__Group_9__1__Impl18544 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group_10__0__Impl_in_rule__ProtocolClass__Group_10__018578 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group_10__1_in_rule__ProtocolClass__Group_10__018581 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_63_in_rule__ProtocolClass__Group_10__0__Impl18609 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group_10__1__Impl_in_rule__ProtocolClass__Group_10__118640 = new BitSet(new long[]{0x0000040000000000L,0x0000000000000020L,0x0000000000000001L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group_10__2_in_rule__ProtocolClass__Group_10__118643 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_rule__ProtocolClass__Group_10__1__Impl18671 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group_10__2__Impl_in_rule__ProtocolClass__Group_10__218702 = new BitSet(new long[]{0x0000040000000000L,0x0000000000000020L,0x0000000000000001L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group_10__3_in_rule__ProtocolClass__Group_10__218705 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__IncomingMessagesAssignment_10_2_in_rule__ProtocolClass__Group_10__2__Impl18732 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000020L,0x0000000000000001L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group_10__3__Impl_in_rule__ProtocolClass__Group_10__318763 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rule__ProtocolClass__Group_10__3__Impl18791 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group_11__0__Impl_in_rule__ProtocolClass__Group_11__018830 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group_11__1_in_rule__ProtocolClass__Group_11__018833 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_64_in_rule__ProtocolClass__Group_11__0__Impl18861 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group_11__1__Impl_in_rule__ProtocolClass__Group_11__118892 = new BitSet(new long[]{0x0000040000000000L,0x0000000000000020L,0x0000000000000001L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group_11__2_in_rule__ProtocolClass__Group_11__118895 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_rule__ProtocolClass__Group_11__1__Impl18923 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group_11__2__Impl_in_rule__ProtocolClass__Group_11__218954 = new BitSet(new long[]{0x0000040000000000L,0x0000000000000020L,0x0000000000000001L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group_11__3_in_rule__ProtocolClass__Group_11__218957 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__OutgoingMessagesAssignment_11_2_in_rule__ProtocolClass__Group_11__2__Impl18984 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000020L,0x0000000000000001L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group_11__3__Impl_in_rule__ProtocolClass__Group_11__319015 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rule__ProtocolClass__Group_11__3__Impl19043 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group_12__0__Impl_in_rule__ProtocolClass__Group_12__019082 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000004L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group_12__1_in_rule__ProtocolClass__Group_12__019085 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_65_in_rule__ProtocolClass__Group_12__0__Impl19113 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group_12__1__Impl_in_rule__ProtocolClass__Group_12__119144 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group_12__2_in_rule__ProtocolClass__Group_12__119147 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_66_in_rule__ProtocolClass__Group_12__1__Impl19175 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group_12__2__Impl_in_rule__ProtocolClass__Group_12__219206 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__RegularAssignment_12_2_in_rule__ProtocolClass__Group_12__2__Impl19233 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group_13__0__Impl_in_rule__ProtocolClass__Group_13__019269 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000004L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group_13__1_in_rule__ProtocolClass__Group_13__019272 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_67_in_rule__ProtocolClass__Group_13__0__Impl19300 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group_13__1__Impl_in_rule__ProtocolClass__Group_13__119331 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group_13__2_in_rule__ProtocolClass__Group_13__119334 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_66_in_rule__ProtocolClass__Group_13__1__Impl19362 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__Group_13__2__Impl_in_rule__ProtocolClass__Group_13__219393 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolClass__ConjugatedAssignment_13_2_in_rule__ProtocolClass__Group_13__2__Impl19420 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CompoundProtocolClass__Group__0__Impl_in_rule__CompoundProtocolClass__Group__019456 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__CompoundProtocolClass__Group__1_in_rule__CompoundProtocolClass__Group__019459 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_20_in_rule__CompoundProtocolClass__Group__0__Impl19487 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CompoundProtocolClass__Group__1__Impl_in_rule__CompoundProtocolClass__Group__119518 = new BitSet(new long[]{0x0800020000000000L});
-    public static final BitSet FOLLOW_rule__CompoundProtocolClass__Group__2_in_rule__CompoundProtocolClass__Group__119521 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CompoundProtocolClass__NameAssignment_1_in_rule__CompoundProtocolClass__Group__1__Impl19548 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CompoundProtocolClass__Group__2__Impl_in_rule__CompoundProtocolClass__Group__219578 = new BitSet(new long[]{0x0800020000000000L});
-    public static final BitSet FOLLOW_rule__CompoundProtocolClass__Group__3_in_rule__CompoundProtocolClass__Group__219581 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CompoundProtocolClass__DocuAssignment_2_in_rule__CompoundProtocolClass__Group__2__Impl19608 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CompoundProtocolClass__Group__3__Impl_in_rule__CompoundProtocolClass__Group__319639 = new BitSet(new long[]{0x0000040000000000L,0x0100000000000010L});
-    public static final BitSet FOLLOW_rule__CompoundProtocolClass__Group__4_in_rule__CompoundProtocolClass__Group__319642 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_rule__CompoundProtocolClass__Group__3__Impl19670 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CompoundProtocolClass__Group__4__Impl_in_rule__CompoundProtocolClass__Group__419701 = new BitSet(new long[]{0x0000040000000000L,0x0100000000000010L});
-    public static final BitSet FOLLOW_rule__CompoundProtocolClass__Group__5_in_rule__CompoundProtocolClass__Group__419704 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CompoundProtocolClass__AnnotationsAssignment_4_in_rule__CompoundProtocolClass__Group__4__Impl19731 = new BitSet(new long[]{0x0000000000000002L,0x0100000000000000L});
-    public static final BitSet FOLLOW_rule__CompoundProtocolClass__Group__5__Impl_in_rule__CompoundProtocolClass__Group__519762 = new BitSet(new long[]{0x0000040000000000L,0x0100000000000010L});
-    public static final BitSet FOLLOW_rule__CompoundProtocolClass__Group__6_in_rule__CompoundProtocolClass__Group__519765 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CompoundProtocolClass__SubProtocolsAssignment_5_in_rule__CompoundProtocolClass__Group__5__Impl19792 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__CompoundProtocolClass__Group__6__Impl_in_rule__CompoundProtocolClass__Group__619823 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rule__CompoundProtocolClass__Group__6__Impl19851 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubProtocol__Group__0__Impl_in_rule__SubProtocol__Group__019896 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__SubProtocol__Group__1_in_rule__SubProtocol__Group__019899 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_68_in_rule__SubProtocol__Group__0__Impl19927 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubProtocol__Group__1__Impl_in_rule__SubProtocol__Group__119958 = new BitSet(new long[]{0x0000080000000000L});
-    public static final BitSet FOLLOW_rule__SubProtocol__Group__2_in_rule__SubProtocol__Group__119961 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubProtocol__NameAssignment_1_in_rule__SubProtocol__Group__1__Impl19988 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubProtocol__Group__2__Impl_in_rule__SubProtocol__Group__220018 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__SubProtocol__Group__3_in_rule__SubProtocol__Group__220021 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_43_in_rule__SubProtocol__Group__2__Impl20049 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubProtocol__Group__3__Impl_in_rule__SubProtocol__Group__320080 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubProtocol__ProtocolAssignment_3_in_rule__SubProtocol__Group__3__Impl20107 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Message__Group__0__Impl_in_rule__Message__Group__020145 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000020L,0x0000000000000001L});
-    public static final BitSet FOLLOW_rule__Message__Group__1_in_rule__Message__Group__020148 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Message__PrivAssignment_0_in_rule__Message__Group__0__Impl20175 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Message__Group__1__Impl_in_rule__Message__Group__120206 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__Message__Group__2_in_rule__Message__Group__120209 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_69_in_rule__Message__Group__1__Impl20237 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Message__Group__2__Impl_in_rule__Message__Group__220268 = new BitSet(new long[]{0x0000800000000000L});
-    public static final BitSet FOLLOW_rule__Message__Group__3_in_rule__Message__Group__220271 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Message__NameAssignment_2_in_rule__Message__Group__2__Impl20298 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Message__Group__3__Impl_in_rule__Message__Group__320328 = new BitSet(new long[]{0x0001000000000040L});
-    public static final BitSet FOLLOW_rule__Message__Group__4_in_rule__Message__Group__320331 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_rule__Message__Group__3__Impl20359 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Message__Group__4__Impl_in_rule__Message__Group__420390 = new BitSet(new long[]{0x0001000000000040L});
-    public static final BitSet FOLLOW_rule__Message__Group__5_in_rule__Message__Group__420393 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Message__DataAssignment_4_in_rule__Message__Group__4__Impl20420 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Message__Group__5__Impl_in_rule__Message__Group__520451 = new BitSet(new long[]{0x0800000000000000L});
-    public static final BitSet FOLLOW_rule__Message__Group__6_in_rule__Message__Group__520454 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_48_in_rule__Message__Group__5__Impl20482 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Message__Group__6__Impl_in_rule__Message__Group__620513 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Message__DocuAssignment_6_in_rule__Message__Group__6__Impl20540 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortClass__Group__0__Impl_in_rule__PortClass__Group__020585 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_rule__PortClass__Group__1_in_rule__PortClass__Group__020588 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortClass__Group__1__Impl_in_rule__PortClass__Group__120646 = new BitSet(new long[]{0x2400040000006000L,0x80000000000000C0L});
-    public static final BitSet FOLLOW_rule__PortClass__Group__2_in_rule__PortClass__Group__120649 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_rule__PortClass__Group__1__Impl20677 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortClass__Group__2__Impl_in_rule__PortClass__Group__220708 = new BitSet(new long[]{0x2400040000006000L,0x80000000000000C0L});
-    public static final BitSet FOLLOW_rule__PortClass__Group__3_in_rule__PortClass__Group__220711 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortClass__Group_2__0_in_rule__PortClass__Group__2__Impl20738 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortClass__Group__3__Impl_in_rule__PortClass__Group__320769 = new BitSet(new long[]{0x2400040000006000L,0x80000000000000C0L});
-    public static final BitSet FOLLOW_rule__PortClass__Group__4_in_rule__PortClass__Group__320772 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortClass__Alternatives_3_in_rule__PortClass__Group__3__Impl20799 = new BitSet(new long[]{0x2400000000006002L,0x8000000000000080L});
-    public static final BitSet FOLLOW_rule__PortClass__Group__4__Impl_in_rule__PortClass__Group__420830 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rule__PortClass__Group__4__Impl20858 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortClass__Group_2__0__Impl_in_rule__PortClass__Group_2__020899 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_rule__PortClass__Group_2__1_in_rule__PortClass__Group_2__020902 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_70_in_rule__PortClass__Group_2__0__Impl20930 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortClass__Group_2__1__Impl_in_rule__PortClass__Group_2__120961 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PortClass__UserCodeAssignment_2_1_in_rule__PortClass__Group_2__1__Impl20988 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InMessageHandler__Group__0__Impl_in_rule__InMessageHandler__Group__021022 = new BitSet(new long[]{0x8000000000000000L});
-    public static final BitSet FOLLOW_rule__InMessageHandler__Group__1_in_rule__InMessageHandler__Group__021025 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_71_in_rule__InMessageHandler__Group__0__Impl21053 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InMessageHandler__Group__1__Impl_in_rule__InMessageHandler__Group__121084 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__InMessageHandler__Group__2_in_rule__InMessageHandler__Group__121087 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_63_in_rule__InMessageHandler__Group__1__Impl21115 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InMessageHandler__Group__2__Impl_in_rule__InMessageHandler__Group__221146 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_rule__InMessageHandler__Group__3_in_rule__InMessageHandler__Group__221149 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InMessageHandler__MsgAssignment_2_in_rule__InMessageHandler__Group__2__Impl21176 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InMessageHandler__Group__3__Impl_in_rule__InMessageHandler__Group__321206 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InMessageHandler__DetailCodeAssignment_3_in_rule__InMessageHandler__Group__3__Impl21233 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutMessageHandler__Group__0__Impl_in_rule__OutMessageHandler__Group__021271 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000001L});
-    public static final BitSet FOLLOW_rule__OutMessageHandler__Group__1_in_rule__OutMessageHandler__Group__021274 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_71_in_rule__OutMessageHandler__Group__0__Impl21302 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutMessageHandler__Group__1__Impl_in_rule__OutMessageHandler__Group__121333 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__OutMessageHandler__Group__2_in_rule__OutMessageHandler__Group__121336 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_64_in_rule__OutMessageHandler__Group__1__Impl21364 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutMessageHandler__Group__2__Impl_in_rule__OutMessageHandler__Group__221395 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_rule__OutMessageHandler__Group__3_in_rule__OutMessageHandler__Group__221398 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutMessageHandler__MsgAssignment_2_in_rule__OutMessageHandler__Group__2__Impl21425 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutMessageHandler__Group__3__Impl_in_rule__OutMessageHandler__Group__321455 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutMessageHandler__DetailCodeAssignment_3_in_rule__OutMessageHandler__Group__3__Impl21482 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group__0__Impl_in_rule__ActorClass__Group__021520 = new BitSet(new long[]{0x0000000000020000L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group__1_in_rule__ActorClass__Group__021523 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__UnorderedGroup_0_in_rule__ActorClass__Group__0__Impl21550 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group__1__Impl_in_rule__ActorClass__Group__121580 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group__2_in_rule__ActorClass__Group__121583 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_17_in_rule__ActorClass__Group__1__Impl21611 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group__2__Impl_in_rule__ActorClass__Group__221642 = new BitSet(new long[]{0x0840020000000000L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group__3_in_rule__ActorClass__Group__221645 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__NameAssignment_2_in_rule__ActorClass__Group__2__Impl21672 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group__3__Impl_in_rule__ActorClass__Group__321702 = new BitSet(new long[]{0x0840020000000000L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group__4_in_rule__ActorClass__Group__321705 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__DocuAssignment_3_in_rule__ActorClass__Group__3__Impl21732 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group__4__Impl_in_rule__ActorClass__Group__421763 = new BitSet(new long[]{0x0840020000000000L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group__5_in_rule__ActorClass__Group__421766 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group_4__0_in_rule__ActorClass__Group__4__Impl21793 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group__5__Impl_in_rule__ActorClass__Group__521824 = new BitSet(new long[]{0x0000040000000000L,0x0100000000000700L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group__6_in_rule__ActorClass__Group__521827 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_rule__ActorClass__Group__5__Impl21855 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group__6__Impl_in_rule__ActorClass__Group__621886 = new BitSet(new long[]{0x0000040000000000L,0x0100000000000700L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group__7_in_rule__ActorClass__Group__621889 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__AnnotationsAssignment_6_in_rule__ActorClass__Group__6__Impl21916 = new BitSet(new long[]{0x0000000000000002L,0x0100000000000000L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group__7__Impl_in_rule__ActorClass__Group__721947 = new BitSet(new long[]{0x0000040000000000L,0x0100000000000700L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group__8_in_rule__ActorClass__Group__721950 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group_7__0_in_rule__ActorClass__Group__7__Impl21977 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group__8__Impl_in_rule__ActorClass__Group__822008 = new BitSet(new long[]{0x0000040000000000L,0x0100000000000700L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group__9_in_rule__ActorClass__Group__822011 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group_8__0_in_rule__ActorClass__Group__8__Impl22038 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group__9__Impl_in_rule__ActorClass__Group__922069 = new BitSet(new long[]{0x0000040000000000L,0x0100000000000700L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group__10_in_rule__ActorClass__Group__922072 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group_9__0_in_rule__ActorClass__Group__9__Impl22099 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group__10__Impl_in_rule__ActorClass__Group__1022130 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rule__ActorClass__Group__10__Impl22158 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group_4__0__Impl_in_rule__ActorClass__Group_4__022211 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group_4__1_in_rule__ActorClass__Group_4__022214 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_54_in_rule__ActorClass__Group_4__0__Impl22242 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group_4__1__Impl_in_rule__ActorClass__Group_4__122273 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__BaseAssignment_4_1_in_rule__ActorClass__Group_4__1__Impl22300 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group_7__0__Impl_in_rule__ActorClass__Group_7__022334 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group_7__1_in_rule__ActorClass__Group_7__022337 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_rule__ActorClass__Group_7__0__Impl22365 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group_7__1__Impl_in_rule__ActorClass__Group_7__122396 = new BitSet(new long[]{0x0000040000000000L,0x0000000000004808L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group_7__2_in_rule__ActorClass__Group_7__122399 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_rule__ActorClass__Group_7__1__Impl22427 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group_7__2__Impl_in_rule__ActorClass__Group_7__222458 = new BitSet(new long[]{0x0000040000000000L,0x0000000000004808L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group_7__3_in_rule__ActorClass__Group_7__222461 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__Alternatives_7_2_in_rule__ActorClass__Group_7__2__Impl22488 = new BitSet(new long[]{0x0000000000000002L,0x0000000000004808L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group_7__3__Impl_in_rule__ActorClass__Group_7__322519 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rule__ActorClass__Group_7__3__Impl22547 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group_8__0__Impl_in_rule__ActorClass__Group_8__022586 = new BitSet(new long[]{0x0800020000000000L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group_8__1_in_rule__ActorClass__Group_8__022589 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_73_in_rule__ActorClass__Group_8__0__Impl22617 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group_8__1__Impl_in_rule__ActorClass__Group_8__122648 = new BitSet(new long[]{0x0800020000000000L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group_8__2_in_rule__ActorClass__Group_8__122651 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__StructureDocuAssignment_8_1_in_rule__ActorClass__Group_8__1__Impl22678 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group_8__2__Impl_in_rule__ActorClass__Group_8__222709 = new BitSet(new long[]{0x2780040600006000L,0x800000001110F808L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group_8__3_in_rule__ActorClass__Group_8__222712 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_rule__ActorClass__Group_8__2__Impl22740 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group_8__3__Impl_in_rule__ActorClass__Group_8__322771 = new BitSet(new long[]{0x2780040600006000L,0x800000001110F808L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group_8__4_in_rule__ActorClass__Group_8__322774 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group_8_3__0_in_rule__ActorClass__Group_8__3__Impl22801 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group_8__4__Impl_in_rule__ActorClass__Group_8__422832 = new BitSet(new long[]{0x2780040600006000L,0x800000001110F808L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group_8__5_in_rule__ActorClass__Group_8__422835 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group_8_4__0_in_rule__ActorClass__Group_8__4__Impl22862 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group_8__5__Impl_in_rule__ActorClass__Group_8__522893 = new BitSet(new long[]{0x2780040600006000L,0x800000001110F808L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group_8__6_in_rule__ActorClass__Group_8__522896 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group_8_5__0_in_rule__ActorClass__Group_8__5__Impl22923 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group_8__6__Impl_in_rule__ActorClass__Group_8__622954 = new BitSet(new long[]{0x2780040600006000L,0x800000001110F808L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group_8__7_in_rule__ActorClass__Group_8__622957 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__Alternatives_8_6_in_rule__ActorClass__Group_8__6__Impl22984 = new BitSet(new long[]{0x2400000600006002L,0x800000001110F808L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group_8__7__Impl_in_rule__ActorClass__Group_8__723015 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rule__ActorClass__Group_8__7__Impl23043 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group_8_3__0__Impl_in_rule__ActorClass__Group_8_3__023090 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group_8_3__1_in_rule__ActorClass__Group_8_3__023093 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_55_in_rule__ActorClass__Group_8_3__0__Impl23121 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group_8_3__1__Impl_in_rule__ActorClass__Group_8_3__123152 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__UserCode1Assignment_8_3_1_in_rule__ActorClass__Group_8_3__1__Impl23179 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group_8_4__0__Impl_in_rule__ActorClass__Group_8_4__023213 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group_8_4__1_in_rule__ActorClass__Group_8_4__023216 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_56_in_rule__ActorClass__Group_8_4__0__Impl23244 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group_8_4__1__Impl_in_rule__ActorClass__Group_8_4__123275 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__UserCode2Assignment_8_4_1_in_rule__ActorClass__Group_8_4__1__Impl23302 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group_8_5__0__Impl_in_rule__ActorClass__Group_8_5__023336 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group_8_5__1_in_rule__ActorClass__Group_8_5__023339 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_57_in_rule__ActorClass__Group_8_5__0__Impl23367 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group_8_5__1__Impl_in_rule__ActorClass__Group_8_5__123398 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__UserCode3Assignment_8_5_1_in_rule__ActorClass__Group_8_5__1__Impl23425 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group_9__0__Impl_in_rule__ActorClass__Group_9__023459 = new BitSet(new long[]{0x0800020000000000L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group_9__1_in_rule__ActorClass__Group_9__023462 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__ActorClass__Group_9__0__Impl23490 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group_9__1__Impl_in_rule__ActorClass__Group_9__123521 = new BitSet(new long[]{0x0800020000000000L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group_9__2_in_rule__ActorClass__Group_9__123524 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__BehaviorDocuAssignment_9_1_in_rule__ActorClass__Group_9__1__Impl23551 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group_9__2__Impl_in_rule__ActorClass__Group_9__223582 = new BitSet(new long[]{0x2000040000006000L,0x8100000020000000L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group_9__3_in_rule__ActorClass__Group_9__223585 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_rule__ActorClass__Group_9__2__Impl23613 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group_9__3__Impl_in_rule__ActorClass__Group_9__323644 = new BitSet(new long[]{0x2000040000006000L,0x8100000020000000L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group_9__4_in_rule__ActorClass__Group_9__323647 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__BehaviorAnnotationsAssignment_9_3_in_rule__ActorClass__Group_9__3__Impl23674 = new BitSet(new long[]{0x0000000000000002L,0x0100000000000000L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group_9__4__Impl_in_rule__ActorClass__Group_9__423705 = new BitSet(new long[]{0x2000040000006000L,0x8100000020000000L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group_9__5_in_rule__ActorClass__Group_9__423708 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__Alternatives_9_4_in_rule__ActorClass__Group_9__4__Impl23735 = new BitSet(new long[]{0x2000000000006002L,0x8000000000000000L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group_9__5__Impl_in_rule__ActorClass__Group_9__523766 = new BitSet(new long[]{0x2000040000006000L,0x8100000020000000L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group_9__6_in_rule__ActorClass__Group_9__523769 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__StateMachineAssignment_9_5_in_rule__ActorClass__Group_9__5__Impl23796 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__Group_9__6__Impl_in_rule__ActorClass__Group_9__623827 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rule__ActorClass__Group_9__6__Impl23855 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Port__Group__0__Impl_in_rule__Port__Group__023900 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004808L});
-    public static final BitSet FOLLOW_rule__Port__Group__1_in_rule__Port__Group__023903 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Port__ConjugatedAssignment_0_in_rule__Port__Group__0__Impl23930 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Port__Group__1__Impl_in_rule__Port__Group__123961 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__Port__Group__2_in_rule__Port__Group__123964 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_75_in_rule__Port__Group__1__Impl23992 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Port__Group__2__Impl_in_rule__Port__Group__224023 = new BitSet(new long[]{0x0800080000000000L});
-    public static final BitSet FOLLOW_rule__Port__Group__3_in_rule__Port__Group__224026 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Port__NameAssignment_2_in_rule__Port__Group__2__Impl24053 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Port__Group__3__Impl_in_rule__Port__Group__324083 = new BitSet(new long[]{0x0800080000000000L});
-    public static final BitSet FOLLOW_rule__Port__Group__4_in_rule__Port__Group__324086 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Port__MultiplicityAssignment_3_in_rule__Port__Group__3__Impl24113 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Port__Group__4__Impl_in_rule__Port__Group__424144 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__Port__Group__5_in_rule__Port__Group__424147 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_43_in_rule__Port__Group__4__Impl24175 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Port__Group__5__Impl_in_rule__Port__Group__524206 = new BitSet(new long[]{0x0800000000000000L});
-    public static final BitSet FOLLOW_rule__Port__Group__6_in_rule__Port__Group__524209 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Port__ProtocolAssignment_5_in_rule__Port__Group__5__Impl24236 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Port__Group__6__Impl_in_rule__Port__Group__624266 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Port__DocuAssignment_6_in_rule__Port__Group__6__Impl24293 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ExternalPort__Group__0__Impl_in_rule__ExternalPort__Group__024338 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000800L});
-    public static final BitSet FOLLOW_rule__ExternalPort__Group__1_in_rule__ExternalPort__Group__024341 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_76_in_rule__ExternalPort__Group__0__Impl24369 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ExternalPort__Group__1__Impl_in_rule__ExternalPort__Group__124400 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__ExternalPort__Group__2_in_rule__ExternalPort__Group__124403 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_75_in_rule__ExternalPort__Group__1__Impl24431 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ExternalPort__Group__2__Impl_in_rule__ExternalPort__Group__224462 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ExternalPort__InterfacePortAssignment_2_in_rule__ExternalPort__Group__2__Impl24489 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SAP__Group__0__Impl_in_rule__SAP__Group__024525 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__SAP__Group__1_in_rule__SAP__Group__024528 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_77_in_rule__SAP__Group__0__Impl24556 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SAP__Group__1__Impl_in_rule__SAP__Group__124587 = new BitSet(new long[]{0x0000080000000000L});
-    public static final BitSet FOLLOW_rule__SAP__Group__2_in_rule__SAP__Group__124590 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SAP__NameAssignment_1_in_rule__SAP__Group__1__Impl24617 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SAP__Group__2__Impl_in_rule__SAP__Group__224647 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__SAP__Group__3_in_rule__SAP__Group__224650 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_43_in_rule__SAP__Group__2__Impl24678 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SAP__Group__3__Impl_in_rule__SAP__Group__324709 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SAP__ProtocolAssignment_3_in_rule__SAP__Group__3__Impl24736 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SPP__Group__0__Impl_in_rule__SPP__Group__024774 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__SPP__Group__1_in_rule__SPP__Group__024777 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_78_in_rule__SPP__Group__0__Impl24805 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SPP__Group__1__Impl_in_rule__SPP__Group__124836 = new BitSet(new long[]{0x0000080000000000L});
-    public static final BitSet FOLLOW_rule__SPP__Group__2_in_rule__SPP__Group__124839 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SPP__NameAssignment_1_in_rule__SPP__Group__1__Impl24866 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SPP__Group__2__Impl_in_rule__SPP__Group__224896 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__SPP__Group__3_in_rule__SPP__Group__224899 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_43_in_rule__SPP__Group__2__Impl24927 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SPP__Group__3__Impl_in_rule__SPP__Group__324958 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SPP__ProtocolAssignment_3_in_rule__SPP__Group__3__Impl24985 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ServiceImplementation__Group__0__Impl_in_rule__ServiceImplementation__Group__025023 = new BitSet(new long[]{0x0004000000000000L});
-    public static final BitSet FOLLOW_rule__ServiceImplementation__Group__1_in_rule__ServiceImplementation__Group__025026 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_79_in_rule__ServiceImplementation__Group__0__Impl25054 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ServiceImplementation__Group__1__Impl_in_rule__ServiceImplementation__Group__125085 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__ServiceImplementation__Group__2_in_rule__ServiceImplementation__Group__125088 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_50_in_rule__ServiceImplementation__Group__1__Impl25116 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ServiceImplementation__Group__2__Impl_in_rule__ServiceImplementation__Group__225147 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ServiceImplementation__SppAssignment_2_in_rule__ServiceImplementation__Group__2__Impl25174 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LogicalSystem__Group__0__Impl_in_rule__LogicalSystem__Group__025210 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__LogicalSystem__Group__1_in_rule__LogicalSystem__Group__025213 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_22_in_rule__LogicalSystem__Group__0__Impl25241 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LogicalSystem__Group__1__Impl_in_rule__LogicalSystem__Group__125272 = new BitSet(new long[]{0x0800020000000000L});
-    public static final BitSet FOLLOW_rule__LogicalSystem__Group__2_in_rule__LogicalSystem__Group__125275 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LogicalSystem__NameAssignment_1_in_rule__LogicalSystem__Group__1__Impl25302 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LogicalSystem__Group__2__Impl_in_rule__LogicalSystem__Group__225332 = new BitSet(new long[]{0x0800020000000000L});
-    public static final BitSet FOLLOW_rule__LogicalSystem__Group__3_in_rule__LogicalSystem__Group__225335 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LogicalSystem__DocuAssignment_2_in_rule__LogicalSystem__Group__2__Impl25362 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LogicalSystem__Group__3__Impl_in_rule__LogicalSystem__Group__325393 = new BitSet(new long[]{0x0000040000000000L,0x0100000001110000L});
-    public static final BitSet FOLLOW_rule__LogicalSystem__Group__4_in_rule__LogicalSystem__Group__325396 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_rule__LogicalSystem__Group__3__Impl25424 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LogicalSystem__Group__4__Impl_in_rule__LogicalSystem__Group__425455 = new BitSet(new long[]{0x0000040000000000L,0x0100000001110000L});
-    public static final BitSet FOLLOW_rule__LogicalSystem__Group__5_in_rule__LogicalSystem__Group__425458 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LogicalSystem__AnnotationsAssignment_4_in_rule__LogicalSystem__Group__4__Impl25485 = new BitSet(new long[]{0x0000000000000002L,0x0100000000000000L});
-    public static final BitSet FOLLOW_rule__LogicalSystem__Group__5__Impl_in_rule__LogicalSystem__Group__525516 = new BitSet(new long[]{0x0000040000000000L,0x0100000001110000L});
-    public static final BitSet FOLLOW_rule__LogicalSystem__Group__6_in_rule__LogicalSystem__Group__525519 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LogicalSystem__Alternatives_5_in_rule__LogicalSystem__Group__5__Impl25546 = new BitSet(new long[]{0x0000000000000002L,0x0000000001110000L});
-    public static final BitSet FOLLOW_rule__LogicalSystem__Group__6__Impl_in_rule__LogicalSystem__Group__625577 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rule__LogicalSystem__Group__6__Impl25605 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemRef__Group__0__Impl_in_rule__SubSystemRef__Group__025650 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__SubSystemRef__Group__1_in_rule__SubSystemRef__Group__025653 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_80_in_rule__SubSystemRef__Group__0__Impl25681 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemRef__Group__1__Impl_in_rule__SubSystemRef__Group__125712 = new BitSet(new long[]{0x0000080000000000L});
-    public static final BitSet FOLLOW_rule__SubSystemRef__Group__2_in_rule__SubSystemRef__Group__125715 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemRef__NameAssignment_1_in_rule__SubSystemRef__Group__1__Impl25742 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemRef__Group__2__Impl_in_rule__SubSystemRef__Group__225772 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__SubSystemRef__Group__3_in_rule__SubSystemRef__Group__225775 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_43_in_rule__SubSystemRef__Group__2__Impl25803 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemRef__Group__3__Impl_in_rule__SubSystemRef__Group__325834 = new BitSet(new long[]{0x0800000000000000L});
-    public static final BitSet FOLLOW_rule__SubSystemRef__Group__4_in_rule__SubSystemRef__Group__325837 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemRef__TypeAssignment_3_in_rule__SubSystemRef__Group__3__Impl25864 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemRef__Group__4__Impl_in_rule__SubSystemRef__Group__425894 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemRef__DocuAssignment_4_in_rule__SubSystemRef__Group__4__Impl25921 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemClass__Group__0__Impl_in_rule__SubSystemClass__Group__025962 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__SubSystemClass__Group__1_in_rule__SubSystemClass__Group__025965 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_21_in_rule__SubSystemClass__Group__0__Impl25993 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemClass__Group__1__Impl_in_rule__SubSystemClass__Group__126024 = new BitSet(new long[]{0x0800020000000000L});
-    public static final BitSet FOLLOW_rule__SubSystemClass__Group__2_in_rule__SubSystemClass__Group__126027 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemClass__NameAssignment_1_in_rule__SubSystemClass__Group__1__Impl26054 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemClass__Group__2__Impl_in_rule__SubSystemClass__Group__226084 = new BitSet(new long[]{0x0800020000000000L});
-    public static final BitSet FOLLOW_rule__SubSystemClass__Group__3_in_rule__SubSystemClass__Group__226087 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemClass__DocuAssignment_2_in_rule__SubSystemClass__Group__2__Impl26114 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemClass__Group__3__Impl_in_rule__SubSystemClass__Group__326145 = new BitSet(new long[]{0x0380040600000000L,0x0100000011164808L});
-    public static final BitSet FOLLOW_rule__SubSystemClass__Group__4_in_rule__SubSystemClass__Group__326148 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_rule__SubSystemClass__Group__3__Impl26176 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemClass__Group__4__Impl_in_rule__SubSystemClass__Group__426207 = new BitSet(new long[]{0x0380040600000000L,0x0100000011164808L});
-    public static final BitSet FOLLOW_rule__SubSystemClass__Group__5_in_rule__SubSystemClass__Group__426210 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemClass__AnnotationsAssignment_4_in_rule__SubSystemClass__Group__4__Impl26237 = new BitSet(new long[]{0x0000000000000002L,0x0100000000000000L});
-    public static final BitSet FOLLOW_rule__SubSystemClass__Group__5__Impl_in_rule__SubSystemClass__Group__526268 = new BitSet(new long[]{0x0380040600000000L,0x0100000011164808L});
-    public static final BitSet FOLLOW_rule__SubSystemClass__Group__6_in_rule__SubSystemClass__Group__526271 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemClass__Group_5__0_in_rule__SubSystemClass__Group__5__Impl26298 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemClass__Group__6__Impl_in_rule__SubSystemClass__Group__626329 = new BitSet(new long[]{0x0380040600000000L,0x0100000011164808L});
-    public static final BitSet FOLLOW_rule__SubSystemClass__Group__7_in_rule__SubSystemClass__Group__626332 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemClass__Group_6__0_in_rule__SubSystemClass__Group__6__Impl26359 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemClass__Group__7__Impl_in_rule__SubSystemClass__Group__726390 = new BitSet(new long[]{0x0380040600000000L,0x0100000011164808L});
-    public static final BitSet FOLLOW_rule__SubSystemClass__Group__8_in_rule__SubSystemClass__Group__726393 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemClass__Group_7__0_in_rule__SubSystemClass__Group__7__Impl26420 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemClass__Group__8__Impl_in_rule__SubSystemClass__Group__826451 = new BitSet(new long[]{0x0380040600000000L,0x0100000011164808L});
-    public static final BitSet FOLLOW_rule__SubSystemClass__Group__9_in_rule__SubSystemClass__Group__826454 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemClass__Alternatives_8_in_rule__SubSystemClass__Group__8__Impl26481 = new BitSet(new long[]{0x0000000600000002L,0x0000000011164808L});
-    public static final BitSet FOLLOW_rule__SubSystemClass__Group__9__Impl_in_rule__SubSystemClass__Group__926512 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rule__SubSystemClass__Group__9__Impl26540 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemClass__Group_5__0__Impl_in_rule__SubSystemClass__Group_5__026591 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_rule__SubSystemClass__Group_5__1_in_rule__SubSystemClass__Group_5__026594 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_55_in_rule__SubSystemClass__Group_5__0__Impl26622 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemClass__Group_5__1__Impl_in_rule__SubSystemClass__Group_5__126653 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemClass__UserCode1Assignment_5_1_in_rule__SubSystemClass__Group_5__1__Impl26680 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemClass__Group_6__0__Impl_in_rule__SubSystemClass__Group_6__026714 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_rule__SubSystemClass__Group_6__1_in_rule__SubSystemClass__Group_6__026717 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_56_in_rule__SubSystemClass__Group_6__0__Impl26745 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemClass__Group_6__1__Impl_in_rule__SubSystemClass__Group_6__126776 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemClass__UserCode2Assignment_6_1_in_rule__SubSystemClass__Group_6__1__Impl26803 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemClass__Group_7__0__Impl_in_rule__SubSystemClass__Group_7__026837 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_rule__SubSystemClass__Group_7__1_in_rule__SubSystemClass__Group_7__026840 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_57_in_rule__SubSystemClass__Group_7__0__Impl26868 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemClass__Group_7__1__Impl_in_rule__SubSystemClass__Group_7__126899 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubSystemClass__UserCode3Assignment_7_1_in_rule__SubSystemClass__Group_7__1__Impl26926 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LogicalThread__Group__0__Impl_in_rule__LogicalThread__Group__026960 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__LogicalThread__Group__1_in_rule__LogicalThread__Group__026963 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_81_in_rule__LogicalThread__Group__0__Impl26991 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LogicalThread__Group__1__Impl_in_rule__LogicalThread__Group__127022 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LogicalThread__NameAssignment_1_in_rule__LogicalThread__Group__1__Impl27049 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorInstanceMapping__Group__0__Impl_in_rule__ActorInstanceMapping__Group__027083 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__ActorInstanceMapping__Group__1_in_rule__ActorInstanceMapping__Group__027086 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_82_in_rule__ActorInstanceMapping__Group__0__Impl27114 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorInstanceMapping__Group__1__Impl_in_rule__ActorInstanceMapping__Group__127145 = new BitSet(new long[]{0x0000200000000000L});
-    public static final BitSet FOLLOW_rule__ActorInstanceMapping__Group__2_in_rule__ActorInstanceMapping__Group__127148 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorInstanceMapping__PathAssignment_1_in_rule__ActorInstanceMapping__Group__1__Impl27175 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorInstanceMapping__Group__2__Impl_in_rule__ActorInstanceMapping__Group__227205 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__ActorInstanceMapping__Group__3_in_rule__ActorInstanceMapping__Group__227208 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_45_in_rule__ActorInstanceMapping__Group__2__Impl27236 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorInstanceMapping__Group__3__Impl_in_rule__ActorInstanceMapping__Group__327267 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_rule__ActorInstanceMapping__Group__4_in_rule__ActorInstanceMapping__Group__327270 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorInstanceMapping__ThreadAssignment_3_in_rule__ActorInstanceMapping__Group__3__Impl27297 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorInstanceMapping__Group__4__Impl_in_rule__ActorInstanceMapping__Group__427327 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorInstanceMapping__Group_4__0_in_rule__ActorInstanceMapping__Group__4__Impl27354 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorInstanceMapping__Group_4__0__Impl_in_rule__ActorInstanceMapping__Group_4__027395 = new BitSet(new long[]{0x0000040000000000L,0x0000000000040000L});
-    public static final BitSet FOLLOW_rule__ActorInstanceMapping__Group_4__1_in_rule__ActorInstanceMapping__Group_4__027398 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_rule__ActorInstanceMapping__Group_4__0__Impl27426 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorInstanceMapping__Group_4__1__Impl_in_rule__ActorInstanceMapping__Group_4__127457 = new BitSet(new long[]{0x0000040000000000L,0x0000000000040000L});
-    public static final BitSet FOLLOW_rule__ActorInstanceMapping__Group_4__2_in_rule__ActorInstanceMapping__Group_4__127460 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorInstanceMapping__ActorInstanceMappingsAssignment_4_1_in_rule__ActorInstanceMapping__Group_4__1__Impl27487 = new BitSet(new long[]{0x0000000000000002L,0x0000000000040000L});
-    public static final BitSet FOLLOW_rule__ActorInstanceMapping__Group_4__2__Impl_in_rule__ActorInstanceMapping__Group_4__227518 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rule__ActorInstanceMapping__Group_4__2__Impl27546 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefPath__Group__0__Impl_in_rule__RefPath__Group__027583 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_rule__RefPath__Group__1_in_rule__RefPath__Group__027586 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefPath__RefsAssignment_0_in_rule__RefPath__Group__0__Impl27613 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefPath__Group__1__Impl_in_rule__RefPath__Group__127643 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefPath__Group_1__0_in_rule__RefPath__Group__1__Impl27670 = new BitSet(new long[]{0x0000000000000002L,0x0000000000080000L});
-    public static final BitSet FOLLOW_rule__RefPath__Group_1__0__Impl_in_rule__RefPath__Group_1__027705 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__RefPath__Group_1__1_in_rule__RefPath__Group_1__027708 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_83_in_rule__RefPath__Group_1__0__Impl27736 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefPath__Group_1__1__Impl_in_rule__RefPath__Group_1__127767 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefPath__RefsAssignment_1_1_in_rule__RefPath__Group_1__1__Impl27794 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefSegment__Group__0__Impl_in_rule__RefSegment__Group__027828 = new BitSet(new long[]{0x0000080000000000L});
-    public static final BitSet FOLLOW_rule__RefSegment__Group__1_in_rule__RefSegment__Group__027831 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefSegment__RefAssignment_0_in_rule__RefSegment__Group__0__Impl27858 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefSegment__Group__1__Impl_in_rule__RefSegment__Group__127888 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefSegment__Group_1__0_in_rule__RefSegment__Group__1__Impl27915 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefSegment__Group_1__0__Impl_in_rule__RefSegment__Group_1__027950 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__RefSegment__Group_1__1_in_rule__RefSegment__Group_1__027953 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_43_in_rule__RefSegment__Group_1__0__Impl27981 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefSegment__Group_1__1__Impl_in_rule__RefSegment__Group_1__128012 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefSegment__IdxAssignment_1_1_in_rule__RefSegment__Group_1__1__Impl28039 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Binding__Group__0__Impl_in_rule__Binding__Group__028073 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__Binding__Group__1_in_rule__Binding__Group__028076 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_84_in_rule__Binding__Group__0__Impl28104 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Binding__Group__1__Impl_in_rule__Binding__Group__128135 = new BitSet(new long[]{0x0000000000000000L,0x0000000000200000L});
-    public static final BitSet FOLLOW_rule__Binding__Group__2_in_rule__Binding__Group__128138 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Binding__Endpoint1Assignment_1_in_rule__Binding__Group__1__Impl28165 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Binding__Group__2__Impl_in_rule__Binding__Group__228195 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__Binding__Group__3_in_rule__Binding__Group__228198 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_85_in_rule__Binding__Group__2__Impl28226 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Binding__Group__3__Impl_in_rule__Binding__Group__328257 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Binding__Endpoint2Assignment_3_in_rule__Binding__Group__3__Impl28284 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__BindingEndPoint__Group__0__Impl_in_rule__BindingEndPoint__Group__028322 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__BindingEndPoint__Group__1_in_rule__BindingEndPoint__Group__028325 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__BindingEndPoint__Group_0__0_in_rule__BindingEndPoint__Group__0__Impl28352 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__BindingEndPoint__Group__1__Impl_in_rule__BindingEndPoint__Group__128383 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L});
-    public static final BitSet FOLLOW_rule__BindingEndPoint__Group__2_in_rule__BindingEndPoint__Group__128386 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__BindingEndPoint__PortAssignment_1_in_rule__BindingEndPoint__Group__1__Impl28413 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__BindingEndPoint__Group__2__Impl_in_rule__BindingEndPoint__Group__228443 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__BindingEndPoint__Group_2__0_in_rule__BindingEndPoint__Group__2__Impl28470 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__BindingEndPoint__Group_0__0__Impl_in_rule__BindingEndPoint__Group_0__028507 = new BitSet(new long[]{0x0000000000000000L,0x0000000000400000L});
-    public static final BitSet FOLLOW_rule__BindingEndPoint__Group_0__1_in_rule__BindingEndPoint__Group_0__028510 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__BindingEndPoint__ActorRefAssignment_0_0_in_rule__BindingEndPoint__Group_0__0__Impl28537 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__BindingEndPoint__Group_0__1__Impl_in_rule__BindingEndPoint__Group_0__128567 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_86_in_rule__BindingEndPoint__Group_0__1__Impl28595 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__BindingEndPoint__Group_2__0__Impl_in_rule__BindingEndPoint__Group_2__028630 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__BindingEndPoint__Group_2__1_in_rule__BindingEndPoint__Group_2__028633 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_87_in_rule__BindingEndPoint__Group_2__0__Impl28661 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__BindingEndPoint__Group_2__1__Impl_in_rule__BindingEndPoint__Group_2__128692 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__BindingEndPoint__SubAssignment_2_1_in_rule__BindingEndPoint__Group_2__1__Impl28719 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LayerConnection__Group__0__Impl_in_rule__LayerConnection__Group__028753 = new BitSet(new long[]{0x0000000000000000L,0x000000000C000000L});
-    public static final BitSet FOLLOW_rule__LayerConnection__Group__1_in_rule__LayerConnection__Group__028756 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_88_in_rule__LayerConnection__Group__0__Impl28784 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LayerConnection__Group__1__Impl_in_rule__LayerConnection__Group__128815 = new BitSet(new long[]{0x0000000000000000L,0x0000000002000000L});
-    public static final BitSet FOLLOW_rule__LayerConnection__Group__2_in_rule__LayerConnection__Group__128818 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LayerConnection__FromAssignment_1_in_rule__LayerConnection__Group__1__Impl28845 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LayerConnection__Group__2__Impl_in_rule__LayerConnection__Group__228875 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__LayerConnection__Group__3_in_rule__LayerConnection__Group__228878 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_89_in_rule__LayerConnection__Group__2__Impl28906 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LayerConnection__Group__3__Impl_in_rule__LayerConnection__Group__328937 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LayerConnection__ToAssignment_3_in_rule__LayerConnection__Group__3__Impl28964 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefSAPoint__Group__0__Impl_in_rule__RefSAPoint__Group__029002 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__RefSAPoint__Group__1_in_rule__RefSAPoint__Group__029005 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_90_in_rule__RefSAPoint__Group__0__Impl29033 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefSAPoint__Group__1__Impl_in_rule__RefSAPoint__Group__129064 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefSAPoint__RefAssignment_1_in_rule__RefSAPoint__Group__1__Impl29091 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RelaySAPoint__Group__0__Impl_in_rule__RelaySAPoint__Group__029125 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__RelaySAPoint__Group__1_in_rule__RelaySAPoint__Group__029128 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_91_in_rule__RelaySAPoint__Group__0__Impl29156 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RelaySAPoint__Group__1__Impl_in_rule__RelaySAPoint__Group__129187 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RelaySAPoint__RelayAssignment_1_in_rule__RelaySAPoint__Group__1__Impl29214 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SPPoint__Group__0__Impl_in_rule__SPPoint__Group__029248 = new BitSet(new long[]{0x0000000000000000L,0x0000000000400000L});
-    public static final BitSet FOLLOW_rule__SPPoint__Group__1_in_rule__SPPoint__Group__029251 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SPPoint__RefAssignment_0_in_rule__SPPoint__Group__0__Impl29278 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SPPoint__Group__1__Impl_in_rule__SPPoint__Group__129308 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__SPPoint__Group__2_in_rule__SPPoint__Group__129311 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_86_in_rule__SPPoint__Group__1__Impl29339 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SPPoint__Group__2__Impl_in_rule__SPPoint__Group__229370 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SPPoint__ServiceAssignment_2_in_rule__SPPoint__Group__2__Impl29397 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorRef__Group__0__Impl_in_rule__ActorRef__Group__029433 = new BitSet(new long[]{0x0000000600000000L,0x0000000010000000L});
-    public static final BitSet FOLLOW_rule__ActorRef__Group__1_in_rule__ActorRef__Group__029436 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorRef__RefTypeAssignment_0_in_rule__ActorRef__Group__0__Impl29463 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorRef__Group__1__Impl_in_rule__ActorRef__Group__129494 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__ActorRef__Group__2_in_rule__ActorRef__Group__129497 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_92_in_rule__ActorRef__Group__1__Impl29525 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorRef__Group__2__Impl_in_rule__ActorRef__Group__229556 = new BitSet(new long[]{0x0800080000000000L});
-    public static final BitSet FOLLOW_rule__ActorRef__Group__3_in_rule__ActorRef__Group__229559 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorRef__NameAssignment_2_in_rule__ActorRef__Group__2__Impl29586 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorRef__Group__3__Impl_in_rule__ActorRef__Group__329616 = new BitSet(new long[]{0x0800080000000000L});
-    public static final BitSet FOLLOW_rule__ActorRef__Group__4_in_rule__ActorRef__Group__329619 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorRef__MultiplicityAssignment_3_in_rule__ActorRef__Group__3__Impl29646 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorRef__Group__4__Impl_in_rule__ActorRef__Group__429677 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__ActorRef__Group__5_in_rule__ActorRef__Group__429680 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_43_in_rule__ActorRef__Group__4__Impl29708 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorRef__Group__5__Impl_in_rule__ActorRef__Group__529739 = new BitSet(new long[]{0x0800000000000000L});
-    public static final BitSet FOLLOW_rule__ActorRef__Group__6_in_rule__ActorRef__Group__529742 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorRef__TypeAssignment_5_in_rule__ActorRef__Group__5__Impl29769 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorRef__Group__6__Impl_in_rule__ActorRef__Group__629799 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorRef__DocuAssignment_6_in_rule__ActorRef__Group__6__Impl29826 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MULTIPLICITY__Group__0__Impl_in_rule__MULTIPLICITY__Group__029871 = new BitSet(new long[]{0x0000000000008010L});
-    public static final BitSet FOLLOW_rule__MULTIPLICITY__Group__1_in_rule__MULTIPLICITY__Group__029874 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_59_in_rule__MULTIPLICITY__Group__0__Impl29902 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MULTIPLICITY__Group__1__Impl_in_rule__MULTIPLICITY__Group__129933 = new BitSet(new long[]{0x1000000000000000L});
-    public static final BitSet FOLLOW_rule__MULTIPLICITY__Group__2_in_rule__MULTIPLICITY__Group__129936 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MULTIPLICITY__Alternatives_1_in_rule__MULTIPLICITY__Group__1__Impl29963 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MULTIPLICITY__Group__2__Impl_in_rule__MULTIPLICITY__Group__229993 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_60_in_rule__MULTIPLICITY__Group__2__Impl30021 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StateGraph__Group__0__Impl_in_rule__StateGraph__Group__030058 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_rule__StateGraph__Group__1_in_rule__StateGraph__Group__030061 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StateGraph__Group__1__Impl_in_rule__StateGraph__Group__130119 = new BitSet(new long[]{0x0000040000000000L,0x000081F840000000L,0x0000000000000004L});
-    public static final BitSet FOLLOW_rule__StateGraph__Group__2_in_rule__StateGraph__Group__130122 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_rule__StateGraph__Group__1__Impl30150 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StateGraph__Group__2__Impl_in_rule__StateGraph__Group__230181 = new BitSet(new long[]{0x0000040000000000L,0x000081F840000000L,0x0000000000000004L});
-    public static final BitSet FOLLOW_rule__StateGraph__Group__3_in_rule__StateGraph__Group__230184 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StateGraph__Alternatives_2_in_rule__StateGraph__Group__2__Impl30211 = new BitSet(new long[]{0x0000000000000002L,0x000081F840000000L,0x0000000000000004L});
-    public static final BitSet FOLLOW_rule__StateGraph__Group__3__Impl_in_rule__StateGraph__Group__330242 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rule__StateGraph__Group__3__Impl30270 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StateMachine__Group__0__Impl_in_rule__StateMachine__Group__030309 = new BitSet(new long[]{0x0000000000000000L,0x0000000020000000L});
-    public static final BitSet FOLLOW_rule__StateMachine__Group__1_in_rule__StateMachine__Group__030312 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StateMachine__Group__1__Impl_in_rule__StateMachine__Group__130370 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_rule__StateMachine__Group__2_in_rule__StateMachine__Group__130373 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_93_in_rule__StateMachine__Group__1__Impl30401 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StateMachine__Group__2__Impl_in_rule__StateMachine__Group__230432 = new BitSet(new long[]{0x0000040000000000L,0x000081F840000000L,0x0000000000000004L});
-    public static final BitSet FOLLOW_rule__StateMachine__Group__3_in_rule__StateMachine__Group__230435 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_rule__StateMachine__Group__2__Impl30463 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StateMachine__Group__3__Impl_in_rule__StateMachine__Group__330494 = new BitSet(new long[]{0x0000040000000000L,0x000081F840000000L,0x0000000000000004L});
-    public static final BitSet FOLLOW_rule__StateMachine__Group__4_in_rule__StateMachine__Group__330497 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StateMachine__Alternatives_3_in_rule__StateMachine__Group__3__Impl30524 = new BitSet(new long[]{0x0000000000000002L,0x000081F840000000L,0x0000000000000004L});
-    public static final BitSet FOLLOW_rule__StateMachine__Group__4__Impl_in_rule__StateMachine__Group__430555 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rule__StateMachine__Group__4__Impl30583 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group__0__Impl_in_rule__SimpleState__Group__030624 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group__1_in_rule__SimpleState__Group__030627 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_94_in_rule__SimpleState__Group__0__Impl30655 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group__1__Impl_in_rule__SimpleState__Group__130686 = new BitSet(new long[]{0x0800020000000000L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group__2_in_rule__SimpleState__Group__130689 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__NameAssignment_1_in_rule__SimpleState__Group__1__Impl30716 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group__2__Impl_in_rule__SimpleState__Group__230746 = new BitSet(new long[]{0x0800020000000000L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group__3_in_rule__SimpleState__Group__230749 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__DocuAssignment_2_in_rule__SimpleState__Group__2__Impl30776 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group__3__Impl_in_rule__SimpleState__Group__330807 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3__0_in_rule__SimpleState__Group__3__Impl30834 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3__0__Impl_in_rule__SimpleState__Group_3__030873 = new BitSet(new long[]{0x0000040000000000L,0x0000000780000000L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3__1_in_rule__SimpleState__Group_3__030876 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_rule__SimpleState__Group_3__0__Impl30904 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3__1__Impl_in_rule__SimpleState__Group_3__130935 = new BitSet(new long[]{0x0000040000000000L,0x0000000780000000L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3__2_in_rule__SimpleState__Group_3__130938 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3_1__0_in_rule__SimpleState__Group_3__1__Impl30965 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3__2__Impl_in_rule__SimpleState__Group_3__230996 = new BitSet(new long[]{0x0000040000000000L,0x0000000780000000L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3__3_in_rule__SimpleState__Group_3__230999 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3_2__0_in_rule__SimpleState__Group_3__2__Impl31026 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3__3__Impl_in_rule__SimpleState__Group_3__331057 = new BitSet(new long[]{0x0000040000000000L,0x0000000780000000L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3__4_in_rule__SimpleState__Group_3__331060 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3_3__0_in_rule__SimpleState__Group_3__3__Impl31087 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3__4__Impl_in_rule__SimpleState__Group_3__431118 = new BitSet(new long[]{0x0000040000000000L,0x0000000780000000L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3__5_in_rule__SimpleState__Group_3__431121 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3_4__0_in_rule__SimpleState__Group_3__4__Impl31148 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3__5__Impl_in_rule__SimpleState__Group_3__531179 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rule__SimpleState__Group_3__5__Impl31207 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3_1__0__Impl_in_rule__SimpleState__Group_3_1__031250 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3_1__1_in_rule__SimpleState__Group_3_1__031253 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_95_in_rule__SimpleState__Group_3_1__0__Impl31281 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3_1__1__Impl_in_rule__SimpleState__Group_3_1__131312 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__EntryCodeAssignment_3_1_1_in_rule__SimpleState__Group_3_1__1__Impl31339 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3_2__0__Impl_in_rule__SimpleState__Group_3_2__031373 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3_2__1_in_rule__SimpleState__Group_3_2__031376 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_96_in_rule__SimpleState__Group_3_2__0__Impl31404 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3_2__1__Impl_in_rule__SimpleState__Group_3_2__131435 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__ExitCodeAssignment_3_2_1_in_rule__SimpleState__Group_3_2__1__Impl31462 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3_3__0__Impl_in_rule__SimpleState__Group_3_3__031496 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3_3__1_in_rule__SimpleState__Group_3_3__031499 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_97_in_rule__SimpleState__Group_3_3__0__Impl31527 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3_3__1__Impl_in_rule__SimpleState__Group_3_3__131558 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__DoCodeAssignment_3_3_1_in_rule__SimpleState__Group_3_3__1__Impl31585 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3_4__0__Impl_in_rule__SimpleState__Group_3_4__031619 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3_4__1_in_rule__SimpleState__Group_3_4__031622 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_98_in_rule__SimpleState__Group_3_4__0__Impl31650 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__Group_3_4__1__Impl_in_rule__SimpleState__Group_3_4__131681 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleState__SubgraphAssignment_3_4_1_in_rule__SimpleState__Group_3_4__1__Impl31708 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group__0__Impl_in_rule__RefinedState__Group__031742 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group__1_in_rule__RefinedState__Group__031745 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_99_in_rule__RefinedState__Group__0__Impl31773 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group__1__Impl_in_rule__RefinedState__Group__131804 = new BitSet(new long[]{0x0800020000000000L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group__2_in_rule__RefinedState__Group__131807 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__TargetAssignment_1_in_rule__RefinedState__Group__1__Impl31834 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group__2__Impl_in_rule__RefinedState__Group__231864 = new BitSet(new long[]{0x0800020000000000L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group__3_in_rule__RefinedState__Group__231867 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__DocuAssignment_2_in_rule__RefinedState__Group__2__Impl31894 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group__3__Impl_in_rule__RefinedState__Group__331925 = new BitSet(new long[]{0x0000040000000000L,0x0000000780000000L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group__4_in_rule__RefinedState__Group__331928 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_rule__RefinedState__Group__3__Impl31956 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group__4__Impl_in_rule__RefinedState__Group__431987 = new BitSet(new long[]{0x0000040000000000L,0x0000000780000000L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group__5_in_rule__RefinedState__Group__431990 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group_4__0_in_rule__RefinedState__Group__4__Impl32017 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group__5__Impl_in_rule__RefinedState__Group__532048 = new BitSet(new long[]{0x0000040000000000L,0x0000000780000000L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group__6_in_rule__RefinedState__Group__532051 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group_5__0_in_rule__RefinedState__Group__5__Impl32078 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group__6__Impl_in_rule__RefinedState__Group__632109 = new BitSet(new long[]{0x0000040000000000L,0x0000000780000000L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group__7_in_rule__RefinedState__Group__632112 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group_6__0_in_rule__RefinedState__Group__6__Impl32139 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group__7__Impl_in_rule__RefinedState__Group__732170 = new BitSet(new long[]{0x0000040000000000L,0x0000000780000000L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group__8_in_rule__RefinedState__Group__732173 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group_7__0_in_rule__RefinedState__Group__7__Impl32200 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group__8__Impl_in_rule__RefinedState__Group__832231 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rule__RefinedState__Group__8__Impl32259 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group_4__0__Impl_in_rule__RefinedState__Group_4__032308 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group_4__1_in_rule__RefinedState__Group_4__032311 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_95_in_rule__RefinedState__Group_4__0__Impl32339 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group_4__1__Impl_in_rule__RefinedState__Group_4__132370 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__EntryCodeAssignment_4_1_in_rule__RefinedState__Group_4__1__Impl32397 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group_5__0__Impl_in_rule__RefinedState__Group_5__032431 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group_5__1_in_rule__RefinedState__Group_5__032434 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_96_in_rule__RefinedState__Group_5__0__Impl32462 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group_5__1__Impl_in_rule__RefinedState__Group_5__132493 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__ExitCodeAssignment_5_1_in_rule__RefinedState__Group_5__1__Impl32520 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group_6__0__Impl_in_rule__RefinedState__Group_6__032554 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group_6__1_in_rule__RefinedState__Group_6__032557 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_97_in_rule__RefinedState__Group_6__0__Impl32585 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group_6__1__Impl_in_rule__RefinedState__Group_6__132616 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__DoCodeAssignment_6_1_in_rule__RefinedState__Group_6__1__Impl32643 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group_7__0__Impl_in_rule__RefinedState__Group_7__032677 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group_7__1_in_rule__RefinedState__Group_7__032680 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_98_in_rule__RefinedState__Group_7__0__Impl32708 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__Group_7__1__Impl_in_rule__RefinedState__Group_7__132739 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedState__SubgraphAssignment_7_1_in_rule__RefinedState__Group_7__1__Impl32766 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DetailCode__Group__0__Impl_in_rule__DetailCode__Group__032800 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_rule__DetailCode__Group__1_in_rule__DetailCode__Group__032803 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DetailCode__Group__1__Impl_in_rule__DetailCode__Group__132861 = new BitSet(new long[]{0x0000040000000080L});
-    public static final BitSet FOLLOW_rule__DetailCode__Group__2_in_rule__DetailCode__Group__132864 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DetailCode__UsedAssignment_1_in_rule__DetailCode__Group__1__Impl32891 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DetailCode__Group__2__Impl_in_rule__DetailCode__Group__232921 = new BitSet(new long[]{0x0000040000000080L});
-    public static final BitSet FOLLOW_rule__DetailCode__Group__3_in_rule__DetailCode__Group__232924 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DetailCode__LinesAssignment_2_in_rule__DetailCode__Group__2__Impl32951 = new BitSet(new long[]{0x0000000000000082L});
-    public static final BitSet FOLLOW_rule__DetailCode__Group__3__Impl_in_rule__DetailCode__Group__332982 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rule__DetailCode__Group__3__Impl33010 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TransitionPoint__Group__0__Impl_in_rule__TransitionPoint__Group__033049 = new BitSet(new long[]{0x0000000000000000L,0x0000001000000000L,0x0000000000000004L});
-    public static final BitSet FOLLOW_rule__TransitionPoint__Group__1_in_rule__TransitionPoint__Group__033052 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TransitionPoint__HandlerAssignment_0_in_rule__TransitionPoint__Group__0__Impl33079 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TransitionPoint__Group__1__Impl_in_rule__TransitionPoint__Group__133110 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__TransitionPoint__Group__2_in_rule__TransitionPoint__Group__133113 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_100_in_rule__TransitionPoint__Group__1__Impl33141 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TransitionPoint__Group__2__Impl_in_rule__TransitionPoint__Group__233172 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TransitionPoint__NameAssignment_2_in_rule__TransitionPoint__Group__2__Impl33199 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EntryPoint__Group__0__Impl_in_rule__EntryPoint__Group__033235 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__EntryPoint__Group__1_in_rule__EntryPoint__Group__033238 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_101_in_rule__EntryPoint__Group__0__Impl33266 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EntryPoint__Group__1__Impl_in_rule__EntryPoint__Group__133297 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EntryPoint__NameAssignment_1_in_rule__EntryPoint__Group__1__Impl33324 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ExitPoint__Group__0__Impl_in_rule__ExitPoint__Group__033358 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__ExitPoint__Group__1_in_rule__ExitPoint__Group__033361 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_102_in_rule__ExitPoint__Group__0__Impl33389 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ExitPoint__Group__1__Impl_in_rule__ExitPoint__Group__133420 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ExitPoint__NameAssignment_1_in_rule__ExitPoint__Group__1__Impl33447 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ChoicePoint__Group__0__Impl_in_rule__ChoicePoint__Group__033481 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__ChoicePoint__Group__1_in_rule__ChoicePoint__Group__033484 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_103_in_rule__ChoicePoint__Group__0__Impl33512 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ChoicePoint__Group__1__Impl_in_rule__ChoicePoint__Group__133543 = new BitSet(new long[]{0x0800000000000000L});
-    public static final BitSet FOLLOW_rule__ChoicePoint__Group__2_in_rule__ChoicePoint__Group__133546 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ChoicePoint__NameAssignment_1_in_rule__ChoicePoint__Group__1__Impl33573 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ChoicePoint__Group__2__Impl_in_rule__ChoicePoint__Group__233603 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ChoicePoint__DocuAssignment_2_in_rule__ChoicePoint__Group__2__Impl33630 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InitialTransition__Group__0__Impl_in_rule__InitialTransition__Group__033667 = new BitSet(new long[]{0x0000080000000040L});
-    public static final BitSet FOLLOW_rule__InitialTransition__Group__1_in_rule__InitialTransition__Group__033670 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_104_in_rule__InitialTransition__Group__0__Impl33698 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InitialTransition__Group__1__Impl_in_rule__InitialTransition__Group__133729 = new BitSet(new long[]{0x0000080000000040L});
-    public static final BitSet FOLLOW_rule__InitialTransition__Group__2_in_rule__InitialTransition__Group__133732 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InitialTransition__NameAssignment_1_in_rule__InitialTransition__Group__1__Impl33759 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InitialTransition__Group__2__Impl_in_rule__InitialTransition__Group__233790 = new BitSet(new long[]{0x0000000000000000L,0x0000020000000000L});
-    public static final BitSet FOLLOW_rule__InitialTransition__Group__3_in_rule__InitialTransition__Group__233793 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_43_in_rule__InitialTransition__Group__2__Impl33821 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InitialTransition__Group__3__Impl_in_rule__InitialTransition__Group__333852 = new BitSet(new long[]{0x0000200000000000L});
-    public static final BitSet FOLLOW_rule__InitialTransition__Group__4_in_rule__InitialTransition__Group__333855 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_105_in_rule__InitialTransition__Group__3__Impl33883 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InitialTransition__Group__4__Impl_in_rule__InitialTransition__Group__433914 = new BitSet(new long[]{0x0000000000000040L,0x0003000000000000L});
-    public static final BitSet FOLLOW_rule__InitialTransition__Group__5_in_rule__InitialTransition__Group__433917 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_45_in_rule__InitialTransition__Group__4__Impl33945 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InitialTransition__Group__5__Impl_in_rule__InitialTransition__Group__533976 = new BitSet(new long[]{0x0800020000000000L});
-    public static final BitSet FOLLOW_rule__InitialTransition__Group__6_in_rule__InitialTransition__Group__533979 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InitialTransition__ToAssignment_5_in_rule__InitialTransition__Group__5__Impl34006 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InitialTransition__Group__6__Impl_in_rule__InitialTransition__Group__634036 = new BitSet(new long[]{0x0800020000000000L});
-    public static final BitSet FOLLOW_rule__InitialTransition__Group__7_in_rule__InitialTransition__Group__634039 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InitialTransition__DocuAssignment_6_in_rule__InitialTransition__Group__6__Impl34066 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InitialTransition__Group__7__Impl_in_rule__InitialTransition__Group__734097 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InitialTransition__Group_7__0_in_rule__InitialTransition__Group__7__Impl34124 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InitialTransition__Group_7__0__Impl_in_rule__InitialTransition__Group_7__034171 = new BitSet(new long[]{0x0000040000000000L,0x0000040000000000L});
-    public static final BitSet FOLLOW_rule__InitialTransition__Group_7__1_in_rule__InitialTransition__Group_7__034174 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_rule__InitialTransition__Group_7__0__Impl34202 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InitialTransition__Group_7__1__Impl_in_rule__InitialTransition__Group_7__134233 = new BitSet(new long[]{0x0000040000000000L,0x0000040000000000L});
-    public static final BitSet FOLLOW_rule__InitialTransition__Group_7__2_in_rule__InitialTransition__Group_7__134236 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InitialTransition__Group_7_1__0_in_rule__InitialTransition__Group_7__1__Impl34263 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InitialTransition__Group_7__2__Impl_in_rule__InitialTransition__Group_7__234294 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rule__InitialTransition__Group_7__2__Impl34322 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InitialTransition__Group_7_1__0__Impl_in_rule__InitialTransition__Group_7_1__034359 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_rule__InitialTransition__Group_7_1__1_in_rule__InitialTransition__Group_7_1__034362 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_106_in_rule__InitialTransition__Group_7_1__0__Impl34390 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InitialTransition__Group_7_1__1__Impl_in_rule__InitialTransition__Group_7_1__134421 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InitialTransition__ActionAssignment_7_1_1_in_rule__InitialTransition__Group_7_1__1__Impl34448 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__Group__0__Impl_in_rule__ContinuationTransition__Group__034482 = new BitSet(new long[]{0x0000080000000040L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__Group__1_in_rule__ContinuationTransition__Group__034485 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_104_in_rule__ContinuationTransition__Group__0__Impl34513 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__Group__1__Impl_in_rule__ContinuationTransition__Group__134544 = new BitSet(new long[]{0x0000080000000040L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__Group__2_in_rule__ContinuationTransition__Group__134547 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__NameAssignment_1_in_rule__ContinuationTransition__Group__1__Impl34574 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__Group__2__Impl_in_rule__ContinuationTransition__Group__234605 = new BitSet(new long[]{0x0000000000000040L,0x0003000000000000L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__Group__3_in_rule__ContinuationTransition__Group__234608 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_43_in_rule__ContinuationTransition__Group__2__Impl34636 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__Group__3__Impl_in_rule__ContinuationTransition__Group__334667 = new BitSet(new long[]{0x0000200000000000L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__Group__4_in_rule__ContinuationTransition__Group__334670 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__FromAssignment_3_in_rule__ContinuationTransition__Group__3__Impl34697 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__Group__4__Impl_in_rule__ContinuationTransition__Group__434727 = new BitSet(new long[]{0x0000000000000040L,0x0003000000000000L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__Group__5_in_rule__ContinuationTransition__Group__434730 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_45_in_rule__ContinuationTransition__Group__4__Impl34758 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__Group__5__Impl_in_rule__ContinuationTransition__Group__534789 = new BitSet(new long[]{0x0800020000000000L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__Group__6_in_rule__ContinuationTransition__Group__534792 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__ToAssignment_5_in_rule__ContinuationTransition__Group__5__Impl34819 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__Group__6__Impl_in_rule__ContinuationTransition__Group__634849 = new BitSet(new long[]{0x0800020000000000L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__Group__7_in_rule__ContinuationTransition__Group__634852 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__DocuAssignment_6_in_rule__ContinuationTransition__Group__6__Impl34879 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__Group__7__Impl_in_rule__ContinuationTransition__Group__734910 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__Group_7__0_in_rule__ContinuationTransition__Group__7__Impl34937 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__Group_7__0__Impl_in_rule__ContinuationTransition__Group_7__034984 = new BitSet(new long[]{0x0000040000000000L,0x0000040000000000L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__Group_7__1_in_rule__ContinuationTransition__Group_7__034987 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_rule__ContinuationTransition__Group_7__0__Impl35015 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__Group_7__1__Impl_in_rule__ContinuationTransition__Group_7__135046 = new BitSet(new long[]{0x0000040000000000L,0x0000040000000000L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__Group_7__2_in_rule__ContinuationTransition__Group_7__135049 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__Group_7_1__0_in_rule__ContinuationTransition__Group_7__1__Impl35076 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__Group_7__2__Impl_in_rule__ContinuationTransition__Group_7__235107 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rule__ContinuationTransition__Group_7__2__Impl35135 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__Group_7_1__0__Impl_in_rule__ContinuationTransition__Group_7_1__035172 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__Group_7_1__1_in_rule__ContinuationTransition__Group_7_1__035175 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_106_in_rule__ContinuationTransition__Group_7_1__0__Impl35203 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__Group_7_1__1__Impl_in_rule__ContinuationTransition__Group_7_1__135234 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContinuationTransition__ActionAssignment_7_1_1_in_rule__ContinuationTransition__Group_7_1__1__Impl35261 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__0__Impl_in_rule__TriggeredTransition__Group__035295 = new BitSet(new long[]{0x0000080000000040L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__1_in_rule__TriggeredTransition__Group__035298 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_104_in_rule__TriggeredTransition__Group__0__Impl35326 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__1__Impl_in_rule__TriggeredTransition__Group__135357 = new BitSet(new long[]{0x0000080000000040L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__2_in_rule__TriggeredTransition__Group__135360 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__NameAssignment_1_in_rule__TriggeredTransition__Group__1__Impl35387 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__2__Impl_in_rule__TriggeredTransition__Group__235418 = new BitSet(new long[]{0x0000000000000040L,0x0003000000000000L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__3_in_rule__TriggeredTransition__Group__235421 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_43_in_rule__TriggeredTransition__Group__2__Impl35449 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__3__Impl_in_rule__TriggeredTransition__Group__335480 = new BitSet(new long[]{0x0000200000000000L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__4_in_rule__TriggeredTransition__Group__335483 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__FromAssignment_3_in_rule__TriggeredTransition__Group__3__Impl35510 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__4__Impl_in_rule__TriggeredTransition__Group__435540 = new BitSet(new long[]{0x0000000000000040L,0x0003000000000000L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__5_in_rule__TriggeredTransition__Group__435543 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_45_in_rule__TriggeredTransition__Group__4__Impl35571 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__5__Impl_in_rule__TriggeredTransition__Group__535602 = new BitSet(new long[]{0x0800020000000000L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__6_in_rule__TriggeredTransition__Group__535605 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__ToAssignment_5_in_rule__TriggeredTransition__Group__5__Impl35632 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__6__Impl_in_rule__TriggeredTransition__Group__635662 = new BitSet(new long[]{0x0800020000000000L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__7_in_rule__TriggeredTransition__Group__635665 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__DocuAssignment_6_in_rule__TriggeredTransition__Group__6__Impl35692 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__7__Impl_in_rule__TriggeredTransition__Group__735723 = new BitSet(new long[]{0x0000000000000000L,0x0000080000000000L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__8_in_rule__TriggeredTransition__Group__735726 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_rule__TriggeredTransition__Group__7__Impl35754 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__8__Impl_in_rule__TriggeredTransition__Group__835785 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__9_in_rule__TriggeredTransition__Group__835788 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_107_in_rule__TriggeredTransition__Group__8__Impl35816 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__9__Impl_in_rule__TriggeredTransition__Group__935847 = new BitSet(new long[]{0x0000000000000000L,0x0004000000000000L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__10_in_rule__TriggeredTransition__Group__935850 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_rule__TriggeredTransition__Group__9__Impl35878 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__10__Impl_in_rule__TriggeredTransition__Group__1035909 = new BitSet(new long[]{0x0000040000000000L,0x0000100000000000L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__11_in_rule__TriggeredTransition__Group__1035912 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__TriggersAssignment_10_in_rule__TriggeredTransition__Group__10__Impl35939 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__11__Impl_in_rule__TriggeredTransition__Group__1135969 = new BitSet(new long[]{0x0000040000000000L,0x0000100000000000L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__12_in_rule__TriggeredTransition__Group__1135972 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group_11__0_in_rule__TriggeredTransition__Group__11__Impl35999 = new BitSet(new long[]{0x0000000000000002L,0x0000100000000000L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__12__Impl_in_rule__TriggeredTransition__Group__1236030 = new BitSet(new long[]{0x0000040000000000L,0x0000040000000000L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__13_in_rule__TriggeredTransition__Group__1236033 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rule__TriggeredTransition__Group__12__Impl36061 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__13__Impl_in_rule__TriggeredTransition__Group__1336092 = new BitSet(new long[]{0x0000040000000000L,0x0000040000000000L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__14_in_rule__TriggeredTransition__Group__1336095 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group_13__0_in_rule__TriggeredTransition__Group__13__Impl36122 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group__14__Impl_in_rule__TriggeredTransition__Group__1436153 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rule__TriggeredTransition__Group__14__Impl36181 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group_11__0__Impl_in_rule__TriggeredTransition__Group_11__036242 = new BitSet(new long[]{0x0000000000000000L,0x0004000000000000L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group_11__1_in_rule__TriggeredTransition__Group_11__036245 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_108_in_rule__TriggeredTransition__Group_11__0__Impl36273 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group_11__1__Impl_in_rule__TriggeredTransition__Group_11__136304 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__TriggersAssignment_11_1_in_rule__TriggeredTransition__Group_11__1__Impl36331 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group_13__0__Impl_in_rule__TriggeredTransition__Group_13__036365 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group_13__1_in_rule__TriggeredTransition__Group_13__036368 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_106_in_rule__TriggeredTransition__Group_13__0__Impl36396 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__Group_13__1__Impl_in_rule__TriggeredTransition__Group_13__136427 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggeredTransition__ActionAssignment_13_1_in_rule__TriggeredTransition__Group_13__1__Impl36454 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group__0__Impl_in_rule__GuardedTransition__Group__036488 = new BitSet(new long[]{0x0000080000000040L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group__1_in_rule__GuardedTransition__Group__036491 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_104_in_rule__GuardedTransition__Group__0__Impl36519 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group__1__Impl_in_rule__GuardedTransition__Group__136550 = new BitSet(new long[]{0x0000080000000040L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group__2_in_rule__GuardedTransition__Group__136553 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__NameAssignment_1_in_rule__GuardedTransition__Group__1__Impl36580 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group__2__Impl_in_rule__GuardedTransition__Group__236611 = new BitSet(new long[]{0x0000000000000040L,0x0003000000000000L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group__3_in_rule__GuardedTransition__Group__236614 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_43_in_rule__GuardedTransition__Group__2__Impl36642 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group__3__Impl_in_rule__GuardedTransition__Group__336673 = new BitSet(new long[]{0x0000200000000000L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group__4_in_rule__GuardedTransition__Group__336676 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__FromAssignment_3_in_rule__GuardedTransition__Group__3__Impl36703 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group__4__Impl_in_rule__GuardedTransition__Group__436733 = new BitSet(new long[]{0x0000000000000040L,0x0003000000000000L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group__5_in_rule__GuardedTransition__Group__436736 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_45_in_rule__GuardedTransition__Group__4__Impl36764 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group__5__Impl_in_rule__GuardedTransition__Group__536795 = new BitSet(new long[]{0x0800020000000000L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group__6_in_rule__GuardedTransition__Group__536798 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__ToAssignment_5_in_rule__GuardedTransition__Group__5__Impl36825 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group__6__Impl_in_rule__GuardedTransition__Group__636855 = new BitSet(new long[]{0x0800020000000000L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group__7_in_rule__GuardedTransition__Group__636858 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__DocuAssignment_6_in_rule__GuardedTransition__Group__6__Impl36885 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group__7__Impl_in_rule__GuardedTransition__Group__736916 = new BitSet(new long[]{0x0000000000000000L,0x0000200000000000L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group__8_in_rule__GuardedTransition__Group__736919 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_rule__GuardedTransition__Group__7__Impl36947 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group__8__Impl_in_rule__GuardedTransition__Group__836978 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group__9_in_rule__GuardedTransition__Group__836981 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_109_in_rule__GuardedTransition__Group__8__Impl37009 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group__9__Impl_in_rule__GuardedTransition__Group__937040 = new BitSet(new long[]{0x0000040000000000L,0x0000040000000000L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group__10_in_rule__GuardedTransition__Group__937043 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__GuardAssignment_9_in_rule__GuardedTransition__Group__9__Impl37070 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group__10__Impl_in_rule__GuardedTransition__Group__1037100 = new BitSet(new long[]{0x0000040000000000L,0x0000040000000000L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group__11_in_rule__GuardedTransition__Group__1037103 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group_10__0_in_rule__GuardedTransition__Group__10__Impl37130 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group__11__Impl_in_rule__GuardedTransition__Group__1137161 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rule__GuardedTransition__Group__11__Impl37189 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group_10__0__Impl_in_rule__GuardedTransition__Group_10__037244 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group_10__1_in_rule__GuardedTransition__Group_10__037247 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_106_in_rule__GuardedTransition__Group_10__0__Impl37275 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__Group_10__1__Impl_in_rule__GuardedTransition__Group_10__137306 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GuardedTransition__ActionAssignment_10_1_in_rule__GuardedTransition__Group_10__1__Impl37333 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group__0__Impl_in_rule__CPBranchTransition__Group__037367 = new BitSet(new long[]{0x0000080000000040L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group__1_in_rule__CPBranchTransition__Group__037370 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_104_in_rule__CPBranchTransition__Group__0__Impl37398 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group__1__Impl_in_rule__CPBranchTransition__Group__137429 = new BitSet(new long[]{0x0000080000000040L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group__2_in_rule__CPBranchTransition__Group__137432 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__NameAssignment_1_in_rule__CPBranchTransition__Group__1__Impl37459 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group__2__Impl_in_rule__CPBranchTransition__Group__237490 = new BitSet(new long[]{0x0000000000000040L,0x0003000000000000L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group__3_in_rule__CPBranchTransition__Group__237493 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_43_in_rule__CPBranchTransition__Group__2__Impl37521 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group__3__Impl_in_rule__CPBranchTransition__Group__337552 = new BitSet(new long[]{0x0000200000000000L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group__4_in_rule__CPBranchTransition__Group__337555 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__FromAssignment_3_in_rule__CPBranchTransition__Group__3__Impl37582 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group__4__Impl_in_rule__CPBranchTransition__Group__437612 = new BitSet(new long[]{0x0000000000000040L,0x0003000000000000L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group__5_in_rule__CPBranchTransition__Group__437615 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_45_in_rule__CPBranchTransition__Group__4__Impl37643 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group__5__Impl_in_rule__CPBranchTransition__Group__537674 = new BitSet(new long[]{0x0800020000000000L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group__6_in_rule__CPBranchTransition__Group__537677 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__ToAssignment_5_in_rule__CPBranchTransition__Group__5__Impl37704 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group__6__Impl_in_rule__CPBranchTransition__Group__637734 = new BitSet(new long[]{0x0800020000000000L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group__7_in_rule__CPBranchTransition__Group__637737 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__DocuAssignment_6_in_rule__CPBranchTransition__Group__6__Impl37764 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group__7__Impl_in_rule__CPBranchTransition__Group__737795 = new BitSet(new long[]{0x0000000000000000L,0x0000400000000000L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group__8_in_rule__CPBranchTransition__Group__737798 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_rule__CPBranchTransition__Group__7__Impl37826 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group__8__Impl_in_rule__CPBranchTransition__Group__837857 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group__9_in_rule__CPBranchTransition__Group__837860 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_110_in_rule__CPBranchTransition__Group__8__Impl37888 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group__9__Impl_in_rule__CPBranchTransition__Group__937919 = new BitSet(new long[]{0x0000040000000000L,0x0000040000000000L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group__10_in_rule__CPBranchTransition__Group__937922 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__ConditionAssignment_9_in_rule__CPBranchTransition__Group__9__Impl37949 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group__10__Impl_in_rule__CPBranchTransition__Group__1037979 = new BitSet(new long[]{0x0000040000000000L,0x0000040000000000L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group__11_in_rule__CPBranchTransition__Group__1037982 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group_10__0_in_rule__CPBranchTransition__Group__10__Impl38009 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group__11__Impl_in_rule__CPBranchTransition__Group__1138040 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rule__CPBranchTransition__Group__11__Impl38068 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group_10__0__Impl_in_rule__CPBranchTransition__Group_10__038123 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group_10__1_in_rule__CPBranchTransition__Group_10__038126 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_106_in_rule__CPBranchTransition__Group_10__0__Impl38154 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__Group_10__1__Impl_in_rule__CPBranchTransition__Group_10__138185 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CPBranchTransition__ActionAssignment_10_1_in_rule__CPBranchTransition__Group_10__1__Impl38212 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedTransition__Group__0__Impl_in_rule__RefinedTransition__Group__038246 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__RefinedTransition__Group__1_in_rule__RefinedTransition__Group__038249 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_111_in_rule__RefinedTransition__Group__0__Impl38277 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedTransition__Group__1__Impl_in_rule__RefinedTransition__Group__138308 = new BitSet(new long[]{0x0800020000000000L});
-    public static final BitSet FOLLOW_rule__RefinedTransition__Group__2_in_rule__RefinedTransition__Group__138311 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedTransition__TargetAssignment_1_in_rule__RefinedTransition__Group__1__Impl38338 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedTransition__Group__2__Impl_in_rule__RefinedTransition__Group__238368 = new BitSet(new long[]{0x0800020000000000L});
-    public static final BitSet FOLLOW_rule__RefinedTransition__Group__3_in_rule__RefinedTransition__Group__238371 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedTransition__DocuAssignment_2_in_rule__RefinedTransition__Group__2__Impl38398 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedTransition__Group__3__Impl_in_rule__RefinedTransition__Group__338429 = new BitSet(new long[]{0x0000000000000000L,0x0000040000000000L});
-    public static final BitSet FOLLOW_rule__RefinedTransition__Group__4_in_rule__RefinedTransition__Group__338432 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_rule__RefinedTransition__Group__3__Impl38460 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedTransition__Group__4__Impl_in_rule__RefinedTransition__Group__438491 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_rule__RefinedTransition__Group__5_in_rule__RefinedTransition__Group__438494 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_106_in_rule__RefinedTransition__Group__4__Impl38522 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedTransition__Group__5__Impl_in_rule__RefinedTransition__Group__538553 = new BitSet(new long[]{0x0000040000000000L});
-    public static final BitSet FOLLOW_rule__RefinedTransition__Group__6_in_rule__RefinedTransition__Group__538556 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedTransition__ActionAssignment_5_in_rule__RefinedTransition__Group__5__Impl38583 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RefinedTransition__Group__6__Impl_in_rule__RefinedTransition__Group__638613 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rule__RefinedTransition__Group__6__Impl38641 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TrPointTerminal__Group__0__Impl_in_rule__TrPointTerminal__Group__038686 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__TrPointTerminal__Group__1_in_rule__TrPointTerminal__Group__038689 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_112_in_rule__TrPointTerminal__Group__0__Impl38717 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TrPointTerminal__Group__1__Impl_in_rule__TrPointTerminal__Group__138748 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TrPointTerminal__TrPointAssignment_1_in_rule__TrPointTerminal__Group__1__Impl38775 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubStateTrPointTerminal__Group__0__Impl_in_rule__SubStateTrPointTerminal__Group__038809 = new BitSet(new long[]{0x0004000000000000L});
-    public static final BitSet FOLLOW_rule__SubStateTrPointTerminal__Group__1_in_rule__SubStateTrPointTerminal__Group__038812 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubStateTrPointTerminal__TrPointAssignment_0_in_rule__SubStateTrPointTerminal__Group__0__Impl38839 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubStateTrPointTerminal__Group__1__Impl_in_rule__SubStateTrPointTerminal__Group__138869 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__SubStateTrPointTerminal__Group__2_in_rule__SubStateTrPointTerminal__Group__138872 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_50_in_rule__SubStateTrPointTerminal__Group__1__Impl38900 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubStateTrPointTerminal__Group__2__Impl_in_rule__SubStateTrPointTerminal__Group__238931 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SubStateTrPointTerminal__StateAssignment_2_in_rule__SubStateTrPointTerminal__Group__2__Impl38958 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ChoicepointTerminal__Group__0__Impl_in_rule__ChoicepointTerminal__Group__038994 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__ChoicepointTerminal__Group__1_in_rule__ChoicepointTerminal__Group__038997 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_113_in_rule__ChoicepointTerminal__Group__0__Impl39025 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ChoicepointTerminal__Group__1__Impl_in_rule__ChoicepointTerminal__Group__139056 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ChoicepointTerminal__CpAssignment_1_in_rule__ChoicepointTerminal__Group__1__Impl39083 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Trigger__Group__0__Impl_in_rule__Trigger__Group__039117 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__Trigger__Group__1_in_rule__Trigger__Group__039120 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_114_in_rule__Trigger__Group__0__Impl39148 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Trigger__Group__1__Impl_in_rule__Trigger__Group__139179 = new BitSet(new long[]{0x0000000000000000L,0x0018200000000000L});
-    public static final BitSet FOLLOW_rule__Trigger__Group__2_in_rule__Trigger__Group__139182 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Trigger__MsgFromIfPairsAssignment_1_in_rule__Trigger__Group__1__Impl39209 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Trigger__Group__2__Impl_in_rule__Trigger__Group__239239 = new BitSet(new long[]{0x0000000000000000L,0x0018200000000000L});
-    public static final BitSet FOLLOW_rule__Trigger__Group__3_in_rule__Trigger__Group__239242 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Trigger__Group_2__0_in_rule__Trigger__Group__2__Impl39269 = new BitSet(new long[]{0x0000000000000002L,0x0010000000000000L});
-    public static final BitSet FOLLOW_rule__Trigger__Group__3__Impl_in_rule__Trigger__Group__339300 = new BitSet(new long[]{0x0000000000000000L,0x0018200000000000L});
-    public static final BitSet FOLLOW_rule__Trigger__Group__4_in_rule__Trigger__Group__339303 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Trigger__GuardAssignment_3_in_rule__Trigger__Group__3__Impl39330 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Trigger__Group__4__Impl_in_rule__Trigger__Group__439361 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_115_in_rule__Trigger__Group__4__Impl39389 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Trigger__Group_2__0__Impl_in_rule__Trigger__Group_2__039430 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__Trigger__Group_2__1_in_rule__Trigger__Group_2__039433 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_116_in_rule__Trigger__Group_2__0__Impl39461 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Trigger__Group_2__1__Impl_in_rule__Trigger__Group_2__139492 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Trigger__MsgFromIfPairsAssignment_2_1_in_rule__Trigger__Group_2__1__Impl39519 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MessageFromIf__Group__0__Impl_in_rule__MessageFromIf__Group__039553 = new BitSet(new long[]{0x0000080000000000L});
-    public static final BitSet FOLLOW_rule__MessageFromIf__Group__1_in_rule__MessageFromIf__Group__039556 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MessageFromIf__MessageAssignment_0_in_rule__MessageFromIf__Group__0__Impl39583 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MessageFromIf__Group__1__Impl_in_rule__MessageFromIf__Group__139613 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__MessageFromIf__Group__2_in_rule__MessageFromIf__Group__139616 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_43_in_rule__MessageFromIf__Group__1__Impl39644 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MessageFromIf__Group__2__Impl_in_rule__MessageFromIf__Group__239675 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MessageFromIf__FromAssignment_2_in_rule__MessageFromIf__Group__2__Impl39702 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Guard__Group__0__Impl_in_rule__Guard__Group__039738 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_rule__Guard__Group__1_in_rule__Guard__Group__039741 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_109_in_rule__Guard__Group__0__Impl39769 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Guard__Group__1__Impl_in_rule__Guard__Group__139800 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Guard__GuardAssignment_1_in_rule__Guard__Group__1__Impl39827 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolSemantics__Group__0__Impl_in_rule__ProtocolSemantics__Group__039861 = new BitSet(new long[]{0x0000000000000000L,0x0020000000000000L});
-    public static final BitSet FOLLOW_rule__ProtocolSemantics__Group__1_in_rule__ProtocolSemantics__Group__039864 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolSemantics__Group__1__Impl_in_rule__ProtocolSemantics__Group__139922 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_rule__ProtocolSemantics__Group__2_in_rule__ProtocolSemantics__Group__139925 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_117_in_rule__ProtocolSemantics__Group__1__Impl39953 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolSemantics__Group__2__Impl_in_rule__ProtocolSemantics__Group__239984 = new BitSet(new long[]{0x0000040000000000L,0x00C0000000000000L});
-    public static final BitSet FOLLOW_rule__ProtocolSemantics__Group__3_in_rule__ProtocolSemantics__Group__239987 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_rule__ProtocolSemantics__Group__2__Impl40015 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolSemantics__Group__3__Impl_in_rule__ProtocolSemantics__Group__340046 = new BitSet(new long[]{0x0000040000000000L,0x00C0000000000000L});
-    public static final BitSet FOLLOW_rule__ProtocolSemantics__Group__4_in_rule__ProtocolSemantics__Group__340049 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ProtocolSemantics__RulesAssignment_3_in_rule__ProtocolSemantics__Group__3__Impl40076 = new BitSet(new long[]{0x0000000000000002L,0x00C0000000000000L});
-    public static final BitSet FOLLOW_rule__ProtocolSemantics__Group__4__Impl_in_rule__ProtocolSemantics__Group__440107 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rule__ProtocolSemantics__Group__4__Impl40135 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__Group__0__Impl_in_rule__InSemanticsRule__Group__040176 = new BitSet(new long[]{0x0000080000000000L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__Group__1_in_rule__InSemanticsRule__Group__040179 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_118_in_rule__InSemanticsRule__Group__0__Impl40207 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__Group__1__Impl_in_rule__InSemanticsRule__Group__140238 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__Group__2_in_rule__InSemanticsRule__Group__140241 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_43_in_rule__InSemanticsRule__Group__1__Impl40269 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__Group__2__Impl_in_rule__InSemanticsRule__Group__240300 = new BitSet(new long[]{0x0000200000000000L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__Group__3_in_rule__InSemanticsRule__Group__240303 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__MsgAssignment_2_in_rule__InSemanticsRule__Group__2__Impl40330 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__Group__3__Impl_in_rule__InSemanticsRule__Group__340360 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__Group_3__0_in_rule__InSemanticsRule__Group__3__Impl40387 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__Group_3__0__Impl_in_rule__InSemanticsRule__Group_3__040426 = new BitSet(new long[]{0x0000800000000000L,0x00C0000000000000L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__Group_3__1_in_rule__InSemanticsRule__Group_3__040429 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_45_in_rule__InSemanticsRule__Group_3__0__Impl40457 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__Group_3__1__Impl_in_rule__InSemanticsRule__Group_3__140488 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__Alternatives_3_1_in_rule__InSemanticsRule__Group_3__1__Impl40515 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__Group_3_1_1__0__Impl_in_rule__InSemanticsRule__Group_3_1_1__040549 = new BitSet(new long[]{0x0000000000000000L,0x00C0000000000000L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__Group_3_1_1__1_in_rule__InSemanticsRule__Group_3_1_1__040552 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_rule__InSemanticsRule__Group_3_1_1__0__Impl40580 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__Group_3_1_1__1__Impl_in_rule__InSemanticsRule__Group_3_1_1__140611 = new BitSet(new long[]{0x0008000000000000L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__Group_3_1_1__2_in_rule__InSemanticsRule__Group_3_1_1__140614 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__FollowUpsAssignment_3_1_1_1_in_rule__InSemanticsRule__Group_3_1_1__1__Impl40641 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__Group_3_1_1__2__Impl_in_rule__InSemanticsRule__Group_3_1_1__240671 = new BitSet(new long[]{0x0001000000000000L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__Group_3_1_1__3_in_rule__InSemanticsRule__Group_3_1_1__240674 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__Group_3_1_1_2__0_in_rule__InSemanticsRule__Group_3_1_1__2__Impl40703 = new BitSet(new long[]{0x0008000000000002L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__Group_3_1_1_2__0_in_rule__InSemanticsRule__Group_3_1_1__2__Impl40715 = new BitSet(new long[]{0x0008000000000002L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__Group_3_1_1__3__Impl_in_rule__InSemanticsRule__Group_3_1_1__340748 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_48_in_rule__InSemanticsRule__Group_3_1_1__3__Impl40776 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__Group_3_1_1_2__0__Impl_in_rule__InSemanticsRule__Group_3_1_1_2__040815 = new BitSet(new long[]{0x0000000000000000L,0x00C0000000000000L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__Group_3_1_1_2__1_in_rule__InSemanticsRule__Group_3_1_1_2__040818 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_rule__InSemanticsRule__Group_3_1_1_2__0__Impl40846 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__Group_3_1_1_2__1__Impl_in_rule__InSemanticsRule__Group_3_1_1_2__140877 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InSemanticsRule__FollowUpsAssignment_3_1_1_2_1_in_rule__InSemanticsRule__Group_3_1_1_2__1__Impl40904 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__Group__0__Impl_in_rule__OutSemanticsRule__Group__040938 = new BitSet(new long[]{0x0000080000000000L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__Group__1_in_rule__OutSemanticsRule__Group__040941 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_119_in_rule__OutSemanticsRule__Group__0__Impl40969 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__Group__1__Impl_in_rule__OutSemanticsRule__Group__141000 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__Group__2_in_rule__OutSemanticsRule__Group__141003 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_43_in_rule__OutSemanticsRule__Group__1__Impl41031 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__Group__2__Impl_in_rule__OutSemanticsRule__Group__241062 = new BitSet(new long[]{0x0000200000000000L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__Group__3_in_rule__OutSemanticsRule__Group__241065 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__MsgAssignment_2_in_rule__OutSemanticsRule__Group__2__Impl41092 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__Group__3__Impl_in_rule__OutSemanticsRule__Group__341122 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__Group_3__0_in_rule__OutSemanticsRule__Group__3__Impl41149 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__Group_3__0__Impl_in_rule__OutSemanticsRule__Group_3__041188 = new BitSet(new long[]{0x0000800000000000L,0x00C0000000000000L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__Group_3__1_in_rule__OutSemanticsRule__Group_3__041191 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_45_in_rule__OutSemanticsRule__Group_3__0__Impl41219 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__Group_3__1__Impl_in_rule__OutSemanticsRule__Group_3__141250 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__Alternatives_3_1_in_rule__OutSemanticsRule__Group_3__1__Impl41277 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__Group_3_1_1__0__Impl_in_rule__OutSemanticsRule__Group_3_1_1__041311 = new BitSet(new long[]{0x0000000000000000L,0x00C0000000000000L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__Group_3_1_1__1_in_rule__OutSemanticsRule__Group_3_1_1__041314 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_rule__OutSemanticsRule__Group_3_1_1__0__Impl41342 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__Group_3_1_1__1__Impl_in_rule__OutSemanticsRule__Group_3_1_1__141373 = new BitSet(new long[]{0x0008000000000000L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__Group_3_1_1__2_in_rule__OutSemanticsRule__Group_3_1_1__141376 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_1_in_rule__OutSemanticsRule__Group_3_1_1__1__Impl41403 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__Group_3_1_1__2__Impl_in_rule__OutSemanticsRule__Group_3_1_1__241433 = new BitSet(new long[]{0x0001000000000000L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__Group_3_1_1__3_in_rule__OutSemanticsRule__Group_3_1_1__241436 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__Group_3_1_1_2__0_in_rule__OutSemanticsRule__Group_3_1_1__2__Impl41465 = new BitSet(new long[]{0x0008000000000002L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__Group_3_1_1_2__0_in_rule__OutSemanticsRule__Group_3_1_1__2__Impl41477 = new BitSet(new long[]{0x0008000000000002L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__Group_3_1_1__3__Impl_in_rule__OutSemanticsRule__Group_3_1_1__341510 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_48_in_rule__OutSemanticsRule__Group_3_1_1__3__Impl41538 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__Group_3_1_1_2__0__Impl_in_rule__OutSemanticsRule__Group_3_1_1_2__041577 = new BitSet(new long[]{0x0000000000000000L,0x00C0000000000000L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__Group_3_1_1_2__1_in_rule__OutSemanticsRule__Group_3_1_1_2__041580 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_rule__OutSemanticsRule__Group_3_1_1_2__0__Impl41608 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__Group_3_1_1_2__1__Impl_in_rule__OutSemanticsRule__Group_3_1_1_2__141639 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_2_1_in_rule__OutSemanticsRule__Group_3_1_1_2__1__Impl41666 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Annotation__Group__0__Impl_in_rule__Annotation__Group__041700 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__Annotation__Group__1_in_rule__Annotation__Group__041703 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_120_in_rule__Annotation__Group__0__Impl41731 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Annotation__Group__1__Impl_in_rule__Annotation__Group__141762 = new BitSet(new long[]{0x0000800000000000L});
-    public static final BitSet FOLLOW_rule__Annotation__Group__2_in_rule__Annotation__Group__141765 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Annotation__TypeAssignment_1_in_rule__Annotation__Group__1__Impl41792 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Annotation__Group__2__Impl_in_rule__Annotation__Group__241822 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Annotation__Group_2__0_in_rule__Annotation__Group__2__Impl41849 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Annotation__Group_2__0__Impl_in_rule__Annotation__Group_2__041886 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__Annotation__Group_2__1_in_rule__Annotation__Group_2__041889 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_rule__Annotation__Group_2__0__Impl41917 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Annotation__Group_2__1__Impl_in_rule__Annotation__Group_2__141948 = new BitSet(new long[]{0x0009000000000000L});
-    public static final BitSet FOLLOW_rule__Annotation__Group_2__2_in_rule__Annotation__Group_2__141951 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Annotation__AttributesAssignment_2_1_in_rule__Annotation__Group_2__1__Impl41978 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Annotation__Group_2__2__Impl_in_rule__Annotation__Group_2__242008 = new BitSet(new long[]{0x0009000000000000L});
-    public static final BitSet FOLLOW_rule__Annotation__Group_2__3_in_rule__Annotation__Group_2__242011 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Annotation__Group_2_2__0_in_rule__Annotation__Group_2__2__Impl42038 = new BitSet(new long[]{0x0008000000000002L});
-    public static final BitSet FOLLOW_rule__Annotation__Group_2__3__Impl_in_rule__Annotation__Group_2__342069 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_48_in_rule__Annotation__Group_2__3__Impl42097 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Annotation__Group_2_2__0__Impl_in_rule__Annotation__Group_2_2__042136 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__Annotation__Group_2_2__1_in_rule__Annotation__Group_2_2__042139 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_rule__Annotation__Group_2_2__0__Impl42167 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Annotation__Group_2_2__1__Impl_in_rule__Annotation__Group_2_2__142198 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Annotation__AttributesAssignment_2_2_1_in_rule__Annotation__Group_2_2__1__Impl42225 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeyValue__Group__0__Impl_in_rule__KeyValue__Group__042259 = new BitSet(new long[]{0x0010000000000000L});
-    public static final BitSet FOLLOW_rule__KeyValue__Group__1_in_rule__KeyValue__Group__042262 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeyValue__KeyAssignment_0_in_rule__KeyValue__Group__0__Impl42289 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeyValue__Group__1__Impl_in_rule__KeyValue__Group__142319 = new BitSet(new long[]{0x000000000E0000B0L,0x0000000000000000L,0x0000000000000008L});
-    public static final BitSet FOLLOW_rule__KeyValue__Group__2_in_rule__KeyValue__Group__142322 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_52_in_rule__KeyValue__Group__1__Impl42350 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeyValue__Group__2__Impl_in_rule__KeyValue__Group__242381 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeyValue__ValueAssignment_2_in_rule__KeyValue__Group__2__Impl42408 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AnnotationType__Group__0__Impl_in_rule__AnnotationType__Group__042444 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__AnnotationType__Group__1_in_rule__AnnotationType__Group__042447 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_121_in_rule__AnnotationType__Group__0__Impl42475 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AnnotationType__Group__1__Impl_in_rule__AnnotationType__Group__142506 = new BitSet(new long[]{0x0800020000000000L});
-    public static final BitSet FOLLOW_rule__AnnotationType__Group__2_in_rule__AnnotationType__Group__142509 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AnnotationType__NameAssignment_1_in_rule__AnnotationType__Group__1__Impl42536 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AnnotationType__Group__2__Impl_in_rule__AnnotationType__Group__242566 = new BitSet(new long[]{0x0800020000000000L});
-    public static final BitSet FOLLOW_rule__AnnotationType__Group__3_in_rule__AnnotationType__Group__242569 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AnnotationType__DocuAssignment_2_in_rule__AnnotationType__Group__2__Impl42596 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AnnotationType__Group__3__Impl_in_rule__AnnotationType__Group__342627 = new BitSet(new long[]{0x0000000000000000L,0x0400000000000000L});
-    public static final BitSet FOLLOW_rule__AnnotationType__Group__4_in_rule__AnnotationType__Group__342630 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_rule__AnnotationType__Group__3__Impl42658 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AnnotationType__Group__4__Impl_in_rule__AnnotationType__Group__442689 = new BitSet(new long[]{0x0010000000000000L});
-    public static final BitSet FOLLOW_rule__AnnotationType__Group__5_in_rule__AnnotationType__Group__442692 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_122_in_rule__AnnotationType__Group__4__Impl42720 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AnnotationType__Group__5__Impl_in_rule__AnnotationType__Group__542751 = new BitSet(new long[]{0x00000200007F0000L});
-    public static final BitSet FOLLOW_rule__AnnotationType__Group__6_in_rule__AnnotationType__Group__542754 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_52_in_rule__AnnotationType__Group__5__Impl42782 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AnnotationType__Group__6__Impl_in_rule__AnnotationType__Group__642813 = new BitSet(new long[]{0x0000040400800000L});
-    public static final BitSet FOLLOW_rule__AnnotationType__Group__7_in_rule__AnnotationType__Group__642816 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AnnotationType__Alternatives_6_in_rule__AnnotationType__Group__6__Impl42843 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AnnotationType__Group__7__Impl_in_rule__AnnotationType__Group__742873 = new BitSet(new long[]{0x0000040400800000L});
-    public static final BitSet FOLLOW_rule__AnnotationType__Group__8_in_rule__AnnotationType__Group__742876 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AnnotationType__AttributesAssignment_7_in_rule__AnnotationType__Group__7__Impl42903 = new BitSet(new long[]{0x0000000400800002L});
-    public static final BitSet FOLLOW_rule__AnnotationType__Group__8__Impl_in_rule__AnnotationType__Group__842934 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rule__AnnotationType__Group__8__Impl42962 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AnnotationType__Group_6_1__0__Impl_in_rule__AnnotationType__Group_6_1__043011 = new BitSet(new long[]{0x00000000007F0000L});
-    public static final BitSet FOLLOW_rule__AnnotationType__Group_6_1__1_in_rule__AnnotationType__Group_6_1__043014 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_rule__AnnotationType__Group_6_1__0__Impl43042 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AnnotationType__Group_6_1__1__Impl_in_rule__AnnotationType__Group_6_1__143073 = new BitSet(new long[]{0x0008040000000000L});
-    public static final BitSet FOLLOW_rule__AnnotationType__Group_6_1__2_in_rule__AnnotationType__Group_6_1__143076 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AnnotationType__TargetsAssignment_6_1_1_in_rule__AnnotationType__Group_6_1__1__Impl43103 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AnnotationType__Group_6_1__2__Impl_in_rule__AnnotationType__Group_6_1__243133 = new BitSet(new long[]{0x0008040000000000L});
-    public static final BitSet FOLLOW_rule__AnnotationType__Group_6_1__3_in_rule__AnnotationType__Group_6_1__243136 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AnnotationType__Group_6_1_2__0_in_rule__AnnotationType__Group_6_1__2__Impl43163 = new BitSet(new long[]{0x0008000000000002L});
-    public static final BitSet FOLLOW_rule__AnnotationType__Group_6_1__3__Impl_in_rule__AnnotationType__Group_6_1__343194 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rule__AnnotationType__Group_6_1__3__Impl43222 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AnnotationType__Group_6_1_2__0__Impl_in_rule__AnnotationType__Group_6_1_2__043261 = new BitSet(new long[]{0x00000000007F0000L});
-    public static final BitSet FOLLOW_rule__AnnotationType__Group_6_1_2__1_in_rule__AnnotationType__Group_6_1_2__043264 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_rule__AnnotationType__Group_6_1_2__0__Impl43292 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AnnotationType__Group_6_1_2__1__Impl_in_rule__AnnotationType__Group_6_1_2__143323 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AnnotationType__TargetsAssignment_6_1_2_1_in_rule__AnnotationType__Group_6_1_2__1__Impl43350 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__0__Impl_in_rule__SimpleAnnotationAttribute__Group__043384 = new BitSet(new long[]{0x0000000000000000L,0x0800000000000000L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__1_in_rule__SimpleAnnotationAttribute__Group__043387 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Alternatives_0_in_rule__SimpleAnnotationAttribute__Group__0__Impl43414 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__1__Impl_in_rule__SimpleAnnotationAttribute__Group__143444 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__2_in_rule__SimpleAnnotationAttribute__Group__143447 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_123_in_rule__SimpleAnnotationAttribute__Group__1__Impl43475 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__2__Impl_in_rule__SimpleAnnotationAttribute__Group__243506 = new BitSet(new long[]{0x0000080000000000L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__3_in_rule__SimpleAnnotationAttribute__Group__243509 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__NameAssignment_2_in_rule__SimpleAnnotationAttribute__Group__2__Impl43536 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__3__Impl_in_rule__SimpleAnnotationAttribute__Group__343566 = new BitSet(new long[]{0x000000F000000000L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__4_in_rule__SimpleAnnotationAttribute__Group__343569 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_43_in_rule__SimpleAnnotationAttribute__Group__3__Impl43597 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__Group__4__Impl_in_rule__SimpleAnnotationAttribute__Group__443628 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleAnnotationAttribute__TypeAssignment_4_in_rule__SimpleAnnotationAttribute__Group__4__Impl43655 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__0__Impl_in_rule__EnumAnnotationAttribute__Group__043695 = new BitSet(new long[]{0x0000000000000000L,0x0800000000000000L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__1_in_rule__EnumAnnotationAttribute__Group__043698 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Alternatives_0_in_rule__EnumAnnotationAttribute__Group__0__Impl43725 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__1__Impl_in_rule__EnumAnnotationAttribute__Group__143755 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__2_in_rule__EnumAnnotationAttribute__Group__143758 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_123_in_rule__EnumAnnotationAttribute__Group__1__Impl43786 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__2__Impl_in_rule__EnumAnnotationAttribute__Group__243817 = new BitSet(new long[]{0x0000080000000000L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__3_in_rule__EnumAnnotationAttribute__Group__243820 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__NameAssignment_2_in_rule__EnumAnnotationAttribute__Group__2__Impl43847 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__3__Impl_in_rule__EnumAnnotationAttribute__Group__343877 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__4_in_rule__EnumAnnotationAttribute__Group__343880 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_43_in_rule__EnumAnnotationAttribute__Group__3__Impl43908 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__4__Impl_in_rule__EnumAnnotationAttribute__Group__443939 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__5_in_rule__EnumAnnotationAttribute__Group__443942 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_rule__EnumAnnotationAttribute__Group__4__Impl43970 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__5__Impl_in_rule__EnumAnnotationAttribute__Group__544001 = new BitSet(new long[]{0x0008040000000000L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__6_in_rule__EnumAnnotationAttribute__Group__544004 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__ValuesAssignment_5_in_rule__EnumAnnotationAttribute__Group__5__Impl44031 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__6__Impl_in_rule__EnumAnnotationAttribute__Group__644061 = new BitSet(new long[]{0x0008040000000000L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__7_in_rule__EnumAnnotationAttribute__Group__644064 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group_6__0_in_rule__EnumAnnotationAttribute__Group__6__Impl44091 = new BitSet(new long[]{0x0008000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group__7__Impl_in_rule__EnumAnnotationAttribute__Group__744122 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rule__EnumAnnotationAttribute__Group__7__Impl44150 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group_6__0__Impl_in_rule__EnumAnnotationAttribute__Group_6__044197 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group_6__1_in_rule__EnumAnnotationAttribute__Group_6__044200 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_rule__EnumAnnotationAttribute__Group_6__0__Impl44228 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__Group_6__1__Impl_in_rule__EnumAnnotationAttribute__Group_6__144259 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__EnumAnnotationAttribute__ValuesAssignment_6_1_in_rule__EnumAnnotationAttribute__Group_6__1__Impl44286 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__Group__0__Impl_in_rule__Import__Group__044320 = new BitSet(new long[]{0x0000000001000040L});
-    public static final BitSet FOLLOW_rule__Import__Group__1_in_rule__Import__Group__044323 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_124_in_rule__Import__Group__0__Impl44351 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__Group__1__Impl_in_rule__Import__Group__144382 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__Import__Group__2_in_rule__Import__Group__144385 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__Alternatives_1_in_rule__Import__Group__1__Impl44412 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__Group__2__Impl_in_rule__Import__Group__244442 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__ImportURIAssignment_2_in_rule__Import__Group__2__Impl44469 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__Group_1_0__0__Impl_in_rule__Import__Group_1_0__044505 = new BitSet(new long[]{0x0000000000000000L,0x2000000000000000L});
-    public static final BitSet FOLLOW_rule__Import__Group_1_0__1_in_rule__Import__Group_1_0__044508 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__ImportedNamespaceAssignment_1_0_0_in_rule__Import__Group_1_0__0__Impl44535 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__Group_1_0__1__Impl_in_rule__Import__Group_1_0__144565 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_125_in_rule__Import__Group_1_0__1__Impl44593 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ImportedFQN__Group__0__Impl_in_rule__ImportedFQN__Group__044628 = new BitSet(new long[]{0x0000000000000000L,0x4000000000000000L});
-    public static final BitSet FOLLOW_rule__ImportedFQN__Group__1_in_rule__ImportedFQN__Group__044631 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_rule__ImportedFQN__Group__0__Impl44658 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ImportedFQN__Group__1__Impl_in_rule__ImportedFQN__Group__144687 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_126_in_rule__ImportedFQN__Group__1__Impl44716 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Documentation__Group__0__Impl_in_rule__Documentation__Group__044753 = new BitSet(new long[]{0x0800000000000000L});
-    public static final BitSet FOLLOW_rule__Documentation__Group__1_in_rule__Documentation__Group__044756 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Documentation__Group__1__Impl_in_rule__Documentation__Group__144814 = new BitSet(new long[]{0x1000000000000080L});
-    public static final BitSet FOLLOW_rule__Documentation__Group__2_in_rule__Documentation__Group__144817 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_59_in_rule__Documentation__Group__1__Impl44845 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Documentation__Group__2__Impl_in_rule__Documentation__Group__244876 = new BitSet(new long[]{0x1000000000000080L});
-    public static final BitSet FOLLOW_rule__Documentation__Group__3_in_rule__Documentation__Group__244879 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Documentation__LinesAssignment_2_in_rule__Documentation__Group__2__Impl44906 = new BitSet(new long[]{0x0000000000000082L});
-    public static final BitSet FOLLOW_rule__Documentation__Group__3__Impl_in_rule__Documentation__Group__344937 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_60_in_rule__Documentation__Group__3__Impl44965 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__BooleanLiteral__Group__0__Impl_in_rule__BooleanLiteral__Group__045010 = new BitSet(new long[]{0x0000000002000000L,0x0000000000000000L,0x0000000000000008L});
-    public static final BitSet FOLLOW_rule__BooleanLiteral__Group__1_in_rule__BooleanLiteral__Group__045013 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__BooleanLiteral__Group__1__Impl_in_rule__BooleanLiteral__Group__145071 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__BooleanLiteral__Alternatives_1_in_rule__BooleanLiteral__Group__1__Impl45098 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RealLiteral__Group__0__Impl_in_rule__RealLiteral__Group__045132 = new BitSet(new long[]{0x000000000C000030L});
-    public static final BitSet FOLLOW_rule__RealLiteral__Group__1_in_rule__RealLiteral__Group__045135 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RealLiteral__Group__1__Impl_in_rule__RealLiteral__Group__145193 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RealLiteral__ValueAssignment_1_in_rule__RealLiteral__Group__1__Impl45220 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IntLiteral__Group__0__Impl_in_rule__IntLiteral__Group__045254 = new BitSet(new long[]{0x000000000C000030L});
-    public static final BitSet FOLLOW_rule__IntLiteral__Group__1_in_rule__IntLiteral__Group__045257 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IntLiteral__Group__1__Impl_in_rule__IntLiteral__Group__145315 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IntLiteral__ValueAssignment_1_in_rule__IntLiteral__Group__1__Impl45342 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StringLiteral__Group__0__Impl_in_rule__StringLiteral__Group__045376 = new BitSet(new long[]{0x000000000E0000B0L,0x0000000000000000L,0x0000000000000008L});
-    public static final BitSet FOLLOW_rule__StringLiteral__Group__1_in_rule__StringLiteral__Group__045379 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StringLiteral__Group__1__Impl_in_rule__StringLiteral__Group__145437 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StringLiteral__ValueAssignment_1_in_rule__StringLiteral__Group__1__Impl45464 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Integer__Group_0__0__Impl_in_rule__Integer__Group_0__045498 = new BitSet(new long[]{0x000000000C000010L});
-    public static final BitSet FOLLOW_rule__Integer__Group_0__1_in_rule__Integer__Group_0__045501 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Integer__Alternatives_0_0_in_rule__Integer__Group_0__0__Impl45528 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Integer__Group_0__1__Impl_in_rule__Integer__Group_0__145559 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__Integer__Group_0__1__Impl45586 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Decimal__Group__0__Impl_in_rule__Decimal__Group__045619 = new BitSet(new long[]{0x000000000C000010L});
-    public static final BitSet FOLLOW_rule__Decimal__Group__1_in_rule__Decimal__Group__045622 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Decimal__Alternatives_0_in_rule__Decimal__Group__0__Impl45649 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Decimal__Group__1__Impl_in_rule__Decimal__Group__145680 = new BitSet(new long[]{0x0000000000000000L,0x0000000000400000L});
-    public static final BitSet FOLLOW_rule__Decimal__Group__2_in_rule__Decimal__Group__145683 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__Decimal__Group__1__Impl45710 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Decimal__Group__2__Impl_in_rule__Decimal__Group__245739 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__Decimal__Group__3_in_rule__Decimal__Group__245742 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_86_in_rule__Decimal__Group__2__Impl45770 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Decimal__Group__3__Impl_in_rule__Decimal__Group__345801 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__Decimal__Group__3__Impl45828 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__0__Impl_in_rule__DecimalExp__Group__045865 = new BitSet(new long[]{0x000000000C000030L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__1_in_rule__DecimalExp__Group__045868 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Alternatives_0_in_rule__DecimalExp__Group__0__Impl45895 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__1__Impl_in_rule__DecimalExp__Group__145926 = new BitSet(new long[]{0x0000000000000000L,0x0000000000400000L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__2_in_rule__DecimalExp__Group__145929 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__DecimalExp__Group__1__Impl45956 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__2__Impl_in_rule__DecimalExp__Group__245985 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__3_in_rule__DecimalExp__Group__245988 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_86_in_rule__DecimalExp__Group__2__Impl46016 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__3__Impl_in_rule__DecimalExp__Group__346047 = new BitSet(new long[]{0x0000000030000000L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__4_in_rule__DecimalExp__Group__346050 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__DecimalExp__Group__3__Impl46077 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__4__Impl_in_rule__DecimalExp__Group__446106 = new BitSet(new long[]{0x000000000C000010L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__5_in_rule__DecimalExp__Group__446109 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Alternatives_4_in_rule__DecimalExp__Group__4__Impl46136 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__5__Impl_in_rule__DecimalExp__Group__546166 = new BitSet(new long[]{0x000000000C000010L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__6_in_rule__DecimalExp__Group__546169 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Alternatives_5_in_rule__DecimalExp__Group__5__Impl46196 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DecimalExp__Group__6__Impl_in_rule__DecimalExp__Group__646227 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__DecimalExp__Group__6__Impl46254 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FQN__Group__0__Impl_in_rule__FQN__Group__046297 = new BitSet(new long[]{0x0000000000000000L,0x0000000000400000L});
-    public static final BitSet FOLLOW_rule__FQN__Group__1_in_rule__FQN__Group__046300 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__FQN__Group__0__Impl46327 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FQN__Group__1__Impl_in_rule__FQN__Group__146356 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FQN__Group_1__0_in_rule__FQN__Group__1__Impl46383 = new BitSet(new long[]{0x0000000000000002L,0x0000000000400000L});
-    public static final BitSet FOLLOW_rule__FQN__Group_1__0__Impl_in_rule__FQN__Group_1__046418 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__FQN__Group_1__1_in_rule__FQN__Group_1__046421 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_86_in_rule__FQN__Group_1__0__Impl46449 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FQN__Group_1__1__Impl_in_rule__FQN__Group_1__146480 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__FQN__Group_1__1__Impl46507 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__UnorderedGroup_0__0_in_rule__ActorClass__UnorderedGroup_046541 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__AbstractAssignment_0_0_in_rule__ActorClass__UnorderedGroup_0__Impl46628 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__CommTypeAssignment_0_1_in_rule__ActorClass__UnorderedGroup_0__Impl46719 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__UnorderedGroup_0__Impl_in_rule__ActorClass__UnorderedGroup_0__046778 = new BitSet(new long[]{0x00000009C0000002L,0x0000000000000000L,0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__UnorderedGroup_0__1_in_rule__ActorClass__UnorderedGroup_0__046781 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActorClass__UnorderedGroup_0__Impl_in_rule__ActorClass__UnorderedGroup_0__146806 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_rule__RoomModel__NameAssignment_146838 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_rule__RoomModel__DocuAssignment_246869 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleImport_in_rule__RoomModel__ImportsAssignment_446900 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rulePrimitiveType_in_rule__RoomModel__PrimitiveTypesAssignment_5_046931 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleEnumerationType_in_rule__RoomModel__EnumerationTypesAssignment_5_146962 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExternalType_in_rule__RoomModel__ExternalTypesAssignment_5_246993 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDataClass_in_rule__RoomModel__DataClassesAssignment_5_347024 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGeneralProtocolClass_in_rule__RoomModel__ProtocolClassesAssignment_5_447055 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleActorClass_in_rule__RoomModel__ActorClassesAssignment_5_547086 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSubSystemClass_in_rule__RoomModel__SubSystemClassesAssignment_5_647117 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLogicalSystem_in_rule__RoomModel__SystemsAssignment_5_747148 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAnnotationType_in_rule__RoomModel__AnnotationTypesAssignment_5_847179 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__VarDecl__NameAssignment_047210 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRefableType_in_rule__VarDecl__RefTypeAssignment_247241 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_rule__RefableType__TypeAssignment_047276 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_90_in_rule__RefableType__RefAssignment_147316 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__PrimitiveType__NameAssignment_147355 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLiteralType_in_rule__PrimitiveType__TypeAssignment_347386 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__PrimitiveType__TargetNameAssignment_547417 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_rule__PrimitiveType__CastNameAssignment_6_147448 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__PrimitiveType__DefaultValueLiteralAssignment_847479 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_rule__PrimitiveType__DocuAssignment_947510 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__EnumerationType__NameAssignment_147541 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_rule__EnumerationType__DocuAssignment_247572 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_rule__EnumerationType__PrimitiveTypeAssignment_3_147607 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleEnumLiteral_in_rule__EnumerationType__LiteralsAssignment_5_047642 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleEnumLiteral_in_rule__EnumerationType__LiteralsAssignment_5_1_147673 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__EnumLiteral__NameAssignment_047704 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntLiteral_in_rule__EnumLiteral__LiteralAssignment_1_147735 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__ExternalType__NameAssignment_147766 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__ExternalType__TargetNameAssignment_347797 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__ExternalType__DefaultValueLiteralAssignment_4_147828 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_rule__ExternalType__DocuAssignment_547859 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__DataClass__NameAssignment_147890 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_rule__DataClass__DocuAssignment_247921 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_rule__DataClass__BaseAssignment_3_147956 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAnnotation_in_rule__DataClass__AnnotationsAssignment_547991 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_rule__DataClass__UserCode1Assignment_6_148022 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_rule__DataClass__UserCode2Assignment_7_148053 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_rule__DataClass__UserCode3Assignment_8_148084 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStandardOperation_in_rule__DataClass__OperationsAssignment_9_048115 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleClassStructor_in_rule__DataClass__StructorsAssignment_9_148146 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAttribute_in_rule__DataClass__AttributesAssignment_9_248177 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__Attribute__NameAssignment_148208 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__Attribute__SizeAssignment_2_148239 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRefableType_in_rule__Attribute__TypeAssignment_448270 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__Attribute__DefaultValueLiteralAssignment_5_148301 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_rule__Attribute__DocuAssignment_648332 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_127_in_rule__StandardOperation__OverrideAssignment_048368 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__StandardOperation__NameAssignment_248407 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleVarDecl_in_rule__StandardOperation__ArgumentsAssignment_4_048438 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleVarDecl_in_rule__StandardOperation__ArgumentsAssignment_4_1_148469 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRefableType_in_rule__StandardOperation__ReturnTypeAssignment_6_1_148500 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_rule__StandardOperation__DocuAssignment_748531 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_rule__StandardOperation__DetailCodeAssignment_848562 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__PortOperation__NameAssignment_148593 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleVarDecl_in_rule__PortOperation__ArgumentsAssignment_3_048624 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleVarDecl_in_rule__PortOperation__ArgumentsAssignment_3_1_148655 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRefableType_in_rule__PortOperation__ReturnTypeAssignment_5_0_1_148686 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__PortOperation__SendsMsgAssignment_5_1_148721 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_rule__PortOperation__DocuAssignment_648756 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_rule__PortOperation__DetailCodeAssignment_748787 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ClassStructor__NameAlternatives_0_0_in_rule__ClassStructor__NameAssignment_048818 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_rule__ClassStructor__DetailCodeAssignment_148851 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCommunicationType_in_rule__ProtocolClass__CommTypeAssignment_048882 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__ProtocolClass__NameAssignment_248913 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_rule__ProtocolClass__DocuAssignment_348944 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_rule__ProtocolClass__BaseAssignment_4_148979 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAnnotation_in_rule__ProtocolClass__AnnotationsAssignment_649014 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_rule__ProtocolClass__UserCode1Assignment_7_149045 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_rule__ProtocolClass__UserCode2Assignment_8_149076 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_rule__ProtocolClass__UserCode3Assignment_9_149107 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMessage_in_rule__ProtocolClass__IncomingMessagesAssignment_10_249138 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMessage_in_rule__ProtocolClass__OutgoingMessagesAssignment_11_249169 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rulePortClass_in_rule__ProtocolClass__RegularAssignment_12_249200 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rulePortClass_in_rule__ProtocolClass__ConjugatedAssignment_13_249231 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleProtocolSemantics_in_rule__ProtocolClass__SemanticsAssignment_1449262 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__CompoundProtocolClass__NameAssignment_149293 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_rule__CompoundProtocolClass__DocuAssignment_249324 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAnnotation_in_rule__CompoundProtocolClass__AnnotationsAssignment_449355 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSubProtocol_in_rule__CompoundProtocolClass__SubProtocolsAssignment_549386 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__SubProtocol__NameAssignment_149417 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_rule__SubProtocol__ProtocolAssignment_349452 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_128_in_rule__Message__PrivAssignment_049492 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__Message__NameAssignment_249531 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleVarDecl_in_rule__Message__DataAssignment_449562 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_rule__Message__DocuAssignment_649593 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_rule__PortClass__UserCodeAssignment_2_149624 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMessageHandler_in_rule__PortClass__MsgHandlersAssignment_3_049655 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rulePortOperation_in_rule__PortClass__OperationsAssignment_3_149686 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAttribute_in_rule__PortClass__AttributesAssignment_3_249717 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__InMessageHandler__MsgAssignment_249752 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_rule__InMessageHandler__DetailCodeAssignment_349787 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__OutMessageHandler__MsgAssignment_249822 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_rule__OutMessageHandler__DetailCodeAssignment_349857 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_129_in_rule__ActorClass__AbstractAssignment_0_049893 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleComponentCommunicationType_in_rule__ActorClass__CommTypeAssignment_0_149932 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__ActorClass__NameAssignment_249963 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_rule__ActorClass__DocuAssignment_349994 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_rule__ActorClass__BaseAssignment_4_150029 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAnnotation_in_rule__ActorClass__AnnotationsAssignment_650064 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSPP_in_rule__ActorClass__ServiceProvisionPointsAssignment_7_2_050095 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rulePort_in_rule__ActorClass__InterfacePortsAssignment_7_2_150126 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_rule__ActorClass__StructureDocuAssignment_8_150157 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_rule__ActorClass__UserCode1Assignment_8_3_150188 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_rule__ActorClass__UserCode2Assignment_8_4_150219 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_rule__ActorClass__UserCode3Assignment_8_5_150250 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLayerConnection_in_rule__ActorClass__ConnectionsAssignment_8_6_050281 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleBinding_in_rule__ActorClass__BindingsAssignment_8_6_150312 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleServiceImplementation_in_rule__ActorClass__ServiceImplementationsAssignment_8_6_250343 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAttribute_in_rule__ActorClass__AttributesAssignment_8_6_350374 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleActorRef_in_rule__ActorClass__ActorRefsAssignment_8_6_450405 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSAP_in_rule__ActorClass__ServiceAccessPointsAssignment_8_6_550436 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rulePort_in_rule__ActorClass__InternalPortsAssignment_8_6_650467 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExternalPort_in_rule__ActorClass__ExternalPortsAssignment_8_6_750498 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_rule__ActorClass__BehaviorDocuAssignment_9_150529 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAnnotation_in_rule__ActorClass__BehaviorAnnotationsAssignment_9_350560 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStandardOperation_in_rule__ActorClass__OperationsAssignment_9_4_050591 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleClassStructor_in_rule__ActorClass__StructorsAssignment_9_4_150622 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStateMachine_in_rule__ActorClass__StateMachineAssignment_9_550653 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_67_in_rule__Port__ConjugatedAssignment_050689 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__Port__NameAssignment_250728 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMULTIPLICITY_in_rule__Port__MultiplicityAssignment_350759 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_rule__Port__ProtocolAssignment_550794 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_rule__Port__DocuAssignment_650829 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__ExternalPort__InterfacePortAssignment_250864 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__SAP__NameAssignment_150899 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_rule__SAP__ProtocolAssignment_350934 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__SPP__NameAssignment_150969 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_rule__SPP__ProtocolAssignment_351004 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__ServiceImplementation__SppAssignment_251043 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__LogicalSystem__NameAssignment_151078 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_rule__LogicalSystem__DocuAssignment_251109 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAnnotation_in_rule__LogicalSystem__AnnotationsAssignment_451140 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLayerConnection_in_rule__LogicalSystem__ConnectionsAssignment_5_051171 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleBinding_in_rule__LogicalSystem__BindingsAssignment_5_151202 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSubSystemRef_in_rule__LogicalSystem__SubSystemsAssignment_5_251233 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__SubSystemRef__NameAssignment_151264 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_rule__SubSystemRef__TypeAssignment_351299 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_rule__SubSystemRef__DocuAssignment_451334 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__SubSystemClass__NameAssignment_151365 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_rule__SubSystemClass__DocuAssignment_251396 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAnnotation_in_rule__SubSystemClass__AnnotationsAssignment_451427 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_rule__SubSystemClass__UserCode1Assignment_5_151458 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_rule__SubSystemClass__UserCode2Assignment_6_151489 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_rule__SubSystemClass__UserCode3Assignment_7_151520 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleActorInstanceMapping_in_rule__SubSystemClass__ActorInstanceMappingsAssignment_8_051551 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLogicalThread_in_rule__SubSystemClass__ThreadsAssignment_8_151582 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLayerConnection_in_rule__SubSystemClass__ConnectionsAssignment_8_251613 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleBinding_in_rule__SubSystemClass__BindingsAssignment_8_351644 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleActorRef_in_rule__SubSystemClass__ActorRefsAssignment_8_451675 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSPP_in_rule__SubSystemClass__ServiceProvisionPointsAssignment_8_551706 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rulePort_in_rule__SubSystemClass__RelayPortsAssignment_8_651737 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__LogicalThread__NameAssignment_151768 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRefPath_in_rule__ActorInstanceMapping__PathAssignment_151799 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__ActorInstanceMapping__ThreadAssignment_351834 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleActorInstanceMapping_in_rule__ActorInstanceMapping__ActorInstanceMappingsAssignment_4_151869 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRefSegment_in_rule__RefPath__RefsAssignment_051900 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRefSegment_in_rule__RefPath__RefsAssignment_1_151931 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__RefSegment__RefAssignment_051962 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__RefSegment__IdxAssignment_1_151993 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleBindingEndPoint_in_rule__Binding__Endpoint1Assignment_152024 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleBindingEndPoint_in_rule__Binding__Endpoint2Assignment_352055 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__BindingEndPoint__ActorRefAssignment_0_052090 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__BindingEndPoint__PortAssignment_152129 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__BindingEndPoint__SubAssignment_2_152168 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSAPoint_in_rule__LayerConnection__FromAssignment_152203 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSPPoint_in_rule__LayerConnection__ToAssignment_352234 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__RefSAPoint__RefAssignment_152269 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__RelaySAPoint__RelayAssignment_152308 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__SPPoint__RefAssignment_052347 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__SPPoint__ServiceAssignment_252386 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleReferenceType_in_rule__ActorRef__RefTypeAssignment_052421 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__ActorRef__NameAssignment_252452 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMULTIPLICITY_in_rule__ActorRef__MultiplicityAssignment_352483 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_rule__ActorRef__TypeAssignment_552518 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_rule__ActorRef__DocuAssignment_652553 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleState_in_rule__StateGraph__StatesAssignment_2_052585 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTrPoint_in_rule__StateGraph__TrPointsAssignment_2_152616 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChoicePoint_in_rule__StateGraph__ChPointsAssignment_2_252647 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTransition_in_rule__StateGraph__TransitionsAssignment_2_352678 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRefinedTransition_in_rule__StateGraph__RefinedTransitionsAssignment_2_452709 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleState_in_rule__StateMachine__StatesAssignment_3_052740 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTrPoint_in_rule__StateMachine__TrPointsAssignment_3_152771 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChoicePoint_in_rule__StateMachine__ChPointsAssignment_3_252802 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTransition_in_rule__StateMachine__TransitionsAssignment_3_352833 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRefinedTransition_in_rule__StateMachine__RefinedTransitionsAssignment_3_452864 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__SimpleState__NameAssignment_152895 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_rule__SimpleState__DocuAssignment_252926 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_rule__SimpleState__EntryCodeAssignment_3_1_152957 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_rule__SimpleState__ExitCodeAssignment_3_2_152988 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_rule__SimpleState__DoCodeAssignment_3_3_153019 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStateGraph_in_rule__SimpleState__SubgraphAssignment_3_4_153050 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_rule__RefinedState__TargetAssignment_153085 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_rule__RefinedState__DocuAssignment_253120 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_rule__RefinedState__EntryCodeAssignment_4_153151 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_rule__RefinedState__ExitCodeAssignment_5_153182 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_rule__RefinedState__DoCodeAssignment_6_153213 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStateGraph_in_rule__RefinedState__SubgraphAssignment_7_153244 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_rule__DetailCode__UsedAssignment_153280 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__DetailCode__LinesAssignment_253319 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_130_in_rule__TransitionPoint__HandlerAssignment_053355 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__TransitionPoint__NameAssignment_253394 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__EntryPoint__NameAssignment_153425 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__ExitPoint__NameAssignment_153456 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__ChoicePoint__NameAssignment_153487 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_rule__ChoicePoint__DocuAssignment_253518 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__InitialTransition__NameAssignment_153549 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTransitionTerminal_in_rule__InitialTransition__ToAssignment_553580 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_rule__InitialTransition__DocuAssignment_653611 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_rule__InitialTransition__ActionAssignment_7_1_153642 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__ContinuationTransition__NameAssignment_153673 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTransitionTerminal_in_rule__ContinuationTransition__FromAssignment_353704 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTransitionTerminal_in_rule__ContinuationTransition__ToAssignment_553735 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_rule__ContinuationTransition__DocuAssignment_653766 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_rule__ContinuationTransition__ActionAssignment_7_1_153797 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__TriggeredTransition__NameAssignment_153828 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTransitionTerminal_in_rule__TriggeredTransition__FromAssignment_353859 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTransitionTerminal_in_rule__TriggeredTransition__ToAssignment_553890 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_rule__TriggeredTransition__DocuAssignment_653921 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTrigger_in_rule__TriggeredTransition__TriggersAssignment_1053952 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTrigger_in_rule__TriggeredTransition__TriggersAssignment_11_153983 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_rule__TriggeredTransition__ActionAssignment_13_154014 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__GuardedTransition__NameAssignment_154045 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTransitionTerminal_in_rule__GuardedTransition__FromAssignment_354076 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTransitionTerminal_in_rule__GuardedTransition__ToAssignment_554107 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_rule__GuardedTransition__DocuAssignment_654138 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_rule__GuardedTransition__GuardAssignment_954169 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_rule__GuardedTransition__ActionAssignment_10_154200 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__CPBranchTransition__NameAssignment_154231 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTransitionTerminal_in_rule__CPBranchTransition__FromAssignment_354262 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTransitionTerminal_in_rule__CPBranchTransition__ToAssignment_554293 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_rule__CPBranchTransition__DocuAssignment_654324 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_rule__CPBranchTransition__ConditionAssignment_954355 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_rule__CPBranchTransition__ActionAssignment_10_154386 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_rule__RefinedTransition__TargetAssignment_154421 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_rule__RefinedTransition__DocuAssignment_254456 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_rule__RefinedTransition__ActionAssignment_554487 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__StateTerminal__StateAssignment54522 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__TrPointTerminal__TrPointAssignment_154561 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__SubStateTrPointTerminal__TrPointAssignment_054600 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__SubStateTrPointTerminal__StateAssignment_254639 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__ChoicepointTerminal__CpAssignment_154678 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMessageFromIf_in_rule__Trigger__MsgFromIfPairsAssignment_154713 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMessageFromIf_in_rule__Trigger__MsgFromIfPairsAssignment_2_154744 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGuard_in_rule__Trigger__GuardAssignment_354775 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__MessageFromIf__MessageAssignment_054810 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__MessageFromIf__FromAssignment_254849 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_rule__Guard__GuardAssignment_154884 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSemanticsRule_in_rule__ProtocolSemantics__RulesAssignment_354915 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__InSemanticsRule__MsgAssignment_254950 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSemanticsRule_in_rule__InSemanticsRule__FollowUpsAssignment_3_1_054985 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSemanticsRule_in_rule__InSemanticsRule__FollowUpsAssignment_3_1_1_155016 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSemanticsRule_in_rule__InSemanticsRule__FollowUpsAssignment_3_1_1_2_155047 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__OutSemanticsRule__MsgAssignment_255082 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSemanticsRule_in_rule__OutSemanticsRule__FollowUpsAssignment_3_1_055117 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSemanticsRule_in_rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_155148 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSemanticsRule_in_rule__OutSemanticsRule__FollowUpsAssignment_3_1_1_2_155179 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_rule__Annotation__TypeAssignment_155214 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleKeyValue_in_rule__Annotation__AttributesAssignment_2_155249 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleKeyValue_in_rule__Annotation__AttributesAssignment_2_2_155280 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__KeyValue__KeyAssignment_055311 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLiteral_in_rule__KeyValue__ValueAssignment_255342 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__AnnotationType__NameAssignment_155373 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_rule__AnnotationType__DocuAssignment_255404 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAnnotationTargetType_in_rule__AnnotationType__TargetsAssignment_6_055435 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAnnotationTargetType_in_rule__AnnotationType__TargetsAssignment_6_1_155466 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAnnotationTargetType_in_rule__AnnotationType__TargetsAssignment_6_1_2_155497 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAnnotationAttribute_in_rule__AnnotationType__AttributesAssignment_755528 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_34_in_rule__SimpleAnnotationAttribute__OptionalAssignment_0_055564 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__SimpleAnnotationAttribute__NameAssignment_255603 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLiteralType_in_rule__SimpleAnnotationAttribute__TypeAssignment_455634 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_34_in_rule__EnumAnnotationAttribute__OptionalAssignment_0_055670 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__EnumAnnotationAttribute__NameAssignment_255709 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__EnumAnnotationAttribute__ValuesAssignment_555740 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__EnumAnnotationAttribute__ValuesAssignment_6_155771 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleImportedFQN_in_rule__Import__ImportedNamespaceAssignment_1_0_055802 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__Import__ImportURIAssignment_255833 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__Documentation__LinesAssignment_255864 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_131_in_rule__BooleanLiteral__IsTrueAssignment_1_155902 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleReal_in_rule__RealLiteral__ValueAssignment_155941 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInteger_in_rule__IntLiteral__ValueAssignment_155972 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__StringLiteral__ValueAssignment_156003 = 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[]{0x0000000000000040L});
+    public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x0800020000000000L});
+    public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x00221409C0790000L,0x1200000000000000L,0x0000000000000002L});
+    public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x0000000000000002L,0x1000000000000000L});
+    public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x00221009C0790002L,0x0200000000000000L,0x0000000000000002L});
+    public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x0000080000000000L});
+    public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x0000000000000000L,0x0000000004000000L});
+    public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x000000F000000000L});
+    public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0000200000000000L});
+    public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0000000000000080L});
+    public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000C00000000000L});
+    public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x0800000000000000L});
+    public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0001000000000000L});
+    public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x0804020000000000L});
+    public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0000040000000040L});
+    public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0008000000000000L});
+    public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0008000000000002L});
+    public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x0010000000000000L});
+    public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x000000000C000030L});
+    public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0800400000000000L});
+    public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x0840020000000000L});
+    public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x2780040000006000L,0x8100000000000000L});
+    public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x0000000000000002L,0x0100000000000000L});
+    public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x2400000000006002L,0x8000000000000000L});
+    public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x0000020000000000L});
+    public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x0800080000000000L});
+    public static final BitSet FOLLOW_29 = new BitSet(new long[]{0x0810000000000040L});
+    public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x1000000000000000L});
+    public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x2000000000000000L,0x8000000000000000L});
+    public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x0000800000000000L});
+    public static final BitSet FOLLOW_34 = new BitSet(new long[]{0x0001000000000040L});
+    public static final BitSet FOLLOW_35 = new BitSet(new long[]{0x08000A0000000000L});
+    public static final BitSet FOLLOW_36 = new BitSet(new long[]{0x0000000000001040L});
+    public static final BitSet FOLLOW_37 = new BitSet(new long[]{0x48000A0000000000L});
+    public static final BitSet FOLLOW_38 = new BitSet(new long[]{0x00000001C0080000L});
+    public static final BitSet FOLLOW_39 = new BitSet(new long[]{0x8380040000000000L,0x012000000000000BL});
+    public static final BitSet FOLLOW_40 = new BitSet(new long[]{0x0000040000000000L,0x0000000000000020L,0x0000000000000001L});
+    public static final BitSet FOLLOW_41 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000020L,0x0000000000000001L});
+    public static final BitSet FOLLOW_42 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000004L});
+    public static final BitSet FOLLOW_43 = new BitSet(new long[]{0x0000040000000000L,0x0100000000000010L});
+    public static final BitSet FOLLOW_44 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000010L});
+    public static final BitSet FOLLOW_45 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000020L,0x0000000000000001L});
+    public static final BitSet FOLLOW_46 = new BitSet(new long[]{0x2400040000006000L,0x80000000000000C0L});
+    public static final BitSet FOLLOW_47 = new BitSet(new long[]{0x2400000000006002L,0x8000000000000080L});
+    public static final BitSet FOLLOW_48 = new BitSet(new long[]{0x8000000000000000L});
+    public static final BitSet FOLLOW_49 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000001L});
+    public static final BitSet FOLLOW_50 = new BitSet(new long[]{0x0000000000020000L});
+    public static final BitSet FOLLOW_51 = new BitSet(new long[]{0x0000040000000000L,0x0100000000000700L});
+    public static final BitSet FOLLOW_52 = new BitSet(new long[]{0x0000040000000000L,0x0000000000004808L});
+    public static final BitSet FOLLOW_53 = new BitSet(new long[]{0x0000000000000002L,0x0000000000004808L});
+    public static final BitSet FOLLOW_54 = new BitSet(new long[]{0x2780040600006000L,0x800000001110F808L});
+    public static final BitSet FOLLOW_55 = new BitSet(new long[]{0x2400000600006002L,0x800000001110F808L});
+    public static final BitSet FOLLOW_56 = new BitSet(new long[]{0x2000040000006000L,0x8100000020000000L});
+    public static final BitSet FOLLOW_57 = new BitSet(new long[]{0x2000000000006002L,0x8000000000000000L});
+    public static final BitSet FOLLOW_58 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004808L});
+    public static final BitSet FOLLOW_59 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000800L});
+    public static final BitSet FOLLOW_60 = new BitSet(new long[]{0x0004000000000000L});
+    public static final BitSet FOLLOW_61 = new BitSet(new long[]{0x0000040000000000L,0x0100000001110000L});
+    public static final BitSet FOLLOW_62 = new BitSet(new long[]{0x0000000000000002L,0x0000000001110000L});
+    public static final BitSet FOLLOW_63 = new BitSet(new long[]{0x0380040600000000L,0x0100000011164808L});
+    public static final BitSet FOLLOW_64 = new BitSet(new long[]{0x0000000600000002L,0x0000000011164808L});
+    public static final BitSet FOLLOW_65 = new BitSet(new long[]{0x0000040000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_66 = new BitSet(new long[]{0x0000000000000002L,0x0000000000040000L});
+    public static final BitSet FOLLOW_67 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
+    public static final BitSet FOLLOW_68 = new BitSet(new long[]{0x0000000000000002L,0x0000000000080000L});
+    public static final BitSet FOLLOW_69 = new BitSet(new long[]{0x0000000000000000L,0x0000000000200000L});
+    public static final BitSet FOLLOW_70 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L});
+    public static final BitSet FOLLOW_71 = new BitSet(new long[]{0x0000000000000000L,0x0000000000400000L});
+    public static final BitSet FOLLOW_72 = new BitSet(new long[]{0x0000000000000000L,0x000000000C000000L});
+    public static final BitSet FOLLOW_73 = new BitSet(new long[]{0x0000000000000000L,0x0000000002000000L});
+    public static final BitSet FOLLOW_74 = new BitSet(new long[]{0x0000000600000000L,0x0000000010000000L});
+    public static final BitSet FOLLOW_75 = new BitSet(new long[]{0x0000000000008010L});
+    public static final BitSet FOLLOW_76 = new BitSet(new long[]{0x0000040000000000L,0x000081F840000000L,0x0000000000000004L});
+    public static final BitSet FOLLOW_77 = new BitSet(new long[]{0x0000000000000002L,0x000081F840000000L,0x0000000000000004L});
+    public static final BitSet FOLLOW_78 = new BitSet(new long[]{0x0000000000000000L,0x0000000020000000L});
+    public static final BitSet FOLLOW_79 = new BitSet(new long[]{0x0000040000000000L,0x0000000780000000L});
+    public static final BitSet FOLLOW_80 = new BitSet(new long[]{0x0000040000000080L});
+    public static final BitSet FOLLOW_81 = new BitSet(new long[]{0x0000000000000082L});
+    public static final BitSet FOLLOW_82 = new BitSet(new long[]{0x0000000000000000L,0x0000001000000000L,0x0000000000000004L});
+    public static final BitSet FOLLOW_83 = new BitSet(new long[]{0x0000080000000040L});
+    public static final BitSet FOLLOW_84 = new BitSet(new long[]{0x0000000000000000L,0x0000020000000000L});
+    public static final BitSet FOLLOW_85 = new BitSet(new long[]{0x0000000000000040L,0x0003000000000000L});
+    public static final BitSet FOLLOW_86 = new BitSet(new long[]{0x0000040000000000L,0x0000040000000000L});
+    public static final BitSet FOLLOW_87 = new BitSet(new long[]{0x0000000000000000L,0x0000080000000000L});
+    public static final BitSet FOLLOW_88 = new BitSet(new long[]{0x0000000000000000L,0x0004000000000000L});
+    public static final BitSet FOLLOW_89 = new BitSet(new long[]{0x0000040000000000L,0x0000100000000000L});
+    public static final BitSet FOLLOW_90 = new BitSet(new long[]{0x0000000000000002L,0x0000100000000000L});
+    public static final BitSet FOLLOW_91 = new BitSet(new long[]{0x0000000000000000L,0x0000200000000000L});
+    public static final BitSet FOLLOW_92 = new BitSet(new long[]{0x0000000000000000L,0x0000400000000000L});
+    public static final BitSet FOLLOW_93 = new BitSet(new long[]{0x0000000000000000L,0x0000040000000000L});
+    public static final BitSet FOLLOW_94 = new BitSet(new long[]{0x0000040000000000L});
+    public static final BitSet FOLLOW_95 = new BitSet(new long[]{0x0000000000000000L,0x0018200000000000L});
+    public static final BitSet FOLLOW_96 = new BitSet(new long[]{0x0000000000000002L,0x0010000000000000L});
+    public static final BitSet FOLLOW_97 = new BitSet(new long[]{0x0000000000000000L,0x0020000000000000L});
+    public static final BitSet FOLLOW_98 = new BitSet(new long[]{0x0000040000000000L,0x00C0000000000000L});
+    public static final BitSet FOLLOW_99 = new BitSet(new long[]{0x0000000000000002L,0x00C0000000000000L});
+    public static final BitSet FOLLOW_100 = new BitSet(new long[]{0x0000800000000000L,0x00C0000000000000L});
+    public static final BitSet FOLLOW_101 = new BitSet(new long[]{0x0000000000000000L,0x00C0000000000000L});
+    public static final BitSet FOLLOW_102 = new BitSet(new long[]{0x0009000000000000L});
+    public static final BitSet FOLLOW_103 = new BitSet(new long[]{0x000000000E0000B0L,0x0000000000000000L,0x0000000000000008L});
+    public static final BitSet FOLLOW_104 = new BitSet(new long[]{0x0000000000000000L,0x0400000000000000L});
+    public static final BitSet FOLLOW_105 = new BitSet(new long[]{0x00000200007F0000L});
+    public static final BitSet FOLLOW_106 = new BitSet(new long[]{0x0000040400800000L});
+    public static final BitSet FOLLOW_107 = new BitSet(new long[]{0x0000000400800002L});
+    public static final BitSet FOLLOW_108 = new BitSet(new long[]{0x00000000007F0000L});
+    public static final BitSet FOLLOW_109 = new BitSet(new long[]{0x0008040000000000L});
+    public static final BitSet FOLLOW_110 = new BitSet(new long[]{0x0000000000000000L,0x0800000000000000L});
+    public static final BitSet FOLLOW_111 = new BitSet(new long[]{0x0000000001000040L});
+    public static final BitSet FOLLOW_112 = new BitSet(new long[]{0x0000000000000000L,0x2000000000000000L});
+    public static final BitSet FOLLOW_113 = new BitSet(new long[]{0x0000000000000000L,0x4000000000000000L});
+    public static final BitSet FOLLOW_114 = new BitSet(new long[]{0x1000000000000080L});
+    public static final BitSet FOLLOW_115 = new BitSet(new long[]{0x0000000002000000L,0x0000000000000000L,0x0000000000000008L});
+    public static final BitSet FOLLOW_116 = new BitSet(new long[]{0x000000000C000010L});
+    public static final BitSet FOLLOW_117 = new BitSet(new long[]{0x0000000030000000L});
+    public static final BitSet FOLLOW_118 = new BitSet(new long[]{0x0000000000000002L,0x0000000000400000L});
+    public static final BitSet FOLLOW_119 = new BitSet(new long[]{0x00000009C0000002L,0x0000000000000000L,0x0000000000000002L});
 
 }
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/AbstractRoomRuntimeModule.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/AbstractRoomRuntimeModule.java
index bec8f16a2..34e0cd3b4 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/AbstractRoomRuntimeModule.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/AbstractRoomRuntimeModule.java
@@ -6,7 +6,6 @@ package org.eclipse.etrice.core;
 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.RoomRuntimeModule}
  */
- @SuppressWarnings("all")
-public abstract class AbstractRoomRuntimeModule extends DefaultRuntimeModule {
+@SuppressWarnings("all")
+public abstract class AbstractRoomRuntimeModule extends org.eclipse.xtext.service.DefaultRuntimeModule {
 
 	protected Properties properties = null;
 
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.genmodel b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.genmodel
index 575b3de23..14c979f2a 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.genmodel
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.genmodel
@@ -3,8 +3,8 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.etrice.core.room/src-gen" editDirectory="/org.eclipse.etrice.core.room.edit/src"
     editorDirectory="/org.eclipse.etrice.core.room.editor/src" modelPluginID="org.eclipse.etrice.core.room"
     forceOverwrite="true" modelName="Room" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.etrice.core.room.edit"
-    editorPluginID="org.eclipse.etrice.core.room.editor" runtimeVersion="2.10" usedGenPackages="platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.genmodel#//base platform:/resource/org.eclipse.etrice.core.fsm/model/generated/FSM.genmodel#//fSM">
+    complianceLevel="6.0" copyrightFields="false" editPluginID="org.eclipse.etrice.core.room.edit"
+    editorPluginID="org.eclipse.etrice.core.room.editor" runtimeVersion="2.12" usedGenPackages="platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.genmodel#//base platform:/resource/org.eclipse.etrice.core.fsm/model/generated/FSM.genmodel#//fSM">
   <genPackages prefix="Room" basePackage="org.eclipse.etrice.core" disposableProviderFactory="true"
       ecorePackage="Room.ecore#/">
     <genEnums typeSafeEnumCompatible="false" ecoreEnum="Room.ecore#//CommunicationType">
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.xtextbin b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.xtextbin
index 1242b1bd1..83837819e 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.xtextbin
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.xtextbin
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/RoomStandaloneSetupGenerated.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/RoomStandaloneSetupGenerated.java
index 0a97f1997..ebef7ba68 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/RoomStandaloneSetupGenerated.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/RoomStandaloneSetupGenerated.java
@@ -1,11 +1,11 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core;
 
 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 RoomStandaloneSetupGenerated implements ISetup {
 
+	@Override
 	public Injector createInjectorAndDoEMFRegistration() {
 		org.eclipse.etrice.core.fsm.FSMStandaloneSetup.doSetup();
 
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/RoomAntlrTokenFileProvider.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/RoomAntlrTokenFileProvider.java
index ae1af8d08..85e7e3a95 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/RoomAntlrTokenFileProvider.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/RoomAntlrTokenFileProvider.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.parser.antlr;
 
 import java.io.InputStream;
@@ -8,6 +8,7 @@ import org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider;
 
 public class RoomAntlrTokenFileProvider implements IAntlrTokenFileProvider {
 	
+	@Override
 	public InputStream getAntlrTokenFile() {
 		ClassLoader classLoader = getClass().getClassLoader();
     	return classLoader.getResourceAsStream("org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.tokens");
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/RoomParser.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/RoomParser.java
index 75806906e..1a92f1acd 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/RoomParser.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/RoomParser.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.parser.antlr;
 
 import com.google.inject.Inject;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g
index 17f323830..2c5729808 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 grammar InternalRoom;
 
 options {
@@ -95,7 +95,7 @@ ruleRoomModel returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"FQN");
+        		"org.eclipse.etrice.core.common.Base.FQN");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -113,7 +113,7 @@ ruleRoomModel returns [EObject current=null]
        			$current, 
        			"docu",
         		lv_docu_2_0, 
-        		"Documentation");
+        		"org.eclipse.etrice.core.common.Base.Documentation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -135,7 +135,7 @@ ruleRoomModel returns [EObject current=null]
        			$current, 
        			"imports",
         		lv_imports_4_0, 
-        		"Import");
+        		"org.eclipse.etrice.core.common.Base.Import");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -153,7 +153,7 @@ ruleRoomModel returns [EObject current=null]
        			$current, 
        			"primitiveTypes",
         		lv_primitiveTypes_5_0, 
-        		"PrimitiveType");
+        		"org.eclipse.etrice.core.Room.PrimitiveType");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -172,7 +172,7 @@ ruleRoomModel returns [EObject current=null]
        			$current, 
        			"enumerationTypes",
         		lv_enumerationTypes_6_0, 
-        		"EnumerationType");
+        		"org.eclipse.etrice.core.Room.EnumerationType");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -191,7 +191,7 @@ ruleRoomModel returns [EObject current=null]
        			$current, 
        			"externalTypes",
         		lv_externalTypes_7_0, 
-        		"ExternalType");
+        		"org.eclipse.etrice.core.Room.ExternalType");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -210,7 +210,7 @@ ruleRoomModel returns [EObject current=null]
        			$current, 
        			"dataClasses",
         		lv_dataClasses_8_0, 
-        		"DataClass");
+        		"org.eclipse.etrice.core.Room.DataClass");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -229,7 +229,7 @@ ruleRoomModel returns [EObject current=null]
        			$current, 
        			"protocolClasses",
         		lv_protocolClasses_9_0, 
-        		"GeneralProtocolClass");
+        		"org.eclipse.etrice.core.Room.GeneralProtocolClass");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -248,7 +248,7 @@ ruleRoomModel returns [EObject current=null]
        			$current, 
        			"actorClasses",
         		lv_actorClasses_10_0, 
-        		"ActorClass");
+        		"org.eclipse.etrice.core.Room.ActorClass");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -267,7 +267,7 @@ ruleRoomModel returns [EObject current=null]
        			$current, 
        			"subSystemClasses",
         		lv_subSystemClasses_11_0, 
-        		"SubSystemClass");
+        		"org.eclipse.etrice.core.Room.SubSystemClass");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -286,7 +286,7 @@ ruleRoomModel returns [EObject current=null]
        			$current, 
        			"systems",
         		lv_systems_12_0, 
-        		"LogicalSystem");
+        		"org.eclipse.etrice.core.Room.LogicalSystem");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -305,7 +305,7 @@ ruleRoomModel returns [EObject current=null]
        			$current, 
        			"annotationTypes",
         		lv_annotationTypes_13_0, 
-        		"AnnotationType");
+        		"org.eclipse.etrice.core.common.Base.AnnotationType");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -431,7 +431,7 @@ ruleVarDecl returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_0_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -452,7 +452,7 @@ ruleVarDecl returns [EObject current=null]
        			$current, 
        			"refType",
         		lv_refType_2_0, 
-        		"RefableType");
+        		"org.eclipse.etrice.core.Room.RefableType");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -637,7 +637,7 @@ rulePrimitiveType returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -658,7 +658,7 @@ rulePrimitiveType returns [EObject current=null]
        			$current, 
        			"type",
         		lv_type_3_0, 
-        		"LiteralType");
+        		"org.eclipse.etrice.core.common.Base.LiteralType");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -681,7 +681,7 @@ rulePrimitiveType returns [EObject current=null]
        			$current, 
        			"targetName",
         		lv_targetName_5_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -702,7 +702,7 @@ rulePrimitiveType returns [EObject current=null]
        			$current, 
        			"castName",
         		lv_castName_7_0, 
-        		"FQN");
+        		"org.eclipse.etrice.core.common.Base.FQN");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -729,7 +729,7 @@ rulePrimitiveType returns [EObject current=null]
        			$current, 
        			"defaultValueLiteral",
         		lv_defaultValueLiteral_10_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -746,7 +746,7 @@ rulePrimitiveType returns [EObject current=null]
        			$current, 
        			"docu",
         		lv_docu_11_0, 
-        		"Documentation");
+        		"org.eclipse.etrice.core.common.Base.Documentation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -790,7 +790,7 @@ ruleEnumerationType returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -807,7 +807,7 @@ ruleEnumerationType returns [EObject current=null]
        			$current, 
        			"docu",
         		lv_docu_2_0, 
-        		"Documentation");
+        		"org.eclipse.etrice.core.common.Base.Documentation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -848,7 +848,7 @@ ruleEnumerationType returns [EObject current=null]
        			$current, 
        			"literals",
         		lv_literals_6_0, 
-        		"EnumLiteral");
+        		"org.eclipse.etrice.core.Room.EnumLiteral");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -870,7 +870,7 @@ ruleEnumerationType returns [EObject current=null]
        			$current, 
        			"literals",
         		lv_literals_8_0, 
-        		"EnumLiteral");
+        		"org.eclipse.etrice.core.Room.EnumLiteral");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -914,7 +914,7 @@ ruleEnumLiteral returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_0_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -935,7 +935,7 @@ ruleEnumLiteral returns [EObject current=null]
        			$current, 
        			"literal",
         		lv_literal_2_0, 
-        		"IntLiteral");
+        		"org.eclipse.etrice.core.common.Base.IntLiteral");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -979,7 +979,7 @@ ruleExternalType returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -1001,7 +1001,7 @@ ruleExternalType returns [EObject current=null]
        			$current, 
        			"targetName",
         		lv_targetName_3_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -1023,7 +1023,7 @@ ruleExternalType returns [EObject current=null]
        			$current, 
        			"defaultValueLiteral",
         		lv_defaultValueLiteral_5_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -1040,7 +1040,7 @@ ruleExternalType returns [EObject current=null]
        			$current, 
        			"docu",
         		lv_docu_6_0, 
-        		"Documentation");
+        		"org.eclipse.etrice.core.common.Base.Documentation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1084,7 +1084,7 @@ ruleDataClass returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -1101,7 +1101,7 @@ ruleDataClass returns [EObject current=null]
        			$current, 
        			"docu",
         		lv_docu_2_0, 
-        		"Documentation");
+        		"org.eclipse.etrice.core.common.Base.Documentation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1142,7 +1142,7 @@ ruleDataClass returns [EObject current=null]
        			$current, 
        			"annotations",
         		lv_annotations_6_0, 
-        		"Annotation");
+        		"org.eclipse.etrice.core.common.Base.Annotation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1164,7 +1164,7 @@ ruleDataClass returns [EObject current=null]
        			$current, 
        			"userCode1",
         		lv_userCode1_8_0, 
-        		"DetailCode");
+        		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1186,7 +1186,7 @@ ruleDataClass returns [EObject current=null]
        			$current, 
        			"userCode2",
         		lv_userCode2_10_0, 
-        		"DetailCode");
+        		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1208,7 +1208,7 @@ ruleDataClass returns [EObject current=null]
        			$current, 
        			"userCode3",
         		lv_userCode3_12_0, 
-        		"DetailCode");
+        		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1226,7 +1226,7 @@ ruleDataClass returns [EObject current=null]
        			$current, 
        			"operations",
         		lv_operations_13_0, 
-        		"StandardOperation");
+        		"org.eclipse.etrice.core.Room.StandardOperation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1245,7 +1245,7 @@ ruleDataClass returns [EObject current=null]
        			$current, 
        			"structors",
         		lv_structors_14_0, 
-        		"ClassStructor");
+        		"org.eclipse.etrice.core.Room.ClassStructor");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1264,7 +1264,7 @@ ruleDataClass returns [EObject current=null]
        			$current, 
        			"attributes",
         		lv_attributes_15_0, 
-        		"Attribute");
+        		"org.eclipse.etrice.core.Room.Attribute");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1312,7 +1312,7 @@ ruleAttribute returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -1334,7 +1334,7 @@ ruleAttribute returns [EObject current=null]
        			$current, 
        			"size",
         		lv_size_3_0, 
-        		"INT");
+        		"org.eclipse.xtext.common.Terminals.INT");
 	    }
 
 )
@@ -1359,7 +1359,7 @@ ruleAttribute returns [EObject current=null]
        			$current, 
        			"type",
         		lv_type_6_0, 
-        		"RefableType");
+        		"org.eclipse.etrice.core.Room.RefableType");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1382,7 +1382,7 @@ ruleAttribute returns [EObject current=null]
        			$current, 
        			"defaultValueLiteral",
         		lv_defaultValueLiteral_8_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -1399,7 +1399,7 @@ ruleAttribute returns [EObject current=null]
        			$current, 
        			"docu",
         		lv_docu_9_0, 
-        		"Documentation");
+        		"org.eclipse.etrice.core.common.Base.Documentation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1460,7 +1460,7 @@ ruleStandardOperation returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_2_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -1481,7 +1481,7 @@ ruleStandardOperation returns [EObject current=null]
        			$current, 
        			"arguments",
         		lv_arguments_4_0, 
-        		"VarDecl");
+        		"org.eclipse.etrice.core.Room.VarDecl");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1503,7 +1503,7 @@ ruleStandardOperation returns [EObject current=null]
        			$current, 
        			"arguments",
         		lv_arguments_6_0, 
-        		"VarDecl");
+        		"org.eclipse.etrice.core.Room.VarDecl");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1534,7 +1534,7 @@ ruleStandardOperation returns [EObject current=null]
        			$current, 
        			"returnType",
         		lv_returnType_10_0, 
-        		"RefableType");
+        		"org.eclipse.etrice.core.Room.RefableType");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1552,7 +1552,7 @@ ruleStandardOperation returns [EObject current=null]
        			$current, 
        			"docu",
         		lv_docu_11_0, 
-        		"Documentation");
+        		"org.eclipse.etrice.core.common.Base.Documentation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1570,7 +1570,7 @@ ruleStandardOperation returns [EObject current=null]
        			$current, 
        			"detailCode",
         		lv_detailCode_12_0, 
-        		"DetailCode");
+        		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1614,7 +1614,7 @@ rulePortOperation returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -1635,7 +1635,7 @@ rulePortOperation returns [EObject current=null]
        			$current, 
        			"arguments",
         		lv_arguments_3_0, 
-        		"VarDecl");
+        		"org.eclipse.etrice.core.Room.VarDecl");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1657,7 +1657,7 @@ rulePortOperation returns [EObject current=null]
        			$current, 
        			"arguments",
         		lv_arguments_5_0, 
-        		"VarDecl");
+        		"org.eclipse.etrice.core.Room.VarDecl");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1688,7 +1688,7 @@ rulePortOperation returns [EObject current=null]
        			$current, 
        			"returnType",
         		lv_returnType_9_0, 
-        		"RefableType");
+        		"org.eclipse.etrice.core.Room.RefableType");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1724,7 +1724,7 @@ rulePortOperation returns [EObject current=null]
        			$current, 
        			"docu",
         		lv_docu_12_0, 
-        		"Documentation");
+        		"org.eclipse.etrice.core.common.Base.Documentation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1742,7 +1742,7 @@ rulePortOperation returns [EObject current=null]
        			$current, 
        			"detailCode",
         		lv_detailCode_13_0, 
-        		"DetailCode");
+        		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1811,7 +1811,7 @@ ruleClassStructor returns [EObject current=null]
        			$current, 
        			"detailCode",
         		lv_detailCode_1_0, 
-        		"DetailCode");
+        		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1890,7 +1890,7 @@ ruleProtocolClass returns [EObject current=null]
        			$current, 
        			"commType",
         		lv_commType_0_0, 
-        		"CommunicationType");
+        		"org.eclipse.etrice.core.Room.CommunicationType");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1913,7 +1913,7 @@ ruleProtocolClass returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_2_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -1930,7 +1930,7 @@ ruleProtocolClass returns [EObject current=null]
        			$current, 
        			"docu",
         		lv_docu_3_0, 
-        		"Documentation");
+        		"org.eclipse.etrice.core.common.Base.Documentation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1971,7 +1971,7 @@ ruleProtocolClass returns [EObject current=null]
        			$current, 
        			"annotations",
         		lv_annotations_7_0, 
-        		"Annotation");
+        		"org.eclipse.etrice.core.common.Base.Annotation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1993,7 +1993,7 @@ ruleProtocolClass returns [EObject current=null]
        			$current, 
        			"userCode1",
         		lv_userCode1_9_0, 
-        		"DetailCode");
+        		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2015,7 +2015,7 @@ ruleProtocolClass returns [EObject current=null]
        			$current, 
        			"userCode2",
         		lv_userCode2_11_0, 
-        		"DetailCode");
+        		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2037,7 +2037,7 @@ ruleProtocolClass returns [EObject current=null]
        			$current, 
        			"userCode3",
         		lv_userCode3_13_0, 
-        		"DetailCode");
+        		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2063,7 +2063,7 @@ ruleProtocolClass returns [EObject current=null]
        			$current, 
        			"incomingMessages",
         		lv_incomingMessages_16_0, 
-        		"Message");
+        		"org.eclipse.etrice.core.Room.Message");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2093,7 +2093,7 @@ ruleProtocolClass returns [EObject current=null]
        			$current, 
        			"outgoingMessages",
         		lv_outgoingMessages_20_0, 
-        		"Message");
+        		"org.eclipse.etrice.core.Room.Message");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2123,7 +2123,7 @@ ruleProtocolClass returns [EObject current=null]
        			$current, 
        			"regular",
         		lv_regular_24_0, 
-        		"PortClass");
+        		"org.eclipse.etrice.core.Room.PortClass");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2149,7 +2149,7 @@ ruleProtocolClass returns [EObject current=null]
        			$current, 
        			"conjugated",
         		lv_conjugated_27_0, 
-        		"PortClass");
+        		"org.eclipse.etrice.core.Room.PortClass");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2167,7 +2167,7 @@ ruleProtocolClass returns [EObject current=null]
        			$current, 
        			"semantics",
         		lv_semantics_28_0, 
-        		"ProtocolSemantics");
+        		"org.eclipse.etrice.core.fsm.FSM.ProtocolSemantics");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2215,7 +2215,7 @@ ruleCompoundProtocolClass returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -2232,7 +2232,7 @@ ruleCompoundProtocolClass returns [EObject current=null]
        			$current, 
        			"docu",
         		lv_docu_2_0, 
-        		"Documentation");
+        		"org.eclipse.etrice.core.common.Base.Documentation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2254,7 +2254,7 @@ ruleCompoundProtocolClass returns [EObject current=null]
        			$current, 
        			"annotations",
         		lv_annotations_4_0, 
-        		"Annotation");
+        		"org.eclipse.etrice.core.common.Base.Annotation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2272,7 +2272,7 @@ ruleCompoundProtocolClass returns [EObject current=null]
        			$current, 
        			"subProtocols",
         		lv_subProtocols_5_0, 
-        		"SubProtocol");
+        		"org.eclipse.etrice.core.Room.SubProtocol");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2320,7 +2320,7 @@ ruleSubProtocol returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -2397,7 +2397,7 @@ ruleMessage returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_2_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -2418,7 +2418,7 @@ ruleMessage returns [EObject current=null]
        			$current, 
        			"data",
         		lv_data_4_0, 
-        		"VarDecl");
+        		"org.eclipse.etrice.core.Room.VarDecl");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2440,7 +2440,7 @@ ruleMessage returns [EObject current=null]
        			$current, 
        			"docu",
         		lv_docu_6_0, 
-        		"Documentation");
+        		"org.eclipse.etrice.core.common.Base.Documentation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2493,7 +2493,7 @@ rulePortClass returns [EObject current=null]
        			$current, 
        			"userCode",
         		lv_userCode_3_0, 
-        		"DetailCode");
+        		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2511,7 +2511,7 @@ rulePortClass returns [EObject current=null]
        			$current, 
        			"msgHandlers",
         		lv_msgHandlers_4_0, 
-        		"MessageHandler");
+        		"org.eclipse.etrice.core.Room.MessageHandler");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2530,7 +2530,7 @@ rulePortClass returns [EObject current=null]
        			$current, 
        			"operations",
         		lv_operations_5_0, 
-        		"PortOperation");
+        		"org.eclipse.etrice.core.Room.PortOperation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2549,7 +2549,7 @@ rulePortClass returns [EObject current=null]
        			$current, 
        			"attributes",
         		lv_attributes_6_0, 
-        		"Attribute");
+        		"org.eclipse.etrice.core.Room.Attribute");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2653,7 +2653,7 @@ ruleInMessageHandler returns [EObject current=null]
        			$current, 
        			"detailCode",
         		lv_detailCode_3_0, 
-        		"DetailCode");
+        		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2713,7 +2713,7 @@ ruleOutMessageHandler returns [EObject current=null]
        			$current, 
        			"detailCode",
         		lv_detailCode_3_0, 
-        		"DetailCode");
+        		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2823,7 +2823,7 @@ ruleActorClass returns [EObject current=null]
        			$current, 
        			"commType",
         		lv_commType_2_0, 
-        		"ComponentCommunicationType");
+        		"org.eclipse.etrice.core.fsm.FSM.ComponentCommunicationType");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2860,7 +2860,7 @@ ruleActorClass returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_4_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -2877,7 +2877,7 @@ ruleActorClass returns [EObject current=null]
        			$current, 
        			"docu",
         		lv_docu_5_0, 
-        		"Documentation");
+        		"org.eclipse.etrice.core.common.Base.Documentation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2918,7 +2918,7 @@ ruleActorClass returns [EObject current=null]
        			$current, 
        			"annotations",
         		lv_annotations_9_0, 
-        		"Annotation");
+        		"org.eclipse.etrice.core.common.Base.Annotation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2944,7 +2944,7 @@ ruleActorClass returns [EObject current=null]
        			$current, 
        			"serviceProvisionPoints",
         		lv_serviceProvisionPoints_12_0, 
-        		"SPP");
+        		"org.eclipse.etrice.core.Room.SPP");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2963,7 +2963,7 @@ ruleActorClass returns [EObject current=null]
        			$current, 
        			"interfacePorts",
         		lv_interfacePorts_13_0, 
-        		"Port");
+        		"org.eclipse.etrice.core.Room.Port");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2989,7 +2989,7 @@ ruleActorClass returns [EObject current=null]
        			$current, 
        			"structureDocu",
         		lv_structureDocu_16_0, 
-        		"Documentation");
+        		"org.eclipse.etrice.core.common.Base.Documentation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3015,7 +3015,7 @@ ruleActorClass returns [EObject current=null]
        			$current, 
        			"userCode1",
         		lv_userCode1_19_0, 
-        		"DetailCode");
+        		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3037,7 +3037,7 @@ ruleActorClass returns [EObject current=null]
        			$current, 
        			"userCode2",
         		lv_userCode2_21_0, 
-        		"DetailCode");
+        		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3059,7 +3059,7 @@ ruleActorClass returns [EObject current=null]
        			$current, 
        			"userCode3",
         		lv_userCode3_23_0, 
-        		"DetailCode");
+        		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3077,7 +3077,7 @@ ruleActorClass returns [EObject current=null]
        			$current, 
        			"connections",
         		lv_connections_24_0, 
-        		"LayerConnection");
+        		"org.eclipse.etrice.core.Room.LayerConnection");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3096,7 +3096,7 @@ ruleActorClass returns [EObject current=null]
        			$current, 
        			"bindings",
         		lv_bindings_25_0, 
-        		"Binding");
+        		"org.eclipse.etrice.core.Room.Binding");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3115,7 +3115,7 @@ ruleActorClass returns [EObject current=null]
        			$current, 
        			"serviceImplementations",
         		lv_serviceImplementations_26_0, 
-        		"ServiceImplementation");
+        		"org.eclipse.etrice.core.Room.ServiceImplementation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3134,7 +3134,7 @@ ruleActorClass returns [EObject current=null]
        			$current, 
        			"attributes",
         		lv_attributes_27_0, 
-        		"Attribute");
+        		"org.eclipse.etrice.core.Room.Attribute");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3153,7 +3153,7 @@ ruleActorClass returns [EObject current=null]
        			$current, 
        			"actorRefs",
         		lv_actorRefs_28_0, 
-        		"ActorRef");
+        		"org.eclipse.etrice.core.Room.ActorRef");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3172,7 +3172,7 @@ ruleActorClass returns [EObject current=null]
        			$current, 
        			"serviceAccessPoints",
         		lv_serviceAccessPoints_29_0, 
-        		"SAP");
+        		"org.eclipse.etrice.core.Room.SAP");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3191,7 +3191,7 @@ ruleActorClass returns [EObject current=null]
        			$current, 
        			"internalPorts",
         		lv_internalPorts_30_0, 
-        		"Port");
+        		"org.eclipse.etrice.core.Room.Port");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3210,7 +3210,7 @@ ruleActorClass returns [EObject current=null]
        			$current, 
        			"externalPorts",
         		lv_externalPorts_31_0, 
-        		"ExternalPort");
+        		"org.eclipse.etrice.core.Room.ExternalPort");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3236,7 +3236,7 @@ ruleActorClass returns [EObject current=null]
        			$current, 
        			"behaviorDocu",
         		lv_behaviorDocu_34_0, 
-        		"Documentation");
+        		"org.eclipse.etrice.core.common.Base.Documentation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3258,7 +3258,7 @@ ruleActorClass returns [EObject current=null]
        			$current, 
        			"behaviorAnnotations",
         		lv_behaviorAnnotations_36_0, 
-        		"Annotation");
+        		"org.eclipse.etrice.core.common.Base.Annotation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3276,7 +3276,7 @@ ruleActorClass returns [EObject current=null]
        			$current, 
        			"operations",
         		lv_operations_37_0, 
-        		"StandardOperation");
+        		"org.eclipse.etrice.core.Room.StandardOperation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3295,7 +3295,7 @@ ruleActorClass returns [EObject current=null]
        			$current, 
        			"structors",
         		lv_structors_38_0, 
-        		"ClassStructor");
+        		"org.eclipse.etrice.core.Room.ClassStructor");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3313,7 +3313,7 @@ ruleActorClass returns [EObject current=null]
        			$current, 
        			"stateMachine",
         		lv_stateMachine_39_0, 
-        		"StateMachine");
+        		"org.eclipse.etrice.core.fsm.FSM.StateMachine");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3430,7 +3430,7 @@ rulePort returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_2_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -3447,7 +3447,7 @@ rulePort returns [EObject current=null]
        			$current, 
        			"multiplicity",
         		lv_multiplicity_3_0, 
-        		"MULTIPLICITY");
+        		"org.eclipse.etrice.core.Room.MULTIPLICITY");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3484,7 +3484,7 @@ rulePort returns [EObject current=null]
        			$current, 
        			"docu",
         		lv_docu_6_0, 
-        		"Documentation");
+        		"org.eclipse.etrice.core.common.Base.Documentation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3570,7 +3570,7 @@ ruleSAP returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -3632,7 +3632,7 @@ ruleSPP returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -3736,7 +3736,7 @@ ruleLogicalSystem returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -3753,7 +3753,7 @@ ruleLogicalSystem returns [EObject current=null]
        			$current, 
        			"docu",
         		lv_docu_2_0, 
-        		"Documentation");
+        		"org.eclipse.etrice.core.common.Base.Documentation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3775,7 +3775,7 @@ ruleLogicalSystem returns [EObject current=null]
        			$current, 
        			"annotations",
         		lv_annotations_4_0, 
-        		"Annotation");
+        		"org.eclipse.etrice.core.common.Base.Annotation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3793,7 +3793,7 @@ ruleLogicalSystem returns [EObject current=null]
        			$current, 
        			"connections",
         		lv_connections_5_0, 
-        		"LayerConnection");
+        		"org.eclipse.etrice.core.Room.LayerConnection");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3812,7 +3812,7 @@ ruleLogicalSystem returns [EObject current=null]
        			$current, 
        			"bindings",
         		lv_bindings_6_0, 
-        		"Binding");
+        		"org.eclipse.etrice.core.Room.Binding");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3831,7 +3831,7 @@ ruleLogicalSystem returns [EObject current=null]
        			$current, 
        			"subSystems",
         		lv_subSystems_7_0, 
-        		"SubSystemRef");
+        		"org.eclipse.etrice.core.Room.SubSystemRef");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3881,7 +3881,7 @@ ruleSubSystemRef returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -3917,7 +3917,7 @@ ruleSubSystemRef returns [EObject current=null]
        			$current, 
        			"docu",
         		lv_docu_4_0, 
-        		"Documentation");
+        		"org.eclipse.etrice.core.common.Base.Documentation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3961,7 +3961,7 @@ ruleSubSystemClass returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -3978,7 +3978,7 @@ ruleSubSystemClass returns [EObject current=null]
        			$current, 
        			"docu",
         		lv_docu_2_0, 
-        		"Documentation");
+        		"org.eclipse.etrice.core.common.Base.Documentation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4000,7 +4000,7 @@ ruleSubSystemClass returns [EObject current=null]
        			$current, 
        			"annotations",
         		lv_annotations_4_0, 
-        		"Annotation");
+        		"org.eclipse.etrice.core.common.Base.Annotation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4022,7 +4022,7 @@ ruleSubSystemClass returns [EObject current=null]
        			$current, 
        			"userCode1",
         		lv_userCode1_6_0, 
-        		"DetailCode");
+        		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4044,7 +4044,7 @@ ruleSubSystemClass returns [EObject current=null]
        			$current, 
        			"userCode2",
         		lv_userCode2_8_0, 
-        		"DetailCode");
+        		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4066,7 +4066,7 @@ ruleSubSystemClass returns [EObject current=null]
        			$current, 
        			"userCode3",
         		lv_userCode3_10_0, 
-        		"DetailCode");
+        		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4084,7 +4084,7 @@ ruleSubSystemClass returns [EObject current=null]
        			$current, 
        			"actorInstanceMappings",
         		lv_actorInstanceMappings_11_0, 
-        		"ActorInstanceMapping");
+        		"org.eclipse.etrice.core.Room.ActorInstanceMapping");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4103,7 +4103,7 @@ ruleSubSystemClass returns [EObject current=null]
        			$current, 
        			"threads",
         		lv_threads_12_0, 
-        		"LogicalThread");
+        		"org.eclipse.etrice.core.Room.LogicalThread");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4122,7 +4122,7 @@ ruleSubSystemClass returns [EObject current=null]
        			$current, 
        			"connections",
         		lv_connections_13_0, 
-        		"LayerConnection");
+        		"org.eclipse.etrice.core.Room.LayerConnection");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4141,7 +4141,7 @@ ruleSubSystemClass returns [EObject current=null]
        			$current, 
        			"bindings",
         		lv_bindings_14_0, 
-        		"Binding");
+        		"org.eclipse.etrice.core.Room.Binding");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4160,7 +4160,7 @@ ruleSubSystemClass returns [EObject current=null]
        			$current, 
        			"actorRefs",
         		lv_actorRefs_15_0, 
-        		"ActorRef");
+        		"org.eclipse.etrice.core.Room.ActorRef");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4179,7 +4179,7 @@ ruleSubSystemClass returns [EObject current=null]
        			$current, 
        			"serviceProvisionPoints",
         		lv_serviceProvisionPoints_16_0, 
-        		"SPP");
+        		"org.eclipse.etrice.core.Room.SPP");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4198,7 +4198,7 @@ ruleSubSystemClass returns [EObject current=null]
        			$current, 
        			"relayPorts",
         		lv_relayPorts_17_0, 
-        		"Port");
+        		"org.eclipse.etrice.core.Room.Port");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4246,7 +4246,7 @@ ruleLogicalThread returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -4288,7 +4288,7 @@ ruleActorInstanceMapping returns [EObject current=null]
        			$current, 
        			"path",
         		lv_path_1_0, 
-        		"RefPath");
+        		"org.eclipse.etrice.core.Room.RefPath");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4327,7 +4327,7 @@ ruleActorInstanceMapping returns [EObject current=null]
        			$current, 
        			"actorInstanceMappings",
         		lv_actorInstanceMappings_5_0, 
-        		"ActorInstanceMapping");
+        		"org.eclipse.etrice.core.Room.ActorInstanceMapping");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4370,7 +4370,7 @@ ruleRefPath returns [EObject current=null]
        			$current, 
        			"refs",
         		lv_refs_0_0, 
-        		"RefSegment");
+        		"org.eclipse.etrice.core.Room.RefSegment");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4392,7 +4392,7 @@ ruleRefPath returns [EObject current=null]
        			$current, 
        			"refs",
         		lv_refs_2_0, 
-        		"RefSegment");
+        		"org.eclipse.etrice.core.Room.RefSegment");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4432,7 +4432,7 @@ ruleRefSegment returns [EObject current=null]
        			$current, 
        			"ref",
         		lv_ref_0_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -4454,7 +4454,7 @@ ruleRefSegment returns [EObject current=null]
        			$current, 
        			"idx",
         		lv_idx_2_0, 
-        		"INT");
+        		"org.eclipse.xtext.common.Terminals.INT");
 	    }
 
 )
@@ -4496,7 +4496,7 @@ ruleBinding returns [EObject current=null]
        			$current, 
        			"endpoint1",
         		lv_endpoint1_1_0, 
-        		"BindingEndPoint");
+        		"org.eclipse.etrice.core.Room.BindingEndPoint");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4518,7 +4518,7 @@ ruleBinding returns [EObject current=null]
        			$current, 
        			"endpoint2",
         		lv_endpoint2_3_0, 
-        		"BindingEndPoint");
+        		"org.eclipse.etrice.core.Room.BindingEndPoint");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4629,7 +4629,7 @@ ruleLayerConnection returns [EObject current=null]
        			$current, 
        			"from",
         		lv_from_1_0, 
-        		"SAPoint");
+        		"org.eclipse.etrice.core.Room.SAPoint");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4651,7 +4651,7 @@ ruleLayerConnection returns [EObject current=null]
        			$current, 
        			"to",
         		lv_to_3_0, 
-        		"SPPoint");
+        		"org.eclipse.etrice.core.Room.SPPoint");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4857,7 +4857,7 @@ ruleActorRef returns [EObject current=null]
        			$current, 
        			"refType",
         		lv_refType_0_0, 
-        		"ReferenceType");
+        		"org.eclipse.etrice.core.Room.ReferenceType");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4880,7 +4880,7 @@ ruleActorRef returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_2_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -4897,7 +4897,7 @@ ruleActorRef returns [EObject current=null]
        			$current, 
        			"multiplicity",
         		lv_multiplicity_3_0, 
-        		"MULTIPLICITY");
+        		"org.eclipse.etrice.core.Room.MULTIPLICITY");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4934,7 +4934,7 @@ ruleActorRef returns [EObject current=null]
        			$current, 
        			"docu",
         		lv_docu_6_0, 
-        		"Documentation");
+        		"org.eclipse.etrice.core.common.Base.Documentation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5155,7 +5155,7 @@ ruleStateGraph returns [EObject current=null]
        			$current, 
        			"states",
         		lv_states_2_0, 
-        		"State");
+        		"org.eclipse.etrice.core.fsm.FSM.State");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5174,7 +5174,7 @@ ruleStateGraph returns [EObject current=null]
        			$current, 
        			"trPoints",
         		lv_trPoints_3_0, 
-        		"TrPoint");
+        		"org.eclipse.etrice.core.fsm.FSM.TrPoint");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5193,7 +5193,7 @@ ruleStateGraph returns [EObject current=null]
        			$current, 
        			"chPoints",
         		lv_chPoints_4_0, 
-        		"ChoicePoint");
+        		"org.eclipse.etrice.core.fsm.FSM.ChoicePoint");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5212,7 +5212,7 @@ ruleStateGraph returns [EObject current=null]
        			$current, 
        			"transitions",
         		lv_transitions_5_0, 
-        		"Transition");
+        		"org.eclipse.etrice.core.fsm.FSM.Transition");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5231,7 +5231,7 @@ ruleStateGraph returns [EObject current=null]
        			$current, 
        			"refinedTransitions",
         		lv_refinedTransitions_6_0, 
-        		"RefinedTransition");
+        		"org.eclipse.etrice.core.fsm.FSM.RefinedTransition");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5288,7 +5288,7 @@ ruleStateMachine returns [EObject current=null]
        			$current, 
        			"states",
         		lv_states_3_0, 
-        		"State");
+        		"org.eclipse.etrice.core.fsm.FSM.State");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5307,7 +5307,7 @@ ruleStateMachine returns [EObject current=null]
        			$current, 
        			"trPoints",
         		lv_trPoints_4_0, 
-        		"TrPoint");
+        		"org.eclipse.etrice.core.fsm.FSM.TrPoint");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5326,7 +5326,7 @@ ruleStateMachine returns [EObject current=null]
        			$current, 
        			"chPoints",
         		lv_chPoints_5_0, 
-        		"ChoicePoint");
+        		"org.eclipse.etrice.core.fsm.FSM.ChoicePoint");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5345,7 +5345,7 @@ ruleStateMachine returns [EObject current=null]
        			$current, 
        			"transitions",
         		lv_transitions_6_0, 
-        		"Transition");
+        		"org.eclipse.etrice.core.fsm.FSM.Transition");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5364,7 +5364,7 @@ ruleStateMachine returns [EObject current=null]
        			$current, 
        			"refinedTransitions",
         		lv_refinedTransitions_7_0, 
-        		"RefinedTransition");
+        		"org.eclipse.etrice.core.fsm.FSM.RefinedTransition");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5452,7 +5452,7 @@ ruleSimpleState returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -5469,7 +5469,7 @@ ruleSimpleState returns [EObject current=null]
        			$current, 
        			"docu",
         		lv_docu_2_0, 
-        		"Documentation");
+        		"org.eclipse.etrice.core.common.Base.Documentation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5495,7 +5495,7 @@ ruleSimpleState returns [EObject current=null]
        			$current, 
        			"entryCode",
         		lv_entryCode_5_0, 
-        		"DetailCode");
+        		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5517,7 +5517,7 @@ ruleSimpleState returns [EObject current=null]
        			$current, 
        			"exitCode",
         		lv_exitCode_7_0, 
-        		"DetailCode");
+        		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5539,7 +5539,7 @@ ruleSimpleState returns [EObject current=null]
        			$current, 
        			"doCode",
         		lv_doCode_9_0, 
-        		"DetailCode");
+        		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5561,7 +5561,7 @@ ruleSimpleState returns [EObject current=null]
        			$current, 
        			"subgraph",
         		lv_subgraph_11_0, 
-        		"StateGraph");
+        		"org.eclipse.etrice.core.fsm.FSM.StateGraph");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5623,7 +5623,7 @@ ruleRefinedState returns [EObject current=null]
        			$current, 
        			"docu",
         		lv_docu_2_0, 
-        		"Documentation");
+        		"org.eclipse.etrice.core.common.Base.Documentation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5649,7 +5649,7 @@ ruleRefinedState returns [EObject current=null]
        			$current, 
        			"entryCode",
         		lv_entryCode_5_0, 
-        		"DetailCode");
+        		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5671,7 +5671,7 @@ ruleRefinedState returns [EObject current=null]
        			$current, 
        			"exitCode",
         		lv_exitCode_7_0, 
-        		"DetailCode");
+        		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5693,7 +5693,7 @@ ruleRefinedState returns [EObject current=null]
        			$current, 
        			"doCode",
         		lv_doCode_9_0, 
-        		"DetailCode");
+        		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5715,7 +5715,7 @@ ruleRefinedState returns [EObject current=null]
        			$current, 
        			"subgraph",
         		lv_subgraph_11_0, 
-        		"StateGraph");
+        		"org.eclipse.etrice.core.fsm.FSM.StateGraph");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5780,7 +5780,7 @@ ruleDetailCode returns [EObject current=null]
        			$current, 
        			"lines",
         		lv_lines_2_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -5892,7 +5892,7 @@ ruleTransitionPoint returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_2_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -5935,7 +5935,7 @@ ruleEntryPoint returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -5978,7 +5978,7 @@ ruleExitPoint returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -6021,7 +6021,7 @@ ruleChoicePoint returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -6038,7 +6038,7 @@ ruleChoicePoint returns [EObject current=null]
        			$current, 
        			"docu",
         		lv_docu_2_0, 
-        		"Documentation");
+        		"org.eclipse.etrice.core.common.Base.Documentation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6050,6 +6050,8 @@ ruleChoicePoint returns [EObject current=null]
 
 
 
+
+
 // Entry rule entryRuleTransition
 entryRuleTransition returns [EObject current=null] 
 	:
@@ -6212,7 +6214,7 @@ ruleInitialTransition returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -6241,7 +6243,7 @@ ruleInitialTransition returns [EObject current=null]
        			$current, 
        			"to",
         		lv_to_5_0, 
-        		"TransitionTerminal");
+        		"org.eclipse.etrice.core.fsm.FSM.TransitionTerminal");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6259,7 +6261,7 @@ ruleInitialTransition returns [EObject current=null]
        			$current, 
        			"docu",
         		lv_docu_6_0, 
-        		"Documentation");
+        		"org.eclipse.etrice.core.common.Base.Documentation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6285,7 +6287,7 @@ ruleInitialTransition returns [EObject current=null]
        			$current, 
        			"action",
         		lv_action_9_0, 
-        		"DetailCode");
+        		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6333,7 +6335,7 @@ ruleContinuationTransition returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -6354,7 +6356,7 @@ ruleContinuationTransition returns [EObject current=null]
        			$current, 
        			"from",
         		lv_from_3_0, 
-        		"TransitionTerminal");
+        		"org.eclipse.etrice.core.fsm.FSM.TransitionTerminal");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6376,7 +6378,7 @@ ruleContinuationTransition returns [EObject current=null]
        			$current, 
        			"to",
         		lv_to_5_0, 
-        		"TransitionTerminal");
+        		"org.eclipse.etrice.core.fsm.FSM.TransitionTerminal");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6394,7 +6396,7 @@ ruleContinuationTransition returns [EObject current=null]
        			$current, 
        			"docu",
         		lv_docu_6_0, 
-        		"Documentation");
+        		"org.eclipse.etrice.core.common.Base.Documentation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6420,7 +6422,7 @@ ruleContinuationTransition returns [EObject current=null]
        			$current, 
        			"action",
         		lv_action_9_0, 
-        		"DetailCode");
+        		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6468,7 +6470,7 @@ ruleTriggeredTransition returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -6489,7 +6491,7 @@ ruleTriggeredTransition returns [EObject current=null]
        			$current, 
        			"from",
         		lv_from_3_0, 
-        		"TransitionTerminal");
+        		"org.eclipse.etrice.core.fsm.FSM.TransitionTerminal");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6511,7 +6513,7 @@ ruleTriggeredTransition returns [EObject current=null]
        			$current, 
        			"to",
         		lv_to_5_0, 
-        		"TransitionTerminal");
+        		"org.eclipse.etrice.core.fsm.FSM.TransitionTerminal");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6529,7 +6531,7 @@ ruleTriggeredTransition returns [EObject current=null]
        			$current, 
        			"docu",
         		lv_docu_6_0, 
-        		"Documentation");
+        		"org.eclipse.etrice.core.common.Base.Documentation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6559,7 +6561,7 @@ ruleTriggeredTransition returns [EObject current=null]
        			$current, 
        			"triggers",
         		lv_triggers_10_0, 
-        		"Trigger");
+        		"org.eclipse.etrice.core.fsm.FSM.Trigger");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6581,7 +6583,7 @@ ruleTriggeredTransition returns [EObject current=null]
        			$current, 
        			"triggers",
         		lv_triggers_12_0, 
-        		"Trigger");
+        		"org.eclipse.etrice.core.fsm.FSM.Trigger");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6607,7 +6609,7 @@ ruleTriggeredTransition returns [EObject current=null]
        			$current, 
        			"action",
         		lv_action_15_0, 
-        		"DetailCode");
+        		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6655,7 +6657,7 @@ ruleGuardedTransition returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -6676,7 +6678,7 @@ ruleGuardedTransition returns [EObject current=null]
        			$current, 
        			"from",
         		lv_from_3_0, 
-        		"TransitionTerminal");
+        		"org.eclipse.etrice.core.fsm.FSM.TransitionTerminal");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6698,7 +6700,7 @@ ruleGuardedTransition returns [EObject current=null]
        			$current, 
        			"to",
         		lv_to_5_0, 
-        		"TransitionTerminal");
+        		"org.eclipse.etrice.core.fsm.FSM.TransitionTerminal");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6716,7 +6718,7 @@ ruleGuardedTransition returns [EObject current=null]
        			$current, 
        			"docu",
         		lv_docu_6_0, 
-        		"Documentation");
+        		"org.eclipse.etrice.core.common.Base.Documentation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6742,7 +6744,7 @@ ruleGuardedTransition returns [EObject current=null]
        			$current, 
        			"guard",
         		lv_guard_9_0, 
-        		"DetailCode");
+        		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6764,7 +6766,7 @@ ruleGuardedTransition returns [EObject current=null]
        			$current, 
        			"action",
         		lv_action_11_0, 
-        		"DetailCode");
+        		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6812,7 +6814,7 @@ ruleCPBranchTransition returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -6833,7 +6835,7 @@ ruleCPBranchTransition returns [EObject current=null]
        			$current, 
        			"from",
         		lv_from_3_0, 
-        		"TransitionTerminal");
+        		"org.eclipse.etrice.core.fsm.FSM.TransitionTerminal");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6855,7 +6857,7 @@ ruleCPBranchTransition returns [EObject current=null]
        			$current, 
        			"to",
         		lv_to_5_0, 
-        		"TransitionTerminal");
+        		"org.eclipse.etrice.core.fsm.FSM.TransitionTerminal");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6873,7 +6875,7 @@ ruleCPBranchTransition returns [EObject current=null]
        			$current, 
        			"docu",
         		lv_docu_6_0, 
-        		"Documentation");
+        		"org.eclipse.etrice.core.common.Base.Documentation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6899,7 +6901,7 @@ ruleCPBranchTransition returns [EObject current=null]
        			$current, 
        			"condition",
         		lv_condition_9_0, 
-        		"DetailCode");
+        		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6921,7 +6923,7 @@ ruleCPBranchTransition returns [EObject current=null]
        			$current, 
        			"action",
         		lv_action_11_0, 
-        		"DetailCode");
+        		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6983,7 +6985,7 @@ ruleRefinedTransition returns [EObject current=null]
        			$current, 
        			"docu",
         		lv_docu_2_0, 
-        		"Documentation");
+        		"org.eclipse.etrice.core.common.Base.Documentation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7009,7 +7011,7 @@ ruleRefinedTransition returns [EObject current=null]
        			$current, 
        			"action",
         		lv_action_5_0, 
-        		"DetailCode");
+        		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7277,7 +7279,7 @@ ruleTrigger returns [EObject current=null]
        			$current, 
        			"msgFromIfPairs",
         		lv_msgFromIfPairs_1_0, 
-        		"MessageFromIf");
+        		"org.eclipse.etrice.core.fsm.FSM.MessageFromIf");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7299,7 +7301,7 @@ ruleTrigger returns [EObject current=null]
        			$current, 
        			"msgFromIfPairs",
         		lv_msgFromIfPairs_3_0, 
-        		"MessageFromIf");
+        		"org.eclipse.etrice.core.fsm.FSM.MessageFromIf");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7317,7 +7319,7 @@ ruleTrigger returns [EObject current=null]
        			$current, 
        			"guard",
         		lv_guard_4_0, 
-        		"Guard");
+        		"org.eclipse.etrice.core.fsm.FSM.Guard");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7415,7 +7417,7 @@ ruleGuard returns [EObject current=null]
        			$current, 
        			"guard",
         		lv_guard_1_0, 
-        		"DetailCode");
+        		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7468,7 +7470,7 @@ ruleProtocolSemantics returns [EObject current=null]
        			$current, 
        			"rules",
         		lv_rules_3_0, 
-        		"SemanticsRule");
+        		"org.eclipse.etrice.core.fsm.FSM.SemanticsRule");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7576,7 +7578,7 @@ ruleInSemanticsRule returns [EObject current=null]
        			$current, 
        			"followUps",
         		lv_followUps_4_0, 
-        		"SemanticsRule");
+        		"org.eclipse.etrice.core.fsm.FSM.SemanticsRule");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7599,7 +7601,7 @@ ruleInSemanticsRule returns [EObject current=null]
        			$current, 
        			"followUps",
         		lv_followUps_6_0, 
-        		"SemanticsRule");
+        		"org.eclipse.etrice.core.fsm.FSM.SemanticsRule");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7621,7 +7623,7 @@ ruleInSemanticsRule returns [EObject current=null]
        			$current, 
        			"followUps",
         		lv_followUps_8_0, 
-        		"SemanticsRule");
+        		"org.eclipse.etrice.core.fsm.FSM.SemanticsRule");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7689,7 +7691,7 @@ ruleOutSemanticsRule returns [EObject current=null]
        			$current, 
        			"followUps",
         		lv_followUps_4_0, 
-        		"SemanticsRule");
+        		"org.eclipse.etrice.core.fsm.FSM.SemanticsRule");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7712,7 +7714,7 @@ ruleOutSemanticsRule returns [EObject current=null]
        			$current, 
        			"followUps",
         		lv_followUps_6_0, 
-        		"SemanticsRule");
+        		"org.eclipse.etrice.core.fsm.FSM.SemanticsRule");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7734,7 +7736,7 @@ ruleOutSemanticsRule returns [EObject current=null]
        			$current, 
        			"followUps",
         		lv_followUps_8_0, 
-        		"SemanticsRule");
+        		"org.eclipse.etrice.core.fsm.FSM.SemanticsRule");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7800,7 +7802,7 @@ ruleAnnotation returns [EObject current=null]
        			$current, 
        			"attributes",
         		lv_attributes_3_0, 
-        		"KeyValue");
+        		"org.eclipse.etrice.core.common.Base.KeyValue");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7822,7 +7824,7 @@ ruleAnnotation returns [EObject current=null]
        			$current, 
        			"attributes",
         		lv_attributes_5_0, 
-        		"KeyValue");
+        		"org.eclipse.etrice.core.common.Base.KeyValue");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7866,7 +7868,7 @@ ruleKeyValue returns [EObject current=null]
        			$current, 
        			"key",
         		lv_key_0_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -7887,7 +7889,7 @@ ruleKeyValue returns [EObject current=null]
        			$current, 
        			"value",
         		lv_value_2_0, 
-        		"Literal");
+        		"org.eclipse.etrice.core.common.Base.Literal");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7931,7 +7933,7 @@ ruleAnnotationType returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -7948,7 +7950,7 @@ ruleAnnotationType returns [EObject current=null]
        			$current, 
        			"docu",
         		lv_docu_2_0, 
-        		"Documentation");
+        		"org.eclipse.etrice.core.common.Base.Documentation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7978,7 +7980,7 @@ ruleAnnotationType returns [EObject current=null]
        			$current, 
        			"targets",
         		lv_targets_6_0, 
-        		"AnnotationTargetType");
+        		"org.eclipse.etrice.core.Room.AnnotationTargetType");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -8001,7 +8003,7 @@ ruleAnnotationType returns [EObject current=null]
        			$current, 
        			"targets",
         		lv_targets_8_0, 
-        		"AnnotationTargetType");
+        		"org.eclipse.etrice.core.Room.AnnotationTargetType");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -8023,7 +8025,7 @@ ruleAnnotationType returns [EObject current=null]
        			$current, 
        			"targets",
         		lv_targets_10_0, 
-        		"AnnotationTargetType");
+        		"org.eclipse.etrice.core.Room.AnnotationTargetType");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -8045,7 +8047,7 @@ ruleAnnotationType returns [EObject current=null]
        			$current, 
        			"attributes",
         		lv_attributes_12_0, 
-        		"AnnotationAttribute");
+        		"org.eclipse.etrice.core.common.Base.AnnotationAttribute");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -8153,7 +8155,7 @@ ruleSimpleAnnotationAttribute returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_3_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -8174,7 +8176,7 @@ ruleSimpleAnnotationAttribute returns [EObject current=null]
        			$current, 
        			"type",
         		lv_type_5_0, 
-        		"LiteralType");
+        		"org.eclipse.etrice.core.common.Base.LiteralType");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -8238,7 +8240,7 @@ ruleEnumAnnotationAttribute returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_3_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -8264,7 +8266,7 @@ ruleEnumAnnotationAttribute returns [EObject current=null]
        			$current, 
        			"values",
         		lv_values_6_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -8286,7 +8288,7 @@ ruleEnumAnnotationAttribute returns [EObject current=null]
        			$current, 
        			"values",
         		lv_values_8_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -8332,7 +8334,7 @@ ruleImport returns [EObject current=null]
        			$current, 
        			"importedNamespace",
         		lv_importedNamespace_1_0, 
-        		"ImportedFQN");
+        		"org.eclipse.etrice.core.common.Base.ImportedFQN");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -8360,7 +8362,7 @@ ruleImport returns [EObject current=null]
        			$current, 
        			"importURI",
         		lv_importURI_4_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -8447,7 +8449,7 @@ ruleDocumentation returns [EObject current=null]
        			$current, 
        			"lines",
         		lv_lines_2_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -8636,7 +8638,7 @@ ruleRealLiteral returns [EObject current=null]
        			$current, 
        			"value",
         		lv_value_1_0, 
-        		"Real");
+        		"org.eclipse.etrice.core.common.Base.Real");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -8681,7 +8683,7 @@ ruleIntLiteral returns [EObject current=null]
        			$current, 
        			"value",
         		lv_value_1_0, 
-        		"Integer");
+        		"org.eclipse.etrice.core.common.Base.Integer");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -8727,7 +8729,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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoomLexer.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoomLexer.java
index d8af1fc30..07afb704e 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoomLexer.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoomLexer.java
@@ -12,135 +12,135 @@ import java.util.ArrayList;
 
 @SuppressWarnings("all")
 public class InternalRoomLexer extends Lexer {
-    public static final int RULE_HEX=7;
-    public static final int T__50=50;
-    public static final int T__59=59;
-    public static final int T__55=55;
-    public static final int T__56=56;
-    public static final int T__57=57;
-    public static final int T__58=58;
-    public static final int T__51=51;
-    public static final int T__52=52;
-    public static final int T__53=53;
-    public static final int T__54=54;
-    public static final int T__60=60;
-    public static final int T__61=61;
     public static final int RULE_ID=4;
-    public static final int T__131=131;
-    public static final int T__130=130;
-    public static final int RULE_INT=6;
-    public static final int T__66=66;
-    public static final int RULE_ML_COMMENT=8;
-    public static final int T__67=67;
-    public static final int T__129=129;
-    public static final int T__68=68;
-    public static final int T__69=69;
-    public static final int T__62=62;
-    public static final int T__126=126;
-    public static final int T__63=63;
-    public static final int T__125=125;
-    public static final int T__64=64;
-    public static final int T__128=128;
-    public static final int T__65=65;
-    public static final int T__127=127;
-    public static final int T__37=37;
-    public static final int T__38=38;
-    public static final int T__39=39;
-    public static final int T__33=33;
-    public static final int T__34=34;
-    public static final int T__35=35;
-    public static final int T__36=36;
-    public static final int T__30=30;
-    public static final int T__31=31;
-    public static final int T__32=32;
-    public static final int T__48=48;
-    public static final int T__49=49;
-    public static final int T__44=44;
-    public static final int T__45=45;
-    public static final int T__46=46;
-    public static final int T__47=47;
-    public static final int T__40=40;
-    public static final int T__41=41;
-    public static final int T__42=42;
-    public static final int T__43=43;
-    public static final int T__91=91;
-    public static final int T__100=100;
-    public static final int T__92=92;
+    public static final int T__29=29;
+    public static final int T__28=28;
+    public static final int T__27=27;
+    public static final int T__26=26;
+    public static final int T__25=25;
+    public static final int T__24=24;
+    public static final int T__23=23;
+    public static final int T__22=22;
+    public static final int RULE_ANY_OTHER=11;
+    public static final int T__21=21;
+    public static final int T__20=20;
+    public static final int EOF=-1;
     public static final int T__93=93;
-    public static final int T__102=102;
+    public static final int T__19=19;
     public static final int T__94=94;
-    public static final int T__101=101;
+    public static final int T__91=91;
+    public static final int T__92=92;
+    public static final int RULE_HEX=7;
+    public static final int T__16=16;
     public static final int T__90=90;
-    public static final int T__19=19;
     public static final int T__15=15;
-    public static final int T__16=16;
-    public static final int T__17=17;
     public static final int T__18=18;
-    public static final int T__99=99;
+    public static final int T__17=17;
     public static final int T__12=12;
-    public static final int T__13=13;
     public static final int T__14=14;
-    public static final int T__95=95;
-    public static final int T__96=96;
-    public static final int T__97=97;
+    public static final int T__13=13;
+    public static final int T__99=99;
     public static final int T__98=98;
-    public static final int T__26=26;
-    public static final int T__27=27;
-    public static final int T__28=28;
-    public static final int T__29=29;
-    public static final int T__22=22;
-    public static final int T__23=23;
-    public static final int T__24=24;
-    public static final int T__25=25;
-    public static final int T__20=20;
-    public static final int T__21=21;
-    public static final int T__122=122;
-    public static final int T__70=70;
-    public static final int T__121=121;
+    public static final int T__97=97;
+    public static final int T__96=96;
+    public static final int T__95=95;
+    public static final int T__80=80;
+    public static final int T__81=81;
+    public static final int T__82=82;
+    public static final int T__83=83;
+    public static final int T__85=85;
+    public static final int T__84=84;
+    public static final int T__87=87;
+    public static final int T__86=86;
+    public static final int T__89=89;
+    public static final int T__88=88;
+    public static final int RULE_ML_COMMENT=8;
+    public static final int T__126=126;
+    public static final int T__125=125;
+    public static final int T__128=128;
+    public static final int RULE_STRING=5;
+    public static final int T__127=127;
     public static final int T__71=71;
-    public static final int T__124=124;
+    public static final int T__129=129;
     public static final int T__72=72;
-    public static final int T__123=123;
-    public static final int T__120=120;
-    public static final int RULE_STRING=5;
-    public static final int RULE_SL_COMMENT=9;
-    public static final int T__77=77;
-    public static final int T__119=119;
+    public static final int T__70=70;
+    public static final int T__76=76;
+    public static final int T__75=75;
+    public static final int T__130=130;
+    public static final int T__74=74;
+    public static final int T__131=131;
+    public static final int T__73=73;
+    public static final int T__79=79;
     public static final int T__78=78;
+    public static final int T__77=77;
+    public static final int T__68=68;
+    public static final int T__69=69;
+    public static final int T__66=66;
+    public static final int T__67=67;
+    public static final int T__64=64;
+    public static final int T__65=65;
+    public static final int T__62=62;
+    public static final int T__63=63;
     public static final int T__118=118;
-    public static final int T__79=79;
-    public static final int T__73=73;
-    public static final int T__115=115;
-    public static final int EOF=-1;
-    public static final int T__74=74;
-    public static final int T__114=114;
-    public static final int T__75=75;
-    public static final int T__117=117;
-    public static final int T__76=76;
+    public static final int T__119=119;
     public static final int T__116=116;
-    public static final int T__80=80;
+    public static final int T__117=117;
+    public static final int T__114=114;
+    public static final int T__115=115;
+    public static final int T__124=124;
+    public static final int T__123=123;
+    public static final int T__122=122;
+    public static final int T__121=121;
+    public static final int T__120=120;
+    public static final int T__61=61;
+    public static final int T__60=60;
+    public static final int T__55=55;
+    public static final int T__56=56;
+    public static final int T__57=57;
+    public static final int T__58=58;
+    public static final int T__51=51;
+    public static final int T__52=52;
+    public static final int T__53=53;
+    public static final int T__54=54;
+    public static final int T__107=107;
+    public static final int T__108=108;
+    public static final int T__109=109;
+    public static final int T__59=59;
+    public static final int T__103=103;
+    public static final int T__104=104;
+    public static final int T__105=105;
+    public static final int T__106=106;
     public static final int T__111=111;
-    public static final int T__81=81;
     public static final int T__110=110;
-    public static final int T__82=82;
     public static final int T__113=113;
-    public static final int T__83=83;
+    public static final int RULE_INT=6;
     public static final int T__112=112;
+    public static final int T__50=50;
+    public static final int T__42=42;
+    public static final int T__43=43;
+    public static final int T__40=40;
+    public static final int T__41=41;
+    public static final int T__46=46;
+    public static final int T__47=47;
+    public static final int T__44=44;
+    public static final int T__45=45;
+    public static final int T__48=48;
+    public static final int T__49=49;
+    public static final int T__102=102;
+    public static final int T__101=101;
+    public static final int T__100=100;
+    public static final int RULE_SL_COMMENT=9;
+    public static final int T__30=30;
+    public static final int T__31=31;
+    public static final int T__32=32;
+    public static final int T__33=33;
+    public static final int T__34=34;
+    public static final int T__35=35;
+    public static final int T__36=36;
+    public static final int T__37=37;
+    public static final int T__38=38;
+    public static final int T__39=39;
     public static final int RULE_WS=10;
-    public static final int RULE_ANY_OTHER=11;
-    public static final int T__88=88;
-    public static final int T__108=108;
-    public static final int T__89=89;
-    public static final int T__107=107;
-    public static final int T__109=109;
-    public static final int T__84=84;
-    public static final int T__104=104;
-    public static final int T__85=85;
-    public static final int T__103=103;
-    public static final int T__86=86;
-    public static final int T__106=106;
-    public static final int T__87=87;
-    public static final int T__105=105;
 
     // delegates
     // delegators
@@ -153,15 +153,15 @@ public class InternalRoomLexer extends Lexer {
         super(input,state);
 
     }
-    public String getGrammarFileName() { return "../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g"; }
+    public String getGrammarFileName() { return "InternalRoom.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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:11:7: ( 'RoomModel' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:11:9: 'RoomModel'
+            // InternalRoom.g:11:7: ( 'RoomModel' )
+            // InternalRoom.g:11:9: 'RoomModel'
             {
             match("RoomModel"); 
 
@@ -181,8 +181,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__13;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:12:7: ( '{' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:12:9: '{'
+            // InternalRoom.g:12:7: ( '{' )
+            // InternalRoom.g:12:9: '{'
             {
             match('{'); 
 
@@ -201,8 +201,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__14;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:13:7: ( '}' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:13:9: '}'
+            // InternalRoom.g:13:7: ( '}' )
+            // InternalRoom.g:13:9: '}'
             {
             match('}'); 
 
@@ -221,8 +221,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__15;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:14:7: ( ':' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:14:9: ':'
+            // InternalRoom.g:14:7: ( ':' )
+            // InternalRoom.g:14:9: ':'
             {
             match(':'); 
 
@@ -241,8 +241,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__16;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:15:7: ( 'ref' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:15:9: 'ref'
+            // InternalRoom.g:15:7: ( 'ref' )
+            // InternalRoom.g:15:9: 'ref'
             {
             match("ref"); 
 
@@ -262,8 +262,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__17;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:16:7: ( 'PrimitiveType' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:16:9: 'PrimitiveType'
+            // InternalRoom.g:16:7: ( 'PrimitiveType' )
+            // InternalRoom.g:16:9: 'PrimitiveType'
             {
             match("PrimitiveType"); 
 
@@ -283,8 +283,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__18;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:17:7: ( '->' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:17:9: '->'
+            // InternalRoom.g:17:7: ( '->' )
+            // InternalRoom.g:17:9: '->'
             {
             match("->"); 
 
@@ -304,8 +304,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__19;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:18:7: ( '(' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:18:9: '('
+            // InternalRoom.g:18:7: ( '(' )
+            // InternalRoom.g:18:9: '('
             {
             match('('); 
 
@@ -324,8 +324,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__20;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:19:7: ( ')' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:19:9: ')'
+            // InternalRoom.g:19:7: ( ')' )
+            // InternalRoom.g:19:9: ')'
             {
             match(')'); 
 
@@ -344,8 +344,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__21;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:20:7: ( 'default' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:20:9: 'default'
+            // InternalRoom.g:20:7: ( 'default' )
+            // InternalRoom.g:20:9: 'default'
             {
             match("default"); 
 
@@ -365,8 +365,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__22;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:21:7: ( 'Enumeration' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:21:9: 'Enumeration'
+            // InternalRoom.g:21:7: ( 'Enumeration' )
+            // InternalRoom.g:21:9: 'Enumeration'
             {
             match("Enumeration"); 
 
@@ -386,8 +386,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__23;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:22:7: ( 'of' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:22:9: 'of'
+            // InternalRoom.g:22:7: ( 'of' )
+            // InternalRoom.g:22:9: 'of'
             {
             match("of"); 
 
@@ -407,8 +407,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__24;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:23:7: ( ',' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:23:9: ','
+            // InternalRoom.g:23:7: ( ',' )
+            // InternalRoom.g:23:9: ','
             {
             match(','); 
 
@@ -427,8 +427,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__25;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:24:7: ( '=' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:24:9: '='
+            // InternalRoom.g:24:7: ( '=' )
+            // InternalRoom.g:24:9: '='
             {
             match('='); 
 
@@ -447,8 +447,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__26;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:25:7: ( 'ExternalType' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:25:9: 'ExternalType'
+            // InternalRoom.g:25:7: ( 'ExternalType' )
+            // InternalRoom.g:25:9: 'ExternalType'
             {
             match("ExternalType"); 
 
@@ -468,8 +468,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__27;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:26:7: ( 'DataClass' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:26:9: 'DataClass'
+            // InternalRoom.g:26:7: ( 'DataClass' )
+            // InternalRoom.g:26:9: 'DataClass'
             {
             match("DataClass"); 
 
@@ -489,8 +489,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__28;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:27:7: ( 'extends' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:27:9: 'extends'
+            // InternalRoom.g:27:7: ( 'extends' )
+            // InternalRoom.g:27:9: 'extends'
             {
             match("extends"); 
 
@@ -510,8 +510,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__29;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:28:7: ( 'usercode1' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:28:9: 'usercode1'
+            // InternalRoom.g:28:7: ( 'usercode1' )
+            // InternalRoom.g:28:9: 'usercode1'
             {
             match("usercode1"); 
 
@@ -531,8 +531,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__30;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:29:7: ( 'usercode2' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:29:9: 'usercode2'
+            // InternalRoom.g:29:7: ( 'usercode2' )
+            // InternalRoom.g:29:9: 'usercode2'
             {
             match("usercode2"); 
 
@@ -552,8 +552,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__31;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:30:7: ( 'usercode3' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:30:9: 'usercode3'
+            // InternalRoom.g:30:7: ( 'usercode3' )
+            // InternalRoom.g:30:9: 'usercode3'
             {
             match("usercode3"); 
 
@@ -573,8 +573,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__32;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:31:7: ( 'Attribute' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:31:9: 'Attribute'
+            // InternalRoom.g:31:7: ( 'Attribute' )
+            // InternalRoom.g:31:9: 'Attribute'
             {
             match("Attribute"); 
 
@@ -594,8 +594,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__33;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:32:7: ( '[' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:32:9: '['
+            // InternalRoom.g:32:7: ( '[' )
+            // InternalRoom.g:32:9: '['
             {
             match('['); 
 
@@ -614,8 +614,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__34;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:33:7: ( ']' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:33:9: ']'
+            // InternalRoom.g:33:7: ( ']' )
+            // InternalRoom.g:33:9: ']'
             {
             match(']'); 
 
@@ -634,8 +634,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__35;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:34:7: ( 'override' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:34:9: 'override'
+            // InternalRoom.g:34:7: ( 'override' )
+            // InternalRoom.g:34:9: 'override'
             {
             match("override"); 
 
@@ -655,8 +655,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__36;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:35:7: ( 'Operation' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:35:9: 'Operation'
+            // InternalRoom.g:35:7: ( 'Operation' )
+            // InternalRoom.g:35:9: 'Operation'
             {
             match("Operation"); 
 
@@ -676,8 +676,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__37;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:36:7: ( 'void' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:36:9: 'void'
+            // InternalRoom.g:36:7: ( 'void' )
+            // InternalRoom.g:36:9: 'void'
             {
             match("void"); 
 
@@ -697,8 +697,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__38;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:37:7: ( 'sends' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:37:9: 'sends'
+            // InternalRoom.g:37:7: ( 'sends' )
+            // InternalRoom.g:37:9: 'sends'
             {
             match("sends"); 
 
@@ -718,8 +718,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__39;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:38:7: ( 'ctor' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:38:9: 'ctor'
+            // InternalRoom.g:38:7: ( 'ctor' )
+            // InternalRoom.g:38:9: 'ctor'
             {
             match("ctor"); 
 
@@ -739,8 +739,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__40;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:39:7: ( 'dtor' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:39:9: 'dtor'
+            // InternalRoom.g:39:7: ( 'dtor' )
+            // InternalRoom.g:39:9: 'dtor'
             {
             match("dtor"); 
 
@@ -760,8 +760,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__41;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:40:7: ( 'ProtocolClass' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:40:9: 'ProtocolClass'
+            // InternalRoom.g:40:7: ( 'ProtocolClass' )
+            // InternalRoom.g:40:9: 'ProtocolClass'
             {
             match("ProtocolClass"); 
 
@@ -781,8 +781,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__42;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:41:7: ( 'incoming' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:41:9: 'incoming'
+            // InternalRoom.g:41:7: ( 'incoming' )
+            // InternalRoom.g:41:9: 'incoming'
             {
             match("incoming"); 
 
@@ -802,8 +802,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__43;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:42:7: ( 'outgoing' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:42:9: 'outgoing'
+            // InternalRoom.g:42:7: ( 'outgoing' )
+            // InternalRoom.g:42:9: 'outgoing'
             {
             match("outgoing"); 
 
@@ -823,8 +823,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__44;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:43:7: ( 'regular' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:43:9: 'regular'
+            // InternalRoom.g:43:7: ( 'regular' )
+            // InternalRoom.g:43:9: 'regular'
             {
             match("regular"); 
 
@@ -844,8 +844,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__45;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:44:7: ( 'PortClass' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:44:9: 'PortClass'
+            // InternalRoom.g:44:7: ( 'PortClass' )
+            // InternalRoom.g:44:9: 'PortClass'
             {
             match("PortClass"); 
 
@@ -865,8 +865,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__46;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:45:7: ( 'conjugated' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:45:9: 'conjugated'
+            // InternalRoom.g:45:7: ( 'conjugated' )
+            // InternalRoom.g:45:9: 'conjugated'
             {
             match("conjugated"); 
 
@@ -886,8 +886,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__47;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:46:7: ( 'CompoundProtocolClass' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:46:9: 'CompoundProtocolClass'
+            // InternalRoom.g:46:7: ( 'CompoundProtocolClass' )
+            // InternalRoom.g:46:9: 'CompoundProtocolClass'
             {
             match("CompoundProtocolClass"); 
 
@@ -907,8 +907,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__48;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:47:7: ( 'SubProtocol' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:47:9: 'SubProtocol'
+            // InternalRoom.g:47:7: ( 'SubProtocol' )
+            // InternalRoom.g:47:9: 'SubProtocol'
             {
             match("SubProtocol"); 
 
@@ -928,8 +928,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__49;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:48:7: ( 'private' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:48:9: 'private'
+            // InternalRoom.g:48:7: ( 'private' )
+            // InternalRoom.g:48:9: 'private'
             {
             match("private"); 
 
@@ -949,8 +949,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__50;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:49:7: ( 'Message' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:49:9: 'Message'
+            // InternalRoom.g:49:7: ( 'Message' )
+            // InternalRoom.g:49:9: 'Message'
             {
             match("Message"); 
 
@@ -970,8 +970,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__51;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:50:7: ( 'usercode' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:50:9: 'usercode'
+            // InternalRoom.g:50:7: ( 'usercode' )
+            // InternalRoom.g:50:9: 'usercode'
             {
             match("usercode"); 
 
@@ -991,8 +991,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__52;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:51:7: ( 'handle' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:51:9: 'handle'
+            // InternalRoom.g:51:7: ( 'handle' )
+            // InternalRoom.g:51:9: 'handle'
             {
             match("handle"); 
 
@@ -1012,8 +1012,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__53;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:52:7: ( 'abstract' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:52:9: 'abstract'
+            // InternalRoom.g:52:7: ( 'abstract' )
+            // InternalRoom.g:52:9: 'abstract'
             {
             match("abstract"); 
 
@@ -1033,8 +1033,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__54;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:53:7: ( 'ActorClass' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:53:9: 'ActorClass'
+            // InternalRoom.g:53:7: ( 'ActorClass' )
+            // InternalRoom.g:53:9: 'ActorClass'
             {
             match("ActorClass"); 
 
@@ -1054,8 +1054,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__55;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:54:7: ( 'Interface' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:54:9: 'Interface'
+            // InternalRoom.g:54:7: ( 'Interface' )
+            // InternalRoom.g:54:9: 'Interface'
             {
             match("Interface"); 
 
@@ -1075,8 +1075,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__56;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:55:7: ( 'Structure' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:55:9: 'Structure'
+            // InternalRoom.g:55:7: ( 'Structure' )
+            // InternalRoom.g:55:9: 'Structure'
             {
             match("Structure"); 
 
@@ -1096,8 +1096,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__57;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:56:7: ( 'Behavior' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:56:9: 'Behavior'
+            // InternalRoom.g:56:7: ( 'Behavior' )
+            // InternalRoom.g:56:9: 'Behavior'
             {
             match("Behavior"); 
 
@@ -1117,8 +1117,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__58;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:57:7: ( 'Port' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:57:9: 'Port'
+            // InternalRoom.g:57:7: ( 'Port' )
+            // InternalRoom.g:57:9: 'Port'
             {
             match("Port"); 
 
@@ -1138,8 +1138,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__59;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:58:7: ( 'external' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:58:9: 'external'
+            // InternalRoom.g:58:7: ( 'external' )
+            // InternalRoom.g:58:9: 'external'
             {
             match("external"); 
 
@@ -1159,8 +1159,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__60;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:59:7: ( 'SAP' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:59:9: 'SAP'
+            // InternalRoom.g:59:7: ( 'SAP' )
+            // InternalRoom.g:59:9: 'SAP'
             {
             match("SAP"); 
 
@@ -1180,8 +1180,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__61;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:60:7: ( 'SPP' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:60:9: 'SPP'
+            // InternalRoom.g:60:7: ( 'SPP' )
+            // InternalRoom.g:60:9: 'SPP'
             {
             match("SPP"); 
 
@@ -1201,8 +1201,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__62;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:61:7: ( 'ServiceImplementation' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:61:9: 'ServiceImplementation'
+            // InternalRoom.g:61:7: ( 'ServiceImplementation' )
+            // InternalRoom.g:61:9: 'ServiceImplementation'
             {
             match("ServiceImplementation"); 
 
@@ -1222,8 +1222,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__63;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:62:7: ( 'LogicalSystem' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:62:9: 'LogicalSystem'
+            // InternalRoom.g:62:7: ( 'LogicalSystem' )
+            // InternalRoom.g:62:9: 'LogicalSystem'
             {
             match("LogicalSystem"); 
 
@@ -1243,8 +1243,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__64;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:63:7: ( 'SubSystemRef' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:63:9: 'SubSystemRef'
+            // InternalRoom.g:63:7: ( 'SubSystemRef' )
+            // InternalRoom.g:63:9: 'SubSystemRef'
             {
             match("SubSystemRef"); 
 
@@ -1264,8 +1264,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__65;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:64:7: ( 'SubSystemClass' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:64:9: 'SubSystemClass'
+            // InternalRoom.g:64:7: ( 'SubSystemClass' )
+            // InternalRoom.g:64:9: 'SubSystemClass'
             {
             match("SubSystemClass"); 
 
@@ -1285,8 +1285,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__66;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:65:7: ( 'LogicalThread' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:65:9: 'LogicalThread'
+            // InternalRoom.g:65:7: ( 'LogicalThread' )
+            // InternalRoom.g:65:9: 'LogicalThread'
             {
             match("LogicalThread"); 
 
@@ -1306,8 +1306,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__67;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:66:7: ( 'ActorInstanceMapping' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:66:9: 'ActorInstanceMapping'
+            // InternalRoom.g:66:7: ( 'ActorInstanceMapping' )
+            // InternalRoom.g:66:9: 'ActorInstanceMapping'
             {
             match("ActorInstanceMapping"); 
 
@@ -1327,8 +1327,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__68;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:67:7: ( '/' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:67:9: '/'
+            // InternalRoom.g:67:7: ( '/' )
+            // InternalRoom.g:67:9: '/'
             {
             match('/'); 
 
@@ -1347,8 +1347,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__69;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:68:7: ( 'Binding' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:68:9: 'Binding'
+            // InternalRoom.g:68:7: ( 'Binding' )
+            // InternalRoom.g:68:9: 'Binding'
             {
             match("Binding"); 
 
@@ -1368,8 +1368,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__70;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:69:7: ( 'and' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:69:9: 'and'
+            // InternalRoom.g:69:7: ( 'and' )
+            // InternalRoom.g:69:9: 'and'
             {
             match("and"); 
 
@@ -1389,8 +1389,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__71;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:70:7: ( '.' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:70:9: '.'
+            // InternalRoom.g:70:7: ( '.' )
+            // InternalRoom.g:70:9: '.'
             {
             match('.'); 
 
@@ -1409,8 +1409,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__72;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:71:7: ( 'sub' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:71:9: 'sub'
+            // InternalRoom.g:71:7: ( 'sub' )
+            // InternalRoom.g:71:9: 'sub'
             {
             match("sub"); 
 
@@ -1430,8 +1430,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__73;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:72:7: ( 'LayerConnection' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:72:9: 'LayerConnection'
+            // InternalRoom.g:72:7: ( 'LayerConnection' )
+            // InternalRoom.g:72:9: 'LayerConnection'
             {
             match("LayerConnection"); 
 
@@ -1451,8 +1451,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__74;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:73:7: ( 'satisfied_by' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:73:9: 'satisfied_by'
+            // InternalRoom.g:73:7: ( 'satisfied_by' )
+            // InternalRoom.g:73:9: 'satisfied_by'
             {
             match("satisfied_by"); 
 
@@ -1472,8 +1472,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__75;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:74:7: ( 'relay_sap' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:74:9: 'relay_sap'
+            // InternalRoom.g:74:7: ( 'relay_sap' )
+            // InternalRoom.g:74:9: 'relay_sap'
             {
             match("relay_sap"); 
 
@@ -1493,8 +1493,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__76;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:75:7: ( 'ActorRef' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:75:9: 'ActorRef'
+            // InternalRoom.g:75:7: ( 'ActorRef' )
+            // InternalRoom.g:75:9: 'ActorRef'
             {
             match("ActorRef"); 
 
@@ -1514,8 +1514,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__77;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:76:7: ( '*' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:76:9: '*'
+            // InternalRoom.g:76:7: ( '*' )
+            // InternalRoom.g:76:9: '*'
             {
             match('*'); 
 
@@ -1534,8 +1534,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__78;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:77:7: ( 'ActorBehavior' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:77:9: 'ActorBehavior'
+            // InternalRoom.g:77:7: ( 'ActorBehavior' )
+            // InternalRoom.g:77:9: 'ActorBehavior'
             {
             match("ActorBehavior"); 
 
@@ -1555,8 +1555,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__79;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:78:7: ( 'StateMachine' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:78:9: 'StateMachine'
+            // InternalRoom.g:78:7: ( 'StateMachine' )
+            // InternalRoom.g:78:9: 'StateMachine'
             {
             match("StateMachine"); 
 
@@ -1576,8 +1576,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__80;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:79:7: ( 'State' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:79:9: 'State'
+            // InternalRoom.g:79:7: ( 'State' )
+            // InternalRoom.g:79:9: 'State'
             {
             match("State"); 
 
@@ -1597,8 +1597,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__81;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:80:7: ( 'entry' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:80:9: 'entry'
+            // InternalRoom.g:80:7: ( 'entry' )
+            // InternalRoom.g:80:9: 'entry'
             {
             match("entry"); 
 
@@ -1618,8 +1618,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__82;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:81:7: ( 'exit' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:81:9: 'exit'
+            // InternalRoom.g:81:7: ( 'exit' )
+            // InternalRoom.g:81:9: 'exit'
             {
             match("exit"); 
 
@@ -1639,8 +1639,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__83;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:82:7: ( 'do' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:82:9: 'do'
+            // InternalRoom.g:82:7: ( 'do' )
+            // InternalRoom.g:82:9: 'do'
             {
             match("do"); 
 
@@ -1660,8 +1660,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__84;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:83:7: ( 'subgraph' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:83:9: 'subgraph'
+            // InternalRoom.g:83:7: ( 'subgraph' )
+            // InternalRoom.g:83:9: 'subgraph'
             {
             match("subgraph"); 
 
@@ -1681,8 +1681,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__85;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:84:7: ( 'RefinedState' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:84:9: 'RefinedState'
+            // InternalRoom.g:84:7: ( 'RefinedState' )
+            // InternalRoom.g:84:9: 'RefinedState'
             {
             match("RefinedState"); 
 
@@ -1702,8 +1702,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__86;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:85:7: ( 'handler' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:85:9: 'handler'
+            // InternalRoom.g:85:7: ( 'handler' )
+            // InternalRoom.g:85:9: 'handler'
             {
             match("handler"); 
 
@@ -1723,8 +1723,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__87;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:86:7: ( 'TransitionPoint' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:86:9: 'TransitionPoint'
+            // InternalRoom.g:86:7: ( 'TransitionPoint' )
+            // InternalRoom.g:86:9: 'TransitionPoint'
             {
             match("TransitionPoint"); 
 
@@ -1744,8 +1744,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__88;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:87:7: ( 'EntryPoint' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:87:9: 'EntryPoint'
+            // InternalRoom.g:87:7: ( 'EntryPoint' )
+            // InternalRoom.g:87:9: 'EntryPoint'
             {
             match("EntryPoint"); 
 
@@ -1765,8 +1765,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__89;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:88:7: ( 'ExitPoint' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:88:9: 'ExitPoint'
+            // InternalRoom.g:88:7: ( 'ExitPoint' )
+            // InternalRoom.g:88:9: 'ExitPoint'
             {
             match("ExitPoint"); 
 
@@ -1786,8 +1786,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__90;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:89:7: ( 'ChoicePoint' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:89:9: 'ChoicePoint'
+            // InternalRoom.g:89:7: ( 'ChoicePoint' )
+            // InternalRoom.g:89:9: 'ChoicePoint'
             {
             match("ChoicePoint"); 
 
@@ -1807,8 +1807,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__91;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:90:7: ( 'Transition' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:90:9: 'Transition'
+            // InternalRoom.g:90:7: ( 'Transition' )
+            // InternalRoom.g:90:9: 'Transition'
             {
             match("Transition"); 
 
@@ -1828,8 +1828,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__92;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:91:7: ( 'initial' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:91:9: 'initial'
+            // InternalRoom.g:91:7: ( 'initial' )
+            // InternalRoom.g:91:9: 'initial'
             {
             match("initial"); 
 
@@ -1849,8 +1849,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__93;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:92:7: ( 'action' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:92:9: 'action'
+            // InternalRoom.g:92:7: ( 'action' )
+            // InternalRoom.g:92:9: 'action'
             {
             match("action"); 
 
@@ -1870,8 +1870,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__94;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:93:7: ( 'triggers' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:93:9: 'triggers'
+            // InternalRoom.g:93:7: ( 'triggers' )
+            // InternalRoom.g:93:9: 'triggers'
             {
             match("triggers"); 
 
@@ -1891,8 +1891,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__95;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:94:7: ( 'or' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:94:9: 'or'
+            // InternalRoom.g:94:7: ( 'or' )
+            // InternalRoom.g:94:9: 'or'
             {
             match("or"); 
 
@@ -1912,8 +1912,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__96;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:95:7: ( 'guard' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:95:9: 'guard'
+            // InternalRoom.g:95:7: ( 'guard' )
+            // InternalRoom.g:95:9: 'guard'
             {
             match("guard"); 
 
@@ -1933,8 +1933,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__97;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:96:7: ( 'cond' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:96:9: 'cond'
+            // InternalRoom.g:96:7: ( 'cond' )
+            // InternalRoom.g:96:9: 'cond'
             {
             match("cond"); 
 
@@ -1954,8 +1954,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__98;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:97:7: ( 'RefinedTransition' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:97:9: 'RefinedTransition'
+            // InternalRoom.g:97:7: ( 'RefinedTransition' )
+            // InternalRoom.g:97:9: 'RefinedTransition'
             {
             match("RefinedTransition"); 
 
@@ -1975,8 +1975,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__99;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:98:7: ( 'my' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:98:9: 'my'
+            // InternalRoom.g:98:7: ( 'my' )
+            // InternalRoom.g:98:9: 'my'
             {
             match("my"); 
 
@@ -1996,8 +1996,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__100;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:99:8: ( 'cp' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:99:10: 'cp'
+            // InternalRoom.g:99:8: ( 'cp' )
+            // InternalRoom.g:99:10: 'cp'
             {
             match("cp"); 
 
@@ -2017,8 +2017,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__101;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:100:8: ( '<' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:100:10: '<'
+            // InternalRoom.g:100:8: ( '<' )
+            // InternalRoom.g:100:10: '<'
             {
             match('<'); 
 
@@ -2037,8 +2037,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__102;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:101:8: ( '|' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:101:10: '|'
+            // InternalRoom.g:101:8: ( '|' )
+            // InternalRoom.g:101:10: '|'
             {
             match('|'); 
 
@@ -2057,8 +2057,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__103;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:102:8: ( '>' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:102:10: '>'
+            // InternalRoom.g:102:8: ( '>' )
+            // InternalRoom.g:102:10: '>'
             {
             match('>'); 
 
@@ -2077,8 +2077,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__104;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:103:8: ( 'semantics' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:103:10: 'semantics'
+            // InternalRoom.g:103:8: ( 'semantics' )
+            // InternalRoom.g:103:10: 'semantics'
             {
             match("semantics"); 
 
@@ -2098,8 +2098,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__105;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:104:8: ( 'in' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:104:10: 'in'
+            // InternalRoom.g:104:8: ( 'in' )
+            // InternalRoom.g:104:10: 'in'
             {
             match("in"); 
 
@@ -2119,8 +2119,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__106;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:105:8: ( 'out' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:105:10: 'out'
+            // InternalRoom.g:105:8: ( 'out' )
+            // InternalRoom.g:105:10: 'out'
             {
             match("out"); 
 
@@ -2140,8 +2140,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__107;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:106:8: ( '@' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:106:10: '@'
+            // InternalRoom.g:106:8: ( '@' )
+            // InternalRoom.g:106:10: '@'
             {
             match('@'); 
 
@@ -2160,8 +2160,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__108;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:107:8: ( 'AnnotationType' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:107:10: 'AnnotationType'
+            // InternalRoom.g:107:8: ( 'AnnotationType' )
+            // InternalRoom.g:107:10: 'AnnotationType'
             {
             match("AnnotationType"); 
 
@@ -2181,8 +2181,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__109;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:108:8: ( 'target' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:108:10: 'target'
+            // InternalRoom.g:108:8: ( 'target' )
+            // InternalRoom.g:108:10: 'target'
             {
             match("target"); 
 
@@ -2202,8 +2202,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__110;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:109:8: ( 'optional' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:109:10: 'optional'
+            // InternalRoom.g:109:8: ( 'optional' )
+            // InternalRoom.g:109:10: 'optional'
             {
             match("optional"); 
 
@@ -2223,8 +2223,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__111;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:110:8: ( 'mandatory' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:110:10: 'mandatory'
+            // InternalRoom.g:110:8: ( 'mandatory' )
+            // InternalRoom.g:110:10: 'mandatory'
             {
             match("mandatory"); 
 
@@ -2244,8 +2244,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__112;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:111:8: ( 'attribute' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:111:10: 'attribute'
+            // InternalRoom.g:111:8: ( 'attribute' )
+            // InternalRoom.g:111:10: 'attribute'
             {
             match("attribute"); 
 
@@ -2265,8 +2265,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__113;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:112:8: ( 'import' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:112:10: 'import'
+            // InternalRoom.g:112:8: ( 'import' )
+            // InternalRoom.g:112:10: 'import'
             {
             match("import"); 
 
@@ -2286,8 +2286,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__114;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:113:8: ( 'from' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:113:10: 'from'
+            // InternalRoom.g:113:8: ( 'from' )
+            // InternalRoom.g:113:10: 'from'
             {
             match("from"); 
 
@@ -2307,8 +2307,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__115;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:114:8: ( 'model' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:114:10: 'model'
+            // InternalRoom.g:114:8: ( 'model' )
+            // InternalRoom.g:114:10: 'model'
             {
             match("model"); 
 
@@ -2328,8 +2328,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__116;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:115:8: ( '.*' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:115:10: '.*'
+            // InternalRoom.g:115:8: ( '.*' )
+            // InternalRoom.g:115:10: '.*'
             {
             match(".*"); 
 
@@ -2349,8 +2349,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__117;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:116:8: ( 'false' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:116:10: 'false'
+            // InternalRoom.g:116:8: ( 'false' )
+            // InternalRoom.g:116:10: 'false'
             {
             match("false"); 
 
@@ -2370,8 +2370,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__118;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:117:8: ( 'true' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:117:10: 'true'
+            // InternalRoom.g:117:8: ( 'true' )
+            // InternalRoom.g:117:10: 'true'
             {
             match("true"); 
 
@@ -2391,8 +2391,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__119;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:118:8: ( '+' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:118:10: '+'
+            // InternalRoom.g:118:8: ( '+' )
+            // InternalRoom.g:118:10: '+'
             {
             match('+'); 
 
@@ -2411,8 +2411,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__120;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:119:8: ( '-' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:119:10: '-'
+            // InternalRoom.g:119:8: ( '-' )
+            // InternalRoom.g:119:10: '-'
             {
             match('-'); 
 
@@ -2431,8 +2431,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__121;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:120:8: ( 'e' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:120:10: 'e'
+            // InternalRoom.g:120:8: ( 'e' )
+            // InternalRoom.g:120:10: 'e'
             {
             match('e'); 
 
@@ -2451,8 +2451,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__122;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:121:8: ( 'E' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:121:10: 'E'
+            // InternalRoom.g:121:8: ( 'E' )
+            // InternalRoom.g:121:10: 'E'
             {
             match('E'); 
 
@@ -2471,8 +2471,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__123;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:122:8: ( 'eventdriven' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:122:10: 'eventdriven'
+            // InternalRoom.g:122:8: ( 'eventdriven' )
+            // InternalRoom.g:122:10: 'eventdriven'
             {
             match("eventdriven"); 
 
@@ -2492,8 +2492,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__124;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:123:8: ( 'datadriven' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:123:10: 'datadriven'
+            // InternalRoom.g:123:8: ( 'datadriven' )
+            // InternalRoom.g:123:10: 'datadriven'
             {
             match("datadriven"); 
 
@@ -2513,8 +2513,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__125;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:124:8: ( 'sync' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:124:10: 'sync'
+            // InternalRoom.g:124:8: ( 'sync' )
+            // InternalRoom.g:124:10: 'sync'
             {
             match("sync"); 
 
@@ -2534,8 +2534,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__126;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:125:8: ( 'fixed' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:125:10: 'fixed'
+            // InternalRoom.g:125:8: ( 'fixed' )
+            // InternalRoom.g:125:10: 'fixed'
             {
             match("fixed"); 
 
@@ -2555,8 +2555,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__127;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:126:8: ( 'async' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:126:10: 'async'
+            // InternalRoom.g:126:8: ( 'async' )
+            // InternalRoom.g:126:10: 'async'
             {
             match("async"); 
 
@@ -2576,8 +2576,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__128;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:127:8: ( 'ptBoolean' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:127:10: 'ptBoolean'
+            // InternalRoom.g:127:8: ( 'ptBoolean' )
+            // InternalRoom.g:127:10: 'ptBoolean'
             {
             match("ptBoolean"); 
 
@@ -2597,8 +2597,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__129;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:128:8: ( 'ptInteger' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:128:10: 'ptInteger'
+            // InternalRoom.g:128:8: ( 'ptInteger' )
+            // InternalRoom.g:128:10: 'ptInteger'
             {
             match("ptInteger"); 
 
@@ -2618,8 +2618,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__130;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:129:8: ( 'ptReal' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:129:10: 'ptReal'
+            // InternalRoom.g:129:8: ( 'ptReal' )
+            // InternalRoom.g:129:10: 'ptReal'
             {
             match("ptReal"); 
 
@@ -2639,8 +2639,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = T__131;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:130:8: ( 'ptCharacter' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:130:10: 'ptCharacter'
+            // InternalRoom.g:130:8: ( 'ptCharacter' )
+            // InternalRoom.g:130:10: 'ptCharacter'
             {
             match("ptCharacter"); 
 
@@ -2660,10 +2660,10 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = RULE_HEX;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9144:10: ( ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+ )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9144:12: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+
+            // InternalRoom.g:9146:10: ( ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+ )
+            // InternalRoom.g:9146:12: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9144:12: ( '0x' | '0X' )
+            // InternalRoom.g:9146:12: ( '0x' | '0X' )
             int alt1=2;
             int LA1_0 = input.LA(1);
 
@@ -2691,7 +2691,7 @@ public class InternalRoomLexer extends Lexer {
             }
             switch (alt1) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9144:13: '0x'
+                    // InternalRoom.g:9146:13: '0x'
                     {
                     match("0x"); 
 
@@ -2699,7 +2699,7 @@ public class InternalRoomLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9144:18: '0X'
+                    // InternalRoom.g:9146:18: '0X'
                     {
                     match("0X"); 
 
@@ -2709,7 +2709,7 @@ public class InternalRoomLexer extends Lexer {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9144:24: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+
+            // InternalRoom.g:9146:24: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+
             int cnt2=0;
             loop2:
             do {
@@ -2723,7 +2723,7 @@ public class InternalRoomLexer extends Lexer {
 
                 switch (alt2) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:
+            	    // InternalRoom.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();
@@ -2763,10 +2763,10 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = RULE_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9146:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9146:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalRoom.g:9148:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+            // InternalRoom.g:9148:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9146:11: ( '^' )?
+            // InternalRoom.g:9148:11: ( '^' )?
             int alt3=2;
             int LA3_0 = input.LA(1);
 
@@ -2775,7 +2775,7 @@ public class InternalRoomLexer extends Lexer {
             }
             switch (alt3) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9146:11: '^'
+                    // InternalRoom.g:9148:11: '^'
                     {
                     match('^'); 
 
@@ -2793,7 +2793,7 @@ public class InternalRoomLexer extends Lexer {
                 recover(mse);
                 throw mse;}
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9146:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalRoom.g:9148:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             loop4:
             do {
                 int alt4=2;
@@ -2806,7 +2806,7 @@ public class InternalRoomLexer extends Lexer {
 
                 switch (alt4) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:
+            	    // InternalRoom.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();
@@ -2842,10 +2842,10 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = RULE_INT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9148:10: ( ( '0' .. '9' )+ )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9148:12: ( '0' .. '9' )+
+            // InternalRoom.g:9150:10: ( ( '0' .. '9' )+ )
+            // InternalRoom.g:9150:12: ( '0' .. '9' )+
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9148:12: ( '0' .. '9' )+
+            // InternalRoom.g:9150:12: ( '0' .. '9' )+
             int cnt5=0;
             loop5:
             do {
@@ -2859,7 +2859,7 @@ public class InternalRoomLexer extends Lexer {
 
                 switch (alt5) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9148:13: '0' .. '9'
+            	    // InternalRoom.g:9150:13: '0' .. '9'
             	    {
             	    matchRange('0','9'); 
 
@@ -2891,10 +2891,10 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = RULE_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9150:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9150:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalRoom.g:9152:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+            // InternalRoom.g:9152:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9150:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalRoom.g:9152:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             int alt8=2;
             int LA8_0 = input.LA(1);
 
@@ -2912,10 +2912,10 @@ public class InternalRoomLexer extends Lexer {
             }
             switch (alt8) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9150:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+                    // InternalRoom.g:9152:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
                     {
                     match('\"'); 
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9150:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+                    // InternalRoom.g:9152:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
                     loop6:
                     do {
                         int alt6=3;
@@ -2931,7 +2931,7 @@ public class InternalRoomLexer extends Lexer {
 
                         switch (alt6) {
                     	case 1 :
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9150:21: '\\\\' .
+                    	    // InternalRoom.g:9152:21: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -2939,7 +2939,7 @@ public class InternalRoomLexer extends Lexer {
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9150:28: ~ ( ( '\\\\' | '\"' ) )
+                    	    // InternalRoom.g:9152:28: ~ ( ( '\\\\' | '\"' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -2964,10 +2964,10 @@ public class InternalRoomLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9150:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+                    // InternalRoom.g:9152:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
                     {
                     match('\''); 
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9150:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+                    // InternalRoom.g:9152:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
                     loop7:
                     do {
                         int alt7=3;
@@ -2983,7 +2983,7 @@ public class InternalRoomLexer extends Lexer {
 
                         switch (alt7) {
                     	case 1 :
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9150:54: '\\\\' .
+                    	    // InternalRoom.g:9152:54: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -2991,7 +2991,7 @@ public class InternalRoomLexer extends Lexer {
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9150:61: ~ ( ( '\\\\' | '\\'' ) )
+                    	    // InternalRoom.g:9152:61: ~ ( ( '\\\\' | '\\'' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -3034,12 +3034,12 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = RULE_ML_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9152:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9152:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // InternalRoom.g:9154:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // InternalRoom.g:9154:19: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); 
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9152:24: ( options {greedy=false; } : . )*
+            // InternalRoom.g:9154:24: ( options {greedy=false; } : . )*
             loop9:
             do {
                 int alt9=2;
@@ -3064,7 +3064,7 @@ public class InternalRoomLexer extends Lexer {
 
                 switch (alt9) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9152:52: .
+            	    // InternalRoom.g:9154:52: .
             	    {
             	    matchAny(); 
 
@@ -3094,12 +3094,12 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = RULE_SL_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9154:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9154:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // InternalRoom.g:9156:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // InternalRoom.g:9156:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
             {
             match("//"); 
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9154:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            // InternalRoom.g:9156:24: (~ ( ( '\\n' | '\\r' ) ) )*
             loop10:
             do {
                 int alt10=2;
@@ -3112,7 +3112,7 @@ public class InternalRoomLexer extends Lexer {
 
                 switch (alt10) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9154:24: ~ ( ( '\\n' | '\\r' ) )
+            	    // InternalRoom.g:9156: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();
@@ -3132,7 +3132,7 @@ public class InternalRoomLexer extends Lexer {
                 }
             } while (true);
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9154:40: ( ( '\\r' )? '\\n' )?
+            // InternalRoom.g:9156:40: ( ( '\\r' )? '\\n' )?
             int alt12=2;
             int LA12_0 = input.LA(1);
 
@@ -3141,9 +3141,9 @@ public class InternalRoomLexer extends Lexer {
             }
             switch (alt12) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9154:41: ( '\\r' )? '\\n'
+                    // InternalRoom.g:9156:41: ( '\\r' )? '\\n'
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9154:41: ( '\\r' )?
+                    // InternalRoom.g:9156:41: ( '\\r' )?
                     int alt11=2;
                     int LA11_0 = input.LA(1);
 
@@ -3152,7 +3152,7 @@ public class InternalRoomLexer extends Lexer {
                     }
                     switch (alt11) {
                         case 1 :
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9154:41: '\\r'
+                            // InternalRoom.g:9156:41: '\\r'
                             {
                             match('\r'); 
 
@@ -3184,10 +3184,10 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = RULE_WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9156:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9156:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalRoom.g:9158:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // InternalRoom.g:9158:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9156:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalRoom.g:9158:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             int cnt13=0;
             loop13:
             do {
@@ -3201,7 +3201,7 @@ public class InternalRoomLexer extends Lexer {
 
                 switch (alt13) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:
+            	    // InternalRoom.g:
             	    {
             	    if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) {
             	        input.consume();
@@ -3241,8 +3241,8 @@ public class InternalRoomLexer extends Lexer {
         try {
             int _type = RULE_ANY_OTHER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9158:16: ( . )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9158:18: .
+            // InternalRoom.g:9160:16: ( . )
+            // InternalRoom.g:9160:18: .
             {
             matchAny(); 
 
@@ -3257,901 +3257,901 @@ public class InternalRoomLexer extends Lexer {
     // $ANTLR end "RULE_ANY_OTHER"
 
     public void mTokens() throws RecognitionException {
-        // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.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 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | T__85 | T__86 | T__87 | T__88 | T__89 | T__90 | T__91 | T__92 | T__93 | T__94 | T__95 | T__96 | T__97 | T__98 | T__99 | T__100 | T__101 | T__102 | T__103 | T__104 | T__105 | T__106 | T__107 | T__108 | T__109 | T__110 | T__111 | T__112 | T__113 | T__114 | T__115 | T__116 | T__117 | T__118 | T__119 | T__120 | T__121 | T__122 | T__123 | T__124 | T__125 | T__126 | T__127 | T__128 | T__129 | T__130 | T__131 | RULE_HEX | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+        // InternalRoom.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 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | T__85 | T__86 | T__87 | T__88 | T__89 | T__90 | T__91 | T__92 | T__93 | T__94 | T__95 | T__96 | T__97 | T__98 | T__99 | T__100 | T__101 | T__102 | T__103 | T__104 | T__105 | T__106 | T__107 | T__108 | T__109 | T__110 | T__111 | T__112 | T__113 | T__114 | T__115 | T__116 | T__117 | T__118 | T__119 | T__120 | T__121 | T__122 | T__123 | T__124 | T__125 | T__126 | T__127 | T__128 | T__129 | T__130 | T__131 | RULE_HEX | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
         int alt14=128;
         alt14 = dfa14.predict(input);
         switch (alt14) {
             case 1 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:10: T__12
+                // InternalRoom.g:1:10: T__12
                 {
                 mT__12(); 
 
                 }
                 break;
             case 2 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:16: T__13
+                // InternalRoom.g:1:16: T__13
                 {
                 mT__13(); 
 
                 }
                 break;
             case 3 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:22: T__14
+                // InternalRoom.g:1:22: T__14
                 {
                 mT__14(); 
 
                 }
                 break;
             case 4 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:28: T__15
+                // InternalRoom.g:1:28: T__15
                 {
                 mT__15(); 
 
                 }
                 break;
             case 5 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:34: T__16
+                // InternalRoom.g:1:34: T__16
                 {
                 mT__16(); 
 
                 }
                 break;
             case 6 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:40: T__17
+                // InternalRoom.g:1:40: T__17
                 {
                 mT__17(); 
 
                 }
                 break;
             case 7 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:46: T__18
+                // InternalRoom.g:1:46: T__18
                 {
                 mT__18(); 
 
                 }
                 break;
             case 8 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:52: T__19
+                // InternalRoom.g:1:52: T__19
                 {
                 mT__19(); 
 
                 }
                 break;
             case 9 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:58: T__20
+                // InternalRoom.g:1:58: T__20
                 {
                 mT__20(); 
 
                 }
                 break;
             case 10 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:64: T__21
+                // InternalRoom.g:1:64: T__21
                 {
                 mT__21(); 
 
                 }
                 break;
             case 11 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:70: T__22
+                // InternalRoom.g:1:70: T__22
                 {
                 mT__22(); 
 
                 }
                 break;
             case 12 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:76: T__23
+                // InternalRoom.g:1:76: T__23
                 {
                 mT__23(); 
 
                 }
                 break;
             case 13 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:82: T__24
+                // InternalRoom.g:1:82: T__24
                 {
                 mT__24(); 
 
                 }
                 break;
             case 14 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:88: T__25
+                // InternalRoom.g:1:88: T__25
                 {
                 mT__25(); 
 
                 }
                 break;
             case 15 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:94: T__26
+                // InternalRoom.g:1:94: T__26
                 {
                 mT__26(); 
 
                 }
                 break;
             case 16 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:100: T__27
+                // InternalRoom.g:1:100: T__27
                 {
                 mT__27(); 
 
                 }
                 break;
             case 17 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:106: T__28
+                // InternalRoom.g:1:106: T__28
                 {
                 mT__28(); 
 
                 }
                 break;
             case 18 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:112: T__29
+                // InternalRoom.g:1:112: T__29
                 {
                 mT__29(); 
 
                 }
                 break;
             case 19 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:118: T__30
+                // InternalRoom.g:1:118: T__30
                 {
                 mT__30(); 
 
                 }
                 break;
             case 20 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:124: T__31
+                // InternalRoom.g:1:124: T__31
                 {
                 mT__31(); 
 
                 }
                 break;
             case 21 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:130: T__32
+                // InternalRoom.g:1:130: T__32
                 {
                 mT__32(); 
 
                 }
                 break;
             case 22 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:136: T__33
+                // InternalRoom.g:1:136: T__33
                 {
                 mT__33(); 
 
                 }
                 break;
             case 23 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:142: T__34
+                // InternalRoom.g:1:142: T__34
                 {
                 mT__34(); 
 
                 }
                 break;
             case 24 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:148: T__35
+                // InternalRoom.g:1:148: T__35
                 {
                 mT__35(); 
 
                 }
                 break;
             case 25 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:154: T__36
+                // InternalRoom.g:1:154: T__36
                 {
                 mT__36(); 
 
                 }
                 break;
             case 26 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:160: T__37
+                // InternalRoom.g:1:160: T__37
                 {
                 mT__37(); 
 
                 }
                 break;
             case 27 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:166: T__38
+                // InternalRoom.g:1:166: T__38
                 {
                 mT__38(); 
 
                 }
                 break;
             case 28 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:172: T__39
+                // InternalRoom.g:1:172: T__39
                 {
                 mT__39(); 
 
                 }
                 break;
             case 29 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:178: T__40
+                // InternalRoom.g:1:178: T__40
                 {
                 mT__40(); 
 
                 }
                 break;
             case 30 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:184: T__41
+                // InternalRoom.g:1:184: T__41
                 {
                 mT__41(); 
 
                 }
                 break;
             case 31 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:190: T__42
+                // InternalRoom.g:1:190: T__42
                 {
                 mT__42(); 
 
                 }
                 break;
             case 32 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:196: T__43
+                // InternalRoom.g:1:196: T__43
                 {
                 mT__43(); 
 
                 }
                 break;
             case 33 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:202: T__44
+                // InternalRoom.g:1:202: T__44
                 {
                 mT__44(); 
 
                 }
                 break;
             case 34 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:208: T__45
+                // InternalRoom.g:1:208: T__45
                 {
                 mT__45(); 
 
                 }
                 break;
             case 35 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:214: T__46
+                // InternalRoom.g:1:214: T__46
                 {
                 mT__46(); 
 
                 }
                 break;
             case 36 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:220: T__47
+                // InternalRoom.g:1:220: T__47
                 {
                 mT__47(); 
 
                 }
                 break;
             case 37 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:226: T__48
+                // InternalRoom.g:1:226: T__48
                 {
                 mT__48(); 
 
                 }
                 break;
             case 38 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:232: T__49
+                // InternalRoom.g:1:232: T__49
                 {
                 mT__49(); 
 
                 }
                 break;
             case 39 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:238: T__50
+                // InternalRoom.g:1:238: T__50
                 {
                 mT__50(); 
 
                 }
                 break;
             case 40 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:244: T__51
+                // InternalRoom.g:1:244: T__51
                 {
                 mT__51(); 
 
                 }
                 break;
             case 41 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:250: T__52
+                // InternalRoom.g:1:250: T__52
                 {
                 mT__52(); 
 
                 }
                 break;
             case 42 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:256: T__53
+                // InternalRoom.g:1:256: T__53
                 {
                 mT__53(); 
 
                 }
                 break;
             case 43 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:262: T__54
+                // InternalRoom.g:1:262: T__54
                 {
                 mT__54(); 
 
                 }
                 break;
             case 44 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:268: T__55
+                // InternalRoom.g:1:268: T__55
                 {
                 mT__55(); 
 
                 }
                 break;
             case 45 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:274: T__56
+                // InternalRoom.g:1:274: T__56
                 {
                 mT__56(); 
 
                 }
                 break;
             case 46 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:280: T__57
+                // InternalRoom.g:1:280: T__57
                 {
                 mT__57(); 
 
                 }
                 break;
             case 47 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:286: T__58
+                // InternalRoom.g:1:286: T__58
                 {
                 mT__58(); 
 
                 }
                 break;
             case 48 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:292: T__59
+                // InternalRoom.g:1:292: T__59
                 {
                 mT__59(); 
 
                 }
                 break;
             case 49 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:298: T__60
+                // InternalRoom.g:1:298: T__60
                 {
                 mT__60(); 
 
                 }
                 break;
             case 50 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:304: T__61
+                // InternalRoom.g:1:304: T__61
                 {
                 mT__61(); 
 
                 }
                 break;
             case 51 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:310: T__62
+                // InternalRoom.g:1:310: T__62
                 {
                 mT__62(); 
 
                 }
                 break;
             case 52 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:316: T__63
+                // InternalRoom.g:1:316: T__63
                 {
                 mT__63(); 
 
                 }
                 break;
             case 53 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:322: T__64
+                // InternalRoom.g:1:322: T__64
                 {
                 mT__64(); 
 
                 }
                 break;
             case 54 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:328: T__65
+                // InternalRoom.g:1:328: T__65
                 {
                 mT__65(); 
 
                 }
                 break;
             case 55 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:334: T__66
+                // InternalRoom.g:1:334: T__66
                 {
                 mT__66(); 
 
                 }
                 break;
             case 56 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:340: T__67
+                // InternalRoom.g:1:340: T__67
                 {
                 mT__67(); 
 
                 }
                 break;
             case 57 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:346: T__68
+                // InternalRoom.g:1:346: T__68
                 {
                 mT__68(); 
 
                 }
                 break;
             case 58 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:352: T__69
+                // InternalRoom.g:1:352: T__69
                 {
                 mT__69(); 
 
                 }
                 break;
             case 59 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:358: T__70
+                // InternalRoom.g:1:358: T__70
                 {
                 mT__70(); 
 
                 }
                 break;
             case 60 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:364: T__71
+                // InternalRoom.g:1:364: T__71
                 {
                 mT__71(); 
 
                 }
                 break;
             case 61 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:370: T__72
+                // InternalRoom.g:1:370: T__72
                 {
                 mT__72(); 
 
                 }
                 break;
             case 62 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:376: T__73
+                // InternalRoom.g:1:376: T__73
                 {
                 mT__73(); 
 
                 }
                 break;
             case 63 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:382: T__74
+                // InternalRoom.g:1:382: T__74
                 {
                 mT__74(); 
 
                 }
                 break;
             case 64 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:388: T__75
+                // InternalRoom.g:1:388: T__75
                 {
                 mT__75(); 
 
                 }
                 break;
             case 65 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:394: T__76
+                // InternalRoom.g:1:394: T__76
                 {
                 mT__76(); 
 
                 }
                 break;
             case 66 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:400: T__77
+                // InternalRoom.g:1:400: T__77
                 {
                 mT__77(); 
 
                 }
                 break;
             case 67 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:406: T__78
+                // InternalRoom.g:1:406: T__78
                 {
                 mT__78(); 
 
                 }
                 break;
             case 68 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:412: T__79
+                // InternalRoom.g:1:412: T__79
                 {
                 mT__79(); 
 
                 }
                 break;
             case 69 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:418: T__80
+                // InternalRoom.g:1:418: T__80
                 {
                 mT__80(); 
 
                 }
                 break;
             case 70 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:424: T__81
+                // InternalRoom.g:1:424: T__81
                 {
                 mT__81(); 
 
                 }
                 break;
             case 71 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:430: T__82
+                // InternalRoom.g:1:430: T__82
                 {
                 mT__82(); 
 
                 }
                 break;
             case 72 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:436: T__83
+                // InternalRoom.g:1:436: T__83
                 {
                 mT__83(); 
 
                 }
                 break;
             case 73 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:442: T__84
+                // InternalRoom.g:1:442: T__84
                 {
                 mT__84(); 
 
                 }
                 break;
             case 74 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:448: T__85
+                // InternalRoom.g:1:448: T__85
                 {
                 mT__85(); 
 
                 }
                 break;
             case 75 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:454: T__86
+                // InternalRoom.g:1:454: T__86
                 {
                 mT__86(); 
 
                 }
                 break;
             case 76 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:460: T__87
+                // InternalRoom.g:1:460: T__87
                 {
                 mT__87(); 
 
                 }
                 break;
             case 77 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:466: T__88
+                // InternalRoom.g:1:466: T__88
                 {
                 mT__88(); 
 
                 }
                 break;
             case 78 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:472: T__89
+                // InternalRoom.g:1:472: T__89
                 {
                 mT__89(); 
 
                 }
                 break;
             case 79 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:478: T__90
+                // InternalRoom.g:1:478: T__90
                 {
                 mT__90(); 
 
                 }
                 break;
             case 80 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:484: T__91
+                // InternalRoom.g:1:484: T__91
                 {
                 mT__91(); 
 
                 }
                 break;
             case 81 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:490: T__92
+                // InternalRoom.g:1:490: T__92
                 {
                 mT__92(); 
 
                 }
                 break;
             case 82 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:496: T__93
+                // InternalRoom.g:1:496: T__93
                 {
                 mT__93(); 
 
                 }
                 break;
             case 83 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:502: T__94
+                // InternalRoom.g:1:502: T__94
                 {
                 mT__94(); 
 
                 }
                 break;
             case 84 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:508: T__95
+                // InternalRoom.g:1:508: T__95
                 {
                 mT__95(); 
 
                 }
                 break;
             case 85 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:514: T__96
+                // InternalRoom.g:1:514: T__96
                 {
                 mT__96(); 
 
                 }
                 break;
             case 86 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:520: T__97
+                // InternalRoom.g:1:520: T__97
                 {
                 mT__97(); 
 
                 }
                 break;
             case 87 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:526: T__98
+                // InternalRoom.g:1:526: T__98
                 {
                 mT__98(); 
 
                 }
                 break;
             case 88 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:532: T__99
+                // InternalRoom.g:1:532: T__99
                 {
                 mT__99(); 
 
                 }
                 break;
             case 89 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:538: T__100
+                // InternalRoom.g:1:538: T__100
                 {
                 mT__100(); 
 
                 }
                 break;
             case 90 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:545: T__101
+                // InternalRoom.g:1:545: T__101
                 {
                 mT__101(); 
 
                 }
                 break;
             case 91 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:552: T__102
+                // InternalRoom.g:1:552: T__102
                 {
                 mT__102(); 
 
                 }
                 break;
             case 92 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:559: T__103
+                // InternalRoom.g:1:559: T__103
                 {
                 mT__103(); 
 
                 }
                 break;
             case 93 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:566: T__104
+                // InternalRoom.g:1:566: T__104
                 {
                 mT__104(); 
 
                 }
                 break;
             case 94 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:573: T__105
+                // InternalRoom.g:1:573: T__105
                 {
                 mT__105(); 
 
                 }
                 break;
             case 95 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:580: T__106
+                // InternalRoom.g:1:580: T__106
                 {
                 mT__106(); 
 
                 }
                 break;
             case 96 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:587: T__107
+                // InternalRoom.g:1:587: T__107
                 {
                 mT__107(); 
 
                 }
                 break;
             case 97 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:594: T__108
+                // InternalRoom.g:1:594: T__108
                 {
                 mT__108(); 
 
                 }
                 break;
             case 98 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:601: T__109
+                // InternalRoom.g:1:601: T__109
                 {
                 mT__109(); 
 
                 }
                 break;
             case 99 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:608: T__110
+                // InternalRoom.g:1:608: T__110
                 {
                 mT__110(); 
 
                 }
                 break;
             case 100 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:615: T__111
+                // InternalRoom.g:1:615: T__111
                 {
                 mT__111(); 
 
                 }
                 break;
             case 101 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:622: T__112
+                // InternalRoom.g:1:622: T__112
                 {
                 mT__112(); 
 
                 }
                 break;
             case 102 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:629: T__113
+                // InternalRoom.g:1:629: T__113
                 {
                 mT__113(); 
 
                 }
                 break;
             case 103 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:636: T__114
+                // InternalRoom.g:1:636: T__114
                 {
                 mT__114(); 
 
                 }
                 break;
             case 104 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:643: T__115
+                // InternalRoom.g:1:643: T__115
                 {
                 mT__115(); 
 
                 }
                 break;
             case 105 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:650: T__116
+                // InternalRoom.g:1:650: T__116
                 {
                 mT__116(); 
 
                 }
                 break;
             case 106 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:657: T__117
+                // InternalRoom.g:1:657: T__117
                 {
                 mT__117(); 
 
                 }
                 break;
             case 107 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:664: T__118
+                // InternalRoom.g:1:664: T__118
                 {
                 mT__118(); 
 
                 }
                 break;
             case 108 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:671: T__119
+                // InternalRoom.g:1:671: T__119
                 {
                 mT__119(); 
 
                 }
                 break;
             case 109 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:678: T__120
+                // InternalRoom.g:1:678: T__120
                 {
                 mT__120(); 
 
                 }
                 break;
             case 110 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:685: T__121
+                // InternalRoom.g:1:685: T__121
                 {
                 mT__121(); 
 
                 }
                 break;
             case 111 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:692: T__122
+                // InternalRoom.g:1:692: T__122
                 {
                 mT__122(); 
 
                 }
                 break;
             case 112 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:699: T__123
+                // InternalRoom.g:1:699: T__123
                 {
                 mT__123(); 
 
                 }
                 break;
             case 113 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:706: T__124
+                // InternalRoom.g:1:706: T__124
                 {
                 mT__124(); 
 
                 }
                 break;
             case 114 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:713: T__125
+                // InternalRoom.g:1:713: T__125
                 {
                 mT__125(); 
 
                 }
                 break;
             case 115 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:720: T__126
+                // InternalRoom.g:1:720: T__126
                 {
                 mT__126(); 
 
                 }
                 break;
             case 116 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:727: T__127
+                // InternalRoom.g:1:727: T__127
                 {
                 mT__127(); 
 
                 }
                 break;
             case 117 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:734: T__128
+                // InternalRoom.g:1:734: T__128
                 {
                 mT__128(); 
 
                 }
                 break;
             case 118 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:741: T__129
+                // InternalRoom.g:1:741: T__129
                 {
                 mT__129(); 
 
                 }
                 break;
             case 119 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:748: T__130
+                // InternalRoom.g:1:748: T__130
                 {
                 mT__130(); 
 
                 }
                 break;
             case 120 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:755: T__131
+                // InternalRoom.g:1:755: T__131
                 {
                 mT__131(); 
 
                 }
                 break;
             case 121 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:762: RULE_HEX
+                // InternalRoom.g:1:762: RULE_HEX
                 {
                 mRULE_HEX(); 
 
                 }
                 break;
             case 122 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:771: RULE_ID
+                // InternalRoom.g:1:771: RULE_ID
                 {
                 mRULE_ID(); 
 
                 }
                 break;
             case 123 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:779: RULE_INT
+                // InternalRoom.g:1:779: RULE_INT
                 {
                 mRULE_INT(); 
 
                 }
                 break;
             case 124 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:788: RULE_STRING
+                // InternalRoom.g:1:788: RULE_STRING
                 {
                 mRULE_STRING(); 
 
                 }
                 break;
             case 125 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:800: RULE_ML_COMMENT
+                // InternalRoom.g:1:800: RULE_ML_COMMENT
                 {
                 mRULE_ML_COMMENT(); 
 
                 }
                 break;
             case 126 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:816: RULE_SL_COMMENT
+                // InternalRoom.g:1:816: RULE_SL_COMMENT
                 {
                 mRULE_SL_COMMENT(); 
 
                 }
                 break;
             case 127 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:832: RULE_WS
+                // InternalRoom.g:1:832: RULE_WS
                 {
                 mRULE_WS(); 
 
                 }
                 break;
             case 128 :
-                // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1:840: RULE_ANY_OTHER
+                // InternalRoom.g:1:840: RULE_ANY_OTHER
                 {
                 mRULE_ANY_OTHER(); 
 
@@ -4165,218 +4165,19 @@ public class InternalRoomLexer extends Lexer {
 
     protected DFA14 dfa14 = new DFA14(this);
     static final String DFA14_eotS =
-        "\1\uffff\1\72\3\uffff\2\72\1\102\2\uffff\1\72\1\113\1\72\2\uffff"+
-        "\1\72\1\127\2\72\2\uffff\16\72\1\u0080\1\u0082\1\uffff\4\72\4\uffff"+
-        "\1\72\1\uffff\1\u0094\1\67\2\uffff\2\67\2\uffff\2\72\4\uffff\3\72"+
-        "\4\uffff\2\72\1\u00a1\3\72\1\uffff\1\u00a7\2\72\1\u00aa\1\72\2\uffff"+
-        "\4\72\1\uffff\4\72\2\uffff\10\72\1\u00be\1\u00c1\26\72\6\uffff\4"+
-        "\72\1\u00e1\2\72\4\uffff\3\72\5\uffff\2\72\1\u00e9\7\72\1\uffff"+
-        "\5\72\1\uffff\1\72\1\u00f8\1\uffff\16\72\1\u0108\4\72\1\uffff\2"+
-        "\72\1\uffff\6\72\1\u0117\1\u0118\11\72\1\u0122\15\72\1\uffff\7\72"+
-        "\1\uffff\4\72\1\u013c\1\72\1\u013e\7\72\1\uffff\3\72\1\u014a\7\72"+
-        "\1\u0152\3\72\1\uffff\1\72\1\u0157\1\u0158\1\72\1\u015a\11\72\2"+
-        "\uffff\11\72\1\uffff\12\72\1\u0177\4\72\1\u017c\11\72\1\uffff\1"+
-        "\72\1\uffff\13\72\1\uffff\1\u0192\6\72\1\uffff\1\u019c\3\72\2\uffff"+
-        "\1\72\1\uffff\10\72\1\u01aa\13\72\1\u01b6\7\72\1\uffff\1\72\1\u01bf"+
-        "\1\72\1\u01c1\1\uffff\1\u01c2\1\u01c3\23\72\1\uffff\11\72\1\uffff"+
-        "\6\72\1\u01e6\6\72\1\uffff\4\72\1\u01f1\2\72\1\u01f5\1\72\1\u01f7"+
-        "\1\72\1\uffff\7\72\1\u0200\1\uffff\1\72\3\uffff\2\72\1\u0205\4\72"+
-        "\1\u020a\11\72\1\u0214\17\72\1\u0224\1\uffff\7\72\1\u022c\2\72\1"+
-        "\uffff\1\72\1\u0230\1\u0231\1\uffff\1\72\1\uffff\3\72\1\u0236\4"+
-        "\72\1\uffff\4\72\1\uffff\4\72\1\uffff\5\72\1\u0249\1\u024a\1\u024b"+
-        "\1\72\1\uffff\1\u024d\1\72\1\u0252\3\72\1\u0256\4\72\1\u025b\2\72"+
-        "\1\u025e\1\uffff\7\72\1\uffff\3\72\2\uffff\1\u0269\2\72\1\u026c"+
-        "\1\uffff\4\72\1\u0271\1\72\1\u0273\2\72\1\u0276\2\72\1\u0279\4\72"+
-        "\1\u027e\3\uffff\1\u027f\1\uffff\1\72\1\u0281\1\u0282\1\u0283\1"+
-        "\uffff\1\u0284\2\72\1\uffff\2\72\1\u0289\1\u028a\1\uffff\2\72\1"+
-        "\uffff\4\72\1\u0292\2\72\1\u0295\1\u0296\1\72\1\uffff\1\u0298\1"+
-        "\u0299\1\uffff\4\72\1\uffff\1\u029e\1\uffff\2\72\1\uffff\2\72\1"+
-        "\uffff\1\u02a3\1\72\1\u02a5\1\72\2\uffff\1\72\4\uffff\1\u02a8\3"+
-        "\72\2\uffff\1\72\1\u02ad\5\72\1\uffff\2\72\2\uffff\1\72\2\uffff"+
-        "\3\72\1\u02ba\1\uffff\4\72\1\uffff\1\u02bf\1\uffff\1\72\1\u02c1"+
-        "\1\uffff\4\72\1\uffff\1\72\1\u02c7\1\u02c8\4\72\1\u02cd\4\72\1\uffff"+
-        "\1\u02d2\3\72\1\uffff\1\u02d6\1\uffff\3\72\1\u02da\1\72\2\uffff"+
-        "\1\u02dc\1\72\1\u02de\1\72\1\uffff\4\72\1\uffff\1\72\1\u02e5\1\u02e6"+
-        "\1\uffff\1\72\1\u02e8\1\72\1\uffff\1\72\1\uffff\1\72\1\uffff\1\72"+
-        "\1\u02ed\1\u02ee\3\72\2\uffff\1\72\1\uffff\1\u02f3\1\72\1\u02f5"+
-        "\1\72\2\uffff\4\72\1\uffff\1\72\1\uffff\1\72\1\u02fd\1\u02fe\4\72"+
-        "\2\uffff\1\u0303\3\72\1\uffff\6\72\1\u030d\2\72\1\uffff\1\u0310"+
-        "\1\u0311\2\uffff";
+        "\1\uffff\1\72\3\uffff\2\72\1\102\2\uffff\1\72\1\113\1\72\2\uffff\1\72\1\127\2\72\2\uffff\16\72\1\u0080\1\u0082\1\uffff\4\72\4\uffff\1\72\1\uffff\1\u0094\1\67\2\uffff\2\67\2\uffff\2\72\4\uffff\3\72\4\uffff\2\72\1\u00a1\3\72\1\uffff\1\u00a7\2\72\1\u00aa\1\72\2\uffff\4\72\1\uffff\4\72\2\uffff\10\72\1\u00be\1\u00c1\26\72\6\uffff\4\72\1\u00e1\2\72\4\uffff\3\72\5\uffff\2\72\1\u00e9\7\72\1\uffff\5\72\1\uffff\1\72\1\u00f8\1\uffff\16\72\1\u0108\4\72\1\uffff\2\72\1\uffff\6\72\1\u0117\1\u0118\11\72\1\u0122\15\72\1\uffff\7\72\1\uffff\4\72\1\u013c\1\72\1\u013e\7\72\1\uffff\3\72\1\u014a\7\72\1\u0152\3\72\1\uffff\1\72\1\u0157\1\u0158\1\72\1\u015a\11\72\2\uffff\11\72\1\uffff\12\72\1\u0177\4\72\1\u017c\11\72\1\uffff\1\72\1\uffff\13\72\1\uffff\1\u0192\6\72\1\uffff\1\u019c\3\72\2\uffff\1\72\1\uffff\10\72\1\u01aa\13\72\1\u01b6\7\72\1\uffff\1\72\1\u01bf\1\72\1\u01c1\1\uffff\1\u01c2\1\u01c3\23\72\1\uffff\11\72\1\uffff\6\72\1\u01e6\6\72\1\uffff\4\72\1\u01f1\2\72\1\u01f5\1\72\1\u01f7\1\72\1\uffff\7\72\1\u0200\1\uffff\1\72\3\uffff\2\72\1\u0205\4\72\1\u020a\11\72\1\u0214\17\72\1\u0224\1\uffff\7\72\1\u022c\2\72\1\uffff\1\72\1\u0230\1\u0231\1\uffff\1\72\1\uffff\3\72\1\u0236\4\72\1\uffff\4\72\1\uffff\4\72\1\uffff\5\72\1\u0249\1\u024a\1\u024b\1\72\1\uffff\1\u024d\1\72\1\u0252\3\72\1\u0256\4\72\1\u025b\2\72\1\u025e\1\uffff\7\72\1\uffff\3\72\2\uffff\1\u0269\2\72\1\u026c\1\uffff\4\72\1\u0271\1\72\1\u0273\2\72\1\u0276\2\72\1\u0279\4\72\1\u027e\3\uffff\1\u027f\1\uffff\1\72\1\u0281\1\u0282\1\u0283\1\uffff\1\u0284\2\72\1\uffff\2\72\1\u0289\1\u028a\1\uffff\2\72\1\uffff\4\72\1\u0292\2\72\1\u0295\1\u0296\1\72\1\uffff\1\u0298\1\u0299\1\uffff\4\72\1\uffff\1\u029e\1\uffff\2\72\1\uffff\2\72\1\uffff\1\u02a3\1\72\1\u02a5\1\72\2\uffff\1\72\4\uffff\1\u02a8\3\72\2\uffff\1\72\1\u02ad\5\72\1\uffff\2\72\2\uffff\1\72\2\uffff\3\72\1\u02ba\1\uffff\4\72\1\uffff\1\u02bf\1\uffff\1\72\1\u02c1\1\uffff\4\72\1\uffff\1\72\1\u02c7\1\u02c8\4\72\1\u02cd\4\72\1\uffff\1\u02d2\3\72\1\uffff\1\u02d6\1\uffff\3\72\1\u02da\1\72\2\uffff\1\u02dc\1\72\1\u02de\1\72\1\uffff\4\72\1\uffff\1\72\1\u02e5\1\u02e6\1\uffff\1\72\1\u02e8\1\72\1\uffff\1\72\1\uffff\1\72\1\uffff\1\72\1\u02ed\1\u02ee\3\72\2\uffff\1\72\1\uffff\1\u02f3\1\72\1\u02f5\1\72\2\uffff\4\72\1\uffff\1\72\1\uffff\1\72\1\u02fd\1\u02fe\4\72\2\uffff\1\u0303\3\72\1\uffff\6\72\1\u030d\2\72\1\uffff\1\u0310\1\u0311\2\uffff";
     static final String DFA14_eofS =
         "\u0312\uffff";
     static final String DFA14_minS =
-        "\1\0\1\145\3\uffff\1\145\1\157\1\76\2\uffff\1\141\1\60\1\146\2"+
-        "\uffff\1\141\1\60\1\163\1\143\2\uffff\1\160\1\157\1\141\1\157\1"+
-        "\155\1\150\1\101\1\162\1\145\1\141\1\142\1\156\1\145\1\141\2\52"+
-        "\1\uffff\1\162\1\141\1\165\1\141\4\uffff\1\141\1\uffff\1\130\1\101"+
-        "\2\uffff\2\0\2\uffff\1\157\1\146\4\uffff\1\146\1\151\1\162\4\uffff"+
-        "\1\146\1\157\1\60\2\164\1\151\1\uffff\1\60\1\145\1\164\1\60\1\164"+
-        "\2\uffff\1\164\1\151\1\164\1\145\1\uffff\1\145\2\164\1\156\2\uffff"+
-        "\1\145\1\151\1\155\1\142\1\164\1\156\1\157\1\156\2\60\1\160\1\155"+
-        "\1\157\1\142\1\141\2\120\1\162\1\151\1\102\1\163\1\156\1\163\1\144"+
-        "\2\164\1\171\1\164\1\150\1\156\1\147\1\171\6\uffff\1\141\1\151\1"+
-        "\162\1\141\1\60\1\156\1\144\4\uffff\1\157\1\154\1\170\5\uffff\1"+
-        "\155\1\151\1\60\1\165\1\141\1\155\2\164\1\141\1\162\1\uffff\1\141"+
-        "\1\155\1\162\1\145\1\164\1\uffff\1\162\1\60\1\uffff\1\151\1\141"+
-        "\1\145\1\164\1\162\1\156\2\162\2\157\1\162\2\144\1\141\1\60\1\151"+
-        "\1\143\1\162\1\144\1\uffff\1\157\1\164\1\uffff\1\157\1\160\1\151"+
-        "\1\120\1\165\1\164\2\60\2\166\1\157\1\156\1\145\1\150\1\163\1\144"+
-        "\1\164\1\60\1\151\1\162\1\156\1\145\1\141\1\144\1\151\1\145\1\156"+
-        "\1\147\1\145\1\147\1\162\1\uffff\1\144\1\145\1\155\1\163\1\145\1"+
-        "\115\1\156\1\uffff\1\154\1\171\1\151\1\157\1\60\1\165\1\60\1\144"+
-        "\1\145\1\171\1\162\1\120\1\162\1\157\1\uffff\1\157\1\103\1\156\1"+
-        "\60\1\171\1\164\1\143\1\151\1\162\1\164\1\141\1\60\1\163\1\156\1"+
-        "\162\1\uffff\1\163\2\60\1\165\1\60\1\155\1\151\1\162\1\157\1\143"+
-        "\1\162\1\171\1\143\1\145\2\uffff\1\151\1\141\1\157\1\164\3\141\1"+
-        "\154\1\162\1\uffff\1\157\1\151\1\143\1\162\1\166\1\151\1\143\1\162"+
-        "\1\163\1\147\1\60\1\145\1\144\1\141\1\154\1\60\1\145\1\144\1\157"+
-        "\1\145\1\141\1\137\1\164\1\143\1\154\1\uffff\1\154\1\uffff\2\162"+
-        "\1\120\1\156\1\157\2\151\1\156\1\154\1\144\1\156\1\uffff\1\60\1"+
-        "\144\1\157\1\142\1\102\1\141\1\164\1\uffff\1\60\1\164\1\141\1\146"+
-        "\2\uffff\1\147\1\uffff\1\151\1\141\1\164\1\165\1\145\1\157\1\163"+
-        "\1\164\1\60\1\143\1\164\1\154\1\145\1\154\1\162\1\147\1\145\1\141"+
-        "\1\156\1\142\1\60\1\146\1\151\1\156\1\141\1\103\1\151\1\145\1\uffff"+
-        "\1\164\1\60\1\164\1\60\1\uffff\2\60\2\144\1\162\1\163\1\151\1\157"+
-        "\1\141\1\164\1\151\1\141\1\157\1\141\1\151\1\144\1\156\2\141\1\163"+
-        "\1\141\1\uffff\1\162\1\144\1\165\1\154\1\156\2\145\1\164\1\151\1"+
-        "\uffff\1\151\1\160\1\151\1\141\1\156\1\154\1\60\1\156\1\120\2\164"+
-        "\1\165\1\141\1\uffff\3\145\1\147\1\60\1\141\1\145\1\60\1\143\1\60"+
-        "\1\165\1\uffff\1\141\1\157\1\147\1\154\1\157\1\164\1\162\1\60\1"+
-        "\uffff\1\157\3\uffff\1\145\1\123\1\60\1\141\1\166\1\154\1\163\1"+
-        "\60\1\166\1\164\1\151\1\154\1\156\1\145\1\147\1\154\1\163\1\60\1"+
-        "\154\1\151\1\145\1\164\1\141\1\163\1\146\1\150\1\151\1\157\1\143"+
-        "\1\150\1\145\1\164\1\147\1\60\1\uffff\1\144\2\157\1\145\1\162\1"+
-        "\143\1\111\1\60\1\141\1\145\1\uffff\1\143\2\60\1\uffff\1\164\1\uffff"+
-        "\1\164\1\143\1\162\1\60\1\123\1\156\1\151\1\163\1\uffff\1\162\1"+
-        "\154\1\164\1\162\1\uffff\1\160\1\145\1\103\1\163\1\uffff\1\145\1"+
-        "\151\1\156\1\124\1\164\3\60\1\163\1\uffff\1\60\1\166\1\60\1\145"+
-        "\1\163\1\164\1\60\1\141\1\157\1\156\1\163\1\60\1\144\1\145\1\60"+
-        "\1\uffff\1\120\1\151\1\143\1\155\1\145\1\150\1\155\1\uffff\1\156"+
-        "\1\162\1\164\2\uffff\1\60\2\145\1\60\1\uffff\1\171\1\150\1\156\1"+
-        "\157\1\60\1\171\1\60\2\141\1\60\1\124\1\154\1\60\1\156\1\157\1\164"+
-        "\1\171\1\60\3\uffff\1\60\1\uffff\1\145\3\60\1\uffff\1\60\1\163\1"+
-        "\141\1\uffff\1\166\1\156\2\60\1\uffff\1\137\1\144\1\uffff\1\162"+
-        "\1\156\1\157\1\103\1\60\1\151\1\160\2\60\1\145\1\uffff\2\60\1\uffff"+
-        "\1\163\1\162\1\145\1\156\1\uffff\1\60\1\uffff\1\164\1\156\1\uffff"+
-        "\1\171\1\141\1\uffff\1\60\1\156\1\60\1\160\2\uffff\1\156\4\uffff"+
-        "\1\60\1\156\1\151\1\124\2\uffff\1\142\1\60\1\157\1\164\1\154\1\145"+
-        "\1\154\1\uffff\1\156\1\154\2\uffff\1\162\2\uffff\1\164\1\145\1\143"+
-        "\1\60\1\uffff\1\145\1\163\1\160\1\163\1\uffff\1\60\1\uffff\1\145"+
-        "\1\60\1\uffff\1\143\1\157\2\171\1\uffff\1\164\2\60\1\146\1\141\2"+
-        "\145\1\60\1\145\1\141\1\164\1\157\1\uffff\1\60\1\151\1\145\1\163"+
-        "\1\uffff\1\60\1\uffff\1\145\1\162\1\160\1\60\1\157\2\uffff\1\60"+
-        "\1\163\1\60\1\155\1\uffff\1\155\1\144\2\151\1\uffff\1\164\2\60\1"+
-        "\uffff\1\115\1\60\1\145\1\uffff\1\143\1\uffff\1\163\1\uffff\1\145"+
-        "\2\60\1\157\1\156\1\151\2\uffff\1\141\1\uffff\1\60\1\157\1\60\1"+
-        "\156\2\uffff\1\156\1\164\1\157\1\160\1\uffff\1\154\1\uffff\1\164"+
-        "\2\60\1\156\1\160\1\103\1\141\2\uffff\1\60\1\151\1\154\1\164\1\uffff"+
-        "\1\156\1\141\1\151\1\147\1\163\1\157\1\60\1\163\1\156\1\uffff\2"+
-        "\60\2\uffff";
+        "\1\0\1\145\3\uffff\1\145\1\157\1\76\2\uffff\1\141\1\60\1\146\2\uffff\1\141\1\60\1\163\1\143\2\uffff\1\160\1\157\1\141\1\157\1\155\1\150\1\101\1\162\1\145\1\141\1\142\1\156\1\145\1\141\2\52\1\uffff\1\162\1\141\1\165\1\141\4\uffff\1\141\1\uffff\1\130\1\101\2\uffff\2\0\2\uffff\1\157\1\146\4\uffff\1\146\1\151\1\162\4\uffff\1\146\1\157\1\60\2\164\1\151\1\uffff\1\60\1\145\1\164\1\60\1\164\2\uffff\1\164\1\151\1\164\1\145\1\uffff\1\145\2\164\1\156\2\uffff\1\145\1\151\1\155\1\142\1\164\1\156\1\157\1\156\2\60\1\160\1\155\1\157\1\142\1\141\2\120\1\162\1\151\1\102\1\163\1\156\1\163\1\144\2\164\1\171\1\164\1\150\1\156\1\147\1\171\6\uffff\1\141\1\151\1\162\1\141\1\60\1\156\1\144\4\uffff\1\157\1\154\1\170\5\uffff\1\155\1\151\1\60\1\165\1\141\1\155\2\164\1\141\1\162\1\uffff\1\141\1\155\1\162\1\145\1\164\1\uffff\1\162\1\60\1\uffff\1\151\1\141\1\145\1\164\1\162\1\156\2\162\2\157\1\162\2\144\1\141\1\60\1\151\1\143\1\162\1\144\1\uffff\1\157\1\164\1\uffff\1\157\1\160\1\151\1\120\1\165\1\164\2\60\2\166\1\157\1\156\1\145\1\150\1\163\1\144\1\164\1\60\1\151\1\162\1\156\1\145\1\141\1\144\1\151\1\145\1\156\1\147\1\145\1\147\1\162\1\uffff\1\144\1\145\1\155\1\163\1\145\1\115\1\156\1\uffff\1\154\1\171\1\151\1\157\1\60\1\165\1\60\1\144\1\145\1\171\1\162\1\120\1\162\1\157\1\uffff\1\157\1\103\1\156\1\60\1\171\1\164\1\143\1\151\1\162\1\164\1\141\1\60\1\163\1\156\1\162\1\uffff\1\163\2\60\1\165\1\60\1\155\1\151\1\162\1\157\1\143\1\162\1\171\1\143\1\145\2\uffff\1\151\1\141\1\157\1\164\3\141\1\154\1\162\1\uffff\1\157\1\151\1\143\1\162\1\166\1\151\1\143\1\162\1\163\1\147\1\60\1\145\1\144\1\141\1\154\1\60\1\145\1\144\1\157\1\145\1\141\1\137\1\164\1\143\1\154\1\uffff\1\154\1\uffff\2\162\1\120\1\156\1\157\2\151\1\156\1\154\1\144\1\156\1\uffff\1\60\1\144\1\157\1\142\1\102\1\141\1\164\1\uffff\1\60\1\164\1\141\1\146\2\uffff\1\147\1\uffff\1\151\1\141\1\164\1\165\1\145\1\157\1\163\1\164\1\60\1\143\1\164\1\154\1\145\1\154\1\162\1\147\1\145\1\141\1\156\1\142\1\60\1\146\1\151\1\156\1\141\1\103\1\151\1\145\1\uffff\1\164\1\60\1\164\1\60\1\uffff\2\60\2\144\1\162\1\163\1\151\1\157\1\141\1\164\1\151\1\141\1\157\1\141\1\151\1\144\1\156\2\141\1\163\1\141\1\uffff\1\162\1\144\1\165\1\154\1\156\2\145\1\164\1\151\1\uffff\1\151\1\160\1\151\1\141\1\156\1\154\1\60\1\156\1\120\2\164\1\165\1\141\1\uffff\3\145\1\147\1\60\1\141\1\145\1\60\1\143\1\60\1\165\1\uffff\1\141\1\157\1\147\1\154\1\157\1\164\1\162\1\60\1\uffff\1\157\3\uffff\1\145\1\123\1\60\1\141\1\166\1\154\1\163\1\60\1\166\1\164\1\151\1\154\1\156\1\145\1\147\1\154\1\163\1\60\1\154\1\151\1\145\1\164\1\141\1\163\1\146\1\150\1\151\1\157\1\143\1\150\1\145\1\164\1\147\1\60\1\uffff\1\144\2\157\1\145\1\162\1\143\1\111\1\60\1\141\1\145\1\uffff\1\143\2\60\1\uffff\1\164\1\uffff\1\164\1\143\1\162\1\60\1\123\1\156\1\151\1\163\1\uffff\1\162\1\154\1\164\1\162\1\uffff\1\160\1\145\1\103\1\163\1\uffff\1\145\1\151\1\156\1\124\1\164\3\60\1\163\1\uffff\1\60\1\166\1\60\1\145\1\163\1\164\1\60\1\141\1\157\1\156\1\163\1\60\1\144\1\145\1\60\1\uffff\1\120\1\151\1\143\1\155\1\145\1\150\1\155\1\uffff\1\156\1\162\1\164\2\uffff\1\60\2\145\1\60\1\uffff\1\171\1\150\1\156\1\157\1\60\1\171\1\60\2\141\1\60\1\124\1\154\1\60\1\156\1\157\1\164\1\171\1\60\3\uffff\1\60\1\uffff\1\145\3\60\1\uffff\1\60\1\163\1\141\1\uffff\1\166\1\156\2\60\1\uffff\1\137\1\144\1\uffff\1\162\1\156\1\157\1\103\1\60\1\151\1\160\2\60\1\145\1\uffff\2\60\1\uffff\1\163\1\162\1\145\1\156\1\uffff\1\60\1\uffff\1\164\1\156\1\uffff\1\171\1\141\1\uffff\1\60\1\156\1\60\1\160\2\uffff\1\156\4\uffff\1\60\1\156\1\151\1\124\2\uffff\1\142\1\60\1\157\1\164\1\154\1\145\1\154\1\uffff\1\156\1\154\2\uffff\1\162\2\uffff\1\164\1\145\1\143\1\60\1\uffff\1\145\1\163\1\160\1\163\1\uffff\1\60\1\uffff\1\145\1\60\1\uffff\1\143\1\157\2\171\1\uffff\1\164\2\60\1\146\1\141\2\145\1\60\1\145\1\141\1\164\1\157\1\uffff\1\60\1\151\1\145\1\163\1\uffff\1\60\1\uffff\1\145\1\162\1\160\1\60\1\157\2\uffff\1\60\1\163\1\60\1\155\1\uffff\1\155\1\144\2\151\1\uffff\1\164\2\60\1\uffff\1\115\1\60\1\145\1\uffff\1\143\1\uffff\1\163\1\uffff\1\145\2\60\1\157\1\156\1\151\2\uffff\1\141\1\uffff\1\60\1\157\1\60\1\156\2\uffff\1\156\1\164\1\157\1\160\1\uffff\1\154\1\uffff\1\164\2\60\1\156\1\160\1\103\1\141\2\uffff\1\60\1\151\1\154\1\164\1\uffff\1\156\1\141\1\151\1\147\1\163\1\157\1\60\1\163\1\156\1\uffff\2\60\2\uffff";
     static final String DFA14_maxS =
-        "\1\uffff\1\157\3\uffff\1\145\1\162\1\76\2\uffff\1\164\1\172\1\166"+
-        "\2\uffff\1\141\1\172\1\163\1\164\2\uffff\1\160\1\157\1\171\1\164"+
-        "\1\156\1\157\1\165\1\164\1\145\1\141\1\164\1\156\1\151\1\157\1\57"+
-        "\1\52\1\uffff\2\162\1\165\1\171\4\uffff\1\162\1\uffff\1\170\1\172"+
-        "\2\uffff\2\uffff\2\uffff\1\157\1\146\4\uffff\1\154\1\157\1\162\4"+
-        "\uffff\1\146\1\157\1\172\1\164\1\165\1\164\1\uffff\1\172\1\145\1"+
-        "\164\1\172\1\164\2\uffff\3\164\1\145\1\uffff\1\145\2\164\1\156\2"+
-        "\uffff\1\145\1\151\1\156\1\142\1\164\1\156\1\157\1\156\2\172\1\160"+
-        "\1\155\1\157\1\142\1\162\2\120\1\162\1\151\1\122\1\163\1\156\1\163"+
-        "\1\144\2\164\1\171\1\164\1\150\1\156\1\147\1\171\6\uffff\1\141\1"+
-        "\165\1\162\1\141\1\172\1\156\1\144\4\uffff\1\157\1\154\1\170\5\uffff"+
-        "\1\155\1\151\1\172\1\165\1\141\1\155\2\164\1\141\1\162\1\uffff\1"+
-        "\141\1\155\1\162\1\145\1\164\1\uffff\1\162\1\172\1\uffff\1\151\1"+
-        "\141\1\145\1\164\1\162\1\156\2\162\2\157\1\162\2\144\1\141\1\172"+
-        "\1\151\1\143\1\162\1\152\1\uffff\1\157\1\164\1\uffff\1\157\1\160"+
-        "\1\151\1\123\1\165\1\164\2\172\2\166\1\157\1\156\1\145\1\150\1\163"+
-        "\1\144\1\164\1\172\1\151\1\162\1\156\1\145\1\141\1\144\1\151\1\145"+
-        "\1\156\1\147\1\145\1\147\1\162\1\uffff\1\144\1\145\1\155\1\163\1"+
-        "\145\1\115\1\156\1\uffff\1\154\1\171\1\151\1\157\1\172\1\165\1\172"+
-        "\1\144\1\145\1\171\1\162\1\120\1\162\1\157\1\uffff\1\157\1\103\1"+
-        "\162\1\172\1\171\1\164\1\143\1\151\1\162\1\164\1\141\1\172\1\163"+
-        "\1\156\1\162\1\uffff\1\163\2\172\1\165\1\172\1\155\1\151\1\162\1"+
-        "\157\1\143\1\162\1\171\1\143\1\145\2\uffff\1\151\1\141\1\157\1\164"+
-        "\3\141\1\154\1\162\1\uffff\1\157\1\151\1\143\1\162\1\166\1\151\1"+
-        "\143\1\162\1\163\1\147\1\172\1\145\1\144\1\141\1\154\1\172\1\145"+
-        "\1\144\1\157\1\145\1\141\1\137\1\164\1\143\1\154\1\uffff\1\154\1"+
-        "\uffff\2\162\1\120\1\156\1\157\2\151\1\156\1\154\1\144\1\156\1\uffff"+
-        "\1\172\1\144\1\157\1\142\1\122\1\141\1\164\1\uffff\1\172\1\164\1"+
-        "\141\1\146\2\uffff\1\147\1\uffff\1\151\1\141\1\164\1\165\1\145\1"+
-        "\157\1\163\1\164\1\172\1\143\1\164\1\154\1\145\1\154\1\162\1\147"+
-        "\1\145\1\141\1\156\1\142\1\172\1\146\1\151\1\156\1\141\1\103\1\151"+
-        "\1\145\1\uffff\1\164\1\172\1\164\1\172\1\uffff\2\172\2\144\1\162"+
-        "\1\163\1\151\1\157\1\141\1\164\1\151\1\141\1\157\1\141\1\151\1\144"+
-        "\1\156\2\141\1\163\1\141\1\uffff\1\162\1\144\1\165\1\154\1\156\2"+
-        "\145\1\164\1\151\1\uffff\1\151\1\160\1\151\1\141\1\156\1\154\1\172"+
-        "\1\156\1\120\2\164\1\165\1\141\1\uffff\3\145\1\147\1\172\1\141\1"+
-        "\145\1\172\1\143\1\172\1\165\1\uffff\1\141\1\157\1\147\1\154\1\157"+
-        "\1\164\1\162\1\172\1\uffff\1\157\3\uffff\1\145\1\124\1\172\1\141"+
-        "\1\166\1\154\1\163\1\172\1\166\1\164\1\151\1\154\1\156\1\145\1\147"+
-        "\1\154\1\163\1\172\1\154\1\151\1\145\1\164\1\141\1\163\1\146\1\150"+
-        "\1\151\1\157\1\143\1\150\1\145\1\164\1\147\1\172\1\uffff\1\144\2"+
-        "\157\1\145\1\162\1\143\1\111\1\172\1\141\1\145\1\uffff\1\143\2\172"+
-        "\1\uffff\1\164\1\uffff\1\164\1\143\1\162\1\172\1\124\1\156\1\151"+
-        "\1\163\1\uffff\1\162\1\154\1\164\1\162\1\uffff\1\160\1\145\1\103"+
-        "\1\163\1\uffff\1\145\1\151\1\156\1\124\1\164\3\172\1\163\1\uffff"+
-        "\1\172\1\166\1\172\1\145\1\163\1\164\1\172\1\141\1\157\1\156\1\163"+
-        "\1\172\1\144\1\145\1\172\1\uffff\1\120\1\151\1\143\1\155\1\145\1"+
-        "\150\1\155\1\uffff\1\156\1\162\1\164\2\uffff\1\172\2\145\1\172\1"+
-        "\uffff\1\171\1\150\1\156\1\157\1\172\1\171\1\172\2\141\1\172\1\124"+
-        "\1\154\1\172\1\156\1\157\1\164\1\171\1\172\3\uffff\1\172\1\uffff"+
-        "\1\145\3\172\1\uffff\1\172\1\163\1\141\1\uffff\1\166\1\156\2\172"+
-        "\1\uffff\1\137\1\144\1\uffff\1\162\1\156\1\157\1\122\1\172\1\151"+
-        "\1\160\2\172\1\145\1\uffff\2\172\1\uffff\1\163\1\162\1\145\1\156"+
-        "\1\uffff\1\172\1\uffff\1\164\1\156\1\uffff\1\171\1\141\1\uffff\1"+
-        "\172\1\156\1\172\1\160\2\uffff\1\156\4\uffff\1\172\1\156\1\151\1"+
-        "\124\2\uffff\1\142\1\172\1\157\1\164\1\154\1\145\1\154\1\uffff\1"+
-        "\156\1\154\2\uffff\1\162\2\uffff\1\164\1\145\1\143\1\172\1\uffff"+
-        "\1\145\1\163\1\160\1\163\1\uffff\1\172\1\uffff\1\145\1\172\1\uffff"+
-        "\1\143\1\157\2\171\1\uffff\1\164\2\172\1\146\1\141\2\145\1\172\1"+
-        "\145\1\141\1\164\1\157\1\uffff\1\172\1\151\1\145\1\163\1\uffff\1"+
-        "\172\1\uffff\1\145\1\162\1\160\1\172\1\157\2\uffff\1\172\1\163\1"+
-        "\172\1\155\1\uffff\1\155\1\144\2\151\1\uffff\1\164\2\172\1\uffff"+
-        "\1\115\1\172\1\145\1\uffff\1\143\1\uffff\1\163\1\uffff\1\145\2\172"+
-        "\1\157\1\156\1\151\2\uffff\1\141\1\uffff\1\172\1\157\1\172\1\156"+
-        "\2\uffff\1\156\1\164\1\157\1\160\1\uffff\1\154\1\uffff\1\164\2\172"+
-        "\1\156\1\160\1\103\1\141\2\uffff\1\172\1\151\1\154\1\164\1\uffff"+
-        "\1\156\1\141\1\151\1\147\1\163\1\157\1\172\1\163\1\156\1\uffff\2"+
-        "\172\2\uffff";
+        "\1\uffff\1\157\3\uffff\1\145\1\162\1\76\2\uffff\1\164\1\172\1\166\2\uffff\1\141\1\172\1\163\1\164\2\uffff\1\160\1\157\1\171\1\164\1\156\1\157\1\165\1\164\1\145\1\141\1\164\1\156\1\151\1\157\1\57\1\52\1\uffff\2\162\1\165\1\171\4\uffff\1\162\1\uffff\1\170\1\172\2\uffff\2\uffff\2\uffff\1\157\1\146\4\uffff\1\154\1\157\1\162\4\uffff\1\146\1\157\1\172\1\164\1\165\1\164\1\uffff\1\172\1\145\1\164\1\172\1\164\2\uffff\3\164\1\145\1\uffff\1\145\2\164\1\156\2\uffff\1\145\1\151\1\156\1\142\1\164\1\156\1\157\1\156\2\172\1\160\1\155\1\157\1\142\1\162\2\120\1\162\1\151\1\122\1\163\1\156\1\163\1\144\2\164\1\171\1\164\1\150\1\156\1\147\1\171\6\uffff\1\141\1\165\1\162\1\141\1\172\1\156\1\144\4\uffff\1\157\1\154\1\170\5\uffff\1\155\1\151\1\172\1\165\1\141\1\155\2\164\1\141\1\162\1\uffff\1\141\1\155\1\162\1\145\1\164\1\uffff\1\162\1\172\1\uffff\1\151\1\141\1\145\1\164\1\162\1\156\2\162\2\157\1\162\2\144\1\141\1\172\1\151\1\143\1\162\1\152\1\uffff\1\157\1\164\1\uffff\1\157\1\160\1\151\1\123\1\165\1\164\2\172\2\166\1\157\1\156\1\145\1\150\1\163\1\144\1\164\1\172\1\151\1\162\1\156\1\145\1\141\1\144\1\151\1\145\1\156\1\147\1\145\1\147\1\162\1\uffff\1\144\1\145\1\155\1\163\1\145\1\115\1\156\1\uffff\1\154\1\171\1\151\1\157\1\172\1\165\1\172\1\144\1\145\1\171\1\162\1\120\1\162\1\157\1\uffff\1\157\1\103\1\162\1\172\1\171\1\164\1\143\1\151\1\162\1\164\1\141\1\172\1\163\1\156\1\162\1\uffff\1\163\2\172\1\165\1\172\1\155\1\151\1\162\1\157\1\143\1\162\1\171\1\143\1\145\2\uffff\1\151\1\141\1\157\1\164\3\141\1\154\1\162\1\uffff\1\157\1\151\1\143\1\162\1\166\1\151\1\143\1\162\1\163\1\147\1\172\1\145\1\144\1\141\1\154\1\172\1\145\1\144\1\157\1\145\1\141\1\137\1\164\1\143\1\154\1\uffff\1\154\1\uffff\2\162\1\120\1\156\1\157\2\151\1\156\1\154\1\144\1\156\1\uffff\1\172\1\144\1\157\1\142\1\122\1\141\1\164\1\uffff\1\172\1\164\1\141\1\146\2\uffff\1\147\1\uffff\1\151\1\141\1\164\1\165\1\145\1\157\1\163\1\164\1\172\1\143\1\164\1\154\1\145\1\154\1\162\1\147\1\145\1\141\1\156\1\142\1\172\1\146\1\151\1\156\1\141\1\103\1\151\1\145\1\uffff\1\164\1\172\1\164\1\172\1\uffff\2\172\2\144\1\162\1\163\1\151\1\157\1\141\1\164\1\151\1\141\1\157\1\141\1\151\1\144\1\156\2\141\1\163\1\141\1\uffff\1\162\1\144\1\165\1\154\1\156\2\145\1\164\1\151\1\uffff\1\151\1\160\1\151\1\141\1\156\1\154\1\172\1\156\1\120\2\164\1\165\1\141\1\uffff\3\145\1\147\1\172\1\141\1\145\1\172\1\143\1\172\1\165\1\uffff\1\141\1\157\1\147\1\154\1\157\1\164\1\162\1\172\1\uffff\1\157\3\uffff\1\145\1\124\1\172\1\141\1\166\1\154\1\163\1\172\1\166\1\164\1\151\1\154\1\156\1\145\1\147\1\154\1\163\1\172\1\154\1\151\1\145\1\164\1\141\1\163\1\146\1\150\1\151\1\157\1\143\1\150\1\145\1\164\1\147\1\172\1\uffff\1\144\2\157\1\145\1\162\1\143\1\111\1\172\1\141\1\145\1\uffff\1\143\2\172\1\uffff\1\164\1\uffff\1\164\1\143\1\162\1\172\1\124\1\156\1\151\1\163\1\uffff\1\162\1\154\1\164\1\162\1\uffff\1\160\1\145\1\103\1\163\1\uffff\1\145\1\151\1\156\1\124\1\164\3\172\1\163\1\uffff\1\172\1\166\1\172\1\145\1\163\1\164\1\172\1\141\1\157\1\156\1\163\1\172\1\144\1\145\1\172\1\uffff\1\120\1\151\1\143\1\155\1\145\1\150\1\155\1\uffff\1\156\1\162\1\164\2\uffff\1\172\2\145\1\172\1\uffff\1\171\1\150\1\156\1\157\1\172\1\171\1\172\2\141\1\172\1\124\1\154\1\172\1\156\1\157\1\164\1\171\1\172\3\uffff\1\172\1\uffff\1\145\3\172\1\uffff\1\172\1\163\1\141\1\uffff\1\166\1\156\2\172\1\uffff\1\137\1\144\1\uffff\1\162\1\156\1\157\1\122\1\172\1\151\1\160\2\172\1\145\1\uffff\2\172\1\uffff\1\163\1\162\1\145\1\156\1\uffff\1\172\1\uffff\1\164\1\156\1\uffff\1\171\1\141\1\uffff\1\172\1\156\1\172\1\160\2\uffff\1\156\4\uffff\1\172\1\156\1\151\1\124\2\uffff\1\142\1\172\1\157\1\164\1\154\1\145\1\154\1\uffff\1\156\1\154\2\uffff\1\162\2\uffff\1\164\1\145\1\143\1\172\1\uffff\1\145\1\163\1\160\1\163\1\uffff\1\172\1\uffff\1\145\1\172\1\uffff\1\143\1\157\2\171\1\uffff\1\164\2\172\1\146\1\141\2\145\1\172\1\145\1\141\1\164\1\157\1\uffff\1\172\1\151\1\145\1\163\1\uffff\1\172\1\uffff\1\145\1\162\1\160\1\172\1\157\2\uffff\1\172\1\163\1\172\1\155\1\uffff\1\155\1\144\2\151\1\uffff\1\164\2\172\1\uffff\1\115\1\172\1\145\1\uffff\1\143\1\uffff\1\163\1\uffff\1\145\2\172\1\157\1\156\1\151\2\uffff\1\141\1\uffff\1\172\1\157\1\172\1\156\2\uffff\1\156\1\164\1\157\1\160\1\uffff\1\154\1\uffff\1\164\2\172\1\156\1\160\1\103\1\141\2\uffff\1\172\1\151\1\154\1\164\1\uffff\1\156\1\141\1\151\1\147\1\163\1\157\1\172\1\163\1\156\1\uffff\2\172\2\uffff";
     static final String DFA14_acceptS =
-        "\2\uffff\1\2\1\3\1\4\3\uffff\1\10\1\11\3\uffff\1\15\1\16\4\uffff"+
-        "\1\26\1\27\20\uffff\1\102\4\uffff\1\132\1\133\1\134\1\140\1\uffff"+
-        "\1\154\2\uffff\1\172\1\173\2\uffff\1\177\1\u0080\2\uffff\1\172\1"+
-        "\2\1\3\1\4\3\uffff\1\7\1\155\1\10\1\11\6\uffff\1\157\5\uffff\1\15"+
-        "\1\16\4\uffff\1\156\4\uffff\1\26\1\27\40\uffff\1\175\1\176\1\71"+
-        "\1\151\1\74\1\102\7\uffff\1\132\1\133\1\134\1\140\3\uffff\1\154"+
-        "\1\171\1\173\1\174\1\177\12\uffff\1\110\5\uffff\1\14\2\uffff\1\124"+
-        "\23\uffff\1\131\2\uffff\1\136\37\uffff\1\130\7\uffff\1\5\16\uffff"+
-        "\1\137\17\uffff\1\75\16\uffff\1\61\1\62\11\uffff\1\73\31\uffff\1"+
-        "\57\1\uffff\1\35\13\uffff\1\107\7\uffff\1\32\4\uffff\1\162\1\34"+
-        "\1\uffff\1\126\34\uffff\1\153\4\uffff\1\147\25\uffff\1\106\11\uffff"+
-        "\1\33\15\uffff\1\105\13\uffff\1\164\10\uffff\1\125\1\uffff\1\150"+
-        "\1\152\1\163\42\uffff\1\146\12\uffff\1\167\3\uffff\1\51\1\uffff"+
-        "\1\122\10\uffff\1\142\4\uffff\1\41\4\uffff\1\12\11\uffff\1\21\17"+
-        "\uffff\1\121\7\uffff\1\46\3\uffff\1\47\1\113\4\uffff\1\72\22\uffff"+
-        "\1\30\1\40\1\143\1\uffff\1\60\4\uffff\1\50\3\uffff\1\101\4\uffff"+
-        "\1\111\2\uffff\1\37\12\uffff\1\52\2\uffff\1\56\4\uffff\1\123\1\uffff"+
-        "\1\1\2\uffff\1\100\2\uffff\1\42\4\uffff\1\116\1\20\1\uffff\1\22"+
-        "\1\23\1\24\1\25\4\uffff\1\31\1\135\7\uffff\1\55\2\uffff\1\165\1"+
-        "\166\1\uffff\1\145\1\54\4\uffff\1\144\4\uffff\1\161\1\uffff\1\115"+
-        "\2\uffff\1\53\4\uffff\1\43\14\uffff\1\120\4\uffff\1\13\1\uffff\1"+
-        "\160\5\uffff\1\117\1\45\4\uffff\1\170\4\uffff\1\112\3\uffff\1\17"+
-        "\3\uffff\1\77\1\uffff\1\65\1\uffff\1\104\6\uffff\1\6\1\36\1\uffff"+
-        "\1\103\4\uffff\1\64\1\67\4\uffff\1\141\1\uffff\1\66\7\uffff\1\76"+
-        "\1\114\4\uffff\1\127\11\uffff\1\70\2\uffff\1\44\1\63";
+        "\2\uffff\1\2\1\3\1\4\3\uffff\1\10\1\11\3\uffff\1\15\1\16\4\uffff\1\26\1\27\20\uffff\1\102\4\uffff\1\132\1\133\1\134\1\140\1\uffff\1\154\2\uffff\1\172\1\173\2\uffff\1\177\1\u0080\2\uffff\1\172\1\2\1\3\1\4\3\uffff\1\7\1\155\1\10\1\11\6\uffff\1\157\5\uffff\1\15\1\16\4\uffff\1\156\4\uffff\1\26\1\27\40\uffff\1\175\1\176\1\71\1\151\1\74\1\102\7\uffff\1\132\1\133\1\134\1\140\3\uffff\1\154\1\171\1\173\1\174\1\177\12\uffff\1\110\5\uffff\1\14\2\uffff\1\124\23\uffff\1\131\2\uffff\1\136\37\uffff\1\130\7\uffff\1\5\16\uffff\1\137\17\uffff\1\75\16\uffff\1\61\1\62\11\uffff\1\73\31\uffff\1\57\1\uffff\1\35\13\uffff\1\107\7\uffff\1\32\4\uffff\1\162\1\34\1\uffff\1\126\34\uffff\1\153\4\uffff\1\147\25\uffff\1\106\11\uffff\1\33\15\uffff\1\105\13\uffff\1\164\10\uffff\1\125\1\uffff\1\150\1\152\1\163\42\uffff\1\146\12\uffff\1\167\3\uffff\1\51\1\uffff\1\122\10\uffff\1\142\4\uffff\1\41\4\uffff\1\12\11\uffff\1\21\17\uffff\1\121\7\uffff\1\46\3\uffff\1\47\1\113\4\uffff\1\72\22\uffff\1\30\1\40\1\143\1\uffff\1\60\4\uffff\1\50\3\uffff\1\101\4\uffff\1\111\2\uffff\1\37\12\uffff\1\52\2\uffff\1\56\4\uffff\1\123\1\uffff\1\1\2\uffff\1\100\2\uffff\1\42\4\uffff\1\116\1\20\1\uffff\1\22\1\23\1\24\1\25\4\uffff\1\31\1\135\7\uffff\1\55\2\uffff\1\165\1\166\1\uffff\1\145\1\54\4\uffff\1\144\4\uffff\1\161\1\uffff\1\115\2\uffff\1\53\4\uffff\1\43\14\uffff\1\120\4\uffff\1\13\1\uffff\1\160\5\uffff\1\117\1\45\4\uffff\1\170\4\uffff\1\112\3\uffff\1\17\3\uffff\1\77\1\uffff\1\65\1\uffff\1\104\6\uffff\1\6\1\36\1\uffff\1\103\4\uffff\1\64\1\67\4\uffff\1\141\1\uffff\1\66\7\uffff\1\76\1\114\4\uffff\1\127\11\uffff\1\70\2\uffff\1\44\1\63";
     static final String DFA14_specialS =
-        "\1\0\63\uffff\1\1\1\2\u02dc\uffff}>";
+        "\1\0\63\uffff\1\2\1\1\u02dc\uffff}>";
     static final String[] DFA14_transitionS = {
-            "\11\67\2\66\2\67\1\66\22\67\1\66\1\67\1\64\4\67\1\65\1\10\1"+
-            "\11\1\45\1\57\1\15\1\7\1\44\1\43\1\60\11\63\1\4\1\67\1\52\1"+
-            "\16\1\54\1\67\1\55\1\22\1\41\1\32\1\17\1\13\3\62\1\40\2\62\1"+
-            "\42\1\35\1\62\1\25\1\6\1\62\1\1\1\33\1\46\6\62\1\23\1\67\1\24"+
-            "\1\61\1\62\1\67\1\37\1\62\1\30\1\12\1\20\1\56\1\50\1\36\1\31"+
-            "\3\62\1\51\1\62\1\14\1\34\1\62\1\5\1\27\1\47\1\21\1\26\4\62"+
-            "\1\2\1\53\1\3\uff82\67",
+            "\11\67\2\66\2\67\1\66\22\67\1\66\1\67\1\64\4\67\1\65\1\10\1\11\1\45\1\57\1\15\1\7\1\44\1\43\1\60\11\63\1\4\1\67\1\52\1\16\1\54\1\67\1\55\1\22\1\41\1\32\1\17\1\13\3\62\1\40\2\62\1\42\1\35\1\62\1\25\1\6\1\62\1\1\1\33\1\46\6\62\1\23\1\67\1\24\1\61\1\62\1\67\1\37\1\62\1\30\1\12\1\20\1\56\1\50\1\36\1\31\3\62\1\51\1\62\1\14\1\34\1\62\1\5\1\27\1\47\1\21\1\26\4\62\1\2\1\53\1\3\uff82\67",
             "\1\71\11\uffff\1\70",
             "",
             "",
@@ -4387,14 +4188,12 @@ public class InternalRoomLexer extends Lexer {
             "",
             "",
             "\1\110\3\uffff\1\105\11\uffff\1\107\4\uffff\1\106",
-            "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\15\72\1\111\11\72"+
-            "\1\112\2\72",
+            "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\15\72\1\111\11\72\1\112\2\72",
             "\1\114\11\uffff\1\120\1\uffff\1\117\2\uffff\1\116\1\115",
             "",
             "",
             "\1\123",
-            "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\15\72\1\125\7\72"+
-            "\1\126\1\72\1\124\2\72",
+            "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\15\72\1\125\7\72\1\126\1\72\1\124\2\72",
             "\1\130",
             "\1\132\12\uffff\1\133\5\uffff\1\131",
             "",
@@ -4481,8 +4280,7 @@ public class InternalRoomLexer extends Lexer {
             "\1\u00bc",
             "\1\u00bd",
             "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72",
-            "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\2\72\1\u00bf\5\72"+
-            "\1\u00c0\21\72",
+            "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\2\72\1\u00bf\5\72\1\u00c0\21\72",
             "\1\u00c2",
             "\1\u00c3",
             "\1\u00c4",
@@ -4548,8 +4346,7 @@ public class InternalRoomLexer extends Lexer {
             "\1\u00f5",
             "",
             "\1\u00f6",
-            "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\6\72\1\u00f7\23"+
-            "\72",
+            "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\6\72\1\u00f7\23\72",
             "",
             "\1\u00f9",
             "\1\u00fa",
@@ -4565,8 +4362,7 @@ public class InternalRoomLexer extends Lexer {
             "\1\u0104",
             "\1\u0105",
             "\1\u0106",
-            "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\6\72\1\u0107\23"+
-            "\72",
+            "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\6\72\1\u0107\23\72",
             "\1\u0109",
             "\1\u010a",
             "\1\u010b",
@@ -4619,8 +4415,7 @@ public class InternalRoomLexer extends Lexer {
             "\1\u0138",
             "\1\u0139",
             "\1\u013a",
-            "\12\72\7\uffff\2\72\1\u013b\27\72\4\uffff\1\72\1\uffff\32"+
-            "\72",
+            "\12\72\7\uffff\2\72\1\u013b\27\72\4\uffff\1\72\1\uffff\32\72",
             "\1\u013d",
             "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72",
             "\1\u013f",
@@ -4737,8 +4532,7 @@ public class InternalRoomLexer extends Lexer {
             "\1\u01a6",
             "\1\u01a7",
             "\1\u01a8",
-            "\12\72\7\uffff\14\72\1\u01a9\15\72\4\uffff\1\72\1\uffff\32"+
-            "\72",
+            "\12\72\7\uffff\14\72\1\u01a9\15\72\4\uffff\1\72\1\uffff\32\72",
             "\1\u01ab",
             "\1\u01ac",
             "\1\u01ad",
@@ -4817,8 +4611,7 @@ public class InternalRoomLexer extends Lexer {
             "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72",
             "\1\u01f2",
             "\1\u01f3",
-            "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\21\72\1\u01f4\10"+
-            "\72",
+            "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\21\72\1\u01f4\10\72",
             "\1\u01f6",
             "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72",
             "\1\u01f8",
@@ -4919,8 +4712,7 @@ public class InternalRoomLexer extends Lexer {
             "",
             "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72",
             "\1\u024e",
-            "\1\72\1\u024f\1\u0250\1\u0251\6\72\7\uffff\32\72\4\uffff\1"+
-            "\72\1\uffff\32\72",
+            "\1\72\1\u024f\1\u0250\1\u0251\6\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72",
             "\1\u0253",
             "\1\u0254",
             "\1\u0255",
@@ -5054,8 +4846,7 @@ public class InternalRoomLexer extends Lexer {
             "\1\u02b6",
             "\1\u02b7",
             "\1\u02b8",
-            "\12\72\7\uffff\17\72\1\u02b9\12\72\4\uffff\1\72\1\uffff\32"+
-            "\72",
+            "\12\72\7\uffff\17\72\1\u02b9\12\72\4\uffff\1\72\1\uffff\32\72",
             "",
             "\1\u02bb",
             "\1\u02bc",
@@ -5327,20 +5118,20 @@ public class InternalRoomLexer extends Lexer {
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA14_52 = input.LA(1);
+                        int LA14_53 = input.LA(1);
 
                         s = -1;
-                        if ( ((LA14_52>='\u0000' && LA14_52<='\uFFFF')) ) {s = 149;}
+                        if ( ((LA14_53>='\u0000' && LA14_53<='\uFFFF')) ) {s = 149;}
 
                         else s = 55;
 
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA14_53 = input.LA(1);
+                        int LA14_52 = input.LA(1);
 
                         s = -1;
-                        if ( ((LA14_53>='\u0000' && LA14_53<='\uFFFF')) ) {s = 149;}
+                        if ( ((LA14_52>='\u0000' && LA14_52<='\uFFFF')) ) {s = 149;}
 
                         else s = 55;
 
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoomParser.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoomParser.java
index 64b1b10fc..dee45687e 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoomParser.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoomParser.java
@@ -24,135 +24,135 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
     public static final String[] tokenNames = new String[] {
         "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_STRING", "RULE_INT", "RULE_HEX", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'RoomModel'", "'{'", "'}'", "':'", "'ref'", "'PrimitiveType'", "'->'", "'('", "')'", "'default'", "'Enumeration'", "'of'", "','", "'='", "'ExternalType'", "'DataClass'", "'extends'", "'usercode1'", "'usercode2'", "'usercode3'", "'Attribute'", "'['", "']'", "'override'", "'Operation'", "'void'", "'sends'", "'ctor'", "'dtor'", "'ProtocolClass'", "'incoming'", "'outgoing'", "'regular'", "'PortClass'", "'conjugated'", "'CompoundProtocolClass'", "'SubProtocol'", "'private'", "'Message'", "'usercode'", "'handle'", "'abstract'", "'ActorClass'", "'Interface'", "'Structure'", "'Behavior'", "'Port'", "'external'", "'SAP'", "'SPP'", "'ServiceImplementation'", "'LogicalSystem'", "'SubSystemRef'", "'SubSystemClass'", "'LogicalThread'", "'ActorInstanceMapping'", "'/'", "'Binding'", "'and'", "'.'", "'sub'", "'LayerConnection'", "'satisfied_by'", "'relay_sap'", "'ActorRef'", "'*'", "'ActorBehavior'", "'StateMachine'", "'State'", "'entry'", "'exit'", "'do'", "'subgraph'", "'RefinedState'", "'handler'", "'TransitionPoint'", "'EntryPoint'", "'ExitPoint'", "'ChoicePoint'", "'Transition'", "'initial'", "'action'", "'triggers'", "'or'", "'guard'", "'cond'", "'RefinedTransition'", "'my'", "'cp'", "'<'", "'|'", "'>'", "'semantics'", "'in'", "'out'", "'@'", "'AnnotationType'", "'target'", "'optional'", "'mandatory'", "'attribute'", "'import'", "'from'", "'model'", "'.*'", "'false'", "'true'", "'+'", "'-'", "'e'", "'E'", "'eventdriven'", "'datadriven'", "'sync'", "'fixed'", "'async'", "'ptBoolean'", "'ptInteger'", "'ptReal'", "'ptCharacter'"
     };
-    public static final int RULE_HEX=7;
-    public static final int T__50=50;
-    public static final int T__59=59;
-    public static final int T__55=55;
-    public static final int T__56=56;
-    public static final int T__57=57;
-    public static final int T__58=58;
-    public static final int T__51=51;
-    public static final int T__52=52;
-    public static final int T__53=53;
-    public static final int T__54=54;
-    public static final int T__60=60;
-    public static final int T__61=61;
     public static final int RULE_ID=4;
-    public static final int T__131=131;
-    public static final int T__130=130;
-    public static final int RULE_INT=6;
-    public static final int T__66=66;
-    public static final int RULE_ML_COMMENT=8;
-    public static final int T__67=67;
-    public static final int T__129=129;
-    public static final int T__68=68;
-    public static final int T__69=69;
-    public static final int T__62=62;
-    public static final int T__126=126;
-    public static final int T__63=63;
-    public static final int T__125=125;
-    public static final int T__64=64;
-    public static final int T__128=128;
-    public static final int T__65=65;
-    public static final int T__127=127;
-    public static final int T__37=37;
-    public static final int T__38=38;
-    public static final int T__39=39;
-    public static final int T__33=33;
-    public static final int T__34=34;
-    public static final int T__35=35;
-    public static final int T__36=36;
-    public static final int T__30=30;
-    public static final int T__31=31;
-    public static final int T__32=32;
-    public static final int T__48=48;
-    public static final int T__49=49;
-    public static final int T__44=44;
-    public static final int T__45=45;
-    public static final int T__46=46;
-    public static final int T__47=47;
-    public static final int T__40=40;
-    public static final int T__41=41;
-    public static final int T__42=42;
-    public static final int T__43=43;
-    public static final int T__91=91;
-    public static final int T__100=100;
-    public static final int T__92=92;
+    public static final int T__29=29;
+    public static final int T__28=28;
+    public static final int T__27=27;
+    public static final int T__26=26;
+    public static final int T__25=25;
+    public static final int T__24=24;
+    public static final int T__23=23;
+    public static final int T__22=22;
+    public static final int RULE_ANY_OTHER=11;
+    public static final int T__21=21;
+    public static final int T__20=20;
+    public static final int EOF=-1;
     public static final int T__93=93;
-    public static final int T__102=102;
-    public static final int T__94=94;
-    public static final int T__101=101;
-    public static final int T__90=90;
     public static final int T__19=19;
-    public static final int T__15=15;
+    public static final int T__94=94;
+    public static final int T__91=91;
+    public static final int RULE_HEX=7;
+    public static final int T__92=92;
     public static final int T__16=16;
-    public static final int T__17=17;
+    public static final int T__15=15;
+    public static final int T__90=90;
     public static final int T__18=18;
-    public static final int T__99=99;
+    public static final int T__17=17;
     public static final int T__12=12;
-    public static final int T__13=13;
     public static final int T__14=14;
-    public static final int T__95=95;
-    public static final int T__96=96;
-    public static final int T__97=97;
+    public static final int T__13=13;
+    public static final int T__99=99;
     public static final int T__98=98;
-    public static final int T__26=26;
-    public static final int T__27=27;
-    public static final int T__28=28;
-    public static final int T__29=29;
-    public static final int T__22=22;
-    public static final int T__23=23;
-    public static final int T__24=24;
-    public static final int T__25=25;
-    public static final int T__20=20;
-    public static final int T__21=21;
-    public static final int T__122=122;
-    public static final int T__70=70;
-    public static final int T__121=121;
+    public static final int T__97=97;
+    public static final int T__96=96;
+    public static final int T__95=95;
+    public static final int T__80=80;
+    public static final int T__81=81;
+    public static final int T__82=82;
+    public static final int T__83=83;
+    public static final int T__85=85;
+    public static final int T__84=84;
+    public static final int T__87=87;
+    public static final int T__86=86;
+    public static final int T__89=89;
+    public static final int T__88=88;
+    public static final int RULE_ML_COMMENT=8;
+    public static final int T__126=126;
+    public static final int T__125=125;
+    public static final int T__128=128;
+    public static final int RULE_STRING=5;
+    public static final int T__127=127;
     public static final int T__71=71;
-    public static final int T__124=124;
+    public static final int T__129=129;
     public static final int T__72=72;
-    public static final int T__123=123;
-    public static final int T__120=120;
-    public static final int RULE_STRING=5;
-    public static final int RULE_SL_COMMENT=9;
-    public static final int T__77=77;
-    public static final int T__119=119;
+    public static final int T__70=70;
+    public static final int T__76=76;
+    public static final int T__75=75;
+    public static final int T__130=130;
+    public static final int T__74=74;
+    public static final int T__131=131;
+    public static final int T__73=73;
+    public static final int T__79=79;
     public static final int T__78=78;
+    public static final int T__77=77;
+    public static final int T__68=68;
+    public static final int T__69=69;
+    public static final int T__66=66;
+    public static final int T__67=67;
+    public static final int T__64=64;
+    public static final int T__65=65;
+    public static final int T__62=62;
+    public static final int T__63=63;
     public static final int T__118=118;
-    public static final int T__79=79;
-    public static final int T__73=73;
-    public static final int T__115=115;
-    public static final int EOF=-1;
-    public static final int T__74=74;
-    public static final int T__114=114;
-    public static final int T__75=75;
-    public static final int T__117=117;
-    public static final int T__76=76;
+    public static final int T__119=119;
     public static final int T__116=116;
-    public static final int T__80=80;
+    public static final int T__117=117;
+    public static final int T__114=114;
+    public static final int T__115=115;
+    public static final int T__124=124;
+    public static final int T__123=123;
+    public static final int T__122=122;
+    public static final int T__121=121;
+    public static final int T__120=120;
+    public static final int T__61=61;
+    public static final int T__60=60;
+    public static final int T__55=55;
+    public static final int T__56=56;
+    public static final int T__57=57;
+    public static final int T__58=58;
+    public static final int T__51=51;
+    public static final int T__52=52;
+    public static final int T__53=53;
+    public static final int T__54=54;
+    public static final int T__107=107;
+    public static final int T__108=108;
+    public static final int T__109=109;
+    public static final int T__103=103;
+    public static final int T__59=59;
+    public static final int T__104=104;
+    public static final int T__105=105;
+    public static final int T__106=106;
     public static final int T__111=111;
-    public static final int T__81=81;
     public static final int T__110=110;
-    public static final int T__82=82;
+    public static final int RULE_INT=6;
     public static final int T__113=113;
-    public static final int T__83=83;
     public static final int T__112=112;
+    public static final int T__50=50;
+    public static final int T__42=42;
+    public static final int T__43=43;
+    public static final int T__40=40;
+    public static final int T__41=41;
+    public static final int T__46=46;
+    public static final int T__47=47;
+    public static final int T__44=44;
+    public static final int T__45=45;
+    public static final int T__48=48;
+    public static final int T__49=49;
+    public static final int T__102=102;
+    public static final int T__101=101;
+    public static final int T__100=100;
+    public static final int RULE_SL_COMMENT=9;
+    public static final int T__30=30;
+    public static final int T__31=31;
+    public static final int T__32=32;
+    public static final int T__33=33;
+    public static final int T__34=34;
+    public static final int T__35=35;
+    public static final int T__36=36;
+    public static final int T__37=37;
+    public static final int T__38=38;
+    public static final int T__39=39;
     public static final int RULE_WS=10;
-    public static final int RULE_ANY_OTHER=11;
-    public static final int T__88=88;
-    public static final int T__108=108;
-    public static final int T__89=89;
-    public static final int T__107=107;
-    public static final int T__109=109;
-    public static final int T__84=84;
-    public static final int T__104=104;
-    public static final int T__85=85;
-    public static final int T__103=103;
-    public static final int T__86=86;
-    public static final int T__106=106;
-    public static final int T__87=87;
-    public static final int T__105=105;
 
     // delegates
     // delegators
@@ -168,7 +168,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
         
 
     public String[] getTokenNames() { return InternalRoomParser.tokenNames; }
-    public String getGrammarFileName() { return "../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g"; }
+    public String getGrammarFileName() { return "InternalRoom.g"; }
 
 
 
@@ -193,7 +193,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleRoomModel"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:68:1: entryRuleRoomModel returns [EObject current=null] : iv_ruleRoomModel= ruleRoomModel EOF ;
+    // InternalRoom.g:68:1: entryRuleRoomModel returns [EObject current=null] : iv_ruleRoomModel= ruleRoomModel EOF ;
     public final EObject entryRuleRoomModel() throws RecognitionException {
         EObject current = null;
 
@@ -201,17 +201,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:69:2: (iv_ruleRoomModel= ruleRoomModel EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:70:2: iv_ruleRoomModel= ruleRoomModel EOF
+            // InternalRoom.g:69:2: (iv_ruleRoomModel= ruleRoomModel EOF )
+            // InternalRoom.g:70:2: iv_ruleRoomModel= ruleRoomModel EOF
             {
              newCompositeNode(grammarAccess.getRoomModelRule()); 
-            pushFollow(FOLLOW_ruleRoomModel_in_entryRuleRoomModel75);
+            pushFollow(FOLLOW_1);
             iv_ruleRoomModel=ruleRoomModel();
 
             state._fsp--;
 
              current =iv_ruleRoomModel; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRoomModel85); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -229,7 +229,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleRoomModel"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:77:1: ruleRoomModel returns [EObject current=null] : (otherlv_0= 'RoomModel' ( (lv_name_1_0= ruleFQN ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_imports_4_0= ruleImport ) )* ( ( (lv_primitiveTypes_5_0= rulePrimitiveType ) ) | ( (lv_enumerationTypes_6_0= ruleEnumerationType ) ) | ( (lv_externalTypes_7_0= ruleExternalType ) ) | ( (lv_dataClasses_8_0= ruleDataClass ) ) | ( (lv_protocolClasses_9_0= ruleGeneralProtocolClass ) ) | ( (lv_actorClasses_10_0= ruleActorClass ) ) | ( (lv_subSystemClasses_11_0= ruleSubSystemClass ) ) | ( (lv_systems_12_0= ruleLogicalSystem ) ) | ( (lv_annotationTypes_13_0= ruleAnnotationType ) ) )* otherlv_14= '}' ) ;
+    // InternalRoom.g:77:1: ruleRoomModel returns [EObject current=null] : (otherlv_0= 'RoomModel' ( (lv_name_1_0= ruleFQN ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_imports_4_0= ruleImport ) )* ( ( (lv_primitiveTypes_5_0= rulePrimitiveType ) ) | ( (lv_enumerationTypes_6_0= ruleEnumerationType ) ) | ( (lv_externalTypes_7_0= ruleExternalType ) ) | ( (lv_dataClasses_8_0= ruleDataClass ) ) | ( (lv_protocolClasses_9_0= ruleGeneralProtocolClass ) ) | ( (lv_actorClasses_10_0= ruleActorClass ) ) | ( (lv_subSystemClasses_11_0= ruleSubSystemClass ) ) | ( (lv_systems_12_0= ruleLogicalSystem ) ) | ( (lv_annotationTypes_13_0= ruleAnnotationType ) ) )* otherlv_14= '}' ) ;
     public final EObject ruleRoomModel() throws RecognitionException {
         EObject current = null;
 
@@ -264,26 +264,26 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:80:28: ( (otherlv_0= 'RoomModel' ( (lv_name_1_0= ruleFQN ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_imports_4_0= ruleImport ) )* ( ( (lv_primitiveTypes_5_0= rulePrimitiveType ) ) | ( (lv_enumerationTypes_6_0= ruleEnumerationType ) ) | ( (lv_externalTypes_7_0= ruleExternalType ) ) | ( (lv_dataClasses_8_0= ruleDataClass ) ) | ( (lv_protocolClasses_9_0= ruleGeneralProtocolClass ) ) | ( (lv_actorClasses_10_0= ruleActorClass ) ) | ( (lv_subSystemClasses_11_0= ruleSubSystemClass ) ) | ( (lv_systems_12_0= ruleLogicalSystem ) ) | ( (lv_annotationTypes_13_0= ruleAnnotationType ) ) )* otherlv_14= '}' ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:81:1: (otherlv_0= 'RoomModel' ( (lv_name_1_0= ruleFQN ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_imports_4_0= ruleImport ) )* ( ( (lv_primitiveTypes_5_0= rulePrimitiveType ) ) | ( (lv_enumerationTypes_6_0= ruleEnumerationType ) ) | ( (lv_externalTypes_7_0= ruleExternalType ) ) | ( (lv_dataClasses_8_0= ruleDataClass ) ) | ( (lv_protocolClasses_9_0= ruleGeneralProtocolClass ) ) | ( (lv_actorClasses_10_0= ruleActorClass ) ) | ( (lv_subSystemClasses_11_0= ruleSubSystemClass ) ) | ( (lv_systems_12_0= ruleLogicalSystem ) ) | ( (lv_annotationTypes_13_0= ruleAnnotationType ) ) )* otherlv_14= '}' )
+            // InternalRoom.g:80:28: ( (otherlv_0= 'RoomModel' ( (lv_name_1_0= ruleFQN ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_imports_4_0= ruleImport ) )* ( ( (lv_primitiveTypes_5_0= rulePrimitiveType ) ) | ( (lv_enumerationTypes_6_0= ruleEnumerationType ) ) | ( (lv_externalTypes_7_0= ruleExternalType ) ) | ( (lv_dataClasses_8_0= ruleDataClass ) ) | ( (lv_protocolClasses_9_0= ruleGeneralProtocolClass ) ) | ( (lv_actorClasses_10_0= ruleActorClass ) ) | ( (lv_subSystemClasses_11_0= ruleSubSystemClass ) ) | ( (lv_systems_12_0= ruleLogicalSystem ) ) | ( (lv_annotationTypes_13_0= ruleAnnotationType ) ) )* otherlv_14= '}' ) )
+            // InternalRoom.g:81:1: (otherlv_0= 'RoomModel' ( (lv_name_1_0= ruleFQN ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_imports_4_0= ruleImport ) )* ( ( (lv_primitiveTypes_5_0= rulePrimitiveType ) ) | ( (lv_enumerationTypes_6_0= ruleEnumerationType ) ) | ( (lv_externalTypes_7_0= ruleExternalType ) ) | ( (lv_dataClasses_8_0= ruleDataClass ) ) | ( (lv_protocolClasses_9_0= ruleGeneralProtocolClass ) ) | ( (lv_actorClasses_10_0= ruleActorClass ) ) | ( (lv_subSystemClasses_11_0= ruleSubSystemClass ) ) | ( (lv_systems_12_0= ruleLogicalSystem ) ) | ( (lv_annotationTypes_13_0= ruleAnnotationType ) ) )* otherlv_14= '}' )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:81:1: (otherlv_0= 'RoomModel' ( (lv_name_1_0= ruleFQN ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_imports_4_0= ruleImport ) )* ( ( (lv_primitiveTypes_5_0= rulePrimitiveType ) ) | ( (lv_enumerationTypes_6_0= ruleEnumerationType ) ) | ( (lv_externalTypes_7_0= ruleExternalType ) ) | ( (lv_dataClasses_8_0= ruleDataClass ) ) | ( (lv_protocolClasses_9_0= ruleGeneralProtocolClass ) ) | ( (lv_actorClasses_10_0= ruleActorClass ) ) | ( (lv_subSystemClasses_11_0= ruleSubSystemClass ) ) | ( (lv_systems_12_0= ruleLogicalSystem ) ) | ( (lv_annotationTypes_13_0= ruleAnnotationType ) ) )* otherlv_14= '}' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:81:3: otherlv_0= 'RoomModel' ( (lv_name_1_0= ruleFQN ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_imports_4_0= ruleImport ) )* ( ( (lv_primitiveTypes_5_0= rulePrimitiveType ) ) | ( (lv_enumerationTypes_6_0= ruleEnumerationType ) ) | ( (lv_externalTypes_7_0= ruleExternalType ) ) | ( (lv_dataClasses_8_0= ruleDataClass ) ) | ( (lv_protocolClasses_9_0= ruleGeneralProtocolClass ) ) | ( (lv_actorClasses_10_0= ruleActorClass ) ) | ( (lv_subSystemClasses_11_0= ruleSubSystemClass ) ) | ( (lv_systems_12_0= ruleLogicalSystem ) ) | ( (lv_annotationTypes_13_0= ruleAnnotationType ) ) )* otherlv_14= '}'
+            // InternalRoom.g:81:1: (otherlv_0= 'RoomModel' ( (lv_name_1_0= ruleFQN ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_imports_4_0= ruleImport ) )* ( ( (lv_primitiveTypes_5_0= rulePrimitiveType ) ) | ( (lv_enumerationTypes_6_0= ruleEnumerationType ) ) | ( (lv_externalTypes_7_0= ruleExternalType ) ) | ( (lv_dataClasses_8_0= ruleDataClass ) ) | ( (lv_protocolClasses_9_0= ruleGeneralProtocolClass ) ) | ( (lv_actorClasses_10_0= ruleActorClass ) ) | ( (lv_subSystemClasses_11_0= ruleSubSystemClass ) ) | ( (lv_systems_12_0= ruleLogicalSystem ) ) | ( (lv_annotationTypes_13_0= ruleAnnotationType ) ) )* otherlv_14= '}' )
+            // InternalRoom.g:81:3: otherlv_0= 'RoomModel' ( (lv_name_1_0= ruleFQN ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_imports_4_0= ruleImport ) )* ( ( (lv_primitiveTypes_5_0= rulePrimitiveType ) ) | ( (lv_enumerationTypes_6_0= ruleEnumerationType ) ) | ( (lv_externalTypes_7_0= ruleExternalType ) ) | ( (lv_dataClasses_8_0= ruleDataClass ) ) | ( (lv_protocolClasses_9_0= ruleGeneralProtocolClass ) ) | ( (lv_actorClasses_10_0= ruleActorClass ) ) | ( (lv_subSystemClasses_11_0= ruleSubSystemClass ) ) | ( (lv_systems_12_0= ruleLogicalSystem ) ) | ( (lv_annotationTypes_13_0= ruleAnnotationType ) ) )* otherlv_14= '}'
             {
-            otherlv_0=(Token)match(input,12,FOLLOW_12_in_ruleRoomModel122); 
+            otherlv_0=(Token)match(input,12,FOLLOW_3); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getRoomModelAccess().getRoomModelKeyword_0());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:85:1: ( (lv_name_1_0= ruleFQN ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:86:1: (lv_name_1_0= ruleFQN )
+            // InternalRoom.g:85:1: ( (lv_name_1_0= ruleFQN ) )
+            // InternalRoom.g:86:1: (lv_name_1_0= ruleFQN )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:86:1: (lv_name_1_0= ruleFQN )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:87:3: lv_name_1_0= ruleFQN
+            // InternalRoom.g:86:1: (lv_name_1_0= ruleFQN )
+            // InternalRoom.g:87:3: lv_name_1_0= ruleFQN
             {
              
             	        newCompositeNode(grammarAccess.getRoomModelAccess().getNameFQNParserRuleCall_1_0()); 
             	    
-            pushFollow(FOLLOW_ruleFQN_in_ruleRoomModel143);
+            pushFollow(FOLLOW_4);
             lv_name_1_0=ruleFQN();
 
             state._fsp--;
@@ -296,7 +296,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"name",
                     		lv_name_1_0, 
-                    		"FQN");
+                    		"org.eclipse.etrice.core.common.Base.FQN");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -305,7 +305,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:103:2: ( (lv_docu_2_0= ruleDocumentation ) )?
+            // InternalRoom.g:103:2: ( (lv_docu_2_0= ruleDocumentation ) )?
             int alt1=2;
             int LA1_0 = input.LA(1);
 
@@ -314,15 +314,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt1) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:104:1: (lv_docu_2_0= ruleDocumentation )
+                    // InternalRoom.g:104:1: (lv_docu_2_0= ruleDocumentation )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:104:1: (lv_docu_2_0= ruleDocumentation )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:105:3: lv_docu_2_0= ruleDocumentation
+                    // InternalRoom.g:104:1: (lv_docu_2_0= ruleDocumentation )
+                    // InternalRoom.g:105:3: lv_docu_2_0= ruleDocumentation
                     {
                      
                     	        newCompositeNode(grammarAccess.getRoomModelAccess().getDocuDocumentationParserRuleCall_2_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDocumentation_in_ruleRoomModel164);
+                    pushFollow(FOLLOW_5);
                     lv_docu_2_0=ruleDocumentation();
 
                     state._fsp--;
@@ -335,7 +335,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"docu",
                             		lv_docu_2_0, 
-                            		"Documentation");
+                            		"org.eclipse.etrice.core.common.Base.Documentation");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -347,11 +347,11 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_3=(Token)match(input,13,FOLLOW_13_in_ruleRoomModel177); 
+            otherlv_3=(Token)match(input,13,FOLLOW_6); 
 
                 	newLeafNode(otherlv_3, grammarAccess.getRoomModelAccess().getLeftCurlyBracketKeyword_3());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:125:1: ( (lv_imports_4_0= ruleImport ) )*
+            // InternalRoom.g:125:1: ( (lv_imports_4_0= ruleImport ) )*
             loop2:
             do {
                 int alt2=2;
@@ -364,15 +364,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                 switch (alt2) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:126:1: (lv_imports_4_0= ruleImport )
+            	    // InternalRoom.g:126:1: (lv_imports_4_0= ruleImport )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:126:1: (lv_imports_4_0= ruleImport )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:127:3: lv_imports_4_0= ruleImport
+            	    // InternalRoom.g:126:1: (lv_imports_4_0= ruleImport )
+            	    // InternalRoom.g:127:3: lv_imports_4_0= ruleImport
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getRoomModelAccess().getImportsImportParserRuleCall_4_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleImport_in_ruleRoomModel198);
+            	    pushFollow(FOLLOW_6);
             	    lv_imports_4_0=ruleImport();
 
             	    state._fsp--;
@@ -385,7 +385,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"imports",
             	            		lv_imports_4_0, 
-            	            		"Import");
+            	            		"org.eclipse.etrice.core.common.Base.Import");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -400,25 +400,25 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                 }
             } while (true);
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:143:3: ( ( (lv_primitiveTypes_5_0= rulePrimitiveType ) ) | ( (lv_enumerationTypes_6_0= ruleEnumerationType ) ) | ( (lv_externalTypes_7_0= ruleExternalType ) ) | ( (lv_dataClasses_8_0= ruleDataClass ) ) | ( (lv_protocolClasses_9_0= ruleGeneralProtocolClass ) ) | ( (lv_actorClasses_10_0= ruleActorClass ) ) | ( (lv_subSystemClasses_11_0= ruleSubSystemClass ) ) | ( (lv_systems_12_0= ruleLogicalSystem ) ) | ( (lv_annotationTypes_13_0= ruleAnnotationType ) ) )*
+            // InternalRoom.g:143:3: ( ( (lv_primitiveTypes_5_0= rulePrimitiveType ) ) | ( (lv_enumerationTypes_6_0= ruleEnumerationType ) ) | ( (lv_externalTypes_7_0= ruleExternalType ) ) | ( (lv_dataClasses_8_0= ruleDataClass ) ) | ( (lv_protocolClasses_9_0= ruleGeneralProtocolClass ) ) | ( (lv_actorClasses_10_0= ruleActorClass ) ) | ( (lv_subSystemClasses_11_0= ruleSubSystemClass ) ) | ( (lv_systems_12_0= ruleLogicalSystem ) ) | ( (lv_annotationTypes_13_0= ruleAnnotationType ) ) )*
             loop3:
             do {
                 int alt3=10;
                 alt3 = dfa3.predict(input);
                 switch (alt3) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:143:4: ( (lv_primitiveTypes_5_0= rulePrimitiveType ) )
+            	    // InternalRoom.g:143:4: ( (lv_primitiveTypes_5_0= rulePrimitiveType ) )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:143:4: ( (lv_primitiveTypes_5_0= rulePrimitiveType ) )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:144:1: (lv_primitiveTypes_5_0= rulePrimitiveType )
+            	    // InternalRoom.g:143:4: ( (lv_primitiveTypes_5_0= rulePrimitiveType ) )
+            	    // InternalRoom.g:144:1: (lv_primitiveTypes_5_0= rulePrimitiveType )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:144:1: (lv_primitiveTypes_5_0= rulePrimitiveType )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:145:3: lv_primitiveTypes_5_0= rulePrimitiveType
+            	    // InternalRoom.g:144:1: (lv_primitiveTypes_5_0= rulePrimitiveType )
+            	    // InternalRoom.g:145:3: lv_primitiveTypes_5_0= rulePrimitiveType
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getRoomModelAccess().getPrimitiveTypesPrimitiveTypeParserRuleCall_5_0_0()); 
             	    	    
-            	    pushFollow(FOLLOW_rulePrimitiveType_in_ruleRoomModel221);
+            	    pushFollow(FOLLOW_7);
             	    lv_primitiveTypes_5_0=rulePrimitiveType();
 
             	    state._fsp--;
@@ -431,7 +431,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"primitiveTypes",
             	            		lv_primitiveTypes_5_0, 
-            	            		"PrimitiveType");
+            	            		"org.eclipse.etrice.core.Room.PrimitiveType");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -444,18 +444,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 2 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:162:6: ( (lv_enumerationTypes_6_0= ruleEnumerationType ) )
+            	    // InternalRoom.g:162:6: ( (lv_enumerationTypes_6_0= ruleEnumerationType ) )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:162:6: ( (lv_enumerationTypes_6_0= ruleEnumerationType ) )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:163:1: (lv_enumerationTypes_6_0= ruleEnumerationType )
+            	    // InternalRoom.g:162:6: ( (lv_enumerationTypes_6_0= ruleEnumerationType ) )
+            	    // InternalRoom.g:163:1: (lv_enumerationTypes_6_0= ruleEnumerationType )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:163:1: (lv_enumerationTypes_6_0= ruleEnumerationType )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:164:3: lv_enumerationTypes_6_0= ruleEnumerationType
+            	    // InternalRoom.g:163:1: (lv_enumerationTypes_6_0= ruleEnumerationType )
+            	    // InternalRoom.g:164:3: lv_enumerationTypes_6_0= ruleEnumerationType
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getRoomModelAccess().getEnumerationTypesEnumerationTypeParserRuleCall_5_1_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleEnumerationType_in_ruleRoomModel248);
+            	    pushFollow(FOLLOW_7);
             	    lv_enumerationTypes_6_0=ruleEnumerationType();
 
             	    state._fsp--;
@@ -468,7 +468,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"enumerationTypes",
             	            		lv_enumerationTypes_6_0, 
-            	            		"EnumerationType");
+            	            		"org.eclipse.etrice.core.Room.EnumerationType");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -481,18 +481,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 3 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:181:6: ( (lv_externalTypes_7_0= ruleExternalType ) )
+            	    // InternalRoom.g:181:6: ( (lv_externalTypes_7_0= ruleExternalType ) )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:181:6: ( (lv_externalTypes_7_0= ruleExternalType ) )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:182:1: (lv_externalTypes_7_0= ruleExternalType )
+            	    // InternalRoom.g:181:6: ( (lv_externalTypes_7_0= ruleExternalType ) )
+            	    // InternalRoom.g:182:1: (lv_externalTypes_7_0= ruleExternalType )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:182:1: (lv_externalTypes_7_0= ruleExternalType )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:183:3: lv_externalTypes_7_0= ruleExternalType
+            	    // InternalRoom.g:182:1: (lv_externalTypes_7_0= ruleExternalType )
+            	    // InternalRoom.g:183:3: lv_externalTypes_7_0= ruleExternalType
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getRoomModelAccess().getExternalTypesExternalTypeParserRuleCall_5_2_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleExternalType_in_ruleRoomModel275);
+            	    pushFollow(FOLLOW_7);
             	    lv_externalTypes_7_0=ruleExternalType();
 
             	    state._fsp--;
@@ -505,7 +505,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"externalTypes",
             	            		lv_externalTypes_7_0, 
-            	            		"ExternalType");
+            	            		"org.eclipse.etrice.core.Room.ExternalType");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -518,18 +518,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 4 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:200:6: ( (lv_dataClasses_8_0= ruleDataClass ) )
+            	    // InternalRoom.g:200:6: ( (lv_dataClasses_8_0= ruleDataClass ) )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:200:6: ( (lv_dataClasses_8_0= ruleDataClass ) )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:201:1: (lv_dataClasses_8_0= ruleDataClass )
+            	    // InternalRoom.g:200:6: ( (lv_dataClasses_8_0= ruleDataClass ) )
+            	    // InternalRoom.g:201:1: (lv_dataClasses_8_0= ruleDataClass )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:201:1: (lv_dataClasses_8_0= ruleDataClass )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:202:3: lv_dataClasses_8_0= ruleDataClass
+            	    // InternalRoom.g:201:1: (lv_dataClasses_8_0= ruleDataClass )
+            	    // InternalRoom.g:202:3: lv_dataClasses_8_0= ruleDataClass
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getRoomModelAccess().getDataClassesDataClassParserRuleCall_5_3_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleDataClass_in_ruleRoomModel302);
+            	    pushFollow(FOLLOW_7);
             	    lv_dataClasses_8_0=ruleDataClass();
 
             	    state._fsp--;
@@ -542,7 +542,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"dataClasses",
             	            		lv_dataClasses_8_0, 
-            	            		"DataClass");
+            	            		"org.eclipse.etrice.core.Room.DataClass");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -555,18 +555,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 5 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:219:6: ( (lv_protocolClasses_9_0= ruleGeneralProtocolClass ) )
+            	    // InternalRoom.g:219:6: ( (lv_protocolClasses_9_0= ruleGeneralProtocolClass ) )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:219:6: ( (lv_protocolClasses_9_0= ruleGeneralProtocolClass ) )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:220:1: (lv_protocolClasses_9_0= ruleGeneralProtocolClass )
+            	    // InternalRoom.g:219:6: ( (lv_protocolClasses_9_0= ruleGeneralProtocolClass ) )
+            	    // InternalRoom.g:220:1: (lv_protocolClasses_9_0= ruleGeneralProtocolClass )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:220:1: (lv_protocolClasses_9_0= ruleGeneralProtocolClass )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:221:3: lv_protocolClasses_9_0= ruleGeneralProtocolClass
+            	    // InternalRoom.g:220:1: (lv_protocolClasses_9_0= ruleGeneralProtocolClass )
+            	    // InternalRoom.g:221:3: lv_protocolClasses_9_0= ruleGeneralProtocolClass
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getRoomModelAccess().getProtocolClassesGeneralProtocolClassParserRuleCall_5_4_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleGeneralProtocolClass_in_ruleRoomModel329);
+            	    pushFollow(FOLLOW_7);
             	    lv_protocolClasses_9_0=ruleGeneralProtocolClass();
 
             	    state._fsp--;
@@ -579,7 +579,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"protocolClasses",
             	            		lv_protocolClasses_9_0, 
-            	            		"GeneralProtocolClass");
+            	            		"org.eclipse.etrice.core.Room.GeneralProtocolClass");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -592,18 +592,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 6 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:238:6: ( (lv_actorClasses_10_0= ruleActorClass ) )
+            	    // InternalRoom.g:238:6: ( (lv_actorClasses_10_0= ruleActorClass ) )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:238:6: ( (lv_actorClasses_10_0= ruleActorClass ) )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:239:1: (lv_actorClasses_10_0= ruleActorClass )
+            	    // InternalRoom.g:238:6: ( (lv_actorClasses_10_0= ruleActorClass ) )
+            	    // InternalRoom.g:239:1: (lv_actorClasses_10_0= ruleActorClass )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:239:1: (lv_actorClasses_10_0= ruleActorClass )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:240:3: lv_actorClasses_10_0= ruleActorClass
+            	    // InternalRoom.g:239:1: (lv_actorClasses_10_0= ruleActorClass )
+            	    // InternalRoom.g:240:3: lv_actorClasses_10_0= ruleActorClass
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getRoomModelAccess().getActorClassesActorClassParserRuleCall_5_5_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleActorClass_in_ruleRoomModel356);
+            	    pushFollow(FOLLOW_7);
             	    lv_actorClasses_10_0=ruleActorClass();
 
             	    state._fsp--;
@@ -616,7 +616,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"actorClasses",
             	            		lv_actorClasses_10_0, 
-            	            		"ActorClass");
+            	            		"org.eclipse.etrice.core.Room.ActorClass");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -629,18 +629,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 7 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:257:6: ( (lv_subSystemClasses_11_0= ruleSubSystemClass ) )
+            	    // InternalRoom.g:257:6: ( (lv_subSystemClasses_11_0= ruleSubSystemClass ) )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:257:6: ( (lv_subSystemClasses_11_0= ruleSubSystemClass ) )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:258:1: (lv_subSystemClasses_11_0= ruleSubSystemClass )
+            	    // InternalRoom.g:257:6: ( (lv_subSystemClasses_11_0= ruleSubSystemClass ) )
+            	    // InternalRoom.g:258:1: (lv_subSystemClasses_11_0= ruleSubSystemClass )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:258:1: (lv_subSystemClasses_11_0= ruleSubSystemClass )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:259:3: lv_subSystemClasses_11_0= ruleSubSystemClass
+            	    // InternalRoom.g:258:1: (lv_subSystemClasses_11_0= ruleSubSystemClass )
+            	    // InternalRoom.g:259:3: lv_subSystemClasses_11_0= ruleSubSystemClass
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getRoomModelAccess().getSubSystemClassesSubSystemClassParserRuleCall_5_6_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleSubSystemClass_in_ruleRoomModel383);
+            	    pushFollow(FOLLOW_7);
             	    lv_subSystemClasses_11_0=ruleSubSystemClass();
 
             	    state._fsp--;
@@ -653,7 +653,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"subSystemClasses",
             	            		lv_subSystemClasses_11_0, 
-            	            		"SubSystemClass");
+            	            		"org.eclipse.etrice.core.Room.SubSystemClass");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -666,18 +666,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 8 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:276:6: ( (lv_systems_12_0= ruleLogicalSystem ) )
+            	    // InternalRoom.g:276:6: ( (lv_systems_12_0= ruleLogicalSystem ) )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:276:6: ( (lv_systems_12_0= ruleLogicalSystem ) )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:277:1: (lv_systems_12_0= ruleLogicalSystem )
+            	    // InternalRoom.g:276:6: ( (lv_systems_12_0= ruleLogicalSystem ) )
+            	    // InternalRoom.g:277:1: (lv_systems_12_0= ruleLogicalSystem )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:277:1: (lv_systems_12_0= ruleLogicalSystem )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:278:3: lv_systems_12_0= ruleLogicalSystem
+            	    // InternalRoom.g:277:1: (lv_systems_12_0= ruleLogicalSystem )
+            	    // InternalRoom.g:278:3: lv_systems_12_0= ruleLogicalSystem
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getRoomModelAccess().getSystemsLogicalSystemParserRuleCall_5_7_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleLogicalSystem_in_ruleRoomModel410);
+            	    pushFollow(FOLLOW_7);
             	    lv_systems_12_0=ruleLogicalSystem();
 
             	    state._fsp--;
@@ -690,7 +690,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"systems",
             	            		lv_systems_12_0, 
-            	            		"LogicalSystem");
+            	            		"org.eclipse.etrice.core.Room.LogicalSystem");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -703,18 +703,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 9 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:295:6: ( (lv_annotationTypes_13_0= ruleAnnotationType ) )
+            	    // InternalRoom.g:295:6: ( (lv_annotationTypes_13_0= ruleAnnotationType ) )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:295:6: ( (lv_annotationTypes_13_0= ruleAnnotationType ) )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:296:1: (lv_annotationTypes_13_0= ruleAnnotationType )
+            	    // InternalRoom.g:295:6: ( (lv_annotationTypes_13_0= ruleAnnotationType ) )
+            	    // InternalRoom.g:296:1: (lv_annotationTypes_13_0= ruleAnnotationType )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:296:1: (lv_annotationTypes_13_0= ruleAnnotationType )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:297:3: lv_annotationTypes_13_0= ruleAnnotationType
+            	    // InternalRoom.g:296:1: (lv_annotationTypes_13_0= ruleAnnotationType )
+            	    // InternalRoom.g:297:3: lv_annotationTypes_13_0= ruleAnnotationType
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getRoomModelAccess().getAnnotationTypesAnnotationTypeParserRuleCall_5_8_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleAnnotationType_in_ruleRoomModel437);
+            	    pushFollow(FOLLOW_7);
             	    lv_annotationTypes_13_0=ruleAnnotationType();
 
             	    state._fsp--;
@@ -727,7 +727,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"annotationTypes",
             	            		lv_annotationTypes_13_0, 
-            	            		"AnnotationType");
+            	            		"org.eclipse.etrice.core.common.Base.AnnotationType");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -745,7 +745,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                 }
             } while (true);
 
-            otherlv_14=(Token)match(input,14,FOLLOW_14_in_ruleRoomModel451); 
+            otherlv_14=(Token)match(input,14,FOLLOW_2); 
 
                 	newLeafNode(otherlv_14, grammarAccess.getRoomModelAccess().getRightCurlyBracketKeyword_6());
                 
@@ -770,7 +770,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleStructureClass"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:327:1: entryRuleStructureClass returns [EObject current=null] : iv_ruleStructureClass= ruleStructureClass EOF ;
+    // InternalRoom.g:327:1: entryRuleStructureClass returns [EObject current=null] : iv_ruleStructureClass= ruleStructureClass EOF ;
     public final EObject entryRuleStructureClass() throws RecognitionException {
         EObject current = null;
 
@@ -778,17 +778,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:328:2: (iv_ruleStructureClass= ruleStructureClass EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:329:2: iv_ruleStructureClass= ruleStructureClass EOF
+            // InternalRoom.g:328:2: (iv_ruleStructureClass= ruleStructureClass EOF )
+            // InternalRoom.g:329:2: iv_ruleStructureClass= ruleStructureClass EOF
             {
              newCompositeNode(grammarAccess.getStructureClassRule()); 
-            pushFollow(FOLLOW_ruleStructureClass_in_entryRuleStructureClass489);
+            pushFollow(FOLLOW_1);
             iv_ruleStructureClass=ruleStructureClass();
 
             state._fsp--;
 
              current =iv_ruleStructureClass; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleStructureClass499); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -806,7 +806,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleStructureClass"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:336:1: ruleStructureClass returns [EObject current=null] : (this_ActorContainerClass_0= ruleActorContainerClass | this_LogicalSystem_1= ruleLogicalSystem ) ;
+    // InternalRoom.g:336:1: ruleStructureClass returns [EObject current=null] : (this_ActorContainerClass_0= ruleActorContainerClass | this_LogicalSystem_1= ruleLogicalSystem ) ;
     public final EObject ruleStructureClass() throws RecognitionException {
         EObject current = null;
 
@@ -818,10 +818,10 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:339:28: ( (this_ActorContainerClass_0= ruleActorContainerClass | this_LogicalSystem_1= ruleLogicalSystem ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:340:1: (this_ActorContainerClass_0= ruleActorContainerClass | this_LogicalSystem_1= ruleLogicalSystem )
+            // InternalRoom.g:339:28: ( (this_ActorContainerClass_0= ruleActorContainerClass | this_LogicalSystem_1= ruleLogicalSystem ) )
+            // InternalRoom.g:340:1: (this_ActorContainerClass_0= ruleActorContainerClass | this_LogicalSystem_1= ruleLogicalSystem )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:340:1: (this_ActorContainerClass_0= ruleActorContainerClass | this_LogicalSystem_1= ruleLogicalSystem )
+            // InternalRoom.g:340:1: (this_ActorContainerClass_0= ruleActorContainerClass | this_LogicalSystem_1= ruleLogicalSystem )
             int alt4=2;
             int LA4_0 = input.LA(1);
 
@@ -839,12 +839,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt4) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:341:5: this_ActorContainerClass_0= ruleActorContainerClass
+                    // InternalRoom.g:341:5: this_ActorContainerClass_0= ruleActorContainerClass
                     {
                      
                             newCompositeNode(grammarAccess.getStructureClassAccess().getActorContainerClassParserRuleCall_0()); 
                         
-                    pushFollow(FOLLOW_ruleActorContainerClass_in_ruleStructureClass546);
+                    pushFollow(FOLLOW_2);
                     this_ActorContainerClass_0=ruleActorContainerClass();
 
                     state._fsp--;
@@ -857,12 +857,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:351:5: this_LogicalSystem_1= ruleLogicalSystem
+                    // InternalRoom.g:351:5: this_LogicalSystem_1= ruleLogicalSystem
                     {
                      
                             newCompositeNode(grammarAccess.getStructureClassAccess().getLogicalSystemParserRuleCall_1()); 
                         
-                    pushFollow(FOLLOW_ruleLogicalSystem_in_ruleStructureClass573);
+                    pushFollow(FOLLOW_2);
                     this_LogicalSystem_1=ruleLogicalSystem();
 
                     state._fsp--;
@@ -895,7 +895,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleActorContainerClass"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:367:1: entryRuleActorContainerClass returns [EObject current=null] : iv_ruleActorContainerClass= ruleActorContainerClass EOF ;
+    // InternalRoom.g:367:1: entryRuleActorContainerClass returns [EObject current=null] : iv_ruleActorContainerClass= ruleActorContainerClass EOF ;
     public final EObject entryRuleActorContainerClass() throws RecognitionException {
         EObject current = null;
 
@@ -903,17 +903,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:368:2: (iv_ruleActorContainerClass= ruleActorContainerClass EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:369:2: iv_ruleActorContainerClass= ruleActorContainerClass EOF
+            // InternalRoom.g:368:2: (iv_ruleActorContainerClass= ruleActorContainerClass EOF )
+            // InternalRoom.g:369:2: iv_ruleActorContainerClass= ruleActorContainerClass EOF
             {
              newCompositeNode(grammarAccess.getActorContainerClassRule()); 
-            pushFollow(FOLLOW_ruleActorContainerClass_in_entryRuleActorContainerClass608);
+            pushFollow(FOLLOW_1);
             iv_ruleActorContainerClass=ruleActorContainerClass();
 
             state._fsp--;
 
              current =iv_ruleActorContainerClass; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleActorContainerClass618); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -931,7 +931,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleActorContainerClass"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:376:1: ruleActorContainerClass returns [EObject current=null] : (this_ActorClass_0= ruleActorClass | this_SubSystemClass_1= ruleSubSystemClass ) ;
+    // InternalRoom.g:376:1: ruleActorContainerClass returns [EObject current=null] : (this_ActorClass_0= ruleActorClass | this_SubSystemClass_1= ruleSubSystemClass ) ;
     public final EObject ruleActorContainerClass() throws RecognitionException {
         EObject current = null;
 
@@ -943,10 +943,10 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:379:28: ( (this_ActorClass_0= ruleActorClass | this_SubSystemClass_1= ruleSubSystemClass ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:380:1: (this_ActorClass_0= ruleActorClass | this_SubSystemClass_1= ruleSubSystemClass )
+            // InternalRoom.g:379:28: ( (this_ActorClass_0= ruleActorClass | this_SubSystemClass_1= ruleSubSystemClass ) )
+            // InternalRoom.g:380:1: (this_ActorClass_0= ruleActorClass | this_SubSystemClass_1= ruleSubSystemClass )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:380:1: (this_ActorClass_0= ruleActorClass | this_SubSystemClass_1= ruleSubSystemClass )
+            // InternalRoom.g:380:1: (this_ActorClass_0= ruleActorClass | this_SubSystemClass_1= ruleSubSystemClass )
             int alt5=2;
             int LA5_0 = input.LA(1);
 
@@ -964,12 +964,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt5) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:381:5: this_ActorClass_0= ruleActorClass
+                    // InternalRoom.g:381:5: this_ActorClass_0= ruleActorClass
                     {
                      
                             newCompositeNode(grammarAccess.getActorContainerClassAccess().getActorClassParserRuleCall_0()); 
                         
-                    pushFollow(FOLLOW_ruleActorClass_in_ruleActorContainerClass665);
+                    pushFollow(FOLLOW_2);
                     this_ActorClass_0=ruleActorClass();
 
                     state._fsp--;
@@ -982,12 +982,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:391:5: this_SubSystemClass_1= ruleSubSystemClass
+                    // InternalRoom.g:391:5: this_SubSystemClass_1= ruleSubSystemClass
                     {
                      
                             newCompositeNode(grammarAccess.getActorContainerClassAccess().getSubSystemClassParserRuleCall_1()); 
                         
-                    pushFollow(FOLLOW_ruleSubSystemClass_in_ruleActorContainerClass692);
+                    pushFollow(FOLLOW_2);
                     this_SubSystemClass_1=ruleSubSystemClass();
 
                     state._fsp--;
@@ -1020,7 +1020,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleVarDecl"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:407:1: entryRuleVarDecl returns [EObject current=null] : iv_ruleVarDecl= ruleVarDecl EOF ;
+    // InternalRoom.g:407:1: entryRuleVarDecl returns [EObject current=null] : iv_ruleVarDecl= ruleVarDecl EOF ;
     public final EObject entryRuleVarDecl() throws RecognitionException {
         EObject current = null;
 
@@ -1028,17 +1028,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:408:2: (iv_ruleVarDecl= ruleVarDecl EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:409:2: iv_ruleVarDecl= ruleVarDecl EOF
+            // InternalRoom.g:408:2: (iv_ruleVarDecl= ruleVarDecl EOF )
+            // InternalRoom.g:409:2: iv_ruleVarDecl= ruleVarDecl EOF
             {
              newCompositeNode(grammarAccess.getVarDeclRule()); 
-            pushFollow(FOLLOW_ruleVarDecl_in_entryRuleVarDecl727);
+            pushFollow(FOLLOW_1);
             iv_ruleVarDecl=ruleVarDecl();
 
             state._fsp--;
 
              current =iv_ruleVarDecl; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleVarDecl737); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1056,7 +1056,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleVarDecl"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:416:1: ruleVarDecl returns [EObject current=null] : ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= ':' ( (lv_refType_2_0= ruleRefableType ) ) ) ;
+    // InternalRoom.g:416:1: ruleVarDecl returns [EObject current=null] : ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= ':' ( (lv_refType_2_0= ruleRefableType ) ) ) ;
     public final EObject ruleVarDecl() throws RecognitionException {
         EObject current = null;
 
@@ -1068,19 +1068,19 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:419:28: ( ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= ':' ( (lv_refType_2_0= ruleRefableType ) ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:420:1: ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= ':' ( (lv_refType_2_0= ruleRefableType ) ) )
+            // InternalRoom.g:419:28: ( ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= ':' ( (lv_refType_2_0= ruleRefableType ) ) ) )
+            // InternalRoom.g:420:1: ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= ':' ( (lv_refType_2_0= ruleRefableType ) ) )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:420:1: ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= ':' ( (lv_refType_2_0= ruleRefableType ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:420:2: ( (lv_name_0_0= RULE_ID ) ) otherlv_1= ':' ( (lv_refType_2_0= ruleRefableType ) )
+            // InternalRoom.g:420:1: ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= ':' ( (lv_refType_2_0= ruleRefableType ) ) )
+            // InternalRoom.g:420:2: ( (lv_name_0_0= RULE_ID ) ) otherlv_1= ':' ( (lv_refType_2_0= ruleRefableType ) )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:420:2: ( (lv_name_0_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:421:1: (lv_name_0_0= RULE_ID )
+            // InternalRoom.g:420:2: ( (lv_name_0_0= RULE_ID ) )
+            // InternalRoom.g:421:1: (lv_name_0_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:421:1: (lv_name_0_0= RULE_ID )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:422:3: lv_name_0_0= RULE_ID
+            // InternalRoom.g:421:1: (lv_name_0_0= RULE_ID )
+            // InternalRoom.g:422:3: lv_name_0_0= RULE_ID
             {
-            lv_name_0_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleVarDecl779); 
+            lv_name_0_0=(Token)match(input,RULE_ID,FOLLOW_8); 
 
             			newLeafNode(lv_name_0_0, grammarAccess.getVarDeclAccess().getNameIDTerminalRuleCall_0_0()); 
             		
@@ -1092,7 +1092,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"name",
                     		lv_name_0_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -1100,20 +1100,20 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,15,FOLLOW_15_in_ruleVarDecl796); 
+            otherlv_1=(Token)match(input,15,FOLLOW_3); 
 
                 	newLeafNode(otherlv_1, grammarAccess.getVarDeclAccess().getColonKeyword_1());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:442:1: ( (lv_refType_2_0= ruleRefableType ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:443:1: (lv_refType_2_0= ruleRefableType )
+            // InternalRoom.g:442:1: ( (lv_refType_2_0= ruleRefableType ) )
+            // InternalRoom.g:443:1: (lv_refType_2_0= ruleRefableType )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:443:1: (lv_refType_2_0= ruleRefableType )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:444:3: lv_refType_2_0= ruleRefableType
+            // InternalRoom.g:443:1: (lv_refType_2_0= ruleRefableType )
+            // InternalRoom.g:444:3: lv_refType_2_0= ruleRefableType
             {
              
             	        newCompositeNode(grammarAccess.getVarDeclAccess().getRefTypeRefableTypeParserRuleCall_2_0()); 
             	    
-            pushFollow(FOLLOW_ruleRefableType_in_ruleVarDecl817);
+            pushFollow(FOLLOW_2);
             lv_refType_2_0=ruleRefableType();
 
             state._fsp--;
@@ -1126,7 +1126,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"refType",
                     		lv_refType_2_0, 
-                    		"RefableType");
+                    		"org.eclipse.etrice.core.Room.RefableType");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -1156,7 +1156,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleRefableType"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:468:1: entryRuleRefableType returns [EObject current=null] : iv_ruleRefableType= ruleRefableType EOF ;
+    // InternalRoom.g:468:1: entryRuleRefableType returns [EObject current=null] : iv_ruleRefableType= ruleRefableType EOF ;
     public final EObject entryRuleRefableType() throws RecognitionException {
         EObject current = null;
 
@@ -1164,17 +1164,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:469:2: (iv_ruleRefableType= ruleRefableType EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:470:2: iv_ruleRefableType= ruleRefableType EOF
+            // InternalRoom.g:469:2: (iv_ruleRefableType= ruleRefableType EOF )
+            // InternalRoom.g:470:2: iv_ruleRefableType= ruleRefableType EOF
             {
              newCompositeNode(grammarAccess.getRefableTypeRule()); 
-            pushFollow(FOLLOW_ruleRefableType_in_entryRuleRefableType853);
+            pushFollow(FOLLOW_1);
             iv_ruleRefableType=ruleRefableType();
 
             state._fsp--;
 
              current =iv_ruleRefableType; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRefableType863); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1192,7 +1192,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleRefableType"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:477:1: ruleRefableType returns [EObject current=null] : ( ( ( ruleFQN ) ) ( (lv_ref_1_0= 'ref' ) )? ) ;
+    // InternalRoom.g:477:1: ruleRefableType returns [EObject current=null] : ( ( ( ruleFQN ) ) ( (lv_ref_1_0= 'ref' ) )? ) ;
     public final EObject ruleRefableType() throws RecognitionException {
         EObject current = null;
 
@@ -1201,17 +1201,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:480:28: ( ( ( ( ruleFQN ) ) ( (lv_ref_1_0= 'ref' ) )? ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:481:1: ( ( ( ruleFQN ) ) ( (lv_ref_1_0= 'ref' ) )? )
+            // InternalRoom.g:480:28: ( ( ( ( ruleFQN ) ) ( (lv_ref_1_0= 'ref' ) )? ) )
+            // InternalRoom.g:481:1: ( ( ( ruleFQN ) ) ( (lv_ref_1_0= 'ref' ) )? )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:481:1: ( ( ( ruleFQN ) ) ( (lv_ref_1_0= 'ref' ) )? )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:481:2: ( ( ruleFQN ) ) ( (lv_ref_1_0= 'ref' ) )?
+            // InternalRoom.g:481:1: ( ( ( ruleFQN ) ) ( (lv_ref_1_0= 'ref' ) )? )
+            // InternalRoom.g:481:2: ( ( ruleFQN ) ) ( (lv_ref_1_0= 'ref' ) )?
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:481:2: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:482:1: ( ruleFQN )
+            // InternalRoom.g:481:2: ( ( ruleFQN ) )
+            // InternalRoom.g:482:1: ( ruleFQN )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:482:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:483:3: ruleFQN
+            // InternalRoom.g:482:1: ( ruleFQN )
+            // InternalRoom.g:483:3: ruleFQN
             {
 
             			if (current==null) {
@@ -1221,7 +1221,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
              
             	        newCompositeNode(grammarAccess.getRefableTypeAccess().getTypeDataTypeCrossReference_0_0()); 
             	    
-            pushFollow(FOLLOW_ruleFQN_in_ruleRefableType911);
+            pushFollow(FOLLOW_9);
             ruleFQN();
 
             state._fsp--;
@@ -1235,7 +1235,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:496:2: ( (lv_ref_1_0= 'ref' ) )?
+            // InternalRoom.g:496:2: ( (lv_ref_1_0= 'ref' ) )?
             int alt6=2;
             int LA6_0 = input.LA(1);
 
@@ -1244,12 +1244,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt6) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:497:1: (lv_ref_1_0= 'ref' )
+                    // InternalRoom.g:497:1: (lv_ref_1_0= 'ref' )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:497:1: (lv_ref_1_0= 'ref' )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:498:3: lv_ref_1_0= 'ref'
+                    // InternalRoom.g:497:1: (lv_ref_1_0= 'ref' )
+                    // InternalRoom.g:498:3: lv_ref_1_0= 'ref'
                     {
-                    lv_ref_1_0=(Token)match(input,16,FOLLOW_16_in_ruleRefableType929); 
+                    lv_ref_1_0=(Token)match(input,16,FOLLOW_2); 
 
                             newLeafNode(lv_ref_1_0, grammarAccess.getRefableTypeAccess().getRefRefKeyword_1_0());
                         
@@ -1289,7 +1289,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleDataType"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:519:1: entryRuleDataType returns [EObject current=null] : iv_ruleDataType= ruleDataType EOF ;
+    // InternalRoom.g:519:1: entryRuleDataType returns [EObject current=null] : iv_ruleDataType= ruleDataType EOF ;
     public final EObject entryRuleDataType() throws RecognitionException {
         EObject current = null;
 
@@ -1297,17 +1297,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:520:2: (iv_ruleDataType= ruleDataType EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:521:2: iv_ruleDataType= ruleDataType EOF
+            // InternalRoom.g:520:2: (iv_ruleDataType= ruleDataType EOF )
+            // InternalRoom.g:521:2: iv_ruleDataType= ruleDataType EOF
             {
              newCompositeNode(grammarAccess.getDataTypeRule()); 
-            pushFollow(FOLLOW_ruleDataType_in_entryRuleDataType979);
+            pushFollow(FOLLOW_1);
             iv_ruleDataType=ruleDataType();
 
             state._fsp--;
 
              current =iv_ruleDataType; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDataType989); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1325,7 +1325,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleDataType"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:528:1: ruleDataType returns [EObject current=null] : (this_PrimitiveType_0= rulePrimitiveType | this_EnumerationType_1= ruleEnumerationType | this_ComplexType_2= ruleComplexType ) ;
+    // InternalRoom.g:528:1: ruleDataType returns [EObject current=null] : (this_PrimitiveType_0= rulePrimitiveType | this_EnumerationType_1= ruleEnumerationType | this_ComplexType_2= ruleComplexType ) ;
     public final EObject ruleDataType() throws RecognitionException {
         EObject current = null;
 
@@ -1339,10 +1339,10 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:531:28: ( (this_PrimitiveType_0= rulePrimitiveType | this_EnumerationType_1= ruleEnumerationType | this_ComplexType_2= ruleComplexType ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:532:1: (this_PrimitiveType_0= rulePrimitiveType | this_EnumerationType_1= ruleEnumerationType | this_ComplexType_2= ruleComplexType )
+            // InternalRoom.g:531:28: ( (this_PrimitiveType_0= rulePrimitiveType | this_EnumerationType_1= ruleEnumerationType | this_ComplexType_2= ruleComplexType ) )
+            // InternalRoom.g:532:1: (this_PrimitiveType_0= rulePrimitiveType | this_EnumerationType_1= ruleEnumerationType | this_ComplexType_2= ruleComplexType )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:532:1: (this_PrimitiveType_0= rulePrimitiveType | this_EnumerationType_1= ruleEnumerationType | this_ComplexType_2= ruleComplexType )
+            // InternalRoom.g:532:1: (this_PrimitiveType_0= rulePrimitiveType | this_EnumerationType_1= ruleEnumerationType | this_ComplexType_2= ruleComplexType )
             int alt7=3;
             switch ( input.LA(1) ) {
             case 17:
@@ -1370,12 +1370,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             switch (alt7) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:533:5: this_PrimitiveType_0= rulePrimitiveType
+                    // InternalRoom.g:533:5: this_PrimitiveType_0= rulePrimitiveType
                     {
                      
                             newCompositeNode(grammarAccess.getDataTypeAccess().getPrimitiveTypeParserRuleCall_0()); 
                         
-                    pushFollow(FOLLOW_rulePrimitiveType_in_ruleDataType1036);
+                    pushFollow(FOLLOW_2);
                     this_PrimitiveType_0=rulePrimitiveType();
 
                     state._fsp--;
@@ -1388,12 +1388,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:543:5: this_EnumerationType_1= ruleEnumerationType
+                    // InternalRoom.g:543:5: this_EnumerationType_1= ruleEnumerationType
                     {
                      
                             newCompositeNode(grammarAccess.getDataTypeAccess().getEnumerationTypeParserRuleCall_1()); 
                         
-                    pushFollow(FOLLOW_ruleEnumerationType_in_ruleDataType1063);
+                    pushFollow(FOLLOW_2);
                     this_EnumerationType_1=ruleEnumerationType();
 
                     state._fsp--;
@@ -1406,12 +1406,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:553:5: this_ComplexType_2= ruleComplexType
+                    // InternalRoom.g:553:5: this_ComplexType_2= ruleComplexType
                     {
                      
                             newCompositeNode(grammarAccess.getDataTypeAccess().getComplexTypeParserRuleCall_2()); 
                         
-                    pushFollow(FOLLOW_ruleComplexType_in_ruleDataType1090);
+                    pushFollow(FOLLOW_2);
                     this_ComplexType_2=ruleComplexType();
 
                     state._fsp--;
@@ -1444,7 +1444,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleComplexType"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:569:1: entryRuleComplexType returns [EObject current=null] : iv_ruleComplexType= ruleComplexType EOF ;
+    // InternalRoom.g:569:1: entryRuleComplexType returns [EObject current=null] : iv_ruleComplexType= ruleComplexType EOF ;
     public final EObject entryRuleComplexType() throws RecognitionException {
         EObject current = null;
 
@@ -1452,17 +1452,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:570:2: (iv_ruleComplexType= ruleComplexType EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:571:2: iv_ruleComplexType= ruleComplexType EOF
+            // InternalRoom.g:570:2: (iv_ruleComplexType= ruleComplexType EOF )
+            // InternalRoom.g:571:2: iv_ruleComplexType= ruleComplexType EOF
             {
              newCompositeNode(grammarAccess.getComplexTypeRule()); 
-            pushFollow(FOLLOW_ruleComplexType_in_entryRuleComplexType1125);
+            pushFollow(FOLLOW_1);
             iv_ruleComplexType=ruleComplexType();
 
             state._fsp--;
 
              current =iv_ruleComplexType; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleComplexType1135); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1480,7 +1480,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleComplexType"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:578:1: ruleComplexType returns [EObject current=null] : (this_DataClass_0= ruleDataClass | this_ExternalType_1= ruleExternalType ) ;
+    // InternalRoom.g:578:1: ruleComplexType returns [EObject current=null] : (this_DataClass_0= ruleDataClass | this_ExternalType_1= ruleExternalType ) ;
     public final EObject ruleComplexType() throws RecognitionException {
         EObject current = null;
 
@@ -1492,10 +1492,10 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:581:28: ( (this_DataClass_0= ruleDataClass | this_ExternalType_1= ruleExternalType ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:582:1: (this_DataClass_0= ruleDataClass | this_ExternalType_1= ruleExternalType )
+            // InternalRoom.g:581:28: ( (this_DataClass_0= ruleDataClass | this_ExternalType_1= ruleExternalType ) )
+            // InternalRoom.g:582:1: (this_DataClass_0= ruleDataClass | this_ExternalType_1= ruleExternalType )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:582:1: (this_DataClass_0= ruleDataClass | this_ExternalType_1= ruleExternalType )
+            // InternalRoom.g:582:1: (this_DataClass_0= ruleDataClass | this_ExternalType_1= ruleExternalType )
             int alt8=2;
             int LA8_0 = input.LA(1);
 
@@ -1513,12 +1513,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt8) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:583:5: this_DataClass_0= ruleDataClass
+                    // InternalRoom.g:583:5: this_DataClass_0= ruleDataClass
                     {
                      
                             newCompositeNode(grammarAccess.getComplexTypeAccess().getDataClassParserRuleCall_0()); 
                         
-                    pushFollow(FOLLOW_ruleDataClass_in_ruleComplexType1182);
+                    pushFollow(FOLLOW_2);
                     this_DataClass_0=ruleDataClass();
 
                     state._fsp--;
@@ -1531,12 +1531,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:593:5: this_ExternalType_1= ruleExternalType
+                    // InternalRoom.g:593:5: this_ExternalType_1= ruleExternalType
                     {
                      
                             newCompositeNode(grammarAccess.getComplexTypeAccess().getExternalTypeParserRuleCall_1()); 
                         
-                    pushFollow(FOLLOW_ruleExternalType_in_ruleComplexType1209);
+                    pushFollow(FOLLOW_2);
                     this_ExternalType_1=ruleExternalType();
 
                     state._fsp--;
@@ -1569,7 +1569,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRulePrimitiveType"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:609:1: entryRulePrimitiveType returns [EObject current=null] : iv_rulePrimitiveType= rulePrimitiveType EOF ;
+    // InternalRoom.g:609:1: entryRulePrimitiveType returns [EObject current=null] : iv_rulePrimitiveType= rulePrimitiveType EOF ;
     public final EObject entryRulePrimitiveType() throws RecognitionException {
         EObject current = null;
 
@@ -1577,17 +1577,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:610:2: (iv_rulePrimitiveType= rulePrimitiveType EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:611:2: iv_rulePrimitiveType= rulePrimitiveType EOF
+            // InternalRoom.g:610:2: (iv_rulePrimitiveType= rulePrimitiveType EOF )
+            // InternalRoom.g:611:2: iv_rulePrimitiveType= rulePrimitiveType EOF
             {
              newCompositeNode(grammarAccess.getPrimitiveTypeRule()); 
-            pushFollow(FOLLOW_rulePrimitiveType_in_entryRulePrimitiveType1244);
+            pushFollow(FOLLOW_1);
             iv_rulePrimitiveType=rulePrimitiveType();
 
             state._fsp--;
 
              current =iv_rulePrimitiveType; 
-            match(input,EOF,FOLLOW_EOF_in_entryRulePrimitiveType1254); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1605,7 +1605,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "rulePrimitiveType"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:618:1: rulePrimitiveType returns [EObject current=null] : (otherlv_0= 'PrimitiveType' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( (lv_type_3_0= ruleLiteralType ) ) otherlv_4= '->' ( (lv_targetName_5_0= RULE_STRING ) ) (otherlv_6= '(' ( (lv_castName_7_0= ruleFQN ) ) otherlv_8= ')' )? otherlv_9= 'default' ( (lv_defaultValueLiteral_10_0= RULE_STRING ) ) ( (lv_docu_11_0= ruleDocumentation ) )? ) ;
+    // InternalRoom.g:618:1: rulePrimitiveType returns [EObject current=null] : (otherlv_0= 'PrimitiveType' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( (lv_type_3_0= ruleLiteralType ) ) otherlv_4= '->' ( (lv_targetName_5_0= RULE_STRING ) ) (otherlv_6= '(' ( (lv_castName_7_0= ruleFQN ) ) otherlv_8= ')' )? otherlv_9= 'default' ( (lv_defaultValueLiteral_10_0= RULE_STRING ) ) ( (lv_docu_11_0= ruleDocumentation ) )? ) ;
     public final EObject rulePrimitiveType() throws RecognitionException {
         EObject current = null;
 
@@ -1628,23 +1628,23 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:621:28: ( (otherlv_0= 'PrimitiveType' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( (lv_type_3_0= ruleLiteralType ) ) otherlv_4= '->' ( (lv_targetName_5_0= RULE_STRING ) ) (otherlv_6= '(' ( (lv_castName_7_0= ruleFQN ) ) otherlv_8= ')' )? otherlv_9= 'default' ( (lv_defaultValueLiteral_10_0= RULE_STRING ) ) ( (lv_docu_11_0= ruleDocumentation ) )? ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:622:1: (otherlv_0= 'PrimitiveType' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( (lv_type_3_0= ruleLiteralType ) ) otherlv_4= '->' ( (lv_targetName_5_0= RULE_STRING ) ) (otherlv_6= '(' ( (lv_castName_7_0= ruleFQN ) ) otherlv_8= ')' )? otherlv_9= 'default' ( (lv_defaultValueLiteral_10_0= RULE_STRING ) ) ( (lv_docu_11_0= ruleDocumentation ) )? )
+            // InternalRoom.g:621:28: ( (otherlv_0= 'PrimitiveType' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( (lv_type_3_0= ruleLiteralType ) ) otherlv_4= '->' ( (lv_targetName_5_0= RULE_STRING ) ) (otherlv_6= '(' ( (lv_castName_7_0= ruleFQN ) ) otherlv_8= ')' )? otherlv_9= 'default' ( (lv_defaultValueLiteral_10_0= RULE_STRING ) ) ( (lv_docu_11_0= ruleDocumentation ) )? ) )
+            // InternalRoom.g:622:1: (otherlv_0= 'PrimitiveType' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( (lv_type_3_0= ruleLiteralType ) ) otherlv_4= '->' ( (lv_targetName_5_0= RULE_STRING ) ) (otherlv_6= '(' ( (lv_castName_7_0= ruleFQN ) ) otherlv_8= ')' )? otherlv_9= 'default' ( (lv_defaultValueLiteral_10_0= RULE_STRING ) ) ( (lv_docu_11_0= ruleDocumentation ) )? )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:622:1: (otherlv_0= 'PrimitiveType' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( (lv_type_3_0= ruleLiteralType ) ) otherlv_4= '->' ( (lv_targetName_5_0= RULE_STRING ) ) (otherlv_6= '(' ( (lv_castName_7_0= ruleFQN ) ) otherlv_8= ')' )? otherlv_9= 'default' ( (lv_defaultValueLiteral_10_0= RULE_STRING ) ) ( (lv_docu_11_0= ruleDocumentation ) )? )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:622:3: otherlv_0= 'PrimitiveType' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( (lv_type_3_0= ruleLiteralType ) ) otherlv_4= '->' ( (lv_targetName_5_0= RULE_STRING ) ) (otherlv_6= '(' ( (lv_castName_7_0= ruleFQN ) ) otherlv_8= ')' )? otherlv_9= 'default' ( (lv_defaultValueLiteral_10_0= RULE_STRING ) ) ( (lv_docu_11_0= ruleDocumentation ) )?
+            // InternalRoom.g:622:1: (otherlv_0= 'PrimitiveType' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( (lv_type_3_0= ruleLiteralType ) ) otherlv_4= '->' ( (lv_targetName_5_0= RULE_STRING ) ) (otherlv_6= '(' ( (lv_castName_7_0= ruleFQN ) ) otherlv_8= ')' )? otherlv_9= 'default' ( (lv_defaultValueLiteral_10_0= RULE_STRING ) ) ( (lv_docu_11_0= ruleDocumentation ) )? )
+            // InternalRoom.g:622:3: otherlv_0= 'PrimitiveType' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( (lv_type_3_0= ruleLiteralType ) ) otherlv_4= '->' ( (lv_targetName_5_0= RULE_STRING ) ) (otherlv_6= '(' ( (lv_castName_7_0= ruleFQN ) ) otherlv_8= ')' )? otherlv_9= 'default' ( (lv_defaultValueLiteral_10_0= RULE_STRING ) ) ( (lv_docu_11_0= ruleDocumentation ) )?
             {
-            otherlv_0=(Token)match(input,17,FOLLOW_17_in_rulePrimitiveType1291); 
+            otherlv_0=(Token)match(input,17,FOLLOW_3); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getPrimitiveTypeAccess().getPrimitiveTypeKeyword_0());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:626:1: ( (lv_name_1_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:627:1: (lv_name_1_0= RULE_ID )
+            // InternalRoom.g:626:1: ( (lv_name_1_0= RULE_ID ) )
+            // InternalRoom.g:627:1: (lv_name_1_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:627:1: (lv_name_1_0= RULE_ID )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:628:3: lv_name_1_0= RULE_ID
+            // InternalRoom.g:627:1: (lv_name_1_0= RULE_ID )
+            // InternalRoom.g:628:3: lv_name_1_0= RULE_ID
             {
-            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_rulePrimitiveType1308); 
+            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_8); 
 
             			newLeafNode(lv_name_1_0, grammarAccess.getPrimitiveTypeAccess().getNameIDTerminalRuleCall_1_0()); 
             		
@@ -1656,7 +1656,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"name",
                     		lv_name_1_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -1664,20 +1664,20 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_2=(Token)match(input,15,FOLLOW_15_in_rulePrimitiveType1325); 
+            otherlv_2=(Token)match(input,15,FOLLOW_10); 
 
                 	newLeafNode(otherlv_2, grammarAccess.getPrimitiveTypeAccess().getColonKeyword_2());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:648:1: ( (lv_type_3_0= ruleLiteralType ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:649:1: (lv_type_3_0= ruleLiteralType )
+            // InternalRoom.g:648:1: ( (lv_type_3_0= ruleLiteralType ) )
+            // InternalRoom.g:649:1: (lv_type_3_0= ruleLiteralType )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:649:1: (lv_type_3_0= ruleLiteralType )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:650:3: lv_type_3_0= ruleLiteralType
+            // InternalRoom.g:649:1: (lv_type_3_0= ruleLiteralType )
+            // InternalRoom.g:650:3: lv_type_3_0= ruleLiteralType
             {
              
             	        newCompositeNode(grammarAccess.getPrimitiveTypeAccess().getTypeLiteralTypeEnumRuleCall_3_0()); 
             	    
-            pushFollow(FOLLOW_ruleLiteralType_in_rulePrimitiveType1346);
+            pushFollow(FOLLOW_11);
             lv_type_3_0=ruleLiteralType();
 
             state._fsp--;
@@ -1690,7 +1690,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"type",
                     		lv_type_3_0, 
-                    		"LiteralType");
+                    		"org.eclipse.etrice.core.common.Base.LiteralType");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -1699,17 +1699,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_4=(Token)match(input,18,FOLLOW_18_in_rulePrimitiveType1358); 
+            otherlv_4=(Token)match(input,18,FOLLOW_12); 
 
                 	newLeafNode(otherlv_4, grammarAccess.getPrimitiveTypeAccess().getHyphenMinusGreaterThanSignKeyword_4());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:670:1: ( (lv_targetName_5_0= RULE_STRING ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:671:1: (lv_targetName_5_0= RULE_STRING )
+            // InternalRoom.g:670:1: ( (lv_targetName_5_0= RULE_STRING ) )
+            // InternalRoom.g:671:1: (lv_targetName_5_0= RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:671:1: (lv_targetName_5_0= RULE_STRING )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:672:3: lv_targetName_5_0= RULE_STRING
+            // InternalRoom.g:671:1: (lv_targetName_5_0= RULE_STRING )
+            // InternalRoom.g:672:3: lv_targetName_5_0= RULE_STRING
             {
-            lv_targetName_5_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rulePrimitiveType1375); 
+            lv_targetName_5_0=(Token)match(input,RULE_STRING,FOLLOW_13); 
 
             			newLeafNode(lv_targetName_5_0, grammarAccess.getPrimitiveTypeAccess().getTargetNameSTRINGTerminalRuleCall_5_0()); 
             		
@@ -1721,7 +1721,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"targetName",
                     		lv_targetName_5_0, 
-                    		"STRING");
+                    		"org.eclipse.xtext.common.Terminals.STRING");
             	    
 
             }
@@ -1729,7 +1729,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:688:2: (otherlv_6= '(' ( (lv_castName_7_0= ruleFQN ) ) otherlv_8= ')' )?
+            // InternalRoom.g:688:2: (otherlv_6= '(' ( (lv_castName_7_0= ruleFQN ) ) otherlv_8= ')' )?
             int alt9=2;
             int LA9_0 = input.LA(1);
 
@@ -1738,22 +1738,22 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt9) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:688:4: otherlv_6= '(' ( (lv_castName_7_0= ruleFQN ) ) otherlv_8= ')'
+                    // InternalRoom.g:688:4: otherlv_6= '(' ( (lv_castName_7_0= ruleFQN ) ) otherlv_8= ')'
                     {
-                    otherlv_6=(Token)match(input,19,FOLLOW_19_in_rulePrimitiveType1393); 
+                    otherlv_6=(Token)match(input,19,FOLLOW_3); 
 
                         	newLeafNode(otherlv_6, grammarAccess.getPrimitiveTypeAccess().getLeftParenthesisKeyword_6_0());
                         
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:692:1: ( (lv_castName_7_0= ruleFQN ) )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:693:1: (lv_castName_7_0= ruleFQN )
+                    // InternalRoom.g:692:1: ( (lv_castName_7_0= ruleFQN ) )
+                    // InternalRoom.g:693:1: (lv_castName_7_0= ruleFQN )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:693:1: (lv_castName_7_0= ruleFQN )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:694:3: lv_castName_7_0= ruleFQN
+                    // InternalRoom.g:693:1: (lv_castName_7_0= ruleFQN )
+                    // InternalRoom.g:694:3: lv_castName_7_0= ruleFQN
                     {
                      
                     	        newCompositeNode(grammarAccess.getPrimitiveTypeAccess().getCastNameFQNParserRuleCall_6_1_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleFQN_in_rulePrimitiveType1414);
+                    pushFollow(FOLLOW_14);
                     lv_castName_7_0=ruleFQN();
 
                     state._fsp--;
@@ -1766,7 +1766,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"castName",
                             		lv_castName_7_0, 
-                            		"FQN");
+                            		"org.eclipse.etrice.core.common.Base.FQN");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -1775,7 +1775,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_8=(Token)match(input,20,FOLLOW_20_in_rulePrimitiveType1426); 
+                    otherlv_8=(Token)match(input,20,FOLLOW_15); 
 
                         	newLeafNode(otherlv_8, grammarAccess.getPrimitiveTypeAccess().getRightParenthesisKeyword_6_2());
                         
@@ -1785,17 +1785,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_9=(Token)match(input,21,FOLLOW_21_in_rulePrimitiveType1440); 
+            otherlv_9=(Token)match(input,21,FOLLOW_12); 
 
                 	newLeafNode(otherlv_9, grammarAccess.getPrimitiveTypeAccess().getDefaultKeyword_7());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:718:1: ( (lv_defaultValueLiteral_10_0= RULE_STRING ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:719:1: (lv_defaultValueLiteral_10_0= RULE_STRING )
+            // InternalRoom.g:718:1: ( (lv_defaultValueLiteral_10_0= RULE_STRING ) )
+            // InternalRoom.g:719:1: (lv_defaultValueLiteral_10_0= RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:719:1: (lv_defaultValueLiteral_10_0= RULE_STRING )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:720:3: lv_defaultValueLiteral_10_0= RULE_STRING
+            // InternalRoom.g:719:1: (lv_defaultValueLiteral_10_0= RULE_STRING )
+            // InternalRoom.g:720:3: lv_defaultValueLiteral_10_0= RULE_STRING
             {
-            lv_defaultValueLiteral_10_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rulePrimitiveType1457); 
+            lv_defaultValueLiteral_10_0=(Token)match(input,RULE_STRING,FOLLOW_16); 
 
             			newLeafNode(lv_defaultValueLiteral_10_0, grammarAccess.getPrimitiveTypeAccess().getDefaultValueLiteralSTRINGTerminalRuleCall_8_0()); 
             		
@@ -1807,7 +1807,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"defaultValueLiteral",
                     		lv_defaultValueLiteral_10_0, 
-                    		"STRING");
+                    		"org.eclipse.xtext.common.Terminals.STRING");
             	    
 
             }
@@ -1815,7 +1815,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:736:2: ( (lv_docu_11_0= ruleDocumentation ) )?
+            // InternalRoom.g:736:2: ( (lv_docu_11_0= ruleDocumentation ) )?
             int alt10=2;
             int LA10_0 = input.LA(1);
 
@@ -1824,15 +1824,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt10) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:737:1: (lv_docu_11_0= ruleDocumentation )
+                    // InternalRoom.g:737:1: (lv_docu_11_0= ruleDocumentation )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:737:1: (lv_docu_11_0= ruleDocumentation )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:738:3: lv_docu_11_0= ruleDocumentation
+                    // InternalRoom.g:737:1: (lv_docu_11_0= ruleDocumentation )
+                    // InternalRoom.g:738:3: lv_docu_11_0= ruleDocumentation
                     {
                      
                     	        newCompositeNode(grammarAccess.getPrimitiveTypeAccess().getDocuDocumentationParserRuleCall_9_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDocumentation_in_rulePrimitiveType1483);
+                    pushFollow(FOLLOW_2);
                     lv_docu_11_0=ruleDocumentation();
 
                     state._fsp--;
@@ -1845,7 +1845,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"docu",
                             		lv_docu_11_0, 
-                            		"Documentation");
+                            		"org.eclipse.etrice.core.common.Base.Documentation");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -1878,7 +1878,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleEnumerationType"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:762:1: entryRuleEnumerationType returns [EObject current=null] : iv_ruleEnumerationType= ruleEnumerationType EOF ;
+    // InternalRoom.g:762:1: entryRuleEnumerationType returns [EObject current=null] : iv_ruleEnumerationType= ruleEnumerationType EOF ;
     public final EObject entryRuleEnumerationType() throws RecognitionException {
         EObject current = null;
 
@@ -1886,17 +1886,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:763:2: (iv_ruleEnumerationType= ruleEnumerationType EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:764:2: iv_ruleEnumerationType= ruleEnumerationType EOF
+            // InternalRoom.g:763:2: (iv_ruleEnumerationType= ruleEnumerationType EOF )
+            // InternalRoom.g:764:2: iv_ruleEnumerationType= ruleEnumerationType EOF
             {
              newCompositeNode(grammarAccess.getEnumerationTypeRule()); 
-            pushFollow(FOLLOW_ruleEnumerationType_in_entryRuleEnumerationType1520);
+            pushFollow(FOLLOW_1);
             iv_ruleEnumerationType=ruleEnumerationType();
 
             state._fsp--;
 
              current =iv_ruleEnumerationType; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleEnumerationType1530); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1914,7 +1914,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleEnumerationType"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:771:1: ruleEnumerationType returns [EObject current=null] : (otherlv_0= 'Enumeration' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= 'of' ( ( ruleFQN ) ) )? otherlv_5= '{' ( ( (lv_literals_6_0= ruleEnumLiteral ) ) (otherlv_7= ',' ( (lv_literals_8_0= ruleEnumLiteral ) ) )* )? otherlv_9= '}' ) ;
+    // InternalRoom.g:771:1: ruleEnumerationType returns [EObject current=null] : (otherlv_0= 'Enumeration' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= 'of' ( ( ruleFQN ) ) )? otherlv_5= '{' ( ( (lv_literals_6_0= ruleEnumLiteral ) ) (otherlv_7= ',' ( (lv_literals_8_0= ruleEnumLiteral ) ) )* )? otherlv_9= '}' ) ;
     public final EObject ruleEnumerationType() throws RecognitionException {
         EObject current = null;
 
@@ -1934,23 +1934,23 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:774:28: ( (otherlv_0= 'Enumeration' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= 'of' ( ( ruleFQN ) ) )? otherlv_5= '{' ( ( (lv_literals_6_0= ruleEnumLiteral ) ) (otherlv_7= ',' ( (lv_literals_8_0= ruleEnumLiteral ) ) )* )? otherlv_9= '}' ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:775:1: (otherlv_0= 'Enumeration' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= 'of' ( ( ruleFQN ) ) )? otherlv_5= '{' ( ( (lv_literals_6_0= ruleEnumLiteral ) ) (otherlv_7= ',' ( (lv_literals_8_0= ruleEnumLiteral ) ) )* )? otherlv_9= '}' )
+            // InternalRoom.g:774:28: ( (otherlv_0= 'Enumeration' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= 'of' ( ( ruleFQN ) ) )? otherlv_5= '{' ( ( (lv_literals_6_0= ruleEnumLiteral ) ) (otherlv_7= ',' ( (lv_literals_8_0= ruleEnumLiteral ) ) )* )? otherlv_9= '}' ) )
+            // InternalRoom.g:775:1: (otherlv_0= 'Enumeration' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= 'of' ( ( ruleFQN ) ) )? otherlv_5= '{' ( ( (lv_literals_6_0= ruleEnumLiteral ) ) (otherlv_7= ',' ( (lv_literals_8_0= ruleEnumLiteral ) ) )* )? otherlv_9= '}' )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:775:1: (otherlv_0= 'Enumeration' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= 'of' ( ( ruleFQN ) ) )? otherlv_5= '{' ( ( (lv_literals_6_0= ruleEnumLiteral ) ) (otherlv_7= ',' ( (lv_literals_8_0= ruleEnumLiteral ) ) )* )? otherlv_9= '}' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:775:3: otherlv_0= 'Enumeration' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= 'of' ( ( ruleFQN ) ) )? otherlv_5= '{' ( ( (lv_literals_6_0= ruleEnumLiteral ) ) (otherlv_7= ',' ( (lv_literals_8_0= ruleEnumLiteral ) ) )* )? otherlv_9= '}'
+            // InternalRoom.g:775:1: (otherlv_0= 'Enumeration' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= 'of' ( ( ruleFQN ) ) )? otherlv_5= '{' ( ( (lv_literals_6_0= ruleEnumLiteral ) ) (otherlv_7= ',' ( (lv_literals_8_0= ruleEnumLiteral ) ) )* )? otherlv_9= '}' )
+            // InternalRoom.g:775:3: otherlv_0= 'Enumeration' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= 'of' ( ( ruleFQN ) ) )? otherlv_5= '{' ( ( (lv_literals_6_0= ruleEnumLiteral ) ) (otherlv_7= ',' ( (lv_literals_8_0= ruleEnumLiteral ) ) )* )? otherlv_9= '}'
             {
-            otherlv_0=(Token)match(input,22,FOLLOW_22_in_ruleEnumerationType1567); 
+            otherlv_0=(Token)match(input,22,FOLLOW_3); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getEnumerationTypeAccess().getEnumerationKeyword_0());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:779:1: ( (lv_name_1_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:780:1: (lv_name_1_0= RULE_ID )
+            // InternalRoom.g:779:1: ( (lv_name_1_0= RULE_ID ) )
+            // InternalRoom.g:780:1: (lv_name_1_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:780:1: (lv_name_1_0= RULE_ID )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:781:3: lv_name_1_0= RULE_ID
+            // InternalRoom.g:780:1: (lv_name_1_0= RULE_ID )
+            // InternalRoom.g:781:3: lv_name_1_0= RULE_ID
             {
-            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEnumerationType1584); 
+            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_17); 
 
             			newLeafNode(lv_name_1_0, grammarAccess.getEnumerationTypeAccess().getNameIDTerminalRuleCall_1_0()); 
             		
@@ -1962,7 +1962,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"name",
                     		lv_name_1_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -1970,7 +1970,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:797:2: ( (lv_docu_2_0= ruleDocumentation ) )?
+            // InternalRoom.g:797:2: ( (lv_docu_2_0= ruleDocumentation ) )?
             int alt11=2;
             int LA11_0 = input.LA(1);
 
@@ -1979,15 +1979,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt11) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:798:1: (lv_docu_2_0= ruleDocumentation )
+                    // InternalRoom.g:798:1: (lv_docu_2_0= ruleDocumentation )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:798:1: (lv_docu_2_0= ruleDocumentation )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:799:3: lv_docu_2_0= ruleDocumentation
+                    // InternalRoom.g:798:1: (lv_docu_2_0= ruleDocumentation )
+                    // InternalRoom.g:799:3: lv_docu_2_0= ruleDocumentation
                     {
                      
                     	        newCompositeNode(grammarAccess.getEnumerationTypeAccess().getDocuDocumentationParserRuleCall_2_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDocumentation_in_ruleEnumerationType1610);
+                    pushFollow(FOLLOW_18);
                     lv_docu_2_0=ruleDocumentation();
 
                     state._fsp--;
@@ -2000,7 +2000,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"docu",
                             		lv_docu_2_0, 
-                            		"Documentation");
+                            		"org.eclipse.etrice.core.common.Base.Documentation");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -2012,7 +2012,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:815:3: (otherlv_3= 'of' ( ( ruleFQN ) ) )?
+            // InternalRoom.g:815:3: (otherlv_3= 'of' ( ( ruleFQN ) ) )?
             int alt12=2;
             int LA12_0 = input.LA(1);
 
@@ -2021,17 +2021,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt12) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:815:5: otherlv_3= 'of' ( ( ruleFQN ) )
+                    // InternalRoom.g:815:5: otherlv_3= 'of' ( ( ruleFQN ) )
                     {
-                    otherlv_3=(Token)match(input,23,FOLLOW_23_in_ruleEnumerationType1624); 
+                    otherlv_3=(Token)match(input,23,FOLLOW_3); 
 
                         	newLeafNode(otherlv_3, grammarAccess.getEnumerationTypeAccess().getOfKeyword_3_0());
                         
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:819:1: ( ( ruleFQN ) )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:820:1: ( ruleFQN )
+                    // InternalRoom.g:819:1: ( ( ruleFQN ) )
+                    // InternalRoom.g:820:1: ( ruleFQN )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:820:1: ( ruleFQN )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:821:3: ruleFQN
+                    // InternalRoom.g:820:1: ( ruleFQN )
+                    // InternalRoom.g:821:3: ruleFQN
                     {
 
                     			if (current==null) {
@@ -2041,7 +2041,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                      
                     	        newCompositeNode(grammarAccess.getEnumerationTypeAccess().getPrimitiveTypePrimitiveTypeCrossReference_3_1_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleFQN_in_ruleEnumerationType1647);
+                    pushFollow(FOLLOW_5);
                     ruleFQN();
 
                     state._fsp--;
@@ -2061,11 +2061,11 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_5=(Token)match(input,13,FOLLOW_13_in_ruleEnumerationType1661); 
+            otherlv_5=(Token)match(input,13,FOLLOW_19); 
 
                 	newLeafNode(otherlv_5, grammarAccess.getEnumerationTypeAccess().getLeftCurlyBracketKeyword_4());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:838:1: ( ( (lv_literals_6_0= ruleEnumLiteral ) ) (otherlv_7= ',' ( (lv_literals_8_0= ruleEnumLiteral ) ) )* )?
+            // InternalRoom.g:838:1: ( ( (lv_literals_6_0= ruleEnumLiteral ) ) (otherlv_7= ',' ( (lv_literals_8_0= ruleEnumLiteral ) ) )* )?
             int alt14=2;
             int LA14_0 = input.LA(1);
 
@@ -2074,18 +2074,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt14) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:838:2: ( (lv_literals_6_0= ruleEnumLiteral ) ) (otherlv_7= ',' ( (lv_literals_8_0= ruleEnumLiteral ) ) )*
+                    // InternalRoom.g:838:2: ( (lv_literals_6_0= ruleEnumLiteral ) ) (otherlv_7= ',' ( (lv_literals_8_0= ruleEnumLiteral ) ) )*
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:838:2: ( (lv_literals_6_0= ruleEnumLiteral ) )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:839:1: (lv_literals_6_0= ruleEnumLiteral )
+                    // InternalRoom.g:838:2: ( (lv_literals_6_0= ruleEnumLiteral ) )
+                    // InternalRoom.g:839:1: (lv_literals_6_0= ruleEnumLiteral )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:839:1: (lv_literals_6_0= ruleEnumLiteral )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:840:3: lv_literals_6_0= ruleEnumLiteral
+                    // InternalRoom.g:839:1: (lv_literals_6_0= ruleEnumLiteral )
+                    // InternalRoom.g:840:3: lv_literals_6_0= ruleEnumLiteral
                     {
                      
                     	        newCompositeNode(grammarAccess.getEnumerationTypeAccess().getLiteralsEnumLiteralParserRuleCall_5_0_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleEnumLiteral_in_ruleEnumerationType1683);
+                    pushFollow(FOLLOW_20);
                     lv_literals_6_0=ruleEnumLiteral();
 
                     state._fsp--;
@@ -2098,7 +2098,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"literals",
                             		lv_literals_6_0, 
-                            		"EnumLiteral");
+                            		"org.eclipse.etrice.core.Room.EnumLiteral");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -2107,7 +2107,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:856:2: (otherlv_7= ',' ( (lv_literals_8_0= ruleEnumLiteral ) ) )*
+                    // InternalRoom.g:856:2: (otherlv_7= ',' ( (lv_literals_8_0= ruleEnumLiteral ) ) )*
                     loop13:
                     do {
                         int alt13=2;
@@ -2120,22 +2120,22 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                         switch (alt13) {
                     	case 1 :
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:856:4: otherlv_7= ',' ( (lv_literals_8_0= ruleEnumLiteral ) )
+                    	    // InternalRoom.g:856:4: otherlv_7= ',' ( (lv_literals_8_0= ruleEnumLiteral ) )
                     	    {
-                    	    otherlv_7=(Token)match(input,24,FOLLOW_24_in_ruleEnumerationType1696); 
+                    	    otherlv_7=(Token)match(input,24,FOLLOW_3); 
 
                     	        	newLeafNode(otherlv_7, grammarAccess.getEnumerationTypeAccess().getCommaKeyword_5_1_0());
                     	        
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:860:1: ( (lv_literals_8_0= ruleEnumLiteral ) )
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:861:1: (lv_literals_8_0= ruleEnumLiteral )
+                    	    // InternalRoom.g:860:1: ( (lv_literals_8_0= ruleEnumLiteral ) )
+                    	    // InternalRoom.g:861:1: (lv_literals_8_0= ruleEnumLiteral )
                     	    {
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:861:1: (lv_literals_8_0= ruleEnumLiteral )
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:862:3: lv_literals_8_0= ruleEnumLiteral
+                    	    // InternalRoom.g:861:1: (lv_literals_8_0= ruleEnumLiteral )
+                    	    // InternalRoom.g:862:3: lv_literals_8_0= ruleEnumLiteral
                     	    {
                     	     
                     	    	        newCompositeNode(grammarAccess.getEnumerationTypeAccess().getLiteralsEnumLiteralParserRuleCall_5_1_1_0()); 
                     	    	    
-                    	    pushFollow(FOLLOW_ruleEnumLiteral_in_ruleEnumerationType1717);
+                    	    pushFollow(FOLLOW_20);
                     	    lv_literals_8_0=ruleEnumLiteral();
 
                     	    state._fsp--;
@@ -2148,7 +2148,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     	           			current, 
                     	           			"literals",
                     	            		lv_literals_8_0, 
-                    	            		"EnumLiteral");
+                    	            		"org.eclipse.etrice.core.Room.EnumLiteral");
                     	    	        afterParserOrEnumRuleCall();
                     	    	    
 
@@ -2172,7 +2172,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_9=(Token)match(input,14,FOLLOW_14_in_ruleEnumerationType1733); 
+            otherlv_9=(Token)match(input,14,FOLLOW_2); 
 
                 	newLeafNode(otherlv_9, grammarAccess.getEnumerationTypeAccess().getRightCurlyBracketKeyword_6());
                 
@@ -2197,7 +2197,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleEnumLiteral"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:890:1: entryRuleEnumLiteral returns [EObject current=null] : iv_ruleEnumLiteral= ruleEnumLiteral EOF ;
+    // InternalRoom.g:890:1: entryRuleEnumLiteral returns [EObject current=null] : iv_ruleEnumLiteral= ruleEnumLiteral EOF ;
     public final EObject entryRuleEnumLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -2205,17 +2205,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:891:2: (iv_ruleEnumLiteral= ruleEnumLiteral EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:892:2: iv_ruleEnumLiteral= ruleEnumLiteral EOF
+            // InternalRoom.g:891:2: (iv_ruleEnumLiteral= ruleEnumLiteral EOF )
+            // InternalRoom.g:892:2: iv_ruleEnumLiteral= ruleEnumLiteral EOF
             {
              newCompositeNode(grammarAccess.getEnumLiteralRule()); 
-            pushFollow(FOLLOW_ruleEnumLiteral_in_entryRuleEnumLiteral1769);
+            pushFollow(FOLLOW_1);
             iv_ruleEnumLiteral=ruleEnumLiteral();
 
             state._fsp--;
 
              current =iv_ruleEnumLiteral; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleEnumLiteral1779); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2233,7 +2233,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleEnumLiteral"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:899:1: ruleEnumLiteral returns [EObject current=null] : ( ( (lv_name_0_0= RULE_ID ) ) (otherlv_1= '=' ( (lv_literal_2_0= ruleIntLiteral ) ) )? ) ;
+    // InternalRoom.g:899:1: ruleEnumLiteral returns [EObject current=null] : ( ( (lv_name_0_0= RULE_ID ) ) (otherlv_1= '=' ( (lv_literal_2_0= ruleIntLiteral ) ) )? ) ;
     public final EObject ruleEnumLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -2245,19 +2245,19 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:902:28: ( ( ( (lv_name_0_0= RULE_ID ) ) (otherlv_1= '=' ( (lv_literal_2_0= ruleIntLiteral ) ) )? ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:903:1: ( ( (lv_name_0_0= RULE_ID ) ) (otherlv_1= '=' ( (lv_literal_2_0= ruleIntLiteral ) ) )? )
+            // InternalRoom.g:902:28: ( ( ( (lv_name_0_0= RULE_ID ) ) (otherlv_1= '=' ( (lv_literal_2_0= ruleIntLiteral ) ) )? ) )
+            // InternalRoom.g:903:1: ( ( (lv_name_0_0= RULE_ID ) ) (otherlv_1= '=' ( (lv_literal_2_0= ruleIntLiteral ) ) )? )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:903:1: ( ( (lv_name_0_0= RULE_ID ) ) (otherlv_1= '=' ( (lv_literal_2_0= ruleIntLiteral ) ) )? )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:903:2: ( (lv_name_0_0= RULE_ID ) ) (otherlv_1= '=' ( (lv_literal_2_0= ruleIntLiteral ) ) )?
+            // InternalRoom.g:903:1: ( ( (lv_name_0_0= RULE_ID ) ) (otherlv_1= '=' ( (lv_literal_2_0= ruleIntLiteral ) ) )? )
+            // InternalRoom.g:903:2: ( (lv_name_0_0= RULE_ID ) ) (otherlv_1= '=' ( (lv_literal_2_0= ruleIntLiteral ) ) )?
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:903:2: ( (lv_name_0_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:904:1: (lv_name_0_0= RULE_ID )
+            // InternalRoom.g:903:2: ( (lv_name_0_0= RULE_ID ) )
+            // InternalRoom.g:904:1: (lv_name_0_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:904:1: (lv_name_0_0= RULE_ID )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:905:3: lv_name_0_0= RULE_ID
+            // InternalRoom.g:904:1: (lv_name_0_0= RULE_ID )
+            // InternalRoom.g:905:3: lv_name_0_0= RULE_ID
             {
-            lv_name_0_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEnumLiteral1821); 
+            lv_name_0_0=(Token)match(input,RULE_ID,FOLLOW_21); 
 
             			newLeafNode(lv_name_0_0, grammarAccess.getEnumLiteralAccess().getNameIDTerminalRuleCall_0_0()); 
             		
@@ -2269,7 +2269,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"name",
                     		lv_name_0_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -2277,7 +2277,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:921:2: (otherlv_1= '=' ( (lv_literal_2_0= ruleIntLiteral ) ) )?
+            // InternalRoom.g:921:2: (otherlv_1= '=' ( (lv_literal_2_0= ruleIntLiteral ) ) )?
             int alt15=2;
             int LA15_0 = input.LA(1);
 
@@ -2286,22 +2286,22 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt15) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:921:4: otherlv_1= '=' ( (lv_literal_2_0= ruleIntLiteral ) )
+                    // InternalRoom.g:921:4: otherlv_1= '=' ( (lv_literal_2_0= ruleIntLiteral ) )
                     {
-                    otherlv_1=(Token)match(input,25,FOLLOW_25_in_ruleEnumLiteral1839); 
+                    otherlv_1=(Token)match(input,25,FOLLOW_22); 
 
                         	newLeafNode(otherlv_1, grammarAccess.getEnumLiteralAccess().getEqualsSignKeyword_1_0());
                         
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:925:1: ( (lv_literal_2_0= ruleIntLiteral ) )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:926:1: (lv_literal_2_0= ruleIntLiteral )
+                    // InternalRoom.g:925:1: ( (lv_literal_2_0= ruleIntLiteral ) )
+                    // InternalRoom.g:926:1: (lv_literal_2_0= ruleIntLiteral )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:926:1: (lv_literal_2_0= ruleIntLiteral )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:927:3: lv_literal_2_0= ruleIntLiteral
+                    // InternalRoom.g:926:1: (lv_literal_2_0= ruleIntLiteral )
+                    // InternalRoom.g:927:3: lv_literal_2_0= ruleIntLiteral
                     {
                      
                     	        newCompositeNode(grammarAccess.getEnumLiteralAccess().getLiteralIntLiteralParserRuleCall_1_1_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleIntLiteral_in_ruleEnumLiteral1860);
+                    pushFollow(FOLLOW_2);
                     lv_literal_2_0=ruleIntLiteral();
 
                     state._fsp--;
@@ -2314,7 +2314,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"literal",
                             		lv_literal_2_0, 
-                            		"IntLiteral");
+                            		"org.eclipse.etrice.core.common.Base.IntLiteral");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -2350,7 +2350,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleExternalType"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:951:1: entryRuleExternalType returns [EObject current=null] : iv_ruleExternalType= ruleExternalType EOF ;
+    // InternalRoom.g:951:1: entryRuleExternalType returns [EObject current=null] : iv_ruleExternalType= ruleExternalType EOF ;
     public final EObject entryRuleExternalType() throws RecognitionException {
         EObject current = null;
 
@@ -2358,17 +2358,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:952:2: (iv_ruleExternalType= ruleExternalType EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:953:2: iv_ruleExternalType= ruleExternalType EOF
+            // InternalRoom.g:952:2: (iv_ruleExternalType= ruleExternalType EOF )
+            // InternalRoom.g:953:2: iv_ruleExternalType= ruleExternalType EOF
             {
              newCompositeNode(grammarAccess.getExternalTypeRule()); 
-            pushFollow(FOLLOW_ruleExternalType_in_entryRuleExternalType1898);
+            pushFollow(FOLLOW_1);
             iv_ruleExternalType=ruleExternalType();
 
             state._fsp--;
 
              current =iv_ruleExternalType; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleExternalType1908); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2386,7 +2386,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleExternalType"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:960:1: ruleExternalType returns [EObject current=null] : (otherlv_0= 'ExternalType' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '->' ( (lv_targetName_3_0= RULE_STRING ) ) (otherlv_4= 'default' ( (lv_defaultValueLiteral_5_0= RULE_STRING ) ) )? ( (lv_docu_6_0= ruleDocumentation ) )? ) ;
+    // InternalRoom.g:960:1: ruleExternalType returns [EObject current=null] : (otherlv_0= 'ExternalType' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '->' ( (lv_targetName_3_0= RULE_STRING ) ) (otherlv_4= 'default' ( (lv_defaultValueLiteral_5_0= RULE_STRING ) ) )? ( (lv_docu_6_0= ruleDocumentation ) )? ) ;
     public final EObject ruleExternalType() throws RecognitionException {
         EObject current = null;
 
@@ -2402,23 +2402,23 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:963:28: ( (otherlv_0= 'ExternalType' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '->' ( (lv_targetName_3_0= RULE_STRING ) ) (otherlv_4= 'default' ( (lv_defaultValueLiteral_5_0= RULE_STRING ) ) )? ( (lv_docu_6_0= ruleDocumentation ) )? ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:964:1: (otherlv_0= 'ExternalType' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '->' ( (lv_targetName_3_0= RULE_STRING ) ) (otherlv_4= 'default' ( (lv_defaultValueLiteral_5_0= RULE_STRING ) ) )? ( (lv_docu_6_0= ruleDocumentation ) )? )
+            // InternalRoom.g:963:28: ( (otherlv_0= 'ExternalType' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '->' ( (lv_targetName_3_0= RULE_STRING ) ) (otherlv_4= 'default' ( (lv_defaultValueLiteral_5_0= RULE_STRING ) ) )? ( (lv_docu_6_0= ruleDocumentation ) )? ) )
+            // InternalRoom.g:964:1: (otherlv_0= 'ExternalType' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '->' ( (lv_targetName_3_0= RULE_STRING ) ) (otherlv_4= 'default' ( (lv_defaultValueLiteral_5_0= RULE_STRING ) ) )? ( (lv_docu_6_0= ruleDocumentation ) )? )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:964:1: (otherlv_0= 'ExternalType' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '->' ( (lv_targetName_3_0= RULE_STRING ) ) (otherlv_4= 'default' ( (lv_defaultValueLiteral_5_0= RULE_STRING ) ) )? ( (lv_docu_6_0= ruleDocumentation ) )? )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:964:3: otherlv_0= 'ExternalType' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '->' ( (lv_targetName_3_0= RULE_STRING ) ) (otherlv_4= 'default' ( (lv_defaultValueLiteral_5_0= RULE_STRING ) ) )? ( (lv_docu_6_0= ruleDocumentation ) )?
+            // InternalRoom.g:964:1: (otherlv_0= 'ExternalType' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '->' ( (lv_targetName_3_0= RULE_STRING ) ) (otherlv_4= 'default' ( (lv_defaultValueLiteral_5_0= RULE_STRING ) ) )? ( (lv_docu_6_0= ruleDocumentation ) )? )
+            // InternalRoom.g:964:3: otherlv_0= 'ExternalType' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '->' ( (lv_targetName_3_0= RULE_STRING ) ) (otherlv_4= 'default' ( (lv_defaultValueLiteral_5_0= RULE_STRING ) ) )? ( (lv_docu_6_0= ruleDocumentation ) )?
             {
-            otherlv_0=(Token)match(input,26,FOLLOW_26_in_ruleExternalType1945); 
+            otherlv_0=(Token)match(input,26,FOLLOW_3); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getExternalTypeAccess().getExternalTypeKeyword_0());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:968:1: ( (lv_name_1_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:969:1: (lv_name_1_0= RULE_ID )
+            // InternalRoom.g:968:1: ( (lv_name_1_0= RULE_ID ) )
+            // InternalRoom.g:969:1: (lv_name_1_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:969:1: (lv_name_1_0= RULE_ID )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:970:3: lv_name_1_0= RULE_ID
+            // InternalRoom.g:969:1: (lv_name_1_0= RULE_ID )
+            // InternalRoom.g:970:3: lv_name_1_0= RULE_ID
             {
-            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleExternalType1962); 
+            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_11); 
 
             			newLeafNode(lv_name_1_0, grammarAccess.getExternalTypeAccess().getNameIDTerminalRuleCall_1_0()); 
             		
@@ -2430,7 +2430,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"name",
                     		lv_name_1_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -2438,17 +2438,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_2=(Token)match(input,18,FOLLOW_18_in_ruleExternalType1979); 
+            otherlv_2=(Token)match(input,18,FOLLOW_12); 
 
                 	newLeafNode(otherlv_2, grammarAccess.getExternalTypeAccess().getHyphenMinusGreaterThanSignKeyword_2());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:990:1: ( (lv_targetName_3_0= RULE_STRING ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:991:1: (lv_targetName_3_0= RULE_STRING )
+            // InternalRoom.g:990:1: ( (lv_targetName_3_0= RULE_STRING ) )
+            // InternalRoom.g:991:1: (lv_targetName_3_0= RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:991:1: (lv_targetName_3_0= RULE_STRING )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:992:3: lv_targetName_3_0= RULE_STRING
+            // InternalRoom.g:991:1: (lv_targetName_3_0= RULE_STRING )
+            // InternalRoom.g:992:3: lv_targetName_3_0= RULE_STRING
             {
-            lv_targetName_3_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleExternalType1996); 
+            lv_targetName_3_0=(Token)match(input,RULE_STRING,FOLLOW_23); 
 
             			newLeafNode(lv_targetName_3_0, grammarAccess.getExternalTypeAccess().getTargetNameSTRINGTerminalRuleCall_3_0()); 
             		
@@ -2460,7 +2460,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"targetName",
                     		lv_targetName_3_0, 
-                    		"STRING");
+                    		"org.eclipse.xtext.common.Terminals.STRING");
             	    
 
             }
@@ -2468,7 +2468,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1008:2: (otherlv_4= 'default' ( (lv_defaultValueLiteral_5_0= RULE_STRING ) ) )?
+            // InternalRoom.g:1008:2: (otherlv_4= 'default' ( (lv_defaultValueLiteral_5_0= RULE_STRING ) ) )?
             int alt16=2;
             int LA16_0 = input.LA(1);
 
@@ -2477,19 +2477,19 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt16) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1008:4: otherlv_4= 'default' ( (lv_defaultValueLiteral_5_0= RULE_STRING ) )
+                    // InternalRoom.g:1008:4: otherlv_4= 'default' ( (lv_defaultValueLiteral_5_0= RULE_STRING ) )
                     {
-                    otherlv_4=(Token)match(input,21,FOLLOW_21_in_ruleExternalType2014); 
+                    otherlv_4=(Token)match(input,21,FOLLOW_12); 
 
                         	newLeafNode(otherlv_4, grammarAccess.getExternalTypeAccess().getDefaultKeyword_4_0());
                         
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1012:1: ( (lv_defaultValueLiteral_5_0= RULE_STRING ) )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1013:1: (lv_defaultValueLiteral_5_0= RULE_STRING )
+                    // InternalRoom.g:1012:1: ( (lv_defaultValueLiteral_5_0= RULE_STRING ) )
+                    // InternalRoom.g:1013:1: (lv_defaultValueLiteral_5_0= RULE_STRING )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1013:1: (lv_defaultValueLiteral_5_0= RULE_STRING )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1014:3: lv_defaultValueLiteral_5_0= RULE_STRING
+                    // InternalRoom.g:1013:1: (lv_defaultValueLiteral_5_0= RULE_STRING )
+                    // InternalRoom.g:1014:3: lv_defaultValueLiteral_5_0= RULE_STRING
                     {
-                    lv_defaultValueLiteral_5_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleExternalType2031); 
+                    lv_defaultValueLiteral_5_0=(Token)match(input,RULE_STRING,FOLLOW_16); 
 
                     			newLeafNode(lv_defaultValueLiteral_5_0, grammarAccess.getExternalTypeAccess().getDefaultValueLiteralSTRINGTerminalRuleCall_4_1_0()); 
                     		
@@ -2501,7 +2501,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"defaultValueLiteral",
                             		lv_defaultValueLiteral_5_0, 
-                            		"STRING");
+                            		"org.eclipse.xtext.common.Terminals.STRING");
                     	    
 
                     }
@@ -2515,7 +2515,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1030:4: ( (lv_docu_6_0= ruleDocumentation ) )?
+            // InternalRoom.g:1030:4: ( (lv_docu_6_0= ruleDocumentation ) )?
             int alt17=2;
             int LA17_0 = input.LA(1);
 
@@ -2524,15 +2524,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt17) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1031:1: (lv_docu_6_0= ruleDocumentation )
+                    // InternalRoom.g:1031:1: (lv_docu_6_0= ruleDocumentation )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1031:1: (lv_docu_6_0= ruleDocumentation )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1032:3: lv_docu_6_0= ruleDocumentation
+                    // InternalRoom.g:1031:1: (lv_docu_6_0= ruleDocumentation )
+                    // InternalRoom.g:1032:3: lv_docu_6_0= ruleDocumentation
                     {
                      
                     	        newCompositeNode(grammarAccess.getExternalTypeAccess().getDocuDocumentationParserRuleCall_5_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDocumentation_in_ruleExternalType2059);
+                    pushFollow(FOLLOW_2);
                     lv_docu_6_0=ruleDocumentation();
 
                     state._fsp--;
@@ -2545,7 +2545,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"docu",
                             		lv_docu_6_0, 
-                            		"Documentation");
+                            		"org.eclipse.etrice.core.common.Base.Documentation");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -2578,7 +2578,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleDataClass"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1056:1: entryRuleDataClass returns [EObject current=null] : iv_ruleDataClass= ruleDataClass EOF ;
+    // InternalRoom.g:1056:1: entryRuleDataClass returns [EObject current=null] : iv_ruleDataClass= ruleDataClass EOF ;
     public final EObject entryRuleDataClass() throws RecognitionException {
         EObject current = null;
 
@@ -2586,17 +2586,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1057:2: (iv_ruleDataClass= ruleDataClass EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1058:2: iv_ruleDataClass= ruleDataClass EOF
+            // InternalRoom.g:1057:2: (iv_ruleDataClass= ruleDataClass EOF )
+            // InternalRoom.g:1058:2: iv_ruleDataClass= ruleDataClass EOF
             {
              newCompositeNode(grammarAccess.getDataClassRule()); 
-            pushFollow(FOLLOW_ruleDataClass_in_entryRuleDataClass2096);
+            pushFollow(FOLLOW_1);
             iv_ruleDataClass=ruleDataClass();
 
             state._fsp--;
 
              current =iv_ruleDataClass; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDataClass2106); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2614,7 +2614,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleDataClass"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1065:1: ruleDataClass returns [EObject current=null] : (otherlv_0= 'DataClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= 'extends' ( ( ruleFQN ) ) )? otherlv_5= '{' ( (lv_annotations_6_0= ruleAnnotation ) )* (otherlv_7= 'usercode1' ( (lv_userCode1_8_0= ruleDetailCode ) ) )? (otherlv_9= 'usercode2' ( (lv_userCode2_10_0= ruleDetailCode ) ) )? (otherlv_11= 'usercode3' ( (lv_userCode3_12_0= ruleDetailCode ) ) )? ( ( (lv_operations_13_0= ruleStandardOperation ) ) | ( (lv_structors_14_0= ruleClassStructor ) ) | ( (lv_attributes_15_0= ruleAttribute ) ) )* otherlv_16= '}' ) ;
+    // InternalRoom.g:1065:1: ruleDataClass returns [EObject current=null] : (otherlv_0= 'DataClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= 'extends' ( ( ruleFQN ) ) )? otherlv_5= '{' ( (lv_annotations_6_0= ruleAnnotation ) )* (otherlv_7= 'usercode1' ( (lv_userCode1_8_0= ruleDetailCode ) ) )? (otherlv_9= 'usercode2' ( (lv_userCode2_10_0= ruleDetailCode ) ) )? (otherlv_11= 'usercode3' ( (lv_userCode3_12_0= ruleDetailCode ) ) )? ( ( (lv_operations_13_0= ruleStandardOperation ) ) | ( (lv_structors_14_0= ruleClassStructor ) ) | ( (lv_attributes_15_0= ruleAttribute ) ) )* otherlv_16= '}' ) ;
     public final EObject ruleDataClass() throws RecognitionException {
         EObject current = null;
 
@@ -2646,23 +2646,23 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1068:28: ( (otherlv_0= 'DataClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= 'extends' ( ( ruleFQN ) ) )? otherlv_5= '{' ( (lv_annotations_6_0= ruleAnnotation ) )* (otherlv_7= 'usercode1' ( (lv_userCode1_8_0= ruleDetailCode ) ) )? (otherlv_9= 'usercode2' ( (lv_userCode2_10_0= ruleDetailCode ) ) )? (otherlv_11= 'usercode3' ( (lv_userCode3_12_0= ruleDetailCode ) ) )? ( ( (lv_operations_13_0= ruleStandardOperation ) ) | ( (lv_structors_14_0= ruleClassStructor ) ) | ( (lv_attributes_15_0= ruleAttribute ) ) )* otherlv_16= '}' ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1069:1: (otherlv_0= 'DataClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= 'extends' ( ( ruleFQN ) ) )? otherlv_5= '{' ( (lv_annotations_6_0= ruleAnnotation ) )* (otherlv_7= 'usercode1' ( (lv_userCode1_8_0= ruleDetailCode ) ) )? (otherlv_9= 'usercode2' ( (lv_userCode2_10_0= ruleDetailCode ) ) )? (otherlv_11= 'usercode3' ( (lv_userCode3_12_0= ruleDetailCode ) ) )? ( ( (lv_operations_13_0= ruleStandardOperation ) ) | ( (lv_structors_14_0= ruleClassStructor ) ) | ( (lv_attributes_15_0= ruleAttribute ) ) )* otherlv_16= '}' )
+            // InternalRoom.g:1068:28: ( (otherlv_0= 'DataClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= 'extends' ( ( ruleFQN ) ) )? otherlv_5= '{' ( (lv_annotations_6_0= ruleAnnotation ) )* (otherlv_7= 'usercode1' ( (lv_userCode1_8_0= ruleDetailCode ) ) )? (otherlv_9= 'usercode2' ( (lv_userCode2_10_0= ruleDetailCode ) ) )? (otherlv_11= 'usercode3' ( (lv_userCode3_12_0= ruleDetailCode ) ) )? ( ( (lv_operations_13_0= ruleStandardOperation ) ) | ( (lv_structors_14_0= ruleClassStructor ) ) | ( (lv_attributes_15_0= ruleAttribute ) ) )* otherlv_16= '}' ) )
+            // InternalRoom.g:1069:1: (otherlv_0= 'DataClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= 'extends' ( ( ruleFQN ) ) )? otherlv_5= '{' ( (lv_annotations_6_0= ruleAnnotation ) )* (otherlv_7= 'usercode1' ( (lv_userCode1_8_0= ruleDetailCode ) ) )? (otherlv_9= 'usercode2' ( (lv_userCode2_10_0= ruleDetailCode ) ) )? (otherlv_11= 'usercode3' ( (lv_userCode3_12_0= ruleDetailCode ) ) )? ( ( (lv_operations_13_0= ruleStandardOperation ) ) | ( (lv_structors_14_0= ruleClassStructor ) ) | ( (lv_attributes_15_0= ruleAttribute ) ) )* otherlv_16= '}' )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1069:1: (otherlv_0= 'DataClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= 'extends' ( ( ruleFQN ) ) )? otherlv_5= '{' ( (lv_annotations_6_0= ruleAnnotation ) )* (otherlv_7= 'usercode1' ( (lv_userCode1_8_0= ruleDetailCode ) ) )? (otherlv_9= 'usercode2' ( (lv_userCode2_10_0= ruleDetailCode ) ) )? (otherlv_11= 'usercode3' ( (lv_userCode3_12_0= ruleDetailCode ) ) )? ( ( (lv_operations_13_0= ruleStandardOperation ) ) | ( (lv_structors_14_0= ruleClassStructor ) ) | ( (lv_attributes_15_0= ruleAttribute ) ) )* otherlv_16= '}' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1069:3: otherlv_0= 'DataClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= 'extends' ( ( ruleFQN ) ) )? otherlv_5= '{' ( (lv_annotations_6_0= ruleAnnotation ) )* (otherlv_7= 'usercode1' ( (lv_userCode1_8_0= ruleDetailCode ) ) )? (otherlv_9= 'usercode2' ( (lv_userCode2_10_0= ruleDetailCode ) ) )? (otherlv_11= 'usercode3' ( (lv_userCode3_12_0= ruleDetailCode ) ) )? ( ( (lv_operations_13_0= ruleStandardOperation ) ) | ( (lv_structors_14_0= ruleClassStructor ) ) | ( (lv_attributes_15_0= ruleAttribute ) ) )* otherlv_16= '}'
+            // InternalRoom.g:1069:1: (otherlv_0= 'DataClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= 'extends' ( ( ruleFQN ) ) )? otherlv_5= '{' ( (lv_annotations_6_0= ruleAnnotation ) )* (otherlv_7= 'usercode1' ( (lv_userCode1_8_0= ruleDetailCode ) ) )? (otherlv_9= 'usercode2' ( (lv_userCode2_10_0= ruleDetailCode ) ) )? (otherlv_11= 'usercode3' ( (lv_userCode3_12_0= ruleDetailCode ) ) )? ( ( (lv_operations_13_0= ruleStandardOperation ) ) | ( (lv_structors_14_0= ruleClassStructor ) ) | ( (lv_attributes_15_0= ruleAttribute ) ) )* otherlv_16= '}' )
+            // InternalRoom.g:1069:3: otherlv_0= 'DataClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= 'extends' ( ( ruleFQN ) ) )? otherlv_5= '{' ( (lv_annotations_6_0= ruleAnnotation ) )* (otherlv_7= 'usercode1' ( (lv_userCode1_8_0= ruleDetailCode ) ) )? (otherlv_9= 'usercode2' ( (lv_userCode2_10_0= ruleDetailCode ) ) )? (otherlv_11= 'usercode3' ( (lv_userCode3_12_0= ruleDetailCode ) ) )? ( ( (lv_operations_13_0= ruleStandardOperation ) ) | ( (lv_structors_14_0= ruleClassStructor ) ) | ( (lv_attributes_15_0= ruleAttribute ) ) )* otherlv_16= '}'
             {
-            otherlv_0=(Token)match(input,27,FOLLOW_27_in_ruleDataClass2143); 
+            otherlv_0=(Token)match(input,27,FOLLOW_3); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getDataClassAccess().getDataClassKeyword_0());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1073:1: ( (lv_name_1_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1074:1: (lv_name_1_0= RULE_ID )
+            // InternalRoom.g:1073:1: ( (lv_name_1_0= RULE_ID ) )
+            // InternalRoom.g:1074:1: (lv_name_1_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1074:1: (lv_name_1_0= RULE_ID )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1075:3: lv_name_1_0= RULE_ID
+            // InternalRoom.g:1074:1: (lv_name_1_0= RULE_ID )
+            // InternalRoom.g:1075:3: lv_name_1_0= RULE_ID
             {
-            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleDataClass2160); 
+            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_24); 
 
             			newLeafNode(lv_name_1_0, grammarAccess.getDataClassAccess().getNameIDTerminalRuleCall_1_0()); 
             		
@@ -2674,7 +2674,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"name",
                     		lv_name_1_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -2682,7 +2682,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1091:2: ( (lv_docu_2_0= ruleDocumentation ) )?
+            // InternalRoom.g:1091:2: ( (lv_docu_2_0= ruleDocumentation ) )?
             int alt18=2;
             int LA18_0 = input.LA(1);
 
@@ -2691,15 +2691,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt18) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1092:1: (lv_docu_2_0= ruleDocumentation )
+                    // InternalRoom.g:1092:1: (lv_docu_2_0= ruleDocumentation )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1092:1: (lv_docu_2_0= ruleDocumentation )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1093:3: lv_docu_2_0= ruleDocumentation
+                    // InternalRoom.g:1092:1: (lv_docu_2_0= ruleDocumentation )
+                    // InternalRoom.g:1093:3: lv_docu_2_0= ruleDocumentation
                     {
                      
                     	        newCompositeNode(grammarAccess.getDataClassAccess().getDocuDocumentationParserRuleCall_2_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDocumentation_in_ruleDataClass2186);
+                    pushFollow(FOLLOW_25);
                     lv_docu_2_0=ruleDocumentation();
 
                     state._fsp--;
@@ -2712,7 +2712,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"docu",
                             		lv_docu_2_0, 
-                            		"Documentation");
+                            		"org.eclipse.etrice.core.common.Base.Documentation");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -2724,7 +2724,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1109:3: (otherlv_3= 'extends' ( ( ruleFQN ) ) )?
+            // InternalRoom.g:1109:3: (otherlv_3= 'extends' ( ( ruleFQN ) ) )?
             int alt19=2;
             int LA19_0 = input.LA(1);
 
@@ -2733,17 +2733,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt19) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1109:5: otherlv_3= 'extends' ( ( ruleFQN ) )
+                    // InternalRoom.g:1109:5: otherlv_3= 'extends' ( ( ruleFQN ) )
                     {
-                    otherlv_3=(Token)match(input,28,FOLLOW_28_in_ruleDataClass2200); 
+                    otherlv_3=(Token)match(input,28,FOLLOW_3); 
 
                         	newLeafNode(otherlv_3, grammarAccess.getDataClassAccess().getExtendsKeyword_3_0());
                         
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1113:1: ( ( ruleFQN ) )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1114:1: ( ruleFQN )
+                    // InternalRoom.g:1113:1: ( ( ruleFQN ) )
+                    // InternalRoom.g:1114:1: ( ruleFQN )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1114:1: ( ruleFQN )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1115:3: ruleFQN
+                    // InternalRoom.g:1114:1: ( ruleFQN )
+                    // InternalRoom.g:1115:3: ruleFQN
                     {
 
                     			if (current==null) {
@@ -2753,7 +2753,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                      
                     	        newCompositeNode(grammarAccess.getDataClassAccess().getBaseDataClassCrossReference_3_1_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleFQN_in_ruleDataClass2223);
+                    pushFollow(FOLLOW_5);
                     ruleFQN();
 
                     state._fsp--;
@@ -2773,11 +2773,11 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_5=(Token)match(input,13,FOLLOW_13_in_ruleDataClass2237); 
+            otherlv_5=(Token)match(input,13,FOLLOW_26); 
 
                 	newLeafNode(otherlv_5, grammarAccess.getDataClassAccess().getLeftCurlyBracketKeyword_4());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1132:1: ( (lv_annotations_6_0= ruleAnnotation ) )*
+            // InternalRoom.g:1132:1: ( (lv_annotations_6_0= ruleAnnotation ) )*
             loop20:
             do {
                 int alt20=2;
@@ -2790,15 +2790,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                 switch (alt20) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1133:1: (lv_annotations_6_0= ruleAnnotation )
+            	    // InternalRoom.g:1133:1: (lv_annotations_6_0= ruleAnnotation )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1133:1: (lv_annotations_6_0= ruleAnnotation )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1134:3: lv_annotations_6_0= ruleAnnotation
+            	    // InternalRoom.g:1133:1: (lv_annotations_6_0= ruleAnnotation )
+            	    // InternalRoom.g:1134:3: lv_annotations_6_0= ruleAnnotation
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getDataClassAccess().getAnnotationsAnnotationParserRuleCall_5_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleAnnotation_in_ruleDataClass2258);
+            	    pushFollow(FOLLOW_26);
             	    lv_annotations_6_0=ruleAnnotation();
 
             	    state._fsp--;
@@ -2811,7 +2811,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"annotations",
             	            		lv_annotations_6_0, 
-            	            		"Annotation");
+            	            		"org.eclipse.etrice.core.common.Base.Annotation");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -2826,7 +2826,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                 }
             } while (true);
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1150:3: (otherlv_7= 'usercode1' ( (lv_userCode1_8_0= ruleDetailCode ) ) )?
+            // InternalRoom.g:1150:3: (otherlv_7= 'usercode1' ( (lv_userCode1_8_0= ruleDetailCode ) ) )?
             int alt21=2;
             int LA21_0 = input.LA(1);
 
@@ -2835,22 +2835,22 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt21) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1150:5: otherlv_7= 'usercode1' ( (lv_userCode1_8_0= ruleDetailCode ) )
+                    // InternalRoom.g:1150:5: otherlv_7= 'usercode1' ( (lv_userCode1_8_0= ruleDetailCode ) )
                     {
-                    otherlv_7=(Token)match(input,29,FOLLOW_29_in_ruleDataClass2272); 
+                    otherlv_7=(Token)match(input,29,FOLLOW_5); 
 
                         	newLeafNode(otherlv_7, grammarAccess.getDataClassAccess().getUsercode1Keyword_6_0());
                         
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1154:1: ( (lv_userCode1_8_0= ruleDetailCode ) )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1155:1: (lv_userCode1_8_0= ruleDetailCode )
+                    // InternalRoom.g:1154:1: ( (lv_userCode1_8_0= ruleDetailCode ) )
+                    // InternalRoom.g:1155:1: (lv_userCode1_8_0= ruleDetailCode )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1155:1: (lv_userCode1_8_0= ruleDetailCode )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1156:3: lv_userCode1_8_0= ruleDetailCode
+                    // InternalRoom.g:1155:1: (lv_userCode1_8_0= ruleDetailCode )
+                    // InternalRoom.g:1156:3: lv_userCode1_8_0= ruleDetailCode
                     {
                      
                     	        newCompositeNode(grammarAccess.getDataClassAccess().getUserCode1DetailCodeParserRuleCall_6_1_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDetailCode_in_ruleDataClass2293);
+                    pushFollow(FOLLOW_27);
                     lv_userCode1_8_0=ruleDetailCode();
 
                     state._fsp--;
@@ -2863,7 +2863,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"userCode1",
                             		lv_userCode1_8_0, 
-                            		"DetailCode");
+                            		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -2878,7 +2878,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1172:4: (otherlv_9= 'usercode2' ( (lv_userCode2_10_0= ruleDetailCode ) ) )?
+            // InternalRoom.g:1172:4: (otherlv_9= 'usercode2' ( (lv_userCode2_10_0= ruleDetailCode ) ) )?
             int alt22=2;
             int LA22_0 = input.LA(1);
 
@@ -2887,22 +2887,22 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt22) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1172:6: otherlv_9= 'usercode2' ( (lv_userCode2_10_0= ruleDetailCode ) )
+                    // InternalRoom.g:1172:6: otherlv_9= 'usercode2' ( (lv_userCode2_10_0= ruleDetailCode ) )
                     {
-                    otherlv_9=(Token)match(input,30,FOLLOW_30_in_ruleDataClass2308); 
+                    otherlv_9=(Token)match(input,30,FOLLOW_5); 
 
                         	newLeafNode(otherlv_9, grammarAccess.getDataClassAccess().getUsercode2Keyword_7_0());
                         
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1176:1: ( (lv_userCode2_10_0= ruleDetailCode ) )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1177:1: (lv_userCode2_10_0= ruleDetailCode )
+                    // InternalRoom.g:1176:1: ( (lv_userCode2_10_0= ruleDetailCode ) )
+                    // InternalRoom.g:1177:1: (lv_userCode2_10_0= ruleDetailCode )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1177:1: (lv_userCode2_10_0= ruleDetailCode )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1178:3: lv_userCode2_10_0= ruleDetailCode
+                    // InternalRoom.g:1177:1: (lv_userCode2_10_0= ruleDetailCode )
+                    // InternalRoom.g:1178:3: lv_userCode2_10_0= ruleDetailCode
                     {
                      
                     	        newCompositeNode(grammarAccess.getDataClassAccess().getUserCode2DetailCodeParserRuleCall_7_1_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDetailCode_in_ruleDataClass2329);
+                    pushFollow(FOLLOW_28);
                     lv_userCode2_10_0=ruleDetailCode();
 
                     state._fsp--;
@@ -2915,7 +2915,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"userCode2",
                             		lv_userCode2_10_0, 
-                            		"DetailCode");
+                            		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -2930,7 +2930,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1194:4: (otherlv_11= 'usercode3' ( (lv_userCode3_12_0= ruleDetailCode ) ) )?
+            // InternalRoom.g:1194:4: (otherlv_11= 'usercode3' ( (lv_userCode3_12_0= ruleDetailCode ) ) )?
             int alt23=2;
             int LA23_0 = input.LA(1);
 
@@ -2939,22 +2939,22 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt23) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1194:6: otherlv_11= 'usercode3' ( (lv_userCode3_12_0= ruleDetailCode ) )
+                    // InternalRoom.g:1194:6: otherlv_11= 'usercode3' ( (lv_userCode3_12_0= ruleDetailCode ) )
                     {
-                    otherlv_11=(Token)match(input,31,FOLLOW_31_in_ruleDataClass2344); 
+                    otherlv_11=(Token)match(input,31,FOLLOW_5); 
 
                         	newLeafNode(otherlv_11, grammarAccess.getDataClassAccess().getUsercode3Keyword_8_0());
                         
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1198:1: ( (lv_userCode3_12_0= ruleDetailCode ) )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1199:1: (lv_userCode3_12_0= ruleDetailCode )
+                    // InternalRoom.g:1198:1: ( (lv_userCode3_12_0= ruleDetailCode ) )
+                    // InternalRoom.g:1199:1: (lv_userCode3_12_0= ruleDetailCode )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1199:1: (lv_userCode3_12_0= ruleDetailCode )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1200:3: lv_userCode3_12_0= ruleDetailCode
+                    // InternalRoom.g:1199:1: (lv_userCode3_12_0= ruleDetailCode )
+                    // InternalRoom.g:1200:3: lv_userCode3_12_0= ruleDetailCode
                     {
                      
                     	        newCompositeNode(grammarAccess.getDataClassAccess().getUserCode3DetailCodeParserRuleCall_8_1_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDetailCode_in_ruleDataClass2365);
+                    pushFollow(FOLLOW_29);
                     lv_userCode3_12_0=ruleDetailCode();
 
                     state._fsp--;
@@ -2967,7 +2967,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"userCode3",
                             		lv_userCode3_12_0, 
-                            		"DetailCode");
+                            		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -2982,7 +2982,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1216:4: ( ( (lv_operations_13_0= ruleStandardOperation ) ) | ( (lv_structors_14_0= ruleClassStructor ) ) | ( (lv_attributes_15_0= ruleAttribute ) ) )*
+            // InternalRoom.g:1216:4: ( ( (lv_operations_13_0= ruleStandardOperation ) ) | ( (lv_structors_14_0= ruleClassStructor ) ) | ( (lv_attributes_15_0= ruleAttribute ) ) )*
             loop24:
             do {
                 int alt24=4;
@@ -3009,18 +3009,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                 switch (alt24) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1216:5: ( (lv_operations_13_0= ruleStandardOperation ) )
+            	    // InternalRoom.g:1216:5: ( (lv_operations_13_0= ruleStandardOperation ) )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1216:5: ( (lv_operations_13_0= ruleStandardOperation ) )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1217:1: (lv_operations_13_0= ruleStandardOperation )
+            	    // InternalRoom.g:1216:5: ( (lv_operations_13_0= ruleStandardOperation ) )
+            	    // InternalRoom.g:1217:1: (lv_operations_13_0= ruleStandardOperation )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1217:1: (lv_operations_13_0= ruleStandardOperation )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1218:3: lv_operations_13_0= ruleStandardOperation
+            	    // InternalRoom.g:1217:1: (lv_operations_13_0= ruleStandardOperation )
+            	    // InternalRoom.g:1218:3: lv_operations_13_0= ruleStandardOperation
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getDataClassAccess().getOperationsStandardOperationParserRuleCall_9_0_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleStandardOperation_in_ruleDataClass2389);
+            	    pushFollow(FOLLOW_29);
             	    lv_operations_13_0=ruleStandardOperation();
 
             	    state._fsp--;
@@ -3033,7 +3033,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"operations",
             	            		lv_operations_13_0, 
-            	            		"StandardOperation");
+            	            		"org.eclipse.etrice.core.Room.StandardOperation");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -3046,18 +3046,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 2 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1235:6: ( (lv_structors_14_0= ruleClassStructor ) )
+            	    // InternalRoom.g:1235:6: ( (lv_structors_14_0= ruleClassStructor ) )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1235:6: ( (lv_structors_14_0= ruleClassStructor ) )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1236:1: (lv_structors_14_0= ruleClassStructor )
+            	    // InternalRoom.g:1235:6: ( (lv_structors_14_0= ruleClassStructor ) )
+            	    // InternalRoom.g:1236:1: (lv_structors_14_0= ruleClassStructor )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1236:1: (lv_structors_14_0= ruleClassStructor )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1237:3: lv_structors_14_0= ruleClassStructor
+            	    // InternalRoom.g:1236:1: (lv_structors_14_0= ruleClassStructor )
+            	    // InternalRoom.g:1237:3: lv_structors_14_0= ruleClassStructor
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getDataClassAccess().getStructorsClassStructorParserRuleCall_9_1_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleClassStructor_in_ruleDataClass2416);
+            	    pushFollow(FOLLOW_29);
             	    lv_structors_14_0=ruleClassStructor();
 
             	    state._fsp--;
@@ -3070,7 +3070,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"structors",
             	            		lv_structors_14_0, 
-            	            		"ClassStructor");
+            	            		"org.eclipse.etrice.core.Room.ClassStructor");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -3083,18 +3083,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 3 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1254:6: ( (lv_attributes_15_0= ruleAttribute ) )
+            	    // InternalRoom.g:1254:6: ( (lv_attributes_15_0= ruleAttribute ) )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1254:6: ( (lv_attributes_15_0= ruleAttribute ) )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1255:1: (lv_attributes_15_0= ruleAttribute )
+            	    // InternalRoom.g:1254:6: ( (lv_attributes_15_0= ruleAttribute ) )
+            	    // InternalRoom.g:1255:1: (lv_attributes_15_0= ruleAttribute )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1255:1: (lv_attributes_15_0= ruleAttribute )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1256:3: lv_attributes_15_0= ruleAttribute
+            	    // InternalRoom.g:1255:1: (lv_attributes_15_0= ruleAttribute )
+            	    // InternalRoom.g:1256:3: lv_attributes_15_0= ruleAttribute
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getDataClassAccess().getAttributesAttributeParserRuleCall_9_2_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleAttribute_in_ruleDataClass2443);
+            	    pushFollow(FOLLOW_29);
             	    lv_attributes_15_0=ruleAttribute();
 
             	    state._fsp--;
@@ -3107,7 +3107,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"attributes",
             	            		lv_attributes_15_0, 
-            	            		"Attribute");
+            	            		"org.eclipse.etrice.core.Room.Attribute");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -3125,7 +3125,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                 }
             } while (true);
 
-            otherlv_16=(Token)match(input,14,FOLLOW_14_in_ruleDataClass2457); 
+            otherlv_16=(Token)match(input,14,FOLLOW_2); 
 
                 	newLeafNode(otherlv_16, grammarAccess.getDataClassAccess().getRightCurlyBracketKeyword_10());
                 
@@ -3150,7 +3150,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleAttribute"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1284:1: entryRuleAttribute returns [EObject current=null] : iv_ruleAttribute= ruleAttribute EOF ;
+    // InternalRoom.g:1284:1: entryRuleAttribute returns [EObject current=null] : iv_ruleAttribute= ruleAttribute EOF ;
     public final EObject entryRuleAttribute() throws RecognitionException {
         EObject current = null;
 
@@ -3158,17 +3158,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1285:2: (iv_ruleAttribute= ruleAttribute EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1286:2: iv_ruleAttribute= ruleAttribute EOF
+            // InternalRoom.g:1285:2: (iv_ruleAttribute= ruleAttribute EOF )
+            // InternalRoom.g:1286:2: iv_ruleAttribute= ruleAttribute EOF
             {
              newCompositeNode(grammarAccess.getAttributeRule()); 
-            pushFollow(FOLLOW_ruleAttribute_in_entryRuleAttribute2493);
+            pushFollow(FOLLOW_1);
             iv_ruleAttribute=ruleAttribute();
 
             state._fsp--;
 
              current =iv_ruleAttribute; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAttribute2503); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3186,7 +3186,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleAttribute"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1293:1: ruleAttribute returns [EObject current=null] : (otherlv_0= 'Attribute' ( (lv_name_1_0= RULE_ID ) ) (otherlv_2= '[' ( (lv_size_3_0= RULE_INT ) ) otherlv_4= ']' )? otherlv_5= ':' ( (lv_type_6_0= ruleRefableType ) )? (otherlv_7= '=' ( (lv_defaultValueLiteral_8_0= RULE_STRING ) ) )? ( (lv_docu_9_0= ruleDocumentation ) )? ) ;
+    // InternalRoom.g:1293:1: ruleAttribute returns [EObject current=null] : (otherlv_0= 'Attribute' ( (lv_name_1_0= RULE_ID ) ) (otherlv_2= '[' ( (lv_size_3_0= RULE_INT ) ) otherlv_4= ']' )? otherlv_5= ':' ( (lv_type_6_0= ruleRefableType ) )? (otherlv_7= '=' ( (lv_defaultValueLiteral_8_0= RULE_STRING ) ) )? ( (lv_docu_9_0= ruleDocumentation ) )? ) ;
     public final EObject ruleAttribute() throws RecognitionException {
         EObject current = null;
 
@@ -3206,23 +3206,23 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1296:28: ( (otherlv_0= 'Attribute' ( (lv_name_1_0= RULE_ID ) ) (otherlv_2= '[' ( (lv_size_3_0= RULE_INT ) ) otherlv_4= ']' )? otherlv_5= ':' ( (lv_type_6_0= ruleRefableType ) )? (otherlv_7= '=' ( (lv_defaultValueLiteral_8_0= RULE_STRING ) ) )? ( (lv_docu_9_0= ruleDocumentation ) )? ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1297:1: (otherlv_0= 'Attribute' ( (lv_name_1_0= RULE_ID ) ) (otherlv_2= '[' ( (lv_size_3_0= RULE_INT ) ) otherlv_4= ']' )? otherlv_5= ':' ( (lv_type_6_0= ruleRefableType ) )? (otherlv_7= '=' ( (lv_defaultValueLiteral_8_0= RULE_STRING ) ) )? ( (lv_docu_9_0= ruleDocumentation ) )? )
+            // InternalRoom.g:1296:28: ( (otherlv_0= 'Attribute' ( (lv_name_1_0= RULE_ID ) ) (otherlv_2= '[' ( (lv_size_3_0= RULE_INT ) ) otherlv_4= ']' )? otherlv_5= ':' ( (lv_type_6_0= ruleRefableType ) )? (otherlv_7= '=' ( (lv_defaultValueLiteral_8_0= RULE_STRING ) ) )? ( (lv_docu_9_0= ruleDocumentation ) )? ) )
+            // InternalRoom.g:1297:1: (otherlv_0= 'Attribute' ( (lv_name_1_0= RULE_ID ) ) (otherlv_2= '[' ( (lv_size_3_0= RULE_INT ) ) otherlv_4= ']' )? otherlv_5= ':' ( (lv_type_6_0= ruleRefableType ) )? (otherlv_7= '=' ( (lv_defaultValueLiteral_8_0= RULE_STRING ) ) )? ( (lv_docu_9_0= ruleDocumentation ) )? )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1297:1: (otherlv_0= 'Attribute' ( (lv_name_1_0= RULE_ID ) ) (otherlv_2= '[' ( (lv_size_3_0= RULE_INT ) ) otherlv_4= ']' )? otherlv_5= ':' ( (lv_type_6_0= ruleRefableType ) )? (otherlv_7= '=' ( (lv_defaultValueLiteral_8_0= RULE_STRING ) ) )? ( (lv_docu_9_0= ruleDocumentation ) )? )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1297:3: otherlv_0= 'Attribute' ( (lv_name_1_0= RULE_ID ) ) (otherlv_2= '[' ( (lv_size_3_0= RULE_INT ) ) otherlv_4= ']' )? otherlv_5= ':' ( (lv_type_6_0= ruleRefableType ) )? (otherlv_7= '=' ( (lv_defaultValueLiteral_8_0= RULE_STRING ) ) )? ( (lv_docu_9_0= ruleDocumentation ) )?
+            // InternalRoom.g:1297:1: (otherlv_0= 'Attribute' ( (lv_name_1_0= RULE_ID ) ) (otherlv_2= '[' ( (lv_size_3_0= RULE_INT ) ) otherlv_4= ']' )? otherlv_5= ':' ( (lv_type_6_0= ruleRefableType ) )? (otherlv_7= '=' ( (lv_defaultValueLiteral_8_0= RULE_STRING ) ) )? ( (lv_docu_9_0= ruleDocumentation ) )? )
+            // InternalRoom.g:1297:3: otherlv_0= 'Attribute' ( (lv_name_1_0= RULE_ID ) ) (otherlv_2= '[' ( (lv_size_3_0= RULE_INT ) ) otherlv_4= ']' )? otherlv_5= ':' ( (lv_type_6_0= ruleRefableType ) )? (otherlv_7= '=' ( (lv_defaultValueLiteral_8_0= RULE_STRING ) ) )? ( (lv_docu_9_0= ruleDocumentation ) )?
             {
-            otherlv_0=(Token)match(input,32,FOLLOW_32_in_ruleAttribute2540); 
+            otherlv_0=(Token)match(input,32,FOLLOW_3); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getAttributeAccess().getAttributeKeyword_0());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1301:1: ( (lv_name_1_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1302:1: (lv_name_1_0= RULE_ID )
+            // InternalRoom.g:1301:1: ( (lv_name_1_0= RULE_ID ) )
+            // InternalRoom.g:1302:1: (lv_name_1_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1302:1: (lv_name_1_0= RULE_ID )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1303:3: lv_name_1_0= RULE_ID
+            // InternalRoom.g:1302:1: (lv_name_1_0= RULE_ID )
+            // InternalRoom.g:1303:3: lv_name_1_0= RULE_ID
             {
-            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleAttribute2557); 
+            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_30); 
 
             			newLeafNode(lv_name_1_0, grammarAccess.getAttributeAccess().getNameIDTerminalRuleCall_1_0()); 
             		
@@ -3234,7 +3234,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"name",
                     		lv_name_1_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -3242,7 +3242,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1319:2: (otherlv_2= '[' ( (lv_size_3_0= RULE_INT ) ) otherlv_4= ']' )?
+            // InternalRoom.g:1319:2: (otherlv_2= '[' ( (lv_size_3_0= RULE_INT ) ) otherlv_4= ']' )?
             int alt25=2;
             int LA25_0 = input.LA(1);
 
@@ -3251,19 +3251,19 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt25) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1319:4: otherlv_2= '[' ( (lv_size_3_0= RULE_INT ) ) otherlv_4= ']'
+                    // InternalRoom.g:1319:4: otherlv_2= '[' ( (lv_size_3_0= RULE_INT ) ) otherlv_4= ']'
                     {
-                    otherlv_2=(Token)match(input,33,FOLLOW_33_in_ruleAttribute2575); 
+                    otherlv_2=(Token)match(input,33,FOLLOW_31); 
 
                         	newLeafNode(otherlv_2, grammarAccess.getAttributeAccess().getLeftSquareBracketKeyword_2_0());
                         
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1323:1: ( (lv_size_3_0= RULE_INT ) )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1324:1: (lv_size_3_0= RULE_INT )
+                    // InternalRoom.g:1323:1: ( (lv_size_3_0= RULE_INT ) )
+                    // InternalRoom.g:1324:1: (lv_size_3_0= RULE_INT )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1324:1: (lv_size_3_0= RULE_INT )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1325:3: lv_size_3_0= RULE_INT
+                    // InternalRoom.g:1324:1: (lv_size_3_0= RULE_INT )
+                    // InternalRoom.g:1325:3: lv_size_3_0= RULE_INT
                     {
-                    lv_size_3_0=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleAttribute2592); 
+                    lv_size_3_0=(Token)match(input,RULE_INT,FOLLOW_32); 
 
                     			newLeafNode(lv_size_3_0, grammarAccess.getAttributeAccess().getSizeINTTerminalRuleCall_2_1_0()); 
                     		
@@ -3275,7 +3275,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"size",
                             		lv_size_3_0, 
-                            		"INT");
+                            		"org.eclipse.xtext.common.Terminals.INT");
                     	    
 
                     }
@@ -3283,7 +3283,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_4=(Token)match(input,34,FOLLOW_34_in_ruleAttribute2609); 
+                    otherlv_4=(Token)match(input,34,FOLLOW_8); 
 
                         	newLeafNode(otherlv_4, grammarAccess.getAttributeAccess().getRightSquareBracketKeyword_2_2());
                         
@@ -3293,11 +3293,11 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_5=(Token)match(input,15,FOLLOW_15_in_ruleAttribute2623); 
+            otherlv_5=(Token)match(input,15,FOLLOW_33); 
 
                 	newLeafNode(otherlv_5, grammarAccess.getAttributeAccess().getColonKeyword_3());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1349:1: ( (lv_type_6_0= ruleRefableType ) )?
+            // InternalRoom.g:1349:1: ( (lv_type_6_0= ruleRefableType ) )?
             int alt26=2;
             int LA26_0 = input.LA(1);
 
@@ -3306,15 +3306,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt26) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1350:1: (lv_type_6_0= ruleRefableType )
+                    // InternalRoom.g:1350:1: (lv_type_6_0= ruleRefableType )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1350:1: (lv_type_6_0= ruleRefableType )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1351:3: lv_type_6_0= ruleRefableType
+                    // InternalRoom.g:1350:1: (lv_type_6_0= ruleRefableType )
+                    // InternalRoom.g:1351:3: lv_type_6_0= ruleRefableType
                     {
                      
                     	        newCompositeNode(grammarAccess.getAttributeAccess().getTypeRefableTypeParserRuleCall_4_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleRefableType_in_ruleAttribute2644);
+                    pushFollow(FOLLOW_34);
                     lv_type_6_0=ruleRefableType();
 
                     state._fsp--;
@@ -3327,7 +3327,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"type",
                             		lv_type_6_0, 
-                            		"RefableType");
+                            		"org.eclipse.etrice.core.Room.RefableType");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -3339,7 +3339,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1367:3: (otherlv_7= '=' ( (lv_defaultValueLiteral_8_0= RULE_STRING ) ) )?
+            // InternalRoom.g:1367:3: (otherlv_7= '=' ( (lv_defaultValueLiteral_8_0= RULE_STRING ) ) )?
             int alt27=2;
             int LA27_0 = input.LA(1);
 
@@ -3348,19 +3348,19 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt27) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1367:5: otherlv_7= '=' ( (lv_defaultValueLiteral_8_0= RULE_STRING ) )
+                    // InternalRoom.g:1367:5: otherlv_7= '=' ( (lv_defaultValueLiteral_8_0= RULE_STRING ) )
                     {
-                    otherlv_7=(Token)match(input,25,FOLLOW_25_in_ruleAttribute2658); 
+                    otherlv_7=(Token)match(input,25,FOLLOW_12); 
 
                         	newLeafNode(otherlv_7, grammarAccess.getAttributeAccess().getEqualsSignKeyword_5_0());
                         
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1371:1: ( (lv_defaultValueLiteral_8_0= RULE_STRING ) )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1372:1: (lv_defaultValueLiteral_8_0= RULE_STRING )
+                    // InternalRoom.g:1371:1: ( (lv_defaultValueLiteral_8_0= RULE_STRING ) )
+                    // InternalRoom.g:1372:1: (lv_defaultValueLiteral_8_0= RULE_STRING )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1372:1: (lv_defaultValueLiteral_8_0= RULE_STRING )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1373:3: lv_defaultValueLiteral_8_0= RULE_STRING
+                    // InternalRoom.g:1372:1: (lv_defaultValueLiteral_8_0= RULE_STRING )
+                    // InternalRoom.g:1373:3: lv_defaultValueLiteral_8_0= RULE_STRING
                     {
-                    lv_defaultValueLiteral_8_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleAttribute2675); 
+                    lv_defaultValueLiteral_8_0=(Token)match(input,RULE_STRING,FOLLOW_16); 
 
                     			newLeafNode(lv_defaultValueLiteral_8_0, grammarAccess.getAttributeAccess().getDefaultValueLiteralSTRINGTerminalRuleCall_5_1_0()); 
                     		
@@ -3372,7 +3372,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"defaultValueLiteral",
                             		lv_defaultValueLiteral_8_0, 
-                            		"STRING");
+                            		"org.eclipse.xtext.common.Terminals.STRING");
                     	    
 
                     }
@@ -3386,7 +3386,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1389:4: ( (lv_docu_9_0= ruleDocumentation ) )?
+            // InternalRoom.g:1389:4: ( (lv_docu_9_0= ruleDocumentation ) )?
             int alt28=2;
             int LA28_0 = input.LA(1);
 
@@ -3395,15 +3395,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt28) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1390:1: (lv_docu_9_0= ruleDocumentation )
+                    // InternalRoom.g:1390:1: (lv_docu_9_0= ruleDocumentation )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1390:1: (lv_docu_9_0= ruleDocumentation )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1391:3: lv_docu_9_0= ruleDocumentation
+                    // InternalRoom.g:1390:1: (lv_docu_9_0= ruleDocumentation )
+                    // InternalRoom.g:1391:3: lv_docu_9_0= ruleDocumentation
                     {
                      
                     	        newCompositeNode(grammarAccess.getAttributeAccess().getDocuDocumentationParserRuleCall_6_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDocumentation_in_ruleAttribute2703);
+                    pushFollow(FOLLOW_2);
                     lv_docu_9_0=ruleDocumentation();
 
                     state._fsp--;
@@ -3416,7 +3416,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"docu",
                             		lv_docu_9_0, 
-                            		"Documentation");
+                            		"org.eclipse.etrice.core.common.Base.Documentation");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -3449,7 +3449,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleStandardOperation"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1417:1: entryRuleStandardOperation returns [EObject current=null] : iv_ruleStandardOperation= ruleStandardOperation EOF ;
+    // InternalRoom.g:1417:1: entryRuleStandardOperation returns [EObject current=null] : iv_ruleStandardOperation= ruleStandardOperation EOF ;
     public final EObject entryRuleStandardOperation() throws RecognitionException {
         EObject current = null;
 
@@ -3457,17 +3457,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1418:2: (iv_ruleStandardOperation= ruleStandardOperation EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1419:2: iv_ruleStandardOperation= ruleStandardOperation EOF
+            // InternalRoom.g:1418:2: (iv_ruleStandardOperation= ruleStandardOperation EOF )
+            // InternalRoom.g:1419:2: iv_ruleStandardOperation= ruleStandardOperation EOF
             {
              newCompositeNode(grammarAccess.getStandardOperationRule()); 
-            pushFollow(FOLLOW_ruleStandardOperation_in_entryRuleStandardOperation2742);
+            pushFollow(FOLLOW_1);
             iv_ruleStandardOperation=ruleStandardOperation();
 
             state._fsp--;
 
              current =iv_ruleStandardOperation; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleStandardOperation2752); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3485,7 +3485,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleStandardOperation"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1426:1: ruleStandardOperation returns [EObject current=null] : ( ( (lv_override_0_0= 'override' ) )? otherlv_1= 'Operation' ( (lv_name_2_0= RULE_ID ) ) otherlv_3= '(' ( ( (lv_arguments_4_0= ruleVarDecl ) ) (otherlv_5= ',' ( (lv_arguments_6_0= ruleVarDecl ) ) )* )? otherlv_7= ')' (otherlv_8= ':' (otherlv_9= 'void' | ( (lv_returnType_10_0= ruleRefableType ) ) ) )? ( (lv_docu_11_0= ruleDocumentation ) )? ( (lv_detailCode_12_0= ruleDetailCode ) ) ) ;
+    // InternalRoom.g:1426:1: ruleStandardOperation returns [EObject current=null] : ( ( (lv_override_0_0= 'override' ) )? otherlv_1= 'Operation' ( (lv_name_2_0= RULE_ID ) ) otherlv_3= '(' ( ( (lv_arguments_4_0= ruleVarDecl ) ) (otherlv_5= ',' ( (lv_arguments_6_0= ruleVarDecl ) ) )* )? otherlv_7= ')' (otherlv_8= ':' (otherlv_9= 'void' | ( (lv_returnType_10_0= ruleRefableType ) ) ) )? ( (lv_docu_11_0= ruleDocumentation ) )? ( (lv_detailCode_12_0= ruleDetailCode ) ) ) ;
     public final EObject ruleStandardOperation() throws RecognitionException {
         EObject current = null;
 
@@ -3511,13 +3511,13 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1429:28: ( ( ( (lv_override_0_0= 'override' ) )? otherlv_1= 'Operation' ( (lv_name_2_0= RULE_ID ) ) otherlv_3= '(' ( ( (lv_arguments_4_0= ruleVarDecl ) ) (otherlv_5= ',' ( (lv_arguments_6_0= ruleVarDecl ) ) )* )? otherlv_7= ')' (otherlv_8= ':' (otherlv_9= 'void' | ( (lv_returnType_10_0= ruleRefableType ) ) ) )? ( (lv_docu_11_0= ruleDocumentation ) )? ( (lv_detailCode_12_0= ruleDetailCode ) ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1430:1: ( ( (lv_override_0_0= 'override' ) )? otherlv_1= 'Operation' ( (lv_name_2_0= RULE_ID ) ) otherlv_3= '(' ( ( (lv_arguments_4_0= ruleVarDecl ) ) (otherlv_5= ',' ( (lv_arguments_6_0= ruleVarDecl ) ) )* )? otherlv_7= ')' (otherlv_8= ':' (otherlv_9= 'void' | ( (lv_returnType_10_0= ruleRefableType ) ) ) )? ( (lv_docu_11_0= ruleDocumentation ) )? ( (lv_detailCode_12_0= ruleDetailCode ) ) )
+            // InternalRoom.g:1429:28: ( ( ( (lv_override_0_0= 'override' ) )? otherlv_1= 'Operation' ( (lv_name_2_0= RULE_ID ) ) otherlv_3= '(' ( ( (lv_arguments_4_0= ruleVarDecl ) ) (otherlv_5= ',' ( (lv_arguments_6_0= ruleVarDecl ) ) )* )? otherlv_7= ')' (otherlv_8= ':' (otherlv_9= 'void' | ( (lv_returnType_10_0= ruleRefableType ) ) ) )? ( (lv_docu_11_0= ruleDocumentation ) )? ( (lv_detailCode_12_0= ruleDetailCode ) ) ) )
+            // InternalRoom.g:1430:1: ( ( (lv_override_0_0= 'override' ) )? otherlv_1= 'Operation' ( (lv_name_2_0= RULE_ID ) ) otherlv_3= '(' ( ( (lv_arguments_4_0= ruleVarDecl ) ) (otherlv_5= ',' ( (lv_arguments_6_0= ruleVarDecl ) ) )* )? otherlv_7= ')' (otherlv_8= ':' (otherlv_9= 'void' | ( (lv_returnType_10_0= ruleRefableType ) ) ) )? ( (lv_docu_11_0= ruleDocumentation ) )? ( (lv_detailCode_12_0= ruleDetailCode ) ) )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1430:1: ( ( (lv_override_0_0= 'override' ) )? otherlv_1= 'Operation' ( (lv_name_2_0= RULE_ID ) ) otherlv_3= '(' ( ( (lv_arguments_4_0= ruleVarDecl ) ) (otherlv_5= ',' ( (lv_arguments_6_0= ruleVarDecl ) ) )* )? otherlv_7= ')' (otherlv_8= ':' (otherlv_9= 'void' | ( (lv_returnType_10_0= ruleRefableType ) ) ) )? ( (lv_docu_11_0= ruleDocumentation ) )? ( (lv_detailCode_12_0= ruleDetailCode ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1430:2: ( (lv_override_0_0= 'override' ) )? otherlv_1= 'Operation' ( (lv_name_2_0= RULE_ID ) ) otherlv_3= '(' ( ( (lv_arguments_4_0= ruleVarDecl ) ) (otherlv_5= ',' ( (lv_arguments_6_0= ruleVarDecl ) ) )* )? otherlv_7= ')' (otherlv_8= ':' (otherlv_9= 'void' | ( (lv_returnType_10_0= ruleRefableType ) ) ) )? ( (lv_docu_11_0= ruleDocumentation ) )? ( (lv_detailCode_12_0= ruleDetailCode ) )
+            // InternalRoom.g:1430:1: ( ( (lv_override_0_0= 'override' ) )? otherlv_1= 'Operation' ( (lv_name_2_0= RULE_ID ) ) otherlv_3= '(' ( ( (lv_arguments_4_0= ruleVarDecl ) ) (otherlv_5= ',' ( (lv_arguments_6_0= ruleVarDecl ) ) )* )? otherlv_7= ')' (otherlv_8= ':' (otherlv_9= 'void' | ( (lv_returnType_10_0= ruleRefableType ) ) ) )? ( (lv_docu_11_0= ruleDocumentation ) )? ( (lv_detailCode_12_0= ruleDetailCode ) ) )
+            // InternalRoom.g:1430:2: ( (lv_override_0_0= 'override' ) )? otherlv_1= 'Operation' ( (lv_name_2_0= RULE_ID ) ) otherlv_3= '(' ( ( (lv_arguments_4_0= ruleVarDecl ) ) (otherlv_5= ',' ( (lv_arguments_6_0= ruleVarDecl ) ) )* )? otherlv_7= ')' (otherlv_8= ':' (otherlv_9= 'void' | ( (lv_returnType_10_0= ruleRefableType ) ) ) )? ( (lv_docu_11_0= ruleDocumentation ) )? ( (lv_detailCode_12_0= ruleDetailCode ) )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1430:2: ( (lv_override_0_0= 'override' ) )?
+            // InternalRoom.g:1430:2: ( (lv_override_0_0= 'override' ) )?
             int alt29=2;
             int LA29_0 = input.LA(1);
 
@@ -3526,12 +3526,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt29) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1431:1: (lv_override_0_0= 'override' )
+                    // InternalRoom.g:1431:1: (lv_override_0_0= 'override' )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1431:1: (lv_override_0_0= 'override' )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1432:3: lv_override_0_0= 'override'
+                    // InternalRoom.g:1431:1: (lv_override_0_0= 'override' )
+                    // InternalRoom.g:1432:3: lv_override_0_0= 'override'
                     {
-                    lv_override_0_0=(Token)match(input,35,FOLLOW_35_in_ruleStandardOperation2795); 
+                    lv_override_0_0=(Token)match(input,35,FOLLOW_35); 
 
                             newLeafNode(lv_override_0_0, grammarAccess.getStandardOperationAccess().getOverrideOverrideKeyword_0_0());
                         
@@ -3550,17 +3550,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,36,FOLLOW_36_in_ruleStandardOperation2821); 
+            otherlv_1=(Token)match(input,36,FOLLOW_3); 
 
                 	newLeafNode(otherlv_1, grammarAccess.getStandardOperationAccess().getOperationKeyword_1());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1449:1: ( (lv_name_2_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1450:1: (lv_name_2_0= RULE_ID )
+            // InternalRoom.g:1449:1: ( (lv_name_2_0= RULE_ID ) )
+            // InternalRoom.g:1450:1: (lv_name_2_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1450:1: (lv_name_2_0= RULE_ID )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1451:3: lv_name_2_0= RULE_ID
+            // InternalRoom.g:1450:1: (lv_name_2_0= RULE_ID )
+            // InternalRoom.g:1451:3: lv_name_2_0= RULE_ID
             {
-            lv_name_2_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleStandardOperation2838); 
+            lv_name_2_0=(Token)match(input,RULE_ID,FOLLOW_36); 
 
             			newLeafNode(lv_name_2_0, grammarAccess.getStandardOperationAccess().getNameIDTerminalRuleCall_2_0()); 
             		
@@ -3572,7 +3572,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"name",
                     		lv_name_2_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -3580,11 +3580,11 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_3=(Token)match(input,19,FOLLOW_19_in_ruleStandardOperation2855); 
+            otherlv_3=(Token)match(input,19,FOLLOW_37); 
 
                 	newLeafNode(otherlv_3, grammarAccess.getStandardOperationAccess().getLeftParenthesisKeyword_3());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1471:1: ( ( (lv_arguments_4_0= ruleVarDecl ) ) (otherlv_5= ',' ( (lv_arguments_6_0= ruleVarDecl ) ) )* )?
+            // InternalRoom.g:1471:1: ( ( (lv_arguments_4_0= ruleVarDecl ) ) (otherlv_5= ',' ( (lv_arguments_6_0= ruleVarDecl ) ) )* )?
             int alt31=2;
             int LA31_0 = input.LA(1);
 
@@ -3593,18 +3593,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt31) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1471:2: ( (lv_arguments_4_0= ruleVarDecl ) ) (otherlv_5= ',' ( (lv_arguments_6_0= ruleVarDecl ) ) )*
+                    // InternalRoom.g:1471:2: ( (lv_arguments_4_0= ruleVarDecl ) ) (otherlv_5= ',' ( (lv_arguments_6_0= ruleVarDecl ) ) )*
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1471:2: ( (lv_arguments_4_0= ruleVarDecl ) )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1472:1: (lv_arguments_4_0= ruleVarDecl )
+                    // InternalRoom.g:1471:2: ( (lv_arguments_4_0= ruleVarDecl ) )
+                    // InternalRoom.g:1472:1: (lv_arguments_4_0= ruleVarDecl )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1472:1: (lv_arguments_4_0= ruleVarDecl )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1473:3: lv_arguments_4_0= ruleVarDecl
+                    // InternalRoom.g:1472:1: (lv_arguments_4_0= ruleVarDecl )
+                    // InternalRoom.g:1473:3: lv_arguments_4_0= ruleVarDecl
                     {
                      
                     	        newCompositeNode(grammarAccess.getStandardOperationAccess().getArgumentsVarDeclParserRuleCall_4_0_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleVarDecl_in_ruleStandardOperation2877);
+                    pushFollow(FOLLOW_38);
                     lv_arguments_4_0=ruleVarDecl();
 
                     state._fsp--;
@@ -3617,7 +3617,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"arguments",
                             		lv_arguments_4_0, 
-                            		"VarDecl");
+                            		"org.eclipse.etrice.core.Room.VarDecl");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -3626,7 +3626,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1489:2: (otherlv_5= ',' ( (lv_arguments_6_0= ruleVarDecl ) ) )*
+                    // InternalRoom.g:1489:2: (otherlv_5= ',' ( (lv_arguments_6_0= ruleVarDecl ) ) )*
                     loop30:
                     do {
                         int alt30=2;
@@ -3639,22 +3639,22 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                         switch (alt30) {
                     	case 1 :
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1489:4: otherlv_5= ',' ( (lv_arguments_6_0= ruleVarDecl ) )
+                    	    // InternalRoom.g:1489:4: otherlv_5= ',' ( (lv_arguments_6_0= ruleVarDecl ) )
                     	    {
-                    	    otherlv_5=(Token)match(input,24,FOLLOW_24_in_ruleStandardOperation2890); 
+                    	    otherlv_5=(Token)match(input,24,FOLLOW_3); 
 
                     	        	newLeafNode(otherlv_5, grammarAccess.getStandardOperationAccess().getCommaKeyword_4_1_0());
                     	        
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1493:1: ( (lv_arguments_6_0= ruleVarDecl ) )
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1494:1: (lv_arguments_6_0= ruleVarDecl )
+                    	    // InternalRoom.g:1493:1: ( (lv_arguments_6_0= ruleVarDecl ) )
+                    	    // InternalRoom.g:1494:1: (lv_arguments_6_0= ruleVarDecl )
                     	    {
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1494:1: (lv_arguments_6_0= ruleVarDecl )
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1495:3: lv_arguments_6_0= ruleVarDecl
+                    	    // InternalRoom.g:1494:1: (lv_arguments_6_0= ruleVarDecl )
+                    	    // InternalRoom.g:1495:3: lv_arguments_6_0= ruleVarDecl
                     	    {
                     	     
                     	    	        newCompositeNode(grammarAccess.getStandardOperationAccess().getArgumentsVarDeclParserRuleCall_4_1_1_0()); 
                     	    	    
-                    	    pushFollow(FOLLOW_ruleVarDecl_in_ruleStandardOperation2911);
+                    	    pushFollow(FOLLOW_38);
                     	    lv_arguments_6_0=ruleVarDecl();
 
                     	    state._fsp--;
@@ -3667,7 +3667,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     	           			current, 
                     	           			"arguments",
                     	            		lv_arguments_6_0, 
-                    	            		"VarDecl");
+                    	            		"org.eclipse.etrice.core.Room.VarDecl");
                     	    	        afterParserOrEnumRuleCall();
                     	    	    
 
@@ -3691,11 +3691,11 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_7=(Token)match(input,20,FOLLOW_20_in_ruleStandardOperation2927); 
+            otherlv_7=(Token)match(input,20,FOLLOW_39); 
 
                 	newLeafNode(otherlv_7, grammarAccess.getStandardOperationAccess().getRightParenthesisKeyword_5());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1515:1: (otherlv_8= ':' (otherlv_9= 'void' | ( (lv_returnType_10_0= ruleRefableType ) ) ) )?
+            // InternalRoom.g:1515:1: (otherlv_8= ':' (otherlv_9= 'void' | ( (lv_returnType_10_0= ruleRefableType ) ) ) )?
             int alt33=2;
             int LA33_0 = input.LA(1);
 
@@ -3704,13 +3704,13 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt33) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1515:3: otherlv_8= ':' (otherlv_9= 'void' | ( (lv_returnType_10_0= ruleRefableType ) ) )
+                    // InternalRoom.g:1515:3: otherlv_8= ':' (otherlv_9= 'void' | ( (lv_returnType_10_0= ruleRefableType ) ) )
                     {
-                    otherlv_8=(Token)match(input,15,FOLLOW_15_in_ruleStandardOperation2940); 
+                    otherlv_8=(Token)match(input,15,FOLLOW_40); 
 
                         	newLeafNode(otherlv_8, grammarAccess.getStandardOperationAccess().getColonKeyword_6_0());
                         
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1519:1: (otherlv_9= 'void' | ( (lv_returnType_10_0= ruleRefableType ) ) )
+                    // InternalRoom.g:1519:1: (otherlv_9= 'void' | ( (lv_returnType_10_0= ruleRefableType ) ) )
                     int alt32=2;
                     int LA32_0 = input.LA(1);
 
@@ -3728,9 +3728,9 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     switch (alt32) {
                         case 1 :
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1519:3: otherlv_9= 'void'
+                            // InternalRoom.g:1519:3: otherlv_9= 'void'
                             {
-                            otherlv_9=(Token)match(input,37,FOLLOW_37_in_ruleStandardOperation2953); 
+                            otherlv_9=(Token)match(input,37,FOLLOW_4); 
 
                                 	newLeafNode(otherlv_9, grammarAccess.getStandardOperationAccess().getVoidKeyword_6_1_0());
                                 
@@ -3738,18 +3738,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                             }
                             break;
                         case 2 :
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1524:6: ( (lv_returnType_10_0= ruleRefableType ) )
+                            // InternalRoom.g:1524:6: ( (lv_returnType_10_0= ruleRefableType ) )
                             {
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1524:6: ( (lv_returnType_10_0= ruleRefableType ) )
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1525:1: (lv_returnType_10_0= ruleRefableType )
+                            // InternalRoom.g:1524:6: ( (lv_returnType_10_0= ruleRefableType ) )
+                            // InternalRoom.g:1525:1: (lv_returnType_10_0= ruleRefableType )
                             {
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1525:1: (lv_returnType_10_0= ruleRefableType )
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1526:3: lv_returnType_10_0= ruleRefableType
+                            // InternalRoom.g:1525:1: (lv_returnType_10_0= ruleRefableType )
+                            // InternalRoom.g:1526:3: lv_returnType_10_0= ruleRefableType
                             {
                              
                             	        newCompositeNode(grammarAccess.getStandardOperationAccess().getReturnTypeRefableTypeParserRuleCall_6_1_1_0()); 
                             	    
-                            pushFollow(FOLLOW_ruleRefableType_in_ruleStandardOperation2980);
+                            pushFollow(FOLLOW_4);
                             lv_returnType_10_0=ruleRefableType();
 
                             state._fsp--;
@@ -3762,7 +3762,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                                    			current, 
                                    			"returnType",
                                     		lv_returnType_10_0, 
-                                    		"RefableType");
+                                    		"org.eclipse.etrice.core.Room.RefableType");
                             	        afterParserOrEnumRuleCall();
                             	    
 
@@ -3783,7 +3783,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1542:5: ( (lv_docu_11_0= ruleDocumentation ) )?
+            // InternalRoom.g:1542:5: ( (lv_docu_11_0= ruleDocumentation ) )?
             int alt34=2;
             int LA34_0 = input.LA(1);
 
@@ -3792,15 +3792,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt34) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1543:1: (lv_docu_11_0= ruleDocumentation )
+                    // InternalRoom.g:1543:1: (lv_docu_11_0= ruleDocumentation )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1543:1: (lv_docu_11_0= ruleDocumentation )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1544:3: lv_docu_11_0= ruleDocumentation
+                    // InternalRoom.g:1543:1: (lv_docu_11_0= ruleDocumentation )
+                    // InternalRoom.g:1544:3: lv_docu_11_0= ruleDocumentation
                     {
                      
                     	        newCompositeNode(grammarAccess.getStandardOperationAccess().getDocuDocumentationParserRuleCall_7_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDocumentation_in_ruleStandardOperation3004);
+                    pushFollow(FOLLOW_5);
                     lv_docu_11_0=ruleDocumentation();
 
                     state._fsp--;
@@ -3813,7 +3813,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"docu",
                             		lv_docu_11_0, 
-                            		"Documentation");
+                            		"org.eclipse.etrice.core.common.Base.Documentation");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -3825,16 +3825,16 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1560:3: ( (lv_detailCode_12_0= ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1561:1: (lv_detailCode_12_0= ruleDetailCode )
+            // InternalRoom.g:1560:3: ( (lv_detailCode_12_0= ruleDetailCode ) )
+            // InternalRoom.g:1561:1: (lv_detailCode_12_0= ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1561:1: (lv_detailCode_12_0= ruleDetailCode )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1562:3: lv_detailCode_12_0= ruleDetailCode
+            // InternalRoom.g:1561:1: (lv_detailCode_12_0= ruleDetailCode )
+            // InternalRoom.g:1562:3: lv_detailCode_12_0= ruleDetailCode
             {
              
             	        newCompositeNode(grammarAccess.getStandardOperationAccess().getDetailCodeDetailCodeParserRuleCall_8_0()); 
             	    
-            pushFollow(FOLLOW_ruleDetailCode_in_ruleStandardOperation3026);
+            pushFollow(FOLLOW_2);
             lv_detailCode_12_0=ruleDetailCode();
 
             state._fsp--;
@@ -3847,7 +3847,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"detailCode",
                     		lv_detailCode_12_0, 
-                    		"DetailCode");
+                    		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -3877,7 +3877,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRulePortOperation"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1586:1: entryRulePortOperation returns [EObject current=null] : iv_rulePortOperation= rulePortOperation EOF ;
+    // InternalRoom.g:1586:1: entryRulePortOperation returns [EObject current=null] : iv_rulePortOperation= rulePortOperation EOF ;
     public final EObject entryRulePortOperation() throws RecognitionException {
         EObject current = null;
 
@@ -3885,17 +3885,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1587:2: (iv_rulePortOperation= rulePortOperation EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1588:2: iv_rulePortOperation= rulePortOperation EOF
+            // InternalRoom.g:1587:2: (iv_rulePortOperation= rulePortOperation EOF )
+            // InternalRoom.g:1588:2: iv_rulePortOperation= rulePortOperation EOF
             {
              newCompositeNode(grammarAccess.getPortOperationRule()); 
-            pushFollow(FOLLOW_rulePortOperation_in_entryRulePortOperation3062);
+            pushFollow(FOLLOW_1);
             iv_rulePortOperation=rulePortOperation();
 
             state._fsp--;
 
              current =iv_rulePortOperation; 
-            match(input,EOF,FOLLOW_EOF_in_entryRulePortOperation3072); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3913,7 +3913,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "rulePortOperation"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1595:1: rulePortOperation returns [EObject current=null] : (otherlv_0= 'Operation' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '(' ( ( (lv_arguments_3_0= ruleVarDecl ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleVarDecl ) ) )* )? otherlv_6= ')' ( (otherlv_7= ':' (otherlv_8= 'void' | ( (lv_returnType_9_0= ruleRefableType ) ) ) ) | (otherlv_10= 'sends' ( (otherlv_11= RULE_ID ) ) ) )? ( (lv_docu_12_0= ruleDocumentation ) )? ( (lv_detailCode_13_0= ruleDetailCode ) ) ) ;
+    // InternalRoom.g:1595:1: rulePortOperation returns [EObject current=null] : (otherlv_0= 'Operation' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '(' ( ( (lv_arguments_3_0= ruleVarDecl ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleVarDecl ) ) )* )? otherlv_6= ')' ( (otherlv_7= ':' (otherlv_8= 'void' | ( (lv_returnType_9_0= ruleRefableType ) ) ) ) | (otherlv_10= 'sends' ( (otherlv_11= RULE_ID ) ) ) )? ( (lv_docu_12_0= ruleDocumentation ) )? ( (lv_detailCode_13_0= ruleDetailCode ) ) ) ;
     public final EObject rulePortOperation() throws RecognitionException {
         EObject current = null;
 
@@ -3940,23 +3940,23 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1598:28: ( (otherlv_0= 'Operation' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '(' ( ( (lv_arguments_3_0= ruleVarDecl ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleVarDecl ) ) )* )? otherlv_6= ')' ( (otherlv_7= ':' (otherlv_8= 'void' | ( (lv_returnType_9_0= ruleRefableType ) ) ) ) | (otherlv_10= 'sends' ( (otherlv_11= RULE_ID ) ) ) )? ( (lv_docu_12_0= ruleDocumentation ) )? ( (lv_detailCode_13_0= ruleDetailCode ) ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1599:1: (otherlv_0= 'Operation' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '(' ( ( (lv_arguments_3_0= ruleVarDecl ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleVarDecl ) ) )* )? otherlv_6= ')' ( (otherlv_7= ':' (otherlv_8= 'void' | ( (lv_returnType_9_0= ruleRefableType ) ) ) ) | (otherlv_10= 'sends' ( (otherlv_11= RULE_ID ) ) ) )? ( (lv_docu_12_0= ruleDocumentation ) )? ( (lv_detailCode_13_0= ruleDetailCode ) ) )
+            // InternalRoom.g:1598:28: ( (otherlv_0= 'Operation' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '(' ( ( (lv_arguments_3_0= ruleVarDecl ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleVarDecl ) ) )* )? otherlv_6= ')' ( (otherlv_7= ':' (otherlv_8= 'void' | ( (lv_returnType_9_0= ruleRefableType ) ) ) ) | (otherlv_10= 'sends' ( (otherlv_11= RULE_ID ) ) ) )? ( (lv_docu_12_0= ruleDocumentation ) )? ( (lv_detailCode_13_0= ruleDetailCode ) ) ) )
+            // InternalRoom.g:1599:1: (otherlv_0= 'Operation' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '(' ( ( (lv_arguments_3_0= ruleVarDecl ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleVarDecl ) ) )* )? otherlv_6= ')' ( (otherlv_7= ':' (otherlv_8= 'void' | ( (lv_returnType_9_0= ruleRefableType ) ) ) ) | (otherlv_10= 'sends' ( (otherlv_11= RULE_ID ) ) ) )? ( (lv_docu_12_0= ruleDocumentation ) )? ( (lv_detailCode_13_0= ruleDetailCode ) ) )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1599:1: (otherlv_0= 'Operation' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '(' ( ( (lv_arguments_3_0= ruleVarDecl ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleVarDecl ) ) )* )? otherlv_6= ')' ( (otherlv_7= ':' (otherlv_8= 'void' | ( (lv_returnType_9_0= ruleRefableType ) ) ) ) | (otherlv_10= 'sends' ( (otherlv_11= RULE_ID ) ) ) )? ( (lv_docu_12_0= ruleDocumentation ) )? ( (lv_detailCode_13_0= ruleDetailCode ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1599:3: otherlv_0= 'Operation' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '(' ( ( (lv_arguments_3_0= ruleVarDecl ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleVarDecl ) ) )* )? otherlv_6= ')' ( (otherlv_7= ':' (otherlv_8= 'void' | ( (lv_returnType_9_0= ruleRefableType ) ) ) ) | (otherlv_10= 'sends' ( (otherlv_11= RULE_ID ) ) ) )? ( (lv_docu_12_0= ruleDocumentation ) )? ( (lv_detailCode_13_0= ruleDetailCode ) )
+            // InternalRoom.g:1599:1: (otherlv_0= 'Operation' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '(' ( ( (lv_arguments_3_0= ruleVarDecl ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleVarDecl ) ) )* )? otherlv_6= ')' ( (otherlv_7= ':' (otherlv_8= 'void' | ( (lv_returnType_9_0= ruleRefableType ) ) ) ) | (otherlv_10= 'sends' ( (otherlv_11= RULE_ID ) ) ) )? ( (lv_docu_12_0= ruleDocumentation ) )? ( (lv_detailCode_13_0= ruleDetailCode ) ) )
+            // InternalRoom.g:1599:3: otherlv_0= 'Operation' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '(' ( ( (lv_arguments_3_0= ruleVarDecl ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleVarDecl ) ) )* )? otherlv_6= ')' ( (otherlv_7= ':' (otherlv_8= 'void' | ( (lv_returnType_9_0= ruleRefableType ) ) ) ) | (otherlv_10= 'sends' ( (otherlv_11= RULE_ID ) ) ) )? ( (lv_docu_12_0= ruleDocumentation ) )? ( (lv_detailCode_13_0= ruleDetailCode ) )
             {
-            otherlv_0=(Token)match(input,36,FOLLOW_36_in_rulePortOperation3109); 
+            otherlv_0=(Token)match(input,36,FOLLOW_3); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getPortOperationAccess().getOperationKeyword_0());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1603:1: ( (lv_name_1_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1604:1: (lv_name_1_0= RULE_ID )
+            // InternalRoom.g:1603:1: ( (lv_name_1_0= RULE_ID ) )
+            // InternalRoom.g:1604:1: (lv_name_1_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1604:1: (lv_name_1_0= RULE_ID )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1605:3: lv_name_1_0= RULE_ID
+            // InternalRoom.g:1604:1: (lv_name_1_0= RULE_ID )
+            // InternalRoom.g:1605:3: lv_name_1_0= RULE_ID
             {
-            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_rulePortOperation3126); 
+            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_36); 
 
             			newLeafNode(lv_name_1_0, grammarAccess.getPortOperationAccess().getNameIDTerminalRuleCall_1_0()); 
             		
@@ -3968,7 +3968,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"name",
                     		lv_name_1_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -3976,11 +3976,11 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_2=(Token)match(input,19,FOLLOW_19_in_rulePortOperation3143); 
+            otherlv_2=(Token)match(input,19,FOLLOW_37); 
 
                 	newLeafNode(otherlv_2, grammarAccess.getPortOperationAccess().getLeftParenthesisKeyword_2());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1625:1: ( ( (lv_arguments_3_0= ruleVarDecl ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleVarDecl ) ) )* )?
+            // InternalRoom.g:1625:1: ( ( (lv_arguments_3_0= ruleVarDecl ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleVarDecl ) ) )* )?
             int alt36=2;
             int LA36_0 = input.LA(1);
 
@@ -3989,18 +3989,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt36) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1625:2: ( (lv_arguments_3_0= ruleVarDecl ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleVarDecl ) ) )*
+                    // InternalRoom.g:1625:2: ( (lv_arguments_3_0= ruleVarDecl ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleVarDecl ) ) )*
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1625:2: ( (lv_arguments_3_0= ruleVarDecl ) )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1626:1: (lv_arguments_3_0= ruleVarDecl )
+                    // InternalRoom.g:1625:2: ( (lv_arguments_3_0= ruleVarDecl ) )
+                    // InternalRoom.g:1626:1: (lv_arguments_3_0= ruleVarDecl )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1626:1: (lv_arguments_3_0= ruleVarDecl )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1627:3: lv_arguments_3_0= ruleVarDecl
+                    // InternalRoom.g:1626:1: (lv_arguments_3_0= ruleVarDecl )
+                    // InternalRoom.g:1627:3: lv_arguments_3_0= ruleVarDecl
                     {
                      
                     	        newCompositeNode(grammarAccess.getPortOperationAccess().getArgumentsVarDeclParserRuleCall_3_0_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleVarDecl_in_rulePortOperation3165);
+                    pushFollow(FOLLOW_38);
                     lv_arguments_3_0=ruleVarDecl();
 
                     state._fsp--;
@@ -4013,7 +4013,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"arguments",
                             		lv_arguments_3_0, 
-                            		"VarDecl");
+                            		"org.eclipse.etrice.core.Room.VarDecl");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -4022,7 +4022,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1643:2: (otherlv_4= ',' ( (lv_arguments_5_0= ruleVarDecl ) ) )*
+                    // InternalRoom.g:1643:2: (otherlv_4= ',' ( (lv_arguments_5_0= ruleVarDecl ) ) )*
                     loop35:
                     do {
                         int alt35=2;
@@ -4035,22 +4035,22 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                         switch (alt35) {
                     	case 1 :
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1643:4: otherlv_4= ',' ( (lv_arguments_5_0= ruleVarDecl ) )
+                    	    // InternalRoom.g:1643:4: otherlv_4= ',' ( (lv_arguments_5_0= ruleVarDecl ) )
                     	    {
-                    	    otherlv_4=(Token)match(input,24,FOLLOW_24_in_rulePortOperation3178); 
+                    	    otherlv_4=(Token)match(input,24,FOLLOW_3); 
 
                     	        	newLeafNode(otherlv_4, grammarAccess.getPortOperationAccess().getCommaKeyword_3_1_0());
                     	        
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1647:1: ( (lv_arguments_5_0= ruleVarDecl ) )
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1648:1: (lv_arguments_5_0= ruleVarDecl )
+                    	    // InternalRoom.g:1647:1: ( (lv_arguments_5_0= ruleVarDecl ) )
+                    	    // InternalRoom.g:1648:1: (lv_arguments_5_0= ruleVarDecl )
                     	    {
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1648:1: (lv_arguments_5_0= ruleVarDecl )
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1649:3: lv_arguments_5_0= ruleVarDecl
+                    	    // InternalRoom.g:1648:1: (lv_arguments_5_0= ruleVarDecl )
+                    	    // InternalRoom.g:1649:3: lv_arguments_5_0= ruleVarDecl
                     	    {
                     	     
                     	    	        newCompositeNode(grammarAccess.getPortOperationAccess().getArgumentsVarDeclParserRuleCall_3_1_1_0()); 
                     	    	    
-                    	    pushFollow(FOLLOW_ruleVarDecl_in_rulePortOperation3199);
+                    	    pushFollow(FOLLOW_38);
                     	    lv_arguments_5_0=ruleVarDecl();
 
                     	    state._fsp--;
@@ -4063,7 +4063,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     	           			current, 
                     	           			"arguments",
                     	            		lv_arguments_5_0, 
-                    	            		"VarDecl");
+                    	            		"org.eclipse.etrice.core.Room.VarDecl");
                     	    	        afterParserOrEnumRuleCall();
                     	    	    
 
@@ -4087,11 +4087,11 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_6=(Token)match(input,20,FOLLOW_20_in_rulePortOperation3215); 
+            otherlv_6=(Token)match(input,20,FOLLOW_41); 
 
                 	newLeafNode(otherlv_6, grammarAccess.getPortOperationAccess().getRightParenthesisKeyword_4());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1669:1: ( (otherlv_7= ':' (otherlv_8= 'void' | ( (lv_returnType_9_0= ruleRefableType ) ) ) ) | (otherlv_10= 'sends' ( (otherlv_11= RULE_ID ) ) ) )?
+            // InternalRoom.g:1669:1: ( (otherlv_7= ':' (otherlv_8= 'void' | ( (lv_returnType_9_0= ruleRefableType ) ) ) ) | (otherlv_10= 'sends' ( (otherlv_11= RULE_ID ) ) ) )?
             int alt38=3;
             int LA38_0 = input.LA(1);
 
@@ -4103,16 +4103,16 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt38) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1669:2: (otherlv_7= ':' (otherlv_8= 'void' | ( (lv_returnType_9_0= ruleRefableType ) ) ) )
+                    // InternalRoom.g:1669:2: (otherlv_7= ':' (otherlv_8= 'void' | ( (lv_returnType_9_0= ruleRefableType ) ) ) )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1669:2: (otherlv_7= ':' (otherlv_8= 'void' | ( (lv_returnType_9_0= ruleRefableType ) ) ) )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1669:4: otherlv_7= ':' (otherlv_8= 'void' | ( (lv_returnType_9_0= ruleRefableType ) ) )
+                    // InternalRoom.g:1669:2: (otherlv_7= ':' (otherlv_8= 'void' | ( (lv_returnType_9_0= ruleRefableType ) ) ) )
+                    // InternalRoom.g:1669:4: otherlv_7= ':' (otherlv_8= 'void' | ( (lv_returnType_9_0= ruleRefableType ) ) )
                     {
-                    otherlv_7=(Token)match(input,15,FOLLOW_15_in_rulePortOperation3229); 
+                    otherlv_7=(Token)match(input,15,FOLLOW_40); 
 
                         	newLeafNode(otherlv_7, grammarAccess.getPortOperationAccess().getColonKeyword_5_0_0());
                         
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1673:1: (otherlv_8= 'void' | ( (lv_returnType_9_0= ruleRefableType ) ) )
+                    // InternalRoom.g:1673:1: (otherlv_8= 'void' | ( (lv_returnType_9_0= ruleRefableType ) ) )
                     int alt37=2;
                     int LA37_0 = input.LA(1);
 
@@ -4130,9 +4130,9 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     switch (alt37) {
                         case 1 :
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1673:3: otherlv_8= 'void'
+                            // InternalRoom.g:1673:3: otherlv_8= 'void'
                             {
-                            otherlv_8=(Token)match(input,37,FOLLOW_37_in_rulePortOperation3242); 
+                            otherlv_8=(Token)match(input,37,FOLLOW_4); 
 
                                 	newLeafNode(otherlv_8, grammarAccess.getPortOperationAccess().getVoidKeyword_5_0_1_0());
                                 
@@ -4140,18 +4140,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                             }
                             break;
                         case 2 :
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1678:6: ( (lv_returnType_9_0= ruleRefableType ) )
+                            // InternalRoom.g:1678:6: ( (lv_returnType_9_0= ruleRefableType ) )
                             {
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1678:6: ( (lv_returnType_9_0= ruleRefableType ) )
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1679:1: (lv_returnType_9_0= ruleRefableType )
+                            // InternalRoom.g:1678:6: ( (lv_returnType_9_0= ruleRefableType ) )
+                            // InternalRoom.g:1679:1: (lv_returnType_9_0= ruleRefableType )
                             {
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1679:1: (lv_returnType_9_0= ruleRefableType )
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1680:3: lv_returnType_9_0= ruleRefableType
+                            // InternalRoom.g:1679:1: (lv_returnType_9_0= ruleRefableType )
+                            // InternalRoom.g:1680:3: lv_returnType_9_0= ruleRefableType
                             {
                              
                             	        newCompositeNode(grammarAccess.getPortOperationAccess().getReturnTypeRefableTypeParserRuleCall_5_0_1_1_0()); 
                             	    
-                            pushFollow(FOLLOW_ruleRefableType_in_rulePortOperation3269);
+                            pushFollow(FOLLOW_4);
                             lv_returnType_9_0=ruleRefableType();
 
                             state._fsp--;
@@ -4164,7 +4164,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                                    			current, 
                                    			"returnType",
                                     		lv_returnType_9_0, 
-                                    		"RefableType");
+                                    		"org.eclipse.etrice.core.Room.RefableType");
                             	        afterParserOrEnumRuleCall();
                             	    
 
@@ -4186,27 +4186,27 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1697:6: (otherlv_10= 'sends' ( (otherlv_11= RULE_ID ) ) )
+                    // InternalRoom.g:1697:6: (otherlv_10= 'sends' ( (otherlv_11= RULE_ID ) ) )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1697:6: (otherlv_10= 'sends' ( (otherlv_11= RULE_ID ) ) )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1697:8: otherlv_10= 'sends' ( (otherlv_11= RULE_ID ) )
+                    // InternalRoom.g:1697:6: (otherlv_10= 'sends' ( (otherlv_11= RULE_ID ) ) )
+                    // InternalRoom.g:1697:8: otherlv_10= 'sends' ( (otherlv_11= RULE_ID ) )
                     {
-                    otherlv_10=(Token)match(input,38,FOLLOW_38_in_rulePortOperation3290); 
+                    otherlv_10=(Token)match(input,38,FOLLOW_3); 
 
                         	newLeafNode(otherlv_10, grammarAccess.getPortOperationAccess().getSendsKeyword_5_1_0());
                         
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1701:1: ( (otherlv_11= RULE_ID ) )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1702:1: (otherlv_11= RULE_ID )
+                    // InternalRoom.g:1701:1: ( (otherlv_11= RULE_ID ) )
+                    // InternalRoom.g:1702:1: (otherlv_11= RULE_ID )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1702:1: (otherlv_11= RULE_ID )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1703:3: otherlv_11= RULE_ID
+                    // InternalRoom.g:1702:1: (otherlv_11= RULE_ID )
+                    // InternalRoom.g:1703:3: otherlv_11= RULE_ID
                     {
 
                     			if (current==null) {
                     	            current = createModelElement(grammarAccess.getPortOperationRule());
                     	        }
                             
-                    otherlv_11=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_rulePortOperation3310); 
+                    otherlv_11=(Token)match(input,RULE_ID,FOLLOW_4); 
 
                     		newLeafNode(otherlv_11, grammarAccess.getPortOperationAccess().getSendsMsgMessageCrossReference_5_1_1_0()); 
                     	
@@ -4225,7 +4225,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1714:5: ( (lv_docu_12_0= ruleDocumentation ) )?
+            // InternalRoom.g:1714:5: ( (lv_docu_12_0= ruleDocumentation ) )?
             int alt39=2;
             int LA39_0 = input.LA(1);
 
@@ -4234,15 +4234,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt39) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1715:1: (lv_docu_12_0= ruleDocumentation )
+                    // InternalRoom.g:1715:1: (lv_docu_12_0= ruleDocumentation )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1715:1: (lv_docu_12_0= ruleDocumentation )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1716:3: lv_docu_12_0= ruleDocumentation
+                    // InternalRoom.g:1715:1: (lv_docu_12_0= ruleDocumentation )
+                    // InternalRoom.g:1716:3: lv_docu_12_0= ruleDocumentation
                     {
                      
                     	        newCompositeNode(grammarAccess.getPortOperationAccess().getDocuDocumentationParserRuleCall_6_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDocumentation_in_rulePortOperation3334);
+                    pushFollow(FOLLOW_5);
                     lv_docu_12_0=ruleDocumentation();
 
                     state._fsp--;
@@ -4255,7 +4255,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"docu",
                             		lv_docu_12_0, 
-                            		"Documentation");
+                            		"org.eclipse.etrice.core.common.Base.Documentation");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -4267,16 +4267,16 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1732:3: ( (lv_detailCode_13_0= ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1733:1: (lv_detailCode_13_0= ruleDetailCode )
+            // InternalRoom.g:1732:3: ( (lv_detailCode_13_0= ruleDetailCode ) )
+            // InternalRoom.g:1733:1: (lv_detailCode_13_0= ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1733:1: (lv_detailCode_13_0= ruleDetailCode )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1734:3: lv_detailCode_13_0= ruleDetailCode
+            // InternalRoom.g:1733:1: (lv_detailCode_13_0= ruleDetailCode )
+            // InternalRoom.g:1734:3: lv_detailCode_13_0= ruleDetailCode
             {
              
             	        newCompositeNode(grammarAccess.getPortOperationAccess().getDetailCodeDetailCodeParserRuleCall_7_0()); 
             	    
-            pushFollow(FOLLOW_ruleDetailCode_in_rulePortOperation3356);
+            pushFollow(FOLLOW_2);
             lv_detailCode_13_0=ruleDetailCode();
 
             state._fsp--;
@@ -4289,7 +4289,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"detailCode",
                     		lv_detailCode_13_0, 
-                    		"DetailCode");
+                    		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -4319,7 +4319,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleClassStructor"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1758:1: entryRuleClassStructor returns [EObject current=null] : iv_ruleClassStructor= ruleClassStructor EOF ;
+    // InternalRoom.g:1758:1: entryRuleClassStructor returns [EObject current=null] : iv_ruleClassStructor= ruleClassStructor EOF ;
     public final EObject entryRuleClassStructor() throws RecognitionException {
         EObject current = null;
 
@@ -4327,17 +4327,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1759:2: (iv_ruleClassStructor= ruleClassStructor EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1760:2: iv_ruleClassStructor= ruleClassStructor EOF
+            // InternalRoom.g:1759:2: (iv_ruleClassStructor= ruleClassStructor EOF )
+            // InternalRoom.g:1760:2: iv_ruleClassStructor= ruleClassStructor EOF
             {
              newCompositeNode(grammarAccess.getClassStructorRule()); 
-            pushFollow(FOLLOW_ruleClassStructor_in_entryRuleClassStructor3392);
+            pushFollow(FOLLOW_1);
             iv_ruleClassStructor=ruleClassStructor();
 
             state._fsp--;
 
              current =iv_ruleClassStructor; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleClassStructor3402); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -4355,7 +4355,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleClassStructor"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1767:1: ruleClassStructor returns [EObject current=null] : ( ( ( (lv_name_0_1= 'ctor' | lv_name_0_2= 'dtor' ) ) ) ( (lv_detailCode_1_0= ruleDetailCode ) ) ) ;
+    // InternalRoom.g:1767:1: ruleClassStructor returns [EObject current=null] : ( ( ( (lv_name_0_1= 'ctor' | lv_name_0_2= 'dtor' ) ) ) ( (lv_detailCode_1_0= ruleDetailCode ) ) ) ;
     public final EObject ruleClassStructor() throws RecognitionException {
         EObject current = null;
 
@@ -4367,19 +4367,19 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1770:28: ( ( ( ( (lv_name_0_1= 'ctor' | lv_name_0_2= 'dtor' ) ) ) ( (lv_detailCode_1_0= ruleDetailCode ) ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1771:1: ( ( ( (lv_name_0_1= 'ctor' | lv_name_0_2= 'dtor' ) ) ) ( (lv_detailCode_1_0= ruleDetailCode ) ) )
+            // InternalRoom.g:1770:28: ( ( ( ( (lv_name_0_1= 'ctor' | lv_name_0_2= 'dtor' ) ) ) ( (lv_detailCode_1_0= ruleDetailCode ) ) ) )
+            // InternalRoom.g:1771:1: ( ( ( (lv_name_0_1= 'ctor' | lv_name_0_2= 'dtor' ) ) ) ( (lv_detailCode_1_0= ruleDetailCode ) ) )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1771:1: ( ( ( (lv_name_0_1= 'ctor' | lv_name_0_2= 'dtor' ) ) ) ( (lv_detailCode_1_0= ruleDetailCode ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1771:2: ( ( (lv_name_0_1= 'ctor' | lv_name_0_2= 'dtor' ) ) ) ( (lv_detailCode_1_0= ruleDetailCode ) )
+            // InternalRoom.g:1771:1: ( ( ( (lv_name_0_1= 'ctor' | lv_name_0_2= 'dtor' ) ) ) ( (lv_detailCode_1_0= ruleDetailCode ) ) )
+            // InternalRoom.g:1771:2: ( ( (lv_name_0_1= 'ctor' | lv_name_0_2= 'dtor' ) ) ) ( (lv_detailCode_1_0= ruleDetailCode ) )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1771:2: ( ( (lv_name_0_1= 'ctor' | lv_name_0_2= 'dtor' ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1772:1: ( (lv_name_0_1= 'ctor' | lv_name_0_2= 'dtor' ) )
+            // InternalRoom.g:1771:2: ( ( (lv_name_0_1= 'ctor' | lv_name_0_2= 'dtor' ) ) )
+            // InternalRoom.g:1772:1: ( (lv_name_0_1= 'ctor' | lv_name_0_2= 'dtor' ) )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1772:1: ( (lv_name_0_1= 'ctor' | lv_name_0_2= 'dtor' ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1773:1: (lv_name_0_1= 'ctor' | lv_name_0_2= 'dtor' )
+            // InternalRoom.g:1772:1: ( (lv_name_0_1= 'ctor' | lv_name_0_2= 'dtor' ) )
+            // InternalRoom.g:1773:1: (lv_name_0_1= 'ctor' | lv_name_0_2= 'dtor' )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1773:1: (lv_name_0_1= 'ctor' | lv_name_0_2= 'dtor' )
+            // InternalRoom.g:1773:1: (lv_name_0_1= 'ctor' | lv_name_0_2= 'dtor' )
             int alt40=2;
             int LA40_0 = input.LA(1);
 
@@ -4397,9 +4397,9 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt40) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1774:3: lv_name_0_1= 'ctor'
+                    // InternalRoom.g:1774:3: lv_name_0_1= 'ctor'
                     {
-                    lv_name_0_1=(Token)match(input,39,FOLLOW_39_in_ruleClassStructor3447); 
+                    lv_name_0_1=(Token)match(input,39,FOLLOW_5); 
 
                             newLeafNode(lv_name_0_1, grammarAccess.getClassStructorAccess().getNameCtorKeyword_0_0_0());
                         
@@ -4413,9 +4413,9 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1786:8: lv_name_0_2= 'dtor'
+                    // InternalRoom.g:1786:8: lv_name_0_2= 'dtor'
                     {
-                    lv_name_0_2=(Token)match(input,40,FOLLOW_40_in_ruleClassStructor3476); 
+                    lv_name_0_2=(Token)match(input,40,FOLLOW_5); 
 
                             newLeafNode(lv_name_0_2, grammarAccess.getClassStructorAccess().getNameDtorKeyword_0_0_1());
                         
@@ -4437,16 +4437,16 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1801:2: ( (lv_detailCode_1_0= ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1802:1: (lv_detailCode_1_0= ruleDetailCode )
+            // InternalRoom.g:1801:2: ( (lv_detailCode_1_0= ruleDetailCode ) )
+            // InternalRoom.g:1802:1: (lv_detailCode_1_0= ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1802:1: (lv_detailCode_1_0= ruleDetailCode )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1803:3: lv_detailCode_1_0= ruleDetailCode
+            // InternalRoom.g:1802:1: (lv_detailCode_1_0= ruleDetailCode )
+            // InternalRoom.g:1803:3: lv_detailCode_1_0= ruleDetailCode
             {
              
             	        newCompositeNode(grammarAccess.getClassStructorAccess().getDetailCodeDetailCodeParserRuleCall_1_0()); 
             	    
-            pushFollow(FOLLOW_ruleDetailCode_in_ruleClassStructor3513);
+            pushFollow(FOLLOW_2);
             lv_detailCode_1_0=ruleDetailCode();
 
             state._fsp--;
@@ -4459,7 +4459,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"detailCode",
                     		lv_detailCode_1_0, 
-                    		"DetailCode");
+                    		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -4489,7 +4489,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleGeneralProtocolClass"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1827:1: entryRuleGeneralProtocolClass returns [EObject current=null] : iv_ruleGeneralProtocolClass= ruleGeneralProtocolClass EOF ;
+    // InternalRoom.g:1827:1: entryRuleGeneralProtocolClass returns [EObject current=null] : iv_ruleGeneralProtocolClass= ruleGeneralProtocolClass EOF ;
     public final EObject entryRuleGeneralProtocolClass() throws RecognitionException {
         EObject current = null;
 
@@ -4497,17 +4497,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1828:2: (iv_ruleGeneralProtocolClass= ruleGeneralProtocolClass EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1829:2: iv_ruleGeneralProtocolClass= ruleGeneralProtocolClass EOF
+            // InternalRoom.g:1828:2: (iv_ruleGeneralProtocolClass= ruleGeneralProtocolClass EOF )
+            // InternalRoom.g:1829:2: iv_ruleGeneralProtocolClass= ruleGeneralProtocolClass EOF
             {
              newCompositeNode(grammarAccess.getGeneralProtocolClassRule()); 
-            pushFollow(FOLLOW_ruleGeneralProtocolClass_in_entryRuleGeneralProtocolClass3549);
+            pushFollow(FOLLOW_1);
             iv_ruleGeneralProtocolClass=ruleGeneralProtocolClass();
 
             state._fsp--;
 
              current =iv_ruleGeneralProtocolClass; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleGeneralProtocolClass3559); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -4525,7 +4525,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleGeneralProtocolClass"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1836:1: ruleGeneralProtocolClass returns [EObject current=null] : (this_ProtocolClass_0= ruleProtocolClass | this_CompoundProtocolClass_1= ruleCompoundProtocolClass ) ;
+    // InternalRoom.g:1836:1: ruleGeneralProtocolClass returns [EObject current=null] : (this_ProtocolClass_0= ruleProtocolClass | this_CompoundProtocolClass_1= ruleCompoundProtocolClass ) ;
     public final EObject ruleGeneralProtocolClass() throws RecognitionException {
         EObject current = null;
 
@@ -4537,10 +4537,10 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1839:28: ( (this_ProtocolClass_0= ruleProtocolClass | this_CompoundProtocolClass_1= ruleCompoundProtocolClass ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1840:1: (this_ProtocolClass_0= ruleProtocolClass | this_CompoundProtocolClass_1= ruleCompoundProtocolClass )
+            // InternalRoom.g:1839:28: ( (this_ProtocolClass_0= ruleProtocolClass | this_CompoundProtocolClass_1= ruleCompoundProtocolClass ) )
+            // InternalRoom.g:1840:1: (this_ProtocolClass_0= ruleProtocolClass | this_CompoundProtocolClass_1= ruleCompoundProtocolClass )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1840:1: (this_ProtocolClass_0= ruleProtocolClass | this_CompoundProtocolClass_1= ruleCompoundProtocolClass )
+            // InternalRoom.g:1840:1: (this_ProtocolClass_0= ruleProtocolClass | this_CompoundProtocolClass_1= ruleCompoundProtocolClass )
             int alt41=2;
             int LA41_0 = input.LA(1);
 
@@ -4558,12 +4558,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt41) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1841:5: this_ProtocolClass_0= ruleProtocolClass
+                    // InternalRoom.g:1841:5: this_ProtocolClass_0= ruleProtocolClass
                     {
                      
                             newCompositeNode(grammarAccess.getGeneralProtocolClassAccess().getProtocolClassParserRuleCall_0()); 
                         
-                    pushFollow(FOLLOW_ruleProtocolClass_in_ruleGeneralProtocolClass3606);
+                    pushFollow(FOLLOW_2);
                     this_ProtocolClass_0=ruleProtocolClass();
 
                     state._fsp--;
@@ -4576,12 +4576,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1851:5: this_CompoundProtocolClass_1= ruleCompoundProtocolClass
+                    // InternalRoom.g:1851:5: this_CompoundProtocolClass_1= ruleCompoundProtocolClass
                     {
                      
                             newCompositeNode(grammarAccess.getGeneralProtocolClassAccess().getCompoundProtocolClassParserRuleCall_1()); 
                         
-                    pushFollow(FOLLOW_ruleCompoundProtocolClass_in_ruleGeneralProtocolClass3633);
+                    pushFollow(FOLLOW_2);
                     this_CompoundProtocolClass_1=ruleCompoundProtocolClass();
 
                     state._fsp--;
@@ -4614,7 +4614,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleProtocolClass"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1867:1: entryRuleProtocolClass returns [EObject current=null] : iv_ruleProtocolClass= ruleProtocolClass EOF ;
+    // InternalRoom.g:1867:1: entryRuleProtocolClass returns [EObject current=null] : iv_ruleProtocolClass= ruleProtocolClass EOF ;
     public final EObject entryRuleProtocolClass() throws RecognitionException {
         EObject current = null;
 
@@ -4622,17 +4622,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1868:2: (iv_ruleProtocolClass= ruleProtocolClass EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1869:2: iv_ruleProtocolClass= ruleProtocolClass EOF
+            // InternalRoom.g:1868:2: (iv_ruleProtocolClass= ruleProtocolClass EOF )
+            // InternalRoom.g:1869:2: iv_ruleProtocolClass= ruleProtocolClass EOF
             {
              newCompositeNode(grammarAccess.getProtocolClassRule()); 
-            pushFollow(FOLLOW_ruleProtocolClass_in_entryRuleProtocolClass3668);
+            pushFollow(FOLLOW_1);
             iv_ruleProtocolClass=ruleProtocolClass();
 
             state._fsp--;
 
              current =iv_ruleProtocolClass; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleProtocolClass3678); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -4650,7 +4650,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleProtocolClass"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1876:1: ruleProtocolClass returns [EObject current=null] : ( ( (lv_commType_0_0= ruleCommunicationType ) )? otherlv_1= 'ProtocolClass' ( (lv_name_2_0= RULE_ID ) ) ( (lv_docu_3_0= ruleDocumentation ) )? (otherlv_4= 'extends' ( ( ruleFQN ) ) )? otherlv_6= '{' ( (lv_annotations_7_0= ruleAnnotation ) )* (otherlv_8= 'usercode1' ( (lv_userCode1_9_0= ruleDetailCode ) ) )? (otherlv_10= 'usercode2' ( (lv_userCode2_11_0= ruleDetailCode ) ) )? (otherlv_12= 'usercode3' ( (lv_userCode3_13_0= ruleDetailCode ) ) )? (otherlv_14= 'incoming' otherlv_15= '{' ( (lv_incomingMessages_16_0= ruleMessage ) )* otherlv_17= '}' )? (otherlv_18= 'outgoing' otherlv_19= '{' ( (lv_outgoingMessages_20_0= ruleMessage ) )* otherlv_21= '}' )? (otherlv_22= 'regular' otherlv_23= 'PortClass' ( (lv_regular_24_0= rulePortClass ) ) )? (otherlv_25= 'conjugated' otherlv_26= 'PortClass' ( (lv_conjugated_27_0= rulePortClass ) ) )? ( (lv_semantics_28_0= ruleProtocolSemantics ) )? otherlv_29= '}' ) ;
+    // InternalRoom.g:1876:1: ruleProtocolClass returns [EObject current=null] : ( ( (lv_commType_0_0= ruleCommunicationType ) )? otherlv_1= 'ProtocolClass' ( (lv_name_2_0= RULE_ID ) ) ( (lv_docu_3_0= ruleDocumentation ) )? (otherlv_4= 'extends' ( ( ruleFQN ) ) )? otherlv_6= '{' ( (lv_annotations_7_0= ruleAnnotation ) )* (otherlv_8= 'usercode1' ( (lv_userCode1_9_0= ruleDetailCode ) ) )? (otherlv_10= 'usercode2' ( (lv_userCode2_11_0= ruleDetailCode ) ) )? (otherlv_12= 'usercode3' ( (lv_userCode3_13_0= ruleDetailCode ) ) )? (otherlv_14= 'incoming' otherlv_15= '{' ( (lv_incomingMessages_16_0= ruleMessage ) )* otherlv_17= '}' )? (otherlv_18= 'outgoing' otherlv_19= '{' ( (lv_outgoingMessages_20_0= ruleMessage ) )* otherlv_21= '}' )? (otherlv_22= 'regular' otherlv_23= 'PortClass' ( (lv_regular_24_0= rulePortClass ) ) )? (otherlv_25= 'conjugated' otherlv_26= 'PortClass' ( (lv_conjugated_27_0= rulePortClass ) ) )? ( (lv_semantics_28_0= ruleProtocolSemantics ) )? otherlv_29= '}' ) ;
     public final EObject ruleProtocolClass() throws RecognitionException {
         EObject current = null;
 
@@ -4698,13 +4698,13 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1879:28: ( ( ( (lv_commType_0_0= ruleCommunicationType ) )? otherlv_1= 'ProtocolClass' ( (lv_name_2_0= RULE_ID ) ) ( (lv_docu_3_0= ruleDocumentation ) )? (otherlv_4= 'extends' ( ( ruleFQN ) ) )? otherlv_6= '{' ( (lv_annotations_7_0= ruleAnnotation ) )* (otherlv_8= 'usercode1' ( (lv_userCode1_9_0= ruleDetailCode ) ) )? (otherlv_10= 'usercode2' ( (lv_userCode2_11_0= ruleDetailCode ) ) )? (otherlv_12= 'usercode3' ( (lv_userCode3_13_0= ruleDetailCode ) ) )? (otherlv_14= 'incoming' otherlv_15= '{' ( (lv_incomingMessages_16_0= ruleMessage ) )* otherlv_17= '}' )? (otherlv_18= 'outgoing' otherlv_19= '{' ( (lv_outgoingMessages_20_0= ruleMessage ) )* otherlv_21= '}' )? (otherlv_22= 'regular' otherlv_23= 'PortClass' ( (lv_regular_24_0= rulePortClass ) ) )? (otherlv_25= 'conjugated' otherlv_26= 'PortClass' ( (lv_conjugated_27_0= rulePortClass ) ) )? ( (lv_semantics_28_0= ruleProtocolSemantics ) )? otherlv_29= '}' ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1880:1: ( ( (lv_commType_0_0= ruleCommunicationType ) )? otherlv_1= 'ProtocolClass' ( (lv_name_2_0= RULE_ID ) ) ( (lv_docu_3_0= ruleDocumentation ) )? (otherlv_4= 'extends' ( ( ruleFQN ) ) )? otherlv_6= '{' ( (lv_annotations_7_0= ruleAnnotation ) )* (otherlv_8= 'usercode1' ( (lv_userCode1_9_0= ruleDetailCode ) ) )? (otherlv_10= 'usercode2' ( (lv_userCode2_11_0= ruleDetailCode ) ) )? (otherlv_12= 'usercode3' ( (lv_userCode3_13_0= ruleDetailCode ) ) )? (otherlv_14= 'incoming' otherlv_15= '{' ( (lv_incomingMessages_16_0= ruleMessage ) )* otherlv_17= '}' )? (otherlv_18= 'outgoing' otherlv_19= '{' ( (lv_outgoingMessages_20_0= ruleMessage ) )* otherlv_21= '}' )? (otherlv_22= 'regular' otherlv_23= 'PortClass' ( (lv_regular_24_0= rulePortClass ) ) )? (otherlv_25= 'conjugated' otherlv_26= 'PortClass' ( (lv_conjugated_27_0= rulePortClass ) ) )? ( (lv_semantics_28_0= ruleProtocolSemantics ) )? otherlv_29= '}' )
+            // InternalRoom.g:1879:28: ( ( ( (lv_commType_0_0= ruleCommunicationType ) )? otherlv_1= 'ProtocolClass' ( (lv_name_2_0= RULE_ID ) ) ( (lv_docu_3_0= ruleDocumentation ) )? (otherlv_4= 'extends' ( ( ruleFQN ) ) )? otherlv_6= '{' ( (lv_annotations_7_0= ruleAnnotation ) )* (otherlv_8= 'usercode1' ( (lv_userCode1_9_0= ruleDetailCode ) ) )? (otherlv_10= 'usercode2' ( (lv_userCode2_11_0= ruleDetailCode ) ) )? (otherlv_12= 'usercode3' ( (lv_userCode3_13_0= ruleDetailCode ) ) )? (otherlv_14= 'incoming' otherlv_15= '{' ( (lv_incomingMessages_16_0= ruleMessage ) )* otherlv_17= '}' )? (otherlv_18= 'outgoing' otherlv_19= '{' ( (lv_outgoingMessages_20_0= ruleMessage ) )* otherlv_21= '}' )? (otherlv_22= 'regular' otherlv_23= 'PortClass' ( (lv_regular_24_0= rulePortClass ) ) )? (otherlv_25= 'conjugated' otherlv_26= 'PortClass' ( (lv_conjugated_27_0= rulePortClass ) ) )? ( (lv_semantics_28_0= ruleProtocolSemantics ) )? otherlv_29= '}' ) )
+            // InternalRoom.g:1880:1: ( ( (lv_commType_0_0= ruleCommunicationType ) )? otherlv_1= 'ProtocolClass' ( (lv_name_2_0= RULE_ID ) ) ( (lv_docu_3_0= ruleDocumentation ) )? (otherlv_4= 'extends' ( ( ruleFQN ) ) )? otherlv_6= '{' ( (lv_annotations_7_0= ruleAnnotation ) )* (otherlv_8= 'usercode1' ( (lv_userCode1_9_0= ruleDetailCode ) ) )? (otherlv_10= 'usercode2' ( (lv_userCode2_11_0= ruleDetailCode ) ) )? (otherlv_12= 'usercode3' ( (lv_userCode3_13_0= ruleDetailCode ) ) )? (otherlv_14= 'incoming' otherlv_15= '{' ( (lv_incomingMessages_16_0= ruleMessage ) )* otherlv_17= '}' )? (otherlv_18= 'outgoing' otherlv_19= '{' ( (lv_outgoingMessages_20_0= ruleMessage ) )* otherlv_21= '}' )? (otherlv_22= 'regular' otherlv_23= 'PortClass' ( (lv_regular_24_0= rulePortClass ) ) )? (otherlv_25= 'conjugated' otherlv_26= 'PortClass' ( (lv_conjugated_27_0= rulePortClass ) ) )? ( (lv_semantics_28_0= ruleProtocolSemantics ) )? otherlv_29= '}' )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1880:1: ( ( (lv_commType_0_0= ruleCommunicationType ) )? otherlv_1= 'ProtocolClass' ( (lv_name_2_0= RULE_ID ) ) ( (lv_docu_3_0= ruleDocumentation ) )? (otherlv_4= 'extends' ( ( ruleFQN ) ) )? otherlv_6= '{' ( (lv_annotations_7_0= ruleAnnotation ) )* (otherlv_8= 'usercode1' ( (lv_userCode1_9_0= ruleDetailCode ) ) )? (otherlv_10= 'usercode2' ( (lv_userCode2_11_0= ruleDetailCode ) ) )? (otherlv_12= 'usercode3' ( (lv_userCode3_13_0= ruleDetailCode ) ) )? (otherlv_14= 'incoming' otherlv_15= '{' ( (lv_incomingMessages_16_0= ruleMessage ) )* otherlv_17= '}' )? (otherlv_18= 'outgoing' otherlv_19= '{' ( (lv_outgoingMessages_20_0= ruleMessage ) )* otherlv_21= '}' )? (otherlv_22= 'regular' otherlv_23= 'PortClass' ( (lv_regular_24_0= rulePortClass ) ) )? (otherlv_25= 'conjugated' otherlv_26= 'PortClass' ( (lv_conjugated_27_0= rulePortClass ) ) )? ( (lv_semantics_28_0= ruleProtocolSemantics ) )? otherlv_29= '}' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1880:2: ( (lv_commType_0_0= ruleCommunicationType ) )? otherlv_1= 'ProtocolClass' ( (lv_name_2_0= RULE_ID ) ) ( (lv_docu_3_0= ruleDocumentation ) )? (otherlv_4= 'extends' ( ( ruleFQN ) ) )? otherlv_6= '{' ( (lv_annotations_7_0= ruleAnnotation ) )* (otherlv_8= 'usercode1' ( (lv_userCode1_9_0= ruleDetailCode ) ) )? (otherlv_10= 'usercode2' ( (lv_userCode2_11_0= ruleDetailCode ) ) )? (otherlv_12= 'usercode3' ( (lv_userCode3_13_0= ruleDetailCode ) ) )? (otherlv_14= 'incoming' otherlv_15= '{' ( (lv_incomingMessages_16_0= ruleMessage ) )* otherlv_17= '}' )? (otherlv_18= 'outgoing' otherlv_19= '{' ( (lv_outgoingMessages_20_0= ruleMessage ) )* otherlv_21= '}' )? (otherlv_22= 'regular' otherlv_23= 'PortClass' ( (lv_regular_24_0= rulePortClass ) ) )? (otherlv_25= 'conjugated' otherlv_26= 'PortClass' ( (lv_conjugated_27_0= rulePortClass ) ) )? ( (lv_semantics_28_0= ruleProtocolSemantics ) )? otherlv_29= '}'
+            // InternalRoom.g:1880:1: ( ( (lv_commType_0_0= ruleCommunicationType ) )? otherlv_1= 'ProtocolClass' ( (lv_name_2_0= RULE_ID ) ) ( (lv_docu_3_0= ruleDocumentation ) )? (otherlv_4= 'extends' ( ( ruleFQN ) ) )? otherlv_6= '{' ( (lv_annotations_7_0= ruleAnnotation ) )* (otherlv_8= 'usercode1' ( (lv_userCode1_9_0= ruleDetailCode ) ) )? (otherlv_10= 'usercode2' ( (lv_userCode2_11_0= ruleDetailCode ) ) )? (otherlv_12= 'usercode3' ( (lv_userCode3_13_0= ruleDetailCode ) ) )? (otherlv_14= 'incoming' otherlv_15= '{' ( (lv_incomingMessages_16_0= ruleMessage ) )* otherlv_17= '}' )? (otherlv_18= 'outgoing' otherlv_19= '{' ( (lv_outgoingMessages_20_0= ruleMessage ) )* otherlv_21= '}' )? (otherlv_22= 'regular' otherlv_23= 'PortClass' ( (lv_regular_24_0= rulePortClass ) ) )? (otherlv_25= 'conjugated' otherlv_26= 'PortClass' ( (lv_conjugated_27_0= rulePortClass ) ) )? ( (lv_semantics_28_0= ruleProtocolSemantics ) )? otherlv_29= '}' )
+            // InternalRoom.g:1880:2: ( (lv_commType_0_0= ruleCommunicationType ) )? otherlv_1= 'ProtocolClass' ( (lv_name_2_0= RULE_ID ) ) ( (lv_docu_3_0= ruleDocumentation ) )? (otherlv_4= 'extends' ( ( ruleFQN ) ) )? otherlv_6= '{' ( (lv_annotations_7_0= ruleAnnotation ) )* (otherlv_8= 'usercode1' ( (lv_userCode1_9_0= ruleDetailCode ) ) )? (otherlv_10= 'usercode2' ( (lv_userCode2_11_0= ruleDetailCode ) ) )? (otherlv_12= 'usercode3' ( (lv_userCode3_13_0= ruleDetailCode ) ) )? (otherlv_14= 'incoming' otherlv_15= '{' ( (lv_incomingMessages_16_0= ruleMessage ) )* otherlv_17= '}' )? (otherlv_18= 'outgoing' otherlv_19= '{' ( (lv_outgoingMessages_20_0= ruleMessage ) )* otherlv_21= '}' )? (otherlv_22= 'regular' otherlv_23= 'PortClass' ( (lv_regular_24_0= rulePortClass ) ) )? (otherlv_25= 'conjugated' otherlv_26= 'PortClass' ( (lv_conjugated_27_0= rulePortClass ) ) )? ( (lv_semantics_28_0= ruleProtocolSemantics ) )? otherlv_29= '}'
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1880:2: ( (lv_commType_0_0= ruleCommunicationType ) )?
+            // InternalRoom.g:1880:2: ( (lv_commType_0_0= ruleCommunicationType ) )?
             int alt42=2;
             int LA42_0 = input.LA(1);
 
@@ -4713,15 +4713,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt42) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1881:1: (lv_commType_0_0= ruleCommunicationType )
+                    // InternalRoom.g:1881:1: (lv_commType_0_0= ruleCommunicationType )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1881:1: (lv_commType_0_0= ruleCommunicationType )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1882:3: lv_commType_0_0= ruleCommunicationType
+                    // InternalRoom.g:1881:1: (lv_commType_0_0= ruleCommunicationType )
+                    // InternalRoom.g:1882:3: lv_commType_0_0= ruleCommunicationType
                     {
                      
                     	        newCompositeNode(grammarAccess.getProtocolClassAccess().getCommTypeCommunicationTypeEnumRuleCall_0_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleCommunicationType_in_ruleProtocolClass3724);
+                    pushFollow(FOLLOW_42);
                     lv_commType_0_0=ruleCommunicationType();
 
                     state._fsp--;
@@ -4734,7 +4734,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"commType",
                             		lv_commType_0_0, 
-                            		"CommunicationType");
+                            		"org.eclipse.etrice.core.Room.CommunicationType");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -4746,17 +4746,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,41,FOLLOW_41_in_ruleProtocolClass3737); 
+            otherlv_1=(Token)match(input,41,FOLLOW_3); 
 
                 	newLeafNode(otherlv_1, grammarAccess.getProtocolClassAccess().getProtocolClassKeyword_1());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1902:1: ( (lv_name_2_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1903:1: (lv_name_2_0= RULE_ID )
+            // InternalRoom.g:1902:1: ( (lv_name_2_0= RULE_ID ) )
+            // InternalRoom.g:1903:1: (lv_name_2_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1903:1: (lv_name_2_0= RULE_ID )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1904:3: lv_name_2_0= RULE_ID
+            // InternalRoom.g:1903:1: (lv_name_2_0= RULE_ID )
+            // InternalRoom.g:1904:3: lv_name_2_0= RULE_ID
             {
-            lv_name_2_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleProtocolClass3754); 
+            lv_name_2_0=(Token)match(input,RULE_ID,FOLLOW_24); 
 
             			newLeafNode(lv_name_2_0, grammarAccess.getProtocolClassAccess().getNameIDTerminalRuleCall_2_0()); 
             		
@@ -4768,7 +4768,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"name",
                     		lv_name_2_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -4776,7 +4776,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1920:2: ( (lv_docu_3_0= ruleDocumentation ) )?
+            // InternalRoom.g:1920:2: ( (lv_docu_3_0= ruleDocumentation ) )?
             int alt43=2;
             int LA43_0 = input.LA(1);
 
@@ -4785,15 +4785,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt43) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1921:1: (lv_docu_3_0= ruleDocumentation )
+                    // InternalRoom.g:1921:1: (lv_docu_3_0= ruleDocumentation )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1921:1: (lv_docu_3_0= ruleDocumentation )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1922:3: lv_docu_3_0= ruleDocumentation
+                    // InternalRoom.g:1921:1: (lv_docu_3_0= ruleDocumentation )
+                    // InternalRoom.g:1922:3: lv_docu_3_0= ruleDocumentation
                     {
                      
                     	        newCompositeNode(grammarAccess.getProtocolClassAccess().getDocuDocumentationParserRuleCall_3_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDocumentation_in_ruleProtocolClass3780);
+                    pushFollow(FOLLOW_25);
                     lv_docu_3_0=ruleDocumentation();
 
                     state._fsp--;
@@ -4806,7 +4806,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"docu",
                             		lv_docu_3_0, 
-                            		"Documentation");
+                            		"org.eclipse.etrice.core.common.Base.Documentation");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -4818,7 +4818,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1938:3: (otherlv_4= 'extends' ( ( ruleFQN ) ) )?
+            // InternalRoom.g:1938:3: (otherlv_4= 'extends' ( ( ruleFQN ) ) )?
             int alt44=2;
             int LA44_0 = input.LA(1);
 
@@ -4827,17 +4827,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt44) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1938:5: otherlv_4= 'extends' ( ( ruleFQN ) )
+                    // InternalRoom.g:1938:5: otherlv_4= 'extends' ( ( ruleFQN ) )
                     {
-                    otherlv_4=(Token)match(input,28,FOLLOW_28_in_ruleProtocolClass3794); 
+                    otherlv_4=(Token)match(input,28,FOLLOW_3); 
 
                         	newLeafNode(otherlv_4, grammarAccess.getProtocolClassAccess().getExtendsKeyword_4_0());
                         
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1942:1: ( ( ruleFQN ) )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1943:1: ( ruleFQN )
+                    // InternalRoom.g:1942:1: ( ( ruleFQN ) )
+                    // InternalRoom.g:1943:1: ( ruleFQN )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1943:1: ( ruleFQN )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1944:3: ruleFQN
+                    // InternalRoom.g:1943:1: ( ruleFQN )
+                    // InternalRoom.g:1944:3: ruleFQN
                     {
 
                     			if (current==null) {
@@ -4847,7 +4847,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                      
                     	        newCompositeNode(grammarAccess.getProtocolClassAccess().getBaseProtocolClassCrossReference_4_1_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleFQN_in_ruleProtocolClass3817);
+                    pushFollow(FOLLOW_5);
                     ruleFQN();
 
                     state._fsp--;
@@ -4867,11 +4867,11 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_6=(Token)match(input,13,FOLLOW_13_in_ruleProtocolClass3831); 
+            otherlv_6=(Token)match(input,13,FOLLOW_43); 
 
                 	newLeafNode(otherlv_6, grammarAccess.getProtocolClassAccess().getLeftCurlyBracketKeyword_5());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1961:1: ( (lv_annotations_7_0= ruleAnnotation ) )*
+            // InternalRoom.g:1961:1: ( (lv_annotations_7_0= ruleAnnotation ) )*
             loop45:
             do {
                 int alt45=2;
@@ -4884,15 +4884,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                 switch (alt45) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1962:1: (lv_annotations_7_0= ruleAnnotation )
+            	    // InternalRoom.g:1962:1: (lv_annotations_7_0= ruleAnnotation )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1962:1: (lv_annotations_7_0= ruleAnnotation )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1963:3: lv_annotations_7_0= ruleAnnotation
+            	    // InternalRoom.g:1962:1: (lv_annotations_7_0= ruleAnnotation )
+            	    // InternalRoom.g:1963:3: lv_annotations_7_0= ruleAnnotation
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getProtocolClassAccess().getAnnotationsAnnotationParserRuleCall_6_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleAnnotation_in_ruleProtocolClass3852);
+            	    pushFollow(FOLLOW_43);
             	    lv_annotations_7_0=ruleAnnotation();
 
             	    state._fsp--;
@@ -4905,7 +4905,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"annotations",
             	            		lv_annotations_7_0, 
-            	            		"Annotation");
+            	            		"org.eclipse.etrice.core.common.Base.Annotation");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -4920,7 +4920,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                 }
             } while (true);
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1979:3: (otherlv_8= 'usercode1' ( (lv_userCode1_9_0= ruleDetailCode ) ) )?
+            // InternalRoom.g:1979:3: (otherlv_8= 'usercode1' ( (lv_userCode1_9_0= ruleDetailCode ) ) )?
             int alt46=2;
             int LA46_0 = input.LA(1);
 
@@ -4929,22 +4929,22 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt46) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1979:5: otherlv_8= 'usercode1' ( (lv_userCode1_9_0= ruleDetailCode ) )
+                    // InternalRoom.g:1979:5: otherlv_8= 'usercode1' ( (lv_userCode1_9_0= ruleDetailCode ) )
                     {
-                    otherlv_8=(Token)match(input,29,FOLLOW_29_in_ruleProtocolClass3866); 
+                    otherlv_8=(Token)match(input,29,FOLLOW_5); 
 
                         	newLeafNode(otherlv_8, grammarAccess.getProtocolClassAccess().getUsercode1Keyword_7_0());
                         
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1983:1: ( (lv_userCode1_9_0= ruleDetailCode ) )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1984:1: (lv_userCode1_9_0= ruleDetailCode )
+                    // InternalRoom.g:1983:1: ( (lv_userCode1_9_0= ruleDetailCode ) )
+                    // InternalRoom.g:1984:1: (lv_userCode1_9_0= ruleDetailCode )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1984:1: (lv_userCode1_9_0= ruleDetailCode )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:1985:3: lv_userCode1_9_0= ruleDetailCode
+                    // InternalRoom.g:1984:1: (lv_userCode1_9_0= ruleDetailCode )
+                    // InternalRoom.g:1985:3: lv_userCode1_9_0= ruleDetailCode
                     {
                      
                     	        newCompositeNode(grammarAccess.getProtocolClassAccess().getUserCode1DetailCodeParserRuleCall_7_1_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDetailCode_in_ruleProtocolClass3887);
+                    pushFollow(FOLLOW_44);
                     lv_userCode1_9_0=ruleDetailCode();
 
                     state._fsp--;
@@ -4957,7 +4957,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"userCode1",
                             		lv_userCode1_9_0, 
-                            		"DetailCode");
+                            		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -4972,7 +4972,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2001:4: (otherlv_10= 'usercode2' ( (lv_userCode2_11_0= ruleDetailCode ) ) )?
+            // InternalRoom.g:2001:4: (otherlv_10= 'usercode2' ( (lv_userCode2_11_0= ruleDetailCode ) ) )?
             int alt47=2;
             int LA47_0 = input.LA(1);
 
@@ -4981,22 +4981,22 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt47) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2001:6: otherlv_10= 'usercode2' ( (lv_userCode2_11_0= ruleDetailCode ) )
+                    // InternalRoom.g:2001:6: otherlv_10= 'usercode2' ( (lv_userCode2_11_0= ruleDetailCode ) )
                     {
-                    otherlv_10=(Token)match(input,30,FOLLOW_30_in_ruleProtocolClass3902); 
+                    otherlv_10=(Token)match(input,30,FOLLOW_5); 
 
                         	newLeafNode(otherlv_10, grammarAccess.getProtocolClassAccess().getUsercode2Keyword_8_0());
                         
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2005:1: ( (lv_userCode2_11_0= ruleDetailCode ) )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2006:1: (lv_userCode2_11_0= ruleDetailCode )
+                    // InternalRoom.g:2005:1: ( (lv_userCode2_11_0= ruleDetailCode ) )
+                    // InternalRoom.g:2006:1: (lv_userCode2_11_0= ruleDetailCode )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2006:1: (lv_userCode2_11_0= ruleDetailCode )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2007:3: lv_userCode2_11_0= ruleDetailCode
+                    // InternalRoom.g:2006:1: (lv_userCode2_11_0= ruleDetailCode )
+                    // InternalRoom.g:2007:3: lv_userCode2_11_0= ruleDetailCode
                     {
                      
                     	        newCompositeNode(grammarAccess.getProtocolClassAccess().getUserCode2DetailCodeParserRuleCall_8_1_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDetailCode_in_ruleProtocolClass3923);
+                    pushFollow(FOLLOW_45);
                     lv_userCode2_11_0=ruleDetailCode();
 
                     state._fsp--;
@@ -5009,7 +5009,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"userCode2",
                             		lv_userCode2_11_0, 
-                            		"DetailCode");
+                            		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -5024,7 +5024,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2023:4: (otherlv_12= 'usercode3' ( (lv_userCode3_13_0= ruleDetailCode ) ) )?
+            // InternalRoom.g:2023:4: (otherlv_12= 'usercode3' ( (lv_userCode3_13_0= ruleDetailCode ) ) )?
             int alt48=2;
             int LA48_0 = input.LA(1);
 
@@ -5033,22 +5033,22 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt48) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2023:6: otherlv_12= 'usercode3' ( (lv_userCode3_13_0= ruleDetailCode ) )
+                    // InternalRoom.g:2023:6: otherlv_12= 'usercode3' ( (lv_userCode3_13_0= ruleDetailCode ) )
                     {
-                    otherlv_12=(Token)match(input,31,FOLLOW_31_in_ruleProtocolClass3938); 
+                    otherlv_12=(Token)match(input,31,FOLLOW_5); 
 
                         	newLeafNode(otherlv_12, grammarAccess.getProtocolClassAccess().getUsercode3Keyword_9_0());
                         
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2027:1: ( (lv_userCode3_13_0= ruleDetailCode ) )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2028:1: (lv_userCode3_13_0= ruleDetailCode )
+                    // InternalRoom.g:2027:1: ( (lv_userCode3_13_0= ruleDetailCode ) )
+                    // InternalRoom.g:2028:1: (lv_userCode3_13_0= ruleDetailCode )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2028:1: (lv_userCode3_13_0= ruleDetailCode )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2029:3: lv_userCode3_13_0= ruleDetailCode
+                    // InternalRoom.g:2028:1: (lv_userCode3_13_0= ruleDetailCode )
+                    // InternalRoom.g:2029:3: lv_userCode3_13_0= ruleDetailCode
                     {
                      
                     	        newCompositeNode(grammarAccess.getProtocolClassAccess().getUserCode3DetailCodeParserRuleCall_9_1_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDetailCode_in_ruleProtocolClass3959);
+                    pushFollow(FOLLOW_46);
                     lv_userCode3_13_0=ruleDetailCode();
 
                     state._fsp--;
@@ -5061,7 +5061,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"userCode3",
                             		lv_userCode3_13_0, 
-                            		"DetailCode");
+                            		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -5076,7 +5076,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2045:4: (otherlv_14= 'incoming' otherlv_15= '{' ( (lv_incomingMessages_16_0= ruleMessage ) )* otherlv_17= '}' )?
+            // InternalRoom.g:2045:4: (otherlv_14= 'incoming' otherlv_15= '{' ( (lv_incomingMessages_16_0= ruleMessage ) )* otherlv_17= '}' )?
             int alt50=2;
             int LA50_0 = input.LA(1);
 
@@ -5085,17 +5085,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt50) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2045:6: otherlv_14= 'incoming' otherlv_15= '{' ( (lv_incomingMessages_16_0= ruleMessage ) )* otherlv_17= '}'
+                    // InternalRoom.g:2045:6: otherlv_14= 'incoming' otherlv_15= '{' ( (lv_incomingMessages_16_0= ruleMessage ) )* otherlv_17= '}'
                     {
-                    otherlv_14=(Token)match(input,42,FOLLOW_42_in_ruleProtocolClass3974); 
+                    otherlv_14=(Token)match(input,42,FOLLOW_5); 
 
                         	newLeafNode(otherlv_14, grammarAccess.getProtocolClassAccess().getIncomingKeyword_10_0());
                         
-                    otherlv_15=(Token)match(input,13,FOLLOW_13_in_ruleProtocolClass3986); 
+                    otherlv_15=(Token)match(input,13,FOLLOW_47); 
 
                         	newLeafNode(otherlv_15, grammarAccess.getProtocolClassAccess().getLeftCurlyBracketKeyword_10_1());
                         
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2053:1: ( (lv_incomingMessages_16_0= ruleMessage ) )*
+                    // InternalRoom.g:2053:1: ( (lv_incomingMessages_16_0= ruleMessage ) )*
                     loop49:
                     do {
                         int alt49=2;
@@ -5108,15 +5108,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                         switch (alt49) {
                     	case 1 :
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2054:1: (lv_incomingMessages_16_0= ruleMessage )
+                    	    // InternalRoom.g:2054:1: (lv_incomingMessages_16_0= ruleMessage )
                     	    {
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2054:1: (lv_incomingMessages_16_0= ruleMessage )
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2055:3: lv_incomingMessages_16_0= ruleMessage
+                    	    // InternalRoom.g:2054:1: (lv_incomingMessages_16_0= ruleMessage )
+                    	    // InternalRoom.g:2055:3: lv_incomingMessages_16_0= ruleMessage
                     	    {
                     	     
                     	    	        newCompositeNode(grammarAccess.getProtocolClassAccess().getIncomingMessagesMessageParserRuleCall_10_2_0()); 
                     	    	    
-                    	    pushFollow(FOLLOW_ruleMessage_in_ruleProtocolClass4007);
+                    	    pushFollow(FOLLOW_47);
                     	    lv_incomingMessages_16_0=ruleMessage();
 
                     	    state._fsp--;
@@ -5129,7 +5129,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     	           			current, 
                     	           			"incomingMessages",
                     	            		lv_incomingMessages_16_0, 
-                    	            		"Message");
+                    	            		"org.eclipse.etrice.core.Room.Message");
                     	    	        afterParserOrEnumRuleCall();
                     	    	    
 
@@ -5144,7 +5144,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                         }
                     } while (true);
 
-                    otherlv_17=(Token)match(input,14,FOLLOW_14_in_ruleProtocolClass4020); 
+                    otherlv_17=(Token)match(input,14,FOLLOW_48); 
 
                         	newLeafNode(otherlv_17, grammarAccess.getProtocolClassAccess().getRightCurlyBracketKeyword_10_3());
                         
@@ -5154,7 +5154,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2075:3: (otherlv_18= 'outgoing' otherlv_19= '{' ( (lv_outgoingMessages_20_0= ruleMessage ) )* otherlv_21= '}' )?
+            // InternalRoom.g:2075:3: (otherlv_18= 'outgoing' otherlv_19= '{' ( (lv_outgoingMessages_20_0= ruleMessage ) )* otherlv_21= '}' )?
             int alt52=2;
             int LA52_0 = input.LA(1);
 
@@ -5163,17 +5163,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt52) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2075:5: otherlv_18= 'outgoing' otherlv_19= '{' ( (lv_outgoingMessages_20_0= ruleMessage ) )* otherlv_21= '}'
+                    // InternalRoom.g:2075:5: otherlv_18= 'outgoing' otherlv_19= '{' ( (lv_outgoingMessages_20_0= ruleMessage ) )* otherlv_21= '}'
                     {
-                    otherlv_18=(Token)match(input,43,FOLLOW_43_in_ruleProtocolClass4035); 
+                    otherlv_18=(Token)match(input,43,FOLLOW_5); 
 
                         	newLeafNode(otherlv_18, grammarAccess.getProtocolClassAccess().getOutgoingKeyword_11_0());
                         
-                    otherlv_19=(Token)match(input,13,FOLLOW_13_in_ruleProtocolClass4047); 
+                    otherlv_19=(Token)match(input,13,FOLLOW_47); 
 
                         	newLeafNode(otherlv_19, grammarAccess.getProtocolClassAccess().getLeftCurlyBracketKeyword_11_1());
                         
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2083:1: ( (lv_outgoingMessages_20_0= ruleMessage ) )*
+                    // InternalRoom.g:2083:1: ( (lv_outgoingMessages_20_0= ruleMessage ) )*
                     loop51:
                     do {
                         int alt51=2;
@@ -5186,15 +5186,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                         switch (alt51) {
                     	case 1 :
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2084:1: (lv_outgoingMessages_20_0= ruleMessage )
+                    	    // InternalRoom.g:2084:1: (lv_outgoingMessages_20_0= ruleMessage )
                     	    {
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2084:1: (lv_outgoingMessages_20_0= ruleMessage )
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2085:3: lv_outgoingMessages_20_0= ruleMessage
+                    	    // InternalRoom.g:2084:1: (lv_outgoingMessages_20_0= ruleMessage )
+                    	    // InternalRoom.g:2085:3: lv_outgoingMessages_20_0= ruleMessage
                     	    {
                     	     
                     	    	        newCompositeNode(grammarAccess.getProtocolClassAccess().getOutgoingMessagesMessageParserRuleCall_11_2_0()); 
                     	    	    
-                    	    pushFollow(FOLLOW_ruleMessage_in_ruleProtocolClass4068);
+                    	    pushFollow(FOLLOW_47);
                     	    lv_outgoingMessages_20_0=ruleMessage();
 
                     	    state._fsp--;
@@ -5207,7 +5207,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     	           			current, 
                     	           			"outgoingMessages",
                     	            		lv_outgoingMessages_20_0, 
-                    	            		"Message");
+                    	            		"org.eclipse.etrice.core.Room.Message");
                     	    	        afterParserOrEnumRuleCall();
                     	    	    
 
@@ -5222,7 +5222,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                         }
                     } while (true);
 
-                    otherlv_21=(Token)match(input,14,FOLLOW_14_in_ruleProtocolClass4081); 
+                    otherlv_21=(Token)match(input,14,FOLLOW_49); 
 
                         	newLeafNode(otherlv_21, grammarAccess.getProtocolClassAccess().getRightCurlyBracketKeyword_11_3());
                         
@@ -5232,7 +5232,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2105:3: (otherlv_22= 'regular' otherlv_23= 'PortClass' ( (lv_regular_24_0= rulePortClass ) ) )?
+            // InternalRoom.g:2105:3: (otherlv_22= 'regular' otherlv_23= 'PortClass' ( (lv_regular_24_0= rulePortClass ) ) )?
             int alt53=2;
             int LA53_0 = input.LA(1);
 
@@ -5241,26 +5241,26 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt53) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2105:5: otherlv_22= 'regular' otherlv_23= 'PortClass' ( (lv_regular_24_0= rulePortClass ) )
+                    // InternalRoom.g:2105:5: otherlv_22= 'regular' otherlv_23= 'PortClass' ( (lv_regular_24_0= rulePortClass ) )
                     {
-                    otherlv_22=(Token)match(input,44,FOLLOW_44_in_ruleProtocolClass4096); 
+                    otherlv_22=(Token)match(input,44,FOLLOW_50); 
 
                         	newLeafNode(otherlv_22, grammarAccess.getProtocolClassAccess().getRegularKeyword_12_0());
                         
-                    otherlv_23=(Token)match(input,45,FOLLOW_45_in_ruleProtocolClass4108); 
+                    otherlv_23=(Token)match(input,45,FOLLOW_5); 
 
                         	newLeafNode(otherlv_23, grammarAccess.getProtocolClassAccess().getPortClassKeyword_12_1());
                         
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2113:1: ( (lv_regular_24_0= rulePortClass ) )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2114:1: (lv_regular_24_0= rulePortClass )
+                    // InternalRoom.g:2113:1: ( (lv_regular_24_0= rulePortClass ) )
+                    // InternalRoom.g:2114:1: (lv_regular_24_0= rulePortClass )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2114:1: (lv_regular_24_0= rulePortClass )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2115:3: lv_regular_24_0= rulePortClass
+                    // InternalRoom.g:2114:1: (lv_regular_24_0= rulePortClass )
+                    // InternalRoom.g:2115:3: lv_regular_24_0= rulePortClass
                     {
                      
                     	        newCompositeNode(grammarAccess.getProtocolClassAccess().getRegularPortClassParserRuleCall_12_2_0()); 
                     	    
-                    pushFollow(FOLLOW_rulePortClass_in_ruleProtocolClass4129);
+                    pushFollow(FOLLOW_51);
                     lv_regular_24_0=rulePortClass();
 
                     state._fsp--;
@@ -5273,7 +5273,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"regular",
                             		lv_regular_24_0, 
-                            		"PortClass");
+                            		"org.eclipse.etrice.core.Room.PortClass");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -5288,7 +5288,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2131:4: (otherlv_25= 'conjugated' otherlv_26= 'PortClass' ( (lv_conjugated_27_0= rulePortClass ) ) )?
+            // InternalRoom.g:2131:4: (otherlv_25= 'conjugated' otherlv_26= 'PortClass' ( (lv_conjugated_27_0= rulePortClass ) ) )?
             int alt54=2;
             int LA54_0 = input.LA(1);
 
@@ -5297,26 +5297,26 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt54) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2131:6: otherlv_25= 'conjugated' otherlv_26= 'PortClass' ( (lv_conjugated_27_0= rulePortClass ) )
+                    // InternalRoom.g:2131:6: otherlv_25= 'conjugated' otherlv_26= 'PortClass' ( (lv_conjugated_27_0= rulePortClass ) )
                     {
-                    otherlv_25=(Token)match(input,46,FOLLOW_46_in_ruleProtocolClass4144); 
+                    otherlv_25=(Token)match(input,46,FOLLOW_50); 
 
                         	newLeafNode(otherlv_25, grammarAccess.getProtocolClassAccess().getConjugatedKeyword_13_0());
                         
-                    otherlv_26=(Token)match(input,45,FOLLOW_45_in_ruleProtocolClass4156); 
+                    otherlv_26=(Token)match(input,45,FOLLOW_5); 
 
                         	newLeafNode(otherlv_26, grammarAccess.getProtocolClassAccess().getPortClassKeyword_13_1());
                         
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2139:1: ( (lv_conjugated_27_0= rulePortClass ) )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2140:1: (lv_conjugated_27_0= rulePortClass )
+                    // InternalRoom.g:2139:1: ( (lv_conjugated_27_0= rulePortClass ) )
+                    // InternalRoom.g:2140:1: (lv_conjugated_27_0= rulePortClass )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2140:1: (lv_conjugated_27_0= rulePortClass )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2141:3: lv_conjugated_27_0= rulePortClass
+                    // InternalRoom.g:2140:1: (lv_conjugated_27_0= rulePortClass )
+                    // InternalRoom.g:2141:3: lv_conjugated_27_0= rulePortClass
                     {
                      
                     	        newCompositeNode(grammarAccess.getProtocolClassAccess().getConjugatedPortClassParserRuleCall_13_2_0()); 
                     	    
-                    pushFollow(FOLLOW_rulePortClass_in_ruleProtocolClass4177);
+                    pushFollow(FOLLOW_52);
                     lv_conjugated_27_0=rulePortClass();
 
                     state._fsp--;
@@ -5329,7 +5329,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"conjugated",
                             		lv_conjugated_27_0, 
-                            		"PortClass");
+                            		"org.eclipse.etrice.core.Room.PortClass");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -5344,7 +5344,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2157:4: ( (lv_semantics_28_0= ruleProtocolSemantics ) )?
+            // InternalRoom.g:2157:4: ( (lv_semantics_28_0= ruleProtocolSemantics ) )?
             int alt55=2;
             int LA55_0 = input.LA(1);
 
@@ -5353,15 +5353,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt55) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2158:1: (lv_semantics_28_0= ruleProtocolSemantics )
+                    // InternalRoom.g:2158:1: (lv_semantics_28_0= ruleProtocolSemantics )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2158:1: (lv_semantics_28_0= ruleProtocolSemantics )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2159:3: lv_semantics_28_0= ruleProtocolSemantics
+                    // InternalRoom.g:2158:1: (lv_semantics_28_0= ruleProtocolSemantics )
+                    // InternalRoom.g:2159:3: lv_semantics_28_0= ruleProtocolSemantics
                     {
                      
                     	        newCompositeNode(grammarAccess.getProtocolClassAccess().getSemanticsProtocolSemanticsParserRuleCall_14_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleProtocolSemantics_in_ruleProtocolClass4200);
+                    pushFollow(FOLLOW_53);
                     lv_semantics_28_0=ruleProtocolSemantics();
 
                     state._fsp--;
@@ -5374,7 +5374,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"semantics",
                             		lv_semantics_28_0, 
-                            		"ProtocolSemantics");
+                            		"org.eclipse.etrice.core.fsm.FSM.ProtocolSemantics");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -5386,7 +5386,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_29=(Token)match(input,14,FOLLOW_14_in_ruleProtocolClass4213); 
+            otherlv_29=(Token)match(input,14,FOLLOW_2); 
 
                 	newLeafNode(otherlv_29, grammarAccess.getProtocolClassAccess().getRightCurlyBracketKeyword_15());
                 
@@ -5411,7 +5411,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleCompoundProtocolClass"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2187:1: entryRuleCompoundProtocolClass returns [EObject current=null] : iv_ruleCompoundProtocolClass= ruleCompoundProtocolClass EOF ;
+    // InternalRoom.g:2187:1: entryRuleCompoundProtocolClass returns [EObject current=null] : iv_ruleCompoundProtocolClass= ruleCompoundProtocolClass EOF ;
     public final EObject entryRuleCompoundProtocolClass() throws RecognitionException {
         EObject current = null;
 
@@ -5419,17 +5419,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2188:2: (iv_ruleCompoundProtocolClass= ruleCompoundProtocolClass EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2189:2: iv_ruleCompoundProtocolClass= ruleCompoundProtocolClass EOF
+            // InternalRoom.g:2188:2: (iv_ruleCompoundProtocolClass= ruleCompoundProtocolClass EOF )
+            // InternalRoom.g:2189:2: iv_ruleCompoundProtocolClass= ruleCompoundProtocolClass EOF
             {
              newCompositeNode(grammarAccess.getCompoundProtocolClassRule()); 
-            pushFollow(FOLLOW_ruleCompoundProtocolClass_in_entryRuleCompoundProtocolClass4249);
+            pushFollow(FOLLOW_1);
             iv_ruleCompoundProtocolClass=ruleCompoundProtocolClass();
 
             state._fsp--;
 
              current =iv_ruleCompoundProtocolClass; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleCompoundProtocolClass4259); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -5447,7 +5447,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleCompoundProtocolClass"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2196:1: ruleCompoundProtocolClass returns [EObject current=null] : (otherlv_0= 'CompoundProtocolClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_annotations_4_0= ruleAnnotation ) )* ( (lv_subProtocols_5_0= ruleSubProtocol ) )* otherlv_6= '}' ) ;
+    // InternalRoom.g:2196:1: ruleCompoundProtocolClass returns [EObject current=null] : (otherlv_0= 'CompoundProtocolClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_annotations_4_0= ruleAnnotation ) )* ( (lv_subProtocols_5_0= ruleSubProtocol ) )* otherlv_6= '}' ) ;
     public final EObject ruleCompoundProtocolClass() throws RecognitionException {
         EObject current = null;
 
@@ -5465,23 +5465,23 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2199:28: ( (otherlv_0= 'CompoundProtocolClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_annotations_4_0= ruleAnnotation ) )* ( (lv_subProtocols_5_0= ruleSubProtocol ) )* otherlv_6= '}' ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2200:1: (otherlv_0= 'CompoundProtocolClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_annotations_4_0= ruleAnnotation ) )* ( (lv_subProtocols_5_0= ruleSubProtocol ) )* otherlv_6= '}' )
+            // InternalRoom.g:2199:28: ( (otherlv_0= 'CompoundProtocolClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_annotations_4_0= ruleAnnotation ) )* ( (lv_subProtocols_5_0= ruleSubProtocol ) )* otherlv_6= '}' ) )
+            // InternalRoom.g:2200:1: (otherlv_0= 'CompoundProtocolClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_annotations_4_0= ruleAnnotation ) )* ( (lv_subProtocols_5_0= ruleSubProtocol ) )* otherlv_6= '}' )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2200:1: (otherlv_0= 'CompoundProtocolClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_annotations_4_0= ruleAnnotation ) )* ( (lv_subProtocols_5_0= ruleSubProtocol ) )* otherlv_6= '}' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2200:3: otherlv_0= 'CompoundProtocolClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_annotations_4_0= ruleAnnotation ) )* ( (lv_subProtocols_5_0= ruleSubProtocol ) )* otherlv_6= '}'
+            // InternalRoom.g:2200:1: (otherlv_0= 'CompoundProtocolClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_annotations_4_0= ruleAnnotation ) )* ( (lv_subProtocols_5_0= ruleSubProtocol ) )* otherlv_6= '}' )
+            // InternalRoom.g:2200:3: otherlv_0= 'CompoundProtocolClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_annotations_4_0= ruleAnnotation ) )* ( (lv_subProtocols_5_0= ruleSubProtocol ) )* otherlv_6= '}'
             {
-            otherlv_0=(Token)match(input,47,FOLLOW_47_in_ruleCompoundProtocolClass4296); 
+            otherlv_0=(Token)match(input,47,FOLLOW_3); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getCompoundProtocolClassAccess().getCompoundProtocolClassKeyword_0());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2204:1: ( (lv_name_1_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2205:1: (lv_name_1_0= RULE_ID )
+            // InternalRoom.g:2204:1: ( (lv_name_1_0= RULE_ID ) )
+            // InternalRoom.g:2205:1: (lv_name_1_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2205:1: (lv_name_1_0= RULE_ID )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2206:3: lv_name_1_0= RULE_ID
+            // InternalRoom.g:2205:1: (lv_name_1_0= RULE_ID )
+            // InternalRoom.g:2206:3: lv_name_1_0= RULE_ID
             {
-            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleCompoundProtocolClass4313); 
+            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_4); 
 
             			newLeafNode(lv_name_1_0, grammarAccess.getCompoundProtocolClassAccess().getNameIDTerminalRuleCall_1_0()); 
             		
@@ -5493,7 +5493,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"name",
                     		lv_name_1_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -5501,7 +5501,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2222:2: ( (lv_docu_2_0= ruleDocumentation ) )?
+            // InternalRoom.g:2222:2: ( (lv_docu_2_0= ruleDocumentation ) )?
             int alt56=2;
             int LA56_0 = input.LA(1);
 
@@ -5510,15 +5510,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt56) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2223:1: (lv_docu_2_0= ruleDocumentation )
+                    // InternalRoom.g:2223:1: (lv_docu_2_0= ruleDocumentation )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2223:1: (lv_docu_2_0= ruleDocumentation )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2224:3: lv_docu_2_0= ruleDocumentation
+                    // InternalRoom.g:2223:1: (lv_docu_2_0= ruleDocumentation )
+                    // InternalRoom.g:2224:3: lv_docu_2_0= ruleDocumentation
                     {
                      
                     	        newCompositeNode(grammarAccess.getCompoundProtocolClassAccess().getDocuDocumentationParserRuleCall_2_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDocumentation_in_ruleCompoundProtocolClass4339);
+                    pushFollow(FOLLOW_5);
                     lv_docu_2_0=ruleDocumentation();
 
                     state._fsp--;
@@ -5531,7 +5531,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"docu",
                             		lv_docu_2_0, 
-                            		"Documentation");
+                            		"org.eclipse.etrice.core.common.Base.Documentation");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -5543,11 +5543,11 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_3=(Token)match(input,13,FOLLOW_13_in_ruleCompoundProtocolClass4352); 
+            otherlv_3=(Token)match(input,13,FOLLOW_54); 
 
                 	newLeafNode(otherlv_3, grammarAccess.getCompoundProtocolClassAccess().getLeftCurlyBracketKeyword_3());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2244:1: ( (lv_annotations_4_0= ruleAnnotation ) )*
+            // InternalRoom.g:2244:1: ( (lv_annotations_4_0= ruleAnnotation ) )*
             loop57:
             do {
                 int alt57=2;
@@ -5560,15 +5560,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                 switch (alt57) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2245:1: (lv_annotations_4_0= ruleAnnotation )
+            	    // InternalRoom.g:2245:1: (lv_annotations_4_0= ruleAnnotation )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2245:1: (lv_annotations_4_0= ruleAnnotation )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2246:3: lv_annotations_4_0= ruleAnnotation
+            	    // InternalRoom.g:2245:1: (lv_annotations_4_0= ruleAnnotation )
+            	    // InternalRoom.g:2246:3: lv_annotations_4_0= ruleAnnotation
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getCompoundProtocolClassAccess().getAnnotationsAnnotationParserRuleCall_4_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleAnnotation_in_ruleCompoundProtocolClass4373);
+            	    pushFollow(FOLLOW_54);
             	    lv_annotations_4_0=ruleAnnotation();
 
             	    state._fsp--;
@@ -5581,7 +5581,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"annotations",
             	            		lv_annotations_4_0, 
-            	            		"Annotation");
+            	            		"org.eclipse.etrice.core.common.Base.Annotation");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -5596,7 +5596,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                 }
             } while (true);
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2262:3: ( (lv_subProtocols_5_0= ruleSubProtocol ) )*
+            // InternalRoom.g:2262:3: ( (lv_subProtocols_5_0= ruleSubProtocol ) )*
             loop58:
             do {
                 int alt58=2;
@@ -5609,15 +5609,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                 switch (alt58) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2263:1: (lv_subProtocols_5_0= ruleSubProtocol )
+            	    // InternalRoom.g:2263:1: (lv_subProtocols_5_0= ruleSubProtocol )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2263:1: (lv_subProtocols_5_0= ruleSubProtocol )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2264:3: lv_subProtocols_5_0= ruleSubProtocol
+            	    // InternalRoom.g:2263:1: (lv_subProtocols_5_0= ruleSubProtocol )
+            	    // InternalRoom.g:2264:3: lv_subProtocols_5_0= ruleSubProtocol
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getCompoundProtocolClassAccess().getSubProtocolsSubProtocolParserRuleCall_5_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleSubProtocol_in_ruleCompoundProtocolClass4395);
+            	    pushFollow(FOLLOW_55);
             	    lv_subProtocols_5_0=ruleSubProtocol();
 
             	    state._fsp--;
@@ -5630,7 +5630,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"subProtocols",
             	            		lv_subProtocols_5_0, 
-            	            		"SubProtocol");
+            	            		"org.eclipse.etrice.core.Room.SubProtocol");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -5645,7 +5645,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                 }
             } while (true);
 
-            otherlv_6=(Token)match(input,14,FOLLOW_14_in_ruleCompoundProtocolClass4408); 
+            otherlv_6=(Token)match(input,14,FOLLOW_2); 
 
                 	newLeafNode(otherlv_6, grammarAccess.getCompoundProtocolClassAccess().getRightCurlyBracketKeyword_6());
                 
@@ -5670,7 +5670,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleSubProtocol"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2292:1: entryRuleSubProtocol returns [EObject current=null] : iv_ruleSubProtocol= ruleSubProtocol EOF ;
+    // InternalRoom.g:2292:1: entryRuleSubProtocol returns [EObject current=null] : iv_ruleSubProtocol= ruleSubProtocol EOF ;
     public final EObject entryRuleSubProtocol() throws RecognitionException {
         EObject current = null;
 
@@ -5678,17 +5678,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2293:2: (iv_ruleSubProtocol= ruleSubProtocol EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2294:2: iv_ruleSubProtocol= ruleSubProtocol EOF
+            // InternalRoom.g:2293:2: (iv_ruleSubProtocol= ruleSubProtocol EOF )
+            // InternalRoom.g:2294:2: iv_ruleSubProtocol= ruleSubProtocol EOF
             {
              newCompositeNode(grammarAccess.getSubProtocolRule()); 
-            pushFollow(FOLLOW_ruleSubProtocol_in_entryRuleSubProtocol4444);
+            pushFollow(FOLLOW_1);
             iv_ruleSubProtocol=ruleSubProtocol();
 
             state._fsp--;
 
              current =iv_ruleSubProtocol; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSubProtocol4454); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -5706,7 +5706,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleSubProtocol"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2301:1: ruleSubProtocol returns [EObject current=null] : (otherlv_0= 'SubProtocol' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( ruleFQN ) ) ) ;
+    // InternalRoom.g:2301:1: ruleSubProtocol returns [EObject current=null] : (otherlv_0= 'SubProtocol' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( ruleFQN ) ) ) ;
     public final EObject ruleSubProtocol() throws RecognitionException {
         EObject current = null;
 
@@ -5717,23 +5717,23 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2304:28: ( (otherlv_0= 'SubProtocol' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( ruleFQN ) ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2305:1: (otherlv_0= 'SubProtocol' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( ruleFQN ) ) )
+            // InternalRoom.g:2304:28: ( (otherlv_0= 'SubProtocol' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( ruleFQN ) ) ) )
+            // InternalRoom.g:2305:1: (otherlv_0= 'SubProtocol' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( ruleFQN ) ) )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2305:1: (otherlv_0= 'SubProtocol' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( ruleFQN ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2305:3: otherlv_0= 'SubProtocol' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( ruleFQN ) )
+            // InternalRoom.g:2305:1: (otherlv_0= 'SubProtocol' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( ruleFQN ) ) )
+            // InternalRoom.g:2305:3: otherlv_0= 'SubProtocol' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( ruleFQN ) )
             {
-            otherlv_0=(Token)match(input,48,FOLLOW_48_in_ruleSubProtocol4491); 
+            otherlv_0=(Token)match(input,48,FOLLOW_3); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getSubProtocolAccess().getSubProtocolKeyword_0());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2309:1: ( (lv_name_1_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2310:1: (lv_name_1_0= RULE_ID )
+            // InternalRoom.g:2309:1: ( (lv_name_1_0= RULE_ID ) )
+            // InternalRoom.g:2310:1: (lv_name_1_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2310:1: (lv_name_1_0= RULE_ID )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2311:3: lv_name_1_0= RULE_ID
+            // InternalRoom.g:2310:1: (lv_name_1_0= RULE_ID )
+            // InternalRoom.g:2311:3: lv_name_1_0= RULE_ID
             {
-            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleSubProtocol4508); 
+            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_8); 
 
             			newLeafNode(lv_name_1_0, grammarAccess.getSubProtocolAccess().getNameIDTerminalRuleCall_1_0()); 
             		
@@ -5745,7 +5745,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"name",
                     		lv_name_1_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -5753,15 +5753,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_2=(Token)match(input,15,FOLLOW_15_in_ruleSubProtocol4525); 
+            otherlv_2=(Token)match(input,15,FOLLOW_3); 
 
                 	newLeafNode(otherlv_2, grammarAccess.getSubProtocolAccess().getColonKeyword_2());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2331:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2332:1: ( ruleFQN )
+            // InternalRoom.g:2331:1: ( ( ruleFQN ) )
+            // InternalRoom.g:2332:1: ( ruleFQN )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2332:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2333:3: ruleFQN
+            // InternalRoom.g:2332:1: ( ruleFQN )
+            // InternalRoom.g:2333:3: ruleFQN
             {
 
             			if (current==null) {
@@ -5771,7 +5771,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
              
             	        newCompositeNode(grammarAccess.getSubProtocolAccess().getProtocolGeneralProtocolClassCrossReference_3_0()); 
             	    
-            pushFollow(FOLLOW_ruleFQN_in_ruleSubProtocol4548);
+            pushFollow(FOLLOW_2);
             ruleFQN();
 
             state._fsp--;
@@ -5806,7 +5806,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleMessage"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2354:1: entryRuleMessage returns [EObject current=null] : iv_ruleMessage= ruleMessage EOF ;
+    // InternalRoom.g:2354:1: entryRuleMessage returns [EObject current=null] : iv_ruleMessage= ruleMessage EOF ;
     public final EObject entryRuleMessage() throws RecognitionException {
         EObject current = null;
 
@@ -5814,17 +5814,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2355:2: (iv_ruleMessage= ruleMessage EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2356:2: iv_ruleMessage= ruleMessage EOF
+            // InternalRoom.g:2355:2: (iv_ruleMessage= ruleMessage EOF )
+            // InternalRoom.g:2356:2: iv_ruleMessage= ruleMessage EOF
             {
              newCompositeNode(grammarAccess.getMessageRule()); 
-            pushFollow(FOLLOW_ruleMessage_in_entryRuleMessage4584);
+            pushFollow(FOLLOW_1);
             iv_ruleMessage=ruleMessage();
 
             state._fsp--;
 
              current =iv_ruleMessage; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleMessage4594); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -5842,7 +5842,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleMessage"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2363:1: ruleMessage returns [EObject current=null] : ( ( (lv_priv_0_0= 'private' ) )? otherlv_1= 'Message' ( (lv_name_2_0= RULE_ID ) ) otherlv_3= '(' ( (lv_data_4_0= ruleVarDecl ) )? otherlv_5= ')' ( (lv_docu_6_0= ruleDocumentation ) )? ) ;
+    // InternalRoom.g:2363:1: ruleMessage returns [EObject current=null] : ( ( (lv_priv_0_0= 'private' ) )? otherlv_1= 'Message' ( (lv_name_2_0= RULE_ID ) ) otherlv_3= '(' ( (lv_data_4_0= ruleVarDecl ) )? otherlv_5= ')' ( (lv_docu_6_0= ruleDocumentation ) )? ) ;
     public final EObject ruleMessage() throws RecognitionException {
         EObject current = null;
 
@@ -5859,13 +5859,13 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2366:28: ( ( ( (lv_priv_0_0= 'private' ) )? otherlv_1= 'Message' ( (lv_name_2_0= RULE_ID ) ) otherlv_3= '(' ( (lv_data_4_0= ruleVarDecl ) )? otherlv_5= ')' ( (lv_docu_6_0= ruleDocumentation ) )? ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2367:1: ( ( (lv_priv_0_0= 'private' ) )? otherlv_1= 'Message' ( (lv_name_2_0= RULE_ID ) ) otherlv_3= '(' ( (lv_data_4_0= ruleVarDecl ) )? otherlv_5= ')' ( (lv_docu_6_0= ruleDocumentation ) )? )
+            // InternalRoom.g:2366:28: ( ( ( (lv_priv_0_0= 'private' ) )? otherlv_1= 'Message' ( (lv_name_2_0= RULE_ID ) ) otherlv_3= '(' ( (lv_data_4_0= ruleVarDecl ) )? otherlv_5= ')' ( (lv_docu_6_0= ruleDocumentation ) )? ) )
+            // InternalRoom.g:2367:1: ( ( (lv_priv_0_0= 'private' ) )? otherlv_1= 'Message' ( (lv_name_2_0= RULE_ID ) ) otherlv_3= '(' ( (lv_data_4_0= ruleVarDecl ) )? otherlv_5= ')' ( (lv_docu_6_0= ruleDocumentation ) )? )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2367:1: ( ( (lv_priv_0_0= 'private' ) )? otherlv_1= 'Message' ( (lv_name_2_0= RULE_ID ) ) otherlv_3= '(' ( (lv_data_4_0= ruleVarDecl ) )? otherlv_5= ')' ( (lv_docu_6_0= ruleDocumentation ) )? )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2367:2: ( (lv_priv_0_0= 'private' ) )? otherlv_1= 'Message' ( (lv_name_2_0= RULE_ID ) ) otherlv_3= '(' ( (lv_data_4_0= ruleVarDecl ) )? otherlv_5= ')' ( (lv_docu_6_0= ruleDocumentation ) )?
+            // InternalRoom.g:2367:1: ( ( (lv_priv_0_0= 'private' ) )? otherlv_1= 'Message' ( (lv_name_2_0= RULE_ID ) ) otherlv_3= '(' ( (lv_data_4_0= ruleVarDecl ) )? otherlv_5= ')' ( (lv_docu_6_0= ruleDocumentation ) )? )
+            // InternalRoom.g:2367:2: ( (lv_priv_0_0= 'private' ) )? otherlv_1= 'Message' ( (lv_name_2_0= RULE_ID ) ) otherlv_3= '(' ( (lv_data_4_0= ruleVarDecl ) )? otherlv_5= ')' ( (lv_docu_6_0= ruleDocumentation ) )?
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2367:2: ( (lv_priv_0_0= 'private' ) )?
+            // InternalRoom.g:2367:2: ( (lv_priv_0_0= 'private' ) )?
             int alt59=2;
             int LA59_0 = input.LA(1);
 
@@ -5874,12 +5874,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt59) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2368:1: (lv_priv_0_0= 'private' )
+                    // InternalRoom.g:2368:1: (lv_priv_0_0= 'private' )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2368:1: (lv_priv_0_0= 'private' )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2369:3: lv_priv_0_0= 'private'
+                    // InternalRoom.g:2368:1: (lv_priv_0_0= 'private' )
+                    // InternalRoom.g:2369:3: lv_priv_0_0= 'private'
                     {
-                    lv_priv_0_0=(Token)match(input,49,FOLLOW_49_in_ruleMessage4637); 
+                    lv_priv_0_0=(Token)match(input,49,FOLLOW_56); 
 
                             newLeafNode(lv_priv_0_0, grammarAccess.getMessageAccess().getPrivPrivateKeyword_0_0());
                         
@@ -5898,17 +5898,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,50,FOLLOW_50_in_ruleMessage4663); 
+            otherlv_1=(Token)match(input,50,FOLLOW_3); 
 
                 	newLeafNode(otherlv_1, grammarAccess.getMessageAccess().getMessageKeyword_1());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2386:1: ( (lv_name_2_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2387:1: (lv_name_2_0= RULE_ID )
+            // InternalRoom.g:2386:1: ( (lv_name_2_0= RULE_ID ) )
+            // InternalRoom.g:2387:1: (lv_name_2_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2387:1: (lv_name_2_0= RULE_ID )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2388:3: lv_name_2_0= RULE_ID
+            // InternalRoom.g:2387:1: (lv_name_2_0= RULE_ID )
+            // InternalRoom.g:2388:3: lv_name_2_0= RULE_ID
             {
-            lv_name_2_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleMessage4680); 
+            lv_name_2_0=(Token)match(input,RULE_ID,FOLLOW_36); 
 
             			newLeafNode(lv_name_2_0, grammarAccess.getMessageAccess().getNameIDTerminalRuleCall_2_0()); 
             		
@@ -5920,7 +5920,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"name",
                     		lv_name_2_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -5928,11 +5928,11 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_3=(Token)match(input,19,FOLLOW_19_in_ruleMessage4697); 
+            otherlv_3=(Token)match(input,19,FOLLOW_37); 
 
                 	newLeafNode(otherlv_3, grammarAccess.getMessageAccess().getLeftParenthesisKeyword_3());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2408:1: ( (lv_data_4_0= ruleVarDecl ) )?
+            // InternalRoom.g:2408:1: ( (lv_data_4_0= ruleVarDecl ) )?
             int alt60=2;
             int LA60_0 = input.LA(1);
 
@@ -5941,15 +5941,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt60) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2409:1: (lv_data_4_0= ruleVarDecl )
+                    // InternalRoom.g:2409:1: (lv_data_4_0= ruleVarDecl )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2409:1: (lv_data_4_0= ruleVarDecl )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2410:3: lv_data_4_0= ruleVarDecl
+                    // InternalRoom.g:2409:1: (lv_data_4_0= ruleVarDecl )
+                    // InternalRoom.g:2410:3: lv_data_4_0= ruleVarDecl
                     {
                      
                     	        newCompositeNode(grammarAccess.getMessageAccess().getDataVarDeclParserRuleCall_4_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleVarDecl_in_ruleMessage4718);
+                    pushFollow(FOLLOW_14);
                     lv_data_4_0=ruleVarDecl();
 
                     state._fsp--;
@@ -5962,7 +5962,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"data",
                             		lv_data_4_0, 
-                            		"VarDecl");
+                            		"org.eclipse.etrice.core.Room.VarDecl");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -5974,11 +5974,11 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_5=(Token)match(input,20,FOLLOW_20_in_ruleMessage4731); 
+            otherlv_5=(Token)match(input,20,FOLLOW_16); 
 
                 	newLeafNode(otherlv_5, grammarAccess.getMessageAccess().getRightParenthesisKeyword_5());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2430:1: ( (lv_docu_6_0= ruleDocumentation ) )?
+            // InternalRoom.g:2430:1: ( (lv_docu_6_0= ruleDocumentation ) )?
             int alt61=2;
             int LA61_0 = input.LA(1);
 
@@ -5987,15 +5987,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt61) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2431:1: (lv_docu_6_0= ruleDocumentation )
+                    // InternalRoom.g:2431:1: (lv_docu_6_0= ruleDocumentation )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2431:1: (lv_docu_6_0= ruleDocumentation )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2432:3: lv_docu_6_0= ruleDocumentation
+                    // InternalRoom.g:2431:1: (lv_docu_6_0= ruleDocumentation )
+                    // InternalRoom.g:2432:3: lv_docu_6_0= ruleDocumentation
                     {
                      
                     	        newCompositeNode(grammarAccess.getMessageAccess().getDocuDocumentationParserRuleCall_6_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDocumentation_in_ruleMessage4752);
+                    pushFollow(FOLLOW_2);
                     lv_docu_6_0=ruleDocumentation();
 
                     state._fsp--;
@@ -6008,7 +6008,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"docu",
                             		lv_docu_6_0, 
-                            		"Documentation");
+                            		"org.eclipse.etrice.core.common.Base.Documentation");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -6041,7 +6041,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRulePortClass"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2456:1: entryRulePortClass returns [EObject current=null] : iv_rulePortClass= rulePortClass EOF ;
+    // InternalRoom.g:2456:1: entryRulePortClass returns [EObject current=null] : iv_rulePortClass= rulePortClass EOF ;
     public final EObject entryRulePortClass() throws RecognitionException {
         EObject current = null;
 
@@ -6049,17 +6049,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2457:2: (iv_rulePortClass= rulePortClass EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2458:2: iv_rulePortClass= rulePortClass EOF
+            // InternalRoom.g:2457:2: (iv_rulePortClass= rulePortClass EOF )
+            // InternalRoom.g:2458:2: iv_rulePortClass= rulePortClass EOF
             {
              newCompositeNode(grammarAccess.getPortClassRule()); 
-            pushFollow(FOLLOW_rulePortClass_in_entryRulePortClass4789);
+            pushFollow(FOLLOW_1);
             iv_rulePortClass=rulePortClass();
 
             state._fsp--;
 
              current =iv_rulePortClass; 
-            match(input,EOF,FOLLOW_EOF_in_entryRulePortClass4799); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -6077,7 +6077,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "rulePortClass"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2465:1: rulePortClass returns [EObject current=null] : ( () otherlv_1= '{' (otherlv_2= 'usercode' ( (lv_userCode_3_0= ruleDetailCode ) ) )? ( ( (lv_msgHandlers_4_0= ruleMessageHandler ) ) | ( (lv_operations_5_0= rulePortOperation ) ) | ( (lv_attributes_6_0= ruleAttribute ) ) )* otherlv_7= '}' ) ;
+    // InternalRoom.g:2465:1: rulePortClass returns [EObject current=null] : ( () otherlv_1= '{' (otherlv_2= 'usercode' ( (lv_userCode_3_0= ruleDetailCode ) ) )? ( ( (lv_msgHandlers_4_0= ruleMessageHandler ) ) | ( (lv_operations_5_0= rulePortOperation ) ) | ( (lv_attributes_6_0= ruleAttribute ) ) )* otherlv_7= '}' ) ;
     public final EObject rulePortClass() throws RecognitionException {
         EObject current = null;
 
@@ -6096,14 +6096,14 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2468:28: ( ( () otherlv_1= '{' (otherlv_2= 'usercode' ( (lv_userCode_3_0= ruleDetailCode ) ) )? ( ( (lv_msgHandlers_4_0= ruleMessageHandler ) ) | ( (lv_operations_5_0= rulePortOperation ) ) | ( (lv_attributes_6_0= ruleAttribute ) ) )* otherlv_7= '}' ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2469:1: ( () otherlv_1= '{' (otherlv_2= 'usercode' ( (lv_userCode_3_0= ruleDetailCode ) ) )? ( ( (lv_msgHandlers_4_0= ruleMessageHandler ) ) | ( (lv_operations_5_0= rulePortOperation ) ) | ( (lv_attributes_6_0= ruleAttribute ) ) )* otherlv_7= '}' )
+            // InternalRoom.g:2468:28: ( ( () otherlv_1= '{' (otherlv_2= 'usercode' ( (lv_userCode_3_0= ruleDetailCode ) ) )? ( ( (lv_msgHandlers_4_0= ruleMessageHandler ) ) | ( (lv_operations_5_0= rulePortOperation ) ) | ( (lv_attributes_6_0= ruleAttribute ) ) )* otherlv_7= '}' ) )
+            // InternalRoom.g:2469:1: ( () otherlv_1= '{' (otherlv_2= 'usercode' ( (lv_userCode_3_0= ruleDetailCode ) ) )? ( ( (lv_msgHandlers_4_0= ruleMessageHandler ) ) | ( (lv_operations_5_0= rulePortOperation ) ) | ( (lv_attributes_6_0= ruleAttribute ) ) )* otherlv_7= '}' )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2469:1: ( () otherlv_1= '{' (otherlv_2= 'usercode' ( (lv_userCode_3_0= ruleDetailCode ) ) )? ( ( (lv_msgHandlers_4_0= ruleMessageHandler ) ) | ( (lv_operations_5_0= rulePortOperation ) ) | ( (lv_attributes_6_0= ruleAttribute ) ) )* otherlv_7= '}' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2469:2: () otherlv_1= '{' (otherlv_2= 'usercode' ( (lv_userCode_3_0= ruleDetailCode ) ) )? ( ( (lv_msgHandlers_4_0= ruleMessageHandler ) ) | ( (lv_operations_5_0= rulePortOperation ) ) | ( (lv_attributes_6_0= ruleAttribute ) ) )* otherlv_7= '}'
+            // InternalRoom.g:2469:1: ( () otherlv_1= '{' (otherlv_2= 'usercode' ( (lv_userCode_3_0= ruleDetailCode ) ) )? ( ( (lv_msgHandlers_4_0= ruleMessageHandler ) ) | ( (lv_operations_5_0= rulePortOperation ) ) | ( (lv_attributes_6_0= ruleAttribute ) ) )* otherlv_7= '}' )
+            // InternalRoom.g:2469:2: () otherlv_1= '{' (otherlv_2= 'usercode' ( (lv_userCode_3_0= ruleDetailCode ) ) )? ( ( (lv_msgHandlers_4_0= ruleMessageHandler ) ) | ( (lv_operations_5_0= rulePortOperation ) ) | ( (lv_attributes_6_0= ruleAttribute ) ) )* otherlv_7= '}'
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2469:2: ()
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2470:5: 
+            // InternalRoom.g:2469:2: ()
+            // InternalRoom.g:2470:5: 
             {
 
                     current = forceCreateModelElement(
@@ -6113,11 +6113,11 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,13,FOLLOW_13_in_rulePortClass4845); 
+            otherlv_1=(Token)match(input,13,FOLLOW_57); 
 
                 	newLeafNode(otherlv_1, grammarAccess.getPortClassAccess().getLeftCurlyBracketKeyword_1());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2479:1: (otherlv_2= 'usercode' ( (lv_userCode_3_0= ruleDetailCode ) ) )?
+            // InternalRoom.g:2479:1: (otherlv_2= 'usercode' ( (lv_userCode_3_0= ruleDetailCode ) ) )?
             int alt62=2;
             int LA62_0 = input.LA(1);
 
@@ -6126,22 +6126,22 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt62) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2479:3: otherlv_2= 'usercode' ( (lv_userCode_3_0= ruleDetailCode ) )
+                    // InternalRoom.g:2479:3: otherlv_2= 'usercode' ( (lv_userCode_3_0= ruleDetailCode ) )
                     {
-                    otherlv_2=(Token)match(input,51,FOLLOW_51_in_rulePortClass4858); 
+                    otherlv_2=(Token)match(input,51,FOLLOW_5); 
 
                         	newLeafNode(otherlv_2, grammarAccess.getPortClassAccess().getUsercodeKeyword_2_0());
                         
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2483:1: ( (lv_userCode_3_0= ruleDetailCode ) )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2484:1: (lv_userCode_3_0= ruleDetailCode )
+                    // InternalRoom.g:2483:1: ( (lv_userCode_3_0= ruleDetailCode ) )
+                    // InternalRoom.g:2484:1: (lv_userCode_3_0= ruleDetailCode )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2484:1: (lv_userCode_3_0= ruleDetailCode )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2485:3: lv_userCode_3_0= ruleDetailCode
+                    // InternalRoom.g:2484:1: (lv_userCode_3_0= ruleDetailCode )
+                    // InternalRoom.g:2485:3: lv_userCode_3_0= ruleDetailCode
                     {
                      
                     	        newCompositeNode(grammarAccess.getPortClassAccess().getUserCodeDetailCodeParserRuleCall_2_1_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDetailCode_in_rulePortClass4879);
+                    pushFollow(FOLLOW_58);
                     lv_userCode_3_0=ruleDetailCode();
 
                     state._fsp--;
@@ -6154,7 +6154,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"userCode",
                             		lv_userCode_3_0, 
-                            		"DetailCode");
+                            		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -6169,7 +6169,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2501:4: ( ( (lv_msgHandlers_4_0= ruleMessageHandler ) ) | ( (lv_operations_5_0= rulePortOperation ) ) | ( (lv_attributes_6_0= ruleAttribute ) ) )*
+            // InternalRoom.g:2501:4: ( ( (lv_msgHandlers_4_0= ruleMessageHandler ) ) | ( (lv_operations_5_0= rulePortOperation ) ) | ( (lv_attributes_6_0= ruleAttribute ) ) )*
             loop63:
             do {
                 int alt63=4;
@@ -6194,18 +6194,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                 switch (alt63) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2501:5: ( (lv_msgHandlers_4_0= ruleMessageHandler ) )
+            	    // InternalRoom.g:2501:5: ( (lv_msgHandlers_4_0= ruleMessageHandler ) )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2501:5: ( (lv_msgHandlers_4_0= ruleMessageHandler ) )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2502:1: (lv_msgHandlers_4_0= ruleMessageHandler )
+            	    // InternalRoom.g:2501:5: ( (lv_msgHandlers_4_0= ruleMessageHandler ) )
+            	    // InternalRoom.g:2502:1: (lv_msgHandlers_4_0= ruleMessageHandler )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2502:1: (lv_msgHandlers_4_0= ruleMessageHandler )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2503:3: lv_msgHandlers_4_0= ruleMessageHandler
+            	    // InternalRoom.g:2502:1: (lv_msgHandlers_4_0= ruleMessageHandler )
+            	    // InternalRoom.g:2503:3: lv_msgHandlers_4_0= ruleMessageHandler
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getPortClassAccess().getMsgHandlersMessageHandlerParserRuleCall_3_0_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleMessageHandler_in_rulePortClass4903);
+            	    pushFollow(FOLLOW_58);
             	    lv_msgHandlers_4_0=ruleMessageHandler();
 
             	    state._fsp--;
@@ -6218,7 +6218,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"msgHandlers",
             	            		lv_msgHandlers_4_0, 
-            	            		"MessageHandler");
+            	            		"org.eclipse.etrice.core.Room.MessageHandler");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -6231,18 +6231,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 2 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2520:6: ( (lv_operations_5_0= rulePortOperation ) )
+            	    // InternalRoom.g:2520:6: ( (lv_operations_5_0= rulePortOperation ) )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2520:6: ( (lv_operations_5_0= rulePortOperation ) )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2521:1: (lv_operations_5_0= rulePortOperation )
+            	    // InternalRoom.g:2520:6: ( (lv_operations_5_0= rulePortOperation ) )
+            	    // InternalRoom.g:2521:1: (lv_operations_5_0= rulePortOperation )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2521:1: (lv_operations_5_0= rulePortOperation )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2522:3: lv_operations_5_0= rulePortOperation
+            	    // InternalRoom.g:2521:1: (lv_operations_5_0= rulePortOperation )
+            	    // InternalRoom.g:2522:3: lv_operations_5_0= rulePortOperation
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getPortClassAccess().getOperationsPortOperationParserRuleCall_3_1_0()); 
             	    	    
-            	    pushFollow(FOLLOW_rulePortOperation_in_rulePortClass4930);
+            	    pushFollow(FOLLOW_58);
             	    lv_operations_5_0=rulePortOperation();
 
             	    state._fsp--;
@@ -6255,7 +6255,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"operations",
             	            		lv_operations_5_0, 
-            	            		"PortOperation");
+            	            		"org.eclipse.etrice.core.Room.PortOperation");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -6268,18 +6268,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 3 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2539:6: ( (lv_attributes_6_0= ruleAttribute ) )
+            	    // InternalRoom.g:2539:6: ( (lv_attributes_6_0= ruleAttribute ) )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2539:6: ( (lv_attributes_6_0= ruleAttribute ) )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2540:1: (lv_attributes_6_0= ruleAttribute )
+            	    // InternalRoom.g:2539:6: ( (lv_attributes_6_0= ruleAttribute ) )
+            	    // InternalRoom.g:2540:1: (lv_attributes_6_0= ruleAttribute )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2540:1: (lv_attributes_6_0= ruleAttribute )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2541:3: lv_attributes_6_0= ruleAttribute
+            	    // InternalRoom.g:2540:1: (lv_attributes_6_0= ruleAttribute )
+            	    // InternalRoom.g:2541:3: lv_attributes_6_0= ruleAttribute
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getPortClassAccess().getAttributesAttributeParserRuleCall_3_2_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleAttribute_in_rulePortClass4957);
+            	    pushFollow(FOLLOW_58);
             	    lv_attributes_6_0=ruleAttribute();
 
             	    state._fsp--;
@@ -6292,7 +6292,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"attributes",
             	            		lv_attributes_6_0, 
-            	            		"Attribute");
+            	            		"org.eclipse.etrice.core.Room.Attribute");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -6310,7 +6310,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                 }
             } while (true);
 
-            otherlv_7=(Token)match(input,14,FOLLOW_14_in_rulePortClass4971); 
+            otherlv_7=(Token)match(input,14,FOLLOW_2); 
 
                 	newLeafNode(otherlv_7, grammarAccess.getPortClassAccess().getRightCurlyBracketKeyword_4());
                 
@@ -6335,7 +6335,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleMessageHandler"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2569:1: entryRuleMessageHandler returns [EObject current=null] : iv_ruleMessageHandler= ruleMessageHandler EOF ;
+    // InternalRoom.g:2569:1: entryRuleMessageHandler returns [EObject current=null] : iv_ruleMessageHandler= ruleMessageHandler EOF ;
     public final EObject entryRuleMessageHandler() throws RecognitionException {
         EObject current = null;
 
@@ -6343,17 +6343,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2570:2: (iv_ruleMessageHandler= ruleMessageHandler EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2571:2: iv_ruleMessageHandler= ruleMessageHandler EOF
+            // InternalRoom.g:2570:2: (iv_ruleMessageHandler= ruleMessageHandler EOF )
+            // InternalRoom.g:2571:2: iv_ruleMessageHandler= ruleMessageHandler EOF
             {
              newCompositeNode(grammarAccess.getMessageHandlerRule()); 
-            pushFollow(FOLLOW_ruleMessageHandler_in_entryRuleMessageHandler5007);
+            pushFollow(FOLLOW_1);
             iv_ruleMessageHandler=ruleMessageHandler();
 
             state._fsp--;
 
              current =iv_ruleMessageHandler; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleMessageHandler5017); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -6371,7 +6371,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleMessageHandler"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2578:1: ruleMessageHandler returns [EObject current=null] : (this_InMessageHandler_0= ruleInMessageHandler | this_OutMessageHandler_1= ruleOutMessageHandler ) ;
+    // InternalRoom.g:2578:1: ruleMessageHandler returns [EObject current=null] : (this_InMessageHandler_0= ruleInMessageHandler | this_OutMessageHandler_1= ruleOutMessageHandler ) ;
     public final EObject ruleMessageHandler() throws RecognitionException {
         EObject current = null;
 
@@ -6383,10 +6383,10 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2581:28: ( (this_InMessageHandler_0= ruleInMessageHandler | this_OutMessageHandler_1= ruleOutMessageHandler ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2582:1: (this_InMessageHandler_0= ruleInMessageHandler | this_OutMessageHandler_1= ruleOutMessageHandler )
+            // InternalRoom.g:2581:28: ( (this_InMessageHandler_0= ruleInMessageHandler | this_OutMessageHandler_1= ruleOutMessageHandler ) )
+            // InternalRoom.g:2582:1: (this_InMessageHandler_0= ruleInMessageHandler | this_OutMessageHandler_1= ruleOutMessageHandler )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2582:1: (this_InMessageHandler_0= ruleInMessageHandler | this_OutMessageHandler_1= ruleOutMessageHandler )
+            // InternalRoom.g:2582:1: (this_InMessageHandler_0= ruleInMessageHandler | this_OutMessageHandler_1= ruleOutMessageHandler )
             int alt64=2;
             int LA64_0 = input.LA(1);
 
@@ -6414,12 +6414,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt64) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2583:5: this_InMessageHandler_0= ruleInMessageHandler
+                    // InternalRoom.g:2583:5: this_InMessageHandler_0= ruleInMessageHandler
                     {
                      
                             newCompositeNode(grammarAccess.getMessageHandlerAccess().getInMessageHandlerParserRuleCall_0()); 
                         
-                    pushFollow(FOLLOW_ruleInMessageHandler_in_ruleMessageHandler5064);
+                    pushFollow(FOLLOW_2);
                     this_InMessageHandler_0=ruleInMessageHandler();
 
                     state._fsp--;
@@ -6432,12 +6432,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2593:5: this_OutMessageHandler_1= ruleOutMessageHandler
+                    // InternalRoom.g:2593:5: this_OutMessageHandler_1= ruleOutMessageHandler
                     {
                      
                             newCompositeNode(grammarAccess.getMessageHandlerAccess().getOutMessageHandlerParserRuleCall_1()); 
                         
-                    pushFollow(FOLLOW_ruleOutMessageHandler_in_ruleMessageHandler5091);
+                    pushFollow(FOLLOW_2);
                     this_OutMessageHandler_1=ruleOutMessageHandler();
 
                     state._fsp--;
@@ -6470,7 +6470,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleInMessageHandler"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2609:1: entryRuleInMessageHandler returns [EObject current=null] : iv_ruleInMessageHandler= ruleInMessageHandler EOF ;
+    // InternalRoom.g:2609:1: entryRuleInMessageHandler returns [EObject current=null] : iv_ruleInMessageHandler= ruleInMessageHandler EOF ;
     public final EObject entryRuleInMessageHandler() throws RecognitionException {
         EObject current = null;
 
@@ -6478,17 +6478,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2610:2: (iv_ruleInMessageHandler= ruleInMessageHandler EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2611:2: iv_ruleInMessageHandler= ruleInMessageHandler EOF
+            // InternalRoom.g:2610:2: (iv_ruleInMessageHandler= ruleInMessageHandler EOF )
+            // InternalRoom.g:2611:2: iv_ruleInMessageHandler= ruleInMessageHandler EOF
             {
              newCompositeNode(grammarAccess.getInMessageHandlerRule()); 
-            pushFollow(FOLLOW_ruleInMessageHandler_in_entryRuleInMessageHandler5126);
+            pushFollow(FOLLOW_1);
             iv_ruleInMessageHandler=ruleInMessageHandler();
 
             state._fsp--;
 
              current =iv_ruleInMessageHandler; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleInMessageHandler5136); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -6506,7 +6506,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleInMessageHandler"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2618:1: ruleInMessageHandler returns [EObject current=null] : (otherlv_0= 'handle' otherlv_1= 'incoming' ( (otherlv_2= RULE_ID ) ) ( (lv_detailCode_3_0= ruleDetailCode ) ) ) ;
+    // InternalRoom.g:2618:1: ruleInMessageHandler returns [EObject current=null] : (otherlv_0= 'handle' otherlv_1= 'incoming' ( (otherlv_2= RULE_ID ) ) ( (lv_detailCode_3_0= ruleDetailCode ) ) ) ;
     public final EObject ruleInMessageHandler() throws RecognitionException {
         EObject current = null;
 
@@ -6519,32 +6519,32 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2621:28: ( (otherlv_0= 'handle' otherlv_1= 'incoming' ( (otherlv_2= RULE_ID ) ) ( (lv_detailCode_3_0= ruleDetailCode ) ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2622:1: (otherlv_0= 'handle' otherlv_1= 'incoming' ( (otherlv_2= RULE_ID ) ) ( (lv_detailCode_3_0= ruleDetailCode ) ) )
+            // InternalRoom.g:2621:28: ( (otherlv_0= 'handle' otherlv_1= 'incoming' ( (otherlv_2= RULE_ID ) ) ( (lv_detailCode_3_0= ruleDetailCode ) ) ) )
+            // InternalRoom.g:2622:1: (otherlv_0= 'handle' otherlv_1= 'incoming' ( (otherlv_2= RULE_ID ) ) ( (lv_detailCode_3_0= ruleDetailCode ) ) )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2622:1: (otherlv_0= 'handle' otherlv_1= 'incoming' ( (otherlv_2= RULE_ID ) ) ( (lv_detailCode_3_0= ruleDetailCode ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2622:3: otherlv_0= 'handle' otherlv_1= 'incoming' ( (otherlv_2= RULE_ID ) ) ( (lv_detailCode_3_0= ruleDetailCode ) )
+            // InternalRoom.g:2622:1: (otherlv_0= 'handle' otherlv_1= 'incoming' ( (otherlv_2= RULE_ID ) ) ( (lv_detailCode_3_0= ruleDetailCode ) ) )
+            // InternalRoom.g:2622:3: otherlv_0= 'handle' otherlv_1= 'incoming' ( (otherlv_2= RULE_ID ) ) ( (lv_detailCode_3_0= ruleDetailCode ) )
             {
-            otherlv_0=(Token)match(input,52,FOLLOW_52_in_ruleInMessageHandler5173); 
+            otherlv_0=(Token)match(input,52,FOLLOW_59); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getInMessageHandlerAccess().getHandleKeyword_0());
                 
-            otherlv_1=(Token)match(input,42,FOLLOW_42_in_ruleInMessageHandler5185); 
+            otherlv_1=(Token)match(input,42,FOLLOW_3); 
 
                 	newLeafNode(otherlv_1, grammarAccess.getInMessageHandlerAccess().getIncomingKeyword_1());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2630:1: ( (otherlv_2= RULE_ID ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2631:1: (otherlv_2= RULE_ID )
+            // InternalRoom.g:2630:1: ( (otherlv_2= RULE_ID ) )
+            // InternalRoom.g:2631:1: (otherlv_2= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2631:1: (otherlv_2= RULE_ID )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2632:3: otherlv_2= RULE_ID
+            // InternalRoom.g:2631:1: (otherlv_2= RULE_ID )
+            // InternalRoom.g:2632:3: otherlv_2= RULE_ID
             {
 
             			if (current==null) {
             	            current = createModelElement(grammarAccess.getInMessageHandlerRule());
             	        }
                     
-            otherlv_2=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleInMessageHandler5205); 
+            otherlv_2=(Token)match(input,RULE_ID,FOLLOW_5); 
 
             		newLeafNode(otherlv_2, grammarAccess.getInMessageHandlerAccess().getMsgMessageCrossReference_2_0()); 
             	
@@ -6554,16 +6554,16 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2643:2: ( (lv_detailCode_3_0= ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2644:1: (lv_detailCode_3_0= ruleDetailCode )
+            // InternalRoom.g:2643:2: ( (lv_detailCode_3_0= ruleDetailCode ) )
+            // InternalRoom.g:2644:1: (lv_detailCode_3_0= ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2644:1: (lv_detailCode_3_0= ruleDetailCode )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2645:3: lv_detailCode_3_0= ruleDetailCode
+            // InternalRoom.g:2644:1: (lv_detailCode_3_0= ruleDetailCode )
+            // InternalRoom.g:2645:3: lv_detailCode_3_0= ruleDetailCode
             {
              
             	        newCompositeNode(grammarAccess.getInMessageHandlerAccess().getDetailCodeDetailCodeParserRuleCall_3_0()); 
             	    
-            pushFollow(FOLLOW_ruleDetailCode_in_ruleInMessageHandler5226);
+            pushFollow(FOLLOW_2);
             lv_detailCode_3_0=ruleDetailCode();
 
             state._fsp--;
@@ -6576,7 +6576,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"detailCode",
                     		lv_detailCode_3_0, 
-                    		"DetailCode");
+                    		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -6606,7 +6606,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleOutMessageHandler"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2669:1: entryRuleOutMessageHandler returns [EObject current=null] : iv_ruleOutMessageHandler= ruleOutMessageHandler EOF ;
+    // InternalRoom.g:2669:1: entryRuleOutMessageHandler returns [EObject current=null] : iv_ruleOutMessageHandler= ruleOutMessageHandler EOF ;
     public final EObject entryRuleOutMessageHandler() throws RecognitionException {
         EObject current = null;
 
@@ -6614,17 +6614,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2670:2: (iv_ruleOutMessageHandler= ruleOutMessageHandler EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2671:2: iv_ruleOutMessageHandler= ruleOutMessageHandler EOF
+            // InternalRoom.g:2670:2: (iv_ruleOutMessageHandler= ruleOutMessageHandler EOF )
+            // InternalRoom.g:2671:2: iv_ruleOutMessageHandler= ruleOutMessageHandler EOF
             {
              newCompositeNode(grammarAccess.getOutMessageHandlerRule()); 
-            pushFollow(FOLLOW_ruleOutMessageHandler_in_entryRuleOutMessageHandler5262);
+            pushFollow(FOLLOW_1);
             iv_ruleOutMessageHandler=ruleOutMessageHandler();
 
             state._fsp--;
 
              current =iv_ruleOutMessageHandler; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOutMessageHandler5272); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -6642,7 +6642,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleOutMessageHandler"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2678:1: ruleOutMessageHandler returns [EObject current=null] : (otherlv_0= 'handle' otherlv_1= 'outgoing' ( (otherlv_2= RULE_ID ) ) ( (lv_detailCode_3_0= ruleDetailCode ) ) ) ;
+    // InternalRoom.g:2678:1: ruleOutMessageHandler returns [EObject current=null] : (otherlv_0= 'handle' otherlv_1= 'outgoing' ( (otherlv_2= RULE_ID ) ) ( (lv_detailCode_3_0= ruleDetailCode ) ) ) ;
     public final EObject ruleOutMessageHandler() throws RecognitionException {
         EObject current = null;
 
@@ -6655,32 +6655,32 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2681:28: ( (otherlv_0= 'handle' otherlv_1= 'outgoing' ( (otherlv_2= RULE_ID ) ) ( (lv_detailCode_3_0= ruleDetailCode ) ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2682:1: (otherlv_0= 'handle' otherlv_1= 'outgoing' ( (otherlv_2= RULE_ID ) ) ( (lv_detailCode_3_0= ruleDetailCode ) ) )
+            // InternalRoom.g:2681:28: ( (otherlv_0= 'handle' otherlv_1= 'outgoing' ( (otherlv_2= RULE_ID ) ) ( (lv_detailCode_3_0= ruleDetailCode ) ) ) )
+            // InternalRoom.g:2682:1: (otherlv_0= 'handle' otherlv_1= 'outgoing' ( (otherlv_2= RULE_ID ) ) ( (lv_detailCode_3_0= ruleDetailCode ) ) )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2682:1: (otherlv_0= 'handle' otherlv_1= 'outgoing' ( (otherlv_2= RULE_ID ) ) ( (lv_detailCode_3_0= ruleDetailCode ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2682:3: otherlv_0= 'handle' otherlv_1= 'outgoing' ( (otherlv_2= RULE_ID ) ) ( (lv_detailCode_3_0= ruleDetailCode ) )
+            // InternalRoom.g:2682:1: (otherlv_0= 'handle' otherlv_1= 'outgoing' ( (otherlv_2= RULE_ID ) ) ( (lv_detailCode_3_0= ruleDetailCode ) ) )
+            // InternalRoom.g:2682:3: otherlv_0= 'handle' otherlv_1= 'outgoing' ( (otherlv_2= RULE_ID ) ) ( (lv_detailCode_3_0= ruleDetailCode ) )
             {
-            otherlv_0=(Token)match(input,52,FOLLOW_52_in_ruleOutMessageHandler5309); 
+            otherlv_0=(Token)match(input,52,FOLLOW_60); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getOutMessageHandlerAccess().getHandleKeyword_0());
                 
-            otherlv_1=(Token)match(input,43,FOLLOW_43_in_ruleOutMessageHandler5321); 
+            otherlv_1=(Token)match(input,43,FOLLOW_3); 
 
                 	newLeafNode(otherlv_1, grammarAccess.getOutMessageHandlerAccess().getOutgoingKeyword_1());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2690:1: ( (otherlv_2= RULE_ID ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2691:1: (otherlv_2= RULE_ID )
+            // InternalRoom.g:2690:1: ( (otherlv_2= RULE_ID ) )
+            // InternalRoom.g:2691:1: (otherlv_2= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2691:1: (otherlv_2= RULE_ID )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2692:3: otherlv_2= RULE_ID
+            // InternalRoom.g:2691:1: (otherlv_2= RULE_ID )
+            // InternalRoom.g:2692:3: otherlv_2= RULE_ID
             {
 
             			if (current==null) {
             	            current = createModelElement(grammarAccess.getOutMessageHandlerRule());
             	        }
                     
-            otherlv_2=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleOutMessageHandler5341); 
+            otherlv_2=(Token)match(input,RULE_ID,FOLLOW_5); 
 
             		newLeafNode(otherlv_2, grammarAccess.getOutMessageHandlerAccess().getMsgMessageCrossReference_2_0()); 
             	
@@ -6690,16 +6690,16 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2703:2: ( (lv_detailCode_3_0= ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2704:1: (lv_detailCode_3_0= ruleDetailCode )
+            // InternalRoom.g:2703:2: ( (lv_detailCode_3_0= ruleDetailCode ) )
+            // InternalRoom.g:2704:1: (lv_detailCode_3_0= ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2704:1: (lv_detailCode_3_0= ruleDetailCode )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2705:3: lv_detailCode_3_0= ruleDetailCode
+            // InternalRoom.g:2704:1: (lv_detailCode_3_0= ruleDetailCode )
+            // InternalRoom.g:2705:3: lv_detailCode_3_0= ruleDetailCode
             {
              
             	        newCompositeNode(grammarAccess.getOutMessageHandlerAccess().getDetailCodeDetailCodeParserRuleCall_3_0()); 
             	    
-            pushFollow(FOLLOW_ruleDetailCode_in_ruleOutMessageHandler5362);
+            pushFollow(FOLLOW_2);
             lv_detailCode_3_0=ruleDetailCode();
 
             state._fsp--;
@@ -6712,7 +6712,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"detailCode",
                     		lv_detailCode_3_0, 
-                    		"DetailCode");
+                    		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -6742,7 +6742,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleModelComponent"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2729:1: entryRuleModelComponent returns [EObject current=null] : iv_ruleModelComponent= ruleModelComponent EOF ;
+    // InternalRoom.g:2729:1: entryRuleModelComponent returns [EObject current=null] : iv_ruleModelComponent= ruleModelComponent EOF ;
     public final EObject entryRuleModelComponent() throws RecognitionException {
         EObject current = null;
 
@@ -6750,17 +6750,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2730:2: (iv_ruleModelComponent= ruleModelComponent EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2731:2: iv_ruleModelComponent= ruleModelComponent EOF
+            // InternalRoom.g:2730:2: (iv_ruleModelComponent= ruleModelComponent EOF )
+            // InternalRoom.g:2731:2: iv_ruleModelComponent= ruleModelComponent EOF
             {
              newCompositeNode(grammarAccess.getModelComponentRule()); 
-            pushFollow(FOLLOW_ruleModelComponent_in_entryRuleModelComponent5398);
+            pushFollow(FOLLOW_1);
             iv_ruleModelComponent=ruleModelComponent();
 
             state._fsp--;
 
              current =iv_ruleModelComponent; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleModelComponent5408); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -6778,7 +6778,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleModelComponent"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2738:1: ruleModelComponent returns [EObject current=null] : this_ActorClass_0= ruleActorClass ;
+    // InternalRoom.g:2738:1: ruleModelComponent returns [EObject current=null] : this_ActorClass_0= ruleActorClass ;
     public final EObject ruleModelComponent() throws RecognitionException {
         EObject current = null;
 
@@ -6788,13 +6788,13 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2741:28: (this_ActorClass_0= ruleActorClass )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2743:5: this_ActorClass_0= ruleActorClass
+            // InternalRoom.g:2741:28: (this_ActorClass_0= ruleActorClass )
+            // InternalRoom.g:2743:5: this_ActorClass_0= ruleActorClass
             {
              
                     newCompositeNode(grammarAccess.getModelComponentAccess().getActorClassParserRuleCall()); 
                 
-            pushFollow(FOLLOW_ruleActorClass_in_ruleModelComponent5454);
+            pushFollow(FOLLOW_2);
             this_ActorClass_0=ruleActorClass();
 
             state._fsp--;
@@ -6821,7 +6821,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleActorClass"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2759:1: entryRuleActorClass returns [EObject current=null] : iv_ruleActorClass= ruleActorClass EOF ;
+    // InternalRoom.g:2759:1: entryRuleActorClass returns [EObject current=null] : iv_ruleActorClass= ruleActorClass EOF ;
     public final EObject entryRuleActorClass() throws RecognitionException {
         EObject current = null;
 
@@ -6829,17 +6829,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2760:2: (iv_ruleActorClass= ruleActorClass EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2761:2: iv_ruleActorClass= ruleActorClass EOF
+            // InternalRoom.g:2760:2: (iv_ruleActorClass= ruleActorClass EOF )
+            // InternalRoom.g:2761:2: iv_ruleActorClass= ruleActorClass EOF
             {
              newCompositeNode(grammarAccess.getActorClassRule()); 
-            pushFollow(FOLLOW_ruleActorClass_in_entryRuleActorClass5488);
+            pushFollow(FOLLOW_1);
             iv_ruleActorClass=ruleActorClass();
 
             state._fsp--;
 
              current =iv_ruleActorClass; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleActorClass5498); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -6857,7 +6857,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleActorClass"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2768:1: ruleActorClass returns [EObject current=null] : ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )* ) ) ) otherlv_3= 'ActorClass' ( (lv_name_4_0= RULE_ID ) ) ( (lv_docu_5_0= ruleDocumentation ) )? (otherlv_6= 'extends' ( ( ruleFQN ) ) )? otherlv_8= '{' ( (lv_annotations_9_0= ruleAnnotation ) )* (otherlv_10= 'Interface' otherlv_11= '{' ( ( (lv_serviceProvisionPoints_12_0= ruleSPP ) ) | ( (lv_interfacePorts_13_0= rulePort ) ) )* otherlv_14= '}' )? (otherlv_15= 'Structure' ( (lv_structureDocu_16_0= ruleDocumentation ) )? otherlv_17= '{' (otherlv_18= 'usercode1' ( (lv_userCode1_19_0= ruleDetailCode ) ) )? (otherlv_20= 'usercode2' ( (lv_userCode2_21_0= ruleDetailCode ) ) )? (otherlv_22= 'usercode3' ( (lv_userCode3_23_0= ruleDetailCode ) ) )? ( ( (lv_connections_24_0= ruleLayerConnection ) ) | ( (lv_bindings_25_0= ruleBinding ) ) | ( (lv_serviceImplementations_26_0= ruleServiceImplementation ) ) | ( (lv_attributes_27_0= ruleAttribute ) ) | ( (lv_actorRefs_28_0= ruleActorRef ) ) | ( (lv_serviceAccessPoints_29_0= ruleSAP ) ) | ( (lv_internalPorts_30_0= rulePort ) ) | ( (lv_externalPorts_31_0= ruleExternalPort ) ) )* otherlv_32= '}' )? (otherlv_33= 'Behavior' ( (lv_behaviorDocu_34_0= ruleDocumentation ) )? otherlv_35= '{' ( (lv_behaviorAnnotations_36_0= ruleAnnotation ) )* ( ( (lv_operations_37_0= ruleStandardOperation ) ) | ( (lv_structors_38_0= ruleClassStructor ) ) )* ( (lv_stateMachine_39_0= ruleStateMachine ) )? otherlv_40= '}' )? otherlv_41= '}' ) ;
+    // InternalRoom.g:2768:1: ruleActorClass returns [EObject current=null] : ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )* ) ) ) otherlv_3= 'ActorClass' ( (lv_name_4_0= RULE_ID ) ) ( (lv_docu_5_0= ruleDocumentation ) )? (otherlv_6= 'extends' ( ( ruleFQN ) ) )? otherlv_8= '{' ( (lv_annotations_9_0= ruleAnnotation ) )* (otherlv_10= 'Interface' otherlv_11= '{' ( ( (lv_serviceProvisionPoints_12_0= ruleSPP ) ) | ( (lv_interfacePorts_13_0= rulePort ) ) )* otherlv_14= '}' )? (otherlv_15= 'Structure' ( (lv_structureDocu_16_0= ruleDocumentation ) )? otherlv_17= '{' (otherlv_18= 'usercode1' ( (lv_userCode1_19_0= ruleDetailCode ) ) )? (otherlv_20= 'usercode2' ( (lv_userCode2_21_0= ruleDetailCode ) ) )? (otherlv_22= 'usercode3' ( (lv_userCode3_23_0= ruleDetailCode ) ) )? ( ( (lv_connections_24_0= ruleLayerConnection ) ) | ( (lv_bindings_25_0= ruleBinding ) ) | ( (lv_serviceImplementations_26_0= ruleServiceImplementation ) ) | ( (lv_attributes_27_0= ruleAttribute ) ) | ( (lv_actorRefs_28_0= ruleActorRef ) ) | ( (lv_serviceAccessPoints_29_0= ruleSAP ) ) | ( (lv_internalPorts_30_0= rulePort ) ) | ( (lv_externalPorts_31_0= ruleExternalPort ) ) )* otherlv_32= '}' )? (otherlv_33= 'Behavior' ( (lv_behaviorDocu_34_0= ruleDocumentation ) )? otherlv_35= '{' ( (lv_behaviorAnnotations_36_0= ruleAnnotation ) )* ( ( (lv_operations_37_0= ruleStandardOperation ) ) | ( (lv_structors_38_0= ruleClassStructor ) ) )* ( (lv_stateMachine_39_0= ruleStateMachine ) )? otherlv_40= '}' )? otherlv_41= '}' ) ;
     public final EObject ruleActorClass() throws RecognitionException {
         EObject current = null;
 
@@ -6927,67 +6927,67 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2771:28: ( ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )* ) ) ) otherlv_3= 'ActorClass' ( (lv_name_4_0= RULE_ID ) ) ( (lv_docu_5_0= ruleDocumentation ) )? (otherlv_6= 'extends' ( ( ruleFQN ) ) )? otherlv_8= '{' ( (lv_annotations_9_0= ruleAnnotation ) )* (otherlv_10= 'Interface' otherlv_11= '{' ( ( (lv_serviceProvisionPoints_12_0= ruleSPP ) ) | ( (lv_interfacePorts_13_0= rulePort ) ) )* otherlv_14= '}' )? (otherlv_15= 'Structure' ( (lv_structureDocu_16_0= ruleDocumentation ) )? otherlv_17= '{' (otherlv_18= 'usercode1' ( (lv_userCode1_19_0= ruleDetailCode ) ) )? (otherlv_20= 'usercode2' ( (lv_userCode2_21_0= ruleDetailCode ) ) )? (otherlv_22= 'usercode3' ( (lv_userCode3_23_0= ruleDetailCode ) ) )? ( ( (lv_connections_24_0= ruleLayerConnection ) ) | ( (lv_bindings_25_0= ruleBinding ) ) | ( (lv_serviceImplementations_26_0= ruleServiceImplementation ) ) | ( (lv_attributes_27_0= ruleAttribute ) ) | ( (lv_actorRefs_28_0= ruleActorRef ) ) | ( (lv_serviceAccessPoints_29_0= ruleSAP ) ) | ( (lv_internalPorts_30_0= rulePort ) ) | ( (lv_externalPorts_31_0= ruleExternalPort ) ) )* otherlv_32= '}' )? (otherlv_33= 'Behavior' ( (lv_behaviorDocu_34_0= ruleDocumentation ) )? otherlv_35= '{' ( (lv_behaviorAnnotations_36_0= ruleAnnotation ) )* ( ( (lv_operations_37_0= ruleStandardOperation ) ) | ( (lv_structors_38_0= ruleClassStructor ) ) )* ( (lv_stateMachine_39_0= ruleStateMachine ) )? otherlv_40= '}' )? otherlv_41= '}' ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2772:1: ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )* ) ) ) otherlv_3= 'ActorClass' ( (lv_name_4_0= RULE_ID ) ) ( (lv_docu_5_0= ruleDocumentation ) )? (otherlv_6= 'extends' ( ( ruleFQN ) ) )? otherlv_8= '{' ( (lv_annotations_9_0= ruleAnnotation ) )* (otherlv_10= 'Interface' otherlv_11= '{' ( ( (lv_serviceProvisionPoints_12_0= ruleSPP ) ) | ( (lv_interfacePorts_13_0= rulePort ) ) )* otherlv_14= '}' )? (otherlv_15= 'Structure' ( (lv_structureDocu_16_0= ruleDocumentation ) )? otherlv_17= '{' (otherlv_18= 'usercode1' ( (lv_userCode1_19_0= ruleDetailCode ) ) )? (otherlv_20= 'usercode2' ( (lv_userCode2_21_0= ruleDetailCode ) ) )? (otherlv_22= 'usercode3' ( (lv_userCode3_23_0= ruleDetailCode ) ) )? ( ( (lv_connections_24_0= ruleLayerConnection ) ) | ( (lv_bindings_25_0= ruleBinding ) ) | ( (lv_serviceImplementations_26_0= ruleServiceImplementation ) ) | ( (lv_attributes_27_0= ruleAttribute ) ) | ( (lv_actorRefs_28_0= ruleActorRef ) ) | ( (lv_serviceAccessPoints_29_0= ruleSAP ) ) | ( (lv_internalPorts_30_0= rulePort ) ) | ( (lv_externalPorts_31_0= ruleExternalPort ) ) )* otherlv_32= '}' )? (otherlv_33= 'Behavior' ( (lv_behaviorDocu_34_0= ruleDocumentation ) )? otherlv_35= '{' ( (lv_behaviorAnnotations_36_0= ruleAnnotation ) )* ( ( (lv_operations_37_0= ruleStandardOperation ) ) | ( (lv_structors_38_0= ruleClassStructor ) ) )* ( (lv_stateMachine_39_0= ruleStateMachine ) )? otherlv_40= '}' )? otherlv_41= '}' )
+            // InternalRoom.g:2771:28: ( ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )* ) ) ) otherlv_3= 'ActorClass' ( (lv_name_4_0= RULE_ID ) ) ( (lv_docu_5_0= ruleDocumentation ) )? (otherlv_6= 'extends' ( ( ruleFQN ) ) )? otherlv_8= '{' ( (lv_annotations_9_0= ruleAnnotation ) )* (otherlv_10= 'Interface' otherlv_11= '{' ( ( (lv_serviceProvisionPoints_12_0= ruleSPP ) ) | ( (lv_interfacePorts_13_0= rulePort ) ) )* otherlv_14= '}' )? (otherlv_15= 'Structure' ( (lv_structureDocu_16_0= ruleDocumentation ) )? otherlv_17= '{' (otherlv_18= 'usercode1' ( (lv_userCode1_19_0= ruleDetailCode ) ) )? (otherlv_20= 'usercode2' ( (lv_userCode2_21_0= ruleDetailCode ) ) )? (otherlv_22= 'usercode3' ( (lv_userCode3_23_0= ruleDetailCode ) ) )? ( ( (lv_connections_24_0= ruleLayerConnection ) ) | ( (lv_bindings_25_0= ruleBinding ) ) | ( (lv_serviceImplementations_26_0= ruleServiceImplementation ) ) | ( (lv_attributes_27_0= ruleAttribute ) ) | ( (lv_actorRefs_28_0= ruleActorRef ) ) | ( (lv_serviceAccessPoints_29_0= ruleSAP ) ) | ( (lv_internalPorts_30_0= rulePort ) ) | ( (lv_externalPorts_31_0= ruleExternalPort ) ) )* otherlv_32= '}' )? (otherlv_33= 'Behavior' ( (lv_behaviorDocu_34_0= ruleDocumentation ) )? otherlv_35= '{' ( (lv_behaviorAnnotations_36_0= ruleAnnotation ) )* ( ( (lv_operations_37_0= ruleStandardOperation ) ) | ( (lv_structors_38_0= ruleClassStructor ) ) )* ( (lv_stateMachine_39_0= ruleStateMachine ) )? otherlv_40= '}' )? otherlv_41= '}' ) )
+            // InternalRoom.g:2772:1: ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )* ) ) ) otherlv_3= 'ActorClass' ( (lv_name_4_0= RULE_ID ) ) ( (lv_docu_5_0= ruleDocumentation ) )? (otherlv_6= 'extends' ( ( ruleFQN ) ) )? otherlv_8= '{' ( (lv_annotations_9_0= ruleAnnotation ) )* (otherlv_10= 'Interface' otherlv_11= '{' ( ( (lv_serviceProvisionPoints_12_0= ruleSPP ) ) | ( (lv_interfacePorts_13_0= rulePort ) ) )* otherlv_14= '}' )? (otherlv_15= 'Structure' ( (lv_structureDocu_16_0= ruleDocumentation ) )? otherlv_17= '{' (otherlv_18= 'usercode1' ( (lv_userCode1_19_0= ruleDetailCode ) ) )? (otherlv_20= 'usercode2' ( (lv_userCode2_21_0= ruleDetailCode ) ) )? (otherlv_22= 'usercode3' ( (lv_userCode3_23_0= ruleDetailCode ) ) )? ( ( (lv_connections_24_0= ruleLayerConnection ) ) | ( (lv_bindings_25_0= ruleBinding ) ) | ( (lv_serviceImplementations_26_0= ruleServiceImplementation ) ) | ( (lv_attributes_27_0= ruleAttribute ) ) | ( (lv_actorRefs_28_0= ruleActorRef ) ) | ( (lv_serviceAccessPoints_29_0= ruleSAP ) ) | ( (lv_internalPorts_30_0= rulePort ) ) | ( (lv_externalPorts_31_0= ruleExternalPort ) ) )* otherlv_32= '}' )? (otherlv_33= 'Behavior' ( (lv_behaviorDocu_34_0= ruleDocumentation ) )? otherlv_35= '{' ( (lv_behaviorAnnotations_36_0= ruleAnnotation ) )* ( ( (lv_operations_37_0= ruleStandardOperation ) ) | ( (lv_structors_38_0= ruleClassStructor ) ) )* ( (lv_stateMachine_39_0= ruleStateMachine ) )? otherlv_40= '}' )? otherlv_41= '}' )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2772:1: ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )* ) ) ) otherlv_3= 'ActorClass' ( (lv_name_4_0= RULE_ID ) ) ( (lv_docu_5_0= ruleDocumentation ) )? (otherlv_6= 'extends' ( ( ruleFQN ) ) )? otherlv_8= '{' ( (lv_annotations_9_0= ruleAnnotation ) )* (otherlv_10= 'Interface' otherlv_11= '{' ( ( (lv_serviceProvisionPoints_12_0= ruleSPP ) ) | ( (lv_interfacePorts_13_0= rulePort ) ) )* otherlv_14= '}' )? (otherlv_15= 'Structure' ( (lv_structureDocu_16_0= ruleDocumentation ) )? otherlv_17= '{' (otherlv_18= 'usercode1' ( (lv_userCode1_19_0= ruleDetailCode ) ) )? (otherlv_20= 'usercode2' ( (lv_userCode2_21_0= ruleDetailCode ) ) )? (otherlv_22= 'usercode3' ( (lv_userCode3_23_0= ruleDetailCode ) ) )? ( ( (lv_connections_24_0= ruleLayerConnection ) ) | ( (lv_bindings_25_0= ruleBinding ) ) | ( (lv_serviceImplementations_26_0= ruleServiceImplementation ) ) | ( (lv_attributes_27_0= ruleAttribute ) ) | ( (lv_actorRefs_28_0= ruleActorRef ) ) | ( (lv_serviceAccessPoints_29_0= ruleSAP ) ) | ( (lv_internalPorts_30_0= rulePort ) ) | ( (lv_externalPorts_31_0= ruleExternalPort ) ) )* otherlv_32= '}' )? (otherlv_33= 'Behavior' ( (lv_behaviorDocu_34_0= ruleDocumentation ) )? otherlv_35= '{' ( (lv_behaviorAnnotations_36_0= ruleAnnotation ) )* ( ( (lv_operations_37_0= ruleStandardOperation ) ) | ( (lv_structors_38_0= ruleClassStructor ) ) )* ( (lv_stateMachine_39_0= ruleStateMachine ) )? otherlv_40= '}' )? otherlv_41= '}' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2772:2: ( ( ( ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )* ) ) ) otherlv_3= 'ActorClass' ( (lv_name_4_0= RULE_ID ) ) ( (lv_docu_5_0= ruleDocumentation ) )? (otherlv_6= 'extends' ( ( ruleFQN ) ) )? otherlv_8= '{' ( (lv_annotations_9_0= ruleAnnotation ) )* (otherlv_10= 'Interface' otherlv_11= '{' ( ( (lv_serviceProvisionPoints_12_0= ruleSPP ) ) | ( (lv_interfacePorts_13_0= rulePort ) ) )* otherlv_14= '}' )? (otherlv_15= 'Structure' ( (lv_structureDocu_16_0= ruleDocumentation ) )? otherlv_17= '{' (otherlv_18= 'usercode1' ( (lv_userCode1_19_0= ruleDetailCode ) ) )? (otherlv_20= 'usercode2' ( (lv_userCode2_21_0= ruleDetailCode ) ) )? (otherlv_22= 'usercode3' ( (lv_userCode3_23_0= ruleDetailCode ) ) )? ( ( (lv_connections_24_0= ruleLayerConnection ) ) | ( (lv_bindings_25_0= ruleBinding ) ) | ( (lv_serviceImplementations_26_0= ruleServiceImplementation ) ) | ( (lv_attributes_27_0= ruleAttribute ) ) | ( (lv_actorRefs_28_0= ruleActorRef ) ) | ( (lv_serviceAccessPoints_29_0= ruleSAP ) ) | ( (lv_internalPorts_30_0= rulePort ) ) | ( (lv_externalPorts_31_0= ruleExternalPort ) ) )* otherlv_32= '}' )? (otherlv_33= 'Behavior' ( (lv_behaviorDocu_34_0= ruleDocumentation ) )? otherlv_35= '{' ( (lv_behaviorAnnotations_36_0= ruleAnnotation ) )* ( ( (lv_operations_37_0= ruleStandardOperation ) ) | ( (lv_structors_38_0= ruleClassStructor ) ) )* ( (lv_stateMachine_39_0= ruleStateMachine ) )? otherlv_40= '}' )? otherlv_41= '}'
+            // InternalRoom.g:2772:1: ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )* ) ) ) otherlv_3= 'ActorClass' ( (lv_name_4_0= RULE_ID ) ) ( (lv_docu_5_0= ruleDocumentation ) )? (otherlv_6= 'extends' ( ( ruleFQN ) ) )? otherlv_8= '{' ( (lv_annotations_9_0= ruleAnnotation ) )* (otherlv_10= 'Interface' otherlv_11= '{' ( ( (lv_serviceProvisionPoints_12_0= ruleSPP ) ) | ( (lv_interfacePorts_13_0= rulePort ) ) )* otherlv_14= '}' )? (otherlv_15= 'Structure' ( (lv_structureDocu_16_0= ruleDocumentation ) )? otherlv_17= '{' (otherlv_18= 'usercode1' ( (lv_userCode1_19_0= ruleDetailCode ) ) )? (otherlv_20= 'usercode2' ( (lv_userCode2_21_0= ruleDetailCode ) ) )? (otherlv_22= 'usercode3' ( (lv_userCode3_23_0= ruleDetailCode ) ) )? ( ( (lv_connections_24_0= ruleLayerConnection ) ) | ( (lv_bindings_25_0= ruleBinding ) ) | ( (lv_serviceImplementations_26_0= ruleServiceImplementation ) ) | ( (lv_attributes_27_0= ruleAttribute ) ) | ( (lv_actorRefs_28_0= ruleActorRef ) ) | ( (lv_serviceAccessPoints_29_0= ruleSAP ) ) | ( (lv_internalPorts_30_0= rulePort ) ) | ( (lv_externalPorts_31_0= ruleExternalPort ) ) )* otherlv_32= '}' )? (otherlv_33= 'Behavior' ( (lv_behaviorDocu_34_0= ruleDocumentation ) )? otherlv_35= '{' ( (lv_behaviorAnnotations_36_0= ruleAnnotation ) )* ( ( (lv_operations_37_0= ruleStandardOperation ) ) | ( (lv_structors_38_0= ruleClassStructor ) ) )* ( (lv_stateMachine_39_0= ruleStateMachine ) )? otherlv_40= '}' )? otherlv_41= '}' )
+            // InternalRoom.g:2772:2: ( ( ( ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )* ) ) ) otherlv_3= 'ActorClass' ( (lv_name_4_0= RULE_ID ) ) ( (lv_docu_5_0= ruleDocumentation ) )? (otherlv_6= 'extends' ( ( ruleFQN ) ) )? otherlv_8= '{' ( (lv_annotations_9_0= ruleAnnotation ) )* (otherlv_10= 'Interface' otherlv_11= '{' ( ( (lv_serviceProvisionPoints_12_0= ruleSPP ) ) | ( (lv_interfacePorts_13_0= rulePort ) ) )* otherlv_14= '}' )? (otherlv_15= 'Structure' ( (lv_structureDocu_16_0= ruleDocumentation ) )? otherlv_17= '{' (otherlv_18= 'usercode1' ( (lv_userCode1_19_0= ruleDetailCode ) ) )? (otherlv_20= 'usercode2' ( (lv_userCode2_21_0= ruleDetailCode ) ) )? (otherlv_22= 'usercode3' ( (lv_userCode3_23_0= ruleDetailCode ) ) )? ( ( (lv_connections_24_0= ruleLayerConnection ) ) | ( (lv_bindings_25_0= ruleBinding ) ) | ( (lv_serviceImplementations_26_0= ruleServiceImplementation ) ) | ( (lv_attributes_27_0= ruleAttribute ) ) | ( (lv_actorRefs_28_0= ruleActorRef ) ) | ( (lv_serviceAccessPoints_29_0= ruleSAP ) ) | ( (lv_internalPorts_30_0= rulePort ) ) | ( (lv_externalPorts_31_0= ruleExternalPort ) ) )* otherlv_32= '}' )? (otherlv_33= 'Behavior' ( (lv_behaviorDocu_34_0= ruleDocumentation ) )? otherlv_35= '{' ( (lv_behaviorAnnotations_36_0= ruleAnnotation ) )* ( ( (lv_operations_37_0= ruleStandardOperation ) ) | ( (lv_structors_38_0= ruleClassStructor ) ) )* ( (lv_stateMachine_39_0= ruleStateMachine ) )? otherlv_40= '}' )? otherlv_41= '}'
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2772:2: ( ( ( ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )* ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2774:1: ( ( ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )* ) )
+            // InternalRoom.g:2772:2: ( ( ( ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )* ) ) )
+            // InternalRoom.g:2774:1: ( ( ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )* ) )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2774:1: ( ( ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )* ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2775:2: ( ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )* )
+            // InternalRoom.g:2774:1: ( ( ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )* ) )
+            // InternalRoom.g:2775:2: ( ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )* )
             {
              
             	  getUnorderedGroupHelper().enter(grammarAccess.getActorClassAccess().getUnorderedGroup_0());
             	
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2778:2: ( ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )* )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2779:3: ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )*
+            // InternalRoom.g:2778:2: ( ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )* )
+            // InternalRoom.g:2779:3: ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )*
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2779:3: ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )*
+            // InternalRoom.g:2779:3: ( ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) ) )*
             loop65:
             do {
                 int alt65=3;
                 int LA65_0 = input.LA(1);
 
-                if ( LA65_0 ==53 && getUnorderedGroupHelper().canSelect(grammarAccess.getActorClassAccess().getUnorderedGroup_0(), 0) ) {
+                if ( LA65_0 == 53 && getUnorderedGroupHelper().canSelect(grammarAccess.getActorClassAccess().getUnorderedGroup_0(), 0) ) {
                     alt65=1;
                 }
-                else if ( ( LA65_0 >=123 && LA65_0<=125 ||LA65_0==127 ) && getUnorderedGroupHelper().canSelect(grammarAccess.getActorClassAccess().getUnorderedGroup_0(), 1) ) {
+                else if ( ( LA65_0 >= 123 && LA65_0 <= 125 || LA65_0 == 127 ) && getUnorderedGroupHelper().canSelect(grammarAccess.getActorClassAccess().getUnorderedGroup_0(), 1) ) {
                     alt65=2;
                 }
 
 
                 switch (alt65) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2781:4: ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) )
+            	    // InternalRoom.g:2781:4: ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2781:4: ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2782:5: {...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) )
+            	    // InternalRoom.g:2781:4: ({...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) ) )
+            	    // InternalRoom.g:2782:5: {...}? => ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) )
             	    {
             	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getActorClassAccess().getUnorderedGroup_0(), 0) ) {
             	        throw new FailedPredicateException(input, "ruleActorClass", "getUnorderedGroupHelper().canSelect(grammarAccess.getActorClassAccess().getUnorderedGroup_0(), 0)");
             	    }
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2782:107: ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2783:6: ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) )
+            	    // InternalRoom.g:2782:107: ( ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) ) )
+            	    // InternalRoom.g:2783:6: ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) )
             	    {
             	     
             	    	 				  getUnorderedGroupHelper().select(grammarAccess.getActorClassAccess().getUnorderedGroup_0(), 0);
             	    	 				
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2786:6: ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2786:7: {...}? => ( (lv_abstract_1_0= 'abstract' ) )
+            	    // InternalRoom.g:2786:6: ({...}? => ( (lv_abstract_1_0= 'abstract' ) ) )
+            	    // InternalRoom.g:2786:7: {...}? => ( (lv_abstract_1_0= 'abstract' ) )
             	    {
             	    if ( !((true)) ) {
             	        throw new FailedPredicateException(input, "ruleActorClass", "true");
             	    }
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2786:16: ( (lv_abstract_1_0= 'abstract' ) )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2787:1: (lv_abstract_1_0= 'abstract' )
+            	    // InternalRoom.g:2786:16: ( (lv_abstract_1_0= 'abstract' ) )
+            	    // InternalRoom.g:2787:1: (lv_abstract_1_0= 'abstract' )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2787:1: (lv_abstract_1_0= 'abstract' )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2788:3: lv_abstract_1_0= 'abstract'
+            	    // InternalRoom.g:2787:1: (lv_abstract_1_0= 'abstract' )
+            	    // InternalRoom.g:2788:3: lv_abstract_1_0= 'abstract'
             	    {
-            	    lv_abstract_1_0=(Token)match(input,53,FOLLOW_53_in_ruleActorClass5586); 
+            	    lv_abstract_1_0=(Token)match(input,53,FOLLOW_61); 
 
             	            newLeafNode(lv_abstract_1_0, grammarAccess.getActorClassAccess().getAbstractAbstractKeyword_0_0_0());
             	        
@@ -7019,36 +7019,36 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 2 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2808:4: ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) )
+            	    // InternalRoom.g:2808:4: ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2808:4: ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2809:5: {...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) )
+            	    // InternalRoom.g:2808:4: ({...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) ) )
+            	    // InternalRoom.g:2809:5: {...}? => ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) )
             	    {
             	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getActorClassAccess().getUnorderedGroup_0(), 1) ) {
             	        throw new FailedPredicateException(input, "ruleActorClass", "getUnorderedGroupHelper().canSelect(grammarAccess.getActorClassAccess().getUnorderedGroup_0(), 1)");
             	    }
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2809:107: ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2810:6: ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) )
+            	    // InternalRoom.g:2809:107: ( ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) ) )
+            	    // InternalRoom.g:2810:6: ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) )
             	    {
             	     
             	    	 				  getUnorderedGroupHelper().select(grammarAccess.getActorClassAccess().getUnorderedGroup_0(), 1);
             	    	 				
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2813:6: ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2813:7: {...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) )
+            	    // InternalRoom.g:2813:6: ({...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) ) )
+            	    // InternalRoom.g:2813:7: {...}? => ( (lv_commType_2_0= ruleComponentCommunicationType ) )
             	    {
             	    if ( !((true)) ) {
             	        throw new FailedPredicateException(input, "ruleActorClass", "true");
             	    }
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2813:16: ( (lv_commType_2_0= ruleComponentCommunicationType ) )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2814:1: (lv_commType_2_0= ruleComponentCommunicationType )
+            	    // InternalRoom.g:2813:16: ( (lv_commType_2_0= ruleComponentCommunicationType ) )
+            	    // InternalRoom.g:2814:1: (lv_commType_2_0= ruleComponentCommunicationType )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2814:1: (lv_commType_2_0= ruleComponentCommunicationType )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2815:3: lv_commType_2_0= ruleComponentCommunicationType
+            	    // InternalRoom.g:2814:1: (lv_commType_2_0= ruleComponentCommunicationType )
+            	    // InternalRoom.g:2815:3: lv_commType_2_0= ruleComponentCommunicationType
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getActorClassAccess().getCommTypeComponentCommunicationTypeEnumRuleCall_0_1_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleComponentCommunicationType_in_ruleActorClass5674);
+            	    pushFollow(FOLLOW_61);
             	    lv_commType_2_0=ruleComponentCommunicationType();
 
             	    state._fsp--;
@@ -7061,7 +7061,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"commType",
             	            		lv_commType_2_0, 
-            	            		"ComponentCommunicationType");
+            	            		"org.eclipse.etrice.core.fsm.FSM.ComponentCommunicationType");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -7103,17 +7103,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_3=(Token)match(input,54,FOLLOW_54_in_ruleActorClass5726); 
+            otherlv_3=(Token)match(input,54,FOLLOW_3); 
 
                 	newLeafNode(otherlv_3, grammarAccess.getActorClassAccess().getActorClassKeyword_1());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2849:1: ( (lv_name_4_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2850:1: (lv_name_4_0= RULE_ID )
+            // InternalRoom.g:2849:1: ( (lv_name_4_0= RULE_ID ) )
+            // InternalRoom.g:2850:1: (lv_name_4_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2850:1: (lv_name_4_0= RULE_ID )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2851:3: lv_name_4_0= RULE_ID
+            // InternalRoom.g:2850:1: (lv_name_4_0= RULE_ID )
+            // InternalRoom.g:2851:3: lv_name_4_0= RULE_ID
             {
-            lv_name_4_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleActorClass5743); 
+            lv_name_4_0=(Token)match(input,RULE_ID,FOLLOW_24); 
 
             			newLeafNode(lv_name_4_0, grammarAccess.getActorClassAccess().getNameIDTerminalRuleCall_2_0()); 
             		
@@ -7125,7 +7125,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"name",
                     		lv_name_4_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -7133,7 +7133,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2867:2: ( (lv_docu_5_0= ruleDocumentation ) )?
+            // InternalRoom.g:2867:2: ( (lv_docu_5_0= ruleDocumentation ) )?
             int alt66=2;
             int LA66_0 = input.LA(1);
 
@@ -7142,15 +7142,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt66) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2868:1: (lv_docu_5_0= ruleDocumentation )
+                    // InternalRoom.g:2868:1: (lv_docu_5_0= ruleDocumentation )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2868:1: (lv_docu_5_0= ruleDocumentation )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2869:3: lv_docu_5_0= ruleDocumentation
+                    // InternalRoom.g:2868:1: (lv_docu_5_0= ruleDocumentation )
+                    // InternalRoom.g:2869:3: lv_docu_5_0= ruleDocumentation
                     {
                      
                     	        newCompositeNode(grammarAccess.getActorClassAccess().getDocuDocumentationParserRuleCall_3_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDocumentation_in_ruleActorClass5769);
+                    pushFollow(FOLLOW_25);
                     lv_docu_5_0=ruleDocumentation();
 
                     state._fsp--;
@@ -7163,7 +7163,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"docu",
                             		lv_docu_5_0, 
-                            		"Documentation");
+                            		"org.eclipse.etrice.core.common.Base.Documentation");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -7175,7 +7175,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2885:3: (otherlv_6= 'extends' ( ( ruleFQN ) ) )?
+            // InternalRoom.g:2885:3: (otherlv_6= 'extends' ( ( ruleFQN ) ) )?
             int alt67=2;
             int LA67_0 = input.LA(1);
 
@@ -7184,17 +7184,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt67) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2885:5: otherlv_6= 'extends' ( ( ruleFQN ) )
+                    // InternalRoom.g:2885:5: otherlv_6= 'extends' ( ( ruleFQN ) )
                     {
-                    otherlv_6=(Token)match(input,28,FOLLOW_28_in_ruleActorClass5783); 
+                    otherlv_6=(Token)match(input,28,FOLLOW_3); 
 
                         	newLeafNode(otherlv_6, grammarAccess.getActorClassAccess().getExtendsKeyword_4_0());
                         
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2889:1: ( ( ruleFQN ) )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2890:1: ( ruleFQN )
+                    // InternalRoom.g:2889:1: ( ( ruleFQN ) )
+                    // InternalRoom.g:2890:1: ( ruleFQN )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2890:1: ( ruleFQN )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2891:3: ruleFQN
+                    // InternalRoom.g:2890:1: ( ruleFQN )
+                    // InternalRoom.g:2891:3: ruleFQN
                     {
 
                     			if (current==null) {
@@ -7204,7 +7204,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                      
                     	        newCompositeNode(grammarAccess.getActorClassAccess().getBaseActorClassCrossReference_4_1_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleFQN_in_ruleActorClass5806);
+                    pushFollow(FOLLOW_5);
                     ruleFQN();
 
                     state._fsp--;
@@ -7224,11 +7224,11 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_8=(Token)match(input,13,FOLLOW_13_in_ruleActorClass5820); 
+            otherlv_8=(Token)match(input,13,FOLLOW_62); 
 
                 	newLeafNode(otherlv_8, grammarAccess.getActorClassAccess().getLeftCurlyBracketKeyword_5());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2908:1: ( (lv_annotations_9_0= ruleAnnotation ) )*
+            // InternalRoom.g:2908:1: ( (lv_annotations_9_0= ruleAnnotation ) )*
             loop68:
             do {
                 int alt68=2;
@@ -7241,15 +7241,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                 switch (alt68) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2909:1: (lv_annotations_9_0= ruleAnnotation )
+            	    // InternalRoom.g:2909:1: (lv_annotations_9_0= ruleAnnotation )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2909:1: (lv_annotations_9_0= ruleAnnotation )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2910:3: lv_annotations_9_0= ruleAnnotation
+            	    // InternalRoom.g:2909:1: (lv_annotations_9_0= ruleAnnotation )
+            	    // InternalRoom.g:2910:3: lv_annotations_9_0= ruleAnnotation
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getActorClassAccess().getAnnotationsAnnotationParserRuleCall_6_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleAnnotation_in_ruleActorClass5841);
+            	    pushFollow(FOLLOW_62);
             	    lv_annotations_9_0=ruleAnnotation();
 
             	    state._fsp--;
@@ -7262,7 +7262,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"annotations",
             	            		lv_annotations_9_0, 
-            	            		"Annotation");
+            	            		"org.eclipse.etrice.core.common.Base.Annotation");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -7277,7 +7277,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                 }
             } while (true);
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2926:3: (otherlv_10= 'Interface' otherlv_11= '{' ( ( (lv_serviceProvisionPoints_12_0= ruleSPP ) ) | ( (lv_interfacePorts_13_0= rulePort ) ) )* otherlv_14= '}' )?
+            // InternalRoom.g:2926:3: (otherlv_10= 'Interface' otherlv_11= '{' ( ( (lv_serviceProvisionPoints_12_0= ruleSPP ) ) | ( (lv_interfacePorts_13_0= rulePort ) ) )* otherlv_14= '}' )?
             int alt70=2;
             int LA70_0 = input.LA(1);
 
@@ -7286,17 +7286,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt70) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2926:5: otherlv_10= 'Interface' otherlv_11= '{' ( ( (lv_serviceProvisionPoints_12_0= ruleSPP ) ) | ( (lv_interfacePorts_13_0= rulePort ) ) )* otherlv_14= '}'
+                    // InternalRoom.g:2926:5: otherlv_10= 'Interface' otherlv_11= '{' ( ( (lv_serviceProvisionPoints_12_0= ruleSPP ) ) | ( (lv_interfacePorts_13_0= rulePort ) ) )* otherlv_14= '}'
                     {
-                    otherlv_10=(Token)match(input,55,FOLLOW_55_in_ruleActorClass5855); 
+                    otherlv_10=(Token)match(input,55,FOLLOW_5); 
 
                         	newLeafNode(otherlv_10, grammarAccess.getActorClassAccess().getInterfaceKeyword_7_0());
                         
-                    otherlv_11=(Token)match(input,13,FOLLOW_13_in_ruleActorClass5867); 
+                    otherlv_11=(Token)match(input,13,FOLLOW_63); 
 
                         	newLeafNode(otherlv_11, grammarAccess.getActorClassAccess().getLeftCurlyBracketKeyword_7_1());
                         
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2934:1: ( ( (lv_serviceProvisionPoints_12_0= ruleSPP ) ) | ( (lv_interfacePorts_13_0= rulePort ) ) )*
+                    // InternalRoom.g:2934:1: ( ( (lv_serviceProvisionPoints_12_0= ruleSPP ) ) | ( (lv_interfacePorts_13_0= rulePort ) ) )*
                     loop69:
                     do {
                         int alt69=3;
@@ -7312,18 +7312,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                         switch (alt69) {
                     	case 1 :
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2934:2: ( (lv_serviceProvisionPoints_12_0= ruleSPP ) )
+                    	    // InternalRoom.g:2934:2: ( (lv_serviceProvisionPoints_12_0= ruleSPP ) )
                     	    {
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2934:2: ( (lv_serviceProvisionPoints_12_0= ruleSPP ) )
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2935:1: (lv_serviceProvisionPoints_12_0= ruleSPP )
+                    	    // InternalRoom.g:2934:2: ( (lv_serviceProvisionPoints_12_0= ruleSPP ) )
+                    	    // InternalRoom.g:2935:1: (lv_serviceProvisionPoints_12_0= ruleSPP )
                     	    {
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2935:1: (lv_serviceProvisionPoints_12_0= ruleSPP )
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2936:3: lv_serviceProvisionPoints_12_0= ruleSPP
+                    	    // InternalRoom.g:2935:1: (lv_serviceProvisionPoints_12_0= ruleSPP )
+                    	    // InternalRoom.g:2936:3: lv_serviceProvisionPoints_12_0= ruleSPP
                     	    {
                     	     
                     	    	        newCompositeNode(grammarAccess.getActorClassAccess().getServiceProvisionPointsSPPParserRuleCall_7_2_0_0()); 
                     	    	    
-                    	    pushFollow(FOLLOW_ruleSPP_in_ruleActorClass5889);
+                    	    pushFollow(FOLLOW_63);
                     	    lv_serviceProvisionPoints_12_0=ruleSPP();
 
                     	    state._fsp--;
@@ -7336,7 +7336,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     	           			current, 
                     	           			"serviceProvisionPoints",
                     	            		lv_serviceProvisionPoints_12_0, 
-                    	            		"SPP");
+                    	            		"org.eclipse.etrice.core.Room.SPP");
                     	    	        afterParserOrEnumRuleCall();
                     	    	    
 
@@ -7349,18 +7349,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2953:6: ( (lv_interfacePorts_13_0= rulePort ) )
+                    	    // InternalRoom.g:2953:6: ( (lv_interfacePorts_13_0= rulePort ) )
                     	    {
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2953:6: ( (lv_interfacePorts_13_0= rulePort ) )
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2954:1: (lv_interfacePorts_13_0= rulePort )
+                    	    // InternalRoom.g:2953:6: ( (lv_interfacePorts_13_0= rulePort ) )
+                    	    // InternalRoom.g:2954:1: (lv_interfacePorts_13_0= rulePort )
                     	    {
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2954:1: (lv_interfacePorts_13_0= rulePort )
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2955:3: lv_interfacePorts_13_0= rulePort
+                    	    // InternalRoom.g:2954:1: (lv_interfacePorts_13_0= rulePort )
+                    	    // InternalRoom.g:2955:3: lv_interfacePorts_13_0= rulePort
                     	    {
                     	     
                     	    	        newCompositeNode(grammarAccess.getActorClassAccess().getInterfacePortsPortParserRuleCall_7_2_1_0()); 
                     	    	    
-                    	    pushFollow(FOLLOW_rulePort_in_ruleActorClass5916);
+                    	    pushFollow(FOLLOW_63);
                     	    lv_interfacePorts_13_0=rulePort();
 
                     	    state._fsp--;
@@ -7373,7 +7373,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     	           			current, 
                     	           			"interfacePorts",
                     	            		lv_interfacePorts_13_0, 
-                    	            		"Port");
+                    	            		"org.eclipse.etrice.core.Room.Port");
                     	    	        afterParserOrEnumRuleCall();
                     	    	    
 
@@ -7391,7 +7391,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                         }
                     } while (true);
 
-                    otherlv_14=(Token)match(input,14,FOLLOW_14_in_ruleActorClass5930); 
+                    otherlv_14=(Token)match(input,14,FOLLOW_64); 
 
                         	newLeafNode(otherlv_14, grammarAccess.getActorClassAccess().getRightCurlyBracketKeyword_7_3());
                         
@@ -7401,7 +7401,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2975:3: (otherlv_15= 'Structure' ( (lv_structureDocu_16_0= ruleDocumentation ) )? otherlv_17= '{' (otherlv_18= 'usercode1' ( (lv_userCode1_19_0= ruleDetailCode ) ) )? (otherlv_20= 'usercode2' ( (lv_userCode2_21_0= ruleDetailCode ) ) )? (otherlv_22= 'usercode3' ( (lv_userCode3_23_0= ruleDetailCode ) ) )? ( ( (lv_connections_24_0= ruleLayerConnection ) ) | ( (lv_bindings_25_0= ruleBinding ) ) | ( (lv_serviceImplementations_26_0= ruleServiceImplementation ) ) | ( (lv_attributes_27_0= ruleAttribute ) ) | ( (lv_actorRefs_28_0= ruleActorRef ) ) | ( (lv_serviceAccessPoints_29_0= ruleSAP ) ) | ( (lv_internalPorts_30_0= rulePort ) ) | ( (lv_externalPorts_31_0= ruleExternalPort ) ) )* otherlv_32= '}' )?
+            // InternalRoom.g:2975:3: (otherlv_15= 'Structure' ( (lv_structureDocu_16_0= ruleDocumentation ) )? otherlv_17= '{' (otherlv_18= 'usercode1' ( (lv_userCode1_19_0= ruleDetailCode ) ) )? (otherlv_20= 'usercode2' ( (lv_userCode2_21_0= ruleDetailCode ) ) )? (otherlv_22= 'usercode3' ( (lv_userCode3_23_0= ruleDetailCode ) ) )? ( ( (lv_connections_24_0= ruleLayerConnection ) ) | ( (lv_bindings_25_0= ruleBinding ) ) | ( (lv_serviceImplementations_26_0= ruleServiceImplementation ) ) | ( (lv_attributes_27_0= ruleAttribute ) ) | ( (lv_actorRefs_28_0= ruleActorRef ) ) | ( (lv_serviceAccessPoints_29_0= ruleSAP ) ) | ( (lv_internalPorts_30_0= rulePort ) ) | ( (lv_externalPorts_31_0= ruleExternalPort ) ) )* otherlv_32= '}' )?
             int alt76=2;
             int LA76_0 = input.LA(1);
 
@@ -7410,13 +7410,13 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt76) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2975:5: otherlv_15= 'Structure' ( (lv_structureDocu_16_0= ruleDocumentation ) )? otherlv_17= '{' (otherlv_18= 'usercode1' ( (lv_userCode1_19_0= ruleDetailCode ) ) )? (otherlv_20= 'usercode2' ( (lv_userCode2_21_0= ruleDetailCode ) ) )? (otherlv_22= 'usercode3' ( (lv_userCode3_23_0= ruleDetailCode ) ) )? ( ( (lv_connections_24_0= ruleLayerConnection ) ) | ( (lv_bindings_25_0= ruleBinding ) ) | ( (lv_serviceImplementations_26_0= ruleServiceImplementation ) ) | ( (lv_attributes_27_0= ruleAttribute ) ) | ( (lv_actorRefs_28_0= ruleActorRef ) ) | ( (lv_serviceAccessPoints_29_0= ruleSAP ) ) | ( (lv_internalPorts_30_0= rulePort ) ) | ( (lv_externalPorts_31_0= ruleExternalPort ) ) )* otherlv_32= '}'
+                    // InternalRoom.g:2975:5: otherlv_15= 'Structure' ( (lv_structureDocu_16_0= ruleDocumentation ) )? otherlv_17= '{' (otherlv_18= 'usercode1' ( (lv_userCode1_19_0= ruleDetailCode ) ) )? (otherlv_20= 'usercode2' ( (lv_userCode2_21_0= ruleDetailCode ) ) )? (otherlv_22= 'usercode3' ( (lv_userCode3_23_0= ruleDetailCode ) ) )? ( ( (lv_connections_24_0= ruleLayerConnection ) ) | ( (lv_bindings_25_0= ruleBinding ) ) | ( (lv_serviceImplementations_26_0= ruleServiceImplementation ) ) | ( (lv_attributes_27_0= ruleAttribute ) ) | ( (lv_actorRefs_28_0= ruleActorRef ) ) | ( (lv_serviceAccessPoints_29_0= ruleSAP ) ) | ( (lv_internalPorts_30_0= rulePort ) ) | ( (lv_externalPorts_31_0= ruleExternalPort ) ) )* otherlv_32= '}'
                     {
-                    otherlv_15=(Token)match(input,56,FOLLOW_56_in_ruleActorClass5945); 
+                    otherlv_15=(Token)match(input,56,FOLLOW_4); 
 
                         	newLeafNode(otherlv_15, grammarAccess.getActorClassAccess().getStructureKeyword_8_0());
                         
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2979:1: ( (lv_structureDocu_16_0= ruleDocumentation ) )?
+                    // InternalRoom.g:2979:1: ( (lv_structureDocu_16_0= ruleDocumentation ) )?
                     int alt71=2;
                     int LA71_0 = input.LA(1);
 
@@ -7425,15 +7425,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     switch (alt71) {
                         case 1 :
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2980:1: (lv_structureDocu_16_0= ruleDocumentation )
+                            // InternalRoom.g:2980:1: (lv_structureDocu_16_0= ruleDocumentation )
                             {
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2980:1: (lv_structureDocu_16_0= ruleDocumentation )
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:2981:3: lv_structureDocu_16_0= ruleDocumentation
+                            // InternalRoom.g:2980:1: (lv_structureDocu_16_0= ruleDocumentation )
+                            // InternalRoom.g:2981:3: lv_structureDocu_16_0= ruleDocumentation
                             {
                              
                             	        newCompositeNode(grammarAccess.getActorClassAccess().getStructureDocuDocumentationParserRuleCall_8_1_0()); 
                             	    
-                            pushFollow(FOLLOW_ruleDocumentation_in_ruleActorClass5966);
+                            pushFollow(FOLLOW_5);
                             lv_structureDocu_16_0=ruleDocumentation();
 
                             state._fsp--;
@@ -7446,7 +7446,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                                    			current, 
                                    			"structureDocu",
                                     		lv_structureDocu_16_0, 
-                                    		"Documentation");
+                                    		"org.eclipse.etrice.core.common.Base.Documentation");
                             	        afterParserOrEnumRuleCall();
                             	    
 
@@ -7458,11 +7458,11 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_17=(Token)match(input,13,FOLLOW_13_in_ruleActorClass5979); 
+                    otherlv_17=(Token)match(input,13,FOLLOW_65); 
 
                         	newLeafNode(otherlv_17, grammarAccess.getActorClassAccess().getLeftCurlyBracketKeyword_8_2());
                         
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3001:1: (otherlv_18= 'usercode1' ( (lv_userCode1_19_0= ruleDetailCode ) ) )?
+                    // InternalRoom.g:3001:1: (otherlv_18= 'usercode1' ( (lv_userCode1_19_0= ruleDetailCode ) ) )?
                     int alt72=2;
                     int LA72_0 = input.LA(1);
 
@@ -7471,22 +7471,22 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     switch (alt72) {
                         case 1 :
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3001:3: otherlv_18= 'usercode1' ( (lv_userCode1_19_0= ruleDetailCode ) )
+                            // InternalRoom.g:3001:3: otherlv_18= 'usercode1' ( (lv_userCode1_19_0= ruleDetailCode ) )
                             {
-                            otherlv_18=(Token)match(input,29,FOLLOW_29_in_ruleActorClass5992); 
+                            otherlv_18=(Token)match(input,29,FOLLOW_5); 
 
                                 	newLeafNode(otherlv_18, grammarAccess.getActorClassAccess().getUsercode1Keyword_8_3_0());
                                 
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3005:1: ( (lv_userCode1_19_0= ruleDetailCode ) )
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3006:1: (lv_userCode1_19_0= ruleDetailCode )
+                            // InternalRoom.g:3005:1: ( (lv_userCode1_19_0= ruleDetailCode ) )
+                            // InternalRoom.g:3006:1: (lv_userCode1_19_0= ruleDetailCode )
                             {
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3006:1: (lv_userCode1_19_0= ruleDetailCode )
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3007:3: lv_userCode1_19_0= ruleDetailCode
+                            // InternalRoom.g:3006:1: (lv_userCode1_19_0= ruleDetailCode )
+                            // InternalRoom.g:3007:3: lv_userCode1_19_0= ruleDetailCode
                             {
                              
                             	        newCompositeNode(grammarAccess.getActorClassAccess().getUserCode1DetailCodeParserRuleCall_8_3_1_0()); 
                             	    
-                            pushFollow(FOLLOW_ruleDetailCode_in_ruleActorClass6013);
+                            pushFollow(FOLLOW_66);
                             lv_userCode1_19_0=ruleDetailCode();
 
                             state._fsp--;
@@ -7499,7 +7499,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                                    			current, 
                                    			"userCode1",
                                     		lv_userCode1_19_0, 
-                                    		"DetailCode");
+                                    		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
                             	        afterParserOrEnumRuleCall();
                             	    
 
@@ -7514,7 +7514,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3023:4: (otherlv_20= 'usercode2' ( (lv_userCode2_21_0= ruleDetailCode ) ) )?
+                    // InternalRoom.g:3023:4: (otherlv_20= 'usercode2' ( (lv_userCode2_21_0= ruleDetailCode ) ) )?
                     int alt73=2;
                     int LA73_0 = input.LA(1);
 
@@ -7523,22 +7523,22 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     switch (alt73) {
                         case 1 :
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3023:6: otherlv_20= 'usercode2' ( (lv_userCode2_21_0= ruleDetailCode ) )
+                            // InternalRoom.g:3023:6: otherlv_20= 'usercode2' ( (lv_userCode2_21_0= ruleDetailCode ) )
                             {
-                            otherlv_20=(Token)match(input,30,FOLLOW_30_in_ruleActorClass6028); 
+                            otherlv_20=(Token)match(input,30,FOLLOW_5); 
 
                                 	newLeafNode(otherlv_20, grammarAccess.getActorClassAccess().getUsercode2Keyword_8_4_0());
                                 
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3027:1: ( (lv_userCode2_21_0= ruleDetailCode ) )
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3028:1: (lv_userCode2_21_0= ruleDetailCode )
+                            // InternalRoom.g:3027:1: ( (lv_userCode2_21_0= ruleDetailCode ) )
+                            // InternalRoom.g:3028:1: (lv_userCode2_21_0= ruleDetailCode )
                             {
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3028:1: (lv_userCode2_21_0= ruleDetailCode )
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3029:3: lv_userCode2_21_0= ruleDetailCode
+                            // InternalRoom.g:3028:1: (lv_userCode2_21_0= ruleDetailCode )
+                            // InternalRoom.g:3029:3: lv_userCode2_21_0= ruleDetailCode
                             {
                              
                             	        newCompositeNode(grammarAccess.getActorClassAccess().getUserCode2DetailCodeParserRuleCall_8_4_1_0()); 
                             	    
-                            pushFollow(FOLLOW_ruleDetailCode_in_ruleActorClass6049);
+                            pushFollow(FOLLOW_67);
                             lv_userCode2_21_0=ruleDetailCode();
 
                             state._fsp--;
@@ -7551,7 +7551,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                                    			current, 
                                    			"userCode2",
                                     		lv_userCode2_21_0, 
-                                    		"DetailCode");
+                                    		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
                             	        afterParserOrEnumRuleCall();
                             	    
 
@@ -7566,7 +7566,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3045:4: (otherlv_22= 'usercode3' ( (lv_userCode3_23_0= ruleDetailCode ) ) )?
+                    // InternalRoom.g:3045:4: (otherlv_22= 'usercode3' ( (lv_userCode3_23_0= ruleDetailCode ) ) )?
                     int alt74=2;
                     int LA74_0 = input.LA(1);
 
@@ -7575,22 +7575,22 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     switch (alt74) {
                         case 1 :
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3045:6: otherlv_22= 'usercode3' ( (lv_userCode3_23_0= ruleDetailCode ) )
+                            // InternalRoom.g:3045:6: otherlv_22= 'usercode3' ( (lv_userCode3_23_0= ruleDetailCode ) )
                             {
-                            otherlv_22=(Token)match(input,31,FOLLOW_31_in_ruleActorClass6064); 
+                            otherlv_22=(Token)match(input,31,FOLLOW_5); 
 
                                 	newLeafNode(otherlv_22, grammarAccess.getActorClassAccess().getUsercode3Keyword_8_5_0());
                                 
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3049:1: ( (lv_userCode3_23_0= ruleDetailCode ) )
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3050:1: (lv_userCode3_23_0= ruleDetailCode )
+                            // InternalRoom.g:3049:1: ( (lv_userCode3_23_0= ruleDetailCode ) )
+                            // InternalRoom.g:3050:1: (lv_userCode3_23_0= ruleDetailCode )
                             {
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3050:1: (lv_userCode3_23_0= ruleDetailCode )
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3051:3: lv_userCode3_23_0= ruleDetailCode
+                            // InternalRoom.g:3050:1: (lv_userCode3_23_0= ruleDetailCode )
+                            // InternalRoom.g:3051:3: lv_userCode3_23_0= ruleDetailCode
                             {
                              
                             	        newCompositeNode(grammarAccess.getActorClassAccess().getUserCode3DetailCodeParserRuleCall_8_5_1_0()); 
                             	    
-                            pushFollow(FOLLOW_ruleDetailCode_in_ruleActorClass6085);
+                            pushFollow(FOLLOW_68);
                             lv_userCode3_23_0=ruleDetailCode();
 
                             state._fsp--;
@@ -7603,7 +7603,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                                    			current, 
                                    			"userCode3",
                                     		lv_userCode3_23_0, 
-                                    		"DetailCode");
+                                    		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
                             	        afterParserOrEnumRuleCall();
                             	    
 
@@ -7618,7 +7618,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3067:4: ( ( (lv_connections_24_0= ruleLayerConnection ) ) | ( (lv_bindings_25_0= ruleBinding ) ) | ( (lv_serviceImplementations_26_0= ruleServiceImplementation ) ) | ( (lv_attributes_27_0= ruleAttribute ) ) | ( (lv_actorRefs_28_0= ruleActorRef ) ) | ( (lv_serviceAccessPoints_29_0= ruleSAP ) ) | ( (lv_internalPorts_30_0= rulePort ) ) | ( (lv_externalPorts_31_0= ruleExternalPort ) ) )*
+                    // InternalRoom.g:3067:4: ( ( (lv_connections_24_0= ruleLayerConnection ) ) | ( (lv_bindings_25_0= ruleBinding ) ) | ( (lv_serviceImplementations_26_0= ruleServiceImplementation ) ) | ( (lv_attributes_27_0= ruleAttribute ) ) | ( (lv_actorRefs_28_0= ruleActorRef ) ) | ( (lv_serviceAccessPoints_29_0= ruleSAP ) ) | ( (lv_internalPorts_30_0= rulePort ) ) | ( (lv_externalPorts_31_0= ruleExternalPort ) ) )*
                     loop75:
                     do {
                         int alt75=9;
@@ -7671,18 +7671,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                         switch (alt75) {
                     	case 1 :
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3067:5: ( (lv_connections_24_0= ruleLayerConnection ) )
+                    	    // InternalRoom.g:3067:5: ( (lv_connections_24_0= ruleLayerConnection ) )
                     	    {
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3067:5: ( (lv_connections_24_0= ruleLayerConnection ) )
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3068:1: (lv_connections_24_0= ruleLayerConnection )
+                    	    // InternalRoom.g:3067:5: ( (lv_connections_24_0= ruleLayerConnection ) )
+                    	    // InternalRoom.g:3068:1: (lv_connections_24_0= ruleLayerConnection )
                     	    {
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3068:1: (lv_connections_24_0= ruleLayerConnection )
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3069:3: lv_connections_24_0= ruleLayerConnection
+                    	    // InternalRoom.g:3068:1: (lv_connections_24_0= ruleLayerConnection )
+                    	    // InternalRoom.g:3069:3: lv_connections_24_0= ruleLayerConnection
                     	    {
                     	     
                     	    	        newCompositeNode(grammarAccess.getActorClassAccess().getConnectionsLayerConnectionParserRuleCall_8_6_0_0()); 
                     	    	    
-                    	    pushFollow(FOLLOW_ruleLayerConnection_in_ruleActorClass6109);
+                    	    pushFollow(FOLLOW_68);
                     	    lv_connections_24_0=ruleLayerConnection();
 
                     	    state._fsp--;
@@ -7695,7 +7695,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     	           			current, 
                     	           			"connections",
                     	            		lv_connections_24_0, 
-                    	            		"LayerConnection");
+                    	            		"org.eclipse.etrice.core.Room.LayerConnection");
                     	    	        afterParserOrEnumRuleCall();
                     	    	    
 
@@ -7708,18 +7708,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3086:6: ( (lv_bindings_25_0= ruleBinding ) )
+                    	    // InternalRoom.g:3086:6: ( (lv_bindings_25_0= ruleBinding ) )
                     	    {
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3086:6: ( (lv_bindings_25_0= ruleBinding ) )
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3087:1: (lv_bindings_25_0= ruleBinding )
+                    	    // InternalRoom.g:3086:6: ( (lv_bindings_25_0= ruleBinding ) )
+                    	    // InternalRoom.g:3087:1: (lv_bindings_25_0= ruleBinding )
                     	    {
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3087:1: (lv_bindings_25_0= ruleBinding )
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3088:3: lv_bindings_25_0= ruleBinding
+                    	    // InternalRoom.g:3087:1: (lv_bindings_25_0= ruleBinding )
+                    	    // InternalRoom.g:3088:3: lv_bindings_25_0= ruleBinding
                     	    {
                     	     
                     	    	        newCompositeNode(grammarAccess.getActorClassAccess().getBindingsBindingParserRuleCall_8_6_1_0()); 
                     	    	    
-                    	    pushFollow(FOLLOW_ruleBinding_in_ruleActorClass6136);
+                    	    pushFollow(FOLLOW_68);
                     	    lv_bindings_25_0=ruleBinding();
 
                     	    state._fsp--;
@@ -7732,7 +7732,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     	           			current, 
                     	           			"bindings",
                     	            		lv_bindings_25_0, 
-                    	            		"Binding");
+                    	            		"org.eclipse.etrice.core.Room.Binding");
                     	    	        afterParserOrEnumRuleCall();
                     	    	    
 
@@ -7745,18 +7745,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     	    }
                     	    break;
                     	case 3 :
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3105:6: ( (lv_serviceImplementations_26_0= ruleServiceImplementation ) )
+                    	    // InternalRoom.g:3105:6: ( (lv_serviceImplementations_26_0= ruleServiceImplementation ) )
                     	    {
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3105:6: ( (lv_serviceImplementations_26_0= ruleServiceImplementation ) )
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3106:1: (lv_serviceImplementations_26_0= ruleServiceImplementation )
+                    	    // InternalRoom.g:3105:6: ( (lv_serviceImplementations_26_0= ruleServiceImplementation ) )
+                    	    // InternalRoom.g:3106:1: (lv_serviceImplementations_26_0= ruleServiceImplementation )
                     	    {
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3106:1: (lv_serviceImplementations_26_0= ruleServiceImplementation )
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3107:3: lv_serviceImplementations_26_0= ruleServiceImplementation
+                    	    // InternalRoom.g:3106:1: (lv_serviceImplementations_26_0= ruleServiceImplementation )
+                    	    // InternalRoom.g:3107:3: lv_serviceImplementations_26_0= ruleServiceImplementation
                     	    {
                     	     
                     	    	        newCompositeNode(grammarAccess.getActorClassAccess().getServiceImplementationsServiceImplementationParserRuleCall_8_6_2_0()); 
                     	    	    
-                    	    pushFollow(FOLLOW_ruleServiceImplementation_in_ruleActorClass6163);
+                    	    pushFollow(FOLLOW_68);
                     	    lv_serviceImplementations_26_0=ruleServiceImplementation();
 
                     	    state._fsp--;
@@ -7769,7 +7769,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     	           			current, 
                     	           			"serviceImplementations",
                     	            		lv_serviceImplementations_26_0, 
-                    	            		"ServiceImplementation");
+                    	            		"org.eclipse.etrice.core.Room.ServiceImplementation");
                     	    	        afterParserOrEnumRuleCall();
                     	    	    
 
@@ -7782,18 +7782,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     	    }
                     	    break;
                     	case 4 :
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3124:6: ( (lv_attributes_27_0= ruleAttribute ) )
+                    	    // InternalRoom.g:3124:6: ( (lv_attributes_27_0= ruleAttribute ) )
                     	    {
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3124:6: ( (lv_attributes_27_0= ruleAttribute ) )
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3125:1: (lv_attributes_27_0= ruleAttribute )
+                    	    // InternalRoom.g:3124:6: ( (lv_attributes_27_0= ruleAttribute ) )
+                    	    // InternalRoom.g:3125:1: (lv_attributes_27_0= ruleAttribute )
                     	    {
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3125:1: (lv_attributes_27_0= ruleAttribute )
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3126:3: lv_attributes_27_0= ruleAttribute
+                    	    // InternalRoom.g:3125:1: (lv_attributes_27_0= ruleAttribute )
+                    	    // InternalRoom.g:3126:3: lv_attributes_27_0= ruleAttribute
                     	    {
                     	     
                     	    	        newCompositeNode(grammarAccess.getActorClassAccess().getAttributesAttributeParserRuleCall_8_6_3_0()); 
                     	    	    
-                    	    pushFollow(FOLLOW_ruleAttribute_in_ruleActorClass6190);
+                    	    pushFollow(FOLLOW_68);
                     	    lv_attributes_27_0=ruleAttribute();
 
                     	    state._fsp--;
@@ -7806,7 +7806,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     	           			current, 
                     	           			"attributes",
                     	            		lv_attributes_27_0, 
-                    	            		"Attribute");
+                    	            		"org.eclipse.etrice.core.Room.Attribute");
                     	    	        afterParserOrEnumRuleCall();
                     	    	    
 
@@ -7819,18 +7819,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     	    }
                     	    break;
                     	case 5 :
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3143:6: ( (lv_actorRefs_28_0= ruleActorRef ) )
+                    	    // InternalRoom.g:3143:6: ( (lv_actorRefs_28_0= ruleActorRef ) )
                     	    {
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3143:6: ( (lv_actorRefs_28_0= ruleActorRef ) )
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3144:1: (lv_actorRefs_28_0= ruleActorRef )
+                    	    // InternalRoom.g:3143:6: ( (lv_actorRefs_28_0= ruleActorRef ) )
+                    	    // InternalRoom.g:3144:1: (lv_actorRefs_28_0= ruleActorRef )
                     	    {
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3144:1: (lv_actorRefs_28_0= ruleActorRef )
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3145:3: lv_actorRefs_28_0= ruleActorRef
+                    	    // InternalRoom.g:3144:1: (lv_actorRefs_28_0= ruleActorRef )
+                    	    // InternalRoom.g:3145:3: lv_actorRefs_28_0= ruleActorRef
                     	    {
                     	     
                     	    	        newCompositeNode(grammarAccess.getActorClassAccess().getActorRefsActorRefParserRuleCall_8_6_4_0()); 
                     	    	    
-                    	    pushFollow(FOLLOW_ruleActorRef_in_ruleActorClass6217);
+                    	    pushFollow(FOLLOW_68);
                     	    lv_actorRefs_28_0=ruleActorRef();
 
                     	    state._fsp--;
@@ -7843,7 +7843,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     	           			current, 
                     	           			"actorRefs",
                     	            		lv_actorRefs_28_0, 
-                    	            		"ActorRef");
+                    	            		"org.eclipse.etrice.core.Room.ActorRef");
                     	    	        afterParserOrEnumRuleCall();
                     	    	    
 
@@ -7856,18 +7856,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     	    }
                     	    break;
                     	case 6 :
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3162:6: ( (lv_serviceAccessPoints_29_0= ruleSAP ) )
+                    	    // InternalRoom.g:3162:6: ( (lv_serviceAccessPoints_29_0= ruleSAP ) )
                     	    {
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3162:6: ( (lv_serviceAccessPoints_29_0= ruleSAP ) )
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3163:1: (lv_serviceAccessPoints_29_0= ruleSAP )
+                    	    // InternalRoom.g:3162:6: ( (lv_serviceAccessPoints_29_0= ruleSAP ) )
+                    	    // InternalRoom.g:3163:1: (lv_serviceAccessPoints_29_0= ruleSAP )
                     	    {
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3163:1: (lv_serviceAccessPoints_29_0= ruleSAP )
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3164:3: lv_serviceAccessPoints_29_0= ruleSAP
+                    	    // InternalRoom.g:3163:1: (lv_serviceAccessPoints_29_0= ruleSAP )
+                    	    // InternalRoom.g:3164:3: lv_serviceAccessPoints_29_0= ruleSAP
                     	    {
                     	     
                     	    	        newCompositeNode(grammarAccess.getActorClassAccess().getServiceAccessPointsSAPParserRuleCall_8_6_5_0()); 
                     	    	    
-                    	    pushFollow(FOLLOW_ruleSAP_in_ruleActorClass6244);
+                    	    pushFollow(FOLLOW_68);
                     	    lv_serviceAccessPoints_29_0=ruleSAP();
 
                     	    state._fsp--;
@@ -7880,7 +7880,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     	           			current, 
                     	           			"serviceAccessPoints",
                     	            		lv_serviceAccessPoints_29_0, 
-                    	            		"SAP");
+                    	            		"org.eclipse.etrice.core.Room.SAP");
                     	    	        afterParserOrEnumRuleCall();
                     	    	    
 
@@ -7893,18 +7893,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     	    }
                     	    break;
                     	case 7 :
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3181:6: ( (lv_internalPorts_30_0= rulePort ) )
+                    	    // InternalRoom.g:3181:6: ( (lv_internalPorts_30_0= rulePort ) )
                     	    {
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3181:6: ( (lv_internalPorts_30_0= rulePort ) )
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3182:1: (lv_internalPorts_30_0= rulePort )
+                    	    // InternalRoom.g:3181:6: ( (lv_internalPorts_30_0= rulePort ) )
+                    	    // InternalRoom.g:3182:1: (lv_internalPorts_30_0= rulePort )
                     	    {
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3182:1: (lv_internalPorts_30_0= rulePort )
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3183:3: lv_internalPorts_30_0= rulePort
+                    	    // InternalRoom.g:3182:1: (lv_internalPorts_30_0= rulePort )
+                    	    // InternalRoom.g:3183:3: lv_internalPorts_30_0= rulePort
                     	    {
                     	     
                     	    	        newCompositeNode(grammarAccess.getActorClassAccess().getInternalPortsPortParserRuleCall_8_6_6_0()); 
                     	    	    
-                    	    pushFollow(FOLLOW_rulePort_in_ruleActorClass6271);
+                    	    pushFollow(FOLLOW_68);
                     	    lv_internalPorts_30_0=rulePort();
 
                     	    state._fsp--;
@@ -7917,7 +7917,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     	           			current, 
                     	           			"internalPorts",
                     	            		lv_internalPorts_30_0, 
-                    	            		"Port");
+                    	            		"org.eclipse.etrice.core.Room.Port");
                     	    	        afterParserOrEnumRuleCall();
                     	    	    
 
@@ -7930,18 +7930,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     	    }
                     	    break;
                     	case 8 :
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3200:6: ( (lv_externalPorts_31_0= ruleExternalPort ) )
+                    	    // InternalRoom.g:3200:6: ( (lv_externalPorts_31_0= ruleExternalPort ) )
                     	    {
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3200:6: ( (lv_externalPorts_31_0= ruleExternalPort ) )
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3201:1: (lv_externalPorts_31_0= ruleExternalPort )
+                    	    // InternalRoom.g:3200:6: ( (lv_externalPorts_31_0= ruleExternalPort ) )
+                    	    // InternalRoom.g:3201:1: (lv_externalPorts_31_0= ruleExternalPort )
                     	    {
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3201:1: (lv_externalPorts_31_0= ruleExternalPort )
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3202:3: lv_externalPorts_31_0= ruleExternalPort
+                    	    // InternalRoom.g:3201:1: (lv_externalPorts_31_0= ruleExternalPort )
+                    	    // InternalRoom.g:3202:3: lv_externalPorts_31_0= ruleExternalPort
                     	    {
                     	     
                     	    	        newCompositeNode(grammarAccess.getActorClassAccess().getExternalPortsExternalPortParserRuleCall_8_6_7_0()); 
                     	    	    
-                    	    pushFollow(FOLLOW_ruleExternalPort_in_ruleActorClass6298);
+                    	    pushFollow(FOLLOW_68);
                     	    lv_externalPorts_31_0=ruleExternalPort();
 
                     	    state._fsp--;
@@ -7954,7 +7954,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     	           			current, 
                     	           			"externalPorts",
                     	            		lv_externalPorts_31_0, 
-                    	            		"ExternalPort");
+                    	            		"org.eclipse.etrice.core.Room.ExternalPort");
                     	    	        afterParserOrEnumRuleCall();
                     	    	    
 
@@ -7972,7 +7972,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                         }
                     } while (true);
 
-                    otherlv_32=(Token)match(input,14,FOLLOW_14_in_ruleActorClass6312); 
+                    otherlv_32=(Token)match(input,14,FOLLOW_69); 
 
                         	newLeafNode(otherlv_32, grammarAccess.getActorClassAccess().getRightCurlyBracketKeyword_8_7());
                         
@@ -7982,7 +7982,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3222:3: (otherlv_33= 'Behavior' ( (lv_behaviorDocu_34_0= ruleDocumentation ) )? otherlv_35= '{' ( (lv_behaviorAnnotations_36_0= ruleAnnotation ) )* ( ( (lv_operations_37_0= ruleStandardOperation ) ) | ( (lv_structors_38_0= ruleClassStructor ) ) )* ( (lv_stateMachine_39_0= ruleStateMachine ) )? otherlv_40= '}' )?
+            // InternalRoom.g:3222:3: (otherlv_33= 'Behavior' ( (lv_behaviorDocu_34_0= ruleDocumentation ) )? otherlv_35= '{' ( (lv_behaviorAnnotations_36_0= ruleAnnotation ) )* ( ( (lv_operations_37_0= ruleStandardOperation ) ) | ( (lv_structors_38_0= ruleClassStructor ) ) )* ( (lv_stateMachine_39_0= ruleStateMachine ) )? otherlv_40= '}' )?
             int alt81=2;
             int LA81_0 = input.LA(1);
 
@@ -7991,13 +7991,13 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt81) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3222:5: otherlv_33= 'Behavior' ( (lv_behaviorDocu_34_0= ruleDocumentation ) )? otherlv_35= '{' ( (lv_behaviorAnnotations_36_0= ruleAnnotation ) )* ( ( (lv_operations_37_0= ruleStandardOperation ) ) | ( (lv_structors_38_0= ruleClassStructor ) ) )* ( (lv_stateMachine_39_0= ruleStateMachine ) )? otherlv_40= '}'
+                    // InternalRoom.g:3222:5: otherlv_33= 'Behavior' ( (lv_behaviorDocu_34_0= ruleDocumentation ) )? otherlv_35= '{' ( (lv_behaviorAnnotations_36_0= ruleAnnotation ) )* ( ( (lv_operations_37_0= ruleStandardOperation ) ) | ( (lv_structors_38_0= ruleClassStructor ) ) )* ( (lv_stateMachine_39_0= ruleStateMachine ) )? otherlv_40= '}'
                     {
-                    otherlv_33=(Token)match(input,57,FOLLOW_57_in_ruleActorClass6327); 
+                    otherlv_33=(Token)match(input,57,FOLLOW_4); 
 
                         	newLeafNode(otherlv_33, grammarAccess.getActorClassAccess().getBehaviorKeyword_9_0());
                         
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3226:1: ( (lv_behaviorDocu_34_0= ruleDocumentation ) )?
+                    // InternalRoom.g:3226:1: ( (lv_behaviorDocu_34_0= ruleDocumentation ) )?
                     int alt77=2;
                     int LA77_0 = input.LA(1);
 
@@ -8006,15 +8006,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     switch (alt77) {
                         case 1 :
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3227:1: (lv_behaviorDocu_34_0= ruleDocumentation )
+                            // InternalRoom.g:3227:1: (lv_behaviorDocu_34_0= ruleDocumentation )
                             {
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3227:1: (lv_behaviorDocu_34_0= ruleDocumentation )
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3228:3: lv_behaviorDocu_34_0= ruleDocumentation
+                            // InternalRoom.g:3227:1: (lv_behaviorDocu_34_0= ruleDocumentation )
+                            // InternalRoom.g:3228:3: lv_behaviorDocu_34_0= ruleDocumentation
                             {
                              
                             	        newCompositeNode(grammarAccess.getActorClassAccess().getBehaviorDocuDocumentationParserRuleCall_9_1_0()); 
                             	    
-                            pushFollow(FOLLOW_ruleDocumentation_in_ruleActorClass6348);
+                            pushFollow(FOLLOW_5);
                             lv_behaviorDocu_34_0=ruleDocumentation();
 
                             state._fsp--;
@@ -8027,7 +8027,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                                    			current, 
                                    			"behaviorDocu",
                                     		lv_behaviorDocu_34_0, 
-                                    		"Documentation");
+                                    		"org.eclipse.etrice.core.common.Base.Documentation");
                             	        afterParserOrEnumRuleCall();
                             	    
 
@@ -8039,11 +8039,11 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_35=(Token)match(input,13,FOLLOW_13_in_ruleActorClass6361); 
+                    otherlv_35=(Token)match(input,13,FOLLOW_70); 
 
                         	newLeafNode(otherlv_35, grammarAccess.getActorClassAccess().getLeftCurlyBracketKeyword_9_2());
                         
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3248:1: ( (lv_behaviorAnnotations_36_0= ruleAnnotation ) )*
+                    // InternalRoom.g:3248:1: ( (lv_behaviorAnnotations_36_0= ruleAnnotation ) )*
                     loop78:
                     do {
                         int alt78=2;
@@ -8056,15 +8056,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                         switch (alt78) {
                     	case 1 :
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3249:1: (lv_behaviorAnnotations_36_0= ruleAnnotation )
+                    	    // InternalRoom.g:3249:1: (lv_behaviorAnnotations_36_0= ruleAnnotation )
                     	    {
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3249:1: (lv_behaviorAnnotations_36_0= ruleAnnotation )
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3250:3: lv_behaviorAnnotations_36_0= ruleAnnotation
+                    	    // InternalRoom.g:3249:1: (lv_behaviorAnnotations_36_0= ruleAnnotation )
+                    	    // InternalRoom.g:3250:3: lv_behaviorAnnotations_36_0= ruleAnnotation
                     	    {
                     	     
                     	    	        newCompositeNode(grammarAccess.getActorClassAccess().getBehaviorAnnotationsAnnotationParserRuleCall_9_3_0()); 
                     	    	    
-                    	    pushFollow(FOLLOW_ruleAnnotation_in_ruleActorClass6382);
+                    	    pushFollow(FOLLOW_70);
                     	    lv_behaviorAnnotations_36_0=ruleAnnotation();
 
                     	    state._fsp--;
@@ -8077,7 +8077,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     	           			current, 
                     	           			"behaviorAnnotations",
                     	            		lv_behaviorAnnotations_36_0, 
-                    	            		"Annotation");
+                    	            		"org.eclipse.etrice.core.common.Base.Annotation");
                     	    	        afterParserOrEnumRuleCall();
                     	    	    
 
@@ -8092,7 +8092,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                         }
                     } while (true);
 
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3266:3: ( ( (lv_operations_37_0= ruleStandardOperation ) ) | ( (lv_structors_38_0= ruleClassStructor ) ) )*
+                    // InternalRoom.g:3266:3: ( ( (lv_operations_37_0= ruleStandardOperation ) ) | ( (lv_structors_38_0= ruleClassStructor ) ) )*
                     loop79:
                     do {
                         int alt79=3;
@@ -8108,18 +8108,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                         switch (alt79) {
                     	case 1 :
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3266:4: ( (lv_operations_37_0= ruleStandardOperation ) )
+                    	    // InternalRoom.g:3266:4: ( (lv_operations_37_0= ruleStandardOperation ) )
                     	    {
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3266:4: ( (lv_operations_37_0= ruleStandardOperation ) )
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3267:1: (lv_operations_37_0= ruleStandardOperation )
+                    	    // InternalRoom.g:3266:4: ( (lv_operations_37_0= ruleStandardOperation ) )
+                    	    // InternalRoom.g:3267:1: (lv_operations_37_0= ruleStandardOperation )
                     	    {
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3267:1: (lv_operations_37_0= ruleStandardOperation )
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3268:3: lv_operations_37_0= ruleStandardOperation
+                    	    // InternalRoom.g:3267:1: (lv_operations_37_0= ruleStandardOperation )
+                    	    // InternalRoom.g:3268:3: lv_operations_37_0= ruleStandardOperation
                     	    {
                     	     
                     	    	        newCompositeNode(grammarAccess.getActorClassAccess().getOperationsStandardOperationParserRuleCall_9_4_0_0()); 
                     	    	    
-                    	    pushFollow(FOLLOW_ruleStandardOperation_in_ruleActorClass6405);
+                    	    pushFollow(FOLLOW_71);
                     	    lv_operations_37_0=ruleStandardOperation();
 
                     	    state._fsp--;
@@ -8132,7 +8132,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     	           			current, 
                     	           			"operations",
                     	            		lv_operations_37_0, 
-                    	            		"StandardOperation");
+                    	            		"org.eclipse.etrice.core.Room.StandardOperation");
                     	    	        afterParserOrEnumRuleCall();
                     	    	    
 
@@ -8145,18 +8145,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3285:6: ( (lv_structors_38_0= ruleClassStructor ) )
+                    	    // InternalRoom.g:3285:6: ( (lv_structors_38_0= ruleClassStructor ) )
                     	    {
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3285:6: ( (lv_structors_38_0= ruleClassStructor ) )
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3286:1: (lv_structors_38_0= ruleClassStructor )
+                    	    // InternalRoom.g:3285:6: ( (lv_structors_38_0= ruleClassStructor ) )
+                    	    // InternalRoom.g:3286:1: (lv_structors_38_0= ruleClassStructor )
                     	    {
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3286:1: (lv_structors_38_0= ruleClassStructor )
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3287:3: lv_structors_38_0= ruleClassStructor
+                    	    // InternalRoom.g:3286:1: (lv_structors_38_0= ruleClassStructor )
+                    	    // InternalRoom.g:3287:3: lv_structors_38_0= ruleClassStructor
                     	    {
                     	     
                     	    	        newCompositeNode(grammarAccess.getActorClassAccess().getStructorsClassStructorParserRuleCall_9_4_1_0()); 
                     	    	    
-                    	    pushFollow(FOLLOW_ruleClassStructor_in_ruleActorClass6432);
+                    	    pushFollow(FOLLOW_71);
                     	    lv_structors_38_0=ruleClassStructor();
 
                     	    state._fsp--;
@@ -8169,7 +8169,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     	           			current, 
                     	           			"structors",
                     	            		lv_structors_38_0, 
-                    	            		"ClassStructor");
+                    	            		"org.eclipse.etrice.core.Room.ClassStructor");
                     	    	        afterParserOrEnumRuleCall();
                     	    	    
 
@@ -8187,7 +8187,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                         }
                     } while (true);
 
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3303:4: ( (lv_stateMachine_39_0= ruleStateMachine ) )?
+                    // InternalRoom.g:3303:4: ( (lv_stateMachine_39_0= ruleStateMachine ) )?
                     int alt80=2;
                     int LA80_0 = input.LA(1);
 
@@ -8196,15 +8196,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     switch (alt80) {
                         case 1 :
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3304:1: (lv_stateMachine_39_0= ruleStateMachine )
+                            // InternalRoom.g:3304:1: (lv_stateMachine_39_0= ruleStateMachine )
                             {
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3304:1: (lv_stateMachine_39_0= ruleStateMachine )
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3305:3: lv_stateMachine_39_0= ruleStateMachine
+                            // InternalRoom.g:3304:1: (lv_stateMachine_39_0= ruleStateMachine )
+                            // InternalRoom.g:3305:3: lv_stateMachine_39_0= ruleStateMachine
                             {
                              
                             	        newCompositeNode(grammarAccess.getActorClassAccess().getStateMachineStateMachineParserRuleCall_9_5_0()); 
                             	    
-                            pushFollow(FOLLOW_ruleStateMachine_in_ruleActorClass6455);
+                            pushFollow(FOLLOW_53);
                             lv_stateMachine_39_0=ruleStateMachine();
 
                             state._fsp--;
@@ -8217,7 +8217,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                                    			current, 
                                    			"stateMachine",
                                     		lv_stateMachine_39_0, 
-                                    		"StateMachine");
+                                    		"org.eclipse.etrice.core.fsm.FSM.StateMachine");
                             	        afterParserOrEnumRuleCall();
                             	    
 
@@ -8229,7 +8229,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_40=(Token)match(input,14,FOLLOW_14_in_ruleActorClass6468); 
+                    otherlv_40=(Token)match(input,14,FOLLOW_53); 
 
                         	newLeafNode(otherlv_40, grammarAccess.getActorClassAccess().getRightCurlyBracketKeyword_9_6());
                         
@@ -8239,7 +8239,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_41=(Token)match(input,14,FOLLOW_14_in_ruleActorClass6482); 
+            otherlv_41=(Token)match(input,14,FOLLOW_2); 
 
                 	newLeafNode(otherlv_41, grammarAccess.getActorClassAccess().getRightCurlyBracketKeyword_10());
                 
@@ -8264,7 +8264,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleInterfaceItem"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3337:1: entryRuleInterfaceItem returns [EObject current=null] : iv_ruleInterfaceItem= ruleInterfaceItem EOF ;
+    // InternalRoom.g:3337:1: entryRuleInterfaceItem returns [EObject current=null] : iv_ruleInterfaceItem= ruleInterfaceItem EOF ;
     public final EObject entryRuleInterfaceItem() throws RecognitionException {
         EObject current = null;
 
@@ -8272,17 +8272,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3338:2: (iv_ruleInterfaceItem= ruleInterfaceItem EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3339:2: iv_ruleInterfaceItem= ruleInterfaceItem EOF
+            // InternalRoom.g:3338:2: (iv_ruleInterfaceItem= ruleInterfaceItem EOF )
+            // InternalRoom.g:3339:2: iv_ruleInterfaceItem= ruleInterfaceItem EOF
             {
              newCompositeNode(grammarAccess.getInterfaceItemRule()); 
-            pushFollow(FOLLOW_ruleInterfaceItem_in_entryRuleInterfaceItem6518);
+            pushFollow(FOLLOW_1);
             iv_ruleInterfaceItem=ruleInterfaceItem();
 
             state._fsp--;
 
              current =iv_ruleInterfaceItem; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleInterfaceItem6528); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -8300,7 +8300,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleInterfaceItem"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3346:1: ruleInterfaceItem returns [EObject current=null] : (this_Port_0= rulePort | this_SAP_1= ruleSAP | this_SPP_2= ruleSPP ) ;
+    // InternalRoom.g:3346:1: ruleInterfaceItem returns [EObject current=null] : (this_Port_0= rulePort | this_SAP_1= ruleSAP | this_SPP_2= ruleSPP ) ;
     public final EObject ruleInterfaceItem() throws RecognitionException {
         EObject current = null;
 
@@ -8314,10 +8314,10 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3349:28: ( (this_Port_0= rulePort | this_SAP_1= ruleSAP | this_SPP_2= ruleSPP ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3350:1: (this_Port_0= rulePort | this_SAP_1= ruleSAP | this_SPP_2= ruleSPP )
+            // InternalRoom.g:3349:28: ( (this_Port_0= rulePort | this_SAP_1= ruleSAP | this_SPP_2= ruleSPP ) )
+            // InternalRoom.g:3350:1: (this_Port_0= rulePort | this_SAP_1= ruleSAP | this_SPP_2= ruleSPP )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3350:1: (this_Port_0= rulePort | this_SAP_1= ruleSAP | this_SPP_2= ruleSPP )
+            // InternalRoom.g:3350:1: (this_Port_0= rulePort | this_SAP_1= ruleSAP | this_SPP_2= ruleSPP )
             int alt82=3;
             switch ( input.LA(1) ) {
             case 46:
@@ -8345,12 +8345,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             switch (alt82) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3351:5: this_Port_0= rulePort
+                    // InternalRoom.g:3351:5: this_Port_0= rulePort
                     {
                      
                             newCompositeNode(grammarAccess.getInterfaceItemAccess().getPortParserRuleCall_0()); 
                         
-                    pushFollow(FOLLOW_rulePort_in_ruleInterfaceItem6575);
+                    pushFollow(FOLLOW_2);
                     this_Port_0=rulePort();
 
                     state._fsp--;
@@ -8363,12 +8363,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3361:5: this_SAP_1= ruleSAP
+                    // InternalRoom.g:3361:5: this_SAP_1= ruleSAP
                     {
                      
                             newCompositeNode(grammarAccess.getInterfaceItemAccess().getSAPParserRuleCall_1()); 
                         
-                    pushFollow(FOLLOW_ruleSAP_in_ruleInterfaceItem6602);
+                    pushFollow(FOLLOW_2);
                     this_SAP_1=ruleSAP();
 
                     state._fsp--;
@@ -8381,12 +8381,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3371:5: this_SPP_2= ruleSPP
+                    // InternalRoom.g:3371:5: this_SPP_2= ruleSPP
                     {
                      
                             newCompositeNode(grammarAccess.getInterfaceItemAccess().getSPPParserRuleCall_2()); 
                         
-                    pushFollow(FOLLOW_ruleSPP_in_ruleInterfaceItem6629);
+                    pushFollow(FOLLOW_2);
                     this_SPP_2=ruleSPP();
 
                     state._fsp--;
@@ -8419,7 +8419,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRulePort"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3387:1: entryRulePort returns [EObject current=null] : iv_rulePort= rulePort EOF ;
+    // InternalRoom.g:3387:1: entryRulePort returns [EObject current=null] : iv_rulePort= rulePort EOF ;
     public final EObject entryRulePort() throws RecognitionException {
         EObject current = null;
 
@@ -8427,17 +8427,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3388:2: (iv_rulePort= rulePort EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3389:2: iv_rulePort= rulePort EOF
+            // InternalRoom.g:3388:2: (iv_rulePort= rulePort EOF )
+            // InternalRoom.g:3389:2: iv_rulePort= rulePort EOF
             {
              newCompositeNode(grammarAccess.getPortRule()); 
-            pushFollow(FOLLOW_rulePort_in_entryRulePort6664);
+            pushFollow(FOLLOW_1);
             iv_rulePort=rulePort();
 
             state._fsp--;
 
              current =iv_rulePort; 
-            match(input,EOF,FOLLOW_EOF_in_entryRulePort6674); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -8455,7 +8455,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "rulePort"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3396:1: rulePort returns [EObject current=null] : ( ( (lv_conjugated_0_0= 'conjugated' ) )? otherlv_1= 'Port' ( (lv_name_2_0= RULE_ID ) ) ( (lv_multiplicity_3_0= ruleMULTIPLICITY ) )? otherlv_4= ':' ( ( ruleFQN ) ) ( (lv_docu_6_0= ruleDocumentation ) )? ) ;
+    // InternalRoom.g:3396:1: rulePort returns [EObject current=null] : ( ( (lv_conjugated_0_0= 'conjugated' ) )? otherlv_1= 'Port' ( (lv_name_2_0= RULE_ID ) ) ( (lv_multiplicity_3_0= ruleMULTIPLICITY ) )? otherlv_4= ':' ( ( ruleFQN ) ) ( (lv_docu_6_0= ruleDocumentation ) )? ) ;
     public final EObject rulePort() throws RecognitionException {
         EObject current = null;
 
@@ -8471,13 +8471,13 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3399:28: ( ( ( (lv_conjugated_0_0= 'conjugated' ) )? otherlv_1= 'Port' ( (lv_name_2_0= RULE_ID ) ) ( (lv_multiplicity_3_0= ruleMULTIPLICITY ) )? otherlv_4= ':' ( ( ruleFQN ) ) ( (lv_docu_6_0= ruleDocumentation ) )? ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3400:1: ( ( (lv_conjugated_0_0= 'conjugated' ) )? otherlv_1= 'Port' ( (lv_name_2_0= RULE_ID ) ) ( (lv_multiplicity_3_0= ruleMULTIPLICITY ) )? otherlv_4= ':' ( ( ruleFQN ) ) ( (lv_docu_6_0= ruleDocumentation ) )? )
+            // InternalRoom.g:3399:28: ( ( ( (lv_conjugated_0_0= 'conjugated' ) )? otherlv_1= 'Port' ( (lv_name_2_0= RULE_ID ) ) ( (lv_multiplicity_3_0= ruleMULTIPLICITY ) )? otherlv_4= ':' ( ( ruleFQN ) ) ( (lv_docu_6_0= ruleDocumentation ) )? ) )
+            // InternalRoom.g:3400:1: ( ( (lv_conjugated_0_0= 'conjugated' ) )? otherlv_1= 'Port' ( (lv_name_2_0= RULE_ID ) ) ( (lv_multiplicity_3_0= ruleMULTIPLICITY ) )? otherlv_4= ':' ( ( ruleFQN ) ) ( (lv_docu_6_0= ruleDocumentation ) )? )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3400:1: ( ( (lv_conjugated_0_0= 'conjugated' ) )? otherlv_1= 'Port' ( (lv_name_2_0= RULE_ID ) ) ( (lv_multiplicity_3_0= ruleMULTIPLICITY ) )? otherlv_4= ':' ( ( ruleFQN ) ) ( (lv_docu_6_0= ruleDocumentation ) )? )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3400:2: ( (lv_conjugated_0_0= 'conjugated' ) )? otherlv_1= 'Port' ( (lv_name_2_0= RULE_ID ) ) ( (lv_multiplicity_3_0= ruleMULTIPLICITY ) )? otherlv_4= ':' ( ( ruleFQN ) ) ( (lv_docu_6_0= ruleDocumentation ) )?
+            // InternalRoom.g:3400:1: ( ( (lv_conjugated_0_0= 'conjugated' ) )? otherlv_1= 'Port' ( (lv_name_2_0= RULE_ID ) ) ( (lv_multiplicity_3_0= ruleMULTIPLICITY ) )? otherlv_4= ':' ( ( ruleFQN ) ) ( (lv_docu_6_0= ruleDocumentation ) )? )
+            // InternalRoom.g:3400:2: ( (lv_conjugated_0_0= 'conjugated' ) )? otherlv_1= 'Port' ( (lv_name_2_0= RULE_ID ) ) ( (lv_multiplicity_3_0= ruleMULTIPLICITY ) )? otherlv_4= ':' ( ( ruleFQN ) ) ( (lv_docu_6_0= ruleDocumentation ) )?
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3400:2: ( (lv_conjugated_0_0= 'conjugated' ) )?
+            // InternalRoom.g:3400:2: ( (lv_conjugated_0_0= 'conjugated' ) )?
             int alt83=2;
             int LA83_0 = input.LA(1);
 
@@ -8486,12 +8486,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt83) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3401:1: (lv_conjugated_0_0= 'conjugated' )
+                    // InternalRoom.g:3401:1: (lv_conjugated_0_0= 'conjugated' )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3401:1: (lv_conjugated_0_0= 'conjugated' )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3402:3: lv_conjugated_0_0= 'conjugated'
+                    // InternalRoom.g:3401:1: (lv_conjugated_0_0= 'conjugated' )
+                    // InternalRoom.g:3402:3: lv_conjugated_0_0= 'conjugated'
                     {
-                    lv_conjugated_0_0=(Token)match(input,46,FOLLOW_46_in_rulePort6717); 
+                    lv_conjugated_0_0=(Token)match(input,46,FOLLOW_72); 
 
                             newLeafNode(lv_conjugated_0_0, grammarAccess.getPortAccess().getConjugatedConjugatedKeyword_0_0());
                         
@@ -8510,17 +8510,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,58,FOLLOW_58_in_rulePort6743); 
+            otherlv_1=(Token)match(input,58,FOLLOW_3); 
 
                 	newLeafNode(otherlv_1, grammarAccess.getPortAccess().getPortKeyword_1());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3419:1: ( (lv_name_2_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3420:1: (lv_name_2_0= RULE_ID )
+            // InternalRoom.g:3419:1: ( (lv_name_2_0= RULE_ID ) )
+            // InternalRoom.g:3420:1: (lv_name_2_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3420:1: (lv_name_2_0= RULE_ID )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3421:3: lv_name_2_0= RULE_ID
+            // InternalRoom.g:3420:1: (lv_name_2_0= RULE_ID )
+            // InternalRoom.g:3421:3: lv_name_2_0= RULE_ID
             {
-            lv_name_2_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_rulePort6760); 
+            lv_name_2_0=(Token)match(input,RULE_ID,FOLLOW_30); 
 
             			newLeafNode(lv_name_2_0, grammarAccess.getPortAccess().getNameIDTerminalRuleCall_2_0()); 
             		
@@ -8532,7 +8532,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"name",
                     		lv_name_2_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -8540,7 +8540,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3437:2: ( (lv_multiplicity_3_0= ruleMULTIPLICITY ) )?
+            // InternalRoom.g:3437:2: ( (lv_multiplicity_3_0= ruleMULTIPLICITY ) )?
             int alt84=2;
             int LA84_0 = input.LA(1);
 
@@ -8549,15 +8549,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt84) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3438:1: (lv_multiplicity_3_0= ruleMULTIPLICITY )
+                    // InternalRoom.g:3438:1: (lv_multiplicity_3_0= ruleMULTIPLICITY )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3438:1: (lv_multiplicity_3_0= ruleMULTIPLICITY )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3439:3: lv_multiplicity_3_0= ruleMULTIPLICITY
+                    // InternalRoom.g:3438:1: (lv_multiplicity_3_0= ruleMULTIPLICITY )
+                    // InternalRoom.g:3439:3: lv_multiplicity_3_0= ruleMULTIPLICITY
                     {
                      
                     	        newCompositeNode(grammarAccess.getPortAccess().getMultiplicityMULTIPLICITYParserRuleCall_3_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleMULTIPLICITY_in_rulePort6786);
+                    pushFollow(FOLLOW_8);
                     lv_multiplicity_3_0=ruleMULTIPLICITY();
 
                     state._fsp--;
@@ -8570,7 +8570,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"multiplicity",
                             		lv_multiplicity_3_0, 
-                            		"MULTIPLICITY");
+                            		"org.eclipse.etrice.core.Room.MULTIPLICITY");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -8582,15 +8582,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_4=(Token)match(input,15,FOLLOW_15_in_rulePort6799); 
+            otherlv_4=(Token)match(input,15,FOLLOW_3); 
 
                 	newLeafNode(otherlv_4, grammarAccess.getPortAccess().getColonKeyword_4());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3459:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3460:1: ( ruleFQN )
+            // InternalRoom.g:3459:1: ( ( ruleFQN ) )
+            // InternalRoom.g:3460:1: ( ruleFQN )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3460:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3461:3: ruleFQN
+            // InternalRoom.g:3460:1: ( ruleFQN )
+            // InternalRoom.g:3461:3: ruleFQN
             {
 
             			if (current==null) {
@@ -8600,7 +8600,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
              
             	        newCompositeNode(grammarAccess.getPortAccess().getProtocolGeneralProtocolClassCrossReference_5_0()); 
             	    
-            pushFollow(FOLLOW_ruleFQN_in_rulePort6822);
+            pushFollow(FOLLOW_16);
             ruleFQN();
 
             state._fsp--;
@@ -8614,7 +8614,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3474:2: ( (lv_docu_6_0= ruleDocumentation ) )?
+            // InternalRoom.g:3474:2: ( (lv_docu_6_0= ruleDocumentation ) )?
             int alt85=2;
             int LA85_0 = input.LA(1);
 
@@ -8623,15 +8623,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt85) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3475:1: (lv_docu_6_0= ruleDocumentation )
+                    // InternalRoom.g:3475:1: (lv_docu_6_0= ruleDocumentation )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3475:1: (lv_docu_6_0= ruleDocumentation )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3476:3: lv_docu_6_0= ruleDocumentation
+                    // InternalRoom.g:3475:1: (lv_docu_6_0= ruleDocumentation )
+                    // InternalRoom.g:3476:3: lv_docu_6_0= ruleDocumentation
                     {
                      
                     	        newCompositeNode(grammarAccess.getPortAccess().getDocuDocumentationParserRuleCall_6_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDocumentation_in_rulePort6843);
+                    pushFollow(FOLLOW_2);
                     lv_docu_6_0=ruleDocumentation();
 
                     state._fsp--;
@@ -8644,7 +8644,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"docu",
                             		lv_docu_6_0, 
-                            		"Documentation");
+                            		"org.eclipse.etrice.core.common.Base.Documentation");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -8677,7 +8677,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleExternalPort"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3500:1: entryRuleExternalPort returns [EObject current=null] : iv_ruleExternalPort= ruleExternalPort EOF ;
+    // InternalRoom.g:3500:1: entryRuleExternalPort returns [EObject current=null] : iv_ruleExternalPort= ruleExternalPort EOF ;
     public final EObject entryRuleExternalPort() throws RecognitionException {
         EObject current = null;
 
@@ -8685,17 +8685,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3501:2: (iv_ruleExternalPort= ruleExternalPort EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3502:2: iv_ruleExternalPort= ruleExternalPort EOF
+            // InternalRoom.g:3501:2: (iv_ruleExternalPort= ruleExternalPort EOF )
+            // InternalRoom.g:3502:2: iv_ruleExternalPort= ruleExternalPort EOF
             {
              newCompositeNode(grammarAccess.getExternalPortRule()); 
-            pushFollow(FOLLOW_ruleExternalPort_in_entryRuleExternalPort6880);
+            pushFollow(FOLLOW_1);
             iv_ruleExternalPort=ruleExternalPort();
 
             state._fsp--;
 
              current =iv_ruleExternalPort; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleExternalPort6890); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -8713,7 +8713,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleExternalPort"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3509:1: ruleExternalPort returns [EObject current=null] : (otherlv_0= 'external' otherlv_1= 'Port' ( (otherlv_2= RULE_ID ) ) ) ;
+    // InternalRoom.g:3509:1: ruleExternalPort returns [EObject current=null] : (otherlv_0= 'external' otherlv_1= 'Port' ( (otherlv_2= RULE_ID ) ) ) ;
     public final EObject ruleExternalPort() throws RecognitionException {
         EObject current = null;
 
@@ -8724,32 +8724,32 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3512:28: ( (otherlv_0= 'external' otherlv_1= 'Port' ( (otherlv_2= RULE_ID ) ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3513:1: (otherlv_0= 'external' otherlv_1= 'Port' ( (otherlv_2= RULE_ID ) ) )
+            // InternalRoom.g:3512:28: ( (otherlv_0= 'external' otherlv_1= 'Port' ( (otherlv_2= RULE_ID ) ) ) )
+            // InternalRoom.g:3513:1: (otherlv_0= 'external' otherlv_1= 'Port' ( (otherlv_2= RULE_ID ) ) )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3513:1: (otherlv_0= 'external' otherlv_1= 'Port' ( (otherlv_2= RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3513:3: otherlv_0= 'external' otherlv_1= 'Port' ( (otherlv_2= RULE_ID ) )
+            // InternalRoom.g:3513:1: (otherlv_0= 'external' otherlv_1= 'Port' ( (otherlv_2= RULE_ID ) ) )
+            // InternalRoom.g:3513:3: otherlv_0= 'external' otherlv_1= 'Port' ( (otherlv_2= RULE_ID ) )
             {
-            otherlv_0=(Token)match(input,59,FOLLOW_59_in_ruleExternalPort6927); 
+            otherlv_0=(Token)match(input,59,FOLLOW_72); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getExternalPortAccess().getExternalKeyword_0());
                 
-            otherlv_1=(Token)match(input,58,FOLLOW_58_in_ruleExternalPort6939); 
+            otherlv_1=(Token)match(input,58,FOLLOW_3); 
 
                 	newLeafNode(otherlv_1, grammarAccess.getExternalPortAccess().getPortKeyword_1());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3521:1: ( (otherlv_2= RULE_ID ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3522:1: (otherlv_2= RULE_ID )
+            // InternalRoom.g:3521:1: ( (otherlv_2= RULE_ID ) )
+            // InternalRoom.g:3522:1: (otherlv_2= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3522:1: (otherlv_2= RULE_ID )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3523:3: otherlv_2= RULE_ID
+            // InternalRoom.g:3522:1: (otherlv_2= RULE_ID )
+            // InternalRoom.g:3523:3: otherlv_2= RULE_ID
             {
 
             			if (current==null) {
             	            current = createModelElement(grammarAccess.getExternalPortRule());
             	        }
                     
-            otherlv_2=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleExternalPort6959); 
+            otherlv_2=(Token)match(input,RULE_ID,FOLLOW_2); 
 
             		newLeafNode(otherlv_2, grammarAccess.getExternalPortAccess().getInterfacePortPortCrossReference_2_0()); 
             	
@@ -8780,7 +8780,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleSAP"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3542:1: entryRuleSAP returns [EObject current=null] : iv_ruleSAP= ruleSAP EOF ;
+    // InternalRoom.g:3542:1: entryRuleSAP returns [EObject current=null] : iv_ruleSAP= ruleSAP EOF ;
     public final EObject entryRuleSAP() throws RecognitionException {
         EObject current = null;
 
@@ -8788,17 +8788,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3543:2: (iv_ruleSAP= ruleSAP EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3544:2: iv_ruleSAP= ruleSAP EOF
+            // InternalRoom.g:3543:2: (iv_ruleSAP= ruleSAP EOF )
+            // InternalRoom.g:3544:2: iv_ruleSAP= ruleSAP EOF
             {
              newCompositeNode(grammarAccess.getSAPRule()); 
-            pushFollow(FOLLOW_ruleSAP_in_entryRuleSAP6995);
+            pushFollow(FOLLOW_1);
             iv_ruleSAP=ruleSAP();
 
             state._fsp--;
 
              current =iv_ruleSAP; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSAP7005); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -8816,7 +8816,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleSAP"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3551:1: ruleSAP returns [EObject current=null] : (otherlv_0= 'SAP' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( ruleFQN ) ) ) ;
+    // InternalRoom.g:3551:1: ruleSAP returns [EObject current=null] : (otherlv_0= 'SAP' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( ruleFQN ) ) ) ;
     public final EObject ruleSAP() throws RecognitionException {
         EObject current = null;
 
@@ -8827,23 +8827,23 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3554:28: ( (otherlv_0= 'SAP' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( ruleFQN ) ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3555:1: (otherlv_0= 'SAP' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( ruleFQN ) ) )
+            // InternalRoom.g:3554:28: ( (otherlv_0= 'SAP' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( ruleFQN ) ) ) )
+            // InternalRoom.g:3555:1: (otherlv_0= 'SAP' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( ruleFQN ) ) )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3555:1: (otherlv_0= 'SAP' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( ruleFQN ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3555:3: otherlv_0= 'SAP' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( ruleFQN ) )
+            // InternalRoom.g:3555:1: (otherlv_0= 'SAP' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( ruleFQN ) ) )
+            // InternalRoom.g:3555:3: otherlv_0= 'SAP' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( ruleFQN ) )
             {
-            otherlv_0=(Token)match(input,60,FOLLOW_60_in_ruleSAP7042); 
+            otherlv_0=(Token)match(input,60,FOLLOW_3); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getSAPAccess().getSAPKeyword_0());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3559:1: ( (lv_name_1_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3560:1: (lv_name_1_0= RULE_ID )
+            // InternalRoom.g:3559:1: ( (lv_name_1_0= RULE_ID ) )
+            // InternalRoom.g:3560:1: (lv_name_1_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3560:1: (lv_name_1_0= RULE_ID )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3561:3: lv_name_1_0= RULE_ID
+            // InternalRoom.g:3560:1: (lv_name_1_0= RULE_ID )
+            // InternalRoom.g:3561:3: lv_name_1_0= RULE_ID
             {
-            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleSAP7059); 
+            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_8); 
 
             			newLeafNode(lv_name_1_0, grammarAccess.getSAPAccess().getNameIDTerminalRuleCall_1_0()); 
             		
@@ -8855,7 +8855,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"name",
                     		lv_name_1_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -8863,15 +8863,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_2=(Token)match(input,15,FOLLOW_15_in_ruleSAP7076); 
+            otherlv_2=(Token)match(input,15,FOLLOW_3); 
 
                 	newLeafNode(otherlv_2, grammarAccess.getSAPAccess().getColonKeyword_2());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3581:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3582:1: ( ruleFQN )
+            // InternalRoom.g:3581:1: ( ( ruleFQN ) )
+            // InternalRoom.g:3582:1: ( ruleFQN )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3582:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3583:3: ruleFQN
+            // InternalRoom.g:3582:1: ( ruleFQN )
+            // InternalRoom.g:3583:3: ruleFQN
             {
 
             			if (current==null) {
@@ -8881,7 +8881,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
              
             	        newCompositeNode(grammarAccess.getSAPAccess().getProtocolProtocolClassCrossReference_3_0()); 
             	    
-            pushFollow(FOLLOW_ruleFQN_in_ruleSAP7099);
+            pushFollow(FOLLOW_2);
             ruleFQN();
 
             state._fsp--;
@@ -8916,7 +8916,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleSPP"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3604:1: entryRuleSPP returns [EObject current=null] : iv_ruleSPP= ruleSPP EOF ;
+    // InternalRoom.g:3604:1: entryRuleSPP returns [EObject current=null] : iv_ruleSPP= ruleSPP EOF ;
     public final EObject entryRuleSPP() throws RecognitionException {
         EObject current = null;
 
@@ -8924,17 +8924,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3605:2: (iv_ruleSPP= ruleSPP EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3606:2: iv_ruleSPP= ruleSPP EOF
+            // InternalRoom.g:3605:2: (iv_ruleSPP= ruleSPP EOF )
+            // InternalRoom.g:3606:2: iv_ruleSPP= ruleSPP EOF
             {
              newCompositeNode(grammarAccess.getSPPRule()); 
-            pushFollow(FOLLOW_ruleSPP_in_entryRuleSPP7135);
+            pushFollow(FOLLOW_1);
             iv_ruleSPP=ruleSPP();
 
             state._fsp--;
 
              current =iv_ruleSPP; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSPP7145); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -8952,7 +8952,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleSPP"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3613:1: ruleSPP returns [EObject current=null] : (otherlv_0= 'SPP' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( ruleFQN ) ) ) ;
+    // InternalRoom.g:3613:1: ruleSPP returns [EObject current=null] : (otherlv_0= 'SPP' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( ruleFQN ) ) ) ;
     public final EObject ruleSPP() throws RecognitionException {
         EObject current = null;
 
@@ -8963,23 +8963,23 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3616:28: ( (otherlv_0= 'SPP' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( ruleFQN ) ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3617:1: (otherlv_0= 'SPP' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( ruleFQN ) ) )
+            // InternalRoom.g:3616:28: ( (otherlv_0= 'SPP' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( ruleFQN ) ) ) )
+            // InternalRoom.g:3617:1: (otherlv_0= 'SPP' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( ruleFQN ) ) )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3617:1: (otherlv_0= 'SPP' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( ruleFQN ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3617:3: otherlv_0= 'SPP' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( ruleFQN ) )
+            // InternalRoom.g:3617:1: (otherlv_0= 'SPP' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( ruleFQN ) ) )
+            // InternalRoom.g:3617:3: otherlv_0= 'SPP' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( ruleFQN ) )
             {
-            otherlv_0=(Token)match(input,61,FOLLOW_61_in_ruleSPP7182); 
+            otherlv_0=(Token)match(input,61,FOLLOW_3); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getSPPAccess().getSPPKeyword_0());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3621:1: ( (lv_name_1_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3622:1: (lv_name_1_0= RULE_ID )
+            // InternalRoom.g:3621:1: ( (lv_name_1_0= RULE_ID ) )
+            // InternalRoom.g:3622:1: (lv_name_1_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3622:1: (lv_name_1_0= RULE_ID )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3623:3: lv_name_1_0= RULE_ID
+            // InternalRoom.g:3622:1: (lv_name_1_0= RULE_ID )
+            // InternalRoom.g:3623:3: lv_name_1_0= RULE_ID
             {
-            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleSPP7199); 
+            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_8); 
 
             			newLeafNode(lv_name_1_0, grammarAccess.getSPPAccess().getNameIDTerminalRuleCall_1_0()); 
             		
@@ -8991,7 +8991,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"name",
                     		lv_name_1_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -8999,15 +8999,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_2=(Token)match(input,15,FOLLOW_15_in_ruleSPP7216); 
+            otherlv_2=(Token)match(input,15,FOLLOW_3); 
 
                 	newLeafNode(otherlv_2, grammarAccess.getSPPAccess().getColonKeyword_2());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3643:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3644:1: ( ruleFQN )
+            // InternalRoom.g:3643:1: ( ( ruleFQN ) )
+            // InternalRoom.g:3644:1: ( ruleFQN )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3644:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3645:3: ruleFQN
+            // InternalRoom.g:3644:1: ( ruleFQN )
+            // InternalRoom.g:3645:3: ruleFQN
             {
 
             			if (current==null) {
@@ -9017,7 +9017,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
              
             	        newCompositeNode(grammarAccess.getSPPAccess().getProtocolProtocolClassCrossReference_3_0()); 
             	    
-            pushFollow(FOLLOW_ruleFQN_in_ruleSPP7239);
+            pushFollow(FOLLOW_2);
             ruleFQN();
 
             state._fsp--;
@@ -9052,7 +9052,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleServiceImplementation"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3666:1: entryRuleServiceImplementation returns [EObject current=null] : iv_ruleServiceImplementation= ruleServiceImplementation EOF ;
+    // InternalRoom.g:3666:1: entryRuleServiceImplementation returns [EObject current=null] : iv_ruleServiceImplementation= ruleServiceImplementation EOF ;
     public final EObject entryRuleServiceImplementation() throws RecognitionException {
         EObject current = null;
 
@@ -9060,17 +9060,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3667:2: (iv_ruleServiceImplementation= ruleServiceImplementation EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3668:2: iv_ruleServiceImplementation= ruleServiceImplementation EOF
+            // InternalRoom.g:3667:2: (iv_ruleServiceImplementation= ruleServiceImplementation EOF )
+            // InternalRoom.g:3668:2: iv_ruleServiceImplementation= ruleServiceImplementation EOF
             {
              newCompositeNode(grammarAccess.getServiceImplementationRule()); 
-            pushFollow(FOLLOW_ruleServiceImplementation_in_entryRuleServiceImplementation7275);
+            pushFollow(FOLLOW_1);
             iv_ruleServiceImplementation=ruleServiceImplementation();
 
             state._fsp--;
 
              current =iv_ruleServiceImplementation; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleServiceImplementation7285); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -9088,7 +9088,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleServiceImplementation"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3675:1: ruleServiceImplementation returns [EObject current=null] : (otherlv_0= 'ServiceImplementation' otherlv_1= 'of' ( (otherlv_2= RULE_ID ) ) ) ;
+    // InternalRoom.g:3675:1: ruleServiceImplementation returns [EObject current=null] : (otherlv_0= 'ServiceImplementation' otherlv_1= 'of' ( (otherlv_2= RULE_ID ) ) ) ;
     public final EObject ruleServiceImplementation() throws RecognitionException {
         EObject current = null;
 
@@ -9099,32 +9099,32 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3678:28: ( (otherlv_0= 'ServiceImplementation' otherlv_1= 'of' ( (otherlv_2= RULE_ID ) ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3679:1: (otherlv_0= 'ServiceImplementation' otherlv_1= 'of' ( (otherlv_2= RULE_ID ) ) )
+            // InternalRoom.g:3678:28: ( (otherlv_0= 'ServiceImplementation' otherlv_1= 'of' ( (otherlv_2= RULE_ID ) ) ) )
+            // InternalRoom.g:3679:1: (otherlv_0= 'ServiceImplementation' otherlv_1= 'of' ( (otherlv_2= RULE_ID ) ) )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3679:1: (otherlv_0= 'ServiceImplementation' otherlv_1= 'of' ( (otherlv_2= RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3679:3: otherlv_0= 'ServiceImplementation' otherlv_1= 'of' ( (otherlv_2= RULE_ID ) )
+            // InternalRoom.g:3679:1: (otherlv_0= 'ServiceImplementation' otherlv_1= 'of' ( (otherlv_2= RULE_ID ) ) )
+            // InternalRoom.g:3679:3: otherlv_0= 'ServiceImplementation' otherlv_1= 'of' ( (otherlv_2= RULE_ID ) )
             {
-            otherlv_0=(Token)match(input,62,FOLLOW_62_in_ruleServiceImplementation7322); 
+            otherlv_0=(Token)match(input,62,FOLLOW_73); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getServiceImplementationAccess().getServiceImplementationKeyword_0());
                 
-            otherlv_1=(Token)match(input,23,FOLLOW_23_in_ruleServiceImplementation7334); 
+            otherlv_1=(Token)match(input,23,FOLLOW_3); 
 
                 	newLeafNode(otherlv_1, grammarAccess.getServiceImplementationAccess().getOfKeyword_1());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3687:1: ( (otherlv_2= RULE_ID ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3688:1: (otherlv_2= RULE_ID )
+            // InternalRoom.g:3687:1: ( (otherlv_2= RULE_ID ) )
+            // InternalRoom.g:3688:1: (otherlv_2= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3688:1: (otherlv_2= RULE_ID )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3689:3: otherlv_2= RULE_ID
+            // InternalRoom.g:3688:1: (otherlv_2= RULE_ID )
+            // InternalRoom.g:3689:3: otherlv_2= RULE_ID
             {
 
             			if (current==null) {
             	            current = createModelElement(grammarAccess.getServiceImplementationRule());
             	        }
                     
-            otherlv_2=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleServiceImplementation7354); 
+            otherlv_2=(Token)match(input,RULE_ID,FOLLOW_2); 
 
             		newLeafNode(otherlv_2, grammarAccess.getServiceImplementationAccess().getSppSPPCrossReference_2_0()); 
             	
@@ -9155,7 +9155,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleLogicalSystem"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3708:1: entryRuleLogicalSystem returns [EObject current=null] : iv_ruleLogicalSystem= ruleLogicalSystem EOF ;
+    // InternalRoom.g:3708:1: entryRuleLogicalSystem returns [EObject current=null] : iv_ruleLogicalSystem= ruleLogicalSystem EOF ;
     public final EObject entryRuleLogicalSystem() throws RecognitionException {
         EObject current = null;
 
@@ -9163,17 +9163,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3709:2: (iv_ruleLogicalSystem= ruleLogicalSystem EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3710:2: iv_ruleLogicalSystem= ruleLogicalSystem EOF
+            // InternalRoom.g:3709:2: (iv_ruleLogicalSystem= ruleLogicalSystem EOF )
+            // InternalRoom.g:3710:2: iv_ruleLogicalSystem= ruleLogicalSystem EOF
             {
              newCompositeNode(grammarAccess.getLogicalSystemRule()); 
-            pushFollow(FOLLOW_ruleLogicalSystem_in_entryRuleLogicalSystem7390);
+            pushFollow(FOLLOW_1);
             iv_ruleLogicalSystem=ruleLogicalSystem();
 
             state._fsp--;
 
              current =iv_ruleLogicalSystem; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleLogicalSystem7400); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -9191,7 +9191,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleLogicalSystem"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3717:1: ruleLogicalSystem returns [EObject current=null] : (otherlv_0= 'LogicalSystem' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_annotations_4_0= ruleAnnotation ) )* ( ( (lv_connections_5_0= ruleLayerConnection ) ) | ( (lv_bindings_6_0= ruleBinding ) ) | ( (lv_subSystems_7_0= ruleSubSystemRef ) ) )* otherlv_8= '}' ) ;
+    // InternalRoom.g:3717:1: ruleLogicalSystem returns [EObject current=null] : (otherlv_0= 'LogicalSystem' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_annotations_4_0= ruleAnnotation ) )* ( ( (lv_connections_5_0= ruleLayerConnection ) ) | ( (lv_bindings_6_0= ruleBinding ) ) | ( (lv_subSystems_7_0= ruleSubSystemRef ) ) )* otherlv_8= '}' ) ;
     public final EObject ruleLogicalSystem() throws RecognitionException {
         EObject current = null;
 
@@ -9213,23 +9213,23 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3720:28: ( (otherlv_0= 'LogicalSystem' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_annotations_4_0= ruleAnnotation ) )* ( ( (lv_connections_5_0= ruleLayerConnection ) ) | ( (lv_bindings_6_0= ruleBinding ) ) | ( (lv_subSystems_7_0= ruleSubSystemRef ) ) )* otherlv_8= '}' ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3721:1: (otherlv_0= 'LogicalSystem' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_annotations_4_0= ruleAnnotation ) )* ( ( (lv_connections_5_0= ruleLayerConnection ) ) | ( (lv_bindings_6_0= ruleBinding ) ) | ( (lv_subSystems_7_0= ruleSubSystemRef ) ) )* otherlv_8= '}' )
+            // InternalRoom.g:3720:28: ( (otherlv_0= 'LogicalSystem' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_annotations_4_0= ruleAnnotation ) )* ( ( (lv_connections_5_0= ruleLayerConnection ) ) | ( (lv_bindings_6_0= ruleBinding ) ) | ( (lv_subSystems_7_0= ruleSubSystemRef ) ) )* otherlv_8= '}' ) )
+            // InternalRoom.g:3721:1: (otherlv_0= 'LogicalSystem' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_annotations_4_0= ruleAnnotation ) )* ( ( (lv_connections_5_0= ruleLayerConnection ) ) | ( (lv_bindings_6_0= ruleBinding ) ) | ( (lv_subSystems_7_0= ruleSubSystemRef ) ) )* otherlv_8= '}' )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3721:1: (otherlv_0= 'LogicalSystem' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_annotations_4_0= ruleAnnotation ) )* ( ( (lv_connections_5_0= ruleLayerConnection ) ) | ( (lv_bindings_6_0= ruleBinding ) ) | ( (lv_subSystems_7_0= ruleSubSystemRef ) ) )* otherlv_8= '}' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3721:3: otherlv_0= 'LogicalSystem' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_annotations_4_0= ruleAnnotation ) )* ( ( (lv_connections_5_0= ruleLayerConnection ) ) | ( (lv_bindings_6_0= ruleBinding ) ) | ( (lv_subSystems_7_0= ruleSubSystemRef ) ) )* otherlv_8= '}'
+            // InternalRoom.g:3721:1: (otherlv_0= 'LogicalSystem' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_annotations_4_0= ruleAnnotation ) )* ( ( (lv_connections_5_0= ruleLayerConnection ) ) | ( (lv_bindings_6_0= ruleBinding ) ) | ( (lv_subSystems_7_0= ruleSubSystemRef ) ) )* otherlv_8= '}' )
+            // InternalRoom.g:3721:3: otherlv_0= 'LogicalSystem' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_annotations_4_0= ruleAnnotation ) )* ( ( (lv_connections_5_0= ruleLayerConnection ) ) | ( (lv_bindings_6_0= ruleBinding ) ) | ( (lv_subSystems_7_0= ruleSubSystemRef ) ) )* otherlv_8= '}'
             {
-            otherlv_0=(Token)match(input,63,FOLLOW_63_in_ruleLogicalSystem7437); 
+            otherlv_0=(Token)match(input,63,FOLLOW_3); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getLogicalSystemAccess().getLogicalSystemKeyword_0());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3725:1: ( (lv_name_1_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3726:1: (lv_name_1_0= RULE_ID )
+            // InternalRoom.g:3725:1: ( (lv_name_1_0= RULE_ID ) )
+            // InternalRoom.g:3726:1: (lv_name_1_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3726:1: (lv_name_1_0= RULE_ID )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3727:3: lv_name_1_0= RULE_ID
+            // InternalRoom.g:3726:1: (lv_name_1_0= RULE_ID )
+            // InternalRoom.g:3727:3: lv_name_1_0= RULE_ID
             {
-            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleLogicalSystem7454); 
+            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_4); 
 
             			newLeafNode(lv_name_1_0, grammarAccess.getLogicalSystemAccess().getNameIDTerminalRuleCall_1_0()); 
             		
@@ -9241,7 +9241,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"name",
                     		lv_name_1_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -9249,7 +9249,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3743:2: ( (lv_docu_2_0= ruleDocumentation ) )?
+            // InternalRoom.g:3743:2: ( (lv_docu_2_0= ruleDocumentation ) )?
             int alt86=2;
             int LA86_0 = input.LA(1);
 
@@ -9258,15 +9258,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt86) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3744:1: (lv_docu_2_0= ruleDocumentation )
+                    // InternalRoom.g:3744:1: (lv_docu_2_0= ruleDocumentation )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3744:1: (lv_docu_2_0= ruleDocumentation )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3745:3: lv_docu_2_0= ruleDocumentation
+                    // InternalRoom.g:3744:1: (lv_docu_2_0= ruleDocumentation )
+                    // InternalRoom.g:3745:3: lv_docu_2_0= ruleDocumentation
                     {
                      
                     	        newCompositeNode(grammarAccess.getLogicalSystemAccess().getDocuDocumentationParserRuleCall_2_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDocumentation_in_ruleLogicalSystem7480);
+                    pushFollow(FOLLOW_5);
                     lv_docu_2_0=ruleDocumentation();
 
                     state._fsp--;
@@ -9279,7 +9279,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"docu",
                             		lv_docu_2_0, 
-                            		"Documentation");
+                            		"org.eclipse.etrice.core.common.Base.Documentation");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -9291,11 +9291,11 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_3=(Token)match(input,13,FOLLOW_13_in_ruleLogicalSystem7493); 
+            otherlv_3=(Token)match(input,13,FOLLOW_74); 
 
                 	newLeafNode(otherlv_3, grammarAccess.getLogicalSystemAccess().getLeftCurlyBracketKeyword_3());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3765:1: ( (lv_annotations_4_0= ruleAnnotation ) )*
+            // InternalRoom.g:3765:1: ( (lv_annotations_4_0= ruleAnnotation ) )*
             loop87:
             do {
                 int alt87=2;
@@ -9308,15 +9308,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                 switch (alt87) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3766:1: (lv_annotations_4_0= ruleAnnotation )
+            	    // InternalRoom.g:3766:1: (lv_annotations_4_0= ruleAnnotation )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3766:1: (lv_annotations_4_0= ruleAnnotation )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3767:3: lv_annotations_4_0= ruleAnnotation
+            	    // InternalRoom.g:3766:1: (lv_annotations_4_0= ruleAnnotation )
+            	    // InternalRoom.g:3767:3: lv_annotations_4_0= ruleAnnotation
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getLogicalSystemAccess().getAnnotationsAnnotationParserRuleCall_4_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleAnnotation_in_ruleLogicalSystem7514);
+            	    pushFollow(FOLLOW_74);
             	    lv_annotations_4_0=ruleAnnotation();
 
             	    state._fsp--;
@@ -9329,7 +9329,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"annotations",
             	            		lv_annotations_4_0, 
-            	            		"Annotation");
+            	            		"org.eclipse.etrice.core.common.Base.Annotation");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -9344,7 +9344,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                 }
             } while (true);
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3783:3: ( ( (lv_connections_5_0= ruleLayerConnection ) ) | ( (lv_bindings_6_0= ruleBinding ) ) | ( (lv_subSystems_7_0= ruleSubSystemRef ) ) )*
+            // InternalRoom.g:3783:3: ( ( (lv_connections_5_0= ruleLayerConnection ) ) | ( (lv_bindings_6_0= ruleBinding ) ) | ( (lv_subSystems_7_0= ruleSubSystemRef ) ) )*
             loop88:
             do {
                 int alt88=4;
@@ -9369,18 +9369,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                 switch (alt88) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3783:4: ( (lv_connections_5_0= ruleLayerConnection ) )
+            	    // InternalRoom.g:3783:4: ( (lv_connections_5_0= ruleLayerConnection ) )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3783:4: ( (lv_connections_5_0= ruleLayerConnection ) )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3784:1: (lv_connections_5_0= ruleLayerConnection )
+            	    // InternalRoom.g:3783:4: ( (lv_connections_5_0= ruleLayerConnection ) )
+            	    // InternalRoom.g:3784:1: (lv_connections_5_0= ruleLayerConnection )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3784:1: (lv_connections_5_0= ruleLayerConnection )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3785:3: lv_connections_5_0= ruleLayerConnection
+            	    // InternalRoom.g:3784:1: (lv_connections_5_0= ruleLayerConnection )
+            	    // InternalRoom.g:3785:3: lv_connections_5_0= ruleLayerConnection
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getLogicalSystemAccess().getConnectionsLayerConnectionParserRuleCall_5_0_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleLayerConnection_in_ruleLogicalSystem7537);
+            	    pushFollow(FOLLOW_75);
             	    lv_connections_5_0=ruleLayerConnection();
 
             	    state._fsp--;
@@ -9393,7 +9393,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"connections",
             	            		lv_connections_5_0, 
-            	            		"LayerConnection");
+            	            		"org.eclipse.etrice.core.Room.LayerConnection");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -9406,18 +9406,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 2 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3802:6: ( (lv_bindings_6_0= ruleBinding ) )
+            	    // InternalRoom.g:3802:6: ( (lv_bindings_6_0= ruleBinding ) )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3802:6: ( (lv_bindings_6_0= ruleBinding ) )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3803:1: (lv_bindings_6_0= ruleBinding )
+            	    // InternalRoom.g:3802:6: ( (lv_bindings_6_0= ruleBinding ) )
+            	    // InternalRoom.g:3803:1: (lv_bindings_6_0= ruleBinding )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3803:1: (lv_bindings_6_0= ruleBinding )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3804:3: lv_bindings_6_0= ruleBinding
+            	    // InternalRoom.g:3803:1: (lv_bindings_6_0= ruleBinding )
+            	    // InternalRoom.g:3804:3: lv_bindings_6_0= ruleBinding
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getLogicalSystemAccess().getBindingsBindingParserRuleCall_5_1_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleBinding_in_ruleLogicalSystem7564);
+            	    pushFollow(FOLLOW_75);
             	    lv_bindings_6_0=ruleBinding();
 
             	    state._fsp--;
@@ -9430,7 +9430,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"bindings",
             	            		lv_bindings_6_0, 
-            	            		"Binding");
+            	            		"org.eclipse.etrice.core.Room.Binding");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -9443,18 +9443,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 3 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3821:6: ( (lv_subSystems_7_0= ruleSubSystemRef ) )
+            	    // InternalRoom.g:3821:6: ( (lv_subSystems_7_0= ruleSubSystemRef ) )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3821:6: ( (lv_subSystems_7_0= ruleSubSystemRef ) )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3822:1: (lv_subSystems_7_0= ruleSubSystemRef )
+            	    // InternalRoom.g:3821:6: ( (lv_subSystems_7_0= ruleSubSystemRef ) )
+            	    // InternalRoom.g:3822:1: (lv_subSystems_7_0= ruleSubSystemRef )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3822:1: (lv_subSystems_7_0= ruleSubSystemRef )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3823:3: lv_subSystems_7_0= ruleSubSystemRef
+            	    // InternalRoom.g:3822:1: (lv_subSystems_7_0= ruleSubSystemRef )
+            	    // InternalRoom.g:3823:3: lv_subSystems_7_0= ruleSubSystemRef
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getLogicalSystemAccess().getSubSystemsSubSystemRefParserRuleCall_5_2_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleSubSystemRef_in_ruleLogicalSystem7591);
+            	    pushFollow(FOLLOW_75);
             	    lv_subSystems_7_0=ruleSubSystemRef();
 
             	    state._fsp--;
@@ -9467,7 +9467,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"subSystems",
             	            		lv_subSystems_7_0, 
-            	            		"SubSystemRef");
+            	            		"org.eclipse.etrice.core.Room.SubSystemRef");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -9485,7 +9485,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                 }
             } while (true);
 
-            otherlv_8=(Token)match(input,14,FOLLOW_14_in_ruleLogicalSystem7605); 
+            otherlv_8=(Token)match(input,14,FOLLOW_2); 
 
                 	newLeafNode(otherlv_8, grammarAccess.getLogicalSystemAccess().getRightCurlyBracketKeyword_6());
                 
@@ -9510,7 +9510,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleSubSystemRef"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3853:1: entryRuleSubSystemRef returns [EObject current=null] : iv_ruleSubSystemRef= ruleSubSystemRef EOF ;
+    // InternalRoom.g:3853:1: entryRuleSubSystemRef returns [EObject current=null] : iv_ruleSubSystemRef= ruleSubSystemRef EOF ;
     public final EObject entryRuleSubSystemRef() throws RecognitionException {
         EObject current = null;
 
@@ -9518,17 +9518,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3854:2: (iv_ruleSubSystemRef= ruleSubSystemRef EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3855:2: iv_ruleSubSystemRef= ruleSubSystemRef EOF
+            // InternalRoom.g:3854:2: (iv_ruleSubSystemRef= ruleSubSystemRef EOF )
+            // InternalRoom.g:3855:2: iv_ruleSubSystemRef= ruleSubSystemRef EOF
             {
              newCompositeNode(grammarAccess.getSubSystemRefRule()); 
-            pushFollow(FOLLOW_ruleSubSystemRef_in_entryRuleSubSystemRef7643);
+            pushFollow(FOLLOW_1);
             iv_ruleSubSystemRef=ruleSubSystemRef();
 
             state._fsp--;
 
              current =iv_ruleSubSystemRef; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSubSystemRef7653); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -9546,7 +9546,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleSubSystemRef"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3862:1: ruleSubSystemRef returns [EObject current=null] : (otherlv_0= 'SubSystemRef' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( ruleFQN ) ) ( (lv_docu_4_0= ruleDocumentation ) )? ) ;
+    // InternalRoom.g:3862:1: ruleSubSystemRef returns [EObject current=null] : (otherlv_0= 'SubSystemRef' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( ruleFQN ) ) ( (lv_docu_4_0= ruleDocumentation ) )? ) ;
     public final EObject ruleSubSystemRef() throws RecognitionException {
         EObject current = null;
 
@@ -9559,23 +9559,23 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3865:28: ( (otherlv_0= 'SubSystemRef' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( ruleFQN ) ) ( (lv_docu_4_0= ruleDocumentation ) )? ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3866:1: (otherlv_0= 'SubSystemRef' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( ruleFQN ) ) ( (lv_docu_4_0= ruleDocumentation ) )? )
+            // InternalRoom.g:3865:28: ( (otherlv_0= 'SubSystemRef' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( ruleFQN ) ) ( (lv_docu_4_0= ruleDocumentation ) )? ) )
+            // InternalRoom.g:3866:1: (otherlv_0= 'SubSystemRef' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( ruleFQN ) ) ( (lv_docu_4_0= ruleDocumentation ) )? )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3866:1: (otherlv_0= 'SubSystemRef' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( ruleFQN ) ) ( (lv_docu_4_0= ruleDocumentation ) )? )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3866:3: otherlv_0= 'SubSystemRef' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( ruleFQN ) ) ( (lv_docu_4_0= ruleDocumentation ) )?
+            // InternalRoom.g:3866:1: (otherlv_0= 'SubSystemRef' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( ruleFQN ) ) ( (lv_docu_4_0= ruleDocumentation ) )? )
+            // InternalRoom.g:3866:3: otherlv_0= 'SubSystemRef' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( ruleFQN ) ) ( (lv_docu_4_0= ruleDocumentation ) )?
             {
-            otherlv_0=(Token)match(input,64,FOLLOW_64_in_ruleSubSystemRef7690); 
+            otherlv_0=(Token)match(input,64,FOLLOW_3); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getSubSystemRefAccess().getSubSystemRefKeyword_0());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3870:1: ( (lv_name_1_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3871:1: (lv_name_1_0= RULE_ID )
+            // InternalRoom.g:3870:1: ( (lv_name_1_0= RULE_ID ) )
+            // InternalRoom.g:3871:1: (lv_name_1_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3871:1: (lv_name_1_0= RULE_ID )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3872:3: lv_name_1_0= RULE_ID
+            // InternalRoom.g:3871:1: (lv_name_1_0= RULE_ID )
+            // InternalRoom.g:3872:3: lv_name_1_0= RULE_ID
             {
-            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleSubSystemRef7707); 
+            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_8); 
 
             			newLeafNode(lv_name_1_0, grammarAccess.getSubSystemRefAccess().getNameIDTerminalRuleCall_1_0()); 
             		
@@ -9587,7 +9587,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"name",
                     		lv_name_1_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -9595,15 +9595,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_2=(Token)match(input,15,FOLLOW_15_in_ruleSubSystemRef7724); 
+            otherlv_2=(Token)match(input,15,FOLLOW_3); 
 
                 	newLeafNode(otherlv_2, grammarAccess.getSubSystemRefAccess().getColonKeyword_2());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3892:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3893:1: ( ruleFQN )
+            // InternalRoom.g:3892:1: ( ( ruleFQN ) )
+            // InternalRoom.g:3893:1: ( ruleFQN )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3893:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3894:3: ruleFQN
+            // InternalRoom.g:3893:1: ( ruleFQN )
+            // InternalRoom.g:3894:3: ruleFQN
             {
 
             			if (current==null) {
@@ -9613,7 +9613,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
              
             	        newCompositeNode(grammarAccess.getSubSystemRefAccess().getTypeSubSystemClassCrossReference_3_0()); 
             	    
-            pushFollow(FOLLOW_ruleFQN_in_ruleSubSystemRef7747);
+            pushFollow(FOLLOW_16);
             ruleFQN();
 
             state._fsp--;
@@ -9627,7 +9627,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3907:2: ( (lv_docu_4_0= ruleDocumentation ) )?
+            // InternalRoom.g:3907:2: ( (lv_docu_4_0= ruleDocumentation ) )?
             int alt89=2;
             int LA89_0 = input.LA(1);
 
@@ -9636,15 +9636,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt89) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3908:1: (lv_docu_4_0= ruleDocumentation )
+                    // InternalRoom.g:3908:1: (lv_docu_4_0= ruleDocumentation )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3908:1: (lv_docu_4_0= ruleDocumentation )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3909:3: lv_docu_4_0= ruleDocumentation
+                    // InternalRoom.g:3908:1: (lv_docu_4_0= ruleDocumentation )
+                    // InternalRoom.g:3909:3: lv_docu_4_0= ruleDocumentation
                     {
                      
                     	        newCompositeNode(grammarAccess.getSubSystemRefAccess().getDocuDocumentationParserRuleCall_4_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDocumentation_in_ruleSubSystemRef7768);
+                    pushFollow(FOLLOW_2);
                     lv_docu_4_0=ruleDocumentation();
 
                     state._fsp--;
@@ -9657,7 +9657,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"docu",
                             		lv_docu_4_0, 
-                            		"Documentation");
+                            		"org.eclipse.etrice.core.common.Base.Documentation");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -9690,7 +9690,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleSubSystemClass"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3933:1: entryRuleSubSystemClass returns [EObject current=null] : iv_ruleSubSystemClass= ruleSubSystemClass EOF ;
+    // InternalRoom.g:3933:1: entryRuleSubSystemClass returns [EObject current=null] : iv_ruleSubSystemClass= ruleSubSystemClass EOF ;
     public final EObject entryRuleSubSystemClass() throws RecognitionException {
         EObject current = null;
 
@@ -9698,17 +9698,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3934:2: (iv_ruleSubSystemClass= ruleSubSystemClass EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3935:2: iv_ruleSubSystemClass= ruleSubSystemClass EOF
+            // InternalRoom.g:3934:2: (iv_ruleSubSystemClass= ruleSubSystemClass EOF )
+            // InternalRoom.g:3935:2: iv_ruleSubSystemClass= ruleSubSystemClass EOF
             {
              newCompositeNode(grammarAccess.getSubSystemClassRule()); 
-            pushFollow(FOLLOW_ruleSubSystemClass_in_entryRuleSubSystemClass7805);
+            pushFollow(FOLLOW_1);
             iv_ruleSubSystemClass=ruleSubSystemClass();
 
             state._fsp--;
 
              current =iv_ruleSubSystemClass; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSubSystemClass7815); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -9726,7 +9726,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleSubSystemClass"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3942:1: ruleSubSystemClass returns [EObject current=null] : (otherlv_0= 'SubSystemClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_annotations_4_0= ruleAnnotation ) )* (otherlv_5= 'usercode1' ( (lv_userCode1_6_0= ruleDetailCode ) ) )? (otherlv_7= 'usercode2' ( (lv_userCode2_8_0= ruleDetailCode ) ) )? (otherlv_9= 'usercode3' ( (lv_userCode3_10_0= ruleDetailCode ) ) )? ( ( (lv_actorInstanceMappings_11_0= ruleActorInstanceMapping ) ) | ( (lv_threads_12_0= ruleLogicalThread ) ) | ( (lv_connections_13_0= ruleLayerConnection ) ) | ( (lv_bindings_14_0= ruleBinding ) ) | ( (lv_actorRefs_15_0= ruleActorRef ) ) | ( (lv_serviceProvisionPoints_16_0= ruleSPP ) ) | ( (lv_relayPorts_17_0= rulePort ) ) )* otherlv_18= '}' ) ;
+    // InternalRoom.g:3942:1: ruleSubSystemClass returns [EObject current=null] : (otherlv_0= 'SubSystemClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_annotations_4_0= ruleAnnotation ) )* (otherlv_5= 'usercode1' ( (lv_userCode1_6_0= ruleDetailCode ) ) )? (otherlv_7= 'usercode2' ( (lv_userCode2_8_0= ruleDetailCode ) ) )? (otherlv_9= 'usercode3' ( (lv_userCode3_10_0= ruleDetailCode ) ) )? ( ( (lv_actorInstanceMappings_11_0= ruleActorInstanceMapping ) ) | ( (lv_threads_12_0= ruleLogicalThread ) ) | ( (lv_connections_13_0= ruleLayerConnection ) ) | ( (lv_bindings_14_0= ruleBinding ) ) | ( (lv_actorRefs_15_0= ruleActorRef ) ) | ( (lv_serviceProvisionPoints_16_0= ruleSPP ) ) | ( (lv_relayPorts_17_0= rulePort ) ) )* otherlv_18= '}' ) ;
     public final EObject ruleSubSystemClass() throws RecognitionException {
         EObject current = null;
 
@@ -9765,23 +9765,23 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3945:28: ( (otherlv_0= 'SubSystemClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_annotations_4_0= ruleAnnotation ) )* (otherlv_5= 'usercode1' ( (lv_userCode1_6_0= ruleDetailCode ) ) )? (otherlv_7= 'usercode2' ( (lv_userCode2_8_0= ruleDetailCode ) ) )? (otherlv_9= 'usercode3' ( (lv_userCode3_10_0= ruleDetailCode ) ) )? ( ( (lv_actorInstanceMappings_11_0= ruleActorInstanceMapping ) ) | ( (lv_threads_12_0= ruleLogicalThread ) ) | ( (lv_connections_13_0= ruleLayerConnection ) ) | ( (lv_bindings_14_0= ruleBinding ) ) | ( (lv_actorRefs_15_0= ruleActorRef ) ) | ( (lv_serviceProvisionPoints_16_0= ruleSPP ) ) | ( (lv_relayPorts_17_0= rulePort ) ) )* otherlv_18= '}' ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3946:1: (otherlv_0= 'SubSystemClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_annotations_4_0= ruleAnnotation ) )* (otherlv_5= 'usercode1' ( (lv_userCode1_6_0= ruleDetailCode ) ) )? (otherlv_7= 'usercode2' ( (lv_userCode2_8_0= ruleDetailCode ) ) )? (otherlv_9= 'usercode3' ( (lv_userCode3_10_0= ruleDetailCode ) ) )? ( ( (lv_actorInstanceMappings_11_0= ruleActorInstanceMapping ) ) | ( (lv_threads_12_0= ruleLogicalThread ) ) | ( (lv_connections_13_0= ruleLayerConnection ) ) | ( (lv_bindings_14_0= ruleBinding ) ) | ( (lv_actorRefs_15_0= ruleActorRef ) ) | ( (lv_serviceProvisionPoints_16_0= ruleSPP ) ) | ( (lv_relayPorts_17_0= rulePort ) ) )* otherlv_18= '}' )
+            // InternalRoom.g:3945:28: ( (otherlv_0= 'SubSystemClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_annotations_4_0= ruleAnnotation ) )* (otherlv_5= 'usercode1' ( (lv_userCode1_6_0= ruleDetailCode ) ) )? (otherlv_7= 'usercode2' ( (lv_userCode2_8_0= ruleDetailCode ) ) )? (otherlv_9= 'usercode3' ( (lv_userCode3_10_0= ruleDetailCode ) ) )? ( ( (lv_actorInstanceMappings_11_0= ruleActorInstanceMapping ) ) | ( (lv_threads_12_0= ruleLogicalThread ) ) | ( (lv_connections_13_0= ruleLayerConnection ) ) | ( (lv_bindings_14_0= ruleBinding ) ) | ( (lv_actorRefs_15_0= ruleActorRef ) ) | ( (lv_serviceProvisionPoints_16_0= ruleSPP ) ) | ( (lv_relayPorts_17_0= rulePort ) ) )* otherlv_18= '}' ) )
+            // InternalRoom.g:3946:1: (otherlv_0= 'SubSystemClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_annotations_4_0= ruleAnnotation ) )* (otherlv_5= 'usercode1' ( (lv_userCode1_6_0= ruleDetailCode ) ) )? (otherlv_7= 'usercode2' ( (lv_userCode2_8_0= ruleDetailCode ) ) )? (otherlv_9= 'usercode3' ( (lv_userCode3_10_0= ruleDetailCode ) ) )? ( ( (lv_actorInstanceMappings_11_0= ruleActorInstanceMapping ) ) | ( (lv_threads_12_0= ruleLogicalThread ) ) | ( (lv_connections_13_0= ruleLayerConnection ) ) | ( (lv_bindings_14_0= ruleBinding ) ) | ( (lv_actorRefs_15_0= ruleActorRef ) ) | ( (lv_serviceProvisionPoints_16_0= ruleSPP ) ) | ( (lv_relayPorts_17_0= rulePort ) ) )* otherlv_18= '}' )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3946:1: (otherlv_0= 'SubSystemClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_annotations_4_0= ruleAnnotation ) )* (otherlv_5= 'usercode1' ( (lv_userCode1_6_0= ruleDetailCode ) ) )? (otherlv_7= 'usercode2' ( (lv_userCode2_8_0= ruleDetailCode ) ) )? (otherlv_9= 'usercode3' ( (lv_userCode3_10_0= ruleDetailCode ) ) )? ( ( (lv_actorInstanceMappings_11_0= ruleActorInstanceMapping ) ) | ( (lv_threads_12_0= ruleLogicalThread ) ) | ( (lv_connections_13_0= ruleLayerConnection ) ) | ( (lv_bindings_14_0= ruleBinding ) ) | ( (lv_actorRefs_15_0= ruleActorRef ) ) | ( (lv_serviceProvisionPoints_16_0= ruleSPP ) ) | ( (lv_relayPorts_17_0= rulePort ) ) )* otherlv_18= '}' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3946:3: otherlv_0= 'SubSystemClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_annotations_4_0= ruleAnnotation ) )* (otherlv_5= 'usercode1' ( (lv_userCode1_6_0= ruleDetailCode ) ) )? (otherlv_7= 'usercode2' ( (lv_userCode2_8_0= ruleDetailCode ) ) )? (otherlv_9= 'usercode3' ( (lv_userCode3_10_0= ruleDetailCode ) ) )? ( ( (lv_actorInstanceMappings_11_0= ruleActorInstanceMapping ) ) | ( (lv_threads_12_0= ruleLogicalThread ) ) | ( (lv_connections_13_0= ruleLayerConnection ) ) | ( (lv_bindings_14_0= ruleBinding ) ) | ( (lv_actorRefs_15_0= ruleActorRef ) ) | ( (lv_serviceProvisionPoints_16_0= ruleSPP ) ) | ( (lv_relayPorts_17_0= rulePort ) ) )* otherlv_18= '}'
+            // InternalRoom.g:3946:1: (otherlv_0= 'SubSystemClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_annotations_4_0= ruleAnnotation ) )* (otherlv_5= 'usercode1' ( (lv_userCode1_6_0= ruleDetailCode ) ) )? (otherlv_7= 'usercode2' ( (lv_userCode2_8_0= ruleDetailCode ) ) )? (otherlv_9= 'usercode3' ( (lv_userCode3_10_0= ruleDetailCode ) ) )? ( ( (lv_actorInstanceMappings_11_0= ruleActorInstanceMapping ) ) | ( (lv_threads_12_0= ruleLogicalThread ) ) | ( (lv_connections_13_0= ruleLayerConnection ) ) | ( (lv_bindings_14_0= ruleBinding ) ) | ( (lv_actorRefs_15_0= ruleActorRef ) ) | ( (lv_serviceProvisionPoints_16_0= ruleSPP ) ) | ( (lv_relayPorts_17_0= rulePort ) ) )* otherlv_18= '}' )
+            // InternalRoom.g:3946:3: otherlv_0= 'SubSystemClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' ( (lv_annotations_4_0= ruleAnnotation ) )* (otherlv_5= 'usercode1' ( (lv_userCode1_6_0= ruleDetailCode ) ) )? (otherlv_7= 'usercode2' ( (lv_userCode2_8_0= ruleDetailCode ) ) )? (otherlv_9= 'usercode3' ( (lv_userCode3_10_0= ruleDetailCode ) ) )? ( ( (lv_actorInstanceMappings_11_0= ruleActorInstanceMapping ) ) | ( (lv_threads_12_0= ruleLogicalThread ) ) | ( (lv_connections_13_0= ruleLayerConnection ) ) | ( (lv_bindings_14_0= ruleBinding ) ) | ( (lv_actorRefs_15_0= ruleActorRef ) ) | ( (lv_serviceProvisionPoints_16_0= ruleSPP ) ) | ( (lv_relayPorts_17_0= rulePort ) ) )* otherlv_18= '}'
             {
-            otherlv_0=(Token)match(input,65,FOLLOW_65_in_ruleSubSystemClass7852); 
+            otherlv_0=(Token)match(input,65,FOLLOW_3); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getSubSystemClassAccess().getSubSystemClassKeyword_0());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3950:1: ( (lv_name_1_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3951:1: (lv_name_1_0= RULE_ID )
+            // InternalRoom.g:3950:1: ( (lv_name_1_0= RULE_ID ) )
+            // InternalRoom.g:3951:1: (lv_name_1_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3951:1: (lv_name_1_0= RULE_ID )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3952:3: lv_name_1_0= RULE_ID
+            // InternalRoom.g:3951:1: (lv_name_1_0= RULE_ID )
+            // InternalRoom.g:3952:3: lv_name_1_0= RULE_ID
             {
-            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleSubSystemClass7869); 
+            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_4); 
 
             			newLeafNode(lv_name_1_0, grammarAccess.getSubSystemClassAccess().getNameIDTerminalRuleCall_1_0()); 
             		
@@ -9793,7 +9793,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"name",
                     		lv_name_1_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -9801,7 +9801,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3968:2: ( (lv_docu_2_0= ruleDocumentation ) )?
+            // InternalRoom.g:3968:2: ( (lv_docu_2_0= ruleDocumentation ) )?
             int alt90=2;
             int LA90_0 = input.LA(1);
 
@@ -9810,15 +9810,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt90) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3969:1: (lv_docu_2_0= ruleDocumentation )
+                    // InternalRoom.g:3969:1: (lv_docu_2_0= ruleDocumentation )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3969:1: (lv_docu_2_0= ruleDocumentation )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3970:3: lv_docu_2_0= ruleDocumentation
+                    // InternalRoom.g:3969:1: (lv_docu_2_0= ruleDocumentation )
+                    // InternalRoom.g:3970:3: lv_docu_2_0= ruleDocumentation
                     {
                      
                     	        newCompositeNode(grammarAccess.getSubSystemClassAccess().getDocuDocumentationParserRuleCall_2_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDocumentation_in_ruleSubSystemClass7895);
+                    pushFollow(FOLLOW_5);
                     lv_docu_2_0=ruleDocumentation();
 
                     state._fsp--;
@@ -9831,7 +9831,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"docu",
                             		lv_docu_2_0, 
-                            		"Documentation");
+                            		"org.eclipse.etrice.core.common.Base.Documentation");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -9843,11 +9843,11 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_3=(Token)match(input,13,FOLLOW_13_in_ruleSubSystemClass7908); 
+            otherlv_3=(Token)match(input,13,FOLLOW_76); 
 
                 	newLeafNode(otherlv_3, grammarAccess.getSubSystemClassAccess().getLeftCurlyBracketKeyword_3());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3990:1: ( (lv_annotations_4_0= ruleAnnotation ) )*
+            // InternalRoom.g:3990:1: ( (lv_annotations_4_0= ruleAnnotation ) )*
             loop91:
             do {
                 int alt91=2;
@@ -9860,15 +9860,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                 switch (alt91) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3991:1: (lv_annotations_4_0= ruleAnnotation )
+            	    // InternalRoom.g:3991:1: (lv_annotations_4_0= ruleAnnotation )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3991:1: (lv_annotations_4_0= ruleAnnotation )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3992:3: lv_annotations_4_0= ruleAnnotation
+            	    // InternalRoom.g:3991:1: (lv_annotations_4_0= ruleAnnotation )
+            	    // InternalRoom.g:3992:3: lv_annotations_4_0= ruleAnnotation
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getSubSystemClassAccess().getAnnotationsAnnotationParserRuleCall_4_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleAnnotation_in_ruleSubSystemClass7929);
+            	    pushFollow(FOLLOW_76);
             	    lv_annotations_4_0=ruleAnnotation();
 
             	    state._fsp--;
@@ -9881,7 +9881,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"annotations",
             	            		lv_annotations_4_0, 
-            	            		"Annotation");
+            	            		"org.eclipse.etrice.core.common.Base.Annotation");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -9896,7 +9896,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                 }
             } while (true);
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4008:3: (otherlv_5= 'usercode1' ( (lv_userCode1_6_0= ruleDetailCode ) ) )?
+            // InternalRoom.g:4008:3: (otherlv_5= 'usercode1' ( (lv_userCode1_6_0= ruleDetailCode ) ) )?
             int alt92=2;
             int LA92_0 = input.LA(1);
 
@@ -9905,22 +9905,22 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt92) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4008:5: otherlv_5= 'usercode1' ( (lv_userCode1_6_0= ruleDetailCode ) )
+                    // InternalRoom.g:4008:5: otherlv_5= 'usercode1' ( (lv_userCode1_6_0= ruleDetailCode ) )
                     {
-                    otherlv_5=(Token)match(input,29,FOLLOW_29_in_ruleSubSystemClass7943); 
+                    otherlv_5=(Token)match(input,29,FOLLOW_5); 
 
                         	newLeafNode(otherlv_5, grammarAccess.getSubSystemClassAccess().getUsercode1Keyword_5_0());
                         
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4012:1: ( (lv_userCode1_6_0= ruleDetailCode ) )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4013:1: (lv_userCode1_6_0= ruleDetailCode )
+                    // InternalRoom.g:4012:1: ( (lv_userCode1_6_0= ruleDetailCode ) )
+                    // InternalRoom.g:4013:1: (lv_userCode1_6_0= ruleDetailCode )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4013:1: (lv_userCode1_6_0= ruleDetailCode )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4014:3: lv_userCode1_6_0= ruleDetailCode
+                    // InternalRoom.g:4013:1: (lv_userCode1_6_0= ruleDetailCode )
+                    // InternalRoom.g:4014:3: lv_userCode1_6_0= ruleDetailCode
                     {
                      
                     	        newCompositeNode(grammarAccess.getSubSystemClassAccess().getUserCode1DetailCodeParserRuleCall_5_1_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDetailCode_in_ruleSubSystemClass7964);
+                    pushFollow(FOLLOW_77);
                     lv_userCode1_6_0=ruleDetailCode();
 
                     state._fsp--;
@@ -9933,7 +9933,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"userCode1",
                             		lv_userCode1_6_0, 
-                            		"DetailCode");
+                            		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -9948,7 +9948,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4030:4: (otherlv_7= 'usercode2' ( (lv_userCode2_8_0= ruleDetailCode ) ) )?
+            // InternalRoom.g:4030:4: (otherlv_7= 'usercode2' ( (lv_userCode2_8_0= ruleDetailCode ) ) )?
             int alt93=2;
             int LA93_0 = input.LA(1);
 
@@ -9957,22 +9957,22 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt93) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4030:6: otherlv_7= 'usercode2' ( (lv_userCode2_8_0= ruleDetailCode ) )
+                    // InternalRoom.g:4030:6: otherlv_7= 'usercode2' ( (lv_userCode2_8_0= ruleDetailCode ) )
                     {
-                    otherlv_7=(Token)match(input,30,FOLLOW_30_in_ruleSubSystemClass7979); 
+                    otherlv_7=(Token)match(input,30,FOLLOW_5); 
 
                         	newLeafNode(otherlv_7, grammarAccess.getSubSystemClassAccess().getUsercode2Keyword_6_0());
                         
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4034:1: ( (lv_userCode2_8_0= ruleDetailCode ) )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4035:1: (lv_userCode2_8_0= ruleDetailCode )
+                    // InternalRoom.g:4034:1: ( (lv_userCode2_8_0= ruleDetailCode ) )
+                    // InternalRoom.g:4035:1: (lv_userCode2_8_0= ruleDetailCode )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4035:1: (lv_userCode2_8_0= ruleDetailCode )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4036:3: lv_userCode2_8_0= ruleDetailCode
+                    // InternalRoom.g:4035:1: (lv_userCode2_8_0= ruleDetailCode )
+                    // InternalRoom.g:4036:3: lv_userCode2_8_0= ruleDetailCode
                     {
                      
                     	        newCompositeNode(grammarAccess.getSubSystemClassAccess().getUserCode2DetailCodeParserRuleCall_6_1_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDetailCode_in_ruleSubSystemClass8000);
+                    pushFollow(FOLLOW_78);
                     lv_userCode2_8_0=ruleDetailCode();
 
                     state._fsp--;
@@ -9985,7 +9985,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"userCode2",
                             		lv_userCode2_8_0, 
-                            		"DetailCode");
+                            		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -10000,7 +10000,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4052:4: (otherlv_9= 'usercode3' ( (lv_userCode3_10_0= ruleDetailCode ) ) )?
+            // InternalRoom.g:4052:4: (otherlv_9= 'usercode3' ( (lv_userCode3_10_0= ruleDetailCode ) ) )?
             int alt94=2;
             int LA94_0 = input.LA(1);
 
@@ -10009,22 +10009,22 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt94) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4052:6: otherlv_9= 'usercode3' ( (lv_userCode3_10_0= ruleDetailCode ) )
+                    // InternalRoom.g:4052:6: otherlv_9= 'usercode3' ( (lv_userCode3_10_0= ruleDetailCode ) )
                     {
-                    otherlv_9=(Token)match(input,31,FOLLOW_31_in_ruleSubSystemClass8015); 
+                    otherlv_9=(Token)match(input,31,FOLLOW_5); 
 
                         	newLeafNode(otherlv_9, grammarAccess.getSubSystemClassAccess().getUsercode3Keyword_7_0());
                         
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4056:1: ( (lv_userCode3_10_0= ruleDetailCode ) )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4057:1: (lv_userCode3_10_0= ruleDetailCode )
+                    // InternalRoom.g:4056:1: ( (lv_userCode3_10_0= ruleDetailCode ) )
+                    // InternalRoom.g:4057:1: (lv_userCode3_10_0= ruleDetailCode )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4057:1: (lv_userCode3_10_0= ruleDetailCode )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4058:3: lv_userCode3_10_0= ruleDetailCode
+                    // InternalRoom.g:4057:1: (lv_userCode3_10_0= ruleDetailCode )
+                    // InternalRoom.g:4058:3: lv_userCode3_10_0= ruleDetailCode
                     {
                      
                     	        newCompositeNode(grammarAccess.getSubSystemClassAccess().getUserCode3DetailCodeParserRuleCall_7_1_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDetailCode_in_ruleSubSystemClass8036);
+                    pushFollow(FOLLOW_79);
                     lv_userCode3_10_0=ruleDetailCode();
 
                     state._fsp--;
@@ -10037,7 +10037,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"userCode3",
                             		lv_userCode3_10_0, 
-                            		"DetailCode");
+                            		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -10052,7 +10052,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4074:4: ( ( (lv_actorInstanceMappings_11_0= ruleActorInstanceMapping ) ) | ( (lv_threads_12_0= ruleLogicalThread ) ) | ( (lv_connections_13_0= ruleLayerConnection ) ) | ( (lv_bindings_14_0= ruleBinding ) ) | ( (lv_actorRefs_15_0= ruleActorRef ) ) | ( (lv_serviceProvisionPoints_16_0= ruleSPP ) ) | ( (lv_relayPorts_17_0= rulePort ) ) )*
+            // InternalRoom.g:4074:4: ( ( (lv_actorInstanceMappings_11_0= ruleActorInstanceMapping ) ) | ( (lv_threads_12_0= ruleLogicalThread ) ) | ( (lv_connections_13_0= ruleLayerConnection ) ) | ( (lv_bindings_14_0= ruleBinding ) ) | ( (lv_actorRefs_15_0= ruleActorRef ) ) | ( (lv_serviceProvisionPoints_16_0= ruleSPP ) ) | ( (lv_relayPorts_17_0= rulePort ) ) )*
             loop95:
             do {
                 int alt95=8;
@@ -10100,18 +10100,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                 switch (alt95) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4074:5: ( (lv_actorInstanceMappings_11_0= ruleActorInstanceMapping ) )
+            	    // InternalRoom.g:4074:5: ( (lv_actorInstanceMappings_11_0= ruleActorInstanceMapping ) )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4074:5: ( (lv_actorInstanceMappings_11_0= ruleActorInstanceMapping ) )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4075:1: (lv_actorInstanceMappings_11_0= ruleActorInstanceMapping )
+            	    // InternalRoom.g:4074:5: ( (lv_actorInstanceMappings_11_0= ruleActorInstanceMapping ) )
+            	    // InternalRoom.g:4075:1: (lv_actorInstanceMappings_11_0= ruleActorInstanceMapping )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4075:1: (lv_actorInstanceMappings_11_0= ruleActorInstanceMapping )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4076:3: lv_actorInstanceMappings_11_0= ruleActorInstanceMapping
+            	    // InternalRoom.g:4075:1: (lv_actorInstanceMappings_11_0= ruleActorInstanceMapping )
+            	    // InternalRoom.g:4076:3: lv_actorInstanceMappings_11_0= ruleActorInstanceMapping
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getSubSystemClassAccess().getActorInstanceMappingsActorInstanceMappingParserRuleCall_8_0_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleActorInstanceMapping_in_ruleSubSystemClass8060);
+            	    pushFollow(FOLLOW_79);
             	    lv_actorInstanceMappings_11_0=ruleActorInstanceMapping();
 
             	    state._fsp--;
@@ -10124,7 +10124,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"actorInstanceMappings",
             	            		lv_actorInstanceMappings_11_0, 
-            	            		"ActorInstanceMapping");
+            	            		"org.eclipse.etrice.core.Room.ActorInstanceMapping");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -10137,18 +10137,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 2 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4093:6: ( (lv_threads_12_0= ruleLogicalThread ) )
+            	    // InternalRoom.g:4093:6: ( (lv_threads_12_0= ruleLogicalThread ) )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4093:6: ( (lv_threads_12_0= ruleLogicalThread ) )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4094:1: (lv_threads_12_0= ruleLogicalThread )
+            	    // InternalRoom.g:4093:6: ( (lv_threads_12_0= ruleLogicalThread ) )
+            	    // InternalRoom.g:4094:1: (lv_threads_12_0= ruleLogicalThread )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4094:1: (lv_threads_12_0= ruleLogicalThread )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4095:3: lv_threads_12_0= ruleLogicalThread
+            	    // InternalRoom.g:4094:1: (lv_threads_12_0= ruleLogicalThread )
+            	    // InternalRoom.g:4095:3: lv_threads_12_0= ruleLogicalThread
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getSubSystemClassAccess().getThreadsLogicalThreadParserRuleCall_8_1_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleLogicalThread_in_ruleSubSystemClass8087);
+            	    pushFollow(FOLLOW_79);
             	    lv_threads_12_0=ruleLogicalThread();
 
             	    state._fsp--;
@@ -10161,7 +10161,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"threads",
             	            		lv_threads_12_0, 
-            	            		"LogicalThread");
+            	            		"org.eclipse.etrice.core.Room.LogicalThread");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -10174,18 +10174,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 3 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4112:6: ( (lv_connections_13_0= ruleLayerConnection ) )
+            	    // InternalRoom.g:4112:6: ( (lv_connections_13_0= ruleLayerConnection ) )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4112:6: ( (lv_connections_13_0= ruleLayerConnection ) )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4113:1: (lv_connections_13_0= ruleLayerConnection )
+            	    // InternalRoom.g:4112:6: ( (lv_connections_13_0= ruleLayerConnection ) )
+            	    // InternalRoom.g:4113:1: (lv_connections_13_0= ruleLayerConnection )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4113:1: (lv_connections_13_0= ruleLayerConnection )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4114:3: lv_connections_13_0= ruleLayerConnection
+            	    // InternalRoom.g:4113:1: (lv_connections_13_0= ruleLayerConnection )
+            	    // InternalRoom.g:4114:3: lv_connections_13_0= ruleLayerConnection
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getSubSystemClassAccess().getConnectionsLayerConnectionParserRuleCall_8_2_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleLayerConnection_in_ruleSubSystemClass8114);
+            	    pushFollow(FOLLOW_79);
             	    lv_connections_13_0=ruleLayerConnection();
 
             	    state._fsp--;
@@ -10198,7 +10198,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"connections",
             	            		lv_connections_13_0, 
-            	            		"LayerConnection");
+            	            		"org.eclipse.etrice.core.Room.LayerConnection");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -10211,18 +10211,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 4 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4131:6: ( (lv_bindings_14_0= ruleBinding ) )
+            	    // InternalRoom.g:4131:6: ( (lv_bindings_14_0= ruleBinding ) )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4131:6: ( (lv_bindings_14_0= ruleBinding ) )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4132:1: (lv_bindings_14_0= ruleBinding )
+            	    // InternalRoom.g:4131:6: ( (lv_bindings_14_0= ruleBinding ) )
+            	    // InternalRoom.g:4132:1: (lv_bindings_14_0= ruleBinding )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4132:1: (lv_bindings_14_0= ruleBinding )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4133:3: lv_bindings_14_0= ruleBinding
+            	    // InternalRoom.g:4132:1: (lv_bindings_14_0= ruleBinding )
+            	    // InternalRoom.g:4133:3: lv_bindings_14_0= ruleBinding
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getSubSystemClassAccess().getBindingsBindingParserRuleCall_8_3_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleBinding_in_ruleSubSystemClass8141);
+            	    pushFollow(FOLLOW_79);
             	    lv_bindings_14_0=ruleBinding();
 
             	    state._fsp--;
@@ -10235,7 +10235,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"bindings",
             	            		lv_bindings_14_0, 
-            	            		"Binding");
+            	            		"org.eclipse.etrice.core.Room.Binding");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -10248,18 +10248,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 5 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4150:6: ( (lv_actorRefs_15_0= ruleActorRef ) )
+            	    // InternalRoom.g:4150:6: ( (lv_actorRefs_15_0= ruleActorRef ) )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4150:6: ( (lv_actorRefs_15_0= ruleActorRef ) )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4151:1: (lv_actorRefs_15_0= ruleActorRef )
+            	    // InternalRoom.g:4150:6: ( (lv_actorRefs_15_0= ruleActorRef ) )
+            	    // InternalRoom.g:4151:1: (lv_actorRefs_15_0= ruleActorRef )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4151:1: (lv_actorRefs_15_0= ruleActorRef )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4152:3: lv_actorRefs_15_0= ruleActorRef
+            	    // InternalRoom.g:4151:1: (lv_actorRefs_15_0= ruleActorRef )
+            	    // InternalRoom.g:4152:3: lv_actorRefs_15_0= ruleActorRef
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getSubSystemClassAccess().getActorRefsActorRefParserRuleCall_8_4_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleActorRef_in_ruleSubSystemClass8168);
+            	    pushFollow(FOLLOW_79);
             	    lv_actorRefs_15_0=ruleActorRef();
 
             	    state._fsp--;
@@ -10272,7 +10272,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"actorRefs",
             	            		lv_actorRefs_15_0, 
-            	            		"ActorRef");
+            	            		"org.eclipse.etrice.core.Room.ActorRef");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -10285,18 +10285,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 6 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4169:6: ( (lv_serviceProvisionPoints_16_0= ruleSPP ) )
+            	    // InternalRoom.g:4169:6: ( (lv_serviceProvisionPoints_16_0= ruleSPP ) )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4169:6: ( (lv_serviceProvisionPoints_16_0= ruleSPP ) )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4170:1: (lv_serviceProvisionPoints_16_0= ruleSPP )
+            	    // InternalRoom.g:4169:6: ( (lv_serviceProvisionPoints_16_0= ruleSPP ) )
+            	    // InternalRoom.g:4170:1: (lv_serviceProvisionPoints_16_0= ruleSPP )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4170:1: (lv_serviceProvisionPoints_16_0= ruleSPP )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4171:3: lv_serviceProvisionPoints_16_0= ruleSPP
+            	    // InternalRoom.g:4170:1: (lv_serviceProvisionPoints_16_0= ruleSPP )
+            	    // InternalRoom.g:4171:3: lv_serviceProvisionPoints_16_0= ruleSPP
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getSubSystemClassAccess().getServiceProvisionPointsSPPParserRuleCall_8_5_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleSPP_in_ruleSubSystemClass8195);
+            	    pushFollow(FOLLOW_79);
             	    lv_serviceProvisionPoints_16_0=ruleSPP();
 
             	    state._fsp--;
@@ -10309,7 +10309,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"serviceProvisionPoints",
             	            		lv_serviceProvisionPoints_16_0, 
-            	            		"SPP");
+            	            		"org.eclipse.etrice.core.Room.SPP");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -10322,18 +10322,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 7 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4188:6: ( (lv_relayPorts_17_0= rulePort ) )
+            	    // InternalRoom.g:4188:6: ( (lv_relayPorts_17_0= rulePort ) )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4188:6: ( (lv_relayPorts_17_0= rulePort ) )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4189:1: (lv_relayPorts_17_0= rulePort )
+            	    // InternalRoom.g:4188:6: ( (lv_relayPorts_17_0= rulePort ) )
+            	    // InternalRoom.g:4189:1: (lv_relayPorts_17_0= rulePort )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4189:1: (lv_relayPorts_17_0= rulePort )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4190:3: lv_relayPorts_17_0= rulePort
+            	    // InternalRoom.g:4189:1: (lv_relayPorts_17_0= rulePort )
+            	    // InternalRoom.g:4190:3: lv_relayPorts_17_0= rulePort
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getSubSystemClassAccess().getRelayPortsPortParserRuleCall_8_6_0()); 
             	    	    
-            	    pushFollow(FOLLOW_rulePort_in_ruleSubSystemClass8222);
+            	    pushFollow(FOLLOW_79);
             	    lv_relayPorts_17_0=rulePort();
 
             	    state._fsp--;
@@ -10346,7 +10346,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"relayPorts",
             	            		lv_relayPorts_17_0, 
-            	            		"Port");
+            	            		"org.eclipse.etrice.core.Room.Port");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -10364,7 +10364,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                 }
             } while (true);
 
-            otherlv_18=(Token)match(input,14,FOLLOW_14_in_ruleSubSystemClass8236); 
+            otherlv_18=(Token)match(input,14,FOLLOW_2); 
 
                 	newLeafNode(otherlv_18, grammarAccess.getSubSystemClassAccess().getRightCurlyBracketKeyword_9());
                 
@@ -10389,7 +10389,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleLogicalThread"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4218:1: entryRuleLogicalThread returns [EObject current=null] : iv_ruleLogicalThread= ruleLogicalThread EOF ;
+    // InternalRoom.g:4218:1: entryRuleLogicalThread returns [EObject current=null] : iv_ruleLogicalThread= ruleLogicalThread EOF ;
     public final EObject entryRuleLogicalThread() throws RecognitionException {
         EObject current = null;
 
@@ -10397,17 +10397,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4219:2: (iv_ruleLogicalThread= ruleLogicalThread EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4220:2: iv_ruleLogicalThread= ruleLogicalThread EOF
+            // InternalRoom.g:4219:2: (iv_ruleLogicalThread= ruleLogicalThread EOF )
+            // InternalRoom.g:4220:2: iv_ruleLogicalThread= ruleLogicalThread EOF
             {
              newCompositeNode(grammarAccess.getLogicalThreadRule()); 
-            pushFollow(FOLLOW_ruleLogicalThread_in_entryRuleLogicalThread8272);
+            pushFollow(FOLLOW_1);
             iv_ruleLogicalThread=ruleLogicalThread();
 
             state._fsp--;
 
              current =iv_ruleLogicalThread; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleLogicalThread8282); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -10425,7 +10425,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleLogicalThread"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4227:1: ruleLogicalThread returns [EObject current=null] : (otherlv_0= 'LogicalThread' ( (lv_name_1_0= RULE_ID ) ) ) ;
+    // InternalRoom.g:4227:1: ruleLogicalThread returns [EObject current=null] : (otherlv_0= 'LogicalThread' ( (lv_name_1_0= RULE_ID ) ) ) ;
     public final EObject ruleLogicalThread() throws RecognitionException {
         EObject current = null;
 
@@ -10435,23 +10435,23 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4230:28: ( (otherlv_0= 'LogicalThread' ( (lv_name_1_0= RULE_ID ) ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4231:1: (otherlv_0= 'LogicalThread' ( (lv_name_1_0= RULE_ID ) ) )
+            // InternalRoom.g:4230:28: ( (otherlv_0= 'LogicalThread' ( (lv_name_1_0= RULE_ID ) ) ) )
+            // InternalRoom.g:4231:1: (otherlv_0= 'LogicalThread' ( (lv_name_1_0= RULE_ID ) ) )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4231:1: (otherlv_0= 'LogicalThread' ( (lv_name_1_0= RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4231:3: otherlv_0= 'LogicalThread' ( (lv_name_1_0= RULE_ID ) )
+            // InternalRoom.g:4231:1: (otherlv_0= 'LogicalThread' ( (lv_name_1_0= RULE_ID ) ) )
+            // InternalRoom.g:4231:3: otherlv_0= 'LogicalThread' ( (lv_name_1_0= RULE_ID ) )
             {
-            otherlv_0=(Token)match(input,66,FOLLOW_66_in_ruleLogicalThread8319); 
+            otherlv_0=(Token)match(input,66,FOLLOW_3); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getLogicalThreadAccess().getLogicalThreadKeyword_0());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4235:1: ( (lv_name_1_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4236:1: (lv_name_1_0= RULE_ID )
+            // InternalRoom.g:4235:1: ( (lv_name_1_0= RULE_ID ) )
+            // InternalRoom.g:4236:1: (lv_name_1_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4236:1: (lv_name_1_0= RULE_ID )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4237:3: lv_name_1_0= RULE_ID
+            // InternalRoom.g:4236:1: (lv_name_1_0= RULE_ID )
+            // InternalRoom.g:4237:3: lv_name_1_0= RULE_ID
             {
-            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleLogicalThread8336); 
+            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_2); 
 
             			newLeafNode(lv_name_1_0, grammarAccess.getLogicalThreadAccess().getNameIDTerminalRuleCall_1_0()); 
             		
@@ -10463,7 +10463,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"name",
                     		lv_name_1_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -10492,7 +10492,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleActorInstanceMapping"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4261:1: entryRuleActorInstanceMapping returns [EObject current=null] : iv_ruleActorInstanceMapping= ruleActorInstanceMapping EOF ;
+    // InternalRoom.g:4261:1: entryRuleActorInstanceMapping returns [EObject current=null] : iv_ruleActorInstanceMapping= ruleActorInstanceMapping EOF ;
     public final EObject entryRuleActorInstanceMapping() throws RecognitionException {
         EObject current = null;
 
@@ -10500,17 +10500,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4262:2: (iv_ruleActorInstanceMapping= ruleActorInstanceMapping EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4263:2: iv_ruleActorInstanceMapping= ruleActorInstanceMapping EOF
+            // InternalRoom.g:4262:2: (iv_ruleActorInstanceMapping= ruleActorInstanceMapping EOF )
+            // InternalRoom.g:4263:2: iv_ruleActorInstanceMapping= ruleActorInstanceMapping EOF
             {
              newCompositeNode(grammarAccess.getActorInstanceMappingRule()); 
-            pushFollow(FOLLOW_ruleActorInstanceMapping_in_entryRuleActorInstanceMapping8377);
+            pushFollow(FOLLOW_1);
             iv_ruleActorInstanceMapping=ruleActorInstanceMapping();
 
             state._fsp--;
 
              current =iv_ruleActorInstanceMapping; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleActorInstanceMapping8387); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -10528,7 +10528,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleActorInstanceMapping"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4270:1: ruleActorInstanceMapping returns [EObject current=null] : (otherlv_0= 'ActorInstanceMapping' ( (lv_path_1_0= ruleRefPath ) ) otherlv_2= '->' ( (otherlv_3= RULE_ID ) ) (otherlv_4= '{' ( (lv_actorInstanceMappings_5_0= ruleActorInstanceMapping ) )* otherlv_6= '}' )? ) ;
+    // InternalRoom.g:4270:1: ruleActorInstanceMapping returns [EObject current=null] : (otherlv_0= 'ActorInstanceMapping' ( (lv_path_1_0= ruleRefPath ) ) otherlv_2= '->' ( (otherlv_3= RULE_ID ) ) (otherlv_4= '{' ( (lv_actorInstanceMappings_5_0= ruleActorInstanceMapping ) )* otherlv_6= '}' )? ) ;
     public final EObject ruleActorInstanceMapping() throws RecognitionException {
         EObject current = null;
 
@@ -10545,26 +10545,26 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4273:28: ( (otherlv_0= 'ActorInstanceMapping' ( (lv_path_1_0= ruleRefPath ) ) otherlv_2= '->' ( (otherlv_3= RULE_ID ) ) (otherlv_4= '{' ( (lv_actorInstanceMappings_5_0= ruleActorInstanceMapping ) )* otherlv_6= '}' )? ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4274:1: (otherlv_0= 'ActorInstanceMapping' ( (lv_path_1_0= ruleRefPath ) ) otherlv_2= '->' ( (otherlv_3= RULE_ID ) ) (otherlv_4= '{' ( (lv_actorInstanceMappings_5_0= ruleActorInstanceMapping ) )* otherlv_6= '}' )? )
+            // InternalRoom.g:4273:28: ( (otherlv_0= 'ActorInstanceMapping' ( (lv_path_1_0= ruleRefPath ) ) otherlv_2= '->' ( (otherlv_3= RULE_ID ) ) (otherlv_4= '{' ( (lv_actorInstanceMappings_5_0= ruleActorInstanceMapping ) )* otherlv_6= '}' )? ) )
+            // InternalRoom.g:4274:1: (otherlv_0= 'ActorInstanceMapping' ( (lv_path_1_0= ruleRefPath ) ) otherlv_2= '->' ( (otherlv_3= RULE_ID ) ) (otherlv_4= '{' ( (lv_actorInstanceMappings_5_0= ruleActorInstanceMapping ) )* otherlv_6= '}' )? )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4274:1: (otherlv_0= 'ActorInstanceMapping' ( (lv_path_1_0= ruleRefPath ) ) otherlv_2= '->' ( (otherlv_3= RULE_ID ) ) (otherlv_4= '{' ( (lv_actorInstanceMappings_5_0= ruleActorInstanceMapping ) )* otherlv_6= '}' )? )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4274:3: otherlv_0= 'ActorInstanceMapping' ( (lv_path_1_0= ruleRefPath ) ) otherlv_2= '->' ( (otherlv_3= RULE_ID ) ) (otherlv_4= '{' ( (lv_actorInstanceMappings_5_0= ruleActorInstanceMapping ) )* otherlv_6= '}' )?
+            // InternalRoom.g:4274:1: (otherlv_0= 'ActorInstanceMapping' ( (lv_path_1_0= ruleRefPath ) ) otherlv_2= '->' ( (otherlv_3= RULE_ID ) ) (otherlv_4= '{' ( (lv_actorInstanceMappings_5_0= ruleActorInstanceMapping ) )* otherlv_6= '}' )? )
+            // InternalRoom.g:4274:3: otherlv_0= 'ActorInstanceMapping' ( (lv_path_1_0= ruleRefPath ) ) otherlv_2= '->' ( (otherlv_3= RULE_ID ) ) (otherlv_4= '{' ( (lv_actorInstanceMappings_5_0= ruleActorInstanceMapping ) )* otherlv_6= '}' )?
             {
-            otherlv_0=(Token)match(input,67,FOLLOW_67_in_ruleActorInstanceMapping8424); 
+            otherlv_0=(Token)match(input,67,FOLLOW_3); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getActorInstanceMappingAccess().getActorInstanceMappingKeyword_0());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4278:1: ( (lv_path_1_0= ruleRefPath ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4279:1: (lv_path_1_0= ruleRefPath )
+            // InternalRoom.g:4278:1: ( (lv_path_1_0= ruleRefPath ) )
+            // InternalRoom.g:4279:1: (lv_path_1_0= ruleRefPath )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4279:1: (lv_path_1_0= ruleRefPath )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4280:3: lv_path_1_0= ruleRefPath
+            // InternalRoom.g:4279:1: (lv_path_1_0= ruleRefPath )
+            // InternalRoom.g:4280:3: lv_path_1_0= ruleRefPath
             {
              
             	        newCompositeNode(grammarAccess.getActorInstanceMappingAccess().getPathRefPathParserRuleCall_1_0()); 
             	    
-            pushFollow(FOLLOW_ruleRefPath_in_ruleActorInstanceMapping8445);
+            pushFollow(FOLLOW_11);
             lv_path_1_0=ruleRefPath();
 
             state._fsp--;
@@ -10577,7 +10577,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"path",
                     		lv_path_1_0, 
-                    		"RefPath");
+                    		"org.eclipse.etrice.core.Room.RefPath");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -10586,22 +10586,22 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_2=(Token)match(input,18,FOLLOW_18_in_ruleActorInstanceMapping8457); 
+            otherlv_2=(Token)match(input,18,FOLLOW_3); 
 
                 	newLeafNode(otherlv_2, grammarAccess.getActorInstanceMappingAccess().getHyphenMinusGreaterThanSignKeyword_2());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4300:1: ( (otherlv_3= RULE_ID ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4301:1: (otherlv_3= RULE_ID )
+            // InternalRoom.g:4300:1: ( (otherlv_3= RULE_ID ) )
+            // InternalRoom.g:4301:1: (otherlv_3= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4301:1: (otherlv_3= RULE_ID )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4302:3: otherlv_3= RULE_ID
+            // InternalRoom.g:4301:1: (otherlv_3= RULE_ID )
+            // InternalRoom.g:4302:3: otherlv_3= RULE_ID
             {
 
             			if (current==null) {
             	            current = createModelElement(grammarAccess.getActorInstanceMappingRule());
             	        }
                     
-            otherlv_3=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleActorInstanceMapping8477); 
+            otherlv_3=(Token)match(input,RULE_ID,FOLLOW_80); 
 
             		newLeafNode(otherlv_3, grammarAccess.getActorInstanceMappingAccess().getThreadLogicalThreadCrossReference_3_0()); 
             	
@@ -10611,7 +10611,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4313:2: (otherlv_4= '{' ( (lv_actorInstanceMappings_5_0= ruleActorInstanceMapping ) )* otherlv_6= '}' )?
+            // InternalRoom.g:4313:2: (otherlv_4= '{' ( (lv_actorInstanceMappings_5_0= ruleActorInstanceMapping ) )* otherlv_6= '}' )?
             int alt97=2;
             int LA97_0 = input.LA(1);
 
@@ -10620,13 +10620,13 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt97) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4313:4: otherlv_4= '{' ( (lv_actorInstanceMappings_5_0= ruleActorInstanceMapping ) )* otherlv_6= '}'
+                    // InternalRoom.g:4313:4: otherlv_4= '{' ( (lv_actorInstanceMappings_5_0= ruleActorInstanceMapping ) )* otherlv_6= '}'
                     {
-                    otherlv_4=(Token)match(input,13,FOLLOW_13_in_ruleActorInstanceMapping8490); 
+                    otherlv_4=(Token)match(input,13,FOLLOW_81); 
 
                         	newLeafNode(otherlv_4, grammarAccess.getActorInstanceMappingAccess().getLeftCurlyBracketKeyword_4_0());
                         
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4317:1: ( (lv_actorInstanceMappings_5_0= ruleActorInstanceMapping ) )*
+                    // InternalRoom.g:4317:1: ( (lv_actorInstanceMappings_5_0= ruleActorInstanceMapping ) )*
                     loop96:
                     do {
                         int alt96=2;
@@ -10639,15 +10639,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                         switch (alt96) {
                     	case 1 :
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4318:1: (lv_actorInstanceMappings_5_0= ruleActorInstanceMapping )
+                    	    // InternalRoom.g:4318:1: (lv_actorInstanceMappings_5_0= ruleActorInstanceMapping )
                     	    {
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4318:1: (lv_actorInstanceMappings_5_0= ruleActorInstanceMapping )
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4319:3: lv_actorInstanceMappings_5_0= ruleActorInstanceMapping
+                    	    // InternalRoom.g:4318:1: (lv_actorInstanceMappings_5_0= ruleActorInstanceMapping )
+                    	    // InternalRoom.g:4319:3: lv_actorInstanceMappings_5_0= ruleActorInstanceMapping
                     	    {
                     	     
                     	    	        newCompositeNode(grammarAccess.getActorInstanceMappingAccess().getActorInstanceMappingsActorInstanceMappingParserRuleCall_4_1_0()); 
                     	    	    
-                    	    pushFollow(FOLLOW_ruleActorInstanceMapping_in_ruleActorInstanceMapping8511);
+                    	    pushFollow(FOLLOW_81);
                     	    lv_actorInstanceMappings_5_0=ruleActorInstanceMapping();
 
                     	    state._fsp--;
@@ -10660,7 +10660,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     	           			current, 
                     	           			"actorInstanceMappings",
                     	            		lv_actorInstanceMappings_5_0, 
-                    	            		"ActorInstanceMapping");
+                    	            		"org.eclipse.etrice.core.Room.ActorInstanceMapping");
                     	    	        afterParserOrEnumRuleCall();
                     	    	    
 
@@ -10675,7 +10675,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                         }
                     } while (true);
 
-                    otherlv_6=(Token)match(input,14,FOLLOW_14_in_ruleActorInstanceMapping8524); 
+                    otherlv_6=(Token)match(input,14,FOLLOW_2); 
 
                         	newLeafNode(otherlv_6, grammarAccess.getActorInstanceMappingAccess().getRightCurlyBracketKeyword_4_2());
                         
@@ -10706,7 +10706,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleRefPath"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4347:1: entryRuleRefPath returns [EObject current=null] : iv_ruleRefPath= ruleRefPath EOF ;
+    // InternalRoom.g:4347:1: entryRuleRefPath returns [EObject current=null] : iv_ruleRefPath= ruleRefPath EOF ;
     public final EObject entryRuleRefPath() throws RecognitionException {
         EObject current = null;
 
@@ -10714,17 +10714,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4348:2: (iv_ruleRefPath= ruleRefPath EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4349:2: iv_ruleRefPath= ruleRefPath EOF
+            // InternalRoom.g:4348:2: (iv_ruleRefPath= ruleRefPath EOF )
+            // InternalRoom.g:4349:2: iv_ruleRefPath= ruleRefPath EOF
             {
              newCompositeNode(grammarAccess.getRefPathRule()); 
-            pushFollow(FOLLOW_ruleRefPath_in_entryRuleRefPath8562);
+            pushFollow(FOLLOW_1);
             iv_ruleRefPath=ruleRefPath();
 
             state._fsp--;
 
              current =iv_ruleRefPath; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRefPath8572); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -10742,7 +10742,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleRefPath"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4356:1: ruleRefPath returns [EObject current=null] : ( ( (lv_refs_0_0= ruleRefSegment ) ) (otherlv_1= '/' ( (lv_refs_2_0= ruleRefSegment ) ) )* ) ;
+    // InternalRoom.g:4356:1: ruleRefPath returns [EObject current=null] : ( ( (lv_refs_0_0= ruleRefSegment ) ) (otherlv_1= '/' ( (lv_refs_2_0= ruleRefSegment ) ) )* ) ;
     public final EObject ruleRefPath() throws RecognitionException {
         EObject current = null;
 
@@ -10755,22 +10755,22 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4359:28: ( ( ( (lv_refs_0_0= ruleRefSegment ) ) (otherlv_1= '/' ( (lv_refs_2_0= ruleRefSegment ) ) )* ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4360:1: ( ( (lv_refs_0_0= ruleRefSegment ) ) (otherlv_1= '/' ( (lv_refs_2_0= ruleRefSegment ) ) )* )
+            // InternalRoom.g:4359:28: ( ( ( (lv_refs_0_0= ruleRefSegment ) ) (otherlv_1= '/' ( (lv_refs_2_0= ruleRefSegment ) ) )* ) )
+            // InternalRoom.g:4360:1: ( ( (lv_refs_0_0= ruleRefSegment ) ) (otherlv_1= '/' ( (lv_refs_2_0= ruleRefSegment ) ) )* )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4360:1: ( ( (lv_refs_0_0= ruleRefSegment ) ) (otherlv_1= '/' ( (lv_refs_2_0= ruleRefSegment ) ) )* )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4360:2: ( (lv_refs_0_0= ruleRefSegment ) ) (otherlv_1= '/' ( (lv_refs_2_0= ruleRefSegment ) ) )*
+            // InternalRoom.g:4360:1: ( ( (lv_refs_0_0= ruleRefSegment ) ) (otherlv_1= '/' ( (lv_refs_2_0= ruleRefSegment ) ) )* )
+            // InternalRoom.g:4360:2: ( (lv_refs_0_0= ruleRefSegment ) ) (otherlv_1= '/' ( (lv_refs_2_0= ruleRefSegment ) ) )*
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4360:2: ( (lv_refs_0_0= ruleRefSegment ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4361:1: (lv_refs_0_0= ruleRefSegment )
+            // InternalRoom.g:4360:2: ( (lv_refs_0_0= ruleRefSegment ) )
+            // InternalRoom.g:4361:1: (lv_refs_0_0= ruleRefSegment )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4361:1: (lv_refs_0_0= ruleRefSegment )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4362:3: lv_refs_0_0= ruleRefSegment
+            // InternalRoom.g:4361:1: (lv_refs_0_0= ruleRefSegment )
+            // InternalRoom.g:4362:3: lv_refs_0_0= ruleRefSegment
             {
              
             	        newCompositeNode(grammarAccess.getRefPathAccess().getRefsRefSegmentParserRuleCall_0_0()); 
             	    
-            pushFollow(FOLLOW_ruleRefSegment_in_ruleRefPath8618);
+            pushFollow(FOLLOW_82);
             lv_refs_0_0=ruleRefSegment();
 
             state._fsp--;
@@ -10783,7 +10783,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"refs",
                     		lv_refs_0_0, 
-                    		"RefSegment");
+                    		"org.eclipse.etrice.core.Room.RefSegment");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -10792,7 +10792,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4378:2: (otherlv_1= '/' ( (lv_refs_2_0= ruleRefSegment ) ) )*
+            // InternalRoom.g:4378:2: (otherlv_1= '/' ( (lv_refs_2_0= ruleRefSegment ) ) )*
             loop98:
             do {
                 int alt98=2;
@@ -10805,22 +10805,22 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                 switch (alt98) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4378:4: otherlv_1= '/' ( (lv_refs_2_0= ruleRefSegment ) )
+            	    // InternalRoom.g:4378:4: otherlv_1= '/' ( (lv_refs_2_0= ruleRefSegment ) )
             	    {
-            	    otherlv_1=(Token)match(input,68,FOLLOW_68_in_ruleRefPath8631); 
+            	    otherlv_1=(Token)match(input,68,FOLLOW_3); 
 
             	        	newLeafNode(otherlv_1, grammarAccess.getRefPathAccess().getSolidusKeyword_1_0());
             	        
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4382:1: ( (lv_refs_2_0= ruleRefSegment ) )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4383:1: (lv_refs_2_0= ruleRefSegment )
+            	    // InternalRoom.g:4382:1: ( (lv_refs_2_0= ruleRefSegment ) )
+            	    // InternalRoom.g:4383:1: (lv_refs_2_0= ruleRefSegment )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4383:1: (lv_refs_2_0= ruleRefSegment )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4384:3: lv_refs_2_0= ruleRefSegment
+            	    // InternalRoom.g:4383:1: (lv_refs_2_0= ruleRefSegment )
+            	    // InternalRoom.g:4384:3: lv_refs_2_0= ruleRefSegment
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getRefPathAccess().getRefsRefSegmentParserRuleCall_1_1_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleRefSegment_in_ruleRefPath8652);
+            	    pushFollow(FOLLOW_82);
             	    lv_refs_2_0=ruleRefSegment();
 
             	    state._fsp--;
@@ -10833,7 +10833,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"refs",
             	            		lv_refs_2_0, 
-            	            		"RefSegment");
+            	            		"org.eclipse.etrice.core.Room.RefSegment");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -10872,7 +10872,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleRefSegment"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4408:1: entryRuleRefSegment returns [EObject current=null] : iv_ruleRefSegment= ruleRefSegment EOF ;
+    // InternalRoom.g:4408:1: entryRuleRefSegment returns [EObject current=null] : iv_ruleRefSegment= ruleRefSegment EOF ;
     public final EObject entryRuleRefSegment() throws RecognitionException {
         EObject current = null;
 
@@ -10880,17 +10880,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4409:2: (iv_ruleRefSegment= ruleRefSegment EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4410:2: iv_ruleRefSegment= ruleRefSegment EOF
+            // InternalRoom.g:4409:2: (iv_ruleRefSegment= ruleRefSegment EOF )
+            // InternalRoom.g:4410:2: iv_ruleRefSegment= ruleRefSegment EOF
             {
              newCompositeNode(grammarAccess.getRefSegmentRule()); 
-            pushFollow(FOLLOW_ruleRefSegment_in_entryRuleRefSegment8690);
+            pushFollow(FOLLOW_1);
             iv_ruleRefSegment=ruleRefSegment();
 
             state._fsp--;
 
              current =iv_ruleRefSegment; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRefSegment8700); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -10908,7 +10908,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleRefSegment"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4417:1: ruleRefSegment returns [EObject current=null] : ( ( (lv_ref_0_0= RULE_ID ) ) (otherlv_1= ':' ( (lv_idx_2_0= RULE_INT ) ) )? ) ;
+    // InternalRoom.g:4417:1: ruleRefSegment returns [EObject current=null] : ( ( (lv_ref_0_0= RULE_ID ) ) (otherlv_1= ':' ( (lv_idx_2_0= RULE_INT ) ) )? ) ;
     public final EObject ruleRefSegment() throws RecognitionException {
         EObject current = null;
 
@@ -10919,19 +10919,19 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4420:28: ( ( ( (lv_ref_0_0= RULE_ID ) ) (otherlv_1= ':' ( (lv_idx_2_0= RULE_INT ) ) )? ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4421:1: ( ( (lv_ref_0_0= RULE_ID ) ) (otherlv_1= ':' ( (lv_idx_2_0= RULE_INT ) ) )? )
+            // InternalRoom.g:4420:28: ( ( ( (lv_ref_0_0= RULE_ID ) ) (otherlv_1= ':' ( (lv_idx_2_0= RULE_INT ) ) )? ) )
+            // InternalRoom.g:4421:1: ( ( (lv_ref_0_0= RULE_ID ) ) (otherlv_1= ':' ( (lv_idx_2_0= RULE_INT ) ) )? )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4421:1: ( ( (lv_ref_0_0= RULE_ID ) ) (otherlv_1= ':' ( (lv_idx_2_0= RULE_INT ) ) )? )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4421:2: ( (lv_ref_0_0= RULE_ID ) ) (otherlv_1= ':' ( (lv_idx_2_0= RULE_INT ) ) )?
+            // InternalRoom.g:4421:1: ( ( (lv_ref_0_0= RULE_ID ) ) (otherlv_1= ':' ( (lv_idx_2_0= RULE_INT ) ) )? )
+            // InternalRoom.g:4421:2: ( (lv_ref_0_0= RULE_ID ) ) (otherlv_1= ':' ( (lv_idx_2_0= RULE_INT ) ) )?
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4421:2: ( (lv_ref_0_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4422:1: (lv_ref_0_0= RULE_ID )
+            // InternalRoom.g:4421:2: ( (lv_ref_0_0= RULE_ID ) )
+            // InternalRoom.g:4422:1: (lv_ref_0_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4422:1: (lv_ref_0_0= RULE_ID )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4423:3: lv_ref_0_0= RULE_ID
+            // InternalRoom.g:4422:1: (lv_ref_0_0= RULE_ID )
+            // InternalRoom.g:4423:3: lv_ref_0_0= RULE_ID
             {
-            lv_ref_0_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleRefSegment8742); 
+            lv_ref_0_0=(Token)match(input,RULE_ID,FOLLOW_83); 
 
             			newLeafNode(lv_ref_0_0, grammarAccess.getRefSegmentAccess().getRefIDTerminalRuleCall_0_0()); 
             		
@@ -10943,7 +10943,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"ref",
                     		lv_ref_0_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -10951,7 +10951,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4439:2: (otherlv_1= ':' ( (lv_idx_2_0= RULE_INT ) ) )?
+            // InternalRoom.g:4439:2: (otherlv_1= ':' ( (lv_idx_2_0= RULE_INT ) ) )?
             int alt99=2;
             int LA99_0 = input.LA(1);
 
@@ -10960,19 +10960,19 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt99) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4439:4: otherlv_1= ':' ( (lv_idx_2_0= RULE_INT ) )
+                    // InternalRoom.g:4439:4: otherlv_1= ':' ( (lv_idx_2_0= RULE_INT ) )
                     {
-                    otherlv_1=(Token)match(input,15,FOLLOW_15_in_ruleRefSegment8760); 
+                    otherlv_1=(Token)match(input,15,FOLLOW_31); 
 
                         	newLeafNode(otherlv_1, grammarAccess.getRefSegmentAccess().getColonKeyword_1_0());
                         
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4443:1: ( (lv_idx_2_0= RULE_INT ) )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4444:1: (lv_idx_2_0= RULE_INT )
+                    // InternalRoom.g:4443:1: ( (lv_idx_2_0= RULE_INT ) )
+                    // InternalRoom.g:4444:1: (lv_idx_2_0= RULE_INT )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4444:1: (lv_idx_2_0= RULE_INT )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4445:3: lv_idx_2_0= RULE_INT
+                    // InternalRoom.g:4444:1: (lv_idx_2_0= RULE_INT )
+                    // InternalRoom.g:4445:3: lv_idx_2_0= RULE_INT
                     {
-                    lv_idx_2_0=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleRefSegment8777); 
+                    lv_idx_2_0=(Token)match(input,RULE_INT,FOLLOW_2); 
 
                     			newLeafNode(lv_idx_2_0, grammarAccess.getRefSegmentAccess().getIdxINTTerminalRuleCall_1_1_0()); 
                     		
@@ -10984,7 +10984,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"idx",
                             		lv_idx_2_0, 
-                            		"INT");
+                            		"org.eclipse.xtext.common.Terminals.INT");
                     	    
 
                     }
@@ -11019,7 +11019,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleBinding"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4469:1: entryRuleBinding returns [EObject current=null] : iv_ruleBinding= ruleBinding EOF ;
+    // InternalRoom.g:4469:1: entryRuleBinding returns [EObject current=null] : iv_ruleBinding= ruleBinding EOF ;
     public final EObject entryRuleBinding() throws RecognitionException {
         EObject current = null;
 
@@ -11027,17 +11027,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4470:2: (iv_ruleBinding= ruleBinding EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4471:2: iv_ruleBinding= ruleBinding EOF
+            // InternalRoom.g:4470:2: (iv_ruleBinding= ruleBinding EOF )
+            // InternalRoom.g:4471:2: iv_ruleBinding= ruleBinding EOF
             {
              newCompositeNode(grammarAccess.getBindingRule()); 
-            pushFollow(FOLLOW_ruleBinding_in_entryRuleBinding8820);
+            pushFollow(FOLLOW_1);
             iv_ruleBinding=ruleBinding();
 
             state._fsp--;
 
              current =iv_ruleBinding; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleBinding8830); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -11055,7 +11055,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleBinding"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4478:1: ruleBinding returns [EObject current=null] : (otherlv_0= 'Binding' ( (lv_endpoint1_1_0= ruleBindingEndPoint ) ) otherlv_2= 'and' ( (lv_endpoint2_3_0= ruleBindingEndPoint ) ) ) ;
+    // InternalRoom.g:4478:1: ruleBinding returns [EObject current=null] : (otherlv_0= 'Binding' ( (lv_endpoint1_1_0= ruleBindingEndPoint ) ) otherlv_2= 'and' ( (lv_endpoint2_3_0= ruleBindingEndPoint ) ) ) ;
     public final EObject ruleBinding() throws RecognitionException {
         EObject current = null;
 
@@ -11069,26 +11069,26 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4481:28: ( (otherlv_0= 'Binding' ( (lv_endpoint1_1_0= ruleBindingEndPoint ) ) otherlv_2= 'and' ( (lv_endpoint2_3_0= ruleBindingEndPoint ) ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4482:1: (otherlv_0= 'Binding' ( (lv_endpoint1_1_0= ruleBindingEndPoint ) ) otherlv_2= 'and' ( (lv_endpoint2_3_0= ruleBindingEndPoint ) ) )
+            // InternalRoom.g:4481:28: ( (otherlv_0= 'Binding' ( (lv_endpoint1_1_0= ruleBindingEndPoint ) ) otherlv_2= 'and' ( (lv_endpoint2_3_0= ruleBindingEndPoint ) ) ) )
+            // InternalRoom.g:4482:1: (otherlv_0= 'Binding' ( (lv_endpoint1_1_0= ruleBindingEndPoint ) ) otherlv_2= 'and' ( (lv_endpoint2_3_0= ruleBindingEndPoint ) ) )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4482:1: (otherlv_0= 'Binding' ( (lv_endpoint1_1_0= ruleBindingEndPoint ) ) otherlv_2= 'and' ( (lv_endpoint2_3_0= ruleBindingEndPoint ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4482:3: otherlv_0= 'Binding' ( (lv_endpoint1_1_0= ruleBindingEndPoint ) ) otherlv_2= 'and' ( (lv_endpoint2_3_0= ruleBindingEndPoint ) )
+            // InternalRoom.g:4482:1: (otherlv_0= 'Binding' ( (lv_endpoint1_1_0= ruleBindingEndPoint ) ) otherlv_2= 'and' ( (lv_endpoint2_3_0= ruleBindingEndPoint ) ) )
+            // InternalRoom.g:4482:3: otherlv_0= 'Binding' ( (lv_endpoint1_1_0= ruleBindingEndPoint ) ) otherlv_2= 'and' ( (lv_endpoint2_3_0= ruleBindingEndPoint ) )
             {
-            otherlv_0=(Token)match(input,69,FOLLOW_69_in_ruleBinding8867); 
+            otherlv_0=(Token)match(input,69,FOLLOW_3); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getBindingAccess().getBindingKeyword_0());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4486:1: ( (lv_endpoint1_1_0= ruleBindingEndPoint ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4487:1: (lv_endpoint1_1_0= ruleBindingEndPoint )
+            // InternalRoom.g:4486:1: ( (lv_endpoint1_1_0= ruleBindingEndPoint ) )
+            // InternalRoom.g:4487:1: (lv_endpoint1_1_0= ruleBindingEndPoint )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4487:1: (lv_endpoint1_1_0= ruleBindingEndPoint )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4488:3: lv_endpoint1_1_0= ruleBindingEndPoint
+            // InternalRoom.g:4487:1: (lv_endpoint1_1_0= ruleBindingEndPoint )
+            // InternalRoom.g:4488:3: lv_endpoint1_1_0= ruleBindingEndPoint
             {
              
             	        newCompositeNode(grammarAccess.getBindingAccess().getEndpoint1BindingEndPointParserRuleCall_1_0()); 
             	    
-            pushFollow(FOLLOW_ruleBindingEndPoint_in_ruleBinding8888);
+            pushFollow(FOLLOW_84);
             lv_endpoint1_1_0=ruleBindingEndPoint();
 
             state._fsp--;
@@ -11101,7 +11101,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"endpoint1",
                     		lv_endpoint1_1_0, 
-                    		"BindingEndPoint");
+                    		"org.eclipse.etrice.core.Room.BindingEndPoint");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -11110,20 +11110,20 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_2=(Token)match(input,70,FOLLOW_70_in_ruleBinding8900); 
+            otherlv_2=(Token)match(input,70,FOLLOW_3); 
 
                 	newLeafNode(otherlv_2, grammarAccess.getBindingAccess().getAndKeyword_2());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4508:1: ( (lv_endpoint2_3_0= ruleBindingEndPoint ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4509:1: (lv_endpoint2_3_0= ruleBindingEndPoint )
+            // InternalRoom.g:4508:1: ( (lv_endpoint2_3_0= ruleBindingEndPoint ) )
+            // InternalRoom.g:4509:1: (lv_endpoint2_3_0= ruleBindingEndPoint )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4509:1: (lv_endpoint2_3_0= ruleBindingEndPoint )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4510:3: lv_endpoint2_3_0= ruleBindingEndPoint
+            // InternalRoom.g:4509:1: (lv_endpoint2_3_0= ruleBindingEndPoint )
+            // InternalRoom.g:4510:3: lv_endpoint2_3_0= ruleBindingEndPoint
             {
              
             	        newCompositeNode(grammarAccess.getBindingAccess().getEndpoint2BindingEndPointParserRuleCall_3_0()); 
             	    
-            pushFollow(FOLLOW_ruleBindingEndPoint_in_ruleBinding8921);
+            pushFollow(FOLLOW_2);
             lv_endpoint2_3_0=ruleBindingEndPoint();
 
             state._fsp--;
@@ -11136,7 +11136,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"endpoint2",
                     		lv_endpoint2_3_0, 
-                    		"BindingEndPoint");
+                    		"org.eclipse.etrice.core.Room.BindingEndPoint");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -11166,7 +11166,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleBindingEndPoint"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4534:1: entryRuleBindingEndPoint returns [EObject current=null] : iv_ruleBindingEndPoint= ruleBindingEndPoint EOF ;
+    // InternalRoom.g:4534:1: entryRuleBindingEndPoint returns [EObject current=null] : iv_ruleBindingEndPoint= ruleBindingEndPoint EOF ;
     public final EObject entryRuleBindingEndPoint() throws RecognitionException {
         EObject current = null;
 
@@ -11174,17 +11174,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4535:2: (iv_ruleBindingEndPoint= ruleBindingEndPoint EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4536:2: iv_ruleBindingEndPoint= ruleBindingEndPoint EOF
+            // InternalRoom.g:4535:2: (iv_ruleBindingEndPoint= ruleBindingEndPoint EOF )
+            // InternalRoom.g:4536:2: iv_ruleBindingEndPoint= ruleBindingEndPoint EOF
             {
              newCompositeNode(grammarAccess.getBindingEndPointRule()); 
-            pushFollow(FOLLOW_ruleBindingEndPoint_in_entryRuleBindingEndPoint8957);
+            pushFollow(FOLLOW_1);
             iv_ruleBindingEndPoint=ruleBindingEndPoint();
 
             state._fsp--;
 
              current =iv_ruleBindingEndPoint; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleBindingEndPoint8967); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -11202,7 +11202,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleBindingEndPoint"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4543:1: ruleBindingEndPoint returns [EObject current=null] : ( ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '.' )? ( (otherlv_2= RULE_ID ) ) (otherlv_3= 'sub' ( (otherlv_4= RULE_ID ) ) )? ) ;
+    // InternalRoom.g:4543:1: ruleBindingEndPoint returns [EObject current=null] : ( ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '.' )? ( (otherlv_2= RULE_ID ) ) (otherlv_3= 'sub' ( (otherlv_4= RULE_ID ) ) )? ) ;
     public final EObject ruleBindingEndPoint() throws RecognitionException {
         EObject current = null;
 
@@ -11215,13 +11215,13 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4546:28: ( ( ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '.' )? ( (otherlv_2= RULE_ID ) ) (otherlv_3= 'sub' ( (otherlv_4= RULE_ID ) ) )? ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4547:1: ( ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '.' )? ( (otherlv_2= RULE_ID ) ) (otherlv_3= 'sub' ( (otherlv_4= RULE_ID ) ) )? )
+            // InternalRoom.g:4546:28: ( ( ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '.' )? ( (otherlv_2= RULE_ID ) ) (otherlv_3= 'sub' ( (otherlv_4= RULE_ID ) ) )? ) )
+            // InternalRoom.g:4547:1: ( ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '.' )? ( (otherlv_2= RULE_ID ) ) (otherlv_3= 'sub' ( (otherlv_4= RULE_ID ) ) )? )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4547:1: ( ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '.' )? ( (otherlv_2= RULE_ID ) ) (otherlv_3= 'sub' ( (otherlv_4= RULE_ID ) ) )? )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4547:2: ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '.' )? ( (otherlv_2= RULE_ID ) ) (otherlv_3= 'sub' ( (otherlv_4= RULE_ID ) ) )?
+            // InternalRoom.g:4547:1: ( ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '.' )? ( (otherlv_2= RULE_ID ) ) (otherlv_3= 'sub' ( (otherlv_4= RULE_ID ) ) )? )
+            // InternalRoom.g:4547:2: ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '.' )? ( (otherlv_2= RULE_ID ) ) (otherlv_3= 'sub' ( (otherlv_4= RULE_ID ) ) )?
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4547:2: ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '.' )?
+            // InternalRoom.g:4547:2: ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '.' )?
             int alt100=2;
             int LA100_0 = input.LA(1);
 
@@ -11234,20 +11234,20 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt100) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4547:3: ( (otherlv_0= RULE_ID ) ) otherlv_1= '.'
+                    // InternalRoom.g:4547:3: ( (otherlv_0= RULE_ID ) ) otherlv_1= '.'
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4547:3: ( (otherlv_0= RULE_ID ) )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4548:1: (otherlv_0= RULE_ID )
+                    // InternalRoom.g:4547:3: ( (otherlv_0= RULE_ID ) )
+                    // InternalRoom.g:4548:1: (otherlv_0= RULE_ID )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4548:1: (otherlv_0= RULE_ID )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4549:3: otherlv_0= RULE_ID
+                    // InternalRoom.g:4548:1: (otherlv_0= RULE_ID )
+                    // InternalRoom.g:4549:3: otherlv_0= RULE_ID
                     {
 
                     			if (current==null) {
                     	            current = createModelElement(grammarAccess.getBindingEndPointRule());
                     	        }
                             
-                    otherlv_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleBindingEndPoint9013); 
+                    otherlv_0=(Token)match(input,RULE_ID,FOLLOW_85); 
 
                     		newLeafNode(otherlv_0, grammarAccess.getBindingEndPointAccess().getActorRefActorContainerRefCrossReference_0_0_0()); 
                     	
@@ -11257,7 +11257,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_1=(Token)match(input,71,FOLLOW_71_in_ruleBindingEndPoint9025); 
+                    otherlv_1=(Token)match(input,71,FOLLOW_3); 
 
                         	newLeafNode(otherlv_1, grammarAccess.getBindingEndPointAccess().getFullStopKeyword_0_1());
                         
@@ -11267,18 +11267,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4564:3: ( (otherlv_2= RULE_ID ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4565:1: (otherlv_2= RULE_ID )
+            // InternalRoom.g:4564:3: ( (otherlv_2= RULE_ID ) )
+            // InternalRoom.g:4565:1: (otherlv_2= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4565:1: (otherlv_2= RULE_ID )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4566:3: otherlv_2= RULE_ID
+            // InternalRoom.g:4565:1: (otherlv_2= RULE_ID )
+            // InternalRoom.g:4566:3: otherlv_2= RULE_ID
             {
 
             			if (current==null) {
             	            current = createModelElement(grammarAccess.getBindingEndPointRule());
             	        }
                     
-            otherlv_2=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleBindingEndPoint9047); 
+            otherlv_2=(Token)match(input,RULE_ID,FOLLOW_86); 
 
             		newLeafNode(otherlv_2, grammarAccess.getBindingEndPointAccess().getPortPortCrossReference_1_0()); 
             	
@@ -11288,7 +11288,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4577:2: (otherlv_3= 'sub' ( (otherlv_4= RULE_ID ) ) )?
+            // InternalRoom.g:4577:2: (otherlv_3= 'sub' ( (otherlv_4= RULE_ID ) ) )?
             int alt101=2;
             int LA101_0 = input.LA(1);
 
@@ -11297,24 +11297,24 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt101) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4577:4: otherlv_3= 'sub' ( (otherlv_4= RULE_ID ) )
+                    // InternalRoom.g:4577:4: otherlv_3= 'sub' ( (otherlv_4= RULE_ID ) )
                     {
-                    otherlv_3=(Token)match(input,72,FOLLOW_72_in_ruleBindingEndPoint9060); 
+                    otherlv_3=(Token)match(input,72,FOLLOW_3); 
 
                         	newLeafNode(otherlv_3, grammarAccess.getBindingEndPointAccess().getSubKeyword_2_0());
                         
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4581:1: ( (otherlv_4= RULE_ID ) )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4582:1: (otherlv_4= RULE_ID )
+                    // InternalRoom.g:4581:1: ( (otherlv_4= RULE_ID ) )
+                    // InternalRoom.g:4582:1: (otherlv_4= RULE_ID )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4582:1: (otherlv_4= RULE_ID )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4583:3: otherlv_4= RULE_ID
+                    // InternalRoom.g:4582:1: (otherlv_4= RULE_ID )
+                    // InternalRoom.g:4583:3: otherlv_4= RULE_ID
                     {
 
                     			if (current==null) {
                     	            current = createModelElement(grammarAccess.getBindingEndPointRule());
                     	        }
                             
-                    otherlv_4=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleBindingEndPoint9080); 
+                    otherlv_4=(Token)match(input,RULE_ID,FOLLOW_2); 
 
                     		newLeafNode(otherlv_4, grammarAccess.getBindingEndPointAccess().getSubSubProtocolCrossReference_2_1_0()); 
                     	
@@ -11351,7 +11351,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleLayerConnection"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4602:1: entryRuleLayerConnection returns [EObject current=null] : iv_ruleLayerConnection= ruleLayerConnection EOF ;
+    // InternalRoom.g:4602:1: entryRuleLayerConnection returns [EObject current=null] : iv_ruleLayerConnection= ruleLayerConnection EOF ;
     public final EObject entryRuleLayerConnection() throws RecognitionException {
         EObject current = null;
 
@@ -11359,17 +11359,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4603:2: (iv_ruleLayerConnection= ruleLayerConnection EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4604:2: iv_ruleLayerConnection= ruleLayerConnection EOF
+            // InternalRoom.g:4603:2: (iv_ruleLayerConnection= ruleLayerConnection EOF )
+            // InternalRoom.g:4604:2: iv_ruleLayerConnection= ruleLayerConnection EOF
             {
              newCompositeNode(grammarAccess.getLayerConnectionRule()); 
-            pushFollow(FOLLOW_ruleLayerConnection_in_entryRuleLayerConnection9118);
+            pushFollow(FOLLOW_1);
             iv_ruleLayerConnection=ruleLayerConnection();
 
             state._fsp--;
 
              current =iv_ruleLayerConnection; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleLayerConnection9128); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -11387,7 +11387,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleLayerConnection"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4611:1: ruleLayerConnection returns [EObject current=null] : (otherlv_0= 'LayerConnection' ( (lv_from_1_0= ruleSAPoint ) ) otherlv_2= 'satisfied_by' ( (lv_to_3_0= ruleSPPoint ) ) ) ;
+    // InternalRoom.g:4611:1: ruleLayerConnection returns [EObject current=null] : (otherlv_0= 'LayerConnection' ( (lv_from_1_0= ruleSAPoint ) ) otherlv_2= 'satisfied_by' ( (lv_to_3_0= ruleSPPoint ) ) ) ;
     public final EObject ruleLayerConnection() throws RecognitionException {
         EObject current = null;
 
@@ -11401,26 +11401,26 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4614:28: ( (otherlv_0= 'LayerConnection' ( (lv_from_1_0= ruleSAPoint ) ) otherlv_2= 'satisfied_by' ( (lv_to_3_0= ruleSPPoint ) ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4615:1: (otherlv_0= 'LayerConnection' ( (lv_from_1_0= ruleSAPoint ) ) otherlv_2= 'satisfied_by' ( (lv_to_3_0= ruleSPPoint ) ) )
+            // InternalRoom.g:4614:28: ( (otherlv_0= 'LayerConnection' ( (lv_from_1_0= ruleSAPoint ) ) otherlv_2= 'satisfied_by' ( (lv_to_3_0= ruleSPPoint ) ) ) )
+            // InternalRoom.g:4615:1: (otherlv_0= 'LayerConnection' ( (lv_from_1_0= ruleSAPoint ) ) otherlv_2= 'satisfied_by' ( (lv_to_3_0= ruleSPPoint ) ) )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4615:1: (otherlv_0= 'LayerConnection' ( (lv_from_1_0= ruleSAPoint ) ) otherlv_2= 'satisfied_by' ( (lv_to_3_0= ruleSPPoint ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4615:3: otherlv_0= 'LayerConnection' ( (lv_from_1_0= ruleSAPoint ) ) otherlv_2= 'satisfied_by' ( (lv_to_3_0= ruleSPPoint ) )
+            // InternalRoom.g:4615:1: (otherlv_0= 'LayerConnection' ( (lv_from_1_0= ruleSAPoint ) ) otherlv_2= 'satisfied_by' ( (lv_to_3_0= ruleSPPoint ) ) )
+            // InternalRoom.g:4615:3: otherlv_0= 'LayerConnection' ( (lv_from_1_0= ruleSAPoint ) ) otherlv_2= 'satisfied_by' ( (lv_to_3_0= ruleSPPoint ) )
             {
-            otherlv_0=(Token)match(input,73,FOLLOW_73_in_ruleLayerConnection9165); 
+            otherlv_0=(Token)match(input,73,FOLLOW_87); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getLayerConnectionAccess().getLayerConnectionKeyword_0());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4619:1: ( (lv_from_1_0= ruleSAPoint ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4620:1: (lv_from_1_0= ruleSAPoint )
+            // InternalRoom.g:4619:1: ( (lv_from_1_0= ruleSAPoint ) )
+            // InternalRoom.g:4620:1: (lv_from_1_0= ruleSAPoint )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4620:1: (lv_from_1_0= ruleSAPoint )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4621:3: lv_from_1_0= ruleSAPoint
+            // InternalRoom.g:4620:1: (lv_from_1_0= ruleSAPoint )
+            // InternalRoom.g:4621:3: lv_from_1_0= ruleSAPoint
             {
              
             	        newCompositeNode(grammarAccess.getLayerConnectionAccess().getFromSAPointParserRuleCall_1_0()); 
             	    
-            pushFollow(FOLLOW_ruleSAPoint_in_ruleLayerConnection9186);
+            pushFollow(FOLLOW_88);
             lv_from_1_0=ruleSAPoint();
 
             state._fsp--;
@@ -11433,7 +11433,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"from",
                     		lv_from_1_0, 
-                    		"SAPoint");
+                    		"org.eclipse.etrice.core.Room.SAPoint");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -11442,20 +11442,20 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_2=(Token)match(input,74,FOLLOW_74_in_ruleLayerConnection9198); 
+            otherlv_2=(Token)match(input,74,FOLLOW_3); 
 
                 	newLeafNode(otherlv_2, grammarAccess.getLayerConnectionAccess().getSatisfied_byKeyword_2());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4641:1: ( (lv_to_3_0= ruleSPPoint ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4642:1: (lv_to_3_0= ruleSPPoint )
+            // InternalRoom.g:4641:1: ( (lv_to_3_0= ruleSPPoint ) )
+            // InternalRoom.g:4642:1: (lv_to_3_0= ruleSPPoint )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4642:1: (lv_to_3_0= ruleSPPoint )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4643:3: lv_to_3_0= ruleSPPoint
+            // InternalRoom.g:4642:1: (lv_to_3_0= ruleSPPoint )
+            // InternalRoom.g:4643:3: lv_to_3_0= ruleSPPoint
             {
              
             	        newCompositeNode(grammarAccess.getLayerConnectionAccess().getToSPPointParserRuleCall_3_0()); 
             	    
-            pushFollow(FOLLOW_ruleSPPoint_in_ruleLayerConnection9219);
+            pushFollow(FOLLOW_2);
             lv_to_3_0=ruleSPPoint();
 
             state._fsp--;
@@ -11468,7 +11468,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"to",
                     		lv_to_3_0, 
-                    		"SPPoint");
+                    		"org.eclipse.etrice.core.Room.SPPoint");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -11498,7 +11498,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleSAPoint"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4667:1: entryRuleSAPoint returns [EObject current=null] : iv_ruleSAPoint= ruleSAPoint EOF ;
+    // InternalRoom.g:4667:1: entryRuleSAPoint returns [EObject current=null] : iv_ruleSAPoint= ruleSAPoint EOF ;
     public final EObject entryRuleSAPoint() throws RecognitionException {
         EObject current = null;
 
@@ -11506,17 +11506,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4668:2: (iv_ruleSAPoint= ruleSAPoint EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4669:2: iv_ruleSAPoint= ruleSAPoint EOF
+            // InternalRoom.g:4668:2: (iv_ruleSAPoint= ruleSAPoint EOF )
+            // InternalRoom.g:4669:2: iv_ruleSAPoint= ruleSAPoint EOF
             {
              newCompositeNode(grammarAccess.getSAPointRule()); 
-            pushFollow(FOLLOW_ruleSAPoint_in_entryRuleSAPoint9255);
+            pushFollow(FOLLOW_1);
             iv_ruleSAPoint=ruleSAPoint();
 
             state._fsp--;
 
              current =iv_ruleSAPoint; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSAPoint9265); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -11534,7 +11534,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleSAPoint"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4676:1: ruleSAPoint returns [EObject current=null] : (this_RefSAPoint_0= ruleRefSAPoint | this_RelaySAPoint_1= ruleRelaySAPoint ) ;
+    // InternalRoom.g:4676:1: ruleSAPoint returns [EObject current=null] : (this_RefSAPoint_0= ruleRefSAPoint | this_RelaySAPoint_1= ruleRelaySAPoint ) ;
     public final EObject ruleSAPoint() throws RecognitionException {
         EObject current = null;
 
@@ -11546,10 +11546,10 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4679:28: ( (this_RefSAPoint_0= ruleRefSAPoint | this_RelaySAPoint_1= ruleRelaySAPoint ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4680:1: (this_RefSAPoint_0= ruleRefSAPoint | this_RelaySAPoint_1= ruleRelaySAPoint )
+            // InternalRoom.g:4679:28: ( (this_RefSAPoint_0= ruleRefSAPoint | this_RelaySAPoint_1= ruleRelaySAPoint ) )
+            // InternalRoom.g:4680:1: (this_RefSAPoint_0= ruleRefSAPoint | this_RelaySAPoint_1= ruleRelaySAPoint )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4680:1: (this_RefSAPoint_0= ruleRefSAPoint | this_RelaySAPoint_1= ruleRelaySAPoint )
+            // InternalRoom.g:4680:1: (this_RefSAPoint_0= ruleRefSAPoint | this_RelaySAPoint_1= ruleRelaySAPoint )
             int alt102=2;
             int LA102_0 = input.LA(1);
 
@@ -11567,12 +11567,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt102) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4681:5: this_RefSAPoint_0= ruleRefSAPoint
+                    // InternalRoom.g:4681:5: this_RefSAPoint_0= ruleRefSAPoint
                     {
                      
                             newCompositeNode(grammarAccess.getSAPointAccess().getRefSAPointParserRuleCall_0()); 
                         
-                    pushFollow(FOLLOW_ruleRefSAPoint_in_ruleSAPoint9312);
+                    pushFollow(FOLLOW_2);
                     this_RefSAPoint_0=ruleRefSAPoint();
 
                     state._fsp--;
@@ -11585,12 +11585,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4691:5: this_RelaySAPoint_1= ruleRelaySAPoint
+                    // InternalRoom.g:4691:5: this_RelaySAPoint_1= ruleRelaySAPoint
                     {
                      
                             newCompositeNode(grammarAccess.getSAPointAccess().getRelaySAPointParserRuleCall_1()); 
                         
-                    pushFollow(FOLLOW_ruleRelaySAPoint_in_ruleSAPoint9339);
+                    pushFollow(FOLLOW_2);
                     this_RelaySAPoint_1=ruleRelaySAPoint();
 
                     state._fsp--;
@@ -11623,7 +11623,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleRefSAPoint"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4707:1: entryRuleRefSAPoint returns [EObject current=null] : iv_ruleRefSAPoint= ruleRefSAPoint EOF ;
+    // InternalRoom.g:4707:1: entryRuleRefSAPoint returns [EObject current=null] : iv_ruleRefSAPoint= ruleRefSAPoint EOF ;
     public final EObject entryRuleRefSAPoint() throws RecognitionException {
         EObject current = null;
 
@@ -11631,17 +11631,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4708:2: (iv_ruleRefSAPoint= ruleRefSAPoint EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4709:2: iv_ruleRefSAPoint= ruleRefSAPoint EOF
+            // InternalRoom.g:4708:2: (iv_ruleRefSAPoint= ruleRefSAPoint EOF )
+            // InternalRoom.g:4709:2: iv_ruleRefSAPoint= ruleRefSAPoint EOF
             {
              newCompositeNode(grammarAccess.getRefSAPointRule()); 
-            pushFollow(FOLLOW_ruleRefSAPoint_in_entryRuleRefSAPoint9374);
+            pushFollow(FOLLOW_1);
             iv_ruleRefSAPoint=ruleRefSAPoint();
 
             state._fsp--;
 
              current =iv_ruleRefSAPoint; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRefSAPoint9384); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -11659,7 +11659,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleRefSAPoint"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4716:1: ruleRefSAPoint returns [EObject current=null] : (otherlv_0= 'ref' ( (otherlv_1= RULE_ID ) ) ) ;
+    // InternalRoom.g:4716:1: ruleRefSAPoint returns [EObject current=null] : (otherlv_0= 'ref' ( (otherlv_1= RULE_ID ) ) ) ;
     public final EObject ruleRefSAPoint() throws RecognitionException {
         EObject current = null;
 
@@ -11669,28 +11669,28 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4719:28: ( (otherlv_0= 'ref' ( (otherlv_1= RULE_ID ) ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4720:1: (otherlv_0= 'ref' ( (otherlv_1= RULE_ID ) ) )
+            // InternalRoom.g:4719:28: ( (otherlv_0= 'ref' ( (otherlv_1= RULE_ID ) ) ) )
+            // InternalRoom.g:4720:1: (otherlv_0= 'ref' ( (otherlv_1= RULE_ID ) ) )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4720:1: (otherlv_0= 'ref' ( (otherlv_1= RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4720:3: otherlv_0= 'ref' ( (otherlv_1= RULE_ID ) )
+            // InternalRoom.g:4720:1: (otherlv_0= 'ref' ( (otherlv_1= RULE_ID ) ) )
+            // InternalRoom.g:4720:3: otherlv_0= 'ref' ( (otherlv_1= RULE_ID ) )
             {
-            otherlv_0=(Token)match(input,16,FOLLOW_16_in_ruleRefSAPoint9421); 
+            otherlv_0=(Token)match(input,16,FOLLOW_3); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getRefSAPointAccess().getRefKeyword_0());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4724:1: ( (otherlv_1= RULE_ID ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4725:1: (otherlv_1= RULE_ID )
+            // InternalRoom.g:4724:1: ( (otherlv_1= RULE_ID ) )
+            // InternalRoom.g:4725:1: (otherlv_1= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4725:1: (otherlv_1= RULE_ID )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4726:3: otherlv_1= RULE_ID
+            // InternalRoom.g:4725:1: (otherlv_1= RULE_ID )
+            // InternalRoom.g:4726:3: otherlv_1= RULE_ID
             {
 
             			if (current==null) {
             	            current = createModelElement(grammarAccess.getRefSAPointRule());
             	        }
                     
-            otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleRefSAPoint9441); 
+            otherlv_1=(Token)match(input,RULE_ID,FOLLOW_2); 
 
             		newLeafNode(otherlv_1, grammarAccess.getRefSAPointAccess().getRefActorContainerRefCrossReference_1_0()); 
             	
@@ -11721,7 +11721,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleRelaySAPoint"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4745:1: entryRuleRelaySAPoint returns [EObject current=null] : iv_ruleRelaySAPoint= ruleRelaySAPoint EOF ;
+    // InternalRoom.g:4745:1: entryRuleRelaySAPoint returns [EObject current=null] : iv_ruleRelaySAPoint= ruleRelaySAPoint EOF ;
     public final EObject entryRuleRelaySAPoint() throws RecognitionException {
         EObject current = null;
 
@@ -11729,17 +11729,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4746:2: (iv_ruleRelaySAPoint= ruleRelaySAPoint EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4747:2: iv_ruleRelaySAPoint= ruleRelaySAPoint EOF
+            // InternalRoom.g:4746:2: (iv_ruleRelaySAPoint= ruleRelaySAPoint EOF )
+            // InternalRoom.g:4747:2: iv_ruleRelaySAPoint= ruleRelaySAPoint EOF
             {
              newCompositeNode(grammarAccess.getRelaySAPointRule()); 
-            pushFollow(FOLLOW_ruleRelaySAPoint_in_entryRuleRelaySAPoint9477);
+            pushFollow(FOLLOW_1);
             iv_ruleRelaySAPoint=ruleRelaySAPoint();
 
             state._fsp--;
 
              current =iv_ruleRelaySAPoint; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRelaySAPoint9487); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -11757,7 +11757,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleRelaySAPoint"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4754:1: ruleRelaySAPoint returns [EObject current=null] : (otherlv_0= 'relay_sap' ( (otherlv_1= RULE_ID ) ) ) ;
+    // InternalRoom.g:4754:1: ruleRelaySAPoint returns [EObject current=null] : (otherlv_0= 'relay_sap' ( (otherlv_1= RULE_ID ) ) ) ;
     public final EObject ruleRelaySAPoint() throws RecognitionException {
         EObject current = null;
 
@@ -11767,28 +11767,28 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4757:28: ( (otherlv_0= 'relay_sap' ( (otherlv_1= RULE_ID ) ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4758:1: (otherlv_0= 'relay_sap' ( (otherlv_1= RULE_ID ) ) )
+            // InternalRoom.g:4757:28: ( (otherlv_0= 'relay_sap' ( (otherlv_1= RULE_ID ) ) ) )
+            // InternalRoom.g:4758:1: (otherlv_0= 'relay_sap' ( (otherlv_1= RULE_ID ) ) )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4758:1: (otherlv_0= 'relay_sap' ( (otherlv_1= RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4758:3: otherlv_0= 'relay_sap' ( (otherlv_1= RULE_ID ) )
+            // InternalRoom.g:4758:1: (otherlv_0= 'relay_sap' ( (otherlv_1= RULE_ID ) ) )
+            // InternalRoom.g:4758:3: otherlv_0= 'relay_sap' ( (otherlv_1= RULE_ID ) )
             {
-            otherlv_0=(Token)match(input,75,FOLLOW_75_in_ruleRelaySAPoint9524); 
+            otherlv_0=(Token)match(input,75,FOLLOW_3); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getRelaySAPointAccess().getRelay_sapKeyword_0());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4762:1: ( (otherlv_1= RULE_ID ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4763:1: (otherlv_1= RULE_ID )
+            // InternalRoom.g:4762:1: ( (otherlv_1= RULE_ID ) )
+            // InternalRoom.g:4763:1: (otherlv_1= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4763:1: (otherlv_1= RULE_ID )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4764:3: otherlv_1= RULE_ID
+            // InternalRoom.g:4763:1: (otherlv_1= RULE_ID )
+            // InternalRoom.g:4764:3: otherlv_1= RULE_ID
             {
 
             			if (current==null) {
             	            current = createModelElement(grammarAccess.getRelaySAPointRule());
             	        }
                     
-            otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleRelaySAPoint9544); 
+            otherlv_1=(Token)match(input,RULE_ID,FOLLOW_2); 
 
             		newLeafNode(otherlv_1, grammarAccess.getRelaySAPointAccess().getRelaySPPCrossReference_1_0()); 
             	
@@ -11819,7 +11819,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleSPPoint"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4783:1: entryRuleSPPoint returns [EObject current=null] : iv_ruleSPPoint= ruleSPPoint EOF ;
+    // InternalRoom.g:4783:1: entryRuleSPPoint returns [EObject current=null] : iv_ruleSPPoint= ruleSPPoint EOF ;
     public final EObject entryRuleSPPoint() throws RecognitionException {
         EObject current = null;
 
@@ -11827,17 +11827,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4784:2: (iv_ruleSPPoint= ruleSPPoint EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4785:2: iv_ruleSPPoint= ruleSPPoint EOF
+            // InternalRoom.g:4784:2: (iv_ruleSPPoint= ruleSPPoint EOF )
+            // InternalRoom.g:4785:2: iv_ruleSPPoint= ruleSPPoint EOF
             {
              newCompositeNode(grammarAccess.getSPPointRule()); 
-            pushFollow(FOLLOW_ruleSPPoint_in_entryRuleSPPoint9580);
+            pushFollow(FOLLOW_1);
             iv_ruleSPPoint=ruleSPPoint();
 
             state._fsp--;
 
              current =iv_ruleSPPoint; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSPPoint9590); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -11855,7 +11855,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleSPPoint"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4792:1: ruleSPPoint returns [EObject current=null] : ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '.' ( (otherlv_2= RULE_ID ) ) ) ;
+    // InternalRoom.g:4792:1: ruleSPPoint returns [EObject current=null] : ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '.' ( (otherlv_2= RULE_ID ) ) ) ;
     public final EObject ruleSPPoint() throws RecognitionException {
         EObject current = null;
 
@@ -11866,24 +11866,24 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4795:28: ( ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '.' ( (otherlv_2= RULE_ID ) ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4796:1: ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '.' ( (otherlv_2= RULE_ID ) ) )
+            // InternalRoom.g:4795:28: ( ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '.' ( (otherlv_2= RULE_ID ) ) ) )
+            // InternalRoom.g:4796:1: ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '.' ( (otherlv_2= RULE_ID ) ) )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4796:1: ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '.' ( (otherlv_2= RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4796:2: ( (otherlv_0= RULE_ID ) ) otherlv_1= '.' ( (otherlv_2= RULE_ID ) )
+            // InternalRoom.g:4796:1: ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '.' ( (otherlv_2= RULE_ID ) ) )
+            // InternalRoom.g:4796:2: ( (otherlv_0= RULE_ID ) ) otherlv_1= '.' ( (otherlv_2= RULE_ID ) )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4796:2: ( (otherlv_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4797:1: (otherlv_0= RULE_ID )
+            // InternalRoom.g:4796:2: ( (otherlv_0= RULE_ID ) )
+            // InternalRoom.g:4797:1: (otherlv_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4797:1: (otherlv_0= RULE_ID )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4798:3: otherlv_0= RULE_ID
+            // InternalRoom.g:4797:1: (otherlv_0= RULE_ID )
+            // InternalRoom.g:4798:3: otherlv_0= RULE_ID
             {
 
             			if (current==null) {
             	            current = createModelElement(grammarAccess.getSPPointRule());
             	        }
                     
-            otherlv_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleSPPoint9635); 
+            otherlv_0=(Token)match(input,RULE_ID,FOLLOW_85); 
 
             		newLeafNode(otherlv_0, grammarAccess.getSPPointAccess().getRefActorContainerRefCrossReference_0_0()); 
             	
@@ -11893,22 +11893,22 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,71,FOLLOW_71_in_ruleSPPoint9647); 
+            otherlv_1=(Token)match(input,71,FOLLOW_3); 
 
                 	newLeafNode(otherlv_1, grammarAccess.getSPPointAccess().getFullStopKeyword_1());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4813:1: ( (otherlv_2= RULE_ID ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4814:1: (otherlv_2= RULE_ID )
+            // InternalRoom.g:4813:1: ( (otherlv_2= RULE_ID ) )
+            // InternalRoom.g:4814:1: (otherlv_2= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4814:1: (otherlv_2= RULE_ID )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4815:3: otherlv_2= RULE_ID
+            // InternalRoom.g:4814:1: (otherlv_2= RULE_ID )
+            // InternalRoom.g:4815:3: otherlv_2= RULE_ID
             {
 
             			if (current==null) {
             	            current = createModelElement(grammarAccess.getSPPointRule());
             	        }
                     
-            otherlv_2=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleSPPoint9667); 
+            otherlv_2=(Token)match(input,RULE_ID,FOLLOW_2); 
 
             		newLeafNode(otherlv_2, grammarAccess.getSPPointAccess().getServiceSPPCrossReference_2_0()); 
             	
@@ -11939,7 +11939,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleActorRef"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4834:1: entryRuleActorRef returns [EObject current=null] : iv_ruleActorRef= ruleActorRef EOF ;
+    // InternalRoom.g:4834:1: entryRuleActorRef returns [EObject current=null] : iv_ruleActorRef= ruleActorRef EOF ;
     public final EObject entryRuleActorRef() throws RecognitionException {
         EObject current = null;
 
@@ -11947,17 +11947,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4835:2: (iv_ruleActorRef= ruleActorRef EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4836:2: iv_ruleActorRef= ruleActorRef EOF
+            // InternalRoom.g:4835:2: (iv_ruleActorRef= ruleActorRef EOF )
+            // InternalRoom.g:4836:2: iv_ruleActorRef= ruleActorRef EOF
             {
              newCompositeNode(grammarAccess.getActorRefRule()); 
-            pushFollow(FOLLOW_ruleActorRef_in_entryRuleActorRef9703);
+            pushFollow(FOLLOW_1);
             iv_ruleActorRef=ruleActorRef();
 
             state._fsp--;
 
              current =iv_ruleActorRef; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleActorRef9713); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -11975,7 +11975,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleActorRef"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4843:1: ruleActorRef returns [EObject current=null] : ( ( (lv_refType_0_0= ruleReferenceType ) )? otherlv_1= 'ActorRef' ( (lv_name_2_0= RULE_ID ) ) ( (lv_multiplicity_3_0= ruleMULTIPLICITY ) )? otherlv_4= ':' ( ( ruleFQN ) ) ( (lv_docu_6_0= ruleDocumentation ) )? ) ;
+    // InternalRoom.g:4843:1: ruleActorRef returns [EObject current=null] : ( ( (lv_refType_0_0= ruleReferenceType ) )? otherlv_1= 'ActorRef' ( (lv_name_2_0= RULE_ID ) ) ( (lv_multiplicity_3_0= ruleMULTIPLICITY ) )? otherlv_4= ':' ( ( ruleFQN ) ) ( (lv_docu_6_0= ruleDocumentation ) )? ) ;
     public final EObject ruleActorRef() throws RecognitionException {
         EObject current = null;
 
@@ -11992,13 +11992,13 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4846:28: ( ( ( (lv_refType_0_0= ruleReferenceType ) )? otherlv_1= 'ActorRef' ( (lv_name_2_0= RULE_ID ) ) ( (lv_multiplicity_3_0= ruleMULTIPLICITY ) )? otherlv_4= ':' ( ( ruleFQN ) ) ( (lv_docu_6_0= ruleDocumentation ) )? ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4847:1: ( ( (lv_refType_0_0= ruleReferenceType ) )? otherlv_1= 'ActorRef' ( (lv_name_2_0= RULE_ID ) ) ( (lv_multiplicity_3_0= ruleMULTIPLICITY ) )? otherlv_4= ':' ( ( ruleFQN ) ) ( (lv_docu_6_0= ruleDocumentation ) )? )
+            // InternalRoom.g:4846:28: ( ( ( (lv_refType_0_0= ruleReferenceType ) )? otherlv_1= 'ActorRef' ( (lv_name_2_0= RULE_ID ) ) ( (lv_multiplicity_3_0= ruleMULTIPLICITY ) )? otherlv_4= ':' ( ( ruleFQN ) ) ( (lv_docu_6_0= ruleDocumentation ) )? ) )
+            // InternalRoom.g:4847:1: ( ( (lv_refType_0_0= ruleReferenceType ) )? otherlv_1= 'ActorRef' ( (lv_name_2_0= RULE_ID ) ) ( (lv_multiplicity_3_0= ruleMULTIPLICITY ) )? otherlv_4= ':' ( ( ruleFQN ) ) ( (lv_docu_6_0= ruleDocumentation ) )? )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4847:1: ( ( (lv_refType_0_0= ruleReferenceType ) )? otherlv_1= 'ActorRef' ( (lv_name_2_0= RULE_ID ) ) ( (lv_multiplicity_3_0= ruleMULTIPLICITY ) )? otherlv_4= ':' ( ( ruleFQN ) ) ( (lv_docu_6_0= ruleDocumentation ) )? )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4847:2: ( (lv_refType_0_0= ruleReferenceType ) )? otherlv_1= 'ActorRef' ( (lv_name_2_0= RULE_ID ) ) ( (lv_multiplicity_3_0= ruleMULTIPLICITY ) )? otherlv_4= ':' ( ( ruleFQN ) ) ( (lv_docu_6_0= ruleDocumentation ) )?
+            // InternalRoom.g:4847:1: ( ( (lv_refType_0_0= ruleReferenceType ) )? otherlv_1= 'ActorRef' ( (lv_name_2_0= RULE_ID ) ) ( (lv_multiplicity_3_0= ruleMULTIPLICITY ) )? otherlv_4= ':' ( ( ruleFQN ) ) ( (lv_docu_6_0= ruleDocumentation ) )? )
+            // InternalRoom.g:4847:2: ( (lv_refType_0_0= ruleReferenceType ) )? otherlv_1= 'ActorRef' ( (lv_name_2_0= RULE_ID ) ) ( (lv_multiplicity_3_0= ruleMULTIPLICITY ) )? otherlv_4= ':' ( ( ruleFQN ) ) ( (lv_docu_6_0= ruleDocumentation ) )?
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4847:2: ( (lv_refType_0_0= ruleReferenceType ) )?
+            // InternalRoom.g:4847:2: ( (lv_refType_0_0= ruleReferenceType ) )?
             int alt103=2;
             int LA103_0 = input.LA(1);
 
@@ -12007,15 +12007,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt103) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4848:1: (lv_refType_0_0= ruleReferenceType )
+                    // InternalRoom.g:4848:1: (lv_refType_0_0= ruleReferenceType )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4848:1: (lv_refType_0_0= ruleReferenceType )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4849:3: lv_refType_0_0= ruleReferenceType
+                    // InternalRoom.g:4848:1: (lv_refType_0_0= ruleReferenceType )
+                    // InternalRoom.g:4849:3: lv_refType_0_0= ruleReferenceType
                     {
                      
                     	        newCompositeNode(grammarAccess.getActorRefAccess().getRefTypeReferenceTypeEnumRuleCall_0_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleReferenceType_in_ruleActorRef9759);
+                    pushFollow(FOLLOW_89);
                     lv_refType_0_0=ruleReferenceType();
 
                     state._fsp--;
@@ -12028,7 +12028,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"refType",
                             		lv_refType_0_0, 
-                            		"ReferenceType");
+                            		"org.eclipse.etrice.core.Room.ReferenceType");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -12040,17 +12040,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,76,FOLLOW_76_in_ruleActorRef9772); 
+            otherlv_1=(Token)match(input,76,FOLLOW_3); 
 
                 	newLeafNode(otherlv_1, grammarAccess.getActorRefAccess().getActorRefKeyword_1());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4869:1: ( (lv_name_2_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4870:1: (lv_name_2_0= RULE_ID )
+            // InternalRoom.g:4869:1: ( (lv_name_2_0= RULE_ID ) )
+            // InternalRoom.g:4870:1: (lv_name_2_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4870:1: (lv_name_2_0= RULE_ID )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4871:3: lv_name_2_0= RULE_ID
+            // InternalRoom.g:4870:1: (lv_name_2_0= RULE_ID )
+            // InternalRoom.g:4871:3: lv_name_2_0= RULE_ID
             {
-            lv_name_2_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleActorRef9789); 
+            lv_name_2_0=(Token)match(input,RULE_ID,FOLLOW_30); 
 
             			newLeafNode(lv_name_2_0, grammarAccess.getActorRefAccess().getNameIDTerminalRuleCall_2_0()); 
             		
@@ -12062,7 +12062,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"name",
                     		lv_name_2_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -12070,7 +12070,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4887:2: ( (lv_multiplicity_3_0= ruleMULTIPLICITY ) )?
+            // InternalRoom.g:4887:2: ( (lv_multiplicity_3_0= ruleMULTIPLICITY ) )?
             int alt104=2;
             int LA104_0 = input.LA(1);
 
@@ -12079,15 +12079,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt104) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4888:1: (lv_multiplicity_3_0= ruleMULTIPLICITY )
+                    // InternalRoom.g:4888:1: (lv_multiplicity_3_0= ruleMULTIPLICITY )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4888:1: (lv_multiplicity_3_0= ruleMULTIPLICITY )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4889:3: lv_multiplicity_3_0= ruleMULTIPLICITY
+                    // InternalRoom.g:4888:1: (lv_multiplicity_3_0= ruleMULTIPLICITY )
+                    // InternalRoom.g:4889:3: lv_multiplicity_3_0= ruleMULTIPLICITY
                     {
                      
                     	        newCompositeNode(grammarAccess.getActorRefAccess().getMultiplicityMULTIPLICITYParserRuleCall_3_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleMULTIPLICITY_in_ruleActorRef9815);
+                    pushFollow(FOLLOW_8);
                     lv_multiplicity_3_0=ruleMULTIPLICITY();
 
                     state._fsp--;
@@ -12100,7 +12100,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"multiplicity",
                             		lv_multiplicity_3_0, 
-                            		"MULTIPLICITY");
+                            		"org.eclipse.etrice.core.Room.MULTIPLICITY");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -12112,15 +12112,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_4=(Token)match(input,15,FOLLOW_15_in_ruleActorRef9828); 
+            otherlv_4=(Token)match(input,15,FOLLOW_3); 
 
                 	newLeafNode(otherlv_4, grammarAccess.getActorRefAccess().getColonKeyword_4());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4909:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4910:1: ( ruleFQN )
+            // InternalRoom.g:4909:1: ( ( ruleFQN ) )
+            // InternalRoom.g:4910:1: ( ruleFQN )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4910:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4911:3: ruleFQN
+            // InternalRoom.g:4910:1: ( ruleFQN )
+            // InternalRoom.g:4911:3: ruleFQN
             {
 
             			if (current==null) {
@@ -12130,7 +12130,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
              
             	        newCompositeNode(grammarAccess.getActorRefAccess().getTypeActorClassCrossReference_5_0()); 
             	    
-            pushFollow(FOLLOW_ruleFQN_in_ruleActorRef9851);
+            pushFollow(FOLLOW_16);
             ruleFQN();
 
             state._fsp--;
@@ -12144,7 +12144,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4924:2: ( (lv_docu_6_0= ruleDocumentation ) )?
+            // InternalRoom.g:4924:2: ( (lv_docu_6_0= ruleDocumentation ) )?
             int alt105=2;
             int LA105_0 = input.LA(1);
 
@@ -12153,15 +12153,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt105) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4925:1: (lv_docu_6_0= ruleDocumentation )
+                    // InternalRoom.g:4925:1: (lv_docu_6_0= ruleDocumentation )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4925:1: (lv_docu_6_0= ruleDocumentation )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4926:3: lv_docu_6_0= ruleDocumentation
+                    // InternalRoom.g:4925:1: (lv_docu_6_0= ruleDocumentation )
+                    // InternalRoom.g:4926:3: lv_docu_6_0= ruleDocumentation
                     {
                      
                     	        newCompositeNode(grammarAccess.getActorRefAccess().getDocuDocumentationParserRuleCall_6_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDocumentation_in_ruleActorRef9872);
+                    pushFollow(FOLLOW_2);
                     lv_docu_6_0=ruleDocumentation();
 
                     state._fsp--;
@@ -12174,7 +12174,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"docu",
                             		lv_docu_6_0, 
-                            		"Documentation");
+                            		"org.eclipse.etrice.core.common.Base.Documentation");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -12207,7 +12207,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleMULTIPLICITY"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4952:1: entryRuleMULTIPLICITY returns [String current=null] : iv_ruleMULTIPLICITY= ruleMULTIPLICITY EOF ;
+    // InternalRoom.g:4952:1: entryRuleMULTIPLICITY returns [String current=null] : iv_ruleMULTIPLICITY= ruleMULTIPLICITY EOF ;
     public final String entryRuleMULTIPLICITY() throws RecognitionException {
         String current = null;
 
@@ -12215,17 +12215,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4953:2: (iv_ruleMULTIPLICITY= ruleMULTIPLICITY EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4954:2: iv_ruleMULTIPLICITY= ruleMULTIPLICITY EOF
+            // InternalRoom.g:4953:2: (iv_ruleMULTIPLICITY= ruleMULTIPLICITY EOF )
+            // InternalRoom.g:4954:2: iv_ruleMULTIPLICITY= ruleMULTIPLICITY EOF
             {
              newCompositeNode(grammarAccess.getMULTIPLICITYRule()); 
-            pushFollow(FOLLOW_ruleMULTIPLICITY_in_entryRuleMULTIPLICITY9912);
+            pushFollow(FOLLOW_1);
             iv_ruleMULTIPLICITY=ruleMULTIPLICITY();
 
             state._fsp--;
 
              current =iv_ruleMULTIPLICITY.getText(); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleMULTIPLICITY9923); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -12243,7 +12243,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleMULTIPLICITY"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4961:1: ruleMULTIPLICITY returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '[' (kw= '*' | this_INT_2= RULE_INT ) kw= ']' ) ;
+    // InternalRoom.g:4961:1: ruleMULTIPLICITY returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '[' (kw= '*' | this_INT_2= RULE_INT ) kw= ']' ) ;
     public final AntlrDatatypeRuleToken ruleMULTIPLICITY() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -12253,18 +12253,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4964:28: ( (kw= '[' (kw= '*' | this_INT_2= RULE_INT ) kw= ']' ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4965:1: (kw= '[' (kw= '*' | this_INT_2= RULE_INT ) kw= ']' )
+            // InternalRoom.g:4964:28: ( (kw= '[' (kw= '*' | this_INT_2= RULE_INT ) kw= ']' ) )
+            // InternalRoom.g:4965:1: (kw= '[' (kw= '*' | this_INT_2= RULE_INT ) kw= ']' )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4965:1: (kw= '[' (kw= '*' | this_INT_2= RULE_INT ) kw= ']' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4966:2: kw= '[' (kw= '*' | this_INT_2= RULE_INT ) kw= ']'
+            // InternalRoom.g:4965:1: (kw= '[' (kw= '*' | this_INT_2= RULE_INT ) kw= ']' )
+            // InternalRoom.g:4966:2: kw= '[' (kw= '*' | this_INT_2= RULE_INT ) kw= ']'
             {
-            kw=(Token)match(input,33,FOLLOW_33_in_ruleMULTIPLICITY9961); 
+            kw=(Token)match(input,33,FOLLOW_90); 
 
                     current.merge(kw);
                     newLeafNode(kw, grammarAccess.getMULTIPLICITYAccess().getLeftSquareBracketKeyword_0()); 
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4971:1: (kw= '*' | this_INT_2= RULE_INT )
+            // InternalRoom.g:4971:1: (kw= '*' | this_INT_2= RULE_INT )
             int alt106=2;
             int LA106_0 = input.LA(1);
 
@@ -12282,9 +12282,9 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt106) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4972:2: kw= '*'
+                    // InternalRoom.g:4972:2: kw= '*'
                     {
-                    kw=(Token)match(input,77,FOLLOW_77_in_ruleMULTIPLICITY9975); 
+                    kw=(Token)match(input,77,FOLLOW_32); 
 
                             current.merge(kw);
                             newLeafNode(kw, grammarAccess.getMULTIPLICITYAccess().getAsteriskKeyword_1_0()); 
@@ -12293,9 +12293,9 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4978:10: this_INT_2= RULE_INT
+                    // InternalRoom.g:4978:10: this_INT_2= RULE_INT
                     {
-                    this_INT_2=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleMULTIPLICITY9996); 
+                    this_INT_2=(Token)match(input,RULE_INT,FOLLOW_32); 
 
                     		current.merge(this_INT_2);
                         
@@ -12308,7 +12308,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            kw=(Token)match(input,34,FOLLOW_34_in_ruleMULTIPLICITY10015); 
+            kw=(Token)match(input,34,FOLLOW_2); 
 
                     current.merge(kw);
                     newLeafNode(kw, grammarAccess.getMULTIPLICITYAccess().getRightSquareBracketKeyword_2()); 
@@ -12334,7 +12334,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleAnnotationTargetType"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4999:1: entryRuleAnnotationTargetType returns [String current=null] : iv_ruleAnnotationTargetType= ruleAnnotationTargetType EOF ;
+    // InternalRoom.g:4999:1: entryRuleAnnotationTargetType returns [String current=null] : iv_ruleAnnotationTargetType= ruleAnnotationTargetType EOF ;
     public final String entryRuleAnnotationTargetType() throws RecognitionException {
         String current = null;
 
@@ -12342,17 +12342,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5000:2: (iv_ruleAnnotationTargetType= ruleAnnotationTargetType EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5001:2: iv_ruleAnnotationTargetType= ruleAnnotationTargetType EOF
+            // InternalRoom.g:5000:2: (iv_ruleAnnotationTargetType= ruleAnnotationTargetType EOF )
+            // InternalRoom.g:5001:2: iv_ruleAnnotationTargetType= ruleAnnotationTargetType EOF
             {
              newCompositeNode(grammarAccess.getAnnotationTargetTypeRule()); 
-            pushFollow(FOLLOW_ruleAnnotationTargetType_in_entryRuleAnnotationTargetType10056);
+            pushFollow(FOLLOW_1);
             iv_ruleAnnotationTargetType=ruleAnnotationTargetType();
 
             state._fsp--;
 
              current =iv_ruleAnnotationTargetType.getText(); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAnnotationTargetType10067); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -12370,7 +12370,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleAnnotationTargetType"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5008:1: ruleAnnotationTargetType returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= 'DataClass' | kw= 'ActorClass' | kw= 'ActorBehavior' | kw= 'ProtocolClass' | kw= 'CompoundProtocolClass' | kw= 'SubSystemClass' | kw= 'LogicalSystem' ) ;
+    // InternalRoom.g:5008:1: ruleAnnotationTargetType returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= 'DataClass' | kw= 'ActorClass' | kw= 'ActorBehavior' | kw= 'ProtocolClass' | kw= 'CompoundProtocolClass' | kw= 'SubSystemClass' | kw= 'LogicalSystem' ) ;
     public final AntlrDatatypeRuleToken ruleAnnotationTargetType() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -12379,10 +12379,10 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5011:28: ( (kw= 'DataClass' | kw= 'ActorClass' | kw= 'ActorBehavior' | kw= 'ProtocolClass' | kw= 'CompoundProtocolClass' | kw= 'SubSystemClass' | kw= 'LogicalSystem' ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5012:1: (kw= 'DataClass' | kw= 'ActorClass' | kw= 'ActorBehavior' | kw= 'ProtocolClass' | kw= 'CompoundProtocolClass' | kw= 'SubSystemClass' | kw= 'LogicalSystem' )
+            // InternalRoom.g:5011:28: ( (kw= 'DataClass' | kw= 'ActorClass' | kw= 'ActorBehavior' | kw= 'ProtocolClass' | kw= 'CompoundProtocolClass' | kw= 'SubSystemClass' | kw= 'LogicalSystem' ) )
+            // InternalRoom.g:5012:1: (kw= 'DataClass' | kw= 'ActorClass' | kw= 'ActorBehavior' | kw= 'ProtocolClass' | kw= 'CompoundProtocolClass' | kw= 'SubSystemClass' | kw= 'LogicalSystem' )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5012:1: (kw= 'DataClass' | kw= 'ActorClass' | kw= 'ActorBehavior' | kw= 'ProtocolClass' | kw= 'CompoundProtocolClass' | kw= 'SubSystemClass' | kw= 'LogicalSystem' )
+            // InternalRoom.g:5012:1: (kw= 'DataClass' | kw= 'ActorClass' | kw= 'ActorBehavior' | kw= 'ProtocolClass' | kw= 'CompoundProtocolClass' | kw= 'SubSystemClass' | kw= 'LogicalSystem' )
             int alt107=7;
             switch ( input.LA(1) ) {
             case 27:
@@ -12429,9 +12429,9 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             switch (alt107) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5013:2: kw= 'DataClass'
+                    // InternalRoom.g:5013:2: kw= 'DataClass'
                     {
-                    kw=(Token)match(input,27,FOLLOW_27_in_ruleAnnotationTargetType10105); 
+                    kw=(Token)match(input,27,FOLLOW_2); 
 
                             current.merge(kw);
                             newLeafNode(kw, grammarAccess.getAnnotationTargetTypeAccess().getDataClassKeyword_0()); 
@@ -12440,9 +12440,9 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5020:2: kw= 'ActorClass'
+                    // InternalRoom.g:5020:2: kw= 'ActorClass'
                     {
-                    kw=(Token)match(input,54,FOLLOW_54_in_ruleAnnotationTargetType10124); 
+                    kw=(Token)match(input,54,FOLLOW_2); 
 
                             current.merge(kw);
                             newLeafNode(kw, grammarAccess.getAnnotationTargetTypeAccess().getActorClassKeyword_1()); 
@@ -12451,9 +12451,9 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5027:2: kw= 'ActorBehavior'
+                    // InternalRoom.g:5027:2: kw= 'ActorBehavior'
                     {
-                    kw=(Token)match(input,78,FOLLOW_78_in_ruleAnnotationTargetType10143); 
+                    kw=(Token)match(input,78,FOLLOW_2); 
 
                             current.merge(kw);
                             newLeafNode(kw, grammarAccess.getAnnotationTargetTypeAccess().getActorBehaviorKeyword_2()); 
@@ -12462,9 +12462,9 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 4 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5034:2: kw= 'ProtocolClass'
+                    // InternalRoom.g:5034:2: kw= 'ProtocolClass'
                     {
-                    kw=(Token)match(input,41,FOLLOW_41_in_ruleAnnotationTargetType10162); 
+                    kw=(Token)match(input,41,FOLLOW_2); 
 
                             current.merge(kw);
                             newLeafNode(kw, grammarAccess.getAnnotationTargetTypeAccess().getProtocolClassKeyword_3()); 
@@ -12473,9 +12473,9 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 5 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5041:2: kw= 'CompoundProtocolClass'
+                    // InternalRoom.g:5041:2: kw= 'CompoundProtocolClass'
                     {
-                    kw=(Token)match(input,47,FOLLOW_47_in_ruleAnnotationTargetType10181); 
+                    kw=(Token)match(input,47,FOLLOW_2); 
 
                             current.merge(kw);
                             newLeafNode(kw, grammarAccess.getAnnotationTargetTypeAccess().getCompoundProtocolClassKeyword_4()); 
@@ -12484,9 +12484,9 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 6 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5048:2: kw= 'SubSystemClass'
+                    // InternalRoom.g:5048:2: kw= 'SubSystemClass'
                     {
-                    kw=(Token)match(input,65,FOLLOW_65_in_ruleAnnotationTargetType10200); 
+                    kw=(Token)match(input,65,FOLLOW_2); 
 
                             current.merge(kw);
                             newLeafNode(kw, grammarAccess.getAnnotationTargetTypeAccess().getSubSystemClassKeyword_5()); 
@@ -12495,9 +12495,9 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 7 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5055:2: kw= 'LogicalSystem'
+                    // InternalRoom.g:5055:2: kw= 'LogicalSystem'
                     {
-                    kw=(Token)match(input,63,FOLLOW_63_in_ruleAnnotationTargetType10219); 
+                    kw=(Token)match(input,63,FOLLOW_2); 
 
                             current.merge(kw);
                             newLeafNode(kw, grammarAccess.getAnnotationTargetTypeAccess().getLogicalSystemKeyword_6()); 
@@ -12526,7 +12526,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleStateGraphNode"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5070:1: entryRuleStateGraphNode returns [EObject current=null] : iv_ruleStateGraphNode= ruleStateGraphNode EOF ;
+    // InternalRoom.g:5070:1: entryRuleStateGraphNode returns [EObject current=null] : iv_ruleStateGraphNode= ruleStateGraphNode EOF ;
     public final EObject entryRuleStateGraphNode() throws RecognitionException {
         EObject current = null;
 
@@ -12534,17 +12534,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5071:2: (iv_ruleStateGraphNode= ruleStateGraphNode EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5072:2: iv_ruleStateGraphNode= ruleStateGraphNode EOF
+            // InternalRoom.g:5071:2: (iv_ruleStateGraphNode= ruleStateGraphNode EOF )
+            // InternalRoom.g:5072:2: iv_ruleStateGraphNode= ruleStateGraphNode EOF
             {
              newCompositeNode(grammarAccess.getStateGraphNodeRule()); 
-            pushFollow(FOLLOW_ruleStateGraphNode_in_entryRuleStateGraphNode10261);
+            pushFollow(FOLLOW_1);
             iv_ruleStateGraphNode=ruleStateGraphNode();
 
             state._fsp--;
 
              current =iv_ruleStateGraphNode; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleStateGraphNode10271); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -12562,7 +12562,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleStateGraphNode"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5079:1: ruleStateGraphNode returns [EObject current=null] : (this_State_0= ruleState | this_ChoicePoint_1= ruleChoicePoint | this_TrPoint_2= ruleTrPoint ) ;
+    // InternalRoom.g:5079: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;
 
@@ -12576,10 +12576,10 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5082:28: ( (this_State_0= ruleState | this_ChoicePoint_1= ruleChoicePoint | this_TrPoint_2= ruleTrPoint ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5083:1: (this_State_0= ruleState | this_ChoicePoint_1= ruleChoicePoint | this_TrPoint_2= ruleTrPoint )
+            // InternalRoom.g:5082:28: ( (this_State_0= ruleState | this_ChoicePoint_1= ruleChoicePoint | this_TrPoint_2= ruleTrPoint ) )
+            // InternalRoom.g:5083:1: (this_State_0= ruleState | this_ChoicePoint_1= ruleChoicePoint | this_TrPoint_2= ruleTrPoint )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5083:1: (this_State_0= ruleState | this_ChoicePoint_1= ruleChoicePoint | this_TrPoint_2= ruleTrPoint )
+            // InternalRoom.g:5083:1: (this_State_0= ruleState | this_ChoicePoint_1= ruleChoicePoint | this_TrPoint_2= ruleTrPoint )
             int alt108=3;
             switch ( input.LA(1) ) {
             case 80:
@@ -12610,12 +12610,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             switch (alt108) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5084:5: this_State_0= ruleState
+                    // InternalRoom.g:5084:5: this_State_0= ruleState
                     {
                      
                             newCompositeNode(grammarAccess.getStateGraphNodeAccess().getStateParserRuleCall_0()); 
                         
-                    pushFollow(FOLLOW_ruleState_in_ruleStateGraphNode10318);
+                    pushFollow(FOLLOW_2);
                     this_State_0=ruleState();
 
                     state._fsp--;
@@ -12628,12 +12628,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5094:5: this_ChoicePoint_1= ruleChoicePoint
+                    // InternalRoom.g:5094:5: this_ChoicePoint_1= ruleChoicePoint
                     {
                      
                             newCompositeNode(grammarAccess.getStateGraphNodeAccess().getChoicePointParserRuleCall_1()); 
                         
-                    pushFollow(FOLLOW_ruleChoicePoint_in_ruleStateGraphNode10345);
+                    pushFollow(FOLLOW_2);
                     this_ChoicePoint_1=ruleChoicePoint();
 
                     state._fsp--;
@@ -12646,12 +12646,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5104:5: this_TrPoint_2= ruleTrPoint
+                    // InternalRoom.g:5104:5: this_TrPoint_2= ruleTrPoint
                     {
                      
                             newCompositeNode(grammarAccess.getStateGraphNodeAccess().getTrPointParserRuleCall_2()); 
                         
-                    pushFollow(FOLLOW_ruleTrPoint_in_ruleStateGraphNode10372);
+                    pushFollow(FOLLOW_2);
                     this_TrPoint_2=ruleTrPoint();
 
                     state._fsp--;
@@ -12684,7 +12684,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleStateGraph"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5122:1: entryRuleStateGraph returns [EObject current=null] : iv_ruleStateGraph= ruleStateGraph EOF ;
+    // InternalRoom.g:5122:1: entryRuleStateGraph returns [EObject current=null] : iv_ruleStateGraph= ruleStateGraph EOF ;
     public final EObject entryRuleStateGraph() throws RecognitionException {
         EObject current = null;
 
@@ -12692,17 +12692,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5123:2: (iv_ruleStateGraph= ruleStateGraph EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5124:2: iv_ruleStateGraph= ruleStateGraph EOF
+            // InternalRoom.g:5123:2: (iv_ruleStateGraph= ruleStateGraph EOF )
+            // InternalRoom.g:5124:2: iv_ruleStateGraph= ruleStateGraph EOF
             {
              newCompositeNode(grammarAccess.getStateGraphRule()); 
-            pushFollow(FOLLOW_ruleStateGraph_in_entryRuleStateGraph10409);
+            pushFollow(FOLLOW_1);
             iv_ruleStateGraph=ruleStateGraph();
 
             state._fsp--;
 
              current =iv_ruleStateGraph; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleStateGraph10419); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -12720,7 +12720,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleStateGraph"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5131: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= '}' ) ;
+    // InternalRoom.g:5131: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;
 
@@ -12740,14 +12740,14 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5134: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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5135: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= '}' )
+            // InternalRoom.g:5134: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= '}' ) )
+            // InternalRoom.g:5135: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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5135: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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5135: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= '}'
+            // InternalRoom.g:5135: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= '}' )
+            // InternalRoom.g:5135: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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5135:2: ()
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5136:5: 
+            // InternalRoom.g:5135:2: ()
+            // InternalRoom.g:5136:5: 
             {
 
                     current = forceCreateModelElement(
@@ -12757,11 +12757,11 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,13,FOLLOW_13_in_ruleStateGraph10465); 
+            otherlv_1=(Token)match(input,13,FOLLOW_91); 
 
                 	newLeafNode(otherlv_1, grammarAccess.getStateGraphAccess().getLeftCurlyBracketKeyword_1());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5145: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 ) ) )*
+            // InternalRoom.g:5145: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 ) ) )*
             loop109:
             do {
                 int alt109=6;
@@ -12800,18 +12800,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                 switch (alt109) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5145:2: ( (lv_states_2_0= ruleState ) )
+            	    // InternalRoom.g:5145:2: ( (lv_states_2_0= ruleState ) )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5145:2: ( (lv_states_2_0= ruleState ) )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5146:1: (lv_states_2_0= ruleState )
+            	    // InternalRoom.g:5145:2: ( (lv_states_2_0= ruleState ) )
+            	    // InternalRoom.g:5146:1: (lv_states_2_0= ruleState )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5146:1: (lv_states_2_0= ruleState )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5147:3: lv_states_2_0= ruleState
+            	    // InternalRoom.g:5146:1: (lv_states_2_0= ruleState )
+            	    // InternalRoom.g:5147:3: lv_states_2_0= ruleState
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getStateGraphAccess().getStatesStateParserRuleCall_2_0_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleState_in_ruleStateGraph10487);
+            	    pushFollow(FOLLOW_91);
             	    lv_states_2_0=ruleState();
 
             	    state._fsp--;
@@ -12824,7 +12824,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"states",
             	            		lv_states_2_0, 
-            	            		"State");
+            	            		"org.eclipse.etrice.core.fsm.FSM.State");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -12837,18 +12837,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 2 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5164:6: ( (lv_trPoints_3_0= ruleTrPoint ) )
+            	    // InternalRoom.g:5164:6: ( (lv_trPoints_3_0= ruleTrPoint ) )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5164:6: ( (lv_trPoints_3_0= ruleTrPoint ) )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5165:1: (lv_trPoints_3_0= ruleTrPoint )
+            	    // InternalRoom.g:5164:6: ( (lv_trPoints_3_0= ruleTrPoint ) )
+            	    // InternalRoom.g:5165:1: (lv_trPoints_3_0= ruleTrPoint )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5165:1: (lv_trPoints_3_0= ruleTrPoint )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5166:3: lv_trPoints_3_0= ruleTrPoint
+            	    // InternalRoom.g:5165:1: (lv_trPoints_3_0= ruleTrPoint )
+            	    // InternalRoom.g:5166:3: lv_trPoints_3_0= ruleTrPoint
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getStateGraphAccess().getTrPointsTrPointParserRuleCall_2_1_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleTrPoint_in_ruleStateGraph10514);
+            	    pushFollow(FOLLOW_91);
             	    lv_trPoints_3_0=ruleTrPoint();
 
             	    state._fsp--;
@@ -12861,7 +12861,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"trPoints",
             	            		lv_trPoints_3_0, 
-            	            		"TrPoint");
+            	            		"org.eclipse.etrice.core.fsm.FSM.TrPoint");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -12874,18 +12874,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 3 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5183:6: ( (lv_chPoints_4_0= ruleChoicePoint ) )
+            	    // InternalRoom.g:5183:6: ( (lv_chPoints_4_0= ruleChoicePoint ) )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5183:6: ( (lv_chPoints_4_0= ruleChoicePoint ) )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5184:1: (lv_chPoints_4_0= ruleChoicePoint )
+            	    // InternalRoom.g:5183:6: ( (lv_chPoints_4_0= ruleChoicePoint ) )
+            	    // InternalRoom.g:5184:1: (lv_chPoints_4_0= ruleChoicePoint )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5184:1: (lv_chPoints_4_0= ruleChoicePoint )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5185:3: lv_chPoints_4_0= ruleChoicePoint
+            	    // InternalRoom.g:5184:1: (lv_chPoints_4_0= ruleChoicePoint )
+            	    // InternalRoom.g:5185:3: lv_chPoints_4_0= ruleChoicePoint
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getStateGraphAccess().getChPointsChoicePointParserRuleCall_2_2_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleChoicePoint_in_ruleStateGraph10541);
+            	    pushFollow(FOLLOW_91);
             	    lv_chPoints_4_0=ruleChoicePoint();
 
             	    state._fsp--;
@@ -12898,7 +12898,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"chPoints",
             	            		lv_chPoints_4_0, 
-            	            		"ChoicePoint");
+            	            		"org.eclipse.etrice.core.fsm.FSM.ChoicePoint");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -12911,18 +12911,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 4 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5202:6: ( (lv_transitions_5_0= ruleTransition ) )
+            	    // InternalRoom.g:5202:6: ( (lv_transitions_5_0= ruleTransition ) )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5202:6: ( (lv_transitions_5_0= ruleTransition ) )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5203:1: (lv_transitions_5_0= ruleTransition )
+            	    // InternalRoom.g:5202:6: ( (lv_transitions_5_0= ruleTransition ) )
+            	    // InternalRoom.g:5203:1: (lv_transitions_5_0= ruleTransition )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5203:1: (lv_transitions_5_0= ruleTransition )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5204:3: lv_transitions_5_0= ruleTransition
+            	    // InternalRoom.g:5203:1: (lv_transitions_5_0= ruleTransition )
+            	    // InternalRoom.g:5204:3: lv_transitions_5_0= ruleTransition
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getStateGraphAccess().getTransitionsTransitionParserRuleCall_2_3_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleTransition_in_ruleStateGraph10568);
+            	    pushFollow(FOLLOW_91);
             	    lv_transitions_5_0=ruleTransition();
 
             	    state._fsp--;
@@ -12935,7 +12935,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"transitions",
             	            		lv_transitions_5_0, 
-            	            		"Transition");
+            	            		"org.eclipse.etrice.core.fsm.FSM.Transition");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -12948,18 +12948,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 5 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5221:6: ( (lv_refinedTransitions_6_0= ruleRefinedTransition ) )
+            	    // InternalRoom.g:5221:6: ( (lv_refinedTransitions_6_0= ruleRefinedTransition ) )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5221:6: ( (lv_refinedTransitions_6_0= ruleRefinedTransition ) )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5222:1: (lv_refinedTransitions_6_0= ruleRefinedTransition )
+            	    // InternalRoom.g:5221:6: ( (lv_refinedTransitions_6_0= ruleRefinedTransition ) )
+            	    // InternalRoom.g:5222:1: (lv_refinedTransitions_6_0= ruleRefinedTransition )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5222:1: (lv_refinedTransitions_6_0= ruleRefinedTransition )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5223:3: lv_refinedTransitions_6_0= ruleRefinedTransition
+            	    // InternalRoom.g:5222:1: (lv_refinedTransitions_6_0= ruleRefinedTransition )
+            	    // InternalRoom.g:5223:3: lv_refinedTransitions_6_0= ruleRefinedTransition
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getStateGraphAccess().getRefinedTransitionsRefinedTransitionParserRuleCall_2_4_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleRefinedTransition_in_ruleStateGraph10595);
+            	    pushFollow(FOLLOW_91);
             	    lv_refinedTransitions_6_0=ruleRefinedTransition();
 
             	    state._fsp--;
@@ -12972,7 +12972,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"refinedTransitions",
             	            		lv_refinedTransitions_6_0, 
-            	            		"RefinedTransition");
+            	            		"org.eclipse.etrice.core.fsm.FSM.RefinedTransition");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -12990,7 +12990,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                 }
             } while (true);
 
-            otherlv_7=(Token)match(input,14,FOLLOW_14_in_ruleStateGraph10609); 
+            otherlv_7=(Token)match(input,14,FOLLOW_2); 
 
                 	newLeafNode(otherlv_7, grammarAccess.getStateGraphAccess().getRightCurlyBracketKeyword_3());
                 
@@ -13015,7 +13015,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleStateMachine"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5251:1: entryRuleStateMachine returns [EObject current=null] : iv_ruleStateMachine= ruleStateMachine EOF ;
+    // InternalRoom.g:5251:1: entryRuleStateMachine returns [EObject current=null] : iv_ruleStateMachine= ruleStateMachine EOF ;
     public final EObject entryRuleStateMachine() throws RecognitionException {
         EObject current = null;
 
@@ -13023,17 +13023,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5252:2: (iv_ruleStateMachine= ruleStateMachine EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5253:2: iv_ruleStateMachine= ruleStateMachine EOF
+            // InternalRoom.g:5252:2: (iv_ruleStateMachine= ruleStateMachine EOF )
+            // InternalRoom.g:5253:2: iv_ruleStateMachine= ruleStateMachine EOF
             {
              newCompositeNode(grammarAccess.getStateMachineRule()); 
-            pushFollow(FOLLOW_ruleStateMachine_in_entryRuleStateMachine10645);
+            pushFollow(FOLLOW_1);
             iv_ruleStateMachine=ruleStateMachine();
 
             state._fsp--;
 
              current =iv_ruleStateMachine; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleStateMachine10655); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -13051,7 +13051,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleStateMachine"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5260: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= '}' ) ;
+    // InternalRoom.g:5260: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;
 
@@ -13072,14 +13072,14 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5263: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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5264: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= '}' )
+            // InternalRoom.g:5263: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= '}' ) )
+            // InternalRoom.g:5264: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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5264: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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5264: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= '}'
+            // InternalRoom.g:5264: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= '}' )
+            // InternalRoom.g:5264: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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5264:2: ()
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5265:5: 
+            // InternalRoom.g:5264:2: ()
+            // InternalRoom.g:5265:5: 
             {
 
                     current = forceCreateModelElement(
@@ -13089,15 +13089,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,79,FOLLOW_79_in_ruleStateMachine10701); 
+            otherlv_1=(Token)match(input,79,FOLLOW_5); 
 
                 	newLeafNode(otherlv_1, grammarAccess.getStateMachineAccess().getStateMachineKeyword_1());
                 
-            otherlv_2=(Token)match(input,13,FOLLOW_13_in_ruleStateMachine10713); 
+            otherlv_2=(Token)match(input,13,FOLLOW_91); 
 
                 	newLeafNode(otherlv_2, grammarAccess.getStateMachineAccess().getLeftCurlyBracketKeyword_2());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5278: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 ) ) )*
+            // InternalRoom.g:5278: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 ) ) )*
             loop110:
             do {
                 int alt110=6;
@@ -13136,18 +13136,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                 switch (alt110) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5278:2: ( (lv_states_3_0= ruleState ) )
+            	    // InternalRoom.g:5278:2: ( (lv_states_3_0= ruleState ) )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5278:2: ( (lv_states_3_0= ruleState ) )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5279:1: (lv_states_3_0= ruleState )
+            	    // InternalRoom.g:5278:2: ( (lv_states_3_0= ruleState ) )
+            	    // InternalRoom.g:5279:1: (lv_states_3_0= ruleState )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5279:1: (lv_states_3_0= ruleState )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5280:3: lv_states_3_0= ruleState
+            	    // InternalRoom.g:5279:1: (lv_states_3_0= ruleState )
+            	    // InternalRoom.g:5280:3: lv_states_3_0= ruleState
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getStateMachineAccess().getStatesStateParserRuleCall_3_0_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleState_in_ruleStateMachine10735);
+            	    pushFollow(FOLLOW_91);
             	    lv_states_3_0=ruleState();
 
             	    state._fsp--;
@@ -13160,7 +13160,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"states",
             	            		lv_states_3_0, 
-            	            		"State");
+            	            		"org.eclipse.etrice.core.fsm.FSM.State");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -13173,18 +13173,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 2 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5297:6: ( (lv_trPoints_4_0= ruleTrPoint ) )
+            	    // InternalRoom.g:5297:6: ( (lv_trPoints_4_0= ruleTrPoint ) )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5297:6: ( (lv_trPoints_4_0= ruleTrPoint ) )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5298:1: (lv_trPoints_4_0= ruleTrPoint )
+            	    // InternalRoom.g:5297:6: ( (lv_trPoints_4_0= ruleTrPoint ) )
+            	    // InternalRoom.g:5298:1: (lv_trPoints_4_0= ruleTrPoint )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5298:1: (lv_trPoints_4_0= ruleTrPoint )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5299:3: lv_trPoints_4_0= ruleTrPoint
+            	    // InternalRoom.g:5298:1: (lv_trPoints_4_0= ruleTrPoint )
+            	    // InternalRoom.g:5299:3: lv_trPoints_4_0= ruleTrPoint
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getStateMachineAccess().getTrPointsTrPointParserRuleCall_3_1_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleTrPoint_in_ruleStateMachine10762);
+            	    pushFollow(FOLLOW_91);
             	    lv_trPoints_4_0=ruleTrPoint();
 
             	    state._fsp--;
@@ -13197,7 +13197,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"trPoints",
             	            		lv_trPoints_4_0, 
-            	            		"TrPoint");
+            	            		"org.eclipse.etrice.core.fsm.FSM.TrPoint");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -13210,18 +13210,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 3 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5316:6: ( (lv_chPoints_5_0= ruleChoicePoint ) )
+            	    // InternalRoom.g:5316:6: ( (lv_chPoints_5_0= ruleChoicePoint ) )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5316:6: ( (lv_chPoints_5_0= ruleChoicePoint ) )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5317:1: (lv_chPoints_5_0= ruleChoicePoint )
+            	    // InternalRoom.g:5316:6: ( (lv_chPoints_5_0= ruleChoicePoint ) )
+            	    // InternalRoom.g:5317:1: (lv_chPoints_5_0= ruleChoicePoint )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5317:1: (lv_chPoints_5_0= ruleChoicePoint )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5318:3: lv_chPoints_5_0= ruleChoicePoint
+            	    // InternalRoom.g:5317:1: (lv_chPoints_5_0= ruleChoicePoint )
+            	    // InternalRoom.g:5318:3: lv_chPoints_5_0= ruleChoicePoint
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getStateMachineAccess().getChPointsChoicePointParserRuleCall_3_2_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleChoicePoint_in_ruleStateMachine10789);
+            	    pushFollow(FOLLOW_91);
             	    lv_chPoints_5_0=ruleChoicePoint();
 
             	    state._fsp--;
@@ -13234,7 +13234,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"chPoints",
             	            		lv_chPoints_5_0, 
-            	            		"ChoicePoint");
+            	            		"org.eclipse.etrice.core.fsm.FSM.ChoicePoint");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -13247,18 +13247,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 4 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5335:6: ( (lv_transitions_6_0= ruleTransition ) )
+            	    // InternalRoom.g:5335:6: ( (lv_transitions_6_0= ruleTransition ) )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5335:6: ( (lv_transitions_6_0= ruleTransition ) )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5336:1: (lv_transitions_6_0= ruleTransition )
+            	    // InternalRoom.g:5335:6: ( (lv_transitions_6_0= ruleTransition ) )
+            	    // InternalRoom.g:5336:1: (lv_transitions_6_0= ruleTransition )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5336:1: (lv_transitions_6_0= ruleTransition )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5337:3: lv_transitions_6_0= ruleTransition
+            	    // InternalRoom.g:5336:1: (lv_transitions_6_0= ruleTransition )
+            	    // InternalRoom.g:5337:3: lv_transitions_6_0= ruleTransition
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getStateMachineAccess().getTransitionsTransitionParserRuleCall_3_3_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleTransition_in_ruleStateMachine10816);
+            	    pushFollow(FOLLOW_91);
             	    lv_transitions_6_0=ruleTransition();
 
             	    state._fsp--;
@@ -13271,7 +13271,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"transitions",
             	            		lv_transitions_6_0, 
-            	            		"Transition");
+            	            		"org.eclipse.etrice.core.fsm.FSM.Transition");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -13284,18 +13284,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 5 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5354:6: ( (lv_refinedTransitions_7_0= ruleRefinedTransition ) )
+            	    // InternalRoom.g:5354:6: ( (lv_refinedTransitions_7_0= ruleRefinedTransition ) )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5354:6: ( (lv_refinedTransitions_7_0= ruleRefinedTransition ) )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5355:1: (lv_refinedTransitions_7_0= ruleRefinedTransition )
+            	    // InternalRoom.g:5354:6: ( (lv_refinedTransitions_7_0= ruleRefinedTransition ) )
+            	    // InternalRoom.g:5355:1: (lv_refinedTransitions_7_0= ruleRefinedTransition )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5355:1: (lv_refinedTransitions_7_0= ruleRefinedTransition )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5356:3: lv_refinedTransitions_7_0= ruleRefinedTransition
+            	    // InternalRoom.g:5355:1: (lv_refinedTransitions_7_0= ruleRefinedTransition )
+            	    // InternalRoom.g:5356:3: lv_refinedTransitions_7_0= ruleRefinedTransition
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getStateMachineAccess().getRefinedTransitionsRefinedTransitionParserRuleCall_3_4_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleRefinedTransition_in_ruleStateMachine10843);
+            	    pushFollow(FOLLOW_91);
             	    lv_refinedTransitions_7_0=ruleRefinedTransition();
 
             	    state._fsp--;
@@ -13308,7 +13308,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"refinedTransitions",
             	            		lv_refinedTransitions_7_0, 
-            	            		"RefinedTransition");
+            	            		"org.eclipse.etrice.core.fsm.FSM.RefinedTransition");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -13326,7 +13326,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                 }
             } while (true);
 
-            otherlv_8=(Token)match(input,14,FOLLOW_14_in_ruleStateMachine10857); 
+            otherlv_8=(Token)match(input,14,FOLLOW_2); 
 
                 	newLeafNode(otherlv_8, grammarAccess.getStateMachineAccess().getRightCurlyBracketKeyword_4());
                 
@@ -13351,7 +13351,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleState"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5384:1: entryRuleState returns [EObject current=null] : iv_ruleState= ruleState EOF ;
+    // InternalRoom.g:5384:1: entryRuleState returns [EObject current=null] : iv_ruleState= ruleState EOF ;
     public final EObject entryRuleState() throws RecognitionException {
         EObject current = null;
 
@@ -13359,17 +13359,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5385:2: (iv_ruleState= ruleState EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5386:2: iv_ruleState= ruleState EOF
+            // InternalRoom.g:5385:2: (iv_ruleState= ruleState EOF )
+            // InternalRoom.g:5386:2: iv_ruleState= ruleState EOF
             {
              newCompositeNode(grammarAccess.getStateRule()); 
-            pushFollow(FOLLOW_ruleState_in_entryRuleState10893);
+            pushFollow(FOLLOW_1);
             iv_ruleState=ruleState();
 
             state._fsp--;
 
              current =iv_ruleState; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleState10903); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -13387,7 +13387,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleState"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5393:1: ruleState returns [EObject current=null] : (this_SimpleState_0= ruleSimpleState | this_RefinedState_1= ruleRefinedState ) ;
+    // InternalRoom.g:5393:1: ruleState returns [EObject current=null] : (this_SimpleState_0= ruleSimpleState | this_RefinedState_1= ruleRefinedState ) ;
     public final EObject ruleState() throws RecognitionException {
         EObject current = null;
 
@@ -13399,10 +13399,10 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5396:28: ( (this_SimpleState_0= ruleSimpleState | this_RefinedState_1= ruleRefinedState ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5397:1: (this_SimpleState_0= ruleSimpleState | this_RefinedState_1= ruleRefinedState )
+            // InternalRoom.g:5396:28: ( (this_SimpleState_0= ruleSimpleState | this_RefinedState_1= ruleRefinedState ) )
+            // InternalRoom.g:5397:1: (this_SimpleState_0= ruleSimpleState | this_RefinedState_1= ruleRefinedState )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5397:1: (this_SimpleState_0= ruleSimpleState | this_RefinedState_1= ruleRefinedState )
+            // InternalRoom.g:5397:1: (this_SimpleState_0= ruleSimpleState | this_RefinedState_1= ruleRefinedState )
             int alt111=2;
             int LA111_0 = input.LA(1);
 
@@ -13420,12 +13420,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt111) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5398:5: this_SimpleState_0= ruleSimpleState
+                    // InternalRoom.g:5398:5: this_SimpleState_0= ruleSimpleState
                     {
                      
                             newCompositeNode(grammarAccess.getStateAccess().getSimpleStateParserRuleCall_0()); 
                         
-                    pushFollow(FOLLOW_ruleSimpleState_in_ruleState10950);
+                    pushFollow(FOLLOW_2);
                     this_SimpleState_0=ruleSimpleState();
 
                     state._fsp--;
@@ -13438,12 +13438,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5408:5: this_RefinedState_1= ruleRefinedState
+                    // InternalRoom.g:5408:5: this_RefinedState_1= ruleRefinedState
                     {
                      
                             newCompositeNode(grammarAccess.getStateAccess().getRefinedStateParserRuleCall_1()); 
                         
-                    pushFollow(FOLLOW_ruleRefinedState_in_ruleState10977);
+                    pushFollow(FOLLOW_2);
                     this_RefinedState_1=ruleRefinedState();
 
                     state._fsp--;
@@ -13476,7 +13476,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleSimpleState"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5424:1: entryRuleSimpleState returns [EObject current=null] : iv_ruleSimpleState= ruleSimpleState EOF ;
+    // InternalRoom.g:5424:1: entryRuleSimpleState returns [EObject current=null] : iv_ruleSimpleState= ruleSimpleState EOF ;
     public final EObject entryRuleSimpleState() throws RecognitionException {
         EObject current = null;
 
@@ -13484,17 +13484,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5425:2: (iv_ruleSimpleState= ruleSimpleState EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5426:2: iv_ruleSimpleState= ruleSimpleState EOF
+            // InternalRoom.g:5425:2: (iv_ruleSimpleState= ruleSimpleState EOF )
+            // InternalRoom.g:5426:2: iv_ruleSimpleState= ruleSimpleState EOF
             {
              newCompositeNode(grammarAccess.getSimpleStateRule()); 
-            pushFollow(FOLLOW_ruleSimpleState_in_entryRuleSimpleState11012);
+            pushFollow(FOLLOW_1);
             iv_ruleSimpleState=ruleSimpleState();
 
             state._fsp--;
 
              current =iv_ruleSimpleState; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSimpleState11022); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -13512,7 +13512,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleSimpleState"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5433: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= '}' )? ) ;
+    // InternalRoom.g:5433: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;
 
@@ -13538,23 +13538,23 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5436: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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5437: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= '}' )? )
+            // InternalRoom.g:5436: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= '}' )? ) )
+            // InternalRoom.g:5437: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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5437: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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5437: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= '}' )?
+            // InternalRoom.g:5437: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= '}' )? )
+            // InternalRoom.g:5437: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,80,FOLLOW_80_in_ruleSimpleState11059); 
+            otherlv_0=(Token)match(input,80,FOLLOW_3); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getSimpleStateAccess().getStateKeyword_0());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5441:1: ( (lv_name_1_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5442:1: (lv_name_1_0= RULE_ID )
+            // InternalRoom.g:5441:1: ( (lv_name_1_0= RULE_ID ) )
+            // InternalRoom.g:5442:1: (lv_name_1_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5442:1: (lv_name_1_0= RULE_ID )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5443:3: lv_name_1_0= RULE_ID
+            // InternalRoom.g:5442:1: (lv_name_1_0= RULE_ID )
+            // InternalRoom.g:5443:3: lv_name_1_0= RULE_ID
             {
-            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleSimpleState11076); 
+            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_92); 
 
             			newLeafNode(lv_name_1_0, grammarAccess.getSimpleStateAccess().getNameIDTerminalRuleCall_1_0()); 
             		
@@ -13566,7 +13566,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"name",
                     		lv_name_1_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -13574,7 +13574,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5459:2: ( (lv_docu_2_0= ruleDocumentation ) )?
+            // InternalRoom.g:5459:2: ( (lv_docu_2_0= ruleDocumentation ) )?
             int alt112=2;
             int LA112_0 = input.LA(1);
 
@@ -13583,15 +13583,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt112) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5460:1: (lv_docu_2_0= ruleDocumentation )
+                    // InternalRoom.g:5460:1: (lv_docu_2_0= ruleDocumentation )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5460:1: (lv_docu_2_0= ruleDocumentation )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5461:3: lv_docu_2_0= ruleDocumentation
+                    // InternalRoom.g:5460:1: (lv_docu_2_0= ruleDocumentation )
+                    // InternalRoom.g:5461:3: lv_docu_2_0= ruleDocumentation
                     {
                      
                     	        newCompositeNode(grammarAccess.getSimpleStateAccess().getDocuDocumentationParserRuleCall_2_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDocumentation_in_ruleSimpleState11102);
+                    pushFollow(FOLLOW_80);
                     lv_docu_2_0=ruleDocumentation();
 
                     state._fsp--;
@@ -13604,7 +13604,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"docu",
                             		lv_docu_2_0, 
-                            		"Documentation");
+                            		"org.eclipse.etrice.core.common.Base.Documentation");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -13616,7 +13616,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5477: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= '}' )?
+            // InternalRoom.g:5477: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 alt117=2;
             int LA117_0 = input.LA(1);
 
@@ -13625,13 +13625,13 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt117) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5477: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= '}'
+                    // InternalRoom.g:5477: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,13,FOLLOW_13_in_ruleSimpleState11116); 
+                    otherlv_3=(Token)match(input,13,FOLLOW_93); 
 
                         	newLeafNode(otherlv_3, grammarAccess.getSimpleStateAccess().getLeftCurlyBracketKeyword_3_0());
                         
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5481:1: (otherlv_4= 'entry' ( (lv_entryCode_5_0= ruleDetailCode ) ) )?
+                    // InternalRoom.g:5481:1: (otherlv_4= 'entry' ( (lv_entryCode_5_0= ruleDetailCode ) ) )?
                     int alt113=2;
                     int LA113_0 = input.LA(1);
 
@@ -13640,22 +13640,22 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     switch (alt113) {
                         case 1 :
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5481:3: otherlv_4= 'entry' ( (lv_entryCode_5_0= ruleDetailCode ) )
+                            // InternalRoom.g:5481:3: otherlv_4= 'entry' ( (lv_entryCode_5_0= ruleDetailCode ) )
                             {
-                            otherlv_4=(Token)match(input,81,FOLLOW_81_in_ruleSimpleState11129); 
+                            otherlv_4=(Token)match(input,81,FOLLOW_5); 
 
                                 	newLeafNode(otherlv_4, grammarAccess.getSimpleStateAccess().getEntryKeyword_3_1_0());
                                 
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5485:1: ( (lv_entryCode_5_0= ruleDetailCode ) )
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5486:1: (lv_entryCode_5_0= ruleDetailCode )
+                            // InternalRoom.g:5485:1: ( (lv_entryCode_5_0= ruleDetailCode ) )
+                            // InternalRoom.g:5486:1: (lv_entryCode_5_0= ruleDetailCode )
                             {
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5486:1: (lv_entryCode_5_0= ruleDetailCode )
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5487:3: lv_entryCode_5_0= ruleDetailCode
+                            // InternalRoom.g:5486:1: (lv_entryCode_5_0= ruleDetailCode )
+                            // InternalRoom.g:5487:3: lv_entryCode_5_0= ruleDetailCode
                             {
                              
                             	        newCompositeNode(grammarAccess.getSimpleStateAccess().getEntryCodeDetailCodeParserRuleCall_3_1_1_0()); 
                             	    
-                            pushFollow(FOLLOW_ruleDetailCode_in_ruleSimpleState11150);
+                            pushFollow(FOLLOW_94);
                             lv_entryCode_5_0=ruleDetailCode();
 
                             state._fsp--;
@@ -13668,7 +13668,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                                    			current, 
                                    			"entryCode",
                                     		lv_entryCode_5_0, 
-                                    		"DetailCode");
+                                    		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
                             	        afterParserOrEnumRuleCall();
                             	    
 
@@ -13683,7 +13683,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5503:4: (otherlv_6= 'exit' ( (lv_exitCode_7_0= ruleDetailCode ) ) )?
+                    // InternalRoom.g:5503:4: (otherlv_6= 'exit' ( (lv_exitCode_7_0= ruleDetailCode ) ) )?
                     int alt114=2;
                     int LA114_0 = input.LA(1);
 
@@ -13692,22 +13692,22 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     switch (alt114) {
                         case 1 :
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5503:6: otherlv_6= 'exit' ( (lv_exitCode_7_0= ruleDetailCode ) )
+                            // InternalRoom.g:5503:6: otherlv_6= 'exit' ( (lv_exitCode_7_0= ruleDetailCode ) )
                             {
-                            otherlv_6=(Token)match(input,82,FOLLOW_82_in_ruleSimpleState11165); 
+                            otherlv_6=(Token)match(input,82,FOLLOW_5); 
 
                                 	newLeafNode(otherlv_6, grammarAccess.getSimpleStateAccess().getExitKeyword_3_2_0());
                                 
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5507:1: ( (lv_exitCode_7_0= ruleDetailCode ) )
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5508:1: (lv_exitCode_7_0= ruleDetailCode )
+                            // InternalRoom.g:5507:1: ( (lv_exitCode_7_0= ruleDetailCode ) )
+                            // InternalRoom.g:5508:1: (lv_exitCode_7_0= ruleDetailCode )
                             {
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5508:1: (lv_exitCode_7_0= ruleDetailCode )
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5509:3: lv_exitCode_7_0= ruleDetailCode
+                            // InternalRoom.g:5508:1: (lv_exitCode_7_0= ruleDetailCode )
+                            // InternalRoom.g:5509:3: lv_exitCode_7_0= ruleDetailCode
                             {
                              
                             	        newCompositeNode(grammarAccess.getSimpleStateAccess().getExitCodeDetailCodeParserRuleCall_3_2_1_0()); 
                             	    
-                            pushFollow(FOLLOW_ruleDetailCode_in_ruleSimpleState11186);
+                            pushFollow(FOLLOW_95);
                             lv_exitCode_7_0=ruleDetailCode();
 
                             state._fsp--;
@@ -13720,7 +13720,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                                    			current, 
                                    			"exitCode",
                                     		lv_exitCode_7_0, 
-                                    		"DetailCode");
+                                    		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
                             	        afterParserOrEnumRuleCall();
                             	    
 
@@ -13735,7 +13735,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5525:4: (otherlv_8= 'do' ( (lv_doCode_9_0= ruleDetailCode ) ) )?
+                    // InternalRoom.g:5525:4: (otherlv_8= 'do' ( (lv_doCode_9_0= ruleDetailCode ) ) )?
                     int alt115=2;
                     int LA115_0 = input.LA(1);
 
@@ -13744,22 +13744,22 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     switch (alt115) {
                         case 1 :
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5525:6: otherlv_8= 'do' ( (lv_doCode_9_0= ruleDetailCode ) )
+                            // InternalRoom.g:5525:6: otherlv_8= 'do' ( (lv_doCode_9_0= ruleDetailCode ) )
                             {
-                            otherlv_8=(Token)match(input,83,FOLLOW_83_in_ruleSimpleState11201); 
+                            otherlv_8=(Token)match(input,83,FOLLOW_5); 
 
                                 	newLeafNode(otherlv_8, grammarAccess.getSimpleStateAccess().getDoKeyword_3_3_0());
                                 
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5529:1: ( (lv_doCode_9_0= ruleDetailCode ) )
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5530:1: (lv_doCode_9_0= ruleDetailCode )
+                            // InternalRoom.g:5529:1: ( (lv_doCode_9_0= ruleDetailCode ) )
+                            // InternalRoom.g:5530:1: (lv_doCode_9_0= ruleDetailCode )
                             {
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5530:1: (lv_doCode_9_0= ruleDetailCode )
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5531:3: lv_doCode_9_0= ruleDetailCode
+                            // InternalRoom.g:5530:1: (lv_doCode_9_0= ruleDetailCode )
+                            // InternalRoom.g:5531:3: lv_doCode_9_0= ruleDetailCode
                             {
                              
                             	        newCompositeNode(grammarAccess.getSimpleStateAccess().getDoCodeDetailCodeParserRuleCall_3_3_1_0()); 
                             	    
-                            pushFollow(FOLLOW_ruleDetailCode_in_ruleSimpleState11222);
+                            pushFollow(FOLLOW_96);
                             lv_doCode_9_0=ruleDetailCode();
 
                             state._fsp--;
@@ -13772,7 +13772,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                                    			current, 
                                    			"doCode",
                                     		lv_doCode_9_0, 
-                                    		"DetailCode");
+                                    		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
                             	        afterParserOrEnumRuleCall();
                             	    
 
@@ -13787,7 +13787,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5547:4: (otherlv_10= 'subgraph' ( (lv_subgraph_11_0= ruleStateGraph ) ) )?
+                    // InternalRoom.g:5547:4: (otherlv_10= 'subgraph' ( (lv_subgraph_11_0= ruleStateGraph ) ) )?
                     int alt116=2;
                     int LA116_0 = input.LA(1);
 
@@ -13796,22 +13796,22 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     switch (alt116) {
                         case 1 :
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5547:6: otherlv_10= 'subgraph' ( (lv_subgraph_11_0= ruleStateGraph ) )
+                            // InternalRoom.g:5547:6: otherlv_10= 'subgraph' ( (lv_subgraph_11_0= ruleStateGraph ) )
                             {
-                            otherlv_10=(Token)match(input,84,FOLLOW_84_in_ruleSimpleState11237); 
+                            otherlv_10=(Token)match(input,84,FOLLOW_5); 
 
                                 	newLeafNode(otherlv_10, grammarAccess.getSimpleStateAccess().getSubgraphKeyword_3_4_0());
                                 
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5551:1: ( (lv_subgraph_11_0= ruleStateGraph ) )
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5552:1: (lv_subgraph_11_0= ruleStateGraph )
+                            // InternalRoom.g:5551:1: ( (lv_subgraph_11_0= ruleStateGraph ) )
+                            // InternalRoom.g:5552:1: (lv_subgraph_11_0= ruleStateGraph )
                             {
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5552:1: (lv_subgraph_11_0= ruleStateGraph )
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5553:3: lv_subgraph_11_0= ruleStateGraph
+                            // InternalRoom.g:5552:1: (lv_subgraph_11_0= ruleStateGraph )
+                            // InternalRoom.g:5553:3: lv_subgraph_11_0= ruleStateGraph
                             {
                              
                             	        newCompositeNode(grammarAccess.getSimpleStateAccess().getSubgraphStateGraphParserRuleCall_3_4_1_0()); 
                             	    
-                            pushFollow(FOLLOW_ruleStateGraph_in_ruleSimpleState11258);
+                            pushFollow(FOLLOW_53);
                             lv_subgraph_11_0=ruleStateGraph();
 
                             state._fsp--;
@@ -13824,7 +13824,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                                    			current, 
                                    			"subgraph",
                                     		lv_subgraph_11_0, 
-                                    		"StateGraph");
+                                    		"org.eclipse.etrice.core.fsm.FSM.StateGraph");
                             	        afterParserOrEnumRuleCall();
                             	    
 
@@ -13839,7 +13839,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_12=(Token)match(input,14,FOLLOW_14_in_ruleSimpleState11272); 
+                    otherlv_12=(Token)match(input,14,FOLLOW_2); 
 
                         	newLeafNode(otherlv_12, grammarAccess.getSimpleStateAccess().getRightCurlyBracketKeyword_3_5());
                         
@@ -13870,7 +13870,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleRefinedState"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5581:1: entryRuleRefinedState returns [EObject current=null] : iv_ruleRefinedState= ruleRefinedState EOF ;
+    // InternalRoom.g:5581:1: entryRuleRefinedState returns [EObject current=null] : iv_ruleRefinedState= ruleRefinedState EOF ;
     public final EObject entryRuleRefinedState() throws RecognitionException {
         EObject current = null;
 
@@ -13878,17 +13878,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5582:2: (iv_ruleRefinedState= ruleRefinedState EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5583:2: iv_ruleRefinedState= ruleRefinedState EOF
+            // InternalRoom.g:5582:2: (iv_ruleRefinedState= ruleRefinedState EOF )
+            // InternalRoom.g:5583:2: iv_ruleRefinedState= ruleRefinedState EOF
             {
              newCompositeNode(grammarAccess.getRefinedStateRule()); 
-            pushFollow(FOLLOW_ruleRefinedState_in_entryRuleRefinedState11310);
+            pushFollow(FOLLOW_1);
             iv_ruleRefinedState=ruleRefinedState();
 
             state._fsp--;
 
              current =iv_ruleRefinedState; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRefinedState11320); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -13906,7 +13906,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleRefinedState"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5590: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= '}' ) ;
+    // InternalRoom.g:5590: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;
 
@@ -13931,21 +13931,21 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5593: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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5594: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= '}' )
+            // InternalRoom.g:5593: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= '}' ) )
+            // InternalRoom.g:5594: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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5594: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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5594: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= '}'
+            // InternalRoom.g:5594: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= '}' )
+            // InternalRoom.g:5594: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,85,FOLLOW_85_in_ruleRefinedState11357); 
+            otherlv_0=(Token)match(input,85,FOLLOW_3); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getRefinedStateAccess().getRefinedStateKeyword_0());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5598:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5599:1: ( ruleFQN )
+            // InternalRoom.g:5598:1: ( ( ruleFQN ) )
+            // InternalRoom.g:5599:1: ( ruleFQN )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5599:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5600:3: ruleFQN
+            // InternalRoom.g:5599:1: ( ruleFQN )
+            // InternalRoom.g:5600:3: ruleFQN
             {
 
             			if (current==null) {
@@ -13955,7 +13955,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
              
             	        newCompositeNode(grammarAccess.getRefinedStateAccess().getTargetStateCrossReference_1_0()); 
             	    
-            pushFollow(FOLLOW_ruleFQN_in_ruleRefinedState11380);
+            pushFollow(FOLLOW_4);
             ruleFQN();
 
             state._fsp--;
@@ -13969,7 +13969,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5613:2: ( (lv_docu_2_0= ruleDocumentation ) )?
+            // InternalRoom.g:5613:2: ( (lv_docu_2_0= ruleDocumentation ) )?
             int alt118=2;
             int LA118_0 = input.LA(1);
 
@@ -13978,15 +13978,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt118) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5614:1: (lv_docu_2_0= ruleDocumentation )
+                    // InternalRoom.g:5614:1: (lv_docu_2_0= ruleDocumentation )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5614:1: (lv_docu_2_0= ruleDocumentation )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5615:3: lv_docu_2_0= ruleDocumentation
+                    // InternalRoom.g:5614:1: (lv_docu_2_0= ruleDocumentation )
+                    // InternalRoom.g:5615:3: lv_docu_2_0= ruleDocumentation
                     {
                      
                     	        newCompositeNode(grammarAccess.getRefinedStateAccess().getDocuDocumentationParserRuleCall_2_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDocumentation_in_ruleRefinedState11401);
+                    pushFollow(FOLLOW_5);
                     lv_docu_2_0=ruleDocumentation();
 
                     state._fsp--;
@@ -13999,7 +13999,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"docu",
                             		lv_docu_2_0, 
-                            		"Documentation");
+                            		"org.eclipse.etrice.core.common.Base.Documentation");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -14011,11 +14011,11 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_3=(Token)match(input,13,FOLLOW_13_in_ruleRefinedState11414); 
+            otherlv_3=(Token)match(input,13,FOLLOW_93); 
 
                 	newLeafNode(otherlv_3, grammarAccess.getRefinedStateAccess().getLeftCurlyBracketKeyword_3());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5635:1: (otherlv_4= 'entry' ( (lv_entryCode_5_0= ruleDetailCode ) ) )?
+            // InternalRoom.g:5635:1: (otherlv_4= 'entry' ( (lv_entryCode_5_0= ruleDetailCode ) ) )?
             int alt119=2;
             int LA119_0 = input.LA(1);
 
@@ -14024,22 +14024,22 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt119) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5635:3: otherlv_4= 'entry' ( (lv_entryCode_5_0= ruleDetailCode ) )
+                    // InternalRoom.g:5635:3: otherlv_4= 'entry' ( (lv_entryCode_5_0= ruleDetailCode ) )
                     {
-                    otherlv_4=(Token)match(input,81,FOLLOW_81_in_ruleRefinedState11427); 
+                    otherlv_4=(Token)match(input,81,FOLLOW_5); 
 
                         	newLeafNode(otherlv_4, grammarAccess.getRefinedStateAccess().getEntryKeyword_4_0());
                         
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5639:1: ( (lv_entryCode_5_0= ruleDetailCode ) )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5640:1: (lv_entryCode_5_0= ruleDetailCode )
+                    // InternalRoom.g:5639:1: ( (lv_entryCode_5_0= ruleDetailCode ) )
+                    // InternalRoom.g:5640:1: (lv_entryCode_5_0= ruleDetailCode )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5640:1: (lv_entryCode_5_0= ruleDetailCode )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5641:3: lv_entryCode_5_0= ruleDetailCode
+                    // InternalRoom.g:5640:1: (lv_entryCode_5_0= ruleDetailCode )
+                    // InternalRoom.g:5641:3: lv_entryCode_5_0= ruleDetailCode
                     {
                      
                     	        newCompositeNode(grammarAccess.getRefinedStateAccess().getEntryCodeDetailCodeParserRuleCall_4_1_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDetailCode_in_ruleRefinedState11448);
+                    pushFollow(FOLLOW_94);
                     lv_entryCode_5_0=ruleDetailCode();
 
                     state._fsp--;
@@ -14052,7 +14052,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"entryCode",
                             		lv_entryCode_5_0, 
-                            		"DetailCode");
+                            		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -14067,7 +14067,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5657:4: (otherlv_6= 'exit' ( (lv_exitCode_7_0= ruleDetailCode ) ) )?
+            // InternalRoom.g:5657:4: (otherlv_6= 'exit' ( (lv_exitCode_7_0= ruleDetailCode ) ) )?
             int alt120=2;
             int LA120_0 = input.LA(1);
 
@@ -14076,22 +14076,22 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt120) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5657:6: otherlv_6= 'exit' ( (lv_exitCode_7_0= ruleDetailCode ) )
+                    // InternalRoom.g:5657:6: otherlv_6= 'exit' ( (lv_exitCode_7_0= ruleDetailCode ) )
                     {
-                    otherlv_6=(Token)match(input,82,FOLLOW_82_in_ruleRefinedState11463); 
+                    otherlv_6=(Token)match(input,82,FOLLOW_5); 
 
                         	newLeafNode(otherlv_6, grammarAccess.getRefinedStateAccess().getExitKeyword_5_0());
                         
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5661:1: ( (lv_exitCode_7_0= ruleDetailCode ) )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5662:1: (lv_exitCode_7_0= ruleDetailCode )
+                    // InternalRoom.g:5661:1: ( (lv_exitCode_7_0= ruleDetailCode ) )
+                    // InternalRoom.g:5662:1: (lv_exitCode_7_0= ruleDetailCode )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5662:1: (lv_exitCode_7_0= ruleDetailCode )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5663:3: lv_exitCode_7_0= ruleDetailCode
+                    // InternalRoom.g:5662:1: (lv_exitCode_7_0= ruleDetailCode )
+                    // InternalRoom.g:5663:3: lv_exitCode_7_0= ruleDetailCode
                     {
                      
                     	        newCompositeNode(grammarAccess.getRefinedStateAccess().getExitCodeDetailCodeParserRuleCall_5_1_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDetailCode_in_ruleRefinedState11484);
+                    pushFollow(FOLLOW_95);
                     lv_exitCode_7_0=ruleDetailCode();
 
                     state._fsp--;
@@ -14104,7 +14104,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"exitCode",
                             		lv_exitCode_7_0, 
-                            		"DetailCode");
+                            		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -14119,7 +14119,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5679:4: (otherlv_8= 'do' ( (lv_doCode_9_0= ruleDetailCode ) ) )?
+            // InternalRoom.g:5679:4: (otherlv_8= 'do' ( (lv_doCode_9_0= ruleDetailCode ) ) )?
             int alt121=2;
             int LA121_0 = input.LA(1);
 
@@ -14128,22 +14128,22 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt121) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5679:6: otherlv_8= 'do' ( (lv_doCode_9_0= ruleDetailCode ) )
+                    // InternalRoom.g:5679:6: otherlv_8= 'do' ( (lv_doCode_9_0= ruleDetailCode ) )
                     {
-                    otherlv_8=(Token)match(input,83,FOLLOW_83_in_ruleRefinedState11499); 
+                    otherlv_8=(Token)match(input,83,FOLLOW_5); 
 
                         	newLeafNode(otherlv_8, grammarAccess.getRefinedStateAccess().getDoKeyword_6_0());
                         
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5683:1: ( (lv_doCode_9_0= ruleDetailCode ) )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5684:1: (lv_doCode_9_0= ruleDetailCode )
+                    // InternalRoom.g:5683:1: ( (lv_doCode_9_0= ruleDetailCode ) )
+                    // InternalRoom.g:5684:1: (lv_doCode_9_0= ruleDetailCode )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5684:1: (lv_doCode_9_0= ruleDetailCode )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5685:3: lv_doCode_9_0= ruleDetailCode
+                    // InternalRoom.g:5684:1: (lv_doCode_9_0= ruleDetailCode )
+                    // InternalRoom.g:5685:3: lv_doCode_9_0= ruleDetailCode
                     {
                      
                     	        newCompositeNode(grammarAccess.getRefinedStateAccess().getDoCodeDetailCodeParserRuleCall_6_1_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDetailCode_in_ruleRefinedState11520);
+                    pushFollow(FOLLOW_96);
                     lv_doCode_9_0=ruleDetailCode();
 
                     state._fsp--;
@@ -14156,7 +14156,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"doCode",
                             		lv_doCode_9_0, 
-                            		"DetailCode");
+                            		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -14171,7 +14171,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5701:4: (otherlv_10= 'subgraph' ( (lv_subgraph_11_0= ruleStateGraph ) ) )?
+            // InternalRoom.g:5701:4: (otherlv_10= 'subgraph' ( (lv_subgraph_11_0= ruleStateGraph ) ) )?
             int alt122=2;
             int LA122_0 = input.LA(1);
 
@@ -14180,22 +14180,22 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt122) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5701:6: otherlv_10= 'subgraph' ( (lv_subgraph_11_0= ruleStateGraph ) )
+                    // InternalRoom.g:5701:6: otherlv_10= 'subgraph' ( (lv_subgraph_11_0= ruleStateGraph ) )
                     {
-                    otherlv_10=(Token)match(input,84,FOLLOW_84_in_ruleRefinedState11535); 
+                    otherlv_10=(Token)match(input,84,FOLLOW_5); 
 
                         	newLeafNode(otherlv_10, grammarAccess.getRefinedStateAccess().getSubgraphKeyword_7_0());
                         
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5705:1: ( (lv_subgraph_11_0= ruleStateGraph ) )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5706:1: (lv_subgraph_11_0= ruleStateGraph )
+                    // InternalRoom.g:5705:1: ( (lv_subgraph_11_0= ruleStateGraph ) )
+                    // InternalRoom.g:5706:1: (lv_subgraph_11_0= ruleStateGraph )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5706:1: (lv_subgraph_11_0= ruleStateGraph )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5707:3: lv_subgraph_11_0= ruleStateGraph
+                    // InternalRoom.g:5706:1: (lv_subgraph_11_0= ruleStateGraph )
+                    // InternalRoom.g:5707:3: lv_subgraph_11_0= ruleStateGraph
                     {
                      
                     	        newCompositeNode(grammarAccess.getRefinedStateAccess().getSubgraphStateGraphParserRuleCall_7_1_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleStateGraph_in_ruleRefinedState11556);
+                    pushFollow(FOLLOW_53);
                     lv_subgraph_11_0=ruleStateGraph();
 
                     state._fsp--;
@@ -14208,7 +14208,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"subgraph",
                             		lv_subgraph_11_0, 
-                            		"StateGraph");
+                            		"org.eclipse.etrice.core.fsm.FSM.StateGraph");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -14223,7 +14223,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_12=(Token)match(input,14,FOLLOW_14_in_ruleRefinedState11570); 
+            otherlv_12=(Token)match(input,14,FOLLOW_2); 
 
                 	newLeafNode(otherlv_12, grammarAccess.getRefinedStateAccess().getRightCurlyBracketKeyword_8());
                 
@@ -14248,7 +14248,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleDetailCode"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5735:1: entryRuleDetailCode returns [EObject current=null] : iv_ruleDetailCode= ruleDetailCode EOF ;
+    // InternalRoom.g:5735:1: entryRuleDetailCode returns [EObject current=null] : iv_ruleDetailCode= ruleDetailCode EOF ;
     public final EObject entryRuleDetailCode() throws RecognitionException {
         EObject current = null;
 
@@ -14256,17 +14256,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5736:2: (iv_ruleDetailCode= ruleDetailCode EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5737:2: iv_ruleDetailCode= ruleDetailCode EOF
+            // InternalRoom.g:5736:2: (iv_ruleDetailCode= ruleDetailCode EOF )
+            // InternalRoom.g:5737:2: iv_ruleDetailCode= ruleDetailCode EOF
             {
              newCompositeNode(grammarAccess.getDetailCodeRule()); 
-            pushFollow(FOLLOW_ruleDetailCode_in_entryRuleDetailCode11606);
+            pushFollow(FOLLOW_1);
             iv_ruleDetailCode=ruleDetailCode();
 
             state._fsp--;
 
              current =iv_ruleDetailCode; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDetailCode11616); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -14284,7 +14284,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleDetailCode"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5744:1: ruleDetailCode returns [EObject current=null] : ( () ( (lv_used_1_0= '{' ) ) ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= '}' ) ;
+    // InternalRoom.g:5744: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;
 
@@ -14295,14 +14295,14 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5747:28: ( ( () ( (lv_used_1_0= '{' ) ) ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= '}' ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5748:1: ( () ( (lv_used_1_0= '{' ) ) ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= '}' )
+            // InternalRoom.g:5747:28: ( ( () ( (lv_used_1_0= '{' ) ) ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= '}' ) )
+            // InternalRoom.g:5748:1: ( () ( (lv_used_1_0= '{' ) ) ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= '}' )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5748:1: ( () ( (lv_used_1_0= '{' ) ) ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= '}' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5748:2: () ( (lv_used_1_0= '{' ) ) ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= '}'
+            // InternalRoom.g:5748:1: ( () ( (lv_used_1_0= '{' ) ) ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= '}' )
+            // InternalRoom.g:5748:2: () ( (lv_used_1_0= '{' ) ) ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= '}'
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5748:2: ()
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5749:5: 
+            // InternalRoom.g:5748:2: ()
+            // InternalRoom.g:5749:5: 
             {
 
                     current = forceCreateModelElement(
@@ -14312,13 +14312,13 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5754:2: ( (lv_used_1_0= '{' ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5755:1: (lv_used_1_0= '{' )
+            // InternalRoom.g:5754:2: ( (lv_used_1_0= '{' ) )
+            // InternalRoom.g:5755:1: (lv_used_1_0= '{' )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5755:1: (lv_used_1_0= '{' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5756:3: lv_used_1_0= '{'
+            // InternalRoom.g:5755:1: (lv_used_1_0= '{' )
+            // InternalRoom.g:5756:3: lv_used_1_0= '{'
             {
-            lv_used_1_0=(Token)match(input,13,FOLLOW_13_in_ruleDetailCode11668); 
+            lv_used_1_0=(Token)match(input,13,FOLLOW_97); 
 
                     newLeafNode(lv_used_1_0, grammarAccess.getDetailCodeAccess().getUsedLeftCurlyBracketKeyword_1_0());
                 
@@ -14334,7 +14334,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5769:2: ( (lv_lines_2_0= RULE_STRING ) )*
+            // InternalRoom.g:5769:2: ( (lv_lines_2_0= RULE_STRING ) )*
             loop123:
             do {
                 int alt123=2;
@@ -14347,12 +14347,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                 switch (alt123) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5770:1: (lv_lines_2_0= RULE_STRING )
+            	    // InternalRoom.g:5770:1: (lv_lines_2_0= RULE_STRING )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5770:1: (lv_lines_2_0= RULE_STRING )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5771:3: lv_lines_2_0= RULE_STRING
+            	    // InternalRoom.g:5770:1: (lv_lines_2_0= RULE_STRING )
+            	    // InternalRoom.g:5771:3: lv_lines_2_0= RULE_STRING
             	    {
-            	    lv_lines_2_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleDetailCode11698); 
+            	    lv_lines_2_0=(Token)match(input,RULE_STRING,FOLLOW_97); 
 
             	    			newLeafNode(lv_lines_2_0, grammarAccess.getDetailCodeAccess().getLinesSTRINGTerminalRuleCall_2_0()); 
             	    		
@@ -14364,7 +14364,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"lines",
             	            		lv_lines_2_0, 
-            	            		"STRING");
+            	            		"org.eclipse.xtext.common.Terminals.STRING");
             	    	    
 
             	    }
@@ -14378,7 +14378,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                 }
             } while (true);
 
-            otherlv_3=(Token)match(input,14,FOLLOW_14_in_ruleDetailCode11716); 
+            otherlv_3=(Token)match(input,14,FOLLOW_2); 
 
                 	newLeafNode(otherlv_3, grammarAccess.getDetailCodeAccess().getRightCurlyBracketKeyword_3());
                 
@@ -14403,7 +14403,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTrPoint"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5799:1: entryRuleTrPoint returns [EObject current=null] : iv_ruleTrPoint= ruleTrPoint EOF ;
+    // InternalRoom.g:5799:1: entryRuleTrPoint returns [EObject current=null] : iv_ruleTrPoint= ruleTrPoint EOF ;
     public final EObject entryRuleTrPoint() throws RecognitionException {
         EObject current = null;
 
@@ -14411,17 +14411,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5800:2: (iv_ruleTrPoint= ruleTrPoint EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5801:2: iv_ruleTrPoint= ruleTrPoint EOF
+            // InternalRoom.g:5800:2: (iv_ruleTrPoint= ruleTrPoint EOF )
+            // InternalRoom.g:5801:2: iv_ruleTrPoint= ruleTrPoint EOF
             {
              newCompositeNode(grammarAccess.getTrPointRule()); 
-            pushFollow(FOLLOW_ruleTrPoint_in_entryRuleTrPoint11752);
+            pushFollow(FOLLOW_1);
             iv_ruleTrPoint=ruleTrPoint();
 
             state._fsp--;
 
              current =iv_ruleTrPoint; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleTrPoint11762); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -14439,7 +14439,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTrPoint"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5808:1: ruleTrPoint returns [EObject current=null] : (this_TransitionPoint_0= ruleTransitionPoint | this_EntryPoint_1= ruleEntryPoint | this_ExitPoint_2= ruleExitPoint ) ;
+    // InternalRoom.g:5808: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;
 
@@ -14453,10 +14453,10 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5811:28: ( (this_TransitionPoint_0= ruleTransitionPoint | this_EntryPoint_1= ruleEntryPoint | this_ExitPoint_2= ruleExitPoint ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5812:1: (this_TransitionPoint_0= ruleTransitionPoint | this_EntryPoint_1= ruleEntryPoint | this_ExitPoint_2= ruleExitPoint )
+            // InternalRoom.g:5811:28: ( (this_TransitionPoint_0= ruleTransitionPoint | this_EntryPoint_1= ruleEntryPoint | this_ExitPoint_2= ruleExitPoint ) )
+            // InternalRoom.g:5812:1: (this_TransitionPoint_0= ruleTransitionPoint | this_EntryPoint_1= ruleEntryPoint | this_ExitPoint_2= ruleExitPoint )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5812:1: (this_TransitionPoint_0= ruleTransitionPoint | this_EntryPoint_1= ruleEntryPoint | this_ExitPoint_2= ruleExitPoint )
+            // InternalRoom.g:5812:1: (this_TransitionPoint_0= ruleTransitionPoint | this_EntryPoint_1= ruleEntryPoint | this_ExitPoint_2= ruleExitPoint )
             int alt124=3;
             switch ( input.LA(1) ) {
             case 86:
@@ -14484,12 +14484,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             switch (alt124) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5813:5: this_TransitionPoint_0= ruleTransitionPoint
+                    // InternalRoom.g:5813:5: this_TransitionPoint_0= ruleTransitionPoint
                     {
                      
                             newCompositeNode(grammarAccess.getTrPointAccess().getTransitionPointParserRuleCall_0()); 
                         
-                    pushFollow(FOLLOW_ruleTransitionPoint_in_ruleTrPoint11809);
+                    pushFollow(FOLLOW_2);
                     this_TransitionPoint_0=ruleTransitionPoint();
 
                     state._fsp--;
@@ -14502,12 +14502,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5823:5: this_EntryPoint_1= ruleEntryPoint
+                    // InternalRoom.g:5823:5: this_EntryPoint_1= ruleEntryPoint
                     {
                      
                             newCompositeNode(grammarAccess.getTrPointAccess().getEntryPointParserRuleCall_1()); 
                         
-                    pushFollow(FOLLOW_ruleEntryPoint_in_ruleTrPoint11836);
+                    pushFollow(FOLLOW_2);
                     this_EntryPoint_1=ruleEntryPoint();
 
                     state._fsp--;
@@ -14520,12 +14520,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5833:5: this_ExitPoint_2= ruleExitPoint
+                    // InternalRoom.g:5833:5: this_ExitPoint_2= ruleExitPoint
                     {
                      
                             newCompositeNode(grammarAccess.getTrPointAccess().getExitPointParserRuleCall_2()); 
                         
-                    pushFollow(FOLLOW_ruleExitPoint_in_ruleTrPoint11863);
+                    pushFollow(FOLLOW_2);
                     this_ExitPoint_2=ruleExitPoint();
 
                     state._fsp--;
@@ -14558,7 +14558,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTransitionPoint"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5849:1: entryRuleTransitionPoint returns [EObject current=null] : iv_ruleTransitionPoint= ruleTransitionPoint EOF ;
+    // InternalRoom.g:5849:1: entryRuleTransitionPoint returns [EObject current=null] : iv_ruleTransitionPoint= ruleTransitionPoint EOF ;
     public final EObject entryRuleTransitionPoint() throws RecognitionException {
         EObject current = null;
 
@@ -14566,17 +14566,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5850:2: (iv_ruleTransitionPoint= ruleTransitionPoint EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5851:2: iv_ruleTransitionPoint= ruleTransitionPoint EOF
+            // InternalRoom.g:5850:2: (iv_ruleTransitionPoint= ruleTransitionPoint EOF )
+            // InternalRoom.g:5851:2: iv_ruleTransitionPoint= ruleTransitionPoint EOF
             {
              newCompositeNode(grammarAccess.getTransitionPointRule()); 
-            pushFollow(FOLLOW_ruleTransitionPoint_in_entryRuleTransitionPoint11898);
+            pushFollow(FOLLOW_1);
             iv_ruleTransitionPoint=ruleTransitionPoint();
 
             state._fsp--;
 
              current =iv_ruleTransitionPoint; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleTransitionPoint11908); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -14594,7 +14594,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTransitionPoint"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5858:1: ruleTransitionPoint returns [EObject current=null] : ( ( (lv_handler_0_0= 'handler' ) )? otherlv_1= 'TransitionPoint' ( (lv_name_2_0= RULE_ID ) ) ) ;
+    // InternalRoom.g:5858: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;
 
@@ -14605,13 +14605,13 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5861:28: ( ( ( (lv_handler_0_0= 'handler' ) )? otherlv_1= 'TransitionPoint' ( (lv_name_2_0= RULE_ID ) ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5862:1: ( ( (lv_handler_0_0= 'handler' ) )? otherlv_1= 'TransitionPoint' ( (lv_name_2_0= RULE_ID ) ) )
+            // InternalRoom.g:5861:28: ( ( ( (lv_handler_0_0= 'handler' ) )? otherlv_1= 'TransitionPoint' ( (lv_name_2_0= RULE_ID ) ) ) )
+            // InternalRoom.g:5862:1: ( ( (lv_handler_0_0= 'handler' ) )? otherlv_1= 'TransitionPoint' ( (lv_name_2_0= RULE_ID ) ) )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5862:1: ( ( (lv_handler_0_0= 'handler' ) )? otherlv_1= 'TransitionPoint' ( (lv_name_2_0= RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5862:2: ( (lv_handler_0_0= 'handler' ) )? otherlv_1= 'TransitionPoint' ( (lv_name_2_0= RULE_ID ) )
+            // InternalRoom.g:5862:1: ( ( (lv_handler_0_0= 'handler' ) )? otherlv_1= 'TransitionPoint' ( (lv_name_2_0= RULE_ID ) ) )
+            // InternalRoom.g:5862:2: ( (lv_handler_0_0= 'handler' ) )? otherlv_1= 'TransitionPoint' ( (lv_name_2_0= RULE_ID ) )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5862:2: ( (lv_handler_0_0= 'handler' ) )?
+            // InternalRoom.g:5862:2: ( (lv_handler_0_0= 'handler' ) )?
             int alt125=2;
             int LA125_0 = input.LA(1);
 
@@ -14620,12 +14620,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt125) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5863:1: (lv_handler_0_0= 'handler' )
+                    // InternalRoom.g:5863:1: (lv_handler_0_0= 'handler' )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5863:1: (lv_handler_0_0= 'handler' )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5864:3: lv_handler_0_0= 'handler'
+                    // InternalRoom.g:5863:1: (lv_handler_0_0= 'handler' )
+                    // InternalRoom.g:5864:3: lv_handler_0_0= 'handler'
                     {
-                    lv_handler_0_0=(Token)match(input,86,FOLLOW_86_in_ruleTransitionPoint11951); 
+                    lv_handler_0_0=(Token)match(input,86,FOLLOW_98); 
 
                             newLeafNode(lv_handler_0_0, grammarAccess.getTransitionPointAccess().getHandlerHandlerKeyword_0_0());
                         
@@ -14644,17 +14644,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,87,FOLLOW_87_in_ruleTransitionPoint11977); 
+            otherlv_1=(Token)match(input,87,FOLLOW_3); 
 
                 	newLeafNode(otherlv_1, grammarAccess.getTransitionPointAccess().getTransitionPointKeyword_1());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5881:1: ( (lv_name_2_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5882:1: (lv_name_2_0= RULE_ID )
+            // InternalRoom.g:5881:1: ( (lv_name_2_0= RULE_ID ) )
+            // InternalRoom.g:5882:1: (lv_name_2_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5882:1: (lv_name_2_0= RULE_ID )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5883:3: lv_name_2_0= RULE_ID
+            // InternalRoom.g:5882:1: (lv_name_2_0= RULE_ID )
+            // InternalRoom.g:5883:3: lv_name_2_0= RULE_ID
             {
-            lv_name_2_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleTransitionPoint11994); 
+            lv_name_2_0=(Token)match(input,RULE_ID,FOLLOW_2); 
 
             			newLeafNode(lv_name_2_0, grammarAccess.getTransitionPointAccess().getNameIDTerminalRuleCall_2_0()); 
             		
@@ -14666,7 +14666,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"name",
                     		lv_name_2_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -14695,7 +14695,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleEntryPoint"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5907:1: entryRuleEntryPoint returns [EObject current=null] : iv_ruleEntryPoint= ruleEntryPoint EOF ;
+    // InternalRoom.g:5907:1: entryRuleEntryPoint returns [EObject current=null] : iv_ruleEntryPoint= ruleEntryPoint EOF ;
     public final EObject entryRuleEntryPoint() throws RecognitionException {
         EObject current = null;
 
@@ -14703,17 +14703,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5908:2: (iv_ruleEntryPoint= ruleEntryPoint EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5909:2: iv_ruleEntryPoint= ruleEntryPoint EOF
+            // InternalRoom.g:5908:2: (iv_ruleEntryPoint= ruleEntryPoint EOF )
+            // InternalRoom.g:5909:2: iv_ruleEntryPoint= ruleEntryPoint EOF
             {
              newCompositeNode(grammarAccess.getEntryPointRule()); 
-            pushFollow(FOLLOW_ruleEntryPoint_in_entryRuleEntryPoint12035);
+            pushFollow(FOLLOW_1);
             iv_ruleEntryPoint=ruleEntryPoint();
 
             state._fsp--;
 
              current =iv_ruleEntryPoint; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleEntryPoint12045); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -14731,7 +14731,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleEntryPoint"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5916:1: ruleEntryPoint returns [EObject current=null] : (otherlv_0= 'EntryPoint' ( (lv_name_1_0= RULE_ID ) ) ) ;
+    // InternalRoom.g:5916:1: ruleEntryPoint returns [EObject current=null] : (otherlv_0= 'EntryPoint' ( (lv_name_1_0= RULE_ID ) ) ) ;
     public final EObject ruleEntryPoint() throws RecognitionException {
         EObject current = null;
 
@@ -14741,23 +14741,23 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5919:28: ( (otherlv_0= 'EntryPoint' ( (lv_name_1_0= RULE_ID ) ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5920:1: (otherlv_0= 'EntryPoint' ( (lv_name_1_0= RULE_ID ) ) )
+            // InternalRoom.g:5919:28: ( (otherlv_0= 'EntryPoint' ( (lv_name_1_0= RULE_ID ) ) ) )
+            // InternalRoom.g:5920:1: (otherlv_0= 'EntryPoint' ( (lv_name_1_0= RULE_ID ) ) )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5920:1: (otherlv_0= 'EntryPoint' ( (lv_name_1_0= RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5920:3: otherlv_0= 'EntryPoint' ( (lv_name_1_0= RULE_ID ) )
+            // InternalRoom.g:5920:1: (otherlv_0= 'EntryPoint' ( (lv_name_1_0= RULE_ID ) ) )
+            // InternalRoom.g:5920:3: otherlv_0= 'EntryPoint' ( (lv_name_1_0= RULE_ID ) )
             {
-            otherlv_0=(Token)match(input,88,FOLLOW_88_in_ruleEntryPoint12082); 
+            otherlv_0=(Token)match(input,88,FOLLOW_3); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getEntryPointAccess().getEntryPointKeyword_0());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5924:1: ( (lv_name_1_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5925:1: (lv_name_1_0= RULE_ID )
+            // InternalRoom.g:5924:1: ( (lv_name_1_0= RULE_ID ) )
+            // InternalRoom.g:5925:1: (lv_name_1_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5925:1: (lv_name_1_0= RULE_ID )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5926:3: lv_name_1_0= RULE_ID
+            // InternalRoom.g:5925:1: (lv_name_1_0= RULE_ID )
+            // InternalRoom.g:5926:3: lv_name_1_0= RULE_ID
             {
-            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEntryPoint12099); 
+            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_2); 
 
             			newLeafNode(lv_name_1_0, grammarAccess.getEntryPointAccess().getNameIDTerminalRuleCall_1_0()); 
             		
@@ -14769,7 +14769,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"name",
                     		lv_name_1_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -14798,7 +14798,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleExitPoint"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5950:1: entryRuleExitPoint returns [EObject current=null] : iv_ruleExitPoint= ruleExitPoint EOF ;
+    // InternalRoom.g:5950:1: entryRuleExitPoint returns [EObject current=null] : iv_ruleExitPoint= ruleExitPoint EOF ;
     public final EObject entryRuleExitPoint() throws RecognitionException {
         EObject current = null;
 
@@ -14806,17 +14806,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5951:2: (iv_ruleExitPoint= ruleExitPoint EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5952:2: iv_ruleExitPoint= ruleExitPoint EOF
+            // InternalRoom.g:5951:2: (iv_ruleExitPoint= ruleExitPoint EOF )
+            // InternalRoom.g:5952:2: iv_ruleExitPoint= ruleExitPoint EOF
             {
              newCompositeNode(grammarAccess.getExitPointRule()); 
-            pushFollow(FOLLOW_ruleExitPoint_in_entryRuleExitPoint12140);
+            pushFollow(FOLLOW_1);
             iv_ruleExitPoint=ruleExitPoint();
 
             state._fsp--;
 
              current =iv_ruleExitPoint; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleExitPoint12150); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -14834,7 +14834,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleExitPoint"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5959:1: ruleExitPoint returns [EObject current=null] : (otherlv_0= 'ExitPoint' ( (lv_name_1_0= RULE_ID ) ) ) ;
+    // InternalRoom.g:5959:1: ruleExitPoint returns [EObject current=null] : (otherlv_0= 'ExitPoint' ( (lv_name_1_0= RULE_ID ) ) ) ;
     public final EObject ruleExitPoint() throws RecognitionException {
         EObject current = null;
 
@@ -14844,23 +14844,23 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5962:28: ( (otherlv_0= 'ExitPoint' ( (lv_name_1_0= RULE_ID ) ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5963:1: (otherlv_0= 'ExitPoint' ( (lv_name_1_0= RULE_ID ) ) )
+            // InternalRoom.g:5962:28: ( (otherlv_0= 'ExitPoint' ( (lv_name_1_0= RULE_ID ) ) ) )
+            // InternalRoom.g:5963:1: (otherlv_0= 'ExitPoint' ( (lv_name_1_0= RULE_ID ) ) )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5963:1: (otherlv_0= 'ExitPoint' ( (lv_name_1_0= RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5963:3: otherlv_0= 'ExitPoint' ( (lv_name_1_0= RULE_ID ) )
+            // InternalRoom.g:5963:1: (otherlv_0= 'ExitPoint' ( (lv_name_1_0= RULE_ID ) ) )
+            // InternalRoom.g:5963:3: otherlv_0= 'ExitPoint' ( (lv_name_1_0= RULE_ID ) )
             {
-            otherlv_0=(Token)match(input,89,FOLLOW_89_in_ruleExitPoint12187); 
+            otherlv_0=(Token)match(input,89,FOLLOW_3); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getExitPointAccess().getExitPointKeyword_0());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5967:1: ( (lv_name_1_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5968:1: (lv_name_1_0= RULE_ID )
+            // InternalRoom.g:5967:1: ( (lv_name_1_0= RULE_ID ) )
+            // InternalRoom.g:5968:1: (lv_name_1_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5968:1: (lv_name_1_0= RULE_ID )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5969:3: lv_name_1_0= RULE_ID
+            // InternalRoom.g:5968:1: (lv_name_1_0= RULE_ID )
+            // InternalRoom.g:5969:3: lv_name_1_0= RULE_ID
             {
-            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleExitPoint12204); 
+            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_2); 
 
             			newLeafNode(lv_name_1_0, grammarAccess.getExitPointAccess().getNameIDTerminalRuleCall_1_0()); 
             		
@@ -14872,7 +14872,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"name",
                     		lv_name_1_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -14901,7 +14901,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleChoicePoint"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5993:1: entryRuleChoicePoint returns [EObject current=null] : iv_ruleChoicePoint= ruleChoicePoint EOF ;
+    // InternalRoom.g:5993:1: entryRuleChoicePoint returns [EObject current=null] : iv_ruleChoicePoint= ruleChoicePoint EOF ;
     public final EObject entryRuleChoicePoint() throws RecognitionException {
         EObject current = null;
 
@@ -14909,17 +14909,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5994:2: (iv_ruleChoicePoint= ruleChoicePoint EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:5995:2: iv_ruleChoicePoint= ruleChoicePoint EOF
+            // InternalRoom.g:5994:2: (iv_ruleChoicePoint= ruleChoicePoint EOF )
+            // InternalRoom.g:5995:2: iv_ruleChoicePoint= ruleChoicePoint EOF
             {
              newCompositeNode(grammarAccess.getChoicePointRule()); 
-            pushFollow(FOLLOW_ruleChoicePoint_in_entryRuleChoicePoint12245);
+            pushFollow(FOLLOW_1);
             iv_ruleChoicePoint=ruleChoicePoint();
 
             state._fsp--;
 
              current =iv_ruleChoicePoint; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleChoicePoint12255); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -14937,7 +14937,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleChoicePoint"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6002:1: ruleChoicePoint returns [EObject current=null] : (otherlv_0= 'ChoicePoint' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? ) ;
+    // InternalRoom.g:6002: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;
 
@@ -14949,23 +14949,23 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6005:28: ( (otherlv_0= 'ChoicePoint' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6006:1: (otherlv_0= 'ChoicePoint' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? )
+            // InternalRoom.g:6005:28: ( (otherlv_0= 'ChoicePoint' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? ) )
+            // InternalRoom.g:6006:1: (otherlv_0= 'ChoicePoint' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6006:1: (otherlv_0= 'ChoicePoint' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6006:3: otherlv_0= 'ChoicePoint' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )?
+            // InternalRoom.g:6006:1: (otherlv_0= 'ChoicePoint' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? )
+            // InternalRoom.g:6006:3: otherlv_0= 'ChoicePoint' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )?
             {
-            otherlv_0=(Token)match(input,90,FOLLOW_90_in_ruleChoicePoint12292); 
+            otherlv_0=(Token)match(input,90,FOLLOW_3); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getChoicePointAccess().getChoicePointKeyword_0());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6010:1: ( (lv_name_1_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6011:1: (lv_name_1_0= RULE_ID )
+            // InternalRoom.g:6010:1: ( (lv_name_1_0= RULE_ID ) )
+            // InternalRoom.g:6011:1: (lv_name_1_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6011:1: (lv_name_1_0= RULE_ID )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6012:3: lv_name_1_0= RULE_ID
+            // InternalRoom.g:6011:1: (lv_name_1_0= RULE_ID )
+            // InternalRoom.g:6012:3: lv_name_1_0= RULE_ID
             {
-            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleChoicePoint12309); 
+            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_16); 
 
             			newLeafNode(lv_name_1_0, grammarAccess.getChoicePointAccess().getNameIDTerminalRuleCall_1_0()); 
             		
@@ -14977,7 +14977,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"name",
                     		lv_name_1_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -14985,7 +14985,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6028:2: ( (lv_docu_2_0= ruleDocumentation ) )?
+            // InternalRoom.g:6028:2: ( (lv_docu_2_0= ruleDocumentation ) )?
             int alt126=2;
             int LA126_0 = input.LA(1);
 
@@ -14994,15 +14994,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt126) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6029:1: (lv_docu_2_0= ruleDocumentation )
+                    // InternalRoom.g:6029:1: (lv_docu_2_0= ruleDocumentation )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6029:1: (lv_docu_2_0= ruleDocumentation )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6030:3: lv_docu_2_0= ruleDocumentation
+                    // InternalRoom.g:6029:1: (lv_docu_2_0= ruleDocumentation )
+                    // InternalRoom.g:6030:3: lv_docu_2_0= ruleDocumentation
                     {
                      
                     	        newCompositeNode(grammarAccess.getChoicePointAccess().getDocuDocumentationParserRuleCall_2_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDocumentation_in_ruleChoicePoint12335);
+                    pushFollow(FOLLOW_2);
                     lv_docu_2_0=ruleDocumentation();
 
                     state._fsp--;
@@ -15015,7 +15015,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"docu",
                             		lv_docu_2_0, 
-                            		"Documentation");
+                            		"org.eclipse.etrice.core.common.Base.Documentation");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -15048,7 +15048,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTransition"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6054:1: entryRuleTransition returns [EObject current=null] : iv_ruleTransition= ruleTransition EOF ;
+    // InternalRoom.g:6056:1: entryRuleTransition returns [EObject current=null] : iv_ruleTransition= ruleTransition EOF ;
     public final EObject entryRuleTransition() throws RecognitionException {
         EObject current = null;
 
@@ -15056,17 +15056,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6055:2: (iv_ruleTransition= ruleTransition EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6056:2: iv_ruleTransition= ruleTransition EOF
+            // InternalRoom.g:6057:2: (iv_ruleTransition= ruleTransition EOF )
+            // InternalRoom.g:6058:2: iv_ruleTransition= ruleTransition EOF
             {
              newCompositeNode(grammarAccess.getTransitionRule()); 
-            pushFollow(FOLLOW_ruleTransition_in_entryRuleTransition12372);
+            pushFollow(FOLLOW_1);
             iv_ruleTransition=ruleTransition();
 
             state._fsp--;
 
              current =iv_ruleTransition; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleTransition12382); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -15084,7 +15084,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTransition"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6063:1: ruleTransition returns [EObject current=null] : (this_InitialTransition_0= ruleInitialTransition | this_NonInitialTransition_1= ruleNonInitialTransition ) ;
+    // InternalRoom.g:6065:1: ruleTransition returns [EObject current=null] : (this_InitialTransition_0= ruleInitialTransition | this_NonInitialTransition_1= ruleNonInitialTransition ) ;
     public final EObject ruleTransition() throws RecognitionException {
         EObject current = null;
 
@@ -15096,10 +15096,10 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6066:28: ( (this_InitialTransition_0= ruleInitialTransition | this_NonInitialTransition_1= ruleNonInitialTransition ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6067:1: (this_InitialTransition_0= ruleInitialTransition | this_NonInitialTransition_1= ruleNonInitialTransition )
+            // InternalRoom.g:6068:28: ( (this_InitialTransition_0= ruleInitialTransition | this_NonInitialTransition_1= ruleNonInitialTransition ) )
+            // InternalRoom.g:6069:1: (this_InitialTransition_0= ruleInitialTransition | this_NonInitialTransition_1= ruleNonInitialTransition )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6067:1: (this_InitialTransition_0= ruleInitialTransition | this_NonInitialTransition_1= ruleNonInitialTransition )
+            // InternalRoom.g:6069:1: (this_InitialTransition_0= ruleInitialTransition | this_NonInitialTransition_1= ruleNonInitialTransition )
             int alt127=2;
             int LA127_0 = input.LA(1);
 
@@ -15112,12 +15112,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     if ( (LA127_2==15) ) {
                         int LA127_3 = input.LA(4);
 
-                        if ( (LA127_3==92) ) {
-                            alt127=1;
-                        }
-                        else if ( (LA127_3==RULE_ID||(LA127_3>=99 && LA127_3<=100)) ) {
+                        if ( (LA127_3==RULE_ID||(LA127_3>=99 && LA127_3<=100)) ) {
                             alt127=2;
                         }
+                        else if ( (LA127_3==92) ) {
+                            alt127=1;
+                        }
                         else {
                             NoViableAltException nvae =
                                 new NoViableAltException("", 127, 3, input);
@@ -15135,12 +15135,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                 else if ( (LA127_1==15) ) {
                     int LA127_3 = input.LA(3);
 
-                    if ( (LA127_3==92) ) {
-                        alt127=1;
-                    }
-                    else if ( (LA127_3==RULE_ID||(LA127_3>=99 && LA127_3<=100)) ) {
+                    if ( (LA127_3==RULE_ID||(LA127_3>=99 && LA127_3<=100)) ) {
                         alt127=2;
                     }
+                    else if ( (LA127_3==92) ) {
+                        alt127=1;
+                    }
                     else {
                         NoViableAltException nvae =
                             new NoViableAltException("", 127, 3, input);
@@ -15163,12 +15163,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt127) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6068:5: this_InitialTransition_0= ruleInitialTransition
+                    // InternalRoom.g:6070:5: this_InitialTransition_0= ruleInitialTransition
                     {
                      
                             newCompositeNode(grammarAccess.getTransitionAccess().getInitialTransitionParserRuleCall_0()); 
                         
-                    pushFollow(FOLLOW_ruleInitialTransition_in_ruleTransition12429);
+                    pushFollow(FOLLOW_2);
                     this_InitialTransition_0=ruleInitialTransition();
 
                     state._fsp--;
@@ -15181,12 +15181,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6078:5: this_NonInitialTransition_1= ruleNonInitialTransition
+                    // InternalRoom.g:6080:5: this_NonInitialTransition_1= ruleNonInitialTransition
                     {
                      
                             newCompositeNode(grammarAccess.getTransitionAccess().getNonInitialTransitionParserRuleCall_1()); 
                         
-                    pushFollow(FOLLOW_ruleNonInitialTransition_in_ruleTransition12456);
+                    pushFollow(FOLLOW_2);
                     this_NonInitialTransition_1=ruleNonInitialTransition();
 
                     state._fsp--;
@@ -15219,7 +15219,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleNonInitialTransition"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6094:1: entryRuleNonInitialTransition returns [EObject current=null] : iv_ruleNonInitialTransition= ruleNonInitialTransition EOF ;
+    // InternalRoom.g:6096:1: entryRuleNonInitialTransition returns [EObject current=null] : iv_ruleNonInitialTransition= ruleNonInitialTransition EOF ;
     public final EObject entryRuleNonInitialTransition() throws RecognitionException {
         EObject current = null;
 
@@ -15227,17 +15227,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6095:2: (iv_ruleNonInitialTransition= ruleNonInitialTransition EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6096:2: iv_ruleNonInitialTransition= ruleNonInitialTransition EOF
+            // InternalRoom.g:6097:2: (iv_ruleNonInitialTransition= ruleNonInitialTransition EOF )
+            // InternalRoom.g:6098:2: iv_ruleNonInitialTransition= ruleNonInitialTransition EOF
             {
              newCompositeNode(grammarAccess.getNonInitialTransitionRule()); 
-            pushFollow(FOLLOW_ruleNonInitialTransition_in_entryRuleNonInitialTransition12491);
+            pushFollow(FOLLOW_1);
             iv_ruleNonInitialTransition=ruleNonInitialTransition();
 
             state._fsp--;
 
              current =iv_ruleNonInitialTransition; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleNonInitialTransition12501); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -15255,7 +15255,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleNonInitialTransition"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6103:1: ruleNonInitialTransition returns [EObject current=null] : (this_TransitionChainStartTransition_0= ruleTransitionChainStartTransition | this_ContinuationTransition_1= ruleContinuationTransition | this_CPBranchTransition_2= ruleCPBranchTransition ) ;
+    // InternalRoom.g:6105: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;
 
@@ -15269,20 +15269,20 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6106:28: ( (this_TransitionChainStartTransition_0= ruleTransitionChainStartTransition | this_ContinuationTransition_1= ruleContinuationTransition | this_CPBranchTransition_2= ruleCPBranchTransition ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6107:1: (this_TransitionChainStartTransition_0= ruleTransitionChainStartTransition | this_ContinuationTransition_1= ruleContinuationTransition | this_CPBranchTransition_2= ruleCPBranchTransition )
+            // InternalRoom.g:6108:28: ( (this_TransitionChainStartTransition_0= ruleTransitionChainStartTransition | this_ContinuationTransition_1= ruleContinuationTransition | this_CPBranchTransition_2= ruleCPBranchTransition ) )
+            // InternalRoom.g:6109:1: (this_TransitionChainStartTransition_0= ruleTransitionChainStartTransition | this_ContinuationTransition_1= ruleContinuationTransition | this_CPBranchTransition_2= ruleCPBranchTransition )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6107:1: (this_TransitionChainStartTransition_0= ruleTransitionChainStartTransition | this_ContinuationTransition_1= ruleContinuationTransition | this_CPBranchTransition_2= ruleCPBranchTransition )
+            // InternalRoom.g:6109:1: (this_TransitionChainStartTransition_0= ruleTransitionChainStartTransition | this_ContinuationTransition_1= ruleContinuationTransition | this_CPBranchTransition_2= ruleCPBranchTransition )
             int alt128=3;
             alt128 = dfa128.predict(input);
             switch (alt128) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6108:5: this_TransitionChainStartTransition_0= ruleTransitionChainStartTransition
+                    // InternalRoom.g:6110:5: this_TransitionChainStartTransition_0= ruleTransitionChainStartTransition
                     {
                      
                             newCompositeNode(grammarAccess.getNonInitialTransitionAccess().getTransitionChainStartTransitionParserRuleCall_0()); 
                         
-                    pushFollow(FOLLOW_ruleTransitionChainStartTransition_in_ruleNonInitialTransition12548);
+                    pushFollow(FOLLOW_2);
                     this_TransitionChainStartTransition_0=ruleTransitionChainStartTransition();
 
                     state._fsp--;
@@ -15295,12 +15295,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6118:5: this_ContinuationTransition_1= ruleContinuationTransition
+                    // InternalRoom.g:6120:5: this_ContinuationTransition_1= ruleContinuationTransition
                     {
                      
                             newCompositeNode(grammarAccess.getNonInitialTransitionAccess().getContinuationTransitionParserRuleCall_1()); 
                         
-                    pushFollow(FOLLOW_ruleContinuationTransition_in_ruleNonInitialTransition12575);
+                    pushFollow(FOLLOW_2);
                     this_ContinuationTransition_1=ruleContinuationTransition();
 
                     state._fsp--;
@@ -15313,12 +15313,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6128:5: this_CPBranchTransition_2= ruleCPBranchTransition
+                    // InternalRoom.g:6130:5: this_CPBranchTransition_2= ruleCPBranchTransition
                     {
                      
                             newCompositeNode(grammarAccess.getNonInitialTransitionAccess().getCPBranchTransitionParserRuleCall_2()); 
                         
-                    pushFollow(FOLLOW_ruleCPBranchTransition_in_ruleNonInitialTransition12602);
+                    pushFollow(FOLLOW_2);
                     this_CPBranchTransition_2=ruleCPBranchTransition();
 
                     state._fsp--;
@@ -15351,7 +15351,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTransitionChainStartTransition"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6144:1: entryRuleTransitionChainStartTransition returns [EObject current=null] : iv_ruleTransitionChainStartTransition= ruleTransitionChainStartTransition EOF ;
+    // InternalRoom.g:6146:1: entryRuleTransitionChainStartTransition returns [EObject current=null] : iv_ruleTransitionChainStartTransition= ruleTransitionChainStartTransition EOF ;
     public final EObject entryRuleTransitionChainStartTransition() throws RecognitionException {
         EObject current = null;
 
@@ -15359,17 +15359,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6145:2: (iv_ruleTransitionChainStartTransition= ruleTransitionChainStartTransition EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6146:2: iv_ruleTransitionChainStartTransition= ruleTransitionChainStartTransition EOF
+            // InternalRoom.g:6147:2: (iv_ruleTransitionChainStartTransition= ruleTransitionChainStartTransition EOF )
+            // InternalRoom.g:6148:2: iv_ruleTransitionChainStartTransition= ruleTransitionChainStartTransition EOF
             {
              newCompositeNode(grammarAccess.getTransitionChainStartTransitionRule()); 
-            pushFollow(FOLLOW_ruleTransitionChainStartTransition_in_entryRuleTransitionChainStartTransition12637);
+            pushFollow(FOLLOW_1);
             iv_ruleTransitionChainStartTransition=ruleTransitionChainStartTransition();
 
             state._fsp--;
 
              current =iv_ruleTransitionChainStartTransition; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleTransitionChainStartTransition12647); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -15387,7 +15387,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTransitionChainStartTransition"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6153:1: ruleTransitionChainStartTransition returns [EObject current=null] : (this_TriggeredTransition_0= ruleTriggeredTransition | this_GuardedTransition_1= ruleGuardedTransition ) ;
+    // InternalRoom.g:6155:1: ruleTransitionChainStartTransition returns [EObject current=null] : (this_TriggeredTransition_0= ruleTriggeredTransition | this_GuardedTransition_1= ruleGuardedTransition ) ;
     public final EObject ruleTransitionChainStartTransition() throws RecognitionException {
         EObject current = null;
 
@@ -15399,20 +15399,20 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6156:28: ( (this_TriggeredTransition_0= ruleTriggeredTransition | this_GuardedTransition_1= ruleGuardedTransition ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6157:1: (this_TriggeredTransition_0= ruleTriggeredTransition | this_GuardedTransition_1= ruleGuardedTransition )
+            // InternalRoom.g:6158:28: ( (this_TriggeredTransition_0= ruleTriggeredTransition | this_GuardedTransition_1= ruleGuardedTransition ) )
+            // InternalRoom.g:6159:1: (this_TriggeredTransition_0= ruleTriggeredTransition | this_GuardedTransition_1= ruleGuardedTransition )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6157:1: (this_TriggeredTransition_0= ruleTriggeredTransition | this_GuardedTransition_1= ruleGuardedTransition )
+            // InternalRoom.g:6159:1: (this_TriggeredTransition_0= ruleTriggeredTransition | this_GuardedTransition_1= ruleGuardedTransition )
             int alt129=2;
             alt129 = dfa129.predict(input);
             switch (alt129) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6158:5: this_TriggeredTransition_0= ruleTriggeredTransition
+                    // InternalRoom.g:6160:5: this_TriggeredTransition_0= ruleTriggeredTransition
                     {
                      
                             newCompositeNode(grammarAccess.getTransitionChainStartTransitionAccess().getTriggeredTransitionParserRuleCall_0()); 
                         
-                    pushFollow(FOLLOW_ruleTriggeredTransition_in_ruleTransitionChainStartTransition12694);
+                    pushFollow(FOLLOW_2);
                     this_TriggeredTransition_0=ruleTriggeredTransition();
 
                     state._fsp--;
@@ -15425,12 +15425,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6168:5: this_GuardedTransition_1= ruleGuardedTransition
+                    // InternalRoom.g:6170:5: this_GuardedTransition_1= ruleGuardedTransition
                     {
                      
                             newCompositeNode(grammarAccess.getTransitionChainStartTransitionAccess().getGuardedTransitionParserRuleCall_1()); 
                         
-                    pushFollow(FOLLOW_ruleGuardedTransition_in_ruleTransitionChainStartTransition12721);
+                    pushFollow(FOLLOW_2);
                     this_GuardedTransition_1=ruleGuardedTransition();
 
                     state._fsp--;
@@ -15463,7 +15463,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleInitialTransition"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6184:1: entryRuleInitialTransition returns [EObject current=null] : iv_ruleInitialTransition= ruleInitialTransition EOF ;
+    // InternalRoom.g:6186:1: entryRuleInitialTransition returns [EObject current=null] : iv_ruleInitialTransition= ruleInitialTransition EOF ;
     public final EObject entryRuleInitialTransition() throws RecognitionException {
         EObject current = null;
 
@@ -15471,17 +15471,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6185:2: (iv_ruleInitialTransition= ruleInitialTransition EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6186:2: iv_ruleInitialTransition= ruleInitialTransition EOF
+            // InternalRoom.g:6187:2: (iv_ruleInitialTransition= ruleInitialTransition EOF )
+            // InternalRoom.g:6188:2: iv_ruleInitialTransition= ruleInitialTransition EOF
             {
              newCompositeNode(grammarAccess.getInitialTransitionRule()); 
-            pushFollow(FOLLOW_ruleInitialTransition_in_entryRuleInitialTransition12756);
+            pushFollow(FOLLOW_1);
             iv_ruleInitialTransition=ruleInitialTransition();
 
             state._fsp--;
 
              current =iv_ruleInitialTransition; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleInitialTransition12766); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -15499,7 +15499,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleInitialTransition"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6193: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= '}' )? ) ;
+    // InternalRoom.g:6195: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;
 
@@ -15521,17 +15521,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6196: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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6197: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= '}' )? )
+            // InternalRoom.g:6198: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= '}' )? ) )
+            // InternalRoom.g:6199: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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6197: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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6197: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= '}' )?
+            // InternalRoom.g:6199: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= '}' )? )
+            // InternalRoom.g:6199: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,91,FOLLOW_91_in_ruleInitialTransition12803); 
+            otherlv_0=(Token)match(input,91,FOLLOW_99); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getInitialTransitionAccess().getTransitionKeyword_0());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6201:1: ( (lv_name_1_0= RULE_ID ) )?
+            // InternalRoom.g:6203:1: ( (lv_name_1_0= RULE_ID ) )?
             int alt130=2;
             int LA130_0 = input.LA(1);
 
@@ -15540,12 +15540,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt130) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6202:1: (lv_name_1_0= RULE_ID )
+                    // InternalRoom.g:6204:1: (lv_name_1_0= RULE_ID )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6202:1: (lv_name_1_0= RULE_ID )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6203:3: lv_name_1_0= RULE_ID
+                    // InternalRoom.g:6204:1: (lv_name_1_0= RULE_ID )
+                    // InternalRoom.g:6205:3: lv_name_1_0= RULE_ID
                     {
-                    lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleInitialTransition12820); 
+                    lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_8); 
 
                     			newLeafNode(lv_name_1_0, grammarAccess.getInitialTransitionAccess().getNameIDTerminalRuleCall_1_0()); 
                     		
@@ -15557,7 +15557,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"name",
                             		lv_name_1_0, 
-                            		"ID");
+                            		"org.eclipse.xtext.common.Terminals.ID");
                     	    
 
                     }
@@ -15568,28 +15568,28 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_2=(Token)match(input,15,FOLLOW_15_in_ruleInitialTransition12838); 
+            otherlv_2=(Token)match(input,15,FOLLOW_100); 
 
                 	newLeafNode(otherlv_2, grammarAccess.getInitialTransitionAccess().getColonKeyword_2());
                 
-            otherlv_3=(Token)match(input,92,FOLLOW_92_in_ruleInitialTransition12850); 
+            otherlv_3=(Token)match(input,92,FOLLOW_11); 
 
                 	newLeafNode(otherlv_3, grammarAccess.getInitialTransitionAccess().getInitialKeyword_3());
                 
-            otherlv_4=(Token)match(input,18,FOLLOW_18_in_ruleInitialTransition12862); 
+            otherlv_4=(Token)match(input,18,FOLLOW_101); 
 
                 	newLeafNode(otherlv_4, grammarAccess.getInitialTransitionAccess().getHyphenMinusGreaterThanSignKeyword_4());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6231:1: ( (lv_to_5_0= ruleTransitionTerminal ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6232:1: (lv_to_5_0= ruleTransitionTerminal )
+            // InternalRoom.g:6233:1: ( (lv_to_5_0= ruleTransitionTerminal ) )
+            // InternalRoom.g:6234:1: (lv_to_5_0= ruleTransitionTerminal )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6232:1: (lv_to_5_0= ruleTransitionTerminal )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6233:3: lv_to_5_0= ruleTransitionTerminal
+            // InternalRoom.g:6234:1: (lv_to_5_0= ruleTransitionTerminal )
+            // InternalRoom.g:6235:3: lv_to_5_0= ruleTransitionTerminal
             {
              
             	        newCompositeNode(grammarAccess.getInitialTransitionAccess().getToTransitionTerminalParserRuleCall_5_0()); 
             	    
-            pushFollow(FOLLOW_ruleTransitionTerminal_in_ruleInitialTransition12883);
+            pushFollow(FOLLOW_92);
             lv_to_5_0=ruleTransitionTerminal();
 
             state._fsp--;
@@ -15602,7 +15602,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"to",
                     		lv_to_5_0, 
-                    		"TransitionTerminal");
+                    		"org.eclipse.etrice.core.fsm.FSM.TransitionTerminal");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -15611,7 +15611,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6249:2: ( (lv_docu_6_0= ruleDocumentation ) )?
+            // InternalRoom.g:6251:2: ( (lv_docu_6_0= ruleDocumentation ) )?
             int alt131=2;
             int LA131_0 = input.LA(1);
 
@@ -15620,15 +15620,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt131) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6250:1: (lv_docu_6_0= ruleDocumentation )
+                    // InternalRoom.g:6252:1: (lv_docu_6_0= ruleDocumentation )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6250:1: (lv_docu_6_0= ruleDocumentation )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6251:3: lv_docu_6_0= ruleDocumentation
+                    // InternalRoom.g:6252:1: (lv_docu_6_0= ruleDocumentation )
+                    // InternalRoom.g:6253:3: lv_docu_6_0= ruleDocumentation
                     {
                      
                     	        newCompositeNode(grammarAccess.getInitialTransitionAccess().getDocuDocumentationParserRuleCall_6_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDocumentation_in_ruleInitialTransition12904);
+                    pushFollow(FOLLOW_80);
                     lv_docu_6_0=ruleDocumentation();
 
                     state._fsp--;
@@ -15641,7 +15641,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"docu",
                             		lv_docu_6_0, 
-                            		"Documentation");
+                            		"org.eclipse.etrice.core.common.Base.Documentation");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -15653,7 +15653,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6267:3: (otherlv_7= '{' (otherlv_8= 'action' ( (lv_action_9_0= ruleDetailCode ) ) )? otherlv_10= '}' )?
+            // InternalRoom.g:6269:3: (otherlv_7= '{' (otherlv_8= 'action' ( (lv_action_9_0= ruleDetailCode ) ) )? otherlv_10= '}' )?
             int alt133=2;
             int LA133_0 = input.LA(1);
 
@@ -15662,13 +15662,13 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt133) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6267:5: otherlv_7= '{' (otherlv_8= 'action' ( (lv_action_9_0= ruleDetailCode ) ) )? otherlv_10= '}'
+                    // InternalRoom.g:6269:5: otherlv_7= '{' (otherlv_8= 'action' ( (lv_action_9_0= ruleDetailCode ) ) )? otherlv_10= '}'
                     {
-                    otherlv_7=(Token)match(input,13,FOLLOW_13_in_ruleInitialTransition12918); 
+                    otherlv_7=(Token)match(input,13,FOLLOW_102); 
 
                         	newLeafNode(otherlv_7, grammarAccess.getInitialTransitionAccess().getLeftCurlyBracketKeyword_7_0());
                         
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6271:1: (otherlv_8= 'action' ( (lv_action_9_0= ruleDetailCode ) ) )?
+                    // InternalRoom.g:6273:1: (otherlv_8= 'action' ( (lv_action_9_0= ruleDetailCode ) ) )?
                     int alt132=2;
                     int LA132_0 = input.LA(1);
 
@@ -15677,22 +15677,22 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     switch (alt132) {
                         case 1 :
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6271:3: otherlv_8= 'action' ( (lv_action_9_0= ruleDetailCode ) )
+                            // InternalRoom.g:6273:3: otherlv_8= 'action' ( (lv_action_9_0= ruleDetailCode ) )
                             {
-                            otherlv_8=(Token)match(input,93,FOLLOW_93_in_ruleInitialTransition12931); 
+                            otherlv_8=(Token)match(input,93,FOLLOW_5); 
 
                                 	newLeafNode(otherlv_8, grammarAccess.getInitialTransitionAccess().getActionKeyword_7_1_0());
                                 
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6275:1: ( (lv_action_9_0= ruleDetailCode ) )
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6276:1: (lv_action_9_0= ruleDetailCode )
+                            // InternalRoom.g:6277:1: ( (lv_action_9_0= ruleDetailCode ) )
+                            // InternalRoom.g:6278:1: (lv_action_9_0= ruleDetailCode )
                             {
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6276:1: (lv_action_9_0= ruleDetailCode )
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6277:3: lv_action_9_0= ruleDetailCode
+                            // InternalRoom.g:6278:1: (lv_action_9_0= ruleDetailCode )
+                            // InternalRoom.g:6279:3: lv_action_9_0= ruleDetailCode
                             {
                              
                             	        newCompositeNode(grammarAccess.getInitialTransitionAccess().getActionDetailCodeParserRuleCall_7_1_1_0()); 
                             	    
-                            pushFollow(FOLLOW_ruleDetailCode_in_ruleInitialTransition12952);
+                            pushFollow(FOLLOW_53);
                             lv_action_9_0=ruleDetailCode();
 
                             state._fsp--;
@@ -15705,7 +15705,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                                    			current, 
                                    			"action",
                                     		lv_action_9_0, 
-                                    		"DetailCode");
+                                    		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
                             	        afterParserOrEnumRuleCall();
                             	    
 
@@ -15720,7 +15720,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_10=(Token)match(input,14,FOLLOW_14_in_ruleInitialTransition12966); 
+                    otherlv_10=(Token)match(input,14,FOLLOW_2); 
 
                         	newLeafNode(otherlv_10, grammarAccess.getInitialTransitionAccess().getRightCurlyBracketKeyword_7_2());
                         
@@ -15751,7 +15751,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleContinuationTransition"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6305:1: entryRuleContinuationTransition returns [EObject current=null] : iv_ruleContinuationTransition= ruleContinuationTransition EOF ;
+    // InternalRoom.g:6307:1: entryRuleContinuationTransition returns [EObject current=null] : iv_ruleContinuationTransition= ruleContinuationTransition EOF ;
     public final EObject entryRuleContinuationTransition() throws RecognitionException {
         EObject current = null;
 
@@ -15759,17 +15759,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6306:2: (iv_ruleContinuationTransition= ruleContinuationTransition EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6307:2: iv_ruleContinuationTransition= ruleContinuationTransition EOF
+            // InternalRoom.g:6308:2: (iv_ruleContinuationTransition= ruleContinuationTransition EOF )
+            // InternalRoom.g:6309:2: iv_ruleContinuationTransition= ruleContinuationTransition EOF
             {
              newCompositeNode(grammarAccess.getContinuationTransitionRule()); 
-            pushFollow(FOLLOW_ruleContinuationTransition_in_entryRuleContinuationTransition13004);
+            pushFollow(FOLLOW_1);
             iv_ruleContinuationTransition=ruleContinuationTransition();
 
             state._fsp--;
 
              current =iv_ruleContinuationTransition; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleContinuationTransition13014); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -15787,7 +15787,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleContinuationTransition"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6314: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= '}' )? ) ;
+    // InternalRoom.g:6316: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;
 
@@ -15810,17 +15810,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6317: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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6318: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= '}' )? )
+            // InternalRoom.g:6319: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= '}' )? ) )
+            // InternalRoom.g:6320: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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6318: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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6318: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= '}' )?
+            // InternalRoom.g:6320: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= '}' )? )
+            // InternalRoom.g:6320: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,91,FOLLOW_91_in_ruleContinuationTransition13051); 
+            otherlv_0=(Token)match(input,91,FOLLOW_99); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getContinuationTransitionAccess().getTransitionKeyword_0());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6322:1: ( (lv_name_1_0= RULE_ID ) )?
+            // InternalRoom.g:6324:1: ( (lv_name_1_0= RULE_ID ) )?
             int alt134=2;
             int LA134_0 = input.LA(1);
 
@@ -15829,12 +15829,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt134) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6323:1: (lv_name_1_0= RULE_ID )
+                    // InternalRoom.g:6325:1: (lv_name_1_0= RULE_ID )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6323:1: (lv_name_1_0= RULE_ID )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6324:3: lv_name_1_0= RULE_ID
+                    // InternalRoom.g:6325:1: (lv_name_1_0= RULE_ID )
+                    // InternalRoom.g:6326:3: lv_name_1_0= RULE_ID
                     {
-                    lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleContinuationTransition13068); 
+                    lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_8); 
 
                     			newLeafNode(lv_name_1_0, grammarAccess.getContinuationTransitionAccess().getNameIDTerminalRuleCall_1_0()); 
                     		
@@ -15846,7 +15846,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"name",
                             		lv_name_1_0, 
-                            		"ID");
+                            		"org.eclipse.xtext.common.Terminals.ID");
                     	    
 
                     }
@@ -15857,20 +15857,20 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_2=(Token)match(input,15,FOLLOW_15_in_ruleContinuationTransition13086); 
+            otherlv_2=(Token)match(input,15,FOLLOW_101); 
 
                 	newLeafNode(otherlv_2, grammarAccess.getContinuationTransitionAccess().getColonKeyword_2());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6344:1: ( (lv_from_3_0= ruleTransitionTerminal ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6345:1: (lv_from_3_0= ruleTransitionTerminal )
+            // InternalRoom.g:6346:1: ( (lv_from_3_0= ruleTransitionTerminal ) )
+            // InternalRoom.g:6347:1: (lv_from_3_0= ruleTransitionTerminal )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6345:1: (lv_from_3_0= ruleTransitionTerminal )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6346:3: lv_from_3_0= ruleTransitionTerminal
+            // InternalRoom.g:6347:1: (lv_from_3_0= ruleTransitionTerminal )
+            // InternalRoom.g:6348:3: lv_from_3_0= ruleTransitionTerminal
             {
              
             	        newCompositeNode(grammarAccess.getContinuationTransitionAccess().getFromTransitionTerminalParserRuleCall_3_0()); 
             	    
-            pushFollow(FOLLOW_ruleTransitionTerminal_in_ruleContinuationTransition13107);
+            pushFollow(FOLLOW_11);
             lv_from_3_0=ruleTransitionTerminal();
 
             state._fsp--;
@@ -15883,7 +15883,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"from",
                     		lv_from_3_0, 
-                    		"TransitionTerminal");
+                    		"org.eclipse.etrice.core.fsm.FSM.TransitionTerminal");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -15892,20 +15892,20 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_4=(Token)match(input,18,FOLLOW_18_in_ruleContinuationTransition13119); 
+            otherlv_4=(Token)match(input,18,FOLLOW_101); 
 
                 	newLeafNode(otherlv_4, grammarAccess.getContinuationTransitionAccess().getHyphenMinusGreaterThanSignKeyword_4());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6366:1: ( (lv_to_5_0= ruleTransitionTerminal ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6367:1: (lv_to_5_0= ruleTransitionTerminal )
+            // InternalRoom.g:6368:1: ( (lv_to_5_0= ruleTransitionTerminal ) )
+            // InternalRoom.g:6369:1: (lv_to_5_0= ruleTransitionTerminal )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6367:1: (lv_to_5_0= ruleTransitionTerminal )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6368:3: lv_to_5_0= ruleTransitionTerminal
+            // InternalRoom.g:6369:1: (lv_to_5_0= ruleTransitionTerminal )
+            // InternalRoom.g:6370:3: lv_to_5_0= ruleTransitionTerminal
             {
              
             	        newCompositeNode(grammarAccess.getContinuationTransitionAccess().getToTransitionTerminalParserRuleCall_5_0()); 
             	    
-            pushFollow(FOLLOW_ruleTransitionTerminal_in_ruleContinuationTransition13140);
+            pushFollow(FOLLOW_92);
             lv_to_5_0=ruleTransitionTerminal();
 
             state._fsp--;
@@ -15918,7 +15918,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"to",
                     		lv_to_5_0, 
-                    		"TransitionTerminal");
+                    		"org.eclipse.etrice.core.fsm.FSM.TransitionTerminal");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -15927,7 +15927,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6384:2: ( (lv_docu_6_0= ruleDocumentation ) )?
+            // InternalRoom.g:6386:2: ( (lv_docu_6_0= ruleDocumentation ) )?
             int alt135=2;
             int LA135_0 = input.LA(1);
 
@@ -15936,15 +15936,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt135) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6385:1: (lv_docu_6_0= ruleDocumentation )
+                    // InternalRoom.g:6387:1: (lv_docu_6_0= ruleDocumentation )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6385:1: (lv_docu_6_0= ruleDocumentation )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6386:3: lv_docu_6_0= ruleDocumentation
+                    // InternalRoom.g:6387:1: (lv_docu_6_0= ruleDocumentation )
+                    // InternalRoom.g:6388:3: lv_docu_6_0= ruleDocumentation
                     {
                      
                     	        newCompositeNode(grammarAccess.getContinuationTransitionAccess().getDocuDocumentationParserRuleCall_6_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDocumentation_in_ruleContinuationTransition13161);
+                    pushFollow(FOLLOW_80);
                     lv_docu_6_0=ruleDocumentation();
 
                     state._fsp--;
@@ -15957,7 +15957,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"docu",
                             		lv_docu_6_0, 
-                            		"Documentation");
+                            		"org.eclipse.etrice.core.common.Base.Documentation");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -15969,7 +15969,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6402:3: (otherlv_7= '{' (otherlv_8= 'action' ( (lv_action_9_0= ruleDetailCode ) ) )? otherlv_10= '}' )?
+            // InternalRoom.g:6404:3: (otherlv_7= '{' (otherlv_8= 'action' ( (lv_action_9_0= ruleDetailCode ) ) )? otherlv_10= '}' )?
             int alt137=2;
             int LA137_0 = input.LA(1);
 
@@ -15978,13 +15978,13 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt137) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6402:5: otherlv_7= '{' (otherlv_8= 'action' ( (lv_action_9_0= ruleDetailCode ) ) )? otherlv_10= '}'
+                    // InternalRoom.g:6404:5: otherlv_7= '{' (otherlv_8= 'action' ( (lv_action_9_0= ruleDetailCode ) ) )? otherlv_10= '}'
                     {
-                    otherlv_7=(Token)match(input,13,FOLLOW_13_in_ruleContinuationTransition13175); 
+                    otherlv_7=(Token)match(input,13,FOLLOW_102); 
 
                         	newLeafNode(otherlv_7, grammarAccess.getContinuationTransitionAccess().getLeftCurlyBracketKeyword_7_0());
                         
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6406:1: (otherlv_8= 'action' ( (lv_action_9_0= ruleDetailCode ) ) )?
+                    // InternalRoom.g:6408:1: (otherlv_8= 'action' ( (lv_action_9_0= ruleDetailCode ) ) )?
                     int alt136=2;
                     int LA136_0 = input.LA(1);
 
@@ -15993,22 +15993,22 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     switch (alt136) {
                         case 1 :
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6406:3: otherlv_8= 'action' ( (lv_action_9_0= ruleDetailCode ) )
+                            // InternalRoom.g:6408:3: otherlv_8= 'action' ( (lv_action_9_0= ruleDetailCode ) )
                             {
-                            otherlv_8=(Token)match(input,93,FOLLOW_93_in_ruleContinuationTransition13188); 
+                            otherlv_8=(Token)match(input,93,FOLLOW_5); 
 
                                 	newLeafNode(otherlv_8, grammarAccess.getContinuationTransitionAccess().getActionKeyword_7_1_0());
                                 
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6410:1: ( (lv_action_9_0= ruleDetailCode ) )
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6411:1: (lv_action_9_0= ruleDetailCode )
+                            // InternalRoom.g:6412:1: ( (lv_action_9_0= ruleDetailCode ) )
+                            // InternalRoom.g:6413:1: (lv_action_9_0= ruleDetailCode )
                             {
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6411:1: (lv_action_9_0= ruleDetailCode )
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6412:3: lv_action_9_0= ruleDetailCode
+                            // InternalRoom.g:6413:1: (lv_action_9_0= ruleDetailCode )
+                            // InternalRoom.g:6414:3: lv_action_9_0= ruleDetailCode
                             {
                              
                             	        newCompositeNode(grammarAccess.getContinuationTransitionAccess().getActionDetailCodeParserRuleCall_7_1_1_0()); 
                             	    
-                            pushFollow(FOLLOW_ruleDetailCode_in_ruleContinuationTransition13209);
+                            pushFollow(FOLLOW_53);
                             lv_action_9_0=ruleDetailCode();
 
                             state._fsp--;
@@ -16021,7 +16021,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                                    			current, 
                                    			"action",
                                     		lv_action_9_0, 
-                                    		"DetailCode");
+                                    		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
                             	        afterParserOrEnumRuleCall();
                             	    
 
@@ -16036,7 +16036,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_10=(Token)match(input,14,FOLLOW_14_in_ruleContinuationTransition13223); 
+                    otherlv_10=(Token)match(input,14,FOLLOW_2); 
 
                         	newLeafNode(otherlv_10, grammarAccess.getContinuationTransitionAccess().getRightCurlyBracketKeyword_7_2());
                         
@@ -16067,7 +16067,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTriggeredTransition"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6440:1: entryRuleTriggeredTransition returns [EObject current=null] : iv_ruleTriggeredTransition= ruleTriggeredTransition EOF ;
+    // InternalRoom.g:6442:1: entryRuleTriggeredTransition returns [EObject current=null] : iv_ruleTriggeredTransition= ruleTriggeredTransition EOF ;
     public final EObject entryRuleTriggeredTransition() throws RecognitionException {
         EObject current = null;
 
@@ -16075,17 +16075,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6441:2: (iv_ruleTriggeredTransition= ruleTriggeredTransition EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6442:2: iv_ruleTriggeredTransition= ruleTriggeredTransition EOF
+            // InternalRoom.g:6443:2: (iv_ruleTriggeredTransition= ruleTriggeredTransition EOF )
+            // InternalRoom.g:6444:2: iv_ruleTriggeredTransition= ruleTriggeredTransition EOF
             {
              newCompositeNode(grammarAccess.getTriggeredTransitionRule()); 
-            pushFollow(FOLLOW_ruleTriggeredTransition_in_entryRuleTriggeredTransition13261);
+            pushFollow(FOLLOW_1);
             iv_ruleTriggeredTransition=ruleTriggeredTransition();
 
             state._fsp--;
 
              current =iv_ruleTriggeredTransition; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleTriggeredTransition13271); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -16103,7 +16103,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTriggeredTransition"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6449: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= '}' ) ;
+    // InternalRoom.g:6451: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;
 
@@ -16134,17 +16134,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6452: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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6453: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= '}' )
+            // InternalRoom.g:6454: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= '}' ) )
+            // InternalRoom.g:6455: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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6453: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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6453: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= '}'
+            // InternalRoom.g:6455: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= '}' )
+            // InternalRoom.g:6455: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,91,FOLLOW_91_in_ruleTriggeredTransition13308); 
+            otherlv_0=(Token)match(input,91,FOLLOW_99); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getTriggeredTransitionAccess().getTransitionKeyword_0());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6457:1: ( (lv_name_1_0= RULE_ID ) )?
+            // InternalRoom.g:6459:1: ( (lv_name_1_0= RULE_ID ) )?
             int alt138=2;
             int LA138_0 = input.LA(1);
 
@@ -16153,12 +16153,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt138) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6458:1: (lv_name_1_0= RULE_ID )
+                    // InternalRoom.g:6460:1: (lv_name_1_0= RULE_ID )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6458:1: (lv_name_1_0= RULE_ID )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6459:3: lv_name_1_0= RULE_ID
+                    // InternalRoom.g:6460:1: (lv_name_1_0= RULE_ID )
+                    // InternalRoom.g:6461:3: lv_name_1_0= RULE_ID
                     {
-                    lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleTriggeredTransition13325); 
+                    lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_8); 
 
                     			newLeafNode(lv_name_1_0, grammarAccess.getTriggeredTransitionAccess().getNameIDTerminalRuleCall_1_0()); 
                     		
@@ -16170,7 +16170,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"name",
                             		lv_name_1_0, 
-                            		"ID");
+                            		"org.eclipse.xtext.common.Terminals.ID");
                     	    
 
                     }
@@ -16181,20 +16181,20 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_2=(Token)match(input,15,FOLLOW_15_in_ruleTriggeredTransition13343); 
+            otherlv_2=(Token)match(input,15,FOLLOW_101); 
 
                 	newLeafNode(otherlv_2, grammarAccess.getTriggeredTransitionAccess().getColonKeyword_2());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6479:1: ( (lv_from_3_0= ruleTransitionTerminal ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6480:1: (lv_from_3_0= ruleTransitionTerminal )
+            // InternalRoom.g:6481:1: ( (lv_from_3_0= ruleTransitionTerminal ) )
+            // InternalRoom.g:6482:1: (lv_from_3_0= ruleTransitionTerminal )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6480:1: (lv_from_3_0= ruleTransitionTerminal )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6481:3: lv_from_3_0= ruleTransitionTerminal
+            // InternalRoom.g:6482:1: (lv_from_3_0= ruleTransitionTerminal )
+            // InternalRoom.g:6483:3: lv_from_3_0= ruleTransitionTerminal
             {
              
             	        newCompositeNode(grammarAccess.getTriggeredTransitionAccess().getFromTransitionTerminalParserRuleCall_3_0()); 
             	    
-            pushFollow(FOLLOW_ruleTransitionTerminal_in_ruleTriggeredTransition13364);
+            pushFollow(FOLLOW_11);
             lv_from_3_0=ruleTransitionTerminal();
 
             state._fsp--;
@@ -16207,7 +16207,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"from",
                     		lv_from_3_0, 
-                    		"TransitionTerminal");
+                    		"org.eclipse.etrice.core.fsm.FSM.TransitionTerminal");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -16216,20 +16216,20 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_4=(Token)match(input,18,FOLLOW_18_in_ruleTriggeredTransition13376); 
+            otherlv_4=(Token)match(input,18,FOLLOW_101); 
 
                 	newLeafNode(otherlv_4, grammarAccess.getTriggeredTransitionAccess().getHyphenMinusGreaterThanSignKeyword_4());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6501:1: ( (lv_to_5_0= ruleTransitionTerminal ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6502:1: (lv_to_5_0= ruleTransitionTerminal )
+            // InternalRoom.g:6503:1: ( (lv_to_5_0= ruleTransitionTerminal ) )
+            // InternalRoom.g:6504:1: (lv_to_5_0= ruleTransitionTerminal )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6502:1: (lv_to_5_0= ruleTransitionTerminal )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6503:3: lv_to_5_0= ruleTransitionTerminal
+            // InternalRoom.g:6504:1: (lv_to_5_0= ruleTransitionTerminal )
+            // InternalRoom.g:6505:3: lv_to_5_0= ruleTransitionTerminal
             {
              
             	        newCompositeNode(grammarAccess.getTriggeredTransitionAccess().getToTransitionTerminalParserRuleCall_5_0()); 
             	    
-            pushFollow(FOLLOW_ruleTransitionTerminal_in_ruleTriggeredTransition13397);
+            pushFollow(FOLLOW_4);
             lv_to_5_0=ruleTransitionTerminal();
 
             state._fsp--;
@@ -16242,7 +16242,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"to",
                     		lv_to_5_0, 
-                    		"TransitionTerminal");
+                    		"org.eclipse.etrice.core.fsm.FSM.TransitionTerminal");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -16251,7 +16251,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6519:2: ( (lv_docu_6_0= ruleDocumentation ) )?
+            // InternalRoom.g:6521:2: ( (lv_docu_6_0= ruleDocumentation ) )?
             int alt139=2;
             int LA139_0 = input.LA(1);
 
@@ -16260,15 +16260,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt139) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6520:1: (lv_docu_6_0= ruleDocumentation )
+                    // InternalRoom.g:6522:1: (lv_docu_6_0= ruleDocumentation )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6520:1: (lv_docu_6_0= ruleDocumentation )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6521:3: lv_docu_6_0= ruleDocumentation
+                    // InternalRoom.g:6522:1: (lv_docu_6_0= ruleDocumentation )
+                    // InternalRoom.g:6523:3: lv_docu_6_0= ruleDocumentation
                     {
                      
                     	        newCompositeNode(grammarAccess.getTriggeredTransitionAccess().getDocuDocumentationParserRuleCall_6_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDocumentation_in_ruleTriggeredTransition13418);
+                    pushFollow(FOLLOW_5);
                     lv_docu_6_0=ruleDocumentation();
 
                     state._fsp--;
@@ -16281,7 +16281,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"docu",
                             		lv_docu_6_0, 
-                            		"Documentation");
+                            		"org.eclipse.etrice.core.common.Base.Documentation");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -16293,28 +16293,28 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_7=(Token)match(input,13,FOLLOW_13_in_ruleTriggeredTransition13431); 
+            otherlv_7=(Token)match(input,13,FOLLOW_103); 
 
                 	newLeafNode(otherlv_7, grammarAccess.getTriggeredTransitionAccess().getLeftCurlyBracketKeyword_7());
                 
-            otherlv_8=(Token)match(input,94,FOLLOW_94_in_ruleTriggeredTransition13443); 
+            otherlv_8=(Token)match(input,94,FOLLOW_5); 
 
                 	newLeafNode(otherlv_8, grammarAccess.getTriggeredTransitionAccess().getTriggersKeyword_8());
                 
-            otherlv_9=(Token)match(input,13,FOLLOW_13_in_ruleTriggeredTransition13455); 
+            otherlv_9=(Token)match(input,13,FOLLOW_104); 
 
                 	newLeafNode(otherlv_9, grammarAccess.getTriggeredTransitionAccess().getLeftCurlyBracketKeyword_9());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6549:1: ( (lv_triggers_10_0= ruleTrigger ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6550:1: (lv_triggers_10_0= ruleTrigger )
+            // InternalRoom.g:6551:1: ( (lv_triggers_10_0= ruleTrigger ) )
+            // InternalRoom.g:6552:1: (lv_triggers_10_0= ruleTrigger )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6550:1: (lv_triggers_10_0= ruleTrigger )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6551:3: lv_triggers_10_0= ruleTrigger
+            // InternalRoom.g:6552:1: (lv_triggers_10_0= ruleTrigger )
+            // InternalRoom.g:6553:3: lv_triggers_10_0= ruleTrigger
             {
              
             	        newCompositeNode(grammarAccess.getTriggeredTransitionAccess().getTriggersTriggerParserRuleCall_10_0()); 
             	    
-            pushFollow(FOLLOW_ruleTrigger_in_ruleTriggeredTransition13476);
+            pushFollow(FOLLOW_105);
             lv_triggers_10_0=ruleTrigger();
 
             state._fsp--;
@@ -16327,7 +16327,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"triggers",
                     		lv_triggers_10_0, 
-                    		"Trigger");
+                    		"org.eclipse.etrice.core.fsm.FSM.Trigger");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -16336,7 +16336,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6567:2: (otherlv_11= 'or' ( (lv_triggers_12_0= ruleTrigger ) ) )*
+            // InternalRoom.g:6569:2: (otherlv_11= 'or' ( (lv_triggers_12_0= ruleTrigger ) ) )*
             loop140:
             do {
                 int alt140=2;
@@ -16349,22 +16349,22 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                 switch (alt140) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6567:4: otherlv_11= 'or' ( (lv_triggers_12_0= ruleTrigger ) )
+            	    // InternalRoom.g:6569:4: otherlv_11= 'or' ( (lv_triggers_12_0= ruleTrigger ) )
             	    {
-            	    otherlv_11=(Token)match(input,95,FOLLOW_95_in_ruleTriggeredTransition13489); 
+            	    otherlv_11=(Token)match(input,95,FOLLOW_104); 
 
             	        	newLeafNode(otherlv_11, grammarAccess.getTriggeredTransitionAccess().getOrKeyword_11_0());
             	        
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6571:1: ( (lv_triggers_12_0= ruleTrigger ) )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6572:1: (lv_triggers_12_0= ruleTrigger )
+            	    // InternalRoom.g:6573:1: ( (lv_triggers_12_0= ruleTrigger ) )
+            	    // InternalRoom.g:6574:1: (lv_triggers_12_0= ruleTrigger )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6572:1: (lv_triggers_12_0= ruleTrigger )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6573:3: lv_triggers_12_0= ruleTrigger
+            	    // InternalRoom.g:6574:1: (lv_triggers_12_0= ruleTrigger )
+            	    // InternalRoom.g:6575:3: lv_triggers_12_0= ruleTrigger
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getTriggeredTransitionAccess().getTriggersTriggerParserRuleCall_11_1_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleTrigger_in_ruleTriggeredTransition13510);
+            	    pushFollow(FOLLOW_105);
             	    lv_triggers_12_0=ruleTrigger();
 
             	    state._fsp--;
@@ -16377,7 +16377,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"triggers",
             	            		lv_triggers_12_0, 
-            	            		"Trigger");
+            	            		"org.eclipse.etrice.core.fsm.FSM.Trigger");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -16395,11 +16395,11 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                 }
             } while (true);
 
-            otherlv_13=(Token)match(input,14,FOLLOW_14_in_ruleTriggeredTransition13524); 
+            otherlv_13=(Token)match(input,14,FOLLOW_102); 
 
                 	newLeafNode(otherlv_13, grammarAccess.getTriggeredTransitionAccess().getRightCurlyBracketKeyword_12());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6593:1: (otherlv_14= 'action' ( (lv_action_15_0= ruleDetailCode ) ) )?
+            // InternalRoom.g:6595:1: (otherlv_14= 'action' ( (lv_action_15_0= ruleDetailCode ) ) )?
             int alt141=2;
             int LA141_0 = input.LA(1);
 
@@ -16408,22 +16408,22 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt141) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6593:3: otherlv_14= 'action' ( (lv_action_15_0= ruleDetailCode ) )
+                    // InternalRoom.g:6595:3: otherlv_14= 'action' ( (lv_action_15_0= ruleDetailCode ) )
                     {
-                    otherlv_14=(Token)match(input,93,FOLLOW_93_in_ruleTriggeredTransition13537); 
+                    otherlv_14=(Token)match(input,93,FOLLOW_5); 
 
                         	newLeafNode(otherlv_14, grammarAccess.getTriggeredTransitionAccess().getActionKeyword_13_0());
                         
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6597:1: ( (lv_action_15_0= ruleDetailCode ) )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6598:1: (lv_action_15_0= ruleDetailCode )
+                    // InternalRoom.g:6599:1: ( (lv_action_15_0= ruleDetailCode ) )
+                    // InternalRoom.g:6600:1: (lv_action_15_0= ruleDetailCode )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6598:1: (lv_action_15_0= ruleDetailCode )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6599:3: lv_action_15_0= ruleDetailCode
+                    // InternalRoom.g:6600:1: (lv_action_15_0= ruleDetailCode )
+                    // InternalRoom.g:6601:3: lv_action_15_0= ruleDetailCode
                     {
                      
                     	        newCompositeNode(grammarAccess.getTriggeredTransitionAccess().getActionDetailCodeParserRuleCall_13_1_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDetailCode_in_ruleTriggeredTransition13558);
+                    pushFollow(FOLLOW_53);
                     lv_action_15_0=ruleDetailCode();
 
                     state._fsp--;
@@ -16436,7 +16436,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"action",
                             		lv_action_15_0, 
-                            		"DetailCode");
+                            		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -16451,7 +16451,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_16=(Token)match(input,14,FOLLOW_14_in_ruleTriggeredTransition13572); 
+            otherlv_16=(Token)match(input,14,FOLLOW_2); 
 
                 	newLeafNode(otherlv_16, grammarAccess.getTriggeredTransitionAccess().getRightCurlyBracketKeyword_14());
                 
@@ -16476,7 +16476,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleGuardedTransition"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6627:1: entryRuleGuardedTransition returns [EObject current=null] : iv_ruleGuardedTransition= ruleGuardedTransition EOF ;
+    // InternalRoom.g:6629:1: entryRuleGuardedTransition returns [EObject current=null] : iv_ruleGuardedTransition= ruleGuardedTransition EOF ;
     public final EObject entryRuleGuardedTransition() throws RecognitionException {
         EObject current = null;
 
@@ -16484,17 +16484,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6628:2: (iv_ruleGuardedTransition= ruleGuardedTransition EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6629:2: iv_ruleGuardedTransition= ruleGuardedTransition EOF
+            // InternalRoom.g:6630:2: (iv_ruleGuardedTransition= ruleGuardedTransition EOF )
+            // InternalRoom.g:6631:2: iv_ruleGuardedTransition= ruleGuardedTransition EOF
             {
              newCompositeNode(grammarAccess.getGuardedTransitionRule()); 
-            pushFollow(FOLLOW_ruleGuardedTransition_in_entryRuleGuardedTransition13608);
+            pushFollow(FOLLOW_1);
             iv_ruleGuardedTransition=ruleGuardedTransition();
 
             state._fsp--;
 
              current =iv_ruleGuardedTransition; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleGuardedTransition13618); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -16512,7 +16512,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleGuardedTransition"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6636: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= '}' ) ;
+    // InternalRoom.g:6638: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;
 
@@ -16538,17 +16538,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6639: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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6640: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= '}' )
+            // InternalRoom.g:6641: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= '}' ) )
+            // InternalRoom.g:6642: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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6640: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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6640: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= '}'
+            // InternalRoom.g:6642: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= '}' )
+            // InternalRoom.g:6642: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,91,FOLLOW_91_in_ruleGuardedTransition13655); 
+            otherlv_0=(Token)match(input,91,FOLLOW_99); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getGuardedTransitionAccess().getTransitionKeyword_0());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6644:1: ( (lv_name_1_0= RULE_ID ) )?
+            // InternalRoom.g:6646:1: ( (lv_name_1_0= RULE_ID ) )?
             int alt142=2;
             int LA142_0 = input.LA(1);
 
@@ -16557,12 +16557,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt142) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6645:1: (lv_name_1_0= RULE_ID )
+                    // InternalRoom.g:6647:1: (lv_name_1_0= RULE_ID )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6645:1: (lv_name_1_0= RULE_ID )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6646:3: lv_name_1_0= RULE_ID
+                    // InternalRoom.g:6647:1: (lv_name_1_0= RULE_ID )
+                    // InternalRoom.g:6648:3: lv_name_1_0= RULE_ID
                     {
-                    lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleGuardedTransition13672); 
+                    lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_8); 
 
                     			newLeafNode(lv_name_1_0, grammarAccess.getGuardedTransitionAccess().getNameIDTerminalRuleCall_1_0()); 
                     		
@@ -16574,7 +16574,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"name",
                             		lv_name_1_0, 
-                            		"ID");
+                            		"org.eclipse.xtext.common.Terminals.ID");
                     	    
 
                     }
@@ -16585,20 +16585,20 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_2=(Token)match(input,15,FOLLOW_15_in_ruleGuardedTransition13690); 
+            otherlv_2=(Token)match(input,15,FOLLOW_101); 
 
                 	newLeafNode(otherlv_2, grammarAccess.getGuardedTransitionAccess().getColonKeyword_2());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6666:1: ( (lv_from_3_0= ruleTransitionTerminal ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6667:1: (lv_from_3_0= ruleTransitionTerminal )
+            // InternalRoom.g:6668:1: ( (lv_from_3_0= ruleTransitionTerminal ) )
+            // InternalRoom.g:6669:1: (lv_from_3_0= ruleTransitionTerminal )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6667:1: (lv_from_3_0= ruleTransitionTerminal )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6668:3: lv_from_3_0= ruleTransitionTerminal
+            // InternalRoom.g:6669:1: (lv_from_3_0= ruleTransitionTerminal )
+            // InternalRoom.g:6670:3: lv_from_3_0= ruleTransitionTerminal
             {
              
             	        newCompositeNode(grammarAccess.getGuardedTransitionAccess().getFromTransitionTerminalParserRuleCall_3_0()); 
             	    
-            pushFollow(FOLLOW_ruleTransitionTerminal_in_ruleGuardedTransition13711);
+            pushFollow(FOLLOW_11);
             lv_from_3_0=ruleTransitionTerminal();
 
             state._fsp--;
@@ -16611,7 +16611,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"from",
                     		lv_from_3_0, 
-                    		"TransitionTerminal");
+                    		"org.eclipse.etrice.core.fsm.FSM.TransitionTerminal");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -16620,20 +16620,20 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_4=(Token)match(input,18,FOLLOW_18_in_ruleGuardedTransition13723); 
+            otherlv_4=(Token)match(input,18,FOLLOW_101); 
 
                 	newLeafNode(otherlv_4, grammarAccess.getGuardedTransitionAccess().getHyphenMinusGreaterThanSignKeyword_4());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6688:1: ( (lv_to_5_0= ruleTransitionTerminal ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6689:1: (lv_to_5_0= ruleTransitionTerminal )
+            // InternalRoom.g:6690:1: ( (lv_to_5_0= ruleTransitionTerminal ) )
+            // InternalRoom.g:6691:1: (lv_to_5_0= ruleTransitionTerminal )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6689:1: (lv_to_5_0= ruleTransitionTerminal )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6690:3: lv_to_5_0= ruleTransitionTerminal
+            // InternalRoom.g:6691:1: (lv_to_5_0= ruleTransitionTerminal )
+            // InternalRoom.g:6692:3: lv_to_5_0= ruleTransitionTerminal
             {
              
             	        newCompositeNode(grammarAccess.getGuardedTransitionAccess().getToTransitionTerminalParserRuleCall_5_0()); 
             	    
-            pushFollow(FOLLOW_ruleTransitionTerminal_in_ruleGuardedTransition13744);
+            pushFollow(FOLLOW_4);
             lv_to_5_0=ruleTransitionTerminal();
 
             state._fsp--;
@@ -16646,7 +16646,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"to",
                     		lv_to_5_0, 
-                    		"TransitionTerminal");
+                    		"org.eclipse.etrice.core.fsm.FSM.TransitionTerminal");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -16655,7 +16655,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6706:2: ( (lv_docu_6_0= ruleDocumentation ) )?
+            // InternalRoom.g:6708:2: ( (lv_docu_6_0= ruleDocumentation ) )?
             int alt143=2;
             int LA143_0 = input.LA(1);
 
@@ -16664,15 +16664,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt143) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6707:1: (lv_docu_6_0= ruleDocumentation )
+                    // InternalRoom.g:6709:1: (lv_docu_6_0= ruleDocumentation )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6707:1: (lv_docu_6_0= ruleDocumentation )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6708:3: lv_docu_6_0= ruleDocumentation
+                    // InternalRoom.g:6709:1: (lv_docu_6_0= ruleDocumentation )
+                    // InternalRoom.g:6710:3: lv_docu_6_0= ruleDocumentation
                     {
                      
                     	        newCompositeNode(grammarAccess.getGuardedTransitionAccess().getDocuDocumentationParserRuleCall_6_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDocumentation_in_ruleGuardedTransition13765);
+                    pushFollow(FOLLOW_5);
                     lv_docu_6_0=ruleDocumentation();
 
                     state._fsp--;
@@ -16685,7 +16685,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"docu",
                             		lv_docu_6_0, 
-                            		"Documentation");
+                            		"org.eclipse.etrice.core.common.Base.Documentation");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -16697,24 +16697,24 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_7=(Token)match(input,13,FOLLOW_13_in_ruleGuardedTransition13778); 
+            otherlv_7=(Token)match(input,13,FOLLOW_106); 
 
                 	newLeafNode(otherlv_7, grammarAccess.getGuardedTransitionAccess().getLeftCurlyBracketKeyword_7());
                 
-            otherlv_8=(Token)match(input,96,FOLLOW_96_in_ruleGuardedTransition13790); 
+            otherlv_8=(Token)match(input,96,FOLLOW_5); 
 
                 	newLeafNode(otherlv_8, grammarAccess.getGuardedTransitionAccess().getGuardKeyword_8());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6732:1: ( (lv_guard_9_0= ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6733:1: (lv_guard_9_0= ruleDetailCode )
+            // InternalRoom.g:6734:1: ( (lv_guard_9_0= ruleDetailCode ) )
+            // InternalRoom.g:6735:1: (lv_guard_9_0= ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6733:1: (lv_guard_9_0= ruleDetailCode )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6734:3: lv_guard_9_0= ruleDetailCode
+            // InternalRoom.g:6735:1: (lv_guard_9_0= ruleDetailCode )
+            // InternalRoom.g:6736:3: lv_guard_9_0= ruleDetailCode
             {
              
             	        newCompositeNode(grammarAccess.getGuardedTransitionAccess().getGuardDetailCodeParserRuleCall_9_0()); 
             	    
-            pushFollow(FOLLOW_ruleDetailCode_in_ruleGuardedTransition13811);
+            pushFollow(FOLLOW_102);
             lv_guard_9_0=ruleDetailCode();
 
             state._fsp--;
@@ -16727,7 +16727,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"guard",
                     		lv_guard_9_0, 
-                    		"DetailCode");
+                    		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -16736,7 +16736,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6750:2: (otherlv_10= 'action' ( (lv_action_11_0= ruleDetailCode ) ) )?
+            // InternalRoom.g:6752:2: (otherlv_10= 'action' ( (lv_action_11_0= ruleDetailCode ) ) )?
             int alt144=2;
             int LA144_0 = input.LA(1);
 
@@ -16745,22 +16745,22 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt144) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6750:4: otherlv_10= 'action' ( (lv_action_11_0= ruleDetailCode ) )
+                    // InternalRoom.g:6752:4: otherlv_10= 'action' ( (lv_action_11_0= ruleDetailCode ) )
                     {
-                    otherlv_10=(Token)match(input,93,FOLLOW_93_in_ruleGuardedTransition13824); 
+                    otherlv_10=(Token)match(input,93,FOLLOW_5); 
 
                         	newLeafNode(otherlv_10, grammarAccess.getGuardedTransitionAccess().getActionKeyword_10_0());
                         
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6754:1: ( (lv_action_11_0= ruleDetailCode ) )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6755:1: (lv_action_11_0= ruleDetailCode )
+                    // InternalRoom.g:6756:1: ( (lv_action_11_0= ruleDetailCode ) )
+                    // InternalRoom.g:6757:1: (lv_action_11_0= ruleDetailCode )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6755:1: (lv_action_11_0= ruleDetailCode )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6756:3: lv_action_11_0= ruleDetailCode
+                    // InternalRoom.g:6757:1: (lv_action_11_0= ruleDetailCode )
+                    // InternalRoom.g:6758:3: lv_action_11_0= ruleDetailCode
                     {
                      
                     	        newCompositeNode(grammarAccess.getGuardedTransitionAccess().getActionDetailCodeParserRuleCall_10_1_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDetailCode_in_ruleGuardedTransition13845);
+                    pushFollow(FOLLOW_53);
                     lv_action_11_0=ruleDetailCode();
 
                     state._fsp--;
@@ -16773,7 +16773,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"action",
                             		lv_action_11_0, 
-                            		"DetailCode");
+                            		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -16788,7 +16788,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_12=(Token)match(input,14,FOLLOW_14_in_ruleGuardedTransition13859); 
+            otherlv_12=(Token)match(input,14,FOLLOW_2); 
 
                 	newLeafNode(otherlv_12, grammarAccess.getGuardedTransitionAccess().getRightCurlyBracketKeyword_11());
                 
@@ -16813,7 +16813,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleCPBranchTransition"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6784:1: entryRuleCPBranchTransition returns [EObject current=null] : iv_ruleCPBranchTransition= ruleCPBranchTransition EOF ;
+    // InternalRoom.g:6786:1: entryRuleCPBranchTransition returns [EObject current=null] : iv_ruleCPBranchTransition= ruleCPBranchTransition EOF ;
     public final EObject entryRuleCPBranchTransition() throws RecognitionException {
         EObject current = null;
 
@@ -16821,17 +16821,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6785:2: (iv_ruleCPBranchTransition= ruleCPBranchTransition EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6786:2: iv_ruleCPBranchTransition= ruleCPBranchTransition EOF
+            // InternalRoom.g:6787:2: (iv_ruleCPBranchTransition= ruleCPBranchTransition EOF )
+            // InternalRoom.g:6788:2: iv_ruleCPBranchTransition= ruleCPBranchTransition EOF
             {
              newCompositeNode(grammarAccess.getCPBranchTransitionRule()); 
-            pushFollow(FOLLOW_ruleCPBranchTransition_in_entryRuleCPBranchTransition13895);
+            pushFollow(FOLLOW_1);
             iv_ruleCPBranchTransition=ruleCPBranchTransition();
 
             state._fsp--;
 
              current =iv_ruleCPBranchTransition; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleCPBranchTransition13905); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -16849,7 +16849,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleCPBranchTransition"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6793: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= '}' ) ;
+    // InternalRoom.g:6795: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;
 
@@ -16875,17 +16875,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6796: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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6797: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= '}' )
+            // InternalRoom.g:6798: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= '}' ) )
+            // InternalRoom.g:6799: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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6797: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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6797: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= '}'
+            // InternalRoom.g:6799: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= '}' )
+            // InternalRoom.g:6799: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,91,FOLLOW_91_in_ruleCPBranchTransition13942); 
+            otherlv_0=(Token)match(input,91,FOLLOW_99); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getCPBranchTransitionAccess().getTransitionKeyword_0());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6801:1: ( (lv_name_1_0= RULE_ID ) )?
+            // InternalRoom.g:6803:1: ( (lv_name_1_0= RULE_ID ) )?
             int alt145=2;
             int LA145_0 = input.LA(1);
 
@@ -16894,12 +16894,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt145) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6802:1: (lv_name_1_0= RULE_ID )
+                    // InternalRoom.g:6804:1: (lv_name_1_0= RULE_ID )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6802:1: (lv_name_1_0= RULE_ID )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6803:3: lv_name_1_0= RULE_ID
+                    // InternalRoom.g:6804:1: (lv_name_1_0= RULE_ID )
+                    // InternalRoom.g:6805:3: lv_name_1_0= RULE_ID
                     {
-                    lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleCPBranchTransition13959); 
+                    lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_8); 
 
                     			newLeafNode(lv_name_1_0, grammarAccess.getCPBranchTransitionAccess().getNameIDTerminalRuleCall_1_0()); 
                     		
@@ -16911,7 +16911,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"name",
                             		lv_name_1_0, 
-                            		"ID");
+                            		"org.eclipse.xtext.common.Terminals.ID");
                     	    
 
                     }
@@ -16922,20 +16922,20 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_2=(Token)match(input,15,FOLLOW_15_in_ruleCPBranchTransition13977); 
+            otherlv_2=(Token)match(input,15,FOLLOW_101); 
 
                 	newLeafNode(otherlv_2, grammarAccess.getCPBranchTransitionAccess().getColonKeyword_2());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6823:1: ( (lv_from_3_0= ruleTransitionTerminal ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6824:1: (lv_from_3_0= ruleTransitionTerminal )
+            // InternalRoom.g:6825:1: ( (lv_from_3_0= ruleTransitionTerminal ) )
+            // InternalRoom.g:6826:1: (lv_from_3_0= ruleTransitionTerminal )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6824:1: (lv_from_3_0= ruleTransitionTerminal )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6825:3: lv_from_3_0= ruleTransitionTerminal
+            // InternalRoom.g:6826:1: (lv_from_3_0= ruleTransitionTerminal )
+            // InternalRoom.g:6827:3: lv_from_3_0= ruleTransitionTerminal
             {
              
             	        newCompositeNode(grammarAccess.getCPBranchTransitionAccess().getFromTransitionTerminalParserRuleCall_3_0()); 
             	    
-            pushFollow(FOLLOW_ruleTransitionTerminal_in_ruleCPBranchTransition13998);
+            pushFollow(FOLLOW_11);
             lv_from_3_0=ruleTransitionTerminal();
 
             state._fsp--;
@@ -16948,7 +16948,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"from",
                     		lv_from_3_0, 
-                    		"TransitionTerminal");
+                    		"org.eclipse.etrice.core.fsm.FSM.TransitionTerminal");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -16957,20 +16957,20 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_4=(Token)match(input,18,FOLLOW_18_in_ruleCPBranchTransition14010); 
+            otherlv_4=(Token)match(input,18,FOLLOW_101); 
 
                 	newLeafNode(otherlv_4, grammarAccess.getCPBranchTransitionAccess().getHyphenMinusGreaterThanSignKeyword_4());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6845:1: ( (lv_to_5_0= ruleTransitionTerminal ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6846:1: (lv_to_5_0= ruleTransitionTerminal )
+            // InternalRoom.g:6847:1: ( (lv_to_5_0= ruleTransitionTerminal ) )
+            // InternalRoom.g:6848:1: (lv_to_5_0= ruleTransitionTerminal )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6846:1: (lv_to_5_0= ruleTransitionTerminal )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6847:3: lv_to_5_0= ruleTransitionTerminal
+            // InternalRoom.g:6848:1: (lv_to_5_0= ruleTransitionTerminal )
+            // InternalRoom.g:6849:3: lv_to_5_0= ruleTransitionTerminal
             {
              
             	        newCompositeNode(grammarAccess.getCPBranchTransitionAccess().getToTransitionTerminalParserRuleCall_5_0()); 
             	    
-            pushFollow(FOLLOW_ruleTransitionTerminal_in_ruleCPBranchTransition14031);
+            pushFollow(FOLLOW_4);
             lv_to_5_0=ruleTransitionTerminal();
 
             state._fsp--;
@@ -16983,7 +16983,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"to",
                     		lv_to_5_0, 
-                    		"TransitionTerminal");
+                    		"org.eclipse.etrice.core.fsm.FSM.TransitionTerminal");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -16992,7 +16992,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6863:2: ( (lv_docu_6_0= ruleDocumentation ) )?
+            // InternalRoom.g:6865:2: ( (lv_docu_6_0= ruleDocumentation ) )?
             int alt146=2;
             int LA146_0 = input.LA(1);
 
@@ -17001,15 +17001,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt146) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6864:1: (lv_docu_6_0= ruleDocumentation )
+                    // InternalRoom.g:6866:1: (lv_docu_6_0= ruleDocumentation )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6864:1: (lv_docu_6_0= ruleDocumentation )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6865:3: lv_docu_6_0= ruleDocumentation
+                    // InternalRoom.g:6866:1: (lv_docu_6_0= ruleDocumentation )
+                    // InternalRoom.g:6867:3: lv_docu_6_0= ruleDocumentation
                     {
                      
                     	        newCompositeNode(grammarAccess.getCPBranchTransitionAccess().getDocuDocumentationParserRuleCall_6_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDocumentation_in_ruleCPBranchTransition14052);
+                    pushFollow(FOLLOW_5);
                     lv_docu_6_0=ruleDocumentation();
 
                     state._fsp--;
@@ -17022,7 +17022,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"docu",
                             		lv_docu_6_0, 
-                            		"Documentation");
+                            		"org.eclipse.etrice.core.common.Base.Documentation");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -17034,24 +17034,24 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_7=(Token)match(input,13,FOLLOW_13_in_ruleCPBranchTransition14065); 
+            otherlv_7=(Token)match(input,13,FOLLOW_107); 
 
                 	newLeafNode(otherlv_7, grammarAccess.getCPBranchTransitionAccess().getLeftCurlyBracketKeyword_7());
                 
-            otherlv_8=(Token)match(input,97,FOLLOW_97_in_ruleCPBranchTransition14077); 
+            otherlv_8=(Token)match(input,97,FOLLOW_5); 
 
                 	newLeafNode(otherlv_8, grammarAccess.getCPBranchTransitionAccess().getCondKeyword_8());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6889:1: ( (lv_condition_9_0= ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6890:1: (lv_condition_9_0= ruleDetailCode )
+            // InternalRoom.g:6891:1: ( (lv_condition_9_0= ruleDetailCode ) )
+            // InternalRoom.g:6892:1: (lv_condition_9_0= ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6890:1: (lv_condition_9_0= ruleDetailCode )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6891:3: lv_condition_9_0= ruleDetailCode
+            // InternalRoom.g:6892:1: (lv_condition_9_0= ruleDetailCode )
+            // InternalRoom.g:6893:3: lv_condition_9_0= ruleDetailCode
             {
              
             	        newCompositeNode(grammarAccess.getCPBranchTransitionAccess().getConditionDetailCodeParserRuleCall_9_0()); 
             	    
-            pushFollow(FOLLOW_ruleDetailCode_in_ruleCPBranchTransition14098);
+            pushFollow(FOLLOW_102);
             lv_condition_9_0=ruleDetailCode();
 
             state._fsp--;
@@ -17064,7 +17064,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"condition",
                     		lv_condition_9_0, 
-                    		"DetailCode");
+                    		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -17073,7 +17073,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6907:2: (otherlv_10= 'action' ( (lv_action_11_0= ruleDetailCode ) ) )?
+            // InternalRoom.g:6909:2: (otherlv_10= 'action' ( (lv_action_11_0= ruleDetailCode ) ) )?
             int alt147=2;
             int LA147_0 = input.LA(1);
 
@@ -17082,22 +17082,22 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt147) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6907:4: otherlv_10= 'action' ( (lv_action_11_0= ruleDetailCode ) )
+                    // InternalRoom.g:6909:4: otherlv_10= 'action' ( (lv_action_11_0= ruleDetailCode ) )
                     {
-                    otherlv_10=(Token)match(input,93,FOLLOW_93_in_ruleCPBranchTransition14111); 
+                    otherlv_10=(Token)match(input,93,FOLLOW_5); 
 
                         	newLeafNode(otherlv_10, grammarAccess.getCPBranchTransitionAccess().getActionKeyword_10_0());
                         
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6911:1: ( (lv_action_11_0= ruleDetailCode ) )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6912:1: (lv_action_11_0= ruleDetailCode )
+                    // InternalRoom.g:6913:1: ( (lv_action_11_0= ruleDetailCode ) )
+                    // InternalRoom.g:6914:1: (lv_action_11_0= ruleDetailCode )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6912:1: (lv_action_11_0= ruleDetailCode )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6913:3: lv_action_11_0= ruleDetailCode
+                    // InternalRoom.g:6914:1: (lv_action_11_0= ruleDetailCode )
+                    // InternalRoom.g:6915:3: lv_action_11_0= ruleDetailCode
                     {
                      
                     	        newCompositeNode(grammarAccess.getCPBranchTransitionAccess().getActionDetailCodeParserRuleCall_10_1_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDetailCode_in_ruleCPBranchTransition14132);
+                    pushFollow(FOLLOW_53);
                     lv_action_11_0=ruleDetailCode();
 
                     state._fsp--;
@@ -17110,7 +17110,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"action",
                             		lv_action_11_0, 
-                            		"DetailCode");
+                            		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -17125,7 +17125,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_12=(Token)match(input,14,FOLLOW_14_in_ruleCPBranchTransition14146); 
+            otherlv_12=(Token)match(input,14,FOLLOW_2); 
 
                 	newLeafNode(otherlv_12, grammarAccess.getCPBranchTransitionAccess().getRightCurlyBracketKeyword_11());
                 
@@ -17150,7 +17150,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleRefinedTransition"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6941:1: entryRuleRefinedTransition returns [EObject current=null] : iv_ruleRefinedTransition= ruleRefinedTransition EOF ;
+    // InternalRoom.g:6943:1: entryRuleRefinedTransition returns [EObject current=null] : iv_ruleRefinedTransition= ruleRefinedTransition EOF ;
     public final EObject entryRuleRefinedTransition() throws RecognitionException {
         EObject current = null;
 
@@ -17158,17 +17158,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6942:2: (iv_ruleRefinedTransition= ruleRefinedTransition EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6943:2: iv_ruleRefinedTransition= ruleRefinedTransition EOF
+            // InternalRoom.g:6944:2: (iv_ruleRefinedTransition= ruleRefinedTransition EOF )
+            // InternalRoom.g:6945:2: iv_ruleRefinedTransition= ruleRefinedTransition EOF
             {
              newCompositeNode(grammarAccess.getRefinedTransitionRule()); 
-            pushFollow(FOLLOW_ruleRefinedTransition_in_entryRuleRefinedTransition14182);
+            pushFollow(FOLLOW_1);
             iv_ruleRefinedTransition=ruleRefinedTransition();
 
             state._fsp--;
 
              current =iv_ruleRefinedTransition; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRefinedTransition14192); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -17186,7 +17186,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleRefinedTransition"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6950: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= '}' ) ;
+    // InternalRoom.g:6952: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;
 
@@ -17202,21 +17202,21 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6953: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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6954:1: (otherlv_0= 'RefinedTransition' ( ( ruleFQN ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' otherlv_4= 'action' ( (lv_action_5_0= ruleDetailCode ) ) otherlv_6= '}' )
+            // InternalRoom.g:6955:28: ( (otherlv_0= 'RefinedTransition' ( ( ruleFQN ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' otherlv_4= 'action' ( (lv_action_5_0= ruleDetailCode ) ) otherlv_6= '}' ) )
+            // InternalRoom.g:6956: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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6954: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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6954:3: otherlv_0= 'RefinedTransition' ( ( ruleFQN ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' otherlv_4= 'action' ( (lv_action_5_0= ruleDetailCode ) ) otherlv_6= '}'
+            // InternalRoom.g:6956:1: (otherlv_0= 'RefinedTransition' ( ( ruleFQN ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' otherlv_4= 'action' ( (lv_action_5_0= ruleDetailCode ) ) otherlv_6= '}' )
+            // InternalRoom.g:6956: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,98,FOLLOW_98_in_ruleRefinedTransition14229); 
+            otherlv_0=(Token)match(input,98,FOLLOW_3); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getRefinedTransitionAccess().getRefinedTransitionKeyword_0());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6958:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6959:1: ( ruleFQN )
+            // InternalRoom.g:6960:1: ( ( ruleFQN ) )
+            // InternalRoom.g:6961:1: ( ruleFQN )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6959:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6960:3: ruleFQN
+            // InternalRoom.g:6961:1: ( ruleFQN )
+            // InternalRoom.g:6962:3: ruleFQN
             {
 
             			if (current==null) {
@@ -17226,7 +17226,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
              
             	        newCompositeNode(grammarAccess.getRefinedTransitionAccess().getTargetTransitionCrossReference_1_0()); 
             	    
-            pushFollow(FOLLOW_ruleFQN_in_ruleRefinedTransition14252);
+            pushFollow(FOLLOW_4);
             ruleFQN();
 
             state._fsp--;
@@ -17240,7 +17240,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6973:2: ( (lv_docu_2_0= ruleDocumentation ) )?
+            // InternalRoom.g:6975:2: ( (lv_docu_2_0= ruleDocumentation ) )?
             int alt148=2;
             int LA148_0 = input.LA(1);
 
@@ -17249,15 +17249,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt148) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6974:1: (lv_docu_2_0= ruleDocumentation )
+                    // InternalRoom.g:6976:1: (lv_docu_2_0= ruleDocumentation )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6974:1: (lv_docu_2_0= ruleDocumentation )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6975:3: lv_docu_2_0= ruleDocumentation
+                    // InternalRoom.g:6976:1: (lv_docu_2_0= ruleDocumentation )
+                    // InternalRoom.g:6977:3: lv_docu_2_0= ruleDocumentation
                     {
                      
                     	        newCompositeNode(grammarAccess.getRefinedTransitionAccess().getDocuDocumentationParserRuleCall_2_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDocumentation_in_ruleRefinedTransition14273);
+                    pushFollow(FOLLOW_5);
                     lv_docu_2_0=ruleDocumentation();
 
                     state._fsp--;
@@ -17270,7 +17270,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"docu",
                             		lv_docu_2_0, 
-                            		"Documentation");
+                            		"org.eclipse.etrice.core.common.Base.Documentation");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -17282,24 +17282,24 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_3=(Token)match(input,13,FOLLOW_13_in_ruleRefinedTransition14286); 
+            otherlv_3=(Token)match(input,13,FOLLOW_108); 
 
                 	newLeafNode(otherlv_3, grammarAccess.getRefinedTransitionAccess().getLeftCurlyBracketKeyword_3());
                 
-            otherlv_4=(Token)match(input,93,FOLLOW_93_in_ruleRefinedTransition14298); 
+            otherlv_4=(Token)match(input,93,FOLLOW_5); 
 
                 	newLeafNode(otherlv_4, grammarAccess.getRefinedTransitionAccess().getActionKeyword_4());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:6999:1: ( (lv_action_5_0= ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7000:1: (lv_action_5_0= ruleDetailCode )
+            // InternalRoom.g:7001:1: ( (lv_action_5_0= ruleDetailCode ) )
+            // InternalRoom.g:7002:1: (lv_action_5_0= ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7000:1: (lv_action_5_0= ruleDetailCode )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7001:3: lv_action_5_0= ruleDetailCode
+            // InternalRoom.g:7002:1: (lv_action_5_0= ruleDetailCode )
+            // InternalRoom.g:7003:3: lv_action_5_0= ruleDetailCode
             {
              
             	        newCompositeNode(grammarAccess.getRefinedTransitionAccess().getActionDetailCodeParserRuleCall_5_0()); 
             	    
-            pushFollow(FOLLOW_ruleDetailCode_in_ruleRefinedTransition14319);
+            pushFollow(FOLLOW_53);
             lv_action_5_0=ruleDetailCode();
 
             state._fsp--;
@@ -17312,7 +17312,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"action",
                     		lv_action_5_0, 
-                    		"DetailCode");
+                    		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -17321,7 +17321,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_6=(Token)match(input,14,FOLLOW_14_in_ruleRefinedTransition14331); 
+            otherlv_6=(Token)match(input,14,FOLLOW_2); 
 
                 	newLeafNode(otherlv_6, grammarAccess.getRefinedTransitionAccess().getRightCurlyBracketKeyword_6());
                 
@@ -17346,7 +17346,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTransitionTerminal"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7029:1: entryRuleTransitionTerminal returns [EObject current=null] : iv_ruleTransitionTerminal= ruleTransitionTerminal EOF ;
+    // InternalRoom.g:7031:1: entryRuleTransitionTerminal returns [EObject current=null] : iv_ruleTransitionTerminal= ruleTransitionTerminal EOF ;
     public final EObject entryRuleTransitionTerminal() throws RecognitionException {
         EObject current = null;
 
@@ -17354,17 +17354,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7030:2: (iv_ruleTransitionTerminal= ruleTransitionTerminal EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7031:2: iv_ruleTransitionTerminal= ruleTransitionTerminal EOF
+            // InternalRoom.g:7032:2: (iv_ruleTransitionTerminal= ruleTransitionTerminal EOF )
+            // InternalRoom.g:7033:2: iv_ruleTransitionTerminal= ruleTransitionTerminal EOF
             {
              newCompositeNode(grammarAccess.getTransitionTerminalRule()); 
-            pushFollow(FOLLOW_ruleTransitionTerminal_in_entryRuleTransitionTerminal14367);
+            pushFollow(FOLLOW_1);
             iv_ruleTransitionTerminal=ruleTransitionTerminal();
 
             state._fsp--;
 
              current =iv_ruleTransitionTerminal; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleTransitionTerminal14377); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -17382,7 +17382,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTransitionTerminal"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7038:1: ruleTransitionTerminal returns [EObject current=null] : (this_StateTerminal_0= ruleStateTerminal | this_TrPointTerminal_1= ruleTrPointTerminal | this_SubStateTrPointTerminal_2= ruleSubStateTrPointTerminal | this_ChoicepointTerminal_3= ruleChoicepointTerminal ) ;
+    // InternalRoom.g:7040: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;
 
@@ -17398,22 +17398,22 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7041:28: ( (this_StateTerminal_0= ruleStateTerminal | this_TrPointTerminal_1= ruleTrPointTerminal | this_SubStateTrPointTerminal_2= ruleSubStateTrPointTerminal | this_ChoicepointTerminal_3= ruleChoicepointTerminal ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7042:1: (this_StateTerminal_0= ruleStateTerminal | this_TrPointTerminal_1= ruleTrPointTerminal | this_SubStateTrPointTerminal_2= ruleSubStateTrPointTerminal | this_ChoicepointTerminal_3= ruleChoicepointTerminal )
+            // InternalRoom.g:7043:28: ( (this_StateTerminal_0= ruleStateTerminal | this_TrPointTerminal_1= ruleTrPointTerminal | this_SubStateTrPointTerminal_2= ruleSubStateTrPointTerminal | this_ChoicepointTerminal_3= ruleChoicepointTerminal ) )
+            // InternalRoom.g:7044:1: (this_StateTerminal_0= ruleStateTerminal | this_TrPointTerminal_1= ruleTrPointTerminal | this_SubStateTrPointTerminal_2= ruleSubStateTrPointTerminal | this_ChoicepointTerminal_3= ruleChoicepointTerminal )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7042:1: (this_StateTerminal_0= ruleStateTerminal | this_TrPointTerminal_1= ruleTrPointTerminal | this_SubStateTrPointTerminal_2= ruleSubStateTrPointTerminal | this_ChoicepointTerminal_3= ruleChoicepointTerminal )
+            // InternalRoom.g:7044:1: (this_StateTerminal_0= ruleStateTerminal | this_TrPointTerminal_1= ruleTrPointTerminal | this_SubStateTrPointTerminal_2= ruleSubStateTrPointTerminal | this_ChoicepointTerminal_3= ruleChoicepointTerminal )
             int alt149=4;
             switch ( input.LA(1) ) {
             case RULE_ID:
                 {
                 int LA149_1 = input.LA(2);
 
-                if ( (LA149_1==23) ) {
-                    alt149=3;
-                }
-                else if ( (LA149_1==EOF||(LA149_1>=13 && LA149_1<=14)||LA149_1==18||LA149_1==33||LA149_1==80||(LA149_1>=85 && LA149_1<=91)||LA149_1==98) ) {
+                if ( (LA149_1==EOF||(LA149_1>=13 && LA149_1<=14)||LA149_1==18||LA149_1==33||LA149_1==80||(LA149_1>=85 && LA149_1<=91)||LA149_1==98) ) {
                     alt149=1;
                 }
+                else if ( (LA149_1==23) ) {
+                    alt149=3;
+                }
                 else {
                     NoViableAltException nvae =
                         new NoViableAltException("", 149, 1, input);
@@ -17441,12 +17441,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             switch (alt149) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7043:5: this_StateTerminal_0= ruleStateTerminal
+                    // InternalRoom.g:7045:5: this_StateTerminal_0= ruleStateTerminal
                     {
                      
                             newCompositeNode(grammarAccess.getTransitionTerminalAccess().getStateTerminalParserRuleCall_0()); 
                         
-                    pushFollow(FOLLOW_ruleStateTerminal_in_ruleTransitionTerminal14424);
+                    pushFollow(FOLLOW_2);
                     this_StateTerminal_0=ruleStateTerminal();
 
                     state._fsp--;
@@ -17459,12 +17459,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7053:5: this_TrPointTerminal_1= ruleTrPointTerminal
+                    // InternalRoom.g:7055:5: this_TrPointTerminal_1= ruleTrPointTerminal
                     {
                      
                             newCompositeNode(grammarAccess.getTransitionTerminalAccess().getTrPointTerminalParserRuleCall_1()); 
                         
-                    pushFollow(FOLLOW_ruleTrPointTerminal_in_ruleTransitionTerminal14451);
+                    pushFollow(FOLLOW_2);
                     this_TrPointTerminal_1=ruleTrPointTerminal();
 
                     state._fsp--;
@@ -17477,12 +17477,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7063:5: this_SubStateTrPointTerminal_2= ruleSubStateTrPointTerminal
+                    // InternalRoom.g:7065:5: this_SubStateTrPointTerminal_2= ruleSubStateTrPointTerminal
                     {
                      
                             newCompositeNode(grammarAccess.getTransitionTerminalAccess().getSubStateTrPointTerminalParserRuleCall_2()); 
                         
-                    pushFollow(FOLLOW_ruleSubStateTrPointTerminal_in_ruleTransitionTerminal14478);
+                    pushFollow(FOLLOW_2);
                     this_SubStateTrPointTerminal_2=ruleSubStateTrPointTerminal();
 
                     state._fsp--;
@@ -17495,12 +17495,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 4 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7073:5: this_ChoicepointTerminal_3= ruleChoicepointTerminal
+                    // InternalRoom.g:7075:5: this_ChoicepointTerminal_3= ruleChoicepointTerminal
                     {
                      
                             newCompositeNode(grammarAccess.getTransitionTerminalAccess().getChoicepointTerminalParserRuleCall_3()); 
                         
-                    pushFollow(FOLLOW_ruleChoicepointTerminal_in_ruleTransitionTerminal14505);
+                    pushFollow(FOLLOW_2);
                     this_ChoicepointTerminal_3=ruleChoicepointTerminal();
 
                     state._fsp--;
@@ -17533,7 +17533,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleStateTerminal"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7089:1: entryRuleStateTerminal returns [EObject current=null] : iv_ruleStateTerminal= ruleStateTerminal EOF ;
+    // InternalRoom.g:7091:1: entryRuleStateTerminal returns [EObject current=null] : iv_ruleStateTerminal= ruleStateTerminal EOF ;
     public final EObject entryRuleStateTerminal() throws RecognitionException {
         EObject current = null;
 
@@ -17541,17 +17541,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7090:2: (iv_ruleStateTerminal= ruleStateTerminal EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7091:2: iv_ruleStateTerminal= ruleStateTerminal EOF
+            // InternalRoom.g:7092:2: (iv_ruleStateTerminal= ruleStateTerminal EOF )
+            // InternalRoom.g:7093:2: iv_ruleStateTerminal= ruleStateTerminal EOF
             {
              newCompositeNode(grammarAccess.getStateTerminalRule()); 
-            pushFollow(FOLLOW_ruleStateTerminal_in_entryRuleStateTerminal14540);
+            pushFollow(FOLLOW_1);
             iv_ruleStateTerminal=ruleStateTerminal();
 
             state._fsp--;
 
              current =iv_ruleStateTerminal; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleStateTerminal14550); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -17569,7 +17569,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleStateTerminal"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7098:1: ruleStateTerminal returns [EObject current=null] : ( (otherlv_0= RULE_ID ) ) ;
+    // InternalRoom.g:7100:1: ruleStateTerminal returns [EObject current=null] : ( (otherlv_0= RULE_ID ) ) ;
     public final EObject ruleStateTerminal() throws RecognitionException {
         EObject current = null;
 
@@ -17578,21 +17578,21 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7101:28: ( ( (otherlv_0= RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7102:1: ( (otherlv_0= RULE_ID ) )
+            // InternalRoom.g:7103:28: ( ( (otherlv_0= RULE_ID ) ) )
+            // InternalRoom.g:7104:1: ( (otherlv_0= RULE_ID ) )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7102:1: ( (otherlv_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7103:1: (otherlv_0= RULE_ID )
+            // InternalRoom.g:7104:1: ( (otherlv_0= RULE_ID ) )
+            // InternalRoom.g:7105:1: (otherlv_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7103:1: (otherlv_0= RULE_ID )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7104:3: otherlv_0= RULE_ID
+            // InternalRoom.g:7105:1: (otherlv_0= RULE_ID )
+            // InternalRoom.g:7106:3: otherlv_0= RULE_ID
             {
 
             			if (current==null) {
             	            current = createModelElement(grammarAccess.getStateTerminalRule());
             	        }
                     
-            otherlv_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleStateTerminal14594); 
+            otherlv_0=(Token)match(input,RULE_ID,FOLLOW_2); 
 
             		newLeafNode(otherlv_0, grammarAccess.getStateTerminalAccess().getStateStateCrossReference_0()); 
             	
@@ -17620,7 +17620,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTrPointTerminal"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7123:1: entryRuleTrPointTerminal returns [EObject current=null] : iv_ruleTrPointTerminal= ruleTrPointTerminal EOF ;
+    // InternalRoom.g:7125:1: entryRuleTrPointTerminal returns [EObject current=null] : iv_ruleTrPointTerminal= ruleTrPointTerminal EOF ;
     public final EObject entryRuleTrPointTerminal() throws RecognitionException {
         EObject current = null;
 
@@ -17628,17 +17628,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7124:2: (iv_ruleTrPointTerminal= ruleTrPointTerminal EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7125:2: iv_ruleTrPointTerminal= ruleTrPointTerminal EOF
+            // InternalRoom.g:7126:2: (iv_ruleTrPointTerminal= ruleTrPointTerminal EOF )
+            // InternalRoom.g:7127:2: iv_ruleTrPointTerminal= ruleTrPointTerminal EOF
             {
              newCompositeNode(grammarAccess.getTrPointTerminalRule()); 
-            pushFollow(FOLLOW_ruleTrPointTerminal_in_entryRuleTrPointTerminal14629);
+            pushFollow(FOLLOW_1);
             iv_ruleTrPointTerminal=ruleTrPointTerminal();
 
             state._fsp--;
 
              current =iv_ruleTrPointTerminal; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleTrPointTerminal14639); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -17656,7 +17656,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTrPointTerminal"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7132:1: ruleTrPointTerminal returns [EObject current=null] : (otherlv_0= 'my' ( (otherlv_1= RULE_ID ) ) ) ;
+    // InternalRoom.g:7134:1: ruleTrPointTerminal returns [EObject current=null] : (otherlv_0= 'my' ( (otherlv_1= RULE_ID ) ) ) ;
     public final EObject ruleTrPointTerminal() throws RecognitionException {
         EObject current = null;
 
@@ -17666,28 +17666,28 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7135:28: ( (otherlv_0= 'my' ( (otherlv_1= RULE_ID ) ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7136:1: (otherlv_0= 'my' ( (otherlv_1= RULE_ID ) ) )
+            // InternalRoom.g:7137:28: ( (otherlv_0= 'my' ( (otherlv_1= RULE_ID ) ) ) )
+            // InternalRoom.g:7138:1: (otherlv_0= 'my' ( (otherlv_1= RULE_ID ) ) )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7136:1: (otherlv_0= 'my' ( (otherlv_1= RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7136:3: otherlv_0= 'my' ( (otherlv_1= RULE_ID ) )
+            // InternalRoom.g:7138:1: (otherlv_0= 'my' ( (otherlv_1= RULE_ID ) ) )
+            // InternalRoom.g:7138:3: otherlv_0= 'my' ( (otherlv_1= RULE_ID ) )
             {
-            otherlv_0=(Token)match(input,99,FOLLOW_99_in_ruleTrPointTerminal14676); 
+            otherlv_0=(Token)match(input,99,FOLLOW_3); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getTrPointTerminalAccess().getMyKeyword_0());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7140:1: ( (otherlv_1= RULE_ID ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7141:1: (otherlv_1= RULE_ID )
+            // InternalRoom.g:7142:1: ( (otherlv_1= RULE_ID ) )
+            // InternalRoom.g:7143:1: (otherlv_1= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7141:1: (otherlv_1= RULE_ID )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7142:3: otherlv_1= RULE_ID
+            // InternalRoom.g:7143:1: (otherlv_1= RULE_ID )
+            // InternalRoom.g:7144:3: otherlv_1= RULE_ID
             {
 
             			if (current==null) {
             	            current = createModelElement(grammarAccess.getTrPointTerminalRule());
             	        }
                     
-            otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleTrPointTerminal14696); 
+            otherlv_1=(Token)match(input,RULE_ID,FOLLOW_2); 
 
             		newLeafNode(otherlv_1, grammarAccess.getTrPointTerminalAccess().getTrPointTrPointCrossReference_1_0()); 
             	
@@ -17718,7 +17718,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleSubStateTrPointTerminal"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7161:1: entryRuleSubStateTrPointTerminal returns [EObject current=null] : iv_ruleSubStateTrPointTerminal= ruleSubStateTrPointTerminal EOF ;
+    // InternalRoom.g:7163:1: entryRuleSubStateTrPointTerminal returns [EObject current=null] : iv_ruleSubStateTrPointTerminal= ruleSubStateTrPointTerminal EOF ;
     public final EObject entryRuleSubStateTrPointTerminal() throws RecognitionException {
         EObject current = null;
 
@@ -17726,17 +17726,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7162:2: (iv_ruleSubStateTrPointTerminal= ruleSubStateTrPointTerminal EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7163:2: iv_ruleSubStateTrPointTerminal= ruleSubStateTrPointTerminal EOF
+            // InternalRoom.g:7164:2: (iv_ruleSubStateTrPointTerminal= ruleSubStateTrPointTerminal EOF )
+            // InternalRoom.g:7165:2: iv_ruleSubStateTrPointTerminal= ruleSubStateTrPointTerminal EOF
             {
              newCompositeNode(grammarAccess.getSubStateTrPointTerminalRule()); 
-            pushFollow(FOLLOW_ruleSubStateTrPointTerminal_in_entryRuleSubStateTrPointTerminal14732);
+            pushFollow(FOLLOW_1);
             iv_ruleSubStateTrPointTerminal=ruleSubStateTrPointTerminal();
 
             state._fsp--;
 
              current =iv_ruleSubStateTrPointTerminal; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSubStateTrPointTerminal14742); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -17754,7 +17754,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleSubStateTrPointTerminal"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7170:1: ruleSubStateTrPointTerminal returns [EObject current=null] : ( ( (otherlv_0= RULE_ID ) ) otherlv_1= 'of' ( (otherlv_2= RULE_ID ) ) ) ;
+    // InternalRoom.g:7172: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;
 
@@ -17765,24 +17765,24 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7173:28: ( ( ( (otherlv_0= RULE_ID ) ) otherlv_1= 'of' ( (otherlv_2= RULE_ID ) ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7174:1: ( ( (otherlv_0= RULE_ID ) ) otherlv_1= 'of' ( (otherlv_2= RULE_ID ) ) )
+            // InternalRoom.g:7175:28: ( ( ( (otherlv_0= RULE_ID ) ) otherlv_1= 'of' ( (otherlv_2= RULE_ID ) ) ) )
+            // InternalRoom.g:7176:1: ( ( (otherlv_0= RULE_ID ) ) otherlv_1= 'of' ( (otherlv_2= RULE_ID ) ) )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7174:1: ( ( (otherlv_0= RULE_ID ) ) otherlv_1= 'of' ( (otherlv_2= RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7174:2: ( (otherlv_0= RULE_ID ) ) otherlv_1= 'of' ( (otherlv_2= RULE_ID ) )
+            // InternalRoom.g:7176:1: ( ( (otherlv_0= RULE_ID ) ) otherlv_1= 'of' ( (otherlv_2= RULE_ID ) ) )
+            // InternalRoom.g:7176:2: ( (otherlv_0= RULE_ID ) ) otherlv_1= 'of' ( (otherlv_2= RULE_ID ) )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7174:2: ( (otherlv_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7175:1: (otherlv_0= RULE_ID )
+            // InternalRoom.g:7176:2: ( (otherlv_0= RULE_ID ) )
+            // InternalRoom.g:7177:1: (otherlv_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7175:1: (otherlv_0= RULE_ID )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7176:3: otherlv_0= RULE_ID
+            // InternalRoom.g:7177:1: (otherlv_0= RULE_ID )
+            // InternalRoom.g:7178:3: otherlv_0= RULE_ID
             {
 
             			if (current==null) {
             	            current = createModelElement(grammarAccess.getSubStateTrPointTerminalRule());
             	        }
                     
-            otherlv_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleSubStateTrPointTerminal14787); 
+            otherlv_0=(Token)match(input,RULE_ID,FOLLOW_73); 
 
             		newLeafNode(otherlv_0, grammarAccess.getSubStateTrPointTerminalAccess().getTrPointTrPointCrossReference_0_0()); 
             	
@@ -17792,22 +17792,22 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,23,FOLLOW_23_in_ruleSubStateTrPointTerminal14799); 
+            otherlv_1=(Token)match(input,23,FOLLOW_3); 
 
                 	newLeafNode(otherlv_1, grammarAccess.getSubStateTrPointTerminalAccess().getOfKeyword_1());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7191:1: ( (otherlv_2= RULE_ID ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7192:1: (otherlv_2= RULE_ID )
+            // InternalRoom.g:7193:1: ( (otherlv_2= RULE_ID ) )
+            // InternalRoom.g:7194:1: (otherlv_2= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7192:1: (otherlv_2= RULE_ID )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7193:3: otherlv_2= RULE_ID
+            // InternalRoom.g:7194:1: (otherlv_2= RULE_ID )
+            // InternalRoom.g:7195:3: otherlv_2= RULE_ID
             {
 
             			if (current==null) {
             	            current = createModelElement(grammarAccess.getSubStateTrPointTerminalRule());
             	        }
                     
-            otherlv_2=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleSubStateTrPointTerminal14819); 
+            otherlv_2=(Token)match(input,RULE_ID,FOLLOW_2); 
 
             		newLeafNode(otherlv_2, grammarAccess.getSubStateTrPointTerminalAccess().getStateStateCrossReference_2_0()); 
             	
@@ -17838,7 +17838,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleChoicepointTerminal"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7212:1: entryRuleChoicepointTerminal returns [EObject current=null] : iv_ruleChoicepointTerminal= ruleChoicepointTerminal EOF ;
+    // InternalRoom.g:7214:1: entryRuleChoicepointTerminal returns [EObject current=null] : iv_ruleChoicepointTerminal= ruleChoicepointTerminal EOF ;
     public final EObject entryRuleChoicepointTerminal() throws RecognitionException {
         EObject current = null;
 
@@ -17846,17 +17846,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7213:2: (iv_ruleChoicepointTerminal= ruleChoicepointTerminal EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7214:2: iv_ruleChoicepointTerminal= ruleChoicepointTerminal EOF
+            // InternalRoom.g:7215:2: (iv_ruleChoicepointTerminal= ruleChoicepointTerminal EOF )
+            // InternalRoom.g:7216:2: iv_ruleChoicepointTerminal= ruleChoicepointTerminal EOF
             {
              newCompositeNode(grammarAccess.getChoicepointTerminalRule()); 
-            pushFollow(FOLLOW_ruleChoicepointTerminal_in_entryRuleChoicepointTerminal14855);
+            pushFollow(FOLLOW_1);
             iv_ruleChoicepointTerminal=ruleChoicepointTerminal();
 
             state._fsp--;
 
              current =iv_ruleChoicepointTerminal; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleChoicepointTerminal14865); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -17874,7 +17874,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleChoicepointTerminal"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7221:1: ruleChoicepointTerminal returns [EObject current=null] : (otherlv_0= 'cp' ( (otherlv_1= RULE_ID ) ) ) ;
+    // InternalRoom.g:7223:1: ruleChoicepointTerminal returns [EObject current=null] : (otherlv_0= 'cp' ( (otherlv_1= RULE_ID ) ) ) ;
     public final EObject ruleChoicepointTerminal() throws RecognitionException {
         EObject current = null;
 
@@ -17884,28 +17884,28 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7224:28: ( (otherlv_0= 'cp' ( (otherlv_1= RULE_ID ) ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7225:1: (otherlv_0= 'cp' ( (otherlv_1= RULE_ID ) ) )
+            // InternalRoom.g:7226:28: ( (otherlv_0= 'cp' ( (otherlv_1= RULE_ID ) ) ) )
+            // InternalRoom.g:7227:1: (otherlv_0= 'cp' ( (otherlv_1= RULE_ID ) ) )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7225:1: (otherlv_0= 'cp' ( (otherlv_1= RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7225:3: otherlv_0= 'cp' ( (otherlv_1= RULE_ID ) )
+            // InternalRoom.g:7227:1: (otherlv_0= 'cp' ( (otherlv_1= RULE_ID ) ) )
+            // InternalRoom.g:7227:3: otherlv_0= 'cp' ( (otherlv_1= RULE_ID ) )
             {
-            otherlv_0=(Token)match(input,100,FOLLOW_100_in_ruleChoicepointTerminal14902); 
+            otherlv_0=(Token)match(input,100,FOLLOW_3); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getChoicepointTerminalAccess().getCpKeyword_0());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7229:1: ( (otherlv_1= RULE_ID ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7230:1: (otherlv_1= RULE_ID )
+            // InternalRoom.g:7231:1: ( (otherlv_1= RULE_ID ) )
+            // InternalRoom.g:7232:1: (otherlv_1= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7230:1: (otherlv_1= RULE_ID )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7231:3: otherlv_1= RULE_ID
+            // InternalRoom.g:7232:1: (otherlv_1= RULE_ID )
+            // InternalRoom.g:7233:3: otherlv_1= RULE_ID
             {
 
             			if (current==null) {
             	            current = createModelElement(grammarAccess.getChoicepointTerminalRule());
             	        }
                     
-            otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleChoicepointTerminal14922); 
+            otherlv_1=(Token)match(input,RULE_ID,FOLLOW_2); 
 
             		newLeafNode(otherlv_1, grammarAccess.getChoicepointTerminalAccess().getCpChoicePointCrossReference_1_0()); 
             	
@@ -17936,7 +17936,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTrigger"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7250:1: entryRuleTrigger returns [EObject current=null] : iv_ruleTrigger= ruleTrigger EOF ;
+    // InternalRoom.g:7252:1: entryRuleTrigger returns [EObject current=null] : iv_ruleTrigger= ruleTrigger EOF ;
     public final EObject entryRuleTrigger() throws RecognitionException {
         EObject current = null;
 
@@ -17944,17 +17944,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7251:2: (iv_ruleTrigger= ruleTrigger EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7252:2: iv_ruleTrigger= ruleTrigger EOF
+            // InternalRoom.g:7253:2: (iv_ruleTrigger= ruleTrigger EOF )
+            // InternalRoom.g:7254:2: iv_ruleTrigger= ruleTrigger EOF
             {
              newCompositeNode(grammarAccess.getTriggerRule()); 
-            pushFollow(FOLLOW_ruleTrigger_in_entryRuleTrigger14958);
+            pushFollow(FOLLOW_1);
             iv_ruleTrigger=ruleTrigger();
 
             state._fsp--;
 
              current =iv_ruleTrigger; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleTrigger14968); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -17972,7 +17972,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTrigger"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7259: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= '>' ) ;
+    // InternalRoom.g:7261: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;
 
@@ -17989,26 +17989,26 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7262: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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7263:1: (otherlv_0= '<' ( (lv_msgFromIfPairs_1_0= ruleMessageFromIf ) ) (otherlv_2= '|' ( (lv_msgFromIfPairs_3_0= ruleMessageFromIf ) ) )* ( (lv_guard_4_0= ruleGuard ) )? otherlv_5= '>' )
+            // InternalRoom.g:7264:28: ( (otherlv_0= '<' ( (lv_msgFromIfPairs_1_0= ruleMessageFromIf ) ) (otherlv_2= '|' ( (lv_msgFromIfPairs_3_0= ruleMessageFromIf ) ) )* ( (lv_guard_4_0= ruleGuard ) )? otherlv_5= '>' ) )
+            // InternalRoom.g:7265: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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7263: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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7263:3: otherlv_0= '<' ( (lv_msgFromIfPairs_1_0= ruleMessageFromIf ) ) (otherlv_2= '|' ( (lv_msgFromIfPairs_3_0= ruleMessageFromIf ) ) )* ( (lv_guard_4_0= ruleGuard ) )? otherlv_5= '>'
+            // InternalRoom.g:7265:1: (otherlv_0= '<' ( (lv_msgFromIfPairs_1_0= ruleMessageFromIf ) ) (otherlv_2= '|' ( (lv_msgFromIfPairs_3_0= ruleMessageFromIf ) ) )* ( (lv_guard_4_0= ruleGuard ) )? otherlv_5= '>' )
+            // InternalRoom.g:7265: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,101,FOLLOW_101_in_ruleTrigger15005); 
+            otherlv_0=(Token)match(input,101,FOLLOW_3); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getTriggerAccess().getLessThanSignKeyword_0());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7267:1: ( (lv_msgFromIfPairs_1_0= ruleMessageFromIf ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7268:1: (lv_msgFromIfPairs_1_0= ruleMessageFromIf )
+            // InternalRoom.g:7269:1: ( (lv_msgFromIfPairs_1_0= ruleMessageFromIf ) )
+            // InternalRoom.g:7270:1: (lv_msgFromIfPairs_1_0= ruleMessageFromIf )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7268:1: (lv_msgFromIfPairs_1_0= ruleMessageFromIf )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7269:3: lv_msgFromIfPairs_1_0= ruleMessageFromIf
+            // InternalRoom.g:7270:1: (lv_msgFromIfPairs_1_0= ruleMessageFromIf )
+            // InternalRoom.g:7271:3: lv_msgFromIfPairs_1_0= ruleMessageFromIf
             {
              
             	        newCompositeNode(grammarAccess.getTriggerAccess().getMsgFromIfPairsMessageFromIfParserRuleCall_1_0()); 
             	    
-            pushFollow(FOLLOW_ruleMessageFromIf_in_ruleTrigger15026);
+            pushFollow(FOLLOW_109);
             lv_msgFromIfPairs_1_0=ruleMessageFromIf();
 
             state._fsp--;
@@ -18021,7 +18021,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"msgFromIfPairs",
                     		lv_msgFromIfPairs_1_0, 
-                    		"MessageFromIf");
+                    		"org.eclipse.etrice.core.fsm.FSM.MessageFromIf");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -18030,7 +18030,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7285:2: (otherlv_2= '|' ( (lv_msgFromIfPairs_3_0= ruleMessageFromIf ) ) )*
+            // InternalRoom.g:7287:2: (otherlv_2= '|' ( (lv_msgFromIfPairs_3_0= ruleMessageFromIf ) ) )*
             loop150:
             do {
                 int alt150=2;
@@ -18043,22 +18043,22 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                 switch (alt150) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7285:4: otherlv_2= '|' ( (lv_msgFromIfPairs_3_0= ruleMessageFromIf ) )
+            	    // InternalRoom.g:7287:4: otherlv_2= '|' ( (lv_msgFromIfPairs_3_0= ruleMessageFromIf ) )
             	    {
-            	    otherlv_2=(Token)match(input,102,FOLLOW_102_in_ruleTrigger15039); 
+            	    otherlv_2=(Token)match(input,102,FOLLOW_3); 
 
             	        	newLeafNode(otherlv_2, grammarAccess.getTriggerAccess().getVerticalLineKeyword_2_0());
             	        
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7289:1: ( (lv_msgFromIfPairs_3_0= ruleMessageFromIf ) )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7290:1: (lv_msgFromIfPairs_3_0= ruleMessageFromIf )
+            	    // InternalRoom.g:7291:1: ( (lv_msgFromIfPairs_3_0= ruleMessageFromIf ) )
+            	    // InternalRoom.g:7292:1: (lv_msgFromIfPairs_3_0= ruleMessageFromIf )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7290:1: (lv_msgFromIfPairs_3_0= ruleMessageFromIf )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7291:3: lv_msgFromIfPairs_3_0= ruleMessageFromIf
+            	    // InternalRoom.g:7292:1: (lv_msgFromIfPairs_3_0= ruleMessageFromIf )
+            	    // InternalRoom.g:7293:3: lv_msgFromIfPairs_3_0= ruleMessageFromIf
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getTriggerAccess().getMsgFromIfPairsMessageFromIfParserRuleCall_2_1_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleMessageFromIf_in_ruleTrigger15060);
+            	    pushFollow(FOLLOW_109);
             	    lv_msgFromIfPairs_3_0=ruleMessageFromIf();
 
             	    state._fsp--;
@@ -18071,7 +18071,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"msgFromIfPairs",
             	            		lv_msgFromIfPairs_3_0, 
-            	            		"MessageFromIf");
+            	            		"org.eclipse.etrice.core.fsm.FSM.MessageFromIf");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -18089,7 +18089,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                 }
             } while (true);
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7307:4: ( (lv_guard_4_0= ruleGuard ) )?
+            // InternalRoom.g:7309:4: ( (lv_guard_4_0= ruleGuard ) )?
             int alt151=2;
             int LA151_0 = input.LA(1);
 
@@ -18098,15 +18098,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt151) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7308:1: (lv_guard_4_0= ruleGuard )
+                    // InternalRoom.g:7310:1: (lv_guard_4_0= ruleGuard )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7308:1: (lv_guard_4_0= ruleGuard )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7309:3: lv_guard_4_0= ruleGuard
+                    // InternalRoom.g:7310:1: (lv_guard_4_0= ruleGuard )
+                    // InternalRoom.g:7311:3: lv_guard_4_0= ruleGuard
                     {
                      
                     	        newCompositeNode(grammarAccess.getTriggerAccess().getGuardGuardParserRuleCall_3_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleGuard_in_ruleTrigger15083);
+                    pushFollow(FOLLOW_110);
                     lv_guard_4_0=ruleGuard();
 
                     state._fsp--;
@@ -18119,7 +18119,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"guard",
                             		lv_guard_4_0, 
-                            		"Guard");
+                            		"org.eclipse.etrice.core.fsm.FSM.Guard");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -18131,7 +18131,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_5=(Token)match(input,103,FOLLOW_103_in_ruleTrigger15096); 
+            otherlv_5=(Token)match(input,103,FOLLOW_2); 
 
                 	newLeafNode(otherlv_5, grammarAccess.getTriggerAccess().getGreaterThanSignKeyword_4());
                 
@@ -18156,7 +18156,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleMessageFromIf"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7337:1: entryRuleMessageFromIf returns [EObject current=null] : iv_ruleMessageFromIf= ruleMessageFromIf EOF ;
+    // InternalRoom.g:7339:1: entryRuleMessageFromIf returns [EObject current=null] : iv_ruleMessageFromIf= ruleMessageFromIf EOF ;
     public final EObject entryRuleMessageFromIf() throws RecognitionException {
         EObject current = null;
 
@@ -18164,17 +18164,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7338:2: (iv_ruleMessageFromIf= ruleMessageFromIf EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7339:2: iv_ruleMessageFromIf= ruleMessageFromIf EOF
+            // InternalRoom.g:7340:2: (iv_ruleMessageFromIf= ruleMessageFromIf EOF )
+            // InternalRoom.g:7341:2: iv_ruleMessageFromIf= ruleMessageFromIf EOF
             {
              newCompositeNode(grammarAccess.getMessageFromIfRule()); 
-            pushFollow(FOLLOW_ruleMessageFromIf_in_entryRuleMessageFromIf15132);
+            pushFollow(FOLLOW_1);
             iv_ruleMessageFromIf=ruleMessageFromIf();
 
             state._fsp--;
 
              current =iv_ruleMessageFromIf; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleMessageFromIf15142); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -18192,7 +18192,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleMessageFromIf"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7346:1: ruleMessageFromIf returns [EObject current=null] : ( ( (otherlv_0= RULE_ID ) ) otherlv_1= ':' ( (otherlv_2= RULE_ID ) ) ) ;
+    // InternalRoom.g:7348: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;
 
@@ -18203,24 +18203,24 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7349:28: ( ( ( (otherlv_0= RULE_ID ) ) otherlv_1= ':' ( (otherlv_2= RULE_ID ) ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7350:1: ( ( (otherlv_0= RULE_ID ) ) otherlv_1= ':' ( (otherlv_2= RULE_ID ) ) )
+            // InternalRoom.g:7351:28: ( ( ( (otherlv_0= RULE_ID ) ) otherlv_1= ':' ( (otherlv_2= RULE_ID ) ) ) )
+            // InternalRoom.g:7352:1: ( ( (otherlv_0= RULE_ID ) ) otherlv_1= ':' ( (otherlv_2= RULE_ID ) ) )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7350:1: ( ( (otherlv_0= RULE_ID ) ) otherlv_1= ':' ( (otherlv_2= RULE_ID ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7350:2: ( (otherlv_0= RULE_ID ) ) otherlv_1= ':' ( (otherlv_2= RULE_ID ) )
+            // InternalRoom.g:7352:1: ( ( (otherlv_0= RULE_ID ) ) otherlv_1= ':' ( (otherlv_2= RULE_ID ) ) )
+            // InternalRoom.g:7352:2: ( (otherlv_0= RULE_ID ) ) otherlv_1= ':' ( (otherlv_2= RULE_ID ) )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7350:2: ( (otherlv_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7351:1: (otherlv_0= RULE_ID )
+            // InternalRoom.g:7352:2: ( (otherlv_0= RULE_ID ) )
+            // InternalRoom.g:7353:1: (otherlv_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7351:1: (otherlv_0= RULE_ID )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7352:3: otherlv_0= RULE_ID
+            // InternalRoom.g:7353:1: (otherlv_0= RULE_ID )
+            // InternalRoom.g:7354:3: otherlv_0= RULE_ID
             {
 
             			if (current==null) {
             	            current = createModelElement(grammarAccess.getMessageFromIfRule());
             	        }
                     
-            otherlv_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleMessageFromIf15187); 
+            otherlv_0=(Token)match(input,RULE_ID,FOLLOW_8); 
 
             		newLeafNode(otherlv_0, grammarAccess.getMessageFromIfAccess().getMessageEObjectCrossReference_0_0()); 
             	
@@ -18230,22 +18230,22 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,15,FOLLOW_15_in_ruleMessageFromIf15199); 
+            otherlv_1=(Token)match(input,15,FOLLOW_3); 
 
                 	newLeafNode(otherlv_1, grammarAccess.getMessageFromIfAccess().getColonKeyword_1());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7367:1: ( (otherlv_2= RULE_ID ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7368:1: (otherlv_2= RULE_ID )
+            // InternalRoom.g:7369:1: ( (otherlv_2= RULE_ID ) )
+            // InternalRoom.g:7370:1: (otherlv_2= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7368:1: (otherlv_2= RULE_ID )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7369:3: otherlv_2= RULE_ID
+            // InternalRoom.g:7370:1: (otherlv_2= RULE_ID )
+            // InternalRoom.g:7371:3: otherlv_2= RULE_ID
             {
 
             			if (current==null) {
             	            current = createModelElement(grammarAccess.getMessageFromIfRule());
             	        }
                     
-            otherlv_2=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleMessageFromIf15219); 
+            otherlv_2=(Token)match(input,RULE_ID,FOLLOW_2); 
 
             		newLeafNode(otherlv_2, grammarAccess.getMessageFromIfAccess().getFromAbstractInterfaceItemCrossReference_2_0()); 
             	
@@ -18276,7 +18276,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleGuard"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7388:1: entryRuleGuard returns [EObject current=null] : iv_ruleGuard= ruleGuard EOF ;
+    // InternalRoom.g:7390:1: entryRuleGuard returns [EObject current=null] : iv_ruleGuard= ruleGuard EOF ;
     public final EObject entryRuleGuard() throws RecognitionException {
         EObject current = null;
 
@@ -18284,17 +18284,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7389:2: (iv_ruleGuard= ruleGuard EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7390:2: iv_ruleGuard= ruleGuard EOF
+            // InternalRoom.g:7391:2: (iv_ruleGuard= ruleGuard EOF )
+            // InternalRoom.g:7392:2: iv_ruleGuard= ruleGuard EOF
             {
              newCompositeNode(grammarAccess.getGuardRule()); 
-            pushFollow(FOLLOW_ruleGuard_in_entryRuleGuard15255);
+            pushFollow(FOLLOW_1);
             iv_ruleGuard=ruleGuard();
 
             state._fsp--;
 
              current =iv_ruleGuard; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleGuard15265); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -18312,7 +18312,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleGuard"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7397:1: ruleGuard returns [EObject current=null] : (otherlv_0= 'guard' ( (lv_guard_1_0= ruleDetailCode ) ) ) ;
+    // InternalRoom.g:7399:1: ruleGuard returns [EObject current=null] : (otherlv_0= 'guard' ( (lv_guard_1_0= ruleDetailCode ) ) ) ;
     public final EObject ruleGuard() throws RecognitionException {
         EObject current = null;
 
@@ -18323,26 +18323,26 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7400:28: ( (otherlv_0= 'guard' ( (lv_guard_1_0= ruleDetailCode ) ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7401:1: (otherlv_0= 'guard' ( (lv_guard_1_0= ruleDetailCode ) ) )
+            // InternalRoom.g:7402:28: ( (otherlv_0= 'guard' ( (lv_guard_1_0= ruleDetailCode ) ) ) )
+            // InternalRoom.g:7403:1: (otherlv_0= 'guard' ( (lv_guard_1_0= ruleDetailCode ) ) )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7401:1: (otherlv_0= 'guard' ( (lv_guard_1_0= ruleDetailCode ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7401:3: otherlv_0= 'guard' ( (lv_guard_1_0= ruleDetailCode ) )
+            // InternalRoom.g:7403:1: (otherlv_0= 'guard' ( (lv_guard_1_0= ruleDetailCode ) ) )
+            // InternalRoom.g:7403:3: otherlv_0= 'guard' ( (lv_guard_1_0= ruleDetailCode ) )
             {
-            otherlv_0=(Token)match(input,96,FOLLOW_96_in_ruleGuard15302); 
+            otherlv_0=(Token)match(input,96,FOLLOW_5); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getGuardAccess().getGuardKeyword_0());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7405:1: ( (lv_guard_1_0= ruleDetailCode ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7406:1: (lv_guard_1_0= ruleDetailCode )
+            // InternalRoom.g:7407:1: ( (lv_guard_1_0= ruleDetailCode ) )
+            // InternalRoom.g:7408:1: (lv_guard_1_0= ruleDetailCode )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7406:1: (lv_guard_1_0= ruleDetailCode )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7407:3: lv_guard_1_0= ruleDetailCode
+            // InternalRoom.g:7408:1: (lv_guard_1_0= ruleDetailCode )
+            // InternalRoom.g:7409:3: lv_guard_1_0= ruleDetailCode
             {
              
             	        newCompositeNode(grammarAccess.getGuardAccess().getGuardDetailCodeParserRuleCall_1_0()); 
             	    
-            pushFollow(FOLLOW_ruleDetailCode_in_ruleGuard15323);
+            pushFollow(FOLLOW_2);
             lv_guard_1_0=ruleDetailCode();
 
             state._fsp--;
@@ -18355,7 +18355,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"guard",
                     		lv_guard_1_0, 
-                    		"DetailCode");
+                    		"org.eclipse.etrice.core.fsm.FSM.DetailCode");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -18385,7 +18385,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleProtocolSemantics"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7431:1: entryRuleProtocolSemantics returns [EObject current=null] : iv_ruleProtocolSemantics= ruleProtocolSemantics EOF ;
+    // InternalRoom.g:7433:1: entryRuleProtocolSemantics returns [EObject current=null] : iv_ruleProtocolSemantics= ruleProtocolSemantics EOF ;
     public final EObject entryRuleProtocolSemantics() throws RecognitionException {
         EObject current = null;
 
@@ -18393,17 +18393,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7432:2: (iv_ruleProtocolSemantics= ruleProtocolSemantics EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7433:2: iv_ruleProtocolSemantics= ruleProtocolSemantics EOF
+            // InternalRoom.g:7434:2: (iv_ruleProtocolSemantics= ruleProtocolSemantics EOF )
+            // InternalRoom.g:7435:2: iv_ruleProtocolSemantics= ruleProtocolSemantics EOF
             {
              newCompositeNode(grammarAccess.getProtocolSemanticsRule()); 
-            pushFollow(FOLLOW_ruleProtocolSemantics_in_entryRuleProtocolSemantics15359);
+            pushFollow(FOLLOW_1);
             iv_ruleProtocolSemantics=ruleProtocolSemantics();
 
             state._fsp--;
 
              current =iv_ruleProtocolSemantics; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleProtocolSemantics15369); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -18421,7 +18421,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleProtocolSemantics"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7440:1: ruleProtocolSemantics returns [EObject current=null] : ( () otherlv_1= 'semantics' otherlv_2= '{' ( (lv_rules_3_0= ruleSemanticsRule ) )* otherlv_4= '}' ) ;
+    // InternalRoom.g:7442:1: ruleProtocolSemantics returns [EObject current=null] : ( () otherlv_1= 'semantics' otherlv_2= '{' ( (lv_rules_3_0= ruleSemanticsRule ) )* otherlv_4= '}' ) ;
     public final EObject ruleProtocolSemantics() throws RecognitionException {
         EObject current = null;
 
@@ -18434,14 +18434,14 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7443:28: ( ( () otherlv_1= 'semantics' otherlv_2= '{' ( (lv_rules_3_0= ruleSemanticsRule ) )* otherlv_4= '}' ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7444:1: ( () otherlv_1= 'semantics' otherlv_2= '{' ( (lv_rules_3_0= ruleSemanticsRule ) )* otherlv_4= '}' )
+            // InternalRoom.g:7445:28: ( ( () otherlv_1= 'semantics' otherlv_2= '{' ( (lv_rules_3_0= ruleSemanticsRule ) )* otherlv_4= '}' ) )
+            // InternalRoom.g:7446:1: ( () otherlv_1= 'semantics' otherlv_2= '{' ( (lv_rules_3_0= ruleSemanticsRule ) )* otherlv_4= '}' )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7444:1: ( () otherlv_1= 'semantics' otherlv_2= '{' ( (lv_rules_3_0= ruleSemanticsRule ) )* otherlv_4= '}' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7444:2: () otherlv_1= 'semantics' otherlv_2= '{' ( (lv_rules_3_0= ruleSemanticsRule ) )* otherlv_4= '}'
+            // InternalRoom.g:7446:1: ( () otherlv_1= 'semantics' otherlv_2= '{' ( (lv_rules_3_0= ruleSemanticsRule ) )* otherlv_4= '}' )
+            // InternalRoom.g:7446:2: () otherlv_1= 'semantics' otherlv_2= '{' ( (lv_rules_3_0= ruleSemanticsRule ) )* otherlv_4= '}'
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7444:2: ()
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7445:5: 
+            // InternalRoom.g:7446:2: ()
+            // InternalRoom.g:7447:5: 
             {
 
                     current = forceCreateModelElement(
@@ -18451,15 +18451,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,104,FOLLOW_104_in_ruleProtocolSemantics15415); 
+            otherlv_1=(Token)match(input,104,FOLLOW_5); 
 
                 	newLeafNode(otherlv_1, grammarAccess.getProtocolSemanticsAccess().getSemanticsKeyword_1());
                 
-            otherlv_2=(Token)match(input,13,FOLLOW_13_in_ruleProtocolSemantics15427); 
+            otherlv_2=(Token)match(input,13,FOLLOW_111); 
 
                 	newLeafNode(otherlv_2, grammarAccess.getProtocolSemanticsAccess().getLeftCurlyBracketKeyword_2());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7458:1: ( (lv_rules_3_0= ruleSemanticsRule ) )*
+            // InternalRoom.g:7460:1: ( (lv_rules_3_0= ruleSemanticsRule ) )*
             loop152:
             do {
                 int alt152=2;
@@ -18472,15 +18472,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                 switch (alt152) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7459:1: (lv_rules_3_0= ruleSemanticsRule )
+            	    // InternalRoom.g:7461:1: (lv_rules_3_0= ruleSemanticsRule )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7459:1: (lv_rules_3_0= ruleSemanticsRule )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7460:3: lv_rules_3_0= ruleSemanticsRule
+            	    // InternalRoom.g:7461:1: (lv_rules_3_0= ruleSemanticsRule )
+            	    // InternalRoom.g:7462:3: lv_rules_3_0= ruleSemanticsRule
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getProtocolSemanticsAccess().getRulesSemanticsRuleParserRuleCall_3_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleSemanticsRule_in_ruleProtocolSemantics15448);
+            	    pushFollow(FOLLOW_111);
             	    lv_rules_3_0=ruleSemanticsRule();
 
             	    state._fsp--;
@@ -18493,7 +18493,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"rules",
             	            		lv_rules_3_0, 
-            	            		"SemanticsRule");
+            	            		"org.eclipse.etrice.core.fsm.FSM.SemanticsRule");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -18508,7 +18508,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                 }
             } while (true);
 
-            otherlv_4=(Token)match(input,14,FOLLOW_14_in_ruleProtocolSemantics15461); 
+            otherlv_4=(Token)match(input,14,FOLLOW_2); 
 
                 	newLeafNode(otherlv_4, grammarAccess.getProtocolSemanticsAccess().getRightCurlyBracketKeyword_4());
                 
@@ -18533,7 +18533,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleSemanticsRule"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7488:1: entryRuleSemanticsRule returns [EObject current=null] : iv_ruleSemanticsRule= ruleSemanticsRule EOF ;
+    // InternalRoom.g:7490:1: entryRuleSemanticsRule returns [EObject current=null] : iv_ruleSemanticsRule= ruleSemanticsRule EOF ;
     public final EObject entryRuleSemanticsRule() throws RecognitionException {
         EObject current = null;
 
@@ -18541,17 +18541,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7489:2: (iv_ruleSemanticsRule= ruleSemanticsRule EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7490:2: iv_ruleSemanticsRule= ruleSemanticsRule EOF
+            // InternalRoom.g:7491:2: (iv_ruleSemanticsRule= ruleSemanticsRule EOF )
+            // InternalRoom.g:7492:2: iv_ruleSemanticsRule= ruleSemanticsRule EOF
             {
              newCompositeNode(grammarAccess.getSemanticsRuleRule()); 
-            pushFollow(FOLLOW_ruleSemanticsRule_in_entryRuleSemanticsRule15497);
+            pushFollow(FOLLOW_1);
             iv_ruleSemanticsRule=ruleSemanticsRule();
 
             state._fsp--;
 
              current =iv_ruleSemanticsRule; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSemanticsRule15507); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -18569,7 +18569,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleSemanticsRule"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7497:1: ruleSemanticsRule returns [EObject current=null] : (this_InSemanticsRule_0= ruleInSemanticsRule | this_OutSemanticsRule_1= ruleOutSemanticsRule ) ;
+    // InternalRoom.g:7499:1: ruleSemanticsRule returns [EObject current=null] : (this_InSemanticsRule_0= ruleInSemanticsRule | this_OutSemanticsRule_1= ruleOutSemanticsRule ) ;
     public final EObject ruleSemanticsRule() throws RecognitionException {
         EObject current = null;
 
@@ -18581,10 +18581,10 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7500:28: ( (this_InSemanticsRule_0= ruleInSemanticsRule | this_OutSemanticsRule_1= ruleOutSemanticsRule ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7501:1: (this_InSemanticsRule_0= ruleInSemanticsRule | this_OutSemanticsRule_1= ruleOutSemanticsRule )
+            // InternalRoom.g:7502:28: ( (this_InSemanticsRule_0= ruleInSemanticsRule | this_OutSemanticsRule_1= ruleOutSemanticsRule ) )
+            // InternalRoom.g:7503:1: (this_InSemanticsRule_0= ruleInSemanticsRule | this_OutSemanticsRule_1= ruleOutSemanticsRule )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7501:1: (this_InSemanticsRule_0= ruleInSemanticsRule | this_OutSemanticsRule_1= ruleOutSemanticsRule )
+            // InternalRoom.g:7503:1: (this_InSemanticsRule_0= ruleInSemanticsRule | this_OutSemanticsRule_1= ruleOutSemanticsRule )
             int alt153=2;
             int LA153_0 = input.LA(1);
 
@@ -18602,12 +18602,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt153) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7502:5: this_InSemanticsRule_0= ruleInSemanticsRule
+                    // InternalRoom.g:7504:5: this_InSemanticsRule_0= ruleInSemanticsRule
                     {
                      
                             newCompositeNode(grammarAccess.getSemanticsRuleAccess().getInSemanticsRuleParserRuleCall_0()); 
                         
-                    pushFollow(FOLLOW_ruleInSemanticsRule_in_ruleSemanticsRule15554);
+                    pushFollow(FOLLOW_2);
                     this_InSemanticsRule_0=ruleInSemanticsRule();
 
                     state._fsp--;
@@ -18620,12 +18620,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7512:5: this_OutSemanticsRule_1= ruleOutSemanticsRule
+                    // InternalRoom.g:7514:5: this_OutSemanticsRule_1= ruleOutSemanticsRule
                     {
                      
                             newCompositeNode(grammarAccess.getSemanticsRuleAccess().getOutSemanticsRuleParserRuleCall_1()); 
                         
-                    pushFollow(FOLLOW_ruleOutSemanticsRule_in_ruleSemanticsRule15581);
+                    pushFollow(FOLLOW_2);
                     this_OutSemanticsRule_1=ruleOutSemanticsRule();
 
                     state._fsp--;
@@ -18658,7 +18658,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleInSemanticsRule"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7528:1: entryRuleInSemanticsRule returns [EObject current=null] : iv_ruleInSemanticsRule= ruleInSemanticsRule EOF ;
+    // InternalRoom.g:7530:1: entryRuleInSemanticsRule returns [EObject current=null] : iv_ruleInSemanticsRule= ruleInSemanticsRule EOF ;
     public final EObject entryRuleInSemanticsRule() throws RecognitionException {
         EObject current = null;
 
@@ -18666,17 +18666,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7529:2: (iv_ruleInSemanticsRule= ruleInSemanticsRule EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7530:2: iv_ruleInSemanticsRule= ruleInSemanticsRule EOF
+            // InternalRoom.g:7531:2: (iv_ruleInSemanticsRule= ruleInSemanticsRule EOF )
+            // InternalRoom.g:7532:2: iv_ruleInSemanticsRule= ruleInSemanticsRule EOF
             {
              newCompositeNode(grammarAccess.getInSemanticsRuleRule()); 
-            pushFollow(FOLLOW_ruleInSemanticsRule_in_entryRuleInSemanticsRule15616);
+            pushFollow(FOLLOW_1);
             iv_ruleInSemanticsRule=ruleInSemanticsRule();
 
             state._fsp--;
 
              current =iv_ruleInSemanticsRule; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleInSemanticsRule15626); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -18694,7 +18694,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleInSemanticsRule"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7537: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= ')' ) ) )? ) ;
+    // InternalRoom.g:7539: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;
 
@@ -18715,32 +18715,32 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7540: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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7541: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= ')' ) ) )? )
+            // InternalRoom.g:7542: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= ')' ) ) )? ) )
+            // InternalRoom.g:7543: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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7541: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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7541: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= ')' ) ) )?
+            // InternalRoom.g:7543: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= ')' ) ) )? )
+            // InternalRoom.g:7543: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,105,FOLLOW_105_in_ruleInSemanticsRule15663); 
+            otherlv_0=(Token)match(input,105,FOLLOW_8); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getInSemanticsRuleAccess().getInKeyword_0());
                 
-            otherlv_1=(Token)match(input,15,FOLLOW_15_in_ruleInSemanticsRule15675); 
+            otherlv_1=(Token)match(input,15,FOLLOW_3); 
 
                 	newLeafNode(otherlv_1, grammarAccess.getInSemanticsRuleAccess().getColonKeyword_1());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7549:1: ( (otherlv_2= RULE_ID ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7550:1: (otherlv_2= RULE_ID )
+            // InternalRoom.g:7551:1: ( (otherlv_2= RULE_ID ) )
+            // InternalRoom.g:7552:1: (otherlv_2= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7550:1: (otherlv_2= RULE_ID )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7551:3: otherlv_2= RULE_ID
+            // InternalRoom.g:7552:1: (otherlv_2= RULE_ID )
+            // InternalRoom.g:7553:3: otherlv_2= RULE_ID
             {
 
             			if (current==null) {
             	            current = createModelElement(grammarAccess.getInSemanticsRuleRule());
             	        }
                     
-            otherlv_2=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleInSemanticsRule15695); 
+            otherlv_2=(Token)match(input,RULE_ID,FOLLOW_112); 
 
             		newLeafNode(otherlv_2, grammarAccess.getInSemanticsRuleAccess().getMsgEObjectCrossReference_2_0()); 
             	
@@ -18750,7 +18750,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7562:2: (otherlv_3= '->' ( ( (lv_followUps_4_0= ruleSemanticsRule ) ) | (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' ) ) )?
+            // InternalRoom.g:7564: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 alt156=2;
             int LA156_0 = input.LA(1);
 
@@ -18759,13 +18759,13 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt156) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7562:4: otherlv_3= '->' ( ( (lv_followUps_4_0= ruleSemanticsRule ) ) | (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' ) )
+                    // InternalRoom.g:7564: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,18,FOLLOW_18_in_ruleInSemanticsRule15708); 
+                    otherlv_3=(Token)match(input,18,FOLLOW_113); 
 
                         	newLeafNode(otherlv_3, grammarAccess.getInSemanticsRuleAccess().getHyphenMinusGreaterThanSignKeyword_3_0());
                         
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7566:1: ( ( (lv_followUps_4_0= ruleSemanticsRule ) ) | (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' ) )
+                    // InternalRoom.g:7568:1: ( ( (lv_followUps_4_0= ruleSemanticsRule ) ) | (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' ) )
                     int alt155=2;
                     int LA155_0 = input.LA(1);
 
@@ -18783,18 +18783,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     switch (alt155) {
                         case 1 :
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7566:2: ( (lv_followUps_4_0= ruleSemanticsRule ) )
+                            // InternalRoom.g:7568:2: ( (lv_followUps_4_0= ruleSemanticsRule ) )
                             {
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7566:2: ( (lv_followUps_4_0= ruleSemanticsRule ) )
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7567:1: (lv_followUps_4_0= ruleSemanticsRule )
+                            // InternalRoom.g:7568:2: ( (lv_followUps_4_0= ruleSemanticsRule ) )
+                            // InternalRoom.g:7569:1: (lv_followUps_4_0= ruleSemanticsRule )
                             {
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7567:1: (lv_followUps_4_0= ruleSemanticsRule )
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7568:3: lv_followUps_4_0= ruleSemanticsRule
+                            // InternalRoom.g:7569:1: (lv_followUps_4_0= ruleSemanticsRule )
+                            // InternalRoom.g:7570:3: lv_followUps_4_0= ruleSemanticsRule
                             {
                              
                             	        newCompositeNode(grammarAccess.getInSemanticsRuleAccess().getFollowUpsSemanticsRuleParserRuleCall_3_1_0_0()); 
                             	    
-                            pushFollow(FOLLOW_ruleSemanticsRule_in_ruleInSemanticsRule15730);
+                            pushFollow(FOLLOW_2);
                             lv_followUps_4_0=ruleSemanticsRule();
 
                             state._fsp--;
@@ -18807,7 +18807,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                                    			current, 
                                    			"followUps",
                                     		lv_followUps_4_0, 
-                                    		"SemanticsRule");
+                                    		"org.eclipse.etrice.core.fsm.FSM.SemanticsRule");
                             	        afterParserOrEnumRuleCall();
                             	    
 
@@ -18820,25 +18820,25 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                             }
                             break;
                         case 2 :
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7585:6: (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' )
+                            // InternalRoom.g:7587:6: (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' )
                             {
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7585:6: (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' )
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7585:8: otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')'
+                            // InternalRoom.g:7587:6: (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' )
+                            // InternalRoom.g:7587:8: otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')'
                             {
-                            otherlv_5=(Token)match(input,19,FOLLOW_19_in_ruleInSemanticsRule15749); 
+                            otherlv_5=(Token)match(input,19,FOLLOW_114); 
 
                                 	newLeafNode(otherlv_5, grammarAccess.getInSemanticsRuleAccess().getLeftParenthesisKeyword_3_1_1_0());
                                 
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7589:1: ( (lv_followUps_6_0= ruleSemanticsRule ) )
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7590:1: (lv_followUps_6_0= ruleSemanticsRule )
+                            // InternalRoom.g:7591:1: ( (lv_followUps_6_0= ruleSemanticsRule ) )
+                            // InternalRoom.g:7592:1: (lv_followUps_6_0= ruleSemanticsRule )
                             {
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7590:1: (lv_followUps_6_0= ruleSemanticsRule )
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7591:3: lv_followUps_6_0= ruleSemanticsRule
+                            // InternalRoom.g:7592:1: (lv_followUps_6_0= ruleSemanticsRule )
+                            // InternalRoom.g:7593:3: lv_followUps_6_0= ruleSemanticsRule
                             {
                              
                             	        newCompositeNode(grammarAccess.getInSemanticsRuleAccess().getFollowUpsSemanticsRuleParserRuleCall_3_1_1_1_0()); 
                             	    
-                            pushFollow(FOLLOW_ruleSemanticsRule_in_ruleInSemanticsRule15770);
+                            pushFollow(FOLLOW_115);
                             lv_followUps_6_0=ruleSemanticsRule();
 
                             state._fsp--;
@@ -18851,7 +18851,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                                    			current, 
                                    			"followUps",
                                     		lv_followUps_6_0, 
-                                    		"SemanticsRule");
+                                    		"org.eclipse.etrice.core.fsm.FSM.SemanticsRule");
                             	        afterParserOrEnumRuleCall();
                             	    
 
@@ -18860,7 +18860,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                             }
 
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7607:2: (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+
+                            // InternalRoom.g:7609:2: (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+
                             int cnt154=0;
                             loop154:
                             do {
@@ -18874,22 +18874,22 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                                 switch (alt154) {
                             	case 1 :
-                            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7607:4: otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) )
+                            	    // InternalRoom.g:7609:4: otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) )
                             	    {
-                            	    otherlv_7=(Token)match(input,24,FOLLOW_24_in_ruleInSemanticsRule15783); 
+                            	    otherlv_7=(Token)match(input,24,FOLLOW_114); 
 
                             	        	newLeafNode(otherlv_7, grammarAccess.getInSemanticsRuleAccess().getCommaKeyword_3_1_1_2_0());
                             	        
-                            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7611:1: ( (lv_followUps_8_0= ruleSemanticsRule ) )
-                            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7612:1: (lv_followUps_8_0= ruleSemanticsRule )
+                            	    // InternalRoom.g:7613:1: ( (lv_followUps_8_0= ruleSemanticsRule ) )
+                            	    // InternalRoom.g:7614:1: (lv_followUps_8_0= ruleSemanticsRule )
                             	    {
-                            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7612:1: (lv_followUps_8_0= ruleSemanticsRule )
-                            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7613:3: lv_followUps_8_0= ruleSemanticsRule
+                            	    // InternalRoom.g:7614:1: (lv_followUps_8_0= ruleSemanticsRule )
+                            	    // InternalRoom.g:7615:3: lv_followUps_8_0= ruleSemanticsRule
                             	    {
                             	     
                             	    	        newCompositeNode(grammarAccess.getInSemanticsRuleAccess().getFollowUpsSemanticsRuleParserRuleCall_3_1_1_2_1_0()); 
                             	    	    
-                            	    pushFollow(FOLLOW_ruleSemanticsRule_in_ruleInSemanticsRule15804);
+                            	    pushFollow(FOLLOW_38);
                             	    lv_followUps_8_0=ruleSemanticsRule();
 
                             	    state._fsp--;
@@ -18902,7 +18902,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                             	           			current, 
                             	           			"followUps",
                             	            		lv_followUps_8_0, 
-                            	            		"SemanticsRule");
+                            	            		"org.eclipse.etrice.core.fsm.FSM.SemanticsRule");
                             	    	        afterParserOrEnumRuleCall();
                             	    	    
 
@@ -18924,7 +18924,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                                 cnt154++;
                             } while (true);
 
-                            otherlv_9=(Token)match(input,20,FOLLOW_20_in_ruleInSemanticsRule15818); 
+                            otherlv_9=(Token)match(input,20,FOLLOW_2); 
 
                                 	newLeafNode(otherlv_9, grammarAccess.getInSemanticsRuleAccess().getRightParenthesisKeyword_3_1_1_3());
                                 
@@ -18964,7 +18964,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleOutSemanticsRule"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7641:1: entryRuleOutSemanticsRule returns [EObject current=null] : iv_ruleOutSemanticsRule= ruleOutSemanticsRule EOF ;
+    // InternalRoom.g:7643:1: entryRuleOutSemanticsRule returns [EObject current=null] : iv_ruleOutSemanticsRule= ruleOutSemanticsRule EOF ;
     public final EObject entryRuleOutSemanticsRule() throws RecognitionException {
         EObject current = null;
 
@@ -18972,17 +18972,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7642:2: (iv_ruleOutSemanticsRule= ruleOutSemanticsRule EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7643:2: iv_ruleOutSemanticsRule= ruleOutSemanticsRule EOF
+            // InternalRoom.g:7644:2: (iv_ruleOutSemanticsRule= ruleOutSemanticsRule EOF )
+            // InternalRoom.g:7645:2: iv_ruleOutSemanticsRule= ruleOutSemanticsRule EOF
             {
              newCompositeNode(grammarAccess.getOutSemanticsRuleRule()); 
-            pushFollow(FOLLOW_ruleOutSemanticsRule_in_entryRuleOutSemanticsRule15858);
+            pushFollow(FOLLOW_1);
             iv_ruleOutSemanticsRule=ruleOutSemanticsRule();
 
             state._fsp--;
 
              current =iv_ruleOutSemanticsRule; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOutSemanticsRule15868); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -19000,7 +19000,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleOutSemanticsRule"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7650: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= ')' ) ) )? ) ;
+    // InternalRoom.g:7652: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;
 
@@ -19021,32 +19021,32 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7653: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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7654: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= ')' ) ) )? )
+            // InternalRoom.g:7655: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= ')' ) ) )? ) )
+            // InternalRoom.g:7656: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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7654: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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7654: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= ')' ) ) )?
+            // InternalRoom.g:7656: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= ')' ) ) )? )
+            // InternalRoom.g:7656: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,106,FOLLOW_106_in_ruleOutSemanticsRule15905); 
+            otherlv_0=(Token)match(input,106,FOLLOW_8); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getOutSemanticsRuleAccess().getOutKeyword_0());
                 
-            otherlv_1=(Token)match(input,15,FOLLOW_15_in_ruleOutSemanticsRule15917); 
+            otherlv_1=(Token)match(input,15,FOLLOW_3); 
 
                 	newLeafNode(otherlv_1, grammarAccess.getOutSemanticsRuleAccess().getColonKeyword_1());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7662:1: ( (otherlv_2= RULE_ID ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7663:1: (otherlv_2= RULE_ID )
+            // InternalRoom.g:7664:1: ( (otherlv_2= RULE_ID ) )
+            // InternalRoom.g:7665:1: (otherlv_2= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7663:1: (otherlv_2= RULE_ID )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7664:3: otherlv_2= RULE_ID
+            // InternalRoom.g:7665:1: (otherlv_2= RULE_ID )
+            // InternalRoom.g:7666:3: otherlv_2= RULE_ID
             {
 
             			if (current==null) {
             	            current = createModelElement(grammarAccess.getOutSemanticsRuleRule());
             	        }
                     
-            otherlv_2=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleOutSemanticsRule15937); 
+            otherlv_2=(Token)match(input,RULE_ID,FOLLOW_112); 
 
             		newLeafNode(otherlv_2, grammarAccess.getOutSemanticsRuleAccess().getMsgEObjectCrossReference_2_0()); 
             	
@@ -19056,7 +19056,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7675:2: (otherlv_3= '->' ( ( (lv_followUps_4_0= ruleSemanticsRule ) ) | (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' ) ) )?
+            // InternalRoom.g:7677: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 alt159=2;
             int LA159_0 = input.LA(1);
 
@@ -19065,13 +19065,13 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt159) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7675:4: otherlv_3= '->' ( ( (lv_followUps_4_0= ruleSemanticsRule ) ) | (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' ) )
+                    // InternalRoom.g:7677: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,18,FOLLOW_18_in_ruleOutSemanticsRule15950); 
+                    otherlv_3=(Token)match(input,18,FOLLOW_113); 
 
                         	newLeafNode(otherlv_3, grammarAccess.getOutSemanticsRuleAccess().getHyphenMinusGreaterThanSignKeyword_3_0());
                         
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7679:1: ( ( (lv_followUps_4_0= ruleSemanticsRule ) ) | (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' ) )
+                    // InternalRoom.g:7681:1: ( ( (lv_followUps_4_0= ruleSemanticsRule ) ) | (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' ) )
                     int alt158=2;
                     int LA158_0 = input.LA(1);
 
@@ -19089,18 +19089,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     switch (alt158) {
                         case 1 :
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7679:2: ( (lv_followUps_4_0= ruleSemanticsRule ) )
+                            // InternalRoom.g:7681:2: ( (lv_followUps_4_0= ruleSemanticsRule ) )
                             {
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7679:2: ( (lv_followUps_4_0= ruleSemanticsRule ) )
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7680:1: (lv_followUps_4_0= ruleSemanticsRule )
+                            // InternalRoom.g:7681:2: ( (lv_followUps_4_0= ruleSemanticsRule ) )
+                            // InternalRoom.g:7682:1: (lv_followUps_4_0= ruleSemanticsRule )
                             {
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7680:1: (lv_followUps_4_0= ruleSemanticsRule )
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7681:3: lv_followUps_4_0= ruleSemanticsRule
+                            // InternalRoom.g:7682:1: (lv_followUps_4_0= ruleSemanticsRule )
+                            // InternalRoom.g:7683:3: lv_followUps_4_0= ruleSemanticsRule
                             {
                              
                             	        newCompositeNode(grammarAccess.getOutSemanticsRuleAccess().getFollowUpsSemanticsRuleParserRuleCall_3_1_0_0()); 
                             	    
-                            pushFollow(FOLLOW_ruleSemanticsRule_in_ruleOutSemanticsRule15972);
+                            pushFollow(FOLLOW_2);
                             lv_followUps_4_0=ruleSemanticsRule();
 
                             state._fsp--;
@@ -19113,7 +19113,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                                    			current, 
                                    			"followUps",
                                     		lv_followUps_4_0, 
-                                    		"SemanticsRule");
+                                    		"org.eclipse.etrice.core.fsm.FSM.SemanticsRule");
                             	        afterParserOrEnumRuleCall();
                             	    
 
@@ -19126,25 +19126,25 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                             }
                             break;
                         case 2 :
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7698:6: (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' )
+                            // InternalRoom.g:7700:6: (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' )
                             {
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7698:6: (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' )
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7698:8: otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')'
+                            // InternalRoom.g:7700:6: (otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')' )
+                            // InternalRoom.g:7700:8: otherlv_5= '(' ( (lv_followUps_6_0= ruleSemanticsRule ) ) (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+ otherlv_9= ')'
                             {
-                            otherlv_5=(Token)match(input,19,FOLLOW_19_in_ruleOutSemanticsRule15991); 
+                            otherlv_5=(Token)match(input,19,FOLLOW_114); 
 
                                 	newLeafNode(otherlv_5, grammarAccess.getOutSemanticsRuleAccess().getLeftParenthesisKeyword_3_1_1_0());
                                 
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7702:1: ( (lv_followUps_6_0= ruleSemanticsRule ) )
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7703:1: (lv_followUps_6_0= ruleSemanticsRule )
+                            // InternalRoom.g:7704:1: ( (lv_followUps_6_0= ruleSemanticsRule ) )
+                            // InternalRoom.g:7705:1: (lv_followUps_6_0= ruleSemanticsRule )
                             {
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7703:1: (lv_followUps_6_0= ruleSemanticsRule )
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7704:3: lv_followUps_6_0= ruleSemanticsRule
+                            // InternalRoom.g:7705:1: (lv_followUps_6_0= ruleSemanticsRule )
+                            // InternalRoom.g:7706:3: lv_followUps_6_0= ruleSemanticsRule
                             {
                              
                             	        newCompositeNode(grammarAccess.getOutSemanticsRuleAccess().getFollowUpsSemanticsRuleParserRuleCall_3_1_1_1_0()); 
                             	    
-                            pushFollow(FOLLOW_ruleSemanticsRule_in_ruleOutSemanticsRule16012);
+                            pushFollow(FOLLOW_115);
                             lv_followUps_6_0=ruleSemanticsRule();
 
                             state._fsp--;
@@ -19157,7 +19157,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                                    			current, 
                                    			"followUps",
                                     		lv_followUps_6_0, 
-                                    		"SemanticsRule");
+                                    		"org.eclipse.etrice.core.fsm.FSM.SemanticsRule");
                             	        afterParserOrEnumRuleCall();
                             	    
 
@@ -19166,7 +19166,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                             }
 
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7720:2: (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+
+                            // InternalRoom.g:7722:2: (otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) ) )+
                             int cnt157=0;
                             loop157:
                             do {
@@ -19180,22 +19180,22 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                                 switch (alt157) {
                             	case 1 :
-                            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7720:4: otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) )
+                            	    // InternalRoom.g:7722:4: otherlv_7= ',' ( (lv_followUps_8_0= ruleSemanticsRule ) )
                             	    {
-                            	    otherlv_7=(Token)match(input,24,FOLLOW_24_in_ruleOutSemanticsRule16025); 
+                            	    otherlv_7=(Token)match(input,24,FOLLOW_114); 
 
                             	        	newLeafNode(otherlv_7, grammarAccess.getOutSemanticsRuleAccess().getCommaKeyword_3_1_1_2_0());
                             	        
-                            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7724:1: ( (lv_followUps_8_0= ruleSemanticsRule ) )
-                            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7725:1: (lv_followUps_8_0= ruleSemanticsRule )
+                            	    // InternalRoom.g:7726:1: ( (lv_followUps_8_0= ruleSemanticsRule ) )
+                            	    // InternalRoom.g:7727:1: (lv_followUps_8_0= ruleSemanticsRule )
                             	    {
-                            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7725:1: (lv_followUps_8_0= ruleSemanticsRule )
-                            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7726:3: lv_followUps_8_0= ruleSemanticsRule
+                            	    // InternalRoom.g:7727:1: (lv_followUps_8_0= ruleSemanticsRule )
+                            	    // InternalRoom.g:7728:3: lv_followUps_8_0= ruleSemanticsRule
                             	    {
                             	     
                             	    	        newCompositeNode(grammarAccess.getOutSemanticsRuleAccess().getFollowUpsSemanticsRuleParserRuleCall_3_1_1_2_1_0()); 
                             	    	    
-                            	    pushFollow(FOLLOW_ruleSemanticsRule_in_ruleOutSemanticsRule16046);
+                            	    pushFollow(FOLLOW_38);
                             	    lv_followUps_8_0=ruleSemanticsRule();
 
                             	    state._fsp--;
@@ -19208,7 +19208,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                             	           			current, 
                             	           			"followUps",
                             	            		lv_followUps_8_0, 
-                            	            		"SemanticsRule");
+                            	            		"org.eclipse.etrice.core.fsm.FSM.SemanticsRule");
                             	    	        afterParserOrEnumRuleCall();
                             	    	    
 
@@ -19230,7 +19230,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                                 cnt157++;
                             } while (true);
 
-                            otherlv_9=(Token)match(input,20,FOLLOW_20_in_ruleOutSemanticsRule16060); 
+                            otherlv_9=(Token)match(input,20,FOLLOW_2); 
 
                                 	newLeafNode(otherlv_9, grammarAccess.getOutSemanticsRuleAccess().getRightParenthesisKeyword_3_1_1_3());
                                 
@@ -19270,7 +19270,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleAnnotation"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7754:1: entryRuleAnnotation returns [EObject current=null] : iv_ruleAnnotation= ruleAnnotation EOF ;
+    // InternalRoom.g:7756:1: entryRuleAnnotation returns [EObject current=null] : iv_ruleAnnotation= ruleAnnotation EOF ;
     public final EObject entryRuleAnnotation() throws RecognitionException {
         EObject current = null;
 
@@ -19278,17 +19278,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7755:2: (iv_ruleAnnotation= ruleAnnotation EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7756:2: iv_ruleAnnotation= ruleAnnotation EOF
+            // InternalRoom.g:7757:2: (iv_ruleAnnotation= ruleAnnotation EOF )
+            // InternalRoom.g:7758:2: iv_ruleAnnotation= ruleAnnotation EOF
             {
              newCompositeNode(grammarAccess.getAnnotationRule()); 
-            pushFollow(FOLLOW_ruleAnnotation_in_entryRuleAnnotation16100);
+            pushFollow(FOLLOW_1);
             iv_ruleAnnotation=ruleAnnotation();
 
             state._fsp--;
 
              current =iv_ruleAnnotation; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAnnotation16110); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -19306,7 +19306,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleAnnotation"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7763:1: ruleAnnotation returns [EObject current=null] : (otherlv_0= '@' ( ( ruleFQN ) ) (otherlv_2= '(' ( (lv_attributes_3_0= ruleKeyValue ) ) (otherlv_4= ',' ( (lv_attributes_5_0= ruleKeyValue ) ) )* otherlv_6= ')' )? ) ;
+    // InternalRoom.g:7765:1: ruleAnnotation returns [EObject current=null] : (otherlv_0= '@' ( ( ruleFQN ) ) (otherlv_2= '(' ( (lv_attributes_3_0= ruleKeyValue ) ) (otherlv_4= ',' ( (lv_attributes_5_0= ruleKeyValue ) ) )* otherlv_6= ')' )? ) ;
     public final EObject ruleAnnotation() throws RecognitionException {
         EObject current = null;
 
@@ -19322,21 +19322,21 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7766:28: ( (otherlv_0= '@' ( ( ruleFQN ) ) (otherlv_2= '(' ( (lv_attributes_3_0= ruleKeyValue ) ) (otherlv_4= ',' ( (lv_attributes_5_0= ruleKeyValue ) ) )* otherlv_6= ')' )? ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7767:1: (otherlv_0= '@' ( ( ruleFQN ) ) (otherlv_2= '(' ( (lv_attributes_3_0= ruleKeyValue ) ) (otherlv_4= ',' ( (lv_attributes_5_0= ruleKeyValue ) ) )* otherlv_6= ')' )? )
+            // InternalRoom.g:7768:28: ( (otherlv_0= '@' ( ( ruleFQN ) ) (otherlv_2= '(' ( (lv_attributes_3_0= ruleKeyValue ) ) (otherlv_4= ',' ( (lv_attributes_5_0= ruleKeyValue ) ) )* otherlv_6= ')' )? ) )
+            // InternalRoom.g:7769:1: (otherlv_0= '@' ( ( ruleFQN ) ) (otherlv_2= '(' ( (lv_attributes_3_0= ruleKeyValue ) ) (otherlv_4= ',' ( (lv_attributes_5_0= ruleKeyValue ) ) )* otherlv_6= ')' )? )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7767:1: (otherlv_0= '@' ( ( ruleFQN ) ) (otherlv_2= '(' ( (lv_attributes_3_0= ruleKeyValue ) ) (otherlv_4= ',' ( (lv_attributes_5_0= ruleKeyValue ) ) )* otherlv_6= ')' )? )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7767:3: otherlv_0= '@' ( ( ruleFQN ) ) (otherlv_2= '(' ( (lv_attributes_3_0= ruleKeyValue ) ) (otherlv_4= ',' ( (lv_attributes_5_0= ruleKeyValue ) ) )* otherlv_6= ')' )?
+            // InternalRoom.g:7769:1: (otherlv_0= '@' ( ( ruleFQN ) ) (otherlv_2= '(' ( (lv_attributes_3_0= ruleKeyValue ) ) (otherlv_4= ',' ( (lv_attributes_5_0= ruleKeyValue ) ) )* otherlv_6= ')' )? )
+            // InternalRoom.g:7769:3: otherlv_0= '@' ( ( ruleFQN ) ) (otherlv_2= '(' ( (lv_attributes_3_0= ruleKeyValue ) ) (otherlv_4= ',' ( (lv_attributes_5_0= ruleKeyValue ) ) )* otherlv_6= ')' )?
             {
-            otherlv_0=(Token)match(input,107,FOLLOW_107_in_ruleAnnotation16147); 
+            otherlv_0=(Token)match(input,107,FOLLOW_3); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getAnnotationAccess().getCommercialAtKeyword_0());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7771:1: ( ( ruleFQN ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7772:1: ( ruleFQN )
+            // InternalRoom.g:7773:1: ( ( ruleFQN ) )
+            // InternalRoom.g:7774:1: ( ruleFQN )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7772:1: ( ruleFQN )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7773:3: ruleFQN
+            // InternalRoom.g:7774:1: ( ruleFQN )
+            // InternalRoom.g:7775:3: ruleFQN
             {
 
             			if (current==null) {
@@ -19346,7 +19346,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
              
             	        newCompositeNode(grammarAccess.getAnnotationAccess().getTypeAnnotationTypeCrossReference_1_0()); 
             	    
-            pushFollow(FOLLOW_ruleFQN_in_ruleAnnotation16170);
+            pushFollow(FOLLOW_116);
             ruleFQN();
 
             state._fsp--;
@@ -19360,7 +19360,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7786:2: (otherlv_2= '(' ( (lv_attributes_3_0= ruleKeyValue ) ) (otherlv_4= ',' ( (lv_attributes_5_0= ruleKeyValue ) ) )* otherlv_6= ')' )?
+            // InternalRoom.g:7788:2: (otherlv_2= '(' ( (lv_attributes_3_0= ruleKeyValue ) ) (otherlv_4= ',' ( (lv_attributes_5_0= ruleKeyValue ) ) )* otherlv_6= ')' )?
             int alt161=2;
             int LA161_0 = input.LA(1);
 
@@ -19369,22 +19369,22 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt161) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7786:4: otherlv_2= '(' ( (lv_attributes_3_0= ruleKeyValue ) ) (otherlv_4= ',' ( (lv_attributes_5_0= ruleKeyValue ) ) )* otherlv_6= ')'
+                    // InternalRoom.g:7788:4: otherlv_2= '(' ( (lv_attributes_3_0= ruleKeyValue ) ) (otherlv_4= ',' ( (lv_attributes_5_0= ruleKeyValue ) ) )* otherlv_6= ')'
                     {
-                    otherlv_2=(Token)match(input,19,FOLLOW_19_in_ruleAnnotation16183); 
+                    otherlv_2=(Token)match(input,19,FOLLOW_3); 
 
                         	newLeafNode(otherlv_2, grammarAccess.getAnnotationAccess().getLeftParenthesisKeyword_2_0());
                         
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7790:1: ( (lv_attributes_3_0= ruleKeyValue ) )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7791:1: (lv_attributes_3_0= ruleKeyValue )
+                    // InternalRoom.g:7792:1: ( (lv_attributes_3_0= ruleKeyValue ) )
+                    // InternalRoom.g:7793:1: (lv_attributes_3_0= ruleKeyValue )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7791:1: (lv_attributes_3_0= ruleKeyValue )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7792:3: lv_attributes_3_0= ruleKeyValue
+                    // InternalRoom.g:7793:1: (lv_attributes_3_0= ruleKeyValue )
+                    // InternalRoom.g:7794:3: lv_attributes_3_0= ruleKeyValue
                     {
                      
                     	        newCompositeNode(grammarAccess.getAnnotationAccess().getAttributesKeyValueParserRuleCall_2_1_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleKeyValue_in_ruleAnnotation16204);
+                    pushFollow(FOLLOW_38);
                     lv_attributes_3_0=ruleKeyValue();
 
                     state._fsp--;
@@ -19397,7 +19397,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"attributes",
                             		lv_attributes_3_0, 
-                            		"KeyValue");
+                            		"org.eclipse.etrice.core.common.Base.KeyValue");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -19406,7 +19406,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7808:2: (otherlv_4= ',' ( (lv_attributes_5_0= ruleKeyValue ) ) )*
+                    // InternalRoom.g:7810:2: (otherlv_4= ',' ( (lv_attributes_5_0= ruleKeyValue ) ) )*
                     loop160:
                     do {
                         int alt160=2;
@@ -19419,22 +19419,22 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                         switch (alt160) {
                     	case 1 :
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7808:4: otherlv_4= ',' ( (lv_attributes_5_0= ruleKeyValue ) )
+                    	    // InternalRoom.g:7810:4: otherlv_4= ',' ( (lv_attributes_5_0= ruleKeyValue ) )
                     	    {
-                    	    otherlv_4=(Token)match(input,24,FOLLOW_24_in_ruleAnnotation16217); 
+                    	    otherlv_4=(Token)match(input,24,FOLLOW_3); 
 
                     	        	newLeafNode(otherlv_4, grammarAccess.getAnnotationAccess().getCommaKeyword_2_2_0());
                     	        
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7812:1: ( (lv_attributes_5_0= ruleKeyValue ) )
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7813:1: (lv_attributes_5_0= ruleKeyValue )
+                    	    // InternalRoom.g:7814:1: ( (lv_attributes_5_0= ruleKeyValue ) )
+                    	    // InternalRoom.g:7815:1: (lv_attributes_5_0= ruleKeyValue )
                     	    {
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7813:1: (lv_attributes_5_0= ruleKeyValue )
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7814:3: lv_attributes_5_0= ruleKeyValue
+                    	    // InternalRoom.g:7815:1: (lv_attributes_5_0= ruleKeyValue )
+                    	    // InternalRoom.g:7816:3: lv_attributes_5_0= ruleKeyValue
                     	    {
                     	     
                     	    	        newCompositeNode(grammarAccess.getAnnotationAccess().getAttributesKeyValueParserRuleCall_2_2_1_0()); 
                     	    	    
-                    	    pushFollow(FOLLOW_ruleKeyValue_in_ruleAnnotation16238);
+                    	    pushFollow(FOLLOW_38);
                     	    lv_attributes_5_0=ruleKeyValue();
 
                     	    state._fsp--;
@@ -19447,7 +19447,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     	           			current, 
                     	           			"attributes",
                     	            		lv_attributes_5_0, 
-                    	            		"KeyValue");
+                    	            		"org.eclipse.etrice.core.common.Base.KeyValue");
                     	    	        afterParserOrEnumRuleCall();
                     	    	    
 
@@ -19465,7 +19465,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                         }
                     } while (true);
 
-                    otherlv_6=(Token)match(input,20,FOLLOW_20_in_ruleAnnotation16252); 
+                    otherlv_6=(Token)match(input,20,FOLLOW_2); 
 
                         	newLeafNode(otherlv_6, grammarAccess.getAnnotationAccess().getRightParenthesisKeyword_2_3());
                         
@@ -19496,7 +19496,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleKeyValue"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7842:1: entryRuleKeyValue returns [EObject current=null] : iv_ruleKeyValue= ruleKeyValue EOF ;
+    // InternalRoom.g:7844:1: entryRuleKeyValue returns [EObject current=null] : iv_ruleKeyValue= ruleKeyValue EOF ;
     public final EObject entryRuleKeyValue() throws RecognitionException {
         EObject current = null;
 
@@ -19504,17 +19504,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7843:2: (iv_ruleKeyValue= ruleKeyValue EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7844:2: iv_ruleKeyValue= ruleKeyValue EOF
+            // InternalRoom.g:7845:2: (iv_ruleKeyValue= ruleKeyValue EOF )
+            // InternalRoom.g:7846:2: iv_ruleKeyValue= ruleKeyValue EOF
             {
              newCompositeNode(grammarAccess.getKeyValueRule()); 
-            pushFollow(FOLLOW_ruleKeyValue_in_entryRuleKeyValue16290);
+            pushFollow(FOLLOW_1);
             iv_ruleKeyValue=ruleKeyValue();
 
             state._fsp--;
 
              current =iv_ruleKeyValue; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleKeyValue16300); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -19532,7 +19532,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleKeyValue"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7851:1: ruleKeyValue returns [EObject current=null] : ( ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) ) ) ;
+    // InternalRoom.g:7853: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;
 
@@ -19544,19 +19544,19 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7854:28: ( ( ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7855:1: ( ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) ) )
+            // InternalRoom.g:7856:28: ( ( ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) ) ) )
+            // InternalRoom.g:7857:1: ( ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) ) )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7855:1: ( ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7855:2: ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) )
+            // InternalRoom.g:7857:1: ( ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) ) )
+            // InternalRoom.g:7857:2: ( (lv_key_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_value_2_0= ruleLiteral ) )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7855:2: ( (lv_key_0_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7856:1: (lv_key_0_0= RULE_ID )
+            // InternalRoom.g:7857:2: ( (lv_key_0_0= RULE_ID ) )
+            // InternalRoom.g:7858:1: (lv_key_0_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7856:1: (lv_key_0_0= RULE_ID )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7857:3: lv_key_0_0= RULE_ID
+            // InternalRoom.g:7858:1: (lv_key_0_0= RULE_ID )
+            // InternalRoom.g:7859:3: lv_key_0_0= RULE_ID
             {
-            lv_key_0_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleKeyValue16342); 
+            lv_key_0_0=(Token)match(input,RULE_ID,FOLLOW_117); 
 
             			newLeafNode(lv_key_0_0, grammarAccess.getKeyValueAccess().getKeyIDTerminalRuleCall_0_0()); 
             		
@@ -19568,7 +19568,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"key",
                     		lv_key_0_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -19576,20 +19576,20 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,25,FOLLOW_25_in_ruleKeyValue16359); 
+            otherlv_1=(Token)match(input,25,FOLLOW_118); 
 
                 	newLeafNode(otherlv_1, grammarAccess.getKeyValueAccess().getEqualsSignKeyword_1());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7877:1: ( (lv_value_2_0= ruleLiteral ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7878:1: (lv_value_2_0= ruleLiteral )
+            // InternalRoom.g:7879:1: ( (lv_value_2_0= ruleLiteral ) )
+            // InternalRoom.g:7880:1: (lv_value_2_0= ruleLiteral )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7878:1: (lv_value_2_0= ruleLiteral )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7879:3: lv_value_2_0= ruleLiteral
+            // InternalRoom.g:7880:1: (lv_value_2_0= ruleLiteral )
+            // InternalRoom.g:7881:3: lv_value_2_0= ruleLiteral
             {
              
             	        newCompositeNode(grammarAccess.getKeyValueAccess().getValueLiteralParserRuleCall_2_0()); 
             	    
-            pushFollow(FOLLOW_ruleLiteral_in_ruleKeyValue16380);
+            pushFollow(FOLLOW_2);
             lv_value_2_0=ruleLiteral();
 
             state._fsp--;
@@ -19602,7 +19602,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"value",
                     		lv_value_2_0, 
-                    		"Literal");
+                    		"org.eclipse.etrice.core.common.Base.Literal");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -19632,7 +19632,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleAnnotationType"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7903:1: entryRuleAnnotationType returns [EObject current=null] : iv_ruleAnnotationType= ruleAnnotationType EOF ;
+    // InternalRoom.g:7905:1: entryRuleAnnotationType returns [EObject current=null] : iv_ruleAnnotationType= ruleAnnotationType EOF ;
     public final EObject entryRuleAnnotationType() throws RecognitionException {
         EObject current = null;
 
@@ -19640,17 +19640,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7904:2: (iv_ruleAnnotationType= ruleAnnotationType EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7905:2: iv_ruleAnnotationType= ruleAnnotationType EOF
+            // InternalRoom.g:7906:2: (iv_ruleAnnotationType= ruleAnnotationType EOF )
+            // InternalRoom.g:7907:2: iv_ruleAnnotationType= ruleAnnotationType EOF
             {
              newCompositeNode(grammarAccess.getAnnotationTypeRule()); 
-            pushFollow(FOLLOW_ruleAnnotationType_in_entryRuleAnnotationType16416);
+            pushFollow(FOLLOW_1);
             iv_ruleAnnotationType=ruleAnnotationType();
 
             state._fsp--;
 
              current =iv_ruleAnnotationType; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAnnotationType16426); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -19668,7 +19668,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleAnnotationType"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7912:1: ruleAnnotationType returns [EObject current=null] : (otherlv_0= 'AnnotationType' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' otherlv_4= 'target' otherlv_5= '=' ( ( (lv_targets_6_0= ruleAnnotationTargetType ) ) | (otherlv_7= '{' ( (lv_targets_8_0= ruleAnnotationTargetType ) ) (otherlv_9= ',' ( (lv_targets_10_0= ruleAnnotationTargetType ) ) )* otherlv_11= '}' ) ) ( (lv_attributes_12_0= ruleAnnotationAttribute ) )* otherlv_13= '}' ) ;
+    // InternalRoom.g:7914:1: ruleAnnotationType returns [EObject current=null] : (otherlv_0= 'AnnotationType' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' otherlv_4= 'target' otherlv_5= '=' ( ( (lv_targets_6_0= ruleAnnotationTargetType ) ) | (otherlv_7= '{' ( (lv_targets_8_0= ruleAnnotationTargetType ) ) (otherlv_9= ',' ( (lv_targets_10_0= ruleAnnotationTargetType ) ) )* otherlv_11= '}' ) ) ( (lv_attributes_12_0= ruleAnnotationAttribute ) )* otherlv_13= '}' ) ;
     public final EObject ruleAnnotationType() throws RecognitionException {
         EObject current = null;
 
@@ -19695,23 +19695,23 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7915:28: ( (otherlv_0= 'AnnotationType' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' otherlv_4= 'target' otherlv_5= '=' ( ( (lv_targets_6_0= ruleAnnotationTargetType ) ) | (otherlv_7= '{' ( (lv_targets_8_0= ruleAnnotationTargetType ) ) (otherlv_9= ',' ( (lv_targets_10_0= ruleAnnotationTargetType ) ) )* otherlv_11= '}' ) ) ( (lv_attributes_12_0= ruleAnnotationAttribute ) )* otherlv_13= '}' ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7916:1: (otherlv_0= 'AnnotationType' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' otherlv_4= 'target' otherlv_5= '=' ( ( (lv_targets_6_0= ruleAnnotationTargetType ) ) | (otherlv_7= '{' ( (lv_targets_8_0= ruleAnnotationTargetType ) ) (otherlv_9= ',' ( (lv_targets_10_0= ruleAnnotationTargetType ) ) )* otherlv_11= '}' ) ) ( (lv_attributes_12_0= ruleAnnotationAttribute ) )* otherlv_13= '}' )
+            // InternalRoom.g:7917:28: ( (otherlv_0= 'AnnotationType' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' otherlv_4= 'target' otherlv_5= '=' ( ( (lv_targets_6_0= ruleAnnotationTargetType ) ) | (otherlv_7= '{' ( (lv_targets_8_0= ruleAnnotationTargetType ) ) (otherlv_9= ',' ( (lv_targets_10_0= ruleAnnotationTargetType ) ) )* otherlv_11= '}' ) ) ( (lv_attributes_12_0= ruleAnnotationAttribute ) )* otherlv_13= '}' ) )
+            // InternalRoom.g:7918:1: (otherlv_0= 'AnnotationType' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' otherlv_4= 'target' otherlv_5= '=' ( ( (lv_targets_6_0= ruleAnnotationTargetType ) ) | (otherlv_7= '{' ( (lv_targets_8_0= ruleAnnotationTargetType ) ) (otherlv_9= ',' ( (lv_targets_10_0= ruleAnnotationTargetType ) ) )* otherlv_11= '}' ) ) ( (lv_attributes_12_0= ruleAnnotationAttribute ) )* otherlv_13= '}' )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7916:1: (otherlv_0= 'AnnotationType' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' otherlv_4= 'target' otherlv_5= '=' ( ( (lv_targets_6_0= ruleAnnotationTargetType ) ) | (otherlv_7= '{' ( (lv_targets_8_0= ruleAnnotationTargetType ) ) (otherlv_9= ',' ( (lv_targets_10_0= ruleAnnotationTargetType ) ) )* otherlv_11= '}' ) ) ( (lv_attributes_12_0= ruleAnnotationAttribute ) )* otherlv_13= '}' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7916:3: otherlv_0= 'AnnotationType' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' otherlv_4= 'target' otherlv_5= '=' ( ( (lv_targets_6_0= ruleAnnotationTargetType ) ) | (otherlv_7= '{' ( (lv_targets_8_0= ruleAnnotationTargetType ) ) (otherlv_9= ',' ( (lv_targets_10_0= ruleAnnotationTargetType ) ) )* otherlv_11= '}' ) ) ( (lv_attributes_12_0= ruleAnnotationAttribute ) )* otherlv_13= '}'
+            // InternalRoom.g:7918:1: (otherlv_0= 'AnnotationType' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' otherlv_4= 'target' otherlv_5= '=' ( ( (lv_targets_6_0= ruleAnnotationTargetType ) ) | (otherlv_7= '{' ( (lv_targets_8_0= ruleAnnotationTargetType ) ) (otherlv_9= ',' ( (lv_targets_10_0= ruleAnnotationTargetType ) ) )* otherlv_11= '}' ) ) ( (lv_attributes_12_0= ruleAnnotationAttribute ) )* otherlv_13= '}' )
+            // InternalRoom.g:7918:3: otherlv_0= 'AnnotationType' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? otherlv_3= '{' otherlv_4= 'target' otherlv_5= '=' ( ( (lv_targets_6_0= ruleAnnotationTargetType ) ) | (otherlv_7= '{' ( (lv_targets_8_0= ruleAnnotationTargetType ) ) (otherlv_9= ',' ( (lv_targets_10_0= ruleAnnotationTargetType ) ) )* otherlv_11= '}' ) ) ( (lv_attributes_12_0= ruleAnnotationAttribute ) )* otherlv_13= '}'
             {
-            otherlv_0=(Token)match(input,108,FOLLOW_108_in_ruleAnnotationType16463); 
+            otherlv_0=(Token)match(input,108,FOLLOW_3); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getAnnotationTypeAccess().getAnnotationTypeKeyword_0());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7920:1: ( (lv_name_1_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7921:1: (lv_name_1_0= RULE_ID )
+            // InternalRoom.g:7922:1: ( (lv_name_1_0= RULE_ID ) )
+            // InternalRoom.g:7923:1: (lv_name_1_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7921:1: (lv_name_1_0= RULE_ID )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7922:3: lv_name_1_0= RULE_ID
+            // InternalRoom.g:7923:1: (lv_name_1_0= RULE_ID )
+            // InternalRoom.g:7924:3: lv_name_1_0= RULE_ID
             {
-            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleAnnotationType16480); 
+            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_4); 
 
             			newLeafNode(lv_name_1_0, grammarAccess.getAnnotationTypeAccess().getNameIDTerminalRuleCall_1_0()); 
             		
@@ -19723,7 +19723,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"name",
                     		lv_name_1_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -19731,7 +19731,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7938:2: ( (lv_docu_2_0= ruleDocumentation ) )?
+            // InternalRoom.g:7940:2: ( (lv_docu_2_0= ruleDocumentation ) )?
             int alt162=2;
             int LA162_0 = input.LA(1);
 
@@ -19740,15 +19740,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt162) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7939:1: (lv_docu_2_0= ruleDocumentation )
+                    // InternalRoom.g:7941:1: (lv_docu_2_0= ruleDocumentation )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7939:1: (lv_docu_2_0= ruleDocumentation )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7940:3: lv_docu_2_0= ruleDocumentation
+                    // InternalRoom.g:7941:1: (lv_docu_2_0= ruleDocumentation )
+                    // InternalRoom.g:7942:3: lv_docu_2_0= ruleDocumentation
                     {
                      
                     	        newCompositeNode(grammarAccess.getAnnotationTypeAccess().getDocuDocumentationParserRuleCall_2_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleDocumentation_in_ruleAnnotationType16506);
+                    pushFollow(FOLLOW_5);
                     lv_docu_2_0=ruleDocumentation();
 
                     state._fsp--;
@@ -19761,7 +19761,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"docu",
                             		lv_docu_2_0, 
-                            		"Documentation");
+                            		"org.eclipse.etrice.core.common.Base.Documentation");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -19773,19 +19773,19 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_3=(Token)match(input,13,FOLLOW_13_in_ruleAnnotationType16519); 
+            otherlv_3=(Token)match(input,13,FOLLOW_119); 
 
                 	newLeafNode(otherlv_3, grammarAccess.getAnnotationTypeAccess().getLeftCurlyBracketKeyword_3());
                 
-            otherlv_4=(Token)match(input,109,FOLLOW_109_in_ruleAnnotationType16531); 
+            otherlv_4=(Token)match(input,109,FOLLOW_117); 
 
                 	newLeafNode(otherlv_4, grammarAccess.getAnnotationTypeAccess().getTargetKeyword_4());
                 
-            otherlv_5=(Token)match(input,25,FOLLOW_25_in_ruleAnnotationType16543); 
+            otherlv_5=(Token)match(input,25,FOLLOW_120); 
 
                 	newLeafNode(otherlv_5, grammarAccess.getAnnotationTypeAccess().getEqualsSignKeyword_5());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7968:1: ( ( (lv_targets_6_0= ruleAnnotationTargetType ) ) | (otherlv_7= '{' ( (lv_targets_8_0= ruleAnnotationTargetType ) ) (otherlv_9= ',' ( (lv_targets_10_0= ruleAnnotationTargetType ) ) )* otherlv_11= '}' ) )
+            // InternalRoom.g:7970:1: ( ( (lv_targets_6_0= ruleAnnotationTargetType ) ) | (otherlv_7= '{' ( (lv_targets_8_0= ruleAnnotationTargetType ) ) (otherlv_9= ',' ( (lv_targets_10_0= ruleAnnotationTargetType ) ) )* otherlv_11= '}' ) )
             int alt164=2;
             int LA164_0 = input.LA(1);
 
@@ -19803,18 +19803,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt164) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7968:2: ( (lv_targets_6_0= ruleAnnotationTargetType ) )
+                    // InternalRoom.g:7970:2: ( (lv_targets_6_0= ruleAnnotationTargetType ) )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7968:2: ( (lv_targets_6_0= ruleAnnotationTargetType ) )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7969:1: (lv_targets_6_0= ruleAnnotationTargetType )
+                    // InternalRoom.g:7970:2: ( (lv_targets_6_0= ruleAnnotationTargetType ) )
+                    // InternalRoom.g:7971:1: (lv_targets_6_0= ruleAnnotationTargetType )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7969:1: (lv_targets_6_0= ruleAnnotationTargetType )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7970:3: lv_targets_6_0= ruleAnnotationTargetType
+                    // InternalRoom.g:7971:1: (lv_targets_6_0= ruleAnnotationTargetType )
+                    // InternalRoom.g:7972:3: lv_targets_6_0= ruleAnnotationTargetType
                     {
                      
                     	        newCompositeNode(grammarAccess.getAnnotationTypeAccess().getTargetsAnnotationTargetTypeParserRuleCall_6_0_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleAnnotationTargetType_in_ruleAnnotationType16565);
+                    pushFollow(FOLLOW_121);
                     lv_targets_6_0=ruleAnnotationTargetType();
 
                     state._fsp--;
@@ -19827,7 +19827,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"targets",
                             		lv_targets_6_0, 
-                            		"AnnotationTargetType");
+                            		"org.eclipse.etrice.core.Room.AnnotationTargetType");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -19840,25 +19840,25 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7987:6: (otherlv_7= '{' ( (lv_targets_8_0= ruleAnnotationTargetType ) ) (otherlv_9= ',' ( (lv_targets_10_0= ruleAnnotationTargetType ) ) )* otherlv_11= '}' )
+                    // InternalRoom.g:7989:6: (otherlv_7= '{' ( (lv_targets_8_0= ruleAnnotationTargetType ) ) (otherlv_9= ',' ( (lv_targets_10_0= ruleAnnotationTargetType ) ) )* otherlv_11= '}' )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7987:6: (otherlv_7= '{' ( (lv_targets_8_0= ruleAnnotationTargetType ) ) (otherlv_9= ',' ( (lv_targets_10_0= ruleAnnotationTargetType ) ) )* otherlv_11= '}' )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7987:8: otherlv_7= '{' ( (lv_targets_8_0= ruleAnnotationTargetType ) ) (otherlv_9= ',' ( (lv_targets_10_0= ruleAnnotationTargetType ) ) )* otherlv_11= '}'
+                    // InternalRoom.g:7989:6: (otherlv_7= '{' ( (lv_targets_8_0= ruleAnnotationTargetType ) ) (otherlv_9= ',' ( (lv_targets_10_0= ruleAnnotationTargetType ) ) )* otherlv_11= '}' )
+                    // InternalRoom.g:7989:8: otherlv_7= '{' ( (lv_targets_8_0= ruleAnnotationTargetType ) ) (otherlv_9= ',' ( (lv_targets_10_0= ruleAnnotationTargetType ) ) )* otherlv_11= '}'
                     {
-                    otherlv_7=(Token)match(input,13,FOLLOW_13_in_ruleAnnotationType16584); 
+                    otherlv_7=(Token)match(input,13,FOLLOW_122); 
 
                         	newLeafNode(otherlv_7, grammarAccess.getAnnotationTypeAccess().getLeftCurlyBracketKeyword_6_1_0());
                         
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7991:1: ( (lv_targets_8_0= ruleAnnotationTargetType ) )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7992:1: (lv_targets_8_0= ruleAnnotationTargetType )
+                    // InternalRoom.g:7993:1: ( (lv_targets_8_0= ruleAnnotationTargetType ) )
+                    // InternalRoom.g:7994:1: (lv_targets_8_0= ruleAnnotationTargetType )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7992:1: (lv_targets_8_0= ruleAnnotationTargetType )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:7993:3: lv_targets_8_0= ruleAnnotationTargetType
+                    // InternalRoom.g:7994:1: (lv_targets_8_0= ruleAnnotationTargetType )
+                    // InternalRoom.g:7995:3: lv_targets_8_0= ruleAnnotationTargetType
                     {
                      
                     	        newCompositeNode(grammarAccess.getAnnotationTypeAccess().getTargetsAnnotationTargetTypeParserRuleCall_6_1_1_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleAnnotationTargetType_in_ruleAnnotationType16605);
+                    pushFollow(FOLLOW_20);
                     lv_targets_8_0=ruleAnnotationTargetType();
 
                     state._fsp--;
@@ -19871,7 +19871,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"targets",
                             		lv_targets_8_0, 
-                            		"AnnotationTargetType");
+                            		"org.eclipse.etrice.core.Room.AnnotationTargetType");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -19880,7 +19880,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8009:2: (otherlv_9= ',' ( (lv_targets_10_0= ruleAnnotationTargetType ) ) )*
+                    // InternalRoom.g:8011:2: (otherlv_9= ',' ( (lv_targets_10_0= ruleAnnotationTargetType ) ) )*
                     loop163:
                     do {
                         int alt163=2;
@@ -19893,22 +19893,22 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                         switch (alt163) {
                     	case 1 :
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8009:4: otherlv_9= ',' ( (lv_targets_10_0= ruleAnnotationTargetType ) )
+                    	    // InternalRoom.g:8011:4: otherlv_9= ',' ( (lv_targets_10_0= ruleAnnotationTargetType ) )
                     	    {
-                    	    otherlv_9=(Token)match(input,24,FOLLOW_24_in_ruleAnnotationType16618); 
+                    	    otherlv_9=(Token)match(input,24,FOLLOW_122); 
 
                     	        	newLeafNode(otherlv_9, grammarAccess.getAnnotationTypeAccess().getCommaKeyword_6_1_2_0());
                     	        
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8013:1: ( (lv_targets_10_0= ruleAnnotationTargetType ) )
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8014:1: (lv_targets_10_0= ruleAnnotationTargetType )
+                    	    // InternalRoom.g:8015:1: ( (lv_targets_10_0= ruleAnnotationTargetType ) )
+                    	    // InternalRoom.g:8016:1: (lv_targets_10_0= ruleAnnotationTargetType )
                     	    {
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8014:1: (lv_targets_10_0= ruleAnnotationTargetType )
-                    	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8015:3: lv_targets_10_0= ruleAnnotationTargetType
+                    	    // InternalRoom.g:8016:1: (lv_targets_10_0= ruleAnnotationTargetType )
+                    	    // InternalRoom.g:8017:3: lv_targets_10_0= ruleAnnotationTargetType
                     	    {
                     	     
                     	    	        newCompositeNode(grammarAccess.getAnnotationTypeAccess().getTargetsAnnotationTargetTypeParserRuleCall_6_1_2_1_0()); 
                     	    	    
-                    	    pushFollow(FOLLOW_ruleAnnotationTargetType_in_ruleAnnotationType16639);
+                    	    pushFollow(FOLLOW_20);
                     	    lv_targets_10_0=ruleAnnotationTargetType();
 
                     	    state._fsp--;
@@ -19921,7 +19921,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     	           			current, 
                     	           			"targets",
                     	            		lv_targets_10_0, 
-                    	            		"AnnotationTargetType");
+                    	            		"org.eclipse.etrice.core.Room.AnnotationTargetType");
                     	    	        afterParserOrEnumRuleCall();
                     	    	    
 
@@ -19939,7 +19939,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                         }
                     } while (true);
 
-                    otherlv_11=(Token)match(input,14,FOLLOW_14_in_ruleAnnotationType16653); 
+                    otherlv_11=(Token)match(input,14,FOLLOW_121); 
 
                         	newLeafNode(otherlv_11, grammarAccess.getAnnotationTypeAccess().getRightCurlyBracketKeyword_6_1_3());
                         
@@ -19952,7 +19952,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8035:3: ( (lv_attributes_12_0= ruleAnnotationAttribute ) )*
+            // InternalRoom.g:8037:3: ( (lv_attributes_12_0= ruleAnnotationAttribute ) )*
             loop165:
             do {
                 int alt165=2;
@@ -19965,15 +19965,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                 switch (alt165) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8036:1: (lv_attributes_12_0= ruleAnnotationAttribute )
+            	    // InternalRoom.g:8038:1: (lv_attributes_12_0= ruleAnnotationAttribute )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8036:1: (lv_attributes_12_0= ruleAnnotationAttribute )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8037:3: lv_attributes_12_0= ruleAnnotationAttribute
+            	    // InternalRoom.g:8038:1: (lv_attributes_12_0= ruleAnnotationAttribute )
+            	    // InternalRoom.g:8039:3: lv_attributes_12_0= ruleAnnotationAttribute
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getAnnotationTypeAccess().getAttributesAnnotationAttributeParserRuleCall_7_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleAnnotationAttribute_in_ruleAnnotationType16676);
+            	    pushFollow(FOLLOW_121);
             	    lv_attributes_12_0=ruleAnnotationAttribute();
 
             	    state._fsp--;
@@ -19986,7 +19986,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"attributes",
             	            		lv_attributes_12_0, 
-            	            		"AnnotationAttribute");
+            	            		"org.eclipse.etrice.core.common.Base.AnnotationAttribute");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -20001,7 +20001,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                 }
             } while (true);
 
-            otherlv_13=(Token)match(input,14,FOLLOW_14_in_ruleAnnotationType16689); 
+            otherlv_13=(Token)match(input,14,FOLLOW_2); 
 
                 	newLeafNode(otherlv_13, grammarAccess.getAnnotationTypeAccess().getRightCurlyBracketKeyword_8());
                 
@@ -20026,7 +20026,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleAnnotationAttribute"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8065:1: entryRuleAnnotationAttribute returns [EObject current=null] : iv_ruleAnnotationAttribute= ruleAnnotationAttribute EOF ;
+    // InternalRoom.g:8067:1: entryRuleAnnotationAttribute returns [EObject current=null] : iv_ruleAnnotationAttribute= ruleAnnotationAttribute EOF ;
     public final EObject entryRuleAnnotationAttribute() throws RecognitionException {
         EObject current = null;
 
@@ -20034,17 +20034,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8066:2: (iv_ruleAnnotationAttribute= ruleAnnotationAttribute EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8067:2: iv_ruleAnnotationAttribute= ruleAnnotationAttribute EOF
+            // InternalRoom.g:8068:2: (iv_ruleAnnotationAttribute= ruleAnnotationAttribute EOF )
+            // InternalRoom.g:8069:2: iv_ruleAnnotationAttribute= ruleAnnotationAttribute EOF
             {
              newCompositeNode(grammarAccess.getAnnotationAttributeRule()); 
-            pushFollow(FOLLOW_ruleAnnotationAttribute_in_entryRuleAnnotationAttribute16725);
+            pushFollow(FOLLOW_1);
             iv_ruleAnnotationAttribute=ruleAnnotationAttribute();
 
             state._fsp--;
 
              current =iv_ruleAnnotationAttribute; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAnnotationAttribute16735); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -20062,7 +20062,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleAnnotationAttribute"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8074:1: ruleAnnotationAttribute returns [EObject current=null] : (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute ) ;
+    // InternalRoom.g:8076:1: ruleAnnotationAttribute returns [EObject current=null] : (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute ) ;
     public final EObject ruleAnnotationAttribute() throws RecognitionException {
         EObject current = null;
 
@@ -20074,10 +20074,10 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8077:28: ( (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8078:1: (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute )
+            // InternalRoom.g:8079:28: ( (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute ) )
+            // InternalRoom.g:8080:1: (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8078:1: (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute )
+            // InternalRoom.g:8080:1: (this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute | this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute )
             int alt166=2;
             int LA166_0 = input.LA(1);
 
@@ -20093,12 +20093,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                         if ( (LA166_4==15) ) {
                             int LA166_5 = input.LA(5);
 
-                            if ( (LA166_5==13) ) {
-                                alt166=2;
-                            }
-                            else if ( ((LA166_5>=128 && LA166_5<=131)) ) {
+                            if ( ((LA166_5>=128 && LA166_5<=131)) ) {
                                 alt166=1;
                             }
+                            else if ( (LA166_5==13) ) {
+                                alt166=2;
+                            }
                             else {
                                 NoViableAltException nvae =
                                     new NoViableAltException("", 166, 5, input);
@@ -20139,12 +20139,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                         if ( (LA166_4==15) ) {
                             int LA166_5 = input.LA(5);
 
-                            if ( (LA166_5==13) ) {
-                                alt166=2;
-                            }
-                            else if ( ((LA166_5>=128 && LA166_5<=131)) ) {
+                            if ( ((LA166_5>=128 && LA166_5<=131)) ) {
                                 alt166=1;
                             }
+                            else if ( (LA166_5==13) ) {
+                                alt166=2;
+                            }
                             else {
                                 NoViableAltException nvae =
                                     new NoViableAltException("", 166, 5, input);
@@ -20181,12 +20181,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt166) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8079:5: this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute
+                    // InternalRoom.g:8081:5: this_SimpleAnnotationAttribute_0= ruleSimpleAnnotationAttribute
                     {
                      
                             newCompositeNode(grammarAccess.getAnnotationAttributeAccess().getSimpleAnnotationAttributeParserRuleCall_0()); 
                         
-                    pushFollow(FOLLOW_ruleSimpleAnnotationAttribute_in_ruleAnnotationAttribute16782);
+                    pushFollow(FOLLOW_2);
                     this_SimpleAnnotationAttribute_0=ruleSimpleAnnotationAttribute();
 
                     state._fsp--;
@@ -20199,12 +20199,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8089:5: this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute
+                    // InternalRoom.g:8091:5: this_EnumAnnotationAttribute_1= ruleEnumAnnotationAttribute
                     {
                      
                             newCompositeNode(grammarAccess.getAnnotationAttributeAccess().getEnumAnnotationAttributeParserRuleCall_1()); 
                         
-                    pushFollow(FOLLOW_ruleEnumAnnotationAttribute_in_ruleAnnotationAttribute16809);
+                    pushFollow(FOLLOW_2);
                     this_EnumAnnotationAttribute_1=ruleEnumAnnotationAttribute();
 
                     state._fsp--;
@@ -20237,7 +20237,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleSimpleAnnotationAttribute"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8105:1: entryRuleSimpleAnnotationAttribute returns [EObject current=null] : iv_ruleSimpleAnnotationAttribute= ruleSimpleAnnotationAttribute EOF ;
+    // InternalRoom.g:8107:1: entryRuleSimpleAnnotationAttribute returns [EObject current=null] : iv_ruleSimpleAnnotationAttribute= ruleSimpleAnnotationAttribute EOF ;
     public final EObject entryRuleSimpleAnnotationAttribute() throws RecognitionException {
         EObject current = null;
 
@@ -20245,17 +20245,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8106:2: (iv_ruleSimpleAnnotationAttribute= ruleSimpleAnnotationAttribute EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8107:2: iv_ruleSimpleAnnotationAttribute= ruleSimpleAnnotationAttribute EOF
+            // InternalRoom.g:8108:2: (iv_ruleSimpleAnnotationAttribute= ruleSimpleAnnotationAttribute EOF )
+            // InternalRoom.g:8109:2: iv_ruleSimpleAnnotationAttribute= ruleSimpleAnnotationAttribute EOF
             {
              newCompositeNode(grammarAccess.getSimpleAnnotationAttributeRule()); 
-            pushFollow(FOLLOW_ruleSimpleAnnotationAttribute_in_entryRuleSimpleAnnotationAttribute16844);
+            pushFollow(FOLLOW_1);
             iv_ruleSimpleAnnotationAttribute=ruleSimpleAnnotationAttribute();
 
             state._fsp--;
 
              current =iv_ruleSimpleAnnotationAttribute; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSimpleAnnotationAttribute16854); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -20273,7 +20273,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleSimpleAnnotationAttribute"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8114: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 ) ) ) ;
+    // InternalRoom.g:8116: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;
 
@@ -20288,13 +20288,13 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8117: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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8118: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 ) ) )
+            // InternalRoom.g:8119: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 ) ) ) )
+            // InternalRoom.g:8120: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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8118: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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8118: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 ) )
+            // InternalRoom.g:8120: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 ) ) )
+            // InternalRoom.g:8120: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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8118:2: ( ( (lv_optional_0_0= 'optional' ) ) | otherlv_1= 'mandatory' )
+            // InternalRoom.g:8120:2: ( ( (lv_optional_0_0= 'optional' ) ) | otherlv_1= 'mandatory' )
             int alt167=2;
             int LA167_0 = input.LA(1);
 
@@ -20312,15 +20312,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt167) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8118:3: ( (lv_optional_0_0= 'optional' ) )
+                    // InternalRoom.g:8120:3: ( (lv_optional_0_0= 'optional' ) )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8118:3: ( (lv_optional_0_0= 'optional' ) )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8119:1: (lv_optional_0_0= 'optional' )
+                    // InternalRoom.g:8120:3: ( (lv_optional_0_0= 'optional' ) )
+                    // InternalRoom.g:8121:1: (lv_optional_0_0= 'optional' )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8119:1: (lv_optional_0_0= 'optional' )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8120:3: lv_optional_0_0= 'optional'
+                    // InternalRoom.g:8121:1: (lv_optional_0_0= 'optional' )
+                    // InternalRoom.g:8122:3: lv_optional_0_0= 'optional'
                     {
-                    lv_optional_0_0=(Token)match(input,110,FOLLOW_110_in_ruleSimpleAnnotationAttribute16898); 
+                    lv_optional_0_0=(Token)match(input,110,FOLLOW_123); 
 
                             newLeafNode(lv_optional_0_0, grammarAccess.getSimpleAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0());
                         
@@ -20340,9 +20340,9 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8134:7: otherlv_1= 'mandatory'
+                    // InternalRoom.g:8136:7: otherlv_1= 'mandatory'
                     {
-                    otherlv_1=(Token)match(input,111,FOLLOW_111_in_ruleSimpleAnnotationAttribute16929); 
+                    otherlv_1=(Token)match(input,111,FOLLOW_123); 
 
                         	newLeafNode(otherlv_1, grammarAccess.getSimpleAnnotationAttributeAccess().getMandatoryKeyword_0_1());
                         
@@ -20352,17 +20352,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_2=(Token)match(input,112,FOLLOW_112_in_ruleSimpleAnnotationAttribute16942); 
+            otherlv_2=(Token)match(input,112,FOLLOW_3); 
 
                 	newLeafNode(otherlv_2, grammarAccess.getSimpleAnnotationAttributeAccess().getAttributeKeyword_1());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8142:1: ( (lv_name_3_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8143:1: (lv_name_3_0= RULE_ID )
+            // InternalRoom.g:8144:1: ( (lv_name_3_0= RULE_ID ) )
+            // InternalRoom.g:8145:1: (lv_name_3_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8143:1: (lv_name_3_0= RULE_ID )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8144:3: lv_name_3_0= RULE_ID
+            // InternalRoom.g:8145:1: (lv_name_3_0= RULE_ID )
+            // InternalRoom.g:8146:3: lv_name_3_0= RULE_ID
             {
-            lv_name_3_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleSimpleAnnotationAttribute16959); 
+            lv_name_3_0=(Token)match(input,RULE_ID,FOLLOW_8); 
 
             			newLeafNode(lv_name_3_0, grammarAccess.getSimpleAnnotationAttributeAccess().getNameIDTerminalRuleCall_2_0()); 
             		
@@ -20374,7 +20374,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"name",
                     		lv_name_3_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -20382,20 +20382,20 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_4=(Token)match(input,15,FOLLOW_15_in_ruleSimpleAnnotationAttribute16976); 
+            otherlv_4=(Token)match(input,15,FOLLOW_10); 
 
                 	newLeafNode(otherlv_4, grammarAccess.getSimpleAnnotationAttributeAccess().getColonKeyword_3());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8164:1: ( (lv_type_5_0= ruleLiteralType ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8165:1: (lv_type_5_0= ruleLiteralType )
+            // InternalRoom.g:8166:1: ( (lv_type_5_0= ruleLiteralType ) )
+            // InternalRoom.g:8167:1: (lv_type_5_0= ruleLiteralType )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8165:1: (lv_type_5_0= ruleLiteralType )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8166:3: lv_type_5_0= ruleLiteralType
+            // InternalRoom.g:8167:1: (lv_type_5_0= ruleLiteralType )
+            // InternalRoom.g:8168:3: lv_type_5_0= ruleLiteralType
             {
              
             	        newCompositeNode(grammarAccess.getSimpleAnnotationAttributeAccess().getTypeLiteralTypeEnumRuleCall_4_0()); 
             	    
-            pushFollow(FOLLOW_ruleLiteralType_in_ruleSimpleAnnotationAttribute16997);
+            pushFollow(FOLLOW_2);
             lv_type_5_0=ruleLiteralType();
 
             state._fsp--;
@@ -20408,7 +20408,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"type",
                     		lv_type_5_0, 
-                    		"LiteralType");
+                    		"org.eclipse.etrice.core.common.Base.LiteralType");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -20438,7 +20438,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleEnumAnnotationAttribute"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8190:1: entryRuleEnumAnnotationAttribute returns [EObject current=null] : iv_ruleEnumAnnotationAttribute= ruleEnumAnnotationAttribute EOF ;
+    // InternalRoom.g:8192:1: entryRuleEnumAnnotationAttribute returns [EObject current=null] : iv_ruleEnumAnnotationAttribute= ruleEnumAnnotationAttribute EOF ;
     public final EObject entryRuleEnumAnnotationAttribute() throws RecognitionException {
         EObject current = null;
 
@@ -20446,17 +20446,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8191:2: (iv_ruleEnumAnnotationAttribute= ruleEnumAnnotationAttribute EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8192:2: iv_ruleEnumAnnotationAttribute= ruleEnumAnnotationAttribute EOF
+            // InternalRoom.g:8193:2: (iv_ruleEnumAnnotationAttribute= ruleEnumAnnotationAttribute EOF )
+            // InternalRoom.g:8194:2: iv_ruleEnumAnnotationAttribute= ruleEnumAnnotationAttribute EOF
             {
              newCompositeNode(grammarAccess.getEnumAnnotationAttributeRule()); 
-            pushFollow(FOLLOW_ruleEnumAnnotationAttribute_in_entryRuleEnumAnnotationAttribute17033);
+            pushFollow(FOLLOW_1);
             iv_ruleEnumAnnotationAttribute=ruleEnumAnnotationAttribute();
 
             state._fsp--;
 
              current =iv_ruleEnumAnnotationAttribute; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleEnumAnnotationAttribute17043); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -20474,7 +20474,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleEnumAnnotationAttribute"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8199: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= '}' ) ;
+    // InternalRoom.g:8201: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;
 
@@ -20492,13 +20492,13 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8202: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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8203: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= '}' )
+            // InternalRoom.g:8204: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= '}' ) )
+            // InternalRoom.g:8205: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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8203: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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8203: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= '}'
+            // InternalRoom.g:8205: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= '}' )
+            // InternalRoom.g:8205: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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8203:2: ( ( (lv_optional_0_0= 'optional' ) ) | otherlv_1= 'mandatory' )
+            // InternalRoom.g:8205:2: ( ( (lv_optional_0_0= 'optional' ) ) | otherlv_1= 'mandatory' )
             int alt168=2;
             int LA168_0 = input.LA(1);
 
@@ -20516,15 +20516,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt168) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8203:3: ( (lv_optional_0_0= 'optional' ) )
+                    // InternalRoom.g:8205:3: ( (lv_optional_0_0= 'optional' ) )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8203:3: ( (lv_optional_0_0= 'optional' ) )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8204:1: (lv_optional_0_0= 'optional' )
+                    // InternalRoom.g:8205:3: ( (lv_optional_0_0= 'optional' ) )
+                    // InternalRoom.g:8206:1: (lv_optional_0_0= 'optional' )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8204:1: (lv_optional_0_0= 'optional' )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8205:3: lv_optional_0_0= 'optional'
+                    // InternalRoom.g:8206:1: (lv_optional_0_0= 'optional' )
+                    // InternalRoom.g:8207:3: lv_optional_0_0= 'optional'
                     {
-                    lv_optional_0_0=(Token)match(input,110,FOLLOW_110_in_ruleEnumAnnotationAttribute17087); 
+                    lv_optional_0_0=(Token)match(input,110,FOLLOW_123); 
 
                             newLeafNode(lv_optional_0_0, grammarAccess.getEnumAnnotationAttributeAccess().getOptionalOptionalKeyword_0_0_0());
                         
@@ -20544,9 +20544,9 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8219:7: otherlv_1= 'mandatory'
+                    // InternalRoom.g:8221:7: otherlv_1= 'mandatory'
                     {
-                    otherlv_1=(Token)match(input,111,FOLLOW_111_in_ruleEnumAnnotationAttribute17118); 
+                    otherlv_1=(Token)match(input,111,FOLLOW_123); 
 
                         	newLeafNode(otherlv_1, grammarAccess.getEnumAnnotationAttributeAccess().getMandatoryKeyword_0_1());
                         
@@ -20556,17 +20556,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_2=(Token)match(input,112,FOLLOW_112_in_ruleEnumAnnotationAttribute17131); 
+            otherlv_2=(Token)match(input,112,FOLLOW_3); 
 
                 	newLeafNode(otherlv_2, grammarAccess.getEnumAnnotationAttributeAccess().getAttributeKeyword_1());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8227:1: ( (lv_name_3_0= RULE_ID ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8228:1: (lv_name_3_0= RULE_ID )
+            // InternalRoom.g:8229:1: ( (lv_name_3_0= RULE_ID ) )
+            // InternalRoom.g:8230:1: (lv_name_3_0= RULE_ID )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8228:1: (lv_name_3_0= RULE_ID )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8229:3: lv_name_3_0= RULE_ID
+            // InternalRoom.g:8230:1: (lv_name_3_0= RULE_ID )
+            // InternalRoom.g:8231:3: lv_name_3_0= RULE_ID
             {
-            lv_name_3_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEnumAnnotationAttribute17148); 
+            lv_name_3_0=(Token)match(input,RULE_ID,FOLLOW_8); 
 
             			newLeafNode(lv_name_3_0, grammarAccess.getEnumAnnotationAttributeAccess().getNameIDTerminalRuleCall_2_0()); 
             		
@@ -20578,7 +20578,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"name",
                     		lv_name_3_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -20586,21 +20586,21 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_4=(Token)match(input,15,FOLLOW_15_in_ruleEnumAnnotationAttribute17165); 
+            otherlv_4=(Token)match(input,15,FOLLOW_5); 
 
                 	newLeafNode(otherlv_4, grammarAccess.getEnumAnnotationAttributeAccess().getColonKeyword_3());
                 
-            otherlv_5=(Token)match(input,13,FOLLOW_13_in_ruleEnumAnnotationAttribute17177); 
+            otherlv_5=(Token)match(input,13,FOLLOW_12); 
 
                 	newLeafNode(otherlv_5, grammarAccess.getEnumAnnotationAttributeAccess().getLeftCurlyBracketKeyword_4());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8253:1: ( (lv_values_6_0= RULE_STRING ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8254:1: (lv_values_6_0= RULE_STRING )
+            // InternalRoom.g:8255:1: ( (lv_values_6_0= RULE_STRING ) )
+            // InternalRoom.g:8256:1: (lv_values_6_0= RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8254:1: (lv_values_6_0= RULE_STRING )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8255:3: lv_values_6_0= RULE_STRING
+            // InternalRoom.g:8256:1: (lv_values_6_0= RULE_STRING )
+            // InternalRoom.g:8257:3: lv_values_6_0= RULE_STRING
             {
-            lv_values_6_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleEnumAnnotationAttribute17194); 
+            lv_values_6_0=(Token)match(input,RULE_STRING,FOLLOW_20); 
 
             			newLeafNode(lv_values_6_0, grammarAccess.getEnumAnnotationAttributeAccess().getValuesSTRINGTerminalRuleCall_5_0()); 
             		
@@ -20612,7 +20612,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"values",
                     		lv_values_6_0, 
-                    		"STRING");
+                    		"org.eclipse.xtext.common.Terminals.STRING");
             	    
 
             }
@@ -20620,7 +20620,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8271:2: (otherlv_7= ',' ( (lv_values_8_0= RULE_STRING ) ) )*
+            // InternalRoom.g:8273:2: (otherlv_7= ',' ( (lv_values_8_0= RULE_STRING ) ) )*
             loop169:
             do {
                 int alt169=2;
@@ -20633,19 +20633,19 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                 switch (alt169) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8271:4: otherlv_7= ',' ( (lv_values_8_0= RULE_STRING ) )
+            	    // InternalRoom.g:8273:4: otherlv_7= ',' ( (lv_values_8_0= RULE_STRING ) )
             	    {
-            	    otherlv_7=(Token)match(input,24,FOLLOW_24_in_ruleEnumAnnotationAttribute17212); 
+            	    otherlv_7=(Token)match(input,24,FOLLOW_12); 
 
             	        	newLeafNode(otherlv_7, grammarAccess.getEnumAnnotationAttributeAccess().getCommaKeyword_6_0());
             	        
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8275:1: ( (lv_values_8_0= RULE_STRING ) )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8276:1: (lv_values_8_0= RULE_STRING )
+            	    // InternalRoom.g:8277:1: ( (lv_values_8_0= RULE_STRING ) )
+            	    // InternalRoom.g:8278:1: (lv_values_8_0= RULE_STRING )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8276:1: (lv_values_8_0= RULE_STRING )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8277:3: lv_values_8_0= RULE_STRING
+            	    // InternalRoom.g:8278:1: (lv_values_8_0= RULE_STRING )
+            	    // InternalRoom.g:8279:3: lv_values_8_0= RULE_STRING
             	    {
-            	    lv_values_8_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleEnumAnnotationAttribute17229); 
+            	    lv_values_8_0=(Token)match(input,RULE_STRING,FOLLOW_20); 
 
             	    			newLeafNode(lv_values_8_0, grammarAccess.getEnumAnnotationAttributeAccess().getValuesSTRINGTerminalRuleCall_6_1_0()); 
             	    		
@@ -20657,7 +20657,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"values",
             	            		lv_values_8_0, 
-            	            		"STRING");
+            	            		"org.eclipse.xtext.common.Terminals.STRING");
             	    	    
 
             	    }
@@ -20674,7 +20674,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                 }
             } while (true);
 
-            otherlv_9=(Token)match(input,14,FOLLOW_14_in_ruleEnumAnnotationAttribute17248); 
+            otherlv_9=(Token)match(input,14,FOLLOW_2); 
 
                 	newLeafNode(otherlv_9, grammarAccess.getEnumAnnotationAttributeAccess().getRightCurlyBracketKeyword_7());
                 
@@ -20699,7 +20699,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleImport"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8305:1: entryRuleImport returns [EObject current=null] : iv_ruleImport= ruleImport EOF ;
+    // InternalRoom.g:8307:1: entryRuleImport returns [EObject current=null] : iv_ruleImport= ruleImport EOF ;
     public final EObject entryRuleImport() throws RecognitionException {
         EObject current = null;
 
@@ -20707,17 +20707,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8306:2: (iv_ruleImport= ruleImport EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8307:2: iv_ruleImport= ruleImport EOF
+            // InternalRoom.g:8308:2: (iv_ruleImport= ruleImport EOF )
+            // InternalRoom.g:8309:2: iv_ruleImport= ruleImport EOF
             {
              newCompositeNode(grammarAccess.getImportRule()); 
-            pushFollow(FOLLOW_ruleImport_in_entryRuleImport17284);
+            pushFollow(FOLLOW_1);
             iv_ruleImport=ruleImport();
 
             state._fsp--;
 
              current =iv_ruleImport; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleImport17294); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -20735,7 +20735,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleImport"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8314:1: ruleImport returns [EObject current=null] : (otherlv_0= 'import' ( ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' ) | otherlv_3= 'model' ) ( (lv_importURI_4_0= RULE_STRING ) ) ) ;
+    // InternalRoom.g:8316:1: ruleImport returns [EObject current=null] : (otherlv_0= 'import' ( ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' ) | otherlv_3= 'model' ) ( (lv_importURI_4_0= RULE_STRING ) ) ) ;
     public final EObject ruleImport() throws RecognitionException {
         EObject current = null;
 
@@ -20749,17 +20749,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8317:28: ( (otherlv_0= 'import' ( ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' ) | otherlv_3= 'model' ) ( (lv_importURI_4_0= RULE_STRING ) ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8318:1: (otherlv_0= 'import' ( ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' ) | otherlv_3= 'model' ) ( (lv_importURI_4_0= RULE_STRING ) ) )
+            // InternalRoom.g:8319:28: ( (otherlv_0= 'import' ( ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' ) | otherlv_3= 'model' ) ( (lv_importURI_4_0= RULE_STRING ) ) ) )
+            // InternalRoom.g:8320:1: (otherlv_0= 'import' ( ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' ) | otherlv_3= 'model' ) ( (lv_importURI_4_0= RULE_STRING ) ) )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8318:1: (otherlv_0= 'import' ( ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' ) | otherlv_3= 'model' ) ( (lv_importURI_4_0= RULE_STRING ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8318:3: otherlv_0= 'import' ( ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' ) | otherlv_3= 'model' ) ( (lv_importURI_4_0= RULE_STRING ) )
+            // InternalRoom.g:8320:1: (otherlv_0= 'import' ( ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' ) | otherlv_3= 'model' ) ( (lv_importURI_4_0= RULE_STRING ) ) )
+            // InternalRoom.g:8320:3: otherlv_0= 'import' ( ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' ) | otherlv_3= 'model' ) ( (lv_importURI_4_0= RULE_STRING ) )
             {
-            otherlv_0=(Token)match(input,113,FOLLOW_113_in_ruleImport17331); 
+            otherlv_0=(Token)match(input,113,FOLLOW_124); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getImportAccess().getImportKeyword_0());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8322:1: ( ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' ) | otherlv_3= 'model' )
+            // InternalRoom.g:8324:1: ( ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' ) | otherlv_3= 'model' )
             int alt170=2;
             int LA170_0 = input.LA(1);
 
@@ -20777,21 +20777,21 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt170) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8322:2: ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' )
+                    // InternalRoom.g:8324:2: ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8322:2: ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8322:3: ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from'
+                    // InternalRoom.g:8324:2: ( ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from' )
+                    // InternalRoom.g:8324:3: ( (lv_importedNamespace_1_0= ruleImportedFQN ) ) otherlv_2= 'from'
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8322:3: ( (lv_importedNamespace_1_0= ruleImportedFQN ) )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8323:1: (lv_importedNamespace_1_0= ruleImportedFQN )
+                    // InternalRoom.g:8324:3: ( (lv_importedNamespace_1_0= ruleImportedFQN ) )
+                    // InternalRoom.g:8325:1: (lv_importedNamespace_1_0= ruleImportedFQN )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8323:1: (lv_importedNamespace_1_0= ruleImportedFQN )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8324:3: lv_importedNamespace_1_0= ruleImportedFQN
+                    // InternalRoom.g:8325:1: (lv_importedNamespace_1_0= ruleImportedFQN )
+                    // InternalRoom.g:8326:3: lv_importedNamespace_1_0= ruleImportedFQN
                     {
                      
                     	        newCompositeNode(grammarAccess.getImportAccess().getImportedNamespaceImportedFQNParserRuleCall_1_0_0_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleImportedFQN_in_ruleImport17354);
+                    pushFollow(FOLLOW_125);
                     lv_importedNamespace_1_0=ruleImportedFQN();
 
                     state._fsp--;
@@ -20804,7 +20804,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                            			current, 
                            			"importedNamespace",
                             		lv_importedNamespace_1_0, 
-                            		"ImportedFQN");
+                            		"org.eclipse.etrice.core.common.Base.ImportedFQN");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -20813,7 +20813,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_2=(Token)match(input,114,FOLLOW_114_in_ruleImport17366); 
+                    otherlv_2=(Token)match(input,114,FOLLOW_12); 
 
                         	newLeafNode(otherlv_2, grammarAccess.getImportAccess().getFromKeyword_1_0_1());
                         
@@ -20824,9 +20824,9 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8345:7: otherlv_3= 'model'
+                    // InternalRoom.g:8347:7: otherlv_3= 'model'
                     {
-                    otherlv_3=(Token)match(input,115,FOLLOW_115_in_ruleImport17385); 
+                    otherlv_3=(Token)match(input,115,FOLLOW_12); 
 
                         	newLeafNode(otherlv_3, grammarAccess.getImportAccess().getModelKeyword_1_1());
                         
@@ -20836,13 +20836,13 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8349:2: ( (lv_importURI_4_0= RULE_STRING ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8350:1: (lv_importURI_4_0= RULE_STRING )
+            // InternalRoom.g:8351:2: ( (lv_importURI_4_0= RULE_STRING ) )
+            // InternalRoom.g:8352:1: (lv_importURI_4_0= RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8350:1: (lv_importURI_4_0= RULE_STRING )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8351:3: lv_importURI_4_0= RULE_STRING
+            // InternalRoom.g:8352:1: (lv_importURI_4_0= RULE_STRING )
+            // InternalRoom.g:8353:3: lv_importURI_4_0= RULE_STRING
             {
-            lv_importURI_4_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleImport17403); 
+            lv_importURI_4_0=(Token)match(input,RULE_STRING,FOLLOW_2); 
 
             			newLeafNode(lv_importURI_4_0, grammarAccess.getImportAccess().getImportURISTRINGTerminalRuleCall_2_0()); 
             		
@@ -20854,7 +20854,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"importURI",
                     		lv_importURI_4_0, 
-                    		"STRING");
+                    		"org.eclipse.xtext.common.Terminals.STRING");
             	    
 
             }
@@ -20883,7 +20883,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleImportedFQN"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8375:1: entryRuleImportedFQN returns [String current=null] : iv_ruleImportedFQN= ruleImportedFQN EOF ;
+    // InternalRoom.g:8377:1: entryRuleImportedFQN returns [String current=null] : iv_ruleImportedFQN= ruleImportedFQN EOF ;
     public final String entryRuleImportedFQN() throws RecognitionException {
         String current = null;
 
@@ -20891,17 +20891,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8376:2: (iv_ruleImportedFQN= ruleImportedFQN EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8377:2: iv_ruleImportedFQN= ruleImportedFQN EOF
+            // InternalRoom.g:8378:2: (iv_ruleImportedFQN= ruleImportedFQN EOF )
+            // InternalRoom.g:8379:2: iv_ruleImportedFQN= ruleImportedFQN EOF
             {
              newCompositeNode(grammarAccess.getImportedFQNRule()); 
-            pushFollow(FOLLOW_ruleImportedFQN_in_entryRuleImportedFQN17445);
+            pushFollow(FOLLOW_1);
             iv_ruleImportedFQN=ruleImportedFQN();
 
             state._fsp--;
 
              current =iv_ruleImportedFQN.getText(); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleImportedFQN17456); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -20919,7 +20919,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleImportedFQN"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8384:1: ruleImportedFQN returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_FQN_0= ruleFQN (kw= '.*' )? ) ;
+    // InternalRoom.g:8386:1: ruleImportedFQN returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_FQN_0= ruleFQN (kw= '.*' )? ) ;
     public final AntlrDatatypeRuleToken ruleImportedFQN() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -20930,16 +20930,16 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8387:28: ( (this_FQN_0= ruleFQN (kw= '.*' )? ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8388:1: (this_FQN_0= ruleFQN (kw= '.*' )? )
+            // InternalRoom.g:8389:28: ( (this_FQN_0= ruleFQN (kw= '.*' )? ) )
+            // InternalRoom.g:8390:1: (this_FQN_0= ruleFQN (kw= '.*' )? )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8388:1: (this_FQN_0= ruleFQN (kw= '.*' )? )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8389:5: this_FQN_0= ruleFQN (kw= '.*' )?
+            // InternalRoom.g:8390:1: (this_FQN_0= ruleFQN (kw= '.*' )? )
+            // InternalRoom.g:8391:5: this_FQN_0= ruleFQN (kw= '.*' )?
             {
              
                     newCompositeNode(grammarAccess.getImportedFQNAccess().getFQNParserRuleCall_0()); 
                 
-            pushFollow(FOLLOW_ruleFQN_in_ruleImportedFQN17503);
+            pushFollow(FOLLOW_126);
             this_FQN_0=ruleFQN();
 
             state._fsp--;
@@ -20950,7 +20950,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
              
                     afterParserOrEnumRuleCall();
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8399:1: (kw= '.*' )?
+            // InternalRoom.g:8401:1: (kw= '.*' )?
             int alt171=2;
             int LA171_0 = input.LA(1);
 
@@ -20959,9 +20959,9 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt171) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8400:2: kw= '.*'
+                    // InternalRoom.g:8402:2: kw= '.*'
                     {
-                    kw=(Token)match(input,116,FOLLOW_116_in_ruleImportedFQN17522); 
+                    kw=(Token)match(input,116,FOLLOW_2); 
 
                             current.merge(kw);
                             newLeafNode(kw, grammarAccess.getImportedFQNAccess().getFullStopAsteriskKeyword_1()); 
@@ -20993,7 +20993,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleDocumentation"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8413:1: entryRuleDocumentation returns [EObject current=null] : iv_ruleDocumentation= ruleDocumentation EOF ;
+    // InternalRoom.g:8415:1: entryRuleDocumentation returns [EObject current=null] : iv_ruleDocumentation= ruleDocumentation EOF ;
     public final EObject entryRuleDocumentation() throws RecognitionException {
         EObject current = null;
 
@@ -21001,17 +21001,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8414:2: (iv_ruleDocumentation= ruleDocumentation EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8415:2: iv_ruleDocumentation= ruleDocumentation EOF
+            // InternalRoom.g:8416:2: (iv_ruleDocumentation= ruleDocumentation EOF )
+            // InternalRoom.g:8417:2: iv_ruleDocumentation= ruleDocumentation EOF
             {
              newCompositeNode(grammarAccess.getDocumentationRule()); 
-            pushFollow(FOLLOW_ruleDocumentation_in_entryRuleDocumentation17564);
+            pushFollow(FOLLOW_1);
             iv_ruleDocumentation=ruleDocumentation();
 
             state._fsp--;
 
              current =iv_ruleDocumentation; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDocumentation17574); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -21029,7 +21029,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleDocumentation"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8422:1: ruleDocumentation returns [EObject current=null] : ( () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']' ) ;
+    // InternalRoom.g:8424: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;
 
@@ -21040,14 +21040,14 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8425:28: ( ( () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']' ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8426:1: ( () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']' )
+            // InternalRoom.g:8427:28: ( ( () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']' ) )
+            // InternalRoom.g:8428:1: ( () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']' )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8426:1: ( () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']' )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8426:2: () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']'
+            // InternalRoom.g:8428:1: ( () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']' )
+            // InternalRoom.g:8428:2: () otherlv_1= '[' ( (lv_lines_2_0= RULE_STRING ) )* otherlv_3= ']'
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8426:2: ()
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8427:5: 
+            // InternalRoom.g:8428:2: ()
+            // InternalRoom.g:8429:5: 
             {
 
                     current = forceCreateModelElement(
@@ -21057,11 +21057,11 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,33,FOLLOW_33_in_ruleDocumentation17620); 
+            otherlv_1=(Token)match(input,33,FOLLOW_127); 
 
                 	newLeafNode(otherlv_1, grammarAccess.getDocumentationAccess().getLeftSquareBracketKeyword_1());
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8436:1: ( (lv_lines_2_0= RULE_STRING ) )*
+            // InternalRoom.g:8438:1: ( (lv_lines_2_0= RULE_STRING ) )*
             loop172:
             do {
                 int alt172=2;
@@ -21074,12 +21074,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                 switch (alt172) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8437:1: (lv_lines_2_0= RULE_STRING )
+            	    // InternalRoom.g:8439:1: (lv_lines_2_0= RULE_STRING )
             	    {
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8437:1: (lv_lines_2_0= RULE_STRING )
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8438:3: lv_lines_2_0= RULE_STRING
+            	    // InternalRoom.g:8439:1: (lv_lines_2_0= RULE_STRING )
+            	    // InternalRoom.g:8440:3: lv_lines_2_0= RULE_STRING
             	    {
-            	    lv_lines_2_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleDocumentation17637); 
+            	    lv_lines_2_0=(Token)match(input,RULE_STRING,FOLLOW_127); 
 
             	    			newLeafNode(lv_lines_2_0, grammarAccess.getDocumentationAccess().getLinesSTRINGTerminalRuleCall_2_0()); 
             	    		
@@ -21091,7 +21091,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	           			current, 
             	           			"lines",
             	            		lv_lines_2_0, 
-            	            		"STRING");
+            	            		"org.eclipse.xtext.common.Terminals.STRING");
             	    	    
 
             	    }
@@ -21105,7 +21105,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                 }
             } while (true);
 
-            otherlv_3=(Token)match(input,34,FOLLOW_34_in_ruleDocumentation17655); 
+            otherlv_3=(Token)match(input,34,FOLLOW_2); 
 
                 	newLeafNode(otherlv_3, grammarAccess.getDocumentationAccess().getRightSquareBracketKeyword_3());
                 
@@ -21130,7 +21130,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleLiteral"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8470:1: entryRuleLiteral returns [EObject current=null] : iv_ruleLiteral= ruleLiteral EOF ;
+    // InternalRoom.g:8472:1: entryRuleLiteral returns [EObject current=null] : iv_ruleLiteral= ruleLiteral EOF ;
     public final EObject entryRuleLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -21138,17 +21138,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8471:2: (iv_ruleLiteral= ruleLiteral EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8472:2: iv_ruleLiteral= ruleLiteral EOF
+            // InternalRoom.g:8473:2: (iv_ruleLiteral= ruleLiteral EOF )
+            // InternalRoom.g:8474:2: iv_ruleLiteral= ruleLiteral EOF
             {
              newCompositeNode(grammarAccess.getLiteralRule()); 
-            pushFollow(FOLLOW_ruleLiteral_in_entryRuleLiteral17695);
+            pushFollow(FOLLOW_1);
             iv_ruleLiteral=ruleLiteral();
 
             state._fsp--;
 
              current =iv_ruleLiteral; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleLiteral17705); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -21166,7 +21166,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleLiteral"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8479:1: ruleLiteral returns [EObject current=null] : (this_BooleanLiteral_0= ruleBooleanLiteral | this_NumberLiteral_1= ruleNumberLiteral | this_StringLiteral_2= ruleStringLiteral ) ;
+    // InternalRoom.g:8481: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;
 
@@ -21180,10 +21180,10 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8482:28: ( (this_BooleanLiteral_0= ruleBooleanLiteral | this_NumberLiteral_1= ruleNumberLiteral | this_StringLiteral_2= ruleStringLiteral ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8483:1: (this_BooleanLiteral_0= ruleBooleanLiteral | this_NumberLiteral_1= ruleNumberLiteral | this_StringLiteral_2= ruleStringLiteral )
+            // InternalRoom.g:8484:28: ( (this_BooleanLiteral_0= ruleBooleanLiteral | this_NumberLiteral_1= ruleNumberLiteral | this_StringLiteral_2= ruleStringLiteral ) )
+            // InternalRoom.g:8485:1: (this_BooleanLiteral_0= ruleBooleanLiteral | this_NumberLiteral_1= ruleNumberLiteral | this_StringLiteral_2= ruleStringLiteral )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8483:1: (this_BooleanLiteral_0= ruleBooleanLiteral | this_NumberLiteral_1= ruleNumberLiteral | this_StringLiteral_2= ruleStringLiteral )
+            // InternalRoom.g:8485:1: (this_BooleanLiteral_0= ruleBooleanLiteral | this_NumberLiteral_1= ruleNumberLiteral | this_StringLiteral_2= ruleStringLiteral )
             int alt173=3;
             switch ( input.LA(1) ) {
             case 117:
@@ -21214,12 +21214,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             switch (alt173) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8484:5: this_BooleanLiteral_0= ruleBooleanLiteral
+                    // InternalRoom.g:8486:5: this_BooleanLiteral_0= ruleBooleanLiteral
                     {
                      
                             newCompositeNode(grammarAccess.getLiteralAccess().getBooleanLiteralParserRuleCall_0()); 
                         
-                    pushFollow(FOLLOW_ruleBooleanLiteral_in_ruleLiteral17752);
+                    pushFollow(FOLLOW_2);
                     this_BooleanLiteral_0=ruleBooleanLiteral();
 
                     state._fsp--;
@@ -21232,12 +21232,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8494:5: this_NumberLiteral_1= ruleNumberLiteral
+                    // InternalRoom.g:8496:5: this_NumberLiteral_1= ruleNumberLiteral
                     {
                      
                             newCompositeNode(grammarAccess.getLiteralAccess().getNumberLiteralParserRuleCall_1()); 
                         
-                    pushFollow(FOLLOW_ruleNumberLiteral_in_ruleLiteral17779);
+                    pushFollow(FOLLOW_2);
                     this_NumberLiteral_1=ruleNumberLiteral();
 
                     state._fsp--;
@@ -21250,12 +21250,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8504:5: this_StringLiteral_2= ruleStringLiteral
+                    // InternalRoom.g:8506:5: this_StringLiteral_2= ruleStringLiteral
                     {
                      
                             newCompositeNode(grammarAccess.getLiteralAccess().getStringLiteralParserRuleCall_2()); 
                         
-                    pushFollow(FOLLOW_ruleStringLiteral_in_ruleLiteral17806);
+                    pushFollow(FOLLOW_2);
                     this_StringLiteral_2=ruleStringLiteral();
 
                     state._fsp--;
@@ -21288,7 +21288,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleBooleanLiteral"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8520:1: entryRuleBooleanLiteral returns [EObject current=null] : iv_ruleBooleanLiteral= ruleBooleanLiteral EOF ;
+    // InternalRoom.g:8522:1: entryRuleBooleanLiteral returns [EObject current=null] : iv_ruleBooleanLiteral= ruleBooleanLiteral EOF ;
     public final EObject entryRuleBooleanLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -21296,17 +21296,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8521:2: (iv_ruleBooleanLiteral= ruleBooleanLiteral EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8522:2: iv_ruleBooleanLiteral= ruleBooleanLiteral EOF
+            // InternalRoom.g:8523:2: (iv_ruleBooleanLiteral= ruleBooleanLiteral EOF )
+            // InternalRoom.g:8524:2: iv_ruleBooleanLiteral= ruleBooleanLiteral EOF
             {
              newCompositeNode(grammarAccess.getBooleanLiteralRule()); 
-            pushFollow(FOLLOW_ruleBooleanLiteral_in_entryRuleBooleanLiteral17841);
+            pushFollow(FOLLOW_1);
             iv_ruleBooleanLiteral=ruleBooleanLiteral();
 
             state._fsp--;
 
              current =iv_ruleBooleanLiteral; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleBooleanLiteral17851); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -21324,7 +21324,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleBooleanLiteral"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8529:1: ruleBooleanLiteral returns [EObject current=null] : ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) ) ;
+    // InternalRoom.g:8531:1: ruleBooleanLiteral returns [EObject current=null] : ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) ) ;
     public final EObject ruleBooleanLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -21334,14 +21334,14 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8532:28: ( ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8533:1: ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) )
+            // InternalRoom.g:8534:28: ( ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) ) )
+            // InternalRoom.g:8535:1: ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8533:1: ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8533:2: () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) )
+            // InternalRoom.g:8535:1: ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) )
+            // InternalRoom.g:8535:2: () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8533:2: ()
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8534:5: 
+            // InternalRoom.g:8535:2: ()
+            // InternalRoom.g:8536:5: 
             {
 
                     current = forceCreateModelElement(
@@ -21351,7 +21351,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8539:2: (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) )
+            // InternalRoom.g:8541:2: (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) )
             int alt174=2;
             int LA174_0 = input.LA(1);
 
@@ -21369,9 +21369,9 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt174) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8539:4: otherlv_1= 'false'
+                    // InternalRoom.g:8541:4: otherlv_1= 'false'
                     {
-                    otherlv_1=(Token)match(input,117,FOLLOW_117_in_ruleBooleanLiteral17898); 
+                    otherlv_1=(Token)match(input,117,FOLLOW_2); 
 
                         	newLeafNode(otherlv_1, grammarAccess.getBooleanLiteralAccess().getFalseKeyword_1_0());
                         
@@ -21379,15 +21379,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8544:6: ( (lv_isTrue_2_0= 'true' ) )
+                    // InternalRoom.g:8546:6: ( (lv_isTrue_2_0= 'true' ) )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8544:6: ( (lv_isTrue_2_0= 'true' ) )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8545:1: (lv_isTrue_2_0= 'true' )
+                    // InternalRoom.g:8546:6: ( (lv_isTrue_2_0= 'true' ) )
+                    // InternalRoom.g:8547:1: (lv_isTrue_2_0= 'true' )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8545:1: (lv_isTrue_2_0= 'true' )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8546:3: lv_isTrue_2_0= 'true'
+                    // InternalRoom.g:8547:1: (lv_isTrue_2_0= 'true' )
+                    // InternalRoom.g:8548:3: lv_isTrue_2_0= 'true'
                     {
-                    lv_isTrue_2_0=(Token)match(input,118,FOLLOW_118_in_ruleBooleanLiteral17922); 
+                    lv_isTrue_2_0=(Token)match(input,118,FOLLOW_2); 
 
                             newLeafNode(lv_isTrue_2_0, grammarAccess.getBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0());
                         
@@ -21430,7 +21430,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleNumberLiteral"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8567:1: entryRuleNumberLiteral returns [EObject current=null] : iv_ruleNumberLiteral= ruleNumberLiteral EOF ;
+    // InternalRoom.g:8569:1: entryRuleNumberLiteral returns [EObject current=null] : iv_ruleNumberLiteral= ruleNumberLiteral EOF ;
     public final EObject entryRuleNumberLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -21438,17 +21438,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8568:2: (iv_ruleNumberLiteral= ruleNumberLiteral EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8569:2: iv_ruleNumberLiteral= ruleNumberLiteral EOF
+            // InternalRoom.g:8570:2: (iv_ruleNumberLiteral= ruleNumberLiteral EOF )
+            // InternalRoom.g:8571:2: iv_ruleNumberLiteral= ruleNumberLiteral EOF
             {
              newCompositeNode(grammarAccess.getNumberLiteralRule()); 
-            pushFollow(FOLLOW_ruleNumberLiteral_in_entryRuleNumberLiteral17972);
+            pushFollow(FOLLOW_1);
             iv_ruleNumberLiteral=ruleNumberLiteral();
 
             state._fsp--;
 
              current =iv_ruleNumberLiteral; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleNumberLiteral17982); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -21466,7 +21466,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleNumberLiteral"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8576:1: ruleNumberLiteral returns [EObject current=null] : (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral ) ;
+    // InternalRoom.g:8578:1: ruleNumberLiteral returns [EObject current=null] : (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral ) ;
     public final EObject ruleNumberLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -21478,10 +21478,10 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8579:28: ( (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8580:1: (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral )
+            // InternalRoom.g:8581:28: ( (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral ) )
+            // InternalRoom.g:8582:1: (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8580:1: (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral )
+            // InternalRoom.g:8582:1: (this_IntLiteral_0= ruleIntLiteral | this_RealLiteral_1= ruleRealLiteral )
             int alt175=2;
             switch ( input.LA(1) ) {
             case 119:
@@ -21491,12 +21491,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                 if ( (LA175_1==RULE_INT) ) {
                     int LA175_3 = input.LA(3);
 
-                    if ( (LA175_3==EOF||LA175_3==20||LA175_3==24) ) {
-                        alt175=1;
-                    }
-                    else if ( (LA175_3==71) ) {
+                    if ( (LA175_3==71) ) {
                         alt175=2;
                     }
+                    else if ( (LA175_3==EOF||LA175_3==20||LA175_3==24) ) {
+                        alt175=1;
+                    }
                     else {
                         NoViableAltException nvae =
                             new NoViableAltException("", 175, 3, input);
@@ -21519,12 +21519,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                 if ( (LA175_2==RULE_INT) ) {
                     int LA175_3 = input.LA(3);
 
-                    if ( (LA175_3==EOF||LA175_3==20||LA175_3==24) ) {
-                        alt175=1;
-                    }
-                    else if ( (LA175_3==71) ) {
+                    if ( (LA175_3==71) ) {
                         alt175=2;
                     }
+                    else if ( (LA175_3==EOF||LA175_3==20||LA175_3==24) ) {
+                        alt175=1;
+                    }
                     else {
                         NoViableAltException nvae =
                             new NoViableAltException("", 175, 3, input);
@@ -21544,12 +21544,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                 {
                 int LA175_3 = input.LA(2);
 
-                if ( (LA175_3==EOF||LA175_3==20||LA175_3==24) ) {
-                    alt175=1;
-                }
-                else if ( (LA175_3==71) ) {
+                if ( (LA175_3==71) ) {
                     alt175=2;
                 }
+                else if ( (LA175_3==EOF||LA175_3==20||LA175_3==24) ) {
+                    alt175=1;
+                }
                 else {
                     NoViableAltException nvae =
                         new NoViableAltException("", 175, 3, input);
@@ -21572,12 +21572,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             switch (alt175) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8581:5: this_IntLiteral_0= ruleIntLiteral
+                    // InternalRoom.g:8583:5: this_IntLiteral_0= ruleIntLiteral
                     {
                      
                             newCompositeNode(grammarAccess.getNumberLiteralAccess().getIntLiteralParserRuleCall_0()); 
                         
-                    pushFollow(FOLLOW_ruleIntLiteral_in_ruleNumberLiteral18029);
+                    pushFollow(FOLLOW_2);
                     this_IntLiteral_0=ruleIntLiteral();
 
                     state._fsp--;
@@ -21590,12 +21590,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8591:5: this_RealLiteral_1= ruleRealLiteral
+                    // InternalRoom.g:8593:5: this_RealLiteral_1= ruleRealLiteral
                     {
                      
                             newCompositeNode(grammarAccess.getNumberLiteralAccess().getRealLiteralParserRuleCall_1()); 
                         
-                    pushFollow(FOLLOW_ruleRealLiteral_in_ruleNumberLiteral18056);
+                    pushFollow(FOLLOW_2);
                     this_RealLiteral_1=ruleRealLiteral();
 
                     state._fsp--;
@@ -21628,7 +21628,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleRealLiteral"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8607:1: entryRuleRealLiteral returns [EObject current=null] : iv_ruleRealLiteral= ruleRealLiteral EOF ;
+    // InternalRoom.g:8609:1: entryRuleRealLiteral returns [EObject current=null] : iv_ruleRealLiteral= ruleRealLiteral EOF ;
     public final EObject entryRuleRealLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -21636,17 +21636,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8608:2: (iv_ruleRealLiteral= ruleRealLiteral EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8609:2: iv_ruleRealLiteral= ruleRealLiteral EOF
+            // InternalRoom.g:8610:2: (iv_ruleRealLiteral= ruleRealLiteral EOF )
+            // InternalRoom.g:8611:2: iv_ruleRealLiteral= ruleRealLiteral EOF
             {
              newCompositeNode(grammarAccess.getRealLiteralRule()); 
-            pushFollow(FOLLOW_ruleRealLiteral_in_entryRuleRealLiteral18091);
+            pushFollow(FOLLOW_1);
             iv_ruleRealLiteral=ruleRealLiteral();
 
             state._fsp--;
 
              current =iv_ruleRealLiteral; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRealLiteral18101); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -21664,7 +21664,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleRealLiteral"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8616:1: ruleRealLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= ruleReal ) ) ) ;
+    // InternalRoom.g:8618:1: ruleRealLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= ruleReal ) ) ) ;
     public final EObject ruleRealLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -21674,14 +21674,14 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8619:28: ( ( () ( (lv_value_1_0= ruleReal ) ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8620:1: ( () ( (lv_value_1_0= ruleReal ) ) )
+            // InternalRoom.g:8621:28: ( ( () ( (lv_value_1_0= ruleReal ) ) ) )
+            // InternalRoom.g:8622:1: ( () ( (lv_value_1_0= ruleReal ) ) )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8620:1: ( () ( (lv_value_1_0= ruleReal ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8620:2: () ( (lv_value_1_0= ruleReal ) )
+            // InternalRoom.g:8622:1: ( () ( (lv_value_1_0= ruleReal ) ) )
+            // InternalRoom.g:8622:2: () ( (lv_value_1_0= ruleReal ) )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8620:2: ()
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8621:5: 
+            // InternalRoom.g:8622:2: ()
+            // InternalRoom.g:8623:5: 
             {
 
                     current = forceCreateModelElement(
@@ -21691,16 +21691,16 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8626:2: ( (lv_value_1_0= ruleReal ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8627:1: (lv_value_1_0= ruleReal )
+            // InternalRoom.g:8628:2: ( (lv_value_1_0= ruleReal ) )
+            // InternalRoom.g:8629:1: (lv_value_1_0= ruleReal )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8627:1: (lv_value_1_0= ruleReal )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8628:3: lv_value_1_0= ruleReal
+            // InternalRoom.g:8629:1: (lv_value_1_0= ruleReal )
+            // InternalRoom.g:8630:3: lv_value_1_0= ruleReal
             {
              
             	        newCompositeNode(grammarAccess.getRealLiteralAccess().getValueRealParserRuleCall_1_0()); 
             	    
-            pushFollow(FOLLOW_ruleReal_in_ruleRealLiteral18156);
+            pushFollow(FOLLOW_2);
             lv_value_1_0=ruleReal();
 
             state._fsp--;
@@ -21713,7 +21713,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"value",
                     		lv_value_1_0, 
-                    		"Real");
+                    		"org.eclipse.etrice.core.common.Base.Real");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -21743,7 +21743,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleIntLiteral"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8652:1: entryRuleIntLiteral returns [EObject current=null] : iv_ruleIntLiteral= ruleIntLiteral EOF ;
+    // InternalRoom.g:8654:1: entryRuleIntLiteral returns [EObject current=null] : iv_ruleIntLiteral= ruleIntLiteral EOF ;
     public final EObject entryRuleIntLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -21751,17 +21751,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8653:2: (iv_ruleIntLiteral= ruleIntLiteral EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8654:2: iv_ruleIntLiteral= ruleIntLiteral EOF
+            // InternalRoom.g:8655:2: (iv_ruleIntLiteral= ruleIntLiteral EOF )
+            // InternalRoom.g:8656:2: iv_ruleIntLiteral= ruleIntLiteral EOF
             {
              newCompositeNode(grammarAccess.getIntLiteralRule()); 
-            pushFollow(FOLLOW_ruleIntLiteral_in_entryRuleIntLiteral18192);
+            pushFollow(FOLLOW_1);
             iv_ruleIntLiteral=ruleIntLiteral();
 
             state._fsp--;
 
              current =iv_ruleIntLiteral; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIntLiteral18202); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -21779,7 +21779,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleIntLiteral"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8661:1: ruleIntLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= ruleInteger ) ) ) ;
+    // InternalRoom.g:8663:1: ruleIntLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= ruleInteger ) ) ) ;
     public final EObject ruleIntLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -21789,14 +21789,14 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8664:28: ( ( () ( (lv_value_1_0= ruleInteger ) ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8665:1: ( () ( (lv_value_1_0= ruleInteger ) ) )
+            // InternalRoom.g:8666:28: ( ( () ( (lv_value_1_0= ruleInteger ) ) ) )
+            // InternalRoom.g:8667:1: ( () ( (lv_value_1_0= ruleInteger ) ) )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8665:1: ( () ( (lv_value_1_0= ruleInteger ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8665:2: () ( (lv_value_1_0= ruleInteger ) )
+            // InternalRoom.g:8667:1: ( () ( (lv_value_1_0= ruleInteger ) ) )
+            // InternalRoom.g:8667:2: () ( (lv_value_1_0= ruleInteger ) )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8665:2: ()
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8666:5: 
+            // InternalRoom.g:8667:2: ()
+            // InternalRoom.g:8668:5: 
             {
 
                     current = forceCreateModelElement(
@@ -21806,16 +21806,16 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8671:2: ( (lv_value_1_0= ruleInteger ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8672:1: (lv_value_1_0= ruleInteger )
+            // InternalRoom.g:8673:2: ( (lv_value_1_0= ruleInteger ) )
+            // InternalRoom.g:8674:1: (lv_value_1_0= ruleInteger )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8672:1: (lv_value_1_0= ruleInteger )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8673:3: lv_value_1_0= ruleInteger
+            // InternalRoom.g:8674:1: (lv_value_1_0= ruleInteger )
+            // InternalRoom.g:8675:3: lv_value_1_0= ruleInteger
             {
              
             	        newCompositeNode(grammarAccess.getIntLiteralAccess().getValueIntegerParserRuleCall_1_0()); 
             	    
-            pushFollow(FOLLOW_ruleInteger_in_ruleIntLiteral18257);
+            pushFollow(FOLLOW_2);
             lv_value_1_0=ruleInteger();
 
             state._fsp--;
@@ -21828,7 +21828,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"value",
                     		lv_value_1_0, 
-                    		"Integer");
+                    		"org.eclipse.etrice.core.common.Base.Integer");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -21858,7 +21858,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleStringLiteral"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8697:1: entryRuleStringLiteral returns [EObject current=null] : iv_ruleStringLiteral= ruleStringLiteral EOF ;
+    // InternalRoom.g:8699:1: entryRuleStringLiteral returns [EObject current=null] : iv_ruleStringLiteral= ruleStringLiteral EOF ;
     public final EObject entryRuleStringLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -21866,17 +21866,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8698:2: (iv_ruleStringLiteral= ruleStringLiteral EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8699:2: iv_ruleStringLiteral= ruleStringLiteral EOF
+            // InternalRoom.g:8700:2: (iv_ruleStringLiteral= ruleStringLiteral EOF )
+            // InternalRoom.g:8701:2: iv_ruleStringLiteral= ruleStringLiteral EOF
             {
              newCompositeNode(grammarAccess.getStringLiteralRule()); 
-            pushFollow(FOLLOW_ruleStringLiteral_in_entryRuleStringLiteral18293);
+            pushFollow(FOLLOW_1);
             iv_ruleStringLiteral=ruleStringLiteral();
 
             state._fsp--;
 
              current =iv_ruleStringLiteral; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleStringLiteral18303); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -21894,7 +21894,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleStringLiteral"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8706:1: ruleStringLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= RULE_STRING ) ) ) ;
+    // InternalRoom.g:8708:1: ruleStringLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= RULE_STRING ) ) ) ;
     public final EObject ruleStringLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -21903,14 +21903,14 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8709:28: ( ( () ( (lv_value_1_0= RULE_STRING ) ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8710:1: ( () ( (lv_value_1_0= RULE_STRING ) ) )
+            // InternalRoom.g:8711:28: ( ( () ( (lv_value_1_0= RULE_STRING ) ) ) )
+            // InternalRoom.g:8712:1: ( () ( (lv_value_1_0= RULE_STRING ) ) )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8710:1: ( () ( (lv_value_1_0= RULE_STRING ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8710:2: () ( (lv_value_1_0= RULE_STRING ) )
+            // InternalRoom.g:8712:1: ( () ( (lv_value_1_0= RULE_STRING ) ) )
+            // InternalRoom.g:8712:2: () ( (lv_value_1_0= RULE_STRING ) )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8710:2: ()
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8711:5: 
+            // InternalRoom.g:8712:2: ()
+            // InternalRoom.g:8713:5: 
             {
 
                     current = forceCreateModelElement(
@@ -21920,13 +21920,13 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8716:2: ( (lv_value_1_0= RULE_STRING ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8717:1: (lv_value_1_0= RULE_STRING )
+            // InternalRoom.g:8718:2: ( (lv_value_1_0= RULE_STRING ) )
+            // InternalRoom.g:8719:1: (lv_value_1_0= RULE_STRING )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8717:1: (lv_value_1_0= RULE_STRING )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8718:3: lv_value_1_0= RULE_STRING
+            // InternalRoom.g:8719:1: (lv_value_1_0= RULE_STRING )
+            // InternalRoom.g:8720:3: lv_value_1_0= RULE_STRING
             {
-            lv_value_1_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleStringLiteral18354); 
+            lv_value_1_0=(Token)match(input,RULE_STRING,FOLLOW_2); 
 
             			newLeafNode(lv_value_1_0, grammarAccess.getStringLiteralAccess().getValueSTRINGTerminalRuleCall_1_0()); 
             		
@@ -21938,7 +21938,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                    			current, 
                    			"value",
                     		lv_value_1_0, 
-                    		"STRING");
+                    		"org.eclipse.xtext.common.Terminals.STRING");
             	    
 
             }
@@ -21967,7 +21967,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleInteger"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8742:1: entryRuleInteger returns [String current=null] : iv_ruleInteger= ruleInteger EOF ;
+    // InternalRoom.g:8744:1: entryRuleInteger returns [String current=null] : iv_ruleInteger= ruleInteger EOF ;
     public final String entryRuleInteger() throws RecognitionException {
         String current = null;
 
@@ -21975,17 +21975,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8743:2: (iv_ruleInteger= ruleInteger EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8744:2: iv_ruleInteger= ruleInteger EOF
+            // InternalRoom.g:8745:2: (iv_ruleInteger= ruleInteger EOF )
+            // InternalRoom.g:8746:2: iv_ruleInteger= ruleInteger EOF
             {
              newCompositeNode(grammarAccess.getIntegerRule()); 
-            pushFollow(FOLLOW_ruleInteger_in_entryRuleInteger18396);
+            pushFollow(FOLLOW_1);
             iv_ruleInteger=ruleInteger();
 
             state._fsp--;
 
              current =iv_ruleInteger.getText(); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleInteger18407); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -22003,7 +22003,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleInteger"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8751:1: ruleInteger returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT ) | this_HEX_3= RULE_HEX ) ;
+    // InternalRoom.g:8753: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();
 
@@ -22014,10 +22014,10 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8754:28: ( ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT ) | this_HEX_3= RULE_HEX ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8755:1: ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT ) | this_HEX_3= RULE_HEX )
+            // InternalRoom.g:8756:28: ( ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT ) | this_HEX_3= RULE_HEX ) )
+            // InternalRoom.g:8757:1: ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT ) | this_HEX_3= RULE_HEX )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8755:1: ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT ) | this_HEX_3= RULE_HEX )
+            // InternalRoom.g:8757:1: ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT ) | this_HEX_3= RULE_HEX )
             int alt177=2;
             int LA177_0 = input.LA(1);
 
@@ -22035,12 +22035,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt177) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8755:2: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT )
+                    // InternalRoom.g:8757:2: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8755:2: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8755:3: (kw= '+' | kw= '-' )? this_INT_2= RULE_INT
+                    // InternalRoom.g:8757:2: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT )
+                    // InternalRoom.g:8757:3: (kw= '+' | kw= '-' )? this_INT_2= RULE_INT
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8755:3: (kw= '+' | kw= '-' )?
+                    // InternalRoom.g:8757:3: (kw= '+' | kw= '-' )?
                     int alt176=3;
                     int LA176_0 = input.LA(1);
 
@@ -22052,9 +22052,9 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     switch (alt176) {
                         case 1 :
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8756:2: kw= '+'
+                            // InternalRoom.g:8758:2: kw= '+'
                             {
-                            kw=(Token)match(input,119,FOLLOW_119_in_ruleInteger18447); 
+                            kw=(Token)match(input,119,FOLLOW_31); 
 
                                     current.merge(kw);
                                     newLeafNode(kw, grammarAccess.getIntegerAccess().getPlusSignKeyword_0_0_0()); 
@@ -22063,9 +22063,9 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                             }
                             break;
                         case 2 :
-                            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8763:2: kw= '-'
+                            // InternalRoom.g:8765:2: kw= '-'
                             {
-                            kw=(Token)match(input,120,FOLLOW_120_in_ruleInteger18466); 
+                            kw=(Token)match(input,120,FOLLOW_31); 
 
                                     current.merge(kw);
                                     newLeafNode(kw, grammarAccess.getIntegerAccess().getHyphenMinusKeyword_0_0_1()); 
@@ -22076,7 +22076,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    this_INT_2=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleInteger18483); 
+                    this_INT_2=(Token)match(input,RULE_INT,FOLLOW_2); 
 
                     		current.merge(this_INT_2);
                         
@@ -22090,9 +22090,9 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8776:10: this_HEX_3= RULE_HEX
+                    // InternalRoom.g:8778:10: this_HEX_3= RULE_HEX
                     {
-                    this_HEX_3=(Token)match(input,RULE_HEX,FOLLOW_RULE_HEX_in_ruleInteger18510); 
+                    this_HEX_3=(Token)match(input,RULE_HEX,FOLLOW_2); 
 
                     		current.merge(this_HEX_3);
                         
@@ -22123,7 +22123,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleReal"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8791:1: entryRuleReal returns [String current=null] : iv_ruleReal= ruleReal EOF ;
+    // InternalRoom.g:8793:1: entryRuleReal returns [String current=null] : iv_ruleReal= ruleReal EOF ;
     public final String entryRuleReal() throws RecognitionException {
         String current = null;
 
@@ -22131,17 +22131,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8792:2: (iv_ruleReal= ruleReal EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8793:2: iv_ruleReal= ruleReal EOF
+            // InternalRoom.g:8794:2: (iv_ruleReal= ruleReal EOF )
+            // InternalRoom.g:8795:2: iv_ruleReal= ruleReal EOF
             {
              newCompositeNode(grammarAccess.getRealRule()); 
-            pushFollow(FOLLOW_ruleReal_in_entryRuleReal18556);
+            pushFollow(FOLLOW_1);
             iv_ruleReal=ruleReal();
 
             state._fsp--;
 
              current =iv_ruleReal.getText(); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleReal18567); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -22159,7 +22159,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleReal"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8800:1: ruleReal returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_Decimal_0= ruleDecimal | this_DecimalExp_1= ruleDecimalExp ) ;
+    // InternalRoom.g:8802: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();
 
@@ -22171,10 +22171,10 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8803:28: ( (this_Decimal_0= ruleDecimal | this_DecimalExp_1= ruleDecimalExp ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8804:1: (this_Decimal_0= ruleDecimal | this_DecimalExp_1= ruleDecimalExp )
+            // InternalRoom.g:8805:28: ( (this_Decimal_0= ruleDecimal | this_DecimalExp_1= ruleDecimalExp ) )
+            // InternalRoom.g:8806:1: (this_Decimal_0= ruleDecimal | this_DecimalExp_1= ruleDecimalExp )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8804:1: (this_Decimal_0= ruleDecimal | this_DecimalExp_1= ruleDecimalExp )
+            // InternalRoom.g:8806:1: (this_Decimal_0= ruleDecimal | this_DecimalExp_1= ruleDecimalExp )
             int alt178=2;
             switch ( input.LA(1) ) {
             case 119:
@@ -22190,12 +22190,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                         if ( (LA178_4==RULE_INT) ) {
                             int LA178_5 = input.LA(5);
 
-                            if ( (LA178_5==EOF||LA178_5==20||LA178_5==24) ) {
-                                alt178=1;
-                            }
-                            else if ( ((LA178_5>=121 && LA178_5<=122)) ) {
+                            if ( ((LA178_5>=121 && LA178_5<=122)) ) {
                                 alt178=2;
                             }
+                            else if ( (LA178_5==EOF||LA178_5==20||LA178_5==24) ) {
+                                alt178=1;
+                            }
                             else {
                                 NoViableAltException nvae =
                                     new NoViableAltException("", 178, 5, input);
@@ -22238,12 +22238,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                         if ( (LA178_4==RULE_INT) ) {
                             int LA178_5 = input.LA(5);
 
-                            if ( (LA178_5==EOF||LA178_5==20||LA178_5==24) ) {
-                                alt178=1;
-                            }
-                            else if ( ((LA178_5>=121 && LA178_5<=122)) ) {
+                            if ( ((LA178_5>=121 && LA178_5<=122)) ) {
                                 alt178=2;
                             }
+                            else if ( (LA178_5==EOF||LA178_5==20||LA178_5==24) ) {
+                                alt178=1;
+                            }
                             else {
                                 NoViableAltException nvae =
                                     new NoViableAltException("", 178, 5, input);
@@ -22283,12 +22283,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     if ( (LA178_4==RULE_INT) ) {
                         int LA178_5 = input.LA(4);
 
-                        if ( (LA178_5==EOF||LA178_5==20||LA178_5==24) ) {
-                            alt178=1;
-                        }
-                        else if ( ((LA178_5>=121 && LA178_5<=122)) ) {
+                        if ( ((LA178_5>=121 && LA178_5<=122)) ) {
                             alt178=2;
                         }
+                        else if ( (LA178_5==EOF||LA178_5==20||LA178_5==24) ) {
+                            alt178=1;
+                        }
                         else {
                             NoViableAltException nvae =
                                 new NoViableAltException("", 178, 5, input);
@@ -22320,12 +22320,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             switch (alt178) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8805:5: this_Decimal_0= ruleDecimal
+                    // InternalRoom.g:8807:5: this_Decimal_0= ruleDecimal
                     {
                      
                             newCompositeNode(grammarAccess.getRealAccess().getDecimalParserRuleCall_0()); 
                         
-                    pushFollow(FOLLOW_ruleDecimal_in_ruleReal18614);
+                    pushFollow(FOLLOW_2);
                     this_Decimal_0=ruleDecimal();
 
                     state._fsp--;
@@ -22340,12 +22340,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8817:5: this_DecimalExp_1= ruleDecimalExp
+                    // InternalRoom.g:8819:5: this_DecimalExp_1= ruleDecimalExp
                     {
                      
                             newCompositeNode(grammarAccess.getRealAccess().getDecimalExpParserRuleCall_1()); 
                         
-                    pushFollow(FOLLOW_ruleDecimalExp_in_ruleReal18647);
+                    pushFollow(FOLLOW_2);
                     this_DecimalExp_1=ruleDecimalExp();
 
                     state._fsp--;
@@ -22380,7 +22380,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleDecimal"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8835:1: entryRuleDecimal returns [String current=null] : iv_ruleDecimal= ruleDecimal EOF ;
+    // InternalRoom.g:8837:1: entryRuleDecimal returns [String current=null] : iv_ruleDecimal= ruleDecimal EOF ;
     public final String entryRuleDecimal() throws RecognitionException {
         String current = null;
 
@@ -22391,17 +22391,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
         	
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8839:2: (iv_ruleDecimal= ruleDecimal EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8840:2: iv_ruleDecimal= ruleDecimal EOF
+            // InternalRoom.g:8841:2: (iv_ruleDecimal= ruleDecimal EOF )
+            // InternalRoom.g:8842:2: iv_ruleDecimal= ruleDecimal EOF
             {
              newCompositeNode(grammarAccess.getDecimalRule()); 
-            pushFollow(FOLLOW_ruleDecimal_in_entryRuleDecimal18699);
+            pushFollow(FOLLOW_1);
             iv_ruleDecimal=ruleDecimal();
 
             state._fsp--;
 
              current =iv_ruleDecimal.getText(); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDecimal18710); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -22422,7 +22422,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleDecimal"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8850:1: ruleDecimal returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT ) ;
+    // InternalRoom.g:8852: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();
 
@@ -22434,13 +22434,13 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8854:28: ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8855:1: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT )
+            // InternalRoom.g:8856:28: ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT ) )
+            // InternalRoom.g:8857:1: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8855:1: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8855:2: (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT
+            // InternalRoom.g:8857:1: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT )
+            // InternalRoom.g:8857:2: (kw= '+' | kw= '-' )? this_INT_2= RULE_INT kw= '.' this_INT_4= RULE_INT
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8855:2: (kw= '+' | kw= '-' )?
+            // InternalRoom.g:8857:2: (kw= '+' | kw= '-' )?
             int alt179=3;
             int LA179_0 = input.LA(1);
 
@@ -22452,9 +22452,9 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt179) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8856:2: kw= '+'
+                    // InternalRoom.g:8858:2: kw= '+'
                     {
-                    kw=(Token)match(input,119,FOLLOW_119_in_ruleDecimal18753); 
+                    kw=(Token)match(input,119,FOLLOW_31); 
 
                             current.merge(kw);
                             newLeafNode(kw, grammarAccess.getDecimalAccess().getPlusSignKeyword_0_0()); 
@@ -22463,9 +22463,9 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8863:2: kw= '-'
+                    // InternalRoom.g:8865:2: kw= '-'
                     {
-                    kw=(Token)match(input,120,FOLLOW_120_in_ruleDecimal18772); 
+                    kw=(Token)match(input,120,FOLLOW_31); 
 
                             current.merge(kw);
                             newLeafNode(kw, grammarAccess.getDecimalAccess().getHyphenMinusKeyword_0_1()); 
@@ -22476,19 +22476,19 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            this_INT_2=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleDecimal18789); 
+            this_INT_2=(Token)match(input,RULE_INT,FOLLOW_85); 
 
             		current.merge(this_INT_2);
                 
              
                 newLeafNode(this_INT_2, grammarAccess.getDecimalAccess().getINTTerminalRuleCall_1()); 
                 
-            kw=(Token)match(input,71,FOLLOW_71_in_ruleDecimal18807); 
+            kw=(Token)match(input,71,FOLLOW_31); 
 
                     current.merge(kw);
                     newLeafNode(kw, grammarAccess.getDecimalAccess().getFullStopKeyword_2()); 
                 
-            this_INT_4=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleDecimal18822); 
+            this_INT_4=(Token)match(input,RULE_INT,FOLLOW_2); 
 
             		current.merge(this_INT_4);
                 
@@ -22519,7 +22519,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleDecimalExp"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8899:1: entryRuleDecimalExp returns [String current=null] : iv_ruleDecimalExp= ruleDecimalExp EOF ;
+    // InternalRoom.g:8901:1: entryRuleDecimalExp returns [String current=null] : iv_ruleDecimalExp= ruleDecimalExp EOF ;
     public final String entryRuleDecimalExp() throws RecognitionException {
         String current = null;
 
@@ -22530,17 +22530,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
         	
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8903:2: (iv_ruleDecimalExp= ruleDecimalExp EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8904:2: iv_ruleDecimalExp= ruleDecimalExp EOF
+            // InternalRoom.g:8905:2: (iv_ruleDecimalExp= ruleDecimalExp EOF )
+            // InternalRoom.g:8906:2: iv_ruleDecimalExp= ruleDecimalExp EOF
             {
              newCompositeNode(grammarAccess.getDecimalExpRule()); 
-            pushFollow(FOLLOW_ruleDecimalExp_in_entryRuleDecimalExp18878);
+            pushFollow(FOLLOW_1);
             iv_ruleDecimalExp=ruleDecimalExp();
 
             state._fsp--;
 
              current =iv_ruleDecimalExp.getText(); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDecimalExp18889); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -22561,7 +22561,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleDecimalExp"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8914: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 ) ;
+    // InternalRoom.g:8916: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();
 
@@ -22574,13 +22574,13 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8918: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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8919: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 )
+            // InternalRoom.g:8920: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 ) )
+            // InternalRoom.g:8921: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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8919: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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8919: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
+            // InternalRoom.g:8921: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 )
+            // InternalRoom.g:8921: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.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8919:2: (kw= '+' | kw= '-' )?
+            // InternalRoom.g:8921:2: (kw= '+' | kw= '-' )?
             int alt180=3;
             int LA180_0 = input.LA(1);
 
@@ -22592,9 +22592,9 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt180) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8920:2: kw= '+'
+                    // InternalRoom.g:8922:2: kw= '+'
                     {
-                    kw=(Token)match(input,119,FOLLOW_119_in_ruleDecimalExp18932); 
+                    kw=(Token)match(input,119,FOLLOW_31); 
 
                             current.merge(kw);
                             newLeafNode(kw, grammarAccess.getDecimalExpAccess().getPlusSignKeyword_0_0()); 
@@ -22603,9 +22603,9 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8927:2: kw= '-'
+                    // InternalRoom.g:8929:2: kw= '-'
                     {
-                    kw=(Token)match(input,120,FOLLOW_120_in_ruleDecimalExp18951); 
+                    kw=(Token)match(input,120,FOLLOW_31); 
 
                             current.merge(kw);
                             newLeafNode(kw, grammarAccess.getDecimalExpAccess().getHyphenMinusKeyword_0_1()); 
@@ -22616,26 +22616,26 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            this_INT_2=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleDecimalExp18968); 
+            this_INT_2=(Token)match(input,RULE_INT,FOLLOW_85); 
 
             		current.merge(this_INT_2);
                 
              
                 newLeafNode(this_INT_2, grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_1()); 
                 
-            kw=(Token)match(input,71,FOLLOW_71_in_ruleDecimalExp18986); 
+            kw=(Token)match(input,71,FOLLOW_31); 
 
                     current.merge(kw);
                     newLeafNode(kw, grammarAccess.getDecimalExpAccess().getFullStopKeyword_2()); 
                 
-            this_INT_4=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleDecimalExp19001); 
+            this_INT_4=(Token)match(input,RULE_INT,FOLLOW_128); 
 
             		current.merge(this_INT_4);
                 
              
                 newLeafNode(this_INT_4, grammarAccess.getDecimalExpAccess().getINTTerminalRuleCall_3()); 
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8952:1: (kw= 'e' | kw= 'E' )
+            // InternalRoom.g:8954:1: (kw= 'e' | kw= 'E' )
             int alt181=2;
             int LA181_0 = input.LA(1);
 
@@ -22653,9 +22653,9 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt181) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8953:2: kw= 'e'
+                    // InternalRoom.g:8955:2: kw= 'e'
                     {
-                    kw=(Token)match(input,121,FOLLOW_121_in_ruleDecimalExp19020); 
+                    kw=(Token)match(input,121,FOLLOW_129); 
 
                             current.merge(kw);
                             newLeafNode(kw, grammarAccess.getDecimalExpAccess().getEKeyword_4_0()); 
@@ -22664,9 +22664,9 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8960:2: kw= 'E'
+                    // InternalRoom.g:8962:2: kw= 'E'
                     {
-                    kw=(Token)match(input,122,FOLLOW_122_in_ruleDecimalExp19039); 
+                    kw=(Token)match(input,122,FOLLOW_129); 
 
                             current.merge(kw);
                             newLeafNode(kw, grammarAccess.getDecimalExpAccess().getEKeyword_4_1()); 
@@ -22677,7 +22677,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8965:2: (kw= '+' | kw= '-' )?
+            // InternalRoom.g:8967:2: (kw= '+' | kw= '-' )?
             int alt182=3;
             int LA182_0 = input.LA(1);
 
@@ -22689,9 +22689,9 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt182) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8966:2: kw= '+'
+                    // InternalRoom.g:8968:2: kw= '+'
                     {
-                    kw=(Token)match(input,119,FOLLOW_119_in_ruleDecimalExp19054); 
+                    kw=(Token)match(input,119,FOLLOW_31); 
 
                             current.merge(kw);
                             newLeafNode(kw, grammarAccess.getDecimalExpAccess().getPlusSignKeyword_5_0()); 
@@ -22700,9 +22700,9 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8973:2: kw= '-'
+                    // InternalRoom.g:8975:2: kw= '-'
                     {
-                    kw=(Token)match(input,120,FOLLOW_120_in_ruleDecimalExp19073); 
+                    kw=(Token)match(input,120,FOLLOW_31); 
 
                             current.merge(kw);
                             newLeafNode(kw, grammarAccess.getDecimalExpAccess().getHyphenMinusKeyword_5_1()); 
@@ -22713,7 +22713,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             }
 
-            this_INT_9=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleDecimalExp19090); 
+            this_INT_9=(Token)match(input,RULE_INT,FOLLOW_2); 
 
             		current.merge(this_INT_9);
                 
@@ -22744,7 +22744,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleFQN"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8996:1: entryRuleFQN returns [String current=null] : iv_ruleFQN= ruleFQN EOF ;
+    // InternalRoom.g:8998:1: entryRuleFQN returns [String current=null] : iv_ruleFQN= ruleFQN EOF ;
     public final String entryRuleFQN() throws RecognitionException {
         String current = null;
 
@@ -22752,17 +22752,17 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8997:2: (iv_ruleFQN= ruleFQN EOF )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:8998:2: iv_ruleFQN= ruleFQN EOF
+            // InternalRoom.g:8999:2: (iv_ruleFQN= ruleFQN EOF )
+            // InternalRoom.g:9000:2: iv_ruleFQN= ruleFQN EOF
             {
              newCompositeNode(grammarAccess.getFQNRule()); 
-            pushFollow(FOLLOW_ruleFQN_in_entryRuleFQN19140);
+            pushFollow(FOLLOW_1);
             iv_ruleFQN=ruleFQN();
 
             state._fsp--;
 
              current =iv_ruleFQN.getText(); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleFQN19151); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -22780,7 +22780,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleFQN"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9005:1: ruleFQN returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* ) ;
+    // InternalRoom.g:9007: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();
 
@@ -22791,20 +22791,20 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9008:28: ( (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9009:1: (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* )
+            // InternalRoom.g:9010:28: ( (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* ) )
+            // InternalRoom.g:9011:1: (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9009:1: (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9009:6: this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )*
+            // InternalRoom.g:9011:1: (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* )
+            // InternalRoom.g:9011:6: this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )*
             {
-            this_ID_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFQN19191); 
+            this_ID_0=(Token)match(input,RULE_ID,FOLLOW_130); 
 
             		current.merge(this_ID_0);
                 
              
                 newLeafNode(this_ID_0, grammarAccess.getFQNAccess().getIDTerminalRuleCall_0()); 
                 
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9016:1: (kw= '.' this_ID_2= RULE_ID )*
+            // InternalRoom.g:9018:1: (kw= '.' this_ID_2= RULE_ID )*
             loop183:
             do {
                 int alt183=2;
@@ -22817,14 +22817,14 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
                 switch (alt183) {
             	case 1 :
-            	    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9017:2: kw= '.' this_ID_2= RULE_ID
+            	    // InternalRoom.g:9019:2: kw= '.' this_ID_2= RULE_ID
             	    {
-            	    kw=(Token)match(input,71,FOLLOW_71_in_ruleFQN19210); 
+            	    kw=(Token)match(input,71,FOLLOW_3); 
 
             	            current.merge(kw);
             	            newLeafNode(kw, grammarAccess.getFQNAccess().getFullStopKeyword_1_0()); 
             	        
-            	    this_ID_2=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFQN19225); 
+            	    this_ID_2=(Token)match(input,RULE_ID,FOLLOW_130); 
 
             	    		current.merge(this_ID_2);
             	        
@@ -22861,7 +22861,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleCommunicationType"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9037:1: ruleCommunicationType returns [Enumerator current=null] : ( (enumLiteral_0= 'eventdriven' ) | (enumLiteral_1= 'datadriven' ) | (enumLiteral_2= 'sync' ) ) ;
+    // InternalRoom.g:9039:1: ruleCommunicationType returns [Enumerator current=null] : ( (enumLiteral_0= 'eventdriven' ) | (enumLiteral_1= 'datadriven' ) | (enumLiteral_2= 'sync' ) ) ;
     public final Enumerator ruleCommunicationType() throws RecognitionException {
         Enumerator current = null;
 
@@ -22871,10 +22871,10 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
          enterRule(); 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9039:28: ( ( (enumLiteral_0= 'eventdriven' ) | (enumLiteral_1= 'datadriven' ) | (enumLiteral_2= 'sync' ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9040:1: ( (enumLiteral_0= 'eventdriven' ) | (enumLiteral_1= 'datadriven' ) | (enumLiteral_2= 'sync' ) )
+            // InternalRoom.g:9041:28: ( ( (enumLiteral_0= 'eventdriven' ) | (enumLiteral_1= 'datadriven' ) | (enumLiteral_2= 'sync' ) ) )
+            // InternalRoom.g:9042:1: ( (enumLiteral_0= 'eventdriven' ) | (enumLiteral_1= 'datadriven' ) | (enumLiteral_2= 'sync' ) )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9040:1: ( (enumLiteral_0= 'eventdriven' ) | (enumLiteral_1= 'datadriven' ) | (enumLiteral_2= 'sync' ) )
+            // InternalRoom.g:9042:1: ( (enumLiteral_0= 'eventdriven' ) | (enumLiteral_1= 'datadriven' ) | (enumLiteral_2= 'sync' ) )
             int alt184=3;
             switch ( input.LA(1) ) {
             case 123:
@@ -22901,12 +22901,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             switch (alt184) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9040:2: (enumLiteral_0= 'eventdriven' )
+                    // InternalRoom.g:9042:2: (enumLiteral_0= 'eventdriven' )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9040:2: (enumLiteral_0= 'eventdriven' )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9040:4: enumLiteral_0= 'eventdriven'
+                    // InternalRoom.g:9042:2: (enumLiteral_0= 'eventdriven' )
+                    // InternalRoom.g:9042:4: enumLiteral_0= 'eventdriven'
                     {
-                    enumLiteral_0=(Token)match(input,123,FOLLOW_123_in_ruleCommunicationType19286); 
+                    enumLiteral_0=(Token)match(input,123,FOLLOW_2); 
 
                             current = grammarAccess.getCommunicationTypeAccess().getEVENT_DRIVENEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
                             newLeafNode(enumLiteral_0, grammarAccess.getCommunicationTypeAccess().getEVENT_DRIVENEnumLiteralDeclaration_0()); 
@@ -22918,12 +22918,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9046:6: (enumLiteral_1= 'datadriven' )
+                    // InternalRoom.g:9048:6: (enumLiteral_1= 'datadriven' )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9046:6: (enumLiteral_1= 'datadriven' )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9046:8: enumLiteral_1= 'datadriven'
+                    // InternalRoom.g:9048:6: (enumLiteral_1= 'datadriven' )
+                    // InternalRoom.g:9048:8: enumLiteral_1= 'datadriven'
                     {
-                    enumLiteral_1=(Token)match(input,124,FOLLOW_124_in_ruleCommunicationType19303); 
+                    enumLiteral_1=(Token)match(input,124,FOLLOW_2); 
 
                             current = grammarAccess.getCommunicationTypeAccess().getDATA_DRIVENEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
                             newLeafNode(enumLiteral_1, grammarAccess.getCommunicationTypeAccess().getDATA_DRIVENEnumLiteralDeclaration_1()); 
@@ -22935,12 +22935,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9052:6: (enumLiteral_2= 'sync' )
+                    // InternalRoom.g:9054:6: (enumLiteral_2= 'sync' )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9052:6: (enumLiteral_2= 'sync' )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9052:8: enumLiteral_2= 'sync'
+                    // InternalRoom.g:9054:6: (enumLiteral_2= 'sync' )
+                    // InternalRoom.g:9054:8: enumLiteral_2= 'sync'
                     {
-                    enumLiteral_2=(Token)match(input,125,FOLLOW_125_in_ruleCommunicationType19320); 
+                    enumLiteral_2=(Token)match(input,125,FOLLOW_2); 
 
                             current = grammarAccess.getCommunicationTypeAccess().getSYNCHRONOUSEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
                             newLeafNode(enumLiteral_2, grammarAccess.getCommunicationTypeAccess().getSYNCHRONOUSEnumLiteralDeclaration_2()); 
@@ -22972,7 +22972,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleReferenceType"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9062:1: ruleReferenceType returns [Enumerator current=null] : ( (enumLiteral_0= 'fixed' ) | (enumLiteral_1= 'optional' ) ) ;
+    // InternalRoom.g:9064:1: ruleReferenceType returns [Enumerator current=null] : ( (enumLiteral_0= 'fixed' ) | (enumLiteral_1= 'optional' ) ) ;
     public final Enumerator ruleReferenceType() throws RecognitionException {
         Enumerator current = null;
 
@@ -22981,10 +22981,10 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
          enterRule(); 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9064:28: ( ( (enumLiteral_0= 'fixed' ) | (enumLiteral_1= 'optional' ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9065:1: ( (enumLiteral_0= 'fixed' ) | (enumLiteral_1= 'optional' ) )
+            // InternalRoom.g:9066:28: ( ( (enumLiteral_0= 'fixed' ) | (enumLiteral_1= 'optional' ) ) )
+            // InternalRoom.g:9067:1: ( (enumLiteral_0= 'fixed' ) | (enumLiteral_1= 'optional' ) )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9065:1: ( (enumLiteral_0= 'fixed' ) | (enumLiteral_1= 'optional' ) )
+            // InternalRoom.g:9067:1: ( (enumLiteral_0= 'fixed' ) | (enumLiteral_1= 'optional' ) )
             int alt185=2;
             int LA185_0 = input.LA(1);
 
@@ -23002,12 +23002,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             }
             switch (alt185) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9065:2: (enumLiteral_0= 'fixed' )
+                    // InternalRoom.g:9067:2: (enumLiteral_0= 'fixed' )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9065:2: (enumLiteral_0= 'fixed' )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9065:4: enumLiteral_0= 'fixed'
+                    // InternalRoom.g:9067:2: (enumLiteral_0= 'fixed' )
+                    // InternalRoom.g:9067:4: enumLiteral_0= 'fixed'
                     {
-                    enumLiteral_0=(Token)match(input,126,FOLLOW_126_in_ruleReferenceType19365); 
+                    enumLiteral_0=(Token)match(input,126,FOLLOW_2); 
 
                             current = grammarAccess.getReferenceTypeAccess().getFIXEDEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
                             newLeafNode(enumLiteral_0, grammarAccess.getReferenceTypeAccess().getFIXEDEnumLiteralDeclaration_0()); 
@@ -23019,12 +23019,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9071:6: (enumLiteral_1= 'optional' )
+                    // InternalRoom.g:9073:6: (enumLiteral_1= 'optional' )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9071:6: (enumLiteral_1= 'optional' )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9071:8: enumLiteral_1= 'optional'
+                    // InternalRoom.g:9073:6: (enumLiteral_1= 'optional' )
+                    // InternalRoom.g:9073:8: enumLiteral_1= 'optional'
                     {
-                    enumLiteral_1=(Token)match(input,110,FOLLOW_110_in_ruleReferenceType19382); 
+                    enumLiteral_1=(Token)match(input,110,FOLLOW_2); 
 
                             current = grammarAccess.getReferenceTypeAccess().getOPTIONALEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
                             newLeafNode(enumLiteral_1, grammarAccess.getReferenceTypeAccess().getOPTIONALEnumLiteralDeclaration_1()); 
@@ -23056,7 +23056,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleComponentCommunicationType"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9083:1: ruleComponentCommunicationType returns [Enumerator current=null] : ( (enumLiteral_0= 'eventdriven' ) | (enumLiteral_1= 'datadriven' ) | (enumLiteral_2= 'async' ) | (enumLiteral_3= 'sync' ) ) ;
+    // InternalRoom.g:9085: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;
 
@@ -23067,10 +23067,10 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
          enterRule(); 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9085:28: ( ( (enumLiteral_0= 'eventdriven' ) | (enumLiteral_1= 'datadriven' ) | (enumLiteral_2= 'async' ) | (enumLiteral_3= 'sync' ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9086:1: ( (enumLiteral_0= 'eventdriven' ) | (enumLiteral_1= 'datadriven' ) | (enumLiteral_2= 'async' ) | (enumLiteral_3= 'sync' ) )
+            // InternalRoom.g:9087:28: ( ( (enumLiteral_0= 'eventdriven' ) | (enumLiteral_1= 'datadriven' ) | (enumLiteral_2= 'async' ) | (enumLiteral_3= 'sync' ) ) )
+            // InternalRoom.g:9088:1: ( (enumLiteral_0= 'eventdriven' ) | (enumLiteral_1= 'datadriven' ) | (enumLiteral_2= 'async' ) | (enumLiteral_3= 'sync' ) )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9086:1: ( (enumLiteral_0= 'eventdriven' ) | (enumLiteral_1= 'datadriven' ) | (enumLiteral_2= 'async' ) | (enumLiteral_3= 'sync' ) )
+            // InternalRoom.g:9088:1: ( (enumLiteral_0= 'eventdriven' ) | (enumLiteral_1= 'datadriven' ) | (enumLiteral_2= 'async' ) | (enumLiteral_3= 'sync' ) )
             int alt186=4;
             switch ( input.LA(1) ) {
             case 123:
@@ -23102,12 +23102,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             switch (alt186) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9086:2: (enumLiteral_0= 'eventdriven' )
+                    // InternalRoom.g:9088:2: (enumLiteral_0= 'eventdriven' )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9086:2: (enumLiteral_0= 'eventdriven' )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9086:4: enumLiteral_0= 'eventdriven'
+                    // InternalRoom.g:9088:2: (enumLiteral_0= 'eventdriven' )
+                    // InternalRoom.g:9088:4: enumLiteral_0= 'eventdriven'
                     {
-                    enumLiteral_0=(Token)match(input,123,FOLLOW_123_in_ruleComponentCommunicationType19429); 
+                    enumLiteral_0=(Token)match(input,123,FOLLOW_2); 
 
                             current = grammarAccess.getComponentCommunicationTypeAccess().getEVENT_DRIVENEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
                             newLeafNode(enumLiteral_0, grammarAccess.getComponentCommunicationTypeAccess().getEVENT_DRIVENEnumLiteralDeclaration_0()); 
@@ -23119,12 +23119,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9092:6: (enumLiteral_1= 'datadriven' )
+                    // InternalRoom.g:9094:6: (enumLiteral_1= 'datadriven' )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9092:6: (enumLiteral_1= 'datadriven' )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9092:8: enumLiteral_1= 'datadriven'
+                    // InternalRoom.g:9094:6: (enumLiteral_1= 'datadriven' )
+                    // InternalRoom.g:9094:8: enumLiteral_1= 'datadriven'
                     {
-                    enumLiteral_1=(Token)match(input,124,FOLLOW_124_in_ruleComponentCommunicationType19446); 
+                    enumLiteral_1=(Token)match(input,124,FOLLOW_2); 
 
                             current = grammarAccess.getComponentCommunicationTypeAccess().getDATA_DRIVENEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
                             newLeafNode(enumLiteral_1, grammarAccess.getComponentCommunicationTypeAccess().getDATA_DRIVENEnumLiteralDeclaration_1()); 
@@ -23136,12 +23136,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9098:6: (enumLiteral_2= 'async' )
+                    // InternalRoom.g:9100:6: (enumLiteral_2= 'async' )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9098:6: (enumLiteral_2= 'async' )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9098:8: enumLiteral_2= 'async'
+                    // InternalRoom.g:9100:6: (enumLiteral_2= 'async' )
+                    // InternalRoom.g:9100:8: enumLiteral_2= 'async'
                     {
-                    enumLiteral_2=(Token)match(input,127,FOLLOW_127_in_ruleComponentCommunicationType19463); 
+                    enumLiteral_2=(Token)match(input,127,FOLLOW_2); 
 
                             current = grammarAccess.getComponentCommunicationTypeAccess().getASYNCHRONOUSEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
                             newLeafNode(enumLiteral_2, grammarAccess.getComponentCommunicationTypeAccess().getASYNCHRONOUSEnumLiteralDeclaration_2()); 
@@ -23153,12 +23153,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 4 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9104:6: (enumLiteral_3= 'sync' )
+                    // InternalRoom.g:9106:6: (enumLiteral_3= 'sync' )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9104:6: (enumLiteral_3= 'sync' )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9104:8: enumLiteral_3= 'sync'
+                    // InternalRoom.g:9106:6: (enumLiteral_3= 'sync' )
+                    // InternalRoom.g:9106:8: enumLiteral_3= 'sync'
                     {
-                    enumLiteral_3=(Token)match(input,125,FOLLOW_125_in_ruleComponentCommunicationType19480); 
+                    enumLiteral_3=(Token)match(input,125,FOLLOW_2); 
 
                             current = grammarAccess.getComponentCommunicationTypeAccess().getSYNCHRONOUSEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
                             newLeafNode(enumLiteral_3, grammarAccess.getComponentCommunicationTypeAccess().getSYNCHRONOUSEnumLiteralDeclaration_3()); 
@@ -23190,7 +23190,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleLiteralType"
-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9114:1: ruleLiteralType returns [Enumerator current=null] : ( (enumLiteral_0= 'ptBoolean' ) | (enumLiteral_1= 'ptInteger' ) | (enumLiteral_2= 'ptReal' ) | (enumLiteral_3= 'ptCharacter' ) ) ;
+    // InternalRoom.g:9116: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;
 
@@ -23201,10 +23201,10 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
          enterRule(); 
         try {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9116:28: ( ( (enumLiteral_0= 'ptBoolean' ) | (enumLiteral_1= 'ptInteger' ) | (enumLiteral_2= 'ptReal' ) | (enumLiteral_3= 'ptCharacter' ) ) )
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9117:1: ( (enumLiteral_0= 'ptBoolean' ) | (enumLiteral_1= 'ptInteger' ) | (enumLiteral_2= 'ptReal' ) | (enumLiteral_3= 'ptCharacter' ) )
+            // InternalRoom.g:9118:28: ( ( (enumLiteral_0= 'ptBoolean' ) | (enumLiteral_1= 'ptInteger' ) | (enumLiteral_2= 'ptReal' ) | (enumLiteral_3= 'ptCharacter' ) ) )
+            // InternalRoom.g:9119:1: ( (enumLiteral_0= 'ptBoolean' ) | (enumLiteral_1= 'ptInteger' ) | (enumLiteral_2= 'ptReal' ) | (enumLiteral_3= 'ptCharacter' ) )
             {
-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9117:1: ( (enumLiteral_0= 'ptBoolean' ) | (enumLiteral_1= 'ptInteger' ) | (enumLiteral_2= 'ptReal' ) | (enumLiteral_3= 'ptCharacter' ) )
+            // InternalRoom.g:9119:1: ( (enumLiteral_0= 'ptBoolean' ) | (enumLiteral_1= 'ptInteger' ) | (enumLiteral_2= 'ptReal' ) | (enumLiteral_3= 'ptCharacter' ) )
             int alt187=4;
             switch ( input.LA(1) ) {
             case 128:
@@ -23236,12 +23236,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 
             switch (alt187) {
                 case 1 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9117:2: (enumLiteral_0= 'ptBoolean' )
+                    // InternalRoom.g:9119:2: (enumLiteral_0= 'ptBoolean' )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9117:2: (enumLiteral_0= 'ptBoolean' )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9117:4: enumLiteral_0= 'ptBoolean'
+                    // InternalRoom.g:9119:2: (enumLiteral_0= 'ptBoolean' )
+                    // InternalRoom.g:9119:4: enumLiteral_0= 'ptBoolean'
                     {
-                    enumLiteral_0=(Token)match(input,128,FOLLOW_128_in_ruleLiteralType19525); 
+                    enumLiteral_0=(Token)match(input,128,FOLLOW_2); 
 
                             current = grammarAccess.getLiteralTypeAccess().getBOOLEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
                             newLeafNode(enumLiteral_0, grammarAccess.getLiteralTypeAccess().getBOOLEnumLiteralDeclaration_0()); 
@@ -23253,12 +23253,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9123:6: (enumLiteral_1= 'ptInteger' )
+                    // InternalRoom.g:9125:6: (enumLiteral_1= 'ptInteger' )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9123:6: (enumLiteral_1= 'ptInteger' )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9123:8: enumLiteral_1= 'ptInteger'
+                    // InternalRoom.g:9125:6: (enumLiteral_1= 'ptInteger' )
+                    // InternalRoom.g:9125:8: enumLiteral_1= 'ptInteger'
                     {
-                    enumLiteral_1=(Token)match(input,129,FOLLOW_129_in_ruleLiteralType19542); 
+                    enumLiteral_1=(Token)match(input,129,FOLLOW_2); 
 
                             current = grammarAccess.getLiteralTypeAccess().getINTEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
                             newLeafNode(enumLiteral_1, grammarAccess.getLiteralTypeAccess().getINTEnumLiteralDeclaration_1()); 
@@ -23270,12 +23270,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9129:6: (enumLiteral_2= 'ptReal' )
+                    // InternalRoom.g:9131:6: (enumLiteral_2= 'ptReal' )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9129:6: (enumLiteral_2= 'ptReal' )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9129:8: enumLiteral_2= 'ptReal'
+                    // InternalRoom.g:9131:6: (enumLiteral_2= 'ptReal' )
+                    // InternalRoom.g:9131:8: enumLiteral_2= 'ptReal'
                     {
-                    enumLiteral_2=(Token)match(input,130,FOLLOW_130_in_ruleLiteralType19559); 
+                    enumLiteral_2=(Token)match(input,130,FOLLOW_2); 
 
                             current = grammarAccess.getLiteralTypeAccess().getREALEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
                             newLeafNode(enumLiteral_2, grammarAccess.getLiteralTypeAccess().getREALEnumLiteralDeclaration_2()); 
@@ -23287,12 +23287,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 4 :
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9135:6: (enumLiteral_3= 'ptCharacter' )
+                    // InternalRoom.g:9137:6: (enumLiteral_3= 'ptCharacter' )
                     {
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9135:6: (enumLiteral_3= 'ptCharacter' )
-                    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:9135:8: enumLiteral_3= 'ptCharacter'
+                    // InternalRoom.g:9137:6: (enumLiteral_3= 'ptCharacter' )
+                    // InternalRoom.g:9137:8: enumLiteral_3= 'ptCharacter'
                     {
-                    enumLiteral_3=(Token)match(input,131,FOLLOW_131_in_ruleLiteralType19576); 
+                    enumLiteral_3=(Token)match(input,131,FOLLOW_2); 
 
                             current = grammarAccess.getLiteralTypeAccess().getCHAREnumLiteralDeclaration_3().getEnumLiteral().getInstance();
                             newLeafNode(enumLiteral_3, grammarAccess.getLiteralTypeAccess().getCHAREnumLiteralDeclaration_3()); 
@@ -23328,22 +23328,13 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
     protected DFA3 dfa3 = new DFA3(this);
     protected DFA128 dfa128 = new DFA128(this);
     protected DFA129 dfa129 = new DFA129(this);
-    static final String DFA3_eotS =
-        "\16\uffff";
-    static final String DFA3_eofS =
-        "\16\uffff";
-    static final String DFA3_minS =
-        "\1\16\5\uffff\3\51\5\uffff";
-    static final String DFA3_maxS =
-        "\1\177\5\uffff\3\177\5\uffff";
-    static final String DFA3_acceptS =
-        "\1\uffff\1\12\1\1\1\2\1\3\1\4\3\uffff\1\5\1\6\1\7\1\10\1\11";
-    static final String DFA3_specialS =
-        "\16\uffff}>";
-    static final String[] DFA3_transitionS = {
-            "\1\1\2\uffff\1\2\4\uffff\1\3\3\uffff\1\4\1\5\15\uffff\1\11"+
-            "\5\uffff\1\11\5\uffff\2\12\10\uffff\1\14\1\uffff\1\13\52\uffff"+
-            "\1\15\16\uffff\1\6\1\7\1\10\1\uffff\1\12",
+    static final String dfa_1s = "\16\uffff";
+    static final String dfa_2s = "\1\16\5\uffff\3\51\5\uffff";
+    static final String dfa_3s = "\1\177\5\uffff\3\177\5\uffff";
+    static final String dfa_4s = "\1\uffff\1\12\1\1\1\2\1\3\1\4\3\uffff\1\5\1\6\1\7\1\10\1\11";
+    static final String dfa_5s = "\16\uffff}>";
+    static final String[] dfa_6s = {
+            "\1\1\2\uffff\1\2\4\uffff\1\3\3\uffff\1\4\1\5\15\uffff\1\11\5\uffff\1\11\5\uffff\2\12\10\uffff\1\14\1\uffff\1\13\52\uffff\1\15\16\uffff\1\6\1\7\1\10\1\uffff\1\12",
             "",
             "",
             "",
@@ -23359,54 +23350,37 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             ""
     };
 
-    static final short[] DFA3_eot = DFA.unpackEncodedString(DFA3_eotS);
-    static final short[] DFA3_eof = DFA.unpackEncodedString(DFA3_eofS);
-    static final char[] DFA3_min = DFA.unpackEncodedStringToUnsignedChars(DFA3_minS);
-    static final char[] DFA3_max = DFA.unpackEncodedStringToUnsignedChars(DFA3_maxS);
-    static final short[] DFA3_accept = DFA.unpackEncodedString(DFA3_acceptS);
-    static final short[] DFA3_special = DFA.unpackEncodedString(DFA3_specialS);
-    static final short[][] DFA3_transition;
-
-    static {
-        int numStates = DFA3_transitionS.length;
-        DFA3_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA3_transition[i] = DFA.unpackEncodedString(DFA3_transitionS[i]);
-        }
-    }
+    static final short[] dfa_1 = DFA.unpackEncodedString(dfa_1s);
+    static final char[] dfa_2 = DFA.unpackEncodedStringToUnsignedChars(dfa_2s);
+    static final char[] dfa_3 = DFA.unpackEncodedStringToUnsignedChars(dfa_3s);
+    static final short[] dfa_4 = DFA.unpackEncodedString(dfa_4s);
+    static final short[] dfa_5 = DFA.unpackEncodedString(dfa_5s);
+    static final short[][] dfa_6 = unpackEncodedStringArray(dfa_6s);
 
     class DFA3 extends DFA {
 
         public DFA3(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 3;
-            this.eot = DFA3_eot;
-            this.eof = DFA3_eof;
-            this.min = DFA3_min;
-            this.max = DFA3_max;
-            this.accept = DFA3_accept;
-            this.special = DFA3_special;
-            this.transition = DFA3_transition;
+            this.eot = dfa_1;
+            this.eof = dfa_1;
+            this.min = dfa_2;
+            this.max = dfa_3;
+            this.accept = dfa_4;
+            this.special = dfa_5;
+            this.transition = dfa_6;
         }
         public String getDescription() {
             return "()* loopback of 143:3: ( ( (lv_primitiveTypes_5_0= rulePrimitiveType ) ) | ( (lv_enumerationTypes_6_0= ruleEnumerationType ) ) | ( (lv_externalTypes_7_0= ruleExternalType ) ) | ( (lv_dataClasses_8_0= ruleDataClass ) ) | ( (lv_protocolClasses_9_0= ruleGeneralProtocolClass ) ) | ( (lv_actorClasses_10_0= ruleActorClass ) ) | ( (lv_subSystemClasses_11_0= ruleSubSystemClass ) ) | ( (lv_systems_12_0= ruleLogicalSystem ) ) | ( (lv_annotationTypes_13_0= ruleAnnotationType ) ) )*";
         }
     }
-    static final String DFA128_eotS =
-        "\32\uffff";
-    static final String DFA128_eofS =
-        "\13\uffff\1\21\7\uffff\2\21\1\uffff\1\21\2\uffff\1\21";
-    static final String DFA128_minS =
-        "\1\133\1\4\1\17\1\4\1\22\4\4\2\22\1\15\2\4\1\22\1\5\1\16\1\uffff"+
-        "\1\4\2\15\1\5\1\15\2\uffff\1\15";
-    static final String DFA128_maxS =
-        "\1\133\2\17\1\144\1\27\2\4\1\144\1\4\2\22\1\142\2\4\1\22\1\42\1"+
-        "\141\1\uffff\1\4\2\142\1\42\1\142\2\uffff\1\142";
-    static final String DFA128_acceptS =
-        "\21\uffff\1\2\5\uffff\1\1\1\3\1\uffff";
-    static final String DFA128_specialS =
-        "\32\uffff}>";
-    static final String[] DFA128_transitionS = {
+    static final String dfa_7s = "\32\uffff";
+    static final String dfa_8s = "\13\uffff\1\21\7\uffff\2\21\1\uffff\1\21\2\uffff\1\21";
+    static final String dfa_9s = "\1\133\1\4\1\17\1\4\1\22\4\4\2\22\1\15\2\4\1\22\1\5\1\16\1\uffff\1\4\2\15\1\5\1\15\2\uffff\1\15";
+    static final String dfa_10s = "\1\133\2\17\1\144\1\27\2\4\1\144\1\4\2\22\1\142\2\4\1\22\1\42\1\141\1\uffff\1\4\2\142\1\42\1\142\2\uffff\1\142";
+    static final String dfa_11s = "\21\uffff\1\2\5\uffff\1\1\1\3\1\uffff";
+    static final String dfa_12s = "\32\uffff}>";
+    static final String[] dfa_13s = {
             "\1\1",
             "\1\2\12\uffff\1\3",
             "\1\3",
@@ -23418,8 +23392,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             "\1\16",
             "\1\7",
             "\1\7",
-            "\1\20\1\21\10\uffff\1\22\11\uffff\1\17\56\uffff\1\21\4\uffff"+
-            "\7\21\6\uffff\1\21",
+            "\1\20\1\21\10\uffff\1\22\11\uffff\1\17\56\uffff\1\21\4\uffff\7\21\6\uffff\1\21",
             "\1\23",
             "\1\24",
             "\1\7",
@@ -23427,66 +23400,46 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             "\1\21\116\uffff\1\21\1\27\1\uffff\1\27\1\30",
             "",
             "\1\31",
-            "\1\20\1\21\22\uffff\1\17\56\uffff\1\21\4\uffff\7\21\6\uffff"+
-            "\1\21",
-            "\1\20\1\21\22\uffff\1\17\56\uffff\1\21\4\uffff\7\21\6\uffff"+
-            "\1\21",
+            "\1\20\1\21\22\uffff\1\17\56\uffff\1\21\4\uffff\7\21\6\uffff\1\21",
+            "\1\20\1\21\22\uffff\1\17\56\uffff\1\21\4\uffff\7\21\6\uffff\1\21",
             "\1\25\34\uffff\1\26",
             "\1\20\1\21\101\uffff\1\21\4\uffff\7\21\6\uffff\1\21",
             "",
             "",
-            "\1\20\1\21\22\uffff\1\17\56\uffff\1\21\4\uffff\7\21\6\uffff"+
-            "\1\21"
+            "\1\20\1\21\22\uffff\1\17\56\uffff\1\21\4\uffff\7\21\6\uffff\1\21"
     };
 
-    static final short[] DFA128_eot = DFA.unpackEncodedString(DFA128_eotS);
-    static final short[] DFA128_eof = DFA.unpackEncodedString(DFA128_eofS);
-    static final char[] DFA128_min = DFA.unpackEncodedStringToUnsignedChars(DFA128_minS);
-    static final char[] DFA128_max = DFA.unpackEncodedStringToUnsignedChars(DFA128_maxS);
-    static final short[] DFA128_accept = DFA.unpackEncodedString(DFA128_acceptS);
-    static final short[] DFA128_special = DFA.unpackEncodedString(DFA128_specialS);
-    static final short[][] DFA128_transition;
-
-    static {
-        int numStates = DFA128_transitionS.length;
-        DFA128_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA128_transition[i] = DFA.unpackEncodedString(DFA128_transitionS[i]);
-        }
-    }
+    static final short[] dfa_7 = DFA.unpackEncodedString(dfa_7s);
+    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 DFA128 extends DFA {
 
         public DFA128(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 128;
-            this.eot = DFA128_eot;
-            this.eof = DFA128_eof;
-            this.min = DFA128_min;
-            this.max = DFA128_max;
-            this.accept = DFA128_accept;
-            this.special = DFA128_special;
-            this.transition = DFA128_transition;
+            this.eot = dfa_7;
+            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 "6107:1: (this_TransitionChainStartTransition_0= ruleTransitionChainStartTransition | this_ContinuationTransition_1= ruleContinuationTransition | this_CPBranchTransition_2= ruleCPBranchTransition )";
+            return "6109:1: (this_TransitionChainStartTransition_0= ruleTransitionChainStartTransition | this_ContinuationTransition_1= ruleContinuationTransition | this_CPBranchTransition_2= ruleCPBranchTransition )";
         }
     }
-    static final String DFA129_eotS =
-        "\31\uffff";
-    static final String DFA129_eofS =
-        "\31\uffff";
-    static final String DFA129_minS =
-        "\1\133\1\4\1\17\1\4\1\22\4\4\3\22\1\15\2\4\1\5\1\136\1\4\2\15\1"+
-        "\5\1\15\2\uffff\1\15";
-    static final String DFA129_maxS =
-        "\1\133\2\17\1\144\1\27\3\4\1\144\3\22\1\41\2\4\1\42\1\140\1\4\2"+
-        "\41\1\42\1\15\2\uffff\1\41";
-    static final String DFA129_acceptS =
-        "\26\uffff\1\2\1\1\1\uffff";
-    static final String DFA129_specialS =
-        "\31\uffff}>";
-    static final String[] DFA129_transitionS = {
+    static final String dfa_14s = "\31\uffff";
+    static final String dfa_15s = "\1\133\1\4\1\17\1\4\1\22\4\4\3\22\1\15\3\4\1\5\1\136\3\15\1\5\1\15\2\uffff";
+    static final String dfa_16s = "\1\133\2\17\1\144\1\27\3\4\1\144\3\22\1\41\3\4\1\42\1\140\3\41\1\42\1\15\2\uffff";
+    static final String dfa_17s = "\27\uffff\1\1\1\2";
+    static final String dfa_18s = "\31\uffff}>";
+    static final String[] dfa_19s = {
             "\1\1",
             "\1\2\12\uffff\1\3",
             "\1\3",
@@ -23499,889 +23452,176 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             "\1\10",
             "\1\10",
             "\1\10",
-            "\1\20\11\uffff\1\21\11\uffff\1\17",
+            "\1\21\11\uffff\1\17\11\uffff\1\20",
             "\1\22",
             "\1\23",
-            "\1\24\34\uffff\1\25",
-            "\1\27\1\uffff\1\26",
-            "\1\30",
-            "\1\20\23\uffff\1\17",
-            "\1\20\23\uffff\1\17",
-            "\1\24\34\uffff\1\25",
-            "\1\20",
-            "",
+            "\1\24",
+            "\1\25\34\uffff\1\26",
+            "\1\27\1\uffff\1\30",
+            "\1\21\23\uffff\1\20",
+            "\1\21\23\uffff\1\20",
+            "\1\21\23\uffff\1\20",
+            "\1\25\34\uffff\1\26",
+            "\1\21",
             "",
-            "\1\20\23\uffff\1\17"
+            ""
     };
 
-    static final short[] DFA129_eot = DFA.unpackEncodedString(DFA129_eotS);
-    static final short[] DFA129_eof = DFA.unpackEncodedString(DFA129_eofS);
-    static final char[] DFA129_min = DFA.unpackEncodedStringToUnsignedChars(DFA129_minS);
-    static final char[] DFA129_max = DFA.unpackEncodedStringToUnsignedChars(DFA129_maxS);
-    static final short[] DFA129_accept = DFA.unpackEncodedString(DFA129_acceptS);
-    static final short[] DFA129_special = DFA.unpackEncodedString(DFA129_specialS);
-    static final short[][] DFA129_transition;
-
-    static {
-        int numStates = DFA129_transitionS.length;
-        DFA129_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA129_transition[i] = DFA.unpackEncodedString(DFA129_transitionS[i]);
-        }
-    }
+    static final short[] dfa_14 = DFA.unpackEncodedString(dfa_14s);
+    static final char[] dfa_15 = DFA.unpackEncodedStringToUnsignedChars(dfa_15s);
+    static final char[] dfa_16 = DFA.unpackEncodedStringToUnsignedChars(dfa_16s);
+    static final short[] dfa_17 = DFA.unpackEncodedString(dfa_17s);
+    static final short[] dfa_18 = DFA.unpackEncodedString(dfa_18s);
+    static final short[][] dfa_19 = unpackEncodedStringArray(dfa_19s);
 
     class DFA129 extends DFA {
 
         public DFA129(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 129;
-            this.eot = DFA129_eot;
-            this.eof = DFA129_eof;
-            this.min = DFA129_min;
-            this.max = DFA129_max;
-            this.accept = DFA129_accept;
-            this.special = DFA129_special;
-            this.transition = DFA129_transition;
+            this.eot = dfa_14;
+            this.eof = dfa_14;
+            this.min = dfa_15;
+            this.max = dfa_16;
+            this.accept = dfa_17;
+            this.special = dfa_18;
+            this.transition = dfa_19;
         }
         public String getDescription() {
-            return "6157:1: (this_TriggeredTransition_0= ruleTriggeredTransition | this_GuardedTransition_1= ruleGuardedTransition )";
+            return "6159:1: (this_TriggeredTransition_0= ruleTriggeredTransition | this_GuardedTransition_1= ruleGuardedTransition )";
         }
     }
  
 
-    public static final BitSet FOLLOW_ruleRoomModel_in_entryRuleRoomModel75 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRoomModel85 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_12_in_ruleRoomModel122 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleFQN_in_ruleRoomModel143 = new BitSet(new long[]{0x0000000200002000L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_ruleRoomModel164 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_13_in_ruleRoomModel177 = new BitSet(new long[]{0x806082000C424000L,0xB802100000000002L});
-    public static final BitSet FOLLOW_ruleImport_in_ruleRoomModel198 = new BitSet(new long[]{0x806082000C424000L,0xB802100000000002L});
-    public static final BitSet FOLLOW_rulePrimitiveType_in_ruleRoomModel221 = new BitSet(new long[]{0x806082000C424000L,0xB800100000000002L});
-    public static final BitSet FOLLOW_ruleEnumerationType_in_ruleRoomModel248 = new BitSet(new long[]{0x806082000C424000L,0xB800100000000002L});
-    public static final BitSet FOLLOW_ruleExternalType_in_ruleRoomModel275 = new BitSet(new long[]{0x806082000C424000L,0xB800100000000002L});
-    public static final BitSet FOLLOW_ruleDataClass_in_ruleRoomModel302 = new BitSet(new long[]{0x806082000C424000L,0xB800100000000002L});
-    public static final BitSet FOLLOW_ruleGeneralProtocolClass_in_ruleRoomModel329 = new BitSet(new long[]{0x806082000C424000L,0xB800100000000002L});
-    public static final BitSet FOLLOW_ruleActorClass_in_ruleRoomModel356 = new BitSet(new long[]{0x806082000C424000L,0xB800100000000002L});
-    public static final BitSet FOLLOW_ruleSubSystemClass_in_ruleRoomModel383 = new BitSet(new long[]{0x806082000C424000L,0xB800100000000002L});
-    public static final BitSet FOLLOW_ruleLogicalSystem_in_ruleRoomModel410 = new BitSet(new long[]{0x806082000C424000L,0xB800100000000002L});
-    public static final BitSet FOLLOW_ruleAnnotationType_in_ruleRoomModel437 = new BitSet(new long[]{0x806082000C424000L,0xB800100000000002L});
-    public static final BitSet FOLLOW_14_in_ruleRoomModel451 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStructureClass_in_entryRuleStructureClass489 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleStructureClass499 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleActorContainerClass_in_ruleStructureClass546 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLogicalSystem_in_ruleStructureClass573 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleActorContainerClass_in_entryRuleActorContainerClass608 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleActorContainerClass618 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleActorClass_in_ruleActorContainerClass665 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSubSystemClass_in_ruleActorContainerClass692 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleVarDecl_in_entryRuleVarDecl727 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleVarDecl737 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleVarDecl779 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_15_in_ruleVarDecl796 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleRefableType_in_ruleVarDecl817 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRefableType_in_entryRuleRefableType853 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRefableType863 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_ruleRefableType911 = new BitSet(new long[]{0x0000000000010002L});
-    public static final BitSet FOLLOW_16_in_ruleRefableType929 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDataType_in_entryRuleDataType979 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDataType989 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rulePrimitiveType_in_ruleDataType1036 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleEnumerationType_in_ruleDataType1063 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleComplexType_in_ruleDataType1090 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleComplexType_in_entryRuleComplexType1125 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleComplexType1135 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDataClass_in_ruleComplexType1182 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExternalType_in_ruleComplexType1209 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rulePrimitiveType_in_entryRulePrimitiveType1244 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRulePrimitiveType1254 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_17_in_rulePrimitiveType1291 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_rulePrimitiveType1308 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_15_in_rulePrimitiveType1325 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x000000000000000FL});
-    public static final BitSet FOLLOW_ruleLiteralType_in_rulePrimitiveType1346 = new BitSet(new long[]{0x0000000000040000L});
-    public static final BitSet FOLLOW_18_in_rulePrimitiveType1358 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rulePrimitiveType1375 = new BitSet(new long[]{0x0000000000280000L});
-    public static final BitSet FOLLOW_19_in_rulePrimitiveType1393 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleFQN_in_rulePrimitiveType1414 = new BitSet(new long[]{0x0000000000100000L});
-    public static final BitSet FOLLOW_20_in_rulePrimitiveType1426 = new BitSet(new long[]{0x0000000000200000L});
-    public static final BitSet FOLLOW_21_in_rulePrimitiveType1440 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rulePrimitiveType1457 = new BitSet(new long[]{0x0000000200000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_rulePrimitiveType1483 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleEnumerationType_in_entryRuleEnumerationType1520 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleEnumerationType1530 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_22_in_ruleEnumerationType1567 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleEnumerationType1584 = new BitSet(new long[]{0x0000000200802000L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_ruleEnumerationType1610 = new BitSet(new long[]{0x0000000000802000L});
-    public static final BitSet FOLLOW_23_in_ruleEnumerationType1624 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleFQN_in_ruleEnumerationType1647 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_13_in_ruleEnumerationType1661 = new BitSet(new long[]{0x0000000000004010L});
-    public static final BitSet FOLLOW_ruleEnumLiteral_in_ruleEnumerationType1683 = new BitSet(new long[]{0x0000000001004000L});
-    public static final BitSet FOLLOW_24_in_ruleEnumerationType1696 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleEnumLiteral_in_ruleEnumerationType1717 = new BitSet(new long[]{0x0000000001004000L});
-    public static final BitSet FOLLOW_14_in_ruleEnumerationType1733 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleEnumLiteral_in_entryRuleEnumLiteral1769 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleEnumLiteral1779 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleEnumLiteral1821 = new BitSet(new long[]{0x0000000002000002L});
-    public static final BitSet FOLLOW_25_in_ruleEnumLiteral1839 = new BitSet(new long[]{0x00000000000000C0L,0x0180000000000000L});
-    public static final BitSet FOLLOW_ruleIntLiteral_in_ruleEnumLiteral1860 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExternalType_in_entryRuleExternalType1898 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleExternalType1908 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_26_in_ruleExternalType1945 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleExternalType1962 = new BitSet(new long[]{0x0000000000040000L});
-    public static final BitSet FOLLOW_18_in_ruleExternalType1979 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleExternalType1996 = new BitSet(new long[]{0x0000000200200002L});
-    public static final BitSet FOLLOW_21_in_ruleExternalType2014 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleExternalType2031 = new BitSet(new long[]{0x0000000200000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_ruleExternalType2059 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDataClass_in_entryRuleDataClass2096 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDataClass2106 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_ruleDataClass2143 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleDataClass2160 = new BitSet(new long[]{0x0000000210002000L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_ruleDataClass2186 = new BitSet(new long[]{0x0000000010002000L});
-    public static final BitSet FOLLOW_28_in_ruleDataClass2200 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleFQN_in_ruleDataClass2223 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_13_in_ruleDataClass2237 = new BitSet(new long[]{0x00000199E0004000L,0x0000080000000000L});
-    public static final BitSet FOLLOW_ruleAnnotation_in_ruleDataClass2258 = new BitSet(new long[]{0x00000199E0004000L,0x0000080000000000L});
-    public static final BitSet FOLLOW_29_in_ruleDataClass2272 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_ruleDataClass2293 = new BitSet(new long[]{0x00000199C0004000L});
-    public static final BitSet FOLLOW_30_in_ruleDataClass2308 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_ruleDataClass2329 = new BitSet(new long[]{0x0000019980004000L});
-    public static final BitSet FOLLOW_31_in_ruleDataClass2344 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_ruleDataClass2365 = new BitSet(new long[]{0x0000019900004000L});
-    public static final BitSet FOLLOW_ruleStandardOperation_in_ruleDataClass2389 = new BitSet(new long[]{0x0000019900004000L});
-    public static final BitSet FOLLOW_ruleClassStructor_in_ruleDataClass2416 = new BitSet(new long[]{0x0000019900004000L});
-    public static final BitSet FOLLOW_ruleAttribute_in_ruleDataClass2443 = new BitSet(new long[]{0x0000019900004000L});
-    public static final BitSet FOLLOW_14_in_ruleDataClass2457 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAttribute_in_entryRuleAttribute2493 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAttribute2503 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_ruleAttribute2540 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleAttribute2557 = new BitSet(new long[]{0x0000000200008000L});
-    public static final BitSet FOLLOW_33_in_ruleAttribute2575 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleAttribute2592 = new BitSet(new long[]{0x0000000400000000L});
-    public static final BitSet FOLLOW_34_in_ruleAttribute2609 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_15_in_ruleAttribute2623 = new BitSet(new long[]{0x0000000202000012L});
-    public static final BitSet FOLLOW_ruleRefableType_in_ruleAttribute2644 = new BitSet(new long[]{0x0000000202000002L});
-    public static final BitSet FOLLOW_25_in_ruleAttribute2658 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleAttribute2675 = new BitSet(new long[]{0x0000000200000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_ruleAttribute2703 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStandardOperation_in_entryRuleStandardOperation2742 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleStandardOperation2752 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_35_in_ruleStandardOperation2795 = new BitSet(new long[]{0x0000001000000000L});
-    public static final BitSet FOLLOW_36_in_ruleStandardOperation2821 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleStandardOperation2838 = new BitSet(new long[]{0x0000000000080000L});
-    public static final BitSet FOLLOW_19_in_ruleStandardOperation2855 = new BitSet(new long[]{0x0000000000100010L});
-    public static final BitSet FOLLOW_ruleVarDecl_in_ruleStandardOperation2877 = new BitSet(new long[]{0x0000000001100000L});
-    public static final BitSet FOLLOW_24_in_ruleStandardOperation2890 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleVarDecl_in_ruleStandardOperation2911 = new BitSet(new long[]{0x0000000001100000L});
-    public static final BitSet FOLLOW_20_in_ruleStandardOperation2927 = new BitSet(new long[]{0x000000020000A000L});
-    public static final BitSet FOLLOW_15_in_ruleStandardOperation2940 = new BitSet(new long[]{0x0000002000000010L});
-    public static final BitSet FOLLOW_37_in_ruleStandardOperation2953 = new BitSet(new long[]{0x0000000200002000L});
-    public static final BitSet FOLLOW_ruleRefableType_in_ruleStandardOperation2980 = new BitSet(new long[]{0x0000000200002000L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_ruleStandardOperation3004 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_ruleStandardOperation3026 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rulePortOperation_in_entryRulePortOperation3062 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRulePortOperation3072 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_36_in_rulePortOperation3109 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_rulePortOperation3126 = new BitSet(new long[]{0x0000000000080000L});
-    public static final BitSet FOLLOW_19_in_rulePortOperation3143 = new BitSet(new long[]{0x0000000000100010L});
-    public static final BitSet FOLLOW_ruleVarDecl_in_rulePortOperation3165 = new BitSet(new long[]{0x0000000001100000L});
-    public static final BitSet FOLLOW_24_in_rulePortOperation3178 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleVarDecl_in_rulePortOperation3199 = new BitSet(new long[]{0x0000000001100000L});
-    public static final BitSet FOLLOW_20_in_rulePortOperation3215 = new BitSet(new long[]{0x000000420000A000L});
-    public static final BitSet FOLLOW_15_in_rulePortOperation3229 = new BitSet(new long[]{0x0000002000000010L});
-    public static final BitSet FOLLOW_37_in_rulePortOperation3242 = new BitSet(new long[]{0x0000000200002000L});
-    public static final BitSet FOLLOW_ruleRefableType_in_rulePortOperation3269 = new BitSet(new long[]{0x0000000200002000L});
-    public static final BitSet FOLLOW_38_in_rulePortOperation3290 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_rulePortOperation3310 = new BitSet(new long[]{0x0000000200002000L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_rulePortOperation3334 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_rulePortOperation3356 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleClassStructor_in_entryRuleClassStructor3392 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleClassStructor3402 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_39_in_ruleClassStructor3447 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_40_in_ruleClassStructor3476 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_ruleClassStructor3513 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGeneralProtocolClass_in_entryRuleGeneralProtocolClass3549 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleGeneralProtocolClass3559 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleProtocolClass_in_ruleGeneralProtocolClass3606 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCompoundProtocolClass_in_ruleGeneralProtocolClass3633 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleProtocolClass_in_entryRuleProtocolClass3668 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleProtocolClass3678 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCommunicationType_in_ruleProtocolClass3724 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_41_in_ruleProtocolClass3737 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleProtocolClass3754 = new BitSet(new long[]{0x0000000210002000L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_ruleProtocolClass3780 = new BitSet(new long[]{0x0000000010002000L});
-    public static final BitSet FOLLOW_28_in_ruleProtocolClass3794 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleFQN_in_ruleProtocolClass3817 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_13_in_ruleProtocolClass3831 = new BitSet(new long[]{0x00005C00E0004000L,0x0000090000000000L});
-    public static final BitSet FOLLOW_ruleAnnotation_in_ruleProtocolClass3852 = new BitSet(new long[]{0x00005C00E0004000L,0x0000090000000000L});
-    public static final BitSet FOLLOW_29_in_ruleProtocolClass3866 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_ruleProtocolClass3887 = new BitSet(new long[]{0x00005C00C0004000L,0x0000010000000000L});
-    public static final BitSet FOLLOW_30_in_ruleProtocolClass3902 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_ruleProtocolClass3923 = new BitSet(new long[]{0x00005C0080004000L,0x0000010000000000L});
-    public static final BitSet FOLLOW_31_in_ruleProtocolClass3938 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_ruleProtocolClass3959 = new BitSet(new long[]{0x00005C0000004000L,0x0000010000000000L});
-    public static final BitSet FOLLOW_42_in_ruleProtocolClass3974 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_13_in_ruleProtocolClass3986 = new BitSet(new long[]{0x0006000000004000L});
-    public static final BitSet FOLLOW_ruleMessage_in_ruleProtocolClass4007 = new BitSet(new long[]{0x0006000000004000L});
-    public static final BitSet FOLLOW_14_in_ruleProtocolClass4020 = new BitSet(new long[]{0x0000580000004000L,0x0000010000000000L});
-    public static final BitSet FOLLOW_43_in_ruleProtocolClass4035 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_13_in_ruleProtocolClass4047 = new BitSet(new long[]{0x0006000000004000L});
-    public static final BitSet FOLLOW_ruleMessage_in_ruleProtocolClass4068 = new BitSet(new long[]{0x0006000000004000L});
-    public static final BitSet FOLLOW_14_in_ruleProtocolClass4081 = new BitSet(new long[]{0x0000500000004000L,0x0000010000000000L});
-    public static final BitSet FOLLOW_44_in_ruleProtocolClass4096 = new BitSet(new long[]{0x0000200000000000L});
-    public static final BitSet FOLLOW_45_in_ruleProtocolClass4108 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_rulePortClass_in_ruleProtocolClass4129 = new BitSet(new long[]{0x0000400000004000L,0x0000010000000000L});
-    public static final BitSet FOLLOW_46_in_ruleProtocolClass4144 = new BitSet(new long[]{0x0000200000000000L});
-    public static final BitSet FOLLOW_45_in_ruleProtocolClass4156 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_rulePortClass_in_ruleProtocolClass4177 = new BitSet(new long[]{0x0000000000004000L,0x0000010000000000L});
-    public static final BitSet FOLLOW_ruleProtocolSemantics_in_ruleProtocolClass4200 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_14_in_ruleProtocolClass4213 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCompoundProtocolClass_in_entryRuleCompoundProtocolClass4249 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleCompoundProtocolClass4259 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_ruleCompoundProtocolClass4296 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleCompoundProtocolClass4313 = new BitSet(new long[]{0x0000000200002000L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_ruleCompoundProtocolClass4339 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_13_in_ruleCompoundProtocolClass4352 = new BitSet(new long[]{0x0001000000004000L,0x0000080000000000L});
-    public static final BitSet FOLLOW_ruleAnnotation_in_ruleCompoundProtocolClass4373 = new BitSet(new long[]{0x0001000000004000L,0x0000080000000000L});
-    public static final BitSet FOLLOW_ruleSubProtocol_in_ruleCompoundProtocolClass4395 = new BitSet(new long[]{0x0001000000004000L});
-    public static final BitSet FOLLOW_14_in_ruleCompoundProtocolClass4408 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSubProtocol_in_entryRuleSubProtocol4444 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSubProtocol4454 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_48_in_ruleSubProtocol4491 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleSubProtocol4508 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_15_in_ruleSubProtocol4525 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleFQN_in_ruleSubProtocol4548 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMessage_in_entryRuleMessage4584 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleMessage4594 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_49_in_ruleMessage4637 = new BitSet(new long[]{0x0004000000000000L});
-    public static final BitSet FOLLOW_50_in_ruleMessage4663 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleMessage4680 = new BitSet(new long[]{0x0000000000080000L});
-    public static final BitSet FOLLOW_19_in_ruleMessage4697 = new BitSet(new long[]{0x0000000000100010L});
-    public static final BitSet FOLLOW_ruleVarDecl_in_ruleMessage4718 = new BitSet(new long[]{0x0000000000100000L});
-    public static final BitSet FOLLOW_20_in_ruleMessage4731 = new BitSet(new long[]{0x0000000200000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_ruleMessage4752 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rulePortClass_in_entryRulePortClass4789 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRulePortClass4799 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_13_in_rulePortClass4845 = new BitSet(new long[]{0x0018019900004000L});
-    public static final BitSet FOLLOW_51_in_rulePortClass4858 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_rulePortClass4879 = new BitSet(new long[]{0x0010019900004000L});
-    public static final BitSet FOLLOW_ruleMessageHandler_in_rulePortClass4903 = new BitSet(new long[]{0x0010019900004000L});
-    public static final BitSet FOLLOW_rulePortOperation_in_rulePortClass4930 = new BitSet(new long[]{0x0010019900004000L});
-    public static final BitSet FOLLOW_ruleAttribute_in_rulePortClass4957 = new BitSet(new long[]{0x0010019900004000L});
-    public static final BitSet FOLLOW_14_in_rulePortClass4971 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMessageHandler_in_entryRuleMessageHandler5007 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleMessageHandler5017 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInMessageHandler_in_ruleMessageHandler5064 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOutMessageHandler_in_ruleMessageHandler5091 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInMessageHandler_in_entryRuleInMessageHandler5126 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleInMessageHandler5136 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_52_in_ruleInMessageHandler5173 = new BitSet(new long[]{0x0000040000000000L});
-    public static final BitSet FOLLOW_42_in_ruleInMessageHandler5185 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleInMessageHandler5205 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_ruleInMessageHandler5226 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOutMessageHandler_in_entryRuleOutMessageHandler5262 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOutMessageHandler5272 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_52_in_ruleOutMessageHandler5309 = new BitSet(new long[]{0x0000080000000000L});
-    public static final BitSet FOLLOW_43_in_ruleOutMessageHandler5321 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleOutMessageHandler5341 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_ruleOutMessageHandler5362 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleModelComponent_in_entryRuleModelComponent5398 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleModelComponent5408 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleActorClass_in_ruleModelComponent5454 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleActorClass_in_entryRuleActorClass5488 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleActorClass5498 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_53_in_ruleActorClass5586 = new BitSet(new long[]{0x0060000000000000L,0xB800000000000000L});
-    public static final BitSet FOLLOW_ruleComponentCommunicationType_in_ruleActorClass5674 = new BitSet(new long[]{0x0060000000000000L,0xB800000000000000L});
-    public static final BitSet FOLLOW_54_in_ruleActorClass5726 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleActorClass5743 = new BitSet(new long[]{0x0000000210002000L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_ruleActorClass5769 = new BitSet(new long[]{0x0000000010002000L});
-    public static final BitSet FOLLOW_28_in_ruleActorClass5783 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleFQN_in_ruleActorClass5806 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_13_in_ruleActorClass5820 = new BitSet(new long[]{0x0380000000004000L,0x0000080000000000L});
-    public static final BitSet FOLLOW_ruleAnnotation_in_ruleActorClass5841 = new BitSet(new long[]{0x0380000000004000L,0x0000080000000000L});
-    public static final BitSet FOLLOW_55_in_ruleActorClass5855 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_13_in_ruleActorClass5867 = new BitSet(new long[]{0x2400400000004000L});
-    public static final BitSet FOLLOW_ruleSPP_in_ruleActorClass5889 = new BitSet(new long[]{0x2400400000004000L});
-    public static final BitSet FOLLOW_rulePort_in_ruleActorClass5916 = new BitSet(new long[]{0x2400400000004000L});
-    public static final BitSet FOLLOW_14_in_ruleActorClass5930 = new BitSet(new long[]{0x0300000000004000L});
-    public static final BitSet FOLLOW_56_in_ruleActorClass5945 = new BitSet(new long[]{0x0000000200002000L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_ruleActorClass5966 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_13_in_ruleActorClass5979 = new BitSet(new long[]{0x7C004199E0004000L,0x4000400000001220L});
-    public static final BitSet FOLLOW_29_in_ruleActorClass5992 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_ruleActorClass6013 = new BitSet(new long[]{0x7C004199C0004000L,0x4000400000001220L});
-    public static final BitSet FOLLOW_30_in_ruleActorClass6028 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_ruleActorClass6049 = new BitSet(new long[]{0x7C00419980004000L,0x4000400000001220L});
-    public static final BitSet FOLLOW_31_in_ruleActorClass6064 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_ruleActorClass6085 = new BitSet(new long[]{0x7C00419900004000L,0x4000400000001220L});
-    public static final BitSet FOLLOW_ruleLayerConnection_in_ruleActorClass6109 = new BitSet(new long[]{0x7C00419900004000L,0x4000400000001220L});
-    public static final BitSet FOLLOW_ruleBinding_in_ruleActorClass6136 = new BitSet(new long[]{0x7C00419900004000L,0x4000400000001220L});
-    public static final BitSet FOLLOW_ruleServiceImplementation_in_ruleActorClass6163 = new BitSet(new long[]{0x7C00419900004000L,0x4000400000001220L});
-    public static final BitSet FOLLOW_ruleAttribute_in_ruleActorClass6190 = new BitSet(new long[]{0x7C00419900004000L,0x4000400000001220L});
-    public static final BitSet FOLLOW_ruleActorRef_in_ruleActorClass6217 = new BitSet(new long[]{0x7C00419900004000L,0x4000400000001220L});
-    public static final BitSet FOLLOW_ruleSAP_in_ruleActorClass6244 = new BitSet(new long[]{0x7C00419900004000L,0x4000400000001220L});
-    public static final BitSet FOLLOW_rulePort_in_ruleActorClass6271 = new BitSet(new long[]{0x7C00419900004000L,0x4000400000001220L});
-    public static final BitSet FOLLOW_ruleExternalPort_in_ruleActorClass6298 = new BitSet(new long[]{0x7C00419900004000L,0x4000400000001220L});
-    public static final BitSet FOLLOW_14_in_ruleActorClass6312 = new BitSet(new long[]{0x0200000000004000L});
-    public static final BitSet FOLLOW_57_in_ruleActorClass6327 = new BitSet(new long[]{0x0000000200002000L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_ruleActorClass6348 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_13_in_ruleActorClass6361 = new BitSet(new long[]{0x0000019800004000L,0x0000080000008000L});
-    public static final BitSet FOLLOW_ruleAnnotation_in_ruleActorClass6382 = new BitSet(new long[]{0x0000019800004000L,0x0000080000008000L});
-    public static final BitSet FOLLOW_ruleStandardOperation_in_ruleActorClass6405 = new BitSet(new long[]{0x0000019800004000L,0x0000000000008000L});
-    public static final BitSet FOLLOW_ruleClassStructor_in_ruleActorClass6432 = new BitSet(new long[]{0x0000019800004000L,0x0000000000008000L});
-    public static final BitSet FOLLOW_ruleStateMachine_in_ruleActorClass6455 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_14_in_ruleActorClass6468 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_14_in_ruleActorClass6482 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInterfaceItem_in_entryRuleInterfaceItem6518 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleInterfaceItem6528 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rulePort_in_ruleInterfaceItem6575 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSAP_in_ruleInterfaceItem6602 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSPP_in_ruleInterfaceItem6629 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rulePort_in_entryRulePort6664 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRulePort6674 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_rulePort6717 = new BitSet(new long[]{0x0400000000000000L});
-    public static final BitSet FOLLOW_58_in_rulePort6743 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_rulePort6760 = new BitSet(new long[]{0x0000000200008000L});
-    public static final BitSet FOLLOW_ruleMULTIPLICITY_in_rulePort6786 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_15_in_rulePort6799 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleFQN_in_rulePort6822 = new BitSet(new long[]{0x0000000200000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_rulePort6843 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExternalPort_in_entryRuleExternalPort6880 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleExternalPort6890 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_59_in_ruleExternalPort6927 = new BitSet(new long[]{0x0400000000000000L});
-    public static final BitSet FOLLOW_58_in_ruleExternalPort6939 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleExternalPort6959 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSAP_in_entryRuleSAP6995 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSAP7005 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_60_in_ruleSAP7042 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleSAP7059 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_15_in_ruleSAP7076 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleFQN_in_ruleSAP7099 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSPP_in_entryRuleSPP7135 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSPP7145 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_61_in_ruleSPP7182 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleSPP7199 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_15_in_ruleSPP7216 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleFQN_in_ruleSPP7239 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleServiceImplementation_in_entryRuleServiceImplementation7275 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleServiceImplementation7285 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_62_in_ruleServiceImplementation7322 = new BitSet(new long[]{0x0000000000800000L});
-    public static final BitSet FOLLOW_23_in_ruleServiceImplementation7334 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleServiceImplementation7354 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLogicalSystem_in_entryRuleLogicalSystem7390 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleLogicalSystem7400 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_63_in_ruleLogicalSystem7437 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleLogicalSystem7454 = new BitSet(new long[]{0x0000000200002000L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_ruleLogicalSystem7480 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_13_in_ruleLogicalSystem7493 = new BitSet(new long[]{0x0000000000004000L,0x0000080000000221L});
-    public static final BitSet FOLLOW_ruleAnnotation_in_ruleLogicalSystem7514 = new BitSet(new long[]{0x0000000000004000L,0x0000080000000221L});
-    public static final BitSet FOLLOW_ruleLayerConnection_in_ruleLogicalSystem7537 = new BitSet(new long[]{0x0000000000004000L,0x0000000000000221L});
-    public static final BitSet FOLLOW_ruleBinding_in_ruleLogicalSystem7564 = new BitSet(new long[]{0x0000000000004000L,0x0000000000000221L});
-    public static final BitSet FOLLOW_ruleSubSystemRef_in_ruleLogicalSystem7591 = new BitSet(new long[]{0x0000000000004000L,0x0000000000000221L});
-    public static final BitSet FOLLOW_14_in_ruleLogicalSystem7605 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSubSystemRef_in_entryRuleSubSystemRef7643 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSubSystemRef7653 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_64_in_ruleSubSystemRef7690 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleSubSystemRef7707 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_15_in_ruleSubSystemRef7724 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleFQN_in_ruleSubSystemRef7747 = new BitSet(new long[]{0x0000000200000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_ruleSubSystemRef7768 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSubSystemClass_in_entryRuleSubSystemClass7805 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSubSystemClass7815 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_65_in_ruleSubSystemClass7852 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleSubSystemClass7869 = new BitSet(new long[]{0x0000000200002000L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_ruleSubSystemClass7895 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_13_in_ruleSubSystemClass7908 = new BitSet(new long[]{0x24004000E0004000L,0x400048000000122CL});
-    public static final BitSet FOLLOW_ruleAnnotation_in_ruleSubSystemClass7929 = new BitSet(new long[]{0x24004000E0004000L,0x400048000000122CL});
-    public static final BitSet FOLLOW_29_in_ruleSubSystemClass7943 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_ruleSubSystemClass7964 = new BitSet(new long[]{0x24004000C0004000L,0x400040000000122CL});
-    public static final BitSet FOLLOW_30_in_ruleSubSystemClass7979 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_ruleSubSystemClass8000 = new BitSet(new long[]{0x2400400080004000L,0x400040000000122CL});
-    public static final BitSet FOLLOW_31_in_ruleSubSystemClass8015 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_ruleSubSystemClass8036 = new BitSet(new long[]{0x2400400000004000L,0x400040000000122CL});
-    public static final BitSet FOLLOW_ruleActorInstanceMapping_in_ruleSubSystemClass8060 = new BitSet(new long[]{0x2400400000004000L,0x400040000000122CL});
-    public static final BitSet FOLLOW_ruleLogicalThread_in_ruleSubSystemClass8087 = new BitSet(new long[]{0x2400400000004000L,0x400040000000122CL});
-    public static final BitSet FOLLOW_ruleLayerConnection_in_ruleSubSystemClass8114 = new BitSet(new long[]{0x2400400000004000L,0x400040000000122CL});
-    public static final BitSet FOLLOW_ruleBinding_in_ruleSubSystemClass8141 = new BitSet(new long[]{0x2400400000004000L,0x400040000000122CL});
-    public static final BitSet FOLLOW_ruleActorRef_in_ruleSubSystemClass8168 = new BitSet(new long[]{0x2400400000004000L,0x400040000000122CL});
-    public static final BitSet FOLLOW_ruleSPP_in_ruleSubSystemClass8195 = new BitSet(new long[]{0x2400400000004000L,0x400040000000122CL});
-    public static final BitSet FOLLOW_rulePort_in_ruleSubSystemClass8222 = new BitSet(new long[]{0x2400400000004000L,0x400040000000122CL});
-    public static final BitSet FOLLOW_14_in_ruleSubSystemClass8236 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLogicalThread_in_entryRuleLogicalThread8272 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleLogicalThread8282 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_66_in_ruleLogicalThread8319 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleLogicalThread8336 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleActorInstanceMapping_in_entryRuleActorInstanceMapping8377 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleActorInstanceMapping8387 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_67_in_ruleActorInstanceMapping8424 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleRefPath_in_ruleActorInstanceMapping8445 = new BitSet(new long[]{0x0000000000040000L});
-    public static final BitSet FOLLOW_18_in_ruleActorInstanceMapping8457 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleActorInstanceMapping8477 = new BitSet(new long[]{0x0000000000002002L});
-    public static final BitSet FOLLOW_13_in_ruleActorInstanceMapping8490 = new BitSet(new long[]{0x0000000000004000L,0x0000000000000008L});
-    public static final BitSet FOLLOW_ruleActorInstanceMapping_in_ruleActorInstanceMapping8511 = new BitSet(new long[]{0x0000000000004000L,0x0000000000000008L});
-    public static final BitSet FOLLOW_14_in_ruleActorInstanceMapping8524 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRefPath_in_entryRuleRefPath8562 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRefPath8572 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRefSegment_in_ruleRefPath8618 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000010L});
-    public static final BitSet FOLLOW_68_in_ruleRefPath8631 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleRefSegment_in_ruleRefPath8652 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleRefSegment_in_entryRuleRefSegment8690 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRefSegment8700 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleRefSegment8742 = new BitSet(new long[]{0x0000000000008002L});
-    public static final BitSet FOLLOW_15_in_ruleRefSegment8760 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleRefSegment8777 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleBinding_in_entryRuleBinding8820 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleBinding8830 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_69_in_ruleBinding8867 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleBindingEndPoint_in_ruleBinding8888 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000040L});
-    public static final BitSet FOLLOW_70_in_ruleBinding8900 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleBindingEndPoint_in_ruleBinding8921 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleBindingEndPoint_in_entryRuleBindingEndPoint8957 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleBindingEndPoint8967 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleBindingEndPoint9013 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000080L});
-    public static final BitSet FOLLOW_71_in_ruleBindingEndPoint9025 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleBindingEndPoint9047 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000100L});
-    public static final BitSet FOLLOW_72_in_ruleBindingEndPoint9060 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleBindingEndPoint9080 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLayerConnection_in_entryRuleLayerConnection9118 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleLayerConnection9128 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_73_in_ruleLayerConnection9165 = new BitSet(new long[]{0x0000000000010000L,0x0000000000000800L});
-    public static final BitSet FOLLOW_ruleSAPoint_in_ruleLayerConnection9186 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_74_in_ruleLayerConnection9198 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleSPPoint_in_ruleLayerConnection9219 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSAPoint_in_entryRuleSAPoint9255 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSAPoint9265 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRefSAPoint_in_ruleSAPoint9312 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRelaySAPoint_in_ruleSAPoint9339 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRefSAPoint_in_entryRuleRefSAPoint9374 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRefSAPoint9384 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_16_in_ruleRefSAPoint9421 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleRefSAPoint9441 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRelaySAPoint_in_entryRuleRelaySAPoint9477 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRelaySAPoint9487 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_75_in_ruleRelaySAPoint9524 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleRelaySAPoint9544 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSPPoint_in_entryRuleSPPoint9580 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSPPoint9590 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleSPPoint9635 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000080L});
-    public static final BitSet FOLLOW_71_in_ruleSPPoint9647 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleSPPoint9667 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleActorRef_in_entryRuleActorRef9703 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleActorRef9713 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleReferenceType_in_ruleActorRef9759 = new BitSet(new long[]{0x0000000000000000L,0x0000000000001000L});
-    public static final BitSet FOLLOW_76_in_ruleActorRef9772 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleActorRef9789 = new BitSet(new long[]{0x0000000200008000L});
-    public static final BitSet FOLLOW_ruleMULTIPLICITY_in_ruleActorRef9815 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_15_in_ruleActorRef9828 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleFQN_in_ruleActorRef9851 = new BitSet(new long[]{0x0000000200000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_ruleActorRef9872 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMULTIPLICITY_in_entryRuleMULTIPLICITY9912 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleMULTIPLICITY9923 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_ruleMULTIPLICITY9961 = new BitSet(new long[]{0x0000000000000040L,0x0000000000002000L});
-    public static final BitSet FOLLOW_77_in_ruleMULTIPLICITY9975 = new BitSet(new long[]{0x0000000400000000L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleMULTIPLICITY9996 = new BitSet(new long[]{0x0000000400000000L});
-    public static final BitSet FOLLOW_34_in_ruleMULTIPLICITY10015 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAnnotationTargetType_in_entryRuleAnnotationTargetType10056 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAnnotationTargetType10067 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_ruleAnnotationTargetType10105 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_54_in_ruleAnnotationTargetType10124 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_78_in_ruleAnnotationTargetType10143 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_ruleAnnotationTargetType10162 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_ruleAnnotationTargetType10181 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_65_in_ruleAnnotationTargetType10200 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_63_in_ruleAnnotationTargetType10219 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStateGraphNode_in_entryRuleStateGraphNode10261 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleStateGraphNode10271 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleState_in_ruleStateGraphNode10318 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChoicePoint_in_ruleStateGraphNode10345 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTrPoint_in_ruleStateGraphNode10372 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStateGraph_in_entryRuleStateGraph10409 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleStateGraph10419 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_13_in_ruleStateGraph10465 = new BitSet(new long[]{0x0000000000004000L,0x000000040FE10000L});
-    public static final BitSet FOLLOW_ruleState_in_ruleStateGraph10487 = new BitSet(new long[]{0x0000000000004000L,0x000000040FE10000L});
-    public static final BitSet FOLLOW_ruleTrPoint_in_ruleStateGraph10514 = new BitSet(new long[]{0x0000000000004000L,0x000000040FE10000L});
-    public static final BitSet FOLLOW_ruleChoicePoint_in_ruleStateGraph10541 = new BitSet(new long[]{0x0000000000004000L,0x000000040FE10000L});
-    public static final BitSet FOLLOW_ruleTransition_in_ruleStateGraph10568 = new BitSet(new long[]{0x0000000000004000L,0x000000040FE10000L});
-    public static final BitSet FOLLOW_ruleRefinedTransition_in_ruleStateGraph10595 = new BitSet(new long[]{0x0000000000004000L,0x000000040FE10000L});
-    public static final BitSet FOLLOW_14_in_ruleStateGraph10609 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStateMachine_in_entryRuleStateMachine10645 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleStateMachine10655 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_79_in_ruleStateMachine10701 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_13_in_ruleStateMachine10713 = new BitSet(new long[]{0x0000000000004000L,0x000000040FE10000L});
-    public static final BitSet FOLLOW_ruleState_in_ruleStateMachine10735 = new BitSet(new long[]{0x0000000000004000L,0x000000040FE10000L});
-    public static final BitSet FOLLOW_ruleTrPoint_in_ruleStateMachine10762 = new BitSet(new long[]{0x0000000000004000L,0x000000040FE10000L});
-    public static final BitSet FOLLOW_ruleChoicePoint_in_ruleStateMachine10789 = new BitSet(new long[]{0x0000000000004000L,0x000000040FE10000L});
-    public static final BitSet FOLLOW_ruleTransition_in_ruleStateMachine10816 = new BitSet(new long[]{0x0000000000004000L,0x000000040FE10000L});
-    public static final BitSet FOLLOW_ruleRefinedTransition_in_ruleStateMachine10843 = new BitSet(new long[]{0x0000000000004000L,0x000000040FE10000L});
-    public static final BitSet FOLLOW_14_in_ruleStateMachine10857 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleState_in_entryRuleState10893 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleState10903 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleState_in_ruleState10950 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRefinedState_in_ruleState10977 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleState_in_entryRuleSimpleState11012 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSimpleState11022 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_80_in_ruleSimpleState11059 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleSimpleState11076 = new BitSet(new long[]{0x0000000200002002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_ruleSimpleState11102 = new BitSet(new long[]{0x0000000000002002L});
-    public static final BitSet FOLLOW_13_in_ruleSimpleState11116 = new BitSet(new long[]{0x0000000000004000L,0x00000000001E0000L});
-    public static final BitSet FOLLOW_81_in_ruleSimpleState11129 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_ruleSimpleState11150 = new BitSet(new long[]{0x0000000000004000L,0x00000000001C0000L});
-    public static final BitSet FOLLOW_82_in_ruleSimpleState11165 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_ruleSimpleState11186 = new BitSet(new long[]{0x0000000000004000L,0x0000000000180000L});
-    public static final BitSet FOLLOW_83_in_ruleSimpleState11201 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_ruleSimpleState11222 = new BitSet(new long[]{0x0000000000004000L,0x0000000000100000L});
-    public static final BitSet FOLLOW_84_in_ruleSimpleState11237 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_ruleStateGraph_in_ruleSimpleState11258 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_14_in_ruleSimpleState11272 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRefinedState_in_entryRuleRefinedState11310 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRefinedState11320 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_85_in_ruleRefinedState11357 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleFQN_in_ruleRefinedState11380 = new BitSet(new long[]{0x0000000200002000L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_ruleRefinedState11401 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_13_in_ruleRefinedState11414 = new BitSet(new long[]{0x0000000000004000L,0x00000000001E0000L});
-    public static final BitSet FOLLOW_81_in_ruleRefinedState11427 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_ruleRefinedState11448 = new BitSet(new long[]{0x0000000000004000L,0x00000000001C0000L});
-    public static final BitSet FOLLOW_82_in_ruleRefinedState11463 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_ruleRefinedState11484 = new BitSet(new long[]{0x0000000000004000L,0x0000000000180000L});
-    public static final BitSet FOLLOW_83_in_ruleRefinedState11499 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_ruleRefinedState11520 = new BitSet(new long[]{0x0000000000004000L,0x0000000000100000L});
-    public static final BitSet FOLLOW_84_in_ruleRefinedState11535 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_ruleStateGraph_in_ruleRefinedState11556 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_14_in_ruleRefinedState11570 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_entryRuleDetailCode11606 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDetailCode11616 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_13_in_ruleDetailCode11668 = new BitSet(new long[]{0x0000000000004020L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleDetailCode11698 = new BitSet(new long[]{0x0000000000004020L});
-    public static final BitSet FOLLOW_14_in_ruleDetailCode11716 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTrPoint_in_entryRuleTrPoint11752 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleTrPoint11762 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTransitionPoint_in_ruleTrPoint11809 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleEntryPoint_in_ruleTrPoint11836 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExitPoint_in_ruleTrPoint11863 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTransitionPoint_in_entryRuleTransitionPoint11898 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleTransitionPoint11908 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_86_in_ruleTransitionPoint11951 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L});
-    public static final BitSet FOLLOW_87_in_ruleTransitionPoint11977 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleTransitionPoint11994 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleEntryPoint_in_entryRuleEntryPoint12035 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleEntryPoint12045 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_88_in_ruleEntryPoint12082 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleEntryPoint12099 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExitPoint_in_entryRuleExitPoint12140 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleExitPoint12150 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_89_in_ruleExitPoint12187 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleExitPoint12204 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChoicePoint_in_entryRuleChoicePoint12245 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleChoicePoint12255 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_90_in_ruleChoicePoint12292 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleChoicePoint12309 = new BitSet(new long[]{0x0000000200000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_ruleChoicePoint12335 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTransition_in_entryRuleTransition12372 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleTransition12382 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInitialTransition_in_ruleTransition12429 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNonInitialTransition_in_ruleTransition12456 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNonInitialTransition_in_entryRuleNonInitialTransition12491 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleNonInitialTransition12501 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTransitionChainStartTransition_in_ruleNonInitialTransition12548 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleContinuationTransition_in_ruleNonInitialTransition12575 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCPBranchTransition_in_ruleNonInitialTransition12602 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTransitionChainStartTransition_in_entryRuleTransitionChainStartTransition12637 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleTransitionChainStartTransition12647 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTriggeredTransition_in_ruleTransitionChainStartTransition12694 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGuardedTransition_in_ruleTransitionChainStartTransition12721 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInitialTransition_in_entryRuleInitialTransition12756 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleInitialTransition12766 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_91_in_ruleInitialTransition12803 = new BitSet(new long[]{0x0000000000008010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleInitialTransition12820 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_15_in_ruleInitialTransition12838 = new BitSet(new long[]{0x0000000000000000L,0x0000000010000000L});
-    public static final BitSet FOLLOW_92_in_ruleInitialTransition12850 = new BitSet(new long[]{0x0000000000040000L});
-    public static final BitSet FOLLOW_18_in_ruleInitialTransition12862 = new BitSet(new long[]{0x0000000000000010L,0x0000001800000000L});
-    public static final BitSet FOLLOW_ruleTransitionTerminal_in_ruleInitialTransition12883 = new BitSet(new long[]{0x0000000200002002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_ruleInitialTransition12904 = new BitSet(new long[]{0x0000000000002002L});
-    public static final BitSet FOLLOW_13_in_ruleInitialTransition12918 = new BitSet(new long[]{0x0000000000004000L,0x0000000020000000L});
-    public static final BitSet FOLLOW_93_in_ruleInitialTransition12931 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_ruleInitialTransition12952 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_14_in_ruleInitialTransition12966 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleContinuationTransition_in_entryRuleContinuationTransition13004 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleContinuationTransition13014 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_91_in_ruleContinuationTransition13051 = new BitSet(new long[]{0x0000000000008010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleContinuationTransition13068 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_15_in_ruleContinuationTransition13086 = new BitSet(new long[]{0x0000000000000010L,0x0000001800000000L});
-    public static final BitSet FOLLOW_ruleTransitionTerminal_in_ruleContinuationTransition13107 = new BitSet(new long[]{0x0000000000040000L});
-    public static final BitSet FOLLOW_18_in_ruleContinuationTransition13119 = new BitSet(new long[]{0x0000000000000010L,0x0000001800000000L});
-    public static final BitSet FOLLOW_ruleTransitionTerminal_in_ruleContinuationTransition13140 = new BitSet(new long[]{0x0000000200002002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_ruleContinuationTransition13161 = new BitSet(new long[]{0x0000000000002002L});
-    public static final BitSet FOLLOW_13_in_ruleContinuationTransition13175 = new BitSet(new long[]{0x0000000000004000L,0x0000000020000000L});
-    public static final BitSet FOLLOW_93_in_ruleContinuationTransition13188 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_ruleContinuationTransition13209 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_14_in_ruleContinuationTransition13223 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTriggeredTransition_in_entryRuleTriggeredTransition13261 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleTriggeredTransition13271 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_91_in_ruleTriggeredTransition13308 = new BitSet(new long[]{0x0000000000008010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleTriggeredTransition13325 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_15_in_ruleTriggeredTransition13343 = new BitSet(new long[]{0x0000000000000010L,0x0000001800000000L});
-    public static final BitSet FOLLOW_ruleTransitionTerminal_in_ruleTriggeredTransition13364 = new BitSet(new long[]{0x0000000000040000L});
-    public static final BitSet FOLLOW_18_in_ruleTriggeredTransition13376 = new BitSet(new long[]{0x0000000000000010L,0x0000001800000000L});
-    public static final BitSet FOLLOW_ruleTransitionTerminal_in_ruleTriggeredTransition13397 = new BitSet(new long[]{0x0000000200002000L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_ruleTriggeredTransition13418 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_13_in_ruleTriggeredTransition13431 = new BitSet(new long[]{0x0000000000000000L,0x0000000040000000L});
-    public static final BitSet FOLLOW_94_in_ruleTriggeredTransition13443 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_13_in_ruleTriggeredTransition13455 = new BitSet(new long[]{0x0000000000000000L,0x0000002000000000L});
-    public static final BitSet FOLLOW_ruleTrigger_in_ruleTriggeredTransition13476 = new BitSet(new long[]{0x0000000000004000L,0x0000000080000000L});
-    public static final BitSet FOLLOW_95_in_ruleTriggeredTransition13489 = new BitSet(new long[]{0x0000000000000000L,0x0000002000000000L});
-    public static final BitSet FOLLOW_ruleTrigger_in_ruleTriggeredTransition13510 = new BitSet(new long[]{0x0000000000004000L,0x0000000080000000L});
-    public static final BitSet FOLLOW_14_in_ruleTriggeredTransition13524 = new BitSet(new long[]{0x0000000000004000L,0x0000000020000000L});
-    public static final BitSet FOLLOW_93_in_ruleTriggeredTransition13537 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_ruleTriggeredTransition13558 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_14_in_ruleTriggeredTransition13572 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGuardedTransition_in_entryRuleGuardedTransition13608 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleGuardedTransition13618 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_91_in_ruleGuardedTransition13655 = new BitSet(new long[]{0x0000000000008010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleGuardedTransition13672 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_15_in_ruleGuardedTransition13690 = new BitSet(new long[]{0x0000000000000010L,0x0000001800000000L});
-    public static final BitSet FOLLOW_ruleTransitionTerminal_in_ruleGuardedTransition13711 = new BitSet(new long[]{0x0000000000040000L});
-    public static final BitSet FOLLOW_18_in_ruleGuardedTransition13723 = new BitSet(new long[]{0x0000000000000010L,0x0000001800000000L});
-    public static final BitSet FOLLOW_ruleTransitionTerminal_in_ruleGuardedTransition13744 = new BitSet(new long[]{0x0000000200002000L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_ruleGuardedTransition13765 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_13_in_ruleGuardedTransition13778 = new BitSet(new long[]{0x0000000000000000L,0x0000000100000000L});
-    public static final BitSet FOLLOW_96_in_ruleGuardedTransition13790 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_ruleGuardedTransition13811 = new BitSet(new long[]{0x0000000000004000L,0x0000000020000000L});
-    public static final BitSet FOLLOW_93_in_ruleGuardedTransition13824 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_ruleGuardedTransition13845 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_14_in_ruleGuardedTransition13859 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCPBranchTransition_in_entryRuleCPBranchTransition13895 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleCPBranchTransition13905 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_91_in_ruleCPBranchTransition13942 = new BitSet(new long[]{0x0000000000008010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleCPBranchTransition13959 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_15_in_ruleCPBranchTransition13977 = new BitSet(new long[]{0x0000000000000010L,0x0000001800000000L});
-    public static final BitSet FOLLOW_ruleTransitionTerminal_in_ruleCPBranchTransition13998 = new BitSet(new long[]{0x0000000000040000L});
-    public static final BitSet FOLLOW_18_in_ruleCPBranchTransition14010 = new BitSet(new long[]{0x0000000000000010L,0x0000001800000000L});
-    public static final BitSet FOLLOW_ruleTransitionTerminal_in_ruleCPBranchTransition14031 = new BitSet(new long[]{0x0000000200002000L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_ruleCPBranchTransition14052 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_13_in_ruleCPBranchTransition14065 = new BitSet(new long[]{0x0000000000000000L,0x0000000200000000L});
-    public static final BitSet FOLLOW_97_in_ruleCPBranchTransition14077 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_ruleCPBranchTransition14098 = new BitSet(new long[]{0x0000000000004000L,0x0000000020000000L});
-    public static final BitSet FOLLOW_93_in_ruleCPBranchTransition14111 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_ruleCPBranchTransition14132 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_14_in_ruleCPBranchTransition14146 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRefinedTransition_in_entryRuleRefinedTransition14182 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRefinedTransition14192 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_98_in_ruleRefinedTransition14229 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleFQN_in_ruleRefinedTransition14252 = new BitSet(new long[]{0x0000000200002000L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_ruleRefinedTransition14273 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_13_in_ruleRefinedTransition14286 = new BitSet(new long[]{0x0000000000000000L,0x0000000020000000L});
-    public static final BitSet FOLLOW_93_in_ruleRefinedTransition14298 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_ruleRefinedTransition14319 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_14_in_ruleRefinedTransition14331 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTransitionTerminal_in_entryRuleTransitionTerminal14367 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleTransitionTerminal14377 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStateTerminal_in_ruleTransitionTerminal14424 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTrPointTerminal_in_ruleTransitionTerminal14451 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSubStateTrPointTerminal_in_ruleTransitionTerminal14478 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChoicepointTerminal_in_ruleTransitionTerminal14505 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStateTerminal_in_entryRuleStateTerminal14540 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleStateTerminal14550 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleStateTerminal14594 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTrPointTerminal_in_entryRuleTrPointTerminal14629 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleTrPointTerminal14639 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_99_in_ruleTrPointTerminal14676 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleTrPointTerminal14696 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSubStateTrPointTerminal_in_entryRuleSubStateTrPointTerminal14732 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSubStateTrPointTerminal14742 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleSubStateTrPointTerminal14787 = new BitSet(new long[]{0x0000000000800000L});
-    public static final BitSet FOLLOW_23_in_ruleSubStateTrPointTerminal14799 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleSubStateTrPointTerminal14819 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChoicepointTerminal_in_entryRuleChoicepointTerminal14855 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleChoicepointTerminal14865 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_100_in_ruleChoicepointTerminal14902 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleChoicepointTerminal14922 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTrigger_in_entryRuleTrigger14958 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleTrigger14968 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_101_in_ruleTrigger15005 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleMessageFromIf_in_ruleTrigger15026 = new BitSet(new long[]{0x0000000000000000L,0x000000C100000000L});
-    public static final BitSet FOLLOW_102_in_ruleTrigger15039 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleMessageFromIf_in_ruleTrigger15060 = new BitSet(new long[]{0x0000000000000000L,0x000000C100000000L});
-    public static final BitSet FOLLOW_ruleGuard_in_ruleTrigger15083 = new BitSet(new long[]{0x0000000000000000L,0x0000008000000000L});
-    public static final BitSet FOLLOW_103_in_ruleTrigger15096 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMessageFromIf_in_entryRuleMessageFromIf15132 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleMessageFromIf15142 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleMessageFromIf15187 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_15_in_ruleMessageFromIf15199 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleMessageFromIf15219 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGuard_in_entryRuleGuard15255 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleGuard15265 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_96_in_ruleGuard15302 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_ruleDetailCode_in_ruleGuard15323 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleProtocolSemantics_in_entryRuleProtocolSemantics15359 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleProtocolSemantics15369 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_104_in_ruleProtocolSemantics15415 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_13_in_ruleProtocolSemantics15427 = new BitSet(new long[]{0x0000000000004000L,0x0000060000000000L});
-    public static final BitSet FOLLOW_ruleSemanticsRule_in_ruleProtocolSemantics15448 = new BitSet(new long[]{0x0000000000004000L,0x0000060000000000L});
-    public static final BitSet FOLLOW_14_in_ruleProtocolSemantics15461 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSemanticsRule_in_entryRuleSemanticsRule15497 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSemanticsRule15507 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInSemanticsRule_in_ruleSemanticsRule15554 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOutSemanticsRule_in_ruleSemanticsRule15581 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInSemanticsRule_in_entryRuleInSemanticsRule15616 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleInSemanticsRule15626 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_105_in_ruleInSemanticsRule15663 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_15_in_ruleInSemanticsRule15675 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleInSemanticsRule15695 = new BitSet(new long[]{0x0000000000040002L});
-    public static final BitSet FOLLOW_18_in_ruleInSemanticsRule15708 = new BitSet(new long[]{0x0000000000080000L,0x0000060000000000L});
-    public static final BitSet FOLLOW_ruleSemanticsRule_in_ruleInSemanticsRule15730 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_19_in_ruleInSemanticsRule15749 = new BitSet(new long[]{0x0000000000000000L,0x0000060000000000L});
-    public static final BitSet FOLLOW_ruleSemanticsRule_in_ruleInSemanticsRule15770 = new BitSet(new long[]{0x0000000001000000L});
-    public static final BitSet FOLLOW_24_in_ruleInSemanticsRule15783 = new BitSet(new long[]{0x0000000000000000L,0x0000060000000000L});
-    public static final BitSet FOLLOW_ruleSemanticsRule_in_ruleInSemanticsRule15804 = new BitSet(new long[]{0x0000000001100000L});
-    public static final BitSet FOLLOW_20_in_ruleInSemanticsRule15818 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOutSemanticsRule_in_entryRuleOutSemanticsRule15858 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOutSemanticsRule15868 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_106_in_ruleOutSemanticsRule15905 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_15_in_ruleOutSemanticsRule15917 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleOutSemanticsRule15937 = new BitSet(new long[]{0x0000000000040002L});
-    public static final BitSet FOLLOW_18_in_ruleOutSemanticsRule15950 = new BitSet(new long[]{0x0000000000080000L,0x0000060000000000L});
-    public static final BitSet FOLLOW_ruleSemanticsRule_in_ruleOutSemanticsRule15972 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_19_in_ruleOutSemanticsRule15991 = new BitSet(new long[]{0x0000000000000000L,0x0000060000000000L});
-    public static final BitSet FOLLOW_ruleSemanticsRule_in_ruleOutSemanticsRule16012 = new BitSet(new long[]{0x0000000001000000L});
-    public static final BitSet FOLLOW_24_in_ruleOutSemanticsRule16025 = new BitSet(new long[]{0x0000000000000000L,0x0000060000000000L});
-    public static final BitSet FOLLOW_ruleSemanticsRule_in_ruleOutSemanticsRule16046 = new BitSet(new long[]{0x0000000001100000L});
-    public static final BitSet FOLLOW_20_in_ruleOutSemanticsRule16060 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAnnotation_in_entryRuleAnnotation16100 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAnnotation16110 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_107_in_ruleAnnotation16147 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleFQN_in_ruleAnnotation16170 = new BitSet(new long[]{0x0000000000080002L});
-    public static final BitSet FOLLOW_19_in_ruleAnnotation16183 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleKeyValue_in_ruleAnnotation16204 = new BitSet(new long[]{0x0000000001100000L});
-    public static final BitSet FOLLOW_24_in_ruleAnnotation16217 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleKeyValue_in_ruleAnnotation16238 = new BitSet(new long[]{0x0000000001100000L});
-    public static final BitSet FOLLOW_20_in_ruleAnnotation16252 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleKeyValue_in_entryRuleKeyValue16290 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleKeyValue16300 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleKeyValue16342 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_25_in_ruleKeyValue16359 = new BitSet(new long[]{0x00000000000000E0L,0x01E0000000000000L});
-    public static final BitSet FOLLOW_ruleLiteral_in_ruleKeyValue16380 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAnnotationType_in_entryRuleAnnotationType16416 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAnnotationType16426 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_108_in_ruleAnnotationType16463 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleAnnotationType16480 = new BitSet(new long[]{0x0000000200002000L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_ruleAnnotationType16506 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_13_in_ruleAnnotationType16519 = new BitSet(new long[]{0x0000000000000000L,0x0000200000000000L});
-    public static final BitSet FOLLOW_109_in_ruleAnnotationType16531 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_25_in_ruleAnnotationType16543 = new BitSet(new long[]{0x8040820008002000L,0x0000000000004002L});
-    public static final BitSet FOLLOW_ruleAnnotationTargetType_in_ruleAnnotationType16565 = new BitSet(new long[]{0x0000000000004000L,0x0000C00000000000L});
-    public static final BitSet FOLLOW_13_in_ruleAnnotationType16584 = new BitSet(new long[]{0x8040820008000000L,0x0000000000004002L});
-    public static final BitSet FOLLOW_ruleAnnotationTargetType_in_ruleAnnotationType16605 = new BitSet(new long[]{0x0000000001004000L});
-    public static final BitSet FOLLOW_24_in_ruleAnnotationType16618 = new BitSet(new long[]{0x8040820008000000L,0x0000000000004002L});
-    public static final BitSet FOLLOW_ruleAnnotationTargetType_in_ruleAnnotationType16639 = new BitSet(new long[]{0x0000000001004000L});
-    public static final BitSet FOLLOW_14_in_ruleAnnotationType16653 = new BitSet(new long[]{0x0000000000004000L,0x0000C00000000000L});
-    public static final BitSet FOLLOW_ruleAnnotationAttribute_in_ruleAnnotationType16676 = new BitSet(new long[]{0x0000000000004000L,0x0000C00000000000L});
-    public static final BitSet FOLLOW_14_in_ruleAnnotationType16689 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAnnotationAttribute_in_entryRuleAnnotationAttribute16725 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAnnotationAttribute16735 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleAnnotationAttribute_in_ruleAnnotationAttribute16782 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleEnumAnnotationAttribute_in_ruleAnnotationAttribute16809 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleAnnotationAttribute_in_entryRuleSimpleAnnotationAttribute16844 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSimpleAnnotationAttribute16854 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_110_in_ruleSimpleAnnotationAttribute16898 = new BitSet(new long[]{0x0000000000000000L,0x0001000000000000L});
-    public static final BitSet FOLLOW_111_in_ruleSimpleAnnotationAttribute16929 = new BitSet(new long[]{0x0000000000000000L,0x0001000000000000L});
-    public static final BitSet FOLLOW_112_in_ruleSimpleAnnotationAttribute16942 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleSimpleAnnotationAttribute16959 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_15_in_ruleSimpleAnnotationAttribute16976 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x000000000000000FL});
-    public static final BitSet FOLLOW_ruleLiteralType_in_ruleSimpleAnnotationAttribute16997 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleEnumAnnotationAttribute_in_entryRuleEnumAnnotationAttribute17033 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleEnumAnnotationAttribute17043 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_110_in_ruleEnumAnnotationAttribute17087 = new BitSet(new long[]{0x0000000000000000L,0x0001000000000000L});
-    public static final BitSet FOLLOW_111_in_ruleEnumAnnotationAttribute17118 = new BitSet(new long[]{0x0000000000000000L,0x0001000000000000L});
-    public static final BitSet FOLLOW_112_in_ruleEnumAnnotationAttribute17131 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleEnumAnnotationAttribute17148 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_15_in_ruleEnumAnnotationAttribute17165 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_13_in_ruleEnumAnnotationAttribute17177 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleEnumAnnotationAttribute17194 = new BitSet(new long[]{0x0000000001004000L});
-    public static final BitSet FOLLOW_24_in_ruleEnumAnnotationAttribute17212 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleEnumAnnotationAttribute17229 = new BitSet(new long[]{0x0000000001004000L});
-    public static final BitSet FOLLOW_14_in_ruleEnumAnnotationAttribute17248 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleImport_in_entryRuleImport17284 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleImport17294 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_113_in_ruleImport17331 = new BitSet(new long[]{0x0000000000000010L,0x0008000000000000L});
-    public static final BitSet FOLLOW_ruleImportedFQN_in_ruleImport17354 = new BitSet(new long[]{0x0000000000000000L,0x0004000000000000L});
-    public static final BitSet FOLLOW_114_in_ruleImport17366 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_115_in_ruleImport17385 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleImport17403 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleImportedFQN_in_entryRuleImportedFQN17445 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleImportedFQN17456 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_ruleImportedFQN17503 = new BitSet(new long[]{0x0000000000000002L,0x0010000000000000L});
-    public static final BitSet FOLLOW_116_in_ruleImportedFQN17522 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDocumentation_in_entryRuleDocumentation17564 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDocumentation17574 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_ruleDocumentation17620 = new BitSet(new long[]{0x0000000400000020L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleDocumentation17637 = new BitSet(new long[]{0x0000000400000020L});
-    public static final BitSet FOLLOW_34_in_ruleDocumentation17655 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLiteral_in_entryRuleLiteral17695 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleLiteral17705 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleBooleanLiteral_in_ruleLiteral17752 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNumberLiteral_in_ruleLiteral17779 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStringLiteral_in_ruleLiteral17806 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleBooleanLiteral_in_entryRuleBooleanLiteral17841 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleBooleanLiteral17851 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_117_in_ruleBooleanLiteral17898 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_118_in_ruleBooleanLiteral17922 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNumberLiteral_in_entryRuleNumberLiteral17972 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleNumberLiteral17982 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntLiteral_in_ruleNumberLiteral18029 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRealLiteral_in_ruleNumberLiteral18056 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRealLiteral_in_entryRuleRealLiteral18091 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRealLiteral18101 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleReal_in_ruleRealLiteral18156 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntLiteral_in_entryRuleIntLiteral18192 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIntLiteral18202 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInteger_in_ruleIntLiteral18257 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStringLiteral_in_entryRuleStringLiteral18293 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleStringLiteral18303 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleStringLiteral18354 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInteger_in_entryRuleInteger18396 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleInteger18407 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_119_in_ruleInteger18447 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_120_in_ruleInteger18466 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleInteger18483 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_HEX_in_ruleInteger18510 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleReal_in_entryRuleReal18556 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleReal18567 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDecimal_in_ruleReal18614 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDecimalExp_in_ruleReal18647 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDecimal_in_entryRuleDecimal18699 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDecimal18710 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_119_in_ruleDecimal18753 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_120_in_ruleDecimal18772 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleDecimal18789 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000080L});
-    public static final BitSet FOLLOW_71_in_ruleDecimal18807 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleDecimal18822 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDecimalExp_in_entryRuleDecimalExp18878 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDecimalExp18889 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_119_in_ruleDecimalExp18932 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_120_in_ruleDecimalExp18951 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleDecimalExp18968 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000080L});
-    public static final BitSet FOLLOW_71_in_ruleDecimalExp18986 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleDecimalExp19001 = new BitSet(new long[]{0x0000000000000000L,0x0600000000000000L});
-    public static final BitSet FOLLOW_121_in_ruleDecimalExp19020 = new BitSet(new long[]{0x0000000000000040L,0x0180000000000000L});
-    public static final BitSet FOLLOW_122_in_ruleDecimalExp19039 = new BitSet(new long[]{0x0000000000000040L,0x0180000000000000L});
-    public static final BitSet FOLLOW_119_in_ruleDecimalExp19054 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_120_in_ruleDecimalExp19073 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleDecimalExp19090 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_entryRuleFQN19140 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleFQN19151 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleFQN19191 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000080L});
-    public static final BitSet FOLLOW_71_in_ruleFQN19210 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleFQN19225 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000080L});
-    public static final BitSet FOLLOW_123_in_ruleCommunicationType19286 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_124_in_ruleCommunicationType19303 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_125_in_ruleCommunicationType19320 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_126_in_ruleReferenceType19365 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_110_in_ruleReferenceType19382 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_123_in_ruleComponentCommunicationType19429 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_124_in_ruleComponentCommunicationType19446 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_127_in_ruleComponentCommunicationType19463 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_125_in_ruleComponentCommunicationType19480 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_128_in_ruleLiteralType19525 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_129_in_ruleLiteralType19542 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_130_in_ruleLiteralType19559 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_131_in_ruleLiteralType19576 = 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[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x0000000200002000L});
+    public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x0000000000002000L});
+    public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x806082000C424000L,0xB802100000000002L});
+    public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x806082000C424000L,0xB800100000000002L});
+    public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x0000000000008000L});
+    public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x0000000000010002L});
+    public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x000000000000000FL});
+    public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0000000000040000L});
+    public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000000000280000L});
+    public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x0000000000100000L});
+    public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0000000000200000L});
+    public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x0000000200000002L});
+    public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0000000200802000L});
+    public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0000000000802000L});
+    public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0000000000004010L});
+    public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x0000000001004000L});
+    public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x0000000002000002L});
+    public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x00000000000000C0L,0x0180000000000000L});
+    public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x0000000200200002L});
+    public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x0000000210002000L});
+    public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x0000000010002000L});
+    public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x00000199E0004000L,0x0000080000000000L});
+    public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x00000199C0004000L});
+    public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x0000019980004000L});
+    public static final BitSet FOLLOW_29 = new BitSet(new long[]{0x0000019900004000L});
+    public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x0000000200008000L});
+    public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x0000000000000040L});
+    public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x0000000400000000L});
+    public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x0000000202000012L});
+    public static final BitSet FOLLOW_34 = new BitSet(new long[]{0x0000000202000002L});
+    public static final BitSet FOLLOW_35 = new BitSet(new long[]{0x0000001000000000L});
+    public static final BitSet FOLLOW_36 = new BitSet(new long[]{0x0000000000080000L});
+    public static final BitSet FOLLOW_37 = new BitSet(new long[]{0x0000000000100010L});
+    public static final BitSet FOLLOW_38 = new BitSet(new long[]{0x0000000001100000L});
+    public static final BitSet FOLLOW_39 = new BitSet(new long[]{0x000000020000A000L});
+    public static final BitSet FOLLOW_40 = new BitSet(new long[]{0x0000002000000010L});
+    public static final BitSet FOLLOW_41 = new BitSet(new long[]{0x000000420000A000L});
+    public static final BitSet FOLLOW_42 = new BitSet(new long[]{0x0000020000000000L});
+    public static final BitSet FOLLOW_43 = new BitSet(new long[]{0x00005C00E0004000L,0x0000090000000000L});
+    public static final BitSet FOLLOW_44 = new BitSet(new long[]{0x00005C00C0004000L,0x0000010000000000L});
+    public static final BitSet FOLLOW_45 = new BitSet(new long[]{0x00005C0080004000L,0x0000010000000000L});
+    public static final BitSet FOLLOW_46 = new BitSet(new long[]{0x00005C0000004000L,0x0000010000000000L});
+    public static final BitSet FOLLOW_47 = new BitSet(new long[]{0x0006000000004000L});
+    public static final BitSet FOLLOW_48 = new BitSet(new long[]{0x0000580000004000L,0x0000010000000000L});
+    public static final BitSet FOLLOW_49 = new BitSet(new long[]{0x0000500000004000L,0x0000010000000000L});
+    public static final BitSet FOLLOW_50 = new BitSet(new long[]{0x0000200000000000L});
+    public static final BitSet FOLLOW_51 = new BitSet(new long[]{0x0000400000004000L,0x0000010000000000L});
+    public static final BitSet FOLLOW_52 = new BitSet(new long[]{0x0000000000004000L,0x0000010000000000L});
+    public static final BitSet FOLLOW_53 = new BitSet(new long[]{0x0000000000004000L});
+    public static final BitSet FOLLOW_54 = new BitSet(new long[]{0x0001000000004000L,0x0000080000000000L});
+    public static final BitSet FOLLOW_55 = new BitSet(new long[]{0x0001000000004000L});
+    public static final BitSet FOLLOW_56 = new BitSet(new long[]{0x0004000000000000L});
+    public static final BitSet FOLLOW_57 = new BitSet(new long[]{0x0018019900004000L});
+    public static final BitSet FOLLOW_58 = new BitSet(new long[]{0x0010019900004000L});
+    public static final BitSet FOLLOW_59 = new BitSet(new long[]{0x0000040000000000L});
+    public static final BitSet FOLLOW_60 = new BitSet(new long[]{0x0000080000000000L});
+    public static final BitSet FOLLOW_61 = new BitSet(new long[]{0x0060000000000000L,0xB800000000000000L});
+    public static final BitSet FOLLOW_62 = new BitSet(new long[]{0x0380000000004000L,0x0000080000000000L});
+    public static final BitSet FOLLOW_63 = new BitSet(new long[]{0x2400400000004000L});
+    public static final BitSet FOLLOW_64 = new BitSet(new long[]{0x0300000000004000L});
+    public static final BitSet FOLLOW_65 = new BitSet(new long[]{0x7C004199E0004000L,0x4000400000001220L});
+    public static final BitSet FOLLOW_66 = new BitSet(new long[]{0x7C004199C0004000L,0x4000400000001220L});
+    public static final BitSet FOLLOW_67 = new BitSet(new long[]{0x7C00419980004000L,0x4000400000001220L});
+    public static final BitSet FOLLOW_68 = new BitSet(new long[]{0x7C00419900004000L,0x4000400000001220L});
+    public static final BitSet FOLLOW_69 = new BitSet(new long[]{0x0200000000004000L});
+    public static final BitSet FOLLOW_70 = new BitSet(new long[]{0x0000019800004000L,0x0000080000008000L});
+    public static final BitSet FOLLOW_71 = new BitSet(new long[]{0x0000019800004000L,0x0000000000008000L});
+    public static final BitSet FOLLOW_72 = new BitSet(new long[]{0x0400000000000000L});
+    public static final BitSet FOLLOW_73 = new BitSet(new long[]{0x0000000000800000L});
+    public static final BitSet FOLLOW_74 = new BitSet(new long[]{0x0000000000004000L,0x0000080000000221L});
+    public static final BitSet FOLLOW_75 = new BitSet(new long[]{0x0000000000004000L,0x0000000000000221L});
+    public static final BitSet FOLLOW_76 = new BitSet(new long[]{0x24004000E0004000L,0x400048000000122CL});
+    public static final BitSet FOLLOW_77 = new BitSet(new long[]{0x24004000C0004000L,0x400040000000122CL});
+    public static final BitSet FOLLOW_78 = new BitSet(new long[]{0x2400400080004000L,0x400040000000122CL});
+    public static final BitSet FOLLOW_79 = new BitSet(new long[]{0x2400400000004000L,0x400040000000122CL});
+    public static final BitSet FOLLOW_80 = new BitSet(new long[]{0x0000000000002002L});
+    public static final BitSet FOLLOW_81 = new BitSet(new long[]{0x0000000000004000L,0x0000000000000008L});
+    public static final BitSet FOLLOW_82 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000010L});
+    public static final BitSet FOLLOW_83 = new BitSet(new long[]{0x0000000000008002L});
+    public static final BitSet FOLLOW_84 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000040L});
+    public static final BitSet FOLLOW_85 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000080L});
+    public static final BitSet FOLLOW_86 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000100L});
+    public static final BitSet FOLLOW_87 = new BitSet(new long[]{0x0000000000010000L,0x0000000000000800L});
+    public static final BitSet FOLLOW_88 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
+    public static final BitSet FOLLOW_89 = new BitSet(new long[]{0x0000000000000000L,0x0000000000001000L});
+    public static final BitSet FOLLOW_90 = new BitSet(new long[]{0x0000000000000040L,0x0000000000002000L});
+    public static final BitSet FOLLOW_91 = new BitSet(new long[]{0x0000000000004000L,0x000000040FE10000L});
+    public static final BitSet FOLLOW_92 = new BitSet(new long[]{0x0000000200002002L});
+    public static final BitSet FOLLOW_93 = new BitSet(new long[]{0x0000000000004000L,0x00000000001E0000L});
+    public static final BitSet FOLLOW_94 = new BitSet(new long[]{0x0000000000004000L,0x00000000001C0000L});
+    public static final BitSet FOLLOW_95 = new BitSet(new long[]{0x0000000000004000L,0x0000000000180000L});
+    public static final BitSet FOLLOW_96 = new BitSet(new long[]{0x0000000000004000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_97 = new BitSet(new long[]{0x0000000000004020L});
+    public static final BitSet FOLLOW_98 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L});
+    public static final BitSet FOLLOW_99 = new BitSet(new long[]{0x0000000000008010L});
+    public static final BitSet FOLLOW_100 = new BitSet(new long[]{0x0000000000000000L,0x0000000010000000L});
+    public static final BitSet FOLLOW_101 = new BitSet(new long[]{0x0000000000000010L,0x0000001800000000L});
+    public static final BitSet FOLLOW_102 = new BitSet(new long[]{0x0000000000004000L,0x0000000020000000L});
+    public static final BitSet FOLLOW_103 = new BitSet(new long[]{0x0000000000000000L,0x0000000040000000L});
+    public static final BitSet FOLLOW_104 = new BitSet(new long[]{0x0000000000000000L,0x0000002000000000L});
+    public static final BitSet FOLLOW_105 = new BitSet(new long[]{0x0000000000004000L,0x0000000080000000L});
+    public static final BitSet FOLLOW_106 = new BitSet(new long[]{0x0000000000000000L,0x0000000100000000L});
+    public static final BitSet FOLLOW_107 = new BitSet(new long[]{0x0000000000000000L,0x0000000200000000L});
+    public static final BitSet FOLLOW_108 = new BitSet(new long[]{0x0000000000000000L,0x0000000020000000L});
+    public static final BitSet FOLLOW_109 = new BitSet(new long[]{0x0000000000000000L,0x000000C100000000L});
+    public static final BitSet FOLLOW_110 = new BitSet(new long[]{0x0000000000000000L,0x0000008000000000L});
+    public static final BitSet FOLLOW_111 = new BitSet(new long[]{0x0000000000004000L,0x0000060000000000L});
+    public static final BitSet FOLLOW_112 = new BitSet(new long[]{0x0000000000040002L});
+    public static final BitSet FOLLOW_113 = new BitSet(new long[]{0x0000000000080000L,0x0000060000000000L});
+    public static final BitSet FOLLOW_114 = new BitSet(new long[]{0x0000000000000000L,0x0000060000000000L});
+    public static final BitSet FOLLOW_115 = new BitSet(new long[]{0x0000000001000000L});
+    public static final BitSet FOLLOW_116 = new BitSet(new long[]{0x0000000000080002L});
+    public static final BitSet FOLLOW_117 = new BitSet(new long[]{0x0000000002000000L});
+    public static final BitSet FOLLOW_118 = new BitSet(new long[]{0x00000000000000E0L,0x01E0000000000000L});
+    public static final BitSet FOLLOW_119 = new BitSet(new long[]{0x0000000000000000L,0x0000200000000000L});
+    public static final BitSet FOLLOW_120 = new BitSet(new long[]{0x8040820008002000L,0x0000000000004002L});
+    public static final BitSet FOLLOW_121 = new BitSet(new long[]{0x0000000000004000L,0x0000C00000000000L});
+    public static final BitSet FOLLOW_122 = new BitSet(new long[]{0x8040820008000000L,0x0000000000004002L});
+    public static final BitSet FOLLOW_123 = new BitSet(new long[]{0x0000000000000000L,0x0001000000000000L});
+    public static final BitSet FOLLOW_124 = new BitSet(new long[]{0x0000000000000010L,0x0008000000000000L});
+    public static final BitSet FOLLOW_125 = new BitSet(new long[]{0x0000000000000000L,0x0004000000000000L});
+    public static final BitSet FOLLOW_126 = new BitSet(new long[]{0x0000000000000002L,0x0010000000000000L});
+    public static final BitSet FOLLOW_127 = new BitSet(new long[]{0x0000000400000020L});
+    public static final BitSet FOLLOW_128 = new BitSet(new long[]{0x0000000000000000L,0x0600000000000000L});
+    public static final BitSet FOLLOW_129 = new BitSet(new long[]{0x0000000000000040L,0x0180000000000000L});
+    public static final BitSet FOLLOW_130 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000080L});
 
 }
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorClass.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorClass.java
index ad4dfd457..894236fa6 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorClass.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorClass.java
@@ -54,6 +54,7 @@ import org.eclipse.etrice.core.fsm.fSM.ModelComponent;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.ActorClass#getInterfacePorts <em>Interface Ports</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.ActorClass#getStructureDocu <em>Structure Docu</em>}</li>
@@ -67,7 +68,6 @@ import org.eclipse.etrice.core.fsm.fSM.ModelComponent;
  *   <li>{@link org.eclipse.etrice.core.room.ActorClass#getOperations <em>Operations</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.ActorClass#getStructors <em>Structors</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.room.RoomPackage#getActorClass()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorContainerClass.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorContainerClass.java
index 715aa1455..b2b2f33e8 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorContainerClass.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorContainerClass.java
@@ -22,6 +22,7 @@ import org.eclipse.etrice.core.fsm.fSM.DetailCode;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.ActorContainerClass#getServiceProvisionPoints <em>Service Provision Points</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.ActorContainerClass#getUserCode1 <em>User Code1</em>}</li>
@@ -29,7 +30,6 @@ import org.eclipse.etrice.core.fsm.fSM.DetailCode;
  *   <li>{@link org.eclipse.etrice.core.room.ActorContainerClass#getUserCode3 <em>User Code3</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.ActorContainerClass#getActorRefs <em>Actor Refs</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.room.RoomPackage#getActorContainerClass()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorContainerRef.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorContainerRef.java
index 35044b688..13d718c98 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorContainerRef.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorContainerRef.java
@@ -23,11 +23,11 @@ import org.eclipse.etrice.core.common.base.Documentation;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.ActorContainerRef#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.ActorContainerRef#getDocu <em>Docu</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.room.RoomPackage#getActorContainerRef()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorInstanceMapping.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorInstanceMapping.java
index b90bd4fc9..263a5a625 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorInstanceMapping.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorInstanceMapping.java
@@ -19,12 +19,12 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.ActorInstanceMapping#getPath <em>Path</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.ActorInstanceMapping#getThread <em>Thread</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.ActorInstanceMapping#getActorInstanceMappings <em>Actor Instance Mappings</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.room.RoomPackage#getActorInstanceMapping()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorRef.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorRef.java
index accdf1d42..525a134bf 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorRef.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorRef.java
@@ -16,12 +16,12 @@ package org.eclipse.etrice.core.room;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.ActorRef#getRefType <em>Ref Type</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.ActorRef#getMultiplicity <em>Multiplicity</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.ActorRef#getType <em>Type</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.room.RoomPackage#getActorRef()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Attribute.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Attribute.java
index 3bce0840b..b846ec1bd 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Attribute.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Attribute.java
@@ -27,6 +27,7 @@ import org.eclipse.etrice.core.common.base.Documentation;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.Attribute#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.Attribute#getSize <em>Size</em>}</li>
@@ -34,7 +35,6 @@ import org.eclipse.etrice.core.common.base.Documentation;
  *   <li>{@link org.eclipse.etrice.core.room.Attribute#getDefaultValueLiteral <em>Default Value Literal</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.Attribute#getDocu <em>Docu</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.room.RoomPackage#getAttribute()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Binding.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Binding.java
index b96833bdb..725956879 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Binding.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Binding.java
@@ -18,11 +18,11 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.Binding#getEndpoint1 <em>Endpoint1</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.Binding#getEndpoint2 <em>Endpoint2</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.room.RoomPackage#getBinding()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/BindingEndPoint.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/BindingEndPoint.java
index 46cb94753..33e658231 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/BindingEndPoint.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/BindingEndPoint.java
@@ -18,12 +18,12 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.BindingEndPoint#getActorRef <em>Actor Ref</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.BindingEndPoint#getPort <em>Port</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.BindingEndPoint#getSub <em>Sub</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.room.RoomPackage#getBindingEndPoint()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ClassStructor.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ClassStructor.java
index 14a004f92..98896ece2 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ClassStructor.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ClassStructor.java
@@ -18,11 +18,11 @@ import org.eclipse.etrice.core.fsm.fSM.DetailCode;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.ClassStructor#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.ClassStructor#getDetailCode <em>Detail Code</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.room.RoomPackage#getClassStructor()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/CommunicationType.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/CommunicationType.java
index 8f02dcc5e..95e62722e 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/CommunicationType.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/CommunicationType.java
@@ -120,6 +120,8 @@ public enum CommunicationType implements Enumerator
    * Returns the '<em><b>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 CommunicationType get(String literal)
@@ -139,6 +141,8 @@ public enum CommunicationType implements Enumerator
    * Returns the '<em><b>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 CommunicationType getByName(String name)
@@ -158,6 +162,8 @@ public enum CommunicationType implements Enumerator
    * Returns the '<em><b>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 CommunicationType get(int value)
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/CompoundProtocolClass.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/CompoundProtocolClass.java
index 76bedbb81..cefa70a86 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/CompoundProtocolClass.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/CompoundProtocolClass.java
@@ -21,10 +21,10 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.CompoundProtocolClass#getSubProtocols <em>Sub Protocols</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.room.RoomPackage#getCompoundProtocolClass()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/DataClass.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/DataClass.java
index 33964c127..897dec20e 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/DataClass.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/DataClass.java
@@ -33,6 +33,7 @@ import org.eclipse.etrice.core.fsm.fSM.DetailCode;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.DataClass#getBase <em>Base</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.DataClass#getAnnotations <em>Annotations</em>}</li>
@@ -43,7 +44,6 @@ import org.eclipse.etrice.core.fsm.fSM.DetailCode;
  *   <li>{@link org.eclipse.etrice.core.room.DataClass#getStructors <em>Structors</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.DataClass#getAttributes <em>Attributes</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.room.RoomPackage#getDataClass()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/EnumLiteral.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/EnumLiteral.java
index e7a14b1fc..9b57b4ae2 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/EnumLiteral.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/EnumLiteral.java
@@ -19,11 +19,11 @@ import org.eclipse.etrice.core.common.base.IntLiteral;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.EnumLiteral#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.EnumLiteral#getLiteral <em>Literal</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.room.RoomPackage#getEnumLiteral()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/EnumerationType.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/EnumerationType.java
index e1b4a85c8..902560a21 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/EnumerationType.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/EnumerationType.java
@@ -18,11 +18,11 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.EnumerationType#getPrimitiveType <em>Primitive Type</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.EnumerationType#getLiterals <em>Literals</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.room.RoomPackage#getEnumerationType()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ExternalPort.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ExternalPort.java
index 8da725b0b..47a124eac 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ExternalPort.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ExternalPort.java
@@ -20,10 +20,10 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.ExternalPort#getInterfacePort <em>Interface Port</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.room.RoomPackage#getExternalPort()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ExternalType.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ExternalType.java
index ba185746a..fc9d25c56 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ExternalType.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ExternalType.java
@@ -16,11 +16,11 @@ package org.eclipse.etrice.core.room;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.ExternalType#getTargetName <em>Target Name</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.ExternalType#getDefaultValueLiteral <em>Default Value Literal</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.room.RoomPackage#getExternalType()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/GeneralProtocolClass.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/GeneralProtocolClass.java
index 4ff7240eb..18da819ab 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/GeneralProtocolClass.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/GeneralProtocolClass.java
@@ -22,10 +22,10 @@ import org.eclipse.etrice.core.common.base.Annotation;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.GeneralProtocolClass#getAnnotations <em>Annotations</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.room.RoomPackage#getGeneralProtocolClass()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/LayerConnection.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/LayerConnection.java
index f468c54a0..5affb8c8c 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/LayerConnection.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/LayerConnection.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.room.LayerConnection#getFrom <em>From</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.LayerConnection#getTo <em>To</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.room.RoomPackage#getLayerConnection()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/LogicalSystem.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/LogicalSystem.java
index 24edb8ac2..6fb071423 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/LogicalSystem.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/LogicalSystem.java
@@ -24,10 +24,10 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.LogicalSystem#getSubSystems <em>Sub Systems</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.room.RoomPackage#getLogicalSystem()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/LogicalThread.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/LogicalThread.java
index 5ad2a7053..fe74463f5 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/LogicalThread.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/LogicalThread.java
@@ -16,10 +16,10 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.LogicalThread#getName <em>Name</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.room.RoomPackage#getLogicalThread()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Message.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Message.java
index 49516b0f8..263c5d52e 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Message.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Message.java
@@ -23,13 +23,13 @@ import org.eclipse.etrice.core.common.base.Documentation;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.Message#isPriv <em>Priv</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.Message#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.Message#getData <em>Data</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.Message#getDocu <em>Docu</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.room.RoomPackage#getMessage()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/MessageHandler.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/MessageHandler.java
index b29372410..6c43a069e 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/MessageHandler.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/MessageHandler.java
@@ -22,11 +22,11 @@ import org.eclipse.etrice.core.fsm.fSM.DetailCode;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.MessageHandler#getMsg <em>Msg</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.MessageHandler#getDetailCode <em>Detail Code</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.room.RoomPackage#getMessageHandler()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Operation.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Operation.java
index 952c8efd6..240e754d5 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Operation.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Operation.java
@@ -26,6 +26,7 @@ import org.eclipse.etrice.core.fsm.fSM.DetailCode;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.Operation#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.Operation#getArguments <em>Arguments</em>}</li>
@@ -33,7 +34,6 @@ import org.eclipse.etrice.core.fsm.fSM.DetailCode;
  *   <li>{@link org.eclipse.etrice.core.room.Operation#getDocu <em>Docu</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.Operation#getDetailCode <em>Detail Code</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.room.RoomPackage#getOperation()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Port.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Port.java
index 8d09f5f49..8f98250dd 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Port.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Port.java
@@ -38,13 +38,13 @@ import org.eclipse.etrice.core.common.base.Documentation;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.Port#isConjugated <em>Conjugated</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.Port#getMultiplicity <em>Multiplicity</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.Port#getProtocol <em>Protocol</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.Port#getDocu <em>Docu</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.room.RoomPackage#getPort()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/PortClass.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/PortClass.java
index d0db65b77..b91781c91 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/PortClass.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/PortClass.java
@@ -26,13 +26,13 @@ import org.eclipse.etrice.core.fsm.fSM.DetailCode;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.PortClass#getUserCode <em>User Code</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.PortClass#getMsgHandlers <em>Msg Handlers</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.PortClass#getOperations <em>Operations</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.PortClass#getAttributes <em>Attributes</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.room.RoomPackage#getPortClass()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/PortOperation.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/PortOperation.java
index 1cda98eef..4689018a8 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/PortOperation.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/PortOperation.java
@@ -21,10 +21,10 @@ package org.eclipse.etrice.core.room;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.PortOperation#getSendsMsg <em>Sends Msg</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.room.RoomPackage#getPortOperation()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/PrimitiveType.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/PrimitiveType.java
index 4a1432bac..e955a7870 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/PrimitiveType.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/PrimitiveType.java
@@ -18,13 +18,13 @@ import org.eclipse.etrice.core.common.base.LiteralType;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.PrimitiveType#getType <em>Type</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.PrimitiveType#getTargetName <em>Target Name</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.PrimitiveType#getCastName <em>Cast Name</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.PrimitiveType#getDefaultValueLiteral <em>Default Value Literal</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.room.RoomPackage#getPrimitiveType()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ProtocolClass.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ProtocolClass.java
index ac28135f9..b8dfb384a 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ProtocolClass.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ProtocolClass.java
@@ -40,6 +40,7 @@ import org.eclipse.etrice.core.fsm.fSM.ProtocolSemantics;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.ProtocolClass#getCommType <em>Comm Type</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.ProtocolClass#getBase <em>Base</em>}</li>
@@ -52,7 +53,6 @@ import org.eclipse.etrice.core.fsm.fSM.ProtocolSemantics;
  *   <li>{@link org.eclipse.etrice.core.room.ProtocolClass#getConjugated <em>Conjugated</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.ProtocolClass#getSemantics <em>Semantics</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.room.RoomPackage#getProtocolClass()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RefPath.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RefPath.java
index dd32adfe1..0284b9ced 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RefPath.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RefPath.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.room.RefPath#getRefs <em>Refs</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.room.RoomPackage#getRefPath()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RefSAPoint.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RefSAPoint.java
index 40331be31..e9c4dacb9 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RefSAPoint.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RefSAPoint.java
@@ -15,10 +15,10 @@ package org.eclipse.etrice.core.room;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.RefSAPoint#getRef <em>Ref</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.room.RoomPackage#getRefSAPoint()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RefSegment.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RefSegment.java
index 4b6f8935b..fa7c5649a 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RefSegment.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RefSegment.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.room.RefSegment#getRef <em>Ref</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.RefSegment#getIdx <em>Idx</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.room.RoomPackage#getRefSegment()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RefableType.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RefableType.java
index 6748c5589..74e7e4078 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RefableType.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RefableType.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.room.RefableType#getType <em>Type</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.RefableType#isRef <em>Ref</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.room.RoomPackage#getRefableType()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ReferenceType.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ReferenceType.java
index 054d6b2c5..11471b609 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ReferenceType.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ReferenceType.java
@@ -94,6 +94,8 @@ public enum ReferenceType implements Enumerator
    * Returns the '<em><b>Reference 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 ReferenceType get(String literal)
@@ -113,6 +115,8 @@ public enum ReferenceType implements Enumerator
    * Returns the '<em><b>Reference 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 ReferenceType getByName(String name)
@@ -132,6 +136,8 @@ public enum ReferenceType implements Enumerator
    * Returns the '<em><b>Reference 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 ReferenceType get(int value)
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RelaySAPoint.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RelaySAPoint.java
index 9c31ee8b7..3af34a4d0 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RelaySAPoint.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RelaySAPoint.java
@@ -15,10 +15,10 @@ package org.eclipse.etrice.core.room;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.RelaySAPoint#getRelay <em>Relay</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.room.RoomPackage#getRelaySAPoint()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RoomAnnotationTargetEnum.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RoomAnnotationTargetEnum.java
index 6cb47c138..2c4b51c16 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RoomAnnotationTargetEnum.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RoomAnnotationTargetEnum.java
@@ -224,6 +224,8 @@ public enum RoomAnnotationTargetEnum implements Enumerator
    * Returns the '<em><b>Annotation Target Enum</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 RoomAnnotationTargetEnum get(String literal)
@@ -243,6 +245,8 @@ public enum RoomAnnotationTargetEnum implements Enumerator
    * Returns the '<em><b>Annotation Target Enum</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 RoomAnnotationTargetEnum getByName(String name)
@@ -262,6 +266,8 @@ public enum RoomAnnotationTargetEnum implements Enumerator
    * Returns the '<em><b>Annotation Target Enum</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 RoomAnnotationTargetEnum get(int value)
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RoomClass.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RoomClass.java
index e815a3b66..7fb20dd47 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RoomClass.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RoomClass.java
@@ -24,11 +24,11 @@ import org.eclipse.etrice.core.common.base.Documentation;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.RoomClass#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.RoomClass#getDocu <em>Docu</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.room.RoomPackage#getRoomClass()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RoomModel.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RoomModel.java
index 86662bd70..cb9845aa8 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RoomModel.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RoomModel.java
@@ -25,6 +25,7 @@ import org.eclipse.etrice.core.common.base.Import;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.RoomModel#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.RoomModel#getDocu <em>Docu</em>}</li>
@@ -39,7 +40,6 @@ import org.eclipse.etrice.core.common.base.Import;
  *   <li>{@link org.eclipse.etrice.core.room.RoomModel#getSystems <em>Systems</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.RoomModel#getAnnotationTypes <em>Annotation Types</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.room.RoomPackage#getRoomModel()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SAP.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SAP.java
index 05c20d5da..ba4c51b35 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SAP.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SAP.java
@@ -21,10 +21,10 @@ package org.eclipse.etrice.core.room;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.SAP#getProtocol <em>Protocol</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.room.RoomPackage#getSAP()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SPP.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SPP.java
index b504dfecb..735ac3142 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SPP.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SPP.java
@@ -21,10 +21,10 @@ package org.eclipse.etrice.core.room;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.SPP#getProtocol <em>Protocol</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.room.RoomPackage#getSPP()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SPPoint.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SPPoint.java
index 3ed8a7de8..e72787710 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SPPoint.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SPPoint.java
@@ -16,11 +16,11 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.SPPoint#getRef <em>Ref</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.SPPoint#getService <em>Service</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.room.RoomPackage#getSPPoint()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ServiceImplementation.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ServiceImplementation.java
index 1ae3e894b..037a6b5ec 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ServiceImplementation.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ServiceImplementation.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.room.ServiceImplementation#getSpp <em>Spp</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.room.RoomPackage#getServiceImplementation()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/StandardOperation.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/StandardOperation.java
index b01000be7..02ca58810 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/StandardOperation.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/StandardOperation.java
@@ -21,10 +21,10 @@ package org.eclipse.etrice.core.room;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.StandardOperation#isOverride <em>Override</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.room.RoomPackage#getStandardOperation()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/StructureClass.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/StructureClass.java
index 8e1e7d454..eee59892f 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/StructureClass.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/StructureClass.java
@@ -22,12 +22,12 @@ import org.eclipse.etrice.core.common.base.Annotation;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.StructureClass#getAnnotations <em>Annotations</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.StructureClass#getConnections <em>Connections</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.StructureClass#getBindings <em>Bindings</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.room.RoomPackage#getStructureClass()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SubProtocol.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SubProtocol.java
index afd629891..dd3d61a8b 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SubProtocol.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SubProtocol.java
@@ -18,11 +18,11 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.SubProtocol#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.SubProtocol#getProtocol <em>Protocol</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.room.RoomPackage#getSubProtocol()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SubSystemClass.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SubSystemClass.java
index f1ec65380..654b65370 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SubSystemClass.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SubSystemClass.java
@@ -27,12 +27,12 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.SubSystemClass#getActorInstanceMappings <em>Actor Instance Mappings</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.SubSystemClass#getThreads <em>Threads</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.SubSystemClass#getRelayPorts <em>Relay Ports</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.room.RoomPackage#getSubSystemClass()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SubSystemRef.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SubSystemRef.java
index 333397da7..0c0344d4f 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SubSystemRef.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SubSystemRef.java
@@ -16,10 +16,10 @@ package org.eclipse.etrice.core.room;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.SubSystemRef#getType <em>Type</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.room.RoomPackage#getSubSystemRef()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/VarDecl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/VarDecl.java
index 7f00ba9b9..c987dfb28 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/VarDecl.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/VarDecl.java
@@ -16,11 +16,11 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.VarDecl#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.VarDecl#getRefType <em>Ref Type</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.etrice.core.room.RoomPackage#getVarDecl()
  * @model
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ActorClassImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ActorClassImpl.java
index 64010b4ba..3655f6e95 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ActorClassImpl.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ActorClassImpl.java
@@ -47,6 +47,7 @@ import org.eclipse.etrice.core.room.util.RoomHelpers;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.impl.ActorClassImpl#isAbstract <em>Abstract</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.impl.ActorClassImpl#getCommType <em>Comm Type</em>}</li>
@@ -65,7 +66,6 @@ import org.eclipse.etrice.core.room.util.RoomHelpers;
  *   <li>{@link org.eclipse.etrice.core.room.impl.ActorClassImpl#getOperations <em>Operations</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.impl.ActorClassImpl#getStructors <em>Structors</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ActorContainerClassImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ActorContainerClassImpl.java
index 5c4e3e625..fd7bc5aa2 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ActorContainerClassImpl.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ActorContainerClassImpl.java
@@ -30,6 +30,7 @@ import org.eclipse.etrice.core.room.SPP;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.impl.ActorContainerClassImpl#getServiceProvisionPoints <em>Service Provision Points</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.impl.ActorContainerClassImpl#getUserCode1 <em>User Code1</em>}</li>
@@ -37,7 +38,6 @@ import org.eclipse.etrice.core.room.SPP;
  *   <li>{@link org.eclipse.etrice.core.room.impl.ActorContainerClassImpl#getUserCode3 <em>User Code3</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.impl.ActorContainerClassImpl#getActorRefs <em>Actor Refs</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ActorContainerRefImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ActorContainerRefImpl.java
index 68c27965d..1853d6fe2 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ActorContainerRefImpl.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ActorContainerRefImpl.java
@@ -25,11 +25,11 @@ import org.eclipse.etrice.core.room.SubSystemRef;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.impl.ActorContainerRefImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.impl.ActorContainerRefImpl#getDocu <em>Docu</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ActorInstanceMappingImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ActorInstanceMappingImpl.java
index 576b7316d..ee5a3bd29 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ActorInstanceMappingImpl.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ActorInstanceMappingImpl.java
@@ -29,12 +29,12 @@ import org.eclipse.etrice.core.room.RoomPackage;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.impl.ActorInstanceMappingImpl#getPath <em>Path</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.impl.ActorInstanceMappingImpl#getThread <em>Thread</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.impl.ActorInstanceMappingImpl#getActorInstanceMappings <em>Actor Instance Mappings</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ActorRefImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ActorRefImpl.java
index 41e1ae32a..3b9fb317e 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ActorRefImpl.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ActorRefImpl.java
@@ -20,12 +20,12 @@ import org.eclipse.etrice.core.room.RoomPackage;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.impl.ActorRefImpl#getRefType <em>Ref Type</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.impl.ActorRefImpl#getMultiplicity <em>Multiplicity</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.impl.ActorRefImpl#getType <em>Type</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/AttributeImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/AttributeImpl.java
index 4171f9255..57799da7f 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/AttributeImpl.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/AttributeImpl.java
@@ -23,6 +23,7 @@ import org.eclipse.etrice.core.room.RoomPackage;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.impl.AttributeImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.impl.AttributeImpl#getSize <em>Size</em>}</li>
@@ -30,7 +31,6 @@ import org.eclipse.etrice.core.room.RoomPackage;
  *   <li>{@link org.eclipse.etrice.core.room.impl.AttributeImpl#getDefaultValueLiteral <em>Default Value Literal</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.impl.AttributeImpl#getDocu <em>Docu</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/BindingEndPointImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/BindingEndPointImpl.java
index d7e32ddd1..3f01cfe05 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/BindingEndPointImpl.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/BindingEndPointImpl.java
@@ -22,12 +22,12 @@ import org.eclipse.etrice.core.room.SubProtocol;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.impl.BindingEndPointImpl#getActorRef <em>Actor Ref</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.impl.BindingEndPointImpl#getPort <em>Port</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.impl.BindingEndPointImpl#getSub <em>Sub</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/BindingImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/BindingImpl.java
index 45a0cff22..81345d2bc 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/BindingImpl.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/BindingImpl.java
@@ -21,11 +21,11 @@ import org.eclipse.etrice.core.room.RoomPackage;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.impl.BindingImpl#getEndpoint1 <em>Endpoint1</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.impl.BindingImpl#getEndpoint2 <em>Endpoint2</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ClassStructorImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ClassStructorImpl.java
index 65d87686b..0311f5123 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ClassStructorImpl.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ClassStructorImpl.java
@@ -22,11 +22,11 @@ import org.eclipse.etrice.core.room.RoomPackage;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.impl.ClassStructorImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.impl.ClassStructorImpl#getDetailCode <em>Detail Code</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ComplexTypeImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ComplexTypeImpl.java
index fa2b61244..0fa2ddf1c 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ComplexTypeImpl.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ComplexTypeImpl.java
@@ -11,8 +11,6 @@ import org.eclipse.etrice.core.room.RoomPackage;
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Complex Type</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/CompoundProtocolClassImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/CompoundProtocolClassImpl.java
index 4cf380828..3f6e2f7b8 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/CompoundProtocolClassImpl.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/CompoundProtocolClassImpl.java
@@ -24,10 +24,10 @@ import org.eclipse.etrice.core.room.SubProtocol;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.impl.CompoundProtocolClassImpl#getSubProtocols <em>Sub Protocols</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/DataClassImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/DataClassImpl.java
index ad758cb74..c21030e91 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/DataClassImpl.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/DataClassImpl.java
@@ -33,6 +33,7 @@ import org.eclipse.etrice.core.room.StandardOperation;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.impl.DataClassImpl#getBase <em>Base</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.impl.DataClassImpl#getAnnotations <em>Annotations</em>}</li>
@@ -43,7 +44,6 @@ import org.eclipse.etrice.core.room.StandardOperation;
  *   <li>{@link org.eclipse.etrice.core.room.impl.DataClassImpl#getStructors <em>Structors</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.impl.DataClassImpl#getAttributes <em>Attributes</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/DataTypeImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/DataTypeImpl.java
index efaacf0a4..b714df31a 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/DataTypeImpl.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/DataTypeImpl.java
@@ -11,8 +11,6 @@ import org.eclipse.etrice.core.room.RoomPackage;
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Data Type</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/EnumLiteralImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/EnumLiteralImpl.java
index 73c42475a..7d32f350b 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/EnumLiteralImpl.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/EnumLiteralImpl.java
@@ -23,11 +23,11 @@ import org.eclipse.etrice.core.room.RoomPackage;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.impl.EnumLiteralImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.impl.EnumLiteralImpl#getLiteral <em>Literal</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/EnumerationTypeImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/EnumerationTypeImpl.java
index 32c04364b..587616f7b 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/EnumerationTypeImpl.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/EnumerationTypeImpl.java
@@ -28,11 +28,11 @@ import org.eclipse.etrice.core.room.RoomPackage;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.impl.EnumerationTypeImpl#getPrimitiveType <em>Primitive Type</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.impl.EnumerationTypeImpl#getLiterals <em>Literals</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ExternalPortImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ExternalPortImpl.java
index 0b540477d..55277121b 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ExternalPortImpl.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ExternalPortImpl.java
@@ -20,10 +20,10 @@ import org.eclipse.etrice.core.room.RoomPackage;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.impl.ExternalPortImpl#getInterfacePort <em>Interface Port</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ExternalTypeImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ExternalTypeImpl.java
index d868f7bb3..a09b735db 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ExternalTypeImpl.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ExternalTypeImpl.java
@@ -17,11 +17,11 @@ import org.eclipse.etrice.core.room.RoomPackage;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.impl.ExternalTypeImpl#getTargetName <em>Target Name</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.impl.ExternalTypeImpl#getDefaultValueLiteral <em>Default Value Literal</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/GeneralProtocolClassImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/GeneralProtocolClassImpl.java
index 4832cb2ac..f51fa4f5b 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/GeneralProtocolClassImpl.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/GeneralProtocolClassImpl.java
@@ -25,10 +25,10 @@ import org.eclipse.etrice.core.room.RoomPackage;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.impl.GeneralProtocolClassImpl#getAnnotations <em>Annotations</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/InMessageHandlerImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/InMessageHandlerImpl.java
index bd9cde90a..8eef7e5c3 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/InMessageHandlerImpl.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/InMessageHandlerImpl.java
@@ -11,8 +11,6 @@ import org.eclipse.etrice.core.room.RoomPackage;
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>In Message Handler</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/InterfaceItemImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/InterfaceItemImpl.java
index a0be40ede..db8a6b432 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/InterfaceItemImpl.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/InterfaceItemImpl.java
@@ -27,8 +27,6 @@ import org.eclipse.etrice.core.room.util.RoomHelpers;
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Interface Item</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/LayerConnectionImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/LayerConnectionImpl.java
index b159d7d5e..c435f4fff 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/LayerConnectionImpl.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/LayerConnectionImpl.java
@@ -22,11 +22,11 @@ import org.eclipse.etrice.core.room.SPPoint;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.impl.LayerConnectionImpl#getFrom <em>From</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.impl.LayerConnectionImpl#getTo <em>To</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/LogicalSystemImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/LogicalSystemImpl.java
index 3295d3d26..68cfee3bc 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/LogicalSystemImpl.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/LogicalSystemImpl.java
@@ -24,10 +24,10 @@ import org.eclipse.etrice.core.room.SubSystemRef;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.impl.LogicalSystemImpl#getSubSystems <em>Sub Systems</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/LogicalThreadImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/LogicalThreadImpl.java
index ff778e9e3..5fe5dfe4d 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/LogicalThreadImpl.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/LogicalThreadImpl.java
@@ -18,10 +18,10 @@ import org.eclipse.etrice.core.room.RoomPackage;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.impl.LogicalThreadImpl#getName <em>Name</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/MessageHandlerImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/MessageHandlerImpl.java
index 5f66d9364..7ac32527e 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/MessageHandlerImpl.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/MessageHandlerImpl.java
@@ -23,11 +23,11 @@ import org.eclipse.etrice.core.room.RoomPackage;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.impl.MessageHandlerImpl#getMsg <em>Msg</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.impl.MessageHandlerImpl#getDetailCode <em>Detail Code</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/MessageImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/MessageImpl.java
index b66745894..b0bef8484 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/MessageImpl.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/MessageImpl.java
@@ -23,13 +23,13 @@ import org.eclipse.etrice.core.room.VarDecl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.impl.MessageImpl#isPriv <em>Priv</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.impl.MessageImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.impl.MessageImpl#getData <em>Data</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.impl.MessageImpl#getDocu <em>Docu</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/OperationImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/OperationImpl.java
index a189616d4..33dc56a28 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/OperationImpl.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/OperationImpl.java
@@ -33,6 +33,7 @@ import org.eclipse.etrice.core.room.VarDecl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.impl.OperationImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.impl.OperationImpl#getArguments <em>Arguments</em>}</li>
@@ -40,7 +41,6 @@ import org.eclipse.etrice.core.room.VarDecl;
  *   <li>{@link org.eclipse.etrice.core.room.impl.OperationImpl#getDocu <em>Docu</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.impl.OperationImpl#getDetailCode <em>Detail Code</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/OutMessageHandlerImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/OutMessageHandlerImpl.java
index 0d46c76af..e145942ef 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/OutMessageHandlerImpl.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/OutMessageHandlerImpl.java
@@ -11,8 +11,6 @@ import org.eclipse.etrice.core.room.RoomPackage;
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Out Message Handler</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/PortClassImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/PortClassImpl.java
index f0b1948b3..149b9d518 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/PortClassImpl.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/PortClassImpl.java
@@ -32,13 +32,13 @@ import org.eclipse.etrice.core.room.RoomPackage;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.impl.PortClassImpl#getUserCode <em>User Code</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.impl.PortClassImpl#getMsgHandlers <em>Msg Handlers</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.impl.PortClassImpl#getOperations <em>Operations</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.impl.PortClassImpl#getAttributes <em>Attributes</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/PortImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/PortImpl.java
index cd09c1586..827ec2aad 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/PortImpl.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/PortImpl.java
@@ -22,13 +22,13 @@ import org.eclipse.etrice.core.room.RoomPackage;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.impl.PortImpl#isConjugated <em>Conjugated</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.impl.PortImpl#getMultiplicity <em>Multiplicity</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.impl.PortImpl#getProtocol <em>Protocol</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.impl.PortImpl#getDocu <em>Docu</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/PortOperationImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/PortOperationImpl.java
index f4872e2a4..82f9265c3 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/PortOperationImpl.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/PortOperationImpl.java
@@ -19,10 +19,10 @@ import org.eclipse.etrice.core.room.RoomPackage;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.impl.PortOperationImpl#getSendsMsg <em>Sends Msg</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/PrimitiveTypeImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/PrimitiveTypeImpl.java
index 8fd487556..abf7e820e 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/PrimitiveTypeImpl.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/PrimitiveTypeImpl.java
@@ -19,13 +19,13 @@ import org.eclipse.etrice.core.room.RoomPackage;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.impl.PrimitiveTypeImpl#getType <em>Type</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.impl.PrimitiveTypeImpl#getTargetName <em>Target Name</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.impl.PrimitiveTypeImpl#getCastName <em>Cast Name</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.impl.PrimitiveTypeImpl#getDefaultValueLiteral <em>Default Value Literal</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ProtocolClassImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ProtocolClassImpl.java
index f3c8ed47f..416eb56f6 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ProtocolClassImpl.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ProtocolClassImpl.java
@@ -32,6 +32,7 @@ import org.eclipse.etrice.core.room.RoomPackage;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.impl.ProtocolClassImpl#getCommType <em>Comm Type</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.impl.ProtocolClassImpl#getBase <em>Base</em>}</li>
@@ -44,7 +45,6 @@ import org.eclipse.etrice.core.room.RoomPackage;
  *   <li>{@link org.eclipse.etrice.core.room.impl.ProtocolClassImpl#getConjugated <em>Conjugated</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.impl.ProtocolClassImpl#getSemantics <em>Semantics</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RefPathImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RefPathImpl.java
index 4291f4c4c..83a36bce6 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RefPathImpl.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RefPathImpl.java
@@ -26,10 +26,10 @@ import org.eclipse.etrice.core.room.RoomPackage;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.impl.RefPathImpl#getRefs <em>Refs</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RefSAPointImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RefSAPointImpl.java
index 9644adf32..8dceca5e8 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RefSAPointImpl.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RefSAPointImpl.java
@@ -19,10 +19,10 @@ import org.eclipse.etrice.core.room.RoomPackage;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.impl.RefSAPointImpl#getRef <em>Ref</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RefSegmentImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RefSegmentImpl.java
index 0f7a9a294..cdb2913fa 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RefSegmentImpl.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RefSegmentImpl.java
@@ -18,11 +18,11 @@ import org.eclipse.etrice.core.room.RoomPackage;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.impl.RefSegmentImpl#getRef <em>Ref</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.impl.RefSegmentImpl#getIdx <em>Idx</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RefableTypeImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RefableTypeImpl.java
index 0879d28d2..515e6f748 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RefableTypeImpl.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RefableTypeImpl.java
@@ -20,11 +20,11 @@ import org.eclipse.etrice.core.room.RoomPackage;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.impl.RefableTypeImpl#getType <em>Type</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.impl.RefableTypeImpl#isRef <em>Ref</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RelaySAPointImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RelaySAPointImpl.java
index 2369ca7e3..a2004f843 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RelaySAPointImpl.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RelaySAPointImpl.java
@@ -19,10 +19,10 @@ import org.eclipse.etrice.core.room.SPP;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.impl.RelaySAPointImpl#getRelay <em>Relay</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RoomClassImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RoomClassImpl.java
index 5198ad8c5..024ca9055 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RoomClassImpl.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RoomClassImpl.java
@@ -22,11 +22,11 @@ import org.eclipse.etrice.core.room.RoomPackage;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.impl.RoomClassImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.impl.RoomClassImpl#getDocu <em>Docu</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RoomModelImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RoomModelImpl.java
index b03a905fb..250848511 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RoomModelImpl.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RoomModelImpl.java
@@ -39,6 +39,7 @@ import org.eclipse.etrice.core.room.SubSystemClass;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.impl.RoomModelImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.impl.RoomModelImpl#getDocu <em>Docu</em>}</li>
@@ -53,7 +54,6 @@ import org.eclipse.etrice.core.room.SubSystemClass;
  *   <li>{@link org.eclipse.etrice.core.room.impl.RoomModelImpl#getSystems <em>Systems</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.impl.RoomModelImpl#getAnnotationTypes <em>Annotation Types</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SAPImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SAPImpl.java
index 8e5993416..ce373d83b 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SAPImpl.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SAPImpl.java
@@ -19,10 +19,10 @@ import org.eclipse.etrice.core.room.SAP;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.impl.SAPImpl#getProtocol <em>Protocol</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SAPointImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SAPointImpl.java
index d97bdca33..0200eb945 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SAPointImpl.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SAPointImpl.java
@@ -13,8 +13,6 @@ import org.eclipse.etrice.core.room.SAPoint;
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>SA Point</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SPPImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SPPImpl.java
index f22baffd0..5be0d6a00 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SPPImpl.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SPPImpl.java
@@ -19,10 +19,10 @@ import org.eclipse.etrice.core.room.SPP;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.impl.SPPImpl#getProtocol <em>Protocol</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SPPointImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SPPointImpl.java
index 5e4b602d3..6d8c5959a 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SPPointImpl.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SPPointImpl.java
@@ -21,11 +21,11 @@ import org.eclipse.etrice.core.room.SPPoint;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.impl.SPPointImpl#getRef <em>Ref</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.impl.SPPointImpl#getService <em>Service</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ServiceImplementationImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ServiceImplementationImpl.java
index 34c90b8b9..f5e63b99d 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ServiceImplementationImpl.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ServiceImplementationImpl.java
@@ -20,10 +20,10 @@ import org.eclipse.etrice.core.room.ServiceImplementation;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.impl.ServiceImplementationImpl#getSpp <em>Spp</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/StandardOperationImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/StandardOperationImpl.java
index 7054531d7..c3400bae4 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/StandardOperationImpl.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/StandardOperationImpl.java
@@ -17,10 +17,10 @@ import org.eclipse.etrice.core.room.StandardOperation;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.impl.StandardOperationImpl#isOverride <em>Override</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/StructureClassImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/StructureClassImpl.java
index 2c2466eba..e21a23d74 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/StructureClassImpl.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/StructureClassImpl.java
@@ -27,12 +27,12 @@ import org.eclipse.etrice.core.room.StructureClass;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.impl.StructureClassImpl#getAnnotations <em>Annotations</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.impl.StructureClassImpl#getConnections <em>Connections</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.impl.StructureClassImpl#getBindings <em>Bindings</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SubProtocolImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SubProtocolImpl.java
index 49ee8b4cd..2764919fd 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SubProtocolImpl.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SubProtocolImpl.java
@@ -20,11 +20,11 @@ import org.eclipse.etrice.core.room.SubProtocol;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.impl.SubProtocolImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.impl.SubProtocolImpl#getProtocol <em>Protocol</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SubSystemClassImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SubSystemClassImpl.java
index 05b07a038..123278e98 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SubSystemClassImpl.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SubSystemClassImpl.java
@@ -26,12 +26,12 @@ import org.eclipse.etrice.core.room.SubSystemClass;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.impl.SubSystemClassImpl#getActorInstanceMappings <em>Actor Instance Mappings</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.impl.SubSystemClassImpl#getThreads <em>Threads</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.impl.SubSystemClassImpl#getRelayPorts <em>Relay Ports</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SubSystemRefImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SubSystemRefImpl.java
index d104f152a..ee45e4723 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SubSystemRefImpl.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SubSystemRefImpl.java
@@ -19,10 +19,10 @@ import org.eclipse.etrice.core.room.SubSystemRef;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.impl.SubSystemRefImpl#getType <em>Type</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/VarDeclImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/VarDeclImpl.java
index 9cb764eed..f1dc4a0df 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/VarDeclImpl.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/VarDeclImpl.java
@@ -21,11 +21,11 @@ import org.eclipse.etrice.core.room.VarDecl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.etrice.core.room.impl.VarDeclImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.etrice.core.room.impl.VarDeclImpl#getRefType <em>Ref Type</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/util/RoomSwitch.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/util/RoomSwitch.java
index 79e79063b..9b7472ba4 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/util/RoomSwitch.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/util/RoomSwitch.java
@@ -54,7 +54,7 @@ public class RoomSwitch<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
    */
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/serializer/RoomSemanticSequencer.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/serializer/RoomSemanticSequencer.java
index fc35b75fe..9b3c811f1 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/serializer/RoomSemanticSequencer.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/serializer/RoomSemanticSequencer.java
@@ -1,8 +1,12 @@
+/*
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.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;
@@ -84,14 +88,11 @@ import org.eclipse.etrice.core.room.SubSystemClass;
 import org.eclipse.etrice.core.room.SubSystemRef;
 import org.eclipse.etrice.core.room.VarDecl;
 import org.eclipse.etrice.core.services.RoomGrammarAccess;
-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")
@@ -100,577 +101,284 @@ public class RoomSemanticSequencer extends FSMSemanticSequencer {
 	@Inject
 	private RoomGrammarAccess 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.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.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; 
 			}
-		else if(semanticObject.eClass().getEPackage() == RoomPackage.eINSTANCE) switch(semanticObject.eClass().getClassifierID()) {
+		else if (epackage == RoomPackage.eINSTANCE)
+			switch (semanticObject.eClass().getClassifierID()) {
 			case RoomPackage.ACTOR_CLASS:
-				if(context == grammarAccess.getActorClassRule() ||
-				   context == grammarAccess.getActorContainerClassRule() ||
-				   context == grammarAccess.getModelComponentRule() ||
-				   context == grammarAccess.getRoomClassRule() ||
-				   context == grammarAccess.getStructureClassRule()) {
-					sequence_ActorClass(context, (ActorClass) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_ActorClass(context, (ActorClass) semanticObject); 
+				return; 
 			case RoomPackage.ACTOR_INSTANCE_MAPPING:
-				if(context == grammarAccess.getActorInstanceMappingRule()) {
-					sequence_ActorInstanceMapping(context, (ActorInstanceMapping) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_ActorInstanceMapping(context, (ActorInstanceMapping) semanticObject); 
+				return; 
 			case RoomPackage.ACTOR_REF:
-				if(context == grammarAccess.getActorContainerRefRule() ||
-				   context == grammarAccess.getActorRefRule()) {
-					sequence_ActorRef(context, (ActorRef) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_ActorRef(context, (ActorRef) semanticObject); 
+				return; 
 			case RoomPackage.ATTRIBUTE:
-				if(context == grammarAccess.getAttributeRule()) {
-					sequence_Attribute(context, (Attribute) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_Attribute(context, (Attribute) semanticObject); 
+				return; 
 			case RoomPackage.BINDING:
-				if(context == grammarAccess.getBindingRule()) {
-					sequence_Binding(context, (Binding) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_Binding(context, (Binding) semanticObject); 
+				return; 
 			case RoomPackage.BINDING_END_POINT:
-				if(context == grammarAccess.getBindingEndPointRule()) {
-					sequence_BindingEndPoint(context, (BindingEndPoint) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_BindingEndPoint(context, (BindingEndPoint) semanticObject); 
+				return; 
 			case RoomPackage.CLASS_STRUCTOR:
-				if(context == grammarAccess.getClassStructorRule()) {
-					sequence_ClassStructor(context, (ClassStructor) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_ClassStructor(context, (ClassStructor) semanticObject); 
+				return; 
 			case RoomPackage.COMPOUND_PROTOCOL_CLASS:
-				if(context == grammarAccess.getCompoundProtocolClassRule() ||
-				   context == grammarAccess.getGeneralProtocolClassRule() ||
-				   context == grammarAccess.getRoomClassRule()) {
-					sequence_CompoundProtocolClass(context, (CompoundProtocolClass) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_CompoundProtocolClass(context, (CompoundProtocolClass) semanticObject); 
+				return; 
 			case RoomPackage.DATA_CLASS:
-				if(context == grammarAccess.getComplexTypeRule() ||
-				   context == grammarAccess.getDataClassRule() ||
-				   context == grammarAccess.getDataTypeRule() ||
-				   context == grammarAccess.getRoomClassRule()) {
-					sequence_DataClass(context, (DataClass) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_DataClass(context, (DataClass) semanticObject); 
+				return; 
 			case RoomPackage.ENUM_LITERAL:
-				if(context == grammarAccess.getEnumLiteralRule()) {
-					sequence_EnumLiteral(context, (EnumLiteral) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_EnumLiteral(context, (EnumLiteral) semanticObject); 
+				return; 
 			case RoomPackage.ENUMERATION_TYPE:
-				if(context == grammarAccess.getDataTypeRule() ||
-				   context == grammarAccess.getEnumerationTypeRule() ||
-				   context == grammarAccess.getRoomClassRule()) {
-					sequence_EnumerationType(context, (EnumerationType) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_EnumerationType(context, (EnumerationType) semanticObject); 
+				return; 
 			case RoomPackage.EXTERNAL_PORT:
-				if(context == grammarAccess.getExternalPortRule()) {
-					sequence_ExternalPort(context, (ExternalPort) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_ExternalPort(context, (ExternalPort) semanticObject); 
+				return; 
 			case RoomPackage.EXTERNAL_TYPE:
-				if(context == grammarAccess.getComplexTypeRule() ||
-				   context == grammarAccess.getDataTypeRule() ||
-				   context == grammarAccess.getExternalTypeRule() ||
-				   context == grammarAccess.getRoomClassRule()) {
-					sequence_ExternalType(context, (ExternalType) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_ExternalType(context, (ExternalType) semanticObject); 
+				return; 
 			case RoomPackage.IN_MESSAGE_HANDLER:
-				if(context == grammarAccess.getInMessageHandlerRule() ||
-				   context == grammarAccess.getMessageHandlerRule()) {
-					sequence_InMessageHandler(context, (InMessageHandler) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_InMessageHandler(context, (InMessageHandler) semanticObject); 
+				return; 
 			case RoomPackage.LAYER_CONNECTION:
-				if(context == grammarAccess.getLayerConnectionRule()) {
-					sequence_LayerConnection(context, (LayerConnection) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_LayerConnection(context, (LayerConnection) semanticObject); 
+				return; 
 			case RoomPackage.LOGICAL_SYSTEM:
-				if(context == grammarAccess.getLogicalSystemRule() ||
-				   context == grammarAccess.getRoomClassRule() ||
-				   context == grammarAccess.getStructureClassRule()) {
-					sequence_LogicalSystem(context, (LogicalSystem) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_LogicalSystem(context, (LogicalSystem) semanticObject); 
+				return; 
 			case RoomPackage.LOGICAL_THREAD:
-				if(context == grammarAccess.getLogicalThreadRule()) {
-					sequence_LogicalThread(context, (LogicalThread) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_LogicalThread(context, (LogicalThread) semanticObject); 
+				return; 
 			case RoomPackage.MESSAGE:
-				if(context == grammarAccess.getMessageRule()) {
-					sequence_Message(context, (Message) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_Message(context, (Message) semanticObject); 
+				return; 
 			case RoomPackage.OUT_MESSAGE_HANDLER:
-				if(context == grammarAccess.getMessageHandlerRule() ||
-				   context == grammarAccess.getOutMessageHandlerRule()) {
-					sequence_OutMessageHandler(context, (OutMessageHandler) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_OutMessageHandler(context, (OutMessageHandler) semanticObject); 
+				return; 
 			case RoomPackage.PORT:
-				if(context == grammarAccess.getAbstractInterfaceItemRule() ||
-				   context == grammarAccess.getInterfaceItemRule() ||
-				   context == grammarAccess.getPortRule()) {
-					sequence_Port(context, (Port) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_Port(context, (Port) semanticObject); 
+				return; 
 			case RoomPackage.PORT_CLASS:
-				if(context == grammarAccess.getPortClassRule()) {
-					sequence_PortClass(context, (PortClass) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_PortClass(context, (PortClass) semanticObject); 
+				return; 
 			case RoomPackage.PORT_OPERATION:
-				if(context == grammarAccess.getOperationRule() ||
-				   context == grammarAccess.getPortOperationRule()) {
-					sequence_PortOperation(context, (PortOperation) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_PortOperation(context, (PortOperation) semanticObject); 
+				return; 
 			case RoomPackage.PRIMITIVE_TYPE:
-				if(context == grammarAccess.getDataTypeRule() ||
-				   context == grammarAccess.getPrimitiveTypeRule() ||
-				   context == grammarAccess.getRoomClassRule()) {
-					sequence_PrimitiveType(context, (PrimitiveType) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_PrimitiveType(context, (PrimitiveType) semanticObject); 
+				return; 
 			case RoomPackage.PROTOCOL_CLASS:
-				if(context == grammarAccess.getGeneralProtocolClassRule() ||
-				   context == grammarAccess.getProtocolClassRule() ||
-				   context == grammarAccess.getRoomClassRule()) {
-					sequence_ProtocolClass(context, (ProtocolClass) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_ProtocolClass(context, (ProtocolClass) semanticObject); 
+				return; 
 			case RoomPackage.REF_PATH:
-				if(context == grammarAccess.getRefPathRule()) {
-					sequence_RefPath(context, (RefPath) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_RefPath(context, (RefPath) semanticObject); 
+				return; 
 			case RoomPackage.REF_SA_POINT:
-				if(context == grammarAccess.getRefSAPointRule() ||
-				   context == grammarAccess.getSAPointRule()) {
-					sequence_RefSAPoint(context, (RefSAPoint) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_RefSAPoint(context, (RefSAPoint) semanticObject); 
+				return; 
 			case RoomPackage.REF_SEGMENT:
-				if(context == grammarAccess.getRefSegmentRule()) {
-					sequence_RefSegment(context, (RefSegment) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_RefSegment(context, (RefSegment) semanticObject); 
+				return; 
 			case RoomPackage.REFABLE_TYPE:
-				if(context == grammarAccess.getRefableTypeRule()) {
-					sequence_RefableType(context, (RefableType) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_RefableType(context, (RefableType) semanticObject); 
+				return; 
 			case RoomPackage.RELAY_SA_POINT:
-				if(context == grammarAccess.getRelaySAPointRule() ||
-				   context == grammarAccess.getSAPointRule()) {
-					sequence_RelaySAPoint(context, (RelaySAPoint) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_RelaySAPoint(context, (RelaySAPoint) semanticObject); 
+				return; 
 			case RoomPackage.ROOM_MODEL:
-				if(context == grammarAccess.getRoomModelRule()) {
-					sequence_RoomModel(context, (RoomModel) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_RoomModel(context, (RoomModel) semanticObject); 
+				return; 
 			case RoomPackage.SAP:
-				if(context == grammarAccess.getAbstractInterfaceItemRule() ||
-				   context == grammarAccess.getInterfaceItemRule() ||
-				   context == grammarAccess.getSAPRule()) {
-					sequence_SAP(context, (SAP) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_SAP(context, (SAP) semanticObject); 
+				return; 
 			case RoomPackage.SPP:
-				if(context == grammarAccess.getAbstractInterfaceItemRule() ||
-				   context == grammarAccess.getInterfaceItemRule() ||
-				   context == grammarAccess.getSPPRule()) {
-					sequence_SPP(context, (SPP) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_SPP(context, (SPP) semanticObject); 
+				return; 
 			case RoomPackage.SP_POINT:
-				if(context == grammarAccess.getSPPointRule()) {
-					sequence_SPPoint(context, (SPPoint) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_SPPoint(context, (SPPoint) semanticObject); 
+				return; 
 			case RoomPackage.SERVICE_IMPLEMENTATION:
-				if(context == grammarAccess.getServiceImplementationRule()) {
-					sequence_ServiceImplementation(context, (ServiceImplementation) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_ServiceImplementation(context, (ServiceImplementation) semanticObject); 
+				return; 
 			case RoomPackage.STANDARD_OPERATION:
-				if(context == grammarAccess.getOperationRule() ||
-				   context == grammarAccess.getStandardOperationRule()) {
-					sequence_StandardOperation(context, (StandardOperation) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_StandardOperation(context, (StandardOperation) semanticObject); 
+				return; 
 			case RoomPackage.SUB_PROTOCOL:
-				if(context == grammarAccess.getSubProtocolRule()) {
-					sequence_SubProtocol(context, (SubProtocol) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_SubProtocol(context, (SubProtocol) semanticObject); 
+				return; 
 			case RoomPackage.SUB_SYSTEM_CLASS:
-				if(context == grammarAccess.getActorContainerClassRule() ||
-				   context == grammarAccess.getRoomClassRule() ||
-				   context == grammarAccess.getStructureClassRule() ||
-				   context == grammarAccess.getSubSystemClassRule()) {
-					sequence_SubSystemClass(context, (SubSystemClass) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_SubSystemClass(context, (SubSystemClass) semanticObject); 
+				return; 
 			case RoomPackage.SUB_SYSTEM_REF:
-				if(context == grammarAccess.getActorContainerRefRule() ||
-				   context == grammarAccess.getSubSystemRefRule()) {
-					sequence_SubSystemRef(context, (SubSystemRef) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_SubSystemRef(context, (SubSystemRef) semanticObject); 
+				return; 
 			case RoomPackage.VAR_DECL:
-				if(context == grammarAccess.getVarDeclRule()) {
-					sequence_VarDecl(context, (VarDecl) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_VarDecl(context, (VarDecl) semanticObject); 
+				return; 
 			}
-		if (errorAcceptor != null) errorAcceptor.accept(diagnosticProvider.createInvalidContextOrTypeDiagnostic(semanticObject, context));
+		if (errorAcceptor != null)
+			errorAcceptor.accept(diagnosticProvider.createInvalidContextOrTypeDiagnostic(semanticObject, context));
 	}
 	
 	/**
+	 * Contexts:
+	 *     RoomClass returns ActorClass
+	 *     StructureClass returns ActorClass
+	 *     ActorContainerClass returns ActorClass
+	 *     ModelComponent returns ActorClass
+	 *     ActorClass returns ActorClass
+	 *
 	 * Constraint:
 	 *     (
-	 *         abstract?='abstract'? 
-	 *         commType=ComponentCommunicationType? 
+	 *         (abstract?='abstract' | commType=ComponentCommunicationType)* 
 	 *         name=ID 
 	 *         docu=Documentation? 
 	 *         base=[ActorClass|FQN]? 
 	 *         annotations+=Annotation* 
-	 *         (serviceProvisionPoints+=SPP | interfacePorts+=Port)* 
+	 *         serviceProvisionPoints+=SPP? 
+	 *         (interfacePorts+=Port? serviceProvisionPoints+=SPP?)* 
+	 *         structureDocu=Documentation? 
+	 *         userCode1=DetailCode? 
+	 *         userCode2=DetailCode? 
+	 *         userCode3=DetailCode? 
+	 *         connections+=LayerConnection? 
 	 *         (
-	 *             structureDocu=Documentation? 
-	 *             userCode1=DetailCode? 
-	 *             userCode2=DetailCode? 
-	 *             userCode3=DetailCode? 
 	 *             (
-	 *                 connections+=LayerConnection | 
 	 *                 bindings+=Binding | 
 	 *                 serviceImplementations+=ServiceImplementation | 
 	 *                 attributes+=Attribute | 
@@ -678,70 +386,84 @@ public class RoomSemanticSequencer extends FSMSemanticSequencer {
 	 *                 serviceAccessPoints+=SAP | 
 	 *                 internalPorts+=Port | 
 	 *                 externalPorts+=ExternalPort
-	 *             )*
-	 *         )? 
-	 *         (
-	 *             behaviorDocu=Documentation? 
-	 *             behaviorAnnotations+=Annotation* 
-	 *             (operations+=StandardOperation | structors+=ClassStructor)* 
-	 *             stateMachine=StateMachine?
-	 *         )?
+	 *             )? 
+	 *             connections+=LayerConnection?
+	 *         )* 
+	 *         behaviorDocu=Documentation? 
+	 *         behaviorAnnotations+=Annotation* 
+	 *         (operations+=StandardOperation | structors+=ClassStructor)* 
+	 *         stateMachine=StateMachine?
 	 *     )
 	 */
-	protected void sequence_ActorClass(EObject context, ActorClass semanticObject) {
+	protected void sequence_ActorClass(ISerializationContext context, ActorClass semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     ActorInstanceMapping returns ActorInstanceMapping
+	 *
 	 * Constraint:
 	 *     (path=RefPath thread=[LogicalThread|ID] actorInstanceMappings+=ActorInstanceMapping*)
 	 */
-	protected void sequence_ActorInstanceMapping(EObject context, ActorInstanceMapping semanticObject) {
+	protected void sequence_ActorInstanceMapping(ISerializationContext context, ActorInstanceMapping semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     ActorContainerRef returns ActorRef
+	 *     ActorRef returns ActorRef
+	 *
 	 * Constraint:
 	 *     (refType=ReferenceType? name=ID multiplicity=MULTIPLICITY? type=[ActorClass|FQN] docu=Documentation?)
 	 */
-	protected void sequence_ActorRef(EObject context, ActorRef semanticObject) {
+	protected void sequence_ActorRef(ISerializationContext context, ActorRef semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Attribute returns Attribute
+	 *
 	 * Constraint:
 	 *     (name=ID size=INT? type=RefableType? defaultValueLiteral=STRING? docu=Documentation?)
 	 */
-	protected void sequence_Attribute(EObject context, Attribute semanticObject) {
+	protected void sequence_Attribute(ISerializationContext context, Attribute semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     BindingEndPoint returns BindingEndPoint
+	 *
 	 * Constraint:
 	 *     (actorRef=[ActorContainerRef|ID]? port=[Port|ID] sub=[SubProtocol|ID]?)
 	 */
-	protected void sequence_BindingEndPoint(EObject context, BindingEndPoint semanticObject) {
+	protected void sequence_BindingEndPoint(ISerializationContext context, BindingEndPoint semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Binding returns Binding
+	 *
 	 * Constraint:
 	 *     (endpoint1=BindingEndPoint endpoint2=BindingEndPoint)
 	 */
-	protected void sequence_Binding(EObject context, Binding semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, RoomPackage.Literals.BINDING__ENDPOINT1) == ValueTransient.YES)
+	protected void sequence_Binding(ISerializationContext context, Binding semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, RoomPackage.Literals.BINDING__ENDPOINT1) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, RoomPackage.Literals.BINDING__ENDPOINT1));
-			if(transientValues.isValueTransient(semanticObject, RoomPackage.Literals.BINDING__ENDPOINT2) == ValueTransient.YES)
+			if (transientValues.isValueTransient(semanticObject, RoomPackage.Literals.BINDING__ENDPOINT2) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, RoomPackage.Literals.BINDING__ENDPOINT2));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
 		feeder.accept(grammarAccess.getBindingAccess().getEndpoint1BindingEndPointParserRuleCall_1_0(), semanticObject.getEndpoint1());
 		feeder.accept(grammarAccess.getBindingAccess().getEndpoint2BindingEndPointParserRuleCall_3_0(), semanticObject.getEndpoint2());
 		feeder.finish();
@@ -749,24 +471,38 @@ public class RoomSemanticSequencer extends FSMSemanticSequencer {
 	
 	
 	/**
+	 * Contexts:
+	 *     ClassStructor returns ClassStructor
+	 *
 	 * Constraint:
 	 *     ((name='ctor' | name='dtor') detailCode=DetailCode)
 	 */
-	protected void sequence_ClassStructor(EObject context, ClassStructor semanticObject) {
+	protected void sequence_ClassStructor(ISerializationContext context, ClassStructor semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     RoomClass returns CompoundProtocolClass
+	 *     GeneralProtocolClass returns CompoundProtocolClass
+	 *     CompoundProtocolClass returns CompoundProtocolClass
+	 *
 	 * Constraint:
 	 *     (name=ID docu=Documentation? annotations+=Annotation* subProtocols+=SubProtocol*)
 	 */
-	protected void sequence_CompoundProtocolClass(EObject context, CompoundProtocolClass semanticObject) {
+	protected void sequence_CompoundProtocolClass(ISerializationContext context, CompoundProtocolClass semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     RoomClass returns DataClass
+	 *     DataType returns DataClass
+	 *     ComplexType returns DataClass
+	 *     DataClass returns DataClass
+	 *
 	 * Constraint:
 	 *     (
 	 *         name=ID 
@@ -779,67 +515,86 @@ public class RoomSemanticSequencer extends FSMSemanticSequencer {
 	 *         (operations+=StandardOperation | structors+=ClassStructor | attributes+=Attribute)*
 	 *     )
 	 */
-	protected void sequence_DataClass(EObject context, DataClass semanticObject) {
+	protected void sequence_DataClass(ISerializationContext context, DataClass semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     EnumLiteral returns EnumLiteral
+	 *
 	 * Constraint:
 	 *     (name=ID literal=IntLiteral?)
 	 */
-	protected void sequence_EnumLiteral(EObject context, EnumLiteral semanticObject) {
+	protected void sequence_EnumLiteral(ISerializationContext context, EnumLiteral semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     RoomClass returns EnumerationType
+	 *     DataType returns EnumerationType
+	 *     EnumerationType returns EnumerationType
+	 *
 	 * Constraint:
 	 *     (name=ID docu=Documentation? primitiveType=[PrimitiveType|FQN]? (literals+=EnumLiteral literals+=EnumLiteral*)?)
 	 */
-	protected void sequence_EnumerationType(EObject context, EnumerationType semanticObject) {
+	protected void sequence_EnumerationType(ISerializationContext context, EnumerationType semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     ExternalPort returns ExternalPort
+	 *
 	 * Constraint:
 	 *     interfacePort=[Port|ID]
 	 */
-	protected void sequence_ExternalPort(EObject context, ExternalPort semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, RoomPackage.Literals.EXTERNAL_PORT__INTERFACE_PORT) == ValueTransient.YES)
+	protected void sequence_ExternalPort(ISerializationContext context, ExternalPort semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, RoomPackage.Literals.EXTERNAL_PORT__INTERFACE_PORT) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, RoomPackage.Literals.EXTERNAL_PORT__INTERFACE_PORT));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
 		feeder.accept(grammarAccess.getExternalPortAccess().getInterfacePortPortIDTerminalRuleCall_2_0_1(), semanticObject.getInterfacePort());
 		feeder.finish();
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     RoomClass returns ExternalType
+	 *     DataType returns ExternalType
+	 *     ComplexType returns ExternalType
+	 *     ExternalType returns ExternalType
+	 *
 	 * Constraint:
 	 *     (name=ID targetName=STRING defaultValueLiteral=STRING? docu=Documentation?)
 	 */
-	protected void sequence_ExternalType(EObject context, ExternalType semanticObject) {
+	protected void sequence_ExternalType(ISerializationContext context, ExternalType semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     MessageHandler returns InMessageHandler
+	 *     InMessageHandler returns InMessageHandler
+	 *
 	 * Constraint:
 	 *     (msg=[Message|ID] detailCode=DetailCode)
 	 */
-	protected void sequence_InMessageHandler(EObject context, InMessageHandler semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, RoomPackage.Literals.MESSAGE_HANDLER__MSG) == ValueTransient.YES)
+	protected void sequence_InMessageHandler(ISerializationContext context, InMessageHandler semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, RoomPackage.Literals.MESSAGE_HANDLER__MSG) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, RoomPackage.Literals.MESSAGE_HANDLER__MSG));
-			if(transientValues.isValueTransient(semanticObject, RoomPackage.Literals.MESSAGE_HANDLER__DETAIL_CODE) == ValueTransient.YES)
+			if (transientValues.isValueTransient(semanticObject, RoomPackage.Literals.MESSAGE_HANDLER__DETAIL_CODE) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, RoomPackage.Literals.MESSAGE_HANDLER__DETAIL_CODE));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
 		feeder.accept(grammarAccess.getInMessageHandlerAccess().getMsgMessageIDTerminalRuleCall_2_0_1(), semanticObject.getMsg());
 		feeder.accept(grammarAccess.getInMessageHandlerAccess().getDetailCodeDetailCodeParserRuleCall_3_0(), semanticObject.getDetailCode());
 		feeder.finish();
@@ -847,18 +602,20 @@ public class RoomSemanticSequencer extends FSMSemanticSequencer {
 	
 	
 	/**
+	 * Contexts:
+	 *     LayerConnection returns LayerConnection
+	 *
 	 * Constraint:
 	 *     (from=SAPoint to=SPPoint)
 	 */
-	protected void sequence_LayerConnection(EObject context, LayerConnection semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, RoomPackage.Literals.LAYER_CONNECTION__FROM) == ValueTransient.YES)
+	protected void sequence_LayerConnection(ISerializationContext context, LayerConnection semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, RoomPackage.Literals.LAYER_CONNECTION__FROM) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, RoomPackage.Literals.LAYER_CONNECTION__FROM));
-			if(transientValues.isValueTransient(semanticObject, RoomPackage.Literals.LAYER_CONNECTION__TO) == ValueTransient.YES)
+			if (transientValues.isValueTransient(semanticObject, RoomPackage.Literals.LAYER_CONNECTION__TO) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, RoomPackage.Literals.LAYER_CONNECTION__TO));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
 		feeder.accept(grammarAccess.getLayerConnectionAccess().getFromSAPointParserRuleCall_1_0(), semanticObject.getFrom());
 		feeder.accept(grammarAccess.getLayerConnectionAccess().getToSPPointParserRuleCall_3_0(), semanticObject.getTo());
 		feeder.finish();
@@ -866,52 +623,65 @@ public class RoomSemanticSequencer extends FSMSemanticSequencer {
 	
 	
 	/**
+	 * Contexts:
+	 *     RoomClass returns LogicalSystem
+	 *     StructureClass returns LogicalSystem
+	 *     LogicalSystem returns LogicalSystem
+	 *
 	 * Constraint:
 	 *     (name=ID docu=Documentation? annotations+=Annotation* (connections+=LayerConnection | bindings+=Binding | subSystems+=SubSystemRef)*)
 	 */
-	protected void sequence_LogicalSystem(EObject context, LogicalSystem semanticObject) {
+	protected void sequence_LogicalSystem(ISerializationContext context, LogicalSystem semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     LogicalThread returns LogicalThread
+	 *
 	 * Constraint:
 	 *     name=ID
 	 */
-	protected void sequence_LogicalThread(EObject context, LogicalThread semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, RoomPackage.Literals.LOGICAL_THREAD__NAME) == ValueTransient.YES)
+	protected void sequence_LogicalThread(ISerializationContext context, LogicalThread semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, RoomPackage.Literals.LOGICAL_THREAD__NAME) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, RoomPackage.Literals.LOGICAL_THREAD__NAME));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
 		feeder.accept(grammarAccess.getLogicalThreadAccess().getNameIDTerminalRuleCall_1_0(), semanticObject.getName());
 		feeder.finish();
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Message returns Message
+	 *
 	 * Constraint:
 	 *     (priv?='private'? name=ID data=VarDecl? docu=Documentation?)
 	 */
-	protected void sequence_Message(EObject context, Message semanticObject) {
+	protected void sequence_Message(ISerializationContext context, Message semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     MessageHandler returns OutMessageHandler
+	 *     OutMessageHandler returns OutMessageHandler
+	 *
 	 * Constraint:
 	 *     (msg=[Message|ID] detailCode=DetailCode)
 	 */
-	protected void sequence_OutMessageHandler(EObject context, OutMessageHandler semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, RoomPackage.Literals.MESSAGE_HANDLER__MSG) == ValueTransient.YES)
+	protected void sequence_OutMessageHandler(ISerializationContext context, OutMessageHandler semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, RoomPackage.Literals.MESSAGE_HANDLER__MSG) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, RoomPackage.Literals.MESSAGE_HANDLER__MSG));
-			if(transientValues.isValueTransient(semanticObject, RoomPackage.Literals.MESSAGE_HANDLER__DETAIL_CODE) == ValueTransient.YES)
+			if (transientValues.isValueTransient(semanticObject, RoomPackage.Literals.MESSAGE_HANDLER__DETAIL_CODE) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, RoomPackage.Literals.MESSAGE_HANDLER__DETAIL_CODE));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
 		feeder.accept(grammarAccess.getOutMessageHandlerAccess().getMsgMessageIDTerminalRuleCall_2_0_1(), semanticObject.getMsg());
 		feeder.accept(grammarAccess.getOutMessageHandlerAccess().getDetailCodeDetailCodeParserRuleCall_3_0(), semanticObject.getDetailCode());
 		feeder.finish();
@@ -919,33 +689,50 @@ public class RoomSemanticSequencer extends FSMSemanticSequencer {
 	
 	
 	/**
+	 * Contexts:
+	 *     PortClass returns PortClass
+	 *
 	 * Constraint:
 	 *     (userCode=DetailCode? (msgHandlers+=MessageHandler | operations+=PortOperation | attributes+=Attribute)*)
 	 */
-	protected void sequence_PortClass(EObject context, PortClass semanticObject) {
+	protected void sequence_PortClass(ISerializationContext context, PortClass semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Operation returns PortOperation
+	 *     PortOperation returns PortOperation
+	 *
 	 * Constraint:
-	 *     (name=ID (arguments+=VarDecl arguments+=VarDecl*)? (returnType=RefableType? | sendsMsg=[Message|ID])? docu=Documentation? detailCode=DetailCode)
+	 *     (name=ID (arguments+=VarDecl arguments+=VarDecl*)? (returnType=RefableType | sendsMsg=[Message|ID])? docu=Documentation? detailCode=DetailCode)
 	 */
-	protected void sequence_PortOperation(EObject context, PortOperation semanticObject) {
+	protected void sequence_PortOperation(ISerializationContext context, PortOperation semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     InterfaceItem returns Port
+	 *     Port returns Port
+	 *     AbstractInterfaceItem returns Port
+	 *
 	 * Constraint:
 	 *     (conjugated?='conjugated'? name=ID multiplicity=MULTIPLICITY? protocol=[GeneralProtocolClass|FQN] docu=Documentation?)
 	 */
-	protected void sequence_Port(EObject context, Port semanticObject) {
+	protected void sequence_Port(ISerializationContext context, Port semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     RoomClass returns PrimitiveType
+	 *     DataType returns PrimitiveType
+	 *     PrimitiveType returns PrimitiveType
+	 *
 	 * Constraint:
 	 *     (
 	 *         name=ID 
@@ -956,12 +743,17 @@ public class RoomSemanticSequencer extends FSMSemanticSequencer {
 	 *         docu=Documentation?
 	 *     )
 	 */
-	protected void sequence_PrimitiveType(EObject context, PrimitiveType semanticObject) {
+	protected void sequence_PrimitiveType(ISerializationContext context, PrimitiveType semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     RoomClass returns ProtocolClass
+	 *     GeneralProtocolClass returns ProtocolClass
+	 *     ProtocolClass returns ProtocolClass
+	 *
 	 * Constraint:
 	 *     (
 	 *         commType=CommunicationType? 
@@ -979,71 +771,89 @@ public class RoomSemanticSequencer extends FSMSemanticSequencer {
 	 *         semantics=ProtocolSemantics?
 	 *     )
 	 */
-	protected void sequence_ProtocolClass(EObject context, ProtocolClass semanticObject) {
+	protected void sequence_ProtocolClass(ISerializationContext context, ProtocolClass semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     RefPath returns RefPath
+	 *
 	 * Constraint:
 	 *     (refs+=RefSegment refs+=RefSegment*)
 	 */
-	protected void sequence_RefPath(EObject context, RefPath semanticObject) {
+	protected void sequence_RefPath(ISerializationContext context, RefPath semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     SAPoint returns RefSAPoint
+	 *     RefSAPoint returns RefSAPoint
+	 *
 	 * Constraint:
 	 *     ref=[ActorContainerRef|ID]
 	 */
-	protected void sequence_RefSAPoint(EObject context, RefSAPoint semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, RoomPackage.Literals.REF_SA_POINT__REF) == ValueTransient.YES)
+	protected void sequence_RefSAPoint(ISerializationContext context, RefSAPoint semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, RoomPackage.Literals.REF_SA_POINT__REF) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, RoomPackage.Literals.REF_SA_POINT__REF));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
 		feeder.accept(grammarAccess.getRefSAPointAccess().getRefActorContainerRefIDTerminalRuleCall_1_0_1(), semanticObject.getRef());
 		feeder.finish();
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     RefSegment returns RefSegment
+	 *
 	 * Constraint:
 	 *     (ref=ID idx=INT?)
 	 */
-	protected void sequence_RefSegment(EObject context, RefSegment semanticObject) {
+	protected void sequence_RefSegment(ISerializationContext context, RefSegment semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     RefableType returns RefableType
+	 *
 	 * Constraint:
 	 *     (type=[DataType|FQN] ref?='ref'?)
 	 */
-	protected void sequence_RefableType(EObject context, RefableType semanticObject) {
+	protected void sequence_RefableType(ISerializationContext context, RefableType semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     SAPoint returns RelaySAPoint
+	 *     RelaySAPoint returns RelaySAPoint
+	 *
 	 * Constraint:
 	 *     relay=[SPP|ID]
 	 */
-	protected void sequence_RelaySAPoint(EObject context, RelaySAPoint semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, RoomPackage.Literals.RELAY_SA_POINT__RELAY) == ValueTransient.YES)
+	protected void sequence_RelaySAPoint(ISerializationContext context, RelaySAPoint semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, RoomPackage.Literals.RELAY_SA_POINT__RELAY) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, RoomPackage.Literals.RELAY_SA_POINT__RELAY));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
 		feeder.accept(grammarAccess.getRelaySAPointAccess().getRelaySPPIDTerminalRuleCall_1_0_1(), semanticObject.getRelay());
 		feeder.finish();
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     RoomModel returns RoomModel
+	 *
 	 * Constraint:
 	 *     (
 	 *         name=FQN 
@@ -1062,24 +872,28 @@ public class RoomSemanticSequencer extends FSMSemanticSequencer {
 	 *         )*
 	 *     )
 	 */
-	protected void sequence_RoomModel(EObject context, RoomModel semanticObject) {
+	protected void sequence_RoomModel(ISerializationContext context, RoomModel semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     InterfaceItem returns SAP
+	 *     SAP returns SAP
+	 *     AbstractInterfaceItem returns SAP
+	 *
 	 * Constraint:
 	 *     (name=ID protocol=[ProtocolClass|FQN])
 	 */
-	protected void sequence_SAP(EObject context, SAP semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, FSMPackage.Literals.ABSTRACT_INTERFACE_ITEM__NAME) == ValueTransient.YES)
+	protected void sequence_SAP(ISerializationContext context, SAP 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));
-			if(transientValues.isValueTransient(semanticObject, RoomPackage.Literals.SAP__PROTOCOL) == ValueTransient.YES)
+			if (transientValues.isValueTransient(semanticObject, RoomPackage.Literals.SAP__PROTOCOL) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, RoomPackage.Literals.SAP__PROTOCOL));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
 		feeder.accept(grammarAccess.getSAPAccess().getNameIDTerminalRuleCall_1_0(), semanticObject.getName());
 		feeder.accept(grammarAccess.getSAPAccess().getProtocolProtocolClassFQNParserRuleCall_3_0_1(), semanticObject.getProtocol());
 		feeder.finish();
@@ -1087,18 +901,22 @@ public class RoomSemanticSequencer extends FSMSemanticSequencer {
 	
 	
 	/**
+	 * Contexts:
+	 *     InterfaceItem returns SPP
+	 *     SPP returns SPP
+	 *     AbstractInterfaceItem returns SPP
+	 *
 	 * Constraint:
 	 *     (name=ID protocol=[ProtocolClass|FQN])
 	 */
-	protected void sequence_SPP(EObject context, SPP semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, FSMPackage.Literals.ABSTRACT_INTERFACE_ITEM__NAME) == ValueTransient.YES)
+	protected void sequence_SPP(ISerializationContext context, SPP 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));
-			if(transientValues.isValueTransient(semanticObject, RoomPackage.Literals.SPP__PROTOCOL) == ValueTransient.YES)
+			if (transientValues.isValueTransient(semanticObject, RoomPackage.Literals.SPP__PROTOCOL) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, RoomPackage.Literals.SPP__PROTOCOL));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
 		feeder.accept(grammarAccess.getSPPAccess().getNameIDTerminalRuleCall_1_0(), semanticObject.getName());
 		feeder.accept(grammarAccess.getSPPAccess().getProtocolProtocolClassFQNParserRuleCall_3_0_1(), semanticObject.getProtocol());
 		feeder.finish();
@@ -1106,18 +924,20 @@ public class RoomSemanticSequencer extends FSMSemanticSequencer {
 	
 	
 	/**
+	 * Contexts:
+	 *     SPPoint returns SPPoint
+	 *
 	 * Constraint:
 	 *     (ref=[ActorContainerRef|ID] service=[SPP|ID])
 	 */
-	protected void sequence_SPPoint(EObject context, SPPoint semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, RoomPackage.Literals.SP_POINT__REF) == ValueTransient.YES)
+	protected void sequence_SPPoint(ISerializationContext context, SPPoint semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, RoomPackage.Literals.SP_POINT__REF) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, RoomPackage.Literals.SP_POINT__REF));
-			if(transientValues.isValueTransient(semanticObject, RoomPackage.Literals.SP_POINT__SERVICE) == ValueTransient.YES)
+			if (transientValues.isValueTransient(semanticObject, RoomPackage.Literals.SP_POINT__SERVICE) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, RoomPackage.Literals.SP_POINT__SERVICE));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
 		feeder.accept(grammarAccess.getSPPointAccess().getRefActorContainerRefIDTerminalRuleCall_0_0_1(), semanticObject.getRef());
 		feeder.accept(grammarAccess.getSPPointAccess().getServiceSPPIDTerminalRuleCall_2_0_1(), semanticObject.getService());
 		feeder.finish();
@@ -1125,22 +945,28 @@ public class RoomSemanticSequencer extends FSMSemanticSequencer {
 	
 	
 	/**
+	 * Contexts:
+	 *     ServiceImplementation returns ServiceImplementation
+	 *
 	 * Constraint:
 	 *     spp=[SPP|ID]
 	 */
-	protected void sequence_ServiceImplementation(EObject context, ServiceImplementation semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, RoomPackage.Literals.SERVICE_IMPLEMENTATION__SPP) == ValueTransient.YES)
+	protected void sequence_ServiceImplementation(ISerializationContext context, ServiceImplementation semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, RoomPackage.Literals.SERVICE_IMPLEMENTATION__SPP) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, RoomPackage.Literals.SERVICE_IMPLEMENTATION__SPP));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
 		feeder.accept(grammarAccess.getServiceImplementationAccess().getSppSPPIDTerminalRuleCall_2_0_1(), semanticObject.getSpp());
 		feeder.finish();
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Operation returns StandardOperation
+	 *     StandardOperation returns StandardOperation
+	 *
 	 * Constraint:
 	 *     (
 	 *         override?='override'? 
@@ -1151,24 +977,26 @@ public class RoomSemanticSequencer extends FSMSemanticSequencer {
 	 *         detailCode=DetailCode
 	 *     )
 	 */
-	protected void sequence_StandardOperation(EObject context, StandardOperation semanticObject) {
+	protected void sequence_StandardOperation(ISerializationContext context, StandardOperation semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     SubProtocol returns SubProtocol
+	 *
 	 * Constraint:
 	 *     (name=ID protocol=[GeneralProtocolClass|FQN])
 	 */
-	protected void sequence_SubProtocol(EObject context, SubProtocol semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, RoomPackage.Literals.SUB_PROTOCOL__NAME) == ValueTransient.YES)
+	protected void sequence_SubProtocol(ISerializationContext context, SubProtocol semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, RoomPackage.Literals.SUB_PROTOCOL__NAME) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, RoomPackage.Literals.SUB_PROTOCOL__NAME));
-			if(transientValues.isValueTransient(semanticObject, RoomPackage.Literals.SUB_PROTOCOL__PROTOCOL) == ValueTransient.YES)
+			if (transientValues.isValueTransient(semanticObject, RoomPackage.Literals.SUB_PROTOCOL__PROTOCOL) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, RoomPackage.Literals.SUB_PROTOCOL__PROTOCOL));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
 		feeder.accept(grammarAccess.getSubProtocolAccess().getNameIDTerminalRuleCall_1_0(), semanticObject.getName());
 		feeder.accept(grammarAccess.getSubProtocolAccess().getProtocolGeneralProtocolClassFQNParserRuleCall_3_0_1(), semanticObject.getProtocol());
 		feeder.finish();
@@ -1176,6 +1004,12 @@ public class RoomSemanticSequencer extends FSMSemanticSequencer {
 	
 	
 	/**
+	 * Contexts:
+	 *     RoomClass returns SubSystemClass
+	 *     StructureClass returns SubSystemClass
+	 *     ActorContainerClass returns SubSystemClass
+	 *     SubSystemClass returns SubSystemClass
+	 *
 	 * Constraint:
 	 *     (
 	 *         name=ID 
@@ -1195,35 +1029,43 @@ public class RoomSemanticSequencer extends FSMSemanticSequencer {
 	 *         )*
 	 *     )
 	 */
-	protected void sequence_SubSystemClass(EObject context, SubSystemClass semanticObject) {
+	protected void sequence_SubSystemClass(ISerializationContext context, SubSystemClass semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     ActorContainerRef returns SubSystemRef
+	 *     SubSystemRef returns SubSystemRef
+	 *
 	 * Constraint:
 	 *     (name=ID type=[SubSystemClass|FQN] docu=Documentation?)
 	 */
-	protected void sequence_SubSystemRef(EObject context, SubSystemRef semanticObject) {
+	protected void sequence_SubSystemRef(ISerializationContext context, SubSystemRef semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     VarDecl returns VarDecl
+	 *
 	 * Constraint:
 	 *     (name=ID refType=RefableType)
 	 */
-	protected void sequence_VarDecl(EObject context, VarDecl semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, RoomPackage.Literals.VAR_DECL__NAME) == ValueTransient.YES)
+	protected void sequence_VarDecl(ISerializationContext context, VarDecl semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, RoomPackage.Literals.VAR_DECL__NAME) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, RoomPackage.Literals.VAR_DECL__NAME));
-			if(transientValues.isValueTransient(semanticObject, RoomPackage.Literals.VAR_DECL__REF_TYPE) == ValueTransient.YES)
+			if (transientValues.isValueTransient(semanticObject, RoomPackage.Literals.VAR_DECL__REF_TYPE) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, RoomPackage.Literals.VAR_DECL__REF_TYPE));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
 		feeder.accept(grammarAccess.getVarDeclAccess().getNameIDTerminalRuleCall_0_0(), semanticObject.getName());
 		feeder.accept(grammarAccess.getVarDeclAccess().getRefTypeRefableTypeParserRuleCall_2_0(), semanticObject.getRefType());
 		feeder.finish();
 	}
+	
+	
 }
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/serializer/RoomSyntacticSequencer.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/serializer/RoomSyntacticSequencer.java
index 31ef991e4..7a93af314 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/serializer/RoomSyntacticSequencer.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/serializer/RoomSyntacticSequencer.java
@@ -1,3 +1,6 @@
+/*
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.serializer;
 
 import com.google.inject.Inject;
@@ -58,115 +61,345 @@ public class RoomSyntacticSequencer extends AbstractSyntacticSequencer {
 		List<INode> transitionNodes = collectNodes(fromNode, toNode);
 		for (AbstractElementAlias syntax : transition.getAmbiguousSyntaxes()) {
 			List<INode> syntaxNodes = getNodesFor(transitionNodes, syntax);
-			if(match_ActorClass___BehaviorKeyword_9_0_LeftCurlyBracketKeyword_9_2_RightCurlyBracketKeyword_9_6__q.equals(syntax))
+			if (match_ActorClass___BehaviorKeyword_9_0_LeftCurlyBracketKeyword_9_2_RightCurlyBracketKeyword_9_6__q.equals(syntax))
 				emit_ActorClass___BehaviorKeyword_9_0_LeftCurlyBracketKeyword_9_2_RightCurlyBracketKeyword_9_6__q(semanticObject, getLastNavigableState(), syntaxNodes);
-			else if(match_ActorClass___InterfaceKeyword_7_0_LeftCurlyBracketKeyword_7_1_RightCurlyBracketKeyword_7_3__q.equals(syntax))
+			else if (match_ActorClass___InterfaceKeyword_7_0_LeftCurlyBracketKeyword_7_1_RightCurlyBracketKeyword_7_3__q.equals(syntax))
 				emit_ActorClass___InterfaceKeyword_7_0_LeftCurlyBracketKeyword_7_1_RightCurlyBracketKeyword_7_3__q(semanticObject, getLastNavigableState(), syntaxNodes);
-			else if(match_ActorClass___StructureKeyword_8_0_LeftCurlyBracketKeyword_8_2_RightCurlyBracketKeyword_8_7__q.equals(syntax))
+			else if (match_ActorClass___StructureKeyword_8_0_LeftCurlyBracketKeyword_8_2_RightCurlyBracketKeyword_8_7__q.equals(syntax))
 				emit_ActorClass___StructureKeyword_8_0_LeftCurlyBracketKeyword_8_2_RightCurlyBracketKeyword_8_7__q(semanticObject, getLastNavigableState(), syntaxNodes);
-			else if(match_ActorInstanceMapping___LeftCurlyBracketKeyword_4_0_RightCurlyBracketKeyword_4_2__q.equals(syntax))
+			else if (match_ActorInstanceMapping___LeftCurlyBracketKeyword_4_0_RightCurlyBracketKeyword_4_2__q.equals(syntax))
 				emit_ActorInstanceMapping___LeftCurlyBracketKeyword_4_0_RightCurlyBracketKeyword_4_2__q(semanticObject, getLastNavigableState(), syntaxNodes);
-			else if(match_ContinuationTransition___LeftCurlyBracketKeyword_7_0_RightCurlyBracketKeyword_7_2__q.equals(syntax))
+			else 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_PortOperation___ColonKeyword_5_0_0_VoidKeyword_5_0_1_0__q.equals(syntax))
+			else if (match_PortOperation___ColonKeyword_5_0_0_VoidKeyword_5_0_1_0__q.equals(syntax))
 				emit_PortOperation___ColonKeyword_5_0_0_VoidKeyword_5_0_1_0__q(semanticObject, getLastNavigableState(), syntaxNodes);
-			else if(match_ProtocolClass___IncomingKeyword_10_0_LeftCurlyBracketKeyword_10_1_RightCurlyBracketKeyword_10_3__q.equals(syntax))
+			else if (match_ProtocolClass___IncomingKeyword_10_0_LeftCurlyBracketKeyword_10_1_RightCurlyBracketKeyword_10_3__q.equals(syntax))
 				emit_ProtocolClass___IncomingKeyword_10_0_LeftCurlyBracketKeyword_10_1_RightCurlyBracketKeyword_10_3__q(semanticObject, getLastNavigableState(), syntaxNodes);
-			else if(match_ProtocolClass___OutgoingKeyword_11_0_LeftCurlyBracketKeyword_11_1_RightCurlyBracketKeyword_11_3__q.equals(syntax))
+			else if (match_ProtocolClass___OutgoingKeyword_11_0_LeftCurlyBracketKeyword_11_1_RightCurlyBracketKeyword_11_3__q.equals(syntax))
 				emit_ProtocolClass___OutgoingKeyword_11_0_LeftCurlyBracketKeyword_11_1_RightCurlyBracketKeyword_11_3__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 if(match_StandardOperation___ColonKeyword_6_0_VoidKeyword_6_1_0__q.equals(syntax))
+			else if (match_StandardOperation___ColonKeyword_6_0_VoidKeyword_6_1_0__q.equals(syntax))
 				emit_StandardOperation___ColonKeyword_6_0_VoidKeyword_6_1_0__q(semanticObject, getLastNavigableState(), syntaxNodes);
 			else acceptNodes(getLastNavigableState(), syntaxNodes);
 		}
 	}
 
 	/**
-	 * Syntax:
+	 * Ambiguous syntax:
 	 *     ('Behavior' '{' '}')?
+	 *
+	 * This ambiguous syntax occurs at:
+	 *     actorRefs+=ActorRef '}' (ambiguity) '}' (rule end)
+	 *     annotations+=Annotation ('Interface' '{' '}')? ('Structure' '{' '}')? (ambiguity) '}' (rule end)
+	 *     attributes+=Attribute '}' (ambiguity) '}' (rule end)
+	 *     base=[ActorClass|FQN] '{' ('Interface' '{' '}')? ('Structure' '{' '}')? (ambiguity) '}' (rule end)
+	 *     bindings+=Binding '}' (ambiguity) '}' (rule end)
+	 *     connections+=LayerConnection '}' (ambiguity) '}' (rule end)
+	 *     docu=Documentation '{' ('Interface' '{' '}')? ('Structure' '{' '}')? (ambiguity) '}' (rule end)
+	 *     externalPorts+=ExternalPort '}' (ambiguity) '}' (rule end)
+	 *     interfacePorts+=Port '}' ('Structure' '{' '}')? (ambiguity) '}' (rule end)
+	 *     internalPorts+=Port '}' (ambiguity) '}' (rule end)
+	 *     name=ID '{' ('Interface' '{' '}')? ('Structure' '{' '}')? (ambiguity) '}' (rule end)
+	 *     serviceAccessPoints+=SAP '}' (ambiguity) '}' (rule end)
+	 *     serviceImplementations+=ServiceImplementation '}' (ambiguity) '}' (rule end)
+	 *     serviceProvisionPoints+=SPP '}' ('Structure' '{' '}')? (ambiguity) '}' (rule end)
+	 *     structureDocu=Documentation '{' '}' (ambiguity) '}' (rule end)
+	 *     userCode1=DetailCode '}' (ambiguity) '}' (rule end)
+	 *     userCode2=DetailCode '}' (ambiguity) '}' (rule end)
+	 *     userCode3=DetailCode '}' (ambiguity) '}' (rule end)
 	 */
 	protected void emit_ActorClass___BehaviorKeyword_9_0_LeftCurlyBracketKeyword_9_2_RightCurlyBracketKeyword_9_6__q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
 		acceptNodes(transition, nodes);
 	}
 	
 	/**
-	 * Syntax:
+	 * Ambiguous syntax:
 	 *     ('Interface' '{' '}')?
+	 *
+	 * This ambiguous syntax occurs at:
+	 *     annotations+=Annotation (ambiguity) 'Structure' '{' 'usercode1' userCode1=DetailCode
+	 *     annotations+=Annotation (ambiguity) 'Structure' '{' 'usercode2' userCode2=DetailCode
+	 *     annotations+=Annotation (ambiguity) 'Structure' '{' 'usercode3' userCode3=DetailCode
+	 *     annotations+=Annotation (ambiguity) 'Structure' '{' actorRefs+=ActorRef
+	 *     annotations+=Annotation (ambiguity) 'Structure' '{' attributes+=Attribute
+	 *     annotations+=Annotation (ambiguity) 'Structure' '{' bindings+=Binding
+	 *     annotations+=Annotation (ambiguity) 'Structure' '{' connections+=LayerConnection
+	 *     annotations+=Annotation (ambiguity) 'Structure' '{' externalPorts+=ExternalPort
+	 *     annotations+=Annotation (ambiguity) 'Structure' '{' internalPorts+=Port
+	 *     annotations+=Annotation (ambiguity) 'Structure' '{' serviceAccessPoints+=SAP
+	 *     annotations+=Annotation (ambiguity) 'Structure' '{' serviceImplementations+=ServiceImplementation
+	 *     annotations+=Annotation (ambiguity) 'Structure' structureDocu=Documentation
+	 *     annotations+=Annotation (ambiguity) ('Structure' '{' '}')? 'Behavior' '{' behaviorAnnotations+=Annotation
+	 *     annotations+=Annotation (ambiguity) ('Structure' '{' '}')? 'Behavior' '{' operations+=StandardOperation
+	 *     annotations+=Annotation (ambiguity) ('Structure' '{' '}')? 'Behavior' '{' stateMachine=StateMachine
+	 *     annotations+=Annotation (ambiguity) ('Structure' '{' '}')? 'Behavior' '{' structors+=ClassStructor
+	 *     annotations+=Annotation (ambiguity) ('Structure' '{' '}')? 'Behavior' behaviorDocu=Documentation
+	 *     annotations+=Annotation (ambiguity) ('Structure' '{' '}')? ('Behavior' '{' '}')? '}' (rule end)
+	 *     base=[ActorClass|FQN] '{' (ambiguity) 'Structure' '{' 'usercode1' userCode1=DetailCode
+	 *     base=[ActorClass|FQN] '{' (ambiguity) 'Structure' '{' 'usercode2' userCode2=DetailCode
+	 *     base=[ActorClass|FQN] '{' (ambiguity) 'Structure' '{' 'usercode3' userCode3=DetailCode
+	 *     base=[ActorClass|FQN] '{' (ambiguity) 'Structure' '{' actorRefs+=ActorRef
+	 *     base=[ActorClass|FQN] '{' (ambiguity) 'Structure' '{' attributes+=Attribute
+	 *     base=[ActorClass|FQN] '{' (ambiguity) 'Structure' '{' bindings+=Binding
+	 *     base=[ActorClass|FQN] '{' (ambiguity) 'Structure' '{' connections+=LayerConnection
+	 *     base=[ActorClass|FQN] '{' (ambiguity) 'Structure' '{' externalPorts+=ExternalPort
+	 *     base=[ActorClass|FQN] '{' (ambiguity) 'Structure' '{' internalPorts+=Port
+	 *     base=[ActorClass|FQN] '{' (ambiguity) 'Structure' '{' serviceAccessPoints+=SAP
+	 *     base=[ActorClass|FQN] '{' (ambiguity) 'Structure' '{' serviceImplementations+=ServiceImplementation
+	 *     base=[ActorClass|FQN] '{' (ambiguity) 'Structure' structureDocu=Documentation
+	 *     base=[ActorClass|FQN] '{' (ambiguity) ('Structure' '{' '}')? 'Behavior' '{' behaviorAnnotations+=Annotation
+	 *     base=[ActorClass|FQN] '{' (ambiguity) ('Structure' '{' '}')? 'Behavior' '{' operations+=StandardOperation
+	 *     base=[ActorClass|FQN] '{' (ambiguity) ('Structure' '{' '}')? 'Behavior' '{' stateMachine=StateMachine
+	 *     base=[ActorClass|FQN] '{' (ambiguity) ('Structure' '{' '}')? 'Behavior' '{' structors+=ClassStructor
+	 *     base=[ActorClass|FQN] '{' (ambiguity) ('Structure' '{' '}')? 'Behavior' behaviorDocu=Documentation
+	 *     base=[ActorClass|FQN] '{' (ambiguity) ('Structure' '{' '}')? ('Behavior' '{' '}')? '}' (rule end)
+	 *     docu=Documentation '{' (ambiguity) 'Structure' '{' 'usercode1' userCode1=DetailCode
+	 *     docu=Documentation '{' (ambiguity) 'Structure' '{' 'usercode2' userCode2=DetailCode
+	 *     docu=Documentation '{' (ambiguity) 'Structure' '{' 'usercode3' userCode3=DetailCode
+	 *     docu=Documentation '{' (ambiguity) 'Structure' '{' actorRefs+=ActorRef
+	 *     docu=Documentation '{' (ambiguity) 'Structure' '{' attributes+=Attribute
+	 *     docu=Documentation '{' (ambiguity) 'Structure' '{' bindings+=Binding
+	 *     docu=Documentation '{' (ambiguity) 'Structure' '{' connections+=LayerConnection
+	 *     docu=Documentation '{' (ambiguity) 'Structure' '{' externalPorts+=ExternalPort
+	 *     docu=Documentation '{' (ambiguity) 'Structure' '{' internalPorts+=Port
+	 *     docu=Documentation '{' (ambiguity) 'Structure' '{' serviceAccessPoints+=SAP
+	 *     docu=Documentation '{' (ambiguity) 'Structure' '{' serviceImplementations+=ServiceImplementation
+	 *     docu=Documentation '{' (ambiguity) 'Structure' structureDocu=Documentation
+	 *     docu=Documentation '{' (ambiguity) ('Structure' '{' '}')? 'Behavior' '{' behaviorAnnotations+=Annotation
+	 *     docu=Documentation '{' (ambiguity) ('Structure' '{' '}')? 'Behavior' '{' operations+=StandardOperation
+	 *     docu=Documentation '{' (ambiguity) ('Structure' '{' '}')? 'Behavior' '{' stateMachine=StateMachine
+	 *     docu=Documentation '{' (ambiguity) ('Structure' '{' '}')? 'Behavior' '{' structors+=ClassStructor
+	 *     docu=Documentation '{' (ambiguity) ('Structure' '{' '}')? 'Behavior' behaviorDocu=Documentation
+	 *     docu=Documentation '{' (ambiguity) ('Structure' '{' '}')? ('Behavior' '{' '}')? '}' (rule end)
+	 *     name=ID '{' (ambiguity) 'Structure' '{' 'usercode1' userCode1=DetailCode
+	 *     name=ID '{' (ambiguity) 'Structure' '{' 'usercode2' userCode2=DetailCode
+	 *     name=ID '{' (ambiguity) 'Structure' '{' 'usercode3' userCode3=DetailCode
+	 *     name=ID '{' (ambiguity) 'Structure' '{' actorRefs+=ActorRef
+	 *     name=ID '{' (ambiguity) 'Structure' '{' attributes+=Attribute
+	 *     name=ID '{' (ambiguity) 'Structure' '{' bindings+=Binding
+	 *     name=ID '{' (ambiguity) 'Structure' '{' connections+=LayerConnection
+	 *     name=ID '{' (ambiguity) 'Structure' '{' externalPorts+=ExternalPort
+	 *     name=ID '{' (ambiguity) 'Structure' '{' internalPorts+=Port
+	 *     name=ID '{' (ambiguity) 'Structure' '{' serviceAccessPoints+=SAP
+	 *     name=ID '{' (ambiguity) 'Structure' '{' serviceImplementations+=ServiceImplementation
+	 *     name=ID '{' (ambiguity) 'Structure' structureDocu=Documentation
+	 *     name=ID '{' (ambiguity) ('Structure' '{' '}')? 'Behavior' '{' behaviorAnnotations+=Annotation
+	 *     name=ID '{' (ambiguity) ('Structure' '{' '}')? 'Behavior' '{' operations+=StandardOperation
+	 *     name=ID '{' (ambiguity) ('Structure' '{' '}')? 'Behavior' '{' stateMachine=StateMachine
+	 *     name=ID '{' (ambiguity) ('Structure' '{' '}')? 'Behavior' '{' structors+=ClassStructor
+	 *     name=ID '{' (ambiguity) ('Structure' '{' '}')? 'Behavior' behaviorDocu=Documentation
+	 *     name=ID '{' (ambiguity) ('Structure' '{' '}')? ('Behavior' '{' '}')? '}' (rule end)
 	 */
 	protected void emit_ActorClass___InterfaceKeyword_7_0_LeftCurlyBracketKeyword_7_1_RightCurlyBracketKeyword_7_3__q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
 		acceptNodes(transition, nodes);
 	}
 	
 	/**
-	 * Syntax:
+	 * Ambiguous syntax:
 	 *     ('Structure' '{' '}')?
+	 *
+	 * This ambiguous syntax occurs at:
+	 *     annotations+=Annotation ('Interface' '{' '}')? (ambiguity) 'Behavior' '{' behaviorAnnotations+=Annotation
+	 *     annotations+=Annotation ('Interface' '{' '}')? (ambiguity) 'Behavior' '{' operations+=StandardOperation
+	 *     annotations+=Annotation ('Interface' '{' '}')? (ambiguity) 'Behavior' '{' stateMachine=StateMachine
+	 *     annotations+=Annotation ('Interface' '{' '}')? (ambiguity) 'Behavior' '{' structors+=ClassStructor
+	 *     annotations+=Annotation ('Interface' '{' '}')? (ambiguity) 'Behavior' behaviorDocu=Documentation
+	 *     annotations+=Annotation ('Interface' '{' '}')? (ambiguity) ('Behavior' '{' '}')? '}' (rule end)
+	 *     base=[ActorClass|FQN] '{' ('Interface' '{' '}')? (ambiguity) 'Behavior' '{' behaviorAnnotations+=Annotation
+	 *     base=[ActorClass|FQN] '{' ('Interface' '{' '}')? (ambiguity) 'Behavior' '{' operations+=StandardOperation
+	 *     base=[ActorClass|FQN] '{' ('Interface' '{' '}')? (ambiguity) 'Behavior' '{' stateMachine=StateMachine
+	 *     base=[ActorClass|FQN] '{' ('Interface' '{' '}')? (ambiguity) 'Behavior' '{' structors+=ClassStructor
+	 *     base=[ActorClass|FQN] '{' ('Interface' '{' '}')? (ambiguity) 'Behavior' behaviorDocu=Documentation
+	 *     base=[ActorClass|FQN] '{' ('Interface' '{' '}')? (ambiguity) ('Behavior' '{' '}')? '}' (rule end)
+	 *     docu=Documentation '{' ('Interface' '{' '}')? (ambiguity) 'Behavior' '{' behaviorAnnotations+=Annotation
+	 *     docu=Documentation '{' ('Interface' '{' '}')? (ambiguity) 'Behavior' '{' operations+=StandardOperation
+	 *     docu=Documentation '{' ('Interface' '{' '}')? (ambiguity) 'Behavior' '{' stateMachine=StateMachine
+	 *     docu=Documentation '{' ('Interface' '{' '}')? (ambiguity) 'Behavior' '{' structors+=ClassStructor
+	 *     docu=Documentation '{' ('Interface' '{' '}')? (ambiguity) 'Behavior' behaviorDocu=Documentation
+	 *     docu=Documentation '{' ('Interface' '{' '}')? (ambiguity) ('Behavior' '{' '}')? '}' (rule end)
+	 *     interfacePorts+=Port '}' (ambiguity) 'Behavior' '{' behaviorAnnotations+=Annotation
+	 *     interfacePorts+=Port '}' (ambiguity) 'Behavior' '{' operations+=StandardOperation
+	 *     interfacePorts+=Port '}' (ambiguity) 'Behavior' '{' stateMachine=StateMachine
+	 *     interfacePorts+=Port '}' (ambiguity) 'Behavior' '{' structors+=ClassStructor
+	 *     interfacePorts+=Port '}' (ambiguity) 'Behavior' behaviorDocu=Documentation
+	 *     interfacePorts+=Port '}' (ambiguity) ('Behavior' '{' '}')? '}' (rule end)
+	 *     name=ID '{' ('Interface' '{' '}')? (ambiguity) 'Behavior' '{' behaviorAnnotations+=Annotation
+	 *     name=ID '{' ('Interface' '{' '}')? (ambiguity) 'Behavior' '{' operations+=StandardOperation
+	 *     name=ID '{' ('Interface' '{' '}')? (ambiguity) 'Behavior' '{' stateMachine=StateMachine
+	 *     name=ID '{' ('Interface' '{' '}')? (ambiguity) 'Behavior' '{' structors+=ClassStructor
+	 *     name=ID '{' ('Interface' '{' '}')? (ambiguity) 'Behavior' behaviorDocu=Documentation
+	 *     name=ID '{' ('Interface' '{' '}')? (ambiguity) ('Behavior' '{' '}')? '}' (rule end)
+	 *     serviceProvisionPoints+=SPP '}' (ambiguity) 'Behavior' '{' behaviorAnnotations+=Annotation
+	 *     serviceProvisionPoints+=SPP '}' (ambiguity) 'Behavior' '{' operations+=StandardOperation
+	 *     serviceProvisionPoints+=SPP '}' (ambiguity) 'Behavior' '{' stateMachine=StateMachine
+	 *     serviceProvisionPoints+=SPP '}' (ambiguity) 'Behavior' '{' structors+=ClassStructor
+	 *     serviceProvisionPoints+=SPP '}' (ambiguity) 'Behavior' behaviorDocu=Documentation
+	 *     serviceProvisionPoints+=SPP '}' (ambiguity) ('Behavior' '{' '}')? '}' (rule end)
 	 */
 	protected void emit_ActorClass___StructureKeyword_8_0_LeftCurlyBracketKeyword_8_2_RightCurlyBracketKeyword_8_7__q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
 		acceptNodes(transition, nodes);
 	}
 	
 	/**
-	 * Syntax:
+	 * Ambiguous syntax:
 	 *     ('{' '}')?
+	 *
+	 * This ambiguous syntax occurs at:
+	 *     thread=[LogicalThread|ID] (ambiguity) (rule end)
 	 */
 	protected void emit_ActorInstanceMapping___LeftCurlyBracketKeyword_4_0_RightCurlyBracketKeyword_4_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_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:
 	 *     (':' 'void')?
+	 *
+	 * This ambiguous syntax occurs at:
+	 *     arguments+=VarDecl ')' (ambiguity) detailCode=DetailCode
+	 *     arguments+=VarDecl ')' (ambiguity) docu=Documentation
+	 *     name=ID '(' ')' (ambiguity) detailCode=DetailCode
+	 *     name=ID '(' ')' (ambiguity) docu=Documentation
 	 */
 	protected void emit_PortOperation___ColonKeyword_5_0_0_VoidKeyword_5_0_1_0__q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
 		acceptNodes(transition, nodes);
 	}
 	
 	/**
-	 * Syntax:
+	 * Ambiguous syntax:
 	 *     ('incoming' '{' '}')?
+	 *
+	 * This ambiguous syntax occurs at:
+	 *     annotations+=Annotation (ambiguity) 'outgoing' '{' outgoingMessages+=Message
+	 *     annotations+=Annotation (ambiguity) ('outgoing' '{' '}')? 'conjugated' 'PortClass' conjugated=PortClass
+	 *     annotations+=Annotation (ambiguity) ('outgoing' '{' '}')? 'regular' 'PortClass' regular=PortClass
+	 *     annotations+=Annotation (ambiguity) ('outgoing' '{' '}')? '}' (rule end)
+	 *     annotations+=Annotation (ambiguity) ('outgoing' '{' '}')? semantics=ProtocolSemantics
+	 *     base=[ProtocolClass|FQN] '{' (ambiguity) 'outgoing' '{' outgoingMessages+=Message
+	 *     base=[ProtocolClass|FQN] '{' (ambiguity) ('outgoing' '{' '}')? 'conjugated' 'PortClass' conjugated=PortClass
+	 *     base=[ProtocolClass|FQN] '{' (ambiguity) ('outgoing' '{' '}')? 'regular' 'PortClass' regular=PortClass
+	 *     base=[ProtocolClass|FQN] '{' (ambiguity) ('outgoing' '{' '}')? '}' (rule end)
+	 *     base=[ProtocolClass|FQN] '{' (ambiguity) ('outgoing' '{' '}')? semantics=ProtocolSemantics
+	 *     docu=Documentation '{' (ambiguity) 'outgoing' '{' outgoingMessages+=Message
+	 *     docu=Documentation '{' (ambiguity) ('outgoing' '{' '}')? 'conjugated' 'PortClass' conjugated=PortClass
+	 *     docu=Documentation '{' (ambiguity) ('outgoing' '{' '}')? 'regular' 'PortClass' regular=PortClass
+	 *     docu=Documentation '{' (ambiguity) ('outgoing' '{' '}')? '}' (rule end)
+	 *     docu=Documentation '{' (ambiguity) ('outgoing' '{' '}')? semantics=ProtocolSemantics
+	 *     name=ID '{' (ambiguity) 'outgoing' '{' outgoingMessages+=Message
+	 *     name=ID '{' (ambiguity) ('outgoing' '{' '}')? 'conjugated' 'PortClass' conjugated=PortClass
+	 *     name=ID '{' (ambiguity) ('outgoing' '{' '}')? 'regular' 'PortClass' regular=PortClass
+	 *     name=ID '{' (ambiguity) ('outgoing' '{' '}')? '}' (rule end)
+	 *     name=ID '{' (ambiguity) ('outgoing' '{' '}')? semantics=ProtocolSemantics
+	 *     userCode1=DetailCode (ambiguity) 'outgoing' '{' outgoingMessages+=Message
+	 *     userCode1=DetailCode (ambiguity) ('outgoing' '{' '}')? 'conjugated' 'PortClass' conjugated=PortClass
+	 *     userCode1=DetailCode (ambiguity) ('outgoing' '{' '}')? 'regular' 'PortClass' regular=PortClass
+	 *     userCode1=DetailCode (ambiguity) ('outgoing' '{' '}')? '}' (rule end)
+	 *     userCode1=DetailCode (ambiguity) ('outgoing' '{' '}')? semantics=ProtocolSemantics
+	 *     userCode2=DetailCode (ambiguity) 'outgoing' '{' outgoingMessages+=Message
+	 *     userCode2=DetailCode (ambiguity) ('outgoing' '{' '}')? 'conjugated' 'PortClass' conjugated=PortClass
+	 *     userCode2=DetailCode (ambiguity) ('outgoing' '{' '}')? 'regular' 'PortClass' regular=PortClass
+	 *     userCode2=DetailCode (ambiguity) ('outgoing' '{' '}')? '}' (rule end)
+	 *     userCode2=DetailCode (ambiguity) ('outgoing' '{' '}')? semantics=ProtocolSemantics
+	 *     userCode3=DetailCode (ambiguity) 'outgoing' '{' outgoingMessages+=Message
+	 *     userCode3=DetailCode (ambiguity) ('outgoing' '{' '}')? 'conjugated' 'PortClass' conjugated=PortClass
+	 *     userCode3=DetailCode (ambiguity) ('outgoing' '{' '}')? 'regular' 'PortClass' regular=PortClass
+	 *     userCode3=DetailCode (ambiguity) ('outgoing' '{' '}')? '}' (rule end)
+	 *     userCode3=DetailCode (ambiguity) ('outgoing' '{' '}')? semantics=ProtocolSemantics
 	 */
 	protected void emit_ProtocolClass___IncomingKeyword_10_0_LeftCurlyBracketKeyword_10_1_RightCurlyBracketKeyword_10_3__q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
 		acceptNodes(transition, nodes);
 	}
 	
 	/**
-	 * Syntax:
+	 * Ambiguous syntax:
 	 *     ('outgoing' '{' '}')?
+	 *
+	 * This ambiguous syntax occurs at:
+	 *     annotations+=Annotation ('incoming' '{' '}')? (ambiguity) 'conjugated' 'PortClass' conjugated=PortClass
+	 *     annotations+=Annotation ('incoming' '{' '}')? (ambiguity) 'regular' 'PortClass' regular=PortClass
+	 *     annotations+=Annotation ('incoming' '{' '}')? (ambiguity) '}' (rule end)
+	 *     annotations+=Annotation ('incoming' '{' '}')? (ambiguity) semantics=ProtocolSemantics
+	 *     base=[ProtocolClass|FQN] '{' ('incoming' '{' '}')? (ambiguity) 'conjugated' 'PortClass' conjugated=PortClass
+	 *     base=[ProtocolClass|FQN] '{' ('incoming' '{' '}')? (ambiguity) 'regular' 'PortClass' regular=PortClass
+	 *     base=[ProtocolClass|FQN] '{' ('incoming' '{' '}')? (ambiguity) '}' (rule end)
+	 *     base=[ProtocolClass|FQN] '{' ('incoming' '{' '}')? (ambiguity) semantics=ProtocolSemantics
+	 *     docu=Documentation '{' ('incoming' '{' '}')? (ambiguity) 'conjugated' 'PortClass' conjugated=PortClass
+	 *     docu=Documentation '{' ('incoming' '{' '}')? (ambiguity) 'regular' 'PortClass' regular=PortClass
+	 *     docu=Documentation '{' ('incoming' '{' '}')? (ambiguity) '}' (rule end)
+	 *     docu=Documentation '{' ('incoming' '{' '}')? (ambiguity) semantics=ProtocolSemantics
+	 *     incomingMessages+=Message '}' (ambiguity) 'conjugated' 'PortClass' conjugated=PortClass
+	 *     incomingMessages+=Message '}' (ambiguity) 'regular' 'PortClass' regular=PortClass
+	 *     incomingMessages+=Message '}' (ambiguity) '}' (rule end)
+	 *     incomingMessages+=Message '}' (ambiguity) semantics=ProtocolSemantics
+	 *     name=ID '{' ('incoming' '{' '}')? (ambiguity) 'conjugated' 'PortClass' conjugated=PortClass
+	 *     name=ID '{' ('incoming' '{' '}')? (ambiguity) 'regular' 'PortClass' regular=PortClass
+	 *     name=ID '{' ('incoming' '{' '}')? (ambiguity) '}' (rule end)
+	 *     name=ID '{' ('incoming' '{' '}')? (ambiguity) semantics=ProtocolSemantics
+	 *     userCode1=DetailCode ('incoming' '{' '}')? (ambiguity) 'conjugated' 'PortClass' conjugated=PortClass
+	 *     userCode1=DetailCode ('incoming' '{' '}')? (ambiguity) 'regular' 'PortClass' regular=PortClass
+	 *     userCode1=DetailCode ('incoming' '{' '}')? (ambiguity) '}' (rule end)
+	 *     userCode1=DetailCode ('incoming' '{' '}')? (ambiguity) semantics=ProtocolSemantics
+	 *     userCode2=DetailCode ('incoming' '{' '}')? (ambiguity) 'conjugated' 'PortClass' conjugated=PortClass
+	 *     userCode2=DetailCode ('incoming' '{' '}')? (ambiguity) 'regular' 'PortClass' regular=PortClass
+	 *     userCode2=DetailCode ('incoming' '{' '}')? (ambiguity) '}' (rule end)
+	 *     userCode2=DetailCode ('incoming' '{' '}')? (ambiguity) semantics=ProtocolSemantics
+	 *     userCode3=DetailCode ('incoming' '{' '}')? (ambiguity) 'conjugated' 'PortClass' conjugated=PortClass
+	 *     userCode3=DetailCode ('incoming' '{' '}')? (ambiguity) 'regular' 'PortClass' regular=PortClass
+	 *     userCode3=DetailCode ('incoming' '{' '}')? (ambiguity) '}' (rule end)
+	 *     userCode3=DetailCode ('incoming' '{' '}')? (ambiguity) semantics=ProtocolSemantics
 	 */
 	protected void emit_ProtocolClass___OutgoingKeyword_11_0_LeftCurlyBracketKeyword_11_1_RightCurlyBracketKeyword_11_3__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);
 	}
 	
 	/**
-	 * Syntax:
+	 * Ambiguous syntax:
 	 *     (':' 'void')?
+	 *
+	 * This ambiguous syntax occurs at:
+	 *     arguments+=VarDecl ')' (ambiguity) detailCode=DetailCode
+	 *     arguments+=VarDecl ')' (ambiguity) docu=Documentation
+	 *     name=ID '(' ')' (ambiguity) detailCode=DetailCode
+	 *     name=ID '(' ')' (ambiguity) docu=Documentation
 	 */
 	protected void emit_StandardOperation___ColonKeyword_6_0_VoidKeyword_6_1_0__q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
 		acceptNodes(transition, nodes);
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/services/RoomGrammarAccess.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/services/RoomGrammarAccess.java
index aeeece0ec..23793b5b3 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/services/RoomGrammarAccess.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/services/RoomGrammarAccess.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.services;
 
 import com.google.inject.Singleton;
@@ -14,13 +14,14 @@ import org.eclipse.xtext.service.AbstractElementFinder.*;
 
 import org.eclipse.etrice.core.fsm.services.FSMGrammarAccess;
 import org.eclipse.etrice.core.common.services.BaseGrammarAccess;
+import org.eclipse.xtext.common.services.TerminalsGrammarAccess;
 
 @Singleton
 public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	
 	
 	public class RoomModelElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "RoomModel");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.RoomModel");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cRoomModelKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -52,19 +53,20 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cRightCurlyBracketKeyword_6 = (Keyword)cGroup.eContents().get(6);
 		
 		//RoomModel:
-		//	"RoomModel" name=FQN docu=Documentation? "{" imports+=Import* (primitiveTypes+=PrimitiveType |
-		//	enumerationTypes+=EnumerationType | externalTypes+=ExternalType | dataClasses+=DataClass |
-		//	protocolClasses+=GeneralProtocolClass | actorClasses+=ActorClass | subSystemClasses+=SubSystemClass |
-		//	systems+=LogicalSystem | annotationTypes+=AnnotationType)* "}";
-		public ParserRule getRule() { return rule; }
-
-		//"RoomModel" name=FQN docu=Documentation? "{" imports+=Import* (primitiveTypes+=PrimitiveType |
+		//	'RoomModel' name=FQN docu=Documentation? '{'
+		//	imports+=Import* (primitiveTypes+=PrimitiveType | enumerationTypes+=EnumerationType | externalTypes+=ExternalType |
+		//	dataClasses+=DataClass | protocolClasses+=GeneralProtocolClass | actorClasses+=ActorClass |
+		//	subSystemClasses+=SubSystemClass | systems+=LogicalSystem | annotationTypes+=AnnotationType)*
+		//	'}';
+		@Override public ParserRule getRule() { return rule; }
+
+		//'RoomModel' name=FQN docu=Documentation? '{' imports+=Import* (primitiveTypes+=PrimitiveType |
 		//enumerationTypes+=EnumerationType | externalTypes+=ExternalType | dataClasses+=DataClass |
 		//protocolClasses+=GeneralProtocolClass | actorClasses+=ActorClass | subSystemClasses+=SubSystemClass |
-		//systems+=LogicalSystem | annotationTypes+=AnnotationType)* "}"
+		//systems+=LogicalSystem | annotationTypes+=AnnotationType)* '}'
 		public Group getGroup() { return cGroup; }
 
-		//"RoomModel"
+		//'RoomModel'
 		public Keyword getRoomModelKeyword_0() { return cRoomModelKeyword_0; }
 
 		//name=FQN
@@ -79,7 +81,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//Documentation
 		public RuleCall getDocuDocumentationParserRuleCall_2_0() { return cDocuDocumentationParserRuleCall_2_0; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_3() { return cLeftCurlyBracketKeyword_3; }
 
 		//imports+=Import*
@@ -147,12 +149,12 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//AnnotationType
 		public RuleCall getAnnotationTypesAnnotationTypeParserRuleCall_5_8_0() { return cAnnotationTypesAnnotationTypeParserRuleCall_5_8_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_6() { return cRightCurlyBracketKeyword_6; }
 	}
 
 	public class RoomClassElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "RoomClass");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.RoomClass");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final RuleCall cDataTypeParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final RuleCall cGeneralProtocolClassParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
@@ -160,7 +162,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//RoomClass:
 		//	DataType | GeneralProtocolClass | StructureClass;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//DataType | GeneralProtocolClass | StructureClass
 		public Alternatives getAlternatives() { return cAlternatives; }
@@ -176,14 +178,14 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class StructureClassElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "StructureClass");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.StructureClass");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final RuleCall cActorContainerClassParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final RuleCall cLogicalSystemParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
 		
 		//StructureClass:
 		//	ActorContainerClass | LogicalSystem;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//ActorContainerClass | LogicalSystem
 		public Alternatives getAlternatives() { return cAlternatives; }
@@ -196,14 +198,14 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class ActorContainerClassElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ActorContainerClass");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.ActorContainerClass");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final RuleCall cActorClassParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final RuleCall cSubSystemClassParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
 		
 		//ActorContainerClass:
 		//	ActorClass | SubSystemClass;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//ActorClass | SubSystemClass
 		public Alternatives getAlternatives() { return cAlternatives; }
@@ -216,7 +218,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class VarDeclElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "VarDecl");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.VarDecl");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Assignment cNameAssignment_0 = (Assignment)cGroup.eContents().get(0);
 		private final RuleCall cNameIDTerminalRuleCall_0_0 = (RuleCall)cNameAssignment_0.eContents().get(0);
@@ -227,10 +229,10 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//// **************************************************************
 		//// data class
 		//VarDecl:
-		//	name=ID ":" refType=RefableType;
-		public ParserRule getRule() { return rule; }
+		//	name=ID ':' refType=RefableType;
+		@Override public ParserRule getRule() { return rule; }
 
-		//name=ID ":" refType=RefableType
+		//name=ID ':' refType=RefableType
 		public Group getGroup() { return cGroup; }
 
 		//name=ID
@@ -239,7 +241,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//ID
 		public RuleCall getNameIDTerminalRuleCall_0_0() { return cNameIDTerminalRuleCall_0_0; }
 
-		//":"
+		//':'
 		public Keyword getColonKeyword_1() { return cColonKeyword_1; }
 
 		//refType=RefableType
@@ -250,7 +252,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class RefableTypeElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "RefableType");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.RefableType");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Assignment cTypeAssignment_0 = (Assignment)cGroup.eContents().get(0);
 		private final CrossReference cTypeDataTypeCrossReference_0_0 = (CrossReference)cTypeAssignment_0.eContents().get(0);
@@ -259,10 +261,10 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cRefRefKeyword_1_0 = (Keyword)cRefAssignment_1.eContents().get(0);
 		
 		//RefableType:
-		//	type=[DataType|FQN] ref?="ref"?;
-		public ParserRule getRule() { return rule; }
+		//	type=[DataType|FQN] ref?='ref'?;
+		@Override public ParserRule getRule() { return rule; }
 
-		//type=[DataType|FQN] ref?="ref"?
+		//type=[DataType|FQN] ref?='ref'?
 		public Group getGroup() { return cGroup; }
 
 		//type=[DataType|FQN]
@@ -274,15 +276,15 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//FQN
 		public RuleCall getTypeDataTypeFQNParserRuleCall_0_0_1() { return cTypeDataTypeFQNParserRuleCall_0_0_1; }
 
-		//ref?="ref"?
+		//ref?='ref'?
 		public Assignment getRefAssignment_1() { return cRefAssignment_1; }
 
-		//"ref"
+		//'ref'
 		public Keyword getRefRefKeyword_1_0() { return cRefRefKeyword_1_0; }
 	}
 
 	public class DataTypeElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "DataType");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.DataType");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final RuleCall cPrimitiveTypeParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final RuleCall cEnumerationTypeParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
@@ -290,7 +292,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//DataType:
 		//	PrimitiveType | EnumerationType | ComplexType;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//PrimitiveType | EnumerationType | ComplexType
 		public Alternatives getAlternatives() { return cAlternatives; }
@@ -306,14 +308,14 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class ComplexTypeElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ComplexType");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.ComplexType");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final RuleCall cDataClassParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final RuleCall cExternalTypeParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
 		
 		//ComplexType:
 		//	DataClass | ExternalType;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//DataClass | ExternalType
 		public Alternatives getAlternatives() { return cAlternatives; }
@@ -326,7 +328,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class PrimitiveTypeElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "PrimitiveType");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.PrimitiveType");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cPrimitiveTypeKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -349,15 +351,15 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cDocuDocumentationParserRuleCall_9_0 = (RuleCall)cDocuAssignment_9.eContents().get(0);
 		
 		//PrimitiveType:
-		//	"PrimitiveType" name=ID ":" type=LiteralType "->" targetName=STRING ("(" castName=FQN ")")? "default"
+		//	'PrimitiveType' name=ID ':' type=LiteralType '->' targetName=STRING ('(' castName=FQN ')')? 'default'
 		//	defaultValueLiteral=STRING docu=Documentation?;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
-		//"PrimitiveType" name=ID ":" type=LiteralType "->" targetName=STRING ("(" castName=FQN ")")? "default"
+		//'PrimitiveType' name=ID ':' type=LiteralType '->' targetName=STRING ('(' castName=FQN ')')? 'default'
 		//defaultValueLiteral=STRING docu=Documentation?
 		public Group getGroup() { return cGroup; }
 
-		//"PrimitiveType"
+		//'PrimitiveType'
 		public Keyword getPrimitiveTypeKeyword_0() { return cPrimitiveTypeKeyword_0; }
 
 		//name=ID
@@ -366,7 +368,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//ID
 		public RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }
 
-		//":"
+		//':'
 		public Keyword getColonKeyword_2() { return cColonKeyword_2; }
 
 		//type=LiteralType
@@ -375,7 +377,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//LiteralType
 		public RuleCall getTypeLiteralTypeEnumRuleCall_3_0() { return cTypeLiteralTypeEnumRuleCall_3_0; }
 
-		//"->"
+		//'->'
 		public Keyword getHyphenMinusGreaterThanSignKeyword_4() { return cHyphenMinusGreaterThanSignKeyword_4; }
 
 		//targetName=STRING
@@ -384,10 +386,10 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//STRING
 		public RuleCall getTargetNameSTRINGTerminalRuleCall_5_0() { return cTargetNameSTRINGTerminalRuleCall_5_0; }
 
-		//("(" castName=FQN ")")?
+		//('(' castName=FQN ')')?
 		public Group getGroup_6() { return cGroup_6; }
 
-		//"("
+		//'('
 		public Keyword getLeftParenthesisKeyword_6_0() { return cLeftParenthesisKeyword_6_0; }
 
 		//castName=FQN
@@ -396,10 +398,10 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//FQN
 		public RuleCall getCastNameFQNParserRuleCall_6_1_0() { return cCastNameFQNParserRuleCall_6_1_0; }
 
-		//")"
+		//')'
 		public Keyword getRightParenthesisKeyword_6_2() { return cRightParenthesisKeyword_6_2; }
 
-		//"default"
+		//'default'
 		public Keyword getDefaultKeyword_7() { return cDefaultKeyword_7; }
 
 		//defaultValueLiteral=STRING
@@ -416,7 +418,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class EnumerationTypeElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "EnumerationType");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.EnumerationType");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cEnumerationKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -439,15 +441,16 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cRightCurlyBracketKeyword_6 = (Keyword)cGroup.eContents().get(6);
 		
 		//EnumerationType:
-		//	"Enumeration" name=ID docu=Documentation? ("of" primitiveType=[PrimitiveType|FQN])? "{" (literals+=EnumLiteral (","
-		//	literals+=EnumLiteral)*)? "}";
-		public ParserRule getRule() { return rule; }
+		//	'Enumeration' name=ID docu=Documentation? ('of' primitiveType=[PrimitiveType|FQN])? '{' (literals+=EnumLiteral (','
+		//	literals+=EnumLiteral)*)?
+		//	'}';
+		@Override public ParserRule getRule() { return rule; }
 
-		//"Enumeration" name=ID docu=Documentation? ("of" primitiveType=[PrimitiveType|FQN])? "{" (literals+=EnumLiteral (","
-		//literals+=EnumLiteral)*)? "}"
+		//'Enumeration' name=ID docu=Documentation? ('of' primitiveType=[PrimitiveType|FQN])? '{' (literals+=EnumLiteral (','
+		//literals+=EnumLiteral)*)? '}'
 		public Group getGroup() { return cGroup; }
 
-		//"Enumeration"
+		//'Enumeration'
 		public Keyword getEnumerationKeyword_0() { return cEnumerationKeyword_0; }
 
 		//name=ID
@@ -462,10 +465,10 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//Documentation
 		public RuleCall getDocuDocumentationParserRuleCall_2_0() { return cDocuDocumentationParserRuleCall_2_0; }
 
-		//("of" primitiveType=[PrimitiveType|FQN])?
+		//('of' primitiveType=[PrimitiveType|FQN])?
 		public Group getGroup_3() { return cGroup_3; }
 
-		//"of"
+		//'of'
 		public Keyword getOfKeyword_3_0() { return cOfKeyword_3_0; }
 
 		//primitiveType=[PrimitiveType|FQN]
@@ -477,10 +480,10 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//FQN
 		public RuleCall getPrimitiveTypePrimitiveTypeFQNParserRuleCall_3_1_0_1() { return cPrimitiveTypePrimitiveTypeFQNParserRuleCall_3_1_0_1; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_4() { return cLeftCurlyBracketKeyword_4; }
 
-		//(literals+=EnumLiteral ("," literals+=EnumLiteral)*)?
+		//(literals+=EnumLiteral (',' literals+=EnumLiteral)*)?
 		public Group getGroup_5() { return cGroup_5; }
 
 		//literals+=EnumLiteral
@@ -489,10 +492,10 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//EnumLiteral
 		public RuleCall getLiteralsEnumLiteralParserRuleCall_5_0_0() { return cLiteralsEnumLiteralParserRuleCall_5_0_0; }
 
-		//("," literals+=EnumLiteral)*
+		//(',' literals+=EnumLiteral)*
 		public Group getGroup_5_1() { return cGroup_5_1; }
 
-		//","
+		//','
 		public Keyword getCommaKeyword_5_1_0() { return cCommaKeyword_5_1_0; }
 
 		//literals+=EnumLiteral
@@ -501,12 +504,12 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//EnumLiteral
 		public RuleCall getLiteralsEnumLiteralParserRuleCall_5_1_1_0() { return cLiteralsEnumLiteralParserRuleCall_5_1_1_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_6() { return cRightCurlyBracketKeyword_6; }
 	}
 
 	public class EnumLiteralElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "EnumLiteral");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.EnumLiteral");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Assignment cNameAssignment_0 = (Assignment)cGroup.eContents().get(0);
 		private final RuleCall cNameIDTerminalRuleCall_0_0 = (RuleCall)cNameAssignment_0.eContents().get(0);
@@ -516,10 +519,10 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cLiteralIntLiteralParserRuleCall_1_1_0 = (RuleCall)cLiteralAssignment_1_1.eContents().get(0);
 		
 		//EnumLiteral:
-		//	name=ID ("=" literal=IntLiteral)?;
-		public ParserRule getRule() { return rule; }
+		//	name=ID ('=' literal=IntLiteral)?;
+		@Override public ParserRule getRule() { return rule; }
 
-		//name=ID ("=" literal=IntLiteral)?
+		//name=ID ('=' literal=IntLiteral)?
 		public Group getGroup() { return cGroup; }
 
 		//name=ID
@@ -528,10 +531,10 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//ID
 		public RuleCall getNameIDTerminalRuleCall_0_0() { return cNameIDTerminalRuleCall_0_0; }
 
-		//("=" literal=IntLiteral)?
+		//('=' literal=IntLiteral)?
 		public Group getGroup_1() { return cGroup_1; }
 
-		//"="
+		//'='
 		public Keyword getEqualsSignKeyword_1_0() { return cEqualsSignKeyword_1_0; }
 
 		//literal=IntLiteral
@@ -542,7 +545,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class ExternalTypeElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ExternalType");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.ExternalType");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cExternalTypeKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -558,13 +561,13 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cDocuDocumentationParserRuleCall_5_0 = (RuleCall)cDocuAssignment_5.eContents().get(0);
 		
 		//ExternalType:
-		//	"ExternalType" name=ID "->" targetName=STRING ("default" defaultValueLiteral=STRING)? docu=Documentation?;
-		public ParserRule getRule() { return rule; }
+		//	'ExternalType' name=ID '->' targetName=STRING ('default' defaultValueLiteral=STRING)? docu=Documentation?;
+		@Override public ParserRule getRule() { return rule; }
 
-		//"ExternalType" name=ID "->" targetName=STRING ("default" defaultValueLiteral=STRING)? docu=Documentation?
+		//'ExternalType' name=ID '->' targetName=STRING ('default' defaultValueLiteral=STRING)? docu=Documentation?
 		public Group getGroup() { return cGroup; }
 
-		//"ExternalType"
+		//'ExternalType'
 		public Keyword getExternalTypeKeyword_0() { return cExternalTypeKeyword_0; }
 
 		//name=ID
@@ -573,7 +576,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//ID
 		public RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }
 
-		//"->"
+		//'->'
 		public Keyword getHyphenMinusGreaterThanSignKeyword_2() { return cHyphenMinusGreaterThanSignKeyword_2; }
 
 		//targetName=STRING
@@ -582,10 +585,10 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//STRING
 		public RuleCall getTargetNameSTRINGTerminalRuleCall_3_0() { return cTargetNameSTRINGTerminalRuleCall_3_0; }
 
-		//("default" defaultValueLiteral=STRING)?
+		//('default' defaultValueLiteral=STRING)?
 		public Group getGroup_4() { return cGroup_4; }
 
-		//"default"
+		//'default'
 		public Keyword getDefaultKeyword_4_0() { return cDefaultKeyword_4_0; }
 
 		//defaultValueLiteral=STRING
@@ -602,7 +605,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class DataClassElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "DataClass");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.DataClass");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cDataClassKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -640,17 +643,18 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//// TODOHRR: define detail level language?
 		//DataClass:
-		//	"DataClass" name=ID docu=Documentation? ("extends" base=[DataClass|FQN])? "{" annotations+=Annotation* ("usercode1"
-		//	userCode1=DetailCode)? ("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)?
-		//	(operations+=StandardOperation | structors+=ClassStructor | attributes+=Attribute)* "}";
-		public ParserRule getRule() { return rule; }
-
-		//"DataClass" name=ID docu=Documentation? ("extends" base=[DataClass|FQN])? "{" annotations+=Annotation* ("usercode1"
-		//userCode1=DetailCode)? ("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)?
-		//(operations+=StandardOperation | structors+=ClassStructor | attributes+=Attribute)* "}"
+		//	'DataClass' name=ID docu=Documentation? ('extends' base=[DataClass|FQN])? '{'
+		//	annotations+=Annotation* ('usercode1' userCode1=DetailCode)? ('usercode2' userCode2=DetailCode)? ('usercode3'
+		//	userCode3=DetailCode)? (operations+=StandardOperation | structors+=ClassStructor | attributes+=Attribute)*
+		//	'}';
+		@Override public ParserRule getRule() { return rule; }
+
+		//'DataClass' name=ID docu=Documentation? ('extends' base=[DataClass|FQN])? '{' annotations+=Annotation* ('usercode1'
+		//userCode1=DetailCode)? ('usercode2' userCode2=DetailCode)? ('usercode3' userCode3=DetailCode)?
+		//(operations+=StandardOperation | structors+=ClassStructor | attributes+=Attribute)* '}'
 		public Group getGroup() { return cGroup; }
 
-		//"DataClass"
+		//'DataClass'
 		public Keyword getDataClassKeyword_0() { return cDataClassKeyword_0; }
 
 		//name=ID
@@ -665,10 +669,10 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//Documentation
 		public RuleCall getDocuDocumentationParserRuleCall_2_0() { return cDocuDocumentationParserRuleCall_2_0; }
 
-		//("extends" base=[DataClass|FQN])?
+		//('extends' base=[DataClass|FQN])?
 		public Group getGroup_3() { return cGroup_3; }
 
-		//"extends"
+		//'extends'
 		public Keyword getExtendsKeyword_3_0() { return cExtendsKeyword_3_0; }
 
 		//base=[DataClass|FQN]
@@ -680,7 +684,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//FQN
 		public RuleCall getBaseDataClassFQNParserRuleCall_3_1_0_1() { return cBaseDataClassFQNParserRuleCall_3_1_0_1; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_4() { return cLeftCurlyBracketKeyword_4; }
 
 		//annotations+=Annotation*
@@ -689,10 +693,10 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//Annotation
 		public RuleCall getAnnotationsAnnotationParserRuleCall_5_0() { return cAnnotationsAnnotationParserRuleCall_5_0; }
 
-		//("usercode1" userCode1=DetailCode)?
+		//('usercode1' userCode1=DetailCode)?
 		public Group getGroup_6() { return cGroup_6; }
 
-		//"usercode1"
+		//'usercode1'
 		public Keyword getUsercode1Keyword_6_0() { return cUsercode1Keyword_6_0; }
 
 		//userCode1=DetailCode
@@ -701,10 +705,10 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//DetailCode
 		public RuleCall getUserCode1DetailCodeParserRuleCall_6_1_0() { return cUserCode1DetailCodeParserRuleCall_6_1_0; }
 
-		//("usercode2" userCode2=DetailCode)?
+		//('usercode2' userCode2=DetailCode)?
 		public Group getGroup_7() { return cGroup_7; }
 
-		//"usercode2"
+		//'usercode2'
 		public Keyword getUsercode2Keyword_7_0() { return cUsercode2Keyword_7_0; }
 
 		//userCode2=DetailCode
@@ -713,10 +717,10 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//DetailCode
 		public RuleCall getUserCode2DetailCodeParserRuleCall_7_1_0() { return cUserCode2DetailCodeParserRuleCall_7_1_0; }
 
-		//("usercode3" userCode3=DetailCode)?
+		//('usercode3' userCode3=DetailCode)?
 		public Group getGroup_8() { return cGroup_8; }
 
-		//"usercode3"
+		//'usercode3'
 		public Keyword getUsercode3Keyword_8_0() { return cUsercode3Keyword_8_0; }
 
 		//userCode3=DetailCode
@@ -746,12 +750,12 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//Attribute
 		public RuleCall getAttributesAttributeParserRuleCall_9_2_0() { return cAttributesAttributeParserRuleCall_9_2_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_10() { return cRightCurlyBracketKeyword_10; }
 	}
 
 	public class AttributeElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Attribute");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.Attribute");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cAttributeKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -772,13 +776,13 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cDocuDocumentationParserRuleCall_6_0 = (RuleCall)cDocuAssignment_6.eContents().get(0);
 		
 		//Attribute:
-		//	"Attribute" name=ID ("[" size=INT "]")? ":" type=RefableType? ("=" defaultValueLiteral=STRING)? docu=Documentation?;
-		public ParserRule getRule() { return rule; }
+		//	'Attribute' name=ID ('[' size=INT ']')? ':' type=RefableType? ('=' defaultValueLiteral=STRING)? docu=Documentation?;
+		@Override public ParserRule getRule() { return rule; }
 
-		//"Attribute" name=ID ("[" size=INT "]")? ":" type=RefableType? ("=" defaultValueLiteral=STRING)? docu=Documentation?
+		//'Attribute' name=ID ('[' size=INT ']')? ':' type=RefableType? ('=' defaultValueLiteral=STRING)? docu=Documentation?
 		public Group getGroup() { return cGroup; }
 
-		//"Attribute"
+		//'Attribute'
 		public Keyword getAttributeKeyword_0() { return cAttributeKeyword_0; }
 
 		//name=ID
@@ -787,10 +791,10 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//ID
 		public RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }
 
-		//("[" size=INT "]")?
+		//('[' size=INT ']')?
 		public Group getGroup_2() { return cGroup_2; }
 
-		//"["
+		//'['
 		public Keyword getLeftSquareBracketKeyword_2_0() { return cLeftSquareBracketKeyword_2_0; }
 
 		//size=INT
@@ -799,10 +803,10 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//INT
 		public RuleCall getSizeINTTerminalRuleCall_2_1_0() { return cSizeINTTerminalRuleCall_2_1_0; }
 
-		//"]"
+		//']'
 		public Keyword getRightSquareBracketKeyword_2_2() { return cRightSquareBracketKeyword_2_2; }
 
-		//":"
+		//':'
 		public Keyword getColonKeyword_3() { return cColonKeyword_3; }
 
 		//type=RefableType?
@@ -811,10 +815,10 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//RefableType
 		public RuleCall getTypeRefableTypeParserRuleCall_4_0() { return cTypeRefableTypeParserRuleCall_4_0; }
 
-		//("=" defaultValueLiteral=STRING)?
+		//('=' defaultValueLiteral=STRING)?
 		public Group getGroup_5() { return cGroup_5; }
 
-		//"="
+		//'='
 		public Keyword getEqualsSignKeyword_5_0() { return cEqualsSignKeyword_5_0; }
 
 		//defaultValueLiteral=STRING
@@ -831,14 +835,14 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class OperationElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Operation");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.Operation");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final RuleCall cStandardOperationParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final RuleCall cPortOperationParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
 		
 		//Operation:
 		//	StandardOperation | PortOperation;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//StandardOperation | PortOperation
 		public Alternatives getAlternatives() { return cAlternatives; }
@@ -851,7 +855,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class StandardOperationElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "StandardOperation");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.StandardOperation");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Assignment cOverrideAssignment_0 = (Assignment)cGroup.eContents().get(0);
 		private final Keyword cOverrideOverrideKeyword_0_0 = (Keyword)cOverrideAssignment_0.eContents().get(0);
@@ -879,21 +883,23 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cDetailCodeDetailCodeParserRuleCall_8_0 = (RuleCall)cDetailCodeAssignment_8.eContents().get(0);
 		
 		//StandardOperation:
-		//	override?="override"? "Operation" name=ID "(" (arguments+=VarDecl ("," arguments+=VarDecl)*)? ")" (":" ("void" |
-		//	returnType=RefableType))? docu=Documentation? detailCode=DetailCode;
-		public ParserRule getRule() { return rule; }
+		//	override?='override'? 'Operation' name=ID '(' (arguments+=VarDecl (',' arguments+=VarDecl)*)? ')' (':' ('void' |
+		//	returnType=RefableType))?
+		//	docu=Documentation?
+		//	detailCode=DetailCode;
+		@Override public ParserRule getRule() { return rule; }
 
-		//override?="override"? "Operation" name=ID "(" (arguments+=VarDecl ("," arguments+=VarDecl)*)? ")" (":" ("void" |
+		//override?='override'? 'Operation' name=ID '(' (arguments+=VarDecl (',' arguments+=VarDecl)*)? ')' (':' ('void' |
 		//returnType=RefableType))? docu=Documentation? detailCode=DetailCode
 		public Group getGroup() { return cGroup; }
 
-		//override?="override"?
+		//override?='override'?
 		public Assignment getOverrideAssignment_0() { return cOverrideAssignment_0; }
 
-		//"override"
+		//'override'
 		public Keyword getOverrideOverrideKeyword_0_0() { return cOverrideOverrideKeyword_0_0; }
 
-		//"Operation"
+		//'Operation'
 		public Keyword getOperationKeyword_1() { return cOperationKeyword_1; }
 
 		//name=ID
@@ -902,10 +908,10 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//ID
 		public RuleCall getNameIDTerminalRuleCall_2_0() { return cNameIDTerminalRuleCall_2_0; }
 
-		//"("
+		//'('
 		public Keyword getLeftParenthesisKeyword_3() { return cLeftParenthesisKeyword_3; }
 
-		//(arguments+=VarDecl ("," arguments+=VarDecl)*)?
+		//(arguments+=VarDecl (',' arguments+=VarDecl)*)?
 		public Group getGroup_4() { return cGroup_4; }
 
 		//arguments+=VarDecl
@@ -914,10 +920,10 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//VarDecl
 		public RuleCall getArgumentsVarDeclParserRuleCall_4_0_0() { return cArgumentsVarDeclParserRuleCall_4_0_0; }
 
-		//("," arguments+=VarDecl)*
+		//(',' arguments+=VarDecl)*
 		public Group getGroup_4_1() { return cGroup_4_1; }
 
-		//","
+		//','
 		public Keyword getCommaKeyword_4_1_0() { return cCommaKeyword_4_1_0; }
 
 		//arguments+=VarDecl
@@ -926,19 +932,19 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//VarDecl
 		public RuleCall getArgumentsVarDeclParserRuleCall_4_1_1_0() { return cArgumentsVarDeclParserRuleCall_4_1_1_0; }
 
-		//")"
+		//')'
 		public Keyword getRightParenthesisKeyword_5() { return cRightParenthesisKeyword_5; }
 
-		//(":" ("void" | returnType=RefableType))?
+		//(':' ('void' | returnType=RefableType))?
 		public Group getGroup_6() { return cGroup_6; }
 
-		//":"
+		//':'
 		public Keyword getColonKeyword_6_0() { return cColonKeyword_6_0; }
 
-		//"void" | returnType=RefableType
+		//'void' | returnType=RefableType
 		public Alternatives getAlternatives_6_1() { return cAlternatives_6_1; }
 
-		//"void"
+		//'void'
 		public Keyword getVoidKeyword_6_1_0() { return cVoidKeyword_6_1_0; }
 
 		//returnType=RefableType
@@ -961,7 +967,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class PortOperationElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "PortOperation");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.PortOperation");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cOperationKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -993,15 +999,17 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cDetailCodeDetailCodeParserRuleCall_7_0 = (RuleCall)cDetailCodeAssignment_7.eContents().get(0);
 		
 		//PortOperation:
-		//	"Operation" name=ID "(" (arguments+=VarDecl ("," arguments+=VarDecl)*)? ")" (":" ("void" | returnType=RefableType) |
-		//	"sends" sendsMsg=[Message])? docu=Documentation? detailCode=DetailCode;
-		public ParserRule getRule() { return rule; }
-
-		//"Operation" name=ID "(" (arguments+=VarDecl ("," arguments+=VarDecl)*)? ")" (":" ("void" | returnType=RefableType) |
-		//"sends" sendsMsg=[Message])? docu=Documentation? detailCode=DetailCode
+		//	'Operation' name=ID '(' (arguments+=VarDecl (',' arguments+=VarDecl)*)? ')' (':' ('void' | returnType=RefableType) |
+		//	'sends' sendsMsg=[Message])?
+		//	docu=Documentation?
+		//	detailCode=DetailCode;
+		@Override public ParserRule getRule() { return rule; }
+
+		//'Operation' name=ID '(' (arguments+=VarDecl (',' arguments+=VarDecl)*)? ')' (':' ('void' | returnType=RefableType) |
+		//'sends' sendsMsg=[Message])? docu=Documentation? detailCode=DetailCode
 		public Group getGroup() { return cGroup; }
 
-		//"Operation"
+		//'Operation'
 		public Keyword getOperationKeyword_0() { return cOperationKeyword_0; }
 
 		//name=ID
@@ -1010,10 +1018,10 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//ID
 		public RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }
 
-		//"("
+		//'('
 		public Keyword getLeftParenthesisKeyword_2() { return cLeftParenthesisKeyword_2; }
 
-		//(arguments+=VarDecl ("," arguments+=VarDecl)*)?
+		//(arguments+=VarDecl (',' arguments+=VarDecl)*)?
 		public Group getGroup_3() { return cGroup_3; }
 
 		//arguments+=VarDecl
@@ -1022,10 +1030,10 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//VarDecl
 		public RuleCall getArgumentsVarDeclParserRuleCall_3_0_0() { return cArgumentsVarDeclParserRuleCall_3_0_0; }
 
-		//("," arguments+=VarDecl)*
+		//(',' arguments+=VarDecl)*
 		public Group getGroup_3_1() { return cGroup_3_1; }
 
-		//","
+		//','
 		public Keyword getCommaKeyword_3_1_0() { return cCommaKeyword_3_1_0; }
 
 		//arguments+=VarDecl
@@ -1034,22 +1042,22 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//VarDecl
 		public RuleCall getArgumentsVarDeclParserRuleCall_3_1_1_0() { return cArgumentsVarDeclParserRuleCall_3_1_1_0; }
 
-		//")"
+		//')'
 		public Keyword getRightParenthesisKeyword_4() { return cRightParenthesisKeyword_4; }
 
-		//(":" ("void" | returnType=RefableType) | "sends" sendsMsg=[Message])?
+		//(':' ('void' | returnType=RefableType) | 'sends' sendsMsg=[Message])?
 		public Alternatives getAlternatives_5() { return cAlternatives_5; }
 
-		//":" ("void" | returnType=RefableType)
+		//':' ('void' | returnType=RefableType)
 		public Group getGroup_5_0() { return cGroup_5_0; }
 
-		//":"
+		//':'
 		public Keyword getColonKeyword_5_0_0() { return cColonKeyword_5_0_0; }
 
-		//"void" | returnType=RefableType
+		//'void' | returnType=RefableType
 		public Alternatives getAlternatives_5_0_1() { return cAlternatives_5_0_1; }
 
-		//"void"
+		//'void'
 		public Keyword getVoidKeyword_5_0_1_0() { return cVoidKeyword_5_0_1_0; }
 
 		//returnType=RefableType
@@ -1058,10 +1066,10 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//RefableType
 		public RuleCall getReturnTypeRefableTypeParserRuleCall_5_0_1_1_0() { return cReturnTypeRefableTypeParserRuleCall_5_0_1_1_0; }
 
-		//"sends" sendsMsg=[Message]
+		//'sends' sendsMsg=[Message]
 		public Group getGroup_5_1() { return cGroup_5_1; }
 
-		//"sends"
+		//'sends'
 		public Keyword getSendsKeyword_5_1_0() { return cSendsKeyword_5_1_0; }
 
 		//sendsMsg=[Message]
@@ -1087,7 +1095,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class ClassStructorElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ClassStructor");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.ClassStructor");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Assignment cNameAssignment_0 = (Assignment)cGroup.eContents().get(0);
 		private final Alternatives cNameAlternatives_0_0 = (Alternatives)cNameAssignment_0.eContents().get(0);
@@ -1097,22 +1105,22 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cDetailCodeDetailCodeParserRuleCall_1_0 = (RuleCall)cDetailCodeAssignment_1.eContents().get(0);
 		
 		//ClassStructor:
-		//	name=("ctor" | "dtor") detailCode=DetailCode;
-		public ParserRule getRule() { return rule; }
+		//	name=('ctor' | 'dtor') detailCode=DetailCode;
+		@Override public ParserRule getRule() { return rule; }
 
-		//name=("ctor" | "dtor") detailCode=DetailCode
+		//name=('ctor' | 'dtor') detailCode=DetailCode
 		public Group getGroup() { return cGroup; }
 
-		//name=("ctor" | "dtor")
+		//name=('ctor' | 'dtor')
 		public Assignment getNameAssignment_0() { return cNameAssignment_0; }
 
-		//"ctor" | "dtor"
+		//('ctor' | 'dtor')
 		public Alternatives getNameAlternatives_0_0() { return cNameAlternatives_0_0; }
 
-		//"ctor"
+		//'ctor'
 		public Keyword getNameCtorKeyword_0_0_0() { return cNameCtorKeyword_0_0_0; }
 
-		//"dtor"
+		//'dtor'
 		public Keyword getNameDtorKeyword_0_0_1() { return cNameDtorKeyword_0_0_1; }
 
 		//detailCode=DetailCode
@@ -1123,14 +1131,14 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class GeneralProtocolClassElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "GeneralProtocolClass");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.GeneralProtocolClass");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final RuleCall cProtocolClassParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final RuleCall cCompoundProtocolClassParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
 		
 		//GeneralProtocolClass:
 		//	ProtocolClass | CompoundProtocolClass;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//ProtocolClass | CompoundProtocolClass
 		public Alternatives getAlternatives() { return cAlternatives; }
@@ -1143,7 +1151,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class ProtocolClassElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ProtocolClass");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.ProtocolClass");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Assignment cCommTypeAssignment_0 = (Assignment)cGroup.eContents().get(0);
 		private final RuleCall cCommTypeCommunicationTypeEnumRuleCall_0_0 = (RuleCall)cCommTypeAssignment_0.eContents().get(0);
@@ -1199,18 +1207,20 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cRightCurlyBracketKeyword_15 = (Keyword)cGroup.eContents().get(15);
 		
 		//ProtocolClass:
-		//	commType=CommunicationType? "ProtocolClass" name=ID docu=Documentation? ("extends" base=[ProtocolClass|FQN])? "{"
-		//	annotations+=Annotation* ("usercode1" userCode1=DetailCode)? ("usercode2" userCode2=DetailCode)? ("usercode3"
-		//	userCode3=DetailCode)? ("incoming" "{" incomingMessages+=Message* "}")? ("outgoing" "{" outgoingMessages+=Message*
-		//	"}")? ("regular" "PortClass" regular=PortClass)? ("conjugated" "PortClass" conjugated=PortClass)?
-		//	semantics=ProtocolSemantics? "}";
-		public ParserRule getRule() { return rule; }
-
-		//commType=CommunicationType? "ProtocolClass" name=ID docu=Documentation? ("extends" base=[ProtocolClass|FQN])? "{"
-		//annotations+=Annotation* ("usercode1" userCode1=DetailCode)? ("usercode2" userCode2=DetailCode)? ("usercode3"
-		//userCode3=DetailCode)? ("incoming" "{" incomingMessages+=Message* "}")? ("outgoing" "{" outgoingMessages+=Message*
-		//"}")? ("regular" "PortClass" regular=PortClass)? ("conjugated" "PortClass" conjugated=PortClass)?
-		//semantics=ProtocolSemantics? "}"
+		//	commType=CommunicationType?
+		//	'ProtocolClass' name=ID docu=Documentation? ('extends' base=[ProtocolClass|FQN])? '{'
+		//	annotations+=Annotation* ('usercode1' userCode1=DetailCode)? ('usercode2' userCode2=DetailCode)? ('usercode3'
+		//	userCode3=DetailCode)? ('incoming' '{' incomingMessages+=Message* '}')? ('outgoing' '{' outgoingMessages+=Message*
+		//	'}')? ('regular' 'PortClass' regular=PortClass)? ('conjugated' 'PortClass' conjugated=PortClass)?
+		//	semantics=ProtocolSemantics?
+		//	'}';
+		@Override public ParserRule getRule() { return rule; }
+
+		//commType=CommunicationType? 'ProtocolClass' name=ID docu=Documentation? ('extends' base=[ProtocolClass|FQN])? '{'
+		//annotations+=Annotation* ('usercode1' userCode1=DetailCode)? ('usercode2' userCode2=DetailCode)? ('usercode3'
+		//userCode3=DetailCode)? ('incoming' '{' incomingMessages+=Message* '}')? ('outgoing' '{' outgoingMessages+=Message*
+		//'}')? ('regular' 'PortClass' regular=PortClass)? ('conjugated' 'PortClass' conjugated=PortClass)?
+		//semantics=ProtocolSemantics? '}'
 		public Group getGroup() { return cGroup; }
 
 		//commType=CommunicationType?
@@ -1219,7 +1229,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//CommunicationType
 		public RuleCall getCommTypeCommunicationTypeEnumRuleCall_0_0() { return cCommTypeCommunicationTypeEnumRuleCall_0_0; }
 
-		//"ProtocolClass"
+		//'ProtocolClass'
 		public Keyword getProtocolClassKeyword_1() { return cProtocolClassKeyword_1; }
 
 		//name=ID
@@ -1234,10 +1244,10 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//Documentation
 		public RuleCall getDocuDocumentationParserRuleCall_3_0() { return cDocuDocumentationParserRuleCall_3_0; }
 
-		//("extends" base=[ProtocolClass|FQN])?
+		//('extends' base=[ProtocolClass|FQN])?
 		public Group getGroup_4() { return cGroup_4; }
 
-		//"extends"
+		//'extends'
 		public Keyword getExtendsKeyword_4_0() { return cExtendsKeyword_4_0; }
 
 		//base=[ProtocolClass|FQN]
@@ -1249,7 +1259,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//FQN
 		public RuleCall getBaseProtocolClassFQNParserRuleCall_4_1_0_1() { return cBaseProtocolClassFQNParserRuleCall_4_1_0_1; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_5() { return cLeftCurlyBracketKeyword_5; }
 
 		//annotations+=Annotation*
@@ -1258,10 +1268,10 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//Annotation
 		public RuleCall getAnnotationsAnnotationParserRuleCall_6_0() { return cAnnotationsAnnotationParserRuleCall_6_0; }
 
-		//("usercode1" userCode1=DetailCode)?
+		//('usercode1' userCode1=DetailCode)?
 		public Group getGroup_7() { return cGroup_7; }
 
-		//"usercode1"
+		//'usercode1'
 		public Keyword getUsercode1Keyword_7_0() { return cUsercode1Keyword_7_0; }
 
 		//userCode1=DetailCode
@@ -1270,10 +1280,10 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//DetailCode
 		public RuleCall getUserCode1DetailCodeParserRuleCall_7_1_0() { return cUserCode1DetailCodeParserRuleCall_7_1_0; }
 
-		//("usercode2" userCode2=DetailCode)?
+		//('usercode2' userCode2=DetailCode)?
 		public Group getGroup_8() { return cGroup_8; }
 
-		//"usercode2"
+		//'usercode2'
 		public Keyword getUsercode2Keyword_8_0() { return cUsercode2Keyword_8_0; }
 
 		//userCode2=DetailCode
@@ -1282,10 +1292,10 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//DetailCode
 		public RuleCall getUserCode2DetailCodeParserRuleCall_8_1_0() { return cUserCode2DetailCodeParserRuleCall_8_1_0; }
 
-		//("usercode3" userCode3=DetailCode)?
+		//('usercode3' userCode3=DetailCode)?
 		public Group getGroup_9() { return cGroup_9; }
 
-		//"usercode3"
+		//'usercode3'
 		public Keyword getUsercode3Keyword_9_0() { return cUsercode3Keyword_9_0; }
 
 		//userCode3=DetailCode
@@ -1294,13 +1304,13 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//DetailCode
 		public RuleCall getUserCode3DetailCodeParserRuleCall_9_1_0() { return cUserCode3DetailCodeParserRuleCall_9_1_0; }
 
-		//("incoming" "{" incomingMessages+=Message* "}")?
+		//('incoming' '{' incomingMessages+=Message* '}')?
 		public Group getGroup_10() { return cGroup_10; }
 
-		//"incoming"
+		//'incoming'
 		public Keyword getIncomingKeyword_10_0() { return cIncomingKeyword_10_0; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_10_1() { return cLeftCurlyBracketKeyword_10_1; }
 
 		//incomingMessages+=Message*
@@ -1309,16 +1319,16 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//Message
 		public RuleCall getIncomingMessagesMessageParserRuleCall_10_2_0() { return cIncomingMessagesMessageParserRuleCall_10_2_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_10_3() { return cRightCurlyBracketKeyword_10_3; }
 
-		//("outgoing" "{" outgoingMessages+=Message* "}")?
+		//('outgoing' '{' outgoingMessages+=Message* '}')?
 		public Group getGroup_11() { return cGroup_11; }
 
-		//"outgoing"
+		//'outgoing'
 		public Keyword getOutgoingKeyword_11_0() { return cOutgoingKeyword_11_0; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_11_1() { return cLeftCurlyBracketKeyword_11_1; }
 
 		//outgoingMessages+=Message*
@@ -1327,16 +1337,16 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//Message
 		public RuleCall getOutgoingMessagesMessageParserRuleCall_11_2_0() { return cOutgoingMessagesMessageParserRuleCall_11_2_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_11_3() { return cRightCurlyBracketKeyword_11_3; }
 
-		//("regular" "PortClass" regular=PortClass)?
+		//('regular' 'PortClass' regular=PortClass)?
 		public Group getGroup_12() { return cGroup_12; }
 
-		//"regular"
+		//'regular'
 		public Keyword getRegularKeyword_12_0() { return cRegularKeyword_12_0; }
 
-		//"PortClass"
+		//'PortClass'
 		public Keyword getPortClassKeyword_12_1() { return cPortClassKeyword_12_1; }
 
 		//regular=PortClass
@@ -1345,13 +1355,13 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//PortClass
 		public RuleCall getRegularPortClassParserRuleCall_12_2_0() { return cRegularPortClassParserRuleCall_12_2_0; }
 
-		//("conjugated" "PortClass" conjugated=PortClass)?
+		//('conjugated' 'PortClass' conjugated=PortClass)?
 		public Group getGroup_13() { return cGroup_13; }
 
-		//"conjugated"
+		//'conjugated'
 		public Keyword getConjugatedKeyword_13_0() { return cConjugatedKeyword_13_0; }
 
-		//"PortClass"
+		//'PortClass'
 		public Keyword getPortClassKeyword_13_1() { return cPortClassKeyword_13_1; }
 
 		//conjugated=PortClass
@@ -1366,12 +1376,12 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//ProtocolSemantics
 		public RuleCall getSemanticsProtocolSemanticsParserRuleCall_14_0() { return cSemanticsProtocolSemanticsParserRuleCall_14_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_15() { return cRightCurlyBracketKeyword_15; }
 	}
 
 	public class CompoundProtocolClassElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "CompoundProtocolClass");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.CompoundProtocolClass");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cCompoundProtocolClassKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -1386,13 +1396,16 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cRightCurlyBracketKeyword_6 = (Keyword)cGroup.eContents().get(6);
 		
 		//CompoundProtocolClass:
-		//	"CompoundProtocolClass" name=ID docu=Documentation? "{" annotations+=Annotation* subProtocols+=SubProtocol* "}";
-		public ParserRule getRule() { return rule; }
+		//	'CompoundProtocolClass' name=ID docu=Documentation? '{'
+		//	annotations+=Annotation*
+		//	subProtocols+=SubProtocol*
+		//	'}';
+		@Override public ParserRule getRule() { return rule; }
 
-		//"CompoundProtocolClass" name=ID docu=Documentation? "{" annotations+=Annotation* subProtocols+=SubProtocol* "}"
+		//'CompoundProtocolClass' name=ID docu=Documentation? '{' annotations+=Annotation* subProtocols+=SubProtocol* '}'
 		public Group getGroup() { return cGroup; }
 
-		//"CompoundProtocolClass"
+		//'CompoundProtocolClass'
 		public Keyword getCompoundProtocolClassKeyword_0() { return cCompoundProtocolClassKeyword_0; }
 
 		//name=ID
@@ -1407,7 +1420,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//Documentation
 		public RuleCall getDocuDocumentationParserRuleCall_2_0() { return cDocuDocumentationParserRuleCall_2_0; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_3() { return cLeftCurlyBracketKeyword_3; }
 
 		//annotations+=Annotation*
@@ -1422,12 +1435,12 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//SubProtocol
 		public RuleCall getSubProtocolsSubProtocolParserRuleCall_5_0() { return cSubProtocolsSubProtocolParserRuleCall_5_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_6() { return cRightCurlyBracketKeyword_6; }
 	}
 
 	public class SubProtocolElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "SubProtocol");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.SubProtocol");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cSubProtocolKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -1438,13 +1451,13 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cProtocolGeneralProtocolClassFQNParserRuleCall_3_0_1 = (RuleCall)cProtocolGeneralProtocolClassCrossReference_3_0.eContents().get(1);
 		
 		//SubProtocol:
-		//	"SubProtocol" name=ID ":" protocol=[GeneralProtocolClass|FQN];
-		public ParserRule getRule() { return rule; }
+		//	'SubProtocol' name=ID ':' protocol=[GeneralProtocolClass|FQN];
+		@Override public ParserRule getRule() { return rule; }
 
-		//"SubProtocol" name=ID ":" protocol=[GeneralProtocolClass|FQN]
+		//'SubProtocol' name=ID ':' protocol=[GeneralProtocolClass|FQN]
 		public Group getGroup() { return cGroup; }
 
-		//"SubProtocol"
+		//'SubProtocol'
 		public Keyword getSubProtocolKeyword_0() { return cSubProtocolKeyword_0; }
 
 		//name=ID
@@ -1453,7 +1466,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//ID
 		public RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }
 
-		//":"
+		//':'
 		public Keyword getColonKeyword_2() { return cColonKeyword_2; }
 
 		//protocol=[GeneralProtocolClass|FQN]
@@ -1467,7 +1480,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class MessageElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Message");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.Message");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Assignment cPrivAssignment_0 = (Assignment)cGroup.eContents().get(0);
 		private final Keyword cPrivPrivateKeyword_0_0 = (Keyword)cPrivAssignment_0.eContents().get(0);
@@ -1482,19 +1495,20 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cDocuDocumentationParserRuleCall_6_0 = (RuleCall)cDocuAssignment_6.eContents().get(0);
 		
 		//Message:
-		//	priv?="private"? "Message" name=ID "(" data=VarDecl? ")" docu=Documentation?;
-		public ParserRule getRule() { return rule; }
+		//	priv?='private'? 'Message' name=ID '(' data=VarDecl? ')'
+		//	docu=Documentation?;
+		@Override public ParserRule getRule() { return rule; }
 
-		//priv?="private"? "Message" name=ID "(" data=VarDecl? ")" docu=Documentation?
+		//priv?='private'? 'Message' name=ID '(' data=VarDecl? ')' docu=Documentation?
 		public Group getGroup() { return cGroup; }
 
-		//priv?="private"?
+		//priv?='private'?
 		public Assignment getPrivAssignment_0() { return cPrivAssignment_0; }
 
-		//"private"
+		//'private'
 		public Keyword getPrivPrivateKeyword_0_0() { return cPrivPrivateKeyword_0_0; }
 
-		//"Message"
+		//'Message'
 		public Keyword getMessageKeyword_1() { return cMessageKeyword_1; }
 
 		//name=ID
@@ -1503,7 +1517,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//ID
 		public RuleCall getNameIDTerminalRuleCall_2_0() { return cNameIDTerminalRuleCall_2_0; }
 
-		//"("
+		//'('
 		public Keyword getLeftParenthesisKeyword_3() { return cLeftParenthesisKeyword_3; }
 
 		//data=VarDecl?
@@ -1512,7 +1526,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//VarDecl
 		public RuleCall getDataVarDeclParserRuleCall_4_0() { return cDataVarDeclParserRuleCall_4_0; }
 
-		//")"
+		//')'
 		public Keyword getRightParenthesisKeyword_5() { return cRightParenthesisKeyword_5; }
 
 		//docu=Documentation?
@@ -1523,7 +1537,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class PortClassElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "PortClass");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.PortClass");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Action cPortClassAction_0 = (Action)cGroup.eContents().get(0);
 		private final Keyword cLeftCurlyBracketKeyword_1 = (Keyword)cGroup.eContents().get(1);
@@ -1541,24 +1555,26 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cRightCurlyBracketKeyword_4 = (Keyword)cGroup.eContents().get(4);
 		
 		//PortClass:
-		//	{PortClass} "{" ("usercode" userCode=DetailCode)? (msgHandlers+=MessageHandler | operations+=PortOperation |
-		//	attributes+=Attribute)* "}";
-		public ParserRule getRule() { return rule; }
-
-		//{PortClass} "{" ("usercode" userCode=DetailCode)? (msgHandlers+=MessageHandler | operations+=PortOperation |
-		//attributes+=Attribute)* "}"
+		//	{PortClass}
+		//	'{' ('usercode' userCode=DetailCode)? (msgHandlers+=MessageHandler | operations+=PortOperation |
+		//	attributes+=Attribute)*
+		//	'}';
+		@Override public ParserRule getRule() { return rule; }
+
+		//{PortClass} '{' ('usercode' userCode=DetailCode)? (msgHandlers+=MessageHandler | operations+=PortOperation |
+		//attributes+=Attribute)* '}'
 		public Group getGroup() { return cGroup; }
 
 		//{PortClass}
 		public Action getPortClassAction_0() { return cPortClassAction_0; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_1() { return cLeftCurlyBracketKeyword_1; }
 
-		//("usercode" userCode=DetailCode)?
+		//('usercode' userCode=DetailCode)?
 		public Group getGroup_2() { return cGroup_2; }
 
-		//"usercode"
+		//'usercode'
 		public Keyword getUsercodeKeyword_2_0() { return cUsercodeKeyword_2_0; }
 
 		//userCode=DetailCode
@@ -1588,19 +1604,19 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//Attribute
 		public RuleCall getAttributesAttributeParserRuleCall_3_2_0() { return cAttributesAttributeParserRuleCall_3_2_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_4() { return cRightCurlyBracketKeyword_4; }
 	}
 
 	public class MessageHandlerElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "MessageHandler");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.MessageHandler");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final RuleCall cInMessageHandlerParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final RuleCall cOutMessageHandlerParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
 		
 		//MessageHandler:
 		//	InMessageHandler | OutMessageHandler;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//InMessageHandler | OutMessageHandler
 		public Alternatives getAlternatives() { return cAlternatives; }
@@ -1613,7 +1629,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class InMessageHandlerElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "InMessageHandler");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.InMessageHandler");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cHandleKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Keyword cIncomingKeyword_1 = (Keyword)cGroup.eContents().get(1);
@@ -1624,16 +1640,16 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cDetailCodeDetailCodeParserRuleCall_3_0 = (RuleCall)cDetailCodeAssignment_3.eContents().get(0);
 		
 		//InMessageHandler:
-		//	"handle" "incoming" msg=[Message] detailCode=DetailCode;
-		public ParserRule getRule() { return rule; }
+		//	'handle' 'incoming' msg=[Message] detailCode=DetailCode;
+		@Override public ParserRule getRule() { return rule; }
 
-		//"handle" "incoming" msg=[Message] detailCode=DetailCode
+		//'handle' 'incoming' msg=[Message] detailCode=DetailCode
 		public Group getGroup() { return cGroup; }
 
-		//"handle"
+		//'handle'
 		public Keyword getHandleKeyword_0() { return cHandleKeyword_0; }
 
-		//"incoming"
+		//'incoming'
 		public Keyword getIncomingKeyword_1() { return cIncomingKeyword_1; }
 
 		//msg=[Message]
@@ -1653,7 +1669,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class OutMessageHandlerElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "OutMessageHandler");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.OutMessageHandler");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cHandleKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Keyword cOutgoingKeyword_1 = (Keyword)cGroup.eContents().get(1);
@@ -1664,16 +1680,16 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cDetailCodeDetailCodeParserRuleCall_3_0 = (RuleCall)cDetailCodeAssignment_3.eContents().get(0);
 		
 		//OutMessageHandler:
-		//	"handle" "outgoing" msg=[Message] detailCode=DetailCode;
-		public ParserRule getRule() { return rule; }
+		//	'handle' 'outgoing' msg=[Message] detailCode=DetailCode;
+		@Override public ParserRule getRule() { return rule; }
 
-		//"handle" "outgoing" msg=[Message] detailCode=DetailCode
+		//'handle' 'outgoing' msg=[Message] detailCode=DetailCode
 		public Group getGroup() { return cGroup; }
 
-		//"handle"
+		//'handle'
 		public Keyword getHandleKeyword_0() { return cHandleKeyword_0; }
 
-		//"outgoing"
+		//'outgoing'
 		public Keyword getOutgoingKeyword_1() { return cOutgoingKeyword_1; }
 
 		//msg=[Message]
@@ -1693,21 +1709,21 @@ public class RoomGrammarAccess 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.Room.ModelComponent");
 		private final RuleCall cActorClassParserRuleCall = (RuleCall)rule.eContents().get(1);
 		
 		//// **************************************************************
 		//// actor class
 		//ModelComponent:
 		//	ActorClass;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//ActorClass
 		public RuleCall getActorClassParserRuleCall() { return cActorClassParserRuleCall; }
 	}
 
 	public class ActorClassElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ActorClass");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.ActorClass");
 		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);
@@ -1796,33 +1812,37 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//// p in i and p in s ==> external end port
 		//// since double containment is not supported we decided to define external ports as reference to interface ports
 		//ActorClass:
-		//	(abstract?="abstract"? & commType=ComponentCommunicationType?) "ActorClass" name=ID docu=Documentation? ("extends"
-		//	base=[ActorClass|FQN])? "{" annotations+=Annotation* ("Interface" "{" (serviceProvisionPoints+=SPP |
-		//	interfacePorts+=Port)* "}")? ("Structure" structureDocu=Documentation? "{" ("usercode1" userCode1=DetailCode)?
-		//	("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)? // workaround: reverse the order for serializer
-		//	(connections+=LayerConnection | bindings+=Binding | serviceImplementations+=ServiceImplementation |
-		//	attributes+=Attribute | actorRefs+=ActorRef | serviceAccessPoints+=SAP | internalPorts+=Port |
-		//	externalPorts+=ExternalPort)* "}")? ("Behavior" behaviorDocu=Documentation? "{" behaviorAnnotations+=Annotation*
-		//	(operations+=StandardOperation | structors+=ClassStructor)* stateMachine=StateMachine? "}")? "}";
-		public ParserRule getRule() { return rule; }
-
-		//(abstract?="abstract"? & commType=ComponentCommunicationType?) "ActorClass" name=ID docu=Documentation? ("extends"
-		//base=[ActorClass|FQN])? "{" annotations+=Annotation* ("Interface" "{" (serviceProvisionPoints+=SPP |
-		//interfacePorts+=Port)* "}")? ("Structure" structureDocu=Documentation? "{" ("usercode1" userCode1=DetailCode)?
-		//("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)? // workaround: reverse the order for serializer
-		//(connections+=LayerConnection | bindings+=Binding | serviceImplementations+=ServiceImplementation |
-		//attributes+=Attribute | actorRefs+=ActorRef | serviceAccessPoints+=SAP | internalPorts+=Port |
-		//externalPorts+=ExternalPort)* "}")? ("Behavior" behaviorDocu=Documentation? "{" behaviorAnnotations+=Annotation*
-		//(operations+=StandardOperation | structors+=ClassStructor)* stateMachine=StateMachine? "}")? "}"
+		//	(abstract?='abstract'? & commType=ComponentCommunicationType?)
+		//	'ActorClass' name=ID docu=Documentation? ('extends' base=[ActorClass|FQN])? '{'
+		//	annotations+=Annotation* ('Interface' '{' (serviceProvisionPoints+=SPP | interfacePorts+=Port)*
+		//	'}')? ('Structure' structureDocu=Documentation? '{' ('usercode1' userCode1=DetailCode)? ('usercode2'
+		//	userCode2=DetailCode)? ('usercode3' userCode3=DetailCode)? (connections+=LayerConnection | bindings+=Binding |
+		//	serviceImplementations+=ServiceImplementation | attributes+=Attribute | actorRefs+=ActorRef |
+		//	serviceAccessPoints+=SAP | internalPorts+=Port | externalPorts+=ExternalPort)*
+		//	'}')? ('Behavior' behaviorDocu=Documentation? '{'
+		//	behaviorAnnotations+=Annotation* (operations+=StandardOperation | structors+=ClassStructor)*
+		//	stateMachine=StateMachine?
+		//	'}')?
+		//	'}';
+		@Override public ParserRule getRule() { return rule; }
+
+		//(abstract?='abstract'? & commType=ComponentCommunicationType?) 'ActorClass' name=ID docu=Documentation? ('extends'
+		//base=[ActorClass|FQN])? '{' annotations+=Annotation* ('Interface' '{' (serviceProvisionPoints+=SPP |
+		//interfacePorts+=Port)* '}')? ('Structure' structureDocu=Documentation? '{' ('usercode1' userCode1=DetailCode)?
+		//('usercode2' userCode2=DetailCode)? ('usercode3' userCode3=DetailCode)? (connections+=LayerConnection |
+		//bindings+=Binding | serviceImplementations+=ServiceImplementation | attributes+=Attribute | actorRefs+=ActorRef |
+		//serviceAccessPoints+=SAP | internalPorts+=Port | externalPorts+=ExternalPort)* '}')? ('Behavior'
+		//behaviorDocu=Documentation? '{' behaviorAnnotations+=Annotation* (operations+=StandardOperation |
+		//structors+=ClassStructor)* 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?
@@ -1831,7 +1851,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//ComponentCommunicationType
 		public RuleCall getCommTypeComponentCommunicationTypeEnumRuleCall_0_1_0() { return cCommTypeComponentCommunicationTypeEnumRuleCall_0_1_0; }
 
-		//"ActorClass"
+		//'ActorClass'
 		public Keyword getActorClassKeyword_1() { return cActorClassKeyword_1; }
 
 		//name=ID
@@ -1846,10 +1866,10 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//Documentation
 		public RuleCall getDocuDocumentationParserRuleCall_3_0() { return cDocuDocumentationParserRuleCall_3_0; }
 
-		//("extends" base=[ActorClass|FQN])?
+		//('extends' base=[ActorClass|FQN])?
 		public Group getGroup_4() { return cGroup_4; }
 
-		//"extends"
+		//'extends'
 		public Keyword getExtendsKeyword_4_0() { return cExtendsKeyword_4_0; }
 
 		//base=[ActorClass|FQN]
@@ -1861,7 +1881,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//FQN
 		public RuleCall getBaseActorClassFQNParserRuleCall_4_1_0_1() { return cBaseActorClassFQNParserRuleCall_4_1_0_1; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_5() { return cLeftCurlyBracketKeyword_5; }
 
 		//annotations+=Annotation*
@@ -1870,13 +1890,13 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//Annotation
 		public RuleCall getAnnotationsAnnotationParserRuleCall_6_0() { return cAnnotationsAnnotationParserRuleCall_6_0; }
 
-		//("Interface" "{" (serviceProvisionPoints+=SPP | interfacePorts+=Port)* "}")?
+		//('Interface' '{' (serviceProvisionPoints+=SPP | interfacePorts+=Port)* '}')?
 		public Group getGroup_7() { return cGroup_7; }
 
-		//"Interface"
+		//'Interface'
 		public Keyword getInterfaceKeyword_7_0() { return cInterfaceKeyword_7_0; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_7_1() { return cLeftCurlyBracketKeyword_7_1; }
 
 		//(serviceProvisionPoints+=SPP | interfacePorts+=Port)*
@@ -1894,17 +1914,16 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//Port
 		public RuleCall getInterfacePortsPortParserRuleCall_7_2_1_0() { return cInterfacePortsPortParserRuleCall_7_2_1_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_7_3() { return cRightCurlyBracketKeyword_7_3; }
 
-		//("Structure" structureDocu=Documentation? "{" ("usercode1" userCode1=DetailCode)? ("usercode2" userCode2=DetailCode)?
-		//("usercode3" userCode3=DetailCode)? // workaround: reverse the order for serializer
-		//(connections+=LayerConnection | bindings+=Binding | serviceImplementations+=ServiceImplementation |
-		//attributes+=Attribute | actorRefs+=ActorRef | serviceAccessPoints+=SAP | internalPorts+=Port |
-		//externalPorts+=ExternalPort)* "}")?
+		//('Structure' structureDocu=Documentation? '{' ('usercode1' userCode1=DetailCode)? ('usercode2' userCode2=DetailCode)?
+		//('usercode3' userCode3=DetailCode)? (connections+=LayerConnection | bindings+=Binding |
+		//serviceImplementations+=ServiceImplementation | attributes+=Attribute | actorRefs+=ActorRef | serviceAccessPoints+=SAP
+		//| internalPorts+=Port | externalPorts+=ExternalPort)* '}')?
 		public Group getGroup_8() { return cGroup_8; }
 
-		//"Structure"
+		//'Structure'
 		public Keyword getStructureKeyword_8_0() { return cStructureKeyword_8_0; }
 
 		//structureDocu=Documentation?
@@ -1913,13 +1932,13 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//Documentation
 		public RuleCall getStructureDocuDocumentationParserRuleCall_8_1_0() { return cStructureDocuDocumentationParserRuleCall_8_1_0; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_8_2() { return cLeftCurlyBracketKeyword_8_2; }
 
-		//("usercode1" userCode1=DetailCode)?
+		//('usercode1' userCode1=DetailCode)?
 		public Group getGroup_8_3() { return cGroup_8_3; }
 
-		//"usercode1"
+		//'usercode1'
 		public Keyword getUsercode1Keyword_8_3_0() { return cUsercode1Keyword_8_3_0; }
 
 		//userCode1=DetailCode
@@ -1928,10 +1947,10 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//DetailCode
 		public RuleCall getUserCode1DetailCodeParserRuleCall_8_3_1_0() { return cUserCode1DetailCodeParserRuleCall_8_3_1_0; }
 
-		//("usercode2" userCode2=DetailCode)?
+		//('usercode2' userCode2=DetailCode)?
 		public Group getGroup_8_4() { return cGroup_8_4; }
 
-		//"usercode2"
+		//'usercode2'
 		public Keyword getUsercode2Keyword_8_4_0() { return cUsercode2Keyword_8_4_0; }
 
 		//userCode2=DetailCode
@@ -1940,10 +1959,10 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//DetailCode
 		public RuleCall getUserCode2DetailCodeParserRuleCall_8_4_1_0() { return cUserCode2DetailCodeParserRuleCall_8_4_1_0; }
 
-		//("usercode3" userCode3=DetailCode)?
+		//('usercode3' userCode3=DetailCode)?
 		public Group getGroup_8_5() { return cGroup_8_5; }
 
-		//"usercode3"
+		//'usercode3'
 		public Keyword getUsercode3Keyword_8_5_0() { return cUsercode3Keyword_8_5_0; }
 
 		//userCode3=DetailCode
@@ -1952,7 +1971,6 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//DetailCode
 		public RuleCall getUserCode3DetailCodeParserRuleCall_8_5_1_0() { return cUserCode3DetailCodeParserRuleCall_8_5_1_0; }
 
-		//// workaround: reverse the order for serializer
 		//(connections+=LayerConnection | bindings+=Binding | serviceImplementations+=ServiceImplementation |
 		//attributes+=Attribute | actorRefs+=ActorRef | serviceAccessPoints+=SAP | internalPorts+=Port |
 		//externalPorts+=ExternalPort)*
@@ -2007,14 +2025,14 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//ExternalPort
 		public RuleCall getExternalPortsExternalPortParserRuleCall_8_6_7_0() { return cExternalPortsExternalPortParserRuleCall_8_6_7_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_8_7() { return cRightCurlyBracketKeyword_8_7; }
 
-		//("Behavior" behaviorDocu=Documentation? "{" behaviorAnnotations+=Annotation* (operations+=StandardOperation |
-		//structors+=ClassStructor)* stateMachine=StateMachine? "}")?
+		//('Behavior' behaviorDocu=Documentation? '{' behaviorAnnotations+=Annotation* (operations+=StandardOperation |
+		//structors+=ClassStructor)* stateMachine=StateMachine? '}')?
 		public Group getGroup_9() { return cGroup_9; }
 
-		//"Behavior"
+		//'Behavior'
 		public Keyword getBehaviorKeyword_9_0() { return cBehaviorKeyword_9_0; }
 
 		//behaviorDocu=Documentation?
@@ -2023,7 +2041,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//Documentation
 		public RuleCall getBehaviorDocuDocumentationParserRuleCall_9_1_0() { return cBehaviorDocuDocumentationParserRuleCall_9_1_0; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_9_2() { return cLeftCurlyBracketKeyword_9_2; }
 
 		//behaviorAnnotations+=Annotation*
@@ -2053,15 +2071,15 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//StateMachine
 		public RuleCall getStateMachineStateMachineParserRuleCall_9_5_0() { return cStateMachineStateMachineParserRuleCall_9_5_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_9_6() { return cRightCurlyBracketKeyword_9_6; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_10() { return cRightCurlyBracketKeyword_10; }
 	}
 
 	public class InterfaceItemElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "InterfaceItem");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.InterfaceItem");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final RuleCall cPortParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final RuleCall cSAPParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
@@ -2069,7 +2087,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//InterfaceItem:
 		//	Port | SAP | SPP;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//Port | SAP | SPP
 		public Alternatives getAlternatives() { return cAlternatives; }
@@ -2085,7 +2103,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class PortElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Port");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.Port");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Assignment cConjugatedAssignment_0 = (Assignment)cGroup.eContents().get(0);
 		private final Keyword cConjugatedConjugatedKeyword_0_0 = (Keyword)cConjugatedAssignment_0.eContents().get(0);
@@ -2102,21 +2120,21 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cDocuDocumentationParserRuleCall_6_0 = (RuleCall)cDocuAssignment_6.eContents().get(0);
 		
 		//Port:
-		//	conjugated?="conjugated"? "Port" name=ID multiplicity=MULTIPLICITY? ":" protocol=[GeneralProtocolClass|FQN]
+		//	conjugated?='conjugated'? 'Port' name=ID multiplicity=MULTIPLICITY? ':' protocol=[GeneralProtocolClass|FQN]
 		//	docu=Documentation?;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
-		//conjugated?="conjugated"? "Port" name=ID multiplicity=MULTIPLICITY? ":" protocol=[GeneralProtocolClass|FQN]
+		//conjugated?='conjugated'? 'Port' name=ID multiplicity=MULTIPLICITY? ':' protocol=[GeneralProtocolClass|FQN]
 		//docu=Documentation?
 		public Group getGroup() { return cGroup; }
 
-		//conjugated?="conjugated"?
+		//conjugated?='conjugated'?
 		public Assignment getConjugatedAssignment_0() { return cConjugatedAssignment_0; }
 
-		//"conjugated"
+		//'conjugated'
 		public Keyword getConjugatedConjugatedKeyword_0_0() { return cConjugatedConjugatedKeyword_0_0; }
 
-		//"Port"
+		//'Port'
 		public Keyword getPortKeyword_1() { return cPortKeyword_1; }
 
 		//name=ID
@@ -2131,7 +2149,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//MULTIPLICITY
 		public RuleCall getMultiplicityMULTIPLICITYParserRuleCall_3_0() { return cMultiplicityMULTIPLICITYParserRuleCall_3_0; }
 
-		//":"
+		//':'
 		public Keyword getColonKeyword_4() { return cColonKeyword_4; }
 
 		//protocol=[GeneralProtocolClass|FQN]
@@ -2151,7 +2169,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class ExternalPortElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ExternalPort");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.ExternalPort");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cExternalKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Keyword cPortKeyword_1 = (Keyword)cGroup.eContents().get(1);
@@ -2160,16 +2178,16 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cInterfacePortPortIDTerminalRuleCall_2_0_1 = (RuleCall)cInterfacePortPortCrossReference_2_0.eContents().get(1);
 		
 		//ExternalPort:
-		//	"external" "Port" interfacePort=[Port];
-		public ParserRule getRule() { return rule; }
+		//	'external' 'Port' interfacePort=[Port];
+		@Override public ParserRule getRule() { return rule; }
 
-		//"external" "Port" interfacePort=[Port]
+		//'external' 'Port' interfacePort=[Port]
 		public Group getGroup() { return cGroup; }
 
-		//"external"
+		//'external'
 		public Keyword getExternalKeyword_0() { return cExternalKeyword_0; }
 
-		//"Port"
+		//'Port'
 		public Keyword getPortKeyword_1() { return cPortKeyword_1; }
 
 		//interfacePort=[Port]
@@ -2183,7 +2201,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class SAPElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "SAP");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.SAP");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cSAPKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -2194,13 +2212,13 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cProtocolProtocolClassFQNParserRuleCall_3_0_1 = (RuleCall)cProtocolProtocolClassCrossReference_3_0.eContents().get(1);
 		
 		//SAP:
-		//	"SAP" name=ID ":" protocol=[ProtocolClass|FQN];
-		public ParserRule getRule() { return rule; }
+		//	'SAP' name=ID ':' protocol=[ProtocolClass|FQN];
+		@Override public ParserRule getRule() { return rule; }
 
-		//"SAP" name=ID ":" protocol=[ProtocolClass|FQN]
+		//'SAP' name=ID ':' protocol=[ProtocolClass|FQN]
 		public Group getGroup() { return cGroup; }
 
-		//"SAP"
+		//'SAP'
 		public Keyword getSAPKeyword_0() { return cSAPKeyword_0; }
 
 		//name=ID
@@ -2209,7 +2227,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//ID
 		public RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }
 
-		//":"
+		//':'
 		public Keyword getColonKeyword_2() { return cColonKeyword_2; }
 
 		//protocol=[ProtocolClass|FQN]
@@ -2223,7 +2241,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class SPPElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "SPP");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.SPP");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cSPPKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -2234,13 +2252,13 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cProtocolProtocolClassFQNParserRuleCall_3_0_1 = (RuleCall)cProtocolProtocolClassCrossReference_3_0.eContents().get(1);
 		
 		//SPP:
-		//	"SPP" name=ID ":" protocol=[ProtocolClass|FQN];
-		public ParserRule getRule() { return rule; }
+		//	'SPP' name=ID ':' protocol=[ProtocolClass|FQN];
+		@Override public ParserRule getRule() { return rule; }
 
-		//"SPP" name=ID ":" protocol=[ProtocolClass|FQN]
+		//'SPP' name=ID ':' protocol=[ProtocolClass|FQN]
 		public Group getGroup() { return cGroup; }
 
-		//"SPP"
+		//'SPP'
 		public Keyword getSPPKeyword_0() { return cSPPKeyword_0; }
 
 		//name=ID
@@ -2249,7 +2267,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//ID
 		public RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }
 
-		//":"
+		//':'
 		public Keyword getColonKeyword_2() { return cColonKeyword_2; }
 
 		//protocol=[ProtocolClass|FQN]
@@ -2263,7 +2281,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class ServiceImplementationElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ServiceImplementation");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.ServiceImplementation");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cServiceImplementationKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Keyword cOfKeyword_1 = (Keyword)cGroup.eContents().get(1);
@@ -2272,16 +2290,16 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cSppSPPIDTerminalRuleCall_2_0_1 = (RuleCall)cSppSPPCrossReference_2_0.eContents().get(1);
 		
 		//ServiceImplementation:
-		//	"ServiceImplementation" "of" spp=[SPP];
-		public ParserRule getRule() { return rule; }
+		//	'ServiceImplementation' 'of' spp=[SPP];
+		@Override public ParserRule getRule() { return rule; }
 
-		//"ServiceImplementation" "of" spp=[SPP]
+		//'ServiceImplementation' 'of' spp=[SPP]
 		public Group getGroup() { return cGroup; }
 
-		//"ServiceImplementation"
+		//'ServiceImplementation'
 		public Keyword getServiceImplementationKeyword_0() { return cServiceImplementationKeyword_0; }
 
-		//"of"
+		//'of'
 		public Keyword getOfKeyword_1() { return cOfKeyword_1; }
 
 		//spp=[SPP]
@@ -2295,7 +2313,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class LogicalSystemElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "LogicalSystem");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.LogicalSystem");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cLogicalSystemKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -2315,15 +2333,16 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cRightCurlyBracketKeyword_6 = (Keyword)cGroup.eContents().get(6);
 		
 		//LogicalSystem:
-		//	"LogicalSystem" name=ID docu=Documentation? "{" annotations+=Annotation* (connections+=LayerConnection |
-		//	bindings+=Binding | subSystems+=SubSystemRef)* "}";
-		public ParserRule getRule() { return rule; }
+		//	'LogicalSystem' name=ID docu=Documentation? '{'
+		//	annotations+=Annotation* (connections+=LayerConnection | bindings+=Binding | subSystems+=SubSystemRef)*
+		//	'}';
+		@Override public ParserRule getRule() { return rule; }
 
-		//"LogicalSystem" name=ID docu=Documentation? "{" annotations+=Annotation* (connections+=LayerConnection |
-		//bindings+=Binding | subSystems+=SubSystemRef)* "}"
+		//'LogicalSystem' name=ID docu=Documentation? '{' annotations+=Annotation* (connections+=LayerConnection |
+		//bindings+=Binding | subSystems+=SubSystemRef)* '}'
 		public Group getGroup() { return cGroup; }
 
-		//"LogicalSystem"
+		//'LogicalSystem'
 		public Keyword getLogicalSystemKeyword_0() { return cLogicalSystemKeyword_0; }
 
 		//name=ID
@@ -2338,7 +2357,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//Documentation
 		public RuleCall getDocuDocumentationParserRuleCall_2_0() { return cDocuDocumentationParserRuleCall_2_0; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_3() { return cLeftCurlyBracketKeyword_3; }
 
 		//annotations+=Annotation*
@@ -2368,19 +2387,19 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//SubSystemRef
 		public RuleCall getSubSystemsSubSystemRefParserRuleCall_5_2_0() { return cSubSystemsSubSystemRefParserRuleCall_5_2_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_6() { return cRightCurlyBracketKeyword_6; }
 	}
 
 	public class ActorContainerRefElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ActorContainerRef");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.ActorContainerRef");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final RuleCall cSubSystemRefParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final RuleCall cActorRefParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
 		
 		//ActorContainerRef:
 		//	SubSystemRef | ActorRef;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//SubSystemRef | ActorRef
 		public Alternatives getAlternatives() { return cAlternatives; }
@@ -2393,7 +2412,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class SubSystemRefElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "SubSystemRef");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.SubSystemRef");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cSubSystemRefKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -2406,13 +2425,13 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cDocuDocumentationParserRuleCall_4_0 = (RuleCall)cDocuAssignment_4.eContents().get(0);
 		
 		//SubSystemRef:
-		//	"SubSystemRef" name=ID ":" type=[SubSystemClass|FQN] docu=Documentation?;
-		public ParserRule getRule() { return rule; }
+		//	'SubSystemRef' name=ID ':' type=[SubSystemClass|FQN] docu=Documentation?;
+		@Override public ParserRule getRule() { return rule; }
 
-		//"SubSystemRef" name=ID ":" type=[SubSystemClass|FQN] docu=Documentation?
+		//'SubSystemRef' name=ID ':' type=[SubSystemClass|FQN] docu=Documentation?
 		public Group getGroup() { return cGroup; }
 
-		//"SubSystemRef"
+		//'SubSystemRef'
 		public Keyword getSubSystemRefKeyword_0() { return cSubSystemRefKeyword_0; }
 
 		//name=ID
@@ -2421,7 +2440,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//ID
 		public RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }
 
-		//":"
+		//':'
 		public Keyword getColonKeyword_2() { return cColonKeyword_2; }
 
 		//type=[SubSystemClass|FQN]
@@ -2441,7 +2460,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class SubSystemClassElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "SubSystemClass");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.SubSystemClass");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cSubSystemClassKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -2481,19 +2500,21 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cRightCurlyBracketKeyword_9 = (Keyword)cGroup.eContents().get(9);
 		
 		//SubSystemClass:
-		//	"SubSystemClass" name=ID docu=Documentation? "{" annotations+=Annotation* ("usercode1" userCode1=DetailCode)?
-		//	("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)? // workaround: reverse the order for serializer
-		//	(actorInstanceMappings+=ActorInstanceMapping | threads+=LogicalThread | connections+=LayerConnection |
-		//	bindings+=Binding | actorRefs+=ActorRef | serviceProvisionPoints+=SPP | relayPorts+=Port)* "}";
-		public ParserRule getRule() { return rule; }
-
-		//"SubSystemClass" name=ID docu=Documentation? "{" annotations+=Annotation* ("usercode1" userCode1=DetailCode)?
-		//("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)? // workaround: reverse the order for serializer
-		//(actorInstanceMappings+=ActorInstanceMapping | threads+=LogicalThread | connections+=LayerConnection | bindings+=Binding
-		//| actorRefs+=ActorRef | serviceProvisionPoints+=SPP | relayPorts+=Port)* "}"
+		//	'SubSystemClass' name=ID docu=Documentation? '{'
+		//	annotations+=Annotation* ('usercode1' userCode1=DetailCode)? ('usercode2' userCode2=DetailCode)? ('usercode3'
+		//	userCode3=DetailCode)? (actorInstanceMappings+=ActorInstanceMapping | threads+=LogicalThread |
+		//	connections+=LayerConnection | bindings+=Binding | actorRefs+=ActorRef | serviceProvisionPoints+=SPP |
+		//	relayPorts+=Port)*
+		//	'}';
+		@Override public ParserRule getRule() { return rule; }
+
+		//'SubSystemClass' name=ID docu=Documentation? '{' annotations+=Annotation* ('usercode1' userCode1=DetailCode)?
+		//('usercode2' userCode2=DetailCode)? ('usercode3' userCode3=DetailCode)? (actorInstanceMappings+=ActorInstanceMapping |
+		//threads+=LogicalThread | connections+=LayerConnection | bindings+=Binding | actorRefs+=ActorRef |
+		//serviceProvisionPoints+=SPP | relayPorts+=Port)* '}'
 		public Group getGroup() { return cGroup; }
 
-		//"SubSystemClass"
+		//'SubSystemClass'
 		public Keyword getSubSystemClassKeyword_0() { return cSubSystemClassKeyword_0; }
 
 		//name=ID
@@ -2508,7 +2529,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//Documentation
 		public RuleCall getDocuDocumentationParserRuleCall_2_0() { return cDocuDocumentationParserRuleCall_2_0; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_3() { return cLeftCurlyBracketKeyword_3; }
 
 		//annotations+=Annotation*
@@ -2517,10 +2538,10 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//Annotation
 		public RuleCall getAnnotationsAnnotationParserRuleCall_4_0() { return cAnnotationsAnnotationParserRuleCall_4_0; }
 
-		//("usercode1" userCode1=DetailCode)?
+		//('usercode1' userCode1=DetailCode)?
 		public Group getGroup_5() { return cGroup_5; }
 
-		//"usercode1"
+		//'usercode1'
 		public Keyword getUsercode1Keyword_5_0() { return cUsercode1Keyword_5_0; }
 
 		//userCode1=DetailCode
@@ -2529,10 +2550,10 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//DetailCode
 		public RuleCall getUserCode1DetailCodeParserRuleCall_5_1_0() { return cUserCode1DetailCodeParserRuleCall_5_1_0; }
 
-		//("usercode2" userCode2=DetailCode)?
+		//('usercode2' userCode2=DetailCode)?
 		public Group getGroup_6() { return cGroup_6; }
 
-		//"usercode2"
+		//'usercode2'
 		public Keyword getUsercode2Keyword_6_0() { return cUsercode2Keyword_6_0; }
 
 		//userCode2=DetailCode
@@ -2541,10 +2562,10 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//DetailCode
 		public RuleCall getUserCode2DetailCodeParserRuleCall_6_1_0() { return cUserCode2DetailCodeParserRuleCall_6_1_0; }
 
-		//("usercode3" userCode3=DetailCode)?
+		//('usercode3' userCode3=DetailCode)?
 		public Group getGroup_7() { return cGroup_7; }
 
-		//"usercode3"
+		//'usercode3'
 		public Keyword getUsercode3Keyword_7_0() { return cUsercode3Keyword_7_0; }
 
 		//userCode3=DetailCode
@@ -2553,7 +2574,6 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//DetailCode
 		public RuleCall getUserCode3DetailCodeParserRuleCall_7_1_0() { return cUserCode3DetailCodeParserRuleCall_7_1_0; }
 
-		//// workaround: reverse the order for serializer
 		//(actorInstanceMappings+=ActorInstanceMapping | threads+=LogicalThread | connections+=LayerConnection | bindings+=Binding
 		//| actorRefs+=ActorRef | serviceProvisionPoints+=SPP | relayPorts+=Port)*
 		public Alternatives getAlternatives_8() { return cAlternatives_8; }
@@ -2601,25 +2621,25 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//Port
 		public RuleCall getRelayPortsPortParserRuleCall_8_6_0() { return cRelayPortsPortParserRuleCall_8_6_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_9() { return cRightCurlyBracketKeyword_9; }
 	}
 
 	public class LogicalThreadElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "LogicalThread");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.LogicalThread");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cLogicalThreadKeyword_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);
 		
 		//LogicalThread:
-		//	"LogicalThread" name=ID;
-		public ParserRule getRule() { return rule; }
+		//	'LogicalThread' name=ID;
+		@Override public ParserRule getRule() { return rule; }
 
-		//"LogicalThread" name=ID
+		//'LogicalThread' name=ID
 		public Group getGroup() { return cGroup; }
 
-		//"LogicalThread"
+		//'LogicalThread'
 		public Keyword getLogicalThreadKeyword_0() { return cLogicalThreadKeyword_0; }
 
 		//name=ID
@@ -2630,7 +2650,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class ActorInstanceMappingElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ActorInstanceMapping");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.ActorInstanceMapping");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cActorInstanceMappingKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cPathAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -2646,14 +2666,15 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cRightCurlyBracketKeyword_4_2 = (Keyword)cGroup_4.eContents().get(2);
 		
 		//ActorInstanceMapping:
-		//	"ActorInstanceMapping" path=RefPath "->" thread=[LogicalThread] ("{" actorInstanceMappings+=ActorInstanceMapping*
-		//	"}")?;
-		public ParserRule getRule() { return rule; }
+		//	'ActorInstanceMapping' path=RefPath '->' thread=[LogicalThread] ('{'
+		//	actorInstanceMappings+=ActorInstanceMapping*
+		//	'}')?;
+		@Override public ParserRule getRule() { return rule; }
 
-		//"ActorInstanceMapping" path=RefPath "->" thread=[LogicalThread] ("{" actorInstanceMappings+=ActorInstanceMapping* "}")?
+		//'ActorInstanceMapping' path=RefPath '->' thread=[LogicalThread] ('{' actorInstanceMappings+=ActorInstanceMapping* '}')?
 		public Group getGroup() { return cGroup; }
 
-		//"ActorInstanceMapping"
+		//'ActorInstanceMapping'
 		public Keyword getActorInstanceMappingKeyword_0() { return cActorInstanceMappingKeyword_0; }
 
 		//path=RefPath
@@ -2662,7 +2683,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//RefPath
 		public RuleCall getPathRefPathParserRuleCall_1_0() { return cPathRefPathParserRuleCall_1_0; }
 
-		//"->"
+		//'->'
 		public Keyword getHyphenMinusGreaterThanSignKeyword_2() { return cHyphenMinusGreaterThanSignKeyword_2; }
 
 		//thread=[LogicalThread]
@@ -2674,10 +2695,10 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//ID
 		public RuleCall getThreadLogicalThreadIDTerminalRuleCall_3_0_1() { return cThreadLogicalThreadIDTerminalRuleCall_3_0_1; }
 
-		//("{" actorInstanceMappings+=ActorInstanceMapping* "}")?
+		//('{' actorInstanceMappings+=ActorInstanceMapping* '}')?
 		public Group getGroup_4() { return cGroup_4; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_4_0() { return cLeftCurlyBracketKeyword_4_0; }
 
 		//actorInstanceMappings+=ActorInstanceMapping*
@@ -2686,12 +2707,12 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//ActorInstanceMapping
 		public RuleCall getActorInstanceMappingsActorInstanceMappingParserRuleCall_4_1_0() { return cActorInstanceMappingsActorInstanceMappingParserRuleCall_4_1_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_4_2() { return cRightCurlyBracketKeyword_4_2; }
 	}
 
 	public class RefPathElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "RefPath");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.RefPath");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Assignment cRefsAssignment_0 = (Assignment)cGroup.eContents().get(0);
 		private final RuleCall cRefsRefSegmentParserRuleCall_0_0 = (RuleCall)cRefsAssignment_0.eContents().get(0);
@@ -2701,10 +2722,10 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cRefsRefSegmentParserRuleCall_1_1_0 = (RuleCall)cRefsAssignment_1_1.eContents().get(0);
 		
 		//RefPath:
-		//	refs+=RefSegment ("/" refs+=RefSegment)*;
-		public ParserRule getRule() { return rule; }
+		//	refs+=RefSegment ('/' refs+=RefSegment)*;
+		@Override public ParserRule getRule() { return rule; }
 
-		//refs+=RefSegment ("/" refs+=RefSegment)*
+		//refs+=RefSegment ('/' refs+=RefSegment)*
 		public Group getGroup() { return cGroup; }
 
 		//refs+=RefSegment
@@ -2713,10 +2734,10 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//RefSegment
 		public RuleCall getRefsRefSegmentParserRuleCall_0_0() { return cRefsRefSegmentParserRuleCall_0_0; }
 
-		//("/" refs+=RefSegment)*
+		//('/' refs+=RefSegment)*
 		public Group getGroup_1() { return cGroup_1; }
 
-		//"/"
+		//'/'
 		public Keyword getSolidusKeyword_1_0() { return cSolidusKeyword_1_0; }
 
 		//refs+=RefSegment
@@ -2727,7 +2748,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class RefSegmentElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "RefSegment");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.RefSegment");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Assignment cRefAssignment_0 = (Assignment)cGroup.eContents().get(0);
 		private final RuleCall cRefIDTerminalRuleCall_0_0 = (RuleCall)cRefAssignment_0.eContents().get(0);
@@ -2737,10 +2758,10 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cIdxINTTerminalRuleCall_1_1_0 = (RuleCall)cIdxAssignment_1_1.eContents().get(0);
 		
 		//RefSegment:
-		//	ref=ID (":" idx=INT)?;
-		public ParserRule getRule() { return rule; }
+		//	ref=ID (':' idx=INT)?;
+		@Override public ParserRule getRule() { return rule; }
 
-		//ref=ID (":" idx=INT)?
+		//ref=ID (':' idx=INT)?
 		public Group getGroup() { return cGroup; }
 
 		//ref=ID
@@ -2749,10 +2770,10 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//ID
 		public RuleCall getRefIDTerminalRuleCall_0_0() { return cRefIDTerminalRuleCall_0_0; }
 
-		//(":" idx=INT)?
+		//(':' idx=INT)?
 		public Group getGroup_1() { return cGroup_1; }
 
-		//":"
+		//':'
 		public Keyword getColonKeyword_1_0() { return cColonKeyword_1_0; }
 
 		//idx=INT
@@ -2763,7 +2784,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class BindingElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Binding");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.Binding");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cBindingKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cEndpoint1Assignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -2773,13 +2794,13 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cEndpoint2BindingEndPointParserRuleCall_3_0 = (RuleCall)cEndpoint2Assignment_3.eContents().get(0);
 		
 		//Binding:
-		//	"Binding" endpoint1=BindingEndPoint "and" endpoint2=BindingEndPoint;
-		public ParserRule getRule() { return rule; }
+		//	'Binding' endpoint1=BindingEndPoint 'and' endpoint2=BindingEndPoint;
+		@Override public ParserRule getRule() { return rule; }
 
-		//"Binding" endpoint1=BindingEndPoint "and" endpoint2=BindingEndPoint
+		//'Binding' endpoint1=BindingEndPoint 'and' endpoint2=BindingEndPoint
 		public Group getGroup() { return cGroup; }
 
-		//"Binding"
+		//'Binding'
 		public Keyword getBindingKeyword_0() { return cBindingKeyword_0; }
 
 		//endpoint1=BindingEndPoint
@@ -2788,7 +2809,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//BindingEndPoint
 		public RuleCall getEndpoint1BindingEndPointParserRuleCall_1_0() { return cEndpoint1BindingEndPointParserRuleCall_1_0; }
 
-		//"and"
+		//'and'
 		public Keyword getAndKeyword_2() { return cAndKeyword_2; }
 
 		//endpoint2=BindingEndPoint
@@ -2799,7 +2820,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class BindingEndPointElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "BindingEndPoint");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.BindingEndPoint");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Group cGroup_0 = (Group)cGroup.eContents().get(0);
 		private final Assignment cActorRefAssignment_0_0 = (Assignment)cGroup_0.eContents().get(0);
@@ -2816,13 +2837,13 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cSubSubProtocolIDTerminalRuleCall_2_1_0_1 = (RuleCall)cSubSubProtocolCrossReference_2_1_0.eContents().get(1);
 		
 		//BindingEndPoint:
-		//	(actorRef=[ActorContainerRef] ".")? port=[Port] ("sub" sub=[SubProtocol])?;
-		public ParserRule getRule() { return rule; }
+		//	(actorRef=[ActorContainerRef] '.')? port=[Port] ('sub' sub=[SubProtocol])?;
+		@Override public ParserRule getRule() { return rule; }
 
-		//(actorRef=[ActorContainerRef] ".")? port=[Port] ("sub" sub=[SubProtocol])?
+		//(actorRef=[ActorContainerRef] '.')? port=[Port] ('sub' sub=[SubProtocol])?
 		public Group getGroup() { return cGroup; }
 
-		//(actorRef=[ActorContainerRef] ".")?
+		//(actorRef=[ActorContainerRef] '.')?
 		public Group getGroup_0() { return cGroup_0; }
 
 		//actorRef=[ActorContainerRef]
@@ -2834,7 +2855,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//ID
 		public RuleCall getActorRefActorContainerRefIDTerminalRuleCall_0_0_0_1() { return cActorRefActorContainerRefIDTerminalRuleCall_0_0_0_1; }
 
-		//"."
+		//'.'
 		public Keyword getFullStopKeyword_0_1() { return cFullStopKeyword_0_1; }
 
 		//port=[Port]
@@ -2846,10 +2867,10 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//ID
 		public RuleCall getPortPortIDTerminalRuleCall_1_0_1() { return cPortPortIDTerminalRuleCall_1_0_1; }
 
-		//("sub" sub=[SubProtocol])?
+		//('sub' sub=[SubProtocol])?
 		public Group getGroup_2() { return cGroup_2; }
 
-		//"sub"
+		//'sub'
 		public Keyword getSubKeyword_2_0() { return cSubKeyword_2_0; }
 
 		//sub=[SubProtocol]
@@ -2863,7 +2884,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class LayerConnectionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "LayerConnection");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.LayerConnection");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cLayerConnectionKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cFromAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -2873,13 +2894,13 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cToSPPointParserRuleCall_3_0 = (RuleCall)cToAssignment_3.eContents().get(0);
 		
 		//LayerConnection:
-		//	"LayerConnection" from=SAPoint "satisfied_by" to=SPPoint;
-		public ParserRule getRule() { return rule; }
+		//	'LayerConnection' from=SAPoint 'satisfied_by' to=SPPoint;
+		@Override public ParserRule getRule() { return rule; }
 
-		//"LayerConnection" from=SAPoint "satisfied_by" to=SPPoint
+		//'LayerConnection' from=SAPoint 'satisfied_by' to=SPPoint
 		public Group getGroup() { return cGroup; }
 
-		//"LayerConnection"
+		//'LayerConnection'
 		public Keyword getLayerConnectionKeyword_0() { return cLayerConnectionKeyword_0; }
 
 		//from=SAPoint
@@ -2888,7 +2909,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//SAPoint
 		public RuleCall getFromSAPointParserRuleCall_1_0() { return cFromSAPointParserRuleCall_1_0; }
 
-		//"satisfied_by"
+		//'satisfied_by'
 		public Keyword getSatisfied_byKeyword_2() { return cSatisfied_byKeyword_2; }
 
 		//to=SPPoint
@@ -2899,14 +2920,14 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class SAPointElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "SAPoint");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.SAPoint");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final RuleCall cRefSAPointParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final RuleCall cRelaySAPointParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
 		
 		//SAPoint:
 		//	RefSAPoint | RelaySAPoint;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//RefSAPoint | RelaySAPoint
 		public Alternatives getAlternatives() { return cAlternatives; }
@@ -2919,7 +2940,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class RefSAPointElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "RefSAPoint");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.RefSAPoint");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cRefKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cRefAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -2927,15 +2948,15 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cRefActorContainerRefIDTerminalRuleCall_1_0_1 = (RuleCall)cRefActorContainerRefCrossReference_1_0.eContents().get(1);
 		
 		//RefSAPoint: // satisfies a sub actor
-		//	"ref" ref=[ActorContainerRef];
-		public ParserRule getRule() { return rule; }
+		//	'ref' ref=[ActorContainerRef];
+		@Override public ParserRule getRule() { return rule; }
 
 		//// satisfies a sub actor
-		//"ref" ref=[ActorContainerRef]
+		//'ref' ref=[ActorContainerRef]
 		public Group getGroup() { return cGroup; }
 
 		//// satisfies a sub actor
-		//"ref"
+		//'ref'
 		public Keyword getRefKeyword_0() { return cRefKeyword_0; }
 
 		//ref=[ActorContainerRef]
@@ -2949,7 +2970,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class RelaySAPointElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "RelaySAPoint");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.RelaySAPoint");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cRelay_sapKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cRelayAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -2957,15 +2978,15 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cRelaySPPIDTerminalRuleCall_1_0_1 = (RuleCall)cRelaySPPCrossReference_1_0.eContents().get(1);
 		
 		//RelaySAPoint: // relays from own interface
-		//	"relay_sap" relay=[SPP];
-		public ParserRule getRule() { return rule; }
+		//	'relay_sap' relay=[SPP];
+		@Override public ParserRule getRule() { return rule; }
 
 		//// relays from own interface
-		//"relay_sap" relay=[SPP]
+		//'relay_sap' relay=[SPP]
 		public Group getGroup() { return cGroup; }
 
 		//// relays from own interface
-		//"relay_sap"
+		//'relay_sap'
 		public Keyword getRelay_sapKeyword_0() { return cRelay_sapKeyword_0; }
 
 		//relay=[SPP]
@@ -2979,7 +3000,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class SPPointElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "SPPoint");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.SPPoint");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Assignment cRefAssignment_0 = (Assignment)cGroup.eContents().get(0);
 		private final CrossReference cRefActorContainerRefCrossReference_0_0 = (CrossReference)cRefAssignment_0.eContents().get(0);
@@ -2990,10 +3011,10 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cServiceSPPIDTerminalRuleCall_2_0_1 = (RuleCall)cServiceSPPCrossReference_2_0.eContents().get(1);
 		
 		//SPPoint:
-		//	ref=[ActorContainerRef] "." service=[SPP];
-		public ParserRule getRule() { return rule; }
+		//	ref=[ActorContainerRef] '.' service=[SPP];
+		@Override public ParserRule getRule() { return rule; }
 
-		//ref=[ActorContainerRef] "." service=[SPP]
+		//ref=[ActorContainerRef] '.' service=[SPP]
 		public Group getGroup() { return cGroup; }
 
 		//ref=[ActorContainerRef]
@@ -3005,7 +3026,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//ID
 		public RuleCall getRefActorContainerRefIDTerminalRuleCall_0_0_1() { return cRefActorContainerRefIDTerminalRuleCall_0_0_1; }
 
-		//"."
+		//'.'
 		public Keyword getFullStopKeyword_1() { return cFullStopKeyword_1; }
 
 		//service=[SPP]
@@ -3019,7 +3040,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	public class ActorRefElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ActorRef");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.ActorRef");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Assignment cRefTypeAssignment_0 = (Assignment)cGroup.eContents().get(0);
 		private final RuleCall cRefTypeReferenceTypeEnumRuleCall_0_0 = (RuleCall)cRefTypeAssignment_0.eContents().get(0);
@@ -3036,10 +3057,10 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cDocuDocumentationParserRuleCall_6_0 = (RuleCall)cDocuAssignment_6.eContents().get(0);
 		
 		//ActorRef:
-		//	refType=ReferenceType? "ActorRef" name=ID multiplicity=MULTIPLICITY? ":" type=[ActorClass|FQN] docu=Documentation?;
-		public ParserRule getRule() { return rule; }
+		//	refType=ReferenceType? 'ActorRef' name=ID multiplicity=MULTIPLICITY? ':' type=[ActorClass|FQN] docu=Documentation?;
+		@Override public ParserRule getRule() { return rule; }
 
-		//refType=ReferenceType? "ActorRef" name=ID multiplicity=MULTIPLICITY? ":" type=[ActorClass|FQN] docu=Documentation?
+		//refType=ReferenceType? 'ActorRef' name=ID multiplicity=MULTIPLICITY? ':' type=[ActorClass|FQN] docu=Documentation?
 		public Group getGroup() { return cGroup; }
 
 		//refType=ReferenceType?
@@ -3048,7 +3069,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//ReferenceType
 		public RuleCall getRefTypeReferenceTypeEnumRuleCall_0_0() { return cRefTypeReferenceTypeEnumRuleCall_0_0; }
 
-		//"ActorRef"
+		//'ActorRef'
 		public Keyword getActorRefKeyword_1() { return cActorRefKeyword_1; }
 
 		//name=ID
@@ -3063,7 +3084,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//MULTIPLICITY
 		public RuleCall getMultiplicityMULTIPLICITYParserRuleCall_3_0() { return cMultiplicityMULTIPLICITYParserRuleCall_3_0; }
 
-		//":"
+		//':'
 		public Keyword getColonKeyword_4() { return cColonKeyword_4; }
 
 		//type=[ActorClass|FQN]
@@ -3083,7 +3104,7 @@ public class RoomGrammarAccess 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.Room.AbstractInterfaceItem");
 		private final RuleCall cInterfaceItemParserRuleCall = (RuleCall)rule.eContents().get(1);
 		
 		//// **************************************************************
@@ -3091,14 +3112,14 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		////AbstractMessage: Message;
 		//AbstractInterfaceItem:
 		//	InterfaceItem;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//InterfaceItem
 		public RuleCall getInterfaceItemParserRuleCall() { return cInterfaceItemParserRuleCall; }
 	}
 
 	public class MULTIPLICITYElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "MULTIPLICITY");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.MULTIPLICITY");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cLeftSquareBracketKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Alternatives cAlternatives_1 = (Alternatives)cGroup.eContents().get(1);
@@ -3110,31 +3131,31 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//// general
 		//// the following is a data type rule (accompanied by a value converter) and must not be a terminal rule
 		//// (because then the lexer already would find this in places where it is not expected, e.g. in an Attribute)
-		//MULTIPLICITY returns ecore::EInt:
-		//	"[" ("*" | INT) "]";
-		public ParserRule getRule() { return rule; }
+		//MULTIPLICITY ecore::EInt:
+		//	'[' ('*' | INT) ']'
+		@Override public ParserRule getRule() { return rule; }
 
-		//"[" ("*" | INT) "]"
+		//'[' ('*' | INT) ']'
 		public Group getGroup() { return cGroup; }
 
-		//"["
+		//'['
 		public Keyword getLeftSquareBracketKeyword_0() { return cLeftSquareBracketKeyword_0; }
 
-		//"*" | INT
+		//'*' | INT
 		public Alternatives getAlternatives_1() { return cAlternatives_1; }
 
-		//"*"
+		//'*'
 		public Keyword getAsteriskKeyword_1_0() { return cAsteriskKeyword_1_0; }
 
 		//INT
 		public RuleCall getINTTerminalRuleCall_1_1() { return cINTTerminalRuleCall_1_1; }
 
-		//"]"
+		//']'
 		public Keyword getRightSquareBracketKeyword_2() { return cRightSquareBracketKeyword_2; }
 	}
 
 	public class AnnotationTargetTypeElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "AnnotationTargetType");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.AnnotationTargetType");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final Keyword cDataClassKeyword_0 = (Keyword)cAlternatives.eContents().get(0);
 		private final Keyword cActorClassKeyword_1 = (Keyword)cAlternatives.eContents().get(1);
@@ -3145,39 +3166,44 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cLogicalSystemKeyword_6 = (Keyword)cAlternatives.eContents().get(6);
 		
 		//AnnotationTargetType:
-		//	"DataClass" | "ActorClass" | "ActorBehavior" | "ProtocolClass" | "CompoundProtocolClass" | "SubSystemClass" |
-		//	"LogicalSystem";
-		public ParserRule getRule() { return rule; }
-
-		//"DataClass" | "ActorClass" | "ActorBehavior" | "ProtocolClass" | "CompoundProtocolClass" | "SubSystemClass" |
-		//"LogicalSystem"
+		//	'DataClass' |
+		//	'ActorClass' |
+		//	'ActorBehavior' |
+		//	'ProtocolClass' |
+		//	'CompoundProtocolClass' |
+		//	'SubSystemClass' |
+		//	'LogicalSystem';
+		@Override public ParserRule getRule() { return rule; }
+
+		//'DataClass' | 'ActorClass' | 'ActorBehavior' | 'ProtocolClass' | 'CompoundProtocolClass' | 'SubSystemClass' |
+		//'LogicalSystem'
 		public Alternatives getAlternatives() { return cAlternatives; }
 
-		//"DataClass"
+		//'DataClass'
 		public Keyword getDataClassKeyword_0() { return cDataClassKeyword_0; }
 
-		//"ActorClass"
+		//'ActorClass'
 		public Keyword getActorClassKeyword_1() { return cActorClassKeyword_1; }
 
-		//"ActorBehavior"
+		//'ActorBehavior'
 		public Keyword getActorBehaviorKeyword_2() { return cActorBehaviorKeyword_2; }
 
-		//"ProtocolClass"
+		//'ProtocolClass'
 		public Keyword getProtocolClassKeyword_3() { return cProtocolClassKeyword_3; }
 
-		//"CompoundProtocolClass"
+		//'CompoundProtocolClass'
 		public Keyword getCompoundProtocolClassKeyword_4() { return cCompoundProtocolClassKeyword_4; }
 
-		//"SubSystemClass"
+		//'SubSystemClass'
 		public Keyword getSubSystemClassKeyword_5() { return cSubSystemClassKeyword_5; }
 
-		//"LogicalSystem"
+		//'LogicalSystem'
 		public Keyword getLogicalSystemKeyword_6() { return cLogicalSystemKeyword_6; }
 	}
 	
 	
 	public class CommunicationTypeElements extends AbstractEnumRuleElementFinder {
-		private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "CommunicationType");
+		private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.CommunicationType");
 		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);
@@ -3186,65 +3212,67 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		private final EnumLiteralDeclaration cSYNCHRONOUSEnumLiteralDeclaration_2 = (EnumLiteralDeclaration)cAlternatives.eContents().get(2);
 		private final Keyword cSYNCHRONOUSSyncKeyword_2_0 = (Keyword)cSYNCHRONOUSEnumLiteralDeclaration_2.eContents().get(0);
 		
-		//// **************************************************************
-		//// protocol class
 		//enum CommunicationType:
-		//	EVENT_DRIVEN="eventdriven" | DATA_DRIVEN="datadriven" | SYNCHRONOUS="sync";
+		//	EVENT_DRIVEN='eventdriven' |
+		//	DATA_DRIVEN='datadriven' |
+		//	SYNCHRONOUS='sync';
 		public EnumRule getRule() { return rule; }
 
-		//EVENT_DRIVEN="eventdriven" | DATA_DRIVEN="datadriven" | SYNCHRONOUS="sync"
+		//EVENT_DRIVEN='eventdriven' | DATA_DRIVEN='datadriven' | 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; }
 
-		//SYNCHRONOUS="sync"
+		//SYNCHRONOUS='sync'
 		public EnumLiteralDeclaration getSYNCHRONOUSEnumLiteralDeclaration_2() { return cSYNCHRONOUSEnumLiteralDeclaration_2; }
 
-		//"sync"
+		//'sync'
 		public Keyword getSYNCHRONOUSSyncKeyword_2_0() { return cSYNCHRONOUSSyncKeyword_2_0; }
 	}
 
 	public class ReferenceTypeElements extends AbstractEnumRuleElementFinder {
-		private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "ReferenceType");
+		private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.ReferenceType");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final EnumLiteralDeclaration cFIXEDEnumLiteralDeclaration_0 = (EnumLiteralDeclaration)cAlternatives.eContents().get(0);
 		private final Keyword cFIXEDFixedKeyword_0_0 = (Keyword)cFIXEDEnumLiteralDeclaration_0.eContents().get(0);
 		private final EnumLiteralDeclaration cOPTIONALEnumLiteralDeclaration_1 = (EnumLiteralDeclaration)cAlternatives.eContents().get(1);
 		private final Keyword cOPTIONALOptionalKeyword_1_0 = (Keyword)cOPTIONALEnumLiteralDeclaration_1.eContents().get(0);
 		
-		//// IMPORTED='imported'
 		//enum ReferenceType:
-		//	FIXED="fixed" | OPTIONAL="optional";
+		//	FIXED='fixed' |
+		//	OPTIONAL='optional'
+		//	// IMPORTED='imported'
+		//;
 		public EnumRule getRule() { return rule; }
 
-		//FIXED="fixed" | OPTIONAL="optional"
+		//FIXED='fixed' | OPTIONAL='optional'
 		public Alternatives getAlternatives() { return cAlternatives; }
 
-		//FIXED="fixed"
+		//FIXED='fixed'
 		public EnumLiteralDeclaration getFIXEDEnumLiteralDeclaration_0() { return cFIXEDEnumLiteralDeclaration_0; }
 
-		//"fixed"
+		//'fixed'
 		public Keyword getFIXEDFixedKeyword_0_0() { return cFIXEDFixedKeyword_0_0; }
 
-		//OPTIONAL="optional"
+		//OPTIONAL='optional'
 		public EnumLiteralDeclaration getOPTIONALEnumLiteralDeclaration_1() { return cOPTIONALEnumLiteralDeclaration_1; }
 
-		//"optional"
+		//'optional'
 		public Keyword getOPTIONALOptionalKeyword_1_0() { return cOPTIONALOptionalKeyword_1_0; }
 	}
 
 	public class RoomAnnotationTargetEnumElements extends AbstractEnumRuleElementFinder {
-		private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "RoomAnnotationTargetEnum");
+		private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.RoomAnnotationTargetEnum");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final EnumLiteralDeclaration cDATA_CLASSEnumLiteralDeclaration_0 = (EnumLiteralDeclaration)cAlternatives.eContents().get(0);
 		private final Keyword cDATA_CLASSDataClassKeyword_0_0 = (Keyword)cDATA_CLASSEnumLiteralDeclaration_0.eContents().get(0);
@@ -3262,56 +3290,60 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cLOGICAL_SYSTEM_CLASSLogicalSystemKeyword_6_0 = (Keyword)cLOGICAL_SYSTEM_CLASSEnumLiteralDeclaration_6.eContents().get(0);
 		
 		//enum RoomAnnotationTargetEnum:
-		//	DATA_CLASS="DataClass" | ACTOR_CLASS="ActorClass" | ACTOR_BEHAVIOR="ActorBehavior" | PROTOCOL_CLASS="ProtocolClass" |
-		//	COMPOUND_PROTOCOL_CLASS="CompoundProtocolClass" | SUBSYSTEM_CLASS="SubSystemClass" |
-		//	LOGICAL_SYSTEM_CLASS="LogicalSystem";
+		//	DATA_CLASS='DataClass' |
+		//	ACTOR_CLASS='ActorClass' |
+		//	ACTOR_BEHAVIOR='ActorBehavior' |
+		//	PROTOCOL_CLASS='ProtocolClass' |
+		//	COMPOUND_PROTOCOL_CLASS='CompoundProtocolClass' |
+		//	SUBSYSTEM_CLASS='SubSystemClass' |
+		//	LOGICAL_SYSTEM_CLASS='LogicalSystem';
 		public EnumRule getRule() { return rule; }
 
-		//DATA_CLASS="DataClass" | ACTOR_CLASS="ActorClass" | ACTOR_BEHAVIOR="ActorBehavior" | PROTOCOL_CLASS="ProtocolClass" |
-		//COMPOUND_PROTOCOL_CLASS="CompoundProtocolClass" | SUBSYSTEM_CLASS="SubSystemClass" |
-		//LOGICAL_SYSTEM_CLASS="LogicalSystem"
+		//DATA_CLASS='DataClass' | ACTOR_CLASS='ActorClass' | ACTOR_BEHAVIOR='ActorBehavior' | PROTOCOL_CLASS='ProtocolClass' |
+		//COMPOUND_PROTOCOL_CLASS='CompoundProtocolClass' | SUBSYSTEM_CLASS='SubSystemClass' |
+		//LOGICAL_SYSTEM_CLASS='LogicalSystem'
 		public Alternatives getAlternatives() { return cAlternatives; }
 
-		//DATA_CLASS="DataClass"
+		//DATA_CLASS='DataClass'
 		public EnumLiteralDeclaration getDATA_CLASSEnumLiteralDeclaration_0() { return cDATA_CLASSEnumLiteralDeclaration_0; }
 
-		//"DataClass"
+		//'DataClass'
 		public Keyword getDATA_CLASSDataClassKeyword_0_0() { return cDATA_CLASSDataClassKeyword_0_0; }
 
-		//ACTOR_CLASS="ActorClass"
+		//ACTOR_CLASS='ActorClass'
 		public EnumLiteralDeclaration getACTOR_CLASSEnumLiteralDeclaration_1() { return cACTOR_CLASSEnumLiteralDeclaration_1; }
 
-		//"ActorClass"
+		//'ActorClass'
 		public Keyword getACTOR_CLASSActorClassKeyword_1_0() { return cACTOR_CLASSActorClassKeyword_1_0; }
 
-		//ACTOR_BEHAVIOR="ActorBehavior"
+		//ACTOR_BEHAVIOR='ActorBehavior'
 		public EnumLiteralDeclaration getACTOR_BEHAVIOREnumLiteralDeclaration_2() { return cACTOR_BEHAVIOREnumLiteralDeclaration_2; }
 
-		//"ActorBehavior"
+		//'ActorBehavior'
 		public Keyword getACTOR_BEHAVIORActorBehaviorKeyword_2_0() { return cACTOR_BEHAVIORActorBehaviorKeyword_2_0; }
 
-		//PROTOCOL_CLASS="ProtocolClass"
+		//PROTOCOL_CLASS='ProtocolClass'
 		public EnumLiteralDeclaration getPROTOCOL_CLASSEnumLiteralDeclaration_3() { return cPROTOCOL_CLASSEnumLiteralDeclaration_3; }
 
-		//"ProtocolClass"
+		//'ProtocolClass'
 		public Keyword getPROTOCOL_CLASSProtocolClassKeyword_3_0() { return cPROTOCOL_CLASSProtocolClassKeyword_3_0; }
 
-		//COMPOUND_PROTOCOL_CLASS="CompoundProtocolClass"
+		//COMPOUND_PROTOCOL_CLASS='CompoundProtocolClass'
 		public EnumLiteralDeclaration getCOMPOUND_PROTOCOL_CLASSEnumLiteralDeclaration_4() { return cCOMPOUND_PROTOCOL_CLASSEnumLiteralDeclaration_4; }
 
-		//"CompoundProtocolClass"
+		//'CompoundProtocolClass'
 		public Keyword getCOMPOUND_PROTOCOL_CLASSCompoundProtocolClassKeyword_4_0() { return cCOMPOUND_PROTOCOL_CLASSCompoundProtocolClassKeyword_4_0; }
 
-		//SUBSYSTEM_CLASS="SubSystemClass"
+		//SUBSYSTEM_CLASS='SubSystemClass'
 		public EnumLiteralDeclaration getSUBSYSTEM_CLASSEnumLiteralDeclaration_5() { return cSUBSYSTEM_CLASSEnumLiteralDeclaration_5; }
 
-		//"SubSystemClass"
+		//'SubSystemClass'
 		public Keyword getSUBSYSTEM_CLASSSubSystemClassKeyword_5_0() { return cSUBSYSTEM_CLASSSubSystemClassKeyword_5_0; }
 
-		//LOGICAL_SYSTEM_CLASS="LogicalSystem"
+		//LOGICAL_SYSTEM_CLASS='LogicalSystem'
 		public EnumLiteralDeclaration getLOGICAL_SYSTEM_CLASSEnumLiteralDeclaration_6() { return cLOGICAL_SYSTEM_CLASSEnumLiteralDeclaration_6; }
 
-		//"LogicalSystem"
+		//'LogicalSystem'
 		public Keyword getLOGICAL_SYSTEM_CLASSLogicalSystemKeyword_6_0() { return cLOGICAL_SYSTEM_CLASSLogicalSystemKeyword_6_0; }
 	}
 	
@@ -3333,7 +3365,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	private final StandardOperationElements pStandardOperation;
 	private final PortOperationElements pPortOperation;
 	private final ClassStructorElements pClassStructor;
-	private final CommunicationTypeElements unknownRuleCommunicationType;
+	private final CommunicationTypeElements eCommunicationType;
 	private final GeneralProtocolClassElements pGeneralProtocolClass;
 	private final ProtocolClassElements pProtocolClass;
 	private final CompoundProtocolClassElements pCompoundProtocolClass;
@@ -3367,21 +3399,29 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	private final RelaySAPointElements pRelaySAPoint;
 	private final SPPointElements pSPPoint;
 	private final ActorRefElements pActorRef;
-	private final ReferenceTypeElements unknownRuleReferenceType;
+	private final ReferenceTypeElements eReferenceType;
 	private final AbstractInterfaceItemElements pAbstractInterfaceItem;
 	private final MULTIPLICITYElements pMULTIPLICITY;
 	private final AnnotationTargetTypeElements pAnnotationTargetType;
-	private final RoomAnnotationTargetEnumElements unknownRuleRoomAnnotationTargetEnum;
+	private final RoomAnnotationTargetEnumElements eRoomAnnotationTargetEnum;
 	
 	private final Grammar grammar;
 
 	private final FSMGrammarAccess gaFSM;
 
+	private final BaseGrammarAccess gaBase;
+
+	private final TerminalsGrammarAccess gaTerminals;
+
 	@Inject
 	public RoomGrammarAccess(GrammarProvider grammarProvider,
-		FSMGrammarAccess gaFSM) {
+		FSMGrammarAccess gaFSM,
+		BaseGrammarAccess gaBase,
+		TerminalsGrammarAccess gaTerminals) {
 		this.grammar = internalFindGrammar(grammarProvider);
 		this.gaFSM = gaFSM;
+		this.gaBase = gaBase;
+		this.gaTerminals = gaTerminals;
 		this.pRoomModel = new RoomModelElements();
 		this.pRoomClass = new RoomClassElements();
 		this.pStructureClass = new StructureClassElements();
@@ -3400,7 +3440,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		this.pStandardOperation = new StandardOperationElements();
 		this.pPortOperation = new PortOperationElements();
 		this.pClassStructor = new ClassStructorElements();
-		this.unknownRuleCommunicationType = new CommunicationTypeElements();
+		this.eCommunicationType = new CommunicationTypeElements();
 		this.pGeneralProtocolClass = new GeneralProtocolClassElements();
 		this.pProtocolClass = new ProtocolClassElements();
 		this.pCompoundProtocolClass = new CompoundProtocolClassElements();
@@ -3434,11 +3474,11 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		this.pRelaySAPoint = new RelaySAPointElements();
 		this.pSPPoint = new SPPointElements();
 		this.pActorRef = new ActorRefElements();
-		this.unknownRuleReferenceType = new ReferenceTypeElements();
+		this.eReferenceType = new ReferenceTypeElements();
 		this.pAbstractInterfaceItem = new AbstractInterfaceItemElements();
 		this.pMULTIPLICITY = new MULTIPLICITYElements();
 		this.pAnnotationTargetType = new AnnotationTargetTypeElements();
-		this.unknownRuleRoomAnnotationTargetEnum = new RoomAnnotationTargetEnumElements();
+		this.eRoomAnnotationTargetEnum = new RoomAnnotationTargetEnumElements();
 	}
 	
 	protected Grammar internalFindGrammar(GrammarProvider grammarProvider) {
@@ -3457,7 +3497,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		return grammar;
 	}
 	
-	
+	@Override
 	public Grammar getGrammar() {
 		return grammar;
 	}
@@ -3467,12 +3507,21 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		return gaFSM;
 	}
 
+	public BaseGrammarAccess getBaseGrammarAccess() {
+		return gaBase;
+	}
+
+	public TerminalsGrammarAccess getTerminalsGrammarAccess() {
+		return gaTerminals;
+	}
+
 	
 	//RoomModel:
-	//	"RoomModel" name=FQN docu=Documentation? "{" imports+=Import* (primitiveTypes+=PrimitiveType |
-	//	enumerationTypes+=EnumerationType | externalTypes+=ExternalType | dataClasses+=DataClass |
-	//	protocolClasses+=GeneralProtocolClass | actorClasses+=ActorClass | subSystemClasses+=SubSystemClass |
-	//	systems+=LogicalSystem | annotationTypes+=AnnotationType)* "}";
+	//	'RoomModel' name=FQN docu=Documentation? '{'
+	//	imports+=Import* (primitiveTypes+=PrimitiveType | enumerationTypes+=EnumerationType | externalTypes+=ExternalType |
+	//	dataClasses+=DataClass | protocolClasses+=GeneralProtocolClass | actorClasses+=ActorClass |
+	//	subSystemClasses+=SubSystemClass | systems+=LogicalSystem | annotationTypes+=AnnotationType)*
+	//	'}';
 	public RoomModelElements getRoomModelAccess() {
 		return pRoomModel;
 	}
@@ -3514,7 +3563,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	//// **************************************************************
 	//// data class
 	//VarDecl:
-	//	name=ID ":" refType=RefableType;
+	//	name=ID ':' refType=RefableType;
 	public VarDeclElements getVarDeclAccess() {
 		return pVarDecl;
 	}
@@ -3524,7 +3573,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//RefableType:
-	//	type=[DataType|FQN] ref?="ref"?;
+	//	type=[DataType|FQN] ref?='ref'?;
 	public RefableTypeElements getRefableTypeAccess() {
 		return pRefableType;
 	}
@@ -3554,7 +3603,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//PrimitiveType:
-	//	"PrimitiveType" name=ID ":" type=LiteralType "->" targetName=STRING ("(" castName=FQN ")")? "default"
+	//	'PrimitiveType' name=ID ':' type=LiteralType '->' targetName=STRING ('(' castName=FQN ')')? 'default'
 	//	defaultValueLiteral=STRING docu=Documentation?;
 	public PrimitiveTypeElements getPrimitiveTypeAccess() {
 		return pPrimitiveType;
@@ -3565,8 +3614,9 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//EnumerationType:
-	//	"Enumeration" name=ID docu=Documentation? ("of" primitiveType=[PrimitiveType|FQN])? "{" (literals+=EnumLiteral (","
-	//	literals+=EnumLiteral)*)? "}";
+	//	'Enumeration' name=ID docu=Documentation? ('of' primitiveType=[PrimitiveType|FQN])? '{' (literals+=EnumLiteral (','
+	//	literals+=EnumLiteral)*)?
+	//	'}';
 	public EnumerationTypeElements getEnumerationTypeAccess() {
 		return pEnumerationType;
 	}
@@ -3576,7 +3626,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//EnumLiteral:
-	//	name=ID ("=" literal=IntLiteral)?;
+	//	name=ID ('=' literal=IntLiteral)?;
 	public EnumLiteralElements getEnumLiteralAccess() {
 		return pEnumLiteral;
 	}
@@ -3586,7 +3636,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//ExternalType:
-	//	"ExternalType" name=ID "->" targetName=STRING ("default" defaultValueLiteral=STRING)? docu=Documentation?;
+	//	'ExternalType' name=ID '->' targetName=STRING ('default' defaultValueLiteral=STRING)? docu=Documentation?;
 	public ExternalTypeElements getExternalTypeAccess() {
 		return pExternalType;
 	}
@@ -3597,9 +3647,10 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 
 	//// TODOHRR: define detail level language?
 	//DataClass:
-	//	"DataClass" name=ID docu=Documentation? ("extends" base=[DataClass|FQN])? "{" annotations+=Annotation* ("usercode1"
-	//	userCode1=DetailCode)? ("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)?
-	//	(operations+=StandardOperation | structors+=ClassStructor | attributes+=Attribute)* "}";
+	//	'DataClass' name=ID docu=Documentation? ('extends' base=[DataClass|FQN])? '{'
+	//	annotations+=Annotation* ('usercode1' userCode1=DetailCode)? ('usercode2' userCode2=DetailCode)? ('usercode3'
+	//	userCode3=DetailCode)? (operations+=StandardOperation | structors+=ClassStructor | attributes+=Attribute)*
+	//	'}';
 	public DataClassElements getDataClassAccess() {
 		return pDataClass;
 	}
@@ -3609,7 +3660,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//Attribute:
-	//	"Attribute" name=ID ("[" size=INT "]")? ":" type=RefableType? ("=" defaultValueLiteral=STRING)? docu=Documentation?;
+	//	'Attribute' name=ID ('[' size=INT ']')? ':' type=RefableType? ('=' defaultValueLiteral=STRING)? docu=Documentation?;
 	public AttributeElements getAttributeAccess() {
 		return pAttribute;
 	}
@@ -3629,8 +3680,10 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//StandardOperation:
-	//	override?="override"? "Operation" name=ID "(" (arguments+=VarDecl ("," arguments+=VarDecl)*)? ")" (":" ("void" |
-	//	returnType=RefableType))? docu=Documentation? detailCode=DetailCode;
+	//	override?='override'? 'Operation' name=ID '(' (arguments+=VarDecl (',' arguments+=VarDecl)*)? ')' (':' ('void' |
+	//	returnType=RefableType))?
+	//	docu=Documentation?
+	//	detailCode=DetailCode;
 	public StandardOperationElements getStandardOperationAccess() {
 		return pStandardOperation;
 	}
@@ -3640,8 +3693,10 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//PortOperation:
-	//	"Operation" name=ID "(" (arguments+=VarDecl ("," arguments+=VarDecl)*)? ")" (":" ("void" | returnType=RefableType) |
-	//	"sends" sendsMsg=[Message])? docu=Documentation? detailCode=DetailCode;
+	//	'Operation' name=ID '(' (arguments+=VarDecl (',' arguments+=VarDecl)*)? ')' (':' ('void' | returnType=RefableType) |
+	//	'sends' sendsMsg=[Message])?
+	//	docu=Documentation?
+	//	detailCode=DetailCode;
 	public PortOperationElements getPortOperationAccess() {
 		return pPortOperation;
 	}
@@ -3651,7 +3706,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//ClassStructor:
-	//	name=("ctor" | "dtor") detailCode=DetailCode;
+	//	name=('ctor' | 'dtor') detailCode=DetailCode;
 	public ClassStructorElements getClassStructorAccess() {
 		return pClassStructor;
 	}
@@ -3660,12 +3715,12 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		return getClassStructorAccess().getRule();
 	}
 
-	//// **************************************************************
-	//// protocol class
 	//enum CommunicationType:
-	//	EVENT_DRIVEN="eventdriven" | DATA_DRIVEN="datadriven" | SYNCHRONOUS="sync";
+	//	EVENT_DRIVEN='eventdriven' |
+	//	DATA_DRIVEN='datadriven' |
+	//	SYNCHRONOUS='sync';
 	public CommunicationTypeElements getCommunicationTypeAccess() {
-		return unknownRuleCommunicationType;
+		return eCommunicationType;
 	}
 	
 	public EnumRule getCommunicationTypeRule() {
@@ -3683,11 +3738,13 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//ProtocolClass:
-	//	commType=CommunicationType? "ProtocolClass" name=ID docu=Documentation? ("extends" base=[ProtocolClass|FQN])? "{"
-	//	annotations+=Annotation* ("usercode1" userCode1=DetailCode)? ("usercode2" userCode2=DetailCode)? ("usercode3"
-	//	userCode3=DetailCode)? ("incoming" "{" incomingMessages+=Message* "}")? ("outgoing" "{" outgoingMessages+=Message*
-	//	"}")? ("regular" "PortClass" regular=PortClass)? ("conjugated" "PortClass" conjugated=PortClass)?
-	//	semantics=ProtocolSemantics? "}";
+	//	commType=CommunicationType?
+	//	'ProtocolClass' name=ID docu=Documentation? ('extends' base=[ProtocolClass|FQN])? '{'
+	//	annotations+=Annotation* ('usercode1' userCode1=DetailCode)? ('usercode2' userCode2=DetailCode)? ('usercode3'
+	//	userCode3=DetailCode)? ('incoming' '{' incomingMessages+=Message* '}')? ('outgoing' '{' outgoingMessages+=Message*
+	//	'}')? ('regular' 'PortClass' regular=PortClass)? ('conjugated' 'PortClass' conjugated=PortClass)?
+	//	semantics=ProtocolSemantics?
+	//	'}';
 	public ProtocolClassElements getProtocolClassAccess() {
 		return pProtocolClass;
 	}
@@ -3697,7 +3754,10 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//CompoundProtocolClass:
-	//	"CompoundProtocolClass" name=ID docu=Documentation? "{" annotations+=Annotation* subProtocols+=SubProtocol* "}";
+	//	'CompoundProtocolClass' name=ID docu=Documentation? '{'
+	//	annotations+=Annotation*
+	//	subProtocols+=SubProtocol*
+	//	'}';
 	public CompoundProtocolClassElements getCompoundProtocolClassAccess() {
 		return pCompoundProtocolClass;
 	}
@@ -3707,7 +3767,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//SubProtocol:
-	//	"SubProtocol" name=ID ":" protocol=[GeneralProtocolClass|FQN];
+	//	'SubProtocol' name=ID ':' protocol=[GeneralProtocolClass|FQN];
 	public SubProtocolElements getSubProtocolAccess() {
 		return pSubProtocol;
 	}
@@ -3717,7 +3777,8 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//Message:
-	//	priv?="private"? "Message" name=ID "(" data=VarDecl? ")" docu=Documentation?;
+	//	priv?='private'? 'Message' name=ID '(' data=VarDecl? ')'
+	//	docu=Documentation?;
 	public MessageElements getMessageAccess() {
 		return pMessage;
 	}
@@ -3727,8 +3788,10 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//PortClass:
-	//	{PortClass} "{" ("usercode" userCode=DetailCode)? (msgHandlers+=MessageHandler | operations+=PortOperation |
-	//	attributes+=Attribute)* "}";
+	//	{PortClass}
+	//	'{' ('usercode' userCode=DetailCode)? (msgHandlers+=MessageHandler | operations+=PortOperation |
+	//	attributes+=Attribute)*
+	//	'}';
 	public PortClassElements getPortClassAccess() {
 		return pPortClass;
 	}
@@ -3748,7 +3811,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//InMessageHandler:
-	//	"handle" "incoming" msg=[Message] detailCode=DetailCode;
+	//	'handle' 'incoming' msg=[Message] detailCode=DetailCode;
 	public InMessageHandlerElements getInMessageHandlerAccess() {
 		return pInMessageHandler;
 	}
@@ -3758,7 +3821,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//OutMessageHandler:
-	//	"handle" "outgoing" msg=[Message] detailCode=DetailCode;
+	//	'handle' 'outgoing' msg=[Message] detailCode=DetailCode;
 	public OutMessageHandlerElements getOutMessageHandlerAccess() {
 		return pOutMessageHandler;
 	}
@@ -3787,14 +3850,18 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	//// p in i and p in s ==> external end port
 	//// since double containment is not supported we decided to define external ports as reference to interface ports
 	//ActorClass:
-	//	(abstract?="abstract"? & commType=ComponentCommunicationType?) "ActorClass" name=ID docu=Documentation? ("extends"
-	//	base=[ActorClass|FQN])? "{" annotations+=Annotation* ("Interface" "{" (serviceProvisionPoints+=SPP |
-	//	interfacePorts+=Port)* "}")? ("Structure" structureDocu=Documentation? "{" ("usercode1" userCode1=DetailCode)?
-	//	("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)? // workaround: reverse the order for serializer
-	//	(connections+=LayerConnection | bindings+=Binding | serviceImplementations+=ServiceImplementation |
-	//	attributes+=Attribute | actorRefs+=ActorRef | serviceAccessPoints+=SAP | internalPorts+=Port |
-	//	externalPorts+=ExternalPort)* "}")? ("Behavior" behaviorDocu=Documentation? "{" behaviorAnnotations+=Annotation*
-	//	(operations+=StandardOperation | structors+=ClassStructor)* stateMachine=StateMachine? "}")? "}";
+	//	(abstract?='abstract'? & commType=ComponentCommunicationType?)
+	//	'ActorClass' name=ID docu=Documentation? ('extends' base=[ActorClass|FQN])? '{'
+	//	annotations+=Annotation* ('Interface' '{' (serviceProvisionPoints+=SPP | interfacePorts+=Port)*
+	//	'}')? ('Structure' structureDocu=Documentation? '{' ('usercode1' userCode1=DetailCode)? ('usercode2'
+	//	userCode2=DetailCode)? ('usercode3' userCode3=DetailCode)? (connections+=LayerConnection | bindings+=Binding |
+	//	serviceImplementations+=ServiceImplementation | attributes+=Attribute | actorRefs+=ActorRef |
+	//	serviceAccessPoints+=SAP | internalPorts+=Port | externalPorts+=ExternalPort)*
+	//	'}')? ('Behavior' behaviorDocu=Documentation? '{'
+	//	behaviorAnnotations+=Annotation* (operations+=StandardOperation | structors+=ClassStructor)*
+	//	stateMachine=StateMachine?
+	//	'}')?
+	//	'}';
 	public ActorClassElements getActorClassAccess() {
 		return pActorClass;
 	}
@@ -3814,7 +3881,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//Port:
-	//	conjugated?="conjugated"? "Port" name=ID multiplicity=MULTIPLICITY? ":" protocol=[GeneralProtocolClass|FQN]
+	//	conjugated?='conjugated'? 'Port' name=ID multiplicity=MULTIPLICITY? ':' protocol=[GeneralProtocolClass|FQN]
 	//	docu=Documentation?;
 	public PortElements getPortAccess() {
 		return pPort;
@@ -3825,7 +3892,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//ExternalPort:
-	//	"external" "Port" interfacePort=[Port];
+	//	'external' 'Port' interfacePort=[Port];
 	public ExternalPortElements getExternalPortAccess() {
 		return pExternalPort;
 	}
@@ -3835,7 +3902,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//SAP:
-	//	"SAP" name=ID ":" protocol=[ProtocolClass|FQN];
+	//	'SAP' name=ID ':' protocol=[ProtocolClass|FQN];
 	public SAPElements getSAPAccess() {
 		return pSAP;
 	}
@@ -3845,7 +3912,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//SPP:
-	//	"SPP" name=ID ":" protocol=[ProtocolClass|FQN];
+	//	'SPP' name=ID ':' protocol=[ProtocolClass|FQN];
 	public SPPElements getSPPAccess() {
 		return pSPP;
 	}
@@ -3855,7 +3922,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//ServiceImplementation:
-	//	"ServiceImplementation" "of" spp=[SPP];
+	//	'ServiceImplementation' 'of' spp=[SPP];
 	public ServiceImplementationElements getServiceImplementationAccess() {
 		return pServiceImplementation;
 	}
@@ -3865,8 +3932,9 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//LogicalSystem:
-	//	"LogicalSystem" name=ID docu=Documentation? "{" annotations+=Annotation* (connections+=LayerConnection |
-	//	bindings+=Binding | subSystems+=SubSystemRef)* "}";
+	//	'LogicalSystem' name=ID docu=Documentation? '{'
+	//	annotations+=Annotation* (connections+=LayerConnection | bindings+=Binding | subSystems+=SubSystemRef)*
+	//	'}';
 	public LogicalSystemElements getLogicalSystemAccess() {
 		return pLogicalSystem;
 	}
@@ -3886,7 +3954,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//SubSystemRef:
-	//	"SubSystemRef" name=ID ":" type=[SubSystemClass|FQN] docu=Documentation?;
+	//	'SubSystemRef' name=ID ':' type=[SubSystemClass|FQN] docu=Documentation?;
 	public SubSystemRefElements getSubSystemRefAccess() {
 		return pSubSystemRef;
 	}
@@ -3896,10 +3964,12 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//SubSystemClass:
-	//	"SubSystemClass" name=ID docu=Documentation? "{" annotations+=Annotation* ("usercode1" userCode1=DetailCode)?
-	//	("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)? // workaround: reverse the order for serializer
-	//	(actorInstanceMappings+=ActorInstanceMapping | threads+=LogicalThread | connections+=LayerConnection |
-	//	bindings+=Binding | actorRefs+=ActorRef | serviceProvisionPoints+=SPP | relayPorts+=Port)* "}";
+	//	'SubSystemClass' name=ID docu=Documentation? '{'
+	//	annotations+=Annotation* ('usercode1' userCode1=DetailCode)? ('usercode2' userCode2=DetailCode)? ('usercode3'
+	//	userCode3=DetailCode)? (actorInstanceMappings+=ActorInstanceMapping | threads+=LogicalThread |
+	//	connections+=LayerConnection | bindings+=Binding | actorRefs+=ActorRef | serviceProvisionPoints+=SPP |
+	//	relayPorts+=Port)*
+	//	'}';
 	public SubSystemClassElements getSubSystemClassAccess() {
 		return pSubSystemClass;
 	}
@@ -3909,7 +3979,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//LogicalThread:
-	//	"LogicalThread" name=ID;
+	//	'LogicalThread' name=ID;
 	public LogicalThreadElements getLogicalThreadAccess() {
 		return pLogicalThread;
 	}
@@ -3919,8 +3989,9 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//ActorInstanceMapping:
-	//	"ActorInstanceMapping" path=RefPath "->" thread=[LogicalThread] ("{" actorInstanceMappings+=ActorInstanceMapping*
-	//	"}")?;
+	//	'ActorInstanceMapping' path=RefPath '->' thread=[LogicalThread] ('{'
+	//	actorInstanceMappings+=ActorInstanceMapping*
+	//	'}')?;
 	public ActorInstanceMappingElements getActorInstanceMappingAccess() {
 		return pActorInstanceMapping;
 	}
@@ -3930,7 +4001,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//RefPath:
-	//	refs+=RefSegment ("/" refs+=RefSegment)*;
+	//	refs+=RefSegment ('/' refs+=RefSegment)*;
 	public RefPathElements getRefPathAccess() {
 		return pRefPath;
 	}
@@ -3940,7 +4011,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//RefSegment:
-	//	ref=ID (":" idx=INT)?;
+	//	ref=ID (':' idx=INT)?;
 	public RefSegmentElements getRefSegmentAccess() {
 		return pRefSegment;
 	}
@@ -3950,7 +4021,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//Binding:
-	//	"Binding" endpoint1=BindingEndPoint "and" endpoint2=BindingEndPoint;
+	//	'Binding' endpoint1=BindingEndPoint 'and' endpoint2=BindingEndPoint;
 	public BindingElements getBindingAccess() {
 		return pBinding;
 	}
@@ -3960,7 +4031,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//BindingEndPoint:
-	//	(actorRef=[ActorContainerRef] ".")? port=[Port] ("sub" sub=[SubProtocol])?;
+	//	(actorRef=[ActorContainerRef] '.')? port=[Port] ('sub' sub=[SubProtocol])?;
 	public BindingEndPointElements getBindingEndPointAccess() {
 		return pBindingEndPoint;
 	}
@@ -3970,7 +4041,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//LayerConnection:
-	//	"LayerConnection" from=SAPoint "satisfied_by" to=SPPoint;
+	//	'LayerConnection' from=SAPoint 'satisfied_by' to=SPPoint;
 	public LayerConnectionElements getLayerConnectionAccess() {
 		return pLayerConnection;
 	}
@@ -3990,7 +4061,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//RefSAPoint: // satisfies a sub actor
-	//	"ref" ref=[ActorContainerRef];
+	//	'ref' ref=[ActorContainerRef];
 	public RefSAPointElements getRefSAPointAccess() {
 		return pRefSAPoint;
 	}
@@ -4000,7 +4071,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//RelaySAPoint: // relays from own interface
-	//	"relay_sap" relay=[SPP];
+	//	'relay_sap' relay=[SPP];
 	public RelaySAPointElements getRelaySAPointAccess() {
 		return pRelaySAPoint;
 	}
@@ -4010,7 +4081,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//SPPoint:
-	//	ref=[ActorContainerRef] "." service=[SPP];
+	//	ref=[ActorContainerRef] '.' service=[SPP];
 	public SPPointElements getSPPointAccess() {
 		return pSPPoint;
 	}
@@ -4020,7 +4091,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//ActorRef:
-	//	refType=ReferenceType? "ActorRef" name=ID multiplicity=MULTIPLICITY? ":" type=[ActorClass|FQN] docu=Documentation?;
+	//	refType=ReferenceType? 'ActorRef' name=ID multiplicity=MULTIPLICITY? ':' type=[ActorClass|FQN] docu=Documentation?;
 	public ActorRefElements getActorRefAccess() {
 		return pActorRef;
 	}
@@ -4029,11 +4100,13 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		return getActorRefAccess().getRule();
 	}
 
-	//// IMPORTED='imported'
 	//enum ReferenceType:
-	//	FIXED="fixed" | OPTIONAL="optional";
+	//	FIXED='fixed' |
+	//	OPTIONAL='optional'
+	//	// IMPORTED='imported'
+	//;
 	public ReferenceTypeElements getReferenceTypeAccess() {
-		return unknownRuleReferenceType;
+		return eReferenceType;
 	}
 	
 	public EnumRule getReferenceTypeRule() {
@@ -4057,8 +4130,8 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	//// general
 	//// the following is a data type rule (accompanied by a value converter) and must not be a terminal rule
 	//// (because then the lexer already would find this in places where it is not expected, e.g. in an Attribute)
-	//MULTIPLICITY returns ecore::EInt:
-	//	"[" ("*" | INT) "]";
+	//MULTIPLICITY ecore::EInt:
+	//	'[' ('*' | INT) ']'
 	public MULTIPLICITYElements getMULTIPLICITYAccess() {
 		return pMULTIPLICITY;
 	}
@@ -4068,8 +4141,13 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//AnnotationTargetType:
-	//	"DataClass" | "ActorClass" | "ActorBehavior" | "ProtocolClass" | "CompoundProtocolClass" | "SubSystemClass" |
-	//	"LogicalSystem";
+	//	'DataClass' |
+	//	'ActorClass' |
+	//	'ActorBehavior' |
+	//	'ProtocolClass' |
+	//	'CompoundProtocolClass' |
+	//	'SubSystemClass' |
+	//	'LogicalSystem';
 	public AnnotationTargetTypeElements getAnnotationTargetTypeAccess() {
 		return pAnnotationTargetType;
 	}
@@ -4079,11 +4157,15 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//enum RoomAnnotationTargetEnum:
-	//	DATA_CLASS="DataClass" | ACTOR_CLASS="ActorClass" | ACTOR_BEHAVIOR="ActorBehavior" | PROTOCOL_CLASS="ProtocolClass" |
-	//	COMPOUND_PROTOCOL_CLASS="CompoundProtocolClass" | SUBSYSTEM_CLASS="SubSystemClass" |
-	//	LOGICAL_SYSTEM_CLASS="LogicalSystem";
+	//	DATA_CLASS='DataClass' |
+	//	ACTOR_CLASS='ActorClass' |
+	//	ACTOR_BEHAVIOR='ActorBehavior' |
+	//	PROTOCOL_CLASS='ProtocolClass' |
+	//	COMPOUND_PROTOCOL_CLASS='CompoundProtocolClass' |
+	//	SUBSYSTEM_CLASS='SubSystemClass' |
+	//	LOGICAL_SYSTEM_CLASS='LogicalSystem';
 	public RoomAnnotationTargetEnumElements getRoomAnnotationTargetEnumAccess() {
-		return unknownRuleRoomAnnotationTargetEnum;
+		return eRoomAnnotationTargetEnum;
 	}
 	
 	public EnumRule getRoomAnnotationTargetEnumRule() {
@@ -4091,7 +4173,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//FSMModel:
-	//	components+=ModelComponent*;
+	//	components+=super::ModelComponent*;
 	public FSMGrammarAccess.FSMModelElements getFSMModelAccess() {
 		return gaFSM.getFSMModelAccess();
 	}
@@ -4100,9 +4182,11 @@ public class RoomGrammarAccess 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 FSMGrammarAccess.ComponentCommunicationTypeElements getComponentCommunicationTypeAccess() {
 		return gaFSM.getComponentCommunicationTypeAccess();
 	}
@@ -4137,8 +4221,10 @@ public class RoomGrammarAccess 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 FSMGrammarAccess.StateGraphElements getStateGraphAccess() {
 		return gaFSM.getStateGraphAccess();
 	}
@@ -4147,9 +4233,11 @@ public class RoomGrammarAccess 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 FSMGrammarAccess.StateMachineElements getStateMachineAccess() {
 		return gaFSM.getStateMachineAccess();
 	}
@@ -4172,8 +4260,9 @@ public class RoomGrammarAccess 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 FSMGrammarAccess.SimpleStateElements getSimpleStateAccess() {
 		return gaFSM.getSimpleStateAccess();
 	}
@@ -4183,8 +4272,9 @@ public class RoomGrammarAccess 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 FSMGrammarAccess.RefinedStateElements getRefinedStateAccess() {
 		return gaFSM.getRefinedStateAccess();
 	}
@@ -4196,7 +4286,9 @@ public class RoomGrammarAccess 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 FSMGrammarAccess.DetailCodeElements getDetailCodeAccess() {
 		return gaFSM.getDetailCodeAccess();
 	}
@@ -4219,7 +4311,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//TransitionPoint:
-	//	handler?="handler"? "TransitionPoint" name=ID;
+	//	handler?='handler'? 'TransitionPoint' name=ID;
 	public FSMGrammarAccess.TransitionPointElements getTransitionPointAccess() {
 		return gaFSM.getTransitionPointAccess();
 	}
@@ -4229,7 +4321,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//EntryPoint:
-	//	"EntryPoint" name=ID;
+	//	'EntryPoint' name=ID;
 	public FSMGrammarAccess.EntryPointElements getEntryPointAccess() {
 		return gaFSM.getEntryPointAccess();
 	}
@@ -4239,7 +4331,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//ExitPoint:
-	//	"ExitPoint" name=ID;
+	//	'ExitPoint' name=ID;
 	public FSMGrammarAccess.ExitPointElements getExitPointAccess() {
 		return gaFSM.getExitPointAccess();
 	}
@@ -4252,7 +4344,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	//// choice point
 	////
 	//ChoicePoint:
-	//	"ChoicePoint" name=ID docu=Documentation?;
+	//	'ChoicePoint' name=ID docu=Documentation?;
 	public FSMGrammarAccess.ChoicePointElements getChoicePointAccess() {
 		return gaFSM.getChoicePointAccess();
 	}
@@ -4264,6 +4356,16 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	////
 	//// transitions
 	////
+	//TransitionBase:
+	//	Transition | RefinedTransition;
+	public FSMGrammarAccess.TransitionBaseElements getTransitionBaseAccess() {
+		return gaFSM.getTransitionBaseAccess();
+	}
+	
+	public ParserRule getTransitionBaseRule() {
+		return getTransitionBaseAccess().getRule();
+	}
+
 	//Transition:
 	//	InitialTransition | NonInitialTransition;
 	public FSMGrammarAccess.TransitionElements getTransitionAccess() {
@@ -4295,8 +4397,9 @@ public class RoomGrammarAccess 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 FSMGrammarAccess.InitialTransitionElements getInitialTransitionAccess() {
 		return gaFSM.getInitialTransitionAccess();
 	}
@@ -4306,8 +4409,9 @@ public class RoomGrammarAccess 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 FSMGrammarAccess.ContinuationTransitionElements getContinuationTransitionAccess() {
 		return gaFSM.getContinuationTransitionAccess();
 	}
@@ -4317,8 +4421,13 @@ public class RoomGrammarAccess 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 FSMGrammarAccess.TriggeredTransitionElements getTriggeredTransitionAccess() {
 		return gaFSM.getTriggeredTransitionAccess();
 	}
@@ -4328,8 +4437,11 @@ public class RoomGrammarAccess 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 FSMGrammarAccess.GuardedTransitionElements getGuardedTransitionAccess() {
 		return gaFSM.getGuardedTransitionAccess();
 	}
@@ -4339,8 +4451,11 @@ public class RoomGrammarAccess 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 FSMGrammarAccess.CPBranchTransitionElements getCPBranchTransitionAccess() {
 		return gaFSM.getCPBranchTransitionAccess();
 	}
@@ -4351,7 +4466,10 @@ public class RoomGrammarAccess 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 FSMGrammarAccess.RefinedTransitionElements getRefinedTransitionAccess() {
 		return gaFSM.getRefinedTransitionAccess();
 	}
@@ -4384,7 +4502,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//TrPointTerminal:
-	//	"my" trPoint=[TrPoint];
+	//	'my' trPoint=[TrPoint];
 	public FSMGrammarAccess.TrPointTerminalElements getTrPointTerminalAccess() {
 		return gaFSM.getTrPointTerminalAccess();
 	}
@@ -4394,7 +4512,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//SubStateTrPointTerminal:
-	//	trPoint=[TrPoint] "of" state=[State];
+	//	trPoint=[TrPoint] 'of' state=[State];
 	public FSMGrammarAccess.SubStateTrPointTerminalElements getSubStateTrPointTerminalAccess() {
 		return gaFSM.getSubStateTrPointTerminalAccess();
 	}
@@ -4404,7 +4522,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//ChoicepointTerminal:
-	//	"cp" cp=[ChoicePoint];
+	//	'cp' cp=[ChoicePoint];
 	public FSMGrammarAccess.ChoicepointTerminalElements getChoicepointTerminalAccess() {
 		return gaFSM.getChoicepointTerminalAccess();
 	}
@@ -4417,7 +4535,8 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	//// transition triggers
 	////
 	//Trigger:
-	//	"<" msgFromIfPairs+=MessageFromIf ("|" msgFromIfPairs+=MessageFromIf)* guard=Guard? ">";
+	//	'<' msgFromIfPairs+=MessageFromIf ('|' msgFromIfPairs+=MessageFromIf)*
+	//	guard=Guard? '>';
 	public FSMGrammarAccess.TriggerElements getTriggerAccess() {
 		return gaFSM.getTriggerAccess();
 	}
@@ -4430,7 +4549,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	//// pairs of (message, interface) are triggering events
 	////
 	//MessageFromIf:
-	//	message=[ecore::EObject] ":" from=[AbstractInterfaceItem];
+	//	message=[ecore::EObject] ':' from=[AbstractInterfaceItem];
 	public FSMGrammarAccess.MessageFromIfElements getMessageFromIfAccess() {
 		return gaFSM.getMessageFromIfAccess();
 	}
@@ -4440,7 +4559,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//Guard:
-	//	"guard" guard=DetailCode;
+	//	'guard' guard=DetailCode;
 	public FSMGrammarAccess.GuardElements getGuardAccess() {
 		return gaFSM.getGuardAccess();
 	}
@@ -4453,7 +4572,10 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	//// semantics for state machine validation
 	////
 	//ProtocolSemantics:
-	//	{ProtocolSemantics} "semantics" "{" rules+=SemanticsRule* "}";
+	//	{ProtocolSemantics}
+	//	'semantics' '{'
+	//	rules+=SemanticsRule*
+	//	'}';
 	public FSMGrammarAccess.ProtocolSemanticsElements getProtocolSemanticsAccess() {
 		return gaFSM.getProtocolSemanticsAccess();
 	}
@@ -4473,8 +4595,8 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//InSemanticsRule:
-	//	"in" ":" msg=[ecore::EObject] ("->" (followUps+=SemanticsRule | "(" followUps+=SemanticsRule (","
-	//	followUps+=SemanticsRule)+ ")"))?;
+	//	'in' ':' msg=[ecore::EObject] ('->' (followUps+=SemanticsRule
+	//	| '(' followUps+=SemanticsRule (',' followUps+=SemanticsRule)+ ')'))?;
 	public FSMGrammarAccess.InSemanticsRuleElements getInSemanticsRuleAccess() {
 		return gaFSM.getInSemanticsRuleAccess();
 	}
@@ -4484,8 +4606,8 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//OutSemanticsRule:
-	//	"out" ":" msg=[ecore::EObject] ("->" (followUps+=SemanticsRule | "(" followUps+=SemanticsRule (","
-	//	followUps+=SemanticsRule)+ ")"))?;
+	//	'out' ':' msg=[ecore::EObject] ('->' (followUps+=SemanticsRule
+	//	| '(' followUps+=SemanticsRule (',' followUps+=SemanticsRule)+ ')'))?;
 	public FSMGrammarAccess.OutSemanticsRuleElements getOutSemanticsRuleAccess() {
 		return gaFSM.getOutSemanticsRuleAccess();
 	}
@@ -4497,9 +4619,9 @@ public class RoomGrammarAccess 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 gaFSM.getAnnotationAccess();
+		return gaBase.getAnnotationAccess();
 	}
 	
 	public ParserRule getAnnotationRule() {
@@ -4507,9 +4629,9 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//KeyValue:
-	//	key=ID "=" value=Literal;
+	//	key=ID '=' value=Literal;
 	public BaseGrammarAccess.KeyValueElements getKeyValueAccess() {
-		return gaFSM.getKeyValueAccess();
+		return gaBase.getKeyValueAccess();
 	}
 	
 	public ParserRule getKeyValueRule() {
@@ -4517,10 +4639,12 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//AnnotationType:
-	//	"AnnotationType" name=ID docu=Documentation? "{" "target" "=" (targets+=AnnotationTargetType | "{"
-	//	targets+=AnnotationTargetType ("," targets+=AnnotationTargetType)* "}") attributes+=AnnotationAttribute* "}";
+	//	'AnnotationType' name=ID docu=Documentation? '{'
+	//	'target' '=' (targets+=super::AnnotationTargetType | '{' targets+=super::AnnotationTargetType (','
+	//	targets+=super::AnnotationTargetType)* '}') attributes+=AnnotationAttribute*
+	//	'}';
 	public BaseGrammarAccess.AnnotationTypeElements getAnnotationTypeAccess() {
-		return gaFSM.getAnnotationTypeAccess();
+		return gaBase.getAnnotationTypeAccess();
 	}
 	
 	public ParserRule getAnnotationTypeRule() {
@@ -4530,7 +4654,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	//AnnotationAttribute:
 	//	SimpleAnnotationAttribute | EnumAnnotationAttribute;
 	public BaseGrammarAccess.AnnotationAttributeElements getAnnotationAttributeAccess() {
-		return gaFSM.getAnnotationAttributeAccess();
+		return gaBase.getAnnotationAttributeAccess();
 	}
 	
 	public ParserRule getAnnotationAttributeRule() {
@@ -4538,9 +4662,9 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//SimpleAnnotationAttribute:
-	//	(optional?="optional" | "mandatory") "attribute" name=ID ":" type=LiteralType;
+	//	(optional?='optional' | 'mandatory') 'attribute' name=ID ':' type=LiteralType;
 	public BaseGrammarAccess.SimpleAnnotationAttributeElements getSimpleAnnotationAttributeAccess() {
-		return gaFSM.getSimpleAnnotationAttributeAccess();
+		return gaBase.getSimpleAnnotationAttributeAccess();
 	}
 	
 	public ParserRule getSimpleAnnotationAttributeRule() {
@@ -4548,9 +4672,9 @@ public class RoomGrammarAccess 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 gaFSM.getEnumAnnotationAttributeAccess();
+		return gaBase.getEnumAnnotationAttributeAccess();
 	}
 	
 	public ParserRule getEnumAnnotationAttributeRule() {
@@ -4578,9 +4702,9 @@ public class RoomGrammarAccess 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 gaFSM.getImportAccess();
+		return gaBase.getImportAccess();
 	}
 	
 	public ParserRule getImportRule() {
@@ -4588,9 +4712,9 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//ImportedFQN:
-	//	FQN ".*"?;
+	//	FQN '.*'?;
 	public BaseGrammarAccess.ImportedFQNElements getImportedFQNAccess() {
-		return gaFSM.getImportedFQNAccess();
+		return gaBase.getImportedFQNAccess();
 	}
 	
 	public ParserRule getImportedFQNRule() {
@@ -4600,9 +4724,12 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	//// **************************************************************
 	//// Documentation Rule
 	//Documentation:
-	//	{Documentation} "[" lines+=STRING* "]";
+	//	{Documentation}
+	//	'['
+	//	lines+=STRING*
+	//	']';
 	public BaseGrammarAccess.DocumentationElements getDocumentationAccess() {
-		return gaFSM.getDocumentationAccess();
+		return gaBase.getDocumentationAccess();
 	}
 	
 	public ParserRule getDocumentationRule() {
@@ -4611,22 +4738,23 @@ public class RoomGrammarAccess 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 gaFSM.getTIMEAccess();
+		return gaBase.getTIMEAccess();
 	}
 	
 	public ParserRule getTIMERule() {
 		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 gaFSM.getLiteralTypeAccess();
+		return gaBase.getLiteralTypeAccess();
 	}
 	
 	public EnumRule getLiteralTypeRule() {
@@ -4634,9 +4762,9 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//LiteralArray:
-	//	literals+=Literal ("," literals+=Literal)*;
+	//	literals+=Literal (',' literals+=Literal)*;
 	public BaseGrammarAccess.LiteralArrayElements getLiteralArrayAccess() {
-		return gaFSM.getLiteralArrayAccess();
+		return gaBase.getLiteralArrayAccess();
 	}
 	
 	public ParserRule getLiteralArrayRule() {
@@ -4647,7 +4775,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	//Literal:
 	//	BooleanLiteral | NumberLiteral | StringLiteral;
 	public BaseGrammarAccess.LiteralElements getLiteralAccess() {
-		return gaFSM.getLiteralAccess();
+		return gaBase.getLiteralAccess();
 	}
 	
 	public ParserRule getLiteralRule() {
@@ -4655,9 +4783,9 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//BooleanLiteral:
-	//	{BooleanLiteral} ("false" | isTrue?="true");
+	//	{BooleanLiteral} ('false' | isTrue?='true');
 	public BaseGrammarAccess.BooleanLiteralElements getBooleanLiteralAccess() {
-		return gaFSM.getBooleanLiteralAccess();
+		return gaBase.getBooleanLiteralAccess();
 	}
 	
 	public ParserRule getBooleanLiteralRule() {
@@ -4667,7 +4795,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	//NumberLiteral:
 	//	IntLiteral | RealLiteral;
 	public BaseGrammarAccess.NumberLiteralElements getNumberLiteralAccess() {
-		return gaFSM.getNumberLiteralAccess();
+		return gaBase.getNumberLiteralAccess();
 	}
 	
 	public ParserRule getNumberLiteralRule() {
@@ -4677,7 +4805,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	//RealLiteral:
 	//	{RealLiteral} value=Real;
 	public BaseGrammarAccess.RealLiteralElements getRealLiteralAccess() {
-		return gaFSM.getRealLiteralAccess();
+		return gaBase.getRealLiteralAccess();
 	}
 	
 	public ParserRule getRealLiteralRule() {
@@ -4687,7 +4815,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	//IntLiteral:
 	//	{IntLiteral} value=Integer;
 	public BaseGrammarAccess.IntLiteralElements getIntLiteralAccess() {
-		return gaFSM.getIntLiteralAccess();
+		return gaBase.getIntLiteralAccess();
 	}
 	
 	public ParserRule getIntLiteralRule() {
@@ -4697,27 +4825,27 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	//StringLiteral:
 	//	{StringLiteral} value=STRING;
 	public BaseGrammarAccess.StringLiteralElements getStringLiteralAccess() {
-		return gaFSM.getStringLiteralAccess();
+		return gaBase.getStringLiteralAccess();
 	}
 	
 	public ParserRule getStringLiteralRule() {
 		return getStringLiteralAccess().getRule();
 	}
 
-	//Integer returns ecore::ELong:
-	//	("+" | "-")? INT | HEX;
+	//Integer ecore::ELong:
+	//	('+' | '-')? INT | HEX
 	public BaseGrammarAccess.IntegerElements getIntegerAccess() {
-		return gaFSM.getIntegerAccess();
+		return gaBase.getIntegerAccess();
 	}
 	
 	public ParserRule getIntegerRule() {
 		return getIntegerAccess().getRule();
 	}
 
-	//Real returns ecore::EDouble:
-	//	Decimal | / *DotDecimal | DecimalDot |* / DecimalExp;
+	//Real ecore::EDouble:
+	//	Decimal | DecimalExp
 	public BaseGrammarAccess.RealElements getRealAccess() {
-		return gaFSM.getRealAccess();
+		return gaBase.getRealAccess();
 	}
 	
 	public ParserRule getRealRule() {
@@ -4725,9 +4853,9 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//Decimal hidden():
-	//	("+" | "-")? INT "." INT;
+	//	('+' | '-')? INT '.' INT;
 	public BaseGrammarAccess.DecimalElements getDecimalAccess() {
-		return gaFSM.getDecimalAccess();
+		return gaBase.getDecimalAccess();
 	}
 	
 	public ParserRule getDecimalRule() {
@@ -4740,9 +4868,9 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	////DecimalDot hidden():
 	////	('+' | '-')? INT '.';
 	//DecimalExp hidden():
-	//	("+" | "-")? INT "." INT ("e" | "E") ("+" | "-")? INT;
+	//	('+' | '-')? INT '.' INT ('e' | 'E') ('+' | '-')? INT;
 	public BaseGrammarAccess.DecimalExpElements getDecimalExpAccess() {
-		return gaFSM.getDecimalExpAccess();
+		return gaBase.getDecimalExpAccess();
 	}
 	
 	public ParserRule getDecimalExpRule() {
@@ -4750,9 +4878,9 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//FQN:
-	//	ID ("." ID)*;
+	//	ID ('.' ID)*;
 	public BaseGrammarAccess.FQNElements getFQNAccess() {
-		return gaFSM.getFQNAccess();
+		return gaBase.getFQNAccess();
 	}
 	
 	public ParserRule getFQNRule() {
@@ -4760,51 +4888,50 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//terminal HEX:
-	//	("0x" | "0X") ("0".."9" | "a".."f" | "A".."F")+;
+	//	('0x' | '0X') ('0'..'9' | 'a'..'f' | 'A'..'F')+;
 	public TerminalRule getHEXRule() {
-		return gaFSM.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 gaFSM.getIDRule();
+		return gaTerminals.getIDRule();
 	} 
 
 	//terminal INT returns ecore::EInt:
-	//	"0".."9"+;
+	//	'0'..'9'+;
 	public TerminalRule getINTRule() {
-		return gaFSM.getINTRule();
+		return gaTerminals.getINTRule();
 	} 
 
 	//terminal STRING:
-	//	"\"" ("\\" . / * 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' * / | !("\\" | "\""))* "\"" | "\'" ("\\" .
-	//	/ * 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' * / | !("\\" | "\'"))* "\'";
+	//	'"' ('\\' . | !('\\' | '"'))* '"' | "'" ('\\' . | !('\\' | "'"))* "'";
 	public TerminalRule getSTRINGRule() {
-		return gaFSM.getSTRINGRule();
+		return gaTerminals.getSTRINGRule();
 	} 
 
 	//terminal ML_COMMENT:
-	//	"/ *"->"* /";
+	//	'/ *'->'* /';
 	public TerminalRule getML_COMMENTRule() {
-		return gaFSM.getML_COMMENTRule();
+		return gaTerminals.getML_COMMENTRule();
 	} 
 
 	//terminal SL_COMMENT:
-	//	"//" !("\n" | "\r")* ("\r"? "\n")?;
+	//	'//' !('\n' | '\r')* ('\r'? '\n')?;
 	public TerminalRule getSL_COMMENTRule() {
-		return gaFSM.getSL_COMMENTRule();
+		return gaTerminals.getSL_COMMENTRule();
 	} 
 
 	//terminal WS:
-	//	(" " | "\t" | "\r" | "\n")+;
+	//	' ' | '\t' | '\r' | '\n'+;
 	public TerminalRule getWSRule() {
-		return gaFSM.getWSRule();
+		return gaTerminals.getWSRule();
 	} 
 
 	//terminal ANY_OTHER:
 	//	.;
 	public TerminalRule getANY_OTHERRule() {
-		return gaFSM.getANY_OTHERRule();
+		return gaTerminals.getANY_OTHERRule();
 	} 
 }
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/validation/AbstractRoomJavaValidator.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/validation/AbstractRoomJavaValidator.java
index 50f8321eb..1978e1fca 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/validation/AbstractRoomJavaValidator.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/validation/AbstractRoomJavaValidator.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.validation;
  
 import java.util.ArrayList;
diff --git a/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/dialogs/TransitionPropertyDialog.java b/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/dialogs/TransitionPropertyDialog.java
index 74cade87f..71ea45657 100644
--- a/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/dialogs/TransitionPropertyDialog.java
+++ b/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/dialogs/TransitionPropertyDialog.java
@@ -246,14 +246,14 @@ public class TransitionPropertyDialog extends AbstractMemberAwarePropertyDialog
 			if (refined!=null) {
 				createActionCodeEditor(body, "&Action Code:",
 						refined.getAction(), refined,
-						FSMPackage.eINSTANCE.getRefinedTransition_Action(),
+						FSMPackage.eINSTANCE.getTransitionBase_Action(),
 						null, s2m, m2s, true, true, false, null, exprProvider);
 			}
 		}
 		else
 		{
 			createActionCodeEditor(body, "&Action Code:", trans.getAction(),
-					trans, FSMPackage.eINSTANCE.getTransition_Action(), null,
+					trans, FSMPackage.eINSTANCE.getTransitionBase_Action(), null,
 					s2m, m2s, true, true, false, null, exprProvider);
 		}
 		
diff --git a/tests/org.eclipse.etrice.core.common.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.common.tests/META-INF/MANIFEST.MF
index 5997e1bd2..29d75f774 100644
--- a/tests/org.eclipse.etrice.core.common.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.core.common.tests/META-INF/MANIFEST.MF
@@ -7,7 +7,10 @@ Bundle-SymbolicName: org.eclipse.etrice.core.common.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.etrice.core.common,
  org.eclipse.core.runtime,
- org.eclipse.xtext.junit4;bundle-version="2.6.0"
+ org.eclipse.xtext.junit4;bundle-version="2.6.0",
+ org.eclipse.xtext.xbase.lib,
+ org.eclipse.etrice.core.common.ui,
+ org.eclipse.ui.workbench;resolution:=optional
 Import-Package: org.apache.log4j,
  org.junit;version="4.5.0",
  org.junit.runner;version="4.5.0",
diff --git a/tests/org.eclipse.etrice.core.common.tests/src-gen/org/eclipse/etrice/core/common/BaseTestInjectorProvider.java b/tests/org.eclipse.etrice.core.common.tests/src-gen/org/eclipse/etrice/core/common/BaseTestInjectorProvider.java
index c3b2b260c..ffea490b8 100644
--- a/tests/org.eclipse.etrice.core.common.tests/src-gen/org/eclipse/etrice/core/common/BaseTestInjectorProvider.java
+++ b/tests/org.eclipse.etrice.core.common.tests/src-gen/org/eclipse/etrice/core/common/BaseTestInjectorProvider.java
@@ -1,18 +1,18 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.common;
 
+import com.google.inject.Guice;
+import com.google.inject.Injector;
 import org.eclipse.xtext.junit4.GlobalRegistries;
 import org.eclipse.xtext.junit4.GlobalRegistries.GlobalStateMemento;
 import org.eclipse.xtext.junit4.IInjectorProvider;
 import org.eclipse.xtext.junit4.IRegistryConfigurator;
 
-import com.google.inject.Injector;
-
 public class BaseTestInjectorProvider implements IInjectorProvider, IRegistryConfigurator {
-	
-    protected GlobalStateMemento stateBeforeInjectorCreation;
+
+	protected GlobalStateMemento stateBeforeInjectorCreation;
 	protected GlobalStateMemento stateAfterInjectorCreation;
 	protected Injector injector;
 
@@ -20,6 +20,7 @@ public class BaseTestInjectorProvider implements IInjectorProvider, IRegistryCon
 		GlobalRegistries.initializeDefaults();
 	}
 
+	@Override
 	public Injector getInjector()
 	{
 		if (injector == null) {
@@ -29,15 +30,34 @@ public class BaseTestInjectorProvider implements IInjectorProvider, IRegistryCon
 		}
 		return injector;
 	}
-	
+
 	protected Injector internalCreateInjector() {
-	    return new BaseTestStandaloneSetup().createInjectorAndDoEMFRegistration();
+		return new BaseTestStandaloneSetup() {
+			@Override
+			public Injector createInjector() {
+				return Guice.createInjector(createRuntimeModule());
+			}
+		}.createInjectorAndDoEMFRegistration();
+	}
+
+	protected BaseTestRuntimeModule createRuntimeModule() {
+		// make it work also with Maven/Tycho and OSGI
+		// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=493672
+		return new BaseTestRuntimeModule() {
+			@Override
+			public ClassLoader bindClassLoaderToInstance() {
+				return BaseTestInjectorProvider.class
+						.getClassLoader();
+			}
+		};
 	}
 
+	@Override
 	public void restoreRegistry() {
 		stateBeforeInjectorCreation.restoreGlobalState();
 	}
 
+	@Override
 	public void setupRegistry() {
 		getInjector();
 		stateAfterInjectorCreation.restoreGlobalState();
diff --git a/tests/org.eclipse.etrice.core.common.tests/src-gen/org/eclipse/etrice/core/common/BaseTestUiInjectorProvider.java b/tests/org.eclipse.etrice.core.common.tests/src-gen/org/eclipse/etrice/core/common/BaseTestUiInjectorProvider.java
new file mode 100644
index 000000000..b22656d72
--- /dev/null
+++ b/tests/org.eclipse.etrice.core.common.tests/src-gen/org/eclipse/etrice/core/common/BaseTestUiInjectorProvider.java
@@ -0,0 +1,17 @@
+/*
+ * generated by Xtext
+ */
+package org.eclipse.etrice.core.common;
+
+import org.eclipse.xtext.junit4.IInjectorProvider;
+
+import com.google.inject.Injector;
+
+public class BaseTestUiInjectorProvider implements IInjectorProvider {
+
+	@Override
+	public Injector getInjector() {
+		return org.eclipse.etrice.core.common.ui.internal.BaseActivator.getInstance().getInjector("org.eclipse.etrice.core.common.BaseTest");
+	}
+
+}
diff --git a/tests/org.eclipse.etrice.core.config.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.config.tests/META-INF/MANIFEST.MF
index dd02fe72f..1113af6bd 100644
--- a/tests/org.eclipse.etrice.core.config.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.core.config.tests/META-INF/MANIFEST.MF
@@ -11,7 +11,8 @@ Require-Bundle: org.eclipse.etrice.core.config;bundle-version="1.1.0",
  org.eclipse.xtext;bundle-version="2.6.0",
  org.eclipse.xtext.junit4;bundle-version="2.6.0",
  org.junit,
- org.eclipse.ui.workbench;resolution:=optional
+ org.eclipse.ui.workbench;resolution:=optional,
+ org.eclipse.xtext.xbase.lib
 Import-Package: org.apache.log4j,
  org.apache.commons.logging,
  org.junit.runner;version="4.5.0",
diff --git a/tests/org.eclipse.etrice.core.config.tests/src-gen/org/eclipse/etrice/core/ConfigInjectorProvider.java b/tests/org.eclipse.etrice.core.config.tests/src-gen/org/eclipse/etrice/core/ConfigInjectorProvider.java
index 81ed8313a..8b7848d02 100644
--- a/tests/org.eclipse.etrice.core.config.tests/src-gen/org/eclipse/etrice/core/ConfigInjectorProvider.java
+++ b/tests/org.eclipse.etrice.core.config.tests/src-gen/org/eclipse/etrice/core/ConfigInjectorProvider.java
@@ -1,18 +1,18 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core;
 
+import com.google.inject.Guice;
+import com.google.inject.Injector;
 import org.eclipse.xtext.junit4.GlobalRegistries;
 import org.eclipse.xtext.junit4.GlobalRegistries.GlobalStateMemento;
 import org.eclipse.xtext.junit4.IInjectorProvider;
 import org.eclipse.xtext.junit4.IRegistryConfigurator;
 
-import com.google.inject.Injector;
-
 public class ConfigInjectorProvider implements IInjectorProvider, IRegistryConfigurator {
-	
-    protected GlobalStateMemento stateBeforeInjectorCreation;
+
+	protected GlobalStateMemento stateBeforeInjectorCreation;
 	protected GlobalStateMemento stateAfterInjectorCreation;
 	protected Injector injector;
 
@@ -20,6 +20,7 @@ public class ConfigInjectorProvider implements IInjectorProvider, IRegistryConfi
 		GlobalRegistries.initializeDefaults();
 	}
 
+	@Override
 	public Injector getInjector()
 	{
 		if (injector == null) {
@@ -29,15 +30,34 @@ public class ConfigInjectorProvider implements IInjectorProvider, IRegistryConfi
 		}
 		return injector;
 	}
-	
+
 	protected Injector internalCreateInjector() {
-	    return new ConfigStandaloneSetup().createInjectorAndDoEMFRegistration();
+		return new ConfigStandaloneSetup() {
+			@Override
+			public Injector createInjector() {
+				return Guice.createInjector(createRuntimeModule());
+			}
+		}.createInjectorAndDoEMFRegistration();
+	}
+
+	protected ConfigRuntimeModule createRuntimeModule() {
+		// make it work also with Maven/Tycho and OSGI
+		// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=493672
+		return new ConfigRuntimeModule() {
+			@Override
+			public ClassLoader bindClassLoaderToInstance() {
+				return ConfigInjectorProvider.class
+						.getClassLoader();
+			}
+		};
 	}
 
+	@Override
 	public void restoreRegistry() {
 		stateBeforeInjectorCreation.restoreGlobalState();
 	}
 
+	@Override
 	public void setupRegistry() {
 		getInjector();
 		stateAfterInjectorCreation.restoreGlobalState();
diff --git a/tests/org.eclipse.etrice.core.config.tests/src-gen/org/eclipse/etrice/core/ConfigUiInjectorProvider.java b/tests/org.eclipse.etrice.core.config.tests/src-gen/org/eclipse/etrice/core/ConfigUiInjectorProvider.java
index 34b7a4cd5..b86ced9d6 100644
--- a/tests/org.eclipse.etrice.core.config.tests/src-gen/org/eclipse/etrice/core/ConfigUiInjectorProvider.java
+++ b/tests/org.eclipse.etrice.core.config.tests/src-gen/org/eclipse/etrice/core/ConfigUiInjectorProvider.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core;
 
 import org.eclipse.xtext.junit4.IInjectorProvider;
@@ -8,9 +8,10 @@ import org.eclipse.xtext.junit4.IInjectorProvider;
 import com.google.inject.Injector;
 
 public class ConfigUiInjectorProvider implements IInjectorProvider {
-	
+
+	@Override
 	public Injector getInjector() {
 		return org.eclipse.etrice.core.ui.internal.ConfigActivator.getInstance().getInjector("org.eclipse.etrice.core.Config");
 	}
-	
+
 }
diff --git a/tests/org.eclipse.etrice.core.etmap.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.etmap.tests/META-INF/MANIFEST.MF
index 4c87869c1..3d869a3b7 100644
--- a/tests/org.eclipse.etrice.core.etmap.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.core.etmap.tests/META-INF/MANIFEST.MF
@@ -9,7 +9,8 @@ Require-Bundle: org.eclipse.etrice.core.etmap;bundle-version="1.1.0",
  org.eclipse.etrice.core.etmap.ui;bundle-version="1.1.0",
  org.eclipse.core.runtime,
  org.eclipse.xtext.junit4;bundle-version="2.6.0",
- org.eclipse.ui.workbench;resolution:=optional
+ org.eclipse.ui.workbench;resolution:=optional,
+ org.eclipse.xtext.xbase.lib
 Import-Package: org.apache.log4j,
  org.junit;version="4.5.0",
  org.junit.runner;version="4.5.0",
diff --git a/tests/org.eclipse.etrice.core.etmap.tests/src-gen/org/eclipse/etrice/core/etmap/ETMapInjectorProvider.java b/tests/org.eclipse.etrice.core.etmap.tests/src-gen/org/eclipse/etrice/core/etmap/ETMapInjectorProvider.java
index 516bdc63f..fbb5ab050 100644
--- a/tests/org.eclipse.etrice.core.etmap.tests/src-gen/org/eclipse/etrice/core/etmap/ETMapInjectorProvider.java
+++ b/tests/org.eclipse.etrice.core.etmap.tests/src-gen/org/eclipse/etrice/core/etmap/ETMapInjectorProvider.java
@@ -1,18 +1,18 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.etmap;
 
+import com.google.inject.Guice;
+import com.google.inject.Injector;
 import org.eclipse.xtext.junit4.GlobalRegistries;
 import org.eclipse.xtext.junit4.GlobalRegistries.GlobalStateMemento;
 import org.eclipse.xtext.junit4.IInjectorProvider;
 import org.eclipse.xtext.junit4.IRegistryConfigurator;
 
-import com.google.inject.Injector;
-
 public class ETMapInjectorProvider implements IInjectorProvider, IRegistryConfigurator {
-	
-    protected GlobalStateMemento stateBeforeInjectorCreation;
+
+	protected GlobalStateMemento stateBeforeInjectorCreation;
 	protected GlobalStateMemento stateAfterInjectorCreation;
 	protected Injector injector;
 
@@ -20,6 +20,7 @@ public class ETMapInjectorProvider implements IInjectorProvider, IRegistryConfig
 		GlobalRegistries.initializeDefaults();
 	}
 
+	@Override
 	public Injector getInjector()
 	{
 		if (injector == null) {
@@ -29,15 +30,34 @@ public class ETMapInjectorProvider implements IInjectorProvider, IRegistryConfig
 		}
 		return injector;
 	}
-	
+
 	protected Injector internalCreateInjector() {
-	    return new ETMapStandaloneSetup().createInjectorAndDoEMFRegistration();
+		return new ETMapStandaloneSetup() {
+			@Override
+			public Injector createInjector() {
+				return Guice.createInjector(createRuntimeModule());
+			}
+		}.createInjectorAndDoEMFRegistration();
+	}
+
+	protected ETMapRuntimeModule createRuntimeModule() {
+		// make it work also with Maven/Tycho and OSGI
+		// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=493672
+		return new ETMapRuntimeModule() {
+			@Override
+			public ClassLoader bindClassLoaderToInstance() {
+				return ETMapInjectorProvider.class
+						.getClassLoader();
+			}
+		};
 	}
 
+	@Override
 	public void restoreRegistry() {
 		stateBeforeInjectorCreation.restoreGlobalState();
 	}
 
+	@Override
 	public void setupRegistry() {
 		getInjector();
 		stateAfterInjectorCreation.restoreGlobalState();
diff --git a/tests/org.eclipse.etrice.core.etmap.tests/src-gen/org/eclipse/etrice/core/etmap/ETMapUiInjectorProvider.java b/tests/org.eclipse.etrice.core.etmap.tests/src-gen/org/eclipse/etrice/core/etmap/ETMapUiInjectorProvider.java
index 3eaa945c1..721354160 100644
--- a/tests/org.eclipse.etrice.core.etmap.tests/src-gen/org/eclipse/etrice/core/etmap/ETMapUiInjectorProvider.java
+++ b/tests/org.eclipse.etrice.core.etmap.tests/src-gen/org/eclipse/etrice/core/etmap/ETMapUiInjectorProvider.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.etmap;
 
 import org.eclipse.xtext.junit4.IInjectorProvider;
@@ -8,9 +8,10 @@ import org.eclipse.xtext.junit4.IInjectorProvider;
 import com.google.inject.Injector;
 
 public class ETMapUiInjectorProvider implements IInjectorProvider {
-	
+
+	@Override
 	public Injector getInjector() {
 		return org.eclipse.etrice.core.etmap.ui.internal.ETMapActivator.getInstance().getInjector("org.eclipse.etrice.core.etmap.ETMap");
 	}
-	
+
 }
diff --git a/tests/org.eclipse.etrice.core.etphys.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.etphys.tests/META-INF/MANIFEST.MF
index 719028ef9..7b915a800 100644
--- a/tests/org.eclipse.etrice.core.etphys.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.core.etphys.tests/META-INF/MANIFEST.MF
@@ -9,7 +9,8 @@ Require-Bundle: org.eclipse.etrice.core.etphys;bundle-version="1.1.0",
  org.eclipse.etrice.core.etphys.ui,
  org.eclipse.core.runtime,
  org.eclipse.xtext.junit4;bundle-version="2.6.0",
- org.eclipse.ui.workbench;resolution:=optional
+ org.eclipse.ui.workbench;resolution:=optional,
+ org.eclipse.xtext.xbase.lib
 Import-Package: org.apache.log4j,
  org.junit;version="4.5.0",
  org.junit.runner;version="4.5.0",
diff --git a/tests/org.eclipse.etrice.core.etphys.tests/src-gen/org/eclipse/etrice/core/etphys/ETPhysInjectorProvider.java b/tests/org.eclipse.etrice.core.etphys.tests/src-gen/org/eclipse/etrice/core/etphys/ETPhysInjectorProvider.java
index acc7d319b..689b6804d 100644
--- a/tests/org.eclipse.etrice.core.etphys.tests/src-gen/org/eclipse/etrice/core/etphys/ETPhysInjectorProvider.java
+++ b/tests/org.eclipse.etrice.core.etphys.tests/src-gen/org/eclipse/etrice/core/etphys/ETPhysInjectorProvider.java
@@ -1,18 +1,18 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.etphys;
 
+import com.google.inject.Guice;
+import com.google.inject.Injector;
 import org.eclipse.xtext.junit4.GlobalRegistries;
 import org.eclipse.xtext.junit4.GlobalRegistries.GlobalStateMemento;
 import org.eclipse.xtext.junit4.IInjectorProvider;
 import org.eclipse.xtext.junit4.IRegistryConfigurator;
 
-import com.google.inject.Injector;
-
 public class ETPhysInjectorProvider implements IInjectorProvider, IRegistryConfigurator {
-	
-    protected GlobalStateMemento stateBeforeInjectorCreation;
+
+	protected GlobalStateMemento stateBeforeInjectorCreation;
 	protected GlobalStateMemento stateAfterInjectorCreation;
 	protected Injector injector;
 
@@ -20,6 +20,7 @@ public class ETPhysInjectorProvider implements IInjectorProvider, IRegistryConfi
 		GlobalRegistries.initializeDefaults();
 	}
 
+	@Override
 	public Injector getInjector()
 	{
 		if (injector == null) {
@@ -29,15 +30,34 @@ public class ETPhysInjectorProvider implements IInjectorProvider, IRegistryConfi
 		}
 		return injector;
 	}
-	
+
 	protected Injector internalCreateInjector() {
-	    return new ETPhysStandaloneSetup().createInjectorAndDoEMFRegistration();
+		return new ETPhysStandaloneSetup() {
+			@Override
+			public Injector createInjector() {
+				return Guice.createInjector(createRuntimeModule());
+			}
+		}.createInjectorAndDoEMFRegistration();
+	}
+
+	protected ETPhysRuntimeModule createRuntimeModule() {
+		// make it work also with Maven/Tycho and OSGI
+		// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=493672
+		return new ETPhysRuntimeModule() {
+			@Override
+			public ClassLoader bindClassLoaderToInstance() {
+				return ETPhysInjectorProvider.class
+						.getClassLoader();
+			}
+		};
 	}
 
+	@Override
 	public void restoreRegistry() {
 		stateBeforeInjectorCreation.restoreGlobalState();
 	}
 
+	@Override
 	public void setupRegistry() {
 		getInjector();
 		stateAfterInjectorCreation.restoreGlobalState();
diff --git a/tests/org.eclipse.etrice.core.etphys.tests/src-gen/org/eclipse/etrice/core/etphys/ETPhysUiInjectorProvider.java b/tests/org.eclipse.etrice.core.etphys.tests/src-gen/org/eclipse/etrice/core/etphys/ETPhysUiInjectorProvider.java
index e7e1d96d1..0247cffc6 100644
--- a/tests/org.eclipse.etrice.core.etphys.tests/src-gen/org/eclipse/etrice/core/etphys/ETPhysUiInjectorProvider.java
+++ b/tests/org.eclipse.etrice.core.etphys.tests/src-gen/org/eclipse/etrice/core/etphys/ETPhysUiInjectorProvider.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.etphys;
 
 import org.eclipse.xtext.junit4.IInjectorProvider;
@@ -8,9 +8,10 @@ import org.eclipse.xtext.junit4.IInjectorProvider;
 import com.google.inject.Injector;
 
 public class ETPhysUiInjectorProvider implements IInjectorProvider {
-	
+
+	@Override
 	public Injector getInjector() {
 		return org.eclipse.etrice.core.etphys.ui.internal.ETPhysActivator.getInstance().getInjector("org.eclipse.etrice.core.etphys.ETPhys");
 	}
-	
+
 }
diff --git a/tests/org.eclipse.etrice.core.fsm.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.fsm.tests/META-INF/MANIFEST.MF
index 41e92d005..a1bc4bb28 100644
--- a/tests/org.eclipse.etrice.core.fsm.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.core.fsm.tests/META-INF/MANIFEST.MF
@@ -10,7 +10,8 @@ Require-Bundle: org.eclipse.etrice.core.fsm,
  org.eclipse.core.runtime,
  org.eclipse.xtext.junit4;bundle-version="2.6.0",
  org.eclipse.ui.workbench;resolution:=optional,
- org.objectweb.asm;bundle-version="[5.0.1,6.0.0)";resolution:=optional
+ org.objectweb.asm;bundle-version="[5.0.1,6.0.0)";resolution:=optional,
+ org.eclipse.xtext.xbase.lib
 Import-Package: org.apache.log4j,
  org.junit;version="4.5.0",
  org.junit.runner;version="4.5.0",
diff --git a/tests/org.eclipse.etrice.core.fsm.tests/src-gen/org/eclipse/etrice/core/fsm/FSMInjectorProvider.java b/tests/org.eclipse.etrice.core.fsm.tests/src-gen/org/eclipse/etrice/core/fsm/FSMInjectorProvider.java
index 696ab2b51..25566da41 100644
--- a/tests/org.eclipse.etrice.core.fsm.tests/src-gen/org/eclipse/etrice/core/fsm/FSMInjectorProvider.java
+++ b/tests/org.eclipse.etrice.core.fsm.tests/src-gen/org/eclipse/etrice/core/fsm/FSMInjectorProvider.java
@@ -1,18 +1,18 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.fsm;
 
+import com.google.inject.Guice;
+import com.google.inject.Injector;
 import org.eclipse.xtext.junit4.GlobalRegistries;
 import org.eclipse.xtext.junit4.GlobalRegistries.GlobalStateMemento;
 import org.eclipse.xtext.junit4.IInjectorProvider;
 import org.eclipse.xtext.junit4.IRegistryConfigurator;
 
-import com.google.inject.Injector;
-
 public class FSMInjectorProvider implements IInjectorProvider, IRegistryConfigurator {
-	
-    protected GlobalStateMemento stateBeforeInjectorCreation;
+
+	protected GlobalStateMemento stateBeforeInjectorCreation;
 	protected GlobalStateMemento stateAfterInjectorCreation;
 	protected Injector injector;
 
@@ -20,6 +20,7 @@ public class FSMInjectorProvider implements IInjectorProvider, IRegistryConfigur
 		GlobalRegistries.initializeDefaults();
 	}
 
+	@Override
 	public Injector getInjector()
 	{
 		if (injector == null) {
@@ -29,15 +30,34 @@ public class FSMInjectorProvider implements IInjectorProvider, IRegistryConfigur
 		}
 		return injector;
 	}
-	
+
 	protected Injector internalCreateInjector() {
-	    return new FSMStandaloneSetup().createInjectorAndDoEMFRegistration();
+		return new FSMStandaloneSetup() {
+			@Override
+			public Injector createInjector() {
+				return Guice.createInjector(createRuntimeModule());
+			}
+		}.createInjectorAndDoEMFRegistration();
+	}
+
+	protected FSMRuntimeModule createRuntimeModule() {
+		// make it work also with Maven/Tycho and OSGI
+		// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=493672
+		return new FSMRuntimeModule() {
+			@Override
+			public ClassLoader bindClassLoaderToInstance() {
+				return FSMInjectorProvider.class
+						.getClassLoader();
+			}
+		};
 	}
 
+	@Override
 	public void restoreRegistry() {
 		stateBeforeInjectorCreation.restoreGlobalState();
 	}
 
+	@Override
 	public void setupRegistry() {
 		getInjector();
 		stateAfterInjectorCreation.restoreGlobalState();
diff --git a/tests/org.eclipse.etrice.core.fsm.tests/src-gen/org/eclipse/etrice/core/fsm/FSMUiInjectorProvider.java b/tests/org.eclipse.etrice.core.fsm.tests/src-gen/org/eclipse/etrice/core/fsm/FSMUiInjectorProvider.java
index c499b9df7..4a1f21f0d 100644
--- a/tests/org.eclipse.etrice.core.fsm.tests/src-gen/org/eclipse/etrice/core/fsm/FSMUiInjectorProvider.java
+++ b/tests/org.eclipse.etrice.core.fsm.tests/src-gen/org/eclipse/etrice/core/fsm/FSMUiInjectorProvider.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.fsm;
 
 import org.eclipse.xtext.junit4.IInjectorProvider;
@@ -8,9 +8,10 @@ import org.eclipse.xtext.junit4.IInjectorProvider;
 import com.google.inject.Injector;
 
 public class FSMUiInjectorProvider implements IInjectorProvider {
-	
+
+	@Override
 	public Injector getInjector() {
 		return org.eclipse.etrice.core.fsm.ui.internal.FSMActivator.getInstance().getInjector("org.eclipse.etrice.core.fsm.FSM");
 	}
-	
+
 }